From 6cb8b77f290e0b104750e22f5f8594330a598709 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@gmail.com>
Date: Mon, 17 Jan 2011 22:49:55 +0900
Subject: [PATCH 001/630] added opWidgetFormDateTime (fixes #1873)

---
 lib/widget/opWidgetFormDateTime.class.php | 28 +++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 lib/widget/opWidgetFormDateTime.class.php

diff --git a/lib/widget/opWidgetFormDateTime.class.php b/lib/widget/opWidgetFormDateTime.class.php
new file mode 100644
index 000000000..3bea86357
--- /dev/null
+++ b/lib/widget/opWidgetFormDateTime.class.php
@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * opWidgetFormDateTime
+ *
+ * @package     OpenPNE3
+ * @subpackage  widget
+ * @author      Kimura Youichi <kim.upsilon@gmail.com>
+ */
+class opWidgetFormDateTime extends sfWidgetFormI18nDateTime
+{
+  /**
+   * @see sfWidgetFormI18nDateTime
+   */
+  public function getDateWidget($attributes = array())
+  {
+    return new opWidgetFormDate(array_merge(array('culture' => $this->getOption('culture')), $this->getOptionsFor('date')), $this->getAttributesFor('date', $attributes));
+  }
+}
+

From 543738d5db90a786d51beb421c08cea9dbfafb4c Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Wed, 8 Feb 2012 08:58:52 +0900
Subject: [PATCH 002/630] (fixes #2408) add patch to symfony-1.4.13 and patch
 not to unescape using get_partial/include_partial

---
 data/patches/t2408.patch                        | 14 ++++++++++++++
 lib/vendor/symfony/lib/helper/PartialHelper.php |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 data/patches/t2408.patch

diff --git a/data/patches/t2408.patch b/data/patches/t2408.patch
new file mode 100644
index 000000000..bf9f74cb0
--- /dev/null
+++ b/data/patches/t2408.patch
@@ -0,0 +1,14 @@
+diff --git a/lib/vendor/symfony/lib/helper/PartialHelper.php b/lib/vendor/symfony/lib/helper/PartialHelper.php
+index e5aac3d..9bfb4e1 100644
+--- a/lib/vendor/symfony/lib/helper/PartialHelper.php
++++ b/lib/vendor/symfony/lib/helper/PartialHelper.php
+@@ -213,7 +213,7 @@ function get_partial($templateName, $vars = array())
+
+   $class = sfConfig::get('mod_'.strtolower($moduleName).'_partial_view_class', 'sf').'PartialView';
+   $view = new $class($context, $moduleName, $actionName, '');
+-  $view->setPartialVars(true === sfConfig::get('sf_escaping_strategy') ? sfOutputEscaper::unescape($vars) : $vars);
++  $view->setPartialVars($vars);
+
+   return $view->render();
+ }
+
diff --git a/lib/vendor/symfony/lib/helper/PartialHelper.php b/lib/vendor/symfony/lib/helper/PartialHelper.php
index e5aac3d3b..9bfb4e11b 100644
--- a/lib/vendor/symfony/lib/helper/PartialHelper.php
+++ b/lib/vendor/symfony/lib/helper/PartialHelper.php
@@ -213,7 +213,7 @@ function get_partial($templateName, $vars = array())
 
   $class = sfConfig::get('mod_'.strtolower($moduleName).'_partial_view_class', 'sf').'PartialView';
   $view = new $class($context, $moduleName, $actionName, '');
-  $view->setPartialVars(true === sfConfig::get('sf_escaping_strategy') ? sfOutputEscaper::unescape($vars) : $vars);
+  $view->setPartialVars($vars);
 
   return $view->render();
 }

From 87e003c5cdbb36b1aeccc23ee16e6b46d05feac6 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Mon, 19 Mar 2012 16:14:00 +0900
Subject: [PATCH 003/630] Revert (#2275) "use option 'date_format_range_error'
 in opValidatorDate"

This reverts commit b6045142184085971062775555cf48d3db34de56.
---
 lib/util/opFormItemGenerator.class.php  | 1 -
 lib/validator/opValidatorDate.class.php | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/util/opFormItemGenerator.class.php b/lib/util/opFormItemGenerator.class.php
index ea2ac2abe..1895c2f9b 100644
--- a/lib/util/opFormItemGenerator.class.php
+++ b/lib/util/opFormItemGenerator.class.php
@@ -233,7 +233,6 @@ public static function generateValidator($field, $choices = array())
 
     if ($field['FormType'] === 'date')
     {
-      $option['date_format_range_error'] = 'Y-m-d';
       $obj = new opValidatorDate($option);
       return $obj;
     }
diff --git a/lib/validator/opValidatorDate.class.php b/lib/validator/opValidatorDate.class.php
index cc82bf438..cfc3bb976 100644
--- a/lib/validator/opValidatorDate.class.php
+++ b/lib/validator/opValidatorDate.class.php
@@ -56,7 +56,7 @@ protected function doClean($value)
       $max = new DateTime($this->getOption('max'));
       if ($max && $clean->format('U') > $max->format('U'))
       {
-        throw new sfValidatorError($this, 'max', array('max' => $max->format($this->getOption('date_format_range_error'))));
+        throw new sfValidatorError($this, 'max', array('max' => $max->format('Y-m-d')));
       }
     }
 
@@ -65,7 +65,7 @@ protected function doClean($value)
       $min = new DateTime($this->getOption('min'));
       if ($min && $clean->format('U') < $min->format('U'))
       {
-        throw new sfValidatorError($this, 'min', array('min' => $min->format($this->getOption('date_format_range_error'))));
+        throw new sfValidatorError($this, 'min', array('min' => $min->format('Y-m-d')));
       }
     }
 

From 46954c93eb22a9a21f926e140e33a7a4f4dde3c4 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Mon, 19 Mar 2012 16:15:27 +0900
Subject: [PATCH 004/630] Revert (#2261) "Removes the last line feed in the
 base64-encoded data before passing it to base64_decode($data, true)."

This reverts commit fcab4cf56ff5532f6e5fef518da08d0c2926a753.
---
 lib/util/opMailMessage.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util/opMailMessage.class.php b/lib/util/opMailMessage.class.php
index f49af912b..819c337c8 100644
--- a/lib/util/opMailMessage.class.php
+++ b/lib/util/opMailMessage.class.php
@@ -65,7 +65,7 @@ private static function saveBase64ImageInTempDir($content)
     $tmppath = tempnam(sys_get_temp_dir(), 'IMG');
 
     $fh = fopen($tmppath, 'w');
-    fwrite($fh, base64_decode(rtrim($content), true));
+    fwrite($fh, base64_decode($content, true));
     fclose($fh);
 
     return $tmppath;

From 0bfea8f1fa24cc9c28d41a15a73923acd865ee09 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Mon, 19 Mar 2012 16:15:43 +0900
Subject: [PATCH 005/630] Revert (#2261) "Avoid an image being read as a
 base64-encoded text when it is posted via e-mail and its content-type is
 image/*"

This reverts commit 5cbd2e46763a087ec35f380bcd93b9ab123e526a.
---
 lib/util/opMailMessage.class.php | 44 +++++++++-----------------------
 1 file changed, 12 insertions(+), 32 deletions(-)

diff --git a/lib/util/opMailMessage.class.php b/lib/util/opMailMessage.class.php
index 819c337c8..3da417aa1 100644
--- a/lib/util/opMailMessage.class.php
+++ b/lib/util/opMailMessage.class.php
@@ -50,46 +50,20 @@ public function getContent()
 
       return $content;
     }
-    elseif ('text/plain' === strtok($this->getPart(0)->contentType, ';'))
-    {
-      return mb_convert_encoding(parent::getContent(), 'UTF-8', 'JIS');
-    }
-    else
-    {
-      return '';
-    }
-  }
 
-  private static function saveBase64ImageInTempDir($content)
-  {
-    $tmppath = tempnam(sys_get_temp_dir(), 'IMG');
-
-    $fh = fopen($tmppath, 'w');
-    fwrite($fh, base64_decode($content, true));
-    fclose($fh);
-
-    return $tmppath;
+    return mb_convert_encoding(parent::getContent(), 'UTF-8', 'JIS');
   }
 
   public function getImages()
   {
-    $images = array();
-    $allowTypes = array('image/jpeg', 'image/png', 'image/gif');
-
     if (!$this->isMultiPart())
     {
-      $type = strtok($this->getPart(0)->contentType, ';');
-      if (in_array($type, $allowTypes))
-      {
-        $image[] = array(
-          'tmp_name' => self::saveBase64ImageInTempDir(parent::getContent()),
-          'type'     => $type,
-        );
-      }
-
-      return $images;
+      return array();
     }
 
+    $images = array();
+    $allowTypes = array('image/jpeg', 'image/png', 'image/gif');
+
     $current = $this->key();
     $this->rewind();
 
@@ -98,8 +72,14 @@ public function getImages()
       $tok = strtok($part->contentType, ';');
       if (in_array($tok, $allowTypes))
       {
+        $tmppath = tempnam(sys_get_temp_dir(), 'IMG');
+
+        $fh = fopen($tmppath, 'w');
+        fwrite($fh, base64_decode($part->getContent(), true));
+        fclose($fh);
+
         $images[] = array(
-          'tmp_name' => self::saveBase64ImageInTempDir($part->getContent()),
+          'tmp_name' => $tmppath,
           'type'    => $tok,
         );
       }

From 6106266c62c30a13cd447974a6b783dca2b10aaa Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Mon, 19 Mar 2012 16:16:18 +0900
Subject: [PATCH 006/630] Revert (#2104) "fixed "IsTrim" option"

This reverts commit 9a9d99dd054733b5a296a0885bb4ff605f7d06a9.
---
 lib/config/config/sns_config.yml       | 8 --------
 lib/util/opFormItemGenerator.class.php | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/lib/config/config/sns_config.yml b/lib/config/config/sns_config.yml
index b26fe8e4b..a869abe0e 100644
--- a/lib/config/config/sns_config.yml
+++ b/lib/config/config/sns_config.yml
@@ -26,7 +26,6 @@ general:
     ValueType:  "email"
     Default:    "sns@example.com"
     IsRequired: true
-    IsTrim:     true
 
   enable_pc:
     Name:      "enable_pc"
@@ -34,7 +33,6 @@ general:
     FormType:  "radio"
     ValueType: "text"
     IsRequired: true
-    IsTrim:     true
     Default:    1
     Choices:
       - "使用しない"
@@ -46,7 +44,6 @@ general:
     FormType:  "radio"
     ValueType: "text"
     IsRequired: true
-    IsTrim:     true
     Default:    1
     Choices:
       - "使用しない"
@@ -70,7 +67,6 @@ general:
     ValueType:   "regexp"
     ValueRegexp: "/^[1-9]\d*[K|M]?$/"
     IsRequired:  true
-    IsTrim:      true
     Default:     "300K"
 
   daily_news_day:
@@ -193,7 +189,6 @@ external_login_page:
     ValueType: "text"
     Default:   ""
     IsRequired: false
-    IsTrim:   true
 
   external_mobile_login_url:
     Name:     "external_mobile_login_url"
@@ -203,7 +198,6 @@ external_login_page:
     ValueType: "text"
     Default:   ""
     IsRequired: false
-    IsTrim:   true
 
 authentication:
   _attributes:
@@ -317,7 +311,6 @@ api_keys:
     FormType:   "text"
     ValueType:  "string"
     IsRequired: false
-    IsTrim:     true
     Default:    ""
   google_AJAX_search_api_key:
     Name:       "google AJAX search api key"
@@ -325,5 +318,4 @@ api_keys:
     FormType:   "text"
     ValueType:  "string"
     IsRequired: false
-    IsTrim:     true
     Default:    ""
diff --git a/lib/util/opFormItemGenerator.class.php b/lib/util/opFormItemGenerator.class.php
index 1895c2f9b..d400d2256 100644
--- a/lib/util/opFormItemGenerator.class.php
+++ b/lib/util/opFormItemGenerator.class.php
@@ -159,7 +159,7 @@ public static function generateWidget($field, $choices = array())
   public static function generateValidator($field, $choices = array())
   {
     $field = self::arrayKeyCamelize($field);
-    $option = array('required' => $field['IsRequired'], 'trim' => $field['IsTrim']);
+    $option = array('required' => $field['IsRequired'], 'trim' => $field['IsRequired']);
 
     if (!$choices && !empty($field['Choices']))
     {

From cc8ea818f66bc399435a58d83eae0091b2d0c2ad Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Mon, 19 Mar 2012 16:16:49 +0900
Subject: [PATCH 007/630] Revert (#2089) "fixed description of class file"

This reverts commit cf16768ec4e8bc6b62fdb121d033e5bc169e4d21.
---
 lib/validator/opValidatorImageSize.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/validator/opValidatorImageSize.class.php b/lib/validator/opValidatorImageSize.class.php
index 04e24c655..6bfc2c9ac 100644
--- a/lib/validator/opValidatorImageSize.class.php
+++ b/lib/validator/opValidatorImageSize.class.php
@@ -9,7 +9,7 @@
  */
 
 /**
- * opValidatorImageSize validates a image size
+ * opValidatorImageFile validates a date
  *
  * @package    OpenPNE
  * @subpackage validator

From 12ac5cbb3c01d613fb0ecbfb74e52fa26beb3a4d Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Mon, 19 Mar 2012 16:19:15 +0900
Subject: [PATCH 008/630] Revert (#2089) "added the image max size of the
 mobile to the pc_backend"

This reverts commit 0e6df5a238b75abc84f9a3b1d378410646f871b8.

Conflicts:

	apps/pc_backend/i18n/messages.ja.xml
---
 .../templates/configImageSuccess.php          |  2 +-
 .../templates/deleteImageSuccess.php          |  2 +-
 .../friend/templates/showImageSuccess.php     |  2 +-
 .../member/templates/configImageSuccess.php   |  2 +-
 .../member/templates/deleteImageSuccess.php   |  2 +-
 apps/pc_backend/i18n/messages.ja.xml          |  4 --
 lib/config/config/sns_config.yml              |  8 ----
 lib/util/opFormItemGenerator.class.php        |  3 --
 lib/validator/opValidatorImageSize.class.php  | 43 -------------------
 9 files changed, 5 insertions(+), 63 deletions(-)
 delete mode 100644 lib/validator/opValidatorImageSize.class.php

diff --git a/apps/mobile_frontend/modules/community/templates/configImageSuccess.php b/apps/mobile_frontend/modules/community/templates/configImageSuccess.php
index 7cc934247..0a1b272cf 100644
--- a/apps/mobile_frontend/modules/community/templates/configImageSuccess.php
+++ b/apps/mobile_frontend/modules/community/templates/configImageSuccess.php
@@ -3,7 +3,7 @@
 <?php if ($community->getImageFileName()): ?>
 <?php echo op_image_tag_sf_image($community->getFile(), array('size' => '120x120', 'format' => 'jpg')) ?><br>
 <?php echo sprintf('[%s | %s]',
-  link_to(__('Expansion'), sf_image_path($community->getFile(), array('size' => opConfig::get('mobile_image_max_size'), 'format' => 'jpg'))),
+  link_to(__('Expansion'), sf_image_path($community->getFile(), array('size' => '320x320', 'format' => 'jpg'))),
   link_to(__('Delete'), '@community_deleteImage?id='.$community->getId())
 ) ?>
 <br><br>
diff --git a/apps/mobile_frontend/modules/community/templates/deleteImageSuccess.php b/apps/mobile_frontend/modules/community/templates/deleteImageSuccess.php
index 842ada04e..c47219918 100644
--- a/apps/mobile_frontend/modules/community/templates/deleteImageSuccess.php
+++ b/apps/mobile_frontend/modules/community/templates/deleteImageSuccess.php
@@ -3,7 +3,7 @@
 <hr color="<?php echo $op_color["core_color_12"] ?>">
 <center>
 <?php echo op_image_tag_sf_image($community->getImageFileName(), array('size' => '120x120', 'format' => 'jpg')) ?><br>
-<?php echo sprintf('[%s]',link_to(__('Expansion'), sf_image_path($community->getImageFileName(), array('size' => opConfig::get('mobile_image_max_size'), 'format' => 'jpg')))) ?><br>
+<?php echo sprintf('[%s]',link_to(__('Expansion'), sf_image_path($community->getImageFileName(), array('size' => '320x320', 'format' => 'jpg')))) ?><br>
 </center>
 <hr color="<?php echo $op_color["core_color_12"] ?>">
 <?php op_include_form('deleteForm', $form, array(
diff --git a/apps/mobile_frontend/modules/friend/templates/showImageSuccess.php b/apps/mobile_frontend/modules/friend/templates/showImageSuccess.php
index ae4de0511..6990471e6 100644
--- a/apps/mobile_frontend/modules/friend/templates/showImageSuccess.php
+++ b/apps/mobile_frontend/modules/friend/templates/showImageSuccess.php
@@ -4,7 +4,7 @@
 <?php for ($i = 0; $i < 3 && $i < count($images); $i++) : ?>
 <?php $image = $images[$i] ?>
 <?php echo op_image_tag_sf_image($image->getFile(), array('size' => '120x120', 'format' => 'jpg')) ?><br>
-<?php echo '['.link_to(__('Expansion'), sf_image_path($image->getFile(), array('size' => opConfig::get('mobile_image_max_size'), 'format' => 'jpg'))).']' ?><br><br>
+<?php echo '['.link_to(__('Expansion'), sf_image_path($image->getFile(), array('size' => '320x320', 'format' => 'jpg'))).']' ?><br><br>
 <?php endfor; ?>
 </center>
 <?php slot('op_mobile_footer_menu') ?>
diff --git a/apps/mobile_frontend/modules/member/templates/configImageSuccess.php b/apps/mobile_frontend/modules/member/templates/configImageSuccess.php
index f27bc9853..a2c05cae0 100644
--- a/apps/mobile_frontend/modules/member/templates/configImageSuccess.php
+++ b/apps/mobile_frontend/modules/member/templates/configImageSuccess.php
@@ -7,7 +7,7 @@
 <?php $csrfToken = '&'.$form->getCSRFFieldName().'='.$form->getCSRFToken() ?>
 <?php foreach ($images as $image) : ?>
 <?php echo op_image_tag_sf_image($image->getFile(), array('size' => '120x120', 'format' => 'jpg')) ?><br>
-<?php echo sprintf('[%s]',link_to(__('Expansion'), sf_image_path($image->getFile(), array('size' => opConfig::get('mobile_image_max_size'), 'format' => 'jpg')))) ?><br>
+<?php echo sprintf('[%s]',link_to(__('Expansion'), sf_image_path($image->getFile(), array('size' => '320x320', 'format' => 'jpg')))) ?><br>
 <?php 
 if ($image->getIsPrimary())
 {
diff --git a/apps/mobile_frontend/modules/member/templates/deleteImageSuccess.php b/apps/mobile_frontend/modules/member/templates/deleteImageSuccess.php
index 52e09f654..764736b57 100644
--- a/apps/mobile_frontend/modules/member/templates/deleteImageSuccess.php
+++ b/apps/mobile_frontend/modules/member/templates/deleteImageSuccess.php
@@ -3,7 +3,7 @@
 <hr color="<?php echo $op_color["core_color_12"] ?>">
 <center>
 <?php echo op_image_tag_sf_image($image->getFile(), array('size' => '120x120', 'format' => 'jpg')) ?><br>
-<?php echo sprintf('[%s]',link_to(__('Expansion'), sf_image_path($image->getFile(), array('size' => opConfig::get('mobile_image_max_size'), 'format' => 'jpg')))) ?><br>
+<?php echo sprintf('[%s]',link_to(__('Expansion'), sf_image_path($image->getFile(), array('size' => '320x320', 'format' => 'jpg')))) ?><br>
 </center>
 <hr color="<?php echo $op_color["core_color_12"] ?>">
 <?php op_include_form('deleteForm', $form, array(
diff --git a/apps/pc_backend/i18n/messages.ja.xml b/apps/pc_backend/i18n/messages.ja.xml
index f36bb24df..761379e85 100644
--- a/apps/pc_backend/i18n/messages.ja.xml
+++ b/apps/pc_backend/i18n/messages.ja.xml
@@ -1445,10 +1445,6 @@
         <source>Are you sure you want to delete this %community%?</source>
         <target>本当にこの%community%を削除してもよろしいですか？</target>
       </trans-unit>
-      <trans-unit id="">
-        <source>Not allowed</source>
-        <target>許可されていません。</target>
-      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/lib/config/config/sns_config.yml b/lib/config/config/sns_config.yml
index a869abe0e..7237cfbed 100644
--- a/lib/config/config/sns_config.yml
+++ b/lib/config/config/sns_config.yml
@@ -252,14 +252,6 @@ mobile:
     Choices:
       1: "携帯電話のIP帯域をチェックする"
       0: "携帯電話のIP帯域をチェックしない"
-  mobile_image_max_size:
-    Name:        "mobile_image_max_size"
-    Caption:     "画像の最大サイズ設定"
-    Help:        "許可されている画像サイズを\"横x縦\"で指定してください。<br />(空欄の場合フルサイズになります)"
-    FormType:    "input"
-    ValueType:   "image_size"
-    IsRequired:  false
-    Default:     "320x320"
 
 policy:
   _attributes:
diff --git a/lib/util/opFormItemGenerator.class.php b/lib/util/opFormItemGenerator.class.php
index d400d2256..70add4def 100644
--- a/lib/util/opFormItemGenerator.class.php
+++ b/lib/util/opFormItemGenerator.class.php
@@ -261,9 +261,6 @@ public static function generateValidator($field, $choices = array())
       case 'password':
         $obj = new sfValidatorPassword($option);
         break;
-      case 'image_size':
-        $obj = new opValidatorImageSize($option);
-        break;
       case 'pass':
         $obj = new sfValidatorPass($option);
         break;
diff --git a/lib/validator/opValidatorImageSize.class.php b/lib/validator/opValidatorImageSize.class.php
deleted file mode 100644
index 6bfc2c9ac..000000000
--- a/lib/validator/opValidatorImageSize.class.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * opValidatorImageFile validates a date
- *
- * @package    OpenPNE
- * @subpackage validator
- * @author     Masato Nagasawa <nagasawa@tejimaya.com>
- */
-class opValidatorImageSize extends opValidatorString
-{
-  protected function configure($options = array(), $messages = array())
-  {
-    parent::configure($options, $messages);
-
-    $this->setOption('ltrim', true);
-    $this->setOption('rtrim', true);
-  }
-
-  protected function doClean($value)
-  {
-    $value = parent::doClean($value);
-    if ($this->isEmpty($value))
-    {
-      return $this->getEmptyValue();
-    }
-
-    if (!in_array($value, sfImageHandler::getAllowedSize()))
-    {
-      throw new sfValidatorError($this, 'Not allowed');
-    }
-
-    return $value;
-  }
-}

From d94ebdbbd5334535abda9a0d6f401e45ec79f67c Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Mon, 19 Mar 2012 16:19:49 +0900
Subject: [PATCH 009/630] Revert (#1966) "add support for 'sf_route' to
 opApplicationConfiguration::generateAppUrl()"

This reverts commit c1678c50ec2756b8d987f14d42fc445ec51847df.
---
 lib/config/opApplicationConfiguration.class.php | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/lib/config/opApplicationConfiguration.class.php b/lib/config/opApplicationConfiguration.class.php
index b09c777f3..cacc32fcb 100644
--- a/lib/config/opApplicationConfiguration.class.php
+++ b/lib/config/opApplicationConfiguration.class.php
@@ -552,16 +552,8 @@ public function setCacheDir($cacheDir)
 
   public function generateAppUrl($application, $parameters = array(), $absolute = false)
   {
-    if (is_array($parameters) && isset($parameters['sf_route']))
-    {
-      $route = $parameters['sf_route'];
-      unset($parameters['sf_route']);
-    }
-    else
-    {
-      list($route, $parameters) = sfContext::getInstance()->getController()
-        ->convertUrlStringToParameters($parameters);
-    }
+    list($route, $parameters) = sfContext::getInstance()->getController()
+      ->convertUrlStringToParameters($parameters);
 
     return $this->getAppRouting($application)->generate($route, $parameters, $absolute);
   }

From 49f80b3d7b7cf1264a26c600cdd6e92840e9811c Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Mon, 19 Mar 2012 16:20:13 +0900
Subject: [PATCH 010/630] Revert (#1859) "fixed sortable of the community
 categories"

This reverts commit 37f8eb131767a730a46328d1eebba5d802f3036b.
---
 .../community/actions/actions.class.php       |  5 ++-
 .../doctrine/CommunityFormFilter.class.php    | 18 ++++-------
 lib/form/doctrine/CommunityForm.class.php     |  8 +++--
 .../doctrine/CommunityCategoryTable.class.php | 31 -------------------
 test/fixtures/common/test_data.yml            |  5 ---
 .../doctrine/CommunityCategoryTableTest.php   | 16 +---------
 6 files changed, 17 insertions(+), 66 deletions(-)

diff --git a/apps/mobile_frontend/modules/community/actions/actions.class.php b/apps/mobile_frontend/modules/community/actions/actions.class.php
index 23f0c8dcd..64a0c6910 100644
--- a/apps/mobile_frontend/modules/community/actions/actions.class.php
+++ b/apps/mobile_frontend/modules/community/actions/actions.class.php
@@ -87,7 +87,10 @@ public function executeSearch(sfWebRequest $request)
     $this->pager->setPage($request->getParameter('page', 1));
     $this->pager->init();
 
-    $this->categorys = Doctrine::getTable('CommunityCategory')->getAllChildren();
+    $this->categorys = Doctrine::getTable('CommunityCategory')
+      ->createQuery()
+      ->where('lft > 1')
+      ->execute();
 
     return sfView::SUCCESS;
   }
diff --git a/lib/filter/doctrine/CommunityFormFilter.class.php b/lib/filter/doctrine/CommunityFormFilter.class.php
index 748495a9c..aa260038d 100644
--- a/lib/filter/doctrine/CommunityFormFilter.class.php
+++ b/lib/filter/doctrine/CommunityFormFilter.class.php
@@ -24,20 +24,14 @@ public function __construct($defaults = array(), $options = array(), $CSRFSecret
 
   public function configure()
   {
-    $choices = array();
-    $choices[''] = sfContext::getInstance()->getI18N()->__('All categories', array(), 'form_community');
-
-    $categories = Doctrine::getTable('CommunityCategory')->getAllChildren();
-    foreach ($categories as $category)
-    {
-      $choices[$category->getId()] = $category->getName();
-    }
-
+    $q = Doctrine::getTable('CommunityCategory')->getAllChildrenQuery();
     $widgets = array(
       'name'                  => new sfWidgetFormInput(),
-      'community_category_id' => new sfWidgetFormChoice(array(
-        'choices'     => $choices,
-        'default'     => '')),
+      'community_category_id' => new sfWidgetFormDoctrineChoice(array(
+        'model'       => 'CommunityCategory',
+        'add_empty'   => sfContext::getInstance()->getI18N()->__('All categories', array(), 'form_community'),
+        'query'    => $q,
+        'default' => 0)),
     );
 
     $validators = array(
diff --git a/lib/form/doctrine/CommunityForm.class.php b/lib/form/doctrine/CommunityForm.class.php
index 6c012d780..a834c0b0f 100644
--- a/lib/form/doctrine/CommunityForm.class.php
+++ b/lib/form/doctrine/CommunityForm.class.php
@@ -27,8 +27,12 @@ public function configure()
     $this->widgetSchema->setLabel('name', '%community% Name');
     $this->setValidator('name', new opValidatorString(array('max_length' => 64, 'trim' => true)));
 
-    $isAllowMemberCommunity = 1 != sfContext::getInstance()->getUser()->getMemberId();
-    $communityCategories = Doctrine::getTable('CommunityCategory')->getAllChildren($isAllowMemberCommunity);
+    $q = Doctrine::getTable('CommunityCategory')->getAllChildrenQuery();
+    if (1 != sfContext::getInstance()->getUser()->getMemberId())
+    {
+      $q->andWhere('is_allow_member_community = 1');
+    }
+    $communityCategories = $q->execute();
     if (0 < count($communityCategories))
     {
       $choices = array();
diff --git a/lib/model/doctrine/CommunityCategoryTable.class.php b/lib/model/doctrine/CommunityCategoryTable.class.php
index 739bbe9f4..dd3add399 100644
--- a/lib/model/doctrine/CommunityCategoryTable.class.php
+++ b/lib/model/doctrine/CommunityCategoryTable.class.php
@@ -48,35 +48,4 @@ public function getAllChildrenQuery($sort = true)
 
     return $q;
   }
-
-  public function getAllChildren($checkIsAllowMemberCommunity = false)
-  {
-    $roots = $this->retrieveAllRoots();
-    $children = $this->retrieveAllChildren();
-
-    // sort by root category
-    $temp = array();
-    foreach ($children as $child)
-    {
-      if ($checkIsAllowMemberCommunity && !$child->getIsAllowMemberCommunity())
-      {
-        continue;
-      }
-      $temp[$child->getTreeKey()][] = $child;
-    }
-
-    $data = array();
-    foreach ($roots as $root)
-    {
-      if (isset($temp[$root->getId()]))
-      {
-        $data = array_merge($data, $temp[$root->getId()]);
-      }
-    }
-
-    $collection = new Doctrine_Collection($this);
-    $collection->setData($data);
-
-    return $collection;
-  }
 }
diff --git a/test/fixtures/common/test_data.yml b/test/fixtures/common/test_data.yml
index 5b302a68a..d5dd6d4dc 100644
--- a/test/fixtures/common/test_data.yml
+++ b/test/fixtures/common/test_data.yml
@@ -507,11 +507,6 @@ CommunityCategory:
     tree_key: 1
     is_allow_member_community: 1
     sort_order: 1
-  community_category_5:
-    name: "CategoryC"
-    tree_key: 2
-    is_allow_member_community: 0
-    sort_order: 3
 
 CommunityConfig:
   community_1_description:
diff --git a/test/unit/model/doctrine/CommunityCategoryTableTest.php b/test/unit/model/doctrine/CommunityCategoryTableTest.php
index 5bb6ee076..095efe2c1 100644
--- a/test/unit/model/doctrine/CommunityCategoryTableTest.php
+++ b/test/unit/model/doctrine/CommunityCategoryTableTest.php
@@ -3,7 +3,7 @@
 include_once dirname(__FILE__) . '/../../../bootstrap/unit.php';
 include_once dirname(__FILE__) . '/../../../bootstrap/database.php';
 
-$t = new lime_test(19, new lime_output_color());
+$t = new lime_test(13, new lime_output_color());
 
 $table = Doctrine::getTable('CommunityCategory');
 
@@ -39,17 +39,3 @@
 $t->isa_ok($table->getAllChildrenQuery(), 'opDoctrineQuery');
 $t->is($table->getAllChildrenQuery(false)->getDql(), ' FROM CommunityCategory WHERE lft > 1');
 $t->is($table->getAllChildrenQuery(true)->getDql(), ' FROM CommunityCategory WHERE lft > 1 ORDER BY sort_order');
-
-//------------------------------------------------------------
-$t->diag('CommunityCategoryTable::getAllChildren()');
-$categories = $table->getAllChildren();
-$t->isa_ok($categories, 'Doctrine_Collection');
-$t->is(count($categories), 3);
-
-$categories = $table->getAllChildren(false);
-$t->isa_ok($categories, 'Doctrine_Collection');
-$t->is(count($categories), 3);
-
-$categories = $table->getAllChildren(true);
-$t->isa_ok($categories, 'Doctrine_Collection');
-$t->is(count($categories), 2);

From e1812638693548b130c0fd543d29f147e51c476e Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Mon, 19 Mar 2012 16:25:11 +0900
Subject: [PATCH 011/630] Revert (#1591) "fixed supported sortable of the
 community category"

This reverts commit 3b8823462b2a4dd29fb2b54109a69569dba81fe3.

Conflicts:

	apps/pc_backend/modules/community/templates/categoryListSuccess.php
---
 .../community/actions/actions.class.php       | 36 -------------------
 .../community/templates/_categoryListForm.php | 14 ++------
 .../templates/categoryListSuccess.php         |  6 +---
 .../doctrine/CommunityCategory.class.php      |  8 -----
 .../doctrine/CommunityCategoryTable.class.php | 17 +++------
 test/fixtures/common/test_data.yml            | 14 +++-----
 .../doctrine/CommunityCategoryTableTest.php   | 12 +------
 .../model/doctrine/CommunityCategoryTest.php  | 13 +------
 8 files changed, 13 insertions(+), 107 deletions(-)

diff --git a/apps/pc_backend/modules/community/actions/actions.class.php b/apps/pc_backend/modules/community/actions/actions.class.php
index 65ea8b76b..5abe5cb7c 100644
--- a/apps/pc_backend/modules/community/actions/actions.class.php
+++ b/apps/pc_backend/modules/community/actions/actions.class.php
@@ -236,40 +236,4 @@ public function executeCategoryDelete(sfWebRequest $request)
     $this->getUser()->setFlash('notice', 'Deleted.');
     $this->redirect('community/categoryList');
   }
-
-  /**
-   * Executes categorySort action
-   *
-   * @param sfWebRequest $request A request object
-   */
-  public function executeCategorySort(sfWebRequest $request)
-  {
-    if (!$request->isXmlHttpRequest())
-    {
-      $this->forward404();
-    }
-
-    $request->checkCSRFProtection();
-
-    $parameters = $request->getParameterHolder();
-    $keys = $parameters->getNames();
-    foreach ($keys as $key)
-    {
-      if (strpos($key, 'type_') === 0)
-      {
-        $order = $parameters->get($key);
-        for ($i = 0; $i < count($order); $i++)
-        {
-          $category = Doctrine::getTable('CommunityCategory')->find($order[$i]);
-          if ($category)
-          {
-            $category->setSortOrder($i * 10);
-            $category->save();
-          }
-        }
-        break;
-      }
-    }
-    return sfView::NONE;
-  }
 }
diff --git a/apps/pc_backend/modules/community/templates/_categoryListForm.php b/apps/pc_backend/modules/community/templates/_categoryListForm.php
index 12fcc5463..8bd374c65 100644
--- a/apps/pc_backend/modules/community/templates/_categoryListForm.php
+++ b/apps/pc_backend/modules/community/templates/_categoryListForm.php
@@ -1,4 +1,4 @@
-<table id="type_<?php echo $type ?>">
+<table>
 <tr>
 <th><?php echo $form['name']->renderLabel() ?></th>
 <?php if (empty($forceAllowUserCommunity)) : ?>
@@ -9,10 +9,9 @@
 
 <?php if ($categories): ?>
 <?php foreach ($categories as $category): ?>
-<tbody id="type_<?php echo $type ?>_<?php echo $category->getId() ?>" class="sortable" style="position: relative;">
-<tr>
 <form action="<?php echo url_for('community/categoryEdit?id='.$category->getId()) ?>" method="post">
 <?php echo $category->getForm()->renderGlobalErrors() ?>
+<tr>
 <?php foreach ($category->getForm() as $key => $row) : ?>
 <?php if (!$row->isHidden()) : ?>
 <?php if (empty($forceAllowUserCommunity) || $key != 'is_allow_member_community') : ?>
@@ -35,7 +34,6 @@
 </form>
 </td>
 </tr>
-</tbody>
 <?php endforeach; ?>
 <?php endif; ?>
 
@@ -60,11 +58,3 @@
 </form>
 
 </table>
-
-<?php $form = new BaseForm() ?>
-<?php echo sortable_element('type_'.$type, array(
-  'tag'  => 'tbody',
-  'only' => 'sortable',
-  'url'  => 'community/categorySort',
-  'with' => 'Sortable.serialize("type_'.$type.'")+"&'.urlencode($form->getCSRFFieldName()).'='.urlencode($form->getCSRFToken()).'"',
-)) ?>
diff --git a/apps/pc_backend/modules/community/templates/categoryListSuccess.php b/apps/pc_backend/modules/community/templates/categoryListSuccess.php
index fd414bdc6..43a8464ea 100644
--- a/apps/pc_backend/modules/community/templates/categoryListSuccess.php
+++ b/apps/pc_backend/modules/community/templates/categoryListSuccess.php
@@ -2,15 +2,12 @@
 <?php include_partial('submenu') ?>
 <?php end_slot() ?>
 
-<?php use_helper('Javascript'); ?>
-
 <?php slot('title', __('%Community% Category Configuration')); ?>
 
 <p><?php echo __('If you uncheck "Is allow Member %community%", only the member who has id 1 can make %community% of the category.') ?></p>
 
 <h3><?php echo __('Big Category') ?></h3>
 <?php include_partial('categoryListForm', array(
-  'type'                    => 'big',
   'form'                    => $rootForm,
   'forceAllowUserCommunity' => true,
   'categories'              => $categories,
@@ -21,9 +18,8 @@
 <?php foreach ($categories as $category): ?>
 <h4><?php echo $category ?></h4>
 <?php include_partial('categoryListForm', array(
-  'type'       => 'small'.$category->getId(),
   'form'       => $categoryForms[$category->getId()],
-  'categories' => $category->getChildren(),
+  'categories' => $category->getNode()->getChildren(),
   'deleteForm' => $deleteForm,
 )) ?>
 <?php endforeach; ?>
diff --git a/lib/model/doctrine/CommunityCategory.class.php b/lib/model/doctrine/CommunityCategory.class.php
index 082525f32..09c967feb 100644
--- a/lib/model/doctrine/CommunityCategory.class.php
+++ b/lib/model/doctrine/CommunityCategory.class.php
@@ -43,12 +43,4 @@ public function getForm()
   {
     return new CommunityCategoryForm($this);
   }
-
-  public function getChildren()
-  {
-    $q = Doctrine::getTable('CommunityCategory')->getAllChildrenQuery();
-    $q->addWhere('tree_key = ?', $this->getId());
-
-    return $q->execute();
-  }
 }
diff --git a/lib/model/doctrine/CommunityCategoryTable.class.php b/lib/model/doctrine/CommunityCategoryTable.class.php
index dd3add399..016021cd6 100644
--- a/lib/model/doctrine/CommunityCategoryTable.class.php
+++ b/lib/model/doctrine/CommunityCategoryTable.class.php
@@ -17,20 +17,11 @@ public function retrieveAll()
   }
 
   //TODO: use getTree()->fetchRoots()
-  public function retrieveAllRoots($sort = true)
+  public function retrieveAllRoots()
   {
-    return $this->getAllRootsQuery($sort)->execute();
-  }
-
-  public function getAllRootsQuery($sort = true)
-  {
-    $q = $this->createQuery()->where('lft = 1');
-    if ($sort)
-    {
-      $q->orderBy('sort_order');
-    }
-
-    return $q;
+    return $this->createQuery()
+      ->where('lft = 1')
+      ->execute();
   }
 
   public function retrieveAllChildren($sort = true)
diff --git a/test/fixtures/common/test_data.yml b/test/fixtures/common/test_data.yml
index d5dd6d4dc..5b0d69b93 100644
--- a/test/fixtures/common/test_data.yml
+++ b/test/fixtures/common/test_data.yml
@@ -487,22 +487,16 @@ Community:
     name: "CommunityE"
 
 CommunityCategory:
-  community_category_1:
-    name: "コミュニティカテゴリA"
-    is_allow_member_community: 1
-    sort_order: 2
-
-  community_category_2:
-    name: "コミュニティカテゴリB"
+  community_category:
+    name: "コミュニティカテゴリ"
     is_allow_member_community: 1
-    sort_order: 1
 
-  community_category_3:
+  community_category_1:
     name: "CategoryA"
     tree_key: 1
     is_allow_member_community: 1
     sort_order: 2
-  community_category_4:
+  community_category_2:
     name: "CategoryB"
     tree_key: 1
     is_allow_member_community: 1
diff --git a/test/unit/model/doctrine/CommunityCategoryTableTest.php b/test/unit/model/doctrine/CommunityCategoryTableTest.php
index 095efe2c1..e0475c129 100644
--- a/test/unit/model/doctrine/CommunityCategoryTableTest.php
+++ b/test/unit/model/doctrine/CommunityCategoryTableTest.php
@@ -3,7 +3,7 @@
 include_once dirname(__FILE__) . '/../../../bootstrap/unit.php';
 include_once dirname(__FILE__) . '/../../../bootstrap/database.php';
 
-$t = new lime_test(13, new lime_output_color());
+$t = new lime_test(8, new lime_output_color());
 
 $table = Doctrine::getTable('CommunityCategory');
 
@@ -15,16 +15,6 @@
 //------------------------------------------------------------
 $t->diag('CommunityCategoryTable::retrieveAllRoots()');
 $t->isa_ok($table->retrieveAllRoots(), 'Doctrine_Collection');
-$categories = $table->retrieveAllRoots(false);
-$t->is($categories[0]->getSortOrder(), 2);
-$categories = $table->retrieveAllRoots(true);
-$t->is($categories[0]->getSortOrder(), 1);
-
-//------------------------------------------------------------
-$t->diag('CommunityCategoryTable::getAllRootsQuery()');
-$t->isa_ok($table->getAllRootsQuery(), 'opDoctrineQuery');
-$t->is($table->getAllRootsQuery(false)->getDql(), ' FROM CommunityCategory WHERE lft = 1');
-$t->is($table->getAllRootsQuery(true)->getDql(), ' FROM CommunityCategory WHERE lft = 1 ORDER BY sort_order');
 
 //------------------------------------------------------------
 $t->diag('CommunityCategoryTable::retrieveAllChildren()');
diff --git a/test/unit/model/doctrine/CommunityCategoryTest.php b/test/unit/model/doctrine/CommunityCategoryTest.php
index e134fbb5f..c873cc1b1 100644
--- a/test/unit/model/doctrine/CommunityCategoryTest.php
+++ b/test/unit/model/doctrine/CommunityCategoryTest.php
@@ -3,7 +3,7 @@
 include_once dirname(__FILE__) . '/../../../bootstrap/unit.php';
 include_once dirname(__FILE__) . '/../../../bootstrap/database.php';
 
-$t = new lime_test(9, new lime_output_color());
+$t = new lime_test(4, new lime_output_color());
 
 $communityCategory1 = Doctrine::getTable('CommunityCategory')->findOneByName('CategoryA');
 
@@ -28,14 +28,3 @@
 //------------------------------------------------------------
 $t->diag('CommunityCategory::getForm()');
 $t->isa_ok($communityCategory1->getForm(), 'CommunityCategoryForm');
-
-//------------------------------------------------------------
-$t->diag('CommunityCategory::getChildren()');
-$t->isa_ok($communityCategory1->getChildren(), 'Doctrine_Collection');
-$t->is(count($communityCategory1->getChildren()), 0);
-
-$communityCategory = Doctrine::getTable('CommunityCategory')->find(1);
-$category = $communityCategory->getChildren();
-$t->is(count($category), 2);
-$t->is($category[0]->getName(), 'CategoryB');
-$t->is($category[1]->getName(), 'CategoryA');

From a13fc1b7bbd8add9b7b7df8a13196569fe27ab2e Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Mon, 19 Mar 2012 18:54:07 +0900
Subject: [PATCH 012/630] Revert (#1453) "fixed to treat as English User when
 the language is not supported"

This reverts commit cae4f98c95d3e7a817d831bd6231f3aceabe8ed4.
---
 lib/config/opApplicationConfiguration.class.php | 6 +-----
 lib/i18n/opI18N.class.php                       | 3 ++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/config/opApplicationConfiguration.class.php b/lib/config/opApplicationConfiguration.class.php
index cacc32fcb..92b0d9173 100644
--- a/lib/config/opApplicationConfiguration.class.php
+++ b/lib/config/opApplicationConfiguration.class.php
@@ -215,15 +215,11 @@ public function filterTemplateParameters(sfEvent $event, $parameters)
 
     $table = Doctrine::getTable('SnsTerm');
     $application = sfConfig::get('sf_app');
-    if ($application == 'pc_backend')
+    if($application == 'pc_backend')
     {
         $application = 'pc_frontend';
     }
     $table->configure(sfContext::getInstance()->getUser()->getCulture(), $application);
-    if (!$table['member'])
-    {
-      $table->configure('en', $application);
-    }
     $parameters['op_term'] = $table;
     sfOutputEscaper::markClassAsSafe('SnsTermTable');
 
diff --git a/lib/i18n/opI18N.class.php b/lib/i18n/opI18N.class.php
index 58568ae4f..5f3bd9208 100644
--- a/lib/i18n/opI18N.class.php
+++ b/lib/i18n/opI18N.class.php
@@ -20,8 +20,9 @@ public function initialize(sfApplicationConfiguration $configuration, sfCache $c
   {
     parent::initialize($configuration, $cache, $options);
 
+    $this->terms = Doctrine::getTable('SnsTerm');
     $application = sfConfig::get('sf_app');
-    if ($application == 'pc_backend')
+    if($application == 'pc_backend')
     {
         $application = 'pc_frontend';
     }

From 1da810f144e79476114268aac3dbc3402d75c703 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 22 Mar 2012 21:17:16 +0900
Subject: [PATCH 013/630] updated the mobile_ip_address list. (fixes #2892)

---
 lib/config/config/mobile_ip_address.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/config/config/mobile_ip_address.yml b/lib/config/config/mobile_ip_address.yml
index 882c1aadc..e7c194337 100644
--- a/lib/config/config/mobile_ip_address.yml
+++ b/lib/config/config/mobile_ip_address.yml
@@ -10,20 +10,16 @@ docomo:
   - 202.229.177.0/24
   - 202.229.178.0/24
 
-# au (2010/12/24更新)
+# au (2012/03/22更新)
 # http://www.au.kddi.com/ezfactory/tec/spec/ezsava_ip.html
 ezweb:
   - 210.230.128.224/28
   - 121.111.227.160/27
-  - 61.117.1.0/28
   - 219.108.158.0/27
   - 219.125.146.0/28
   - 61.117.2.32/29
   - 61.117.2.40/29
   - 219.108.158.40/29
-  - 219.125.148.0/25
-  - 222.5.63.0/25
-  - 222.5.63.128/25
   - 222.5.62.128/25
   - 59.135.38.128/25
   - 219.108.157.0/25

From 586cf9a78df7a524eb8783f4b4232ee2f8296d2f Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 22 Mar 2012 21:20:36 +0900
Subject: [PATCH 014/630] version 3.7.0

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index fc3f088bc..9874d24f9 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.7.0-dev');
+  define('OPENPNE_VERSION', '3.7.0');
 }

From 427d48417ea9f5b93ca6743e7b8e2462c2bbe204 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 22 Mar 2012 21:27:18 +0900
Subject: [PATCH 015/630] tarted developing OpenPNE 3.7.1

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 9874d24f9..98ca5c05a 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.7.0');
+  define('OPENPNE_VERSION', '3.7.1-dev');
 }

From 422a18a4502adb8fcd627439215a885870c955d3 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 29 Mar 2012 12:42:16 +0900
Subject: [PATCH 016/630] started developing OpenPNE 3.8beta1

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 98ca5c05a..f92c3fb10 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.7.1-dev');
+  define('OPENPNE_VERSION', '3.8beta1-dev');
 }

From f6991781693e222595fd31a12c06fa2fc5259e54 Mon Sep 17 00:00:00 2001
From: Masato Nagasawa <nagasawa@tejimaya.com>
Date: Tue, 17 May 2011 16:51:51 +0900
Subject: [PATCH 017/630] fixed "IsTrim" option (fixes #2104)

---
 lib/config/config/sns_config.yml       | 8 ++++++++
 lib/util/opFormItemGenerator.class.php | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/config/config/sns_config.yml b/lib/config/config/sns_config.yml
index 7237cfbed..788be72b8 100644
--- a/lib/config/config/sns_config.yml
+++ b/lib/config/config/sns_config.yml
@@ -26,6 +26,7 @@ general:
     ValueType:  "email"
     Default:    "sns@example.com"
     IsRequired: true
+    IsTrim:     true
 
   enable_pc:
     Name:      "enable_pc"
@@ -33,6 +34,7 @@ general:
     FormType:  "radio"
     ValueType: "text"
     IsRequired: true
+    IsTrim:     true
     Default:    1
     Choices:
       - "使用しない"
@@ -44,6 +46,7 @@ general:
     FormType:  "radio"
     ValueType: "text"
     IsRequired: true
+    IsTrim:     true
     Default:    1
     Choices:
       - "使用しない"
@@ -67,6 +70,7 @@ general:
     ValueType:   "regexp"
     ValueRegexp: "/^[1-9]\d*[K|M]?$/"
     IsRequired:  true
+    IsTrim:      true
     Default:     "300K"
 
   daily_news_day:
@@ -189,6 +193,7 @@ external_login_page:
     ValueType: "text"
     Default:   ""
     IsRequired: false
+    IsTrim:   true
 
   external_mobile_login_url:
     Name:     "external_mobile_login_url"
@@ -198,6 +203,7 @@ external_login_page:
     ValueType: "text"
     Default:   ""
     IsRequired: false
+    IsTrim:   true
 
 authentication:
   _attributes:
@@ -303,6 +309,7 @@ api_keys:
     FormType:   "text"
     ValueType:  "string"
     IsRequired: false
+    IsTrim:     true
     Default:    ""
   google_AJAX_search_api_key:
     Name:       "google AJAX search api key"
@@ -310,4 +317,5 @@ api_keys:
     FormType:   "text"
     ValueType:  "string"
     IsRequired: false
+    IsTrim:     true
     Default:    ""
diff --git a/lib/util/opFormItemGenerator.class.php b/lib/util/opFormItemGenerator.class.php
index 70add4def..1194ea0d2 100644
--- a/lib/util/opFormItemGenerator.class.php
+++ b/lib/util/opFormItemGenerator.class.php
@@ -159,7 +159,7 @@ public static function generateWidget($field, $choices = array())
   public static function generateValidator($field, $choices = array())
   {
     $field = self::arrayKeyCamelize($field);
-    $option = array('required' => $field['IsRequired'], 'trim' => $field['IsRequired']);
+    $option = array('required' => $field['IsRequired'], 'trim' => $field['IsTrim']);
 
     if (!$choices && !empty($field['Choices']))
     {

From 5b1c8d4a6ce15463d6700ded9fb0487709e6c617 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 20 Oct 2011 15:15:54 +0900
Subject: [PATCH 018/630] correct wrong class name in sfImageHandlerPlugin
 (fixes #2228)

---
 .../lib/image/generator/sfImageGenerator.class.php              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGenerator.class.php b/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGenerator.class.php
index d7a99b5fb..65625a9ad 100644
--- a/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGenerator.class.php
+++ b/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGenerator.class.php
@@ -107,7 +107,7 @@ public function output($outputFilename)
       $currentUmask = umask(0000);
       if (false === @mkdir(dirname($outputFilename), 0777, true))
       {
-        throw new sfRuntimeException('Failed to make cache directory.');
+        throw new RuntimeException('Failed to make cache directory.');
       }
       umask($currentUmask);
     }

From c400cefb14d56e07e3e9aa73d25343a601749daa Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Tue, 17 Jan 2012 01:27:26 +0900
Subject: [PATCH 019/630] (fixes #2323) fixed to put links automatically when
 the text has whitespaces

---
 lib/helper/opUtilHelper.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/helper/opUtilHelper.php b/lib/helper/opUtilHelper.php
index ea0b57124..eb4c17465 100644
--- a/lib/helper/opUtilHelper.php
+++ b/lib/helper/opUtilHelper.php
@@ -313,7 +313,8 @@ function op_format_date($date, $format = 'd', $culture = null, $charset = null)
     (                       # leading text
       <\w+.*?>|             #   leading HTML tag, or
       [^=!:\'"/]|           #   leading punctuation, or
-      ^                     #   beginning of line
+      ^|                    #   beginning of line, or
+      \s?                   #   leading whitespaces
     )
     (
       (?:https?://)|        # protocol spec, or

From 274623fa9d217c663a17e0bc59e676c7a7b4ec0a Mon Sep 17 00:00:00 2001
From: Maki Takahashi <takahashi@tejimaya.com>
Date: Fri, 21 Oct 2011 16:06:17 +0900
Subject: [PATCH 020/630] (fixes #2417) added the max_length option for
 opValidatorPCMail and sfValidatorMobileEmail

---
 lib/validator/opValidatorPCEmail.class.php     | 6 ++++++
 lib/validator/sfValidatorMobileEmail.class.php | 1 +
 2 files changed, 7 insertions(+)

diff --git a/lib/validator/opValidatorPCEmail.class.php b/lib/validator/opValidatorPCEmail.class.php
index 53918f747..5d7e08b28 100644
--- a/lib/validator/opValidatorPCEmail.class.php
+++ b/lib/validator/opValidatorPCEmail.class.php
@@ -17,6 +17,12 @@
  */
 class opValidatorPCEmail extends sfValidatorEmail
 {
+  protected function configure($options = array(), $messages = array())
+  {
+    parent::configure($options, $messages);
+    $this->setOption('max_length', 320);
+  }
+
   /**
    * @see sfValidatorString
    */
diff --git a/lib/validator/sfValidatorMobileEmail.class.php b/lib/validator/sfValidatorMobileEmail.class.php
index 35b5fa3b4..c5b5dc40e 100644
--- a/lib/validator/sfValidatorMobileEmail.class.php
+++ b/lib/validator/sfValidatorMobileEmail.class.php
@@ -28,5 +28,6 @@ protected function configure($options = array(), $messages = array())
     $str = join('|', array_filter(opToolkit::getMobileMailAddressDomains(), $filter));
 
     $this->setOption('pattern', '/^([^@\s]+)@('.$str.')$/i');
+    $this->setOption('max_length', 320);
   }
 }

From 50656a2028c9f255adc7045200534757819ead35 Mon Sep 17 00:00:00 2001
From: Maki Takahashi <takahashi@tejimaya.com>
Date: Mon, 24 Oct 2011 17:37:53 +0900
Subject: [PATCH 021/630] (fixes #2488) changed error level of
 opDeprecatedRoute's log from ERR to NOTICE

---
 lib/routing/opDeprecatedRoute.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/routing/opDeprecatedRoute.class.php b/lib/routing/opDeprecatedRoute.class.php
index 86d6ae00c..500a859fd 100644
--- a/lib/routing/opDeprecatedRoute.class.php
+++ b/lib/routing/opDeprecatedRoute.class.php
@@ -27,7 +27,7 @@ public function matchesUrl($url, $context = array())
 
     $message = array(
       'This routing rule is deprecated. Please use other rules instead of this.',
-      'priority' => sfLogger::ERR,
+      'priority' => sfLogger::NOTICE,
     );
 
     if (sfContext::hasInstance())

From 64ede427d2d4a00dbefc5b84f465727c91f6eb7d Mon Sep 17 00:00:00 2001
From: mtakai <m.takai@tejimaya.com>
Date: Wed, 19 Oct 2011 15:00:59 +0900
Subject: [PATCH 022/630] (fixes #2516) fixed factories.yml for pc_backend not
 to cause warning

---
 apps/pc_backend/config/factories.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/apps/pc_backend/config/factories.yml b/apps/pc_backend/config/factories.yml
index 21cc1657b..0b9b2a4fd 100644
--- a/apps/pc_backend/config/factories.yml
+++ b/apps/pc_backend/config/factories.yml
@@ -92,13 +92,7 @@ all:
       debug:                false
       untranslated_prefix:  "[T]"
       untranslated_suffix:  "[/T]"
-      cache:
-        class: sfFileCache
-        param:
-          automatic_cleaning_factor: 0
-          cache_dir:                 %SF_I18N_CACHE_DIR%
-          lifetime:                  86400
-          prefix:                    %SF_APP_DIR%
+      cache: ~
 
   routing:
     class: sfPatternRouting

From bebacd50ccf0ba7cdd65676a58b094058274a2be Mon Sep 17 00:00:00 2001
From: mtakai <m.takai@tejimaya.com>
Date: Fri, 18 Nov 2011 22:55:02 +0900
Subject: [PATCH 023/630] (fixes #2516) fixed factories.yml for mobile_frontend
 not to cause warning

---
 apps/mobile_frontend/config/factories.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/apps/mobile_frontend/config/factories.yml b/apps/mobile_frontend/config/factories.yml
index bc25a5b4b..5742d6620 100644
--- a/apps/mobile_frontend/config/factories.yml
+++ b/apps/mobile_frontend/config/factories.yml
@@ -93,13 +93,7 @@ all:
       debug:                false
       untranslated_prefix:  "[T]"
       untranslated_suffix:  "[/T]"
-      cache:
-        class: sfFileCache
-        param:
-          automatic_cleaning_factor: 0
-          cache_dir:                 %SF_I18N_CACHE_DIR%
-          lifetime:                  86400
-          prefix:                    %SF_APP_DIR%
+      cache: ~
 
   routing:
     class: sfPatternRouting

From 6a707421a63695a22ccf8e358144538bf8bf20a7 Mon Sep 17 00:00:00 2001
From: Shogo Kawahara <kawahara@bucyou.net>
Date: Fri, 25 Nov 2011 22:09:30 +0900
Subject: [PATCH 024/630] fixed factries.yml for pc_frontend, because test
 can't pass by the response's  configuration (fixes #2618)

---
 apps/pc_frontend/config/factories.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/pc_frontend/config/factories.yml b/apps/pc_frontend/config/factories.yml
index 3a2758cc5..9501123c3 100644
--- a/apps/pc_frontend/config/factories.yml
+++ b/apps/pc_frontend/config/factories.yml
@@ -15,7 +15,7 @@ cli:
 
 test:
   response:
-    class: sfWebResponse
+    class: opWebResponse
     param:
       send_http_headers: false
 

From 9b81fb9edc73633f112d7e5803d46fa6be0ca583 Mon Sep 17 00:00:00 2001
From: Masato Nagasawa <nagasawa@tejimaya.com>
Date: Tue, 21 Dec 2010 22:24:02 +0900
Subject: [PATCH 025/630] fixed supported sortable of the community category
 (fixes #1591)

---
 .../community/actions/actions.class.php       | 36 +++++++++++++++++++
 .../community/templates/_categoryListForm.php | 14 ++++++--
 .../templates/categoryListSuccess.php         |  6 +++-
 .../doctrine/CommunityCategory.class.php      |  8 +++++
 .../doctrine/CommunityCategoryTable.class.php | 17 ++++++---
 test/fixtures/common/test_data.yml            | 14 +++++---
 .../doctrine/CommunityCategoryTableTest.php   | 12 ++++++-
 .../model/doctrine/CommunityCategoryTest.php  | 13 ++++++-
 8 files changed, 107 insertions(+), 13 deletions(-)

diff --git a/apps/pc_backend/modules/community/actions/actions.class.php b/apps/pc_backend/modules/community/actions/actions.class.php
index 5abe5cb7c..65ea8b76b 100644
--- a/apps/pc_backend/modules/community/actions/actions.class.php
+++ b/apps/pc_backend/modules/community/actions/actions.class.php
@@ -236,4 +236,40 @@ public function executeCategoryDelete(sfWebRequest $request)
     $this->getUser()->setFlash('notice', 'Deleted.');
     $this->redirect('community/categoryList');
   }
+
+  /**
+   * Executes categorySort action
+   *
+   * @param sfWebRequest $request A request object
+   */
+  public function executeCategorySort(sfWebRequest $request)
+  {
+    if (!$request->isXmlHttpRequest())
+    {
+      $this->forward404();
+    }
+
+    $request->checkCSRFProtection();
+
+    $parameters = $request->getParameterHolder();
+    $keys = $parameters->getNames();
+    foreach ($keys as $key)
+    {
+      if (strpos($key, 'type_') === 0)
+      {
+        $order = $parameters->get($key);
+        for ($i = 0; $i < count($order); $i++)
+        {
+          $category = Doctrine::getTable('CommunityCategory')->find($order[$i]);
+          if ($category)
+          {
+            $category->setSortOrder($i * 10);
+            $category->save();
+          }
+        }
+        break;
+      }
+    }
+    return sfView::NONE;
+  }
 }
diff --git a/apps/pc_backend/modules/community/templates/_categoryListForm.php b/apps/pc_backend/modules/community/templates/_categoryListForm.php
index 8bd374c65..12fcc5463 100644
--- a/apps/pc_backend/modules/community/templates/_categoryListForm.php
+++ b/apps/pc_backend/modules/community/templates/_categoryListForm.php
@@ -1,4 +1,4 @@
-<table>
+<table id="type_<?php echo $type ?>">
 <tr>
 <th><?php echo $form['name']->renderLabel() ?></th>
 <?php if (empty($forceAllowUserCommunity)) : ?>
@@ -9,9 +9,10 @@
 
 <?php if ($categories): ?>
 <?php foreach ($categories as $category): ?>
+<tbody id="type_<?php echo $type ?>_<?php echo $category->getId() ?>" class="sortable" style="position: relative;">
+<tr>
 <form action="<?php echo url_for('community/categoryEdit?id='.$category->getId()) ?>" method="post">
 <?php echo $category->getForm()->renderGlobalErrors() ?>
-<tr>
 <?php foreach ($category->getForm() as $key => $row) : ?>
 <?php if (!$row->isHidden()) : ?>
 <?php if (empty($forceAllowUserCommunity) || $key != 'is_allow_member_community') : ?>
@@ -34,6 +35,7 @@
 </form>
 </td>
 </tr>
+</tbody>
 <?php endforeach; ?>
 <?php endif; ?>
 
@@ -58,3 +60,11 @@
 </form>
 
 </table>
+
+<?php $form = new BaseForm() ?>
+<?php echo sortable_element('type_'.$type, array(
+  'tag'  => 'tbody',
+  'only' => 'sortable',
+  'url'  => 'community/categorySort',
+  'with' => 'Sortable.serialize("type_'.$type.'")+"&'.urlencode($form->getCSRFFieldName()).'='.urlencode($form->getCSRFToken()).'"',
+)) ?>
diff --git a/apps/pc_backend/modules/community/templates/categoryListSuccess.php b/apps/pc_backend/modules/community/templates/categoryListSuccess.php
index 43a8464ea..fd414bdc6 100644
--- a/apps/pc_backend/modules/community/templates/categoryListSuccess.php
+++ b/apps/pc_backend/modules/community/templates/categoryListSuccess.php
@@ -2,12 +2,15 @@
 <?php include_partial('submenu') ?>
 <?php end_slot() ?>
 
+<?php use_helper('Javascript'); ?>
+
 <?php slot('title', __('%Community% Category Configuration')); ?>
 
 <p><?php echo __('If you uncheck "Is allow Member %community%", only the member who has id 1 can make %community% of the category.') ?></p>
 
 <h3><?php echo __('Big Category') ?></h3>
 <?php include_partial('categoryListForm', array(
+  'type'                    => 'big',
   'form'                    => $rootForm,
   'forceAllowUserCommunity' => true,
   'categories'              => $categories,
@@ -18,8 +21,9 @@
 <?php foreach ($categories as $category): ?>
 <h4><?php echo $category ?></h4>
 <?php include_partial('categoryListForm', array(
+  'type'       => 'small'.$category->getId(),
   'form'       => $categoryForms[$category->getId()],
-  'categories' => $category->getNode()->getChildren(),
+  'categories' => $category->getChildren(),
   'deleteForm' => $deleteForm,
 )) ?>
 <?php endforeach; ?>
diff --git a/lib/model/doctrine/CommunityCategory.class.php b/lib/model/doctrine/CommunityCategory.class.php
index 09c967feb..082525f32 100644
--- a/lib/model/doctrine/CommunityCategory.class.php
+++ b/lib/model/doctrine/CommunityCategory.class.php
@@ -43,4 +43,12 @@ public function getForm()
   {
     return new CommunityCategoryForm($this);
   }
+
+  public function getChildren()
+  {
+    $q = Doctrine::getTable('CommunityCategory')->getAllChildrenQuery();
+    $q->addWhere('tree_key = ?', $this->getId());
+
+    return $q->execute();
+  }
 }
diff --git a/lib/model/doctrine/CommunityCategoryTable.class.php b/lib/model/doctrine/CommunityCategoryTable.class.php
index 016021cd6..dd3add399 100644
--- a/lib/model/doctrine/CommunityCategoryTable.class.php
+++ b/lib/model/doctrine/CommunityCategoryTable.class.php
@@ -17,11 +17,20 @@ public function retrieveAll()
   }
 
   //TODO: use getTree()->fetchRoots()
-  public function retrieveAllRoots()
+  public function retrieveAllRoots($sort = true)
   {
-    return $this->createQuery()
-      ->where('lft = 1')
-      ->execute();
+    return $this->getAllRootsQuery($sort)->execute();
+  }
+
+  public function getAllRootsQuery($sort = true)
+  {
+    $q = $this->createQuery()->where('lft = 1');
+    if ($sort)
+    {
+      $q->orderBy('sort_order');
+    }
+
+    return $q;
   }
 
   public function retrieveAllChildren($sort = true)
diff --git a/test/fixtures/common/test_data.yml b/test/fixtures/common/test_data.yml
index 5b0d69b93..d5dd6d4dc 100644
--- a/test/fixtures/common/test_data.yml
+++ b/test/fixtures/common/test_data.yml
@@ -487,16 +487,22 @@ Community:
     name: "CommunityE"
 
 CommunityCategory:
-  community_category:
-    name: "コミュニティカテゴリ"
+  community_category_1:
+    name: "コミュニティカテゴリA"
     is_allow_member_community: 1
+    sort_order: 2
 
-  community_category_1:
+  community_category_2:
+    name: "コミュニティカテゴリB"
+    is_allow_member_community: 1
+    sort_order: 1
+
+  community_category_3:
     name: "CategoryA"
     tree_key: 1
     is_allow_member_community: 1
     sort_order: 2
-  community_category_2:
+  community_category_4:
     name: "CategoryB"
     tree_key: 1
     is_allow_member_community: 1
diff --git a/test/unit/model/doctrine/CommunityCategoryTableTest.php b/test/unit/model/doctrine/CommunityCategoryTableTest.php
index e0475c129..095efe2c1 100644
--- a/test/unit/model/doctrine/CommunityCategoryTableTest.php
+++ b/test/unit/model/doctrine/CommunityCategoryTableTest.php
@@ -3,7 +3,7 @@
 include_once dirname(__FILE__) . '/../../../bootstrap/unit.php';
 include_once dirname(__FILE__) . '/../../../bootstrap/database.php';
 
-$t = new lime_test(8, new lime_output_color());
+$t = new lime_test(13, new lime_output_color());
 
 $table = Doctrine::getTable('CommunityCategory');
 
@@ -15,6 +15,16 @@
 //------------------------------------------------------------
 $t->diag('CommunityCategoryTable::retrieveAllRoots()');
 $t->isa_ok($table->retrieveAllRoots(), 'Doctrine_Collection');
+$categories = $table->retrieveAllRoots(false);
+$t->is($categories[0]->getSortOrder(), 2);
+$categories = $table->retrieveAllRoots(true);
+$t->is($categories[0]->getSortOrder(), 1);
+
+//------------------------------------------------------------
+$t->diag('CommunityCategoryTable::getAllRootsQuery()');
+$t->isa_ok($table->getAllRootsQuery(), 'opDoctrineQuery');
+$t->is($table->getAllRootsQuery(false)->getDql(), ' FROM CommunityCategory WHERE lft = 1');
+$t->is($table->getAllRootsQuery(true)->getDql(), ' FROM CommunityCategory WHERE lft = 1 ORDER BY sort_order');
 
 //------------------------------------------------------------
 $t->diag('CommunityCategoryTable::retrieveAllChildren()');
diff --git a/test/unit/model/doctrine/CommunityCategoryTest.php b/test/unit/model/doctrine/CommunityCategoryTest.php
index c873cc1b1..e134fbb5f 100644
--- a/test/unit/model/doctrine/CommunityCategoryTest.php
+++ b/test/unit/model/doctrine/CommunityCategoryTest.php
@@ -3,7 +3,7 @@
 include_once dirname(__FILE__) . '/../../../bootstrap/unit.php';
 include_once dirname(__FILE__) . '/../../../bootstrap/database.php';
 
-$t = new lime_test(4, new lime_output_color());
+$t = new lime_test(9, new lime_output_color());
 
 $communityCategory1 = Doctrine::getTable('CommunityCategory')->findOneByName('CategoryA');
 
@@ -28,3 +28,14 @@
 //------------------------------------------------------------
 $t->diag('CommunityCategory::getForm()');
 $t->isa_ok($communityCategory1->getForm(), 'CommunityCategoryForm');
+
+//------------------------------------------------------------
+$t->diag('CommunityCategory::getChildren()');
+$t->isa_ok($communityCategory1->getChildren(), 'Doctrine_Collection');
+$t->is(count($communityCategory1->getChildren()), 0);
+
+$communityCategory = Doctrine::getTable('CommunityCategory')->find(1);
+$category = $communityCategory->getChildren();
+$t->is(count($category), 2);
+$t->is($category[0]->getName(), 'CategoryB');
+$t->is($category[1]->getName(), 'CategoryA');

From 0021f0b7656bae96b6cd63992f93c65b5700c552 Mon Sep 17 00:00:00 2001
From: Masato Nagasawa <nagasawa@tejimaya.com>
Date: Mon, 16 May 2011 15:50:00 +0900
Subject: [PATCH 026/630] added the image max size of the mobile to the
 pc_backend (refs #2089)

---
 .../templates/configImageSuccess.php          |  2 +-
 .../templates/deleteImageSuccess.php          |  2 +-
 .../friend/templates/showImageSuccess.php     |  2 +-
 .../member/templates/configImageSuccess.php   |  2 +-
 .../member/templates/deleteImageSuccess.php   |  2 +-
 apps/pc_backend/i18n/messages.ja.xml          |  4 ++
 lib/config/config/sns_config.yml              |  8 ++++
 lib/util/opFormItemGenerator.class.php        |  3 ++
 lib/validator/opValidatorImageSize.class.php  | 43 +++++++++++++++++++
 9 files changed, 63 insertions(+), 5 deletions(-)
 create mode 100644 lib/validator/opValidatorImageSize.class.php

diff --git a/apps/mobile_frontend/modules/community/templates/configImageSuccess.php b/apps/mobile_frontend/modules/community/templates/configImageSuccess.php
index 0a1b272cf..7cc934247 100644
--- a/apps/mobile_frontend/modules/community/templates/configImageSuccess.php
+++ b/apps/mobile_frontend/modules/community/templates/configImageSuccess.php
@@ -3,7 +3,7 @@
 <?php if ($community->getImageFileName()): ?>
 <?php echo op_image_tag_sf_image($community->getFile(), array('size' => '120x120', 'format' => 'jpg')) ?><br>
 <?php echo sprintf('[%s | %s]',
-  link_to(__('Expansion'), sf_image_path($community->getFile(), array('size' => '320x320', 'format' => 'jpg'))),
+  link_to(__('Expansion'), sf_image_path($community->getFile(), array('size' => opConfig::get('mobile_image_max_size'), 'format' => 'jpg'))),
   link_to(__('Delete'), '@community_deleteImage?id='.$community->getId())
 ) ?>
 <br><br>
diff --git a/apps/mobile_frontend/modules/community/templates/deleteImageSuccess.php b/apps/mobile_frontend/modules/community/templates/deleteImageSuccess.php
index c47219918..842ada04e 100644
--- a/apps/mobile_frontend/modules/community/templates/deleteImageSuccess.php
+++ b/apps/mobile_frontend/modules/community/templates/deleteImageSuccess.php
@@ -3,7 +3,7 @@
 <hr color="<?php echo $op_color["core_color_12"] ?>">
 <center>
 <?php echo op_image_tag_sf_image($community->getImageFileName(), array('size' => '120x120', 'format' => 'jpg')) ?><br>
-<?php echo sprintf('[%s]',link_to(__('Expansion'), sf_image_path($community->getImageFileName(), array('size' => '320x320', 'format' => 'jpg')))) ?><br>
+<?php echo sprintf('[%s]',link_to(__('Expansion'), sf_image_path($community->getImageFileName(), array('size' => opConfig::get('mobile_image_max_size'), 'format' => 'jpg')))) ?><br>
 </center>
 <hr color="<?php echo $op_color["core_color_12"] ?>">
 <?php op_include_form('deleteForm', $form, array(
diff --git a/apps/mobile_frontend/modules/friend/templates/showImageSuccess.php b/apps/mobile_frontend/modules/friend/templates/showImageSuccess.php
index 6990471e6..ae4de0511 100644
--- a/apps/mobile_frontend/modules/friend/templates/showImageSuccess.php
+++ b/apps/mobile_frontend/modules/friend/templates/showImageSuccess.php
@@ -4,7 +4,7 @@
 <?php for ($i = 0; $i < 3 && $i < count($images); $i++) : ?>
 <?php $image = $images[$i] ?>
 <?php echo op_image_tag_sf_image($image->getFile(), array('size' => '120x120', 'format' => 'jpg')) ?><br>
-<?php echo '['.link_to(__('Expansion'), sf_image_path($image->getFile(), array('size' => '320x320', 'format' => 'jpg'))).']' ?><br><br>
+<?php echo '['.link_to(__('Expansion'), sf_image_path($image->getFile(), array('size' => opConfig::get('mobile_image_max_size'), 'format' => 'jpg'))).']' ?><br><br>
 <?php endfor; ?>
 </center>
 <?php slot('op_mobile_footer_menu') ?>
diff --git a/apps/mobile_frontend/modules/member/templates/configImageSuccess.php b/apps/mobile_frontend/modules/member/templates/configImageSuccess.php
index a2c05cae0..f27bc9853 100644
--- a/apps/mobile_frontend/modules/member/templates/configImageSuccess.php
+++ b/apps/mobile_frontend/modules/member/templates/configImageSuccess.php
@@ -7,7 +7,7 @@
 <?php $csrfToken = '&'.$form->getCSRFFieldName().'='.$form->getCSRFToken() ?>
 <?php foreach ($images as $image) : ?>
 <?php echo op_image_tag_sf_image($image->getFile(), array('size' => '120x120', 'format' => 'jpg')) ?><br>
-<?php echo sprintf('[%s]',link_to(__('Expansion'), sf_image_path($image->getFile(), array('size' => '320x320', 'format' => 'jpg')))) ?><br>
+<?php echo sprintf('[%s]',link_to(__('Expansion'), sf_image_path($image->getFile(), array('size' => opConfig::get('mobile_image_max_size'), 'format' => 'jpg')))) ?><br>
 <?php 
 if ($image->getIsPrimary())
 {
diff --git a/apps/mobile_frontend/modules/member/templates/deleteImageSuccess.php b/apps/mobile_frontend/modules/member/templates/deleteImageSuccess.php
index 764736b57..52e09f654 100644
--- a/apps/mobile_frontend/modules/member/templates/deleteImageSuccess.php
+++ b/apps/mobile_frontend/modules/member/templates/deleteImageSuccess.php
@@ -3,7 +3,7 @@
 <hr color="<?php echo $op_color["core_color_12"] ?>">
 <center>
 <?php echo op_image_tag_sf_image($image->getFile(), array('size' => '120x120', 'format' => 'jpg')) ?><br>
-<?php echo sprintf('[%s]',link_to(__('Expansion'), sf_image_path($image->getFile(), array('size' => '320x320', 'format' => 'jpg')))) ?><br>
+<?php echo sprintf('[%s]',link_to(__('Expansion'), sf_image_path($image->getFile(), array('size' => opConfig::get('mobile_image_max_size'), 'format' => 'jpg')))) ?><br>
 </center>
 <hr color="<?php echo $op_color["core_color_12"] ?>">
 <?php op_include_form('deleteForm', $form, array(
diff --git a/apps/pc_backend/i18n/messages.ja.xml b/apps/pc_backend/i18n/messages.ja.xml
index 761379e85..f36bb24df 100644
--- a/apps/pc_backend/i18n/messages.ja.xml
+++ b/apps/pc_backend/i18n/messages.ja.xml
@@ -1445,6 +1445,10 @@
         <source>Are you sure you want to delete this %community%?</source>
         <target>本当にこの%community%を削除してもよろしいですか？</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>Not allowed</source>
+        <target>許可されていません。</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/lib/config/config/sns_config.yml b/lib/config/config/sns_config.yml
index 788be72b8..b26fe8e4b 100644
--- a/lib/config/config/sns_config.yml
+++ b/lib/config/config/sns_config.yml
@@ -258,6 +258,14 @@ mobile:
     Choices:
       1: "携帯電話のIP帯域をチェックする"
       0: "携帯電話のIP帯域をチェックしない"
+  mobile_image_max_size:
+    Name:        "mobile_image_max_size"
+    Caption:     "画像の最大サイズ設定"
+    Help:        "許可されている画像サイズを\"横x縦\"で指定してください。<br />(空欄の場合フルサイズになります)"
+    FormType:    "input"
+    ValueType:   "image_size"
+    IsRequired:  false
+    Default:     "320x320"
 
 policy:
   _attributes:
diff --git a/lib/util/opFormItemGenerator.class.php b/lib/util/opFormItemGenerator.class.php
index 1194ea0d2..1895c2f9b 100644
--- a/lib/util/opFormItemGenerator.class.php
+++ b/lib/util/opFormItemGenerator.class.php
@@ -261,6 +261,9 @@ public static function generateValidator($field, $choices = array())
       case 'password':
         $obj = new sfValidatorPassword($option);
         break;
+      case 'image_size':
+        $obj = new opValidatorImageSize($option);
+        break;
       case 'pass':
         $obj = new sfValidatorPass($option);
         break;
diff --git a/lib/validator/opValidatorImageSize.class.php b/lib/validator/opValidatorImageSize.class.php
new file mode 100644
index 000000000..6bfc2c9ac
--- /dev/null
+++ b/lib/validator/opValidatorImageSize.class.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * opValidatorImageFile validates a date
+ *
+ * @package    OpenPNE
+ * @subpackage validator
+ * @author     Masato Nagasawa <nagasawa@tejimaya.com>
+ */
+class opValidatorImageSize extends opValidatorString
+{
+  protected function configure($options = array(), $messages = array())
+  {
+    parent::configure($options, $messages);
+
+    $this->setOption('ltrim', true);
+    $this->setOption('rtrim', true);
+  }
+
+  protected function doClean($value)
+  {
+    $value = parent::doClean($value);
+    if ($this->isEmpty($value))
+    {
+      return $this->getEmptyValue();
+    }
+
+    if (!in_array($value, sfImageHandler::getAllowedSize()))
+    {
+      throw new sfValidatorError($this, 'Not allowed');
+    }
+
+    return $value;
+  }
+}

From c3d3433bb5e97ab1f2df59022d9f4419e503b7cb Mon Sep 17 00:00:00 2001
From: Masato Nagasawa <nagasawa@tejimaya.com>
Date: Mon, 16 May 2011 16:26:55 +0900
Subject: [PATCH 027/630] fixed description of class file (fixes #2089)

---
 lib/validator/opValidatorImageSize.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/validator/opValidatorImageSize.class.php b/lib/validator/opValidatorImageSize.class.php
index 6bfc2c9ac..04e24c655 100644
--- a/lib/validator/opValidatorImageSize.class.php
+++ b/lib/validator/opValidatorImageSize.class.php
@@ -9,7 +9,7 @@
  */
 
 /**
- * opValidatorImageFile validates a date
+ * opValidatorImageSize validates a image size
  *
  * @package    OpenPNE
  * @subpackage validator

From 8eccb9ab0313aa42cad51b453c4dbbb31f8c791f Mon Sep 17 00:00:00 2001
From: mtakai <m.takai@tejimaya.com>
Date: Thu, 14 Jul 2011 22:26:58 +0900
Subject: [PATCH 028/630] (fixes #2275) use option 'date_format_range_error' in
 opValidatorDate

---
 lib/util/opFormItemGenerator.class.php  | 1 +
 lib/validator/opValidatorDate.class.php | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/util/opFormItemGenerator.class.php b/lib/util/opFormItemGenerator.class.php
index 1895c2f9b..ea2ac2abe 100644
--- a/lib/util/opFormItemGenerator.class.php
+++ b/lib/util/opFormItemGenerator.class.php
@@ -233,6 +233,7 @@ public static function generateValidator($field, $choices = array())
 
     if ($field['FormType'] === 'date')
     {
+      $option['date_format_range_error'] = 'Y-m-d';
       $obj = new opValidatorDate($option);
       return $obj;
     }
diff --git a/lib/validator/opValidatorDate.class.php b/lib/validator/opValidatorDate.class.php
index cfc3bb976..cc82bf438 100644
--- a/lib/validator/opValidatorDate.class.php
+++ b/lib/validator/opValidatorDate.class.php
@@ -56,7 +56,7 @@ protected function doClean($value)
       $max = new DateTime($this->getOption('max'));
       if ($max && $clean->format('U') > $max->format('U'))
       {
-        throw new sfValidatorError($this, 'max', array('max' => $max->format('Y-m-d')));
+        throw new sfValidatorError($this, 'max', array('max' => $max->format($this->getOption('date_format_range_error'))));
       }
     }
 
@@ -65,7 +65,7 @@ protected function doClean($value)
       $min = new DateTime($this->getOption('min'));
       if ($min && $clean->format('U') < $min->format('U'))
       {
-        throw new sfValidatorError($this, 'min', array('min' => $min->format('Y-m-d')));
+        throw new sfValidatorError($this, 'min', array('min' => $min->format($this->getOption('date_format_range_error'))));
       }
     }
 

From 681ae12ea344193544a6cbd476e9b4fbbce19e1a Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Tue, 27 Mar 2012 14:56:27 +0900
Subject: [PATCH 029/630] fix coding style issue (fixes #2275)

---
 lib/util/opFormItemGenerator.class.php | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/lib/util/opFormItemGenerator.class.php b/lib/util/opFormItemGenerator.class.php
index ea2ac2abe..e5a5b4fc0 100644
--- a/lib/util/opFormItemGenerator.class.php
+++ b/lib/util/opFormItemGenerator.class.php
@@ -71,7 +71,7 @@ public static function generateWidget($field, $choices = array())
 
     if (in_array($field['FormType'], self::$choicesType))
     {
-      if ($field['FormType'] === 'select')
+      if ('select' === $field['FormType'])
       {
         if (!$field['IsRequired'])
         {
@@ -151,6 +151,7 @@ public static function generateWidget($field, $choices = array())
         break;
       default:
         $obj = new sfWidgetFormInput($params);
+        break;
     }
 
     return $obj;
@@ -166,22 +167,24 @@ public static function generateValidator($field, $choices = array())
       $choices = array_keys($field['Choices']);
     }
 
-    if ($field['FormType'] === 'checkbox')
+    if ('checkbox' === $field['FormType'])
     {
       $option['choices'] = $choices;
       $option['multiple'] = true;
       $obj = new sfValidatorChoice($option);
+
       return $obj;
     }
-    if ($field['FormType'] === 'select' || $field['FormType'] === 'radio')
+    if ('select' === $field['FormType'] || 'radio' === $field['FormType'])
     {
       $option = array('choices' => $choices);
       $option['required'] = $field['IsRequired'];
       $obj = new sfValidatorChoice($option);
+
       return $obj;
     }
 
-    if ($field['ValueType'] === 'integer')
+    if ('integer' === $field['ValueType'])
     {
       if (isset($field['ValueMin']) && is_numeric($field['ValueMin']))
       {
@@ -197,7 +200,7 @@ public static function generateValidator($field, $choices = array())
         }
       }
     }
-    elseif ($field['FormType'] === 'date')
+    elseif ('date' === $field['FormType'])
     {
       if (isset($field['ValueMin']) && false !== strtotime($field['ValueMin']))
       {
@@ -231,10 +234,11 @@ public static function generateValidator($field, $choices = array())
       }
     }
 
-    if ($field['FormType'] === 'date')
+    if ('date' === $field['FormType'])
     {
       $option['date_format_range_error'] = 'Y-m-d';
       $obj = new opValidatorDate($option);
+
       return $obj;
     }
 
@@ -270,6 +274,7 @@ public static function generateValidator($field, $choices = array())
         break;
       default:
         $obj = new opValidatorString($option);
+        break;
     }
 
     return $obj;
@@ -334,6 +339,7 @@ public static function generateSearchWidget($field, $choices = array())
       // text and something else
       default:
         $obj = new sfWidgetFormInput($params);
+        break;
     }
 
     return $obj;
@@ -376,6 +382,7 @@ public static function filterSearchQuery($q, $column, $value, $field)
       // text and something else
       default:
         $q->andWhereLike($column, $value);
+        break;
     }
 
     return $q;

From 018a9eb6e8e3de0b3e7389f6ad0794a174a911b5 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Sun, 11 Dec 2011 14:42:27 +0900
Subject: [PATCH 030/630] add layouts for smartphone (refs #2227)

---
 apps/pc_frontend/templates/_tosaka.php        |   11 +
 apps/pc_frontend/templates/smtLayoutGroup.php |   44 +
 apps/pc_frontend/templates/smtLayoutHome.php  |   47 +
 .../pc_frontend/templates/smtLayoutMember.php |   50 +
 apps/pc_frontend/templates/smtLayoutSns.php   |   52 +
 lib/response/opWebResponse.class.php          |   24 +
 web/css/bootstrap.css                         | 2467 +++++++++++++++++
 web/css/smt_main.css                          |  147 +
 web/images/HomeIcon.png                       |  Bin 0 -> 47837 bytes
 web/images/LOGO.png                           |  Bin 0 -> 45618 bytes
 web/images/NOTIFY_CENTER.png                  |  Bin 0 -> 64292 bytes
 web/images/POST.png                           |  Bin 0 -> 59820 bytes
 12 files changed, 2842 insertions(+)
 create mode 100644 apps/pc_frontend/templates/_tosaka.php
 create mode 100644 apps/pc_frontend/templates/smtLayoutGroup.php
 create mode 100644 apps/pc_frontend/templates/smtLayoutHome.php
 create mode 100644 apps/pc_frontend/templates/smtLayoutMember.php
 create mode 100644 apps/pc_frontend/templates/smtLayoutSns.php
 create mode 100644 web/css/bootstrap.css
 create mode 100644 web/css/smt_main.css
 create mode 100644 web/images/HomeIcon.png
 create mode 100644 web/images/LOGO.png
 create mode 100644 web/images/NOTIFY_CENTER.png
 create mode 100644 web/images/POST.png

diff --git a/apps/pc_frontend/templates/_tosaka.php b/apps/pc_frontend/templates/_tosaka.php
new file mode 100644
index 000000000..24b5580e0
--- /dev/null
+++ b/apps/pc_frontend/templates/_tosaka.php
@@ -0,0 +1,11 @@
+<div id="slot_tosaka">
+  <div class="row">
+    <div class="span12">
+      <div class="row">
+        <div class="span4"><?php echo link_to(op_image_tag('LOGO.png', array('height' => '32', 'class' => 'menubutton')), '@homepage') ?></div>
+        <div class="span4 center"><?php echo op_image_tag('NOTIFY_CENTER.png', array('height' => '32', 'class' => 'ncbutton')) ?></div>
+        <div class="span3 offset1 center"><?php echo op_image_tag('POST.png', array('height' => '32', 'class' =>'postbutton')) ?></div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/apps/pc_frontend/templates/smtLayoutGroup.php b/apps/pc_frontend/templates/smtLayoutGroup.php
new file mode 100644
index 000000000..443cf5ddb
--- /dev/null
+++ b/apps/pc_frontend/templates/smtLayoutGroup.php
@@ -0,0 +1,44 @@
+<?php use_helper('Javascript') ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
+<head>
+<?php include_http_metas() ?>
+<?php include_metas() ?>
+<?php include_title() ?>
+<?php use_stylesheet('bootstrap') ?>
+<?php use_stylesheet('smt_main') ?>
+<?php include_stylesheets() ?>
+<?php if (Doctrine::getTable('SnsConfig')->get('customizing_css')): ?>
+<link rel="stylesheet" type="text/css" href="<?php echo url_for('@customizing_css') ?>" />
+<?php endif ?>
+<meta name="viewport" content="width=320px,user-scalable=no" />
+<?php
+$json = array(
+  'apiKey' => $sf_user->getMemberApiKey(),
+  'apiBase' => app_url_for('api', 'homepage'),
+);
+
+echo javascript_tag('
+var openpne = '.json_encode($json, defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0).';
+')
+?>
+<?php use_javascript('jquery.min.js') ?>
+<?php include_javascripts() ?>
+</head>
+<body id="<?php printf('page_%s_%s', $this->getModuleName(), $this->getActionName()) ?>" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
+<?php include_partial('global/tosaka') ?>
+<div id="face" class="row">
+  <?php $community = $sf_response->getDisplayCommunity() ?>
+  <?php if ($community): ?>
+  <div class="span2">
+    <?php echo op_image_tag_sf_image($community->getImageFileName(), array('size' => '48x48')) ?>
+  </div>
+  <div class="span8">
+    <div class="row face-name"><?php echo $community->getName() ?></div>
+  </div>
+  <div class="span2 center"><?php echo link_to(op_image_tag('HomeIcon.png', array('height' => '48')), '@homepage') ?></div>
+  <?php endif ?>
+</div>
+<?php echo $sf_content ?>
+</body>
+</html>
diff --git a/apps/pc_frontend/templates/smtLayoutHome.php b/apps/pc_frontend/templates/smtLayoutHome.php
new file mode 100644
index 000000000..11d734c16
--- /dev/null
+++ b/apps/pc_frontend/templates/smtLayoutHome.php
@@ -0,0 +1,47 @@
+<?php use_helper('Javascript') ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
+<head>
+<?php include_http_metas() ?>
+<?php include_metas() ?>
+<?php include_title() ?>
+<?php use_stylesheet('bootstrap') ?>
+<?php use_stylesheet('smt_main') ?>
+<?php include_stylesheets() ?>
+<?php if (Doctrine::getTable('SnsConfig')->get('customizing_css')): ?>
+<link rel="stylesheet" type="text/css" href="<?php echo url_for('@customizing_css') ?>" />
+<?php endif ?>
+<meta name="viewport" content="width=320px,user-scalable=no" />
+<?php
+$json = array(
+  'apiKey' => $sf_user->getMemberApiKey(),
+  'apiBase' => app_url_for('api', 'homepage'),
+);
+
+echo javascript_tag('
+var openpne = '.json_encode($json, defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0).';
+')
+?>
+<?php use_javascript('jquery.min.js') ?>
+<?php include_javascripts() ?>
+</head>
+<body id="<?php printf('page_%s_%s', $this->getModuleName(), $this->getActionName()) ?>" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
+<?php include_partial('global/tosaka') ?>
+<div id="face" class="row">
+  <div class="span2">
+    <?php echo op_image_tag_sf_image($sf_user->getMember()->getImageFileName(), array('size' => '48x48')) ?>
+  </div>
+  <div class="span8">
+    <div class="row face-name"><?php echo $sf_user->getMember()->getName() ?></div>
+    <div class="row screen-name">
+      <?php $screenName = $sf_user->getMember()->getConfig('op_screen_name') ?>
+      <?php if ($screenName): ?>
+      <a href="#">@<?php echo $screenName ?></a>
+      <?php endif ?>
+    </div>
+  </div>
+  <div class="span2 center"><?php echo link_to(op_image_tag('HomeIcon.png', array('height' => '48')), '@homepage') ?></div>
+</div>
+<?php echo $sf_content ?>
+</body>
+</html>
diff --git a/apps/pc_frontend/templates/smtLayoutMember.php b/apps/pc_frontend/templates/smtLayoutMember.php
new file mode 100644
index 000000000..9e0708c4f
--- /dev/null
+++ b/apps/pc_frontend/templates/smtLayoutMember.php
@@ -0,0 +1,50 @@
+<?php use_helper('Javascript') ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
+<head>
+<?php include_http_metas() ?>
+<?php include_metas() ?>
+<?php include_title() ?>
+<?php use_stylesheet('bootstrap') ?>
+<?php use_stylesheet('smt_main') ?>
+<?php include_stylesheets() ?>
+<?php if (Doctrine::getTable('SnsConfig')->get('customizing_css')): ?>
+<link rel="stylesheet" type="text/css" href="<?php echo url_for('@customizing_css') ?>" />
+<?php endif ?>
+<meta name="viewport" content="width=320px,user-scalable=no" />
+<?php
+$json = array(
+  'apiKey' => $sf_user->getMemberApiKey(),
+  'apiBase' => app_url_for('api', 'homepage'),
+);
+
+echo javascript_tag('
+var openpne = '.json_encode($json, defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0).';
+')
+?>
+<?php use_javascript('jquery.min.js') ?>
+<?php include_javascripts() ?>
+</head>
+<body id="<?php printf('page_%s_%s', $this->getModuleName(), $this->getActionName()) ?>" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
+<?php include_partial('global/tosaka') ?>
+<div id="face" class="row">
+  <?php $member = $sf_response->getDisplayMember() ?>
+  <?php if ($member): ?>
+  <div class="span2">
+    <?php echo op_image_tag_sf_image($member->getImageFileName(), array('size' => '48x48')) ?>
+  </div>
+  <div class="span8">
+    <div class="row face-name"><?php echo $member->getName() ?></div>
+    <div class="row screen-name">
+      <?php $screenName = $member->getConfig('op_screen_name') ?>
+      <?php if ($screenName): ?>
+      <a href="#">@<?php echo $screenName ?></a>
+      <?php endif ?>
+    </div>
+  </div>
+  <div class="span2 center"><?php echo link_to(op_image_tag('HomeIcon.png', array('height' => '48')), '@homepage') ?></div>
+  <?php endif ?>
+</div>
+<?php echo $sf_content ?>
+</body>
+</html>
diff --git a/apps/pc_frontend/templates/smtLayoutSns.php b/apps/pc_frontend/templates/smtLayoutSns.php
new file mode 100644
index 000000000..6310d3da5
--- /dev/null
+++ b/apps/pc_frontend/templates/smtLayoutSns.php
@@ -0,0 +1,52 @@
+<?php use_helper('Javascript') ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
+<head>
+<?php include_http_metas() ?>
+<?php include_metas() ?>
+<?php include_title() ?>
+<?php use_stylesheet('bootstrap') ?>
+<?php use_stylesheet('smt_main') ?>
+<?php include_stylesheets() ?>
+<?php if (Doctrine::getTable('SnsConfig')->get('customizing_css')): ?>
+<link rel="stylesheet" type="text/css" href="<?php echo url_for('@customizing_css') ?>" />
+<?php endif ?>
+<meta name="viewport" content="width=320px,user-scalable=no" />
+<?php
+$json = array(
+  'apiKey' => opToolkit::isSecurePage() ? $sf_user->getMemberApiKey() : '',
+  'apiBase' => app_url_for('api', 'homepage'),
+);
+
+echo javascript_tag('
+var openpne = '.json_encode($json, defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0).';
+')
+?>
+<?php use_javascript('jquery.min.js') ?>
+<?php include_javascripts() ?>
+</head>
+<body id="<?php printf('page_%s_%s', $this->getModuleName(), $this->getActionName()) ?>" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
+
+<?php if (opToolkit::isSecurePage()): ?>
+<?php include_partial('global/tosaka') ?>
+
+<div id="face" class="row">
+  <div class="span2">
+    <?php echo op_image_tag_sf_image($sf_user->getMember()->getImageFileName(), array('size' => '48x48')) ?>
+  </div>
+  <div class="span8">
+    <div class="row face-name"><?php echo $sf_user->getMember()->getName() ?></div>
+    <div class="row screen-name">
+      <?php $screenName = $sf_user->getMember()->getConfig('op_screen_name') ?>
+      <?php if ($screenName): ?>
+      <a href="#">@<?php echo $screenName ?></a>
+      <?php endif ?>
+    </div>
+  </div>
+  <div class="span2 center"><?php echo link_to(op_image_tag('HomeIcon.png', array('height' => '48')), '@homepage') ?></div>
+</div>
+<?php endif ?>
+
+<?php echo $sf_content ?>
+</body>
+</html>
diff --git a/lib/response/opWebResponse.class.php b/lib/response/opWebResponse.class.php
index fdb0a9891..fd1282db6 100644
--- a/lib/response/opWebResponse.class.php
+++ b/lib/response/opWebResponse.class.php
@@ -16,6 +16,10 @@
  */
 class opWebResponse extends sfWebResponse
 {
+  protected
+    $displayMember = null,
+    $displayCommunity = null;
+
   public function getTitle()
   {
     $result = parent::getTitle();
@@ -27,6 +31,26 @@ public function getTitle()
     return $result;
   }
 
+  public function getDisplayMember()
+  {
+    return $this->displayMember;
+  }
+
+  public function setDisplayMember(Member $member)
+  {
+    $this->displayMember = $member;
+  }
+
+  public function getDisplayCommunity()
+  {
+    return $this->displayCommunity;
+  }
+
+  public function setDisplayCommunity(Community $community)
+  {
+    $this->displayCommunity = $community;
+  }
+
   public function generateMobileUidCookie()
   {
     $request = sfContext::getInstance()->getRequest();
diff --git a/web/css/bootstrap.css b/web/css/bootstrap.css
new file mode 100644
index 000000000..63711555a
--- /dev/null
+++ b/web/css/bootstrap.css
@@ -0,0 +1,2467 @@
+/*!
+ * Bootstrap @VERSION
+ *
+ * Copyright 2011 Twitter, Inc
+ * Licensed under the Apache License v2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Designed and built with all the love in the world @twitter by @mdo and @fat.
+ * Date: @DATE
+ */
+/* Reset.less
+ * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here	that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
+ * ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */
+html, body {
+  margin: 0;
+  padding: 0;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+blockquote,
+pre,
+a,
+abbr,
+acronym,
+address,
+cite,
+code,
+del,
+dfn,
+em,
+img,
+q,
+s,
+samp,
+small,
+strike,
+strong,
+sub,
+sup,
+tt,
+var,
+dd,
+dl,
+dt,
+li,
+ol,
+ul,
+fieldset,
+form,
+label,
+legend,
+button,
+table,
+caption,
+tbody,
+tfoot,
+thead,
+tr,
+th,
+td {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-weight: normal;
+  font-style: normal;
+  font-size: 100%;
+  line-height: 1;
+  font-family: inherit;
+}
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+ol, ul {
+  list-style: none;
+}
+q:before,
+q:after,
+blockquote:before,
+blockquote:after {
+  content: "";
+}
+html {
+  overflow-y: scroll;
+  font-size: 100%;
+  -webkit-text-size-adjust: 100%;
+  -ms-text-size-adjust: 100%;
+}
+a:focus {
+  outline: thin dotted;
+}
+a:hover, a:active {
+  outline: 0;
+}
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+nav,
+section {
+  display: block;
+}
+audio, canvas, video {
+  display: inline-block;
+  *display: inline;
+  *zoom: 1;
+}
+audio:not([controls]) {
+  display: none;
+}
+sub, sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+sup {
+  top: -0.5em;
+}
+sub {
+  bottom: -0.25em;
+}
+img {
+  border: 0;
+  -ms-interpolation-mode: bicubic;
+}
+button,
+input,
+select,
+textarea {
+  font-size: 100%;
+  margin: 0;
+  vertical-align: baseline;
+  *vertical-align: middle;
+}
+button, input {
+  line-height: normal;
+  *overflow: visible;
+}
+button::-moz-focus-inner, input::-moz-focus-inner {
+  border: 0;
+  padding: 0;
+}
+button,
+input[type="button"],
+input[type="reset"],
+input[type="submit"] {
+  cursor: pointer;
+  -webkit-appearance: button;
+}
+input[type="search"] {
+  -webkit-appearance: textfield;
+  -webkit-box-sizing: content-box;
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+}
+input[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+textarea {
+  overflow: auto;
+  vertical-align: top;
+}
+/* Variables.less
+ * Variables to customize the look and feel of Bootstrap
+ * ----------------------------------------------------- */
+/* Mixins.less
+ * Snippets of reusable CSS to develop faster and keep code readable
+ * ----------------------------------------------------------------- */
+/*
+ * Scaffolding
+ * Basic and global styles for generating a grid system, structural layout, and page templates
+ * ------------------------------------------------------------------------------------------- */
+body {
+  background-color: #ffffff;
+  margin: 0;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 18px;
+  color: #404040;
+}
+.container {
+  width: 320px;
+  margin-left: auto;
+  margin-right: auto;
+  zoom: 1;
+}
+.container:before, .container:after {
+  display: table;
+  content: "";
+  zoom: 1;
+}
+.container:after {
+  clear: both;
+}
+.container-fluid {
+  position: relative;
+  min-width: 940px;
+  padding-left: 20px;
+  padding-right: 20px;
+  zoom: 1;
+}
+.container-fluid:before, .container-fluid:after {
+  display: table;
+  content: "";
+  zoom: 1;
+}
+.container-fluid:after {
+  clear: both;
+}
+.container-fluid > .sidebar {
+  position: absolute;
+  top: 0;
+  left: 20px;
+  width: 220px;
+}
+.container-fluid > .content {
+  margin-left: 240px;
+}
+a {
+  color: #0069d6;
+  text-decoration: none;
+  line-height: inherit;
+  font-weight: inherit;
+}
+a:hover {
+  color: #00438a;
+  text-decoration: underline;
+}
+.pull-right {
+  float: right;
+}
+.pull-left {
+  float: left;
+}
+.hide {
+  display: none;
+}
+.show {
+  display: block;
+}
+.row {
+  zoom: 1;
+  margin-left: -4px;
+}
+.row:before, .row:after {
+  display: table;
+  content: "";
+  zoom: 1;
+}
+.row:after {
+  clear: both;
+}
+.row > [class*="span"] {
+  display: inline;
+  float: left;
+  margin-left: 4px;
+}
+.span1 {
+  width: 23px;
+}
+.span2 {
+  width: 50px;
+}
+.span3 {
+  width: 77px;
+}
+.span4 {
+  width: 104px;
+}
+.span5 {
+  width: 131px;
+}
+.span6 {
+  width: 158px;
+}
+.span7 {
+  width: 185px;
+}
+.span8 {
+  width: 212px;
+}
+.span9 {
+  width: 239px;
+}
+.span10 {
+  width: 266px;
+}
+.span11 {
+  width: 293px;
+}
+.span12 {
+  width: 320px;
+}
+.span13 {
+  width: 347px;
+}
+.span14 {
+  width: 374px;
+}
+.span15 {
+  width: 401px;
+}
+.span16 {
+  width: 428px;
+}
+.span17 {
+  width: 455px;
+}
+.span18 {
+  width: 482px;
+}
+.span19 {
+  width: 509px;
+}
+.span20 {
+  width: 536px;
+}
+.span21 {
+  width: 563px;
+}
+.span22 {
+  width: 590px;
+}
+.span23 {
+  width: 617px;
+}
+.span24 {
+  width: 644px;
+}
+.row > .offset1 {
+  margin-left: 31px;
+}
+.row > .offset2 {
+  margin-left: 58px;
+}
+.row > .offset3 {
+  margin-left: 85px;
+}
+.row > .offset4 {
+  margin-left: 112px;
+}
+.row > .offset5 {
+  margin-left: 139px;
+}
+.row > .offset6 {
+  margin-left: 166px;
+}
+.row > .offset7 {
+  margin-left: 193px;
+}
+.row > .offset8 {
+  margin-left: 220px;
+}
+.row > .offset9 {
+  margin-left: 247px;
+}
+.row > .offset10 {
+  margin-left: 274px;
+}
+.row > .offset11 {
+  margin-left: 301px;
+}
+.row > .offset12 {
+  margin-left: 328px;
+}
+.span-one-third {
+  width: 300px;
+}
+.span-two-thirds {
+  width: 620px;
+}
+.row > .offset-one-third {
+  margin-left: 340px;
+}
+.row > .offset-two-thirds {
+  margin-left: 660px;
+}
+/* Typography.less
+ * Headings, body text, lists, code, and more for a versatile and durable typography system
+ * ---------------------------------------------------------------------------------------- */
+p {
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 18px;
+  margin-bottom: 9px;
+}
+p small {
+  font-size: 11px;
+  color: #bfbfbf;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  font-weight: bold;
+  color: #404040;
+}
+h1 small,
+h2 small,
+h3 small,
+h4 small,
+h5 small,
+h6 small {
+  color: #bfbfbf;
+}
+h1 {
+  margin-bottom: 18px;
+  font-size: 30px;
+  line-height: 36px;
+}
+h1 small {
+  font-size: 18px;
+}
+h2 {
+  font-size: 24px;
+  line-height: 36px;
+}
+h2 small {
+  font-size: 14px;
+}
+h3,
+h4,
+h5,
+h6 {
+  line-height: 36px;
+}
+h3 {
+  font-size: 18px;
+}
+h3 small {
+  font-size: 14px;
+}
+h4 {
+  font-size: 16px;
+}
+h4 small {
+  font-size: 12px;
+}
+h5 {
+  font-size: 14px;
+}
+h6 {
+  font-size: 13px;
+  color: #bfbfbf;
+  text-transform: uppercase;
+}
+ul, ol {
+  margin: 0 0 18px 25px;
+}
+ul ul,
+ul ol,
+ol ol,
+ol ul {
+  margin-bottom: 0;
+}
+ul {
+  list-style: disc;
+}
+ol {
+  list-style: decimal;
+}
+li {
+  line-height: 18px;
+  color: #808080;
+}
+ul.unstyled {
+  list-style: none;
+  margin-left: 0;
+}
+dl {
+  margin-bottom: 18px;
+}
+dl dt, dl dd {
+  line-height: 18px;
+}
+dl dt {
+  font-weight: bold;
+}
+dl dd {
+  margin-left: 9px;
+}
+hr {
+  margin: 20px 0 19px;
+  border: 0;
+  border-bottom: 1px solid #eee;
+}
+strong {
+  font-style: inherit;
+  font-weight: bold;
+}
+em {
+  font-style: italic;
+  font-weight: inherit;
+  line-height: inherit;
+}
+.muted {
+  color: #bfbfbf;
+}
+blockquote {
+  margin-bottom: 18px;
+  border-left: 5px solid #eee;
+  padding-left: 15px;
+}
+blockquote p {
+  font-size: 14px;
+  font-weight: 300;
+  line-height: 18px;
+  margin-bottom: 0;
+}
+blockquote small {
+  display: block;
+  font-size: 12px;
+  font-weight: 300;
+  line-height: 18px;
+  color: #bfbfbf;
+}
+blockquote small:before {
+  content: '\2014 \00A0';
+}
+address {
+  display: block;
+  line-height: 18px;
+  margin-bottom: 18px;
+}
+code, pre {
+  padding: 0 3px 2px;
+  font-family: Monaco, Andale Mono, Courier New, monospace;
+  font-size: 12px;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+code {
+  background-color: #fee9cc;
+  color: rgba(0, 0, 0, 0.75);
+  padding: 1px 3px;
+}
+pre {
+  background-color: #f5f5f5;
+  display: block;
+  padding: 8.5px;
+  margin: 0 0 18px;
+  line-height: 18px;
+  font-size: 12px;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  white-space: pre;
+  white-space: pre-wrap;
+  word-wrap: break-word;
+}
+/* Forms.less
+ * Base styles for various input types, form layouts, and states
+ * ------------------------------------------------------------- */
+form {
+  margin-bottom: 18px;
+}
+fieldset {
+  margin-bottom: 18px;
+  padding-top: 18px;
+}
+fieldset legend {
+  display: block;
+  padding-left: 150px;
+  font-size: 19.5px;
+  line-height: 1;
+  color: #404040;
+  *padding: 0 0 5px 145px;
+  /* IE6-7 */
+
+  *line-height: 1.5;
+  /* IE6-7 */
+
+}
+form .clearfix {
+  margin-bottom: 18px;
+  zoom: 1;
+}
+form .clearfix:before, form .clearfix:after {
+  display: table;
+  content: "";
+  zoom: 1;
+}
+form .clearfix:after {
+  clear: both;
+}
+label,
+input,
+select,
+textarea {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  font-weight: normal;
+  line-height: normal;
+}
+label {
+  padding-top: 6px;
+  font-size: 13px;
+  line-height: 18px;
+  float: left;
+  width: 130px;
+  text-align: right;
+  color: #404040;
+}
+form .input {
+  margin-left: 150px;
+}
+input[type=checkbox], input[type=radio] {
+  cursor: pointer;
+}
+input,
+textarea,
+select,
+.uneditable-input {
+  display: inline-block;
+  width: 210px;
+  height: 18px;
+  padding: 4px;
+  font-size: 13px;
+  line-height: 18px;
+  color: #808080;
+  border: 1px solid #ccc;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+select {
+  padding: initial;
+}
+input[type=checkbox], input[type=radio] {
+  width: auto;
+  height: auto;
+  padding: 0;
+  margin: 3px 0;
+  *margin-top: 0;
+  /* IE6-7 */
+
+  line-height: normal;
+  border: none;
+}
+input[type=file] {
+  background-color: #ffffff;
+  padding: initial;
+  border: initial;
+  line-height: initial;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+input[type=button], input[type=reset], input[type=submit] {
+  width: auto;
+  height: auto;
+}
+select, input[type=file] {
+  height: 27px;
+  *height: auto;
+  line-height: 27px;
+  *margin-top: 4px;
+  /* For IE7, add top margin to align select with labels */
+
+}
+select[multiple] {
+  height: inherit;
+  background-color: #ffffff;
+}
+textarea {
+  height: auto;
+}
+.uneditable-input {
+  background-color: #ffffff;
+  display: block;
+  border-color: #eee;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+  cursor: not-allowed;
+}
+:-moz-placeholder {
+  color: #bfbfbf;
+}
+::-webkit-input-placeholder {
+  color: #bfbfbf;
+}
+input, textarea {
+  -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
+  -o-transition: border linear 0.2s, box-shadow linear 0.2s;
+  transition: border linear 0.2s, box-shadow linear 0.2s;
+  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
+  box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+input:focus, textarea:focus {
+  outline: 0;
+  border-color: rgba(82, 168, 236, 0.8);
+  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+  -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+  box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+}
+input[type=file]:focus, input[type=checkbox]:focus, select:focus {
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+  outline: 1px dotted #666;
+}
+form .clearfix.error > label, form .clearfix.error .help-block, form .clearfix.error .help-inline {
+  color: #b94a48;
+}
+form .clearfix.error input, form .clearfix.error textarea {
+  color: #b94a48;
+  border-color: #ee5f5b;
+}
+form .clearfix.error input:focus, form .clearfix.error textarea:focus {
+  border-color: #e9322d;
+  -webkit-box-shadow: 0 0 6px #f8b9b7;
+  -moz-box-shadow: 0 0 6px #f8b9b7;
+  box-shadow: 0 0 6px #f8b9b7;
+}
+form .clearfix.error .input-prepend .add-on, form .clearfix.error .input-append .add-on {
+  color: #b94a48;
+  background-color: #fce6e6;
+  border-color: #b94a48;
+}
+form .clearfix.warning > label, form .clearfix.warning .help-block, form .clearfix.warning .help-inline {
+  color: #c09853;
+}
+form .clearfix.warning input, form .clearfix.warning textarea {
+  color: #c09853;
+  border-color: #ccae64;
+}
+form .clearfix.warning input:focus, form .clearfix.warning textarea:focus {
+  border-color: #be9a3f;
+  -webkit-box-shadow: 0 0 6px #e5d6b1;
+  -moz-box-shadow: 0 0 6px #e5d6b1;
+  box-shadow: 0 0 6px #e5d6b1;
+}
+form .clearfix.warning .input-prepend .add-on, form .clearfix.warning .input-append .add-on {
+  color: #c09853;
+  background-color: #d2b877;
+  border-color: #c09853;
+}
+form .clearfix.success > label, form .clearfix.success .help-block, form .clearfix.success .help-inline {
+  color: #468847;
+}
+form .clearfix.success input, form .clearfix.success textarea {
+  color: #468847;
+  border-color: #57a957;
+}
+form .clearfix.success input:focus, form .clearfix.success textarea:focus {
+  border-color: #458845;
+  -webkit-box-shadow: 0 0 6px #9acc9a;
+  -moz-box-shadow: 0 0 6px #9acc9a;
+  box-shadow: 0 0 6px #9acc9a;
+}
+form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-append .add-on {
+  color: #468847;
+  background-color: #bcddbc;
+  border-color: #468847;
+}
+.input-mini,
+input.mini,
+textarea.mini,
+select.mini {
+  width: 60px;
+}
+.input-small,
+input.small,
+textarea.small,
+select.small {
+  width: 90px;
+}
+.input-medium,
+input.medium,
+textarea.medium,
+select.medium {
+  width: 150px;
+}
+.input-large,
+input.large,
+textarea.large,
+select.large {
+  width: 210px;
+}
+.input-xlarge,
+input.xlarge,
+textarea.xlarge,
+select.xlarge {
+  width: 270px;
+}
+.input-xxlarge,
+input.xxlarge,
+textarea.xxlarge,
+select.xxlarge {
+  width: 530px;
+}
+textarea.xxlarge {
+  overflow-y: auto;
+}
+input.span1, textarea.span1 {
+  display: inline-block;
+  float: none;
+  width: 13px;
+  margin-left: 0;
+}
+input.span2, textarea.span2 {
+  display: inline-block;
+  float: none;
+  width: 40px;
+  margin-left: 0;
+}
+input.span3, textarea.span3 {
+  display: inline-block;
+  float: none;
+  width: 67px;
+  margin-left: 0;
+}
+input.span4, textarea.span4 {
+  display: inline-block;
+  float: none;
+  width: 94px;
+  margin-left: 0;
+}
+input.span5, textarea.span5 {
+  display: inline-block;
+  float: none;
+  width: 121px;
+  margin-left: 0;
+}
+input.span6, textarea.span6 {
+  display: inline-block;
+  float: none;
+  width: 148px;
+  margin-left: 0;
+}
+input.span7, textarea.span7 {
+  display: inline-block;
+  float: none;
+  width: 175px;
+  margin-left: 0;
+}
+input.span8, textarea.span8 {
+  display: inline-block;
+  float: none;
+  width: 202px;
+  margin-left: 0;
+}
+input.span9, textarea.span9 {
+  display: inline-block;
+  float: none;
+  width: 229px;
+  margin-left: 0;
+}
+input.span10, textarea.span10 {
+  display: inline-block;
+  float: none;
+  width: 256px;
+  margin-left: 0;
+}
+input.span11, textarea.span11 {
+  display: inline-block;
+  float: none;
+  width: 283px;
+  margin-left: 0;
+}
+input.span12, textarea.span12 {
+  display: inline-block;
+  float: none;
+  width: 310px;
+  margin-left: 0;
+}
+input.span13, textarea.span13 {
+  display: inline-block;
+  float: none;
+  width: 337px;
+  margin-left: 0;
+}
+input.span14, textarea.span14 {
+  display: inline-block;
+  float: none;
+  width: 364px;
+  margin-left: 0;
+}
+input.span15, textarea.span15 {
+  display: inline-block;
+  float: none;
+  width: 391px;
+  margin-left: 0;
+}
+input.span16, textarea.span16 {
+  display: inline-block;
+  float: none;
+  width: 418px;
+  margin-left: 0;
+}
+input[disabled],
+select[disabled],
+textarea[disabled],
+input[readonly],
+select[readonly],
+textarea[readonly] {
+  background-color: #f5f5f5;
+  border-color: #ddd;
+  cursor: not-allowed;
+}
+.actions {
+  background: #f5f5f5;
+  margin-top: 18px;
+  margin-bottom: 18px;
+  padding: 17px 20px 18px 150px;
+  border-top: 1px solid #ddd;
+  -webkit-border-radius: 0 0 3px 3px;
+  -moz-border-radius: 0 0 3px 3px;
+  border-radius: 0 0 3px 3px;
+}
+.actions .secondary-action {
+  float: right;
+}
+.actions .secondary-action a {
+  line-height: 30px;
+}
+.actions .secondary-action a:hover {
+  text-decoration: underline;
+}
+.help-inline, .help-block {
+  font-size: 13px;
+  line-height: 18px;
+  color: #bfbfbf;
+}
+.help-inline {
+  padding-left: 5px;
+  *position: relative;
+  /* IE6-7 */
+
+  *top: -5px;
+  /* IE6-7 */
+
+}
+.help-block {
+  display: block;
+  max-width: 600px;
+}
+.inline-inputs {
+  color: #808080;
+}
+.inline-inputs span {
+  padding: 0 2px 0 1px;
+}
+.input-prepend input, .input-append input {
+  -webkit-border-radius: 0 3px 3px 0;
+  -moz-border-radius: 0 3px 3px 0;
+  border-radius: 0 3px 3px 0;
+}
+.input-prepend .add-on, .input-append .add-on {
+  position: relative;
+  background: #f5f5f5;
+  border: 1px solid #ccc;
+  z-index: 2;
+  float: left;
+  display: block;
+  width: auto;
+  min-width: 16px;
+  height: 18px;
+  padding: 4px 4px 4px 5px;
+  margin-right: -1px;
+  font-weight: normal;
+  line-height: 18px;
+  color: #bfbfbf;
+  text-align: center;
+  text-shadow: 0 1px 0 #ffffff;
+  -webkit-border-radius: 3px 0 0 3px;
+  -moz-border-radius: 3px 0 0 3px;
+  border-radius: 3px 0 0 3px;
+}
+.input-prepend .active, .input-append .active {
+  background: #a9dba9;
+  border-color: #46a546;
+}
+.input-prepend .add-on {
+  *margin-top: 1px;
+  /* IE6-7 */
+
+}
+.input-append input {
+  float: left;
+  -webkit-border-radius: 3px 0 0 3px;
+  -moz-border-radius: 3px 0 0 3px;
+  border-radius: 3px 0 0 3px;
+}
+.input-append .add-on {
+  -webkit-border-radius: 0 3px 3px 0;
+  -moz-border-radius: 0 3px 3px 0;
+  border-radius: 0 3px 3px 0;
+  margin-right: 0;
+  margin-left: -1px;
+}
+.inputs-list {
+  margin: 0 0 5px;
+  width: 100%;
+}
+.inputs-list li {
+  display: block;
+  padding: 0;
+  width: 100%;
+}
+.inputs-list label {
+  display: block;
+  float: none;
+  width: auto;
+  padding: 0;
+  margin-left: 20px;
+  line-height: 18px;
+  text-align: left;
+  white-space: normal;
+}
+.inputs-list label strong {
+  color: #808080;
+}
+.inputs-list label small {
+  font-size: 11px;
+  font-weight: normal;
+}
+.inputs-list .inputs-list {
+  margin-left: 25px;
+  margin-bottom: 10px;
+  padding-top: 0;
+}
+.inputs-list:first-child {
+  padding-top: 6px;
+}
+.inputs-list li + li {
+  padding-top: 2px;
+}
+.inputs-list input[type=radio], .inputs-list input[type=checkbox] {
+  margin-bottom: 0;
+  margin-left: -20px;
+  float: left;
+}
+.form-stacked {
+  padding-left: 20px;
+}
+.form-stacked fieldset {
+  padding-top: 9px;
+}
+.form-stacked legend {
+  padding-left: 0;
+}
+.form-stacked label {
+  display: block;
+  float: none;
+  width: auto;
+  font-weight: bold;
+  text-align: left;
+  line-height: 20px;
+  padding-top: 0;
+}
+.form-stacked .clearfix {
+  margin-bottom: 9px;
+}
+.form-stacked .clearfix div.input {
+  margin-left: 0;
+}
+.form-stacked .inputs-list {
+  margin-bottom: 0;
+}
+.form-stacked .inputs-list li {
+  padding-top: 0;
+}
+.form-stacked .inputs-list li label {
+  font-weight: normal;
+  padding-top: 0;
+}
+.form-stacked div.clearfix.error {
+  padding-top: 10px;
+  padding-bottom: 10px;
+  padding-left: 10px;
+  margin-top: 0;
+  margin-left: -10px;
+}
+.form-stacked .actions {
+  margin-left: -20px;
+  padding-left: 20px;
+}
+/*
+ * Tables.less
+ * Tables for, you guessed it, tabular data
+ * ---------------------------------------- */
+table {
+  width: 100%;
+  margin-bottom: 18px;
+  padding: 0;
+  font-size: 13px;
+  border-collapse: collapse;
+}
+table th, table td {
+  padding: 10px 10px 9px;
+  line-height: 18px;
+  text-align: left;
+}
+table th {
+  padding-top: 9px;
+  font-weight: bold;
+  vertical-align: middle;
+}
+table td {
+  vertical-align: top;
+  border-top: 1px solid #ddd;
+}
+table tbody th {
+  border-top: 1px solid #ddd;
+  vertical-align: top;
+}
+.condensed-table th, .condensed-table td {
+  padding: 5px 5px 4px;
+}
+.bordered-table {
+  border: 1px solid #ddd;
+  border-collapse: separate;
+  *border-collapse: collapse;
+  /* IE7, collapse table to remove spacing */
+
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.bordered-table th + th, .bordered-table td + td, .bordered-table th + td {
+  border-left: 1px solid #ddd;
+}
+.bordered-table thead tr:first-child th:first-child, .bordered-table tbody tr:first-child td:first-child {
+  -webkit-border-radius: 4px 0 0 0;
+  -moz-border-radius: 4px 0 0 0;
+  border-radius: 4px 0 0 0;
+}
+.bordered-table thead tr:first-child th:last-child, .bordered-table tbody tr:first-child td:last-child {
+  -webkit-border-radius: 0 4px 0 0;
+  -moz-border-radius: 0 4px 0 0;
+  border-radius: 0 4px 0 0;
+}
+.bordered-table tbody tr:last-child td:first-child {
+  -webkit-border-radius: 0 0 0 4px;
+  -moz-border-radius: 0 0 0 4px;
+  border-radius: 0 0 0 4px;
+}
+.bordered-table tbody tr:last-child td:last-child {
+  -webkit-border-radius: 0 0 4px 0;
+  -moz-border-radius: 0 0 4px 0;
+  border-radius: 0 0 4px 0;
+}
+table .span1 {
+  width: 3px;
+}
+table .span2 {
+  width: 9px;
+}
+table .span3 {
+  width: 15px;
+}
+table .span4 {
+  width: 21px;
+}
+table .span5 {
+  width: 27px;
+}
+table .span6 {
+  width: 33px;
+}
+table .span7 {
+  width: 39px;
+}
+table .span8 {
+  width: 45px;
+}
+table .span9 {
+  width: 51px;
+}
+table .span10 {
+  width: 57px;
+}
+table .span11 {
+  width: 63px;
+}
+table .span12 {
+  width: 69px;
+}
+table .span13 {
+  width: 75px;
+}
+table .span14 {
+  width: 81px;
+}
+table .span15 {
+  width: 87px;
+}
+table .span16 {
+  width: 93px;
+}
+.zebra-striped tbody tr:nth-child(odd) td, .zebra-striped tbody tr:nth-child(odd) th {
+  background-color: #f9f9f9;
+}
+.zebra-striped tbody tr:hover td, .zebra-striped tbody tr:hover th {
+  background-color: #f5f5f5;
+}
+table .header {
+  cursor: pointer;
+}
+table .header:after {
+  content: "";
+  float: right;
+  margin-top: 7px;
+  border-width: 0 4px 4px;
+  border-style: solid;
+  border-color: #000 transparent;
+  visibility: hidden;
+}
+table .headerSortUp, table .headerSortDown {
+  background-color: rgba(141, 192, 219, 0.25);
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+}
+table .header:hover:after {
+  visibility: visible;
+}
+table .headerSortDown:after, table .headerSortDown:hover:after {
+  visibility: visible;
+  filter: alpha(opacity=60);
+  -khtml-opacity: 0.6;
+  -moz-opacity: 0.6;
+  opacity: 0.6;
+}
+table .headerSortUp:after {
+  border-bottom: none;
+  border-left: 4px solid transparent;
+  border-right: 4px solid transparent;
+  border-top: 4px solid #000;
+  visibility: visible;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+  filter: alpha(opacity=60);
+  -khtml-opacity: 0.6;
+  -moz-opacity: 0.6;
+  opacity: 0.6;
+}
+table .blue {
+  color: #049cdb;
+  border-bottom-color: #049cdb;
+}
+table .headerSortUp.blue, table .headerSortDown.blue {
+  background-color: #ade6fe;
+}
+table .green {
+  color: #46a546;
+  border-bottom-color: #46a546;
+}
+table .headerSortUp.green, table .headerSortDown.green {
+  background-color: #cdeacd;
+}
+table .red {
+  color: #9d261d;
+  border-bottom-color: #9d261d;
+}
+table .headerSortUp.red, table .headerSortDown.red {
+  background-color: #f4c8c5;
+}
+table .yellow {
+  color: #ffc40d;
+  border-bottom-color: #ffc40d;
+}
+table .headerSortUp.yellow, table .headerSortDown.yellow {
+  background-color: #fff6d9;
+}
+table .orange {
+  color: #f89406;
+  border-bottom-color: #f89406;
+}
+table .headerSortUp.orange, table .headerSortDown.orange {
+  background-color: #fee9cc;
+}
+table .purple {
+  color: #7a43b6;
+  border-bottom-color: #7a43b6;
+}
+table .headerSortUp.purple, table .headerSortDown.purple {
+  background-color: #e2d5f0;
+}
+/* Patterns.less
+ * Repeatable UI elements outside the base styles provided from the scaffolding
+ * ---------------------------------------------------------------------------- */
+.topbar {
+  height: 40px;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 10000;
+  overflow: visible;
+}
+.topbar a {
+  color: #bfbfbf;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+.topbar h3 a:hover, .topbar .brand:hover, .topbar ul .active > a {
+  background-color: #333;
+  background-color: rgba(255, 255, 255, 0.05);
+  color: #ffffff;
+  text-decoration: none;
+}
+.topbar h3 {
+  position: relative;
+}
+.topbar h3 a, .topbar .brand {
+  float: left;
+  display: block;
+  padding: 8px 20px 12px;
+  margin-left: -20px;
+  color: #ffffff;
+  font-size: 20px;
+  font-weight: 200;
+  line-height: 1;
+}
+.topbar p {
+  margin: 0;
+  line-height: 40px;
+}
+.topbar p a:hover {
+  background-color: transparent;
+  color: #ffffff;
+}
+.topbar form {
+  float: left;
+  margin: 5px 0 0 0;
+  position: relative;
+  filter: alpha(opacity=100);
+  -khtml-opacity: 1;
+  -moz-opacity: 1;
+  opacity: 1;
+}
+.topbar form.pull-right {
+  float: right;
+}
+.topbar input {
+  background-color: #444;
+  background-color: rgba(255, 255, 255, 0.3);
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: normal;
+  font-weight: 13px;
+  line-height: 1;
+  padding: 4px 9px;
+  color: #ffffff;
+  color: rgba(255, 255, 255, 0.75);
+  border: 1px solid #111;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25);
+  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25);
+  -webkit-transition: none;
+  -moz-transition: none;
+  -ms-transition: none;
+  -o-transition: none;
+  transition: none;
+}
+.topbar input:-moz-placeholder {
+  color: #e6e6e6;
+}
+.topbar input::-webkit-input-placeholder {
+  color: #e6e6e6;
+}
+.topbar input:hover {
+  background-color: #bfbfbf;
+  background-color: rgba(255, 255, 255, 0.5);
+  color: #ffffff;
+}
+.topbar input:focus, .topbar input.focused {
+  outline: 0;
+  background-color: #ffffff;
+  color: #404040;
+  text-shadow: 0 1px 0 #ffffff;
+  border: 0;
+  padding: 5px 10px;
+  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+  -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+  box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+}
+.topbar-inner, .topbar .fill {
+  background-color: #222;
+  background-color: #222222;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));
+  background-image: -moz-linear-gradient(top, #333333, #222222);
+  background-image: -ms-linear-gradient(top, #333333, #222222);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));
+  background-image: -webkit-linear-gradient(top, #333333, #222222);
+  background-image: -o-linear-gradient(top, #333333, #222222);
+  background-image: linear-gradient(top, #333333, #222222);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+}
+.topbar div > ul, .nav {
+  display: block;
+  float: left;
+  margin: 0 10px 0 0;
+  position: relative;
+  left: 0;
+}
+.topbar div > ul > li, .nav > li {
+  display: block;
+  float: left;
+}
+.topbar div > ul a, .nav a {
+  display: block;
+  float: none;
+  padding: 10px 10px 11px;
+  line-height: 19px;
+  text-decoration: none;
+}
+.topbar div > ul a:hover, .nav a:hover {
+  color: #ffffff;
+  text-decoration: none;
+}
+.topbar div > ul .active > a, .nav .active > a {
+  background-color: #222;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+.topbar div > ul.secondary-nav, .nav.secondary-nav {
+  float: right;
+  margin-left: 10px;
+  margin-right: 0;
+}
+.topbar div > ul.secondary-nav .menu-dropdown,
+.nav.secondary-nav .menu-dropdown,
+.topbar div > ul.secondary-nav .dropdown-menu,
+.nav.secondary-nav .dropdown-menu {
+  right: 0;
+  border: 0;
+}
+.topbar div > ul a.menu:hover,
+.nav a.menu:hover,
+.topbar div > ul li.open .menu,
+.nav li.open .menu,
+.topbar div > ul .dropdown-toggle:hover,
+.nav .dropdown-toggle:hover,
+.topbar div > ul .dropdown.open .dropdown-toggle,
+.nav .dropdown.open .dropdown-toggle {
+  background: #444;
+  background: rgba(255, 255, 255, 0.05);
+}
+.topbar div > ul .menu-dropdown,
+.nav .menu-dropdown,
+.topbar div > ul .dropdown-menu,
+.nav .dropdown-menu {
+  background-color: #333;
+}
+.topbar div > ul .menu-dropdown a.menu,
+.nav .menu-dropdown a.menu,
+.topbar div > ul .dropdown-menu a.menu,
+.nav .dropdown-menu a.menu,
+.topbar div > ul .menu-dropdown .dropdown-toggle,
+.nav .menu-dropdown .dropdown-toggle,
+.topbar div > ul .dropdown-menu .dropdown-toggle,
+.nav .dropdown-menu .dropdown-toggle {
+  color: #ffffff;
+}
+.topbar div > ul .menu-dropdown a.menu.open,
+.nav .menu-dropdown a.menu.open,
+.topbar div > ul .dropdown-menu a.menu.open,
+.nav .dropdown-menu a.menu.open,
+.topbar div > ul .menu-dropdown .dropdown-toggle.open,
+.nav .menu-dropdown .dropdown-toggle.open,
+.topbar div > ul .dropdown-menu .dropdown-toggle.open,
+.nav .dropdown-menu .dropdown-toggle.open {
+  background: #444;
+  background: rgba(255, 255, 255, 0.05);
+}
+.topbar div > ul .menu-dropdown li a,
+.nav .menu-dropdown li a,
+.topbar div > ul .dropdown-menu li a,
+.nav .dropdown-menu li a {
+  color: #999;
+  text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
+}
+.topbar div > ul .menu-dropdown li a:hover,
+.nav .menu-dropdown li a:hover,
+.topbar div > ul .dropdown-menu li a:hover,
+.nav .dropdown-menu li a:hover {
+  background-color: #191919;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));
+  background-image: -moz-linear-gradient(top, #292929, #191919);
+  background-image: -ms-linear-gradient(top, #292929, #191919);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));
+  background-image: -webkit-linear-gradient(top, #292929, #191919);
+  background-image: -o-linear-gradient(top, #292929, #191919);
+  background-image: linear-gradient(top, #292929, #191919);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#292929', endColorstr='#191919', GradientType=0);
+  color: #ffffff;
+}
+.topbar div > ul .menu-dropdown .active a,
+.nav .menu-dropdown .active a,
+.topbar div > ul .dropdown-menu .active a,
+.nav .dropdown-menu .active a {
+  color: #ffffff;
+}
+.topbar div > ul .menu-dropdown .divider,
+.nav .menu-dropdown .divider,
+.topbar div > ul .dropdown-menu .divider,
+.nav .dropdown-menu .divider {
+  background-color: #222;
+  border-color: #444;
+}
+.topbar ul .menu-dropdown li a, .topbar ul .dropdown-menu li a {
+  padding: 4px 15px;
+}
+li.menu, .dropdown {
+  position: relative;
+}
+a.menu:after, .dropdown-toggle:after {
+  width: 0;
+  height: 0;
+  display: inline-block;
+  content: "&darr;";
+  text-indent: -99999px;
+  vertical-align: top;
+  margin-top: 8px;
+  margin-left: 4px;
+  border-left: 4px solid transparent;
+  border-right: 4px solid transparent;
+  border-top: 4px solid #ffffff;
+  filter: alpha(opacity=50);
+  -khtml-opacity: 0.5;
+  -moz-opacity: 0.5;
+  opacity: 0.5;
+}
+.menu-dropdown, .dropdown-menu {
+  background-color: #ffffff;
+  float: left;
+  display: none;
+  position: absolute;
+  top: 40px;
+  z-index: 900;
+  min-width: 160px;
+  max-width: 220px;
+  _width: 160px;
+  margin-left: 0;
+  margin-right: 0;
+  padding: 6px 0;
+  zoom: 1;
+  border-color: #999;
+  border-color: rgba(0, 0, 0, 0.2);
+  border-style: solid;
+  border-width: 0 1px 1px;
+  -webkit-border-radius: 0 0 6px 6px;
+  -moz-border-radius: 0 0 6px 6px;
+  border-radius: 0 0 6px 6px;
+  -webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+  -moz-background-clip: padding-box;
+  background-clip: padding-box;
+}
+.menu-dropdown li, .dropdown-menu li {
+  float: none;
+  display: block;
+  background-color: none;
+}
+.menu-dropdown .divider, .dropdown-menu .divider {
+  height: 1px;
+  margin: 5px 0;
+  overflow: hidden;
+  background-color: #eee;
+  border-bottom: 1px solid #ffffff;
+}
+.topbar .dropdown-menu a, .dropdown-menu a {
+  display: block;
+  padding: 4px 15px;
+  clear: both;
+  font-weight: normal;
+  line-height: 18px;
+  color: #808080;
+  text-shadow: 0 1px 0 #ffffff;
+}
+.topbar .dropdown-menu a:hover,
+.dropdown-menu a:hover,
+.topbar .dropdown-menu a.hover,
+.dropdown-menu a.hover {
+  background-color: #dddddd;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));
+  background-image: -moz-linear-gradient(top, #eeeeee, #dddddd);
+  background-image: -ms-linear-gradient(top, #eeeeee, #dddddd);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));
+  background-image: -webkit-linear-gradient(top, #eeeeee, #dddddd);
+  background-image: -o-linear-gradient(top, #eeeeee, #dddddd);
+  background-image: linear-gradient(top, #eeeeee, #dddddd);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0);
+  color: #404040;
+  text-decoration: none;
+  -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025);
+  -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025);
+  box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025);
+}
+.open .menu,
+.dropdown.open .menu,
+.open .dropdown-toggle,
+.dropdown.open .dropdown-toggle {
+  color: #ffffff;
+  background: #ccc;
+  background: rgba(0, 0, 0, 0.3);
+}
+.open .menu-dropdown,
+.dropdown.open .menu-dropdown,
+.open .dropdown-menu,
+.dropdown.open .dropdown-menu {
+  display: block;
+}
+.tabs, .pills {
+  margin: 0 0 18px;
+  padding: 0;
+  list-style: none;
+  zoom: 1;
+}
+.tabs:before,
+.pills:before,
+.tabs:after,
+.pills:after {
+  display: table;
+  content: "";
+  zoom: 1;
+}
+.tabs:after, .pills:after {
+  clear: both;
+}
+.tabs > li, .pills > li {
+  float: left;
+}
+.tabs > li > a, .pills > li > a {
+  display: block;
+}
+.tabs {
+  border-color: #ddd;
+  border-style: solid;
+  border-width: 0 0 1px;
+}
+.tabs > li {
+  position: relative;
+  margin-bottom: -1px;
+}
+.tabs > li > a {
+  padding: 0 15px;
+  margin-right: 2px;
+  line-height: 34px;
+  border: 1px solid transparent;
+  -webkit-border-radius: 4px 4px 0 0;
+  -moz-border-radius: 4px 4px 0 0;
+  border-radius: 4px 4px 0 0;
+}
+.tabs > li > a:hover {
+  text-decoration: none;
+  background-color: #eee;
+  border-color: #eee #eee #ddd;
+}
+.tabs .active > a, .tabs .active > a:hover {
+  color: #808080;
+  background-color: #ffffff;
+  border: 1px solid #ddd;
+  border-bottom-color: transparent;
+  cursor: default;
+}
+.tabs .menu-dropdown, .tabs .dropdown-menu {
+  top: 35px;
+  border-width: 1px;
+  -webkit-border-radius: 0 6px 6px 6px;
+  -moz-border-radius: 0 6px 6px 6px;
+  border-radius: 0 6px 6px 6px;
+}
+.tabs a.menu:after, .tabs .dropdown-toggle:after {
+  border-top-color: #999;
+  margin-top: 15px;
+  margin-left: 5px;
+}
+.tabs li.open.menu .menu, .tabs .open.dropdown .dropdown-toggle {
+  border-color: #999;
+}
+.tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after {
+  border-top-color: #555;
+}
+.pills a {
+  margin: 5px 3px 5px 0;
+  padding: 0 15px;
+  line-height: 30px;
+  text-shadow: 0 1px 1px #ffffff;
+  -webkit-border-radius: 15px;
+  -moz-border-radius: 15px;
+  border-radius: 15px;
+}
+.pills a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25);
+  background-color: #00438a;
+}
+.pills .active a {
+  color: #ffffff;
+  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25);
+  background-color: #0069d6;
+}
+.pills-vertical > li {
+  float: none;
+}
+.tab-content > .tab-pane,
+.pill-content > .pill-pane,
+.tab-content > div,
+.pill-content > div {
+  display: none;
+}
+.tab-content > .active, .pill-content > .active {
+  display: block;
+}
+.breadcrumb {
+  padding: 7px 14px;
+  margin: 0 0 18px;
+  background-color: #f5f5f5;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));
+  background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));
+  background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: -o-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: linear-gradient(top, #ffffff, #f5f5f5);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);
+  border: 1px solid #ddd;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  -webkit-box-shadow: inset 0 1px 0 #ffffff;
+  -moz-box-shadow: inset 0 1px 0 #ffffff;
+  box-shadow: inset 0 1px 0 #ffffff;
+}
+.breadcrumb li {
+  display: inline;
+  text-shadow: 0 1px 0 #ffffff;
+}
+.breadcrumb .divider {
+  padding: 0 5px;
+  color: #bfbfbf;
+}
+.breadcrumb .active a {
+  color: #404040;
+}
+.hero-unit {
+  background-color: #f5f5f5;
+  margin-bottom: 30px;
+  padding: 60px;
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+}
+.hero-unit h1 {
+  margin-bottom: 0;
+  font-size: 60px;
+  line-height: 1;
+  letter-spacing: -1px;
+}
+.hero-unit p {
+  font-size: 18px;
+  font-weight: 200;
+  line-height: 27px;
+}
+footer {
+  margin-top: 17px;
+  padding-top: 17px;
+  border-top: 1px solid #eee;
+}
+.page-header {
+  margin-bottom: 17px;
+  border-bottom: 1px solid #ddd;
+  -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+}
+.page-header h1 {
+  margin-bottom: 8px;
+}
+.btn.danger,
+.alert-message.danger,
+.btn.danger:hover,
+.alert-message.danger:hover,
+.btn.error,
+.alert-message.error,
+.btn.error:hover,
+.alert-message.error:hover,
+.btn.success,
+.alert-message.success,
+.btn.success:hover,
+.alert-message.success:hover,
+.btn.info,
+.alert-message.info,
+.btn.info:hover,
+.alert-message.info:hover {
+  color: #ffffff;
+}
+.btn .close, .alert-message .close {
+  font-family: Arial, sans-serif;
+  line-height: 18px;
+}
+.btn.danger,
+.alert-message.danger,
+.btn.error,
+.alert-message.error {
+  background-color: #c43c35;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));
+  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: linear-gradient(top, #ee5f5b, #c43c35);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #c43c35 #c43c35 #882a25;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+.btn.success, .alert-message.success {
+  background-color: #57a957;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));
+  background-image: -moz-linear-gradient(top, #62c462, #57a957);
+  background-image: -ms-linear-gradient(top, #62c462, #57a957);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));
+  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
+  background-image: -o-linear-gradient(top, #62c462, #57a957);
+  background-image: linear-gradient(top, #62c462, #57a957);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #57a957 #57a957 #3d773d;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+.btn.info, .alert-message.info {
+  background-color: #339bb9;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));
+  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));
+  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: linear-gradient(top, #5bc0de, #339bb9);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #339bb9 #339bb9 #22697d;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+.btn {
+  cursor: pointer;
+  display: inline-block;
+  background-color: #e6e6e6;
+  background-repeat: no-repeat;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
+  padding: 5px 14px 6px;
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+  color: #333;
+  font-size: 13px;
+  line-height: normal;
+  border: 1px solid #ccc;
+  border-bottom-color: #bbb;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -webkit-transition: 0.1s linear all;
+  -moz-transition: 0.1s linear all;
+  -ms-transition: 0.1s linear all;
+  -o-transition: 0.1s linear all;
+  transition: 0.1s linear all;
+}
+.btn:hover {
+  background-position: 0 -15px;
+  color: #333;
+  text-decoration: none;
+}
+.btn:focus {
+  outline: 1px dotted #666;
+}
+.btn.primary {
+  color: #ffffff;
+  background-color: #0064cd;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
+  background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
+  background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
+  background-image: -o-linear-gradient(top, #049cdb, #0064cd);
+  background-image: linear-gradient(top, #049cdb, #0064cd);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #0064cd #0064cd #003f81;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
+.btn.active, .btn:active {
+  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+.btn.disabled {
+  cursor: default;
+  background-image: none;
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+  filter: alpha(opacity=65);
+  -khtml-opacity: 0.65;
+  -moz-opacity: 0.65;
+  opacity: 0.65;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+.btn[disabled] {
+  cursor: default;
+  background-image: none;
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+  filter: alpha(opacity=65);
+  -khtml-opacity: 0.65;
+  -moz-opacity: 0.65;
+  opacity: 0.65;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+.btn.large {
+  font-size: 15px;
+  line-height: normal;
+  padding: 9px 14px 9px;
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+}
+.btn.small {
+  padding: 7px 9px 7px;
+  font-size: 11px;
+}
+:root .alert-message, :root .btn {
+  border-radius: 0 \0;
+}
+button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+.close {
+  float: right;
+  color: #000000;
+  font-size: 20px;
+  font-weight: bold;
+  line-height: 13.5px;
+  text-shadow: 0 1px 0 #ffffff;
+  filter: alpha(opacity=25);
+  -khtml-opacity: 0.25;
+  -moz-opacity: 0.25;
+  opacity: 0.25;
+}
+.close:hover {
+  color: #000000;
+  text-decoration: none;
+  filter: alpha(opacity=40);
+  -khtml-opacity: 0.4;
+  -moz-opacity: 0.4;
+  opacity: 0.4;
+}
+.alert-message {
+  position: relative;
+  padding: 7px 15px;
+  margin-bottom: 18px;
+  color: #404040;
+  background-color: #eedc94;
+  background-repeat: repeat-x;
+  background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));
+  background-image: -moz-linear-gradient(top, #fceec1, #eedc94);
+  background-image: -ms-linear-gradient(top, #fceec1, #eedc94);
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));
+  background-image: -webkit-linear-gradient(top, #fceec1, #eedc94);
+  background-image: -o-linear-gradient(top, #fceec1, #eedc94);
+  background-image: linear-gradient(top, #fceec1, #eedc94);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  border-color: #eedc94 #eedc94 #e4c652;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  border-width: 1px;
+  border-style: solid;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+}
+.alert-message .close {
+  margin-top: 1px;
+  *margin-top: 0;
+}
+.alert-message a {
+  font-weight: bold;
+  color: #404040;
+}
+.alert-message.danger p a,
+.alert-message.error p a,
+.alert-message.success p a,
+.alert-message.info p a {
+  color: #ffffff;
+}
+.alert-message h5 {
+  line-height: 18px;
+}
+.alert-message p {
+  margin-bottom: 0;
+}
+.alert-message div {
+  margin-top: 5px;
+  margin-bottom: 2px;
+  line-height: 28px;
+}
+.alert-message .btn {
+  -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
+  -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
+  box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
+}
+.alert-message.block-message {
+  background-image: none;
+  background-color: #fdf5d9;
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+  padding: 14px;
+  border-color: #fceec1;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+.alert-message.block-message ul, .alert-message.block-message p {
+  margin-right: 30px;
+}
+.alert-message.block-message ul {
+  margin-bottom: 0;
+}
+.alert-message.block-message li {
+  color: #404040;
+}
+.alert-message.block-message .alert-actions {
+  margin-top: 5px;
+}
+.alert-message.block-message.error, .alert-message.block-message.success, .alert-message.block-message.info {
+  color: #404040;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+}
+.alert-message.block-message.error {
+  background-color: #fddfde;
+  border-color: #fbc7c6;
+}
+.alert-message.block-message.success {
+  background-color: #d1eed1;
+  border-color: #bfe7bf;
+}
+.alert-message.block-message.info {
+  background-color: #ddf4fb;
+  border-color: #c6edf9;
+}
+.alert-message.block-message.danger p a,
+.alert-message.block-message.error p a,
+.alert-message.block-message.success p a,
+.alert-message.block-message.info p a {
+  color: #404040;
+}
+.pagination {
+  height: 36px;
+  margin: 18px 0;
+}
+.pagination ul {
+  float: left;
+  margin: 0;
+  border: 1px solid #ddd;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+.pagination li {
+  display: inline;
+}
+.pagination a {
+  float: left;
+  padding: 0 14px;
+  line-height: 34px;
+  border-right: 1px solid;
+  border-right-color: #ddd;
+  border-right-color: rgba(0, 0, 0, 0.15);
+  *border-right-color: #ddd;
+  /* IE6-7 */
+
+  text-decoration: none;
+}
+.pagination a:hover, .pagination .active a {
+  background-color: #c7eefe;
+}
+.pagination .disabled a, .pagination .disabled a:hover {
+  background-color: transparent;
+  color: #bfbfbf;
+}
+.pagination .next a {
+  border: 0;
+}
+.well {
+  background-color: #f5f5f5;
+  margin-bottom: 20px;
+  padding: 19px;
+  min-height: 20px;
+  border: 1px solid #eee;
+  border: 1px solid rgba(0, 0, 0, 0.05);
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+}
+.well blockquote {
+  border-color: #ddd;
+  border-color: rgba(0, 0, 0, 0.15);
+}
+.modal-backdrop {
+  background-color: #000000;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 10000;
+}
+.modal-backdrop.fade {
+  opacity: 0;
+}
+.modal-backdrop, .modal-backdrop.fade.in {
+  filter: alpha(opacity=80);
+  -khtml-opacity: 0.8;
+  -moz-opacity: 0.8;
+  opacity: 0.8;
+}
+.modal {
+  position: fixed;
+  top: 50%;
+  left: 50%;
+  z-index: 11000;
+  width: 560px;
+  margin: -250px 0 0 -280px;
+  background-color: #ffffff;
+  border: 1px solid #999;
+  border: 1px solid rgba(0, 0, 0, 0.3);
+  *border: 1px solid #999;
+  /* IE6-7 */
+
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  -webkit-background-clip: padding-box;
+  -moz-background-clip: padding-box;
+  background-clip: padding-box;
+}
+.modal .close {
+  margin-top: 7px;
+}
+.modal.fade {
+  -webkit-transition: opacity .3s linear, top .3s ease-out;
+  -moz-transition: opacity .3s linear, top .3s ease-out;
+  -ms-transition: opacity .3s linear, top .3s ease-out;
+  -o-transition: opacity .3s linear, top .3s ease-out;
+  transition: opacity .3s linear, top .3s ease-out;
+  top: -25%;
+}
+.modal.fade.in {
+  top: 50%;
+}
+.modal-header {
+  border-bottom: 1px solid #eee;
+  padding: 5px 15px;
+}
+.modal-body {
+  padding: 15px;
+}
+.modal-body form {
+  margin-bottom: 0;
+}
+.modal-footer {
+  background-color: #f5f5f5;
+  padding: 14px 15px 15px;
+  border-top: 1px solid #ddd;
+  -webkit-border-radius: 0 0 6px 6px;
+  -moz-border-radius: 0 0 6px 6px;
+  border-radius: 0 0 6px 6px;
+  -webkit-box-shadow: inset 0 1px 0 #ffffff;
+  -moz-box-shadow: inset 0 1px 0 #ffffff;
+  box-shadow: inset 0 1px 0 #ffffff;
+  zoom: 1;
+  margin-bottom: 0;
+}
+.modal-footer:before, .modal-footer:after {
+  display: table;
+  content: "";
+  zoom: 1;
+}
+.modal-footer:after {
+  clear: both;
+}
+.modal-footer .btn {
+  float: right;
+  margin-left: 5px;
+}
+.modal .popover, .modal .twipsy {
+  z-index: 12000;
+}
+.twipsy {
+  display: block;
+  position: absolute;
+  visibility: visible;
+  padding: 5px;
+  font-size: 11px;
+  z-index: 1000;
+  filter: alpha(opacity=80);
+  -khtml-opacity: 0.8;
+  -moz-opacity: 0.8;
+  opacity: 0.8;
+}
+.twipsy.fade.in {
+  filter: alpha(opacity=80);
+  -khtml-opacity: 0.8;
+  -moz-opacity: 0.8;
+  opacity: 0.8;
+}
+.twipsy.above .twipsy-arrow {
+  bottom: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-top: 5px solid #000000;
+}
+.twipsy.left .twipsy-arrow {
+  top: 50%;
+  right: 0;
+  margin-top: -5px;
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-left: 5px solid #000000;
+}
+.twipsy.below .twipsy-arrow {
+  top: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-bottom: 5px solid #000000;
+}
+.twipsy.right .twipsy-arrow {
+  top: 50%;
+  left: 0;
+  margin-top: -5px;
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-right: 5px solid #000000;
+}
+.twipsy-inner {
+  padding: 3px 8px;
+  background-color: #000000;
+  color: white;
+  text-align: center;
+  max-width: 200px;
+  text-decoration: none;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.twipsy-arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+}
+.popover {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 1000;
+  padding: 5px;
+  display: none;
+}
+.popover.above .arrow {
+  bottom: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-top: 5px solid #000000;
+}
+.popover.right .arrow {
+  top: 50%;
+  left: 0;
+  margin-top: -5px;
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-right: 5px solid #000000;
+}
+.popover.below .arrow {
+  top: 0;
+  left: 50%;
+  margin-left: -5px;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-bottom: 5px solid #000000;
+}
+.popover.left .arrow {
+  top: 50%;
+  right: 0;
+  margin-top: -5px;
+  border-top: 5px solid transparent;
+  border-bottom: 5px solid transparent;
+  border-left: 5px solid #000000;
+}
+.popover .arrow {
+  position: absolute;
+  width: 0;
+  height: 0;
+}
+.popover .inner {
+  background: #000000;
+  background: rgba(0, 0, 0, 0.8);
+  padding: 3px;
+  overflow: hidden;
+  width: 280px;
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+  -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+  box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
+}
+.popover .title {
+  background-color: #f5f5f5;
+  padding: 9px 15px;
+  line-height: 1;
+  -webkit-border-radius: 3px 3px 0 0;
+  -moz-border-radius: 3px 3px 0 0;
+  border-radius: 3px 3px 0 0;
+  border-bottom: 1px solid #eee;
+}
+.popover .content {
+  background-color: #ffffff;
+  padding: 14px;
+  -webkit-border-radius: 0 0 3px 3px;
+  -moz-border-radius: 0 0 3px 3px;
+  border-radius: 0 0 3px 3px;
+  -webkit-background-clip: padding-box;
+  -moz-background-clip: padding-box;
+  background-clip: padding-box;
+}
+.popover .content p, .popover .content ul, .popover .content ol {
+  margin-bottom: 0;
+}
+.fade {
+  -webkit-transition: opacity 0.15s linear;
+  -moz-transition: opacity 0.15s linear;
+  -ms-transition: opacity 0.15s linear;
+  -o-transition: opacity 0.15s linear;
+  transition: opacity 0.15s linear;
+  opacity: 0;
+}
+.fade.in {
+  opacity: 1;
+}
+.label {
+  padding: 1px 3px 2px;
+  font-size: 9.75px;
+  font-weight: bold;
+  color: #ffffff;
+  text-transform: uppercase;
+  white-space: nowrap;
+  background-color: #bfbfbf;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+.label.important {
+  background-color: #c43c35;
+}
+.label.warning {
+  background-color: #f89406;
+}
+.label.success {
+  background-color: #46a546;
+}
+.label.notice {
+  background-color: #62cffc;
+}
+.media-grid {
+  margin-left: -4px;
+  margin-bottom: 0;
+  zoom: 1;
+}
+.media-grid:before, .media-grid:after {
+  display: table;
+  content: "";
+  zoom: 1;
+}
+.media-grid:after {
+  clear: both;
+}
+.media-grid li {
+  display: inline;
+}
+.media-grid a {
+  float: left;
+  padding: 4px;
+  margin: 0 0 18px 4px;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
+  -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+.media-grid a img {
+  display: block;
+}
+.media-grid a:hover {
+  border-color: #0069d6;
+  -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+  -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+  box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+}
diff --git a/web/css/smt_main.css b/web/css/smt_main.css
new file mode 100644
index 000000000..5b2289b0e
--- /dev/null
+++ b/web/css/smt_main.css
@@ -0,0 +1,147 @@
+#face .row {
+  padding: 0 0 0 6px;
+}
+#face a {
+  font-size: 14px;
+}
+#face {
+  height: 52px;
+  background: #eee;
+  padding: 4px 0 0 0;
+}
+#face .face-name {
+  font-size: 20px;
+  margin: 4px 0;
+}
+
+#tosaka {
+  height: 44px;
+  background: #555;
+  padding-top: 8px;
+}
+#tosaka div {
+  height: 100%;
+}
+
+.center {
+  margin-left: auto;
+  margin-right: auto;
+  text-align: center;
+}
+
+.debug {
+  background: #aaa;
+  text-align: center;
+  height: 32px;
+}
+
+.gadget_header {
+  background: #333;
+  color: #fff;
+  text-align: center;
+  padding: 9px 0;
+  font-size: 16px;
+}
+
+body {
+  width: 320px;
+}
+
+hr.toumei {
+  margin: 0;
+  height: 4px;
+  border-color: transparent;
+}
+
+.menu-margin {
+  background: #555;
+  height: 12px;
+  margin-top: 0;
+}
+.menu-top {
+  color: #fff;
+  background: #555;
+  -webkit-border-radius: 10px 10px 0 0;
+  -moz-border-radius: 10px 10px 0 0;
+  border-radius: 10px 10px 0 0;
+}
+.menu-middle {
+  color: #fff;
+  background: #555;
+}
+.menu-middle .btn {
+  margin-right: 1px;
+  margin-bottom: 6px;
+}
+.menu-bottom {
+  background: #555;
+  -webkit-border-radius: 0 0 10px 10px;
+  -moz-border-radius: 0 0 10px 10px;
+  border-radius: 0 0 10px 10px;
+}
+
+.rad4 {
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.rad6 {
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+}
+.rad10 {
+  -webkit-border-radius: 10px;
+  -moz-border-radius: 10px;
+  border-radius: 10px;
+}
+
+.font10 {
+  font-size: 10px;
+}
+.font12 {
+  font-size: 12px;
+}
+.font14 {
+  font-size: 14px;
+}
+.font16 {
+  font-size: 16px;
+}
+.font18 {
+  font-size: 18px;
+}
+
+.row_memberimg {
+  height: 57px;
+}
+.row_membername {
+  height: 30px;
+}
+
+* {
+  word-break: break-all;
+}
+
+/*----------------------------------------------
+ * Override bootstrap.css rules
+ *--------------------------------------------*/
+label {
+  width: auto !important;
+}
+
+table {
+  margin-bottom: 6px !important;
+}
+
+table td {
+  padding: 0 !important;
+}
+
+table th {
+  padding: 9px 0 0 0 !important;
+}
+
+table td {
+  border-top: none !important;
+}
diff --git a/web/images/HomeIcon.png b/web/images/HomeIcon.png
new file mode 100644
index 0000000000000000000000000000000000000000..853291b6ea4b27e212bce790fd7c0da8acf6976c
GIT binary patch
literal 47837
zcmb^2Q*<Uz{4n?!PppY;CllND#1q@Ljfrh%V%xTD+qRzU{QmFW?7KI6cDK)|?r-&}
zs>Vg1>iSguQIwZJ0N?;XKtK?rBt?JyJ2L%Cyf9Gz_C&p0pZ^XJPQp?uF#k4h7~}AN
zd02Z%O(zf#z{P(FG%yn3_rH@E&SDzQB90~o&K7pIL@E|GCLo-QKYubZaRntS82&4O
z_g?{JJ5y&j14k1OA!9p36C!a7M-w+YM=K{H5oI=qrUP~m5Eu!2M>Tc#tSfB=1zZXA
zTt6Ve7YI?&IKCgK_s9y#(Jz`Kkd|4QQ%KA*V#zc~v3OJ(A*3@<u_C1{8bpAon#wO5
zGEaLl(ttzB>PB`p<Wbk{%=E3gKKC!PuCjB?<?SuanVYZeP7XU$SB@I~V<1J#n9a-s
zAf$hMe7s7l#df<>3dZ4EdEbRv>CB0WBSE|U)x!0#(OJVea%i~9S;KMUI46f8IwAJl
za;0jts`f+$->ioF>$SztnAE*u?d<(>bKHW4&jWD;x~+q))s^ny+!)kP>z?`M3Qu(}
zL&+m2P6_GRKr1tw(}ng!$H_y*-&55G!>kK%(mmQ;TFC$A#pbm2P=6>p&wt%8IrztL
z$vAZ`Bv#_BgUzT=J-sdwa4it`K}u=A<>qDUBD4(J(~Co6!l54cp193p6ZG~eL=U@?
z<mfI}^sBE*ySjC%^(q)%BlPudA1&cNXKXbJN#Lw&EsZ}0Dc4<YLy-LXITp8v>l+@2
z&~pTKElfZ*(dpC(I-0QMi+CnUC)uz0L|pz~mgAcki0l`>L(6|ar{+D~K6E1iG>CGV
zZspFC1t3((3%s&W2!g`p&h_nqdyvELQRlOIJ3WFDuF8-HgPEY_gmMVhyhd~dAO1o(
z1Lyya13X5>+917}gL3NwadfWpq2|HB_mGU+fQqNT!95I-Khyhv+=9NMqbu6v-H{$C
z^i4-;owCjfHVYnplEWyo&)O&i{m|FuHu(EVjUwC9?a0m)8f;P;fNYOP?FWdd#?gBZ
zv_<$M)r2I>4PPe6@g{NqqLYhSZJ!SvC}IhZCf|NkqocPkR1ya0je!*=aQLuVk>GuF
zD|S^xStK%sI)}<VW6*<T>BtMJ5;A^`vxN6r0-|a^aJ>FRB<)W<CDBLv#P$?;K**=>
z?bpb2@-FVc51MiLWSP>-jfT;aNG1P!$2bczkazQ{@8iqX8C}iOPxb0#iM>7(Omk{(
zB*pqV8F;rBBF%?#a3M(f!#8N`3v3jQoAx<bpbw=xgi&RFgkUU2rWZ*`bL1_o{L=Oy
z(|VB3XjhOI!q@E+JR?w<4-^IA(}9Qp7H9(WWE#IE>LrBngSDX0uWb7gSzJ=^ZbN$&
zh_3wV1FAomfm?i=ej7bneuUwIJx%9Ae$syz62F~1@H813l&pjM6;t>|KbL?%d~d(H
znfM`Q(>A;wfW-~viiP{73$Q%f9TLWWrQ<kQrL=z~g9bAlTC8%JpF9w<%q~7-t^+Ik
zz8ABIAiCRcl&^yY7A&&Q)3FwAnOIp${>U%bSb<MIb-gU9(D;D92yXxd<r=)P^4D{z
z>4TTyWD0ToX!FmJ%r?5eAXUlf9%+nAUQN3XUIYsIfUZiVQtl(4U#AaW3SI&yDc=pX
zptD?lSvF_nVKNQc4L=G@jZt<lo=jK{EM4mand6Y33AHw>HfDg0E33gAzI77?a1O6q
zy1SbBN^1yRQv&5j*@kR*-8+-?dv~OOZxM`1fgN;Ev+|Bm$rU{+=7|_q{fYw;su;j`
zJwt$aHjw}N1PSlNq)BnL;(F8}O^bTi@f+#pyM!=DAe-3CVfSSoDDnxqcMy*1c9|TK
zm$=kdQ?2+VNc7eFqI3laQfl5hsF>qGNQdqGpmv;N|Axtt)Mv{gM@@Uik_m@^L1fL>
zCcFJLy;q5sK_1np*2`OwF(sR8Twn3D{3?9FqRF#)rmx7Xu2FA+jsr$5%UcL7UUet3
zu`{yriQRNt)MVqGf6J9}P?est6gqq&_X&!Gz?ex)485&Q<<n@u`rRy&SN#Uw0g`J4
z%(5CV|7<pjn|*_}M3asa5T@$Wi8+D|*oIy?Wf9i)q6K4GdKjm^ArjED3Y&?i?1`$G
zKm+ZrxpP578R(#D>DpAY@+J^nNd8O~7)AI!a1tB1P|yCFe|a;Z`q@XQj|SVyWjf-w
zbDR04x8p4ap^E6E2u5LO@Ks~=9mYt^Lr{)fr>!OB!#3!5^QGYQIiL=f<39Vk*<aHA
z<?_AKj(eKXb9SscYc)QL-Akq&J`C(}frv8G3(NdwZSj-w?t2QrV6M6e6$VNjd_aa=
z+*N(r9cd2BZJbwDni2T|ITH8OmO`6*a=)wYptrpr@30YyDO9#V?&iEkVkP&7W4(YP
zm1Z}w)e{0Ju=YTa&}~Kq_Slt&H;vox86d}CEN1TC9zH$k(6nz+vV+Kury6qL`EcUF
zpY*o9cah20uJMw0;F+uG<zf59^;Kt$FXTa<W1kKqo+?sviq#BlbtakA4BzKc&B@cg
z#ujkP{dp$zPOHVy>|m<S8j&$wK6}93+V_B&pl3Sf!+oO7EiSjyj!2g_W}f<K7i{^;
z+vn$uygeUJi+1LYiVHC2CYK%1iSwHQ`lV}^kIDtFlMyh2agmWP%9v~X8O7kUxqL&~
zlEBEZO;AGQi<tXyqOX(B<-1%wy5>9QfIm{kJ>=tNd_2O!^X*KE+_8JI5qa=*)b$Hv
zC#1U5nZu;BH4M^C@0^*r1L~&PgI1Z;%(AJ^rRC9U5n9Xb)2&5m=266Z1h1KpVhs8N
zSnDTu4uss7v?Y3YBaM<<m`P(xhCEbr4Eu@owzv-+Jjom45S=O=tu0%;aFUpqNI032
zGD14G2${qo5LtVzlEgTX_S1)tICWdyR-@-yoCrsE^bP6p%WsRb=k6hTX7r@qP@?>2
zvL+8RX9uoZ?A1=RncGF4p6$iQ`uQ-U>1XK5^ptECIi;CEFaKfTP+Qr;)YQ{K!b82K
zA)U<=rYXL+n*-QG_L~5@=Mj6-^r4<>XC^dW_O$oEu7{+Jm9Y5x_Bilg4Dm1hf7+=3
zvgCt+@Xgp*sVM*JrugVY;jO9qnYeX5zixEQkw74k_7TF&bGMYgKR}iV6q}iDu`FyX
z8O5smFX?QVAm!j^-np}zQW3`q!axY|-ojJ;CJ9KAl<XD1^}kQxg}AH#;}1jJFVpS5
zhAH~v%x}7_rM$v+>%6)={p`AlHu34IdPb|qY5K-{)2o8Rb}2T-&aG<epxdjXqt2_c
zqso?a)_G@plaHa+VCb4h%&lb0J|^8OmBVd0bJ`()zq;xr>j2fMgEqxUd)ZEn*0k=o
zYsd041D>j02prd=K+A$HA^r-_twQ0lmt&>QEL29-*24L3J+Fc*%jS;mHqeclzGt6R
zTZ>p$37*B2CI)X$z((l0ByRiG@iGXb&c<J!#k}w1(*5Pki&@Q<ZcwD3fuRHywpG1B
zoV9C~duU5lY?kLX+%3M58N<b`gVK@RZeGrc71NmvHk*gIRfu?29Z$O1&ChD?MoLCD
zw-<M&UF`lW>~(sRHnwN0`Nt^%sTQ{Bi;en)pwWG}Xt*4p;;E!qO$ImJ?A%=3mx-}4
zB|=uUUm%UggE)gfFOYbMg)gn2%%T)czYNlw%%)ehf2=O<jv;{raDRTFD|!+!wUaTO
z2TXe-T3=FM<`(l6=Ld$nj?l#EVlZKY^FW}%VW(RJ2h`KzQLX2|(gcZ^*p~wE%E7|Q
zcYkNQ?dpmzHPOB5Bk2$P@I#+iFF>&9?Ih~Oqum$9x<ZaB5=O=2GpRuTmB-1O-%j3#
z48x8Rsty^7&})tabZz?ZH`Md0<eSZb#Y=^V(OKp3?~z#dg&Dh#6Va^WO7MJ2vQEi{
zJitvRqbeRUudg11iI&GCVk^UjgPg4Z%j4-a3zN1V??-lV8D*k2>{S+d#d1<7s!%>z
zHd|6Kb}m)CNtolykklivY)|KmnAIfi+QPsNix%dDm_EzpcDx}f#L4QF^+{X9+JSPb
zjg$z9qebU(eisa!Mj2&B%;x*^dRJB=BH>F6Lcomy5zEAbR+O0kFeVVbmk>)#@)8A;
zP3pE?^4|SyFKw*0SE|Zo`B(}XZA87VR@9BbY1~eHxmXG_OXVuG8sQU@$=ql1BOPY0
zoJ73B@lYD9J)yUnte0iC03wIkp3~hM?j=jjEjl<Ae$x3)g7Y)4mCgu<Y0R4sA*vvq
z2*`wxjG6+G05-~r=b?ewJ7@oEe-#`J8oep(PdF1o+*qY%G}+J~78RoOp8#2-DfCtk
zLD#O=v`L&RFR+4Chyr^1Hm{`G7m%J2u%!yHC5j>=B!ipKSJrvN1T0@1|EGN_slRyQ
zt%}^LNc4}5{d-mRNK@cPrI9&NTW@jV*SWTixl9~zMylDMYJUU5F>u@*Ydgm!Grga{
z*9l839qG(zm9>n7sU(3URrI-S#gJbxZWBVhPvcZUd)2VKFW%ZFtaC!Y{u<#1;%bhX
z;SNQNo6#yGMZ6>ohkvnzC_}1(g9s+q_t^>RQ>~RzX%^q%x{^x~yH(nx9Z){uk)jAI
zn>Ua|y{Pa(zrz}_1|mI~zj9zV(2-NQj1Mo-{@_*_Zwx)h%!>$x(SsQ<UOg)u{Db?_
z{-lvw9y&d-#*KcP&v#uE5M8m(db5lE(>yEH4JMKdOF=*--<=FA|CO0=2NfcP-#G+Y
z9?2o75mouXtc-}=+JsA}zttOza2^vYbD%%nA8-2lJjY0h$U}_C1KOVCL{Q_p&ks7C
z#Hz5M(J|t?xQNQUhB|raQ5Mf=1P#=p+@CI)GiEjPvjK05EX*NV<=#9(TKdUz2bL1|
zr!44SOtg33VLS?nUveqQlE!F_9}d+LN=+~M9YadjuGC=pDv;eJ1DtZBSK+_X&=`)4
zQaCX5CikbgCzXt>N*j|#!gYo5$KMafS1Z5<=qo*>rZ?vaz%#;aSf!KZE@%((r1-}M
z5SM7Xf0(``S8uLN{|OmPE0-5iaRKzt+QbkyQ8b|g;v4>8aZyuPn3wP@D?+<z%#}((
z-iY<|JAr7;9o@)LXFM&K23b7LCrO*?TJ$@;ByoxXOr@OBTITbLYrPBm1B%8)qJx(2
zCcUGxhyzM_l$pJC@a-b*I*m(HSPC+z27ZJ{mM~&;hjd{=5i7#cDAtX)lJ9Q(gp3l7
zMNzYqvm6k~<F!5ig=eX$1KRo;BX}Wim}du(gdsu`>`u|?|3?x`mnrypJyaB41ZCd|
znkxjS_l!EfIpm@~1Zo4LO;IWe*?65w^A<_>F~X4;G+)r2H#32Q&L6)bn^WpgDj_42
zqy3<bwM&5e?6h(AzF-jFpd>UuSgfIGKmH|&mzw&6IN(5?5w<t2-99m)96Bj7)G2_X
zltq14Q*JQ>%VjMj${@hrGHPIi(=(75LZ~))R(oN1NT-hSPB7S!dkk#SY=LFE?T^G+
zJ8BWd)CP{M3wLBhA~R{0=V1<^pP|D~1$@e;CGrUXrpu4AT5g><ulNC#L#8J#Ss%ni
zPi<Df!V*@R`EPwsRe%JM^>ZR9C5o~VggZ&MGRYz+#Pi+)C;uyRKwNbftd|=x!*GDV
zNfne9(%whrE$jp^d}ndp+TBs)Sm{X0GTGy?EMe)jAWcWbfL+EoX*~%H+f{AUUCdwA
zuV9ivT*i#$YFVD&G~JTDEU5^<eeUG`j#jSB3Qfy|_Op2!6Dcp1i>)&wNm4OLqI`I(
zv=KAXRDjP;E{bO$Bc(GfL2_YVrbs2I*wB*i*YX3=RRrEi{ByO+^g-Rn;pT`+KIPQ(
zuYr+-k{7ay(jr7ad4iPeKIs&5zjlP;A)zcVfbumtUh?)1oIHVin8mwXz@=-Rx~7P1
zz&T45NCQ#p^J`&j^hd*Qj|dvpnpB8#C2DaVIB>T5)-LkqmRDCA5fAq2RI#_V$-bv@
zir_1pne{}2b2%*=10CrQavI4z?){~#g(Nx3UleCWmi*cp3SAI7r)6cr3(rszf9EAt
z;cL~0(5o#iqD)sZbyWxpPvtlgiYH|`o;&^~C0f1gF&B%96j*4-3OeLX&K3R2nSU5m
z<=Uq}4;{IHuvR&dgx@Lh|5#hW%My%M$^(dZQ7zV?tBv?Zpu{E2Hz&^_<npGGciusr
z_akm1le#QsEIKmK{V^c*m>kdot4HX)RK|axhUCgQ;it@FX)+Ckg+C&b5lCn?XW^~K
z7Kf9RRuYtF-!)J{cX?yuw@!j8i8RV0s@5!`I_Vk<r|xpBU;0U4{O&B$l&q^sShgyk
z3umlV`xRGTXCbpD4_<G09{_-@KX<l$IDU~9_mKA2dA7I&mD}u1az)paB@0p;=hiQ#
z%&j>_O3EyHOf2XEZLlaC&A{ZS5mSz}nDxL&B<OwO$|$Ro6**EUK6dbIH5M*Yi#Q7C
z-o_~A37RZpsP_Sbu!tLGpfycg5Y=7Z^|=il<?i3vC%s3>@CQ$kuq>9^Lm&>>V5PB8
zPJe|}HJN>9#?US<(;J0IJi(zUX}WKdlKRt|b!|&_{r8P^PH9&KIE?O*PmL;KPCbsY
zk5bsrTZYmPD+f+&0U63dyEiwP2ASgkc6aYc_?SeRalST$Mo(J*OOP76;Wuoo1-JA}
z4MA+`vi7Q_RB51V+a@!?6uOd^Jw$qNa9(QUCf?soADmZpu&iLNPjC=^aMJ8|rYuEZ
zgyS2jya61M?O*JXsD~il+Ln3f5{}PJ$Jig`Mfh<udEI|Vm@?Y1X1BY!^RUPXQBzpt
z$&&~ioWBfQls@gXu8!v%XkSA?!~B~{30iQmkX>PB<;v%}WEAa2u2E*2UkjUBb(>mU
z8`VZ@n%d>K|85+8EW0-ZMQ;F(Z97HwL!i=*rF8(;YcX4iRWeXFsH_#fv9^MK);-5O
z=)f~3#eVPojXL_`ki6}+b&+toPJn~e6FW%H+AgME*h~e!H;PPTk73B%_hv7{)&}`@
zPvFP(KELbz#VI!9-c{fYL^dw!7CCV{RF`Nkl*p!Xcnz&!l%<Nj0{dOMwznxmH~fAF
z&EN{8zqPx0W%g!ju=^5b@_E`7#E3DPbuL_UE*yK1KI6OVA2CK*kHE4PG^%iqk7mlt
z35s4YOnqX^U0AwAxc#{LB5)-3v7bvL)|8ybqDd7OZN@B;u6Vvr7VQ1*+0CTGxt&)V
z%o`0-Rii~}lOe8P`7TtOjo^$@j-rTHHajtEIdbME42_Nqjc71cV!iM_8oYZ^Ep{W;
zGZc*g%-`ggzoGJVP=vKmZc034|6)ezRl_is#jNIdin7P6wMkaANwS1Lb|PD3L)GTK
z4y?yC6Rx&bZDz=6vty=aN74qhrhNWIrVpD@OnG>_BjCy<ycwftC&t`j!rX%8-Nw)O
z$rs_?dG~ykcC{AFzAub>B+MgJy^W1o{q=XZfKUSJ#YSN@Rn8v~GY{>2)kH5-d|l8g
zL6ksIXA3vsxlv-fhtI^XS^m7hGs;F831q_(C*RKWREzkrY6P-YTI`N)-BZq-HpYm*
zK<HJ(My67vLqNwUn&twtf;mI2IV3}NWz~3vi!XXAc!@j!BWB`uoT%IAc?(3GTy^C2
zD+u3+BYIc9ab$P8zja4kZ(9@RX7Ib8hgOIs)&ztwDo&f<z$dqXf$pu{pD~%2gdnW|
zTD4)k{AUVK85909v6s%%3wkJkYu0F%Zth>b31Ha(3Xr<4l<8BZ6acsN#bq_{<UivF
zkZ`e3>eb0u9xR!Ob{SA{ts7qz44ergvJ4h-t0r4(XdlaR=qBF76I|W+5%xIcpa&%=
z_r-}7ig<~5Q#o!XFZz*W$7(j%_3Cf+NK-}HYgCfQH|B>vq7y~#$t#0#owFqOV=!|!
zX9QgbqDx9hYUD^*Dm7{15d|Bb)>Y}g2DqJI6ZM#I?;$>Iua8vNI#UAYlrk<xoZL&h
zslT&m&UijGY>SGoMrM5P(xkFKmOd}H|Hs6_j7xCG-BTL`;adUkmfrpaQ<RVsQyg1y
ztqRt6>0zW^U*0~Oi}Y}b|1)Bw74Q?EQqw~vTP9FB;bIcIqyn^?P@g!rxI&yw+M*yT
z9b;{Bm;&IT-lP}9qNJEKA6!Z2Y3b2l*1lON3g0lhr5DF*7?L77`>B`#dp@GG;5?vT
zj6b&GWB(-7REf0TyCeZwq8J6*vPifl8w<|iX`pkhM6#uEdd&#a(k<z7l&tn}>RyC_
zC6ABt`+_wRhyE|(H^JNnJ})63Nz!&cra=$5<kkwjTaghyJ_j!C>kR$4r5bCPnt~yQ
z9ex2%cZ`vG=XuFmD}qE935_@D3PP3_wevMp7r%{;RfH2T*R?X)!cJ;oFV-UTnZmo-
z0M57HM#Pg*46-@d0I9Ht1Ya}M&t)}eXLD93by%VNsnINrG@Qp*+9;ot5h|urgk=n=
z33`7uwN@g(um&RL*;Ez()_p~wq!OdZNo}|MWe?9Al(LF0EX5Ri@bL`LRdvX}l-iXG
zzghB-^J<os&%&@^wU_IkGJ?;zWAG{cR_v~<pG#5U&e<h9A6JKyd-TF&-$~8)hWcn4
z>)5Cy3J95vUjdV_o!y)hxeNTOGk)FK;Cx2c9mw=|&4>ZnEPKTlaO)O)9GrVf(<QdY
z7oT594^Mi+*!M<vYi1b}e1vm1en`t1An*oAJq37?K&d<l*f%>Di^+h6J))Phfb*r+
zYM}_kK>RLf3MVamNy+6aNBMDf??v<{;F)%Fe5matujMp8R}?E>{ud9~N1fyYqS4hu
zXv<$UJP+iGy8Cn)V0yjIganX|=nnaPhlDzcibMc;el^hRGT{2Y#kw1g`z@Rf2+|Ch
zZi5@Ma~R1oq{C3_7tnJf!h7#z_w9P3_yJ#XihkKiw%P{gzL!0_?r1yR_Ey=}mgM9#
zJ;lXAxo-+rO{3;;yqV?nknYqlS<l6B@-KEu%bbC;wN<)0VLCa=N}b6{HAxxu;QB8f
z==}W6YWibjAxbd%8&PO_nM*5|O$(Px>%=;{!KDBop>NG}a-5Ypla)D@mFe{FdR$5&
z;HjI}C!JXj_wep*X%CLm6I_f|FDl%hU^68PPOiEjuG1$AN0*=dwGUeyKkFVMIdU0J
zj>UG5z4>+i=Qa<HG0px9BYUUbyxae4HfM5*ars}EiW!jl@aD|Lc+$z6{y&ixBb3(3
z!<l3A^cuHj$iYy$LaNgPiM<p5e{E)ECaQAkM*UZT5sdM_V!G2F*dA@LE5cJqlE3y%
z3>H|9kNBB1RcU*7kgL_XFm!V&YwDYm|F(f+ikK;6QsVQb^w7IZl4AUU3>+zMg7XPr
z-qS4bHt)wCN<Up&SwmV=Uu#+2slVwxc~QPtW6L)?Xc60n!+$C`)6q+KJUi1NZrb*d
zru8Ffx-Oq>&r6Lzn1=J+Tq`m2+de5A`;9^9F+Sq!cp(4Ab&T(JOlsw^`Q|;6Epr)p
zN&0N_3@V=EchBQ@t4nq-J21tW10~7-@<1^8f4*sOj*A4FlTEytsno#DPnqwjYj5Dq
znw{wD+i%IhiAUMbRQzXQ%}lX`wIZKB7TbNj;F=PrYmj>eD6fjaY|{Nru(dxUZE4X@
zdo!RpPmbig?O;3j`fbE`H`9Y7U*I1E#)Nt=^|42}uv<@*yKm?AI$_u2Yr6#6-~L#j
zZwGv@zNas+UCT9Z>H-oo9Z}z*)t>SfGVm{`ymo0j4CVvDPeD$#Za*pGd`xGfCIXrs
zCY&Y@Bl}r+4io2`Quk^=M!epQ`%6GA7H3Zq0UkbKtVnA|#_8TleR3WYgw5mzB6YNW
zi56Q!amyYbrWFoQ7Rr!~@RiYxaOtpZG#$g_e{Q4`{uYnu-bXC`Rg%fN;m6I@NDBaF
z`+0qB+g4udKuur?qu(Xv7<2jmd7;g<dc4TV4LKQ3+oRsXNXI8nUP8;rgQIY72DKQ8
zYb=q@Kwl)?6bP<hx=$IkSB;1ZJ489UJcv5C?{Tqz6u6XlarJxixob2)^b$PXEOa91
zJMq!8DpXoRgAA0K?vz)8nE?&Xq2#{#nN=q-@}8r3KX7h-hu-Byqtk))T2y30Jko{D
zvKiM{A^2&6R`W!CQY8%^w!V&ZG?ZkdDCfh9HsziCMgGC?k#=>nY0yI{#_#YJ6|pug
zLP(&@5Xk4rPK>DoIMgcj8elppN_Zk){Z6`%HyO3(6ZcIBkeMw(*Y6Qo0%R8u;m<ON
z(qLntsJ=+)Vo^F^lcG%t8=m+*cx@rAA=xk9yY+m{rjTS&8c#tdp>3lP91wW-)F2qL
zyxwvlLC6Hpcw*-?Vcq45?8grTyS1Zo^1tb%=nL?Fcih%^`|#~8#2V7FC+7HitKFBx
z_9$;ID0D}DKK5N)p!QVc0=tjD=Jh)zlt_tk%g%RHApr~5?s9)b6FPJN`6ykn+9tn9
zf6l(vI1ay!aq{+`l)bx&1q>f{=%^Ypf5~HtNRGbDV)mo;fV%O858~w}A3P{Wd|L|u
z7cd!s9sAlQJu}T~v8#Fwv8yY+2fn@C#o-Wkz1fA~<bUR?m7ITwvW;mz%tsaFwM^4}
z*Uqqe=jv#4=K2_1)?oaa>2kepa;nMpx*ED&uYpoGGc_~`a@5mtU*{;R=3SHqsF^yM
z9Hmy;eeU@&Kpe}|Lb|+!H=aB1=f@KwrNdz&87%D?J<FNUM|nf$10^?#!jJ!Stb<ai
z^K=y+WV?d<dA&2(ZQijLY8-0a1>v?)Fx{5vKHR5`$Un8G@~UwzRpcb==7Qt*Vr-G>
zCDufqZfk9I(Ur5XwcZ=y<&Ng9l;%@>M&hiOaL$A_3m#+%iBr$R2-Ry+n6Wv2o?L!h
ziaeWL60W(ea_l|~bjUpSOiBH~JUe@(isMKmm$8}5f8&YzyNkSx7)==~0fW64%Qo>g
zymrF>{owZ~(%kcrX!m_1%j7pi=<qn~yfb%84}H@=XQ*JxUK7!_bjl^e?}R&e!Fl5;
zND3TXB`;@1%EMQ>a+hp2OaRV+JxyG$tkJtdON6be`>%Y9d_)DV&6qZRbK?!5yzG~O
zn;d_j?h;GPmb3U_taqo)JxmI$gsT*rjK%ht)iL5fbD_8W_*`!|>BFRs^+}iUWN3EL
z(F*D2Es7Xrh)&7b9PY<}I95lV3=!csH}V_WHY236xm-xngJ1@nKZ8a~T<!ZhEUoNH
z*`hX#d?z21T#@TFPmr~N548t1rkK#xnq(7Byy#+&tep72srJv}D)YCwV1RZ3#PrGU
z<?ZJ0c+u$M@bGZ3mn`_T;*Xo6M<b*42?^#_Oj!V)7E!<kLKlIo{O@+5982C9!bgL9
zy5{o3K7M>J+t15p3*Sqcst0UTugh$}KmlY1t3rfUp3q879HM?zw<Nc}>v7x<c<O1o
zI5}?Ppyx_#*GIUX*YUocNkur_hc;{_1>CVt0x#Ej^W)Am9#_GK)|ap3s=cbSB0IDS
z!)kx0ZujHf6);hjuzT&d7mN(O7v_&;*);X&7q-(C{wn5OuavJh3(YFV%WnYO<u`-K
z@n<|G`18#r_;XRZ=FWw&p3&xwlFu`2RV`n1n#KH+>a$ML<wrE^38DP&^aQ~ZhOm|#
zs`dW0bf_<N^yD2HliH*3W{(H%6Al7OR-59xWv<g9(&(D}r`Z~%?rz@g#I<FKVA4YD
zdhqh8)!<sGoaG;y2tcjB7y{c_T9v3#rOW;V?(7#}z&}0#J|SOsC*L(6B>>tU`S*aQ
zbsxfH<COdM`^l1mWV8Dj&*OcM=$ccwnbGHM!a8vukH@T<UAP%l{;!w!B$5+Zy@3)L
zGg+;HFcg*b^uzmbqwa{<*uvwA*PL98Welm0;|{|;lV_7>k!J@I#OH0VHYxRyQ_E$R
z;amX%`JR;bOApTWZbq~HtUtK|6!P7!)<3K;mt;R_{(XW_zK|~$GQH3@Q;N3t6pzx(
zQk$`;tDw{zZky)dHJrMw3I`NCpV?w$W|3}u=VW271}b#Y=5c9K!WDAmI4APoK$alx
zyM%Bi9Jq*L1husI^B2QdX>=)OG|0<RO9QnLq<jPm;g;eS?*zhPvZpvj5>EUGT=v*9
z0`6sbY4y@S;rTIxS?!;eBlI8<Vuhbzw7mN-jgT?!_ekp<bwjFW(^P5!It6bc6wy3;
zJ)b<y-t;?kk4EbaGX>J|;%a@8$RiQ0NZF}b<tz;cQZrrVKYtgbz51I`J2et-vL~Jw
z?0c9IC$3n;98?cioc`clt9}ih;}LfiD$~ZA8RaobPZB~k!SSJAprQk6k?3juJvFCz
zdLCVv7A8rB@w!AK#C}>1^y-ma%n$#Ht9$`H(w?~NxP-gR{MY*sdB(hyxwOKr0J%f?
zW=-E;-3-6S3j67aCxShPog@2!-j^~~o|YzJ7w+By@Um~-r8CZe@6i{~%|9JMRDm7z
zhHx7I%Wu1x?aBUqbK1IXenY?$qgw@k8Nac=gY`9I<KhjgmsdCCb>K$#mUSX}&b3kJ
z)jn0#$E@9=zB6Q6Bo^IN=Vjg7vVC25-TZ$U(AX#=#DBo;fsbu1TiOk<#mC<{>jk1Z
zt%z<kYzJ8Np*=3|!FpayZ5`Av5W-8@dGS;w>J93wo#ElPuzRjPiFZWGmB=Z~mZ7v>
z$z3`^yX}c_^WEVi&u;xLnZku5Y*w?HZTX#u1ING;NSf*1PotaEX6LfK&BtJ9byuU+
zdA9pjQRQO2U4NU#-$?sug~a%hqDm>afiLWc#?xZi<e;^&K3qJO*(^57QHj87Q)I9=
zV7=XRtF=*JXVrz!Ir=*m*C#O?T=j|1(t@VFW1+yvjlJ}{i$Mo*deF2)voNy7br&q7
zqfLpEJJb)vE)^$?gWE1`QE;RGK*%P7fsH6qF7nPwv)vqFE@QFUn*Fv_w@Pm7Y_rc4
zno!gY_sNF4Sc%fcYSF5(Nwd&yD!TB%wc-S?AycfSWoeJF{lZYjN5<P8mj|M*qYid!
zW7T?|ZEO0R0u}v3{h9fLCr@rmXNSnaWqG5s58Mxjst7WsKwd_2To6)HKrUmnkJ4_5
zx~#w6D4yS;C6HJHe7e$u7-SUY{i3?1&HN@XYon<{f44==VZb$&wVK|0A0K%MMB@;;
zm*jhh-*v+#&}^WfkR8W4{+JuKXHFbPqYsYVcJDcveS6Hsu4dq2`xv^-_Rw~+1NX!1
zS#`IR5!|e6hTl*RX)Bt%edB$&yvM+-LhRzFy9n)1=Q>&N-#?AEj!i3LTd~#q)p%*(
znYPZCZkauK_=rzXQyu#bg&DB4hle6IY?rc(3PC>d>2Yd%LSL%wloqVwqnn#8A7?vL
zxjJ(EbuP9LnJr^qJS)Pwu5J5;T#L^0SX*2LiS(DX+?2qywp<KX#Nkv+jjncwV<11a
z>Dsd~fG%R*Hg`4jK$jA+tmTR&_rd|bS~k~MICny#h6t^TDrB}7TZB>p^ECl^auw&j
z7iy59A&!>a4H3zgyAZukN~}2qMrC4$Qk(YZAASL8ZpCh$t4PZ}5*58hT7So%=zm5%
z5wLA!l6A1bJ#BU^Z4H*3ZWk19H`iL!uo~>h4cKs;<!{%wO8nkAbYJu!P5QA<4<sv@
z%N50k#r1F3+L8n4FB9pn`xEJEoS}bU9_t|=+X46%BBdW{PJ<%sfVPe#UQ2~ChE9-w
z&ZwyubgtNAW7JzDiPhU^Y6|W%$jxu=mj@;TzWcD{kT)z7uiMr;F;<(_wMAC8JEJ+)
z>%$?M>E<n47OZ=1I`SrbUR>RRl!gAs!bN=u)h@f0od;-lt}BC>;4s_}r2b79>j3-7
zaKTZ5(V#)!p<{)6qoik}Z&pf+@BQf+w*xh3=YqommUv662u^<+NdRJ{KFQnXk|+{8
zcg_}(ea?2;!&Tn;M4{o;S7m3dpQo~uH&U)edrO39-Au()O4=r*Oi8_T(Nbz*9U)`y
zTInXmcu~b|7yjcS)4LE7&v@N7`@y2Cr5_j2d%g_SLtwW|UAbnB3dh#se5vR((L2G~
zB5V1Z`{(ZlliT6JVLAV~BN%a;g3P(GIfGnpXI_Ngg|e3JjtGY7Phr`}#IDWnEaFrR
zz}m@m7Bg!GIBUzp<CHTSE>88UfNxip7!=dv+=W-3?_!Hsi&CP3tvbM8bx7IaUc|mZ
zVR2I&gS<-sbVRdR;P|d0_W#&+Z$3?{8nh8};rZ`Vx+_rY)%{pQO|3>^gfvWuG$XMr
zm_q!(Iu*&l!V>FbVE}p<rAiAK7FZue|8041t<VrHuw62$$A0gbMd0;>)3xj{WZ?LN
zm~27>(PZdY@_b3TUeonQl$}aKUfPesv33elR&E{t#lNO>=z=u>f2JJ)l|bbmp`{ff
zp;9Q|IXL|zX&qpi+1xGs6}}{e70Q}$(bsdL@ArxeQ-eyu(}1(9>QPQ>^nPM{`R~Pe
zFKFzgT?o_jfyv=l_EvD+ZzK|RD#uf%7l6<S%pq3TbdKof>*7K_X%8|8QZ^t^A}#yR
z{MhW<A>p9?*a&jGmw52?l<Z3>!NSd0yk<zD+EM9TArxy&QMgv}yV`EtS!k_tA&Fq&
zDx?AJGnef!M5?ASiD*RxR@HbsE$pc@SVscLjDIAm`*82x?j8N6)9)=dRNbFU3qyo^
zw?X^$Q5L;q4^OO25vGB!1FS028mN*0q67Ow104{F0jWPm3MzF36eRtuf)ov=YzgRS
zMtPi6<WN7O*_3yWLD!!4jec4+-oS?IqJ}q{&-W9{F{~{Sd`$RqmCH$w5JVJ(y~2*j
zqyE1~?NN82b7%QjU0#)}O*Cvi(OYC=v-fevk4Mr?dg!}F+Cuoy4vJg6o&!B`G<-5K
z?q=fF_z>@ArOHz8=ATb_?u-^us{+cLs)}rb32K=X8kbV8=U<9WfF1+&1a!xd^-wO~
zUo*_8#H=CgwEgZ1OHO&YOyZ=kim{=7iOdtf0)LfQYj+vuixkOPmHL8~n}^?qFv*5y
z^Gj#7I@D;zx|CU-c4k!#s1N5o75_g3?Sb68J35TP&?-7gNvu?bU6FS%BPR_`w77va
zoh>Ii09g$T+0CsO1=z%{jO2pYvbdPV5&E~BjMA*GGEK!<I_Gc<CD^<Qs3wgAULC@l
z8CSa$;z355H>)Ojk!ROUa3TVBG01!*tdD>ZVj^i7#e_6jJ?#1y=SpGe`p4|nK9!pV
z6pn)Gt`~RILhxn`RS4JKFMd-G<+~xe>&gK<w&qZ28IPz_^2Pj0h3cp-8m7(ujMT%)
z5tf8PrGhA3J#1*Xdnp3fQr){Irj8otqi$DuI<nz^j9pN!j2vp~1YgEhR-_o7B{w)K
z#VjSlvsD+$-8v8<E=S|e_>PeSUPotVCp}l0%Z@8sm|Cpz^FbOdr=w($`WKT-L1t?*
z6kEs<E(Ri<DuE?lV~p9c)ge5r=vI2f-o?4Qa?}aANK+Qdk|=gFl_<AQ*)9EL7ZXgt
zZ^eKJ)nR(jofK+)bkC^TUsk_x3BZmVlvDQ=C(Z%ALv9ei-B7`ONb@RV&AZ?3t=&P<
z;vqWqVXm4G{$PcY44xo50@(Z)l!a~JR!ra!nrR*L6R?O!8<pyJ2|G_Qj)cL418&{f
z$?Y@@vA_7~!DSVl9>m>vQ;T0DDDks@{MJosCB0l^N~$$)R^z?TNuVS*5g@bwJSPXm
zQpU9X_3O#san7D$_Aho!7)w?u8}oTR9QFX%-Xd05tivOO2uz?pY<^pDbYzF2!hQhE
zk#hoM+Dx%omJ?d+ybHOsTt*99+PU)&3`!$$&Zkj60pQ@iaSpe<Wra)%2E#esF9Vl$
zq8E~|vQdL`r?huGil<g{^x_I;rn$!6$8z)-!PQGjaCwsA0+?G-?-J2cQe8Nv7$jd=
zqF^{)p4u-b!!?I!-OdI$t+)OK{;p$NX&ZLlHsXiUd$Oi+-glKTOK+t~hH|D%@}JT+
z(gE;1w8otzz2yQ*p+5q1rW&<)-qK9U*Z%%Wp*by`**jAxm7l|_?3Eo|<<{f%*F9zh
zCR^m>LB*;>cPLpf{+ROh+|Iyq3uUACU?z_*9!ixigOVFs^!!_SBD9XdHBEY@Q<gPi
z^fJ~KTPCcKkzEuTORjJurKTi<kFG+Vm^LVpVHDhko<Ay(_6e?VOG_HRdjKs>CKF}$
zs^WL<S){BhBNckaS#ih+TB2SpC)%90G_I_Y@6ko37%k1bu8CC|KXgT3*EQ6lj6L4q
z&_y>sV}e+%&PHs#;=Y^%uWYw&8L69A(~F8hrig!MIc+gsj7FXK_=}B@p|V6bkl}Gr
zCEvm;i1e4mUmB>@3PXT;6RUW`g&bpftkPpKu9UKAG46-Xuko>_k6SF|0^&K=YKc5f
z#pBao)Cy-F`{j5JXn=tO7clm6C$i9+U%g+K3m4e6>va`@N{j#(x{#&1TtkSze;aK~
zoChe8OkwRh1KMlBIR+*1|IHA|f|D^^l_Yq$P4VB=dVDF1c}oh!n{moTn@#`CG5`_k
zm{3G0rQL{4um)cUNmfKfM2UOLL=(~ei9^UP9kejSEZ=CH)<f+=VkljcW!)47ozB0d
zXj7!VEJ4$}Z~}(yhj5}BSY%xSs>%E&7y_Z`!rkKW;6+}@OWw=y!TRjqqZ+y`OUg)*
zAVh0|&$N&@qy7LrKK1KeYHr(qtx?5zDl&7WplpQov@=2qY4<%#W6W<P)0kEBq@Ns3
zy6G1k(&JM#(-yX|yi5EQ8j)lWtE(n+W){W$Jk(7Phv+g2@CRXh>?{OcE$=TDIe;Au
z_3etlnhJ$4iSOy67pz8@?skiSNp-&CZ`$0<q$HThvup8v`3wa#d`S5tJK1>53=-zx
zlma|r0%n@YL>%I*Syto(HGR$oRD!7}&0TCtWJbmpAqB32vK$@Wxt}DokV%eA70I`0
z#f6Wb=XdTFQz2C;!8GQn6Zi*nvM5c^5^++JFrICrQ$pigB>{fqy;7eDq_GW5^JPc_
zutzmisRH}x%^>^Y84i=20;Awwv_AHp12gn5=J~(ZLEqrdGpWD|(<4Ezt}4JIl<tWQ
zxDHf=&rl>*2-Pr$kXn{(3Gf*=wIY7^ZAQCEcFuw<XqU<K@%{VZt9KdO)d@6Rx|u^b
zjlEj&4(k`dhmuZH@aAbAYD8Y-(ei?c4^bz!t=fj#z3Vb@zjJx*j9?@Tnu+eca02Ua
zwo7&Y23&VUeyonw6q<Dgx4?CyIonD)rv{(mJfebTZubyk=<Q;nlHWnT7^CHm4VfM9
zPY`ui2z%??%}WE(G7N}ypTvr|O?mp5*B~}d0<TU2r-)V~yLAlb;FNRp&#xc=hTGj&
zupjlXwY`uUqmb@k6OX<O$0%X~VE;clbd;aU5Zbi+hwJ3CwQz-fzN%xs3GzAyaU;f^
zZ^nqIXW#2l1ajhe_*I#NF`7kkWMf7oYmnp&T>P>H$j2Xn$}97afU1r0s<lBACx^AR
z)}P^4V+w#d$5(ih{|q|*A4ca`7vMV1Avn!t_a1D`y=r}$#BywR<2UeS&WdZB7iybR
zjxO;W^f%?AYd;>0?*6Z5p4|g;7RK+mv_b=p3MP`>`=6h0{~Iaiy9ZuTe>AxK!dx=4
z&h)&+_>?1koPzhE4eoww1yL)b$`RA5fwdWOn3Q0J@hi3Y<6{0&VpXYR@@2>-zA)ab
zn0SVhdC6T;QkP!aPF8#Gs}}yfc+&wIC0!nK_W{i_Y>U&EZ64c~9pcav-QC&1y8Y)n
z#7!;GlwbmcAB(unyZ@cvOh@D11yqk_%+JU)f<R@8rea*<T|tNGRspQx^a>vx`dBbl
zs6q4_?uPE81X1F(WU!$BmNB1(&iUn}5@F@vVi;<?r6Ms<H;dnBx%?c<2+C_iG)CaC
z{Dgs}C{SB%3C1($6i&l$p}|fd26kF_^Bf~S*dT0A2l`mtwLF~-G`U<TSIXUUS^q{q
z!K>#g8e>3Wvjd;WzLoIYm{U&g=u}(1)HpPe?dJ1x=e+1V5(5)rCPESzs8i2Ke`2X!
z798q*b&+piosl0sL}l&u5{NtGDqtSdB}WR=1gN+6b(hWQE@nn=k#Sc_jviiEmJKGd
z6lD&gP0UX_`gh+wwu0aQb2)dlcCQ)3`Ry5^e&*F{p?#L0#G3SF?Q%Pbk5>4+V#GRN
z7<0?l-<NWyLX?oLq_fDYgL@0~3iHdUM_VS%i(<3T)~83yq2E_q_TZTn<WUvDYHB_%
z-UlnYv`PHIGR^PkA@Udm(ErJM%V$MfjO{2s3+<ETNvQeQJrA<fBpeK=hy}>!V}aY2
z3Dl<(K-)g{|L523b^rVt+14lie4MuG-^7(&%B~v4t*e}7`G(Rt;q&$Ia>fI<{uoi6
zV;wsN&tbwlU$Mo1YdV76(w|dKPuj7+bZuc{@aHIjXxrRhj@5Dk{nMv4k`gI<dfC3p
zsZs)aU97(HRV91_@Isq+%CBha0sqUCA4X9EW|3^6W4ci}*E5w}dJA>Fv+C87rtf?w
z@%4J7F2>JJdIHJ}-<?CYRULE7C$^EGt`|HMK3OJbu~W~AZWRPa4q{Son0)iSl{+bG
z6_izZvveseMm3^m?!B-$x07<bVLclpu-B<bAo-jRn|kAMS)CpgI|(dO9XnbZUf=uT
zbYs&6vs`pPsNX%@tGV_l+of+5-4zZ`%wY#c-(>9h;XczdNDbP=D}TNL<aZUi`^nq;
zbHYJXzmT%%vn}QVdx`l%&L;(D$S>6f6-Wb8%;^nBPrHuHVl9Kk+CK>-4fDPLEshS?
zT&MK!2b3t{rHPA(W4?6rodX&loqP197!m}7mX+Se34X=aEBEmNaFV>iz!pgWX~YOp
zFl+NJfmdF~Cw}HlpgccGq=3JTkm*L~0ms|CtV1f?rQYt%2Xgf1=0?vJ*CPJ_EH@-a
z&yOQh2i~QbA+3-9koCQCZGCi&+w3B%in9L6qi>nM8;bdVSK}p&7`M^$?SP7%nKrJI
zW0n(Bmj5vJpW}{BVHR$}x0y~)bMfS|@nAZ-POov9orq#YGte7N7asr9=bY5Y|9m&=
z!LcAh9P_rHC%@_FKd{zxa-#lUtt?-cIlqQvE0mmUc7kkX&6G^Ey@l)@ci0*4|BoRr
zNA@lM2gg-T%{i0H|2rIKRrcTQPyVapfzryA`;UwN*?3~xn^=}YYQqCb?SFD?c9NBy
zsLJ}k%Q2Ux*#8Zf<1;hu=@&o!$%@i6S0AH1+K^<`mH@XL!56CXA*qxX6_qyRf5;g^
zr*qg9xZUaew9eBcXi(uGVpXj$|NRj4H;BH?2D3!4%r(?B5Z2e!+tu}$>;%l*lq@$`
z3C|4MMRsCxpNlPYbd#MeEOZE4c6}tN0YxphRP$Yg7)eKRFoU=E=vZ%2XTEr$mFJUQ
zN0oEPpT?qjj!x3tHq&PuU&)5E+l@CoHnC?WQ&%z9BrZ2D!J~Nn&U)6eXTJG9q9q^G
zLvuUqzjXQ^-j2=IE>1qP9-O9UJal%Q-#n;CXa1Kz2WQrV{B4n)8Sq;(V2o?hfv-#;
zxXGj!!F`M*!`NjXjS=#Tk4AVk;ukq!=Y`50UPuNww2NR9+&5-s$jG1;%ARm}MDbIL
z3|hRdo$47ty}JRgp1eBhDtHsmwvXbjr)ty`(S3J_V`CkJuz>)3Z`UswEm|s?G{zc?
zU~Gj&82M6{mC^Q>QA^?9C0m0%;n#92xdCdB*z329;t`|~OmOHJ?(acQl#2vm8qqR%
zvEn%*Rk;0k*Ro8X(9e9&s)9=TZJ#Xp9Y6?PJ^bp6Sskv1t)L4+<PL+zM*?qw$B*D2
zuU5dNnYjmsgP#0~oQ3y<<xYqh+~st*btZ$MN4(2yJW!O0P}YN=r&q`%;U&&tNB(@C
zJq_BV6n+pN>->oVV|j3+kdUi4isJcbsi#CE!ekqzFgmAbCqx_Ydje4)6)bZh4?S;P
z*I}2?ob9(AJHF;Jymt`Q;Jm^P8+>~f*L^P^>qPA1h`A4fq7Qowx}j$D;-A-XpO*&x
zJUXy=xt|O&wS>9fI<M;8-8r{s5_OtOe@h5+lRwW6ZqQ#I6K_Zad~V<ON_q$$9$(mQ
zF#Glm&p06tSyaC|$^{M9@oT8#B^_I2h*=9>;#q{)NWi1NJ#*UKe#RUSgw7~G-9&&z
zkGXY}4;sE_Gla&)-Q?#cyGagB+x6-oeXje5k2TGVJNTG>+kkzLTp&`FA1LWz)Xt0C
z5nf9~VZXT_Uec&ChaQd`0p`~1pD|8oK75*|d<TIz^*uFpH}y!XD}zp9HV%1$mjpU+
zE{;1hfd%X)GNlw;R=ODu%(oRT6JQrz*k(u~^ZsCB@$5&HKIQmoMVFv#<%H#ozp6rq
zDJ59ua@5!K0*AdPpWUu&cM=WDTifGktoV?8+-2GDFXvctbqd(JiUhX+F6LOrH7fPG
zf%K!r5`U*kj4nubmZw4*T#}YYE;9ia-J^w=^|cb~44M~cZcX5d)vlfrBRp47K;WLv
zcI$zSc-?5rJ~W4;+-LOOLg(>Oof+TKh3@_5VwtXsE}pB1R-xG&-C==7g}3y3z>5$8
zKRzGfyQeK(R*v3lRZ!u#fk1o9$HWb-%U3|$qcdYLiaB~8nVD{hr=X{u2ln)8q0v{C
z$~?d&*;BXu+45G0FTGwX$UB>X^+>Kf4WTK4q~qxv?_tbVufF>(?7Iy)jS-R-kbcFb
zt<Ln>F6^*(4!|5{gACz2Ne=0(k5m6~Ki+Rm19##-a*OXmnj2jcSsw7x-EN}vRMnSE
zc%UH&Wh<^{-rs}8_Vg#y#vD%N3CYnZUOXyciixX2lh1FudxqcGZx|Tw6XpZXFVNXx
z{JoK7>=2(56FcYLpi#fLiJ#FiAPGP;xSBm3cmIq*0j8PFtZ?Lfe9nB&A*}(g6}rEA
zSo%IO{CML?`GGl*CjZ2DkPFh!cwizQlN!t;{foO}=z0=zkNk!QuS<w8X4*|AvZ=0D
zBlkq(Anmg2XUym{=)=W2&EpxhiA@KqZ|kMZp7XxV@yNz;ztrx%2H0iI>c=Jc6-z|x
z$HHNB5S9o3n}0zwe{>K3(@A?Ll!9X-CmXPa71KhG+{0t-Ym8h6LP~WMDHS9h)dNZ5
zuo1GJJIu13JNgdOqLT0=(NJ4GpY(m*`n)A|IKlV1@H$MID|ZS8h)^CJMN4Be^(W?1
zz3BCBq3&cj_I09ZuN2WaWZ2N<h_w>`ZTW8-U6vg}yKjgyh(ut-UvTpUM2o(-f@rX{
z9+79;ne}yvp4-S8yw554rd_sNO5~^7AEU|jsUX?41pgrTxkh+n<yp88mXWwZelBog
zod>5o<b6wd*1ueXI@DF~-l`DFLt9&no#=;P4%M8-j6YUy{v2UYc^TH!OvX)5KfmcW
zvj{>f;)wm=g7kOj{p8;S0mfqs{8_wfA3qZ-cPr1bjl&LR^<J)0UZ>p)kb-m(k7`{Y
zMn>J!f3oadjdL@xS4A0N?~(y`qPXR+o={=zcO>b3G}V@+$EQpruz;mbA7C}x<MVs3
z?}hGzC8gnBm-8PZ+7~;de{p?`CPIF=J%fJCPrBc@7`8B9zm%3g1ut{vieK`cz0<hT
zOJBYZ2R|TDR>39Eux7GmL=>v#46Td~(8s<QFE^r`!B5wV+gU0nM=8lZQCwk%d!SPA
zX3H~k>4E$Ex`=LL8`Z2$CVWvoL*7>TeZGBP0Lz3&suKqtD!q3k$kVfQ)pOod8t*%o
zHDd|7%h^tW3i)9QpC|*n&2*ppiYbF!n?L4M*q8`YW};1rj^3uD5e3fHoW{vd!`ymG
zFCBo<BN)Yv1a^PuKGuR8@XGzw&_-XNs=#(z@#54a6l%SN%aEuY8I;LX|2Z#}R(a@O
z{yf=soCI#*$!uN2SXm<P_d_XMjndRty1QEUuYGK91{jN7-dBu#(!M5@wEu&>_YP}n
zX&b#kR8&M%L_n&dpwdBl2^K)5iBzRY6Y0GZB6g*TQlv&jK<T|hKuYML2%(1_N=PVy
zkh;FO_kQ+%&hwq?{f^iBp6mO^bp=?g+;h*&Z|<2jvu5sD&YLFSG2itg!*{hDW>uF8
z@2p?o@=bbF-ui`fgw_q?ya|1n#q&NR^mJI7mX^+`!~7fE(Z26{-&XdvYKvwB4mkMe
z<r?oUk8Q+kzc=vKn)ahl2wyWT8v2SY>@X1z>ayBAj0`6@;{(MCSmvcWWD^azzue8f
zZJ&HOX3z6=m}A`M%w&g(xSaIoHzZE%3Z*DT#T6*nPmuj<jxAn%*;>ALSjKYK>Qx)8
zv$2C->zf-}8xy?)0x2Pz&N6M5K{veXuFvDmzj6IN&-?wu2jas&=6Q=hE3zaDw@8l0
znq4H7FmdaY?}l5?<Ms{}ea25;uG0Fd9@2+eIbp3CO7bL&Y4#=4OxdiI?Z++DiVIT$
z8tPO7FG7l#p(hex$a!LLk+$YwBeBu!-{<#h>*@3RZ&3M2bv1};8g2cy6QX56ZbOM3
ztxKUudv7UB_RN8W7=;5=Dy9d#8wRG;0(cwlbB_vDwZWuG(23POOK^nN5H=bmGgnr@
zZo9TVsz!H`oZ%{*$ivx{4SsGPA61i|vG63A2U<)C^9`<VfnDpzn%mdcf5gTRqiqg0
zDO9A?*-j}dHx5NmFDw<lu5@Z(LOu~$E@+`oEvMGO9dkfjcb7&coYN`iuwDA-<?4!o
zmO_PbD>r5LkSF@A$6iXNjxHX<evkAEnNtz`SXZH+s&HD}tzhJ%XN9obY0HQEwdFUT
znbcqOMXlC1gj%+a%-K{04K;6@S*(rLJI+djADQhT`K__ydHRnlRh}&f2Y3v-%vV-c
zMC-j*aF2ZJY0eWge!J!S%dvXb*{VuS)JO<VP+SGSL1^lN>Yaw^%*1SHor<_}fYVbF
zYHe_FM%OJMMXol;m099rO)AgxO#40Njeu|7L7CexZn2h&tMdQIUcSpzI$F*JOU#NK
zIbLvUz3U-U?Aq}7kMur1w}6eSepQC3Z2L3*gOyqhS{A8tq>)KQWsj<mKIyu9exVk8
zv`=*sl|QOlnX5{!AFty{?Qe+g6}B2$&-XYtTMTg&D1!|pHtXekzO7bXbDy4x0I{}~
z?bDh*<=zcVYs*=!5KMdYJtyU2K*M2pg7bI%XyN&yCJ3wI=R-12XtnEgf-?c@66U)F
zCiT4mN!=+)Pe(yzMc2Ml9B+O^ISG^$)ve3VmNv`TWnR_uP5(0eD3e+=bAYGHi+r2M
zqolE9)pK;rW#FChbibXkRsNmliDI{_YBX1bJPZ?xuSOqX%BK=s`U9nUGalEsGD?2n
z#XV`Bl`x$Q$Xnv&IWWrRKJb_-S04zDOtFsa$*M5Pe7V%n^BTMVh8Zs4)nrIL(n1a6
zAIN^JRMdnytEPf!A0x{|ZRE+()k5|Gx%*$Q@wqZ91c;3i9uBPMZxo5nxkf_h)5a>|
zpOdT$+Ije}5d|fomQ7@aBIC*Xp3luo16?(!SB1#lZ%q1`rgK~_7J_RIp!lB{z!e<T
zJ`?wuv)>nvRr?`7r4<RY>Q)(2vBof8uVcDroZ}RC8ClgKH4^&6&GQ{*MC^wz!8DK^
z`Z+W*C1m1zcEjK^umWq<)R&hb-E)1m;P>-}=;%B5Z+h;%Pt$^&^gr*$u<GHja4GWs
z(;)ln7MuBgZ>TKWl83exo@cCRW)aQsSKAaI6x6!^o$-k@h^0behqWW<fz1Q@)V{Et
z$=eU=$*tL_TZD`3UIJHnD=|~jehO+Q9JR1Zh4NPy@_Oa`+IuI0S`#%bOC002>HvZA
zf%%nhvT_M@-|+8rcX7IFx0Sxmu_sce92S*SuQdx6KihJBG^`OlbL_RAd8*&`mdE^n
zWypTc$}mgC)a0J}U~a<;XSPyeX6(AZ?Rzq%%b9q2gQAwGd)bSLZ7rYP<yVSb61=3V
zBd#&+&8mvMa^A#ScC%(Faqp^X)7V>u;CGxvMGLql{Tb+D_BGjw%mg_Zi7Qful&IYg
z29Xa*6M-(hkFFJ$e-^kSk34bh$-Cs(cUeOFFW<fTDiUkrWwRr}OEDpbbDhnW8F|do
zxCFKx?eKaMNB4IRrsu|()JJ!IhbXrFw>;nf3QTu;PkHUWCUyLP)y*@v&R#kn{pIbc
zcUpH}f#mn>Ro!lml{oCBFdy}MJ6F<u{agh~G%Nn@?Mpv@QIP}!fws2hdiy!*X(@k_
zF8Sn&jgbj-%0ppsd)pTvkx0Jb-TpcJCL`h|jga7ArBVAed{F@&Ad|_GxBc@&K$(Cu
z88HJStE;Prk2Cl(x@Q)OMg=tcKOc_U<LGO+m*U@}SXNFd^VjDd1bs2PquwQb+xN>G
zGiOr(O^Ku0`0H$F3IMMW)vqLd(t3!Q-(T6xr8wy%m{}o9GLm~W@9}ThyLD}gS!6?v
z)9&%ytTS$;M|Z3;l?be_uW!V>0taOi;JQNKtEqzZgL7%S+LR1azHWv3q&RB=SpB{8
zU`B1JIGT5FnFe)U0x&Az4Bgv%#TfH-VYqSE9fB;?cv`3kkNV2z1Qc%E77!RAx*Zeb
zcU+)~;MCrX?17&5e(+pD6FnZUm)P#EVN&r8VG3N)97OdLDhU1-Z<2VSTO|*7GWK%;
zC026NeYYY*A0oLte=DY9jPP*VaO5c^B(!5wb;zM-MSjI0*@LLETr}PVWR)5=G9|i`
zLqiF2>*uLW<o(VA*+EOE04LS<^IPY7ts5_>tx}5qD5(siq;YhwAI?#dI1;}mm{e>F
z=IL#8B@uquRO|*<fbx}oq;$IVhC~knV0R(dwl<2Q<9aqf6~FCzv0G_Xn=&t52aBIx
z4oO6c6&S*Vv2MN2rc1Cl)Y3_^kj;qdR@&}&*_yr#_wxj6B`4OTP$l8wz%t?b3FYqO
zwb%Z!I}b-vNVRvL6O>09bVc3G;CSx0X4aYfIjtcV2)B|Nuvs$DOl*>yXC@7CpQrL6
zsL}Pxu37ygTzpw5f4kr?$W#)OWN!^roh6(-9?I?CQ_)p!l0CM4W~>TeznV5cjRUkD
z)wRJiP#eGv*`>V=m`iKmj@gq1I?dU`T^dMfNum4pLX30pSE~%H5nElw1M2LAGLUb2
zaBNptVdVw{rF{u{CtFogdPF*0CUGDG`2u=Z@;jHpUMvI8P~&l5cLGGf*C%%C13-kF
z+rGF%o&w5bpn3K*L=B$`KKz}(_|E1f@Ke~UZq-VYJ?T0puF3_fGTOG?Yt9Z`E*F}<
zCrh{(oA4Ckx_Q=J#JwwHtOLlDfo@B5gj<YU0&AoCYVBeN%rz%<i_l2w7`Zvc>wDsA
zg6)r|HDAaI=&b<-E(8Is6}%%gu7Qfw<zWYHXC%}RDs&z>H)yCe;$eSP$UkbOm7dCp
z|M4SEWkKL&QjCj2wv{jg1EbMDjgZOf|Di@`WY+oVgHtaInY~XidmrcYKK}Ehq&|YB
zD*G((<}f<qda40=P0y{*=-v5S|M3wR@a9D~;tbGA-4%fZSgirU(+cU!3-?XQh9fXs
zR58Mj2LIFDrK;9&siTm_mwvcX`vh>AZ9qXUS*-#xtN^1$V{IzeLQR#{po<~tU~>By
ztk!yn+U?tjvjLFk;P7z}5(9u8Cql4D+(adn)I&hSsIVduKa!9~&?p=ZB&TT(L-~-d
ze<zJZ__^uY|Jkvp0Xjm=uU0euM&FTbpTIwOBdY(;6#Umx^frDp!hKHa)WHX_O^2eI
z4sl1E;QAyabxr%hvl#k?{u3Tdg>i11H`B{&Z==;$LI*_-z`ef^UY@^md#e_OqiF1&
znSx<Tk;^p4Dnp|R7JIUCz~~29eoL3MdqF@?`MC_hh)yto$3K0dt^;og@3Y0=XASsZ
z$n~T?WnAQr<m?AUPv^@#a<z~#suW<~u~OjzjZL?lR}-|B^`6cuL}3;I*KJQ<ecQfo
zF;*%>*hopxl-PDGnp~<ykgSV#37%Zt#em}=J-ADW`h`_nK?g0rn|oTT*wk4sfFytn
zNGFh`isjgD0K_pCDku|L%Qp1;XmA`*AnSBF7Uym0WW$e(SXW+N6hM;x)VaFoErB3b
zA$+spxr-CwOs!E9J2Ddm3y@0)9AuNS1y~W2wkRrvHGU(>d1_44%H;9g@iHwMpa6Ue
z0|4mt;4qs|a&~P)-UPX?(OENfqF{j9EfM;Y#F(oeP}*&sNlvo*hh0*`&%9uMLU1e^
zpfdf}rS`x7_T!qQLx<$-aSlF428LtEe@q1$^uG`AYgg%}k{%t$d+F$NzE|wtg2!54
zD;{T_yTRLGy|Su~taG}hfk4pAi(Fis>YR_CJk<X*BPpr*ffU!#gHQkUX9h$e?W`@L
z5l~3joH8L7J?ER1&)~R6Xa)>dh;L}JVE~P~IFw`X$Ja7p#H~dXLZT5&-c`XBD>&}Q
zleM*ekjpa?G7NTL`{V~`g}XL8hNOUm?DxoZ6fxb(cq@Nlztx!r>#XiVr}g?!buSlm
zUdS3oV9^!jUsLWG%Adj(d?1%r6zsSYLxzGNG(zaI_#ky}bDq!;^rH5wB+Cuu2L2V<
z8?+4JtylFmoQ`?cH#w0z!K)vgg(MBM`S2l>XhbdmM-|z?XyMo+%4A<X$AK*&y?BJ|
zJ*bcxL55s+)G%Y>P%0eNpPc;~7iD4TtEPD-eOs{{tf~G*o3rEFiZOQYBg=Sc7a!7C
zAlFG8x(P<oNIe|+6o~1=5nu(9ULVmzTlM^EWEzO!4KW1|NX$Kz>{tI99-(UL6Hu$6
z-gOp4;4n$265k@aQQQDdnzOo%wya7L+QBYl(GsX&zPYB#Q8k*Dg&;kP;V<&>hU1af
zwm<17OKen0h_1)gSUW--exMsDx}KsImTls@Iee~lxCK^+T{Fl_TrcS&c#0akDv$M^
zqMmOQDg%Y|%O|c}8~WDk%-Mn4g@d+qDT~~_3WaCqWibXehTwiEqyG+W)sq{=o5G*G
zVnI^N$YS$z&FY9G@98xGaqYOXB4A0To%WXwwf#Oa#7-Odb<#@!SNfHrob(O9Qp@)*
zGf`F~Buznjw>+EGs-KA}if>;5w@qYxw_j|{GDkRgM}*p$&{oGdpd;QNV!wauD_pLg
zbH|;{Yp=|6y4;t$C17G1Qbn;KmTO;K98qJp&Jp$T-=u_Atm&FA4pV4{(I#1-OMt0*
z!QlJt7k!sV{0GoMZ=Z*yG2L6qAB<?{sB_|XhT!MZEZc&eC#~(5Oh`jpp0h)j)lOux
zG?jhdKD*sTYh5=!olrJ(FN>)H<nwULi3W7>r?8XF(vo~fx*AM*$2^EXb}mCr#{{tE
zM4`n~YCw-x$0QY!%Y?{#2T2mO_;e<3MhhR_7JT4lo~3S5_#X-GGZ=iC8TE(_FPAY@
z0gK_z*fnO(*@bbedd{4Q4=f5ZddOKwo@^e1#zRD*BP*B6s`^y8Im<CUT8xXQ%gR-h
zgILLHqn&WV+$G6Z21b1>!KG^^r1w8lFEice$kcVo)KOL>urMAS=cMhF9HWN2O)Iqi
zyKWw7ZG1&cd*UzX`oTmjSBKqqf{%vgAB~fH?7@F;sZfk?5N&537<v?PU``+(7C0h2
zMcPRwbITSQBI6_W^z%0i9RrX8hhwdnzZSJu)$SHK+21T8b!VWtvCa+Ygg2qsBz(`+
zY}t$z{4L0~;tTkrvaP_aE{C2$e`H{H2fq5L3GXe!f*IO7{^^Ed0d^RPzLlxYoGzM_
zxv8;;iD&al#`7AsL1(u+wC!p4lX5BPTbAv)J*%Xc`c@v3cJ_P>D!ppIRnH(%a!+|3
zSnfi|I-pfL^OT*gDRtaUkM6+Z!nDo86OypVK<+%5yfu}rhasw0;jwY3H%=Ig%?bqV
zc7jOC>E;aXr^X-#X&G&EWm{@R>1EGMl81Nrf@Re*1bKi23%tC|I=N;XkhL<Q+H_+v
zI9_}%;5uyu6fHrl0A%T(x~E-$$1&pSFJ_^BVJmy0NzQV#yh#t>amH+3AJnP#e($|7
z)g5X5;I{lQO$C}O>Cc=Hia|StBS46xYw9FYeL*#aK4BK!7YEjd_Ab_OMf5!<W-xM7
z)EE61&4LRY^1Jd2iv}G+c>h&-E-z17g3J_~v@_pzBLxH)5p(<Q)sgvohLxXC2N5?o
zobq<<8=X`mS$cM5L`$n5W5<T6fXJFz1xJZ|Lx#7<C^R&K*=N}weJ-$Cb<o%q-zSmG
zkGK5j^Ch9tW0A*ThKw6lH^IbyU=O!{DP#=F+!QTb%Lv}Zh1MGqzl+6+S*Lqz@kyGu
zkpmQKB}TqEvCkr9!RsB>bNdYL5Fwb@qv0MG<{z0bPitQ}mV@5AXhVMP>k(!KHg*yY
zvZjv#--~IjQ=eDDi5$f(0|nK`w({^5qVsQ9RGYg1AyKg8yh)(qwZ6NLY!F?zg@Ld-
zS=qB}?ukB@3MNWX?yIPap=|@{Ug^n=0gjW4`vUt{EXet!prW;7+Fx-MJtSBR$_hZ0
zfSgoz#Lyn7!3L&r&p^dmtHQEDWCE=SfwF@TfDY_Dhy*t<U8z?iR^K19+3srx_{f<;
zumDF2Xm&ZErcd9-tQ|-%i{Z%Kf%#0|(|x=)?x_-UoLCI)lP+^ARq`^mPSCChS5LOE
zq03k68&nw)__(1Qvj4gl)<c@m%i}o1>UUL*7W4eLM&xMI;Q&X7f#oSzYej~U_}H&Z
z0ji8^_w7Pzi%KV$Eg55GPn|KqcxA;D9k4sy=y5*$^aeP;@fh55IV3@rYjfZOtGmuT
z%W~d)fJu8F&C0sYxm>@NZF;fVjPL4holrR;C}u4_Z)IQHk_)QKuXP8*%i_%vU8c;O
z2}5YA^|OXt7<rEJCSJO3zd3x5u|l(LVEv1Ca(Q7_@Lg@H_$N{SqZiq9EZNA9^6w0t
z5XqXnY(4s^6lPt7DcbZNS93q9796Ity|ow6mgh)$Jz+`x;M4IY{R(3R6fU3^le!sd
zwpvY^k{%?J_ou6<O;s&!1@Vrrv3rqKJT=rwsqq~jRt_3l{)nN9@?S4`e^Bi*F1a%=
z>;p`D<2Ii`_4TerCNnEyB1ce+v_x4luHqw`l8q*`zvSB-YXjAk>J6tc?m)WcF9i%<
zM1P(C*cAsxU|<&7i~Bc;e1TunpjdeAKE4V3e5m-`Q%`&Y@1zl*12Vy;I|J8;eA-3Z
zlUe-1r{ZiZ3=O=D>I)>jtV({beDKG?+8j9C30YA2-iZFRf1cU52Q%#wJGEMiyKq0+
zBHX6C$YEuqu<FZZsc3rI$R@s~C(vpPQ248m_v${baakcIUHQk>Z$<gPZ4`CP(Y4Au
ziR&AAf@Ac&Y8{I%#;T}k-~ChuN@G|Fz!a679#K&xoW=(~sS@-&9eZ9ME6sy0f2F33
z%DRI!o#$Z8@P}rqmcs>Ah4Uz|Rau?9VD{_Zs<|XNiB}Rcd41rQoYg95mnFmcVyxd<
zbsN^`_oqvH$7t6aip~mDZ>b4gOqgX+)ym!3-j42THl;y*N@W^6#-`mofzjyE9C%oX
zd!=V;<vx))Z#zuE`sbm@ZmduG14jsE)$w5oz!AGFe?*G;t6RuBsPENjo6`C`u3{|P
zV30z|2&O9YGS&nfjV-uacww7cw4oYyy^uYh0-LZwAFdjQhTpQJ8tx*)OI#t8gTdbr
zLN--^izjpVjbM{Swx&YsTvEmZIUqB`E2@@x@if`B2K&;p0;K$fceuNd+Iby*tfB@R
zIM&GwDWpKV*VI8nIsu49<*SvnZLp?tRY#vqo(HdJ=m5<hXi>uyZNpY4eLj|@61;og
zH};fSsjCCs4g+8=(S|(=V)0CvZvFF}xtSfQU7${yLi^c8#XfhVR=sh2T!k+r#yBZI
zFGSXER=!EkcwmMkh{<*v%!Be8;ux)x8V^`1k?%z8A+h1T7R8ya2EZY*8POS|ZO;+j
zerf&?U#qxk#<9TcdI@T*talGMfo(nmA`+16zY%!ewB%jB$C>v70kc~dOMOafzXR2U
zaxplWZw;@ERLrU)y8zcH8-&gPB7VC-@tP#_6n#A!aaj{F{81oDBvNTL5CqXt84Ob1
z3gX$QJ)oM13Dc-#o3JlyMKlz0yv!k*l4gSE+Bul(?CFh|#zbO_5r1H>;x%U8ge~vF
z7A#;z&g4{!U6EnNyTx7`a+Eg(JMI!{US$;IZQZ3_tQuWu>7JcFY)V5pcJ1Cb=KZwx
z?8+2b0A~wv_*~#9!#w?tD(bO$Zx^uy*}JxrR2#bwYV7^2(1-#-0!($ZW2pEQ)zlW;
z9;CoRn7%tI<RK7a5%vNgu<a0hi$kz?(3iNimlv1EnsdRS_mR*0Wb?|BJrvqpXq;YT
zvu#*k;KN0~U0k&$ED%9NS-=~RDo+W|OMnM%pntWR|GLTj98YWzW>16;jFIti&Ef1o
z{%%7Vd=TY);(@2`Ztyd8f6s3%C}&IW*BG7cFfeck$1uo7R><fy3h-Cz)h4WOe!~>O
z?7ue(?T)ReSBW89JU0rq0z-F(Uy%5ZzZ~J2Dt)O--cMA^b2nRF-Rh9>xB0RgoewCE
z79}pOKwUgDKy~9hrLK_a?i-{%6sqLYF2ue51(h1e{6ihzattF>_!0bVqWd&*r%F>f
zA7e1_$v{OF$OnAWDZxpp*iS#esf^>Pjjpf3;iM>R$#7VO-n$n#5k>Cn#+<amPx+pr
zUoFfsNKblpqZ;;Jm?STJ!{H2*cc?xhyMzX;B^pv7f_~?hW_+(25r}`&6C!bAJ4@~B
zq*>TdXSlbT&8J3&;M_*Ny2(xS*cf9koRC<w0FQO0G5Y1;?2Oc8mdIgQgC&UIa{X}|
zut5>l5lM_+iffpN-JPLs`03818OcMvA6y64dt7)QQp;r%g}PTJi|K=aVQCg%W&P%Q
z5zUH_@*e$~x?_26-K@K3+G=q-zl%mOP-&DA(P+fXYlQo0^Yl@aYxC&K149?5{3E((
zs|t+n(vcj?$%a;_J7(zurf41+vQc5oVu%$YD+D^|E09i&>zqK!_P1FDpijqPb0?>Q
z0tYkjQ_AB>>f^z0=%xN?lkL@cm(L(S6Cwk{37>z4xOoHg!7P2)``<h0LtM*(vi$0y
za6tb2N$$v~sMd3FaV2pb9UY@L&!3Fs?M$T|^73%!c$aLmQ&v$&;D4yU>8G4d>v>Sl
z9ko(dXc062N{g|53te!vnyHv8lZB+z8$4K$JT>a?e)S@oNZ2S-SKtcE0jSi`767bd
zm(gvJV(q^%y{5q%ZylpS**R!w7kA?QGkE&W`^)EC>x}t@gN#@5g3?Ckw&Y<V@l|5o
z4&^@3Eo~juBathLAt#%j>9%j3^^N0AeC%_lm{wM^f5@LkUrZ8i@Ho)YX)1c-Wxk}E
zb&TZ!1|FfO3=%Y#o0?9>AhBxNhIn@D8N*@`D40~=i#yCcJuJ_fKY!v1qj{g^%4>+q
zp8tez@y>}OO=E?8UDF-v<C`aSb54JO3RBkh=qXwDb9){x8@{UbFfqV7mT@_iF(K?0
zlX|n9L{G@@(NJQ|OG%pv*qRsMbme@T#?KfEGOiSs0!>=-FId6%I@J4$Nzdce^k=`?
z?W7*u|6o2w<mrw_Bg;ob*#)D+P;e@WUD=WO?zXg|>rows-O5#4_lavP3b!6JS7&SP
zTl{8YI8dfi&zdv4T<7DUn=8Wj6-&?a9V+E4<I#X;OsV_tbZ|C3EtI<YK5_PHtbCz+
zT_fRQLW@D)Y3>vk<=S>^-f%wS>Q78<deKL=MOMPZ*l&HTSFUe#y~7}Tk`>QD2(oCE
zeQ}DN=a%o`LfHk00r^$b65-k0AP4)y>&K)yyBn0}iZ-d*<J=Fm<~#Tqj(prewy)W(
zoj#DdfB$0};~?7ep|?LXUYj4{ruRwib7o+^v(EB52YmF((V+4Seg<AQFiO7tbg#Ma
z-s3Yj8EUH>X!rOUp)hLLxf<~7*7(S`df<U5RhW;y$E!gRWv!Gsx-&P8xs8wCkRkEe
zo_9Xm5<LT4i3rn5(XXpMz80COLm8K;0X_rI7jl_Lp@Uu1E2p1)Ii6UZT@fz8+PT3*
zNfNECIUoUlXzJtsw(<KNgt^X(6Y&pjJ^<cdifz&i2%Mdj-1x%gxgENXxXN$6;~Po^
zi}tZrgQES<jB!f)35nIW`yLmXQjFjJsL37-4n7>ojC`b{(?On~WO&U)Lbg_!Bxmp2
zg-y1VT`shmUn;EI|1okA`mo#dK@*d}ey@XI=T?#I%R_YWw|T=BSBSD)$O!m$g!_7G
zoGR_KG-iTyNuVI&tyXODp^t;C=aWT`hSN=<HX;dZvB5U+ct1V>Q(PcU0&*Cnw2k!%
zvbT9RIy{wh{LX`wY3?Up``SQg9J#cB4ZgV8YOf_oUlae{ytdh{yI*WL)YP8}VyBun
zd#nug``O@tsk^3~oT(X#y^c&yAXPYdVOO$TGdIv_<%4U5MWUVjL;ZJ`u5hZg9{b6|
zMH)kyIy-RHhyo927zJd@7*`rKUfQ#=BMqi~<S(4L0XIj^oUm^_$GE*i@#b!B@a-w{
zSsuQ_TYryC>st4F<Mu^v0b}&wROeiCj>|?zY8w~^7)?$x;Ken=y!<#kn9g4jyGVwo
zrZVh(FgTrFmuwKTWnvySwf3nHbV!3UokXGp9t#>FuOd0#tJid1vG>CqH>jEnS6fn7
zS}?a#mnUu59Ek`j<GT46Mz^}Of}O=3B|A^0HJI2!ucz6#uR47<qrIdS=4P1-VISka
zyZrdJmA8%DMsx5*fVgqkT#|88%zg%StDSe)5BD9b6*Z1%sB0)zrZrB}q|<MDsMV_!
zLMSc$0WQVWhNp2=Fic<+z@zD;WixMG9BtjZLbpXl&U@R**(vlMf%(}JAFX=exhzJB
zP5fZLf!s6a6NgH~<4QFT>zZ@k?M9MeBDYZU-#1GjHbBGD)h5372MCTin(i^`)zP~h
zXV=H-xK|I-!GG8ET_)-K>&`dQ;tw{3#To&(NH5};W?w&@t0Jn+epW&`FL(ENnhQw#
zjTZn7tI^_pvX@>0X|SW$ntlq*L4o5byF+`kt7c^|TFybQ7im`nt2N}MX-9w$O_sp~
zZKi|ej64OoY9N#7tD&5ySzhk<!k!`sQS6m!=e!rmN0g4*ys$&R*_z-@T&Ki~H>P)P
z%RKpZr<u8}&Hl8;L|t%J`j+S#RBAt|S{5~R`Lgf1%SxnEl{X)Yk8Yd$O*zekT>yb!
zj<Mq}qixKAW%hWrZXUKIb<rcXz_R=gKv47O;eB%|_F5e&*@@R;pUSLg?q5Eq2!enC
zotIPUm0~`NsDP)E9(ST=Z7)?h#<+gqEI-t(g};ut)qHX-t;Sa$szKI$%@V1Dr?<<3
zkgV+WufxaYlUkoor;J&Vbn-+^^(f!?K0C3FDuzDpHU4<xr#Ww%&9{3T%U@7uJ=Ny(
zP$7jsljnTRT}!SKr$TWFcH<Tj_x6(O(pHJ)0mD`1J>PJI=c;mN(qYjCJ{-^?%{LOk
znLbjyA5!`K!P0rHo`@bx4dxTUcRtaHGjg)|2J(;sFnd^~vEYpd>@j6&C?_dbi!>Lu
zQ#Xiej_So%Om}ZGFh&&{1+dNq)2p`^akKx;%tS@ox{?}f{_)81K!1==;WB2o<(lH|
zkq_g%r+3SRDXb^hU(l2OWX?w(GjlVlM|@A`5koN^RTgLAdZK>q&Y=gJFXEMO-dWmL
z%;C@(RHnZUV@SsF?L|a?%uS(qB{2c-TKVtIW_+!6uF@y+&+Vkf-2SO>UqI>16a63f
zFEso{d-jU^2f~H(Yf0O$GS9ud)RVVnX1w1*D_5l4J9CuYYW2?@YoA;%s2g^JGs|zv
z-(i}`I^NHGL#IF)Okmc~?D0C%=i9bSuL?7ZIT$Acwa^3aO>8Z`YcxNuH9HiDeS7zZ
zY?xi@^^Qv=jKz}|cj+Z|ajtOZ2DhbkW#StYL$S~G$MI%U?2{`$RzWozj_SK7&-;iE
z_~iVI`_52?JiV3Af;=RroH=||9U=j^oqv4d%)F)7Yh4X_c^p)C4VJjKr$7==vT;Xx
z$q^zLZab_2w|1%>KMy?4O55~a3~Ih+UfiQ47bwKYx;-lP(_|i?rWHLOj1&sfPUk74
zVamFduiu8Bsf=}4P_nRFDxG_~KRE_AIyX1<Q+T1;5IHVy)f+uC%%-ik%fZaxn*w=p
zy)f*o+diYpj)jvh;rMPJ)6Pa1uyS|Qf=wl;t){TVs%u4HH)Z^>K~ovWIKOMx+wTwR
z28>@dgdC>dQukjO;T9qXMF(y$94gw}PY(C1C^e%!u}~|&KBw2eNzfX<9x@&N3UV12
zwa?2eP*mah9lZx1V?OxGe0FUXnJzUQJ?Bd8sPM&S=@TjYfzrEDJI``PEO!L%{n+tT
z$z8dh>n_?8taOthI!J1qx`FoMB@YVrwQ0LIHqr`S$PG^;d!{Ah9`CZftnsqLR>RUu
zt+AseVsCP$@4LeL8JU38W`W0d=a6Jj`j#W`eyGyRRhHPIDbhik;P^`4@W0F^9diGs
zO8fHrK+A0{nv`mBVn;-6(=@%aP?(dYFn|1IOotIQ+=@sE?B`FNdG_o)LwXF?$z~E;
zwaqI2I;uJ8?2$K<2X^RmzfKELD>GYRvxcYN9*Komay)LP`)f+a3heC@L6|cf32Ccn
zK^-DC*}Q`A%1ggRpft$)E=pZ)qp(5DCa+Z<f53lM9y@m7BQeQVSDp2%Ax0lUrB%%f
z2!I51p2Zm4-Z5hEYR9wcx0Eml^B!BvGjNzc$+WA=SqHVdFKCZv+BT@b3=9Y|nfrR-
zJ0O{iqtXu_c~}|pxx9IG=E8WH>#-*vb1y2zZ|~nei-ORGvByRW#8*PbmW07wA>j{W
zHiXk&wtf!R*|$7?S+4Y8*RyZQ*IRGgdSZC(L-?UJI>2%oUub|kQ_LOft%q{e^{k22
zY6zdtQtzt#ZfQg|8cOp>9eoYq@sCYDcglH>6=37>Pg%iCER{Sz6kit;aHC(u_5sJJ
zo`>{mvzUVZ8~NjcPfBj`%F*@#tRq2PPAGYtZ84*hhy&JDiC1Q3BKXAq<025jk2!~E
zhWCBdsow==*t(Q4-iqXrZ<`|AVmNtoAi6ey=>boV(!}_{X3iUy!$aqyU$5P5E#oa4
zTIaeJfL$XCq(2w0+k7PYNcFt>gLh94rZ%0!X3H~`b7K#E>ubb5(mnl<F;e!6)Jlox
zh0ijUH&<YdK;5TIb)Q`p#mvPmz64;?^XXi1j<hPX?tHVjqrvQ%S5M=aN{n`RyKd2Y
zAtow(qwSnA9~mabSeeK+HbPS0RCC1}`QhQc4Bx)5w1ZM)qc?Uah-S^w)#GJ`MX2`l
z7|{uc4}LZ=t*NZ<)2J$^k60db#_JKnur@>>X2b>ooUvROJMd^Jne*$~0nB{2>deQY
z9<3WR#yK08K&ujt>=j;X;=a=-d!LT9Akh#5bU4o{E9le$>kfaaBcI~=gLf|$iHlE@
z^Lh9wX=AE0{L<dDXCDVoQ|XP+j11EASS@9)D`Mm`Dp%R}SeQ544<~sH<IwO$f7O^)
zsX5-`hc@VaAbVvI<>LG-&wUSAy@pzm++1q5c7dsnT1yyUd<eR~m2pv<*o^Zsy_)Qw
zU#~bY_z=-)`ZZ+B@gUq~jmpnn9*8qSndGuwd5&R9(%Z{f6^rVlH`dp3egyG^1&&Xi
z_qx^2=3nl5Keh(;Ri1S^P{v2+DBaIh5^Ey>v|Q4=-e6vK24B$i$;0S4kJURyBVer`
z7zmJx5UAZcRMlKyBNzszX?thQn@gc*S5J)=unKFZ#j0h^xt{)Tp+9r);IXs)>z@p_
z(uR;o7<s&`yr7!aAipDDRhYShaG1}v{@S^5ZCm(Jr^rkhlkDd&hRPE*GoGHTkd!6C
z8a9SUVFBn_cGvV^9CgD<IK$`QP7e+-K2}l`NerP`DNG+ET??I_JmBnclT}459P9Kn
z6`Mm}%FZzLDKIbN*bYIDZW%ss*|T~<?**y?-@TNzvsATb6T8&}O+R@)!Xw+tXD2p2
zdTw@Y4KzJg{N&&lu7@V73MSY2GWNG(9;(zPvj~M)=gf{=GTeL5B$vJx+YRMh<|NU`
zp7koKN3Yx;PHLk+X>~Zyu)ar<HFx`pX<~ddBT=k4X`$)DV@aErcSt+EMNh-d!!PQR
z%3b{&_pkAjNBBe!HEDQ5#?6KlQ7U*B(6pt#57L)%+yHU7N7(N$T$TQ?Wk_l1S#5aw
zewH6FwWG9k?`EoMa(wbCwy4fa&)vVXHs<X-_?xEo3+OUnma~6+B_Pt|%R!CXs|y@f
zAGc>kwxW~Tp?$u0d4-K`pLOD5-wOefBt*~AF4R(=@qQTa;s6q_?IJeVj^2E>FgLv3
zD3Zf*Yyc7W!=Y_`gWiJ9th6^{;-4G<VxpSNhalz2K*P+@GvP&0%{L6>0ZEKxsag=d
z$FY}dq`D?#W5dzGkhWrze~47vzo-3bXKCm@cZ{v73S8~z%}<v7wtFG8<u1d5mi+#T
zJ5GuL5L4A7NyAr7k4`*Wx<9c+0lt#g6szyI%^OTY4!sXw+&PO&U5-KezL*a`@5XfZ
zS$99kU3M_`Os$I88ZA*yW;oq?z$Szqz2LWqXcfNNl4CTNfsu758oBy2s2<z+G!1b?
ztw`~tZ}!Vu3`i;b1``3rvVUKMhT!o-|NsBlfISA7uRso6dGe!Foc>0@ihrKI6ovoy
zp1b@R`p*Rh6N*Q*jQ*GPhBrOlrUq_fS#EaTE8?37lFb-iefj0k$<GXLNkm_+7q)+Y
zf^IcJ0NMl&9xDLw)rpwIgeJ|75jSRAJYhd)>vIX?jZRcErQD+}<cNC2-0nsqt){Lr
zX4q2%QmAdl8mb;n866qEO~V3i5E6a`iSk4>QYl-D-4N2}UCxT4txK0B`xd#-ar#ut
z!f`~&xF_*_K)QwVeVgGDTg2_Ybeg0x5kjL7k@7nRfOt*((YH!6b|ADdt>aWOlIF&V
zckR0Xs$w7Cx5%@LS+J4W+ACUKKu9lKgH#-i^R3_@+*^Rl&8RmjzffoBvR9MFjCBI}
zGy`HF?&xyxf;A*hTo5^4DMsxv??i<#ERz#5{9F2c^@u{qcP3VA>Njl&ADV*q?!AKt
z)SjJqy%V))<KF6g6u9d@NAoQgu<A8Wa~H_5aUx&3cW?R<8_9ji3K=YxRGRNTE*SDc
zx^p$<FP1@?TyWHT?P6pOu<a>{ySFt(;<sFNt(D&?40_hRyzat`SaQ0VzLB`wSeHoH
zPNyJ7H)F$I1ZNQZ8(SqB5-7k6+V*Kn8otaH(UKjbCrk}onP}l$a9t5fN4zDS2lZJI
zne@<}U!p8ysU3}C6O!ww@vNk+DuFq}35_mPxV(Tb=o0vKpID6`k6R-KorY%_but$e
z!UP;Z8=}kE-tRh9@r@rPT+2v4y@kb$C0lo){PADsBMJc~|3?iojqacraHv&OzeIQk
zxIe&#0Nhqt3qpJLINjb|!{4)dH(j;{(WqQulECC$N}l!fhFnjiz}|zvD0K}u*&N!`
zhx)K3B2Hmg80rKrHkieM5WA$*(vtc}eA@&knl!y~5dV7OaBW*HR{*U&9)?(3Fi7i4
z#^0r-A&D)t0E~qW$l@wE3nWer++AO+_~AY<97hGKYIoQ#>O4z;NrPY2=lCyf1}*7^
zOlR}+)7K=?p9s=FckC@NsT5Upn3JX2?qhCym_Q|XvrMlslBIzI(n4u*a&j74rOb>R
zUOonYhMsJ~i(j)|+jg~a0`+WtEYbp{WtQa$0tr*d0I9IB(U^XoQHUBm=O*k<J9fee
z?Te|JmxMnO7>(P!#R~VMPKI+LL*us4BoFHxa6~2U{?Z;>ZSai@`tS#VsoIuXezgLi
z=^IUC0cHUk_^ccQKAubK=g1}YQhmJL0rzI!kG8QK1<?1maADyyH8vL{5eLNj@DMM{
z$K9PZ!F|Q_ZzTIWS5zc}UT}`g_WABmY*r3dDS-gKygNOUMRHShmg^P`^TA=$WBa&T
z&^xWsis?TPQ+rS+h6OULyQ@SubOH1S7pbFYE}I!w*~TXH3-$7M^LzWCJQI`coO>Y)
zXYxAt_Srm5r@%S)D3(UFd6qEM!b^Z%SVU}F7h0jQ>0d_eAyJXwxAub97IG5g)=IFx
zKA(U(5#U;oKiVKvI75fwNPdgG1eD9F%333tCwMArzPoPZJGc?;A<e>7E;^#AX^Wna
zbB<diRf+koj0dUBtJW7~LwdFlyUYGZpv~EC6Qc5UBve2-HdQtG1@d@H(M#4wR|P9T
z(rw6|$KnCiV0@R@?*VQ=qPJ3><>6T3w7XDiF(n66kgXwpZ%<TP2cQ;YE<r#lX724i
zJ96n1KF<aFU4b$v?N$f|L~8sH8)twegai?yLTiLa;b+Ou9cw})Xx}Jx)O5-a=a05?
z14Z<STL_-DW=fiJYGiw%c~jd739N^T4#qN7y@Me6-N=Eej8rwS_EZCAT&w--TWk6g
zx1IEeN=(QtKCcCBSOSHmXkG`ykUx^v7up*-)`@cLz_E~1v=bn4(lRUXiGm`8cTrBV
zv%mX8&ZPJ1FbUW&Z3>)U*t@osRv4aPi}_cH6{lGEm%~y;Hx%}a0=)BEaG0f$g5BW0
z=jbDR4WQ{KagbOrSLLV0v@_;Jbl`ehW!!iG{Vk1)#i(x^gc}<`L@e?C#QP0#Z^=Xu
zs%%pYwyJufyC=LdD)prh6*ab00E{iwsaFn-X}JPX6X(2Xdm+V)J_RttWzWM(?X5o9
zVtcQ!1vwtQ_bgO+*K<6Vlo>BUG}x-eA0TtYM-?I|7eo7aN>D|qMuY1)Q=~eLqVE-p
zs2!-z0!~R_8A}=Y2<xnV4^d}RhI%y1u5h4_*jNBImmzEJe#Q3gn3n763*KJ<BU*X1
z?)$yt@I$JlAoNL9kI%6KMIL8?@9Js<^pxsWy*wPELY#-^;e9EDW!mK5x2w>Zpzf$-
z%QndLn<?_D7he#%5+sGBJ6{U{av7+Zy^tmNKy30;dze*rS?Q;sW7ecqx0hS>9~0R6
z;TPGF4~Zp!a<~9AyL)IX)0)xkqcdBZ2U_loQc>AA&I~g+BD~5{<<tZyfaVdCv|hK1
zekbqP<CBFNpu)CI?2N(#h&i-O>l%W|Q3C~oiz{I&qC_LaiZ-5dB@8tBa9yAr=qFTO
z2Elz|k_cwu2pNQDn?5aZ4BAC+4UA|?05aSm#x@WA0lkGCc{$mMazAx5QhpcX-ee9~
z08_VV&#7<2`+OzlPmVJMrwssa-Jf0=t2CHg$8m&R;|B^HC>dLXJxTQ581n~Ovz;7m
zq7&8;Oq<%nnfzVl|7sKeY#F8MC0g&CP6}t+FF?CI(kHE<Z8-;pEllckZA>3W`RJGf
zA1ZuhAaf-bQCVB)+L+sGn5xsYit#Z~BI<MR%r)i`>yPyr=93MnXY4X(#=Y?|>05z8
zuURm5giG&XYuIX=E}gK1*tmc`PQmF(X>`o6UcLNr*F%m_M{yZ=Dvl&ageoO%^MQ1%
zV>D~OguhnWLX;TdN(%24BDHE16W1Uo*z`e*;VQ~%w^fsH6DZmzaf~0sW^L=cVEwDp
zJn$8#I@)zw%wfw}vOaaryh~>_$@h}TinR{lWEnn(mI0^AuY-S-!K!9)mumPYJ**7s
z$Uf72);v9gGMAU(FV0nALj}B+YUYSCN`a5%<9UZA`z3gxA>sk+%4AV09LU@*)eD_A
zOX8=-l5gLuDY{Q6=vuA#{NO@W6zlrn7dNHY=k+Ji3G_WNl6i-V5JCnBlMvD6W)lFU
zf~B$(ePhs*4k_XM0h=@WRjDs;q@xusOWZ@}@rVW}4+T4_;P(`}!P(&}z*N}ts#4LG
zxasHmG$lyp%v2LNA@o{%hLGREqLmNGAne=u;R4@S^G=v+QIt`>fa!WFMRFKj=YLzx
zbM>e;6}F)oIb5eJ0%VqM>*jAMvn|}PDwUsf$$yxhyyc|(VQqg%x@3{)XoE#)OfrhE
z)@NhtI$p2v9@0BIe0JHQjyE(mII=#oaH}`?%whWj9U)g?In($$eB89k5H=9^EU)A-
zTq!A^J*3k&#0(ZszFC;IjoCJRX&WR9FnoMM5-dPwerI4fDEm(bcA@Nlr~^CR8EJw%
z{dn`qO|4GBw;id%Zw+aWA2VJjx^*?;`Xj{UFTT3C%M_}qnRnaxVrs+_Qmg8Zje~~8
zI1Vzu+nwfzpI@<l%}?_*G%M6>h$stfQP?viV;gpJo0Z8|$Z09Bz7qGjySTW}6oNJ$
z^wZwe<a+!d!<Y^peRcNwi^l;gTr)T*kAg>(UaI^oB0F0+HWm_7^yV&Ypvn`)b>-0=
zU8uSmhdYUjoOsuW%*@8$O58?geg&#V0D-fvs2l_6gLQ)pRi#4fhLlH~VBk_r1jNu~
z1ZW5)%=IM8mUv9n3gknEGk5Dk2v|NUX(#g5d*QaWNY43rc<gI=aNFoep;g^O>OH^-
zkrCbA-d;HZ%UzHQn`w$LoSe8&xSbz7LTi1^KL7nW3;m5W6G2-Gx9FOzcJ)3;ovoIS
z;#X77PzR@gcXoD0V6_W!X(2_HH8Q68<|pjiqh4D#ggAn~t*jx7=EusMyw^qwZjgIZ
z6_n&XCaa^;RRTR?<gQ#X2UfrDC?iP};<o+X#_T|*c5J>V!B^6zF-k3TxAn;Z7Q5N+
z&tLCOH-!2|eJHVqFQp~RI{8qmXv5D#G!YqU_RIaB2Iv{iN7wkGebPZ;ds439i(LuT
zp#+c5dII(cC<tNR$IZ*sR?$Q<OUeiN<3<WBM&iiT^kD~_o{TyA66cbj%{fKyxf^a{
zr56UWW2Nn0IUe(kRE79qCyAo55xH*>LFvl=N3ioXvGd$m8kOw5z0_Onw{q9AE<ij{
z?A}Ru3|}M@^Re^ecxkPpNbr(W60fF2Y(!TQIpjy9PLhPQ%a5;$V3OZtBUlBx8Qjja
zo~4u2P9Lg(uG@4gF1>qdsj2T%$7!DYwcCbIB_PT!eJLf&BMos6F^Qa~iv{z~q##HV
z+5+~i@pH*K$9&?-I(mT(uCJ=7Qx}x1EiA}pbph*k6P51w6kIx}s*i>gTu1UBcs{10
zeDKn{z!Ha2XD_hVPBP<l+47yO8l<TqwkKP>CD~Rx{2S<_urUN~uqHzu9Ce}vH>gVL
zG+Ce&5FzG3*HCti1n6$c&KeRP$tk&2uSadVzeMSyP0zNx)WOlzKmDX7-Ydjh^Ck@>
z53nJC1W_pU3=fYlkT~wm#x^2TvB=j%M`k}-Y%6Wo`szlidi$%hl~-bU7q-+iOgczN
zBoa<9_PHP5jPAh(gJ;^Kd1|Wa=wmr9B_9VYOT^Da8QmucGS`H$-Qg&u(KFUbsKTtJ
zsRqlGB-X^*8+alMt?m&v=iwrM@Gr><UJx{k8zPxC<^!w4dE4q(`hxL$pyI?al&ygm
z-4KZquL!h{bn9q6ZjqvW%!fm%0J2CnhV0_UkfOHYLuO`XoT&<)eYFP3GJhF_I8+C^
zQ*`7WWSZ>52Ei{67?{H`>%|Jywk<C{DEqtUrpk-|X*zVt!gD!0MQ*A|>x)*{Qpawe
zDSl<Yi^up?Kg94Vy+iC^PRL)m(i+7rtA738lF+$cX0zCZQ~#<)a4oWK=tA$F42SG(
zoK^N)KAvY<@P=NA;Au*}C+Y2hP<BPlf|w6k{LvyQV{n7tiGZD=*NvD_`r3ODl|XEd
zQ~mh(co<T_bGjbU59g9@O+;MaREnHLSpaW_D~%x;^euIgY+8uDzVyZV>t)kf{x-_=
zehQa#LGJ~pxQWomU2TCj@UJ3p29$5SMfoGcMl=|pfx~f~1nA<jeH53SMW3Y4y9v)`
zQBLHN%@G(UZR#4IqpOR{Txg?tU4T3GL{esK$+_&p1R_iUy-TvG8NY&jDK}pE9C`#+
zc^8=&?jGZ=1iW0DoTfilDvB%xBX3(-oLh2r75h)0puhcae(_|5g~F=LSblqIlRKD!
zLFTNpvALhQp02XJr@Mr$gQuONM3B4JANLVeP>`3cy{n_2pq-<WvxnL_TpjG3ptFP8
zIWsvuDLt?2j*pyghWI!dh3FgGhq&4+Ih+HjA5jfbrYoRtPG~C_<nHF-s~n_u?hn1n
z^z)yWCC>@|A>!w%cJAuW2nEgc?g(D@^l=oFlaLa(my(wfl$Vx}mc62&pdcnFBPA^*
zDJ3H*Eh8?ipe!q+EF~rQ*Ktn$2>nde$Kj#!-5XkeMMwWn?c5_jKQCoT$-uxsi9lHi
zPah{qX(c74pK4@e#OV^^zQG=Twn5?^zCwR0`Inv>j=uIj&R%}bo*sff_1fBb`unM!
zJNGl9zmLE2<?i)&L>|6>v7=Lz46^l-l$MZ^{97|Upemh-@^v3aTR%@9V^2>v^*?j2
z<?Q1a=;`C?D|p>VPEeX2N<vyfK~T@u-r2*?)Ay08<bQ_yCn5i+bi85f=crBxB`yAw
zl9aKutg@7}vYhn&e+&Po(0>Hi^K@{282tYVE~hLbt1K<^SMYxm`YX7q<WDyL#_ErP
z_?gZBxc>je(82z1gkJtWZhw@NgT17qo1?p<ho3JUqxAoZ(ZOE%p{I|#t)IHHyRDO>
zq?d=2s^mWx|I76KnQFSF(2Z2`Z!7&*(*G{q|0^f|aR0xe{!gX9Bl#t`zj6J>^-BbP
zN%*&Q{l@i61b#{Qw{`u-^-BbPN%*&Q{l@i61b#{Qw{`u-^-BbPN%*&Q{l@i61b#{Q
zw{`u-^-BbPN%*&Q{l@i61b#{Qw{`u-^-BbPN%*&Q{l@i61b#{Qw{`u-^-BbPN%*&Q
z{l@i61b#{Qw{`u-^-BbPN%*&Q{l@i61b#{Qw{`u-^-BbPN%*&Q{l@i61b#{Qw{`u-
z^-BbPN%*&Q{l@i61b#{Qw{`u-^-BbPN%+6Ct|R~WeK>m1ojn5SULB{Z$AuUem~Y*>
zan<-y#Co!UuJHsP97I4I-S^JroXot#S7|K=+c&QZYmc84EP2s&{-nIz+bG#qlR7`g
zuzcN=QF-AvH}9HPsOl*fW&1N8G*=ztzLLV_XPZ%SA?x)~rWQ&KAx#21xz^CK@gbS{
zf^gXT_uPHd^ldU2fkP0duEyQnlDj_T$`pQi_b^88-+%Bv2RJmp1>tBk8jML-U!QhH
z>he8HkCz|g#m%`Hsa*-8v3^##15!tYHtFt8>S8BJqod~64C8eeuDyb^+Lc(pIh5#%
z^mz96^y?dqCMFdMyvNv&y)>ksoO~U|@<^lL^Ti}(6%}V!SElOyKTPx7at=RgXlRJN
zq8E8ZPEJ}%s;Q}oK~GQbQ3_qbISAuwR{Wu}QhM*h)Y-f~-hZxgOQVkd1`rz)lj!~X
z7(WkOEGQ@_udF;7t#x?+zKd@L12^Z|P)uKQ-+aFKA^Y$h?<ZpyRbEFT>Ar&(j7=K$
zn}&0}h_K}vZLcaXFRrgY+O#s1^I9u2Dki41yd0lOBnF3sg!KFKoxM>}$uu1L(e!rk
z3f*ZiO(ihqDKp!<?!`j~pSIdb>!&MgUQRfdtou$^_@0$jR#w*YAk{v)Tj4!x>m}?|
z-H+j66Qe2BuOm#%M_V3%!Rdjx>5|gYYZp(=jaRs)DSAIyS#h>*3|rw6$@)@I5Y56V
zaXc2z&CP9VYs=Uo^~l3xntk6J=ahOdIgzd^hEGLH?6eT?v9j9Qt~|4%S2xc6Kq8rn
z8yoe{#m!*G%IK~=vUFdsj*dh0ElmQx=ifI@Z@qTtUFZ4c2XBK^^`*GZ)028T>yAl+
z@#VJ3NnT%H-;A1s1db=og4eHKr-MvPOkBod`I|470G#{oo0%bB9se%fSW*&ad|6XD
zUF-Ji&leA!EygjP-T&sZVAlC`{j$nREqi;R&7d?5!N=Loaab%?d-&~Fyzod}Z7u(|
z+;N^G&$-T=nWOKsvf!h1w59f@zZJUky~x*Gg4?s>csxF6ff5d)ziVZw`6+W434i$P
z4LcW?TsEnI%!Gaw6&2uHu8Wx>uP}e?P=CLMIyCV1r)=jvYB(hva%*3WWsIeS6EfV`
zqz%0tcRP!Vk8hFgYkKHxc6Lq<<U*EMUSRI|*K8lM??Lr*a+H;oYtNiH)A6t@W-~YU
z^O`a{J9|9@2sa9jzw1NyHKqHt(or8en>Ij?Nn4wl?&X%6`|aB|cx^H=Aca9zR`zMr
zz@sbU{**oM>H6S#Y2%?Qr#U%myyp+r7KV0xwdJDwTk_})r71Dci_Y2EHatAz=gVxE
zC^;unFQ0wONMq#+pyNxsbK=?qg5ru_3YmZlJ#7OEpAxcX_j-AHL-Ik*M_2e^E_06p
z*`rV0<XOU$I_;ib(Q83(GrmQj`My`?s}M@Z^3x~R;<=TFk9!F|6NDl{ql%;7-F?^T
zutBCS*H$!qzUUys9UGNeU3c90P41!UgmG^VWboPj|4#t;0tfw>Oa@)oop=YxWHL_Z
z*mCZ@s{M_&Y67`juA~Rt1d2W2CgAo!@m{-50C1GritXFi4zFSl*dB8a_g>YaDgvfy
zZaOvh>E?1dd_JF3p;T4%5O!A~n}B_}Rf<Y`A$@pwc+4;iHa0deP1AXiF-_AMHUUl3
zoN8nnX%F|hjg1Wq!(e!Lc#H}UwNek%`u+Z%{{DWB9691SHBHl~t*v!JNYgaWMP`T4
znKNe`^6s^vP>9LN$sVj1{M2p{sF70g;>C+il|xlk>gwu{Qj*PPJ@F4#t(Q{r^yyR5
z>9i*Y6h*=3^V$2=>?Q#fAQTE=7>0*{qA1kV)HosGj&ns(oKp`30uCAXT3y#!TwHW?
z>=pr;N~OM^nVI=z@x>#h#OL$z?AbF+)7(@R6-D9Z&70i0bBBCBzp2?PyzqPvR8&tZ
zeIIB5nt>y1ChvRr@ZnQC)=Lqv+viv;b`i)Itv7)G0zUw$-TG-!$4asTZ2m3hAkbL&
z{4uOyHEhK_kHl)?HrS;Xn(ajVKt15wMlO%lwEgJq^|k-|cOPF3whQd`!si08Quuzn
zFjfllrQ~Oe=G%ZnCDzz`*=yP<4Y&S^FpE_k+#BC2%-wR$4Hgv0!dL-*S7M(JMf;Dt
z*0|-0M>|`f>UP?NUf|D#?|&+M{ucNHmca>^?9Z{hvEW);3KMwAekd)rJ!aY71Gdbd
zOJ=YzH(Mklfj<`Jdhwp}R{DMt><t$R-)FH-!%e_#fE%R@Tj0xSj=Sbc$=UjB!X;5|
z2>qf=x$Q8H6<UK>9{3I`xvSP!Zs*s5Rk0M{o1$kg3!m+-x%Q%GHtc-31^f(eer%<$
zeG3_2XOcL9bz<XusXVsZ$BSe?V3D#<IDt2JYz*Qxe3s3n8Q2*Dx3FsY0Pr{0`~;=r
zcN{B>zGLg!K2TzAwv^ybUSw^2DT|2`&khxgI8^xiLt(g|wNo0l>^}CfkA3W8XYoH-
WDjV8&8BUP^0000<MNUMnLSTZkH)G2H

literal 0
HcmV?d00001

diff --git a/web/images/LOGO.png b/web/images/LOGO.png
new file mode 100644
index 0000000000000000000000000000000000000000..61b64adcec5a9d53588bbaa6992e6f101ad64c1a
GIT binary patch
literal 45618
zcmd4Xb!?ka*C6;{lO_!_Gcz+Z%*@Qp%nma%Gd9f3%-C?^FsEUrX}|CNV`rt2b~PjI
zKGFr-*GImxbkAe|PK1J-I2;T%3<wAaoTP+^(%(_%ZzF{M_P5VNAlUmmKsXCYszCp}
ze4tIj|33ciAff3D0s@QtuYoRX`Mv*r64ymk!$sNN%*EZ%$rR+LiM^32p_rwUsk^<C
zwKJixGMi)bK062qWRZiDnz~2!rRKCfjwmXCh^jalnTqSkNL1)&f>zAkR?%g1Qj=SU
zM{D)&o{dpw^B%e49(UkxG0N_HB_uNB6%|#owt`6TaH(u0p?f95y@?2vFG0hX?$(y`
zV*hfOMyRVsH{jI8)cf}6R2Bl@ZFHq~{+sQy4Dba>bSXt7lWO3~=^aHrm|$1@SvR=1
zv2h>R<Ga!8d>q@`)KrWIaB!HrIzNY%{rdRu{ra=jNi2@}EG{noxw@Ku^7qAjJb;VK
z65#$M0pQ_r5*Hn9F$%ani0JL?#L4`^`uhBM``q5n?d|CJg$Hb){kqv7Wrhk13v1rT
zfPn-$;sPuzC{f=8e4gj>a&j)$pEou(Xyi4Xmk!VMgMnMmhIzfj@6ZARan~gO*MYLI
zCckbJ@b@#jv-pW1xw4_1l5;hQR!VS5oR`8;FJ`vZrEfT$!ZkGQ*9x8^Q@!Kz?sx1K
zxc0sZeH7;Y%A*vsKOYG@p0quuF!;X3D(aY-uc_h3`{QlV@}b)+zenkf;3KzJ{J44F
z-b?I^x(X0UjTyjp`Rv@MQ+9cT=^@M0Gr#mj=VbYfeGV>9ibIFQ^*eHxoa7MkmJ9fD
ztzv~`2>#Y}AFs6LuLV~LB?=OVcYLMXmD?b@clfW~@0TmC`y`L5xt0i2tVss&3fMGX
z%uT?Bm^dzX*!>##3%06H*UM)<R;<#G`Y%ei5rfNTE<&EBx!A!>$)hh5k2?ZIdlW@L
zC0dy4AOVgyZiMUNTNk)}Ex!~`4~!ojkHu(h6974)dB4(_#6Xb42j@kG1^K*`d&?rO
zhw9_eUHLoCYORu#(KX%Hv(s62LZiIHx8E{GFXrp#0$*tLU^TEE*}+ZwcT)_L*md6|
z@2|eVYxVoM(g`k)^X47|z?YU+_v`bsa8Gmxs4<HqZ$j+2q26W}Slxifl(7Ur(Hvnv
zm{|yu$Vr|t76u}=2wUOfUrdo(Z`596JGkmW2vII@_|?QMsi(~Ml|Orl*T%Mntl~1h
zRdXn&+IayW*=qAY3pYVp+`z#bII4=WpN^QCj@_aiasi{Hm||O`jMTT?^d!HaY4O$J
zl2a^kUc9t>=!*F*h<x8YXT$1-`26zI(`HO?rrUU-H(5#Pg35C5QiQ0bPmi{SHMx2@
zu9p;YlNYDdl$V<<>&x*fb<6%xJoWitC<dzU2~tjOsl11LxPV?YpbLB?ZGUCNog|;&
z?LSFBpRk%3<fKB9&;pZ-Wy0(~rS$Rmu?iuyRLFjfI@IWia!c6eZ~lzS(K`)8C+na;
z&i`7WV7VUp;gpmZIq8jkWf@`RwYPq^es(>ERnIr6lH$EBSf;fI9%M4{y@|dtO&JGO
zx%U^;nfOD+>rdZ8eq|u<aY}%3CVl>)>iq=rxCf78;}ploHtdTFI&k9lO9JxK@Jm-P
zSG&pQjPS4zz*~uWM$<lc`~-8xO_{U2w+JxrmE(FH6J$84UK^z0^;$E}&8Wk%V@|2=
zNST<3R6;?~BOil2Fr8{qe<MNx?r1cGRV!8C9aGPhKvQXge}+{b>Aq|*c<$deRCYz@
zRDD+E{$f!5F@SjZ>rY#n<c2E8AJf}VmGR@ssj3%$v~*85qBRHb9li2qiSG>Nx>ju~
zGCp}~+dfGf%ibr_MD-wW7m!6~Gb-7KiP5T^@t!YoT`v7LZ5i3qg=Gz%W@c)vj40)?
zQ^Zj=w-kSdnzB4K2>*~x+4Rw>u_s7K(i=iI&dFl2!Pzm6=1^Z1zR3N~F|vbPn*?QP
z|IjfDSQCvp=iE6Zw03sKs4m82wT>ji&}`$PnKacrhhZTx(3GalYjE16&1ulc7<Q+d
zF{K-y-r)LUvJFq(LDU}@cHH8im&wsBBzA`GMBJN`_Gd0pvtL5uIAb7>yR6;S&jRdU
zB9O4P77}~ip7{Ki2mZGIt&6Idr2qtkAJNuYMfq<E@Rg1xk<<eGnYwpTR~INXR|`VK
zl?oK7li0#}xjqj(5O4ogs;i1$X5HZh(R9(&xZxuIprESTD4QTe7=Q?k?zr>Af~^W-
zp(Yq&3I^VSp)*WW$4tEshA4Hir)>(dKIs0dhk<zE1$yI@Htq6s=20eug@hoX_bLkb
z6dr#6csVhCs!iwZuzs^`Ws4x^TD$%0TjX*UPmnUp%I~{wzy1w-l`Z9?t;6A*>P&Af
z=C0}L7H=zTJ?kwud02&YZ}9ROn?5w1*JC!En50E1luwn(%OYi4(Q~U<H+gF--%F4l
zxF+%K<r(&+cg!VR!I+w@;Prq<F3!D#meLf%D<&IYuzg(qg@w4n;+<CW7X5Zrm+%wq
zU{U%<p?Za_;T_G!wG2J#eK4AL4t&G8in+a#qUGGoge~<io;|R0*LAz*(|oTG47&C9
zLHG6PeoLw=)pfM>jU#pYjd${mcdxEhYWLk}JR7t-tIpS*Cg_lWw2I42l_kS6(2#yu
z6j%l%vozK8X%s9sF_TqKqDJcYwK@2o#@oN~1-I&#38G?#>rdnQL#gT=vk}>CqL(>E
zV`D63syRA_cTXKWxN&od!^*~Xsl43oY}=$)8f_KX-9ejmpxnY4#zDG>K&q_b3O4w@
zVHPa@bpL^m1%W~@V}af7XyJyOk2T-qXd%X0&7v(!0)6KR8SK_LU~QxKji{THuo_Vr
zj#V7QOBcinJe~ezFLOE2Ufw|8o;Z)Heo5E5CEARe3agsMwihpC9xY&={6c`#)mref
z-}7OEiqjUxX7$CunJ;u2>%n}as@Eg9X2?s!>N4W7+VbAK-&b16D`w79u%rLRQ*;NV
zynt@0kUsw1BRiVxkkI&uQ&)M9^mXeVlP){ro(cMpQ-~{8fu2ZcMVxRc>=Nbjlwu+E
z)R2K@)NsNvog23lK1}jbc-T<u#?b4Biwmzfi@>s_Q&qCg5GQN2@Zf*C3mKiIP<(a}
z`;Vjv(W9w$iLJ%Z)T^ZM1x|kKum!XLC9K?c#42ydPyU}O5Nc@<YU6YLZcsbp+PDP2
z^1|iku@|=}TVM&7c#6zT9D;wu#t$Pka0;O#JS+Sv2uC0Y8bDiRf(vD~vkNNqg{M6K
zj_^K0QlZjxBX~vzS~8D^!7E;nP3<EGSE?xW?T8K33=Q=U5?R@wx6{xvu(>qIe0PwM
zeZ=Sx{Ly+sWfrSfg5&VLih@ronbNPN+;T;kPy^8e0_uwE#GGeYg>F!Mw1KG!$EkZe
z2-b`_BV0D~>_6=}q+&_09w4n<b(tQIFCb6s+bYF)GTj_Y-Ih$re&VoJo!6dKc$93l
zC(ww}EVtSi<?fabGPbmZ&=2OY@$2;*sWAB|Ac9x%$b9&Dn&^Cr94O{kE@rZ|;#?z!
z#NyuqoJLDN%ob6CR;yoE`SQc(Kux&)*6)otp%S2(3RH(QQTSN593adrz)*}*uVAOH
zO@^Y8%f>Ivgr>AWQs%D))1<PSMvTeXs-=3qS#3N+GY8`EB@d{GInZz}o@bKXPU6i|
zOy{y$Z=zP|C#;zj94?Zqkt*@z@?xX@Txdpi(OQuz@L%wNAsmm(;){jOqvPXj%H2#!
z($7RYog8PVt{{@zC#>Y-!KT83Yc!Urt?lv7X5pOa8l(W%x}tcz@<D`C#~M`|&*UW=
zC9$#FU`0N*Kqv!^HVT&X%9yHDt|Z$H{pjRz)+6mEZHp)Dq&Jt+|JgoqJ2zlwTPnz^
z*>o<0U;#rQzh{XWk|blOCnP8<3~7-Io_Xwl#Fd|oPnKU0%g+{z;cMPr#FriKPVIy$
zjVl_72u9h^SZLvh>RF~b5MERjUc~fmG+SaZKz){lhAg0XZn{fhri%?m22iCOc<Pq?
zL$izun{#eqq$!8k*AF_r#&Tm%Tc1Y;?21+D*YT^Q60=n!KZ!gK0Zw4;ShNi9H@VO)
z^7aFSVCzqRnU?~muAB=9M{-yyidK52LlrS9lZB)XV2<-JJ(mhI%lb7DcD2R4N>q`I
z2A1(&d%;G|fG;lxAME4rf~)YYbe~Zp01PifDD8c}&1e!z>D#J}nTG7VtZ!W*i?JTM
z!6kL6wyH%s7~X{>I9g5<_|-|cOyGEQI_&AN#BnAnw;Am{gdD-264ow|NlK^Ikc*!g
z7ob!GasfZz3=AbfheUp;e}G_xd2$=+*mUWhQ0^a)GCscUGyBMipYpva-mXp!Ko?nm
zFS2$dl?@}2ERiH5`kRA&^c1btHDb-A^EdV^S}#0Qsso?I1Vx!_`aOxA1F((1AQW(f
z%<)J9UF9LDdB5fOvonIPtQRV55Q}dhHSXdTw8}A^?IDicMqvX!Ma8%%p`GXzk$KHz
zC?i*v5(+V0Bu5BBlHU`;%|bd)-H5-l{cKX>5Ftp7<iAbTLgZqi&PEv=PzViE^8i^Q
z7T9Xh4%8ZASBm^YUYb0~UxJ(D9>-D`o5-2TtV%Wdc`x@>WefmY*9p!XB>w@ICF@)x
zUfCwXPE{b$FsCc<N%T(aIHwu_#M=w%k+7eGm{m#WP*f>pA9KxvASI_N{Xr|6u_D;|
zB@@t50kdQ&bzCl)cWNNRPDRcfe8zJ%E_Pl9qV%f5f0Y=)s~jr91->Rf3`gPu6Mm4k
zY$s@nrM@;MvObO}zu(YNIN7;Nf8~a}lQo3JW9?BqvaDc9^`sdjHZ@Bu3PoeGUPNYb
zQ~xLz%?d!HRSvUR^jMfG!2{0{;%kS4d2Uetq2k}Ibj0TX(7mX=`#2bynD^}_yl?2E
zOKcK3aI<w%PWiDIrRC7G;=wA5mYHB^&6Z8uZb^Y3QE9xAnJs#IDGwn_3J+gKM2qOR
zJA$_-Yqxm=%O&SIQq5zymgt)&{$tV5E6v5lhX7%tP^1V8d5Kh-6QW%A@V-5~wfJJc
z$mX?tO2<P7+K^<c$yl;v{(9U2Hq8;&f?iIj|F;S?=0o<d;Z#^f0}G_`QHpL3RVVi$
z>!M6l;y1o7#1TaF9H}I!8YfRfy+r4t>_%nrJY7iD6&O)z<O)mT#d;X=5498|wYLPJ
zV;M9JImOF@G!gD%Qs(oL_jojI<_B%8h5{MLxODjzD1W^80zV;sk0lOZ$j4~%Og1Zl
zzB;pUgQX`kN18PLLom{C24j*}J#JZexxQio^V-3P7j~ZsNStsRxYjGDE=aAMZLBB*
zyOSBU@Us#V?m(v$z6wPSF$rI6CX^~SmhKGukL?hpZ$aYByy0F%qn^xrO60%QP-LDn
zTYk<Qc^}tQzna*(CcEieRlfG-QZlj8_;#PY?Zl0rdxCUOlM_Tk*|{|)rSwG{SSWH;
zz!WWmIE=7@K2z?r#kB0ZnIQ+(!a@KGv*U#)9b+waSr*7@T6Az4`tN=7<l`h^DjLqi
zh+<BNLk@0Y?PXKQ&>Ul_j(mkB@$`RWMP0DC(}dW<h$bFPKqX2JJJ4H7Wx3MjFXR>B
zj$uO<DATY_$7dMPH!(n3H@qc#C9u7Ue@{hH_BlmGEjnlIkmNbQh;UW*D1Q#;RmFDD
zETUSJRBB^9*h5XShFL^(0K*@riNOnwu5k5Rh8M;=0V|V{&$^M{Wh7-bU{$BzVQ^W3
zR~PW4W<49AMoQ+LzrB0Bv2aE%R)5bw1(g*a+FkIoL3c$R^I5Ow=X*Kn%<EyfTa>R$
zpemJQKwM3ZkiQweJBwK#x8!RBTOk9nl^TNsgWc8vvkTM1yoUeT!O<Y*uX(Jcc#OE@
z3HVjJD7>Q0#$Eh-&o!%Sb#$N-%9v}Luzm-_88U$!()v+sx!5|fKMP_w6j+Eehd&Ac
z6_wYx-S2xtjrBp8KoWLaHO0Fm!o+#$h<qK<26>lD(f5Jvv1h%3qjmj^L=*e!5=^15
z9C}l)`$NB6->5Gx@A+L5aswg<19|HgqHc;BDc2kt0oBk7GT{gtwMLSh4>?9&Mg&91
zbItdgW)MOsd~9c`ClaBqqbMoYDZN1Bh3_qckQ?I=SweMbAAS)T!uNqejtw|t)Ds=u
zOs=O87LK4=86dNBEbWA`R5iTGb)sISuj$<oquCKou6#*0FyruBwea28wwz>}XvSVn
zU)$jyr^TuJN|UBSJVA4r2X@>6s^>Kl&l4ZsB#&h%S^==t@!v0h2vwpm@)4j@W$%7=
zBfTwtuO16gn+i@9vQQ71TOM9tc8|CZ{G3!JBL9u#jS?q8v4D(WNrhqwlc0x6Ts=qY
zPXe&>KW7NwzJD`tvFCQ=($SG4uR-0@x(O1x;ClDvpZD<7K#4gHV>=aD*)KddE#wIr
z?i6lBe`AW`*zDyn0&o{Rw9ma}%*`NHa)faK1Ss1s-V*x%d($UQpdAIFx;M=gwXV(B
zk_Vu0l4CNROSu*w+rh6cF-xM4n3I|KAT4?<LfU2)lQ6c;?I7%wRJmf>wXn9sNWf9n
z7Kf_K$cpnP3hOFGqZ}Q};8HZ)0`ep__BB_tvigcTEi{eYc=XvHd$5(;-wl%0*`k30
ztBh`w&}v42A8J~IZa6s>rhXa`Utu&+{dW9`pgxR3PA|dDzWp6_d*@(1SZBc=27&m=
zQ^+);_4j$}%-1NOEELwA?KNw^#q%@D0J{@`0IS+K0y1>b(7fPZbxYIwb?jZpbuaQe
z<>=Kl9nwY3K6}dw95SXT($TIY*Dr`eJce`GG?I^9b`1vE_971OgtSjFLa)npbh`Pa
zGnANK^eSOA((^2%g?#%sbeN8(1P(FV`OR1!7Z6ROYjK-(5hM}#vr6rq$F50a_2e3N
z^qv?$t&ONo+YAmL!ksesiMRCT$3-tH^|RcgdvewJ<$;&3IeNHH!>oq=O6|18$Q~hR
zOS1Qmd&@Q!<nso@I^_E5cb@p!RMVun8sRGFVD~X)aZdTWy+iOoWDbDjeSouJHfYK;
zwy}B%Uo6bgj}=WuA?BxDbKX$R_;F6r6!G6}q?}~!Gl7mB=sR!p<hPc#qB=#%y2(t9
zn3raQ^e~R<70Q^uMSm*Z8W%P^SA;N?oz0_@8KsxleI^beowF_`9R)0qY5}h@i*dfO
z<Y;vL3959LhV15n(do8tSF?j?dyxYgzEV2uV=NcZNfqNrZ@rW4E+13XcInmTWY?^K
z4_5dJSx1>k8zWTo0a3i#%bVtXg-&g~&{j75mwczMm$M$nEvq|X0d~qNjWz8}5NM4a
z+B;h}Xbj*t`z+08+73(7#DgnOU48A91<tLfzuC35WV7$Snv|;rn>}U25Eg%2lKZ$D
zAovaX^1UW>5ns><!WGHK#?tob<5@XO!fv^mJ{N0gdq*+_w(Xa(qI2Im?TqoTe*e<&
zCXDq3)kfuhwc4@ZsyvH->-^+`q{HAc$E)!onCWlDo3rwzv`p;}XV)#slk1XyF?~sr
zfO6SR0EA+3@56KpUP3qdEZxlW{Lt@FL$Pl<oijm;Sd1c#p;Q}ed`JHl%RwUF16J)R
z!lWfY4oTy3@X(jA!Rmgm@t!^AU&!N`iq93rAO~mp7!Nz7iP4+~_O4sNwM)?<M)L_o
zLE?T4(Yts@<IIEPFFg{g+a%S)0zh(HN9Y-*)LctE`~P}`nu*P}T$BpK=L<QT5}YJi
zt&U0y3QDzb-5Y!EE}F$(fzEPy;fohhe?!}z9B#+RZ?;H?Gm2Iqs=!nJs+YWr6@Q$?
zabhatymcrZ5u4SynT>utKS>aPmEaA2T#<zFy&XdcVRhTZj}vr%*~s4p&GC`p`$T+%
z%&<j>1@2nQ4e8R?0|I8B`UzgzIRKrWRlcFh_ox?L#H;O)9=kbpt)`pVj(48U&iwmF
z(OE2ZazoSXI;vH9vu#}aN6yDbl#^zE7dVeh8`||ywzbQ(=j}(QvFP!;>%}&Rj7(xN
zn0MhG9jfp1H*)5hL0G-Jr?RxntiE=wt&gp88=ps4qnL7n83$o;m~Z<0*|hmjun1<{
zwu48){ln<A<G#uEe-URqG&{={c8@*yb8_qNkn5b;^XQF_k3(~=dU7Lk@_Jufus9gN
zIn3`)neArUxUe_`1pZC+zS+$jE&kUgJnZ~>{!Y8PespC|mrZ(b?H}I!*KE~`Yn3}o
zKCRw$WO<w!cXrmNBRVTBAgl3TO!Lib+QA#2slRXV#PZ<!yX?kkWO8hhtqtAEPcRWl
z58c;mrfU<FoW>H}$IGF6PsYQut4FMvjv#}_fy?Ew*mI%Z_+>*Wj8`eTPVicz*{y(%
zafDYo8$p(ngad=`jr)!0jrtA!P5Tk=`SWwh%T4!W?b<fsNl2W}-fJa7!pqIeT(;Uh
zZviGxqPmm3iQdAr(C?TGcy%$?C~$r^U#P{leix1ZHvYg<G+S@c%Yvgh`95R5aiwFZ
zZ$eOS--s}G_nriN33@WhJ!ajE-naBWU=g_LpZfO=MrSEIG~%CbU~$A99sMTc_*wuo
z^5lJaKjJX?_24J&VDq7TnTClMluwh7|0t*T7@>O~diG*Ib|d;@q@Ydw=K|$eYe}B;
z*obvGAP$z7#+Zz^1A2qLP6r|O>BwmRGr$+2Fs^p;#Q4%&$o=EHM-Pn7N=c^^dmGe>
z0I8VZrw2ky+y{HX?^m|3GmI0@m23NxUl>ht!Ml3?$8dKWWYuYm00&U3QD?A+S=3BN
zvN|_E+kgZgISsQk8)mIPU_P{*dS^-BfgQz)e0lPbCJ(v`ye4UlqPJX-9Ht3AZ443o
ztWJma%+;N^3*4F<`Y|jLS&{jsa~l$!@fq=z3)VWwU-SeCOC~^?4kNaT73K-Iyg1pW
zqkI4caI=F0v%*_F-~7HW%0o!L0liP;bK;o%qvP0ow|(B+L&#m!OkA?0Ihgz;@Ox^t
z^!hx>CDq>>qzCA8ZwEB7Wn`=x5qzgOS|iq1&NALjd%WCtgtz(beuiF#T=pqL1n3-Z
zml@+{za4Aa%}Q=1!t{eF^)c98CjYrRkz?He7X1189<u0F!{$~_;dB0!8eRDJg@w%c
z{UR<Fow%k+;!mgW6>ikKRN^0D>+9c#hf$3c<hlhgrhPI#$lmDR((x{UhP@a!K4QZx
z)MlN~wjOClNH+6}O!X&Hgxf+}=OJA7)S9(IA1IOH%Y*|d(LTw6(sQL63Rg-kLKF-V
zP)*eu<VBQSXYk{&AEflgCWW377kl=8wGTvZps`w?e_9E+kr0l<z3zyHgP($j+n_d{
zn*WSJ^ZU$z_apB%>IIum4_}zac^q)==G1(PmG?_SD<3@uKz)kU)>8PqevU;?x0Mm(
zro5ku11*;p<9em<PlHxgNZxDwUf(j`OZw;0MPmf-WmMm4s1(v&M$e^46E|(yg2mqX
z=V_C$6KX~PDbC3`xFO=tynokF&tU>ut)*zmfu~N;5hr~2C3Qo!gSrUD{G;YYpD)qx
z0;5k~_a%2<H61IfSB-p+B#$c>B#&%$Z3K0-RJ{E-4#%8El3h*b2RV?6vQEo|tj1&(
z)yk6sHjQvVv*XkmGkxrJ>yRau${fwhDJyd|Z?3Ax$^PFN6&h>#tLhl3kK~6b-dcM7
z6E+1^?|~mN0`IdWeLj$n`G0cb)uu-X&fY%b+g&~p&G7imfGS4=V`_+Jam}Eftm4~Z
zDEXTfE%I_tII8cLr=4Bbp>NSTu~)+kdKZ~}eJtHaDMWG8_Z^jqXl7o&?-tHs^TFE+
zJFl#7X$CseDmzz1+)96_`(cbyD4nobm462)3iBKsb17)C&S04&<HjJ8W|=zak&FUn
zdS>}e03)9XzG1%LJpx^wd+!^8CXN}ov2kGI8MKy8#`M!bLsH1JIyXyRPfnpRXuy;v
z{qk(j^-JDY5kW&xzkJV2uXF!98DK~;_Oz#ZR~vpiph#5Kik%^%{kH|z9ltZq&^hN-
zhcwCO*sA9Qt9!wP@}D+w-(k{^Jg77E)!N353;0<0`dX0Mudqif$i}=`i!U07AL2T%
z%3%{@Pmp~iXFn@v-c>1ijKpS@zjR1aGh(Iu+Hy((rwYf3$5t=x=9c|wRI$DZ(q2Tq
z=V-Rz>$kzo#NgO;eBK1G=7{NeKN-{DUknJ|Xde0B1lLCSWp6|gi}LLV7Ce?f&WBa?
zLnzusr}$r!^uwFfeb#Cc4&c$w;Y%+yN06VYqJ&?zX?C7p!5DkRFejJ}8=q=$^VLZa
zXyunr$?;}MenuVaER2=Q-K{yX)>g}_RUx=~h=^y+Ql6Y4ev}DV`ErWCxdzexcEA;|
z7%XgDl|q7jJWV)`&D~-jkJT-5<>xbs6K65hxCkJhPTJ#}%Rk4Egkn_BBf;zQJ4!^q
zADe9|m+x4D%JF2e`NHtKDH-g|C_?W#b7m>zuco+LA8SnVV!;^RtQXE4_1&qpfxF7l
zdxfv39)aOJjuMCWp%dhFqNGg*=oh}Y5;WRRhj{+>&<}INo5KdzYdo5jm)>|Ac%0QT
zdUJ;)K8`E?vD({+u$p$X{H9m*$u{(Xe`p?O5pqfEQ|h>){&1yJ4Cv)Qdf#`XQAR%5
zOu61>@zmzzS<L@(Cce`ygl<7xWap}NcHDOqT0A<l*Y#K9U4F*aitx+WduTS4J?q(~
zz{Q%5zf`gtAqtjlXo?NDy0(v1dmrO!O(#21t^uXH_F0B}M|lH#gL&JZ{n9^|N9%q^
zTR@mv!GA6%J*TRrn)M-`IFb4EoYm<nzd`fe#ag@lK+0N59i4rK>ABW9T<cw-AmA~-
z#pdU88YyP;Ir%Belf=utmtMWMzhAya-D7SZ;>uL$8>L%+P5j3EH`Q_?K}|mC{h9kc
z-<kOoePbRMR;DlQ`^k%|4@_fn92uI$N1@Q?VUKH$vLg4xV)PTi_eFRu%l1ayOd|*G
zDjlVZr^RAY(Lt&?UN_JG&~UD|E*g~g`s9jLwFv9d=S3d)Byz?uJAgx@87h+>%|2Z4
z@mB(S*(QuRY{NwsH_+GSDO&PorPd>y)F7@nrV7%5k?fW(f-Q+(x&frc=FD;mCmsXP
zU3XP818!A#Y4kJRQG2w7u-m+>w`K!F#S7Mh>G%y_nZk+JuK6FFazp4B(p4B?bIM+X
z$zynS^?PE-^d~tGKGN?m?#7g4NGkIw!i_~YL+PdDO4=Xx9cR1$=1ro!=Xh}{*bCt{
zd-^re;ky}O^4fXa(SVW06L#J;K_B5OJig9+6?!=HgPcYg7{Um!m>zTsRP?W-akZl{
zo=oW;zQ?A!_%Uk3INLpvA}6}Gchf?0&x_F|Zvus>=8>Msp1z*(p0U4YO@Gf&PbxDk
z<NAIcsWNWXxiap)l1Q8}r7ySeM3XSSO@J2~it`EF?p133H*?q-;nMMI*p_{=Tfc0<
zRKY3n>lRzY%qR8_+tdw;vJ@+0hqI2@!E{S6*Ph`o&xcZmU1`=9Py6Rsvb?)Z4SsWb
z6WPj^4L(!7Ze1*cdcCrNZTxKPy5IQOXL{YLMZ#KidadJ8zO-GBeuoFiz-Lj9A-w7z
z2rh32_i`v_cT*dvrW<}ZHN!iT=)6C@E7>{e+H&mT?pwO`1>Quv9zKr7Eqyy<WNX>A
zG+1%&A*PuFHdgz|IqG2;7Hpzy1qGibroS=R_^dj$OKBfsqp|ChB8V?v2g7wy-fdg-
zaB)r>THa0T>apIu$GoDW+pl`aKux&ztc^@|8>&Oki6zBv_K(=E!fme9J=K-p6dI!3
zs(RzdYuBznGxE6GZd$E2HLq=tMA@`>menFT=KtyuCzBO@dOUZz_+)SH-71{y&(OG7
znQ*yz<<}9sb8D$iQho;a@K$N-n)B=@hD>(l#a|*nRs?NWt;gz3t&UniERj5Xl|zfO
zPQzKsKEk7Yy!q);tF=~S{0nWN#i~Tc+uC&fmu+4)`<d-i^45gs<rewZ!aA}yb?07`
z`W8ia_a&ai_M==(%_$p)TYUa%Z$sP~5Y+Z;dzn3=vi<iCB>wZ_+{@&31z3NwKPO|d
z7Sy03Qc~-LiG<xii)65KQYe}=Ym-LtbqB<#zb6>hPw(#PZy1-l@y<m)7~Id7aGUij
z#4*;;SsqX#zai0IK<mZ;^>N)|K|5<Lr{$N_y2UM`1GVh&-<EFze{Zw_x&z#AyINaz
zJb`;qo_ZH{GTSj9EN|2fOKAa(+vWuIwPAlokhiM4f#?H_ZIrb1&|4-th^2>YXQq0(
zN54%q;q+k$U%4sLx0u;t^m+IDSR4#Wev@un!y0U?o-M=U7HhXFeJ8C)01N18^~RVe
zY~2WsH9bph-B>4Pu3A>yll3ORSY@^4JTvRJuDP3bt=Bxxa_wo~+79C%!F22P8Q(DD
zUbbTig2}lNDmxQmQU@_z_RIlwtuqzG(-~oOfE|m(tk$K!6C%jw*1!%@hMmyOZzxo^
zLn%nzC}w`py;u>D`>w*e^ECc3RKn3}cuoZI_T0hn2_9_`yh0hXy6DzrmD9^FlS>tc
z@i5nVWg+Un_^s*3oc0;Iwk`Fen*;^>C3VZ2n>AEkg)2^!HhR3`;0RvK1GWl~xl1f2
z_Z%)OtGF63)*%GLly=?Kq3wBas!&pL1No2MS!%Oe>_L>>+_=4v@G_r$YvH=Cby~t>
z3y06ZDzJL7gHCTQvO23{M&0I+SLr5jTvg}F5se{~ZS#zaPhKbElgy+ejVup&i$+5(
zFHyNWM(y&z#W<~_@0%M5WnCxca&;l3{?&r|B#10W7aTmD3w-eMMtOighn34y%=)F^
zZ!uexZvS;{k4fFEbc>Zz`W-fFRSQ8_)ZYE>-|I&{DsZUP9Q{d5&boZSbBwNQ;&vWw
z!n?#>TVjr^&=oBxRsYoH3%)K7(;{k9giknLAJefK8rHNUe2EnE^KX9d*TxD#w2_YL
zD31U+6YvREe0KkCUi^!>i=<qWRjCZ#8YwLN;R}pzDO=bq{k3f|fuaUkd5!v&Q^Kt5
z2pA<gR5WCr5~r-lv)DF}<1?wK`!=Q8>p+Q)hQA=*7hck(zI&l(c~{wL>z8Ef$ERnL
zK+~j5LS1!vHpbel3(lat!B$azK33b@@xS13!XEE53GC6p5kq4~n^)sHLn#|vieNaL
zA~v}MV`FUPb2tr^z_P)A93J^!9DcGUOUPYzzScs?6v{}bS7&=ehUL!z;Xjzx`(SCL
zdp$;&?qDdiI2I$^m;^E%UK%6JQfQg8W`+GTeU^r>DGN={_>LL+lnm4|BppTvTmWGf
zG==2UT1$GW_gwaXg)FthdOCGphJvifwe+&Jh_Qp1alJTNGLG5j#4Sg;Hz#nhv@bLV
zfqlhzHCqv2HuV}Mej-&BR<fLH0n8Kwpl`O4maIVMKo#RS4O5I#C<tqpi}G%8!&4Yb
za*d^P$*m-FM)+~?iNTr^`~LW+-?1dg(&2LtNYFR;JB#wgbc=&}YO#aK`;4xfGI;Pw
z>tT_DO?!j)>7``Tvr}=dnYc7$7)<bR`*V!{>3C2unk{h;x8!LtGFXm@UFC7KdgO_v
z_Ma_qrPLv$Oec)0=QkJ~=_bGdKhlj;e&E@-gXDG%-xRz?Jfl`KZN(UMf(Ui9c!_-z
zAKQV}#3hO%F}d+aD8Y_=zGkA-3BX%4pxigZ?S9W50Y>phw8)ec#y}}Ce5Z{0)3(C}
zbEvZGY{eL(#LQUxow1UYb6OvYVG&OLgDM?Y0XLEhzF*_S5f_%3t*G?NF_tnH`>b}v
z<W>GM0(;m5T217$AQ6UPEdmJfdw&r&Fx_w)i)pbFY0g9_%5f>%vE$e+5mWYTA9V9}
zz-n*p7<_ZXLpi~X@nKuxsdQN36^|}cEI_#)Avsgs1tPoz>!liYsk6zelpS3$__YyI
z;&K&78gfnwgpfb)>*jf?;UuCXgL5*U#oCK+f(agliy1nZhyIcyD;IOf?)PYH?VX#&
z@;nLP!IJX-HGH4Rvtkka6muvFQ%awJwu3bH(rpy+YbSXvUTZXq$qIa+Vcwu^^6?_g
z@_AT2n9qk!tVzjV>`;S&Ode4Nk@VZVa1?pAIqffaIH<{fU#ODMm-Dlfg>%G)(!5-o
zml(H5$20cwec0O1?sq);TPHT>B~TAI4zg&Q;B1jvKA_^lH+0@WUnIkq1IHYOPP%8#
zP%l%H9)NpucR%Wq@RD>O`st=SliU;NlyX=Qvb8P~V9{W)l7T;m%AY&5NC`ucG0+w4
zpBV}>#|y<e3p(vA$i*imD2(T8h0E|d!#op#mG{3=Zy)3}3tVSnStvce*{WoSL?Mnl
zA+Eb+O2&_Rx$mVLip(ZCr53o01DOGjHUG`t5s(lFmfIF!9%YJ3d@J&aiHcbdSf1-I
ztB5|LW+r<~4$K$q!%io=@>8PqN&A;36yYqI5?t-B5maT&Qbb9)OCNu-Y23yO5;Nv^
zCvN5=(Pf)CCxTO$$a8Tzwx~8oofjJo^zmL}S7XNAX&=k_?u^ES2&UY4xePnvrp-cs
zqi!uh(QvaInSw6Y7<Hh1VUfGkQNXFVEWmdakuZNJXECBL#vsYDRys+qpF`pFZA)9Y
z2BR$++d^-EGHrk=_Thy5b{P~x28oEmr1Jo7(jHASW4o{D5;<;o@i1!ooE^L1{aAER
zpAmv2wt_6SvL}%VFP`{UEQJzv2A;bLmuu>9r&9%6hv)6qZpyVFuVVZo`Ac2pt?&Ln
z7w_w*Biy-;FNoMu8P$n;f$l|t^VK|mc8r3fy6?h+W{cV9^VIYSvQm_Zv@R=g0O(!`
zTo=_H_pn|Z(PECk-W(R)Vms873OJ`N3eX72NGfn?<s-JaO9AD4yI)|gnG0N23+CLI
zNwSd<KMG!Fyc_0Usr-}qQ)W9&h-Z_Dlx74Ul^qA6bHIpSN}6#LG)Gj~nG@WYM;6<v
zYEEwL+9o@5AfCw`M`p0`E9%))v?hF)^O5cvCFc8KG9E3yYxz`lqmamcDp`AltZG0w
zTaNaXD#+Uff%ROVf}<JKCVL`m>SMf}`v`E=JGtmHKzGwRM3K@Vwd-bWs*nxd7oulh
zvEj=qhnShHYQa%R+pR~4@13nSlba{_yrKL=i3l3BgoX{)Z*vUuNWyV{7m8KRbv&2T
zXfXjEBMrKwZ<FES0Y?X0DCaFgA=t)|;X$p`xqRvO=&0VFDYN*gSupT1gjOXuE;W=a
zS$&u{_pZ=}S`iFT85R1=k7?nJ`DIdasM48hFV1Avep8iYm}w=mp6rG&hSr^^WU4r&
zOv2tJX5$=Y=Wu_-2Z8;nL5oZ!Raz7&HAahlt)?cadL#*%$)K*wE?gI8h;WgRG+CB@
zA);w9IcsG$5zc_YXUh8lYyt>|zJ7n%Q3Pi9%HJpkzC3p%VkOB=CbhTg+?G>BQ_ciu
zEJYo1ii&(hMkbGwb1W}{kb^&ycbA{}FSsm1T%Ro+Y1|u;n3pmKGoTF;byXhxbX}lg
zUf3`9R47TBKeQR#(WNwH^dKD!D#vijrXZm=RkCI453YT=YT~oE{Y_zAS=6-erT_cu
zK_sF=^YmO52nC>38|<Z__<w}mFHv#0TCvWgetXJ2pA+Umr*Hgu_(`ZrrYi`-*z=+=
z<NJ8POloQBJzV9fx6nlH9!z$OHS<4eFdL|mq~j?Fq)CyxIt$6{=URd#0u*|G94KOx
z7Jp<=9SOZD)sc6~S72xs0g?@{n1<8jelm5)6=gLE`z2^_goH)LjVYIarm<x*=a7cL
z3e(FmwU;u&fl}-wbS<p@981?aHos(CY8GcT^;(Yxz=RPcfEKkofdUGO+}d8pl?xOx
z)FSc^B2x2O<HWO)2)p;7WD%Ze)=${%=QWoU3GXaNU+)i!uKZqSrsM_s#Y)r3y9EuD
z$@zydW-B?YD9WUtVvD^PQ}^MJVf~oY5iOPK%>Mp1>>$VLl2ovHrt1K`bbQB9xDO^1
zfbWvu9ec{hWikoVU7p7etWT(|EVu81?A!00zTVTm_665h_y(+e7iD;!g;hCikm>?J
zp8qkz<9TzvPfm+ht&^SeB$}^=nOC(GO%%R5iHl;mrinzlfwW$Tm_68IVYw+m1hNtJ
zq<YkoePvA7A=bVWD&aMz?WDT|UOM!<G541uUYPdk8yz8b?-*oXd~1kou(OxZ<p$N#
z@mC}7W4V`kNn(y0pG5jUsn&x8dI<wqe}Fjk0y%S$Iu^q+7F5A*s?fH&Rkprq5)3E3
zI%q~pc=a4N;V#5<jtQyE38jdqqC^WY(_oyp$KTpMk;{d95yYNKQPKv74^8%@h-%OT
zD2H+ffye(P*8k`_NzR3jzC(|^gGHl@2OF>mSlWYox{6uNle6%pZ}KB=Vi`J{Hk<(>
zz|g<>nbiIFt~+%6?aB?+eQXB^h|3d1@aN)#r<$ZMBbKjZ%jH)jbWP&wt4=`;&e=$s
zOha3$=G3xa4T2K)ESnxW=G1U+d}WMbN7rl8JNy6*BiLli<0)bmTKz~?%$mkYy5?@!
zSumBV0e}B;Ci-;lyMkbxsKg$*BCx^iG=-q47x+d~ZP*zj*TgJPHS{%@GHk#>Fb=|x
zN!0E$u-;>!t8wEB3j8q)2s8WtHCn5_R&=|QEDtFyIQCDRBONmPiga`rCPl5P_p)DM
z`tsHK<o0Zw?=j4aIO@xwpwp&I3Q-5BYy8|2v1hQG4mCrDQ=2lqb!E#t?$20|*^3B~
zFeMTMdc0CXVSh?rT+=z;rHK%5VvJxZtW`0&sjlyr8_YQ5K$4I;6Znl7r$c5$E30^_
z#7GA!C!W({mRW=LTp1DPEvpT&Nv(-uu|&<=v0oG-x~Fi5DC(l3k_nJgN9Ac@I{(7A
zRU{78JUe2L#I2WO;j_f2lr4PtsFCb2WL%6GKId=qYE_x*Eb9CHmTG+{=AU(Sk5?K8
z#^Gnkw_YgHQUA9%0NKtr_jcm^;cubKj(Kmb()ML;i)dp>eV9rUzo~xcV*hLK!p1#y
zO)J}bvkb|hyl*clv(Mt^oO^)P-F?yaGx#>gZYQ|+kFT(v8}Zx7x>`Yj`<OgjJWc=J
zXPVBo!;n86%sxuh)qKO4KR0ibpM^I9NEo1EyM&Xj<C>v%^A6#0ec2qEvQ=HjK6Jmb
z15=~2NdUKaKsUk4hg0!^fJ(8ZQ|b?wJ>Ln2$vhG6{JYq9mZ>=`^%F=d@%+Q0*tl)O
z=iBB?k0RMH@=A$pJyJ`NdhFc8Rz`;|EYDjsi)oU``Bx??jRKNdsMyWY_M*|fW07yD
zTjP!QW12pWRuYY2I)pPF<sYaY;k+x^*C@J0XkS+m(0Fe`3~rw=*|T5-%FZMjcF48S
zy@5E-BDHl=>K>#%f~s%e=HfF=mL<Y*xk9dH`G-gs%fplXKc$<v9ZlZ1=gs4+gJnD3
z@g)i?KVYs7_cmeYw3^1mnZ(NDmtrfvR*OAHN#2g(+S8SBJvo((i_B}D&Bgwnk7Id|
zr1(N_=cFP0o(Ew<*qsh>;`yELwhCANa{Q(E0O+^CsTQcwt7|rjJ^HlO-oE3%)m-nJ
zS-o4l%lv~>UNCNYNEe%6UDtA}8~;@IrK_DQ?;kc}aZv1;;nYws&;I3E$GdiC=VVis
zf9$(|#K@tKx~WsPIqUdOpYwPa#5IZkIWmhL{M~J(W1c3iJPR1xC(k67wz-Y(wvDZc
zP0l~~{Y%aP_5J^do8R4z{XfA(u;6u^yyO3guk+5K&VPG$)t2(<wKH#?-0Z67_tk$Q
zTz}_0IODD_KRh!F{J+_8bXH#8|4h@Kyc`1he`#7z@0;E~n(oTJx%K$3nN2sYP0nAL
z{s-eGSh2_E{JJC4lYP@`|6=~7_taev{{I=UO%D#Sbzs>92*;rrqWJmD_5Oe)rLe;C
z^R?+Yl6Udy=@+f1#!cb1;c|N~@Sg6}zuQ&_<5P)g5PDQ;b<Uw<8t0PDgpp?_WJTrr
z=6uBaruasE(7nO?0035eo%HuM&n;u#1x2|W-RB~td_3KarOTc2mLc-R%ep997){KI
zy?2RM?rtY*c@HlZiq+Vco?>wy2d_Ev#~Mw*jF>7@zvISB_nJC}hPc(%HK-HM&+)7G
zes88(XKcHX8&<*FjJzj<|Bydbn`YeoWptLf^PN?E7T~mZEob(N?=1#XKp#QUAtpEC
zt6{K6VaY7X<eLfx?>@Spkq=*nb0?xZQ#l=y`(uPN-5EuqGZXfC-za2mN<A{ZZm=ze
zMh(=cw{yMYS6>g*{OF45ef=X#LFXp~uRdhW`GPJN&Sua#0Wt|8pbKha)Guq!>LU~I
z0DIqM{mkL=8&->Az=5IfF7)LxaalTDpbeyXpDW<i9A>%=S%asyrB8yNg0@kb9gEH#
zlph_J;bA=3UU#89ca}o5;g#MJzhQEX_$50qt3iT)^Y4j?-G0lFv8)SknNyWjJAzd#
zD>}z~Vq2^`CNrjb%0?dnNQ;xOYPdqvt<PMt#xm`k9VORtp6iXWx7)&rUh1ZqWAWM%
z<t?Dlgf$=r96BfYZQV6qZ=SI57IYFf78NgO38A?3LrgA{U7jR7CQBp*dIdl5wZV{B
zNBmGHMrapDXTtW)R>uF+3NQZ|_HnYklLo|)$2qEl3ZCKPK4$U}xNc_uql!m`DC2ZQ
za}aWkDR|;pcvsVh6?dWmL>9ZKTi4DmaLtoip@;Ibw3HpYna{?m5nne&0&opk<3)N(
zBZUgvUIy<OMKV#AZRbUq^-O&x`lk6#!9QNr0i!(li}tY48g+x&yQJ%(TTV{XHC)IL
z?F;@q3}kbpRH+wyejg^WM%<MW<Cp3uvrwijcc;=WNWv%vUst0|Qbg5r4Lb<&Lr!C2
zp64ZXyW!|vd5!-75vKz@Z6M@?hdGOMzr-62cn=tD23@{sxtl-`@E->lL|kh!3^X1Y
zJvNH-I%QwWse_MF^iIMo?ceo+1BzBwQ22cTCL?B>iwLt)pZ7&qtY@dAK(g2S{_}Gr
zKXri*U)j%v9gC<!F+#7>U%o4-lrkOru4KrPe_F7GNc{3FQYB*~)c1QQxF+Oc2S|K!
zfBCATSw#14u#urBUAb@ti`?VCDrxMk?AC-a<?S~re)))f=Iy@$UKd^f>RZ+qPiy#Z
zNN?7UNN?C0n+U5bsJT0EZO*v$q<ZVFw=;p|<XqN@nf1s`%N2(NEo-6njn2~MjSO&?
z%|d4xzh|o4%$iv$yK&Xt4tLI`RH|$gE-GQAy_0Sy_~>d4Oj{Jx{Q5sf2tJRM40^!4
z72M?|D$Vv09((~~I@|#0M)<!%NbPKBLIeFUy6(@LNn&60UBQm^ue7|yP=7w&>*{$7
z`ijwyKJ8&JxXBvqWa!;Z#E+VJZK;mKuymh!o<2a%f$Gd}J+Zx@?QTu}-m)g<Q4Xc)
zjoL?{y2oZ)3hpg0z`MP}rKH0?{=qC2D+Zl7&CFGsurFW^G$&{fF#a0r8SDWC5^U=_
ze%k(QXp@m26%RO&No8$kN;|q@ObnFP=w!|1#U(Nc7C55CI5*dSexLoCM_B9Mp#Z)E
z+YLSw1@<UMU4YBibWm4)^M&MWS!qL?R!!NSdF^m}uG#KeB}f313trRAPK8G*_syan
zqr}fy@CTZUl{H&8DDkjWb^nzw;kW3(wOR9~FEq|j68et{Vbg;*upOj_d{y&L>SR2o
zqT>oc4br5HIGMnv++wdwx%0Sl^ZRCF)6OL7XwMi~cYM!7WDBURrw~>GXiREucU%Yy
z^wcb2x^$RNUEBwncb;$lg>hc#GjX`0LMwtLua*D9-mlt$q)lQof{$?qk#(9Ln-vMC
zut-;^#YbA>2=C?L0-q~12OnS1bbXQ^hv~O#-s<pkG>K5D6z48UvBwGdqD~H$CMsnw
zHe8u2%M>)rVcfihMbqY}F0SF9iv-R5*+m~6KU1wZV+ooJ=QV9g!Xe-8$DGAy?XpZp
zYv#H0@asp5G8kze1(S{>Z}2VV9-@lD(<^5a;0*+vC1Je|%(a#%bkBljy0BWlV0)hz
zc7aohuzC;eSc-YeNuIU`Ym(g=QAU4OiKh4Yuhm;ZpX3;P!!*#0A+zs>NuYYr3Gum5
z(I<Kt=HENw)>@ASx~#ftg*)LbVnAy(?~cn#E`1H(%<1YsI>8d|#Ff5X0N0={q@B-w
zYZbq+_x$2+8^xOj+|c<K+s-Rr-RT#4^$DCmZ`x9*zPtR9^0><AqRY;)ocrQRc%f5-
z&<?lE%3f)2yWuRbbbe^17o@?r_JOMw>6N*8U9Tf|)xScCjW!!|qvF^{93a=!5*J~6
z<`AdxJIL0aLcXV3@kjUIKL`7a@D1<{`M5d$s(mPn)cb@vg*viE@KH&8NM1=c=SMPi
zA^++!r`KD0j_kRPwt4vsm$jPQH}`?m_o%tO0G=ns<*<0d<>7M~FJSZE=a=S4;^R3^
zsomT-F4>>~8yg2YFz0)QYcxC(d^7&0+U)S4LvIH6ld}`uY44He#?isW+7f;Mer)a4
zWICtuo_SnEQY~KA=(;EyO79O$0phqGs1M~CKA1n!NmmY3&QnFw;?c>eV3nND>lWXt
z+E<(BcPaS3a7U?|gtr;+zZ-tVx5KjBhDM_8EtVP2I9c)wQU&<f$B#Jaz(<hO)mG;y
zp7CL$F~pnFCM?}0|D+Eo-Y%IBQIa@&?v);$G0!F%zY~b+xTc;K^rX&Bsg?1A0n!n{
z>2x>$G5`5D6Wb1;=P`a@iX_;0<au$;3Sn5vP^X8?EWQ&ZjpST207nvQ53|DjWV{|d
zO{hu}ROe8J>WS@yG04gmHeYYrj`i5Fs^jH-#)^_5ABi?O(k=@3JdcTzRxD!o1@|>w
zaB^)3dkUUnb9EJ{(?VHpXEezn<3$3*^kG?Hq5yX$G|mTj(_}z=?{!ZJla#tq_L~I7
zc66OjX2m4lN8__@1j-{VW1y+N0np@c6<kBFfxeNxbOt2m<&AtIRqXTwRjeab;V4rw
ze-4r9IuSyPV0UB$*L~=<yR<@3BjhpBqRBJl#tpKkfE=MT;Sq_)wA0%`lalQZIo%aU
zOcvSNnbv24+U@%iuZR(rD>z`~!Cf}a<nBdGmE~`@&a$b>RvK{H<#UzQjUZ+4mh~Xz
zt;$v_7m3Q@b9T@AxR90Y+U)FGoL=a-=Ax8t+qcK@(;V`p<BV3SiIxv`ov8jaI*-6d
zHCqQQ2c9kbQ!DRYzsD$#^S9}w#aB0+EIr$%It%ub@0q5Yxa@9q<FZu)QLGzAIEZuI
zPL2JrI0P*^H4AF(Vj*y8r-KP>yoTTm6I~pc_V9Af8tXpJX&AD+fTEs|VH|e+#Q>)q
z`<5Fg`&Bfsrg>6Q_c})$H}EI63qD$_E{oM*pWoXfi_4Yl{8KZ!IIY<1wze&;H^f=C
z+w;~U=;gUrijs@7-5=a|oxQS`_N^yQ4&>->&CI%8JqQ?cT{*Vr2dJMQ+xTeo3@&<g
z5}>AdaZt_Uo+|#dZZ;#erssvMB9=<+J<7xT>xbXi$~>W>e0>nND%BoO(yc<8s<o&V
zx3w}_to~-C7_Yyq-|D32-8$ae)H0MiQS-c~`t;q%-Ww{jwOhH!+G{!nkCg1O_QLql
zT`;AiwOMx0%8tz=0P2&~Wt1B00?frXDAd*wvlafth)|b^B}j4%J3Su8XRw!z36cw8
z)DRAnI3B5K#d;GGlw-oZz#O>Uw{g+jR@Dw_@-@{1gL-3{AN{l@esQi>^s~*zIcBv+
zNpXX?LLF!IYvn)s4BBdO)e1@fO?-GS{e*l!Jw0`$Jk8TJLp{xu&4<b#^{lJ*Dz(D$
zeGdySCm@!(np{yq8)Rcdt<`OZaBCt(iZH?#5!xkat5X5JdyD*}twMX-&N|AYLQ6b?
z<I-0LxX`p)o&{OkKEtsxY?foc{Bq>xO|X>nKiYfmsHV1d-ycLpML<PFqzWh^(v=QD
z5D@_psY+8JAkqmPLabl~ktQ`N0!r^40xE<aiV%9}p@h%^=~*}Kz2CjxbMGDJ9LMk6
z@%zV&3=-CQ<}>H~tnYj>*IaAPrGVQ*ep}V;pFiQUmsfrE>9xV9cMIQtJ65Fho~!cU
z=f|DL_j<8<AF3(u1UoD~HfJ|-^0|Mph9mz5p~G{g(l6B_yYZzx4k-nDzO$tr0;}Gf
zSN70)Vk3a5Y=HrXJf}{8H$q3FtqZoQg4&hlH$Dp2jtCX(^BH}R$Qo)iaW~JTWs+;@
zd$xT`AjWHTN~yxj$+vTt!@c3^%o2yk%eIl|&wY@FJCK#)if@Mt*FV0}uj68H!QS0G
zFXd+Yb;4+(bf_mb9CeT~Y;v!y7Q1R?QRlv@DBnA@6KQ&!S{HCjxrO7Fe1JKc{OC)X
z!C43Sninftg)=S1k+xbn*yqv%h^or>i29cO9b1<bCpvNLQ%C81)OYW!oBb%kiK*d|
z_I_vEvbdusQ|g@-y+XyVy`Jc1URl2C@k6=q7JBllc%bLUFZQXFC?de>4y>K$jp?sp
zPA>n-oNvyY8*YEii0hI3QRjIzP2FbE;wPK#_Xc%dPjNjru}Ssc+Vq<3vkTqLR~c@n
znws2IAHr{T>cnPB^wizXFS{O181p5bU8iX!8lUxH<6g-(yIrFevmh#EY$T&I>C35!
zKQCeFtF%$GkVv|y*);M-CFCt1S=AP)-)DSyK3i95EHmMPqU?EjGuo@2ccw30C}TnQ
zyYJ~1mwyzwu8cmc`{-?Q%-byS-DhuHeD)G=>EpO9D@e1XMjStxtvK|6qj3RxXSmJh
zQ7m)9d<e5P7L*?5?0J}K%m1gT^M55~&YDko?ztj=XpjAs6NV?HBwl}dbM)=y8_z(>
zBqvReD<dV&q!jjp{%>YVI`zaVFw$A^H?B(k{6j|*iA2WAiu={4n8&5UNygM8OOEE2
z@Ch%K`K>JoK%r0|5uE`!!j?lamW{BG5Vc{a6+%$~0iaT;a#sWLLqVB<8x=JLBx`GH
zM~t#SSUocfrC$X$2Rt2&CGqw&+)N4RQY|Z|lm%Sl?+1OdzOLP&a24|Dg|(X%fThLK
z9RrNk^+kZ^sOo2Oera9g%&*TJXHr~^60GgfB^k-x`Zt9)ojf|W&e>+eEz)iZT&c5Y
zWM;=znMwv$S6A1gpFxAOiAZB{=*3jg`u>@;9Rpg1l~AWjeNwCg5vm>M)}K*ZDuWdy
zEi&M43jj_7nqhpERE)D(J&m;JxK31}TTF@<5ip;HT!F&%t0E#pWDhP;VelMXa!u>S
z5DE0O`<?d^mhAOlwdBsu3NDq<5Uz6kH7{8^g$_c#Ay_7!>eR?vI}-D;fEFXS;ki?h
zaSbN7IBOVPF+z0NG8=kK3k_@A&>V2?T2fwePWB>eEEbJ+09mDGjckdY)UYt(g;fc9
z6Lq&+Uv}`qQNUHRRbo@D+oAE4)-tW=k0X^~o-~T>_Fn_bk%!_}M3ai|Kn1!R-6_N$
zjuks06`*{zA1Un~-J!4h0jQ@qV#@$SGjczfpGw$rKhvqUY(Se;s6)h0E`}ze&lQ*<
zPUAhg-K-W6FX*M?RB^{4&CRr(uSzvN8J-eE2Q^pDq%gJ9#X)7K>&MhPlUJSx#B93^
zrBG^bJSD0RH5f~KS|bVkZ>$|Mg>$}#o+271HQ=)p;hFd(5ARF{>XtyI3#ifk{El_~
zI8tU&Jb$ZTKgdcBm*nICRGlQAJQT(s&{fe<Zkau@bz-Cn;JKLAM~?*zz}f~-2B-z#
zhwU)l1kR*2@JExBfOZ?6i2Dtcw4|_Iq)>|-!o@062h?Uqai2C1u?z%B4~gjrFRWaL
zVGN|;*RwU{6owQc6chV0(2?*Pa$k?DkYZQ_1{x1RJc%$7h+oX+JAe!m+d8vNodC)d
z;dxFBRE>}ZA>wU-%=U&9^fBUDr)H%kNukd5c;y^j9ebzMXXY-p{6bhdNr`wSCgCy6
zedDC3q-RIQNE?u;2;Y)zi?AJ%f*N3YYVXGM+31fO7h%!#5o&Xa&)3A|ggZYT*L<R?
zU^n|zj-!a!%OTtHqdJ(E#sWN`t&D^kVujH?w+0=pMgrom2Kh&;v^UW>{6GGR)tD2B
zN{YU(l5KyQg@x_;KS9W(`+q114d3zI)H(We`s(K=S9EqAIeYTRn+LlkESTRuFyCA|
zvpq>dTsc8;M{k{(YfwVLJ=$D|9?DGvJlpb?SINrDzAtD=_Hzgvg^gUqg|;gz?8(I%
zVOKAcgQ8Y&o#;?dFnQMfPU?8oB&^(B)?EXM4s~6HP`+#jMv)B~;XJdW3>^@{65{tf
z;5zyN7RY#IGKOIGiRMKhA4iaOgn2+|n%e9LmAogb0E{)~O#s=kFeyhg(Sk7=Ga66r
zfQdU%&g4*?;|m`)l&?mr1q%!rl@A73#DMABdUZXS2*=R6z+jP{812A7c*;v`by?$#
zO(N{aRqZ?^maye?At7MlQUAHpin>y@4sCR9x;+YRAd_y|owM!G?;bNhgUWYwG{Ufj
zYSvl30;g9?yd2%Qu!Z)m#Dg@DTNo}+Ml|lNS`kLdv16mgD_y`6PHqs&BceO9<Z@Od
z$AA^>%-MAXS9<yK+jGm#7+VIT%gq+bT|Ziq(s#Nh8U)m$T_IYMd=1gqwJ<w(RM>ag
zHn}qbt2IVi7QElu=v7J&?xBi}!J(dDh*pA;T~*wc77P)IaUViu;(#LM)81=YbiL7l
z=<tcfpu$@0GTEDRJ3YdXkzuq0GfsrXYjc>>Nl>~?!pcGs<nUnU_Fa)5#GL4xTR$*E
z>Co(moS}ehl%b0AP-jij97r<BiqW_RA3$j_fSi#_(D;Eha8{a&;C$E|Rz4}Ep~uq|
zi{Bd>VINl20lJEad9|%%h0XF2oT}K08O;(`>xnILhcOz$8!m0Phg1-V<3_V2c`e6<
z5hC!VBzj(Cezu*$pBJJu`Pna(#vIdnt$^>`015(TDJifto-nKnsq6k+#(fb=4^ew)
zo&>w)?P=?l3SkUukpk{B$4K2ZCKU&PdlT}&T09o^GAy`F3;?6k=S=B0Vu8|^f2xtW
ziH|H-*9IHWXLQPLItHf4f&M2N%pX3++d%QgTP;|h5Be-DtmgkTO3UZ}6L~Ou21C<s
zk8dB1G-LNY%<g-L&-c*JFD3O4IjXWx0x$MsAL^x=Qddkodd%NS82)c>kv?BRY~z|K
zR;{xlh=`~)C3@SVA%aLqN;VROJ5E1G{Lv6_tg}?p0V#hF))?i#R_c@hExQv~&`s5<
zfDNi37_ae;l`COZYAf*h&~zxZbp%oCFhK8wG_E-UXlzKtC<u)Mpy07kJbG=cl1}L&
zVi9yi5k(kH%p>X)4hB)v^atTWX!pO1Mj`%Oh3>!iBI$q*kn^jxEWR+8sN+KagBKqB
z-*fPvTQTvbzm64@I`~xR8IP|h*Z1eDhuCK>3AQ;bEo-CeTn%+lD27eZ{rj$UZikNS
z>wTP&l+=7%{`kSYkN@>C1)@>5SLU%OI4pcdotTTAfn?>gfJww=z-)>9f}s@7Tt04o
zAjkBN-HPGl&3Oz;wh>C*(O4^10q-VI4KDwnmS-enm~JC>Dfcl7cO19PD1iytap+YH
zIo;l3Gk<Qk{fP#Ltj<E$)%q}PpZnOn&=s7>ygMeKrrbMBIE6c8PcEY<1iT$hg@a%W
zV%VZgKb^EOOKb>^to<y<aY?;FcuDCJBjfbuv-%o7aGt{zKJ<3T@_RRNIa326LMZJu
zDi=UviX0J)2>bzcD#Qfbw<&HCk5ak`7uO;xQtJ+yWsL1hMPhoBv!AcMvbBR~>7Pj7
zQZ0w-YkxA}Yx}ZffhWD^7%lA(LR*OBy2`*eplAlAi#MMJvvL^%mSE}i54#x4-k;5_
zf^dSNR?t4#na6Uy+MgpHYFhaP*6L_?oCFbhEz{}bH>gewKd`32SKY!`)TD@S<L9y%
z33RB?OjG5s7UQz5D6@(Yk@*C((U-bgAFd_Ku2;!Qug2CmfML!*unjb0Z)sb*7MYzK
zA@{nqIZo#tYgp7;H{}d;f*!N1jQ5?OOEij?fkJzg6PI)czI40swXN+SL7T?3dH!yd
z!jrQ~I8#S6XfK>KV0&%Zn;#>XBAmQrOVP^6;`VpXYI{i~nKS{ht!pPGp>k~7tx?Xk
zy?%=1c1NThB??$8{Y+C&`a)Q$75bM<)K!T|6R_@0?`Ey)C(^1iTj!xIV;Nta=D%mz
zpqzalhTXMfERXQQhkW0~eErf>xL7^oxpp$IwKC83Y)|f{h^1X<70s4hZg6paNQ=iI
zN7^r7gBDh?Vr(@(NMr2BT4sTy04wc+{<y8k9x00O9&GTNr{QUAH<$AJAGY$=xeB|%
z2(xK+Eg^2>4o(Y}lz~m}>4CFahch{v%D!%$-0EO_U$r=vP&RNgi>(6W=d$U_06K(I
zc&OHCNsytA1}ni4FY=G=vv8{s5xfmqeEz5w&~>?OoDR!nL*>1NB}v<UIFUDXnGn$u
zvgb;kopDmc9|i6)?T^ZQb&s2HA!DKf5zU{mW5J%YgWz5Eo;nd9R1|LR!dFNgZytch
z!=&LuOHyT3JsSLc<+!fPtn<gp$~Dx3IjJkd?aWbgDY<8+<~<xCr7M<{xSyq0oa_O!
zbx2u(l_Y}-<FT=>2Cm7`T5DGsg${qW%>&;XpE0i*1&F%8vpkn;!~+=<Vqk@bV=p}L
z627@mc#gOid)Fo?>>zB<j7UBrXz26=WjmS5uT*G;j(<qHmcMQW4n&LWkFjU}T+~`s
zyHn)qbft*WnStfUyEUW}UxeY42wfMml`@tHhOjNwNaVe;&7jQ==dS($bWmp-q583<
zpdoS28tWVXcwMysKZwQ}W@@viODAP+=*;8dxqXref@Ur7>8&;cC&sO$Tw403U2AUF
zG9|kHyMSdYPd*NlUbWl4tDh`KQeOoYJ5Wl_SdI2Pbyr=rwj1fM+X!pn2G$V?NqBS+
zf1YCAipHi(sOCjvOf2SwD-P$l1jBk9CR1`c`9gZ>(Wrh#M$1gurdCmU*%Qm;!EK=s
zC9Mom0U*JapzOFxtr-QB>@Dezop{`uAR!lUpR@;x7GU-Oy7W)qllOrK(K6bR({TUr
zC6aWK+XY76xEJssV>+(~?pk}R`)0W2w!*cLmi%yi6^1+I&zca6LED8xK&YI1>Nr|^
zPBVphE%J3wEc6<@d%o`Y!=9()3|4-c_I$v+bx478en);`QNMGj;J+Hr*~M`?khN-)
zLFU^|w1@~RYG&8XI;wEjp!y?vKk5>%Yu=7iqpRjij;<X=>C);4_>n<6Ah}{)!CRu-
zkm2h!3=hj-_gf6WiUn0`_FK3UdSsJ@33l)OJ|#4I%?p@LQP&2wEpajLcp{vl#4SLX
z8`6a<86i7sVfAL@ujgXUIi&ku7Lv1Rp$4kf$_{;T<(Wn+L08+VXLgxhC&O?t2P3>r
z&EB(QpENknm4hXnail(lc!gU-EnH6rJ220-<IY`Pr9Z7il6i~2^%YceZRQawq-S4n
zXf}5M;?hvLS<4_*-JTow98n!>bA91;N=hfWJrn)xR4mnAc`jqlgthdg`=lo~27<@u
zcLnt>*;4Z<!9^=v2A|g|x+sWfj6HxU0l8{ypTl}#`Wx6ry@OP1?F-BL(Fu$q6y`3B
z2(;m6K@_B^)l$6{x%$?K<5o{AAVkd+M+Aatpy|cHnx1Qp)~!H#Su}6%Ho|Z6rtyQ7
zQE!dtL*!z3k3yMishW?KLxMp?gm$v6Bh$Y6nrW3eQHUSTtMsqm!g^Q}c5!sgtom(L
zqwTElS|fV6X@4LXW@>lT-9eRQC_d&hTc9TE%B{PhwMC_4>~^ft(??I3;(W5Ai}u_-
z*61Y>acmu$-^hjZUJOl8I=<2Oj?>d<mSZt*Hqf%Qhhgtf=T?5LmV0u(+FI!1PMvr;
zF*tf9K5uDP?81FahyV9&oFIoU$Llh6_DlpyU#pih^wiK(j4xSA&uL@uCToR$OW*1z
z-{kVbj*uG$beRv*0SC`;8`*JF@8w?~I4qepe%4|5Ln*?c2v@Y>JF4Y*L@OlRXls)c
z*pdgPJs-29zw>K*k$#@F0*(~XicZ}KvtF*IOepkIsk_rPv?i+NH-iO7S9pA=8s0kE
zl+^gPcT0OM?0!VkrG@oM;`VBtT}y7y3x9_&SidS{TCLYH&t`2;PUH=aR*)@AUaNS|
zt>&l??=AT<!`VQ$qWdBltlO}TS*gJOGuY3w?>l0lC>+ApV1D-oSt#gp8XS+T-6b?e
zm<^MedF)MS5F9rbaz-aOc4n;gpdWWINQ(16gf!eNPBU+y#`FYHqN<YP)c5|_TbqMK
zx}pmz<IEYRA7<GhUAW2nF%!$RYo~6#wvBM?EOK5NDy;gnQ7WCDHnc&g=?bzR0aX4v
z$fUaWE643o<L<&EtA?)v-ZV;sbByitj;!?zJz8V+zUUBxEyinT8Ql0#21;XD3d9wa
z92?TmBpxG#JgO4)J{BW!4X+@8Eq|t^j>)=?x0>Z;%?N;JYL+8KHBaZ!5X(wNc_BP{
zU#gGG@sZCbW(xWtrQEbC7-!|ed!ilQ*ms)MT<c9&@QpU8+4njtNc&q&*nGk?hvwzn
z?X9iXJ<V1OxL>JagV)HUhc__%dN>CeUgBBlom#m|a>n;Au3+`!z{^g&U;1q@47Ut+
zDFJw67L^akvw!voeG7+NoOCR$&pTd>=k5<yDH+05WuC=bLSN$xZWNx{;+JlyM(7pt
z<kJvij@bQGqwokrJG$8pI-<lKM%x?m1tsoS1>E;$kGK?KInUix=#WdvxP1Z0%<y?t
z%RYaM>RyA7@~!}>e-a$*ETp&VA-O7Q@IfQ(?65)_ymLhxG+-2nnpeMA$=HJGt5>!4
zIOcf?N{96^0)TH?%+<0G%j16U%TkHH-EoawW%k<IK&Nvb^tf~b^D^%IiE!ikr`t1A
z+wwa=odS*Vvx|y<>Orr10e(<LC?rR_sy{76*KSn4NYA)!jV7K`>NK4N<u$~z+9x&c
zu~Va7e@H^(Bf4#iGu=&reN=0*8_vLqH=<Q)cAwC98O;o?pzL~CdW@297c_x;HUlOZ
zm>aMjBw<zZHs9++Twmby=9yBz(%P>;b>W5RHN`It&&)Nft6z2i?ynqCMt!LGtpZhD
zIrfR>^n2t*ebnH4ktE5NYRf?&n2|<*u=-}Oz<TW-%|u+dP9^u4Q`vV^Lm_We4%vz_
z6*AMx%U<Wi3}QNCiP7f5LEWml?1BlKzJ=fLfIT&nPb+3gk)7ZXqdNdrwt|9ph&9hL
z3i38@(9cv2FMaErp4@N6z<@h;ZdnL^Sb1`Of-16h2j={-0IbM9`Iav2wQ+L?wE!dO
zZYR~o?1EePJ}ES(!O#F(9fJ!KzoeP^ZH)vgusw~^qQP8%Xxs2efXKZ~gcOJ3uVbb7
z4HoAYN1Ah?VYkpvdzA9ZlD$+~?lbs&sMcGEo*<Wb|DCmJeMAt7jIl*Fpfw&7pOyf(
zJwX48n*aKd`*}XGPMkg*);B^W#5PCp0Qox&WypSv+u_^Z#ycTTv;(}qe8afe`98-P
zZG}UDeQPZJ+*Fl}cJsghwQd9A>c$sb5yI(fqxjCql6KWO)P3*ug3X|??ZHTj@S&(7
zfr-*6W9n|QR-UKz;__yjVu0hPo!9w*>Tprw{1W`WcLu0#RG`!yHraWJLc(B5KJ36e
z>m%v(Aod^Hgl}9p@xu4eFJqm@(A!n|>iIa+u@9yinm|4PNvDM*rQ$#QfTpsJrZ&1i
zhel9d;Y$X?D@@)-u1Tu$>sjzI3P0p~OMkYt&Y(Q%+IiJLinL6g`?9uXmb^{(liVRT
z;O(%m0!i#!|1^u6)u<rCi>^@FOIul5pU17k2ihZiwH!Y*vV`O|n$(SNU`Iw+yOG4i
zqB&%YJA>6fXYH=Jmf`|6JgdJ16;gg})Ddc0ga@O^@e8pHV=+5Z^mTvZsWfwCxbJN}
zfVtX$pbNcRDN($0X}p+u5-_O10W7UvSuJAN6I0@_&*|HCVyo7jU6c0nTlpOfnyE&k
zqNGkEZdND4-$0;;re2#z%f*JxPXs*dU@WV!dMdo+T}(E!$6U8g7qP+$C{oP}qvu2I
zQCXqzeuzjqJ+^%et<>9MABa5`i_aaO2oCDcAWW!_CTWj`ykH*n4;$RiB<_C%`CF1%
zSPuLBbBdeS$2@su{m)Ne|LeWXQ(U`(vi$0S2tZll2>;7hufB`L#+JmkwY3djkvQ^F
zusxNr&&SJ?_ieJ{c3DLoQP}0$hQE3`qw97#|Es0CLfh!sXO~%9H?aj5tJ#W=XL3-~
zx<mR4k|%}(JTIQ%mJA<e>j+xn*aMe8_zi%n-OcE<O>qcVpIp%qjCY9Ep>6NAyBm8r
z?g=t|JMOHQd!2>w>0pbcyx_FqnN4McWPH`RPUmtz_@;r8=7E<>s-Z`ko*1`oo`l2-
zCO+`HUd$+~**y@zsGjwVFnthY=Q{CvJt|*L%OTos4~u~KV-{J){VV#e7NB$0jCGmp
zm=k8jl5i-czI$yy|Ky-DXa4Nr^Q<;K`b*DY8l-?RNb&aJ15G1^LLHNB+M^psjB}2C
zf}f_XkeDS|^!Iogp%k%v*(EX1A%=A^l{F#UkWIV!f^1jl;K49*O_ZGD7-Gc-a6K>4
zqVqF{f{gQpr9jhV<w#EG%{J|xV#?Eat!vYt?{25=-F<sDTJrI>S0l%JRM{!>{cvb1
zhDRODeq&2P)%~Cm%TDF;9nUdc4i&=(?A6)&yXL<*n)Q`w)N|%cFV^`v8|O;0e#SHF
ze4S1^$$BvG30vy!>ur2Zj|=55#wAW)j8QK1tZO8mN%&^kbBsUbzItsdK5sCeb@?Zz
z7L(Tpwj`Ir&+!<(uUD^cbidA`bcB<@LJYS3t`vEcN5BxWzffsTwoiE(vp{?@)6dJ}
zqQ|Ac*V&*xQ?x-h80B}lJliJBa^U?sx^?C5%CSAEyLUfuv<PNA9eDGz;<fpq9wr|y
ze9R2WcQaaC<wXvkKNwt|A<QD^0mUe{9_zL_O?q(R3QKL3GvlUEBOE~w7ps9zZ;lRq
zsRwRL(@zTxnmU^n(N;>?U$^I`v9|~bo3SK5A^GNWFEA@`JP~D8DgAlb4`Q2{I*@Ue
z9_ZKibS{^D7~bD8xpeH&r$dR=*%c8YobBsuv?S@;nmw{e7b`!{H;rGfqil>K569oW
zavO+~ifPgh44R&nTmQuEy%n~Lye#an4GE(|rF%H5L9YW&jPNP=i=V4+g&Y!}P>tVu
zug?<#4cY&a9evNpsEs;C%kY_c3ENy|lbgPEH+;OM>};X^>_TDP?)NX};Vzw4x0~2R
zcKhswx_y_-K0ClPf0H+8d!DRx9Q_cv_0V%QHCB^xOaV7WkrF9*_~vp<@xJ%{oD#{>
z2P2qLsC}3OwO!{Pd$5}jh$}9Tp#V87@&*>yh)P!l*W0|+jQk~_>I~1r&moR525&AS
za9t=irrKu#*3%?Rnl-TA@$`?0fLjI7K|FMuX0N4zUVq0mVB&^VJ6~#sYB!k86{Lxz
z&h5yR>*of!F1>TFuuZ(H>~ig`)OkLw?_585+*iQSCQkNUG^Zg08-@X;GS;O=ohT<x
z9<=GCpYo{_mykB-sl!g+#aOqtX}<i;4Un!fzs14pg7r74jE+_R7apH3%;C&$A8ns$
z&bhzdmf8YE0OsT4ECd<-a36nOFE)wu=gv@(si`cacc#bE>yk~QH!W?#CssZbg7)d~
zrBf)hAg<sc>N1))PP?Z4ypuofkZIL;gw}$#+MJEOwlZbi@xa62vg21CAegF4E7+dj
zR=ex1wt_e}*X?aR3eg@4uO%gYV{cYG75+Z{>-`^JHuJX7TUcJ9hamnnd@jWzDS9`H
zw*B^7{JUG=YE_*BI@&s_m1&KW42AS7URw1Ug)rK;-oX3C)n>=mst~xKSAc-N>t)AT
zhvL@`-Aha@s`B03O3qGU_6TfF9)54%h0NtJPizu~`uF9YkVqUTk%=wU-*0TgccT+c
zMMxTAX1{Kfz#M^wg^Nu>t+!FUGYn%c`o-ZJZ6{Yp>iC!UGQoe<hb&UA1sKmZGUE3(
zg~yl!hLp%yw&~}OXR63r(;w9^Zi}5=-Zml%{-Xsz!}4pH9wn(LAPsR)x9O+B3>-L=
zvNJ%MUbZenFmm?#M5dh=t=3UiU>pG6HQ9v_4cPXUvkDaCYJn_YUku|r#u2sK2Y-|(
zPIFSLo$;Ng9#A{z7<m`_VslI|ag`P?)0p1ArTFN}^=9^#7N=u6V|5`}>6_9kaQWSo
zY9-9X*|QL_vuc#1l~*3f3~$-^Pq<Enp8`RnMtBHkv5q#tB2T<lrvP`7w)BBJz@qXG
zKve(W{#`Q~PM6zKvJ-V<9xE>C?_LyB1;L<zQPhNX<vG83OyFZVuj{X;??_dFqut-}
zmGA4kOwdCaHXm6@tASjD>rjoKbG$SnFypc)EGv8U^B~u3()Xv6DI@k2qdaLV6WSM{
zkFK1<s$mbhE#6=HDd#Qg*;X&E{5fsTqb+_eDk;L50unVh?2ebX7Rt!-SbU@KZ!Nel
zY?kQnF<WLQK_XDz%j)e(`=uL%)_^tzp`nL-=|jc4VU=HRFGyVOde~*B!+tpA`UfU)
zRz7Y>kN_nRN5ZR(gsk7@i7rdSxXQcRrrqa0dWozB)-FD8wR44q^;NNXAm>a7vw8cF
zH+o-8ja9U)s%ar+9}FD|3IO>PF5-5+>8kD=csD9|Y^VG*jq@;1B(vy`X8e?KQ&(Pf
z$&ifhu@n<9WwEyIhwE3a@4LMb8LzhHn`Lm`1___SWCj?qhGrbvnn(3UUlEU2J162>
ztNgXuTIhS7yTajovF+68t3Ms?3M`#^bnOS>6N9kcn!V)tj(AF9C28wfrdX6zSKf-X
z#ctcnxsv6+nZwMe)jPx0I=)&^H|T+6SKd&*&Nh{GsF(ecQGq&?$gZQ`<#V71(z3{G
z3RCkrI9F4xusv~>cWl4vG(V`d-WP;_bK{3n_}x^!HmMTU;_)*(%p-PYrf~Zbznw#6
z;tLE*v7g?9c<TwC@ueTjpqh2C_RbLrKbbzioS%7LAIMN<M)@q53pM4${)^f$S-?Z$
z!Qm6Lc0SLIb(EFY;KnP6L=s7bBBJK#iT1fbe8_Uuc?B@st_FYXdytj3;X5DPtZP%;
zb@@V&I4kGY@VTFoxs91r^}an+c$#r6PbCdk)~T*{6?vjE#(7T7_U=OI%$wcG(TL%h
znTemqbJb?(QDyt?*HeSs1|~ba>@1KJSfpNI_(_jl=9O)8NA5=uI{mEL8xg?LjbU4E
zjo_A=!V>$AC6S$!(FdkYWxS)p?j3Kw-mdGjc-9cQpZSxz`}`2UI5qfn&^pV$qK)0u
z2>*&wYsMp6t#Z8?lim&D<x#!R$%tpLvum$*`B(=@t317Ka{GPsJBZ>(_h!k-QmbJx
zcY0d|gphTOOxq2V-jLsZk~3ttEpqe6wzo#^(yd%i>8=p9D=e>r<wxo3SRX-Zzi3a3
zfoEeQqagCa;3T?hQZDwv4tG?I&s}^qBE8fBKU{L|Mb6|ccVsUs8<5&8^5Dh{nhHwa
z1Osscl|JrD<Zt?tZHzJA&trp5Wsd2vTURt%7vqBLwk|W|HH#D59@aKZGCK=}Ia$nG
zKck}C%;^#KWLi+KaO%{PClV~_(Z`Q8Q@E=gmkD~9=A@GcUX1VAX43sUDNe7<{EnD5
zJND*449t%AL30|?Ng+mrv`Z3Y!*U?BrQ#cAAGyi#8B9=F;SCC-L)~>o{%i}48)iMO
zTY2cV@JVI-$f@__q&vpioS)5b*I;x;)vSmJNW|z#wCUAtbLPs#1kP*UN?1+{a;@Z<
zI?o<q+tK8!gWtU+>O^4MGOfV%^@+0CKzs;ouuRrr1($nX_GUu&UpzZ;YP8Iq>(Tq%
zGivc$ySGkaV2nXL*KmQ%Qs~ISX=q1igiG}L>9nZtA0v!*EsmbOP`bC{$(Llk@0Sc8
znd!cZ*tfz2Sk4d%3-n}*zV5K;a-q7OGqG9=<@ZtkZI!>F&dWwK1p)bk&tU=qG09>_
z-AJ4Ow?IJ35^ijv<mtZny6C`5y^?os^A4MMDJ(aiQ@Qp+`H<+Nk}HB27`p(@q2LZz
zjPlx@Vpdm4XS}<bpyJe6$l=|GBw?cObM`UJZb7u^Uqz<4JJfN$s??z`8<PCz)|734
z*R_Fcw*|V?#zy-#a$a!k9}s)}eC5XXGQqNe)#JK>_!X*1`cs*@jeFAfG$piezkR$n
zwMh)0t;|-=kKgyDrxAb8_?QdpOQlcpOC{c?J}TN>Swb`dbssXd{dPE1Gv_yj5`Ycw
z$1}w_3YzT3v&}MK)9Dk>9>=qlm~RVq7&3bymKs9Ct$fk%S;j^<*{F_=;__cKb7dNZ
zkrCZ2U%oE2f>M-TuW!>(&HAOwhsw-~Fs<p)(qk|`!gOL<Q(4c4VNE{2b9wM7pL-~?
z+E9_`Ax9K&!ftM4&%K3YzRxRraI>A7Q}2tqE?;7>&N$u=vM=GyUJ`U5?>cs*`|;2>
zG!|xxjSyJo1Rb5@+!js+3#m%%y>X^UMrM+lFCa`y8_}E+R`8uZ`5<JH&J03RifC`H
zTG~v<!=aCuTy+RnxG(n)S7jXQz~Gqx&FJs)GlGZqtuy;TPU@2C#rav@yKZy(417oP
zAJ@8bHz@Vq_YxL_5UQ4+Zc)^7Zpv+u*-UoNu2$^ncR{sVeGc6O??v8Up$qer2d$Z7
zEOR-}KgF>nnUHdp&%Nql25a4%AHf3QL8IdmK8CH_0p;$uVrmedl{qJa6#a}2s$3e9
z!#j!q-=s|R8f?l=5DGdzc$ps(uz$;H4y^P7eSz{1MQS(qRW%nliiSfO2EJLdHuBi%
z<)gy|oTm-aVzjbm+>gCG)tgD$%XPAM^@G`F+5j4jppKT67gRGEl(&_u3NyD+&a=4=
zpWD}Uw@%+{mz*kNQ~LPHOnuC8%G;Y0ma-sP!_9IpJP<q0<DMR}MqhV5o#D54yK4<K
zI#N>fk{rsgSDD;P(G8m%-{a<Wg;V2P1m5*=Dn6%~#>+DCAt*0{Yny1oRE8f?>7+?;
zoJdvB+bE^GcA8Gy=M0<R=|?0UdS%=DZO5d)o|#@*0Zon+Kid20xQnHxilv@V#_sPp
z7meCv4)IWjoarGcGg2Jeh4ht}PB`BpAB92nuGi2!c>dO4QVVmW)megNl|)gp@%W5u
zV!bydTdX>6tAAg>jxnq3oOW!JS%z(wPug<o9lgA_bcLxyLel%1bbMi>)&r^-4Z?lU
zq}???G=z4@6t%zWwEupjCUdZ5KyBekZAAKRjvolEgN#+*X1Zo_eDX5BsLsd4GoZaT
z`pqo#i@rf5d=aqD**&@x_|o#zUY)DUbG-KNx27dGUnjM~dmuLiPn%yo>3W=p6bdBC
zN{ca0)zY5`zU%Yh1rl|4Q0v?WuRNKX8C-3Y%;DwgLopZ9Y*}4rM$oCH)@EG%qdh?M
zt0tQPSa~wgFm>=mL=jy71q-!L4kuTt70m2$kaEp6SHvA1dD~dhmK^i<QHpy>2G6z^
z25#|3-_g`SY8|}t!LIiXDU`9;VOH=hzqjJLt7;(3O7lR{;6<y0V^0=tjcw9^&(syw
z>RT<drsJ@EaS`*|C)ZLJqtTGa*$4>_wi{16dqJK`{V^wMHO{Rt5-%tYraSaGhBC7k
z{qpd&hEQz@7vp~4(5fqgTKy4Jk8gaOhB}~Cq<RFB9c9RZmM5&U5iuOQcRkb*J+$xt
z|BrRV1AzTJY~T4uKT2g-SPoSDGx|~#@n4Uv{MQzL-e54MdhoLOf4H;rir1Uepe;Pd
zmG+xOLSw;78H3AFpY|R3$nu6lh8&N)^Y=U0un`6@#@3KAB7jhxq-Ati()0*<efpa>
z;^)=+T;gb>E8SWx_ux0`!+O-r&UzxFrmix2&|4B#Xkg75rX4{W9vZyLzylsI3SkM2
z@y0aLX`Az%Fv`arzKWtvsk3rD^T)BV*XVYIqo|TmZ*p8<x~<zS$H9_2sH;8c3^{c&
zj6ox#mA6d+nVR^6Z`2g;g0L2hwxh{th6f+Pz2_9Dif44!yuc1_&QWobRJ1sUQkc_)
zRUC|kRPYjS&LJ;MX*a4zYO{1WX(`}F+JStADLH8E;9|&}11wKQ6g^sbj^1U{jtOO1
zq$XqpeCvgnkj2q&E$vsduQ(FlHHDCFzC{Mso*a9={c7IP^Sj$Y;6}g<15z$x-))oT
zDU##pN|m~Kb5e?%;<;dt4mp=pn(sL(8XBq4zMS$G%V7QENKBkTF**m>@|Ih>xj8`*
zwp(_uRo*TPe$u(PdY>J&;Cdx}J#nY8E|IvEPD2fE#DqtNWDo-yzsoix(11wB7IRVr
zq3jOoTXwX`X?oDo*f+j8_a*Uk)EkNfsK=hnW`gzp^vW)V-qv_-Ol}o3nw7L!B{E|+
zrqh9mP!@rJq@d4x&eeztcr@a$X#|d8R~u1rT;Lw88Md4|ZpXDsX!IaaHzWDjCLTAE
z?9hP;Abg&ESO~BM+-sO>^aMpi!|Y%6%0{$7djlPbz*UWvV61nS>(!kV!cF_PlVvL~
zoysLPSzMk}^0c=vOfQj!hyy_}+B!(84ZNub^KMg8hQ=~C&<>nwu#N?xb||T(CG{@}
zEn|FG%H+~s!t=5HwJo*B0~xLH2-M1)X<A1z;RYiOP5#CR#Mv5wY%fByKr-~8oz?k@
zAD(@Kv2>`WL7UUO(USy(0`ysZPQd&|@PcvZWVW!dCF2`&M3DKu?qrKgrD<v-T<x@W
z9`HLML@J>hWhRX;IU0Cj-)P@lU0ny3X;VY{7rBs6u;Wbx8C{2!Eq6y(P}k=BqRXJP
z%(6UDAYlR>C?6g^9NjB04AVm9TtQrK#gDmSA-JkpIpjT&;n)pBPNYA5Jc17$7Q2b1
zcsb-iA6Bm2S|D-PhFr>Ep8lY4Ra+MppDh7cn|4?hU>&$l$jUJl5|COIqn0?y_Xu_d
z-kgdXZs9lxU~g@%g-1-)IG&P2?K#&&fce-x=xnbE=_zLJk?U<=(vS;|<Qtmqfo#(p
zm-bevfdHYr>s{kT7bfcLR&5(*L&7IVb{+qQ-TwYsHT?%_f&_PEnWG{)J4%eh=0JaN
zkw1t%?l|SH)YycL)GmKJOWFk&7#nZpBZbbL$ZIF<a(tXlL-LVmcIJ#(j&RLFDd2AS
z!<d#1tV(0kzeMdNTan<u5-E5Gb_C?{o#>!9n}9hS=w6UN+#p^!#e@N-zQIcY<w}}L
z4rul<fy$b%?(6x^9%Lt2^XaPlM$)Ni^WHEq@Fqo5cD5tqc53so!x^Q}u1(a=V!#1-
zbGFBrv~nE<6IhN<)l7~=ANp1l#o6etVh_l93^)nc-lm(5?vQ)Epbcp3X3CSiHI7(=
z4$Mk)$=($7_fY>ghpQa|F>{JiFp!3|XRF`#g>;&b_ngy?NEw`A7>WZ?8sEjln&OF}
z!NgZ#HK&J>C#g@tHKDSMFSI&(I&FaOM~hfr5%a<=jKEnlp+Gx2v^CefVc?1eR>P$G
zW7w+R!qCDV)F4e(x)#)6q5(I0x%KlK2j+;|cKX9gT&SUt&zu1wfyPlZYlLITA4=;9
z>kb=f$AH_`IH)NG39wiN#U<oeK@rNgC@0x1z|(~<DNY+9ix^}~K=TW`S2oiMBQoyb
z{&mEPQ)~mu5vkJaDkSqj-~4ZDxP_sDosgcV*aJchpvgzEuo&p^$`A8tCv3>rpw*Vj
z*wMf)5N5s@^JSfQX&rbNL%uZ@$6WV8E)j$&+t5NRYaZ_Gil}^*8YNE0j4TuYBMWuf
zl>;M}-GNtQV!jMgXfdl_0m5w2d%s%icfag&q-Xeo9Ix)1wi<$~Io=EEtWq!??rNFa
z=p310m6x<LVLbvRn4(nk{?(ibN}W#8*NS<}Hr!}#O-*DGPaArVXs?cgX>+T?y_%Jl
zc(Df@Z2`x#uoX}LVkb}BH$Ck+-%o%!qx`jT9O)2ppJpitdqmUgV@zL>*Gb^3wiXdP
zp}ASFjD%^BXOVdX2#vVN82|g{Dr_pa^Hs843v814pv+|-p<rw!NFM#No=+UOkb#*Z
zg)SibVv-*_A?&luN<Rd1IZ&28qBiT_Cvf*7&+wpK$R&V!ga|ylb6_OXfz{)^8+VHr
z_QDCZqOvc18P-TtM3tS!(J@dU!z(&zwQdLdRvFyomxbx0BepE>nnwhZa~PQpHAKsU
zrYfdqmclip$>yjf0|M=QIB3{qRiqr~C03pVA^oD0h}ID(MU;2THAdnHyn`7H%o%C`
zI>I^nP9F9hb`w7oHQtW#JbLA&@(#|k$p)|mCayA`(%(e%KxAi+jIxEK^#N}@AD<to
zG#y`E;|<pp1`3>M8Jk3s9F{b~{*KXn_X1<A9nluTm>{iL{@vvNiiv+lM)`W#@7Iqd
zMR4yHVVoW6QP454n}H+d#*I4GCl6u#jBJ2+6%a+(OvxEc)+V+#`sxa<>R7F6eDo_x
z?U}bWIx~s&Ts>y_R5SXCyO~p?zJ%!X&7k1t9JsqgsW`+6zS^<FC_Eu1Hn4|JbaGq)
z8$D=JuYAaT9~cgnQADP$Q7(|-YDrr{AR~up{n}3v&($_jC1z_Sg*OY)muplLS73*^
zuYu+xG}N`OY9_6XVHh7|aQ-YCwcp={T)Q|afLwB|W9TuW_uEZVuhD00I*gW+AX1V`
z4n}~hUBnDl5t^#J3jI-rsG44rsu3RdvNx@x`b`Qs2y_w4?ngyLidEsmM0^%%X2^<a
zK@XJU1qbDNWd-4(GJ&h=RB1XA$lNM537fP|5~jycuimUFx<xGLSg!bZ`&88{&ei@;
z9%?a9>yKa)m}`?H3l0{c#7$9_q0)=ZmH<ctPv;>+qOs%7DG|bf8&lV+Qll=VV^z+|
z-o)k!NC&D9gn%^&B-KvlP0vffMEKLHQt5B8lTWWP)L@xY6HU;BFx}P+asRzVOYhLZ
z_&2kI1&|n<c7%J;EAxC2tJPGR+#t3t;HsAQ@<9VSVqNp)V4blfkXgEAoWH5gJ$K2z
zRC)Y<zDs)YrmOM0mEED~az)a^4Ypy?$rzzpzx4?{f=S^`v~PCA^rCH@U|3AZ%lgd1
z&F+vB`<?c*g<eGDOcLq{v6C7D_@K2Xc_j~!YDxJ#q3w`RYeYQtN@3a-Zp$j_POuWd
z^8OJ;v;dv?m4)T}GdBwxe;X5Hbti96**iZU*DM?C>GMZFRTC8KbH~XY>@Rv3?CR#F
zCAL<F5EFHC))KS6U?OkgqX)j{b|usgY#w^e!YS0<NzGXdq<ug$Se@y>6YPISG}zO_
z3!)yZCH9A3b>{b<o8`nr|1j})*Alz<$Md0WOs<RSdHaDyFUZQvILRx^iz+L~Dkz;-
zQBgT3swl4@FDI`kr=TdKprWp%s4g!r`qxWL`vCKsrk}Hm`i)DM|H_W}pO)A?e}5l!
zIk}*qAlV=#S#LjAIR!N}wV!Sj6=j$fGLR52|2x4lUJ&s=o&3wsB{0Ov&&|i*&D%@#
zr{6nwy#xHU#KeAP^!MwpdU^VonEaiU7vwK`OpbEFcYNd&WaZ^NJ>~vyDIxwh!2cBT
z|C$nF5#j@uy8(uH2lzRGndbkLlUWQ+CSem3^-JDP0iIwlf5S`K%nh>6ZqDjTmoKQu
ztDL{2t9$vff`Y!hnx5JvJ$-rQ3yNxb^1Av8nsWa~(toP<ms>+Gi2ofgC-7fx-TrZ_
z_g}gFx1|4v+e=_Sw?MG-Wj}AvKhXNz@q>VWR#QvtU-kU^Sp11v^AAw!ZvT`=^`h!U
zdFInN<>mD*tLiFW)>TtfR#Q{DsH>!)Ag`yStSR?@B>ATtKf(RE+xZ`G|6Py&mgFCg
zf7AS@YJW)bXHIfI<@0ZH`g_O!w*9{$v;SOV{|@cv5meXn1K;uY_OtNz_R#*bf&GUE
zu!|}%r75c*t0HQ0$H~ph-y3r8k9z!vbpKYzzg>ba-SG!&GuxwrjJ&Fhf`Wzo1@-ev
z>gUyN{agA!jsCafCf?3&E+PLU|Jj!1Efg-OE2^nqIR97je>3_k`TrP0XQ#gr`ULoS
z{1FhGo#enC;GfM0!fdMwa{mFNvy-}ux1Z-7e{DC<JFZ|kA1_x;xqmkPr{(*z)Xady
zjD>Q42g83I{y&xd|LX5Q-2Y$Y!1Vh&lV5`S8`p1KzeM1djDM@^H?ChI@Jq(O)%6?K
zFA?}9<KOD~jq8^P{F3o+b^XTmO9Xz&__w-#<N756zhwMdUB7Yt5`kYb{;jUxxPFPi
zFB$(<*Kb_EMBtZ<f2->^u3sYXOUA#|^&8hO5%?wJ-|G5}>z4@plJReK{l@i61b)f*
zx4M4g`XvItWc*uQzj6H%fnPHIt*+m=eu=;@8UI$-Z(P4b;FpYltLrzeUn1~J#=q6|
z8`m!p_$A~2R9y%DnO+3;V$LZFVon}fg}F^KpH%Y3@X|$#dk<HWOT27Vjz%KP{rz`x
z>u4+;Zwf+LLKYYHF5cthpZ#E~S#8Uvn#msG&MIxYH>3!8u#x-rs##zNpkY_4Su4gn
zawvZ9Jo~=WQVznCz?-P3Qp1m>phoH_4+&wm2cu-Uu4TTb$l`3mRdCW3_4xCo(Jj)k
zSV9-tQx7TZbAa}Pe4op>3l~Tn7~_1~+GIGrqUOV4-0i_n;eKF*#wH|R@TwPHKRMKm
zYdIDu_By%YMS{nzGj986Ew#fe(5aZ)INMLA(*59|ZMAFAmab!UiVSGgN#mJ=s{2eJ
zw-1Exa(J8OBev92^aMC#LSi92Fgruk3rPvdmUHuPiIW`NI0prrtjj+?v*S9t$}4hT
zqT$qYhT@4>{}T?oruH7+^;q7DZT#IxzPoY1SusEAS!7@x#)a~|gf(LSj<D|7_wIp#
z;Asgh7UTzY2|3krj^&{)JO{?R++0kO)SFPGB&Tq4KVI(|T;dk-fe;IuVU$bYVS!WW
zu}^S24SsU#?XN?w+&c8c@96p?xj4wx=Sov(8S0MTbA6RvbGwP$1tI7zJl(YR?cS%w
zetX7QQHJcDC7;}tY@f92mtf1IcOU1O$^UfobcFC5tALm}!r_qShC`r!{HrVYshBmz
zDc=v^@01zV;Av^K=Aeg;=_bL`q<+*xexEstsiCy@-g>Ti@weh)+)XIiZ=~a++->GZ
z#MEVw8dIq2+Og$jug*!5(vH4FU)$(v*G9eaMSoF|Xbww9uy`NX>YQf`=;lWp<n(bk
zA&Hxj?(YdtUqMet29|h8NRqS+*H5mD^&m;8r-ni4Gb<yH3*-@LN+L$q&&bMLN@a#u
zV(25~&s&uFZLh8KyKzKITu`Wc<KLEBWh5*Vg-x99pQ`dti;wA!QyuAr2~s>$PkP*y
zK6xN5PPa4e4WUaT*u+Q4U1H+RrBEJOHKYEHsCYPbkxfKmqAbPoyli)hs(|-nlPhjZ
z`$*{%&lnQA_d<|?C+9ESSQ;X)H77T?rHrVpPhOxm<qmV^kwcQy3hpUz$9N*t1UPP8
zJed`UECj-ms;F-)YK0OPp*2SQN~xu(y?Z^{Zgk;v`!9HAAF_61^MKUVzwh3)w|o~^
z?vRUeoIjt(cU3iZ27cJ4KRdbj#0#HQVc0!yh>YXW*5_$up@H)_9G_v*TkS|wI=DoK
m4tL4A@#SaJ$SQ>~Sl!^@hPyw$)%~0nXsCbfQlakcNB;}|%^Sf0

literal 0
HcmV?d00001

diff --git a/web/images/NOTIFY_CENTER.png b/web/images/NOTIFY_CENTER.png
new file mode 100644
index 0000000000000000000000000000000000000000..18a872b3500c164eb05ff23aa43e9c99abb4945f
GIT binary patch
literal 64292
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
Jc<J8b{|79&iZuWL

literal 0
HcmV?d00001

diff --git a/web/images/POST.png b/web/images/POST.png
new file mode 100644
index 0000000000000000000000000000000000000000..282c1dd6679902547c5384fed279f6ba61e4ccb0
GIT binary patch
literal 59820
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

literal 0
HcmV?d00001


From 1a282268c6a730dacb39da93a8a89ba6d8c5aa4c Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Sun, 11 Dec 2011 16:02:32 +0900
Subject: [PATCH 031/630] disable main.css (from 'opSkinBasicPlugin') on
 smartphone template (refs #2227)

---
 apps/pc_frontend/templates/smtLayoutGroup.php  | 2 ++
 apps/pc_frontend/templates/smtLayoutHome.php   | 2 ++
 apps/pc_frontend/templates/smtLayoutMember.php | 2 ++
 apps/pc_frontend/templates/smtLayoutSns.php    | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/apps/pc_frontend/templates/smtLayoutGroup.php b/apps/pc_frontend/templates/smtLayoutGroup.php
index 443cf5ddb..494417d9e 100644
--- a/apps/pc_frontend/templates/smtLayoutGroup.php
+++ b/apps/pc_frontend/templates/smtLayoutGroup.php
@@ -1,4 +1,6 @@
 <?php use_helper('Javascript') ?>
+<?php $sf_response->removeStylesheet('/opSkinBasicPlugin/css/main.css') ?>
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
 <head>
diff --git a/apps/pc_frontend/templates/smtLayoutHome.php b/apps/pc_frontend/templates/smtLayoutHome.php
index 11d734c16..21e6072ce 100644
--- a/apps/pc_frontend/templates/smtLayoutHome.php
+++ b/apps/pc_frontend/templates/smtLayoutHome.php
@@ -1,4 +1,6 @@
 <?php use_helper('Javascript') ?>
+<?php $sf_response->removeStylesheet('/opSkinBasicPlugin/css/main.css') ?>
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
 <head>
diff --git a/apps/pc_frontend/templates/smtLayoutMember.php b/apps/pc_frontend/templates/smtLayoutMember.php
index 9e0708c4f..7c00f7d88 100644
--- a/apps/pc_frontend/templates/smtLayoutMember.php
+++ b/apps/pc_frontend/templates/smtLayoutMember.php
@@ -1,4 +1,6 @@
 <?php use_helper('Javascript') ?>
+<?php $sf_response->removeStylesheet('/opSkinBasicPlugin/css/main.css') ?>
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
 <head>
diff --git a/apps/pc_frontend/templates/smtLayoutSns.php b/apps/pc_frontend/templates/smtLayoutSns.php
index 6310d3da5..9a9d33763 100644
--- a/apps/pc_frontend/templates/smtLayoutSns.php
+++ b/apps/pc_frontend/templates/smtLayoutSns.php
@@ -1,4 +1,6 @@
 <?php use_helper('Javascript') ?>
+<?php $sf_response->removeStylesheet('/opSkinBasicPlugin/css/main.css') ?>
+
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
 <head>

From c38a2dbb98d7d71e2ea86cfeb6ccdf1deb03f556 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 9 Feb 2012 19:41:16 +0900
Subject: [PATCH 032/630] import jquery.tmpl.js into project tree (refs #2227)

---
 apps/pc_frontend/templates/smtLayoutGroup.php  | 1 +
 apps/pc_frontend/templates/smtLayoutHome.php   | 1 +
 apps/pc_frontend/templates/smtLayoutMember.php | 1 +
 apps/pc_frontend/templates/smtLayoutSns.php    | 1 +
 web/js/jquery.tmpl.min.js                      | 1 +
 5 files changed, 5 insertions(+)
 create mode 100644 web/js/jquery.tmpl.min.js

diff --git a/apps/pc_frontend/templates/smtLayoutGroup.php b/apps/pc_frontend/templates/smtLayoutGroup.php
index 494417d9e..cc682f973 100644
--- a/apps/pc_frontend/templates/smtLayoutGroup.php
+++ b/apps/pc_frontend/templates/smtLayoutGroup.php
@@ -25,6 +25,7 @@
 ')
 ?>
 <?php use_javascript('jquery.min.js') ?>
+<?php use_javascript('jquery.tmpl.min.js') ?>
 <?php include_javascripts() ?>
 </head>
 <body id="<?php printf('page_%s_%s', $this->getModuleName(), $this->getActionName()) ?>" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
diff --git a/apps/pc_frontend/templates/smtLayoutHome.php b/apps/pc_frontend/templates/smtLayoutHome.php
index 21e6072ce..02650c1dc 100644
--- a/apps/pc_frontend/templates/smtLayoutHome.php
+++ b/apps/pc_frontend/templates/smtLayoutHome.php
@@ -25,6 +25,7 @@
 ')
 ?>
 <?php use_javascript('jquery.min.js') ?>
+<?php use_javascript('jquery.tmpl.min.js') ?>
 <?php include_javascripts() ?>
 </head>
 <body id="<?php printf('page_%s_%s', $this->getModuleName(), $this->getActionName()) ?>" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
diff --git a/apps/pc_frontend/templates/smtLayoutMember.php b/apps/pc_frontend/templates/smtLayoutMember.php
index 7c00f7d88..358fd5d05 100644
--- a/apps/pc_frontend/templates/smtLayoutMember.php
+++ b/apps/pc_frontend/templates/smtLayoutMember.php
@@ -25,6 +25,7 @@
 ')
 ?>
 <?php use_javascript('jquery.min.js') ?>
+<?php use_javascript('jquery.tmpl.min.js') ?>
 <?php include_javascripts() ?>
 </head>
 <body id="<?php printf('page_%s_%s', $this->getModuleName(), $this->getActionName()) ?>" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
diff --git a/apps/pc_frontend/templates/smtLayoutSns.php b/apps/pc_frontend/templates/smtLayoutSns.php
index 9a9d33763..f621959b8 100644
--- a/apps/pc_frontend/templates/smtLayoutSns.php
+++ b/apps/pc_frontend/templates/smtLayoutSns.php
@@ -25,6 +25,7 @@
 ')
 ?>
 <?php use_javascript('jquery.min.js') ?>
+<?php use_javascript('jquery.tmpl.min.js') ?>
 <?php include_javascripts() ?>
 </head>
 <body id="<?php printf('page_%s_%s', $this->getModuleName(), $this->getActionName()) ?>" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
diff --git a/web/js/jquery.tmpl.min.js b/web/js/jquery.tmpl.min.js
new file mode 100644
index 000000000..f08e81dcc
--- /dev/null
+++ b/web/js/jquery.tmpl.min.js
@@ -0,0 +1 @@
+(function(a){var r=a.fn.domManip,d="_tmplitem",q=/^[^<]*(<[\w\W]+>)[^>]*$|\{\{\! /,b={},f={},e,p={key:0,data:{}},h=0,c=0,l=[];function g(e,d,g,i){var c={data:i||(d?d.data:{}),_wrap:d?d._wrap:null,tmpl:null,parent:d||null,nodes:[],calls:u,nest:w,wrap:x,html:v,update:t};e&&a.extend(c,e,{nodes:[],parent:d});if(g){c.tmpl=g;c._ctnt=c._ctnt||c.tmpl(a,c);c.key=++h;(l.length?f:b)[h]=c}return c}a.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(f,d){a.fn[f]=function(n){var g=[],i=a(n),k,h,m,l,j=this.length===1&&this[0].parentNode;e=b||{};if(j&&j.nodeType===11&&j.childNodes.length===1&&i.length===1){i[d](this[0]);g=this}else{for(h=0,m=i.length;h<m;h++){c=h;k=(h>0?this.clone(true):this).get();a.fn[d].apply(a(i[h]),k);g=g.concat(k)}c=0;g=this.pushStack(g,f,i.selector)}l=e;e=null;a.tmpl.complete(l);return g}});a.fn.extend({tmpl:function(d,c,b){return a.tmpl(this[0],d,c,b)},tmplItem:function(){return a.tmplItem(this[0])},template:function(b){return a.template(b,this[0])},domManip:function(d,l,j){if(d[0]&&d[0].nodeType){var f=a.makeArray(arguments),g=d.length,i=0,h;while(i<g&&!(h=a.data(d[i++],"tmplItem")));if(g>1)f[0]=[a.makeArray(d)];if(h&&c)f[2]=function(b){a.tmpl.afterManip(this,b,j)};r.apply(this,f)}else r.apply(this,arguments);c=0;!e&&a.tmpl.complete(b);return this}});a.extend({tmpl:function(d,h,e,c){var j,k=!c;if(k){c=p;d=a.template[d]||a.template(null,d);f={}}else if(!d){d=c.tmpl;b[c.key]=c;c.nodes=[];c.wrapped&&n(c,c.wrapped);return a(i(c,null,c.tmpl(a,c)))}if(!d)return[];if(typeof h==="function")h=h.call(c||{});e&&e.wrapped&&n(e,e.wrapped);j=a.isArray(h)?a.map(h,function(a){return a?g(e,c,d,a):null}):[g(e,c,d,h)];return k?a(i(c,null,j)):j},tmplItem:function(b){var c;if(b instanceof a)b=b[0];while(b&&b.nodeType===1&&!(c=a.data(b,"tmplItem"))&&(b=b.parentNode));return c||p},template:function(c,b){if(b){if(typeof b==="string")b=o(b);else if(b instanceof a)b=b[0]||{};if(b.nodeType)b=a.data(b,"tmpl")||a.data(b,"tmpl",o(b.innerHTML));return typeof c==="string"?(a.template[c]=b):b}return c?typeof c!=="string"?a.template(null,c):a.template[c]||a.template(null,q.test(c)?c:a(c)):null},encode:function(a){return(""+a).split("<").join("&lt;").split(">").join("&gt;").split('"').join("&#34;").split("'").join("&#39;")}});a.extend(a.tmpl,{tag:{tmpl:{_default:{$2:"null"},open:"if($notnull_1){_=_.concat($item.nest($1,$2));}"},wrap:{_default:{$2:"null"},open:"$item.calls(_,$1,$2);_=[];",close:"call=$item.calls();_=call._.concat($item.wrap(call,_));"},each:{_default:{$2:"$index, $value"},open:"if($notnull_1){$.each($1a,function($2){with(this){",close:"}});}"},"if":{open:"if(($notnull_1) && $1a){",close:"}"},"else":{_default:{$1:"true"},open:"}else if(($notnull_1) && $1a){"},html:{open:"if($notnull_1){_.push($1a);}"},"=":{_default:{$1:"$data"},open:"if($notnull_1){_.push($.encode($1a));}"},"!":{open:""}},complete:function(){b={}},afterManip:function(f,b,d){var e=b.nodeType===11?a.makeArray(b.childNodes):b.nodeType===1?[b]:[];d.call(f,b);m(e);c++}});function i(e,g,f){var b,c=f?a.map(f,function(a){return typeof a==="string"?e.key?a.replace(/(<\w+)(?=[\s>])(?![^>]*_tmplitem)([^>]*)/g,"$1 "+d+'="'+e.key+'" $2'):a:i(a,e,a._ctnt)}):e;if(g)return c;c=c.join("");c.replace(/^\s*([^<\s][^<]*)?(<[\w\W]+>)([^>]*[^>\s])?\s*$/,function(f,c,e,d){b=a(e).get();m(b);if(c)b=j(c).concat(b);if(d)b=b.concat(j(d))});return b?b:j(c)}function j(c){var b=document.createElement("div");b.innerHTML=c;return a.makeArray(b.childNodes)}function o(b){return new Function("jQuery","$item","var $=jQuery,call,_=[],$data=$item.data;with($data){_.push('"+a.trim(b).replace(/([\\'])/g,"\\$1").replace(/[\r\t\n]/g," ").replace(/\$\{([^\}]*)\}/g,"{{= $1}}").replace(/\{\{(\/?)(\w+|.)(?:\(((?:[^\}]|\}(?!\}))*?)?\))?(?:\s+(.*?)?)?(\(((?:[^\}]|\}(?!\}))*?)\))?\s*\}\}/g,function(m,l,j,d,b,c,e){var i=a.tmpl.tag[j],h,f,g;if(!i)throw"Template command not found: "+j;h=i._default||[];if(c&&!/\w$/.test(b)){b+=c;c=""}if(b){b=k(b);e=e?","+k(e)+")":c?")":"";f=c?b.indexOf(".")>-1?b+c:"("+b+").call($item"+e:b;g=c?f:"(typeof("+b+")==='function'?("+b+").call($item):("+b+"))"}else g=f=h.$1||"null";d=k(d);return"');"+i[l?"close":"open"].split("$notnull_1").join(b?"typeof("+b+")!=='undefined' && ("+b+")!=null":"true").split("$1a").join(g).split("$1").join(f).split("$2").join(d?d.replace(/\s*([^\(]+)\s*(\((.*?)\))?/g,function(d,c,b,a){a=a?","+a+")":b?")":"";return a?"("+c+").call($item"+a:d}):h.$2||"")+"_.push('"})+"');}return _;")}function n(c,b){c._wrap=i(c,true,a.isArray(b)?b:[q.test(b)?b:a(b).html()]).join("")}function k(a){return a?a.replace(/\\'/g,"'").replace(/\\\\/g,"\\"):null}function s(b){var a=document.createElement("div");a.appendChild(b.cloneNode(true));return a.innerHTML}function m(o){var n="_"+c,k,j,l={},e,p,i;for(e=0,p=o.length;e<p;e++){if((k=o[e]).nodeType!==1)continue;j=k.getElementsByTagName("*");for(i=j.length-1;i>=0;i--)m(j[i]);m(k)}function m(j){var p,i=j,k,e,m;if(m=j.getAttribute(d)){while(i.parentNode&&(i=i.parentNode).nodeType===1&&!(p=i.getAttribute(d)));if(p!==m){i=i.parentNode?i.nodeType===11?0:i.getAttribute(d)||0:0;if(!(e=b[m])){e=f[m];e=g(e,b[i]||f[i],null,true);e.key=++h;b[h]=e}c&&o(m)}j.removeAttribute(d)}else if(c&&(e=a.data(j,"tmplItem"))){o(e.key);b[e.key]=e;i=a.data(j.parentNode,"tmplItem");i=i?i.key:0}if(e){k=e;while(k&&k.key!=i){k.nodes.push(j);k=k.parent}delete e._ctnt;delete e._wrap;a.data(j,"tmplItem",e)}function o(a){a=a+n;e=l[a]=l[a]||g(e,b[e.parent.key+n]||e.parent,null,true)}}}function u(a,d,c,b){if(!a)return l.pop();l.push({_:a,tmpl:d,item:this,data:c,options:b})}function w(d,c,b){return a.tmpl(a.template(d),c,b,this)}function x(b,d){var c=b.options||{};c.wrapped=d;return a.tmpl(a.template(b.tmpl),b.data,c,b.item)}function v(d,c){var b=this._wrap;return a.map(a(a.isArray(b)?b.join(""):b).filter(d||"*"),function(a){return c?a.innerText||a.textContent:a.outerHTML||s(a)})}function t(){var b=this.nodes;a.tmpl(null,null,null,this).insertBefore(b[0]);a(b).remove()}})(jQuery)
\ No newline at end of file

From 4289683965be9798c55de0804e6d952ea445d7fe Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 28 Dec 2011 00:35:03 +0900
Subject: [PATCH 033/630] add actions and templates for smartphone (refs #2227)

---
 apps/pc_frontend/i18n/messages.ja.xml         |  28 +++
 .../community/actions/actions.class.php       | 156 ++++++++++++++-
 .../modules/community/config/view.yml         |  24 +++
 .../community/templates/smtEditSuccess.php    | 100 ++++++++++
 .../community/templates/smtHomeSuccess.php    |  76 ++++++++
 .../community/templates/smtJoinError.php      |  17 ++
 .../community/templates/smtJoinInput.php      |  24 +++
 .../templates/smtJoinlistSuccess.php          |  18 ++
 .../templates/smtMemberListSuccess.php        |  20 ++
 .../community/templates/smtQuitError.php      |  16 ++
 .../community/templates/smtQuitSuccess.php    |  24 +++
 .../default/actions/csrfErrorAction.class.php |   5 +
 .../default/actions/errorAction.class.php     |   7 +-
 .../actions/privacyPolicyAction.class.php     |   5 +
 .../actions/userAgreementAction.class.php     |   5 +
 .../default/templates/smtCsrfErrorSuccess.php |   9 +
 .../default/templates/smtErrorSuccess.php     |   8 +
 .../templates/smtPrivacyPolicySuccess.php     |   7 +
 .../templates/smtUserAgreementSuccess.php     |   7 +
 .../modules/friend/actions/actions.class.php  |  26 +++
 .../modules/friend/config/view.yml            |   5 +
 .../modules/friend/templates/smtLinkInput.php |  23 +++
 .../friend/templates/smtListSuccess.php       |  21 ++
 .../modules/member/actions/actions.class.php  | 179 ++++++++++++++++--
 .../modules/member/config/view.yml            |  18 ++
 .../templates/smtConfigImageSuccess.php       |  58 ++++++
 .../member/templates/smtConfigSuccess.php     |  59 ++++++
 .../templates/smtEditProfileSuccess.php       |  68 +++++++
 .../member/templates/smtHomeSuccess.php       |  87 +++++++++
 .../member/templates/smtInviteError.php       |   9 +
 .../member/templates/smtInviteSuccess.php     |  38 ++++
 .../member/templates/smtLoginError.php        |   8 +
 .../member/templates/smtLoginSuccess.php      |  30 +++
 .../member/templates/smtProfileSuccess.php    | 110 +++++++++++
 lib/request/opWebRequest.class.php            |  12 ++
 35 files changed, 1288 insertions(+), 19 deletions(-)
 create mode 100644 apps/pc_frontend/modules/community/templates/smtEditSuccess.php
 create mode 100644 apps/pc_frontend/modules/community/templates/smtHomeSuccess.php
 create mode 100644 apps/pc_frontend/modules/community/templates/smtJoinError.php
 create mode 100644 apps/pc_frontend/modules/community/templates/smtJoinInput.php
 create mode 100644 apps/pc_frontend/modules/community/templates/smtJoinlistSuccess.php
 create mode 100644 apps/pc_frontend/modules/community/templates/smtMemberListSuccess.php
 create mode 100644 apps/pc_frontend/modules/community/templates/smtQuitError.php
 create mode 100644 apps/pc_frontend/modules/community/templates/smtQuitSuccess.php
 create mode 100644 apps/pc_frontend/modules/default/templates/smtCsrfErrorSuccess.php
 create mode 100644 apps/pc_frontend/modules/default/templates/smtErrorSuccess.php
 create mode 100644 apps/pc_frontend/modules/default/templates/smtPrivacyPolicySuccess.php
 create mode 100644 apps/pc_frontend/modules/default/templates/smtUserAgreementSuccess.php
 create mode 100644 apps/pc_frontend/modules/friend/config/view.yml
 create mode 100644 apps/pc_frontend/modules/friend/templates/smtLinkInput.php
 create mode 100644 apps/pc_frontend/modules/friend/templates/smtListSuccess.php
 create mode 100644 apps/pc_frontend/modules/member/templates/smtConfigImageSuccess.php
 create mode 100644 apps/pc_frontend/modules/member/templates/smtConfigSuccess.php
 create mode 100644 apps/pc_frontend/modules/member/templates/smtEditProfileSuccess.php
 create mode 100644 apps/pc_frontend/modules/member/templates/smtHomeSuccess.php
 create mode 100644 apps/pc_frontend/modules/member/templates/smtInviteError.php
 create mode 100644 apps/pc_frontend/modules/member/templates/smtInviteSuccess.php
 create mode 100644 apps/pc_frontend/modules/member/templates/smtLoginError.php
 create mode 100644 apps/pc_frontend/modules/member/templates/smtLoginSuccess.php
 create mode 100644 apps/pc_frontend/modules/member/templates/smtProfileSuccess.php

diff --git a/apps/pc_frontend/i18n/messages.ja.xml b/apps/pc_frontend/i18n/messages.ja.xml
index 620fe6bf6..2d22b39a9 100644
--- a/apps/pc_frontend/i18n/messages.ja.xml
+++ b/apps/pc_frontend/i18n/messages.ja.xml
@@ -318,6 +318,10 @@
         <source>%friend% List</source>
         <target>%friend%リスト</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>%1%'s %friend% List</source>
+        <target>%1%さんの%friend%リスト</target>
+      </trans-unit>
       <trans-unit id="">
         <source>Other members look your page like this.</source>
         <target>※他のメンバーから見たあなたのページはこのようになります。</target>
@@ -1335,6 +1339,30 @@
         <source>Unknown Day</source>
         <target>日付非設定</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>JSON API Configuration</source>
+        <target>JSON API 設定</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>API Key</source>
+        <target>APIキー</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>You can provide this API key to third party applications.</source>
+        <target>APIキーはサードパーティアプリに設定することができます。</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Reset API key</source>
+        <target>APIキーをリセットする</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Back to %member% profile page</source>
+        <target>%member% さんのページに戻る</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Back to %community% top page</source>
+        <target>%community% トップに戻る</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/apps/pc_frontend/modules/community/actions/actions.class.php b/apps/pc_frontend/modules/community/actions/actions.class.php
index 0d14672dc..db954609f 100644
--- a/apps/pc_frontend/modules/community/actions/actions.class.php
+++ b/apps/pc_frontend/modules/community/actions/actions.class.php
@@ -17,13 +17,41 @@
  */
 class communityActions extends opCommunityAction
 {
+ /**
+  * Executes home action
+  *
+  * @param opWebRequest $request A request object
+  */
+  public function executeHome($request)
+  {
+    $this->forwardIf($request->isSmartphone(), 'community', 'smtHome');
+
+    return parent::executeHome($request);
+  }
+
+ /**
+  * Executes smtHome action
+  *
+  * @param opWebRequest $request A request object
+  */
+  public function executeSmtHome(opWebRequest $request)
+  {
+    $result = parent::executeHome($request);
+
+    $this->getResponse()->setDisplayCommunity($this->community);
+
+    return $result;
+  }
+
  /**
   * Executes edit action
   *
-  * @param sfRequest $request A request object
+  * @param opWebRequest $request A request object
   */
   public function executeEdit($request)
   {
+    $this->forwardIf($request->isSmartphone(), 'community', 'smtEdit');
+
     $this->enableImage = true;
     $result = parent::executeEdit($request);
 
@@ -32,16 +60,65 @@ public function executeEdit($request)
     }
 
 
+    return $result;
+  }
+
+ /**
+  * Executes smtEdit action
+  *
+  * @param opWebRequest $request A request object
+  */
+  public function executeSmtEdit(opWebRequest $request)
+  {
+    $result = parent::executeEdit($request);
+
+    if ($this->community->isNew())
+    {
+      $this->setLayout('smtLayoutHome');
+    }
+    else
+    {
+      $this->getResponse()->setDisplayCommunity($this->community);
+    }
+
+    return $result;
+  }
+
+ /**
+  * Executes memberList action
+  *
+  * @param opWebRequest $request A request object
+  */
+  public function executeMemberList($request)
+  {
+    $this->forwardIf($request->isSmartphone(), 'community', 'smtMemberList');
+
+    return parent::executeMemberList($request);
+  }
+
+ /**
+  * Executes smtMemberList action
+  *
+  * @param opWebRequest $request A request object
+  */
+  public function executeSmtMemberList(opWebRequest $request)
+  {
+    $result = parent::executeMemberList($request);
+
+    $this->getResponse()->setDisplayCommunity($this->community);
+
     return $result;
   }
 
  /**
   * Executes joinlist action
   *
-  * @param sfRequest $request A request object
+  * @param opWebRequest $request A request object
   */
   public function executeJoinlist($request)
   {
+    $this->forwardIf($request->isSmartphone(), 'community', 'smtJoinlist');
+
     sfConfig::set('sf_nav_type', 'default');
 
     if ($request->hasParameter('id') && $request->getParameter('id') != $this->getUser()->getMemberId())
@@ -51,4 +128,79 @@ public function executeJoinlist($request)
 
     return parent::executeJoinlist($request);
   }
+
+ /**
+  * Executes smtJoinlist action
+  *
+  * @param opWebRequest $request A request object
+  */
+  public function executeSmtJoinlist(opWebRequest $request)
+  {
+    $result = parent::executeJoinlist($request);
+
+    if ($request['id'] && $request['id'] !== $this->getUser()->getMemberId())
+    {
+      $this->targetMember = Doctrine::getTable('Member')->find((int)$request['id']);
+    }
+    else
+    {
+      $this->targetMember = $this->getUser()->getMember();
+    }
+
+    $this->getResponse()->setDisplayMember($this->targetMember);
+
+    return $result;
+  }
+
+ /**
+  * Executes join action
+  *
+  * @param opWebRequest $request A request object
+  */
+  public function executeJoin(opWebRequest $request)
+  {
+    $this->forwardIf($request->isSmartphone(), 'community', 'smtJoin');
+
+    return parent::executeJoin($request);
+  }
+
+ /**
+  * Executes smtJoin action
+  *
+  * @param opWebRequest $request A request object
+  */
+  public function executeSmtJoin(opWebRequest $request)
+  {
+    $result = parent::executeJoin($request);
+
+    $this->getResponse()->setDisplayCommunity($this->community);
+
+    return $result;
+  }
+
+ /**
+  * Executes quit action
+  *
+  * @param opWebRequest $request A request object
+  */
+  public function executeQuit(opWebRequest $request)
+  {
+    $this->forwardIf($request->isSmartphone(), 'community', 'smtQuit');
+
+    return parent::executeQuit($request);
+  }
+
+ /**
+  * Executes smtJoin action
+  *
+  * @param opWebRequest $request A request object
+  */
+  public function executeSmtQuit(opWebRequest $request)
+  {
+    $result = parent::executeQuit($request);
+
+    $this->getResponse()->setDisplayCommunity($this->community);
+
+    return $result;
+  }
 }
diff --git a/apps/pc_frontend/modules/community/config/view.yml b/apps/pc_frontend/modules/community/config/view.yml
index 309e7b7fd..ee36a0e75 100644
--- a/apps/pc_frontend/modules/community/config/view.yml
+++ b/apps/pc_frontend/modules/community/config/view.yml
@@ -1,2 +1,26 @@
 homeSuccess:
   layout: layoutA
+
+smtHomeSuccess:
+  layout: smtLayoutGroup
+
+smtEditSuccess:
+  layout: smtLayoutGroup
+
+smtMemberListSuccess:
+  layout: smtLayoutGroup
+
+smtJoinlistSuccess:
+  layout: smtLayoutMember
+
+smtJoinInput:
+  layout: smtLayoutGroup
+
+smtJoinError:
+  layout: smtLayoutSns
+
+smtQuitSuccess:
+  layout: smtLayoutGroup
+
+smtQuitError:
+  layout: smtLayoutSns
diff --git a/apps/pc_frontend/modules/community/templates/smtEditSuccess.php b/apps/pc_frontend/modules/community/templates/smtEditSuccess.php
new file mode 100644
index 000000000..6fff56c8f
--- /dev/null
+++ b/apps/pc_frontend/modules/community/templates/smtEditSuccess.php
@@ -0,0 +1,100 @@
+<?php if ($communityForm->isNew()): ?>
+<?php echo form_tag(url_for('@community_edit'), 'multipart=true') ?>
+<?php else: ?>
+<?php echo form_tag(url_for('@community_edit?id='.$community->getId()), 'multipart=true') ?>
+<?php endif; ?>
+<div class="row">
+<?php if ($communityForm->isNew()): ?>
+  <div class="gadget_header span12"> <?php echo __('Create a new %community%'); ?> </div>
+<?php else: ?>
+  <div class="gadget_header span12"> <?php echo __('Edit the %community%'); ?> </div>
+<?php endif; ?>
+</div>
+
+<?php $errors = array(); ?>
+<?php if ($communityForm->hasGlobalErrors()): ?>
+<?php $errors[] = $communityForm->renderGlobalErrors(); ?>
+<?php endif; ?>
+<?php if ($communityConfigForm->hasGlobalErrors()): ?>
+<?php $errors[] = $communityConfigForm->renderGlobalErrors(); ?>
+<?php endif; ?>
+<?php if ($communityFileForm->hasGlobalErrors()): ?>
+<?php $errors[] = $communityFileForm->renderGlobalErrors(); ?>
+<?php endif; ?>
+<?php if ($errors): ?>
+<div class="row">
+<div class="alert-message block-message error">
+<a class="close" href="#">x</a>
+<?php foreach ($errors as $error): ?>
+<p><?php echo __($error) ?></p>
+<?php endforeach; ?>
+</div>
+</div>
+<?php endif; ?>
+
+<div class="row">
+<?php foreach ($communityForm as $cf): ?>
+<?php if (!$cf->isHidden()): ?>
+  <div class="span12">
+  <?php echo $cf->renderLabel(); ?>
+  </div>
+  <div class="span12 <?php echo $cf->hasError() ? 'clearfix error' : '' ?>">
+    <?php if ($cf->hasError()): ?>
+    <span class="label important"><?php echo __($cf->getError()) ?></span>
+    <?php endif ?>
+    <?php echo $cf->render(array('class' => 'span12')) ?>
+    <span class="help-block"><?php echo $cf->renderHelp() ?></span>
+  </div>
+<?php endif; ?>
+<?php endforeach; ?>
+</div>
+
+<div class="row">
+<?php foreach ($communityConfigForm as $ccf): ?>
+<?php if (!$ccf->isHidden()): ?>
+  <div class="span12"><?php echo $ccf->renderLabel() ?></div>
+  <div class="<?php echo $ccf->hasError() ? 'clearfix error' : '' ?>">
+    <?php if ($ccf->hasError()): ?>
+    <span class="label important"><?php echo __($ccf->getError()) ?></span>
+    <?php endif ?>
+    <?php echo $ccf->render(array('class' => 'span12')) ?>
+    <span class="help-block"><?php echo $ccf->renderHelp() ?></span>
+  </div>
+<?php endif; ?>
+<?php endforeach; ?>
+</div>
+
+<div class="row">
+<?php foreach ($communityFileForm as $cff): ?>
+<?php if (!$cff->isHidden()): ?>
+  <div class="span12"><?php echo $cff->renderLabel(); ?></div>
+  <div class="span12 <? echo $cff->hasError() ? 'clearfix error' : '' ?>">
+    <?php if ($cff->hasError()): ?>
+    <span class="label important"><?php echo __($cff->getError()) ?></span>
+    <?php endif ?>
+    <?php echo $cff->render(array('class' => 'span12')) ?>
+    <span class="help-block"><?php echo $cff->renderHelp() ?></span>
+  </div>
+<?php endif; ?>
+<?php endforeach; ?>
+</div>
+
+<div class="row">
+<div class="span5">
+<input type="submit" name="submit" value="<?php echo __('Send') ?>" class="btn primary" />
+<?php echo $communityForm->renderHiddenFields(); ?>
+<?php echo $communityConfigForm->renderHiddenFields(); ?>
+<?php echo $communityFileForm->renderHiddenFields(); ?>
+</form>
+</div>
+
+<div class="span5">
+  <?php if (!$communityForm->isNew() && $isDeleteCommunity): ?>
+  <?php echo form_tag(url_for('@community_delete?id='.$community->getId())) ?>
+  <span class="label important">DANGER</span>: <input type="submit" name="submit" value="<?php echo __('Delete'); ?>" class="btn danger" />
+  </form>
+  <?php endif; ?>
+</div>
+</div>
+
+</div>
diff --git a/apps/pc_frontend/modules/community/templates/smtHomeSuccess.php b/apps/pc_frontend/modules/community/templates/smtHomeSuccess.php
new file mode 100644
index 000000000..6b16cf9ed
--- /dev/null
+++ b/apps/pc_frontend/modules/community/templates/smtHomeSuccess.php
@@ -0,0 +1,76 @@
+<div class="row">
+  <div class="gadget_header span12">コミュニティ情報</div>
+</div>
+<div class="row">
+  <div class="span12">
+    <hr class="toumei" />
+    <?php echo op_image_tag_sf_image($community->getImageFileName(), array('size' => '320x320', 'format' => 'jpg')) ?>
+    <hr class="toumei" />
+    <?php if ($isAdmin) : ?>
+    <?php echo link_to(__('Edit Photo'), 'community/configImage?id='.$community->getId()) ?>
+    <?php endif; ?>
+  </div>
+</div>
+<div class="row">
+<table class="zebra-striped">
+<tbody>
+<tr>
+  <td><?php echo __('Date Created') ?></td>
+  <td><?php echo op_format_date($community->getCreatedAt(), 'D') ?></td>
+</tr>
+<tr>
+  <td><?php echo __('Administrator') ?></td>
+  <td><?php echo link_to($communityAdmin->getName(), '@member_profile?id='.$communityAdmin->getId()) ?></td>
+</tr>
+<?php
+$subAdminCaption = array();
+foreach ($communitySubAdmins as $m) 
+{
+  $subAdminCaption[] = link_to($m->getName(), '@member_profile?id='.$m->getId());
+}
+?>
+<?php if (count($subAdminCaption)): ?>
+<tr>
+  <td><?php echo __('Sub Administrator') ?></td>
+  <td><?php echo implode("<br>\n", $subAdminCaption) ?></td>
+</tr>
+<?php endif; ?>
+<?php if ($community->community_category_id): ?>
+<tr>
+  <td><?php echo __('%community% Category', array('%community%' => $op_term['community']->titleize()), 'form_community') ?>:</td>
+  <td><?php echo $community->getCommunityCategory() ?></td>
+</tr>
+<?php endif; ?>
+<tr>
+  <td><?php echo __('Register policy', array('%community%' => $op_term['community']->titleize()), 'form_community') ?>:</td>
+  <td><?php echo __($sf_data->getRaw('community')->getRegisterPolicy()) ?></td>
+</tr>
+<tr>
+  <td><?php echo __('Count of Members'); ?></td>
+  <td><?php echo $community->countCommunityMembers(); ?></td>
+</tr>
+<tr>
+  <td><?php echo __('%community% Description', array('%community%' => $op_term['community']->titleize()), 'form_community') ?></td>
+  <td><?php echo $community->getConfig('description'); ?></td>
+</tr>
+<tr>
+  <td></td>
+  <td>
+  <?php if ($isEditCommunity) : ?>
+  <?php echo link_to(__('Edit this %community%', array('%community%' => $op_term['community']->titleize())), '@community_edit?id=' . $community->getId()) ?><br>
+  <?php endif; ?>
+  <?php if (!$isAdmin) : ?>
+  <?php if ($isCommunityMember) : ?>
+  <?php echo link_to(__('Quit this %community%', array('%community%' => $op_term['community']->titleize())), '@community_quit?id=' . $community->getId()) ?><br>
+  <?php else : ?>
+  <?php if ($isCommunityPreMember) : ?>
+  <?php echo __('You are waiting for the participation approval by %community%\'s administrator.', array('%community%' => $op_term['community']->titleize())) ?>
+  <?php else: ?>
+  <?php echo link_to(__('Join this %community%', array('%community%' => $op_term['community']->titleize())), '@community_join?id=' . $community->getId()) ?><br>
+  <?php endif; ?>
+  <?php endif; ?>
+  <?php endif; ?>
+  </td></tr>
+</tbody>
+</table>
+</div>
diff --git a/apps/pc_frontend/modules/community/templates/smtJoinError.php b/apps/pc_frontend/modules/community/templates/smtJoinError.php
new file mode 100644
index 000000000..4d0d5b033
--- /dev/null
+++ b/apps/pc_frontend/modules/community/templates/smtJoinError.php
@@ -0,0 +1,17 @@
+<div class="row">
+  <div class="gadget_header span12"><?php echo __('Errors') ?></div>
+</div>
+
+<div class="row">
+
+<?php if ($isCommunityMember): ?>
+<?php echo __('You are already joined to this %community%.') ?>
+<?php else: ?>
+<?php echo __('You have already sent the participation request to this %community%.') ?>
+<?php endif; ?>
+
+<?php use_helper('Javascript') ?>
+<?php op_include_line('backLink', link_to_function(__('Back to previous page'), 'history.back()')) ?>
+
+</div>
+
diff --git a/apps/pc_frontend/modules/community/templates/smtJoinInput.php b/apps/pc_frontend/modules/community/templates/smtJoinInput.php
new file mode 100644
index 000000000..f933ee961
--- /dev/null
+++ b/apps/pc_frontend/modules/community/templates/smtJoinInput.php
@@ -0,0 +1,24 @@
+<div class="row">
+  <div class="gadget_header span12"><?php echo __('Join to "%1%"', array('%1%' => $community->getName())) ?></div>
+</div>
+
+<div class="row">
+  <div class="span4"><?php echo link_to(op_image_tag_sf_image($community->getImageFileName(), array('size' => '48x48')), '@community_home?id='.$id) ?></div>
+  <div class="span8"><?php echo link_to($community->getName(), '@community_home?id='.$id) ?></div>
+  <div class="span12 center"><?php echo __('Do you really join to the following %community%?') ?></div>
+  <div class="span12">
+    <?php echo form_tag($sf_request->getCurrentUri()); ?>
+    <?php foreach ($form as $field): ?>
+    <?php if (!$field->isHidden()): ?>
+    <div class="clearfix <?php $field->hasError() ? 'error' : '' ?>">
+    <label for="xlInput3" class="span12"><?php echo $field->renderLabel() ?></label>
+    <?php echo $field->render(array('class' => 'span12')) ?>
+    <span class="help-block"><?php echo $field->renderHelp() ?></span>
+    </div>
+    <?php endif; ?>
+    <?php endforeach; ?>
+    <div class="center"><input type="submit" name="submit" value="<?php echo __('Send') ?>" class="btn primary" /></div>
+    <?php echo $form->renderHiddenFields(); ?>
+    </form>
+  </div>
+</div>
diff --git a/apps/pc_frontend/modules/community/templates/smtJoinlistSuccess.php b/apps/pc_frontend/modules/community/templates/smtJoinlistSuccess.php
new file mode 100644
index 000000000..553c21f3d
--- /dev/null
+++ b/apps/pc_frontend/modules/community/templates/smtJoinlistSuccess.php
@@ -0,0 +1,18 @@
+<div class="row">
+  <div class="gadget_header span12"><?php echo __('%community% List', array('%community%' => $op_term['community']->titleize())); ?></div>
+</div>
+<hr class="toumei" />
+<div class="row" style="margin-left: 0px;">
+<?php foreach ( $pager->getResults() as $member ): ?>
+<div class="span3">
+  <div class="row_memberimg row">
+<?php echo op_link_to_member($member, array('link_target' => op_image_tag_sf_image($member->getImageFileName(), array('size' => '57x57')))) ?>
+  </div>
+  <div class="row_membername font10 row"><?php echo link_to($member->getName(), '@member_profile?id='.$member->getId()); ?></div>
+</div>
+<?php endforeach ?>
+</div>
+
+<div class="row" style="text-align: right;">
+<?php echo link_to(__('Back to %member% profile page', array('%member%' => $targetMember->getName())), '@member_profile?id='.$targetMember->getId()) ?>
+</div>
diff --git a/apps/pc_frontend/modules/community/templates/smtMemberListSuccess.php b/apps/pc_frontend/modules/community/templates/smtMemberListSuccess.php
new file mode 100644
index 000000000..e29ca2f80
--- /dev/null
+++ b/apps/pc_frontend/modules/community/templates/smtMemberListSuccess.php
@@ -0,0 +1,20 @@
+<div class="row">
+  <div class="gadget_header span12"><?php echo __('%community% List', array('%community%' => $op_term['community']->titleize())); ?></div>
+</div>
+<hr class="toumei" />
+<div class="row" style="margin-left: 0px;">
+<?php foreach ( $pager->getResults() as $member ): ?>
+<div class="span3">
+  <div class="row_memberimg row">
+  <?php echo op_link_to_member($member, array('link_target' => op_image_tag_sf_image($member->getImageFileName(), array('size' => '57x57')))) ?>
+  </div>
+  <div class="row_membername font10 row">
+  <?php echo link_to($member->getName(), '@member_profile?id='.$member->getId()); ?>
+  </div>
+</div>
+<?php endforeach ?>
+</div>
+
+<div class="row" style="text-align: right;">
+<?php echo link_to(__('Back to %community% top page', array('%community%' => $community->getName())), '@community_home?id='.$community->getId()) ?>
+</div>
diff --git a/apps/pc_frontend/modules/community/templates/smtQuitError.php b/apps/pc_frontend/modules/community/templates/smtQuitError.php
new file mode 100644
index 000000000..bcef67f12
--- /dev/null
+++ b/apps/pc_frontend/modules/community/templates/smtQuitError.php
@@ -0,0 +1,16 @@
+<div class="row">
+  <div class="gadget_header span12"><?php echo __('Errors') ?></div>
+</div>
+
+<div class="row">
+
+<?php if ($isAdmin): ?>
+<?php echo  __('The administrator doesn\'t leave the %community%.') ?>
+<?php else: ?>
+<?php echo  __('You haven\'t joined this %community% yet.') ?>
+<?php endif; ?>
+
+<?php use_helper('Javascript') ?>
+<?php op_include_line('backLink', link_to_function(__('Back to previous page'), 'history.back()')) ?>
+
+</div>
diff --git a/apps/pc_frontend/modules/community/templates/smtQuitSuccess.php b/apps/pc_frontend/modules/community/templates/smtQuitSuccess.php
new file mode 100644
index 000000000..fec4fdd33
--- /dev/null
+++ b/apps/pc_frontend/modules/community/templates/smtQuitSuccess.php
@@ -0,0 +1,24 @@
+<div class="row">
+  <div class="gadget_header span12"><?php echo __('Quit "%1%"', array('%1%' => $community->getName())) ?></div>
+</div>
+
+<div class="row">
+  <div class="span4"><?php echo link_to(op_image_tag_sf_image($community->getImageFileName(), array('size' => '48x48')), '@community_home?id='.$id) ?></div>
+  <div class="span8"><?php echo link_to($community->getName(), '@community_home?id='.$id) ?></div>
+  <div class="span12 center"><?php echo __('Do you really quit the following %community%?') ?></div>
+  <div class="span12 center">
+    <?php echo form_tag($sf_request->getCurrentUri()); ?>
+    <?php foreach ($form as $field): ?>
+    <?php if (!$field->isHidden()): ?>
+    <div class="clearfix <?php $field->hasError() ? 'error' : '' ?>">
+    <label for="xlInput3" class="span12"><?php echo $field->renderLabel() ?></label>
+    <?php echo $field->render(array('class' => 'span12')) ?>
+    <span class="help-block"><?php echo $field->renderHelp() ?></span>
+    </div>
+    <?php endif; ?>
+    <?php endforeach; ?>
+    <input type="submit" name="submit" value="<?php echo __('Send') ?>" class="btn danger" />
+    <?php echo $form->renderHiddenFields(); ?>
+    </form>
+  </div>
+</div>
diff --git a/apps/pc_frontend/modules/default/actions/csrfErrorAction.class.php b/apps/pc_frontend/modules/default/actions/csrfErrorAction.class.php
index b4b1eaed2..ba767e1b6 100644
--- a/apps/pc_frontend/modules/default/actions/csrfErrorAction.class.php
+++ b/apps/pc_frontend/modules/default/actions/csrfErrorAction.class.php
@@ -19,5 +19,10 @@ class csrfErrorAction extends sfAction
 {
   public function execute($request)
   {
+    if ($request->isSmartphone())
+    {
+      $this->setLayout('smtLayoutSns');
+      $this->setTemplate('smtCsrf');
+    }
   }
 }
diff --git a/apps/pc_frontend/modules/default/actions/errorAction.class.php b/apps/pc_frontend/modules/default/actions/errorAction.class.php
index a2f57c05c..877b15ddd 100644
--- a/apps/pc_frontend/modules/default/actions/errorAction.class.php
+++ b/apps/pc_frontend/modules/default/actions/errorAction.class.php
@@ -21,9 +21,14 @@ class errorAction extends sfAction
  /**
   * Executes error action
   *
-  * @param sfRequest $request A request object
+  * @param opWebRequest $request A request object
   */
   public function execute($request)
   {
+    if ($request->isSmartphone())
+    {
+      $this->setLayout('smtLayoutSns');
+      $this->setTemplate('smtError');
+    }
   }
 }
diff --git a/apps/pc_frontend/modules/default/actions/privacyPolicyAction.class.php b/apps/pc_frontend/modules/default/actions/privacyPolicyAction.class.php
index 5ce714119..173be9ee8 100644
--- a/apps/pc_frontend/modules/default/actions/privacyPolicyAction.class.php
+++ b/apps/pc_frontend/modules/default/actions/privacyPolicyAction.class.php
@@ -24,5 +24,10 @@ class privacyPolicyAction extends sfAction
   */
   public function execute($request)
   {
+    if ($request->isSmartphone())
+    {
+      $this->setLayout('smtLayoutSns');
+      $this->setTemplate('smtPrivacyPolicy');
+    }
   }
 }
diff --git a/apps/pc_frontend/modules/default/actions/userAgreementAction.class.php b/apps/pc_frontend/modules/default/actions/userAgreementAction.class.php
index 67195a715..5c24b42fe 100644
--- a/apps/pc_frontend/modules/default/actions/userAgreementAction.class.php
+++ b/apps/pc_frontend/modules/default/actions/userAgreementAction.class.php
@@ -24,5 +24,10 @@ class userAgreementAction extends sfAction
   */
   public function execute($request)
   {
+    if ($request->isSmartphone())
+    {
+      $this->setLayout('smtLayoutSns');
+      $this->setTemplate('smtUserAgreement');
+    }
   }
 }
diff --git a/apps/pc_frontend/modules/default/templates/smtCsrfErrorSuccess.php b/apps/pc_frontend/modules/default/templates/smtCsrfErrorSuccess.php
new file mode 100644
index 000000000..6ce90a73d
--- /dev/null
+++ b/apps/pc_frontend/modules/default/templates/smtCsrfErrorSuccess.php
@@ -0,0 +1,9 @@
+<div class="row">
+  <h3 class="span12"><?php echo __('CSRF attack detected.'); ?></h3>
+</div>
+
+<?php use_helper('Javascript') ?>
+
+<div class="row">
+<?php op_include_line('backLink', link_to_function(__('Back to previous page'), 'history.back()')) ?>
+</div>
diff --git a/apps/pc_frontend/modules/default/templates/smtErrorSuccess.php b/apps/pc_frontend/modules/default/templates/smtErrorSuccess.php
new file mode 100644
index 000000000..8337de2f4
--- /dev/null
+++ b/apps/pc_frontend/modules/default/templates/smtErrorSuccess.php
@@ -0,0 +1,8 @@
+<div class="row">
+  <h3 class="span12"><?php echo __('You can\'t access this page.') ?></h3>
+</div>
+
+<?php use_helper('Javascript') ?>
+<div class="row">
+  <?php op_include_line('backLink', link_to_function(__('Back to previous page'), 'history.back()')) ?>
+</div>
diff --git a/apps/pc_frontend/modules/default/templates/smtPrivacyPolicySuccess.php b/apps/pc_frontend/modules/default/templates/smtPrivacyPolicySuccess.php
new file mode 100644
index 000000000..2e6acb7fb
--- /dev/null
+++ b/apps/pc_frontend/modules/default/templates/smtPrivacyPolicySuccess.php
@@ -0,0 +1,7 @@
+<div class="row">
+  <h3 class="span12"><?php echo __('Privacy policy'); ?></h3>
+</div>
+
+<div class="row">
+<?php echo nl2br($op_config['privacy_policy']); ?>
+</div>
diff --git a/apps/pc_frontend/modules/default/templates/smtUserAgreementSuccess.php b/apps/pc_frontend/modules/default/templates/smtUserAgreementSuccess.php
new file mode 100644
index 000000000..1ed0b64f6
--- /dev/null
+++ b/apps/pc_frontend/modules/default/templates/smtUserAgreementSuccess.php
@@ -0,0 +1,7 @@
+<div class="row">
+  <h3 class="span12"><?php echo __('Terms of service'); ?></h3>
+</div>
+
+<div class="row">
+<?php echo nl2br($op_config['user_agreement']) ?>
+</div>
diff --git a/apps/pc_frontend/modules/friend/actions/actions.class.php b/apps/pc_frontend/modules/friend/actions/actions.class.php
index 5751c03d8..ce3bef579 100644
--- a/apps/pc_frontend/modules/friend/actions/actions.class.php
+++ b/apps/pc_frontend/modules/friend/actions/actions.class.php
@@ -29,8 +29,34 @@ public function preExecute()
 
   public function executeList(sfWebRequest $request)
   {
+    $this->forwardIf($request->isSmartphone(), 'friend', 'smtList');
+
     $this->size = 50;
 
     return parent::executeList($request);
   }
+
+  public function executeSmtList($request)
+  {
+    $this->member = Doctrine::getTable('Member')->find($this->id);
+    $this->getResponse()->setDisplayMember($this->member);
+
+    return sfView::SUCCESS;
+  }
+
+  public function executeLink(opWebRequest $request)
+  {
+    $this->forwardIf($request->isSmartphone(), 'friend', 'smtLink');
+
+    return parent::executeLink($request);
+  }
+
+  public function executeSmtLink(opWebRequest $request)
+  {
+    $result = parent::executeLink($request);
+
+    $this->getResponse()->setDisplayMember($this->member);
+
+    return $result;
+  }
 }
diff --git a/apps/pc_frontend/modules/friend/config/view.yml b/apps/pc_frontend/modules/friend/config/view.yml
new file mode 100644
index 000000000..7dcbac29c
--- /dev/null
+++ b/apps/pc_frontend/modules/friend/config/view.yml
@@ -0,0 +1,5 @@
+smtListSuccess:
+  layout: smtLayoutMember
+
+smtLinkInput:
+  layout: smtLayoutSns
diff --git a/apps/pc_frontend/modules/friend/templates/smtLinkInput.php b/apps/pc_frontend/modules/friend/templates/smtLinkInput.php
new file mode 100644
index 000000000..48ebd36a7
--- /dev/null
+++ b/apps/pc_frontend/modules/friend/templates/smtLinkInput.php
@@ -0,0 +1,23 @@
+<div class="row">
+  <div class="gadget_header span12"><?php echo __('Add %my_friend%', array('%my_friend%' => $op_term['my_friend']->pluralize())) ?></div>
+</div>
+
+<div class="row">
+  <div class="span4"><?php echo link_to(op_image_tag_sf_image($member->getImageFileName(), array('size' => '48x48')), '@member_profile?id='.$id) ?></div>
+  <div class="span8"><?php echo link_to($member->getName(), '@member_profile?id='.$id) ?></div>
+  <div class="span12">
+    <?php echo form_tag($sf_request->getCurrentUri()); ?>
+    <?php foreach ($form as $field): ?>
+    <?php if (!$field->isHidden()): ?>
+    <div class="clearfix <?php $field->hasError() ? 'error' : '' ?>">
+    <label for="xlInput3" class="span12"><?php echo $field->renderLabel() ?></label>
+    <?php echo $field->render(array('class' => 'span12')) ?>
+    <span class="help-block"><?php echo $field->renderHelp() ?></span>
+    </div>
+    <?php endif; ?>
+    <?php endforeach; ?>
+    <input type="submit" name="submit" value="<?php echo __('Send') ?>" class="btn primary" />
+    <?php echo $form->renderHiddenFields(); ?>
+    </form>
+  </div>
+</div>
diff --git a/apps/pc_frontend/modules/friend/templates/smtListSuccess.php b/apps/pc_frontend/modules/friend/templates/smtListSuccess.php
new file mode 100644
index 000000000..da9fc2225
--- /dev/null
+++ b/apps/pc_frontend/modules/friend/templates/smtListSuccess.php
@@ -0,0 +1,21 @@
+<script id="friendListTemplate" type="text/x-jquery-tmpl">
+  <div class="span3">
+    <div class="row_memberimg row"><a href="${profile_url}"><img src="${profile_image}" class="rad10" width="57" height="57"></a></div>
+    <div class="row_membername font10 row"><a href="${profile_url}">${name}</a> (${friends_count})</div>
+  </div>
+</script>
+<script type="text/javascript">
+$(function(){
+  $.getJSON( openpne.apiBase + 'member/search.json?apiKey=' + openpne.apiKey + '&target=friend&target_id=<?php echo $member->getId()?>', function(json) {
+    $('#friendListTemplate').tmpl(json.data).appendTo('#memberFriendList');
+  });
+});
+</script>
+
+<div class="row">
+  <div class="gadget_header span12"><?php echo __('%1%\'s %friend% List', array('%1%' => $member->getName(), '%friend%' => $op_term['friend']->titleize())); ?></div>
+</div>
+<hr class="toumei" />
+<div class="row" id="memberFriendList">
+
+</div>
diff --git a/apps/pc_frontend/modules/member/actions/actions.class.php b/apps/pc_frontend/modules/member/actions/actions.class.php
index b8d44a485..22e37cfe6 100644
--- a/apps/pc_frontend/modules/member/actions/actions.class.php
+++ b/apps/pc_frontend/modules/member/actions/actions.class.php
@@ -20,10 +20,12 @@ class memberActions extends opMemberAction
  /**
   * Executes home action
   *
-  * @param sfRequest $request A request object
+  * @param opWebRequest $request A request object
   */
   public function executeHome($request)
   {
+    $this->forwardIf($request->isSmartphone(), 'member', 'smtHome');
+
     $this->topGadgets = null;
     $this->sideMenuGadgets = null;
 
@@ -47,10 +49,20 @@ public function executeHome($request)
     return parent::executeHome($request);
   }
 
+ /**
+  * Execute smtHome action
+  *
+  * @param opWebRequest $request A request object
+  */
+  public function executeSmtHome(opWebRequest $request)
+  {
+    return sfView::SUCCESS;
+  }
+
  /**
   * Executes login action
   *
-  * @param sfRequest $request A request object
+  * @param opWevRequest $request A request object
   */
   public function executeLogin($request)
   {
@@ -59,32 +71,43 @@ public function executeLogin($request)
       $this->redirect(opConfig::get('external_pc_login_url'));
     }
 
-    $this->gadgetConfig = sfConfig::get('op_login_gadget_list');
-    $gadgets = Doctrine::getTable('Gadget')->retrieveGadgetsByTypesName('login');
-    $layout = Doctrine::getTable('SnsConfig')->get('login_layout', 'layoutA');
-    $this->setLayout($layout);
-
-    switch($layout)
+    if ($request->isSmartphone())
     {
-      case 'layoutA' :
-        $this->topGadgets = $gadgets['loginTop'];
-      case 'layoutB' :
-        $this->sideMenuGadgets = $gadgets['loginSideMenu'];
+      $this->setLayout('smtLayoutSns');
+      $this->setTemplate('smtLogin');    
     }
+    else
+    {
+      $this->gadgetConfig = sfConfig::get('op_login_gadget_list');
+      $gadgets = Doctrine::getTable('Gadget')->retrieveGadgetsByTypesName('login');
+      $layout = Doctrine::getTable('SnsConfig')->get('login_layout', 'layoutA');
+      $this->setLayout($layout);
 
-    $this->contentsGadgets = $gadgets['loginContents'];
-    $this->bottomGadgets = $gadgets['loginBottom'];
+      switch($layout)
+      {
+        case 'layoutA' :
+          $this->topGadgets = $gadgets['loginTop'];
+        case 'layoutB' :
+          $this->sideMenuGadgets = $gadgets['loginSideMenu'];
+      }
+
+      $this->contentsGadgets = $gadgets['loginContents'];
+      $this->bottomGadgets = $gadgets['loginBottom'];
+    }
 
     return parent::executeLogin($request);
   }
 
+
  /**
   * Executes profile action
   *
-  * @param sfRequest $request A request object
+  * @param opWebRequest $request A request object
   */
   public function executeProfile($request)
   {
+    $this->forwardIf($request->isSmartphone(), 'member', 'smtProfile');
+
     $id = $request->getParameter('id', $this->getUser()->getMemberId());
     if ($id != $this->getUser()->getMemberId())
     {
@@ -110,13 +133,29 @@ public function executeProfile($request)
     return parent::executeProfile($request);
   }
 
+ /**
+  * Executes smtProfile action
+  *
+  * @param opWebRequest $request A request object
+  */
+  public function executeSmtProfile(opWebRequest $request)
+  {
+    $result = parent::executeProfile($request);
+
+    $this->getResponse()->setDisplayMember($this->member);
+
+    return $result;
+  }
+
  /**
   * Executes configImage action
   *
-  * @param sfRequest $request A request object
+  * @param opWebRequest $request A request object
   */
   public function executeConfigImage($request)
   {
+    $this->forwardIf($request->isSmartphone(), 'member', 'smtConfigImage');
+
     $options = array('member' => $this->getUser()->getMember());
     $this->form = new MemberImageForm(array(), $options);
 
@@ -141,6 +180,44 @@ public function executeConfigImage($request)
       }
       $this->redirect('@member_config_image');
     }
+
+  }
+
+
+ /**
+  * Executes smtCofigImage action
+  *
+  * @param opWebRequest $request A request object
+  */
+
+  public function executeSmtConfigImage(opWebRequest $request)
+  {
+    $options = array('member' => $this->getUser()->getMember());
+    $this->form = new MemberImageForm(array(), $options);
+
+    if ($request->isMethod(sfWebRequest::POST))
+    {
+      try
+      {
+        if (!$this->form->bindAndSave($request->getParameter('member_image'), $request->getFiles('member_image')))
+        {
+          $errors = $this->form->getErrorSchema()->getErrors();
+          if (isset($errors['file']))
+          {
+            $error = $errors['file'];
+            $i18n = $this->getContext()->getI18N();
+            $this->getUser()->setFlash('error', $i18n->__($error->getMessageFormat(), $error->getArguments()));
+          }
+        }
+      }
+      catch (opRuntimeException $e)
+      {
+        $this->getUser()->setFlash('error', $e->getMessage());
+      }
+      $this->redirect('@member_config_image');
+    }
+
+    return parent::executeConfigImage($request);
   }
 
  /**
@@ -187,4 +264,74 @@ public function executeChangeLanguage(sfWebRequest $request)
     }
     $this->redirect('@homepage');
   }
+
+
+ /**
+  * Executes editConfig action
+  *
+  * @param opWebRequest $request a request object
+  */
+  public function executeConfig($request)
+  {
+    $this->forwardIf($request->isSmartphone(), 'member', 'smtConfig');
+
+    return parent::executeConfig($request);
+  }
+
+ /**
+  * Executes editSmtConfig action
+  *
+  * @param opWebRequest $request a request object
+  */
+  public function executeSmtConfig(opWebRequest $request)
+  {
+    return parent::executeConfig($request);
+  }
+
+
+ /**
+  * Executes invite action
+  *
+  * @param opWebRequest $request a request object
+  */
+  public function executeInvite($request)
+  {
+    $this->forwardIf($request->isSmartphone(), 'member', 'smtInvite');
+
+    return parent::executeInvite($request);
+  }
+
+
+ /**
+  * Executes editSmtConfig action
+  *
+  * @param opWebRequest $request a request object
+  */
+  public function executeSmtInvite(opWebRequest $request)
+  {
+    return parent::executeInvite($request);
+  }
+
+
+ /**
+  * Executes editProfile action
+  *
+  * @param opWebRequest $request a request object
+  */
+  public function executeEditProfile($request)
+  {
+    $this->forwardIf($request->isSmartphone(), 'member', 'smtEditProfile');
+
+    return parent::executeEditProfile($request);
+  }
+
+ /**
+  * Executes smtEditProfile action
+  *
+  * @param opWebRequest $request a request object
+  */
+  public function executeSmtEditProfile(opWebRequest $request)
+  {
+    return parent::executeEditProfile($request);
+  }
 }
diff --git a/apps/pc_frontend/modules/member/config/view.yml b/apps/pc_frontend/modules/member/config/view.yml
index f62759b2b..324e4ffa1 100644
--- a/apps/pc_frontend/modules/member/config/view.yml
+++ b/apps/pc_frontend/modules/member/config/view.yml
@@ -31,3 +31,21 @@ configSuccess:
 
 loginSuccess:
   layout: layoutA
+
+smtHomeSuccess:
+  layout: smtLayoutHome
+
+smtProfileSuccess:
+  layout: smtLayoutMember
+
+smtEditProfileSuccess:
+  layout: smtLayoutHome
+
+smtConfigSuccess:
+  layout: smtLayoutHome
+
+smtConfigImageSuccess:
+  layout: smtLayoutHome
+
+smtInviteSuccess:
+  layout: smtLayoutHome
diff --git a/apps/pc_frontend/modules/member/templates/smtConfigImageSuccess.php b/apps/pc_frontend/modules/member/templates/smtConfigImageSuccess.php
new file mode 100644
index 000000000..d938dd4bc
--- /dev/null
+++ b/apps/pc_frontend/modules/member/templates/smtConfigImageSuccess.php
@@ -0,0 +1,58 @@
+<div class="row">
+  <div class="gadget_header span12"><?php echo __('Edit Photo') ?></div>
+</div>
+
+<?php $errors = array(); ?>
+<?php if ($form->hasGlobalErrors()): ?>
+<?php $errors[] = $form->renderGlobalErrors(); ?>
+<?php endif; ?>
+<?php if ($errors): ?>
+<div class="row">
+<div class="alert-message block-message error">
+<a class="close" href="#">x</a>
+<?php foreach ($errors as $error): ?>
+<p><?php echo __($error) ?></p>
+<?php endforeach; ?>
+</div>
+</div>
+<?php endif; ?>
+
+<div class="row">
+<?php echo $form->renderFormTag(url_for('member/configImage')) ?>
+<?php echo $form['file'] ?>
+<?php echo $form->renderHiddenFields(); ?>
+<input type="submit" name="submit" value="<?php echo __('Upload') ?>" class="btn primary" />
+</form>
+<?php if (3 >= $sf_user->getMember()->getMemberImage()->count()): ?>
+<?php echo __('Send E-mail that has a photo to use as your image.') ?><br>
+<?php echo op_mail_to('member_add_image', array(), __('Send E-mail')) ?>
+<?php endif; ?>
+</div>
+
+<div class="row">
+<?php $member = $sf_user->getMember() ?>
+<?php $images = $member->getMemberImage() ?>
+<?php $form = new sfForm() ?>
+<?php $csrfToken = '&'.$form->getCSRFFieldName().'='.$form->getCSRFToken() ?>
+<?php for ($i = 0; $i < 3; $i++) : ?>
+<div class="span4">
+  <div class="row center"> 
+<?php if (isset($images[$i])) : ?>
+<?php $image = $images[$i]; ?>
+<?php echo op_image_tag_sf_image($image->getFile(), array('size' => '120x120', 'width' => '80', 'height' => '80')) ?></div>
+  <div class="row center">
+[
+<?php echo link_to(__('Delete'), 'member/deleteImage?member_image_id='.$image->getId().$csrfToken) ?> |
+<?php if ($image->getIsPrimary()) : ?>
+<?php echo(__('Main Photo')) ?>
+<?php else: ?>
+<?php echo link_to(__('Main Photo'), 'member/changeMainImage?member_image_id='.$image->getId().$csrfToken) ?>
+<?php endif; ?>
+]
+<?php else: ?>
+<?php echo op_image_tag('no_image.gif', array('size' => '80x80', 'alt' => '')) ?>
+<?php endif; ?>
+  </div>
+</div>
+<?php endfor; ?>
+</div>
diff --git a/apps/pc_frontend/modules/member/templates/smtConfigSuccess.php b/apps/pc_frontend/modules/member/templates/smtConfigSuccess.php
new file mode 100644
index 000000000..73365f8ee
--- /dev/null
+++ b/apps/pc_frontend/modules/member/templates/smtConfigSuccess.php
@@ -0,0 +1,59 @@
+<?php
+$lists = array();
+foreach ($categories as $key => $value)
+{
+  if (count($value))
+  {
+    $lists[$key] = link_to(__($categoryCaptions[$key]), '@member_config?category='.$key);
+  }
+}
+?>
+<?php if($categoryName): ?>
+<div class="row">
+  <div class="gadget_header span12"><?php echo __($categoryCaptions[$categoryName]); ?></div>
+</div>
+<?php else: ?>
+<div class="row">
+  <div class="gadget_header span12"><?php echo __('Change Settings'); ?></div>
+</div>
+<?php endif; ?>
+
+<?php if ($categoryName): ?>
+<?php echo form_tag(url_for('@member_config?category='.$categoryName)) ?>
+<?php $errors = array(); ?>
+<?php if ($form->hasGlobalErrors()): ?>
+<?php $errors[] = $form->renderGlobalErrors(); ?>
+<?php endif; ?>
+<?php if ($errors): ?>
+<div class="row">
+<div class="alert-message block-message error">
+<?php foreach ($errors as $error): ?>
+<p><?php echo __($error) ?></p>
+<?php endforeach; ?>
+</div>
+</div>
+<?php endif; ?>
+
+<div class="row span12" style="margin-left: 5px;">
+<?php foreach ($form as $f): ?>
+<?php if (!$f->isHidden()): ?>
+<div class="clearfix <?php $f->hasError() ? 'error' : '' ?>">
+<label for="xlInput3" class="span12"><?php echo $f->renderLabel() ?></label>
+<?php echo $f->render(array('class' => 'span12')) ?>
+<span class="help-block"><?php echo $f->renderHelp() ?></span>
+</div>
+<?php endif; ?>
+<?php endforeach; ?>
+<input type="submit" name="submit" value="<?php echo __('Send') ?>" class="btn danger" />
+<?php echo $form->renderHiddenFields(); ?>
+</form>
+</div>
+<?php else: ?>
+<?php echo __('Please select the item that wants to be set from the menu.'); ?>
+<?php endif; ?>
+
+<div class="row span12" style="margin-left: 5px;">
+<?php foreach ($lists as $list): ?>
+<div class="span6" style="margin: 0px;"><?php echo $list; ?></div>
+<?php endforeach; ?>
+</div>
diff --git a/apps/pc_frontend/modules/member/templates/smtEditProfileSuccess.php b/apps/pc_frontend/modules/member/templates/smtEditProfileSuccess.php
new file mode 100644
index 000000000..0d54d0b42
--- /dev/null
+++ b/apps/pc_frontend/modules/member/templates/smtEditProfileSuccess.php
@@ -0,0 +1,68 @@
+<form action="<?php echo url_for('@member_editProfile'); ?>" method="post">
+<div class="row">
+  <div class="gadget_header span12"> <?php echo __('Edit Profile'); ?> </div>
+</div>
+
+<?php $errors = array(); ?>
+<?php if ($memberForm->hasGlobalErrors()): ?>
+<?php $errors[] = $memberForm->renderGlobalErrors(); ?>
+<?php endif; ?>
+<?php if ($profileForm->hasGlobalErrors()): ?>
+<?php $errors[] = $profileForm->renderGlobalErrors(); ?>
+<?php endif; ?>
+
+<?php if ($errors): ?>
+<div class="row">
+<div class="alert-message block-message error">
+<a class="close" href="#">x</a>
+<?php foreach ($errors as $error): ?>
+<p><?php echo __($error) ?></p>
+<?php endforeach; ?>
+</div>
+</div>
+<?php endif; ?>
+
+<div class="row">
+<table class="zebra-striped">
+<?php foreach ($memberForm as $mf): ?>
+<?php if (!$mf->isHidden()): ?>
+<tr>
+  <th><?php echo $mf->renderLabel(); ?></th>
+  <td>
+  <div class="<?php echo $mf->hasError() ? 'clearfix error' : '' ?>">
+    <?php if ($mf->hasError()): ?>
+    <span class="label important"><?php echo __($mf->getError()); ?></span>
+    <?php endif ?>
+    <?php echo $mf->render(array('class' => 'span16')) ?>
+    <span class="help-block"><?php echo $mf->renderHelp(); ?></span>
+  </div>
+  </td>
+</tr>
+<?php endif; ?>
+<?php endforeach; ?>
+<?php foreach ($profileForm as $pf): ?>
+<?php if (!$pf->isHidden()): ?>
+<tr>
+  <th><?php echo $pf->renderLabel(); ?></th>
+  <td>
+  <div class="<?php $mf->hasError() ? 'clearfix error' : '' ?>">
+    <?php if ($mf->hasError()): ?>
+    <span class="label important"><?php echo __($pf->getError()); ?></span>
+    <?php endif ?>
+    <?php if ($pf->getWidget()->getOption('widget') instanceof sfWidgetFormDate): ?>
+    <?php echo $pf->render(array('class' => 'span8')) ?>
+    <?php else: ?>
+    <?php echo $pf->render(array('class' => 'span16')) ?>
+    <?php endif ?>
+    <span class="help-block"><?php echo $pf->renderHelp() ?></span>
+  </div>
+  </td>
+</tr>
+<?php endif; ?>
+<?php endforeach; ?>
+<?php echo $memberForm->renderHiddenFields(); ?>
+<?php echo $profileForm->renderHiddenFields(); ?>
+</table>
+<input type="submit" name="subtmi" value="<?php echo __('Send') ?>" class="btn primary" />
+</form>
+</div>
diff --git a/apps/pc_frontend/modules/member/templates/smtHomeSuccess.php b/apps/pc_frontend/modules/member/templates/smtHomeSuccess.php
new file mode 100644
index 000000000..7e4950718
--- /dev/null
+++ b/apps/pc_frontend/modules/member/templates/smtHomeSuccess.php
@@ -0,0 +1,87 @@
+<?php use_helper('Javascript') ?>
+
+<?php op_include_parts('descriptionBox', 'smtHomeBox', $options); ?>
+
+<?php echo javascript_tag('
+function storeSort(obj)
+{
+  var result = "";
+  Element.childElements(obj.parentNode).each(function(child, index){
+    if (child.id && child.id.match(/_[0-9]+$/)) {
+      if (result) {
+        result = result + ",";
+      }
+      result = result + child.id;
+    }
+  });
+  var path = "'.($sf_request->getRelativeUrlRoot() ? $sf_request->getRelativeUrlRoot() : '/').'";
+  var expires = new Date();
+  expires.setTime((new Date()).getTime() + (10 * 12 * 30 * 24 * 60 * 60 * 1000));
+  var pos = obj.parentNode.id;
+
+  opCookie.set("HomeGadget_" + pos + "_sort", result, expires, path);
+}
+
+function foldObj(obj, display)
+{
+  Element.childElements(obj.parentNode).each(function(child, index){
+    if (!child.hasClassName("partsHeading")) {
+      if (display == null) {
+        child.toggle();
+      } else {
+        if (display == "true") {
+          child.show();
+        } else {
+          child.hide();
+        }
+      }
+
+      var size = Element.childElements(obj.parentNode).length;
+      if (size == index + 1) {  // It is a last loop maybe
+        var path = "'.($sf_request->getRelativeUrlRoot() ? $sf_request->getRelativeUrlRoot() : '/').'";
+        var id = child.parentNode.parentNode.id;
+        var expires = new Date();
+        expires.setTime((new Date()).getTime() + (10 * 12 * 30 * 24 * 60 * 60 * 1000));
+        opCookie.set("HomeGadget_" + id + "_toggle", child.visible(), expires, path);
+      }
+    }
+  });
+}
+
+$$(".partsHeading").each(function(obj){
+  // folding
+  Event.observe(obj, "dblclick", function(e){
+    foldObj(obj);
+  });
+  var id = obj.parentNode.parentNode.id;
+  var display = opCookie.get("HomeGadget_"+id+"_toggle");
+  if (display != null) {
+    foldObj(obj, display);
+  }
+
+});
+
+["Top", "Left", "Center"].each(function(type){
+  var sortInfo = opCookie.get("HomeGadget_" + type + "_sort");
+  if (sortInfo)
+  {
+    var obj = document.getElementById(type);
+    var preGadget = null;
+    sortInfo.split(",").each(function(value){
+      var gadget = document.getElementById(value);
+      if (preGadget)
+      {
+        Element.remove(gadget);
+        Insertion.After(preGadget, gadget);
+      }
+      else
+      {
+        Element.remove(gadget);
+        Insertion.Top(obj, gadget);
+      }
+      preGadget = gadget;
+    });
+  }
+});
+
+') ?>
diff --git a/apps/pc_frontend/modules/member/templates/smtInviteError.php b/apps/pc_frontend/modules/member/templates/smtInviteError.php
new file mode 100644
index 000000000..940aa0eb1
--- /dev/null
+++ b/apps/pc_frontend/modules/member/templates/smtInviteError.php
@@ -0,0 +1,9 @@
+<?php
+$options = array(
+  'title' => __('Invite a friend to %1%', array('%1%' => $op_config['sns_name'])),
+);
+op_include_box('inviteForm', __('The invitation has not been permitted.'), $options);
+?>
+
+<?php use_helper('Javascript') ?>
+<?php op_include_line('backLink', link_to_function(__('Back to previous page'), 'history.back()')) ?>
diff --git a/apps/pc_frontend/modules/member/templates/smtInviteSuccess.php b/apps/pc_frontend/modules/member/templates/smtInviteSuccess.php
new file mode 100644
index 000000000..a0e759842
--- /dev/null
+++ b/apps/pc_frontend/modules/member/templates/smtInviteSuccess.php
@@ -0,0 +1,38 @@
+<form action="<?php echo url_for('@member_invite'); ?>" method="post">
+<div class="row">
+  <div class="gadget_header span12"> <?php echo __('Invite a friend to %1%', array('%1%' => $op_config['sns_name'])); ?> </div>
+</div>
+<?php $errors = array(); ?>
+<?php if ($form->hasGlobalErrors()): ?>
+<?php $errors[] = $form->renderGlobalErrors(); ?>
+<?php endif; ?>
+<?php if ($errors): ?>
+<div class="row">
+<div class="alert-message block-message error">
+<a class="close" href="#">x</a>
+<?php foreach ($errors as $error): ?>
+<p><?php echo __($error) ?></p>
+<?php endforeach; ?>
+</div>
+</div>
+<?php endif; ?>
+<div class="row">
+
+<?php foreach ($form as $f): ?>
+<?php if (!$f->isHidden()): ?>
+<div class="span12" style="text-align: left;">
+<?php echo $f->renderLabel(); ?>
+</div>
+<div class="span12 <?php echo $f->hasError() ? 'clearfix error' : '' ?>">
+  <?php if ($f->hasError()): ?>
+  <span class="label important"><?php echo __($f->getError()) ?></span><br>
+  <?php endif ?>
+  <?php echo $f->render(array('class' => 'span12')) ?>
+  <span class="help-block"><?php echo $f->renderHelp() ?></span>
+</div>
+<?php endif; ?>
+<?php endforeach; ?>
+<?php echo $form->renderHiddenFields(); ?>
+<input type="submit" name="submit" value="<?php echo __('Send'); ?>" class="btn primary" />
+</form>
+</div>
diff --git a/apps/pc_frontend/modules/member/templates/smtLoginError.php b/apps/pc_frontend/modules/member/templates/smtLoginError.php
new file mode 100644
index 000000000..7c820e18d
--- /dev/null
+++ b/apps/pc_frontend/modules/member/templates/smtLoginError.php
@@ -0,0 +1,8 @@
+<div class="row">
+  <div class="gadget_header span12"><?php echo __('Error'); ?></div>
+</div>
+
+<?php echo __('Failed in login.'); ?>
+
+<?php use_helper('Javascript') ?>
+<?php op_include_line('backLink', link_to_function(__('Back to previous page'), 'history.back()')) ?>
diff --git a/apps/pc_frontend/modules/member/templates/smtLoginSuccess.php b/apps/pc_frontend/modules/member/templates/smtLoginSuccess.php
new file mode 100644
index 000000000..c4a821cbe
--- /dev/null
+++ b/apps/pc_frontend/modules/member/templates/smtLoginSuccess.php
@@ -0,0 +1,30 @@
+<form action="<?php echo url_for('member/login?authMode=MailAddress') ?>" method="post">
+
+<div class="row">
+<div class="span12">メールアドレス</div>
+</div>
+
+<div class="row">
+<input type="text" name="authMailAddress[mail_address]" id="authMailAddress_mail_address" class="span12" value="" />
+</div>
+
+<div class="row">
+<div class="span12">パスワード</div>
+</div>
+
+<div class="row">
+<input type="password" name="authMailAddress[password]" id="authMailAddress_password" class="span12" value="" />
+</div>
+
+<div class="row">
+<div class="span8">次回から自動的にログイン</div>
+<div class="span4"><input type="checkbox" name="authMailAddress[is_remember_me]" id="authMailAddress_is_remember_me" />
+<input value="member/home" type="hidden" name="authMailAddress[next_uri]" id="authMailAddress_next_uri" /></div>
+</div>
+
+<div class="row">
+<div class="span4"></div><div class="span8"><input type="submit" class="input_submit btn primary" value="ログイン" /></div>
+</div>
+
+</form>
+
diff --git a/apps/pc_frontend/modules/member/templates/smtProfileSuccess.php b/apps/pc_frontend/modules/member/templates/smtProfileSuccess.php
new file mode 100644
index 000000000..e2f61693d
--- /dev/null
+++ b/apps/pc_frontend/modules/member/templates/smtProfileSuccess.php
@@ -0,0 +1,110 @@
+<?php use_helper('Javascript') ?>
+<script type="text/javascript" src="http://code.jquery.com/jquery-latest.min.js"></script>
+<script type="text/javascript" src="http://ajax.microsoft.com/ajax/jquery.templates/beta1/jquery.tmpl.js"></script>
+<script id="friendListTemplate" type="text/x-jquery-tmpl">
+  <div class="span3">
+    <div class="row_memberimg row"><a href="${member.profile_url}"><img src="${member.image}" class="rad10" width="57" height="57"></a></div>
+    <div class="row_membername font10 row"><a href="${member.profile_url}">${member.name}</a> (${member.count})</div>
+  </div>
+</script>
+<script type="text/javascript">
+$(function(){
+  $.getJSON( '<?php echo app_url_for('api', 'member/friendList.json', array('id' => $member->getId())); ?>&apiKey=' + openpne.apiKey, function(json) {
+    $('#friendListTemplate').tmpl(json.data).appendTo('#memberFriendList');
+  });
+});
+</script>
+<?php if ($relation->isSelf()): ?>
+<?php ob_start() ?>
+<div class="alert-message block-message info">
+<p><?php echo __('Other members look your page like this.') ?></p>
+<p><?php echo __('If you teach your page to other members, please use following URL.') ?><br />
+<?php echo url_for('@member_profile?id='.$member->getId(), true) ?></p>
+<p><?php echo __('If you edit this page, please visit %1%.', array('%1%' => link_to(__('Edit profile'), '@member_editProfile'))) ?></p>
+</div>
+<?php $content = ob_get_clean() ?>
+<?php op_include_parts('descriptionBox', 'informationAboutThisIsYourProfilePage', array('body' => $content)) ?>
+<?php else: ?>
+<?php if (!$relation->isFriend() && opConfig::get('enable_friend_link') && $relation->isAllowed($sf_user->getRawValue()->getMember(), 'friend_link')): ?>
+<?php ob_start() ?>
+<div class="alert-message block-message warning">
+<p><?php echo __('If %1% is your friend, let us add to %my_friend% it!', array('%1%' => $member->getName(), '%my_friend%' => $op_term['my_friend']->pluralize())) ?><br />
+<?php echo link_to(__('Add %my_friend%', array('%my_friend%' => $op_term['my_friend']->pluralize())), 'friend/link?id='.$member->getId()) ?>
+</p>
+</div>
+<?php $content = ob_get_clean() ?>
+<?php op_include_parts('descriptionBox', 'informationAboutThisIsYourProfilePage', array('body' => $content)) ?>
+<?php endif; ?>
+<?php endif; ?>
+
+<?php
+op_include_parts('descriptionBox', 'smtProfileTop', array());
+foreach ($member->getProfiles(true) as $profile)
+{
+  $caption = $profile->getProfile()->getCaption();
+  if ($profile->getProfile()->isPreset())
+  {
+    $presetConfig = $profile->getProfile()->getPresetConfig();
+    $caption = __($presetConfig['Caption']);
+  }
+
+  $profileValue = (string)$profile;
+  if ('' === $profileValue)
+  {
+    continue;
+  }
+
+  if ($profile->getFormType() === 'textarea')
+  {
+    $profileValue = op_auto_link_text(nl2br($profileValue));
+  }
+
+  if ($profile->getProfile()->isPreset())
+  {
+    if ($profile->getFormType() === 'country_select')
+    {
+      $profileValue = $culture->getCountry($profileValue);
+    }
+    elseif ('op_preset_birthday' === $profile->getName())
+    {
+      $profileValue = op_format_date($profileValue, 'XShortDateJa');
+    }
+
+    $profileValue = __($profileValue);
+  }
+
+  $list[$caption] = $profileValue;
+}
+?>
+<div class="row">
+  <div class="gadget_header span12"><?php echo __('Profile') ?></div>
+</div>
+<div class="row">
+<table class="zebra-striped">
+<tbody>
+<tr><td><?php echo $op_term['nickname'] ?></td><td><?php echo $member->getName(); ?></td></tr>
+<?php foreach ($list as $k => $v): ?>
+<tr><td><?php echo __($k); ?></td><td><?php echo $v; ?></td></tr>
+<?php endforeach; ?>
+</tbody>
+</table>
+</div>
+
+<div class="row">
+  <div class="gadget_header span12"><?php echo __('Photo') ?></div>
+</div>
+<hr class="toumei" />
+<div class="row">
+  <div class="span12">
+    <hr class="toumei" />
+    <?php echo op_image_tag_sf_image($member->getImageFileName(), array('size' => '320x320')) ?>
+  </div>
+</div>
+<hr class="toumei" />
+<div class="row">
+  <div class="gadget_header span12"><?php echo __('%friend% List', array('%friend%' => $op_term['friend'])) ?></div>
+</div>
+<hr class="toumei" />
+<div class="row" id="memberFriendList">
+</div>
+ 
diff --git a/lib/request/opWebRequest.class.php b/lib/request/opWebRequest.class.php
index aabb1bd27..fd41a3d52 100644
--- a/lib/request/opWebRequest.class.php
+++ b/lib/request/opWebRequest.class.php
@@ -415,4 +415,16 @@ public function redirectToSoftBankGateway()
 
     sfContext::getInstance()->getController()->redirect($url);
   }
+
+  public function isSmartphone()
+  {
+    $userAgent = $this->getHttpHeader('User-Agent');
+
+    if (!$userAgent)
+    {
+      return false;
+    }
+
+    return preg_match('/iPhone/', $userAgent) || preg_match('/iPad/', $userAgent) || preg_match('/Android/', $userAgent);
+  }
 }

From 56e601baefed9354aabd4ff03ba7cfaadfbef3a0 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 12 Jan 2012 18:11:50 +0900
Subject: [PATCH 034/630] add ability to configure gadget for smartphone (refs
 #2227)

---
 .../community/actions/actions.class.php       |   6 +-
 .../community/actions/components.class.php    |  31 ++++++
 .../templates/_smtCommunityListBox.php        |  74 ++++++++++++++
 .../_smtCommunityMemberJoinListBox.php        |  22 ++++
 .../community/templates/smtHomeSuccess.php    |  79 +-------------
 .../default/actions/components.class.php      |   5 +
 .../default/templates/_smtLoginFormBox.php    |  65 ++++++++++++
 .../modules/member/actions/actions.class.php  |  11 ++
 .../member/actions/components.class.php       |  37 +++++++
 .../templates/_smtMemberFriendListBox.php     |  28 +++++
 .../_smtMemberJoinCommunityListBox.php        |  27 +++++
 .../member/templates/_smtProfileListBox.php   |  53 ++++++++++
 .../member/templates/smtHomeSuccess.php       |  94 ++---------------
 .../member/templates/smtLoginSuccess.php      |  37 ++-----
 .../member/templates/smtProfileSuccess.php    |  96 ++----------------
 data/fixtures/005_import_gadgets.yml          |  32 ++++++
 lib/config/config/gadget_config.yml           |  24 +++++
 .../config/smartphone_community_gadget.yml    |  36 +++++++
 lib/config/config/smartphone_gadget.yml       |  20 ++++
 lib/config/config/smartphone_login_gadget.yml |  28 +++++
 .../config/smartphone_profile_gadget.yml      |  43 ++++++++
 web/css/gadgetPlot.css                        |   8 ++
 web/css/smt_main.css                          |  13 +++
 web/images/ajax-loader.gif                    | Bin 0 -> 1849 bytes
 24 files changed, 587 insertions(+), 282 deletions(-)
 create mode 100644 apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php
 create mode 100644 apps/pc_frontend/modules/community/templates/_smtCommunityMemberJoinListBox.php
 create mode 100644 apps/pc_frontend/modules/default/templates/_smtLoginFormBox.php
 create mode 100644 apps/pc_frontend/modules/member/templates/_smtMemberFriendListBox.php
 create mode 100644 apps/pc_frontend/modules/member/templates/_smtMemberJoinCommunityListBox.php
 create mode 100644 apps/pc_frontend/modules/member/templates/_smtProfileListBox.php
 create mode 100644 lib/config/config/smartphone_community_gadget.yml
 create mode 100644 lib/config/config/smartphone_gadget.yml
 create mode 100644 lib/config/config/smartphone_login_gadget.yml
 create mode 100644 lib/config/config/smartphone_profile_gadget.yml
 create mode 100644 web/images/ajax-loader.gif

diff --git a/apps/pc_frontend/modules/community/actions/actions.class.php b/apps/pc_frontend/modules/community/actions/actions.class.php
index db954609f..f0930ac45 100644
--- a/apps/pc_frontend/modules/community/actions/actions.class.php
+++ b/apps/pc_frontend/modules/community/actions/actions.class.php
@@ -36,11 +36,13 @@ public function executeHome($request)
   */
   public function executeSmtHome(opWebRequest $request)
   {
-    $result = parent::executeHome($request);
+    $gadgets = Doctrine::getTable('Gadget')->retrieveGadgetsByTypesName('smartphoneCommunity');
+    $this->contentsGadgets = $gadgets['smartphoneCommunityContents'];
 
+    $this->community = Doctrine::getTable('Community')->find($this->id);
     $this->getResponse()->setDisplayCommunity($this->community);
 
-    return $result;
+    return sfView::SUCCESS;
   }
 
  /**
diff --git a/apps/pc_frontend/modules/community/actions/components.class.php b/apps/pc_frontend/modules/community/actions/components.class.php
index 0e798c864..1f48fbd88 100644
--- a/apps/pc_frontend/modules/community/actions/components.class.php
+++ b/apps/pc_frontend/modules/community/actions/components.class.php
@@ -25,4 +25,35 @@ public function executeJoinListBox($request)
     $this->crownIds = Doctrine::getTable('CommunityMember')->getCommunityIdsOfAdminByMemberId($this->member->getId());
     $this->communities = Doctrine::getTable('Community')->retrievesByMemberId($this->member->getId(), $this->row * $this->col, true);
   }
+
+  public function executeSmtCommunityListBox($request)
+  {
+    $this->id = $request->getParameter('id');
+
+    $memberId = $this->getUser()->getMemberId();
+    $communityMember = Doctrine::getTable('CommunityMember')->retrieveByMemberIdAndCommunityId($memberId, $this->id);
+
+    if ($communityMember)
+    {
+      $this->isCommunityMember = !$communityMember->getIsPre();
+      $this->isCommunityPreMember = $communityMember->getIsPre();
+
+      $positions = Doctrine::getTable('CommunityMemberPosition')->getPositionsByMemberIdAndCommunityId($memberId, $this->id);
+      $this->isAdmin = in_array('admin', $positions);
+      $this->isSubAdmin = in_array('sub_admin', $positions);
+      $this->isEditCommunity = $this->isAdmin || $this->isSubAdmin;
+    }
+    else
+    {
+      $this->isCommunityMember = false;
+      $this->isCommunityPreMember = false;
+      $this->isAdmin = false;
+      $this->isSubAdmin = false;
+      $this->isEditCommunity = false;
+    }
+
+    $this->community = Doctrine::getTable('Community')->find($this->id);
+    $this->communityAdmin = $this->community->getAdminMember();
+    $this->communitySubAdmins = $this->community->getSubAdminMembers();
+  }
 }
diff --git a/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php b/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php
new file mode 100644
index 000000000..0cd24f752
--- /dev/null
+++ b/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php
@@ -0,0 +1,74 @@
+<div class="row">
+  <div class="gadget_header span12">コミュニティ情報</div>
+</div>
+<div class="row">
+  <div class="span12">
+    <hr class="toumei" />
+    <?php echo op_image_tag_sf_image($community->getImageFileName(), array('size' => '320x320', 'format' => 'jpg')) ?>
+    <hr class="toumei" />
+    <?php if ($isAdmin) : ?>
+    <?php endif; ?>
+  </div>
+</div>
+<div class="row">
+<table class="zebra-striped">
+<tbody>
+<tr>
+  <td><?php echo __('Date Created') ?></td>
+  <td><?php echo op_format_date($community->getCreatedAt(), 'D') ?></td>
+</tr>
+<tr>
+  <td><?php echo __('Administrator') ?></td>
+  <td><?php echo link_to($communityAdmin->getName(), '@member_profile?id='.$communityAdmin->getId()) ?></td>
+</tr>
+<?php
+$subAdminCaption = array();
+foreach ($communitySubAdmins as $m) 
+{
+  $subAdminCaption[] = link_to($m->getName(), '@member_profile?id='.$m->getId());
+}
+?>
+<?php if (count($subAdminCaption)): ?>
+<tr>
+  <td><?php echo __('Sub Administrator') ?></td>
+  <td><?php echo implode("<br>\n", $subAdminCaption) ?></td>
+</tr>
+<?php endif; ?>
+<?php if ($community->community_category_id): ?>
+<tr>
+  <td><?php echo __('%community% Category', array('%community%' => $op_term['community']->titleize()), 'form_community') ?>:</td>
+  <td><?php echo $community->getCommunityCategory() ?></td>
+</tr>
+<?php endif; ?>
+<tr>
+  <td><?php echo __('Register policy', array('%community%' => $op_term['community']->titleize()), 'form_community') ?>:</td>
+  <td><?php echo __($sf_data->getRaw('community')->getRegisterPolicy()) ?></td>
+</tr>
+<tr>
+  <td><?php echo __('Count of Members'); ?></td>
+  <td><?php echo $community->countCommunityMembers(); ?></td>
+</tr>
+<tr>
+  <td><?php echo __('%community% Description', array('%community%' => $op_term['community']->titleize()), 'form_community') ?></td>
+  <td><?php echo $community->getConfig('description'); ?></td>
+</tr>
+<tr>
+  <td></td>
+  <td>
+  <?php if ($isEditCommunity) : ?>
+  <?php endif; ?>
+  <?php if (!$isAdmin) : ?>
+  <?php if ($isCommunityMember) : ?>
+  <?php echo link_to(__('Leave this %community%', array('%community%' => $op_term['community']->titleize())), '@community_quit?id=' . $community->getId()) ?><br>
+  <?php else : ?>
+  <?php if ($isCommunityPreMember) : ?>
+  <?php echo __('You are waiting for the participation approval by %community%\'s administrator.', array('%community%' => $op_term['community']->titleize())) ?>
+  <?php else: ?>
+  <?php echo link_to(__('Join this %community%', array('%community%' => $op_term['community']->titleize())), '@community_join?id=' . $community->getId()) ?><br>
+  <?php endif; ?>
+  <?php endif; ?>
+  <?php endif; ?>
+  </td></tr>
+</tbody>
+</table>
+</div>
diff --git a/apps/pc_frontend/modules/community/templates/_smtCommunityMemberJoinListBox.php b/apps/pc_frontend/modules/community/templates/_smtCommunityMemberJoinListBox.php
new file mode 100644
index 000000000..3ec922db0
--- /dev/null
+++ b/apps/pc_frontend/modules/community/templates/_smtCommunityMemberJoinListBox.php
@@ -0,0 +1,22 @@
+<?php use_helper('Javascript') ?>
+<script id="communityMemberJoinListTemplate" type="text/x-jquery-tmpl">
+  <div class="span3">
+    <div class="row_memberimg row"><div class="span3 center"><a href="${profile_url}"><img src="${profile_image}" class="rad10" width="57" height="57"></a></div></div>
+    <div class="row_membername font10 row"><div class="span3 center"><a href="${profile_url}">${name}</a> (${friends_count})</div></div>
+  </div>
+</script>
+<script type="text/javascript">
+$(function(){
+  $.getJSON( openpne.apiBase + 'member/search.json?target=community&target_id=<?php echo $community->getId() ?>&apiKey=' + openpne.apiKey, function(json) {
+    $('#communityMemberJoinListTemplate').tmpl(json.data).appendTo('#communityMemberJoinList');
+  });
+});
+</script>
+
+<hr class="toumei" />
+<div class="row">
+  <div class="gadget_header span12"><?php echo __('%community% Members', array('%community%' => $op_term['community'])) ?></div>
+</div>
+<hr class="toumei" />
+<div class="row" id="communityMemberJoinList">
+</div>
diff --git a/apps/pc_frontend/modules/community/templates/smtHomeSuccess.php b/apps/pc_frontend/modules/community/templates/smtHomeSuccess.php
index 6b16cf9ed..bf4865b2d 100644
--- a/apps/pc_frontend/modules/community/templates/smtHomeSuccess.php
+++ b/apps/pc_frontend/modules/community/templates/smtHomeSuccess.php
@@ -1,76 +1,7 @@
-<div class="row">
-  <div class="gadget_header span12">コミュニティ情報</div>
-</div>
-<div class="row">
-  <div class="span12">
-    <hr class="toumei" />
-    <?php echo op_image_tag_sf_image($community->getImageFileName(), array('size' => '320x320', 'format' => 'jpg')) ?>
-    <hr class="toumei" />
-    <?php if ($isAdmin) : ?>
-    <?php echo link_to(__('Edit Photo'), 'community/configImage?id='.$community->getId()) ?>
-    <?php endif; ?>
-  </div>
-</div>
-<div class="row">
-<table class="zebra-striped">
-<tbody>
-<tr>
-  <td><?php echo __('Date Created') ?></td>
-  <td><?php echo op_format_date($community->getCreatedAt(), 'D') ?></td>
-</tr>
-<tr>
-  <td><?php echo __('Administrator') ?></td>
-  <td><?php echo link_to($communityAdmin->getName(), '@member_profile?id='.$communityAdmin->getId()) ?></td>
-</tr>
-<?php
-$subAdminCaption = array();
-foreach ($communitySubAdmins as $m) 
-{
-  $subAdminCaption[] = link_to($m->getName(), '@member_profile?id='.$m->getId());
-}
-?>
-<?php if (count($subAdminCaption)): ?>
-<tr>
-  <td><?php echo __('Sub Administrator') ?></td>
-  <td><?php echo implode("<br>\n", $subAdminCaption) ?></td>
-</tr>
+<?php if (isset($contentsGadgets)): ?>
+<?php foreach ($contentsGadgets as $gadget): ?>
+<?php if ($gadget->isEnabled()): ?>
+<?php include_component($gadget->getComponentModule(), $gadget->getComponentAction(), array('gadget' => $gadget)); ?>
 <?php endif; ?>
-<?php if ($community->community_category_id): ?>
-<tr>
-  <td><?php echo __('%community% Category', array('%community%' => $op_term['community']->titleize()), 'form_community') ?>:</td>
-  <td><?php echo $community->getCommunityCategory() ?></td>
-</tr>
+<?php endforeach; ?>
 <?php endif; ?>
-<tr>
-  <td><?php echo __('Register policy', array('%community%' => $op_term['community']->titleize()), 'form_community') ?>:</td>
-  <td><?php echo __($sf_data->getRaw('community')->getRegisterPolicy()) ?></td>
-</tr>
-<tr>
-  <td><?php echo __('Count of Members'); ?></td>
-  <td><?php echo $community->countCommunityMembers(); ?></td>
-</tr>
-<tr>
-  <td><?php echo __('%community% Description', array('%community%' => $op_term['community']->titleize()), 'form_community') ?></td>
-  <td><?php echo $community->getConfig('description'); ?></td>
-</tr>
-<tr>
-  <td></td>
-  <td>
-  <?php if ($isEditCommunity) : ?>
-  <?php echo link_to(__('Edit this %community%', array('%community%' => $op_term['community']->titleize())), '@community_edit?id=' . $community->getId()) ?><br>
-  <?php endif; ?>
-  <?php if (!$isAdmin) : ?>
-  <?php if ($isCommunityMember) : ?>
-  <?php echo link_to(__('Quit this %community%', array('%community%' => $op_term['community']->titleize())), '@community_quit?id=' . $community->getId()) ?><br>
-  <?php else : ?>
-  <?php if ($isCommunityPreMember) : ?>
-  <?php echo __('You are waiting for the participation approval by %community%\'s administrator.', array('%community%' => $op_term['community']->titleize())) ?>
-  <?php else: ?>
-  <?php echo link_to(__('Join this %community%', array('%community%' => $op_term['community']->titleize())), '@community_join?id=' . $community->getId()) ?><br>
-  <?php endif; ?>
-  <?php endif; ?>
-  <?php endif; ?>
-  </td></tr>
-</tbody>
-</table>
-</div>
diff --git a/apps/pc_frontend/modules/default/actions/components.class.php b/apps/pc_frontend/modules/default/actions/components.class.php
index ad7904649..43d1f580c 100644
--- a/apps/pc_frontend/modules/default/actions/components.class.php
+++ b/apps/pc_frontend/modules/default/actions/components.class.php
@@ -89,6 +89,11 @@ public function executeLoginFormBox()
     $this->forms = $this->getUser()->getAuthForms();
   }
 
+  public function executeSmtLoginFormBox()
+  {
+    $this->forms = $this->getUser()->getAuthForms();
+  }
+
   public function executeSideBanner()
   {
   }
diff --git a/apps/pc_frontend/modules/default/templates/_smtLoginFormBox.php b/apps/pc_frontend/modules/default/templates/_smtLoginFormBox.php
new file mode 100644
index 000000000..c029cb0bb
--- /dev/null
+++ b/apps/pc_frontend/modules/default/templates/_smtLoginFormBox.php
@@ -0,0 +1,65 @@
+<?php foreach ($forms as $form) : ?>
+
+<?php echo form_tag(url_for(sprintf('@login'.'?%s=%s', opAuthForm::AUTH_MODE_FIELD_NAME, $form->getAuthMode()))) ?>
+
+<?php $errors = array(); ?>
+<?php if ($form->hasGlobalErrors()): ?>
+<?php $errors[] = $form->renderGlobalErrors(); ?>
+<?php endif; ?>
+<?php if ($errors): ?>
+<div class="row">
+<div class="alert-message block-message error">
+<a class="close" href="#">x</a>
+<?php foreach ($errors as $error): ?>
+<p><?php echo __($error) ?></p>
+<?php endforeach; ?>
+</div>
+</div>
+<?php endif; ?>
+
+<div class="row">
+<?php foreach ($form as $field): ?>
+<?php if (!$field->isHidden()): ?>
+<?php if ('checkbox' === $field->getWidget()->getOption('type')): ?>
+  <hr class="toumei">
+  <div class="span9">
+  <?php echo $field->renderLabel(); ?>
+  </div>
+  <div class="span3 <?php echo $field->hasError() ? 'clearfix error' : '' ?>">
+    <?php if ($field->hasError()): ?>
+    <span class="label important"><?php echo __($field->getError()); ?>
+    <?php endif; ?>
+    <?php echo $field->render(); ?>
+    <span class="help-block"><?php echo $field->renderHelp(); ?></span>
+  </div>
+
+  <hr class="toumei">
+  <hr class="toumei">
+<?php else: ?>
+  <div class="span12">
+  <?php echo $field->renderLabel(); ?>
+  </div>
+  <div class="span12 <?php echo $field->hasError() ? 'clearfix error' : '' ?>">
+    <?php if ($field->hasError()): ?>
+    <span class="label important"><?php echo __($field->getError()) ?></span>
+    <?php endif ?>
+    <?php if (in_array($field->getWidget()->getOption('type'), array('text', 'password'))): ?>
+    <?php echo $field->render(array('class' => 'span12')); ?>
+    <?php else: ?>
+    <?php echo $field->render(); ?>
+    <?php endif; ?>
+    <span class="help-block"><?php echo $field->renderHelp(); ?></span>
+  </div>
+<?php endif; ?>
+<?php endif; ?>
+<?php endforeach; ?>
+</div>
+
+<div class="row">
+<div class="span12">
+<input type="submit" name="submit" value="<?php echo __('Login'); ?>" class="btn primary span12" />
+<?php echo $form->renderHiddenFields(); ?>
+</form>
+</div>
+
+<?php endforeach; ?>
diff --git a/apps/pc_frontend/modules/member/actions/actions.class.php b/apps/pc_frontend/modules/member/actions/actions.class.php
index 22e37cfe6..793704f7d 100644
--- a/apps/pc_frontend/modules/member/actions/actions.class.php
+++ b/apps/pc_frontend/modules/member/actions/actions.class.php
@@ -56,6 +56,11 @@ public function executeHome($request)
   */
   public function executeSmtHome(opWebRequest $request)
   {
+    $this->gadgetConfig = sfConfig::get('op_smartphone_gadget_list');
+
+    $gadgets = Doctrine::getTable('Gadget')->retrieveGadgetsByTypesName('smartphone');
+    $this->contentsGadgets = $gadgets['smartphoneContents'];
+
     return sfView::SUCCESS;
   }
 
@@ -73,6 +78,9 @@ public function executeLogin($request)
 
     if ($request->isSmartphone())
     {
+      $gadgets = Doctrine::getTable('Gadget')->retrieveGadgetsByTypesName('smartphoneLogin');
+      $this->contentsGadgets = $gadgets['smartphoneLoginContents'];
+
       $this->setLayout('smtLayoutSns');
       $this->setTemplate('smtLogin');    
     }
@@ -140,6 +148,9 @@ public function executeProfile($request)
   */
   public function executeSmtProfile(opWebRequest $request)
   {
+    $gadgets = Doctrine::getTable('Gadget')->retrieveGadgetsByTypesName('smartphoneProfile');
+    $this->contentsGadgets = $gadgets['smartphoneProfileContents'];
+
     $result = parent::executeProfile($request);
 
     $this->getResponse()->setDisplayMember($this->member);
diff --git a/apps/pc_frontend/modules/member/actions/components.class.php b/apps/pc_frontend/modules/member/actions/components.class.php
index efb28a78c..4d83dc03f 100644
--- a/apps/pc_frontend/modules/member/actions/components.class.php
+++ b/apps/pc_frontend/modules/member/actions/components.class.php
@@ -21,4 +21,41 @@ public function executeProfileListBox($request)
       $this->member = $this->getUser()->getMember();
     }
   }
+
+  public function executeSmtProfileListBox($request)
+  {
+    if ($request->hasParameter('id'))
+    {
+      $this->member = Doctrine::getTable('Member')->find($request->getParameter('id'));
+    }
+    else
+    {
+      $this->member = $this->getUser()->getMember();
+    }
+  }
+
+  public function executeSmtMemberFriendListBox($request)
+  {
+    if ($request->hasParameter('id') && 'profile'!=sfContext::getInstance()->getActionName())
+    {
+      $this->member = Doctrine::getTable('Member')->find($request->getParameter('id'));
+    }
+    else
+    {
+      $this->member = $this->getUser()->getMember();
+    }
+  }
+
+  public function executeSmtMemberJoinCommunityListBox($request)
+  {
+    if ($request->hasParameter('id') && 'profile'!=sfContext::getInstance()->getActionName())
+    {
+      $this->member = Doctrine::getTable('Member')->find($request->getParameter('id'));
+    }
+    else
+    {
+      $this->member = $this->getUser()->getMember();
+    }
+  }
+
 }
diff --git a/apps/pc_frontend/modules/member/templates/_smtMemberFriendListBox.php b/apps/pc_frontend/modules/member/templates/_smtMemberFriendListBox.php
new file mode 100644
index 000000000..50cd01c19
--- /dev/null
+++ b/apps/pc_frontend/modules/member/templates/_smtMemberFriendListBox.php
@@ -0,0 +1,28 @@
+<?php use_helper('Javascript') ?>
+<script id="friendListTemplate" type="text/x-jquery-tmpl">
+  <div class="span3">
+    <div class="row_memberimg row"><div class="span3 center"><a href="${profile_url}"><img src="${profile_image}" class="rad10" width="57" height="57" /></a></div></div>
+    <div class="row_membername font10 row"><div class="span3 center"><a href="${profile_url}">${name}</a> (${friends_count})</div></div>
+  </div>
+</script>
+<script type="text/javascript">
+$(function(){
+  $.getJSON( openpne.apiBase + 'member/search.json?target=friend&target_id=<?php echo $member->getId() ?>&apiKey=' + openpne.apiKey, function(json) {
+    $('#friendListTemplate').tmpl(json.data).appendTo('#memberFriendList');
+    $('#memberFriendList').show();
+    $('#memberFriendListLoading').hide();
+  });
+});
+</script>
+
+<hr class="toumei" />
+<div class="row">
+  <div class="gadget_header span12"><?php echo __('%friend% List', array('%friend%' => $op_term['friend'])) ?></div>
+</div>
+<hr class="toumei" />
+<div class="row" id="memberFriendList">
+</div> 
+<div class="row" id="memberFriendListLoading" style="margin-left: 0; text-align: center;">
+<?php echo op_image_tag('ajax-loader.gif') ?>
+</div>
+
diff --git a/apps/pc_frontend/modules/member/templates/_smtMemberJoinCommunityListBox.php b/apps/pc_frontend/modules/member/templates/_smtMemberJoinCommunityListBox.php
new file mode 100644
index 000000000..a682de2d0
--- /dev/null
+++ b/apps/pc_frontend/modules/member/templates/_smtMemberJoinCommunityListBox.php
@@ -0,0 +1,27 @@
+<?php use_helper('Javascript') ?>
+<script id="joinCommunityListTemplate" type="text/x-jquery-tmpl">
+  <div class="span3">
+    <div class="row_memberimg row"><div class="span3 center"><a href="${community_url}"><img src="${community_image_url}" class="rad10" width="57" height="57"></a></div></div>
+    <div class="row_membername font10 row"><div class="span3 center"><a href="${community_url}">${name}</a> (${member_count})</div></div>
+  </div>
+</script>
+<script type="text/javascript">
+$(function(){
+  $.getJSON( openpne.apiBase + 'member/community.json?member_id=<?php echo $member->getId() ?>&apiKey=' + openpne.apiKey, function(json) {
+    $('#joinCommunityListTemplate').tmpl(json.data).appendTo('#memberJoinCommunityList');
+    $('#memberJoinCommunityList').show();
+    $('#memberJoinCommunityListLoading').hide();
+  });
+});
+</script>
+
+<hr class="toumei" />
+<div class="row">
+  <div class="gadget_header span12"><?php echo __('%community% List', array('%community%' => $op_term['community'])) ?></div>
+</div>
+<hr class="toumei" />
+<div class="row hide" id="memberJoinCommunityList">
+</div>
+<div class="row" id="memberJoinCommunityListLoading" style="margin-left: 0; text-align: center;">
+<?php echo op_image_tag('ajax-loader.gif') ?>
+</div>
diff --git a/apps/pc_frontend/modules/member/templates/_smtProfileListBox.php b/apps/pc_frontend/modules/member/templates/_smtProfileListBox.php
new file mode 100644
index 000000000..514374417
--- /dev/null
+++ b/apps/pc_frontend/modules/member/templates/_smtProfileListBox.php
@@ -0,0 +1,53 @@
+<?php use_helper('Javascript') ?>
+<?php
+op_include_parts('descriptionBox', 'smtProfileTop', array());
+foreach ($member->getProfiles(true) as $profile)
+{
+  $caption = $profile->getProfile()->getCaption();
+  if ($profile->getProfile()->isPreset())
+  {
+    $presetConfig = $profile->getProfile()->getPresetConfig();
+    $caption = __($presetConfig['Caption']);
+  }
+
+  $profileValue = (string)$profile;
+  if ('' === $profileValue)
+  {
+    continue;
+  }
+
+  if ($profile->getFormType() === 'textarea')
+  {
+    $profileValue = op_auto_link_text(nl2br($profileValue));
+  }
+
+  if ($profile->getProfile()->isPreset())
+  {
+    if ($profile->getFormType() === 'country_select')
+    {
+      $profileValue = $culture->getCountry($profileValue);
+    }
+    elseif ('op_preset_birthday' === $profile->getName())
+    {
+      $profileValue = op_format_date($profileValue, 'XShortDateJa');
+    }
+
+    $profileValue = __($profileValue);
+  }
+
+  $list[$caption] = $profileValue;
+}
+?>
+<div class="row">
+  <div class="gadget_header span12"><?php echo __('Profile') ?></div>
+</div>
+<div class="row">
+<table class="zebra-striped">
+<tbody>
+<tr><td><?php echo $op_term['nickname'] ?></td><td><?php echo $member->getName(); ?></td></tr>
+<?php foreach ($list as $k => $v): ?>
+<tr><td><?php echo __($k); ?></td><td><?php echo $v; ?></td></tr>
+<?php endforeach; ?>
+</tbody>
+</table>
+</div>
diff --git a/apps/pc_frontend/modules/member/templates/smtHomeSuccess.php b/apps/pc_frontend/modules/member/templates/smtHomeSuccess.php
index 7e4950718..bf4865b2d 100644
--- a/apps/pc_frontend/modules/member/templates/smtHomeSuccess.php
+++ b/apps/pc_frontend/modules/member/templates/smtHomeSuccess.php
@@ -1,87 +1,7 @@
-<?php use_helper('Javascript') ?>
-
-<?php op_include_parts('descriptionBox', 'smtHomeBox', $options); ?>
-
-<?php echo javascript_tag('
-function storeSort(obj)
-{
-  var result = "";
-  Element.childElements(obj.parentNode).each(function(child, index){
-    if (child.id && child.id.match(/_[0-9]+$/)) {
-      if (result) {
-        result = result + ",";
-      }
-      result = result + child.id;
-    }
-  });
-  var path = "'.($sf_request->getRelativeUrlRoot() ? $sf_request->getRelativeUrlRoot() : '/').'";
-  var expires = new Date();
-  expires.setTime((new Date()).getTime() + (10 * 12 * 30 * 24 * 60 * 60 * 1000));
-  var pos = obj.parentNode.id;
-
-  opCookie.set("HomeGadget_" + pos + "_sort", result, expires, path);
-}
-
-function foldObj(obj, display)
-{
-  Element.childElements(obj.parentNode).each(function(child, index){
-    if (!child.hasClassName("partsHeading")) {
-      if (display == null) {
-        child.toggle();
-      } else {
-        if (display == "true") {
-          child.show();
-        } else {
-          child.hide();
-        }
-      }
-
-      var size = Element.childElements(obj.parentNode).length;
-      if (size == index + 1) {  // It is a last loop maybe
-        var path = "'.($sf_request->getRelativeUrlRoot() ? $sf_request->getRelativeUrlRoot() : '/').'";
-        var id = child.parentNode.parentNode.id;
-        var expires = new Date();
-        expires.setTime((new Date()).getTime() + (10 * 12 * 30 * 24 * 60 * 60 * 1000));
-        opCookie.set("HomeGadget_" + id + "_toggle", child.visible(), expires, path);
-      }
-    }
-  });
-}
-
-$$(".partsHeading").each(function(obj){
-  // folding
-  Event.observe(obj, "dblclick", function(e){
-    foldObj(obj);
-  });
-  var id = obj.parentNode.parentNode.id;
-  var display = opCookie.get("HomeGadget_"+id+"_toggle");
-  if (display != null) {
-    foldObj(obj, display);
-  }
-
-});
-
-["Top", "Left", "Center"].each(function(type){
-  var sortInfo = opCookie.get("HomeGadget_" + type + "_sort");
-  if (sortInfo)
-  {
-    var obj = document.getElementById(type);
-    var preGadget = null;
-    sortInfo.split(",").each(function(value){
-      var gadget = document.getElementById(value);
-      if (preGadget)
-      {
-        Element.remove(gadget);
-        Insertion.After(preGadget, gadget);
-      }
-      else
-      {
-        Element.remove(gadget);
-        Insertion.Top(obj, gadget);
-      }
-      preGadget = gadget;
-    });
-  }
-});
-
-') ?>
+<?php if (isset($contentsGadgets)): ?>
+<?php foreach ($contentsGadgets as $gadget): ?>
+<?php if ($gadget->isEnabled()): ?>
+<?php include_component($gadget->getComponentModule(), $gadget->getComponentAction(), array('gadget' => $gadget)); ?>
+<?php endif; ?>
+<?php endforeach; ?>
+<?php endif; ?>
diff --git a/apps/pc_frontend/modules/member/templates/smtLoginSuccess.php b/apps/pc_frontend/modules/member/templates/smtLoginSuccess.php
index c4a821cbe..bf4865b2d 100644
--- a/apps/pc_frontend/modules/member/templates/smtLoginSuccess.php
+++ b/apps/pc_frontend/modules/member/templates/smtLoginSuccess.php
@@ -1,30 +1,7 @@
-<form action="<?php echo url_for('member/login?authMode=MailAddress') ?>" method="post">
-
-<div class="row">
-<div class="span12">メールアドレス</div>
-</div>
-
-<div class="row">
-<input type="text" name="authMailAddress[mail_address]" id="authMailAddress_mail_address" class="span12" value="" />
-</div>
-
-<div class="row">
-<div class="span12">パスワード</div>
-</div>
-
-<div class="row">
-<input type="password" name="authMailAddress[password]" id="authMailAddress_password" class="span12" value="" />
-</div>
-
-<div class="row">
-<div class="span8">次回から自動的にログイン</div>
-<div class="span4"><input type="checkbox" name="authMailAddress[is_remember_me]" id="authMailAddress_is_remember_me" />
-<input value="member/home" type="hidden" name="authMailAddress[next_uri]" id="authMailAddress_next_uri" /></div>
-</div>
-
-<div class="row">
-<div class="span4"></div><div class="span8"><input type="submit" class="input_submit btn primary" value="ログイン" /></div>
-</div>
-
-</form>
-
+<?php if (isset($contentsGadgets)): ?>
+<?php foreach ($contentsGadgets as $gadget): ?>
+<?php if ($gadget->isEnabled()): ?>
+<?php include_component($gadget->getComponentModule(), $gadget->getComponentAction(), array('gadget' => $gadget)); ?>
+<?php endif; ?>
+<?php endforeach; ?>
+<?php endif; ?>
diff --git a/apps/pc_frontend/modules/member/templates/smtProfileSuccess.php b/apps/pc_frontend/modules/member/templates/smtProfileSuccess.php
index e2f61693d..92a0e4b5a 100644
--- a/apps/pc_frontend/modules/member/templates/smtProfileSuccess.php
+++ b/apps/pc_frontend/modules/member/templates/smtProfileSuccess.php
@@ -1,26 +1,8 @@
-<?php use_helper('Javascript') ?>
-<script type="text/javascript" src="http://code.jquery.com/jquery-latest.min.js"></script>
-<script type="text/javascript" src="http://ajax.microsoft.com/ajax/jquery.templates/beta1/jquery.tmpl.js"></script>
-<script id="friendListTemplate" type="text/x-jquery-tmpl">
-  <div class="span3">
-    <div class="row_memberimg row"><a href="${member.profile_url}"><img src="${member.image}" class="rad10" width="57" height="57"></a></div>
-    <div class="row_membername font10 row"><a href="${member.profile_url}">${member.name}</a> (${member.count})</div>
-  </div>
-</script>
-<script type="text/javascript">
-$(function(){
-  $.getJSON( '<?php echo app_url_for('api', 'member/friendList.json', array('id' => $member->getId())); ?>&apiKey=' + openpne.apiKey, function(json) {
-    $('#friendListTemplate').tmpl(json.data).appendTo('#memberFriendList');
-  });
-});
-</script>
 <?php if ($relation->isSelf()): ?>
 <?php ob_start() ?>
 <div class="alert-message block-message info">
 <p><?php echo __('Other members look your page like this.') ?></p>
-<p><?php echo __('If you teach your page to other members, please use following URL.') ?><br />
-<?php echo url_for('@member_profile?id='.$member->getId(), true) ?></p>
-<p><?php echo __('If you edit this page, please visit %1%.', array('%1%' => link_to(__('Edit profile'), '@member_editProfile'))) ?></p>
+<p><?php echo link_to(__('Edit profile'), '@member_editProfile') ?></p>
 </div>
 <?php $content = ob_get_clean() ?>
 <?php op_include_parts('descriptionBox', 'informationAboutThisIsYourProfilePage', array('body' => $content)) ?>
@@ -37,74 +19,10 @@
 <?php endif; ?>
 <?php endif; ?>
 
-<?php
-op_include_parts('descriptionBox', 'smtProfileTop', array());
-foreach ($member->getProfiles(true) as $profile)
-{
-  $caption = $profile->getProfile()->getCaption();
-  if ($profile->getProfile()->isPreset())
-  {
-    $presetConfig = $profile->getProfile()->getPresetConfig();
-    $caption = __($presetConfig['Caption']);
-  }
-
-  $profileValue = (string)$profile;
-  if ('' === $profileValue)
-  {
-    continue;
-  }
-
-  if ($profile->getFormType() === 'textarea')
-  {
-    $profileValue = op_auto_link_text(nl2br($profileValue));
-  }
-
-  if ($profile->getProfile()->isPreset())
-  {
-    if ($profile->getFormType() === 'country_select')
-    {
-      $profileValue = $culture->getCountry($profileValue);
-    }
-    elseif ('op_preset_birthday' === $profile->getName())
-    {
-      $profileValue = op_format_date($profileValue, 'XShortDateJa');
-    }
-
-    $profileValue = __($profileValue);
-  }
-
-  $list[$caption] = $profileValue;
-}
-?>
-<div class="row">
-  <div class="gadget_header span12"><?php echo __('Profile') ?></div>
-</div>
-<div class="row">
-<table class="zebra-striped">
-<tbody>
-<tr><td><?php echo $op_term['nickname'] ?></td><td><?php echo $member->getName(); ?></td></tr>
-<?php foreach ($list as $k => $v): ?>
-<tr><td><?php echo __($k); ?></td><td><?php echo $v; ?></td></tr>
+<?php if (isset($contentsGadgets)): ?>
+<?php foreach ($contentsGadgets as $gadget): ?>
+<?php if ($gadget->isEnabled()): ?>
+<?php include_component($gadget->getComponentModule(), $gadget->getComponentAction(), array('gadget' => $gadget)); ?>
+<?php endif; ?>
 <?php endforeach; ?>
-</tbody>
-</table>
-</div>
-
-<div class="row">
-  <div class="gadget_header span12"><?php echo __('Photo') ?></div>
-</div>
-<hr class="toumei" />
-<div class="row">
-  <div class="span12">
-    <hr class="toumei" />
-    <?php echo op_image_tag_sf_image($member->getImageFileName(), array('size' => '320x320')) ?>
-  </div>
-</div>
-<hr class="toumei" />
-<div class="row">
-  <div class="gadget_header span12"><?php echo __('%friend% List', array('%friend%' => $op_term['friend'])) ?></div>
-</div>
-<hr class="toumei" />
-<div class="row" id="memberFriendList">
-</div>
- 
+<?php endif; ?>
diff --git a/data/fixtures/005_import_gadgets.yml b/data/fixtures/005_import_gadgets.yml
index 556c943d2..f3c1ed9f0 100644
--- a/data/fixtures/005_import_gadgets.yml
+++ b/data/fixtures/005_import_gadgets.yml
@@ -98,3 +98,35 @@ Gadget:
     type: "mobileProfileBottom"
     name: "communityJoinListBox"
     sort_order: 20
+
+  smartphone_profile_gadget_profile:
+    type: "smartphoneProfileContents"
+    name: "profileListBox"
+    sort_order: 10
+
+  smartphone_profile_member_list:
+    type: "smartphoneProfileContents"
+    name: "memberFriendListBox"
+    sort_order: 100
+
+  smartphone_profile_join_community_list:
+    type: "smartphoneProfileContents"
+    name: "memberJoinCommunityListBox"
+    sort_order: 110
+
+  smartphone_community_gadget_community:
+    type: "smartphoneCommunityContents"
+    name: "communityListBox"
+    sort_order: 10
+
+  smartphone_community_gadget_join_member_list:
+    type: "smartphoneCommunityContents"
+    name: "communityMemberJoinListBox"
+    sort_order: 100
+
+  smartphone_login_gadget_login_form_box:
+    type: "smartphoneLoginContents"
+    name: "loginForm"
+    sort_order: 10
+
+
diff --git a/lib/config/config/gadget_config.yml b/lib/config/config/gadget_config.yml
index f4a75ebb3..d6608c315 100644
--- a/lib/config/config/gadget_config.yml
+++ b/lib/config/config/gadget_config.yml
@@ -55,6 +55,30 @@ mobileFooter:
     default: layoutD
   plot_action: [design, mobileFooterGadgetPlot]
 
+smartphone:
+  name: "スマートフォン版ホーム画面"
+  layout:
+    default: layoutD
+  plot_action: [design, smartphoneHomeGadgetPlot]
+
+smartphoneProfile:
+  name: "スマートフォン版プロフィール画面"
+  layout:
+    default: layoutD
+  plot_action: [design, smartphoneProfileGadgetPlot]
+
+smartphoneCommunity:
+  name: "スマートフォン版コミュニティ画面"
+  layout:
+    default: layoutD
+  plot_action: [design, smartphoneCommunityGadgetPlot]
+
+smartphoneLogin:
+  name: "スマートフォン版ログイン画面"
+  layout:
+    default: layoutD
+  plot_action: [design, smartphoneLoginGadgetPlot]
+
 dailyNews:
   name: "デイリーニュース（PCメールアドレス向け）"
   layout:
diff --git a/lib/config/config/smartphone_community_gadget.yml b/lib/config/config/smartphone_community_gadget.yml
new file mode 100644
index 000000000..44b802679
--- /dev/null
+++ b/lib/config/config/smartphone_community_gadget.yml
@@ -0,0 +1,36 @@
+freeArea:
+  caption:
+    ja_JP: "フリーエリア"
+  description:
+    ja_JP: "フリーエリアを設置できます"
+  component: [default, freeAreaBox]
+  viewable_privilege: 4
+  config:
+    title:
+      Name:       "title"
+      Caption:    "タイトル"
+      FormType:   "input"
+      ValueType:  "text"
+      IsRequired: false
+    value:
+      Name:       "value"
+      Caption:    "内容"
+      FormType:   "rich_textarea"
+      ValueType:  "text"
+      IsRequired: false
+
+communityListBox:
+  caption:
+    ja_JP: "コミュニティ"
+  description:
+    ja_JP: "コミュニティ情報のリストを表示します"
+  viewable_privilege: 4
+  component: [community, smtCommunityListBox]
+
+communityMemberJoinListBox:
+  caption:
+    ja_JP: "コミュニティ参加者一覧"
+  description:
+    ja_JP: "コミュニティの参加者一覧を表示します"
+  component: [community, smtCommunityMemberJoinListBox]
+
diff --git a/lib/config/config/smartphone_gadget.yml b/lib/config/config/smartphone_gadget.yml
new file mode 100644
index 000000000..8b3493eac
--- /dev/null
+++ b/lib/config/config/smartphone_gadget.yml
@@ -0,0 +1,20 @@
+freeArea:
+  caption:
+    ja_JP: "フリーエリア"
+  description:
+    ja_JP: "フリーエリアを設置できます"
+  component: [default, freeAreaBox]
+  config:
+    title:
+      Name:       "title"
+      Caption:    "タイトル"
+      FormType:   "input"
+      ValueType:  "text"
+      IsRequired: false
+    value:
+      Name:       "value"
+      Caption:    "内容"
+      FormType:   "rich_textarea"
+      ValueType:  "text"
+      IsRequired: false
+
diff --git a/lib/config/config/smartphone_login_gadget.yml b/lib/config/config/smartphone_login_gadget.yml
new file mode 100644
index 000000000..6bf926c22
--- /dev/null
+++ b/lib/config/config/smartphone_login_gadget.yml
@@ -0,0 +1,28 @@
+loginForm:
+  caption:
+    ja_JP: "ログインフォーム"
+  description:
+    ja_JP: "ログイン用のフォームを設置できます。利用可能なすべての認証モード用のログインフォームがすべて含まれています。"
+  viewable_privilege: 4
+  component: [default, smtLoginFormBox]
+
+freeArea:
+  caption:
+    ja_JP: "フリーエリア"
+  description:
+    ja_JP: "フリーエリアを設置できます"
+  viewable_privilege: 4
+  component: [default, freeAreaBox]
+  config:
+    title:
+      Name:       "title"
+      Caption:    "タイトル"
+      FormType:   "input"
+      ValueType:  "text"
+      IsRequired: false
+    value:
+      Name:       "value"
+      Caption:    "内容"
+      FormType:   "rich_textarea"
+      ValueType:  "text"
+      IsRequired: false
diff --git a/lib/config/config/smartphone_profile_gadget.yml b/lib/config/config/smartphone_profile_gadget.yml
new file mode 100644
index 000000000..6469b2606
--- /dev/null
+++ b/lib/config/config/smartphone_profile_gadget.yml
@@ -0,0 +1,43 @@
+freeArea:
+  caption:
+    ja_JP: "フリーエリア"
+  description:
+    ja_JP: "フリーエリアを設置できます"
+  component: [default, freeAreaBox]
+  viewable_privilege: 4
+  config:
+    title:
+      Name:       "title"
+      Caption:    "タイトル"
+      FormType:   "input"
+      ValueType:  "text"
+      IsRequired: false
+    value:
+      Name:       "value"
+      Caption:    "内容"
+      FormType:   "rich_textarea"
+      ValueType:  "text"
+      IsRequired: false
+
+profileListBox:
+  caption:
+    ja_JP: "プロフィール"
+  description:
+    ja_JP: "プロフィール情報のリストを表示します"
+  viewable_privilege: 4
+  component: [member, smtProfileListBox]
+
+memberFriendListBox:
+  caption:
+    ja_JP: "メンバーフレンド一覧"
+  description:
+    ja_JP: "メンバーのフレンド一覧を表示します"
+  component: [member, smtMemberFriendListBox]
+
+memberJoinCommunityListBox:
+  caption:
+    ja_JP: "メンバーコミュニティ参加者一覧"
+  description:
+    ja_JP: "メンバーが参加しているコミュニティの一覧を表示します"
+  component: [member, smtMemberJoinCommunityListBox]
+
diff --git a/web/css/gadgetPlot.css b/web/css/gadgetPlot.css
index a9ade1acc..9632b45b2 100644
--- a/web/css/gadgetPlot.css
+++ b/web/css/gadgetPlot.css
@@ -99,6 +99,10 @@ body
 #plotMobileProfileBottom div,
 #plotMobileHeaderContents div,
 #plotMobileFooterContents div,
+#plotSmartphoneContents div,
+#plotSmartphoneProfileContents div,
+#plotSmartphoneCommunityContents div,
+#plotSmartphoneLoginContents div,
 #plotDailyNewsContents div,
 #plotMobileDailyNewsContents div
 {
@@ -132,6 +136,10 @@ body
 #plotMobileLoginContents div.emptyGadget,
 #plotMobileHeaderContents div.emptyGadget,
 #plotMobileFooterContents div.emptyGadget,
+#plotSmartphoneContents div.emptyGadget,
+#plotSmartphoneProfileContents div.emptyGadget,
+#plotSmartphoneCommunityContents div.emptyGadget,
+#plotSmartphoneLoginContents div.emptyGadget,
 #plotDailyNewsContents div.emptyGadget,
 #plotMobileDailyNewsContents div.emptyGadget
 {
diff --git a/web/css/smt_main.css b/web/css/smt_main.css
index 5b2289b0e..a1c48b79b 100644
--- a/web/css/smt_main.css
+++ b/web/css/smt_main.css
@@ -123,6 +123,19 @@ hr.toumei {
   word-break: break-all;
 }
 
+.partsHeading h3 {
+  height: 20px;
+  background: #333;
+  color: #fff;
+  text-align: center;
+
+  width: 320px;
+
+  line-height: normal;
+  font-weight: normal;
+  font-size: inherit;
+}
+
 /*----------------------------------------------
  * Override bootstrap.css rules
  *--------------------------------------------*/
diff --git a/web/images/ajax-loader.gif b/web/images/ajax-loader.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5b33f7e54f4e55b6b8774d86d96895db9af044b4
GIT binary patch
literal 1849
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
EAHN$8j{pDw

literal 0
HcmV?d00001


From c9a7318e8b96fb9ec45327f2ee149dae94d295c1 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 12 Jan 2012 15:36:53 +0900
Subject: [PATCH 035/630] add global navigation for smartphone (refs #2227)

---
 apps/pc_backend/i18n/messages.ja.xml          |   4 +
 .../modules/navigation/templates/_submenu.php |   1 +
 .../default/actions/components.class.php      |   7 ++
 .../modules/default/templates/_smtMenu.php    |  24 +++++
 apps/pc_frontend/templates/_tosaka.php        |  19 +++-
 apps/pc_frontend/templates/smtLayoutGroup.php |  19 ++++
 apps/pc_frontend/templates/smtLayoutHome.php  |  19 ++++
 .../pc_frontend/templates/smtLayoutMember.php |  19 ++++
 apps/pc_frontend/templates/smtLayoutSns.php   |  18 ++++
 .../012_import_smartphone_navi_menu.yml       |  60 ++++++++++++
 lib/model/doctrine/NavigationTable.class.php  |   5 +
 web/css/smt_main.css                          |  88 +++++++++++++-----
 web/images/SEPALATOR.png                      | Bin 0 -> 42684 bytes
 web/images/UPARROW.png                        | Bin 0 -> 42449 bytes
 web/js/smt_menu.js                            |   5 +
 web/js/smt_tosaka.js                          |  15 +++
 16 files changed, 281 insertions(+), 22 deletions(-)
 create mode 100644 apps/pc_frontend/modules/default/templates/_smtMenu.php
 create mode 100644 data/fixtures/012_import_smartphone_navi_menu.yml
 create mode 100644 web/images/SEPALATOR.png
 create mode 100644 web/images/UPARROW.png
 create mode 100644 web/js/smt_menu.js
 create mode 100644 web/js/smt_tosaka.js

diff --git a/apps/pc_backend/i18n/messages.ja.xml b/apps/pc_backend/i18n/messages.ja.xml
index f36bb24df..e2bbc1532 100644
--- a/apps/pc_backend/i18n/messages.ja.xml
+++ b/apps/pc_backend/i18n/messages.ja.xml
@@ -1197,6 +1197,10 @@
         <source>PC frontend</source>
         <target>ナビ設定</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>PC frontend (Smartphone)</source>
+        <target>スマートフォン版ナビ設定</target>
+      </trans-unit>
       <trans-unit id="">
         <source>Mobile frontend</source>
         <target>携帯版ナビ設定</target>
diff --git a/apps/pc_backend/modules/navigation/templates/_submenu.php b/apps/pc_backend/modules/navigation/templates/_submenu.php
index 4df980c37..8ce00688f 100644
--- a/apps/pc_backend/modules/navigation/templates/_submenu.php
+++ b/apps/pc_backend/modules/navigation/templates/_submenu.php
@@ -1,3 +1,4 @@
 <li><?php echo link_to(__('PC frontend'), 'navigation/list') ?></li>
+<li><?php echo link_to(__('PC frontend (Smartphone)'), 'navigation/list?app=smartphone') ?></li>
 <li><?php echo link_to(__('Mobile frontend'), 'navigation/list?app=mobile') ?></li>
 <li><?php echo link_to(__('Administration'), 'navigation/list?app=backend') ?></li>
diff --git a/apps/pc_frontend/modules/default/actions/components.class.php b/apps/pc_frontend/modules/default/actions/components.class.php
index 43d1f580c..e7586f38b 100644
--- a/apps/pc_frontend/modules/default/actions/components.class.php
+++ b/apps/pc_frontend/modules/default/actions/components.class.php
@@ -39,6 +39,13 @@ public function executeLocalNav()
     }
   }
 
+  public function executeSmtMenu()
+  {
+    $type = opToolkit::isSecurePage() ? 'smartphone_default' : 'smartphone_insecure';
+
+    $this->navs = Doctrine::getTable('Navigation')->retrieveByType($type);
+  }
+
   public function executeSideBannerGadgets()
   {
     $gadgets = Doctrine::getTable('Gadget')->retrieveGadgetsByTypesName('sideBanner');
diff --git a/apps/pc_frontend/modules/default/templates/_smtMenu.php b/apps/pc_frontend/modules/default/templates/_smtMenu.php
new file mode 100644
index 000000000..d18134429
--- /dev/null
+++ b/apps/pc_frontend/modules/default/templates/_smtMenu.php
@@ -0,0 +1,24 @@
+<!-- MENUFORM TMPL -->
+<div class="menuform hide toggle1">
+  <div class="row">
+    <div class="span10 offset1 center white font14 toggle1_close">
+      MENU
+    </div>
+    <div class="span1">
+      <?php echo op_image_tag('UPARROW', array('class' => 'toggle1_close')) ?>
+    </div>
+  </div>
+
+  <div class="menu-middle row">
+    <div class="span11 offset1">
+      <?php if ($navs): ?>
+      <?php foreach ($navs as $nav): ?>
+      <?php if (op_is_accessible_url($nav->uri)): ?>
+      <?php echo link_to($nav->caption, $nav->uri, array('class' => 'btn', 'id' => sprintf('smtMenu_%1', op_url_to_id($nav->uri, true)))) ?>
+      <?php endif ?>
+      <?php endforeach ?>
+      <?php endif ?>
+    </div>
+  </div>
+</div>
+<!-- MENUFORM TMPL -->
diff --git a/apps/pc_frontend/templates/_tosaka.php b/apps/pc_frontend/templates/_tosaka.php
index 24b5580e0..8d6e89efa 100644
--- a/apps/pc_frontend/templates/_tosaka.php
+++ b/apps/pc_frontend/templates/_tosaka.php
@@ -1,8 +1,25 @@
+<!-- NCFORM TMPL -->
+<div class="ncform hide toggle1">
+  <div class="row">
+    <div class="span10 offset1 center white font14 toggle1_close">
+      通知センター
+    </div>
+    <div class="span1">
+      <?php echo op_image_tag('UPARROW', array('class' => 'toggle1_close')) ?>
+    </div>
+  </div>
+  <div class="row">
+  </div>
+</div>
+<!-- NCFORM TMPL -->
+
+<?php include_component('default', 'smtMenu') ?>
+
 <div id="slot_tosaka">
   <div class="row">
     <div class="span12">
       <div class="row">
-        <div class="span4"><?php echo link_to(op_image_tag('LOGO.png', array('height' => '32', 'class' => 'menubutton')), '@homepage') ?></div>
+        <div class="span4"><?php echo op_image_tag('LOGO.png', array('height' => '32', 'class' => 'menubutton')); ?></div>
         <div class="span4 center"><?php echo op_image_tag('NOTIFY_CENTER.png', array('height' => '32', 'class' => 'ncbutton')) ?></div>
         <div class="span3 offset1 center"><?php echo op_image_tag('POST.png', array('height' => '32', 'class' =>'postbutton')) ?></div>
       </div>
diff --git a/apps/pc_frontend/templates/smtLayoutGroup.php b/apps/pc_frontend/templates/smtLayoutGroup.php
index cc682f973..b346c1d78 100644
--- a/apps/pc_frontend/templates/smtLayoutGroup.php
+++ b/apps/pc_frontend/templates/smtLayoutGroup.php
@@ -26,6 +26,8 @@
 ?>
 <?php use_javascript('jquery.min.js') ?>
 <?php use_javascript('jquery.tmpl.min.js') ?>
+<?php use_javascript('smt_tosaka') ?>
+<?php use_javascript('smt_menu') ?>
 <?php include_javascripts() ?>
 </head>
 <body id="<?php printf('page_%s_%s', $this->getModuleName(), $this->getActionName()) ?>" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
@@ -42,6 +44,23 @@
   <div class="span2 center"><?php echo link_to(op_image_tag('HomeIcon.png', array('height' => '48')), '@homepage') ?></div>
   <?php endif ?>
 </div>
+
+<?php if ($sf_user->hasFlash('error')): ?>
+<div id="global-error" class="row">
+  <div class="alert-message block-message error">
+    <?php echo __($sf_user->getFlash('error')); ?>
+  </div>
+</div>
+<?php endif; ?>
+
+<?php if ($sf_user->hasFlash('notice')): ?>
+<div id="global-error" class="row">
+  <div class="alert-message block-message info">
+    <?php echo __($sf_user->getFlash('notice')); ?>
+  </div>
+</div>
+<?php endif; ?>
+
 <?php echo $sf_content ?>
 </body>
 </html>
diff --git a/apps/pc_frontend/templates/smtLayoutHome.php b/apps/pc_frontend/templates/smtLayoutHome.php
index 02650c1dc..066af0934 100644
--- a/apps/pc_frontend/templates/smtLayoutHome.php
+++ b/apps/pc_frontend/templates/smtLayoutHome.php
@@ -26,6 +26,8 @@
 ?>
 <?php use_javascript('jquery.min.js') ?>
 <?php use_javascript('jquery.tmpl.min.js') ?>
+<?php use_javascript('smt_tosaka') ?>
+<?php use_javascript('smt_menu') ?>
 <?php include_javascripts() ?>
 </head>
 <body id="<?php printf('page_%s_%s', $this->getModuleName(), $this->getActionName()) ?>" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
@@ -45,6 +47,23 @@
   </div>
   <div class="span2 center"><?php echo link_to(op_image_tag('HomeIcon.png', array('height' => '48')), '@homepage') ?></div>
 </div>
+
+<?php if ($sf_user->hasFlash('error')): ?>
+<div id="global-error" class="row">
+  <div class="alert-message block-message error">
+    <?php echo __($sf_user->getFlash('error')); ?>
+  </div>
+</div>
+<?php endif; ?>
+
+<?php if ($sf_user->hasFlash('notice')): ?>
+<div id="global-error" class="row">
+  <div class="alert-message block-message info">
+    <?php echo __($sf_user->getFlash('notice')); ?>
+  </div>
+</div>
+<?php endif; ?>
+
 <?php echo $sf_content ?>
 </body>
 </html>
diff --git a/apps/pc_frontend/templates/smtLayoutMember.php b/apps/pc_frontend/templates/smtLayoutMember.php
index 358fd5d05..dd990059b 100644
--- a/apps/pc_frontend/templates/smtLayoutMember.php
+++ b/apps/pc_frontend/templates/smtLayoutMember.php
@@ -26,6 +26,8 @@
 ?>
 <?php use_javascript('jquery.min.js') ?>
 <?php use_javascript('jquery.tmpl.min.js') ?>
+<?php use_javascript('smt_tosaka') ?>
+<?php use_javascript('smt_menu') ?>
 <?php include_javascripts() ?>
 </head>
 <body id="<?php printf('page_%s_%s', $this->getModuleName(), $this->getActionName()) ?>" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
@@ -48,6 +50,23 @@
   <div class="span2 center"><?php echo link_to(op_image_tag('HomeIcon.png', array('height' => '48')), '@homepage') ?></div>
   <?php endif ?>
 </div>
+
+<?php if ($sf_user->hasFlash('error')): ?>
+<div id="global-error" class="row">
+  <div class="alert-message block-message error">
+    <?php echo __($sf_user->getFlash('error')); ?>
+  </div>
+</div>
+<?php endif; ?>
+
+<?php if ($sf_user->hasFlash('notice')): ?>
+<div id="global-error" class="row">
+  <div class="alert-message block-message info">
+    <?php echo __($sf_user->getFlash('notice')); ?>
+  </div>
+</div>
+<?php endif; ?>
+
 <?php echo $sf_content ?>
 </body>
 </html>
diff --git a/apps/pc_frontend/templates/smtLayoutSns.php b/apps/pc_frontend/templates/smtLayoutSns.php
index f621959b8..6c3a35b3f 100644
--- a/apps/pc_frontend/templates/smtLayoutSns.php
+++ b/apps/pc_frontend/templates/smtLayoutSns.php
@@ -26,6 +26,8 @@
 ?>
 <?php use_javascript('jquery.min.js') ?>
 <?php use_javascript('jquery.tmpl.min.js') ?>
+<?php use_javascript('smt_tosaka') ?>
+<?php use_javascript('smt_menu') ?>
 <?php include_javascripts() ?>
 </head>
 <body id="<?php printf('page_%s_%s', $this->getModuleName(), $this->getActionName()) ?>" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
@@ -50,6 +52,22 @@
 </div>
 <?php endif ?>
 
+<?php if ($sf_user->hasFlash('error')): ?>
+<div id="global-error" class="row">
+  <div class="alert-message block-message error">
+    <?php echo __($sf_user->getFlash('error')); ?>
+  </div>
+</div>
+<?php endif; ?>
+
+<?php if ($sf_user->hasFlash('notice')): ?>
+<div id="global-error" class="row">
+  <div class="alert-message block-message info">
+    <?php echo __($sf_user->getFlash('notice')); ?>
+  </div>
+</div>
+<?php endif; ?>
+
 <?php echo $sf_content ?>
 </body>
 </html>
diff --git a/data/fixtures/012_import_smartphone_navi_menu.yml b/data/fixtures/012_import_smartphone_navi_menu.yml
new file mode 100644
index 000000000..79663fa87
--- /dev/null
+++ b/data/fixtures/012_import_smartphone_navi_menu.yml
@@ -0,0 +1,60 @@
+Navigation:
+  smartphone_default_navigation_home:
+    type: "smartphone_default"
+    uri: "@homepage"
+    sort_order: 0
+    Translation:
+      ja_JP:
+        caption: "マイホーム"
+      en:
+        caption: "My Home"
+
+  smartphone_default_navigation_profile_confirm:
+    type: "smartphone_default"
+    uri: "@member_profile_mine"
+    sort_order: 10
+    Translation:
+      ja_JP:
+        caption: "プロフィール確認"
+      en:
+        caption: "Profile"
+
+  smartphone_default_navigation_profile_edit:
+    type: "smartphone_default"
+    uri: "@member_editProfile"
+    sort_order: 20
+    Translation:
+      ja_JP:
+        caption: "プロフィール編集"
+      en:
+        caption: "Edit Profile"
+
+  smartphone_default_navigation_community_all:
+    type: "smartphone_default"
+    uri: "@community_home?id=1"
+    sort_order: 30
+    Translation:
+      ja_JP:
+        caption: "allコミュニティ"
+      en:
+        caption: "all Community"
+
+  smartphone_default_navigation_config:
+    type: "smartphone_default"
+    uri: "@member_config"
+    sort_order: 40
+    Translation:
+      ja_JP:
+        caption: "設定変更"
+      en:
+        caption: "Settings"
+
+  smartphone_default_navigation_logout:
+    type: "smartphone_default"
+    uri: "@member_logout"
+    sort_order: 50
+    Translation:
+      ja_JP:
+        caption: "ログアウト"
+      en:
+        caption: "Logout"
diff --git a/lib/model/doctrine/NavigationTable.class.php b/lib/model/doctrine/NavigationTable.class.php
index 5dbbb1e8c..1c376bdb5 100644
--- a/lib/model/doctrine/NavigationTable.class.php
+++ b/lib/model/doctrine/NavigationTable.class.php
@@ -32,6 +32,11 @@ public function getTypesByAppName($appName)
           'mobile_friend',
           'mobile_community',
         );
+      case 'smartphone' :
+        return array(
+          'smartphone_insecure',
+          'smartphone_default',
+        );
       case 'backend' :
         return array(
           'backend_side'
diff --git a/web/css/smt_main.css b/web/css/smt_main.css
index a1c48b79b..426ccff39 100644
--- a/web/css/smt_main.css
+++ b/web/css/smt_main.css
@@ -1,10 +1,10 @@
-#face .row {
-  padding: 0 0 0 6px;
+#slot_face .row {
+  padding: 0 0 0 4px;
 }
-#face a {
+#slot_face a {
   font-size: 14px;
 }
-#face {
+#slot_face > .row {
   height: 52px;
   background: #eee;
   padding: 4px 0 0 0;
@@ -14,12 +14,28 @@
   margin: 4px 0;
 }
 
-#tosaka {
-  height: 44px;
+.ncform, .menuform {
   background: #555;
-  padding-top: 8px;
 }
-#tosaka div {
+.white{
+  color:#fff;
+}
+
+.ncform, .menuform {
+  padding-top: 4px;
+  padding-bottom: 8px;
+  border-bottom: 6px solid #909090;
+}
+
+.tosaka_margin, .right_margin, .left_margin, .center_margin {
+  background: #555;
+}
+
+#slot_tosaka .span12 {
+  height: 34px;
+  background: #555;
+}
+#slot_tosaka div {
   height: 100%;
 }
 
@@ -36,11 +52,10 @@
 }
 
 .gadget_header {
+  height: 20px;
   background: #333;
   color: #fff;
   text-align: center;
-  padding: 9px 0;
-  font-size: 16px;
 }
 
 body {
@@ -52,6 +67,23 @@ hr.toumei {
   height: 4px;
   border-color: transparent;
 }
+hr.toumei2 {
+  margin: 0;
+  height: 2px;
+  border-color: transparent;
+}
+hr.toumei100 {
+  margin: 0;
+  height: 100px;
+  border-color: transparent;
+}
+hr.white2 {
+  margin: 0;
+  height: 2px;
+  border-bottom: 0;
+  background: #fff;
+  opacity: 0.5;
+}
 
 .menu-margin {
   background: #555;
@@ -66,6 +98,9 @@ hr.toumei {
   border-radius: 10px 10px 0 0;
 }
 .menu-middle {
+  margin-top: 4px;
+}
+.menu-middle > div {
   color: #fff;
   background: #555;
 }
@@ -96,20 +131,21 @@ hr.toumei {
   border-radius: 10px;
 }
 
+.font11 {
+  font-size: 11px;
+  line-height: 13px;
+}
 .font10 {
   font-size: 10px;
-}
-.font12 {
-  font-size: 12px;
+  line-height: 12px;
 }
 .font14 {
   font-size: 14px;
+  line-height: 16px;
 }
-.font16 {
-  font-size: 16px;
-}
-.font18 {
-  font-size: 18px;
+.font20 {
+  font-size: 20px;
+  line-height: 24px;
 }
 
 .row_memberimg {
@@ -117,6 +153,7 @@ hr.toumei {
 }
 .row_membername {
   height: 30px;
+  line-height: 12px;
 }
 
 * {
@@ -130,10 +167,19 @@ hr.toumei {
   text-align: center;
 
   width: 320px;
+}
+
+.row_profile * {
+  text-align: left;
+}
+
+.timeline * {
+  text-align: left;
+}
 
-  line-height: normal;
-  font-weight: normal;
-  font-size: inherit;
+.comment * {
+  background: #ddd;
+  text-align: left;
 }
 
 /*----------------------------------------------
diff --git a/web/images/SEPALATOR.png b/web/images/SEPALATOR.png
new file mode 100644
index 0000000000000000000000000000000000000000..7eb04a8f70b60fe9ee077cde9fbdd3224a35b461
GIT binary patch
literal 42684
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

literal 0
HcmV?d00001

diff --git a/web/images/UPARROW.png b/web/images/UPARROW.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f6d768c29fda75806557553fa6d0a66bbc0fa77
GIT binary patch
literal 42449
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
U==VdvhMrtBx^gb}jN^m<1Lw?<K>z>%

literal 0
HcmV?d00001

diff --git a/web/js/smt_menu.js b/web/js/smt_menu.js
new file mode 100644
index 000000000..1ae487410
--- /dev/null
+++ b/web/js/smt_menu.js
@@ -0,0 +1,5 @@
+$(document).ready(function(){
+  $("#menubutton").click(function(){
+    $(".menuform.template").toggle();
+  });
+});
diff --git a/web/js/smt_tosaka.js b/web/js/smt_tosaka.js
new file mode 100644
index 000000000..5cf24cf51
--- /dev/null
+++ b/web/js/smt_tosaka.js
@@ -0,0 +1,15 @@
+$(document).ready(function(){
+  $(".ncbutton").click(function(){
+    $(".toggle1:not(.ncform)").hide();
+    $(".ncform").toggle();
+  });
+
+  $(".menubutton").click(function(){
+    $(".toggle1:not(.menuform)").hide();
+    $(".menuform").toggle();
+  });
+
+  $(".toggle1_close").click(function(){
+    $(".toggle1").hide();
+  });
+});

From a998d6bea5cf9e23fdbd14110e3c839be46b4208 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 16 Feb 2012 19:36:40 +0900
Subject: [PATCH 036/630] add postform into tosaka (refs #2227)

---
 apps/pc_frontend/templates/_tosaka.php | 19 +++++++++++++++++++
 web/css/smt_main.css                   | 20 +++++++++++++++++++-
 web/js/smt_tosaka.js                   | 25 +++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/apps/pc_frontend/templates/_tosaka.php b/apps/pc_frontend/templates/_tosaka.php
index 8d6e89efa..dce4f2683 100644
--- a/apps/pc_frontend/templates/_tosaka.php
+++ b/apps/pc_frontend/templates/_tosaka.php
@@ -15,6 +15,25 @@
 
 <?php include_component('default', 'smtMenu') ?>
 
+<!-- POSTFORM TMPL -->
+<div class="postform hide toggle1">
+  <div class="row">
+    <div class="span10 offset1 center white font14 toggle1_close">
+      投稿フォーム
+    </div>
+    <div class="span1">
+      <?php echo op_image_tag('UPARROW', array('class' => 'toggle1_close')) ?>
+    </div>
+  </div>
+  <div class="row posttextarea">
+    <textarea id="tosaka_postform_body" class="span12" rows="4"></textarea>
+  </div>
+  <div class="row">
+    <button id="tosaka_postform_submit" class="span10 offset1 btn small primary">POST</button>
+  </div>
+</div>
+<!-- POSTFORM TMPL -->
+
 <div id="slot_tosaka">
   <div class="row">
     <div class="span12">
diff --git a/web/css/smt_main.css b/web/css/smt_main.css
index 426ccff39..378cd46b0 100644
--- a/web/css/smt_main.css
+++ b/web/css/smt_main.css
@@ -14,7 +14,7 @@
   margin: 4px 0;
 }
 
-.ncform, .menuform {
+.postform, .ncform, .menuform {
   background: #555;
 }
 .white{
@@ -27,6 +27,24 @@
   border-bottom: 6px solid #909090;
 }
 
+.postface {
+  height: 52px;
+  background: #eee;
+  padding: 4px 0 0 0;
+}
+
+.postform {
+  padding-top: 4px;
+  padding-bottom: 52px;
+  border-bottom: 6px solid #909090;
+}
+.postform .posttextarea {
+  margin: 4px 0;
+}
+.postform .posttextarea textarea {
+  margin: 0;
+}
+
 .tosaka_margin, .right_margin, .left_margin, .center_margin {
   background: #555;
 }
diff --git a/web/js/smt_tosaka.js b/web/js/smt_tosaka.js
index 5cf24cf51..ef5709556 100644
--- a/web/js/smt_tosaka.js
+++ b/web/js/smt_tosaka.js
@@ -9,7 +9,32 @@ $(document).ready(function(){
     $(".menuform").toggle();
   });
 
+  $(".postbutton").click(function(){
+    $(".toggle1:not(.postform)").hide();
+    $(".postform").toggle();
+    if($(".postform").is(":visible")){
+      $(".posttextarea").focus();
+    }
+  });
+
   $(".toggle1_close").click(function(){
     $(".toggle1").hide();
   });
+
+  $('#tosaka_postform_submit').click(function() {
+    var body_elem = $('#tosaka_postform_body');
+    var body_text = body_elem.val();
+    if (body_text == '') return;
+
+    var params = {
+      apiKey: openpne.apiKey,
+      body: body_text
+    };
+
+    $.getJSON(openpne.apiBase + 'activity/post.json', params, function(json) {
+      if (json.status == 'success') {
+        body_elem.val('');
+      }
+    });
+  });
 });

From 0cc0b7f6779535af5c15731dc55d3e22ddd82e2a Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 9 Feb 2012 19:41:08 +0900
Subject: [PATCH 037/630] introduce notification center (refs #2227)

---
 apps/pc_frontend/templates/_tosaka.php        | 43 +++++++++-
 apps/pc_frontend/templates/smtLayoutGroup.php |  1 +
 apps/pc_frontend/templates/smtLayoutHome.php  |  1 +
 .../pc_frontend/templates/smtLayoutMember.php |  1 +
 apps/pc_frontend/templates/smtLayoutSns.php   |  1 +
 .../doctrine/MemberRelationship.class.php     |  9 ++
 web/css/smt_main.css                          | 48 +++++++++++
 web/js/smt_notify.js                          | 86 +++++++++++++++++++
 web/js/smt_tosaka.js                          | 25 ++++++
 9 files changed, 213 insertions(+), 2 deletions(-)
 create mode 100644 web/js/smt_notify.js

diff --git a/apps/pc_frontend/templates/_tosaka.php b/apps/pc_frontend/templates/_tosaka.php
index dce4f2683..0c700c478 100644
--- a/apps/pc_frontend/templates/_tosaka.php
+++ b/apps/pc_frontend/templates/_tosaka.php
@@ -8,11 +8,49 @@
       <?php echo op_image_tag('UPARROW', array('class' => 'toggle1_close')) ?>
     </div>
   </div>
-  <div class="row">
+  <div id="pushList" class="hide">
   </div>
+  <div id="pushLoading" class="center"><?php echo op_image_tag('ajax-loader.gif') ?></div>
 </div>
 <!-- NCFORM TMPL -->
 
+<script id="pushListTemplate" type="text/x-jquery-tmpl">
+    <div class="{{if unread==false}}isread {{/if}}{{if category=="message" || category=="other"}}divlink {{/if}}row push"  data-notify-id="${id}" data-location-url="${url}" data-member-id="${member_id_from}">
+      <div class="span3 push_icon">
+        <img style="margin-left: 5px;" src="${icon_url}" class="rad4" width="48" height="48">
+      </div>
+      <div class="span9 push_content">
+        <div class="row">
+          {{if category=="link" && unread==false}}
+          フレンドリンクが来ました。
+          {{else}}
+          {{html body}}
+          {{/if}}
+        </div>
+        {{if category=="link"}}
+        <div class="row">
+            <button class="span2 btn primary small friend-notify-button friend-accept">YES</button>
+            <button class="span2 btn small friend-notify-button friend-reject">NO</button>
+            <div class="center hide" id="ncfriendloading"><?php echo op_image_tag('ajax-loader.gif') ?></div>
+            <div class="center hide" id="ncfriendresultmessage"></div>
+        </div>
+        {{/if}}
+      </div>
+    </div>
+</script>
+<script id="pushCountTemplate" type="text/x-jquery-tmpl">
+  {{if message!==0}}
+  <span class="nc_icon1 label important" id="nc_count1">${message}</span>
+  {{/if}}
+  {{if link!==0}}
+  <span class="nc_icon2 label important" id="nc_count2">${link}</span>
+  {{/if}}
+  {{if other!==0}}
+  <span class="nc_icon3 label important" id="nc_count3">${other}</span>
+  {{/if}}
+</script>
+
+
 <?php include_component('default', 'smtMenu') ?>
 
 <!-- POSTFORM TMPL -->
@@ -39,7 +77,8 @@
     <div class="span12">
       <div class="row">
         <div class="span4"><?php echo op_image_tag('LOGO.png', array('height' => '32', 'class' => 'menubutton')); ?></div>
-        <div class="span4 center"><?php echo op_image_tag('NOTIFY_CENTER.png', array('height' => '32', 'class' => 'ncbutton')) ?></div>
+        <div id="notification_center" class="span4 center"><?php echo op_image_tag('NOTIFY_CENTER.png', array('height' => '32', 'class' => 'ncbutton')) ?>
+        </div>
         <div class="span3 offset1 center"><?php echo op_image_tag('POST.png', array('height' => '32', 'class' =>'postbutton')) ?></div>
       </div>
     </div>
diff --git a/apps/pc_frontend/templates/smtLayoutGroup.php b/apps/pc_frontend/templates/smtLayoutGroup.php
index b346c1d78..fd955329d 100644
--- a/apps/pc_frontend/templates/smtLayoutGroup.php
+++ b/apps/pc_frontend/templates/smtLayoutGroup.php
@@ -26,6 +26,7 @@
 ?>
 <?php use_javascript('jquery.min.js') ?>
 <?php use_javascript('jquery.tmpl.min.js') ?>
+<?php use_javascript('smt_notify') ?>
 <?php use_javascript('smt_tosaka') ?>
 <?php use_javascript('smt_menu') ?>
 <?php include_javascripts() ?>
diff --git a/apps/pc_frontend/templates/smtLayoutHome.php b/apps/pc_frontend/templates/smtLayoutHome.php
index 066af0934..e9574e5f1 100644
--- a/apps/pc_frontend/templates/smtLayoutHome.php
+++ b/apps/pc_frontend/templates/smtLayoutHome.php
@@ -26,6 +26,7 @@
 ?>
 <?php use_javascript('jquery.min.js') ?>
 <?php use_javascript('jquery.tmpl.min.js') ?>
+<?php use_javascript('smt_notify') ?>
 <?php use_javascript('smt_tosaka') ?>
 <?php use_javascript('smt_menu') ?>
 <?php include_javascripts() ?>
diff --git a/apps/pc_frontend/templates/smtLayoutMember.php b/apps/pc_frontend/templates/smtLayoutMember.php
index dd990059b..c6add4a2c 100644
--- a/apps/pc_frontend/templates/smtLayoutMember.php
+++ b/apps/pc_frontend/templates/smtLayoutMember.php
@@ -26,6 +26,7 @@
 ?>
 <?php use_javascript('jquery.min.js') ?>
 <?php use_javascript('jquery.tmpl.min.js') ?>
+<?php use_javascript('smt_notify') ?>
 <?php use_javascript('smt_tosaka') ?>
 <?php use_javascript('smt_menu') ?>
 <?php include_javascripts() ?>
diff --git a/apps/pc_frontend/templates/smtLayoutSns.php b/apps/pc_frontend/templates/smtLayoutSns.php
index 6c3a35b3f..0e36b1c35 100644
--- a/apps/pc_frontend/templates/smtLayoutSns.php
+++ b/apps/pc_frontend/templates/smtLayoutSns.php
@@ -26,6 +26,7 @@
 ?>
 <?php use_javascript('jquery.min.js') ?>
 <?php use_javascript('jquery.tmpl.min.js') ?>
+<?php use_javascript('smt_notify') ?>
 <?php use_javascript('smt_tosaka') ?>
 <?php use_javascript('smt_menu') ?>
 <?php include_javascripts() ?>
diff --git a/lib/model/doctrine/MemberRelationship.class.php b/lib/model/doctrine/MemberRelationship.class.php
index 6ffc07d01..1100f2793 100644
--- a/lib/model/doctrine/MemberRelationship.class.php
+++ b/lib/model/doctrine/MemberRelationship.class.php
@@ -20,6 +20,15 @@ public function preSave($event)
     }
   }
 
+  public function postSave($event)
+  {
+    if ($this->isFriendPreFrom())
+    {
+      // FIXME : Help! finx my centence in English!
+      opNotificationCenter::notify($this->getMemberRelatedByMemberIdFrom(), $this->getMember(), 'Do you accept friend request?', array('category' => 'link',));
+    }
+  }
+
   public function isFriend()
   {
     return (bool)$this->getIsFriend();
diff --git a/web/css/smt_main.css b/web/css/smt_main.css
index 378cd46b0..8536dd076 100644
--- a/web/css/smt_main.css
+++ b/web/css/smt_main.css
@@ -45,6 +45,49 @@
   margin: 0;
 }
 
+#pushList {
+  background: #ddd;
+}
+#pushList div.push {
+  padding: 4px 0;
+  border-bottom: 1px solid #999;
+}
+#pushList div.push_content {
+  margin-left: -13px;
+}
+
+.isread {
+  background: #FFF;
+}
+
+.hover {
+  border-color: #aaf;
+  cursor: pointer;
+  background-color: #cdf;
+}
+
+#notification_center {
+  position: relative;
+}
+.nc_icon1 {
+  position:absolute;
+  top: 18px;
+  left: 24px;
+  line-height: 10px;
+}
+.nc_icon2 {
+  position:absolute;
+  top: 18px;
+  left: 58px;
+  line-height: 10px;
+}
+.nc_icon3 {
+  position:absolute;
+  top: 18px;
+  left: 90px;
+  line-height: 10px;
+}
+
 .tosaka_margin, .right_margin, .left_margin, .center_margin {
   background: #555;
 }
@@ -80,6 +123,11 @@ body {
   width: 320px;
 }
 
+hr.gray {
+  margin: 0;
+  height: 0;
+  border-color: #999;
+}
 hr.toumei {
   margin: 0;
   height: 4px;
diff --git a/web/js/smt_notify.js b/web/js/smt_notify.js
new file mode 100644
index 000000000..e1bca671b
--- /dev/null
+++ b/web/js/smt_notify.js
@@ -0,0 +1,86 @@
+/*******************************************************
+** jQuery notification center functions
+** how to use : $('#element').pushLink();
+**              $('#element').friendLink(buttonElement: '.button', ncfriendloadingElement: '#ncfriendloading', ncfriendresultmessageElement: '#ncfriendresultmessage');
+**              $('#element').friendUnlink(buttonElement: '.button', ncfriendloadingElement: '#ncfriendloading', ncfriendresultmessageElement: '#ncfriendresultmessage');
+** @author    : Shouta Kashiwagi <kashiwagi@tejimaya.com>
+*********************************************************/
+
+(function($){
+	var _followScroll = true;
+	var _readyBound = false;
+
+	$.fn.pushLink = function(settings){
+		return this.each(function(){
+			var linkUrl = $(this).attr('data-location-url');
+			var notifyId = $(this).attr('data-notify-id');
+			$(this).mouseover(function(){
+				$(this).addClass('hover');
+			})
+			.mouseout(function(){
+				$(this).removeClass('hover');
+			})
+			$(this).click(function(){
+				$.getJSON( openpne.apiBase + 'push/read.json' , { 'id': notifyId, 'apiKey': openpne.apiKey }, function(d){});
+				window.location = linkUrl;
+			});
+		});
+	};
+
+	$.fn.friendLink = function(settings){
+		return this.each(function(){
+			$(this).click(function(){
+				$(settings.buttonElement).hide();
+				$(settings.ncfriendloadingElement).show();
+        var pushElement = $(this).parents('.push');
+				var memberId = pushElement.attr('data-member-id');
+				var notifyId = pushElement.attr('data-notify-id');
+				$.getJSON( openpne.apiBase + 'push/read.json' , { 'id': notifyId, 'apiKey': openpne.apiKey }, function(d){});
+				$.ajax({
+					url: openpne.apiBase + 'member/friend_accept.json',
+					type: 'GET',
+					data: 'member_id=' + memberId + '&apiKey=' + openpne.apiKey,
+					dataType: 'json',
+					success: function(data) {
+						if(data.status=='success'){
+							$(settings.ncfriendloadingElement).hide();
+							$(settings.ncfriendresultmessageElement).text('フレンド申請を承認しました。');
+						}else{
+							alert(data.message);
+						}   
+					}
+				});
+			});
+		});
+        };
+
+
+	$.fn.friendUnlink = function(settings){
+		return this.each(function(){
+			$(this).click(function(){
+				$(settings.buttonElement).hide();
+				$(settings.ncfriendloadingElement).show();
+        var pushElement = $(this).parents('.push');
+				var memberId = pushElement.attr('data-member-id');
+				var notifyId = pushElement.attr('data-notify-id');
+				$.getJSON( openpne.apiBase + 'push/read.json' , { 'id': notifyId, 'apiKey': openpne.apiKey }, function(d){});
+				$.ajax({
+					url: openpne.apiBase + 'member/friend_reject.json',
+					type: 'GET',
+					data: 'member_id=' + memberId + '&apiKey=' + openpne.apiKey,
+					dataType: 'json',
+					success: function(data) {
+						if(data.status=='success'){
+							$(settings.ncfriendloadingElement).hide();
+							$(settings.ncfriendresultmessageElement).show();
+							$(settings.ncfriendresultmessageElement).text('フレンド申請を拒否しました。');
+						}else{
+							alert(data.message);
+						}   
+					}
+				});
+			});
+		});
+        };
+
+})(jQuery);
diff --git a/web/js/smt_tosaka.js b/web/js/smt_tosaka.js
index ef5709556..2f2eeb2a6 100644
--- a/web/js/smt_tosaka.js
+++ b/web/js/smt_tosaka.js
@@ -2,6 +2,21 @@ $(document).ready(function(){
   $(".ncbutton").click(function(){
     $(".toggle1:not(.ncform)").hide();
     $(".ncform").toggle();
+    $('#pushLoading').show();
+    $.getJSON( openpne.apiBase + 'push/search.json?apiKey=' + openpne.apiKey, function(json){
+      if(json.status=='success')
+      {
+        $pushHtml = $("#pushListTemplate").tmpl(json.data);
+        $('.divlink', $pushHtml).pushLink();
+	$('.friend-accept', $pushHtml).friendLink({ buttonElement: '.friend-notify-button', ncfriendloadingElement: '#ncfriendloading', ncfriendresultmessageElement: '#ncfriendresultmessage', });
+	$('.friend-reject', $pushHtml).friendUnlink({ buttonElement: '.friend-notify-button', ncfriendloadingElement: '#ncfriendloading', ncfriendresultmessageElement: '#ncfriendresultmessage', })
+        $("#pushList").html($pushHtml);
+      }else{
+        alert(json.message);
+      }
+      $('#pushList').show();
+      $('#pushLoading').hide();
+    });
   });
 
   $(".menubutton").click(function(){
@@ -37,4 +52,14 @@ $(document).ready(function(){
       }
     });
   });
+
+  $.getJSON( openpne.apiBase + 'push/count.json?apiKey=' + openpne.apiKey, function(json){
+    if(json.status=='success')
+    {
+      $pushHtml = $("#pushCountTemplate").tmpl(json.data);
+      $("#notification_center").append($pushHtml);
+    }else{
+      alert(json.message);
+    }
+  });
 });

From 20ca2ad8d4a04364b352b3919a154495f4bfa732 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Fri, 17 Feb 2012 16:27:22 +0900
Subject: [PATCH 038/630] add ability to switch smartphone style (refs #2227)

---
 apps/pc_frontend/i18n/messages.ja.xml         |  8 ++++++++
 apps/pc_frontend/templates/_layout.php        | 12 ++++++++++++
 apps/pc_frontend/templates/smtLayoutGroup.php |  6 ++++++
 apps/pc_frontend/templates/smtLayoutHome.php  |  6 ++++++
 .../pc_frontend/templates/smtLayoutMember.php |  6 ++++++
 apps/pc_frontend/templates/smtLayoutSns.php   |  6 ++++++
 lib/request/opWebRequest.class.php            |  7 ++++++-
 plugins/opSkinBasicPlugin/web/css/main.css    | 19 +++++++++++++++++++
 web/css/smt_main.css                          | 11 +++++++++++
 web/js/smt_main.js                            |  8 ++++++++
 10 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 web/js/smt_main.js

diff --git a/apps/pc_frontend/i18n/messages.ja.xml b/apps/pc_frontend/i18n/messages.ja.xml
index 2d22b39a9..e366baddf 100644
--- a/apps/pc_frontend/i18n/messages.ja.xml
+++ b/apps/pc_frontend/i18n/messages.ja.xml
@@ -1363,6 +1363,14 @@
         <source>Back to %community% top page</source>
         <target>%community% トップに戻る</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>View this page on smartphone style</source>
+        <target>このページをスマートフォン版で表示</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>View this page on regular style</source>
+        <target>このページをPC版で表示</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/apps/pc_frontend/templates/_layout.php b/apps/pc_frontend/templates/_layout.php
index 574da7c66..06bb04b7a 100644
--- a/apps/pc_frontend/templates/_layout.php
+++ b/apps/pc_frontend/templates/_layout.php
@@ -83,6 +83,18 @@
 </div><!-- ContentsContainer -->
 </div><!-- Contents -->
 
+<?php if ($sf_request->isSmartphone(false)): ?>
+<div id="SmtSwitch">
+<a href="javascript:void(0)" id="SmtSwitchLink"><?php echo __('View this page on smartphone style') ?></a>
+<?php echo javascript_tag('
+document.getElementById("SmtSwitchLink").addEventListener("click", function() {
+  opCookie.set("disable_smt", "0");
+  location.reload();
+}, false);
+') ?>
+</div>
+<?php endif ?>
+
 <div id="Footer">
 <div id="FooterContainer">
 <?php include_partial('global/footer') ?>
diff --git a/apps/pc_frontend/templates/smtLayoutGroup.php b/apps/pc_frontend/templates/smtLayoutGroup.php
index fd955329d..c52bbda81 100644
--- a/apps/pc_frontend/templates/smtLayoutGroup.php
+++ b/apps/pc_frontend/templates/smtLayoutGroup.php
@@ -26,6 +26,7 @@
 ?>
 <?php use_javascript('jquery.min.js') ?>
 <?php use_javascript('jquery.tmpl.min.js') ?>
+<?php use_javascript('smt_main') ?>
 <?php use_javascript('smt_notify') ?>
 <?php use_javascript('smt_tosaka') ?>
 <?php use_javascript('smt_menu') ?>
@@ -63,5 +64,10 @@
 <?php endif; ?>
 
 <?php echo $sf_content ?>
+
+<div id="smt-switch" class="row" style="display: none">
+<a class="btn info"><?php echo __('View this page on regular style') ?></a>
+</div>
+
 </body>
 </html>
diff --git a/apps/pc_frontend/templates/smtLayoutHome.php b/apps/pc_frontend/templates/smtLayoutHome.php
index e9574e5f1..fba74c85d 100644
--- a/apps/pc_frontend/templates/smtLayoutHome.php
+++ b/apps/pc_frontend/templates/smtLayoutHome.php
@@ -26,6 +26,7 @@
 ?>
 <?php use_javascript('jquery.min.js') ?>
 <?php use_javascript('jquery.tmpl.min.js') ?>
+<?php use_javascript('smt_main') ?>
 <?php use_javascript('smt_notify') ?>
 <?php use_javascript('smt_tosaka') ?>
 <?php use_javascript('smt_menu') ?>
@@ -66,5 +67,10 @@
 <?php endif; ?>
 
 <?php echo $sf_content ?>
+
+<div id="smt-switch" class="row" style="display: none">
+<a class="btn info"><?php echo __('View this page on regular style') ?></a>
+</div>
+
 </body>
 </html>
diff --git a/apps/pc_frontend/templates/smtLayoutMember.php b/apps/pc_frontend/templates/smtLayoutMember.php
index c6add4a2c..1b44287cb 100644
--- a/apps/pc_frontend/templates/smtLayoutMember.php
+++ b/apps/pc_frontend/templates/smtLayoutMember.php
@@ -26,6 +26,7 @@
 ?>
 <?php use_javascript('jquery.min.js') ?>
 <?php use_javascript('jquery.tmpl.min.js') ?>
+<?php use_javascript('smt_main') ?>
 <?php use_javascript('smt_notify') ?>
 <?php use_javascript('smt_tosaka') ?>
 <?php use_javascript('smt_menu') ?>
@@ -69,5 +70,10 @@
 <?php endif; ?>
 
 <?php echo $sf_content ?>
+
+<div id="smt-switch" class="row" style="display: none">
+<a class="btn info"><?php echo __('View this page on regular style') ?></a>
+</div>
+
 </body>
 </html>
diff --git a/apps/pc_frontend/templates/smtLayoutSns.php b/apps/pc_frontend/templates/smtLayoutSns.php
index 0e36b1c35..0dd91cf9a 100644
--- a/apps/pc_frontend/templates/smtLayoutSns.php
+++ b/apps/pc_frontend/templates/smtLayoutSns.php
@@ -26,6 +26,7 @@
 ?>
 <?php use_javascript('jquery.min.js') ?>
 <?php use_javascript('jquery.tmpl.min.js') ?>
+<?php use_javascript('smt_main') ?>
 <?php use_javascript('smt_notify') ?>
 <?php use_javascript('smt_tosaka') ?>
 <?php use_javascript('smt_menu') ?>
@@ -70,5 +71,10 @@
 <?php endif; ?>
 
 <?php echo $sf_content ?>
+
+<div id="smt-switch" class="row" style="display: none">
+<a class="btn info"><?php echo __('View this page on regular style') ?></a>
+</div>
+
 </body>
 </html>
diff --git a/lib/request/opWebRequest.class.php b/lib/request/opWebRequest.class.php
index fd41a3d52..470b79dfc 100644
--- a/lib/request/opWebRequest.class.php
+++ b/lib/request/opWebRequest.class.php
@@ -416,8 +416,13 @@ public function redirectToSoftBankGateway()
     sfContext::getInstance()->getController()->redirect($url);
   }
 
-  public function isSmartphone()
+  public function isSmartphone($checkCookie = true)
   {
+    if ($checkCookie && '1' === $this->getCookie('disable_smt', false))
+    {
+      return false;
+    }
+
     $userAgent = $this->getHttpHeader('User-Agent');
 
     if (!$userAgent)
diff --git a/plugins/opSkinBasicPlugin/web/css/main.css b/plugins/opSkinBasicPlugin/web/css/main.css
index 41049b6dc..6e36a673c 100644
--- a/plugins/opSkinBasicPlugin/web/css/main.css
+++ b/plugins/opSkinBasicPlugin/web/css/main.css
@@ -1436,6 +1436,25 @@ div.activityBox div.box_list div.box_body ul.operation li {
   margin-left: 0.5em;
 }
 
+/*==============================================================================
+ * API Key
+ *----------------------------------------------------------------------------*/
+
+div.apiKey {
+  padding: 10px;
+  font-weight: bold;
+}
+
+/*==============================================================================
+ * Smartphone Style Switch
+ *----------------------------------------------------------------------------*/
+
+#SmtSwitch {
+  margin: 10px 0;
+  font-size: medium;
+  text-align: center;
+}
+
 /*==============================================================================
  * toolbar of opWidgetFormRichTextareaOpenPNE
  *----------------------------------------------------------------------------*/
diff --git a/web/css/smt_main.css b/web/css/smt_main.css
index 8536dd076..6b4847b03 100644
--- a/web/css/smt_main.css
+++ b/web/css/smt_main.css
@@ -248,6 +248,17 @@ hr.white2 {
   text-align: left;
 }
 
+#smt-switch {
+  border-top: 1px solid #ccc;
+  padding: 8px 0;
+  margin-top: 20px;
+  text-align: center;
+}
+#smt-switch .btn {
+  padding-top: 4px;
+  padding-bottom: 5px;
+}
+
 /*----------------------------------------------
  * Override bootstrap.css rules
  *--------------------------------------------*/
diff --git a/web/js/smt_main.js b/web/js/smt_main.js
new file mode 100644
index 000000000..5c27120fa
--- /dev/null
+++ b/web/js/smt_main.js
@@ -0,0 +1,8 @@
+$(function(){
+  $('#smt-switch')
+    .show()
+    .click(function() {
+      document.cookie = "disable_smt=1";
+      location.reload();
+    });
+});

From 3bd1bac4ed298a212678877491fe242a9908e43b Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 17 Nov 2011 18:41:54 +0900
Subject: [PATCH 039/630] remove sfProtoculousPlugin (refs #2617)

---
 plugins/sfProtoculousPlugin/LICENSE           |    7 -
 plugins/sfProtoculousPlugin/LICENSE.prototype |   16 -
 .../LICENSE.script.aculo.us                   |   20 -
 .../sfProtoculousPlugin/config/settings.yml   |    3 -
 .../lib/helper/JavascriptHelper.php           |  967 ----
 .../web/css/input_auto_complete_tag.css       |   34 -
 plugins/sfProtoculousPlugin/web/js/builder.js |  136 -
 .../sfProtoculousPlugin/web/js/controls.js    |  965 ----
 .../sfProtoculousPlugin/web/js/dragdrop.js    |  975 ----
 plugins/sfProtoculousPlugin/web/js/effects.js | 1130 -----
 plugins/sfProtoculousPlugin/web/js/index.html |    4 -
 .../sfProtoculousPlugin/web/js/prototype.js   | 4320 -----------------
 .../web/js/scriptaculous.js                   |   60 -
 plugins/sfProtoculousPlugin/web/js/slider.js  |  275 --
 plugins/sfProtoculousPlugin/web/js/sound.js   |   55 -
 .../sfProtoculousPlugin/web/js/unittest.js    |  568 ---
 16 files changed, 9535 deletions(-)
 delete mode 100644 plugins/sfProtoculousPlugin/LICENSE
 delete mode 100644 plugins/sfProtoculousPlugin/LICENSE.prototype
 delete mode 100644 plugins/sfProtoculousPlugin/LICENSE.script.aculo.us
 delete mode 100644 plugins/sfProtoculousPlugin/config/settings.yml
 delete mode 100644 plugins/sfProtoculousPlugin/lib/helper/JavascriptHelper.php
 delete mode 100644 plugins/sfProtoculousPlugin/web/css/input_auto_complete_tag.css
 delete mode 100644 plugins/sfProtoculousPlugin/web/js/builder.js
 delete mode 100644 plugins/sfProtoculousPlugin/web/js/controls.js
 delete mode 100644 plugins/sfProtoculousPlugin/web/js/dragdrop.js
 delete mode 100644 plugins/sfProtoculousPlugin/web/js/effects.js
 delete mode 100644 plugins/sfProtoculousPlugin/web/js/index.html
 delete mode 100644 plugins/sfProtoculousPlugin/web/js/prototype.js
 delete mode 100644 plugins/sfProtoculousPlugin/web/js/scriptaculous.js
 delete mode 100644 plugins/sfProtoculousPlugin/web/js/slider.js
 delete mode 100644 plugins/sfProtoculousPlugin/web/js/sound.js
 delete mode 100644 plugins/sfProtoculousPlugin/web/js/unittest.js

diff --git a/plugins/sfProtoculousPlugin/LICENSE b/plugins/sfProtoculousPlugin/LICENSE
deleted file mode 100644
index 28956ad5e..000000000
--- a/plugins/sfProtoculousPlugin/LICENSE
+++ /dev/null
@@ -1,7 +0,0 @@
-Copyright (c) 2004-2006 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/sfProtoculousPlugin/LICENSE.prototype b/plugins/sfProtoculousPlugin/LICENSE.prototype
deleted file mode 100644
index 61e491823..000000000
--- a/plugins/sfProtoculousPlugin/LICENSE.prototype
+++ /dev/null
@@ -1,16 +0,0 @@
-Copyright (c) 2005-2008 Sam Stephenson
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/plugins/sfProtoculousPlugin/LICENSE.script.aculo.us b/plugins/sfProtoculousPlugin/LICENSE.script.aculo.us
deleted file mode 100644
index b5e74b40b..000000000
--- a/plugins/sfProtoculousPlugin/LICENSE.script.aculo.us
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/plugins/sfProtoculousPlugin/config/settings.yml b/plugins/sfProtoculousPlugin/config/settings.yml
deleted file mode 100644
index 4563d78f7..000000000
--- a/plugins/sfProtoculousPlugin/config/settings.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-all:
-  .settings:
-    prototype_web_dir:      /sfProtoculousPlugin  #default 1.6.02 and 1.8 files. Can be changed to compressed files for production.
\ No newline at end of file
diff --git a/plugins/sfProtoculousPlugin/lib/helper/JavascriptHelper.php b/plugins/sfProtoculousPlugin/lib/helper/JavascriptHelper.php
deleted file mode 100644
index 6ee14204f..000000000
--- a/plugins/sfProtoculousPlugin/lib/helper/JavascriptHelper.php
+++ /dev/null
@@ -1,967 +0,0 @@
-<?php
-
-require_once sfConfig::get('sf_symfony_lib_dir').'/helper/JavascriptBaseHelper.php';
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2009 Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) 2004 David Heinemeier Hansson
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * JavascriptHelper.
- *
- * @package    symfony
- * @subpackage helper
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @author     John Christopher <john.christopher@symfony-project.com>
- * @author     David Heinemeier Hansson
- * @author     Fabian Lange <fabian.lange@symfony-project.com>
- * @version    SVN: $Id: JavascriptHelper.php 19310 2009-06-16 12:41:07Z FabianLange $
- */
-
-/*
- * Provides a set of helpers to call remote methods using what has been labelled 
- * AJAX[http://www.adaptivepath.com/publications/essays/archives/000385.php].
- * This means that you can call actions in your controllers without reloading the page,
- * but still update certain parts of it using injections into the DOM.
- * The common use case is having a form that adds a new element to a list without reloading the page.
- *
- * To be able to use the JavaScript helpers, you must include the Prototype JavaScript Framework
- * and for some functions script.aculo.us (which both come with symfony) on your pages.
- * Choose one of these options:
- *
- * * Use <tt><?php echo javascript_include_tag :defaults ?></tt> in the HEAD section of your page (recommended):
- *   The function will return references to the JavaScript files created by the +rails+ command in your
- *   <tt>public/javascripts</tt> directory. Using it is recommended as the browser can then cache the libraries
- *   instead of fetching all the functions anew on every request.
- * * Use <tt><?php echo javascript_include_tag 'prototype' ?></tt>: As above, but will only include the Prototype core library,
- *   which means you are able to use all basic AJAX functionality. For the script.aculo.us-based JavaScript helpers,
- *   like visual effects, autocompletion, drag and drop and so on, you should use the method described above.
- * * Use <tt><?php echo define_javascript_functions ?></tt>: this will copy all the JavaScript support functions within a single
- *   script block.
- *
- * For documentation on +javascript_include_tag+ see ActionView::Helpers::AssetTagHelper.
- *
- * If you're the visual type, there's an AJAX movie[http://www.rubyonrails.com/media/video/rails-ajax.mov] demonstrating
- * the use of form_remote_tag.
- */
-
-  function get_callbacks()
-  {
-    static $callbacks;
-    if (!$callbacks)
-    {
-      $callbacks = array_merge(array(
-        'uninitialized', 'loading', 'loaded', 'interactive', 'complete', 'failure', 'success'
-        ), range(100, 599));
-    }
-
-    return $callbacks;
-  }
-
-  function get_ajax_options()
-  {
-    static $ajax_options;
-    if (!$ajax_options)
-    {
-      $ajax_options = array_merge(array(
-        'before', 'after', 'condition', 'url', 'asynchronous', 'method',
-        'insertion', 'position', 'form', 'with', 'update', 'script'
-        ), get_callbacks());
-    }
-
-    return $ajax_options;
-  }
-
-  /**
-   * Returns an html button to a remote action defined by 'url' (using the
-   * 'url_for()' format) that's called in the background using XMLHttpRequest.
-   *
-   * See link_to_remote() for details.
-   *
-   */
-  function button_to_remote($name, $options = array(), $html_options = array())
-  {
-    return button_to_function($name, remote_function($options), $html_options);
-  }
-
-  /**
-   * Returns a link to a remote action defined by 'url'
-   * (using the 'url_for()' format) that's called in the background using
-   * XMLHttpRequest. The result of that request can then be inserted into a
-   * DOM object whose id can be specified with 'update'.
-   * Usually, the result would be a partial prepared by the controller with
-   * either 'render_partial()'.
-   *
-   * Examples:
-   *  <?php echo link_to_remote('Delete this post'), array(
-   *    'update' => 'posts',
-   *    'url'    => 'destroy?id='.$post.id,
-   *  )) ?>
-   *  <?php echo link_to_remote(image_tag('refresh'), array(
-   *    'update' => 'emails',
-   *    'url'    => '@list_emails',
-   *  )) ?>
-   *
-   * You can also specify a hash for 'update' to allow for
-   * easy redirection of output to an other DOM element if a server-side error occurs:
-   *
-   * Example:
-   *  <?php echo link_to_remote('Delete this post', array(
-   *      'update' => array('success' => 'posts', 'failure' => 'error'),
-   *      'url'    => 'destroy?id='.$post.id,
-   *  )) ?>
-   *
-   * Optionally, you can use the 'position' parameter to influence
-   * how the target DOM element is updated. It must be one of
-   * 'before', 'top', 'bottom', or 'after'.
-   *
-   * By default, these remote requests are processed asynchronous during
-   * which various JavaScript callbacks can be triggered (for progress indicators and
-   * the likes). All callbacks get access to the 'request' object,
-   * which holds the underlying XMLHttpRequest.
-   *
-   * To access the server response, use 'request.responseText', to
-   * find out the HTTP status, use 'request.status'.
-   *
-   * Example:
-   *  <?php echo link_to_remote($word, array(
-   *    'url'      => '@undo?n='.$word_counter,
-   *    'complete' => 'undoRequestCompleted(request)'
-   *  )) ?>
-   *
-   * The callbacks that may be specified are (in order):
-   *
-   * 'loading'                 Called when the remote document is being
-   *                           loaded with data by the browser.
-   * 'loaded'                  Called when the browser has finished loading
-   *                           the remote document.
-   * 'interactive'             Called when the user can interact with the
-   *                           remote document, even though it has not
-   *                           finished loading.
-   * 'success'                 Called when the XMLHttpRequest is completed,
-   *                           and the HTTP status code is in the 2XX range.
-   * 'failure'                 Called when the XMLHttpRequest is completed,
-   *                           and the HTTP status code is not in the 2XX
-   *                           range.
-   * 'complete'                Called when the XMLHttpRequest is complete
-   *                           (fires after success/failure if they are present).,
-   *
-   * You can further refine 'success' and 'failure' by adding additional
-   * callbacks for specific status codes:
-   *
-   * Example:
-   *  <?php echo link_to_remote($word, array(
-   *       'url'     => '@rule',
-   *       '404'     => "alert('Not found...? Wrong URL...?')",
-   *       'failure' => "alert('HTTP Error ' + request.status + '!')",
-   *  )) ?>
-   *
-   * A status code callback overrides the success/failure handlers if present.
-   *
-   * If you for some reason or another need synchronous processing (that'll
-   * block the browser while the request is happening), you can specify
-   * 'type' => 'synchronous'.
-   *
-   * You can customize further browser side call logic by passing
-   * in JavaScript code snippets via some optional parameters. In
-   * their order of use these are:
-   *
-   * 'confirm'             Adds confirmation dialog.
-   * 'condition'           Perform remote request conditionally
-   *                       by this expression. Use this to
-   *                       describe browser-side conditions when
-   *                       request should not be initiated.
-   * 'before'              Called before request is initiated.
-   * 'after'               Called immediately after request was
-   *                       initiated and before 'loading'.
-   * 'submit'              Specifies the DOM element ID that's used
-   *                       as the parent of the form elements. By
-   *                       default this is the current form, but
-   *                       it could just as well be the ID of a
-   *                       table row or any other DOM element.
-   */
-  function link_to_remote($name, $options = array(), $html_options = array())
-  {
-    return link_to_function($name, remote_function($options), $html_options);
-  }
-
-  /**
-   * Periodically calls the specified url ('url') every 'frequency' seconds (default is 10).
-   * Usually used to update a specified div ('update') with the results of the remote call.
-   * The options for specifying the target with 'url' and defining callbacks is the same as 'link_to_remote()'.
-   */
-  function periodically_call_remote($options = array())
-  {
-    $frequency = isset($options['frequency']) ? $options['frequency'] : 10; // every ten seconds by default
-    $code = 'new PeriodicalExecuter(function() {'.remote_function($options).'}, '.$frequency.')';
-
-    return javascript_tag($code);
-  }
-
-  /**
-   * Returns a form tag that will submit using XMLHttpRequest in the background instead of the regular
-   * reloading POST arrangement. Even though it's using JavaScript to serialize the form elements, the form submission
-   * will work just like a regular submission as viewed by the receiving side (all elements available in 'params').
-   * The options for specifying the target with 'url' and defining callbacks are the same as 'link_to_remote()'.
-   *
-   * A "fall-through" target for browsers that don't do JavaScript can be specified
-   * with the 'action'/'method' options on '$options_html'
-   *
-   * Example:
-   *  <?php echo form_remote_tag(array(
-   *    'url'      => '@tag_add',
-   *    'update'   => 'question_tags',
-   *    'loading'  => "Element.show('indicator'); \$('tag').value = ''",
-   *    'complete' => "Element.hide('indicator');".visual_effect('highlight', 'question_tags'),
-   *  )) ?>
-   *
-   * The hash passed as a second argument is equivalent to the options (2nd) argument in the form_tag() helper.
-   *
-   * By default the fall-through action is the same as the one specified in the 'url'
-   * (and the default method is 'post').
-   */
-  function form_remote_tag($options = array(), $options_html = array())
-  {
-    $options = _parse_attributes($options);
-    $options_html = _parse_attributes($options_html);
-
-    $options['form'] = true;
-
-    $options_html['onsubmit'] = remote_function($options).' return false;';
-    $options_html['action'] = isset($options_html['action']) ? $options_html['action'] : url_for($options['url']);
-    $options_html['method'] = isset($options_html['method']) ? $options_html['method'] : 'post';
-
-    return tag('form', $options_html, true);
-  }
-
-  /**
-   *  Returns a button input tag that will submit form using XMLHttpRequest in the background instead of regular
-   *  reloading POST arrangement. The '$options' argument is the same as in 'form_remote_tag()'.
-   */
-  function submit_to_remote($name, $value, $options = array(), $options_html = array())
-  {
-    $options = _parse_attributes($options);
-    $options_html = _parse_attributes($options_html);
-
-    if (!isset($options['with']))
-    {
-      $options['with'] = 'Form.serialize(this.form)';
-    }
-
-    $options_html['type'] = 'button';
-    $options_html['onclick'] = remote_function($options).' return false;';
-    $options_html['name'] = $name;
-    $options_html['value'] = $value;
-
-    return tag('input', $options_html, false);
-  }
-
-  /**
-   *  Returns a image submit tag that will submit form using XMLHttpRequest in the background instead of regular
-   *  reloading POST arrangement. The '$options' argument is the same as in 'form_remote_tag()'.
-   */
-  function submit_image_to_remote($name, $source, $options = array(), $options_html = array())
-  {
-    $options = _parse_attributes($options);
-    $options_html = _parse_attributes($options_html);
- 
-    if (!isset($options['with']))
-    {
-      $options['with'] = 'Form.serialize(this.form)';
-    }
-
-    $options_html['type'] = 'image';
-    $options_html['onclick'] = remote_function($options).' return false;';
-    $options_html['name'] = $name;
-    $options_html['src'] = image_path($source);
-
-    if (!isset($options_html['alt'])) 
-    {
-      $path_pos = strrpos($source, '/');
-      $dot_pos = strrpos($source, '.');
-      $begin = $path_pos ? $path_pos + 1 : 0;
-      $nb_str = ($dot_pos ? $dot_pos : strlen($source)) - $begin;
-      $options_html['alt'] = ucfirst(substr($source, $begin, $nb_str));
-    }
- 
-    return tag('input', $options_html, false);
-  }
-
-  /**
-   * Returns a Javascript function (or expression) that will update a DOM element '$element_id'
-   * according to the '$options' passed.
-   *
-   * Possible '$options' are:
-   * 'content'            The content to use for updating. Can be left out if using block, see example.
-   * 'action'             Valid options are 'update' (assumed by default), 'empty', 'remove'
-   * 'position'           If the 'action' is 'update', you can optionally specify one of the following positions:
-   *                      'before', 'top', 'bottom', 'after'.
-   *
-   * Example:
-   *   <?php echo javascript_tag(
-   *      update_element_function('products', array(
-   *            'position' => 'bottom',
-   *            'content'  => "<p>New product!</p>",
-   *      ))
-   *   ) ?>
-   *
-   *
-   * This method can also be used in combination with remote method call
-   * where the result is evaluated afterwards to cause multiple updates on a page.
-   *
-   * Example:
-   *
-   *  # Calling view
-   *  <?php echo form_remote_tag(array(
-   *      'url'      => '@buy',
-   *      'complete' => evaluate_remote_response()
-   *  )) ?>
-   *  all the inputs here...
-   *
-   *  # Target action
-   *  public function executeBuy()
-   *  {
-   *     $this->product = ProductPeer::retrieveByPk(1);
-   *  }
-   *
-   *  # Returning view
-   *  <?php echo update_element_function('cart', array(
-   *      'action'   => 'update',
-   *      'position' => 'bottom',
-   *      'content'  => '<p>New Product: '.$product->getName().'</p>',
-   *  )) ?>
-   */
-  function update_element_function($element_id, $options = array())
-  {
-    sfContext::getInstance()->getResponse()->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/prototype');
-
-    $content = escape_javascript(isset($options['content']) ? $options['content'] : '');
-
-    $value = isset($options['action']) ? $options['action'] : 'update';
-    switch ($value)
-    {
-      case 'update':
-        if (isset($options['position']) && $options['position'])
-        {
-          $javascript_function = "\$('$element_id').insert({'".$options['position']."':'$content'})";
-        }
-        else
-        {
-          $javascript_function = "\$('$element_id').update('$content')";
-        }
-        break;
-
-      case 'empty':
-        $javascript_function = "\$('$element_id').innerHTML = ''";
-        break;
-
-      case 'remove':
-        $javascript_function = "\$('$element_id').remove()";
-        break;
-
-      default:
-        throw new sfException('Invalid action, choose one of update, remove, empty.');
-    }
-
-    $javascript_function .= ";\n";
-
-    return (isset($options['binding']) ? $javascript_function.$options['binding'] : $javascript_function);
-  }
-
-  /**
-   * Returns 'eval(request.responseText)', which is the Javascript function that
-   * 'form_remote_tag()' can call in 'complete' to evaluate a multiple update return document
-   * using 'update_element_function()' calls.
-   */
-  function evaluate_remote_response()
-  {
-    return 'eval(request.responseText)';
-  }
-
-  /**
-   * Returns the javascript needed for a remote function.
-   * Takes the same arguments as 'link_to_remote()'.
-   *
-   * Example:
-   *   <select id="options" onchange="<?php echo remote_function(array('update' => 'options', 'url' => '@update_options')) ?>">
-   *     <option value="0">Hello</option>
-   *     <option value="1">World</option>
-   *   </select>
-   */
-  function remote_function($options)
-  {
-    sfContext::getInstance()->getResponse()->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/prototype');
-
-    $javascript_options = _options_for_ajax($options);
-
-    $update = '';
-    if (isset($options['update']) && is_array($options['update']))
-    {
-      $update = array();
-      if (isset($options['update']['success']))
-      {
-        $update[] = "success:'".$options['update']['success']."'";
-      }
-      if (isset($options['update']['failure']))
-      {
-        $update[] = "failure:'".$options['update']['failure']."'";
-      }
-      $update = '{'.join(',', $update).'}';
-    }
-    else if (isset($options['update']))
-    {
-      $update .= "'".$options['update']."'";
-    }
-
-    $function = !$update ?  "new Ajax.Request(" : "new Ajax.Updater($update, ";
-
-    $function .= '\''.url_for($options['url']).'\'';
-    $function .= ', '.$javascript_options.')';
-
-    if (isset($options['before']))
-    {
-      $function = $options['before'].'; '.$function;
-    }
-    if (isset($options['after']))
-    {
-      $function = $function.'; '.$options['after'];
-    }
-    if (isset($options['condition']))
-    {
-      $function = 'if ('.$options['condition'].') { '.$function.'; }';
-    }
-    if (isset($options['confirm']))
-    {
-      $function = "if (window.confirm('".escape_javascript($options['confirm'])."')) { $function; }";
-      if (isset($options['cancel']))
-      {
-        $function = $function.' else { '.$options['cancel'].' }';
-      }
-    }
-
-    return $function.';';
-  }
-
-  /**
-   * Observes the field with the DOM ID specified by '$field_id' and makes
-   * an AJAX call when its contents have changed.
-   *
-   * Required '$options' are:
-   * 'url'                 'url_for()'-style options for the action to call
-   *                       when the field has changed.
-   *
-   * Additional options are:
-   * 'frequency'           The frequency (in seconds) at which changes to
-   *                       this field will be detected. Not setting this
-   *                       option at all or to a value equal to or less than
-   *                       zero will use event based observation instead of
-   *                       time based observation.
-   * 'update'              Specifies the DOM ID of the element whose
-   *                       innerHTML should be updated with the
-   *                       XMLHttpRequest response text.
-   * 'with'                A JavaScript expression specifying the
-   *                       parameters for the XMLHttpRequest. This defaults
-   *                       to 'value', which in the evaluated context
-   *                       refers to the new field value.
-   *
-   * Additionally, you may specify any of the options documented in
-   * link_to_remote().
-   */
-  function observe_field($field_id, $options = array())
-  {
-    sfContext::getInstance()->getResponse()->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/prototype');
-
-    if (isset($options['frequency']) && $options['frequency'] > 0)
-    {
-      return _build_observer('Form.Element.Observer', $field_id, $options);
-    }
-    else
-    {
-      return _build_observer('Form.Element.EventObserver', $field_id, $options);
-    }
-  }
-
-  /**
-   * Like 'observe_field()', but operates on an entire form identified by the
-   * DOM ID '$form_id'. '$options' are the same as 'observe_field()', except
-   * the default value of the 'with' option evaluates to the
-   * serialized (request string) value of the form.
-   */
-  function observe_form($form_id, $options = array())
-  {
-    sfContext::getInstance()->getResponse()->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/prototype');
-
-    if (isset($options['frequency']) && $options['frequency'] > 0)
-    {
-      return _build_observer('Form.Observer', $form_id, $options);
-    }
-    else
-    {
-      return _build_observer('Form.EventObserver', $form_id, $options);
-    }
-  }
-
-  /**
-   * Returns a JavaScript snippet to be used on the AJAX callbacks for starting
-   * visual effects.
-   *
-   * Example:
-   *  <?php echo link_to_remote('Reload', array(
-   *        'update'  => 'posts',
-   *        'url'     => '@reload',
-   *        'complete => visual_effect('highlight', 'posts', array('duration' => 0.5 )),
-   *  )) ?>
-   *
-   * If no '$element_id' is given, it assumes "element" which should be a local
-   * variable in the generated JavaScript execution context. This can be used
-   * for example with drop_receiving_element():
-   *
-   *  <?php echo drop_receving_element( ..., array(
-   *        ...
-   *        'loading' => visual_effect('fade'),
-   *  )) ?>
-   *
-   * This would fade the element that was dropped on the drop receiving element.
-   *
-   * You can change the behaviour with various options, see
-   * http://script.aculo.us for more documentation.
-   */
-  function visual_effect($name, $element_id = false, $js_options = array())
-  {
-    $response = sfContext::getInstance()->getResponse();
-    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/prototype');
-    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/builder');
-    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/effects');
-
-    $element = $element_id ? "'$element_id'" : 'element';
-
-    if (in_array($name, array('toggle_appear', 'toggle_blind', 'toggle_slide')))
-    {
-      return "new Effect.toggle($element, '".substr($name, 7)."', ".options_for_javascript($js_options).");";
-    }
-    else
-    {
-      return "new Effect.".sfInflector::camelize($name)."($element, ".options_for_javascript($js_options).");";
-    }
-  }
-
-  /**
-   * Makes the elements with the DOM ID specified by '$element_id' sortable
-   * by drag-and-drop and if an 'url' is specified make an AJAX call whenever
-   * the sort order has changed. By default, the action called gets the 
-   * serialized sortable element as parameters.
-   *
-   * Example:
-   *   <?php echo sortable_element($my_list, array(
-   *      'url' => '@order',
-   *   )) ?>
-   *
-   * In the example, the action gets a '$my_list' array parameter
-   * containing the values of the ids of elements the sortable consists
-   * of, in the current order.
-   *
-   * You can change the behaviour with various options, see
-   * http://script.aculo.us for more documentation.
-   */
-  function sortable_element($element_id, $options = array())
-  {
-    $response = sfContext::getInstance()->getResponse();
-    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/prototype');
-    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/builder');
-    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/effects');
-    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/dragdrop');
-
-    if (!isset($options['with']))
-    {
-      $options['with'] = "Sortable.serialize('$element_id')";
-    }
-
-    if (!isset($options['onUpdate']) && isset($options['url']))
-    {
-      $options['onUpdate'] = "function(){".remote_function($options)."}";
-    }
-
-    foreach (get_ajax_options() as $key)
-    {
-      unset($options[$key]);
-    }
-
-    foreach (array('tag', 'overlap', 'constraint', 'handle') as $option)
-    {
-      if (isset($options[$option]))
-      {
-        $options[$option] = "'{$options[$option]}'";
-      }
-    }
-
-    if (isset($options['containment']))
-    {
-      $options['containment'] = array_or_string_for_javascript($options['containment']);
-    }
-
-    if (isset($options['hoverclass']))
-    {
-      $options['hoverclass'] = "'{$options['hoverclass']}'";
-    }
-
-    if (isset($options['only']))
-    {
-      $options['only'] = array_or_string_for_javascript($options['only']);
-    }
-
-    $scrollPosition = "";
-    if (isset($options['scroll']))
-    {
-      $options['scroll'] = array_or_string_for_javascript($options['scroll']);
-      $scrollPosition = "Position.includeScrollOffsets = true;";
-    }
-
-    return javascript_tag($scrollPosition."Sortable.create('$element_id', ".options_for_javascript($options).")");
-  }
-
-  /**
-   * Makes the element with the DOM ID specified by '$element_id' draggable.
-   *
-   * Example:
-   *   <?php echo draggable_element('my_image', array(
-   *      'revert' => true,
-   *   )) ?>
-   *
-   * You can change the behaviour with various options, see
-   * http://script.aculo.us for more documentation.
-   */
-  function draggable_element($element_id, $options = array())
-  {
-    $response = sfContext::getInstance()->getResponse();
-    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/prototype');
-    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/builder');
-    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/effects');
-    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/dragdrop');
-
-    return javascript_tag("new Draggable('$element_id', ".options_for_javascript($options).")");
-  }
-
-  /**
-   * Makes the element with the DOM ID specified by '$element_id' receive
-   * dropped draggable elements (created by 'draggable_element()') and make an AJAX call.
-   * By default, the action called gets the DOM ID of the element as parameter.
-   *
-   * Example:
-   *   <?php drop_receiving_element('my_cart', array(
-   *      'url' => 'cart/add',
-   *   )) ?>
-   *
-   * You can change the behaviour with various options, see
-   * http://script.aculo.us for more documentation.
-   */
-  function drop_receiving_element($element_id, $options = array())
-  {
-    $response = sfContext::getInstance()->getResponse();
-    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/prototype');
-    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/builder');
-    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/effects');
-    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/dragdrop');
-
-    if (!isset($options['with']))
-    {
-      $options['with'] = "'id=' + encodeURIComponent(element.id)";
-    }
-    if (!isset($options['onDrop']))
-    {
-      $options['onDrop'] = "function(element){".remote_function($options)."}";
-    }
-
-    foreach (get_ajax_options() as $key)
-    {
-      unset($options[$key]);
-    }
-
-    if (isset($options['accept']))
-    {
-      $options['accept'] = array_or_string_for_javascript($options['accept']);
-    }
-
-    if (isset($options['hoverclass']))
-    {
-      $options['hoverclass'] = "'{$options['hoverclass']}'";
-    }
-
-    return javascript_tag("Droppables.add('$element_id', ".options_for_javascript($options).")");
-  }
-
-  /**
-   * wrapper for script.aculo.us/prototype Ajax.Autocompleter.
-   * @param string name value of input field
-   * @param string default value for input field
-   * @param array input tag options. (size, autocomplete, etc...)
-   * @param array completion options. (use_style, etc...)
-   *
-   * @return string input field tag, div for completion results, and
-   *                 auto complete javascript tags
-   */
-  function input_auto_complete_tag($name, $value, $url, $tag_options = array(), $completion_options = array())
-  {
-    $context = sfContext::getInstance();
-
-    $tag_options = _convert_options($tag_options);
-
-    $response = $context->getResponse();
-    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/prototype');
-    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/effects');
-    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/controls');
-
-    $comp_options = _convert_options($completion_options);
-    if (isset($comp_options['use_style']) && $comp_options['use_style'] == true)
-    {
-      $response->addStylesheet(sfConfig::get('sf_prototype_web_dir').'/css/input_auto_complete_tag');
-    }
-
-    $tag_options['id'] = get_id_from_name(isset($tag_options['id']) ? $tag_options['id'] : $name);
-
-    $javascript  = tag('input', array_merge(array('type' => 'text', 'name' => $name, 'value' => $value), _convert_options($tag_options)));
-    $javascript .= content_tag('div', '' , array('id' => $tag_options['id'].'_auto_complete', 'class' => 'auto_complete'));
-    $javascript .= _auto_complete_field($tag_options['id'], $url, $comp_options);
-
-    return $javascript;
-  }
-
-  /**
-   * wrapper for script.aculo.us/prototype Ajax.InPlaceEditor.
-   * @param string name id of field that can be edited
-   * @param string url of module/action to be called when ok is clicked
-   * @param array editor tag options. (rows, cols, highlightcolor, highlightendcolor, etc...)
-   *
-   * @return string javascript to manipulate the id field to allow click and edit functionality
-   */
-  function input_in_place_editor_tag($name, $url, $editor_options = array())
-  {
-    $response = sfContext::getInstance()->getResponse();
-    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/prototype');
-    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/effects');
-    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/controls');
-
-    $editor_options = _convert_options($editor_options);
-    return _in_place_editor($name, $url, $editor_options);
-  }
-
-  /*
-   * Makes an HTML element specified by the DOM ID '$field_id' become an in-place
-   * editor of a property.
-   *
-   * A form is automatically created and displayed when the user clicks the element,
-   * something like this:
-   * <form id="myElement-in-place-edit-form" target="specified url">
-   *   <input name="value" text="The content of myElement"/>
-   *   <input type="submit" value="ok"/>
-   *   <a onclick="javascript to cancel the editing">cancel</a>
-   * </form>
-   *
-   * The form is serialized and sent to the server using an AJAX call, the action on
-   * the server should process the value and return the updated value in the body of
-   * the reponse. The element will automatically be updated with the changed value
-   * (as returned from the server).
-   *
-   * Required '$options' are:
-   * 'url'                 Specifies the url where the updated value should
-   *                       be sent after the user presses "ok".
-   *
-   * Some additional '$options' are:
-   * 'rows'                Number of rows (more than 1 will use a TEXTAREA)
-   * 'cancel_text'         The text on the cancel link. (default: "cancel")
-   * 'save_text'           The text on the save link. (default: "ok")
-   * 'external_control'    The id of an external control used to enter edit mode.
-   * 'options'             Pass through options to the AJAX call (see prototype's Ajax.Updater)
-   * 'with'                JavaScript snippet that should return what is to be sent
-   *                       in the AJAX call, 'form' is an implicit parameter
-   *
-   * for details see: http://mir.aculo.us/2007/7/17/in-place-editing-the-summer-2007-rewrite/
-   */
-    function _in_place_editor($field_id, $url, $options = array())
-    {
-      $javascript = "new Ajax.InPlaceEditor(";
-
-      $javascript .= "'$field_id', ";
-      $javascript .= array_or_string_for_javascript(url_for($url));
-
-      // translate symfony option names to InPlaceEditor options
-      if (isset($options['cancel_text']))
-      {
-        $options['cancelText'] = array_or_string_for_javascript($options['cancel_text']);
-        unset($options['cancel_text']);
-      }
-      if (isset($options['save_text']))
-      {
-        $options['okText'] = array_or_string_for_javascript($options['save_text']);
-        unset($options['save_text']);
-      }
-      if (isset($options['external_control']))
-      {
-        $options['externalControl'] = array_or_string_for_javascript($options['external_control']);
-        unset($options['external_control']);
-      }
-      if (isset($options['options']))
-      {
-        $options['ajaxOptions'] = $options['options'];
-        unset($options['options']);
-      }
-      if (isset($options['with']))
-      {
-        $options['callback'] = "function(form, value) { return ".$options['with']." }";
-        unset($options['with']);
-      }
-      if (isset($options['highlightcolor']))
-      {
-        $options['highlightColor'] = array_or_string_for_javascript($options['highlightcolor']);
-        unset($options['highlightcolor']);
-      }
-      if (isset($options['highlightendcolor']))
-      {
-        $options['highlightEndColor'] = array_or_string_for_javascript($options['highlightendcolor']);
-        unset($options['highlightendcolor']);
-      }
-      if (isset($options['loadTextURL']))
-      {
-        $options['loadTextURL'] =  array_or_string_for_javascript($options['loadTextURL']);
-      }
-
-      $javascript .= ', '.options_for_javascript($options);
-      $javascript .= ');';
-
-      return javascript_tag($javascript);
-    }
-
-  /**
-   * wrapper for script.aculo.us/prototype Ajax.Autocompleter.
-   * @param string id value of input field
-   * @param string url of module/action to execute for autocompletion
-   * @param array completion options
-   * @return string javascript tag for Ajax.Autocompleter
-   */
-  function _auto_complete_field($field_id, $url, $options = array())
-  {
-    $javascript = "new Ajax.Autocompleter(";
-
-    $javascript .= "'".get_id_from_name($field_id)."', ";
-    if (isset($options['update']))
-    {
-      $javascript .= "'".$options['update']."', ";
-    }
-    else
-    {
-      $javascript .= "'".get_id_from_name($field_id)."_auto_complete', ";
-    }
-
-    $javascript .= array_or_string_for_javascript(url_for($url));
-
-    $js_options = array();
-    if (isset($options['tokens']))
-    {
-      $js_options['tokens'] = array_or_string_for_javascript($options['tokens']);
-    }
-    if (isset ($options['with']))
-    {
-      $js_options['callback'] = "function(element, value) { return ".$options['with']."}";
-    }
-    if (isset($options['indicator']))
-    {
-      $js_options['indicator']  = array_or_string_for_javascript($options['indicator']);
-    }
-    if (isset($options['on_show']))
-    {
-      $js_options['onShow'] = $options['on_show'];
-    }
-    if (isset($options['on_hide']))
-    {
-      $js_options['onHide'] = $options['on_hide'];
-    }
-    if (isset($options['min_chars']))
-    {
-      $js_options['minChars'] = $options['min_chars'];
-    }
-    if (isset($options['frequency']))
-    {
-      $js_options['frequency'] = $options['frequency'];
-    }
-    if (isset($options['update_element']))
-    {
-      $js_options['updateElement'] = $options['update_element'];
-    }
-    if (isset($options['after_update_element']))
-    {
-      $js_options['afterUpdateElement'] = $options['after_update_element'];
-    }
-    if (isset($options['param_name'])) 
-    {
-      $js_options['paramName'] = "'".$options['param_name']."'";
-    }
-
-    $javascript .= ', '.options_for_javascript($js_options).');';
-
-    return javascript_tag($javascript);
-  }
-
-  function _options_for_ajax($options)
-  {
-    $js_options = _build_callbacks($options);
-
-    $js_options['asynchronous'] = (isset($options['type']) && ($options['type'] == 'synchronous')) ? false : true;
-    if (isset($options['method'])) $js_options['method'] = array_or_string_for_javascript($options['method']);
-    if (isset($options['position'])) $js_options['insertion'] = "Insertion.".sfInflector::camelize($options['position']);
-    $js_options['evalScripts'] = (!isset($options['script']) || $options['script'] == '0' || $options['script'] == false) ? false : true;
-
-    if (isset($options['form']))
-    {
-      $js_options['parameters'] = 'Form.serialize(this)';
-    }
-    else if (isset($options['submit']))
-    {
-      $js_options['parameters'] = "Form.serialize(document.getElementById('{$options['submit']}'))";
-    }
-    else if (isset($options['with']))
-    {
-      $js_options['parameters'] = $options['with'];
-    }
-
-    return options_for_javascript($js_options);
-  }
-
-  function _build_observer($klass, $name, $options = array())
-  {
-    if (!isset($options['with']) && isset($options['update']))
-    {
-      $options['with'] = 'value';
-    }
-
-    $callback = remote_function($options);
-
-    $javascript  = 'new '.$klass.'("'.$name.'", ';
-    if (isset($options['frequency']) && $options['frequency'] > 0)
-    {
-      $javascript .= $options['frequency'].", ";
-    }
-    $javascript .= "function(element, value) {";
-    $javascript .= $callback.'});';
-
-    return javascript_tag($javascript);
-  }
-
-  function _build_callbacks($options)
-  {
-    $callbacks = array();
-    foreach (get_callbacks() as $callback)
-    {
-      if (isset($options[$callback]))
-      {
-        $name = 'on'.ucfirst($callback);
-        $code = $options[$callback];
-        $callbacks[$name] = 'function(request, json){'.$code.'}';
-      }
-    }
-
-    return $callbacks;
-  }
diff --git a/plugins/sfProtoculousPlugin/web/css/input_auto_complete_tag.css b/plugins/sfProtoculousPlugin/web/css/input_auto_complete_tag.css
deleted file mode 100644
index 1029e1a2c..000000000
--- a/plugins/sfProtoculousPlugin/web/css/input_auto_complete_tag.css
+++ /dev/null
@@ -1,34 +0,0 @@
-div.auto_complete
-{
-  width: 350px;
-  background: #fff;
-}
-
-div.auto_complete ul
-{
-  width: 100%;
-  margin: 0;
-  padding: 0;
-  list-style-type: none;
-  border: 1px solid #bbb;
-}
-
-div.auto_complete ul li
-{
-  margin: 0;
-  padding: 3px;
-  border-bottom: 1px solid #eee;
-  list-style-type: none;
-}
-
-div.auto_complete ul li.selected
-{
-  background-color: #ffb;
-}
-
-div.auto_complete ul strong.highlight
-{
-  margin: 0;
-  padding: 0;
-  color: #800;
-}
diff --git a/plugins/sfProtoculousPlugin/web/js/builder.js b/plugins/sfProtoculousPlugin/web/js/builder.js
deleted file mode 100644
index dba8becaa..000000000
--- a/plugins/sfProtoculousPlugin/web/js/builder.js
+++ /dev/null
@@ -1,136 +0,0 @@
-// script.aculo.us builder.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
-
-// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//
-// script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-var Builder = {
-  NODEMAP: {
-    AREA: 'map',
-    CAPTION: 'table',
-    COL: 'table',
-    COLGROUP: 'table',
-    LEGEND: 'fieldset',
-    OPTGROUP: 'select',
-    OPTION: 'select',
-    PARAM: 'object',
-    TBODY: 'table',
-    TD: 'table',
-    TFOOT: 'table',
-    TH: 'table',
-    THEAD: 'table',
-    TR: 'table'
-  },
-  // note: For Firefox < 1.5, OPTION and OPTGROUP tags are currently broken,
-  //       due to a Firefox bug
-  node: function(elementName) {
-    elementName = elementName.toUpperCase();
-
-    // try innerHTML approach
-    var parentTag = this.NODEMAP[elementName] || 'div';
-    var parentElement = document.createElement(parentTag);
-    try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
-      parentElement.innerHTML = "<" + elementName + "></" + elementName + ">";
-    } catch(e) {}
-    var element = parentElement.firstChild || null;
-
-    // see if browser added wrapping tags
-    if(element && (element.tagName.toUpperCase() != elementName))
-      element = element.getElementsByTagName(elementName)[0];
-
-    // fallback to createElement approach
-    if(!element) element = document.createElement(elementName);
-
-    // abort if nothing could be created
-    if(!element) return;
-
-    // attributes (or text)
-    if(arguments[1])
-      if(this._isStringOrNumber(arguments[1]) ||
-        (arguments[1] instanceof Array) ||
-        arguments[1].tagName) {
-          this._children(element, arguments[1]);
-        } else {
-          var attrs = this._attributes(arguments[1]);
-          if(attrs.length) {
-            try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
-              parentElement.innerHTML = "<" +elementName + " " +
-                attrs + "></" + elementName + ">";
-            } catch(e) {}
-            element = parentElement.firstChild || null;
-            // workaround firefox 1.0.X bug
-            if(!element) {
-              element = document.createElement(elementName);
-              for(attr in arguments[1])
-                element[attr == 'class' ? 'className' : attr] = arguments[1][attr];
-            }
-            if(element.tagName.toUpperCase() != elementName)
-              element = parentElement.getElementsByTagName(elementName)[0];
-          }
-        }
-
-    // text, or array of children
-    if(arguments[2])
-      this._children(element, arguments[2]);
-
-     return $(element);
-  },
-  _text: function(text) {
-     return document.createTextNode(text);
-  },
-
-  ATTR_MAP: {
-    'className': 'class',
-    'htmlFor': 'for'
-  },
-
-  _attributes: function(attributes) {
-    var attrs = [];
-    for(attribute in attributes)
-      attrs.push((attribute in this.ATTR_MAP ? this.ATTR_MAP[attribute] : attribute) +
-          '="' + attributes[attribute].toString().escapeHTML().gsub(/"/,'&quot;') + '"');
-    return attrs.join(" ");
-  },
-  _children: function(element, children) {
-    if(children.tagName) {
-      element.appendChild(children);
-      return;
-    }
-    if(typeof children=='object') { // array can hold nodes and text
-      children.flatten().each( function(e) {
-        if(typeof e=='object')
-          element.appendChild(e);
-        else
-          if(Builder._isStringOrNumber(e))
-            element.appendChild(Builder._text(e));
-      });
-    } else
-      if(Builder._isStringOrNumber(children))
-        element.appendChild(Builder._text(children));
-  },
-  _isStringOrNumber: function(param) {
-    return(typeof param=='string' || typeof param=='number');
-  },
-  build: function(html) {
-    var element = this.node('div');
-    $(element).update(html.strip());
-    return element.down();
-  },
-  dump: function(scope) {
-    if(typeof scope != 'object' && typeof scope != 'function') scope = window; //global scope
-
-    var tags = ("A ABBR ACRONYM ADDRESS APPLET AREA B BASE BASEFONT BDO BIG BLOCKQUOTE BODY " +
-      "BR BUTTON CAPTION CENTER CITE CODE COL COLGROUP DD DEL DFN DIR DIV DL DT EM FIELDSET " +
-      "FONT FORM FRAME FRAMESET H1 H2 H3 H4 H5 H6 HEAD HR HTML I IFRAME IMG INPUT INS ISINDEX "+
-      "KBD LABEL LEGEND LI LINK MAP MENU META NOFRAMES NOSCRIPT OBJECT OL OPTGROUP OPTION P "+
-      "PARAM PRE Q S SAMP SCRIPT SELECT SMALL SPAN STRIKE STRONG STYLE SUB SUP TABLE TBODY TD "+
-      "TEXTAREA TFOOT TH THEAD TITLE TR TT U UL VAR").split(/\s+/);
-
-    tags.each( function(tag){
-      scope[tag] = function() {
-        return Builder.node.apply(Builder, [tag].concat($A(arguments)));
-      };
-    });
-  }
-};
\ No newline at end of file
diff --git a/plugins/sfProtoculousPlugin/web/js/controls.js b/plugins/sfProtoculousPlugin/web/js/controls.js
deleted file mode 100644
index c56ccb798..000000000
--- a/plugins/sfProtoculousPlugin/web/js/controls.js
+++ /dev/null
@@ -1,965 +0,0 @@
-// script.aculo.us controls.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
-
-// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//           (c) 2005-2008 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
-//           (c) 2005-2008 Jon Tirsen (http://www.tirsen.com)
-// Contributors:
-//  Richard Livsey
-//  Rahul Bhargava
-//  Rob Wills
-//
-// script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-// Autocompleter.Base handles all the autocompletion functionality
-// that's independent of the data source for autocompletion. This
-// includes drawing the autocompletion menu, observing keyboard
-// and mouse events, and similar.
-//
-// Specific autocompleters need to provide, at the very least,
-// a getUpdatedChoices function that will be invoked every time
-// the text inside the monitored textbox changes. This method
-// should get the text for which to provide autocompletion by
-// invoking this.getToken(), NOT by directly accessing
-// this.element.value. This is to allow incremental tokenized
-// autocompletion. Specific auto-completion logic (AJAX, etc)
-// belongs in getUpdatedChoices.
-//
-// Tokenized incremental autocompletion is enabled automatically
-// when an autocompleter is instantiated with the 'tokens' option
-// in the options parameter, e.g.:
-// new Ajax.Autocompleter('id','upd', '/url/', { tokens: ',' });
-// will incrementally autocomplete with a comma as the token.
-// Additionally, ',' in the above example can be replaced with
-// a token array, e.g. { tokens: [',', '\n'] } which
-// enables autocompletion on multiple tokens. This is most
-// useful when one of the tokens is \n (a newline), as it
-// allows smart autocompletion after linebreaks.
-
-if(typeof Effect == 'undefined')
-  throw("controls.js requires including script.aculo.us' effects.js library");
-
-var Autocompleter = { };
-Autocompleter.Base = Class.create({
-  baseInitialize: function(element, update, options) {
-    element          = $(element);
-    this.element     = element;
-    this.update      = $(update);
-    this.hasFocus    = false;
-    this.changed     = false;
-    this.active      = false;
-    this.index       = 0;
-    this.entryCount  = 0;
-    this.oldElementValue = this.element.value;
-
-    if(this.setOptions)
-      this.setOptions(options);
-    else
-      this.options = options || { };
-
-    this.options.paramName    = this.options.paramName || this.element.name;
-    this.options.tokens       = this.options.tokens || [];
-    this.options.frequency    = this.options.frequency || 0.4;
-    this.options.minChars     = this.options.minChars || 1;
-    this.options.onShow       = this.options.onShow ||
-      function(element, update){
-        if(!update.style.position || update.style.position=='absolute') {
-          update.style.position = 'absolute';
-          Position.clone(element, update, {
-            setHeight: false,
-            offsetTop: element.offsetHeight
-          });
-        }
-        Effect.Appear(update,{duration:0.15});
-      };
-    this.options.onHide = this.options.onHide ||
-      function(element, update){ new Effect.Fade(update,{duration:0.15}) };
-
-    if(typeof(this.options.tokens) == 'string')
-      this.options.tokens = new Array(this.options.tokens);
-    // Force carriage returns as token delimiters anyway
-    if (!this.options.tokens.include('\n'))
-      this.options.tokens.push('\n');
-
-    this.observer = null;
-
-    this.element.setAttribute('autocomplete','off');
-
-    Element.hide(this.update);
-
-    Event.observe(this.element, 'blur', this.onBlur.bindAsEventListener(this));
-    Event.observe(this.element, 'keydown', this.onKeyPress.bindAsEventListener(this));
-  },
-
-  show: function() {
-    if(Element.getStyle(this.update, 'display')=='none') this.options.onShow(this.element, this.update);
-    if(!this.iefix &&
-      (Prototype.Browser.IE) &&
-      (Element.getStyle(this.update, 'position')=='absolute')) {
-      new Insertion.After(this.update,
-       '<iframe id="' + this.update.id + '_iefix" '+
-       'style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' +
-       'src="javascript:false;" frameborder="0" scrolling="no"></iframe>');
-      this.iefix = $(this.update.id+'_iefix');
-    }
-    if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50);
-  },
-
-  fixIEOverlapping: function() {
-    Position.clone(this.update, this.iefix, {setTop:(!this.update.style.height)});
-    this.iefix.style.zIndex = 1;
-    this.update.style.zIndex = 2;
-    Element.show(this.iefix);
-  },
-
-  hide: function() {
-    this.stopIndicator();
-    if(Element.getStyle(this.update, 'display')!='none') this.options.onHide(this.element, this.update);
-    if(this.iefix) Element.hide(this.iefix);
-  },
-
-  startIndicator: function() {
-    if(this.options.indicator) Element.show(this.options.indicator);
-  },
-
-  stopIndicator: function() {
-    if(this.options.indicator) Element.hide(this.options.indicator);
-  },
-
-  onKeyPress: function(event) {
-    if(this.active)
-      switch(event.keyCode) {
-       case Event.KEY_TAB:
-       case Event.KEY_RETURN:
-         this.selectEntry();
-         Event.stop(event);
-       case Event.KEY_ESC:
-         this.hide();
-         this.active = false;
-         Event.stop(event);
-         return;
-       case Event.KEY_LEFT:
-       case Event.KEY_RIGHT:
-         return;
-       case Event.KEY_UP:
-         this.markPrevious();
-         this.render();
-         Event.stop(event);
-         return;
-       case Event.KEY_DOWN:
-         this.markNext();
-         this.render();
-         Event.stop(event);
-         return;
-      }
-     else
-       if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN ||
-         (Prototype.Browser.WebKit > 0 && event.keyCode == 0)) return;
-
-    this.changed = true;
-    this.hasFocus = true;
-
-    if(this.observer) clearTimeout(this.observer);
-      this.observer =
-        setTimeout(this.onObserverEvent.bind(this), this.options.frequency*1000);
-  },
-
-  activate: function() {
-    this.changed = false;
-    this.hasFocus = true;
-    this.getUpdatedChoices();
-  },
-
-  onHover: function(event) {
-    var element = Event.findElement(event, 'LI');
-    if(this.index != element.autocompleteIndex)
-    {
-        this.index = element.autocompleteIndex;
-        this.render();
-    }
-    Event.stop(event);
-  },
-
-  onClick: function(event) {
-    var element = Event.findElement(event, 'LI');
-    this.index = element.autocompleteIndex;
-    this.selectEntry();
-    this.hide();
-  },
-
-  onBlur: function(event) {
-    // needed to make click events working
-    setTimeout(this.hide.bind(this), 250);
-    this.hasFocus = false;
-    this.active = false;
-  },
-
-  render: function() {
-    if(this.entryCount > 0) {
-      for (var i = 0; i < this.entryCount; i++)
-        this.index==i ?
-          Element.addClassName(this.getEntry(i),"selected") :
-          Element.removeClassName(this.getEntry(i),"selected");
-      if(this.hasFocus) {
-        this.show();
-        this.active = true;
-      }
-    } else {
-      this.active = false;
-      this.hide();
-    }
-  },
-
-  markPrevious: function() {
-    if(this.index > 0) this.index--;
-      else this.index = this.entryCount-1;
-    this.getEntry(this.index).scrollIntoView(true);
-  },
-
-  markNext: function() {
-    if(this.index < this.entryCount-1) this.index++;
-      else this.index = 0;
-    this.getEntry(this.index).scrollIntoView(false);
-  },
-
-  getEntry: function(index) {
-    return this.update.firstChild.childNodes[index];
-  },
-
-  getCurrentEntry: function() {
-    return this.getEntry(this.index);
-  },
-
-  selectEntry: function() {
-    this.active = false;
-    this.updateElement(this.getCurrentEntry());
-  },
-
-  updateElement: function(selectedElement) {
-    if (this.options.updateElement) {
-      this.options.updateElement(selectedElement);
-      return;
-    }
-    var value = '';
-    if (this.options.select) {
-      var nodes = $(selectedElement).select('.' + this.options.select) || [];
-      if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select);
-    } else
-      value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal');
-
-    var bounds = this.getTokenBounds();
-    if (bounds[0] != -1) {
-      var newValue = this.element.value.substr(0, bounds[0]);
-      var whitespace = this.element.value.substr(bounds[0]).match(/^\s+/);
-      if (whitespace)
-        newValue += whitespace[0];
-      this.element.value = newValue + value + this.element.value.substr(bounds[1]);
-    } else {
-      this.element.value = value;
-    }
-    this.oldElementValue = this.element.value;
-    this.element.focus();
-
-    if (this.options.afterUpdateElement)
-      this.options.afterUpdateElement(this.element, selectedElement);
-  },
-
-  updateChoices: function(choices) {
-    if(!this.changed && this.hasFocus) {
-      this.update.innerHTML = choices;
-      Element.cleanWhitespace(this.update);
-      Element.cleanWhitespace(this.update.down());
-
-      if(this.update.firstChild && this.update.down().childNodes) {
-        this.entryCount =
-          this.update.down().childNodes.length;
-        for (var i = 0; i < this.entryCount; i++) {
-          var entry = this.getEntry(i);
-          entry.autocompleteIndex = i;
-          this.addObservers(entry);
-        }
-      } else {
-        this.entryCount = 0;
-      }
-
-      this.stopIndicator();
-      this.index = 0;
-
-      if(this.entryCount==1 && this.options.autoSelect) {
-        this.selectEntry();
-        this.hide();
-      } else {
-        this.render();
-      }
-    }
-  },
-
-  addObservers: function(element) {
-    Event.observe(element, "mouseover", this.onHover.bindAsEventListener(this));
-    Event.observe(element, "click", this.onClick.bindAsEventListener(this));
-  },
-
-  onObserverEvent: function() {
-    this.changed = false;
-    this.tokenBounds = null;
-    if(this.getToken().length>=this.options.minChars) {
-      this.getUpdatedChoices();
-    } else {
-      this.active = false;
-      this.hide();
-    }
-    this.oldElementValue = this.element.value;
-  },
-
-  getToken: function() {
-    var bounds = this.getTokenBounds();
-    return this.element.value.substring(bounds[0], bounds[1]).strip();
-  },
-
-  getTokenBounds: function() {
-    if (null != this.tokenBounds) return this.tokenBounds;
-    var value = this.element.value;
-    if (value.strip().empty()) return [-1, 0];
-    var diff = arguments.callee.getFirstDifferencePos(value, this.oldElementValue);
-    var offset = (diff == this.oldElementValue.length ? 1 : 0);
-    var prevTokenPos = -1, nextTokenPos = value.length;
-    var tp;
-    for (var index = 0, l = this.options.tokens.length; index < l; ++index) {
-      tp = value.lastIndexOf(this.options.tokens[index], diff + offset - 1);
-      if (tp > prevTokenPos) prevTokenPos = tp;
-      tp = value.indexOf(this.options.tokens[index], diff + offset);
-      if (-1 != tp && tp < nextTokenPos) nextTokenPos = tp;
-    }
-    return (this.tokenBounds = [prevTokenPos + 1, nextTokenPos]);
-  }
-});
-
-Autocompleter.Base.prototype.getTokenBounds.getFirstDifferencePos = function(newS, oldS) {
-  var boundary = Math.min(newS.length, oldS.length);
-  for (var index = 0; index < boundary; ++index)
-    if (newS[index] != oldS[index])
-      return index;
-  return boundary;
-};
-
-Ajax.Autocompleter = Class.create(Autocompleter.Base, {
-  initialize: function(element, update, url, options) {
-    this.baseInitialize(element, update, options);
-    this.options.asynchronous  = true;
-    this.options.onComplete    = this.onComplete.bind(this);
-    this.options.defaultParams = this.options.parameters || null;
-    this.url                   = url;
-  },
-
-  getUpdatedChoices: function() {
-    this.startIndicator();
-
-    var entry = encodeURIComponent(this.options.paramName) + '=' +
-      encodeURIComponent(this.getToken());
-
-    this.options.parameters = this.options.callback ?
-      this.options.callback(this.element, entry) : entry;
-
-    if(this.options.defaultParams)
-      this.options.parameters += '&' + this.options.defaultParams;
-
-    new Ajax.Request(this.url, this.options);
-  },
-
-  onComplete: function(request) {
-    this.updateChoices(request.responseText);
-  }
-});
-
-// The local array autocompleter. Used when you'd prefer to
-// inject an array of autocompletion options into the page, rather
-// than sending out Ajax queries, which can be quite slow sometimes.
-//
-// The constructor takes four parameters. The first two are, as usual,
-// the id of the monitored textbox, and id of the autocompletion menu.
-// The third is the array you want to autocomplete from, and the fourth
-// is the options block.
-//
-// Extra local autocompletion options:
-// - choices - How many autocompletion choices to offer
-//
-// - partialSearch - If false, the autocompleter will match entered
-//                    text only at the beginning of strings in the
-//                    autocomplete array. Defaults to true, which will
-//                    match text at the beginning of any *word* in the
-//                    strings in the autocomplete array. If you want to
-//                    search anywhere in the string, additionally set
-//                    the option fullSearch to true (default: off).
-//
-// - fullSsearch - Search anywhere in autocomplete array strings.
-//
-// - partialChars - How many characters to enter before triggering
-//                   a partial match (unlike minChars, which defines
-//                   how many characters are required to do any match
-//                   at all). Defaults to 2.
-//
-// - ignoreCase - Whether to ignore case when autocompleting.
-//                 Defaults to true.
-//
-// It's possible to pass in a custom function as the 'selector'
-// option, if you prefer to write your own autocompletion logic.
-// In that case, the other options above will not apply unless
-// you support them.
-
-Autocompleter.Local = Class.create(Autocompleter.Base, {
-  initialize: function(element, update, array, options) {
-    this.baseInitialize(element, update, options);
-    this.options.array = array;
-  },
-
-  getUpdatedChoices: function() {
-    this.updateChoices(this.options.selector(this));
-  },
-
-  setOptions: function(options) {
-    this.options = Object.extend({
-      choices: 10,
-      partialSearch: true,
-      partialChars: 2,
-      ignoreCase: true,
-      fullSearch: false,
-      selector: function(instance) {
-        var ret       = []; // Beginning matches
-        var partial   = []; // Inside matches
-        var entry     = instance.getToken();
-        var count     = 0;
-
-        for (var i = 0; i < instance.options.array.length &&
-          ret.length < instance.options.choices ; i++) {
-
-          var elem = instance.options.array[i];
-          var foundPos = instance.options.ignoreCase ?
-            elem.toLowerCase().indexOf(entry.toLowerCase()) :
-            elem.indexOf(entry);
-
-          while (foundPos != -1) {
-            if (foundPos == 0 && elem.length != entry.length) {
-              ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" +
-                elem.substr(entry.length) + "</li>");
-              break;
-            } else if (entry.length >= instance.options.partialChars &&
-              instance.options.partialSearch && foundPos != -1) {
-              if (instance.options.fullSearch || /\s/.test(elem.substr(foundPos-1,1))) {
-                partial.push("<li>" + elem.substr(0, foundPos) + "<strong>" +
-                  elem.substr(foundPos, entry.length) + "</strong>" + elem.substr(
-                  foundPos + entry.length) + "</li>");
-                break;
-              }
-            }
-
-            foundPos = instance.options.ignoreCase ?
-              elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) :
-              elem.indexOf(entry, foundPos + 1);
-
-          }
-        }
-        if (partial.length)
-          ret = ret.concat(partial.slice(0, instance.options.choices - ret.length));
-        return "<ul>" + ret.join('') + "</ul>";
-      }
-    }, options || { });
-  }
-});
-
-// AJAX in-place editor and collection editor
-// Full rewrite by Christophe Porteneuve <tdd@tddsworld.com> (April 2007).
-
-// Use this if you notice weird scrolling problems on some browsers,
-// the DOM might be a bit confused when this gets called so do this
-// waits 1 ms (with setTimeout) until it does the activation
-Field.scrollFreeActivate = function(field) {
-  setTimeout(function() {
-    Field.activate(field);
-  }, 1);
-};
-
-Ajax.InPlaceEditor = Class.create({
-  initialize: function(element, url, options) {
-    this.url = url;
-    this.element = element = $(element);
-    this.prepareOptions();
-    this._controls = { };
-    arguments.callee.dealWithDeprecatedOptions(options); // DEPRECATION LAYER!!!
-    Object.extend(this.options, options || { });
-    if (!this.options.formId && this.element.id) {
-      this.options.formId = this.element.id + '-inplaceeditor';
-      if ($(this.options.formId))
-        this.options.formId = '';
-    }
-    if (this.options.externalControl)
-      this.options.externalControl = $(this.options.externalControl);
-    if (!this.options.externalControl)
-      this.options.externalControlOnly = false;
-    this._originalBackground = this.element.getStyle('background-color') || 'transparent';
-    this.element.title = this.options.clickToEditText;
-    this._boundCancelHandler = this.handleFormCancellation.bind(this);
-    this._boundComplete = (this.options.onComplete || Prototype.emptyFunction).bind(this);
-    this._boundFailureHandler = this.handleAJAXFailure.bind(this);
-    this._boundSubmitHandler = this.handleFormSubmission.bind(this);
-    this._boundWrapperHandler = this.wrapUp.bind(this);
-    this.registerListeners();
-  },
-  checkForEscapeOrReturn: function(e) {
-    if (!this._editing || e.ctrlKey || e.altKey || e.shiftKey) return;
-    if (Event.KEY_ESC == e.keyCode)
-      this.handleFormCancellation(e);
-    else if (Event.KEY_RETURN == e.keyCode)
-      this.handleFormSubmission(e);
-  },
-  createControl: function(mode, handler, extraClasses) {
-    var control = this.options[mode + 'Control'];
-    var text = this.options[mode + 'Text'];
-    if ('button' == control) {
-      var btn = document.createElement('input');
-      btn.type = 'submit';
-      btn.value = text;
-      btn.className = 'editor_' + mode + '_button';
-      if ('cancel' == mode)
-        btn.onclick = this._boundCancelHandler;
-      this._form.appendChild(btn);
-      this._controls[mode] = btn;
-    } else if ('link' == control) {
-      var link = document.createElement('a');
-      link.href = '#';
-      link.appendChild(document.createTextNode(text));
-      link.onclick = 'cancel' == mode ? this._boundCancelHandler : this._boundSubmitHandler;
-      link.className = 'editor_' + mode + '_link';
-      if (extraClasses)
-        link.className += ' ' + extraClasses;
-      this._form.appendChild(link);
-      this._controls[mode] = link;
-    }
-  },
-  createEditField: function() {
-    var text = (this.options.loadTextURL ? this.options.loadingText : this.getText());
-    var fld;
-    if (1 >= this.options.rows && !/\r|\n/.test(this.getText())) {
-      fld = document.createElement('input');
-      fld.type = 'text';
-      var size = this.options.size || this.options.cols || 0;
-      if (0 < size) fld.size = size;
-    } else {
-      fld = document.createElement('textarea');
-      fld.rows = (1 >= this.options.rows ? this.options.autoRows : this.options.rows);
-      fld.cols = this.options.cols || 40;
-    }
-    fld.name = this.options.paramName;
-    fld.value = text; // No HTML breaks conversion anymore
-    fld.className = 'editor_field';
-    if (this.options.submitOnBlur)
-      fld.onblur = this._boundSubmitHandler;
-    this._controls.editor = fld;
-    if (this.options.loadTextURL)
-      this.loadExternalText();
-    this._form.appendChild(this._controls.editor);
-  },
-  createForm: function() {
-    var ipe = this;
-    function addText(mode, condition) {
-      var text = ipe.options['text' + mode + 'Controls'];
-      if (!text || condition === false) return;
-      ipe._form.appendChild(document.createTextNode(text));
-    };
-    this._form = $(document.createElement('form'));
-    this._form.id = this.options.formId;
-    this._form.addClassName(this.options.formClassName);
-    this._form.onsubmit = this._boundSubmitHandler;
-    this.createEditField();
-    if ('textarea' == this._controls.editor.tagName.toLowerCase())
-      this._form.appendChild(document.createElement('br'));
-    if (this.options.onFormCustomization)
-      this.options.onFormCustomization(this, this._form);
-    addText('Before', this.options.okControl || this.options.cancelControl);
-    this.createControl('ok', this._boundSubmitHandler);
-    addText('Between', this.options.okControl && this.options.cancelControl);
-    this.createControl('cancel', this._boundCancelHandler, 'editor_cancel');
-    addText('After', this.options.okControl || this.options.cancelControl);
-  },
-  destroy: function() {
-    if (this._oldInnerHTML)
-      this.element.innerHTML = this._oldInnerHTML;
-    this.leaveEditMode();
-    this.unregisterListeners();
-  },
-  enterEditMode: function(e) {
-    if (this._saving || this._editing) return;
-    this._editing = true;
-    this.triggerCallback('onEnterEditMode');
-    if (this.options.externalControl)
-      this.options.externalControl.hide();
-    this.element.hide();
-    this.createForm();
-    this.element.parentNode.insertBefore(this._form, this.element);
-    if (!this.options.loadTextURL)
-      this.postProcessEditField();
-    if (e) Event.stop(e);
-  },
-  enterHover: function(e) {
-    if (this.options.hoverClassName)
-      this.element.addClassName(this.options.hoverClassName);
-    if (this._saving) return;
-    this.triggerCallback('onEnterHover');
-  },
-  getText: function() {
-    return this.element.innerHTML.unescapeHTML();
-  },
-  handleAJAXFailure: function(transport) {
-    this.triggerCallback('onFailure', transport);
-    if (this._oldInnerHTML) {
-      this.element.innerHTML = this._oldInnerHTML;
-      this._oldInnerHTML = null;
-    }
-  },
-  handleFormCancellation: function(e) {
-    this.wrapUp();
-    if (e) Event.stop(e);
-  },
-  handleFormSubmission: function(e) {
-    var form = this._form;
-    var value = $F(this._controls.editor);
-    this.prepareSubmission();
-    var params = this.options.callback(form, value) || '';
-    if (Object.isString(params))
-      params = params.toQueryParams();
-    params.editorId = this.element.id;
-    if (this.options.htmlResponse) {
-      var options = Object.extend({ evalScripts: true }, this.options.ajaxOptions);
-      Object.extend(options, {
-        parameters: params,
-        onComplete: this._boundWrapperHandler,
-        onFailure: this._boundFailureHandler
-      });
-      new Ajax.Updater({ success: this.element }, this.url, options);
-    } else {
-      var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
-      Object.extend(options, {
-        parameters: params,
-        onComplete: this._boundWrapperHandler,
-        onFailure: this._boundFailureHandler
-      });
-      new Ajax.Request(this.url, options);
-    }
-    if (e) Event.stop(e);
-  },
-  leaveEditMode: function() {
-    this.element.removeClassName(this.options.savingClassName);
-    this.removeForm();
-    this.leaveHover();
-    this.element.style.backgroundColor = this._originalBackground;
-    this.element.show();
-    if (this.options.externalControl)
-      this.options.externalControl.show();
-    this._saving = false;
-    this._editing = false;
-    this._oldInnerHTML = null;
-    this.triggerCallback('onLeaveEditMode');
-  },
-  leaveHover: function(e) {
-    if (this.options.hoverClassName)
-      this.element.removeClassName(this.options.hoverClassName);
-    if (this._saving) return;
-    this.triggerCallback('onLeaveHover');
-  },
-  loadExternalText: function() {
-    this._form.addClassName(this.options.loadingClassName);
-    this._controls.editor.disabled = true;
-    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
-    Object.extend(options, {
-      parameters: 'editorId=' + encodeURIComponent(this.element.id),
-      onComplete: Prototype.emptyFunction,
-      onSuccess: function(transport) {
-        this._form.removeClassName(this.options.loadingClassName);
-        var text = transport.responseText;
-        if (this.options.stripLoadedTextTags)
-          text = text.stripTags();
-        this._controls.editor.value = text;
-        this._controls.editor.disabled = false;
-        this.postProcessEditField();
-      }.bind(this),
-      onFailure: this._boundFailureHandler
-    });
-    new Ajax.Request(this.options.loadTextURL, options);
-  },
-  postProcessEditField: function() {
-    var fpc = this.options.fieldPostCreation;
-    if (fpc)
-      $(this._controls.editor)['focus' == fpc ? 'focus' : 'activate']();
-  },
-  prepareOptions: function() {
-    this.options = Object.clone(Ajax.InPlaceEditor.DefaultOptions);
-    Object.extend(this.options, Ajax.InPlaceEditor.DefaultCallbacks);
-    [this._extraDefaultOptions].flatten().compact().each(function(defs) {
-      Object.extend(this.options, defs);
-    }.bind(this));
-  },
-  prepareSubmission: function() {
-    this._saving = true;
-    this.removeForm();
-    this.leaveHover();
-    this.showSaving();
-  },
-  registerListeners: function() {
-    this._listeners = { };
-    var listener;
-    $H(Ajax.InPlaceEditor.Listeners).each(function(pair) {
-      listener = this[pair.value].bind(this);
-      this._listeners[pair.key] = listener;
-      if (!this.options.externalControlOnly)
-        this.element.observe(pair.key, listener);
-      if (this.options.externalControl)
-        this.options.externalControl.observe(pair.key, listener);
-    }.bind(this));
-  },
-  removeForm: function() {
-    if (!this._form) return;
-    this._form.remove();
-    this._form = null;
-    this._controls = { };
-  },
-  showSaving: function() {
-    this._oldInnerHTML = this.element.innerHTML;
-    this.element.innerHTML = this.options.savingText;
-    this.element.addClassName(this.options.savingClassName);
-    this.element.style.backgroundColor = this._originalBackground;
-    this.element.show();
-  },
-  triggerCallback: function(cbName, arg) {
-    if ('function' == typeof this.options[cbName]) {
-      this.options[cbName](this, arg);
-    }
-  },
-  unregisterListeners: function() {
-    $H(this._listeners).each(function(pair) {
-      if (!this.options.externalControlOnly)
-        this.element.stopObserving(pair.key, pair.value);
-      if (this.options.externalControl)
-        this.options.externalControl.stopObserving(pair.key, pair.value);
-    }.bind(this));
-  },
-  wrapUp: function(transport) {
-    this.leaveEditMode();
-    // Can't use triggerCallback due to backward compatibility: requires
-    // binding + direct element
-    this._boundComplete(transport, this.element);
-  }
-});
-
-Object.extend(Ajax.InPlaceEditor.prototype, {
-  dispose: Ajax.InPlaceEditor.prototype.destroy
-});
-
-Ajax.InPlaceCollectionEditor = Class.create(Ajax.InPlaceEditor, {
-  initialize: function($super, element, url, options) {
-    this._extraDefaultOptions = Ajax.InPlaceCollectionEditor.DefaultOptions;
-    $super(element, url, options);
-  },
-
-  createEditField: function() {
-    var list = document.createElement('select');
-    list.name = this.options.paramName;
-    list.size = 1;
-    this._controls.editor = list;
-    this._collection = this.options.collection || [];
-    if (this.options.loadCollectionURL)
-      this.loadCollection();
-    else
-      this.checkForExternalText();
-    this._form.appendChild(this._controls.editor);
-  },
-
-  loadCollection: function() {
-    this._form.addClassName(this.options.loadingClassName);
-    this.showLoadingText(this.options.loadingCollectionText);
-    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
-    Object.extend(options, {
-      parameters: 'editorId=' + encodeURIComponent(this.element.id),
-      onComplete: Prototype.emptyFunction,
-      onSuccess: function(transport) {
-        var js = transport.responseText.strip();
-        if (!/^\[.*\]$/.test(js)) // TODO: improve sanity check
-          throw('Server returned an invalid collection representation.');
-        this._collection = eval(js);
-        this.checkForExternalText();
-      }.bind(this),
-      onFailure: this.onFailure
-    });
-    new Ajax.Request(this.options.loadCollectionURL, options);
-  },
-
-  showLoadingText: function(text) {
-    this._controls.editor.disabled = true;
-    var tempOption = this._controls.editor.firstChild;
-    if (!tempOption) {
-      tempOption = document.createElement('option');
-      tempOption.value = '';
-      this._controls.editor.appendChild(tempOption);
-      tempOption.selected = true;
-    }
-    tempOption.update((text || '').stripScripts().stripTags());
-  },
-
-  checkForExternalText: function() {
-    this._text = this.getText();
-    if (this.options.loadTextURL)
-      this.loadExternalText();
-    else
-      this.buildOptionList();
-  },
-
-  loadExternalText: function() {
-    this.showLoadingText(this.options.loadingText);
-    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
-    Object.extend(options, {
-      parameters: 'editorId=' + encodeURIComponent(this.element.id),
-      onComplete: Prototype.emptyFunction,
-      onSuccess: function(transport) {
-        this._text = transport.responseText.strip();
-        this.buildOptionList();
-      }.bind(this),
-      onFailure: this.onFailure
-    });
-    new Ajax.Request(this.options.loadTextURL, options);
-  },
-
-  buildOptionList: function() {
-    this._form.removeClassName(this.options.loadingClassName);
-    this._collection = this._collection.map(function(entry) {
-      return 2 === entry.length ? entry : [entry, entry].flatten();
-    });
-    var marker = ('value' in this.options) ? this.options.value : this._text;
-    var textFound = this._collection.any(function(entry) {
-      return entry[0] == marker;
-    }.bind(this));
-    this._controls.editor.update('');
-    var option;
-    this._collection.each(function(entry, index) {
-      option = document.createElement('option');
-      option.value = entry[0];
-      option.selected = textFound ? entry[0] == marker : 0 == index;
-      option.appendChild(document.createTextNode(entry[1]));
-      this._controls.editor.appendChild(option);
-    }.bind(this));
-    this._controls.editor.disabled = false;
-    Field.scrollFreeActivate(this._controls.editor);
-  }
-});
-
-//**** DEPRECATION LAYER FOR InPlace[Collection]Editor! ****
-//**** This only  exists for a while,  in order to  let ****
-//**** users adapt to  the new API.  Read up on the new ****
-//**** API and convert your code to it ASAP!            ****
-
-Ajax.InPlaceEditor.prototype.initialize.dealWithDeprecatedOptions = function(options) {
-  if (!options) return;
-  function fallback(name, expr) {
-    if (name in options || expr === undefined) return;
-    options[name] = expr;
-  };
-  fallback('cancelControl', (options.cancelLink ? 'link' : (options.cancelButton ? 'button' :
-    options.cancelLink == options.cancelButton == false ? false : undefined)));
-  fallback('okControl', (options.okLink ? 'link' : (options.okButton ? 'button' :
-    options.okLink == options.okButton == false ? false : undefined)));
-  fallback('highlightColor', options.highlightcolor);
-  fallback('highlightEndColor', options.highlightendcolor);
-};
-
-Object.extend(Ajax.InPlaceEditor, {
-  DefaultOptions: {
-    ajaxOptions: { },
-    autoRows: 3,                                // Use when multi-line w/ rows == 1
-    cancelControl: 'link',                      // 'link'|'button'|false
-    cancelText: 'cancel',
-    clickToEditText: 'Click to edit',
-    externalControl: null,                      // id|elt
-    externalControlOnly: false,
-    fieldPostCreation: 'activate',              // 'activate'|'focus'|false
-    formClassName: 'inplaceeditor-form',
-    formId: null,                               // id|elt
-    highlightColor: '#ffff99',
-    highlightEndColor: '#ffffff',
-    hoverClassName: '',
-    htmlResponse: true,
-    loadingClassName: 'inplaceeditor-loading',
-    loadingText: 'Loading...',
-    okControl: 'button',                        // 'link'|'button'|false
-    okText: 'ok',
-    paramName: 'value',
-    rows: 1,                                    // If 1 and multi-line, uses autoRows
-    savingClassName: 'inplaceeditor-saving',
-    savingText: 'Saving...',
-    size: 0,
-    stripLoadedTextTags: false,
-    submitOnBlur: false,
-    textAfterControls: '',
-    textBeforeControls: '',
-    textBetweenControls: ''
-  },
-  DefaultCallbacks: {
-    callback: function(form) {
-      return Form.serialize(form);
-    },
-    onComplete: function(transport, element) {
-      // For backward compatibility, this one is bound to the IPE, and passes
-      // the element directly.  It was too often customized, so we don't break it.
-      new Effect.Highlight(element, {
-        startcolor: this.options.highlightColor, keepBackgroundImage: true });
-    },
-    onEnterEditMode: null,
-    onEnterHover: function(ipe) {
-      ipe.element.style.backgroundColor = ipe.options.highlightColor;
-      if (ipe._effect)
-        ipe._effect.cancel();
-    },
-    onFailure: function(transport, ipe) {
-      alert('Error communication with the server: ' + transport.responseText.stripTags());
-    },
-    onFormCustomization: null, // Takes the IPE and its generated form, after editor, before controls.
-    onLeaveEditMode: null,
-    onLeaveHover: function(ipe) {
-      ipe._effect = new Effect.Highlight(ipe.element, {
-        startcolor: ipe.options.highlightColor, endcolor: ipe.options.highlightEndColor,
-        restorecolor: ipe._originalBackground, keepBackgroundImage: true
-      });
-    }
-  },
-  Listeners: {
-    click: 'enterEditMode',
-    keydown: 'checkForEscapeOrReturn',
-    mouseover: 'enterHover',
-    mouseout: 'leaveHover'
-  }
-});
-
-Ajax.InPlaceCollectionEditor.DefaultOptions = {
-  loadingCollectionText: 'Loading options...'
-};
-
-// Delayed observer, like Form.Element.Observer,
-// but waits for delay after last key input
-// Ideal for live-search fields
-
-Form.Element.DelayedObserver = Class.create({
-  initialize: function(element, delay, callback) {
-    this.delay     = delay || 0.5;
-    this.element   = $(element);
-    this.callback  = callback;
-    this.timer     = null;
-    this.lastValue = $F(this.element);
-    Event.observe(this.element,'keyup',this.delayedListener.bindAsEventListener(this));
-  },
-  delayedListener: function(event) {
-    if(this.lastValue == $F(this.element)) return;
-    if(this.timer) clearTimeout(this.timer);
-    this.timer = setTimeout(this.onTimerEvent.bind(this), this.delay * 1000);
-    this.lastValue = $F(this.element);
-  },
-  onTimerEvent: function() {
-    this.timer = null;
-    this.callback(this.element, $F(this.element));
-  }
-});
\ No newline at end of file
diff --git a/plugins/sfProtoculousPlugin/web/js/dragdrop.js b/plugins/sfProtoculousPlugin/web/js/dragdrop.js
deleted file mode 100644
index 07c98e2bd..000000000
--- a/plugins/sfProtoculousPlugin/web/js/dragdrop.js
+++ /dev/null
@@ -1,975 +0,0 @@
-// script.aculo.us dragdrop.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
-
-// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//           (c) 2005-2008 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
-//
-// script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-if(Object.isUndefined(Effect))
-  throw("dragdrop.js requires including script.aculo.us' effects.js library");
-
-var Droppables = {
-  drops: [],
-
-  remove: function(element) {
-    this.drops = this.drops.reject(function(d) { return d.element==$(element) });
-  },
-
-  add: function(element) {
-    element = $(element);
-    var options = Object.extend({
-      greedy:     true,
-      hoverclass: null,
-      tree:       false
-    }, arguments[1] || { });
-
-    // cache containers
-    if(options.containment) {
-      options._containers = [];
-      var containment = options.containment;
-      if(Object.isArray(containment)) {
-        containment.each( function(c) { options._containers.push($(c)) });
-      } else {
-        options._containers.push($(containment));
-      }
-    }
-
-    if(options.accept) options.accept = [options.accept].flatten();
-
-    Element.makePositioned(element); // fix IE
-    options.element = element;
-
-    this.drops.push(options);
-  },
-
-  findDeepestChild: function(drops) {
-    deepest = drops[0];
-
-    for (i = 1; i < drops.length; ++i)
-      if (Element.isParent(drops[i].element, deepest.element))
-        deepest = drops[i];
-
-    return deepest;
-  },
-
-  isContained: function(element, drop) {
-    var containmentNode;
-    if(drop.tree) {
-      containmentNode = element.treeNode;
-    } else {
-      containmentNode = element.parentNode;
-    }
-    return drop._containers.detect(function(c) { return containmentNode == c });
-  },
-
-  isAffected: function(point, element, drop) {
-    return (
-      (drop.element!=element) &&
-      ((!drop._containers) ||
-        this.isContained(element, drop)) &&
-      ((!drop.accept) ||
-        (Element.classNames(element).detect(
-          function(v) { return drop.accept.include(v) } ) )) &&
-      Position.within(drop.element, point[0], point[1]) );
-  },
-
-  deactivate: function(drop) {
-    if(drop.hoverclass)
-      Element.removeClassName(drop.element, drop.hoverclass);
-    this.last_active = null;
-  },
-
-  activate: function(drop) {
-    if(drop.hoverclass)
-      Element.addClassName(drop.element, drop.hoverclass);
-    this.last_active = drop;
-  },
-
-  show: function(point, element) {
-    if(!this.drops.length) return;
-    var drop, affected = [];
-
-    this.drops.each( function(drop) {
-      if(Droppables.isAffected(point, element, drop))
-        affected.push(drop);
-    });
-
-    if(affected.length>0)
-      drop = Droppables.findDeepestChild(affected);
-
-    if(this.last_active && this.last_active != drop) this.deactivate(this.last_active);
-    if (drop) {
-      Position.within(drop.element, point[0], point[1]);
-      if(drop.onHover)
-        drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));
-
-      if (drop != this.last_active) Droppables.activate(drop);
-    }
-  },
-
-  fire: function(event, element) {
-    if(!this.last_active) return;
-    Position.prepare();
-
-    if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active))
-      if (this.last_active.onDrop) {
-        this.last_active.onDrop(element, this.last_active.element, event);
-        return true;
-      }
-  },
-
-  reset: function() {
-    if(this.last_active)
-      this.deactivate(this.last_active);
-  }
-};
-
-var Draggables = {
-  drags: [],
-  observers: [],
-
-  register: function(draggable) {
-    if(this.drags.length == 0) {
-      this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
-      this.eventMouseMove = this.updateDrag.bindAsEventListener(this);
-      this.eventKeypress  = this.keyPress.bindAsEventListener(this);
-
-      Event.observe(document, "mouseup", this.eventMouseUp);
-      Event.observe(document, "mousemove", this.eventMouseMove);
-      Event.observe(document, "keypress", this.eventKeypress);
-    }
-    this.drags.push(draggable);
-  },
-
-  unregister: function(draggable) {
-    this.drags = this.drags.reject(function(d) { return d==draggable });
-    if(this.drags.length == 0) {
-      Event.stopObserving(document, "mouseup", this.eventMouseUp);
-      Event.stopObserving(document, "mousemove", this.eventMouseMove);
-      Event.stopObserving(document, "keypress", this.eventKeypress);
-    }
-  },
-
-  activate: function(draggable) {
-    if(draggable.options.delay) {
-      this._timeout = setTimeout(function() {
-        Draggables._timeout = null;
-        window.focus();
-        Draggables.activeDraggable = draggable;
-      }.bind(this), draggable.options.delay);
-    } else {
-      window.focus(); // allows keypress events if window isn't currently focused, fails for Safari
-      this.activeDraggable = draggable;
-    }
-  },
-
-  deactivate: function() {
-    this.activeDraggable = null;
-  },
-
-  updateDrag: function(event) {
-    if(!this.activeDraggable) return;
-    var pointer = [Event.pointerX(event), Event.pointerY(event)];
-    // Mozilla-based browsers fire successive mousemove events with
-    // the same coordinates, prevent needless redrawing (moz bug?)
-    if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return;
-    this._lastPointer = pointer;
-
-    this.activeDraggable.updateDrag(event, pointer);
-  },
-
-  endDrag: function(event) {
-    if(this._timeout) {
-      clearTimeout(this._timeout);
-      this._timeout = null;
-    }
-    if(!this.activeDraggable) return;
-    this._lastPointer = null;
-    this.activeDraggable.endDrag(event);
-    this.activeDraggable = null;
-  },
-
-  keyPress: function(event) {
-    if(this.activeDraggable)
-      this.activeDraggable.keyPress(event);
-  },
-
-  addObserver: function(observer) {
-    this.observers.push(observer);
-    this._cacheObserverCallbacks();
-  },
-
-  removeObserver: function(element) {  // element instead of observer fixes mem leaks
-    this.observers = this.observers.reject( function(o) { return o.element==element });
-    this._cacheObserverCallbacks();
-  },
-
-  notify: function(eventName, draggable, event) {  // 'onStart', 'onEnd', 'onDrag'
-    if(this[eventName+'Count'] > 0)
-      this.observers.each( function(o) {
-        if(o[eventName]) o[eventName](eventName, draggable, event);
-      });
-    if(draggable.options[eventName]) draggable.options[eventName](draggable, event);
-  },
-
-  _cacheObserverCallbacks: function() {
-    ['onStart','onEnd','onDrag'].each( function(eventName) {
-      Draggables[eventName+'Count'] = Draggables.observers.select(
-        function(o) { return o[eventName]; }
-      ).length;
-    });
-  }
-};
-
-/*--------------------------------------------------------------------------*/
-
-var Draggable = Class.create({
-  initialize: function(element) {
-    var defaults = {
-      handle: false,
-      reverteffect: function(element, top_offset, left_offset) {
-        var dur = Math.sqrt(Math.abs(top_offset^2)+Math.abs(left_offset^2))*0.02;
-        new Effect.Move(element, { x: -left_offset, y: -top_offset, duration: dur,
-          queue: {scope:'_draggable', position:'end'}
-        });
-      },
-      endeffect: function(element) {
-        var toOpacity = Object.isNumber(element._opacity) ? element._opacity : 1.0;
-        new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity,
-          queue: {scope:'_draggable', position:'end'},
-          afterFinish: function(){
-            Draggable._dragging[element] = false
-          }
-        });
-      },
-      zindex: 1000,
-      revert: false,
-      quiet: false,
-      scroll: false,
-      scrollSensitivity: 20,
-      scrollSpeed: 15,
-      snap: false,  // false, or xy or [x,y] or function(x,y){ return [x,y] }
-      delay: 0
-    };
-
-    if(!arguments[1] || Object.isUndefined(arguments[1].endeffect))
-      Object.extend(defaults, {
-        starteffect: function(element) {
-          element._opacity = Element.getOpacity(element);
-          Draggable._dragging[element] = true;
-          new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7});
-        }
-      });
-
-    var options = Object.extend(defaults, arguments[1] || { });
-
-    this.element = $(element);
-
-    if(options.handle && Object.isString(options.handle))
-      this.handle = this.element.down('.'+options.handle, 0);
-
-    if(!this.handle) this.handle = $(options.handle);
-    if(!this.handle) this.handle = this.element;
-
-    if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) {
-      options.scroll = $(options.scroll);
-      this._isScrollChild = Element.childOf(this.element, options.scroll);
-    }
-
-    Element.makePositioned(this.element); // fix IE
-
-    this.options  = options;
-    this.dragging = false;
-
-    this.eventMouseDown = this.initDrag.bindAsEventListener(this);
-    Event.observe(this.handle, "mousedown", this.eventMouseDown);
-
-    Draggables.register(this);
-  },
-
-  destroy: function() {
-    Event.stopObserving(this.handle, "mousedown", this.eventMouseDown);
-    Draggables.unregister(this);
-  },
-
-  currentDelta: function() {
-    return([
-      parseInt(Element.getStyle(this.element,'left') || '0'),
-      parseInt(Element.getStyle(this.element,'top') || '0')]);
-  },
-
-  initDrag: function(event) {
-    if(!Object.isUndefined(Draggable._dragging[this.element]) &&
-      Draggable._dragging[this.element]) return;
-    if(Event.isLeftClick(event)) {
-      // abort on form elements, fixes a Firefox issue
-      var src = Event.element(event);
-      if((tag_name = src.tagName.toUpperCase()) && (
-        tag_name=='INPUT' ||
-        tag_name=='SELECT' ||
-        tag_name=='OPTION' ||
-        tag_name=='BUTTON' ||
-        tag_name=='TEXTAREA')) return;
-
-      var pointer = [Event.pointerX(event), Event.pointerY(event)];
-      var pos     = Position.cumulativeOffset(this.element);
-      this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) });
-
-      Draggables.activate(this);
-      Event.stop(event);
-    }
-  },
-
-  startDrag: function(event) {
-    this.dragging = true;
-    if(!this.delta)
-      this.delta = this.currentDelta();
-
-    if(this.options.zindex) {
-      this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
-      this.element.style.zIndex = this.options.zindex;
-    }
-
-    if(this.options.ghosting) {
-      this._clone = this.element.cloneNode(true);
-      this._originallyAbsolute = (this.element.getStyle('position') == 'absolute');
-      if (!this._originallyAbsolute)
-        Position.absolutize(this.element);
-      this.element.parentNode.insertBefore(this._clone, this.element);
-    }
-
-    if(this.options.scroll) {
-      if (this.options.scroll == window) {
-        var where = this._getWindowScroll(this.options.scroll);
-        this.originalScrollLeft = where.left;
-        this.originalScrollTop = where.top;
-      } else {
-        this.originalScrollLeft = this.options.scroll.scrollLeft;
-        this.originalScrollTop = this.options.scroll.scrollTop;
-      }
-    }
-
-    Draggables.notify('onStart', this, event);
-
-    if(this.options.starteffect) this.options.starteffect(this.element);
-  },
-
-  updateDrag: function(event, pointer) {
-    if(!this.dragging) this.startDrag(event);
-
-    if(!this.options.quiet){
-      Position.prepare();
-      Droppables.show(pointer, this.element);
-    }
-
-    Draggables.notify('onDrag', this, event);
-
-    this.draw(pointer);
-    if(this.options.change) this.options.change(this);
-
-    if(this.options.scroll) {
-      this.stopScrolling();
-
-      var p;
-      if (this.options.scroll == window) {
-        with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; }
-      } else {
-        p = Position.page(this.options.scroll);
-        p[0] += this.options.scroll.scrollLeft + Position.deltaX;
-        p[1] += this.options.scroll.scrollTop + Position.deltaY;
-        p.push(p[0]+this.options.scroll.offsetWidth);
-        p.push(p[1]+this.options.scroll.offsetHeight);
-      }
-      var speed = [0,0];
-      if(pointer[0] < (p[0]+this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[0]+this.options.scrollSensitivity);
-      if(pointer[1] < (p[1]+this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[1]+this.options.scrollSensitivity);
-      if(pointer[0] > (p[2]-this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[2]-this.options.scrollSensitivity);
-      if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity);
-      this.startScrolling(speed);
-    }
-
-    // fix AppleWebKit rendering
-    if(Prototype.Browser.WebKit) window.scrollBy(0,0);
-
-    Event.stop(event);
-  },
-
-  finishDrag: function(event, success) {
-    this.dragging = false;
-
-    if(this.options.quiet){
-      Position.prepare();
-      var pointer = [Event.pointerX(event), Event.pointerY(event)];
-      Droppables.show(pointer, this.element);
-    }
-
-    if(this.options.ghosting) {
-      if (!this._originallyAbsolute)
-        Position.relativize(this.element);
-      delete this._originallyAbsolute;
-      Element.remove(this._clone);
-      this._clone = null;
-    }
-
-    var dropped = false;
-    if(success) {
-      dropped = Droppables.fire(event, this.element);
-      if (!dropped) dropped = false;
-    }
-    if(dropped && this.options.onDropped) this.options.onDropped(this.element);
-    Draggables.notify('onEnd', this, event);
-
-    var revert = this.options.revert;
-    if(revert && Object.isFunction(revert)) revert = revert(this.element);
-
-    var d = this.currentDelta();
-    if(revert && this.options.reverteffect) {
-      if (dropped == 0 || revert != 'failure')
-        this.options.reverteffect(this.element,
-          d[1]-this.delta[1], d[0]-this.delta[0]);
-    } else {
-      this.delta = d;
-    }
-
-    if(this.options.zindex)
-      this.element.style.zIndex = this.originalZ;
-
-    if(this.options.endeffect)
-      this.options.endeffect(this.element);
-
-    Draggables.deactivate(this);
-    Droppables.reset();
-  },
-
-  keyPress: function(event) {
-    if(event.keyCode!=Event.KEY_ESC) return;
-    this.finishDrag(event, false);
-    Event.stop(event);
-  },
-
-  endDrag: function(event) {
-    if(!this.dragging) return;
-    this.stopScrolling();
-    this.finishDrag(event, true);
-    Event.stop(event);
-  },
-
-  draw: function(point) {
-    var pos = Position.cumulativeOffset(this.element);
-    if(this.options.ghosting) {
-      var r   = Position.realOffset(this.element);
-      pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY;
-    }
-
-    var d = this.currentDelta();
-    pos[0] -= d[0]; pos[1] -= d[1];
-
-    if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) {
-      pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
-      pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
-    }
-
-    var p = [0,1].map(function(i){
-      return (point[i]-pos[i]-this.offset[i])
-    }.bind(this));
-
-    if(this.options.snap) {
-      if(Object.isFunction(this.options.snap)) {
-        p = this.options.snap(p[0],p[1],this);
-      } else {
-      if(Object.isArray(this.options.snap)) {
-        p = p.map( function(v, i) {
-          return (v/this.options.snap[i]).round()*this.options.snap[i] }.bind(this));
-      } else {
-        p = p.map( function(v) {
-          return (v/this.options.snap).round()*this.options.snap }.bind(this));
-      }
-    }}
-
-    var style = this.element.style;
-    if((!this.options.constraint) || (this.options.constraint=='horizontal'))
-      style.left = p[0] + "px";
-    if((!this.options.constraint) || (this.options.constraint=='vertical'))
-      style.top  = p[1] + "px";
-
-    if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
-  },
-
-  stopScrolling: function() {
-    if(this.scrollInterval) {
-      clearInterval(this.scrollInterval);
-      this.scrollInterval = null;
-      Draggables._lastScrollPointer = null;
-    }
-  },
-
-  startScrolling: function(speed) {
-    if(!(speed[0] || speed[1])) return;
-    this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed];
-    this.lastScrolled = new Date();
-    this.scrollInterval = setInterval(this.scroll.bind(this), 10);
-  },
-
-  scroll: function() {
-    var current = new Date();
-    var delta = current - this.lastScrolled;
-    this.lastScrolled = current;
-    if(this.options.scroll == window) {
-      with (this._getWindowScroll(this.options.scroll)) {
-        if (this.scrollSpeed[0] || this.scrollSpeed[1]) {
-          var d = delta / 1000;
-          this.options.scroll.scrollTo( left + d*this.scrollSpeed[0], top + d*this.scrollSpeed[1] );
-        }
-      }
-    } else {
-      this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000;
-      this.options.scroll.scrollTop  += this.scrollSpeed[1] * delta / 1000;
-    }
-
-    Position.prepare();
-    Droppables.show(Draggables._lastPointer, this.element);
-    Draggables.notify('onDrag', this);
-    if (this._isScrollChild) {
-      Draggables._lastScrollPointer = Draggables._lastScrollPointer || $A(Draggables._lastPointer);
-      Draggables._lastScrollPointer[0] += this.scrollSpeed[0] * delta / 1000;
-      Draggables._lastScrollPointer[1] += this.scrollSpeed[1] * delta / 1000;
-      if (Draggables._lastScrollPointer[0] < 0)
-        Draggables._lastScrollPointer[0] = 0;
-      if (Draggables._lastScrollPointer[1] < 0)
-        Draggables._lastScrollPointer[1] = 0;
-      this.draw(Draggables._lastScrollPointer);
-    }
-
-    if(this.options.change) this.options.change(this);
-  },
-
-  _getWindowScroll: function(w) {
-    var T, L, W, H;
-    with (w.document) {
-      if (w.document.documentElement && documentElement.scrollTop) {
-        T = documentElement.scrollTop;
-        L = documentElement.scrollLeft;
-      } else if (w.document.body) {
-        T = body.scrollTop;
-        L = body.scrollLeft;
-      }
-      if (w.innerWidth) {
-        W = w.innerWidth;
-        H = w.innerHeight;
-      } else if (w.document.documentElement && documentElement.clientWidth) {
-        W = documentElement.clientWidth;
-        H = documentElement.clientHeight;
-      } else {
-        W = body.offsetWidth;
-        H = body.offsetHeight;
-      }
-    }
-    return { top: T, left: L, width: W, height: H };
-  }
-});
-
-Draggable._dragging = { };
-
-/*--------------------------------------------------------------------------*/
-
-var SortableObserver = Class.create({
-  initialize: function(element, observer) {
-    this.element   = $(element);
-    this.observer  = observer;
-    this.lastValue = Sortable.serialize(this.element);
-  },
-
-  onStart: function() {
-    this.lastValue = Sortable.serialize(this.element);
-  },
-
-  onEnd: function() {
-    Sortable.unmark();
-    if(this.lastValue != Sortable.serialize(this.element))
-      this.observer(this.element)
-  }
-});
-
-var Sortable = {
-  SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/,
-
-  sortables: { },
-
-  _findRootElement: function(element) {
-    while (element.tagName.toUpperCase() != "BODY") {
-      if(element.id && Sortable.sortables[element.id]) return element;
-      element = element.parentNode;
-    }
-  },
-
-  options: function(element) {
-    element = Sortable._findRootElement($(element));
-    if(!element) return;
-    return Sortable.sortables[element.id];
-  },
-
-  destroy: function(element){
-    element = $(element);
-    var s = Sortable.sortables[element.id];
-
-    if(s) {
-      Draggables.removeObserver(s.element);
-      s.droppables.each(function(d){ Droppables.remove(d) });
-      s.draggables.invoke('destroy');
-
-      delete Sortable.sortables[s.element.id];
-    }
-  },
-
-  create: function(element) {
-    element = $(element);
-    var options = Object.extend({
-      element:     element,
-      tag:         'li',       // assumes li children, override with tag: 'tagname'
-      dropOnEmpty: false,
-      tree:        false,
-      treeTag:     'ul',
-      overlap:     'vertical', // one of 'vertical', 'horizontal'
-      constraint:  'vertical', // one of 'vertical', 'horizontal', false
-      containment: element,    // also takes array of elements (or id's); or false
-      handle:      false,      // or a CSS class
-      only:        false,
-      delay:       0,
-      hoverclass:  null,
-      ghosting:    false,
-      quiet:       false,
-      scroll:      false,
-      scrollSensitivity: 20,
-      scrollSpeed: 15,
-      format:      this.SERIALIZE_RULE,
-
-      // these take arrays of elements or ids and can be
-      // used for better initialization performance
-      elements:    false,
-      handles:     false,
-
-      onChange:    Prototype.emptyFunction,
-      onUpdate:    Prototype.emptyFunction
-    }, arguments[1] || { });
-
-    // clear any old sortable with same element
-    this.destroy(element);
-
-    // build options for the draggables
-    var options_for_draggable = {
-      revert:      true,
-      quiet:       options.quiet,
-      scroll:      options.scroll,
-      scrollSpeed: options.scrollSpeed,
-      scrollSensitivity: options.scrollSensitivity,
-      delay:       options.delay,
-      ghosting:    options.ghosting,
-      constraint:  options.constraint,
-      handle:      options.handle };
-
-    if(options.starteffect)
-      options_for_draggable.starteffect = options.starteffect;
-
-    if(options.reverteffect)
-      options_for_draggable.reverteffect = options.reverteffect;
-    else
-      if(options.ghosting) options_for_draggable.reverteffect = function(element) {
-        element.style.top  = 0;
-        element.style.left = 0;
-      };
-
-    if(options.endeffect)
-      options_for_draggable.endeffect = options.endeffect;
-
-    if(options.zindex)
-      options_for_draggable.zindex = options.zindex;
-
-    // build options for the droppables
-    var options_for_droppable = {
-      overlap:     options.overlap,
-      containment: options.containment,
-      tree:        options.tree,
-      hoverclass:  options.hoverclass,
-      onHover:     Sortable.onHover
-    };
-
-    var options_for_tree = {
-      onHover:      Sortable.onEmptyHover,
-      overlap:      options.overlap,
-      containment:  options.containment,
-      hoverclass:   options.hoverclass
-    };
-
-    // fix for gecko engine
-    Element.cleanWhitespace(element);
-
-    options.draggables = [];
-    options.droppables = [];
-
-    // drop on empty handling
-    if(options.dropOnEmpty || options.tree) {
-      Droppables.add(element, options_for_tree);
-      options.droppables.push(element);
-    }
-
-    (options.elements || this.findElements(element, options) || []).each( function(e,i) {
-      var handle = options.handles ? $(options.handles[i]) :
-        (options.handle ? $(e).select('.' + options.handle)[0] : e);
-      options.draggables.push(
-        new Draggable(e, Object.extend(options_for_draggable, { handle: handle })));
-      Droppables.add(e, options_for_droppable);
-      if(options.tree) e.treeNode = element;
-      options.droppables.push(e);
-    });
-
-    if(options.tree) {
-      (Sortable.findTreeElements(element, options) || []).each( function(e) {
-        Droppables.add(e, options_for_tree);
-        e.treeNode = element;
-        options.droppables.push(e);
-      });
-    }
-
-    // keep reference
-    this.sortables[element.id] = options;
-
-    // for onupdate
-    Draggables.addObserver(new SortableObserver(element, options.onUpdate));
-
-  },
-
-  // return all suitable-for-sortable elements in a guaranteed order
-  findElements: function(element, options) {
-    return Element.findChildren(
-      element, options.only, options.tree ? true : false, options.tag);
-  },
-
-  findTreeElements: function(element, options) {
-    return Element.findChildren(
-      element, options.only, options.tree ? true : false, options.treeTag);
-  },
-
-  onHover: function(element, dropon, overlap) {
-    if(Element.isParent(dropon, element)) return;
-
-    if(overlap > .33 && overlap < .66 && Sortable.options(dropon).tree) {
-      return;
-    } else if(overlap>0.5) {
-      Sortable.mark(dropon, 'before');
-      if(dropon.previousSibling != element) {
-        var oldParentNode = element.parentNode;
-        element.style.visibility = "hidden"; // fix gecko rendering
-        dropon.parentNode.insertBefore(element, dropon);
-        if(dropon.parentNode!=oldParentNode)
-          Sortable.options(oldParentNode).onChange(element);
-        Sortable.options(dropon.parentNode).onChange(element);
-      }
-    } else {
-      Sortable.mark(dropon, 'after');
-      var nextElement = dropon.nextSibling || null;
-      if(nextElement != element) {
-        var oldParentNode = element.parentNode;
-        element.style.visibility = "hidden"; // fix gecko rendering
-        dropon.parentNode.insertBefore(element, nextElement);
-        if(dropon.parentNode!=oldParentNode)
-          Sortable.options(oldParentNode).onChange(element);
-        Sortable.options(dropon.parentNode).onChange(element);
-      }
-    }
-  },
-
-  onEmptyHover: function(element, dropon, overlap) {
-    var oldParentNode = element.parentNode;
-    var droponOptions = Sortable.options(dropon);
-
-    if(!Element.isParent(dropon, element)) {
-      var index;
-
-      var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only});
-      var child = null;
-
-      if(children) {
-        var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap);
-
-        for (index = 0; index < children.length; index += 1) {
-          if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) {
-            offset -= Element.offsetSize (children[index], droponOptions.overlap);
-          } else if (offset - (Element.offsetSize (children[index], droponOptions.overlap) / 2) >= 0) {
-            child = index + 1 < children.length ? children[index + 1] : null;
-            break;
-          } else {
-            child = children[index];
-            break;
-          }
-        }
-      }
-
-      dropon.insertBefore(element, child);
-
-      Sortable.options(oldParentNode).onChange(element);
-      droponOptions.onChange(element);
-    }
-  },
-
-  unmark: function() {
-    if(Sortable._marker) Sortable._marker.hide();
-  },
-
-  mark: function(dropon, position) {
-    // mark on ghosting only
-    var sortable = Sortable.options(dropon.parentNode);
-    if(sortable && !sortable.ghosting) return;
-
-    if(!Sortable._marker) {
-      Sortable._marker =
-        ($('dropmarker') || Element.extend(document.createElement('DIV'))).
-          hide().addClassName('dropmarker').setStyle({position:'absolute'});
-      document.getElementsByTagName("body").item(0).appendChild(Sortable._marker);
-    }
-    var offsets = Position.cumulativeOffset(dropon);
-    Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'});
-
-    if(position=='after')
-      if(sortable.overlap == 'horizontal')
-        Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'});
-      else
-        Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'});
-
-    Sortable._marker.show();
-  },
-
-  _tree: function(element, options, parent) {
-    var children = Sortable.findElements(element, options) || [];
-
-    for (var i = 0; i < children.length; ++i) {
-      var match = children[i].id.match(options.format);
-
-      if (!match) continue;
-
-      var child = {
-        id: encodeURIComponent(match ? match[1] : null),
-        element: element,
-        parent: parent,
-        children: [],
-        position: parent.children.length,
-        container: $(children[i]).down(options.treeTag)
-      };
-
-      /* Get the element containing the children and recurse over it */
-      if (child.container)
-        this._tree(child.container, options, child);
-
-      parent.children.push (child);
-    }
-
-    return parent;
-  },
-
-  tree: function(element) {
-    element = $(element);
-    var sortableOptions = this.options(element);
-    var options = Object.extend({
-      tag: sortableOptions.tag,
-      treeTag: sortableOptions.treeTag,
-      only: sortableOptions.only,
-      name: element.id,
-      format: sortableOptions.format
-    }, arguments[1] || { });
-
-    var root = {
-      id: null,
-      parent: null,
-      children: [],
-      container: element,
-      position: 0
-    };
-
-    return Sortable._tree(element, options, root);
-  },
-
-  /* Construct a [i] index for a particular node */
-  _constructIndex: function(node) {
-    var index = '';
-    do {
-      if (node.id) index = '[' + node.position + ']' + index;
-    } while ((node = node.parent) != null);
-    return index;
-  },
-
-  sequence: function(element) {
-    element = $(element);
-    var options = Object.extend(this.options(element), arguments[1] || { });
-
-    return $(this.findElements(element, options) || []).map( function(item) {
-      return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
-    });
-  },
-
-  setSequence: function(element, new_sequence) {
-    element = $(element);
-    var options = Object.extend(this.options(element), arguments[2] || { });
-
-    var nodeMap = { };
-    this.findElements(element, options).each( function(n) {
-        if (n.id.match(options.format))
-            nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode];
-        n.parentNode.removeChild(n);
-    });
-
-    new_sequence.each(function(ident) {
-      var n = nodeMap[ident];
-      if (n) {
-        n[1].appendChild(n[0]);
-        delete nodeMap[ident];
-      }
-    });
-  },
-
-  serialize: function(element) {
-    element = $(element);
-    var options = Object.extend(Sortable.options(element), arguments[1] || { });
-    var name = encodeURIComponent(
-      (arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
-
-    if (options.tree) {
-      return Sortable.tree(element, arguments[1]).children.map( function (item) {
-        return [name + Sortable._constructIndex(item) + "[id]=" +
-                encodeURIComponent(item.id)].concat(item.children.map(arguments.callee));
-      }).flatten().join('&');
-    } else {
-      return Sortable.sequence(element, arguments[1]).map( function(item) {
-        return name + "[]=" + encodeURIComponent(item);
-      }).join('&');
-    }
-  }
-};
-
-// Returns true if child is contained within element
-Element.isParent = function(child, element) {
-  if (!child.parentNode || child == element) return false;
-  if (child.parentNode == element) return true;
-  return Element.isParent(child.parentNode, element);
-};
-
-Element.findChildren = function(element, only, recursive, tagName) {
-  if(!element.hasChildNodes()) return null;
-  tagName = tagName.toUpperCase();
-  if(only) only = [only].flatten();
-  var elements = [];
-  $A(element.childNodes).each( function(e) {
-    if(e.tagName && e.tagName.toUpperCase()==tagName &&
-      (!only || (Element.classNames(e).detect(function(v) { return only.include(v) }))))
-        elements.push(e);
-    if(recursive) {
-      var grandchildren = Element.findChildren(e, only, recursive, tagName);
-      if(grandchildren) elements.push(grandchildren);
-    }
-  });
-
-  return (elements.length>0 ? elements.flatten() : []);
-};
-
-Element.offsetSize = function (element, type) {
-  return element['offset' + ((type=='vertical' || type=='height') ? 'Height' : 'Width')];
-};
\ No newline at end of file
diff --git a/plugins/sfProtoculousPlugin/web/js/effects.js b/plugins/sfProtoculousPlugin/web/js/effects.js
deleted file mode 100644
index f31a81a00..000000000
--- a/plugins/sfProtoculousPlugin/web/js/effects.js
+++ /dev/null
@@ -1,1130 +0,0 @@
-// script.aculo.us effects.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
-
-// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-// Contributors:
-//  Justin Palmer (http://encytemedia.com/)
-//  Mark Pilgrim (http://diveintomark.org/)
-//  Martin Bialasinki
-//
-// script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-// converts rgb() and #xxx to #xxxxxx format,
-// returns self (or first argument) if not convertable
-String.prototype.parseColor = function() {
-  var color = '#';
-  if (this.slice(0,4) == 'rgb(') {
-    var cols = this.slice(4,this.length-1).split(',');
-    var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3);
-  } else {
-    if (this.slice(0,1) == '#') {
-      if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase();
-      if (this.length==7) color = this.toLowerCase();
-    }
-  }
-  return (color.length==7 ? color : (arguments[0] || this));
-};
-
-/*--------------------------------------------------------------------------*/
-
-Element.collectTextNodes = function(element) {
-  return $A($(element).childNodes).collect( function(node) {
-    return (node.nodeType==3 ? node.nodeValue :
-      (node.hasChildNodes() ? Element.collectTextNodes(node) : ''));
-  }).flatten().join('');
-};
-
-Element.collectTextNodesIgnoreClass = function(element, className) {
-  return $A($(element).childNodes).collect( function(node) {
-    return (node.nodeType==3 ? node.nodeValue :
-      ((node.hasChildNodes() && !Element.hasClassName(node,className)) ?
-        Element.collectTextNodesIgnoreClass(node, className) : ''));
-  }).flatten().join('');
-};
-
-Element.setContentZoom = function(element, percent) {
-  element = $(element);
-  element.setStyle({fontSize: (percent/100) + 'em'});
-  if (Prototype.Browser.WebKit) window.scrollBy(0,0);
-  return element;
-};
-
-Element.getInlineOpacity = function(element){
-  return $(element).style.opacity || '';
-};
-
-Element.forceRerendering = function(element) {
-  try {
-    element = $(element);
-    var n = document.createTextNode(' ');
-    element.appendChild(n);
-    element.removeChild(n);
-  } catch(e) { }
-};
-
-/*--------------------------------------------------------------------------*/
-
-var Effect = {
-  _elementDoesNotExistError: {
-    name: 'ElementDoesNotExistError',
-    message: 'The specified DOM element does not exist, but is required for this effect to operate'
-  },
-  Transitions: {
-    linear: Prototype.K,
-    sinoidal: function(pos) {
-      return (-Math.cos(pos*Math.PI)/2) + .5;
-    },
-    reverse: function(pos) {
-      return 1-pos;
-    },
-    flicker: function(pos) {
-      var pos = ((-Math.cos(pos*Math.PI)/4) + .75) + Math.random()/4;
-      return pos > 1 ? 1 : pos;
-    },
-    wobble: function(pos) {
-      return (-Math.cos(pos*Math.PI*(9*pos))/2) + .5;
-    },
-    pulse: function(pos, pulses) {
-      return (-Math.cos((pos*((pulses||5)-.5)*2)*Math.PI)/2) + .5;
-    },
-    spring: function(pos) {
-      return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6));
-    },
-    none: function(pos) {
-      return 0;
-    },
-    full: function(pos) {
-      return 1;
-    }
-  },
-  DefaultOptions: {
-    duration:   1.0,   // seconds
-    fps:        100,   // 100= assume 66fps max.
-    sync:       false, // true for combining
-    from:       0.0,
-    to:         1.0,
-    delay:      0.0,
-    queue:      'parallel'
-  },
-  tagifyText: function(element) {
-    var tagifyStyle = 'position:relative';
-    if (Prototype.Browser.IE) tagifyStyle += ';zoom:1';
-
-    element = $(element);
-    $A(element.childNodes).each( function(child) {
-      if (child.nodeType==3) {
-        child.nodeValue.toArray().each( function(character) {
-          element.insertBefore(
-            new Element('span', {style: tagifyStyle}).update(
-              character == ' ' ? String.fromCharCode(160) : character),
-              child);
-        });
-        Element.remove(child);
-      }
-    });
-  },
-  multiple: function(element, effect) {
-    var elements;
-    if (((typeof element == 'object') ||
-        Object.isFunction(element)) &&
-       (element.length))
-      elements = element;
-    else
-      elements = $(element).childNodes;
-
-    var options = Object.extend({
-      speed: 0.1,
-      delay: 0.0
-    }, arguments[2] || { });
-    var masterDelay = options.delay;
-
-    $A(elements).each( function(element, index) {
-      new effect(element, Object.extend(options, { delay: index * options.speed + masterDelay }));
-    });
-  },
-  PAIRS: {
-    'slide':  ['SlideDown','SlideUp'],
-    'blind':  ['BlindDown','BlindUp'],
-    'appear': ['Appear','Fade']
-  },
-  toggle: function(element, effect) {
-    element = $(element);
-    effect = (effect || 'appear').toLowerCase();
-    var options = Object.extend({
-      queue: { position:'end', scope:(element.id || 'global'), limit: 1 }
-    }, arguments[2] || { });
-    Effect[element.visible() ?
-      Effect.PAIRS[effect][1] : Effect.PAIRS[effect][0]](element, options);
-  }
-};
-
-Effect.DefaultOptions.transition = Effect.Transitions.sinoidal;
-
-/* ------------- core effects ------------- */
-
-Effect.ScopedQueue = Class.create(Enumerable, {
-  initialize: function() {
-    this.effects  = [];
-    this.interval = null;
-  },
-  _each: function(iterator) {
-    this.effects._each(iterator);
-  },
-  add: function(effect) {
-    var timestamp = new Date().getTime();
-
-    var position = Object.isString(effect.options.queue) ?
-      effect.options.queue : effect.options.queue.position;
-
-    switch(position) {
-      case 'front':
-        // move unstarted effects after this effect
-        this.effects.findAll(function(e){ return e.state=='idle' }).each( function(e) {
-            e.startOn  += effect.finishOn;
-            e.finishOn += effect.finishOn;
-          });
-        break;
-      case 'with-last':
-        timestamp = this.effects.pluck('startOn').max() || timestamp;
-        break;
-      case 'end':
-        // start effect after last queued effect has finished
-        timestamp = this.effects.pluck('finishOn').max() || timestamp;
-        break;
-    }
-
-    effect.startOn  += timestamp;
-    effect.finishOn += timestamp;
-
-    if (!effect.options.queue.limit || (this.effects.length < effect.options.queue.limit))
-      this.effects.push(effect);
-
-    if (!this.interval)
-      this.interval = setInterval(this.loop.bind(this), 15);
-  },
-  remove: function(effect) {
-    this.effects = this.effects.reject(function(e) { return e==effect });
-    if (this.effects.length == 0) {
-      clearInterval(this.interval);
-      this.interval = null;
-    }
-  },
-  loop: function() {
-    var timePos = new Date().getTime();
-    for(var i=0, len=this.effects.length;i<len;i++)
-      this.effects[i] && this.effects[i].loop(timePos);
-  }
-});
-
-Effect.Queues = {
-  instances: $H(),
-  get: function(queueName) {
-    if (!Object.isString(queueName)) return queueName;
-
-    return this.instances.get(queueName) ||
-      this.instances.set(queueName, new Effect.ScopedQueue());
-  }
-};
-Effect.Queue = Effect.Queues.get('global');
-
-Effect.Base = Class.create({
-  position: null,
-  start: function(options) {
-    function codeForEvent(options,eventName){
-      return (
-        (options[eventName+'Internal'] ? 'this.options.'+eventName+'Internal(this);' : '') +
-        (options[eventName] ? 'this.options.'+eventName+'(this);' : '')
-      );
-    }
-    if (options && options.transition === false) options.transition = Effect.Transitions.linear;
-    this.options      = Object.extend(Object.extend({ },Effect.DefaultOptions), options || { });
-    this.currentFrame = 0;
-    this.state        = 'idle';
-    this.startOn      = this.options.delay*1000;
-    this.finishOn     = this.startOn+(this.options.duration*1000);
-    this.fromToDelta  = this.options.to-this.options.from;
-    this.totalTime    = this.finishOn-this.startOn;
-    this.totalFrames  = this.options.fps*this.options.duration;
-
-    this.render = (function() {
-      function dispatch(effect, eventName) {
-        if (effect.options[eventName + 'Internal'])
-          effect.options[eventName + 'Internal'](effect);
-        if (effect.options[eventName])
-          effect.options[eventName](effect);
-      }
-
-      return function(pos) {
-        if (this.state === "idle") {
-          this.state = "running";
-          dispatch(this, 'beforeSetup');
-          if (this.setup) this.setup();
-          dispatch(this, 'afterSetup');
-        }
-        if (this.state === "running") {
-          pos = (this.options.transition(pos) * this.fromToDelta) + this.options.from;
-          this.position = pos;
-          dispatch(this, 'beforeUpdate');
-          if (this.update) this.update(pos);
-          dispatch(this, 'afterUpdate');
-        }
-      };
-    })();
-
-    this.event('beforeStart');
-    if (!this.options.sync)
-      Effect.Queues.get(Object.isString(this.options.queue) ?
-        'global' : this.options.queue.scope).add(this);
-  },
-  loop: function(timePos) {
-    if (timePos >= this.startOn) {
-      if (timePos >= this.finishOn) {
-        this.render(1.0);
-        this.cancel();
-        this.event('beforeFinish');
-        if (this.finish) this.finish();
-        this.event('afterFinish');
-        return;
-      }
-      var pos   = (timePos - this.startOn) / this.totalTime,
-          frame = (pos * this.totalFrames).round();
-      if (frame > this.currentFrame) {
-        this.render(pos);
-        this.currentFrame = frame;
-      }
-    }
-  },
-  cancel: function() {
-    if (!this.options.sync)
-      Effect.Queues.get(Object.isString(this.options.queue) ?
-        'global' : this.options.queue.scope).remove(this);
-    this.state = 'finished';
-  },
-  event: function(eventName) {
-    if (this.options[eventName + 'Internal']) this.options[eventName + 'Internal'](this);
-    if (this.options[eventName]) this.options[eventName](this);
-  },
-  inspect: function() {
-    var data = $H();
-    for(property in this)
-      if (!Object.isFunction(this[property])) data.set(property, this[property]);
-    return '#<Effect:' + data.inspect() + ',options:' + $H(this.options).inspect() + '>';
-  }
-});
-
-Effect.Parallel = Class.create(Effect.Base, {
-  initialize: function(effects) {
-    this.effects = effects || [];
-    this.start(arguments[1]);
-  },
-  update: function(position) {
-    this.effects.invoke('render', position);
-  },
-  finish: function(position) {
-    this.effects.each( function(effect) {
-      effect.render(1.0);
-      effect.cancel();
-      effect.event('beforeFinish');
-      if (effect.finish) effect.finish(position);
-      effect.event('afterFinish');
-    });
-  }
-});
-
-Effect.Tween = Class.create(Effect.Base, {
-  initialize: function(object, from, to) {
-    object = Object.isString(object) ? $(object) : object;
-    var args = $A(arguments), method = args.last(),
-      options = args.length == 5 ? args[3] : null;
-    this.method = Object.isFunction(method) ? method.bind(object) :
-      Object.isFunction(object[method]) ? object[method].bind(object) :
-      function(value) { object[method] = value };
-    this.start(Object.extend({ from: from, to: to }, options || { }));
-  },
-  update: function(position) {
-    this.method(position);
-  }
-});
-
-Effect.Event = Class.create(Effect.Base, {
-  initialize: function() {
-    this.start(Object.extend({ duration: 0 }, arguments[0] || { }));
-  },
-  update: Prototype.emptyFunction
-});
-
-Effect.Opacity = Class.create(Effect.Base, {
-  initialize: function(element) {
-    this.element = $(element);
-    if (!this.element) throw(Effect._elementDoesNotExistError);
-    // make this work on IE on elements without 'layout'
-    if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
-      this.element.setStyle({zoom: 1});
-    var options = Object.extend({
-      from: this.element.getOpacity() || 0.0,
-      to:   1.0
-    }, arguments[1] || { });
-    this.start(options);
-  },
-  update: function(position) {
-    this.element.setOpacity(position);
-  }
-});
-
-Effect.Move = Class.create(Effect.Base, {
-  initialize: function(element) {
-    this.element = $(element);
-    if (!this.element) throw(Effect._elementDoesNotExistError);
-    var options = Object.extend({
-      x:    0,
-      y:    0,
-      mode: 'relative'
-    }, arguments[1] || { });
-    this.start(options);
-  },
-  setup: function() {
-    this.element.makePositioned();
-    this.originalLeft = parseFloat(this.element.getStyle('left') || '0');
-    this.originalTop  = parseFloat(this.element.getStyle('top')  || '0');
-    if (this.options.mode == 'absolute') {
-      this.options.x = this.options.x - this.originalLeft;
-      this.options.y = this.options.y - this.originalTop;
-    }
-  },
-  update: function(position) {
-    this.element.setStyle({
-      left: (this.options.x  * position + this.originalLeft).round() + 'px',
-      top:  (this.options.y  * position + this.originalTop).round()  + 'px'
-    });
-  }
-});
-
-// for backwards compatibility
-Effect.MoveBy = function(element, toTop, toLeft) {
-  return new Effect.Move(element,
-    Object.extend({ x: toLeft, y: toTop }, arguments[3] || { }));
-};
-
-Effect.Scale = Class.create(Effect.Base, {
-  initialize: function(element, percent) {
-    this.element = $(element);
-    if (!this.element) throw(Effect._elementDoesNotExistError);
-    var options = Object.extend({
-      scaleX: true,
-      scaleY: true,
-      scaleContent: true,
-      scaleFromCenter: false,
-      scaleMode: 'box',        // 'box' or 'contents' or { } with provided values
-      scaleFrom: 100.0,
-      scaleTo:   percent
-    }, arguments[2] || { });
-    this.start(options);
-  },
-  setup: function() {
-    this.restoreAfterFinish = this.options.restoreAfterFinish || false;
-    this.elementPositioning = this.element.getStyle('position');
-
-    this.originalStyle = { };
-    ['top','left','width','height','fontSize'].each( function(k) {
-      this.originalStyle[k] = this.element.style[k];
-    }.bind(this));
-
-    this.originalTop  = this.element.offsetTop;
-    this.originalLeft = this.element.offsetLeft;
-
-    var fontSize = this.element.getStyle('font-size') || '100%';
-    ['em','px','%','pt'].each( function(fontSizeType) {
-      if (fontSize.indexOf(fontSizeType)>0) {
-        this.fontSize     = parseFloat(fontSize);
-        this.fontSizeType = fontSizeType;
-      }
-    }.bind(this));
-
-    this.factor = (this.options.scaleTo - this.options.scaleFrom)/100;
-
-    this.dims = null;
-    if (this.options.scaleMode=='box')
-      this.dims = [this.element.offsetHeight, this.element.offsetWidth];
-    if (/^content/.test(this.options.scaleMode))
-      this.dims = [this.element.scrollHeight, this.element.scrollWidth];
-    if (!this.dims)
-      this.dims = [this.options.scaleMode.originalHeight,
-                   this.options.scaleMode.originalWidth];
-  },
-  update: function(position) {
-    var currentScale = (this.options.scaleFrom/100.0) + (this.factor * position);
-    if (this.options.scaleContent && this.fontSize)
-      this.element.setStyle({fontSize: this.fontSize * currentScale + this.fontSizeType });
-    this.setDimensions(this.dims[0] * currentScale, this.dims[1] * currentScale);
-  },
-  finish: function(position) {
-    if (this.restoreAfterFinish) this.element.setStyle(this.originalStyle);
-  },
-  setDimensions: function(height, width) {
-    var d = { };
-    if (this.options.scaleX) d.width = width.round() + 'px';
-    if (this.options.scaleY) d.height = height.round() + 'px';
-    if (this.options.scaleFromCenter) {
-      var topd  = (height - this.dims[0])/2;
-      var leftd = (width  - this.dims[1])/2;
-      if (this.elementPositioning == 'absolute') {
-        if (this.options.scaleY) d.top = this.originalTop-topd + 'px';
-        if (this.options.scaleX) d.left = this.originalLeft-leftd + 'px';
-      } else {
-        if (this.options.scaleY) d.top = -topd + 'px';
-        if (this.options.scaleX) d.left = -leftd + 'px';
-      }
-    }
-    this.element.setStyle(d);
-  }
-});
-
-Effect.Highlight = Class.create(Effect.Base, {
-  initialize: function(element) {
-    this.element = $(element);
-    if (!this.element) throw(Effect._elementDoesNotExistError);
-    var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || { });
-    this.start(options);
-  },
-  setup: function() {
-    // Prevent executing on elements not in the layout flow
-    if (this.element.getStyle('display')=='none') { this.cancel(); return; }
-    // Disable background image during the effect
-    this.oldStyle = { };
-    if (!this.options.keepBackgroundImage) {
-      this.oldStyle.backgroundImage = this.element.getStyle('background-image');
-      this.element.setStyle({backgroundImage: 'none'});
-    }
-    if (!this.options.endcolor)
-      this.options.endcolor = this.element.getStyle('background-color').parseColor('#ffffff');
-    if (!this.options.restorecolor)
-      this.options.restorecolor = this.element.getStyle('background-color');
-    // init color calculations
-    this._base  = $R(0,2).map(function(i){ return parseInt(this.options.startcolor.slice(i*2+1,i*2+3),16) }.bind(this));
-    this._delta = $R(0,2).map(function(i){ return parseInt(this.options.endcolor.slice(i*2+1,i*2+3),16)-this._base[i] }.bind(this));
-  },
-  update: function(position) {
-    this.element.setStyle({backgroundColor: $R(0,2).inject('#',function(m,v,i){
-      return m+((this._base[i]+(this._delta[i]*position)).round().toColorPart()); }.bind(this)) });
-  },
-  finish: function() {
-    this.element.setStyle(Object.extend(this.oldStyle, {
-      backgroundColor: this.options.restorecolor
-    }));
-  }
-});
-
-Effect.ScrollTo = function(element) {
-  var options = arguments[1] || { },
-  scrollOffsets = document.viewport.getScrollOffsets(),
-  elementOffsets = $(element).cumulativeOffset();
-
-  if (options.offset) elementOffsets[1] += options.offset;
-
-  return new Effect.Tween(null,
-    scrollOffsets.top,
-    elementOffsets[1],
-    options,
-    function(p){ scrollTo(scrollOffsets.left, p.round()); }
-  );
-};
-
-/* ------------- combination effects ------------- */
-
-Effect.Fade = function(element) {
-  element = $(element);
-  var oldOpacity = element.getInlineOpacity();
-  var options = Object.extend({
-    from: element.getOpacity() || 1.0,
-    to:   0.0,
-    afterFinishInternal: function(effect) {
-      if (effect.options.to!=0) return;
-      effect.element.hide().setStyle({opacity: oldOpacity});
-    }
-  }, arguments[1] || { });
-  return new Effect.Opacity(element,options);
-};
-
-Effect.Appear = function(element) {
-  element = $(element);
-  var options = Object.extend({
-  from: (element.getStyle('display') == 'none' ? 0.0 : element.getOpacity() || 0.0),
-  to:   1.0,
-  // force Safari to render floated elements properly
-  afterFinishInternal: function(effect) {
-    effect.element.forceRerendering();
-  },
-  beforeSetup: function(effect) {
-    effect.element.setOpacity(effect.options.from).show();
-  }}, arguments[1] || { });
-  return new Effect.Opacity(element,options);
-};
-
-Effect.Puff = function(element) {
-  element = $(element);
-  var oldStyle = {
-    opacity: element.getInlineOpacity(),
-    position: element.getStyle('position'),
-    top:  element.style.top,
-    left: element.style.left,
-    width: element.style.width,
-    height: element.style.height
-  };
-  return new Effect.Parallel(
-   [ new Effect.Scale(element, 200,
-      { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }),
-     new Effect.Opacity(element, { sync: true, to: 0.0 } ) ],
-     Object.extend({ duration: 1.0,
-      beforeSetupInternal: function(effect) {
-        Position.absolutize(effect.effects[0].element);
-      },
-      afterFinishInternal: function(effect) {
-         effect.effects[0].element.hide().setStyle(oldStyle); }
-     }, arguments[1] || { })
-   );
-};
-
-Effect.BlindUp = function(element) {
-  element = $(element);
-  element.makeClipping();
-  return new Effect.Scale(element, 0,
-    Object.extend({ scaleContent: false,
-      scaleX: false,
-      restoreAfterFinish: true,
-      afterFinishInternal: function(effect) {
-        effect.element.hide().undoClipping();
-      }
-    }, arguments[1] || { })
-  );
-};
-
-Effect.BlindDown = function(element) {
-  element = $(element);
-  var elementDimensions = element.getDimensions();
-  return new Effect.Scale(element, 100, Object.extend({
-    scaleContent: false,
-    scaleX: false,
-    scaleFrom: 0,
-    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
-    restoreAfterFinish: true,
-    afterSetup: function(effect) {
-      effect.element.makeClipping().setStyle({height: '0px'}).show();
-    },
-    afterFinishInternal: function(effect) {
-      effect.element.undoClipping();
-    }
-  }, arguments[1] || { }));
-};
-
-Effect.SwitchOff = function(element) {
-  element = $(element);
-  var oldOpacity = element.getInlineOpacity();
-  return new Effect.Appear(element, Object.extend({
-    duration: 0.4,
-    from: 0,
-    transition: Effect.Transitions.flicker,
-    afterFinishInternal: function(effect) {
-      new Effect.Scale(effect.element, 1, {
-        duration: 0.3, scaleFromCenter: true,
-        scaleX: false, scaleContent: false, restoreAfterFinish: true,
-        beforeSetup: function(effect) {
-          effect.element.makePositioned().makeClipping();
-        },
-        afterFinishInternal: function(effect) {
-          effect.element.hide().undoClipping().undoPositioned().setStyle({opacity: oldOpacity});
-        }
-      });
-    }
-  }, arguments[1] || { }));
-};
-
-Effect.DropOut = function(element) {
-  element = $(element);
-  var oldStyle = {
-    top: element.getStyle('top'),
-    left: element.getStyle('left'),
-    opacity: element.getInlineOpacity() };
-  return new Effect.Parallel(
-    [ new Effect.Move(element, {x: 0, y: 100, sync: true }),
-      new Effect.Opacity(element, { sync: true, to: 0.0 }) ],
-    Object.extend(
-      { duration: 0.5,
-        beforeSetup: function(effect) {
-          effect.effects[0].element.makePositioned();
-        },
-        afterFinishInternal: function(effect) {
-          effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle);
-        }
-      }, arguments[1] || { }));
-};
-
-Effect.Shake = function(element) {
-  element = $(element);
-  var options = Object.extend({
-    distance: 20,
-    duration: 0.5
-  }, arguments[1] || {});
-  var distance = parseFloat(options.distance);
-  var split = parseFloat(options.duration) / 10.0;
-  var oldStyle = {
-    top: element.getStyle('top'),
-    left: element.getStyle('left') };
-    return new Effect.Move(element,
-      { x:  distance, y: 0, duration: split, afterFinishInternal: function(effect) {
-    new Effect.Move(effect.element,
-      { x: -distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
-    new Effect.Move(effect.element,
-      { x:  distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
-    new Effect.Move(effect.element,
-      { x: -distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
-    new Effect.Move(effect.element,
-      { x:  distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
-    new Effect.Move(effect.element,
-      { x: -distance, y: 0, duration: split, afterFinishInternal: function(effect) {
-        effect.element.undoPositioned().setStyle(oldStyle);
-  }}); }}); }}); }}); }}); }});
-};
-
-Effect.SlideDown = function(element) {
-  element = $(element).cleanWhitespace();
-  // SlideDown need to have the content of the element wrapped in a container element with fixed height!
-  var oldInnerBottom = element.down().getStyle('bottom');
-  var elementDimensions = element.getDimensions();
-  return new Effect.Scale(element, 100, Object.extend({
-    scaleContent: false,
-    scaleX: false,
-    scaleFrom: window.opera ? 0 : 1,
-    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
-    restoreAfterFinish: true,
-    afterSetup: function(effect) {
-      effect.element.makePositioned();
-      effect.element.down().makePositioned();
-      if (window.opera) effect.element.setStyle({top: ''});
-      effect.element.makeClipping().setStyle({height: '0px'}).show();
-    },
-    afterUpdateInternal: function(effect) {
-      effect.element.down().setStyle({bottom:
-        (effect.dims[0] - effect.element.clientHeight) + 'px' });
-    },
-    afterFinishInternal: function(effect) {
-      effect.element.undoClipping().undoPositioned();
-      effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom}); }
-    }, arguments[1] || { })
-  );
-};
-
-Effect.SlideUp = function(element) {
-  element = $(element).cleanWhitespace();
-  var oldInnerBottom = element.down().getStyle('bottom');
-  var elementDimensions = element.getDimensions();
-  return new Effect.Scale(element, window.opera ? 0 : 1,
-   Object.extend({ scaleContent: false,
-    scaleX: false,
-    scaleMode: 'box',
-    scaleFrom: 100,
-    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
-    restoreAfterFinish: true,
-    afterSetup: function(effect) {
-      effect.element.makePositioned();
-      effect.element.down().makePositioned();
-      if (window.opera) effect.element.setStyle({top: ''});
-      effect.element.makeClipping().show();
-    },
-    afterUpdateInternal: function(effect) {
-      effect.element.down().setStyle({bottom:
-        (effect.dims[0] - effect.element.clientHeight) + 'px' });
-    },
-    afterFinishInternal: function(effect) {
-      effect.element.hide().undoClipping().undoPositioned();
-      effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom});
-    }
-   }, arguments[1] || { })
-  );
-};
-
-// Bug in opera makes the TD containing this element expand for a instance after finish
-Effect.Squish = function(element) {
-  return new Effect.Scale(element, window.opera ? 1 : 0, {
-    restoreAfterFinish: true,
-    beforeSetup: function(effect) {
-      effect.element.makeClipping();
-    },
-    afterFinishInternal: function(effect) {
-      effect.element.hide().undoClipping();
-    }
-  });
-};
-
-Effect.Grow = function(element) {
-  element = $(element);
-  var options = Object.extend({
-    direction: 'center',
-    moveTransition: Effect.Transitions.sinoidal,
-    scaleTransition: Effect.Transitions.sinoidal,
-    opacityTransition: Effect.Transitions.full
-  }, arguments[1] || { });
-  var oldStyle = {
-    top: element.style.top,
-    left: element.style.left,
-    height: element.style.height,
-    width: element.style.width,
-    opacity: element.getInlineOpacity() };
-
-  var dims = element.getDimensions();
-  var initialMoveX, initialMoveY;
-  var moveX, moveY;
-
-  switch (options.direction) {
-    case 'top-left':
-      initialMoveX = initialMoveY = moveX = moveY = 0;
-      break;
-    case 'top-right':
-      initialMoveX = dims.width;
-      initialMoveY = moveY = 0;
-      moveX = -dims.width;
-      break;
-    case 'bottom-left':
-      initialMoveX = moveX = 0;
-      initialMoveY = dims.height;
-      moveY = -dims.height;
-      break;
-    case 'bottom-right':
-      initialMoveX = dims.width;
-      initialMoveY = dims.height;
-      moveX = -dims.width;
-      moveY = -dims.height;
-      break;
-    case 'center':
-      initialMoveX = dims.width / 2;
-      initialMoveY = dims.height / 2;
-      moveX = -dims.width / 2;
-      moveY = -dims.height / 2;
-      break;
-  }
-
-  return new Effect.Move(element, {
-    x: initialMoveX,
-    y: initialMoveY,
-    duration: 0.01,
-    beforeSetup: function(effect) {
-      effect.element.hide().makeClipping().makePositioned();
-    },
-    afterFinishInternal: function(effect) {
-      new Effect.Parallel(
-        [ new Effect.Opacity(effect.element, { sync: true, to: 1.0, from: 0.0, transition: options.opacityTransition }),
-          new Effect.Move(effect.element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }),
-          new Effect.Scale(effect.element, 100, {
-            scaleMode: { originalHeight: dims.height, originalWidth: dims.width },
-            sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true})
-        ], Object.extend({
-             beforeSetup: function(effect) {
-               effect.effects[0].element.setStyle({height: '0px'}).show();
-             },
-             afterFinishInternal: function(effect) {
-               effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle);
-             }
-           }, options)
-      );
-    }
-  });
-};
-
-Effect.Shrink = function(element) {
-  element = $(element);
-  var options = Object.extend({
-    direction: 'center',
-    moveTransition: Effect.Transitions.sinoidal,
-    scaleTransition: Effect.Transitions.sinoidal,
-    opacityTransition: Effect.Transitions.none
-  }, arguments[1] || { });
-  var oldStyle = {
-    top: element.style.top,
-    left: element.style.left,
-    height: element.style.height,
-    width: element.style.width,
-    opacity: element.getInlineOpacity() };
-
-  var dims = element.getDimensions();
-  var moveX, moveY;
-
-  switch (options.direction) {
-    case 'top-left':
-      moveX = moveY = 0;
-      break;
-    case 'top-right':
-      moveX = dims.width;
-      moveY = 0;
-      break;
-    case 'bottom-left':
-      moveX = 0;
-      moveY = dims.height;
-      break;
-    case 'bottom-right':
-      moveX = dims.width;
-      moveY = dims.height;
-      break;
-    case 'center':
-      moveX = dims.width / 2;
-      moveY = dims.height / 2;
-      break;
-  }
-
-  return new Effect.Parallel(
-    [ new Effect.Opacity(element, { sync: true, to: 0.0, from: 1.0, transition: options.opacityTransition }),
-      new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: options.scaleTransition, restoreAfterFinish: true}),
-      new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition })
-    ], Object.extend({
-         beforeStartInternal: function(effect) {
-           effect.effects[0].element.makePositioned().makeClipping();
-         },
-         afterFinishInternal: function(effect) {
-           effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); }
-       }, options)
-  );
-};
-
-Effect.Pulsate = function(element) {
-  element = $(element);
-  var options    = arguments[1] || { },
-    oldOpacity = element.getInlineOpacity(),
-    transition = options.transition || Effect.Transitions.linear,
-    reverser   = function(pos){
-      return 1 - transition((-Math.cos((pos*(options.pulses||5)*2)*Math.PI)/2) + .5);
-    };
-
-  return new Effect.Opacity(element,
-    Object.extend(Object.extend({  duration: 2.0, from: 0,
-      afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); }
-    }, options), {transition: reverser}));
-};
-
-Effect.Fold = function(element) {
-  element = $(element);
-  var oldStyle = {
-    top: element.style.top,
-    left: element.style.left,
-    width: element.style.width,
-    height: element.style.height };
-  element.makeClipping();
-  return new Effect.Scale(element, 5, Object.extend({
-    scaleContent: false,
-    scaleX: false,
-    afterFinishInternal: function(effect) {
-    new Effect.Scale(element, 1, {
-      scaleContent: false,
-      scaleY: false,
-      afterFinishInternal: function(effect) {
-        effect.element.hide().undoClipping().setStyle(oldStyle);
-      } });
-  }}, arguments[1] || { }));
-};
-
-Effect.Morph = Class.create(Effect.Base, {
-  initialize: function(element) {
-    this.element = $(element);
-    if (!this.element) throw(Effect._elementDoesNotExistError);
-    var options = Object.extend({
-      style: { }
-    }, arguments[1] || { });
-
-    if (!Object.isString(options.style)) this.style = $H(options.style);
-    else {
-      if (options.style.include(':'))
-        this.style = options.style.parseStyle();
-      else {
-        this.element.addClassName(options.style);
-        this.style = $H(this.element.getStyles());
-        this.element.removeClassName(options.style);
-        var css = this.element.getStyles();
-        this.style = this.style.reject(function(style) {
-          return style.value == css[style.key];
-        });
-        options.afterFinishInternal = function(effect) {
-          effect.element.addClassName(effect.options.style);
-          effect.transforms.each(function(transform) {
-            effect.element.style[transform.style] = '';
-          });
-        };
-      }
-    }
-    this.start(options);
-  },
-
-  setup: function(){
-    function parseColor(color){
-      if (!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff';
-      color = color.parseColor();
-      return $R(0,2).map(function(i){
-        return parseInt( color.slice(i*2+1,i*2+3), 16 );
-      });
-    }
-    this.transforms = this.style.map(function(pair){
-      var property = pair[0], value = pair[1], unit = null;
-
-      if (value.parseColor('#zzzzzz') != '#zzzzzz') {
-        value = value.parseColor();
-        unit  = 'color';
-      } else if (property == 'opacity') {
-        value = parseFloat(value);
-        if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
-          this.element.setStyle({zoom: 1});
-      } else if (Element.CSS_LENGTH.test(value)) {
-          var components = value.match(/^([\+\-]?[0-9\.]+)(.*)$/);
-          value = parseFloat(components[1]);
-          unit = (components.length == 3) ? components[2] : null;
-      }
-
-      var originalValue = this.element.getStyle(property);
-      return {
-        style: property.camelize(),
-        originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0),
-        targetValue: unit=='color' ? parseColor(value) : value,
-        unit: unit
-      };
-    }.bind(this)).reject(function(transform){
-      return (
-        (transform.originalValue == transform.targetValue) ||
-        (
-          transform.unit != 'color' &&
-          (isNaN(transform.originalValue) || isNaN(transform.targetValue))
-        )
-      );
-    });
-  },
-  update: function(position) {
-    var style = { }, transform, i = this.transforms.length;
-    while(i--)
-      style[(transform = this.transforms[i]).style] =
-        transform.unit=='color' ? '#'+
-          (Math.round(transform.originalValue[0]+
-            (transform.targetValue[0]-transform.originalValue[0])*position)).toColorPart() +
-          (Math.round(transform.originalValue[1]+
-            (transform.targetValue[1]-transform.originalValue[1])*position)).toColorPart() +
-          (Math.round(transform.originalValue[2]+
-            (transform.targetValue[2]-transform.originalValue[2])*position)).toColorPart() :
-        (transform.originalValue +
-          (transform.targetValue - transform.originalValue) * position).toFixed(3) +
-            (transform.unit === null ? '' : transform.unit);
-    this.element.setStyle(style, true);
-  }
-});
-
-Effect.Transform = Class.create({
-  initialize: function(tracks){
-    this.tracks  = [];
-    this.options = arguments[1] || { };
-    this.addTracks(tracks);
-  },
-  addTracks: function(tracks){
-    tracks.each(function(track){
-      track = $H(track);
-      var data = track.values().first();
-      this.tracks.push($H({
-        ids:     track.keys().first(),
-        effect:  Effect.Morph,
-        options: { style: data }
-      }));
-    }.bind(this));
-    return this;
-  },
-  play: function(){
-    return new Effect.Parallel(
-      this.tracks.map(function(track){
-        var ids = track.get('ids'), effect = track.get('effect'), options = track.get('options');
-        var elements = [$(ids) || $$(ids)].flatten();
-        return elements.map(function(e){ return new effect(e, Object.extend({ sync:true }, options)) });
-      }).flatten(),
-      this.options
-    );
-  }
-});
-
-Element.CSS_PROPERTIES = $w(
-  'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' +
-  'borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth ' +
-  'borderRightColor borderRightStyle borderRightWidth borderSpacing ' +
-  'borderTopColor borderTopStyle borderTopWidth bottom clip color ' +
-  'fontSize fontWeight height left letterSpacing lineHeight ' +
-  'marginBottom marginLeft marginRight marginTop markerOffset maxHeight '+
-  'maxWidth minHeight minWidth opacity outlineColor outlineOffset ' +
-  'outlineWidth paddingBottom paddingLeft paddingRight paddingTop ' +
-  'right textIndent top width wordSpacing zIndex');
-
-Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/;
-
-String.__parseStyleElement = document.createElement('div');
-String.prototype.parseStyle = function(){
-  var style, styleRules = $H();
-  if (Prototype.Browser.WebKit)
-    style = new Element('div',{style:this}).style;
-  else {
-    String.__parseStyleElement.innerHTML = '<div style="' + this + '"></div>';
-    style = String.__parseStyleElement.childNodes[0].style;
-  }
-
-  Element.CSS_PROPERTIES.each(function(property){
-    if (style[property]) styleRules.set(property, style[property]);
-  });
-
-  if (Prototype.Browser.IE && this.include('opacity'))
-    styleRules.set('opacity', this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1]);
-
-  return styleRules;
-};
-
-if (document.defaultView && document.defaultView.getComputedStyle) {
-  Element.getStyles = function(element) {
-    var css = document.defaultView.getComputedStyle($(element), null);
-    return Element.CSS_PROPERTIES.inject({ }, function(styles, property) {
-      styles[property] = css[property];
-      return styles;
-    });
-  };
-} else {
-  Element.getStyles = function(element) {
-    element = $(element);
-    var css = element.currentStyle, styles;
-    styles = Element.CSS_PROPERTIES.inject({ }, function(results, property) {
-      results[property] = css[property];
-      return results;
-    });
-    if (!styles.opacity) styles.opacity = element.getOpacity();
-    return styles;
-  };
-}
-
-Effect.Methods = {
-  morph: function(element, style) {
-    element = $(element);
-    new Effect.Morph(element, Object.extend({ style: style }, arguments[2] || { }));
-    return element;
-  },
-  visualEffect: function(element, effect, options) {
-    element = $(element);
-    var s = effect.dasherize().camelize(), klass = s.charAt(0).toUpperCase() + s.substring(1);
-    new Effect[klass](element, options);
-    return element;
-  },
-  highlight: function(element, options) {
-    element = $(element);
-    new Effect.Highlight(element, options);
-    return element;
-  }
-};
-
-$w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+
-  'pulsate shake puff squish switchOff dropOut').each(
-  function(effect) {
-    Effect.Methods[effect] = function(element, options){
-      element = $(element);
-      Effect[effect.charAt(0).toUpperCase() + effect.substring(1)](element, options);
-      return element;
-    };
-  }
-);
-
-$w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each(
-  function(f) { Effect.Methods[f] = Element[f]; }
-);
-
-Element.addMethods(Effect.Methods);
\ No newline at end of file
diff --git a/plugins/sfProtoculousPlugin/web/js/index.html b/plugins/sfProtoculousPlugin/web/js/index.html
deleted file mode 100644
index 7879e1ce9..000000000
--- a/plugins/sfProtoculousPlugin/web/js/index.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<html>
-<body>
-</body>
-</html>
diff --git a/plugins/sfProtoculousPlugin/web/js/prototype.js b/plugins/sfProtoculousPlugin/web/js/prototype.js
deleted file mode 100644
index dfe8ab4e1..000000000
--- a/plugins/sfProtoculousPlugin/web/js/prototype.js
+++ /dev/null
@@ -1,4320 +0,0 @@
-/*  Prototype JavaScript framework, version 1.6.0.3
- *  (c) 2005-2008 Sam Stephenson
- *
- *  Prototype is freely distributable under the terms of an MIT-style license.
- *  For details, see the Prototype web site: http://www.prototypejs.org/
- *
- *--------------------------------------------------------------------------*/
-
-var Prototype = {
-  Version: '1.6.0.3',
-
-  Browser: {
-    IE:     !!(window.attachEvent &&
-      navigator.userAgent.indexOf('Opera') === -1),
-    Opera:  navigator.userAgent.indexOf('Opera') > -1,
-    WebKit: navigator.userAgent.indexOf('AppleWebKit/') > -1,
-    Gecko:  navigator.userAgent.indexOf('Gecko') > -1 &&
-      navigator.userAgent.indexOf('KHTML') === -1,
-    MobileSafari: !!navigator.userAgent.match(/Apple.*Mobile.*Safari/)
-  },
-
-  BrowserFeatures: {
-    XPath: !!document.evaluate,
-    SelectorsAPI: !!document.querySelector,
-    ElementExtensions: !!window.HTMLElement,
-    SpecificElementExtensions:
-      document.createElement('div')['__proto__'] &&
-      document.createElement('div')['__proto__'] !==
-        document.createElement('form')['__proto__']
-  },
-
-  ScriptFragment: '<script[^>]*>([\\S\\s]*?)<\/script>',
-  JSONFilter: /^\/\*-secure-([\s\S]*)\*\/\s*$/,
-
-  emptyFunction: function() { },
-  K: function(x) { return x }
-};
-
-if (Prototype.Browser.MobileSafari)
-  Prototype.BrowserFeatures.SpecificElementExtensions = false;
-
-
-/* Based on Alex Arnell's inheritance implementation. */
-var Class = {
-  create: function() {
-    var parent = null, properties = $A(arguments);
-    if (Object.isFunction(properties[0]))
-      parent = properties.shift();
-
-    function klass() {
-      this.initialize.apply(this, arguments);
-    }
-
-    Object.extend(klass, Class.Methods);
-    klass.superclass = parent;
-    klass.subclasses = [];
-
-    if (parent) {
-      var subclass = function() { };
-      subclass.prototype = parent.prototype;
-      klass.prototype = new subclass;
-      parent.subclasses.push(klass);
-    }
-
-    for (var i = 0; i < properties.length; i++)
-      klass.addMethods(properties[i]);
-
-    if (!klass.prototype.initialize)
-      klass.prototype.initialize = Prototype.emptyFunction;
-
-    klass.prototype.constructor = klass;
-
-    return klass;
-  }
-};
-
-Class.Methods = {
-  addMethods: function(source) {
-    var ancestor   = this.superclass && this.superclass.prototype;
-    var properties = Object.keys(source);
-
-    if (!Object.keys({ toString: true }).length)
-      properties.push("toString", "valueOf");
-
-    for (var i = 0, length = properties.length; i < length; i++) {
-      var property = properties[i], value = source[property];
-      if (ancestor && Object.isFunction(value) &&
-          value.argumentNames().first() == "$super") {
-        var method = value;
-        value = (function(m) {
-          return function() { return ancestor[m].apply(this, arguments) };
-        })(property).wrap(method);
-
-        value.valueOf = method.valueOf.bind(method);
-        value.toString = method.toString.bind(method);
-      }
-      this.prototype[property] = value;
-    }
-
-    return this;
-  }
-};
-
-var Abstract = { };
-
-Object.extend = function(destination, source) {
-  for (var property in source)
-    destination[property] = source[property];
-  return destination;
-};
-
-Object.extend(Object, {
-  inspect: function(object) {
-    try {
-      if (Object.isUndefined(object)) return 'undefined';
-      if (object === null) return 'null';
-      return object.inspect ? object.inspect() : String(object);
-    } catch (e) {
-      if (e instanceof RangeError) return '...';
-      throw e;
-    }
-  },
-
-  toJSON: function(object) {
-    var type = typeof object;
-    switch (type) {
-      case 'undefined':
-      case 'function':
-      case 'unknown': return;
-      case 'boolean': return object.toString();
-    }
-
-    if (object === null) return 'null';
-    if (object.toJSON) return object.toJSON();
-    if (Object.isElement(object)) return;
-
-    var results = [];
-    for (var property in object) {
-      var value = Object.toJSON(object[property]);
-      if (!Object.isUndefined(value))
-        results.push(property.toJSON() + ': ' + value);
-    }
-
-    return '{' + results.join(', ') + '}';
-  },
-
-  toQueryString: function(object) {
-    return $H(object).toQueryString();
-  },
-
-  toHTML: function(object) {
-    return object && object.toHTML ? object.toHTML() : String.interpret(object);
-  },
-
-  keys: function(object) {
-    var keys = [];
-    for (var property in object)
-      keys.push(property);
-    return keys;
-  },
-
-  values: function(object) {
-    var values = [];
-    for (var property in object)
-      values.push(object[property]);
-    return values;
-  },
-
-  clone: function(object) {
-    return Object.extend({ }, object);
-  },
-
-  isElement: function(object) {
-    return !!(object && object.nodeType == 1);
-  },
-
-  isArray: function(object) {
-    return object != null && typeof object == "object" &&
-      'splice' in object && 'join' in object;
-  },
-
-  isHash: function(object) {
-    return object instanceof Hash;
-  },
-
-  isFunction: function(object) {
-    return typeof object == "function";
-  },
-
-  isString: function(object) {
-    return typeof object == "string";
-  },
-
-  isNumber: function(object) {
-    return typeof object == "number";
-  },
-
-  isUndefined: function(object) {
-    return typeof object == "undefined";
-  }
-});
-
-Object.extend(Function.prototype, {
-  argumentNames: function() {
-    var names = this.toString().match(/^[\s\(]*function[^(]*\(([^\)]*)\)/)[1]
-      .replace(/\s+/g, '').split(',');
-    return names.length == 1 && !names[0] ? [] : names;
-  },
-
-  bind: function() {
-    if (arguments.length < 2 && Object.isUndefined(arguments[0])) return this;
-    var __method = this, args = $A(arguments), object = args.shift();
-    return function() {
-      return __method.apply(object, args.concat($A(arguments)));
-    }
-  },
-
-  bindAsEventListener: function() {
-    var __method = this, args = $A(arguments), object = args.shift();
-    return function(event) {
-      return __method.apply(object, [event || window.event].concat(args));
-    }
-  },
-
-  curry: function() {
-    if (!arguments.length) return this;
-    var __method = this, args = $A(arguments);
-    return function() {
-      return __method.apply(this, args.concat($A(arguments)));
-    }
-  },
-
-  delay: function() {
-    var __method = this, args = $A(arguments), timeout = args.shift() * 1000;
-    return window.setTimeout(function() {
-      return __method.apply(__method, args);
-    }, timeout);
-  },
-
-  defer: function() {
-    var args = [0.01].concat($A(arguments));
-    return this.delay.apply(this, args);
-  },
-
-  wrap: function(wrapper) {
-    var __method = this;
-    return function() {
-      return wrapper.apply(this, [__method.bind(this)].concat($A(arguments)));
-    }
-  },
-
-  methodize: function() {
-    if (this._methodized) return this._methodized;
-    var __method = this;
-    return this._methodized = function() {
-      return __method.apply(null, [this].concat($A(arguments)));
-    };
-  }
-});
-
-Date.prototype.toJSON = function() {
-  return '"' + this.getUTCFullYear() + '-' +
-    (this.getUTCMonth() + 1).toPaddedString(2) + '-' +
-    this.getUTCDate().toPaddedString(2) + 'T' +
-    this.getUTCHours().toPaddedString(2) + ':' +
-    this.getUTCMinutes().toPaddedString(2) + ':' +
-    this.getUTCSeconds().toPaddedString(2) + 'Z"';
-};
-
-var Try = {
-  these: function() {
-    var returnValue;
-
-    for (var i = 0, length = arguments.length; i < length; i++) {
-      var lambda = arguments[i];
-      try {
-        returnValue = lambda();
-        break;
-      } catch (e) { }
-    }
-
-    return returnValue;
-  }
-};
-
-RegExp.prototype.match = RegExp.prototype.test;
-
-RegExp.escape = function(str) {
-  return String(str).replace(/([.*+?^=!:${}()|[\]\/\\])/g, '\\$1');
-};
-
-/*--------------------------------------------------------------------------*/
-
-var PeriodicalExecuter = Class.create({
-  initialize: function(callback, frequency) {
-    this.callback = callback;
-    this.frequency = frequency;
-    this.currentlyExecuting = false;
-
-    this.registerCallback();
-  },
-
-  registerCallback: function() {
-    this.timer = setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
-  },
-
-  execute: function() {
-    this.callback(this);
-  },
-
-  stop: function() {
-    if (!this.timer) return;
-    clearInterval(this.timer);
-    this.timer = null;
-  },
-
-  onTimerEvent: function() {
-    if (!this.currentlyExecuting) {
-      try {
-        this.currentlyExecuting = true;
-        this.execute();
-      } finally {
-        this.currentlyExecuting = false;
-      }
-    }
-  }
-});
-Object.extend(String, {
-  interpret: function(value) {
-    return value == null ? '' : String(value);
-  },
-  specialChar: {
-    '\b': '\\b',
-    '\t': '\\t',
-    '\n': '\\n',
-    '\f': '\\f',
-    '\r': '\\r',
-    '\\': '\\\\'
-  }
-});
-
-Object.extend(String.prototype, {
-  gsub: function(pattern, replacement) {
-    var result = '', source = this, match;
-    replacement = arguments.callee.prepareReplacement(replacement);
-
-    while (source.length > 0) {
-      if (match = source.match(pattern)) {
-        result += source.slice(0, match.index);
-        result += String.interpret(replacement(match));
-        source  = source.slice(match.index + match[0].length);
-      } else {
-        result += source, source = '';
-      }
-    }
-    return result;
-  },
-
-  sub: function(pattern, replacement, count) {
-    replacement = this.gsub.prepareReplacement(replacement);
-    count = Object.isUndefined(count) ? 1 : count;
-
-    return this.gsub(pattern, function(match) {
-      if (--count < 0) return match[0];
-      return replacement(match);
-    });
-  },
-
-  scan: function(pattern, iterator) {
-    this.gsub(pattern, iterator);
-    return String(this);
-  },
-
-  truncate: function(length, truncation) {
-    length = length || 30;
-    truncation = Object.isUndefined(truncation) ? '...' : truncation;
-    return this.length > length ?
-      this.slice(0, length - truncation.length) + truncation : String(this);
-  },
-
-  strip: function() {
-    return this.replace(/^\s+/, '').replace(/\s+$/, '');
-  },
-
-  stripTags: function() {
-    return this.replace(/<\/?[^>]+>/gi, '');
-  },
-
-  stripScripts: function() {
-    return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), '');
-  },
-
-  extractScripts: function() {
-    var matchAll = new RegExp(Prototype.ScriptFragment, 'img');
-    var matchOne = new RegExp(Prototype.ScriptFragment, 'im');
-    return (this.match(matchAll) || []).map(function(scriptTag) {
-      return (scriptTag.match(matchOne) || ['', ''])[1];
-    });
-  },
-
-  evalScripts: function() {
-    return this.extractScripts().map(function(script) { return eval(script) });
-  },
-
-  escapeHTML: function() {
-    var self = arguments.callee;
-    self.text.data = this;
-    return self.div.innerHTML;
-  },
-
-  unescapeHTML: function() {
-    var div = new Element('div');
-    div.innerHTML = this.stripTags();
-    return div.childNodes[0] ? (div.childNodes.length > 1 ?
-      $A(div.childNodes).inject('', function(memo, node) { return memo+node.nodeValue }) :
-      div.childNodes[0].nodeValue) : '';
-  },
-
-  toQueryParams: function(separator) {
-    var match = this.strip().match(/([^?#]*)(#.*)?$/);
-    if (!match) return { };
-
-    return match[1].split(separator || '&').inject({ }, function(hash, pair) {
-      if ((pair = pair.split('='))[0]) {
-        var key = decodeURIComponent(pair.shift());
-        var value = pair.length > 1 ? pair.join('=') : pair[0];
-        if (value != undefined) value = decodeURIComponent(value);
-
-        if (key in hash) {
-          if (!Object.isArray(hash[key])) hash[key] = [hash[key]];
-          hash[key].push(value);
-        }
-        else hash[key] = value;
-      }
-      return hash;
-    });
-  },
-
-  toArray: function() {
-    return this.split('');
-  },
-
-  succ: function() {
-    return this.slice(0, this.length - 1) +
-      String.fromCharCode(this.charCodeAt(this.length - 1) + 1);
-  },
-
-  times: function(count) {
-    return count < 1 ? '' : new Array(count + 1).join(this);
-  },
-
-  camelize: function() {
-    var parts = this.split('-'), len = parts.length;
-    if (len == 1) return parts[0];
-
-    var camelized = this.charAt(0) == '-'
-      ? parts[0].charAt(0).toUpperCase() + parts[0].substring(1)
-      : parts[0];
-
-    for (var i = 1; i < len; i++)
-      camelized += parts[i].charAt(0).toUpperCase() + parts[i].substring(1);
-
-    return camelized;
-  },
-
-  capitalize: function() {
-    return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase();
-  },
-
-  underscore: function() {
-    return this.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'#{1}_#{2}').gsub(/([a-z\d])([A-Z])/,'#{1}_#{2}').gsub(/-/,'_').toLowerCase();
-  },
-
-  dasherize: function() {
-    return this.gsub(/_/,'-');
-  },
-
-  inspect: function(useDoubleQuotes) {
-    var escapedString = this.gsub(/[\x00-\x1f\\]/, function(match) {
-      var character = String.specialChar[match[0]];
-      return character ? character : '\\u00' + match[0].charCodeAt().toPaddedString(2, 16);
-    });
-    if (useDoubleQuotes) return '"' + escapedString.replace(/"/g, '\\"') + '"';
-    return "'" + escapedString.replace(/'/g, '\\\'') + "'";
-  },
-
-  toJSON: function() {
-    return this.inspect(true);
-  },
-
-  unfilterJSON: function(filter) {
-    return this.sub(filter || Prototype.JSONFilter, '#{1}');
-  },
-
-  isJSON: function() {
-    var str = this;
-    if (str.blank()) return false;
-    str = this.replace(/\\./g, '@').replace(/"[^"\\\n\r]*"/g, '');
-    return (/^[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]*$/).test(str);
-  },
-
-  evalJSON: function(sanitize) {
-    var json = this.unfilterJSON();
-    try {
-      if (!sanitize || json.isJSON()) return eval('(' + json + ')');
-    } catch (e) { }
-    throw new SyntaxError('Badly formed JSON string: ' + this.inspect());
-  },
-
-  include: function(pattern) {
-    return this.indexOf(pattern) > -1;
-  },
-
-  startsWith: function(pattern) {
-    return this.indexOf(pattern) === 0;
-  },
-
-  endsWith: function(pattern) {
-    var d = this.length - pattern.length;
-    return d >= 0 && this.lastIndexOf(pattern) === d;
-  },
-
-  empty: function() {
-    return this == '';
-  },
-
-  blank: function() {
-    return /^\s*$/.test(this);
-  },
-
-  interpolate: function(object, pattern) {
-    return new Template(this, pattern).evaluate(object);
-  }
-});
-
-if (Prototype.Browser.WebKit || Prototype.Browser.IE) Object.extend(String.prototype, {
-  escapeHTML: function() {
-    return this.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
-  },
-  unescapeHTML: function() {
-    return this.stripTags().replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>');
-  }
-});
-
-String.prototype.gsub.prepareReplacement = function(replacement) {
-  if (Object.isFunction(replacement)) return replacement;
-  var template = new Template(replacement);
-  return function(match) { return template.evaluate(match) };
-};
-
-String.prototype.parseQuery = String.prototype.toQueryParams;
-
-Object.extend(String.prototype.escapeHTML, {
-  div:  document.createElement('div'),
-  text: document.createTextNode('')
-});
-
-String.prototype.escapeHTML.div.appendChild(String.prototype.escapeHTML.text);
-
-var Template = Class.create({
-  initialize: function(template, pattern) {
-    this.template = template.toString();
-    this.pattern = pattern || Template.Pattern;
-  },
-
-  evaluate: function(object) {
-    if (Object.isFunction(object.toTemplateReplacements))
-      object = object.toTemplateReplacements();
-
-    return this.template.gsub(this.pattern, function(match) {
-      if (object == null) return '';
-
-      var before = match[1] || '';
-      if (before == '\\') return match[2];
-
-      var ctx = object, expr = match[3];
-      var pattern = /^([^.[]+|\[((?:.*?[^\\])?)\])(\.|\[|$)/;
-      match = pattern.exec(expr);
-      if (match == null) return before;
-
-      while (match != null) {
-        var comp = match[1].startsWith('[') ? match[2].gsub('\\\\]', ']') : match[1];
-        ctx = ctx[comp];
-        if (null == ctx || '' == match[3]) break;
-        expr = expr.substring('[' == match[3] ? match[1].length : match[0].length);
-        match = pattern.exec(expr);
-      }
-
-      return before + String.interpret(ctx);
-    });
-  }
-});
-Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/;
-
-var $break = { };
-
-var Enumerable = {
-  each: function(iterator, context) {
-    var index = 0;
-    try {
-      this._each(function(value) {
-        iterator.call(context, value, index++);
-      });
-    } catch (e) {
-      if (e != $break) throw e;
-    }
-    return this;
-  },
-
-  eachSlice: function(number, iterator, context) {
-    var index = -number, slices = [], array = this.toArray();
-    if (number < 1) return array;
-    while ((index += number) < array.length)
-      slices.push(array.slice(index, index+number));
-    return slices.collect(iterator, context);
-  },
-
-  all: function(iterator, context) {
-    iterator = iterator || Prototype.K;
-    var result = true;
-    this.each(function(value, index) {
-      result = result && !!iterator.call(context, value, index);
-      if (!result) throw $break;
-    });
-    return result;
-  },
-
-  any: function(iterator, context) {
-    iterator = iterator || Prototype.K;
-    var result = false;
-    this.each(function(value, index) {
-      if (result = !!iterator.call(context, value, index))
-        throw $break;
-    });
-    return result;
-  },
-
-  collect: function(iterator, context) {
-    iterator = iterator || Prototype.K;
-    var results = [];
-    this.each(function(value, index) {
-      results.push(iterator.call(context, value, index));
-    });
-    return results;
-  },
-
-  detect: function(iterator, context) {
-    var result;
-    this.each(function(value, index) {
-      if (iterator.call(context, value, index)) {
-        result = value;
-        throw $break;
-      }
-    });
-    return result;
-  },
-
-  findAll: function(iterator, context) {
-    var results = [];
-    this.each(function(value, index) {
-      if (iterator.call(context, value, index))
-        results.push(value);
-    });
-    return results;
-  },
-
-  grep: function(filter, iterator, context) {
-    iterator = iterator || Prototype.K;
-    var results = [];
-
-    if (Object.isString(filter))
-      filter = new RegExp(filter);
-
-    this.each(function(value, index) {
-      if (filter.match(value))
-        results.push(iterator.call(context, value, index));
-    });
-    return results;
-  },
-
-  include: function(object) {
-    if (Object.isFunction(this.indexOf))
-      if (this.indexOf(object) != -1) return true;
-
-    var found = false;
-    this.each(function(value) {
-      if (value == object) {
-        found = true;
-        throw $break;
-      }
-    });
-    return found;
-  },
-
-  inGroupsOf: function(number, fillWith) {
-    fillWith = Object.isUndefined(fillWith) ? null : fillWith;
-    return this.eachSlice(number, function(slice) {
-      while(slice.length < number) slice.push(fillWith);
-      return slice;
-    });
-  },
-
-  inject: function(memo, iterator, context) {
-    this.each(function(value, index) {
-      memo = iterator.call(context, memo, value, index);
-    });
-    return memo;
-  },
-
-  invoke: function(method) {
-    var args = $A(arguments).slice(1);
-    return this.map(function(value) {
-      return value[method].apply(value, args);
-    });
-  },
-
-  max: function(iterator, context) {
-    iterator = iterator || Prototype.K;
-    var result;
-    this.each(function(value, index) {
-      value = iterator.call(context, value, index);
-      if (result == null || value >= result)
-        result = value;
-    });
-    return result;
-  },
-
-  min: function(iterator, context) {
-    iterator = iterator || Prototype.K;
-    var result;
-    this.each(function(value, index) {
-      value = iterator.call(context, value, index);
-      if (result == null || value < result)
-        result = value;
-    });
-    return result;
-  },
-
-  partition: function(iterator, context) {
-    iterator = iterator || Prototype.K;
-    var trues = [], falses = [];
-    this.each(function(value, index) {
-      (iterator.call(context, value, index) ?
-        trues : falses).push(value);
-    });
-    return [trues, falses];
-  },
-
-  pluck: function(property) {
-    var results = [];
-    this.each(function(value) {
-      results.push(value[property]);
-    });
-    return results;
-  },
-
-  reject: function(iterator, context) {
-    var results = [];
-    this.each(function(value, index) {
-      if (!iterator.call(context, value, index))
-        results.push(value);
-    });
-    return results;
-  },
-
-  sortBy: function(iterator, context) {
-    return this.map(function(value, index) {
-      return {
-        value: value,
-        criteria: iterator.call(context, value, index)
-      };
-    }).sort(function(left, right) {
-      var a = left.criteria, b = right.criteria;
-      return a < b ? -1 : a > b ? 1 : 0;
-    }).pluck('value');
-  },
-
-  toArray: function() {
-    return this.map();
-  },
-
-  zip: function() {
-    var iterator = Prototype.K, args = $A(arguments);
-    if (Object.isFunction(args.last()))
-      iterator = args.pop();
-
-    var collections = [this].concat(args).map($A);
-    return this.map(function(value, index) {
-      return iterator(collections.pluck(index));
-    });
-  },
-
-  size: function() {
-    return this.toArray().length;
-  },
-
-  inspect: function() {
-    return '#<Enumerable:' + this.toArray().inspect() + '>';
-  }
-};
-
-Object.extend(Enumerable, {
-  map:     Enumerable.collect,
-  find:    Enumerable.detect,
-  select:  Enumerable.findAll,
-  filter:  Enumerable.findAll,
-  member:  Enumerable.include,
-  entries: Enumerable.toArray,
-  every:   Enumerable.all,
-  some:    Enumerable.any
-});
-function $A(iterable) {
-  if (!iterable) return [];
-  if (iterable.toArray) return iterable.toArray();
-  var length = iterable.length || 0, results = new Array(length);
-  while (length--) results[length] = iterable[length];
-  return results;
-}
-
-if (Prototype.Browser.WebKit) {
-  $A = function(iterable) {
-    if (!iterable) return [];
-    // In Safari, only use the `toArray` method if it's not a NodeList.
-    // A NodeList is a function, has an function `item` property, and a numeric
-    // `length` property. Adapted from Google Doctype.
-    if (!(typeof iterable === 'function' && typeof iterable.length ===
-        'number' && typeof iterable.item === 'function') && iterable.toArray)
-      return iterable.toArray();
-    var length = iterable.length || 0, results = new Array(length);
-    while (length--) results[length] = iterable[length];
-    return results;
-  };
-}
-
-Array.from = $A;
-
-Object.extend(Array.prototype, Enumerable);
-
-if (!Array.prototype._reverse) Array.prototype._reverse = Array.prototype.reverse;
-
-Object.extend(Array.prototype, {
-  _each: function(iterator) {
-    for (var i = 0, length = this.length; i < length; i++)
-      iterator(this[i]);
-  },
-
-  clear: function() {
-    this.length = 0;
-    return this;
-  },
-
-  first: function() {
-    return this[0];
-  },
-
-  last: function() {
-    return this[this.length - 1];
-  },
-
-  compact: function() {
-    return this.select(function(value) {
-      return value != null;
-    });
-  },
-
-  flatten: function() {
-    return this.inject([], function(array, value) {
-      return array.concat(Object.isArray(value) ?
-        value.flatten() : [value]);
-    });
-  },
-
-  without: function() {
-    var values = $A(arguments);
-    return this.select(function(value) {
-      return !values.include(value);
-    });
-  },
-
-  reverse: function(inline) {
-    return (inline !== false ? this : this.toArray())._reverse();
-  },
-
-  reduce: function() {
-    return this.length > 1 ? this : this[0];
-  },
-
-  uniq: function(sorted) {
-    return this.inject([], function(array, value, index) {
-      if (0 == index || (sorted ? array.last() != value : !array.include(value)))
-        array.push(value);
-      return array;
-    });
-  },
-
-  intersect: function(array) {
-    return this.uniq().findAll(function(item) {
-      return array.detect(function(value) { return item === value });
-    });
-  },
-
-  clone: function() {
-    return [].concat(this);
-  },
-
-  size: function() {
-    return this.length;
-  },
-
-  inspect: function() {
-    return '[' + this.map(Object.inspect).join(', ') + ']';
-  },
-
-  toJSON: function() {
-    var results = [];
-    this.each(function(object) {
-      var value = Object.toJSON(object);
-      if (!Object.isUndefined(value)) results.push(value);
-    });
-    return '[' + results.join(', ') + ']';
-  }
-});
-
-// use native browser JS 1.6 implementation if available
-if (Object.isFunction(Array.prototype.forEach))
-  Array.prototype._each = Array.prototype.forEach;
-
-if (!Array.prototype.indexOf) Array.prototype.indexOf = function(item, i) {
-  i || (i = 0);
-  var length = this.length;
-  if (i < 0) i = length + i;
-  for (; i < length; i++)
-    if (this[i] === item) return i;
-  return -1;
-};
-
-if (!Array.prototype.lastIndexOf) Array.prototype.lastIndexOf = function(item, i) {
-  i = isNaN(i) ? this.length : (i < 0 ? this.length + i : i) + 1;
-  var n = this.slice(0, i).reverse().indexOf(item);
-  return (n < 0) ? n : i - n - 1;
-};
-
-Array.prototype.toArray = Array.prototype.clone;
-
-function $w(string) {
-  if (!Object.isString(string)) return [];
-  string = string.strip();
-  return string ? string.split(/\s+/) : [];
-}
-
-if (Prototype.Browser.Opera){
-  Array.prototype.concat = function() {
-    var array = [];
-    for (var i = 0, length = this.length; i < length; i++) array.push(this[i]);
-    for (var i = 0, length = arguments.length; i < length; i++) {
-      if (Object.isArray(arguments[i])) {
-        for (var j = 0, arrayLength = arguments[i].length; j < arrayLength; j++)
-          array.push(arguments[i][j]);
-      } else {
-        array.push(arguments[i]);
-      }
-    }
-    return array;
-  };
-}
-Object.extend(Number.prototype, {
-  toColorPart: function() {
-    return this.toPaddedString(2, 16);
-  },
-
-  succ: function() {
-    return this + 1;
-  },
-
-  times: function(iterator, context) {
-    $R(0, this, true).each(iterator, context);
-    return this;
-  },
-
-  toPaddedString: function(length, radix) {
-    var string = this.toString(radix || 10);
-    return '0'.times(length - string.length) + string;
-  },
-
-  toJSON: function() {
-    return isFinite(this) ? this.toString() : 'null';
-  }
-});
-
-$w('abs round ceil floor').each(function(method){
-  Number.prototype[method] = Math[method].methodize();
-});
-function $H(object) {
-  return new Hash(object);
-};
-
-var Hash = Class.create(Enumerable, (function() {
-
-  function toQueryPair(key, value) {
-    if (Object.isUndefined(value)) return key;
-    return key + '=' + encodeURIComponent(String.interpret(value));
-  }
-
-  return {
-    initialize: function(object) {
-      this._object = Object.isHash(object) ? object.toObject() : Object.clone(object);
-    },
-
-    _each: function(iterator) {
-      for (var key in this._object) {
-        var value = this._object[key], pair = [key, value];
-        pair.key = key;
-        pair.value = value;
-        iterator(pair);
-      }
-    },
-
-    set: function(key, value) {
-      return this._object[key] = value;
-    },
-
-    get: function(key) {
-      // simulating poorly supported hasOwnProperty
-      if (this._object[key] !== Object.prototype[key])
-        return this._object[key];
-    },
-
-    unset: function(key) {
-      var value = this._object[key];
-      delete this._object[key];
-      return value;
-    },
-
-    toObject: function() {
-      return Object.clone(this._object);
-    },
-
-    keys: function() {
-      return this.pluck('key');
-    },
-
-    values: function() {
-      return this.pluck('value');
-    },
-
-    index: function(value) {
-      var match = this.detect(function(pair) {
-        return pair.value === value;
-      });
-      return match && match.key;
-    },
-
-    merge: function(object) {
-      return this.clone().update(object);
-    },
-
-    update: function(object) {
-      return new Hash(object).inject(this, function(result, pair) {
-        result.set(pair.key, pair.value);
-        return result;
-      });
-    },
-
-    toQueryString: function() {
-      return this.inject([], function(results, pair) {
-        var key = encodeURIComponent(pair.key), values = pair.value;
-
-        if (values && typeof values == 'object') {
-          if (Object.isArray(values))
-            return results.concat(values.map(toQueryPair.curry(key)));
-        } else results.push(toQueryPair(key, values));
-        return results;
-      }).join('&');
-    },
-
-    inspect: function() {
-      return '#<Hash:{' + this.map(function(pair) {
-        return pair.map(Object.inspect).join(': ');
-      }).join(', ') + '}>';
-    },
-
-    toJSON: function() {
-      return Object.toJSON(this.toObject());
-    },
-
-    clone: function() {
-      return new Hash(this);
-    }
-  }
-})());
-
-Hash.prototype.toTemplateReplacements = Hash.prototype.toObject;
-Hash.from = $H;
-var ObjectRange = Class.create(Enumerable, {
-  initialize: function(start, end, exclusive) {
-    this.start = start;
-    this.end = end;
-    this.exclusive = exclusive;
-  },
-
-  _each: function(iterator) {
-    var value = this.start;
-    while (this.include(value)) {
-      iterator(value);
-      value = value.succ();
-    }
-  },
-
-  include: function(value) {
-    if (value < this.start)
-      return false;
-    if (this.exclusive)
-      return value < this.end;
-    return value <= this.end;
-  }
-});
-
-var $R = function(start, end, exclusive) {
-  return new ObjectRange(start, end, exclusive);
-};
-
-var Ajax = {
-  getTransport: function() {
-    return Try.these(
-      function() {return new XMLHttpRequest()},
-      function() {return new ActiveXObject('Msxml2.XMLHTTP')},
-      function() {return new ActiveXObject('Microsoft.XMLHTTP')}
-    ) || false;
-  },
-
-  activeRequestCount: 0
-};
-
-Ajax.Responders = {
-  responders: [],
-
-  _each: function(iterator) {
-    this.responders._each(iterator);
-  },
-
-  register: function(responder) {
-    if (!this.include(responder))
-      this.responders.push(responder);
-  },
-
-  unregister: function(responder) {
-    this.responders = this.responders.without(responder);
-  },
-
-  dispatch: function(callback, request, transport, json) {
-    this.each(function(responder) {
-      if (Object.isFunction(responder[callback])) {
-        try {
-          responder[callback].apply(responder, [request, transport, json]);
-        } catch (e) { }
-      }
-    });
-  }
-};
-
-Object.extend(Ajax.Responders, Enumerable);
-
-Ajax.Responders.register({
-  onCreate:   function() { Ajax.activeRequestCount++ },
-  onComplete: function() { Ajax.activeRequestCount-- }
-});
-
-Ajax.Base = Class.create({
-  initialize: function(options) {
-    this.options = {
-      method:       'post',
-      asynchronous: true,
-      contentType:  'application/x-www-form-urlencoded',
-      encoding:     'UTF-8',
-      parameters:   '',
-      evalJSON:     true,
-      evalJS:       true
-    };
-    Object.extend(this.options, options || { });
-
-    this.options.method = this.options.method.toLowerCase();
-
-    if (Object.isString(this.options.parameters))
-      this.options.parameters = this.options.parameters.toQueryParams();
-    else if (Object.isHash(this.options.parameters))
-      this.options.parameters = this.options.parameters.toObject();
-  }
-});
-
-Ajax.Request = Class.create(Ajax.Base, {
-  _complete: false,
-
-  initialize: function($super, url, options) {
-    $super(options);
-    this.transport = Ajax.getTransport();
-    this.request(url);
-  },
-
-  request: function(url) {
-    this.url = url;
-    this.method = this.options.method;
-    var params = Object.clone(this.options.parameters);
-
-    if (!['get', 'post'].include(this.method)) {
-      // simulate other verbs over post
-      params['_method'] = this.method;
-      this.method = 'post';
-    }
-
-    this.parameters = params;
-
-    if (params = Object.toQueryString(params)) {
-      // when GET, append parameters to URL
-      if (this.method == 'get')
-        this.url += (this.url.include('?') ? '&' : '?') + params;
-      else if (/Konqueror|Safari|KHTML/.test(navigator.userAgent))
-        params += '&_=';
-    }
-
-    try {
-      var response = new Ajax.Response(this);
-      if (this.options.onCreate) this.options.onCreate(response);
-      Ajax.Responders.dispatch('onCreate', this, response);
-
-      this.transport.open(this.method.toUpperCase(), this.url,
-        this.options.asynchronous);
-
-      if (this.options.asynchronous) this.respondToReadyState.bind(this).defer(1);
-
-      this.transport.onreadystatechange = this.onStateChange.bind(this);
-      this.setRequestHeaders();
-
-      this.body = this.method == 'post' ? (this.options.postBody || params) : null;
-      this.transport.send(this.body);
-
-      /* Force Firefox to handle ready state 4 for synchronous requests */
-      if (!this.options.asynchronous && this.transport.overrideMimeType)
-        this.onStateChange();
-
-    }
-    catch (e) {
-      this.dispatchException(e);
-    }
-  },
-
-  onStateChange: function() {
-    var readyState = this.transport.readyState;
-    if (readyState > 1 && !((readyState == 4) && this._complete))
-      this.respondToReadyState(this.transport.readyState);
-  },
-
-  setRequestHeaders: function() {
-    var headers = {
-      'X-Requested-With': 'XMLHttpRequest',
-      'X-Prototype-Version': Prototype.Version,
-      'Accept': 'text/javascript, text/html, application/xml, text/xml, */*'
-    };
-
-    if (this.method == 'post') {
-      headers['Content-type'] = this.options.contentType +
-        (this.options.encoding ? '; charset=' + this.options.encoding : '');
-
-      /* Force "Connection: close" for older Mozilla browsers to work
-       * around a bug where XMLHttpRequest sends an incorrect
-       * Content-length header. See Mozilla Bugzilla #246651.
-       */
-      if (this.transport.overrideMimeType &&
-          (navigator.userAgent.match(/Gecko\/(\d{4})/) || [0,2005])[1] < 2005)
-            headers['Connection'] = 'close';
-    }
-
-    // user-defined headers
-    if (typeof this.options.requestHeaders == 'object') {
-      var extras = this.options.requestHeaders;
-
-      if (Object.isFunction(extras.push))
-        for (var i = 0, length = extras.length; i < length; i += 2)
-          headers[extras[i]] = extras[i+1];
-      else
-        $H(extras).each(function(pair) { headers[pair.key] = pair.value });
-    }
-
-    for (var name in headers)
-      this.transport.setRequestHeader(name, headers[name]);
-  },
-
-  success: function() {
-    var status = this.getStatus();
-    return !status || (status >= 200 && status < 300);
-  },
-
-  getStatus: function() {
-    try {
-      return this.transport.status || 0;
-    } catch (e) { return 0 }
-  },
-
-  respondToReadyState: function(readyState) {
-    var state = Ajax.Request.Events[readyState], response = new Ajax.Response(this);
-
-    if (state == 'Complete') {
-      try {
-        this._complete = true;
-        (this.options['on' + response.status]
-         || this.options['on' + (this.success() ? 'Success' : 'Failure')]
-         || Prototype.emptyFunction)(response, response.headerJSON);
-      } catch (e) {
-        this.dispatchException(e);
-      }
-
-      var contentType = response.getHeader('Content-type');
-      if (this.options.evalJS == 'force'
-          || (this.options.evalJS && this.isSameOrigin() && contentType
-          && contentType.match(/^\s*(text|application)\/(x-)?(java|ecma)script(;.*)?\s*$/i)))
-        this.evalResponse();
-    }
-
-    try {
-      (this.options['on' + state] || Prototype.emptyFunction)(response, response.headerJSON);
-      Ajax.Responders.dispatch('on' + state, this, response, response.headerJSON);
-    } catch (e) {
-      this.dispatchException(e);
-    }
-
-    if (state == 'Complete') {
-      // avoid memory leak in MSIE: clean up
-      this.transport.onreadystatechange = Prototype.emptyFunction;
-    }
-  },
-
-  isSameOrigin: function() {
-    var m = this.url.match(/^\s*https?:\/\/[^\/]*/);
-    return !m || (m[0] == '#{protocol}//#{domain}#{port}'.interpolate({
-      protocol: location.protocol,
-      domain: document.domain,
-      port: location.port ? ':' + location.port : ''
-    }));
-  },
-
-  getHeader: function(name) {
-    try {
-      return this.transport.getResponseHeader(name) || null;
-    } catch (e) { return null }
-  },
-
-  evalResponse: function() {
-    try {
-      return eval((this.transport.responseText || '').unfilterJSON());
-    } catch (e) {
-      this.dispatchException(e);
-    }
-  },
-
-  dispatchException: function(exception) {
-    (this.options.onException || Prototype.emptyFunction)(this, exception);
-    Ajax.Responders.dispatch('onException', this, exception);
-  }
-});
-
-Ajax.Request.Events =
-  ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
-
-Ajax.Response = Class.create({
-  initialize: function(request){
-    this.request = request;
-    var transport  = this.transport  = request.transport,
-        readyState = this.readyState = transport.readyState;
-
-    if((readyState > 2 && !Prototype.Browser.IE) || readyState == 4) {
-      this.status       = this.getStatus();
-      this.statusText   = this.getStatusText();
-      this.responseText = String.interpret(transport.responseText);
-      this.headerJSON   = this._getHeaderJSON();
-    }
-
-    if(readyState == 4) {
-      var xml = transport.responseXML;
-      this.responseXML  = Object.isUndefined(xml) ? null : xml;
-      this.responseJSON = this._getResponseJSON();
-    }
-  },
-
-  status:      0,
-  statusText: '',
-
-  getStatus: Ajax.Request.prototype.getStatus,
-
-  getStatusText: function() {
-    try {
-      return this.transport.statusText || '';
-    } catch (e) { return '' }
-  },
-
-  getHeader: Ajax.Request.prototype.getHeader,
-
-  getAllHeaders: function() {
-    try {
-      return this.getAllResponseHeaders();
-    } catch (e) { return null }
-  },
-
-  getResponseHeader: function(name) {
-    return this.transport.getResponseHeader(name);
-  },
-
-  getAllResponseHeaders: function() {
-    return this.transport.getAllResponseHeaders();
-  },
-
-  _getHeaderJSON: function() {
-    var json = this.getHeader('X-JSON');
-    if (!json) return null;
-    json = decodeURIComponent(escape(json));
-    try {
-      return json.evalJSON(this.request.options.sanitizeJSON ||
-        !this.request.isSameOrigin());
-    } catch (e) {
-      this.request.dispatchException(e);
-    }
-  },
-
-  _getResponseJSON: function() {
-    var options = this.request.options;
-    if (!options.evalJSON || (options.evalJSON != 'force' &&
-      !(this.getHeader('Content-type') || '').include('application/json')) ||
-        this.responseText.blank())
-          return null;
-    try {
-      return this.responseText.evalJSON(options.sanitizeJSON ||
-        !this.request.isSameOrigin());
-    } catch (e) {
-      this.request.dispatchException(e);
-    }
-  }
-});
-
-Ajax.Updater = Class.create(Ajax.Request, {
-  initialize: function($super, container, url, options) {
-    this.container = {
-      success: (container.success || container),
-      failure: (container.failure || (container.success ? null : container))
-    };
-
-    options = Object.clone(options);
-    var onComplete = options.onComplete;
-    options.onComplete = (function(response, json) {
-      this.updateContent(response.responseText);
-      if (Object.isFunction(onComplete)) onComplete(response, json);
-    }).bind(this);
-
-    $super(url, options);
-  },
-
-  updateContent: function(responseText) {
-    var receiver = this.container[this.success() ? 'success' : 'failure'],
-        options = this.options;
-
-    if (!options.evalScripts) responseText = responseText.stripScripts();
-
-    if (receiver = $(receiver)) {
-      if (options.insertion) {
-        if (Object.isString(options.insertion)) {
-          var insertion = { }; insertion[options.insertion] = responseText;
-          receiver.insert(insertion);
-        }
-        else options.insertion(receiver, responseText);
-      }
-      else receiver.update(responseText);
-    }
-  }
-});
-
-Ajax.PeriodicalUpdater = Class.create(Ajax.Base, {
-  initialize: function($super, container, url, options) {
-    $super(options);
-    this.onComplete = this.options.onComplete;
-
-    this.frequency = (this.options.frequency || 2);
-    this.decay = (this.options.decay || 1);
-
-    this.updater = { };
-    this.container = container;
-    this.url = url;
-
-    this.start();
-  },
-
-  start: function() {
-    this.options.onComplete = this.updateComplete.bind(this);
-    this.onTimerEvent();
-  },
-
-  stop: function() {
-    this.updater.options.onComplete = undefined;
-    clearTimeout(this.timer);
-    (this.onComplete || Prototype.emptyFunction).apply(this, arguments);
-  },
-
-  updateComplete: function(response) {
-    if (this.options.decay) {
-      this.decay = (response.responseText == this.lastText ?
-        this.decay * this.options.decay : 1);
-
-      this.lastText = response.responseText;
-    }
-    this.timer = this.onTimerEvent.bind(this).delay(this.decay * this.frequency);
-  },
-
-  onTimerEvent: function() {
-    this.updater = new Ajax.Updater(this.container, this.url, this.options);
-  }
-});
-function $(element) {
-  if (arguments.length > 1) {
-    for (var i = 0, elements = [], length = arguments.length; i < length; i++)
-      elements.push($(arguments[i]));
-    return elements;
-  }
-  if (Object.isString(element))
-    element = document.getElementById(element);
-  return Element.extend(element);
-}
-
-if (Prototype.BrowserFeatures.XPath) {
-  document._getElementsByXPath = function(expression, parentElement) {
-    var results = [];
-    var query = document.evaluate(expression, $(parentElement) || document,
-      null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
-    for (var i = 0, length = query.snapshotLength; i < length; i++)
-      results.push(Element.extend(query.snapshotItem(i)));
-    return results;
-  };
-}
-
-/*--------------------------------------------------------------------------*/
-
-if (!window.Node) var Node = { };
-
-if (!Node.ELEMENT_NODE) {
-  // DOM level 2 ECMAScript Language Binding
-  Object.extend(Node, {
-    ELEMENT_NODE: 1,
-    ATTRIBUTE_NODE: 2,
-    TEXT_NODE: 3,
-    CDATA_SECTION_NODE: 4,
-    ENTITY_REFERENCE_NODE: 5,
-    ENTITY_NODE: 6,
-    PROCESSING_INSTRUCTION_NODE: 7,
-    COMMENT_NODE: 8,
-    DOCUMENT_NODE: 9,
-    DOCUMENT_TYPE_NODE: 10,
-    DOCUMENT_FRAGMENT_NODE: 11,
-    NOTATION_NODE: 12
-  });
-}
-
-(function() {
-  var element = this.Element;
-  this.Element = function(tagName, attributes) {
-    attributes = attributes || { };
-    tagName = tagName.toLowerCase();
-    var cache = Element.cache;
-    if (Prototype.Browser.IE && attributes.name) {
-      tagName = '<' + tagName + ' name="' + attributes.name + '">';
-      delete attributes.name;
-      return Element.writeAttribute(document.createElement(tagName), attributes);
-    }
-    if (!cache[tagName]) cache[tagName] = Element.extend(document.createElement(tagName));
-    return Element.writeAttribute(cache[tagName].cloneNode(false), attributes);
-  };
-  Object.extend(this.Element, element || { });
-  if (element) this.Element.prototype = element.prototype;
-}).call(window);
-
-Element.cache = { };
-
-Element.Methods = {
-  visible: function(element) {
-    return $(element).style.display != 'none';
-  },
-
-  toggle: function(element) {
-    element = $(element);
-    Element[Element.visible(element) ? 'hide' : 'show'](element);
-    return element;
-  },
-
-  hide: function(element) {
-    element = $(element);
-    element.style.display = 'none';
-    return element;
-  },
-
-  show: function(element) {
-    element = $(element);
-    element.style.display = '';
-    return element;
-  },
-
-  remove: function(element) {
-    element = $(element);
-    element.parentNode.removeChild(element);
-    return element;
-  },
-
-  update: function(element, content) {
-    element = $(element);
-    if (content && content.toElement) content = content.toElement();
-    if (Object.isElement(content)) return element.update().insert(content);
-    content = Object.toHTML(content);
-    element.innerHTML = content.stripScripts();
-    content.evalScripts.bind(content).defer();
-    return element;
-  },
-
-  replace: function(element, content) {
-    element = $(element);
-    if (content && content.toElement) content = content.toElement();
-    else if (!Object.isElement(content)) {
-      content = Object.toHTML(content);
-      var range = element.ownerDocument.createRange();
-      range.selectNode(element);
-      content.evalScripts.bind(content).defer();
-      content = range.createContextualFragment(content.stripScripts());
-    }
-    element.parentNode.replaceChild(content, element);
-    return element;
-  },
-
-  insert: function(element, insertions) {
-    element = $(element);
-
-    if (Object.isString(insertions) || Object.isNumber(insertions) ||
-        Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML)))
-          insertions = {bottom:insertions};
-
-    var content, insert, tagName, childNodes;
-
-    for (var position in insertions) {
-      content  = insertions[position];
-      position = position.toLowerCase();
-      insert = Element._insertionTranslations[position];
-
-      if (content && content.toElement) content = content.toElement();
-      if (Object.isElement(content)) {
-        insert(element, content);
-        continue;
-      }
-
-      content = Object.toHTML(content);
-
-      tagName = ((position == 'before' || position == 'after')
-        ? element.parentNode : element).tagName.toUpperCase();
-
-      childNodes = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
-
-      if (position == 'top' || position == 'after') childNodes.reverse();
-      childNodes.each(insert.curry(element));
-
-      content.evalScripts.bind(content).defer();
-    }
-
-    return element;
-  },
-
-  wrap: function(element, wrapper, attributes) {
-    element = $(element);
-    if (Object.isElement(wrapper))
-      $(wrapper).writeAttribute(attributes || { });
-    else if (Object.isString(wrapper)) wrapper = new Element(wrapper, attributes);
-    else wrapper = new Element('div', wrapper);
-    if (element.parentNode)
-      element.parentNode.replaceChild(wrapper, element);
-    wrapper.appendChild(element);
-    return wrapper;
-  },
-
-  inspect: function(element) {
-    element = $(element);
-    var result = '<' + element.tagName.toLowerCase();
-    $H({'id': 'id', 'className': 'class'}).each(function(pair) {
-      var property = pair.first(), attribute = pair.last();
-      var value = (element[property] || '').toString();
-      if (value) result += ' ' + attribute + '=' + value.inspect(true);
-    });
-    return result + '>';
-  },
-
-  recursivelyCollect: function(element, property) {
-    element = $(element);
-    var elements = [];
-    while (element = element[property])
-      if (element.nodeType == 1)
-        elements.push(Element.extend(element));
-    return elements;
-  },
-
-  ancestors: function(element) {
-    return $(element).recursivelyCollect('parentNode');
-  },
-
-  descendants: function(element) {
-    return $(element).select("*");
-  },
-
-  firstDescendant: function(element) {
-    element = $(element).firstChild;
-    while (element && element.nodeType != 1) element = element.nextSibling;
-    return $(element);
-  },
-
-  immediateDescendants: function(element) {
-    if (!(element = $(element).firstChild)) return [];
-    while (element && element.nodeType != 1) element = element.nextSibling;
-    if (element) return [element].concat($(element).nextSiblings());
-    return [];
-  },
-
-  previousSiblings: function(element) {
-    return $(element).recursivelyCollect('previousSibling');
-  },
-
-  nextSiblings: function(element) {
-    return $(element).recursivelyCollect('nextSibling');
-  },
-
-  siblings: function(element) {
-    element = $(element);
-    return element.previousSiblings().reverse().concat(element.nextSiblings());
-  },
-
-  match: function(element, selector) {
-    if (Object.isString(selector))
-      selector = new Selector(selector);
-    return selector.match($(element));
-  },
-
-  up: function(element, expression, index) {
-    element = $(element);
-    if (arguments.length == 1) return $(element.parentNode);
-    var ancestors = element.ancestors();
-    return Object.isNumber(expression) ? ancestors[expression] :
-      Selector.findElement(ancestors, expression, index);
-  },
-
-  down: function(element, expression, index) {
-    element = $(element);
-    if (arguments.length == 1) return element.firstDescendant();
-    return Object.isNumber(expression) ? element.descendants()[expression] :
-      Element.select(element, expression)[index || 0];
-  },
-
-  previous: function(element, expression, index) {
-    element = $(element);
-    if (arguments.length == 1) return $(Selector.handlers.previousElementSibling(element));
-    var previousSiblings = element.previousSiblings();
-    return Object.isNumber(expression) ? previousSiblings[expression] :
-      Selector.findElement(previousSiblings, expression, index);
-  },
-
-  next: function(element, expression, index) {
-    element = $(element);
-    if (arguments.length == 1) return $(Selector.handlers.nextElementSibling(element));
-    var nextSiblings = element.nextSiblings();
-    return Object.isNumber(expression) ? nextSiblings[expression] :
-      Selector.findElement(nextSiblings, expression, index);
-  },
-
-  select: function() {
-    var args = $A(arguments), element = $(args.shift());
-    return Selector.findChildElements(element, args);
-  },
-
-  adjacent: function() {
-    var args = $A(arguments), element = $(args.shift());
-    return Selector.findChildElements(element.parentNode, args).without(element);
-  },
-
-  identify: function(element) {
-    element = $(element);
-    var id = element.readAttribute('id'), self = arguments.callee;
-    if (id) return id;
-    do { id = 'anonymous_element_' + self.counter++ } while ($(id));
-    element.writeAttribute('id', id);
-    return id;
-  },
-
-  readAttribute: function(element, name) {
-    element = $(element);
-    if (Prototype.Browser.IE) {
-      var t = Element._attributeTranslations.read;
-      if (t.values[name]) return t.values[name](element, name);
-      if (t.names[name]) name = t.names[name];
-      if (name.include(':')) {
-        return (!element.attributes || !element.attributes[name]) ? null :
-         element.attributes[name].value;
-      }
-    }
-    return element.getAttribute(name);
-  },
-
-  writeAttribute: function(element, name, value) {
-    element = $(element);
-    var attributes = { }, t = Element._attributeTranslations.write;
-
-    if (typeof name == 'object') attributes = name;
-    else attributes[name] = Object.isUndefined(value) ? true : value;
-
-    for (var attr in attributes) {
-      name = t.names[attr] || attr;
-      value = attributes[attr];
-      if (t.values[attr]) name = t.values[attr](element, value);
-      if (value === false || value === null)
-        element.removeAttribute(name);
-      else if (value === true)
-        element.setAttribute(name, name);
-      else element.setAttribute(name, value);
-    }
-    return element;
-  },
-
-  getHeight: function(element) {
-    return $(element).getDimensions().height;
-  },
-
-  getWidth: function(element) {
-    return $(element).getDimensions().width;
-  },
-
-  classNames: function(element) {
-    return new Element.ClassNames(element);
-  },
-
-  hasClassName: function(element, className) {
-    if (!(element = $(element))) return;
-    var elementClassName = element.className;
-    return (elementClassName.length > 0 && (elementClassName == className ||
-      new RegExp("(^|\\s)" + className + "(\\s|$)").test(elementClassName)));
-  },
-
-  addClassName: function(element, className) {
-    if (!(element = $(element))) return;
-    if (!element.hasClassName(className))
-      element.className += (element.className ? ' ' : '') + className;
-    return element;
-  },
-
-  removeClassName: function(element, className) {
-    if (!(element = $(element))) return;
-    element.className = element.className.replace(
-      new RegExp("(^|\\s+)" + className + "(\\s+|$)"), ' ').strip();
-    return element;
-  },
-
-  toggleClassName: function(element, className) {
-    if (!(element = $(element))) return;
-    return element[element.hasClassName(className) ?
-      'removeClassName' : 'addClassName'](className);
-  },
-
-  // removes whitespace-only text node children
-  cleanWhitespace: function(element) {
-    element = $(element);
-    var node = element.firstChild;
-    while (node) {
-      var nextNode = node.nextSibling;
-      if (node.nodeType == 3 && !/\S/.test(node.nodeValue))
-        element.removeChild(node);
-      node = nextNode;
-    }
-    return element;
-  },
-
-  empty: function(element) {
-    return $(element).innerHTML.blank();
-  },
-
-  descendantOf: function(element, ancestor) {
-    element = $(element), ancestor = $(ancestor);
-
-    if (element.compareDocumentPosition)
-      return (element.compareDocumentPosition(ancestor) & 8) === 8;
-
-    if (ancestor.contains)
-      return ancestor.contains(element) && ancestor !== element;
-
-    while (element = element.parentNode)
-      if (element == ancestor) return true;
-
-    return false;
-  },
-
-  scrollTo: function(element) {
-    element = $(element);
-    var pos = element.cumulativeOffset();
-    window.scrollTo(pos[0], pos[1]);
-    return element;
-  },
-
-  getStyle: function(element, style) {
-    element = $(element);
-    style = style == 'float' ? 'cssFloat' : style.camelize();
-    var value = element.style[style];
-    if (!value || value == 'auto') {
-      var css = document.defaultView.getComputedStyle(element, null);
-      value = css ? css[style] : null;
-    }
-    if (style == 'opacity') return value ? parseFloat(value) : 1.0;
-    return value == 'auto' ? null : value;
-  },
-
-  getOpacity: function(element) {
-    return $(element).getStyle('opacity');
-  },
-
-  setStyle: function(element, styles) {
-    element = $(element);
-    var elementStyle = element.style, match;
-    if (Object.isString(styles)) {
-      element.style.cssText += ';' + styles;
-      return styles.include('opacity') ?
-        element.setOpacity(styles.match(/opacity:\s*(\d?\.?\d*)/)[1]) : element;
-    }
-    for (var property in styles)
-      if (property == 'opacity') element.setOpacity(styles[property]);
-      else
-        elementStyle[(property == 'float' || property == 'cssFloat') ?
-          (Object.isUndefined(elementStyle.styleFloat) ? 'cssFloat' : 'styleFloat') :
-            property] = styles[property];
-
-    return element;
-  },
-
-  setOpacity: function(element, value) {
-    element = $(element);
-    element.style.opacity = (value == 1 || value === '') ? '' :
-      (value < 0.00001) ? 0 : value;
-    return element;
-  },
-
-  getDimensions: function(element) {
-    element = $(element);
-    var display = element.getStyle('display');
-    if (display != 'none' && display != null) // Safari bug
-      return {width: element.offsetWidth, height: element.offsetHeight};
-
-    // All *Width and *Height properties give 0 on elements with display none,
-    // so enable the element temporarily
-    var els = element.style;
-    var originalVisibility = els.visibility;
-    var originalPosition = els.position;
-    var originalDisplay = els.display;
-    els.visibility = 'hidden';
-    els.position = 'absolute';
-    els.display = 'block';
-    var originalWidth = element.clientWidth;
-    var originalHeight = element.clientHeight;
-    els.display = originalDisplay;
-    els.position = originalPosition;
-    els.visibility = originalVisibility;
-    return {width: originalWidth, height: originalHeight};
-  },
-
-  makePositioned: function(element) {
-    element = $(element);
-    var pos = Element.getStyle(element, 'position');
-    if (pos == 'static' || !pos) {
-      element._madePositioned = true;
-      element.style.position = 'relative';
-      // Opera returns the offset relative to the positioning context, when an
-      // element is position relative but top and left have not been defined
-      if (Prototype.Browser.Opera) {
-        element.style.top = 0;
-        element.style.left = 0;
-      }
-    }
-    return element;
-  },
-
-  undoPositioned: function(element) {
-    element = $(element);
-    if (element._madePositioned) {
-      element._madePositioned = undefined;
-      element.style.position =
-        element.style.top =
-        element.style.left =
-        element.style.bottom =
-        element.style.right = '';
-    }
-    return element;
-  },
-
-  makeClipping: function(element) {
-    element = $(element);
-    if (element._overflow) return element;
-    element._overflow = Element.getStyle(element, 'overflow') || 'auto';
-    if (element._overflow !== 'hidden')
-      element.style.overflow = 'hidden';
-    return element;
-  },
-
-  undoClipping: function(element) {
-    element = $(element);
-    if (!element._overflow) return element;
-    element.style.overflow = element._overflow == 'auto' ? '' : element._overflow;
-    element._overflow = null;
-    return element;
-  },
-
-  cumulativeOffset: function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      element = element.offsetParent;
-    } while (element);
-    return Element._returnOffset(valueL, valueT);
-  },
-
-  positionedOffset: function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      element = element.offsetParent;
-      if (element) {
-        if (element.tagName.toUpperCase() == 'BODY') break;
-        var p = Element.getStyle(element, 'position');
-        if (p !== 'static') break;
-      }
-    } while (element);
-    return Element._returnOffset(valueL, valueT);
-  },
-
-  absolutize: function(element) {
-    element = $(element);
-    if (element.getStyle('position') == 'absolute') return element;
-    // Position.prepare(); // To be done manually by Scripty when it needs it.
-
-    var offsets = element.positionedOffset();
-    var top     = offsets[1];
-    var left    = offsets[0];
-    var width   = element.clientWidth;
-    var height  = element.clientHeight;
-
-    element._originalLeft   = left - parseFloat(element.style.left  || 0);
-    element._originalTop    = top  - parseFloat(element.style.top || 0);
-    element._originalWidth  = element.style.width;
-    element._originalHeight = element.style.height;
-
-    element.style.position = 'absolute';
-    element.style.top    = top + 'px';
-    element.style.left   = left + 'px';
-    element.style.width  = width + 'px';
-    element.style.height = height + 'px';
-    return element;
-  },
-
-  relativize: function(element) {
-    element = $(element);
-    if (element.getStyle('position') == 'relative') return element;
-    // Position.prepare(); // To be done manually by Scripty when it needs it.
-
-    element.style.position = 'relative';
-    var top  = parseFloat(element.style.top  || 0) - (element._originalTop || 0);
-    var left = parseFloat(element.style.left || 0) - (element._originalLeft || 0);
-
-    element.style.top    = top + 'px';
-    element.style.left   = left + 'px';
-    element.style.height = element._originalHeight;
-    element.style.width  = element._originalWidth;
-    return element;
-  },
-
-  cumulativeScrollOffset: function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.scrollTop  || 0;
-      valueL += element.scrollLeft || 0;
-      element = element.parentNode;
-    } while (element);
-    return Element._returnOffset(valueL, valueT);
-  },
-
-  getOffsetParent: function(element) {
-    if (element.offsetParent) return $(element.offsetParent);
-    if (element == document.body) return $(element);
-
-    while ((element = element.parentNode) && element != document.body)
-      if (Element.getStyle(element, 'position') != 'static')
-        return $(element);
-
-    return $(document.body);
-  },
-
-  viewportOffset: function(forElement) {
-    var valueT = 0, valueL = 0;
-
-    var element = forElement;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-
-      // Safari fix
-      if (element.offsetParent == document.body &&
-        Element.getStyle(element, 'position') == 'absolute') break;
-
-    } while (element = element.offsetParent);
-
-    element = forElement;
-    do {
-      if (!Prototype.Browser.Opera || (element.tagName && (element.tagName.toUpperCase() == 'BODY'))) {
-        valueT -= element.scrollTop  || 0;
-        valueL -= element.scrollLeft || 0;
-      }
-    } while (element = element.parentNode);
-
-    return Element._returnOffset(valueL, valueT);
-  },
-
-  clonePosition: function(element, source) {
-    var options = Object.extend({
-      setLeft:    true,
-      setTop:     true,
-      setWidth:   true,
-      setHeight:  true,
-      offsetTop:  0,
-      offsetLeft: 0
-    }, arguments[2] || { });
-
-    // find page position of source
-    source = $(source);
-    var p = source.viewportOffset();
-
-    // find coordinate system to use
-    element = $(element);
-    var delta = [0, 0];
-    var parent = null;
-    // delta [0,0] will do fine with position: fixed elements,
-    // position:absolute needs offsetParent deltas
-    if (Element.getStyle(element, 'position') == 'absolute') {
-      parent = element.getOffsetParent();
-      delta = parent.viewportOffset();
-    }
-
-    // correct by body offsets (fixes Safari)
-    if (parent == document.body) {
-      delta[0] -= document.body.offsetLeft;
-      delta[1] -= document.body.offsetTop;
-    }
-
-    // set position
-    if (options.setLeft)   element.style.left  = (p[0] - delta[0] + options.offsetLeft) + 'px';
-    if (options.setTop)    element.style.top   = (p[1] - delta[1] + options.offsetTop) + 'px';
-    if (options.setWidth)  element.style.width = source.offsetWidth + 'px';
-    if (options.setHeight) element.style.height = source.offsetHeight + 'px';
-    return element;
-  }
-};
-
-Element.Methods.identify.counter = 1;
-
-Object.extend(Element.Methods, {
-  getElementsBySelector: Element.Methods.select,
-  childElements: Element.Methods.immediateDescendants
-});
-
-Element._attributeTranslations = {
-  write: {
-    names: {
-      className: 'class',
-      htmlFor:   'for'
-    },
-    values: { }
-  }
-};
-
-if (Prototype.Browser.Opera) {
-  Element.Methods.getStyle = Element.Methods.getStyle.wrap(
-    function(proceed, element, style) {
-      switch (style) {
-        case 'left': case 'top': case 'right': case 'bottom':
-          if (proceed(element, 'position') === 'static') return null;
-        case 'height': case 'width':
-          // returns '0px' for hidden elements; we want it to return null
-          if (!Element.visible(element)) return null;
-
-          // returns the border-box dimensions rather than the content-box
-          // dimensions, so we subtract padding and borders from the value
-          var dim = parseInt(proceed(element, style), 10);
-
-          if (dim !== element['offset' + style.capitalize()])
-            return dim + 'px';
-
-          var properties;
-          if (style === 'height') {
-            properties = ['border-top-width', 'padding-top',
-             'padding-bottom', 'border-bottom-width'];
-          }
-          else {
-            properties = ['border-left-width', 'padding-left',
-             'padding-right', 'border-right-width'];
-          }
-          return properties.inject(dim, function(memo, property) {
-            var val = proceed(element, property);
-            return val === null ? memo : memo - parseInt(val, 10);
-          }) + 'px';
-        default: return proceed(element, style);
-      }
-    }
-  );
-
-  Element.Methods.readAttribute = Element.Methods.readAttribute.wrap(
-    function(proceed, element, attribute) {
-      if (attribute === 'title') return element.title;
-      return proceed(element, attribute);
-    }
-  );
-}
-
-else if (Prototype.Browser.IE) {
-  // IE doesn't report offsets correctly for static elements, so we change them
-  // to "relative" to get the values, then change them back.
-  Element.Methods.getOffsetParent = Element.Methods.getOffsetParent.wrap(
-    function(proceed, element) {
-      element = $(element);
-      // IE throws an error if element is not in document
-      try { element.offsetParent }
-      catch(e) { return $(document.body) }
-      var position = element.getStyle('position');
-      if (position !== 'static') return proceed(element);
-      element.setStyle({ position: 'relative' });
-      var value = proceed(element);
-      element.setStyle({ position: position });
-      return value;
-    }
-  );
-
-  $w('positionedOffset viewportOffset').each(function(method) {
-    Element.Methods[method] = Element.Methods[method].wrap(
-      function(proceed, element) {
-        element = $(element);
-        try { element.offsetParent }
-        catch(e) { return Element._returnOffset(0,0) }
-        var position = element.getStyle('position');
-        if (position !== 'static') return proceed(element);
-        // Trigger hasLayout on the offset parent so that IE6 reports
-        // accurate offsetTop and offsetLeft values for position: fixed.
-        var offsetParent = element.getOffsetParent();
-        if (offsetParent && offsetParent.getStyle('position') === 'fixed')
-          offsetParent.setStyle({ zoom: 1 });
-        element.setStyle({ position: 'relative' });
-        var value = proceed(element);
-        element.setStyle({ position: position });
-        return value;
-      }
-    );
-  });
-
-  Element.Methods.cumulativeOffset = Element.Methods.cumulativeOffset.wrap(
-    function(proceed, element) {
-      try { element.offsetParent }
-      catch(e) { return Element._returnOffset(0,0) }
-      return proceed(element);
-    }
-  );
-
-  Element.Methods.getStyle = function(element, style) {
-    element = $(element);
-    style = (style == 'float' || style == 'cssFloat') ? 'styleFloat' : style.camelize();
-    var value = element.style[style];
-    if (!value && element.currentStyle) value = element.currentStyle[style];
-
-    if (style == 'opacity') {
-      if (value = (element.getStyle('filter') || '').match(/alpha\(opacity=(.*)\)/))
-        if (value[1]) return parseFloat(value[1]) / 100;
-      return 1.0;
-    }
-
-    if (value == 'auto') {
-      if ((style == 'width' || style == 'height') && (element.getStyle('display') != 'none'))
-        return element['offset' + style.capitalize()] + 'px';
-      return null;
-    }
-    return value;
-  };
-
-  Element.Methods.setOpacity = function(element, value) {
-    function stripAlpha(filter){
-      return filter.replace(/alpha\([^\)]*\)/gi,'');
-    }
-    element = $(element);
-    var currentStyle = element.currentStyle;
-    if ((currentStyle && !currentStyle.hasLayout) ||
-      (!currentStyle && element.style.zoom == 'normal'))
-        element.style.zoom = 1;
-
-    var filter = element.getStyle('filter'), style = element.style;
-    if (value == 1 || value === '') {
-      (filter = stripAlpha(filter)) ?
-        style.filter = filter : style.removeAttribute('filter');
-      return element;
-    } else if (value < 0.00001) value = 0;
-    style.filter = stripAlpha(filter) +
-      'alpha(opacity=' + (value * 100) + ')';
-    return element;
-  };
-
-  Element._attributeTranslations = {
-    read: {
-      names: {
-        'class': 'className',
-        'for':   'htmlFor'
-      },
-      values: {
-        _getAttr: function(element, attribute) {
-          return element.getAttribute(attribute, 2);
-        },
-        _getAttrNode: function(element, attribute) {
-          var node = element.getAttributeNode(attribute);
-          return node ? node.value : "";
-        },
-        _getEv: function(element, attribute) {
-          attribute = element.getAttribute(attribute);
-          return attribute ? attribute.toString().slice(23, -2) : null;
-        },
-        _flag: function(element, attribute) {
-          return $(element).hasAttribute(attribute) ? attribute : null;
-        },
-        style: function(element) {
-          return element.style.cssText.toLowerCase();
-        },
-        title: function(element) {
-          return element.title;
-        }
-      }
-    }
-  };
-
-  Element._attributeTranslations.write = {
-    names: Object.extend({
-      cellpadding: 'cellPadding',
-      cellspacing: 'cellSpacing'
-    }, Element._attributeTranslations.read.names),
-    values: {
-      checked: function(element, value) {
-        element.checked = !!value;
-      },
-
-      style: function(element, value) {
-        element.style.cssText = value ? value : '';
-      }
-    }
-  };
-
-  Element._attributeTranslations.has = {};
-
-  $w('colSpan rowSpan vAlign dateTime accessKey tabIndex ' +
-      'encType maxLength readOnly longDesc frameBorder').each(function(attr) {
-    Element._attributeTranslations.write.names[attr.toLowerCase()] = attr;
-    Element._attributeTranslations.has[attr.toLowerCase()] = attr;
-  });
-
-  (function(v) {
-    Object.extend(v, {
-      href:        v._getAttr,
-      src:         v._getAttr,
-      type:        v._getAttr,
-      action:      v._getAttrNode,
-      disabled:    v._flag,
-      checked:     v._flag,
-      readonly:    v._flag,
-      multiple:    v._flag,
-      onload:      v._getEv,
-      onunload:    v._getEv,
-      onclick:     v._getEv,
-      ondblclick:  v._getEv,
-      onmousedown: v._getEv,
-      onmouseup:   v._getEv,
-      onmouseover: v._getEv,
-      onmousemove: v._getEv,
-      onmouseout:  v._getEv,
-      onfocus:     v._getEv,
-      onblur:      v._getEv,
-      onkeypress:  v._getEv,
-      onkeydown:   v._getEv,
-      onkeyup:     v._getEv,
-      onsubmit:    v._getEv,
-      onreset:     v._getEv,
-      onselect:    v._getEv,
-      onchange:    v._getEv
-    });
-  })(Element._attributeTranslations.read.values);
-}
-
-else if (Prototype.Browser.Gecko && /rv:1\.8\.0/.test(navigator.userAgent)) {
-  Element.Methods.setOpacity = function(element, value) {
-    element = $(element);
-    element.style.opacity = (value == 1) ? 0.999999 :
-      (value === '') ? '' : (value < 0.00001) ? 0 : value;
-    return element;
-  };
-}
-
-else if (Prototype.Browser.WebKit) {
-  Element.Methods.setOpacity = function(element, value) {
-    element = $(element);
-    element.style.opacity = (value == 1 || value === '') ? '' :
-      (value < 0.00001) ? 0 : value;
-
-    if (value == 1)
-      if(element.tagName.toUpperCase() == 'IMG' && element.width) {
-        element.width++; element.width--;
-      } else try {
-        var n = document.createTextNode(' ');
-        element.appendChild(n);
-        element.removeChild(n);
-      } catch (e) { }
-
-    return element;
-  };
-
-  // Safari returns margins on body which is incorrect if the child is absolutely
-  // positioned.  For performance reasons, redefine Element#cumulativeOffset for
-  // KHTML/WebKit only.
-  Element.Methods.cumulativeOffset = function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      if (element.offsetParent == document.body)
-        if (Element.getStyle(element, 'position') == 'absolute') break;
-
-      element = element.offsetParent;
-    } while (element);
-
-    return Element._returnOffset(valueL, valueT);
-  };
-}
-
-if (Prototype.Browser.IE || Prototype.Browser.Opera) {
-  // IE and Opera are missing .innerHTML support for TABLE-related and SELECT elements
-  Element.Methods.update = function(element, content) {
-    element = $(element);
-
-    if (content && content.toElement) content = content.toElement();
-    if (Object.isElement(content)) return element.update().insert(content);
-
-    content = Object.toHTML(content);
-    var tagName = element.tagName.toUpperCase();
-
-    if (tagName in Element._insertionTranslations.tags) {
-      $A(element.childNodes).each(function(node) { element.removeChild(node) });
-      Element._getContentFromAnonymousElement(tagName, content.stripScripts())
-        .each(function(node) { element.appendChild(node) });
-    }
-    else element.innerHTML = content.stripScripts();
-
-    content.evalScripts.bind(content).defer();
-    return element;
-  };
-}
-
-if ('outerHTML' in document.createElement('div')) {
-  Element.Methods.replace = function(element, content) {
-    element = $(element);
-
-    if (content && content.toElement) content = content.toElement();
-    if (Object.isElement(content)) {
-      element.parentNode.replaceChild(content, element);
-      return element;
-    }
-
-    content = Object.toHTML(content);
-    var parent = element.parentNode, tagName = parent.tagName.toUpperCase();
-
-    if (Element._insertionTranslations.tags[tagName]) {
-      var nextSibling = element.next();
-      var fragments = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
-      parent.removeChild(element);
-      if (nextSibling)
-        fragments.each(function(node) { parent.insertBefore(node, nextSibling) });
-      else
-        fragments.each(function(node) { parent.appendChild(node) });
-    }
-    else element.outerHTML = content.stripScripts();
-
-    content.evalScripts.bind(content).defer();
-    return element;
-  };
-}
-
-Element._returnOffset = function(l, t) {
-  var result = [l, t];
-  result.left = l;
-  result.top = t;
-  return result;
-};
-
-Element._getContentFromAnonymousElement = function(tagName, html) {
-  var div = new Element('div'), t = Element._insertionTranslations.tags[tagName];
-  if (t) {
-    div.innerHTML = t[0] + html + t[1];
-    t[2].times(function() { div = div.firstChild });
-  } else div.innerHTML = html;
-  return $A(div.childNodes);
-};
-
-Element._insertionTranslations = {
-  before: function(element, node) {
-    element.parentNode.insertBefore(node, element);
-  },
-  top: function(element, node) {
-    element.insertBefore(node, element.firstChild);
-  },
-  bottom: function(element, node) {
-    element.appendChild(node);
-  },
-  after: function(element, node) {
-    element.parentNode.insertBefore(node, element.nextSibling);
-  },
-  tags: {
-    TABLE:  ['<table>',                '</table>',                   1],
-    TBODY:  ['<table><tbody>',         '</tbody></table>',           2],
-    TR:     ['<table><tbody><tr>',     '</tr></tbody></table>',      3],
-    TD:     ['<table><tbody><tr><td>', '</td></tr></tbody></table>', 4],
-    SELECT: ['<select>',               '</select>',                  1]
-  }
-};
-
-(function() {
-  Object.extend(this.tags, {
-    THEAD: this.tags.TBODY,
-    TFOOT: this.tags.TBODY,
-    TH:    this.tags.TD
-  });
-}).call(Element._insertionTranslations);
-
-Element.Methods.Simulated = {
-  hasAttribute: function(element, attribute) {
-    attribute = Element._attributeTranslations.has[attribute] || attribute;
-    var node = $(element).getAttributeNode(attribute);
-    return !!(node && node.specified);
-  }
-};
-
-Element.Methods.ByTag = { };
-
-Object.extend(Element, Element.Methods);
-
-if (!Prototype.BrowserFeatures.ElementExtensions &&
-    document.createElement('div')['__proto__']) {
-  window.HTMLElement = { };
-  window.HTMLElement.prototype = document.createElement('div')['__proto__'];
-  Prototype.BrowserFeatures.ElementExtensions = true;
-}
-
-Element.extend = (function() {
-  if (Prototype.BrowserFeatures.SpecificElementExtensions)
-    return Prototype.K;
-
-  var Methods = { }, ByTag = Element.Methods.ByTag;
-
-  var extend = Object.extend(function(element) {
-    if (!element || element._extendedByPrototype ||
-        element.nodeType != 1 || element == window) return element;
-
-    var methods = Object.clone(Methods),
-      tagName = element.tagName.toUpperCase(), property, value;
-
-    // extend methods for specific tags
-    if (ByTag[tagName]) Object.extend(methods, ByTag[tagName]);
-
-    for (property in methods) {
-      value = methods[property];
-      if (Object.isFunction(value) && !(property in element))
-        element[property] = value.methodize();
-    }
-
-    element._extendedByPrototype = Prototype.emptyFunction;
-    return element;
-
-  }, {
-    refresh: function() {
-      // extend methods for all tags (Safari doesn't need this)
-      if (!Prototype.BrowserFeatures.ElementExtensions) {
-        Object.extend(Methods, Element.Methods);
-        Object.extend(Methods, Element.Methods.Simulated);
-      }
-    }
-  });
-
-  extend.refresh();
-  return extend;
-})();
-
-Element.hasAttribute = function(element, attribute) {
-  if (element.hasAttribute) return element.hasAttribute(attribute);
-  return Element.Methods.Simulated.hasAttribute(element, attribute);
-};
-
-Element.addMethods = function(methods) {
-  var F = Prototype.BrowserFeatures, T = Element.Methods.ByTag;
-
-  if (!methods) {
-    Object.extend(Form, Form.Methods);
-    Object.extend(Form.Element, Form.Element.Methods);
-    Object.extend(Element.Methods.ByTag, {
-      "FORM":     Object.clone(Form.Methods),
-      "INPUT":    Object.clone(Form.Element.Methods),
-      "SELECT":   Object.clone(Form.Element.Methods),
-      "TEXTAREA": Object.clone(Form.Element.Methods)
-    });
-  }
-
-  if (arguments.length == 2) {
-    var tagName = methods;
-    methods = arguments[1];
-  }
-
-  if (!tagName) Object.extend(Element.Methods, methods || { });
-  else {
-    if (Object.isArray(tagName)) tagName.each(extend);
-    else extend(tagName);
-  }
-
-  function extend(tagName) {
-    tagName = tagName.toUpperCase();
-    if (!Element.Methods.ByTag[tagName])
-      Element.Methods.ByTag[tagName] = { };
-    Object.extend(Element.Methods.ByTag[tagName], methods);
-  }
-
-  function copy(methods, destination, onlyIfAbsent) {
-    onlyIfAbsent = onlyIfAbsent || false;
-    for (var property in methods) {
-      var value = methods[property];
-      if (!Object.isFunction(value)) continue;
-      if (!onlyIfAbsent || !(property in destination))
-        destination[property] = value.methodize();
-    }
-  }
-
-  function findDOMClass(tagName) {
-    var klass;
-    var trans = {
-      "OPTGROUP": "OptGroup", "TEXTAREA": "TextArea", "P": "Paragraph",
-      "FIELDSET": "FieldSet", "UL": "UList", "OL": "OList", "DL": "DList",
-      "DIR": "Directory", "H1": "Heading", "H2": "Heading", "H3": "Heading",
-      "H4": "Heading", "H5": "Heading", "H6": "Heading", "Q": "Quote",
-      "INS": "Mod", "DEL": "Mod", "A": "Anchor", "IMG": "Image", "CAPTION":
-      "TableCaption", "COL": "TableCol", "COLGROUP": "TableCol", "THEAD":
-      "TableSection", "TFOOT": "TableSection", "TBODY": "TableSection", "TR":
-      "TableRow", "TH": "TableCell", "TD": "TableCell", "FRAMESET":
-      "FrameSet", "IFRAME": "IFrame"
-    };
-    if (trans[tagName]) klass = 'HTML' + trans[tagName] + 'Element';
-    if (window[klass]) return window[klass];
-    klass = 'HTML' + tagName + 'Element';
-    if (window[klass]) return window[klass];
-    klass = 'HTML' + tagName.capitalize() + 'Element';
-    if (window[klass]) return window[klass];
-
-    window[klass] = { };
-    window[klass].prototype = document.createElement(tagName)['__proto__'];
-    return window[klass];
-  }
-
-  if (F.ElementExtensions) {
-    copy(Element.Methods, HTMLElement.prototype);
-    copy(Element.Methods.Simulated, HTMLElement.prototype, true);
-  }
-
-  if (F.SpecificElementExtensions) {
-    for (var tag in Element.Methods.ByTag) {
-      var klass = findDOMClass(tag);
-      if (Object.isUndefined(klass)) continue;
-      copy(T[tag], klass.prototype);
-    }
-  }
-
-  Object.extend(Element, Element.Methods);
-  delete Element.ByTag;
-
-  if (Element.extend.refresh) Element.extend.refresh();
-  Element.cache = { };
-};
-
-document.viewport = {
-  getDimensions: function() {
-    var dimensions = { }, B = Prototype.Browser;
-    $w('width height').each(function(d) {
-      var D = d.capitalize();
-      if (B.WebKit && !document.evaluate) {
-        // Safari <3.0 needs self.innerWidth/Height
-        dimensions[d] = self['inner' + D];
-      } else if (B.Opera && parseFloat(window.opera.version()) < 9.5) {
-        // Opera <9.5 needs document.body.clientWidth/Height
-        dimensions[d] = document.body['client' + D]
-      } else {
-        dimensions[d] = document.documentElement['client' + D];
-      }
-    });
-    return dimensions;
-  },
-
-  getWidth: function() {
-    return this.getDimensions().width;
-  },
-
-  getHeight: function() {
-    return this.getDimensions().height;
-  },
-
-  getScrollOffsets: function() {
-    return Element._returnOffset(
-      window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft,
-      window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop);
-  }
-};
-/* Portions of the Selector class are derived from Jack Slocum's DomQuery,
- * part of YUI-Ext version 0.40, distributed under the terms of an MIT-style
- * license.  Please see http://www.yui-ext.com/ for more information. */
-
-var Selector = Class.create({
-  initialize: function(expression) {
-    this.expression = expression.strip();
-
-    if (this.shouldUseSelectorsAPI()) {
-      this.mode = 'selectorsAPI';
-    } else if (this.shouldUseXPath()) {
-      this.mode = 'xpath';
-      this.compileXPathMatcher();
-    } else {
-      this.mode = "normal";
-      this.compileMatcher();
-    }
-
-  },
-
-  shouldUseXPath: function() {
-    if (!Prototype.BrowserFeatures.XPath) return false;
-
-    var e = this.expression;
-
-    // Safari 3 chokes on :*-of-type and :empty
-    if (Prototype.Browser.WebKit &&
-     (e.include("-of-type") || e.include(":empty")))
-      return false;
-
-    // XPath can't do namespaced attributes, nor can it read
-    // the "checked" property from DOM nodes
-    if ((/(\[[\w-]*?:|:checked)/).test(e))
-      return false;
-
-    return true;
-  },
-
-  shouldUseSelectorsAPI: function() {
-    if (!Prototype.BrowserFeatures.SelectorsAPI) return false;
-
-    if (!Selector._div) Selector._div = new Element('div');
-
-    // Make sure the browser treats the selector as valid. Test on an
-    // isolated element to minimize cost of this check.
-    try {
-      Selector._div.querySelector(this.expression);
-    } catch(e) {
-      return false;
-    }
-
-    return true;
-  },
-
-  compileMatcher: function() {
-    var e = this.expression, ps = Selector.patterns, h = Selector.handlers,
-        c = Selector.criteria, le, p, m;
-
-    if (Selector._cache[e]) {
-      this.matcher = Selector._cache[e];
-      return;
-    }
-
-    this.matcher = ["this.matcher = function(root) {",
-                    "var r = root, h = Selector.handlers, c = false, n;"];
-
-    while (e && le != e && (/\S/).test(e)) {
-      le = e;
-      for (var i in ps) {
-        p = ps[i];
-        if (m = e.match(p)) {
-          this.matcher.push(Object.isFunction(c[i]) ? c[i](m) :
-            new Template(c[i]).evaluate(m));
-          e = e.replace(m[0], '');
-          break;
-        }
-      }
-    }
-
-    this.matcher.push("return h.unique(n);\n}");
-    eval(this.matcher.join('\n'));
-    Selector._cache[this.expression] = this.matcher;
-  },
-
-  compileXPathMatcher: function() {
-    var e = this.expression, ps = Selector.patterns,
-        x = Selector.xpath, le, m;
-
-    if (Selector._cache[e]) {
-      this.xpath = Selector._cache[e]; return;
-    }
-
-    this.matcher = ['.//*'];
-    while (e && le != e && (/\S/).test(e)) {
-      le = e;
-      for (var i in ps) {
-        if (m = e.match(ps[i])) {
-          this.matcher.push(Object.isFunction(x[i]) ? x[i](m) :
-            new Template(x[i]).evaluate(m));
-          e = e.replace(m[0], '');
-          break;
-        }
-      }
-    }
-
-    this.xpath = this.matcher.join('');
-    Selector._cache[this.expression] = this.xpath;
-  },
-
-  findElements: function(root) {
-    root = root || document;
-    var e = this.expression, results;
-
-    switch (this.mode) {
-      case 'selectorsAPI':
-        // querySelectorAll queries document-wide, then filters to descendants
-        // of the context element. That's not what we want.
-        // Add an explicit context to the selector if necessary.
-        if (root !== document) {
-          var oldId = root.id, id = $(root).identify();
-          e = "#" + id + " " + e;
-        }
-
-        results = $A(root.querySelectorAll(e)).map(Element.extend);
-        root.id = oldId;
-
-        return results;
-      case 'xpath':
-        return document._getElementsByXPath(this.xpath, root);
-      default:
-       return this.matcher(root);
-    }
-  },
-
-  match: function(element) {
-    this.tokens = [];
-
-    var e = this.expression, ps = Selector.patterns, as = Selector.assertions;
-    var le, p, m;
-
-    while (e && le !== e && (/\S/).test(e)) {
-      le = e;
-      for (var i in ps) {
-        p = ps[i];
-        if (m = e.match(p)) {
-          // use the Selector.assertions methods unless the selector
-          // is too complex.
-          if (as[i]) {
-            this.tokens.push([i, Object.clone(m)]);
-            e = e.replace(m[0], '');
-          } else {
-            // reluctantly do a document-wide search
-            // and look for a match in the array
-            return this.findElements(document).include(element);
-          }
-        }
-      }
-    }
-
-    var match = true, name, matches;
-    for (var i = 0, token; token = this.tokens[i]; i++) {
-      name = token[0], matches = token[1];
-      if (!Selector.assertions[name](element, matches)) {
-        match = false; break;
-      }
-    }
-
-    return match;
-  },
-
-  toString: function() {
-    return this.expression;
-  },
-
-  inspect: function() {
-    return "#<Selector:" + this.expression.inspect() + ">";
-  }
-});
-
-Object.extend(Selector, {
-  _cache: { },
-
-  xpath: {
-    descendant:   "//*",
-    child:        "/*",
-    adjacent:     "/following-sibling::*[1]",
-    laterSibling: '/following-sibling::*',
-    tagName:      function(m) {
-      if (m[1] == '*') return '';
-      return "[local-name()='" + m[1].toLowerCase() +
-             "' or local-name()='" + m[1].toUpperCase() + "']";
-    },
-    className:    "[contains(concat(' ', @class, ' '), ' #{1} ')]",
-    id:           "[@id='#{1}']",
-    attrPresence: function(m) {
-      m[1] = m[1].toLowerCase();
-      return new Template("[@#{1}]").evaluate(m);
-    },
-    attr: function(m) {
-      m[1] = m[1].toLowerCase();
-      m[3] = m[5] || m[6];
-      return new Template(Selector.xpath.operators[m[2]]).evaluate(m);
-    },
-    pseudo: function(m) {
-      var h = Selector.xpath.pseudos[m[1]];
-      if (!h) return '';
-      if (Object.isFunction(h)) return h(m);
-      return new Template(Selector.xpath.pseudos[m[1]]).evaluate(m);
-    },
-    operators: {
-      '=':  "[@#{1}='#{3}']",
-      '!=': "[@#{1}!='#{3}']",
-      '^=': "[starts-with(@#{1}, '#{3}')]",
-      '$=': "[substring(@#{1}, (string-length(@#{1}) - string-length('#{3}') + 1))='#{3}']",
-      '*=': "[contains(@#{1}, '#{3}')]",
-      '~=': "[contains(concat(' ', @#{1}, ' '), ' #{3} ')]",
-      '|=': "[contains(concat('-', @#{1}, '-'), '-#{3}-')]"
-    },
-    pseudos: {
-      'first-child': '[not(preceding-sibling::*)]',
-      'last-child':  '[not(following-sibling::*)]',
-      'only-child':  '[not(preceding-sibling::* or following-sibling::*)]',
-      'empty':       "[count(*) = 0 and (count(text()) = 0)]",
-      'checked':     "[@checked]",
-      'disabled':    "[(@disabled) and (@type!='hidden')]",
-      'enabled':     "[not(@disabled) and (@type!='hidden')]",
-      'not': function(m) {
-        var e = m[6], p = Selector.patterns,
-            x = Selector.xpath, le, v;
-
-        var exclusion = [];
-        while (e && le != e && (/\S/).test(e)) {
-          le = e;
-          for (var i in p) {
-            if (m = e.match(p[i])) {
-              v = Object.isFunction(x[i]) ? x[i](m) : new Template(x[i]).evaluate(m);
-              exclusion.push("(" + v.substring(1, v.length - 1) + ")");
-              e = e.replace(m[0], '');
-              break;
-            }
-          }
-        }
-        return "[not(" + exclusion.join(" and ") + ")]";
-      },
-      'nth-child':      function(m) {
-        return Selector.xpath.pseudos.nth("(count(./preceding-sibling::*) + 1) ", m);
-      },
-      'nth-last-child': function(m) {
-        return Selector.xpath.pseudos.nth("(count(./following-sibling::*) + 1) ", m);
-      },
-      'nth-of-type':    function(m) {
-        return Selector.xpath.pseudos.nth("position() ", m);
-      },
-      'nth-last-of-type': function(m) {
-        return Selector.xpath.pseudos.nth("(last() + 1 - position()) ", m);
-      },
-      'first-of-type':  function(m) {
-        m[6] = "1"; return Selector.xpath.pseudos['nth-of-type'](m);
-      },
-      'last-of-type':   function(m) {
-        m[6] = "1"; return Selector.xpath.pseudos['nth-last-of-type'](m);
-      },
-      'only-of-type':   function(m) {
-        var p = Selector.xpath.pseudos; return p['first-of-type'](m) + p['last-of-type'](m);
-      },
-      nth: function(fragment, m) {
-        var mm, formula = m[6], predicate;
-        if (formula == 'even') formula = '2n+0';
-        if (formula == 'odd')  formula = '2n+1';
-        if (mm = formula.match(/^(\d+)$/)) // digit only
-          return '[' + fragment + "= " + mm[1] + ']';
-        if (mm = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
-          if (mm[1] == "-") mm[1] = -1;
-          var a = mm[1] ? Number(mm[1]) : 1;
-          var b = mm[2] ? Number(mm[2]) : 0;
-          predicate = "[((#{fragment} - #{b}) mod #{a} = 0) and " +
-          "((#{fragment} - #{b}) div #{a} >= 0)]";
-          return new Template(predicate).evaluate({
-            fragment: fragment, a: a, b: b });
-        }
-      }
-    }
-  },
-
-  criteria: {
-    tagName:      'n = h.tagName(n, r, "#{1}", c);      c = false;',
-    className:    'n = h.className(n, r, "#{1}", c);    c = false;',
-    id:           'n = h.id(n, r, "#{1}", c);           c = false;',
-    attrPresence: 'n = h.attrPresence(n, r, "#{1}", c); c = false;',
-    attr: function(m) {
-      m[3] = (m[5] || m[6]);
-      return new Template('n = h.attr(n, r, "#{1}", "#{3}", "#{2}", c); c = false;').evaluate(m);
-    },
-    pseudo: function(m) {
-      if (m[6]) m[6] = m[6].replace(/"/g, '\\"');
-      return new Template('n = h.pseudo(n, "#{1}", "#{6}", r, c); c = false;').evaluate(m);
-    },
-    descendant:   'c = "descendant";',
-    child:        'c = "child";',
-    adjacent:     'c = "adjacent";',
-    laterSibling: 'c = "laterSibling";'
-  },
-
-  patterns: {
-    // combinators must be listed first
-    // (and descendant needs to be last combinator)
-    laterSibling: /^\s*~\s*/,
-    child:        /^\s*>\s*/,
-    adjacent:     /^\s*\+\s*/,
-    descendant:   /^\s/,
-
-    // selectors follow
-    tagName:      /^\s*(\*|[\w\-]+)(\b|$)?/,
-    id:           /^#([\w\-\*]+)(\b|$)/,
-    className:    /^\.([\w\-\*]+)(\b|$)/,
-    pseudo:
-/^:((first|last|nth|nth-last|only)(-child|-of-type)|empty|checked|(en|dis)abled|not)(\((.*?)\))?(\b|$|(?=\s|[:+~>]))/,
-    attrPresence: /^\[((?:[\w]+:)?[\w]+)\]/,
-    attr:         /\[((?:[\w-]*:)?[\w-]+)\s*(?:([!^$*~|]?=)\s*((['"])([^\4]*?)\4|([^'"][^\]]*?)))?\]/
-  },
-
-  // for Selector.match and Element#match
-  assertions: {
-    tagName: function(element, matches) {
-      return matches[1].toUpperCase() == element.tagName.toUpperCase();
-    },
-
-    className: function(element, matches) {
-      return Element.hasClassName(element, matches[1]);
-    },
-
-    id: function(element, matches) {
-      return element.id === matches[1];
-    },
-
-    attrPresence: function(element, matches) {
-      return Element.hasAttribute(element, matches[1]);
-    },
-
-    attr: function(element, matches) {
-      var nodeValue = Element.readAttribute(element, matches[1]);
-      return nodeValue && Selector.operators[matches[2]](nodeValue, matches[5] || matches[6]);
-    }
-  },
-
-  handlers: {
-    // UTILITY FUNCTIONS
-    // joins two collections
-    concat: function(a, b) {
-      for (var i = 0, node; node = b[i]; i++)
-        a.push(node);
-      return a;
-    },
-
-    // marks an array of nodes for counting
-    mark: function(nodes) {
-      var _true = Prototype.emptyFunction;
-      for (var i = 0, node; node = nodes[i]; i++)
-        node._countedByPrototype = _true;
-      return nodes;
-    },
-
-    unmark: function(nodes) {
-      for (var i = 0, node; node = nodes[i]; i++)
-        node._countedByPrototype = undefined;
-      return nodes;
-    },
-
-    // mark each child node with its position (for nth calls)
-    // "ofType" flag indicates whether we're indexing for nth-of-type
-    // rather than nth-child
-    index: function(parentNode, reverse, ofType) {
-      parentNode._countedByPrototype = Prototype.emptyFunction;
-      if (reverse) {
-        for (var nodes = parentNode.childNodes, i = nodes.length - 1, j = 1; i >= 0; i--) {
-          var node = nodes[i];
-          if (node.nodeType == 1 && (!ofType || node._countedByPrototype)) node.nodeIndex = j++;
-        }
-      } else {
-        for (var i = 0, j = 1, nodes = parentNode.childNodes; node = nodes[i]; i++)
-          if (node.nodeType == 1 && (!ofType || node._countedByPrototype)) node.nodeIndex = j++;
-      }
-    },
-
-    // filters out duplicates and extends all nodes
-    unique: function(nodes) {
-      if (nodes.length == 0) return nodes;
-      var results = [], n;
-      for (var i = 0, l = nodes.length; i < l; i++)
-        if (!(n = nodes[i])._countedByPrototype) {
-          n._countedByPrototype = Prototype.emptyFunction;
-          results.push(Element.extend(n));
-        }
-      return Selector.handlers.unmark(results);
-    },
-
-    // COMBINATOR FUNCTIONS
-    descendant: function(nodes) {
-      var h = Selector.handlers;
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        h.concat(results, node.getElementsByTagName('*'));
-      return results;
-    },
-
-    child: function(nodes) {
-      var h = Selector.handlers;
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        for (var j = 0, child; child = node.childNodes[j]; j++)
-          if (child.nodeType == 1 && child.tagName != '!') results.push(child);
-      }
-      return results;
-    },
-
-    adjacent: function(nodes) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        var next = this.nextElementSibling(node);
-        if (next) results.push(next);
-      }
-      return results;
-    },
-
-    laterSibling: function(nodes) {
-      var h = Selector.handlers;
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        h.concat(results, Element.nextSiblings(node));
-      return results;
-    },
-
-    nextElementSibling: function(node) {
-      while (node = node.nextSibling)
-        if (node.nodeType == 1) return node;
-      return null;
-    },
-
-    previousElementSibling: function(node) {
-      while (node = node.previousSibling)
-        if (node.nodeType == 1) return node;
-      return null;
-    },
-
-    // TOKEN FUNCTIONS
-    tagName: function(nodes, root, tagName, combinator) {
-      var uTagName = tagName.toUpperCase();
-      var results = [], h = Selector.handlers;
-      if (nodes) {
-        if (combinator) {
-          // fastlane for ordinary descendant combinators
-          if (combinator == "descendant") {
-            for (var i = 0, node; node = nodes[i]; i++)
-              h.concat(results, node.getElementsByTagName(tagName));
-            return results;
-          } else nodes = this[combinator](nodes);
-          if (tagName == "*") return nodes;
-        }
-        for (var i = 0, node; node = nodes[i]; i++)
-          if (node.tagName.toUpperCase() === uTagName) results.push(node);
-        return results;
-      } else return root.getElementsByTagName(tagName);
-    },
-
-    id: function(nodes, root, id, combinator) {
-      var targetNode = $(id), h = Selector.handlers;
-      if (!targetNode) return [];
-      if (!nodes && root == document) return [targetNode];
-      if (nodes) {
-        if (combinator) {
-          if (combinator == 'child') {
-            for (var i = 0, node; node = nodes[i]; i++)
-              if (targetNode.parentNode == node) return [targetNode];
-          } else if (combinator == 'descendant') {
-            for (var i = 0, node; node = nodes[i]; i++)
-              if (Element.descendantOf(targetNode, node)) return [targetNode];
-          } else if (combinator == 'adjacent') {
-            for (var i = 0, node; node = nodes[i]; i++)
-              if (Selector.handlers.previousElementSibling(targetNode) == node)
-                return [targetNode];
-          } else nodes = h[combinator](nodes);
-        }
-        for (var i = 0, node; node = nodes[i]; i++)
-          if (node == targetNode) return [targetNode];
-        return [];
-      }
-      return (targetNode && Element.descendantOf(targetNode, root)) ? [targetNode] : [];
-    },
-
-    className: function(nodes, root, className, combinator) {
-      if (nodes && combinator) nodes = this[combinator](nodes);
-      return Selector.handlers.byClassName(nodes, root, className);
-    },
-
-    byClassName: function(nodes, root, className) {
-      if (!nodes) nodes = Selector.handlers.descendant([root]);
-      var needle = ' ' + className + ' ';
-      for (var i = 0, results = [], node, nodeClassName; node = nodes[i]; i++) {
-        nodeClassName = node.className;
-        if (nodeClassName.length == 0) continue;
-        if (nodeClassName == className || (' ' + nodeClassName + ' ').include(needle))
-          results.push(node);
-      }
-      return results;
-    },
-
-    attrPresence: function(nodes, root, attr, combinator) {
-      if (!nodes) nodes = root.getElementsByTagName("*");
-      if (nodes && combinator) nodes = this[combinator](nodes);
-      var results = [];
-      for (var i = 0, node; node = nodes[i]; i++)
-        if (Element.hasAttribute(node, attr)) results.push(node);
-      return results;
-    },
-
-    attr: function(nodes, root, attr, value, operator, combinator) {
-      if (!nodes) nodes = root.getElementsByTagName("*");
-      if (nodes && combinator) nodes = this[combinator](nodes);
-      var handler = Selector.operators[operator], results = [];
-      for (var i = 0, node; node = nodes[i]; i++) {
-        var nodeValue = Element.readAttribute(node, attr);
-        if (nodeValue === null) continue;
-        if (handler(nodeValue, value)) results.push(node);
-      }
-      return results;
-    },
-
-    pseudo: function(nodes, name, value, root, combinator) {
-      if (nodes && combinator) nodes = this[combinator](nodes);
-      if (!nodes) nodes = root.getElementsByTagName("*");
-      return Selector.pseudos[name](nodes, value, root);
-    }
-  },
-
-  pseudos: {
-    'first-child': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        if (Selector.handlers.previousElementSibling(node)) continue;
-          results.push(node);
-      }
-      return results;
-    },
-    'last-child': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        if (Selector.handlers.nextElementSibling(node)) continue;
-          results.push(node);
-      }
-      return results;
-    },
-    'only-child': function(nodes, value, root) {
-      var h = Selector.handlers;
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (!h.previousElementSibling(node) && !h.nextElementSibling(node))
-          results.push(node);
-      return results;
-    },
-    'nth-child':        function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, formula, root);
-    },
-    'nth-last-child':   function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, formula, root, true);
-    },
-    'nth-of-type':      function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, formula, root, false, true);
-    },
-    'nth-last-of-type': function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, formula, root, true, true);
-    },
-    'first-of-type':    function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, "1", root, false, true);
-    },
-    'last-of-type':     function(nodes, formula, root) {
-      return Selector.pseudos.nth(nodes, "1", root, true, true);
-    },
-    'only-of-type':     function(nodes, formula, root) {
-      var p = Selector.pseudos;
-      return p['last-of-type'](p['first-of-type'](nodes, formula, root), formula, root);
-    },
-
-    // handles the an+b logic
-    getIndices: function(a, b, total) {
-      if (a == 0) return b > 0 ? [b] : [];
-      return $R(1, total).inject([], function(memo, i) {
-        if (0 == (i - b) % a && (i - b) / a >= 0) memo.push(i);
-        return memo;
-      });
-    },
-
-    // handles nth(-last)-child, nth(-last)-of-type, and (first|last)-of-type
-    nth: function(nodes, formula, root, reverse, ofType) {
-      if (nodes.length == 0) return [];
-      if (formula == 'even') formula = '2n+0';
-      if (formula == 'odd')  formula = '2n+1';
-      var h = Selector.handlers, results = [], indexed = [], m;
-      h.mark(nodes);
-      for (var i = 0, node; node = nodes[i]; i++) {
-        if (!node.parentNode._countedByPrototype) {
-          h.index(node.parentNode, reverse, ofType);
-          indexed.push(node.parentNode);
-        }
-      }
-      if (formula.match(/^\d+$/)) { // just a number
-        formula = Number(formula);
-        for (var i = 0, node; node = nodes[i]; i++)
-          if (node.nodeIndex == formula) results.push(node);
-      } else if (m = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
-        if (m[1] == "-") m[1] = -1;
-        var a = m[1] ? Number(m[1]) : 1;
-        var b = m[2] ? Number(m[2]) : 0;
-        var indices = Selector.pseudos.getIndices(a, b, nodes.length);
-        for (var i = 0, node, l = indices.length; node = nodes[i]; i++) {
-          for (var j = 0; j < l; j++)
-            if (node.nodeIndex == indices[j]) results.push(node);
-        }
-      }
-      h.unmark(nodes);
-      h.unmark(indexed);
-      return results;
-    },
-
-    'empty': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++) {
-        // IE treats comments as element nodes
-        if (node.tagName == '!' || node.firstChild) continue;
-        results.push(node);
-      }
-      return results;
-    },
-
-    'not': function(nodes, selector, root) {
-      var h = Selector.handlers, selectorType, m;
-      var exclusions = new Selector(selector).findElements(root);
-      h.mark(exclusions);
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (!node._countedByPrototype) results.push(node);
-      h.unmark(exclusions);
-      return results;
-    },
-
-    'enabled': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (!node.disabled && (!node.type || node.type !== 'hidden'))
-          results.push(node);
-      return results;
-    },
-
-    'disabled': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (node.disabled) results.push(node);
-      return results;
-    },
-
-    'checked': function(nodes, value, root) {
-      for (var i = 0, results = [], node; node = nodes[i]; i++)
-        if (node.checked) results.push(node);
-      return results;
-    }
-  },
-
-  operators: {
-    '=':  function(nv, v) { return nv == v; },
-    '!=': function(nv, v) { return nv != v; },
-    '^=': function(nv, v) { return nv == v || nv && nv.startsWith(v); },
-    '$=': function(nv, v) { return nv == v || nv && nv.endsWith(v); },
-    '*=': function(nv, v) { return nv == v || nv && nv.include(v); },
-    '$=': function(nv, v) { return nv.endsWith(v); },
-    '*=': function(nv, v) { return nv.include(v); },
-    '~=': function(nv, v) { return (' ' + nv + ' ').include(' ' + v + ' '); },
-    '|=': function(nv, v) { return ('-' + (nv || "").toUpperCase() +
-     '-').include('-' + (v || "").toUpperCase() + '-'); }
-  },
-
-  split: function(expression) {
-    var expressions = [];
-    expression.scan(/(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) {
-      expressions.push(m[1].strip());
-    });
-    return expressions;
-  },
-
-  matchElements: function(elements, expression) {
-    var matches = $$(expression), h = Selector.handlers;
-    h.mark(matches);
-    for (var i = 0, results = [], element; element = elements[i]; i++)
-      if (element._countedByPrototype) results.push(element);
-    h.unmark(matches);
-    return results;
-  },
-
-  findElement: function(elements, expression, index) {
-    if (Object.isNumber(expression)) {
-      index = expression; expression = false;
-    }
-    return Selector.matchElements(elements, expression || '*')[index || 0];
-  },
-
-  findChildElements: function(element, expressions) {
-    expressions = Selector.split(expressions.join(','));
-    var results = [], h = Selector.handlers;
-    for (var i = 0, l = expressions.length, selector; i < l; i++) {
-      selector = new Selector(expressions[i].strip());
-      h.concat(results, selector.findElements(element));
-    }
-    return (l > 1) ? h.unique(results) : results;
-  }
-});
-
-if (Prototype.Browser.IE) {
-  Object.extend(Selector.handlers, {
-    // IE returns comment nodes on getElementsByTagName("*").
-    // Filter them out.
-    concat: function(a, b) {
-      for (var i = 0, node; node = b[i]; i++)
-        if (node.tagName !== "!") a.push(node);
-      return a;
-    },
-
-    // IE improperly serializes _countedByPrototype in (inner|outer)HTML.
-    unmark: function(nodes) {
-      for (var i = 0, node; node = nodes[i]; i++)
-        node.removeAttribute('_countedByPrototype');
-      return nodes;
-    }
-  });
-}
-
-function $$() {
-  return Selector.findChildElements(document, $A(arguments));
-}
-var Form = {
-  reset: function(form) {
-    $(form).reset();
-    return form;
-  },
-
-  serializeElements: function(elements, options) {
-    if (typeof options != 'object') options = { hash: !!options };
-    else if (Object.isUndefined(options.hash)) options.hash = true;
-    var key, value, submitted = false, submit = options.submit;
-
-    var data = elements.inject({ }, function(result, element) {
-      if (!element.disabled && element.name) {
-        key = element.name; value = $(element).getValue();
-        if (value != null && element.type != 'file' && (element.type != 'submit' || (!submitted &&
-            submit !== false && (!submit || key == submit) && (submitted = true)))) {
-          if (key in result) {
-            // a key is already present; construct an array of values
-            if (!Object.isArray(result[key])) result[key] = [result[key]];
-            result[key].push(value);
-          }
-          else result[key] = value;
-        }
-      }
-      return result;
-    });
-
-    return options.hash ? data : Object.toQueryString(data);
-  }
-};
-
-Form.Methods = {
-  serialize: function(form, options) {
-    return Form.serializeElements(Form.getElements(form), options);
-  },
-
-  getElements: function(form) {
-    return $A($(form).getElementsByTagName('*')).inject([],
-      function(elements, child) {
-        if (Form.Element.Serializers[child.tagName.toLowerCase()])
-          elements.push(Element.extend(child));
-        return elements;
-      }
-    );
-  },
-
-  getInputs: function(form, typeName, name) {
-    form = $(form);
-    var inputs = form.getElementsByTagName('input');
-
-    if (!typeName && !name) return $A(inputs).map(Element.extend);
-
-    for (var i = 0, matchingInputs = [], length = inputs.length; i < length; i++) {
-      var input = inputs[i];
-      if ((typeName && input.type != typeName) || (name && input.name != name))
-        continue;
-      matchingInputs.push(Element.extend(input));
-    }
-
-    return matchingInputs;
-  },
-
-  disable: function(form) {
-    form = $(form);
-    Form.getElements(form).invoke('disable');
-    return form;
-  },
-
-  enable: function(form) {
-    form = $(form);
-    Form.getElements(form).invoke('enable');
-    return form;
-  },
-
-  findFirstElement: function(form) {
-    var elements = $(form).getElements().findAll(function(element) {
-      return 'hidden' != element.type && !element.disabled;
-    });
-    var firstByIndex = elements.findAll(function(element) {
-      return element.hasAttribute('tabIndex') && element.tabIndex >= 0;
-    }).sortBy(function(element) { return element.tabIndex }).first();
-
-    return firstByIndex ? firstByIndex : elements.find(function(element) {
-      return ['input', 'select', 'textarea'].include(element.tagName.toLowerCase());
-    });
-  },
-
-  focusFirstElement: function(form) {
-    form = $(form);
-    form.findFirstElement().activate();
-    return form;
-  },
-
-  request: function(form, options) {
-    form = $(form), options = Object.clone(options || { });
-
-    var params = options.parameters, action = form.readAttribute('action') || '';
-    if (action.blank()) action = window.location.href;
-    options.parameters = form.serialize(true);
-
-    if (params) {
-      if (Object.isString(params)) params = params.toQueryParams();
-      Object.extend(options.parameters, params);
-    }
-
-    if (form.hasAttribute('method') && !options.method)
-      options.method = form.method;
-
-    return new Ajax.Request(action, options);
-  }
-};
-
-/*--------------------------------------------------------------------------*/
-
-Form.Element = {
-  focus: function(element) {
-    $(element).focus();
-    return element;
-  },
-
-  select: function(element) {
-    $(element).select();
-    return element;
-  }
-};
-
-Form.Element.Methods = {
-  serialize: function(element) {
-    element = $(element);
-    if (!element.disabled && element.name) {
-      var value = element.getValue();
-      if (value != undefined) {
-        var pair = { };
-        pair[element.name] = value;
-        return Object.toQueryString(pair);
-      }
-    }
-    return '';
-  },
-
-  getValue: function(element) {
-    element = $(element);
-    var method = element.tagName.toLowerCase();
-    return Form.Element.Serializers[method](element);
-  },
-
-  setValue: function(element, value) {
-    element = $(element);
-    var method = element.tagName.toLowerCase();
-    Form.Element.Serializers[method](element, value);
-    return element;
-  },
-
-  clear: function(element) {
-    $(element).value = '';
-    return element;
-  },
-
-  present: function(element) {
-    return $(element).value != '';
-  },
-
-  activate: function(element) {
-    element = $(element);
-    try {
-      element.focus();
-      if (element.select && (element.tagName.toLowerCase() != 'input' ||
-          !['button', 'reset', 'submit'].include(element.type)))
-        element.select();
-    } catch (e) { }
-    return element;
-  },
-
-  disable: function(element) {
-    element = $(element);
-    element.disabled = true;
-    return element;
-  },
-
-  enable: function(element) {
-    element = $(element);
-    element.disabled = false;
-    return element;
-  }
-};
-
-/*--------------------------------------------------------------------------*/
-
-var Field = Form.Element;
-var $F = Form.Element.Methods.getValue;
-
-/*--------------------------------------------------------------------------*/
-
-Form.Element.Serializers = {
-  input: function(element, value) {
-    switch (element.type.toLowerCase()) {
-      case 'checkbox':
-      case 'radio':
-        return Form.Element.Serializers.inputSelector(element, value);
-      default:
-        return Form.Element.Serializers.textarea(element, value);
-    }
-  },
-
-  inputSelector: function(element, value) {
-    if (Object.isUndefined(value)) return element.checked ? element.value : null;
-    else element.checked = !!value;
-  },
-
-  textarea: function(element, value) {
-    if (Object.isUndefined(value)) return element.value;
-    else element.value = value;
-  },
-
-  select: function(element, value) {
-    if (Object.isUndefined(value))
-      return this[element.type == 'select-one' ?
-        'selectOne' : 'selectMany'](element);
-    else {
-      var opt, currentValue, single = !Object.isArray(value);
-      for (var i = 0, length = element.length; i < length; i++) {
-        opt = element.options[i];
-        currentValue = this.optionValue(opt);
-        if (single) {
-          if (currentValue == value) {
-            opt.selected = true;
-            return;
-          }
-        }
-        else opt.selected = value.include(currentValue);
-      }
-    }
-  },
-
-  selectOne: function(element) {
-    var index = element.selectedIndex;
-    return index >= 0 ? this.optionValue(element.options[index]) : null;
-  },
-
-  selectMany: function(element) {
-    var values, length = element.length;
-    if (!length) return null;
-
-    for (var i = 0, values = []; i < length; i++) {
-      var opt = element.options[i];
-      if (opt.selected) values.push(this.optionValue(opt));
-    }
-    return values;
-  },
-
-  optionValue: function(opt) {
-    // extend element because hasAttribute may not be native
-    return Element.extend(opt).hasAttribute('value') ? opt.value : opt.text;
-  }
-};
-
-/*--------------------------------------------------------------------------*/
-
-Abstract.TimedObserver = Class.create(PeriodicalExecuter, {
-  initialize: function($super, element, frequency, callback) {
-    $super(callback, frequency);
-    this.element   = $(element);
-    this.lastValue = this.getValue();
-  },
-
-  execute: function() {
-    var value = this.getValue();
-    if (Object.isString(this.lastValue) && Object.isString(value) ?
-        this.lastValue != value : String(this.lastValue) != String(value)) {
-      this.callback(this.element, value);
-      this.lastValue = value;
-    }
-  }
-});
-
-Form.Element.Observer = Class.create(Abstract.TimedObserver, {
-  getValue: function() {
-    return Form.Element.getValue(this.element);
-  }
-});
-
-Form.Observer = Class.create(Abstract.TimedObserver, {
-  getValue: function() {
-    return Form.serialize(this.element);
-  }
-});
-
-/*--------------------------------------------------------------------------*/
-
-Abstract.EventObserver = Class.create({
-  initialize: function(element, callback) {
-    this.element  = $(element);
-    this.callback = callback;
-
-    this.lastValue = this.getValue();
-    if (this.element.tagName.toLowerCase() == 'form')
-      this.registerFormCallbacks();
-    else
-      this.registerCallback(this.element);
-  },
-
-  onElementEvent: function() {
-    var value = this.getValue();
-    if (this.lastValue != value) {
-      this.callback(this.element, value);
-      this.lastValue = value;
-    }
-  },
-
-  registerFormCallbacks: function() {
-    Form.getElements(this.element).each(this.registerCallback, this);
-  },
-
-  registerCallback: function(element) {
-    if (element.type) {
-      switch (element.type.toLowerCase()) {
-        case 'checkbox':
-        case 'radio':
-          Event.observe(element, 'click', this.onElementEvent.bind(this));
-          break;
-        default:
-          Event.observe(element, 'change', this.onElementEvent.bind(this));
-          break;
-      }
-    }
-  }
-});
-
-Form.Element.EventObserver = Class.create(Abstract.EventObserver, {
-  getValue: function() {
-    return Form.Element.getValue(this.element);
-  }
-});
-
-Form.EventObserver = Class.create(Abstract.EventObserver, {
-  getValue: function() {
-    return Form.serialize(this.element);
-  }
-});
-if (!window.Event) var Event = { };
-
-Object.extend(Event, {
-  KEY_BACKSPACE: 8,
-  KEY_TAB:       9,
-  KEY_RETURN:   13,
-  KEY_ESC:      27,
-  KEY_LEFT:     37,
-  KEY_UP:       38,
-  KEY_RIGHT:    39,
-  KEY_DOWN:     40,
-  KEY_DELETE:   46,
-  KEY_HOME:     36,
-  KEY_END:      35,
-  KEY_PAGEUP:   33,
-  KEY_PAGEDOWN: 34,
-  KEY_INSERT:   45,
-
-  cache: { },
-
-  relatedTarget: function(event) {
-    var element;
-    switch(event.type) {
-      case 'mouseover': element = event.fromElement; break;
-      case 'mouseout':  element = event.toElement;   break;
-      default: return null;
-    }
-    return Element.extend(element);
-  }
-});
-
-Event.Methods = (function() {
-  var isButton;
-
-  if (Prototype.Browser.IE) {
-    var buttonMap = { 0: 1, 1: 4, 2: 2 };
-    isButton = function(event, code) {
-      return event.button == buttonMap[code];
-    };
-
-  } else if (Prototype.Browser.WebKit) {
-    isButton = function(event, code) {
-      switch (code) {
-        case 0: return event.which == 1 && !event.metaKey;
-        case 1: return event.which == 1 && event.metaKey;
-        default: return false;
-      }
-    };
-
-  } else {
-    isButton = function(event, code) {
-      return event.which ? (event.which === code + 1) : (event.button === code);
-    };
-  }
-
-  return {
-    isLeftClick:   function(event) { return isButton(event, 0) },
-    isMiddleClick: function(event) { return isButton(event, 1) },
-    isRightClick:  function(event) { return isButton(event, 2) },
-
-    element: function(event) {
-      event = Event.extend(event);
-
-      var node          = event.target,
-          type          = event.type,
-          currentTarget = event.currentTarget;
-
-      if (currentTarget && currentTarget.tagName) {
-        // Firefox screws up the "click" event when moving between radio buttons
-        // via arrow keys. It also screws up the "load" and "error" events on images,
-        // reporting the document as the target instead of the original image.
-        if (type === 'load' || type === 'error' ||
-          (type === 'click' && currentTarget.tagName.toLowerCase() === 'input'
-            && currentTarget.type === 'radio'))
-              node = currentTarget;
-      }
-      if (node.nodeType == Node.TEXT_NODE) node = node.parentNode;
-      return Element.extend(node);
-    },
-
-    findElement: function(event, expression) {
-      var element = Event.element(event);
-      if (!expression) return element;
-      var elements = [element].concat(element.ancestors());
-      return Selector.findElement(elements, expression, 0);
-    },
-
-    pointer: function(event) {
-      var docElement = document.documentElement,
-      body = document.body || { scrollLeft: 0, scrollTop: 0 };
-      return {
-        x: event.pageX || (event.clientX +
-          (docElement.scrollLeft || body.scrollLeft) -
-          (docElement.clientLeft || 0)),
-        y: event.pageY || (event.clientY +
-          (docElement.scrollTop || body.scrollTop) -
-          (docElement.clientTop || 0))
-      };
-    },
-
-    pointerX: function(event) { return Event.pointer(event).x },
-    pointerY: function(event) { return Event.pointer(event).y },
-
-    stop: function(event) {
-      Event.extend(event);
-      event.preventDefault();
-      event.stopPropagation();
-      event.stopped = true;
-    }
-  };
-})();
-
-Event.extend = (function() {
-  var methods = Object.keys(Event.Methods).inject({ }, function(m, name) {
-    m[name] = Event.Methods[name].methodize();
-    return m;
-  });
-
-  if (Prototype.Browser.IE) {
-    Object.extend(methods, {
-      stopPropagation: function() { this.cancelBubble = true },
-      preventDefault:  function() { this.returnValue = false },
-      inspect: function() { return "[object Event]" }
-    });
-
-    return function(event) {
-      if (!event) return false;
-      if (event._extendedByPrototype) return event;
-
-      event._extendedByPrototype = Prototype.emptyFunction;
-      var pointer = Event.pointer(event);
-      Object.extend(event, {
-        target: event.srcElement,
-        relatedTarget: Event.relatedTarget(event),
-        pageX:  pointer.x,
-        pageY:  pointer.y
-      });
-      return Object.extend(event, methods);
-    };
-
-  } else {
-    Event.prototype = Event.prototype || document.createEvent("HTMLEvents")['__proto__'];
-    Object.extend(Event.prototype, methods);
-    return Prototype.K;
-  }
-})();
-
-Object.extend(Event, (function() {
-  var cache = Event.cache;
-
-  function getEventID(element) {
-    if (element._prototypeEventID) return element._prototypeEventID[0];
-    arguments.callee.id = arguments.callee.id || 1;
-    return element._prototypeEventID = [++arguments.callee.id];
-  }
-
-  function getDOMEventName(eventName) {
-    if (eventName && eventName.include(':')) return "dataavailable";
-    return eventName;
-  }
-
-  function getCacheForID(id) {
-    return cache[id] = cache[id] || { };
-  }
-
-  function getWrappersForEventName(id, eventName) {
-    var c = getCacheForID(id);
-    return c[eventName] = c[eventName] || [];
-  }
-
-  function createWrapper(element, eventName, handler) {
-    var id = getEventID(element);
-    var c = getWrappersForEventName(id, eventName);
-    if (c.pluck("handler").include(handler)) return false;
-
-    var wrapper = function(event) {
-      if (!Event || !Event.extend ||
-        (event.eventName && event.eventName != eventName))
-          return false;
-
-      Event.extend(event);
-      handler.call(element, event);
-    };
-
-    wrapper.handler = handler;
-    c.push(wrapper);
-    return wrapper;
-  }
-
-  function findWrapper(id, eventName, handler) {
-    var c = getWrappersForEventName(id, eventName);
-    return c.find(function(wrapper) { return wrapper.handler == handler });
-  }
-
-  function destroyWrapper(id, eventName, handler) {
-    var c = getCacheForID(id);
-    if (!c[eventName]) return false;
-    c[eventName] = c[eventName].without(findWrapper(id, eventName, handler));
-  }
-
-  function destroyCache() {
-    for (var id in cache)
-      for (var eventName in cache[id])
-        cache[id][eventName] = null;
-  }
-
-
-  // Internet Explorer needs to remove event handlers on page unload
-  // in order to avoid memory leaks.
-  if (window.attachEvent) {
-    window.attachEvent("onunload", destroyCache);
-  }
-
-  // Safari has a dummy event handler on page unload so that it won't
-  // use its bfcache. Safari <= 3.1 has an issue with restoring the "document"
-  // object when page is returned to via the back button using its bfcache.
-  if (Prototype.Browser.WebKit) {
-    window.addEventListener('unload', Prototype.emptyFunction, false);
-  }
-
-  return {
-    observe: function(element, eventName, handler) {
-      element = $(element);
-      var name = getDOMEventName(eventName);
-
-      var wrapper = createWrapper(element, eventName, handler);
-      if (!wrapper) return element;
-
-      if (element.addEventListener) {
-        element.addEventListener(name, wrapper, false);
-      } else {
-        element.attachEvent("on" + name, wrapper);
-      }
-
-      return element;
-    },
-
-    stopObserving: function(element, eventName, handler) {
-      element = $(element);
-      var id = getEventID(element), name = getDOMEventName(eventName);
-
-      if (!handler && eventName) {
-        getWrappersForEventName(id, eventName).each(function(wrapper) {
-          element.stopObserving(eventName, wrapper.handler);
-        });
-        return element;
-
-      } else if (!eventName) {
-        Object.keys(getCacheForID(id)).each(function(eventName) {
-          element.stopObserving(eventName);
-        });
-        return element;
-      }
-
-      var wrapper = findWrapper(id, eventName, handler);
-      if (!wrapper) return element;
-
-      if (element.removeEventListener) {
-        element.removeEventListener(name, wrapper, false);
-      } else {
-        element.detachEvent("on" + name, wrapper);
-      }
-
-      destroyWrapper(id, eventName, handler);
-
-      return element;
-    },
-
-    fire: function(element, eventName, memo) {
-      element = $(element);
-      if (element == document && document.createEvent && !element.dispatchEvent)
-        element = document.documentElement;
-
-      var event;
-      if (document.createEvent) {
-        event = document.createEvent("HTMLEvents");
-        event.initEvent("dataavailable", true, true);
-      } else {
-        event = document.createEventObject();
-        event.eventType = "ondataavailable";
-      }
-
-      event.eventName = eventName;
-      event.memo = memo || { };
-
-      if (document.createEvent) {
-        element.dispatchEvent(event);
-      } else {
-        element.fireEvent(event.eventType, event);
-      }
-
-      return Event.extend(event);
-    }
-  };
-})());
-
-Object.extend(Event, Event.Methods);
-
-Element.addMethods({
-  fire:          Event.fire,
-  observe:       Event.observe,
-  stopObserving: Event.stopObserving
-});
-
-Object.extend(document, {
-  fire:          Element.Methods.fire.methodize(),
-  observe:       Element.Methods.observe.methodize(),
-  stopObserving: Element.Methods.stopObserving.methodize(),
-  loaded:        false
-});
-
-(function() {
-  /* Support for the DOMContentLoaded event is based on work by Dan Webb,
-     Matthias Miller, Dean Edwards and John Resig. */
-
-  var timer;
-
-  function fireContentLoadedEvent() {
-    if (document.loaded) return;
-    if (timer) window.clearInterval(timer);
-    document.fire("dom:loaded");
-    document.loaded = true;
-  }
-
-  if (document.addEventListener) {
-    if (Prototype.Browser.WebKit) {
-      timer = window.setInterval(function() {
-        if (/loaded|complete/.test(document.readyState))
-          fireContentLoadedEvent();
-      }, 0);
-
-      Event.observe(window, "load", fireContentLoadedEvent);
-
-    } else {
-      document.addEventListener("DOMContentLoaded",
-        fireContentLoadedEvent, false);
-    }
-
-  } else {
-    document.write("<script id=__onDOMContentLoaded defer src=//:><\/script>");
-    $("__onDOMContentLoaded").onreadystatechange = function() {
-      if (this.readyState == "complete") {
-        this.onreadystatechange = null;
-        fireContentLoadedEvent();
-      }
-    };
-  }
-})();
-/*------------------------------- DEPRECATED -------------------------------*/
-
-Hash.toQueryString = Object.toQueryString;
-
-var Toggle = { display: Element.toggle };
-
-Element.Methods.childOf = Element.Methods.descendantOf;
-
-var Insertion = {
-  Before: function(element, content) {
-    return Element.insert(element, {before:content});
-  },
-
-  Top: function(element, content) {
-    return Element.insert(element, {top:content});
-  },
-
-  Bottom: function(element, content) {
-    return Element.insert(element, {bottom:content});
-  },
-
-  After: function(element, content) {
-    return Element.insert(element, {after:content});
-  }
-};
-
-var $continue = new Error('"throw $continue" is deprecated, use "return" instead');
-
-// This should be moved to script.aculo.us; notice the deprecated methods
-// further below, that map to the newer Element methods.
-var Position = {
-  // set to true if needed, warning: firefox performance problems
-  // NOT neeeded for page scrolling, only if draggable contained in
-  // scrollable elements
-  includeScrollOffsets: false,
-
-  // must be called before calling withinIncludingScrolloffset, every time the
-  // page is scrolled
-  prepare: function() {
-    this.deltaX =  window.pageXOffset
-                || document.documentElement.scrollLeft
-                || document.body.scrollLeft
-                || 0;
-    this.deltaY =  window.pageYOffset
-                || document.documentElement.scrollTop
-                || document.body.scrollTop
-                || 0;
-  },
-
-  // caches x/y coordinate pair to use with overlap
-  within: function(element, x, y) {
-    if (this.includeScrollOffsets)
-      return this.withinIncludingScrolloffsets(element, x, y);
-    this.xcomp = x;
-    this.ycomp = y;
-    this.offset = Element.cumulativeOffset(element);
-
-    return (y >= this.offset[1] &&
-            y <  this.offset[1] + element.offsetHeight &&
-            x >= this.offset[0] &&
-            x <  this.offset[0] + element.offsetWidth);
-  },
-
-  withinIncludingScrolloffsets: function(element, x, y) {
-    var offsetcache = Element.cumulativeScrollOffset(element);
-
-    this.xcomp = x + offsetcache[0] - this.deltaX;
-    this.ycomp = y + offsetcache[1] - this.deltaY;
-    this.offset = Element.cumulativeOffset(element);
-
-    return (this.ycomp >= this.offset[1] &&
-            this.ycomp <  this.offset[1] + element.offsetHeight &&
-            this.xcomp >= this.offset[0] &&
-            this.xcomp <  this.offset[0] + element.offsetWidth);
-  },
-
-  // within must be called directly before
-  overlap: function(mode, element) {
-    if (!mode) return 0;
-    if (mode == 'vertical')
-      return ((this.offset[1] + element.offsetHeight) - this.ycomp) /
-        element.offsetHeight;
-    if (mode == 'horizontal')
-      return ((this.offset[0] + element.offsetWidth) - this.xcomp) /
-        element.offsetWidth;
-  },
-
-  // Deprecation layer -- use newer Element methods now (1.5.2).
-
-  cumulativeOffset: Element.Methods.cumulativeOffset,
-
-  positionedOffset: Element.Methods.positionedOffset,
-
-  absolutize: function(element) {
-    Position.prepare();
-    return Element.absolutize(element);
-  },
-
-  relativize: function(element) {
-    Position.prepare();
-    return Element.relativize(element);
-  },
-
-  realOffset: Element.Methods.cumulativeScrollOffset,
-
-  offsetParent: Element.Methods.getOffsetParent,
-
-  page: Element.Methods.viewportOffset,
-
-  clone: function(source, target, options) {
-    options = options || { };
-    return Element.clonePosition(target, source, options);
-  }
-};
-
-/*--------------------------------------------------------------------------*/
-
-if (!document.getElementsByClassName) document.getElementsByClassName = function(instanceMethods){
-  function iter(name) {
-    return name.blank() ? null : "[contains(concat(' ', @class, ' '), ' " + name + " ')]";
-  }
-
-  instanceMethods.getElementsByClassName = Prototype.BrowserFeatures.XPath ?
-  function(element, className) {
-    className = className.toString().strip();
-    var cond = /\s/.test(className) ? $w(className).map(iter).join('') : iter(className);
-    return cond ? document._getElementsByXPath('.//*' + cond, element) : [];
-  } : function(element, className) {
-    className = className.toString().strip();
-    var elements = [], classNames = (/\s/.test(className) ? $w(className) : null);
-    if (!classNames && !className) return elements;
-
-    var nodes = $(element).getElementsByTagName('*');
-    className = ' ' + className + ' ';
-
-    for (var i = 0, child, cn; child = nodes[i]; i++) {
-      if (child.className && (cn = ' ' + child.className + ' ') && (cn.include(className) ||
-          (classNames && classNames.all(function(name) {
-            return !name.toString().blank() && cn.include(' ' + name + ' ');
-          }))))
-        elements.push(Element.extend(child));
-    }
-    return elements;
-  };
-
-  return function(className, parentElement) {
-    return $(parentElement || document.body).getElementsByClassName(className);
-  };
-}(Element.Methods);
-
-/*--------------------------------------------------------------------------*/
-
-Element.ClassNames = Class.create();
-Element.ClassNames.prototype = {
-  initialize: function(element) {
-    this.element = $(element);
-  },
-
-  _each: function(iterator) {
-    this.element.className.split(/\s+/).select(function(name) {
-      return name.length > 0;
-    })._each(iterator);
-  },
-
-  set: function(className) {
-    this.element.className = className;
-  },
-
-  add: function(classNameToAdd) {
-    if (this.include(classNameToAdd)) return;
-    this.set($A(this).concat(classNameToAdd).join(' '));
-  },
-
-  remove: function(classNameToRemove) {
-    if (!this.include(classNameToRemove)) return;
-    this.set($A(this).without(classNameToRemove).join(' '));
-  },
-
-  toString: function() {
-    return $A(this).join(' ');
-  }
-};
-
-Object.extend(Element.ClassNames.prototype, Enumerable);
-
-/*--------------------------------------------------------------------------*/
-
-Element.addMethods();
\ No newline at end of file
diff --git a/plugins/sfProtoculousPlugin/web/js/scriptaculous.js b/plugins/sfProtoculousPlugin/web/js/scriptaculous.js
deleted file mode 100644
index 3e5543bd0..000000000
--- a/plugins/sfProtoculousPlugin/web/js/scriptaculous.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// script.aculo.us scriptaculous.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
-
-// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-var Scriptaculous = {
-  Version: '1.8.2',
-  require: function(libraryName) {
-    // inserting via DOM fails in Safari 2.0, so brute force approach
-    document.write('<script type="text/javascript" src="'+libraryName+'"><\/script>');
-  },
-  REQUIRED_PROTOTYPE: '1.6.0.3',
-  load: function() {
-    function convertVersionString(versionString) {
-      var v = versionString.replace(/_.*|\./g, '');
-      v = parseInt(v + '0'.times(4-v.length));
-      return versionString.indexOf('_') > -1 ? v-1 : v;
-    }
-
-    if((typeof Prototype=='undefined') ||
-       (typeof Element == 'undefined') ||
-       (typeof Element.Methods=='undefined') ||
-       (convertVersionString(Prototype.Version) <
-        convertVersionString(Scriptaculous.REQUIRED_PROTOTYPE)))
-       throw("script.aculo.us requires the Prototype JavaScript framework >= " +
-        Scriptaculous.REQUIRED_PROTOTYPE);
-
-    var js = /scriptaculous\.js(\?.*)?$/;
-    $$('head script[src]').findAll(function(s) {
-      return s.src.match(js);
-    }).each(function(s) {
-      var path = s.src.replace(js, ''),
-      includes = s.src.match(/\?.*load=([a-z,]*)/);
-      (includes ? includes[1] : 'builder,effects,dragdrop,controls,slider,sound').split(',').each(
-       function(include) { Scriptaculous.require(path+include+'.js') });
-    });
-  }
-};
-
-Scriptaculous.load();
\ No newline at end of file
diff --git a/plugins/sfProtoculousPlugin/web/js/slider.js b/plugins/sfProtoculousPlugin/web/js/slider.js
deleted file mode 100644
index 40b73711c..000000000
--- a/plugins/sfProtoculousPlugin/web/js/slider.js
+++ /dev/null
@@ -1,275 +0,0 @@
-// script.aculo.us slider.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
-
-// Copyright (c) 2005-2008 Marty Haught, Thomas Fuchs
-//
-// script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-if (!Control) var Control = { };
-
-// options:
-//  axis: 'vertical', or 'horizontal' (default)
-//
-// callbacks:
-//  onChange(value)
-//  onSlide(value)
-Control.Slider = Class.create({
-  initialize: function(handle, track, options) {
-    var slider = this;
-
-    if (Object.isArray(handle)) {
-      this.handles = handle.collect( function(e) { return $(e) });
-    } else {
-      this.handles = [$(handle)];
-    }
-
-    this.track   = $(track);
-    this.options = options || { };
-
-    this.axis      = this.options.axis || 'horizontal';
-    this.increment = this.options.increment || 1;
-    this.step      = parseInt(this.options.step || '1');
-    this.range     = this.options.range || $R(0,1);
-
-    this.value     = 0; // assure backwards compat
-    this.values    = this.handles.map( function() { return 0 });
-    this.spans     = this.options.spans ? this.options.spans.map(function(s){ return $(s) }) : false;
-    this.options.startSpan = $(this.options.startSpan || null);
-    this.options.endSpan   = $(this.options.endSpan || null);
-
-    this.restricted = this.options.restricted || false;
-
-    this.maximum   = this.options.maximum || this.range.end;
-    this.minimum   = this.options.minimum || this.range.start;
-
-    // Will be used to align the handle onto the track, if necessary
-    this.alignX = parseInt(this.options.alignX || '0');
-    this.alignY = parseInt(this.options.alignY || '0');
-
-    this.trackLength = this.maximumOffset() - this.minimumOffset();
-
-    this.handleLength = this.isVertical() ?
-      (this.handles[0].offsetHeight != 0 ?
-        this.handles[0].offsetHeight : this.handles[0].style.height.replace(/px$/,"")) :
-      (this.handles[0].offsetWidth != 0 ? this.handles[0].offsetWidth :
-        this.handles[0].style.width.replace(/px$/,""));
-
-    this.active   = false;
-    this.dragging = false;
-    this.disabled = false;
-
-    if (this.options.disabled) this.setDisabled();
-
-    // Allowed values array
-    this.allowedValues = this.options.values ? this.options.values.sortBy(Prototype.K) : false;
-    if (this.allowedValues) {
-      this.minimum = this.allowedValues.min();
-      this.maximum = this.allowedValues.max();
-    }
-
-    this.eventMouseDown = this.startDrag.bindAsEventListener(this);
-    this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
-    this.eventMouseMove = this.update.bindAsEventListener(this);
-
-    // Initialize handles in reverse (make sure first handle is active)
-    this.handles.each( function(h,i) {
-      i = slider.handles.length-1-i;
-      slider.setValue(parseFloat(
-        (Object.isArray(slider.options.sliderValue) ?
-          slider.options.sliderValue[i] : slider.options.sliderValue) ||
-         slider.range.start), i);
-      h.makePositioned().observe("mousedown", slider.eventMouseDown);
-    });
-
-    this.track.observe("mousedown", this.eventMouseDown);
-    document.observe("mouseup", this.eventMouseUp);
-    document.observe("mousemove", this.eventMouseMove);
-
-    this.initialized = true;
-  },
-  dispose: function() {
-    var slider = this;
-    Event.stopObserving(this.track, "mousedown", this.eventMouseDown);
-    Event.stopObserving(document, "mouseup", this.eventMouseUp);
-    Event.stopObserving(document, "mousemove", this.eventMouseMove);
-    this.handles.each( function(h) {
-      Event.stopObserving(h, "mousedown", slider.eventMouseDown);
-    });
-  },
-  setDisabled: function(){
-    this.disabled = true;
-  },
-  setEnabled: function(){
-    this.disabled = false;
-  },
-  getNearestValue: function(value){
-    if (this.allowedValues){
-      if (value >= this.allowedValues.max()) return(this.allowedValues.max());
-      if (value <= this.allowedValues.min()) return(this.allowedValues.min());
-
-      var offset = Math.abs(this.allowedValues[0] - value);
-      var newValue = this.allowedValues[0];
-      this.allowedValues.each( function(v) {
-        var currentOffset = Math.abs(v - value);
-        if (currentOffset <= offset){
-          newValue = v;
-          offset = currentOffset;
-        }
-      });
-      return newValue;
-    }
-    if (value > this.range.end) return this.range.end;
-    if (value < this.range.start) return this.range.start;
-    return value;
-  },
-  setValue: function(sliderValue, handleIdx){
-    if (!this.active) {
-      this.activeHandleIdx = handleIdx || 0;
-      this.activeHandle    = this.handles[this.activeHandleIdx];
-      this.updateStyles();
-    }
-    handleIdx = handleIdx || this.activeHandleIdx || 0;
-    if (this.initialized && this.restricted) {
-      if ((handleIdx>0) && (sliderValue<this.values[handleIdx-1]))
-        sliderValue = this.values[handleIdx-1];
-      if ((handleIdx < (this.handles.length-1)) && (sliderValue>this.values[handleIdx+1]))
-        sliderValue = this.values[handleIdx+1];
-    }
-    sliderValue = this.getNearestValue(sliderValue);
-    this.values[handleIdx] = sliderValue;
-    this.value = this.values[0]; // assure backwards compat
-
-    this.handles[handleIdx].style[this.isVertical() ? 'top' : 'left'] =
-      this.translateToPx(sliderValue);
-
-    this.drawSpans();
-    if (!this.dragging || !this.event) this.updateFinished();
-  },
-  setValueBy: function(delta, handleIdx) {
-    this.setValue(this.values[handleIdx || this.activeHandleIdx || 0] + delta,
-      handleIdx || this.activeHandleIdx || 0);
-  },
-  translateToPx: function(value) {
-    return Math.round(
-      ((this.trackLength-this.handleLength)/(this.range.end-this.range.start)) *
-      (value - this.range.start)) + "px";
-  },
-  translateToValue: function(offset) {
-    return ((offset/(this.trackLength-this.handleLength) *
-      (this.range.end-this.range.start)) + this.range.start);
-  },
-  getRange: function(range) {
-    var v = this.values.sortBy(Prototype.K);
-    range = range || 0;
-    return $R(v[range],v[range+1]);
-  },
-  minimumOffset: function(){
-    return(this.isVertical() ? this.alignY : this.alignX);
-  },
-  maximumOffset: function(){
-    return(this.isVertical() ?
-      (this.track.offsetHeight != 0 ? this.track.offsetHeight :
-        this.track.style.height.replace(/px$/,"")) - this.alignY :
-      (this.track.offsetWidth != 0 ? this.track.offsetWidth :
-        this.track.style.width.replace(/px$/,"")) - this.alignX);
-  },
-  isVertical:  function(){
-    return (this.axis == 'vertical');
-  },
-  drawSpans: function() {
-    var slider = this;
-    if (this.spans)
-      $R(0, this.spans.length-1).each(function(r) { slider.setSpan(slider.spans[r], slider.getRange(r)) });
-    if (this.options.startSpan)
-      this.setSpan(this.options.startSpan,
-        $R(0, this.values.length>1 ? this.getRange(0).min() : this.value ));
-    if (this.options.endSpan)
-      this.setSpan(this.options.endSpan,
-        $R(this.values.length>1 ? this.getRange(this.spans.length-1).max() : this.value, this.maximum));
-  },
-  setSpan: function(span, range) {
-    if (this.isVertical()) {
-      span.style.top = this.translateToPx(range.start);
-      span.style.height = this.translateToPx(range.end - range.start + this.range.start);
-    } else {
-      span.style.left = this.translateToPx(range.start);
-      span.style.width = this.translateToPx(range.end - range.start + this.range.start);
-    }
-  },
-  updateStyles: function() {
-    this.handles.each( function(h){ Element.removeClassName(h, 'selected') });
-    Element.addClassName(this.activeHandle, 'selected');
-  },
-  startDrag: function(event) {
-    if (Event.isLeftClick(event)) {
-      if (!this.disabled){
-        this.active = true;
-
-        var handle = Event.element(event);
-        var pointer  = [Event.pointerX(event), Event.pointerY(event)];
-        var track = handle;
-        if (track==this.track) {
-          var offsets  = Position.cumulativeOffset(this.track);
-          this.event = event;
-          this.setValue(this.translateToValue(
-           (this.isVertical() ? pointer[1]-offsets[1] : pointer[0]-offsets[0])-(this.handleLength/2)
-          ));
-          var offsets  = Position.cumulativeOffset(this.activeHandle);
-          this.offsetX = (pointer[0] - offsets[0]);
-          this.offsetY = (pointer[1] - offsets[1]);
-        } else {
-          // find the handle (prevents issues with Safari)
-          while((this.handles.indexOf(handle) == -1) && handle.parentNode)
-            handle = handle.parentNode;
-
-          if (this.handles.indexOf(handle)!=-1) {
-            this.activeHandle    = handle;
-            this.activeHandleIdx = this.handles.indexOf(this.activeHandle);
-            this.updateStyles();
-
-            var offsets  = Position.cumulativeOffset(this.activeHandle);
-            this.offsetX = (pointer[0] - offsets[0]);
-            this.offsetY = (pointer[1] - offsets[1]);
-          }
-        }
-      }
-      Event.stop(event);
-    }
-  },
-  update: function(event) {
-   if (this.active) {
-      if (!this.dragging) this.dragging = true;
-      this.draw(event);
-      if (Prototype.Browser.WebKit) window.scrollBy(0,0);
-      Event.stop(event);
-   }
-  },
-  draw: function(event) {
-    var pointer = [Event.pointerX(event), Event.pointerY(event)];
-    var offsets = Position.cumulativeOffset(this.track);
-    pointer[0] -= this.offsetX + offsets[0];
-    pointer[1] -= this.offsetY + offsets[1];
-    this.event = event;
-    this.setValue(this.translateToValue( this.isVertical() ? pointer[1] : pointer[0] ));
-    if (this.initialized && this.options.onSlide)
-      this.options.onSlide(this.values.length>1 ? this.values : this.value, this);
-  },
-  endDrag: function(event) {
-    if (this.active && this.dragging) {
-      this.finishDrag(event, true);
-      Event.stop(event);
-    }
-    this.active = false;
-    this.dragging = false;
-  },
-  finishDrag: function(event, success) {
-    this.active = false;
-    this.dragging = false;
-    this.updateFinished();
-  },
-  updateFinished: function() {
-    if (this.initialized && this.options.onChange)
-      this.options.onChange(this.values.length>1 ? this.values : this.value, this);
-    this.event = null;
-  }
-});
\ No newline at end of file
diff --git a/plugins/sfProtoculousPlugin/web/js/sound.js b/plugins/sfProtoculousPlugin/web/js/sound.js
deleted file mode 100644
index e2487cde5..000000000
--- a/plugins/sfProtoculousPlugin/web/js/sound.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// script.aculo.us sound.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
-
-// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//
-// Based on code created by Jules Gravinese (http://www.webveteran.com/)
-//
-// script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-Sound = {
-  tracks: {},
-  _enabled: true,
-  template:
-    new Template('<embed style="height:0" id="sound_#{track}_#{id}" src="#{url}" loop="false" autostart="true" hidden="true"/>'),
-  enable: function(){
-    Sound._enabled = true;
-  },
-  disable: function(){
-    Sound._enabled = false;
-  },
-  play: function(url){
-    if(!Sound._enabled) return;
-    var options = Object.extend({
-      track: 'global', url: url, replace: false
-    }, arguments[1] || {});
-
-    if(options.replace && this.tracks[options.track]) {
-      $R(0, this.tracks[options.track].id).each(function(id){
-        var sound = $('sound_'+options.track+'_'+id);
-        sound.Stop && sound.Stop();
-        sound.remove();
-      });
-      this.tracks[options.track] = null;
-    }
-
-    if(!this.tracks[options.track])
-      this.tracks[options.track] = { id: 0 };
-    else
-      this.tracks[options.track].id++;
-
-    options.id = this.tracks[options.track].id;
-    $$('body')[0].insert(
-      Prototype.Browser.IE ? new Element('bgsound',{
-        id: 'sound_'+options.track+'_'+options.id,
-        src: options.url, loop: 1, autostart: true
-      }) : Sound.template.evaluate(options));
-  }
-};
-
-if(Prototype.Browser.Gecko && navigator.userAgent.indexOf("Win") > 0){
-  if(navigator.plugins && $A(navigator.plugins).detect(function(p){ return p.name.indexOf('QuickTime') != -1 }))
-    Sound.template = new Template('<object id="sound_#{track}_#{id}" width="0" height="0" type="audio/mpeg" data="#{url}"/>');
-  else
-    Sound.play = function(){};
-}
\ No newline at end of file
diff --git a/plugins/sfProtoculousPlugin/web/js/unittest.js b/plugins/sfProtoculousPlugin/web/js/unittest.js
deleted file mode 100644
index 446097ec5..000000000
--- a/plugins/sfProtoculousPlugin/web/js/unittest.js
+++ /dev/null
@@ -1,568 +0,0 @@
-// script.aculo.us unittest.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
-
-// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//           (c) 2005-2008 Jon Tirsen (http://www.tirsen.com)
-//           (c) 2005-2008 Michael Schuerig (http://www.schuerig.de/michael/)
-//
-// script.aculo.us is freely distributable under the terms of an MIT-style license.
-// For details, see the script.aculo.us web site: http://script.aculo.us/
-
-// experimental, Firefox-only
-Event.simulateMouse = function(element, eventName) {
-  var options = Object.extend({
-    pointerX: 0,
-    pointerY: 0,
-    buttons:  0,
-    ctrlKey:  false,
-    altKey:   false,
-    shiftKey: false,
-    metaKey:  false
-  }, arguments[2] || {});
-  var oEvent = document.createEvent("MouseEvents");
-  oEvent.initMouseEvent(eventName, true, true, document.defaultView, 
-    options.buttons, options.pointerX, options.pointerY, options.pointerX, options.pointerY, 
-    options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, 0, $(element));
-  
-  if(this.mark) Element.remove(this.mark);
-  this.mark = document.createElement('div');
-  this.mark.appendChild(document.createTextNode(" "));
-  document.body.appendChild(this.mark);
-  this.mark.style.position = 'absolute';
-  this.mark.style.top = options.pointerY + "px";
-  this.mark.style.left = options.pointerX + "px";
-  this.mark.style.width = "5px";
-  this.mark.style.height = "5px;";
-  this.mark.style.borderTop = "1px solid red;";
-  this.mark.style.borderLeft = "1px solid red;";
-  
-  if(this.step)
-    alert('['+new Date().getTime().toString()+'] '+eventName+'/'+Test.Unit.inspect(options));
-  
-  $(element).dispatchEvent(oEvent);
-};
-
-// Note: Due to a fix in Firefox 1.0.5/6 that probably fixed "too much", this doesn't work in 1.0.6 or DP2.
-// You need to downgrade to 1.0.4 for now to get this working
-// See https://bugzilla.mozilla.org/show_bug.cgi?id=289940 for the fix that fixed too much
-Event.simulateKey = function(element, eventName) {
-  var options = Object.extend({
-    ctrlKey: false,
-    altKey: false,
-    shiftKey: false,
-    metaKey: false,
-    keyCode: 0,
-    charCode: 0
-  }, arguments[2] || {});
-
-  var oEvent = document.createEvent("KeyEvents");
-  oEvent.initKeyEvent(eventName, true, true, window, 
-    options.ctrlKey, options.altKey, options.shiftKey, options.metaKey,
-    options.keyCode, options.charCode );
-  $(element).dispatchEvent(oEvent);
-};
-
-Event.simulateKeys = function(element, command) {
-  for(var i=0; i<command.length; i++) {
-    Event.simulateKey(element,'keypress',{charCode:command.charCodeAt(i)});
-  }
-};
-
-var Test = {};
-Test.Unit = {};
-
-// security exception workaround
-Test.Unit.inspect = Object.inspect;
-
-Test.Unit.Logger = Class.create();
-Test.Unit.Logger.prototype = {
-  initialize: function(log) {
-    this.log = $(log);
-    if (this.log) {
-      this._createLogTable();
-    }
-  },
-  start: function(testName) {
-    if (!this.log) return;
-    this.testName = testName;
-    this.lastLogLine = document.createElement('tr');
-    this.statusCell = document.createElement('td');
-    this.nameCell = document.createElement('td');
-    this.nameCell.className = "nameCell";
-    this.nameCell.appendChild(document.createTextNode(testName));
-    this.messageCell = document.createElement('td');
-    this.lastLogLine.appendChild(this.statusCell);
-    this.lastLogLine.appendChild(this.nameCell);
-    this.lastLogLine.appendChild(this.messageCell);
-    this.loglines.appendChild(this.lastLogLine);
-  },
-  finish: function(status, summary) {
-    if (!this.log) return;
-    this.lastLogLine.className = status;
-    this.statusCell.innerHTML = status;
-    this.messageCell.innerHTML = this._toHTML(summary);
-    this.addLinksToResults();
-  },
-  message: function(message) {
-    if (!this.log) return;
-    this.messageCell.innerHTML = this._toHTML(message);
-  },
-  summary: function(summary) {
-    if (!this.log) return;
-    this.logsummary.innerHTML = this._toHTML(summary);
-  },
-  _createLogTable: function() {
-    this.log.innerHTML =
-    '<div id="logsummary"></div>' +
-    '<table id="logtable">' +
-    '<thead><tr><th>Status</th><th>Test</th><th>Message</th></tr></thead>' +
-    '<tbody id="loglines"></tbody>' +
-    '</table>';
-    this.logsummary = $('logsummary');
-    this.loglines = $('loglines');
-  },
-  _toHTML: function(txt) {
-    return txt.escapeHTML().replace(/\n/g,"<br/>");
-  },
-  addLinksToResults: function(){ 
-    $$("tr.failed .nameCell").each( function(td){ // todo: limit to children of this.log
-      td.title = "Run only this test";
-      Event.observe(td, 'click', function(){ window.location.search = "?tests=" + td.innerHTML;});
-    });
-    $$("tr.passed .nameCell").each( function(td){ // todo: limit to children of this.log
-      td.title = "Run all tests";
-      Event.observe(td, 'click', function(){ window.location.search = "";});
-    });
-  }
-};
-
-Test.Unit.Runner = Class.create();
-Test.Unit.Runner.prototype = {
-  initialize: function(testcases) {
-    this.options = Object.extend({
-      testLog: 'testlog'
-    }, arguments[1] || {});
-    this.options.resultsURL = this.parseResultsURLQueryParameter();
-    this.options.tests      = this.parseTestsQueryParameter();
-    if (this.options.testLog) {
-      this.options.testLog = $(this.options.testLog) || null;
-    }
-    if(this.options.tests) {
-      this.tests = [];
-      for(var i = 0; i < this.options.tests.length; i++) {
-        if(/^test/.test(this.options.tests[i])) {
-          this.tests.push(new Test.Unit.Testcase(this.options.tests[i], testcases[this.options.tests[i]], testcases["setup"], testcases["teardown"]));
-        }
-      }
-    } else {
-      if (this.options.test) {
-        this.tests = [new Test.Unit.Testcase(this.options.test, testcases[this.options.test], testcases["setup"], testcases["teardown"])];
-      } else {
-        this.tests = [];
-        for(var testcase in testcases) {
-          if(/^test/.test(testcase)) {
-            this.tests.push(
-               new Test.Unit.Testcase(
-                 this.options.context ? ' -> ' + this.options.titles[testcase] : testcase, 
-                 testcases[testcase], testcases["setup"], testcases["teardown"]
-               ));
-          }
-        }
-      }
-    }
-    this.currentTest = 0;
-    this.logger = new Test.Unit.Logger(this.options.testLog);
-    setTimeout(this.runTests.bind(this), 1000);
-  },
-  parseResultsURLQueryParameter: function() {
-    return window.location.search.parseQuery()["resultsURL"];
-  },
-  parseTestsQueryParameter: function(){
-    if (window.location.search.parseQuery()["tests"]){
-        return window.location.search.parseQuery()["tests"].split(',');
-    };
-  },
-  // Returns:
-  //  "ERROR" if there was an error,
-  //  "FAILURE" if there was a failure, or
-  //  "SUCCESS" if there was neither
-  getResult: function() {
-    var hasFailure = false;
-    for(var i=0;i<this.tests.length;i++) {
-      if (this.tests[i].errors > 0) {
-        return "ERROR";
-      }
-      if (this.tests[i].failures > 0) {
-        hasFailure = true;
-      }
-    }
-    if (hasFailure) {
-      return "FAILURE";
-    } else {
-      return "SUCCESS";
-    }
-  },
-  postResults: function() {
-    if (this.options.resultsURL) {
-      new Ajax.Request(this.options.resultsURL, 
-        { method: 'get', parameters: 'result=' + this.getResult(), asynchronous: false });
-    }
-  },
-  runTests: function() {
-    var test = this.tests[this.currentTest];
-    if (!test) {
-      // finished!
-      this.postResults();
-      this.logger.summary(this.summary());
-      return;
-    }
-    if(!test.isWaiting) {
-      this.logger.start(test.name);
-    }
-    test.run();
-    if(test.isWaiting) {
-      this.logger.message("Waiting for " + test.timeToWait + "ms");
-      setTimeout(this.runTests.bind(this), test.timeToWait || 1000);
-    } else {
-      this.logger.finish(test.status(), test.summary());
-      this.currentTest++;
-      // tail recursive, hopefully the browser will skip the stackframe
-      this.runTests();
-    }
-  },
-  summary: function() {
-    var assertions = 0;
-    var failures = 0;
-    var errors = 0;
-    var messages = [];
-    for(var i=0;i<this.tests.length;i++) {
-      assertions +=   this.tests[i].assertions;
-      failures   +=   this.tests[i].failures;
-      errors     +=   this.tests[i].errors;
-    }
-    return (
-      (this.options.context ? this.options.context + ': ': '') + 
-      this.tests.length + " tests, " + 
-      assertions + " assertions, " + 
-      failures   + " failures, " +
-      errors     + " errors");
-  }
-};
-
-Test.Unit.Assertions = Class.create();
-Test.Unit.Assertions.prototype = {
-  initialize: function() {
-    this.assertions = 0;
-    this.failures   = 0;
-    this.errors     = 0;
-    this.messages   = [];
-  },
-  summary: function() {
-    return (
-      this.assertions + " assertions, " + 
-      this.failures   + " failures, " +
-      this.errors     + " errors" + "\n" +
-      this.messages.join("\n"));
-  },
-  pass: function() {
-    this.assertions++;
-  },
-  fail: function(message) {
-    this.failures++;
-    this.messages.push("Failure: " + message);
-  },
-  info: function(message) {
-    this.messages.push("Info: " + message);
-  },
-  error: function(error) {
-    this.errors++;
-    this.messages.push(error.name + ": "+ error.message + "(" + Test.Unit.inspect(error) +")");
-  },
-  status: function() {
-    if (this.failures > 0) return 'failed';
-    if (this.errors > 0) return 'error';
-    return 'passed';
-  },
-  assert: function(expression) {
-    var message = arguments[1] || 'assert: got "' + Test.Unit.inspect(expression) + '"';
-    try { expression ? this.pass() : 
-      this.fail(message); }
-    catch(e) { this.error(e); }
-  },
-  assertEqual: function(expected, actual) {
-    var message = arguments[2] || "assertEqual";
-    try { (expected == actual) ? this.pass() :
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) + 
-        '", actual "' + Test.Unit.inspect(actual) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertInspect: function(expected, actual) {
-    var message = arguments[2] || "assertInspect";
-    try { (expected == actual.inspect()) ? this.pass() :
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) + 
-        '", actual "' + Test.Unit.inspect(actual) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertEnumEqual: function(expected, actual) {
-    var message = arguments[2] || "assertEnumEqual";
-    try { $A(expected).length == $A(actual).length && 
-      expected.zip(actual).all(function(pair) { return pair[0] == pair[1] }) ?
-        this.pass() : this.fail(message + ': expected ' + Test.Unit.inspect(expected) + 
-          ', actual ' + Test.Unit.inspect(actual)); }
-    catch(e) { this.error(e); }
-  },
-  assertNotEqual: function(expected, actual) {
-    var message = arguments[2] || "assertNotEqual";
-    try { (expected != actual) ? this.pass() : 
-      this.fail(message + ': got "' + Test.Unit.inspect(actual) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertIdentical: function(expected, actual) { 
-    var message = arguments[2] || "assertIdentical"; 
-    try { (expected === actual) ? this.pass() : 
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
-        '", actual "' + Test.Unit.inspect(actual) + '"'); } 
-    catch(e) { this.error(e); } 
-  },
-  assertNotIdentical: function(expected, actual) { 
-    var message = arguments[2] || "assertNotIdentical"; 
-    try { !(expected === actual) ? this.pass() : 
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
-        '", actual "' + Test.Unit.inspect(actual) + '"'); } 
-    catch(e) { this.error(e); } 
-  },
-  assertNull: function(obj) {
-    var message = arguments[1] || 'assertNull';
-    try { (obj==null) ? this.pass() : 
-      this.fail(message + ': got "' + Test.Unit.inspect(obj) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertMatch: function(expected, actual) {
-    var message = arguments[2] || 'assertMatch';
-    var regex = new RegExp(expected);
-    try { (regex.exec(actual)) ? this.pass() :
-      this.fail(message + ' : regex: "' +  Test.Unit.inspect(expected) + ' did not match: ' + Test.Unit.inspect(actual) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertHidden: function(element) {
-    var message = arguments[1] || 'assertHidden';
-    this.assertEqual("none", element.style.display, message);
-  },
-  assertNotNull: function(object) {
-    var message = arguments[1] || 'assertNotNull';
-    this.assert(object != null, message);
-  },
-  assertType: function(expected, actual) {
-    var message = arguments[2] || 'assertType';
-    try { 
-      (actual.constructor == expected) ? this.pass() : 
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
-        '", actual "' + (actual.constructor) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertNotOfType: function(expected, actual) {
-    var message = arguments[2] || 'assertNotOfType';
-    try { 
-      (actual.constructor != expected) ? this.pass() : 
-      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
-        '", actual "' + (actual.constructor) + '"'); }
-    catch(e) { this.error(e); }
-  },
-  assertInstanceOf: function(expected, actual) {
-    var message = arguments[2] || 'assertInstanceOf';
-    try { 
-      (actual instanceof expected) ? this.pass() : 
-      this.fail(message + ": object was not an instance of the expected type"); }
-    catch(e) { this.error(e); } 
-  },
-  assertNotInstanceOf: function(expected, actual) {
-    var message = arguments[2] || 'assertNotInstanceOf';
-    try { 
-      !(actual instanceof expected) ? this.pass() : 
-      this.fail(message + ": object was an instance of the not expected type"); }
-    catch(e) { this.error(e); } 
-  },
-  assertRespondsTo: function(method, obj) {
-    var message = arguments[2] || 'assertRespondsTo';
-    try {
-      (obj[method] && typeof obj[method] == 'function') ? this.pass() : 
-      this.fail(message + ": object doesn't respond to [" + method + "]"); }
-    catch(e) { this.error(e); }
-  },
-  assertReturnsTrue: function(method, obj) {
-    var message = arguments[2] || 'assertReturnsTrue';
-    try {
-      var m = obj[method];
-      if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)];
-      m() ? this.pass() : 
-      this.fail(message + ": method returned false"); }
-    catch(e) { this.error(e); }
-  },
-  assertReturnsFalse: function(method, obj) {
-    var message = arguments[2] || 'assertReturnsFalse';
-    try {
-      var m = obj[method];
-      if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)];
-      !m() ? this.pass() : 
-      this.fail(message + ": method returned true"); }
-    catch(e) { this.error(e); }
-  },
-  assertRaise: function(exceptionName, method) {
-    var message = arguments[2] || 'assertRaise';
-    try { 
-      method();
-      this.fail(message + ": exception expected but none was raised"); }
-    catch(e) {
-      ((exceptionName == null) || (e.name==exceptionName)) ? this.pass() : this.error(e); 
-    }
-  },
-  assertElementsMatch: function() {
-    var expressions = $A(arguments), elements = $A(expressions.shift());
-    if (elements.length != expressions.length) {
-      this.fail('assertElementsMatch: size mismatch: ' + elements.length + ' elements, ' + expressions.length + ' expressions');
-      return false;
-    }
-    elements.zip(expressions).all(function(pair, index) {
-      var element = $(pair.first()), expression = pair.last();
-      if (element.match(expression)) return true;
-      this.fail('assertElementsMatch: (in index ' + index + ') expected ' + expression.inspect() + ' but got ' + element.inspect());
-    }.bind(this)) && this.pass();
-  },
-  assertElementMatches: function(element, expression) {
-    this.assertElementsMatch([element], expression);
-  },
-  benchmark: function(operation, iterations) {
-    var startAt = new Date();
-    (iterations || 1).times(operation);
-    var timeTaken = ((new Date())-startAt);
-    this.info((arguments[2] || 'Operation') + ' finished ' + 
-       iterations + ' iterations in ' + (timeTaken/1000)+'s' );
-    return timeTaken;
-  },
-  _isVisible: function(element) {
-    element = $(element);
-    if(!element.parentNode) return true;
-    this.assertNotNull(element);
-    if(element.style && Element.getStyle(element, 'display') == 'none')
-      return false;
-    
-    return this._isVisible(element.parentNode);
-  },
-  assertNotVisible: function(element) {
-    this.assert(!this._isVisible(element), Test.Unit.inspect(element) + " was not hidden and didn't have a hidden parent either. " + ("" || arguments[1]));
-  },
-  assertVisible: function(element) {
-    this.assert(this._isVisible(element), Test.Unit.inspect(element) + " was not visible. " + ("" || arguments[1]));
-  },
-  benchmark: function(operation, iterations) {
-    var startAt = new Date();
-    (iterations || 1).times(operation);
-    var timeTaken = ((new Date())-startAt);
-    this.info((arguments[2] || 'Operation') + ' finished ' + 
-       iterations + ' iterations in ' + (timeTaken/1000)+'s' );
-    return timeTaken;
-  }
-};
-
-Test.Unit.Testcase = Class.create();
-Object.extend(Object.extend(Test.Unit.Testcase.prototype, Test.Unit.Assertions.prototype), {
-  initialize: function(name, test, setup, teardown) {
-    Test.Unit.Assertions.prototype.initialize.bind(this)();
-    this.name           = name;
-    
-    if(typeof test == 'string') {
-      test = test.gsub(/(\.should[^\(]+\()/,'#{0}this,');
-      test = test.gsub(/(\.should[^\(]+)\(this,\)/,'#{1}(this)');
-      this.test = function() {
-        eval('with(this){'+test+'}');
-      }
-    } else {
-      this.test = test || function() {};
-    }
-    
-    this.setup          = setup || function() {};
-    this.teardown       = teardown || function() {};
-    this.isWaiting      = false;
-    this.timeToWait     = 1000;
-  },
-  wait: function(time, nextPart) {
-    this.isWaiting = true;
-    this.test = nextPart;
-    this.timeToWait = time;
-  },
-  run: function() {
-    try {
-      try {
-        if (!this.isWaiting) this.setup.bind(this)();
-        this.isWaiting = false;
-        this.test.bind(this)();
-      } finally {
-        if(!this.isWaiting) {
-          this.teardown.bind(this)();
-        }
-      }
-    }
-    catch(e) { this.error(e); }
-  }
-});
-
-// *EXPERIMENTAL* BDD-style testing to please non-technical folk
-// This draws many ideas from RSpec http://rspec.rubyforge.org/
-
-Test.setupBDDExtensionMethods = function(){
-  var METHODMAP = {
-    shouldEqual:     'assertEqual',
-    shouldNotEqual:  'assertNotEqual',
-    shouldEqualEnum: 'assertEnumEqual',
-    shouldBeA:       'assertType',
-    shouldNotBeA:    'assertNotOfType',
-    shouldBeAn:      'assertType',
-    shouldNotBeAn:   'assertNotOfType',
-    shouldBeNull:    'assertNull',
-    shouldNotBeNull: 'assertNotNull',
-    
-    shouldBe:        'assertReturnsTrue',
-    shouldNotBe:     'assertReturnsFalse',
-    shouldRespondTo: 'assertRespondsTo'
-  };
-  var makeAssertion = function(assertion, args, object) { 
-   	this[assertion].apply(this,(args || []).concat([object]));
-  };
-  
-  Test.BDDMethods = {};   
-  $H(METHODMAP).each(function(pair) { 
-    Test.BDDMethods[pair.key] = function() { 
-       var args = $A(arguments); 
-       var scope = args.shift(); 
-       makeAssertion.apply(scope, [pair.value, args, this]); }; 
-  });
-  
-  [Array.prototype, String.prototype, Number.prototype, Boolean.prototype].each(
-    function(p){ Object.extend(p, Test.BDDMethods) }
-  );
-};
-
-Test.context = function(name, spec, log){
-  Test.setupBDDExtensionMethods();
-  
-  var compiledSpec = {};
-  var titles = {};
-  for(specName in spec) {
-    switch(specName){
-      case "setup":
-      case "teardown":
-        compiledSpec[specName] = spec[specName];
-        break;
-      default:
-        var testName = 'test'+specName.gsub(/\s+/,'-').camelize();
-        var body = spec[specName].toString().split('\n').slice(1);
-        if(/^\{/.test(body[0])) body = body.slice(1);
-        body.pop();
-        body = body.map(function(statement){ 
-          return statement.strip()
-        });
-        compiledSpec[testName] = body.join('\n');
-        titles[testName] = specName;
-    }
-  }
-  new Test.Unit.Runner(compiledSpec, { titles: titles, testLog: log || 'testlog', context: name });
-};
\ No newline at end of file

From 10c0ffec716301658146a93562b2918d0cf90644 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Tue, 22 Nov 2011 21:45:09 +0900
Subject: [PATCH 040/630] rewrite to use jQuery instead of prototype.js (fixes
 #2617)

---
 .../modules/default/config/view.yml           |  2 +-
 .../modules/default/templates/topSuccess.php  |  8 +--
 .../pc_backend/modules/design/config/view.yml | 10 ++--
 .../modules/design/templates/_plotGadget.php  | 13 +++--
 .../modules/design/templates/_plotHeader.php  | 33 ++++++-------
 .../design/templates/addGadgetSuccess.php     |  8 +--
 .../design/templates/editGadgetSuccess.php    | 14 +++---
 .../design/templates/gadgetSuccess.php        |  2 +-
 .../modules/member/config/view.yml            |  2 +-
 .../modules/member/templates/homeSuccess.php  | 49 ++++++++++---------
 config/OpenPNE.yml.sample                     |  8 +++
 lib/helper/JavascriptHelper.php               | 21 ++++++++
 lib/helper/opJavascriptHelper.php             |  8 +--
 web/js/util.js                                |  8 +--
 web/js/util.js.src                            | 16 +++---
 15 files changed, 114 insertions(+), 88 deletions(-)
 create mode 100644 lib/helper/JavascriptHelper.php

diff --git a/apps/pc_backend/modules/default/config/view.yml b/apps/pc_backend/modules/default/config/view.yml
index 8beb8a03b..77ecb5619 100644
--- a/apps/pc_backend/modules/default/config/view.yml
+++ b/apps/pc_backend/modules/default/config/view.yml
@@ -1,5 +1,5 @@
 topSuccess:
-  javascripts: [%SF_PROTOTYPE_WEB_DIR%/js/prototype]
+  javascripts: [%OP_JQUERY_URL%]
 
 templateHelpSuccess:
   layout: plain
diff --git a/apps/pc_backend/modules/default/templates/topSuccess.php b/apps/pc_backend/modules/default/templates/topSuccess.php
index cbfcf2688..8424dcca5 100644
--- a/apps/pc_backend/modules/default/templates/topSuccess.php
+++ b/apps/pc_backend/modules/default/templates/topSuccess.php
@@ -4,8 +4,8 @@ function getVersion(obj)
 {
   if (obj)
   {
-    var info = document.getElementById("versionInformation");
-    new Insertion.Top(info, "<p class=\""+obj.level+"\">"+obj.message+"</p>");
+    var info = $("#versionInformation");
+    info.before("<p class=\""+obj.level+"\">"+obj.message+"</p>");
     info.show();
   }
 }
@@ -14,8 +14,8 @@ function getDashboard(str)
 {
   if (str)
   {
-    var dashboard = document.getElementById("dashboard");
-    new Insertion.Top(dashboard, str);
+    var dashboard = $("#dashboard");
+    dashboard.before(str);
     dashboard.show();
   }
 }
diff --git a/apps/pc_backend/modules/design/config/view.yml b/apps/pc_backend/modules/design/config/view.yml
index a2a16e49f..b95b21e42 100644
--- a/apps/pc_backend/modules/design/config/view.yml
+++ b/apps/pc_backend/modules/design/config/view.yml
@@ -1,20 +1,18 @@
 gadgetSuccess:
   javascripts:
-    - %SF_PROTOTYPE_WEB_DIR%/js/prototype
-    - %SF_PROTOTYPE_WEB_DIR%/js/builder
-    - %SF_PROTOTYPE_WEB_DIR%/js/effects
+    - %OP_JQUERY_URL%
 
 gadgetPlotSuccess:
   layout: plain
   stylesheets: [-backend, gadgetPlot]
-  javascripts: [%SF_PROTOTYPE_WEB_DIR%/js/prototype]
+  javascripts: [%OP_JQUERY_URL%, %OP_JQUERYUI_URL%]
 
 addGadgetSuccess:
   layout: plain
   stylesheets: [-backend]
-  javascripts: [%SF_PROTOTYPE_WEB_DIR%/js/prototype]
+  javascripts: [%OP_JQUERY_URL%]
 
 editGadgetSuccess:
   layout: plain
   stylesheets: [-backend]
-  javascripts: [%SF_PROTOTYPE_WEB_DIR%/js/prototype]
+  javascripts: [%OP_JQUERY_URL%]
diff --git a/apps/pc_backend/modules/design/templates/_plotGadget.php b/apps/pc_backend/modules/design/templates/_plotGadget.php
index e8883d598..e8ebb3a3d 100644
--- a/apps/pc_backend/modules/design/templates/_plotGadget.php
+++ b/apps/pc_backend/modules/design/templates/_plotGadget.php
@@ -12,8 +12,11 @@
 <?php echo link_to_function(__('ガジェットを追加'), 'showModalOnParent(\''.url_for('design/addGadget?type='.$type).'\')') ?>
 </div>
 </div>
-<?php echo sortable_element('plot'.ucfirst($type), array(
-  'only' => 'sortable',
-  'tag'  => 'div',
-  'onUpdate' => 'function(s){insertHiddenTags(\''.$type.'\', Sortable.sequence(s, s.id))}',
-)) ?>
+<?php echo javascript_tag('
+$("#plot'.ucfirst($type).'").sortable({
+  items: "> div",
+  update: function(event,ui){
+    insertHiddenTags("'.$type.'", ui.item.parent().sortable("toArray"));
+  }
+});
+') ?>
diff --git a/apps/pc_backend/modules/design/templates/_plotHeader.php b/apps/pc_backend/modules/design/templates/_plotHeader.php
index b2ac84a6e..03ccf5032 100644
--- a/apps/pc_backend/modules/design/templates/_plotHeader.php
+++ b/apps/pc_backend/modules/design/templates/_plotHeader.php
@@ -3,28 +3,25 @@
 <?php echo javascript_tag("
 function showModalOnParent(url)
 {
-  var modal = parent.document.getElementById('modal');
-  var modalContents = parent.document.getElementById('modal_contents');
-  var modalIframe = modalContents.getElementsByTagName('iframe')[0];
+  var modal = $('#modal', parent.document);
+  var modalContents = $('#modal_contents', parent.document);
+  var modalIframe = $('iframe', modalContents)[0];
   modalIframe.src = url;
-  modalContents.setStyle(parent.getCenterMuchScreen(modalContents));
+  modalContents.css(parent.getCenterMuchScreen(modalContents));
 
-  modal.style.height   = (parent.document.documentElement.scrollHeight || parent.document.body.scrollHeight) + 'px';
-  modal.style.width    = (parent.document.documentElement.scrollWidth  || parent.document.body.scrollWidth)  + 'px';
-  modal.style.position = 'absolute';
+  modal.height(parent.document.documentElement.scrollHeight || parent.document.body.scrollHeight);
+  modal.width(parent.document.documentElement.scrollWidth || parent.document.body.scrollWidth);
+  modal.css('position', 'absolute');
 
-  new Effect.Appear(modal, {from:0, to:0.7, duration: 0.5, fps: 100});
-  new Effect.Appear(modalContents, {from:0, to:1.0, duration: 0.6});
+  modal.fadeTo(500, 0.7);
+  modalContents.fadeIn(600);
 }
 
 function insertHiddenTags(type, ids)
 {
   var form = parent.document.getElementById('gadgetForm');
-  var hiddens = Element.select(form, '.' + type + 'Gadget');
-  for (var i = 0; i < hiddens.length; i++)
-  {
-    Element.remove(hiddens[i]);
-  }
+
+  $('.' + type + 'Gadget', form).remove();
 
   for (var i = 0; i < ids.length; i++)
   {
@@ -38,24 +35,24 @@ function insertHiddenTags(type, ids)
     obj.setAttribute('type', 'hidden');
     obj.setAttribute('name', 'gadget[' + type + '][' + i + ']');
     obj.setAttribute('value', ids[i]);
-    new Insertion.Bottom(form, obj);
+    $(obj).appendTo(form);
   }
 }
 
 function dropNewGadget(type, name, obj)
 {
   var form      = parent.document.getElementById('gadgetForm');
-  var elements  = form.elements;
+  var elements  = $(form.elements);
   var inputName = 'new[' + type + '][]';
   for (var i = 0; i < elements.length; i++)
   {
     if (elements[i].type == 'hidden' && elements[i].name == inputName && elements[i].value == name)
     {
-      Element.remove(elements[i]);
+      $(elements[i]).remove();
       break;
     }
   }
-  Element.remove(obj);
+  $(obj).remove();
 
   parent.adjustByIframeContens(this.frameElement);
 }
diff --git a/apps/pc_backend/modules/design/templates/addGadgetSuccess.php b/apps/pc_backend/modules/design/templates/addGadgetSuccess.php
index e791dda14..aaf68982c 100644
--- a/apps/pc_backend/modules/design/templates/addGadgetSuccess.php
+++ b/apps/pc_backend/modules/design/templates/addGadgetSuccess.php
@@ -28,19 +28,19 @@ function insertGadget(type, id, caption)
   var parentIframe = parent.document.getElementsByTagName('iframe')[0];
 
   var typeId = 'plot' + type.charAt(0).toUpperCase() + type.substr(1, type.length - 1);
-  var target = parentIframe.contentWindow.document.getElementById(typeId).getElementsByClassName('emptyGadget')[0];
+  var target = $('#' + typeId + ' .emptyGadget', parentIframe.contentWindow.document);
   var contents = parentIframe.contentWindow.document.createElement('div');
   contents.setAttribute('class', 'gadget');
   contents.innerHTML = caption+'(<a href=\'#\' onclick=\'dropNewGadget(\"'+type+'\", \"'+id+'\", this.parentNode); return false;\'>".__('削除')."</a>)';
-  new Insertion.Before(target, contents);
+  $(contents).insertBefore(target);
 
-  var form = parent.document.getElementById('gadgetForm');
+  var form = $('#gadgetForm', parent.document);
   var hidden = parent.document.createElement('input');
   hidden.setAttribute('class', type + 'New');
   hidden.setAttribute('type', 'hidden');
   hidden.setAttribute('name', 'new[' + type + '][]');
   hidden.setAttribute('value', id);
-  new Insertion.Bottom(form, hidden);
+  $(hidden).appendTo(form);
 
   parentIframe.contentWindow.parent.adjustByIframeContens(parentIframe);
 }
diff --git a/apps/pc_backend/modules/design/templates/editGadgetSuccess.php b/apps/pc_backend/modules/design/templates/editGadgetSuccess.php
index d3138cdd7..9ed61b949 100644
--- a/apps/pc_backend/modules/design/templates/editGadgetSuccess.php
+++ b/apps/pc_backend/modules/design/templates/editGadgetSuccess.php
@@ -28,18 +28,16 @@ function deleteGadget(type, id)
   var parentIframe = parent.document.getElementsByTagName('iframe')[0];
 
   var typeId = 'plot' + type.charAt(0).toUpperCase() + type.substr(1, type.length - 1);
-  Element.remove(parentIframe.contentWindow.document.getElementById(typeId + '_gadget_' + id));
+  $('#' + typeId + '_gadget_' + id, parentIframe.contentWindow.document).remove();
 
   var form = parent.document.getElementById('gadgetForm');
-  var hiddens = Element.select(form, '.' + type + 'Gadget');
-  for (var i = 0; i < hiddens.length; i++)
-  {
-    if (hiddens[i].value == id)
+  $('.' + type + 'Gadget', form).each(function(){
+    if (this.value == id)
     {
-      Element.remove(hiddens[i]);
-      break;
+      $(this).remove();
+      return false;
     }
-  }
+  });
 
   parentIframe.contentWindow.parent.adjustByIframeContens(parentIframe);
   parent.document.getElementById('modal').onclick();
diff --git a/apps/pc_backend/modules/design/templates/gadgetSuccess.php b/apps/pc_backend/modules/design/templates/gadgetSuccess.php
index 8b1f3ae2f..3b45d6422 100644
--- a/apps/pc_backend/modules/design/templates/gadgetSuccess.php
+++ b/apps/pc_backend/modules/design/templates/gadgetSuccess.php
@@ -33,7 +33,7 @@
 <?php echo javascript_tag("
 function adjustByIframeContens(obj)
 {
-  var size = Element.getHeight(obj.contentWindow.document.body);
+  var size = obj.contentWindow.document.body.scrollHeight;
   obj.style.height = size+'px';
 }
 ");
diff --git a/apps/pc_frontend/modules/member/config/view.yml b/apps/pc_frontend/modules/member/config/view.yml
index 324e4ffa1..9fa69c8f4 100644
--- a/apps/pc_frontend/modules/member/config/view.yml
+++ b/apps/pc_frontend/modules/member/config/view.yml
@@ -1,5 +1,5 @@
 homeSuccess:
-  javascripts: [%SF_PROTOTYPE_WEB_DIR%/js/prototype, util]
+  javascripts: [%OP_JQUERY_URL%, %OP_JQUERYUI_URL%, util]
   layout: layoutA
   customize:
     cautionAboutFriendPre:
diff --git a/apps/pc_frontend/modules/member/templates/homeSuccess.php b/apps/pc_frontend/modules/member/templates/homeSuccess.php
index 08b121635..eaf96df42 100644
--- a/apps/pc_frontend/modules/member/templates/homeSuccess.php
+++ b/apps/pc_frontend/modules/member/templates/homeSuccess.php
@@ -8,7 +8,7 @@
 <?php endif; ?>
 <?php endforeach; ?>
 <?php end_slot() ?>
-<?php echo sortable_element('Top', array('tag' => 'div', 'handle' => 'partsHeading', 'onChange' => 'function(obj){storeSort(obj)}')) ?>
+<?php echo javascript_tag('$("#Top").sortable({ axis: "y", items: "> div", handle: "div.partsHeading", update: function(event,ui){storeSort(event, ui)} });') ?>
 <?php endif; ?>
 
 <?php if (isset($sideMenuGadgets)): ?>
@@ -19,7 +19,7 @@
 <?php endif; ?>
 <?php endforeach; ?>
 <?php end_slot() ?>
-<?php echo sortable_element('Left', array('tag' => 'div', 'handle' => 'partsHeading', 'onChange' => 'function(obj){storeSort(obj)}')) ?>
+<?php echo javascript_tag('$("#Left").sortable({ axis: "y", items: "> div", handle: "div.partsHeading", update: function(event,ui){storeSort(event, ui)} });') ?>
 <?php endif; ?>
 
 <?php if (isset($contentsGadgets)): ?>
@@ -28,7 +28,7 @@
 <?php include_component($gadget->getComponentModule(), $gadget->getComponentAction(), array('gadget' => $gadget)); ?>
 <?php endif; ?>
 <?php endforeach; ?>
-<?php echo sortable_element('Center', array('tag' => 'div', 'handle' => 'partsHeading', 'onChange' => 'function(obj){storeSort(obj)}')) ?>
+<?php echo javascript_tag('$("#Center").sortable({ axis: "y", items: "> div", handle: "div.partsHeading", update: function(event,ui){storeSort(event, ui)} });') ?>
 <?php endif; ?>
 
 <?php if (isset($bottomGadgets)): ?>
@@ -39,33 +39,34 @@
 <?php endif; ?>
 <?php endforeach; ?>
 <?php end_slot() ?>
-<?php echo sortable_element('Bottom', array('tag' => 'div', 'handle' => 'partsHeading')) ?>
+<?php echo javascript_tag('$("#Bottom").sortable({ item: "> div.partsHeading" });') ?>
 <?php endif; ?>
 
 <?php echo javascript_tag('
-function storeSort(obj)
+function storeSort(event, ui)
 {
   var result = "";
-  Element.childElements(obj.parentNode).each(function(child, index){
-    if (child.id && child.id.match(/_[0-9]+$/)) {
+  ui.item.parent().children().each(function(index){
+    if (this.id && this.id.match(/_[0-9]+$/)) {
       if (result) {
         result = result + ",";
       }
-      result = result + child.id;
+      result = result + this.id;
     }
   });
   var path = "'.($sf_request->getRelativeUrlRoot() ? $sf_request->getRelativeUrlRoot() : '/').'";
   var expires = new Date();
   expires.setTime((new Date()).getTime() + (10 * 12 * 30 * 24 * 60 * 60 * 1000));
-  var pos = obj.parentNode.id;
+  var pos = ui.item.parent().attr("id");
 
   opCookie.set("HomeGadget_" + pos + "_sort", result, expires, path);
 }
 
 function foldObj(obj, display)
 {
-  Element.childElements(obj.parentNode).each(function(child, index){
-    if (!child.hasClassName("partsHeading")) {
+  obj.parent().children().each(function(index){
+    var child = $(this);
+    if (!child.hasClass("partsHeading")) {
       if (display == null) {
         child.toggle();
       } else {
@@ -76,24 +77,25 @@ function foldObj(obj, display)
         }
       }
 
-      var size = Element.childElements(obj.parentNode).length;
+      var size = obj.parent().children().length;
       if (size == index + 1) {  // It is a last loop maybe
         var path = "'.($sf_request->getRelativeUrlRoot() ? $sf_request->getRelativeUrlRoot() : '/').'";
-        var id = child.parentNode.parentNode.id;
+        var id = child.parent().parent().attr("id");
         var expires = new Date();
         expires.setTime((new Date()).getTime() + (10 * 12 * 30 * 24 * 60 * 60 * 1000));
-        opCookie.set("HomeGadget_" + id + "_toggle", child.visible(), expires, path);
+        opCookie.set("HomeGadget_" + id + "_toggle", !child.is(":hidden"), expires, path);
       }
     }
   });
 }
 
-$$(".partsHeading").each(function(obj){
+$(".partsHeading").each(function(){
+  var obj = $(this);
   // folding
-  Event.observe(obj, "dblclick", function(e){
+  obj.dblclick(function(){
     foldObj(obj);
   });
-  var id = obj.parentNode.parentNode.id;
+  var id = obj.parent().parent().attr("id");
   var display = opCookie.get("HomeGadget_"+id+"_toggle");
   if (display != null) {
     foldObj(obj, display);
@@ -101,15 +103,14 @@ function foldObj(obj, display)
 
 });
 
-["Top", "Left", "Center"].each(function(type){
-  var sortInfo = opCookie.get("HomeGadget_" + type + "_sort");
+$.each(["Top", "Left", "Center"], function(){
+  var sortInfo = opCookie.get("HomeGadget_" + this + "_sort");
   if (sortInfo)
   {
-    var obj = document.getElementById(type);
-    sortInfo.split(",").each(function(value){
-      var gadget = document.getElementById(value);
-      Element.remove(gadget);
-      obj.appendChild(gadget);
+    var obj = $("#"+this);
+    $.each(sortInfo.split(","), function(){
+      var gadget = $("#"+this);
+      gadget.detach().appendTo(obj);
     });
   }
 });
diff --git a/config/OpenPNE.yml.sample b/config/OpenPNE.yml.sample
index 1086a404c..ae6e93d87 100644
--- a/config/OpenPNE.yml.sample
+++ b/config/OpenPNE.yml.sample
@@ -218,6 +218,14 @@ supported_languages: ['en', 'ja_JP']
 # プラグインリストのベース URL
 # plugin_list_base_url: "http://plugins.openpne.jp/packages/"
 
+####################################
+# Ajax設定
+####################################
+
+# ロードする jQuery の URL
+jquery_url: "https://ajax.googleapis.com/ajax/libs/jquery/1.7.0/jquery.min.js"
+jqueryui_url: "https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js"
+
 ###########################################
 # モバイル自動リンク設定 (Mobile Auto link)
 ###########################################
diff --git a/lib/helper/JavascriptHelper.php b/lib/helper/JavascriptHelper.php
new file mode 100644
index 000000000..185178e63
--- /dev/null
+++ b/lib/helper/JavascriptHelper.php
@@ -0,0 +1,21 @@
+<?php
+
+require_once sfConfig::get('sf_symfony_lib_dir').'/helper/JavascriptBaseHelper.php';
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * JavascriptHelper.
+ *
+ * @package    symfony
+ * @subpackage helper
+ * @author     Kimura Youichi <kim.upsilon@bucyou.net>
+ */
+
+
diff --git a/lib/helper/opJavascriptHelper.php b/lib/helper/opJavascriptHelper.php
index 9d5efb55e..a9272877f 100644
--- a/lib/helper/opJavascriptHelper.php
+++ b/lib/helper/opJavascriptHelper.php
@@ -16,7 +16,7 @@
  * @author     Kousuke Ebihara <ebihara@tejimaya.com>
  */
 
-require_once sfConfig::get('sf_plugins_dir').'/sfProtoculousPlugin/lib/helper/JavascriptHelper.php';
+require_once sfConfig::get('sf_lib_dir').'/helper/JavascriptHelper.php';
 
 /**
  * Makes contents to be a modal box.
@@ -25,15 +25,15 @@
  */
 function make_modal_box($id, $contents)
 {
-  sfContext::getInstance()->getResponse()->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/prototype');
+  sfContext::getInstance()->getResponse()->addJavascript(sfConfig::get('op_jquery_url'));
   sfContext::getInstance()->getResponse()->addJavascript('util');
-  $div = '<div id="'.$id.'" class="modalWall" style="display:none" onclick="this.style.display=\'none\'; $(\''.$id.'_contents\').style.display=\'none\'"></div>'
+  $div = '<div id="'.$id.'" class="modalWall" style="display:none" onclick="$(this).hide(); $(\'#'.$id.'_contents\').hide()"></div>'
        . '<div id="'.$id.'_contents" class="modalBox" style="display: none;">'
        . $contents
        . '</div>'
        . '<script type="text/javascript">'
        . 'var contents = $("'.$id.'_contents");'
-       . 'contents.setStyle(getCenterMuchScreen(contents))'
+       . 'contents.css(getCenterMuchScreen(contents))'
        . '</script>';
 
   return $div;
diff --git a/web/js/util.js b/web/js/util.js
index 965b1b7a3..2bd5c3870 100644
--- a/web/js/util.js
+++ b/web/js/util.js
@@ -1,6 +1,6 @@
 
 function getCenterMuchScreen(element)
-{var width=$(element).getWidth();var height=$(element).getHeight();var screenWidth=document.viewport.getWidth();var screenHeight=document.documentElement.clientHeight;var screenTop=document.viewport.getScrollOffsets().top;var left=(screenWidth/2)-(width/2);var top=(screenHeight/2+screenTop)-(height/2);if(top<10)
+{var width=$(element).width();var height=$(element).height();var screenWidth=$(window).width();var screenHeight=$(window).height();var screenTop=$(window).scrollTop();var left=(screenWidth/2)-(width/2);var top=(screenHeight/2+screenTop)-(height/2);if(top<10)
 {top=10;}
 return{"left":left+"px","top":top+"px"};}
 var opCookie={set:function(name,value,expires,path,domain,secure,httponly)
@@ -21,12 +21,12 @@ if(httponly)
 document.cookie=result;},get:function(name)
 {var value=null;if(document.cookie&&document.cookie.length)
 {var _cookie=document.cookie;var cookies=_cookie.split(';');for(var i=0;i<cookies.length;i++)
-{var _cookie=cookies[i].strip();if(_cookie.startsWith(name+'='))
-{value=decodeURIComponent(_cookie.substr(name.length+1)).strip();break;}}}
+{var _cookie=$.trim(cookies[i]);if(_cookie.indexOf(name+'=')==0)
+{value=$.trim(decodeURIComponent(_cookie.substr(name.length+1)));break;}}}
 return value;}};function pne_url2a(url)
 {var urlstr;if(url.length>57)
 {var _url=url.replace("&amp;","&");if(_url.length>57)
 {_url=_url.substr(0,57)+'...';urlstr=_url.replace("&","&amp;");}}
 if(!urlstr)
 {urlstr=url;}
-document.write('<a href="'+url+'" target="_blank">'+urlstr+'</a>');}
\ No newline at end of file
+document.write('<a href="'+url+'" target="_blank">'+urlstr+'</a>');}
diff --git a/web/js/util.js.src b/web/js/util.js.src
index 4d1343408..763b58189 100644
--- a/web/js/util.js.src
+++ b/web/js/util.js.src
@@ -15,11 +15,11 @@
 
 function getCenterMuchScreen(element)
 {
-  var width  = $(element).getWidth();
-  var height = $(element).getHeight();
-  var screenWidth = document.viewport.getWidth();
-  var screenHeight = document.documentElement.clientHeight;
-  var screenTop = document.viewport.getScrollOffsets().top;
+  var width  = $(element).width();
+  var height = $(element).height();
+  var screenWidth = $(window).width();
+  var screenHeight = $(window).height();
+  var screenTop = $(window).scrollTop();
 
   var left = (screenWidth / 2) - (width / 2);
   var top = (screenHeight / 2 + screenTop) - (height / 2);
@@ -109,10 +109,10 @@ var opCookie = {
       var cookies = _cookie.split(';');
       for (var i = 0; i < cookies.length; i++)
       {
-        var _cookie = cookies[i].strip();
-        if (_cookie.startsWith(name + '='))
+        var _cookie = $.trim(cookies[i]);
+        if (_cookie.indexOf(name + '=') == 0)
         {
-          value = decodeURIComponent(_cookie.substr(name.length + 1)).strip();
+          value = $.trim(decodeURIComponent(_cookie.substr(name.length + 1)));
           break;
         }
       }

From 5337346d6b4e33b16f273ca924b766c523b0e8c1 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 19 Jan 2012 20:27:00 +0900
Subject: [PATCH 041/630] rewrite to use jQuery instead of prototype.js (fixes
 #2617)

---
 .../modules/community/config/view.yml         |  4 ++
 .../community/templates/_categoryListForm.php | 27 ++++++----
 .../modules/navigation/config/view.yml        |  4 ++
 .../navigation/templates/listSuccess.php      | 27 ++++++----
 .../modules/profile/config/view.yml           |  3 ++
 .../modules/profile/templates/listSuccess.php | 54 +++++++++++++------
 apps/pc_backend/modules/sns/config/view.yml   |  4 ++
 .../sns/templates/richTextareaSuccess.php     | 28 ++++++----
 8 files changed, 106 insertions(+), 45 deletions(-)
 create mode 100644 apps/pc_backend/modules/community/config/view.yml
 create mode 100644 apps/pc_backend/modules/navigation/config/view.yml
 create mode 100644 apps/pc_backend/modules/sns/config/view.yml

diff --git a/apps/pc_backend/modules/community/config/view.yml b/apps/pc_backend/modules/community/config/view.yml
new file mode 100644
index 000000000..359810d89
--- /dev/null
+++ b/apps/pc_backend/modules/community/config/view.yml
@@ -0,0 +1,4 @@
+categoryListSuccess:
+  javascripts:
+    - %OP_JQUERY_URL%
+    - %OP_JQUERYUI_URL%
diff --git a/apps/pc_backend/modules/community/templates/_categoryListForm.php b/apps/pc_backend/modules/community/templates/_categoryListForm.php
index 12fcc5463..348bf9ac1 100644
--- a/apps/pc_backend/modules/community/templates/_categoryListForm.php
+++ b/apps/pc_backend/modules/community/templates/_categoryListForm.php
@@ -8,9 +8,9 @@
 </tr>
 
 <?php if ($categories): ?>
+<tbody>
 <?php foreach ($categories as $category): ?>
-<tbody id="type_<?php echo $type ?>_<?php echo $category->getId() ?>" class="sortable" style="position: relative;">
-<tr>
+<tr id="type_<?php echo $type ?>_<?php echo $category->getId() ?>" class="sortable" style="position: relative;">
 <form action="<?php echo url_for('community/categoryEdit?id='.$category->getId()) ?>" method="post">
 <?php echo $category->getForm()->renderGlobalErrors() ?>
 <?php foreach ($category->getForm() as $key => $row) : ?>
@@ -35,8 +35,8 @@
 </form>
 </td>
 </tr>
-</tbody>
 <?php endforeach; ?>
+</tbody>
 <?php endif; ?>
 
 <form action="<?php echo url_for('community/categoryList') ?>" method="post">
@@ -62,9 +62,18 @@
 </table>
 
 <?php $form = new BaseForm() ?>
-<?php echo sortable_element('type_'.$type, array(
-  'tag'  => 'tbody',
-  'only' => 'sortable',
-  'url'  => 'community/categorySort',
-  'with' => 'Sortable.serialize("type_'.$type.'")+"&'.urlencode($form->getCSRFFieldName()).'='.urlencode($form->getCSRFToken()).'"',
-)) ?>
+<?php echo javascript_tag('
+$("#type_'.$type.' tbody").sortable({
+  items: "> .sortable",
+  update: function (event, ui) {
+    var postData = $(this).sortable("serialize", { expression: /(type_'.$type.')_(.+)/ });
+    postData += "&'.urlencode($form->getCSRFFieldName()).'='.urlencode($form->getCSRFToken()).'";
+
+    $.ajax({
+      url: "'.url_for('community/categorySort').'",
+      type: "POST",
+      data: postData
+    });
+  }
+});
+'); ?>
diff --git a/apps/pc_backend/modules/navigation/config/view.yml b/apps/pc_backend/modules/navigation/config/view.yml
new file mode 100644
index 000000000..d3c9e2cf4
--- /dev/null
+++ b/apps/pc_backend/modules/navigation/config/view.yml
@@ -0,0 +1,4 @@
+listSuccess:
+  javascripts:
+    - %OP_JQUERY_URL%
+    - %OP_JQUERYUI_URL%
diff --git a/apps/pc_backend/modules/navigation/templates/listSuccess.php b/apps/pc_backend/modules/navigation/templates/listSuccess.php
index 780d186c9..4e6d40d8e 100644
--- a/apps/pc_backend/modules/navigation/templates/listSuccess.php
+++ b/apps/pc_backend/modules/navigation/templates/listSuccess.php
@@ -18,9 +18,9 @@
 <?php endforeach; ?>
 <th colspan="2"><?php echo __('Operation') ?></th>
 </tr>
+<tbody>
 <?php foreach ($nav as $form) : ?>
-<tbody id="type_<?php echo str_replace(' ', '_', $type) ?>_<?php echo $form->getObject()->getId() ?>"<?php if (!$form->isNew()) : ?> class="sortable"<?php endif; ?>>
-<tr>
+<tr id="type_<?php echo str_replace(' ', '_', $type) ?>_<?php echo $form->getObject()->getId() ?>"<?php if (!$form->isNew()) : ?> class="sortable"<?php endif; ?>>
 <form action="<?php echo url_for('navigation/edit?app='.$sf_request->getParameter('app', 'pc')) ?>" method="post">
 <td>
 <?php echo $form->renderHiddenFields() ?>
@@ -47,15 +47,24 @@
 </td>
 <?php endif; ?>
 </tr>
-</tbody>
 <?php endforeach; ?>
+</tbody>
 </table>
 
-<?php echo sortable_element('type_'.str_replace(' ', '_', $type), array(
-  'tag'  => 'tbody',
-  'only' => 'sortable',
-  'url'  => 'navigation/sort',
-  'with' => 'Sortable.serialize("type_'.str_replace(' ', '_', $type).'")+"&'.urlencode($sortForm->getCSRFFieldName()).'='.urlencode($sortForm->getCSRFToken()).'"',
-)) ?>
+<?php echo javascript_tag('
+$("#type_'.str_replace(' ', '_', $type).' tbody").sortable({
+  items: "> .sortable",
+  update: function (event, ui) {
+    var postData = $(this).sortable("serialize", { expression: /(type_'.str_replace(' ', '_', $type).')_(.+)/ });
+    postData += "&'.urlencode($sortForm->getCSRFFieldName()).'='.urlencode($sortForm->getCSRFToken()).'";
+
+    $.ajax({
+      url: "'.url_for('navigation/sort').'",
+      type: "POST",
+      data: postData
+    });
+  }
+});
+') ?>
 
 <?php endforeach; ?>
diff --git a/apps/pc_backend/modules/profile/config/view.yml b/apps/pc_backend/modules/profile/config/view.yml
index 306c4135a..2f3c7b59a 100644
--- a/apps/pc_backend/modules/profile/config/view.yml
+++ b/apps/pc_backend/modules/profile/config/view.yml
@@ -1,2 +1,5 @@
 editSuccess:
   javascripts: [%SF_PROTOTYPE_WEB_DIR%/js/prototype]
+
+listSuccess:
+  javascripts: [%OP_JQUERY_URL%, %OP_JQUERYUI_URL%]
diff --git a/apps/pc_backend/modules/profile/templates/listSuccess.php b/apps/pc_backend/modules/profile/templates/listSuccess.php
index b637f7f9a..7e6c76b5c 100644
--- a/apps/pc_backend/modules/profile/templates/listSuccess.php
+++ b/apps/pc_backend/modules/profile/templates/listSuccess.php
@@ -19,9 +19,9 @@
 <th><?php echo __('Change')?></th>
 <th><?php echo __('Search')?></th>
 </tr></thead>
+<tbody>
 <?php foreach ($profiles as $value): ?>
-<tbody id="profile_<?php echo $value->getId() ?>" class="sortable">
-<tr>
+<tr id="profile_<?php echo $value->getId() ?>" class="sortable">
 <td><?php echo link_to(__('Edit'), 'profile/edit?id=' . $value->getId()) ?></td>
 <td><?php echo link_to(__('Delete'), 'profile/delete?id=' . $value->getId()) ?></td>
 <td><?php echo $value->getId() ?></td>
@@ -48,14 +48,24 @@
 <td><?php echo ($value->getIsDispConfig() ? '○' :'×') ?></td>
 <td><?php echo ($value->getIsDispSearch() ? '○' : '') ?></td>
 </tr>
-</tbody>
 <?php endforeach; ?>
+</tbody>
 </table>
-<?php echo sortable_element('profiles',array(
-  'tag'  => 'tbody',
-  'url'  => 'profile/sortProfile',
-  'with' => 'Sortable.serialize("profiles")+"&'.urlencode($tokenForm->getCSRFFieldName()).'='.urlencode($tokenForm->getCSRFToken()).'"'
-)) ?>
+<?php echo javascript_tag('
+$("#profiles tbody").sortable({
+  items: "> .sortable",
+  update: function (event, ui) {
+    var postData = $(this).sortable("serialize", { expression: /(profile)_(.+)/ });
+    postData += "&'.urlencode($tokenForm->getCSRFFieldName()).'='.urlencode($tokenForm->getCSRFToken()).'";
+
+    $.ajax({
+      url: "'.url_for('profile/sortProfile').'",
+      type: "POST",
+      data: postData
+    });
+  }
+});
+') ?>
 
 <h3><?php echo __('Option list')?></h3>
 <?php $selectionCount = 0; ?>
@@ -72,11 +82,12 @@
 <?php endforeach; ?>
 <th colspan="2"><?php echo __('Operation')?></th>
 </tr></thead>
+<tbody>
 <?php foreach ($option_form[$value->getId()] as $form) : ?>
 <?php if (!$form->getObject()->isNew()) : ?>
-<tbody id="profile_option_<?php echo $form->getObject()->getId() ?>" class="sortable">
+<tr id="profile_option_<?php echo $form->getObject()->getId() ?>" class="sortable">
 <?php else: ?>
-<tbody>
+<tr>
 <?php endif; ?>
 <tr>
 <form action="<?php echo url_for('profile/editOption?id='.$form->getObject()->getId()) ?>" method="post">
@@ -109,15 +120,24 @@
 </form>
 <?php endif; ?>
 </tr>
-</tbody>
 <?php endforeach; ?>
+</tbody>
 </table>
-<?php echo sortable_element('profile_options_'.$value->getId(),array(
-  'tag'  => 'tbody',
-  'only' => 'sortable',
-  'url'  => 'profile/sortProfileOption',
-  'with' => 'Sortable.serialize("profile_options_'.$value->getId().'")+"&'.urlencode($tokenForm->getCSRFFieldName()).'='.urlencode($tokenForm->getCSRFToken()).'"'
-)) ?>
+<?php echo javascript_tag('
+$("#profile_options_'.$value->getId().' tbody").sortable({
+  items: "> .sortable",
+  update: function (event, ui) {
+    var postData = $(this).sortable("serialize", { expression: /(profile_options_'.$value->getId().')_(.+)/ });
+    postData += "&'.urlencode($tokenForm->getCSRFFieldName()).'='.urlencode($tokenForm->getCSRFToken()).'";
+
+    $.ajax({
+      url: "'.url_for('profile/sortProfileOption').'",
+      type: "POST",
+      data: postData
+    });
+  }
+});
+') ?>
 <?php endif; ?>
 <?php endforeach; ?>
 <?php if (!$selectionCount): ?>
diff --git a/apps/pc_backend/modules/sns/config/view.yml b/apps/pc_backend/modules/sns/config/view.yml
new file mode 100644
index 000000000..0f6a354b9
--- /dev/null
+++ b/apps/pc_backend/modules/sns/config/view.yml
@@ -0,0 +1,4 @@
+richTextareaSuccess:
+  javascripts:
+    - %OP_JQUERY_URL%
+    - %OP_JQUERYUI_URL%
diff --git a/apps/pc_backend/modules/sns/templates/richTextareaSuccess.php b/apps/pc_backend/modules/sns/templates/richTextareaSuccess.php
index fcd91d2aa..c705055ea 100644
--- a/apps/pc_backend/modules/sns/templates/richTextareaSuccess.php
+++ b/apps/pc_backend/modules/sns/templates/richTextareaSuccess.php
@@ -17,27 +17,35 @@
 <th><?php echo __('Enabled') ?></th>
 </tr>
 </thead>
+<tbody>
 <?php foreach ($buttonConfigForm as $name => $button): ?>
 <?php if (!$button->isHidden()): ?>
-<tbody id="button_<?php echo $name ?>" class="sortable">
-<tr>
+<tr id="button_<?php echo $name ?>" class="sortable">
 <td><?php echo $name ?></td>
 <td><?php echo isset($buttonConfig[$name]['imageURL']) ? image_tag($buttonConfig[$name]['imageURL']) : '&nbsp;' ?></td>
 <td><?php echo isset($buttonConfig[$name]['caption']) ? __($buttonConfig[$name]['caption']) : '&nbsp;' ?></td>
 <td><?php echo $button ?></td>
 </tr>
-</tbody>
 <?php endif; ?>
 <?php endforeach; ?>
+</tbody>
 </table>
 <?php echo $buttonConfigForm->renderHiddenFields() ?>
 <input type="submit" value="<?php echo __('Edit') ?>" />
 </form>
 <?php use_helper('Javascript'); ?>
-<?php echo sortable_element('button', array(
-  'tag'  => 'tbody',
-  'only' => 'sortable',
-  'format' => '/^button_(.*)$/',
-  'url'  => 'sns/changeRichTextareaButtonOrder',
-  'with' => 'Sortable.serialize("button")+"&'.urlencode($sortForm->getCSRFFieldName()).'='.urlencode($sortForm->getCSRFToken()).'"',
-)) ?>
+<?php echo javascript_tag('
+$("#button tbody").sortable({
+  items: "> .sortable",
+  update: function (event, ui) {
+    var postData = $(this).sortable("serialize", { expression: /(button)_(.+)/ });
+    postData += "&'.urlencode($sortForm->getCSRFFieldName()).'='.urlencode($sortForm->getCSRFToken()).'";
+
+    $.ajax({
+      url: "'.url_for('sns/changeRichTextareaButtonOrder').'",
+      type: "POST",
+      data: postData
+    });
+  }
+});
+') ?>

From e5ecb058f8ff17cf47a157e502022f18af5514b1 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Fri, 20 Jan 2012 20:59:09 +0900
Subject: [PATCH 042/630] add sfProtoculousPlugin for compatibility (fixes
 #2617)

---
 plugins/sfProtoculousPlugin/LICENSE           |    7 +
 plugins/sfProtoculousPlugin/LICENSE.prototype |   16 +
 .../LICENSE.script.aculo.us                   |   20 +
 .../sfProtoculousPlugin/config/settings.yml   |    3 +
 .../lib/helper/JavascriptHelper.php           |  967 ++++
 .../web/css/input_auto_complete_tag.css       |   34 +
 plugins/sfProtoculousPlugin/web/js/builder.js |  136 +
 .../sfProtoculousPlugin/web/js/controls.js    |  965 ++++
 .../sfProtoculousPlugin/web/js/dragdrop.js    |  975 ++++
 plugins/sfProtoculousPlugin/web/js/effects.js | 1130 +++++
 plugins/sfProtoculousPlugin/web/js/index.html |    4 +
 .../sfProtoculousPlugin/web/js/prototype.js   | 4320 +++++++++++++++++
 .../web/js/scriptaculous.js                   |   60 +
 plugins/sfProtoculousPlugin/web/js/slider.js  |  275 ++
 plugins/sfProtoculousPlugin/web/js/sound.js   |   55 +
 .../sfProtoculousPlugin/web/js/unittest.js    |  568 +++
 16 files changed, 9535 insertions(+)
 create mode 100644 plugins/sfProtoculousPlugin/LICENSE
 create mode 100644 plugins/sfProtoculousPlugin/LICENSE.prototype
 create mode 100644 plugins/sfProtoculousPlugin/LICENSE.script.aculo.us
 create mode 100644 plugins/sfProtoculousPlugin/config/settings.yml
 create mode 100644 plugins/sfProtoculousPlugin/lib/helper/JavascriptHelper.php
 create mode 100644 plugins/sfProtoculousPlugin/web/css/input_auto_complete_tag.css
 create mode 100644 plugins/sfProtoculousPlugin/web/js/builder.js
 create mode 100644 plugins/sfProtoculousPlugin/web/js/controls.js
 create mode 100644 plugins/sfProtoculousPlugin/web/js/dragdrop.js
 create mode 100644 plugins/sfProtoculousPlugin/web/js/effects.js
 create mode 100644 plugins/sfProtoculousPlugin/web/js/index.html
 create mode 100644 plugins/sfProtoculousPlugin/web/js/prototype.js
 create mode 100644 plugins/sfProtoculousPlugin/web/js/scriptaculous.js
 create mode 100644 plugins/sfProtoculousPlugin/web/js/slider.js
 create mode 100644 plugins/sfProtoculousPlugin/web/js/sound.js
 create mode 100644 plugins/sfProtoculousPlugin/web/js/unittest.js

diff --git a/plugins/sfProtoculousPlugin/LICENSE b/plugins/sfProtoculousPlugin/LICENSE
new file mode 100644
index 000000000..28956ad5e
--- /dev/null
+++ b/plugins/sfProtoculousPlugin/LICENSE
@@ -0,0 +1,7 @@
+Copyright (c) 2004-2006 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/sfProtoculousPlugin/LICENSE.prototype b/plugins/sfProtoculousPlugin/LICENSE.prototype
new file mode 100644
index 000000000..61e491823
--- /dev/null
+++ b/plugins/sfProtoculousPlugin/LICENSE.prototype
@@ -0,0 +1,16 @@
+Copyright (c) 2005-2008 Sam Stephenson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/plugins/sfProtoculousPlugin/LICENSE.script.aculo.us b/plugins/sfProtoculousPlugin/LICENSE.script.aculo.us
new file mode 100644
index 000000000..b5e74b40b
--- /dev/null
+++ b/plugins/sfProtoculousPlugin/LICENSE.script.aculo.us
@@ -0,0 +1,20 @@
+Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/plugins/sfProtoculousPlugin/config/settings.yml b/plugins/sfProtoculousPlugin/config/settings.yml
new file mode 100644
index 000000000..4563d78f7
--- /dev/null
+++ b/plugins/sfProtoculousPlugin/config/settings.yml
@@ -0,0 +1,3 @@
+all:
+  .settings:
+    prototype_web_dir:      /sfProtoculousPlugin  #default 1.6.02 and 1.8 files. Can be changed to compressed files for production.
\ No newline at end of file
diff --git a/plugins/sfProtoculousPlugin/lib/helper/JavascriptHelper.php b/plugins/sfProtoculousPlugin/lib/helper/JavascriptHelper.php
new file mode 100644
index 000000000..6ee14204f
--- /dev/null
+++ b/plugins/sfProtoculousPlugin/lib/helper/JavascriptHelper.php
@@ -0,0 +1,967 @@
+<?php
+
+require_once sfConfig::get('sf_symfony_lib_dir').'/helper/JavascriptBaseHelper.php';
+
+/*
+ * This file is part of the symfony package.
+ * (c) 2004-2009 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * (c) 2004 David Heinemeier Hansson
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * JavascriptHelper.
+ *
+ * @package    symfony
+ * @subpackage helper
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ * @author     John Christopher <john.christopher@symfony-project.com>
+ * @author     David Heinemeier Hansson
+ * @author     Fabian Lange <fabian.lange@symfony-project.com>
+ * @version    SVN: $Id: JavascriptHelper.php 19310 2009-06-16 12:41:07Z FabianLange $
+ */
+
+/*
+ * Provides a set of helpers to call remote methods using what has been labelled 
+ * AJAX[http://www.adaptivepath.com/publications/essays/archives/000385.php].
+ * This means that you can call actions in your controllers without reloading the page,
+ * but still update certain parts of it using injections into the DOM.
+ * The common use case is having a form that adds a new element to a list without reloading the page.
+ *
+ * To be able to use the JavaScript helpers, you must include the Prototype JavaScript Framework
+ * and for some functions script.aculo.us (which both come with symfony) on your pages.
+ * Choose one of these options:
+ *
+ * * Use <tt><?php echo javascript_include_tag :defaults ?></tt> in the HEAD section of your page (recommended):
+ *   The function will return references to the JavaScript files created by the +rails+ command in your
+ *   <tt>public/javascripts</tt> directory. Using it is recommended as the browser can then cache the libraries
+ *   instead of fetching all the functions anew on every request.
+ * * Use <tt><?php echo javascript_include_tag 'prototype' ?></tt>: As above, but will only include the Prototype core library,
+ *   which means you are able to use all basic AJAX functionality. For the script.aculo.us-based JavaScript helpers,
+ *   like visual effects, autocompletion, drag and drop and so on, you should use the method described above.
+ * * Use <tt><?php echo define_javascript_functions ?></tt>: this will copy all the JavaScript support functions within a single
+ *   script block.
+ *
+ * For documentation on +javascript_include_tag+ see ActionView::Helpers::AssetTagHelper.
+ *
+ * If you're the visual type, there's an AJAX movie[http://www.rubyonrails.com/media/video/rails-ajax.mov] demonstrating
+ * the use of form_remote_tag.
+ */
+
+  function get_callbacks()
+  {
+    static $callbacks;
+    if (!$callbacks)
+    {
+      $callbacks = array_merge(array(
+        'uninitialized', 'loading', 'loaded', 'interactive', 'complete', 'failure', 'success'
+        ), range(100, 599));
+    }
+
+    return $callbacks;
+  }
+
+  function get_ajax_options()
+  {
+    static $ajax_options;
+    if (!$ajax_options)
+    {
+      $ajax_options = array_merge(array(
+        'before', 'after', 'condition', 'url', 'asynchronous', 'method',
+        'insertion', 'position', 'form', 'with', 'update', 'script'
+        ), get_callbacks());
+    }
+
+    return $ajax_options;
+  }
+
+  /**
+   * Returns an html button to a remote action defined by 'url' (using the
+   * 'url_for()' format) that's called in the background using XMLHttpRequest.
+   *
+   * See link_to_remote() for details.
+   *
+   */
+  function button_to_remote($name, $options = array(), $html_options = array())
+  {
+    return button_to_function($name, remote_function($options), $html_options);
+  }
+
+  /**
+   * Returns a link to a remote action defined by 'url'
+   * (using the 'url_for()' format) that's called in the background using
+   * XMLHttpRequest. The result of that request can then be inserted into a
+   * DOM object whose id can be specified with 'update'.
+   * Usually, the result would be a partial prepared by the controller with
+   * either 'render_partial()'.
+   *
+   * Examples:
+   *  <?php echo link_to_remote('Delete this post'), array(
+   *    'update' => 'posts',
+   *    'url'    => 'destroy?id='.$post.id,
+   *  )) ?>
+   *  <?php echo link_to_remote(image_tag('refresh'), array(
+   *    'update' => 'emails',
+   *    'url'    => '@list_emails',
+   *  )) ?>
+   *
+   * You can also specify a hash for 'update' to allow for
+   * easy redirection of output to an other DOM element if a server-side error occurs:
+   *
+   * Example:
+   *  <?php echo link_to_remote('Delete this post', array(
+   *      'update' => array('success' => 'posts', 'failure' => 'error'),
+   *      'url'    => 'destroy?id='.$post.id,
+   *  )) ?>
+   *
+   * Optionally, you can use the 'position' parameter to influence
+   * how the target DOM element is updated. It must be one of
+   * 'before', 'top', 'bottom', or 'after'.
+   *
+   * By default, these remote requests are processed asynchronous during
+   * which various JavaScript callbacks can be triggered (for progress indicators and
+   * the likes). All callbacks get access to the 'request' object,
+   * which holds the underlying XMLHttpRequest.
+   *
+   * To access the server response, use 'request.responseText', to
+   * find out the HTTP status, use 'request.status'.
+   *
+   * Example:
+   *  <?php echo link_to_remote($word, array(
+   *    'url'      => '@undo?n='.$word_counter,
+   *    'complete' => 'undoRequestCompleted(request)'
+   *  )) ?>
+   *
+   * The callbacks that may be specified are (in order):
+   *
+   * 'loading'                 Called when the remote document is being
+   *                           loaded with data by the browser.
+   * 'loaded'                  Called when the browser has finished loading
+   *                           the remote document.
+   * 'interactive'             Called when the user can interact with the
+   *                           remote document, even though it has not
+   *                           finished loading.
+   * 'success'                 Called when the XMLHttpRequest is completed,
+   *                           and the HTTP status code is in the 2XX range.
+   * 'failure'                 Called when the XMLHttpRequest is completed,
+   *                           and the HTTP status code is not in the 2XX
+   *                           range.
+   * 'complete'                Called when the XMLHttpRequest is complete
+   *                           (fires after success/failure if they are present).,
+   *
+   * You can further refine 'success' and 'failure' by adding additional
+   * callbacks for specific status codes:
+   *
+   * Example:
+   *  <?php echo link_to_remote($word, array(
+   *       'url'     => '@rule',
+   *       '404'     => "alert('Not found...? Wrong URL...?')",
+   *       'failure' => "alert('HTTP Error ' + request.status + '!')",
+   *  )) ?>
+   *
+   * A status code callback overrides the success/failure handlers if present.
+   *
+   * If you for some reason or another need synchronous processing (that'll
+   * block the browser while the request is happening), you can specify
+   * 'type' => 'synchronous'.
+   *
+   * You can customize further browser side call logic by passing
+   * in JavaScript code snippets via some optional parameters. In
+   * their order of use these are:
+   *
+   * 'confirm'             Adds confirmation dialog.
+   * 'condition'           Perform remote request conditionally
+   *                       by this expression. Use this to
+   *                       describe browser-side conditions when
+   *                       request should not be initiated.
+   * 'before'              Called before request is initiated.
+   * 'after'               Called immediately after request was
+   *                       initiated and before 'loading'.
+   * 'submit'              Specifies the DOM element ID that's used
+   *                       as the parent of the form elements. By
+   *                       default this is the current form, but
+   *                       it could just as well be the ID of a
+   *                       table row or any other DOM element.
+   */
+  function link_to_remote($name, $options = array(), $html_options = array())
+  {
+    return link_to_function($name, remote_function($options), $html_options);
+  }
+
+  /**
+   * Periodically calls the specified url ('url') every 'frequency' seconds (default is 10).
+   * Usually used to update a specified div ('update') with the results of the remote call.
+   * The options for specifying the target with 'url' and defining callbacks is the same as 'link_to_remote()'.
+   */
+  function periodically_call_remote($options = array())
+  {
+    $frequency = isset($options['frequency']) ? $options['frequency'] : 10; // every ten seconds by default
+    $code = 'new PeriodicalExecuter(function() {'.remote_function($options).'}, '.$frequency.')';
+
+    return javascript_tag($code);
+  }
+
+  /**
+   * Returns a form tag that will submit using XMLHttpRequest in the background instead of the regular
+   * reloading POST arrangement. Even though it's using JavaScript to serialize the form elements, the form submission
+   * will work just like a regular submission as viewed by the receiving side (all elements available in 'params').
+   * The options for specifying the target with 'url' and defining callbacks are the same as 'link_to_remote()'.
+   *
+   * A "fall-through" target for browsers that don't do JavaScript can be specified
+   * with the 'action'/'method' options on '$options_html'
+   *
+   * Example:
+   *  <?php echo form_remote_tag(array(
+   *    'url'      => '@tag_add',
+   *    'update'   => 'question_tags',
+   *    'loading'  => "Element.show('indicator'); \$('tag').value = ''",
+   *    'complete' => "Element.hide('indicator');".visual_effect('highlight', 'question_tags'),
+   *  )) ?>
+   *
+   * The hash passed as a second argument is equivalent to the options (2nd) argument in the form_tag() helper.
+   *
+   * By default the fall-through action is the same as the one specified in the 'url'
+   * (and the default method is 'post').
+   */
+  function form_remote_tag($options = array(), $options_html = array())
+  {
+    $options = _parse_attributes($options);
+    $options_html = _parse_attributes($options_html);
+
+    $options['form'] = true;
+
+    $options_html['onsubmit'] = remote_function($options).' return false;';
+    $options_html['action'] = isset($options_html['action']) ? $options_html['action'] : url_for($options['url']);
+    $options_html['method'] = isset($options_html['method']) ? $options_html['method'] : 'post';
+
+    return tag('form', $options_html, true);
+  }
+
+  /**
+   *  Returns a button input tag that will submit form using XMLHttpRequest in the background instead of regular
+   *  reloading POST arrangement. The '$options' argument is the same as in 'form_remote_tag()'.
+   */
+  function submit_to_remote($name, $value, $options = array(), $options_html = array())
+  {
+    $options = _parse_attributes($options);
+    $options_html = _parse_attributes($options_html);
+
+    if (!isset($options['with']))
+    {
+      $options['with'] = 'Form.serialize(this.form)';
+    }
+
+    $options_html['type'] = 'button';
+    $options_html['onclick'] = remote_function($options).' return false;';
+    $options_html['name'] = $name;
+    $options_html['value'] = $value;
+
+    return tag('input', $options_html, false);
+  }
+
+  /**
+   *  Returns a image submit tag that will submit form using XMLHttpRequest in the background instead of regular
+   *  reloading POST arrangement. The '$options' argument is the same as in 'form_remote_tag()'.
+   */
+  function submit_image_to_remote($name, $source, $options = array(), $options_html = array())
+  {
+    $options = _parse_attributes($options);
+    $options_html = _parse_attributes($options_html);
+ 
+    if (!isset($options['with']))
+    {
+      $options['with'] = 'Form.serialize(this.form)';
+    }
+
+    $options_html['type'] = 'image';
+    $options_html['onclick'] = remote_function($options).' return false;';
+    $options_html['name'] = $name;
+    $options_html['src'] = image_path($source);
+
+    if (!isset($options_html['alt'])) 
+    {
+      $path_pos = strrpos($source, '/');
+      $dot_pos = strrpos($source, '.');
+      $begin = $path_pos ? $path_pos + 1 : 0;
+      $nb_str = ($dot_pos ? $dot_pos : strlen($source)) - $begin;
+      $options_html['alt'] = ucfirst(substr($source, $begin, $nb_str));
+    }
+ 
+    return tag('input', $options_html, false);
+  }
+
+  /**
+   * Returns a Javascript function (or expression) that will update a DOM element '$element_id'
+   * according to the '$options' passed.
+   *
+   * Possible '$options' are:
+   * 'content'            The content to use for updating. Can be left out if using block, see example.
+   * 'action'             Valid options are 'update' (assumed by default), 'empty', 'remove'
+   * 'position'           If the 'action' is 'update', you can optionally specify one of the following positions:
+   *                      'before', 'top', 'bottom', 'after'.
+   *
+   * Example:
+   *   <?php echo javascript_tag(
+   *      update_element_function('products', array(
+   *            'position' => 'bottom',
+   *            'content'  => "<p>New product!</p>",
+   *      ))
+   *   ) ?>
+   *
+   *
+   * This method can also be used in combination with remote method call
+   * where the result is evaluated afterwards to cause multiple updates on a page.
+   *
+   * Example:
+   *
+   *  # Calling view
+   *  <?php echo form_remote_tag(array(
+   *      'url'      => '@buy',
+   *      'complete' => evaluate_remote_response()
+   *  )) ?>
+   *  all the inputs here...
+   *
+   *  # Target action
+   *  public function executeBuy()
+   *  {
+   *     $this->product = ProductPeer::retrieveByPk(1);
+   *  }
+   *
+   *  # Returning view
+   *  <?php echo update_element_function('cart', array(
+   *      'action'   => 'update',
+   *      'position' => 'bottom',
+   *      'content'  => '<p>New Product: '.$product->getName().'</p>',
+   *  )) ?>
+   */
+  function update_element_function($element_id, $options = array())
+  {
+    sfContext::getInstance()->getResponse()->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/prototype');
+
+    $content = escape_javascript(isset($options['content']) ? $options['content'] : '');
+
+    $value = isset($options['action']) ? $options['action'] : 'update';
+    switch ($value)
+    {
+      case 'update':
+        if (isset($options['position']) && $options['position'])
+        {
+          $javascript_function = "\$('$element_id').insert({'".$options['position']."':'$content'})";
+        }
+        else
+        {
+          $javascript_function = "\$('$element_id').update('$content')";
+        }
+        break;
+
+      case 'empty':
+        $javascript_function = "\$('$element_id').innerHTML = ''";
+        break;
+
+      case 'remove':
+        $javascript_function = "\$('$element_id').remove()";
+        break;
+
+      default:
+        throw new sfException('Invalid action, choose one of update, remove, empty.');
+    }
+
+    $javascript_function .= ";\n";
+
+    return (isset($options['binding']) ? $javascript_function.$options['binding'] : $javascript_function);
+  }
+
+  /**
+   * Returns 'eval(request.responseText)', which is the Javascript function that
+   * 'form_remote_tag()' can call in 'complete' to evaluate a multiple update return document
+   * using 'update_element_function()' calls.
+   */
+  function evaluate_remote_response()
+  {
+    return 'eval(request.responseText)';
+  }
+
+  /**
+   * Returns the javascript needed for a remote function.
+   * Takes the same arguments as 'link_to_remote()'.
+   *
+   * Example:
+   *   <select id="options" onchange="<?php echo remote_function(array('update' => 'options', 'url' => '@update_options')) ?>">
+   *     <option value="0">Hello</option>
+   *     <option value="1">World</option>
+   *   </select>
+   */
+  function remote_function($options)
+  {
+    sfContext::getInstance()->getResponse()->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/prototype');
+
+    $javascript_options = _options_for_ajax($options);
+
+    $update = '';
+    if (isset($options['update']) && is_array($options['update']))
+    {
+      $update = array();
+      if (isset($options['update']['success']))
+      {
+        $update[] = "success:'".$options['update']['success']."'";
+      }
+      if (isset($options['update']['failure']))
+      {
+        $update[] = "failure:'".$options['update']['failure']."'";
+      }
+      $update = '{'.join(',', $update).'}';
+    }
+    else if (isset($options['update']))
+    {
+      $update .= "'".$options['update']."'";
+    }
+
+    $function = !$update ?  "new Ajax.Request(" : "new Ajax.Updater($update, ";
+
+    $function .= '\''.url_for($options['url']).'\'';
+    $function .= ', '.$javascript_options.')';
+
+    if (isset($options['before']))
+    {
+      $function = $options['before'].'; '.$function;
+    }
+    if (isset($options['after']))
+    {
+      $function = $function.'; '.$options['after'];
+    }
+    if (isset($options['condition']))
+    {
+      $function = 'if ('.$options['condition'].') { '.$function.'; }';
+    }
+    if (isset($options['confirm']))
+    {
+      $function = "if (window.confirm('".escape_javascript($options['confirm'])."')) { $function; }";
+      if (isset($options['cancel']))
+      {
+        $function = $function.' else { '.$options['cancel'].' }';
+      }
+    }
+
+    return $function.';';
+  }
+
+  /**
+   * Observes the field with the DOM ID specified by '$field_id' and makes
+   * an AJAX call when its contents have changed.
+   *
+   * Required '$options' are:
+   * 'url'                 'url_for()'-style options for the action to call
+   *                       when the field has changed.
+   *
+   * Additional options are:
+   * 'frequency'           The frequency (in seconds) at which changes to
+   *                       this field will be detected. Not setting this
+   *                       option at all or to a value equal to or less than
+   *                       zero will use event based observation instead of
+   *                       time based observation.
+   * 'update'              Specifies the DOM ID of the element whose
+   *                       innerHTML should be updated with the
+   *                       XMLHttpRequest response text.
+   * 'with'                A JavaScript expression specifying the
+   *                       parameters for the XMLHttpRequest. This defaults
+   *                       to 'value', which in the evaluated context
+   *                       refers to the new field value.
+   *
+   * Additionally, you may specify any of the options documented in
+   * link_to_remote().
+   */
+  function observe_field($field_id, $options = array())
+  {
+    sfContext::getInstance()->getResponse()->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/prototype');
+
+    if (isset($options['frequency']) && $options['frequency'] > 0)
+    {
+      return _build_observer('Form.Element.Observer', $field_id, $options);
+    }
+    else
+    {
+      return _build_observer('Form.Element.EventObserver', $field_id, $options);
+    }
+  }
+
+  /**
+   * Like 'observe_field()', but operates on an entire form identified by the
+   * DOM ID '$form_id'. '$options' are the same as 'observe_field()', except
+   * the default value of the 'with' option evaluates to the
+   * serialized (request string) value of the form.
+   */
+  function observe_form($form_id, $options = array())
+  {
+    sfContext::getInstance()->getResponse()->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/prototype');
+
+    if (isset($options['frequency']) && $options['frequency'] > 0)
+    {
+      return _build_observer('Form.Observer', $form_id, $options);
+    }
+    else
+    {
+      return _build_observer('Form.EventObserver', $form_id, $options);
+    }
+  }
+
+  /**
+   * Returns a JavaScript snippet to be used on the AJAX callbacks for starting
+   * visual effects.
+   *
+   * Example:
+   *  <?php echo link_to_remote('Reload', array(
+   *        'update'  => 'posts',
+   *        'url'     => '@reload',
+   *        'complete => visual_effect('highlight', 'posts', array('duration' => 0.5 )),
+   *  )) ?>
+   *
+   * If no '$element_id' is given, it assumes "element" which should be a local
+   * variable in the generated JavaScript execution context. This can be used
+   * for example with drop_receiving_element():
+   *
+   *  <?php echo drop_receving_element( ..., array(
+   *        ...
+   *        'loading' => visual_effect('fade'),
+   *  )) ?>
+   *
+   * This would fade the element that was dropped on the drop receiving element.
+   *
+   * You can change the behaviour with various options, see
+   * http://script.aculo.us for more documentation.
+   */
+  function visual_effect($name, $element_id = false, $js_options = array())
+  {
+    $response = sfContext::getInstance()->getResponse();
+    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/prototype');
+    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/builder');
+    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/effects');
+
+    $element = $element_id ? "'$element_id'" : 'element';
+
+    if (in_array($name, array('toggle_appear', 'toggle_blind', 'toggle_slide')))
+    {
+      return "new Effect.toggle($element, '".substr($name, 7)."', ".options_for_javascript($js_options).");";
+    }
+    else
+    {
+      return "new Effect.".sfInflector::camelize($name)."($element, ".options_for_javascript($js_options).");";
+    }
+  }
+
+  /**
+   * Makes the elements with the DOM ID specified by '$element_id' sortable
+   * by drag-and-drop and if an 'url' is specified make an AJAX call whenever
+   * the sort order has changed. By default, the action called gets the 
+   * serialized sortable element as parameters.
+   *
+   * Example:
+   *   <?php echo sortable_element($my_list, array(
+   *      'url' => '@order',
+   *   )) ?>
+   *
+   * In the example, the action gets a '$my_list' array parameter
+   * containing the values of the ids of elements the sortable consists
+   * of, in the current order.
+   *
+   * You can change the behaviour with various options, see
+   * http://script.aculo.us for more documentation.
+   */
+  function sortable_element($element_id, $options = array())
+  {
+    $response = sfContext::getInstance()->getResponse();
+    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/prototype');
+    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/builder');
+    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/effects');
+    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/dragdrop');
+
+    if (!isset($options['with']))
+    {
+      $options['with'] = "Sortable.serialize('$element_id')";
+    }
+
+    if (!isset($options['onUpdate']) && isset($options['url']))
+    {
+      $options['onUpdate'] = "function(){".remote_function($options)."}";
+    }
+
+    foreach (get_ajax_options() as $key)
+    {
+      unset($options[$key]);
+    }
+
+    foreach (array('tag', 'overlap', 'constraint', 'handle') as $option)
+    {
+      if (isset($options[$option]))
+      {
+        $options[$option] = "'{$options[$option]}'";
+      }
+    }
+
+    if (isset($options['containment']))
+    {
+      $options['containment'] = array_or_string_for_javascript($options['containment']);
+    }
+
+    if (isset($options['hoverclass']))
+    {
+      $options['hoverclass'] = "'{$options['hoverclass']}'";
+    }
+
+    if (isset($options['only']))
+    {
+      $options['only'] = array_or_string_for_javascript($options['only']);
+    }
+
+    $scrollPosition = "";
+    if (isset($options['scroll']))
+    {
+      $options['scroll'] = array_or_string_for_javascript($options['scroll']);
+      $scrollPosition = "Position.includeScrollOffsets = true;";
+    }
+
+    return javascript_tag($scrollPosition."Sortable.create('$element_id', ".options_for_javascript($options).")");
+  }
+
+  /**
+   * Makes the element with the DOM ID specified by '$element_id' draggable.
+   *
+   * Example:
+   *   <?php echo draggable_element('my_image', array(
+   *      'revert' => true,
+   *   )) ?>
+   *
+   * You can change the behaviour with various options, see
+   * http://script.aculo.us for more documentation.
+   */
+  function draggable_element($element_id, $options = array())
+  {
+    $response = sfContext::getInstance()->getResponse();
+    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/prototype');
+    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/builder');
+    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/effects');
+    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/dragdrop');
+
+    return javascript_tag("new Draggable('$element_id', ".options_for_javascript($options).")");
+  }
+
+  /**
+   * Makes the element with the DOM ID specified by '$element_id' receive
+   * dropped draggable elements (created by 'draggable_element()') and make an AJAX call.
+   * By default, the action called gets the DOM ID of the element as parameter.
+   *
+   * Example:
+   *   <?php drop_receiving_element('my_cart', array(
+   *      'url' => 'cart/add',
+   *   )) ?>
+   *
+   * You can change the behaviour with various options, see
+   * http://script.aculo.us for more documentation.
+   */
+  function drop_receiving_element($element_id, $options = array())
+  {
+    $response = sfContext::getInstance()->getResponse();
+    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/prototype');
+    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/builder');
+    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/effects');
+    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/dragdrop');
+
+    if (!isset($options['with']))
+    {
+      $options['with'] = "'id=' + encodeURIComponent(element.id)";
+    }
+    if (!isset($options['onDrop']))
+    {
+      $options['onDrop'] = "function(element){".remote_function($options)."}";
+    }
+
+    foreach (get_ajax_options() as $key)
+    {
+      unset($options[$key]);
+    }
+
+    if (isset($options['accept']))
+    {
+      $options['accept'] = array_or_string_for_javascript($options['accept']);
+    }
+
+    if (isset($options['hoverclass']))
+    {
+      $options['hoverclass'] = "'{$options['hoverclass']}'";
+    }
+
+    return javascript_tag("Droppables.add('$element_id', ".options_for_javascript($options).")");
+  }
+
+  /**
+   * wrapper for script.aculo.us/prototype Ajax.Autocompleter.
+   * @param string name value of input field
+   * @param string default value for input field
+   * @param array input tag options. (size, autocomplete, etc...)
+   * @param array completion options. (use_style, etc...)
+   *
+   * @return string input field tag, div for completion results, and
+   *                 auto complete javascript tags
+   */
+  function input_auto_complete_tag($name, $value, $url, $tag_options = array(), $completion_options = array())
+  {
+    $context = sfContext::getInstance();
+
+    $tag_options = _convert_options($tag_options);
+
+    $response = $context->getResponse();
+    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/prototype');
+    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/effects');
+    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/controls');
+
+    $comp_options = _convert_options($completion_options);
+    if (isset($comp_options['use_style']) && $comp_options['use_style'] == true)
+    {
+      $response->addStylesheet(sfConfig::get('sf_prototype_web_dir').'/css/input_auto_complete_tag');
+    }
+
+    $tag_options['id'] = get_id_from_name(isset($tag_options['id']) ? $tag_options['id'] : $name);
+
+    $javascript  = tag('input', array_merge(array('type' => 'text', 'name' => $name, 'value' => $value), _convert_options($tag_options)));
+    $javascript .= content_tag('div', '' , array('id' => $tag_options['id'].'_auto_complete', 'class' => 'auto_complete'));
+    $javascript .= _auto_complete_field($tag_options['id'], $url, $comp_options);
+
+    return $javascript;
+  }
+
+  /**
+   * wrapper for script.aculo.us/prototype Ajax.InPlaceEditor.
+   * @param string name id of field that can be edited
+   * @param string url of module/action to be called when ok is clicked
+   * @param array editor tag options. (rows, cols, highlightcolor, highlightendcolor, etc...)
+   *
+   * @return string javascript to manipulate the id field to allow click and edit functionality
+   */
+  function input_in_place_editor_tag($name, $url, $editor_options = array())
+  {
+    $response = sfContext::getInstance()->getResponse();
+    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/prototype');
+    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/effects');
+    $response->addJavascript(sfConfig::get('sf_prototype_web_dir').'/js/controls');
+
+    $editor_options = _convert_options($editor_options);
+    return _in_place_editor($name, $url, $editor_options);
+  }
+
+  /*
+   * Makes an HTML element specified by the DOM ID '$field_id' become an in-place
+   * editor of a property.
+   *
+   * A form is automatically created and displayed when the user clicks the element,
+   * something like this:
+   * <form id="myElement-in-place-edit-form" target="specified url">
+   *   <input name="value" text="The content of myElement"/>
+   *   <input type="submit" value="ok"/>
+   *   <a onclick="javascript to cancel the editing">cancel</a>
+   * </form>
+   *
+   * The form is serialized and sent to the server using an AJAX call, the action on
+   * the server should process the value and return the updated value in the body of
+   * the reponse. The element will automatically be updated with the changed value
+   * (as returned from the server).
+   *
+   * Required '$options' are:
+   * 'url'                 Specifies the url where the updated value should
+   *                       be sent after the user presses "ok".
+   *
+   * Some additional '$options' are:
+   * 'rows'                Number of rows (more than 1 will use a TEXTAREA)
+   * 'cancel_text'         The text on the cancel link. (default: "cancel")
+   * 'save_text'           The text on the save link. (default: "ok")
+   * 'external_control'    The id of an external control used to enter edit mode.
+   * 'options'             Pass through options to the AJAX call (see prototype's Ajax.Updater)
+   * 'with'                JavaScript snippet that should return what is to be sent
+   *                       in the AJAX call, 'form' is an implicit parameter
+   *
+   * for details see: http://mir.aculo.us/2007/7/17/in-place-editing-the-summer-2007-rewrite/
+   */
+    function _in_place_editor($field_id, $url, $options = array())
+    {
+      $javascript = "new Ajax.InPlaceEditor(";
+
+      $javascript .= "'$field_id', ";
+      $javascript .= array_or_string_for_javascript(url_for($url));
+
+      // translate symfony option names to InPlaceEditor options
+      if (isset($options['cancel_text']))
+      {
+        $options['cancelText'] = array_or_string_for_javascript($options['cancel_text']);
+        unset($options['cancel_text']);
+      }
+      if (isset($options['save_text']))
+      {
+        $options['okText'] = array_or_string_for_javascript($options['save_text']);
+        unset($options['save_text']);
+      }
+      if (isset($options['external_control']))
+      {
+        $options['externalControl'] = array_or_string_for_javascript($options['external_control']);
+        unset($options['external_control']);
+      }
+      if (isset($options['options']))
+      {
+        $options['ajaxOptions'] = $options['options'];
+        unset($options['options']);
+      }
+      if (isset($options['with']))
+      {
+        $options['callback'] = "function(form, value) { return ".$options['with']." }";
+        unset($options['with']);
+      }
+      if (isset($options['highlightcolor']))
+      {
+        $options['highlightColor'] = array_or_string_for_javascript($options['highlightcolor']);
+        unset($options['highlightcolor']);
+      }
+      if (isset($options['highlightendcolor']))
+      {
+        $options['highlightEndColor'] = array_or_string_for_javascript($options['highlightendcolor']);
+        unset($options['highlightendcolor']);
+      }
+      if (isset($options['loadTextURL']))
+      {
+        $options['loadTextURL'] =  array_or_string_for_javascript($options['loadTextURL']);
+      }
+
+      $javascript .= ', '.options_for_javascript($options);
+      $javascript .= ');';
+
+      return javascript_tag($javascript);
+    }
+
+  /**
+   * wrapper for script.aculo.us/prototype Ajax.Autocompleter.
+   * @param string id value of input field
+   * @param string url of module/action to execute for autocompletion
+   * @param array completion options
+   * @return string javascript tag for Ajax.Autocompleter
+   */
+  function _auto_complete_field($field_id, $url, $options = array())
+  {
+    $javascript = "new Ajax.Autocompleter(";
+
+    $javascript .= "'".get_id_from_name($field_id)."', ";
+    if (isset($options['update']))
+    {
+      $javascript .= "'".$options['update']."', ";
+    }
+    else
+    {
+      $javascript .= "'".get_id_from_name($field_id)."_auto_complete', ";
+    }
+
+    $javascript .= array_or_string_for_javascript(url_for($url));
+
+    $js_options = array();
+    if (isset($options['tokens']))
+    {
+      $js_options['tokens'] = array_or_string_for_javascript($options['tokens']);
+    }
+    if (isset ($options['with']))
+    {
+      $js_options['callback'] = "function(element, value) { return ".$options['with']."}";
+    }
+    if (isset($options['indicator']))
+    {
+      $js_options['indicator']  = array_or_string_for_javascript($options['indicator']);
+    }
+    if (isset($options['on_show']))
+    {
+      $js_options['onShow'] = $options['on_show'];
+    }
+    if (isset($options['on_hide']))
+    {
+      $js_options['onHide'] = $options['on_hide'];
+    }
+    if (isset($options['min_chars']))
+    {
+      $js_options['minChars'] = $options['min_chars'];
+    }
+    if (isset($options['frequency']))
+    {
+      $js_options['frequency'] = $options['frequency'];
+    }
+    if (isset($options['update_element']))
+    {
+      $js_options['updateElement'] = $options['update_element'];
+    }
+    if (isset($options['after_update_element']))
+    {
+      $js_options['afterUpdateElement'] = $options['after_update_element'];
+    }
+    if (isset($options['param_name'])) 
+    {
+      $js_options['paramName'] = "'".$options['param_name']."'";
+    }
+
+    $javascript .= ', '.options_for_javascript($js_options).');';
+
+    return javascript_tag($javascript);
+  }
+
+  function _options_for_ajax($options)
+  {
+    $js_options = _build_callbacks($options);
+
+    $js_options['asynchronous'] = (isset($options['type']) && ($options['type'] == 'synchronous')) ? false : true;
+    if (isset($options['method'])) $js_options['method'] = array_or_string_for_javascript($options['method']);
+    if (isset($options['position'])) $js_options['insertion'] = "Insertion.".sfInflector::camelize($options['position']);
+    $js_options['evalScripts'] = (!isset($options['script']) || $options['script'] == '0' || $options['script'] == false) ? false : true;
+
+    if (isset($options['form']))
+    {
+      $js_options['parameters'] = 'Form.serialize(this)';
+    }
+    else if (isset($options['submit']))
+    {
+      $js_options['parameters'] = "Form.serialize(document.getElementById('{$options['submit']}'))";
+    }
+    else if (isset($options['with']))
+    {
+      $js_options['parameters'] = $options['with'];
+    }
+
+    return options_for_javascript($js_options);
+  }
+
+  function _build_observer($klass, $name, $options = array())
+  {
+    if (!isset($options['with']) && isset($options['update']))
+    {
+      $options['with'] = 'value';
+    }
+
+    $callback = remote_function($options);
+
+    $javascript  = 'new '.$klass.'("'.$name.'", ';
+    if (isset($options['frequency']) && $options['frequency'] > 0)
+    {
+      $javascript .= $options['frequency'].", ";
+    }
+    $javascript .= "function(element, value) {";
+    $javascript .= $callback.'});';
+
+    return javascript_tag($javascript);
+  }
+
+  function _build_callbacks($options)
+  {
+    $callbacks = array();
+    foreach (get_callbacks() as $callback)
+    {
+      if (isset($options[$callback]))
+      {
+        $name = 'on'.ucfirst($callback);
+        $code = $options[$callback];
+        $callbacks[$name] = 'function(request, json){'.$code.'}';
+      }
+    }
+
+    return $callbacks;
+  }
diff --git a/plugins/sfProtoculousPlugin/web/css/input_auto_complete_tag.css b/plugins/sfProtoculousPlugin/web/css/input_auto_complete_tag.css
new file mode 100644
index 000000000..1029e1a2c
--- /dev/null
+++ b/plugins/sfProtoculousPlugin/web/css/input_auto_complete_tag.css
@@ -0,0 +1,34 @@
+div.auto_complete
+{
+  width: 350px;
+  background: #fff;
+}
+
+div.auto_complete ul
+{
+  width: 100%;
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+  border: 1px solid #bbb;
+}
+
+div.auto_complete ul li
+{
+  margin: 0;
+  padding: 3px;
+  border-bottom: 1px solid #eee;
+  list-style-type: none;
+}
+
+div.auto_complete ul li.selected
+{
+  background-color: #ffb;
+}
+
+div.auto_complete ul strong.highlight
+{
+  margin: 0;
+  padding: 0;
+  color: #800;
+}
diff --git a/plugins/sfProtoculousPlugin/web/js/builder.js b/plugins/sfProtoculousPlugin/web/js/builder.js
new file mode 100644
index 000000000..dba8becaa
--- /dev/null
+++ b/plugins/sfProtoculousPlugin/web/js/builder.js
@@ -0,0 +1,136 @@
+// script.aculo.us builder.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
+
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+var Builder = {
+  NODEMAP: {
+    AREA: 'map',
+    CAPTION: 'table',
+    COL: 'table',
+    COLGROUP: 'table',
+    LEGEND: 'fieldset',
+    OPTGROUP: 'select',
+    OPTION: 'select',
+    PARAM: 'object',
+    TBODY: 'table',
+    TD: 'table',
+    TFOOT: 'table',
+    TH: 'table',
+    THEAD: 'table',
+    TR: 'table'
+  },
+  // note: For Firefox < 1.5, OPTION and OPTGROUP tags are currently broken,
+  //       due to a Firefox bug
+  node: function(elementName) {
+    elementName = elementName.toUpperCase();
+
+    // try innerHTML approach
+    var parentTag = this.NODEMAP[elementName] || 'div';
+    var parentElement = document.createElement(parentTag);
+    try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
+      parentElement.innerHTML = "<" + elementName + "></" + elementName + ">";
+    } catch(e) {}
+    var element = parentElement.firstChild || null;
+
+    // see if browser added wrapping tags
+    if(element && (element.tagName.toUpperCase() != elementName))
+      element = element.getElementsByTagName(elementName)[0];
+
+    // fallback to createElement approach
+    if(!element) element = document.createElement(elementName);
+
+    // abort if nothing could be created
+    if(!element) return;
+
+    // attributes (or text)
+    if(arguments[1])
+      if(this._isStringOrNumber(arguments[1]) ||
+        (arguments[1] instanceof Array) ||
+        arguments[1].tagName) {
+          this._children(element, arguments[1]);
+        } else {
+          var attrs = this._attributes(arguments[1]);
+          if(attrs.length) {
+            try { // prevent IE "feature": http://dev.rubyonrails.org/ticket/2707
+              parentElement.innerHTML = "<" +elementName + " " +
+                attrs + "></" + elementName + ">";
+            } catch(e) {}
+            element = parentElement.firstChild || null;
+            // workaround firefox 1.0.X bug
+            if(!element) {
+              element = document.createElement(elementName);
+              for(attr in arguments[1])
+                element[attr == 'class' ? 'className' : attr] = arguments[1][attr];
+            }
+            if(element.tagName.toUpperCase() != elementName)
+              element = parentElement.getElementsByTagName(elementName)[0];
+          }
+        }
+
+    // text, or array of children
+    if(arguments[2])
+      this._children(element, arguments[2]);
+
+     return $(element);
+  },
+  _text: function(text) {
+     return document.createTextNode(text);
+  },
+
+  ATTR_MAP: {
+    'className': 'class',
+    'htmlFor': 'for'
+  },
+
+  _attributes: function(attributes) {
+    var attrs = [];
+    for(attribute in attributes)
+      attrs.push((attribute in this.ATTR_MAP ? this.ATTR_MAP[attribute] : attribute) +
+          '="' + attributes[attribute].toString().escapeHTML().gsub(/"/,'&quot;') + '"');
+    return attrs.join(" ");
+  },
+  _children: function(element, children) {
+    if(children.tagName) {
+      element.appendChild(children);
+      return;
+    }
+    if(typeof children=='object') { // array can hold nodes and text
+      children.flatten().each( function(e) {
+        if(typeof e=='object')
+          element.appendChild(e);
+        else
+          if(Builder._isStringOrNumber(e))
+            element.appendChild(Builder._text(e));
+      });
+    } else
+      if(Builder._isStringOrNumber(children))
+        element.appendChild(Builder._text(children));
+  },
+  _isStringOrNumber: function(param) {
+    return(typeof param=='string' || typeof param=='number');
+  },
+  build: function(html) {
+    var element = this.node('div');
+    $(element).update(html.strip());
+    return element.down();
+  },
+  dump: function(scope) {
+    if(typeof scope != 'object' && typeof scope != 'function') scope = window; //global scope
+
+    var tags = ("A ABBR ACRONYM ADDRESS APPLET AREA B BASE BASEFONT BDO BIG BLOCKQUOTE BODY " +
+      "BR BUTTON CAPTION CENTER CITE CODE COL COLGROUP DD DEL DFN DIR DIV DL DT EM FIELDSET " +
+      "FONT FORM FRAME FRAMESET H1 H2 H3 H4 H5 H6 HEAD HR HTML I IFRAME IMG INPUT INS ISINDEX "+
+      "KBD LABEL LEGEND LI LINK MAP MENU META NOFRAMES NOSCRIPT OBJECT OL OPTGROUP OPTION P "+
+      "PARAM PRE Q S SAMP SCRIPT SELECT SMALL SPAN STRIKE STRONG STYLE SUB SUP TABLE TBODY TD "+
+      "TEXTAREA TFOOT TH THEAD TITLE TR TT U UL VAR").split(/\s+/);
+
+    tags.each( function(tag){
+      scope[tag] = function() {
+        return Builder.node.apply(Builder, [tag].concat($A(arguments)));
+      };
+    });
+  }
+};
\ No newline at end of file
diff --git a/plugins/sfProtoculousPlugin/web/js/controls.js b/plugins/sfProtoculousPlugin/web/js/controls.js
new file mode 100644
index 000000000..c56ccb798
--- /dev/null
+++ b/plugins/sfProtoculousPlugin/web/js/controls.js
@@ -0,0 +1,965 @@
+// script.aculo.us controls.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
+
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005-2008 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
+//           (c) 2005-2008 Jon Tirsen (http://www.tirsen.com)
+// Contributors:
+//  Richard Livsey
+//  Rahul Bhargava
+//  Rob Wills
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+// Autocompleter.Base handles all the autocompletion functionality
+// that's independent of the data source for autocompletion. This
+// includes drawing the autocompletion menu, observing keyboard
+// and mouse events, and similar.
+//
+// Specific autocompleters need to provide, at the very least,
+// a getUpdatedChoices function that will be invoked every time
+// the text inside the monitored textbox changes. This method
+// should get the text for which to provide autocompletion by
+// invoking this.getToken(), NOT by directly accessing
+// this.element.value. This is to allow incremental tokenized
+// autocompletion. Specific auto-completion logic (AJAX, etc)
+// belongs in getUpdatedChoices.
+//
+// Tokenized incremental autocompletion is enabled automatically
+// when an autocompleter is instantiated with the 'tokens' option
+// in the options parameter, e.g.:
+// new Ajax.Autocompleter('id','upd', '/url/', { tokens: ',' });
+// will incrementally autocomplete with a comma as the token.
+// Additionally, ',' in the above example can be replaced with
+// a token array, e.g. { tokens: [',', '\n'] } which
+// enables autocompletion on multiple tokens. This is most
+// useful when one of the tokens is \n (a newline), as it
+// allows smart autocompletion after linebreaks.
+
+if(typeof Effect == 'undefined')
+  throw("controls.js requires including script.aculo.us' effects.js library");
+
+var Autocompleter = { };
+Autocompleter.Base = Class.create({
+  baseInitialize: function(element, update, options) {
+    element          = $(element);
+    this.element     = element;
+    this.update      = $(update);
+    this.hasFocus    = false;
+    this.changed     = false;
+    this.active      = false;
+    this.index       = 0;
+    this.entryCount  = 0;
+    this.oldElementValue = this.element.value;
+
+    if(this.setOptions)
+      this.setOptions(options);
+    else
+      this.options = options || { };
+
+    this.options.paramName    = this.options.paramName || this.element.name;
+    this.options.tokens       = this.options.tokens || [];
+    this.options.frequency    = this.options.frequency || 0.4;
+    this.options.minChars     = this.options.minChars || 1;
+    this.options.onShow       = this.options.onShow ||
+      function(element, update){
+        if(!update.style.position || update.style.position=='absolute') {
+          update.style.position = 'absolute';
+          Position.clone(element, update, {
+            setHeight: false,
+            offsetTop: element.offsetHeight
+          });
+        }
+        Effect.Appear(update,{duration:0.15});
+      };
+    this.options.onHide = this.options.onHide ||
+      function(element, update){ new Effect.Fade(update,{duration:0.15}) };
+
+    if(typeof(this.options.tokens) == 'string')
+      this.options.tokens = new Array(this.options.tokens);
+    // Force carriage returns as token delimiters anyway
+    if (!this.options.tokens.include('\n'))
+      this.options.tokens.push('\n');
+
+    this.observer = null;
+
+    this.element.setAttribute('autocomplete','off');
+
+    Element.hide(this.update);
+
+    Event.observe(this.element, 'blur', this.onBlur.bindAsEventListener(this));
+    Event.observe(this.element, 'keydown', this.onKeyPress.bindAsEventListener(this));
+  },
+
+  show: function() {
+    if(Element.getStyle(this.update, 'display')=='none') this.options.onShow(this.element, this.update);
+    if(!this.iefix &&
+      (Prototype.Browser.IE) &&
+      (Element.getStyle(this.update, 'position')=='absolute')) {
+      new Insertion.After(this.update,
+       '<iframe id="' + this.update.id + '_iefix" '+
+       'style="display:none;position:absolute;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=0);" ' +
+       'src="javascript:false;" frameborder="0" scrolling="no"></iframe>');
+      this.iefix = $(this.update.id+'_iefix');
+    }
+    if(this.iefix) setTimeout(this.fixIEOverlapping.bind(this), 50);
+  },
+
+  fixIEOverlapping: function() {
+    Position.clone(this.update, this.iefix, {setTop:(!this.update.style.height)});
+    this.iefix.style.zIndex = 1;
+    this.update.style.zIndex = 2;
+    Element.show(this.iefix);
+  },
+
+  hide: function() {
+    this.stopIndicator();
+    if(Element.getStyle(this.update, 'display')!='none') this.options.onHide(this.element, this.update);
+    if(this.iefix) Element.hide(this.iefix);
+  },
+
+  startIndicator: function() {
+    if(this.options.indicator) Element.show(this.options.indicator);
+  },
+
+  stopIndicator: function() {
+    if(this.options.indicator) Element.hide(this.options.indicator);
+  },
+
+  onKeyPress: function(event) {
+    if(this.active)
+      switch(event.keyCode) {
+       case Event.KEY_TAB:
+       case Event.KEY_RETURN:
+         this.selectEntry();
+         Event.stop(event);
+       case Event.KEY_ESC:
+         this.hide();
+         this.active = false;
+         Event.stop(event);
+         return;
+       case Event.KEY_LEFT:
+       case Event.KEY_RIGHT:
+         return;
+       case Event.KEY_UP:
+         this.markPrevious();
+         this.render();
+         Event.stop(event);
+         return;
+       case Event.KEY_DOWN:
+         this.markNext();
+         this.render();
+         Event.stop(event);
+         return;
+      }
+     else
+       if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN ||
+         (Prototype.Browser.WebKit > 0 && event.keyCode == 0)) return;
+
+    this.changed = true;
+    this.hasFocus = true;
+
+    if(this.observer) clearTimeout(this.observer);
+      this.observer =
+        setTimeout(this.onObserverEvent.bind(this), this.options.frequency*1000);
+  },
+
+  activate: function() {
+    this.changed = false;
+    this.hasFocus = true;
+    this.getUpdatedChoices();
+  },
+
+  onHover: function(event) {
+    var element = Event.findElement(event, 'LI');
+    if(this.index != element.autocompleteIndex)
+    {
+        this.index = element.autocompleteIndex;
+        this.render();
+    }
+    Event.stop(event);
+  },
+
+  onClick: function(event) {
+    var element = Event.findElement(event, 'LI');
+    this.index = element.autocompleteIndex;
+    this.selectEntry();
+    this.hide();
+  },
+
+  onBlur: function(event) {
+    // needed to make click events working
+    setTimeout(this.hide.bind(this), 250);
+    this.hasFocus = false;
+    this.active = false;
+  },
+
+  render: function() {
+    if(this.entryCount > 0) {
+      for (var i = 0; i < this.entryCount; i++)
+        this.index==i ?
+          Element.addClassName(this.getEntry(i),"selected") :
+          Element.removeClassName(this.getEntry(i),"selected");
+      if(this.hasFocus) {
+        this.show();
+        this.active = true;
+      }
+    } else {
+      this.active = false;
+      this.hide();
+    }
+  },
+
+  markPrevious: function() {
+    if(this.index > 0) this.index--;
+      else this.index = this.entryCount-1;
+    this.getEntry(this.index).scrollIntoView(true);
+  },
+
+  markNext: function() {
+    if(this.index < this.entryCount-1) this.index++;
+      else this.index = 0;
+    this.getEntry(this.index).scrollIntoView(false);
+  },
+
+  getEntry: function(index) {
+    return this.update.firstChild.childNodes[index];
+  },
+
+  getCurrentEntry: function() {
+    return this.getEntry(this.index);
+  },
+
+  selectEntry: function() {
+    this.active = false;
+    this.updateElement(this.getCurrentEntry());
+  },
+
+  updateElement: function(selectedElement) {
+    if (this.options.updateElement) {
+      this.options.updateElement(selectedElement);
+      return;
+    }
+    var value = '';
+    if (this.options.select) {
+      var nodes = $(selectedElement).select('.' + this.options.select) || [];
+      if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select);
+    } else
+      value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal');
+
+    var bounds = this.getTokenBounds();
+    if (bounds[0] != -1) {
+      var newValue = this.element.value.substr(0, bounds[0]);
+      var whitespace = this.element.value.substr(bounds[0]).match(/^\s+/);
+      if (whitespace)
+        newValue += whitespace[0];
+      this.element.value = newValue + value + this.element.value.substr(bounds[1]);
+    } else {
+      this.element.value = value;
+    }
+    this.oldElementValue = this.element.value;
+    this.element.focus();
+
+    if (this.options.afterUpdateElement)
+      this.options.afterUpdateElement(this.element, selectedElement);
+  },
+
+  updateChoices: function(choices) {
+    if(!this.changed && this.hasFocus) {
+      this.update.innerHTML = choices;
+      Element.cleanWhitespace(this.update);
+      Element.cleanWhitespace(this.update.down());
+
+      if(this.update.firstChild && this.update.down().childNodes) {
+        this.entryCount =
+          this.update.down().childNodes.length;
+        for (var i = 0; i < this.entryCount; i++) {
+          var entry = this.getEntry(i);
+          entry.autocompleteIndex = i;
+          this.addObservers(entry);
+        }
+      } else {
+        this.entryCount = 0;
+      }
+
+      this.stopIndicator();
+      this.index = 0;
+
+      if(this.entryCount==1 && this.options.autoSelect) {
+        this.selectEntry();
+        this.hide();
+      } else {
+        this.render();
+      }
+    }
+  },
+
+  addObservers: function(element) {
+    Event.observe(element, "mouseover", this.onHover.bindAsEventListener(this));
+    Event.observe(element, "click", this.onClick.bindAsEventListener(this));
+  },
+
+  onObserverEvent: function() {
+    this.changed = false;
+    this.tokenBounds = null;
+    if(this.getToken().length>=this.options.minChars) {
+      this.getUpdatedChoices();
+    } else {
+      this.active = false;
+      this.hide();
+    }
+    this.oldElementValue = this.element.value;
+  },
+
+  getToken: function() {
+    var bounds = this.getTokenBounds();
+    return this.element.value.substring(bounds[0], bounds[1]).strip();
+  },
+
+  getTokenBounds: function() {
+    if (null != this.tokenBounds) return this.tokenBounds;
+    var value = this.element.value;
+    if (value.strip().empty()) return [-1, 0];
+    var diff = arguments.callee.getFirstDifferencePos(value, this.oldElementValue);
+    var offset = (diff == this.oldElementValue.length ? 1 : 0);
+    var prevTokenPos = -1, nextTokenPos = value.length;
+    var tp;
+    for (var index = 0, l = this.options.tokens.length; index < l; ++index) {
+      tp = value.lastIndexOf(this.options.tokens[index], diff + offset - 1);
+      if (tp > prevTokenPos) prevTokenPos = tp;
+      tp = value.indexOf(this.options.tokens[index], diff + offset);
+      if (-1 != tp && tp < nextTokenPos) nextTokenPos = tp;
+    }
+    return (this.tokenBounds = [prevTokenPos + 1, nextTokenPos]);
+  }
+});
+
+Autocompleter.Base.prototype.getTokenBounds.getFirstDifferencePos = function(newS, oldS) {
+  var boundary = Math.min(newS.length, oldS.length);
+  for (var index = 0; index < boundary; ++index)
+    if (newS[index] != oldS[index])
+      return index;
+  return boundary;
+};
+
+Ajax.Autocompleter = Class.create(Autocompleter.Base, {
+  initialize: function(element, update, url, options) {
+    this.baseInitialize(element, update, options);
+    this.options.asynchronous  = true;
+    this.options.onComplete    = this.onComplete.bind(this);
+    this.options.defaultParams = this.options.parameters || null;
+    this.url                   = url;
+  },
+
+  getUpdatedChoices: function() {
+    this.startIndicator();
+
+    var entry = encodeURIComponent(this.options.paramName) + '=' +
+      encodeURIComponent(this.getToken());
+
+    this.options.parameters = this.options.callback ?
+      this.options.callback(this.element, entry) : entry;
+
+    if(this.options.defaultParams)
+      this.options.parameters += '&' + this.options.defaultParams;
+
+    new Ajax.Request(this.url, this.options);
+  },
+
+  onComplete: function(request) {
+    this.updateChoices(request.responseText);
+  }
+});
+
+// The local array autocompleter. Used when you'd prefer to
+// inject an array of autocompletion options into the page, rather
+// than sending out Ajax queries, which can be quite slow sometimes.
+//
+// The constructor takes four parameters. The first two are, as usual,
+// the id of the monitored textbox, and id of the autocompletion menu.
+// The third is the array you want to autocomplete from, and the fourth
+// is the options block.
+//
+// Extra local autocompletion options:
+// - choices - How many autocompletion choices to offer
+//
+// - partialSearch - If false, the autocompleter will match entered
+//                    text only at the beginning of strings in the
+//                    autocomplete array. Defaults to true, which will
+//                    match text at the beginning of any *word* in the
+//                    strings in the autocomplete array. If you want to
+//                    search anywhere in the string, additionally set
+//                    the option fullSearch to true (default: off).
+//
+// - fullSsearch - Search anywhere in autocomplete array strings.
+//
+// - partialChars - How many characters to enter before triggering
+//                   a partial match (unlike minChars, which defines
+//                   how many characters are required to do any match
+//                   at all). Defaults to 2.
+//
+// - ignoreCase - Whether to ignore case when autocompleting.
+//                 Defaults to true.
+//
+// It's possible to pass in a custom function as the 'selector'
+// option, if you prefer to write your own autocompletion logic.
+// In that case, the other options above will not apply unless
+// you support them.
+
+Autocompleter.Local = Class.create(Autocompleter.Base, {
+  initialize: function(element, update, array, options) {
+    this.baseInitialize(element, update, options);
+    this.options.array = array;
+  },
+
+  getUpdatedChoices: function() {
+    this.updateChoices(this.options.selector(this));
+  },
+
+  setOptions: function(options) {
+    this.options = Object.extend({
+      choices: 10,
+      partialSearch: true,
+      partialChars: 2,
+      ignoreCase: true,
+      fullSearch: false,
+      selector: function(instance) {
+        var ret       = []; // Beginning matches
+        var partial   = []; // Inside matches
+        var entry     = instance.getToken();
+        var count     = 0;
+
+        for (var i = 0; i < instance.options.array.length &&
+          ret.length < instance.options.choices ; i++) {
+
+          var elem = instance.options.array[i];
+          var foundPos = instance.options.ignoreCase ?
+            elem.toLowerCase().indexOf(entry.toLowerCase()) :
+            elem.indexOf(entry);
+
+          while (foundPos != -1) {
+            if (foundPos == 0 && elem.length != entry.length) {
+              ret.push("<li><strong>" + elem.substr(0, entry.length) + "</strong>" +
+                elem.substr(entry.length) + "</li>");
+              break;
+            } else if (entry.length >= instance.options.partialChars &&
+              instance.options.partialSearch && foundPos != -1) {
+              if (instance.options.fullSearch || /\s/.test(elem.substr(foundPos-1,1))) {
+                partial.push("<li>" + elem.substr(0, foundPos) + "<strong>" +
+                  elem.substr(foundPos, entry.length) + "</strong>" + elem.substr(
+                  foundPos + entry.length) + "</li>");
+                break;
+              }
+            }
+
+            foundPos = instance.options.ignoreCase ?
+              elem.toLowerCase().indexOf(entry.toLowerCase(), foundPos + 1) :
+              elem.indexOf(entry, foundPos + 1);
+
+          }
+        }
+        if (partial.length)
+          ret = ret.concat(partial.slice(0, instance.options.choices - ret.length));
+        return "<ul>" + ret.join('') + "</ul>";
+      }
+    }, options || { });
+  }
+});
+
+// AJAX in-place editor and collection editor
+// Full rewrite by Christophe Porteneuve <tdd@tddsworld.com> (April 2007).
+
+// Use this if you notice weird scrolling problems on some browsers,
+// the DOM might be a bit confused when this gets called so do this
+// waits 1 ms (with setTimeout) until it does the activation
+Field.scrollFreeActivate = function(field) {
+  setTimeout(function() {
+    Field.activate(field);
+  }, 1);
+};
+
+Ajax.InPlaceEditor = Class.create({
+  initialize: function(element, url, options) {
+    this.url = url;
+    this.element = element = $(element);
+    this.prepareOptions();
+    this._controls = { };
+    arguments.callee.dealWithDeprecatedOptions(options); // DEPRECATION LAYER!!!
+    Object.extend(this.options, options || { });
+    if (!this.options.formId && this.element.id) {
+      this.options.formId = this.element.id + '-inplaceeditor';
+      if ($(this.options.formId))
+        this.options.formId = '';
+    }
+    if (this.options.externalControl)
+      this.options.externalControl = $(this.options.externalControl);
+    if (!this.options.externalControl)
+      this.options.externalControlOnly = false;
+    this._originalBackground = this.element.getStyle('background-color') || 'transparent';
+    this.element.title = this.options.clickToEditText;
+    this._boundCancelHandler = this.handleFormCancellation.bind(this);
+    this._boundComplete = (this.options.onComplete || Prototype.emptyFunction).bind(this);
+    this._boundFailureHandler = this.handleAJAXFailure.bind(this);
+    this._boundSubmitHandler = this.handleFormSubmission.bind(this);
+    this._boundWrapperHandler = this.wrapUp.bind(this);
+    this.registerListeners();
+  },
+  checkForEscapeOrReturn: function(e) {
+    if (!this._editing || e.ctrlKey || e.altKey || e.shiftKey) return;
+    if (Event.KEY_ESC == e.keyCode)
+      this.handleFormCancellation(e);
+    else if (Event.KEY_RETURN == e.keyCode)
+      this.handleFormSubmission(e);
+  },
+  createControl: function(mode, handler, extraClasses) {
+    var control = this.options[mode + 'Control'];
+    var text = this.options[mode + 'Text'];
+    if ('button' == control) {
+      var btn = document.createElement('input');
+      btn.type = 'submit';
+      btn.value = text;
+      btn.className = 'editor_' + mode + '_button';
+      if ('cancel' == mode)
+        btn.onclick = this._boundCancelHandler;
+      this._form.appendChild(btn);
+      this._controls[mode] = btn;
+    } else if ('link' == control) {
+      var link = document.createElement('a');
+      link.href = '#';
+      link.appendChild(document.createTextNode(text));
+      link.onclick = 'cancel' == mode ? this._boundCancelHandler : this._boundSubmitHandler;
+      link.className = 'editor_' + mode + '_link';
+      if (extraClasses)
+        link.className += ' ' + extraClasses;
+      this._form.appendChild(link);
+      this._controls[mode] = link;
+    }
+  },
+  createEditField: function() {
+    var text = (this.options.loadTextURL ? this.options.loadingText : this.getText());
+    var fld;
+    if (1 >= this.options.rows && !/\r|\n/.test(this.getText())) {
+      fld = document.createElement('input');
+      fld.type = 'text';
+      var size = this.options.size || this.options.cols || 0;
+      if (0 < size) fld.size = size;
+    } else {
+      fld = document.createElement('textarea');
+      fld.rows = (1 >= this.options.rows ? this.options.autoRows : this.options.rows);
+      fld.cols = this.options.cols || 40;
+    }
+    fld.name = this.options.paramName;
+    fld.value = text; // No HTML breaks conversion anymore
+    fld.className = 'editor_field';
+    if (this.options.submitOnBlur)
+      fld.onblur = this._boundSubmitHandler;
+    this._controls.editor = fld;
+    if (this.options.loadTextURL)
+      this.loadExternalText();
+    this._form.appendChild(this._controls.editor);
+  },
+  createForm: function() {
+    var ipe = this;
+    function addText(mode, condition) {
+      var text = ipe.options['text' + mode + 'Controls'];
+      if (!text || condition === false) return;
+      ipe._form.appendChild(document.createTextNode(text));
+    };
+    this._form = $(document.createElement('form'));
+    this._form.id = this.options.formId;
+    this._form.addClassName(this.options.formClassName);
+    this._form.onsubmit = this._boundSubmitHandler;
+    this.createEditField();
+    if ('textarea' == this._controls.editor.tagName.toLowerCase())
+      this._form.appendChild(document.createElement('br'));
+    if (this.options.onFormCustomization)
+      this.options.onFormCustomization(this, this._form);
+    addText('Before', this.options.okControl || this.options.cancelControl);
+    this.createControl('ok', this._boundSubmitHandler);
+    addText('Between', this.options.okControl && this.options.cancelControl);
+    this.createControl('cancel', this._boundCancelHandler, 'editor_cancel');
+    addText('After', this.options.okControl || this.options.cancelControl);
+  },
+  destroy: function() {
+    if (this._oldInnerHTML)
+      this.element.innerHTML = this._oldInnerHTML;
+    this.leaveEditMode();
+    this.unregisterListeners();
+  },
+  enterEditMode: function(e) {
+    if (this._saving || this._editing) return;
+    this._editing = true;
+    this.triggerCallback('onEnterEditMode');
+    if (this.options.externalControl)
+      this.options.externalControl.hide();
+    this.element.hide();
+    this.createForm();
+    this.element.parentNode.insertBefore(this._form, this.element);
+    if (!this.options.loadTextURL)
+      this.postProcessEditField();
+    if (e) Event.stop(e);
+  },
+  enterHover: function(e) {
+    if (this.options.hoverClassName)
+      this.element.addClassName(this.options.hoverClassName);
+    if (this._saving) return;
+    this.triggerCallback('onEnterHover');
+  },
+  getText: function() {
+    return this.element.innerHTML.unescapeHTML();
+  },
+  handleAJAXFailure: function(transport) {
+    this.triggerCallback('onFailure', transport);
+    if (this._oldInnerHTML) {
+      this.element.innerHTML = this._oldInnerHTML;
+      this._oldInnerHTML = null;
+    }
+  },
+  handleFormCancellation: function(e) {
+    this.wrapUp();
+    if (e) Event.stop(e);
+  },
+  handleFormSubmission: function(e) {
+    var form = this._form;
+    var value = $F(this._controls.editor);
+    this.prepareSubmission();
+    var params = this.options.callback(form, value) || '';
+    if (Object.isString(params))
+      params = params.toQueryParams();
+    params.editorId = this.element.id;
+    if (this.options.htmlResponse) {
+      var options = Object.extend({ evalScripts: true }, this.options.ajaxOptions);
+      Object.extend(options, {
+        parameters: params,
+        onComplete: this._boundWrapperHandler,
+        onFailure: this._boundFailureHandler
+      });
+      new Ajax.Updater({ success: this.element }, this.url, options);
+    } else {
+      var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+      Object.extend(options, {
+        parameters: params,
+        onComplete: this._boundWrapperHandler,
+        onFailure: this._boundFailureHandler
+      });
+      new Ajax.Request(this.url, options);
+    }
+    if (e) Event.stop(e);
+  },
+  leaveEditMode: function() {
+    this.element.removeClassName(this.options.savingClassName);
+    this.removeForm();
+    this.leaveHover();
+    this.element.style.backgroundColor = this._originalBackground;
+    this.element.show();
+    if (this.options.externalControl)
+      this.options.externalControl.show();
+    this._saving = false;
+    this._editing = false;
+    this._oldInnerHTML = null;
+    this.triggerCallback('onLeaveEditMode');
+  },
+  leaveHover: function(e) {
+    if (this.options.hoverClassName)
+      this.element.removeClassName(this.options.hoverClassName);
+    if (this._saving) return;
+    this.triggerCallback('onLeaveHover');
+  },
+  loadExternalText: function() {
+    this._form.addClassName(this.options.loadingClassName);
+    this._controls.editor.disabled = true;
+    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+    Object.extend(options, {
+      parameters: 'editorId=' + encodeURIComponent(this.element.id),
+      onComplete: Prototype.emptyFunction,
+      onSuccess: function(transport) {
+        this._form.removeClassName(this.options.loadingClassName);
+        var text = transport.responseText;
+        if (this.options.stripLoadedTextTags)
+          text = text.stripTags();
+        this._controls.editor.value = text;
+        this._controls.editor.disabled = false;
+        this.postProcessEditField();
+      }.bind(this),
+      onFailure: this._boundFailureHandler
+    });
+    new Ajax.Request(this.options.loadTextURL, options);
+  },
+  postProcessEditField: function() {
+    var fpc = this.options.fieldPostCreation;
+    if (fpc)
+      $(this._controls.editor)['focus' == fpc ? 'focus' : 'activate']();
+  },
+  prepareOptions: function() {
+    this.options = Object.clone(Ajax.InPlaceEditor.DefaultOptions);
+    Object.extend(this.options, Ajax.InPlaceEditor.DefaultCallbacks);
+    [this._extraDefaultOptions].flatten().compact().each(function(defs) {
+      Object.extend(this.options, defs);
+    }.bind(this));
+  },
+  prepareSubmission: function() {
+    this._saving = true;
+    this.removeForm();
+    this.leaveHover();
+    this.showSaving();
+  },
+  registerListeners: function() {
+    this._listeners = { };
+    var listener;
+    $H(Ajax.InPlaceEditor.Listeners).each(function(pair) {
+      listener = this[pair.value].bind(this);
+      this._listeners[pair.key] = listener;
+      if (!this.options.externalControlOnly)
+        this.element.observe(pair.key, listener);
+      if (this.options.externalControl)
+        this.options.externalControl.observe(pair.key, listener);
+    }.bind(this));
+  },
+  removeForm: function() {
+    if (!this._form) return;
+    this._form.remove();
+    this._form = null;
+    this._controls = { };
+  },
+  showSaving: function() {
+    this._oldInnerHTML = this.element.innerHTML;
+    this.element.innerHTML = this.options.savingText;
+    this.element.addClassName(this.options.savingClassName);
+    this.element.style.backgroundColor = this._originalBackground;
+    this.element.show();
+  },
+  triggerCallback: function(cbName, arg) {
+    if ('function' == typeof this.options[cbName]) {
+      this.options[cbName](this, arg);
+    }
+  },
+  unregisterListeners: function() {
+    $H(this._listeners).each(function(pair) {
+      if (!this.options.externalControlOnly)
+        this.element.stopObserving(pair.key, pair.value);
+      if (this.options.externalControl)
+        this.options.externalControl.stopObserving(pair.key, pair.value);
+    }.bind(this));
+  },
+  wrapUp: function(transport) {
+    this.leaveEditMode();
+    // Can't use triggerCallback due to backward compatibility: requires
+    // binding + direct element
+    this._boundComplete(transport, this.element);
+  }
+});
+
+Object.extend(Ajax.InPlaceEditor.prototype, {
+  dispose: Ajax.InPlaceEditor.prototype.destroy
+});
+
+Ajax.InPlaceCollectionEditor = Class.create(Ajax.InPlaceEditor, {
+  initialize: function($super, element, url, options) {
+    this._extraDefaultOptions = Ajax.InPlaceCollectionEditor.DefaultOptions;
+    $super(element, url, options);
+  },
+
+  createEditField: function() {
+    var list = document.createElement('select');
+    list.name = this.options.paramName;
+    list.size = 1;
+    this._controls.editor = list;
+    this._collection = this.options.collection || [];
+    if (this.options.loadCollectionURL)
+      this.loadCollection();
+    else
+      this.checkForExternalText();
+    this._form.appendChild(this._controls.editor);
+  },
+
+  loadCollection: function() {
+    this._form.addClassName(this.options.loadingClassName);
+    this.showLoadingText(this.options.loadingCollectionText);
+    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+    Object.extend(options, {
+      parameters: 'editorId=' + encodeURIComponent(this.element.id),
+      onComplete: Prototype.emptyFunction,
+      onSuccess: function(transport) {
+        var js = transport.responseText.strip();
+        if (!/^\[.*\]$/.test(js)) // TODO: improve sanity check
+          throw('Server returned an invalid collection representation.');
+        this._collection = eval(js);
+        this.checkForExternalText();
+      }.bind(this),
+      onFailure: this.onFailure
+    });
+    new Ajax.Request(this.options.loadCollectionURL, options);
+  },
+
+  showLoadingText: function(text) {
+    this._controls.editor.disabled = true;
+    var tempOption = this._controls.editor.firstChild;
+    if (!tempOption) {
+      tempOption = document.createElement('option');
+      tempOption.value = '';
+      this._controls.editor.appendChild(tempOption);
+      tempOption.selected = true;
+    }
+    tempOption.update((text || '').stripScripts().stripTags());
+  },
+
+  checkForExternalText: function() {
+    this._text = this.getText();
+    if (this.options.loadTextURL)
+      this.loadExternalText();
+    else
+      this.buildOptionList();
+  },
+
+  loadExternalText: function() {
+    this.showLoadingText(this.options.loadingText);
+    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+    Object.extend(options, {
+      parameters: 'editorId=' + encodeURIComponent(this.element.id),
+      onComplete: Prototype.emptyFunction,
+      onSuccess: function(transport) {
+        this._text = transport.responseText.strip();
+        this.buildOptionList();
+      }.bind(this),
+      onFailure: this.onFailure
+    });
+    new Ajax.Request(this.options.loadTextURL, options);
+  },
+
+  buildOptionList: function() {
+    this._form.removeClassName(this.options.loadingClassName);
+    this._collection = this._collection.map(function(entry) {
+      return 2 === entry.length ? entry : [entry, entry].flatten();
+    });
+    var marker = ('value' in this.options) ? this.options.value : this._text;
+    var textFound = this._collection.any(function(entry) {
+      return entry[0] == marker;
+    }.bind(this));
+    this._controls.editor.update('');
+    var option;
+    this._collection.each(function(entry, index) {
+      option = document.createElement('option');
+      option.value = entry[0];
+      option.selected = textFound ? entry[0] == marker : 0 == index;
+      option.appendChild(document.createTextNode(entry[1]));
+      this._controls.editor.appendChild(option);
+    }.bind(this));
+    this._controls.editor.disabled = false;
+    Field.scrollFreeActivate(this._controls.editor);
+  }
+});
+
+//**** DEPRECATION LAYER FOR InPlace[Collection]Editor! ****
+//**** This only  exists for a while,  in order to  let ****
+//**** users adapt to  the new API.  Read up on the new ****
+//**** API and convert your code to it ASAP!            ****
+
+Ajax.InPlaceEditor.prototype.initialize.dealWithDeprecatedOptions = function(options) {
+  if (!options) return;
+  function fallback(name, expr) {
+    if (name in options || expr === undefined) return;
+    options[name] = expr;
+  };
+  fallback('cancelControl', (options.cancelLink ? 'link' : (options.cancelButton ? 'button' :
+    options.cancelLink == options.cancelButton == false ? false : undefined)));
+  fallback('okControl', (options.okLink ? 'link' : (options.okButton ? 'button' :
+    options.okLink == options.okButton == false ? false : undefined)));
+  fallback('highlightColor', options.highlightcolor);
+  fallback('highlightEndColor', options.highlightendcolor);
+};
+
+Object.extend(Ajax.InPlaceEditor, {
+  DefaultOptions: {
+    ajaxOptions: { },
+    autoRows: 3,                                // Use when multi-line w/ rows == 1
+    cancelControl: 'link',                      // 'link'|'button'|false
+    cancelText: 'cancel',
+    clickToEditText: 'Click to edit',
+    externalControl: null,                      // id|elt
+    externalControlOnly: false,
+    fieldPostCreation: 'activate',              // 'activate'|'focus'|false
+    formClassName: 'inplaceeditor-form',
+    formId: null,                               // id|elt
+    highlightColor: '#ffff99',
+    highlightEndColor: '#ffffff',
+    hoverClassName: '',
+    htmlResponse: true,
+    loadingClassName: 'inplaceeditor-loading',
+    loadingText: 'Loading...',
+    okControl: 'button',                        // 'link'|'button'|false
+    okText: 'ok',
+    paramName: 'value',
+    rows: 1,                                    // If 1 and multi-line, uses autoRows
+    savingClassName: 'inplaceeditor-saving',
+    savingText: 'Saving...',
+    size: 0,
+    stripLoadedTextTags: false,
+    submitOnBlur: false,
+    textAfterControls: '',
+    textBeforeControls: '',
+    textBetweenControls: ''
+  },
+  DefaultCallbacks: {
+    callback: function(form) {
+      return Form.serialize(form);
+    },
+    onComplete: function(transport, element) {
+      // For backward compatibility, this one is bound to the IPE, and passes
+      // the element directly.  It was too often customized, so we don't break it.
+      new Effect.Highlight(element, {
+        startcolor: this.options.highlightColor, keepBackgroundImage: true });
+    },
+    onEnterEditMode: null,
+    onEnterHover: function(ipe) {
+      ipe.element.style.backgroundColor = ipe.options.highlightColor;
+      if (ipe._effect)
+        ipe._effect.cancel();
+    },
+    onFailure: function(transport, ipe) {
+      alert('Error communication with the server: ' + transport.responseText.stripTags());
+    },
+    onFormCustomization: null, // Takes the IPE and its generated form, after editor, before controls.
+    onLeaveEditMode: null,
+    onLeaveHover: function(ipe) {
+      ipe._effect = new Effect.Highlight(ipe.element, {
+        startcolor: ipe.options.highlightColor, endcolor: ipe.options.highlightEndColor,
+        restorecolor: ipe._originalBackground, keepBackgroundImage: true
+      });
+    }
+  },
+  Listeners: {
+    click: 'enterEditMode',
+    keydown: 'checkForEscapeOrReturn',
+    mouseover: 'enterHover',
+    mouseout: 'leaveHover'
+  }
+});
+
+Ajax.InPlaceCollectionEditor.DefaultOptions = {
+  loadingCollectionText: 'Loading options...'
+};
+
+// Delayed observer, like Form.Element.Observer,
+// but waits for delay after last key input
+// Ideal for live-search fields
+
+Form.Element.DelayedObserver = Class.create({
+  initialize: function(element, delay, callback) {
+    this.delay     = delay || 0.5;
+    this.element   = $(element);
+    this.callback  = callback;
+    this.timer     = null;
+    this.lastValue = $F(this.element);
+    Event.observe(this.element,'keyup',this.delayedListener.bindAsEventListener(this));
+  },
+  delayedListener: function(event) {
+    if(this.lastValue == $F(this.element)) return;
+    if(this.timer) clearTimeout(this.timer);
+    this.timer = setTimeout(this.onTimerEvent.bind(this), this.delay * 1000);
+    this.lastValue = $F(this.element);
+  },
+  onTimerEvent: function() {
+    this.timer = null;
+    this.callback(this.element, $F(this.element));
+  }
+});
\ No newline at end of file
diff --git a/plugins/sfProtoculousPlugin/web/js/dragdrop.js b/plugins/sfProtoculousPlugin/web/js/dragdrop.js
new file mode 100644
index 000000000..07c98e2bd
--- /dev/null
+++ b/plugins/sfProtoculousPlugin/web/js/dragdrop.js
@@ -0,0 +1,975 @@
+// script.aculo.us dragdrop.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
+
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005-2008 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+if(Object.isUndefined(Effect))
+  throw("dragdrop.js requires including script.aculo.us' effects.js library");
+
+var Droppables = {
+  drops: [],
+
+  remove: function(element) {
+    this.drops = this.drops.reject(function(d) { return d.element==$(element) });
+  },
+
+  add: function(element) {
+    element = $(element);
+    var options = Object.extend({
+      greedy:     true,
+      hoverclass: null,
+      tree:       false
+    }, arguments[1] || { });
+
+    // cache containers
+    if(options.containment) {
+      options._containers = [];
+      var containment = options.containment;
+      if(Object.isArray(containment)) {
+        containment.each( function(c) { options._containers.push($(c)) });
+      } else {
+        options._containers.push($(containment));
+      }
+    }
+
+    if(options.accept) options.accept = [options.accept].flatten();
+
+    Element.makePositioned(element); // fix IE
+    options.element = element;
+
+    this.drops.push(options);
+  },
+
+  findDeepestChild: function(drops) {
+    deepest = drops[0];
+
+    for (i = 1; i < drops.length; ++i)
+      if (Element.isParent(drops[i].element, deepest.element))
+        deepest = drops[i];
+
+    return deepest;
+  },
+
+  isContained: function(element, drop) {
+    var containmentNode;
+    if(drop.tree) {
+      containmentNode = element.treeNode;
+    } else {
+      containmentNode = element.parentNode;
+    }
+    return drop._containers.detect(function(c) { return containmentNode == c });
+  },
+
+  isAffected: function(point, element, drop) {
+    return (
+      (drop.element!=element) &&
+      ((!drop._containers) ||
+        this.isContained(element, drop)) &&
+      ((!drop.accept) ||
+        (Element.classNames(element).detect(
+          function(v) { return drop.accept.include(v) } ) )) &&
+      Position.within(drop.element, point[0], point[1]) );
+  },
+
+  deactivate: function(drop) {
+    if(drop.hoverclass)
+      Element.removeClassName(drop.element, drop.hoverclass);
+    this.last_active = null;
+  },
+
+  activate: function(drop) {
+    if(drop.hoverclass)
+      Element.addClassName(drop.element, drop.hoverclass);
+    this.last_active = drop;
+  },
+
+  show: function(point, element) {
+    if(!this.drops.length) return;
+    var drop, affected = [];
+
+    this.drops.each( function(drop) {
+      if(Droppables.isAffected(point, element, drop))
+        affected.push(drop);
+    });
+
+    if(affected.length>0)
+      drop = Droppables.findDeepestChild(affected);
+
+    if(this.last_active && this.last_active != drop) this.deactivate(this.last_active);
+    if (drop) {
+      Position.within(drop.element, point[0], point[1]);
+      if(drop.onHover)
+        drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));
+
+      if (drop != this.last_active) Droppables.activate(drop);
+    }
+  },
+
+  fire: function(event, element) {
+    if(!this.last_active) return;
+    Position.prepare();
+
+    if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active))
+      if (this.last_active.onDrop) {
+        this.last_active.onDrop(element, this.last_active.element, event);
+        return true;
+      }
+  },
+
+  reset: function() {
+    if(this.last_active)
+      this.deactivate(this.last_active);
+  }
+};
+
+var Draggables = {
+  drags: [],
+  observers: [],
+
+  register: function(draggable) {
+    if(this.drags.length == 0) {
+      this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
+      this.eventMouseMove = this.updateDrag.bindAsEventListener(this);
+      this.eventKeypress  = this.keyPress.bindAsEventListener(this);
+
+      Event.observe(document, "mouseup", this.eventMouseUp);
+      Event.observe(document, "mousemove", this.eventMouseMove);
+      Event.observe(document, "keypress", this.eventKeypress);
+    }
+    this.drags.push(draggable);
+  },
+
+  unregister: function(draggable) {
+    this.drags = this.drags.reject(function(d) { return d==draggable });
+    if(this.drags.length == 0) {
+      Event.stopObserving(document, "mouseup", this.eventMouseUp);
+      Event.stopObserving(document, "mousemove", this.eventMouseMove);
+      Event.stopObserving(document, "keypress", this.eventKeypress);
+    }
+  },
+
+  activate: function(draggable) {
+    if(draggable.options.delay) {
+      this._timeout = setTimeout(function() {
+        Draggables._timeout = null;
+        window.focus();
+        Draggables.activeDraggable = draggable;
+      }.bind(this), draggable.options.delay);
+    } else {
+      window.focus(); // allows keypress events if window isn't currently focused, fails for Safari
+      this.activeDraggable = draggable;
+    }
+  },
+
+  deactivate: function() {
+    this.activeDraggable = null;
+  },
+
+  updateDrag: function(event) {
+    if(!this.activeDraggable) return;
+    var pointer = [Event.pointerX(event), Event.pointerY(event)];
+    // Mozilla-based browsers fire successive mousemove events with
+    // the same coordinates, prevent needless redrawing (moz bug?)
+    if(this._lastPointer && (this._lastPointer.inspect() == pointer.inspect())) return;
+    this._lastPointer = pointer;
+
+    this.activeDraggable.updateDrag(event, pointer);
+  },
+
+  endDrag: function(event) {
+    if(this._timeout) {
+      clearTimeout(this._timeout);
+      this._timeout = null;
+    }
+    if(!this.activeDraggable) return;
+    this._lastPointer = null;
+    this.activeDraggable.endDrag(event);
+    this.activeDraggable = null;
+  },
+
+  keyPress: function(event) {
+    if(this.activeDraggable)
+      this.activeDraggable.keyPress(event);
+  },
+
+  addObserver: function(observer) {
+    this.observers.push(observer);
+    this._cacheObserverCallbacks();
+  },
+
+  removeObserver: function(element) {  // element instead of observer fixes mem leaks
+    this.observers = this.observers.reject( function(o) { return o.element==element });
+    this._cacheObserverCallbacks();
+  },
+
+  notify: function(eventName, draggable, event) {  // 'onStart', 'onEnd', 'onDrag'
+    if(this[eventName+'Count'] > 0)
+      this.observers.each( function(o) {
+        if(o[eventName]) o[eventName](eventName, draggable, event);
+      });
+    if(draggable.options[eventName]) draggable.options[eventName](draggable, event);
+  },
+
+  _cacheObserverCallbacks: function() {
+    ['onStart','onEnd','onDrag'].each( function(eventName) {
+      Draggables[eventName+'Count'] = Draggables.observers.select(
+        function(o) { return o[eventName]; }
+      ).length;
+    });
+  }
+};
+
+/*--------------------------------------------------------------------------*/
+
+var Draggable = Class.create({
+  initialize: function(element) {
+    var defaults = {
+      handle: false,
+      reverteffect: function(element, top_offset, left_offset) {
+        var dur = Math.sqrt(Math.abs(top_offset^2)+Math.abs(left_offset^2))*0.02;
+        new Effect.Move(element, { x: -left_offset, y: -top_offset, duration: dur,
+          queue: {scope:'_draggable', position:'end'}
+        });
+      },
+      endeffect: function(element) {
+        var toOpacity = Object.isNumber(element._opacity) ? element._opacity : 1.0;
+        new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity,
+          queue: {scope:'_draggable', position:'end'},
+          afterFinish: function(){
+            Draggable._dragging[element] = false
+          }
+        });
+      },
+      zindex: 1000,
+      revert: false,
+      quiet: false,
+      scroll: false,
+      scrollSensitivity: 20,
+      scrollSpeed: 15,
+      snap: false,  // false, or xy or [x,y] or function(x,y){ return [x,y] }
+      delay: 0
+    };
+
+    if(!arguments[1] || Object.isUndefined(arguments[1].endeffect))
+      Object.extend(defaults, {
+        starteffect: function(element) {
+          element._opacity = Element.getOpacity(element);
+          Draggable._dragging[element] = true;
+          new Effect.Opacity(element, {duration:0.2, from:element._opacity, to:0.7});
+        }
+      });
+
+    var options = Object.extend(defaults, arguments[1] || { });
+
+    this.element = $(element);
+
+    if(options.handle && Object.isString(options.handle))
+      this.handle = this.element.down('.'+options.handle, 0);
+
+    if(!this.handle) this.handle = $(options.handle);
+    if(!this.handle) this.handle = this.element;
+
+    if(options.scroll && !options.scroll.scrollTo && !options.scroll.outerHTML) {
+      options.scroll = $(options.scroll);
+      this._isScrollChild = Element.childOf(this.element, options.scroll);
+    }
+
+    Element.makePositioned(this.element); // fix IE
+
+    this.options  = options;
+    this.dragging = false;
+
+    this.eventMouseDown = this.initDrag.bindAsEventListener(this);
+    Event.observe(this.handle, "mousedown", this.eventMouseDown);
+
+    Draggables.register(this);
+  },
+
+  destroy: function() {
+    Event.stopObserving(this.handle, "mousedown", this.eventMouseDown);
+    Draggables.unregister(this);
+  },
+
+  currentDelta: function() {
+    return([
+      parseInt(Element.getStyle(this.element,'left') || '0'),
+      parseInt(Element.getStyle(this.element,'top') || '0')]);
+  },
+
+  initDrag: function(event) {
+    if(!Object.isUndefined(Draggable._dragging[this.element]) &&
+      Draggable._dragging[this.element]) return;
+    if(Event.isLeftClick(event)) {
+      // abort on form elements, fixes a Firefox issue
+      var src = Event.element(event);
+      if((tag_name = src.tagName.toUpperCase()) && (
+        tag_name=='INPUT' ||
+        tag_name=='SELECT' ||
+        tag_name=='OPTION' ||
+        tag_name=='BUTTON' ||
+        tag_name=='TEXTAREA')) return;
+
+      var pointer = [Event.pointerX(event), Event.pointerY(event)];
+      var pos     = Position.cumulativeOffset(this.element);
+      this.offset = [0,1].map( function(i) { return (pointer[i] - pos[i]) });
+
+      Draggables.activate(this);
+      Event.stop(event);
+    }
+  },
+
+  startDrag: function(event) {
+    this.dragging = true;
+    if(!this.delta)
+      this.delta = this.currentDelta();
+
+    if(this.options.zindex) {
+      this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
+      this.element.style.zIndex = this.options.zindex;
+    }
+
+    if(this.options.ghosting) {
+      this._clone = this.element.cloneNode(true);
+      this._originallyAbsolute = (this.element.getStyle('position') == 'absolute');
+      if (!this._originallyAbsolute)
+        Position.absolutize(this.element);
+      this.element.parentNode.insertBefore(this._clone, this.element);
+    }
+
+    if(this.options.scroll) {
+      if (this.options.scroll == window) {
+        var where = this._getWindowScroll(this.options.scroll);
+        this.originalScrollLeft = where.left;
+        this.originalScrollTop = where.top;
+      } else {
+        this.originalScrollLeft = this.options.scroll.scrollLeft;
+        this.originalScrollTop = this.options.scroll.scrollTop;
+      }
+    }
+
+    Draggables.notify('onStart', this, event);
+
+    if(this.options.starteffect) this.options.starteffect(this.element);
+  },
+
+  updateDrag: function(event, pointer) {
+    if(!this.dragging) this.startDrag(event);
+
+    if(!this.options.quiet){
+      Position.prepare();
+      Droppables.show(pointer, this.element);
+    }
+
+    Draggables.notify('onDrag', this, event);
+
+    this.draw(pointer);
+    if(this.options.change) this.options.change(this);
+
+    if(this.options.scroll) {
+      this.stopScrolling();
+
+      var p;
+      if (this.options.scroll == window) {
+        with(this._getWindowScroll(this.options.scroll)) { p = [ left, top, left+width, top+height ]; }
+      } else {
+        p = Position.page(this.options.scroll);
+        p[0] += this.options.scroll.scrollLeft + Position.deltaX;
+        p[1] += this.options.scroll.scrollTop + Position.deltaY;
+        p.push(p[0]+this.options.scroll.offsetWidth);
+        p.push(p[1]+this.options.scroll.offsetHeight);
+      }
+      var speed = [0,0];
+      if(pointer[0] < (p[0]+this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[0]+this.options.scrollSensitivity);
+      if(pointer[1] < (p[1]+this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[1]+this.options.scrollSensitivity);
+      if(pointer[0] > (p[2]-this.options.scrollSensitivity)) speed[0] = pointer[0]-(p[2]-this.options.scrollSensitivity);
+      if(pointer[1] > (p[3]-this.options.scrollSensitivity)) speed[1] = pointer[1]-(p[3]-this.options.scrollSensitivity);
+      this.startScrolling(speed);
+    }
+
+    // fix AppleWebKit rendering
+    if(Prototype.Browser.WebKit) window.scrollBy(0,0);
+
+    Event.stop(event);
+  },
+
+  finishDrag: function(event, success) {
+    this.dragging = false;
+
+    if(this.options.quiet){
+      Position.prepare();
+      var pointer = [Event.pointerX(event), Event.pointerY(event)];
+      Droppables.show(pointer, this.element);
+    }
+
+    if(this.options.ghosting) {
+      if (!this._originallyAbsolute)
+        Position.relativize(this.element);
+      delete this._originallyAbsolute;
+      Element.remove(this._clone);
+      this._clone = null;
+    }
+
+    var dropped = false;
+    if(success) {
+      dropped = Droppables.fire(event, this.element);
+      if (!dropped) dropped = false;
+    }
+    if(dropped && this.options.onDropped) this.options.onDropped(this.element);
+    Draggables.notify('onEnd', this, event);
+
+    var revert = this.options.revert;
+    if(revert && Object.isFunction(revert)) revert = revert(this.element);
+
+    var d = this.currentDelta();
+    if(revert && this.options.reverteffect) {
+      if (dropped == 0 || revert != 'failure')
+        this.options.reverteffect(this.element,
+          d[1]-this.delta[1], d[0]-this.delta[0]);
+    } else {
+      this.delta = d;
+    }
+
+    if(this.options.zindex)
+      this.element.style.zIndex = this.originalZ;
+
+    if(this.options.endeffect)
+      this.options.endeffect(this.element);
+
+    Draggables.deactivate(this);
+    Droppables.reset();
+  },
+
+  keyPress: function(event) {
+    if(event.keyCode!=Event.KEY_ESC) return;
+    this.finishDrag(event, false);
+    Event.stop(event);
+  },
+
+  endDrag: function(event) {
+    if(!this.dragging) return;
+    this.stopScrolling();
+    this.finishDrag(event, true);
+    Event.stop(event);
+  },
+
+  draw: function(point) {
+    var pos = Position.cumulativeOffset(this.element);
+    if(this.options.ghosting) {
+      var r   = Position.realOffset(this.element);
+      pos[0] += r[0] - Position.deltaX; pos[1] += r[1] - Position.deltaY;
+    }
+
+    var d = this.currentDelta();
+    pos[0] -= d[0]; pos[1] -= d[1];
+
+    if(this.options.scroll && (this.options.scroll != window && this._isScrollChild)) {
+      pos[0] -= this.options.scroll.scrollLeft-this.originalScrollLeft;
+      pos[1] -= this.options.scroll.scrollTop-this.originalScrollTop;
+    }
+
+    var p = [0,1].map(function(i){
+      return (point[i]-pos[i]-this.offset[i])
+    }.bind(this));
+
+    if(this.options.snap) {
+      if(Object.isFunction(this.options.snap)) {
+        p = this.options.snap(p[0],p[1],this);
+      } else {
+      if(Object.isArray(this.options.snap)) {
+        p = p.map( function(v, i) {
+          return (v/this.options.snap[i]).round()*this.options.snap[i] }.bind(this));
+      } else {
+        p = p.map( function(v) {
+          return (v/this.options.snap).round()*this.options.snap }.bind(this));
+      }
+    }}
+
+    var style = this.element.style;
+    if((!this.options.constraint) || (this.options.constraint=='horizontal'))
+      style.left = p[0] + "px";
+    if((!this.options.constraint) || (this.options.constraint=='vertical'))
+      style.top  = p[1] + "px";
+
+    if(style.visibility=="hidden") style.visibility = ""; // fix gecko rendering
+  },
+
+  stopScrolling: function() {
+    if(this.scrollInterval) {
+      clearInterval(this.scrollInterval);
+      this.scrollInterval = null;
+      Draggables._lastScrollPointer = null;
+    }
+  },
+
+  startScrolling: function(speed) {
+    if(!(speed[0] || speed[1])) return;
+    this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed];
+    this.lastScrolled = new Date();
+    this.scrollInterval = setInterval(this.scroll.bind(this), 10);
+  },
+
+  scroll: function() {
+    var current = new Date();
+    var delta = current - this.lastScrolled;
+    this.lastScrolled = current;
+    if(this.options.scroll == window) {
+      with (this._getWindowScroll(this.options.scroll)) {
+        if (this.scrollSpeed[0] || this.scrollSpeed[1]) {
+          var d = delta / 1000;
+          this.options.scroll.scrollTo( left + d*this.scrollSpeed[0], top + d*this.scrollSpeed[1] );
+        }
+      }
+    } else {
+      this.options.scroll.scrollLeft += this.scrollSpeed[0] * delta / 1000;
+      this.options.scroll.scrollTop  += this.scrollSpeed[1] * delta / 1000;
+    }
+
+    Position.prepare();
+    Droppables.show(Draggables._lastPointer, this.element);
+    Draggables.notify('onDrag', this);
+    if (this._isScrollChild) {
+      Draggables._lastScrollPointer = Draggables._lastScrollPointer || $A(Draggables._lastPointer);
+      Draggables._lastScrollPointer[0] += this.scrollSpeed[0] * delta / 1000;
+      Draggables._lastScrollPointer[1] += this.scrollSpeed[1] * delta / 1000;
+      if (Draggables._lastScrollPointer[0] < 0)
+        Draggables._lastScrollPointer[0] = 0;
+      if (Draggables._lastScrollPointer[1] < 0)
+        Draggables._lastScrollPointer[1] = 0;
+      this.draw(Draggables._lastScrollPointer);
+    }
+
+    if(this.options.change) this.options.change(this);
+  },
+
+  _getWindowScroll: function(w) {
+    var T, L, W, H;
+    with (w.document) {
+      if (w.document.documentElement && documentElement.scrollTop) {
+        T = documentElement.scrollTop;
+        L = documentElement.scrollLeft;
+      } else if (w.document.body) {
+        T = body.scrollTop;
+        L = body.scrollLeft;
+      }
+      if (w.innerWidth) {
+        W = w.innerWidth;
+        H = w.innerHeight;
+      } else if (w.document.documentElement && documentElement.clientWidth) {
+        W = documentElement.clientWidth;
+        H = documentElement.clientHeight;
+      } else {
+        W = body.offsetWidth;
+        H = body.offsetHeight;
+      }
+    }
+    return { top: T, left: L, width: W, height: H };
+  }
+});
+
+Draggable._dragging = { };
+
+/*--------------------------------------------------------------------------*/
+
+var SortableObserver = Class.create({
+  initialize: function(element, observer) {
+    this.element   = $(element);
+    this.observer  = observer;
+    this.lastValue = Sortable.serialize(this.element);
+  },
+
+  onStart: function() {
+    this.lastValue = Sortable.serialize(this.element);
+  },
+
+  onEnd: function() {
+    Sortable.unmark();
+    if(this.lastValue != Sortable.serialize(this.element))
+      this.observer(this.element)
+  }
+});
+
+var Sortable = {
+  SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/,
+
+  sortables: { },
+
+  _findRootElement: function(element) {
+    while (element.tagName.toUpperCase() != "BODY") {
+      if(element.id && Sortable.sortables[element.id]) return element;
+      element = element.parentNode;
+    }
+  },
+
+  options: function(element) {
+    element = Sortable._findRootElement($(element));
+    if(!element) return;
+    return Sortable.sortables[element.id];
+  },
+
+  destroy: function(element){
+    element = $(element);
+    var s = Sortable.sortables[element.id];
+
+    if(s) {
+      Draggables.removeObserver(s.element);
+      s.droppables.each(function(d){ Droppables.remove(d) });
+      s.draggables.invoke('destroy');
+
+      delete Sortable.sortables[s.element.id];
+    }
+  },
+
+  create: function(element) {
+    element = $(element);
+    var options = Object.extend({
+      element:     element,
+      tag:         'li',       // assumes li children, override with tag: 'tagname'
+      dropOnEmpty: false,
+      tree:        false,
+      treeTag:     'ul',
+      overlap:     'vertical', // one of 'vertical', 'horizontal'
+      constraint:  'vertical', // one of 'vertical', 'horizontal', false
+      containment: element,    // also takes array of elements (or id's); or false
+      handle:      false,      // or a CSS class
+      only:        false,
+      delay:       0,
+      hoverclass:  null,
+      ghosting:    false,
+      quiet:       false,
+      scroll:      false,
+      scrollSensitivity: 20,
+      scrollSpeed: 15,
+      format:      this.SERIALIZE_RULE,
+
+      // these take arrays of elements or ids and can be
+      // used for better initialization performance
+      elements:    false,
+      handles:     false,
+
+      onChange:    Prototype.emptyFunction,
+      onUpdate:    Prototype.emptyFunction
+    }, arguments[1] || { });
+
+    // clear any old sortable with same element
+    this.destroy(element);
+
+    // build options for the draggables
+    var options_for_draggable = {
+      revert:      true,
+      quiet:       options.quiet,
+      scroll:      options.scroll,
+      scrollSpeed: options.scrollSpeed,
+      scrollSensitivity: options.scrollSensitivity,
+      delay:       options.delay,
+      ghosting:    options.ghosting,
+      constraint:  options.constraint,
+      handle:      options.handle };
+
+    if(options.starteffect)
+      options_for_draggable.starteffect = options.starteffect;
+
+    if(options.reverteffect)
+      options_for_draggable.reverteffect = options.reverteffect;
+    else
+      if(options.ghosting) options_for_draggable.reverteffect = function(element) {
+        element.style.top  = 0;
+        element.style.left = 0;
+      };
+
+    if(options.endeffect)
+      options_for_draggable.endeffect = options.endeffect;
+
+    if(options.zindex)
+      options_for_draggable.zindex = options.zindex;
+
+    // build options for the droppables
+    var options_for_droppable = {
+      overlap:     options.overlap,
+      containment: options.containment,
+      tree:        options.tree,
+      hoverclass:  options.hoverclass,
+      onHover:     Sortable.onHover
+    };
+
+    var options_for_tree = {
+      onHover:      Sortable.onEmptyHover,
+      overlap:      options.overlap,
+      containment:  options.containment,
+      hoverclass:   options.hoverclass
+    };
+
+    // fix for gecko engine
+    Element.cleanWhitespace(element);
+
+    options.draggables = [];
+    options.droppables = [];
+
+    // drop on empty handling
+    if(options.dropOnEmpty || options.tree) {
+      Droppables.add(element, options_for_tree);
+      options.droppables.push(element);
+    }
+
+    (options.elements || this.findElements(element, options) || []).each( function(e,i) {
+      var handle = options.handles ? $(options.handles[i]) :
+        (options.handle ? $(e).select('.' + options.handle)[0] : e);
+      options.draggables.push(
+        new Draggable(e, Object.extend(options_for_draggable, { handle: handle })));
+      Droppables.add(e, options_for_droppable);
+      if(options.tree) e.treeNode = element;
+      options.droppables.push(e);
+    });
+
+    if(options.tree) {
+      (Sortable.findTreeElements(element, options) || []).each( function(e) {
+        Droppables.add(e, options_for_tree);
+        e.treeNode = element;
+        options.droppables.push(e);
+      });
+    }
+
+    // keep reference
+    this.sortables[element.id] = options;
+
+    // for onupdate
+    Draggables.addObserver(new SortableObserver(element, options.onUpdate));
+
+  },
+
+  // return all suitable-for-sortable elements in a guaranteed order
+  findElements: function(element, options) {
+    return Element.findChildren(
+      element, options.only, options.tree ? true : false, options.tag);
+  },
+
+  findTreeElements: function(element, options) {
+    return Element.findChildren(
+      element, options.only, options.tree ? true : false, options.treeTag);
+  },
+
+  onHover: function(element, dropon, overlap) {
+    if(Element.isParent(dropon, element)) return;
+
+    if(overlap > .33 && overlap < .66 && Sortable.options(dropon).tree) {
+      return;
+    } else if(overlap>0.5) {
+      Sortable.mark(dropon, 'before');
+      if(dropon.previousSibling != element) {
+        var oldParentNode = element.parentNode;
+        element.style.visibility = "hidden"; // fix gecko rendering
+        dropon.parentNode.insertBefore(element, dropon);
+        if(dropon.parentNode!=oldParentNode)
+          Sortable.options(oldParentNode).onChange(element);
+        Sortable.options(dropon.parentNode).onChange(element);
+      }
+    } else {
+      Sortable.mark(dropon, 'after');
+      var nextElement = dropon.nextSibling || null;
+      if(nextElement != element) {
+        var oldParentNode = element.parentNode;
+        element.style.visibility = "hidden"; // fix gecko rendering
+        dropon.parentNode.insertBefore(element, nextElement);
+        if(dropon.parentNode!=oldParentNode)
+          Sortable.options(oldParentNode).onChange(element);
+        Sortable.options(dropon.parentNode).onChange(element);
+      }
+    }
+  },
+
+  onEmptyHover: function(element, dropon, overlap) {
+    var oldParentNode = element.parentNode;
+    var droponOptions = Sortable.options(dropon);
+
+    if(!Element.isParent(dropon, element)) {
+      var index;
+
+      var children = Sortable.findElements(dropon, {tag: droponOptions.tag, only: droponOptions.only});
+      var child = null;
+
+      if(children) {
+        var offset = Element.offsetSize(dropon, droponOptions.overlap) * (1.0 - overlap);
+
+        for (index = 0; index < children.length; index += 1) {
+          if (offset - Element.offsetSize (children[index], droponOptions.overlap) >= 0) {
+            offset -= Element.offsetSize (children[index], droponOptions.overlap);
+          } else if (offset - (Element.offsetSize (children[index], droponOptions.overlap) / 2) >= 0) {
+            child = index + 1 < children.length ? children[index + 1] : null;
+            break;
+          } else {
+            child = children[index];
+            break;
+          }
+        }
+      }
+
+      dropon.insertBefore(element, child);
+
+      Sortable.options(oldParentNode).onChange(element);
+      droponOptions.onChange(element);
+    }
+  },
+
+  unmark: function() {
+    if(Sortable._marker) Sortable._marker.hide();
+  },
+
+  mark: function(dropon, position) {
+    // mark on ghosting only
+    var sortable = Sortable.options(dropon.parentNode);
+    if(sortable && !sortable.ghosting) return;
+
+    if(!Sortable._marker) {
+      Sortable._marker =
+        ($('dropmarker') || Element.extend(document.createElement('DIV'))).
+          hide().addClassName('dropmarker').setStyle({position:'absolute'});
+      document.getElementsByTagName("body").item(0).appendChild(Sortable._marker);
+    }
+    var offsets = Position.cumulativeOffset(dropon);
+    Sortable._marker.setStyle({left: offsets[0]+'px', top: offsets[1] + 'px'});
+
+    if(position=='after')
+      if(sortable.overlap == 'horizontal')
+        Sortable._marker.setStyle({left: (offsets[0]+dropon.clientWidth) + 'px'});
+      else
+        Sortable._marker.setStyle({top: (offsets[1]+dropon.clientHeight) + 'px'});
+
+    Sortable._marker.show();
+  },
+
+  _tree: function(element, options, parent) {
+    var children = Sortable.findElements(element, options) || [];
+
+    for (var i = 0; i < children.length; ++i) {
+      var match = children[i].id.match(options.format);
+
+      if (!match) continue;
+
+      var child = {
+        id: encodeURIComponent(match ? match[1] : null),
+        element: element,
+        parent: parent,
+        children: [],
+        position: parent.children.length,
+        container: $(children[i]).down(options.treeTag)
+      };
+
+      /* Get the element containing the children and recurse over it */
+      if (child.container)
+        this._tree(child.container, options, child);
+
+      parent.children.push (child);
+    }
+
+    return parent;
+  },
+
+  tree: function(element) {
+    element = $(element);
+    var sortableOptions = this.options(element);
+    var options = Object.extend({
+      tag: sortableOptions.tag,
+      treeTag: sortableOptions.treeTag,
+      only: sortableOptions.only,
+      name: element.id,
+      format: sortableOptions.format
+    }, arguments[1] || { });
+
+    var root = {
+      id: null,
+      parent: null,
+      children: [],
+      container: element,
+      position: 0
+    };
+
+    return Sortable._tree(element, options, root);
+  },
+
+  /* Construct a [i] index for a particular node */
+  _constructIndex: function(node) {
+    var index = '';
+    do {
+      if (node.id) index = '[' + node.position + ']' + index;
+    } while ((node = node.parent) != null);
+    return index;
+  },
+
+  sequence: function(element) {
+    element = $(element);
+    var options = Object.extend(this.options(element), arguments[1] || { });
+
+    return $(this.findElements(element, options) || []).map( function(item) {
+      return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
+    });
+  },
+
+  setSequence: function(element, new_sequence) {
+    element = $(element);
+    var options = Object.extend(this.options(element), arguments[2] || { });
+
+    var nodeMap = { };
+    this.findElements(element, options).each( function(n) {
+        if (n.id.match(options.format))
+            nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode];
+        n.parentNode.removeChild(n);
+    });
+
+    new_sequence.each(function(ident) {
+      var n = nodeMap[ident];
+      if (n) {
+        n[1].appendChild(n[0]);
+        delete nodeMap[ident];
+      }
+    });
+  },
+
+  serialize: function(element) {
+    element = $(element);
+    var options = Object.extend(Sortable.options(element), arguments[1] || { });
+    var name = encodeURIComponent(
+      (arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
+
+    if (options.tree) {
+      return Sortable.tree(element, arguments[1]).children.map( function (item) {
+        return [name + Sortable._constructIndex(item) + "[id]=" +
+                encodeURIComponent(item.id)].concat(item.children.map(arguments.callee));
+      }).flatten().join('&');
+    } else {
+      return Sortable.sequence(element, arguments[1]).map( function(item) {
+        return name + "[]=" + encodeURIComponent(item);
+      }).join('&');
+    }
+  }
+};
+
+// Returns true if child is contained within element
+Element.isParent = function(child, element) {
+  if (!child.parentNode || child == element) return false;
+  if (child.parentNode == element) return true;
+  return Element.isParent(child.parentNode, element);
+};
+
+Element.findChildren = function(element, only, recursive, tagName) {
+  if(!element.hasChildNodes()) return null;
+  tagName = tagName.toUpperCase();
+  if(only) only = [only].flatten();
+  var elements = [];
+  $A(element.childNodes).each( function(e) {
+    if(e.tagName && e.tagName.toUpperCase()==tagName &&
+      (!only || (Element.classNames(e).detect(function(v) { return only.include(v) }))))
+        elements.push(e);
+    if(recursive) {
+      var grandchildren = Element.findChildren(e, only, recursive, tagName);
+      if(grandchildren) elements.push(grandchildren);
+    }
+  });
+
+  return (elements.length>0 ? elements.flatten() : []);
+};
+
+Element.offsetSize = function (element, type) {
+  return element['offset' + ((type=='vertical' || type=='height') ? 'Height' : 'Width')];
+};
\ No newline at end of file
diff --git a/plugins/sfProtoculousPlugin/web/js/effects.js b/plugins/sfProtoculousPlugin/web/js/effects.js
new file mode 100644
index 000000000..f31a81a00
--- /dev/null
+++ b/plugins/sfProtoculousPlugin/web/js/effects.js
@@ -0,0 +1,1130 @@
+// script.aculo.us effects.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
+
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// Contributors:
+//  Justin Palmer (http://encytemedia.com/)
+//  Mark Pilgrim (http://diveintomark.org/)
+//  Martin Bialasinki
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+// converts rgb() and #xxx to #xxxxxx format,
+// returns self (or first argument) if not convertable
+String.prototype.parseColor = function() {
+  var color = '#';
+  if (this.slice(0,4) == 'rgb(') {
+    var cols = this.slice(4,this.length-1).split(',');
+    var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3);
+  } else {
+    if (this.slice(0,1) == '#') {
+      if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase();
+      if (this.length==7) color = this.toLowerCase();
+    }
+  }
+  return (color.length==7 ? color : (arguments[0] || this));
+};
+
+/*--------------------------------------------------------------------------*/
+
+Element.collectTextNodes = function(element) {
+  return $A($(element).childNodes).collect( function(node) {
+    return (node.nodeType==3 ? node.nodeValue :
+      (node.hasChildNodes() ? Element.collectTextNodes(node) : ''));
+  }).flatten().join('');
+};
+
+Element.collectTextNodesIgnoreClass = function(element, className) {
+  return $A($(element).childNodes).collect( function(node) {
+    return (node.nodeType==3 ? node.nodeValue :
+      ((node.hasChildNodes() && !Element.hasClassName(node,className)) ?
+        Element.collectTextNodesIgnoreClass(node, className) : ''));
+  }).flatten().join('');
+};
+
+Element.setContentZoom = function(element, percent) {
+  element = $(element);
+  element.setStyle({fontSize: (percent/100) + 'em'});
+  if (Prototype.Browser.WebKit) window.scrollBy(0,0);
+  return element;
+};
+
+Element.getInlineOpacity = function(element){
+  return $(element).style.opacity || '';
+};
+
+Element.forceRerendering = function(element) {
+  try {
+    element = $(element);
+    var n = document.createTextNode(' ');
+    element.appendChild(n);
+    element.removeChild(n);
+  } catch(e) { }
+};
+
+/*--------------------------------------------------------------------------*/
+
+var Effect = {
+  _elementDoesNotExistError: {
+    name: 'ElementDoesNotExistError',
+    message: 'The specified DOM element does not exist, but is required for this effect to operate'
+  },
+  Transitions: {
+    linear: Prototype.K,
+    sinoidal: function(pos) {
+      return (-Math.cos(pos*Math.PI)/2) + .5;
+    },
+    reverse: function(pos) {
+      return 1-pos;
+    },
+    flicker: function(pos) {
+      var pos = ((-Math.cos(pos*Math.PI)/4) + .75) + Math.random()/4;
+      return pos > 1 ? 1 : pos;
+    },
+    wobble: function(pos) {
+      return (-Math.cos(pos*Math.PI*(9*pos))/2) + .5;
+    },
+    pulse: function(pos, pulses) {
+      return (-Math.cos((pos*((pulses||5)-.5)*2)*Math.PI)/2) + .5;
+    },
+    spring: function(pos) {
+      return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6));
+    },
+    none: function(pos) {
+      return 0;
+    },
+    full: function(pos) {
+      return 1;
+    }
+  },
+  DefaultOptions: {
+    duration:   1.0,   // seconds
+    fps:        100,   // 100= assume 66fps max.
+    sync:       false, // true for combining
+    from:       0.0,
+    to:         1.0,
+    delay:      0.0,
+    queue:      'parallel'
+  },
+  tagifyText: function(element) {
+    var tagifyStyle = 'position:relative';
+    if (Prototype.Browser.IE) tagifyStyle += ';zoom:1';
+
+    element = $(element);
+    $A(element.childNodes).each( function(child) {
+      if (child.nodeType==3) {
+        child.nodeValue.toArray().each( function(character) {
+          element.insertBefore(
+            new Element('span', {style: tagifyStyle}).update(
+              character == ' ' ? String.fromCharCode(160) : character),
+              child);
+        });
+        Element.remove(child);
+      }
+    });
+  },
+  multiple: function(element, effect) {
+    var elements;
+    if (((typeof element == 'object') ||
+        Object.isFunction(element)) &&
+       (element.length))
+      elements = element;
+    else
+      elements = $(element).childNodes;
+
+    var options = Object.extend({
+      speed: 0.1,
+      delay: 0.0
+    }, arguments[2] || { });
+    var masterDelay = options.delay;
+
+    $A(elements).each( function(element, index) {
+      new effect(element, Object.extend(options, { delay: index * options.speed + masterDelay }));
+    });
+  },
+  PAIRS: {
+    'slide':  ['SlideDown','SlideUp'],
+    'blind':  ['BlindDown','BlindUp'],
+    'appear': ['Appear','Fade']
+  },
+  toggle: function(element, effect) {
+    element = $(element);
+    effect = (effect || 'appear').toLowerCase();
+    var options = Object.extend({
+      queue: { position:'end', scope:(element.id || 'global'), limit: 1 }
+    }, arguments[2] || { });
+    Effect[element.visible() ?
+      Effect.PAIRS[effect][1] : Effect.PAIRS[effect][0]](element, options);
+  }
+};
+
+Effect.DefaultOptions.transition = Effect.Transitions.sinoidal;
+
+/* ------------- core effects ------------- */
+
+Effect.ScopedQueue = Class.create(Enumerable, {
+  initialize: function() {
+    this.effects  = [];
+    this.interval = null;
+  },
+  _each: function(iterator) {
+    this.effects._each(iterator);
+  },
+  add: function(effect) {
+    var timestamp = new Date().getTime();
+
+    var position = Object.isString(effect.options.queue) ?
+      effect.options.queue : effect.options.queue.position;
+
+    switch(position) {
+      case 'front':
+        // move unstarted effects after this effect
+        this.effects.findAll(function(e){ return e.state=='idle' }).each( function(e) {
+            e.startOn  += effect.finishOn;
+            e.finishOn += effect.finishOn;
+          });
+        break;
+      case 'with-last':
+        timestamp = this.effects.pluck('startOn').max() || timestamp;
+        break;
+      case 'end':
+        // start effect after last queued effect has finished
+        timestamp = this.effects.pluck('finishOn').max() || timestamp;
+        break;
+    }
+
+    effect.startOn  += timestamp;
+    effect.finishOn += timestamp;
+
+    if (!effect.options.queue.limit || (this.effects.length < effect.options.queue.limit))
+      this.effects.push(effect);
+
+    if (!this.interval)
+      this.interval = setInterval(this.loop.bind(this), 15);
+  },
+  remove: function(effect) {
+    this.effects = this.effects.reject(function(e) { return e==effect });
+    if (this.effects.length == 0) {
+      clearInterval(this.interval);
+      this.interval = null;
+    }
+  },
+  loop: function() {
+    var timePos = new Date().getTime();
+    for(var i=0, len=this.effects.length;i<len;i++)
+      this.effects[i] && this.effects[i].loop(timePos);
+  }
+});
+
+Effect.Queues = {
+  instances: $H(),
+  get: function(queueName) {
+    if (!Object.isString(queueName)) return queueName;
+
+    return this.instances.get(queueName) ||
+      this.instances.set(queueName, new Effect.ScopedQueue());
+  }
+};
+Effect.Queue = Effect.Queues.get('global');
+
+Effect.Base = Class.create({
+  position: null,
+  start: function(options) {
+    function codeForEvent(options,eventName){
+      return (
+        (options[eventName+'Internal'] ? 'this.options.'+eventName+'Internal(this);' : '') +
+        (options[eventName] ? 'this.options.'+eventName+'(this);' : '')
+      );
+    }
+    if (options && options.transition === false) options.transition = Effect.Transitions.linear;
+    this.options      = Object.extend(Object.extend({ },Effect.DefaultOptions), options || { });
+    this.currentFrame = 0;
+    this.state        = 'idle';
+    this.startOn      = this.options.delay*1000;
+    this.finishOn     = this.startOn+(this.options.duration*1000);
+    this.fromToDelta  = this.options.to-this.options.from;
+    this.totalTime    = this.finishOn-this.startOn;
+    this.totalFrames  = this.options.fps*this.options.duration;
+
+    this.render = (function() {
+      function dispatch(effect, eventName) {
+        if (effect.options[eventName + 'Internal'])
+          effect.options[eventName + 'Internal'](effect);
+        if (effect.options[eventName])
+          effect.options[eventName](effect);
+      }
+
+      return function(pos) {
+        if (this.state === "idle") {
+          this.state = "running";
+          dispatch(this, 'beforeSetup');
+          if (this.setup) this.setup();
+          dispatch(this, 'afterSetup');
+        }
+        if (this.state === "running") {
+          pos = (this.options.transition(pos) * this.fromToDelta) + this.options.from;
+          this.position = pos;
+          dispatch(this, 'beforeUpdate');
+          if (this.update) this.update(pos);
+          dispatch(this, 'afterUpdate');
+        }
+      };
+    })();
+
+    this.event('beforeStart');
+    if (!this.options.sync)
+      Effect.Queues.get(Object.isString(this.options.queue) ?
+        'global' : this.options.queue.scope).add(this);
+  },
+  loop: function(timePos) {
+    if (timePos >= this.startOn) {
+      if (timePos >= this.finishOn) {
+        this.render(1.0);
+        this.cancel();
+        this.event('beforeFinish');
+        if (this.finish) this.finish();
+        this.event('afterFinish');
+        return;
+      }
+      var pos   = (timePos - this.startOn) / this.totalTime,
+          frame = (pos * this.totalFrames).round();
+      if (frame > this.currentFrame) {
+        this.render(pos);
+        this.currentFrame = frame;
+      }
+    }
+  },
+  cancel: function() {
+    if (!this.options.sync)
+      Effect.Queues.get(Object.isString(this.options.queue) ?
+        'global' : this.options.queue.scope).remove(this);
+    this.state = 'finished';
+  },
+  event: function(eventName) {
+    if (this.options[eventName + 'Internal']) this.options[eventName + 'Internal'](this);
+    if (this.options[eventName]) this.options[eventName](this);
+  },
+  inspect: function() {
+    var data = $H();
+    for(property in this)
+      if (!Object.isFunction(this[property])) data.set(property, this[property]);
+    return '#<Effect:' + data.inspect() + ',options:' + $H(this.options).inspect() + '>';
+  }
+});
+
+Effect.Parallel = Class.create(Effect.Base, {
+  initialize: function(effects) {
+    this.effects = effects || [];
+    this.start(arguments[1]);
+  },
+  update: function(position) {
+    this.effects.invoke('render', position);
+  },
+  finish: function(position) {
+    this.effects.each( function(effect) {
+      effect.render(1.0);
+      effect.cancel();
+      effect.event('beforeFinish');
+      if (effect.finish) effect.finish(position);
+      effect.event('afterFinish');
+    });
+  }
+});
+
+Effect.Tween = Class.create(Effect.Base, {
+  initialize: function(object, from, to) {
+    object = Object.isString(object) ? $(object) : object;
+    var args = $A(arguments), method = args.last(),
+      options = args.length == 5 ? args[3] : null;
+    this.method = Object.isFunction(method) ? method.bind(object) :
+      Object.isFunction(object[method]) ? object[method].bind(object) :
+      function(value) { object[method] = value };
+    this.start(Object.extend({ from: from, to: to }, options || { }));
+  },
+  update: function(position) {
+    this.method(position);
+  }
+});
+
+Effect.Event = Class.create(Effect.Base, {
+  initialize: function() {
+    this.start(Object.extend({ duration: 0 }, arguments[0] || { }));
+  },
+  update: Prototype.emptyFunction
+});
+
+Effect.Opacity = Class.create(Effect.Base, {
+  initialize: function(element) {
+    this.element = $(element);
+    if (!this.element) throw(Effect._elementDoesNotExistError);
+    // make this work on IE on elements without 'layout'
+    if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
+      this.element.setStyle({zoom: 1});
+    var options = Object.extend({
+      from: this.element.getOpacity() || 0.0,
+      to:   1.0
+    }, arguments[1] || { });
+    this.start(options);
+  },
+  update: function(position) {
+    this.element.setOpacity(position);
+  }
+});
+
+Effect.Move = Class.create(Effect.Base, {
+  initialize: function(element) {
+    this.element = $(element);
+    if (!this.element) throw(Effect._elementDoesNotExistError);
+    var options = Object.extend({
+      x:    0,
+      y:    0,
+      mode: 'relative'
+    }, arguments[1] || { });
+    this.start(options);
+  },
+  setup: function() {
+    this.element.makePositioned();
+    this.originalLeft = parseFloat(this.element.getStyle('left') || '0');
+    this.originalTop  = parseFloat(this.element.getStyle('top')  || '0');
+    if (this.options.mode == 'absolute') {
+      this.options.x = this.options.x - this.originalLeft;
+      this.options.y = this.options.y - this.originalTop;
+    }
+  },
+  update: function(position) {
+    this.element.setStyle({
+      left: (this.options.x  * position + this.originalLeft).round() + 'px',
+      top:  (this.options.y  * position + this.originalTop).round()  + 'px'
+    });
+  }
+});
+
+// for backwards compatibility
+Effect.MoveBy = function(element, toTop, toLeft) {
+  return new Effect.Move(element,
+    Object.extend({ x: toLeft, y: toTop }, arguments[3] || { }));
+};
+
+Effect.Scale = Class.create(Effect.Base, {
+  initialize: function(element, percent) {
+    this.element = $(element);
+    if (!this.element) throw(Effect._elementDoesNotExistError);
+    var options = Object.extend({
+      scaleX: true,
+      scaleY: true,
+      scaleContent: true,
+      scaleFromCenter: false,
+      scaleMode: 'box',        // 'box' or 'contents' or { } with provided values
+      scaleFrom: 100.0,
+      scaleTo:   percent
+    }, arguments[2] || { });
+    this.start(options);
+  },
+  setup: function() {
+    this.restoreAfterFinish = this.options.restoreAfterFinish || false;
+    this.elementPositioning = this.element.getStyle('position');
+
+    this.originalStyle = { };
+    ['top','left','width','height','fontSize'].each( function(k) {
+      this.originalStyle[k] = this.element.style[k];
+    }.bind(this));
+
+    this.originalTop  = this.element.offsetTop;
+    this.originalLeft = this.element.offsetLeft;
+
+    var fontSize = this.element.getStyle('font-size') || '100%';
+    ['em','px','%','pt'].each( function(fontSizeType) {
+      if (fontSize.indexOf(fontSizeType)>0) {
+        this.fontSize     = parseFloat(fontSize);
+        this.fontSizeType = fontSizeType;
+      }
+    }.bind(this));
+
+    this.factor = (this.options.scaleTo - this.options.scaleFrom)/100;
+
+    this.dims = null;
+    if (this.options.scaleMode=='box')
+      this.dims = [this.element.offsetHeight, this.element.offsetWidth];
+    if (/^content/.test(this.options.scaleMode))
+      this.dims = [this.element.scrollHeight, this.element.scrollWidth];
+    if (!this.dims)
+      this.dims = [this.options.scaleMode.originalHeight,
+                   this.options.scaleMode.originalWidth];
+  },
+  update: function(position) {
+    var currentScale = (this.options.scaleFrom/100.0) + (this.factor * position);
+    if (this.options.scaleContent && this.fontSize)
+      this.element.setStyle({fontSize: this.fontSize * currentScale + this.fontSizeType });
+    this.setDimensions(this.dims[0] * currentScale, this.dims[1] * currentScale);
+  },
+  finish: function(position) {
+    if (this.restoreAfterFinish) this.element.setStyle(this.originalStyle);
+  },
+  setDimensions: function(height, width) {
+    var d = { };
+    if (this.options.scaleX) d.width = width.round() + 'px';
+    if (this.options.scaleY) d.height = height.round() + 'px';
+    if (this.options.scaleFromCenter) {
+      var topd  = (height - this.dims[0])/2;
+      var leftd = (width  - this.dims[1])/2;
+      if (this.elementPositioning == 'absolute') {
+        if (this.options.scaleY) d.top = this.originalTop-topd + 'px';
+        if (this.options.scaleX) d.left = this.originalLeft-leftd + 'px';
+      } else {
+        if (this.options.scaleY) d.top = -topd + 'px';
+        if (this.options.scaleX) d.left = -leftd + 'px';
+      }
+    }
+    this.element.setStyle(d);
+  }
+});
+
+Effect.Highlight = Class.create(Effect.Base, {
+  initialize: function(element) {
+    this.element = $(element);
+    if (!this.element) throw(Effect._elementDoesNotExistError);
+    var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || { });
+    this.start(options);
+  },
+  setup: function() {
+    // Prevent executing on elements not in the layout flow
+    if (this.element.getStyle('display')=='none') { this.cancel(); return; }
+    // Disable background image during the effect
+    this.oldStyle = { };
+    if (!this.options.keepBackgroundImage) {
+      this.oldStyle.backgroundImage = this.element.getStyle('background-image');
+      this.element.setStyle({backgroundImage: 'none'});
+    }
+    if (!this.options.endcolor)
+      this.options.endcolor = this.element.getStyle('background-color').parseColor('#ffffff');
+    if (!this.options.restorecolor)
+      this.options.restorecolor = this.element.getStyle('background-color');
+    // init color calculations
+    this._base  = $R(0,2).map(function(i){ return parseInt(this.options.startcolor.slice(i*2+1,i*2+3),16) }.bind(this));
+    this._delta = $R(0,2).map(function(i){ return parseInt(this.options.endcolor.slice(i*2+1,i*2+3),16)-this._base[i] }.bind(this));
+  },
+  update: function(position) {
+    this.element.setStyle({backgroundColor: $R(0,2).inject('#',function(m,v,i){
+      return m+((this._base[i]+(this._delta[i]*position)).round().toColorPart()); }.bind(this)) });
+  },
+  finish: function() {
+    this.element.setStyle(Object.extend(this.oldStyle, {
+      backgroundColor: this.options.restorecolor
+    }));
+  }
+});
+
+Effect.ScrollTo = function(element) {
+  var options = arguments[1] || { },
+  scrollOffsets = document.viewport.getScrollOffsets(),
+  elementOffsets = $(element).cumulativeOffset();
+
+  if (options.offset) elementOffsets[1] += options.offset;
+
+  return new Effect.Tween(null,
+    scrollOffsets.top,
+    elementOffsets[1],
+    options,
+    function(p){ scrollTo(scrollOffsets.left, p.round()); }
+  );
+};
+
+/* ------------- combination effects ------------- */
+
+Effect.Fade = function(element) {
+  element = $(element);
+  var oldOpacity = element.getInlineOpacity();
+  var options = Object.extend({
+    from: element.getOpacity() || 1.0,
+    to:   0.0,
+    afterFinishInternal: function(effect) {
+      if (effect.options.to!=0) return;
+      effect.element.hide().setStyle({opacity: oldOpacity});
+    }
+  }, arguments[1] || { });
+  return new Effect.Opacity(element,options);
+};
+
+Effect.Appear = function(element) {
+  element = $(element);
+  var options = Object.extend({
+  from: (element.getStyle('display') == 'none' ? 0.0 : element.getOpacity() || 0.0),
+  to:   1.0,
+  // force Safari to render floated elements properly
+  afterFinishInternal: function(effect) {
+    effect.element.forceRerendering();
+  },
+  beforeSetup: function(effect) {
+    effect.element.setOpacity(effect.options.from).show();
+  }}, arguments[1] || { });
+  return new Effect.Opacity(element,options);
+};
+
+Effect.Puff = function(element) {
+  element = $(element);
+  var oldStyle = {
+    opacity: element.getInlineOpacity(),
+    position: element.getStyle('position'),
+    top:  element.style.top,
+    left: element.style.left,
+    width: element.style.width,
+    height: element.style.height
+  };
+  return new Effect.Parallel(
+   [ new Effect.Scale(element, 200,
+      { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }),
+     new Effect.Opacity(element, { sync: true, to: 0.0 } ) ],
+     Object.extend({ duration: 1.0,
+      beforeSetupInternal: function(effect) {
+        Position.absolutize(effect.effects[0].element);
+      },
+      afterFinishInternal: function(effect) {
+         effect.effects[0].element.hide().setStyle(oldStyle); }
+     }, arguments[1] || { })
+   );
+};
+
+Effect.BlindUp = function(element) {
+  element = $(element);
+  element.makeClipping();
+  return new Effect.Scale(element, 0,
+    Object.extend({ scaleContent: false,
+      scaleX: false,
+      restoreAfterFinish: true,
+      afterFinishInternal: function(effect) {
+        effect.element.hide().undoClipping();
+      }
+    }, arguments[1] || { })
+  );
+};
+
+Effect.BlindDown = function(element) {
+  element = $(element);
+  var elementDimensions = element.getDimensions();
+  return new Effect.Scale(element, 100, Object.extend({
+    scaleContent: false,
+    scaleX: false,
+    scaleFrom: 0,
+    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
+    restoreAfterFinish: true,
+    afterSetup: function(effect) {
+      effect.element.makeClipping().setStyle({height: '0px'}).show();
+    },
+    afterFinishInternal: function(effect) {
+      effect.element.undoClipping();
+    }
+  }, arguments[1] || { }));
+};
+
+Effect.SwitchOff = function(element) {
+  element = $(element);
+  var oldOpacity = element.getInlineOpacity();
+  return new Effect.Appear(element, Object.extend({
+    duration: 0.4,
+    from: 0,
+    transition: Effect.Transitions.flicker,
+    afterFinishInternal: function(effect) {
+      new Effect.Scale(effect.element, 1, {
+        duration: 0.3, scaleFromCenter: true,
+        scaleX: false, scaleContent: false, restoreAfterFinish: true,
+        beforeSetup: function(effect) {
+          effect.element.makePositioned().makeClipping();
+        },
+        afterFinishInternal: function(effect) {
+          effect.element.hide().undoClipping().undoPositioned().setStyle({opacity: oldOpacity});
+        }
+      });
+    }
+  }, arguments[1] || { }));
+};
+
+Effect.DropOut = function(element) {
+  element = $(element);
+  var oldStyle = {
+    top: element.getStyle('top'),
+    left: element.getStyle('left'),
+    opacity: element.getInlineOpacity() };
+  return new Effect.Parallel(
+    [ new Effect.Move(element, {x: 0, y: 100, sync: true }),
+      new Effect.Opacity(element, { sync: true, to: 0.0 }) ],
+    Object.extend(
+      { duration: 0.5,
+        beforeSetup: function(effect) {
+          effect.effects[0].element.makePositioned();
+        },
+        afterFinishInternal: function(effect) {
+          effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle);
+        }
+      }, arguments[1] || { }));
+};
+
+Effect.Shake = function(element) {
+  element = $(element);
+  var options = Object.extend({
+    distance: 20,
+    duration: 0.5
+  }, arguments[1] || {});
+  var distance = parseFloat(options.distance);
+  var split = parseFloat(options.duration) / 10.0;
+  var oldStyle = {
+    top: element.getStyle('top'),
+    left: element.getStyle('left') };
+    return new Effect.Move(element,
+      { x:  distance, y: 0, duration: split, afterFinishInternal: function(effect) {
+    new Effect.Move(effect.element,
+      { x: -distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
+    new Effect.Move(effect.element,
+      { x:  distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
+    new Effect.Move(effect.element,
+      { x: -distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
+    new Effect.Move(effect.element,
+      { x:  distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
+    new Effect.Move(effect.element,
+      { x: -distance, y: 0, duration: split, afterFinishInternal: function(effect) {
+        effect.element.undoPositioned().setStyle(oldStyle);
+  }}); }}); }}); }}); }}); }});
+};
+
+Effect.SlideDown = function(element) {
+  element = $(element).cleanWhitespace();
+  // SlideDown need to have the content of the element wrapped in a container element with fixed height!
+  var oldInnerBottom = element.down().getStyle('bottom');
+  var elementDimensions = element.getDimensions();
+  return new Effect.Scale(element, 100, Object.extend({
+    scaleContent: false,
+    scaleX: false,
+    scaleFrom: window.opera ? 0 : 1,
+    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
+    restoreAfterFinish: true,
+    afterSetup: function(effect) {
+      effect.element.makePositioned();
+      effect.element.down().makePositioned();
+      if (window.opera) effect.element.setStyle({top: ''});
+      effect.element.makeClipping().setStyle({height: '0px'}).show();
+    },
+    afterUpdateInternal: function(effect) {
+      effect.element.down().setStyle({bottom:
+        (effect.dims[0] - effect.element.clientHeight) + 'px' });
+    },
+    afterFinishInternal: function(effect) {
+      effect.element.undoClipping().undoPositioned();
+      effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom}); }
+    }, arguments[1] || { })
+  );
+};
+
+Effect.SlideUp = function(element) {
+  element = $(element).cleanWhitespace();
+  var oldInnerBottom = element.down().getStyle('bottom');
+  var elementDimensions = element.getDimensions();
+  return new Effect.Scale(element, window.opera ? 0 : 1,
+   Object.extend({ scaleContent: false,
+    scaleX: false,
+    scaleMode: 'box',
+    scaleFrom: 100,
+    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
+    restoreAfterFinish: true,
+    afterSetup: function(effect) {
+      effect.element.makePositioned();
+      effect.element.down().makePositioned();
+      if (window.opera) effect.element.setStyle({top: ''});
+      effect.element.makeClipping().show();
+    },
+    afterUpdateInternal: function(effect) {
+      effect.element.down().setStyle({bottom:
+        (effect.dims[0] - effect.element.clientHeight) + 'px' });
+    },
+    afterFinishInternal: function(effect) {
+      effect.element.hide().undoClipping().undoPositioned();
+      effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom});
+    }
+   }, arguments[1] || { })
+  );
+};
+
+// Bug in opera makes the TD containing this element expand for a instance after finish
+Effect.Squish = function(element) {
+  return new Effect.Scale(element, window.opera ? 1 : 0, {
+    restoreAfterFinish: true,
+    beforeSetup: function(effect) {
+      effect.element.makeClipping();
+    },
+    afterFinishInternal: function(effect) {
+      effect.element.hide().undoClipping();
+    }
+  });
+};
+
+Effect.Grow = function(element) {
+  element = $(element);
+  var options = Object.extend({
+    direction: 'center',
+    moveTransition: Effect.Transitions.sinoidal,
+    scaleTransition: Effect.Transitions.sinoidal,
+    opacityTransition: Effect.Transitions.full
+  }, arguments[1] || { });
+  var oldStyle = {
+    top: element.style.top,
+    left: element.style.left,
+    height: element.style.height,
+    width: element.style.width,
+    opacity: element.getInlineOpacity() };
+
+  var dims = element.getDimensions();
+  var initialMoveX, initialMoveY;
+  var moveX, moveY;
+
+  switch (options.direction) {
+    case 'top-left':
+      initialMoveX = initialMoveY = moveX = moveY = 0;
+      break;
+    case 'top-right':
+      initialMoveX = dims.width;
+      initialMoveY = moveY = 0;
+      moveX = -dims.width;
+      break;
+    case 'bottom-left':
+      initialMoveX = moveX = 0;
+      initialMoveY = dims.height;
+      moveY = -dims.height;
+      break;
+    case 'bottom-right':
+      initialMoveX = dims.width;
+      initialMoveY = dims.height;
+      moveX = -dims.width;
+      moveY = -dims.height;
+      break;
+    case 'center':
+      initialMoveX = dims.width / 2;
+      initialMoveY = dims.height / 2;
+      moveX = -dims.width / 2;
+      moveY = -dims.height / 2;
+      break;
+  }
+
+  return new Effect.Move(element, {
+    x: initialMoveX,
+    y: initialMoveY,
+    duration: 0.01,
+    beforeSetup: function(effect) {
+      effect.element.hide().makeClipping().makePositioned();
+    },
+    afterFinishInternal: function(effect) {
+      new Effect.Parallel(
+        [ new Effect.Opacity(effect.element, { sync: true, to: 1.0, from: 0.0, transition: options.opacityTransition }),
+          new Effect.Move(effect.element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }),
+          new Effect.Scale(effect.element, 100, {
+            scaleMode: { originalHeight: dims.height, originalWidth: dims.width },
+            sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true})
+        ], Object.extend({
+             beforeSetup: function(effect) {
+               effect.effects[0].element.setStyle({height: '0px'}).show();
+             },
+             afterFinishInternal: function(effect) {
+               effect.effects[0].element.undoClipping().undoPositioned().setStyle(oldStyle);
+             }
+           }, options)
+      );
+    }
+  });
+};
+
+Effect.Shrink = function(element) {
+  element = $(element);
+  var options = Object.extend({
+    direction: 'center',
+    moveTransition: Effect.Transitions.sinoidal,
+    scaleTransition: Effect.Transitions.sinoidal,
+    opacityTransition: Effect.Transitions.none
+  }, arguments[1] || { });
+  var oldStyle = {
+    top: element.style.top,
+    left: element.style.left,
+    height: element.style.height,
+    width: element.style.width,
+    opacity: element.getInlineOpacity() };
+
+  var dims = element.getDimensions();
+  var moveX, moveY;
+
+  switch (options.direction) {
+    case 'top-left':
+      moveX = moveY = 0;
+      break;
+    case 'top-right':
+      moveX = dims.width;
+      moveY = 0;
+      break;
+    case 'bottom-left':
+      moveX = 0;
+      moveY = dims.height;
+      break;
+    case 'bottom-right':
+      moveX = dims.width;
+      moveY = dims.height;
+      break;
+    case 'center':
+      moveX = dims.width / 2;
+      moveY = dims.height / 2;
+      break;
+  }
+
+  return new Effect.Parallel(
+    [ new Effect.Opacity(element, { sync: true, to: 0.0, from: 1.0, transition: options.opacityTransition }),
+      new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: options.scaleTransition, restoreAfterFinish: true}),
+      new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition })
+    ], Object.extend({
+         beforeStartInternal: function(effect) {
+           effect.effects[0].element.makePositioned().makeClipping();
+         },
+         afterFinishInternal: function(effect) {
+           effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); }
+       }, options)
+  );
+};
+
+Effect.Pulsate = function(element) {
+  element = $(element);
+  var options    = arguments[1] || { },
+    oldOpacity = element.getInlineOpacity(),
+    transition = options.transition || Effect.Transitions.linear,
+    reverser   = function(pos){
+      return 1 - transition((-Math.cos((pos*(options.pulses||5)*2)*Math.PI)/2) + .5);
+    };
+
+  return new Effect.Opacity(element,
+    Object.extend(Object.extend({  duration: 2.0, from: 0,
+      afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); }
+    }, options), {transition: reverser}));
+};
+
+Effect.Fold = function(element) {
+  element = $(element);
+  var oldStyle = {
+    top: element.style.top,
+    left: element.style.left,
+    width: element.style.width,
+    height: element.style.height };
+  element.makeClipping();
+  return new Effect.Scale(element, 5, Object.extend({
+    scaleContent: false,
+    scaleX: false,
+    afterFinishInternal: function(effect) {
+    new Effect.Scale(element, 1, {
+      scaleContent: false,
+      scaleY: false,
+      afterFinishInternal: function(effect) {
+        effect.element.hide().undoClipping().setStyle(oldStyle);
+      } });
+  }}, arguments[1] || { }));
+};
+
+Effect.Morph = Class.create(Effect.Base, {
+  initialize: function(element) {
+    this.element = $(element);
+    if (!this.element) throw(Effect._elementDoesNotExistError);
+    var options = Object.extend({
+      style: { }
+    }, arguments[1] || { });
+
+    if (!Object.isString(options.style)) this.style = $H(options.style);
+    else {
+      if (options.style.include(':'))
+        this.style = options.style.parseStyle();
+      else {
+        this.element.addClassName(options.style);
+        this.style = $H(this.element.getStyles());
+        this.element.removeClassName(options.style);
+        var css = this.element.getStyles();
+        this.style = this.style.reject(function(style) {
+          return style.value == css[style.key];
+        });
+        options.afterFinishInternal = function(effect) {
+          effect.element.addClassName(effect.options.style);
+          effect.transforms.each(function(transform) {
+            effect.element.style[transform.style] = '';
+          });
+        };
+      }
+    }
+    this.start(options);
+  },
+
+  setup: function(){
+    function parseColor(color){
+      if (!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff';
+      color = color.parseColor();
+      return $R(0,2).map(function(i){
+        return parseInt( color.slice(i*2+1,i*2+3), 16 );
+      });
+    }
+    this.transforms = this.style.map(function(pair){
+      var property = pair[0], value = pair[1], unit = null;
+
+      if (value.parseColor('#zzzzzz') != '#zzzzzz') {
+        value = value.parseColor();
+        unit  = 'color';
+      } else if (property == 'opacity') {
+        value = parseFloat(value);
+        if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
+          this.element.setStyle({zoom: 1});
+      } else if (Element.CSS_LENGTH.test(value)) {
+          var components = value.match(/^([\+\-]?[0-9\.]+)(.*)$/);
+          value = parseFloat(components[1]);
+          unit = (components.length == 3) ? components[2] : null;
+      }
+
+      var originalValue = this.element.getStyle(property);
+      return {
+        style: property.camelize(),
+        originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0),
+        targetValue: unit=='color' ? parseColor(value) : value,
+        unit: unit
+      };
+    }.bind(this)).reject(function(transform){
+      return (
+        (transform.originalValue == transform.targetValue) ||
+        (
+          transform.unit != 'color' &&
+          (isNaN(transform.originalValue) || isNaN(transform.targetValue))
+        )
+      );
+    });
+  },
+  update: function(position) {
+    var style = { }, transform, i = this.transforms.length;
+    while(i--)
+      style[(transform = this.transforms[i]).style] =
+        transform.unit=='color' ? '#'+
+          (Math.round(transform.originalValue[0]+
+            (transform.targetValue[0]-transform.originalValue[0])*position)).toColorPart() +
+          (Math.round(transform.originalValue[1]+
+            (transform.targetValue[1]-transform.originalValue[1])*position)).toColorPart() +
+          (Math.round(transform.originalValue[2]+
+            (transform.targetValue[2]-transform.originalValue[2])*position)).toColorPart() :
+        (transform.originalValue +
+          (transform.targetValue - transform.originalValue) * position).toFixed(3) +
+            (transform.unit === null ? '' : transform.unit);
+    this.element.setStyle(style, true);
+  }
+});
+
+Effect.Transform = Class.create({
+  initialize: function(tracks){
+    this.tracks  = [];
+    this.options = arguments[1] || { };
+    this.addTracks(tracks);
+  },
+  addTracks: function(tracks){
+    tracks.each(function(track){
+      track = $H(track);
+      var data = track.values().first();
+      this.tracks.push($H({
+        ids:     track.keys().first(),
+        effect:  Effect.Morph,
+        options: { style: data }
+      }));
+    }.bind(this));
+    return this;
+  },
+  play: function(){
+    return new Effect.Parallel(
+      this.tracks.map(function(track){
+        var ids = track.get('ids'), effect = track.get('effect'), options = track.get('options');
+        var elements = [$(ids) || $$(ids)].flatten();
+        return elements.map(function(e){ return new effect(e, Object.extend({ sync:true }, options)) });
+      }).flatten(),
+      this.options
+    );
+  }
+});
+
+Element.CSS_PROPERTIES = $w(
+  'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' +
+  'borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth ' +
+  'borderRightColor borderRightStyle borderRightWidth borderSpacing ' +
+  'borderTopColor borderTopStyle borderTopWidth bottom clip color ' +
+  'fontSize fontWeight height left letterSpacing lineHeight ' +
+  'marginBottom marginLeft marginRight marginTop markerOffset maxHeight '+
+  'maxWidth minHeight minWidth opacity outlineColor outlineOffset ' +
+  'outlineWidth paddingBottom paddingLeft paddingRight paddingTop ' +
+  'right textIndent top width wordSpacing zIndex');
+
+Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/;
+
+String.__parseStyleElement = document.createElement('div');
+String.prototype.parseStyle = function(){
+  var style, styleRules = $H();
+  if (Prototype.Browser.WebKit)
+    style = new Element('div',{style:this}).style;
+  else {
+    String.__parseStyleElement.innerHTML = '<div style="' + this + '"></div>';
+    style = String.__parseStyleElement.childNodes[0].style;
+  }
+
+  Element.CSS_PROPERTIES.each(function(property){
+    if (style[property]) styleRules.set(property, style[property]);
+  });
+
+  if (Prototype.Browser.IE && this.include('opacity'))
+    styleRules.set('opacity', this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1]);
+
+  return styleRules;
+};
+
+if (document.defaultView && document.defaultView.getComputedStyle) {
+  Element.getStyles = function(element) {
+    var css = document.defaultView.getComputedStyle($(element), null);
+    return Element.CSS_PROPERTIES.inject({ }, function(styles, property) {
+      styles[property] = css[property];
+      return styles;
+    });
+  };
+} else {
+  Element.getStyles = function(element) {
+    element = $(element);
+    var css = element.currentStyle, styles;
+    styles = Element.CSS_PROPERTIES.inject({ }, function(results, property) {
+      results[property] = css[property];
+      return results;
+    });
+    if (!styles.opacity) styles.opacity = element.getOpacity();
+    return styles;
+  };
+}
+
+Effect.Methods = {
+  morph: function(element, style) {
+    element = $(element);
+    new Effect.Morph(element, Object.extend({ style: style }, arguments[2] || { }));
+    return element;
+  },
+  visualEffect: function(element, effect, options) {
+    element = $(element);
+    var s = effect.dasherize().camelize(), klass = s.charAt(0).toUpperCase() + s.substring(1);
+    new Effect[klass](element, options);
+    return element;
+  },
+  highlight: function(element, options) {
+    element = $(element);
+    new Effect.Highlight(element, options);
+    return element;
+  }
+};
+
+$w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+
+  'pulsate shake puff squish switchOff dropOut').each(
+  function(effect) {
+    Effect.Methods[effect] = function(element, options){
+      element = $(element);
+      Effect[effect.charAt(0).toUpperCase() + effect.substring(1)](element, options);
+      return element;
+    };
+  }
+);
+
+$w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each(
+  function(f) { Effect.Methods[f] = Element[f]; }
+);
+
+Element.addMethods(Effect.Methods);
\ No newline at end of file
diff --git a/plugins/sfProtoculousPlugin/web/js/index.html b/plugins/sfProtoculousPlugin/web/js/index.html
new file mode 100644
index 000000000..7879e1ce9
--- /dev/null
+++ b/plugins/sfProtoculousPlugin/web/js/index.html
@@ -0,0 +1,4 @@
+<html>
+<body>
+</body>
+</html>
diff --git a/plugins/sfProtoculousPlugin/web/js/prototype.js b/plugins/sfProtoculousPlugin/web/js/prototype.js
new file mode 100644
index 000000000..dfe8ab4e1
--- /dev/null
+++ b/plugins/sfProtoculousPlugin/web/js/prototype.js
@@ -0,0 +1,4320 @@
+/*  Prototype JavaScript framework, version 1.6.0.3
+ *  (c) 2005-2008 Sam Stephenson
+ *
+ *  Prototype is freely distributable under the terms of an MIT-style license.
+ *  For details, see the Prototype web site: http://www.prototypejs.org/
+ *
+ *--------------------------------------------------------------------------*/
+
+var Prototype = {
+  Version: '1.6.0.3',
+
+  Browser: {
+    IE:     !!(window.attachEvent &&
+      navigator.userAgent.indexOf('Opera') === -1),
+    Opera:  navigator.userAgent.indexOf('Opera') > -1,
+    WebKit: navigator.userAgent.indexOf('AppleWebKit/') > -1,
+    Gecko:  navigator.userAgent.indexOf('Gecko') > -1 &&
+      navigator.userAgent.indexOf('KHTML') === -1,
+    MobileSafari: !!navigator.userAgent.match(/Apple.*Mobile.*Safari/)
+  },
+
+  BrowserFeatures: {
+    XPath: !!document.evaluate,
+    SelectorsAPI: !!document.querySelector,
+    ElementExtensions: !!window.HTMLElement,
+    SpecificElementExtensions:
+      document.createElement('div')['__proto__'] &&
+      document.createElement('div')['__proto__'] !==
+        document.createElement('form')['__proto__']
+  },
+
+  ScriptFragment: '<script[^>]*>([\\S\\s]*?)<\/script>',
+  JSONFilter: /^\/\*-secure-([\s\S]*)\*\/\s*$/,
+
+  emptyFunction: function() { },
+  K: function(x) { return x }
+};
+
+if (Prototype.Browser.MobileSafari)
+  Prototype.BrowserFeatures.SpecificElementExtensions = false;
+
+
+/* Based on Alex Arnell's inheritance implementation. */
+var Class = {
+  create: function() {
+    var parent = null, properties = $A(arguments);
+    if (Object.isFunction(properties[0]))
+      parent = properties.shift();
+
+    function klass() {
+      this.initialize.apply(this, arguments);
+    }
+
+    Object.extend(klass, Class.Methods);
+    klass.superclass = parent;
+    klass.subclasses = [];
+
+    if (parent) {
+      var subclass = function() { };
+      subclass.prototype = parent.prototype;
+      klass.prototype = new subclass;
+      parent.subclasses.push(klass);
+    }
+
+    for (var i = 0; i < properties.length; i++)
+      klass.addMethods(properties[i]);
+
+    if (!klass.prototype.initialize)
+      klass.prototype.initialize = Prototype.emptyFunction;
+
+    klass.prototype.constructor = klass;
+
+    return klass;
+  }
+};
+
+Class.Methods = {
+  addMethods: function(source) {
+    var ancestor   = this.superclass && this.superclass.prototype;
+    var properties = Object.keys(source);
+
+    if (!Object.keys({ toString: true }).length)
+      properties.push("toString", "valueOf");
+
+    for (var i = 0, length = properties.length; i < length; i++) {
+      var property = properties[i], value = source[property];
+      if (ancestor && Object.isFunction(value) &&
+          value.argumentNames().first() == "$super") {
+        var method = value;
+        value = (function(m) {
+          return function() { return ancestor[m].apply(this, arguments) };
+        })(property).wrap(method);
+
+        value.valueOf = method.valueOf.bind(method);
+        value.toString = method.toString.bind(method);
+      }
+      this.prototype[property] = value;
+    }
+
+    return this;
+  }
+};
+
+var Abstract = { };
+
+Object.extend = function(destination, source) {
+  for (var property in source)
+    destination[property] = source[property];
+  return destination;
+};
+
+Object.extend(Object, {
+  inspect: function(object) {
+    try {
+      if (Object.isUndefined(object)) return 'undefined';
+      if (object === null) return 'null';
+      return object.inspect ? object.inspect() : String(object);
+    } catch (e) {
+      if (e instanceof RangeError) return '...';
+      throw e;
+    }
+  },
+
+  toJSON: function(object) {
+    var type = typeof object;
+    switch (type) {
+      case 'undefined':
+      case 'function':
+      case 'unknown': return;
+      case 'boolean': return object.toString();
+    }
+
+    if (object === null) return 'null';
+    if (object.toJSON) return object.toJSON();
+    if (Object.isElement(object)) return;
+
+    var results = [];
+    for (var property in object) {
+      var value = Object.toJSON(object[property]);
+      if (!Object.isUndefined(value))
+        results.push(property.toJSON() + ': ' + value);
+    }
+
+    return '{' + results.join(', ') + '}';
+  },
+
+  toQueryString: function(object) {
+    return $H(object).toQueryString();
+  },
+
+  toHTML: function(object) {
+    return object && object.toHTML ? object.toHTML() : String.interpret(object);
+  },
+
+  keys: function(object) {
+    var keys = [];
+    for (var property in object)
+      keys.push(property);
+    return keys;
+  },
+
+  values: function(object) {
+    var values = [];
+    for (var property in object)
+      values.push(object[property]);
+    return values;
+  },
+
+  clone: function(object) {
+    return Object.extend({ }, object);
+  },
+
+  isElement: function(object) {
+    return !!(object && object.nodeType == 1);
+  },
+
+  isArray: function(object) {
+    return object != null && typeof object == "object" &&
+      'splice' in object && 'join' in object;
+  },
+
+  isHash: function(object) {
+    return object instanceof Hash;
+  },
+
+  isFunction: function(object) {
+    return typeof object == "function";
+  },
+
+  isString: function(object) {
+    return typeof object == "string";
+  },
+
+  isNumber: function(object) {
+    return typeof object == "number";
+  },
+
+  isUndefined: function(object) {
+    return typeof object == "undefined";
+  }
+});
+
+Object.extend(Function.prototype, {
+  argumentNames: function() {
+    var names = this.toString().match(/^[\s\(]*function[^(]*\(([^\)]*)\)/)[1]
+      .replace(/\s+/g, '').split(',');
+    return names.length == 1 && !names[0] ? [] : names;
+  },
+
+  bind: function() {
+    if (arguments.length < 2 && Object.isUndefined(arguments[0])) return this;
+    var __method = this, args = $A(arguments), object = args.shift();
+    return function() {
+      return __method.apply(object, args.concat($A(arguments)));
+    }
+  },
+
+  bindAsEventListener: function() {
+    var __method = this, args = $A(arguments), object = args.shift();
+    return function(event) {
+      return __method.apply(object, [event || window.event].concat(args));
+    }
+  },
+
+  curry: function() {
+    if (!arguments.length) return this;
+    var __method = this, args = $A(arguments);
+    return function() {
+      return __method.apply(this, args.concat($A(arguments)));
+    }
+  },
+
+  delay: function() {
+    var __method = this, args = $A(arguments), timeout = args.shift() * 1000;
+    return window.setTimeout(function() {
+      return __method.apply(__method, args);
+    }, timeout);
+  },
+
+  defer: function() {
+    var args = [0.01].concat($A(arguments));
+    return this.delay.apply(this, args);
+  },
+
+  wrap: function(wrapper) {
+    var __method = this;
+    return function() {
+      return wrapper.apply(this, [__method.bind(this)].concat($A(arguments)));
+    }
+  },
+
+  methodize: function() {
+    if (this._methodized) return this._methodized;
+    var __method = this;
+    return this._methodized = function() {
+      return __method.apply(null, [this].concat($A(arguments)));
+    };
+  }
+});
+
+Date.prototype.toJSON = function() {
+  return '"' + this.getUTCFullYear() + '-' +
+    (this.getUTCMonth() + 1).toPaddedString(2) + '-' +
+    this.getUTCDate().toPaddedString(2) + 'T' +
+    this.getUTCHours().toPaddedString(2) + ':' +
+    this.getUTCMinutes().toPaddedString(2) + ':' +
+    this.getUTCSeconds().toPaddedString(2) + 'Z"';
+};
+
+var Try = {
+  these: function() {
+    var returnValue;
+
+    for (var i = 0, length = arguments.length; i < length; i++) {
+      var lambda = arguments[i];
+      try {
+        returnValue = lambda();
+        break;
+      } catch (e) { }
+    }
+
+    return returnValue;
+  }
+};
+
+RegExp.prototype.match = RegExp.prototype.test;
+
+RegExp.escape = function(str) {
+  return String(str).replace(/([.*+?^=!:${}()|[\]\/\\])/g, '\\$1');
+};
+
+/*--------------------------------------------------------------------------*/
+
+var PeriodicalExecuter = Class.create({
+  initialize: function(callback, frequency) {
+    this.callback = callback;
+    this.frequency = frequency;
+    this.currentlyExecuting = false;
+
+    this.registerCallback();
+  },
+
+  registerCallback: function() {
+    this.timer = setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
+  },
+
+  execute: function() {
+    this.callback(this);
+  },
+
+  stop: function() {
+    if (!this.timer) return;
+    clearInterval(this.timer);
+    this.timer = null;
+  },
+
+  onTimerEvent: function() {
+    if (!this.currentlyExecuting) {
+      try {
+        this.currentlyExecuting = true;
+        this.execute();
+      } finally {
+        this.currentlyExecuting = false;
+      }
+    }
+  }
+});
+Object.extend(String, {
+  interpret: function(value) {
+    return value == null ? '' : String(value);
+  },
+  specialChar: {
+    '\b': '\\b',
+    '\t': '\\t',
+    '\n': '\\n',
+    '\f': '\\f',
+    '\r': '\\r',
+    '\\': '\\\\'
+  }
+});
+
+Object.extend(String.prototype, {
+  gsub: function(pattern, replacement) {
+    var result = '', source = this, match;
+    replacement = arguments.callee.prepareReplacement(replacement);
+
+    while (source.length > 0) {
+      if (match = source.match(pattern)) {
+        result += source.slice(0, match.index);
+        result += String.interpret(replacement(match));
+        source  = source.slice(match.index + match[0].length);
+      } else {
+        result += source, source = '';
+      }
+    }
+    return result;
+  },
+
+  sub: function(pattern, replacement, count) {
+    replacement = this.gsub.prepareReplacement(replacement);
+    count = Object.isUndefined(count) ? 1 : count;
+
+    return this.gsub(pattern, function(match) {
+      if (--count < 0) return match[0];
+      return replacement(match);
+    });
+  },
+
+  scan: function(pattern, iterator) {
+    this.gsub(pattern, iterator);
+    return String(this);
+  },
+
+  truncate: function(length, truncation) {
+    length = length || 30;
+    truncation = Object.isUndefined(truncation) ? '...' : truncation;
+    return this.length > length ?
+      this.slice(0, length - truncation.length) + truncation : String(this);
+  },
+
+  strip: function() {
+    return this.replace(/^\s+/, '').replace(/\s+$/, '');
+  },
+
+  stripTags: function() {
+    return this.replace(/<\/?[^>]+>/gi, '');
+  },
+
+  stripScripts: function() {
+    return this.replace(new RegExp(Prototype.ScriptFragment, 'img'), '');
+  },
+
+  extractScripts: function() {
+    var matchAll = new RegExp(Prototype.ScriptFragment, 'img');
+    var matchOne = new RegExp(Prototype.ScriptFragment, 'im');
+    return (this.match(matchAll) || []).map(function(scriptTag) {
+      return (scriptTag.match(matchOne) || ['', ''])[1];
+    });
+  },
+
+  evalScripts: function() {
+    return this.extractScripts().map(function(script) { return eval(script) });
+  },
+
+  escapeHTML: function() {
+    var self = arguments.callee;
+    self.text.data = this;
+    return self.div.innerHTML;
+  },
+
+  unescapeHTML: function() {
+    var div = new Element('div');
+    div.innerHTML = this.stripTags();
+    return div.childNodes[0] ? (div.childNodes.length > 1 ?
+      $A(div.childNodes).inject('', function(memo, node) { return memo+node.nodeValue }) :
+      div.childNodes[0].nodeValue) : '';
+  },
+
+  toQueryParams: function(separator) {
+    var match = this.strip().match(/([^?#]*)(#.*)?$/);
+    if (!match) return { };
+
+    return match[1].split(separator || '&').inject({ }, function(hash, pair) {
+      if ((pair = pair.split('='))[0]) {
+        var key = decodeURIComponent(pair.shift());
+        var value = pair.length > 1 ? pair.join('=') : pair[0];
+        if (value != undefined) value = decodeURIComponent(value);
+
+        if (key in hash) {
+          if (!Object.isArray(hash[key])) hash[key] = [hash[key]];
+          hash[key].push(value);
+        }
+        else hash[key] = value;
+      }
+      return hash;
+    });
+  },
+
+  toArray: function() {
+    return this.split('');
+  },
+
+  succ: function() {
+    return this.slice(0, this.length - 1) +
+      String.fromCharCode(this.charCodeAt(this.length - 1) + 1);
+  },
+
+  times: function(count) {
+    return count < 1 ? '' : new Array(count + 1).join(this);
+  },
+
+  camelize: function() {
+    var parts = this.split('-'), len = parts.length;
+    if (len == 1) return parts[0];
+
+    var camelized = this.charAt(0) == '-'
+      ? parts[0].charAt(0).toUpperCase() + parts[0].substring(1)
+      : parts[0];
+
+    for (var i = 1; i < len; i++)
+      camelized += parts[i].charAt(0).toUpperCase() + parts[i].substring(1);
+
+    return camelized;
+  },
+
+  capitalize: function() {
+    return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase();
+  },
+
+  underscore: function() {
+    return this.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/,'#{1}_#{2}').gsub(/([a-z\d])([A-Z])/,'#{1}_#{2}').gsub(/-/,'_').toLowerCase();
+  },
+
+  dasherize: function() {
+    return this.gsub(/_/,'-');
+  },
+
+  inspect: function(useDoubleQuotes) {
+    var escapedString = this.gsub(/[\x00-\x1f\\]/, function(match) {
+      var character = String.specialChar[match[0]];
+      return character ? character : '\\u00' + match[0].charCodeAt().toPaddedString(2, 16);
+    });
+    if (useDoubleQuotes) return '"' + escapedString.replace(/"/g, '\\"') + '"';
+    return "'" + escapedString.replace(/'/g, '\\\'') + "'";
+  },
+
+  toJSON: function() {
+    return this.inspect(true);
+  },
+
+  unfilterJSON: function(filter) {
+    return this.sub(filter || Prototype.JSONFilter, '#{1}');
+  },
+
+  isJSON: function() {
+    var str = this;
+    if (str.blank()) return false;
+    str = this.replace(/\\./g, '@').replace(/"[^"\\\n\r]*"/g, '');
+    return (/^[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]*$/).test(str);
+  },
+
+  evalJSON: function(sanitize) {
+    var json = this.unfilterJSON();
+    try {
+      if (!sanitize || json.isJSON()) return eval('(' + json + ')');
+    } catch (e) { }
+    throw new SyntaxError('Badly formed JSON string: ' + this.inspect());
+  },
+
+  include: function(pattern) {
+    return this.indexOf(pattern) > -1;
+  },
+
+  startsWith: function(pattern) {
+    return this.indexOf(pattern) === 0;
+  },
+
+  endsWith: function(pattern) {
+    var d = this.length - pattern.length;
+    return d >= 0 && this.lastIndexOf(pattern) === d;
+  },
+
+  empty: function() {
+    return this == '';
+  },
+
+  blank: function() {
+    return /^\s*$/.test(this);
+  },
+
+  interpolate: function(object, pattern) {
+    return new Template(this, pattern).evaluate(object);
+  }
+});
+
+if (Prototype.Browser.WebKit || Prototype.Browser.IE) Object.extend(String.prototype, {
+  escapeHTML: function() {
+    return this.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
+  },
+  unescapeHTML: function() {
+    return this.stripTags().replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>');
+  }
+});
+
+String.prototype.gsub.prepareReplacement = function(replacement) {
+  if (Object.isFunction(replacement)) return replacement;
+  var template = new Template(replacement);
+  return function(match) { return template.evaluate(match) };
+};
+
+String.prototype.parseQuery = String.prototype.toQueryParams;
+
+Object.extend(String.prototype.escapeHTML, {
+  div:  document.createElement('div'),
+  text: document.createTextNode('')
+});
+
+String.prototype.escapeHTML.div.appendChild(String.prototype.escapeHTML.text);
+
+var Template = Class.create({
+  initialize: function(template, pattern) {
+    this.template = template.toString();
+    this.pattern = pattern || Template.Pattern;
+  },
+
+  evaluate: function(object) {
+    if (Object.isFunction(object.toTemplateReplacements))
+      object = object.toTemplateReplacements();
+
+    return this.template.gsub(this.pattern, function(match) {
+      if (object == null) return '';
+
+      var before = match[1] || '';
+      if (before == '\\') return match[2];
+
+      var ctx = object, expr = match[3];
+      var pattern = /^([^.[]+|\[((?:.*?[^\\])?)\])(\.|\[|$)/;
+      match = pattern.exec(expr);
+      if (match == null) return before;
+
+      while (match != null) {
+        var comp = match[1].startsWith('[') ? match[2].gsub('\\\\]', ']') : match[1];
+        ctx = ctx[comp];
+        if (null == ctx || '' == match[3]) break;
+        expr = expr.substring('[' == match[3] ? match[1].length : match[0].length);
+        match = pattern.exec(expr);
+      }
+
+      return before + String.interpret(ctx);
+    });
+  }
+});
+Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/;
+
+var $break = { };
+
+var Enumerable = {
+  each: function(iterator, context) {
+    var index = 0;
+    try {
+      this._each(function(value) {
+        iterator.call(context, value, index++);
+      });
+    } catch (e) {
+      if (e != $break) throw e;
+    }
+    return this;
+  },
+
+  eachSlice: function(number, iterator, context) {
+    var index = -number, slices = [], array = this.toArray();
+    if (number < 1) return array;
+    while ((index += number) < array.length)
+      slices.push(array.slice(index, index+number));
+    return slices.collect(iterator, context);
+  },
+
+  all: function(iterator, context) {
+    iterator = iterator || Prototype.K;
+    var result = true;
+    this.each(function(value, index) {
+      result = result && !!iterator.call(context, value, index);
+      if (!result) throw $break;
+    });
+    return result;
+  },
+
+  any: function(iterator, context) {
+    iterator = iterator || Prototype.K;
+    var result = false;
+    this.each(function(value, index) {
+      if (result = !!iterator.call(context, value, index))
+        throw $break;
+    });
+    return result;
+  },
+
+  collect: function(iterator, context) {
+    iterator = iterator || Prototype.K;
+    var results = [];
+    this.each(function(value, index) {
+      results.push(iterator.call(context, value, index));
+    });
+    return results;
+  },
+
+  detect: function(iterator, context) {
+    var result;
+    this.each(function(value, index) {
+      if (iterator.call(context, value, index)) {
+        result = value;
+        throw $break;
+      }
+    });
+    return result;
+  },
+
+  findAll: function(iterator, context) {
+    var results = [];
+    this.each(function(value, index) {
+      if (iterator.call(context, value, index))
+        results.push(value);
+    });
+    return results;
+  },
+
+  grep: function(filter, iterator, context) {
+    iterator = iterator || Prototype.K;
+    var results = [];
+
+    if (Object.isString(filter))
+      filter = new RegExp(filter);
+
+    this.each(function(value, index) {
+      if (filter.match(value))
+        results.push(iterator.call(context, value, index));
+    });
+    return results;
+  },
+
+  include: function(object) {
+    if (Object.isFunction(this.indexOf))
+      if (this.indexOf(object) != -1) return true;
+
+    var found = false;
+    this.each(function(value) {
+      if (value == object) {
+        found = true;
+        throw $break;
+      }
+    });
+    return found;
+  },
+
+  inGroupsOf: function(number, fillWith) {
+    fillWith = Object.isUndefined(fillWith) ? null : fillWith;
+    return this.eachSlice(number, function(slice) {
+      while(slice.length < number) slice.push(fillWith);
+      return slice;
+    });
+  },
+
+  inject: function(memo, iterator, context) {
+    this.each(function(value, index) {
+      memo = iterator.call(context, memo, value, index);
+    });
+    return memo;
+  },
+
+  invoke: function(method) {
+    var args = $A(arguments).slice(1);
+    return this.map(function(value) {
+      return value[method].apply(value, args);
+    });
+  },
+
+  max: function(iterator, context) {
+    iterator = iterator || Prototype.K;
+    var result;
+    this.each(function(value, index) {
+      value = iterator.call(context, value, index);
+      if (result == null || value >= result)
+        result = value;
+    });
+    return result;
+  },
+
+  min: function(iterator, context) {
+    iterator = iterator || Prototype.K;
+    var result;
+    this.each(function(value, index) {
+      value = iterator.call(context, value, index);
+      if (result == null || value < result)
+        result = value;
+    });
+    return result;
+  },
+
+  partition: function(iterator, context) {
+    iterator = iterator || Prototype.K;
+    var trues = [], falses = [];
+    this.each(function(value, index) {
+      (iterator.call(context, value, index) ?
+        trues : falses).push(value);
+    });
+    return [trues, falses];
+  },
+
+  pluck: function(property) {
+    var results = [];
+    this.each(function(value) {
+      results.push(value[property]);
+    });
+    return results;
+  },
+
+  reject: function(iterator, context) {
+    var results = [];
+    this.each(function(value, index) {
+      if (!iterator.call(context, value, index))
+        results.push(value);
+    });
+    return results;
+  },
+
+  sortBy: function(iterator, context) {
+    return this.map(function(value, index) {
+      return {
+        value: value,
+        criteria: iterator.call(context, value, index)
+      };
+    }).sort(function(left, right) {
+      var a = left.criteria, b = right.criteria;
+      return a < b ? -1 : a > b ? 1 : 0;
+    }).pluck('value');
+  },
+
+  toArray: function() {
+    return this.map();
+  },
+
+  zip: function() {
+    var iterator = Prototype.K, args = $A(arguments);
+    if (Object.isFunction(args.last()))
+      iterator = args.pop();
+
+    var collections = [this].concat(args).map($A);
+    return this.map(function(value, index) {
+      return iterator(collections.pluck(index));
+    });
+  },
+
+  size: function() {
+    return this.toArray().length;
+  },
+
+  inspect: function() {
+    return '#<Enumerable:' + this.toArray().inspect() + '>';
+  }
+};
+
+Object.extend(Enumerable, {
+  map:     Enumerable.collect,
+  find:    Enumerable.detect,
+  select:  Enumerable.findAll,
+  filter:  Enumerable.findAll,
+  member:  Enumerable.include,
+  entries: Enumerable.toArray,
+  every:   Enumerable.all,
+  some:    Enumerable.any
+});
+function $A(iterable) {
+  if (!iterable) return [];
+  if (iterable.toArray) return iterable.toArray();
+  var length = iterable.length || 0, results = new Array(length);
+  while (length--) results[length] = iterable[length];
+  return results;
+}
+
+if (Prototype.Browser.WebKit) {
+  $A = function(iterable) {
+    if (!iterable) return [];
+    // In Safari, only use the `toArray` method if it's not a NodeList.
+    // A NodeList is a function, has an function `item` property, and a numeric
+    // `length` property. Adapted from Google Doctype.
+    if (!(typeof iterable === 'function' && typeof iterable.length ===
+        'number' && typeof iterable.item === 'function') && iterable.toArray)
+      return iterable.toArray();
+    var length = iterable.length || 0, results = new Array(length);
+    while (length--) results[length] = iterable[length];
+    return results;
+  };
+}
+
+Array.from = $A;
+
+Object.extend(Array.prototype, Enumerable);
+
+if (!Array.prototype._reverse) Array.prototype._reverse = Array.prototype.reverse;
+
+Object.extend(Array.prototype, {
+  _each: function(iterator) {
+    for (var i = 0, length = this.length; i < length; i++)
+      iterator(this[i]);
+  },
+
+  clear: function() {
+    this.length = 0;
+    return this;
+  },
+
+  first: function() {
+    return this[0];
+  },
+
+  last: function() {
+    return this[this.length - 1];
+  },
+
+  compact: function() {
+    return this.select(function(value) {
+      return value != null;
+    });
+  },
+
+  flatten: function() {
+    return this.inject([], function(array, value) {
+      return array.concat(Object.isArray(value) ?
+        value.flatten() : [value]);
+    });
+  },
+
+  without: function() {
+    var values = $A(arguments);
+    return this.select(function(value) {
+      return !values.include(value);
+    });
+  },
+
+  reverse: function(inline) {
+    return (inline !== false ? this : this.toArray())._reverse();
+  },
+
+  reduce: function() {
+    return this.length > 1 ? this : this[0];
+  },
+
+  uniq: function(sorted) {
+    return this.inject([], function(array, value, index) {
+      if (0 == index || (sorted ? array.last() != value : !array.include(value)))
+        array.push(value);
+      return array;
+    });
+  },
+
+  intersect: function(array) {
+    return this.uniq().findAll(function(item) {
+      return array.detect(function(value) { return item === value });
+    });
+  },
+
+  clone: function() {
+    return [].concat(this);
+  },
+
+  size: function() {
+    return this.length;
+  },
+
+  inspect: function() {
+    return '[' + this.map(Object.inspect).join(', ') + ']';
+  },
+
+  toJSON: function() {
+    var results = [];
+    this.each(function(object) {
+      var value = Object.toJSON(object);
+      if (!Object.isUndefined(value)) results.push(value);
+    });
+    return '[' + results.join(', ') + ']';
+  }
+});
+
+// use native browser JS 1.6 implementation if available
+if (Object.isFunction(Array.prototype.forEach))
+  Array.prototype._each = Array.prototype.forEach;
+
+if (!Array.prototype.indexOf) Array.prototype.indexOf = function(item, i) {
+  i || (i = 0);
+  var length = this.length;
+  if (i < 0) i = length + i;
+  for (; i < length; i++)
+    if (this[i] === item) return i;
+  return -1;
+};
+
+if (!Array.prototype.lastIndexOf) Array.prototype.lastIndexOf = function(item, i) {
+  i = isNaN(i) ? this.length : (i < 0 ? this.length + i : i) + 1;
+  var n = this.slice(0, i).reverse().indexOf(item);
+  return (n < 0) ? n : i - n - 1;
+};
+
+Array.prototype.toArray = Array.prototype.clone;
+
+function $w(string) {
+  if (!Object.isString(string)) return [];
+  string = string.strip();
+  return string ? string.split(/\s+/) : [];
+}
+
+if (Prototype.Browser.Opera){
+  Array.prototype.concat = function() {
+    var array = [];
+    for (var i = 0, length = this.length; i < length; i++) array.push(this[i]);
+    for (var i = 0, length = arguments.length; i < length; i++) {
+      if (Object.isArray(arguments[i])) {
+        for (var j = 0, arrayLength = arguments[i].length; j < arrayLength; j++)
+          array.push(arguments[i][j]);
+      } else {
+        array.push(arguments[i]);
+      }
+    }
+    return array;
+  };
+}
+Object.extend(Number.prototype, {
+  toColorPart: function() {
+    return this.toPaddedString(2, 16);
+  },
+
+  succ: function() {
+    return this + 1;
+  },
+
+  times: function(iterator, context) {
+    $R(0, this, true).each(iterator, context);
+    return this;
+  },
+
+  toPaddedString: function(length, radix) {
+    var string = this.toString(radix || 10);
+    return '0'.times(length - string.length) + string;
+  },
+
+  toJSON: function() {
+    return isFinite(this) ? this.toString() : 'null';
+  }
+});
+
+$w('abs round ceil floor').each(function(method){
+  Number.prototype[method] = Math[method].methodize();
+});
+function $H(object) {
+  return new Hash(object);
+};
+
+var Hash = Class.create(Enumerable, (function() {
+
+  function toQueryPair(key, value) {
+    if (Object.isUndefined(value)) return key;
+    return key + '=' + encodeURIComponent(String.interpret(value));
+  }
+
+  return {
+    initialize: function(object) {
+      this._object = Object.isHash(object) ? object.toObject() : Object.clone(object);
+    },
+
+    _each: function(iterator) {
+      for (var key in this._object) {
+        var value = this._object[key], pair = [key, value];
+        pair.key = key;
+        pair.value = value;
+        iterator(pair);
+      }
+    },
+
+    set: function(key, value) {
+      return this._object[key] = value;
+    },
+
+    get: function(key) {
+      // simulating poorly supported hasOwnProperty
+      if (this._object[key] !== Object.prototype[key])
+        return this._object[key];
+    },
+
+    unset: function(key) {
+      var value = this._object[key];
+      delete this._object[key];
+      return value;
+    },
+
+    toObject: function() {
+      return Object.clone(this._object);
+    },
+
+    keys: function() {
+      return this.pluck('key');
+    },
+
+    values: function() {
+      return this.pluck('value');
+    },
+
+    index: function(value) {
+      var match = this.detect(function(pair) {
+        return pair.value === value;
+      });
+      return match && match.key;
+    },
+
+    merge: function(object) {
+      return this.clone().update(object);
+    },
+
+    update: function(object) {
+      return new Hash(object).inject(this, function(result, pair) {
+        result.set(pair.key, pair.value);
+        return result;
+      });
+    },
+
+    toQueryString: function() {
+      return this.inject([], function(results, pair) {
+        var key = encodeURIComponent(pair.key), values = pair.value;
+
+        if (values && typeof values == 'object') {
+          if (Object.isArray(values))
+            return results.concat(values.map(toQueryPair.curry(key)));
+        } else results.push(toQueryPair(key, values));
+        return results;
+      }).join('&');
+    },
+
+    inspect: function() {
+      return '#<Hash:{' + this.map(function(pair) {
+        return pair.map(Object.inspect).join(': ');
+      }).join(', ') + '}>';
+    },
+
+    toJSON: function() {
+      return Object.toJSON(this.toObject());
+    },
+
+    clone: function() {
+      return new Hash(this);
+    }
+  }
+})());
+
+Hash.prototype.toTemplateReplacements = Hash.prototype.toObject;
+Hash.from = $H;
+var ObjectRange = Class.create(Enumerable, {
+  initialize: function(start, end, exclusive) {
+    this.start = start;
+    this.end = end;
+    this.exclusive = exclusive;
+  },
+
+  _each: function(iterator) {
+    var value = this.start;
+    while (this.include(value)) {
+      iterator(value);
+      value = value.succ();
+    }
+  },
+
+  include: function(value) {
+    if (value < this.start)
+      return false;
+    if (this.exclusive)
+      return value < this.end;
+    return value <= this.end;
+  }
+});
+
+var $R = function(start, end, exclusive) {
+  return new ObjectRange(start, end, exclusive);
+};
+
+var Ajax = {
+  getTransport: function() {
+    return Try.these(
+      function() {return new XMLHttpRequest()},
+      function() {return new ActiveXObject('Msxml2.XMLHTTP')},
+      function() {return new ActiveXObject('Microsoft.XMLHTTP')}
+    ) || false;
+  },
+
+  activeRequestCount: 0
+};
+
+Ajax.Responders = {
+  responders: [],
+
+  _each: function(iterator) {
+    this.responders._each(iterator);
+  },
+
+  register: function(responder) {
+    if (!this.include(responder))
+      this.responders.push(responder);
+  },
+
+  unregister: function(responder) {
+    this.responders = this.responders.without(responder);
+  },
+
+  dispatch: function(callback, request, transport, json) {
+    this.each(function(responder) {
+      if (Object.isFunction(responder[callback])) {
+        try {
+          responder[callback].apply(responder, [request, transport, json]);
+        } catch (e) { }
+      }
+    });
+  }
+};
+
+Object.extend(Ajax.Responders, Enumerable);
+
+Ajax.Responders.register({
+  onCreate:   function() { Ajax.activeRequestCount++ },
+  onComplete: function() { Ajax.activeRequestCount-- }
+});
+
+Ajax.Base = Class.create({
+  initialize: function(options) {
+    this.options = {
+      method:       'post',
+      asynchronous: true,
+      contentType:  'application/x-www-form-urlencoded',
+      encoding:     'UTF-8',
+      parameters:   '',
+      evalJSON:     true,
+      evalJS:       true
+    };
+    Object.extend(this.options, options || { });
+
+    this.options.method = this.options.method.toLowerCase();
+
+    if (Object.isString(this.options.parameters))
+      this.options.parameters = this.options.parameters.toQueryParams();
+    else if (Object.isHash(this.options.parameters))
+      this.options.parameters = this.options.parameters.toObject();
+  }
+});
+
+Ajax.Request = Class.create(Ajax.Base, {
+  _complete: false,
+
+  initialize: function($super, url, options) {
+    $super(options);
+    this.transport = Ajax.getTransport();
+    this.request(url);
+  },
+
+  request: function(url) {
+    this.url = url;
+    this.method = this.options.method;
+    var params = Object.clone(this.options.parameters);
+
+    if (!['get', 'post'].include(this.method)) {
+      // simulate other verbs over post
+      params['_method'] = this.method;
+      this.method = 'post';
+    }
+
+    this.parameters = params;
+
+    if (params = Object.toQueryString(params)) {
+      // when GET, append parameters to URL
+      if (this.method == 'get')
+        this.url += (this.url.include('?') ? '&' : '?') + params;
+      else if (/Konqueror|Safari|KHTML/.test(navigator.userAgent))
+        params += '&_=';
+    }
+
+    try {
+      var response = new Ajax.Response(this);
+      if (this.options.onCreate) this.options.onCreate(response);
+      Ajax.Responders.dispatch('onCreate', this, response);
+
+      this.transport.open(this.method.toUpperCase(), this.url,
+        this.options.asynchronous);
+
+      if (this.options.asynchronous) this.respondToReadyState.bind(this).defer(1);
+
+      this.transport.onreadystatechange = this.onStateChange.bind(this);
+      this.setRequestHeaders();
+
+      this.body = this.method == 'post' ? (this.options.postBody || params) : null;
+      this.transport.send(this.body);
+
+      /* Force Firefox to handle ready state 4 for synchronous requests */
+      if (!this.options.asynchronous && this.transport.overrideMimeType)
+        this.onStateChange();
+
+    }
+    catch (e) {
+      this.dispatchException(e);
+    }
+  },
+
+  onStateChange: function() {
+    var readyState = this.transport.readyState;
+    if (readyState > 1 && !((readyState == 4) && this._complete))
+      this.respondToReadyState(this.transport.readyState);
+  },
+
+  setRequestHeaders: function() {
+    var headers = {
+      'X-Requested-With': 'XMLHttpRequest',
+      'X-Prototype-Version': Prototype.Version,
+      'Accept': 'text/javascript, text/html, application/xml, text/xml, */*'
+    };
+
+    if (this.method == 'post') {
+      headers['Content-type'] = this.options.contentType +
+        (this.options.encoding ? '; charset=' + this.options.encoding : '');
+
+      /* Force "Connection: close" for older Mozilla browsers to work
+       * around a bug where XMLHttpRequest sends an incorrect
+       * Content-length header. See Mozilla Bugzilla #246651.
+       */
+      if (this.transport.overrideMimeType &&
+          (navigator.userAgent.match(/Gecko\/(\d{4})/) || [0,2005])[1] < 2005)
+            headers['Connection'] = 'close';
+    }
+
+    // user-defined headers
+    if (typeof this.options.requestHeaders == 'object') {
+      var extras = this.options.requestHeaders;
+
+      if (Object.isFunction(extras.push))
+        for (var i = 0, length = extras.length; i < length; i += 2)
+          headers[extras[i]] = extras[i+1];
+      else
+        $H(extras).each(function(pair) { headers[pair.key] = pair.value });
+    }
+
+    for (var name in headers)
+      this.transport.setRequestHeader(name, headers[name]);
+  },
+
+  success: function() {
+    var status = this.getStatus();
+    return !status || (status >= 200 && status < 300);
+  },
+
+  getStatus: function() {
+    try {
+      return this.transport.status || 0;
+    } catch (e) { return 0 }
+  },
+
+  respondToReadyState: function(readyState) {
+    var state = Ajax.Request.Events[readyState], response = new Ajax.Response(this);
+
+    if (state == 'Complete') {
+      try {
+        this._complete = true;
+        (this.options['on' + response.status]
+         || this.options['on' + (this.success() ? 'Success' : 'Failure')]
+         || Prototype.emptyFunction)(response, response.headerJSON);
+      } catch (e) {
+        this.dispatchException(e);
+      }
+
+      var contentType = response.getHeader('Content-type');
+      if (this.options.evalJS == 'force'
+          || (this.options.evalJS && this.isSameOrigin() && contentType
+          && contentType.match(/^\s*(text|application)\/(x-)?(java|ecma)script(;.*)?\s*$/i)))
+        this.evalResponse();
+    }
+
+    try {
+      (this.options['on' + state] || Prototype.emptyFunction)(response, response.headerJSON);
+      Ajax.Responders.dispatch('on' + state, this, response, response.headerJSON);
+    } catch (e) {
+      this.dispatchException(e);
+    }
+
+    if (state == 'Complete') {
+      // avoid memory leak in MSIE: clean up
+      this.transport.onreadystatechange = Prototype.emptyFunction;
+    }
+  },
+
+  isSameOrigin: function() {
+    var m = this.url.match(/^\s*https?:\/\/[^\/]*/);
+    return !m || (m[0] == '#{protocol}//#{domain}#{port}'.interpolate({
+      protocol: location.protocol,
+      domain: document.domain,
+      port: location.port ? ':' + location.port : ''
+    }));
+  },
+
+  getHeader: function(name) {
+    try {
+      return this.transport.getResponseHeader(name) || null;
+    } catch (e) { return null }
+  },
+
+  evalResponse: function() {
+    try {
+      return eval((this.transport.responseText || '').unfilterJSON());
+    } catch (e) {
+      this.dispatchException(e);
+    }
+  },
+
+  dispatchException: function(exception) {
+    (this.options.onException || Prototype.emptyFunction)(this, exception);
+    Ajax.Responders.dispatch('onException', this, exception);
+  }
+});
+
+Ajax.Request.Events =
+  ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
+
+Ajax.Response = Class.create({
+  initialize: function(request){
+    this.request = request;
+    var transport  = this.transport  = request.transport,
+        readyState = this.readyState = transport.readyState;
+
+    if((readyState > 2 && !Prototype.Browser.IE) || readyState == 4) {
+      this.status       = this.getStatus();
+      this.statusText   = this.getStatusText();
+      this.responseText = String.interpret(transport.responseText);
+      this.headerJSON   = this._getHeaderJSON();
+    }
+
+    if(readyState == 4) {
+      var xml = transport.responseXML;
+      this.responseXML  = Object.isUndefined(xml) ? null : xml;
+      this.responseJSON = this._getResponseJSON();
+    }
+  },
+
+  status:      0,
+  statusText: '',
+
+  getStatus: Ajax.Request.prototype.getStatus,
+
+  getStatusText: function() {
+    try {
+      return this.transport.statusText || '';
+    } catch (e) { return '' }
+  },
+
+  getHeader: Ajax.Request.prototype.getHeader,
+
+  getAllHeaders: function() {
+    try {
+      return this.getAllResponseHeaders();
+    } catch (e) { return null }
+  },
+
+  getResponseHeader: function(name) {
+    return this.transport.getResponseHeader(name);
+  },
+
+  getAllResponseHeaders: function() {
+    return this.transport.getAllResponseHeaders();
+  },
+
+  _getHeaderJSON: function() {
+    var json = this.getHeader('X-JSON');
+    if (!json) return null;
+    json = decodeURIComponent(escape(json));
+    try {
+      return json.evalJSON(this.request.options.sanitizeJSON ||
+        !this.request.isSameOrigin());
+    } catch (e) {
+      this.request.dispatchException(e);
+    }
+  },
+
+  _getResponseJSON: function() {
+    var options = this.request.options;
+    if (!options.evalJSON || (options.evalJSON != 'force' &&
+      !(this.getHeader('Content-type') || '').include('application/json')) ||
+        this.responseText.blank())
+          return null;
+    try {
+      return this.responseText.evalJSON(options.sanitizeJSON ||
+        !this.request.isSameOrigin());
+    } catch (e) {
+      this.request.dispatchException(e);
+    }
+  }
+});
+
+Ajax.Updater = Class.create(Ajax.Request, {
+  initialize: function($super, container, url, options) {
+    this.container = {
+      success: (container.success || container),
+      failure: (container.failure || (container.success ? null : container))
+    };
+
+    options = Object.clone(options);
+    var onComplete = options.onComplete;
+    options.onComplete = (function(response, json) {
+      this.updateContent(response.responseText);
+      if (Object.isFunction(onComplete)) onComplete(response, json);
+    }).bind(this);
+
+    $super(url, options);
+  },
+
+  updateContent: function(responseText) {
+    var receiver = this.container[this.success() ? 'success' : 'failure'],
+        options = this.options;
+
+    if (!options.evalScripts) responseText = responseText.stripScripts();
+
+    if (receiver = $(receiver)) {
+      if (options.insertion) {
+        if (Object.isString(options.insertion)) {
+          var insertion = { }; insertion[options.insertion] = responseText;
+          receiver.insert(insertion);
+        }
+        else options.insertion(receiver, responseText);
+      }
+      else receiver.update(responseText);
+    }
+  }
+});
+
+Ajax.PeriodicalUpdater = Class.create(Ajax.Base, {
+  initialize: function($super, container, url, options) {
+    $super(options);
+    this.onComplete = this.options.onComplete;
+
+    this.frequency = (this.options.frequency || 2);
+    this.decay = (this.options.decay || 1);
+
+    this.updater = { };
+    this.container = container;
+    this.url = url;
+
+    this.start();
+  },
+
+  start: function() {
+    this.options.onComplete = this.updateComplete.bind(this);
+    this.onTimerEvent();
+  },
+
+  stop: function() {
+    this.updater.options.onComplete = undefined;
+    clearTimeout(this.timer);
+    (this.onComplete || Prototype.emptyFunction).apply(this, arguments);
+  },
+
+  updateComplete: function(response) {
+    if (this.options.decay) {
+      this.decay = (response.responseText == this.lastText ?
+        this.decay * this.options.decay : 1);
+
+      this.lastText = response.responseText;
+    }
+    this.timer = this.onTimerEvent.bind(this).delay(this.decay * this.frequency);
+  },
+
+  onTimerEvent: function() {
+    this.updater = new Ajax.Updater(this.container, this.url, this.options);
+  }
+});
+function $(element) {
+  if (arguments.length > 1) {
+    for (var i = 0, elements = [], length = arguments.length; i < length; i++)
+      elements.push($(arguments[i]));
+    return elements;
+  }
+  if (Object.isString(element))
+    element = document.getElementById(element);
+  return Element.extend(element);
+}
+
+if (Prototype.BrowserFeatures.XPath) {
+  document._getElementsByXPath = function(expression, parentElement) {
+    var results = [];
+    var query = document.evaluate(expression, $(parentElement) || document,
+      null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
+    for (var i = 0, length = query.snapshotLength; i < length; i++)
+      results.push(Element.extend(query.snapshotItem(i)));
+    return results;
+  };
+}
+
+/*--------------------------------------------------------------------------*/
+
+if (!window.Node) var Node = { };
+
+if (!Node.ELEMENT_NODE) {
+  // DOM level 2 ECMAScript Language Binding
+  Object.extend(Node, {
+    ELEMENT_NODE: 1,
+    ATTRIBUTE_NODE: 2,
+    TEXT_NODE: 3,
+    CDATA_SECTION_NODE: 4,
+    ENTITY_REFERENCE_NODE: 5,
+    ENTITY_NODE: 6,
+    PROCESSING_INSTRUCTION_NODE: 7,
+    COMMENT_NODE: 8,
+    DOCUMENT_NODE: 9,
+    DOCUMENT_TYPE_NODE: 10,
+    DOCUMENT_FRAGMENT_NODE: 11,
+    NOTATION_NODE: 12
+  });
+}
+
+(function() {
+  var element = this.Element;
+  this.Element = function(tagName, attributes) {
+    attributes = attributes || { };
+    tagName = tagName.toLowerCase();
+    var cache = Element.cache;
+    if (Prototype.Browser.IE && attributes.name) {
+      tagName = '<' + tagName + ' name="' + attributes.name + '">';
+      delete attributes.name;
+      return Element.writeAttribute(document.createElement(tagName), attributes);
+    }
+    if (!cache[tagName]) cache[tagName] = Element.extend(document.createElement(tagName));
+    return Element.writeAttribute(cache[tagName].cloneNode(false), attributes);
+  };
+  Object.extend(this.Element, element || { });
+  if (element) this.Element.prototype = element.prototype;
+}).call(window);
+
+Element.cache = { };
+
+Element.Methods = {
+  visible: function(element) {
+    return $(element).style.display != 'none';
+  },
+
+  toggle: function(element) {
+    element = $(element);
+    Element[Element.visible(element) ? 'hide' : 'show'](element);
+    return element;
+  },
+
+  hide: function(element) {
+    element = $(element);
+    element.style.display = 'none';
+    return element;
+  },
+
+  show: function(element) {
+    element = $(element);
+    element.style.display = '';
+    return element;
+  },
+
+  remove: function(element) {
+    element = $(element);
+    element.parentNode.removeChild(element);
+    return element;
+  },
+
+  update: function(element, content) {
+    element = $(element);
+    if (content && content.toElement) content = content.toElement();
+    if (Object.isElement(content)) return element.update().insert(content);
+    content = Object.toHTML(content);
+    element.innerHTML = content.stripScripts();
+    content.evalScripts.bind(content).defer();
+    return element;
+  },
+
+  replace: function(element, content) {
+    element = $(element);
+    if (content && content.toElement) content = content.toElement();
+    else if (!Object.isElement(content)) {
+      content = Object.toHTML(content);
+      var range = element.ownerDocument.createRange();
+      range.selectNode(element);
+      content.evalScripts.bind(content).defer();
+      content = range.createContextualFragment(content.stripScripts());
+    }
+    element.parentNode.replaceChild(content, element);
+    return element;
+  },
+
+  insert: function(element, insertions) {
+    element = $(element);
+
+    if (Object.isString(insertions) || Object.isNumber(insertions) ||
+        Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML)))
+          insertions = {bottom:insertions};
+
+    var content, insert, tagName, childNodes;
+
+    for (var position in insertions) {
+      content  = insertions[position];
+      position = position.toLowerCase();
+      insert = Element._insertionTranslations[position];
+
+      if (content && content.toElement) content = content.toElement();
+      if (Object.isElement(content)) {
+        insert(element, content);
+        continue;
+      }
+
+      content = Object.toHTML(content);
+
+      tagName = ((position == 'before' || position == 'after')
+        ? element.parentNode : element).tagName.toUpperCase();
+
+      childNodes = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
+
+      if (position == 'top' || position == 'after') childNodes.reverse();
+      childNodes.each(insert.curry(element));
+
+      content.evalScripts.bind(content).defer();
+    }
+
+    return element;
+  },
+
+  wrap: function(element, wrapper, attributes) {
+    element = $(element);
+    if (Object.isElement(wrapper))
+      $(wrapper).writeAttribute(attributes || { });
+    else if (Object.isString(wrapper)) wrapper = new Element(wrapper, attributes);
+    else wrapper = new Element('div', wrapper);
+    if (element.parentNode)
+      element.parentNode.replaceChild(wrapper, element);
+    wrapper.appendChild(element);
+    return wrapper;
+  },
+
+  inspect: function(element) {
+    element = $(element);
+    var result = '<' + element.tagName.toLowerCase();
+    $H({'id': 'id', 'className': 'class'}).each(function(pair) {
+      var property = pair.first(), attribute = pair.last();
+      var value = (element[property] || '').toString();
+      if (value) result += ' ' + attribute + '=' + value.inspect(true);
+    });
+    return result + '>';
+  },
+
+  recursivelyCollect: function(element, property) {
+    element = $(element);
+    var elements = [];
+    while (element = element[property])
+      if (element.nodeType == 1)
+        elements.push(Element.extend(element));
+    return elements;
+  },
+
+  ancestors: function(element) {
+    return $(element).recursivelyCollect('parentNode');
+  },
+
+  descendants: function(element) {
+    return $(element).select("*");
+  },
+
+  firstDescendant: function(element) {
+    element = $(element).firstChild;
+    while (element && element.nodeType != 1) element = element.nextSibling;
+    return $(element);
+  },
+
+  immediateDescendants: function(element) {
+    if (!(element = $(element).firstChild)) return [];
+    while (element && element.nodeType != 1) element = element.nextSibling;
+    if (element) return [element].concat($(element).nextSiblings());
+    return [];
+  },
+
+  previousSiblings: function(element) {
+    return $(element).recursivelyCollect('previousSibling');
+  },
+
+  nextSiblings: function(element) {
+    return $(element).recursivelyCollect('nextSibling');
+  },
+
+  siblings: function(element) {
+    element = $(element);
+    return element.previousSiblings().reverse().concat(element.nextSiblings());
+  },
+
+  match: function(element, selector) {
+    if (Object.isString(selector))
+      selector = new Selector(selector);
+    return selector.match($(element));
+  },
+
+  up: function(element, expression, index) {
+    element = $(element);
+    if (arguments.length == 1) return $(element.parentNode);
+    var ancestors = element.ancestors();
+    return Object.isNumber(expression) ? ancestors[expression] :
+      Selector.findElement(ancestors, expression, index);
+  },
+
+  down: function(element, expression, index) {
+    element = $(element);
+    if (arguments.length == 1) return element.firstDescendant();
+    return Object.isNumber(expression) ? element.descendants()[expression] :
+      Element.select(element, expression)[index || 0];
+  },
+
+  previous: function(element, expression, index) {
+    element = $(element);
+    if (arguments.length == 1) return $(Selector.handlers.previousElementSibling(element));
+    var previousSiblings = element.previousSiblings();
+    return Object.isNumber(expression) ? previousSiblings[expression] :
+      Selector.findElement(previousSiblings, expression, index);
+  },
+
+  next: function(element, expression, index) {
+    element = $(element);
+    if (arguments.length == 1) return $(Selector.handlers.nextElementSibling(element));
+    var nextSiblings = element.nextSiblings();
+    return Object.isNumber(expression) ? nextSiblings[expression] :
+      Selector.findElement(nextSiblings, expression, index);
+  },
+
+  select: function() {
+    var args = $A(arguments), element = $(args.shift());
+    return Selector.findChildElements(element, args);
+  },
+
+  adjacent: function() {
+    var args = $A(arguments), element = $(args.shift());
+    return Selector.findChildElements(element.parentNode, args).without(element);
+  },
+
+  identify: function(element) {
+    element = $(element);
+    var id = element.readAttribute('id'), self = arguments.callee;
+    if (id) return id;
+    do { id = 'anonymous_element_' + self.counter++ } while ($(id));
+    element.writeAttribute('id', id);
+    return id;
+  },
+
+  readAttribute: function(element, name) {
+    element = $(element);
+    if (Prototype.Browser.IE) {
+      var t = Element._attributeTranslations.read;
+      if (t.values[name]) return t.values[name](element, name);
+      if (t.names[name]) name = t.names[name];
+      if (name.include(':')) {
+        return (!element.attributes || !element.attributes[name]) ? null :
+         element.attributes[name].value;
+      }
+    }
+    return element.getAttribute(name);
+  },
+
+  writeAttribute: function(element, name, value) {
+    element = $(element);
+    var attributes = { }, t = Element._attributeTranslations.write;
+
+    if (typeof name == 'object') attributes = name;
+    else attributes[name] = Object.isUndefined(value) ? true : value;
+
+    for (var attr in attributes) {
+      name = t.names[attr] || attr;
+      value = attributes[attr];
+      if (t.values[attr]) name = t.values[attr](element, value);
+      if (value === false || value === null)
+        element.removeAttribute(name);
+      else if (value === true)
+        element.setAttribute(name, name);
+      else element.setAttribute(name, value);
+    }
+    return element;
+  },
+
+  getHeight: function(element) {
+    return $(element).getDimensions().height;
+  },
+
+  getWidth: function(element) {
+    return $(element).getDimensions().width;
+  },
+
+  classNames: function(element) {
+    return new Element.ClassNames(element);
+  },
+
+  hasClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    var elementClassName = element.className;
+    return (elementClassName.length > 0 && (elementClassName == className ||
+      new RegExp("(^|\\s)" + className + "(\\s|$)").test(elementClassName)));
+  },
+
+  addClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    if (!element.hasClassName(className))
+      element.className += (element.className ? ' ' : '') + className;
+    return element;
+  },
+
+  removeClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    element.className = element.className.replace(
+      new RegExp("(^|\\s+)" + className + "(\\s+|$)"), ' ').strip();
+    return element;
+  },
+
+  toggleClassName: function(element, className) {
+    if (!(element = $(element))) return;
+    return element[element.hasClassName(className) ?
+      'removeClassName' : 'addClassName'](className);
+  },
+
+  // removes whitespace-only text node children
+  cleanWhitespace: function(element) {
+    element = $(element);
+    var node = element.firstChild;
+    while (node) {
+      var nextNode = node.nextSibling;
+      if (node.nodeType == 3 && !/\S/.test(node.nodeValue))
+        element.removeChild(node);
+      node = nextNode;
+    }
+    return element;
+  },
+
+  empty: function(element) {
+    return $(element).innerHTML.blank();
+  },
+
+  descendantOf: function(element, ancestor) {
+    element = $(element), ancestor = $(ancestor);
+
+    if (element.compareDocumentPosition)
+      return (element.compareDocumentPosition(ancestor) & 8) === 8;
+
+    if (ancestor.contains)
+      return ancestor.contains(element) && ancestor !== element;
+
+    while (element = element.parentNode)
+      if (element == ancestor) return true;
+
+    return false;
+  },
+
+  scrollTo: function(element) {
+    element = $(element);
+    var pos = element.cumulativeOffset();
+    window.scrollTo(pos[0], pos[1]);
+    return element;
+  },
+
+  getStyle: function(element, style) {
+    element = $(element);
+    style = style == 'float' ? 'cssFloat' : style.camelize();
+    var value = element.style[style];
+    if (!value || value == 'auto') {
+      var css = document.defaultView.getComputedStyle(element, null);
+      value = css ? css[style] : null;
+    }
+    if (style == 'opacity') return value ? parseFloat(value) : 1.0;
+    return value == 'auto' ? null : value;
+  },
+
+  getOpacity: function(element) {
+    return $(element).getStyle('opacity');
+  },
+
+  setStyle: function(element, styles) {
+    element = $(element);
+    var elementStyle = element.style, match;
+    if (Object.isString(styles)) {
+      element.style.cssText += ';' + styles;
+      return styles.include('opacity') ?
+        element.setOpacity(styles.match(/opacity:\s*(\d?\.?\d*)/)[1]) : element;
+    }
+    for (var property in styles)
+      if (property == 'opacity') element.setOpacity(styles[property]);
+      else
+        elementStyle[(property == 'float' || property == 'cssFloat') ?
+          (Object.isUndefined(elementStyle.styleFloat) ? 'cssFloat' : 'styleFloat') :
+            property] = styles[property];
+
+    return element;
+  },
+
+  setOpacity: function(element, value) {
+    element = $(element);
+    element.style.opacity = (value == 1 || value === '') ? '' :
+      (value < 0.00001) ? 0 : value;
+    return element;
+  },
+
+  getDimensions: function(element) {
+    element = $(element);
+    var display = element.getStyle('display');
+    if (display != 'none' && display != null) // Safari bug
+      return {width: element.offsetWidth, height: element.offsetHeight};
+
+    // All *Width and *Height properties give 0 on elements with display none,
+    // so enable the element temporarily
+    var els = element.style;
+    var originalVisibility = els.visibility;
+    var originalPosition = els.position;
+    var originalDisplay = els.display;
+    els.visibility = 'hidden';
+    els.position = 'absolute';
+    els.display = 'block';
+    var originalWidth = element.clientWidth;
+    var originalHeight = element.clientHeight;
+    els.display = originalDisplay;
+    els.position = originalPosition;
+    els.visibility = originalVisibility;
+    return {width: originalWidth, height: originalHeight};
+  },
+
+  makePositioned: function(element) {
+    element = $(element);
+    var pos = Element.getStyle(element, 'position');
+    if (pos == 'static' || !pos) {
+      element._madePositioned = true;
+      element.style.position = 'relative';
+      // Opera returns the offset relative to the positioning context, when an
+      // element is position relative but top and left have not been defined
+      if (Prototype.Browser.Opera) {
+        element.style.top = 0;
+        element.style.left = 0;
+      }
+    }
+    return element;
+  },
+
+  undoPositioned: function(element) {
+    element = $(element);
+    if (element._madePositioned) {
+      element._madePositioned = undefined;
+      element.style.position =
+        element.style.top =
+        element.style.left =
+        element.style.bottom =
+        element.style.right = '';
+    }
+    return element;
+  },
+
+  makeClipping: function(element) {
+    element = $(element);
+    if (element._overflow) return element;
+    element._overflow = Element.getStyle(element, 'overflow') || 'auto';
+    if (element._overflow !== 'hidden')
+      element.style.overflow = 'hidden';
+    return element;
+  },
+
+  undoClipping: function(element) {
+    element = $(element);
+    if (!element._overflow) return element;
+    element.style.overflow = element._overflow == 'auto' ? '' : element._overflow;
+    element._overflow = null;
+    return element;
+  },
+
+  cumulativeOffset: function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+      element = element.offsetParent;
+    } while (element);
+    return Element._returnOffset(valueL, valueT);
+  },
+
+  positionedOffset: function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+      element = element.offsetParent;
+      if (element) {
+        if (element.tagName.toUpperCase() == 'BODY') break;
+        var p = Element.getStyle(element, 'position');
+        if (p !== 'static') break;
+      }
+    } while (element);
+    return Element._returnOffset(valueL, valueT);
+  },
+
+  absolutize: function(element) {
+    element = $(element);
+    if (element.getStyle('position') == 'absolute') return element;
+    // Position.prepare(); // To be done manually by Scripty when it needs it.
+
+    var offsets = element.positionedOffset();
+    var top     = offsets[1];
+    var left    = offsets[0];
+    var width   = element.clientWidth;
+    var height  = element.clientHeight;
+
+    element._originalLeft   = left - parseFloat(element.style.left  || 0);
+    element._originalTop    = top  - parseFloat(element.style.top || 0);
+    element._originalWidth  = element.style.width;
+    element._originalHeight = element.style.height;
+
+    element.style.position = 'absolute';
+    element.style.top    = top + 'px';
+    element.style.left   = left + 'px';
+    element.style.width  = width + 'px';
+    element.style.height = height + 'px';
+    return element;
+  },
+
+  relativize: function(element) {
+    element = $(element);
+    if (element.getStyle('position') == 'relative') return element;
+    // Position.prepare(); // To be done manually by Scripty when it needs it.
+
+    element.style.position = 'relative';
+    var top  = parseFloat(element.style.top  || 0) - (element._originalTop || 0);
+    var left = parseFloat(element.style.left || 0) - (element._originalLeft || 0);
+
+    element.style.top    = top + 'px';
+    element.style.left   = left + 'px';
+    element.style.height = element._originalHeight;
+    element.style.width  = element._originalWidth;
+    return element;
+  },
+
+  cumulativeScrollOffset: function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.scrollTop  || 0;
+      valueL += element.scrollLeft || 0;
+      element = element.parentNode;
+    } while (element);
+    return Element._returnOffset(valueL, valueT);
+  },
+
+  getOffsetParent: function(element) {
+    if (element.offsetParent) return $(element.offsetParent);
+    if (element == document.body) return $(element);
+
+    while ((element = element.parentNode) && element != document.body)
+      if (Element.getStyle(element, 'position') != 'static')
+        return $(element);
+
+    return $(document.body);
+  },
+
+  viewportOffset: function(forElement) {
+    var valueT = 0, valueL = 0;
+
+    var element = forElement;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+
+      // Safari fix
+      if (element.offsetParent == document.body &&
+        Element.getStyle(element, 'position') == 'absolute') break;
+
+    } while (element = element.offsetParent);
+
+    element = forElement;
+    do {
+      if (!Prototype.Browser.Opera || (element.tagName && (element.tagName.toUpperCase() == 'BODY'))) {
+        valueT -= element.scrollTop  || 0;
+        valueL -= element.scrollLeft || 0;
+      }
+    } while (element = element.parentNode);
+
+    return Element._returnOffset(valueL, valueT);
+  },
+
+  clonePosition: function(element, source) {
+    var options = Object.extend({
+      setLeft:    true,
+      setTop:     true,
+      setWidth:   true,
+      setHeight:  true,
+      offsetTop:  0,
+      offsetLeft: 0
+    }, arguments[2] || { });
+
+    // find page position of source
+    source = $(source);
+    var p = source.viewportOffset();
+
+    // find coordinate system to use
+    element = $(element);
+    var delta = [0, 0];
+    var parent = null;
+    // delta [0,0] will do fine with position: fixed elements,
+    // position:absolute needs offsetParent deltas
+    if (Element.getStyle(element, 'position') == 'absolute') {
+      parent = element.getOffsetParent();
+      delta = parent.viewportOffset();
+    }
+
+    // correct by body offsets (fixes Safari)
+    if (parent == document.body) {
+      delta[0] -= document.body.offsetLeft;
+      delta[1] -= document.body.offsetTop;
+    }
+
+    // set position
+    if (options.setLeft)   element.style.left  = (p[0] - delta[0] + options.offsetLeft) + 'px';
+    if (options.setTop)    element.style.top   = (p[1] - delta[1] + options.offsetTop) + 'px';
+    if (options.setWidth)  element.style.width = source.offsetWidth + 'px';
+    if (options.setHeight) element.style.height = source.offsetHeight + 'px';
+    return element;
+  }
+};
+
+Element.Methods.identify.counter = 1;
+
+Object.extend(Element.Methods, {
+  getElementsBySelector: Element.Methods.select,
+  childElements: Element.Methods.immediateDescendants
+});
+
+Element._attributeTranslations = {
+  write: {
+    names: {
+      className: 'class',
+      htmlFor:   'for'
+    },
+    values: { }
+  }
+};
+
+if (Prototype.Browser.Opera) {
+  Element.Methods.getStyle = Element.Methods.getStyle.wrap(
+    function(proceed, element, style) {
+      switch (style) {
+        case 'left': case 'top': case 'right': case 'bottom':
+          if (proceed(element, 'position') === 'static') return null;
+        case 'height': case 'width':
+          // returns '0px' for hidden elements; we want it to return null
+          if (!Element.visible(element)) return null;
+
+          // returns the border-box dimensions rather than the content-box
+          // dimensions, so we subtract padding and borders from the value
+          var dim = parseInt(proceed(element, style), 10);
+
+          if (dim !== element['offset' + style.capitalize()])
+            return dim + 'px';
+
+          var properties;
+          if (style === 'height') {
+            properties = ['border-top-width', 'padding-top',
+             'padding-bottom', 'border-bottom-width'];
+          }
+          else {
+            properties = ['border-left-width', 'padding-left',
+             'padding-right', 'border-right-width'];
+          }
+          return properties.inject(dim, function(memo, property) {
+            var val = proceed(element, property);
+            return val === null ? memo : memo - parseInt(val, 10);
+          }) + 'px';
+        default: return proceed(element, style);
+      }
+    }
+  );
+
+  Element.Methods.readAttribute = Element.Methods.readAttribute.wrap(
+    function(proceed, element, attribute) {
+      if (attribute === 'title') return element.title;
+      return proceed(element, attribute);
+    }
+  );
+}
+
+else if (Prototype.Browser.IE) {
+  // IE doesn't report offsets correctly for static elements, so we change them
+  // to "relative" to get the values, then change them back.
+  Element.Methods.getOffsetParent = Element.Methods.getOffsetParent.wrap(
+    function(proceed, element) {
+      element = $(element);
+      // IE throws an error if element is not in document
+      try { element.offsetParent }
+      catch(e) { return $(document.body) }
+      var position = element.getStyle('position');
+      if (position !== 'static') return proceed(element);
+      element.setStyle({ position: 'relative' });
+      var value = proceed(element);
+      element.setStyle({ position: position });
+      return value;
+    }
+  );
+
+  $w('positionedOffset viewportOffset').each(function(method) {
+    Element.Methods[method] = Element.Methods[method].wrap(
+      function(proceed, element) {
+        element = $(element);
+        try { element.offsetParent }
+        catch(e) { return Element._returnOffset(0,0) }
+        var position = element.getStyle('position');
+        if (position !== 'static') return proceed(element);
+        // Trigger hasLayout on the offset parent so that IE6 reports
+        // accurate offsetTop and offsetLeft values for position: fixed.
+        var offsetParent = element.getOffsetParent();
+        if (offsetParent && offsetParent.getStyle('position') === 'fixed')
+          offsetParent.setStyle({ zoom: 1 });
+        element.setStyle({ position: 'relative' });
+        var value = proceed(element);
+        element.setStyle({ position: position });
+        return value;
+      }
+    );
+  });
+
+  Element.Methods.cumulativeOffset = Element.Methods.cumulativeOffset.wrap(
+    function(proceed, element) {
+      try { element.offsetParent }
+      catch(e) { return Element._returnOffset(0,0) }
+      return proceed(element);
+    }
+  );
+
+  Element.Methods.getStyle = function(element, style) {
+    element = $(element);
+    style = (style == 'float' || style == 'cssFloat') ? 'styleFloat' : style.camelize();
+    var value = element.style[style];
+    if (!value && element.currentStyle) value = element.currentStyle[style];
+
+    if (style == 'opacity') {
+      if (value = (element.getStyle('filter') || '').match(/alpha\(opacity=(.*)\)/))
+        if (value[1]) return parseFloat(value[1]) / 100;
+      return 1.0;
+    }
+
+    if (value == 'auto') {
+      if ((style == 'width' || style == 'height') && (element.getStyle('display') != 'none'))
+        return element['offset' + style.capitalize()] + 'px';
+      return null;
+    }
+    return value;
+  };
+
+  Element.Methods.setOpacity = function(element, value) {
+    function stripAlpha(filter){
+      return filter.replace(/alpha\([^\)]*\)/gi,'');
+    }
+    element = $(element);
+    var currentStyle = element.currentStyle;
+    if ((currentStyle && !currentStyle.hasLayout) ||
+      (!currentStyle && element.style.zoom == 'normal'))
+        element.style.zoom = 1;
+
+    var filter = element.getStyle('filter'), style = element.style;
+    if (value == 1 || value === '') {
+      (filter = stripAlpha(filter)) ?
+        style.filter = filter : style.removeAttribute('filter');
+      return element;
+    } else if (value < 0.00001) value = 0;
+    style.filter = stripAlpha(filter) +
+      'alpha(opacity=' + (value * 100) + ')';
+    return element;
+  };
+
+  Element._attributeTranslations = {
+    read: {
+      names: {
+        'class': 'className',
+        'for':   'htmlFor'
+      },
+      values: {
+        _getAttr: function(element, attribute) {
+          return element.getAttribute(attribute, 2);
+        },
+        _getAttrNode: function(element, attribute) {
+          var node = element.getAttributeNode(attribute);
+          return node ? node.value : "";
+        },
+        _getEv: function(element, attribute) {
+          attribute = element.getAttribute(attribute);
+          return attribute ? attribute.toString().slice(23, -2) : null;
+        },
+        _flag: function(element, attribute) {
+          return $(element).hasAttribute(attribute) ? attribute : null;
+        },
+        style: function(element) {
+          return element.style.cssText.toLowerCase();
+        },
+        title: function(element) {
+          return element.title;
+        }
+      }
+    }
+  };
+
+  Element._attributeTranslations.write = {
+    names: Object.extend({
+      cellpadding: 'cellPadding',
+      cellspacing: 'cellSpacing'
+    }, Element._attributeTranslations.read.names),
+    values: {
+      checked: function(element, value) {
+        element.checked = !!value;
+      },
+
+      style: function(element, value) {
+        element.style.cssText = value ? value : '';
+      }
+    }
+  };
+
+  Element._attributeTranslations.has = {};
+
+  $w('colSpan rowSpan vAlign dateTime accessKey tabIndex ' +
+      'encType maxLength readOnly longDesc frameBorder').each(function(attr) {
+    Element._attributeTranslations.write.names[attr.toLowerCase()] = attr;
+    Element._attributeTranslations.has[attr.toLowerCase()] = attr;
+  });
+
+  (function(v) {
+    Object.extend(v, {
+      href:        v._getAttr,
+      src:         v._getAttr,
+      type:        v._getAttr,
+      action:      v._getAttrNode,
+      disabled:    v._flag,
+      checked:     v._flag,
+      readonly:    v._flag,
+      multiple:    v._flag,
+      onload:      v._getEv,
+      onunload:    v._getEv,
+      onclick:     v._getEv,
+      ondblclick:  v._getEv,
+      onmousedown: v._getEv,
+      onmouseup:   v._getEv,
+      onmouseover: v._getEv,
+      onmousemove: v._getEv,
+      onmouseout:  v._getEv,
+      onfocus:     v._getEv,
+      onblur:      v._getEv,
+      onkeypress:  v._getEv,
+      onkeydown:   v._getEv,
+      onkeyup:     v._getEv,
+      onsubmit:    v._getEv,
+      onreset:     v._getEv,
+      onselect:    v._getEv,
+      onchange:    v._getEv
+    });
+  })(Element._attributeTranslations.read.values);
+}
+
+else if (Prototype.Browser.Gecko && /rv:1\.8\.0/.test(navigator.userAgent)) {
+  Element.Methods.setOpacity = function(element, value) {
+    element = $(element);
+    element.style.opacity = (value == 1) ? 0.999999 :
+      (value === '') ? '' : (value < 0.00001) ? 0 : value;
+    return element;
+  };
+}
+
+else if (Prototype.Browser.WebKit) {
+  Element.Methods.setOpacity = function(element, value) {
+    element = $(element);
+    element.style.opacity = (value == 1 || value === '') ? '' :
+      (value < 0.00001) ? 0 : value;
+
+    if (value == 1)
+      if(element.tagName.toUpperCase() == 'IMG' && element.width) {
+        element.width++; element.width--;
+      } else try {
+        var n = document.createTextNode(' ');
+        element.appendChild(n);
+        element.removeChild(n);
+      } catch (e) { }
+
+    return element;
+  };
+
+  // Safari returns margins on body which is incorrect if the child is absolutely
+  // positioned.  For performance reasons, redefine Element#cumulativeOffset for
+  // KHTML/WebKit only.
+  Element.Methods.cumulativeOffset = function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+      if (element.offsetParent == document.body)
+        if (Element.getStyle(element, 'position') == 'absolute') break;
+
+      element = element.offsetParent;
+    } while (element);
+
+    return Element._returnOffset(valueL, valueT);
+  };
+}
+
+if (Prototype.Browser.IE || Prototype.Browser.Opera) {
+  // IE and Opera are missing .innerHTML support for TABLE-related and SELECT elements
+  Element.Methods.update = function(element, content) {
+    element = $(element);
+
+    if (content && content.toElement) content = content.toElement();
+    if (Object.isElement(content)) return element.update().insert(content);
+
+    content = Object.toHTML(content);
+    var tagName = element.tagName.toUpperCase();
+
+    if (tagName in Element._insertionTranslations.tags) {
+      $A(element.childNodes).each(function(node) { element.removeChild(node) });
+      Element._getContentFromAnonymousElement(tagName, content.stripScripts())
+        .each(function(node) { element.appendChild(node) });
+    }
+    else element.innerHTML = content.stripScripts();
+
+    content.evalScripts.bind(content).defer();
+    return element;
+  };
+}
+
+if ('outerHTML' in document.createElement('div')) {
+  Element.Methods.replace = function(element, content) {
+    element = $(element);
+
+    if (content && content.toElement) content = content.toElement();
+    if (Object.isElement(content)) {
+      element.parentNode.replaceChild(content, element);
+      return element;
+    }
+
+    content = Object.toHTML(content);
+    var parent = element.parentNode, tagName = parent.tagName.toUpperCase();
+
+    if (Element._insertionTranslations.tags[tagName]) {
+      var nextSibling = element.next();
+      var fragments = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
+      parent.removeChild(element);
+      if (nextSibling)
+        fragments.each(function(node) { parent.insertBefore(node, nextSibling) });
+      else
+        fragments.each(function(node) { parent.appendChild(node) });
+    }
+    else element.outerHTML = content.stripScripts();
+
+    content.evalScripts.bind(content).defer();
+    return element;
+  };
+}
+
+Element._returnOffset = function(l, t) {
+  var result = [l, t];
+  result.left = l;
+  result.top = t;
+  return result;
+};
+
+Element._getContentFromAnonymousElement = function(tagName, html) {
+  var div = new Element('div'), t = Element._insertionTranslations.tags[tagName];
+  if (t) {
+    div.innerHTML = t[0] + html + t[1];
+    t[2].times(function() { div = div.firstChild });
+  } else div.innerHTML = html;
+  return $A(div.childNodes);
+};
+
+Element._insertionTranslations = {
+  before: function(element, node) {
+    element.parentNode.insertBefore(node, element);
+  },
+  top: function(element, node) {
+    element.insertBefore(node, element.firstChild);
+  },
+  bottom: function(element, node) {
+    element.appendChild(node);
+  },
+  after: function(element, node) {
+    element.parentNode.insertBefore(node, element.nextSibling);
+  },
+  tags: {
+    TABLE:  ['<table>',                '</table>',                   1],
+    TBODY:  ['<table><tbody>',         '</tbody></table>',           2],
+    TR:     ['<table><tbody><tr>',     '</tr></tbody></table>',      3],
+    TD:     ['<table><tbody><tr><td>', '</td></tr></tbody></table>', 4],
+    SELECT: ['<select>',               '</select>',                  1]
+  }
+};
+
+(function() {
+  Object.extend(this.tags, {
+    THEAD: this.tags.TBODY,
+    TFOOT: this.tags.TBODY,
+    TH:    this.tags.TD
+  });
+}).call(Element._insertionTranslations);
+
+Element.Methods.Simulated = {
+  hasAttribute: function(element, attribute) {
+    attribute = Element._attributeTranslations.has[attribute] || attribute;
+    var node = $(element).getAttributeNode(attribute);
+    return !!(node && node.specified);
+  }
+};
+
+Element.Methods.ByTag = { };
+
+Object.extend(Element, Element.Methods);
+
+if (!Prototype.BrowserFeatures.ElementExtensions &&
+    document.createElement('div')['__proto__']) {
+  window.HTMLElement = { };
+  window.HTMLElement.prototype = document.createElement('div')['__proto__'];
+  Prototype.BrowserFeatures.ElementExtensions = true;
+}
+
+Element.extend = (function() {
+  if (Prototype.BrowserFeatures.SpecificElementExtensions)
+    return Prototype.K;
+
+  var Methods = { }, ByTag = Element.Methods.ByTag;
+
+  var extend = Object.extend(function(element) {
+    if (!element || element._extendedByPrototype ||
+        element.nodeType != 1 || element == window) return element;
+
+    var methods = Object.clone(Methods),
+      tagName = element.tagName.toUpperCase(), property, value;
+
+    // extend methods for specific tags
+    if (ByTag[tagName]) Object.extend(methods, ByTag[tagName]);
+
+    for (property in methods) {
+      value = methods[property];
+      if (Object.isFunction(value) && !(property in element))
+        element[property] = value.methodize();
+    }
+
+    element._extendedByPrototype = Prototype.emptyFunction;
+    return element;
+
+  }, {
+    refresh: function() {
+      // extend methods for all tags (Safari doesn't need this)
+      if (!Prototype.BrowserFeatures.ElementExtensions) {
+        Object.extend(Methods, Element.Methods);
+        Object.extend(Methods, Element.Methods.Simulated);
+      }
+    }
+  });
+
+  extend.refresh();
+  return extend;
+})();
+
+Element.hasAttribute = function(element, attribute) {
+  if (element.hasAttribute) return element.hasAttribute(attribute);
+  return Element.Methods.Simulated.hasAttribute(element, attribute);
+};
+
+Element.addMethods = function(methods) {
+  var F = Prototype.BrowserFeatures, T = Element.Methods.ByTag;
+
+  if (!methods) {
+    Object.extend(Form, Form.Methods);
+    Object.extend(Form.Element, Form.Element.Methods);
+    Object.extend(Element.Methods.ByTag, {
+      "FORM":     Object.clone(Form.Methods),
+      "INPUT":    Object.clone(Form.Element.Methods),
+      "SELECT":   Object.clone(Form.Element.Methods),
+      "TEXTAREA": Object.clone(Form.Element.Methods)
+    });
+  }
+
+  if (arguments.length == 2) {
+    var tagName = methods;
+    methods = arguments[1];
+  }
+
+  if (!tagName) Object.extend(Element.Methods, methods || { });
+  else {
+    if (Object.isArray(tagName)) tagName.each(extend);
+    else extend(tagName);
+  }
+
+  function extend(tagName) {
+    tagName = tagName.toUpperCase();
+    if (!Element.Methods.ByTag[tagName])
+      Element.Methods.ByTag[tagName] = { };
+    Object.extend(Element.Methods.ByTag[tagName], methods);
+  }
+
+  function copy(methods, destination, onlyIfAbsent) {
+    onlyIfAbsent = onlyIfAbsent || false;
+    for (var property in methods) {
+      var value = methods[property];
+      if (!Object.isFunction(value)) continue;
+      if (!onlyIfAbsent || !(property in destination))
+        destination[property] = value.methodize();
+    }
+  }
+
+  function findDOMClass(tagName) {
+    var klass;
+    var trans = {
+      "OPTGROUP": "OptGroup", "TEXTAREA": "TextArea", "P": "Paragraph",
+      "FIELDSET": "FieldSet", "UL": "UList", "OL": "OList", "DL": "DList",
+      "DIR": "Directory", "H1": "Heading", "H2": "Heading", "H3": "Heading",
+      "H4": "Heading", "H5": "Heading", "H6": "Heading", "Q": "Quote",
+      "INS": "Mod", "DEL": "Mod", "A": "Anchor", "IMG": "Image", "CAPTION":
+      "TableCaption", "COL": "TableCol", "COLGROUP": "TableCol", "THEAD":
+      "TableSection", "TFOOT": "TableSection", "TBODY": "TableSection", "TR":
+      "TableRow", "TH": "TableCell", "TD": "TableCell", "FRAMESET":
+      "FrameSet", "IFRAME": "IFrame"
+    };
+    if (trans[tagName]) klass = 'HTML' + trans[tagName] + 'Element';
+    if (window[klass]) return window[klass];
+    klass = 'HTML' + tagName + 'Element';
+    if (window[klass]) return window[klass];
+    klass = 'HTML' + tagName.capitalize() + 'Element';
+    if (window[klass]) return window[klass];
+
+    window[klass] = { };
+    window[klass].prototype = document.createElement(tagName)['__proto__'];
+    return window[klass];
+  }
+
+  if (F.ElementExtensions) {
+    copy(Element.Methods, HTMLElement.prototype);
+    copy(Element.Methods.Simulated, HTMLElement.prototype, true);
+  }
+
+  if (F.SpecificElementExtensions) {
+    for (var tag in Element.Methods.ByTag) {
+      var klass = findDOMClass(tag);
+      if (Object.isUndefined(klass)) continue;
+      copy(T[tag], klass.prototype);
+    }
+  }
+
+  Object.extend(Element, Element.Methods);
+  delete Element.ByTag;
+
+  if (Element.extend.refresh) Element.extend.refresh();
+  Element.cache = { };
+};
+
+document.viewport = {
+  getDimensions: function() {
+    var dimensions = { }, B = Prototype.Browser;
+    $w('width height').each(function(d) {
+      var D = d.capitalize();
+      if (B.WebKit && !document.evaluate) {
+        // Safari <3.0 needs self.innerWidth/Height
+        dimensions[d] = self['inner' + D];
+      } else if (B.Opera && parseFloat(window.opera.version()) < 9.5) {
+        // Opera <9.5 needs document.body.clientWidth/Height
+        dimensions[d] = document.body['client' + D]
+      } else {
+        dimensions[d] = document.documentElement['client' + D];
+      }
+    });
+    return dimensions;
+  },
+
+  getWidth: function() {
+    return this.getDimensions().width;
+  },
+
+  getHeight: function() {
+    return this.getDimensions().height;
+  },
+
+  getScrollOffsets: function() {
+    return Element._returnOffset(
+      window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft,
+      window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop);
+  }
+};
+/* Portions of the Selector class are derived from Jack Slocum's DomQuery,
+ * part of YUI-Ext version 0.40, distributed under the terms of an MIT-style
+ * license.  Please see http://www.yui-ext.com/ for more information. */
+
+var Selector = Class.create({
+  initialize: function(expression) {
+    this.expression = expression.strip();
+
+    if (this.shouldUseSelectorsAPI()) {
+      this.mode = 'selectorsAPI';
+    } else if (this.shouldUseXPath()) {
+      this.mode = 'xpath';
+      this.compileXPathMatcher();
+    } else {
+      this.mode = "normal";
+      this.compileMatcher();
+    }
+
+  },
+
+  shouldUseXPath: function() {
+    if (!Prototype.BrowserFeatures.XPath) return false;
+
+    var e = this.expression;
+
+    // Safari 3 chokes on :*-of-type and :empty
+    if (Prototype.Browser.WebKit &&
+     (e.include("-of-type") || e.include(":empty")))
+      return false;
+
+    // XPath can't do namespaced attributes, nor can it read
+    // the "checked" property from DOM nodes
+    if ((/(\[[\w-]*?:|:checked)/).test(e))
+      return false;
+
+    return true;
+  },
+
+  shouldUseSelectorsAPI: function() {
+    if (!Prototype.BrowserFeatures.SelectorsAPI) return false;
+
+    if (!Selector._div) Selector._div = new Element('div');
+
+    // Make sure the browser treats the selector as valid. Test on an
+    // isolated element to minimize cost of this check.
+    try {
+      Selector._div.querySelector(this.expression);
+    } catch(e) {
+      return false;
+    }
+
+    return true;
+  },
+
+  compileMatcher: function() {
+    var e = this.expression, ps = Selector.patterns, h = Selector.handlers,
+        c = Selector.criteria, le, p, m;
+
+    if (Selector._cache[e]) {
+      this.matcher = Selector._cache[e];
+      return;
+    }
+
+    this.matcher = ["this.matcher = function(root) {",
+                    "var r = root, h = Selector.handlers, c = false, n;"];
+
+    while (e && le != e && (/\S/).test(e)) {
+      le = e;
+      for (var i in ps) {
+        p = ps[i];
+        if (m = e.match(p)) {
+          this.matcher.push(Object.isFunction(c[i]) ? c[i](m) :
+            new Template(c[i]).evaluate(m));
+          e = e.replace(m[0], '');
+          break;
+        }
+      }
+    }
+
+    this.matcher.push("return h.unique(n);\n}");
+    eval(this.matcher.join('\n'));
+    Selector._cache[this.expression] = this.matcher;
+  },
+
+  compileXPathMatcher: function() {
+    var e = this.expression, ps = Selector.patterns,
+        x = Selector.xpath, le, m;
+
+    if (Selector._cache[e]) {
+      this.xpath = Selector._cache[e]; return;
+    }
+
+    this.matcher = ['.//*'];
+    while (e && le != e && (/\S/).test(e)) {
+      le = e;
+      for (var i in ps) {
+        if (m = e.match(ps[i])) {
+          this.matcher.push(Object.isFunction(x[i]) ? x[i](m) :
+            new Template(x[i]).evaluate(m));
+          e = e.replace(m[0], '');
+          break;
+        }
+      }
+    }
+
+    this.xpath = this.matcher.join('');
+    Selector._cache[this.expression] = this.xpath;
+  },
+
+  findElements: function(root) {
+    root = root || document;
+    var e = this.expression, results;
+
+    switch (this.mode) {
+      case 'selectorsAPI':
+        // querySelectorAll queries document-wide, then filters to descendants
+        // of the context element. That's not what we want.
+        // Add an explicit context to the selector if necessary.
+        if (root !== document) {
+          var oldId = root.id, id = $(root).identify();
+          e = "#" + id + " " + e;
+        }
+
+        results = $A(root.querySelectorAll(e)).map(Element.extend);
+        root.id = oldId;
+
+        return results;
+      case 'xpath':
+        return document._getElementsByXPath(this.xpath, root);
+      default:
+       return this.matcher(root);
+    }
+  },
+
+  match: function(element) {
+    this.tokens = [];
+
+    var e = this.expression, ps = Selector.patterns, as = Selector.assertions;
+    var le, p, m;
+
+    while (e && le !== e && (/\S/).test(e)) {
+      le = e;
+      for (var i in ps) {
+        p = ps[i];
+        if (m = e.match(p)) {
+          // use the Selector.assertions methods unless the selector
+          // is too complex.
+          if (as[i]) {
+            this.tokens.push([i, Object.clone(m)]);
+            e = e.replace(m[0], '');
+          } else {
+            // reluctantly do a document-wide search
+            // and look for a match in the array
+            return this.findElements(document).include(element);
+          }
+        }
+      }
+    }
+
+    var match = true, name, matches;
+    for (var i = 0, token; token = this.tokens[i]; i++) {
+      name = token[0], matches = token[1];
+      if (!Selector.assertions[name](element, matches)) {
+        match = false; break;
+      }
+    }
+
+    return match;
+  },
+
+  toString: function() {
+    return this.expression;
+  },
+
+  inspect: function() {
+    return "#<Selector:" + this.expression.inspect() + ">";
+  }
+});
+
+Object.extend(Selector, {
+  _cache: { },
+
+  xpath: {
+    descendant:   "//*",
+    child:        "/*",
+    adjacent:     "/following-sibling::*[1]",
+    laterSibling: '/following-sibling::*',
+    tagName:      function(m) {
+      if (m[1] == '*') return '';
+      return "[local-name()='" + m[1].toLowerCase() +
+             "' or local-name()='" + m[1].toUpperCase() + "']";
+    },
+    className:    "[contains(concat(' ', @class, ' '), ' #{1} ')]",
+    id:           "[@id='#{1}']",
+    attrPresence: function(m) {
+      m[1] = m[1].toLowerCase();
+      return new Template("[@#{1}]").evaluate(m);
+    },
+    attr: function(m) {
+      m[1] = m[1].toLowerCase();
+      m[3] = m[5] || m[6];
+      return new Template(Selector.xpath.operators[m[2]]).evaluate(m);
+    },
+    pseudo: function(m) {
+      var h = Selector.xpath.pseudos[m[1]];
+      if (!h) return '';
+      if (Object.isFunction(h)) return h(m);
+      return new Template(Selector.xpath.pseudos[m[1]]).evaluate(m);
+    },
+    operators: {
+      '=':  "[@#{1}='#{3}']",
+      '!=': "[@#{1}!='#{3}']",
+      '^=': "[starts-with(@#{1}, '#{3}')]",
+      '$=': "[substring(@#{1}, (string-length(@#{1}) - string-length('#{3}') + 1))='#{3}']",
+      '*=': "[contains(@#{1}, '#{3}')]",
+      '~=': "[contains(concat(' ', @#{1}, ' '), ' #{3} ')]",
+      '|=': "[contains(concat('-', @#{1}, '-'), '-#{3}-')]"
+    },
+    pseudos: {
+      'first-child': '[not(preceding-sibling::*)]',
+      'last-child':  '[not(following-sibling::*)]',
+      'only-child':  '[not(preceding-sibling::* or following-sibling::*)]',
+      'empty':       "[count(*) = 0 and (count(text()) = 0)]",
+      'checked':     "[@checked]",
+      'disabled':    "[(@disabled) and (@type!='hidden')]",
+      'enabled':     "[not(@disabled) and (@type!='hidden')]",
+      'not': function(m) {
+        var e = m[6], p = Selector.patterns,
+            x = Selector.xpath, le, v;
+
+        var exclusion = [];
+        while (e && le != e && (/\S/).test(e)) {
+          le = e;
+          for (var i in p) {
+            if (m = e.match(p[i])) {
+              v = Object.isFunction(x[i]) ? x[i](m) : new Template(x[i]).evaluate(m);
+              exclusion.push("(" + v.substring(1, v.length - 1) + ")");
+              e = e.replace(m[0], '');
+              break;
+            }
+          }
+        }
+        return "[not(" + exclusion.join(" and ") + ")]";
+      },
+      'nth-child':      function(m) {
+        return Selector.xpath.pseudos.nth("(count(./preceding-sibling::*) + 1) ", m);
+      },
+      'nth-last-child': function(m) {
+        return Selector.xpath.pseudos.nth("(count(./following-sibling::*) + 1) ", m);
+      },
+      'nth-of-type':    function(m) {
+        return Selector.xpath.pseudos.nth("position() ", m);
+      },
+      'nth-last-of-type': function(m) {
+        return Selector.xpath.pseudos.nth("(last() + 1 - position()) ", m);
+      },
+      'first-of-type':  function(m) {
+        m[6] = "1"; return Selector.xpath.pseudos['nth-of-type'](m);
+      },
+      'last-of-type':   function(m) {
+        m[6] = "1"; return Selector.xpath.pseudos['nth-last-of-type'](m);
+      },
+      'only-of-type':   function(m) {
+        var p = Selector.xpath.pseudos; return p['first-of-type'](m) + p['last-of-type'](m);
+      },
+      nth: function(fragment, m) {
+        var mm, formula = m[6], predicate;
+        if (formula == 'even') formula = '2n+0';
+        if (formula == 'odd')  formula = '2n+1';
+        if (mm = formula.match(/^(\d+)$/)) // digit only
+          return '[' + fragment + "= " + mm[1] + ']';
+        if (mm = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
+          if (mm[1] == "-") mm[1] = -1;
+          var a = mm[1] ? Number(mm[1]) : 1;
+          var b = mm[2] ? Number(mm[2]) : 0;
+          predicate = "[((#{fragment} - #{b}) mod #{a} = 0) and " +
+          "((#{fragment} - #{b}) div #{a} >= 0)]";
+          return new Template(predicate).evaluate({
+            fragment: fragment, a: a, b: b });
+        }
+      }
+    }
+  },
+
+  criteria: {
+    tagName:      'n = h.tagName(n, r, "#{1}", c);      c = false;',
+    className:    'n = h.className(n, r, "#{1}", c);    c = false;',
+    id:           'n = h.id(n, r, "#{1}", c);           c = false;',
+    attrPresence: 'n = h.attrPresence(n, r, "#{1}", c); c = false;',
+    attr: function(m) {
+      m[3] = (m[5] || m[6]);
+      return new Template('n = h.attr(n, r, "#{1}", "#{3}", "#{2}", c); c = false;').evaluate(m);
+    },
+    pseudo: function(m) {
+      if (m[6]) m[6] = m[6].replace(/"/g, '\\"');
+      return new Template('n = h.pseudo(n, "#{1}", "#{6}", r, c); c = false;').evaluate(m);
+    },
+    descendant:   'c = "descendant";',
+    child:        'c = "child";',
+    adjacent:     'c = "adjacent";',
+    laterSibling: 'c = "laterSibling";'
+  },
+
+  patterns: {
+    // combinators must be listed first
+    // (and descendant needs to be last combinator)
+    laterSibling: /^\s*~\s*/,
+    child:        /^\s*>\s*/,
+    adjacent:     /^\s*\+\s*/,
+    descendant:   /^\s/,
+
+    // selectors follow
+    tagName:      /^\s*(\*|[\w\-]+)(\b|$)?/,
+    id:           /^#([\w\-\*]+)(\b|$)/,
+    className:    /^\.([\w\-\*]+)(\b|$)/,
+    pseudo:
+/^:((first|last|nth|nth-last|only)(-child|-of-type)|empty|checked|(en|dis)abled|not)(\((.*?)\))?(\b|$|(?=\s|[:+~>]))/,
+    attrPresence: /^\[((?:[\w]+:)?[\w]+)\]/,
+    attr:         /\[((?:[\w-]*:)?[\w-]+)\s*(?:([!^$*~|]?=)\s*((['"])([^\4]*?)\4|([^'"][^\]]*?)))?\]/
+  },
+
+  // for Selector.match and Element#match
+  assertions: {
+    tagName: function(element, matches) {
+      return matches[1].toUpperCase() == element.tagName.toUpperCase();
+    },
+
+    className: function(element, matches) {
+      return Element.hasClassName(element, matches[1]);
+    },
+
+    id: function(element, matches) {
+      return element.id === matches[1];
+    },
+
+    attrPresence: function(element, matches) {
+      return Element.hasAttribute(element, matches[1]);
+    },
+
+    attr: function(element, matches) {
+      var nodeValue = Element.readAttribute(element, matches[1]);
+      return nodeValue && Selector.operators[matches[2]](nodeValue, matches[5] || matches[6]);
+    }
+  },
+
+  handlers: {
+    // UTILITY FUNCTIONS
+    // joins two collections
+    concat: function(a, b) {
+      for (var i = 0, node; node = b[i]; i++)
+        a.push(node);
+      return a;
+    },
+
+    // marks an array of nodes for counting
+    mark: function(nodes) {
+      var _true = Prototype.emptyFunction;
+      for (var i = 0, node; node = nodes[i]; i++)
+        node._countedByPrototype = _true;
+      return nodes;
+    },
+
+    unmark: function(nodes) {
+      for (var i = 0, node; node = nodes[i]; i++)
+        node._countedByPrototype = undefined;
+      return nodes;
+    },
+
+    // mark each child node with its position (for nth calls)
+    // "ofType" flag indicates whether we're indexing for nth-of-type
+    // rather than nth-child
+    index: function(parentNode, reverse, ofType) {
+      parentNode._countedByPrototype = Prototype.emptyFunction;
+      if (reverse) {
+        for (var nodes = parentNode.childNodes, i = nodes.length - 1, j = 1; i >= 0; i--) {
+          var node = nodes[i];
+          if (node.nodeType == 1 && (!ofType || node._countedByPrototype)) node.nodeIndex = j++;
+        }
+      } else {
+        for (var i = 0, j = 1, nodes = parentNode.childNodes; node = nodes[i]; i++)
+          if (node.nodeType == 1 && (!ofType || node._countedByPrototype)) node.nodeIndex = j++;
+      }
+    },
+
+    // filters out duplicates and extends all nodes
+    unique: function(nodes) {
+      if (nodes.length == 0) return nodes;
+      var results = [], n;
+      for (var i = 0, l = nodes.length; i < l; i++)
+        if (!(n = nodes[i])._countedByPrototype) {
+          n._countedByPrototype = Prototype.emptyFunction;
+          results.push(Element.extend(n));
+        }
+      return Selector.handlers.unmark(results);
+    },
+
+    // COMBINATOR FUNCTIONS
+    descendant: function(nodes) {
+      var h = Selector.handlers;
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        h.concat(results, node.getElementsByTagName('*'));
+      return results;
+    },
+
+    child: function(nodes) {
+      var h = Selector.handlers;
+      for (var i = 0, results = [], node; node = nodes[i]; i++) {
+        for (var j = 0, child; child = node.childNodes[j]; j++)
+          if (child.nodeType == 1 && child.tagName != '!') results.push(child);
+      }
+      return results;
+    },
+
+    adjacent: function(nodes) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++) {
+        var next = this.nextElementSibling(node);
+        if (next) results.push(next);
+      }
+      return results;
+    },
+
+    laterSibling: function(nodes) {
+      var h = Selector.handlers;
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        h.concat(results, Element.nextSiblings(node));
+      return results;
+    },
+
+    nextElementSibling: function(node) {
+      while (node = node.nextSibling)
+        if (node.nodeType == 1) return node;
+      return null;
+    },
+
+    previousElementSibling: function(node) {
+      while (node = node.previousSibling)
+        if (node.nodeType == 1) return node;
+      return null;
+    },
+
+    // TOKEN FUNCTIONS
+    tagName: function(nodes, root, tagName, combinator) {
+      var uTagName = tagName.toUpperCase();
+      var results = [], h = Selector.handlers;
+      if (nodes) {
+        if (combinator) {
+          // fastlane for ordinary descendant combinators
+          if (combinator == "descendant") {
+            for (var i = 0, node; node = nodes[i]; i++)
+              h.concat(results, node.getElementsByTagName(tagName));
+            return results;
+          } else nodes = this[combinator](nodes);
+          if (tagName == "*") return nodes;
+        }
+        for (var i = 0, node; node = nodes[i]; i++)
+          if (node.tagName.toUpperCase() === uTagName) results.push(node);
+        return results;
+      } else return root.getElementsByTagName(tagName);
+    },
+
+    id: function(nodes, root, id, combinator) {
+      var targetNode = $(id), h = Selector.handlers;
+      if (!targetNode) return [];
+      if (!nodes && root == document) return [targetNode];
+      if (nodes) {
+        if (combinator) {
+          if (combinator == 'child') {
+            for (var i = 0, node; node = nodes[i]; i++)
+              if (targetNode.parentNode == node) return [targetNode];
+          } else if (combinator == 'descendant') {
+            for (var i = 0, node; node = nodes[i]; i++)
+              if (Element.descendantOf(targetNode, node)) return [targetNode];
+          } else if (combinator == 'adjacent') {
+            for (var i = 0, node; node = nodes[i]; i++)
+              if (Selector.handlers.previousElementSibling(targetNode) == node)
+                return [targetNode];
+          } else nodes = h[combinator](nodes);
+        }
+        for (var i = 0, node; node = nodes[i]; i++)
+          if (node == targetNode) return [targetNode];
+        return [];
+      }
+      return (targetNode && Element.descendantOf(targetNode, root)) ? [targetNode] : [];
+    },
+
+    className: function(nodes, root, className, combinator) {
+      if (nodes && combinator) nodes = this[combinator](nodes);
+      return Selector.handlers.byClassName(nodes, root, className);
+    },
+
+    byClassName: function(nodes, root, className) {
+      if (!nodes) nodes = Selector.handlers.descendant([root]);
+      var needle = ' ' + className + ' ';
+      for (var i = 0, results = [], node, nodeClassName; node = nodes[i]; i++) {
+        nodeClassName = node.className;
+        if (nodeClassName.length == 0) continue;
+        if (nodeClassName == className || (' ' + nodeClassName + ' ').include(needle))
+          results.push(node);
+      }
+      return results;
+    },
+
+    attrPresence: function(nodes, root, attr, combinator) {
+      if (!nodes) nodes = root.getElementsByTagName("*");
+      if (nodes && combinator) nodes = this[combinator](nodes);
+      var results = [];
+      for (var i = 0, node; node = nodes[i]; i++)
+        if (Element.hasAttribute(node, attr)) results.push(node);
+      return results;
+    },
+
+    attr: function(nodes, root, attr, value, operator, combinator) {
+      if (!nodes) nodes = root.getElementsByTagName("*");
+      if (nodes && combinator) nodes = this[combinator](nodes);
+      var handler = Selector.operators[operator], results = [];
+      for (var i = 0, node; node = nodes[i]; i++) {
+        var nodeValue = Element.readAttribute(node, attr);
+        if (nodeValue === null) continue;
+        if (handler(nodeValue, value)) results.push(node);
+      }
+      return results;
+    },
+
+    pseudo: function(nodes, name, value, root, combinator) {
+      if (nodes && combinator) nodes = this[combinator](nodes);
+      if (!nodes) nodes = root.getElementsByTagName("*");
+      return Selector.pseudos[name](nodes, value, root);
+    }
+  },
+
+  pseudos: {
+    'first-child': function(nodes, value, root) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++) {
+        if (Selector.handlers.previousElementSibling(node)) continue;
+          results.push(node);
+      }
+      return results;
+    },
+    'last-child': function(nodes, value, root) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++) {
+        if (Selector.handlers.nextElementSibling(node)) continue;
+          results.push(node);
+      }
+      return results;
+    },
+    'only-child': function(nodes, value, root) {
+      var h = Selector.handlers;
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        if (!h.previousElementSibling(node) && !h.nextElementSibling(node))
+          results.push(node);
+      return results;
+    },
+    'nth-child':        function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, formula, root);
+    },
+    'nth-last-child':   function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, formula, root, true);
+    },
+    'nth-of-type':      function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, formula, root, false, true);
+    },
+    'nth-last-of-type': function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, formula, root, true, true);
+    },
+    'first-of-type':    function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, "1", root, false, true);
+    },
+    'last-of-type':     function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, "1", root, true, true);
+    },
+    'only-of-type':     function(nodes, formula, root) {
+      var p = Selector.pseudos;
+      return p['last-of-type'](p['first-of-type'](nodes, formula, root), formula, root);
+    },
+
+    // handles the an+b logic
+    getIndices: function(a, b, total) {
+      if (a == 0) return b > 0 ? [b] : [];
+      return $R(1, total).inject([], function(memo, i) {
+        if (0 == (i - b) % a && (i - b) / a >= 0) memo.push(i);
+        return memo;
+      });
+    },
+
+    // handles nth(-last)-child, nth(-last)-of-type, and (first|last)-of-type
+    nth: function(nodes, formula, root, reverse, ofType) {
+      if (nodes.length == 0) return [];
+      if (formula == 'even') formula = '2n+0';
+      if (formula == 'odd')  formula = '2n+1';
+      var h = Selector.handlers, results = [], indexed = [], m;
+      h.mark(nodes);
+      for (var i = 0, node; node = nodes[i]; i++) {
+        if (!node.parentNode._countedByPrototype) {
+          h.index(node.parentNode, reverse, ofType);
+          indexed.push(node.parentNode);
+        }
+      }
+      if (formula.match(/^\d+$/)) { // just a number
+        formula = Number(formula);
+        for (var i = 0, node; node = nodes[i]; i++)
+          if (node.nodeIndex == formula) results.push(node);
+      } else if (m = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
+        if (m[1] == "-") m[1] = -1;
+        var a = m[1] ? Number(m[1]) : 1;
+        var b = m[2] ? Number(m[2]) : 0;
+        var indices = Selector.pseudos.getIndices(a, b, nodes.length);
+        for (var i = 0, node, l = indices.length; node = nodes[i]; i++) {
+          for (var j = 0; j < l; j++)
+            if (node.nodeIndex == indices[j]) results.push(node);
+        }
+      }
+      h.unmark(nodes);
+      h.unmark(indexed);
+      return results;
+    },
+
+    'empty': function(nodes, value, root) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++) {
+        // IE treats comments as element nodes
+        if (node.tagName == '!' || node.firstChild) continue;
+        results.push(node);
+      }
+      return results;
+    },
+
+    'not': function(nodes, selector, root) {
+      var h = Selector.handlers, selectorType, m;
+      var exclusions = new Selector(selector).findElements(root);
+      h.mark(exclusions);
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        if (!node._countedByPrototype) results.push(node);
+      h.unmark(exclusions);
+      return results;
+    },
+
+    'enabled': function(nodes, value, root) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        if (!node.disabled && (!node.type || node.type !== 'hidden'))
+          results.push(node);
+      return results;
+    },
+
+    'disabled': function(nodes, value, root) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        if (node.disabled) results.push(node);
+      return results;
+    },
+
+    'checked': function(nodes, value, root) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        if (node.checked) results.push(node);
+      return results;
+    }
+  },
+
+  operators: {
+    '=':  function(nv, v) { return nv == v; },
+    '!=': function(nv, v) { return nv != v; },
+    '^=': function(nv, v) { return nv == v || nv && nv.startsWith(v); },
+    '$=': function(nv, v) { return nv == v || nv && nv.endsWith(v); },
+    '*=': function(nv, v) { return nv == v || nv && nv.include(v); },
+    '$=': function(nv, v) { return nv.endsWith(v); },
+    '*=': function(nv, v) { return nv.include(v); },
+    '~=': function(nv, v) { return (' ' + nv + ' ').include(' ' + v + ' '); },
+    '|=': function(nv, v) { return ('-' + (nv || "").toUpperCase() +
+     '-').include('-' + (v || "").toUpperCase() + '-'); }
+  },
+
+  split: function(expression) {
+    var expressions = [];
+    expression.scan(/(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) {
+      expressions.push(m[1].strip());
+    });
+    return expressions;
+  },
+
+  matchElements: function(elements, expression) {
+    var matches = $$(expression), h = Selector.handlers;
+    h.mark(matches);
+    for (var i = 0, results = [], element; element = elements[i]; i++)
+      if (element._countedByPrototype) results.push(element);
+    h.unmark(matches);
+    return results;
+  },
+
+  findElement: function(elements, expression, index) {
+    if (Object.isNumber(expression)) {
+      index = expression; expression = false;
+    }
+    return Selector.matchElements(elements, expression || '*')[index || 0];
+  },
+
+  findChildElements: function(element, expressions) {
+    expressions = Selector.split(expressions.join(','));
+    var results = [], h = Selector.handlers;
+    for (var i = 0, l = expressions.length, selector; i < l; i++) {
+      selector = new Selector(expressions[i].strip());
+      h.concat(results, selector.findElements(element));
+    }
+    return (l > 1) ? h.unique(results) : results;
+  }
+});
+
+if (Prototype.Browser.IE) {
+  Object.extend(Selector.handlers, {
+    // IE returns comment nodes on getElementsByTagName("*").
+    // Filter them out.
+    concat: function(a, b) {
+      for (var i = 0, node; node = b[i]; i++)
+        if (node.tagName !== "!") a.push(node);
+      return a;
+    },
+
+    // IE improperly serializes _countedByPrototype in (inner|outer)HTML.
+    unmark: function(nodes) {
+      for (var i = 0, node; node = nodes[i]; i++)
+        node.removeAttribute('_countedByPrototype');
+      return nodes;
+    }
+  });
+}
+
+function $$() {
+  return Selector.findChildElements(document, $A(arguments));
+}
+var Form = {
+  reset: function(form) {
+    $(form).reset();
+    return form;
+  },
+
+  serializeElements: function(elements, options) {
+    if (typeof options != 'object') options = { hash: !!options };
+    else if (Object.isUndefined(options.hash)) options.hash = true;
+    var key, value, submitted = false, submit = options.submit;
+
+    var data = elements.inject({ }, function(result, element) {
+      if (!element.disabled && element.name) {
+        key = element.name; value = $(element).getValue();
+        if (value != null && element.type != 'file' && (element.type != 'submit' || (!submitted &&
+            submit !== false && (!submit || key == submit) && (submitted = true)))) {
+          if (key in result) {
+            // a key is already present; construct an array of values
+            if (!Object.isArray(result[key])) result[key] = [result[key]];
+            result[key].push(value);
+          }
+          else result[key] = value;
+        }
+      }
+      return result;
+    });
+
+    return options.hash ? data : Object.toQueryString(data);
+  }
+};
+
+Form.Methods = {
+  serialize: function(form, options) {
+    return Form.serializeElements(Form.getElements(form), options);
+  },
+
+  getElements: function(form) {
+    return $A($(form).getElementsByTagName('*')).inject([],
+      function(elements, child) {
+        if (Form.Element.Serializers[child.tagName.toLowerCase()])
+          elements.push(Element.extend(child));
+        return elements;
+      }
+    );
+  },
+
+  getInputs: function(form, typeName, name) {
+    form = $(form);
+    var inputs = form.getElementsByTagName('input');
+
+    if (!typeName && !name) return $A(inputs).map(Element.extend);
+
+    for (var i = 0, matchingInputs = [], length = inputs.length; i < length; i++) {
+      var input = inputs[i];
+      if ((typeName && input.type != typeName) || (name && input.name != name))
+        continue;
+      matchingInputs.push(Element.extend(input));
+    }
+
+    return matchingInputs;
+  },
+
+  disable: function(form) {
+    form = $(form);
+    Form.getElements(form).invoke('disable');
+    return form;
+  },
+
+  enable: function(form) {
+    form = $(form);
+    Form.getElements(form).invoke('enable');
+    return form;
+  },
+
+  findFirstElement: function(form) {
+    var elements = $(form).getElements().findAll(function(element) {
+      return 'hidden' != element.type && !element.disabled;
+    });
+    var firstByIndex = elements.findAll(function(element) {
+      return element.hasAttribute('tabIndex') && element.tabIndex >= 0;
+    }).sortBy(function(element) { return element.tabIndex }).first();
+
+    return firstByIndex ? firstByIndex : elements.find(function(element) {
+      return ['input', 'select', 'textarea'].include(element.tagName.toLowerCase());
+    });
+  },
+
+  focusFirstElement: function(form) {
+    form = $(form);
+    form.findFirstElement().activate();
+    return form;
+  },
+
+  request: function(form, options) {
+    form = $(form), options = Object.clone(options || { });
+
+    var params = options.parameters, action = form.readAttribute('action') || '';
+    if (action.blank()) action = window.location.href;
+    options.parameters = form.serialize(true);
+
+    if (params) {
+      if (Object.isString(params)) params = params.toQueryParams();
+      Object.extend(options.parameters, params);
+    }
+
+    if (form.hasAttribute('method') && !options.method)
+      options.method = form.method;
+
+    return new Ajax.Request(action, options);
+  }
+};
+
+/*--------------------------------------------------------------------------*/
+
+Form.Element = {
+  focus: function(element) {
+    $(element).focus();
+    return element;
+  },
+
+  select: function(element) {
+    $(element).select();
+    return element;
+  }
+};
+
+Form.Element.Methods = {
+  serialize: function(element) {
+    element = $(element);
+    if (!element.disabled && element.name) {
+      var value = element.getValue();
+      if (value != undefined) {
+        var pair = { };
+        pair[element.name] = value;
+        return Object.toQueryString(pair);
+      }
+    }
+    return '';
+  },
+
+  getValue: function(element) {
+    element = $(element);
+    var method = element.tagName.toLowerCase();
+    return Form.Element.Serializers[method](element);
+  },
+
+  setValue: function(element, value) {
+    element = $(element);
+    var method = element.tagName.toLowerCase();
+    Form.Element.Serializers[method](element, value);
+    return element;
+  },
+
+  clear: function(element) {
+    $(element).value = '';
+    return element;
+  },
+
+  present: function(element) {
+    return $(element).value != '';
+  },
+
+  activate: function(element) {
+    element = $(element);
+    try {
+      element.focus();
+      if (element.select && (element.tagName.toLowerCase() != 'input' ||
+          !['button', 'reset', 'submit'].include(element.type)))
+        element.select();
+    } catch (e) { }
+    return element;
+  },
+
+  disable: function(element) {
+    element = $(element);
+    element.disabled = true;
+    return element;
+  },
+
+  enable: function(element) {
+    element = $(element);
+    element.disabled = false;
+    return element;
+  }
+};
+
+/*--------------------------------------------------------------------------*/
+
+var Field = Form.Element;
+var $F = Form.Element.Methods.getValue;
+
+/*--------------------------------------------------------------------------*/
+
+Form.Element.Serializers = {
+  input: function(element, value) {
+    switch (element.type.toLowerCase()) {
+      case 'checkbox':
+      case 'radio':
+        return Form.Element.Serializers.inputSelector(element, value);
+      default:
+        return Form.Element.Serializers.textarea(element, value);
+    }
+  },
+
+  inputSelector: function(element, value) {
+    if (Object.isUndefined(value)) return element.checked ? element.value : null;
+    else element.checked = !!value;
+  },
+
+  textarea: function(element, value) {
+    if (Object.isUndefined(value)) return element.value;
+    else element.value = value;
+  },
+
+  select: function(element, value) {
+    if (Object.isUndefined(value))
+      return this[element.type == 'select-one' ?
+        'selectOne' : 'selectMany'](element);
+    else {
+      var opt, currentValue, single = !Object.isArray(value);
+      for (var i = 0, length = element.length; i < length; i++) {
+        opt = element.options[i];
+        currentValue = this.optionValue(opt);
+        if (single) {
+          if (currentValue == value) {
+            opt.selected = true;
+            return;
+          }
+        }
+        else opt.selected = value.include(currentValue);
+      }
+    }
+  },
+
+  selectOne: function(element) {
+    var index = element.selectedIndex;
+    return index >= 0 ? this.optionValue(element.options[index]) : null;
+  },
+
+  selectMany: function(element) {
+    var values, length = element.length;
+    if (!length) return null;
+
+    for (var i = 0, values = []; i < length; i++) {
+      var opt = element.options[i];
+      if (opt.selected) values.push(this.optionValue(opt));
+    }
+    return values;
+  },
+
+  optionValue: function(opt) {
+    // extend element because hasAttribute may not be native
+    return Element.extend(opt).hasAttribute('value') ? opt.value : opt.text;
+  }
+};
+
+/*--------------------------------------------------------------------------*/
+
+Abstract.TimedObserver = Class.create(PeriodicalExecuter, {
+  initialize: function($super, element, frequency, callback) {
+    $super(callback, frequency);
+    this.element   = $(element);
+    this.lastValue = this.getValue();
+  },
+
+  execute: function() {
+    var value = this.getValue();
+    if (Object.isString(this.lastValue) && Object.isString(value) ?
+        this.lastValue != value : String(this.lastValue) != String(value)) {
+      this.callback(this.element, value);
+      this.lastValue = value;
+    }
+  }
+});
+
+Form.Element.Observer = Class.create(Abstract.TimedObserver, {
+  getValue: function() {
+    return Form.Element.getValue(this.element);
+  }
+});
+
+Form.Observer = Class.create(Abstract.TimedObserver, {
+  getValue: function() {
+    return Form.serialize(this.element);
+  }
+});
+
+/*--------------------------------------------------------------------------*/
+
+Abstract.EventObserver = Class.create({
+  initialize: function(element, callback) {
+    this.element  = $(element);
+    this.callback = callback;
+
+    this.lastValue = this.getValue();
+    if (this.element.tagName.toLowerCase() == 'form')
+      this.registerFormCallbacks();
+    else
+      this.registerCallback(this.element);
+  },
+
+  onElementEvent: function() {
+    var value = this.getValue();
+    if (this.lastValue != value) {
+      this.callback(this.element, value);
+      this.lastValue = value;
+    }
+  },
+
+  registerFormCallbacks: function() {
+    Form.getElements(this.element).each(this.registerCallback, this);
+  },
+
+  registerCallback: function(element) {
+    if (element.type) {
+      switch (element.type.toLowerCase()) {
+        case 'checkbox':
+        case 'radio':
+          Event.observe(element, 'click', this.onElementEvent.bind(this));
+          break;
+        default:
+          Event.observe(element, 'change', this.onElementEvent.bind(this));
+          break;
+      }
+    }
+  }
+});
+
+Form.Element.EventObserver = Class.create(Abstract.EventObserver, {
+  getValue: function() {
+    return Form.Element.getValue(this.element);
+  }
+});
+
+Form.EventObserver = Class.create(Abstract.EventObserver, {
+  getValue: function() {
+    return Form.serialize(this.element);
+  }
+});
+if (!window.Event) var Event = { };
+
+Object.extend(Event, {
+  KEY_BACKSPACE: 8,
+  KEY_TAB:       9,
+  KEY_RETURN:   13,
+  KEY_ESC:      27,
+  KEY_LEFT:     37,
+  KEY_UP:       38,
+  KEY_RIGHT:    39,
+  KEY_DOWN:     40,
+  KEY_DELETE:   46,
+  KEY_HOME:     36,
+  KEY_END:      35,
+  KEY_PAGEUP:   33,
+  KEY_PAGEDOWN: 34,
+  KEY_INSERT:   45,
+
+  cache: { },
+
+  relatedTarget: function(event) {
+    var element;
+    switch(event.type) {
+      case 'mouseover': element = event.fromElement; break;
+      case 'mouseout':  element = event.toElement;   break;
+      default: return null;
+    }
+    return Element.extend(element);
+  }
+});
+
+Event.Methods = (function() {
+  var isButton;
+
+  if (Prototype.Browser.IE) {
+    var buttonMap = { 0: 1, 1: 4, 2: 2 };
+    isButton = function(event, code) {
+      return event.button == buttonMap[code];
+    };
+
+  } else if (Prototype.Browser.WebKit) {
+    isButton = function(event, code) {
+      switch (code) {
+        case 0: return event.which == 1 && !event.metaKey;
+        case 1: return event.which == 1 && event.metaKey;
+        default: return false;
+      }
+    };
+
+  } else {
+    isButton = function(event, code) {
+      return event.which ? (event.which === code + 1) : (event.button === code);
+    };
+  }
+
+  return {
+    isLeftClick:   function(event) { return isButton(event, 0) },
+    isMiddleClick: function(event) { return isButton(event, 1) },
+    isRightClick:  function(event) { return isButton(event, 2) },
+
+    element: function(event) {
+      event = Event.extend(event);
+
+      var node          = event.target,
+          type          = event.type,
+          currentTarget = event.currentTarget;
+
+      if (currentTarget && currentTarget.tagName) {
+        // Firefox screws up the "click" event when moving between radio buttons
+        // via arrow keys. It also screws up the "load" and "error" events on images,
+        // reporting the document as the target instead of the original image.
+        if (type === 'load' || type === 'error' ||
+          (type === 'click' && currentTarget.tagName.toLowerCase() === 'input'
+            && currentTarget.type === 'radio'))
+              node = currentTarget;
+      }
+      if (node.nodeType == Node.TEXT_NODE) node = node.parentNode;
+      return Element.extend(node);
+    },
+
+    findElement: function(event, expression) {
+      var element = Event.element(event);
+      if (!expression) return element;
+      var elements = [element].concat(element.ancestors());
+      return Selector.findElement(elements, expression, 0);
+    },
+
+    pointer: function(event) {
+      var docElement = document.documentElement,
+      body = document.body || { scrollLeft: 0, scrollTop: 0 };
+      return {
+        x: event.pageX || (event.clientX +
+          (docElement.scrollLeft || body.scrollLeft) -
+          (docElement.clientLeft || 0)),
+        y: event.pageY || (event.clientY +
+          (docElement.scrollTop || body.scrollTop) -
+          (docElement.clientTop || 0))
+      };
+    },
+
+    pointerX: function(event) { return Event.pointer(event).x },
+    pointerY: function(event) { return Event.pointer(event).y },
+
+    stop: function(event) {
+      Event.extend(event);
+      event.preventDefault();
+      event.stopPropagation();
+      event.stopped = true;
+    }
+  };
+})();
+
+Event.extend = (function() {
+  var methods = Object.keys(Event.Methods).inject({ }, function(m, name) {
+    m[name] = Event.Methods[name].methodize();
+    return m;
+  });
+
+  if (Prototype.Browser.IE) {
+    Object.extend(methods, {
+      stopPropagation: function() { this.cancelBubble = true },
+      preventDefault:  function() { this.returnValue = false },
+      inspect: function() { return "[object Event]" }
+    });
+
+    return function(event) {
+      if (!event) return false;
+      if (event._extendedByPrototype) return event;
+
+      event._extendedByPrototype = Prototype.emptyFunction;
+      var pointer = Event.pointer(event);
+      Object.extend(event, {
+        target: event.srcElement,
+        relatedTarget: Event.relatedTarget(event),
+        pageX:  pointer.x,
+        pageY:  pointer.y
+      });
+      return Object.extend(event, methods);
+    };
+
+  } else {
+    Event.prototype = Event.prototype || document.createEvent("HTMLEvents")['__proto__'];
+    Object.extend(Event.prototype, methods);
+    return Prototype.K;
+  }
+})();
+
+Object.extend(Event, (function() {
+  var cache = Event.cache;
+
+  function getEventID(element) {
+    if (element._prototypeEventID) return element._prototypeEventID[0];
+    arguments.callee.id = arguments.callee.id || 1;
+    return element._prototypeEventID = [++arguments.callee.id];
+  }
+
+  function getDOMEventName(eventName) {
+    if (eventName && eventName.include(':')) return "dataavailable";
+    return eventName;
+  }
+
+  function getCacheForID(id) {
+    return cache[id] = cache[id] || { };
+  }
+
+  function getWrappersForEventName(id, eventName) {
+    var c = getCacheForID(id);
+    return c[eventName] = c[eventName] || [];
+  }
+
+  function createWrapper(element, eventName, handler) {
+    var id = getEventID(element);
+    var c = getWrappersForEventName(id, eventName);
+    if (c.pluck("handler").include(handler)) return false;
+
+    var wrapper = function(event) {
+      if (!Event || !Event.extend ||
+        (event.eventName && event.eventName != eventName))
+          return false;
+
+      Event.extend(event);
+      handler.call(element, event);
+    };
+
+    wrapper.handler = handler;
+    c.push(wrapper);
+    return wrapper;
+  }
+
+  function findWrapper(id, eventName, handler) {
+    var c = getWrappersForEventName(id, eventName);
+    return c.find(function(wrapper) { return wrapper.handler == handler });
+  }
+
+  function destroyWrapper(id, eventName, handler) {
+    var c = getCacheForID(id);
+    if (!c[eventName]) return false;
+    c[eventName] = c[eventName].without(findWrapper(id, eventName, handler));
+  }
+
+  function destroyCache() {
+    for (var id in cache)
+      for (var eventName in cache[id])
+        cache[id][eventName] = null;
+  }
+
+
+  // Internet Explorer needs to remove event handlers on page unload
+  // in order to avoid memory leaks.
+  if (window.attachEvent) {
+    window.attachEvent("onunload", destroyCache);
+  }
+
+  // Safari has a dummy event handler on page unload so that it won't
+  // use its bfcache. Safari <= 3.1 has an issue with restoring the "document"
+  // object when page is returned to via the back button using its bfcache.
+  if (Prototype.Browser.WebKit) {
+    window.addEventListener('unload', Prototype.emptyFunction, false);
+  }
+
+  return {
+    observe: function(element, eventName, handler) {
+      element = $(element);
+      var name = getDOMEventName(eventName);
+
+      var wrapper = createWrapper(element, eventName, handler);
+      if (!wrapper) return element;
+
+      if (element.addEventListener) {
+        element.addEventListener(name, wrapper, false);
+      } else {
+        element.attachEvent("on" + name, wrapper);
+      }
+
+      return element;
+    },
+
+    stopObserving: function(element, eventName, handler) {
+      element = $(element);
+      var id = getEventID(element), name = getDOMEventName(eventName);
+
+      if (!handler && eventName) {
+        getWrappersForEventName(id, eventName).each(function(wrapper) {
+          element.stopObserving(eventName, wrapper.handler);
+        });
+        return element;
+
+      } else if (!eventName) {
+        Object.keys(getCacheForID(id)).each(function(eventName) {
+          element.stopObserving(eventName);
+        });
+        return element;
+      }
+
+      var wrapper = findWrapper(id, eventName, handler);
+      if (!wrapper) return element;
+
+      if (element.removeEventListener) {
+        element.removeEventListener(name, wrapper, false);
+      } else {
+        element.detachEvent("on" + name, wrapper);
+      }
+
+      destroyWrapper(id, eventName, handler);
+
+      return element;
+    },
+
+    fire: function(element, eventName, memo) {
+      element = $(element);
+      if (element == document && document.createEvent && !element.dispatchEvent)
+        element = document.documentElement;
+
+      var event;
+      if (document.createEvent) {
+        event = document.createEvent("HTMLEvents");
+        event.initEvent("dataavailable", true, true);
+      } else {
+        event = document.createEventObject();
+        event.eventType = "ondataavailable";
+      }
+
+      event.eventName = eventName;
+      event.memo = memo || { };
+
+      if (document.createEvent) {
+        element.dispatchEvent(event);
+      } else {
+        element.fireEvent(event.eventType, event);
+      }
+
+      return Event.extend(event);
+    }
+  };
+})());
+
+Object.extend(Event, Event.Methods);
+
+Element.addMethods({
+  fire:          Event.fire,
+  observe:       Event.observe,
+  stopObserving: Event.stopObserving
+});
+
+Object.extend(document, {
+  fire:          Element.Methods.fire.methodize(),
+  observe:       Element.Methods.observe.methodize(),
+  stopObserving: Element.Methods.stopObserving.methodize(),
+  loaded:        false
+});
+
+(function() {
+  /* Support for the DOMContentLoaded event is based on work by Dan Webb,
+     Matthias Miller, Dean Edwards and John Resig. */
+
+  var timer;
+
+  function fireContentLoadedEvent() {
+    if (document.loaded) return;
+    if (timer) window.clearInterval(timer);
+    document.fire("dom:loaded");
+    document.loaded = true;
+  }
+
+  if (document.addEventListener) {
+    if (Prototype.Browser.WebKit) {
+      timer = window.setInterval(function() {
+        if (/loaded|complete/.test(document.readyState))
+          fireContentLoadedEvent();
+      }, 0);
+
+      Event.observe(window, "load", fireContentLoadedEvent);
+
+    } else {
+      document.addEventListener("DOMContentLoaded",
+        fireContentLoadedEvent, false);
+    }
+
+  } else {
+    document.write("<script id=__onDOMContentLoaded defer src=//:><\/script>");
+    $("__onDOMContentLoaded").onreadystatechange = function() {
+      if (this.readyState == "complete") {
+        this.onreadystatechange = null;
+        fireContentLoadedEvent();
+      }
+    };
+  }
+})();
+/*------------------------------- DEPRECATED -------------------------------*/
+
+Hash.toQueryString = Object.toQueryString;
+
+var Toggle = { display: Element.toggle };
+
+Element.Methods.childOf = Element.Methods.descendantOf;
+
+var Insertion = {
+  Before: function(element, content) {
+    return Element.insert(element, {before:content});
+  },
+
+  Top: function(element, content) {
+    return Element.insert(element, {top:content});
+  },
+
+  Bottom: function(element, content) {
+    return Element.insert(element, {bottom:content});
+  },
+
+  After: function(element, content) {
+    return Element.insert(element, {after:content});
+  }
+};
+
+var $continue = new Error('"throw $continue" is deprecated, use "return" instead');
+
+// This should be moved to script.aculo.us; notice the deprecated methods
+// further below, that map to the newer Element methods.
+var Position = {
+  // set to true if needed, warning: firefox performance problems
+  // NOT neeeded for page scrolling, only if draggable contained in
+  // scrollable elements
+  includeScrollOffsets: false,
+
+  // must be called before calling withinIncludingScrolloffset, every time the
+  // page is scrolled
+  prepare: function() {
+    this.deltaX =  window.pageXOffset
+                || document.documentElement.scrollLeft
+                || document.body.scrollLeft
+                || 0;
+    this.deltaY =  window.pageYOffset
+                || document.documentElement.scrollTop
+                || document.body.scrollTop
+                || 0;
+  },
+
+  // caches x/y coordinate pair to use with overlap
+  within: function(element, x, y) {
+    if (this.includeScrollOffsets)
+      return this.withinIncludingScrolloffsets(element, x, y);
+    this.xcomp = x;
+    this.ycomp = y;
+    this.offset = Element.cumulativeOffset(element);
+
+    return (y >= this.offset[1] &&
+            y <  this.offset[1] + element.offsetHeight &&
+            x >= this.offset[0] &&
+            x <  this.offset[0] + element.offsetWidth);
+  },
+
+  withinIncludingScrolloffsets: function(element, x, y) {
+    var offsetcache = Element.cumulativeScrollOffset(element);
+
+    this.xcomp = x + offsetcache[0] - this.deltaX;
+    this.ycomp = y + offsetcache[1] - this.deltaY;
+    this.offset = Element.cumulativeOffset(element);
+
+    return (this.ycomp >= this.offset[1] &&
+            this.ycomp <  this.offset[1] + element.offsetHeight &&
+            this.xcomp >= this.offset[0] &&
+            this.xcomp <  this.offset[0] + element.offsetWidth);
+  },
+
+  // within must be called directly before
+  overlap: function(mode, element) {
+    if (!mode) return 0;
+    if (mode == 'vertical')
+      return ((this.offset[1] + element.offsetHeight) - this.ycomp) /
+        element.offsetHeight;
+    if (mode == 'horizontal')
+      return ((this.offset[0] + element.offsetWidth) - this.xcomp) /
+        element.offsetWidth;
+  },
+
+  // Deprecation layer -- use newer Element methods now (1.5.2).
+
+  cumulativeOffset: Element.Methods.cumulativeOffset,
+
+  positionedOffset: Element.Methods.positionedOffset,
+
+  absolutize: function(element) {
+    Position.prepare();
+    return Element.absolutize(element);
+  },
+
+  relativize: function(element) {
+    Position.prepare();
+    return Element.relativize(element);
+  },
+
+  realOffset: Element.Methods.cumulativeScrollOffset,
+
+  offsetParent: Element.Methods.getOffsetParent,
+
+  page: Element.Methods.viewportOffset,
+
+  clone: function(source, target, options) {
+    options = options || { };
+    return Element.clonePosition(target, source, options);
+  }
+};
+
+/*--------------------------------------------------------------------------*/
+
+if (!document.getElementsByClassName) document.getElementsByClassName = function(instanceMethods){
+  function iter(name) {
+    return name.blank() ? null : "[contains(concat(' ', @class, ' '), ' " + name + " ')]";
+  }
+
+  instanceMethods.getElementsByClassName = Prototype.BrowserFeatures.XPath ?
+  function(element, className) {
+    className = className.toString().strip();
+    var cond = /\s/.test(className) ? $w(className).map(iter).join('') : iter(className);
+    return cond ? document._getElementsByXPath('.//*' + cond, element) : [];
+  } : function(element, className) {
+    className = className.toString().strip();
+    var elements = [], classNames = (/\s/.test(className) ? $w(className) : null);
+    if (!classNames && !className) return elements;
+
+    var nodes = $(element).getElementsByTagName('*');
+    className = ' ' + className + ' ';
+
+    for (var i = 0, child, cn; child = nodes[i]; i++) {
+      if (child.className && (cn = ' ' + child.className + ' ') && (cn.include(className) ||
+          (classNames && classNames.all(function(name) {
+            return !name.toString().blank() && cn.include(' ' + name + ' ');
+          }))))
+        elements.push(Element.extend(child));
+    }
+    return elements;
+  };
+
+  return function(className, parentElement) {
+    return $(parentElement || document.body).getElementsByClassName(className);
+  };
+}(Element.Methods);
+
+/*--------------------------------------------------------------------------*/
+
+Element.ClassNames = Class.create();
+Element.ClassNames.prototype = {
+  initialize: function(element) {
+    this.element = $(element);
+  },
+
+  _each: function(iterator) {
+    this.element.className.split(/\s+/).select(function(name) {
+      return name.length > 0;
+    })._each(iterator);
+  },
+
+  set: function(className) {
+    this.element.className = className;
+  },
+
+  add: function(classNameToAdd) {
+    if (this.include(classNameToAdd)) return;
+    this.set($A(this).concat(classNameToAdd).join(' '));
+  },
+
+  remove: function(classNameToRemove) {
+    if (!this.include(classNameToRemove)) return;
+    this.set($A(this).without(classNameToRemove).join(' '));
+  },
+
+  toString: function() {
+    return $A(this).join(' ');
+  }
+};
+
+Object.extend(Element.ClassNames.prototype, Enumerable);
+
+/*--------------------------------------------------------------------------*/
+
+Element.addMethods();
\ No newline at end of file
diff --git a/plugins/sfProtoculousPlugin/web/js/scriptaculous.js b/plugins/sfProtoculousPlugin/web/js/scriptaculous.js
new file mode 100644
index 000000000..3e5543bd0
--- /dev/null
+++ b/plugins/sfProtoculousPlugin/web/js/scriptaculous.js
@@ -0,0 +1,60 @@
+// script.aculo.us scriptaculous.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
+
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+var Scriptaculous = {
+  Version: '1.8.2',
+  require: function(libraryName) {
+    // inserting via DOM fails in Safari 2.0, so brute force approach
+    document.write('<script type="text/javascript" src="'+libraryName+'"><\/script>');
+  },
+  REQUIRED_PROTOTYPE: '1.6.0.3',
+  load: function() {
+    function convertVersionString(versionString) {
+      var v = versionString.replace(/_.*|\./g, '');
+      v = parseInt(v + '0'.times(4-v.length));
+      return versionString.indexOf('_') > -1 ? v-1 : v;
+    }
+
+    if((typeof Prototype=='undefined') ||
+       (typeof Element == 'undefined') ||
+       (typeof Element.Methods=='undefined') ||
+       (convertVersionString(Prototype.Version) <
+        convertVersionString(Scriptaculous.REQUIRED_PROTOTYPE)))
+       throw("script.aculo.us requires the Prototype JavaScript framework >= " +
+        Scriptaculous.REQUIRED_PROTOTYPE);
+
+    var js = /scriptaculous\.js(\?.*)?$/;
+    $$('head script[src]').findAll(function(s) {
+      return s.src.match(js);
+    }).each(function(s) {
+      var path = s.src.replace(js, ''),
+      includes = s.src.match(/\?.*load=([a-z,]*)/);
+      (includes ? includes[1] : 'builder,effects,dragdrop,controls,slider,sound').split(',').each(
+       function(include) { Scriptaculous.require(path+include+'.js') });
+    });
+  }
+};
+
+Scriptaculous.load();
\ No newline at end of file
diff --git a/plugins/sfProtoculousPlugin/web/js/slider.js b/plugins/sfProtoculousPlugin/web/js/slider.js
new file mode 100644
index 000000000..40b73711c
--- /dev/null
+++ b/plugins/sfProtoculousPlugin/web/js/slider.js
@@ -0,0 +1,275 @@
+// script.aculo.us slider.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
+
+// Copyright (c) 2005-2008 Marty Haught, Thomas Fuchs
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+if (!Control) var Control = { };
+
+// options:
+//  axis: 'vertical', or 'horizontal' (default)
+//
+// callbacks:
+//  onChange(value)
+//  onSlide(value)
+Control.Slider = Class.create({
+  initialize: function(handle, track, options) {
+    var slider = this;
+
+    if (Object.isArray(handle)) {
+      this.handles = handle.collect( function(e) { return $(e) });
+    } else {
+      this.handles = [$(handle)];
+    }
+
+    this.track   = $(track);
+    this.options = options || { };
+
+    this.axis      = this.options.axis || 'horizontal';
+    this.increment = this.options.increment || 1;
+    this.step      = parseInt(this.options.step || '1');
+    this.range     = this.options.range || $R(0,1);
+
+    this.value     = 0; // assure backwards compat
+    this.values    = this.handles.map( function() { return 0 });
+    this.spans     = this.options.spans ? this.options.spans.map(function(s){ return $(s) }) : false;
+    this.options.startSpan = $(this.options.startSpan || null);
+    this.options.endSpan   = $(this.options.endSpan || null);
+
+    this.restricted = this.options.restricted || false;
+
+    this.maximum   = this.options.maximum || this.range.end;
+    this.minimum   = this.options.minimum || this.range.start;
+
+    // Will be used to align the handle onto the track, if necessary
+    this.alignX = parseInt(this.options.alignX || '0');
+    this.alignY = parseInt(this.options.alignY || '0');
+
+    this.trackLength = this.maximumOffset() - this.minimumOffset();
+
+    this.handleLength = this.isVertical() ?
+      (this.handles[0].offsetHeight != 0 ?
+        this.handles[0].offsetHeight : this.handles[0].style.height.replace(/px$/,"")) :
+      (this.handles[0].offsetWidth != 0 ? this.handles[0].offsetWidth :
+        this.handles[0].style.width.replace(/px$/,""));
+
+    this.active   = false;
+    this.dragging = false;
+    this.disabled = false;
+
+    if (this.options.disabled) this.setDisabled();
+
+    // Allowed values array
+    this.allowedValues = this.options.values ? this.options.values.sortBy(Prototype.K) : false;
+    if (this.allowedValues) {
+      this.minimum = this.allowedValues.min();
+      this.maximum = this.allowedValues.max();
+    }
+
+    this.eventMouseDown = this.startDrag.bindAsEventListener(this);
+    this.eventMouseUp   = this.endDrag.bindAsEventListener(this);
+    this.eventMouseMove = this.update.bindAsEventListener(this);
+
+    // Initialize handles in reverse (make sure first handle is active)
+    this.handles.each( function(h,i) {
+      i = slider.handles.length-1-i;
+      slider.setValue(parseFloat(
+        (Object.isArray(slider.options.sliderValue) ?
+          slider.options.sliderValue[i] : slider.options.sliderValue) ||
+         slider.range.start), i);
+      h.makePositioned().observe("mousedown", slider.eventMouseDown);
+    });
+
+    this.track.observe("mousedown", this.eventMouseDown);
+    document.observe("mouseup", this.eventMouseUp);
+    document.observe("mousemove", this.eventMouseMove);
+
+    this.initialized = true;
+  },
+  dispose: function() {
+    var slider = this;
+    Event.stopObserving(this.track, "mousedown", this.eventMouseDown);
+    Event.stopObserving(document, "mouseup", this.eventMouseUp);
+    Event.stopObserving(document, "mousemove", this.eventMouseMove);
+    this.handles.each( function(h) {
+      Event.stopObserving(h, "mousedown", slider.eventMouseDown);
+    });
+  },
+  setDisabled: function(){
+    this.disabled = true;
+  },
+  setEnabled: function(){
+    this.disabled = false;
+  },
+  getNearestValue: function(value){
+    if (this.allowedValues){
+      if (value >= this.allowedValues.max()) return(this.allowedValues.max());
+      if (value <= this.allowedValues.min()) return(this.allowedValues.min());
+
+      var offset = Math.abs(this.allowedValues[0] - value);
+      var newValue = this.allowedValues[0];
+      this.allowedValues.each( function(v) {
+        var currentOffset = Math.abs(v - value);
+        if (currentOffset <= offset){
+          newValue = v;
+          offset = currentOffset;
+        }
+      });
+      return newValue;
+    }
+    if (value > this.range.end) return this.range.end;
+    if (value < this.range.start) return this.range.start;
+    return value;
+  },
+  setValue: function(sliderValue, handleIdx){
+    if (!this.active) {
+      this.activeHandleIdx = handleIdx || 0;
+      this.activeHandle    = this.handles[this.activeHandleIdx];
+      this.updateStyles();
+    }
+    handleIdx = handleIdx || this.activeHandleIdx || 0;
+    if (this.initialized && this.restricted) {
+      if ((handleIdx>0) && (sliderValue<this.values[handleIdx-1]))
+        sliderValue = this.values[handleIdx-1];
+      if ((handleIdx < (this.handles.length-1)) && (sliderValue>this.values[handleIdx+1]))
+        sliderValue = this.values[handleIdx+1];
+    }
+    sliderValue = this.getNearestValue(sliderValue);
+    this.values[handleIdx] = sliderValue;
+    this.value = this.values[0]; // assure backwards compat
+
+    this.handles[handleIdx].style[this.isVertical() ? 'top' : 'left'] =
+      this.translateToPx(sliderValue);
+
+    this.drawSpans();
+    if (!this.dragging || !this.event) this.updateFinished();
+  },
+  setValueBy: function(delta, handleIdx) {
+    this.setValue(this.values[handleIdx || this.activeHandleIdx || 0] + delta,
+      handleIdx || this.activeHandleIdx || 0);
+  },
+  translateToPx: function(value) {
+    return Math.round(
+      ((this.trackLength-this.handleLength)/(this.range.end-this.range.start)) *
+      (value - this.range.start)) + "px";
+  },
+  translateToValue: function(offset) {
+    return ((offset/(this.trackLength-this.handleLength) *
+      (this.range.end-this.range.start)) + this.range.start);
+  },
+  getRange: function(range) {
+    var v = this.values.sortBy(Prototype.K);
+    range = range || 0;
+    return $R(v[range],v[range+1]);
+  },
+  minimumOffset: function(){
+    return(this.isVertical() ? this.alignY : this.alignX);
+  },
+  maximumOffset: function(){
+    return(this.isVertical() ?
+      (this.track.offsetHeight != 0 ? this.track.offsetHeight :
+        this.track.style.height.replace(/px$/,"")) - this.alignY :
+      (this.track.offsetWidth != 0 ? this.track.offsetWidth :
+        this.track.style.width.replace(/px$/,"")) - this.alignX);
+  },
+  isVertical:  function(){
+    return (this.axis == 'vertical');
+  },
+  drawSpans: function() {
+    var slider = this;
+    if (this.spans)
+      $R(0, this.spans.length-1).each(function(r) { slider.setSpan(slider.spans[r], slider.getRange(r)) });
+    if (this.options.startSpan)
+      this.setSpan(this.options.startSpan,
+        $R(0, this.values.length>1 ? this.getRange(0).min() : this.value ));
+    if (this.options.endSpan)
+      this.setSpan(this.options.endSpan,
+        $R(this.values.length>1 ? this.getRange(this.spans.length-1).max() : this.value, this.maximum));
+  },
+  setSpan: function(span, range) {
+    if (this.isVertical()) {
+      span.style.top = this.translateToPx(range.start);
+      span.style.height = this.translateToPx(range.end - range.start + this.range.start);
+    } else {
+      span.style.left = this.translateToPx(range.start);
+      span.style.width = this.translateToPx(range.end - range.start + this.range.start);
+    }
+  },
+  updateStyles: function() {
+    this.handles.each( function(h){ Element.removeClassName(h, 'selected') });
+    Element.addClassName(this.activeHandle, 'selected');
+  },
+  startDrag: function(event) {
+    if (Event.isLeftClick(event)) {
+      if (!this.disabled){
+        this.active = true;
+
+        var handle = Event.element(event);
+        var pointer  = [Event.pointerX(event), Event.pointerY(event)];
+        var track = handle;
+        if (track==this.track) {
+          var offsets  = Position.cumulativeOffset(this.track);
+          this.event = event;
+          this.setValue(this.translateToValue(
+           (this.isVertical() ? pointer[1]-offsets[1] : pointer[0]-offsets[0])-(this.handleLength/2)
+          ));
+          var offsets  = Position.cumulativeOffset(this.activeHandle);
+          this.offsetX = (pointer[0] - offsets[0]);
+          this.offsetY = (pointer[1] - offsets[1]);
+        } else {
+          // find the handle (prevents issues with Safari)
+          while((this.handles.indexOf(handle) == -1) && handle.parentNode)
+            handle = handle.parentNode;
+
+          if (this.handles.indexOf(handle)!=-1) {
+            this.activeHandle    = handle;
+            this.activeHandleIdx = this.handles.indexOf(this.activeHandle);
+            this.updateStyles();
+
+            var offsets  = Position.cumulativeOffset(this.activeHandle);
+            this.offsetX = (pointer[0] - offsets[0]);
+            this.offsetY = (pointer[1] - offsets[1]);
+          }
+        }
+      }
+      Event.stop(event);
+    }
+  },
+  update: function(event) {
+   if (this.active) {
+      if (!this.dragging) this.dragging = true;
+      this.draw(event);
+      if (Prototype.Browser.WebKit) window.scrollBy(0,0);
+      Event.stop(event);
+   }
+  },
+  draw: function(event) {
+    var pointer = [Event.pointerX(event), Event.pointerY(event)];
+    var offsets = Position.cumulativeOffset(this.track);
+    pointer[0] -= this.offsetX + offsets[0];
+    pointer[1] -= this.offsetY + offsets[1];
+    this.event = event;
+    this.setValue(this.translateToValue( this.isVertical() ? pointer[1] : pointer[0] ));
+    if (this.initialized && this.options.onSlide)
+      this.options.onSlide(this.values.length>1 ? this.values : this.value, this);
+  },
+  endDrag: function(event) {
+    if (this.active && this.dragging) {
+      this.finishDrag(event, true);
+      Event.stop(event);
+    }
+    this.active = false;
+    this.dragging = false;
+  },
+  finishDrag: function(event, success) {
+    this.active = false;
+    this.dragging = false;
+    this.updateFinished();
+  },
+  updateFinished: function() {
+    if (this.initialized && this.options.onChange)
+      this.options.onChange(this.values.length>1 ? this.values : this.value, this);
+    this.event = null;
+  }
+});
\ No newline at end of file
diff --git a/plugins/sfProtoculousPlugin/web/js/sound.js b/plugins/sfProtoculousPlugin/web/js/sound.js
new file mode 100644
index 000000000..e2487cde5
--- /dev/null
+++ b/plugins/sfProtoculousPlugin/web/js/sound.js
@@ -0,0 +1,55 @@
+// script.aculo.us sound.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
+
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//
+// Based on code created by Jules Gravinese (http://www.webveteran.com/)
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+Sound = {
+  tracks: {},
+  _enabled: true,
+  template:
+    new Template('<embed style="height:0" id="sound_#{track}_#{id}" src="#{url}" loop="false" autostart="true" hidden="true"/>'),
+  enable: function(){
+    Sound._enabled = true;
+  },
+  disable: function(){
+    Sound._enabled = false;
+  },
+  play: function(url){
+    if(!Sound._enabled) return;
+    var options = Object.extend({
+      track: 'global', url: url, replace: false
+    }, arguments[1] || {});
+
+    if(options.replace && this.tracks[options.track]) {
+      $R(0, this.tracks[options.track].id).each(function(id){
+        var sound = $('sound_'+options.track+'_'+id);
+        sound.Stop && sound.Stop();
+        sound.remove();
+      });
+      this.tracks[options.track] = null;
+    }
+
+    if(!this.tracks[options.track])
+      this.tracks[options.track] = { id: 0 };
+    else
+      this.tracks[options.track].id++;
+
+    options.id = this.tracks[options.track].id;
+    $$('body')[0].insert(
+      Prototype.Browser.IE ? new Element('bgsound',{
+        id: 'sound_'+options.track+'_'+options.id,
+        src: options.url, loop: 1, autostart: true
+      }) : Sound.template.evaluate(options));
+  }
+};
+
+if(Prototype.Browser.Gecko && navigator.userAgent.indexOf("Win") > 0){
+  if(navigator.plugins && $A(navigator.plugins).detect(function(p){ return p.name.indexOf('QuickTime') != -1 }))
+    Sound.template = new Template('<object id="sound_#{track}_#{id}" width="0" height="0" type="audio/mpeg" data="#{url}"/>');
+  else
+    Sound.play = function(){};
+}
\ No newline at end of file
diff --git a/plugins/sfProtoculousPlugin/web/js/unittest.js b/plugins/sfProtoculousPlugin/web/js/unittest.js
new file mode 100644
index 000000000..446097ec5
--- /dev/null
+++ b/plugins/sfProtoculousPlugin/web/js/unittest.js
@@ -0,0 +1,568 @@
+// script.aculo.us unittest.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008
+
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005-2008 Jon Tirsen (http://www.tirsen.com)
+//           (c) 2005-2008 Michael Schuerig (http://www.schuerig.de/michael/)
+//
+// script.aculo.us is freely distributable under the terms of an MIT-style license.
+// For details, see the script.aculo.us web site: http://script.aculo.us/
+
+// experimental, Firefox-only
+Event.simulateMouse = function(element, eventName) {
+  var options = Object.extend({
+    pointerX: 0,
+    pointerY: 0,
+    buttons:  0,
+    ctrlKey:  false,
+    altKey:   false,
+    shiftKey: false,
+    metaKey:  false
+  }, arguments[2] || {});
+  var oEvent = document.createEvent("MouseEvents");
+  oEvent.initMouseEvent(eventName, true, true, document.defaultView, 
+    options.buttons, options.pointerX, options.pointerY, options.pointerX, options.pointerY, 
+    options.ctrlKey, options.altKey, options.shiftKey, options.metaKey, 0, $(element));
+  
+  if(this.mark) Element.remove(this.mark);
+  this.mark = document.createElement('div');
+  this.mark.appendChild(document.createTextNode(" "));
+  document.body.appendChild(this.mark);
+  this.mark.style.position = 'absolute';
+  this.mark.style.top = options.pointerY + "px";
+  this.mark.style.left = options.pointerX + "px";
+  this.mark.style.width = "5px";
+  this.mark.style.height = "5px;";
+  this.mark.style.borderTop = "1px solid red;";
+  this.mark.style.borderLeft = "1px solid red;";
+  
+  if(this.step)
+    alert('['+new Date().getTime().toString()+'] '+eventName+'/'+Test.Unit.inspect(options));
+  
+  $(element).dispatchEvent(oEvent);
+};
+
+// Note: Due to a fix in Firefox 1.0.5/6 that probably fixed "too much", this doesn't work in 1.0.6 or DP2.
+// You need to downgrade to 1.0.4 for now to get this working
+// See https://bugzilla.mozilla.org/show_bug.cgi?id=289940 for the fix that fixed too much
+Event.simulateKey = function(element, eventName) {
+  var options = Object.extend({
+    ctrlKey: false,
+    altKey: false,
+    shiftKey: false,
+    metaKey: false,
+    keyCode: 0,
+    charCode: 0
+  }, arguments[2] || {});
+
+  var oEvent = document.createEvent("KeyEvents");
+  oEvent.initKeyEvent(eventName, true, true, window, 
+    options.ctrlKey, options.altKey, options.shiftKey, options.metaKey,
+    options.keyCode, options.charCode );
+  $(element).dispatchEvent(oEvent);
+};
+
+Event.simulateKeys = function(element, command) {
+  for(var i=0; i<command.length; i++) {
+    Event.simulateKey(element,'keypress',{charCode:command.charCodeAt(i)});
+  }
+};
+
+var Test = {};
+Test.Unit = {};
+
+// security exception workaround
+Test.Unit.inspect = Object.inspect;
+
+Test.Unit.Logger = Class.create();
+Test.Unit.Logger.prototype = {
+  initialize: function(log) {
+    this.log = $(log);
+    if (this.log) {
+      this._createLogTable();
+    }
+  },
+  start: function(testName) {
+    if (!this.log) return;
+    this.testName = testName;
+    this.lastLogLine = document.createElement('tr');
+    this.statusCell = document.createElement('td');
+    this.nameCell = document.createElement('td');
+    this.nameCell.className = "nameCell";
+    this.nameCell.appendChild(document.createTextNode(testName));
+    this.messageCell = document.createElement('td');
+    this.lastLogLine.appendChild(this.statusCell);
+    this.lastLogLine.appendChild(this.nameCell);
+    this.lastLogLine.appendChild(this.messageCell);
+    this.loglines.appendChild(this.lastLogLine);
+  },
+  finish: function(status, summary) {
+    if (!this.log) return;
+    this.lastLogLine.className = status;
+    this.statusCell.innerHTML = status;
+    this.messageCell.innerHTML = this._toHTML(summary);
+    this.addLinksToResults();
+  },
+  message: function(message) {
+    if (!this.log) return;
+    this.messageCell.innerHTML = this._toHTML(message);
+  },
+  summary: function(summary) {
+    if (!this.log) return;
+    this.logsummary.innerHTML = this._toHTML(summary);
+  },
+  _createLogTable: function() {
+    this.log.innerHTML =
+    '<div id="logsummary"></div>' +
+    '<table id="logtable">' +
+    '<thead><tr><th>Status</th><th>Test</th><th>Message</th></tr></thead>' +
+    '<tbody id="loglines"></tbody>' +
+    '</table>';
+    this.logsummary = $('logsummary');
+    this.loglines = $('loglines');
+  },
+  _toHTML: function(txt) {
+    return txt.escapeHTML().replace(/\n/g,"<br/>");
+  },
+  addLinksToResults: function(){ 
+    $$("tr.failed .nameCell").each( function(td){ // todo: limit to children of this.log
+      td.title = "Run only this test";
+      Event.observe(td, 'click', function(){ window.location.search = "?tests=" + td.innerHTML;});
+    });
+    $$("tr.passed .nameCell").each( function(td){ // todo: limit to children of this.log
+      td.title = "Run all tests";
+      Event.observe(td, 'click', function(){ window.location.search = "";});
+    });
+  }
+};
+
+Test.Unit.Runner = Class.create();
+Test.Unit.Runner.prototype = {
+  initialize: function(testcases) {
+    this.options = Object.extend({
+      testLog: 'testlog'
+    }, arguments[1] || {});
+    this.options.resultsURL = this.parseResultsURLQueryParameter();
+    this.options.tests      = this.parseTestsQueryParameter();
+    if (this.options.testLog) {
+      this.options.testLog = $(this.options.testLog) || null;
+    }
+    if(this.options.tests) {
+      this.tests = [];
+      for(var i = 0; i < this.options.tests.length; i++) {
+        if(/^test/.test(this.options.tests[i])) {
+          this.tests.push(new Test.Unit.Testcase(this.options.tests[i], testcases[this.options.tests[i]], testcases["setup"], testcases["teardown"]));
+        }
+      }
+    } else {
+      if (this.options.test) {
+        this.tests = [new Test.Unit.Testcase(this.options.test, testcases[this.options.test], testcases["setup"], testcases["teardown"])];
+      } else {
+        this.tests = [];
+        for(var testcase in testcases) {
+          if(/^test/.test(testcase)) {
+            this.tests.push(
+               new Test.Unit.Testcase(
+                 this.options.context ? ' -> ' + this.options.titles[testcase] : testcase, 
+                 testcases[testcase], testcases["setup"], testcases["teardown"]
+               ));
+          }
+        }
+      }
+    }
+    this.currentTest = 0;
+    this.logger = new Test.Unit.Logger(this.options.testLog);
+    setTimeout(this.runTests.bind(this), 1000);
+  },
+  parseResultsURLQueryParameter: function() {
+    return window.location.search.parseQuery()["resultsURL"];
+  },
+  parseTestsQueryParameter: function(){
+    if (window.location.search.parseQuery()["tests"]){
+        return window.location.search.parseQuery()["tests"].split(',');
+    };
+  },
+  // Returns:
+  //  "ERROR" if there was an error,
+  //  "FAILURE" if there was a failure, or
+  //  "SUCCESS" if there was neither
+  getResult: function() {
+    var hasFailure = false;
+    for(var i=0;i<this.tests.length;i++) {
+      if (this.tests[i].errors > 0) {
+        return "ERROR";
+      }
+      if (this.tests[i].failures > 0) {
+        hasFailure = true;
+      }
+    }
+    if (hasFailure) {
+      return "FAILURE";
+    } else {
+      return "SUCCESS";
+    }
+  },
+  postResults: function() {
+    if (this.options.resultsURL) {
+      new Ajax.Request(this.options.resultsURL, 
+        { method: 'get', parameters: 'result=' + this.getResult(), asynchronous: false });
+    }
+  },
+  runTests: function() {
+    var test = this.tests[this.currentTest];
+    if (!test) {
+      // finished!
+      this.postResults();
+      this.logger.summary(this.summary());
+      return;
+    }
+    if(!test.isWaiting) {
+      this.logger.start(test.name);
+    }
+    test.run();
+    if(test.isWaiting) {
+      this.logger.message("Waiting for " + test.timeToWait + "ms");
+      setTimeout(this.runTests.bind(this), test.timeToWait || 1000);
+    } else {
+      this.logger.finish(test.status(), test.summary());
+      this.currentTest++;
+      // tail recursive, hopefully the browser will skip the stackframe
+      this.runTests();
+    }
+  },
+  summary: function() {
+    var assertions = 0;
+    var failures = 0;
+    var errors = 0;
+    var messages = [];
+    for(var i=0;i<this.tests.length;i++) {
+      assertions +=   this.tests[i].assertions;
+      failures   +=   this.tests[i].failures;
+      errors     +=   this.tests[i].errors;
+    }
+    return (
+      (this.options.context ? this.options.context + ': ': '') + 
+      this.tests.length + " tests, " + 
+      assertions + " assertions, " + 
+      failures   + " failures, " +
+      errors     + " errors");
+  }
+};
+
+Test.Unit.Assertions = Class.create();
+Test.Unit.Assertions.prototype = {
+  initialize: function() {
+    this.assertions = 0;
+    this.failures   = 0;
+    this.errors     = 0;
+    this.messages   = [];
+  },
+  summary: function() {
+    return (
+      this.assertions + " assertions, " + 
+      this.failures   + " failures, " +
+      this.errors     + " errors" + "\n" +
+      this.messages.join("\n"));
+  },
+  pass: function() {
+    this.assertions++;
+  },
+  fail: function(message) {
+    this.failures++;
+    this.messages.push("Failure: " + message);
+  },
+  info: function(message) {
+    this.messages.push("Info: " + message);
+  },
+  error: function(error) {
+    this.errors++;
+    this.messages.push(error.name + ": "+ error.message + "(" + Test.Unit.inspect(error) +")");
+  },
+  status: function() {
+    if (this.failures > 0) return 'failed';
+    if (this.errors > 0) return 'error';
+    return 'passed';
+  },
+  assert: function(expression) {
+    var message = arguments[1] || 'assert: got "' + Test.Unit.inspect(expression) + '"';
+    try { expression ? this.pass() : 
+      this.fail(message); }
+    catch(e) { this.error(e); }
+  },
+  assertEqual: function(expected, actual) {
+    var message = arguments[2] || "assertEqual";
+    try { (expected == actual) ? this.pass() :
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) + 
+        '", actual "' + Test.Unit.inspect(actual) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertInspect: function(expected, actual) {
+    var message = arguments[2] || "assertInspect";
+    try { (expected == actual.inspect()) ? this.pass() :
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) + 
+        '", actual "' + Test.Unit.inspect(actual) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertEnumEqual: function(expected, actual) {
+    var message = arguments[2] || "assertEnumEqual";
+    try { $A(expected).length == $A(actual).length && 
+      expected.zip(actual).all(function(pair) { return pair[0] == pair[1] }) ?
+        this.pass() : this.fail(message + ': expected ' + Test.Unit.inspect(expected) + 
+          ', actual ' + Test.Unit.inspect(actual)); }
+    catch(e) { this.error(e); }
+  },
+  assertNotEqual: function(expected, actual) {
+    var message = arguments[2] || "assertNotEqual";
+    try { (expected != actual) ? this.pass() : 
+      this.fail(message + ': got "' + Test.Unit.inspect(actual) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertIdentical: function(expected, actual) { 
+    var message = arguments[2] || "assertIdentical"; 
+    try { (expected === actual) ? this.pass() : 
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
+        '", actual "' + Test.Unit.inspect(actual) + '"'); } 
+    catch(e) { this.error(e); } 
+  },
+  assertNotIdentical: function(expected, actual) { 
+    var message = arguments[2] || "assertNotIdentical"; 
+    try { !(expected === actual) ? this.pass() : 
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
+        '", actual "' + Test.Unit.inspect(actual) + '"'); } 
+    catch(e) { this.error(e); } 
+  },
+  assertNull: function(obj) {
+    var message = arguments[1] || 'assertNull';
+    try { (obj==null) ? this.pass() : 
+      this.fail(message + ': got "' + Test.Unit.inspect(obj) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertMatch: function(expected, actual) {
+    var message = arguments[2] || 'assertMatch';
+    var regex = new RegExp(expected);
+    try { (regex.exec(actual)) ? this.pass() :
+      this.fail(message + ' : regex: "' +  Test.Unit.inspect(expected) + ' did not match: ' + Test.Unit.inspect(actual) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertHidden: function(element) {
+    var message = arguments[1] || 'assertHidden';
+    this.assertEqual("none", element.style.display, message);
+  },
+  assertNotNull: function(object) {
+    var message = arguments[1] || 'assertNotNull';
+    this.assert(object != null, message);
+  },
+  assertType: function(expected, actual) {
+    var message = arguments[2] || 'assertType';
+    try { 
+      (actual.constructor == expected) ? this.pass() : 
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
+        '", actual "' + (actual.constructor) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertNotOfType: function(expected, actual) {
+    var message = arguments[2] || 'assertNotOfType';
+    try { 
+      (actual.constructor != expected) ? this.pass() : 
+      this.fail(message + ': expected "' + Test.Unit.inspect(expected) +  
+        '", actual "' + (actual.constructor) + '"'); }
+    catch(e) { this.error(e); }
+  },
+  assertInstanceOf: function(expected, actual) {
+    var message = arguments[2] || 'assertInstanceOf';
+    try { 
+      (actual instanceof expected) ? this.pass() : 
+      this.fail(message + ": object was not an instance of the expected type"); }
+    catch(e) { this.error(e); } 
+  },
+  assertNotInstanceOf: function(expected, actual) {
+    var message = arguments[2] || 'assertNotInstanceOf';
+    try { 
+      !(actual instanceof expected) ? this.pass() : 
+      this.fail(message + ": object was an instance of the not expected type"); }
+    catch(e) { this.error(e); } 
+  },
+  assertRespondsTo: function(method, obj) {
+    var message = arguments[2] || 'assertRespondsTo';
+    try {
+      (obj[method] && typeof obj[method] == 'function') ? this.pass() : 
+      this.fail(message + ": object doesn't respond to [" + method + "]"); }
+    catch(e) { this.error(e); }
+  },
+  assertReturnsTrue: function(method, obj) {
+    var message = arguments[2] || 'assertReturnsTrue';
+    try {
+      var m = obj[method];
+      if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)];
+      m() ? this.pass() : 
+      this.fail(message + ": method returned false"); }
+    catch(e) { this.error(e); }
+  },
+  assertReturnsFalse: function(method, obj) {
+    var message = arguments[2] || 'assertReturnsFalse';
+    try {
+      var m = obj[method];
+      if(!m) m = obj['is'+method.charAt(0).toUpperCase()+method.slice(1)];
+      !m() ? this.pass() : 
+      this.fail(message + ": method returned true"); }
+    catch(e) { this.error(e); }
+  },
+  assertRaise: function(exceptionName, method) {
+    var message = arguments[2] || 'assertRaise';
+    try { 
+      method();
+      this.fail(message + ": exception expected but none was raised"); }
+    catch(e) {
+      ((exceptionName == null) || (e.name==exceptionName)) ? this.pass() : this.error(e); 
+    }
+  },
+  assertElementsMatch: function() {
+    var expressions = $A(arguments), elements = $A(expressions.shift());
+    if (elements.length != expressions.length) {
+      this.fail('assertElementsMatch: size mismatch: ' + elements.length + ' elements, ' + expressions.length + ' expressions');
+      return false;
+    }
+    elements.zip(expressions).all(function(pair, index) {
+      var element = $(pair.first()), expression = pair.last();
+      if (element.match(expression)) return true;
+      this.fail('assertElementsMatch: (in index ' + index + ') expected ' + expression.inspect() + ' but got ' + element.inspect());
+    }.bind(this)) && this.pass();
+  },
+  assertElementMatches: function(element, expression) {
+    this.assertElementsMatch([element], expression);
+  },
+  benchmark: function(operation, iterations) {
+    var startAt = new Date();
+    (iterations || 1).times(operation);
+    var timeTaken = ((new Date())-startAt);
+    this.info((arguments[2] || 'Operation') + ' finished ' + 
+       iterations + ' iterations in ' + (timeTaken/1000)+'s' );
+    return timeTaken;
+  },
+  _isVisible: function(element) {
+    element = $(element);
+    if(!element.parentNode) return true;
+    this.assertNotNull(element);
+    if(element.style && Element.getStyle(element, 'display') == 'none')
+      return false;
+    
+    return this._isVisible(element.parentNode);
+  },
+  assertNotVisible: function(element) {
+    this.assert(!this._isVisible(element), Test.Unit.inspect(element) + " was not hidden and didn't have a hidden parent either. " + ("" || arguments[1]));
+  },
+  assertVisible: function(element) {
+    this.assert(this._isVisible(element), Test.Unit.inspect(element) + " was not visible. " + ("" || arguments[1]));
+  },
+  benchmark: function(operation, iterations) {
+    var startAt = new Date();
+    (iterations || 1).times(operation);
+    var timeTaken = ((new Date())-startAt);
+    this.info((arguments[2] || 'Operation') + ' finished ' + 
+       iterations + ' iterations in ' + (timeTaken/1000)+'s' );
+    return timeTaken;
+  }
+};
+
+Test.Unit.Testcase = Class.create();
+Object.extend(Object.extend(Test.Unit.Testcase.prototype, Test.Unit.Assertions.prototype), {
+  initialize: function(name, test, setup, teardown) {
+    Test.Unit.Assertions.prototype.initialize.bind(this)();
+    this.name           = name;
+    
+    if(typeof test == 'string') {
+      test = test.gsub(/(\.should[^\(]+\()/,'#{0}this,');
+      test = test.gsub(/(\.should[^\(]+)\(this,\)/,'#{1}(this)');
+      this.test = function() {
+        eval('with(this){'+test+'}');
+      }
+    } else {
+      this.test = test || function() {};
+    }
+    
+    this.setup          = setup || function() {};
+    this.teardown       = teardown || function() {};
+    this.isWaiting      = false;
+    this.timeToWait     = 1000;
+  },
+  wait: function(time, nextPart) {
+    this.isWaiting = true;
+    this.test = nextPart;
+    this.timeToWait = time;
+  },
+  run: function() {
+    try {
+      try {
+        if (!this.isWaiting) this.setup.bind(this)();
+        this.isWaiting = false;
+        this.test.bind(this)();
+      } finally {
+        if(!this.isWaiting) {
+          this.teardown.bind(this)();
+        }
+      }
+    }
+    catch(e) { this.error(e); }
+  }
+});
+
+// *EXPERIMENTAL* BDD-style testing to please non-technical folk
+// This draws many ideas from RSpec http://rspec.rubyforge.org/
+
+Test.setupBDDExtensionMethods = function(){
+  var METHODMAP = {
+    shouldEqual:     'assertEqual',
+    shouldNotEqual:  'assertNotEqual',
+    shouldEqualEnum: 'assertEnumEqual',
+    shouldBeA:       'assertType',
+    shouldNotBeA:    'assertNotOfType',
+    shouldBeAn:      'assertType',
+    shouldNotBeAn:   'assertNotOfType',
+    shouldBeNull:    'assertNull',
+    shouldNotBeNull: 'assertNotNull',
+    
+    shouldBe:        'assertReturnsTrue',
+    shouldNotBe:     'assertReturnsFalse',
+    shouldRespondTo: 'assertRespondsTo'
+  };
+  var makeAssertion = function(assertion, args, object) { 
+   	this[assertion].apply(this,(args || []).concat([object]));
+  };
+  
+  Test.BDDMethods = {};   
+  $H(METHODMAP).each(function(pair) { 
+    Test.BDDMethods[pair.key] = function() { 
+       var args = $A(arguments); 
+       var scope = args.shift(); 
+       makeAssertion.apply(scope, [pair.value, args, this]); }; 
+  });
+  
+  [Array.prototype, String.prototype, Number.prototype, Boolean.prototype].each(
+    function(p){ Object.extend(p, Test.BDDMethods) }
+  );
+};
+
+Test.context = function(name, spec, log){
+  Test.setupBDDExtensionMethods();
+  
+  var compiledSpec = {};
+  var titles = {};
+  for(specName in spec) {
+    switch(specName){
+      case "setup":
+      case "teardown":
+        compiledSpec[specName] = spec[specName];
+        break;
+      default:
+        var testName = 'test'+specName.gsub(/\s+/,'-').camelize();
+        var body = spec[specName].toString().split('\n').slice(1);
+        if(/^\{/.test(body[0])) body = body.slice(1);
+        body.pop();
+        body = body.map(function(statement){ 
+          return statement.strip()
+        });
+        compiledSpec[testName] = body.join('\n');
+        titles[testName] = specName;
+    }
+  }
+  new Test.Unit.Runner(compiledSpec, { titles: titles, testLog: log || 'testlog', context: name });
+};
\ No newline at end of file

From 329a54f98768cb712d1b54b075e5621357776b3f Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Fri, 20 Jan 2012 20:59:27 +0900
Subject: [PATCH 043/630] rename JavascriptHelper.php in sfProtoculousPlugin to
 avoid helper name conflict (fixes #2617)

---
 lib/helper/JavascriptHelper.php                                  | 1 +
 .../lib/helper/{JavascriptHelper.php => ProtoculousHelper.php}   | 0
 2 files changed, 1 insertion(+)
 rename plugins/sfProtoculousPlugin/lib/helper/{JavascriptHelper.php => ProtoculousHelper.php} (100%)

diff --git a/lib/helper/JavascriptHelper.php b/lib/helper/JavascriptHelper.php
index 185178e63..cb11cb918 100644
--- a/lib/helper/JavascriptHelper.php
+++ b/lib/helper/JavascriptHelper.php
@@ -18,4 +18,5 @@
  * @author     Kimura Youichi <kim.upsilon@bucyou.net>
  */
 
+use_helper('Protoculous');
 
diff --git a/plugins/sfProtoculousPlugin/lib/helper/JavascriptHelper.php b/plugins/sfProtoculousPlugin/lib/helper/ProtoculousHelper.php
similarity index 100%
rename from plugins/sfProtoculousPlugin/lib/helper/JavascriptHelper.php
rename to plugins/sfProtoculousPlugin/lib/helper/ProtoculousHelper.php

From 5a1dba21c6f9096f1ad802e626421f8d6ffc9eac Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 2 Feb 2012 19:37:27 +0900
Subject: [PATCH 044/630] don't make element that is'nt mark with sortable CSS
 class as movable (refs #2617)

---
 apps/pc_backend/modules/design/templates/_plotGadget.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/pc_backend/modules/design/templates/_plotGadget.php b/apps/pc_backend/modules/design/templates/_plotGadget.php
index e8ebb3a3d..870b78bda 100644
--- a/apps/pc_backend/modules/design/templates/_plotGadget.php
+++ b/apps/pc_backend/modules/design/templates/_plotGadget.php
@@ -14,7 +14,7 @@
 </div>
 <?php echo javascript_tag('
 $("#plot'.ucfirst($type).'").sortable({
-  items: "> div",
+  items: "> div.sortable",
   update: function(event,ui){
     insertHiddenTags("'.$type.'", ui.item.parent().sortable("toArray"));
   }

From 31db1bd266203d2f8448bf75c288bbb0061a1cdb Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 9 Feb 2012 19:22:57 +0900
Subject: [PATCH 045/630] include jquery.min.js and jquery-ui.min.js into
 project tree (fixes #2617)

---
 .../modules/community/config/view.yml         |   4 +-
 .../modules/default/config/view.yml           |   2 +-
 .../pc_backend/modules/design/config/view.yml |   8 +-
 .../modules/navigation/config/view.yml        |   4 +-
 .../modules/profile/config/view.yml           |   2 +-
 apps/pc_backend/modules/sns/config/view.yml   |   4 +-
 .../modules/member/config/view.yml            |   2 +-
 config/OpenPNE.yml.sample                     |   8 -
 web/js/jquery-ui.min.js                       | 414 ++++++++++++++++++
 web/js/jquery.min.js                          |   4 +
 10 files changed, 431 insertions(+), 21 deletions(-)
 create mode 100644 web/js/jquery-ui.min.js
 create mode 100644 web/js/jquery.min.js

diff --git a/apps/pc_backend/modules/community/config/view.yml b/apps/pc_backend/modules/community/config/view.yml
index 359810d89..08f900204 100644
--- a/apps/pc_backend/modules/community/config/view.yml
+++ b/apps/pc_backend/modules/community/config/view.yml
@@ -1,4 +1,4 @@
 categoryListSuccess:
   javascripts:
-    - %OP_JQUERY_URL%
-    - %OP_JQUERYUI_URL%
+    - jquery.min.js
+    - jquery-ui.min.js
diff --git a/apps/pc_backend/modules/default/config/view.yml b/apps/pc_backend/modules/default/config/view.yml
index 77ecb5619..b81991cfa 100644
--- a/apps/pc_backend/modules/default/config/view.yml
+++ b/apps/pc_backend/modules/default/config/view.yml
@@ -1,5 +1,5 @@
 topSuccess:
-  javascripts: [%OP_JQUERY_URL%]
+  javascripts: [jquery.min.js]
 
 templateHelpSuccess:
   layout: plain
diff --git a/apps/pc_backend/modules/design/config/view.yml b/apps/pc_backend/modules/design/config/view.yml
index b95b21e42..dd955e1d9 100644
--- a/apps/pc_backend/modules/design/config/view.yml
+++ b/apps/pc_backend/modules/design/config/view.yml
@@ -1,18 +1,18 @@
 gadgetSuccess:
   javascripts:
-    - %OP_JQUERY_URL%
+    - jquery.min.js
 
 gadgetPlotSuccess:
   layout: plain
   stylesheets: [-backend, gadgetPlot]
-  javascripts: [%OP_JQUERY_URL%, %OP_JQUERYUI_URL%]
+  javascripts: [jquery.min.js, jquery-ui.min.js]
 
 addGadgetSuccess:
   layout: plain
   stylesheets: [-backend]
-  javascripts: [%OP_JQUERY_URL%]
+  javascripts: [jquery.min.js]
 
 editGadgetSuccess:
   layout: plain
   stylesheets: [-backend]
-  javascripts: [%OP_JQUERY_URL%]
+  javascripts: [jquery.min.js]
diff --git a/apps/pc_backend/modules/navigation/config/view.yml b/apps/pc_backend/modules/navigation/config/view.yml
index d3c9e2cf4..b979df85c 100644
--- a/apps/pc_backend/modules/navigation/config/view.yml
+++ b/apps/pc_backend/modules/navigation/config/view.yml
@@ -1,4 +1,4 @@
 listSuccess:
   javascripts:
-    - %OP_JQUERY_URL%
-    - %OP_JQUERYUI_URL%
+    - jquery.min.js
+    - jquery-ui.min.js
diff --git a/apps/pc_backend/modules/profile/config/view.yml b/apps/pc_backend/modules/profile/config/view.yml
index 2f3c7b59a..84afedbaa 100644
--- a/apps/pc_backend/modules/profile/config/view.yml
+++ b/apps/pc_backend/modules/profile/config/view.yml
@@ -2,4 +2,4 @@ editSuccess:
   javascripts: [%SF_PROTOTYPE_WEB_DIR%/js/prototype]
 
 listSuccess:
-  javascripts: [%OP_JQUERY_URL%, %OP_JQUERYUI_URL%]
+  javascripts: [jquery.min.js, jquery-ui.min.js]
diff --git a/apps/pc_backend/modules/sns/config/view.yml b/apps/pc_backend/modules/sns/config/view.yml
index 0f6a354b9..f567e9d48 100644
--- a/apps/pc_backend/modules/sns/config/view.yml
+++ b/apps/pc_backend/modules/sns/config/view.yml
@@ -1,4 +1,4 @@
 richTextareaSuccess:
   javascripts:
-    - %OP_JQUERY_URL%
-    - %OP_JQUERYUI_URL%
+    - jquery.min.js
+    - jquery-ui.min.js
diff --git a/apps/pc_frontend/modules/member/config/view.yml b/apps/pc_frontend/modules/member/config/view.yml
index 9fa69c8f4..b5569dc26 100644
--- a/apps/pc_frontend/modules/member/config/view.yml
+++ b/apps/pc_frontend/modules/member/config/view.yml
@@ -1,5 +1,5 @@
 homeSuccess:
-  javascripts: [%OP_JQUERY_URL%, %OP_JQUERYUI_URL%, util]
+  javascripts: [jquery.min.js, jquery-ui.min.js, util]
   layout: layoutA
   customize:
     cautionAboutFriendPre:
diff --git a/config/OpenPNE.yml.sample b/config/OpenPNE.yml.sample
index ae6e93d87..1086a404c 100644
--- a/config/OpenPNE.yml.sample
+++ b/config/OpenPNE.yml.sample
@@ -218,14 +218,6 @@ supported_languages: ['en', 'ja_JP']
 # プラグインリストのベース URL
 # plugin_list_base_url: "http://plugins.openpne.jp/packages/"
 
-####################################
-# Ajax設定
-####################################
-
-# ロードする jQuery の URL
-jquery_url: "https://ajax.googleapis.com/ajax/libs/jquery/1.7.0/jquery.min.js"
-jqueryui_url: "https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js"
-
 ###########################################
 # モバイル自動リンク設定 (Mobile Auto link)
 ###########################################
diff --git a/web/js/jquery-ui.min.js b/web/js/jquery-ui.min.js
new file mode 100644
index 000000000..0202506b5
--- /dev/null
+++ b/web/js/jquery-ui.min.js
@@ -0,0 +1,414 @@
+/*!
+ * jQuery UI 1.8.16
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI
+ */
+(function(a,d){function c(h,g){var i=h.nodeName.toLowerCase();if("area"===i){g=h.parentNode;i=g.name;if(!h.href||!i||g.nodeName.toLowerCase()!=="map")return false;h=a("img[usemap=#"+i+"]")[0];return!!h&&e(h)}return(/input|select|textarea|button|object/.test(i)?!h.disabled:"a"==i?h.href||g:g)&&e(h)}function e(h){return!a(h).parents().andSelf().filter(function(){return a.curCSS(this,"visibility")==="hidden"||a.expr.filters.hidden(this)}).length}a.ui=a.ui||{};if(!a.ui.version){a.extend(a.ui,{version:"1.8.16",
+keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});a.fn.extend({propAttr:a.fn.prop||a.fn.attr,_focus:a.fn.focus,focus:function(h,g){return typeof h==="number"?this.each(function(){var i=
+this;setTimeout(function(){a(i).focus();g&&g.call(i)},h)}):this._focus.apply(this,arguments)},scrollParent:function(){var h;h=a.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(a.curCSS(this,"position",1))&&/(auto|scroll)/.test(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(a.curCSS(this,
+"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!h.length?a(document):h},zIndex:function(h){if(h!==d)return this.css("zIndex",h);if(this.length){h=a(this[0]);for(var g;h.length&&h[0]!==document;){g=h.css("position");if(g==="absolute"||g==="relative"||g==="fixed"){g=parseInt(h.css("zIndex"),10);if(!isNaN(g)&&g!==0)return g}h=h.parent()}}return 0},disableSelection:function(){return this.bind((a.support.selectstart?"selectstart":
+"mousedown")+".ui-disableSelection",function(h){h.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});a.each(["Width","Height"],function(h,g){function i(l,o,n,k){a.each(b,function(){o-=parseFloat(a.curCSS(l,"padding"+this,true))||0;if(n)o-=parseFloat(a.curCSS(l,"border"+this+"Width",true))||0;if(k)o-=parseFloat(a.curCSS(l,"margin"+this,true))||0});return o}var b=g==="Width"?["Left","Right"]:["Top","Bottom"],f=g.toLowerCase(),j={innerWidth:a.fn.innerWidth,innerHeight:a.fn.innerHeight,
+outerWidth:a.fn.outerWidth,outerHeight:a.fn.outerHeight};a.fn["inner"+g]=function(l){if(l===d)return j["inner"+g].call(this);return this.each(function(){a(this).css(f,i(this,l)+"px")})};a.fn["outer"+g]=function(l,o){if(typeof l!=="number")return j["outer"+g].call(this,l);return this.each(function(){a(this).css(f,i(this,l,true,o)+"px")})}});a.extend(a.expr[":"],{data:function(h,g,i){return!!a.data(h,i[3])},focusable:function(h){return c(h,!isNaN(a.attr(h,"tabindex")))},tabbable:function(h){var g=a.attr(h,
+"tabindex"),i=isNaN(g);return(i||g>=0)&&c(h,!i)}});a(function(){var h=document.body,g=h.appendChild(g=document.createElement("div"));a.extend(g.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});a.support.minHeight=g.offsetHeight===100;a.support.selectstart="onselectstart"in g;h.removeChild(g).style.display="none"});a.extend(a.ui,{plugin:{add:function(h,g,i){h=a.ui[h].prototype;for(var b in i){h.plugins[b]=h.plugins[b]||[];h.plugins[b].push([g,i[b]])}},call:function(h,g,i){if((g=h.plugins[g])&&
+h.element[0].parentNode)for(var b=0;b<g.length;b++)h.options[g[b][0]]&&g[b][1].apply(h.element,i)}},contains:function(h,g){return document.compareDocumentPosition?h.compareDocumentPosition(g)&16:h!==g&&h.contains(g)},hasScroll:function(h,g){if(a(h).css("overflow")==="hidden")return false;g=g&&g==="left"?"scrollLeft":"scrollTop";var i=false;if(h[g]>0)return true;h[g]=1;i=h[g]>0;h[g]=0;return i},isOverAxis:function(h,g,i){return h>g&&h<g+i},isOver:function(h,g,i,b,f,j){return a.ui.isOverAxis(h,i,f)&&
+a.ui.isOverAxis(g,b,j)}})}})(jQuery);
+(function(a,d){if(a.cleanData){var c=a.cleanData;a.cleanData=function(h){for(var g=0,i;(i=h[g])!=null;g++)try{a(i).triggerHandler("remove")}catch(b){}c(h)}}else{var e=a.fn.remove;a.fn.remove=function(h,g){return this.each(function(){if(!g)if(!h||a.filter(h,[this]).length)a("*",this).add([this]).each(function(){try{a(this).triggerHandler("remove")}catch(i){}});return e.call(a(this),h,g)})}}a.widget=function(h,g,i){var b=h.split(".")[0],f;h=h.split(".")[1];f=b+"-"+h;if(!i){i=g;g=a.Widget}a.expr[":"][f]=
+function(j){return!!a.data(j,h)};a[b]=a[b]||{};a[b][h]=function(j,l){arguments.length&&this._createWidget(j,l)};g=new g;g.options=a.extend(true,{},g.options);a[b][h].prototype=a.extend(true,g,{namespace:b,widgetName:h,widgetEventPrefix:a[b][h].prototype.widgetEventPrefix||h,widgetBaseClass:f},i);a.widget.bridge(h,a[b][h])};a.widget.bridge=function(h,g){a.fn[h]=function(i){var b=typeof i==="string",f=Array.prototype.slice.call(arguments,1),j=this;i=!b&&f.length?a.extend.apply(null,[true,i].concat(f)):
+i;if(b&&i.charAt(0)==="_")return j;b?this.each(function(){var l=a.data(this,h),o=l&&a.isFunction(l[i])?l[i].apply(l,f):l;if(o!==l&&o!==d){j=o;return false}}):this.each(function(){var l=a.data(this,h);l?l.option(i||{})._init():a.data(this,h,new g(i,this))});return j}};a.Widget=function(h,g){arguments.length&&this._createWidget(h,g)};a.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(h,g){a.data(g,this.widgetName,this);this.element=a(g);this.options=
+a.extend(true,{},this.options,this._getCreateOptions(),h);var i=this;this.element.bind("remove."+this.widgetName,function(){i.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return a.metadata&&a.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+
+"-disabled ui-state-disabled")},widget:function(){return this.element},option:function(h,g){var i=h;if(arguments.length===0)return a.extend({},this.options);if(typeof h==="string"){if(g===d)return this.options[h];i={};i[h]=g}this._setOptions(i);return this},_setOptions:function(h){var g=this;a.each(h,function(i,b){g._setOption(i,b)});return this},_setOption:function(h,g){this.options[h]=g;if(h==="disabled")this.widget()[g?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",
+g);return this},enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(h,g,i){var b=this.options[h];g=a.Event(g);g.type=(h===this.widgetEventPrefix?h:this.widgetEventPrefix+h).toLowerCase();i=i||{};if(g.originalEvent){h=a.event.props.length;for(var f;h;){f=a.event.props[--h];g[f]=g.originalEvent[f]}}this.element.trigger(g,i);return!(a.isFunction(b)&&b.call(this.element[0],g,i)===false||g.isDefaultPrevented())}}})(jQuery);
+(function(a){var d=false;a(document).mouseup(function(){d=false});a.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var c=this;this.element.bind("mousedown."+this.widgetName,function(e){return c._mouseDown(e)}).bind("click."+this.widgetName,function(e){if(true===a.data(e.target,c.widgetName+".preventClickEvent")){a.removeData(e.target,c.widgetName+".preventClickEvent");e.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+
+this.widgetName)},_mouseDown:function(c){if(!d){this._mouseStarted&&this._mouseUp(c);this._mouseDownEvent=c;var e=this,h=c.which==1,g=typeof this.options.cancel=="string"&&c.target.nodeName?a(c.target).closest(this.options.cancel).length:false;if(!h||g||!this._mouseCapture(c))return true;this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){e.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(c)&&this._mouseDelayMet(c)){this._mouseStarted=
+this._mouseStart(c)!==false;if(!this._mouseStarted){c.preventDefault();return true}}true===a.data(c.target,this.widgetName+".preventClickEvent")&&a.removeData(c.target,this.widgetName+".preventClickEvent");this._mouseMoveDelegate=function(i){return e._mouseMove(i)};this._mouseUpDelegate=function(i){return e._mouseUp(i)};a(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);c.preventDefault();return d=true}},_mouseMove:function(c){if(a.browser.msie&&
+!(document.documentMode>=9)&&!c.button)return this._mouseUp(c);if(this._mouseStarted){this._mouseDrag(c);return c.preventDefault()}if(this._mouseDistanceMet(c)&&this._mouseDelayMet(c))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,c)!==false)?this._mouseDrag(c):this._mouseUp(c);return!this._mouseStarted},_mouseUp:function(c){a(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=
+false;c.target==this._mouseDownEvent.target&&a.data(c.target,this.widgetName+".preventClickEvent",true);this._mouseStop(c)}return false},_mouseDistanceMet:function(c){return Math.max(Math.abs(this._mouseDownEvent.pageX-c.pageX),Math.abs(this._mouseDownEvent.pageY-c.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return true}})})(jQuery);
+(function(a){a.widget("ui.draggable",a.ui.mouse,{widgetEventPrefix:"drag",options:{addClasses:true,appendTo:"parent",axis:false,connectToSortable:false,containment:false,cursor:"auto",cursorAt:false,grid:false,handle:false,helper:"original",iframeFix:false,opacity:false,refreshPositions:false,revert:false,revertDuration:500,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,snap:false,snapMode:"both",snapTolerance:20,stack:false,zIndex:false},_create:function(){if(this.options.helper==
+"original"&&!/^(?:r|a|f)/.test(this.element.css("position")))this.element[0].style.position="relative";this.options.addClasses&&this.element.addClass("ui-draggable");this.options.disabled&&this.element.addClass("ui-draggable-disabled");this._mouseInit()},destroy:function(){if(this.element.data("draggable")){this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled");this._mouseDestroy();return this}},_mouseCapture:function(d){var c=
+this.options;if(this.helper||c.disabled||a(d.target).is(".ui-resizable-handle"))return false;this.handle=this._getHandle(d);if(!this.handle)return false;if(c.iframeFix)a(c.iframeFix===true?"iframe":c.iframeFix).each(function(){a('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1E3}).css(a(this).offset()).appendTo("body")});return true},_mouseStart:function(d){var c=this.options;
+this.helper=this._createHelper(d);this._cacheHelperProportions();if(a.ui.ddmanager)a.ui.ddmanager.current=this;this._cacheMargins();this.cssPosition=this.helper.css("position");this.scrollParent=this.helper.scrollParent();this.offset=this.positionAbs=this.element.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};a.extend(this.offset,{click:{left:d.pageX-this.offset.left,top:d.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});
+this.originalPosition=this.position=this._generatePosition(d);this.originalPageX=d.pageX;this.originalPageY=d.pageY;c.cursorAt&&this._adjustOffsetFromHelper(c.cursorAt);c.containment&&this._setContainment();if(this._trigger("start",d)===false){this._clear();return false}this._cacheHelperProportions();a.ui.ddmanager&&!c.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,d);this.helper.addClass("ui-draggable-dragging");this._mouseDrag(d,true);a.ui.ddmanager&&a.ui.ddmanager.dragStart(this,d);return true},
+_mouseDrag:function(d,c){this.position=this._generatePosition(d);this.positionAbs=this._convertPositionTo("absolute");if(!c){c=this._uiHash();if(this._trigger("drag",d,c)===false){this._mouseUp({});return false}this.position=c.position}if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";a.ui.ddmanager&&a.ui.ddmanager.drag(this,d);return false},_mouseStop:function(d){var c=
+false;if(a.ui.ddmanager&&!this.options.dropBehaviour)c=a.ui.ddmanager.drop(this,d);if(this.dropped){c=this.dropped;this.dropped=false}if((!this.element[0]||!this.element[0].parentNode)&&this.options.helper=="original")return false;if(this.options.revert=="invalid"&&!c||this.options.revert=="valid"&&c||this.options.revert===true||a.isFunction(this.options.revert)&&this.options.revert.call(this.element,c)){var e=this;a(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,
+10),function(){e._trigger("stop",d)!==false&&e._clear()})}else this._trigger("stop",d)!==false&&this._clear();return false},_mouseUp:function(d){this.options.iframeFix===true&&a("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)});a.ui.ddmanager&&a.ui.ddmanager.dragStop(this,d);return a.ui.mouse.prototype._mouseUp.call(this,d)},cancel:function(){this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear();return this},_getHandle:function(d){var c=!this.options.handle||
+!a(this.options.handle,this.element).length?true:false;a(this.options.handle,this.element).find("*").andSelf().each(function(){if(this==d.target)c=true});return c},_createHelper:function(d){var c=this.options;d=a.isFunction(c.helper)?a(c.helper.apply(this.element[0],[d])):c.helper=="clone"?this.element.clone().removeAttr("id"):this.element;d.parents("body").length||d.appendTo(c.appendTo=="parent"?this.element[0].parentNode:c.appendTo);d[0]!=this.element[0]&&!/(fixed|absolute)/.test(d.css("position"))&&
+d.css("position","absolute");return d},_adjustOffsetFromHelper:function(d){if(typeof d=="string")d=d.split(" ");if(a.isArray(d))d={left:+d[0],top:+d[1]||0};if("left"in d)this.offset.click.left=d.left+this.margins.left;if("right"in d)this.offset.click.left=this.helperProportions.width-d.right+this.margins.left;if("top"in d)this.offset.click.top=d.top+this.margins.top;if("bottom"in d)this.offset.click.top=this.helperProportions.height-d.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=
+this.helper.offsetParent();var d=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0])){d.left+=this.scrollParent.scrollLeft();d.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&a.browser.msie)d={top:0,left:0};return{top:d.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:d.left+(parseInt(this.offsetParent.css("borderLeftWidth"),
+10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var d=this.element.position();return{top:d.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:d.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),
+10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var d=this.options;if(d.containment=="parent")d.containment=this.helper[0].parentNode;if(d.containment=="document"||d.containment=="window")this.containment=[d.containment=="document"?0:a(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,d.containment=="document"?0:a(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,
+(d.containment=="document"?0:a(window).scrollLeft())+a(d.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(d.containment=="document"?0:a(window).scrollTop())+(a(d.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(d.containment)&&d.containment.constructor!=Array){d=a(d.containment);var c=d[0];if(c){d.offset();var e=a(c).css("overflow")!=
+"hidden";this.containment=[(parseInt(a(c).css("borderLeftWidth"),10)||0)+(parseInt(a(c).css("paddingLeft"),10)||0),(parseInt(a(c).css("borderTopWidth"),10)||0)+(parseInt(a(c).css("paddingTop"),10)||0),(e?Math.max(c.scrollWidth,c.offsetWidth):c.offsetWidth)-(parseInt(a(c).css("borderLeftWidth"),10)||0)-(parseInt(a(c).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(e?Math.max(c.scrollHeight,c.offsetHeight):c.offsetHeight)-(parseInt(a(c).css("borderTopWidth"),
+10)||0)-(parseInt(a(c).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom];this.relative_container=d}}else if(d.containment.constructor==Array)this.containment=d.containment},_convertPositionTo:function(d,c){if(!c)c=this.position;d=d=="absolute"?1:-1;var e=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,h=/(html|body)/i.test(e[0].tagName);return{top:c.top+
+this.offset.relative.top*d+this.offset.parent.top*d-(a.browser.safari&&a.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():h?0:e.scrollTop())*d),left:c.left+this.offset.relative.left*d+this.offset.parent.left*d-(a.browser.safari&&a.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():h?0:e.scrollLeft())*d)}},_generatePosition:function(d){var c=this.options,e=this.cssPosition=="absolute"&&
+!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,h=/(html|body)/i.test(e[0].tagName),g=d.pageX,i=d.pageY;if(this.originalPosition){var b;if(this.containment){if(this.relative_container){b=this.relative_container.offset();b=[this.containment[0]+b.left,this.containment[1]+b.top,this.containment[2]+b.left,this.containment[3]+b.top]}else b=this.containment;if(d.pageX-this.offset.click.left<b[0])g=b[0]+this.offset.click.left;
+if(d.pageY-this.offset.click.top<b[1])i=b[1]+this.offset.click.top;if(d.pageX-this.offset.click.left>b[2])g=b[2]+this.offset.click.left;if(d.pageY-this.offset.click.top>b[3])i=b[3]+this.offset.click.top}if(c.grid){i=c.grid[1]?this.originalPageY+Math.round((i-this.originalPageY)/c.grid[1])*c.grid[1]:this.originalPageY;i=b?!(i-this.offset.click.top<b[1]||i-this.offset.click.top>b[3])?i:!(i-this.offset.click.top<b[1])?i-c.grid[1]:i+c.grid[1]:i;g=c.grid[0]?this.originalPageX+Math.round((g-this.originalPageX)/
+c.grid[0])*c.grid[0]:this.originalPageX;g=b?!(g-this.offset.click.left<b[0]||g-this.offset.click.left>b[2])?g:!(g-this.offset.click.left<b[0])?g-c.grid[0]:g+c.grid[0]:g}}return{top:i-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(a.browser.safari&&a.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():h?0:e.scrollTop()),left:g-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(a.browser.safari&&a.browser.version<
+526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():h?0:e.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-draggable-dragging");this.helper[0]!=this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove();this.helper=null;this.cancelHelperRemoval=false},_trigger:function(d,c,e){e=e||this._uiHash();a.ui.plugin.call(this,d,[c,e]);if(d=="drag")this.positionAbs=this._convertPositionTo("absolute");return a.Widget.prototype._trigger.call(this,d,c,
+e)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}});a.extend(a.ui.draggable,{version:"1.8.16"});a.ui.plugin.add("draggable","connectToSortable",{start:function(d,c){var e=a(this).data("draggable"),h=e.options,g=a.extend({},c,{item:e.element});e.sortables=[];a(h.connectToSortable).each(function(){var i=a.data(this,"sortable");if(i&&!i.options.disabled){e.sortables.push({instance:i,shouldRevert:i.options.revert});
+i.refreshPositions();i._trigger("activate",d,g)}})},stop:function(d,c){var e=a(this).data("draggable"),h=a.extend({},c,{item:e.element});a.each(e.sortables,function(){if(this.instance.isOver){this.instance.isOver=0;e.cancelHelperRemoval=true;this.instance.cancelHelperRemoval=false;if(this.shouldRevert)this.instance.options.revert=true;this.instance._mouseStop(d);this.instance.options.helper=this.instance.options._helper;e.options.helper=="original"&&this.instance.currentItem.css({top:"auto",left:"auto"})}else{this.instance.cancelHelperRemoval=
+false;this.instance._trigger("deactivate",d,h)}})},drag:function(d,c){var e=a(this).data("draggable"),h=this;a.each(e.sortables,function(){this.instance.positionAbs=e.positionAbs;this.instance.helperProportions=e.helperProportions;this.instance.offset.click=e.offset.click;if(this.instance._intersectsWith(this.instance.containerCache)){if(!this.instance.isOver){this.instance.isOver=1;this.instance.currentItem=a(h).clone().removeAttr("id").appendTo(this.instance.element).data("sortable-item",true);
+this.instance.options._helper=this.instance.options.helper;this.instance.options.helper=function(){return c.helper[0]};d.target=this.instance.currentItem[0];this.instance._mouseCapture(d,true);this.instance._mouseStart(d,true,true);this.instance.offset.click.top=e.offset.click.top;this.instance.offset.click.left=e.offset.click.left;this.instance.offset.parent.left-=e.offset.parent.left-this.instance.offset.parent.left;this.instance.offset.parent.top-=e.offset.parent.top-this.instance.offset.parent.top;
+e._trigger("toSortable",d);e.dropped=this.instance.element;e.currentItem=e.element;this.instance.fromOutside=e}this.instance.currentItem&&this.instance._mouseDrag(d)}else if(this.instance.isOver){this.instance.isOver=0;this.instance.cancelHelperRemoval=true;this.instance.options.revert=false;this.instance._trigger("out",d,this.instance._uiHash(this.instance));this.instance._mouseStop(d,true);this.instance.options.helper=this.instance.options._helper;this.instance.currentItem.remove();this.instance.placeholder&&
+this.instance.placeholder.remove();e._trigger("fromSortable",d);e.dropped=false}})}});a.ui.plugin.add("draggable","cursor",{start:function(){var d=a("body"),c=a(this).data("draggable").options;if(d.css("cursor"))c._cursor=d.css("cursor");d.css("cursor",c.cursor)},stop:function(){var d=a(this).data("draggable").options;d._cursor&&a("body").css("cursor",d._cursor)}});a.ui.plugin.add("draggable","opacity",{start:function(d,c){d=a(c.helper);c=a(this).data("draggable").options;if(d.css("opacity"))c._opacity=
+d.css("opacity");d.css("opacity",c.opacity)},stop:function(d,c){d=a(this).data("draggable").options;d._opacity&&a(c.helper).css("opacity",d._opacity)}});a.ui.plugin.add("draggable","scroll",{start:function(){var d=a(this).data("draggable");if(d.scrollParent[0]!=document&&d.scrollParent[0].tagName!="HTML")d.overflowOffset=d.scrollParent.offset()},drag:function(d){var c=a(this).data("draggable"),e=c.options,h=false;if(c.scrollParent[0]!=document&&c.scrollParent[0].tagName!="HTML"){if(!e.axis||e.axis!=
+"x")if(c.overflowOffset.top+c.scrollParent[0].offsetHeight-d.pageY<e.scrollSensitivity)c.scrollParent[0].scrollTop=h=c.scrollParent[0].scrollTop+e.scrollSpeed;else if(d.pageY-c.overflowOffset.top<e.scrollSensitivity)c.scrollParent[0].scrollTop=h=c.scrollParent[0].scrollTop-e.scrollSpeed;if(!e.axis||e.axis!="y")if(c.overflowOffset.left+c.scrollParent[0].offsetWidth-d.pageX<e.scrollSensitivity)c.scrollParent[0].scrollLeft=h=c.scrollParent[0].scrollLeft+e.scrollSpeed;else if(d.pageX-c.overflowOffset.left<
+e.scrollSensitivity)c.scrollParent[0].scrollLeft=h=c.scrollParent[0].scrollLeft-e.scrollSpeed}else{if(!e.axis||e.axis!="x")if(d.pageY-a(document).scrollTop()<e.scrollSensitivity)h=a(document).scrollTop(a(document).scrollTop()-e.scrollSpeed);else if(a(window).height()-(d.pageY-a(document).scrollTop())<e.scrollSensitivity)h=a(document).scrollTop(a(document).scrollTop()+e.scrollSpeed);if(!e.axis||e.axis!="y")if(d.pageX-a(document).scrollLeft()<e.scrollSensitivity)h=a(document).scrollLeft(a(document).scrollLeft()-
+e.scrollSpeed);else if(a(window).width()-(d.pageX-a(document).scrollLeft())<e.scrollSensitivity)h=a(document).scrollLeft(a(document).scrollLeft()+e.scrollSpeed)}h!==false&&a.ui.ddmanager&&!e.dropBehaviour&&a.ui.ddmanager.prepareOffsets(c,d)}});a.ui.plugin.add("draggable","snap",{start:function(){var d=a(this).data("draggable"),c=d.options;d.snapElements=[];a(c.snap.constructor!=String?c.snap.items||":data(draggable)":c.snap).each(function(){var e=a(this),h=e.offset();this!=d.element[0]&&d.snapElements.push({item:this,
+width:e.outerWidth(),height:e.outerHeight(),top:h.top,left:h.left})})},drag:function(d,c){for(var e=a(this).data("draggable"),h=e.options,g=h.snapTolerance,i=c.offset.left,b=i+e.helperProportions.width,f=c.offset.top,j=f+e.helperProportions.height,l=e.snapElements.length-1;l>=0;l--){var o=e.snapElements[l].left,n=o+e.snapElements[l].width,k=e.snapElements[l].top,m=k+e.snapElements[l].height;if(o-g<i&&i<n+g&&k-g<f&&f<m+g||o-g<i&&i<n+g&&k-g<j&&j<m+g||o-g<b&&b<n+g&&k-g<f&&f<m+g||o-g<b&&b<n+g&&k-g<j&&
+j<m+g){if(h.snapMode!="inner"){var p=Math.abs(k-j)<=g,q=Math.abs(m-f)<=g,s=Math.abs(o-b)<=g,r=Math.abs(n-i)<=g;if(p)c.position.top=e._convertPositionTo("relative",{top:k-e.helperProportions.height,left:0}).top-e.margins.top;if(q)c.position.top=e._convertPositionTo("relative",{top:m,left:0}).top-e.margins.top;if(s)c.position.left=e._convertPositionTo("relative",{top:0,left:o-e.helperProportions.width}).left-e.margins.left;if(r)c.position.left=e._convertPositionTo("relative",{top:0,left:n}).left-e.margins.left}var u=
+p||q||s||r;if(h.snapMode!="outer"){p=Math.abs(k-f)<=g;q=Math.abs(m-j)<=g;s=Math.abs(o-i)<=g;r=Math.abs(n-b)<=g;if(p)c.position.top=e._convertPositionTo("relative",{top:k,left:0}).top-e.margins.top;if(q)c.position.top=e._convertPositionTo("relative",{top:m-e.helperProportions.height,left:0}).top-e.margins.top;if(s)c.position.left=e._convertPositionTo("relative",{top:0,left:o}).left-e.margins.left;if(r)c.position.left=e._convertPositionTo("relative",{top:0,left:n-e.helperProportions.width}).left-e.margins.left}if(!e.snapElements[l].snapping&&
+(p||q||s||r||u))e.options.snap.snap&&e.options.snap.snap.call(e.element,d,a.extend(e._uiHash(),{snapItem:e.snapElements[l].item}));e.snapElements[l].snapping=p||q||s||r||u}else{e.snapElements[l].snapping&&e.options.snap.release&&e.options.snap.release.call(e.element,d,a.extend(e._uiHash(),{snapItem:e.snapElements[l].item}));e.snapElements[l].snapping=false}}}});a.ui.plugin.add("draggable","stack",{start:function(){var d=a(this).data("draggable").options;d=a.makeArray(a(d.stack)).sort(function(e,h){return(parseInt(a(e).css("zIndex"),
+10)||0)-(parseInt(a(h).css("zIndex"),10)||0)});if(d.length){var c=parseInt(d[0].style.zIndex)||0;a(d).each(function(e){this.style.zIndex=c+e});this[0].style.zIndex=c+d.length}}});a.ui.plugin.add("draggable","zIndex",{start:function(d,c){d=a(c.helper);c=a(this).data("draggable").options;if(d.css("zIndex"))c._zIndex=d.css("zIndex");d.css("zIndex",c.zIndex)},stop:function(d,c){d=a(this).data("draggable").options;d._zIndex&&a(c.helper).css("zIndex",d._zIndex)}})})(jQuery);
+(function(a){a.widget("ui.droppable",{widgetEventPrefix:"drop",options:{accept:"*",activeClass:false,addClasses:true,greedy:false,hoverClass:false,scope:"default",tolerance:"intersect"},_create:function(){var d=this.options,c=d.accept;this.isover=0;this.isout=1;this.accept=a.isFunction(c)?c:function(e){return e.is(c)};this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight};a.ui.ddmanager.droppables[d.scope]=a.ui.ddmanager.droppables[d.scope]||[];a.ui.ddmanager.droppables[d.scope].push(this);
+d.addClasses&&this.element.addClass("ui-droppable")},destroy:function(){for(var d=a.ui.ddmanager.droppables[this.options.scope],c=0;c<d.length;c++)d[c]==this&&d.splice(c,1);this.element.removeClass("ui-droppable ui-droppable-disabled").removeData("droppable").unbind(".droppable");return this},_setOption:function(d,c){if(d=="accept")this.accept=a.isFunction(c)?c:function(e){return e.is(c)};a.Widget.prototype._setOption.apply(this,arguments)},_activate:function(d){var c=a.ui.ddmanager.current;this.options.activeClass&&
+this.element.addClass(this.options.activeClass);c&&this._trigger("activate",d,this.ui(c))},_deactivate:function(d){var c=a.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass);c&&this._trigger("deactivate",d,this.ui(c))},_over:function(d){var c=a.ui.ddmanager.current;if(!(!c||(c.currentItem||c.element)[0]==this.element[0]))if(this.accept.call(this.element[0],c.currentItem||c.element)){this.options.hoverClass&&this.element.addClass(this.options.hoverClass);
+this._trigger("over",d,this.ui(c))}},_out:function(d){var c=a.ui.ddmanager.current;if(!(!c||(c.currentItem||c.element)[0]==this.element[0]))if(this.accept.call(this.element[0],c.currentItem||c.element)){this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("out",d,this.ui(c))}},_drop:function(d,c){var e=c||a.ui.ddmanager.current;if(!e||(e.currentItem||e.element)[0]==this.element[0])return false;var h=false;this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function(){var g=
+a.data(this,"droppable");if(g.options.greedy&&!g.options.disabled&&g.options.scope==e.options.scope&&g.accept.call(g.element[0],e.currentItem||e.element)&&a.ui.intersect(e,a.extend(g,{offset:g.element.offset()}),g.options.tolerance)){h=true;return false}});if(h)return false;if(this.accept.call(this.element[0],e.currentItem||e.element)){this.options.activeClass&&this.element.removeClass(this.options.activeClass);this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("drop",
+d,this.ui(e));return this.element}return false},ui:function(d){return{draggable:d.currentItem||d.element,helper:d.helper,position:d.position,offset:d.positionAbs}}});a.extend(a.ui.droppable,{version:"1.8.16"});a.ui.intersect=function(d,c,e){if(!c.offset)return false;var h=(d.positionAbs||d.position.absolute).left,g=h+d.helperProportions.width,i=(d.positionAbs||d.position.absolute).top,b=i+d.helperProportions.height,f=c.offset.left,j=f+c.proportions.width,l=c.offset.top,o=l+c.proportions.height;
+switch(e){case "fit":return f<=h&&g<=j&&l<=i&&b<=o;case "intersect":return f<h+d.helperProportions.width/2&&g-d.helperProportions.width/2<j&&l<i+d.helperProportions.height/2&&b-d.helperProportions.height/2<o;case "pointer":return a.ui.isOver((d.positionAbs||d.position.absolute).top+(d.clickOffset||d.offset.click).top,(d.positionAbs||d.position.absolute).left+(d.clickOffset||d.offset.click).left,l,f,c.proportions.height,c.proportions.width);case "touch":return(i>=l&&i<=o||b>=l&&b<=o||i<l&&b>o)&&(h>=
+f&&h<=j||g>=f&&g<=j||h<f&&g>j);default:return false}};a.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(d,c){var e=a.ui.ddmanager.droppables[d.options.scope]||[],h=c?c.type:null,g=(d.currentItem||d.element).find(":data(droppable)").andSelf(),i=0;a:for(;i<e.length;i++)if(!(e[i].options.disabled||d&&!e[i].accept.call(e[i].element[0],d.currentItem||d.element))){for(var b=0;b<g.length;b++)if(g[b]==e[i].element[0]){e[i].proportions.height=0;continue a}e[i].visible=e[i].element.css("display")!=
+"none";if(e[i].visible){h=="mousedown"&&e[i]._activate.call(e[i],c);e[i].offset=e[i].element.offset();e[i].proportions={width:e[i].element[0].offsetWidth,height:e[i].element[0].offsetHeight}}}},drop:function(d,c){var e=false;a.each(a.ui.ddmanager.droppables[d.options.scope]||[],function(){if(this.options){if(!this.options.disabled&&this.visible&&a.ui.intersect(d,this,this.options.tolerance))e=e||this._drop.call(this,c);if(!this.options.disabled&&this.visible&&this.accept.call(this.element[0],d.currentItem||
+d.element)){this.isout=1;this.isover=0;this._deactivate.call(this,c)}}});return e},dragStart:function(d,c){d.element.parents(":not(body,html)").bind("scroll.droppable",function(){d.options.refreshPositions||a.ui.ddmanager.prepareOffsets(d,c)})},drag:function(d,c){d.options.refreshPositions&&a.ui.ddmanager.prepareOffsets(d,c);a.each(a.ui.ddmanager.droppables[d.options.scope]||[],function(){if(!(this.options.disabled||this.greedyChild||!this.visible)){var e=a.ui.intersect(d,this,this.options.tolerance);
+if(e=!e&&this.isover==1?"isout":e&&this.isover==0?"isover":null){var h;if(this.options.greedy){var g=this.element.parents(":data(droppable):eq(0)");if(g.length){h=a.data(g[0],"droppable");h.greedyChild=e=="isover"?1:0}}if(h&&e=="isover"){h.isover=0;h.isout=1;h._out.call(h,c)}this[e]=1;this[e=="isout"?"isover":"isout"]=0;this[e=="isover"?"_over":"_out"].call(this,c);if(h&&e=="isout"){h.isout=0;h.isover=1;h._over.call(h,c)}}}})},dragStop:function(d,c){d.element.parents(":not(body,html)").unbind("scroll.droppable");
+d.options.refreshPositions||a.ui.ddmanager.prepareOffsets(d,c)}}})(jQuery);
+(function(a){a.widget("ui.resizable",a.ui.mouse,{widgetEventPrefix:"resize",options:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,containment:false,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1E3},_create:function(){var e=this,h=this.options;this.element.addClass("ui-resizable");a.extend(this,{_aspectRatio:!!h.aspectRatio,aspectRatio:h.aspectRatio,originalElement:this.element,
+_proportionallyResizeElements:[],_helper:h.helper||h.ghost||h.animate?h.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){/relative/.test(this.element.css("position"))&&a.browser.opera&&this.element.css({position:"relative",top:"auto",left:"auto"});this.element.wrap(a('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),
+top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle=
+this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=h.handles||(!a(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",
+nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all")this.handles="n,e,s,w,se,sw,ne,nw";var g=this.handles.split(",");this.handles={};for(var i=0;i<g.length;i++){var b=a.trim(g[i]),f=a('<div class="ui-resizable-handle '+("ui-resizable-"+b)+'"></div>');/sw|se|ne|nw/.test(b)&&f.css({zIndex:++h.zIndex});"se"==b&&f.addClass("ui-icon ui-icon-gripsmall-diagonal-se");this.handles[b]=".ui-resizable-"+b;this.element.append(f)}}this._renderAxis=function(j){j=j||this.element;for(var l in this.handles){if(this.handles[l].constructor==
+String)this.handles[l]=a(this.handles[l],this.element).show();if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var o=a(this.handles[l],this.element),n=0;n=/sw|ne|nw|se|n|s/.test(l)?o.outerHeight():o.outerWidth();o=["padding",/ne|nw|n/.test(l)?"Top":/se|sw|s/.test(l)?"Bottom":/^e$/.test(l)?"Right":"Left"].join("");j.css(o,n);this._proportionallyResize()}a(this.handles[l])}};this._renderAxis(this.element);this._handles=a(".ui-resizable-handle",this.element).disableSelection();
+this._handles.mouseover(function(){if(!e.resizing){if(this.className)var j=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);e.axis=j&&j[1]?j[1]:"se"}});if(h.autoHide){this._handles.hide();a(this.element).addClass("ui-resizable-autohide").hover(function(){if(!h.disabled){a(this).removeClass("ui-resizable-autohide");e._handles.show()}},function(){if(!h.disabled)if(!e.resizing){a(this).addClass("ui-resizable-autohide");e._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();
+var e=function(g){a(g).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.elementIsWrapper){e(this.element);var h=this.element;h.after(this.originalElement.css({position:h.css("position"),width:h.outerWidth(),height:h.outerHeight(),top:h.css("top"),left:h.css("left")})).remove()}this.originalElement.css("resize",this.originalResizeStyle);e(this.originalElement);return this},_mouseCapture:function(e){var h=
+false;for(var g in this.handles)if(a(this.handles[g])[0]==e.target)h=true;return!this.options.disabled&&h},_mouseStart:function(e){var h=this.options,g=this.element.position(),i=this.element;this.resizing=true;this.documentScroll={top:a(document).scrollTop(),left:a(document).scrollLeft()};if(i.is(".ui-draggable")||/absolute/.test(i.css("position")))i.css({position:"absolute",top:g.top,left:g.left});a.browser.opera&&/relative/.test(i.css("position"))&&i.css({position:"relative",top:"auto",left:"auto"});
+this._renderProxy();g=d(this.helper.css("left"));var b=d(this.helper.css("top"));if(h.containment){g+=a(h.containment).scrollLeft()||0;b+=a(h.containment).scrollTop()||0}this.offset=this.helper.offset();this.position={left:g,top:b};this.size=this._helper?{width:i.outerWidth(),height:i.outerHeight()}:{width:i.width(),height:i.height()};this.originalSize=this._helper?{width:i.outerWidth(),height:i.outerHeight()}:{width:i.width(),height:i.height()};this.originalPosition={left:g,top:b};this.sizeDiff=
+{width:i.outerWidth()-i.width(),height:i.outerHeight()-i.height()};this.originalMousePosition={left:e.pageX,top:e.pageY};this.aspectRatio=typeof h.aspectRatio=="number"?h.aspectRatio:this.originalSize.width/this.originalSize.height||1;h=a(".ui-resizable-"+this.axis).css("cursor");a("body").css("cursor",h=="auto"?this.axis+"-resize":h);i.addClass("ui-resizable-resizing");this._propagate("start",e);return true},_mouseDrag:function(e){var h=this.helper,g=this.originalMousePosition,i=this._change[this.axis];
+if(!i)return false;g=i.apply(this,[e,e.pageX-g.left||0,e.pageY-g.top||0]);this._updateVirtualBoundaries(e.shiftKey);if(this._aspectRatio||e.shiftKey)g=this._updateRatio(g,e);g=this._respectSize(g,e);this._propagate("resize",e);h.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize();this._updateCache(g);this._trigger("resize",e,this.ui());return false},
+_mouseStop:function(e){this.resizing=false;var h=this.options,g=this;if(this._helper){var i=this._proportionallyResizeElements,b=i.length&&/textarea/i.test(i[0].nodeName);i=b&&a.ui.hasScroll(i[0],"left")?0:g.sizeDiff.height;b=b?0:g.sizeDiff.width;b={width:g.helper.width()-b,height:g.helper.height()-i};i=parseInt(g.element.css("left"),10)+(g.position.left-g.originalPosition.left)||null;var f=parseInt(g.element.css("top"),10)+(g.position.top-g.originalPosition.top)||null;h.animate||this.element.css(a.extend(b,
+{top:f,left:i}));g.helper.height(g.size.height);g.helper.width(g.size.width);this._helper&&!h.animate&&this._proportionallyResize()}a("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");this._propagate("stop",e);this._helper&&this.helper.remove();return false},_updateVirtualBoundaries:function(e){var h=this.options,g,i,b;h={minWidth:c(h.minWidth)?h.minWidth:0,maxWidth:c(h.maxWidth)?h.maxWidth:Infinity,minHeight:c(h.minHeight)?h.minHeight:0,maxHeight:c(h.maxHeight)?h.maxHeight:
+Infinity};if(this._aspectRatio||e){e=h.minHeight*this.aspectRatio;i=h.minWidth/this.aspectRatio;g=h.maxHeight*this.aspectRatio;b=h.maxWidth/this.aspectRatio;if(e>h.minWidth)h.minWidth=e;if(i>h.minHeight)h.minHeight=i;if(g<h.maxWidth)h.maxWidth=g;if(b<h.maxHeight)h.maxHeight=b}this._vBoundaries=h},_updateCache:function(e){this.offset=this.helper.offset();if(c(e.left))this.position.left=e.left;if(c(e.top))this.position.top=e.top;if(c(e.height))this.size.height=e.height;if(c(e.width))this.size.width=
+e.width},_updateRatio:function(e){var h=this.position,g=this.size,i=this.axis;if(c(e.height))e.width=e.height*this.aspectRatio;else if(c(e.width))e.height=e.width/this.aspectRatio;if(i=="sw"){e.left=h.left+(g.width-e.width);e.top=null}if(i=="nw"){e.top=h.top+(g.height-e.height);e.left=h.left+(g.width-e.width)}return e},_respectSize:function(e){var h=this._vBoundaries,g=this.axis,i=c(e.width)&&h.maxWidth&&h.maxWidth<e.width,b=c(e.height)&&h.maxHeight&&h.maxHeight<e.height,f=c(e.width)&&h.minWidth&&
+h.minWidth>e.width,j=c(e.height)&&h.minHeight&&h.minHeight>e.height;if(f)e.width=h.minWidth;if(j)e.height=h.minHeight;if(i)e.width=h.maxWidth;if(b)e.height=h.maxHeight;var l=this.originalPosition.left+this.originalSize.width,o=this.position.top+this.size.height,n=/sw|nw|w/.test(g);g=/nw|ne|n/.test(g);if(f&&n)e.left=l-h.minWidth;if(i&&n)e.left=l-h.maxWidth;if(j&&g)e.top=o-h.minHeight;if(b&&g)e.top=o-h.maxHeight;if((h=!e.width&&!e.height)&&!e.left&&e.top)e.top=null;else if(h&&!e.top&&e.left)e.left=
+null;return e},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var e=this.helper||this.element,h=0;h<this._proportionallyResizeElements.length;h++){var g=this._proportionallyResizeElements[h];if(!this.borderDif){var i=[g.css("borderTopWidth"),g.css("borderRightWidth"),g.css("borderBottomWidth"),g.css("borderLeftWidth")],b=[g.css("paddingTop"),g.css("paddingRight"),g.css("paddingBottom"),g.css("paddingLeft")];this.borderDif=a.map(i,function(f,j){f=parseInt(f,10)||
+0;j=parseInt(b[j],10)||0;return f+j})}a.browser.msie&&(a(e).is(":hidden")||a(e).parents(":hidden").length)||g.css({height:e.height()-this.borderDif[0]-this.borderDif[2]||0,width:e.width()-this.borderDif[1]-this.borderDif[3]||0})}},_renderProxy:function(){var e=this.options;this.elementOffset=this.element.offset();if(this._helper){this.helper=this.helper||a('<div style="overflow:hidden;"></div>');var h=a.browser.msie&&a.browser.version<7,g=h?1:0;h=h?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+
+h,height:this.element.outerHeight()+h,position:"absolute",left:this.elementOffset.left-g+"px",top:this.elementOffset.top-g+"px",zIndex:++e.zIndex});this.helper.appendTo("body").disableSelection()}else this.helper=this.element},_change:{e:function(e,h){return{width:this.originalSize.width+h}},w:function(e,h){return{left:this.originalPosition.left+h,width:this.originalSize.width-h}},n:function(e,h,g){return{top:this.originalPosition.top+g,height:this.originalSize.height-g}},s:function(e,h,g){return{height:this.originalSize.height+
+g}},se:function(e,h,g){return a.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[e,h,g]))},sw:function(e,h,g){return a.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[e,h,g]))},ne:function(e,h,g){return a.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[e,h,g]))},nw:function(e,h,g){return a.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[e,h,g]))}},_propagate:function(e,h){a.ui.plugin.call(this,e,[h,this.ui()]);
+e!="resize"&&this._trigger(e,h,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}});a.extend(a.ui.resizable,{version:"1.8.16"});a.ui.plugin.add("resizable","alsoResize",{start:function(){var e=a(this).data("resizable").options,h=function(g){a(g).each(function(){var i=a(this);i.data("resizable-alsoresize",{width:parseInt(i.width(),
+10),height:parseInt(i.height(),10),left:parseInt(i.css("left"),10),top:parseInt(i.css("top"),10),position:i.css("position")})})};if(typeof e.alsoResize=="object"&&!e.alsoResize.parentNode)if(e.alsoResize.length){e.alsoResize=e.alsoResize[0];h(e.alsoResize)}else a.each(e.alsoResize,function(g){h(g)});else h(e.alsoResize)},resize:function(e,h){var g=a(this).data("resizable");e=g.options;var i=g.originalSize,b=g.originalPosition,f={height:g.size.height-i.height||0,width:g.size.width-i.width||0,top:g.position.top-
+b.top||0,left:g.position.left-b.left||0},j=function(l,o){a(l).each(function(){var n=a(this),k=a(this).data("resizable-alsoresize"),m={},p=o&&o.length?o:n.parents(h.originalElement[0]).length?["width","height"]:["width","height","top","left"];a.each(p,function(q,s){if((q=(k[s]||0)+(f[s]||0))&&q>=0)m[s]=q||null});if(a.browser.opera&&/relative/.test(n.css("position"))){g._revertToRelativePosition=true;n.css({position:"absolute",top:"auto",left:"auto"})}n.css(m)})};typeof e.alsoResize=="object"&&!e.alsoResize.nodeType?
+a.each(e.alsoResize,function(l,o){j(l,o)}):j(e.alsoResize)},stop:function(){var e=a(this).data("resizable"),h=e.options,g=function(i){a(i).each(function(){var b=a(this);b.css({position:b.data("resizable-alsoresize").position})})};if(e._revertToRelativePosition){e._revertToRelativePosition=false;typeof h.alsoResize=="object"&&!h.alsoResize.nodeType?a.each(h.alsoResize,function(i){g(i)}):g(h.alsoResize)}a(this).removeData("resizable-alsoresize")}});a.ui.plugin.add("resizable","animate",{stop:function(e){var h=
+a(this).data("resizable"),g=h.options,i=h._proportionallyResizeElements,b=i.length&&/textarea/i.test(i[0].nodeName),f=b&&a.ui.hasScroll(i[0],"left")?0:h.sizeDiff.height;b={width:h.size.width-(b?0:h.sizeDiff.width),height:h.size.height-f};f=parseInt(h.element.css("left"),10)+(h.position.left-h.originalPosition.left)||null;var j=parseInt(h.element.css("top"),10)+(h.position.top-h.originalPosition.top)||null;h.element.animate(a.extend(b,j&&f?{top:j,left:f}:{}),{duration:g.animateDuration,easing:g.animateEasing,
+step:function(){var l={width:parseInt(h.element.css("width"),10),height:parseInt(h.element.css("height"),10),top:parseInt(h.element.css("top"),10),left:parseInt(h.element.css("left"),10)};i&&i.length&&a(i[0]).css({width:l.width,height:l.height});h._updateCache(l);h._propagate("resize",e)}})}});a.ui.plugin.add("resizable","containment",{start:function(){var e=a(this).data("resizable"),h=e.element,g=e.options.containment;if(h=g instanceof a?g.get(0):/parent/.test(g)?h.parent().get(0):g){e.containerElement=
+a(h);if(/document/.test(g)||g==document){e.containerOffset={left:0,top:0};e.containerPosition={left:0,top:0};e.parentData={element:a(document),left:0,top:0,width:a(document).width(),height:a(document).height()||document.body.parentNode.scrollHeight}}else{var i=a(h),b=[];a(["Top","Right","Left","Bottom"]).each(function(l,o){b[l]=d(i.css("padding"+o))});e.containerOffset=i.offset();e.containerPosition=i.position();e.containerSize={height:i.innerHeight()-b[3],width:i.innerWidth()-b[1]};g=e.containerOffset;
+var f=e.containerSize.height,j=e.containerSize.width;j=a.ui.hasScroll(h,"left")?h.scrollWidth:j;f=a.ui.hasScroll(h)?h.scrollHeight:f;e.parentData={element:h,left:g.left,top:g.top,width:j,height:f}}}},resize:function(e){var h=a(this).data("resizable"),g=h.options,i=h.containerOffset,b=h.position;e=h._aspectRatio||e.shiftKey;var f={top:0,left:0},j=h.containerElement;if(j[0]!=document&&/static/.test(j.css("position")))f=i;if(b.left<(h._helper?i.left:0)){h.size.width+=h._helper?h.position.left-i.left:
+h.position.left-f.left;if(e)h.size.height=h.size.width/g.aspectRatio;h.position.left=g.helper?i.left:0}if(b.top<(h._helper?i.top:0)){h.size.height+=h._helper?h.position.top-i.top:h.position.top;if(e)h.size.width=h.size.height*g.aspectRatio;h.position.top=h._helper?i.top:0}h.offset.left=h.parentData.left+h.position.left;h.offset.top=h.parentData.top+h.position.top;g=Math.abs((h._helper?h.offset.left-f.left:h.offset.left-f.left)+h.sizeDiff.width);i=Math.abs((h._helper?h.offset.top-f.top:h.offset.top-
+i.top)+h.sizeDiff.height);b=h.containerElement.get(0)==h.element.parent().get(0);f=/relative|absolute/.test(h.containerElement.css("position"));if(b&&f)g-=h.parentData.left;if(g+h.size.width>=h.parentData.width){h.size.width=h.parentData.width-g;if(e)h.size.height=h.size.width/h.aspectRatio}if(i+h.size.height>=h.parentData.height){h.size.height=h.parentData.height-i;if(e)h.size.width=h.size.height*h.aspectRatio}},stop:function(){var e=a(this).data("resizable"),h=e.options,g=e.containerOffset,i=e.containerPosition,
+b=e.containerElement,f=a(e.helper),j=f.offset(),l=f.outerWidth()-e.sizeDiff.width;f=f.outerHeight()-e.sizeDiff.height;e._helper&&!h.animate&&/relative/.test(b.css("position"))&&a(this).css({left:j.left-i.left-g.left,width:l,height:f});e._helper&&!h.animate&&/static/.test(b.css("position"))&&a(this).css({left:j.left-i.left-g.left,width:l,height:f})}});a.ui.plugin.add("resizable","ghost",{start:function(){var e=a(this).data("resizable"),h=e.options,g=e.size;e.ghost=e.originalElement.clone();e.ghost.css({opacity:0.25,
+display:"block",position:"relative",height:g.height,width:g.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof h.ghost=="string"?h.ghost:"");e.ghost.appendTo(e.helper)},resize:function(){var e=a(this).data("resizable");e.ghost&&e.ghost.css({position:"relative",height:e.size.height,width:e.size.width})},stop:function(){var e=a(this).data("resizable");e.ghost&&e.helper&&e.helper.get(0).removeChild(e.ghost.get(0))}});a.ui.plugin.add("resizable","grid",{resize:function(){var e=
+a(this).data("resizable"),h=e.options,g=e.size,i=e.originalSize,b=e.originalPosition,f=e.axis;h.grid=typeof h.grid=="number"?[h.grid,h.grid]:h.grid;var j=Math.round((g.width-i.width)/(h.grid[0]||1))*(h.grid[0]||1);h=Math.round((g.height-i.height)/(h.grid[1]||1))*(h.grid[1]||1);if(/^(se|s|e)$/.test(f)){e.size.width=i.width+j;e.size.height=i.height+h}else if(/^(ne)$/.test(f)){e.size.width=i.width+j;e.size.height=i.height+h;e.position.top=b.top-h}else{if(/^(sw)$/.test(f)){e.size.width=i.width+j;e.size.height=
+i.height+h}else{e.size.width=i.width+j;e.size.height=i.height+h;e.position.top=b.top-h}e.position.left=b.left-j}}});var d=function(e){return parseInt(e,10)||0},c=function(e){return!isNaN(parseInt(e,10))}})(jQuery);
+(function(a){a.widget("ui.selectable",a.ui.mouse,{options:{appendTo:"body",autoRefresh:true,distance:0,filter:"*",tolerance:"touch"},_create:function(){var d=this;this.element.addClass("ui-selectable");this.dragged=false;var c;this.refresh=function(){c=a(d.options.filter,d.element[0]);c.each(function(){var e=a(this),h=e.offset();a.data(this,"selectable-item",{element:this,$element:e,left:h.left,top:h.top,right:h.left+e.outerWidth(),bottom:h.top+e.outerHeight(),startselected:false,selected:e.hasClass("ui-selected"),
+selecting:e.hasClass("ui-selecting"),unselecting:e.hasClass("ui-unselecting")})})};this.refresh();this.selectees=c.addClass("ui-selectee");this._mouseInit();this.helper=a("<div class='ui-selectable-helper'></div>")},destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item");this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable");this._mouseDestroy();return this},_mouseStart:function(d){var c=this;this.opos=[d.pageX,
+d.pageY];if(!this.options.disabled){var e=this.options;this.selectees=a(e.filter,this.element[0]);this._trigger("start",d);a(e.appendTo).append(this.helper);this.helper.css({left:d.clientX,top:d.clientY,width:0,height:0});e.autoRefresh&&this.refresh();this.selectees.filter(".ui-selected").each(function(){var h=a.data(this,"selectable-item");h.startselected=true;if(!d.metaKey){h.$element.removeClass("ui-selected");h.selected=false;h.$element.addClass("ui-unselecting");h.unselecting=true;c._trigger("unselecting",
+d,{unselecting:h.element})}});a(d.target).parents().andSelf().each(function(){var h=a.data(this,"selectable-item");if(h){var g=!d.metaKey||!h.$element.hasClass("ui-selected");h.$element.removeClass(g?"ui-unselecting":"ui-selected").addClass(g?"ui-selecting":"ui-unselecting");h.unselecting=!g;h.selecting=g;(h.selected=g)?c._trigger("selecting",d,{selecting:h.element}):c._trigger("unselecting",d,{unselecting:h.element});return false}})}},_mouseDrag:function(d){var c=this;this.dragged=true;if(!this.options.disabled){var e=
+this.options,h=this.opos[0],g=this.opos[1],i=d.pageX,b=d.pageY;if(h>i){var f=i;i=h;h=f}if(g>b){f=b;b=g;g=f}this.helper.css({left:h,top:g,width:i-h,height:b-g});this.selectees.each(function(){var j=a.data(this,"selectable-item");if(!(!j||j.element==c.element[0])){var l=false;if(e.tolerance=="touch")l=!(j.left>i||j.right<h||j.top>b||j.bottom<g);else if(e.tolerance=="fit")l=j.left>h&&j.right<i&&j.top>g&&j.bottom<b;if(l){if(j.selected){j.$element.removeClass("ui-selected");j.selected=false}if(j.unselecting){j.$element.removeClass("ui-unselecting");
+j.unselecting=false}if(!j.selecting){j.$element.addClass("ui-selecting");j.selecting=true;c._trigger("selecting",d,{selecting:j.element})}}else{if(j.selecting)if(d.metaKey&&j.startselected){j.$element.removeClass("ui-selecting");j.selecting=false;j.$element.addClass("ui-selected");j.selected=true}else{j.$element.removeClass("ui-selecting");j.selecting=false;if(j.startselected){j.$element.addClass("ui-unselecting");j.unselecting=true}c._trigger("unselecting",d,{unselecting:j.element})}if(j.selected)if(!d.metaKey&&
+!j.startselected){j.$element.removeClass("ui-selected");j.selected=false;j.$element.addClass("ui-unselecting");j.unselecting=true;c._trigger("unselecting",d,{unselecting:j.element})}}}});return false}},_mouseStop:function(d){var c=this;this.dragged=false;a(".ui-unselecting",this.element[0]).each(function(){var e=a.data(this,"selectable-item");e.$element.removeClass("ui-unselecting");e.unselecting=false;e.startselected=false;c._trigger("unselected",d,{unselected:e.element})});a(".ui-selecting",this.element[0]).each(function(){var e=
+a.data(this,"selectable-item");e.$element.removeClass("ui-selecting").addClass("ui-selected");e.selecting=false;e.selected=true;e.startselected=true;c._trigger("selected",d,{selected:e.element})});this._trigger("stop",d);this.helper.remove();return false}});a.extend(a.ui.selectable,{version:"1.8.16"})})(jQuery);
+(function(a){a.widget("ui.sortable",a.ui.mouse,{widgetEventPrefix:"sort",options:{appendTo:"parent",axis:false,connectWith:false,containment:false,cursor:"auto",cursorAt:false,dropOnEmpty:true,forcePlaceholderSize:false,forceHelperSize:false,grid:false,handle:false,helper:"original",items:"> *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1E3},_create:function(){var d=this.options;this.containerCache={};this.element.addClass("ui-sortable");
+this.refresh();this.floating=this.items.length?d.axis==="x"||/left|right/.test(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0].item.css("display")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var d=this.items.length-1;d>=0;d--)this.items[d].item.removeData("sortable-item");return this},_setOption:function(d,c){if(d===
+"disabled"){this.options[d]=c;this.widget()[c?"addClass":"removeClass"]("ui-sortable-disabled")}else a.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(d,c){if(this.reverting)return false;if(this.options.disabled||this.options.type=="static")return false;this._refreshItems(d);var e=null,h=this;a(d.target).parents().each(function(){if(a.data(this,"sortable-item")==h){e=a(this);return false}});if(a.data(d.target,"sortable-item")==h)e=a(d.target);if(!e)return false;if(this.options.handle&&
+!c){var g=false;a(this.options.handle,e).find("*").andSelf().each(function(){if(this==d.target)g=true});if(!g)return false}this.currentItem=e;this._removeCurrentsFromItems();return true},_mouseStart:function(d,c,e){c=this.options;var h=this;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(d);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,
+left:this.offset.left-this.margins.left};this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");a.extend(this.offset,{click:{left:d.pageX-this.offset.left,top:d.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(d);this.originalPageX=d.pageX;this.originalPageY=d.pageY;c.cursorAt&&this._adjustOffsetFromHelper(c.cursorAt);this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};
+this.helper[0]!=this.currentItem[0]&&this.currentItem.hide();this._createPlaceholder();c.containment&&this._setContainment();if(c.cursor){if(a("body").css("cursor"))this._storedCursor=a("body").css("cursor");a("body").css("cursor",c.cursor)}if(c.opacity){if(this.helper.css("opacity"))this._storedOpacity=this.helper.css("opacity");this.helper.css("opacity",c.opacity)}if(c.zIndex){if(this.helper.css("zIndex"))this._storedZIndex=this.helper.css("zIndex");this.helper.css("zIndex",c.zIndex)}if(this.scrollParent[0]!=
+document&&this.scrollParent[0].tagName!="HTML")this.overflowOffset=this.scrollParent.offset();this._trigger("start",d,this._uiHash());this._preserveHelperProportions||this._cacheHelperProportions();if(!e)for(e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("activate",d,h._uiHash(this));if(a.ui.ddmanager)a.ui.ddmanager.current=this;a.ui.ddmanager&&!c.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,d);this.dragging=true;this.helper.addClass("ui-sortable-helper");this._mouseDrag(d);
+return true},_mouseDrag:function(d){this.position=this._generatePosition(d);this.positionAbs=this._convertPositionTo("absolute");if(!this.lastPositionAbs)this.lastPositionAbs=this.positionAbs;if(this.options.scroll){var c=this.options,e=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if(this.overflowOffset.top+this.scrollParent[0].offsetHeight-d.pageY<c.scrollSensitivity)this.scrollParent[0].scrollTop=e=this.scrollParent[0].scrollTop+c.scrollSpeed;else if(d.pageY-this.overflowOffset.top<
+c.scrollSensitivity)this.scrollParent[0].scrollTop=e=this.scrollParent[0].scrollTop-c.scrollSpeed;if(this.overflowOffset.left+this.scrollParent[0].offsetWidth-d.pageX<c.scrollSensitivity)this.scrollParent[0].scrollLeft=e=this.scrollParent[0].scrollLeft+c.scrollSpeed;else if(d.pageX-this.overflowOffset.left<c.scrollSensitivity)this.scrollParent[0].scrollLeft=e=this.scrollParent[0].scrollLeft-c.scrollSpeed}else{if(d.pageY-a(document).scrollTop()<c.scrollSensitivity)e=a(document).scrollTop(a(document).scrollTop()-
+c.scrollSpeed);else if(a(window).height()-(d.pageY-a(document).scrollTop())<c.scrollSensitivity)e=a(document).scrollTop(a(document).scrollTop()+c.scrollSpeed);if(d.pageX-a(document).scrollLeft()<c.scrollSensitivity)e=a(document).scrollLeft(a(document).scrollLeft()-c.scrollSpeed);else if(a(window).width()-(d.pageX-a(document).scrollLeft())<c.scrollSensitivity)e=a(document).scrollLeft(a(document).scrollLeft()+c.scrollSpeed)}e!==false&&a.ui.ddmanager&&!c.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,
+d)}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";for(c=this.items.length-1;c>=0;c--){e=this.items[c];var h=e.item[0],g=this._intersectsWithPointer(e);if(g)if(h!=this.currentItem[0]&&this.placeholder[g==1?"next":"prev"]()[0]!=h&&!a.ui.contains(this.placeholder[0],h)&&(this.options.type=="semi-dynamic"?!a.ui.contains(this.element[0],
+h):true)){this.direction=g==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(e))this._rearrange(d,e);else break;this._trigger("change",d,this._uiHash());break}}this._contactContainers(d);a.ui.ddmanager&&a.ui.ddmanager.drag(this,d);this._trigger("sort",d,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(d,c){if(d){a.ui.ddmanager&&!this.options.dropBehaviour&&a.ui.ddmanager.drop(this,d);if(this.options.revert){var e=this;c=e.placeholder.offset();
+e.reverting=true;a(this.helper).animate({left:c.left-this.offset.parent.left-e.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:c.top-this.offset.parent.top-e.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){e._clear(d)})}else this._clear(d,c);return false}},cancel:function(){var d=this;if(this.dragging){this._mouseUp({target:null});this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):
+this.currentItem.show();for(var c=this.containers.length-1;c>=0;c--){this.containers[c]._trigger("deactivate",null,d._uiHash(this));if(this.containers[c].containerCache.over){this.containers[c]._trigger("out",null,d._uiHash(this));this.containers[c].containerCache.over=0}}}if(this.placeholder){this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove();a.extend(this,{helper:null,
+dragging:false,reverting:false,_noFinalSort:null});this.domPosition.prev?a(this.domPosition.prev).after(this.currentItem):a(this.domPosition.parent).prepend(this.currentItem)}return this},serialize:function(d){var c=this._getItemsAsjQuery(d&&d.connected),e=[];d=d||{};a(c).each(function(){var h=(a(d.item||this).attr(d.attribute||"id")||"").match(d.expression||/(.+)[-=_](.+)/);if(h)e.push((d.key||h[1]+"[]")+"="+(d.key&&d.expression?h[1]:h[2]))});!e.length&&d.key&&e.push(d.key+"=");return e.join("&")},
+toArray:function(d){var c=this._getItemsAsjQuery(d&&d.connected),e=[];d=d||{};c.each(function(){e.push(a(d.item||this).attr(d.attribute||"id")||"")});return e},_intersectsWith:function(d){var c=this.positionAbs.left,e=c+this.helperProportions.width,h=this.positionAbs.top,g=h+this.helperProportions.height,i=d.left,b=i+d.width,f=d.top,j=f+d.height,l=this.offset.click.top,o=this.offset.click.left;l=h+l>f&&h+l<j&&c+o>i&&c+o<b;return this.options.tolerance=="pointer"||this.options.forcePointerForContainers||
+this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>d[this.floating?"width":"height"]?l:i<c+this.helperProportions.width/2&&e-this.helperProportions.width/2<b&&f<h+this.helperProportions.height/2&&g-this.helperProportions.height/2<j},_intersectsWithPointer:function(d){var c=a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,d.top,d.height);d=a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,d.left,d.width);c=c&&d;d=this._getDragVerticalDirection();
+var e=this._getDragHorizontalDirection();if(!c)return false;return this.floating?e&&e=="right"||d=="down"?2:1:d&&(d=="down"?2:1)},_intersectsWithSides:function(d){var c=a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,d.top+d.height/2,d.height);d=a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,d.left+d.width/2,d.width);var e=this._getDragVerticalDirection(),h=this._getDragHorizontalDirection();return this.floating&&h?h=="right"&&d||h=="left"&&!d:e&&(e=="down"&&c||e=="up"&&!c)},
+_getDragVerticalDirection:function(){var d=this.positionAbs.top-this.lastPositionAbs.top;return d!=0&&(d>0?"down":"up")},_getDragHorizontalDirection:function(){var d=this.positionAbs.left-this.lastPositionAbs.left;return d!=0&&(d>0?"right":"left")},refresh:function(d){this._refreshItems(d);this.refreshPositions();return this},_connectWith:function(){var d=this.options;return d.connectWith.constructor==String?[d.connectWith]:d.connectWith},_getItemsAsjQuery:function(d){var c=[],e=[],h=this._connectWith();
+if(h&&d)for(d=h.length-1;d>=0;d--)for(var g=a(h[d]),i=g.length-1;i>=0;i--){var b=a.data(g[i],"sortable");if(b&&b!=this&&!b.options.disabled)e.push([a.isFunction(b.options.items)?b.options.items.call(b.element):a(b.options.items,b.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),b])}e.push([a.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):a(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),
+this]);for(d=e.length-1;d>=0;d--)e[d][0].each(function(){c.push(this)});return a(c)},_removeCurrentsFromItems:function(){for(var d=this.currentItem.find(":data(sortable-item)"),c=0;c<this.items.length;c++)for(var e=0;e<d.length;e++)d[e]==this.items[c].item[0]&&this.items.splice(c,1)},_refreshItems:function(d){this.items=[];this.containers=[this];var c=this.items,e=[[a.isFunction(this.options.items)?this.options.items.call(this.element[0],d,{item:this.currentItem}):a(this.options.items,this.element),
+this]],h=this._connectWith();if(h)for(var g=h.length-1;g>=0;g--)for(var i=a(h[g]),b=i.length-1;b>=0;b--){var f=a.data(i[b],"sortable");if(f&&f!=this&&!f.options.disabled){e.push([a.isFunction(f.options.items)?f.options.items.call(f.element[0],d,{item:this.currentItem}):a(f.options.items,f.element),f]);this.containers.push(f)}}for(g=e.length-1;g>=0;g--){d=e[g][1];h=e[g][0];b=0;for(i=h.length;b<i;b++){f=a(h[b]);f.data("sortable-item",d);c.push({item:f,instance:d,width:0,height:0,left:0,top:0})}}},refreshPositions:function(d){if(this.offsetParent&&
+this.helper)this.offset.parent=this._getParentOffset();for(var c=this.items.length-1;c>=0;c--){var e=this.items[c];if(!(e.instance!=this.currentContainer&&this.currentContainer&&e.item[0]!=this.currentItem[0])){var h=this.options.toleranceElement?a(this.options.toleranceElement,e.item):e.item;if(!d){e.width=h.outerWidth();e.height=h.outerHeight()}h=h.offset();e.left=h.left;e.top=h.top}}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(c=
+this.containers.length-1;c>=0;c--){h=this.containers[c].element.offset();this.containers[c].containerCache.left=h.left;this.containers[c].containerCache.top=h.top;this.containers[c].containerCache.width=this.containers[c].element.outerWidth();this.containers[c].containerCache.height=this.containers[c].element.outerHeight()}return this},_createPlaceholder:function(d){var c=d||this,e=c.options;if(!e.placeholder||e.placeholder.constructor==String){var h=e.placeholder;e.placeholder={element:function(){var g=
+a(document.createElement(c.currentItem[0].nodeName)).addClass(h||c.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];if(!h)g.style.visibility="hidden";return g},update:function(g,i){if(!(h&&!e.forcePlaceholderSize)){i.height()||i.height(c.currentItem.innerHeight()-parseInt(c.currentItem.css("paddingTop")||0,10)-parseInt(c.currentItem.css("paddingBottom")||0,10));i.width()||i.width(c.currentItem.innerWidth()-parseInt(c.currentItem.css("paddingLeft")||0,10)-parseInt(c.currentItem.css("paddingRight")||
+0,10))}}}}c.placeholder=a(e.placeholder.element.call(c.element,c.currentItem));c.currentItem.after(c.placeholder);e.placeholder.update(c,c.placeholder)},_contactContainers:function(d){for(var c=null,e=null,h=this.containers.length-1;h>=0;h--)if(!a.ui.contains(this.currentItem[0],this.containers[h].element[0]))if(this._intersectsWith(this.containers[h].containerCache)){if(!(c&&a.ui.contains(this.containers[h].element[0],c.element[0]))){c=this.containers[h];e=h}}else if(this.containers[h].containerCache.over){this.containers[h]._trigger("out",
+d,this._uiHash(this));this.containers[h].containerCache.over=0}if(c)if(this.containers.length===1){this.containers[e]._trigger("over",d,this._uiHash(this));this.containers[e].containerCache.over=1}else if(this.currentContainer!=this.containers[e]){c=1E4;h=null;for(var g=this.positionAbs[this.containers[e].floating?"left":"top"],i=this.items.length-1;i>=0;i--)if(a.ui.contains(this.containers[e].element[0],this.items[i].item[0])){var b=this.items[i][this.containers[e].floating?"left":"top"];if(Math.abs(b-
+g)<c){c=Math.abs(b-g);h=this.items[i]}}if(h||this.options.dropOnEmpty){this.currentContainer=this.containers[e];h?this._rearrange(d,h,null,true):this._rearrange(d,null,this.containers[e].element,true);this._trigger("change",d,this._uiHash());this.containers[e]._trigger("change",d,this._uiHash(this));this.options.placeholder.update(this.currentContainer,this.placeholder);this.containers[e]._trigger("over",d,this._uiHash(this));this.containers[e].containerCache.over=1}}},_createHelper:function(d){var c=
+this.options;d=a.isFunction(c.helper)?a(c.helper.apply(this.element[0],[d,this.currentItem])):c.helper=="clone"?this.currentItem.clone():this.currentItem;d.parents("body").length||a(c.appendTo!="parent"?c.appendTo:this.currentItem[0].parentNode)[0].appendChild(d[0]);if(d[0]==this.currentItem[0])this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")};if(d[0].style.width==
+""||c.forceHelperSize)d.width(this.currentItem.width());if(d[0].style.height==""||c.forceHelperSize)d.height(this.currentItem.height());return d},_adjustOffsetFromHelper:function(d){if(typeof d=="string")d=d.split(" ");if(a.isArray(d))d={left:+d[0],top:+d[1]||0};if("left"in d)this.offset.click.left=d.left+this.margins.left;if("right"in d)this.offset.click.left=this.helperProportions.width-d.right+this.margins.left;if("top"in d)this.offset.click.top=d.top+this.margins.top;if("bottom"in d)this.offset.click.top=
+this.helperProportions.height-d.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var d=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0])){d.left+=this.scrollParent.scrollLeft();d.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&a.browser.msie)d=
+{top:0,left:0};return{top:d.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:d.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var d=this.currentItem.position();return{top:d.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:d.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),
+10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var d=this.options;if(d.containment=="parent")d.containment=this.helper[0].parentNode;if(d.containment=="document"||d.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,a(d.containment=="document"?
+document:window).width()-this.helperProportions.width-this.margins.left,(a(d.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(d.containment)){var c=a(d.containment)[0];d=a(d.containment).offset();var e=a(c).css("overflow")!="hidden";this.containment=[d.left+(parseInt(a(c).css("borderLeftWidth"),10)||0)+(parseInt(a(c).css("paddingLeft"),10)||0)-this.margins.left,d.top+(parseInt(a(c).css("borderTopWidth"),
+10)||0)+(parseInt(a(c).css("paddingTop"),10)||0)-this.margins.top,d.left+(e?Math.max(c.scrollWidth,c.offsetWidth):c.offsetWidth)-(parseInt(a(c).css("borderLeftWidth"),10)||0)-(parseInt(a(c).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,d.top+(e?Math.max(c.scrollHeight,c.offsetHeight):c.offsetHeight)-(parseInt(a(c).css("borderTopWidth"),10)||0)-(parseInt(a(c).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(d,c){if(!c)c=
+this.position;d=d=="absolute"?1:-1;var e=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,h=/(html|body)/i.test(e[0].tagName);return{top:c.top+this.offset.relative.top*d+this.offset.parent.top*d-(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():h?0:e.scrollTop())*d),left:c.left+this.offset.relative.left*d+this.offset.parent.left*d-(a.browser.safari&&
+this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():h?0:e.scrollLeft())*d)}},_generatePosition:function(d){var c=this.options,e=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,h=/(html|body)/i.test(e[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0]))this.offset.relative=this._getRelativeOffset();
+var g=d.pageX,i=d.pageY;if(this.originalPosition){if(this.containment){if(d.pageX-this.offset.click.left<this.containment[0])g=this.containment[0]+this.offset.click.left;if(d.pageY-this.offset.click.top<this.containment[1])i=this.containment[1]+this.offset.click.top;if(d.pageX-this.offset.click.left>this.containment[2])g=this.containment[2]+this.offset.click.left;if(d.pageY-this.offset.click.top>this.containment[3])i=this.containment[3]+this.offset.click.top}if(c.grid){i=this.originalPageY+Math.round((i-
+this.originalPageY)/c.grid[1])*c.grid[1];i=this.containment?!(i-this.offset.click.top<this.containment[1]||i-this.offset.click.top>this.containment[3])?i:!(i-this.offset.click.top<this.containment[1])?i-c.grid[1]:i+c.grid[1]:i;g=this.originalPageX+Math.round((g-this.originalPageX)/c.grid[0])*c.grid[0];g=this.containment?!(g-this.offset.click.left<this.containment[0]||g-this.offset.click.left>this.containment[2])?g:!(g-this.offset.click.left<this.containment[0])?g-c.grid[0]:g+c.grid[0]:g}}return{top:i-
+this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(a.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():h?0:e.scrollTop()),left:g-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(a.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():h?0:e.scrollLeft())}},_rearrange:function(d,c,e,h){e?e[0].appendChild(this.placeholder[0]):c.item[0].parentNode.insertBefore(this.placeholder[0],
+this.direction=="down"?c.item[0]:c.item[0].nextSibling);this.counter=this.counter?++this.counter:1;var g=this,i=this.counter;window.setTimeout(function(){i==g.counter&&g.refreshPositions(!h)},0)},_clear:function(d,c){this.reverting=false;var e=[];!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem);this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var h in this._storedCSS)if(this._storedCSS[h]=="auto"||this._storedCSS[h]=="static")this._storedCSS[h]=
+"";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!c&&e.push(function(g){this._trigger("receive",g,this._uiHash(this.fromOutside))});if((this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!c)e.push(function(g){this._trigger("update",g,this._uiHash())});if(!a.ui.contains(this.element[0],this.currentItem[0])){c||e.push(function(g){this._trigger("remove",
+g,this._uiHash())});for(h=this.containers.length-1;h>=0;h--)if(a.ui.contains(this.containers[h].element[0],this.currentItem[0])&&!c){e.push(function(g){return function(i){g._trigger("receive",i,this._uiHash(this))}}.call(this,this.containers[h]));e.push(function(g){return function(i){g._trigger("update",i,this._uiHash(this))}}.call(this,this.containers[h]))}}for(h=this.containers.length-1;h>=0;h--){c||e.push(function(g){return function(i){g._trigger("deactivate",i,this._uiHash(this))}}.call(this,
+this.containers[h]));if(this.containers[h].containerCache.over){e.push(function(g){return function(i){g._trigger("out",i,this._uiHash(this))}}.call(this,this.containers[h]));this.containers[h].containerCache.over=0}}this._storedCursor&&a("body").css("cursor",this._storedCursor);this._storedOpacity&&this.helper.css("opacity",this._storedOpacity);if(this._storedZIndex)this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex);this.dragging=false;if(this.cancelHelperRemoval){if(!c){this._trigger("beforeStop",
+d,this._uiHash());for(h=0;h<e.length;h++)e[h].call(this,d);this._trigger("stop",d,this._uiHash())}return false}c||this._trigger("beforeStop",d,this._uiHash());this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.helper[0]!=this.currentItem[0]&&this.helper.remove();this.helper=null;if(!c){for(h=0;h<e.length;h++)e[h].call(this,d);this._trigger("stop",d,this._uiHash())}this.fromOutside=false;return true},_trigger:function(){a.Widget.prototype._trigger.apply(this,arguments)===false&&this.cancel()},
+_uiHash:function(d){var c=d||this;return{helper:c.helper,placeholder:c.placeholder||a([]),position:c.position,originalPosition:c.originalPosition,offset:c.positionAbs,item:c.currentItem,sender:d?d.element:null}}});a.extend(a.ui.sortable,{version:"1.8.16"})})(jQuery);
+jQuery.effects||function(a,d){function c(n){var k;if(n&&n.constructor==Array&&n.length==3)return n;if(k=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(n))return[parseInt(k[1],10),parseInt(k[2],10),parseInt(k[3],10)];if(k=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(n))return[parseFloat(k[1])*2.55,parseFloat(k[2])*2.55,parseFloat(k[3])*2.55];if(k=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(n))return[parseInt(k[1],
+16),parseInt(k[2],16),parseInt(k[3],16)];if(k=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(n))return[parseInt(k[1]+k[1],16),parseInt(k[2]+k[2],16),parseInt(k[3]+k[3],16)];if(/rgba\(0, 0, 0, 0\)/.exec(n))return j.transparent;return j[a.trim(n).toLowerCase()]}function e(n,k){var m;do{m=a.curCSS(n,k);if(m!=""&&m!="transparent"||a.nodeName(n,"body"))break;k="backgroundColor"}while(n=n.parentNode);return c(m)}function h(){var n=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle,
+k={},m,p;if(n&&n.length&&n[0]&&n[n[0]])for(var q=n.length;q--;){m=n[q];if(typeof n[m]=="string"){p=m.replace(/\-(\w)/g,function(s,r){return r.toUpperCase()});k[p]=n[m]}}else for(m in n)if(typeof n[m]==="string")k[m]=n[m];return k}function g(n){var k,m;for(k in n){m=n[k];if(m==null||a.isFunction(m)||k in o||/scrollbar/.test(k)||!/color/i.test(k)&&isNaN(parseFloat(m)))delete n[k]}return n}function i(n,k){var m={_:0},p;for(p in k)if(n[p]!=k[p])m[p]=k[p];return m}function b(n,k,m,p){if(typeof n=="object"){p=
+k;m=null;k=n;n=k.effect}if(a.isFunction(k)){p=k;m=null;k={}}if(typeof k=="number"||a.fx.speeds[k]){p=m;m=k;k={}}if(a.isFunction(m)){p=m;m=null}k=k||{};m=m||k.duration;m=a.fx.off?0:typeof m=="number"?m:m in a.fx.speeds?a.fx.speeds[m]:a.fx.speeds._default;p=p||k.complete;return[n,k,m,p]}function f(n){if(!n||typeof n==="number"||a.fx.speeds[n])return true;if(typeof n==="string"&&!a.effects[n])return true;return false}a.effects={};a.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor",
+"borderTopColor","borderColor","color","outlineColor"],function(n,k){a.fx.step[k]=function(m){if(!m.colorInit){m.start=e(m.elem,k);m.end=c(m.end);m.colorInit=true}m.elem.style[k]="rgb("+Math.max(Math.min(parseInt(m.pos*(m.end[0]-m.start[0])+m.start[0],10),255),0)+","+Math.max(Math.min(parseInt(m.pos*(m.end[1]-m.start[1])+m.start[1],10),255),0)+","+Math.max(Math.min(parseInt(m.pos*(m.end[2]-m.start[2])+m.start[2],10),255),0)+")"}});var j={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,
+0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,
+211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},l=["add","remove","toggle"],o={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};a.effects.animateClass=function(n,k,m,
+p){if(a.isFunction(m)){p=m;m=null}return this.queue(function(){var q=a(this),s=q.attr("style")||" ",r=g(h.call(this)),u,v=q.attr("class");a.each(l,function(w,x){n[x]&&q[x+"Class"](n[x])});u=g(h.call(this));q.attr("class",v);q.animate(i(r,u),{queue:false,duration:k,easing:m,complete:function(){a.each(l,function(w,x){n[x]&&q[x+"Class"](n[x])});if(typeof q.attr("style")=="object"){q.attr("style").cssText="";q.attr("style").cssText=s}else q.attr("style",s);p&&p.apply(this,arguments);a.dequeue(this)}})})};
+a.fn.extend({_addClass:a.fn.addClass,addClass:function(n,k,m,p){return k?a.effects.animateClass.apply(this,[{add:n},k,m,p]):this._addClass(n)},_removeClass:a.fn.removeClass,removeClass:function(n,k,m,p){return k?a.effects.animateClass.apply(this,[{remove:n},k,m,p]):this._removeClass(n)},_toggleClass:a.fn.toggleClass,toggleClass:function(n,k,m,p,q){return typeof k=="boolean"||k===d?m?a.effects.animateClass.apply(this,[k?{add:n}:{remove:n},m,p,q]):this._toggleClass(n,k):a.effects.animateClass.apply(this,
+[{toggle:n},k,m,p])},switchClass:function(n,k,m,p,q){return a.effects.animateClass.apply(this,[{add:k,remove:n},m,p,q])}});a.extend(a.effects,{version:"1.8.16",save:function(n,k){for(var m=0;m<k.length;m++)k[m]!==null&&n.data("ec.storage."+k[m],n[0].style[k[m]])},restore:function(n,k){for(var m=0;m<k.length;m++)k[m]!==null&&n.css(k[m],n.data("ec.storage."+k[m]))},setMode:function(n,k){if(k=="toggle")k=n.is(":hidden")?"show":"hide";return k},getBaseline:function(n,k){var m;switch(n[0]){case "top":m=
+0;break;case "middle":m=0.5;break;case "bottom":m=1;break;default:m=n[0]/k.height}switch(n[1]){case "left":n=0;break;case "center":n=0.5;break;case "right":n=1;break;default:n=n[1]/k.width}return{x:n,y:m}},createWrapper:function(n){if(n.parent().is(".ui-effects-wrapper"))return n.parent();var k={width:n.outerWidth(true),height:n.outerHeight(true),"float":n.css("float")},m=a("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),
+p=document.activeElement;n.wrap(m);if(n[0]===p||a.contains(n[0],p))a(p).focus();m=n.parent();if(n.css("position")=="static"){m.css({position:"relative"});n.css({position:"relative"})}else{a.extend(k,{position:n.css("position"),zIndex:n.css("z-index")});a.each(["top","left","bottom","right"],function(q,s){k[s]=n.css(s);if(isNaN(parseInt(k[s],10)))k[s]="auto"});n.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})}return m.css(k).show()},removeWrapper:function(n){var k,m=document.activeElement;
+if(n.parent().is(".ui-effects-wrapper")){k=n.parent().replaceWith(n);if(n[0]===m||a.contains(n[0],m))a(m).focus();return k}return n},setTransition:function(n,k,m,p){p=p||{};a.each(k,function(q,s){unit=n.cssUnit(s);if(unit[0]>0)p[s]=unit[0]*m+unit[1]});return p}});a.fn.extend({effect:function(n){var k=b.apply(this,arguments),m={options:k[1],duration:k[2],callback:k[3]};k=m.options.mode;var p=a.effects[n];if(a.fx.off||!p)return k?this[k](m.duration,m.callback):this.each(function(){m.callback&&m.callback.call(this)});
+return p.call(this,m)},_show:a.fn.show,show:function(n){if(f(n))return this._show.apply(this,arguments);else{var k=b.apply(this,arguments);k[1].mode="show";return this.effect.apply(this,k)}},_hide:a.fn.hide,hide:function(n){if(f(n))return this._hide.apply(this,arguments);else{var k=b.apply(this,arguments);k[1].mode="hide";return this.effect.apply(this,k)}},__toggle:a.fn.toggle,toggle:function(n){if(f(n)||typeof n==="boolean"||a.isFunction(n))return this.__toggle.apply(this,arguments);else{var k=b.apply(this,
+arguments);k[1].mode="toggle";return this.effect.apply(this,k)}},cssUnit:function(n){var k=this.css(n),m=[];a.each(["em","px","%","pt"],function(p,q){if(k.indexOf(q)>0)m=[parseFloat(k),q]});return m}});a.easing.jswing=a.easing.swing;a.extend(a.easing,{def:"easeOutQuad",swing:function(n,k,m,p,q){return a.easing[a.easing.def](n,k,m,p,q)},easeInQuad:function(n,k,m,p,q){return p*(k/=q)*k+m},easeOutQuad:function(n,k,m,p,q){return-p*(k/=q)*(k-2)+m},easeInOutQuad:function(n,k,m,p,q){if((k/=q/2)<1)return p/
+2*k*k+m;return-p/2*(--k*(k-2)-1)+m},easeInCubic:function(n,k,m,p,q){return p*(k/=q)*k*k+m},easeOutCubic:function(n,k,m,p,q){return p*((k=k/q-1)*k*k+1)+m},easeInOutCubic:function(n,k,m,p,q){if((k/=q/2)<1)return p/2*k*k*k+m;return p/2*((k-=2)*k*k+2)+m},easeInQuart:function(n,k,m,p,q){return p*(k/=q)*k*k*k+m},easeOutQuart:function(n,k,m,p,q){return-p*((k=k/q-1)*k*k*k-1)+m},easeInOutQuart:function(n,k,m,p,q){if((k/=q/2)<1)return p/2*k*k*k*k+m;return-p/2*((k-=2)*k*k*k-2)+m},easeInQuint:function(n,k,m,
+p,q){return p*(k/=q)*k*k*k*k+m},easeOutQuint:function(n,k,m,p,q){return p*((k=k/q-1)*k*k*k*k+1)+m},easeInOutQuint:function(n,k,m,p,q){if((k/=q/2)<1)return p/2*k*k*k*k*k+m;return p/2*((k-=2)*k*k*k*k+2)+m},easeInSine:function(n,k,m,p,q){return-p*Math.cos(k/q*(Math.PI/2))+p+m},easeOutSine:function(n,k,m,p,q){return p*Math.sin(k/q*(Math.PI/2))+m},easeInOutSine:function(n,k,m,p,q){return-p/2*(Math.cos(Math.PI*k/q)-1)+m},easeInExpo:function(n,k,m,p,q){return k==0?m:p*Math.pow(2,10*(k/q-1))+m},easeOutExpo:function(n,
+k,m,p,q){return k==q?m+p:p*(-Math.pow(2,-10*k/q)+1)+m},easeInOutExpo:function(n,k,m,p,q){if(k==0)return m;if(k==q)return m+p;if((k/=q/2)<1)return p/2*Math.pow(2,10*(k-1))+m;return p/2*(-Math.pow(2,-10*--k)+2)+m},easeInCirc:function(n,k,m,p,q){return-p*(Math.sqrt(1-(k/=q)*k)-1)+m},easeOutCirc:function(n,k,m,p,q){return p*Math.sqrt(1-(k=k/q-1)*k)+m},easeInOutCirc:function(n,k,m,p,q){if((k/=q/2)<1)return-p/2*(Math.sqrt(1-k*k)-1)+m;return p/2*(Math.sqrt(1-(k-=2)*k)+1)+m},easeInElastic:function(n,k,m,
+p,q){n=1.70158;var s=0,r=p;if(k==0)return m;if((k/=q)==1)return m+p;s||(s=q*0.3);if(r<Math.abs(p)){r=p;n=s/4}else n=s/(2*Math.PI)*Math.asin(p/r);return-(r*Math.pow(2,10*(k-=1))*Math.sin((k*q-n)*2*Math.PI/s))+m},easeOutElastic:function(n,k,m,p,q){n=1.70158;var s=0,r=p;if(k==0)return m;if((k/=q)==1)return m+p;s||(s=q*0.3);if(r<Math.abs(p)){r=p;n=s/4}else n=s/(2*Math.PI)*Math.asin(p/r);return r*Math.pow(2,-10*k)*Math.sin((k*q-n)*2*Math.PI/s)+p+m},easeInOutElastic:function(n,k,m,p,q){n=1.70158;var s=
+0,r=p;if(k==0)return m;if((k/=q/2)==2)return m+p;s||(s=q*0.3*1.5);if(r<Math.abs(p)){r=p;n=s/4}else n=s/(2*Math.PI)*Math.asin(p/r);if(k<1)return-0.5*r*Math.pow(2,10*(k-=1))*Math.sin((k*q-n)*2*Math.PI/s)+m;return r*Math.pow(2,-10*(k-=1))*Math.sin((k*q-n)*2*Math.PI/s)*0.5+p+m},easeInBack:function(n,k,m,p,q,s){if(s==d)s=1.70158;return p*(k/=q)*k*((s+1)*k-s)+m},easeOutBack:function(n,k,m,p,q,s){if(s==d)s=1.70158;return p*((k=k/q-1)*k*((s+1)*k+s)+1)+m},easeInOutBack:function(n,k,m,p,q,s){if(s==d)s=1.70158;
+if((k/=q/2)<1)return p/2*k*k*(((s*=1.525)+1)*k-s)+m;return p/2*((k-=2)*k*(((s*=1.525)+1)*k+s)+2)+m},easeInBounce:function(n,k,m,p,q){return p-a.easing.easeOutBounce(n,q-k,0,p,q)+m},easeOutBounce:function(n,k,m,p,q){return(k/=q)<1/2.75?p*7.5625*k*k+m:k<2/2.75?p*(7.5625*(k-=1.5/2.75)*k+0.75)+m:k<2.5/2.75?p*(7.5625*(k-=2.25/2.75)*k+0.9375)+m:p*(7.5625*(k-=2.625/2.75)*k+0.984375)+m},easeInOutBounce:function(n,k,m,p,q){if(k<q/2)return a.easing.easeInBounce(n,k*2,0,p,q)*0.5+m;return a.easing.easeOutBounce(n,
+k*2-q,0,p,q)*0.5+p*0.5+m}})}(jQuery);
+(function(a){a.effects.blind=function(d){return this.queue(function(){var c=a(this),e=["position","top","bottom","left","right"],h=a.effects.setMode(c,d.options.mode||"hide"),g=d.options.direction||"vertical";a.effects.save(c,e);c.show();var i=a.effects.createWrapper(c).css({overflow:"hidden"}),b=g=="vertical"?"height":"width";g=g=="vertical"?i.height():i.width();h=="show"&&i.css(b,0);var f={};f[b]=h=="show"?g:0;i.animate(f,d.duration,d.options.easing,function(){h=="hide"&&c.hide();a.effects.restore(c,
+e);a.effects.removeWrapper(c);d.callback&&d.callback.apply(c[0],arguments);c.dequeue()})})}})(jQuery);
+(function(a){a.effects.bounce=function(d){return this.queue(function(){var c=a(this),e=["position","top","bottom","left","right"],h=a.effects.setMode(c,d.options.mode||"effect"),g=d.options.direction||"up",i=d.options.distance||20,b=d.options.times||5,f=d.duration||250;/show|hide/.test(h)&&e.push("opacity");a.effects.save(c,e);c.show();a.effects.createWrapper(c);var j=g=="up"||g=="down"?"top":"left";g=g=="up"||g=="left"?"pos":"neg";i=d.options.distance||(j=="top"?c.outerHeight({margin:true})/3:c.outerWidth({margin:true})/
+3);if(h=="show")c.css("opacity",0).css(j,g=="pos"?-i:i);if(h=="hide")i/=b*2;h!="hide"&&b--;if(h=="show"){var l={opacity:1};l[j]=(g=="pos"?"+=":"-=")+i;c.animate(l,f/2,d.options.easing);i/=2;b--}for(l=0;l<b;l++){var o={},n={};o[j]=(g=="pos"?"-=":"+=")+i;n[j]=(g=="pos"?"+=":"-=")+i;c.animate(o,f/2,d.options.easing).animate(n,f/2,d.options.easing);i=h=="hide"?i*2:i/2}if(h=="hide"){l={opacity:0};l[j]=(g=="pos"?"-=":"+=")+i;c.animate(l,f/2,d.options.easing,function(){c.hide();a.effects.restore(c,e);a.effects.removeWrapper(c);
+d.callback&&d.callback.apply(this,arguments)})}else{o={};n={};o[j]=(g=="pos"?"-=":"+=")+i;n[j]=(g=="pos"?"+=":"-=")+i;c.animate(o,f/2,d.options.easing).animate(n,f/2,d.options.easing,function(){a.effects.restore(c,e);a.effects.removeWrapper(c);d.callback&&d.callback.apply(this,arguments)})}c.queue("fx",function(){c.dequeue()});c.dequeue()})}})(jQuery);
+(function(a){a.effects.clip=function(d){return this.queue(function(){var c=a(this),e=["position","top","bottom","left","right","height","width"],h=a.effects.setMode(c,d.options.mode||"hide"),g=d.options.direction||"vertical";a.effects.save(c,e);c.show();var i=a.effects.createWrapper(c).css({overflow:"hidden"});i=c[0].tagName=="IMG"?i:c;var b={size:g=="vertical"?"height":"width",position:g=="vertical"?"top":"left"};g=g=="vertical"?i.height():i.width();if(h=="show"){i.css(b.size,0);i.css(b.position,
+g/2)}var f={};f[b.size]=h=="show"?g:0;f[b.position]=h=="show"?0:g/2;i.animate(f,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){h=="hide"&&c.hide();a.effects.restore(c,e);a.effects.removeWrapper(c);d.callback&&d.callback.apply(c[0],arguments);c.dequeue()}})})}})(jQuery);
+(function(a){a.effects.drop=function(d){return this.queue(function(){var c=a(this),e=["position","top","bottom","left","right","opacity"],h=a.effects.setMode(c,d.options.mode||"hide"),g=d.options.direction||"left";a.effects.save(c,e);c.show();a.effects.createWrapper(c);var i=g=="up"||g=="down"?"top":"left";g=g=="up"||g=="left"?"pos":"neg";var b=d.options.distance||(i=="top"?c.outerHeight({margin:true})/2:c.outerWidth({margin:true})/2);if(h=="show")c.css("opacity",0).css(i,g=="pos"?-b:b);var f={opacity:h==
+"show"?1:0};f[i]=(h=="show"?g=="pos"?"+=":"-=":g=="pos"?"-=":"+=")+b;c.animate(f,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){h=="hide"&&c.hide();a.effects.restore(c,e);a.effects.removeWrapper(c);d.callback&&d.callback.apply(this,arguments);c.dequeue()}})})}})(jQuery);
+(function(a){a.effects.explode=function(d){return this.queue(function(){var c=d.options.pieces?Math.round(Math.sqrt(d.options.pieces)):3,e=d.options.pieces?Math.round(Math.sqrt(d.options.pieces)):3;d.options.mode=d.options.mode=="toggle"?a(this).is(":visible")?"hide":"show":d.options.mode;var h=a(this).show().css("visibility","hidden"),g=h.offset();g.top-=parseInt(h.css("marginTop"),10)||0;g.left-=parseInt(h.css("marginLeft"),10)||0;for(var i=h.outerWidth(true),b=h.outerHeight(true),f=0;f<c;f++)for(var j=
+0;j<e;j++)h.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-j*(i/e),top:-f*(b/c)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:i/e,height:b/c,left:g.left+j*(i/e)+(d.options.mode=="show"?(j-Math.floor(e/2))*(i/e):0),top:g.top+f*(b/c)+(d.options.mode=="show"?(f-Math.floor(c/2))*(b/c):0),opacity:d.options.mode=="show"?0:1}).animate({left:g.left+j*(i/e)+(d.options.mode=="show"?0:(j-Math.floor(e/2))*(i/e)),top:g.top+
+f*(b/c)+(d.options.mode=="show"?0:(f-Math.floor(c/2))*(b/c)),opacity:d.options.mode=="show"?1:0},d.duration||500);setTimeout(function(){d.options.mode=="show"?h.css({visibility:"visible"}):h.css({visibility:"visible"}).hide();d.callback&&d.callback.apply(h[0]);h.dequeue();a("div.ui-effects-explode").remove()},d.duration||500)})}})(jQuery);
+(function(a){a.effects.fade=function(d){return this.queue(function(){var c=a(this),e=a.effects.setMode(c,d.options.mode||"hide");c.animate({opacity:e},{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){d.callback&&d.callback.apply(this,arguments);c.dequeue()}})})}})(jQuery);
+(function(a){a.effects.fold=function(d){return this.queue(function(){var c=a(this),e=["position","top","bottom","left","right"],h=a.effects.setMode(c,d.options.mode||"hide"),g=d.options.size||15,i=!!d.options.horizFirst,b=d.duration?d.duration/2:a.fx.speeds._default/2;a.effects.save(c,e);c.show();var f=a.effects.createWrapper(c).css({overflow:"hidden"}),j=h=="show"!=i,l=j?["width","height"]:["height","width"];j=j?[f.width(),f.height()]:[f.height(),f.width()];var o=/([0-9]+)%/.exec(g);if(o)g=parseInt(o[1],
+10)/100*j[h=="hide"?0:1];if(h=="show")f.css(i?{height:0,width:g}:{height:g,width:0});i={};o={};i[l[0]]=h=="show"?j[0]:g;o[l[1]]=h=="show"?j[1]:0;f.animate(i,b,d.options.easing).animate(o,b,d.options.easing,function(){h=="hide"&&c.hide();a.effects.restore(c,e);a.effects.removeWrapper(c);d.callback&&d.callback.apply(c[0],arguments);c.dequeue()})})}})(jQuery);
+(function(a){a.effects.highlight=function(d){return this.queue(function(){var c=a(this),e=["backgroundImage","backgroundColor","opacity"],h=a.effects.setMode(c,d.options.mode||"show"),g={backgroundColor:c.css("backgroundColor")};if(h=="hide")g.opacity=0;a.effects.save(c,e);c.show().css({backgroundImage:"none",backgroundColor:d.options.color||"#ffff99"}).animate(g,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){h=="hide"&&c.hide();a.effects.restore(c,e);h=="show"&&!a.support.opacity&&
+this.style.removeAttribute("filter");d.callback&&d.callback.apply(this,arguments);c.dequeue()}})})}})(jQuery);
+(function(a){a.effects.pulsate=function(d){return this.queue(function(){var c=a(this),e=a.effects.setMode(c,d.options.mode||"show");times=(d.options.times||5)*2-1;duration=d.duration?d.duration/2:a.fx.speeds._default/2;isVisible=c.is(":visible");animateTo=0;if(!isVisible){c.css("opacity",0).show();animateTo=1}if(e=="hide"&&isVisible||e=="show"&&!isVisible)times--;for(e=0;e<times;e++){c.animate({opacity:animateTo},duration,d.options.easing);animateTo=(animateTo+1)%2}c.animate({opacity:animateTo},duration,
+d.options.easing,function(){animateTo==0&&c.hide();d.callback&&d.callback.apply(this,arguments)});c.queue("fx",function(){c.dequeue()}).dequeue()})}})(jQuery);
+(function(a){a.effects.puff=function(d){return this.queue(function(){var c=a(this),e=a.effects.setMode(c,d.options.mode||"hide"),h=parseInt(d.options.percent,10)||150,g=h/100,i={height:c.height(),width:c.width()};a.extend(d.options,{fade:true,mode:e,percent:e=="hide"?h:100,from:e=="hide"?i:{height:i.height*g,width:i.width*g}});c.effect("scale",d.options,d.duration,d.callback);c.dequeue()})};a.effects.scale=function(d){return this.queue(function(){var c=a(this),e=a.extend(true,{},d.options),h=a.effects.setMode(c,
+d.options.mode||"effect"),g=parseInt(d.options.percent,10)||(parseInt(d.options.percent,10)==0?0:h=="hide"?0:100),i=d.options.direction||"both",b=d.options.origin;if(h!="effect"){e.origin=b||["middle","center"];e.restore=true}b={height:c.height(),width:c.width()};c.from=d.options.from||(h=="show"?{height:0,width:0}:b);g={y:i!="horizontal"?g/100:1,x:i!="vertical"?g/100:1};c.to={height:b.height*g.y,width:b.width*g.x};if(d.options.fade){if(h=="show"){c.from.opacity=0;c.to.opacity=1}if(h=="hide"){c.from.opacity=
+1;c.to.opacity=0}}e.from=c.from;e.to=c.to;e.mode=h;c.effect("size",e,d.duration,d.callback);c.dequeue()})};a.effects.size=function(d){return this.queue(function(){var c=a(this),e=["position","top","bottom","left","right","width","height","overflow","opacity"],h=["position","top","bottom","left","right","overflow","opacity"],g=["width","height","overflow"],i=["fontSize"],b=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],f=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],
+j=a.effects.setMode(c,d.options.mode||"effect"),l=d.options.restore||false,o=d.options.scale||"both",n=d.options.origin,k={height:c.height(),width:c.width()};c.from=d.options.from||k;c.to=d.options.to||k;if(n){n=a.effects.getBaseline(n,k);c.from.top=(k.height-c.from.height)*n.y;c.from.left=(k.width-c.from.width)*n.x;c.to.top=(k.height-c.to.height)*n.y;c.to.left=(k.width-c.to.width)*n.x}var m={from:{y:c.from.height/k.height,x:c.from.width/k.width},to:{y:c.to.height/k.height,x:c.to.width/k.width}};
+if(o=="box"||o=="both"){if(m.from.y!=m.to.y){e=e.concat(b);c.from=a.effects.setTransition(c,b,m.from.y,c.from);c.to=a.effects.setTransition(c,b,m.to.y,c.to)}if(m.from.x!=m.to.x){e=e.concat(f);c.from=a.effects.setTransition(c,f,m.from.x,c.from);c.to=a.effects.setTransition(c,f,m.to.x,c.to)}}if(o=="content"||o=="both")if(m.from.y!=m.to.y){e=e.concat(i);c.from=a.effects.setTransition(c,i,m.from.y,c.from);c.to=a.effects.setTransition(c,i,m.to.y,c.to)}a.effects.save(c,l?e:h);c.show();a.effects.createWrapper(c);
+c.css("overflow","hidden").css(c.from);if(o=="content"||o=="both"){b=b.concat(["marginTop","marginBottom"]).concat(i);f=f.concat(["marginLeft","marginRight"]);g=e.concat(b).concat(f);c.find("*[width]").each(function(){child=a(this);l&&a.effects.save(child,g);var p={height:child.height(),width:child.width()};child.from={height:p.height*m.from.y,width:p.width*m.from.x};child.to={height:p.height*m.to.y,width:p.width*m.to.x};if(m.from.y!=m.to.y){child.from=a.effects.setTransition(child,b,m.from.y,child.from);
+child.to=a.effects.setTransition(child,b,m.to.y,child.to)}if(m.from.x!=m.to.x){child.from=a.effects.setTransition(child,f,m.from.x,child.from);child.to=a.effects.setTransition(child,f,m.to.x,child.to)}child.css(child.from);child.animate(child.to,d.duration,d.options.easing,function(){l&&a.effects.restore(child,g)})})}c.animate(c.to,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){c.to.opacity===0&&c.css("opacity",c.from.opacity);j=="hide"&&c.hide();a.effects.restore(c,
+l?e:h);a.effects.removeWrapper(c);d.callback&&d.callback.apply(this,arguments);c.dequeue()}})})}})(jQuery);
+(function(a){a.effects.shake=function(d){return this.queue(function(){var c=a(this),e=["position","top","bottom","left","right"];a.effects.setMode(c,d.options.mode||"effect");var h=d.options.direction||"left",g=d.options.distance||20,i=d.options.times||3,b=d.duration||d.options.duration||140;a.effects.save(c,e);c.show();a.effects.createWrapper(c);var f=h=="up"||h=="down"?"top":"left",j=h=="up"||h=="left"?"pos":"neg";h={};var l={},o={};h[f]=(j=="pos"?"-=":"+=")+g;l[f]=(j=="pos"?"+=":"-=")+g*2;o[f]=
+(j=="pos"?"-=":"+=")+g*2;c.animate(h,b,d.options.easing);for(g=1;g<i;g++)c.animate(l,b,d.options.easing).animate(o,b,d.options.easing);c.animate(l,b,d.options.easing).animate(h,b/2,d.options.easing,function(){a.effects.restore(c,e);a.effects.removeWrapper(c);d.callback&&d.callback.apply(this,arguments)});c.queue("fx",function(){c.dequeue()});c.dequeue()})}})(jQuery);
+(function(a){a.effects.slide=function(d){return this.queue(function(){var c=a(this),e=["position","top","bottom","left","right"],h=a.effects.setMode(c,d.options.mode||"show"),g=d.options.direction||"left";a.effects.save(c,e);c.show();a.effects.createWrapper(c).css({overflow:"hidden"});var i=g=="up"||g=="down"?"top":"left";g=g=="up"||g=="left"?"pos":"neg";var b=d.options.distance||(i=="top"?c.outerHeight({margin:true}):c.outerWidth({margin:true}));if(h=="show")c.css(i,g=="pos"?isNaN(b)?"-"+b:-b:b);
+var f={};f[i]=(h=="show"?g=="pos"?"+=":"-=":g=="pos"?"-=":"+=")+b;c.animate(f,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){h=="hide"&&c.hide();a.effects.restore(c,e);a.effects.removeWrapper(c);d.callback&&d.callback.apply(this,arguments);c.dequeue()}})})}})(jQuery);
+(function(a){a.effects.transfer=function(d){return this.queue(function(){var c=a(this),e=a(d.options.to),h=e.offset();e={top:h.top,left:h.left,height:e.innerHeight(),width:e.innerWidth()};h=c.offset();var g=a('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(d.options.className).css({top:h.top,left:h.left,height:c.innerHeight(),width:c.innerWidth(),position:"absolute"}).animate(e,d.duration,d.options.easing,function(){g.remove();d.callback&&d.callback.apply(c[0],arguments);
+c.dequeue()})})}})(jQuery);
+(function(a){a.widget("ui.accordion",{options:{active:0,animated:"slide",autoHeight:true,clearStyle:false,collapsible:false,event:"click",fillSpace:false,header:"> li > :first-child,> :not(li):even",icons:{header:"ui-icon-triangle-1-e",headerSelected:"ui-icon-triangle-1-s"},navigation:false,navigationFilter:function(){return this.href.toLowerCase()===location.href.toLowerCase()}},_create:function(){var d=this,c=d.options;d.running=0;d.element.addClass("ui-accordion ui-widget ui-helper-reset").children("li").addClass("ui-accordion-li-fix");d.headers=
+d.element.find(c.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all").bind("mouseenter.accordion",function(){c.disabled||a(this).addClass("ui-state-hover")}).bind("mouseleave.accordion",function(){c.disabled||a(this).removeClass("ui-state-hover")}).bind("focus.accordion",function(){c.disabled||a(this).addClass("ui-state-focus")}).bind("blur.accordion",function(){c.disabled||a(this).removeClass("ui-state-focus")});d.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom");
+if(c.navigation){var e=d.element.find("a").filter(c.navigationFilter).eq(0);if(e.length){var h=e.closest(".ui-accordion-header");d.active=h.length?h:e.closest(".ui-accordion-content").prev()}}d.active=d._findActive(d.active||c.active).addClass("ui-state-default ui-state-active").toggleClass("ui-corner-all").toggleClass("ui-corner-top");d.active.next().addClass("ui-accordion-content-active");d._createIcons();d.resize();d.element.attr("role","tablist");d.headers.attr("role","tab").bind("keydown.accordion",
+function(g){return d._keydown(g)}).next().attr("role","tabpanel");d.headers.not(d.active||"").attr({"aria-expanded":"false","aria-selected":"false",tabIndex:-1}).next().hide();d.active.length?d.active.attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}):d.headers.eq(0).attr("tabIndex",0);a.browser.safari||d.headers.find("a").attr("tabIndex",-1);c.event&&d.headers.bind(c.event.split(" ").join(".accordion ")+".accordion",function(g){d._clickHandler.call(d,g,this);g.preventDefault()})},_createIcons:function(){var d=
+this.options;if(d.icons){a("<span></span>").addClass("ui-icon "+d.icons.header).prependTo(this.headers);this.active.children(".ui-icon").toggleClass(d.icons.header).toggleClass(d.icons.headerSelected);this.element.addClass("ui-accordion-icons")}},_destroyIcons:function(){this.headers.children(".ui-icon").remove();this.element.removeClass("ui-accordion-icons")},destroy:function(){var d=this.options;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role");this.headers.unbind(".accordion").removeClass("ui-accordion-header ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-selected").removeAttr("tabIndex");
+this.headers.find("a").removeAttr("tabIndex");this._destroyIcons();var c=this.headers.next().css("display","").removeAttr("role").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-accordion-disabled ui-state-disabled");if(d.autoHeight||d.fillHeight)c.css("height","");return a.Widget.prototype.destroy.call(this)},_setOption:function(d,c){a.Widget.prototype._setOption.apply(this,arguments);d=="active"&&this.activate(c);if(d=="icons"){this._destroyIcons();
+c&&this._createIcons()}if(d=="disabled")this.headers.add(this.headers.next())[c?"addClass":"removeClass"]("ui-accordion-disabled ui-state-disabled")},_keydown:function(d){if(!(this.options.disabled||d.altKey||d.ctrlKey)){var c=a.ui.keyCode,e=this.headers.length,h=this.headers.index(d.target),g=false;switch(d.keyCode){case c.RIGHT:case c.DOWN:g=this.headers[(h+1)%e];break;case c.LEFT:case c.UP:g=this.headers[(h-1+e)%e];break;case c.SPACE:case c.ENTER:this._clickHandler({target:d.target},d.target);
+d.preventDefault()}if(g){a(d.target).attr("tabIndex",-1);a(g).attr("tabIndex",0);g.focus();return false}return true}},resize:function(){var d=this.options,c;if(d.fillSpace){if(a.browser.msie){var e=this.element.parent().css("overflow");this.element.parent().css("overflow","hidden")}c=this.element.parent().height();a.browser.msie&&this.element.parent().css("overflow",e);this.headers.each(function(){c-=a(this).outerHeight(true)});this.headers.next().each(function(){a(this).height(Math.max(0,c-a(this).innerHeight()+
+a(this).height()))}).css("overflow","auto")}else if(d.autoHeight){c=0;this.headers.next().each(function(){c=Math.max(c,a(this).height("").height())}).height(c)}return this},activate:function(d){this.options.active=d;d=this._findActive(d)[0];this._clickHandler({target:d},d);return this},_findActive:function(d){return d?typeof d==="number"?this.headers.filter(":eq("+d+")"):this.headers.not(this.headers.not(d)):d===false?a([]):this.headers.filter(":eq(0)")},_clickHandler:function(d,c){var e=this.options;
+if(!e.disabled)if(d.target){d=a(d.currentTarget||c);c=d[0]===this.active[0];e.active=e.collapsible&&c?false:this.headers.index(d);if(!(this.running||!e.collapsible&&c)){var h=this.active;f=d.next();i=this.active.next();b={options:e,newHeader:c&&e.collapsible?a([]):d,oldHeader:this.active,newContent:c&&e.collapsible?a([]):f,oldContent:i};var g=this.headers.index(this.active[0])>this.headers.index(d[0]);this.active=c?a([]):d;this._toggle(f,i,b,c,g);h.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(e.icons.headerSelected).addClass(e.icons.header);
+if(!c){d.removeClass("ui-state-default ui-corner-all").addClass("ui-state-active ui-corner-top").children(".ui-icon").removeClass(e.icons.header).addClass(e.icons.headerSelected);d.next().addClass("ui-accordion-content-active")}}}else if(e.collapsible){this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(e.icons.headerSelected).addClass(e.icons.header);this.active.next().addClass("ui-accordion-content-active");var i=this.active.next(),
+b={options:e,newHeader:a([]),oldHeader:e.active,newContent:a([]),oldContent:i},f=this.active=a([]);this._toggle(f,i,b)}},_toggle:function(d,c,e,h,g){var i=this,b=i.options;i.toShow=d;i.toHide=c;i.data=e;var f=function(){if(i)return i._completed.apply(i,arguments)};i._trigger("changestart",null,i.data);i.running=c.size()===0?d.size():c.size();if(b.animated){e={};e=b.collapsible&&h?{toShow:a([]),toHide:c,complete:f,down:g,autoHeight:b.autoHeight||b.fillSpace}:{toShow:d,toHide:c,complete:f,down:g,autoHeight:b.autoHeight||
+b.fillSpace};if(!b.proxied)b.proxied=b.animated;if(!b.proxiedDuration)b.proxiedDuration=b.duration;b.animated=a.isFunction(b.proxied)?b.proxied(e):b.proxied;b.duration=a.isFunction(b.proxiedDuration)?b.proxiedDuration(e):b.proxiedDuration;h=a.ui.accordion.animations;var j=b.duration,l=b.animated;if(l&&!h[l]&&!a.easing[l])l="slide";h[l]||(h[l]=function(o){this.slide(o,{easing:l,duration:j||700})});h[l](e)}else{if(b.collapsible&&h)d.toggle();else{c.hide();d.show()}f(true)}c.prev().attr({"aria-expanded":"false",
+"aria-selected":"false",tabIndex:-1}).blur();d.prev().attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}).focus()},_completed:function(d){this.running=d?0:--this.running;if(!this.running){this.options.clearStyle&&this.toShow.add(this.toHide).css({height:"",overflow:""});this.toHide.removeClass("ui-accordion-content-active");if(this.toHide.length)this.toHide.parent()[0].className=this.toHide.parent()[0].className;this._trigger("change",null,this.data)}}});a.extend(a.ui.accordion,{version:"1.8.16",
+animations:{slide:function(d,c){d=a.extend({easing:"swing",duration:300},d,c);if(d.toHide.size())if(d.toShow.size()){var e=d.toShow.css("overflow"),h=0,g={},i={},b;c=d.toShow;b=c[0].style.width;c.width(parseInt(c.parent().width(),10)-parseInt(c.css("paddingLeft"),10)-parseInt(c.css("paddingRight"),10)-(parseInt(c.css("borderLeftWidth"),10)||0)-(parseInt(c.css("borderRightWidth"),10)||0));a.each(["height","paddingTop","paddingBottom"],function(f,j){i[j]="hide";f=(""+a.css(d.toShow[0],j)).match(/^([\d+-.]+)(.*)$/);
+g[j]={value:f[1],unit:f[2]||"px"}});d.toShow.css({height:0,overflow:"hidden"}).show();d.toHide.filter(":hidden").each(d.complete).end().filter(":visible").animate(i,{step:function(f,j){if(j.prop=="height")h=j.end-j.start===0?0:(j.now-j.start)/(j.end-j.start);d.toShow[0].style[j.prop]=h*g[j.prop].value+g[j.prop].unit},duration:d.duration,easing:d.easing,complete:function(){d.autoHeight||d.toShow.css("height","");d.toShow.css({width:b,overflow:e});d.complete()}})}else d.toHide.animate({height:"hide",
+paddingTop:"hide",paddingBottom:"hide"},d);else d.toShow.animate({height:"show",paddingTop:"show",paddingBottom:"show"},d)},bounceslide:function(d){this.slide(d,{easing:d.down?"easeOutBounce":"swing",duration:d.down?1E3:200})}}})})(jQuery);
+(function(a){var d=0;a.widget("ui.autocomplete",{options:{appendTo:"body",autoFocus:false,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null},pending:0,_create:function(){var c=this,e=this.element[0].ownerDocument,h;this.element.addClass("ui-autocomplete-input").attr("autocomplete","off").attr({role:"textbox","aria-autocomplete":"list","aria-haspopup":"true"}).bind("keydown.autocomplete",function(g){if(!(c.options.disabled||c.element.propAttr("readOnly"))){h=
+false;var i=a.ui.keyCode;switch(g.keyCode){case i.PAGE_UP:c._move("previousPage",g);break;case i.PAGE_DOWN:c._move("nextPage",g);break;case i.UP:c._move("previous",g);g.preventDefault();break;case i.DOWN:c._move("next",g);g.preventDefault();break;case i.ENTER:case i.NUMPAD_ENTER:if(c.menu.active){h=true;g.preventDefault()}case i.TAB:if(!c.menu.active)return;c.menu.select(g);break;case i.ESCAPE:c.element.val(c.term);c.close(g);break;default:clearTimeout(c.searching);c.searching=setTimeout(function(){if(c.term!=
+c.element.val()){c.selectedItem=null;c.search(null,g)}},c.options.delay);break}}}).bind("keypress.autocomplete",function(g){if(h){h=false;g.preventDefault()}}).bind("focus.autocomplete",function(){if(!c.options.disabled){c.selectedItem=null;c.previous=c.element.val()}}).bind("blur.autocomplete",function(g){if(!c.options.disabled){clearTimeout(c.searching);c.closing=setTimeout(function(){c.close(g);c._change(g)},150)}});this._initSource();this.response=function(){return c._response.apply(c,arguments)};
+this.menu=a("<ul></ul>").addClass("ui-autocomplete").appendTo(a(this.options.appendTo||"body",e)[0]).mousedown(function(g){var i=c.menu.element[0];a(g.target).closest(".ui-menu-item").length||setTimeout(function(){a(document).one("mousedown",function(b){b.target!==c.element[0]&&b.target!==i&&!a.ui.contains(i,b.target)&&c.close()})},1);setTimeout(function(){clearTimeout(c.closing)},13)}).menu({focus:function(g,i){i=i.item.data("item.autocomplete");false!==c._trigger("focus",g,{item:i})&&/^key/.test(g.originalEvent.type)&&
+c.element.val(i.value)},selected:function(g,i){var b=i.item.data("item.autocomplete"),f=c.previous;if(c.element[0]!==e.activeElement){c.element.focus();c.previous=f;setTimeout(function(){c.previous=f;c.selectedItem=b},1)}false!==c._trigger("select",g,{item:b})&&c.element.val(b.value);c.term=c.element.val();c.close(g);c.selectedItem=b},blur:function(){c.menu.element.is(":visible")&&c.element.val()!==c.term&&c.element.val(c.term)}}).zIndex(this.element.zIndex()+1).css({top:0,left:0}).hide().data("menu");
+a.fn.bgiframe&&this.menu.element.bgiframe()},destroy:function(){this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete").removeAttr("role").removeAttr("aria-autocomplete").removeAttr("aria-haspopup");this.menu.element.remove();a.Widget.prototype.destroy.call(this)},_setOption:function(c,e){a.Widget.prototype._setOption.apply(this,arguments);c==="source"&&this._initSource();if(c==="appendTo")this.menu.element.appendTo(a(e||"body",this.element[0].ownerDocument)[0]);c==="disabled"&&
+e&&this.xhr&&this.xhr.abort()},_initSource:function(){var c=this,e,h;if(a.isArray(this.options.source)){e=this.options.source;this.source=function(g,i){i(a.ui.autocomplete.filter(e,g.term))}}else if(typeof this.options.source==="string"){h=this.options.source;this.source=function(g,i){c.xhr&&c.xhr.abort();c.xhr=a.ajax({url:h,data:g,dataType:"json",autocompleteRequest:++d,success:function(b){this.autocompleteRequest===d&&i(b)},error:function(){this.autocompleteRequest===d&&i([])}})}}else this.source=
+this.options.source},search:function(c,e){c=c!=null?c:this.element.val();this.term=this.element.val();if(c.length<this.options.minLength)return this.close(e);clearTimeout(this.closing);if(this._trigger("search",e)!==false)return this._search(c)},_search:function(c){this.pending++;this.element.addClass("ui-autocomplete-loading");this.source({term:c},this.response)},_response:function(c){if(!this.options.disabled&&c&&c.length){c=this._normalize(c);this._suggest(c);this._trigger("open")}else this.close();
+this.pending--;this.pending||this.element.removeClass("ui-autocomplete-loading")},close:function(c){clearTimeout(this.closing);if(this.menu.element.is(":visible")){this.menu.element.hide();this.menu.deactivate();this._trigger("close",c)}},_change:function(c){this.previous!==this.element.val()&&this._trigger("change",c,{item:this.selectedItem})},_normalize:function(c){if(c.length&&c[0].label&&c[0].value)return c;return a.map(c,function(e){if(typeof e==="string")return{label:e,value:e};return a.extend({label:e.label||
+e.value,value:e.value||e.label},e)})},_suggest:function(c){var e=this.menu.element.empty().zIndex(this.element.zIndex()+1);this._renderMenu(e,c);this.menu.deactivate();this.menu.refresh();e.show();this._resizeMenu();e.position(a.extend({of:this.element},this.options.position));this.options.autoFocus&&this.menu.next(new a.Event("mouseover"))},_resizeMenu:function(){var c=this.menu.element;c.outerWidth(Math.max(c.width("").outerWidth(),this.element.outerWidth()))},_renderMenu:function(c,e){var h=this;
+a.each(e,function(g,i){h._renderItem(c,i)})},_renderItem:function(c,e){return a("<li></li>").data("item.autocomplete",e).append(a("<a></a>").text(e.label)).appendTo(c)},_move:function(c,e){if(this.menu.element.is(":visible"))if(this.menu.first()&&/^previous/.test(c)||this.menu.last()&&/^next/.test(c)){this.element.val(this.term);this.menu.deactivate()}else this.menu[c](e);else this.search(null,e)},widget:function(){return this.menu.element}});a.extend(a.ui.autocomplete,{escapeRegex:function(c){return c.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,
+"\\$&")},filter:function(c,e){var h=new RegExp(a.ui.autocomplete.escapeRegex(e),"i");return a.grep(c,function(g){return h.test(g.label||g.value||g)})}})})(jQuery);
+(function(a){a.widget("ui.menu",{_create:function(){var d=this;this.element.addClass("ui-menu ui-widget ui-widget-content ui-corner-all").attr({role:"listbox","aria-activedescendant":"ui-active-menuitem"}).click(function(c){if(a(c.target).closest(".ui-menu-item a").length){c.preventDefault();d.select(c)}});this.refresh()},refresh:function(){var d=this;this.element.children("li:not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","menuitem").children("a").addClass("ui-corner-all").attr("tabindex",
+-1).mouseenter(function(c){d.activate(c,a(this).parent())}).mouseleave(function(){d.deactivate()})},activate:function(d,c){this.deactivate();if(this.hasScroll()){var e=c.offset().top-this.element.offset().top,h=this.element.scrollTop(),g=this.element.height();if(e<0)this.element.scrollTop(h+e);else e>=g&&this.element.scrollTop(h+e-g+c.height())}this.active=c.eq(0).children("a").addClass("ui-state-hover").attr("id","ui-active-menuitem").end();this._trigger("focus",d,{item:c})},deactivate:function(){if(this.active){this.active.children("a").removeClass("ui-state-hover").removeAttr("id");
+this._trigger("blur");this.active=null}},next:function(d){this.move("next",".ui-menu-item:first",d)},previous:function(d){this.move("prev",".ui-menu-item:last",d)},first:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},last:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},move:function(d,c,e){if(this.active){d=this.active[d+"All"](".ui-menu-item").eq(0);d.length?this.activate(e,d):this.activate(e,this.element.children(c))}else this.activate(e,
+this.element.children(c))},nextPage:function(d){if(this.hasScroll())if(!this.active||this.last())this.activate(d,this.element.children(".ui-menu-item:first"));else{var c=this.active.offset().top,e=this.element.height(),h=this.element.children(".ui-menu-item").filter(function(){var g=a(this).offset().top-c-e+a(this).height();return g<10&&g>-10});h.length||(h=this.element.children(".ui-menu-item:last"));this.activate(d,h)}else this.activate(d,this.element.children(".ui-menu-item").filter(!this.active||
+this.last()?":first":":last"))},previousPage:function(d){if(this.hasScroll())if(!this.active||this.first())this.activate(d,this.element.children(".ui-menu-item:last"));else{var c=this.active.offset().top,e=this.element.height();result=this.element.children(".ui-menu-item").filter(function(){var h=a(this).offset().top-c+e-a(this).height();return h<10&&h>-10});result.length||(result=this.element.children(".ui-menu-item:first"));this.activate(d,result)}else this.activate(d,this.element.children(".ui-menu-item").filter(!this.active||
+this.first()?":last":":first"))},hasScroll:function(){return this.element.height()<this.element[a.fn.prop?"prop":"attr"]("scrollHeight")},select:function(d){this._trigger("selected",d,{item:this.active})}})})(jQuery);
+(function(a){var d,c,e,h,g=function(){var b=a(this).find(":ui-button");setTimeout(function(){b.button("refresh")},1)},i=function(b){var f=b.name,j=b.form,l=a([]);if(f)l=j?a(j).find("[name='"+f+"']"):a("[name='"+f+"']",b.ownerDocument).filter(function(){return!this.form});return l};a.widget("ui.button",{options:{disabled:null,text:true,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset.button").bind("reset.button",g);if(typeof this.options.disabled!==
+"boolean")this.options.disabled=this.element.propAttr("disabled");this._determineButtonType();this.hasTitle=!!this.buttonElement.attr("title");var b=this,f=this.options,j=this.type==="checkbox"||this.type==="radio",l="ui-state-hover"+(!j?" ui-state-active":"");if(f.label===null)f.label=this.buttonElement.html();if(this.element.is(":disabled"))f.disabled=true;this.buttonElement.addClass("ui-button ui-widget ui-state-default ui-corner-all").attr("role","button").bind("mouseenter.button",function(){if(!f.disabled){a(this).addClass("ui-state-hover");
+this===d&&a(this).addClass("ui-state-active")}}).bind("mouseleave.button",function(){f.disabled||a(this).removeClass(l)}).bind("click.button",function(o){if(f.disabled){o.preventDefault();o.stopImmediatePropagation()}});this.element.bind("focus.button",function(){b.buttonElement.addClass("ui-state-focus")}).bind("blur.button",function(){b.buttonElement.removeClass("ui-state-focus")});if(j){this.element.bind("change.button",function(){h||b.refresh()});this.buttonElement.bind("mousedown.button",function(o){if(!f.disabled){h=
+false;c=o.pageX;e=o.pageY}}).bind("mouseup.button",function(o){if(!f.disabled)if(c!==o.pageX||e!==o.pageY)h=true})}if(this.type==="checkbox")this.buttonElement.bind("click.button",function(){if(f.disabled||h)return false;a(this).toggleClass("ui-state-active");b.buttonElement.attr("aria-pressed",b.element[0].checked)});else if(this.type==="radio")this.buttonElement.bind("click.button",function(){if(f.disabled||h)return false;a(this).addClass("ui-state-active");b.buttonElement.attr("aria-pressed","true");
+var o=b.element[0];i(o).not(o).map(function(){return a(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed","false")});else{this.buttonElement.bind("mousedown.button",function(){if(f.disabled)return false;a(this).addClass("ui-state-active");d=this;a(document).one("mouseup",function(){d=null})}).bind("mouseup.button",function(){if(f.disabled)return false;a(this).removeClass("ui-state-active")}).bind("keydown.button",function(o){if(f.disabled)return false;if(o.keyCode==a.ui.keyCode.SPACE||
+o.keyCode==a.ui.keyCode.ENTER)a(this).addClass("ui-state-active")}).bind("keyup.button",function(){a(this).removeClass("ui-state-active")});this.buttonElement.is("a")&&this.buttonElement.keyup(function(o){o.keyCode===a.ui.keyCode.SPACE&&a(this).click()})}this._setOption("disabled",f.disabled);this._resetButton()},_determineButtonType:function(){this.type=this.element.is(":checkbox")?"checkbox":this.element.is(":radio")?"radio":this.element.is("input")?"input":"button";if(this.type==="checkbox"||this.type===
+"radio"){var b=this.element.parents().filter(":last"),f="label[for='"+this.element.attr("id")+"']";this.buttonElement=b.find(f);if(!this.buttonElement.length){b=b.length?b.siblings():this.element.siblings();this.buttonElement=b.filter(f);if(!this.buttonElement.length)this.buttonElement=b.find(f)}this.element.addClass("ui-helper-hidden-accessible");(b=this.element.is(":checked"))&&this.buttonElement.addClass("ui-state-active");this.buttonElement.attr("aria-pressed",b)}else this.buttonElement=this.element},
+widget:function(){return this.buttonElement},destroy:function(){this.element.removeClass("ui-helper-hidden-accessible");this.buttonElement.removeClass("ui-button ui-widget ui-state-default ui-corner-all ui-state-hover ui-state-active  ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only").removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html());this.hasTitle||this.buttonElement.removeAttr("title");
+a.Widget.prototype.destroy.call(this)},_setOption:function(b,f){a.Widget.prototype._setOption.apply(this,arguments);if(b==="disabled")f?this.element.propAttr("disabled",true):this.element.propAttr("disabled",false);else this._resetButton()},refresh:function(){var b=this.element.is(":disabled");b!==this.options.disabled&&this._setOption("disabled",b);if(this.type==="radio")i(this.element[0]).each(function(){a(this).is(":checked")?a(this).button("widget").addClass("ui-state-active").attr("aria-pressed",
+"true"):a(this).button("widget").removeClass("ui-state-active").attr("aria-pressed","false")});else if(this.type==="checkbox")this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed","true"):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed","false")},_resetButton:function(){if(this.type==="input")this.options.label&&this.element.val(this.options.label);else{var b=this.buttonElement.removeClass("ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only"),
+f=a("<span></span>").addClass("ui-button-text").html(this.options.label).appendTo(b.empty()).text(),j=this.options.icons,l=j.primary&&j.secondary,o=[];if(j.primary||j.secondary){if(this.options.text)o.push("ui-button-text-icon"+(l?"s":j.primary?"-primary":"-secondary"));j.primary&&b.prepend("<span class='ui-button-icon-primary ui-icon "+j.primary+"'></span>");j.secondary&&b.append("<span class='ui-button-icon-secondary ui-icon "+j.secondary+"'></span>");if(!this.options.text){o.push(l?"ui-button-icons-only":
+"ui-button-icon-only");this.hasTitle||b.attr("title",f)}}else o.push("ui-button-text-only");b.addClass(o.join(" "))}}});a.widget("ui.buttonset",{options:{items:":button, :submit, :reset, :checkbox, :radio, a, :data(button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(b,f){b==="disabled"&&this.buttons.button("option",b,f);a.Widget.prototype._setOption.apply(this,arguments)},refresh:function(){var b=this.element.css("direction")===
+"ltr";this.buttons=this.element.find(this.options.items).filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(b?"ui-corner-left":"ui-corner-right").end().filter(":last").addClass(b?"ui-corner-right":"ui-corner-left").end().end()},destroy:function(){this.element.removeClass("ui-buttonset");this.buttons.map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy");
+a.Widget.prototype.destroy.call(this)}})})(jQuery);
+(function(a,d){function c(){this.debug=false;this._curInst=null;this._keyEvent=false;this._disabledInputs=[];this._inDialog=this._datepickerShowing=false;this._mainDivId="ui-datepicker-div";this._inlineClass="ui-datepicker-inline";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._disableClass="ui-datepicker-disabled";this._unselectableClass="ui-datepicker-unselectable";this._currentClass="ui-datepicker-current-day";this._dayOverClass=
+"ui-datepicker-days-cell-over";this.regional=[];this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su",
+"Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:false,showMonthAfterYear:false,yearSuffix:""};this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:false,hideIfNoPrevNext:false,navigationAsDateFormat:false,gotoCurrent:false,changeMonth:false,changeYear:false,yearRange:"c-10:c+10",showOtherMonths:false,selectOtherMonths:false,showWeek:false,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",
+minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false,autoSize:false,disabled:false};a.extend(this._defaults,this.regional[""]);this.dpDiv=e(a('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}function e(b){return b.bind("mouseout",
+function(f){f=a(f.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");f.length&&f.removeClass("ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover")}).bind("mouseover",function(f){f=a(f.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");if(!(a.datepicker._isDisabledDatepicker(i.inline?b.parent()[0]:i.input[0])||!f.length)){f.parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");
+f.addClass("ui-state-hover");f.hasClass("ui-datepicker-prev")&&f.addClass("ui-datepicker-prev-hover");f.hasClass("ui-datepicker-next")&&f.addClass("ui-datepicker-next-hover")}})}function h(b,f){a.extend(b,f);for(var j in f)if(f[j]==null||f[j]==d)b[j]=f[j];return b}a.extend(a.ui,{datepicker:{version:"1.8.16"}});var g=(new Date).getTime(),i;a.extend(c.prototype,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv},
+setDefaults:function(b){h(this._defaults,b||{});return this},_attachDatepicker:function(b,f){var j=null;for(var l in this._defaults){var o=b.getAttribute("date:"+l);if(o){j=j||{};try{j[l]=eval(o)}catch(n){j[l]=o}}}l=b.nodeName.toLowerCase();o=l=="div"||l=="span";if(!b.id){this.uuid+=1;b.id="dp"+this.uuid}var k=this._newInst(a(b),o);k.settings=a.extend({},f||{},j||{});if(l=="input")this._connectDatepicker(b,k);else o&&this._inlineDatepicker(b,k)},_newInst:function(b,f){return{id:b[0].id.replace(/([^A-Za-z0-9_-])/g,
+"\\\\$1"),input:b,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:f,dpDiv:!f?this.dpDiv:e(a('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}},_connectDatepicker:function(b,f){var j=a(b);f.append=a([]);f.trigger=a([]);if(!j.hasClass(this.markerClassName)){this._attachments(j,f);j.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",
+function(l,o,n){f.settings[o]=n}).bind("getData.datepicker",function(l,o){return this._get(f,o)});this._autoSize(f);a.data(b,"datepicker",f);f.settings.disabled&&this._disableDatepicker(b)}},_attachments:function(b,f){var j=this._get(f,"appendText"),l=this._get(f,"isRTL");f.append&&f.append.remove();if(j){f.append=a('<span class="'+this._appendClass+'">'+j+"</span>");b[l?"before":"after"](f.append)}b.unbind("focus",this._showDatepicker);f.trigger&&f.trigger.remove();j=this._get(f,"showOn");if(j==
+"focus"||j=="both")b.focus(this._showDatepicker);if(j=="button"||j=="both"){j=this._get(f,"buttonText");var o=this._get(f,"buttonImage");f.trigger=a(this._get(f,"buttonImageOnly")?a("<img/>").addClass(this._triggerClass).attr({src:o,alt:j,title:j}):a('<button type="button"></button>').addClass(this._triggerClass).html(o==""?j:a("<img/>").attr({src:o,alt:j,title:j})));b[l?"before":"after"](f.trigger);f.trigger.click(function(){a.datepicker._datepickerShowing&&a.datepicker._lastInput==b[0]?a.datepicker._hideDatepicker():
+a.datepicker._showDatepicker(b[0]);return false})}},_autoSize:function(b){if(this._get(b,"autoSize")&&!b.inline){var f=new Date(2009,11,20),j=this._get(b,"dateFormat");if(j.match(/[DM]/)){var l=function(o){for(var n=0,k=0,m=0;m<o.length;m++)if(o[m].length>n){n=o[m].length;k=m}return k};f.setMonth(l(this._get(b,j.match(/MM/)?"monthNames":"monthNamesShort")));f.setDate(l(this._get(b,j.match(/DD/)?"dayNames":"dayNamesShort"))+20-f.getDay())}b.input.attr("size",this._formatDate(b,f).length)}},_inlineDatepicker:function(b,
+f){var j=a(b);if(!j.hasClass(this.markerClassName)){j.addClass(this.markerClassName).append(f.dpDiv).bind("setData.datepicker",function(l,o,n){f.settings[o]=n}).bind("getData.datepicker",function(l,o){return this._get(f,o)});a.data(b,"datepicker",f);this._setDate(f,this._getDefaultDate(f),true);this._updateDatepicker(f);this._updateAlternate(f);f.settings.disabled&&this._disableDatepicker(b);f.dpDiv.css("display","block")}},_dialogDatepicker:function(b,f,j,l,o){b=this._dialogInst;if(!b){this.uuid+=
+1;this._dialogInput=a('<input type="text" id="'+("dp"+this.uuid)+'" style="position: absolute; top: -100px; width: 0px; z-index: -10;"/>');this._dialogInput.keydown(this._doKeyDown);a("body").append(this._dialogInput);b=this._dialogInst=this._newInst(this._dialogInput,false);b.settings={};a.data(this._dialogInput[0],"datepicker",b)}h(b.settings,l||{});f=f&&f.constructor==Date?this._formatDate(b,f):f;this._dialogInput.val(f);this._pos=o?o.length?o:[o.pageX,o.pageY]:null;if(!this._pos)this._pos=[document.documentElement.clientWidth/
+2-100+(document.documentElement.scrollLeft||document.body.scrollLeft),document.documentElement.clientHeight/2-150+(document.documentElement.scrollTop||document.body.scrollTop)];this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px");b.settings.onSelect=j;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);a.blockUI&&a.blockUI(this.dpDiv);a.data(this._dialogInput[0],"datepicker",b);return this},_destroyDatepicker:function(b){var f=
+a(b),j=a.data(b,"datepicker");if(f.hasClass(this.markerClassName)){var l=b.nodeName.toLowerCase();a.removeData(b,"datepicker");if(l=="input"){j.append.remove();j.trigger.remove();f.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)}else if(l=="div"||l=="span")f.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(b){var f=a(b),j=a.data(b,"datepicker");if(f.hasClass(this.markerClassName)){var l=
+b.nodeName.toLowerCase();if(l=="input"){b.disabled=false;j.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else if(l=="div"||l=="span"){f=f.children("."+this._inlineClass);f.children().removeClass("ui-state-disabled");f.find("select.ui-datepicker-month, select.ui-datepicker-year").removeAttr("disabled")}this._disabledInputs=a.map(this._disabledInputs,function(o){return o==b?null:o})}},_disableDatepicker:function(b){var f=a(b),j=a.data(b,
+"datepicker");if(f.hasClass(this.markerClassName)){var l=b.nodeName.toLowerCase();if(l=="input"){b.disabled=true;j.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5",cursor:"default"})}else if(l=="div"||l=="span"){f=f.children("."+this._inlineClass);f.children().addClass("ui-state-disabled");f.find("select.ui-datepicker-month, select.ui-datepicker-year").attr("disabled","disabled")}this._disabledInputs=a.map(this._disabledInputs,function(o){return o==
+b?null:o});this._disabledInputs[this._disabledInputs.length]=b}},_isDisabledDatepicker:function(b){if(!b)return false;for(var f=0;f<this._disabledInputs.length;f++)if(this._disabledInputs[f]==b)return true;return false},_getInst:function(b){try{return a.data(b,"datepicker")}catch(f){throw"Missing instance data for this datepicker";}},_optionDatepicker:function(b,f,j){var l=this._getInst(b);if(arguments.length==2&&typeof f=="string")return f=="defaults"?a.extend({},a.datepicker._defaults):l?f=="all"?
+a.extend({},l.settings):this._get(l,f):null;var o=f||{};if(typeof f=="string"){o={};o[f]=j}if(l){this._curInst==l&&this._hideDatepicker();var n=this._getDateDatepicker(b,true),k=this._getMinMaxDate(l,"min"),m=this._getMinMaxDate(l,"max");h(l.settings,o);if(k!==null&&o.dateFormat!==d&&o.minDate===d)l.settings.minDate=this._formatDate(l,k);if(m!==null&&o.dateFormat!==d&&o.maxDate===d)l.settings.maxDate=this._formatDate(l,m);this._attachments(a(b),l);this._autoSize(l);this._setDate(l,n);this._updateAlternate(l);
+this._updateDatepicker(l)}},_changeDatepicker:function(b,f,j){this._optionDatepicker(b,f,j)},_refreshDatepicker:function(b){(b=this._getInst(b))&&this._updateDatepicker(b)},_setDateDatepicker:function(b,f){if(b=this._getInst(b)){this._setDate(b,f);this._updateDatepicker(b);this._updateAlternate(b)}},_getDateDatepicker:function(b,f){(b=this._getInst(b))&&!b.inline&&this._setDateFromField(b,f);return b?this._getDate(b):null},_doKeyDown:function(b){var f=a.datepicker._getInst(b.target),j=true,l=f.dpDiv.is(".ui-datepicker-rtl");
+f._keyEvent=true;if(a.datepicker._datepickerShowing)switch(b.keyCode){case 9:a.datepicker._hideDatepicker();j=false;break;case 13:j=a("td."+a.datepicker._dayOverClass+":not(."+a.datepicker._currentClass+")",f.dpDiv);j[0]&&a.datepicker._selectDay(b.target,f.selectedMonth,f.selectedYear,j[0]);if(b=a.datepicker._get(f,"onSelect")){j=a.datepicker._formatDate(f);b.apply(f.input?f.input[0]:null,[j,f])}else a.datepicker._hideDatepicker();return false;case 27:a.datepicker._hideDatepicker();break;case 33:a.datepicker._adjustDate(b.target,
+b.ctrlKey?-a.datepicker._get(f,"stepBigMonths"):-a.datepicker._get(f,"stepMonths"),"M");break;case 34:a.datepicker._adjustDate(b.target,b.ctrlKey?+a.datepicker._get(f,"stepBigMonths"):+a.datepicker._get(f,"stepMonths"),"M");break;case 35:if(b.ctrlKey||b.metaKey)a.datepicker._clearDate(b.target);j=b.ctrlKey||b.metaKey;break;case 36:if(b.ctrlKey||b.metaKey)a.datepicker._gotoToday(b.target);j=b.ctrlKey||b.metaKey;break;case 37:if(b.ctrlKey||b.metaKey)a.datepicker._adjustDate(b.target,l?+1:-1,"D");j=
+b.ctrlKey||b.metaKey;if(b.originalEvent.altKey)a.datepicker._adjustDate(b.target,b.ctrlKey?-a.datepicker._get(f,"stepBigMonths"):-a.datepicker._get(f,"stepMonths"),"M");break;case 38:if(b.ctrlKey||b.metaKey)a.datepicker._adjustDate(b.target,-7,"D");j=b.ctrlKey||b.metaKey;break;case 39:if(b.ctrlKey||b.metaKey)a.datepicker._adjustDate(b.target,l?-1:+1,"D");j=b.ctrlKey||b.metaKey;if(b.originalEvent.altKey)a.datepicker._adjustDate(b.target,b.ctrlKey?+a.datepicker._get(f,"stepBigMonths"):+a.datepicker._get(f,
+"stepMonths"),"M");break;case 40:if(b.ctrlKey||b.metaKey)a.datepicker._adjustDate(b.target,+7,"D");j=b.ctrlKey||b.metaKey;break;default:j=false}else if(b.keyCode==36&&b.ctrlKey)a.datepicker._showDatepicker(this);else j=false;if(j){b.preventDefault();b.stopPropagation()}},_doKeyPress:function(b){var f=a.datepicker._getInst(b.target);if(a.datepicker._get(f,"constrainInput")){f=a.datepicker._possibleChars(a.datepicker._get(f,"dateFormat"));var j=String.fromCharCode(b.charCode==d?b.keyCode:b.charCode);
+return b.ctrlKey||b.metaKey||j<" "||!f||f.indexOf(j)>-1}},_doKeyUp:function(b){b=a.datepicker._getInst(b.target);if(b.input.val()!=b.lastVal)try{if(a.datepicker.parseDate(a.datepicker._get(b,"dateFormat"),b.input?b.input.val():null,a.datepicker._getFormatConfig(b))){a.datepicker._setDateFromField(b);a.datepicker._updateAlternate(b);a.datepicker._updateDatepicker(b)}}catch(f){a.datepicker.log(f)}return true},_showDatepicker:function(b){b=b.target||b;if(b.nodeName.toLowerCase()!="input")b=a("input",
+b.parentNode)[0];if(!(a.datepicker._isDisabledDatepicker(b)||a.datepicker._lastInput==b)){var f=a.datepicker._getInst(b);if(a.datepicker._curInst&&a.datepicker._curInst!=f){a.datepicker._datepickerShowing&&a.datepicker._triggerOnClose(a.datepicker._curInst);a.datepicker._curInst.dpDiv.stop(true,true)}var j=a.datepicker._get(f,"beforeShow");j=j?j.apply(b,[b,f]):{};if(j!==false){h(f.settings,j);f.lastVal=null;a.datepicker._lastInput=b;a.datepicker._setDateFromField(f);if(a.datepicker._inDialog)b.value=
+"";if(!a.datepicker._pos){a.datepicker._pos=a.datepicker._findPos(b);a.datepicker._pos[1]+=b.offsetHeight}var l=false;a(b).parents().each(function(){l|=a(this).css("position")=="fixed";return!l});if(l&&a.browser.opera){a.datepicker._pos[0]-=document.documentElement.scrollLeft;a.datepicker._pos[1]-=document.documentElement.scrollTop}j={left:a.datepicker._pos[0],top:a.datepicker._pos[1]};a.datepicker._pos=null;f.dpDiv.empty();f.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});a.datepicker._updateDatepicker(f);
+j=a.datepicker._checkOffset(f,j,l);f.dpDiv.css({position:a.datepicker._inDialog&&a.blockUI?"static":l?"fixed":"absolute",display:"none",left:j.left+"px",top:j.top+"px"});if(!f.inline){j=a.datepicker._get(f,"showAnim");var o=a.datepicker._get(f,"duration"),n=function(){var k=f.dpDiv.find("iframe.ui-datepicker-cover");if(k.length){var m=a.datepicker._getBorders(f.dpDiv);k.css({left:-m[0],top:-m[1],width:f.dpDiv.outerWidth(),height:f.dpDiv.outerHeight()})}};f.dpDiv.zIndex(a(b).zIndex()+1);a.datepicker._datepickerShowing=
+true;a.effects&&a.effects[j]?f.dpDiv.show(j,a.datepicker._get(f,"showOptions"),o,n):f.dpDiv[j||"show"](j?o:null,n);if(!j||!o)n();f.input.is(":visible")&&!f.input.is(":disabled")&&f.input.focus();a.datepicker._curInst=f}}}},_updateDatepicker:function(b){this.maxRows=4;var f=a.datepicker._getBorders(b.dpDiv);i=b;b.dpDiv.empty().append(this._generateHTML(b));var j=b.dpDiv.find("iframe.ui-datepicker-cover");j.length&&j.css({left:-f[0],top:-f[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()});
+b.dpDiv.find("."+this._dayOverClass+" a").mouseover();f=this._getNumberOfMonths(b);j=f[1];b.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");j>1&&b.dpDiv.addClass("ui-datepicker-multi-"+j).css("width",17*j+"em");b.dpDiv[(f[0]!=1||f[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");b.dpDiv[(this._get(b,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");b==a.datepicker._curInst&&a.datepicker._datepickerShowing&&b.input&&b.input.is(":visible")&&
+!b.input.is(":disabled")&&b.input[0]!=document.activeElement&&b.input.focus();if(b.yearshtml){var l=b.yearshtml;setTimeout(function(){l===b.yearshtml&&b.yearshtml&&b.dpDiv.find("select.ui-datepicker-year:first").replaceWith(b.yearshtml);l=b.yearshtml=null},0)}},_getBorders:function(b){var f=function(j){return{thin:1,medium:2,thick:3}[j]||j};return[parseFloat(f(b.css("border-left-width"))),parseFloat(f(b.css("border-top-width")))]},_checkOffset:function(b,f,j){var l=b.dpDiv.outerWidth(),o=b.dpDiv.outerHeight(),
+n=b.input?b.input.outerWidth():0,k=b.input?b.input.outerHeight():0,m=document.documentElement.clientWidth+a(document).scrollLeft(),p=document.documentElement.clientHeight+a(document).scrollTop();f.left-=this._get(b,"isRTL")?l-n:0;f.left-=j&&f.left==b.input.offset().left?a(document).scrollLeft():0;f.top-=j&&f.top==b.input.offset().top+k?a(document).scrollTop():0;f.left-=Math.min(f.left,f.left+l>m&&m>l?Math.abs(f.left+l-m):0);f.top-=Math.min(f.top,f.top+o>p&&p>o?Math.abs(o+k):0);return f},_findPos:function(b){for(var f=
+this._get(this._getInst(b),"isRTL");b&&(b.type=="hidden"||b.nodeType!=1||a.expr.filters.hidden(b));)b=b[f?"previousSibling":"nextSibling"];b=a(b).offset();return[b.left,b.top]},_triggerOnClose:function(b){var f=this._get(b,"onClose");if(f)f.apply(b.input?b.input[0]:null,[b.input?b.input.val():"",b])},_hideDatepicker:function(b){var f=this._curInst;if(!(!f||b&&f!=a.data(b,"datepicker")))if(this._datepickerShowing){b=this._get(f,"showAnim");var j=this._get(f,"duration"),l=function(){a.datepicker._tidyDialog(f);
+this._curInst=null};a.effects&&a.effects[b]?f.dpDiv.hide(b,a.datepicker._get(f,"showOptions"),j,l):f.dpDiv[b=="slideDown"?"slideUp":b=="fadeIn"?"fadeOut":"hide"](b?j:null,l);b||l();a.datepicker._triggerOnClose(f);this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",left:"0",top:"-100px"});if(a.blockUI){a.unblockUI();a("body").append(this.dpDiv)}}this._inDialog=false}},_tidyDialog:function(b){b.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},
+_checkExternalClick:function(b){if(a.datepicker._curInst){b=a(b.target);b[0].id!=a.datepicker._mainDivId&&b.parents("#"+a.datepicker._mainDivId).length==0&&!b.hasClass(a.datepicker.markerClassName)&&!b.hasClass(a.datepicker._triggerClass)&&a.datepicker._datepickerShowing&&!(a.datepicker._inDialog&&a.blockUI)&&a.datepicker._hideDatepicker()}},_adjustDate:function(b,f,j){b=a(b);var l=this._getInst(b[0]);if(!this._isDisabledDatepicker(b[0])){this._adjustInstDate(l,f+(j=="M"?this._get(l,"showCurrentAtPos"):
+0),j);this._updateDatepicker(l)}},_gotoToday:function(b){b=a(b);var f=this._getInst(b[0]);if(this._get(f,"gotoCurrent")&&f.currentDay){f.selectedDay=f.currentDay;f.drawMonth=f.selectedMonth=f.currentMonth;f.drawYear=f.selectedYear=f.currentYear}else{var j=new Date;f.selectedDay=j.getDate();f.drawMonth=f.selectedMonth=j.getMonth();f.drawYear=f.selectedYear=j.getFullYear()}this._notifyChange(f);this._adjustDate(b)},_selectMonthYear:function(b,f,j){b=a(b);var l=this._getInst(b[0]);l["selected"+(j=="M"?
+"Month":"Year")]=l["draw"+(j=="M"?"Month":"Year")]=parseInt(f.options[f.selectedIndex].value,10);this._notifyChange(l);this._adjustDate(b)},_selectDay:function(b,f,j,l){var o=a(b);if(!(a(l).hasClass(this._unselectableClass)||this._isDisabledDatepicker(o[0]))){o=this._getInst(o[0]);o.selectedDay=o.currentDay=a("a",l).html();o.selectedMonth=o.currentMonth=f;o.selectedYear=o.currentYear=j;this._selectDate(b,this._formatDate(o,o.currentDay,o.currentMonth,o.currentYear))}},_clearDate:function(b){b=a(b);
+this._getInst(b[0]);this._selectDate(b,"")},_selectDate:function(b,f){b=this._getInst(a(b)[0]);f=f!=null?f:this._formatDate(b);b.input&&b.input.val(f);this._updateAlternate(b);var j=this._get(b,"onSelect");if(j)j.apply(b.input?b.input[0]:null,[f,b]);else b.input&&b.input.trigger("change");if(b.inline)this._updateDatepicker(b);else{this._hideDatepicker();this._lastInput=b.input[0];typeof b.input[0]!="object"&&b.input.focus();this._lastInput=null}},_updateAlternate:function(b){var f=this._get(b,"altField");
+if(f){var j=this._get(b,"altFormat")||this._get(b,"dateFormat"),l=this._getDate(b),o=this.formatDate(j,l,this._getFormatConfig(b));a(f).each(function(){a(this).val(o)})}},noWeekends:function(b){b=b.getDay();return[b>0&&b<6,""]},iso8601Week:function(b){b=new Date(b.getTime());b.setDate(b.getDate()+4-(b.getDay()||7));var f=b.getTime();b.setMonth(0);b.setDate(1);return Math.floor(Math.round((f-b)/864E5)/7)+1},parseDate:function(b,f,j){if(b==null||f==null)throw"Invalid arguments";f=typeof f=="object"?
+f.toString():f+"";if(f=="")return null;var l=(j?j.shortYearCutoff:null)||this._defaults.shortYearCutoff;l=typeof l!="string"?l:(new Date).getFullYear()%100+parseInt(l,10);for(var o=(j?j.dayNamesShort:null)||this._defaults.dayNamesShort,n=(j?j.dayNames:null)||this._defaults.dayNames,k=(j?j.monthNamesShort:null)||this._defaults.monthNamesShort,m=(j?j.monthNames:null)||this._defaults.monthNames,p=j=-1,q=-1,s=-1,r=false,u=function(z){(z=H+1<b.length&&b.charAt(H+1)==z)&&H++;return z},v=function(z){var I=
+u(z);z=new RegExp("^\\d{1,"+(z=="@"?14:z=="!"?20:z=="y"&&I?4:z=="o"?3:2)+"}");z=f.substring(y).match(z);if(!z)throw"Missing number at position "+y;y+=z[0].length;return parseInt(z[0],10)},w=function(z,I,N){z=a.map(u(z)?N:I,function(D,E){return[[E,D]]}).sort(function(D,E){return-(D[1].length-E[1].length)});var J=-1;a.each(z,function(D,E){D=E[1];if(f.substr(y,D.length).toLowerCase()==D.toLowerCase()){J=E[0];y+=D.length;return false}});if(J!=-1)return J+1;else throw"Unknown name at position "+y;},x=
+function(){if(f.charAt(y)!=b.charAt(H))throw"Unexpected literal at position "+y;y++},y=0,H=0;H<b.length;H++)if(r)if(b.charAt(H)=="'"&&!u("'"))r=false;else x();else switch(b.charAt(H)){case "d":q=v("d");break;case "D":w("D",o,n);break;case "o":s=v("o");break;case "m":p=v("m");break;case "M":p=w("M",k,m);break;case "y":j=v("y");break;case "@":var C=new Date(v("@"));j=C.getFullYear();p=C.getMonth()+1;q=C.getDate();break;case "!":C=new Date((v("!")-this._ticksTo1970)/1E4);j=C.getFullYear();p=C.getMonth()+
+1;q=C.getDate();break;case "'":if(u("'"))x();else r=true;break;default:x()}if(y<f.length)throw"Extra/unparsed characters found in date: "+f.substring(y);if(j==-1)j=(new Date).getFullYear();else if(j<100)j+=(new Date).getFullYear()-(new Date).getFullYear()%100+(j<=l?0:-100);if(s>-1){p=1;q=s;do{l=this._getDaysInMonth(j,p-1);if(q<=l)break;p++;q-=l}while(1)}C=this._daylightSavingAdjust(new Date(j,p-1,q));if(C.getFullYear()!=j||C.getMonth()+1!=p||C.getDate()!=q)throw"Invalid date";return C},ATOM:"yy-mm-dd",
+COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1E7,formatDate:function(b,f,j){if(!f)return"";var l=(j?j.dayNamesShort:null)||this._defaults.dayNamesShort,o=(j?j.dayNames:null)||this._defaults.dayNames,n=(j?j.monthNamesShort:null)||this._defaults.monthNamesShort;j=(j?j.monthNames:
+null)||this._defaults.monthNames;var k=function(u){(u=r+1<b.length&&b.charAt(r+1)==u)&&r++;return u},m=function(u,v,w){v=""+v;if(k(u))for(;v.length<w;)v="0"+v;return v},p=function(u,v,w,x){return k(u)?x[v]:w[v]},q="",s=false;if(f)for(var r=0;r<b.length;r++)if(s)if(b.charAt(r)=="'"&&!k("'"))s=false;else q+=b.charAt(r);else switch(b.charAt(r)){case "d":q+=m("d",f.getDate(),2);break;case "D":q+=p("D",f.getDay(),l,o);break;case "o":q+=m("o",Math.round(((new Date(f.getFullYear(),f.getMonth(),f.getDate())).getTime()-
+(new Date(f.getFullYear(),0,0)).getTime())/864E5),3);break;case "m":q+=m("m",f.getMonth()+1,2);break;case "M":q+=p("M",f.getMonth(),n,j);break;case "y":q+=k("y")?f.getFullYear():(f.getYear()%100<10?"0":"")+f.getYear()%100;break;case "@":q+=f.getTime();break;case "!":q+=f.getTime()*1E4+this._ticksTo1970;break;case "'":if(k("'"))q+="'";else s=true;break;default:q+=b.charAt(r)}return q},_possibleChars:function(b){for(var f="",j=false,l=function(n){(n=o+1<b.length&&b.charAt(o+1)==n)&&o++;return n},o=
+0;o<b.length;o++)if(j)if(b.charAt(o)=="'"&&!l("'"))j=false;else f+=b.charAt(o);else switch(b.charAt(o)){case "d":case "m":case "y":case "@":f+="0123456789";break;case "D":case "M":return null;case "'":if(l("'"))f+="'";else j=true;break;default:f+=b.charAt(o)}return f},_get:function(b,f){return b.settings[f]!==d?b.settings[f]:this._defaults[f]},_setDateFromField:function(b,f){if(b.input.val()!=b.lastVal){var j=this._get(b,"dateFormat"),l=b.lastVal=b.input?b.input.val():null,o,n;o=n=this._getDefaultDate(b);
+var k=this._getFormatConfig(b);try{o=this.parseDate(j,l,k)||n}catch(m){this.log(m);l=f?"":l}b.selectedDay=o.getDate();b.drawMonth=b.selectedMonth=o.getMonth();b.drawYear=b.selectedYear=o.getFullYear();b.currentDay=l?o.getDate():0;b.currentMonth=l?o.getMonth():0;b.currentYear=l?o.getFullYear():0;this._adjustInstDate(b)}},_getDefaultDate:function(b){return this._restrictMinMax(b,this._determineDate(b,this._get(b,"defaultDate"),new Date))},_determineDate:function(b,f,j){var l=function(n){var k=new Date;
+k.setDate(k.getDate()+n);return k},o=function(n){try{return a.datepicker.parseDate(a.datepicker._get(b,"dateFormat"),n,a.datepicker._getFormatConfig(b))}catch(k){}var m=(n.toLowerCase().match(/^c/)?a.datepicker._getDate(b):null)||new Date,p=m.getFullYear(),q=m.getMonth();m=m.getDate();for(var s=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,r=s.exec(n);r;){switch(r[2]||"d"){case "d":case "D":m+=parseInt(r[1],10);break;case "w":case "W":m+=parseInt(r[1],10)*7;break;case "m":case "M":q+=parseInt(r[1],10);m=
+Math.min(m,a.datepicker._getDaysInMonth(p,q));break;case "y":case "Y":p+=parseInt(r[1],10);m=Math.min(m,a.datepicker._getDaysInMonth(p,q));break}r=s.exec(n)}return new Date(p,q,m)};if(f=(f=f==null||f===""?j:typeof f=="string"?o(f):typeof f=="number"?isNaN(f)?j:l(f):new Date(f.getTime()))&&f.toString()=="Invalid Date"?j:f){f.setHours(0);f.setMinutes(0);f.setSeconds(0);f.setMilliseconds(0)}return this._daylightSavingAdjust(f)},_daylightSavingAdjust:function(b){if(!b)return null;b.setHours(b.getHours()>
+12?b.getHours()+2:0);return b},_setDate:function(b,f,j){var l=!f,o=b.selectedMonth,n=b.selectedYear;f=this._restrictMinMax(b,this._determineDate(b,f,new Date));b.selectedDay=b.currentDay=f.getDate();b.drawMonth=b.selectedMonth=b.currentMonth=f.getMonth();b.drawYear=b.selectedYear=b.currentYear=f.getFullYear();if((o!=b.selectedMonth||n!=b.selectedYear)&&!j)this._notifyChange(b);this._adjustInstDate(b);if(b.input)b.input.val(l?"":this._formatDate(b))},_getDate:function(b){return!b.currentYear||b.input&&
+b.input.val()==""?null:this._daylightSavingAdjust(new Date(b.currentYear,b.currentMonth,b.currentDay))},_generateHTML:function(b){var f=new Date;f=this._daylightSavingAdjust(new Date(f.getFullYear(),f.getMonth(),f.getDate()));var j=this._get(b,"isRTL"),l=this._get(b,"showButtonPanel"),o=this._get(b,"hideIfNoPrevNext"),n=this._get(b,"navigationAsDateFormat"),k=this._getNumberOfMonths(b),m=this._get(b,"showCurrentAtPos"),p=this._get(b,"stepMonths"),q=k[0]!=1||k[1]!=1,s=this._daylightSavingAdjust(!b.currentDay?
+new Date(9999,9,9):new Date(b.currentYear,b.currentMonth,b.currentDay)),r=this._getMinMaxDate(b,"min"),u=this._getMinMaxDate(b,"max");m=b.drawMonth-m;var v=b.drawYear;if(m<0){m+=12;v--}if(u){var w=this._daylightSavingAdjust(new Date(u.getFullYear(),u.getMonth()-k[0]*k[1]+1,u.getDate()));for(w=r&&w<r?r:w;this._daylightSavingAdjust(new Date(v,m,1))>w;){m--;if(m<0){m=11;v--}}}b.drawMonth=m;b.drawYear=v;w=this._get(b,"prevText");w=!n?w:this.formatDate(w,this._daylightSavingAdjust(new Date(v,m-p,1)),this._getFormatConfig(b));
+w=this._canAdjustMonth(b,-1,v,m)?'<a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery_'+g+".datepicker._adjustDate('#"+b.id+"', -"+p+", 'M');\" title=\""+w+'"><span class="ui-icon ui-icon-circle-triangle-'+(j?"e":"w")+'">'+w+"</span></a>":o?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+w+'"><span class="ui-icon ui-icon-circle-triangle-'+(j?"e":"w")+'">'+w+"</span></a>";var x=this._get(b,"nextText");x=!n?x:this.formatDate(x,this._daylightSavingAdjust(new Date(v,
+m+p,1)),this._getFormatConfig(b));o=this._canAdjustMonth(b,+1,v,m)?'<a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery_'+g+".datepicker._adjustDate('#"+b.id+"', +"+p+", 'M');\" title=\""+x+'"><span class="ui-icon ui-icon-circle-triangle-'+(j?"w":"e")+'">'+x+"</span></a>":o?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+x+'"><span class="ui-icon ui-icon-circle-triangle-'+(j?"w":"e")+'">'+x+"</span></a>";p=this._get(b,"currentText");x=this._get(b,"gotoCurrent")&&
+b.currentDay?s:f;p=!n?p:this.formatDate(p,x,this._getFormatConfig(b));n=!b.inline?'<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="DP_jQuery_'+g+'.datepicker._hideDatepicker();">'+this._get(b,"closeText")+"</button>":"";l=l?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(j?n:"")+(this._isInRange(b,x)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="DP_jQuery_'+
+g+".datepicker._gotoToday('#"+b.id+"');\">"+p+"</button>":"")+(j?"":n)+"</div>":"";n=parseInt(this._get(b,"firstDay"),10);n=isNaN(n)?0:n;p=this._get(b,"showWeek");x=this._get(b,"dayNames");this._get(b,"dayNamesShort");var y=this._get(b,"dayNamesMin"),H=this._get(b,"monthNames"),C=this._get(b,"monthNamesShort"),z=this._get(b,"beforeShowDay"),I=this._get(b,"showOtherMonths"),N=this._get(b,"selectOtherMonths");this._get(b,"calculateWeek");for(var J=this._getDefaultDate(b),D="",E=0;E<k[0];E++){var P=
+"";this.maxRows=4;for(var L=0;L<k[1];L++){var Q=this._daylightSavingAdjust(new Date(v,m,b.selectedDay)),B=" ui-corner-all",F="";if(q){F+='<div class="ui-datepicker-group';if(k[1]>1)switch(L){case 0:F+=" ui-datepicker-group-first";B=" ui-corner-"+(j?"right":"left");break;case k[1]-1:F+=" ui-datepicker-group-last";B=" ui-corner-"+(j?"left":"right");break;default:F+=" ui-datepicker-group-middle";B="";break}F+='">'}F+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+B+'">'+(/all|left/.test(B)&&
+E==0?j?o:w:"")+(/all|right/.test(B)&&E==0?j?w:o:"")+this._generateMonthYearHeader(b,m,v,r,u,E>0||L>0,H,C)+'</div><table class="ui-datepicker-calendar"><thead><tr>';var G=p?'<th class="ui-datepicker-week-col">'+this._get(b,"weekHeader")+"</th>":"";for(B=0;B<7;B++){var A=(B+n)%7;G+="<th"+((B+n+6)%7>=5?' class="ui-datepicker-week-end"':"")+'><span title="'+x[A]+'">'+y[A]+"</span></th>"}F+=G+"</tr></thead><tbody>";G=this._getDaysInMonth(v,m);if(v==b.selectedYear&&m==b.selectedMonth)b.selectedDay=Math.min(b.selectedDay,
+G);B=(this._getFirstDayOfMonth(v,m)-n+7)%7;G=Math.ceil((B+G)/7);this.maxRows=G=q?this.maxRows>G?this.maxRows:G:G;A=this._daylightSavingAdjust(new Date(v,m,1-B));for(var R=0;R<G;R++){F+="<tr>";var S=!p?"":'<td class="ui-datepicker-week-col">'+this._get(b,"calculateWeek")(A)+"</td>";for(B=0;B<7;B++){var M=z?z.apply(b.input?b.input[0]:null,[A]):[true,""],K=A.getMonth()!=m,O=K&&!N||!M[0]||r&&A<r||u&&A>u;S+='<td class="'+((B+n+6)%7>=5?" ui-datepicker-week-end":"")+(K?" ui-datepicker-other-month":"")+(A.getTime()==
+Q.getTime()&&m==b.selectedMonth&&b._keyEvent||J.getTime()==A.getTime()&&J.getTime()==Q.getTime()?" "+this._dayOverClass:"")+(O?" "+this._unselectableClass+" ui-state-disabled":"")+(K&&!I?"":" "+M[1]+(A.getTime()==s.getTime()?" "+this._currentClass:"")+(A.getTime()==f.getTime()?" ui-datepicker-today":""))+'"'+((!K||I)&&M[2]?' title="'+M[2]+'"':"")+(O?"":' onclick="DP_jQuery_'+g+".datepicker._selectDay('#"+b.id+"',"+A.getMonth()+","+A.getFullYear()+', this);return false;"')+">"+(K&&!I?"&#xa0;":O?'<span class="ui-state-default">'+
+A.getDate()+"</span>":'<a class="ui-state-default'+(A.getTime()==f.getTime()?" ui-state-highlight":"")+(A.getTime()==s.getTime()?" ui-state-active":"")+(K?" ui-priority-secondary":"")+'" href="#">'+A.getDate()+"</a>")+"</td>";A.setDate(A.getDate()+1);A=this._daylightSavingAdjust(A)}F+=S+"</tr>"}m++;if(m>11){m=0;v++}F+="</tbody></table>"+(q?"</div>"+(k[0]>0&&L==k[1]-1?'<div class="ui-datepicker-row-break"></div>':""):"");P+=F}D+=P}D+=l+(a.browser.msie&&parseInt(a.browser.version,10)<7&&!b.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>':
+"");b._keyEvent=false;return D},_generateMonthYearHeader:function(b,f,j,l,o,n,k,m){var p=this._get(b,"changeMonth"),q=this._get(b,"changeYear"),s=this._get(b,"showMonthAfterYear"),r='<div class="ui-datepicker-title">',u="";if(n||!p)u+='<span class="ui-datepicker-month">'+k[f]+"</span>";else{k=l&&l.getFullYear()==j;var v=o&&o.getFullYear()==j;u+='<select class="ui-datepicker-month" onchange="DP_jQuery_'+g+".datepicker._selectMonthYear('#"+b.id+"', this, 'M');\" >";for(var w=0;w<12;w++)if((!k||w>=l.getMonth())&&
+(!v||w<=o.getMonth()))u+='<option value="'+w+'"'+(w==f?' selected="selected"':"")+">"+m[w]+"</option>";u+="</select>"}s||(r+=u+(n||!(p&&q)?"&#xa0;":""));if(!b.yearshtml){b.yearshtml="";if(n||!q)r+='<span class="ui-datepicker-year">'+j+"</span>";else{m=this._get(b,"yearRange").split(":");var x=(new Date).getFullYear();k=function(y){y=y.match(/c[+-].*/)?j+parseInt(y.substring(1),10):y.match(/[+-].*/)?x+parseInt(y,10):parseInt(y,10);return isNaN(y)?x:y};f=k(m[0]);m=Math.max(f,k(m[1]||""));f=l?Math.max(f,
+l.getFullYear()):f;m=o?Math.min(m,o.getFullYear()):m;for(b.yearshtml+='<select class="ui-datepicker-year" onchange="DP_jQuery_'+g+".datepicker._selectMonthYear('#"+b.id+"', this, 'Y');\" >";f<=m;f++)b.yearshtml+='<option value="'+f+'"'+(f==j?' selected="selected"':"")+">"+f+"</option>";b.yearshtml+="</select>";r+=b.yearshtml;b.yearshtml=null}}r+=this._get(b,"yearSuffix");if(s)r+=(n||!(p&&q)?"&#xa0;":"")+u;r+="</div>";return r},_adjustInstDate:function(b,f,j){var l=b.drawYear+(j=="Y"?f:0),o=b.drawMonth+
+(j=="M"?f:0);f=Math.min(b.selectedDay,this._getDaysInMonth(l,o))+(j=="D"?f:0);l=this._restrictMinMax(b,this._daylightSavingAdjust(new Date(l,o,f)));b.selectedDay=l.getDate();b.drawMonth=b.selectedMonth=l.getMonth();b.drawYear=b.selectedYear=l.getFullYear();if(j=="M"||j=="Y")this._notifyChange(b)},_restrictMinMax:function(b,f){var j=this._getMinMaxDate(b,"min");b=this._getMinMaxDate(b,"max");f=j&&f<j?j:f;return f=b&&f>b?b:f},_notifyChange:function(b){var f=this._get(b,"onChangeMonthYear");if(f)f.apply(b.input?
+b.input[0]:null,[b.selectedYear,b.selectedMonth+1,b])},_getNumberOfMonths:function(b){b=this._get(b,"numberOfMonths");return b==null?[1,1]:typeof b=="number"?[1,b]:b},_getMinMaxDate:function(b,f){return this._determineDate(b,this._get(b,f+"Date"),null)},_getDaysInMonth:function(b,f){return 32-this._daylightSavingAdjust(new Date(b,f,32)).getDate()},_getFirstDayOfMonth:function(b,f){return(new Date(b,f,1)).getDay()},_canAdjustMonth:function(b,f,j,l){var o=this._getNumberOfMonths(b);j=this._daylightSavingAdjust(new Date(j,
+l+(f<0?f:o[0]*o[1]),1));f<0&&j.setDate(this._getDaysInMonth(j.getFullYear(),j.getMonth()));return this._isInRange(b,j)},_isInRange:function(b,f){var j=this._getMinMaxDate(b,"min");b=this._getMinMaxDate(b,"max");return(!j||f.getTime()>=j.getTime())&&(!b||f.getTime()<=b.getTime())},_getFormatConfig:function(b){var f=this._get(b,"shortYearCutoff");f=typeof f!="string"?f:(new Date).getFullYear()%100+parseInt(f,10);return{shortYearCutoff:f,dayNamesShort:this._get(b,"dayNamesShort"),dayNames:this._get(b,
+"dayNames"),monthNamesShort:this._get(b,"monthNamesShort"),monthNames:this._get(b,"monthNames")}},_formatDate:function(b,f,j,l){if(!f){b.currentDay=b.selectedDay;b.currentMonth=b.selectedMonth;b.currentYear=b.selectedYear}f=f?typeof f=="object"?f:this._daylightSavingAdjust(new Date(l,j,f)):this._daylightSavingAdjust(new Date(b.currentYear,b.currentMonth,b.currentDay));return this.formatDate(this._get(b,"dateFormat"),f,this._getFormatConfig(b))}});a.fn.datepicker=function(b){if(!this.length)return this;
+if(!a.datepicker.initialized){a(document).mousedown(a.datepicker._checkExternalClick).find("body").append(a.datepicker.dpDiv);a.datepicker.initialized=true}var f=Array.prototype.slice.call(arguments,1);if(typeof b=="string"&&(b=="isDisabled"||b=="getDate"||b=="widget"))return a.datepicker["_"+b+"Datepicker"].apply(a.datepicker,[this[0]].concat(f));if(b=="option"&&arguments.length==2&&typeof arguments[1]=="string")return a.datepicker["_"+b+"Datepicker"].apply(a.datepicker,[this[0]].concat(f));return this.each(function(){typeof b==
+"string"?a.datepicker["_"+b+"Datepicker"].apply(a.datepicker,[this].concat(f)):a.datepicker._attachDatepicker(this,b)})};a.datepicker=new c;a.datepicker.initialized=false;a.datepicker.uuid=(new Date).getTime();a.datepicker.version="1.8.16";window["DP_jQuery_"+g]=a})(jQuery);
+(function(a,d){var c={buttons:true,height:true,maxHeight:true,maxWidth:true,minHeight:true,minWidth:true,width:true},e={maxHeight:true,maxWidth:true,minHeight:true,minWidth:true},h=a.attrFn||{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true,click:true};a.widget("ui.dialog",{options:{autoOpen:true,buttons:{},closeOnEscape:true,closeText:"close",dialogClass:"",draggable:true,hide:null,height:"auto",maxHeight:false,maxWidth:false,minHeight:150,minWidth:150,modal:false,
+position:{my:"center",at:"center",collision:"fit",using:function(g){var i=a(this).css(g).offset().top;i<0&&a(this).css("top",g.top-i)}},resizable:true,show:null,stack:true,title:"",width:300,zIndex:1E3},_create:function(){this.originalTitle=this.element.attr("title");if(typeof this.originalTitle!=="string")this.originalTitle="";this.options.title=this.options.title||this.originalTitle;var g=this,i=g.options,b=i.title||"&#160;",f=a.ui.dialog.getTitleId(g.element),j=(g.uiDialog=a("<div></div>")).appendTo(document.body).hide().addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+
+i.dialogClass).css({zIndex:i.zIndex}).attr("tabIndex",-1).css("outline",0).keydown(function(n){if(i.closeOnEscape&&!n.isDefaultPrevented()&&n.keyCode&&n.keyCode===a.ui.keyCode.ESCAPE){g.close(n);n.preventDefault()}}).attr({role:"dialog","aria-labelledby":f}).mousedown(function(n){g.moveToTop(false,n)});g.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(j);var l=(g.uiDialogTitlebar=a("<div></div>")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(j),
+o=a('<a href="#"></a>').addClass("ui-dialog-titlebar-close ui-corner-all").attr("role","button").hover(function(){o.addClass("ui-state-hover")},function(){o.removeClass("ui-state-hover")}).focus(function(){o.addClass("ui-state-focus")}).blur(function(){o.removeClass("ui-state-focus")}).click(function(n){g.close(n);return false}).appendTo(l);(g.uiDialogTitlebarCloseText=a("<span></span>")).addClass("ui-icon ui-icon-closethick").text(i.closeText).appendTo(o);a("<span></span>").addClass("ui-dialog-title").attr("id",
+f).html(b).prependTo(l);if(a.isFunction(i.beforeclose)&&!a.isFunction(i.beforeClose))i.beforeClose=i.beforeclose;l.find("*").add(l).disableSelection();i.draggable&&a.fn.draggable&&g._makeDraggable();i.resizable&&a.fn.resizable&&g._makeResizable();g._createButtons(i.buttons);g._isOpen=false;a.fn.bgiframe&&j.bgiframe()},_init:function(){this.options.autoOpen&&this.open()},destroy:function(){var g=this;g.overlay&&g.overlay.destroy();g.uiDialog.hide();g.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body");
+g.uiDialog.remove();g.originalTitle&&g.element.attr("title",g.originalTitle);return g},widget:function(){return this.uiDialog},close:function(g){var i=this,b,f;if(false!==i._trigger("beforeClose",g)){i.overlay&&i.overlay.destroy();i.uiDialog.unbind("keypress.ui-dialog");i._isOpen=false;if(i.options.hide)i.uiDialog.hide(i.options.hide,function(){i._trigger("close",g)});else{i.uiDialog.hide();i._trigger("close",g)}a.ui.dialog.overlay.resize();if(i.options.modal){b=0;a(".ui-dialog").each(function(){if(this!==
+i.uiDialog[0]){f=a(this).css("z-index");isNaN(f)||(b=Math.max(b,f))}});a.ui.dialog.maxZ=b}return i}},isOpen:function(){return this._isOpen},moveToTop:function(g,i){var b=this,f=b.options;if(f.modal&&!g||!f.stack&&!f.modal)return b._trigger("focus",i);if(f.zIndex>a.ui.dialog.maxZ)a.ui.dialog.maxZ=f.zIndex;if(b.overlay){a.ui.dialog.maxZ+=1;b.overlay.$el.css("z-index",a.ui.dialog.overlay.maxZ=a.ui.dialog.maxZ)}g={scrollTop:b.element.scrollTop(),scrollLeft:b.element.scrollLeft()};a.ui.dialog.maxZ+=1;
+b.uiDialog.css("z-index",a.ui.dialog.maxZ);b.element.attr(g);b._trigger("focus",i);return b},open:function(){if(!this._isOpen){var g=this,i=g.options,b=g.uiDialog;g.overlay=i.modal?new a.ui.dialog.overlay(g):null;g._size();g._position(i.position);b.show(i.show);g.moveToTop(true);i.modal&&b.bind("keypress.ui-dialog",function(f){if(f.keyCode===a.ui.keyCode.TAB){var j=a(":tabbable",this),l=j.filter(":first");j=j.filter(":last");if(f.target===j[0]&&!f.shiftKey){l.focus(1);return false}else if(f.target===
+l[0]&&f.shiftKey){j.focus(1);return false}}});a(g.element.find(":tabbable").get().concat(b.find(".ui-dialog-buttonpane :tabbable").get().concat(b.get()))).eq(0).focus();g._isOpen=true;g._trigger("open");return g}},_createButtons:function(g){var i=this,b=false,f=a("<div></div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),j=a("<div></div>").addClass("ui-dialog-buttonset").appendTo(f);i.uiDialog.find(".ui-dialog-buttonpane").remove();typeof g==="object"&&g!==null&&a.each(g,
+function(){return!(b=true)});if(b){a.each(g,function(l,o){o=a.isFunction(o)?{click:o,text:l}:o;var n=a('<button type="button"></button>').click(function(){o.click.apply(i.element[0],arguments)}).appendTo(j);a.each(o,function(k,m){if(k!=="click")k in h?n[k](m):n.attr(k,m)});a.fn.button&&n.button()});f.appendTo(i.uiDialog)}},_makeDraggable:function(){function g(l){return{position:l.position,offset:l.offset}}var i=this,b=i.options,f=a(document),j;i.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",
+handle:".ui-dialog-titlebar",containment:"document",start:function(l,o){j=b.height==="auto"?"auto":a(this).height();a(this).height(a(this).height()).addClass("ui-dialog-dragging");i._trigger("dragStart",l,g(o))},drag:function(l,o){i._trigger("drag",l,g(o))},stop:function(l,o){b.position=[o.position.left-f.scrollLeft(),o.position.top-f.scrollTop()];a(this).removeClass("ui-dialog-dragging").height(j);i._trigger("dragStop",l,g(o));a.ui.dialog.overlay.resize()}})},_makeResizable:function(g){function i(l){return{originalPosition:l.originalPosition,
+originalSize:l.originalSize,position:l.position,size:l.size}}g=g===d?this.options.resizable:g;var b=this,f=b.options,j=b.uiDialog.css("position");g=typeof g==="string"?g:"n,e,s,w,se,sw,ne,nw";b.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:b.element,maxWidth:f.maxWidth,maxHeight:f.maxHeight,minWidth:f.minWidth,minHeight:b._minHeight(),handles:g,start:function(l,o){a(this).addClass("ui-dialog-resizing");b._trigger("resizeStart",l,i(o))},resize:function(l,o){b._trigger("resize",
+l,i(o))},stop:function(l,o){a(this).removeClass("ui-dialog-resizing");f.height=a(this).height();f.width=a(this).width();b._trigger("resizeStop",l,i(o));a.ui.dialog.overlay.resize()}}).css("position",j).find(".ui-resizable-se").addClass("ui-icon ui-icon-grip-diagonal-se")},_minHeight:function(){var g=this.options;return g.height==="auto"?g.minHeight:Math.min(g.minHeight,g.height)},_position:function(g){var i=[],b=[0,0],f;if(g){if(typeof g==="string"||typeof g==="object"&&"0"in g){i=g.split?g.split(" "):
+[g[0],g[1]];if(i.length===1)i[1]=i[0];a.each(["left","top"],function(j,l){if(+i[j]===i[j]){b[j]=i[j];i[j]=l}});g={my:i.join(" "),at:i.join(" "),offset:b.join(" ")}}g=a.extend({},a.ui.dialog.prototype.options.position,g)}else g=a.ui.dialog.prototype.options.position;(f=this.uiDialog.is(":visible"))||this.uiDialog.show();this.uiDialog.css({top:0,left:0}).position(a.extend({of:window},g));f||this.uiDialog.hide()},_setOptions:function(g){var i=this,b={},f=false;a.each(g,function(j,l){i._setOption(j,l);
+if(j in c)f=true;if(j in e)b[j]=l});f&&this._size();this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option",b)},_setOption:function(g,i){var b=this,f=b.uiDialog;switch(g){case "beforeclose":g="beforeClose";break;case "buttons":b._createButtons(i);break;case "closeText":b.uiDialogTitlebarCloseText.text(""+i);break;case "dialogClass":f.removeClass(b.options.dialogClass).addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+i);break;case "disabled":i?f.addClass("ui-dialog-disabled"):
+f.removeClass("ui-dialog-disabled");break;case "draggable":var j=f.is(":data(draggable)");j&&!i&&f.draggable("destroy");!j&&i&&b._makeDraggable();break;case "position":b._position(i);break;case "resizable":(j=f.is(":data(resizable)"))&&!i&&f.resizable("destroy");j&&typeof i==="string"&&f.resizable("option","handles",i);!j&&i!==false&&b._makeResizable(i);break;case "title":a(".ui-dialog-title",b.uiDialogTitlebar).html(""+(i||"&#160;"));break}a.Widget.prototype._setOption.apply(b,arguments)},_size:function(){var g=
+this.options,i,b,f=this.uiDialog.is(":visible");this.element.show().css({width:"auto",minHeight:0,height:0});if(g.minWidth>g.width)g.width=g.minWidth;i=this.uiDialog.css({height:"auto",width:g.width}).height();b=Math.max(0,g.minHeight-i);if(g.height==="auto")if(a.support.minHeight)this.element.css({minHeight:b,height:"auto"});else{this.uiDialog.show();g=this.element.css("height","auto").height();f||this.uiDialog.hide();this.element.height(Math.max(g,b))}else this.element.height(Math.max(g.height-
+i,0));this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())}});a.extend(a.ui.dialog,{version:"1.8.16",uuid:0,maxZ:0,getTitleId:function(g){g=g.attr("id");if(!g){this.uuid+=1;g=this.uuid}return"ui-dialog-title-"+g},overlay:function(g){this.$el=a.ui.dialog.overlay.create(g)}});a.extend(a.ui.dialog.overlay,{instances:[],oldInstances:[],maxZ:0,events:a.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(g){return g+".dialog-overlay"}).join(" "),
+create:function(g){if(this.instances.length===0){setTimeout(function(){a.ui.dialog.overlay.instances.length&&a(document).bind(a.ui.dialog.overlay.events,function(b){if(a(b.target).zIndex()<a.ui.dialog.overlay.maxZ)return false})},1);a(document).bind("keydown.dialog-overlay",function(b){if(g.options.closeOnEscape&&!b.isDefaultPrevented()&&b.keyCode&&b.keyCode===a.ui.keyCode.ESCAPE){g.close(b);b.preventDefault()}});a(window).bind("resize.dialog-overlay",a.ui.dialog.overlay.resize)}var i=(this.oldInstances.pop()||
+a("<div></div>").addClass("ui-widget-overlay")).appendTo(document.body).css({width:this.width(),height:this.height()});a.fn.bgiframe&&i.bgiframe();this.instances.push(i);return i},destroy:function(g){var i=a.inArray(g,this.instances);i!=-1&&this.oldInstances.push(this.instances.splice(i,1)[0]);this.instances.length===0&&a([document,window]).unbind(".dialog-overlay");g.remove();var b=0;a.each(this.instances,function(){b=Math.max(b,this.css("z-index"))});this.maxZ=b},height:function(){var g,i;if(a.browser.msie&&
+a.browser.version<7){g=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight);i=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);return g<i?a(window).height()+"px":g+"px"}else return a(document).height()+"px"},width:function(){var g,i;if(a.browser.msie){g=Math.max(document.documentElement.scrollWidth,document.body.scrollWidth);i=Math.max(document.documentElement.offsetWidth,document.body.offsetWidth);return g<i?a(window).width()+"px":g+"px"}else return a(document).width()+
+"px"},resize:function(){var g=a([]);a.each(a.ui.dialog.overlay.instances,function(){g=g.add(this)});g.css({width:0,height:0}).css({width:a.ui.dialog.overlay.width(),height:a.ui.dialog.overlay.height()})}});a.extend(a.ui.dialog.overlay.prototype,{destroy:function(){a.ui.dialog.overlay.destroy(this.$el)}})})(jQuery);
+(function(a){a.ui=a.ui||{};var d=/left|center|right/,c=/top|center|bottom/,e=a.fn.position,h=a.fn.offset;a.fn.position=function(g){if(!g||!g.of)return e.apply(this,arguments);g=a.extend({},g);var i=a(g.of),b=i[0],f=(g.collision||"flip").split(" "),j=g.offset?g.offset.split(" "):[0,0],l,o,n;if(b.nodeType===9){l=i.width();o=i.height();n={top:0,left:0}}else if(b.setTimeout){l=i.width();o=i.height();n={top:i.scrollTop(),left:i.scrollLeft()}}else if(b.preventDefault){g.at="left top";l=o=0;n={top:g.of.pageY,
+left:g.of.pageX}}else{l=i.outerWidth();o=i.outerHeight();n=i.offset()}a.each(["my","at"],function(){var k=(g[this]||"").split(" ");if(k.length===1)k=d.test(k[0])?k.concat(["center"]):c.test(k[0])?["center"].concat(k):["center","center"];k[0]=d.test(k[0])?k[0]:"center";k[1]=c.test(k[1])?k[1]:"center";g[this]=k});if(f.length===1)f[1]=f[0];j[0]=parseInt(j[0],10)||0;if(j.length===1)j[1]=j[0];j[1]=parseInt(j[1],10)||0;if(g.at[0]==="right")n.left+=l;else if(g.at[0]==="center")n.left+=l/2;if(g.at[1]==="bottom")n.top+=
+o;else if(g.at[1]==="center")n.top+=o/2;n.left+=j[0];n.top+=j[1];return this.each(function(){var k=a(this),m=k.outerWidth(),p=k.outerHeight(),q=parseInt(a.curCSS(this,"marginLeft",true))||0,s=parseInt(a.curCSS(this,"marginTop",true))||0,r=m+q+(parseInt(a.curCSS(this,"marginRight",true))||0),u=p+s+(parseInt(a.curCSS(this,"marginBottom",true))||0),v=a.extend({},n),w;if(g.my[0]==="right")v.left-=m;else if(g.my[0]==="center")v.left-=m/2;if(g.my[1]==="bottom")v.top-=p;else if(g.my[1]==="center")v.top-=
+p/2;v.left=Math.round(v.left);v.top=Math.round(v.top);w={left:v.left-q,top:v.top-s};a.each(["left","top"],function(x,y){a.ui.position[f[x]]&&a.ui.position[f[x]][y](v,{targetWidth:l,targetHeight:o,elemWidth:m,elemHeight:p,collisionPosition:w,collisionWidth:r,collisionHeight:u,offset:j,my:g.my,at:g.at})});a.fn.bgiframe&&k.bgiframe();k.offset(a.extend(v,{using:g.using}))})};a.ui.position={fit:{left:function(g,i){var b=a(window);b=i.collisionPosition.left+i.collisionWidth-b.width()-b.scrollLeft();g.left=
+b>0?g.left-b:Math.max(g.left-i.collisionPosition.left,g.left)},top:function(g,i){var b=a(window);b=i.collisionPosition.top+i.collisionHeight-b.height()-b.scrollTop();g.top=b>0?g.top-b:Math.max(g.top-i.collisionPosition.top,g.top)}},flip:{left:function(g,i){if(i.at[0]!=="center"){var b=a(window);b=i.collisionPosition.left+i.collisionWidth-b.width()-b.scrollLeft();var f=i.my[0]==="left"?-i.elemWidth:i.my[0]==="right"?i.elemWidth:0,j=i.at[0]==="left"?i.targetWidth:-i.targetWidth,l=-2*i.offset[0];g.left+=
+i.collisionPosition.left<0?f+j+l:b>0?f+j+l:0}},top:function(g,i){if(i.at[1]!=="center"){var b=a(window);b=i.collisionPosition.top+i.collisionHeight-b.height()-b.scrollTop();var f=i.my[1]==="top"?-i.elemHeight:i.my[1]==="bottom"?i.elemHeight:0,j=i.at[1]==="top"?i.targetHeight:-i.targetHeight,l=-2*i.offset[1];g.top+=i.collisionPosition.top<0?f+j+l:b>0?f+j+l:0}}}};if(!a.offset.setOffset){a.offset.setOffset=function(g,i){if(/static/.test(a.curCSS(g,"position")))g.style.position="relative";var b=a(g),
+f=b.offset(),j=parseInt(a.curCSS(g,"top",true),10)||0,l=parseInt(a.curCSS(g,"left",true),10)||0;f={top:i.top-f.top+j,left:i.left-f.left+l};"using"in i?i.using.call(g,f):b.css(f)};a.fn.offset=function(g){var i=this[0];if(!i||!i.ownerDocument)return null;if(g)return this.each(function(){a.offset.setOffset(this,g)});return h.call(this)}}})(jQuery);
+(function(a,d){a.widget("ui.progressbar",{options:{value:0,max:100},min:0,_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min,"aria-valuemax":this.options.max,"aria-valuenow":this._value()});this.valueDiv=a("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element);this.oldValue=this._value();this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow");
+this.valueDiv.remove();a.Widget.prototype.destroy.apply(this,arguments)},value:function(c){if(c===d)return this._value();this._setOption("value",c);return this},_setOption:function(c,e){if(c==="value"){this.options.value=e;this._refreshValue();this._value()===this.options.max&&this._trigger("complete")}a.Widget.prototype._setOption.apply(this,arguments)},_value:function(){var c=this.options.value;if(typeof c!=="number")c=0;return Math.min(this.options.max,Math.max(this.min,c))},_percentage:function(){return 100*
+this._value()/this.options.max},_refreshValue:function(){var c=this.value(),e=this._percentage();if(this.oldValue!==c){this.oldValue=c;this._trigger("change")}this.valueDiv.toggle(c>this.min).toggleClass("ui-corner-right",c===this.options.max).width(e.toFixed(0)+"%");this.element.attr("aria-valuenow",c)}});a.extend(a.ui.progressbar,{version:"1.8.16"})})(jQuery);
+(function(a){a.widget("ui.slider",a.ui.mouse,{widgetEventPrefix:"slide",options:{animate:false,distance:0,max:100,min:0,orientation:"horizontal",range:false,step:1,value:0,values:null},_create:function(){var d=this,c=this.options,e=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),h=c.values&&c.values.length||1,g=[];this._mouseSliding=this._keySliding=false;this._animateOff=true;this._handleIndex=null;this._detectOrientation();this._mouseInit();this.element.addClass("ui-slider ui-slider-"+
+this.orientation+" ui-widget ui-widget-content ui-corner-all"+(c.disabled?" ui-slider-disabled ui-disabled":""));this.range=a([]);if(c.range){if(c.range===true){if(!c.values)c.values=[this._valueMin(),this._valueMin()];if(c.values.length&&c.values.length!==2)c.values=[c.values[0],c.values[0]]}this.range=a("<div></div>").appendTo(this.element).addClass("ui-slider-range ui-widget-header"+(c.range==="min"||c.range==="max"?" ui-slider-range-"+c.range:""))}for(var i=e.length;i<h;i+=1)g.push("<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>");
+this.handles=e.add(a(g.join("")).appendTo(d.element));this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(b){b.preventDefault()}).hover(function(){c.disabled||a(this).addClass("ui-state-hover")},function(){a(this).removeClass("ui-state-hover")}).focus(function(){if(c.disabled)a(this).blur();else{a(".ui-slider .ui-state-focus").removeClass("ui-state-focus");a(this).addClass("ui-state-focus")}}).blur(function(){a(this).removeClass("ui-state-focus")});this.handles.each(function(b){a(this).data("index.ui-slider-handle",
+b)});this.handles.keydown(function(b){var f=true,j=a(this).data("index.ui-slider-handle"),l,o,n;if(!d.options.disabled){switch(b.keyCode){case a.ui.keyCode.HOME:case a.ui.keyCode.END:case a.ui.keyCode.PAGE_UP:case a.ui.keyCode.PAGE_DOWN:case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:case a.ui.keyCode.DOWN:case a.ui.keyCode.LEFT:f=false;if(!d._keySliding){d._keySliding=true;a(this).addClass("ui-state-active");l=d._start(b,j);if(l===false)return}break}n=d.options.step;l=d.options.values&&d.options.values.length?
+(o=d.values(j)):(o=d.value());switch(b.keyCode){case a.ui.keyCode.HOME:o=d._valueMin();break;case a.ui.keyCode.END:o=d._valueMax();break;case a.ui.keyCode.PAGE_UP:o=d._trimAlignValue(l+(d._valueMax()-d._valueMin())/5);break;case a.ui.keyCode.PAGE_DOWN:o=d._trimAlignValue(l-(d._valueMax()-d._valueMin())/5);break;case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:if(l===d._valueMax())return;o=d._trimAlignValue(l+n);break;case a.ui.keyCode.DOWN:case a.ui.keyCode.LEFT:if(l===d._valueMin())return;o=d._trimAlignValue(l-
+n);break}d._slide(b,j,o);return f}}).keyup(function(b){var f=a(this).data("index.ui-slider-handle");if(d._keySliding){d._keySliding=false;d._stop(b,f);d._change(b,f);a(this).removeClass("ui-state-active")}});this._refreshValue();this._animateOff=false},destroy:function(){this.handles.remove();this.range.remove();this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider");this._mouseDestroy();
+return this},_mouseCapture:function(d){var c=this.options,e,h,g,i,b;if(c.disabled)return false;this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();e=this._normValueFromMouse({x:d.pageX,y:d.pageY});h=this._valueMax()-this._valueMin()+1;i=this;this.handles.each(function(f){var j=Math.abs(e-i.values(f));if(h>j){h=j;g=a(this);b=f}});if(c.range===true&&this.values(1)===c.min){b+=1;g=a(this.handles[b])}if(this._start(d,b)===false)return false;
+this._mouseSliding=true;i._handleIndex=b;g.addClass("ui-state-active").focus();c=g.offset();this._clickOffset=!a(d.target).parents().andSelf().is(".ui-slider-handle")?{left:0,top:0}:{left:d.pageX-c.left-g.width()/2,top:d.pageY-c.top-g.height()/2-(parseInt(g.css("borderTopWidth"),10)||0)-(parseInt(g.css("borderBottomWidth"),10)||0)+(parseInt(g.css("marginTop"),10)||0)};this.handles.hasClass("ui-state-hover")||this._slide(d,b,e);return this._animateOff=true},_mouseStart:function(){return true},_mouseDrag:function(d){var c=
+this._normValueFromMouse({x:d.pageX,y:d.pageY});this._slide(d,this._handleIndex,c);return false},_mouseStop:function(d){this.handles.removeClass("ui-state-active");this._mouseSliding=false;this._stop(d,this._handleIndex);this._change(d,this._handleIndex);this._clickOffset=this._handleIndex=null;return this._animateOff=false},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(d){var c;if(this.orientation==="horizontal"){c=
+this.elementSize.width;d=d.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)}else{c=this.elementSize.height;d=d.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)}c=d/c;if(c>1)c=1;if(c<0)c=0;if(this.orientation==="vertical")c=1-c;d=this._valueMax()-this._valueMin();return this._trimAlignValue(this._valueMin()+c*d)},_start:function(d,c){var e={handle:this.handles[c],value:this.value()};if(this.options.values&&this.options.values.length){e.value=this.values(c);
+e.values=this.values()}return this._trigger("start",d,e)},_slide:function(d,c,e){var h;if(this.options.values&&this.options.values.length){h=this.values(c?0:1);if(this.options.values.length===2&&this.options.range===true&&(c===0&&e>h||c===1&&e<h))e=h;if(e!==this.values(c)){h=this.values();h[c]=e;d=this._trigger("slide",d,{handle:this.handles[c],value:e,values:h});this.values(c?0:1);d!==false&&this.values(c,e,true)}}else if(e!==this.value()){d=this._trigger("slide",d,{handle:this.handles[c],value:e});
+d!==false&&this.value(e)}},_stop:function(d,c){var e={handle:this.handles[c],value:this.value()};if(this.options.values&&this.options.values.length){e.value=this.values(c);e.values=this.values()}this._trigger("stop",d,e)},_change:function(d,c){if(!this._keySliding&&!this._mouseSliding){var e={handle:this.handles[c],value:this.value()};if(this.options.values&&this.options.values.length){e.value=this.values(c);e.values=this.values()}this._trigger("change",d,e)}},value:function(d){if(arguments.length){this.options.value=
+this._trimAlignValue(d);this._refreshValue();this._change(null,0)}else return this._value()},values:function(d,c){var e,h,g;if(arguments.length>1){this.options.values[d]=this._trimAlignValue(c);this._refreshValue();this._change(null,d)}else if(arguments.length)if(a.isArray(arguments[0])){e=this.options.values;h=arguments[0];for(g=0;g<e.length;g+=1){e[g]=this._trimAlignValue(h[g]);this._change(null,g)}this._refreshValue()}else return this.options.values&&this.options.values.length?this._values(d):
+this.value();else return this._values()},_setOption:function(d,c){var e,h=0;if(a.isArray(this.options.values))h=this.options.values.length;a.Widget.prototype._setOption.apply(this,arguments);switch(d){case "disabled":if(c){this.handles.filter(".ui-state-focus").blur();this.handles.removeClass("ui-state-hover");this.handles.propAttr("disabled",true);this.element.addClass("ui-disabled")}else{this.handles.propAttr("disabled",false);this.element.removeClass("ui-disabled")}break;case "orientation":this._detectOrientation();
+this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation);this._refreshValue();break;case "value":this._animateOff=true;this._refreshValue();this._change(null,0);this._animateOff=false;break;case "values":this._animateOff=true;this._refreshValue();for(e=0;e<h;e+=1)this._change(null,e);this._animateOff=false;break}},_value:function(){var d=this.options.value;return d=this._trimAlignValue(d)},_values:function(d){var c,e;if(arguments.length){c=this.options.values[d];
+return c=this._trimAlignValue(c)}else{c=this.options.values.slice();for(e=0;e<c.length;e+=1)c[e]=this._trimAlignValue(c[e]);return c}},_trimAlignValue:function(d){if(d<=this._valueMin())return this._valueMin();if(d>=this._valueMax())return this._valueMax();var c=this.options.step>0?this.options.step:1,e=(d-this._valueMin())%c;d=d-e;if(Math.abs(e)*2>=c)d+=e>0?c:-c;return parseFloat(d.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var d=
+this.options.range,c=this.options,e=this,h=!this._animateOff?c.animate:false,g,i={},b,f,j,l;if(this.options.values&&this.options.values.length)this.handles.each(function(o){g=(e.values(o)-e._valueMin())/(e._valueMax()-e._valueMin())*100;i[e.orientation==="horizontal"?"left":"bottom"]=g+"%";a(this).stop(1,1)[h?"animate":"css"](i,c.animate);if(e.options.range===true)if(e.orientation==="horizontal"){if(o===0)e.range.stop(1,1)[h?"animate":"css"]({left:g+"%"},c.animate);if(o===1)e.range[h?"animate":"css"]({width:g-
+b+"%"},{queue:false,duration:c.animate})}else{if(o===0)e.range.stop(1,1)[h?"animate":"css"]({bottom:g+"%"},c.animate);if(o===1)e.range[h?"animate":"css"]({height:g-b+"%"},{queue:false,duration:c.animate})}b=g});else{f=this.value();j=this._valueMin();l=this._valueMax();g=l!==j?(f-j)/(l-j)*100:0;i[e.orientation==="horizontal"?"left":"bottom"]=g+"%";this.handle.stop(1,1)[h?"animate":"css"](i,c.animate);if(d==="min"&&this.orientation==="horizontal")this.range.stop(1,1)[h?"animate":"css"]({width:g+"%"},
+c.animate);if(d==="max"&&this.orientation==="horizontal")this.range[h?"animate":"css"]({width:100-g+"%"},{queue:false,duration:c.animate});if(d==="min"&&this.orientation==="vertical")this.range.stop(1,1)[h?"animate":"css"]({height:g+"%"},c.animate);if(d==="max"&&this.orientation==="vertical")this.range[h?"animate":"css"]({height:100-g+"%"},{queue:false,duration:c.animate})}}});a.extend(a.ui.slider,{version:"1.8.16"})})(jQuery);
+(function(a,d){function c(){return++h}function e(){return++g}var h=0,g=0;a.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:false,cookie:null,collapsible:false,disable:null,disabled:[],enable:null,event:"click",fx:null,idPrefix:"ui-tabs-",load:null,panelTemplate:"<div></div>",remove:null,select:null,show:null,spinner:"<em>Loading&#8230;</em>",tabTemplate:"<li><a href='#{href}'><span>#{label}</span></a></li>"},_create:function(){this._tabify(true)},_setOption:function(i,b){if(i=="selected")this.options.collapsible&&
+b==this.options.selected||this.select(b);else{this.options[i]=b;this._tabify()}},_tabId:function(i){return i.title&&i.title.replace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix+c()},_sanitizeSelector:function(i){return i.replace(/:/g,"\\:")},_cookie:function(){var i=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+e());return a.cookie.apply(null,[i].concat(a.makeArray(arguments)))},_ui:function(i,b){return{tab:i,panel:b,index:this.anchors.index(i)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var i=
+a(this);i.html(i.data("label.tabs")).removeData("label.tabs")})},_tabify:function(i){function b(r,u){r.css("display","");!a.support.opacity&&u.opacity&&r[0].style.removeAttribute("filter")}var f=this,j=this.options,l=/^#.+/;this.list=this.element.find("ol,ul").eq(0);this.lis=a(" > li:has(a[href])",this.list);this.anchors=this.lis.map(function(){return a("a",this)[0]});this.panels=a([]);this.anchors.each(function(r,u){var v=a(u).attr("href"),w=v.split("#")[0],x;if(w&&(w===location.toString().split("#")[0]||
+(x=a("base")[0])&&w===x.href)){v=u.hash;u.href=v}if(l.test(v))f.panels=f.panels.add(f.element.find(f._sanitizeSelector(v)));else if(v&&v!=="#"){a.data(u,"href.tabs",v);a.data(u,"load.tabs",v.replace(/#.*$/,""));v=f._tabId(u);u.href="#"+v;u=f.element.find("#"+v);if(!u.length){u=a(j.panelTemplate).attr("id",v).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").insertAfter(f.panels[r-1]||f.list);u.data("destroy.tabs",true)}f.panels=f.panels.add(u)}else j.disabled.push(r)});if(i){this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all");
+this.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.lis.addClass("ui-state-default ui-corner-top");this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom");if(j.selected===d){location.hash&&this.anchors.each(function(r,u){if(u.hash==location.hash){j.selected=r;return false}});if(typeof j.selected!=="number"&&j.cookie)j.selected=parseInt(f._cookie(),10);if(typeof j.selected!=="number"&&this.lis.filter(".ui-tabs-selected").length)j.selected=
+this.lis.index(this.lis.filter(".ui-tabs-selected"));j.selected=j.selected||(this.lis.length?0:-1)}else if(j.selected===null)j.selected=-1;j.selected=j.selected>=0&&this.anchors[j.selected]||j.selected<0?j.selected:0;j.disabled=a.unique(j.disabled.concat(a.map(this.lis.filter(".ui-state-disabled"),function(r){return f.lis.index(r)}))).sort();a.inArray(j.selected,j.disabled)!=-1&&j.disabled.splice(a.inArray(j.selected,j.disabled),1);this.panels.addClass("ui-tabs-hide");this.lis.removeClass("ui-tabs-selected ui-state-active");
+if(j.selected>=0&&this.anchors.length){f.element.find(f._sanitizeSelector(f.anchors[j.selected].hash)).removeClass("ui-tabs-hide");this.lis.eq(j.selected).addClass("ui-tabs-selected ui-state-active");f.element.queue("tabs",function(){f._trigger("show",null,f._ui(f.anchors[j.selected],f.element.find(f._sanitizeSelector(f.anchors[j.selected].hash))[0]))});this.load(j.selected)}a(window).bind("unload",function(){f.lis.add(f.anchors).unbind(".tabs");f.lis=f.anchors=f.panels=null})}else j.selected=this.lis.index(this.lis.filter(".ui-tabs-selected"));
+this.element[j.collapsible?"addClass":"removeClass"]("ui-tabs-collapsible");j.cookie&&this._cookie(j.selected,j.cookie);i=0;for(var o;o=this.lis[i];i++)a(o)[a.inArray(i,j.disabled)!=-1&&!a(o).hasClass("ui-tabs-selected")?"addClass":"removeClass"]("ui-state-disabled");j.cache===false&&this.anchors.removeData("cache.tabs");this.lis.add(this.anchors).unbind(".tabs");if(j.event!=="mouseover"){var n=function(r,u){u.is(":not(.ui-state-disabled)")&&u.addClass("ui-state-"+r)},k=function(r,u){u.removeClass("ui-state-"+
+r)};this.lis.bind("mouseover.tabs",function(){n("hover",a(this))});this.lis.bind("mouseout.tabs",function(){k("hover",a(this))});this.anchors.bind("focus.tabs",function(){n("focus",a(this).closest("li"))});this.anchors.bind("blur.tabs",function(){k("focus",a(this).closest("li"))})}var m,p;if(j.fx)if(a.isArray(j.fx)){m=j.fx[0];p=j.fx[1]}else m=p=j.fx;var q=p?function(r,u){a(r).closest("li").addClass("ui-tabs-selected ui-state-active");u.hide().removeClass("ui-tabs-hide").animate(p,p.duration||"normal",
+function(){b(u,p);f._trigger("show",null,f._ui(r,u[0]))})}:function(r,u){a(r).closest("li").addClass("ui-tabs-selected ui-state-active");u.removeClass("ui-tabs-hide");f._trigger("show",null,f._ui(r,u[0]))},s=m?function(r,u){u.animate(m,m.duration||"normal",function(){f.lis.removeClass("ui-tabs-selected ui-state-active");u.addClass("ui-tabs-hide");b(u,m);f.element.dequeue("tabs")})}:function(r,u){f.lis.removeClass("ui-tabs-selected ui-state-active");u.addClass("ui-tabs-hide");f.element.dequeue("tabs")};
+this.anchors.bind(j.event+".tabs",function(){var r=this,u=a(r).closest("li"),v=f.panels.filter(":not(.ui-tabs-hide)"),w=f.element.find(f._sanitizeSelector(r.hash));if(u.hasClass("ui-tabs-selected")&&!j.collapsible||u.hasClass("ui-state-disabled")||u.hasClass("ui-state-processing")||f.panels.filter(":animated").length||f._trigger("select",null,f._ui(this,w[0]))===false){this.blur();return false}j.selected=f.anchors.index(this);f.abort();if(j.collapsible)if(u.hasClass("ui-tabs-selected")){j.selected=
+-1;j.cookie&&f._cookie(j.selected,j.cookie);f.element.queue("tabs",function(){s(r,v)}).dequeue("tabs");this.blur();return false}else if(!v.length){j.cookie&&f._cookie(j.selected,j.cookie);f.element.queue("tabs",function(){q(r,w)});f.load(f.anchors.index(this));this.blur();return false}j.cookie&&f._cookie(j.selected,j.cookie);if(w.length){v.length&&f.element.queue("tabs",function(){s(r,v)});f.element.queue("tabs",function(){q(r,w)});f.load(f.anchors.index(this))}else throw"jQuery UI Tabs: Mismatching fragment identifier.";
+a.browser.msie&&this.blur()});this.anchors.bind("click.tabs",function(){return false})},_getIndex:function(i){if(typeof i=="string")i=this.anchors.index(this.anchors.filter("[href$="+i+"]"));return i},destroy:function(){var i=this.options;this.abort();this.element.unbind(".tabs").removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible").removeData("tabs");this.list.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.anchors.each(function(){var b=
+a.data(this,"href.tabs");if(b)this.href=b;var f=a(this).unbind(".tabs");a.each(["href","load","cache"],function(j,l){f.removeData(l+".tabs")})});this.lis.unbind(".tabs").add(this.panels).each(function(){a.data(this,"destroy.tabs")?a(this).remove():a(this).removeClass("ui-state-default ui-corner-top ui-tabs-selected ui-state-active ui-state-hover ui-state-focus ui-state-disabled ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide")});i.cookie&&this._cookie(null,i.cookie);return this},add:function(i,
+b,f){if(f===d)f=this.anchors.length;var j=this,l=this.options;b=a(l.tabTemplate.replace(/#\{href\}/g,i).replace(/#\{label\}/g,b));i=!i.indexOf("#")?i.replace("#",""):this._tabId(a("a",b)[0]);b.addClass("ui-state-default ui-corner-top").data("destroy.tabs",true);var o=j.element.find("#"+i);o.length||(o=a(l.panelTemplate).attr("id",i).data("destroy.tabs",true));o.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide");if(f>=this.lis.length){b.appendTo(this.list);o.appendTo(this.list[0].parentNode)}else{b.insertBefore(this.lis[f]);
+o.insertBefore(this.panels[f])}l.disabled=a.map(l.disabled,function(n){return n>=f?++n:n});this._tabify();if(this.anchors.length==1){l.selected=0;b.addClass("ui-tabs-selected ui-state-active");o.removeClass("ui-tabs-hide");this.element.queue("tabs",function(){j._trigger("show",null,j._ui(j.anchors[0],j.panels[0]))});this.load(0)}this._trigger("add",null,this._ui(this.anchors[f],this.panels[f]));return this},remove:function(i){i=this._getIndex(i);var b=this.options,f=this.lis.eq(i).remove(),j=this.panels.eq(i).remove();
+if(f.hasClass("ui-tabs-selected")&&this.anchors.length>1)this.select(i+(i+1<this.anchors.length?1:-1));b.disabled=a.map(a.grep(b.disabled,function(l){return l!=i}),function(l){return l>=i?--l:l});this._tabify();this._trigger("remove",null,this._ui(f.find("a")[0],j[0]));return this},enable:function(i){i=this._getIndex(i);var b=this.options;if(a.inArray(i,b.disabled)!=-1){this.lis.eq(i).removeClass("ui-state-disabled");b.disabled=a.grep(b.disabled,function(f){return f!=i});this._trigger("enable",null,
+this._ui(this.anchors[i],this.panels[i]));return this}},disable:function(i){i=this._getIndex(i);var b=this.options;if(i!=b.selected){this.lis.eq(i).addClass("ui-state-disabled");b.disabled.push(i);b.disabled.sort();this._trigger("disable",null,this._ui(this.anchors[i],this.panels[i]))}return this},select:function(i){i=this._getIndex(i);if(i==-1)if(this.options.collapsible&&this.options.selected!=-1)i=this.options.selected;else return this;this.anchors.eq(i).trigger(this.options.event+".tabs");return this},
+load:function(i){i=this._getIndex(i);var b=this,f=this.options,j=this.anchors.eq(i)[0],l=a.data(j,"load.tabs");this.abort();if(!l||this.element.queue("tabs").length!==0&&a.data(j,"cache.tabs"))this.element.dequeue("tabs");else{this.lis.eq(i).addClass("ui-state-processing");if(f.spinner){var o=a("span",j);o.data("label.tabs",o.html()).html(f.spinner)}this.xhr=a.ajax(a.extend({},f.ajaxOptions,{url:l,success:function(n,k){b.element.find(b._sanitizeSelector(j.hash)).html(n);b._cleanup();f.cache&&a.data(j,
+"cache.tabs",true);b._trigger("load",null,b._ui(b.anchors[i],b.panels[i]));try{f.ajaxOptions.success(n,k)}catch(m){}},error:function(n,k){b._cleanup();b._trigger("load",null,b._ui(b.anchors[i],b.panels[i]));try{f.ajaxOptions.error(n,k,i,j)}catch(m){}}}));b.element.dequeue("tabs");return this}},abort:function(){this.element.queue([]);this.panels.stop(false,true);this.element.queue("tabs",this.element.queue("tabs").splice(-2,2));if(this.xhr){this.xhr.abort();delete this.xhr}this._cleanup();return this},
+url:function(i,b){this.anchors.eq(i).removeData("cache.tabs").data("load.tabs",b);return this},length:function(){return this.anchors.length}});a.extend(a.ui.tabs,{version:"1.8.16"});a.extend(a.ui.tabs.prototype,{rotation:null,rotate:function(i,b){var f=this,j=this.options,l=f._rotate||(f._rotate=function(o){clearTimeout(f.rotation);f.rotation=setTimeout(function(){var n=j.selected;f.select(++n<f.anchors.length?n:0)},i);o&&o.stopPropagation()});b=f._unrotate||(f._unrotate=!b?function(o){o.clientX&&
+f.rotate(null)}:function(){t=j.selected;l()});if(i){this.element.bind("tabsshow",l);this.anchors.bind(j.event+".tabs",b);l()}else{clearTimeout(f.rotation);this.element.unbind("tabsshow",l);this.anchors.unbind(j.event+".tabs",b);delete this._rotate;delete this._unrotate}return this}})})(jQuery);
diff --git a/web/js/jquery.min.js b/web/js/jquery.min.js
new file mode 100644
index 000000000..198b3ff07
--- /dev/null
+++ b/web/js/jquery.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.7.1 jquery.com | jquery.org/license */
+(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cv(a){if(!ck[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){cl||(cl=c.createElement("iframe"),cl.frameBorder=cl.width=cl.height=0),b.appendChild(cl);if(!cm||!cl.createElement)cm=(cl.contentWindow||cl.contentDocument).document,cm.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),cm.close();d=cm.createElement(a),cm.body.appendChild(d),e=f.css(d,"display"),b.removeChild(cl)}ck[a]=e}return ck[a]}function cu(a,b){var c={};f.each(cq.concat.apply([],cq.slice(0,b)),function(){c[this]=a});return c}function ct(){cr=b}function cs(){setTimeout(ct,0);return cr=f.now()}function cj(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ci(){try{return new a.XMLHttpRequest}catch(b){}}function cc(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function cb(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function ca(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bE.test(a)?d(a,e):ca(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)ca(a+"["+e+"]",b[e],c,d);else d(a,b)}function b_(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function b$(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bT,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=b$(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=b$(a,c,d,e,"*",g));return l}function bZ(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bP),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bC(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bx:by,g=0,h=e.length;if(d>0){if(c!=="border")for(;g<h;g++)c||(d-=parseFloat(f.css(a,"padding"+e[g]))||0),c==="margin"?d+=parseFloat(f.css(a,c+e[g]))||0:d-=parseFloat(f.css(a,"border"+e[g]+"Width"))||0;return d+"px"}d=bz(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0;if(c)for(;g<h;g++)d+=parseFloat(f.css(a,"padding"+e[g]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+e[g]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+e[g]))||0);return d+"px"}function bp(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c+(i[c][d].namespace?".":"")+i[c][d].namespace,i[c][d],i[c][d].data)}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.1",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?m(g):h==="function"&&(!a.unique||!o.has(g))&&c.push(g)},n=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,l=j||0,j=0,k=c.length;for(;c&&l<k;l++)if(c[l].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}i=!1,c&&(a.once?e===!0?o.disable():c=[]:d&&d.length&&(e=d.shift(),o.fireWith(e[0],e[1])))},o={add:function(){if(c){var a=c.length;m(arguments),i?k=c.length:e&&e!==!0&&(j=a,n(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){i&&f<=k&&(k--,f<=l&&l--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&o.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(i?a.once||d.push([b,c]):(!a.once||!e)&&n(b,c));return this},fire:function(){o.fireWith(this,arguments);return this},fired:function(){return!!e}};return o};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function(){g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p,q=c.createElement("div"),r=c.documentElement;q.setAttribute("className","t"),q.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=q.getElementsByTagName("*"),e=q.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=q.getElementsByTagName("input")[0],b={leadingWhitespace:q.firstChild.nodeType===3,tbody:!q.getElementsByTagName("tbody").length,htmlSerialize:!!q.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:q.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete q.test}catch(s){b.deleteExpando=!1}!q.addEventListener&&q.attachEvent&&q.fireEvent&&(q.attachEvent("onclick",function(){b.noCloneEvent=!1}),q.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),q.appendChild(i),k=c.createDocumentFragment(),k.appendChild(q.lastChild),b.checkClone=k.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,k.removeChild(i),k.appendChild(q),q.innerHTML="",a.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",q.style.width="2px",q.appendChild(j),b.reliableMarginRight=(parseInt((a.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(q.attachEvent)for(o in{submit:1,change:1,focusin:1})n="on"+o,p=n in q,p||(q.setAttribute(n,"return;"),p=typeof q[n]=="function"),b[o+"Bubbles"]=p;k.removeChild(q),k=g=h=j=q=i=null,f(function(){var a,d,e,g,h,i,j,k,m,n,o,r=c.getElementsByTagName("body")[0];!r||(j=1,k="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",m="visibility:hidden;border:0;",n="style='"+k+"border:5px solid #000;padding:0;'",o="<div "+n+"><div></div></div>"+"<table "+n+" cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",a=c.createElement("div"),a.style.cssText=m+"width:0;height:0;position:static;top:0;margin-top:"+j+"px",r.insertBefore(a,r.firstChild),q=c.createElement("div"),a.appendChild(q),q.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",l=q.getElementsByTagName("td"),p=l[0].offsetHeight===0,l[0].style.display="",l[1].style.display="none",b.reliableHiddenOffsets=p&&l[0].offsetHeight===0,q.innerHTML="",q.style.width=q.style.paddingLeft="1px",f.boxModel=b.boxModel=q.offsetWidth===2,typeof q.style.zoom!="undefined"&&(q.style.display="inline",q.style.zoom=1,b.inlineBlockNeedsLayout=q.offsetWidth===2,q.style.display="",q.innerHTML="<div style='width:4px;'></div>",b.shrinkWrapBlocks=q.offsetWidth!==2),q.style.cssText=k+m,q.innerHTML=o,d=q.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,i={doesNotAddBorder:e.offsetTop!==5,doesAddBorderForTableAndCells:h.offsetTop===5},e.style.position="fixed",e.style.top="20px",i.fixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",i.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,i.doesNotIncludeMarginInBodyOffset=r.offsetTop!==j,r.removeChild(a),q=a=null,f.extend(b,i))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h=null;if(typeof a=="undefined"){if(this.length){h=f.data(this[0]);if(this[0].nodeType===1&&!f._data(this[0],"parsedAttrs")){e=this[0].attributes;for(var i=0,j=e.length;i<j;i++)g=e[i].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),l(this[0],g,h[g]));f._data(this[0],"parsedAttrs",!0)}}return h}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split("."),d[1]=d[1]?"."+d[1]:"";if(c===b){h=this.triggerHandler("getData"+d[1]+"!",[d[0]]),h===b&&this.length&&(h=f.data(this[0],a),h=l(this[0],a,h));return h===b&&d[1]?this.data(d[0]):h}return this.each(function(){var b=f(this),e=[d[0],c];b.triggerHandler("setData"+d[1]+"!",e),f.data(this,a,c),b.triggerHandler("changeData"+d[1]+"!",e)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise()}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;h<g;h++)e=d[h],e&&(c=f.propFix[e]||e,f.attr(a,e,""),a.removeAttribute(v?e:c),u.test(e)&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/\bhover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};
+f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,quick:G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=[],j,k,l,m,n,o,p,q,r,s,t;g[0]=c,c.delegateTarget=this;if(e&&!c.target.disabled&&(!c.button||c.type!=="click")){m=f(this),m.context=this.ownerDocument||this;for(l=c.target;l!=this;l=l.parentNode||this){o={},q=[],m[0]=l;for(j=0;j<e;j++)r=d[j],s=r.selector,o[s]===b&&(o[s]=r.quick?H(l,r.quick):m.is(s)),o[s]&&q.push(r);q.length&&i.push({elem:l,matches:q})}}d.length>e&&i.push({elem:this,matches:d.slice(e)});for(j=0;j<i.length&&!c.isPropagationStopped();j++){p=i[j],c.currentTarget=p.elem;for(k=0;k<p.matches.length&&!c.isImmediatePropagationStopped();k++){r=p.matches[k];if(h||!c.namespace&&!r.namespace||c.namespace_re&&c.namespace_re.test(r.namespace))c.data=r.data,c.handleObj=r,n=((f.event.special[r.origType]||{}).handle||r.handler).apply(p.elem,g),n!==b&&(c.result=n,n===!1&&(c.preventDefault(),c.stopPropagation()))}}return c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.contains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0)}),d._submit_attached=!0)})},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on.call(this,a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.type+"."+e.namespace:e.type,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.POS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|style)/i,bb=/<(?:script|object|embed|option|style)/i,bc=new RegExp("<(?:"+V+")","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function()
+{for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bi(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bp)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!bb.test(j)&&(f.support.checkClone||!bd.test(j))&&(f.support.html5Clone||!bc.test(j))&&(g=!0,h=f.fragments[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||!bc.test("<"+a.nodeName)?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1></$2>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=bg[l]||bg._default,n=m[0],o=b.createElement("div");b===c?bh.appendChild(o):U(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bn(k[i]);else bn(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||be.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bq=/alpha\([^)]*\)/i,br=/opacity=([^)]*)/,bs=/([A-Z]|^ms)/g,bt=/^-?\d+(?:px)?$/i,bu=/^-?\d/,bv=/^([\-+])=([\-+.\de]+)/,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Left","Right"],by=["Top","Bottom"],bz,bA,bB;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bz(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bv.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bz)return bz(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bC(a,b,d);f.swap(a,bw,function(){e=bC(a,b,d)});return e}},set:function(a,b){if(!bt.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return br.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bq,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bq.test(g)?g.replace(bq,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bz(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bA=function(a,b){var c,d,e;b=b.replace(bs,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b)));return c}),c.documentElement.currentStyle&&(bB=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bt.test(f)&&bu.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bz=bA||bB,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bD=/%20/g,bE=/\[\]$/,bF=/\r?\n/g,bG=/#.*$/,bH=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bI=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bJ=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bK=/^(?:GET|HEAD)$/,bL=/^\/\//,bM=/\?/,bN=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bO=/^(?:select|textarea)/i,bP=/\s+/,bQ=/([?&])_=[^&]*/,bR=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bS=f.fn.load,bT={},bU={},bV,bW,bX=["*/"]+["*"];try{bV=e.href}catch(bY){bV=c.createElement("a"),bV.href="",bV=bV.href}bW=bR.exec(bV.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bS)return bS.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bN,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bO.test(this.nodeName)||bI.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bF,"\r\n")}}):{name:b.name,value:c.replace(bF,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b_(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b_(a,b);return a},ajaxSettings:{url:bV,isLocal:bJ.test(bW[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bX},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bZ(bT),ajaxTransport:bZ(bU),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cb(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cc(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bH.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bG,"").replace(bL,bW[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bP),d.crossDomain==null&&(r=bR.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bW[1]&&r[2]==bW[2]&&(r[3]||(r[1]==="http:"?80:443))==(bW[3]||(bW[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),b$(bT,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bK.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bM.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bQ,"$1_="+x);d.url=y+(y===d.url?(bM.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bX+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=b$(bU,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)ca(g,a[g],c,e);return d.join("&").replace(bD,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cd=f.now(),ce=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cd++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ce.test(b.url)||e&&ce.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ce,l),b.url===j&&(e&&(k=k.replace(ce,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cf=a.ActiveXObject?function(){for(var a in ch)ch[a](0,1)}:!1,cg=0,ch;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ci()||cj()}:ci,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cf&&delete ch[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cg,cf&&(ch||(ch={},f(a).unload(cf)),ch[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var ck={},cl,cm,cn=/^(?:toggle|show|hide)$/,co=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cp,cq=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cr;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cu("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cv(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cu("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cu("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cv(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)j=new f.fx(this,b,i),h=a[i],cn.test(h)?(o=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),o?(f._data(this,"toggle"+i,o==="show"?"hide":"show"),j[o]()):j[h]()):(k=co.exec(h),l=j.cur(),k?(m=parseFloat(k[2]),n=k[3]||(f.cssNumber[i]?"":"px"),n!=="px"&&(f.style(this,i,(m||1)+n),l=(m||1)/j.cur()*l,f.style(this,i,l+n)),k[1]&&(m=(k[1]==="-="?-1:1)*m+l),j.custom(l,m,n)):j.custom(l,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b]&&g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:cu("show",1),slideUp:cu("hide",1),slideToggle:cu("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=cr||cs(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){e.options.hide&&f._data(e.elem,"fxshow"+e.prop)===b&&f._data(e.elem,"fxshow"+e.prop,e.start)},h()&&f.timers.push(h)&&!cp&&(cp=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!==b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=cr||cs(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cp),cp=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(["width","height"],function(a,b){f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now)+a.unit)}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cy(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.support.fixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cw.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.support.fixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cy(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cy(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
\ No newline at end of file

From f2698b584443095a43060b09a4d9e67a4384749c Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 22 Mar 2012 14:51:07 +0900
Subject: [PATCH 046/630] fix sort order not applied correctly in backend
 config page (gadget, profile) (fixes #2617)

---
 apps/pc_backend/modules/design/templates/_plotGadget.php  | 7 ++++++-
 apps/pc_backend/modules/profile/templates/listSuccess.php | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/pc_backend/modules/design/templates/_plotGadget.php b/apps/pc_backend/modules/design/templates/_plotGadget.php
index 870b78bda..8147b2903 100644
--- a/apps/pc_backend/modules/design/templates/_plotGadget.php
+++ b/apps/pc_backend/modules/design/templates/_plotGadget.php
@@ -16,7 +16,12 @@
 $("#plot'.ucfirst($type).'").sortable({
   items: "> div.sortable",
   update: function(event,ui){
-    insertHiddenTags("'.$type.'", ui.item.parent().sortable("toArray"));
+    var item_ids = ui.item.parent().sortable("toArray");
+    item_ids = $.map(item_ids, function (val) {
+      return val.replace(/^.+_(\d+)$/, "$1");
+    });
+
+    insertHiddenTags("'.$type.'", item_ids);
   }
 });
 ') ?>
diff --git a/apps/pc_backend/modules/profile/templates/listSuccess.php b/apps/pc_backend/modules/profile/templates/listSuccess.php
index 7e6c76b5c..880800069 100644
--- a/apps/pc_backend/modules/profile/templates/listSuccess.php
+++ b/apps/pc_backend/modules/profile/templates/listSuccess.php
@@ -55,7 +55,7 @@
 $("#profiles tbody").sortable({
   items: "> .sortable",
   update: function (event, ui) {
-    var postData = $(this).sortable("serialize", { expression: /(profile)_(.+)/ });
+    var postData = $(this).sortable("serialize", { key: "profiles[]", expression: /profile_(.+)/ });
     postData += "&'.urlencode($tokenForm->getCSRFFieldName()).'='.urlencode($tokenForm->getCSRFToken()).'";
 
     $.ajax({

From f078ff2feca4da7a132fdc6b36dbb28d74e312de Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Mon, 23 Jan 2012 15:36:25 +0900
Subject: [PATCH 047/630] symfony plugins are now in the
 /lib/vendor/symfony/lib/plugins directory instead of /plugins (refs #2752)

---
 .../symfony/lib/plugins}/sfFormExtraPlugin/LICENSE  |   0
 .../symfony/lib/plugins}/sfFormExtraPlugin/README   |   0
 .../lib/plugins}/sfFormExtraPlugin/bin/prove.php    |   0
 .../lib/form/sfFormLanguage.class.php               |   0
 .../sfValidatorDoctrineNestedSetLevel.class.php     |   0
 .../lib/validator/sfValidatorBlacklist.class.php    |   0
 .../lib/validator/sfValidatorReCaptcha.class.php    |   0
 .../sfValidatorSchemaTimeInterval.class.php         |   0
 .../sfWidgetFormDoctrineChoiceGrouped.class.php     |   0
 .../sfWidgetFormJQueryAutocompleter.class.php       |   0
 .../lib/widget/sfWidgetFormJQueryDate.class.php     |   0
 .../sfWidgetFormPropelChoiceGrouped.class.php       |   0
 .../sfWidgetFormPropelJQueryAutocompleter.class.php |   0
 .../lib/widget/sfWidgetFormReCaptcha.class.php      |   0
 .../widget/sfWidgetFormSelectDoubleList.class.php   |   0
 .../lib/widget/sfWidgetFormSelectUSState.class.php  |   0
 .../widget/sfWidgetFormTextareaTinyMCE.class.php    |   0
 .../lib/plugins}/sfFormExtraPlugin/package.xml      |   0
 .../plugins}/sfFormExtraPlugin/test/bootstrap.php   |   0
 .../test/form/sfFormLanguageTest.php                |   0
 .../test/validator/sfValidatorBlacklistTest.php     |   0
 .../test/validator/sfValidatorReCaptchaTest.php     |   0
 .../validator/sfValidatorSchemaTimeIntervalTest.php |   0
 .../test/widget/sfWidgetFormReCaptchaTest.php       |   0
 .../test/widget/sfWidgetFormSelectUSStateTest.php   |   0
 .../web/css/jquery.autocompleter.css                |   0
 .../sfFormExtraPlugin/web/images/indicator.gif      | Bin
 .../plugins}/sfFormExtraPlugin/web/images/next.png  | Bin
 .../sfFormExtraPlugin/web/images/previous.png       | Bin
 .../sfFormExtraPlugin/web/js/double_list.js         |   0
 .../web/js/jquery.autocompleter.js                  |   0
 .../lib/plugins}/sfImageHandlerPlugin/LICENSE       |   0
 .../plugins}/sfImageHandlerPlugin/config/config.php |   0
 .../lib/helper/sfImageHelper.php                    |   0
 .../lib/image/generator/sfImageGenerator.class.php  |   0
 .../image/generator/sfImageGeneratorGD.class.php    |   0
 .../image/generator/sfImageGeneratorIM.class.php    |   0
 .../generator/sfImageGeneratorImageTransform.php    |   0
 .../lib/image/sfImageHandler.class.php              |   0
 .../image/storage/sfImageStorageDefault.class.php   |   0
 .../storage/sfImageStorageFilesystem.class.php      |   0
 .../lib/sfImageHandlerRouting.class.php             |   0
 .../lib/sfImageHandlerUser.class.php                |   0
 .../modules/image/actions/actions.class.php         |   0
 .../lib/plugins}/sfProtoculousPlugin/LICENSE        |   0
 .../plugins}/sfProtoculousPlugin/LICENSE.prototype  |   0
 .../sfProtoculousPlugin/LICENSE.script.aculo.us     |   0
 .../sfProtoculousPlugin/config/settings.yml         |   0
 .../lib/helper/ProtoculousHelper.php                |   0
 .../web/css/input_auto_complete_tag.css             |   0
 .../plugins}/sfProtoculousPlugin/web/js/builder.js  |   0
 .../plugins}/sfProtoculousPlugin/web/js/controls.js |   0
 .../plugins}/sfProtoculousPlugin/web/js/dragdrop.js |   0
 .../plugins}/sfProtoculousPlugin/web/js/effects.js  |   0
 .../plugins}/sfProtoculousPlugin/web/js/index.html  |   0
 .../sfProtoculousPlugin/web/js/prototype.js         |   0
 .../sfProtoculousPlugin/web/js/scriptaculous.js     |   0
 .../plugins}/sfProtoculousPlugin/web/js/slider.js   |   0
 .../plugins}/sfProtoculousPlugin/web/js/sound.js    |   0
 .../plugins}/sfProtoculousPlugin/web/js/unittest.js |   0
 .../plugins}/sfSymfonyTemplatingViewPlugin/LISENCE  |   0
 .../plugins}/sfSymfonyTemplatingViewPlugin/NOTICE   |   0
 .../plugins}/sfSymfonyTemplatingViewPlugin/README   |   0
 .../sfSymfonyTemplatingViewPlugin/config/config.php |   0
 .../loader/sfTemplateAbstractSwitchableLoader.php   |   0
 .../lib/loader/sfTemplateLoaderSwitcher.php         |   0
 .../loader/sfTemplateSwitchableLoaderDoctrine.php   |   0
 ...emplateSwitchableLoaderFilesystemForSymfony1.php |   0
 .../lib/renderer/sfTemplateRendererSmarty.php       |   0
 .../lib/renderer/sfTemplateRendererTwig.php         |   0
 .../SymfonyTemplating/sfTemplateAutoloader.php      |   0
 .../sfTemplateDebuggerInterface.php                 |   0
 .../vendor/SymfonyTemplating/sfTemplateEngine.php   |   0
 .../vendor/SymfonyTemplating/sfTemplateHelper.php   |   0
 .../SymfonyTemplating/sfTemplateHelperAssets.php    |   0
 .../SymfonyTemplating/sfTemplateHelperInterface.php |   0
 .../sfTemplateHelperJavascripts.php                 |   0
 .../SymfonyTemplating/sfTemplateHelperSet.php       |   0
 .../sfTemplateHelperStylesheets.php                 |   0
 .../vendor/SymfonyTemplating/sfTemplateLoader.php   |   0
 .../SymfonyTemplating/sfTemplateLoaderCache.php     |   0
 .../SymfonyTemplating/sfTemplateLoaderChain.php     |   0
 .../sfTemplateLoaderCompilableInterface.php         |   0
 .../sfTemplateLoaderFilesystem.php                  |   0
 .../SymfonyTemplating/sfTemplateLoaderInterface.php |   0
 .../vendor/SymfonyTemplating/sfTemplateRenderer.php |   0
 .../sfTemplateRendererInterface.php                 |   0
 .../SymfonyTemplating/sfTemplateRendererPhp.php     |   0
 .../vendor/SymfonyTemplating/sfTemplateStorage.php  |   0
 .../SymfonyTemplating/sfTemplateStorageFile.php     |   0
 .../SymfonyTemplating/sfTemplateStorageString.php   |   0
 .../lib/vendor/Twig/Autoloader.php                  |   0
 .../lib/vendor/Twig/Compiler.php                    |   0
 .../lib/vendor/Twig/CompilerInterface.php           |   0
 .../lib/vendor/Twig/Environment.php                 |   0
 .../lib/vendor/Twig/Error.php                       |   0
 .../lib/vendor/Twig/ExpressionParser.php            |   0
 .../lib/vendor/Twig/Extension.php                   |   0
 .../lib/vendor/Twig/Extension/Core.php              |   0
 .../lib/vendor/Twig/Extension/Escaper.php           |   0
 .../lib/vendor/Twig/Extension/Sandbox.php           |   0
 .../lib/vendor/Twig/ExtensionInterface.php          |   0
 .../lib/vendor/Twig/Filter.php                      |   0
 .../lib/vendor/Twig/Filter/Function.php             |   0
 .../lib/vendor/Twig/Filter/Method.php               |   0
 .../lib/vendor/Twig/Lexer.php                       |   0
 .../lib/vendor/Twig/LexerInterface.php              |   0
 .../lib/vendor/Twig/Loader/Array.php                |   0
 .../lib/vendor/Twig/Loader/Filesystem.php           |   0
 .../lib/vendor/Twig/Loader/String.php               |   0
 .../lib/vendor/Twig/LoaderInterface.php             |   0
 .../lib/vendor/Twig/Macro.php                       |   0
 .../lib/vendor/Twig/Node.php                        |   0
 .../lib/vendor/Twig/Node/AutoEscape.php             |   0
 .../lib/vendor/Twig/Node/Block.php                  |   0
 .../lib/vendor/Twig/Node/BlockReference.php         |   0
 .../lib/vendor/Twig/Node/Debug.php                  |   0
 .../lib/vendor/Twig/Node/Expression.php             |   0
 .../lib/vendor/Twig/Node/Expression/Array.php       |   0
 .../lib/vendor/Twig/Node/Expression/AssignName.php  |   0
 .../lib/vendor/Twig/Node/Expression/Binary.php      |   0
 .../lib/vendor/Twig/Node/Expression/Binary/Add.php  |   0
 .../lib/vendor/Twig/Node/Expression/Binary/And.php  |   0
 .../vendor/Twig/Node/Expression/Binary/Concat.php   |   0
 .../lib/vendor/Twig/Node/Expression/Binary/Div.php  |   0
 .../lib/vendor/Twig/Node/Expression/Binary/Mod.php  |   0
 .../lib/vendor/Twig/Node/Expression/Binary/Mul.php  |   0
 .../lib/vendor/Twig/Node/Expression/Binary/Or.php   |   0
 .../lib/vendor/Twig/Node/Expression/Binary/Sub.php  |   0
 .../lib/vendor/Twig/Node/Expression/Compare.php     |   0
 .../lib/vendor/Twig/Node/Expression/Conditional.php |   0
 .../lib/vendor/Twig/Node/Expression/Constant.php    |   0
 .../lib/vendor/Twig/Node/Expression/Filter.php      |   0
 .../lib/vendor/Twig/Node/Expression/GetAttr.php     |   0
 .../lib/vendor/Twig/Node/Expression/Name.php        |   0
 .../lib/vendor/Twig/Node/Expression/Unary.php       |   0
 .../lib/vendor/Twig/Node/Expression/Unary/Neg.php   |   0
 .../lib/vendor/Twig/Node/Expression/Unary/Not.php   |   0
 .../lib/vendor/Twig/Node/Expression/Unary/Pos.php   |   0
 .../lib/vendor/Twig/Node/Filter.php                 |   0
 .../lib/vendor/Twig/Node/For.php                    |   0
 .../lib/vendor/Twig/Node/If.php                     |   0
 .../lib/vendor/Twig/Node/Import.php                 |   0
 .../lib/vendor/Twig/Node/Include.php                |   0
 .../lib/vendor/Twig/Node/Macro.php                  |   0
 .../lib/vendor/Twig/Node/Module.php                 |   0
 .../lib/vendor/Twig/Node/Parent.php                 |   0
 .../lib/vendor/Twig/Node/Print.php                  |   0
 .../lib/vendor/Twig/Node/Set.php                    |   0
 .../lib/vendor/Twig/Node/Text.php                   |   0
 .../lib/vendor/Twig/NodeList.php                    |   0
 .../lib/vendor/Twig/NodeListInterface.php           |   0
 .../lib/vendor/Twig/NodeTraverser.php               |   0
 .../lib/vendor/Twig/NodeVisitor/Escaper.php         |   0
 .../lib/vendor/Twig/NodeVisitor/Filter.php          |   0
 .../lib/vendor/Twig/NodeVisitor/Sandbox.php         |   0
 .../lib/vendor/Twig/NodeVisitorInterface.php        |   0
 .../lib/vendor/Twig/Parser.php                      |   0
 .../lib/vendor/Twig/ParserInterface.php             |   0
 .../lib/vendor/Twig/Resource.php                    |   0
 .../lib/vendor/Twig/RuntimeError.php                |   0
 .../lib/vendor/Twig/Sandbox/SecurityError.php       |   0
 .../lib/vendor/Twig/Sandbox/SecurityPolicy.php      |   0
 .../vendor/Twig/Sandbox/SecurityPolicyInterface.php |   0
 .../lib/vendor/Twig/SyntaxError.php                 |   0
 .../lib/vendor/Twig/Template.php                    |   0
 .../lib/vendor/Twig/TemplateInterface.php           |   0
 .../lib/vendor/Twig/Token.php                       |   0
 .../lib/vendor/Twig/TokenParser.php                 |   0
 .../lib/vendor/Twig/TokenParser/AutoEscape.php      |   0
 .../lib/vendor/Twig/TokenParser/Block.php           |   0
 .../lib/vendor/Twig/TokenParser/Debug.php           |   0
 .../lib/vendor/Twig/TokenParser/Display.php         |   0
 .../lib/vendor/Twig/TokenParser/Extends.php         |   0
 .../lib/vendor/Twig/TokenParser/Filter.php          |   0
 .../lib/vendor/Twig/TokenParser/For.php             |   0
 .../lib/vendor/Twig/TokenParser/If.php              |   0
 .../lib/vendor/Twig/TokenParser/Import.php          |   0
 .../lib/vendor/Twig/TokenParser/Include.php         |   0
 .../lib/vendor/Twig/TokenParser/Macro.php           |   0
 .../lib/vendor/Twig/TokenParser/Parent.php          |   0
 .../lib/vendor/Twig/TokenParser/Set.php             |   0
 .../lib/vendor/Twig/TokenStream.php                 |   0
 .../lib/vendor/smarty2/Config_File.class.php        |   0
 .../lib/vendor/smarty2/Smarty.class.php             |   0
 .../lib/vendor/smarty2/Smarty_Compiler.class.php    |   0
 .../lib/vendor/smarty2/debug.tpl                    |   0
 .../internals/core.assemble_plugin_filepath.php     |   0
 .../internals/core.assign_smarty_interface.php      |   0
 .../smarty2/internals/core.create_dir_structure.php |   0
 .../internals/core.display_debug_console.php        |   0
 .../smarty2/internals/core.get_include_path.php     |   0
 .../vendor/smarty2/internals/core.get_microtime.php |   0
 .../smarty2/internals/core.get_php_resource.php     |   0
 .../lib/vendor/smarty2/internals/core.is_secure.php |   0
 .../vendor/smarty2/internals/core.is_trusted.php    |   0
 .../vendor/smarty2/internals/core.load_plugins.php  |   0
 .../smarty2/internals/core.load_resource_plugin.php |   0
 .../internals/core.process_cached_inserts.php       |   0
 .../internals/core.process_compiled_include.php     |   0
 .../smarty2/internals/core.read_cache_file.php      |   0
 .../lib/vendor/smarty2/internals/core.rm_auto.php   |   0
 .../lib/vendor/smarty2/internals/core.rmdir.php     |   0
 .../smarty2/internals/core.run_insert_handler.php   |   0
 .../smarty2/internals/core.smarty_include_php.php   |   0
 .../smarty2/internals/core.write_cache_file.php     |   0
 .../internals/core.write_compiled_include.php       |   0
 .../internals/core.write_compiled_resource.php      |   0
 .../vendor/smarty2/internals/core.write_file.php    |   0
 .../lib/vendor/smarty2/plugins/block.textformat.php |   0
 .../lib/vendor/smarty2/plugins/compiler.assign.php  |   0
 .../smarty2/plugins/function.assign_debug_info.php  |   0
 .../vendor/smarty2/plugins/function.config_load.php |   0
 .../lib/vendor/smarty2/plugins/function.counter.php |   0
 .../lib/vendor/smarty2/plugins/function.cycle.php   |   0
 .../lib/vendor/smarty2/plugins/function.debug.php   |   0
 .../lib/vendor/smarty2/plugins/function.eval.php    |   0
 .../lib/vendor/smarty2/plugins/function.fetch.php   |   0
 .../smarty2/plugins/function.html_checkboxes.php    |   0
 .../vendor/smarty2/plugins/function.html_image.php  |   0
 .../smarty2/plugins/function.html_options.php       |   0
 .../vendor/smarty2/plugins/function.html_radios.php |   0
 .../smarty2/plugins/function.html_select_date.php   |   0
 .../smarty2/plugins/function.html_select_time.php   |   0
 .../vendor/smarty2/plugins/function.html_table.php  |   0
 .../lib/vendor/smarty2/plugins/function.mailto.php  |   0
 .../lib/vendor/smarty2/plugins/function.math.php    |   0
 .../lib/vendor/smarty2/plugins/function.popup.php   |   0
 .../vendor/smarty2/plugins/function.popup_init.php  |   0
 .../vendor/smarty2/plugins/modifier.capitalize.php  |   0
 .../lib/vendor/smarty2/plugins/modifier.cat.php     |   0
 .../smarty2/plugins/modifier.count_characters.php   |   0
 .../smarty2/plugins/modifier.count_paragraphs.php   |   0
 .../smarty2/plugins/modifier.count_sentences.php    |   0
 .../vendor/smarty2/plugins/modifier.count_words.php |   0
 .../vendor/smarty2/plugins/modifier.date_format.php |   0
 .../smarty2/plugins/modifier.debug_print_var.php    |   0
 .../lib/vendor/smarty2/plugins/modifier.default.php |   0
 .../lib/vendor/smarty2/plugins/modifier.escape.php  |   0
 .../lib/vendor/smarty2/plugins/modifier.indent.php  |   0
 .../lib/vendor/smarty2/plugins/modifier.lower.php   |   0
 .../lib/vendor/smarty2/plugins/modifier.nl2br.php   |   0
 .../smarty2/plugins/modifier.regex_replace.php      |   0
 .../lib/vendor/smarty2/plugins/modifier.replace.php |   0
 .../lib/vendor/smarty2/plugins/modifier.spacify.php |   0
 .../smarty2/plugins/modifier.string_format.php      |   0
 .../lib/vendor/smarty2/plugins/modifier.strip.php   |   0
 .../vendor/smarty2/plugins/modifier.strip_tags.php  |   0
 .../vendor/smarty2/plugins/modifier.truncate.php    |   0
 .../lib/vendor/smarty2/plugins/modifier.upper.php   |   0
 .../vendor/smarty2/plugins/modifier.wordwrap.php    |   0
 .../smarty2/plugins/outputfilter.trimwhitespace.php |   0
 .../smarty2/plugins/shared.escape_special_chars.php |   0
 .../smarty2/plugins/shared.make_timestamp.php       |   0
 .../view/sfTemplatingComponentPartialView.class.php |   0
 .../lib/view/sfTemplatingComponentView.class.php    |   0
 .../test/bootstrap/config.php                       |   0
 .../test/unit/fixtures/module/_ebi.php              |   0
 .../test/unit/fixtures/module/_ebi.xml.php          |   0
 .../test/unit/fixtures/module/_params.php           |   0
 .../test/unit/fixtures/module/_params.xml.php       |   0
 .../test/unit/fixtures/module/actionSuccess.php     |   0
 .../test/unit/fixtures/module/actionSuccess.xml.php |   0
 .../test/unit/fixtures/module/helperSuccess.php     |   0
 .../test/unit/fixtures/module/withLayoutSuccess.php |   0
 .../unit/fixtures/module/withLayoutSuccess.xml.php  |   0
 .../test/unit/fixtures/template/_ebi.php            |   0
 .../test/unit/fixtures/template/_ebi.xml.php        |   0
 .../test/unit/fixtures/template/_helper.php         |   0
 .../test/unit/fixtures/template/_helper.xml.php     |   0
 .../test/unit/fixtures/template/layout.php          |   0
 .../test/unit/fixtures/template/layout.xml.php      |   0
 .../test/unit/fixtures/template/smarty.tpl          |   0
 .../test/unit/fixtures/template/twig.tpl            |   0
 .../sfTemplateAbstractSwitchableLoaderTest.php      |   0
 .../unit/loader/sfTemplateLoaderSwitcherTest.php    |   0
 .../sfTemplateSwitchableLoaderDoctrineTest.php      |   0
 ...ateSwitchableLoaderFilesystemForSymfony1Test.php |   0
 .../unit/renderer/sfTemplateRendererSmartyTest.php  |   0
 .../unit/renderer/sfTemplateRendererTwigTest.php    |   0
 .../test/unit/sfApplicationConfigurationMock.php    |   0
 .../test/unit/sfContextMock.class.php               |   0
 .../view/sfTemplatingComponentPartialViewTest.php   |   0
 .../unit/view/sfTemplatingComponentViewTest.php     |   0
 284 files changed, 0 insertions(+), 0 deletions(-)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/LICENSE (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/README (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/bin/prove.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/lib/form/sfFormLanguage.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/lib/validator/doctrine/sfValidatorDoctrineNestedSetLevel.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/lib/validator/sfValidatorBlacklist.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/lib/validator/sfValidatorReCaptcha.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/lib/validator/sfValidatorSchemaTimeInterval.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/lib/widget/sfWidgetFormDoctrineChoiceGrouped.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/lib/widget/sfWidgetFormJQueryAutocompleter.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/lib/widget/sfWidgetFormJQueryDate.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/lib/widget/sfWidgetFormPropelChoiceGrouped.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/lib/widget/sfWidgetFormPropelJQueryAutocompleter.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/lib/widget/sfWidgetFormReCaptcha.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/lib/widget/sfWidgetFormSelectDoubleList.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/lib/widget/sfWidgetFormSelectUSState.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/lib/widget/sfWidgetFormTextareaTinyMCE.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/package.xml (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/test/bootstrap.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/test/form/sfFormLanguageTest.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/test/validator/sfValidatorBlacklistTest.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/test/validator/sfValidatorReCaptchaTest.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/test/validator/sfValidatorSchemaTimeIntervalTest.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/test/widget/sfWidgetFormReCaptchaTest.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/test/widget/sfWidgetFormSelectUSStateTest.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/web/css/jquery.autocompleter.css (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/web/images/indicator.gif (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/web/images/next.png (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/web/images/previous.png (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/web/js/double_list.js (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfFormExtraPlugin/web/js/jquery.autocompleter.js (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfImageHandlerPlugin/LICENSE (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfImageHandlerPlugin/config/config.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfImageHandlerPlugin/lib/helper/sfImageHelper.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfImageHandlerPlugin/lib/image/generator/sfImageGenerator.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorGD.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorIM.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfImageHandlerPlugin/lib/image/sfImageHandler.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfImageHandlerPlugin/lib/image/storage/sfImageStorageDefault.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfImageHandlerPlugin/lib/image/storage/sfImageStorageFilesystem.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfImageHandlerPlugin/lib/sfImageHandlerRouting.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfImageHandlerPlugin/lib/sfImageHandlerUser.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfImageHandlerPlugin/modules/image/actions/actions.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfProtoculousPlugin/LICENSE (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfProtoculousPlugin/LICENSE.prototype (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfProtoculousPlugin/LICENSE.script.aculo.us (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfProtoculousPlugin/config/settings.yml (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfProtoculousPlugin/lib/helper/ProtoculousHelper.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfProtoculousPlugin/web/css/input_auto_complete_tag.css (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfProtoculousPlugin/web/js/builder.js (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfProtoculousPlugin/web/js/controls.js (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfProtoculousPlugin/web/js/dragdrop.js (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfProtoculousPlugin/web/js/effects.js (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfProtoculousPlugin/web/js/index.html (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfProtoculousPlugin/web/js/prototype.js (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfProtoculousPlugin/web/js/scriptaculous.js (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfProtoculousPlugin/web/js/slider.js (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfProtoculousPlugin/web/js/sound.js (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfProtoculousPlugin/web/js/unittest.js (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/LISENCE (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/NOTICE (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/README (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/config/config.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateAbstractSwitchableLoader.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateLoaderSwitcher.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateSwitchableLoaderDoctrine.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateSwitchableLoaderFilesystemForSymfony1.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/renderer/sfTemplateRendererSmarty.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/renderer/sfTemplateRendererTwig.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateAutoloader.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateDebuggerInterface.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateEngine.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelper.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperAssets.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperInterface.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperJavascripts.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperSet.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperStylesheets.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoader.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderCache.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderChain.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderCompilableInterface.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderFilesystem.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderInterface.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRenderer.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRendererInterface.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRendererPhp.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorage.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorageFile.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorageString.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Autoloader.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Compiler.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/CompilerInterface.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Environment.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Error.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ExpressionParser.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Core.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Escaper.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Sandbox.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ExtensionInterface.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter/Function.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter/Method.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Lexer.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/LexerInterface.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/Array.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/Filesystem.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/String.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/LoaderInterface.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Macro.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/AutoEscape.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Block.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/BlockReference.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Debug.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Array.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/AssignName.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Add.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/And.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Concat.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Div.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Mod.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Mul.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Or.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Sub.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Compare.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Conditional.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Constant.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Filter.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/GetAttr.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Name.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Neg.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Not.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Pos.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Filter.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/For.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/If.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Import.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Include.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Macro.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Module.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Parent.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Print.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Set.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Text.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeList.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeListInterface.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeTraverser.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Escaper.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Filter.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Sandbox.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitorInterface.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Parser.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ParserInterface.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Resource.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/RuntimeError.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityError.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityPolicy.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityPolicyInterface.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/SyntaxError.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Template.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TemplateInterface.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Token.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/AutoEscape.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Block.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Debug.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Display.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Extends.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Filter.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/For.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/If.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Import.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Include.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Macro.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Parent.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Set.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenStream.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Config_File.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Smarty.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Smarty_Compiler.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/debug.tpl (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.assemble_plugin_filepath.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.assign_smarty_interface.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.create_dir_structure.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.display_debug_console.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_include_path.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_microtime.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_php_resource.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.is_secure.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.is_trusted.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.load_plugins.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.load_resource_plugin.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.process_cached_inserts.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.process_compiled_include.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.read_cache_file.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.rm_auto.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.rmdir.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.run_insert_handler.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.smarty_include_php.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_cache_file.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_compiled_include.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_compiled_resource.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_file.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/block.textformat.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/compiler.assign.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.assign_debug_info.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.config_load.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.counter.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.cycle.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.debug.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.eval.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.fetch.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_checkboxes.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_image.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_options.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_radios.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_select_date.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_select_time.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_table.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.mailto.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.math.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.popup.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.popup_init.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.capitalize.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.cat.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_characters.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_paragraphs.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_sentences.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_words.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.date_format.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.debug_print_var.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.default.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.escape.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.indent.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.lower.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.nl2br.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.regex_replace.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.replace.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.spacify.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.string_format.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.strip.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.strip_tags.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.truncate.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.upper.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.wordwrap.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/outputfilter.trimwhitespace.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/shared.escape_special_chars.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/shared.make_timestamp.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/view/sfTemplatingComponentPartialView.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/lib/view/sfTemplatingComponentView.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/bootstrap/config.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_ebi.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_ebi.xml.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_params.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_params.xml.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/actionSuccess.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/actionSuccess.xml.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/helperSuccess.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/withLayoutSuccess.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/withLayoutSuccess.xml.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_ebi.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_ebi.xml.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_helper.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_helper.xml.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/layout.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/layout.xml.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/smarty.tpl (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/twig.tpl (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateAbstractSwitchableLoaderTest.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateLoaderSwitcherTest.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateSwitchableLoaderDoctrineTest.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateSwitchableLoaderFilesystemForSymfony1Test.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/renderer/sfTemplateRendererSmartyTest.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/renderer/sfTemplateRendererTwigTest.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/sfApplicationConfigurationMock.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/sfContextMock.class.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/view/sfTemplatingComponentPartialViewTest.php (100%)
 rename {plugins => lib/vendor/symfony/lib/plugins}/sfSymfonyTemplatingViewPlugin/test/unit/view/sfTemplatingComponentViewTest.php (100%)

diff --git a/plugins/sfFormExtraPlugin/LICENSE b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/LICENSE
similarity index 100%
rename from plugins/sfFormExtraPlugin/LICENSE
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/LICENSE
diff --git a/plugins/sfFormExtraPlugin/README b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/README
similarity index 100%
rename from plugins/sfFormExtraPlugin/README
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/README
diff --git a/plugins/sfFormExtraPlugin/bin/prove.php b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/bin/prove.php
similarity index 100%
rename from plugins/sfFormExtraPlugin/bin/prove.php
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/bin/prove.php
diff --git a/plugins/sfFormExtraPlugin/lib/form/sfFormLanguage.class.php b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/form/sfFormLanguage.class.php
similarity index 100%
rename from plugins/sfFormExtraPlugin/lib/form/sfFormLanguage.class.php
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/form/sfFormLanguage.class.php
diff --git a/plugins/sfFormExtraPlugin/lib/validator/doctrine/sfValidatorDoctrineNestedSetLevel.class.php b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/validator/doctrine/sfValidatorDoctrineNestedSetLevel.class.php
similarity index 100%
rename from plugins/sfFormExtraPlugin/lib/validator/doctrine/sfValidatorDoctrineNestedSetLevel.class.php
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/validator/doctrine/sfValidatorDoctrineNestedSetLevel.class.php
diff --git a/plugins/sfFormExtraPlugin/lib/validator/sfValidatorBlacklist.class.php b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/validator/sfValidatorBlacklist.class.php
similarity index 100%
rename from plugins/sfFormExtraPlugin/lib/validator/sfValidatorBlacklist.class.php
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/validator/sfValidatorBlacklist.class.php
diff --git a/plugins/sfFormExtraPlugin/lib/validator/sfValidatorReCaptcha.class.php b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/validator/sfValidatorReCaptcha.class.php
similarity index 100%
rename from plugins/sfFormExtraPlugin/lib/validator/sfValidatorReCaptcha.class.php
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/validator/sfValidatorReCaptcha.class.php
diff --git a/plugins/sfFormExtraPlugin/lib/validator/sfValidatorSchemaTimeInterval.class.php b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/validator/sfValidatorSchemaTimeInterval.class.php
similarity index 100%
rename from plugins/sfFormExtraPlugin/lib/validator/sfValidatorSchemaTimeInterval.class.php
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/validator/sfValidatorSchemaTimeInterval.class.php
diff --git a/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormDoctrineChoiceGrouped.class.php b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormDoctrineChoiceGrouped.class.php
similarity index 100%
rename from plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormDoctrineChoiceGrouped.class.php
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormDoctrineChoiceGrouped.class.php
diff --git a/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormJQueryAutocompleter.class.php b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormJQueryAutocompleter.class.php
similarity index 100%
rename from plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormJQueryAutocompleter.class.php
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormJQueryAutocompleter.class.php
diff --git a/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormJQueryDate.class.php b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormJQueryDate.class.php
similarity index 100%
rename from plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormJQueryDate.class.php
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormJQueryDate.class.php
diff --git a/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormPropelChoiceGrouped.class.php b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormPropelChoiceGrouped.class.php
similarity index 100%
rename from plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormPropelChoiceGrouped.class.php
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormPropelChoiceGrouped.class.php
diff --git a/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormPropelJQueryAutocompleter.class.php b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormPropelJQueryAutocompleter.class.php
similarity index 100%
rename from plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormPropelJQueryAutocompleter.class.php
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormPropelJQueryAutocompleter.class.php
diff --git a/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormReCaptcha.class.php b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormReCaptcha.class.php
similarity index 100%
rename from plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormReCaptcha.class.php
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormReCaptcha.class.php
diff --git a/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormSelectDoubleList.class.php b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormSelectDoubleList.class.php
similarity index 100%
rename from plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormSelectDoubleList.class.php
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormSelectDoubleList.class.php
diff --git a/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormSelectUSState.class.php b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormSelectUSState.class.php
similarity index 100%
rename from plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormSelectUSState.class.php
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormSelectUSState.class.php
diff --git a/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormTextareaTinyMCE.class.php b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormTextareaTinyMCE.class.php
similarity index 100%
rename from plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormTextareaTinyMCE.class.php
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormTextareaTinyMCE.class.php
diff --git a/plugins/sfFormExtraPlugin/package.xml b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/package.xml
similarity index 100%
rename from plugins/sfFormExtraPlugin/package.xml
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/package.xml
diff --git a/plugins/sfFormExtraPlugin/test/bootstrap.php b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/bootstrap.php
similarity index 100%
rename from plugins/sfFormExtraPlugin/test/bootstrap.php
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/bootstrap.php
diff --git a/plugins/sfFormExtraPlugin/test/form/sfFormLanguageTest.php b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/form/sfFormLanguageTest.php
similarity index 100%
rename from plugins/sfFormExtraPlugin/test/form/sfFormLanguageTest.php
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/form/sfFormLanguageTest.php
diff --git a/plugins/sfFormExtraPlugin/test/validator/sfValidatorBlacklistTest.php b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/validator/sfValidatorBlacklistTest.php
similarity index 100%
rename from plugins/sfFormExtraPlugin/test/validator/sfValidatorBlacklistTest.php
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/validator/sfValidatorBlacklistTest.php
diff --git a/plugins/sfFormExtraPlugin/test/validator/sfValidatorReCaptchaTest.php b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/validator/sfValidatorReCaptchaTest.php
similarity index 100%
rename from plugins/sfFormExtraPlugin/test/validator/sfValidatorReCaptchaTest.php
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/validator/sfValidatorReCaptchaTest.php
diff --git a/plugins/sfFormExtraPlugin/test/validator/sfValidatorSchemaTimeIntervalTest.php b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/validator/sfValidatorSchemaTimeIntervalTest.php
similarity index 100%
rename from plugins/sfFormExtraPlugin/test/validator/sfValidatorSchemaTimeIntervalTest.php
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/validator/sfValidatorSchemaTimeIntervalTest.php
diff --git a/plugins/sfFormExtraPlugin/test/widget/sfWidgetFormReCaptchaTest.php b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/widget/sfWidgetFormReCaptchaTest.php
similarity index 100%
rename from plugins/sfFormExtraPlugin/test/widget/sfWidgetFormReCaptchaTest.php
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/widget/sfWidgetFormReCaptchaTest.php
diff --git a/plugins/sfFormExtraPlugin/test/widget/sfWidgetFormSelectUSStateTest.php b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/widget/sfWidgetFormSelectUSStateTest.php
similarity index 100%
rename from plugins/sfFormExtraPlugin/test/widget/sfWidgetFormSelectUSStateTest.php
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/widget/sfWidgetFormSelectUSStateTest.php
diff --git a/plugins/sfFormExtraPlugin/web/css/jquery.autocompleter.css b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/web/css/jquery.autocompleter.css
similarity index 100%
rename from plugins/sfFormExtraPlugin/web/css/jquery.autocompleter.css
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/web/css/jquery.autocompleter.css
diff --git a/plugins/sfFormExtraPlugin/web/images/indicator.gif b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/web/images/indicator.gif
similarity index 100%
rename from plugins/sfFormExtraPlugin/web/images/indicator.gif
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/web/images/indicator.gif
diff --git a/plugins/sfFormExtraPlugin/web/images/next.png b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/web/images/next.png
similarity index 100%
rename from plugins/sfFormExtraPlugin/web/images/next.png
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/web/images/next.png
diff --git a/plugins/sfFormExtraPlugin/web/images/previous.png b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/web/images/previous.png
similarity index 100%
rename from plugins/sfFormExtraPlugin/web/images/previous.png
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/web/images/previous.png
diff --git a/plugins/sfFormExtraPlugin/web/js/double_list.js b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/web/js/double_list.js
similarity index 100%
rename from plugins/sfFormExtraPlugin/web/js/double_list.js
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/web/js/double_list.js
diff --git a/plugins/sfFormExtraPlugin/web/js/jquery.autocompleter.js b/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/web/js/jquery.autocompleter.js
similarity index 100%
rename from plugins/sfFormExtraPlugin/web/js/jquery.autocompleter.js
rename to lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/web/js/jquery.autocompleter.js
diff --git a/plugins/sfImageHandlerPlugin/LICENSE b/lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/LICENSE
similarity index 100%
rename from plugins/sfImageHandlerPlugin/LICENSE
rename to lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/LICENSE
diff --git a/plugins/sfImageHandlerPlugin/config/config.php b/lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/config/config.php
similarity index 100%
rename from plugins/sfImageHandlerPlugin/config/config.php
rename to lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/config/config.php
diff --git a/plugins/sfImageHandlerPlugin/lib/helper/sfImageHelper.php b/lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/helper/sfImageHelper.php
similarity index 100%
rename from plugins/sfImageHandlerPlugin/lib/helper/sfImageHelper.php
rename to lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/helper/sfImageHelper.php
diff --git a/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGenerator.class.php b/lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGenerator.class.php
similarity index 100%
rename from plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGenerator.class.php
rename to lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGenerator.class.php
diff --git a/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorGD.class.php b/lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorGD.class.php
similarity index 100%
rename from plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorGD.class.php
rename to lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorGD.class.php
diff --git a/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorIM.class.php b/lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorIM.class.php
similarity index 100%
rename from plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorIM.class.php
rename to lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorIM.class.php
diff --git a/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php b/lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php
similarity index 100%
rename from plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php
rename to lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php
diff --git a/plugins/sfImageHandlerPlugin/lib/image/sfImageHandler.class.php b/lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/sfImageHandler.class.php
similarity index 100%
rename from plugins/sfImageHandlerPlugin/lib/image/sfImageHandler.class.php
rename to lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/sfImageHandler.class.php
diff --git a/plugins/sfImageHandlerPlugin/lib/image/storage/sfImageStorageDefault.class.php b/lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/storage/sfImageStorageDefault.class.php
similarity index 100%
rename from plugins/sfImageHandlerPlugin/lib/image/storage/sfImageStorageDefault.class.php
rename to lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/storage/sfImageStorageDefault.class.php
diff --git a/plugins/sfImageHandlerPlugin/lib/image/storage/sfImageStorageFilesystem.class.php b/lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/storage/sfImageStorageFilesystem.class.php
similarity index 100%
rename from plugins/sfImageHandlerPlugin/lib/image/storage/sfImageStorageFilesystem.class.php
rename to lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/storage/sfImageStorageFilesystem.class.php
diff --git a/plugins/sfImageHandlerPlugin/lib/sfImageHandlerRouting.class.php b/lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/sfImageHandlerRouting.class.php
similarity index 100%
rename from plugins/sfImageHandlerPlugin/lib/sfImageHandlerRouting.class.php
rename to lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/sfImageHandlerRouting.class.php
diff --git a/plugins/sfImageHandlerPlugin/lib/sfImageHandlerUser.class.php b/lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/sfImageHandlerUser.class.php
similarity index 100%
rename from plugins/sfImageHandlerPlugin/lib/sfImageHandlerUser.class.php
rename to lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/sfImageHandlerUser.class.php
diff --git a/plugins/sfImageHandlerPlugin/modules/image/actions/actions.class.php b/lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/modules/image/actions/actions.class.php
similarity index 100%
rename from plugins/sfImageHandlerPlugin/modules/image/actions/actions.class.php
rename to lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/modules/image/actions/actions.class.php
diff --git a/plugins/sfProtoculousPlugin/LICENSE b/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/LICENSE
similarity index 100%
rename from plugins/sfProtoculousPlugin/LICENSE
rename to lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/LICENSE
diff --git a/plugins/sfProtoculousPlugin/LICENSE.prototype b/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/LICENSE.prototype
similarity index 100%
rename from plugins/sfProtoculousPlugin/LICENSE.prototype
rename to lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/LICENSE.prototype
diff --git a/plugins/sfProtoculousPlugin/LICENSE.script.aculo.us b/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/LICENSE.script.aculo.us
similarity index 100%
rename from plugins/sfProtoculousPlugin/LICENSE.script.aculo.us
rename to lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/LICENSE.script.aculo.us
diff --git a/plugins/sfProtoculousPlugin/config/settings.yml b/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/config/settings.yml
similarity index 100%
rename from plugins/sfProtoculousPlugin/config/settings.yml
rename to lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/config/settings.yml
diff --git a/plugins/sfProtoculousPlugin/lib/helper/ProtoculousHelper.php b/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/lib/helper/ProtoculousHelper.php
similarity index 100%
rename from plugins/sfProtoculousPlugin/lib/helper/ProtoculousHelper.php
rename to lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/lib/helper/ProtoculousHelper.php
diff --git a/plugins/sfProtoculousPlugin/web/css/input_auto_complete_tag.css b/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/css/input_auto_complete_tag.css
similarity index 100%
rename from plugins/sfProtoculousPlugin/web/css/input_auto_complete_tag.css
rename to lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/css/input_auto_complete_tag.css
diff --git a/plugins/sfProtoculousPlugin/web/js/builder.js b/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/builder.js
similarity index 100%
rename from plugins/sfProtoculousPlugin/web/js/builder.js
rename to lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/builder.js
diff --git a/plugins/sfProtoculousPlugin/web/js/controls.js b/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/controls.js
similarity index 100%
rename from plugins/sfProtoculousPlugin/web/js/controls.js
rename to lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/controls.js
diff --git a/plugins/sfProtoculousPlugin/web/js/dragdrop.js b/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/dragdrop.js
similarity index 100%
rename from plugins/sfProtoculousPlugin/web/js/dragdrop.js
rename to lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/dragdrop.js
diff --git a/plugins/sfProtoculousPlugin/web/js/effects.js b/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/effects.js
similarity index 100%
rename from plugins/sfProtoculousPlugin/web/js/effects.js
rename to lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/effects.js
diff --git a/plugins/sfProtoculousPlugin/web/js/index.html b/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/index.html
similarity index 100%
rename from plugins/sfProtoculousPlugin/web/js/index.html
rename to lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/index.html
diff --git a/plugins/sfProtoculousPlugin/web/js/prototype.js b/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/prototype.js
similarity index 100%
rename from plugins/sfProtoculousPlugin/web/js/prototype.js
rename to lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/prototype.js
diff --git a/plugins/sfProtoculousPlugin/web/js/scriptaculous.js b/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/scriptaculous.js
similarity index 100%
rename from plugins/sfProtoculousPlugin/web/js/scriptaculous.js
rename to lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/scriptaculous.js
diff --git a/plugins/sfProtoculousPlugin/web/js/slider.js b/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/slider.js
similarity index 100%
rename from plugins/sfProtoculousPlugin/web/js/slider.js
rename to lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/slider.js
diff --git a/plugins/sfProtoculousPlugin/web/js/sound.js b/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/sound.js
similarity index 100%
rename from plugins/sfProtoculousPlugin/web/js/sound.js
rename to lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/sound.js
diff --git a/plugins/sfProtoculousPlugin/web/js/unittest.js b/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/unittest.js
similarity index 100%
rename from plugins/sfProtoculousPlugin/web/js/unittest.js
rename to lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/unittest.js
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/LISENCE b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/LISENCE
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/LISENCE
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/LISENCE
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/NOTICE b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/NOTICE
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/NOTICE
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/NOTICE
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/README b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/README
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/README
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/README
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/config/config.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/config/config.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/config/config.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/config/config.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateAbstractSwitchableLoader.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateAbstractSwitchableLoader.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateAbstractSwitchableLoader.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateAbstractSwitchableLoader.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateLoaderSwitcher.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateLoaderSwitcher.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateLoaderSwitcher.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateLoaderSwitcher.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateSwitchableLoaderDoctrine.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateSwitchableLoaderDoctrine.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateSwitchableLoaderDoctrine.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateSwitchableLoaderDoctrine.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateSwitchableLoaderFilesystemForSymfony1.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateSwitchableLoaderFilesystemForSymfony1.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateSwitchableLoaderFilesystemForSymfony1.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateSwitchableLoaderFilesystemForSymfony1.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/renderer/sfTemplateRendererSmarty.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/renderer/sfTemplateRendererSmarty.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/renderer/sfTemplateRendererSmarty.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/renderer/sfTemplateRendererSmarty.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/renderer/sfTemplateRendererTwig.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/renderer/sfTemplateRendererTwig.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/renderer/sfTemplateRendererTwig.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/renderer/sfTemplateRendererTwig.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateAutoloader.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateAutoloader.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateAutoloader.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateAutoloader.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateDebuggerInterface.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateDebuggerInterface.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateDebuggerInterface.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateDebuggerInterface.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateEngine.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateEngine.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateEngine.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateEngine.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelper.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelper.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelper.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelper.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperAssets.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperAssets.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperAssets.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperAssets.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperInterface.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperInterface.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperInterface.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperInterface.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperJavascripts.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperJavascripts.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperJavascripts.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperJavascripts.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperSet.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperSet.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperSet.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperSet.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperStylesheets.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperStylesheets.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperStylesheets.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperStylesheets.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoader.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoader.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoader.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoader.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderCache.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderCache.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderCache.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderCache.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderChain.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderChain.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderChain.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderChain.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderCompilableInterface.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderCompilableInterface.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderCompilableInterface.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderCompilableInterface.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderFilesystem.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderFilesystem.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderFilesystem.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderFilesystem.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderInterface.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderInterface.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderInterface.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderInterface.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRenderer.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRenderer.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRenderer.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRenderer.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRendererInterface.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRendererInterface.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRendererInterface.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRendererInterface.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRendererPhp.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRendererPhp.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRendererPhp.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRendererPhp.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorage.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorage.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorage.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorage.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorageFile.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorageFile.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorageFile.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorageFile.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorageString.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorageString.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorageString.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorageString.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Autoloader.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Autoloader.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Autoloader.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Autoloader.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Compiler.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Compiler.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Compiler.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Compiler.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/CompilerInterface.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/CompilerInterface.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/CompilerInterface.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/CompilerInterface.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Environment.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Environment.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Environment.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Environment.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Error.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Error.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Error.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Error.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ExpressionParser.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ExpressionParser.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ExpressionParser.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ExpressionParser.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Core.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Core.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Core.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Core.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Escaper.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Escaper.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Escaper.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Escaper.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Sandbox.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Sandbox.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Sandbox.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Sandbox.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ExtensionInterface.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ExtensionInterface.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ExtensionInterface.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ExtensionInterface.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter/Function.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter/Function.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter/Function.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter/Function.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter/Method.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter/Method.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter/Method.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter/Method.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Lexer.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Lexer.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Lexer.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Lexer.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/LexerInterface.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/LexerInterface.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/LexerInterface.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/LexerInterface.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/Array.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/Array.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/Array.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/Array.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/Filesystem.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/Filesystem.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/Filesystem.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/Filesystem.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/String.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/String.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/String.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/String.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/LoaderInterface.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/LoaderInterface.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/LoaderInterface.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/LoaderInterface.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Macro.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Macro.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Macro.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Macro.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/AutoEscape.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/AutoEscape.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/AutoEscape.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/AutoEscape.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Block.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Block.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Block.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Block.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/BlockReference.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/BlockReference.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/BlockReference.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/BlockReference.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Debug.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Debug.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Debug.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Debug.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Array.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Array.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Array.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Array.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/AssignName.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/AssignName.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/AssignName.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/AssignName.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Add.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Add.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Add.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Add.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/And.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/And.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/And.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/And.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Concat.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Concat.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Concat.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Concat.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Div.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Div.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Div.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Div.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Mod.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Mod.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Mod.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Mod.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Mul.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Mul.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Mul.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Mul.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Or.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Or.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Or.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Or.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Sub.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Sub.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Sub.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Sub.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Compare.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Compare.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Compare.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Compare.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Conditional.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Conditional.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Conditional.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Conditional.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Constant.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Constant.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Constant.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Constant.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Filter.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Filter.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Filter.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Filter.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/GetAttr.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/GetAttr.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/GetAttr.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/GetAttr.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Name.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Name.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Name.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Name.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Neg.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Neg.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Neg.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Neg.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Not.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Not.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Not.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Not.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Pos.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Pos.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Pos.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Pos.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Filter.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Filter.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Filter.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Filter.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/For.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/For.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/For.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/For.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/If.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/If.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/If.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/If.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Import.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Import.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Import.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Import.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Include.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Include.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Include.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Include.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Macro.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Macro.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Macro.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Macro.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Module.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Module.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Module.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Module.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Parent.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Parent.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Parent.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Parent.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Print.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Print.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Print.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Print.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Set.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Set.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Set.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Set.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Text.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Text.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Text.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Text.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeList.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeList.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeList.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeList.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeListInterface.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeListInterface.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeListInterface.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeListInterface.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeTraverser.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeTraverser.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeTraverser.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeTraverser.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Escaper.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Escaper.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Escaper.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Escaper.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Filter.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Filter.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Filter.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Filter.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Sandbox.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Sandbox.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Sandbox.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Sandbox.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitorInterface.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitorInterface.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitorInterface.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitorInterface.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Parser.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Parser.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Parser.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Parser.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ParserInterface.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ParserInterface.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ParserInterface.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ParserInterface.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Resource.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Resource.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Resource.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Resource.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/RuntimeError.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/RuntimeError.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/RuntimeError.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/RuntimeError.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityError.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityError.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityError.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityError.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityPolicy.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityPolicy.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityPolicy.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityPolicy.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityPolicyInterface.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityPolicyInterface.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityPolicyInterface.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityPolicyInterface.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/SyntaxError.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/SyntaxError.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/SyntaxError.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/SyntaxError.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Template.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Template.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Template.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Template.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TemplateInterface.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TemplateInterface.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TemplateInterface.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TemplateInterface.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Token.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Token.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Token.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Token.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/AutoEscape.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/AutoEscape.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/AutoEscape.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/AutoEscape.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Block.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Block.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Block.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Block.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Debug.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Debug.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Debug.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Debug.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Display.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Display.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Display.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Display.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Extends.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Extends.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Extends.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Extends.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Filter.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Filter.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Filter.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Filter.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/For.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/For.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/For.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/For.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/If.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/If.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/If.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/If.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Import.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Import.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Import.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Import.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Include.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Include.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Include.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Include.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Macro.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Macro.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Macro.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Macro.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Parent.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Parent.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Parent.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Parent.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Set.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Set.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Set.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Set.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenStream.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenStream.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenStream.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenStream.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Config_File.class.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Config_File.class.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Config_File.class.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Config_File.class.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Smarty.class.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Smarty.class.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Smarty.class.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Smarty.class.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Smarty_Compiler.class.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Smarty_Compiler.class.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Smarty_Compiler.class.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Smarty_Compiler.class.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/debug.tpl b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/debug.tpl
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/debug.tpl
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/debug.tpl
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.assemble_plugin_filepath.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.assemble_plugin_filepath.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.assemble_plugin_filepath.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.assemble_plugin_filepath.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.assign_smarty_interface.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.assign_smarty_interface.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.assign_smarty_interface.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.assign_smarty_interface.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.create_dir_structure.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.create_dir_structure.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.create_dir_structure.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.create_dir_structure.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.display_debug_console.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.display_debug_console.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.display_debug_console.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.display_debug_console.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_include_path.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_include_path.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_include_path.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_include_path.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_microtime.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_microtime.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_microtime.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_microtime.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_php_resource.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_php_resource.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_php_resource.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_php_resource.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.is_secure.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.is_secure.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.is_secure.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.is_secure.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.is_trusted.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.is_trusted.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.is_trusted.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.is_trusted.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.load_plugins.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.load_plugins.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.load_plugins.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.load_plugins.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.load_resource_plugin.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.load_resource_plugin.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.load_resource_plugin.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.load_resource_plugin.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.process_cached_inserts.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.process_cached_inserts.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.process_cached_inserts.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.process_cached_inserts.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.process_compiled_include.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.process_compiled_include.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.process_compiled_include.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.process_compiled_include.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.read_cache_file.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.read_cache_file.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.read_cache_file.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.read_cache_file.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.rm_auto.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.rm_auto.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.rm_auto.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.rm_auto.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.rmdir.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.rmdir.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.rmdir.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.rmdir.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.run_insert_handler.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.run_insert_handler.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.run_insert_handler.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.run_insert_handler.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.smarty_include_php.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.smarty_include_php.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.smarty_include_php.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.smarty_include_php.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_cache_file.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_cache_file.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_cache_file.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_cache_file.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_compiled_include.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_compiled_include.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_compiled_include.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_compiled_include.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_compiled_resource.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_compiled_resource.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_compiled_resource.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_compiled_resource.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_file.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_file.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_file.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_file.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/block.textformat.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/block.textformat.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/block.textformat.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/block.textformat.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/compiler.assign.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/compiler.assign.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/compiler.assign.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/compiler.assign.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.assign_debug_info.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.assign_debug_info.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.assign_debug_info.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.assign_debug_info.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.config_load.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.config_load.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.config_load.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.config_load.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.counter.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.counter.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.counter.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.counter.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.cycle.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.cycle.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.cycle.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.cycle.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.debug.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.debug.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.debug.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.debug.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.eval.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.eval.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.eval.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.eval.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.fetch.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.fetch.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.fetch.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.fetch.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_checkboxes.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_checkboxes.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_checkboxes.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_checkboxes.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_image.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_image.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_image.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_image.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_options.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_options.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_options.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_options.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_radios.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_radios.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_radios.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_radios.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_select_date.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_select_date.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_select_date.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_select_date.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_select_time.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_select_time.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_select_time.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_select_time.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_table.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_table.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_table.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_table.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.mailto.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.mailto.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.mailto.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.mailto.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.math.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.math.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.math.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.math.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.popup.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.popup.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.popup.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.popup.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.popup_init.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.popup_init.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.popup_init.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.popup_init.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.capitalize.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.capitalize.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.capitalize.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.capitalize.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.cat.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.cat.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.cat.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.cat.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_characters.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_characters.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_characters.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_characters.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_paragraphs.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_paragraphs.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_paragraphs.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_paragraphs.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_sentences.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_sentences.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_sentences.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_sentences.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_words.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_words.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_words.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_words.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.date_format.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.date_format.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.date_format.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.date_format.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.debug_print_var.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.debug_print_var.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.debug_print_var.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.debug_print_var.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.default.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.default.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.default.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.default.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.escape.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.escape.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.escape.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.escape.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.indent.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.indent.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.indent.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.indent.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.lower.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.lower.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.lower.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.lower.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.nl2br.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.nl2br.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.nl2br.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.nl2br.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.regex_replace.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.regex_replace.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.regex_replace.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.regex_replace.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.replace.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.replace.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.replace.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.replace.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.spacify.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.spacify.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.spacify.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.spacify.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.string_format.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.string_format.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.string_format.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.string_format.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.strip.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.strip.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.strip.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.strip.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.strip_tags.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.strip_tags.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.strip_tags.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.strip_tags.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.truncate.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.truncate.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.truncate.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.truncate.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.upper.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.upper.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.upper.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.upper.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.wordwrap.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.wordwrap.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.wordwrap.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.wordwrap.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/outputfilter.trimwhitespace.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/outputfilter.trimwhitespace.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/outputfilter.trimwhitespace.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/outputfilter.trimwhitespace.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/shared.escape_special_chars.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/shared.escape_special_chars.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/shared.escape_special_chars.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/shared.escape_special_chars.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/shared.make_timestamp.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/shared.make_timestamp.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/shared.make_timestamp.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/shared.make_timestamp.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/view/sfTemplatingComponentPartialView.class.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/view/sfTemplatingComponentPartialView.class.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/view/sfTemplatingComponentPartialView.class.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/view/sfTemplatingComponentPartialView.class.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/lib/view/sfTemplatingComponentView.class.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/view/sfTemplatingComponentView.class.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/lib/view/sfTemplatingComponentView.class.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/view/sfTemplatingComponentView.class.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/bootstrap/config.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/bootstrap/config.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/bootstrap/config.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/bootstrap/config.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_ebi.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_ebi.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_ebi.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_ebi.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_ebi.xml.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_ebi.xml.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_ebi.xml.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_ebi.xml.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_params.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_params.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_params.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_params.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_params.xml.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_params.xml.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_params.xml.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_params.xml.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/actionSuccess.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/actionSuccess.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/actionSuccess.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/actionSuccess.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/actionSuccess.xml.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/actionSuccess.xml.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/actionSuccess.xml.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/actionSuccess.xml.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/helperSuccess.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/helperSuccess.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/helperSuccess.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/helperSuccess.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/withLayoutSuccess.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/withLayoutSuccess.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/withLayoutSuccess.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/withLayoutSuccess.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/withLayoutSuccess.xml.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/withLayoutSuccess.xml.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/withLayoutSuccess.xml.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/withLayoutSuccess.xml.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_ebi.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_ebi.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_ebi.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_ebi.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_ebi.xml.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_ebi.xml.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_ebi.xml.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_ebi.xml.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_helper.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_helper.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_helper.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_helper.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_helper.xml.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_helper.xml.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_helper.xml.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_helper.xml.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/layout.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/layout.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/layout.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/layout.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/layout.xml.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/layout.xml.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/layout.xml.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/layout.xml.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/smarty.tpl b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/smarty.tpl
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/smarty.tpl
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/smarty.tpl
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/twig.tpl b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/twig.tpl
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/twig.tpl
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/twig.tpl
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateAbstractSwitchableLoaderTest.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateAbstractSwitchableLoaderTest.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateAbstractSwitchableLoaderTest.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateAbstractSwitchableLoaderTest.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateLoaderSwitcherTest.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateLoaderSwitcherTest.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateLoaderSwitcherTest.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateLoaderSwitcherTest.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateSwitchableLoaderDoctrineTest.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateSwitchableLoaderDoctrineTest.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateSwitchableLoaderDoctrineTest.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateSwitchableLoaderDoctrineTest.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateSwitchableLoaderFilesystemForSymfony1Test.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateSwitchableLoaderFilesystemForSymfony1Test.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateSwitchableLoaderFilesystemForSymfony1Test.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateSwitchableLoaderFilesystemForSymfony1Test.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/renderer/sfTemplateRendererSmartyTest.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/renderer/sfTemplateRendererSmartyTest.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/renderer/sfTemplateRendererSmartyTest.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/renderer/sfTemplateRendererSmartyTest.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/renderer/sfTemplateRendererTwigTest.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/renderer/sfTemplateRendererTwigTest.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/renderer/sfTemplateRendererTwigTest.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/renderer/sfTemplateRendererTwigTest.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/sfApplicationConfigurationMock.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/sfApplicationConfigurationMock.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/sfApplicationConfigurationMock.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/sfApplicationConfigurationMock.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/sfContextMock.class.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/sfContextMock.class.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/sfContextMock.class.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/sfContextMock.class.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/view/sfTemplatingComponentPartialViewTest.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/view/sfTemplatingComponentPartialViewTest.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/view/sfTemplatingComponentPartialViewTest.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/view/sfTemplatingComponentPartialViewTest.php
diff --git a/plugins/sfSymfonyTemplatingViewPlugin/test/unit/view/sfTemplatingComponentViewTest.php b/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/view/sfTemplatingComponentViewTest.php
similarity index 100%
rename from plugins/sfSymfonyTemplatingViewPlugin/test/unit/view/sfTemplatingComponentViewTest.php
rename to lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/view/sfTemplatingComponentViewTest.php

From 06f2cfffe444c7d714c91488dc6259e97a55ff4a Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Mon, 26 Mar 2012 21:58:56 +0900
Subject: [PATCH 048/630] symfony plugins (not in symfony) are now in the
 /lib/plugins directory (fixes #2752)

---
 lib/config/opProjectConfiguration.class.php   |  18 +++++++++++++++++-
 .../plugins/sfFormExtraPlugin/LICENSE         |   0
 .../lib => }/plugins/sfFormExtraPlugin/README |   0
 .../plugins/sfFormExtraPlugin/bin/prove.php   |   0
 .../lib/form/sfFormLanguage.class.php         |   0
 ...fValidatorDoctrineNestedSetLevel.class.php |   0
 .../validator/sfValidatorBlacklist.class.php  |   0
 .../validator/sfValidatorReCaptcha.class.php  |   0
 .../sfValidatorSchemaTimeInterval.class.php   |   0
 ...fWidgetFormDoctrineChoiceGrouped.class.php |   0
 .../sfWidgetFormJQueryAutocompleter.class.php |   0
 .../widget/sfWidgetFormJQueryDate.class.php   |   0
 .../sfWidgetFormPropelChoiceGrouped.class.php |   0
 ...getFormPropelJQueryAutocompleter.class.php |   0
 .../widget/sfWidgetFormReCaptcha.class.php    |   0
 .../sfWidgetFormSelectDoubleList.class.php    |   0
 .../sfWidgetFormSelectUSState.class.php       |   0
 .../sfWidgetFormTextareaTinyMCE.class.php     |   0
 .../plugins/sfFormExtraPlugin/package.xml     |   0
 .../sfFormExtraPlugin/test/bootstrap.php      |   0
 .../test/form/sfFormLanguageTest.php          |   0
 .../validator/sfValidatorBlacklistTest.php    |   0
 .../validator/sfValidatorReCaptchaTest.php    |   0
 .../sfValidatorSchemaTimeIntervalTest.php     |   0
 .../test/widget/sfWidgetFormReCaptchaTest.php |   0
 .../widget/sfWidgetFormSelectUSStateTest.php  |   0
 .../web/css/jquery.autocompleter.css          |   0
 .../web/images/indicator.gif                  | Bin
 .../sfFormExtraPlugin/web/images/next.png     | Bin
 .../sfFormExtraPlugin/web/images/previous.png | Bin
 .../sfFormExtraPlugin/web/js/double_list.js   |   0
 .../web/js/jquery.autocompleter.js            |   0
 .../plugins/sfImageHandlerPlugin/LICENSE      |   0
 .../sfImageHandlerPlugin/config/config.php    |   0
 .../lib/helper/sfImageHelper.php              |   0
 .../generator/sfImageGenerator.class.php      |   0
 .../generator/sfImageGeneratorGD.class.php    |   0
 .../generator/sfImageGeneratorIM.class.php    |   0
 .../sfImageGeneratorImageTransform.php        |   0
 .../lib/image/sfImageHandler.class.php        |   0
 .../storage/sfImageStorageDefault.class.php   |   0
 .../sfImageStorageFilesystem.class.php        |   0
 .../lib/sfImageHandlerRouting.class.php       |   0
 .../lib/sfImageHandlerUser.class.php          |   0
 .../modules/image/actions/actions.class.php   |   0
 .../plugins/sfProtoculousPlugin/LICENSE       |   0
 .../sfProtoculousPlugin/LICENSE.prototype     |   0
 .../LICENSE.script.aculo.us                   |   0
 .../sfProtoculousPlugin/config/settings.yml   |   0
 .../lib/helper/ProtoculousHelper.php          |   0
 .../web/css/input_auto_complete_tag.css       |   0
 .../sfProtoculousPlugin/web/js/builder.js     |   0
 .../sfProtoculousPlugin/web/js/controls.js    |   0
 .../sfProtoculousPlugin/web/js/dragdrop.js    |   0
 .../sfProtoculousPlugin/web/js/effects.js     |   0
 .../sfProtoculousPlugin/web/js/index.html     |   0
 .../sfProtoculousPlugin/web/js/prototype.js   |   0
 .../web/js/scriptaculous.js                   |   0
 .../sfProtoculousPlugin/web/js/slider.js      |   0
 .../sfProtoculousPlugin/web/js/sound.js       |   0
 .../sfProtoculousPlugin/web/js/unittest.js    |   0
 .../sfSymfonyTemplatingViewPlugin/LISENCE     |   0
 .../sfSymfonyTemplatingViewPlugin/NOTICE      |   0
 .../sfSymfonyTemplatingViewPlugin/README      |   0
 .../config/config.php                         |   0
 .../sfTemplateAbstractSwitchableLoader.php    |   0
 .../lib/loader/sfTemplateLoaderSwitcher.php   |   0
 .../sfTemplateSwitchableLoaderDoctrine.php    |   0
 ...eSwitchableLoaderFilesystemForSymfony1.php |   0
 .../lib/renderer/sfTemplateRendererSmarty.php |   0
 .../lib/renderer/sfTemplateRendererTwig.php   |   0
 .../sfTemplateAutoloader.php                  |   0
 .../sfTemplateDebuggerInterface.php           |   0
 .../SymfonyTemplating/sfTemplateEngine.php    |   0
 .../SymfonyTemplating/sfTemplateHelper.php    |   0
 .../sfTemplateHelperAssets.php                |   0
 .../sfTemplateHelperInterface.php             |   0
 .../sfTemplateHelperJavascripts.php           |   0
 .../SymfonyTemplating/sfTemplateHelperSet.php |   0
 .../sfTemplateHelperStylesheets.php           |   0
 .../SymfonyTemplating/sfTemplateLoader.php    |   0
 .../sfTemplateLoaderCache.php                 |   0
 .../sfTemplateLoaderChain.php                 |   0
 .../sfTemplateLoaderCompilableInterface.php   |   0
 .../sfTemplateLoaderFilesystem.php            |   0
 .../sfTemplateLoaderInterface.php             |   0
 .../SymfonyTemplating/sfTemplateRenderer.php  |   0
 .../sfTemplateRendererInterface.php           |   0
 .../sfTemplateRendererPhp.php                 |   0
 .../SymfonyTemplating/sfTemplateStorage.php   |   0
 .../sfTemplateStorageFile.php                 |   0
 .../sfTemplateStorageString.php               |   0
 .../lib/vendor/Twig/Autoloader.php            |   0
 .../lib/vendor/Twig/Compiler.php              |   0
 .../lib/vendor/Twig/CompilerInterface.php     |   0
 .../lib/vendor/Twig/Environment.php           |   0
 .../lib/vendor/Twig/Error.php                 |   0
 .../lib/vendor/Twig/ExpressionParser.php      |   0
 .../lib/vendor/Twig/Extension.php             |   0
 .../lib/vendor/Twig/Extension/Core.php        |   0
 .../lib/vendor/Twig/Extension/Escaper.php     |   0
 .../lib/vendor/Twig/Extension/Sandbox.php     |   0
 .../lib/vendor/Twig/ExtensionInterface.php    |   0
 .../lib/vendor/Twig/Filter.php                |   0
 .../lib/vendor/Twig/Filter/Function.php       |   0
 .../lib/vendor/Twig/Filter/Method.php         |   0
 .../lib/vendor/Twig/Lexer.php                 |   0
 .../lib/vendor/Twig/LexerInterface.php        |   0
 .../lib/vendor/Twig/Loader/Array.php          |   0
 .../lib/vendor/Twig/Loader/Filesystem.php     |   0
 .../lib/vendor/Twig/Loader/String.php         |   0
 .../lib/vendor/Twig/LoaderInterface.php       |   0
 .../lib/vendor/Twig/Macro.php                 |   0
 .../lib/vendor/Twig/Node.php                  |   0
 .../lib/vendor/Twig/Node/AutoEscape.php       |   0
 .../lib/vendor/Twig/Node/Block.php            |   0
 .../lib/vendor/Twig/Node/BlockReference.php   |   0
 .../lib/vendor/Twig/Node/Debug.php            |   0
 .../lib/vendor/Twig/Node/Expression.php       |   0
 .../lib/vendor/Twig/Node/Expression/Array.php |   0
 .../Twig/Node/Expression/AssignName.php       |   0
 .../vendor/Twig/Node/Expression/Binary.php    |   0
 .../Twig/Node/Expression/Binary/Add.php       |   0
 .../Twig/Node/Expression/Binary/And.php       |   0
 .../Twig/Node/Expression/Binary/Concat.php    |   0
 .../Twig/Node/Expression/Binary/Div.php       |   0
 .../Twig/Node/Expression/Binary/Mod.php       |   0
 .../Twig/Node/Expression/Binary/Mul.php       |   0
 .../vendor/Twig/Node/Expression/Binary/Or.php |   0
 .../Twig/Node/Expression/Binary/Sub.php       |   0
 .../vendor/Twig/Node/Expression/Compare.php   |   0
 .../Twig/Node/Expression/Conditional.php      |   0
 .../vendor/Twig/Node/Expression/Constant.php  |   0
 .../vendor/Twig/Node/Expression/Filter.php    |   0
 .../vendor/Twig/Node/Expression/GetAttr.php   |   0
 .../lib/vendor/Twig/Node/Expression/Name.php  |   0
 .../lib/vendor/Twig/Node/Expression/Unary.php |   0
 .../vendor/Twig/Node/Expression/Unary/Neg.php |   0
 .../vendor/Twig/Node/Expression/Unary/Not.php |   0
 .../vendor/Twig/Node/Expression/Unary/Pos.php |   0
 .../lib/vendor/Twig/Node/Filter.php           |   0
 .../lib/vendor/Twig/Node/For.php              |   0
 .../lib/vendor/Twig/Node/If.php               |   0
 .../lib/vendor/Twig/Node/Import.php           |   0
 .../lib/vendor/Twig/Node/Include.php          |   0
 .../lib/vendor/Twig/Node/Macro.php            |   0
 .../lib/vendor/Twig/Node/Module.php           |   0
 .../lib/vendor/Twig/Node/Parent.php           |   0
 .../lib/vendor/Twig/Node/Print.php            |   0
 .../lib/vendor/Twig/Node/Set.php              |   0
 .../lib/vendor/Twig/Node/Text.php             |   0
 .../lib/vendor/Twig/NodeList.php              |   0
 .../lib/vendor/Twig/NodeListInterface.php     |   0
 .../lib/vendor/Twig/NodeTraverser.php         |   0
 .../lib/vendor/Twig/NodeVisitor/Escaper.php   |   0
 .../lib/vendor/Twig/NodeVisitor/Filter.php    |   0
 .../lib/vendor/Twig/NodeVisitor/Sandbox.php   |   0
 .../lib/vendor/Twig/NodeVisitorInterface.php  |   0
 .../lib/vendor/Twig/Parser.php                |   0
 .../lib/vendor/Twig/ParserInterface.php       |   0
 .../lib/vendor/Twig/Resource.php              |   0
 .../lib/vendor/Twig/RuntimeError.php          |   0
 .../lib/vendor/Twig/Sandbox/SecurityError.php |   0
 .../vendor/Twig/Sandbox/SecurityPolicy.php    |   0
 .../Twig/Sandbox/SecurityPolicyInterface.php  |   0
 .../lib/vendor/Twig/SyntaxError.php           |   0
 .../lib/vendor/Twig/Template.php              |   0
 .../lib/vendor/Twig/TemplateInterface.php     |   0
 .../lib/vendor/Twig/Token.php                 |   0
 .../lib/vendor/Twig/TokenParser.php           |   0
 .../vendor/Twig/TokenParser/AutoEscape.php    |   0
 .../lib/vendor/Twig/TokenParser/Block.php     |   0
 .../lib/vendor/Twig/TokenParser/Debug.php     |   0
 .../lib/vendor/Twig/TokenParser/Display.php   |   0
 .../lib/vendor/Twig/TokenParser/Extends.php   |   0
 .../lib/vendor/Twig/TokenParser/Filter.php    |   0
 .../lib/vendor/Twig/TokenParser/For.php       |   0
 .../lib/vendor/Twig/TokenParser/If.php        |   0
 .../lib/vendor/Twig/TokenParser/Import.php    |   0
 .../lib/vendor/Twig/TokenParser/Include.php   |   0
 .../lib/vendor/Twig/TokenParser/Macro.php     |   0
 .../lib/vendor/Twig/TokenParser/Parent.php    |   0
 .../lib/vendor/Twig/TokenParser/Set.php       |   0
 .../lib/vendor/Twig/TokenStream.php           |   0
 .../lib/vendor/smarty2/Config_File.class.php  |   0
 .../lib/vendor/smarty2/Smarty.class.php       |   0
 .../vendor/smarty2/Smarty_Compiler.class.php  |   0
 .../lib/vendor/smarty2/debug.tpl              |   0
 .../core.assemble_plugin_filepath.php         |   0
 .../core.assign_smarty_interface.php          |   0
 .../internals/core.create_dir_structure.php   |   0
 .../internals/core.display_debug_console.php  |   0
 .../internals/core.get_include_path.php       |   0
 .../smarty2/internals/core.get_microtime.php  |   0
 .../internals/core.get_php_resource.php       |   0
 .../smarty2/internals/core.is_secure.php      |   0
 .../smarty2/internals/core.is_trusted.php     |   0
 .../smarty2/internals/core.load_plugins.php   |   0
 .../internals/core.load_resource_plugin.php   |   0
 .../internals/core.process_cached_inserts.php |   0
 .../core.process_compiled_include.php         |   0
 .../internals/core.read_cache_file.php        |   0
 .../vendor/smarty2/internals/core.rm_auto.php |   0
 .../vendor/smarty2/internals/core.rmdir.php   |   0
 .../internals/core.run_insert_handler.php     |   0
 .../internals/core.smarty_include_php.php     |   0
 .../internals/core.write_cache_file.php       |   0
 .../internals/core.write_compiled_include.php |   0
 .../core.write_compiled_resource.php          |   0
 .../smarty2/internals/core.write_file.php     |   0
 .../smarty2/plugins/block.textformat.php      |   0
 .../smarty2/plugins/compiler.assign.php       |   0
 .../plugins/function.assign_debug_info.php    |   0
 .../smarty2/plugins/function.config_load.php  |   0
 .../smarty2/plugins/function.counter.php      |   0
 .../vendor/smarty2/plugins/function.cycle.php |   0
 .../vendor/smarty2/plugins/function.debug.php |   0
 .../vendor/smarty2/plugins/function.eval.php  |   0
 .../vendor/smarty2/plugins/function.fetch.php |   0
 .../plugins/function.html_checkboxes.php      |   0
 .../smarty2/plugins/function.html_image.php   |   0
 .../smarty2/plugins/function.html_options.php |   0
 .../smarty2/plugins/function.html_radios.php  |   0
 .../plugins/function.html_select_date.php     |   0
 .../plugins/function.html_select_time.php     |   0
 .../smarty2/plugins/function.html_table.php   |   0
 .../smarty2/plugins/function.mailto.php       |   0
 .../vendor/smarty2/plugins/function.math.php  |   0
 .../vendor/smarty2/plugins/function.popup.php |   0
 .../smarty2/plugins/function.popup_init.php   |   0
 .../smarty2/plugins/modifier.capitalize.php   |   0
 .../vendor/smarty2/plugins/modifier.cat.php   |   0
 .../plugins/modifier.count_characters.php     |   0
 .../plugins/modifier.count_paragraphs.php     |   0
 .../plugins/modifier.count_sentences.php      |   0
 .../smarty2/plugins/modifier.count_words.php  |   0
 .../smarty2/plugins/modifier.date_format.php  |   0
 .../plugins/modifier.debug_print_var.php      |   0
 .../smarty2/plugins/modifier.default.php      |   0
 .../smarty2/plugins/modifier.escape.php       |   0
 .../smarty2/plugins/modifier.indent.php       |   0
 .../vendor/smarty2/plugins/modifier.lower.php |   0
 .../vendor/smarty2/plugins/modifier.nl2br.php |   0
 .../plugins/modifier.regex_replace.php        |   0
 .../smarty2/plugins/modifier.replace.php      |   0
 .../smarty2/plugins/modifier.spacify.php      |   0
 .../plugins/modifier.string_format.php        |   0
 .../vendor/smarty2/plugins/modifier.strip.php |   0
 .../smarty2/plugins/modifier.strip_tags.php   |   0
 .../smarty2/plugins/modifier.truncate.php     |   0
 .../vendor/smarty2/plugins/modifier.upper.php |   0
 .../smarty2/plugins/modifier.wordwrap.php     |   0
 .../plugins/outputfilter.trimwhitespace.php   |   0
 .../plugins/shared.escape_special_chars.php   |   0
 .../smarty2/plugins/shared.make_timestamp.php |   0
 ...sfTemplatingComponentPartialView.class.php |   0
 .../view/sfTemplatingComponentView.class.php  |   0
 .../test/bootstrap/config.php                 |   0
 .../test/unit/fixtures/module/_ebi.php        |   0
 .../test/unit/fixtures/module/_ebi.xml.php    |   0
 .../test/unit/fixtures/module/_params.php     |   0
 .../test/unit/fixtures/module/_params.xml.php |   0
 .../unit/fixtures/module/actionSuccess.php    |   0
 .../fixtures/module/actionSuccess.xml.php     |   0
 .../unit/fixtures/module/helperSuccess.php    |   0
 .../fixtures/module/withLayoutSuccess.php     |   0
 .../fixtures/module/withLayoutSuccess.xml.php |   0
 .../test/unit/fixtures/template/_ebi.php      |   0
 .../test/unit/fixtures/template/_ebi.xml.php  |   0
 .../test/unit/fixtures/template/_helper.php   |   0
 .../unit/fixtures/template/_helper.xml.php    |   0
 .../test/unit/fixtures/template/layout.php    |   0
 .../unit/fixtures/template/layout.xml.php     |   0
 .../test/unit/fixtures/template/smarty.tpl    |   0
 .../test/unit/fixtures/template/twig.tpl      |   0
 ...sfTemplateAbstractSwitchableLoaderTest.php |   0
 .../loader/sfTemplateLoaderSwitcherTest.php   |   0
 ...sfTemplateSwitchableLoaderDoctrineTest.php |   0
 ...tchableLoaderFilesystemForSymfony1Test.php |   0
 .../renderer/sfTemplateRendererSmartyTest.php |   0
 .../renderer/sfTemplateRendererTwigTest.php   |   0
 .../unit/sfApplicationConfigurationMock.php   |   0
 .../test/unit/sfContextMock.class.php         |   0
 .../sfTemplatingComponentPartialViewTest.php  |   0
 .../view/sfTemplatingComponentViewTest.php    |   0
 285 files changed, 17 insertions(+), 1 deletion(-)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/LICENSE (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/README (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/bin/prove.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/lib/form/sfFormLanguage.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/lib/validator/doctrine/sfValidatorDoctrineNestedSetLevel.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/lib/validator/sfValidatorBlacklist.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/lib/validator/sfValidatorReCaptcha.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/lib/validator/sfValidatorSchemaTimeInterval.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormDoctrineChoiceGrouped.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormJQueryAutocompleter.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormJQueryDate.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormPropelChoiceGrouped.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormPropelJQueryAutocompleter.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormReCaptcha.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormSelectDoubleList.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormSelectUSState.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormTextareaTinyMCE.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/package.xml (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/test/bootstrap.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/test/form/sfFormLanguageTest.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/test/validator/sfValidatorBlacklistTest.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/test/validator/sfValidatorReCaptchaTest.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/test/validator/sfValidatorSchemaTimeIntervalTest.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/test/widget/sfWidgetFormReCaptchaTest.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/test/widget/sfWidgetFormSelectUSStateTest.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/web/css/jquery.autocompleter.css (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/web/images/indicator.gif (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/web/images/next.png (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/web/images/previous.png (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/web/js/double_list.js (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfFormExtraPlugin/web/js/jquery.autocompleter.js (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfImageHandlerPlugin/LICENSE (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfImageHandlerPlugin/config/config.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfImageHandlerPlugin/lib/helper/sfImageHelper.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGenerator.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorGD.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorIM.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfImageHandlerPlugin/lib/image/sfImageHandler.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfImageHandlerPlugin/lib/image/storage/sfImageStorageDefault.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfImageHandlerPlugin/lib/image/storage/sfImageStorageFilesystem.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfImageHandlerPlugin/lib/sfImageHandlerRouting.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfImageHandlerPlugin/lib/sfImageHandlerUser.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfImageHandlerPlugin/modules/image/actions/actions.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfProtoculousPlugin/LICENSE (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfProtoculousPlugin/LICENSE.prototype (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfProtoculousPlugin/LICENSE.script.aculo.us (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfProtoculousPlugin/config/settings.yml (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfProtoculousPlugin/lib/helper/ProtoculousHelper.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfProtoculousPlugin/web/css/input_auto_complete_tag.css (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfProtoculousPlugin/web/js/builder.js (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfProtoculousPlugin/web/js/controls.js (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfProtoculousPlugin/web/js/dragdrop.js (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfProtoculousPlugin/web/js/effects.js (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfProtoculousPlugin/web/js/index.html (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfProtoculousPlugin/web/js/prototype.js (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfProtoculousPlugin/web/js/scriptaculous.js (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfProtoculousPlugin/web/js/slider.js (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfProtoculousPlugin/web/js/sound.js (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfProtoculousPlugin/web/js/unittest.js (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/LISENCE (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/NOTICE (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/README (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/config/config.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateAbstractSwitchableLoader.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateLoaderSwitcher.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateSwitchableLoaderDoctrine.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateSwitchableLoaderFilesystemForSymfony1.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/renderer/sfTemplateRendererSmarty.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/renderer/sfTemplateRendererTwig.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateAutoloader.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateDebuggerInterface.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateEngine.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelper.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperAssets.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperInterface.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperJavascripts.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperSet.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperStylesheets.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoader.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderCache.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderChain.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderCompilableInterface.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderFilesystem.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderInterface.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRenderer.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRendererInterface.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRendererPhp.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorage.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorageFile.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorageString.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Autoloader.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Compiler.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/CompilerInterface.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Environment.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Error.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ExpressionParser.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Core.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Escaper.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Sandbox.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ExtensionInterface.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter/Function.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter/Method.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Lexer.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/LexerInterface.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/Array.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/Filesystem.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/String.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/LoaderInterface.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Macro.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/AutoEscape.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Block.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/BlockReference.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Debug.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Array.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/AssignName.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Add.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/And.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Concat.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Div.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Mod.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Mul.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Or.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Sub.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Compare.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Conditional.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Constant.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Filter.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/GetAttr.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Name.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Neg.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Not.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Pos.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Filter.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/For.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/If.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Import.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Include.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Macro.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Module.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Parent.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Print.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Set.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Text.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeList.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeListInterface.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeTraverser.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Escaper.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Filter.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Sandbox.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitorInterface.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Parser.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ParserInterface.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Resource.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/RuntimeError.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityError.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityPolicy.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityPolicyInterface.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/SyntaxError.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Template.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TemplateInterface.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Token.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/AutoEscape.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Block.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Debug.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Display.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Extends.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Filter.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/For.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/If.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Import.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Include.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Macro.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Parent.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Set.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenStream.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Config_File.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Smarty.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Smarty_Compiler.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/debug.tpl (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.assemble_plugin_filepath.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.assign_smarty_interface.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.create_dir_structure.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.display_debug_console.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_include_path.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_microtime.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_php_resource.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.is_secure.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.is_trusted.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.load_plugins.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.load_resource_plugin.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.process_cached_inserts.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.process_compiled_include.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.read_cache_file.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.rm_auto.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.rmdir.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.run_insert_handler.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.smarty_include_php.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_cache_file.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_compiled_include.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_compiled_resource.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_file.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/block.textformat.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/compiler.assign.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.assign_debug_info.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.config_load.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.counter.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.cycle.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.debug.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.eval.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.fetch.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_checkboxes.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_image.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_options.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_radios.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_select_date.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_select_time.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_table.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.mailto.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.math.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.popup.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.popup_init.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.capitalize.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.cat.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_characters.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_paragraphs.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_sentences.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_words.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.date_format.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.debug_print_var.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.default.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.escape.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.indent.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.lower.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.nl2br.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.regex_replace.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.replace.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.spacify.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.string_format.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.strip.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.strip_tags.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.truncate.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.upper.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.wordwrap.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/outputfilter.trimwhitespace.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/shared.escape_special_chars.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/shared.make_timestamp.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/view/sfTemplatingComponentPartialView.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/lib/view/sfTemplatingComponentView.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/bootstrap/config.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_ebi.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_ebi.xml.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_params.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_params.xml.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/actionSuccess.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/actionSuccess.xml.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/helperSuccess.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/withLayoutSuccess.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/withLayoutSuccess.xml.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_ebi.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_ebi.xml.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_helper.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_helper.xml.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/layout.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/layout.xml.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/smarty.tpl (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/twig.tpl (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateAbstractSwitchableLoaderTest.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateLoaderSwitcherTest.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateSwitchableLoaderDoctrineTest.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateSwitchableLoaderFilesystemForSymfony1Test.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/renderer/sfTemplateRendererSmartyTest.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/renderer/sfTemplateRendererTwigTest.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/sfApplicationConfigurationMock.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/sfContextMock.class.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/view/sfTemplatingComponentPartialViewTest.php (100%)
 rename lib/{vendor/symfony/lib => }/plugins/sfSymfonyTemplatingViewPlugin/test/unit/view/sfTemplatingComponentViewTest.php (100%)

diff --git a/lib/config/opProjectConfiguration.class.php b/lib/config/opProjectConfiguration.class.php
index e19b9652a..5f0c4254d 100644
--- a/lib/config/opProjectConfiguration.class.php
+++ b/lib/config/opProjectConfiguration.class.php
@@ -35,7 +35,8 @@ static public function listenToPreCommandEvent(sfEvent $event)
 
   public function setup()
   {
-    $this->enableAllPluginsExcept(array('sfPropelPlugin'));
+    $this->configurePluginPath();
+    $this->enableAllPluginsExcept();
     $this->setIncludePath();
 
     require_once dirname(__FILE__).'/../util/opToolkit.class.php';
@@ -52,6 +53,21 @@ public function setup()
     $this->setupProjectOpenPNE();
   }
 
+  public function configurePluginPath()
+  {
+    // search for *Plugin directories representing plugins
+    // follow links and do not recurse. No need to exclude VC because they do not end with *Plugin
+    $finder = sfFinder::type('dir')->maxdepth(0)->ignore_version_control(false)->follow_link()->name('*Plugin');
+    $dirs = array(
+      sfConfig::get('sf_lib_dir').'/plugins',
+    );
+
+    foreach ($finder->in($dirs) as $path)
+    {
+      $this->setPluginPath(basename($path), $path);
+    }
+  }
+
   protected function configureSessionStorage($name, $options = array())
   {
     $sessionName = 'OpenPNE_'.sfConfig::get('sf_app', 'default');
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/LICENSE b/lib/plugins/sfFormExtraPlugin/LICENSE
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/LICENSE
rename to lib/plugins/sfFormExtraPlugin/LICENSE
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/README b/lib/plugins/sfFormExtraPlugin/README
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/README
rename to lib/plugins/sfFormExtraPlugin/README
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/bin/prove.php b/lib/plugins/sfFormExtraPlugin/bin/prove.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/bin/prove.php
rename to lib/plugins/sfFormExtraPlugin/bin/prove.php
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/form/sfFormLanguage.class.php b/lib/plugins/sfFormExtraPlugin/lib/form/sfFormLanguage.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/form/sfFormLanguage.class.php
rename to lib/plugins/sfFormExtraPlugin/lib/form/sfFormLanguage.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/validator/doctrine/sfValidatorDoctrineNestedSetLevel.class.php b/lib/plugins/sfFormExtraPlugin/lib/validator/doctrine/sfValidatorDoctrineNestedSetLevel.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/validator/doctrine/sfValidatorDoctrineNestedSetLevel.class.php
rename to lib/plugins/sfFormExtraPlugin/lib/validator/doctrine/sfValidatorDoctrineNestedSetLevel.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/validator/sfValidatorBlacklist.class.php b/lib/plugins/sfFormExtraPlugin/lib/validator/sfValidatorBlacklist.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/validator/sfValidatorBlacklist.class.php
rename to lib/plugins/sfFormExtraPlugin/lib/validator/sfValidatorBlacklist.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/validator/sfValidatorReCaptcha.class.php b/lib/plugins/sfFormExtraPlugin/lib/validator/sfValidatorReCaptcha.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/validator/sfValidatorReCaptcha.class.php
rename to lib/plugins/sfFormExtraPlugin/lib/validator/sfValidatorReCaptcha.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/validator/sfValidatorSchemaTimeInterval.class.php b/lib/plugins/sfFormExtraPlugin/lib/validator/sfValidatorSchemaTimeInterval.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/validator/sfValidatorSchemaTimeInterval.class.php
rename to lib/plugins/sfFormExtraPlugin/lib/validator/sfValidatorSchemaTimeInterval.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormDoctrineChoiceGrouped.class.php b/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormDoctrineChoiceGrouped.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormDoctrineChoiceGrouped.class.php
rename to lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormDoctrineChoiceGrouped.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormJQueryAutocompleter.class.php b/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormJQueryAutocompleter.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormJQueryAutocompleter.class.php
rename to lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormJQueryAutocompleter.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormJQueryDate.class.php b/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormJQueryDate.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormJQueryDate.class.php
rename to lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormJQueryDate.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormPropelChoiceGrouped.class.php b/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormPropelChoiceGrouped.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormPropelChoiceGrouped.class.php
rename to lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormPropelChoiceGrouped.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormPropelJQueryAutocompleter.class.php b/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormPropelJQueryAutocompleter.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormPropelJQueryAutocompleter.class.php
rename to lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormPropelJQueryAutocompleter.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormReCaptcha.class.php b/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormReCaptcha.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormReCaptcha.class.php
rename to lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormReCaptcha.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormSelectDoubleList.class.php b/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormSelectDoubleList.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormSelectDoubleList.class.php
rename to lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormSelectDoubleList.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormSelectUSState.class.php b/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormSelectUSState.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormSelectUSState.class.php
rename to lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormSelectUSState.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormTextareaTinyMCE.class.php b/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormTextareaTinyMCE.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormTextareaTinyMCE.class.php
rename to lib/plugins/sfFormExtraPlugin/lib/widget/sfWidgetFormTextareaTinyMCE.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/package.xml b/lib/plugins/sfFormExtraPlugin/package.xml
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/package.xml
rename to lib/plugins/sfFormExtraPlugin/package.xml
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/bootstrap.php b/lib/plugins/sfFormExtraPlugin/test/bootstrap.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/bootstrap.php
rename to lib/plugins/sfFormExtraPlugin/test/bootstrap.php
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/form/sfFormLanguageTest.php b/lib/plugins/sfFormExtraPlugin/test/form/sfFormLanguageTest.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/form/sfFormLanguageTest.php
rename to lib/plugins/sfFormExtraPlugin/test/form/sfFormLanguageTest.php
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/validator/sfValidatorBlacklistTest.php b/lib/plugins/sfFormExtraPlugin/test/validator/sfValidatorBlacklistTest.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/validator/sfValidatorBlacklistTest.php
rename to lib/plugins/sfFormExtraPlugin/test/validator/sfValidatorBlacklistTest.php
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/validator/sfValidatorReCaptchaTest.php b/lib/plugins/sfFormExtraPlugin/test/validator/sfValidatorReCaptchaTest.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/validator/sfValidatorReCaptchaTest.php
rename to lib/plugins/sfFormExtraPlugin/test/validator/sfValidatorReCaptchaTest.php
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/validator/sfValidatorSchemaTimeIntervalTest.php b/lib/plugins/sfFormExtraPlugin/test/validator/sfValidatorSchemaTimeIntervalTest.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/validator/sfValidatorSchemaTimeIntervalTest.php
rename to lib/plugins/sfFormExtraPlugin/test/validator/sfValidatorSchemaTimeIntervalTest.php
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/widget/sfWidgetFormReCaptchaTest.php b/lib/plugins/sfFormExtraPlugin/test/widget/sfWidgetFormReCaptchaTest.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/widget/sfWidgetFormReCaptchaTest.php
rename to lib/plugins/sfFormExtraPlugin/test/widget/sfWidgetFormReCaptchaTest.php
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/widget/sfWidgetFormSelectUSStateTest.php b/lib/plugins/sfFormExtraPlugin/test/widget/sfWidgetFormSelectUSStateTest.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/test/widget/sfWidgetFormSelectUSStateTest.php
rename to lib/plugins/sfFormExtraPlugin/test/widget/sfWidgetFormSelectUSStateTest.php
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/web/css/jquery.autocompleter.css b/lib/plugins/sfFormExtraPlugin/web/css/jquery.autocompleter.css
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/web/css/jquery.autocompleter.css
rename to lib/plugins/sfFormExtraPlugin/web/css/jquery.autocompleter.css
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/web/images/indicator.gif b/lib/plugins/sfFormExtraPlugin/web/images/indicator.gif
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/web/images/indicator.gif
rename to lib/plugins/sfFormExtraPlugin/web/images/indicator.gif
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/web/images/next.png b/lib/plugins/sfFormExtraPlugin/web/images/next.png
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/web/images/next.png
rename to lib/plugins/sfFormExtraPlugin/web/images/next.png
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/web/images/previous.png b/lib/plugins/sfFormExtraPlugin/web/images/previous.png
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/web/images/previous.png
rename to lib/plugins/sfFormExtraPlugin/web/images/previous.png
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/web/js/double_list.js b/lib/plugins/sfFormExtraPlugin/web/js/double_list.js
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/web/js/double_list.js
rename to lib/plugins/sfFormExtraPlugin/web/js/double_list.js
diff --git a/lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/web/js/jquery.autocompleter.js b/lib/plugins/sfFormExtraPlugin/web/js/jquery.autocompleter.js
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfFormExtraPlugin/web/js/jquery.autocompleter.js
rename to lib/plugins/sfFormExtraPlugin/web/js/jquery.autocompleter.js
diff --git a/lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/LICENSE b/lib/plugins/sfImageHandlerPlugin/LICENSE
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/LICENSE
rename to lib/plugins/sfImageHandlerPlugin/LICENSE
diff --git a/lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/config/config.php b/lib/plugins/sfImageHandlerPlugin/config/config.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/config/config.php
rename to lib/plugins/sfImageHandlerPlugin/config/config.php
diff --git a/lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/helper/sfImageHelper.php b/lib/plugins/sfImageHandlerPlugin/lib/helper/sfImageHelper.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/helper/sfImageHelper.php
rename to lib/plugins/sfImageHandlerPlugin/lib/helper/sfImageHelper.php
diff --git a/lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGenerator.class.php b/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGenerator.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGenerator.class.php
rename to lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGenerator.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorGD.class.php b/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorGD.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorGD.class.php
rename to lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorGD.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorIM.class.php b/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorIM.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorIM.class.php
rename to lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorIM.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php b/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php
rename to lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php
diff --git a/lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/sfImageHandler.class.php b/lib/plugins/sfImageHandlerPlugin/lib/image/sfImageHandler.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/sfImageHandler.class.php
rename to lib/plugins/sfImageHandlerPlugin/lib/image/sfImageHandler.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/storage/sfImageStorageDefault.class.php b/lib/plugins/sfImageHandlerPlugin/lib/image/storage/sfImageStorageDefault.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/storage/sfImageStorageDefault.class.php
rename to lib/plugins/sfImageHandlerPlugin/lib/image/storage/sfImageStorageDefault.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/storage/sfImageStorageFilesystem.class.php b/lib/plugins/sfImageHandlerPlugin/lib/image/storage/sfImageStorageFilesystem.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/image/storage/sfImageStorageFilesystem.class.php
rename to lib/plugins/sfImageHandlerPlugin/lib/image/storage/sfImageStorageFilesystem.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/sfImageHandlerRouting.class.php b/lib/plugins/sfImageHandlerPlugin/lib/sfImageHandlerRouting.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/sfImageHandlerRouting.class.php
rename to lib/plugins/sfImageHandlerPlugin/lib/sfImageHandlerRouting.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/sfImageHandlerUser.class.php b/lib/plugins/sfImageHandlerPlugin/lib/sfImageHandlerUser.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/lib/sfImageHandlerUser.class.php
rename to lib/plugins/sfImageHandlerPlugin/lib/sfImageHandlerUser.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/modules/image/actions/actions.class.php b/lib/plugins/sfImageHandlerPlugin/modules/image/actions/actions.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfImageHandlerPlugin/modules/image/actions/actions.class.php
rename to lib/plugins/sfImageHandlerPlugin/modules/image/actions/actions.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/LICENSE b/lib/plugins/sfProtoculousPlugin/LICENSE
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/LICENSE
rename to lib/plugins/sfProtoculousPlugin/LICENSE
diff --git a/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/LICENSE.prototype b/lib/plugins/sfProtoculousPlugin/LICENSE.prototype
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/LICENSE.prototype
rename to lib/plugins/sfProtoculousPlugin/LICENSE.prototype
diff --git a/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/LICENSE.script.aculo.us b/lib/plugins/sfProtoculousPlugin/LICENSE.script.aculo.us
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/LICENSE.script.aculo.us
rename to lib/plugins/sfProtoculousPlugin/LICENSE.script.aculo.us
diff --git a/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/config/settings.yml b/lib/plugins/sfProtoculousPlugin/config/settings.yml
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/config/settings.yml
rename to lib/plugins/sfProtoculousPlugin/config/settings.yml
diff --git a/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/lib/helper/ProtoculousHelper.php b/lib/plugins/sfProtoculousPlugin/lib/helper/ProtoculousHelper.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/lib/helper/ProtoculousHelper.php
rename to lib/plugins/sfProtoculousPlugin/lib/helper/ProtoculousHelper.php
diff --git a/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/css/input_auto_complete_tag.css b/lib/plugins/sfProtoculousPlugin/web/css/input_auto_complete_tag.css
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/css/input_auto_complete_tag.css
rename to lib/plugins/sfProtoculousPlugin/web/css/input_auto_complete_tag.css
diff --git a/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/builder.js b/lib/plugins/sfProtoculousPlugin/web/js/builder.js
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/builder.js
rename to lib/plugins/sfProtoculousPlugin/web/js/builder.js
diff --git a/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/controls.js b/lib/plugins/sfProtoculousPlugin/web/js/controls.js
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/controls.js
rename to lib/plugins/sfProtoculousPlugin/web/js/controls.js
diff --git a/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/dragdrop.js b/lib/plugins/sfProtoculousPlugin/web/js/dragdrop.js
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/dragdrop.js
rename to lib/plugins/sfProtoculousPlugin/web/js/dragdrop.js
diff --git a/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/effects.js b/lib/plugins/sfProtoculousPlugin/web/js/effects.js
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/effects.js
rename to lib/plugins/sfProtoculousPlugin/web/js/effects.js
diff --git a/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/index.html b/lib/plugins/sfProtoculousPlugin/web/js/index.html
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/index.html
rename to lib/plugins/sfProtoculousPlugin/web/js/index.html
diff --git a/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/prototype.js b/lib/plugins/sfProtoculousPlugin/web/js/prototype.js
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/prototype.js
rename to lib/plugins/sfProtoculousPlugin/web/js/prototype.js
diff --git a/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/scriptaculous.js b/lib/plugins/sfProtoculousPlugin/web/js/scriptaculous.js
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/scriptaculous.js
rename to lib/plugins/sfProtoculousPlugin/web/js/scriptaculous.js
diff --git a/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/slider.js b/lib/plugins/sfProtoculousPlugin/web/js/slider.js
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/slider.js
rename to lib/plugins/sfProtoculousPlugin/web/js/slider.js
diff --git a/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/sound.js b/lib/plugins/sfProtoculousPlugin/web/js/sound.js
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/sound.js
rename to lib/plugins/sfProtoculousPlugin/web/js/sound.js
diff --git a/lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/unittest.js b/lib/plugins/sfProtoculousPlugin/web/js/unittest.js
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfProtoculousPlugin/web/js/unittest.js
rename to lib/plugins/sfProtoculousPlugin/web/js/unittest.js
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/LISENCE b/lib/plugins/sfSymfonyTemplatingViewPlugin/LISENCE
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/LISENCE
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/LISENCE
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/NOTICE b/lib/plugins/sfSymfonyTemplatingViewPlugin/NOTICE
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/NOTICE
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/NOTICE
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/README b/lib/plugins/sfSymfonyTemplatingViewPlugin/README
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/README
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/README
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/config/config.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/config/config.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/config/config.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/config/config.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateAbstractSwitchableLoader.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateAbstractSwitchableLoader.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateAbstractSwitchableLoader.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateAbstractSwitchableLoader.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateLoaderSwitcher.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateLoaderSwitcher.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateLoaderSwitcher.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateLoaderSwitcher.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateSwitchableLoaderDoctrine.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateSwitchableLoaderDoctrine.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateSwitchableLoaderDoctrine.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateSwitchableLoaderDoctrine.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateSwitchableLoaderFilesystemForSymfony1.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateSwitchableLoaderFilesystemForSymfony1.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateSwitchableLoaderFilesystemForSymfony1.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/loader/sfTemplateSwitchableLoaderFilesystemForSymfony1.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/renderer/sfTemplateRendererSmarty.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/renderer/sfTemplateRendererSmarty.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/renderer/sfTemplateRendererSmarty.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/renderer/sfTemplateRendererSmarty.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/renderer/sfTemplateRendererTwig.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/renderer/sfTemplateRendererTwig.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/renderer/sfTemplateRendererTwig.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/renderer/sfTemplateRendererTwig.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateAutoloader.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateAutoloader.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateAutoloader.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateAutoloader.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateDebuggerInterface.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateDebuggerInterface.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateDebuggerInterface.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateDebuggerInterface.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateEngine.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateEngine.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateEngine.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateEngine.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelper.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelper.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelper.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelper.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperAssets.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperAssets.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperAssets.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperAssets.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperInterface.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperInterface.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperInterface.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperInterface.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperJavascripts.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperJavascripts.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperJavascripts.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperJavascripts.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperSet.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperSet.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperSet.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperSet.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperStylesheets.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperStylesheets.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperStylesheets.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateHelperStylesheets.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoader.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoader.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoader.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoader.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderCache.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderCache.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderCache.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderCache.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderChain.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderChain.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderChain.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderChain.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderCompilableInterface.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderCompilableInterface.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderCompilableInterface.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderCompilableInterface.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderFilesystem.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderFilesystem.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderFilesystem.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderFilesystem.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderInterface.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderInterface.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderInterface.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateLoaderInterface.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRenderer.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRenderer.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRenderer.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRenderer.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRendererInterface.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRendererInterface.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRendererInterface.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRendererInterface.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRendererPhp.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRendererPhp.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRendererPhp.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateRendererPhp.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorage.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorage.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorage.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorage.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorageFile.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorageFile.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorageFile.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorageFile.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorageString.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorageString.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorageString.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/SymfonyTemplating/sfTemplateStorageString.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Autoloader.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Autoloader.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Autoloader.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Autoloader.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Compiler.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Compiler.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Compiler.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Compiler.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/CompilerInterface.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/CompilerInterface.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/CompilerInterface.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/CompilerInterface.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Environment.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Environment.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Environment.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Environment.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Error.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Error.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Error.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Error.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ExpressionParser.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ExpressionParser.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ExpressionParser.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ExpressionParser.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Core.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Core.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Core.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Core.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Escaper.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Escaper.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Escaper.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Escaper.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Sandbox.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Sandbox.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Sandbox.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Extension/Sandbox.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ExtensionInterface.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ExtensionInterface.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ExtensionInterface.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ExtensionInterface.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter/Function.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter/Function.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter/Function.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter/Function.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter/Method.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter/Method.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter/Method.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Filter/Method.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Lexer.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Lexer.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Lexer.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Lexer.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/LexerInterface.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/LexerInterface.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/LexerInterface.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/LexerInterface.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/Array.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/Array.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/Array.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/Array.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/Filesystem.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/Filesystem.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/Filesystem.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/Filesystem.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/String.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/String.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/String.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Loader/String.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/LoaderInterface.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/LoaderInterface.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/LoaderInterface.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/LoaderInterface.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Macro.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Macro.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Macro.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Macro.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/AutoEscape.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/AutoEscape.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/AutoEscape.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/AutoEscape.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Block.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Block.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Block.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Block.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/BlockReference.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/BlockReference.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/BlockReference.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/BlockReference.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Debug.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Debug.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Debug.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Debug.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Array.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Array.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Array.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Array.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/AssignName.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/AssignName.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/AssignName.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/AssignName.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Add.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Add.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Add.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Add.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/And.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/And.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/And.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/And.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Concat.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Concat.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Concat.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Concat.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Div.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Div.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Div.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Div.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Mod.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Mod.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Mod.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Mod.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Mul.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Mul.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Mul.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Mul.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Or.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Or.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Or.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Or.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Sub.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Sub.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Sub.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Binary/Sub.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Compare.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Compare.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Compare.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Compare.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Conditional.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Conditional.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Conditional.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Conditional.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Constant.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Constant.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Constant.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Constant.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Filter.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Filter.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Filter.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Filter.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/GetAttr.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/GetAttr.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/GetAttr.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/GetAttr.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Name.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Name.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Name.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Name.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Neg.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Neg.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Neg.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Neg.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Not.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Not.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Not.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Not.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Pos.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Pos.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Pos.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Expression/Unary/Pos.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Filter.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Filter.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Filter.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Filter.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/For.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/For.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/For.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/For.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/If.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/If.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/If.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/If.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Import.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Import.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Import.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Import.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Include.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Include.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Include.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Include.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Macro.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Macro.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Macro.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Macro.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Module.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Module.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Module.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Module.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Parent.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Parent.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Parent.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Parent.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Print.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Print.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Print.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Print.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Set.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Set.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Set.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Set.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Text.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Text.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Text.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Node/Text.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeList.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeList.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeList.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeList.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeListInterface.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeListInterface.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeListInterface.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeListInterface.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeTraverser.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeTraverser.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeTraverser.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeTraverser.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Escaper.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Escaper.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Escaper.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Escaper.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Filter.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Filter.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Filter.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Filter.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Sandbox.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Sandbox.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Sandbox.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitor/Sandbox.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitorInterface.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitorInterface.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitorInterface.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/NodeVisitorInterface.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Parser.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Parser.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Parser.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Parser.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ParserInterface.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ParserInterface.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ParserInterface.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/ParserInterface.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Resource.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Resource.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Resource.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Resource.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/RuntimeError.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/RuntimeError.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/RuntimeError.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/RuntimeError.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityError.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityError.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityError.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityError.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityPolicy.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityPolicy.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityPolicy.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityPolicy.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityPolicyInterface.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityPolicyInterface.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityPolicyInterface.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Sandbox/SecurityPolicyInterface.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/SyntaxError.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/SyntaxError.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/SyntaxError.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/SyntaxError.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Template.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Template.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Template.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Template.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TemplateInterface.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TemplateInterface.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TemplateInterface.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TemplateInterface.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Token.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Token.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Token.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/Token.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/AutoEscape.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/AutoEscape.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/AutoEscape.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/AutoEscape.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Block.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Block.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Block.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Block.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Debug.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Debug.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Debug.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Debug.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Display.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Display.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Display.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Display.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Extends.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Extends.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Extends.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Extends.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Filter.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Filter.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Filter.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Filter.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/For.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/For.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/For.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/For.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/If.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/If.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/If.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/If.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Import.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Import.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Import.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Import.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Include.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Include.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Include.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Include.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Macro.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Macro.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Macro.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Macro.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Parent.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Parent.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Parent.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Parent.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Set.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Set.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Set.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenParser/Set.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenStream.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenStream.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenStream.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/Twig/TokenStream.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Config_File.class.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Config_File.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Config_File.class.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Config_File.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Smarty.class.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Smarty.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Smarty.class.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Smarty.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Smarty_Compiler.class.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Smarty_Compiler.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Smarty_Compiler.class.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/Smarty_Compiler.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/debug.tpl b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/debug.tpl
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/debug.tpl
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/debug.tpl
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.assemble_plugin_filepath.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.assemble_plugin_filepath.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.assemble_plugin_filepath.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.assemble_plugin_filepath.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.assign_smarty_interface.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.assign_smarty_interface.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.assign_smarty_interface.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.assign_smarty_interface.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.create_dir_structure.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.create_dir_structure.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.create_dir_structure.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.create_dir_structure.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.display_debug_console.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.display_debug_console.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.display_debug_console.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.display_debug_console.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_include_path.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_include_path.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_include_path.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_include_path.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_microtime.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_microtime.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_microtime.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_microtime.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_php_resource.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_php_resource.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_php_resource.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.get_php_resource.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.is_secure.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.is_secure.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.is_secure.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.is_secure.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.is_trusted.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.is_trusted.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.is_trusted.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.is_trusted.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.load_plugins.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.load_plugins.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.load_plugins.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.load_plugins.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.load_resource_plugin.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.load_resource_plugin.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.load_resource_plugin.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.load_resource_plugin.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.process_cached_inserts.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.process_cached_inserts.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.process_cached_inserts.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.process_cached_inserts.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.process_compiled_include.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.process_compiled_include.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.process_compiled_include.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.process_compiled_include.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.read_cache_file.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.read_cache_file.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.read_cache_file.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.read_cache_file.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.rm_auto.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.rm_auto.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.rm_auto.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.rm_auto.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.rmdir.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.rmdir.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.rmdir.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.rmdir.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.run_insert_handler.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.run_insert_handler.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.run_insert_handler.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.run_insert_handler.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.smarty_include_php.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.smarty_include_php.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.smarty_include_php.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.smarty_include_php.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_cache_file.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_cache_file.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_cache_file.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_cache_file.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_compiled_include.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_compiled_include.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_compiled_include.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_compiled_include.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_compiled_resource.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_compiled_resource.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_compiled_resource.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_compiled_resource.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_file.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_file.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_file.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/internals/core.write_file.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/block.textformat.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/block.textformat.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/block.textformat.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/block.textformat.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/compiler.assign.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/compiler.assign.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/compiler.assign.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/compiler.assign.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.assign_debug_info.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.assign_debug_info.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.assign_debug_info.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.assign_debug_info.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.config_load.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.config_load.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.config_load.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.config_load.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.counter.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.counter.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.counter.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.counter.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.cycle.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.cycle.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.cycle.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.cycle.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.debug.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.debug.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.debug.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.debug.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.eval.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.eval.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.eval.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.eval.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.fetch.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.fetch.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.fetch.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.fetch.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_checkboxes.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_checkboxes.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_checkboxes.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_checkboxes.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_image.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_image.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_image.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_image.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_options.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_options.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_options.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_options.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_radios.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_radios.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_radios.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_radios.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_select_date.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_select_date.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_select_date.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_select_date.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_select_time.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_select_time.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_select_time.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_select_time.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_table.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_table.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_table.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.html_table.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.mailto.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.mailto.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.mailto.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.mailto.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.math.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.math.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.math.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.math.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.popup.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.popup.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.popup.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.popup.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.popup_init.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.popup_init.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.popup_init.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/function.popup_init.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.capitalize.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.capitalize.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.capitalize.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.capitalize.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.cat.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.cat.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.cat.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.cat.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_characters.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_characters.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_characters.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_characters.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_paragraphs.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_paragraphs.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_paragraphs.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_paragraphs.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_sentences.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_sentences.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_sentences.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_sentences.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_words.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_words.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_words.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.count_words.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.date_format.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.date_format.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.date_format.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.date_format.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.debug_print_var.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.debug_print_var.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.debug_print_var.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.debug_print_var.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.default.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.default.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.default.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.default.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.escape.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.escape.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.escape.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.escape.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.indent.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.indent.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.indent.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.indent.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.lower.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.lower.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.lower.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.lower.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.nl2br.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.nl2br.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.nl2br.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.nl2br.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.regex_replace.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.regex_replace.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.regex_replace.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.regex_replace.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.replace.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.replace.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.replace.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.replace.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.spacify.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.spacify.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.spacify.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.spacify.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.string_format.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.string_format.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.string_format.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.string_format.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.strip.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.strip.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.strip.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.strip.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.strip_tags.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.strip_tags.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.strip_tags.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.strip_tags.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.truncate.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.truncate.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.truncate.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.truncate.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.upper.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.upper.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.upper.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.upper.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.wordwrap.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.wordwrap.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.wordwrap.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/modifier.wordwrap.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/outputfilter.trimwhitespace.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/outputfilter.trimwhitespace.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/outputfilter.trimwhitespace.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/outputfilter.trimwhitespace.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/shared.escape_special_chars.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/shared.escape_special_chars.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/shared.escape_special_chars.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/shared.escape_special_chars.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/shared.make_timestamp.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/shared.make_timestamp.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/shared.make_timestamp.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/vendor/smarty2/plugins/shared.make_timestamp.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/view/sfTemplatingComponentPartialView.class.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/view/sfTemplatingComponentPartialView.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/view/sfTemplatingComponentPartialView.class.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/view/sfTemplatingComponentPartialView.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/view/sfTemplatingComponentView.class.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/view/sfTemplatingComponentView.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/lib/view/sfTemplatingComponentView.class.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/lib/view/sfTemplatingComponentView.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/bootstrap/config.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/bootstrap/config.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/bootstrap/config.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/bootstrap/config.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_ebi.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_ebi.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_ebi.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_ebi.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_ebi.xml.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_ebi.xml.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_ebi.xml.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_ebi.xml.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_params.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_params.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_params.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_params.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_params.xml.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_params.xml.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_params.xml.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/_params.xml.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/actionSuccess.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/actionSuccess.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/actionSuccess.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/actionSuccess.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/actionSuccess.xml.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/actionSuccess.xml.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/actionSuccess.xml.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/actionSuccess.xml.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/helperSuccess.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/helperSuccess.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/helperSuccess.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/helperSuccess.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/withLayoutSuccess.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/withLayoutSuccess.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/withLayoutSuccess.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/withLayoutSuccess.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/withLayoutSuccess.xml.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/withLayoutSuccess.xml.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/withLayoutSuccess.xml.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/module/withLayoutSuccess.xml.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_ebi.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_ebi.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_ebi.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_ebi.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_ebi.xml.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_ebi.xml.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_ebi.xml.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_ebi.xml.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_helper.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_helper.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_helper.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_helper.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_helper.xml.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_helper.xml.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_helper.xml.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/_helper.xml.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/layout.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/layout.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/layout.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/layout.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/layout.xml.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/layout.xml.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/layout.xml.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/layout.xml.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/smarty.tpl b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/smarty.tpl
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/smarty.tpl
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/smarty.tpl
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/twig.tpl b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/twig.tpl
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/twig.tpl
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/fixtures/template/twig.tpl
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateAbstractSwitchableLoaderTest.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateAbstractSwitchableLoaderTest.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateAbstractSwitchableLoaderTest.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateAbstractSwitchableLoaderTest.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateLoaderSwitcherTest.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateLoaderSwitcherTest.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateLoaderSwitcherTest.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateLoaderSwitcherTest.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateSwitchableLoaderDoctrineTest.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateSwitchableLoaderDoctrineTest.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateSwitchableLoaderDoctrineTest.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateSwitchableLoaderDoctrineTest.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateSwitchableLoaderFilesystemForSymfony1Test.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateSwitchableLoaderFilesystemForSymfony1Test.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateSwitchableLoaderFilesystemForSymfony1Test.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/loader/sfTemplateSwitchableLoaderFilesystemForSymfony1Test.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/renderer/sfTemplateRendererSmartyTest.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/renderer/sfTemplateRendererSmartyTest.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/renderer/sfTemplateRendererSmartyTest.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/renderer/sfTemplateRendererSmartyTest.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/renderer/sfTemplateRendererTwigTest.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/renderer/sfTemplateRendererTwigTest.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/renderer/sfTemplateRendererTwigTest.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/renderer/sfTemplateRendererTwigTest.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/sfApplicationConfigurationMock.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/sfApplicationConfigurationMock.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/sfApplicationConfigurationMock.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/sfApplicationConfigurationMock.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/sfContextMock.class.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/sfContextMock.class.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/sfContextMock.class.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/sfContextMock.class.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/view/sfTemplatingComponentPartialViewTest.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/view/sfTemplatingComponentPartialViewTest.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/view/sfTemplatingComponentPartialViewTest.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/view/sfTemplatingComponentPartialViewTest.php
diff --git a/lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/view/sfTemplatingComponentViewTest.php b/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/view/sfTemplatingComponentViewTest.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/view/sfTemplatingComponentViewTest.php
rename to lib/plugins/sfSymfonyTemplatingViewPlugin/test/unit/view/sfTemplatingComponentViewTest.php

From 1a8e608d08a4bcc2b44f773c0a1ac33eb09e30d2 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Sat, 10 Dec 2011 16:36:19 +0900
Subject: [PATCH 049/630] add JSON API implementation (refs #2698)

---
 apps/api/config/settings.yml                  |  15 ++-
 apps/api/lib/myUser.class.php                 |  71 +++++++++++
 .../modules/default/actions/actions.class.php |  62 ++++++++++
 apps/pc_frontend/config/routing.yml           |   4 +
 .../modules/member/actions/actions.class.php  |  20 ++++
 .../member/templates/configJsonApiSuccess.php |  14 +++
 .../member/templates/configSuccess.php        |   5 +
 apps/pc_frontend/templates/_layout.php        |  14 ++-
 lib/action/opJsonApiActions.class.php         | 113 ++++++++++++++++++
 lib/exception/opErrorHttpException.class.php  |  72 +++++++++++
 lib/model/doctrine/Member.class.php           |  20 ++++
 lib/user/opSecurityUser.class.php             |  12 ++
 lib/view/opJsonApiView.class.php              |  70 +++++++++++
 13 files changed, 488 insertions(+), 4 deletions(-)
 create mode 100644 apps/api/modules/default/actions/actions.class.php
 create mode 100644 apps/pc_frontend/modules/member/templates/configJsonApiSuccess.php
 create mode 100644 lib/action/opJsonApiActions.class.php
 create mode 100644 lib/exception/opErrorHttpException.class.php
 create mode 100644 lib/view/opJsonApiView.class.php

diff --git a/apps/api/config/settings.yml b/apps/api/config/settings.yml
index a5f6a520c..9a4b88e08 100644
--- a/apps/api/config/settings.yml
+++ b/apps/api/config/settings.yml
@@ -30,8 +30,17 @@ all:
 
 #all:
 #  .actions:
-#    error_404_module:       default   # To be called when a 404 error is raised
-#    error_404_action:       error404  # Or when the requested URL doesn't match any route
+    error_404_module:       default   # To be called when a 404 error is raised
+    error_404_action:       error404  # Or when the requested URL doesn't match any route
+
+    error_400_module:       default
+    error_400_action:       error400
+
+    error_401_module:       default
+    error_401_action:       error401
+
+    error_403_module:       default
+    error_403_action:       error403
 #
 #    login_module:           default   # To be called when a non-authenticated user
 #    login_action:           login     # Tries to access a secure page
@@ -42,7 +51,7 @@ all:
 #    module_disabled_module: default   # To be called when a user requests 
 #    module_disabled_action: disabled  # A module disabled in the module.yml
 #
-  .settings:
+#  .settings:
 #    # Optional features. Deactivating unused features boots performance a bit.
 #    use_database:           on        # Enable database manager. Set to off if you don't use a database.
     i18n:                   on       # Enable interface translation. Set to off if your application should not be translated.
diff --git a/apps/api/lib/myUser.class.php b/apps/api/lib/myUser.class.php
index 4c793028e..7b0c6b115 100644
--- a/apps/api/lib/myUser.class.php
+++ b/apps/api/lib/myUser.class.php
@@ -1,5 +1,76 @@
 <?php
 
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * myUser
+ *
+ * @package    OpenPNE
+ * @subpackage user
+ * @author     Kimura Youichi <kim.upsilon@gmail.com>
+ */
 class myUser extends sfBasicSecurityUser
 {
+  protected
+    $member = null;
+
+  public function getMemberByApiKey($apiKey)
+  {
+    if (!$apiKey)
+    {
+      return null;
+    }
+
+    $config = Doctrine::getTable('MemberConfig')->createQuery('c')
+      ->leftJoin('c.Member')
+      ->where('c.name = \'api_key\'')
+      ->where('c.value = ?', $apiKey)
+      ->fetchOne();
+
+    if (!$config)
+    {
+      return null;
+    }
+
+    return $config->getMember();
+  }
+
+  public function getMember()
+  {
+    if (null !== $this->member)
+    {
+      return $this->member;
+    }
+
+    $request = sfContext::getInstance()->getRequest();
+
+    $apiKey = $request['apiKey'];
+    if (false === $apiKey)
+    {
+      $exception = new opErrorHttpException('apiKey parameter not specified.');
+      throw $exception->setHttpStatusCode(401);
+    }
+
+    $member = $this->getMemberByApiKey($apiKey);
+    if (null === $member)
+    {
+      $exception = new opErrorHttpException('Invalid API key.');
+      throw $exception->setHttpStatusCode(401);
+    }
+
+    $this->member = $member;
+
+    return $member;
+  }
+
+  public function getMemberId()
+  {
+    return $this->getMember()->getId();
+  }
 }
diff --git a/apps/api/modules/default/actions/actions.class.php b/apps/api/modules/default/actions/actions.class.php
new file mode 100644
index 000000000..cd3ea6c68
--- /dev/null
+++ b/apps/api/modules/default/actions/actions.class.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * default actions.
+ *
+ * @package    OpenPNE
+ * @subpackage default
+ * @author     Kimura Youichi <kim.upsilon@gmail.com>
+ */
+class defaultActions extends sfActions
+{
+  public function executeError400(sfWebRequest $request)
+  {
+    $this->getResponse()->setStatusCode(400);
+
+    return $this->renderError($request['error_message']);
+  }
+
+  public function executeError401(sfWebRequest $request)
+  {
+    $this->getResponse()->setStatusCode(401);
+
+    return $this->renderError($request['error_message']);
+  }
+
+  public function executeError403(sfWebRequest $request)
+  {
+    $this->getResponse()->setStatusCode(403);
+
+    return $this->renderError($request['error_message']);
+  }
+
+  public function executeError404(sfWebRequest $request)
+  {
+    $this->getResponse()->setStatusCode(404);
+
+    return $this->renderError($request['error_message']);
+  }
+
+  protected function renderError($message = null)
+  {
+    $response = $this->getResponse();
+    $response->setContentType('text/plain');
+
+    $errorText = $response->getStatusCode().' '.$response->getStatusText();
+
+    if ($message)
+    {
+      $errorText .= ': '.$message;
+    }
+
+    return $this->renderText($errorText);
+  }
+}
diff --git a/apps/pc_frontend/config/routing.yml b/apps/pc_frontend/config/routing.yml
index 88d0f07ad..f87514b83 100644
--- a/apps/pc_frontend/config/routing.yml
+++ b/apps/pc_frontend/config/routing.yml
@@ -58,6 +58,10 @@ member_config_image:
   url: /member/image/config
   param: { module: member, action: configImage }
 
+member_config_jsonapi:
+  url: /member/config/jsonapi
+  param: { module: member, action: configJsonApi }
+
 member_config:
   url: /member/config
   param: { module: member, action: config }
diff --git a/apps/pc_frontend/modules/member/actions/actions.class.php b/apps/pc_frontend/modules/member/actions/actions.class.php
index 793704f7d..e13f5510c 100644
--- a/apps/pc_frontend/modules/member/actions/actions.class.php
+++ b/apps/pc_frontend/modules/member/actions/actions.class.php
@@ -231,6 +231,26 @@ public function executeSmtConfigImage(opWebRequest $request)
     return parent::executeConfigImage($request);
   }
 
+ /**
+  * Executes configJsonApi action
+  *
+  * @param sfRequest $request A request object
+  */
+  public function executeConfigJsonApi($request)
+  {
+    $member = $this->getUser()->getMember();
+
+    if (isset($request['reset_api_key']) && '1' === $request['reset_api_key'])
+    {
+      $request->checkCSRFProtection();
+      $member->generateApiKey();
+    }
+
+    $this->apiKey = $member->getApiKey();
+
+    return sfView::SUCCESS;
+  }
+
  /**
   * Executes registerMobileToRegisterEnd action
   *
diff --git a/apps/pc_frontend/modules/member/templates/configJsonApiSuccess.php b/apps/pc_frontend/modules/member/templates/configJsonApiSuccess.php
new file mode 100644
index 000000000..c48ba35c5
--- /dev/null
+++ b/apps/pc_frontend/modules/member/templates/configJsonApiSuccess.php
@@ -0,0 +1,14 @@
+<?php slot('body') ?>
+<div class="body">
+<p>
+<?php echo __('You can provide this API key to third party applications.') ?>
+</p>
+<div class="apiKey"><?php echo $apiKey ?></div>
+<p>
+<?php echo link_to(__('Reset API key'), '@member_config_jsonapi?reset_api_key=1', array('method' => 'post')) ?>
+</p>
+</div>
+<?php end_slot() ?>
+<?php op_include_box('memberConfigJsonApiBox', get_slot('body'), array(
+  'title'  => __('API Key'),
+)); ?>
diff --git a/apps/pc_frontend/modules/member/templates/configSuccess.php b/apps/pc_frontend/modules/member/templates/configSuccess.php
index 5f2c4a2ee..f6f08a623 100644
--- a/apps/pc_frontend/modules/member/templates/configSuccess.php
+++ b/apps/pc_frontend/modules/member/templates/configSuccess.php
@@ -19,6 +19,11 @@
   $list[] = link_to(__('Connecting with External Application'), '@connection_list');
 }
 
+if (opConfig::get('enable_jsonapi'))
+{
+  $list[] = link_to(__('JSON API Configuration'), '@member_config_jsonapi');
+}
+
 if (opConfig::get('enable_openid'))
 {
   $list[] = link_to(__('OpenID Configuration'), '@openid_list');
diff --git a/apps/pc_frontend/templates/_layout.php b/apps/pc_frontend/templates/_layout.php
index 06bb04b7a..cc1eca579 100644
--- a/apps/pc_frontend/templates/_layout.php
+++ b/apps/pc_frontend/templates/_layout.php
@@ -5,10 +5,22 @@
 <?php include_metas() ?>
 <?php include_title() ?>
 <?php include_stylesheets() ?>
-<?php include_javascripts() ?>
 <?php if (Doctrine::getTable('SnsConfig')->get('customizing_css')): ?>
 <link rel="stylesheet" type="text/css" href="<?php echo url_for('@customizing_css') ?>" />
 <?php endif; ?>
+<?php
+use_helper('Javascript');
+
+$json = array(
+  'apiKey' => $sf_user->getMemberApiKey(),
+  'apiBase' => app_url_for('api', 'homepage'),
+);
+
+echo javascript_tag('
+var openpne = '.json_encode($json, defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0).';
+');
+?>
+<?php include_javascripts() ?>
 <?php echo $op_config->get('pc_html_head') ?>
 </head>
 <body id="<?php printf('page_%s_%s', $view->getModuleName(), $view->getActionName()) ?>" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
diff --git a/lib/action/opJsonApiActions.class.php b/lib/action/opJsonApiActions.class.php
new file mode 100644
index 000000000..463a5d6e3
--- /dev/null
+++ b/lib/action/opJsonApiActions.class.php
@@ -0,0 +1,113 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * opJsonApiAction
+ *
+ * @package    OpenPNE
+ * @subpackage action
+ * @author     Kimura Youichi <kim.upsilon@gmail.com>
+ */
+class opJsonApiActions extends sfActions
+{
+  protected
+    $member = null,
+    $doEscapeText = false;
+
+  public function execute($request)
+  {
+    $moduleName = strtolower($this->moduleName);
+    sfConfig::set('mod_'.$moduleName.'_view_class', 'opJsonApi');
+    $this->getResponse()->setContentType('application/json');
+
+    $enableEscaping = true;
+    if (isset($request['escaping']))
+    {
+      $enableEscaping = in_array($request['escaping'], array('1', 'on', 'true'));
+    }
+    sfConfig::set('sf_escaping_strategy', $enableEscaping);
+
+    return parent::execute($request);
+  }
+
+  public function renderJSON(array $data)
+  {
+    $json = json_encode($data, $this->doEscape);
+    $this->getResponse()->setContentType('application/json');
+
+    return $this->renderText($json);
+  }
+
+  public function forward400($message = null)
+  {
+    $exception = new opErrorHttpException($message);
+    throw $exception->setHttpStatusCode(400);
+  }
+
+  public function forward400If($condition, $message = null)
+  {
+    if ($condition)
+    {
+      $this->forward400($message);
+    }
+  }
+
+  public function forward400Unless($condition, $message = null)
+  {
+    if (!$condition)
+    {
+      $this->forward400($message);
+    }
+  }
+
+  public function forward401($message = null)
+  {
+    $exception = new opErrorHttpException($message);
+    throw $exception->setHttpStatusCode(401);
+  }
+
+  public function forward401If($condition, $message = null)
+  {
+    if ($condition)
+    {
+      $this->forward401($message);
+    }
+  }
+
+  public function forward401Unless($condition, $message = null)
+  {
+    if (!$condition)
+    {
+      $this->forward401($message);
+    }
+  }
+
+  public function forward403($message = null)
+  {
+    $exception = new opErrorHttpException($message);
+    throw $exception->setHttpStatusCode(403);
+  }
+
+  public function forward403If($condition, $message = null)
+  {
+    if ($condition)
+    {
+      $this->forward403($message);
+    }
+  }
+
+  public function forward403Unless($condition, $message = null)
+  {
+    if (!$condition)
+    {
+      $this->forward403($message);
+    }
+  }
+}
diff --git a/lib/exception/opErrorHttpException.class.php b/lib/exception/opErrorHttpException.class.php
new file mode 100644
index 000000000..e17112af6
--- /dev/null
+++ b/lib/exception/opErrorHttpException.class.php
@@ -0,0 +1,72 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * opErrorHttpException
+ *
+ * @package    OpenPNE
+ * @subpackage exception
+ * @author     Kimura Youichi <kim.upsilon@gmail.com>
+ */
+class opErrorHttpException extends sfError404Exception
+{
+  protected
+    $httpStatusCode = 404;
+
+  public function getHttpStatusCode()
+  {
+    return $this->httpStatusCode;
+  }
+
+  public function setHttpStatusCode($statusCode)
+  {
+    $this->httpStatusCode = $statusCode;
+    return $this;
+  }
+
+  /**
+   * Forwards to the error action.
+   */
+  public function printStackTrace()
+  {
+    $exception = null === $this->wrappedException ? $this : $this->wrappedException;
+
+    if (sfConfig::get('sf_debug'))
+    {
+      $response = sfContext::getInstance()->getResponse();
+      if (null === $response)
+      {
+        $response = new sfWebResponse(sfContext::getInstance()->getEventDispatcher());
+        sfContext::getInstance()->setResponse($response);
+      }
+
+      $response->setStatusCode($this->httpStatusCode);
+
+      return parent::printStackTrace();
+    }
+    else
+    {
+      // log all exceptions in php log
+      if (!sfConfig::get('sf_test'))
+      {
+        error_log($this->getMessage());
+      }
+
+      if ($this->getMessage())
+      {
+        sfContext::getInstance()->getRequest()->setParameter('error_message', $this->getMessage());
+      }
+
+      $module = sfConfig::get('sf_error_'.$this->httpStatusCode.'_module', sfConfig::get('sf_error_404_module', 'default'));
+      $action = sfConfig::get('sf_error_'.$this->httpStatusCode.'_action', sfConfig::get('sf_error_404_action', 'error'));
+      sfContext::getInstance()->getController()->forward($module, $action);
+    }
+  }
+}
diff --git a/lib/model/doctrine/Member.class.php b/lib/model/doctrine/Member.class.php
index 99c399e25..55d55f67a 100644
--- a/lib/model/doctrine/Member.class.php
+++ b/lib/model/doctrine/Member.class.php
@@ -378,4 +378,24 @@ public function countJoinCommunity()
 
     return $cache;
   }
+
+  public function generateApiKey()
+  {
+    $apiKey = opToolkit::getRandom();
+    $this->setConfig('api_key', $apiKey);
+
+    return $apiKey;
+  }
+
+  public function getApiKey()
+  {
+    $apiKey = $this->getConfig('api_key');
+
+    if (null === $apiKey)
+    {
+      $apiKey = $this->generateApiKey();
+    }
+
+    return $apiKey;
+  }
 }
diff --git a/lib/user/opSecurityUser.class.php b/lib/user/opSecurityUser.class.php
index 7d66a461a..778e7cbb6 100644
--- a/lib/user/opSecurityUser.class.php
+++ b/lib/user/opSecurityUser.class.php
@@ -457,4 +457,16 @@ public function decryptSid($data, $time)
 
     return $sid;
   }
+
+  public function getMemberApiKey()
+  {
+    $member = $this->getMember();
+
+    if ($member instanceof opAnonymousMember)
+    {
+      return '';
+    }
+
+    return $member->getApiKey();
+  }
 }
diff --git a/lib/view/opJsonApiView.class.php b/lib/view/opJsonApiView.class.php
new file mode 100644
index 000000000..5effa242d
--- /dev/null
+++ b/lib/view/opJsonApiView.class.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * opJsonApiView
+ *
+ * @package    OpenPNE
+ * @subpackage view
+ * @author     Kimura Youichi <kim.upsilon@gmail.com>
+ */
+class opJsonApiView extends sfPHPView
+{
+  public function configure()
+  {
+    $this->setExtension('.php');
+
+    parent::configure();
+  }
+
+  /**
+   * Renders the presentation.
+   *
+   * @param  string $_sfFile  Filename
+   * @return string File content
+   * @see    sfPHPView::renderFile()
+   */
+  protected function renderFile($_sfFile)
+  {
+    if (sfConfig::get('sf_logging_enabled'))
+    {
+      $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Render "%s"', $_sfFile))));
+    }
+
+    $this->loadCoreAndStandardHelpers();
+
+    // EXTR_REFS can't be used (see #3595 and #3151)
+    $vars = $this->attributeHolder->toArray();
+    extract($vars);
+
+    // render
+    try
+    {
+      $returnValue = include($_sfFile);
+      $output = $this->renderOutput($returnValue);
+    }
+    catch (Exception $e)
+    {
+      throw $e;
+    }
+
+    return $output;
+  }
+
+  protected function renderOutput(array $values)
+  {
+    return json_encode($values);
+  }
+
+  protected function decorate($content)
+  {
+    return $content;
+  }
+}

From 8bc44e86f1da9ed9c078c426726011807e803cb8 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Tue, 24 Jan 2012 19:58:58 +0900
Subject: [PATCH 050/630] make JSON API configurable on/off (refs #2698)

---
 .../modules/member/actions/actions.class.php          |  2 ++
 apps/pc_frontend/templates/_layout.php                |  2 ++
 lib/action/opJsonApiActions.class.php                 |  2 ++
 lib/config/config/sns_config.yml                      | 11 +++++++++++
 4 files changed, 17 insertions(+)

diff --git a/apps/pc_frontend/modules/member/actions/actions.class.php b/apps/pc_frontend/modules/member/actions/actions.class.php
index e13f5510c..c53fd50ad 100644
--- a/apps/pc_frontend/modules/member/actions/actions.class.php
+++ b/apps/pc_frontend/modules/member/actions/actions.class.php
@@ -238,6 +238,8 @@ public function executeSmtConfigImage(opWebRequest $request)
   */
   public function executeConfigJsonApi($request)
   {
+    $this->forward404Unless(opConfig::get('enable_jsonapi'));
+
     $member = $this->getUser()->getMember();
 
     if (isset($request['reset_api_key']) && '1' === $request['reset_api_key'])
diff --git a/apps/pc_frontend/templates/_layout.php b/apps/pc_frontend/templates/_layout.php
index cc1eca579..6b555d80f 100644
--- a/apps/pc_frontend/templates/_layout.php
+++ b/apps/pc_frontend/templates/_layout.php
@@ -8,6 +8,7 @@
 <?php if (Doctrine::getTable('SnsConfig')->get('customizing_css')): ?>
 <link rel="stylesheet" type="text/css" href="<?php echo url_for('@customizing_css') ?>" />
 <?php endif; ?>
+<?php if (Doctrine::getTable('SnsConfig')->get('enable_jsonapi')): ?>
 <?php
 use_helper('Javascript');
 
@@ -20,6 +21,7 @@
 var openpne = '.json_encode($json, defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0).';
 ');
 ?>
+<?php endif ?>
 <?php include_javascripts() ?>
 <?php echo $op_config->get('pc_html_head') ?>
 </head>
diff --git a/lib/action/opJsonApiActions.class.php b/lib/action/opJsonApiActions.class.php
index 463a5d6e3..7d1645374 100644
--- a/lib/action/opJsonApiActions.class.php
+++ b/lib/action/opJsonApiActions.class.php
@@ -23,6 +23,8 @@ class opJsonApiActions extends sfActions
 
   public function execute($request)
   {
+    $this->forward404Unless(opConfig::get('enable_jsonapi'));
+
     $moduleName = strtolower($this->moduleName);
     sfConfig::set('mod_'.$moduleName.'_view_class', 'opJsonApi');
     $this->getResponse()->setContentType('application/json');
diff --git a/lib/config/config/sns_config.yml b/lib/config/config/sns_config.yml
index b26fe8e4b..dcb3cbf3a 100644
--- a/lib/config/config/sns_config.yml
+++ b/lib/config/config/sns_config.yml
@@ -170,6 +170,17 @@ general:
       - "使用しない"
       - "使用する"
 
+  enable_jsonapi:
+    Name:      "enable_jsonapi"
+    Caption:   "JSON API 使用設定"
+    FormType:  "radio"
+    ValueType: "text"
+    IsRequired: true
+    Default:    0
+    Choices:
+      - "使用しない"
+      - "使用する"
+
   enable_openid:
     Name:      "enable_openid"
     Caption:   "OpenID Provider 使用設定"

From 63f47dec91b151a221d0e2fc43f4d99f95aaf02d Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Wed, 4 Jan 2012 22:42:45 +0900
Subject: [PATCH 051/630] add opActivityQueryBuilder (refs #2698)

---
 .../doctrine/ActivityDataTable.class.php      |   8 +-
 lib/util/opActivityQueryBuilder.class.php     | 200 ++++++++++++++++++
 2 files changed, 204 insertions(+), 4 deletions(-)
 create mode 100644 lib/util/opActivityQueryBuilder.class.php

diff --git a/lib/model/doctrine/ActivityDataTable.class.php b/lib/model/doctrine/ActivityDataTable.class.php
index e10e1dc5f..fa2bb7314 100644
--- a/lib/model/doctrine/ActivityDataTable.class.php
+++ b/lib/model/doctrine/ActivityDataTable.class.php
@@ -192,7 +192,7 @@ public function getViewablePublicFlags($flag)
     return $flags;
   }
 
-  protected function getOrderdQuery()
+  public function getOrderdQuery()
   {
     return $this->createQuery()->orderBy('created_at DESC');
   }
@@ -216,7 +216,7 @@ protected function getPager(Doctrine_Query $q, $page, $size)
     return $pager;
   }
 
-  protected function addFriendActivityQuery(Doctrine_Query $q, $memberId, $isCheckApp = true)
+  public function addFriendActivityQuery(Doctrine_Query $q, $memberId, $isCheckApp = true)
   {
     if (null === $memberId)
     {
@@ -274,7 +274,7 @@ public function getFriendActivityListPager($memberId = null, $page = 1, $size =
     return $this->getPager($q, $page, $size);
   }
 
-  protected function addActivityQuery(Doctrine_Query $q, $memberId = null, $viewerMemberId = null, $isCheckApp = true)
+  public function addActivityQuery(Doctrine_Query $q, $memberId = null, $viewerMemberId = null, $isCheckApp = true)
   {
     if (null === $memberId)
     {
@@ -352,7 +352,7 @@ public function getActivityListPager($memberId = null, $viewerMemberId = null, $
     return $this->getPager($q, $page, $size);
   }
 
-  protected function addAllMemberActivityQuery($q, $isCheckApp)
+  public function addAllMemberActivityQuery($q, $isCheckApp = true)
   {
     $q->whereIn('public_flag', array(self::PUBLIC_FLAG_OPEN, self::PUBLIC_FLAG_SNS));
 
diff --git a/lib/util/opActivityQueryBuilder.class.php b/lib/util/opActivityQueryBuilder.class.php
new file mode 100644
index 000000000..f3bedfcaa
--- /dev/null
+++ b/lib/util/opActivityQueryBuilder.class.php
@@ -0,0 +1,200 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * opActivityQueryBuilder
+ *
+ * @package    OpenPNE
+ * @subpackage util
+ * @author     Kimura Youichi <kim.upsilon@gmail.com>
+ */
+class opActivityQueryBuilder
+{
+  protected
+    $table,
+    $viewerId = null,
+    $inactiveIds,
+    $include;
+
+  static public function create()
+  {
+    return new self();
+  }
+
+  public function __construct()
+  {
+    $this->table = Doctrine::getTable('ActivityData');
+    $this->inactiveIds = Doctrine::getTable('Member')->getInactiveMemberIds();
+
+    $this->resetInclude();
+  }
+
+  public function setViewerId($viewerId)
+  {
+    $this->viewerId = $viewerId;
+    return $this;
+  }
+
+  public function resetInclude()
+  {
+    $this->include = array(
+      'self' => false,
+      'friend' => false,
+      'sns' => false,
+      'member' => false,
+    );
+
+    return $this;
+  }
+
+  public function includeSelf()
+  {
+    $this->include['self'] = true;
+    return $this;
+  }
+
+  public function includeFriends($target_member_id)
+  {
+    $this->include['friend'] = $target_member_id ?: $this->viewerId;
+    return $this;
+  }
+
+  public function includeSns()
+  {
+    $this->include['sns'] = true;
+    return $this;
+  }
+
+  public function includeMember($member_id)
+  {
+    $this->include['member'] = $member_id;
+    return $this;
+  }
+
+  public function buildQuery()
+  {
+    $query = $this->table->createQuery('a')
+      ->leftJoin('a.Member');
+
+    $subQuery = array();
+
+    if ($this->include['self'])
+    {
+      $subQuery[] = $this->buildSelfQuery($query->createSubquery());
+    }
+
+    if ($this->include['friend'])
+    {
+      $subQuery[] = $this->buildFriendQuery($query->createSubquery(), $this->include['friend']);
+    }
+
+    if ($this->include['sns'])
+    {
+      $subQuery[] = $this->buildAllMemberQuery($query->createSubquery());
+    }
+
+    if ($this->include['member'])
+    {
+      $subQuery[] = $this->buildMemberQueryWithCheckRel($query->createSubquery(), $this->include['member']);
+    }
+
+    $subQuery = array_map(array($this, 'trimSubqueryWhere'), $subQuery);
+
+    $query->andWhere(implode(' OR ', $subQuery))
+      ->orderBy('id DESC');
+
+    return $query;
+  }
+
+  protected function buildSelfQuery($query)
+  {
+    return $this->buildMemberQuery($query, $this->viewerId, ActivityDataTable::PUBLIC_FLAG_PRIVATE);
+  }
+
+  protected function buildFriendQuery($query, $member_id)
+  {
+    $friendsQuery = $query->createSubquery()
+      ->select('r.member_id_to')
+      ->from('MemberRelationship r')
+      ->addWhere('r.member_id_from = ?', $member_id)
+      ->addWhere('r.is_friend = true')
+      ->andWhereNotIn('r.member_id_to', $this->inactiveIds);
+
+    return $this->buildMemberQuery($query, $friendsQuery, ActivityDataTable::PUBLIC_FLAG_FRIEND);
+  }
+
+  protected function buildAllMemberQuery($query)
+  {
+    return $this->buildMemberQuery($query, null, ActivityDataTable::PUBLIC_FLAG_SNS);
+  }
+
+  protected function buildMemberQuery($query, $member_id = null, $public_flag = ActivityDataTable::PUBLIC_FLAG_SNS)
+  {
+    if (is_array($member_id))
+    {
+      $query->andWhereIn('a.member_id', $member_id);
+    }
+    elseif ($member_id instanceof Doctrine_Query)
+    {
+      $query->andWhere('a.member_id IN ('.$member_id->getDql().')');
+    }
+    elseif (is_scalar($member_id))
+    {
+      $query->andWhere('a.member_id = ?', $member_id);
+    }
+
+    $query->andWhereIn('a.public_flag', $this->table->getViewablePublicFlags($public_flag));
+
+    return $query;
+  }
+
+  protected function buildMemberQueryWithCheckRel($query, $member_id = null)
+  {
+    $subQuery = array();
+
+    foreach ((array)$member_id as $id)
+    {
+      if ($this->viewerId === $id)
+      {
+        $subQuery[] = $this->buildSelfQuery($query->createSubquery());
+      }
+      elseif (in_array($id, $this->inactiveIds))
+      {
+        continue;
+      }
+      else
+      {
+        $relation = Doctrine::getTable('MemberRelationship')->retrieveByFromAndTo($this->viewerId, $id);
+
+        if ($relation && $relation->isFriend())
+        {
+          $subQuery[] = $this->buildMemberQuery($query->createSubquery(), $id, ActivityDataTable::PUBLIC_FLAG_FRIEND);
+        }
+        else
+        {
+          $subQuery[] = $this->buildMemberQuery($query->createSubquery(), $id, ActivityDataTable::PUBLIC_FLAG_SNS);
+        }
+      }
+    }
+
+    if (!empty($subQuery))
+    {
+      $subQuery = array_map(array($this, 'trimSubqueryWhere'), $subQuery);
+      $query->andWhere(implode(' OR ', $subQuery));
+    }
+
+    return $query;
+  }
+
+  protected function trimSubqueryWhere($subquery)
+  {
+    return '('.implode(' ', $subquery->getDqlPart('where')).')';
+  }
+}

From 5af1d2892a98e62c24112cbc697e2ea09e4b23c3 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 19 Jan 2012 19:48:24 +0900
Subject: [PATCH 052/630] add JSON API for activity (refs #2698)

This commit adds these APIs:
  activity/search.json
  activity/member.json
  activity/friends.json
  activity/post.json
  activity/delete.json
---
 apps/api/config/routing.yml                   |  30 +++
 apps/api/config/settings.yml                  |   2 +-
 apps/api/lib/helper/opJsonApiHelper.php       |  85 +++++++++
 .../activity/actions/actions.class.php        | 174 ++++++++++++++++++
 .../activity/templates/arraySuccess.php       |  26 +++
 .../activity/templates/objectSuccess.php      |  19 ++
 lib/model/doctrine/ActivityData.class.php     |  20 ++
 7 files changed, 355 insertions(+), 1 deletion(-)
 create mode 100644 apps/api/lib/helper/opJsonApiHelper.php
 create mode 100644 apps/api/modules/activity/actions/actions.class.php
 create mode 100644 apps/api/modules/activity/templates/arraySuccess.php
 create mode 100644 apps/api/modules/activity/templates/objectSuccess.php

diff --git a/apps/api/config/routing.yml b/apps/api/config/routing.yml
index 366d4cb83..000fcf1b2 100644
--- a/apps/api/config/routing.yml
+++ b/apps/api/config/routing.yml
@@ -13,3 +13,33 @@ no_default:
 
 default:
   url:   /:module/:action/*
+
+activity_search:
+  url: /activity/search.json
+  param: { module: activity, action: search, sf_format: json }
+  requirements: { sf_method: [get] }
+
+activity_list:
+  url: /activity/list.json
+  param: { module: activity, action: search, sf_format: json }
+  requirements: { sf_method: [get] }
+
+activity_member:
+  url: /activity/member.json
+  param: { module: activity, action: member, sf_format: json }
+  requirements: { sf_method: [get] }
+
+activity_friends:
+  url: /activity/friends.json
+  param: { module: activity, action: friends, sf_format: json }
+  requirements: { sf_method: [get] }
+
+activity_post:
+  url: /activity/post.json
+  param: { module: activity, action: post, sf_format: json }
+  requirements: { sf_method: [post, get] }
+
+activity_delete:
+  url: /activity/delete.json
+  param: { module: activity, action: delete, sf_format: json }
+  requirements: { sf_method: [get] }
diff --git a/apps/api/config/settings.yml b/apps/api/config/settings.yml
index 9a4b88e08..14be3b804 100644
--- a/apps/api/config/settings.yml
+++ b/apps/api/config/settings.yml
@@ -83,7 +83,7 @@ all:
 #    calendar_web_dir:       /sf/calendar
 #
 #    # Helpers included in all templates by default
-#    standard_helpers:       [Partial, Cache, Form]
+    standard_helpers:       [Partial, Cache, sfImage, opUtil, opJsonApi]
 #
 #    # Activated modules from plugins or from the symfony core
 #    enabled_modules:        [default]
diff --git a/apps/api/lib/helper/opJsonApiHelper.php b/apps/api/lib/helper/opJsonApiHelper.php
new file mode 100644
index 000000000..7c67cf69e
--- /dev/null
+++ b/apps/api/lib/helper/opJsonApiHelper.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * opJsonApiHelper
+ *
+ * @package    OpenPNE
+ * @subpackage helper
+ * @author     Kimura Youichi <kim.upsilon@gmail.com>
+ */
+function op_api_member($member)
+{
+  $viewMemberId = sfContext::getInstance()->getUser()->getMemberId();
+
+  $memberImageFileName = $member->getImageFileName();
+  if (!$memberImageFileName)
+  {
+    $memberImage = op_image_path('no_image.gif', true);
+  }
+  else
+  {
+    $memberImage = sf_image_path($memberImageFileName, array('size' => '48x48'), true);
+  }
+
+  $relation = null;
+  if ((string)$viewMemberId !== (string)$member->getId())
+  {
+    $relation = Doctrine::getTable('MemberRelationship')->retrieveByFromAndTo($viewMemberId, $member->getId());
+  }
+
+  $selfIntroduction = $member->getProfile('op_preset_self_introduction', true);
+
+  return array(
+    'id' => $member->getId(),
+    'profile_image' => $memberImage,
+    'screen_name' => $member->getConfig('op_screen_name', $member->getName()),
+    'name' => $member->getName(),
+    'profile_url' => op_api_member_profile_url($member->getId()),
+    'friend' => $relation ? $relation->isFriend() : false,
+    'blocking' => $relation ? $relation->isAccessBlocked() : false,
+    'self' => $viewMemberId === $member->getId(),
+    'friends_count' => $member->countFriends(),
+    'self_introduction' => $selfIntroduction ? (string)$selfIntroduction : null,
+  );
+}
+
+function op_api_member_profile_url($member_id)
+{
+  return app_url_for('pc_frontend', array('sf_route' => 'obj_member_profile', 'id' => $member_id), true);
+}
+
+function op_api_activity($activity)
+{
+  $viewMemberId = sfContext::getInstance()->getUser()->getMemberId();
+  $member = $activity->getMember();
+
+  return array(
+    'id' => $activity->getId(),
+    'member' => op_api_member($member),
+    'body' => $activity->getBody(),
+    'body_html' => op_auto_link_text(nl2br(op_api_force_escape($activity->getBody()))),
+    'uri' => $activity->getUri(),
+    'source' => $activity->getSource(),
+    'source_uri' => $activity->getSourceUri(),
+    'created_at' => date('r', strtotime($activity->getCreatedAt())),
+  );
+}
+
+function op_api_force_escape($text)
+{
+  if (!sfConfig::get('sf_escaping_strategy'))
+  {
+    // escape body even if escaping method is disabled.
+    $text = sfOutputEscaper::escape(sfConfig::get('sf_escaping_method'), $text);
+  }
+
+  return $text;
+}
diff --git a/apps/api/modules/activity/actions/actions.class.php b/apps/api/modules/activity/actions/actions.class.php
new file mode 100644
index 000000000..c20b46547
--- /dev/null
+++ b/apps/api/modules/activity/actions/actions.class.php
@@ -0,0 +1,174 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * activity actions.
+ *
+ * @package    OpenPNE
+ * @subpackage action
+ * @author     Kimura Youichi <kim.upsilon@gmail.com>
+ */
+class activityActions extends opJsonApiActions
+{
+  public function executeSearch(sfWebRequest $request)
+  {
+    $builder = opActivityQueryBuilder::create()
+      ->setViewerId($this->getUser()->getMemberId());
+
+    if (isset($request['target']))
+    {
+      if ('friend' === $request['target'])
+      {
+        $builder->includeFriends($request['target_id'] ? $request['target_id'] : null);
+      }
+      else
+      {
+        $this->forward400('target parameter is invalid.');
+      }
+    }
+    else
+    {
+      if (isset($request['member_id']))
+      {
+        $builder->includeMember(explode(',', $request['member_id']));
+      }
+      else
+      {
+        $builder->includeSns();
+      }
+    }
+
+    $query = $builder->buildQuery();
+
+    if (isset($request['keyword']))
+    {
+      $query->andWhereLike('body', $request['keyword']);
+    }
+
+    $globalAPILimit = sfConfig::get('op_json_api_limit', 20);
+    if (isset($request['count']) && (int)$request['count'] < $globalAPILimit)
+    {
+      $query->limit($request['count']);
+    }
+    else
+    {
+      $query->limit($globalAPILimit);
+    }
+
+    if (isset($request['max_id']))
+    {
+      $query->addWhere('id <= ?', $request['max_id']);
+    }
+
+    if (isset($request['since_id']))
+    {
+      $query->addWhere('id > ?', $request['since_id']);
+    }
+
+    $this->activityData = $query
+      ->andWhere('in_reply_to_activity_id IS NULL')
+      ->execute();
+
+    $this->setTemplate('array');
+  }
+
+  public function executeMember(sfWebRequest $request)
+  {
+    if ($request['id'])
+    {
+      $request['member_id'] = $request['id'];
+    }
+
+    if (isset($request['target']))
+    {
+      unset($request['target']);
+    }
+
+    $this->forward('activity', 'search');
+  }
+
+  public function executeFriends(sfWebRequest $request)
+  {
+    $request['target'] = 'friend';
+
+    if (isset($request['member_id']))
+    {
+      $request['target_id'] = $request['member_id'];
+      unset($request['member_id']);
+    }
+    elseif (isset($request['id']))
+    {
+      $request['target_id'] = $request['id'];
+      unset($request['id']);
+    }
+
+    $this->forward('activity', 'search');
+  }
+
+  public function executePost(sfWebRequest $request)
+  {
+    $this->forward400Unless(isset($request['body']), 'body parameter not specified.');
+
+    $memberId = $this->getUser()->getMemberId();
+    $body = $request['body'];
+    $options = array();
+
+    if (isset($request['public_flag']))
+    {
+      $options['public_flag'] = $request['public_flag'];
+    }
+
+    if (isset($request['in_reply_to_activity_id']))
+    {
+      $options['in_reply_to_activity_id'] = $request['in_reply_to_activity_id'];
+    }
+
+    if (isset($request['uri']))
+    {
+      $options['uri'] = $request['uri'];
+    }
+    elseif (isset($request['url']))
+    {
+      $options['uri'] = $request['url'];
+    }
+
+    $options['source'] = 'API';
+
+    $this->activity = Doctrine::getTable('ActivityData')->updateActivity($memberId, $body, $options);
+
+    $this->setTemplate('object');
+  }
+
+  public function executeDelete(sfWebRequest $request)
+  {
+    if (isset($request['activity_id']))
+    {
+      $activityId = $request['activity_id'];
+    }
+    elseif (isset($request['id']))
+    {
+      $activityId = $request['id'];
+    }
+    else
+    {
+      $this->forward400('activity_id parameter not specified.');
+    }
+
+    $activity = Doctrine::getTable('ActivityData')->find($activityId);
+
+    $this->forward404Unless($activity, 'Invalid activity id.');
+
+    $this->forward403Unless($activity->getMemberId() === $this->getUser()->getMemberId());
+
+    $activity->delete();
+
+    return $this->renderJSON(array('status' => 'success'));
+  }
+}
diff --git a/apps/api/modules/activity/templates/arraySuccess.php b/apps/api/modules/activity/templates/arraySuccess.php
new file mode 100644
index 000000000..4eb150457
--- /dev/null
+++ b/apps/api/modules/activity/templates/arraySuccess.php
@@ -0,0 +1,26 @@
+<?php
+
+$ac = array();
+
+foreach ($activityData as $activity)
+{
+  $acEntity = op_api_activity($activity);
+
+  $replies = $activity->getReplies();
+  if (0 !== count($replies))
+  {
+    $acEntity['replies'] = array();
+
+    foreach ($replies as $reply)
+    {
+      $acEntity['replies'][] = op_api_activity($reply);
+    }
+  }
+
+  $ac[] = $acEntity;
+}
+
+return array(
+  'status' => 'success',
+  'data' => $ac,
+);
diff --git a/apps/api/modules/activity/templates/objectSuccess.php b/apps/api/modules/activity/templates/objectSuccess.php
new file mode 100644
index 000000000..c6fb31e48
--- /dev/null
+++ b/apps/api/modules/activity/templates/objectSuccess.php
@@ -0,0 +1,19 @@
+<?php
+
+$acEntity = op_api_activity($activity);
+
+$replies = $activity->getReplies();
+if (0 !== count($replies))
+{
+  $acEntity['replies'] = array();
+
+  foreach ($replies as $reply)
+  {
+    $acEntity['replies'][] = op_api_activity($reply);
+  }
+}
+
+return array(
+  'status' => 'success',
+  'data' => $acEntity,
+);
diff --git a/lib/model/doctrine/ActivityData.class.php b/lib/model/doctrine/ActivityData.class.php
index 021be6fbf..b3b775a3c 100644
--- a/lib/model/doctrine/ActivityData.class.php
+++ b/lib/model/doctrine/ActivityData.class.php
@@ -24,4 +24,24 @@ public function getPublicFlagCaption()
   {
     return $this->getTable()->publicFlagToCaption($this->getPublicFlag());
   }
+
+  public function getReplies($publicFlag = ActivityDataTable::PUBLIC_FLAG_SNS, $limit = 10)
+  {
+    $query = $this->getTable()->createQuery('a')
+      ->leftJoin('a.Member')
+      ->addWhere('a.in_reply_to_activity_id = ?', $this->getId())
+      ->orderBy('a.id')
+      ->limit($limit);
+
+    if (is_array($publicFlag))
+    {
+      $query->andWhereIn('a.public_flag', $publicFlag);
+    }
+    else
+    {
+      $query->andWhere('a.public_flag = ?', $publicFlag);
+    }
+
+    return $query->execute();
+  }
 }

From 5b60fd5e53387eb3a5f172b03d5358c942acc281 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 5 Jan 2012 19:32:47 +0900
Subject: [PATCH 053/630] add JSON API for member (refs #2698)

This commit adds these APIs:
  member/search.json
  member/community.json
  member/friend_accept.json
---
 apps/api/config/routing.yml                   |  25 ++++
 .../modules/member/actions/actions.class.php  | 114 ++++++++++++++++++
 .../modules/member/templates/arraySuccess.php |  13 ++
 3 files changed, 152 insertions(+)
 create mode 100644 apps/api/modules/member/actions/actions.class.php
 create mode 100644 apps/api/modules/member/templates/arraySuccess.php

diff --git a/apps/api/config/routing.yml b/apps/api/config/routing.yml
index 000fcf1b2..58a0caee6 100644
--- a/apps/api/config/routing.yml
+++ b/apps/api/config/routing.yml
@@ -43,3 +43,28 @@ activity_delete:
   url: /activity/delete.json
   param: { module: activity, action: delete, sf_format: json }
   requirements: { sf_method: [get] }
+
+member_search:
+  url: /member/search.json
+  param: { module: member, action: search, sf_format: json }
+  requirements: { sf_method: [get] }
+
+member_list:
+  url: /member/list.json
+  param: { module: member, action: search, sf_format: json }
+  requirements: { sf_method: [get] }
+
+member_community:
+  url: /member/community.json
+  param: { module: member, action: community, sf_format: json }
+  requirements: { sf_method: [get] }
+
+member_friend_accept:
+  url: /member/friend_accept.json
+  param: { module: member, action: friendAccept, sf_format: json }
+  requirements: { sf_method: [get] }
+
+member_friend_reject:
+  url: /member/friend_reject.json
+  param: { module: member, action: friendAccept, sf_format: json, reject: 1 }
+  requirements: { sf_method: [get] }
diff --git a/apps/api/modules/member/actions/actions.class.php b/apps/api/modules/member/actions/actions.class.php
new file mode 100644
index 000000000..612d2a980
--- /dev/null
+++ b/apps/api/modules/member/actions/actions.class.php
@@ -0,0 +1,114 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * member actions.
+ *
+ * @package    OpenPNE
+ * @subpackage action
+ * @author     Kimura Youichi <kim.upsilon@gmail.com>
+ */
+class memberActions extends opJsonApiActions
+{
+  public function executeCommunity(sfWebRequest $request)
+  {
+    if (isset($request['member_id']))
+    {
+      $memberId = $request['member_id'];
+    }
+    elseif (isset($request['id']))
+    {
+      $memberId = $request['id'];
+    }
+    else
+    {
+      $memberId = $this->getUser()->getMemberId();
+    }
+
+    $this->communities = Doctrine::getTable('Community')->createQuery('c')
+      ->innerJoin('c.CommunityMember cm WITH cm.is_pre = false AND cm.member_id = ?', $memberId)
+      ->limit(sfConfig::get('op_json_api_limit', 20))
+      ->execute();
+
+    $this->setTemplate('array', 'community');
+  }
+
+  public function executeSearch(sfWebRequest $request)
+  {
+    $query = Doctrine::getTable('Member')->createQuery('m')
+      ->andWhere('m.is_active = true');
+
+    if (isset($request['target']))
+    {
+      if (!isset($request['target_id']))
+      {
+        $this->forward400('target_id parameter not specified.');
+      }
+      $targetId = $request['target_id'];
+
+      if ('friend' === $request['target'])
+      {
+        $query->andWhere('EXISTS (FROM MemberRelationship mr WHERE m.id = mr.member_id_to AND mr.member_id_from = ?)', $targetId);
+      }
+      if ('community' === $request['target'])
+      {
+        $query->andWhere('EXISTS (FROM CommunityMember cm WHERE m.id = cm.member_id AND cm.community_id = ?)', $targetId);
+      }
+    }
+
+    $this->members = $query
+      ->limit(sfConfig::get('op_json_api_limit', 20))
+      ->execute();
+
+    $this->setTemplate('array');
+  }
+
+  public function executeFriendAccept(sfWebRequest $request)
+  {
+    if (isset($request['member_id']))
+    {
+      $targetMemberId = $request['member_id'];
+    }
+    elseif (isset($request['id']))
+    {
+      $targetMemberId = $request['id'];
+    }
+    else
+    {
+      $this->forward400('member_id parameter not specified.');
+    }
+
+    $memberId = $this->getUser()->getMemberId();
+
+    $preRequest = Doctrine::getTable('MemberRelationship')->createQuery()
+      ->addWhere('member_id_from = ?', $targetMemberId)
+      ->addWhere('member_id_to = ?', $memberId)
+      ->addWhere('is_friend_pre = true')
+      ->fetchOne();
+
+    if (!$preRequest)
+    {
+      $this->forward404('Invalid member_id.');
+    }
+
+    if (!$request['reject'])
+    {
+      $preRequest->setFriend();
+    }
+    else
+    {
+      $preRequest->removeFriendPre();
+    }
+
+    $preRequest->free(true);
+
+    return $this->renderJSON(array('status' => 'success'));
+  }
+}
diff --git a/apps/api/modules/member/templates/arraySuccess.php b/apps/api/modules/member/templates/arraySuccess.php
new file mode 100644
index 000000000..acc241bfe
--- /dev/null
+++ b/apps/api/modules/member/templates/arraySuccess.php
@@ -0,0 +1,13 @@
+<?php
+
+$data = array();
+
+foreach ($members as $member)
+{
+  $data[] = op_api_member($member);
+}
+
+return array(
+  'status' => 'success',
+  'data' => $data,
+);

From 447edddf8b3e0e893919fc468d2363861310fc2b Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 5 Jan 2012 18:04:27 +0900
Subject: [PATCH 054/630] add JSON API for community (refs #2698)

This commit adds these APIs:
  community/search.json
  community/member.json
---
 apps/api/config/routing.yml                   | 15 +++++
 apps/api/lib/helper/opJsonApiHelper.php       | 42 ++++++++++++++
 .../community/actions/actions.class.php       | 58 +++++++++++++++++++
 .../community/templates/arraySuccess.php      | 13 +++++
 4 files changed, 128 insertions(+)
 create mode 100644 apps/api/modules/community/actions/actions.class.php
 create mode 100644 apps/api/modules/community/templates/arraySuccess.php

diff --git a/apps/api/config/routing.yml b/apps/api/config/routing.yml
index 58a0caee6..1e9ff82b5 100644
--- a/apps/api/config/routing.yml
+++ b/apps/api/config/routing.yml
@@ -68,3 +68,18 @@ member_friend_reject:
   url: /member/friend_reject.json
   param: { module: member, action: friendAccept, sf_format: json, reject: 1 }
   requirements: { sf_method: [get] }
+
+community_search:
+  url: /community/search.json
+  param: { module: community, action: search, sf_format: json }
+  requirements: { sf_method: [get] }
+
+community_list:
+  url: /community/list.json
+  param: { module: community, action: search, sf_format: json }
+  requirements: { sf_method: [get] }
+
+community_member:
+  url: /community/member.json
+  param: { module: community, action: member, sf_format: json }
+  requirements: { sf_method: [get] }
diff --git a/apps/api/lib/helper/opJsonApiHelper.php b/apps/api/lib/helper/opJsonApiHelper.php
index 7c67cf69e..c50e250c7 100644
--- a/apps/api/lib/helper/opJsonApiHelper.php
+++ b/apps/api/lib/helper/opJsonApiHelper.php
@@ -83,3 +83,45 @@ function op_api_force_escape($text)
 
   return $text;
 }
+
+function op_api_community($community)
+{
+  $viewMemberId = sfContext::getInstance()->getUser()->getMemberId();
+
+  $communityUrl = app_url_for('pc_frontend', array('sf_route' => 'community_home', 'id' => $community->getId()), true);
+
+  $communityImageFileName = $community->getImageFileName();
+  if (!$communityImageFileName)
+  {
+    $communityImage = op_image_path('no_image.gif', true);
+  }
+  else
+  {
+    $communityImage = sf_image_path($communityImageFileName, array('size' => '48x48'), true);
+  }
+
+  $communityMember = Doctrine::getTable('CommunityMember')
+    ->retrieveByMemberIdAndCommunityId($viewMemberId, $community->getId());
+
+  return array(
+    'id' => $community->getId(),
+    'name' => $community->getName(),
+    'category' => (string)$community->getCommunityCategory() ?: null,
+    'community_url' => $communityUrl,
+    'community_image_url' => $communityImage,
+    'joining' => $communityMember ? !$communityMember->getIsPre() : false,
+    'admin' => $communityMember ? $communityMember->hasPosition('admin') : false,
+    'sub_admin' => $communityMember ? $communityMember->hasPosition('sub_admin') : false,
+    'created_at' => op_api_date($community->getCreatedAt()),
+    'admin_member' => op_api_member($community->getAdminMember()),
+    'member_count' => $community->countCommunityMembers(),
+    'public_flag' => $community->getConfig('public_flag'),
+    'register_policy' => $community->getConfig('register_policy'),
+    'description' => $community->getConfig('description'),
+  );
+}
+
+function op_api_date($date)
+{
+  return gmdate('r', strtotime($date));
+}
diff --git a/apps/api/modules/community/actions/actions.class.php b/apps/api/modules/community/actions/actions.class.php
new file mode 100644
index 000000000..fb3a7e591
--- /dev/null
+++ b/apps/api/modules/community/actions/actions.class.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * community actions.
+ *
+ * @package    OpenPNE
+ * @subpackage action
+ * @author     Kimura Youichi <kim.upsilon@gmail.com>
+ */
+class communityActions extends opJsonApiActions
+{
+  public function executeSearch(sfWebRequest $request)
+  {
+    $query = Doctrine::getTable('Community')->createQuery();
+
+    if (isset($request['keyword']))
+    {
+      $query->andWhereLike('name', $request['keyword']);
+    }
+
+    $this->communities = $query
+      ->limit(sfConfig::get('op_json_api_limit', 20))
+      ->execute();
+
+    $this->setTemplate('array');
+  }
+
+  public function executeMember(sfWebRequest $request)
+  {
+    if (isset($request['community_id']))
+    {
+      $communityId = $request['community_id'];
+    }
+    elseif (isset($request['id']))
+    {
+      $communityId = $request['id'];
+    }
+    else
+    {
+      $this->forward400('community_id parameter not specified.');
+    }
+
+    $this->members = Doctrine::getTable('Member')->createQuery('m')
+      ->addWhere('EXISTS (FROM CommunityMember cm WHERE m.id = cm.member_id AND cm.is_pre = false AND cm.community_id = ?)', $communityId)
+      ->limit(sfConfig::get('op_json_api_limit', 20))
+      ->execute();
+
+    $this->setTemplate('array', 'member');
+  }
+}
diff --git a/apps/api/modules/community/templates/arraySuccess.php b/apps/api/modules/community/templates/arraySuccess.php
new file mode 100644
index 000000000..2574ab914
--- /dev/null
+++ b/apps/api/modules/community/templates/arraySuccess.php
@@ -0,0 +1,13 @@
+<?php
+
+$data = array();
+
+foreach ($communities as $community)
+{
+  $data[] = op_api_community($community);
+}
+
+return array(
+  'status' => 'success',
+  'data' => $data,
+);

From 3dd9bbf9ec4bef86eed5c56ad8ee4fbb810a1517 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Mon, 13 Feb 2012 15:25:08 +0900
Subject: [PATCH 055/630] add API for friend request (refs #2698)

---
 apps/api/config/routing.yml                   | 10 +++
 .../modules/member/actions/actions.class.php  | 62 +++++++++++++++++++
 2 files changed, 72 insertions(+)

diff --git a/apps/api/config/routing.yml b/apps/api/config/routing.yml
index 1e9ff82b5..6cbb92757 100644
--- a/apps/api/config/routing.yml
+++ b/apps/api/config/routing.yml
@@ -69,6 +69,16 @@ member_friend_reject:
   param: { module: member, action: friendAccept, sf_format: json, reject: 1 }
   requirements: { sf_method: [get] }
 
+member_friend_request:
+  url: /member/friend_request.json
+  param: { module: member, action: friendRequest, sf_format: json, }
+  requirements: { sf_method: [get] }
+
+member_friend_unlink:
+  url: /member/friend_unlink.json
+  param: { module: member, action: friendRequest, sf_format: json, unlink: 1 }
+  requirements: { sf_method: [get] }
+
 community_search:
   url: /community/search.json
   param: { module: community, action: search, sf_format: json }
diff --git a/apps/api/modules/member/actions/actions.class.php b/apps/api/modules/member/actions/actions.class.php
index 612d2a980..1ce3cc92e 100644
--- a/apps/api/modules/member/actions/actions.class.php
+++ b/apps/api/modules/member/actions/actions.class.php
@@ -111,4 +111,66 @@ public function executeFriendAccept(sfWebRequest $request)
 
     return $this->renderJSON(array('status' => 'success'));
   }
+
+  public function executeFriendRequest(sfWebRequest $request)
+  {
+    $memberId = $this->getUser()->getMemberId();
+
+    if (isset($request['member_id']))
+    {
+      $targetMemberId = $request['member_id'];
+    }
+    elseif (isset($request['id']))
+    {
+      $targetMemberId = $request['id'];
+    }
+    else
+    {
+      $this->forward400('member_id parameter not specified.');
+    }
+
+    if ($memberId === $targetMemberId)
+    {
+      $this->forward400('Friend request to myself is not allowed.');
+    }
+
+    $relation = Doctrine::getTable('MemberRelationship')->retrieveByFromAndTo($memberId, $targetMemberId);
+    if (!$relation)
+    {
+      $relation = new MemberRelationship();
+      $relation->setMemberIdFrom($memberId);
+      $relation->setMemberIdTo($targetMemberId);
+    }
+
+    if (isset($request['unlink']))
+    {
+      if (!$relation->isFriend())
+      {
+        $this->forward400('This member is not your friend.');
+      }
+
+      $relation->removeFriend();
+    }
+    else
+    {
+      if ($relation->isAccessBlocked())
+      {
+        $this->forward403('Friend request is blocked.');
+      }
+      if ($relation->isFriend())
+      {
+        $this->forward400('This member already belongs to your friend.');
+      }
+      if ($relation->isFriendPreFrom())
+      {
+        $this->forward400('Friend request is already sent.');
+      }
+
+      $relation->setFriendPre();
+    }
+
+    $relation->free(true);
+
+    return $this->renderJSON(array('status' => 'success'));
+  }
 }

From 1535171d6739956ca3eddaa7f7f1b8ede265d58f Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Mon, 13 Feb 2012 16:27:57 +0900
Subject: [PATCH 056/630] add API for community joining (refs #2698)

---
 apps/api/config/routing.yml                   |  5 ++
 .../community/actions/actions.class.php       | 57 +++++++++++++++++++
 2 files changed, 62 insertions(+)

diff --git a/apps/api/config/routing.yml b/apps/api/config/routing.yml
index 6cbb92757..b30392422 100644
--- a/apps/api/config/routing.yml
+++ b/apps/api/config/routing.yml
@@ -93,3 +93,8 @@ community_member:
   url: /community/member.json
   param: { module: community, action: member, sf_format: json }
   requirements: { sf_method: [get] }
+
+community_join:
+  url: /community/join.json
+  param: { module: community, action: join, sf_format: json }
+  requirements: { sf_method: [get] }
diff --git a/apps/api/modules/community/actions/actions.class.php b/apps/api/modules/community/actions/actions.class.php
index fb3a7e591..e40de9bd3 100644
--- a/apps/api/modules/community/actions/actions.class.php
+++ b/apps/api/modules/community/actions/actions.class.php
@@ -55,4 +55,61 @@ public function executeMember(sfWebRequest $request)
 
     $this->setTemplate('array', 'member');
   }
+
+  public function executeJoin(sfWebRequest $request)
+  {
+    $memberId = $this->getUser()->getMemberId();
+
+    if (isset($request['community_id']))
+    {
+      $communityId = $request['community_id'];
+    }
+    elseif (isset($request['id']))
+    {
+      $communityId = $request['id'];
+    }
+    else
+    {
+      $this->forward400('community_id parameter not specified.');
+    }
+
+    $community = Doctrine::getTable('Community')->find($communityId);
+    if (!$community)
+    {
+      $this->forward404('This community does not exist.');
+    }
+
+    $communityJoinPolicy = $community->getConfig('register_policy');
+
+    $communityMember = Doctrine::getTable('CommunityMember')
+      ->retrieveByMemberIdAndCommunityId($viewMemberId, $community->getId());
+
+    if ($request['leave'])
+    {
+      if (!$communityMember || $communityMember->hasPosition('admin'))
+      {
+        $this->forward400('You can\'t leave this community.');
+      }
+
+      Doctrine::getTable('CommunityMember')->quit($memberId, $communityId);
+    }
+    else
+    {
+      if ($communityMember)
+      {
+        if ($communityMember->getIsPre())
+        {
+          $this->forward400('You are already sent request to join this community.');
+        }
+        else
+        {
+          $this->forward400('You are already this community\'s member.');
+        }
+      }
+
+      Doctrine::getTable('CommunityMember')->join($memberId, $communityId, $communityJoinPolicy);
+    }
+
+    return $this->renderJSON(array('status' => 'success'));
+  }
 }

From de8c8fe6b1b0718247baded355e0629ac0a67586 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Tue, 24 Jan 2012 20:25:40 +0900
Subject: [PATCH 057/630] add API for notification center (fixes #2756)

---
 apps/api/config/routing.yml                   | 20 ++++
 apps/api/lib/helper/opJsonApiHelper.php       | 41 ++++++++
 .../modules/push/actions/actions.class.php    | 95 +++++++++++++++++++
 .../modules/push/templates/arraySuccess.php   | 13 +++
 .../modules/push/templates/countSuccess.php   |  6 ++
 lib/util/opNotificationCenter.class.php       | 78 +++++++++++++++
 6 files changed, 253 insertions(+)
 create mode 100644 apps/api/modules/push/actions/actions.class.php
 create mode 100644 apps/api/modules/push/templates/arraySuccess.php
 create mode 100644 apps/api/modules/push/templates/countSuccess.php
 create mode 100644 lib/util/opNotificationCenter.class.php

diff --git a/apps/api/config/routing.yml b/apps/api/config/routing.yml
index b30392422..58cfa94e0 100644
--- a/apps/api/config/routing.yml
+++ b/apps/api/config/routing.yml
@@ -98,3 +98,23 @@ community_join:
   url: /community/join.json
   param: { module: community, action: join, sf_format: json }
   requirements: { sf_method: [get] }
+
+push_search:
+  url: /push/search.json
+  param: { module: push, action: search, sf_format: json }
+  requirements: { sf_method: [get] }
+
+push_list:
+  url: /push/list.json
+  param: { module: push, action: search, sf_format: json }
+  requirements: { sf_method: [get] }
+
+push_count:
+  url: /push/count.json
+  param: { module: push, action: count, sf_format: json }
+  requirements: { sf_method: [get] }
+
+push_read:
+  url: /push/read.json
+  param: { module: push, action: read, sf_format: json }
+  requirements: { sf_method: [get] }
diff --git a/apps/api/lib/helper/opJsonApiHelper.php b/apps/api/lib/helper/opJsonApiHelper.php
index c50e250c7..4c7a99137 100644
--- a/apps/api/lib/helper/opJsonApiHelper.php
+++ b/apps/api/lib/helper/opJsonApiHelper.php
@@ -125,3 +125,44 @@ function op_api_date($date)
 {
   return gmdate('r', strtotime($date));
 }
+
+function op_api_notification($notification)
+{
+  if ($notification['icon_url'])
+  {
+    $iconUrl = $notification['icon_url'];
+  }
+  else
+  {
+    if ('link' === $notification['category'])
+    {
+      $fromMember = Doctrine::getTable('Member')->find($notification['member_id_from']);
+      $fromMemberImageFileName = $fromMember ? $fromMember->getImageFileName() : null;
+
+      if ($fromMemberImageFileName)
+      {
+        $iconUrl = sf_image_path($fromMemberImageFileName, array('size' => '48x48'), true);
+      }
+    }
+  }
+
+  if (!$iconUrl)
+  {
+    $iconUrl = op_image_path('no_image.gif', true);
+  }
+  elseif (0 !== strpos('http://', $iconUrl))
+  {
+    $iconUrl = sf_image_path($iconUrl, array('size' => '48x48'), true);
+  }
+
+  return array(
+    'id' => $notification['id'],
+    'body' => $notification['body'],
+    'category' => $notification['category'],
+    'unread' => $notification['unread'],
+    'created_at' => date('r', strtotime($notification['created_at'])),
+    'icon_url' => $iconUrl,
+    'url' => $notification['url'] ? url_for($notification['url'], array('abstract' => true)) : null,
+    'member_id_from' => $notification['member_id_from'],
+  );
+}
diff --git a/apps/api/modules/push/actions/actions.class.php b/apps/api/modules/push/actions/actions.class.php
new file mode 100644
index 000000000..d79b01220
--- /dev/null
+++ b/apps/api/modules/push/actions/actions.class.php
@@ -0,0 +1,95 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * push actions.
+ *
+ * @package    OpenPNE
+ * @subpackage action
+ * @author     Kimura Youichi <kim.upsilon@gmail.com>
+ */
+class pushActions extends opJsonApiActions
+{
+  public function executeSearch(sfWebRequest $request)
+  {
+    $this->notifications = $this->getNotifications();
+
+    $this->setTemplate('array');
+  }
+
+  public function executeCount(sfWebRequest $request)
+  {
+    $notifications = $this->getNotifications();
+
+    $this->count = array(
+      'link'    => 0,
+      'message' => 0,
+      'other'   => 0,
+    );
+
+    foreach ($notifications as $notification)
+    {
+      if (array_key_exists($notification['category'], $this->count))
+      {
+        $category = $notification['category'];
+      }
+      else
+      {
+        $category = 'other';
+      }
+
+      if ($notification['unread'])
+      {
+        $this->count[$category]++;
+      }
+    }
+
+    $this->setTemplate('count');
+  }
+
+  public function executeRead(sfWebRequest $request)
+  {
+    $this->forward400Unless($request['id'], 'id parameter not specified.');
+
+    $member = $this->getUser()->getMember();
+
+    $ret = opNotificationCenter::setRead($member, $request['id']);
+
+    if ($ret)
+    {
+      return $this->renderJSON(array('status' => 'success'));
+    }
+    else
+    {
+      return $this->renderJSON(array('status' => 'error'));
+    }
+  }
+
+  protected function getNotifications(Member $member = null)
+  {
+    if (!$member)
+    {
+      $member = $this->getUser()->getMember();
+    }
+
+    $notifications = $member->getConfig('notification_center');
+
+    if (!$notifications)
+    {
+      $notifications = array();
+    }
+    else
+    {
+      $notifications = unserialize($notifications);
+    }
+
+    return $notifications;
+  }
+}
diff --git a/apps/api/modules/push/templates/arraySuccess.php b/apps/api/modules/push/templates/arraySuccess.php
new file mode 100644
index 000000000..afcf70c91
--- /dev/null
+++ b/apps/api/modules/push/templates/arraySuccess.php
@@ -0,0 +1,13 @@
+<?php
+
+$data = array();
+
+foreach ($notifications as $notification)
+{
+  $data[] = op_api_notification($notification);
+}
+
+return array(
+  'status' => 'success',
+  'data' => $data
+);
diff --git a/apps/api/modules/push/templates/countSuccess.php b/apps/api/modules/push/templates/countSuccess.php
new file mode 100644
index 000000000..c9ad93471
--- /dev/null
+++ b/apps/api/modules/push/templates/countSuccess.php
@@ -0,0 +1,6 @@
+<?php
+
+return array(
+  'status' => 'success',
+  'data' => $count->getRawValue(),
+);
diff --git a/lib/util/opNotificationCenter.class.php b/lib/util/opNotificationCenter.class.php
new file mode 100644
index 000000000..8a31c3c1e
--- /dev/null
+++ b/lib/util/opNotificationCenter.class.php
@@ -0,0 +1,78 @@
+<?php
+
+class opNotificationCenter
+{
+  static public function notify(Member $from, Member $to, $body, array $options = null)
+  {
+    $notificationItem = array(
+      'id' => microtime(),
+      'body' => $body,
+      'member_id_from' => $from->getId(),
+      'created_at' => time(),
+      'unread' => true,
+      'category' => $options['category'] ? $options['category'] : 'other',
+      'url' => $options['url'] ? $options['url'] : null,
+      'icon_url' => $options['icon_url'] ? $options['icon_url'] : null,
+    );
+
+    $notificationObject = Doctrine::getTable('MemberConfig')
+      ->findOneByMemberIdAndName($to->getId(), 'notification_center');
+
+    if (!$notificationObject)
+    {
+      $notificationObject = new MemberConfig();
+      $notificationObject->setMemberId($to->getId());
+      $notificationObject->setName('notification_center');
+
+      $notifications = array();
+    }
+    else
+    {
+      $notifications = unserialize($notificationObject->getValue());
+    }
+
+    $notifications[] = $notificationItem;
+
+    if (sfConfig::get('op_notification_limit', 20) > count($notifications))
+    {
+      array_slice($notifications, -1, -sfConfig::get('op_notification_limit', 20));
+    }
+
+    $notificationObject->setValue(serialize($notifications));
+    $notificationObject->save();
+    $notificationObject->free(true);
+  }
+
+  public function setRead(Member $target, $notificationId)
+  {
+    $notificationObject = Doctrine::getTable('MemberConfig')
+      ->findOneByMemberIdAndName($target->getId(), 'notification_center');
+
+    if (!$notificationObject)
+    {
+      return false;
+    }
+    else
+    {
+      $notifications = unserialize($notificationObject->getValue());
+    }
+
+    $success = false;
+
+    foreach ($notifications as &$notification)
+    {
+      if ($notificationId === $notification['id'])
+      {
+        $notification['unread'] = false;
+        $success = true;
+      }
+    }
+    unset($notification);
+
+    $notificationObject->setValue(serialize($notifications));
+    $notificationObject->save();
+    $notificationObject->free(true);
+
+    return $success;
+  }
+}

From e31b656c4e1715a7f780928fed405c9d26a3c353 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Sat, 28 Jan 2012 17:24:43 +0900
Subject: [PATCH 058/630] remove sfPropelPlugin from symfony package (fixes
 #2822)

---
 .../lib/plugins/sfPropelPlugin/LICENSE        |    7 -
 .../lib/plugins/sfPropelPlugin/LICENSE.Agavi  |   14 -
 .../lib/plugins/sfPropelPlugin/LICENSE.Propel |  506 --
 .../lib/plugins/sfPropelPlugin/LICENSE.phing  | 1042 -----
 .../sfPropelPlugin/config/autoload.yml        |    6 -
 .../sfPropelPlugin/config/installer.php       |    5 -
 .../sfPropelPluginConfiguration.class.php     |   78 -
 .../config/skeleton/config/databases.yml      |   32 -
 .../config/skeleton/config/propel.ini         |   54 -
 .../config/skeleton/config/schema.yml         |    0
 .../template/sfPropelFormBaseTemplate.php     |   15 -
 .../sfPropelFormGeneratedTemplate.php         |  139 -
 .../default/template/sfPropelFormTemplate.php |   15 -
 .../sfPropelFormFilterBaseTemplate.php        |   15 -
 .../sfPropelFormFilterGeneratedTemplate.php   |   84 -
 .../template/sfPropelFormFilterTemplate.php   |   15 -
 .../admin/parts/actionsConfiguration.php      |   41 -
 .../admin/parts/batchAction.php               |   72 -
 .../admin/parts/configuration.php             |   59 -
 .../admin/parts/createAction.php              |    9 -
 .../admin/parts/deleteAction.php              |   12 -
 .../sfPropelModule/admin/parts/editAction.php |    5 -
 .../admin/parts/fieldsConfiguration.php       |   86 -
 .../admin/parts/filterAction.php              |   26 -
 .../admin/parts/filtersAction.php             |    9 -
 .../admin/parts/indexAction.php               |   17 -
 .../sfPropelModule/admin/parts/newAction.php  |    5 -
 .../admin/parts/paginationAction.php          |   42 -
 .../admin/parts/paginationConfiguration.php   |   11 -
 .../admin/parts/processFormAction.php         |   29 -
 .../admin/parts/sortingAction.php             |   44 -
 .../admin/parts/sortingConfiguration.php      |   10 -
 .../admin/parts/updateAction.php              |    9 -
 .../admin/skeleton/actions/actions.class.php  |   16 -
 .../admin/skeleton/config/generator.yml       |   13 -
 .../admin/skeleton/lib/configuration.php      |   13 -
 .../admin/skeleton/lib/helper.php             |   13 -
 .../admin/skeleton/templates/.sf              |    0
 .../admin/template/actions/actions.class.php  |   60 -
 .../admin/template/lib/helper.php             |   16 -
 .../admin/template/templates/_assets.php      |    6 -
 .../admin/template/templates/_filters.php     |   36 -
 .../template/templates/_filters_field.php     |   20 -
 .../admin/template/templates/_flashes.php     |    7 -
 .../admin/template/templates/_form.php        |   18 -
 .../template/templates/_form_actions.php      |   35 -
 .../admin/template/templates/_form_field.php  |   20 -
 .../template/templates/_form_fieldset.php     |   18 -
 .../admin/template/templates/_form_footer.php |    0
 .../admin/template/templates/_form_header.php |    0
 .../admin/template/templates/_list.php        |   54 -
 .../template/templates/_list_actions.php      |   11 -
 .../templates/_list_batch_actions.php         |   15 -
 .../templates/_list_field_boolean.php         |    5 -
 .../admin/template/templates/_list_footer.php |    0
 .../admin/template/templates/_list_header.php |    0
 .../template/templates/_list_td_actions.php   |   18 -
 .../templates/_list_td_batch_actions.php      |    3 -
 .../template/templates/_list_td_stacked.php   |    3 -
 .../template/templates/_list_td_tabular.php   |    9 -
 .../template/templates/_list_th_stacked.php   |    1 -
 .../template/templates/_list_th_tabular.php   |   17 -
 .../admin/template/templates/_pagination.php  |   25 -
 .../admin/template/templates/editSuccess.php  |   20 -
 .../admin/template/templates/indexSuccess.php |   36 -
 .../admin/template/templates/newSuccess.php   |   20 -
 .../default/parts/createAction.php            |   13 -
 .../default/parts/deleteAction.php            |   17 -
 .../default/parts/editAction.php              |    9 -
 .../default/parts/indexAction.php             |    8 -
 .../default/parts/newAction.php               |    4 -
 .../default/parts/processFormAction.php       |   14 -
 .../default/parts/showAction.php              |    9 -
 .../default/parts/updateAction.php            |   14 -
 .../skeleton/actions/actions.class.php        |   13 -
 .../default/skeleton/config/generator.yml     |    7 -
 .../default/skeleton/templates/.sf            |    0
 .../template/actions/actions.class.php        |   30 -
 .../default/template/templates/_form.php      |   53 -
 .../template/templates/editSuccess.php        |    3 -
 .../template/templates/indexSuccess.php       |   34 -
 .../default/template/templates/newSuccess.php |    3 -
 .../template/templates/showSuccess.php        |   22 -
 .../sfPropelPlugin/i18n/sf_admin.ar.xml       |  134 -
 .../sfPropelPlugin/i18n/sf_admin.bg.xml       |  126 -
 .../sfPropelPlugin/i18n/sf_admin.ca.xml       |  151 -
 .../sfPropelPlugin/i18n/sf_admin.cs.xml       |  178 -
 .../sfPropelPlugin/i18n/sf_admin.da.xml       |  134 -
 .../sfPropelPlugin/i18n/sf_admin.de.xml       |  191 -
 .../sfPropelPlugin/i18n/sf_admin.el.xml       |  158 -
 .../sfPropelPlugin/i18n/sf_admin.es.xml       |  308 --
 .../sfPropelPlugin/i18n/sf_admin.es_AR.xml    |  114 -
 .../sfPropelPlugin/i18n/sf_admin.eu.xml       |  170 -
 .../sfPropelPlugin/i18n/sf_admin.fa.xml       |  168 -
 .../sfPropelPlugin/i18n/sf_admin.fi.xml       |  134 -
 .../sfPropelPlugin/i18n/sf_admin.fr.xml       |  182 -
 .../sfPropelPlugin/i18n/sf_admin.hr.xml       |  134 -
 .../sfPropelPlugin/i18n/sf_admin.hu.xml       |  134 -
 .../sfPropelPlugin/i18n/sf_admin.id.xml       |  134 -
 .../sfPropelPlugin/i18n/sf_admin.it.xml       |  202 -
 .../sfPropelPlugin/i18n/sf_admin.ja.xml       |  294 --
 .../sfPropelPlugin/i18n/sf_admin.lt.xml       |  134 -
 .../sfPropelPlugin/i18n/sf_admin.lv.xml       |  134 -
 .../sfPropelPlugin/i18n/sf_admin.nl.xml       |  130 -
 .../sfPropelPlugin/i18n/sf_admin.no.xml       |  114 -
 .../sfPropelPlugin/i18n/sf_admin.pl.xml       |  174 -
 .../sfPropelPlugin/i18n/sf_admin.pt.xml       |  135 -
 .../sfPropelPlugin/i18n/sf_admin.pt_BR.xml    |  138 -
 .../sfPropelPlugin/i18n/sf_admin.ro.xml       |  137 -
 .../sfPropelPlugin/i18n/sf_admin.ru.xml       |  174 -
 .../sfPropelPlugin/i18n/sf_admin.sk.xml       |  134 -
 .../sfPropelPlugin/i18n/sf_admin.sl.xml       |  158 -
 .../sfPropelPlugin/i18n/sf_admin.sv.xml       |  146 -
 .../sfPropelPlugin/i18n/sf_admin.tr.xml       |  174 -
 .../sfPropelPlugin/i18n/sf_admin.uk.xml       |  174 -
 .../sfPropelPlugin/i18n/sf_admin.zh_CN.xml    |  135 -
 .../sfPropelPlugin/i18n/sf_admin.zh_TW.xml    |  151 -
 .../lib/addon/sfMixer.class.php               |  194 -
 .../lib/addon/sfPropel.class.php              |  102 -
 .../lib/addon/sfPropelBehavior.class.php      |  108 -
 .../lib/addon/sfPropelData.class.php          |  530 ---
 .../addon/sfPropelDatabaseSchema.class.php    | 1306 ------
 .../lib/addon/sfPropelManyToMany.class.php    |  145 -
 .../lib/addon/sfPropelPager.class.php         |  189 -
 .../lib/behavior/SfPropelBehaviorBase.php     |   53 -
 .../lib/behavior/SfPropelBehaviorI18n.php     |  389 --
 .../SfPropelBehaviorI18nTranslation.php       |   91 -
 .../lib/behavior/SfPropelBehaviorSymfony.php  |  138 -
 .../SfPropelBehaviorSymfonyBehaviors.php      |  342 --
 .../SfPropelBehaviorTimestampable.php         |   63 -
 .../lib/database/sfPropelDatabase.class.php   |  189 -
 .../lib/debug/sfWebDebugPanelPropel.class.php |  146 -
 .../lib/form/sfFormFilterPropel.class.php     |  268 --
 .../lib/form/sfFormPropel.class.php           |  311 --
 .../sfPropelFormFilterGenerator.class.php     |  304 --
 .../generator/sfPropelFormGenerator.class.php |  526 ---
 .../lib/generator/sfPropelGenerator.class.php |  337 --
 .../lib/log/sfPropelLogger.class.php          |  121 -
 .../lib/mailer/Swift_PropelSpool.class.php    |  145 -
 .../lib/routing/sfPropelRoute.class.php       |  126 -
 .../routing/sfPropelRouteCollection.class.php |   23 -
 .../lib/task/phing/phing_default_overrides    |    1 -
 .../lib/task/phing/tasks/defaults.properties  |   86 -
 .../lib/task/phing/types/defaults.properties  |   13 -
 .../sfPropelPlugin/lib/task/sfPhing.class.php |   40 -
 .../lib/task/sfPhingListener.php              |  115 -
 .../lib/task/sfPropelBaseTask.class.php       |  357 --
 .../task/sfPropelBuildAllLoadTask.class.php   |   95 -
 .../lib/task/sfPropelBuildAllTask.class.php   |  152 -
 .../task/sfPropelBuildFiltersTask.class.php   |   87 -
 .../lib/task/sfPropelBuildFormsTask.class.php |   95 -
 .../lib/task/sfPropelBuildModelTask.class.php |   68 -
 .../task/sfPropelBuildSchemaTask.class.php    |  114 -
 .../lib/task/sfPropelBuildSqlTask.class.php   |   59 -
 .../lib/task/sfPropelBuildTask.class.php      |  257 --
 .../sfPropelConfigureDatabaseTask.class.php   |  118 -
 .../lib/task/sfPropelDataDumpTask.class.php   |  105 -
 .../lib/task/sfPropelDataLoadTask.class.php   |  105 -
 .../task/sfPropelGenerateAdminTask.class.php  |  234 -
 ...PropelGenerateModuleForRouteTask.class.php |   98 -
 .../task/sfPropelGenerateModuleTask.class.php |  226 -
 .../lib/task/sfPropelGraphvizTask.class.php   |   55 -
 .../lib/task/sfPropelInsertSqlTask.class.php  |  146 -
 .../task/sfPropelSchemaToXmlTask.class.php    |   46 -
 .../task/sfPropelSchemaToYmlTask.class.php    |   46 -
 .../lib/test/sfTesterPropel.class.php         |   94 -
 .../sfValidatorPropelChoice.class.php         |  131 -
 .../sfValidatorPropelUnique.class.php         |  176 -
 .../lib/vendor/phing/BuildEvent.php           |  198 -
 .../lib/vendor/phing/BuildException.php       |  121 -
 .../lib/vendor/phing/BuildListener.php        |   91 -
 .../lib/vendor/phing/BuildLogger.php          |   70 -
 .../vendor/phing/ConfigurationException.php   |   83 -
 .../lib/vendor/phing/IntrospectionHelper.php  |  542 ---
 .../sfPropelPlugin/lib/vendor/phing/Phing.php | 1335 ------
 .../lib/vendor/phing/Project.php              |  968 ----
 .../lib/vendor/phing/ProjectComponent.php     |   70 -
 .../lib/vendor/phing/RuntimeConfigurable.php  |  118 -
 .../lib/vendor/phing/Target.php               |  317 --
 .../sfPropelPlugin/lib/vendor/phing/Task.php  |  265 --
 .../lib/vendor/phing/TaskAdapter.php          |   84 -
 .../lib/vendor/phing/TaskContainer.php        |   42 -
 .../lib/vendor/phing/UnknownElement.php       |  215 -
 .../vendor/phing/filters/BaseFilterReader.php |  157 -
 .../phing/filters/BaseParamFilterReader.php   |   69 -
 .../vendor/phing/filters/ChainableReader.php  |   42 -
 .../vendor/phing/filters/ExpandProperties.php |   82 -
 .../lib/vendor/phing/filters/HeadFilter.php   |  161 -
 .../lib/vendor/phing/filters/LineContains.php |  258 --
 .../phing/filters/LineContainsRegexp.php      |  179 -
 .../lib/vendor/phing/filters/PrefixLines.php  |  142 -
 .../vendor/phing/filters/ReplaceRegexp.php    |  129 -
 .../vendor/phing/filters/ReplaceTokens.php    |  415 --
 .../vendor/phing/filters/StripLineBreaks.php  |  148 -
 .../phing/filters/StripLineComments.php       |  205 -
 .../vendor/phing/filters/StripPhpComments.php |  188 -
 .../vendor/phing/filters/StripWhitespace.php  |   95 -
 .../lib/vendor/phing/filters/TabToSpaces.php  |  144 -
 .../lib/vendor/phing/filters/TailFilter.php   |  157 -
 .../lib/vendor/phing/filters/TidyFilter.php   |  162 -
 .../vendor/phing/filters/TranslateGettext.php |  285 --
 .../vendor/phing/filters/XincludeFilter.php   |  137 -
 .../lib/vendor/phing/filters/XsltFilter.php   |  341 --
 .../phing/filters/util/ChainReaderHelper.php  |  183 -
 .../phing/filters/util/IniFileTokenReader.php |   97 -
 .../phing/input/DefaultInputHandler.php       |   81 -
 .../lib/vendor/phing/input/InputHandler.php   |   45 -
 .../lib/vendor/phing/input/InputRequest.php   |  107 -
 .../input/MultipleChoiceInputRequest.php      |   58 -
 .../phing/input/PropertyFileInputHandler.php  |  129 -
 .../vendor/phing/input/YesNoInputRequest.php  |   47 -
 .../lib/vendor/phing/lib/Capsule.php          |  266 --
 .../lib/vendor/phing/lib/Zip.php              | 3590 ---------------
 .../vendor/phing/listener/AnsiColorLogger.php |  234 -
 .../vendor/phing/listener/DefaultLogger.php   |  278 --
 .../vendor/phing/listener/NoBannerLogger.php  |   59 -
 .../vendor/phing/listener/PearLogListener.php |  197 -
 .../listener/StreamRequiredBuildLogger.php    |   39 -
 .../lib/vendor/phing/listener/XmlLogger.php   |  345 --
 .../vendor/phing/listener/defaults.properties |   43 -
 .../vendor/phing/mappers/FileNameMapper.php   |   59 -
 .../vendor/phing/mappers/FlattenMapper.php    |   55 -
 .../lib/vendor/phing/mappers/GlobMapper.php   |  113 -
 .../vendor/phing/mappers/IdentityMapper.php   |   54 -
 .../lib/vendor/phing/mappers/MergeMapper.php  |   69 -
 .../lib/vendor/phing/mappers/RegexpMapper.php |   97 -
 .../vendor/phing/parser/AbstractHandler.php   |   98 -
 .../vendor/phing/parser/AbstractSAXParser.php |  116 -
 .../vendor/phing/parser/DataTypeHandler.php   |  144 -
 .../phing/parser/ExpatParseException.php      |   31 -
 .../lib/vendor/phing/parser/ExpatParser.php   |  140 -
 .../lib/vendor/phing/parser/Location.php      |   72 -
 .../phing/parser/NestedElementHandler.php     |  186 -
 .../phing/parser/ProjectConfigurator.php      |  245 -
 .../vendor/phing/parser/ProjectHandler.php    |  153 -
 .../lib/vendor/phing/parser/RootHandler.php   |   82 -
 .../lib/vendor/phing/parser/TargetHandler.php |  149 -
 .../lib/vendor/phing/parser/TaskHandler.php   |  234 -
 .../vendor/phing/system/io/BufferedReader.php |  168 -
 .../vendor/phing/system/io/BufferedWriter.php |   71 -
 .../vendor/phing/system/io/ConsoleReader.php  |   84 -
 .../phing/system/io/FileInputStream.php       |   76 -
 .../phing/system/io/FileOutputStream.php      |   71 -
 .../lib/vendor/phing/system/io/FileReader.php |   41 -
 .../lib/vendor/phing/system/io/FileSystem.php |  686 ---
 .../lib/vendor/phing/system/io/FileWriter.php |   42 -
 .../vendor/phing/system/io/FilterReader.php   |   68 -
 .../vendor/phing/system/io/IOException.php    |   27 -
 .../vendor/phing/system/io/InputStream.php    |  178 -
 .../phing/system/io/InputStreamReader.php     |  126 -
 .../vendor/phing/system/io/OutputStream.php   |  108 -
 .../phing/system/io/OutputStreamWriter.php    |   84 -
 .../lib/vendor/phing/system/io/PhingFile.php  |  882 ----
 .../lib/vendor/phing/system/io/Reader.php     |   91 -
 .../vendor/phing/system/io/StringReader.php   |   84 -
 .../vendor/phing/system/io/UnixFileSystem.php |  278 --
 .../phing/system/io/Win32FileSystem.php       |  477 --
 .../phing/system/io/WinNTFileSystem.php       |   35 -
 .../lib/vendor/phing/system/io/Writer.php     |   53 -
 .../vendor/phing/system/lang/Character.php    |   49 -
 .../vendor/phing/system/lang/EventObject.php  |   52 -
 .../system/lang/FileNotFoundException.php     |   26 -
 .../system/lang/NullPointerException.php      |   26 -
 .../phing/system/lang/SecurityException.php   |   26 -
 .../lib/vendor/phing/system/util/Message.php  |    9 -
 .../vendor/phing/system/util/Properties.php   |  272 --
 .../lib/vendor/phing/system/util/Register.php |  115 -
 .../lib/vendor/phing/system/util/Timer.php    |   96 -
 .../vendor/phing/tasks/defaults.properties    |   86 -
 .../vendor/phing/tasks/ext/CapsuleTask.php    |  478 --
 .../phing/tasks/ext/ExtractBaseTask.php       |  183 -
 .../vendor/phing/tasks/ext/FtpDeployTask.php  |  176 -
 .../vendor/phing/tasks/ext/JslLintTask.php    |  184 -
 .../lib/vendor/phing/tasks/ext/MailTask.php   |   77 -
 .../vendor/phing/tasks/ext/ManifestTask.php   |  341 --
 .../phing/tasks/ext/PackageAsPathTask.php     |   65 -
 .../phing/tasks/ext/PearPackage2Task.php      |  270 --
 .../phing/tasks/ext/PearPackageTask.php       |  421 --
 .../phing/tasks/ext/PhpCodeSnifferTask.php    |  326 --
 .../vendor/phing/tasks/ext/PhpLintTask.php    |  159 -
 .../vendor/phing/tasks/ext/ScpSendTask.php    |  192 -
 .../lib/vendor/phing/tasks/ext/SmartyTask.php |  610 ---
 .../lib/vendor/phing/tasks/ext/TarTask.php    |  426 --
 .../lib/vendor/phing/tasks/ext/UntarTask.php  |   89 -
 .../lib/vendor/phing/tasks/ext/UnzipTask.php  |   68 -
 .../vendor/phing/tasks/ext/XmlLintTask.php    |  135 -
 .../phing/tasks/ext/ZendCodeAnalyzerTask.php  |  182 -
 .../lib/vendor/phing/tasks/ext/ZipTask.php    |  265 --
 .../tasks/ext/coverage/CoverageMerger.php     |  137 -
 .../tasks/ext/coverage/CoverageMergerTask.php |   92 -
 .../tasks/ext/coverage/CoverageReportTask.php |  414 --
 .../coverage/CoverageReportTransformer.php    |  120 -
 .../tasks/ext/coverage/CoverageSetupTask.php  |  158 -
 .../tasks/ext/creole/CreoleSQLExecTask.php    |  590 ---
 .../phing/tasks/ext/creole/CreoleTask.php     |  242 -
 .../phing/tasks/ext/dbdeploy/DbDeployTask.php |  192 -
 .../phing/tasks/ext/dbdeploy/DbmsSyntax.php   |   34 -
 .../tasks/ext/dbdeploy/DbmsSyntaxFactory.php  |   59 -
 .../tasks/ext/dbdeploy/DbmsSyntaxMsSql.php    |   37 -
 .../tasks/ext/dbdeploy/DbmsSyntaxMysql.php    |   37 -
 .../tasks/ext/dbdeploy/DbmsSyntaxSQLite.php   |   37 -
 .../tasks/ext/ioncube/IoncubeComment.php      |   43 -
 .../tasks/ext/ioncube/IoncubeEncoderTask.php  |  487 --
 .../tasks/ext/ioncube/IoncubeLicenseTask.php  |  143 -
 .../tasks/ext/pdo/PDOResultFormatter.php      |   84 -
 .../ext/pdo/PDOSQLExecFormatterElement.php    |  312 --
 .../phing/tasks/ext/pdo/PDOSQLExecTask.php    |  614 ---
 .../vendor/phing/tasks/ext/pdo/PDOTask.php    |  217 -
 .../tasks/ext/pdo/PlainPDOResultFormatter.php |  130 -
 .../tasks/ext/pdo/XMLPDOResultFormatter.php   |  141 -
 .../phing/tasks/ext/pearpackage/Fileset.php   |  231 -
 .../ext/phpdoc/PhingPhpDocumentorSetup.php    |  210 -
 .../ext/phpdoc/PhpDocumentorExternalTask.php  |  261 --
 .../tasks/ext/phpdoc/PhpDocumentorTask.php    |  460 --
 .../phing/tasks/ext/phpunit/BatchTest.php     |  182 -
 .../tasks/ext/phpunit/FormatterElement.php    |  150 -
 .../tasks/ext/phpunit/PHPUnitReportTask.php   |  186 -
 .../phing/tasks/ext/phpunit/PHPUnitTask.php   |  390 --
 .../tasks/ext/phpunit/PHPUnitTestRunner.php   |  140 -
 .../phing/tasks/ext/phpunit/PHPUnitUtil.php   |  131 -
 .../phpunit2/PHPUnit2ResultFormatter.php      |  157 -
 .../phpunit2/PlainPHPUnit2ResultFormatter.php |  116 -
 .../SummaryPHPUnit2ResultFormatter.php        |   57 -
 .../phpunit2/XMLPHPUnit2ResultFormatter.php   |  116 -
 .../phpunit3/PHPUnit3ResultFormatter.php      |  200 -
 .../phpunit3/PlainPHPUnit3ResultFormatter.php |  123 -
 .../SummaryPHPUnit3ResultFormatter.php        |   58 -
 .../phpunit3/XMLPHPUnit3ResultFormatter.php   |  116 -
 .../SimpleTestCountResultFormatter.php        |   51 -
 .../simpletest/SimpleTestFormatterElement.php |   61 -
 .../SimpleTestPlainResultFormatter.php        |   94 -
 .../simpletest/SimpleTestResultFormatter.php  |  161 -
 .../SimpleTestSummaryResultFormatter.php      |   53 -
 .../tasks/ext/simpletest/SimpleTestTask.php   |  237 -
 .../phing/tasks/ext/svn/SvnBaseTask.php       |  321 --
 .../phing/tasks/ext/svn/SvnCheckoutTask.php   |   49 -
 .../phing/tasks/ext/svn/SvnExportTask.php     |   70 -
 .../tasks/ext/svn/SvnLastRevisionTask.php     |   74 -
 .../phing/tasks/ext/svn/SvnUpdateTask.php     |   49 -
 .../vendor/phing/tasks/system/AdhocTask.php   |   88 -
 .../phing/tasks/system/AdhocTaskdefTask.php   |   90 -
 .../phing/tasks/system/AdhocTypedefTask.php   |   71 -
 .../vendor/phing/tasks/system/AppendTask.php  |  240 -
 .../phing/tasks/system/AvailableTask.php      |  135 -
 .../vendor/phing/tasks/system/ChmodTask.php   |  203 -
 .../vendor/phing/tasks/system/ChownTask.php   |  195 -
 .../phing/tasks/system/ConditionTask.php      |   74 -
 .../vendor/phing/tasks/system/CopyTask.php    |  408 --
 .../vendor/phing/tasks/system/CvsPassTask.php |  173 -
 .../lib/vendor/phing/tasks/system/CvsTask.php |  540 ---
 .../vendor/phing/tasks/system/DeleteTask.php  |  277 --
 .../vendor/phing/tasks/system/EchoTask.php    |  107 -
 .../vendor/phing/tasks/system/ExecTask.php    |  266 --
 .../vendor/phing/tasks/system/ExitTask.php    |  118 -
 .../vendor/phing/tasks/system/ForeachTask.php |  138 -
 .../lib/vendor/phing/tasks/system/IfTask.php  |  224 -
 .../phing/tasks/system/IncludePathTask.php    |  115 -
 .../vendor/phing/tasks/system/InputTask.php   |  146 -
 .../phing/tasks/system/MatchingTask.php       |  361 --
 .../vendor/phing/tasks/system/MkdirTask.php   |   64 -
 .../vendor/phing/tasks/system/MoveTask.php    |  247 -
 .../phing/tasks/system/PhingCallTask.php      |  161 -
 .../vendor/phing/tasks/system/PhingTask.php   |  623 ---
 .../vendor/phing/tasks/system/PhpEvalTask.php |  169 -
 .../phing/tasks/system/PropertyPromptTask.php |  234 -
 .../phing/tasks/system/PropertyTask.php       |  438 --
 .../phing/tasks/system/ReflexiveTask.php      |  155 -
 .../phing/tasks/system/ResolvePathTask.php    |  122 -
 .../phing/tasks/system/SequentialTask.php     |   57 -
 .../vendor/phing/tasks/system/TaskdefTask.php |  127 -
 .../vendor/phing/tasks/system/TouchTask.php   |  170 -
 .../vendor/phing/tasks/system/TstampTask.php  |  168 -
 .../vendor/phing/tasks/system/TypedefTask.php |  125 -
 .../phing/tasks/system/UpToDateTask.php       |  217 -
 .../vendor/phing/tasks/system/WarnTask.php    |   35 -
 .../vendor/phing/tasks/system/XsltTask.php    |   81 -
 .../tasks/system/condition/AndCondition.php   |   46 -
 .../tasks/system/condition/Condition.php      |   38 -
 .../tasks/system/condition/ConditionBase.php  |  195 -
 .../system/condition/ContainsCondition.php    |   76 -
 .../system/condition/EqualsCondition.php      |   78 -
 .../system/condition/IsFalseCondition.php     |   60 -
 .../tasks/system/condition/IsSetCondition.php |   53 -
 .../system/condition/IsTrueCondition.php      |   59 -
 .../tasks/system/condition/NotCondition.php   |   48 -
 .../tasks/system/condition/OrCondition.php    |   46 -
 .../tasks/system/condition/OsCondition.php    |   63 -
 .../condition/ReferenceExistsCondition.php    |   52 -
 .../vendor/phing/types/AbstractFileSet.php    |  570 ---
 .../lib/vendor/phing/types/Commandline.php    |  467 --
 .../lib/vendor/phing/types/DataType.php       |  182 -
 .../lib/vendor/phing/types/Description.php    |   53 -
 .../lib/vendor/phing/types/DirSet.php         |   49 -
 .../lib/vendor/phing/types/FileList.php       |  224 -
 .../lib/vendor/phing/types/FileSet.php        |   56 -
 .../lib/vendor/phing/types/FilterChain.php    |  176 -
 .../lib/vendor/phing/types/Mapper.php         |  207 -
 .../lib/vendor/phing/types/Parameter.php      |   99 -
 .../vendor/phing/types/Parameterizable.php    |   32 -
 .../lib/vendor/phing/types/Path.php           |  450 --
 .../lib/vendor/phing/types/PatternSet.php     |  491 --
 .../vendor/phing/types/PhingFilterReader.php  |  136 -
 .../lib/vendor/phing/types/Reference.php      |   56 -
 .../vendor/phing/types/RegularExpression.php  |  105 -
 .../lib/vendor/phing/types/TokenReader.php    |   66 -
 .../lib/vendor/phing/types/TokenSource.php    |  157 -
 .../vendor/phing/types/defaults.properties    |   13 -
 .../phing/types/selectors/AndSelector.php     |   67 -
 .../types/selectors/BaseExtendSelector.php    |   62 -
 .../phing/types/selectors/BaseSelector.php    |   84 -
 .../types/selectors/BaseSelectorContainer.php |  270 --
 .../selectors/ContainsRegexpSelector.php      |  164 -
 .../types/selectors/ContainsSelector.php      |  151 -
 .../phing/types/selectors/DateSelector.php    |  214 -
 .../phing/types/selectors/DependSelector.php  |  151 -
 .../phing/types/selectors/DepthSelector.php   |  158 -
 .../types/selectors/ExtendFileSelector.php    |   43 -
 .../phing/types/selectors/ExtendSelector.php  |  124 -
 .../phing/types/selectors/FileSelector.php    |   47 -
 .../types/selectors/FilenameSelector.php      |  157 -
 .../types/selectors/MajoritySelector.php      |   92 -
 .../phing/types/selectors/NoneSelector.php    |   71 -
 .../phing/types/selectors/NotSelector.php     |   59 -
 .../phing/types/selectors/OrSelector.php      |   72 -
 .../phing/types/selectors/PresentSelector.php |  154 -
 .../phing/types/selectors/SelectSelector.php  |  124 -
 .../types/selectors/SelectorContainer.php     |  141 -
 .../phing/types/selectors/SelectorScanner.php |   55 -
 .../phing/types/selectors/SelectorUtils.php   |  440 --
 .../phing/types/selectors/SizeSelector.php    |  228 -
 .../phing/types/selectors/TypeSelector.php    |  113 -
 .../vendor/phing/util/DirectoryScanner.php    |  712 ---
 .../vendor/phing/util/ExtendedFileStream.php  |  132 -
 .../lib/vendor/phing/util/FileUtils.php       |  294 --
 .../lib/vendor/phing/util/LogWriter.php       |   95 -
 .../lib/vendor/phing/util/PathTokenizer.php   |  245 -
 .../vendor/phing/util/SourceFileScanner.php   |  159 -
 .../lib/vendor/phing/util/StringHelper.php    |  208 -
 .../vendor/phing/util/regexp/PregEngine.php   |  104 -
 .../lib/vendor/phing/util/regexp/Regexp.php   |  167 -
 .../vendor/phing/util/regexp/RegexpEngine.php |   73 -
 .../vendor/propel-generator/bin/propel-gen    |   67 -
 .../propel-generator/bin/propel-gen.bat       |   47 -
 .../vendor/propel-generator/build-propel.xml  |  542 ---
 .../propel-generator/build.properties-sample  |  194 -
 .../lib/vendor/propel-generator/build.xml     |  188 -
 .../vendor/propel-generator/build.xml-local   |  124 -
 .../classes/propel/engine/EngineException.php |   33 -
 .../classes/propel/engine/GeneratorConfig.php |  229 -
 .../AlternativeCodingStandardsBehavior.php    |  135 -
 .../engine/behavior/AutoAddPkBehavior.php     |   66 -
 .../engine/behavior/SoftDeleteBehavior.php    |  259 --
 .../engine/behavior/TimestampableBehavior.php |   88 -
 .../engine/builder/DataModelBuilder.php       |  496 --
 .../propel/engine/builder/om/ClassTools.php   |  131 -
 .../propel/engine/builder/om/OMBuilder.php    |  368 --
 .../engine/builder/om/ObjectBuilder.php       |  187 -
 .../propel/engine/builder/om/PeerBuilder.php  |  299 --
 .../om/php5/PHP5ExtensionNodeBuilder.php      |  122 -
 .../om/php5/PHP5ExtensionNodePeerBuilder.php  |  123 -
 .../om/php5/PHP5ExtensionObjectBuilder.php    |  169 -
 .../om/php5/PHP5ExtensionPeerBuilder.php      |  146 -
 .../builder/om/php5/PHP5InterfaceBuilder.php  |  119 -
 .../om/php5/PHP5MultiExtendObjectBuilder.php  |  202 -
 .../builder/om/php5/PHP5NestedSetBuilder.php  | 1145 -----
 .../om/php5/PHP5NestedSetPeerBuilder.php      | 1737 -------
 .../builder/om/php5/PHP5NodeBuilder.php       | 1115 -----
 .../builder/om/php5/PHP5NodePeerBuilder.php   |  765 ----
 .../builder/om/php5/PHP5ObjectBuilder.php     | 4071 -----------------
 .../builder/om/php5/PHP5PeerBuilder.php       | 2645 -----------
 .../builder/om/php5/PHP5TableMapBuilder.php   |  340 --
 .../propel/engine/builder/sql/DDLBuilder.php  |  177 -
 .../engine/builder/sql/DataSQLBuilder.php     |  264 --
 .../builder/sql/mssql/MssqlDDLBuilder.php     |  185 -
 .../builder/sql/mssql/MssqlDataSQLBuilder.php |   48 -
 .../builder/sql/mysql/MysqlDDLBuilder.php     |  425 --
 .../builder/sql/mysql/MysqlDataSQLBuilder.php |   33 -
 .../builder/sql/oracle/OracleDDLBuilder.php   |  176 -
 .../sql/oracle/OracleDataSQLBuilder.php       |   34 -
 .../builder/sql/pgsql/PgsqlDDLBuilder.php     |  316 --
 .../builder/sql/pgsql/PgsqlDataSQLBuilder.php |  113 -
 .../builder/sql/sqlite/SqliteDDLBuilder.php   |  130 -
 .../sql/sqlite/SqliteDataSQLBuilder.php       |   47 -
 .../builder/util/DefaultEnglishPluralizer.php |   43 -
 .../propel/engine/builder/util/Pluralizer.php |   38 -
 .../builder/util/transform/XmlToDataSQL.php   |  276 --
 .../propel/engine/database/model/AppData.php  |  216 -
 .../propel/engine/database/model/Behavior.php |  184 -
 .../propel/engine/database/model/Column.php   | 1184 -----
 .../database/model/ColumnDefaultValue.php     |  101 -
 .../model/ConstraintNameGenerator.php         |   84 -
 .../propel/engine/database/model/Database.php |  588 ---
 .../propel/engine/database/model/Domain.php   |  396 --
 .../engine/database/model/ForeignKey.php      |  442 --
 .../propel/engine/database/model/IDMethod.php |   46 -
 .../database/model/IdMethodParameter.php      |  119 -
 .../propel/engine/database/model/Index.php    |  286 --
 .../engine/database/model/Inheritance.php     |  158 -
 .../engine/database/model/NameFactory.php     |   88 -
 .../engine/database/model/NameGenerator.php   |   83 -
 .../database/model/PhpNameGenerator.php       |  175 -
 .../engine/database/model/PropelTypes.php     |  331 --
 .../propel/engine/database/model/Rule.php     |  204 -
 .../propel/engine/database/model/Table.php    | 1429 ------
 .../propel/engine/database/model/Unique.php   |   68 -
 .../engine/database/model/Validator.php       |  194 -
 .../engine/database/model/VendorInfo.php      |  182 -
 .../engine/database/model/XMLElement.php      |  192 -
 .../database/reverse/BaseSchemaParser.php     |  198 -
 .../engine/database/reverse/SchemaParser.php  |   71 -
 .../reverse/mssql/MssqlSchemaParser.php       |  248 -
 .../reverse/mysql/MysqlSchemaParser.php       |  337 --
 .../reverse/oracle/OracleSchemaParser.php     |  230 -
 .../reverse/pgsql/PgsqlSchemaParser.php       |  545 ---
 .../reverse/sqlite/SqliteSchemaParser.php     |  203 -
 .../database/transform/XmlToAppData.php       |  409 --
 .../engine/platform/DefaultPlatform.php       |  309 --
 .../propel/engine/platform/MssqlPlatform.php  |  117 -
 .../propel/engine/platform/MysqlPlatform.php  |  120 -
 .../propel/engine/platform/OraclePlatform.php |   99 -
 .../propel/engine/platform/PgsqlPlatform.php  |  128 -
 .../propel/engine/platform/Platform.php       |  192 -
 .../propel/engine/platform/SqlitePlatform.php |   97 -
 .../phing/AbstractPropelDataModelTask.php     |  611 ---
 .../propel/phing/PropelConvertConfTask.php    |  312 --
 .../phing/PropelCreoleTransformTask.php       |  829 ----
 .../propel/phing/PropelDataDTDTask.php        |   80 -
 .../propel/phing/PropelDataDumpTask.php       |  365 --
 .../phing/PropelDataModelTemplateTask.php     |  228 -
 .../propel/phing/PropelDataSQLTask.php        |  204 -
 .../propel/phing/PropelGraphvizTask.php       |  181 -
 .../classes/propel/phing/PropelOMTask.php     |  212 -
 .../classes/propel/phing/PropelSQLExec.php    |  711 ---
 .../classes/propel/phing/PropelSQLTask.php    |  261 --
 .../propel/phing/PropelSchemaReverseTask.php  |  556 ---
 .../propel-generator/default.properties       |  264 --
 .../pear/BuildPropelGenPEARPackageTask.php    |  270 --
 .../pear/build-pear-package.xml               |  143 -
 .../propel-generator/pear/build.properties    |    5 -
 .../propel-generator/pear/pear-build.xml      |  125 -
 .../propel-generator/pear/pear-propel-gen     |   18 -
 .../propel-generator/pear/pear-propel-gen.bat |   24 -
 .../resources/dtd/database.dtd                |  176 -
 .../resources/xsd/custom_datatypes.xsd        |    8 -
 .../resources/xsd/database.xsd                |  397 --
 .../resources/xsl/database.xsl                |  292 --
 .../lib/vendor/propel/Propel.php              |  841 ----
 .../lib/vendor/propel/PropelException.php     |   61 -
 .../lib/vendor/propel/adapter/DBAdapter.php   |  306 --
 .../lib/vendor/propel/adapter/DBMSSQL.php     |  194 -
 .../lib/vendor/propel/adapter/DBMySQL.php     |  156 -
 .../lib/vendor/propel/adapter/DBNone.php      |  115 -
 .../lib/vendor/propel/adapter/DBOracle.php    |  143 -
 .../lib/vendor/propel/adapter/DBPostgres.php  |  152 -
 .../lib/vendor/propel/adapter/DBSQLite.php    |  127 -
 .../adapter/MSSQL/MssqlDateTime.class.php     |   27 -
 .../propel/adapter/MSSQL/MssqlDebugPDO.php    |  110 -
 .../propel/adapter/MSSQL/MssqlPropelPDO.php   |  110 -
 .../lib/vendor/propel/logger/BasicLogger.php  |  103 -
 .../vendor/propel/logger/MojaviLogAdapter.php |  170 -
 .../lib/vendor/propel/map/ColumnMap.php       |  475 --
 .../lib/vendor/propel/map/DatabaseMap.php     |  200 -
 .../lib/vendor/propel/map/RelationMap.php     |  218 -
 .../lib/vendor/propel/map/TableMap.php        |  654 ---
 .../lib/vendor/propel/map/ValidatorMap.php    |  103 -
 .../lib/vendor/propel/om/BaseObject.php       |  266 --
 .../propel/om/NestedSetRecursiveIterator.php  |   88 -
 .../lib/vendor/propel/om/NodeObject.php       |  334 --
 .../lib/vendor/propel/om/Persistent.php       |  118 -
 .../vendor/propel/om/PreOrderNodeIterator.php |   90 -
 .../lib/vendor/propel/util/BasePeer.php       | 1064 -----
 .../lib/vendor/propel/util/Criteria.php       | 1754 -------
 .../lib/vendor/propel/util/DebugPDO.php       |  550 ---
 .../vendor/propel/util/DebugPDOStatement.php  |  134 -
 .../lib/vendor/propel/util/Join.php           |  251 -
 .../lib/vendor/propel/util/NodePeer.php       |  379 --
 .../vendor/propel/util/PropelColumnTypes.php  |   95 -
 .../propel/util/PropelConfiguration.php       |  170 -
 .../util/PropelConfigurationIterator.php      |  114 -
 .../lib/vendor/propel/util/PropelDateTime.php |   87 -
 .../lib/vendor/propel/util/PropelPDO.php      |  268 --
 .../lib/vendor/propel/util/PropelPager.php    |  607 ---
 .../propel/validator/BasicValidator.php       |   46 -
 .../propel/validator/MatchValidator.php       |   79 -
 .../propel/validator/MaxLengthValidator.php   |   50 -
 .../propel/validator/MaxValueValidator.php    |   54 -
 .../propel/validator/MinLengthValidator.php   |   47 -
 .../propel/validator/MinValueValidator.php    |   54 -
 .../propel/validator/NotMatchValidator.php    |   77 -
 .../propel/validator/RequiredValidator.php    |   49 -
 .../vendor/propel/validator/TypeValidator.php |   44 -
 .../propel/validator/UniqueValidator.php      |   59 -
 .../propel/validator/ValidValuesValidator.php |   44 -
 .../propel/validator/ValidationFailed.php     |  126 -
 .../widget/sfWidgetFormPropelChoice.class.php |  108 -
 .../plugins/sfPropelPlugin/test/bin/prove.php |   31 -
 .../test/bootstrap/functional.php             |   55 -
 .../sfPropelPlugin/test/bootstrap/unit.php    |   20 -
 .../test/functional/crud/crud10Test.php       |   21 -
 .../test/functional/crud/crud2Test.php        |   21 -
 .../test/functional/crud/crud3Test.php        |   21 -
 .../test/functional/crud/crud6Test.php        |   21 -
 .../test/functional/crud/crud7Test.php        |   21 -
 .../test/functional/crud/crud9Test.php        |   21 -
 .../functional/crud/crudBrowser.class.php     |  359 --
 .../test/functional/crud/rest1Test.php        |   21 -
 .../test/functional/crud/rest2Test.php        |   21 -
 .../functional/crud/restBrowser.class.php     |   36 -
 .../apps/backend_compat/config/app.yml        |    2 -
 .../backend_compatConfiguration.class.php     |    8 -
 .../apps/backend_compat/config/cache.yml      |    4 -
 .../apps/backend_compat/config/factories.yml  |   17 -
 .../apps/backend_compat/config/filters.yml    |    9 -
 .../apps/backend_compat/config/routing.yml    |   15 -
 .../apps/backend_compat/config/security.yml   |    2 -
 .../apps/backend_compat/config/settings.yml   |   20 -
 .../apps/backend_compat/config/view.yml       |   17 -
 .../apps/backend_compat/lib/myUser.class.php  |    5 -
 .../modules/article/actions/actions.class.php |   17 -
 .../modules/article/config/generator.yml      |    5 -
 .../modules/article/templates/_body.php       |    9 -
 .../modules/error/actions/actions.class.php   |   13 -
 .../modules/error/config/generator.yml        |    5 -
 .../inheritance/actions/actions.class.php     |   28 -
 .../modules/inheritance/config/generator.yml  |    5 -
 .../validation/actions/actions.class.php      |   13 -
 .../modules/validation/config/generator.yml   |    5 -
 .../modules/validation/validate/edit.yml      |   13 -
 .../apps/backend_compat/templates/layout.php  |   21 -
 .../fixtures/apps/crud/config/app.yml         |    2 -
 .../fixtures/apps/crud/config/cache.yml       |    4 -
 .../crud/config/crudConfiguration.class.php   |    8 -
 .../fixtures/apps/crud/config/factories.yml   |   17 -
 .../fixtures/apps/crud/config/filters.yml     |    9 -
 .../fixtures/apps/crud/config/routing.yml     |   27 -
 .../fixtures/apps/crud/config/security.yml    |    2 -
 .../fixtures/apps/crud/config/settings.yml    |   24 -
 .../fixtures/apps/crud/config/view.yml        |   17 -
 .../fixtures/apps/crud/lib/myUser.class.php   |    5 -
 .../modules/error/actions/actions.class.php   |   13 -
 .../crud/modules/error/config/generator.yml   |    5 -
 .../fixtures/apps/crud/templates/layout.php   |   21 -
 .../fixtures/apps/frontend/config/app.yml     |    2 -
 .../fixtures/apps/frontend/config/cache.yml   |    4 -
 .../apps/frontend/config/factories.yml        |   17 -
 .../fixtures/apps/frontend/config/filters.yml |    8 -
 .../config/frontendConfiguration.class.php    |    8 -
 .../fixtures/apps/frontend/config/routing.yml |   15 -
 .../apps/frontend/config/security.yml         |    2 -
 .../apps/frontend/config/settings.yml         |   29 -
 .../fixtures/apps/frontend/config/view.yml    |   17 -
 .../apps/frontend/lib/myUser.class.php        |    5 -
 .../attachment/actions/actions.class.php      |   51 -
 .../attachment/templates/indexSuccess.php     |   10 -
 .../modules/choice/actions/actions.class.php  |   50 -
 .../choice/templates/articleSuccess.php       |   10 -
 .../modules/i18n/actions/actions.class.php    |   48 -
 .../modules/i18n/templates/indexSuccess.php   |    8 -
 .../modules/i18n/templates/movieSuccess.php   |   10 -
 .../i18n/templates/productsSuccess.php        |    5 -
 .../modules/pager/actions/actions.class.php   |   10 -
 .../pager/templates/interfacesSuccess.php     |    7 -
 .../modules/pooling/actions/actions.class.php |   35 -
 .../modules/unique/actions/actions.class.php  |   74 -
 .../unique/templates/articleSuccess.php       |   10 -
 .../unique/templates/categorySuccess.php      |   10 -
 .../modules/unique/templates/editSuccess.php  |   10 -
 .../apps/frontend/templates/layout.php        |   21 -
 .../config/ProjectConfiguration.class.php     |   85 -
 .../functional/fixtures/config/databases.yml  |   11 -
 .../functional/fixtures/config/propel.ini     |   55 -
 .../functional/fixtures/config/properties.ini |    2 -
 .../fixtures/config/rsync_exclude.txt         |    5 -
 .../functional/fixtures/config/schema.xml     |  105 -
 .../fixtures/data/environment.migrated        |    0
 .../fixtures/data/fixtures/fixtures.yml       |   62 -
 .../lib/filter/ArticleFormFilter.class.php    |   16 -
 .../lib/filter/AttachmentFormFilter.class.php |   16 -
 .../lib/filter/AuthorFormFilter.class.php     |   16 -
 .../lib/filter/BaseFormFilterPropel.class.php |   16 -
 .../lib/filter/BookFormFilter.class.php       |   16 -
 .../lib/filter/CategoryFormFilter.class.php   |   16 -
 .../lib/filter/MovieFormFilter.class.php      |   16 -
 .../lib/filter/MovieI18nFormFilter.class.php  |   16 -
 .../lib/filter/ProductFormFilter.class.php    |   16 -
 .../filter/ProductI18nFormFilter.class.php    |   16 -
 .../fixtures/lib/form/ArticleForm.class.php   |   30 -
 .../lib/form/AttachmentForm.class.php         |   20 -
 .../fixtures/lib/form/AuthorForm.class.php    |   15 -
 .../fixtures/lib/form/BaseForm.class.php      |   13 -
 .../lib/form/BaseFormPropel.class.php         |   14 -
 .../fixtures/lib/form/BookForm.class.php      |   15 -
 .../fixtures/lib/form/CategoryForm.class.php  |   15 -
 .../fixtures/lib/form/MovieForm.class.php     |   16 -
 .../fixtures/lib/form/MovieI18nForm.class.php |   15 -
 .../fixtures/lib/form/ProductForm.class.php   |   15 -
 .../lib/form/ProductI18nForm.class.php        |   15 -
 .../functional/fixtures/lib/model/Article.php |   23 -
 .../fixtures/lib/model/ArticlePeer.php        |   12 -
 .../fixtures/lib/model/Attachment.php         |   16 -
 .../fixtures/lib/model/AttachmentPeer.php     |   12 -
 .../functional/fixtures/lib/model/Author.php  |   28 -
 .../fixtures/lib/model/AuthorArticle.php      |   23 -
 .../fixtures/lib/model/AuthorArticlePeer.php  |   12 -
 .../fixtures/lib/model/AuthorPeer.php         |   12 -
 .../functional/fixtures/lib/model/Book.php    |   27 -
 .../fixtures/lib/model/BookPeer.php           |   12 -
 .../fixtures/lib/model/Category.php           |   27 -
 .../fixtures/lib/model/CategoryPeer.php       |   19 -
 .../functional/fixtures/lib/model/Movie.php   |   12 -
 .../fixtures/lib/model/MovieI18n.php          |   12 -
 .../fixtures/lib/model/MovieI18nPeer.php      |   12 -
 .../fixtures/lib/model/MoviePeer.php          |   12 -
 .../functional/fixtures/lib/model/Product.php |   24 -
 .../fixtures/lib/model/ProductI18n.php        |   24 -
 .../fixtures/lib/model/ProductI18nPeer.php    |   13 -
 .../fixtures/lib/model/ProductPeer.php        |   13 -
 .../test/functional/fixtures/symfony          |   15 -
 .../test/functional/formTest.php              |  280 --
 .../test/functional/i18nTest.php              |  159 -
 .../test/functional/pagerTest.php             |   39 -
 .../test/functional/poolingTest.php           |   30 -
 .../unit/database/sfPropelDatabaseTest.php    |   59 -
 .../unit/debug/sfWebDebugPanelPropelTest.php  |   57 -
 .../test/unit/fixtures/new_schema.yml         |  113 -
 .../test/unit/fixtures/schema.xml             |  119 -
 .../test/unit/fixtures/schema.yml             |   95 -
 .../test/unit/form/sfFormPropelTest.php       |   37 -
 .../sfPropelPlugin/test/unit/sfMixerTest.php  |  170 -
 .../test/unit/sfPropelDatabaseSchemaTest.php  |   88 -
 .../test/unit/task/sfPhingTest.php            |   18 -
 .../validator/sfValidatorPropelUniqueTest.php |   58 -
 .../sfPropelPlugin/web/css/default.css        |  271 --
 .../plugins/sfPropelPlugin/web/css/global.css |   34 -
 .../plugins/sfPropelPlugin/web/images/asc.png |  Bin 287 -> 0 bytes
 .../sfPropelPlugin/web/images/default.png     |  Bin 267 -> 0 bytes
 .../sfPropelPlugin/web/images/delete.png      |  Bin 325 -> 0 bytes
 .../sfPropelPlugin/web/images/desc.png        |  Bin 285 -> 0 bytes
 .../sfPropelPlugin/web/images/edit.png        |  Bin 411 -> 0 bytes
 .../sfPropelPlugin/web/images/error.png       |  Bin 438 -> 0 bytes
 .../sfPropelPlugin/web/images/first.png       |  Bin 435 -> 0 bytes
 .../sfPropelPlugin/web/images/last.png        |  Bin 436 -> 0 bytes
 .../sfPropelPlugin/web/images/list.png        |  Bin 267 -> 0 bytes
 .../plugins/sfPropelPlugin/web/images/new.png |  Bin 288 -> 0 bytes
 .../sfPropelPlugin/web/images/next.png        |  Bin 448 -> 0 bytes
 .../sfPropelPlugin/web/images/previous.png    |  Bin 452 -> 0 bytes
 .../sfPropelPlugin/web/images/tick.png        |  Bin 344 -> 0 bytes
 747 files changed, 119250 deletions(-)
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/LICENSE
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/LICENSE.Agavi
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/LICENSE.Propel
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/LICENSE.phing
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/config/autoload.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/config/installer.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/config/sfPropelPluginConfiguration.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/config/skeleton/config/databases.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/config/skeleton/config/propel.ini
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/config/skeleton/config/schema.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelForm/default/template/sfPropelFormBaseTemplate.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelForm/default/template/sfPropelFormGeneratedTemplate.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelForm/default/template/sfPropelFormTemplate.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelFormFilter/default/template/sfPropelFormFilterBaseTemplate.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelFormFilter/default/template/sfPropelFormFilterGeneratedTemplate.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelFormFilter/default/template/sfPropelFormFilterTemplate.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/actionsConfiguration.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/batchAction.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/configuration.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/createAction.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/deleteAction.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/editAction.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/fieldsConfiguration.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/filterAction.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/filtersAction.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/indexAction.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/newAction.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/paginationAction.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/paginationConfiguration.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/processFormAction.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/sortingAction.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/sortingConfiguration.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/updateAction.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/skeleton/actions/actions.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/skeleton/config/generator.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/skeleton/lib/configuration.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/skeleton/lib/helper.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/skeleton/templates/.sf
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/actions/actions.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/lib/helper.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_assets.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_filters.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_filters_field.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_flashes.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_form.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_form_actions.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_form_field.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_form_fieldset.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_form_footer.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_form_header.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_actions.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_batch_actions.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_field_boolean.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_footer.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_header.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_td_actions.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_td_batch_actions.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_td_stacked.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_td_tabular.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_th_stacked.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_th_tabular.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_pagination.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/editSuccess.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/indexSuccess.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/newSuccess.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/createAction.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/deleteAction.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/editAction.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/indexAction.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/newAction.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/processFormAction.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/showAction.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/updateAction.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/skeleton/actions/actions.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/skeleton/config/generator.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/skeleton/templates/.sf
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/template/actions/actions.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/template/templates/_form.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/template/templates/editSuccess.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/template/templates/indexSuccess.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/template/templates/newSuccess.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/template/templates/showSuccess.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.ar.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.bg.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.ca.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.cs.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.da.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.de.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.el.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.es.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.es_AR.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.eu.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.fa.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.fi.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.fr.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.hr.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.hu.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.id.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.it.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.ja.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.lt.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.lv.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.nl.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.no.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.pl.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.pt.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.pt_BR.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.ro.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.ru.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.sk.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.sl.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.sv.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.tr.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.uk.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.zh_CN.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.zh_TW.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfMixer.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfPropel.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfPropelBehavior.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfPropelData.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfPropelDatabaseSchema.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfPropelManyToMany.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfPropelPager.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/behavior/SfPropelBehaviorBase.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/behavior/SfPropelBehaviorI18n.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/behavior/SfPropelBehaviorI18nTranslation.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/behavior/SfPropelBehaviorSymfony.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/behavior/SfPropelBehaviorSymfonyBehaviors.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/behavior/SfPropelBehaviorTimestampable.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/database/sfPropelDatabase.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/debug/sfWebDebugPanelPropel.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/form/sfFormFilterPropel.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/form/sfFormPropel.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/generator/sfPropelFormFilterGenerator.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/generator/sfPropelFormGenerator.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/generator/sfPropelGenerator.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/log/sfPropelLogger.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/mailer/Swift_PropelSpool.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/routing/sfPropelRoute.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/routing/sfPropelRouteCollection.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/phing/phing_default_overrides
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/phing/tasks/defaults.properties
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/phing/types/defaults.properties
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPhing.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPhingListener.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBaseTask.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildAllLoadTask.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildAllTask.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildFiltersTask.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildFormsTask.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildModelTask.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildSchemaTask.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildSqlTask.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildTask.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelConfigureDatabaseTask.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelDataDumpTask.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelDataLoadTask.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelGenerateAdminTask.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelGenerateModuleForRouteTask.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelGenerateModuleTask.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelGraphvizTask.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelInsertSqlTask.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelSchemaToXmlTask.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelSchemaToYmlTask.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/test/sfTesterPropel.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/validator/sfValidatorPropelChoice.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/validator/sfValidatorPropelUnique.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/BuildEvent.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/BuildException.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/BuildListener.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/BuildLogger.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/ConfigurationException.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/IntrospectionHelper.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/Phing.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/Project.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/ProjectComponent.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/RuntimeConfigurable.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/Target.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/Task.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/TaskAdapter.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/TaskContainer.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/UnknownElement.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/BaseFilterReader.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/BaseParamFilterReader.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/ChainableReader.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/ExpandProperties.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/HeadFilter.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/LineContains.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/LineContainsRegexp.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/PrefixLines.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/ReplaceRegexp.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/ReplaceTokens.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/StripLineBreaks.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/StripLineComments.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/StripPhpComments.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/StripWhitespace.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/TabToSpaces.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/TailFilter.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/TidyFilter.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/TranslateGettext.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/XincludeFilter.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/XsltFilter.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/util/ChainReaderHelper.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/util/IniFileTokenReader.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/input/DefaultInputHandler.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/input/InputHandler.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/input/InputRequest.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/input/MultipleChoiceInputRequest.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/input/PropertyFileInputHandler.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/input/YesNoInputRequest.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/lib/Capsule.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/lib/Zip.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/AnsiColorLogger.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/DefaultLogger.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/NoBannerLogger.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/PearLogListener.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/StreamRequiredBuildLogger.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/XmlLogger.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/defaults.properties
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/mappers/FileNameMapper.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/mappers/FlattenMapper.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/mappers/GlobMapper.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/mappers/IdentityMapper.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/mappers/MergeMapper.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/mappers/RegexpMapper.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/AbstractHandler.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/AbstractSAXParser.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/DataTypeHandler.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/ExpatParseException.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/ExpatParser.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/Location.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/NestedElementHandler.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/ProjectConfigurator.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/ProjectHandler.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/RootHandler.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/TargetHandler.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/TaskHandler.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/BufferedReader.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/BufferedWriter.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/ConsoleReader.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/FileInputStream.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/FileOutputStream.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/FileReader.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/FileSystem.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/FileWriter.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/FilterReader.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/IOException.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/InputStream.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/InputStreamReader.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/OutputStream.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/OutputStreamWriter.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/PhingFile.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/Reader.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/StringReader.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/UnixFileSystem.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/Win32FileSystem.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/WinNTFileSystem.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/Writer.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/lang/Character.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/lang/EventObject.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/lang/FileNotFoundException.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/lang/NullPointerException.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/lang/SecurityException.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/util/Message.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/util/Properties.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/util/Register.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/util/Timer.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/defaults.properties
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/CapsuleTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ExtractBaseTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/FtpDeployTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/JslLintTask.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/MailTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ManifestTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/PackageAsPathTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/PearPackage2Task.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/PearPackageTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/PhpCodeSnifferTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/PhpLintTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ScpSendTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/SmartyTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/TarTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/UntarTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/UnzipTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/XmlLintTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ZendCodeAnalyzerTask.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ZipTask.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/coverage/CoverageMerger.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/coverage/CoverageMergerTask.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/coverage/CoverageReportTask.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/coverage/CoverageReportTransformer.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/coverage/CoverageSetupTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/creole/CreoleSQLExecTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/creole/CreoleTask.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/dbdeploy/DbDeployTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/dbdeploy/DbmsSyntax.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/dbdeploy/DbmsSyntaxFactory.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/dbdeploy/DbmsSyntaxMsSql.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/dbdeploy/DbmsSyntaxMysql.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/dbdeploy/DbmsSyntaxSQLite.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ioncube/IoncubeComment.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ioncube/IoncubeEncoderTask.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ioncube/IoncubeLicenseTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pdo/PDOResultFormatter.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pdo/PDOSQLExecFormatterElement.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pdo/PDOSQLExecTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pdo/PDOTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pdo/PlainPDOResultFormatter.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pdo/XMLPDOResultFormatter.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pearpackage/Fileset.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpdoc/PhingPhpDocumentorSetup.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpdoc/PhpDocumentorExternalTask.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpdoc/PhpDocumentorTask.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/BatchTest.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/FormatterElement.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/PHPUnitReportTask.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/PHPUnitTask.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/PHPUnitTestRunner.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/PHPUnitUtil.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit2/PHPUnit2ResultFormatter.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit2/PlainPHPUnit2ResultFormatter.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit2/SummaryPHPUnit2ResultFormatter.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit2/XMLPHPUnit2ResultFormatter.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit3/PHPUnit3ResultFormatter.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit3/PlainPHPUnit3ResultFormatter.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit3/SummaryPHPUnit3ResultFormatter.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit3/XMLPHPUnit3ResultFormatter.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/simpletest/SimpleTestCountResultFormatter.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/simpletest/SimpleTestFormatterElement.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/simpletest/SimpleTestPlainResultFormatter.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/simpletest/SimpleTestResultFormatter.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/simpletest/SimpleTestSummaryResultFormatter.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/simpletest/SimpleTestTask.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/svn/SvnBaseTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/svn/SvnCheckoutTask.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/svn/SvnExportTask.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/svn/SvnLastRevisionTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/svn/SvnUpdateTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/AdhocTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/AdhocTaskdefTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/AdhocTypedefTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/AppendTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/AvailableTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ChmodTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ChownTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ConditionTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/CopyTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/CvsPassTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/CvsTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/DeleteTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/EchoTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ExecTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ExitTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ForeachTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/IfTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/IncludePathTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/InputTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/MatchingTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/MkdirTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/MoveTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/PhingCallTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/PhingTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/PhpEvalTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/PropertyPromptTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/PropertyTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ReflexiveTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ResolvePathTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/SequentialTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/TaskdefTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/TouchTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/TstampTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/TypedefTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/UpToDateTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/WarnTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/XsltTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/AndCondition.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/Condition.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/ConditionBase.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/ContainsCondition.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/EqualsCondition.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/IsFalseCondition.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/IsSetCondition.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/IsTrueCondition.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/NotCondition.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/OrCondition.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/OsCondition.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/ReferenceExistsCondition.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/AbstractFileSet.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Commandline.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/DataType.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Description.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/DirSet.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/FileList.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/FileSet.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/FilterChain.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Mapper.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Parameter.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Parameterizable.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Path.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/PatternSet.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/PhingFilterReader.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Reference.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/RegularExpression.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/TokenReader.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/TokenSource.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/defaults.properties
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/AndSelector.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/BaseExtendSelector.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/BaseSelector.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/BaseSelectorContainer.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/ContainsRegexpSelector.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/ContainsSelector.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/DateSelector.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/DependSelector.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/DepthSelector.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/ExtendFileSelector.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/ExtendSelector.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/FileSelector.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/FilenameSelector.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/MajoritySelector.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/NoneSelector.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/NotSelector.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/OrSelector.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/PresentSelector.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/SelectSelector.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/SelectorContainer.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/SelectorScanner.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/SelectorUtils.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/SizeSelector.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/TypeSelector.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/DirectoryScanner.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/ExtendedFileStream.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/FileUtils.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/LogWriter.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/PathTokenizer.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/SourceFileScanner.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/StringHelper.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/regexp/PregEngine.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/regexp/Regexp.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/regexp/RegexpEngine.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/bin/propel-gen
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/bin/propel-gen.bat
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/build-propel.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/build.properties-sample
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/build.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/build.xml-local
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/EngineException.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/GeneratorConfig.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/behavior/AlternativeCodingStandardsBehavior.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/behavior/AutoAddPkBehavior.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/behavior/SoftDeleteBehavior.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/behavior/TimestampableBehavior.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/DataModelBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/ClassTools.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/OMBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/ObjectBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/PeerBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5ExtensionNodeBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5ExtensionNodePeerBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5ExtensionObjectBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5ExtensionPeerBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5InterfaceBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5MultiExtendObjectBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5NestedSetBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5NestedSetPeerBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5NodeBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5NodePeerBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5ObjectBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5PeerBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5TableMapBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/DDLBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/DataSQLBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/mssql/MssqlDDLBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/mssql/MssqlDataSQLBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/mysql/MysqlDDLBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/mysql/MysqlDataSQLBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/oracle/OracleDDLBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/oracle/OracleDataSQLBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/pgsql/PgsqlDDLBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/pgsql/PgsqlDataSQLBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/sqlite/SqliteDDLBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/sqlite/SqliteDataSQLBuilder.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/util/DefaultEnglishPluralizer.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/util/Pluralizer.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/util/transform/XmlToDataSQL.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/AppData.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Behavior.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Column.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/ColumnDefaultValue.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/ConstraintNameGenerator.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Database.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Domain.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/ForeignKey.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/IDMethod.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/IdMethodParameter.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Index.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Inheritance.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/NameFactory.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/NameGenerator.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/PhpNameGenerator.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/PropelTypes.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Rule.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Table.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Unique.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Validator.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/VendorInfo.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/XMLElement.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/BaseSchemaParser.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/SchemaParser.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/mssql/MssqlSchemaParser.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/mysql/MysqlSchemaParser.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/oracle/OracleSchemaParser.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/pgsql/PgsqlSchemaParser.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/sqlite/SqliteSchemaParser.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/transform/XmlToAppData.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/DefaultPlatform.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/MssqlPlatform.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/MysqlPlatform.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/OraclePlatform.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/PgsqlPlatform.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/Platform.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/SqlitePlatform.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/AbstractPropelDataModelTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelConvertConfTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelCreoleTransformTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelDataDTDTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelDataDumpTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelDataModelTemplateTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelDataSQLTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelGraphvizTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelOMTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelSQLExec.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelSQLTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelSchemaReverseTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/default.properties
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/pear/BuildPropelGenPEARPackageTask.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/pear/build-pear-package.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/pear/build.properties
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/pear/pear-build.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/pear/pear-propel-gen
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/pear/pear-propel-gen.bat
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/resources/dtd/database.dtd
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/resources/xsd/custom_datatypes.xsd
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/resources/xsd/database.xsd
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/resources/xsl/database.xsl
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/Propel.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/PropelException.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBAdapter.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBMSSQL.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBMySQL.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBNone.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBOracle.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBPostgres.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBSQLite.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/MSSQL/MssqlDateTime.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/MSSQL/MssqlDebugPDO.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/MSSQL/MssqlPropelPDO.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/logger/BasicLogger.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/logger/MojaviLogAdapter.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/map/ColumnMap.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/map/DatabaseMap.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/map/RelationMap.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/map/TableMap.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/map/ValidatorMap.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/om/BaseObject.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/om/NestedSetRecursiveIterator.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/om/NodeObject.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/om/Persistent.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/om/PreOrderNodeIterator.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/BasePeer.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/Criteria.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/DebugPDO.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/DebugPDOStatement.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/Join.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/NodePeer.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/PropelColumnTypes.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/PropelConfiguration.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/PropelConfigurationIterator.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/PropelDateTime.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/PropelPDO.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/PropelPager.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/BasicValidator.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/MatchValidator.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/MaxLengthValidator.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/MaxValueValidator.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/MinLengthValidator.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/MinValueValidator.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/NotMatchValidator.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/RequiredValidator.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/TypeValidator.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/UniqueValidator.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/ValidValuesValidator.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/ValidationFailed.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/widget/sfWidgetFormPropelChoice.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/bin/prove.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/bootstrap/functional.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/bootstrap/unit.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crud10Test.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crud2Test.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crud3Test.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crud6Test.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crud7Test.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crud9Test.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crudBrowser.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/rest1Test.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/rest2Test.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/restBrowser.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/app.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/backend_compatConfiguration.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/cache.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/factories.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/filters.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/routing.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/security.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/settings.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/view.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/lib/myUser.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/article/actions/actions.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/article/config/generator.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/article/templates/_body.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/error/actions/actions.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/error/config/generator.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/inheritance/actions/actions.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/inheritance/config/generator.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/validation/actions/actions.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/validation/config/generator.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/validation/validate/edit.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/templates/layout.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/app.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/cache.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/crudConfiguration.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/factories.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/filters.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/routing.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/security.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/settings.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/view.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/lib/myUser.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/modules/error/actions/actions.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/modules/error/config/generator.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/templates/layout.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/app.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/cache.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/factories.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/filters.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/frontendConfiguration.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/routing.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/security.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/settings.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/view.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/lib/myUser.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/attachment/actions/actions.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/attachment/templates/indexSuccess.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/choice/actions/actions.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/choice/templates/articleSuccess.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/i18n/actions/actions.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/i18n/templates/indexSuccess.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/i18n/templates/movieSuccess.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/i18n/templates/productsSuccess.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/pager/actions/actions.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/pager/templates/interfacesSuccess.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/pooling/actions/actions.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/unique/actions/actions.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/unique/templates/articleSuccess.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/unique/templates/categorySuccess.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/unique/templates/editSuccess.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/templates/layout.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/ProjectConfiguration.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/databases.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/propel.ini
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/properties.ini
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/rsync_exclude.txt
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/schema.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/data/environment.migrated
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/data/fixtures/fixtures.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/ArticleFormFilter.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/AttachmentFormFilter.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/AuthorFormFilter.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/BaseFormFilterPropel.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/BookFormFilter.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/CategoryFormFilter.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/MovieFormFilter.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/MovieI18nFormFilter.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/ProductFormFilter.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/ProductI18nFormFilter.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/ArticleForm.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/AttachmentForm.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/AuthorForm.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/BaseForm.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/BaseFormPropel.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/BookForm.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/CategoryForm.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/MovieForm.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/MovieI18nForm.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/ProductForm.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/ProductI18nForm.class.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Article.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/ArticlePeer.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Attachment.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/AttachmentPeer.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Author.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/AuthorArticle.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/AuthorArticlePeer.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/AuthorPeer.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Book.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/BookPeer.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Category.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/CategoryPeer.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Movie.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/MovieI18n.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/MovieI18nPeer.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/MoviePeer.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Product.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/ProductI18n.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/ProductI18nPeer.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/ProductPeer.php
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/symfony
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/formTest.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/i18nTest.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/pagerTest.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/poolingTest.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/database/sfPropelDatabaseTest.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/debug/sfWebDebugPanelPropelTest.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/fixtures/new_schema.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/fixtures/schema.xml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/fixtures/schema.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/form/sfFormPropelTest.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/sfMixerTest.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/sfPropelDatabaseSchemaTest.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/task/sfPhingTest.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/validator/sfValidatorPropelUniqueTest.php
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/css/default.css
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/css/global.css
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/asc.png
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/default.png
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/delete.png
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/desc.png
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/edit.png
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/error.png
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/first.png
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/last.png
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/list.png
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/new.png
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/next.png
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/previous.png
 delete mode 100755 lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/tick.png

diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/LICENSE b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/LICENSE
deleted file mode 100644
index e2df9d8c9..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/LICENSE
+++ /dev/null
@@ -1,7 +0,0 @@
-Copyright (c) 2004-2008 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/LICENSE.Agavi b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/LICENSE.Agavi
deleted file mode 100644
index 5ef499897..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/LICENSE.Agavi
+++ /dev/null
@@ -1,14 +0,0 @@
-On behalf of Veikko Mäkinen, the original author of Agavi's CreoleSessionStorage, I hereby grant you a special, non-exclusive, worldwide, royalty-free, perpetual license to include and modify the CreoleSessionStorage in the symfony project under a license other than the GNU Lesser General Public License, subject to the following conditions:
-
-1) you must include and leave intact all copyright notices in the respective parts of the source code, if applicable.
-2) you must add a note to the source code stating that the original version the file is based on is licensed under the LGPL, but a special license was granted.
-3) you must either
-  a) include this special license in a LICENSE.Agavi file, and reference it in the COPYRIGHT file, along with the proper copyright information and a note about the special character of this license, deviating from the original LGPL license, or
-  b) include the copyright information and the license itself and make clear the existance and background of this license agreement in a manner of your choice, provided that it is of similar nature to that of other such information about third-party intellectual property bundled with symfony.
-
-December 8, 2006
-Munich, Germany
-
-David Zülke
-Lead Developer
-The Agavi Project
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/LICENSE.Propel b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/LICENSE.Propel
deleted file mode 100644
index b9d61c9de..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/LICENSE.Propel
+++ /dev/null
@@ -1,506 +0,0 @@
-	GNU LESSER GENERAL PUBLIC LICENSE
-	Version 2.1, February 1999
-
-	Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-	59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-	Everyone is permitted to copy and distribute verbatim copies
-	of this license document, but changing it is not allowed.
-
-	[This is the first released version of the Lesser GPL.  It also counts
-	as the successor of the GNU Library Public License, version 2, hence
-	the version number 2.1.]
-
-	Preamble
-
-	The licenses for most software are designed to take away your
-	freedom to share and change it.  By contrast, the GNU General Public
-	Licenses are intended to guarantee your freedom to share and change
-	free software--to make sure the software is free for all its users.
-
-	This license, the Lesser General Public License, applies to some
-	specially designated software packages--typically libraries--of the
-	Free Software Foundation and other authors who decide to use it.  You
-	can use it too, but we suggest you first think carefully about whether
-	this license or the ordinary General Public License is the better
-	strategy to use in any particular case, based on the explanations below.
-
-	When we speak of free software, we are referring to freedom of use,
-	not price.  Our General Public Licenses are designed to make sure that
-	you have the freedom to distribute copies of free software (and charge
-	for this service if you wish); that you receive source code or can get
-	it if you want it; that you can change the software and use pieces of
-	it in new free programs; and that you are informed that you can do
-	these things.
-
-	To protect your rights, we need to make restrictions that forbid
-	distributors to deny you these rights or to ask you to surrender these
-	rights.  These restrictions translate to certain responsibilities for
-	you if you distribute copies of the library or if you modify it.
-
-	For example, if you distribute copies of the library, whether gratis
-	or for a fee, you must give the recipients all the rights that we gave
-	you.  You must make sure that they, too, receive or can get the source
-	code.  If you link other code with the library, you must provide
-	complete object files to the recipients, so that they can relink them
-	with the library after making changes to the library and recompiling
-	it.  And you must show them these terms so they know their rights.
-
-	We protect your rights with a two-step method: (1) we copyright the
-	library, and (2) we offer you this license, which gives you legal
-	permission to copy, distribute and/or modify the library.
-
-	To protect each distributor, we want to make it very clear that
-	there is no warranty for the free library.  Also, if the library is
-	modified by someone else and passed on, the recipients should know
-	that what they have is not the original version, so that the original
-	author's reputation will not be affected by problems that might be
-	introduced by others.
-
-	Finally, software patents pose a constant threat to the existence of
-	any free program.  We wish to make sure that a company cannot
-	effectively restrict the users of a free program by obtaining a
-	restrictive license from a patent holder.  Therefore, we insist that
-	any patent license obtained for a version of the library must be
-	consistent with the full freedom of use specified in this license.
-
-	Most GNU software, including some libraries, is covered by the
-	ordinary GNU General Public License.  This license, the GNU Lesser
-	General Public License, applies to certain designated libraries, and
-	is quite different from the ordinary General Public License.  We use
-	this license for certain libraries in order to permit linking those
-	libraries into non-free programs.
-
-	When a program is linked with a library, whether statically or using
-	a shared library, the combination of the two is legally speaking a
-	combined work, a derivative of the original library.  The ordinary
-	General Public License therefore permits such linking only if the
-	entire combination fits its criteria of freedom.  The Lesser General
-	Public License permits more lax criteria for linking other code with
-	the library.
-
-	We call this license the "Lesser" General Public License because it
-	does Less to protect the user's freedom than the ordinary General
-	Public License.  It also provides other free software developers Less
-	of an advantage over competing non-free programs.  These disadvantages
-	are the reason we use the ordinary General Public License for many
-	libraries.  However, the Lesser license provides advantages in certain
-	special circumstances.
-
-	For example, on rare occasions, there may be a special need to
-	encourage the widest possible use of a certain library, so that it
-	becomes a de-facto standard.  To achieve this, non-free programs must be
-	allowed to use the library.  A more frequent case is that a free
-	library does the same job as widely used non-free libraries.  In this
-	case, there is little to gain by limiting the free library to free
-	software only, so we use the Lesser General Public License.
-
-	In other cases, permission to use a particular library in non-free
-	programs enables a greater number of people to use a large body of
-	free software.  For example, permission to use the GNU C Library in
-	non-free programs enables many more people to use the whole GNU
-	operating system, as well as its variant, the GNU/Linux operating
-	system.
-
-	Although the Lesser General Public License is Less protective of the
-	users' freedom, it does ensure that the user of a program that is
-	linked with the Library has the freedom and the wherewithal to run
-	that program using a modified version of the Library.
-
-	The precise terms and conditions for copying, distribution and
-	modification follow.  Pay close attention to the difference between a
-	"work based on the library" and a "work that uses the library".  The
-	former contains code derived from the library, whereas the latter must
-	be combined with the library in order to run.
-
-	GNU LESSER GENERAL PUBLIC LICENSE
-	TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-	0. This License Agreement applies to any software library or other
-	program which contains a notice placed by the copyright holder or
-	other authorized party saying it may be distributed under the terms of
-	this Lesser General Public License (also called "this License").
-	Each licensee is addressed as "you".
-
-	A "library" means a collection of software functions and/or data
-	prepared so as to be conveniently linked with application programs
-	(which use some of those functions and data) to form executables.
-
-	The "Library", below, refers to any such software library or work
-	which has been distributed under these terms.  A "work based on the
-	Library" means either the Library or any derivative work under
-	copyright law: that is to say, a work containing the Library or a
-	portion of it, either verbatim or with modifications and/or translated
-	straightforwardly into another language.  (Hereinafter, translation is
-	included without limitation in the term "modification".)
-
-	"Source code" for a work means the preferred form of the work for
-	making modifications to it.  For a library, complete source code means
-	all the source code for all modules it contains, plus any associated
-	interface definition files, plus the scripts used to control compilation
-	and installation of the library.
-
-	Activities other than copying, distribution and modification are not
-	covered by this License; they are outside its scope.  The act of
-	running a program using the Library is not restricted, and output from
-	such a program is covered only if its contents constitute a work based
-	on the Library (independent of the use of the Library in a tool for
-	writing it).  Whether that is true depends on what the Library does
-	and what the program that uses the Library does.
-
-	1. You may copy and distribute verbatim copies of the Library's
-	complete source code as you receive it, in any medium, provided that
-	you conspicuously and appropriately publish on each copy an
-	appropriate copyright notice and disclaimer of warranty; keep intact
-	all the notices that refer to this License and to the absence of any
-	warranty; and distribute a copy of this License along with the
-	Library.
-
-	You may charge a fee for the physical act of transferring a copy,
-	and you may at your option offer warranty protection in exchange for a
-	fee.
-
-	2. You may modify your copy or copies of the Library or any portion
-	of it, thus forming a work based on the Library, and copy and
-	distribute such modifications or work under the terms of Section 1
-	above, provided that you also meet all of these conditions:
-
-	a) The modified work must itself be a software library.
-
-	b) You must cause the files modified to carry prominent notices
-	stating that you changed the files and the date of any change.
-
-	c) You must cause the whole of the work to be licensed at no
-	charge to all third parties under the terms of this License.
-
-	d) If a facility in the modified Library refers to a function or a
-	table of data to be supplied by an application program that uses
-	the facility, other than as an argument passed when the facility
-	is invoked, then you must make a good faith effort to ensure that,
-	in the event an application does not supply such function or
-	table, the facility still operates, and performs whatever part of
-	its purpose remains meaningful.
-
-	(For example, a function in a library to compute square roots has
-	a purpose that is entirely well-defined independent of the
-	application.  Therefore, Subsection 2d requires that any
-	application-supplied function or table used by this function must
-	be optional: if the application does not supply it, the square
-	root function must still compute square roots.)
-
-	These requirements apply to the modified work as a whole.  If
-	identifiable sections of that work are not derived from the Library,
-	and can be reasonably considered independent and separate works in
-	themselves, then this License, and its terms, do not apply to those
-	sections when you distribute them as separate works.  But when you
-	distribute the same sections as part of a whole which is a work based
-	on the Library, the distribution of the whole must be on the terms of
-	this License, whose permissions for other licensees extend to the
-	entire whole, and thus to each and every part regardless of who wrote
-	it.
-
-	Thus, it is not the intent of this section to claim rights or contest
-	your rights to work written entirely by you; rather, the intent is to
-	exercise the right to control the distribution of derivative or
-	collective works based on the Library.
-
-	In addition, mere aggregation of another work not based on the Library
-	with the Library (or with a work based on the Library) on a volume of
-	a storage or distribution medium does not bring the other work under
-	the scope of this License.
-
-	3. You may opt to apply the terms of the ordinary GNU General Public
-	License instead of this License to a given copy of the Library.  To do
-	this, you must alter all the notices that refer to this License, so
-	that they refer to the ordinary GNU General Public License, version 2,
-	instead of to this License.  (If a newer version than version 2 of the
-	ordinary GNU General Public License has appeared, then you can specify
-	that version instead if you wish.)  Do not make any other change in
-	these notices.
-
-	Once this change is made in a given copy, it is irreversible for
-	that copy, so the ordinary GNU General Public License applies to all
-	subsequent copies and derivative works made from that copy.
-
-	This option is useful when you wish to copy part of the code of
-	the Library into a program that is not a library.
-
-	4. You may copy and distribute the Library (or a portion or
-	derivative of it, under Section 2) in object code or executable form
-	under the terms of Sections 1 and 2 above provided that you accompany
-	it with the complete corresponding machine-readable source code, which
-	must be distributed under the terms of Sections 1 and 2 above on a
-	medium customarily used for software interchange.
-
-	If distribution of object code is made by offering access to copy
-	from a designated place, then offering equivalent access to copy the
-	source code from the same place satisfies the requirement to
-	distribute the source code, even though third parties are not
-	compelled to copy the source along with the object code.
-
-	5. A program that contains no derivative of any portion of the
-	Library, but is designed to work with the Library by being compiled or
-	linked with it, is called a "work that uses the Library".  Such a
-	work, in isolation, is not a derivative work of the Library, and
-	therefore falls outside the scope of this License.
-
-	However, linking a "work that uses the Library" with the Library
-	creates an executable that is a derivative of the Library (because it
-	contains portions of the Library), rather than a "work that uses the
-	library".  The executable is therefore covered by this License.
-	Section 6 states terms for distribution of such executables.
-
-	When a "work that uses the Library" uses material from a header file
-	that is part of the Library, the object code for the work may be a
-	derivative work of the Library even though the source code is not.
-	Whether this is true is especially significant if the work can be
-	linked without the Library, or if the work is itself a library.  The
-	threshold for this to be true is not precisely defined by law.
-
-	If such an object file uses only numerical parameters, data
-	structure layouts and accessors, and small macros and small inline
-	functions (ten lines or less in length), then the use of the object
-	file is unrestricted, regardless of whether it is legally a derivative
-	work.  (Executables containing this object code plus portions of the
-	Library will still fall under Section 6.)
-
-	Otherwise, if the work is a derivative of the Library, you may
-	distribute the object code for the work under the terms of Section 6.
-	Any executables containing that work also fall under Section 6,
-	whether or not they are linked directly with the Library itself.
-
-	6. As an exception to the Sections above, you may also combine or
-	link a "work that uses the Library" with the Library to produce a
-	work containing portions of the Library, and distribute that work
-	under terms of your choice, provided that the terms permit
-	modification of the work for the customer's own use and reverse
-	engineering for debugging such modifications.
-
-	You must give prominent notice with each copy of the work that the
-	Library is used in it and that the Library and its use are covered by
-	this License.  You must supply a copy of this License.  If the work
-	during execution displays copyright notices, you must include the
-	copyright notice for the Library among them, as well as a reference
-	directing the user to the copy of this License.  Also, you must do one
-	of these things:
-
-	a) Accompany the work with the complete corresponding
-	machine-readable source code for the Library including whatever
-	changes were used in the work (which must be distributed under
-	Sections 1 and 2 above); and, if the work is an executable linked
-	with the Library, with the complete machine-readable "work that
-	uses the Library", as object code and/or source code, so that the
-	user can modify the Library and then relink to produce a modified
-	executable containing the modified Library.  (It is understood
-	that the user who changes the contents of definitions files in the
-	Library will not necessarily be able to recompile the application
-	to use the modified definitions.)
-
-	b) Use a suitable shared library mechanism for linking with the
-	Library.  A suitable mechanism is one that (1) uses at run time a
-	copy of the library already present on the user's computer system,
-	rather than copying library functions into the executable, and (2)
-	will operate properly with a modified version of the library, if
-	the user installs one, as long as the modified version is
-	interface-compatible with the version that the work was made with.
-
-	c) Accompany the work with a written offer, valid for at
-	least three years, to give the same user the materials
-	specified in Subsection 6a, above, for a charge no more
-	than the cost of performing this distribution.
-
-	d) If distribution of the work is made by offering access to copy
-	from a designated place, offer equivalent access to copy the above
-	specified materials from the same place.
-
-	e) Verify that the user has already received a copy of these
-	materials or that you have already sent this user a copy.
-
-	For an executable, the required form of the "work that uses the
-	Library" must include any data and utility programs needed for
-	reproducing the executable from it.  However, as a special exception,
-	the materials to be distributed need not include anything that is
-	normally distributed (in either source or binary form) with the major
-	components (compiler, kernel, and so on) of the operating system on
-	which the executable runs, unless that component itself accompanies
-	the executable.
-
-	It may happen that this requirement contradicts the license
-	restrictions of other proprietary libraries that do not normally
-	accompany the operating system.  Such a contradiction means you cannot
-	use both them and the Library together in an executable that you
-	distribute.
-
-	7. You may place library facilities that are a work based on the
-	Library side-by-side in a single library together with other library
-	facilities not covered by this License, and distribute such a combined
-	library, provided that the separate distribution of the work based on
-	the Library and of the other library facilities is otherwise
-	permitted, and provided that you do these two things:
-
-	a) Accompany the combined library with a copy of the same work
-	based on the Library, uncombined with any other library
-	facilities.  This must be distributed under the terms of the
-	Sections above.
-
-	b) Give prominent notice with the combined library of the fact
-	that part of it is a work based on the Library, and explaining
-	where to find the accompanying uncombined form of the same work.
-
-	8. You may not copy, modify, sublicense, link with, or distribute
-	the Library except as expressly provided under this License.  Any
-	attempt otherwise to copy, modify, sublicense, link with, or
-	distribute the Library is void, and will automatically terminate your
-	rights under this License.  However, parties who have received copies,
-	or rights, from you under this License will not have their licenses
-	terminated so long as such parties remain in full compliance.
-
-	9. You are not required to accept this License, since you have not
-	signed it.  However, nothing else grants you permission to modify or
-	distribute the Library or its derivative works.  These actions are
-	prohibited by law if you do not accept this License.  Therefore, by
-	modifying or distributing the Library (or any work based on the
-	Library), you indicate your acceptance of this License to do so, and
-	all its terms and conditions for copying, distributing or modifying
-	the Library or works based on it.
-
-	10. Each time you redistribute the Library (or any work based on the
-	Library), the recipient automatically receives a license from the
-	original licensor to copy, distribute, link with or modify the Library
-	subject to these terms and conditions.  You may not impose any further
-	restrictions on the recipients' exercise of the rights granted herein.
-	You are not responsible for enforcing compliance by third parties with
-	this License.
-
-	11. If, as a consequence of a court judgment or allegation of patent
-	infringement or for any other reason (not limited to patent issues),
-	conditions are imposed on you (whether by court order, agreement or
-	otherwise) that contradict the conditions of this License, they do not
-	excuse you from the conditions of this License.  If you cannot
-	distribute so as to satisfy simultaneously your obligations under this
-	License and any other pertinent obligations, then as a consequence you
-	may not distribute the Library at all.  For example, if a patent
-	license would not permit royalty-free redistribution of the Library by
-	all those who receive copies directly or indirectly through you, then
-	the only way you could satisfy both it and this License would be to
-	refrain entirely from distribution of the Library.
-
-	If any portion of this section is held invalid or unenforceable under any
-	particular circumstance, the balance of the section is intended to apply,
-	and the section as a whole is intended to apply in other circumstances.
-
-	It is not the purpose of this section to induce you to infringe any
-	patents or other property right claims or to contest validity of any
-	such claims; this section has the sole purpose of protecting the
-	integrity of the free software distribution system which is
-	implemented by public license practices.  Many people have made
-	generous contributions to the wide range of software distributed
-	through that system in reliance on consistent application of that
-	system; it is up to the author/donor to decide if he or she is willing
-	to distribute software through any other system and a licensee cannot
-	impose that choice.
-
-	This section is intended to make thoroughly clear what is believed to
-	be a consequence of the rest of this License.
-
-	12. If the distribution and/or use of the Library is restricted in
-	certain countries either by patents or by copyrighted interfaces, the
-	original copyright holder who places the Library under this License may
-	add an explicit geographical distribution limitation excluding those
-	countries, so that distribution is permitted only in or among countries
-	not thus excluded.  In such case, this License incorporates the
-	limitation as if written in the body of this License.
-
-	13. The Free Software Foundation may publish revised and/or new
-	versions of the Lesser General Public License from time to time.
-	Such new versions will be similar in spirit to the present version,
-	but may differ in detail to address new problems or concerns.
-
-	Each version is given a distinguishing version number.  If the Library
-	specifies a version number of this License which applies to it and
-	"any later version", you have the option of following the terms and
-	conditions either of that version or of any later version published by
-	the Free Software Foundation.  If the Library does not specify a
-	license version number, you may choose any version ever published by
-	the Free Software Foundation.
-
-	14. If you wish to incorporate parts of the Library into other free
-	programs whose distribution conditions are incompatible with these,
-	write to the author to ask for permission.  For software which is
-	copyrighted by the Free Software Foundation, write to the Free
-	Software Foundation; we sometimes make exceptions for this.  Our
-	decision will be guided by the two goals of preserving the free status
-	of all derivatives of our free software and of promoting the sharing
-	and reuse of software generally.
-
-	NO WARRANTY
-
-	15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-	WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-	EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-	OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-	KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-	PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-	LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-	THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-	16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-	WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-	AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-	FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-	CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-	LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-	RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-	FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-	SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-	DAMAGES.
-
-	END OF TERMS AND CONDITIONS
-
-	How to Apply These Terms to Your New Libraries
-
-	If you develop a new library, and you want it to be of the greatest
-	possible use to the public, we recommend making it free software that
-	everyone can redistribute and change.  You can do so by permitting
-	redistribution under these terms (or, alternatively, under the terms of the
-	ordinary General Public License).
-
-	To apply these terms, attach the following notices to the library.  It is
-	safest to attach them to the start of each source file to most effectively
-	convey the exclusion of warranty; and each file should have at least the
-	"copyright" line and a pointer to where the full notice is found.
-
-	<one line to give the library's name and a brief idea of what it does.>
-	Copyright (C) <year>  <name of author>
-
-	This library is free software; you can redistribute it and/or
-	modify it under the terms of the GNU Lesser General Public
-	License as published by the Free Software Foundation; either
-	version 2.1 of the License, or (at your option) any later version.
-
-	This library is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-	Lesser General Public License for more details.
-
-	You should have received a copy of the GNU Lesser General Public
-	License along with this library; if not, write to the Free Software
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-	Also add information on how to contact you by electronic and paper mail.
-
-	You should also get your employer (if you work as a programmer) or your
-	school, if any, to sign a "copyright disclaimer" for the library, if
-	necessary.  Here is a sample; alter the names:
-
-	Yoyodyne, Inc., hereby disclaims all copyright interest in the
-	library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-	<signature of Ty Coon>, 1 April 1990
-	Ty Coon, President of Vice
-
-	That's all there is to it!
-
-  --$Id: LICENSE,v 1.1 2004/07/14 02:18:14 hlellelid Exp $
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/LICENSE.phing b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/LICENSE.phing
deleted file mode 100644
index 9139d6089..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/LICENSE.phing
+++ /dev/null
@@ -1,1042 +0,0 @@
-                         _________________________
-
-                         P     H     I     N     G
-
-
-
-
-
-  Please, be sure to read the license header on any one of the phing core
-
-  files. It explains the licensing scheme.
-
-
-
-  Some files in phing are Perl Artistic, Apache, BSD, or just free. See
-
-  "CREDITS" for a list.
-
-
-
-  We've included a copy of the LGPL for convenience.
-
-
-
-
-
-  LGPL LICENSE
-
-  ------------
-
-
-
-	GNU LESSER GENERAL PUBLIC LICENSE
-
-	Version 2.1, February 1999
-
-
-
-	Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-
-	59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-	Everyone is permitted to copy and distribute verbatim copies
-
-	of this license document, but changing it is not allowed.
-
-
-
-	[This is the first released version of the Lesser GPL.  It also counts
-
-	as the successor of the GNU Library Public License, version 2, hence
-
-	the version number 2.1.]
-
-
-
-	Preamble
-
-
-
-	The licenses for most software are designed to take away your
-
-	freedom to share and change it.  By contrast, the GNU General Public
-
-	Licenses are intended to guarantee your freedom to share and change
-
-	free software--to make sure the software is free for all its users.
-
-
-
-	This license, the Lesser General Public License, applies to some
-
-	specially designated software packages--typically libraries--of the
-
-	Free Software Foundation and other authors who decide to use it.  You
-
-	can use it too, but we suggest you first think carefully about whether
-
-	this license or the ordinary General Public License is the better
-
-	strategy to use in any particular case, based on the explanations below.
-
-
-
-	When we speak of free software, we are referring to freedom of use,
-
-	not price.  Our General Public Licenses are designed to make sure that
-
-	you have the freedom to distribute copies of free software (and charge
-
-	for this service if you wish); that you receive source code or can get
-
-	it if you want it; that you can change the software and use pieces of
-
-	it in new free programs; and that you are informed that you can do
-
-	these things.
-
-
-
-	To protect your rights, we need to make restrictions that forbid
-
-	distributors to deny you these rights or to ask you to surrender these
-
-	rights.  These restrictions translate to certain responsibilities for
-
-	you if you distribute copies of the library or if you modify it.
-
-
-
-	For example, if you distribute copies of the library, whether gratis
-
-	or for a fee, you must give the recipients all the rights that we gave
-
-	you.  You must make sure that they, too, receive or can get the source
-
-	code.  If you link other code with the library, you must provide
-
-	complete object files to the recipients, so that they can relink them
-
-	with the library after making changes to the library and recompiling
-
-	it.  And you must show them these terms so they know their rights.
-
-
-
-	We protect your rights with a two-step method: (1) we copyright the
-
-	library, and (2) we offer you this license, which gives you legal
-
-	permission to copy, distribute and/or modify the library.
-
-
-
-	To protect each distributor, we want to make it very clear that
-
-	there is no warranty for the free library.  Also, if the library is
-
-	modified by someone else and passed on, the recipients should know
-
-	that what they have is not the original version, so that the original
-
-	author's reputation will not be affected by problems that might be
-
-	introduced by others.
-
-
-
-	Finally, software patents pose a constant threat to the existence of
-
-	any free program.  We wish to make sure that a company cannot
-
-	effectively restrict the users of a free program by obtaining a
-
-	restrictive license from a patent holder.  Therefore, we insist that
-
-	any patent license obtained for a version of the library must be
-
-	consistent with the full freedom of use specified in this license.
-
-
-
-	Most GNU software, including some libraries, is covered by the
-
-	ordinary GNU General Public License.  This license, the GNU Lesser
-
-	General Public License, applies to certain designated libraries, and
-
-	is quite different from the ordinary General Public License.  We use
-
-	this license for certain libraries in order to permit linking those
-
-	libraries into non-free programs.
-
-
-
-	When a program is linked with a library, whether statically or using
-
-	a shared library, the combination of the two is legally speaking a
-
-	combined work, a derivative of the original library.  The ordinary
-
-	General Public License therefore permits such linking only if the
-
-	entire combination fits its criteria of freedom.  The Lesser General
-
-	Public License permits more lax criteria for linking other code with
-
-	the library.
-
-
-
-	We call this license the "Lesser" General Public License because it
-
-	does Less to protect the user's freedom than the ordinary General
-
-	Public License.  It also provides other free software developers Less
-
-	of an advantage over competing non-free programs.  These disadvantages
-
-	are the reason we use the ordinary General Public License for many
-
-	libraries.  However, the Lesser license provides advantages in certain
-
-	special circumstances.
-
-
-
-	For example, on rare occasions, there may be a special need to
-
-	encourage the widest possible use of a certain library, so that it
-
-	becomes a de-facto standard.  To achieve this, non-free programs must be
-
-	allowed to use the library.  A more frequent case is that a free
-
-	library does the same job as widely used non-free libraries.  In this
-
-	case, there is little to gain by limiting the free library to free
-
-	software only, so we use the Lesser General Public License.
-
-
-
-	In other cases, permission to use a particular library in non-free
-
-	programs enables a greater number of people to use a large body of
-
-	free software.  For example, permission to use the GNU C Library in
-
-	non-free programs enables many more people to use the whole GNU
-
-	operating system, as well as its variant, the GNU/Linux operating
-
-	system.
-
-
-
-	Although the Lesser General Public License is Less protective of the
-
-	users' freedom, it does ensure that the user of a program that is
-
-	linked with the Library has the freedom and the wherewithal to run
-
-	that program using a modified version of the Library.
-
-
-
-	The precise terms and conditions for copying, distribution and
-
-	modification follow.  Pay close attention to the difference between a
-
-	"work based on the library" and a "work that uses the library".  The
-
-	former contains code derived from the library, whereas the latter must
-
-	be combined with the library in order to run.
-
-
-
-	GNU LESSER GENERAL PUBLIC LICENSE
-
-	TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-
-
-	0. This License Agreement applies to any software library or other
-
-	program which contains a notice placed by the copyright holder or
-
-	other authorized party saying it may be distributed under the terms of
-
-	this Lesser General Public License (also called "this License").
-
-	Each licensee is addressed as "you".
-
-
-
-	A "library" means a collection of software functions and/or data
-
-	prepared so as to be conveniently linked with application programs
-
-	(which use some of those functions and data) to form executables.
-
-
-
-	The "Library", below, refers to any such software library or work
-
-	which has been distributed under these terms.  A "work based on the
-
-	Library" means either the Library or any derivative work under
-
-	copyright law: that is to say, a work containing the Library or a
-
-	portion of it, either verbatim or with modifications and/or translated
-
-	straightforwardly into another language.  (Hereinafter, translation is
-
-	included without limitation in the term "modification".)
-
-
-
-	"Source code" for a work means the preferred form of the work for
-
-	making modifications to it.  For a library, complete source code means
-
-	all the source code for all modules it contains, plus any associated
-
-	interface definition files, plus the scripts used to control compilation
-
-	and installation of the library.
-
-
-
-	Activities other than copying, distribution and modification are not
-
-	covered by this License; they are outside its scope.  The act of
-
-	running a program using the Library is not restricted, and output from
-
-	such a program is covered only if its contents constitute a work based
-
-	on the Library (independent of the use of the Library in a tool for
-
-	writing it).  Whether that is true depends on what the Library does
-
-	and what the program that uses the Library does.
-
-
-
-	1. You may copy and distribute verbatim copies of the Library's
-
-	complete source code as you receive it, in any medium, provided that
-
-	you conspicuously and appropriately publish on each copy an
-
-	appropriate copyright notice and disclaimer of warranty; keep intact
-
-	all the notices that refer to this License and to the absence of any
-
-	warranty; and distribute a copy of this License along with the
-
-	Library.
-
-
-
-	You may charge a fee for the physical act of transferring a copy,
-
-	and you may at your option offer warranty protection in exchange for a
-
-	fee.
-
-
-
-	2. You may modify your copy or copies of the Library or any portion
-
-	of it, thus forming a work based on the Library, and copy and
-
-	distribute such modifications or work under the terms of Section 1
-
-	above, provided that you also meet all of these conditions:
-
-
-
-	a) The modified work must itself be a software library.
-
-
-
-	b) You must cause the files modified to carry prominent notices
-
-	stating that you changed the files and the date of any change.
-
-
-
-	c) You must cause the whole of the work to be licensed at no
-
-	charge to all third parties under the terms of this License.
-
-
-
-	d) If a facility in the modified Library refers to a function or a
-
-	table of data to be supplied by an application program that uses
-
-	the facility, other than as an argument passed when the facility
-
-	is invoked, then you must make a good faith effort to ensure that,
-
-	in the event an application does not supply such function or
-
-	table, the facility still operates, and performs whatever part of
-
-	its purpose remains meaningful.
-
-
-
-	(For example, a function in a library to compute square roots has
-
-	a purpose that is entirely well-defined independent of the
-
-	application.  Therefore, Subsection 2d requires that any
-
-	application-supplied function or table used by this function must
-
-	be optional: if the application does not supply it, the square
-
-	root function must still compute square roots.)
-
-
-
-	These requirements apply to the modified work as a whole.  If
-
-	identifiable sections of that work are not derived from the Library,
-
-	and can be reasonably considered independent and separate works in
-
-	themselves, then this License, and its terms, do not apply to those
-
-	sections when you distribute them as separate works.  But when you
-
-	distribute the same sections as part of a whole which is a work based
-
-	on the Library, the distribution of the whole must be on the terms of
-
-	this License, whose permissions for other licensees extend to the
-
-	entire whole, and thus to each and every part regardless of who wrote
-
-	it.
-
-
-
-	Thus, it is not the intent of this section to claim rights or contest
-
-	your rights to work written entirely by you; rather, the intent is to
-
-	exercise the right to control the distribution of derivative or
-
-	collective works based on the Library.
-
-
-
-	In addition, mere aggregation of another work not based on the Library
-
-	with the Library (or with a work based on the Library) on a volume of
-
-	a storage or distribution medium does not bring the other work under
-
-	the scope of this License.
-
-
-
-	3. You may opt to apply the terms of the ordinary GNU General Public
-
-	License instead of this License to a given copy of the Library.  To do
-
-	this, you must alter all the notices that refer to this License, so
-
-	that they refer to the ordinary GNU General Public License, version 2,
-
-	instead of to this License.  (If a newer version than version 2 of the
-
-	ordinary GNU General Public License has appeared, then you can specify
-
-	that version instead if you wish.)  Do not make any other change in
-
-	these notices.
-
-
-
-	Once this change is made in a given copy, it is irreversible for
-
-	that copy, so the ordinary GNU General Public License applies to all
-
-	subsequent copies and derivative works made from that copy.
-
-
-
-	This option is useful when you wish to copy part of the code of
-
-	the Library into a program that is not a library.
-
-
-
-	4. You may copy and distribute the Library (or a portion or
-
-	derivative of it, under Section 2) in object code or executable form
-
-	under the terms of Sections 1 and 2 above provided that you accompany
-
-	it with the complete corresponding machine-readable source code, which
-
-	must be distributed under the terms of Sections 1 and 2 above on a
-
-	medium customarily used for software interchange.
-
-
-
-	If distribution of object code is made by offering access to copy
-
-	from a designated place, then offering equivalent access to copy the
-
-	source code from the same place satisfies the requirement to
-
-	distribute the source code, even though third parties are not
-
-	compelled to copy the source along with the object code.
-
-
-
-	5. A program that contains no derivative of any portion of the
-
-	Library, but is designed to work with the Library by being compiled or
-
-	linked with it, is called a "work that uses the Library".  Such a
-
-	work, in isolation, is not a derivative work of the Library, and
-
-	therefore falls outside the scope of this License.
-
-
-
-	However, linking a "work that uses the Library" with the Library
-
-	creates an executable that is a derivative of the Library (because it
-
-	contains portions of the Library), rather than a "work that uses the
-
-	library".  The executable is therefore covered by this License.
-
-	Section 6 states terms for distribution of such executables.
-
-
-
-	When a "work that uses the Library" uses material from a header file
-
-	that is part of the Library, the object code for the work may be a
-
-	derivative work of the Library even though the source code is not.
-
-	Whether this is true is especially significant if the work can be
-
-	linked without the Library, or if the work is itself a library.  The
-
-	threshold for this to be true is not precisely defined by law.
-
-
-
-	If such an object file uses only numerical parameters, data
-
-	structure layouts and accessors, and small macros and small inline
-
-	functions (ten lines or less in length), then the use of the object
-
-	file is unrestricted, regardless of whether it is legally a derivative
-
-	work.  (Executables containing this object code plus portions of the
-
-	Library will still fall under Section 6.)
-
-
-
-	Otherwise, if the work is a derivative of the Library, you may
-
-	distribute the object code for the work under the terms of Section 6.
-
-	Any executables containing that work also fall under Section 6,
-
-	whether or not they are linked directly with the Library itself.
-
-
-
-	6. As an exception to the Sections above, you may also combine or
-
-	link a "work that uses the Library" with the Library to produce a
-
-	work containing portions of the Library, and distribute that work
-
-	under terms of your choice, provided that the terms permit
-
-	modification of the work for the customer's own use and reverse
-
-	engineering for debugging such modifications.
-
-
-
-	You must give prominent notice with each copy of the work that the
-
-	Library is used in it and that the Library and its use are covered by
-
-	this License.  You must supply a copy of this License.  If the work
-
-	during execution displays copyright notices, you must include the
-
-	copyright notice for the Library among them, as well as a reference
-
-	directing the user to the copy of this License.  Also, you must do one
-
-	of these things:
-
-
-
-	a) Accompany the work with the complete corresponding
-
-	machine-readable source code for the Library including whatever
-
-	changes were used in the work (which must be distributed under
-
-	Sections 1 and 2 above); and, if the work is an executable linked
-
-	with the Library, with the complete machine-readable "work that
-
-	uses the Library", as object code and/or source code, so that the
-
-	user can modify the Library and then relink to produce a modified
-
-	executable containing the modified Library.  (It is understood
-
-	that the user who changes the contents of definitions files in the
-
-	Library will not necessarily be able to recompile the application
-
-	to use the modified definitions.)
-
-
-
-	b) Use a suitable shared library mechanism for linking with the
-
-	Library.  A suitable mechanism is one that (1) uses at run time a
-
-	copy of the library already present on the user's computer system,
-
-	rather than copying library functions into the executable, and (2)
-
-	will operate properly with a modified version of the library, if
-
-	the user installs one, as long as the modified version is
-
-	interface-compatible with the version that the work was made with.
-
-
-
-	c) Accompany the work with a written offer, valid for at
-
-	least three years, to give the same user the materials
-
-	specified in Subsection 6a, above, for a charge no more
-
-	than the cost of performing this distribution.
-
-
-
-	d) If distribution of the work is made by offering access to copy
-
-	from a designated place, offer equivalent access to copy the above
-
-	specified materials from the same place.
-
-
-
-	e) Verify that the user has already received a copy of these
-
-	materials or that you have already sent this user a copy.
-
-
-
-	For an executable, the required form of the "work that uses the
-
-	Library" must include any data and utility programs needed for
-
-	reproducing the executable from it.  However, as a special exception,
-
-	the materials to be distributed need not include anything that is
-
-	normally distributed (in either source or binary form) with the major
-
-	components (compiler, kernel, and so on) of the operating system on
-
-	which the executable runs, unless that component itself accompanies
-
-	the executable.
-
-
-
-	It may happen that this requirement contradicts the license
-
-	restrictions of other proprietary libraries that do not normally
-
-	accompany the operating system.  Such a contradiction means you cannot
-
-	use both them and the Library together in an executable that you
-
-	distribute.
-
-
-
-	7. You may place library facilities that are a work based on the
-
-	Library side-by-side in a single library together with other library
-
-	facilities not covered by this License, and distribute such a combined
-
-	library, provided that the separate distribution of the work based on
-
-	the Library and of the other library facilities is otherwise
-
-	permitted, and provided that you do these two things:
-
-
-
-	a) Accompany the combined library with a copy of the same work
-
-	based on the Library, uncombined with any other library
-
-	facilities.  This must be distributed under the terms of the
-
-	Sections above.
-
-
-
-	b) Give prominent notice with the combined library of the fact
-
-	that part of it is a work based on the Library, and explaining
-
-	where to find the accompanying uncombined form of the same work.
-
-
-
-	8. You may not copy, modify, sublicense, link with, or distribute
-
-	the Library except as expressly provided under this License.  Any
-
-	attempt otherwise to copy, modify, sublicense, link with, or
-
-	distribute the Library is void, and will automatically terminate your
-
-	rights under this License.  However, parties who have received copies,
-
-	or rights, from you under this License will not have their licenses
-
-	terminated so long as such parties remain in full compliance.
-
-
-
-	9. You are not required to accept this License, since you have not
-
-	signed it.  However, nothing else grants you permission to modify or
-
-	distribute the Library or its derivative works.  These actions are
-
-	prohibited by law if you do not accept this License.  Therefore, by
-
-	modifying or distributing the Library (or any work based on the
-
-	Library), you indicate your acceptance of this License to do so, and
-
-	all its terms and conditions for copying, distributing or modifying
-
-	the Library or works based on it.
-
-
-
-	10. Each time you redistribute the Library (or any work based on the
-
-	Library), the recipient automatically receives a license from the
-
-	original licensor to copy, distribute, link with or modify the Library
-
-	subject to these terms and conditions.  You may not impose any further
-
-	restrictions on the recipients' exercise of the rights granted herein.
-
-	You are not responsible for enforcing compliance by third parties with
-
-	this License.
-
-
-
-	11. If, as a consequence of a court judgment or allegation of patent
-
-	infringement or for any other reason (not limited to patent issues),
-
-	conditions are imposed on you (whether by court order, agreement or
-
-	otherwise) that contradict the conditions of this License, they do not
-
-	excuse you from the conditions of this License.  If you cannot
-
-	distribute so as to satisfy simultaneously your obligations under this
-
-	License and any other pertinent obligations, then as a consequence you
-
-	may not distribute the Library at all.  For example, if a patent
-
-	license would not permit royalty-free redistribution of the Library by
-
-	all those who receive copies directly or indirectly through you, then
-
-	the only way you could satisfy both it and this License would be to
-
-	refrain entirely from distribution of the Library.
-
-
-
-	If any portion of this section is held invalid or unenforceable under any
-
-	particular circumstance, the balance of the section is intended to apply,
-
-	and the section as a whole is intended to apply in other circumstances.
-
-
-
-	It is not the purpose of this section to induce you to infringe any
-
-	patents or other property right claims or to contest validity of any
-
-	such claims; this section has the sole purpose of protecting the
-
-	integrity of the free software distribution system which is
-
-	implemented by public license practices.  Many people have made
-
-	generous contributions to the wide range of software distributed
-
-	through that system in reliance on consistent application of that
-
-	system; it is up to the author/donor to decide if he or she is willing
-
-	to distribute software through any other system and a licensee cannot
-
-	impose that choice.
-
-
-
-	This section is intended to make thoroughly clear what is believed to
-
-	be a consequence of the rest of this License.
-
-
-
-	12. If the distribution and/or use of the Library is restricted in
-
-	certain countries either by patents or by copyrighted interfaces, the
-
-	original copyright holder who places the Library under this License may
-
-	add an explicit geographical distribution limitation excluding those
-
-	countries, so that distribution is permitted only in or among countries
-
-	not thus excluded.  In such case, this License incorporates the
-
-	limitation as if written in the body of this License.
-
-
-
-	13. The Free Software Foundation may publish revised and/or new
-
-	versions of the Lesser General Public License from time to time.
-
-	Such new versions will be similar in spirit to the present version,
-
-	but may differ in detail to address new problems or concerns.
-
-
-
-	Each version is given a distinguishing version number.  If the Library
-
-	specifies a version number of this License which applies to it and
-
-	"any later version", you have the option of following the terms and
-
-	conditions either of that version or of any later version published by
-
-	the Free Software Foundation.  If the Library does not specify a
-
-	license version number, you may choose any version ever published by
-
-	the Free Software Foundation.
-
-
-
-	14. If you wish to incorporate parts of the Library into other free
-
-	programs whose distribution conditions are incompatible with these,
-
-	write to the author to ask for permission.  For software which is
-
-	copyrighted by the Free Software Foundation, write to the Free
-
-	Software Foundation; we sometimes make exceptions for this.  Our
-
-	decision will be guided by the two goals of preserving the free status
-
-	of all derivatives of our free software and of promoting the sharing
-
-	and reuse of software generally.
-
-
-
-	NO WARRANTY
-
-
-
-	15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-
-	WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-
-	EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-
-	OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-
-	KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-
-	IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-
-	PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-
-	LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-
-	THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-
-
-	16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-
-	WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-
-	AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-
-	FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-
-	CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-
-	LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-
-	RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-
-	FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-
-	SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-
-	DAMAGES.
-
-
-
-	END OF TERMS AND CONDITIONS
-
-
-
-	How to Apply These Terms to Your New Libraries
-
-
-
-	If you develop a new library, and you want it to be of the greatest
-
-	possible use to the public, we recommend making it free software that
-
-	everyone can redistribute and change.  You can do so by permitting
-
-	redistribution under these terms (or, alternatively, under the terms of the
-
-	ordinary General Public License).
-
-
-
-	To apply these terms, attach the following notices to the library.  It is
-
-	safest to attach them to the start of each source file to most effectively
-
-	convey the exclusion of warranty; and each file should have at least the
-
-	"copyright" line and a pointer to where the full notice is found.
-
-
-
-	<one line to give the library's name and a brief idea of what it does.>
-
-	Copyright (C) <year>  <name of author>
-
-
-
-	This library is free software; you can redistribute it and/or
-
-	modify it under the terms of the GNU Lesser General Public
-
-	License as published by the Free Software Foundation; either
-
-	version 2.1 of the License, or (at your option) any later version.
-
-
-
-	This library is distributed in the hope that it will be useful,
-
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-
-	Lesser General Public License for more details.
-
-
-
-	You should have received a copy of the GNU Lesser General Public
-
-	License along with this library; if not, write to the Free Software
-
-	Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-
-	Also add information on how to contact you by electronic and paper mail.
-
-
-
-	You should also get your employer (if you work as a programmer) or your
-
-	school, if any, to sign a "copyright disclaimer" for the library, if
-
-	necessary.  Here is a sample; alter the names:
-
-
-
-	Yoyodyne, Inc., hereby disclaims all copyright interest in the
-
-	library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-
-
-	<signature of Ty Coon>, 1 April 1990
-
-	Ty Coon, President of Vice
-
-
-
-	That's all there is to it!
-
-
-
-  --$Id: LICENSE,v 1.3 2003/11/06 18:18:06 hlellelid Exp $
-
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/config/autoload.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/config/autoload.yml
deleted file mode 100644
index 8dd5f5923..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/config/autoload.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-autoload:
-  sfPropelPlugin_lib:
-    name:           propel addon
-    path:           <?php echo realpath(dirname(__FILE__).'/../lib')."\n" ?>
-    recursive:      true
-    exclude:        [vendor]
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/config/installer.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/config/installer.php
deleted file mode 100644
index 0fbfb8459..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/config/installer.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$this->installDir(dirname(__FILE__).'/skeleton');
-$this->enablePlugin('sfPropelPlugin');
-$this->reloadTasks();
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/config/sfPropelPluginConfiguration.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/config/sfPropelPluginConfiguration.class.php
deleted file mode 100644
index 2eed9617f..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/config/sfPropelPluginConfiguration.class.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * sfPropelPlugin configuration.
- * 
- * @package    sfPropelPlugin
- * @subpackage config
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelPluginConfiguration.class.php 23739 2009-11-09 23:32:46Z Kris.Wallsmith $
- */
-class sfPropelPluginConfiguration extends sfPluginConfiguration
-{
-  /**
-   * @see sfPluginConfiguration
-   */
-  public function initialize()
-  {
-    sfConfig::set('sf_orm', 'propel');
-    if (!sfConfig::get('sf_admin_module_web_dir'))
-    {
-      sfConfig::set('sf_admin_module_web_dir', '/sfPropelPlugin');
-    }
-
-    sfToolkit::addIncludePath(array(
-      sfConfig::get('sf_root_dir'),
-      sfConfig::get('sf_propel_runtime_path', realpath(dirname(__FILE__).'/../lib/vendor')),
-    ));
-
-    require_once 'propel/Propel.php';
-
-    if (!Propel::isInit())
-    {
-      if (sfConfig::get('sf_debug') && sfConfig::get('sf_logging_enabled'))
-      {
-        Propel::setLogger(new sfPropelLogger($this->dispatcher));
-      }
-
-      $propelConfiguration = new PropelConfiguration();
-      Propel::setConfiguration($propelConfiguration);
-
-      $this->dispatcher->notify(new sfEvent($propelConfiguration, 'propel.configure'));
-
-      Propel::initialize();
-    }
-
-    $this->dispatcher->connect('user.change_culture', array('sfPropel', 'listenToChangeCultureEvent'));
-
-    if (sfConfig::get('sf_web_debug'))
-    {
-      $this->dispatcher->connect('debug.web.load_panels', array('sfWebDebugPanelPropel', 'listenToAddPanelEvent'));
-    }
-
-    if (sfConfig::get('sf_test'))
-    {
-      $this->dispatcher->connect('context.load_factories', array($this, 'clearAllInstancePools'));
-    }
-  }
-
-  /**
-   * Clears all instance pools.
-   * 
-   * This method is used to clear Propel's static instance pools between
-   * requests performed in functional tests.
-   */
-  public function clearAllInstancePools()
-  {
-    $finder = sfFinder::type('file')->name('*TableMap.php');
-    foreach ($finder->in($this->configuration->getModelDirs()) as $file)
-    {
-      $omClass = basename($file, 'TableMap.php');
-      if (class_exists($omClass) && is_subclass_of($omClass, 'BaseObject'))
-      {
-        $peer = constant($omClass.'::PEER');
-        call_user_func(array($peer, 'clearInstancePool'));
-      }
-    }
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/config/skeleton/config/databases.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/config/skeleton/config/databases.yml
deleted file mode 100644
index 692d9af6f..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/config/skeleton/config/databases.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-# You can find more information about this file on the symfony website:
-# http://www.symfony-project.org/reference/1_4/en/07-Databases
-
-dev:
-  propel:
-    param:
-      classname:  DebugPDO
-      debug:
-        realmemoryusage: true
-        details:
-          time:       { enabled: true }
-          slow:       { enabled: true, threshold: 0.1 }
-          mem:        { enabled: true }
-          mempeak:    { enabled: true }
-          memdelta:   { enabled: true }
-
-test:
-  propel:
-    param:
-      classname:  DebugPDO
-
-all:
-  propel:
-    class:        sfPropelDatabase
-    param:
-      classname:  PropelPDO
-      dsn:        mysql:dbname=##PROJECT_NAME##;host=localhost
-      username:   root
-      password:   
-      encoding:   utf8
-      persistent: true
-      pooling:    true
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/config/skeleton/config/propel.ini b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/config/skeleton/config/propel.ini
deleted file mode 100644
index 237f95448..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/config/skeleton/config/propel.ini
+++ /dev/null
@@ -1,54 +0,0 @@
-propel.targetPackage       = lib.model
-propel.packageObjectModel  = true
-propel.project             = ##PROJECT_NAME##
-propel.database            = mysql
-propel.database.driver     = mysql
-propel.database.url        = mysql:dbname=##PROJECT_NAME##;host=localhost
-propel.database.creole.url = ${propel.database.url}
-propel.database.user       = root
-propel.database.password   = 
-propel.database.encoding   = utf8
-
-; mysql options
-propel.mysql.tableType     = InnoDB
-
-propel.addVendorInfo       = true
-propel.addGenericAccessors = true
-propel.addGenericMutators  = true
-propel.addTimeStamp        = true
-propel.addValidators       = false
-propel.addIncludes         = false
-
-propel.useDateTimeClass       = true
-propel.defaultTimeStampFormat = Y-m-d H:i:s
-propel.defaultTimeFormat      = H:i:s
-propel.defaultDateFormat      = Y-m-d
-
-propel.schema.validate        = false
-propel.samePhpName            = false
-propel.disableIdentifierQuoting     = false
-propel.emulateForeignKeyConstraints = true
-
-; directories
-propel.home                    = .
-propel.output.dir              = ##PROJECT_DIR##
-propel.schema.dir              = ${propel.output.dir}/config
-propel.conf.dir                = ${propel.output.dir}/config
-propel.phpconf.dir             = ${propel.output.dir}/config
-propel.sql.dir                 = ${propel.output.dir}/data/sql
-propel.runtime.conf.file       = runtime-conf.xml
-propel.php.dir                 = ${propel.output.dir}
-propel.default.schema.basename = schema
-propel.datadump.mapper.from    = *schema.xml
-propel.datadump.mapper.to      = *data.xml
-
-propel.builder.addComments  = true
-propel.builder.addBehaviors = true
-
-; behaviors
-propel.behavior.default                        = symfony,symfony_i18n
-propel.behavior.symfony.class                  = plugins.sfPropelPlugin.lib.behavior.SfPropelBehaviorSymfony
-propel.behavior.symfony_i18n.class             = plugins.sfPropelPlugin.lib.behavior.SfPropelBehaviorI18n
-propel.behavior.symfony_i18n_translation.class = plugins.sfPropelPlugin.lib.behavior.SfPropelBehaviorI18nTranslation
-propel.behavior.symfony_behaviors.class        = plugins.sfPropelPlugin.lib.behavior.SfPropelBehaviorSymfonyBehaviors
-propel.behavior.symfony_timestampable.class    = plugins.sfPropelPlugin.lib.behavior.SfPropelBehaviorTimestampable
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/config/skeleton/config/schema.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/config/skeleton/config/schema.yml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelForm/default/template/sfPropelFormBaseTemplate.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelForm/default/template/sfPropelFormBaseTemplate.php
deleted file mode 100644
index 594d8503c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelForm/default/template/sfPropelFormBaseTemplate.php
+++ /dev/null
@@ -1,15 +0,0 @@
-[?php
-
-/**
- * Project form base class.
- *
- * @package    ##PROJECT_NAME##
- * @subpackage form
- * @author     ##AUTHOR_NAME##
- */
-abstract class BaseFormPropel extends sfFormPropel
-{
-  public function setup()
-  {
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelForm/default/template/sfPropelFormGeneratedTemplate.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelForm/default/template/sfPropelFormGeneratedTemplate.php
deleted file mode 100644
index d5c347a66..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelForm/default/template/sfPropelFormGeneratedTemplate.php
+++ /dev/null
@@ -1,139 +0,0 @@
-[?php
-
-/**
- * <?php echo $this->table->getClassname() ?> form base class.
- *
- * @method <?php echo $this->table->getClassname() ?> getObject() Returns the current form's model object
- *
- * @package    ##PROJECT_NAME##
- * @subpackage form
- * @author     ##AUTHOR_NAME##
- */
-abstract class Base<?php echo $this->table->getClassname() ?>Form extends BaseFormPropel
-{
-  public function setup()
-  {
-    $this->setWidgets(array(
-<?php foreach ($this->table->getColumns() as $column): ?>
-      '<?php echo $this->translateColumnName($column) ?>'<?php echo str_repeat(' ', $this->getColumnNameMaxLength() - strlen($column->getName())) ?> => new <?php echo $this->getWidgetClassForColumn($column) ?>(<?php echo $this->getWidgetOptionsForColumn($column) ?>),
-<?php endforeach; ?>
-<?php foreach ($this->getManyToManyTables() as $tables): ?>
-      '<?php echo $this->underscore($tables['middleTable']->getClassname()) ?>_list'<?php echo str_repeat(' ', $this->getColumnNameMaxLength() - strlen($this->underscore($tables['middleTable']->getClassname()).'_list')) ?> => new sfWidgetFormPropelChoice(array('multiple' => true, 'model' => '<?php echo $tables['relatedTable']->getClassname() ?>')),
-<?php endforeach; ?>
-    ));
-
-    $this->setValidators(array(
-<?php foreach ($this->table->getColumns() as $column): ?>
-      '<?php echo $this->translateColumnName($column) ?>'<?php echo str_repeat(' ', $this->getColumnNameMaxLength() - strlen($column->getName())) ?> => new <?php echo $this->getValidatorClassForColumn($column) ?>(<?php echo $this->getValidatorOptionsForColumn($column) ?>),
-<?php endforeach; ?>
-<?php foreach ($this->getManyToManyTables() as $tables): ?>
-      '<?php echo $this->underscore($tables['middleTable']->getClassname()) ?>_list'<?php echo str_repeat(' ', $this->getColumnNameMaxLength() - strlen($this->underscore($tables['middleTable']->getClassname()).'_list')) ?> => new sfValidatorPropelChoice(array('multiple' => true, 'model' => '<?php echo $tables['relatedTable']->getClassname() ?>', 'required' => false)),
-<?php endforeach; ?>
-    ));
-
-<?php if ($uniqueColumns = $this->getUniqueColumnNames()): ?>
-    $this->validatorSchema->setPostValidator(
-<?php if (count($uniqueColumns) > 1): ?>
-      new sfValidatorAnd(array(
-<?php foreach ($uniqueColumns as $uniqueColumn): ?>
-        new sfValidatorPropelUnique(array('model' => '<?php echo $this->table->getClassname() ?>', 'column' => array('<?php echo implode("', '", $uniqueColumn) ?>'))),
-<?php endforeach; ?>
-      ))
-<?php else: ?>
-      new sfValidatorPropelUnique(array('model' => '<?php echo $this->table->getClassname() ?>', 'column' => array('<?php echo implode("', '", $uniqueColumns[0]) ?>')))
-<?php endif; ?>
-    );
-
-<?php endif; ?>
-    $this->widgetSchema->setNameFormat('<?php echo $this->underscore($this->table->getClassname()) ?>[%s]');
-
-    $this->errorSchema = new sfValidatorErrorSchema($this->validatorSchema);
-
-    parent::setup();
-  }
-
-  public function getModelName()
-  {
-    return '<?php echo $this->table->getClassname() ?>';
-  }
-
-<?php if ($this->isI18n()): ?>
-  public function getI18nModelName()
-  {
-    return '<?php echo $this->getI18nModel() ?>';
-  }
-
-  public function getI18nFormClass()
-  {
-    return '<?php echo $this->getI18nModel() ?>Form';
-  }
-<?php endif; ?>
-
-<?php if ($this->getManyToManyTables()): ?>
-  public function updateDefaultsFromObject()
-  {
-    parent::updateDefaultsFromObject();
-
-<?php foreach ($this->getManyToManyTables() as $tables): ?>
-    if (isset($this->widgetSchema['<?php echo $this->underscore($tables['middleTable']->getClassname()) ?>_list']))
-    {
-      $values = array();
-      foreach ($this->object->get<?php echo $tables['middleTable']->getPhpName() ?>s() as $obj)
-      {
-        $values[] = $obj->get<?php echo $tables['relatedColumn']->getPhpName() ?>();
-      }
-
-      $this->setDefault('<?php echo $this->underscore($tables['middleTable']->getClassname()) ?>_list', $values);
-    }
-
-<?php endforeach; ?>
-  }
-
-  protected function doSave($con = null)
-  {
-    parent::doSave($con);
-
-<?php foreach ($this->getManyToManyTables() as $tables): ?>
-    $this->save<?php echo $tables['middleTable']->getPhpName() ?>List($con);
-<?php endforeach; ?>
-  }
-
-<?php foreach ($this->getManyToManyTables() as $tables): ?>
-  public function save<?php echo $tables['middleTable']->getPhpName() ?>List($con = null)
-  {
-    if (!$this->isValid())
-    {
-      throw $this->getErrorSchema();
-    }
-
-    if (!isset($this->widgetSchema['<?php echo $this->underscore($tables['middleTable']->getClassname()) ?>_list']))
-    {
-      // somebody has unset this widget
-      return;
-    }
-
-    if (null === $con)
-    {
-      $con = $this->getConnection();
-    }
-
-    $c = new Criteria();
-    $c->add(<?php echo constant($tables['middleTable']->getClassname().'::PEER') ?>::<?php echo strtoupper($tables['column']->getName()) ?>, $this->object->getPrimaryKey());
-    <?php echo constant($tables['middleTable']->getClassname().'::PEER') ?>::doDelete($c, $con);
-
-    $values = $this->getValue('<?php echo $this->underscore($tables['middleTable']->getClassname()) ?>_list');
-    if (is_array($values))
-    {
-      foreach ($values as $value)
-      {
-        $obj = new <?php echo $tables['middleTable']->getClassname() ?>();
-        $obj->set<?php echo $tables['column']->getPhpName() ?>($this->object->getPrimaryKey());
-        $obj->set<?php echo $tables['relatedColumn']->getPhpName() ?>($value);
-        $obj->save();
-      }
-    }
-  }
-
-<?php endforeach; ?>
-<?php endif; ?>
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelForm/default/template/sfPropelFormTemplate.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelForm/default/template/sfPropelFormTemplate.php
deleted file mode 100644
index 346d19f76..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelForm/default/template/sfPropelFormTemplate.php
+++ /dev/null
@@ -1,15 +0,0 @@
-[?php
-
-/**
- * <?php echo $this->table->getClassname() ?> form.
- *
- * @package    ##PROJECT_NAME##
- * @subpackage form
- * @author     ##AUTHOR_NAME##
- */
-class <?php echo $this->table->getClassname() ?>Form extends Base<?php echo $this->table->getClassname() ?>Form
-{
-  public function configure()
-  {
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelFormFilter/default/template/sfPropelFormFilterBaseTemplate.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelFormFilter/default/template/sfPropelFormFilterBaseTemplate.php
deleted file mode 100644
index 95c54f812..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelFormFilter/default/template/sfPropelFormFilterBaseTemplate.php
+++ /dev/null
@@ -1,15 +0,0 @@
-[?php
-
-/**
- * Project filter form base class.
- *
- * @package    ##PROJECT_NAME##
- * @subpackage filter
- * @author     ##AUTHOR_NAME##
- */
-abstract class BaseFormFilterPropel extends sfFormFilterPropel
-{
-  public function setup()
-  {
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelFormFilter/default/template/sfPropelFormFilterGeneratedTemplate.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelFormFilter/default/template/sfPropelFormFilterGeneratedTemplate.php
deleted file mode 100644
index 1cddbbba5..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelFormFilter/default/template/sfPropelFormFilterGeneratedTemplate.php
+++ /dev/null
@@ -1,84 +0,0 @@
-[?php
-
-/**
- * <?php echo $this->table->getClassname() ?> filter form base class.
- *
- * @package    ##PROJECT_NAME##
- * @subpackage filter
- * @author     ##AUTHOR_NAME##
- */
-abstract class Base<?php echo $this->table->getClassname() ?>FormFilter extends BaseFormFilterPropel
-{
-  public function setup()
-  {
-    $this->setWidgets(array(
-<?php foreach ($this->table->getColumns() as $column): ?>
-<?php if ($column->isPrimaryKey()) continue ?>
-      '<?php echo $this->translateColumnName($column) ?>'<?php echo str_repeat(' ', $this->getColumnNameMaxLength() - strlen($column->getName())) ?> => new <?php echo $this->getWidgetClassForColumn($column) ?>(<?php echo $this->getWidgetOptionsForColumn($column) ?>),
-<?php endforeach; ?>
-<?php foreach ($this->getManyToManyTables() as $tables): ?>
-      '<?php echo $this->underscore($tables['middleTable']->getClassname()) ?>_list'<?php echo str_repeat(' ', $this->getColumnNameMaxLength() - strlen($this->underscore($tables['middleTable']->getClassname()).'_list')) ?> => new sfWidgetFormPropelChoice(array('model' => '<?php echo $tables['relatedTable']->getClassname() ?>', 'add_empty' => true)),
-<?php endforeach; ?>
-    ));
-
-    $this->setValidators(array(
-<?php foreach ($this->table->getColumns() as $column): ?>
-<?php if ($column->isPrimaryKey()) continue ?>
-      '<?php echo $this->translateColumnName($column) ?>'<?php echo str_repeat(' ', $this->getColumnNameMaxLength() - strlen($column->getName())) ?> => <?php echo $this->getValidatorForColumn($column) ?>,
-<?php endforeach; ?>
-<?php foreach ($this->getManyToManyTables() as $tables): ?>
-      '<?php echo $this->underscore($tables['middleTable']->getClassname()) ?>_list'<?php echo str_repeat(' ', $this->getColumnNameMaxLength() - strlen($this->underscore($tables['middleTable']->getClassname()).'_list')) ?> => new sfValidatorPropelChoice(array('model' => '<?php echo $tables['relatedTable']->getClassname() ?>', 'required' => false)),
-<?php endforeach; ?>
-    ));
-
-    $this->widgetSchema->setNameFormat('<?php echo $this->underscore($this->table->getClassname()) ?>_filters[%s]');
-
-    $this->errorSchema = new sfValidatorErrorSchema($this->validatorSchema);
-
-    parent::setup();
-  }
-
-<?php foreach ($this->getManyToManyTables() as $tables): ?>
-  public function add<?php echo $tables['middleTable']->getPhpName() ?>ListColumnCriteria(Criteria $criteria, $field, $values)
-  {
-    if (!is_array($values))
-    {
-      $values = array($values);
-    }
-
-    if (!count($values))
-    {
-      return;
-    }
-
-    $criteria->addJoin(<?php echo constant($tables['middleTable']->getPhpName().'::PEER') ?>::<?php echo strtoupper($tables['column']->getName()) ?>, <?php echo constant($this->table->getPhpName().'::PEER') ?>::<?php echo strtoupper($this->getPrimaryKey()->getName()) ?>);
-
-    $value = array_pop($values);
-    $criterion = $criteria->getNewCriterion(<?php echo constant($tables['middleTable']->getPhpName().'::PEER') ?>::<?php echo $tables['relatedColumn']->getName() ?>, $value);
-
-    foreach ($values as $value)
-    {
-      $criterion->addOr($criteria->getNewCriterion(<?php echo constant($tables['middleTable']->getPhpName().'::PEER') ?>::<?php echo $tables['relatedColumn']->getName() ?>, $value));
-    }
-
-    $criteria->add($criterion);
-  }
-
-<?php endforeach; ?>
-  public function getModelName()
-  {
-    return '<?php echo $this->table->getClassname() ?>';
-  }
-
-  public function getFields()
-  {
-    return array(
-<?php foreach ($this->table->getColumns() as $column): ?>
-      '<?php echo $this->translateColumnName($column) ?>'<?php echo str_repeat(' ', $this->getColumnNameMaxLength() - strlen($column->getName())) ?> => '<?php echo $this->getType($column) ?>',
-<?php endforeach; ?>
-<?php foreach ($this->getManyToManyTables() as $tables): ?>
-      '<?php echo $this->underscore($tables['middleTable']->getClassname()) ?>_list'<?php echo str_repeat(' ', $this->getColumnNameMaxLength() - strlen($this->underscore($tables['middleTable']->getClassname()).'_list')) ?> => 'ManyKey',
-<?php endforeach; ?>
-    );
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelFormFilter/default/template/sfPropelFormFilterTemplate.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelFormFilter/default/template/sfPropelFormFilterTemplate.php
deleted file mode 100644
index aef7e1cfa..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelFormFilter/default/template/sfPropelFormFilterTemplate.php
+++ /dev/null
@@ -1,15 +0,0 @@
-[?php
-
-/**
- * <?php echo $this->table->getClassname() ?> filter form.
- *
- * @package    ##PROJECT_NAME##
- * @subpackage filter
- * @author     ##AUTHOR_NAME##
- */
-class <?php echo $this->table->getClassname() ?>FormFilter extends Base<?php echo $this->table->getClassname() ?>FormFilter
-{
-  public function configure()
-  {
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/actionsConfiguration.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/actionsConfiguration.php
deleted file mode 100644
index cd266cb72..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/actionsConfiguration.php
+++ /dev/null
@@ -1,41 +0,0 @@
-  public function getActionsDefault()
-  {
-    return <?php echo $this->asPhp(isset($this->config['actions']) ? $this->config['actions'] : array()) ?>;
-<?php unset($this->config['actions']) ?>
-  }
-
-  public function getFormActions()
-  {
-    return <?php echo $this->asPhp(isset($this->config['form']['actions']) ? $this->config['form']['actions'] : array('_delete' => null, '_list' => null, '_save' => null, '_save_and_add' => null)) ?>;
-<?php unset($this->config['form']['actions']) ?>
-  }
-
-  public function getNewActions()
-  {
-    return <?php echo $this->asPhp(isset($this->config['new']['actions']) ? $this->config['new']['actions'] : array()) ?>;
-<?php unset($this->config['new']['actions']) ?>
-  }
-
-  public function getEditActions()
-  {
-    return <?php echo $this->asPhp(isset($this->config['edit']['actions']) ? $this->config['edit']['actions'] : array()) ?>;
-<?php unset($this->config['edit']['actions']) ?>
-  }
-
-  public function getListObjectActions()
-  {
-    return <?php echo $this->asPhp(isset($this->config['list']['object_actions']) ? $this->config['list']['object_actions'] : array('_edit' => null, '_delete' => null)) ?>;
-<?php unset($this->config['list']['object_actions']) ?>
-  }
-
-  public function getListActions()
-  {
-    return <?php echo $this->asPhp(isset($this->config['list']['actions']) ? $this->config['list']['actions'] : array('_new' => null)) ?>;
-<?php unset($this->config['list']['actions']) ?>
-  }
-
-  public function getListBatchActions()
-  {
-    return <?php echo $this->asPhp(isset($this->config['list']['batch_actions']) ? $this->config['list']['batch_actions'] : array('_delete' => null)) ?>;
-<?php unset($this->config['list']['batch_actions']) ?>
-  }
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/batchAction.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/batchAction.php
deleted file mode 100644
index 80f982d91..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/batchAction.php
+++ /dev/null
@@ -1,72 +0,0 @@
-  public function executeBatch(sfWebRequest $request)
-  {
-    $request->checkCSRFProtection();
-
-    if (!$ids = $request->getParameter('ids'))
-    {
-      $this->getUser()->setFlash('error', 'You must at least select one item.');
-
-      $this->redirect('@<?php echo $this->getUrlForAction('list') ?>');
-    }
-
-    if (!$action = $request->getParameter('batch_action'))
-    {
-      $this->getUser()->setFlash('error', 'You must select an action to execute on the selected items.');
-
-      $this->redirect('@<?php echo $this->getUrlForAction('list') ?>');
-    }
-
-    if (!method_exists($this, $method = 'execute'.ucfirst($action)))
-    {
-      throw new InvalidArgumentException(sprintf('You must create a "%s" method for action "%s"', $method, $action));
-    }
-
-    if (!$this->getUser()->hasCredential($this->configuration->getCredentials($action)))
-    {
-      $this->forward(sfConfig::get('sf_secure_module'), sfConfig::get('sf_secure_action'));
-    }
-
-    $validator = new sfValidatorPropelChoice(array('multiple' => true, 'model' => '<?php echo $this->getModelClass() ?>'));
-    try
-    {
-      // validate ids
-      $ids = $validator->clean($ids);
-
-      // execute batch
-      $this->$method($request);
-    }
-    catch (sfValidatorError $e)
-    {
-      $this->getUser()->setFlash('error', 'A problem occurs when deleting the selected items as some items do not exist anymore.');
-    }
-
-    $this->redirect('@<?php echo $this->getUrlForAction('list') ?>');
-  }
-
-  protected function executeBatchDelete(sfWebRequest $request)
-  {
-    $ids = $request->getParameter('ids');
-
-    $count = 0;
-    foreach (<?php echo constant($this->getModelClass().'::PEER') ?>::retrieveByPks($ids) as $object)
-    {
-      $this->dispatcher->notify(new sfEvent($this, 'admin.delete_object', array('object' => $object)));
-
-      $object->delete();
-      if ($object->isDeleted())
-      {
-        $count++;
-      }
-    }
-
-    if ($count >= count($ids))
-    {
-      $this->getUser()->setFlash('notice', 'The selected items have been deleted successfully.');
-    }
-    else
-    {
-      $this->getUser()->setFlash('error', 'A problem occurs when deleting the selected items.');
-    }
-
-    $this->redirect('@<?php echo $this->getUrlForAction('list') ?>');
-  }
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/configuration.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/configuration.php
deleted file mode 100644
index ee4290c38..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/configuration.php
+++ /dev/null
@@ -1,59 +0,0 @@
-[?php
-
-/**
- * <?php echo $this->getModuleName() ?> module configuration.
- *
- * @package    ##PROJECT_NAME##
- * @subpackage <?php echo $this->getModuleName()."\n" ?>
- * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: configuration.php 24171 2009-11-19 16:37:50Z Kris.Wallsmith $
- */
-abstract class Base<?php echo ucfirst($this->getModuleName()) ?>GeneratorConfiguration extends sfModelGeneratorConfiguration
-{
-<?php include dirname(__FILE__).'/actionsConfiguration.php' ?>
-
-<?php include dirname(__FILE__).'/fieldsConfiguration.php' ?>
-
-  /**
-   * Gets the form class name.
-   *
-   * @return string The form class name
-   */
-  public function getFormClass()
-  {
-    return '<?php echo isset($this->config['form']['class']) ? $this->config['form']['class'] : $this->getModelClass().'Form' ?>';
-<?php unset($this->config['form']['class']) ?>
-  }
-
-  public function hasFilterForm()
-  {
-    return <?php echo !isset($this->config['filter']['class']) || false !== $this->config['filter']['class'] ? 'true' : 'false' ?>;
-  }
-
-  /**
-   * Gets the filter form class name
-   *
-   * @return string The filter form class name associated with this generator
-   */
-  public function getFilterFormClass()
-  {
-    return '<?php echo isset($this->config['filter']['class']) && !in_array($this->config['filter']['class'], array(null, true, false), true) ? $this->config['filter']['class'] : $this->getModelClass().'FormFilter' ?>';
-<?php unset($this->config['filter']['class']) ?>
-  }
-
-<?php include dirname(__FILE__).'/paginationConfiguration.php' ?>
-
-<?php include dirname(__FILE__).'/sortingConfiguration.php' ?>
-
-  public function getPeerMethod()
-  {
-    return '<?php echo isset($this->config['list']['peer_method']) ? $this->config['list']['peer_method'] : 'doSelect' ?>';
-<?php unset($this->config['list']['peer_method']) ?>
-  }
-
-  public function getPeerCountMethod()
-  {
-    return '<?php echo isset($this->config['list']['peer_count_method']) ? $this->config['list']['peer_count_method'] : 'doCount' ?>';
-<?php unset($this->config['list']['peer_count_method']) ?>
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/createAction.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/createAction.php
deleted file mode 100644
index 6b063eb32..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/createAction.php
+++ /dev/null
@@ -1,9 +0,0 @@
-  public function executeCreate(sfWebRequest $request)
-  {
-    $this->form = $this->configuration->getForm();
-    $this-><?php echo $this->getSingularName() ?> = $this->form->getObject();
-
-    $this->processForm($request, $this->form);
-
-    $this->setTemplate('new');
-  }
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/deleteAction.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/deleteAction.php
deleted file mode 100644
index 88b392f71..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/deleteAction.php
+++ /dev/null
@@ -1,12 +0,0 @@
-  public function executeDelete(sfWebRequest $request)
-  {
-    $request->checkCSRFProtection();
-
-    $this->dispatcher->notify(new sfEvent($this, 'admin.delete_object', array('object' => $this->getRoute()->getObject())));
-
-    $this->getRoute()->getObject()->delete();
-
-    $this->getUser()->setFlash('notice', 'The item was deleted successfully.');
-
-    $this->redirect('@<?php echo $this->getUrlForAction('list') ?>');
-  }
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/editAction.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/editAction.php
deleted file mode 100644
index e0cfde5f4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/editAction.php
+++ /dev/null
@@ -1,5 +0,0 @@
-  public function executeEdit(sfWebRequest $request)
-  {
-    $this-><?php echo $this->getSingularName() ?> = $this->getRoute()->getObject();
-    $this->form = $this->configuration->getForm($this-><?php echo $this->getSingularName() ?>);
-  }
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/fieldsConfiguration.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/fieldsConfiguration.php
deleted file mode 100644
index dbd06c661..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/fieldsConfiguration.php
+++ /dev/null
@@ -1,86 +0,0 @@
-  public function getListParams()
-  {
-    return <?php echo $this->asPhp(isset($this->config['list']['params']) ? $this->config['list']['params'] : '%%'.implode('%% - %%', isset($this->config['list']['display']) ? $this->config['list']['display'] : $this->getAllFieldNames(false)).'%%') ?>;
-<?php unset($this->config['list']['params']) ?>
-  }
-
-  public function getListLayout()
-  {
-    return '<?php echo isset($this->config['list']['layout']) ? $this->config['list']['layout'] : 'tabular' ?>';
-<?php unset($this->config['list']['layout']) ?>
-  }
-
-  public function getListTitle()
-  {
-    return '<?php echo $this->escapeString(isset($this->config['list']['title']) ? $this->config['list']['title'] : sfInflector::humanize($this->getModuleName()).' List') ?>';
-<?php unset($this->config['list']['title']) ?>
-  }
-
-  public function getEditTitle()
-  {
-    return '<?php echo $this->escapeString(isset($this->config['edit']['title']) ? $this->config['edit']['title'] : 'Edit '.sfInflector::humanize($this->getModuleName())) ?>';
-<?php unset($this->config['edit']['title']) ?>
-  }
-
-  public function getNewTitle()
-  {
-    return '<?php echo $this->escapeString(isset($this->config['new']['title']) ? $this->config['new']['title'] : 'New '.sfInflector::humanize($this->getModuleName())) ?>';
-<?php unset($this->config['new']['title']) ?>
-  }
-
-  public function getFilterDisplay()
-  {
-    return <?php echo $this->asPhp(isset($this->config['filter']['display']) ? $this->config['filter']['display'] : array()) ?>;
-<?php unset($this->config['filter']['display']) ?>
-  }
-
-  public function getFormDisplay()
-  {
-    return <?php echo $this->asPhp(isset($this->config['form']['display']) ? $this->config['form']['display'] : array()) ?>;
-<?php unset($this->config['form']['display']) ?>
-  }
-
-  public function getEditDisplay()
-  {
-    return <?php echo $this->asPhp(isset($this->config['edit']['display']) ? $this->config['edit']['display'] : array()) ?>;
-<?php unset($this->config['edit']['display']) ?>
-  }
-
-  public function getNewDisplay()
-  {
-    return <?php echo $this->asPhp(isset($this->config['new']['display']) ? $this->config['new']['display'] : array()) ?>;
-<?php unset($this->config['new']['display']) ?>
-  }
-
-  public function getListDisplay()
-  {
-<?php if (isset($this->config['list']['display'])): ?>
-    return <?php echo $this->asPhp($this->config['list']['display']) ?>;
-<?php elseif (isset($this->config['list']['hide'])): ?>
-    return <?php echo $this->asPhp(array_diff($this->getAllFieldNames(false), $this->config['list']['hide'])) ?>;
-<?php else: ?>
-    return <?php echo $this->asPhp($this->getAllFieldNames(false)) ?>;
-<?php endif; ?>
-<?php unset($this->config['list']['display'], $this->config['list']['hide']) ?>
-  }
-
-  public function getFieldsDefault()
-  {
-    return array(
-<?php foreach ($this->getDefaultFieldsConfiguration() as $name => $params): ?>
-      '<?php echo $name ?>' => <?php echo $this->asPhp($params) ?>,
-<?php endforeach; ?>
-    );
-  }
-
-<?php foreach (array('list', 'filter', 'form', 'edit', 'new') as $context): ?>
-  public function getFields<?php echo ucfirst($context) ?>()
-  {
-    return array(
-<?php foreach ($this->getFieldsConfiguration($context) as $name => $params): ?>
-      '<?php echo $name ?>' => <?php echo $this->asPhp($params) ?>,
-<?php endforeach; ?>
-    );
-  }
-
-<?php endforeach; ?>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/filterAction.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/filterAction.php
deleted file mode 100644
index 377d1e662..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/filterAction.php
+++ /dev/null
@@ -1,26 +0,0 @@
-  public function executeFilter(sfWebRequest $request)
-  {
-    $this->setPage(1);
-
-    if ($request->hasParameter('_reset'))
-    {
-      $this->setFilters($this->configuration->getFilterDefaults());
-
-      $this->redirect('@<?php echo $this->getUrlForAction('list') ?>');
-    }
-
-    $this->filters = $this->configuration->getFilterForm($this->getFilters());
-
-    $this->filters->bind($request->getParameter($this->filters->getName()));
-    if ($this->filters->isValid())
-    {
-      $this->setFilters($this->filters->getValues());
-
-      $this->redirect('@<?php echo $this->getUrlForAction('list') ?>');
-    }
-
-    $this->pager = $this->getPager();
-    $this->sort = $this->getSort();
-
-    $this->setTemplate('index');
-  }
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/filtersAction.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/filtersAction.php
deleted file mode 100644
index f4785b630..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/filtersAction.php
+++ /dev/null
@@ -1,9 +0,0 @@
-  protected function getFilters()
-  {
-    return $this->getUser()->getAttribute('<?php echo $this->getModuleName() ?>.filters', $this->configuration->getFilterDefaults(), 'admin_module');
-  }
-
-  protected function setFilters(array $filters)
-  {
-    return $this->getUser()->setAttribute('<?php echo $this->getModuleName() ?>.filters', $filters, 'admin_module');
-  }
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/indexAction.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/indexAction.php
deleted file mode 100644
index 1de77ebf8..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/indexAction.php
+++ /dev/null
@@ -1,17 +0,0 @@
-  public function executeIndex(sfWebRequest $request)
-  {
-    // sorting
-    if ($request->getParameter('sort') && $this->isValidSortColumn($request->getParameter('sort')))
-    {
-      $this->setSort(array($request->getParameter('sort'), $request->getParameter('sort_type')));
-    }
-
-    // pager
-    if ($request->getParameter('page'))
-    {
-      $this->setPage($request->getParameter('page'));
-    }
-
-    $this->pager = $this->getPager();
-    $this->sort = $this->getSort();
-  }
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/newAction.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/newAction.php
deleted file mode 100644
index 24903513d..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/newAction.php
+++ /dev/null
@@ -1,5 +0,0 @@
-  public function executeNew(sfWebRequest $request)
-  {
-    $this->form = $this->configuration->getForm();
-    $this-><?php echo $this->getSingularName() ?> = $this->form->getObject();
-  }
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/paginationAction.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/paginationAction.php
deleted file mode 100644
index 8ddcdbd43..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/paginationAction.php
+++ /dev/null
@@ -1,42 +0,0 @@
-  protected function getPager()
-  {
-    $pager = $this->configuration->getPager('<?php echo $this->getModelClass() ?>');
-    $pager->setCriteria($this->buildCriteria());
-    $pager->setPage($this->getPage());
-    $pager->setPeerMethod($this->configuration->getPeerMethod());
-    $pager->setPeerCountMethod($this->configuration->getPeerCountMethod());
-    $pager->init();
-
-    return $pager;
-  }
-
-  protected function setPage($page)
-  {
-    $this->getUser()->setAttribute('<?php echo $this->getModuleName() ?>.page', $page, 'admin_module');
-  }
-
-  protected function getPage()
-  {
-    return $this->getUser()->getAttribute('<?php echo $this->getModuleName() ?>.page', 1, 'admin_module');
-  }
-
-  protected function buildCriteria()
-  {
-<?php if ($this->configuration->hasFilterForm()): ?>
-    if (null === $this->filters)
-    {
-      $this->filters = $this->configuration->getFilterForm($this->getFilters());
-    }
-
-    $criteria = $this->filters->buildCriteria($this->getFilters());
-<?php else: ?>
-    $criteria = new Criteria();
-<?php endif; ?>
-
-    $this->addSortCriteria($criteria);
-
-    $event = $this->dispatcher->filter(new sfEvent($this, 'admin.build_criteria'), $criteria);
-    $criteria = $event->getReturnValue();
-
-    return $criteria;
-  }
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/paginationConfiguration.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/paginationConfiguration.php
deleted file mode 100644
index 8480e6a8f..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/paginationConfiguration.php
+++ /dev/null
@@ -1,11 +0,0 @@
-  public function getPagerClass()
-  {
-    return '<?php echo isset($this->config['list']['pager_class']) ? $this->config['list']['pager_class'] : 'sfPropelPager' ?>';
-<?php unset($this->config['list']['pager_class']) ?>
-  }
-
-  public function getPagerMaxPerPage()
-  {
-    return <?php echo isset($this->config['list']['max_per_page']) ? (integer) $this->config['list']['max_per_page'] : 20 ?>;
-<?php unset($this->config['list']['max_per_page']) ?>
-  }
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/processFormAction.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/processFormAction.php
deleted file mode 100644
index 23a16dd3a..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/processFormAction.php
+++ /dev/null
@@ -1,29 +0,0 @@
-  protected function processForm(sfWebRequest $request, sfForm $form)
-  {
-    $form->bind($request->getParameter($form->getName()), $request->getFiles($form->getName()));
-    if ($form->isValid())
-    {
-      $notice = $form->getObject()->isNew() ? 'The item was created successfully.' : 'The item was updated successfully.';
-
-      $<?php echo $this->getSingularName() ?> = $form->save();
-
-      $this->dispatcher->notify(new sfEvent($this, 'admin.save_object', array('object' => $<?php echo $this->getSingularName() ?>)));
-
-      if ($request->hasParameter('_save_and_add'))
-      {
-        $this->getUser()->setFlash('notice', $notice.' You can add another one below.');
-
-        $this->redirect('@<?php echo $this->getUrlForAction('new') ?>');
-      }
-      else
-      {
-        $this->getUser()->setFlash('notice', $notice);
-
-        $this->redirect(array('sf_route' => '<?php echo $this->getUrlForAction('edit') ?>', 'sf_subject' => $<?php echo $this->getSingularName() ?>));
-      }
-    }
-    else
-    {
-      $this->getUser()->setFlash('error', 'The item has not been saved due to some errors.', false);
-    }
-  }
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/sortingAction.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/sortingAction.php
deleted file mode 100644
index b4eee0c80..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/sortingAction.php
+++ /dev/null
@@ -1,44 +0,0 @@
-  protected function addSortCriteria($criteria)
-  {
-    if (array(null, null) == ($sort = $this->getSort()))
-    {
-      return;
-    }
-
-    $column = <?php echo constant($this->getModelClass().'::PEER') ?>::translateFieldName($sort[0], BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_COLNAME);
-    if ('asc' == $sort[1])
-    {
-      $criteria->addAscendingOrderByColumn($column);
-    }
-    else
-    {
-      $criteria->addDescendingOrderByColumn($column);
-    }
-  }
-
-  protected function getSort()
-  {
-    if (null !== $sort = $this->getUser()->getAttribute('<?php echo $this->getModuleName() ?>.sort', null, 'admin_module'))
-    {
-      return $sort;
-    }
-
-    $this->setSort($this->configuration->getDefaultSort());
-
-    return $this->getUser()->getAttribute('<?php echo $this->getModuleName() ?>.sort', null, 'admin_module');
-  }
-
-  protected function setSort(array $sort)
-  {
-    if (null !== $sort[0] && null === $sort[1])
-    {
-      $sort[1] = 'asc';
-    }
-
-    $this->getUser()->setAttribute('<?php echo $this->getModuleName() ?>.sort', $sort, 'admin_module');
-  }
-
-  protected function isValidSortColumn($column)
-  {
-    return in_array($column, BasePeer::getFieldnames('<?php echo $this->getModelClass() ?>', BasePeer::TYPE_FIELDNAME));
-  }
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/sortingConfiguration.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/sortingConfiguration.php
deleted file mode 100644
index c52479324..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/sortingConfiguration.php
+++ /dev/null
@@ -1,10 +0,0 @@
-  public function getDefaultSort()
-  {
-<?php if ($sort = (isset($this->config['list']['sort']) ? $this->config['list']['sort'] : false)): ?>
-<?php if (!is_array($sort)) $sort = array($sort, 'asc'); ?>
-    return array('<?php echo $sort[0] ?>', '<?php echo isset($sort[1]) ? $sort[1] : 'asc' ?>');
-<?php else: ?>
-    return array(null, null);
-<?php endif; ?>
-<?php unset($this->config['list']['sort']) ?>
-  }
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/updateAction.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/updateAction.php
deleted file mode 100644
index 958a04a35..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/parts/updateAction.php
+++ /dev/null
@@ -1,9 +0,0 @@
-  public function executeUpdate(sfWebRequest $request)
-  {
-    $this-><?php echo $this->getSingularName() ?> = $this->getRoute()->getObject();
-    $this->form = $this->configuration->getForm($this-><?php echo $this->getSingularName() ?>);
-
-    $this->processForm($request, $this->form);
-
-    $this->setTemplate('edit');
-  }
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/skeleton/actions/actions.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/skeleton/actions/actions.class.php
deleted file mode 100644
index 17fda269a..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/skeleton/actions/actions.class.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-require_once dirname(__FILE__).'/../lib/##MODULE_NAME##GeneratorConfiguration.class.php';
-require_once dirname(__FILE__).'/../lib/##MODULE_NAME##GeneratorHelper.class.php';
-
-/**
- * ##MODULE_NAME## actions.
- *
- * @package    ##PROJECT_NAME##
- * @subpackage ##MODULE_NAME##
- * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: actions.class.php 12474 2008-10-31 10:41:27Z fabien $
- */
-class ##MODULE_NAME##Actions extends auto##UC_MODULE_NAME##Actions
-{
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/skeleton/config/generator.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/skeleton/config/generator.yml
deleted file mode 100644
index 11f0463d9..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/skeleton/config/generator.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-generator:
-  class: sfPropelGenerator
-  param:
-##CONFIG##
-
-    config:
-      actions: ~
-      fields:  ~
-      list:    ~
-      filter:  ~
-      form:    ~
-      edit:    ~
-      new:     ~
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/skeleton/lib/configuration.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/skeleton/lib/configuration.php
deleted file mode 100644
index a55c0cded..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/skeleton/lib/configuration.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-/**
- * ##MODULE_NAME## module configuration.
- *
- * @package    ##PROJECT_NAME##
- * @subpackage ##MODULE_NAME##
- * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: configuration.php 12474 2008-10-31 10:41:27Z fabien $
- */
-class ##MODULE_NAME##GeneratorConfiguration extends Base##UC_MODULE_NAME##GeneratorConfiguration
-{
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/skeleton/lib/helper.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/skeleton/lib/helper.php
deleted file mode 100644
index 3f764db44..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/skeleton/lib/helper.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-/**
- * ##MODULE_NAME## module helper.
- *
- * @package    ##PROJECT_NAME##
- * @subpackage ##MODULE_NAME##
- * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: helper.php 12474 2008-10-31 10:41:27Z fabien $
- */
-class ##MODULE_NAME##GeneratorHelper extends Base##UC_MODULE_NAME##GeneratorHelper
-{
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/skeleton/templates/.sf b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/skeleton/templates/.sf
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/actions/actions.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/actions/actions.class.php
deleted file mode 100644
index 99a55ff03..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/actions/actions.class.php
+++ /dev/null
@@ -1,60 +0,0 @@
-[?php
-
-require_once(dirname(__FILE__).'/../lib/Base<?php echo ucfirst($this->moduleName) ?>GeneratorConfiguration.class.php');
-require_once(dirname(__FILE__).'/../lib/Base<?php echo ucfirst($this->moduleName) ?>GeneratorHelper.class.php');
-
-/**
- * <?php echo $this->getModuleName() ?> actions.
- *
- * @package    ##PROJECT_NAME##
- * @subpackage <?php echo $this->getModuleName()."\n" ?>
- * @author     ##AUTHOR_NAME##
- */
-abstract class <?php echo $this->getGeneratedModuleName() ?>Actions extends <?php echo $this->getActionsBaseClass()."\n" ?>
-{
-  public function preExecute()
-  {
-    $this->configuration = new <?php echo $this->getModuleName() ?>GeneratorConfiguration();
-
-    if (!$this->getUser()->hasCredential($this->configuration->getCredentials($this->getActionName())))
-    {
-      $this->forward(sfConfig::get('sf_secure_module'), sfConfig::get('sf_secure_action'));
-    }
-
-    $this->dispatcher->notify(new sfEvent($this, 'admin.pre_execute', array('configuration' => $this->configuration)));
-
-    $this->helper = new <?php echo $this->getModuleName() ?>GeneratorHelper();
-
-    parent::preExecute();
-  }
-
-<?php include dirname(__FILE__).'/../../parts/indexAction.php' ?>
-
-<?php if ($this->configuration->hasFilterForm()): ?>
-<?php include dirname(__FILE__).'/../../parts/filterAction.php' ?>
-<?php endif; ?>
-
-<?php include dirname(__FILE__).'/../../parts/newAction.php' ?>
-
-<?php include dirname(__FILE__).'/../../parts/createAction.php' ?>
-
-<?php include dirname(__FILE__).'/../../parts/editAction.php' ?>
-
-<?php include dirname(__FILE__).'/../../parts/updateAction.php' ?>
-
-<?php include dirname(__FILE__).'/../../parts/deleteAction.php' ?>
-
-<?php if ($this->configuration->getValue('list.batch_actions')): ?>
-<?php include dirname(__FILE__).'/../../parts/batchAction.php' ?>
-<?php endif; ?>
-
-<?php include dirname(__FILE__).'/../../parts/processFormAction.php' ?>
-
-<?php if ($this->configuration->hasFilterForm()): ?>
-<?php include dirname(__FILE__).'/../../parts/filtersAction.php' ?>
-<?php endif; ?>
-
-<?php include dirname(__FILE__).'/../../parts/paginationAction.php' ?>
-
-<?php include dirname(__FILE__).'/../../parts/sortingAction.php' ?>
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/lib/helper.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/lib/helper.php
deleted file mode 100644
index 290124bed..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/lib/helper.php
+++ /dev/null
@@ -1,16 +0,0 @@
-[?php
-
-/**
- * <?php echo $this->getModuleName() ?> module configuration.
- *
- * @package    ##PROJECT_NAME##
- * @subpackage <?php echo $this->getModuleName()."\n" ?>
- * @author     ##AUTHOR_NAME##
- */
-abstract class Base<?php echo ucfirst($this->getModuleName()) ?>GeneratorHelper extends sfModelGeneratorHelper
-{
-  public function getUrlForAction($action)
-  {
-    return 'list' == $action ? '<?php echo $this->params['route_prefix'] ?>' : '<?php echo $this->params['route_prefix'] ?>_'.$action;
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_assets.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_assets.php
deleted file mode 100644
index f307e0c68..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_assets.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php if (isset($this->params['css']) && ($this->params['css'] !== false)): ?> 
-[?php use_stylesheet('<?php echo $this->params['css'] ?>', 'first') ?] 
-<?php elseif(!isset($this->params['css'])): ?> 
-[?php use_stylesheet('<?php echo sfConfig::get('sf_admin_module_web_dir').'/css/global.css' ?>', 'first') ?] 
-[?php use_stylesheet('<?php echo sfConfig::get('sf_admin_module_web_dir').'/css/default.css' ?>', 'first') ?] 
-<?php endif; ?>
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_filters.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_filters.php
deleted file mode 100644
index b8259edb3..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_filters.php
+++ /dev/null
@@ -1,36 +0,0 @@
-[?php use_stylesheets_for_form($form) ?]
-[?php use_javascripts_for_form($form) ?]
-
-<div class="sf_admin_filter">
-  [?php if ($form->hasGlobalErrors()): ?]
-    [?php echo $form->renderGlobalErrors() ?]
-  [?php endif; ?]
-
-  <form action="[?php echo url_for('<?php echo $this->getUrlForAction('collection') ?>', array('action' => 'filter')) ?]" method="post">
-    <table cellspacing="0">
-      <tfoot>
-        <tr>
-          <td colspan="2">
-            [?php echo $form->renderHiddenFields() ?]
-            [?php echo link_to(__('Reset', array(), 'sf_admin'), '<?php echo $this->getUrlForAction('collection') ?>', array('action' => 'filter'), array('query_string' => '_reset', 'method' => 'post')) ?]
-            <input type="submit" value="[?php echo __('Filter', array(), 'sf_admin') ?]" />
-          </td>
-        </tr>
-      </tfoot>
-      <tbody>
-        [?php foreach ($configuration->getFormFilterFields($form) as $name => $field): ?]
-        [?php if ((isset($form[$name]) && $form[$name]->isHidden()) || (!isset($form[$name]) && $field->isReal())) continue ?]
-          [?php include_partial('<?php echo $this->getModuleName() ?>/filters_field', array(
-            'name'       => $name,
-            'attributes' => $field->getConfig('attributes', array()),
-            'label'      => $field->getConfig('label'),
-            'help'       => $field->getConfig('help'),
-            'form'       => $form,
-            'field'      => $field,
-            'class'      => 'sf_admin_form_row sf_admin_'.strtolower($field->getType()).' sf_admin_filter_field_'.$name,
-          )) ?]
-        [?php endforeach; ?]
-      </tbody>
-    </table>
-  </form>
-</div>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_filters_field.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_filters_field.php
deleted file mode 100644
index 749ecc868..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_filters_field.php
+++ /dev/null
@@ -1,20 +0,0 @@
-[?php if ($field->isPartial()): ?]
-  [?php include_partial('<?php echo $this->getModuleName() ?>/'.$name, array('type' => 'filter', 'form' => $form, 'attributes' => $attributes instanceof sfOutputEscaper ? $attributes->getRawValue() : $attributes)) ?]
-[?php elseif ($field->isComponent()): ?]
-  [?php include_component('<?php echo $this->getModuleName() ?>', $name, array('type' => 'filter', 'form' => $form, 'attributes' => $attributes instanceof sfOutputEscaper ? $attributes->getRawValue() : $attributes)) ?]
-[?php else: ?]
-  <tr class="[?php echo $class ?]">
-    <td>
-      [?php echo $form[$name]->renderLabel($label) ?]
-    </td>
-    <td>
-      [?php echo $form[$name]->renderError() ?]
-
-      [?php echo $form[$name]->render($attributes instanceof sfOutputEscaper ? $attributes->getRawValue() : $attributes) ?]
-
-      [?php if ($help || $help = $form[$name]->renderHelp()): ?]
-        <div class="help">[?php echo __($help, array(), '<?php echo $this->getI18nCatalogue() ?>') ?]</div>
-      [?php endif; ?]
-    </td>
-  </tr>
-[?php endif; ?]
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_flashes.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_flashes.php
deleted file mode 100644
index da049da0b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_flashes.php
+++ /dev/null
@@ -1,7 +0,0 @@
-[?php if ($sf_user->hasFlash('notice')): ?]
-  <div class="notice">[?php echo __($sf_user->getFlash('notice'), array(), 'sf_admin') ?]</div>
-[?php endif; ?]
-
-[?php if ($sf_user->hasFlash('error')): ?]
-  <div class="error">[?php echo __($sf_user->getFlash('error'), array(), 'sf_admin') ?]</div>
-[?php endif; ?]
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_form.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_form.php
deleted file mode 100644
index c07123c2c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_form.php
+++ /dev/null
@@ -1,18 +0,0 @@
-[?php use_stylesheets_for_form($form) ?]
-[?php use_javascripts_for_form($form) ?]
-
-<div class="sf_admin_form">
-  [?php echo form_tag_for($form, '@<?php echo $this->params['route_prefix'] ?>') ?]
-    [?php echo $form->renderHiddenFields(false) ?]
-
-    [?php if ($form->hasGlobalErrors()): ?]
-      [?php echo $form->renderGlobalErrors() ?]
-    [?php endif; ?]
-
-    [?php foreach ($configuration->getFormFields($form, $form->isNew() ? 'new' : 'edit') as $fieldset => $fields): ?]
-      [?php include_partial('<?php echo $this->getModuleName() ?>/form_fieldset', array('<?php echo $this->getSingularName() ?>' => $<?php echo $this->getSingularName() ?>, 'form' => $form, 'fields' => $fields, 'fieldset' => $fieldset)) ?]
-    [?php endforeach; ?]
-
-    [?php include_partial('<?php echo $this->getModuleName() ?>/form_actions', array('<?php echo $this->getSingularName() ?>' => $<?php echo $this->getSingularName() ?>, 'form' => $form, 'configuration' => $configuration, 'helper' => $helper)) ?]
-  </form>
-</div>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_form_actions.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_form_actions.php
deleted file mode 100644
index c3d66bbeb..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_form_actions.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<ul class="sf_admin_actions">
-<?php foreach (array('new', 'edit') as $action): ?>
-<?php if ('new' == $action): ?>
-[?php if ($form->isNew()): ?]
-<?php else: ?>
-[?php else: ?]
-<?php endif; ?>
-<?php foreach ($this->configuration->getValue($action.'.actions') as $name => $params): ?>
-<?php if ('_delete' == $name): ?>
-  <?php echo $this->addCredentialCondition('[?php echo $helper->linkToDelete($form->getObject(), '.$this->asPhp($params).') ?]', $params) ?>
-
-<?php elseif ('_list' == $name): ?>
-  <?php echo $this->addCredentialCondition('[?php echo $helper->linkToList('.$this->asPhp($params).') ?]', $params) ?>
-
-<?php elseif ('_save' == $name): ?>
-  <?php echo $this->addCredentialCondition('[?php echo $helper->linkToSave($form->getObject(), '.$this->asPhp($params).') ?]', $params) ?>
-
-<?php elseif ('_save_and_add' == $name): ?>
-  <?php echo $this->addCredentialCondition('[?php echo $helper->linkToSaveAndAdd($form->getObject(), '.$this->asPhp($params).') ?]', $params) ?>
-
-<?php else: ?>
-  <li class="sf_admin_action_<?php echo $params['class_suffix'] ?>">
-[?php if (method_exists($helper, 'linkTo<?php echo $method = ucfirst(sfInflector::camelize($name)) ?>')): ?]
-  <?php echo $this->addCredentialCondition('[?php echo $helper->linkTo'.$method.'($form->getObject(), '.$this->asPhp($params).') ?]', $params) ?>
-
-[?php else: ?]
-  <?php echo $this->addCredentialCondition($this->getLinkToAction($name, $params, true), $params) ?>
-
-[?php endif; ?]
-  </li>
-<?php endif; ?>
-<?php endforeach; ?>
-<?php endforeach; ?>
-[?php endif; ?]
-</ul>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_form_field.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_form_field.php
deleted file mode 100644
index a7111ff60..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_form_field.php
+++ /dev/null
@@ -1,20 +0,0 @@
-[?php if ($field->isPartial()): ?]
-  [?php include_partial('<?php echo $this->getModuleName() ?>/'.$name, array('form' => $form, 'attributes' => $attributes instanceof sfOutputEscaper ? $attributes->getRawValue() : $attributes)) ?]
-[?php elseif ($field->isComponent()): ?]
-  [?php include_component('<?php echo $this->getModuleName() ?>', $name, array('form' => $form, 'attributes' => $attributes instanceof sfOutputEscaper ? $attributes->getRawValue() : $attributes)) ?]
-[?php else: ?]
-  <div class="[?php echo $class ?][?php $form[$name]->hasError() and print ' errors' ?]">
-    [?php echo $form[$name]->renderError() ?]
-    <div>
-      [?php echo $form[$name]->renderLabel($label) ?]
-
-      <div class="content">[?php echo $form[$name]->render($attributes instanceof sfOutputEscaper ? $attributes->getRawValue() : $attributes) ?]</div>
-
-      [?php if ($help): ?]
-        <div class="help">[?php echo __($help, array(), '<?php echo $this->getI18nCatalogue() ?>') ?]</div>
-      [?php elseif ($help = $form[$name]->renderHelp()): ?]
-        <div class="help">[?php echo $help ?]</div>
-      [?php endif; ?]
-    </div>
-  </div>
-[?php endif; ?]
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_form_fieldset.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_form_fieldset.php
deleted file mode 100644
index ae30a30e6..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_form_fieldset.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<fieldset id="sf_fieldset_[?php echo preg_replace('/[^a-z0-9_]/', '_', strtolower($fieldset)) ?]">
-  [?php if ('NONE' != $fieldset): ?]
-    <h2>[?php echo __($fieldset, array(), '<?php echo $this->getI18nCatalogue() ?>') ?]</h2>
-  [?php endif; ?]
-
-  [?php foreach ($fields as $name => $field): ?]
-    [?php if ((isset($form[$name]) && $form[$name]->isHidden()) || (!isset($form[$name]) && $field->isReal())) continue ?]
-    [?php include_partial('<?php echo $this->getModuleName() ?>/form_field', array(
-      'name'       => $name,
-      'attributes' => $field->getConfig('attributes', array()),
-      'label'      => $field->getConfig('label'),
-      'help'       => $field->getConfig('help'),
-      'form'       => $form,
-      'field'      => $field,
-      'class'      => 'sf_admin_form_row sf_admin_'.strtolower($field->getType()).' sf_admin_form_field_'.$name,
-    )) ?]
-  [?php endforeach; ?]
-</fieldset>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_form_footer.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_form_footer.php
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_form_header.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_form_header.php
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list.php
deleted file mode 100644
index ae2b0c55f..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<div class="sf_admin_list">
-  [?php if (!$pager->getNbResults()): ?]
-    <p>[?php echo __('No result', array(), 'sf_admin') ?]</p>
-  [?php else: ?]
-    <table cellspacing="0">
-      <thead>
-        <tr>
-<?php if ($this->configuration->getValue('list.batch_actions')): ?>
-          <th id="sf_admin_list_batch_actions"><input id="sf_admin_list_batch_checkbox" type="checkbox" onclick="checkAll();" /></th>
-<?php endif; ?>
-          [?php include_partial('<?php echo $this->getModuleName() ?>/list_th_<?php echo $this->configuration->getValue('list.layout') ?>', array('sort' => $sort)) ?]
-<?php if ($this->configuration->getValue('list.object_actions')): ?>
-          <th id="sf_admin_list_th_actions">[?php echo __('Actions', array(), 'sf_admin') ?]</th>
-<?php endif; ?>
-        </tr>
-      </thead>
-      <tfoot>
-        <tr>
-          <th colspan="<?php echo count($this->configuration->getValue('list.display')) + ($this->configuration->getValue('list.object_actions') ? 1 : 0) + ($this->configuration->getValue('list.batch_actions') ? 1 : 0) ?>">
-            [?php if ($pager->haveToPaginate()): ?]
-              [?php include_partial('<?php echo $this->getModuleName() ?>/pagination', array('pager' => $pager)) ?]
-            [?php endif; ?]
-
-            [?php echo format_number_choice('[0] no result|[1] 1 result|(1,+Inf] %1% results', array('%1%' => $pager->getNbResults()), $pager->getNbResults(), 'sf_admin') ?]
-            [?php if ($pager->haveToPaginate()): ?]
-              [?php echo __('(page %%page%%/%%nb_pages%%)', array('%%page%%' => $pager->getPage(), '%%nb_pages%%' => $pager->getLastPage()), 'sf_admin') ?]
-            [?php endif; ?]
-          </th>
-        </tr>
-      </tfoot>
-      <tbody>
-        [?php foreach ($pager->getResults() as $i => $<?php echo $this->getSingularName() ?>): $odd = fmod(++$i, 2) ? 'odd' : 'even' ?]
-          <tr class="sf_admin_row [?php echo $odd ?]">
-<?php if ($this->configuration->getValue('list.batch_actions')): ?>
-            [?php include_partial('<?php echo $this->getModuleName() ?>/list_td_batch_actions', array('<?php echo $this->getSingularName() ?>' => $<?php echo $this->getSingularName() ?>, 'helper' => $helper)) ?]
-<?php endif; ?>
-            [?php include_partial('<?php echo $this->getModuleName() ?>/list_td_<?php echo $this->configuration->getValue('list.layout') ?>', array('<?php echo $this->getSingularName() ?>' => $<?php echo $this->getSingularName() ?>)) ?]
-<?php if ($this->configuration->getValue('list.object_actions')): ?>
-            [?php include_partial('<?php echo $this->getModuleName() ?>/list_td_actions', array('<?php echo $this->getSingularName() ?>' => $<?php echo $this->getSingularName() ?>, 'helper' => $helper)) ?]
-<?php endif; ?>
-          </tr>
-        [?php endforeach; ?]
-      </tbody>
-    </table>
-  [?php endif; ?]
-</div>
-<script type="text/javascript">
-/* <![CDATA[ */
-function checkAll()
-{
-  var boxes = document.getElementsByTagName('input'); for(var index = 0; index < boxes.length; index++) { box = boxes[index]; if (box.type == 'checkbox' && box.className == 'sf_admin_batch_checkbox') box.checked = document.getElementById('sf_admin_list_batch_checkbox').checked } return true;
-}
-/* ]]> */
-</script>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_actions.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_actions.php
deleted file mode 100644
index 09019a008..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_actions.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php if ($actions = $this->configuration->getValue('list.actions')): ?>
-<?php foreach ($actions as $name => $params): ?>
-<?php if ('_new' == $name): ?>
-<?php echo $this->addCredentialCondition('[?php echo $helper->linkToNew('.$this->asPhp($params).') ?]', $params)."\n" ?>
-<?php else: ?>
-<li class="sf_admin_action_<?php echo $params['class_suffix'] ?>">
-  <?php echo $this->addCredentialCondition($this->getLinkToAction($name, $params, false), $params)."\n" ?>
-</li>
-<?php endif; ?>
-<?php endforeach; ?>
-<?php endif; ?>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_batch_actions.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_batch_actions.php
deleted file mode 100644
index 6f85a5e2a..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_batch_actions.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php if ($listActions = $this->configuration->getValue('list.batch_actions')): ?>
-<li class="sf_admin_batch_actions_choice">
-  <select name="batch_action">
-    <option value="">[?php echo __('Choose an action', array(), 'sf_admin') ?]</option>
-<?php foreach ((array) $listActions as $action => $params): ?>
-    <?php echo $this->addCredentialCondition('<option value="'.$action.'">[?php echo __(\''.$params['label'].'\', array(), \'sf_admin\') ?]</option>', $params) ?>
-
-<?php endforeach; ?>
-  </select>
-  [?php $form = new BaseForm(); if ($form->isCSRFProtected()): ?]
-    <input type="hidden" name="[?php echo $form->getCSRFFieldName() ?]" value="[?php echo $form->getCSRFToken() ?]" />
-  [?php endif; ?]
-  <input type="submit" value="[?php echo __('go', array(), 'sf_admin') ?]" />
-</li>
-<?php endif; ?>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_field_boolean.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_field_boolean.php
deleted file mode 100644
index 85b5dd10b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_field_boolean.php
+++ /dev/null
@@ -1,5 +0,0 @@
-[?php if ($value): ?]
-  [?php echo image_tag(sfConfig::get('sf_admin_module_web_dir').'/images/tick.png', array('alt' => __('Checked', array(), 'sf_admin'), 'title' => __('Checked', array(), 'sf_admin'))) ?]
-[?php else: ?]
-  &nbsp;
-[?php endif; ?]
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_footer.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_footer.php
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_header.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_header.php
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_td_actions.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_td_actions.php
deleted file mode 100644
index 65e302890..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_td_actions.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<td>
-  <ul class="sf_admin_td_actions">
-<?php foreach ($this->configuration->getValue('list.object_actions') as $name => $params): ?>
-<?php if ('_delete' == $name): ?>
-    <?php echo $this->addCredentialCondition('[?php echo $helper->linkToDelete($'.$this->getSingularName().', '.$this->asPhp($params).') ?]', $params) ?>
-
-<?php elseif ('_edit' == $name): ?>
-    <?php echo $this->addCredentialCondition('[?php echo $helper->linkToEdit($'.$this->getSingularName().', '.$this->asPhp($params).') ?]', $params) ?>
-
-<?php else: ?>
-    <li class="sf_admin_action_<?php echo $params['class_suffix'] ?>">
-      <?php echo $this->addCredentialCondition($this->getLinkToAction($name, $params, true), $params) ?>
-
-    </li>
-<?php endif; ?>
-<?php endforeach; ?>
-  </ul>
-</td>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_td_batch_actions.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_td_batch_actions.php
deleted file mode 100644
index 505a41f18..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_td_batch_actions.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<td>
-  <input type="checkbox" name="ids[]" value="[?php echo $<?php echo $this->getSingularName() ?>->getPrimaryKey() ?]" class="sf_admin_batch_checkbox" />
-</td>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_td_stacked.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_td_stacked.php
deleted file mode 100644
index 00639252b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_td_stacked.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<td colspan="<?php echo count($this->configuration->getValue('list.display'))  ?>">
-  [?php echo <?php echo $this->getI18NString('list.params') ?> ?]
-</td>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_td_tabular.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_td_tabular.php
deleted file mode 100644
index 4d56b50ef..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_td_tabular.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php foreach ($this->configuration->getValue('list.display') as $name => $field): ?>
-<?php echo $this->addCredentialCondition(sprintf(<<<EOF
-<td class="sf_admin_%s sf_admin_list_td_%s">
-  [?php echo %s ?]
-</td>
-
-EOF
-, strtolower($field->getType()), $name, $this->renderField($field)), $field->getConfig()) ?>
-<?php endforeach; ?>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_th_stacked.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_th_stacked.php
deleted file mode 100644
index 669386258..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_th_stacked.php
+++ /dev/null
@@ -1 +0,0 @@
-[?php include_partial('<?php echo $this->getModuleName() ?>/list_th_tabular', array('sort' => $sort)) ?]
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_th_tabular.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_th_tabular.php
deleted file mode 100644
index 298b900ee..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_list_th_tabular.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php foreach ($this->configuration->getValue('list.display') as $name => $field): ?>
-[?php slot('sf_admin.current_header') ?]
-<th class="sf_admin_<?php echo strtolower($field->getType()) ?> sf_admin_list_th_<?php echo $name ?>">
-<?php if ($field->isReal()): ?>
-  [?php if ('<?php echo $name ?>' == $sort[0]): ?]
-    [?php echo link_to(__('<?php echo $field->getConfig('label', '', true) ?>', array(), '<?php echo $this->getI18nCatalogue() ?>'), '@<?php echo $this->getUrlForAction('list') ?>', array('query_string' => 'sort=<?php echo $name ?>&sort_type='.($sort[1] == 'asc' ? 'desc' : 'asc'))) ?]
-    [?php echo image_tag(sfConfig::get('sf_admin_module_web_dir').'/images/'.$sort[1].'.png', array('alt' => __($sort[1], array(), 'sf_admin'), 'title' => __($sort[1], array(), 'sf_admin'))) ?]
-  [?php else: ?]
-    [?php echo link_to(__('<?php echo $field->getConfig('label', '', true) ?>', array(), '<?php echo $this->getI18nCatalogue() ?>'), '@<?php echo $this->getUrlForAction('list') ?>', array('query_string' => 'sort=<?php echo $name ?>&sort_type=asc')) ?]
-  [?php endif; ?]
-<?php else: ?>
-  [?php echo __('<?php echo $field->getConfig('label', '', true) ?>', array(), '<?php echo $this->getI18nCatalogue() ?>') ?]
-<?php endif; ?>
-</th>
-[?php end_slot(); ?]
-<?php echo $this->addCredentialCondition("[?php include_slot('sf_admin.current_header') ?]", $field->getConfig()) ?>
-<?php endforeach; ?>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_pagination.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_pagination.php
deleted file mode 100644
index 1760cb974..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/_pagination.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="sf_admin_pagination">
-  <a href="[?php echo url_for('@<?php echo $this->getUrlForAction('list') ?>') ?]?page=1">
-    [?php echo image_tag(sfConfig::get('sf_admin_module_web_dir').'/images/first.png', array('alt' => __('First page', array(), 'sf_admin'), 'title' => __('First page', array(), 'sf_admin'))) ?]
-  </a>
-
-  <a href="[?php echo url_for('@<?php echo $this->getUrlForAction('list') ?>') ?]?page=[?php echo $pager->getPreviousPage() ?]">
-    [?php echo image_tag(sfConfig::get('sf_admin_module_web_dir').'/images/previous.png', array('alt' => __('Previous page', array(), 'sf_admin'), 'title' => __('Previous page', array(), 'sf_admin'))) ?]
-  </a>
-
-  [?php foreach ($pager->getLinks() as $page): ?]
-    [?php if ($page == $pager->getPage()): ?]
-      [?php echo $page ?]
-    [?php else: ?]
-      <a href="[?php echo url_for('@<?php echo $this->getUrlForAction('list') ?>') ?]?page=[?php echo $page ?]">[?php echo $page ?]</a>
-    [?php endif; ?]
-  [?php endforeach; ?]
-
-  <a href="[?php echo url_for('@<?php echo $this->getUrlForAction('list') ?>') ?]?page=[?php echo $pager->getNextPage() ?]">
-    [?php echo image_tag(sfConfig::get('sf_admin_module_web_dir').'/images/next.png', array('alt' => __('Next page', array(), 'sf_admin'), 'title' => __('Next page', array(), 'sf_admin'))) ?]
-  </a>
-
-  <a href="[?php echo url_for('@<?php echo $this->getUrlForAction('list') ?>') ?]?page=[?php echo $pager->getLastPage() ?]">
-    [?php echo image_tag(sfConfig::get('sf_admin_module_web_dir').'/images/last.png', array('alt' => __('Last page', array(), 'sf_admin'), 'title' => __('Last page', array(), 'sf_admin'))) ?]
-  </a>
-</div>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/editSuccess.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/editSuccess.php
deleted file mode 100644
index 2ab44e466..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/editSuccess.php
+++ /dev/null
@@ -1,20 +0,0 @@
-[?php use_helper('I18N', 'Date') ?]
-[?php include_partial('<?php echo $this->getModuleName() ?>/assets') ?]
-
-<div id="sf_admin_container">
-  <h1>[?php echo <?php echo $this->getI18NString('edit.title') ?> ?]</h1>
-
-  [?php include_partial('<?php echo $this->getModuleName() ?>/flashes') ?]
-
-  <div id="sf_admin_header">
-    [?php include_partial('<?php echo $this->getModuleName() ?>/form_header', array('<?php echo $this->getSingularName() ?>' => $<?php echo $this->getSingularName() ?>, 'form' => $form, 'configuration' => $configuration)) ?]
-  </div>
-
-  <div id="sf_admin_content">
-    [?php include_partial('<?php echo $this->getModuleName() ?>/form', array('<?php echo $this->getSingularName() ?>' => $<?php echo $this->getSingularName() ?>, 'form' => $form, 'configuration' => $configuration, 'helper' => $helper)) ?]
-  </div>
-
-  <div id="sf_admin_footer">
-    [?php include_partial('<?php echo $this->getModuleName() ?>/form_footer', array('<?php echo $this->getSingularName() ?>' => $<?php echo $this->getSingularName() ?>, 'form' => $form, 'configuration' => $configuration)) ?]
-  </div>
-</div>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/indexSuccess.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/indexSuccess.php
deleted file mode 100644
index 5ed168a25..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/indexSuccess.php
+++ /dev/null
@@ -1,36 +0,0 @@
-[?php use_helper('I18N', 'Date') ?]
-[?php include_partial('<?php echo $this->getModuleName() ?>/assets') ?]
-
-<div id="sf_admin_container">
-  <h1>[?php echo <?php echo $this->getI18NString('list.title') ?> ?]</h1>
-
-  [?php include_partial('<?php echo $this->getModuleName() ?>/flashes') ?]
-
-  <div id="sf_admin_header">
-    [?php include_partial('<?php echo $this->getModuleName() ?>/list_header', array('pager' => $pager)) ?]
-  </div>
-
-<?php if ($this->configuration->hasFilterForm()): ?>
-  <div id="sf_admin_bar">
-    [?php include_partial('<?php echo $this->getModuleName() ?>/filters', array('form' => $filters, 'configuration' => $configuration)) ?]
-  </div>
-<?php endif; ?>
-
-  <div id="sf_admin_content">
-<?php if ($this->configuration->getValue('list.batch_actions')): ?>
-    <form action="[?php echo url_for('<?php echo $this->getUrlForAction('collection') ?>', array('action' => 'batch')) ?]" method="post">
-<?php endif; ?>
-    [?php include_partial('<?php echo $this->getModuleName() ?>/list', array('pager' => $pager, 'sort' => $sort, 'helper' => $helper)) ?]
-    <ul class="sf_admin_actions">
-      [?php include_partial('<?php echo $this->getModuleName() ?>/list_batch_actions', array('helper' => $helper)) ?]
-      [?php include_partial('<?php echo $this->getModuleName() ?>/list_actions', array('helper' => $helper)) ?]
-    </ul>
-<?php if ($this->configuration->getValue('list.batch_actions')): ?>
-    </form>
-<?php endif; ?>
-  </div>
-
-  <div id="sf_admin_footer">
-    [?php include_partial('<?php echo $this->getModuleName() ?>/list_footer', array('pager' => $pager)) ?]
-  </div>
-</div>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/newSuccess.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/newSuccess.php
deleted file mode 100644
index bc55b698f..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/admin/template/templates/newSuccess.php
+++ /dev/null
@@ -1,20 +0,0 @@
-[?php use_helper('I18N', 'Date') ?]
-[?php include_partial('<?php echo $this->getModuleName() ?>/assets') ?]
-
-<div id="sf_admin_container">
-  <h1>[?php echo <?php echo $this->getI18NString('new.title') ?> ?]</h1>
-
-  [?php include_partial('<?php echo $this->getModuleName() ?>/flashes') ?]
-
-  <div id="sf_admin_header">
-    [?php include_partial('<?php echo $this->getModuleName() ?>/form_header', array('<?php echo $this->getSingularName() ?>' => $<?php echo $this->getSingularName() ?>, 'form' => $form, 'configuration' => $configuration)) ?]
-  </div>
-
-  <div id="sf_admin_content">
-    [?php include_partial('<?php echo $this->getModuleName() ?>/form', array('<?php echo $this->getSingularName() ?>' => $<?php echo $this->getSingularName() ?>, 'form' => $form, 'configuration' => $configuration, 'helper' => $helper)) ?]
-  </div>
-
-  <div id="sf_admin_footer">
-    [?php include_partial('<?php echo $this->getModuleName() ?>/form_footer', array('<?php echo $this->getSingularName() ?>' => $<?php echo $this->getSingularName() ?>, 'form' => $form, 'configuration' => $configuration)) ?]
-  </div>
-</div>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/createAction.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/createAction.php
deleted file mode 100644
index 68c95ac2d..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/createAction.php
+++ /dev/null
@@ -1,13 +0,0 @@
-  public function executeCreate(sfWebRequest $request)
-  {
-<?php if (isset($this->params['with_propel_route']) && $this->params['with_propel_route']): ?>
-<?php else: ?>
-    $this->forward404Unless($request->isMethod(sfRequest::POST));
-
-<?php endif; ?>
-    $this->form = new <?php echo $this->getModelClass().'Form' ?>();
-
-    $this->processForm($request, $this->form);
-
-    $this->setTemplate('new');
-  }
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/deleteAction.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/deleteAction.php
deleted file mode 100644
index 498259115..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/deleteAction.php
+++ /dev/null
@@ -1,17 +0,0 @@
-  public function executeDelete(sfWebRequest $request)
-  {
-    $request->checkCSRFProtection();
-
-<?php if (isset($this->params['with_propel_route']) && $this->params['with_propel_route']): ?>
-    $this->getRoute()->getObject()->delete();
-<?php else: ?>
-    $this->forward404Unless($<?php echo $this->getSingularName() ?> = <?php echo constant($this->getModelClass().'::PEER') ?>::retrieveByPk(<?php echo $this->getRetrieveByPkParamsForAction(43) ?>), sprintf('Object <?php echo $this->getSingularName() ?> does not exist (%s).', <?php echo $this->getRetrieveByPkParamsForAction(43) ?>));
-    $<?php echo $this->getSingularName() ?>->delete();
-<?php endif; ?>
-
-<?php if (isset($this->params['route_prefix']) && $this->params['route_prefix']): ?>
-    $this->redirect('@<?php echo $this->getUrlForAction('list') ?>');
-<?php else: ?>
-    $this->redirect('<?php echo $this->getModuleName() ?>/index');
-<?php endif; ?>
-  }
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/editAction.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/editAction.php
deleted file mode 100644
index b06a03284..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/editAction.php
+++ /dev/null
@@ -1,9 +0,0 @@
-  public function executeEdit(sfWebRequest $request)
-  {
-<?php if (isset($this->params['with_propel_route']) && $this->params['with_propel_route']): ?>
-    $this->form = new <?php echo $this->getModelClass().'Form' ?>($this->getRoute()->getObject());
-<?php else: ?>
-    $this->forward404Unless($<?php echo $this->getSingularName() ?> = <?php echo constant($this->getModelClass().'::PEER') ?>::retrieveByPk(<?php echo $this->getRetrieveByPkParamsForAction(43) ?>), sprintf('Object <?php echo $this->getSingularName() ?> does not exist (%s).', <?php echo $this->getRetrieveByPkParamsForAction(43) ?>));
-    $this->form = new <?php echo $this->getModelClass().'Form' ?>($<?php echo $this->getSingularName() ?>);
-<?php endif; ?>
-  }
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/indexAction.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/indexAction.php
deleted file mode 100644
index a6c967f32..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/indexAction.php
+++ /dev/null
@@ -1,8 +0,0 @@
-  public function executeIndex(sfWebRequest $request)
-  {
-<?php if (isset($this->params['with_propel_route']) && $this->params['with_propel_route']): ?>
-    $this-><?php echo $this->getPluralName() ?> = $this->getRoute()->getObjects();
-<?php else: ?>
-    $this-><?php echo $this->getPluralName() ?> = <?php echo constant($this->getModelClass().'::PEER') ?>::doSelect(new Criteria());
-<?php endif; ?>
-  }
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/newAction.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/newAction.php
deleted file mode 100644
index 526ba5804..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/newAction.php
+++ /dev/null
@@ -1,4 +0,0 @@
-  public function executeNew(sfWebRequest $request)
-  {
-    $this->form = new <?php echo $this->getModelClass().'Form' ?>();
-  }
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/processFormAction.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/processFormAction.php
deleted file mode 100644
index e0eef8ba8..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/processFormAction.php
+++ /dev/null
@@ -1,14 +0,0 @@
-  protected function processForm(sfWebRequest $request, sfForm $form)
-  {
-    $form->bind($request->getParameter($form->getName()), $request->getFiles($form->getName()));
-    if ($form->isValid())
-    {
-      $<?php echo $this->getSingularName() ?> = $form->save();
-
-<?php if (isset($this->params['route_prefix']) && $this->params['route_prefix']): ?>
-      $this->redirect('@<?php echo $this->getUrlForAction('edit') ?>?<?php echo $this->getPrimaryKeyUrlParams() ?>);
-<?php else: ?>
-      $this->redirect('<?php echo $this->getModuleName() ?>/edit?<?php echo $this->getPrimaryKeyUrlParams() ?>);
-<?php endif; ?>
-    }
-  }
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/showAction.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/showAction.php
deleted file mode 100644
index e570bd7f6..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/showAction.php
+++ /dev/null
@@ -1,9 +0,0 @@
-  public function executeShow(sfWebRequest $request)
-  {
-<?php if (isset($this->params['with_propel_route']) && $this->params['with_propel_route']): ?>
-    $this-><?php echo $this->getSingularName() ?> = $this->getRoute()->getObject();
-<?php else: ?>
-    $this-><?php echo $this->getSingularName() ?> = <?php echo constant($this->getModelClass().'::PEER') ?>::retrieveByPk(<?php echo $this->getRetrieveByPkParamsForAction(49) ?>);
-    $this->forward404Unless($this-><?php echo $this->getSingularName() ?>);
-<?php endif; ?>
-  }
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/updateAction.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/updateAction.php
deleted file mode 100644
index eadf8d44d..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/parts/updateAction.php
+++ /dev/null
@@ -1,14 +0,0 @@
-  public function executeUpdate(sfWebRequest $request)
-  {
-<?php if (isset($this->params['with_propel_route']) && $this->params['with_propel_route']): ?>
-    $this->form = new <?php echo $this->getModelClass().'Form' ?>($this->getRoute()->getObject());
-<?php else: ?>
-    $this->forward404Unless($request->isMethod(sfRequest::POST) || $request->isMethod(sfRequest::PUT));
-    $this->forward404Unless($<?php echo $this->getSingularName() ?> = <?php echo constant($this->getModelClass().'::PEER') ?>::retrieveByPk(<?php echo $this->getRetrieveByPkParamsForAction(43) ?>), sprintf('Object <?php echo $this->getSingularName() ?> does not exist (%s).', <?php echo $this->getRetrieveByPkParamsForAction(43) ?>));
-    $this->form = new <?php echo $this->getModelClass().'Form' ?>($<?php echo $this->getSingularName() ?>);
-<?php endif; ?>
-
-    $this->processForm($request, $this->form);
-
-    $this->setTemplate('edit');
-  }
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/skeleton/actions/actions.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/skeleton/actions/actions.class.php
deleted file mode 100644
index ccafb8ce4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/skeleton/actions/actions.class.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-/**
- * ##MODULE_NAME## actions.
- *
- * @package    ##PROJECT_NAME##
- * @subpackage ##MODULE_NAME##
- * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: actions.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
- */
-class ##MODULE_NAME##Actions extends auto##MODULE_NAME##Actions
-{
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/skeleton/config/generator.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/skeleton/config/generator.yml
deleted file mode 100644
index 5e2acad89..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/skeleton/config/generator.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-# You can find more information about this file on the symfony website:
-# http://www.symfony-project.org/reference/1_4/en/06-Admin-Generator
-
-generator:
-  class: sfPropelGenerator
-  param:
-##CONFIG##
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/skeleton/templates/.sf b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/skeleton/templates/.sf
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/template/actions/actions.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/template/actions/actions.class.php
deleted file mode 100644
index e6ac77eaf..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/template/actions/actions.class.php
+++ /dev/null
@@ -1,30 +0,0 @@
-[?php
-
-/**
- * <?php echo $this->getModuleName() ?> actions.
- *
- * @package    ##PROJECT_NAME##
- * @subpackage <?php echo $this->getModuleName()."\n" ?>
- * @author     ##AUTHOR_NAME##
- */
-class <?php echo $this->getGeneratedModuleName() ?>Actions extends <?php echo $this->getActionsBaseClass() ?>
-
-{
-<?php include dirname(__FILE__).'/../../parts/indexAction.php' ?>
-
-<?php if (isset($this->params['with_show']) && $this->params['with_show']): ?>
-<?php include dirname(__FILE__).'/../../parts/showAction.php' ?>
-
-<?php endif; ?>
-<?php include dirname(__FILE__).'/../../parts/newAction.php' ?>
-
-<?php include dirname(__FILE__).'/../../parts/createAction.php' ?>
-
-<?php include dirname(__FILE__).'/../../parts/editAction.php' ?>
-
-<?php include dirname(__FILE__).'/../../parts/updateAction.php' ?>
-
-<?php include dirname(__FILE__).'/../../parts/deleteAction.php' ?>
-
-<?php include dirname(__FILE__).'/../../parts/processFormAction.php' ?>
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/template/templates/_form.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/template/templates/_form.php
deleted file mode 100644
index 7ebe1575a..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/template/templates/_form.php
+++ /dev/null
@@ -1,53 +0,0 @@
-[?php use_stylesheets_for_form($form) ?]
-[?php use_javascripts_for_form($form) ?]
-
-<?php $form = $this->getFormObject() ?>
-<?php if (isset($this->params['route_prefix']) && $this->params['route_prefix']): ?>
-[?php echo form_tag_for($form, '@<?php echo $this->params['route_prefix'] ?>') ?]
-<?php else: ?>
-<form action="[?php echo url_for('<?php echo $this->getModuleName() ?>/'.($form->getObject()->isNew() ? 'create' : 'update').(!$form->getObject()->isNew() ? '?<?php echo $this->getPrimaryKeyUrlParams('$form->getObject()', true) ?> : '')) ?]" method="post" [?php $form->isMultipart() and print 'enctype="multipart/form-data" ' ?]>
-[?php if (!$form->getObject()->isNew()): ?]
-<input type="hidden" name="sf_method" value="put" />
-[?php endif; ?]
-<?php endif;?>
-  <table>
-    <tfoot>
-      <tr>
-        <td colspan="2">
-<?php if (!isset($this->params['non_verbose_templates']) || !$this->params['non_verbose_templates']): ?>
-          [?php echo $form->renderHiddenFields(false) ?]
-<?php endif; ?>
-<?php if (isset($this->params['route_prefix']) && $this->params['route_prefix']): ?>
-          &nbsp;<a href="[?php echo url_for('<?php echo $this->getUrlForAction('list') ?>') ?]">Back to list</a>
-<?php else: ?>
-          &nbsp;<a href="[?php echo url_for('<?php echo $this->getModuleName() ?>/index') ?]">Back to list</a>
-<?php endif; ?>
-          [?php if (!$form->getObject()->isNew()): ?]
-<?php if (isset($this->params['route_prefix']) && $this->params['route_prefix']): ?>
-            &nbsp;[?php echo link_to('Delete', '<?php echo $this->getUrlForAction('delete') ?>', $form->getObject(), array('method' => 'delete', 'confirm' => 'Are you sure?')) ?]
-<?php else: ?>
-            &nbsp;[?php echo link_to('Delete', '<?php echo $this->getModuleName() ?>/delete?<?php echo $this->getPrimaryKeyUrlParams('$form->getObject()', true) ?>, array('method' => 'delete', 'confirm' => 'Are you sure?')) ?]
-<?php endif; ?>
-          [?php endif; ?]
-          <input type="submit" value="Save" />
-        </td>
-      </tr>
-    </tfoot>
-    <tbody>
-<?php if (isset($this->params['non_verbose_templates']) && $this->params['non_verbose_templates']): ?>
-      [?php echo $form ?]
-<?php else: ?>
-      [?php echo $form->renderGlobalErrors() ?]
-<?php foreach ($form as $name => $field): if ($field->isHidden()) continue ?>
-      <tr>
-        <th>[?php echo $form['<?php echo $name ?>']->renderLabel() ?]</th>
-        <td>
-          [?php echo $form['<?php echo $name ?>']->renderError() ?]
-          [?php echo $form['<?php echo $name ?>'] ?]
-        </td>
-      </tr>
-<?php endforeach; ?>
-<?php endif; ?>
-    </tbody>
-  </table>
-</form>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/template/templates/editSuccess.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/template/templates/editSuccess.php
deleted file mode 100644
index 032d848bb..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/template/templates/editSuccess.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>Edit <?php echo sfInflector::humanize($this->getSingularName()) ?></h1>
-
-[?php include_partial('form', array('form' => $form)) ?]
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/template/templates/indexSuccess.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/template/templates/indexSuccess.php
deleted file mode 100644
index 51b3783ee..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/template/templates/indexSuccess.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<h1><?php echo sfInflector::humanize($this->getPluralName()) ?> List</h1>
-
-<table>
-  <thead>
-    <tr>
-<?php foreach ($this->getTableMap()->getColumns() as $column): ?>
-      <th><?php echo sfInflector::humanize(sfInflector::underscore($column->getPhpName())) ?></th>
-<?php endforeach; ?>
-    </tr>
-  </thead>
-  <tbody>
-    [?php foreach ($<?php echo $this->getPluralName() ?> as $<?php echo $this->getSingularName() ?>): ?]
-    <tr>
-<?php foreach ($this->getTableMap()->getColumns() as $column): ?>
-<?php if ($column->isPrimaryKey()): ?>
-<?php if (isset($this->params['route_prefix']) && $this->params['route_prefix']): ?>
-      <td><a href="[?php echo url_for('<?php echo $this->getUrlForAction(isset($this->params['with_show']) && $this->params['with_show'] ? 'show' : 'edit') ?>', $<?php echo $this->getSingularName() ?>) ?]">[?php echo $<?php echo $this->getSingularName() ?>->get<?php echo $column->getPhpName() ?>() ?]</a></td>
-<?php else: ?>
-      <td><a href="[?php echo url_for('<?php echo $this->getModuleName() ?>/<?php echo isset($this->params['with_show']) && $this->params['with_show'] ? 'show' : 'edit' ?>?<?php echo $this->getPrimaryKeyUrlParams() ?>) ?]">[?php echo $<?php echo $this->getSingularName() ?>->get<?php echo $column->getPhpName() ?>() ?]</a></td>
-<?php endif; ?>
-<?php else: ?>
-      <td>[?php echo $<?php echo $this->getSingularName() ?>->get<?php echo $column->getPhpName() ?>() ?]</td>
-<?php endif; ?>
-<?php endforeach; ?>
-    </tr>
-    [?php endforeach; ?]
-  </tbody>
-</table>
-
-<?php if (isset($this->params['route_prefix']) && $this->params['route_prefix']): ?>
-  <a href="[?php echo url_for('<?php echo $this->getUrlForAction('new') ?>') ?]">New</a>
-<?php else: ?>
-  <a href="[?php echo url_for('<?php echo $this->getModuleName() ?>/new') ?]">New</a>
-<?php endif; ?>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/template/templates/newSuccess.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/template/templates/newSuccess.php
deleted file mode 100644
index 3f4f2330d..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/template/templates/newSuccess.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>New <?php echo sfInflector::humanize($this->getSingularName()) ?></h1>
-
-[?php include_partial('form', array('form' => $form)) ?]
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/template/templates/showSuccess.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/template/templates/showSuccess.php
deleted file mode 100644
index f06339116..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/data/generator/sfPropelModule/default/template/templates/showSuccess.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<table>
-  <tbody>
-<?php foreach ($this->getTableMap()->getColumns() as $column): ?>
-    <tr>
-      <th><?php echo sfInflector::humanize(sfInflector::underscore($column->getPhpName())) ?>:</th>
-      <td>[?php echo $<?php echo $this->getSingularName() ?>->get<?php echo $column->getPhpName() ?>() ?]</td>
-    </tr>
-<?php endforeach; ?>
-  </tbody>
-</table>
-
-<hr />
-
-<?php if (isset($this->params['route_prefix']) && $this->params['route_prefix']): ?>
-<a href="[?php echo url_for('<?php echo $this->getUrlForAction('edit') ?>', $<?php echo $this->getSingularName() ?>) ?]">Edit</a>
-&nbsp;
-<a href="[?php echo url_for('<?php echo $this->getUrlForAction('list') ?>') ?]">List</a>
-<?php else: ?>
-<a href="[?php echo url_for('<?php echo $this->getModuleName() ?>/edit?<?php echo $this->getPrimaryKeyUrlParams() ?>) ?]">Edit</a>
-&nbsp;
-<a href="[?php echo url_for('<?php echo $this->getModuleName() ?>/index') ?]">List</a>
-<?php endif; ?>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.ar.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.ar.xml
deleted file mode 100644
index c076fb521..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.ar.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>جديد</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>تحديث</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>حذف</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>لائحة</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-         <target>حفظ</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>حفظ و إضافة</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>إلغاء</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>مسح</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>فرز</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>لا توجد نتائج</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>إجراءات</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(%%nb_pages%%/%%page%% صفحة)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>تصاعدي</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>تنازلي</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>الأولى</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>الصفحة السابقة</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>الصفحة الاحقة</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>الاخيرة</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>.تمت الإضافة بنجاح</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-       <target>.تم التحديث بنجاح</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>.تمت الإضافة بنجاح. يمكنك إضافة آخر</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>.تم التحديث بنجاح. يمكنك إضافة آخر</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>.لم يتم التحديث</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>.تم الحذف بنجاح</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>.يجب اختيار عنصر واحد على الأقل</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>.يجب اختيار عمل للتنفيذ ضمن العناصر المختارة</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>.حال مشكل دون عملية الحذف للعناصر المختارة لأن بعضها غير موجود</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>.تم حذف العناصر المختارة بنجاح</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>.حال مشكل أثناء عملية الحذف للعناصر المختارة</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.bg.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.bg.xml
deleted file mode 100644
index 8d38fdc1c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.bg.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Нов</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Редакция</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Изтриване</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Списък</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Съхраняване</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Съхраняване и Добавяне</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Отказ</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Choose an action</source>
-        <target>Избери действие</target>
-      </trans-unit>
-      <trans-unit>
-        <source>go</source>
-        <target>ок</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Нулиране</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Филтър</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Няма резултати</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Действия</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(страница %%page%% от %%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>възходящ</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>низходящ</target>
-      </trans-unit>
-      <trans-unit>
-        <source>[0] no result|[1] 1 result|(1,+Inf] %1% results</source>
-        <target>[0] няма резултати|[1] 1 резултат|(1,+Inf] %1% резултата</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Първа страница</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Предишна страница</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Следваща страница</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Последна страница</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>Записът беше създаден успешно.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>Записът беше успешно обновен.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>Записът беше създаден успешно. Можете да добавите друг.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>Записът беше успешно обновен. Можете да добавите друг.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>Записът не беше запазен поради грешки.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>Записът беше успешно изтрит.</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.ca.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.ca.xml
deleted file mode 100644
index 6301a25af..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.ca.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Nou</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Edita</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Esborrar</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Llista</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Desar</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Desar i afegir</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Cancel·lar</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Filters</source>
-        <target>Filtres</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Reset</source>
-        <target>Restablir</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Filtrar</target>
-      </trans-unit>
-
-      <!-- List -->
-            <trans-unit>
-        <source>No result</source>
-        <target>Cap resultat</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Accions</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(pàgina %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>asc</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>desc</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Choose an action</source>
-        <target>Tria una opció</target>
-      </trans-unit>
-      <trans-unit>
-        <source>go</source>
-        <target>executa</target>
-      </trans-unit>
-      <trans-unit>
-        <source>[0] no result|[1] 1 result|(1,+Inf] %1% results</source>
-        <target>[0] cap resultat|[1] 1 resultat|(1,+Inf] %1% resultats</target>
-      </trans-unit>
-      
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Primera pàgina</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Pàgina anterior</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Pàgina següent</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Última pàgina</target>
-      </trans-unit>
-      
-      
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>El tema s&#39;ha creat amb èxit.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>El tema s&#39;ha actualitzat amb èxit.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>El tema s&#39;ha creat amb èxit. Podeu afegir una altra més endavant.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>El tema s&#39;ha actualitzat amb èxit. Podeu afegir una altra més endavant.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>El tema no s&#39;ha desat degut a alguns errors.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>El tema s&#39;ha eliminat amb èxit.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>Has de seleccionar almenys un element.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>Has de triar l'acció que vols executar sobre els elements seleccionats.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>S'ha produït un error a l'esborrar els elements seleccionats perquè almenys un d'ells ja no existeix.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>Els elements seleccionats s'han esborrat correctament.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>S'ha produït un error a l'esborrar els elements seleccionats.</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.cs.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.cs.xml
deleted file mode 100644
index c4ffc007a..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.cs.xml
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Vytvořit</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Upravit</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Odstranit</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Výpis</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Uložit</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Uložit a přidat</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Zrušit</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Choose an action</source>
-        <target>Vybrat akci</target>
-      </trans-unit>
-      <trans-unit>
-        <source>go</source>
-        <target>ok</target>
-      </trans-unit>
-      
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Zrušit</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Filtrovat</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Žádné položky</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Akce</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(stránka %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>vzestupně</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>sestupně</target>
-      </trans-unit>
-      <trans-unit>
-        <source>[0] no result|[1] 1 result|(1,+Inf] %1% results</source>
-        <target>[0] žádné položky|[1] 1 položka|(1,+Inf] %1% položky</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Are you sure?</source>
-        <target>Jste si jist?</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Checked</source>
-        <target>Aktivováno</target>
-      </trans-unit>
-      
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>První stránka</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Předchozí stránka</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Další stránka</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Poslední stránka</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>Položka byla úspešně vytvořena.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>Položka byla úspešně upravena.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>Položka byla úspešně vytvořena. Můžete přidat další.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>Položka byla úspešne upravena. Můžete přidat další.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>Položka nebyla uložena kvůli chybám.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>Položka byla úspešně odstraněna.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>Zvolte alespoň jednu položku.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>Zvolte si akci, která se provede se zvolenými položkami.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>Došlo k chybě při odstraňování zvolených položek, některé z nich již neexistují.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>Zvolené položky byly úspěšně odstraněny.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>Došlo k chybě při odstraňování zvolených položek.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>is empty</source>
-        <target>je prázdný</target>
-      </trans-unit>
-      <trans-unit>
-        <source>yes or no</source>
-        <target>ano nebo ne</target>
-      </trans-unit>
-      <trans-unit>
-        <source>yes</source>
-        <target>ano</target>
-      </trans-unit>
-      <trans-unit>
-        <source>no</source>
-        <target>ne</target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[from %from_date% to %to_date%]]></source>
-        <target><![CDATA[od %from_date% do %to_date%]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[from %from_date%<br />to %to_date%]]></source>
-        <target><![CDATA[od %from_date%<br />do %to_date%]]></target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.da.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.da.xml
deleted file mode 100644
index 894c03050..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.da.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Ny</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Rediger</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Slet</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Liste</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Gem</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Gem og tilføj</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Annuler</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Nulstil</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Filtrer</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Intet resultat</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Handlinger</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(side %%page%% af %%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>stigende</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>faldende</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Første side</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Forrige side</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Næste side</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Sidste side</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>Elementet er blevet tilføjet.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>Elementet er blevet opdateret.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>Elementet er blevet tilføjet, du kan tilføje endnu et element herunder.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>Elementet er blevet opdateret, du kan tilføje endnu et herunder.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>Elementet er ikke blevet tilføjet, pga. fejl.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>Elementet er blevet slettet.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>Du skal vælge mindst et element.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>Du skal vælge en handling, at udføre på de valgte elementer.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>Et problem opstod ved sletning af de valgte elementer, da nogen af disse ikke eksisterer mere.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>De valgte elementer er blevet slettet.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>Der var et problem, med at slette de valgte elementer.</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.de.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.de.xml
deleted file mode 100644
index 69c2ae1cb..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.de.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Neu</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Bearbeiten</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Löschen</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Liste</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Speichern</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Speichern und hinzufügen</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Abbrechen</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Choose an action</source>
-        <target>Eine Aktion wählen</target>
-      </trans-unit>
-      <trans-unit>
-        <source>go</source>
-        <target>ok</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Back to list</source>
-        <target>Zurück zur Liste</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Zurücksetzen</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Filtern</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Keine Ergebnisse</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Aktionen</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(Seite %%page%% von %%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>aufsteigend</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>absteigend</target>
-      </trans-unit>
-      <trans-unit>
-        <source>[0] no result|[1] 1 result|(1,+Inf] %1% results</source>
-        <target>[0] kein Ergebnis|[1] 1 Ergebnis|(1,+Inf] %1% Ergebnisse</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Erste Seite</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Vorherige Seite</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Nächste Seite</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Letzte Seite</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>Das Objekt wurde erfolgreich erstellt.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>Das Objekt wurde erfolgreich aktualisiert.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>Das Objekt wurde erfolgreich erstellt. Weitere können unten erstellt werden.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>Das Objekt wurde erfolgreich aktualisiert. Weitere können unten erstellt werden.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>Das Objekt konnte wegen Fehlern nicht gespeichert werden.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>Das Objekt wurde erfolgreich gelöscht.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>is empty</source>
-        <target>ist leer</target>
-      </trans-unit>
-      <trans-unit>
-        <source>yes or no</source>
-        <target>Ja oder Nein</target>
-      </trans-unit>
-      <trans-unit>
-        <source>yes</source>
-        <target>Ja</target>
-      </trans-unit>
-      <trans-unit>
-        <source>no</source>
-        <target>Nein</target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[from %from_date% to %to_date%]]></source>
-        <target><![CDATA[von %from_date% bis %to_date%]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[from %from_date%<br />to %to_date%]]></source>
-        <target><![CDATA[von %from_date%<br />bis %to_date%]]></target>
-      </trans-unit>
-
-      <trans-unit>
-        <source>Required.</source>
-        <target>Erforderlich.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Invalid.</source>
-        <target>Ungültig.</target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA["%value%" is not an integer.]]></source>
-        <target><![CDATA["%value%" ist kein Integer.]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA["%value%" is not a number.]]></source>
-        <target><![CDATA["%value%" ist keine Nummer.]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[At least %min% values must be selected (%count% values selected).]]></source>
-        <target><![CDATA[Es müssen mindestens %min% Werte ausgewählt werden (%count% Werte ausgewählt).]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[At most %max% values must be selected (%count% values selected).]]></source>
-        <target><![CDATA[Es können maximal %max% Werte ausgewählt werden (%count% Werte ausgewählt).]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[CSRF attack detected.]]></source>
-        <target><![CDATA[CSRF Attacke erkannt.]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source>Checked</source>
-        <target>Ausgewählt</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Are you sure?</source>
-        <target>Sind Sie sicher?</target>
-      </trans-unit>
-     </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.el.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.el.xml
deleted file mode 100644
index 811a36602..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.el.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Νέο</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Επεξεργασία</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Διαγραφή</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Απαρίθμηση</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Αποθήκευση</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Αποθήκευση και Προσθήκη</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Ακύρωση</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Καθαρισμός</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Φίλτρο</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Κανένα Αποτέλεσμα.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Ενέργειες</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(Σελίδα %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>αυξ</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>φθι</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Πρώτη Σελίδα</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Προηγούμενη Σελίδα</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Επόμενη Σελίδα</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Τελευταία Σελίδα</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>Το αντικείμενο δημιουργήθηκε επιτυχώς.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>Το αντικείμενο ενημερώθηκε επιτυχώς.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>Το αντικείμενο δημιουργήθηκε επιτυχώς. Μπορείτε να προσθέσετε ένα καινούριο παρακάτω.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>Το αντικείμενο ενημερώθηκε επιτυχώς. Μπορείτε να προσθέσετε ένα καινούριο παρακάτω.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>Το αντικείμενο δεν αποθηκεύθηκε λόγω κάποιων σφαλμάτων.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>Το αντικείμενο διαγράφηκε επιτυχώς.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>Πρέπει να επιλέξετε τουλάχιστον ένα αντικείμενο.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>Πρέπει να επιλέξετε κάποια ενέργεια να εκτελεστεί στα επιλεγμένα αντικείμενα.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>Κάποιο πρόβλημα σημειώθηκε κατά την διαγραφή των επιλεγμένων αντικειμένων καθώς μερικά αντικείμενα δεν υπάρχουν πια.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>Τα επιλεγμένα αντικείμενα διαγράφηκαν επιτυχώς.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>Κάποιο πρόβλημα σημειώθηκε κατά την διαγραφή των επιλεγμένων αντικειμένων.</target>
-      </trans-unit>
-	  <trans-unit>
-        <source>is empty</source>
-        <target>είναι κενό</target>
-      </trans-unit>
-      <trans-unit>
-        <source>yes or no</source>
-        <target>ναι ή όχι</target>
-      </trans-unit>
-      <trans-unit>
-        <source>yes</source>
-        <target>ναι</target>
-      </trans-unit>
-      <trans-unit>
-        <source>no</source>
-        <target>όχι</target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[from %from_date% to %to_date%]]></source>
-        <target><![CDATA[από %from_date% εώς %to_date%]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[from %from_date%<br />to %to_date%]]></source>
-        <target><![CDATA[από %from_date%<br />εώς %to_date%]]></target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.es.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.es.xml
deleted file mode 100644
index 913f4aeaa..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.es.xml
+++ /dev/null
@@ -1,308 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Nuevo</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Editar</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Borrar</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Guardar</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Guardar y crear otro</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Show</source>
-        <target>Mostrar</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Are you sure?</source>
-        <target>¿Está seguro?</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Cancelar</target>
-      </trans-unit>      
-      <trans-unit>
-        <source>Choose an action</source>
-        <target>Seleccione una acción</target>
-      </trans-unit>
-      <trans-unit>
-        <source>go</source>
-        <target>ok</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Back to list</source>
-        <target>Listar</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Listar</target>
-      </trans-unit>
-      
-       <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Restablecer</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Filtrar</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filters</source>
-        <target>Filtrar</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Sin resultados</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Acciones</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(página %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>asc</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>desc</target>
-      </trans-unit>
-      <trans-unit>
-        <source>[0] no result|[1] 1 result|(1,+Inf] %1% results</source>
-        <target>[0] sin resultados|[1] 1 resultado|(1,+Inf] %1% resultados</target>
-      </trans-unit>
-      
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Primera página</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Página anterior</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Página siguiente</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Última página</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>El elemento se ha creado correctamente.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>El elemento se ha actualizado correctamente.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>El elemento se ha creado correctamente y ahora puede crear otro elemento.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>El elemento se ha actualizado correctamente y ahora puede crear otro elemento.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>El elemento no se ha guardado porque se ha producido algún error.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>El elemento se ha borrado correctamente.</target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[The form submission cannot be processed. It probably means that you have uploaded a file that is too big.]]></source>
-        <target><![CDATA[El formulario no puede ser procesado. Problamente significa que ha cargado un archivo muy grande.]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[Unexpected extra form field named "%field%".]]></source>
-        <target><![CDATA[Campo extra no esperado "%field%".]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[CSRF attack detected.]]></source>
-        <target><![CDATA[Ataque CSRF detectado.]]></target>
-      </trans-unit>
-      
-      <!-- Batch Actions-->
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>Debe seleccionar al menos un elemento.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>Seleccione la acción que quiera ejecutar sobre los elementos seleccionados.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>Se ha producido un error al borrar los elementos seleccionados porque al menos uno de ellos ya no existe.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>Los elementos seleccionados se han borrado correctamente.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>Se ha producido un error al borrar los elementos seleccionados.</target>
-      </trans-unit>
-      
-      <!-- Dates -->
-      <trans-unit>
-        <source><![CDATA[from %from_date% to %to_date%]]></source>
-        <target><![CDATA[de %from_date% a %to_date%]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[from %from_date%<br />to %to_date%]]></source>
-        <target><![CDATA[de %from_date%<br />a %to_date%]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA["%value%" does not match the date format (%date_format%).]]></source>
-        <target><![CDATA["%value%" no coincide con el formato (%date_format%).]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[The date must be before %max%.]]></source>
-        <target><![CDATA[La fecha debe ser anterior a %max%.]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[The date must be after %min%.]]></source>
-        <target><![CDATA[La fecha debe ser posterior a %min%.]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[The begin date must be before the end date.]]></source>
-        <target><![CDATA[La fecha de inicio debe ser anterior a la fecha de finalización.]]></target>
-      </trans-unit>
-      
-      <!-- Files -->
-      <trans-unit>
-        <source><![CDATA[File is too large (maximum is %max_size% bytes).]]></source>
-        <target><![CDATA[El archivo es muy grande (máximo %max_size% bytes).]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[Invalid mime type (%mime_type%).]]></source>
-        <target><![CDATA[Tipo MIME inválido (%mime_type%).]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[The uploaded file was only partially uploaded.]]></source>
-        <target><![CDATA[Al archivo sólo se cargó parcialmente.]]></target>
-      </trans-unit>      
-      <trans-unit>
-        <source><![CDATA[Missing a temporary folder.]]></source>
-        <target><![CDATA[Falta la carpeta temporal.]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[Failed to write file to disk.]]></source>
-        <target><![CDATA[No se pudo guardar el archivo.]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[File upload stopped by extension.]]></source>
-        <target><![CDATA[Se ha detenido la carga del archivo.]]></target>
-      </trans-unit>
-      
-      <!-- Widgets -->
-      <trans-unit>
-        <source><![CDATA["%value%" must be at most %max%.]]></source>
-        <target><![CDATA["%value%" debe ser a lo sumo %max%.]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA["%value%" must be at least %min.]]></source>
-        <target><![CDATA["%value%" debe ser por lo menos %min%.]]></target>
-      </trans-unit>     
-      <trans-unit>
-        <source><![CDATA["%value%" must be less than %max%.]]></source>
-        <target><![CDATA["%value%" debe ser menor que %max%.]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA["%value%" must be greater than %min%.]]></source>
-        <target><![CDATA["%value%" debe ser más grande que %min%.]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source>Checked</source>
-        <target>Marcado</target>
-      </trans-unit>
-      <trans-unit>
-        <source>is empty</source>
-        <target>Vacío</target>
-      </trans-unit>
-      <trans-unit>
-        <source>yes or no</source>
-        <target>si o no</target>
-      </trans-unit>
-      <trans-unit>
-        <source>yes</source>
-        <target>si</target>
-      </trans-unit>
-      <trans-unit>
-        <source>no</source>
-        <target>no</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Required.</source>
-        <target>Obligatorio.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Invalid.</source>
-        <target>Inválido.</target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA["%value%" is not an integer.]]></source>
-        <target><![CDATA["%value%" no es un entero.]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA["%value%" is not a number.]]></source>
-        <target><![CDATA["%value%" no es un número.]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[At least %min% values must be selected (%count% values selected).]]></source>
-        <target><![CDATA[Por lo menos %min% elementos deben ser seleccionados (%count% elementos seleccionados).]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[At most %max% values must be selected (%count% values selected).]]></source>
-        <target><![CDATA[A lo sumo %max% elementos deben ser seleccionados (%count% elementos seleccionados).]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA["%value%" is too long (%max_length% characters max).]]></source>
-        <target><![CDATA["%value%" es muy largo (%max_length% caracteres máximo).]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA["%value%" is too short (%min_length% characters min).]]></source>
-        <target><![CDATA["%value%" es muy pequeño (%min_length% caracteres mínimo).]]></target>
-      </trans-unit>
-      
-      <trans-unit>
-        <source><![CDATA["%value%" does not match the time format (%time_format%).]]></source>
-        <target><![CDATA["%value%" no coincide con el formato (%time_format%).]]></target>
-      </trans-unit>
-
-      <trans-unit>
-        <source><![CDATA[An object with the same "%column%" already exist.]]></source>
-        <target><![CDATA[Un objeto con el mismo "%column%" ya existe.]]></target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.es_AR.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.es_AR.xml
deleted file mode 100644
index ce999a42b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.es_AR.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Nuevo</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Editar</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Borrar</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Listar</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Guardar</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Guardar y agregar otro</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Cancelar</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Reiniciar</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Filtrar</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Sin resultados</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Acciones</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(página %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>asc</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>desc</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Primera página</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Página anterior</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Siguiente página</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Ultima página</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>El elemento fue creado satisfactoriamente.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>El elemento fue actualizado satisfactoriamente.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>El elemento fue creado satisfactoriamente. Podés agregar otro abajo.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>El elemento fue actualizado satisfactoriamente. Podés agregar otro abajo.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>El elemento no fue guardado debido a algunos errores.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>El elemento fue borrado satisfactoriamente.</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.eu.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.eu.xml
deleted file mode 100644
index 4a925661e..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.eu.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Berria</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Aldatu</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Ezabatu</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Zerrendatu</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Gorde</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Gorde eta berria</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Ezeztatu</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Choose an action</source>
-        <target>Ekintza bat aukeratu</target>
-      </trans-unit>
-      <trans-unit>
-        <source>go</source>
-        <target>ok</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Garbitu</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Mugatu</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Emaitzarik ez</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Ekintzak</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(%%page%%/%%nb_pages%% orria)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>gora</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>behera</target>
-      </trans-unit>
-      <trans-unit>
-        <source>[0] no result|[1] 1 result|(1,+Inf] %1% results</source>
-        <target>[0] emaitzarik ez|[1] emaitza bat|(1,+Inf] %1% emaitzak</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Lehen orria</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Aurreko orria</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Hurrengo orria</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Azken orria</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>Elementua egoki sortu da.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>Elementua egoki eguneratu da.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>Elementua egoki sortu da eta orain beste elementu bat sor dezakezu.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>Elementua egoki eguneratu da eta orain beste elementu bat sor dezakezu.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>Elementua ez da gorde errakuntzaren bat gertatu delako.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>Elementua egoki ezabatu da.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>Gutxienez, elementu bat aukeratu behar duzu.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>Aukeratutako elementuen artean, exekutatu nahi duzun ekintza aukeratu.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>Aukeratutako elementuak ezabatzerakoan errakuntza bat gertatu da, horietako bat, gutxienez, existitzen ez delako.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>Aukeratutako elementuak egoki ezabatu dira.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>Errakuntza bat gertatu da, aukeratutako elementuak ezabatzerakoan.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>is empty</source>
-        <target>hutsik</target>
-      </trans-unit>
-      <trans-unit>
-        <source>yes or no</source>
-        <target>bai ala ez</target>
-      </trans-unit>
-      <trans-unit>
-        <source>yes</source>
-        <target>bai</target>
-      </trans-unit>
-      <trans-unit>
-        <source>no</source>
-        <target>ez</target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[from %from_date% to %to_date%]]></source>
-        <target><![CDATA[%from_date%-tik %to_date%-ra]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[from %from_date%<br />to %to_date%]]></source>
-        <target><![CDATA[%from_date%-tik<br /> %to_date%-ra]]></target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.fa.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.fa.xml
deleted file mode 100644
index 5a5c84cfc..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.fa.xml
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-	  <!-- Translated By Ehsan Chavoshi -->
-      <!-- Actions -->
-      <trans-unit>
-        <source>Choose an action</source>
-        <target>انتخاب عملیات</target>
-      </trans-unit>      
-      <trans-unit>
-        <source>go</source>
-        <target>برو</target>
-      </trans-unit>            
-      <trans-unit>
-        <source>New</source>
-        <target>جديد</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>ویرایش</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>حذف</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>لیست</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-         <target>ذخیره</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>دخیره و افزودن</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>لغو</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Show</source>
-        <target>نمایش</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Back to list</source>
-        <target>بازگشت به لیست</target>
-      </trans-unit>
-
-      <!-- Filters -->
-       <trans-unit>
-        <source>Filters</source>
-        <target>فیلترها</target>
-       </trans-unit>
-       <trans-unit>
-        <source>Reset</source>
-        <target>بازنشانی</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>فیلتر</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>بدون نتیجه</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>عملیات</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(%%nb_pages%%/%%page%% صفحه)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>صعودی</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>نزولی</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Choose an action</source>
-        <target>عملیاتی را انتخاب کنید</target>
-      </trans-unit>
-      <trans-unit>
-        <source>go</source>
-        <target>انجام</target>
-      </trans-unit>
-      <trans-unit>
-        <source>[0] no result|[1] 1 result|(1,+Inf] %1% results</source>
-        <target>[0] بدون نتیجه|[1] 1 نتیجه|(1,+Inf] %1% نتیجه</target>
-      </trans-unit>
-      
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>صفحه اول</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>صفحه قبل</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>صفحه بعد</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>صفحه آخر</target>
-      </trans-unit>
-
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>مورد با موفقیت ایجاد شد.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-       <target>مورد با موفقیت به روز رسانی شد</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>مورد با موفقیت ایجاد شد. میتوانید مورد دیگری را در ادامه اضافه کنید.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>مورد با موفیت به روز رسانی شد. میتوانید مورد دیگری را در ادامه اضافه کنید</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>به علت بروز خطا مورد ذخیره نشد.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>مورد با موفقیت حذف شد.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>شما باید حداقل یک مورد را انتخاب نمایید.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>شما باید عملیاتی را جهت اعمال روی اقلام انتخابی ، انتخاب کنید.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>مشکلی در حذف موارد انتخابی پیش آمد.زیرا بعضی از اقلام انتخابی دیگر وجود ندارند.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>اقلام انتخاب شده با موفقیت حذف گردید.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>مشکلی در حذف اقلام انتخابی پیش آمد.</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.fi.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.fi.xml
deleted file mode 100644
index 71c934ca4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.fi.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Uusi</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Muokkaa</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Poista</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Näytä lista</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Tallenna</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Tallenna ja lisää</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Peruuta</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Tyhjennä</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Suodata</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Ei tuloksia</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Toiminnot</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(sivu %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>kasvava</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>madaltuva</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Ensimmäinen sivu</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Edellinen sivu</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Seuraava sivu</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Viimeinen sivu</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>Merkinnän luonti onnistui.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>Merkinnän päivittäminen onnistui.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>Merkinnän luonti onnistui. Voit lisätä sen alle seuraavan.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>Merkinnän päivitys onnistui. Voit lisätä sen alle seuraavan.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>Merkintää ei tallennettu virheiden takia.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>Merkinnän poistaminen onnistui.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>Valitse vähintään yksi merkintä.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>Valitse toiminto, joka suoritetaan valituille merkinnöille.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>Valittujen merkintöjen poistamisessa esiintyi virhe, koska jotkut merkinnät eivät enää olleet olemassa.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>Valittujen merkintöjen poistaminen onnistui.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>Valittujen merkintöjen poistamisessa esiintyi virhe.</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.fr.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.fr.xml
deleted file mode 100644
index 95a6c144a..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.fr.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Nouveau</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Modifier</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Supprimer</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Liste</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Mettre à jour</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Mettre à jour et ajouter</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Annuler</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Choose an action</source>
-        <target>Choisir une action</target>
-      </trans-unit>
-      <trans-unit>
-        <source>go</source>
-        <target>ok</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Back to list</source>
-        <target>Retour à la liste</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Effacer</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Filtrer</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Aucun résultat.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Actions</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(page %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>asc</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>desc</target>
-      </trans-unit>
-      <trans-unit>
-        <source>[0] no result|[1] 1 result|(1,+Inf] %1% results</source>
-        <target>[0] aucun résultat|[1] 1 résultat|(1,+Inf] %1% résultats</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Are you sure?</source>
-        <target>Etes-vous sûr?</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Checked</source>
-        <target>Activé</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Première page</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Page précédente</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Page suivante</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Dernière page</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>L'objet a été ajouté avec succès.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>L'objet a été mis à jour avec succès.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>L'objet a été ajouté avec succès. Vous pouvez en ajouter un autre.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>L'objet a été mis à jour avec succès. Vous pouvez en ajouter un autre.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>L'objet n'a pu être mis à jour.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>L'objet a été supprimé avec succès.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>Vous devez au moins sélectionner un objet.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>Vous devez sélectionner une action à executer sur les objets sélectionnés.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>Un problème est survenu lors de la suppression des objets sélectionnés car certains objets n'existent plus.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>Les objets sélectionnés ont été supprimés avec succès.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>Un problème est survenu lors de la suppression des objets sélectionnés.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>is empty</source>
-        <target>est vide</target>
-      </trans-unit>
-      <trans-unit>
-        <source>yes or no</source>
-        <target>oui ou non</target>
-      </trans-unit>
-      <trans-unit>
-        <source>yes</source>
-        <target>oui</target>
-      </trans-unit>
-      <trans-unit>
-        <source>no</source>
-        <target>non</target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[from %from_date% to %to_date%]]></source>
-        <target><![CDATA[du %from_date% au %to_date%]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[from %from_date%<br />to %to_date%]]></source>
-        <target><![CDATA[du %from_date%<br />au %to_date%]]></target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.hr.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.hr.xml
deleted file mode 100644
index fe0c4e502..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.hr.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Novo</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Uredi</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Obriši</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Lista</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Spremi</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Spremi i dodaj</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Odustani</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Poništi</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Filtriraj</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Nema rezultata</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Akcije</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(stranica %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>rastuće</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>padajuće</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Prva stranica</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Prethodna stranica</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Sljedeća stranica</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Zadnja stranica</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>Stavka je uspješno kreirana.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>Izmjene su spremljene.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>Stavka uspješno kreirana. Možete dodati sljedeću.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>Izmjene su spremljene. Možete dodati sljedeću stavku.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>Stavka nije spremljena zbog greške.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>Stavka uspješno izbrisana.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>Morate izabrati barem jednu stavku.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>Morate izabrati akciju koja će se izvršiti na izabranim stavkama.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>Ne mogu izbrisati izabrane stavke jer neke više ne postoje.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>Izabrane stavke su uspješno obrisane.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>Ne mogu izbrisati izabrane stavke zbog greške.</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.hu.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.hu.xml
deleted file mode 100644
index 7642ad554..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.hu.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Új</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Szerkesztés</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Törlés</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Lista</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Mentés</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Mentés és új elem</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Mégsem</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Alapértelmezett</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Szűrés</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Nincs találat.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Műveletek</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(oldal %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>növekvő</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>csökkenő</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Első oldal</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Előző oldal</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Következő oldal</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Utolsó oldal</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>Az elem létrehozása sikeres volt.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>Az elem mentése sikeres volt.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>Az elem létrehozása sikeres volt. Újabb létrehozása az alábbi adatlapon.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>Az elem mentése sikeres volt. Újabb létrehozása az alábbi adatlapon.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>Az elem mentése hiba miatt sikertelen volt.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>Az elem törlése sikeres volt.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>Legalább egy elemet ki kell választani.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>Válassza ki a kiválasztott elemeken végrehajtandó műveletet.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>Probléma lépett fel a kiválasztott elemek törlése közben, valamely elem már eleve nem létezett.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>A kiválasztott elemek törlése sikeres volt.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>Probléma lépett fel a kiválasztott elemek törlése közben.</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.id.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.id.xml
deleted file mode 100644
index 4c271141d..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.id.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Buat Baru</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Sunting</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Hapus</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Indeks</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Simpan</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Simpan dan tambah baru</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Batalkan</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Kembalikan seperti semula</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Filter</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Tak ada hasil</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Aksi</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(halaman %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>asc</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>desc</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Halaman pertama</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Halaman sebelumnya</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Halaman berikut</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Halaman terakhir</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>Data telah berhasil dibuat.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>Data telah berhasil diperbaharui.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>Data telah berhasil dibuat. Anda dapat menambahkan data baru di bawah ini.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>Data telah berhasil diperbaharui. Anda dapat menambahkan data baru di bawah ini.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>Data gagal disimpan karena adanya kesalahan.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>Data telah berhasil dihapus.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>Anda harus memilih paling tidak satu data.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>Anda harus memilih sebuah aksi pada data yang telah terpilih.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>Terjadi masalah pada saat akan menghapus data yang terpilih karena beberapa data tidak lagi tersedia.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>Data yang terpilih telah berhasil dihapus.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>Terjadi masalah pada saat akan menghapus data yang terpilih.</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.it.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.it.xml
deleted file mode 100644
index f8041d935..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.it.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Nuovo</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Modifica</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Cancella</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Lista</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Salva</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Salva e aggiungi</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Annulla</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Choose an action</source>
-        <target>Scegli un'azione</target>
-      </trans-unit>
-      <trans-unit>
-        <source>go</source>
-        <target>ok</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Back to list</source>
-        <target>Torna alla lista</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Reset</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Filtra</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Nessun risultato</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Azioni</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(pagina %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>asc</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>disc</target>
-      </trans-unit>
-      <trans-unit>
-        <source>[0] no result|[1] 1 result|(1,+Inf] %1% results</source>
-        <target>[0] nessun risultato|[1] 1 risultato|(1,+Inf] %1% risultati</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Prima pagina</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Pagina precedente</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Pagina seguente</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Ultima pagina</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>L'elemento è stato creato con successo.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>L'elemento è stato aggiornato con successo.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>L'elemento è stato creato con successo. Puoi aggiungerne un altro di seguito.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>L'elemento è stato aggiornato con successo. Puoi aggiungerne un altro di seguito.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>L'elemento non è stato salvato a causa di qualche errore.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>L'elemento è stato cancellato con successo.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>Selezionare almeno un elemento.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>Selezionare un'azione da eseguire sugli elementi selezionati.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>Si è verificato un problema durante la cancellazione degli elementi selezionati, alcuni elementi non esistono più.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>Gli elementi selezionati sono stati cancellati.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>Si è verificato un problema durante la cancellazione degli elementi selezionati.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>is empty</source>
-        <target>è vuoto</target>
-      </trans-unit>
-      <trans-unit>
-        <source>yes or no</source>
-        <target>si o no</target>
-      </trans-unit>
-      <trans-unit>
-        <source>yes</source>
-        <target>si</target>
-      </trans-unit>
-      <trans-unit>
-        <source>no</source>
-        <target>no</target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[from %from_date% to %to_date%]]></source>
-        <target><![CDATA[da %from_date% a %to_date%]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[from %from_date%<br />to %to_date%]]></source>
-        <target><![CDATA[da %from_date%<br />a %to_date%]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source>Required.</source>
-        <target>Obbligatorio.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Invalid.</source>
-        <target>Non valido.</target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA["%value%" is not an integer.]]></source>
-        <target><![CDATA["%value%" non è un intero.]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA["%value%" is not a number.]]></source>
-        <target><![CDATA["%value%" non è un numero.]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[At least %min% values must be selected (%count% values selected).]]></source>
-        <target><![CDATA[Si devono selezionare almeno %min% valori (%count% selezionati).]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[At most %max% values must be selected (%count% values selected).]]></source>
-        <target><![CDATA[Si devono selezionare al più %max% valori (%count% selezionati).]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[CSRF attack detected.]]></source>
-        <target><![CDATA[Individuato attacco CSRF.]]></target>
-      </trans-unit>   
-   </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.ja.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.ja.xml
deleted file mode 100644
index 05f4f2ec1..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.ja.xml
+++ /dev/null
@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>新規作成</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>編集</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>削除</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>一覧</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>保存</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>保存して更に追加</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>キャンセル</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Choose an action</source>
-        <target>アクションを選択</target>
-      </trans-unit>
-      <trans-unit>
-        <source>go</source>
-        <target>実行</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Back to list</source>
-        <target>リストに戻る</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>リセット</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>検索</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>データがありません</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>操作</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(ページ %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>降順</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>昇順</target>
-      </trans-unit>
-      <trans-unit>
-        <source>[0] no result|[1] 1 result|(1,+Inf] %1% results</source>
-        <target>[0] 0件|[1] 1件|(1,+Inf] %1% 件</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>最初のページ</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>前のページ</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>次のページ</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>最後のページ</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>アイテムを作成しました</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>アイテムを更新しました</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>アイテムを作成しました。以下で別のアイテムを追加できます。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>アイテムを更新しました。以下で別のアイテムを追加できます。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>エラーのためアイテムを保存できませんでした</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>アイテムを削除しました</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>最低でも1つを選択してください。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>選択されたアイテムを処理するためにアクションを選択してください。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>すでに存在しないアイテムを削除しようとしてエラーが発生しました。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>選択されたアイテムを削除しました。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>選択されたアイテムを削除するときにエラーが発生しました。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>is empty</source>
-        <target>空の値も含む</target>
-      </trans-unit>
-      <trans-unit>
-        <source>yes or no</source>
-        <target>全て</target>
-      </trans-unit>
-      <trans-unit>
-        <source>yes</source>
-        <target>はい</target>
-      </trans-unit>
-      <trans-unit>
-        <source>no</source>
-        <target>いいえ</target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[from %from_date% to %to_date%]]></source>
-        <target><![CDATA[%from_date% から %to_date%]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[from %from_date%<br />to %to_date%]]></source>
-        <target><![CDATA[%from_date% から<br /> %to_date%]]></target>
-      </trans-unit>
-
-      <!-- Form Error Messages -->
-      <trans-unit>
-        <source>Required.</source>
-        <target>必須項目です。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Invalid.</source>
-        <target>無効な値です。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>"%value%" is not an integer.</source>
-        <target>"%value%" は数値でありません。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>"%value%" is not a number.</source>
-        <target>"%value%" は数字でありません。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>At least %min% values must be selected (%count% values selected).</source>
-        <target>%min% 個以上選択してください(現在 %count% が選択されています)。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>At most %max% values must be selected (%count% values selected).</source>
-        <target>%min% 個以内で選択してください(現在 %count% が選択されています)。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>CSRF attack detected.</source>
-        <target>画面遷移が確認できませんでした</target>
-      </trans-unit>
-      <trans-unit>
-        <source>"%value%" does not match the date format (%date_format%).</source>
-        <target>"%value%" が日付のフォーマット (%date_format%)に一致しません</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The date must be before %max%.</source>
-        <target>日付は %max% より前を指定してください</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The date must be after %min%.</source>
-        <target>日付は %min% より後を指定してください</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The begin date must be before the end date.</source>
-        <target>開始日は終了日より前でなければなりません。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>File is too large (maximum is %max_size% bytes).</source>
-        <target>ファイルのサイズが大きすぎます(アップロードできるファイルサイズは%max_size%バイトです)。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Invalid mime type (%mime_type%).</source>
-        <target>無効なmimeタイプです(%mime_type%)。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The uploaded file was only partially uploaded.</source>
-        <target>アップロードされたファイルは不十分な状態でアップロードされました。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Missing a temporary folder.</source>
-        <target>テンポラリフォルダーがありません。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Failed to write file to disk.</source>
-        <target>ディスクへのファイル書き込みに失敗しました。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>File upload stopped by extension.</source>
-        <target>ファイルの拡張子の制限でアップロードは中止しました。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Unexpected extra form field named "%field%".</source>
-        <target>"%field%" という不明のフィールドがあります</target>
-      </trans-unit>
-      <trans-unit>
-        <source>"%value%" is too long (%max_length% characters max).</source>
-        <target>入力文字数がオーバーしています (%max_length%文字以下)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>"%value%" is too short (%min_length% characters min).</source>
-        <target>入力文字数が不足しています (%min_length%文字以上)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>"%value%" does not match the time format (%time_format%).</source>
-        <target>"%value%"が時刻のフォーマット (%time_format%)に一致しません</target>
-      </trans-unit>
-      <trans-unit>
-        <source>"%value%" must be at most %max%.</source>
-        <target>"%value%" は %max% より小さくなければなりません。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>"%value%" must be at least %min.</source>
-        <target>"%value%" %min% より大きくなければなりません。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The date must be before %max%.</source>
-        <target>日付は %max% より前の日付でなければなりません。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The date must be after %min%.</source>
-        <target>日付は %mix% より後の日付でなければなりません。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The form submission cannot be processed. It probably means that you have uploaded a file that is too big.</source>
-        <target>フォームの処理ができませんでした。アップロードしたファイルのサイズが大きすぎるのかもしれません。</target>
-      </trans-unit>
-
-      <!-- Old -->
-      <trans-unit>
-        <source>"%value%" must be less than %max%.</source>
-        <target>"%value%" は %max% より小さい値を指定してください</target>
-      </trans-unit>
-      <trans-unit>
-        <source>"%value%" must be greater than %min%.</source>
-        <target>"%value%" は %min% より大きい値を指定してください</target>
-      </trans-unit>
-      <trans-unit>
-        <source>An object with the same "%column%" already exist.</source>
-        <target>既に登録されています</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.lt.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.lt.xml
deleted file mode 100644
index b19c4d27e..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.lt.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Naujas</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Redaguoti</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Šalinti</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Sąrašas</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Išsaugoti</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Išsaugoti ir pridėti</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Atšaukti</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Atstatyti</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Filtruoti</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Rezultatų nerasta</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Veiksmai</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(puslapis %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>didėjančiai</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>mažėjančiai</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Pirmas puslapis</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Ankstesnis puslapis</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Kitas puslapis</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Paskutinis puslapis</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>Sukurta sėkmingai.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>Atnaujinta sėkmingai.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>Sukurta sėkmingai. Naują galite pridėti žemiau.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>Ataujinta sėkmingai. Naują galite pridėti žemiau.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>Išsaugoti nepavyko dėl esančių klaidų.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>Pašalinta sėkmingai.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>Turite pasirinkti bent vieną elementą.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>Turite pasirinkti veiksmą, kurį norite atlikti su pasirinktais elementais.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>Nepavyko pašalinti pasirinktų elementų, kadangi kai kurie elementai jau nebeegzistuoja.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>Pasirinkti elementai pašalinti sėkmingai.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>Nepavyko pašalinti pasirinktų elementų.</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.lv.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.lv.xml
deleted file mode 100644
index 7f51560c1..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.lv.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Jauns</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Rediģēt</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Dzēst</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Saraksts</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Saglabāt</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Saglabāt un pievienot</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Atcelt</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Atiestatīt</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Filtrēt</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Nav datu</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Darbības</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(lapa %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>augoši</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>dilstoši</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Pirmā lapa</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Iepriekšejā lapa</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Nākamā lapa</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Pēdējā lapa</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>Izveide sekmīga.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>Rediģēšana sekmīga.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>Izveide sekmīga, lai pievienotu vēl vienu, lietojiet zemāk esošo formu.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>Rediģēšana sekmīga, lai pievienotu vēl vienu, lietojiet zemāk esošo formu.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>Neizdevās saglabāt kļūdu dēļ.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>Dzēšana sekmīga.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>Jāiezīmē vismaz viena vienība.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>Jānorāda darbība, kura veicama ar iezīmētajām vienībām.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>Problēma dzēsot - visas vienības vairs neeksistē.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>Atzīmētās vienības sekmīgi izdzēstas.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>Dzēsot atzīmētās vienības notiek kļūda.</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.nl.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.nl.xml
deleted file mode 100644
index b17ed088c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.nl.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Nieuw</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Wijzig</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Verwijder</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Lijst</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Opslaan</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Opslaan en Doorgaan</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Annuleren</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Choose an action</source>
-        <target>Kies een optie</target>
-      </trans-unit>
-      <trans-unit>
-        <source>go</source>
-        <target>ok</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Back to list</source>
-        <target>Terug naar lijst</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Herstellen</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Filteren</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Geen resultaat</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Acties</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(pagina %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>opl</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>afl</target>
-      </trans-unit>
-      <trans-unit>
-        <source>[0] no result|[1] 1 result|(1,+Inf] %1% results</source> 
-        <target>[0] geen resultaat|[1] 1 resultaat|(1,+Inf] %1% resultaten</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Eerste pagina</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Vorige pagina</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Volgende pagina</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Laatste pagina</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>Het item is succesvol aangemaakt.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>Het item is succesvol gewijzigd.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>Het items is succesvol aangemaakt. Hieronder kan je nog een item toevoegen.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>Het item is succesvol gewijzigd. Hieronder kan je nog een item toevoegen.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>Het item is niet opgeslagen vanwege fouten.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>Het item is succesvol verwijderd</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.no.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.no.xml
deleted file mode 100644
index b1ebe4012..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.no.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Ny</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Rediger</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Slett</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Liste</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Lagre</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Lagre og opprett ny</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Avbryt</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Tilbakestill</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Filtrer</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Ingen resultater</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Handlinger</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(side %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>stigende</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>synkende</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Første side</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Forrige side</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Neste side</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Siste side</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>Nytt objekt opprettet.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>Objekt oppdatert.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>Objektet ble opprettet, du kan opprette et nytt nedenfor.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>Objekt oppdatert, du kan opprette et nytt nedenfor.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>Objektet ble ikke lagret, grunnet noen feil.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>Objekt slettet.</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.pl.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.pl.xml
deleted file mode 100644
index af874c585..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.pl.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Nowy</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Edytuj</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Skasuj</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Lista</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Zapisz</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Zapisz i dodaj</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Anuluj</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Choose an action</source>
-        <target>Wybierz akcję</target>
-      </trans-unit>
-      <trans-unit>
-        <source>go</source>
-        <target>ok</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Back to list</source>
-        <target>Powrót do listy</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Wyczyść</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Szukaj</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Brak wyników.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Akcje</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(strona %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>rosnąco</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>malejąco</target>
-      </trans-unit>
-      <trans-unit>
-        <source>[0] no result|[1] 1 result|(1,+Inf] %1% results</source>
-        <target>[0] brak wyników|[1,+Inf] wyników: %1%</target> 
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Pierwsza strona</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Poprzednia strona</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Następna strona</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Ostatnia strona</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>Obiekt został poprawnie utworzony.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>Obiekt został poprawnie zaktualizowany.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>Obiekt został poprawnie utworzony. Możesz teraz dodać kolejny.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>Obiekt został poprawnie zaktualizowany. Możesz teraz dodać kolejny.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>Z powodu błędów obiekt nie został zapisany.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>Obiekt został poprawnie skasowany.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>Musisz wybrać co najmniej jeden obiekt.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>Musisz wybrać akcję do wykonania na wybranych obiektach.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>Wystąpił błąd podczas usuwania wybranych obiektów, ponieważ niektóre już nie istnieją.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>Wybrane obiekty zostały skasowane.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>Wystąpił błąd podczas usuwania wybranych obiektów.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>is empty</source>
-        <target>jest pusty</target>
-      </trans-unit>
-      <trans-unit>
-        <source>yes or no</source>
-        <target>tak lub nie</target>
-      </trans-unit>
-      <trans-unit>
-        <source>yes</source>
-        <target>tak</target>
-      </trans-unit>
-      <trans-unit>
-        <source>no</source>
-        <target>nie</target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[from %from_date% to %to_date%]]></source>
-        <target><![CDATA[od %from_date% do %to_date%]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[from %from_date%<br />to %to_date%]]></source>
-        <target><![CDATA[od %from_date%<br />do %to_date%]]></target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.pt.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.pt.xml
deleted file mode 100644
index 6081506eb..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.pt.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Novo</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Editar</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Apagar</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Listar</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Gravar</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Gravar e adicionar</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Cancelar</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Eliminar</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Filtrar</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Nenhum resultado.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Acções</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(página %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>asc</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>desc</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Primeira página</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Página anterior</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Próxima página</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Última página</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>O objecto foi criado com sucesso.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>O objecto foi actualizado com sucesso.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>O objecto foi criado com sucesso. Poderá adicionar outro de seguida.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>O objecto foi actualizado com sucesso. Poderá adicionar outro de seguida.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>O objecto não foi guardado devido a erros.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>O objecto foi apagado com sucesso.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>Deverá seleccionar pelo menos um objecto.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>Deverá selecionar uma acção para executar nos objectos seleccionados.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>Um problema ocorreu ao apagar os objectos seleccionados devido à sua inexistência.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>Os objectos seleccionados foram apagados com sucesso..</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>Ocorreu um erro ao apagar os objectos seleccionados.</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.pt_BR.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.pt_BR.xml
deleted file mode 100644
index a669e319a..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.pt_BR.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Novo</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Editar</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Remover</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Listar</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Salvar</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Salvar e Adicionar outro</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Cancelar</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Limpar</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Filtrar</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Nenhum resultado.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Ações</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(página %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>asc</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>desc</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Primeira página</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Página anterior</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Próxima página</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Última página</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>Item adicionado com sucesso.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>Item atualizado com sucesso.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>Item adicionado com sucesso. Você pode adicionar outro abaixo.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>Item atualizado com sucesso. Você pode adicionar outro abaixo.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>Item não atualizado devido a erros.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>Item removido com sucesso.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>Ítem excluído com sucesso.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>Você deve selecionar pelo menos um ítem.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>Você deve selecionar uma ação a ser executada nos ítens selecionados.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>Ocorreu um problema ao excluir os ítens selecionados pois alguns deles não existem mais.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>Os ítens selecionados foram excluídos com sucesso.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>Ocorreu um problema ao deletar os ítens selecionados.</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.ro.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.ro.xml
deleted file mode 100644
index cbeff9cf8..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.ro.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-  <!-- This file uses ş and ţ (cedilla below) insted of ș and ț (comma below) for compatibility. -->
-  <!-- Acest fişier foloseşte ş şi ţ (sedilă dedesubt) în loc de ș şi ț (virgulă dedesubt) pentru compatibilitate. -->
-  <!-- ref: http://en.wikipedia.org/wiki/Romanian_alphabet#Comma-below_.28.C8.99_and_.C8.9B.29_versus_cedilla_.28.C5.9F_and_.C5.A3.29 -->
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Nou</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Editare</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Ştergere</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Listare</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Salvare</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Salvare şi adăugare</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Anulare</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Resetare</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Filtrare</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Nici un rezultat.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Acţiuni</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(pagina %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>asc</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>desc</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Prima pagină</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Pagina precedentă</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Pagina următoare</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Ultima pagină</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>Obiectul a fost creat cu succes.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>Obiectul a fost actualizat cu succes.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>Obiectul a fost creat cu succes. Puteţi să mai adăugaţi unul mai jos.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>Obiectul a fost actualizat cu succes. Puteţi să mai adăugaţi unul mai jos.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>Obiectul n-a putut fi salvat.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>Obiectul a fost şters cu succes.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>Trebuie să selectaţi cel puţin un obiect.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>Trebuie să selectaţi o acţiune ce va fi executată asupra obiectelor selectate.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>A survenit o problemă la ştergerea obiectelor selectate deoarece o parte din acestea nu mai există.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>Obiectele selectate au fost şterse cu succes.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>A survenit o problemă la ştergerea obiectelor selectate.</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.ru.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.ru.xml
deleted file mode 100644
index 0a3067778..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.ru.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Создать</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Редактировать</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Удалить</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Список</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Сохранить</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Сохранить и добавить</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Отмена</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Choose an action</source>
-        <target>Выберите действие</target>
-      </trans-unit>
-      <trans-unit>
-        <source>go</source>
-        <target>Выполнить</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Back to list</source>
-        <target>Вернуться к списку</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Очистить</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Фильтр</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Нет результатов</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Действия</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(страница %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>По возрастанию</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>По убыванию</target>
-      </trans-unit>
-      <trans-unit>
-        <source>[0] no result|[1] 1 result|(1,+Inf] %1% results</source>
-        <target>[0] нет результатов|[1] 1 результат|(1,+Inf] %1% результата(ов)</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Первая страница</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Предыдущая страница</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Следующая страница</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Последняя страница</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>Объект успешно создан.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>Объект успешно изменен.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>Объект успешно создан. Вы можете добавить еще один.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>Объект успешно обновлен. Вы можете добавить еще один.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>Объект не сохранен из-за некоторых ошибок.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>Объект успешно удален.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>Вы должны выделить как минимум один объект.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>Вы должны выбрать действие, которое будет выполнено с выделенными объектами.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>Возникла проблемма при удалении выделенных объектов, так как некоторые объекты больше не существуют.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>Выделенные объекты успешно удалены.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>Возникла проблемма при удалении выделенных объектов.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>is empty</source>
-        <target>пустое значение</target>
-      </trans-unit>
-      <trans-unit>
-        <source>yes or no</source>
-        <target>да или нет</target>
-      </trans-unit>
-      <trans-unit>
-        <source>yes</source>
-        <target>да</target>
-      </trans-unit>
-      <trans-unit>
-        <source>no</source>
-        <target>нет</target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[from %from_date% to %to_date%]]></source>
-        <target><![CDATA[от %from_date% до %to_date%]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[from %from_date%<br />to %to_date%]]></source>
-        <target><![CDATA[от %from_date%<br />до %to_date%]]></target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.sk.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.sk.xml
deleted file mode 100644
index 5e512e8a0..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.sk.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Vytvoriť</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Upraviť</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Vymazať</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Výpis</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Uložiť</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Uložiť a pridať</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Zrušiť</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Zrušiť</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Filtrovať</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Žiaden výsledok.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Akcie</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(stránka %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>vzostupne</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>zostupne</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Prvá stránka</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Predchádzajúca stránka</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Nasledujúca stránka</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Posledná stránka</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>Položka bola úspešne vytvorená.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>Položka bola úspešne upravená.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>Položka bola úspešne vytvorená. Môžete pridať ďalšiu.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>Položka bola úspešne upravená. Môžete pridať ďalšiu.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>Položka nebola uložená kôli niekoľkým chybám.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>Položka bola úspešne vymazaná.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>Prosím zvoľte si aspoň jednu položku.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>Prosím zvoľte si akciu na vykonanie s týmito položkami.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>Vyskytol sa problem pri mazaní viacerých položiek, keďže niektore z nich už neexistujú.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>Vybrané položky boli úspešne vymazané.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>Vyskytol sa problem pri mazaní zvolených položiek.</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.sl.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.sl.xml
deleted file mode 100644
index 11e1f1309..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.sl.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Novo</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Uredi</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Izbriši</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Navedi</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Shrani</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Shrani in dodaj</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Razveljavi</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Choose an action</source>
-        <target>Izberi aktivnost</target>
-      </trans-unit>
-      <trans-unit>
-        <source>go</source>
-        <target>Pojdi</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Back to list</source>
-        <target>Nazaj na seznam</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Are you sure?</source>
-        <target>Ste prepričani?</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Znova</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Filtriraj</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Ni rezultatov</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Aktivnosti</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(stran %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>navzgor</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>navzdol</target>
-      </trans-unit>
-      <trans-unit>
-        <source>[0] no result|[1] 1 result|(1,+Inf] %1% results</source>
-        <target><![CDATA[[0] ni rezultatov|{n: n == 1 || n % 100 == 1}%1% rezultat|{n: n==2 || n % 100 == 2}%1% rezultata|{n: n == 3 || n == 4 || n % 100 == 3 || n % 100 == 4 }%1% rezultati|(4,+Inf]%1% rezultatov]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source>Checked</source>
-        <target>Označeno</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Prva stran</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Prejšnja stran</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Naslednja stran</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Zadnja stran</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>Predmet ste uspešno dodali.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>Predmet ste uspešno shranili.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>Predmet ste uspešno dodali. Lahko dodate novega.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>Predmet ste uspešno shranili. Lahko dodate novega.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>Predmeta zaradi napake niste uspeli shraniti.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>Predmet ste uspešno izbrisali.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>Izbrati morate vsaj en predmet.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>Izbrati morate aktivnost za izbrane predmete.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>Pri brisanju izbranih predmetov se je pojavila napaka, ker določeni predmeti ne obstajajo več.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>Izbrane predmete ste uspešno izbrisali.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>Pri brisanju izbranih predmetov se je pojavila napaka.</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.sv.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.sv.xml
deleted file mode 100644
index 47f24d442..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.sv.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Ny</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Redigera</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Radera</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Lista</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Spara</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Spara och skapa ny</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Avbryt</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Choose an action</source>
-        <target>Välj en åtgärd</target>
-      </trans-unit>
-      <trans-unit>
-        <source>go</source>
-        <target>ok</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Nollställ</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Filtrera</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Inga resultat</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Åtgärder</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(sida %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>stigande</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>fallande</target>
-      </trans-unit>
-      <trans-unit>
-        <source>[0] no result|[1] 1 result|(1,+Inf] %1% results</source>
-        <target>[0] inget resultat|[1] 1 resultat|(1,+Inf] %1% resultat</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Första sidan</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Föregående sida</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Näste sida</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Sista sidan</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>Objekt skapades.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>Objekt uppdaterat.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>Objektet skapades. Du kan skapa ett nytt nedanför.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>Objektet uppdaterades. Du kan skapa ett nytt nedanför.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>Objektet kunde inte sparas på grund av vissa fel.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>Objektet raderades.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>Du måste välja minst ett objekt</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>Du måste välja en åtgärd att utföra på det valda objektet.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>Ett problem uppstod när de valda objekten skulle raderas då vissa objekt inte existerar längre.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>De valda objekten har raderats.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>Ett problem uppstod när de valda objekten raderades.</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.tr.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.tr.xml
deleted file mode 100644
index 4f8cef90f..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.tr.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Yeni</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Düzenle</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Sil</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Liste</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Kaydet</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Kaydet ve ekle</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Vazgeç</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Choose an action</source>
-        <target>Bir Eylem Seç</target>
-      </trans-unit>
-      <trans-unit>
-        <source>go</source>
-        <target>devam</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Back to list</source>
-        <target>Listeye geri dön</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Temizle</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Filtrele</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Kayıt yok.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Eylemler</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(sayfa %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>artan</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>azalan</target>
-      </trans-unit>
-      <trans-unit>
-        <source>[0] no result|[1] 1 result|(1,+Inf] %1% results</source>
-        <target>[0] kayıt yok|[1] 1 sonuç|(1,+Inf] %1% sonuçlar</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>İlk sayfa</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Önceki sayfa</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Sonraki sayfa</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Son sayfa</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>Kayıt başarıyla oluşturuldu.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>Kayıt başarıyla güncellendi.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>Kayıt başarıyla oluşturuldu. Aşağıdan yeni bir tane ekleyebilirsiniz.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>Kayıt başarıyla güncellendi. Aşağıdan yeni bir tane ekleyebilirsiniz.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>Bazı hatalar nedeniyle kayıt oluşturulamadı.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>Kayıt başarıyla silindi.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>En az bir kayıt seçmelisiniz.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>Seçilen kayıtlar üzerinde çalıştırılmak üzere bir eylem seçmelisiniz.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>Seçilen kayıtlar silinirken bir sorun oluştu, bazı kayıtlar artık bulunmuyor.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>Seçilen kayıtlar başarıyla silindi.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>Seçilen kayıtlar silinirken bir sorun oluştu.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>is empty</source>
-        <target>boş mu?</target>
-      </trans-unit>
-      <trans-unit>
-        <source>yes or no</source>
-        <target>evet ya da hayır</target>
-      </trans-unit>
-      <trans-unit>
-        <source>yes</source>
-        <target>evet</target>
-      </trans-unit>
-      <trans-unit>
-        <source>no</source>
-        <target>hayır</target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[from %from_date% to %to_date%]]></source>
-        <target><![CDATA[%from_date% ile %to_date% arası]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[from %from_date%<br />to %to_date%]]></source>
-        <target><![CDATA[%from_date% ile<br />%to_date% arası]]></target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.uk.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.uk.xml
deleted file mode 100644
index 532bda41b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.uk.xml
+++ /dev/null
@@ -1,174 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>Новий запис</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>Редагувати</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>Видалити</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>Список</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>Зберегти</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>Зберегти і додати</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>Скасувати</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Choose an action</source>
-        <target>Виберіть дію</target>
-      </trans-unit>
-      <trans-unit>
-        <source>go</source>
-        <target>Виконати</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Back to list</source>
-        <target>Повернутися до списку</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>Скинути</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>Фільтрувати</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>Результат відсутній</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>Дії</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(сторінка %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>(А-Я)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>(Я-А)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>[0] no result|[1] 1 result|(1,+Inf] %1% results</source>
-        <target>[0] результат відсутній|[1] 1 результат|(1,+Inf] %1% результати(ів)</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>Перша сторінка</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>Попередня сторінка</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>Наступна сторінка</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>Остання сторінка</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>Запис успішно створено.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>Запис успішно оновлено.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>Запис успішно створено. Можете додати ще один.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>Запис успішно змінено. Можете додати ще один.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>Запис не було збережено через помилки.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>Запис успішно знищено.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>Ви повинні вибрати принаймні один запис.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>Ви повинні вибрати дію, що буде виконана над позначеними записами.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>Деякі записи серед вибраних для знищення вже відсутні.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>Позначені записи успішно знищено.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>При видаленні позначених записів виникла помилка.</target>
-      </trans-unit>
-      <trans-unit>
-        <source>is empty</source>
-        <target>пусте значення</target>
-      </trans-unit>
-      <trans-unit>
-        <source>yes or no</source>
-        <target>так чи ні</target>
-      </trans-unit>
-      <trans-unit>
-        <source>yes</source>
-        <target>так</target>
-      </trans-unit>
-      <trans-unit>
-        <source>no</source>
-        <target>ні</target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[from %from_date% to %to_date%]]></source>
-        <target><![CDATA[від %from_date% до %to_date%]]></target>
-      </trans-unit>
-      <trans-unit>
-        <source><![CDATA[from %from_date%<br />to %to_date%]]></source>
-        <target><![CDATA[від %from_date%<br />до %to_date%]]></target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.zh_CN.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.zh_CN.xml
deleted file mode 100644
index abcf56193..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.zh_CN.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>New</source>
-        <target>新建</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>编辑</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>删除</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>列表</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>保存</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>保存并继续添加</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>返回</target>
-      </trans-unit>
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>重设</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>过滤器</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>No result</source>
-        <target>没有数据</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>操作</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(页码 %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>顺序</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>逆序</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>首页</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>上一页</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>下一页</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>尾页</target>
-      </trans-unit>
-
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>内容创建成功。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>内容已更新。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>内容已创建，将继续创建新内容。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>内容已更新，将继续创建新内容。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>有错误，内容保存失败。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>内容已删除。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>至少要选择一项。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>请选取一个针对该条目的操作。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>不能删除不存在的条目。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>选定的条目已删除。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>在删除过程中发生错误。</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.zh_TW.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.zh_TW.xml
deleted file mode 100644
index a1988eba0..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/i18n/sf_admin.zh_TW.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN" "http://www.oasis-open.org/committees/xliff/documents/xliff.dtd" >
-<xliff version="1.0">
-  <file original="global" source-language="en" datatype="plaintext">
-    <header />
-    <body>
-      <!-- Actions -->
-      <trans-unit>
-        <source>Choose an action</source>
-        <target>選擇一個動作</target>
-      </trans-unit>      
-      <trans-unit>
-        <source>go</source>
-        <target>進行</target>
-      </trans-unit>            
-      <trans-unit>
-        <source>New</source>
-        <target>新建</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Edit</source>
-        <target>編輯</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Delete</source>
-        <target>刪除</target>
-      </trans-unit>
-      <trans-unit>
-        <source>List</source>
-        <target>列表</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save</source>
-        <target>保存</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Save and add</source>
-        <target>保存並繼續添加</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Cancel</source>
-        <target>返回</target>
-      </trans-unit>
-      
-      <trans-unit>
-        <source>Back to list</source>
-        <target>返回列表</target>
-      </trans-unit>      
-
-      <!-- Filters -->
-      <trans-unit>
-        <source>Reset</source>
-        <target>重設</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Filter</source>
-        <target>篩選</target>
-      </trans-unit>
-
-      <!-- List -->
-      <trans-unit>
-        <source>[0] no result|[1] 1 result|(1,+Inf] %1% results</source>
-        <target>[0] 沒有數據|[1] 1 筆數據|(1,+Inf] %1% 筆數據</target>
-      </trans-unit>
-      <trans-unit>
-        <source>No result</source>
-        <target>沒有數據</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Actions</source>
-        <target>操作</target>
-      </trans-unit>
-      <trans-unit>
-        <source>(page %%page%%/%%nb_pages%%)</source>
-        <target>(頁碼 %%page%%/%%nb_pages%%)</target>
-      </trans-unit>
-      <trans-unit>
-        <source>asc</source>
-        <target>遞增</target>
-      </trans-unit>
-      <trans-unit>
-        <source>desc</source>
-        <target>遞減</target>
-      </trans-unit>
-
-      <!-- Pagination -->
-      <trans-unit>
-        <source>First page</source>
-        <target>首頁</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Previous page</source>
-        <target>上一頁</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Next page</source>
-        <target>下一頁</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Last page</source>
-        <target>尾頁</target>
-      </trans-unit>
-      <!-- Form -->
-      <trans-unit>
-        <source>The item was created successfully.</source>
-        <target>內容創建成功。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully.</source>
-        <target>內容已更新。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was created successfully. You can add another one below.</source>
-        <target>內容已創建，將繼續創建新內容。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was updated successfully. You can add another one below.</source>
-        <target>內容已更新，將繼續創建新內容。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item has not been saved due to some errors.</source>
-        <target>有錯誤，內容保存失敗。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The item was deleted successfully.</source>
-        <target>內容已刪除。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must at least select one item.</source>
-        <target>至少要選擇一項。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>You must select an action to execute on the selected items.</source>
-        <target>請選取一個針對該條目的操作。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items as some items do not exist anymore.</source>
-        <target>不能刪除不存在的條目。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>The selected items have been deleted successfully.</source>
-        <target>選定的條目已刪除。</target>
-      </trans-unit>
-      <trans-unit>
-        <source>A problem occurs when deleting the selected items.</source>
-        <target>在刪除過程中發生錯誤。</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfMixer.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfMixer.class.php
deleted file mode 100644
index 1826a2b30..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfMixer.class.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * sfMixer implements mixins and hooks.
- *
- * @package    symfony
- * @subpackage propel
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfMixer.class.php 11108 2008-08-25 11:00:07Z Kris.Wallsmith $
- */
-class sfMixer
-{
-  static protected
-    $mixins          = array(),
-    $mixinParameters = array(),
-    $mixinInstances  = array();
-
-  static public function register($name, $callable)
-  {
-    $lazy = false;
-
-    if (is_array($callable))
-    {
-      $mixinClass = $callable[0];
-      $mixinMethod = $callable[1];
-      if (!is_object($mixinClass))
-      {
-        $rc = new ReflectionClass($mixinClass);
-        $rm = $rc->getMethod($mixinMethod);
-        if (!$rm->isStatic())
-        {
-          $lazy = true;
-        }
-      }
-    }
-    else
-    {
-      $mixinMethod = $callable;
-    }
-
-    $tmp = explode(':', $name);
-    $class = $tmp[0];
-
-    // do we have a method name
-    if (isset($tmp[1]))
-    {
-      $method = $tmp[1];
-
-      // do we have a hook name
-      if (isset($tmp[2]))
-      {
-        $hook = $tmp[2];
-      }
-      else
-      {
-        $hook = $method;
-        $name .= ':'.$hook;
-      }
-    }
-    else
-    {
-      // this will be called with __call
-      $method = $mixinMethod;
-      $name = $class.':'.$method;
-      $hook = '';
-    }
-
-    // we cannot register 2 new methods with the same name
-    if (!$hook && isset(self::$mixins[$name]))
-    {
-      throw new Exception(sprintf('The class "%s" has already a mixin for method "%s".', $class, $mixinMethod));
-    }
-
-    // register mixin
-    if (!isset(self::$mixins[$name]))
-    {
-      self::$mixins[$name] = array();
-    }
-
-    if (!isset(self::$mixinParameters[$name]))
-    {
-      self::$mixinParameters[$name] = array();
-    }
-
-    self::$mixins[$name][] = $callable;
-    self::$mixinParameters[$name][] = array(
-      'lazy'     => $lazy,
-      'class'    => $class,
-      'method'   => $method,
-      'hook'     => $hook,
-    );
-  }
-
-  static public function getMixinInstance($name)
-  {
-    if (!isset(self::$mixins[$name]))
-    {
-      return;
-    }
-
-    foreach (self::$mixins[$name] as $i => $mixin)
-    {
-      if (!self::$mixinParameters[$name][$i]['lazy'])
-      {
-        continue;
-      }
-
-      $class = $mixin[0];
-      if (!isset(self::$mixinInstances[$class]))
-      {
-        self::$mixinInstances[$class] = new $class();
-        if (method_exists(self::$mixinInstances[$class], 'initialize'))
-        {
-          self::$mixinInstances[$class]->initialize();
-        }
-      }
-
-      self::$mixinParameters[$name][$i]['lazy'] = false;
-      self::$mixins[$name][$i][0] = self::$mixinInstances[$class];
-    }
-  }
-
-  static public function getCallables($name)
-  {
-    self::getMixinInstance($name);
-
-    return isset(self::$mixins[$name]) ? self::$mixins[$name] : array();
-  }
-
-  static public function getCallable($name)
-  {
-    self::getMixinInstance($name);
-
-    return isset(self::$mixins[$name]) ? self::$mixins[$name][0] : null;
-  }
-
-  static public function callMixins($hookName = null, $moreParams = array())
-  {
-    $traces = debug_backtrace();
-    $function = $traces[1]['function'];
-    $parameters = $traces[1]['args'];
-    $class = $traces[1]['class'];
-    $type = $traces[1]['type'];
-    if ('__call' == $function)
-    {
-      $method     = $parameters[0];
-      $parameters = $parameters[1];
-    }
-    else
-    {
-      $method = $function;
-    }
-
-    if ('->' == $type)
-    {
-      array_unshift($parameters, $traces[1]['object']);
-    }
-    else
-    {
-      array_unshift($parameters, $class);
-    }
-
-    // add more parameters
-    $parameters = array_merge($parameters, (array) $moreParams);
-
-    if ('__call' == $function)
-    {
-      if ($callable = self::getCallable($class.':'.$method))
-      {
-        return call_user_func_array($callable, $parameters);
-      }
-      else
-      {
-        throw new Exception(sprintf('Call to undefined method %s::%s.', $class, $method));
-      }
-    }
-    else
-    {
-      $hookName = $hookName ? $hookName : $method;
-      foreach (self::getCallables($class.':'.$method.':'.$hookName) as $callable)
-      {
-        call_user_func_array($callable, $parameters);
-      }
-    }
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfPropel.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfPropel.class.php
deleted file mode 100644
index 961e54b8a..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfPropel.class.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Initialization for propel and i18n propel integration.
- *
- * @package    sfPropelPlugin
- * @subpackage addon
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropel.class.php 23737 2009-11-09 23:23:25Z Kris.Wallsmith $
- */
-class sfPropel
-{
-  static protected
-    $defaultCulture = 'en';
-
-  /**
-   * Initialize symfony propel
-   *
-   * @param sfEventDispatcher $dispatcher
-   * @param string $culture
-   * 
-   * @deprecated Moved to {@link sfPropelPluginConfiguration}
-   */
-  static public function initialize(sfEventDispatcher $dispatcher, $culture = null)
-  {
-    $dispatcher->notify(new sfEvent(__CLASS__, 'application.log', array(__METHOD__.'() has been deprecated. Please call sfPropel::setDefaultCulture() to set the culture.', 'priority' => sfLogger::NOTICE)));
-
-    if (null !== $culture)
-    {
-      self::setDefaultCulture($culture);
-    }
-    else if (class_exists('sfContext', false) && sfContext::hasInstance() && $user = sfContext::getInstance()->getUser())
-    {
-      self::setDefaultCulture($user->getCulture());
-    }
-  }
-
-  /**
-   * Sets the default culture
-   *
-   * @param string $culture
-   */
-  static public function setDefaultCulture($culture)
-  {
-    self::$defaultCulture = $culture;
-  }
-
-  /**
-   * Return the default culture
-   *
-   * @return string the default culture
-   */
-  static public function getDefaultCulture()
-  {
-    return self::$defaultCulture;
-  }
-
-  /**
-   * Listens to the user.change_culture event.
-   *
-   * @param sfEvent An sfEvent instance
-   *
-   */
-  static public function listenToChangeCultureEvent(sfEvent $event)
-  {
-    self::setDefaultCulture($event['culture']);
-  }
-
-  /**
-   * @deprecated Use Propel::importClass() instead
-   */
-  static public function import($path)
-  {
-    return Propel::importClass($path);
-  }
-
-  /**
-   * @deprecated Use Propel::importClass() instead
-   */
-  static public function importClass($path)
-  {
-    return Propel::importClass($path);
-  }
-
-  /**
-   * Clears all instance pools.
-   *
-   * @deprecated Moved to {@link sfPropelPluginConfiguration}
-   */
-  static public function clearAllInstancePools()
-  {
-    sfProjectConfiguration::getActive()->getPluginConfiguration('sfPropelPlugin')->clearAllInstancePools();
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfPropelBehavior.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfPropelBehavior.class.php
deleted file mode 100644
index 524e4fef4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfPropelBehavior.class.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Manages behaviors for propel. Implements hooks for propel objects.
- *
- * @package    symfony
- * @subpackage propel
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelBehavior.class.php 12809 2008-11-09 09:14:58Z fabien $
- */
-class sfPropelBehavior
-{
-  static protected
-    $loaded    = array(),
-    $behaviors = array();
-
-  static public function registerMethods($name, $callables)
-  {
-    if (!isset(self::$behaviors[$name]))
-    {
-      self::$behaviors[$name] = array('methods' => array(), 'hooks' => array());
-    }
-    foreach ($callables as $callable)
-    {
-      self::$behaviors[$name]['methods'][] = $callable;
-    }
-  }
-
-  static public function registerHooks($name, $hooks)
-  {
-    if (!isset(self::$behaviors[$name]))
-    {
-      self::$behaviors[$name] = array('methods' => array(), 'hooks' => array());
-    }
-    foreach ($hooks as $hook => $callable)
-    {
-      if (!isset(self::$behaviors[$name]['hooks']))
-      {
-        self::$behaviors[$name]['hooks'][$hook] = array();
-      }
-
-      self::$behaviors[$name]['hooks'][$hook][] = $callable;
-    }
-  }
-
-  static public function add($class, $behaviors)
-  {
-    foreach ($behaviors as $name => $parameters)
-    {
-      if (is_int($name))
-      {
-        // no parameters
-        $name = $parameters;
-      }
-      else
-      {
-        // register parameters
-        foreach ($parameters as $key => $value)
-        {
-          sfConfig::set('propel_behavior_'.$name.'_'.$class.'_'.$key, $value);
-        }
-      }
-
-      if (!isset(self::$behaviors[$name]))
-      {
-        throw new sfConfigurationException(sprintf('Propel behavior "%s" is not registered', $name));
-      }
-
-      // register hooks
-      foreach (self::$behaviors[$name]['hooks'] as $hook => $callables)
-      {
-        foreach ($callables as $callable)
-        {
-          $key = 'Base'.$class.$hook.'//'.self::callableToString($callable);
-          if (!isset(self::$loaded[$key]))
-          {
-            sfMixer::register('Base'.$class.$hook, $callable);
-            self::$loaded[$key] = true;
-          }
-        }
-      }
-
-      // register new methods
-      foreach (self::$behaviors[$name]['methods'] as $callable)
-      {
-        $key = 'Base'.$class.'//'.self::callableToString($callable);
-        if (!isset(self::$loaded[$key]))
-        {
-          sfMixer::register('Base'.$class, $callable);
-          self::$loaded[$key] = true;
-        }
-      }
-    }
-  }
-
-  static protected function callableToString($callable)
-  {
-    return is_array($callable) ? (is_object($callable[0]) ? get_class($callable[0]) : $callable[0]).'::'.$callable[1] : var_export($callable, true);
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfPropelData.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfPropelData.class.php
deleted file mode 100644
index 88503efdf..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfPropelData.class.php
+++ /dev/null
@@ -1,530 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * This class is the Propel implementation of sfData.  It interacts with the data source
- * and loads data.
- *
- * @package    symfony
- * @subpackage propel
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelData.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
- */
-class sfPropelData extends sfData
-{
-  protected
-    $deletedClasses = array(),
-    $con            = null;
-
-  /**
-   * Loads data from a file or directory into a Propel data source
-   *
-   * @see sfPropelData::loadData()
-   *
-   * @param mixed   $directoryOrFile  A file or directory path or an array of files or directories
-   * @param string  $connectionName   The Propel connection name, default 'propel'
-   *
-   * @throws Exception If the database throws an error, rollback transaction and rethrows exception
-   */
-  public function loadData($directoryOrFile = null, $connectionName = 'propel')
-  {
-    $files = $this->getFiles($directoryOrFile);
-
-    // load map classes
-    $this->loadMapBuilders();
-    $this->dbMap = Propel::getDatabaseMap($connectionName);
-
-    // wrap all database operations in a single transaction
-    $this->con = Propel::getConnection($connectionName);
-    try
-    {
-      $this->con->beginTransaction();
-
-      $this->doDeleteCurrentData($files);
-
-      $this->doLoadData($files);
-
-      $this->con->commit();
-    }
-    catch (Exception $e)
-    {
-      $this->con->rollBack();
-      throw $e;
-    }
-  }
-
-  /**
-   * Implements the abstract loadDataFromArray method and loads the data using the generated data model.
-   *
-   * @param array   $data  The data to be loaded into the data source
-   *
-   * @throws Exception If data is unnamed.
-   * @throws sfException If an object defined in the model does not exist in the data
-   * @throws sfException If a column that does not exist is referenced
-   */
-  public function loadDataFromArray($data)
-  {
-    if ($data === null)
-    {
-      // no data
-      return;
-    }
-
-    foreach ($data as $class => $datas)
-    {
-      $class = trim($class);
-
-      $tableMap = $this->dbMap->getTable(constant(constant($class.'::PEER').'::TABLE_NAME'));
-
-      $column_names = call_user_func_array(array(constant($class.'::PEER'), 'getFieldNames'), array(BasePeer::TYPE_FIELDNAME));
-
-      // iterate through datas for this class
-      // might have been empty just for force a table to be emptied on import
-      if (!is_array($datas))
-      {
-        continue;
-      }
-
-      foreach ($datas as $key => $data)
-      {
-        // create a new entry in the database
-        if (!class_exists($class))
-        {
-          throw new InvalidArgumentException(sprintf('Unknown class "%s".', $class));
-        }
-
-        $obj = new $class();
-
-        if (!$obj instanceof BaseObject)
-        {
-          throw new RuntimeException(sprintf('The class "%s" is not a Propel class. This probably means there is already a class named "%s" somewhere in symfony or in your project.', $class, $class));
-        }
-
-        if (!is_array($data))
-        {
-          throw new InvalidArgumentException(sprintf('You must give a name for each fixture data entry (class %s).', $class));
-        }
-
-        foreach ($data as $name => $value)
-        {
-          if (is_array($value) && 's' == substr($name, -1))
-          {
-            // many to many relationship
-            $this->loadMany2Many($obj, substr($name, 0, -1), $value);
-
-            continue;
-          }
-
-          $isARealColumn = true;
-          try
-          {
-            $column = $tableMap->getColumn($name);
-          }
-          catch (PropelException $e)
-          {
-            $isARealColumn = false;
-          }
-
-          // foreign key?
-          if ($isARealColumn)
-          {
-            if ($column->isForeignKey() && null !== $value)
-            {
-              $relatedTable = $this->dbMap->getTable($column->getRelatedTableName());
-              if (!isset($this->object_references[$relatedTable->getPhpName().'_'.$value]))
-              {
-                throw new InvalidArgumentException(sprintf('The object "%s" from class "%s" is not defined in your data file.', $value, $relatedTable->getPhpName()));
-              }
-              $value = $this->object_references[$relatedTable->getPhpName().'_'.$value]->getByName($column->getRelatedName(), BasePeer::TYPE_COLNAME);
-            }
-          }
-
-          if (false !== $pos = array_search($name, $column_names))
-          {
-            $obj->setByPosition($pos, $value);
-          }
-          else if (is_callable(array($obj, $method = 'set'.sfInflector::camelize($name))))
-          {
-            $obj->$method($value);
-          }
-          else
-          {
-            throw new InvalidArgumentException(sprintf('Column "%s" does not exist for class "%s".', $name, $class));
-          }
-        }
-        $obj->save($this->con);
-
-        // save the object for future reference
-        if (method_exists($obj, 'getPrimaryKey'))
-        {
-          $this->object_references[Propel::importClass(constant(constant($class.'::PEER').'::CLASS_DEFAULT')).'_'.$key] = $obj;
-        }
-      }
-    }
-  }
-
-  /**
-   * Loads many to many objects.
-   *
-   * @param BaseObject $obj               A Propel object
-   * @param string     $middleTableName   The middle table name
-   * @param array      $values            An array of values
-   */
-  protected function loadMany2Many($obj, $middleTableName, $values)
-  {
-    $middleTable = $this->dbMap->getTable($middleTableName);
-    $middleClass = $middleTable->getPhpName();
-    foreach ($middleTable->getColumns()  as $column)
-    {
-      if ($column->isForeignKey() && constant(constant(get_class($obj).'::PEER').'::TABLE_NAME') != $column->getRelatedTableName())
-      {
-        $relatedClass = $this->dbMap->getTable($column->getRelatedTableName())->getPhpName();
-        break;
-      }
-    }
-
-    if (!isset($relatedClass))
-    {
-      throw new InvalidArgumentException(sprintf('Unable to find the many-to-many relationship for object "%s".', get_class($obj)));
-    }
-
-    $setter = 'set'.get_class($obj);
-    $relatedSetter = 'set'.$relatedClass;
-
-    foreach ($values as $value)
-    {
-      if (!isset($this->object_references[$relatedClass.'_'.$value]))
-      {
-        throw new InvalidArgumentException(sprintf('The object "%s" from class "%s" is not defined in your data file.', $value, $relatedClass));
-      }
-
-      $middle = new $middleClass();
-      $middle->$setter($obj);
-      $middle->$relatedSetter($this->object_references[$relatedClass.'_'.$value]);
-      $middle->save();
-    }
-  }
-
-  /**
-   * Clears existing data from the data source by reading the fixture files
-   * and deleting the existing data for only those classes that are mentioned
-   * in the fixtures.
-   *
-   * @param array $files The list of YAML files.
-   *
-   * @throws sfException If a class mentioned in a fixture can not be found
-   */
-  protected function doDeleteCurrentData($files)
-  {
-    // delete all current datas in database
-    if (!$this->deleteCurrentData)
-    {
-      return;
-    }
-
-    rsort($files);
-    foreach ($files as $file)
-    {
-      $data = sfYaml::load($file);
-
-      if ($data === null)
-      {
-        // no data
-        continue;
-      }
-
-      $classes = array_keys($data);
-      foreach (array_reverse($classes) as $class)
-      {
-        $class = trim($class);
-        if (in_array($class, $this->deletedClasses))
-        {
-          continue;
-        }
-
-        // Check that peer class exists before calling doDeleteAll()
-        if (!class_exists(constant($class.'::PEER')))
-        {
-          throw new InvalidArgumentException(sprintf('Unknown class "%sPeer".', $class));
-        }
-
-        call_user_func(array(constant($class.'::PEER'), 'doDeleteAll'), $this->con);
-
-        $this->deletedClasses[] = $class;
-      }
-    }
-  }
-
-  /**
-   * Loads all map builders.
-   *
-   * @throws sfException If the class cannot be found
-   */
-  protected function loadMapBuilders()
-  {
-    $dbMap = Propel::getDatabaseMap();
-    $files = sfFinder::type('file')->name('*TableMap.php')->in(sfProjectConfiguration::getActive()->getModelDirs());
-    foreach ($files as $file)
-    {
-      $omClass = basename($file, 'TableMap.php');
-      if (class_exists($omClass) && is_subclass_of($omClass, 'BaseObject'))
-      {
-        $tableMapClass = basename($file, '.php');
-        $dbMap->addTableFromMapClass($tableMapClass);
-      }
-    }
-  }
-
-  /**
-   * Dumps data to fixture from one or more tables.
-   *
-   * @param string $directoryOrFile   The directory or file to dump to
-   * @param mixed  $tables            The name or names of tables to dump (or all to dump all tables)
-   * @param string $connectionName    The connection name (default to propel)
-   */
-  public function dumpData($directoryOrFile, $tables = 'all', $connectionName = 'propel')
-  {
-    $dumpData = $this->getData($tables, $connectionName);
-
-    // save to file(s)
-    if (!is_dir($directoryOrFile))
-    {
-      file_put_contents($directoryOrFile, sfYaml::dump($dumpData, 3));
-    }
-    else
-    {
-      $i = 0;
-      foreach ($tables as $tableName)
-      {
-        if (!isset($dumpData[$tableName]))
-        {
-          continue;
-        }
-
-        file_put_contents(sprintf("%s/%03d-%s.yml", $directoryOrFile, ++$i, $tableName), sfYaml::dump(array($tableName => $dumpData[$tableName]), 3));
-      }
-    }
-  }
-
-  /**
-   * Returns data from one or more tables.
-   *
-   * @param  mixed  $tables           name or names of tables to dump (or all to dump all tables)
-   * @param  string $connectionName   connection name
-   *
-   * @return array  An array of database data
-   */
-  public function getData($tables = 'all', $connectionName = 'propel')
-  {
-    $this->loadMapBuilders();
-    $this->con = Propel::getConnection($connectionName);
-    $this->dbMap = Propel::getDatabaseMap($connectionName);
-
-    // get tables
-    if ('all' === $tables || null === $tables)
-    {
-      $tables = array();
-      foreach ($this->dbMap->getTables() as $table)
-      {
-        $tables[] = $table->getPhpName();
-      }
-    }
-    else if (!is_array($tables))
-    {
-      $tables = array($tables);
-    }
-
-    $dumpData = array();
-
-    $tables = $this->fixOrderingOfForeignKeyData($tables);
-    foreach ($tables as $tableName)
-    {
-      $tableMap = $this->dbMap->getTable(constant(constant($tableName.'::PEER').'::TABLE_NAME'));
-      $hasParent = false;
-      $haveParents = false;
-      $fixColumn = null;
-      foreach ($tableMap->getColumns() as $column)
-      {
-        $col = strtolower($column->getName());
-        if ($column->isForeignKey())
-        {
-          $relatedTable = $this->dbMap->getTable($column->getRelatedTableName());
-          if ($tableName === $relatedTable->getPhpName())
-          {
-            if ($hasParent)
-            {
-              $haveParents = true;
-            }
-            else
-            {
-              $fixColumn = $column;
-              $hasParent = true;
-            }
-          }
-        }
-      }
-
-      if ($haveParents)
-      {
-        // unable to dump tables having multi-recursive references
-        continue;
-      }
-
-      // get db info
-      $resultsSets = array();
-      if ($hasParent)
-      {
-        $resultsSets[] = $this->fixOrderingOfForeignKeyDataInSameTable($resultsSets, $tableName, $fixColumn);
-      }
-      else
-      {
-        $in = array();
-        foreach ($tableMap->getColumns() as $column)
-        {
-          $in[] = strtolower($column->getName());
-        }
-        $stmt = $this->con->query(sprintf('SELECT %s FROM %s', implode(',', $in), constant(constant($tableName.'::PEER').'::TABLE_NAME')));
-
-        $resultsSets[] = $stmt->fetchAll(PDO::FETCH_ASSOC);
-        $stmt->closeCursor();
-        unset($stmt);
-      }
-
-      foreach ($resultsSets as $rows)
-      {
-        if(count($rows) > 0 && !isset($dumpData[$tableName]))
-        {
-          $dumpData[$tableName] = array();
-
-          foreach ($rows as $row)
-          {
-            $pk = $tableName;
-            $values = array();
-            $primaryKeys = array();
-            $foreignKeys = array();
-
-            foreach ($tableMap->getColumns() as $column)
-            {
-              $col = strtolower($column->getName());
-              $isPrimaryKey = $column->isPrimaryKey();
-
-              if (null === $row[$col])
-              {
-                continue;
-              }
-
-              if ($isPrimaryKey)
-              {
-                $value = $row[$col];
-                $pk .= '_'.$value;
-                $primaryKeys[$col] = $value;
-              }
-
-              if ($column->isForeignKey())
-              {
-                $relatedTable = $this->dbMap->getTable($column->getRelatedTableName());
-                if ($isPrimaryKey)
-                {
-                  $foreignKeys[$col] = $row[$col];
-                  $primaryKeys[$col] = $relatedTable->getPhpName().'_'.$row[$col];
-                }
-                else
-                {
-                  $values[$col] = $relatedTable->getPhpName().'_'.$row[$col];
-
-                  $values[$col] = strlen($row[$col]) ? $relatedTable->getPhpName().'_'.$row[$col] : '';
-                }
-              }
-              elseif (!$isPrimaryKey || ($isPrimaryKey && !$tableMap->isUseIdGenerator()))
-              {
-                // We did not want auto incremented primary keys
-                $values[$col] = $row[$col];
-              }
-            }
-
-            if (count($primaryKeys) > 1 || (count($primaryKeys) > 0 && count($foreignKeys) > 0))
-            {
-              $values = array_merge($primaryKeys, $values);
-            }
-
-            $dumpData[$tableName][$pk] = $values;
-          }
-        }
-      }
-    }
-
-    return $dumpData;
-  }
-
-  /**
-   * Fixes the ordering of foreign key data, by outputting data a foreign key depends on before the table with the foreign key.
-   *
-   * @param array $classes The array with the class names.
-   */
-  public function fixOrderingOfForeignKeyData($classes)
-  {
-    // reordering classes to take foreign keys into account
-    for ($i = 0, $count = count($classes); $i < $count; $i++)
-    {
-      $class = $classes[$i];
-      $tableMap = $this->dbMap->getTable(constant(constant($class.'::PEER').'::TABLE_NAME'));
-      foreach ($tableMap->getColumns() as $column)
-      {
-        if ($column->isForeignKey())
-        {
-          $relatedTable = $this->dbMap->getTable($column->getRelatedTableName());
-          $relatedTablePos = array_search($relatedTable->getPhpName(), $classes);
-
-          // check if relatedTable is after the current table
-          if ($relatedTablePos > $i)
-          {
-            // move related table 1 position before current table
-            $classes = array_merge(
-              array_slice($classes, 0, $i),
-              array($classes[$relatedTablePos]),
-              array_slice($classes, $i, $relatedTablePos - $i),
-              array_slice($classes, $relatedTablePos + 1)
-            );
-
-            // we have moved a table, so let's see if we are done
-            return $this->fixOrderingOfForeignKeyData($classes);
-          }
-        }
-      }
-    }
-
-    return $classes;
-  }
-
-  protected function fixOrderingOfForeignKeyDataInSameTable($resultsSets, $tableName, $column, $in = null)
-  {
-    $sql = sprintf('SELECT * FROM %s WHERE %s %s',
-                   constant(constant($tableName.'::PEER').'::TABLE_NAME'),
-                   strtolower($column->getName()),
-                   null === $in ? 'IS NULL' : 'IN ('.$in.')');
-    $stmt = $this->con->prepare($sql);
-
-    $stmt->execute();
-
-    $in = array();
-    while ($row = $stmt->fetch(PDO::FETCH_ASSOC))
-    {
-      $in[] = "'".$row[strtolower($column->getRelatedColumnName())]."'";
-      $resultsSets[] = $row;
-    }
-
-    if ($in = implode(', ', $in))
-    {
-      $resultsSets = $this->fixOrderingOfForeignKeyDataInSameTable($resultsSets, $tableName, $column, $in);
-    }
-
-    return $resultsSets;
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfPropelDatabaseSchema.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfPropelDatabaseSchema.class.php
deleted file mode 100644
index 2f5f94bea..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfPropelDatabaseSchema.class.php
+++ /dev/null
@@ -1,1306 +0,0 @@
-<?php
-
-/*
-* This file is part of the symfony package.
-* (c) Fabien Potencier <fabien.potencier@symfony-project.com>
-* (c) Francois Zaninotto <francois.zaninotto@symfony-project.com>
-*
-* For the full copyright and license information, please view the LICENSE
-* file that was distributed with this source code.
-*/
-
-/**
- * Manages propel database schemas as YAML and XML.
- *
- * @package    symfony
- * @subpackage propel
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @author     François Zaninotto <francois.zaninotto@symfony-project.com>
- * @version    SVN: $Id: sfPropelDatabaseSchema.class.php 24392 2009-11-25 18:35:39Z FabianLange $
- */
-class sfPropelDatabaseSchema
-{
-  protected $connection_name = '';
-  protected $database        = array();
-
-  /**
-   * Dumps schema as array
-   *
-   * @return array
-   */
-  public function asArray()
-  {
-    return array($this->connection_name => $this->database);
-  }
-
-  /**
-   * Load schema from array
-   *
-   * @param array $schema_array
-   */
-  public function loadArray($schema_array)
-  {
-    if (is_array($schema_array) && !empty($schema_array))
-    {
-      $database = array();
-      $connection_name = '';
-
-      if (isset($schema_array['classes']))
-      {
-        // New schema syntax
-        $schema_array = $this->convertNewToOldYaml($schema_array);
-      }
-
-      if (count($schema_array) > 1)
-      {
-        throw new sfException('A schema.yml must only contain 1 database entry.');
-      }
-
-      $tmp = array_keys($schema_array);
-      $connection_name = array_shift($tmp);
-
-      if ($connection_name)
-      {
-        $database = $schema_array[$connection_name];
-      }
-
-      $this->connection_name = $connection_name;
-      $this->database = $database;
-
-      $this->fixYAMLDatabase();
-      $this->fixYAMLI18n();
-      $this->fixYAMLColumns();
-    }
-  }
-
-  /**
-   * Load schema from YAML file
-   *
-   * @param string $file
-   */
-  public function loadYAML($file)
-  {
-    $schema_array = sfYaml::load($file);
-
-    if (!is_array($schema_array))
-    {
-      return; // No defined schema here, skipping
-    }
-
-    if (!isset($schema_array['classes']))
-    {
-      // Old schema syntax: we convert it
-      $schema_array = $this->convertOldToNewYaml($schema_array);
-    }
-
-    $this->loadArray($schema_array);
-  }
-
-  /**
-   * Converts old yaml format schema to new yaml schema
-   *
-   * @param array $schema
-   *
-   * @return array
-   */
-  public function convertOldToNewYaml($schema)
-  {
-    if (is_array($schema) && !empty($schema))
-    {
-      $new_schema = array();
-
-      $tmp = array_keys($schema);
-      $connection_name = array_shift($tmp);
-
-      if (!empty($connection_name) && isset($schema[$connection_name]))
-      {
-        $new_schema['connection'] = $connection_name;
-
-        $classes = array();
-        foreach($schema[$connection_name] as $table => $table_params)
-        {
-          if ($table == '_attributes')
-          {
-            // Database attributes
-            $new_schema = array_merge($new_schema, $table_params);
-          }
-          else if ('_propel_behaviors' == $table)
-          {
-            // Database behaviors
-            $new_schema['propel_behaviors'] = $table_params;
-          }
-          else
-          {
-            // Table
-            $phpName = sfInflector::camelize($table);
-            if (isset($table_params['_attributes']))
-            {
-              $table_attributes = $table_params['_attributes'];
-              unset($table_params['_attributes']);
-              if (isset($table_attributes['phpName']))
-              {
-                $phpName = $table_attributes['phpName'];
-                unset($table_attributes['phpName']);
-              }
-            }
-            else
-            {
-              $table_attributes = array();
-            }
-            $classes[$phpName] = $table_attributes;
-            $classes[$phpName]['tableName'] = $table;
-            $classes[$phpName]['columns'] = array();
-            foreach($table_params as $column => $column_params)
-            {
-              switch($column)
-              {
-                case '_behaviors':
-                  $classes[$phpName]['behaviors'] = $column_params;
-                  break;
-                case '_propel_behaviors':
-                  $classes[$phpName]['propel_behaviors'] = $column_params;
-                  break;
-                case '_inheritance':
-                  $classes[$phpName]['inheritance'] = $column_params;
-                  break;
-                case '_nestedSet':
-                  $classes[$phpName]['nestedSet'] = $column_params;
-                  break;
-                case '_foreignKeys':
-                  $classes[$phpName]['foreignKeys'] = $column_params;
-                  break;
-                case '_indexes':
-                  $classes[$phpName]['indexes'] = $column_params;
-                  break;
-                case '_uniques':
-                  $classes[$phpName]['uniques'] = $column_params;
-                  break;
-                default:
-                  $classes[$phpName]['columns'][$column] = $column_params;
-              }
-            }
-          }
-        }
-
-        $new_schema['classes'] = $classes;
-
-      }
-
-      return $new_schema;
-    }
-  }
-
-  /**
-   * Converts new yaml schema format to old yaml schema
-   *
-   * @param array $schema
-   *
-   * @return array
-   */
-  public function convertNewToOldYaml($schema)
-  {
-    if (isset($schema['connection']))
-    {
-      $connection_name = $schema['connection'];
-      unset($schema['connection']);
-    }
-    else
-    {
-      $connection_name = 'propel';
-    }
-
-    $database = array();
-
-    // Tables
-    if (isset($schema['classes']))
-    {
-      $tables = array();
-      foreach ($schema['classes'] as $className => $classParams)
-      {
-        $tableParams = array();
-
-        // Columns
-        if (isset($classParams['columns']))
-        {
-          $tableParams = array_merge($classParams['columns'], $tableParams);
-          unset($classParams['columns']);
-        }
-
-        // Indexes and foreign keys
-        if (isset($classParams['indexes']))
-        {
-          $tableParams['_indexes'] = $classParams['indexes'];
-          unset($classParams['indexes']);
-        }
-        if (isset($classParams['uniques']))
-        {
-          $tableParams['_uniques'] = $classParams['uniques'];
-          unset($classParams['uniques']);
-        }
-        if (isset($classParams['foreignKeys']))
-        {
-          $tableParams['_foreignKeys'] = $classParams['foreignKeys'];
-          unset($classParams['foreignKeys']);
-        }
-
-        // Behaviors
-        if (isset($classParams['behaviors']))
-        {
-          $tableParams['_behaviors'] = $classParams['behaviors'];
-          unset($classParams['behaviors']);
-        }
-        if (isset($classParams['propel_behaviors']))
-        {
-          $tableParams['_propel_behaviors'] = $classParams['propel_behaviors'];
-          unset($classParams['propel_behaviors']);
-        }
-
-        // Inheritance
-        if (isset($classParams['inheritance']))
-        {
-          $tableParams['_inheritance'] = $classParams['inheritance'];
-          unset($classParams['inheritance']);
-        }
-
-        // Nested sets
-        if (isset($classParams['nestedSet']))
-        {
-          $tableParams['_nestedSet'] = $classParams['nestedSet'];
-          unset($classParams['nestedSet']);
-        }
-
-        // Table attributes
-        $tableAttributes = array();
-        if (isset($classParams['tableName']))
-        {
-          $tableName = $classParams['tableName'];
-          unset($classParams['tableName']);
-        }
-        else
-        {
-          $tableName = sfInflector::underscore($className);
-        }
-
-        if (sfInflector::camelize($tableName) != $className)
-        {
-          $tableAttributes['phpName'] = $className;
-        }
-
-        if ($tableAttributes || $classParams)
-        {
-          $tableParams['_attributes'] = array_merge($tableAttributes, $classParams);
-        }
-
-        $tables[$tableName] = $tableParams;
-      }
-      $database = array_merge($database, $tables);
-      unset($schema['classes']);
-    }
-
-    // Database behaviors
-    if (isset($schema['propel_behaviors']))
-    {
-      $database['_propel_behaviors'] = $schema['propel_behaviors'];
-      unset($schema['propel_behaviors']);
-    }
-
-    // Database attributes
-    if ($schema)
-    {
-      $database['_attributes'] = $schema;
-    }
-
-    return array($connection_name => $database);
-  }
-
-  /**
-   * Dumps schema as propel xml
-   *
-   * @return unknown
-   */
-  public function asXML()
-  {
-    $xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-
-    $xml .= "<database name=\"$this->connection_name\"".$this->getAttributesFor($this->database).">\n";
-
-    if (isset($this->database['_propel_behaviors']))
-    {
-      foreach ($this->database['_propel_behaviors'] as $name => $parameters)
-      {
-        $xml .= "\n  <behavior name=\"$name\"";
-        if (is_array($parameters) && count($parameters))
-        {
-          $xml .= ">\n";
-          foreach ($parameters as $key => $value)
-          {
-            $xml .= "    <parameter name=\"$key\" value=\"{$this->fixXMLBoolean($value)}\"/>\n";
-          }
-          $xml .= "  </behavior>\n";
-        }
-        else
-        {
-          $xml .= "/>\n";
-        }
-      }
-    }
-
-    // tables
-    foreach ($this->getChildren($this->database) as $tb_name => $table)
-    {
-      // capture nested set config for this table
-      if ($isNestedSet = isset($table['_nestedSet']))
-      {
-        $treeConfig = $table['_nestedSet'];
-        if (
-          !isset($treeConfig['left'])
-          ||
-          !isset($treeConfig['right'])
-          ||
-          !isset($table[$treeConfig['left']])
-          ||
-          !isset($table[$treeConfig['right']])
-          ||
-          (isset($treeConfig['scope']) && !isset($table[$treeConfig['scope']]))
-        )
-        {
-          throw new sfException(sprintf('Incorrect NestedSet configuration for "%s" table.', $tb_name));
-        }
-      }
-
-      $xml .= "\n  <table name=\"$tb_name\"".$this->getAttributesFor($table);
-      if ($isNestedSet)
-      {
-        $xml .= ' treeMode="NestedSet"';
-      }
-      if (isset($table['_behaviors']))
-      {
-        $xml .= sprintf(" behaviors=\"%s\"", htmlspecialchars(serialize($table['_behaviors'])), ENT_QUOTES, sfConfig::get('sf_charset'));
-      }
-      $xml .= ">\n";
-      
-      // behaviors
-      if (isset($table['_propel_behaviors']))
-      {
-        foreach ($table['_propel_behaviors'] as $behavior_name => $parameters)
-        {
-          if ($parameters)
-          {
-            $xml .= "    <behavior name=\"$behavior_name\">\n";
-            foreach ($parameters as $param_name => $param_value)
-            {
-              $xml .= "      <parameter name=\"$param_name\" value=\"{$this->fixXMLBoolean($param_value)}\" />\n";
-            }
-            $xml .= "    </behavior>\n";
-          }
-          else
-          {
-            $xml .= "    <behavior name=\"$behavior_name\" />\n";
-          }
-        }
-      }
-      
-      // columns
-      foreach ($this->getChildren($table) as $col_name => $column)
-      {
-        // inheritance
-        if (
-          isset($table['_inheritance'])
-          &&
-          isset($table['_inheritance']['column'])
-          &&
-          $col_name == $table['_inheritance']['column']
-          &&
-          isset($table['_inheritance']['classes'])
-          &&
-          is_array($table['_inheritance']['classes'])
-        )
-        {
-          $column['inheritance'] = $table['_inheritance']['classes'];
-          unset($table['_inheritance']);
-        }
-
-        // add nested set attributes to this column
-        if ($isNestedSet && in_array($col_name, $treeConfig))
-        {
-          if ($col_name == $treeConfig['left'])
-          {
-            $column['nestedSetLeftKey'] = 'true';
-          }
-          elseif ($col_name == $treeConfig['right'])
-          {
-            $column['nestedSetRightKey'] = 'true';
-          }
-          elseif (isset($treeConfig['scope']) && $col_name == $treeConfig['scope'])
-          {
-            $column['treeScopeKey'] = 'true';
-          }
-        }
-
-        $xml .= "    <column name=\"$col_name\"".$this->getAttributesForColumn($tb_name, $col_name, $column);
-      }
-
-      // indexes
-      if (isset($table['_indexes']))
-      {
-        foreach ($table['_indexes'] as $index_name => $index)
-        {
-          $xml .= "    <index name=\"$index_name\">\n";
-          foreach ($index as $index_column)
-          {
-            preg_match('/^(.+?)\(([\d]+)\)$/', $index_column, $matches);
-            if (isset($matches[2]))
-            {
-              $xml .= "      <index-column name=\"{$matches[1]}\" size=\"{$matches[2]}\" />\n";
-            }
-            else
-            {
-              $xml .= "      <index-column name=\"$index_column\" />\n";
-            }
-          }
-          $xml .= "    </index>\n";
-        }
-      }
-
-      // uniques
-      if (isset($table['_uniques']))
-      {
-        foreach ($table['_uniques'] as $unique_name => $index)
-        {
-          $xml .= "    <unique name=\"$unique_name\">\n";
-          foreach ($index as $unique_column)
-          {
-            preg_match('/^(.+?)\(([\d]+)\)$/', $unique_column, $matches);
-            if (isset($matches[2]))
-            {
-              $xml .= "      <unique-column name=\"{$matches[1]}\" size=\"{$matches[2]}\" />\n";
-            }
-            else
-            {
-              $xml .= "      <unique-column name=\"$unique_column\" />\n";
-            }
-          }
-          $xml .= "    </unique>\n";
-        }
-      }
-
-      // foreign-keys
-      if (isset($table['_foreignKeys']))
-      {
-        foreach ($table['_foreignKeys'] as $fkey_name => $fkey)
-        {
-          if (!isset($fkey['foreignTable']))
-          {
-            if (
-              !isset($fkey['foreignClass'])
-              ||
-              !$fkey['foreignTable'] = $this->findTable($fkey['foreignClass'])
-            )
-            {
-              throw new sfException(sprintf('Unable to resolve foreign table for foreign key "%s": %s', $fkey_name, var_export($fkey, true)));
-            }
-          }
-          unset($fkey['foreignClass']);
-
-          $xml .= '    <foreign-key';
-
-          // foreign key name
-          if (!is_numeric($fkey_name))
-          {
-            $xml .= " name=\"$fkey_name\"";
-          }
-
-          // other attributes
-          foreach ($fkey as $attribute_name => $attribute_value)
-          {
-            if (is_string($attribute_value))
-            {
-              $xml .= " $attribute_name=\"$attribute_value\"";
-            }
-          }
-
-          $xml .= ">\n";
-
-          // references
-          if (isset($fkey['references']))
-          {
-            foreach ($fkey['references'] as $reference)
-            {
-              $xml .= "      <reference local=\"{$reference['local']}\" foreign=\"{$reference['foreign']}\" />\n";
-            }
-          }
-          $xml .= "    </foreign-key>\n";
-        }
-      }
-
-      $xml .= "  </table>\n";
-    }
-    $xml .= "\n</database>\n";
-
-    return $xml;
-  }
-
-  /**
-   * Fixes databases in yaml shorthand schema
-   *
-   */
-  protected function fixYAMLDatabase()
-  {
-    if (!isset($this->database['_attributes']))
-    {
-      $this->database['_attributes'] = array();
-    }
-
-    // conventions for database attributes
-    $this->setIfNotSet($this->database['_attributes'], 'defaultIdMethod', 'native');
-    $this->setIfNotSet($this->database['_attributes'], 'package', 'lib.model');
-  }
-
-  /**
-   * Fixes i18n tables in yaml shorthand schema
-   *
-   */
-  protected function fixYAMLI18n()
-  {
-    foreach ($this->getTables() as $i18n_table => $columns)
-    {
-      $pos = strpos($i18n_table, '_i18n');
-
-      $has_primary_key = false;
-      foreach ($columns as $column => $attributes)
-      {
-        if (is_array($attributes) && array_key_exists('primaryKey', $attributes))
-        {
-          $has_primary_key = true;
-        }
-      }
-
-      if ($pos > 0 && $pos == strlen($i18n_table) - 5 && !$has_primary_key)
-      {
-        // i18n table without primary key
-        $main_table = $this->findTable(substr($i18n_table, 0, $pos));
-
-        if ($main_table)
-        {
-          // set i18n attributes for main table
-          $this->setIfNotSet($this->database[$main_table]['_attributes'], 'isI18N', 1);
-          $this->setIfNotSet($this->database[$main_table]['_attributes'], 'i18nTable', $i18n_table);
-
-          // set id and culture columns for i18n table
-          $this->setIfNotSet($this->database[$i18n_table], 'id', array(
-            'type'             => 'integer',
-            'required'         => true,
-            'primaryKey'       => true,
-            'foreignTable'     => $main_table,
-            'foreignReference' => 'id',
-            'onDelete'         => 'cascade',
-          ));
-          $this->setIfNotSet($this->database[$i18n_table], 'culture', array(
-            'isCulture'  => true,
-            'type'       => 'varchar',
-            'size'       => '7',
-            'required'   => true,
-            'primaryKey' => true,
-          ));
-        }
-        else
-        {
-          throw new sfException(sprintf('Missing main table for internationalized table "%s".', $i18n_table));
-        }
-      }
-    }
-  }
-
-  /**
-   * Fixes columns in yaml shorthand schema
-   *
-   */
-  protected function fixYAMLColumns()
-  {
-    foreach ($this->getTables() as $table => $columns)
-    {
-      $has_primary_key = false;
-
-      foreach ($columns as $column => $attributes)
-      {
-        if ($attributes == null)
-        {
-          // conventions for null attributes
-          if ($column == 'created_at' || $column == 'updated_at')
-          {
-            // timestamp convention
-            $this->database[$table][$column]['type']= 'timestamp';
-          }
-
-          if ($column == 'id')
-          {
-            // primary key convention
-            $this->database[$table]['id'] = array(
-            'type'          => 'integer',
-            'required'      => true,
-            'primaryKey'    => true,
-            'autoIncrement' => true
-            );
-            $has_primary_key = true;
-          }
-
-          $pos = strpos($column, '_id');
-          if ($pos > 0 && $pos == strlen($column) - 3)
-          {
-            // foreign key convention
-            $foreign_table = $this->findTable(substr($column, 0, $pos));
-            if ($foreign_table)
-            {
-              $this->database[$table][$column] = array(
-                'type'             => 'integer',
-                'foreignTable'     => $foreign_table,
-                'foreignReference' => 'id',
-              );
-            }
-            else
-            {
-              throw new sfException(sprintf('Unable to resolve foreign table for column "%s".', $column));
-            }
-          }
-
-        }
-        else
-        {
-          if (!is_array($attributes))
-          {
-            // compact type given as single attribute
-            $this->database[$table][$column] = $this->getAttributesFromCompactType($attributes);
-          }
-          else
-          {
-            if (isset($attributes['type']))
-            {
-              // compact type given as value of the type attribute
-              $this->database[$table][$column] = array_merge($this->database[$table][$column], $this->getAttributesFromCompactType($attributes['type']));
-            }
-            if (isset($attributes['primaryKey']))
-            {
-              $has_primary_key = true;
-            }
-          }
-        }
-      }
-
-      if (!$has_primary_key)
-      {
-        // convention for tables without primary key
-        $this->database[$table]['id'] = array(
-        'type'          => 'integer',
-        'required'      => true,
-        'primaryKey'    => true,
-        'autoIncrement' => true
-        );
-      }
-    }
-  }
-
-  /**
-   * Returns attributes for compact type
-   *
-   * @param string $type
-   *
-   * @return array The attributes for type
-   */
-  protected function getAttributesFromCompactType($type)
-  {
-    preg_match('/varchar\(([\d]+)\)/', $type, $matches);
-    if (isset($matches[1]))
-    {
-      return array('type' => 'varchar', 'size' => $matches[1]);
-    }
-    else
-    {
-      return array('type' => $type);
-    }
-  }
-
-  /**
-   * Sets entry if not set
-   *
-   * @param string $entry
-   * @param string $key
-   * @param string $value
-   */
-  protected function setIfNotSet(&$entry, $key, $value)
-  {
-    if (!isset($entry[$key]))
-    {
-      $entry[$key] = $value;
-    }
-  }
-
-  /**
-   * Find table by name
-   *
-   * @param string $table_name
-   *
-   * @return array
-   */
-  protected function findTable($table_name)
-  {
-    // find a table from a phpName or a name
-    $table_match = false;
-    foreach ($this->getTables() as $tb_name => $table)
-    {
-      if (
-      ($tb_name == $table_name)
-      || (isset($table['_attributes']['phpName']) &&
-      (
-      $table['_attributes']['phpName'] == sfInflector::camelize($table_name)
-      || $table['_attributes']['phpName'] == $table_name
-      )
-      || (sfInflector::underscore($table_name) == $tb_name))
-      )
-      {
-        $table_match = $tb_name;
-        break;
-      }
-    }
-
-    return $table_match;
-  }
-
-  /**
-   * Get attributes for column
-   *
-   * @param string $tb_name
-   * @param string $col_name
-   * @param string $column
-   *
-   * @return array
-   */
-  protected function getAttributesForColumn($tb_name, $col_name, $column)
-  {
-    $attributes_string = '';
-    if (is_array($column))
-    {
-      foreach ($column as $key => $value)
-      {
-        if (!in_array($key, array('foreignClass', 'foreignTable', 'foreignReference', 'fkPhpName', 'fkRefPhpName', 'onDelete', 'onUpdate', 'index', 'unique', 'sequence', 'inheritance')))
-        {
-          $attributes_string .= " $key=\"".htmlspecialchars($this->getCorrectValueFor($key, $value), ENT_QUOTES, sfConfig::get('sf_charset'))."\"";
-        }
-      }
-      if (isset($column['inheritance']))
-      {
-        $attributes_string .= ' inheritance="single">'."\n";
-
-        $extended_package = isset($this->database[$tb_name]['_attributes']['package']) ? $this->database[$tb_name]['_attributes']['package'] : $this->database['_attributes']['package'];
-        $extended_class   = isset($this->database[$tb_name]['_attributes']['phpName']) ? $this->database[$tb_name]['_attributes']['phpName'] : sfInflector::camelize($tb_name);
-
-        foreach ($column['inheritance'] as $key => $class)
-        {
-          // each inheritance class can have its own package
-          $package = null;
-          if (is_array($class))
-          {
-            $package = isset($class['package']) ? $class['package'] : null;
-            $class   = $class['phpName'];
-          }
-
-          $attributes_string .= vsprintf('      <inheritance extends="%s.%s" key="%s" class="%s"%s />', array(
-            $extended_package,
-            $extended_class,
-            $key,
-            $class,
-            $package ? " package=\"$package\"" : '',
-          ))."\n";
-        }
-
-        $attributes_string .= '    </column>'."\n";
-      }
-      else
-      {
-        $attributes_string .= " />\n";
-      }
-    }
-    else
-    {
-      throw new sfException(sprintf('Incorrect settings for column "%s" of table "%s".', $col_name, $tb_name));
-    }
-
-    // conventions for foreign key attributes
-    if (is_array($column) && (isset($column['foreignTable']) || isset($column['foreignClass'])))
-    {
-      if (isset($column['foreignTable']))
-      {
-        $attributes_string .= "    <foreign-key foreignTable=\"{$column['foreignTable']}\"";
-      }
-      else
-      {
-        $foreignTable = $this->findTable($column['foreignClass']);
-        if (!$foreignTable)
-        {
-          // Let's assume that the class given is from another schema
-          // We have no access to the other schema's phpNames
-          // So our last guess is to try to underscore the class name
-          $foreignTable = sfInflector::underscore($column['foreignClass']);
-        }
-        $attributes_string .= "    <foreign-key foreignTable=\"".$foreignTable."\"";
-      }
-
-      if (isset($column['onDelete']))
-      {
-        $attributes_string .= " onDelete=\"{$column['onDelete']}\"";
-      }
-      if (isset($column['onUpdate']))
-      {
-        $attributes_string .= " onUpdate=\"{$column['onUpdate']}\"";
-      }
-      if (isset($column['fkPhpName']))
-      {
-        $attributes_string .= " phpName=\"{$column['fkPhpName']}\"";
-      }
-      if (isset($column['fkRefPhpName']))
-      {
-        $attributes_string .= " refPhpName=\"{$column['fkRefPhpName']}\"";
-      }
-      $attributes_string .= ">\n";
-      $attributes_string .= "      <reference local=\"$col_name\" foreign=\"{$column['foreignReference']}\" />\n";
-      $attributes_string .= "    </foreign-key>\n";
-    }
-
-    // conventions for index and unique index attributes
-    if (is_array($column) && isset($column['index']))
-    {
-      if ($column['index'] === 'unique')
-      {
-        $attributes_string .= "    <unique>\n";
-        $attributes_string .= "      <unique-column name=\"$col_name\" />\n";
-        $attributes_string .= "    </unique>\n";
-      }
-      else
-      {
-        $attributes_string .= "    <index>\n";
-        $attributes_string .= "      <index-column name=\"$col_name\" />\n";
-        $attributes_string .= "    </index>\n";
-      }
-    }
-
-    // conventions for sequence name attributes
-    // required for databases using sequences for auto-increment columns (e.g. PostgreSQL or Oracle)
-    if (is_array($column) && isset($column['sequence']))
-    {
-      $attributes_string .= "    <id-method-parameter value=\"{$column['sequence']}\" />\n";
-    }
-
-    return $attributes_string;
-  }
-
-  /**
-   * Returns attributes for a tag
-   *
-   * @param string $tag
-   *
-   * @return string
-   */
-  protected function getAttributesFor($tag)
-  {
-    if (!isset($tag['_attributes']))
-    {
-      return '';
-    }
-    $attributes = $tag['_attributes'];
-    $attributes_string = '';
-    foreach ($attributes as $key => $value)
-    {
-      $attributes_string .= ' '.$key.'="'.htmlspecialchars($this->getCorrectValueFor($key, $value), ENT_QUOTES, sfConfig::get('sf_charset')).'"';
-    }
-
-    return $attributes_string;
-  }
-
-  protected function getCorrectValueFor($key, $value)
-  {
-    $booleans = array('required', 'primaryKey', 'autoincrement', 'autoIncrement', 'isI18N', 'isCulture');
-    if (in_array($key, $booleans))
-    {
-      return $value == 1 ? 'true' : 'false';
-    }
-    else
-    {
-      return null === $value ? 'null' : $value;
-    }
-  }
-
-  /**
-   * Returns the tables for database
-   *
-   * @return array
-   */
-  public function getTables()
-  {
-    return $this->getChildren($this->database);
-  }
-
-  /**
-   * Returns the children for a given hash
-   *
-   * @param string $hash
-   *
-   * @return array
-   */
-  public function getChildren($hash)
-  {
-    foreach ($hash as $key => $value)
-    {
-      // ignore special children (starting with _)
-      if ($key[0] == '_')
-      {
-        unset($hash[$key]);
-      }
-    }
-
-    return $hash;
-  }
-
-  /**
-   * Loads propel xml schema
-   *
-   * @param string $file The path to the propel xml schema
-   */
-  public function loadXML($file)
-  {
-    $schema = simplexml_load_file($file);
-    $database = array();
-
-    // database
-    list($database_name, $database_attributes) = $this->getNameAndAttributes($schema->attributes());
-    if ($database_name)
-    {
-      $this->connection_name = $database_name;
-    }
-    else
-    {
-      throw new sfException('The database tag misses a name attribute.');
-    }
-    if ($database_attributes)
-    {
-      $database['_attributes'] = $database_attributes;
-    }
-
-    // tables
-    foreach ($schema as $table)
-    {
-      list($table_name, $table_attributes) = $this->getNameAndAttributes($table->attributes());
-      if ($table_name)
-      {
-        $database[$table_name] = array();
-      }
-      else
-      {
-        throw new sfException('A table tag misses the name attribute.');
-      }
-      if ($table_attributes)
-      {
-        $database[$table_name]['_attributes'] = $table_attributes;
-      }
-
-      // columns
-      foreach ($table->xpath('column') as $column)
-      {
-        list($column_name, $column_attributes) = $this->getNameAndAttributes($column->attributes());
-        if ($column_name)
-        {
-          $database[$table_name][$column_name] = $column_attributes;
-        }
-        else
-        {
-          throw new sfException('A column tag misses the name attribute.');
-        }
-      }
-
-      // foreign-keys
-      $database[$table_name]['_foreignKeys'] = array();
-      foreach ($table->xpath('foreign-key') as $foreign_key)
-      {
-        $foreign_key_table = array();
-
-        // foreign key attributes
-        if (isset($foreign_key['foreignTable']))
-        {
-          $foreign_key_table['foreignTable'] = (string) $foreign_key['foreignTable'];
-        }
-        else
-        {
-          throw new sfException('A foreign key misses the foreignTable attribute.');
-        }
-        if (isset($foreign_key['onDelete']))
-        {
-          $foreign_key_table['onDelete'] = (string) $foreign_key['onDelete'];
-        }
-        if (isset($foreign_key['onUpdate']))
-        {
-          $foreign_key_table['onUpdate'] = (string) $foreign_key['onUpdate'];
-        }
-
-        // foreign key references
-        $foreign_key_table['references'] = array();
-        foreach ($foreign_key->xpath('reference') as $reference)
-        {
-          $reference_attributes = array();
-          foreach ($reference->attributes() as $reference_attribute_name => $reference_attribute_value)
-          {
-            $reference_attributes[$reference_attribute_name] = strval($reference_attribute_value);
-          }
-          $foreign_key_table['references'][] = $reference_attributes;
-        }
-
-        if (isset($foreign_key['name']))
-        {
-          $database[$table_name]['_foreignKeys'][(string)$foreign_key['name']] = $foreign_key_table;
-        }
-        else
-        {
-          $database[$table_name]['_foreignKeys'][] = $foreign_key_table;
-        }
-
-      }
-      $this->removeEmptyKey($database[$table_name], '_foreignKeys');
-
-      // indexes
-      $database[$table_name]['_indexes'] = array();
-      foreach ($table->xpath('index') as $index)
-      {
-        $index_keys = array();
-        foreach ($index->xpath('index-column') as $index_key)
-        {
-          $index_keys[] = strval($index_key['name']);
-        }
-        $database[$table_name]['_indexes'][strval($index['name'])] = $index_keys;
-      }
-      $this->removeEmptyKey($database[$table_name], '_indexes');
-
-      // unique indexes
-      $database[$table_name]['_uniques'] = array();
-      foreach ($table->xpath('unique') as $index)
-      {
-        $unique_keys = array();
-        foreach ($index->xpath('unique-column') as $unique_key)
-        {
-          $unique_keys[] = strval($unique_key['name']);
-        }
-        $database[$table_name]['_uniques'][strval($index['name'])] = $unique_keys;
-      }
-      $this->removeEmptyKey($database[$table_name], '_uniques');
-    }
-    $this->database = $database;
-
-    $this->fixXML();
-  }
-
-  /**
-   * Fixed xml for using short hand syntax
-   *
-   * @return void
-   */
-  public function fixXML()
-  {
-    $this->fixXMLForeignKeys();
-    $this->fixXMLIndexes();
-    // $this->fixXMLColumns();
-  }
-
-  /**
-   * Fixes xml foreign keys
-   *
-   * @return void
-   */
-  protected function fixXMLForeignKeys()
-  {
-    foreach ($this->getTables() as $table => $columns)
-    {
-      if (isset($this->database[$table]['_foreignKeys']))
-      {
-        $foreign_keys = $this->database[$table]['_foreignKeys'];
-        foreach ($foreign_keys as $foreign_key_name => $foreign_key_attributes)
-        {
-          // Only single foreign keys can be simplified
-          if (count($foreign_key_attributes['references']) == 1)
-          {
-            $reference = $foreign_key_attributes['references'][0];
-
-            // set simple foreign key
-            $this->database[$table][$reference['local']]['foreignTable'] = $foreign_key_attributes['foreignTable'];
-            $this->database[$table][$reference['local']]['foreignReference'] = $reference['foreign'];
-            if (isset($foreign_key_attributes['onDelete']))
-            {
-              $this->database[$table][$reference['local']]['onDelete'] = $foreign_key_attributes['onDelete'];
-            }
-            if (isset($foreign_key_attributes['onUpdate']))
-            {
-              $this->database[$table][$reference['local']]['onUpdate'] = $foreign_key_attributes['onUpdate'];
-            }
-
-            // remove complex foreign key
-            unset($this->database[$table]['_foreignKeys'][$foreign_key_name]);
-          }
-
-          $this->removeEmptyKey($this->database[$table], '_foreignKeys');
-        }
-      }
-    }
-  }
-
-  /**
-   * Fixes xml indices
-   *
-   * @return void
-   */
-  protected function fixXMLIndexes()
-  {
-    foreach ($this->getTables() as $table => $columns)
-    {
-      if (isset($this->database[$table]['_indexes']))
-      {
-        $indexes = $this->database[$table]['_indexes'];
-        foreach ($indexes as $index => $references)
-        {
-          // Only single indexes can be simplified
-          if (count($references) == 1 && false !== substr($index, 0, strlen($index) - 6) && array_key_exists(substr($index, 0, strlen($index) - 6), $columns))
-          {
-            $reference = $references[0];
-
-            // set simple index
-            $this->database[$table][$reference]['index'] = 'true';
-
-            // remove complex index
-            unset($this->database[$table]['_indexes'][$index]);
-          }
-
-          $this->removeEmptyKey($this->database[$table], '_indexes');
-        }
-      }
-      if (isset($this->database[$table]['_uniques']))
-      {
-        $uniques = $this->database[$table]['_uniques'];
-        foreach ($uniques as $index => $references)
-        {
-          // Only single unique indexes can be simplified
-          if (count($references) == 1 && false !== substr($index, 0, strlen($index) - 7) && array_key_exists(substr($index, 0, strlen($index) - 7), $columns))
-          {
-            $reference = $references[0];
-
-            // set simple index
-            $this->database[$table][$reference]['index'] = 'unique';
-
-            // remove complex unique index
-            unset($this->database[$table]['_uniques'][$index]);
-          }
-
-          $this->removeEmptyKey($this->database[$table], '_uniques');
-        }
-      }
-    }
-  }
-
-  /**
-   * Fixes xml columns
-   *
-   * @return void
-   */
-  protected function fixXMLColumns()
-  {
-    foreach ($this->getTables() as $table => $columns)
-    {
-      foreach ($columns as $column => $attributes)
-      {
-        if ($column == 'id' && !array_diff($attributes, array('type' => 'integer', 'required' => 'true', 'primaryKey' => 'true', 'autoIncrement' => 'true')))
-        {
-          // simplify primary keys
-          $this->database[$table]['id'] = null;
-        }
-
-        if (($column == 'created_at') || ($column == 'updated_at') && !array_diff($attributes, array('type' => 'timestamp')))
-        {
-          // simplify timestamps
-          $this->database[$table][$column] = null;
-        }
-
-        $pos                 = strpos($column, '_id');
-        $has_fk_name         = $pos > 0 && $pos == strlen($column) - 3;
-        $is_foreign_key      = isset($attributes['type']) && $attributes['type'] == 'integer' && isset($attributes['foreignReference']) && $attributes['foreignReference'] == 'id';
-        $has_foreign_table   = isset($attributes['foreignTable']) && array_key_exists($attributes['foreignTable'], $this->getTables());
-        $has_other_attribute = isset($attributes['onDelete']);
-        if ($has_fk_name && $has_foreign_table && $is_foreign_key && !$has_other_attribute)
-        {
-          // simplify foreign key
-          $this->database[$table][$column] = null;
-        }
-      }
-    }
-  }
-
-  protected function fixXMLBoolean($value)
-  {
-    switch (true)
-    {
-      case true === $value:
-        return 'true';
-      case false === $value:
-        return 'false';
-      default:
-        return $value;
-    }
-  }
-
-  /**
-   * Dumps schema as yaml
-   *
-   * @return string
-   */
-  public function asYAML()
-  {
-    return sfYaml::dump(array($this->connection_name => $this->database), 3);
-  }
-
-  /**
-   * Returns name and attributes from given hash
-   *
-   * @param string $hash
-   * @param string $name_attribute
-   *
-   * @return array
-   */
-  protected function getNameAndAttributes($hash, $name_attribute = 'name')
-  {
-    // tag name
-    $name = '';
-    if (isset($hash[$name_attribute]))
-    {
-      $name = strval($hash[$name_attribute]);
-      unset($hash[$name_attribute]);
-    }
-
-    // tag attributes
-    $attributes = array();
-    foreach ($hash as $attribute => $value)
-    {
-      $value = (string) $value;
-      if (in_array($value, array('true', 'on')))
-      {
-        $value = true;
-      }
-      elseif (in_array($value, array('false', 'off')))
-      {
-        $value = false;
-      }
-      $attributes[$attribute] = $value;
-    }
-
-    return array($name, $attributes);
-  }
-
-  protected function removeEmptyKey(&$hash, $key)
-  {
-    if (isset($hash[$key]) && !$hash[$key])
-    {
-      unset($hash[$key]);
-    }
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfPropelManyToMany.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfPropelManyToMany.class.php
deleted file mode 100644
index fffcdde92..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfPropelManyToMany.class.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Utilities for managing many to many relationships in propel.
- *
- * @package    symfony
- * @subpackage propel
- * @author     Nick Lane <nick.lane@internode.on.net>
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelManyToMany.class.php 22881 2009-10-08 16:50:37Z Kris.Wallsmith $
- */
-class sfPropelManyToMany
-{
-  public static function getColumn($class, $middleClass, $relatedColumn = '')
-  {
-    // find the related class
-    $tableMap = call_user_func(array(constant($middleClass.'::PEER'), 'getTableMap'));
-    $object_table_name = constant(constant($class.'::PEER').'::TABLE_NAME');
-
-    if (!empty($relatedColumn))
-    {
-      $relatedColumnName = $tableMap->getColumn($relatedColumn)->getPhpName();
-    }
-
-    foreach ($tableMap->getColumns() as $column)
-    {
-      if ($column->isForeignKey() && $object_table_name == $column->getRelatedTableName())
-      {
-        if (!empty($relatedColumn))
-        {
-          if ($column->getPhpName() != $relatedColumnName)
-          {
-            return $column;
-          }
-        }
-        else
-        {
-          return $column;
-        }
-      }
-    }
-  }
-
-  public static function getRelatedColumn($class, $middleClass, $relatedColumn = '')
-  {
-    // find the related class
-    $tableMap = call_user_func(array(constant($middleClass.'::PEER'), 'getTableMap'));
-    $object_table_name = constant(constant($class.'::PEER').'::TABLE_NAME');
-
-    if (!empty($relatedColumn))
-    {
-      return $tableMap->getColumn($relatedColumn);
-    }
-
-    foreach ($tableMap->getColumns() as $column)
-    {
-      if ($column->isForeignKey() && $object_table_name != $column->getRelatedTableName())
-      {
-        return $column;
-      }
-    }
-  }
-
-  public static function getRelatedClass($class, $middleClass, $relatedColumn = '')
-  {
-    $column = self::getRelatedColumn($class, $middleClass, $relatedColumn);
-
-    $tableMap = call_user_func(array(constant($middleClass.'::PEER'), 'getTableMap'));
-    $tableMap->getRelations();
-
-    return $tableMap->getDatabaseMap()->getTable($column->getRelatedTableName())->getPhpName();
-  }
-
-  public static function getAllObjects($object, $middleClass, $relatedColumn = '', $criteria = null)
-  {
-    if (null === $criteria)
-    {
-      $criteria = new Criteria();
-    }
-
-    $relatedClass = self::getRelatedClass(get_class($object), $middleClass, $relatedColumn);
-
-    // don't show $this object for self-referential relation
-    // make sure to use all primary keys
-    if (!empty($relatedColumn))
-    {
-      $tempCriteria = $object->buildPkeyCriteria();
-      foreach ($tempCriteria->getIterator() as $criterion)
-      {
-        $criteria->add($criterion->getTable().'.'.$criterion->getColumn(), $criterion->getValue(), Criteria::NOT_EQUAL);
-      }
-    }
-
-    return call_user_func(array(constant($relatedClass.'::PEER'), 'doSelect'), $criteria);
-  }
-
-  /**
-   * Gets objects related by a many-to-many relationship, with a middle table.
-   *
-   * @param  $object        The object to get related objects for.
-   * @param  $middleClass   The middle class used for the many-to-many relationship.
-   * @param  $criteria      Criteria to apply to the selection.
-   */
-  public static function getRelatedObjects($object, $middleClass, $relatedColumn = '', $criteria = null)
-  {
-    if (null === $criteria)
-    {
-      $criteria = new Criteria();
-    }
-
-    $relatedClass = self::getRelatedClass(get_class($object), $middleClass, $relatedColumn);
-
-    $relatedObjects = array();
-    if (empty($relatedColumn))
-    {
-      $objectMethod = 'get'.$middleClass.'sJoin'.$relatedClass;
-      $relatedMethod = 'get'.$relatedClass;
-      $rels = $object->$objectMethod($criteria);
-    }
-    else
-    {
-      // as there is no way to join the related objects starting from this object we'll use the through class peer instead
-      $localColumn = self::getColumn(get_class($object), $middleClass, $relatedColumn);
-      $remoteColumn = self::getRelatedColumn(get_class($object), $middleClass, $relatedColumn);
-      $c = new Criteria();
-      $c->add(constant(constant($middleClass.'::PEER').'::'.$localColumn->getName()), $object->getId());
-      $relatedMethod = 'get'.$relatedClass.'RelatedBy'.$remoteColumn->getPhpName();
-      $rels = call_user_func(array(constant($middleClass.'::PEER'), 'doSelectJoin'.$relatedClass.'RelatedBy'.$remoteColumn->getPhpName()), $c);
-    }
-    foreach ($rels as $rel)
-    {
-      $relatedObjects[] = $rel->$relatedMethod();
-    }
-
-    return $relatedObjects;
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfPropelPager.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfPropelPager.class.php
deleted file mode 100644
index b6110c7c6..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/addon/sfPropelPager.class.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * This class is the Propel implementation of sfPager.  It interacts with the propel record set and
- * manages criteria.
- *
- * @package    sfPropelPlugin
- * @subpackage addon
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelPager.class.php 27747 2010-02-08 18:02:19Z Kris.Wallsmith $
- */
-class sfPropelPager extends sfPager
-{
-  protected
-    $criteria               = null,
-    $peer_method_name       = 'doSelect',
-    $peer_count_method_name = 'doCount';
-
-  /**
-   * Constructor.
-   *
-   * @see sfPager
-   */
-  public function __construct($class, $maxPerPage = 10)
-  {
-    parent::__construct($class, $maxPerPage);
-
-    $this->setCriteria(new Criteria());
-    $this->tableName = constant($this->getClassPeer().'::TABLE_NAME');
-  }
-
-  /**
-   * @see sfPager
-   */
-  public function init()
-  {
-    $this->resetIterator();
-
-    $hasMaxRecordLimit = ($this->getMaxRecordLimit() !== false);
-    $maxRecordLimit = $this->getMaxRecordLimit();
-
-    $criteriaForCount = clone $this->getCriteria();
-    $criteriaForCount
-      ->setOffset(0)
-      ->setLimit(0)
-      ->clearGroupByColumns()
-    ;
-
-    $count = call_user_func(array($this->getClassPeer(), $this->getPeerCountMethod()), $criteriaForCount);
-
-    $this->setNbResults($hasMaxRecordLimit ? min($count, $maxRecordLimit) : $count);
-
-    $criteria = $this->getCriteria()
-      ->setOffset(0)
-      ->setLimit(0)
-    ;
-
-    if (0 == $this->getPage() || 0 == $this->getMaxPerPage())
-    {
-      $this->setLastPage(0);
-    }
-    else
-    {
-      $this->setLastPage(ceil($this->getNbResults() / $this->getMaxPerPage()));
-
-      $offset = ($this->getPage() - 1) * $this->getMaxPerPage();
-      $criteria->setOffset($offset);
-
-      if ($hasMaxRecordLimit)
-      {
-        $maxRecordLimit = $maxRecordLimit - $offset;
-        if ($maxRecordLimit > $this->getMaxPerPage())
-        {
-          $criteria->setLimit($this->getMaxPerPage());
-        }
-        else
-        {
-          $criteria->setLimit($maxRecordLimit);
-        }
-      }
-      else
-      {
-        $criteria->setLimit($this->getMaxPerPage());
-      }
-    }
-  }
-
-  /**
-   * @see sfPager
-   */
-  protected function retrieveObject($offset)
-  {
-    $criteriaForRetrieve = clone $this->getCriteria();
-    $criteriaForRetrieve
-      ->setOffset($offset - 1)
-      ->setLimit(1)
-    ;
-
-    $results = call_user_func(array($this->getClassPeer(), $this->getPeerMethod()), $criteriaForRetrieve);
-
-    return is_array($results) && isset($results[0]) ? $results[0] : null;
-  }
-
-  /**
-   * @see sfPager
-   */
-  public function getResults()
-  {
-    return call_user_func(array($this->getClassPeer(), $this->getPeerMethod()), $this->getCriteria());
-  }
-
-  /**
-   * Returns the peer method name.
-   *
-   * @return string
-   */
-  public function getPeerMethod()
-  {
-    return $this->peer_method_name;
-  }
-
-  /**
-   * Sets the peer method name.
-   *
-   * @param string $method A method on the current peer class
-   */
-  public function setPeerMethod($peer_method_name)
-  {
-    $this->peer_method_name = $peer_method_name;
-  }
-
-  /**
-   * Returns the peer count method name.
-   *
-   * @return string
-   */
-  public function getPeerCountMethod()
-  {
-    return $this->peer_count_method_name;
-  }
-
-  /**
-   * Sets the peer count method name.
-   *
-   * @param string $peer_count_method_name
-   */
-  public function setPeerCountMethod($peer_count_method_name)
-  {
-    $this->peer_count_method_name = $peer_count_method_name;
-  }
-
-  /**
-   * Returns the name of the current model class' peer class.
-   *
-   * @return string
-   */
-  public function getClassPeer()
-  {
-    return constant($this->class.'::PEER');
-  }
-
-  /**
-   * Returns the current Criteria.
-   *
-   * @return Criteria
-   */
-  public function getCriteria()
-  {
-    return $this->criteria;
-  }
-
-  /**
-   * Sets the Criteria for the current pager.
-   *
-   * @param Criteria $criteria
-   */
-  public function setCriteria($criteria)
-  {
-    $this->criteria = $criteria;
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/behavior/SfPropelBehaviorBase.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/behavior/SfPropelBehaviorBase.php
deleted file mode 100644
index 9a5b0bb3a..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/behavior/SfPropelBehaviorBase.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once 'propel/engine/database/model/Behavior.php';
-
-/**
- * Base behavior class.
- *
- * @package     sfPropelPlugin
- * @subpackage  behavior
- * @author      Kris Wallsmith <kris.wallsmith@symfony-project.com>
- * @version     SVN: $Id: SfPropelBehaviorBase.php 23310 2009-10-24 15:27:41Z Kris.Wallsmith $
- */
-abstract class SfPropelBehaviorBase extends Behavior
-{
-  protected
-    $buildProperties = null;
-
-  /**
-   * Returns a build property from propel.ini.
-   *
-   * @param string $name
-   *
-   * @return mixed
-   */
-  protected function getBuildProperty($name)
-  {
-    if (null === $this->buildProperties)
-    {
-      $this->buildProperties = new Properties();
-      $this->buildProperties->load(new PhingFile(sfConfig::get('sf_config_dir').'/propel.ini'));
-    }
-
-    return $this->buildProperties->getProperty($name);
-  }
-
-  /**
-   * Returns true if the current behavior has been disabled.
-   *
-   * @return boolean
-   */
-  protected function isDisabled()
-  {
-    return 'true' == $this->getParameter('disabled');
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/behavior/SfPropelBehaviorI18n.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/behavior/SfPropelBehaviorI18n.php
deleted file mode 100644
index b2a6646de..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/behavior/SfPropelBehaviorI18n.php
+++ /dev/null
@@ -1,389 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Internationalizes Propel models.
- *
- * This behavior is intended to be applied at the database level.
- *
- * @package     sfPropelPlugin
- * @subpackage  behavior
- * @author      Kris Wallsmith <kris.wallsmith@symfony-project.com>
- * @version     SVN: $Id: SfPropelBehaviorI18n.php 24597 2009-11-30 19:53:50Z Kris.Wallsmith $
- */
-class SfPropelBehaviorI18n extends SfPropelBehaviorBase
-{
-  protected $parameters = array(
-    'i18n_table' => null,
-  );
-
-  /**
-   * Looks for tables marked as I18N and adds behaviors.
-   */
-  public function modifyDatabase()
-  {
-    $translationBehavior = Propel::importClass($this->getBuildProperty('propel.behavior.symfony_i18n_translation.class'));
-
-    foreach ($this->getDatabase()->getTables() as $table)
-    {
-      $behaviors = $table->getBehaviors();
-
-      if (!isset($behaviors['symfony_i18n']) && 'true' == $table->getAttribute('isI18N'))
-      {
-        $i18nTable = $this->getDatabase()->getTable($table->getAttribute('i18nTable'));
-
-        // add the current behavior to the translatable model
-        $behavior = clone $this;
-        $behavior->setParameters(array('i18n_table' => $i18nTable->getName()));
-        $table->addBehavior($behavior);
-
-        // add the translation behavior to the translation model
-        $behavior = new $translationBehavior();
-        $behavior->setName('symfony_i18n_translation');
-        $behavior->setParameters(array('culture_column' => $this->getCultureColumn($i18nTable)->getName()));
-        $i18nTable->addBehavior($behavior);
-      }
-    }
-  }
-
-  public function modifyTable()
-  {
-    if ($this->isDisabled())
-    {
-      return;
-    }
-
-    if (count($this->getTable()->getPrimaryKey()) > 1)
-    {
-      throw new Exception('i18n support only works with a single primary key');
-    }
-  }
-
-  public function objectAttributes()
-  {
-    if ($this->isDisabled())
-    {
-      return;
-    }
-
-    return <<<EOF
-
-/**
- * @var string The value for the culture field
- */
-protected \$culture = null;
-
-/**
- * @var array Current I18N objects
- */
-protected \$current_i18n = array();
-
-EOF;
-  }
-
-  public function objectMethods()
-  {
-    if ($this->isDisabled())
-    {
-      return;
-    }
-
-    $script = <<<EOF
-
-/**
- * Returns the culture.
- *
- * @return string The culture
- */
-public function getCulture()
-{
-  return \$this->culture;
-}
-
-/**
- * Sets the culture.
- *
- * @param string $culture The culture to set
- *
- * @return {$this->getTable()->getPhpName()}
- */
-public function setCulture(\$culture)
-{
-  \$this->culture = \$culture;
-  return \$this;
-}
-
-EOF;
-
-    // add accessors and mutators for each of the i18nTable's columns
-    $foreignKey = $this->getI18nTable()->getBehavior('symfony_i18n_translation')->getForeignKey();
-    $refPhpName = $foreignKey->getRefPhpName() ? $foreignKey->getRefPhpName() : $this->getI18nTable()->getPhpName();
-
-    foreach ($this->getI18nTable()->getColumns() as $column)
-    {
-      if ($column->isPrimaryKey())
-      {
-        continue;
-      }
-
-      $script .= <<<EOF
-
-/**
- * Returns the "{$column->getName()}" value from the current {@link {$this->getI18nTable()->getPhpName()}}.
- */
-public function get{$column->getPhpName()}(\$culture = null)
-{
-  return \$this->getCurrent{$refPhpName}(\$culture)->get{$column->getPhpName()}();
-}
-
-/**
- * Sets the "{$column->getName()}" value of the current {@link {$this->getI18nTable()->getPhpName()}}.
- *
- * @return {$this->getTable()->getPhpName()}
- */
-public function set{$column->getPhpName()}(\$value, \$culture = null)
-{
-  \$this->getCurrent{$refPhpName}(\$culture)->set{$column->getPhpName()}(\$value);
-  return \$this;
-}
-
-EOF;
-    }
-
-    $script .= <<<EOF
-
-/**
- * Returns the current translation.
- *
- * @return {$this->getI18nTable()->getPhpName()}
- */
-public function getCurrent{$refPhpName}(\$culture = null)
-{
-  if (null === \$culture)
-  {
-    \$culture = null === \$this->culture ? sfPropel::getDefaultCulture() : \$this->culture;
-  }
-
-  if (!isset(\$this->current_i18n[\$culture]))
-  {
-    \$object = \$this->isNew() ? null : {$this->getI18nTable()->getPhpName()}Peer::retrieveByPK(\$this->getPrimaryKey(), \$culture);
-    if (\$object)
-    {
-      \$this->set{$refPhpName}ForCulture(\$object, \$culture);
-    }
-    else
-    {
-      \$this->set{$refPhpName}ForCulture(new {$this->getI18nTable()->getPhpName()}(), \$culture);
-      \$this->current_i18n[\$culture]->set{$this->getI18nTable()->getBehavior('symfony_i18n_translation')->getCultureColumn()->getPhpName()}(\$culture);
-    }
-  }
-
-  return \$this->current_i18n[\$culture];
-}
-
-/**
- * Sets the translation object for a culture.
- */
-public function set{$refPhpName}ForCulture({$this->getI18nTable()->getPhpName()} \$object, \$culture)
-{
-  \$this->current_i18n[\$culture] = \$object;
-  \$this->add{$refPhpName}(\$object);
-}
-
-EOF;
-
-    if (!$this->hasPrimaryString($this->getTable()) && $this->hasPrimaryString($this->getI18nTable()))
-    {
-      $script .= <<<EOF
-
-/**
- * @see {$this->getI18nTable()->getPhpName()}
- */
-public function __toString()
-{
-  return (string) \$this->getCurrent{$refPhpName}();
-}
-
-EOF;
-    }
-
-    return $script;
-  }
-
-  public function staticMethods()
-  {
-    $foreignKey = $this->getI18nTable()->getBehavior('symfony_i18n_translation')->getForeignKey();
-    $refPhpName = $foreignKey->getRefPhpName() ? $foreignKey->getRefPhpName() : $this->getI18nTable()->getPhpName();
-    $join = in_array($this->getBuildProperty('propel.useLeftJoinsInDoJoinMethods'), array(true, null), true) ? 'LEFT' : 'INNER';
-
-    $behaviors = $this->getTable()->getBehaviors();
-    $mixerHook = !isset($behaviors['symfony_behaviors']) ? '' : <<<EOF
-
-  foreach (sfMixer::getCallables('Base{$this->getTable()->getPhpName()}:doSelectJoin:doSelectJoin') as \$sf_hook)
-  {
-    call_user_func(\$sf_hook, '{$this->getTable()->getPhpName()}', \$criteria, \$con);
-  }
-
-EOF;
-
-    return <<<EOF
-
-/**
- * Returns the i18n model class name.
- *
- * @return string The i18n model class name
- */
-static public function getI18nModel()
-{
-  return '{$this->getI18nTable()->getPhpName()}';
-}
-
-/**
- * Selects a collection of {@link {$this->getTable()->getPhpName()}} objects with a {@link {$this->getI18nTable()->getPhpName()}} translation populated.
- *
- * @param Criteria  \$criteria
- * @param string    \$culture
- * @param PropelPDO \$con
- * @param string    \$join_behavior
- *
- * @return array
- */
-static public function doSelectWithI18n(Criteria \$criteria, \$culture = null, \$con = null, \$join_behavior = Criteria::{$join}_JOIN)
-{
-  \$criteria = clone \$criteria;
-
-  if (null === \$culture)
-  {
-    \$culture = sfPropel::getDefaultCulture();
-  }
-
-  // Set the correct dbName if it has not been overridden
-  if (\$criteria->getDbName() == Propel::getDefaultDB()) {
-  	\$criteria->setDbName(self::DATABASE_NAME);
-  }
-
-  {$this->getTable()->getPhpName()}Peer::addSelectColumns(\$criteria);
-  \$startcol = ({$this->getTable()->getPhpName()}Peer::NUM_COLUMNS - {$this->getTable()->getPhpName()}Peer::NUM_LAZY_LOAD_COLUMNS);
-  {$this->getI18nTable()->getPhpName()}Peer::addSelectColumns(\$criteria);
-  \$criteria->addJoin({$this->getLocalColumn()->getConstantName()}, {$this->getForeignColumn()->getConstantName()}, \$join_behavior);
-  \$criteria->add({$this->getCultureColumn($this->getI18nTable())->getConstantName()}, \$culture);
-{$mixerHook}
-  \$stmt = BasePeer::doSelect(\$criteria, \$con);
-	\$results = array();
-
-	while (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
-		\$key1 = {$this->getTable()->getPhpName()}Peer::getPrimaryKeyHashFromRow(\$row, 0);
-		if (null !== (\$obj1 = {$this->getTable()->getPhpName()}Peer::getInstanceFromPool(\$key1))) {
-			// We no longer rehydrate the object, since this can cause data loss.
-  		// See http://propel.phpdb.org/trac/ticket/509
-  		// \$obj1->hydrate(\$row, 0, true); // rehydrate
-  	} else {
-			\$cls = {$this->getTable()->getPhpName()}Peer::getOMClass(false);
-			\$obj1 = new \$cls();
-			\$obj1->hydrate(\$row);
-      {$this->getTable()->getPhpName()}Peer::addInstanceToPool(\$obj1, \$key1);
-		} // if \$obj1 already loaded
-
-		\$key2 = {$this->getI18nTable()->getPhpName()}Peer::getPrimaryKeyHashFromRow(\$row, \$startcol);
-		if (\$key2 !== null) {
-			\$obj2 = {$this->getI18nTable()->getPhpName()}Peer::getInstanceFromPool(\$key2);
-			if (!\$obj2) {
-				\$cls = {$this->getI18nTable()->getPhpName()}Peer::getOMClass(false);
-				\$obj2 = new \$cls();
-				\$obj2->hydrate(\$row, \$startcol);
-				{$this->getI18nTable()->getPhpName()}Peer::addInstanceToPool(\$obj2, \$key2);
-			} // if obj2 already loaded
-
-      \$obj1->set{$refPhpName}ForCulture(\$obj2, \$culture);
-		} // if joined row was not null
-
-		\$results[] = \$obj1;
-	}
-
-	\$stmt->closeCursor();
-
-	return \$results;
-}
-
-EOF;
-  }
-
-  /**
-   * Returns the current table's i18n translation table.
-   *
-   * @return Table
-   */
-  public function getI18nTable()
-  {
-    return $this->getDatabase()->getTable($this->getParameter('i18n_table'));
-  }
-
-  /**
-   * Finds the supplied translation table's culture column.
-   *
-   * @return Column
-   *
-   * @throws InvalidArgumentException If there is not a column marked as "isCulture"
-   */
-  protected function getCultureColumn(Table $table)
-  {
-    foreach ($table->getColumns() as $column)
-    {
-      if ('true' == $column->getAttribute('isCulture'))
-      {
-        return $column;
-      }
-    }
-
-    throw new InvalidArgumentException(sprintf('The table "%s" does not have a column marked with the "isCulture" attribute.', $table->getName()));
-  }
-
-  /**
-   * Returns the column on the current model referenced by the translation model.
-   *
-   * @return Column
-   */
-  protected function getLocalColumn()
-  {
-    $columns = $this->getI18nTable()->getBehavior('symfony_i18n_translation')->getForeignKey()->getForeignColumns();
-    return $this->getTable()->getColumn($columns[0]);
-  }
-
-  /**
-   * Returns the column on the translation table the references the current model.
-   *
-   * @return Column
-   */
-  protected function getForeignColumn()
-  {
-    $columns = $this->getI18nTable()->getBehavior('symfony_i18n_translation')->getForeignKey()->getLocalColumns();
-    return $this->getI18nTable()->getColumn($columns[0]);
-  }
-
-  /**
-   * Checks whether the supplied table has a primary string defined.
-   *
-   * @param  Table $table
-   *
-   * @return boolean
-   */
-  protected function hasPrimaryString(Table $table)
-  {
-    foreach ($table->getColumns() as $column)
-    {
-      if ($column->isPrimaryString())
-      {
-        return true;
-      }
-    }
-
-    return false;
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/behavior/SfPropelBehaviorI18nTranslation.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/behavior/SfPropelBehaviorI18nTranslation.php
deleted file mode 100644
index 43b4ff9f6..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/behavior/SfPropelBehaviorI18nTranslation.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Translation behavior.
- *
- * @package     sfPropelPlugin
- * @subpackage  behavior
- * @author      Kris Wallsmith <kris.wallsmith@symfony-project.com>
- * @version     SVN: $Id: SfPropelBehaviorI18nTranslation.php 23310 2009-10-24 15:27:41Z Kris.Wallsmith $
- */
-class SfPropelBehaviorI18nTranslation extends SfPropelBehaviorBase
-{
-  protected $parameters = array(
-    'culture_column' => null,
-  );
-
-  public function objectFilter(& $script)
-  {
-    if ($this->isDisabled())
-    {
-      return;
-    }
-
-    $class = new sfClassManipulator($script);
-    $class->filterMethod('doSave', array($this, 'filterDoSave'));
-
-    $script = $class->getCode();
-  }
-
-  /**
-   * Filters each line of the generated doSave method.
-   *
-   * @param string $line
-   *
-   * @return string
-   */
-  public function filterDoSave($line)
-  {
-    $foreignKey = $this->getForeignKey();
-    $phpName = $foreignKey->getPhpName() ? $foreignKey->getPhpName() : $foreignKey->getForeignTable()->getPhpName();
-    $refPhpName = $foreignKey->getRefPhpName() ? $foreignKey->getRefPhpName() : $this->getTable()->getPhpName();
-    $search = sprintf('$this->a%s->isModified()', $phpName);
-    $insert = sprintf(' || ($this->a%s->getCulture() && $this->a%1$s->getCurrent%s()->isModified())', $phpName, $refPhpName);
-
-    if (false !== strpos($line, $search))
-    {
-      $line = str_replace($search, $search.$insert, $line);
-    }
-
-    return $line;
-  }
-
-  /**
-   * Returns the foreign key that references the translated model.
-   *
-   * @return ForeignKey
-   *
-   * @throws LogicException If the foreign key cannot be found
-   */
-  public function getForeignKey()
-  {
-    foreach ($this->getTable()->getForeignKeys() as $fk)
-    {
-      $behaviors = $fk->getForeignTable()->getBehaviors();
-      if (isset($behaviors['symfony_i18n']))
-      {
-        return $fk;
-      }
-    }
-
-    throw new Exception('The foreign key that references the I18N model could not be found.');
-  }
-
-  /**
-   * Returns the current table's culture column.
-   *
-   * @return Column
-   */
-  public function getCultureColumn()
-  {
-    return $this->getTable()->getColumn($this->getParameter('culture_column'));
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/behavior/SfPropelBehaviorSymfony.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/behavior/SfPropelBehaviorSymfony.php
deleted file mode 100644
index e9afda450..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/behavior/SfPropelBehaviorSymfony.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A database behavior that adds default symfony behaviors.
- *
- * @package     sfPropelPlugin
- * @subpackage  behavior
- * @author      Kris Wallsmith <kris.wallsmith@symfony-project.com>
- * @version     SVN: $Id: SfPropelBehaviorSymfony.php 23737 2009-11-09 23:23:25Z Kris.Wallsmith $
- */
-class SfPropelBehaviorSymfony extends SfPropelBehaviorBase
-{
-  protected $parameters = array(
-    'form'   => 'true',
-    'filter' => 'true',
-  );
-
-  public function modifyDatabase()
-  {
-    foreach ($this->getDatabase()->getTables() as $table)
-    {
-      $behaviors = $table->getBehaviors();
-
-      if (!isset($behaviors['symfony']))
-      {
-        $behavior = clone $this;
-        $table->addBehavior($behavior);
-      }
-
-      // symfony behaviors
-      if (!isset($behaviors['symfony_behaviors']) && $this->getBuildProperty('propel.builder.addBehaviors'))
-      {
-        $class = Propel::importClass($this->getBuildProperty('propel.behavior.symfony_behaviors.class'));
-        $behavior = new $class();
-        $behavior->setName('symfony_behaviors');
-        $table->addBehavior($behavior);
-      }
-
-      // timestampable
-      if (!isset($behaviors['symfony_timestampable']))
-      {
-        $parameters = array();
-        foreach ($table->getColumns() as $column)
-        {
-          if (!isset($parameters['create_column']) && in_array($column->getName(), array('created_at', 'created_on')))
-          {
-            $parameters['create_column'] = $column->getName();
-          }
-
-          if (!isset($parameters['update_column']) && in_array($column->getName(), array('updated_at', 'updated_on')))
-          {
-            $parameters['update_column'] = $column->getName();
-          }
-        }
-
-        if ($parameters)
-        {
-          $class = Propel::importClass($this->getBuildProperty('propel.behavior.symfony_timestampable.class'));
-          $behavior = new $class();
-          $behavior->setName('symfony_timestampable');
-          $behavior->setParameters($parameters);
-          $table->addBehavior($behavior);
-        }
-      }
-    }
-  }
-
-  public function objectAttributes()
-  {
-    if ($this->isDisabled())
-    {
-      return;
-    }
-
-    return <<<EOF
-
-const PEER = '{$this->getTable()->getPhpName()}Peer';
-
-EOF;
-  }
-
-  public function staticAttributes()
-  {
-    if ($this->isDisabled())
-    {
-      return;
-    }
-
-    $behaviors = $this->getTable()->getBehaviors();
-    $isI18n = isset($behaviors['symfony_i18n']) ? 'true' : 'false';
-
-    return <<<EOF
-
-/**
- * Indicates whether the current model includes I18N.
- */
-const IS_I18N = {$isI18n};
-
-EOF;
-  }
-
-  public function staticMethods()
-  {
-    if ($this->isDisabled())
-    {
-      return;
-    }
-
-    $unices = array();
-    foreach ($this->getTable()->getUnices() as $unique)
-    {
-      $unices[] = sprintf("array('%s')", implode("', '", $unique->getColumns()));
-    }
-    $unices = implode(', ', array_unique($unices));
-
-    return <<<EOF
-
-/**
- * Returns an array of arrays that contain columns in each unique index.
- *
- * @return array
- */
-static public function getUniqueColumnNames()
-{
-  return array({$unices});
-}
-
-EOF;
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/behavior/SfPropelBehaviorSymfonyBehaviors.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/behavior/SfPropelBehaviorSymfonyBehaviors.php
deleted file mode 100644
index ae49ad468..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/behavior/SfPropelBehaviorSymfonyBehaviors.php
+++ /dev/null
@@ -1,342 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Adds support for symfony's {@link sfMixer} behaviors.
- *
- * @package     sfPropelPlugin
- * @subpackage  behavior
- * @author      Kris Wallsmith <kris.wallsmith@symfony-project.com>
- * @version     SVN: $Id: SfPropelBehaviorSymfonyBehaviors.php 28958 2010-04-01 13:56:17Z fabien $
- */
-class SfPropelBehaviorSymfonyBehaviors extends SfPropelBehaviorBase
-{
-  public function preDelete()
-  {
-    if ($this->isDisabled())
-    {
-      return;
-    }
-
-    return <<<EOF
-foreach (sfMixer::getCallables('Base{$this->getTable()->getPhpName()}:delete:pre') as \$callable)
-{
-  if (call_user_func(\$callable, \$this, \$con))
-  {
-    \$con->commit();
-
-    return;
-  }
-}
-
-EOF;
-  }
-
-  public function postDelete()
-  {
-    if ($this->isDisabled())
-    {
-      return;
-    }
-
-    return <<<EOF
-foreach (sfMixer::getCallables('Base{$this->getTable()->getPhpName()}:delete:post') as \$callable)
-{
-  call_user_func(\$callable, \$this, \$con);
-}
-
-EOF;
-  }
-
-  public function preSave()
-  {
-    if ($this->isDisabled())
-    {
-      return;
-    }
-
-    return <<<EOF
-foreach (sfMixer::getCallables('Base{$this->getTable()->getPhpName()}:save:pre') as \$callable)
-{
-  if (is_integer(\$affectedRows = call_user_func(\$callable, \$this, \$con)))
-  {
-    \$con->commit();
-
-    return \$affectedRows;
-  }
-}
-
-EOF;
-  }
-
-  public function postSave()
-  {
-    if ($this->isDisabled())
-    {
-      return;
-    }
-
-    return <<<EOF
-foreach (sfMixer::getCallables('Base{$this->getTable()->getPhpName()}:save:post') as \$callable)
-{
-  call_user_func(\$callable, \$this, \$con, \$affectedRows);
-}
-
-EOF;
-  }
-
-  public function objectMethods()
-  {
-    if ($this->isDisabled())
-    {
-      return;
-    }
-
-    return <<<EOF
-
-/**
- * Calls methods defined via {@link sfMixer}.
- */
-public function __call(\$method, \$arguments)
-{
-  if (!\$callable = sfMixer::getCallable('Base{$this->getTable()->getPhpName()}:'.\$method))
-  {
-    throw new sfException(sprintf('Call to undefined method Base{$this->getTable()->getPhpName()}::%s', \$method));
-  }
-
-  array_unshift(\$arguments, \$this);
-
-  return call_user_func_array(\$callable, \$arguments);
-}
-
-EOF;
-  }
-
-  public function staticMethods()
-  {
-    if ($this->isDisabled())
-    {
-      return;
-    }
-
-    return <<<EOF
-
-/**
- * Returns the name of the hook to call from inside the supplied method.
- *
- * @param string \$method The calling method
- *
- * @return string A hook name for {@link sfMixer}
- *
- * @throws LogicException If the method name is not recognized
- */
-static private function getMixerPreSelectHook(\$method)
-{
-  if (preg_match('/^do(Select|Count)(Join(All(Except)?)?|Stmt)?/', \$method, \$match))
-  {
-    return sprintf('Base{$this->getTable()->getPhpName()}Peer:%s:%1\$s', 'Count' == \$match[1] ? 'doCount' : \$match[0]);
-  }
-
-  throw new LogicException(sprintf('Unrecognized function "%s"', \$method));
-}
-
-EOF;
-  }
-
-  public function preSelect()
-  {
-    if ($this->isDisabled())
-    {
-      return;
-    }
-
-    return <<<EOF
-foreach (sfMixer::getCallables(self::getMixerPreSelectHook(__FUNCTION__)) as \$sf_hook)
-{
-  call_user_func(\$sf_hook, 'Base{$this->getTable()->getPhpName()}Peer', \$criteria, \$con);
-}
-
-EOF;
-  }
-
-  public function objectFilter(& $script)
-  {
-    if ($this->isDisabled())
-    {
-      return;
-    }
-
-    if ($this->getTable()->getAttribute('behaviors'))
-    {
-      $script .= $this->getBehaviorsInclude();
-    }
-  }
-
-  public function peerFilter(& $script)
-  {
-    if ($this->isDisabled())
-    {
-      return;
-    }
-
-    $doInsertPre = <<<EOF
-// symfony_behaviors behavior
-    foreach (sfMixer::getCallables('Base{$this->getTable()->getPhpName()}Peer:doInsert:pre') as \$sf_hook)
-    {
-      if (false !== \$sf_hook_retval = call_user_func(\$sf_hook, 'Base{$this->getTable()->getPhpName()}Peer', \$values, \$con))
-      {
-        return \$sf_hook_retval;
-      }
-    }
-
-EOF;
-    $doUpdatePre = <<<EOF
-// symfony_behaviors behavior
-    foreach (sfMixer::getCallables('Base{$this->getTable()->getPhpName()}Peer:doUpdate:pre') as \$sf_hook)
-    {
-      if (false !== \$sf_hook_retval = call_user_func(\$sf_hook, 'Base{$this->getTable()->getPhpName()}Peer', \$values, \$con))
-      {
-        return \$sf_hook_retval;
-      }
-    }
-
-EOF;
-
-    // add doInsert and doUpdate hooks
-    $class = new sfClassManipulator($script);
-    $class->filterMethod('doInsert', array($this, 'filterDoInsert'));
-    $class->wrapMethod('doInsert', $doInsertPre);
-    $class->filterMethod('doUpdate', array($this, 'filterDoUpdate'));
-    $class->wrapMethod('doUpdate', $doUpdatePre);
-
-    $script = $class->getCode();
-
-    // add symfony behavior configuration file
-    if ($this->createBehaviorsFile())
-    {
-      $script .= $this->getBehaviorsInclude();
-    }
-  }
-
-  /**
-   * Filters the generated doInsert method.
-   *
-   * @param string $line
-   *
-   * @return string
-   */
-  public function filterDoInsert($line)
-  {
-    if (false !== strpos($line, 'return'))
-    {
-      $doInsertPost = <<<EOF
-    // symfony_behaviors behavior
-    foreach (sfMixer::getCallables('Base{$this->getTable()->getPhpName()}Peer:doInsert:post') as \$sf_hook)
-    {
-      call_user_func(\$sf_hook, 'Base{$this->getTable()->getPhpName()}Peer', \$values, \$con, \$pk);
-    }
-
-
-EOF;
-
-      $line = $doInsertPost.$line;
-    }
-
-    return $line;
-  }
-
-  /**
-   * Filters the generated doUpdate method.
-   *
-   * @param string $line
-   *
-   * @return string
-   */
-  public function filterDoUpdate($line)
-  {
-    if (false !== strpos($line, 'return'))
-    {
-      $replace = str_replace('return', '$ret =', $line);
-      $doUpdatePost = <<<EOF
-
-    // symfony_behaviors behavior
-    foreach (sfMixer::getCallables('Base{$this->getTable()->getPhpName()}Peer:doUpdate:post') as \$sf_hook)
-    {
-      call_user_func(\$sf_hook, 'Base{$this->getTable()->getPhpName()}Peer', \$values, \$con, \$ret);
-    }
-
-    return \$ret;
-
-EOF;
-
-      $line = $replace.$doUpdatePost;
-    }
-
-    return $line;
-  }
-
-  /**
-   * Creates the current model's behaviors configuration file.
-   *
-   * Any existing behaviors file will be either deleted or overwritten.
-   *
-   * @return boolean Returns true if the model has behaviors
-   */
-  protected function createBehaviorsFile()
-  {
-    $file = $this->getBehaviorsFilePath(true);
-
-    if (file_exists($file))
-    {
-      unlink($file);
-    }
-
-    if ($behaviors = $this->getTable()->getAttribute('behaviors'))
-    {
-      $code = <<<EOF
-<?php
-
-sfPropelBehavior::add('{$this->getTable()->getPhpName()}', %s);
-
-EOF;
-
-      file_put_contents($file, sprintf($code, var_export(unserialize($behaviors), true)));
-      return true;
-    }
-  }
-
-  /**
-   * Returns PHP code for including the current model's behaviors configuration file.
-   *
-   * @return string
-   */
-  protected function getBehaviorsInclude()
-  {
-    return <<<EOF
-
-// symfony_behaviors behavior
-include_once '{$this->getBehaviorsFilePath()}';
-
-EOF;
-  }
-
-  /**
-   * Returns the path to the current model's behaviors configuration file.
-   *
-   * @param boolean $absolute
-   *
-   * @return string
-   */
-  protected function getBehaviorsFilePath($absolute = false)
-  {
-    $base = $absolute ? sfConfig::get('sf_root_dir').DIRECTORY_SEPARATOR : '';
-    return $base.ClassTools::getFilePath($this->getTable()->getPackage().'.om', sprintf('Base%sBehaviors', $this->getTable()->getPhpName()));
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/behavior/SfPropelBehaviorTimestampable.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/behavior/SfPropelBehaviorTimestampable.php
deleted file mode 100644
index 1c6af76fc..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/behavior/SfPropelBehaviorTimestampable.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A timestampable implementation BC with symfony <= 1.2.
- *
- * @package     sfPropelPlugin
- * @subpackage  behavior
- * @author      Kris Wallsmith <kris.wallsmith@symfony-project.com>
- * @version     SVN: $Id: SfPropelBehaviorTimestampable.php 23310 2009-10-24 15:27:41Z Kris.Wallsmith $
- */
-class SfPropelBehaviorTimestampable extends SfPropelBehaviorBase
-{
-  protected $parameters = array(
-    'create_column' => null,
-    'update_column' => null,
-  );
-
-  public function preInsert()
-  {
-    if ($this->isDisabled())
-    {
-      return;
-    }
-
-    if ($column = $this->getParameter('create_column'))
-    {
-      return <<<EOF
-if (!\$this->isColumnModified({$this->getTable()->getColumn($column)->getConstantName()}))
-{
-  \$this->set{$this->getTable()->getColumn($column)->getPhpName()}(time());
-}
-
-EOF;
-    }
-  }
-
-  public function preSave()
-  {
-    if ($this->isDisabled())
-    {
-      return;
-    }
-
-    if ($column = $this->getParameter('update_column'))
-    {
-      return <<<EOF
-if (\$this->isModified() && !\$this->isColumnModified({$this->getTable()->getColumn($column)->getConstantName()}))
-{
-  \$this->set{$this->getTable()->getColumn($column)->getPhpName()}(time());
-}
-
-EOF;
-    }
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/database/sfPropelDatabase.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/database/sfPropelDatabase.class.php
deleted file mode 100644
index f43b9beab..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/database/sfPropelDatabase.class.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A symfony database driver for Propel.
- *
- * @package    sfPropelPlugin
- * @subpackage database
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelDatabase.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
- */
-class sfPropelDatabase extends sfPDODatabase
-{
-  /**
-   * Returns the current propel configuration.
-   *
-   * @return array
-   *
-   * @deprecated Use Propel::getConfiguration() instead
-   */
-  static public function getConfiguration()
-  {
-    return array('propel' => Propel::getConfiguration(PropelConfiguration::TYPE_ARRAY));
-  }
-
-  /**
-   * Configures a Propel datasource.
-   *
-   * @param array  $parameters The datasource parameters
-   * @param string $name       The datasource name
-   */
-  public function initialize($parameters = null, $name = 'propel')
-  {
-    parent::initialize($parameters);
-
-    if (!$this->hasParameter('datasource') && $this->hasParameter('name'))
-    {
-      $this->setParameter('datasource', $this->getParameter('name'));
-    }
-    elseif (!$this->hasParameter('datasource') && !empty($name))
-    {
-      $this->setParameter('datasource', $name);
-    }
-
-    $this->addConfig();
-
-    // mark the first connection as the default
-    if (!Propel::getConfiguration(PropelConfiguration::TYPE_OBJECT)->getParameter('datasources.default'))
-    {
-      $this->setDefaultConfig();
-    }
-
-    // for BC
-    if ($this->getParameter('pooling', false))
-    {
-      Propel::enableInstancePooling();
-    }
-    else
-    {
-      Propel::disableInstancePooling();
-    }
-  }
-
-  /**
-   * Connect to the database.
-   *
-   * Stores the PDO connection in $connection.
-   *
-   * @return void
-   */
-  public function connect()
-  {
-    $this->connection = Propel::getConnection($this->getParameter('datasource'));
-  }
-
-  /**
-   * Marks the current database as the default.
-   */
-  public function setDefaultConfig()
-  {
-    Propel::getConfiguration(PropelConfiguration::TYPE_OBJECT)->setParameter('datasources.default', $this->getParameter('datasource'));
-  }
-
-  /**
-   * Adds configuration for current datasource.
-   */
-  public function addConfig()
-  {
-    if ($dsn = $this->getParameter('dsn'))
-    {
-      $params = $this->parseDsn($dsn);
-
-      $options = array('dsn', 'phptype', 'hostspec', 'database', 'username', 'password', 'port', 'protocol', 'encoding', 'persistent', 'socket', 'compat_assoc_lower', 'compat_rtrim_string');
-      foreach ($options as $option)
-      {
-        if (!$this->getParameter($option) && isset($params[$option]))
-        {
-          $this->setParameter($option, $params[$option]);
-        }
-      }
-    }
-
-    if ($this->hasParameter('persistent'))
-    {
-      // for BC
-      $this->setParameter('options', array_merge(
-        $this->getParameter('options', array()),
-        array('ATTR_PERSISTENT' => $this->getParameter('persistent'))
-      ));
-    }
-
-    $propelConfiguration = Propel::getConfiguration(PropelConfiguration::TYPE_OBJECT);
-
-    if ($this->hasParameter('debug'))
-    {
-      $propelConfiguration->setParameter('debugpdo.logging', sfToolkit::arrayDeepMerge(
-        $propelConfiguration->getParameter('debugpdo.logging', array()),
-        $this->getParameter('debug')
-      ));
-    }
-
-    $event = new sfEvent($propelConfiguration, 'propel.filter_connection_config', array('name' => $this->getParameter('datasource'), 'database' => $this));
-    $event = sfProjectConfiguration::getActive()->getEventDispatcher()->filter($event, array(
-      'adapter'    => $this->getParameter('phptype'),
-      'connection' => array(
-        'dsn'       => $this->getParameter('dsn'),
-        'user'      => $this->getParameter('username'),
-        'password'  => $this->getParameter('password'),
-        'classname' => $this->getParameter('classname', 'PropelPDO'),
-        'options'   => $this->getParameter('options', array()),
-        'settings'  => array(
-          'charset' => array('value' => $this->getParameter('encoding', sfConfig::get('sf_charset'))),
-          'queries' => $this->getParameter('queries', array()),
-        ),
-      ),
-    ));
-
-    $propelConfiguration->setParameter('datasources.'.$this->getParameter('datasource'), $event->getReturnValue());
-  }
-
-  /**
-   * Sets database configuration parameter
-   *
-   * @param string $key
-   * @param mixed  $value
-   */
-  public function setConnectionParameter($key, $value)
-  {
-    if ('host' == $key)
-    {
-      $key = 'hostspec';
-    }
-
-    Propel::getConfiguration(PropelConfiguration::TYPE_OBJECT)->setParameter('datasources.'.$this->getParameter('datasource').'.connection.'.$key, $value);
-    $this->setParameter($key, $value);
-  }
-
-  /**
-   * Execute the shutdown procedure.
-   *
-   * @return void
-   */
-  public function shutdown()
-  {
-    if (null !== $this->connection)
-    {
-      @$this->connection = null;
-    }
-  }
-
-  /**
-   * Parses PDO style DSN.
-   *
-   * @param  string $dsn
-   *
-   * @return array the parsed dsn
-   */
-  protected function parseDsn($dsn)
-  {
-    return array('phptype' => substr($dsn, 0, strpos($dsn, ':')));
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/debug/sfWebDebugPanelPropel.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/debug/sfWebDebugPanelPropel.class.php
deleted file mode 100644
index 1065ca2c4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/debug/sfWebDebugPanelPropel.class.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-
-
-/**
- * sfWebDebugPanelPropel adds a panel to the web debug toolbar with Propel information.
- *
- * @package    symfony
- * @subpackage debug
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWebDebugPanelPropel.class.php 27284 2010-01-28 18:34:57Z Kris.Wallsmith $
- */
-class sfWebDebugPanelPropel extends sfWebDebugPanel
-{
-  /**
-   * Get the title/icon for the panel
-   *
-   * @return string $html
-   */
-  public function getTitle()
-  {
-    if ($sqlLogs = $this->getSqlLogs())
-    {
-      return '<img src="'.$this->webDebug->getOption('image_root_path').'/database.png" alt="SQL queries" /> '.count($sqlLogs);
-    }
-  }
-
-  /**
-   * Get the verbal title of the panel
-   *
-   * @return string $title
-   */
-  public function getPanelTitle()
-  {
-    return 'SQL queries';
-  }
-
-  /**
-   * Get the html content of the panel
-   *
-   * @return string $html
-   */
-  public function getPanelContent()
-  {
-    return '
-      <div id="sfWebDebugDatabaseLogs">
-        <h3>Propel Version: '.Propel::VERSION.'</h3>
-        <ol>'.implode("\n", $this->getSqlLogs()).'</ol>
-      </div>
-    ';
-  }
-
-  /**
-   * Listens to debug.web.load_panels and adds this panel.
-   */
-  static public function listenToAddPanelEvent(sfEvent $event)
-  {
-    $event->getSubject()->setPanel('db', new self($event->getSubject()));
-  }
-
-  /**
-   * Builds the sql logs and returns them as an array.
-   *
-   * @return array
-   */
-  protected function getSqlLogs()
-  {
-    $config    = $this->getPropelConfiguration();
-    $outerGlue = $config->getParameter('debugpdo.logging.outerglue', ' | ');
-    $innerGlue = $config->getParameter('debugpdo.logging.innerglue', ': ');
-    $flagSlow  = $config->getParameter('debugpdo.logging.details.slow.enabled', false);
-    $threshold = $config->getParameter('debugpdo.logging.details.slow.threshold', DebugPDO::DEFAULT_SLOW_THRESHOLD);
-
-    $html = array();
-    foreach ($this->webDebug->getLogger()->getLogs() as $log)
-    {
-      if ('sfPropelLogger' != $log['type'])
-      {
-        continue;
-      }
-
-      $details = array();
-      $slowQuery = false;
-
-      $parts = explode($outerGlue, $log['message']);
-      foreach ($parts as $i => $part)
-      {
-        // is this a key-glue-value fragment ?
-        if (preg_match('/^(\w+)'.preg_quote($innerGlue, '/').'(.*)/', $part, $match))
-        {
-          $details[] = $part;
-          unset($parts[$i]);
-
-          // check for slow query
-          if ('time' == $match[1])
-          {
-            if ($flagSlow && (float) $match[2] > $threshold)
-            {
-              $slowQuery = true;
-              if ($this->getStatus() > sfLogger::NOTICE)
-              {
-                $this->setStatus(sfLogger::NOTICE);
-              }
-            }
-          }
-        }
-      }
-      // all stuff that has not been eaten by the loop should be the query string
-      $query = join($outerGlue, $parts);
-
-      $query = $this->formatSql(htmlspecialchars($query, ENT_QUOTES, sfConfig::get('sf_charset')));
-      $backtrace = isset($log['debug_backtrace']) && count($log['debug_backtrace']) ? '&nbsp;'.$this->getToggleableDebugStack($log['debug_backtrace']) : '';
-
-      $html[] = sprintf('
-        <li%s>
-          <p class="sfWebDebugDatabaseQuery">%s</p>
-          <div class="sfWebDebugDatabaseLogInfo">%s%s</div>
-        </li>',
-        $slowQuery ? ' class="sfWebDebugWarning"' : '',
-        $query,
-        implode(', ', $details),
-        $backtrace
-      );
-    }
-
-    return $html;
-  }
-
-  /**
-   * Returns the current PropelConfiguration.
-   *
-   * @return PropelConfiguration
-   */
-  protected function getPropelConfiguration()
-  {
-    return Propel::getConfiguration(PropelConfiguration::TYPE_OBJECT);
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/form/sfFormFilterPropel.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/form/sfFormFilterPropel.class.php
deleted file mode 100644
index 4c5189cd8..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/form/sfFormFilterPropel.class.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * sfFormFilterPropel is the base class for filter forms based on Propel objects.
- *
- * @package    symfony
- * @subpackage form
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfFormFilterPropel.class.php 27748 2010-02-08 18:18:44Z Kris.Wallsmith $
- */
-abstract class sfFormFilterPropel extends sfFormFilter
-{
-  /**
-   * Returns the current model name.
-   *
-   * @return string The model class name
-   */
-  abstract public function getModelName();
-
-  /**
-   * Returns the fields and their filter type.
-   *
-   * @return array An array of fields with their filter type
-   */
-  abstract public function getFields();
-
-  /**
-   * Returns a Propel Criteria based on the current values form the form.
-   *
-   * @return Criteria A Propel Criteria object
-   */
-  public function getCriteria()
-  {
-    if (!$this->isValid())
-    {
-      throw $this->getErrorSchema();
-    }
-
-    return $this->buildCriteria($this->getValues());
-  }
-
-  /**
-   * Processes cleaned up values with user defined methods.
-   *
-   * To process a value before it is used by the buildCriteria() method,
-   * you need to define an convertXXXValue() method where XXX is the PHP name
-   * of the column.
-   *
-   * The method must return the processed value or false to remove the value
-   * from the array of cleaned up values.
-   *
-   * @param  array An array of cleaned up values to process
-   *
-   * @return array An array of cleaned up values processed by the user defined methods
-   */
-  public function processValues($values)
-  {
-    // see if the user has overridden some column setter
-    $originalValues = $values;
-    foreach ($originalValues as $field => $value)
-    {
-      try
-      {
-        $method = sprintf('convert%sValue', call_user_func(array(constant($this->getModelName().'::PEER'), 'translateFieldName'), $field, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_PHPNAME));
-      }
-      catch (Exception $e)
-      {
-        // no a "real" column of this object
-        continue;
-      }
-
-      if (method_exists($this, $method))
-      {
-        if (false === $ret = $this->$method($value))
-        {
-          unset($values[$field]);
-        }
-        else
-        {
-          $values[$field] = $ret;
-        }
-      }
-    }
-
-    return $values;
-  }
-
-  /**
-   * Builds a Propel Criteria based on the passed values.
-   *
-   * @param  array    An array of parameters to build the Criteria object
-   *
-   * @return Criteria A Propel Criteria object
-   */
-  public function buildCriteria(array $values)
-  {
-    return $this->doBuildCriteria($this->processValues($values));
-  }
-
-  /**
-   * Builds a Propel Criteria with processed values.
-   *
-   * Overload this method instead of {@link buildCriteria()} to avoid running
-   * {@link processValues()} multiple times.
-   *
-   * @param  array $values
-   *
-   * @return Criteria
-   */
-  protected function doBuildCriteria(array $values)
-  {
-    $criteria = new Criteria();
-    $peer = constant($this->getModelName().'::PEER');
-
-    $fields = $this->getFields();
-
-    // add those fields that are not represented in getFields() with a null type
-    $names = array_merge($fields, array_diff(array_keys($this->validatorSchema->getFields()), array_keys($fields)));
-    $fields = array_merge($fields, array_combine($names, array_fill(0, count($names), null)));
-
-    foreach ($fields as $field => $type)
-    {
-      if (!isset($values[$field]) || null === $values[$field] || '' === $values[$field])
-      {
-        continue;
-      }
-
-      try
-      {
-        $method = sprintf('add%sColumnCriteria', call_user_func(array($peer, 'translateFieldName'), $field, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_PHPNAME));
-      }
-      catch (Exception $e)
-      {
-        // not a "real" column
-        if (!method_exists($this, $method = sprintf('add%sColumnCriteria', self::camelize($field))))
-        {
-          throw new LogicException(sprintf('You must define a "%s" method to be able to filter with the "%s" field.', $method, $field));
-        }
-      }
-
-      if (method_exists($this, $method))
-      {
-        $this->$method($criteria, $field, $values[$field]);
-      }
-      else
-      {
-        if (!method_exists($this, $method = sprintf('add%sCriteria', $type)))
-        {
-          throw new LogicException(sprintf('Unable to filter for the "%s" type.', $type));
-        }
-
-        $this->$method($criteria, $field, $values[$field]);
-      }
-    }
-
-    return $criteria;
-  }
-
-  protected function addForeignKeyCriteria(Criteria $criteria, $field, $value)
-  {
-    $colname = $this->getColname($field);
-
-    if (is_array($value))
-    {
-      $values = $value;
-      $value = array_pop($values);
-      $criterion = $criteria->getNewCriterion($colname, $value);
-
-      foreach ($values as $value)
-      {
-        $criterion->addOr($criteria->getNewCriterion($colname, $value));
-      }
-
-      $criteria->add($criterion);
-    }
-    else
-    {
-      $criteria->add($colname, $value);
-    }
-  }
-
-  protected function addTextCriteria(Criteria $criteria, $field, $values)
-  {
-    $colname = $this->getColname($field);
-
-    if (is_array($values) && isset($values['is_empty']) && $values['is_empty'])
-    {
-      $criterion = $criteria->getNewCriterion($colname, '');
-      $criterion->addOr($criteria->getNewCriterion($colname, null, Criteria::ISNULL));
-      $criteria->add($criterion);
-    }
-    else if (is_array($values) && isset($values['text']) && '' != $values['text'])
-    {
-      $criteria->add($colname, '%'.$values['text'].'%', Criteria::LIKE);
-    }
-  }
-
-  protected function addNumberCriteria(Criteria $criteria, $field, $values)
-  {
-    $colname = $this->getColname($field);
-
-    if (is_array($values) && isset($values['is_empty']) && $values['is_empty'])
-    {
-      $criterion = $criteria->getNewCriterion($colname, '');
-      $criterion->addOr($criteria->getNewCriterion($colname, null, Criteria::ISNULL));
-      $criteria->add($criterion);
-    }
-    else if (is_array($values) && isset($values['text']) && '' !== $values['text'])
-    {
-      $criteria->add($colname, $values['text']);
-    }
-  }
-
-  protected function addBooleanCriteria(Criteria $criteria, $field, $value)
-  {
-    $criteria->add($this->getColname($field), $value);
-  }
-
-  protected function addDateCriteria(Criteria $criteria, $field, $values)
-  {
-    $colname = $this->getColname($field);
-
-    if (isset($values['is_empty']) && $values['is_empty'])
-    {
-      $criteria->add($colname, null, Criteria::ISNULL);
-    }
-    else
-    {
-      $criterion = null;
-      if (null !== $values['from'] && null !== $values['to'])
-      {
-        $criterion = $criteria->getNewCriterion($colname, $values['from'], Criteria::GREATER_EQUAL);
-        $criterion->addAnd($criteria->getNewCriterion($colname, $values['to'], Criteria::LESS_EQUAL));
-      }
-      else if (null !== $values['from'])
-      {
-        $criterion = $criteria->getNewCriterion($colname, $values['from'], Criteria::GREATER_EQUAL);
-      }
-      else if (null !== $values['to'])
-      {
-        $criterion = $criteria->getNewCriterion($colname, $values['to'], Criteria::LESS_EQUAL);
-      }
-
-      if (null !== $criterion)
-      {
-        $criteria->add($criterion);
-      }
-    }
-  }
-
-  protected function getColName($field)
-  {
-    return call_user_func(array(constant($this->getModelName().'::PEER'), 'translateFieldName'), $field, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_COLNAME);
-  }
-
-  protected function camelize($text)
-  {
-    return sfToolkit::pregtr($text, array('#/(.?)#e' => "'::'.strtoupper('\\1')", '/(^|_|-)+(.)/e' => "strtoupper('\\2')"));
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/form/sfFormPropel.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/form/sfFormPropel.class.php
deleted file mode 100644
index 125c1ce86..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/form/sfFormPropel.class.php
+++ /dev/null
@@ -1,311 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * sfFormPropel is the base class for forms based on Propel objects.
- *
- * This class extends BaseForm, a class generated automatically with each new project.
- *
- * @package    symfony
- * @subpackage form
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfFormPropel.class.php 27915 2010-02-11 18:12:56Z Kris.Wallsmith $
- */
-abstract class sfFormPropel extends sfFormObject
-{
-  /**
-   * Constructor.
-   *
-   * @param mixed  A object used to initialize default values
-   * @param array  An array of options
-   * @param string A CSRF secret (false to disable CSRF protection, null to use the global CSRF secret)
-   *
-   * @see sfForm
-   */
-  public function __construct($object = null, $options = array(), $CSRFSecret = null)
-  {
-    $class = $this->getModelName();
-    if (!$object)
-    {
-      $this->object = new $class();
-    }
-    else
-    {
-      if (!$object instanceof $class)
-      {
-        throw new sfException(sprintf('The "%s" form only accepts a "%s" object.', get_class($this), $class));
-      }
-
-      $this->object = $object;
-      $this->isNew = $this->getObject()->isNew();
-    }
-
-    parent::__construct(array(), $options, $CSRFSecret);
-
-    $this->updateDefaultsFromObject();
-  }
-
-  /**
-   * @return PropelPDO
-   * @see sfFormObject
-   */
-  public function getConnection()
-  {
-    return Propel::getConnection(constant(constant(get_class($this->getObject()).'::PEER').'::DATABASE_NAME'));
-  }
-
-  /**
-   * Embeds i18n objects into the current form.
-   *
-   * @param array   $cultures   An array of cultures
-   * @param string  $decorator  A HTML decorator for the embedded form
-   */
-  public function embedI18n($cultures, $decorator = null)
-  {
-    if (!$this->isI18n())
-    {
-      throw new sfException(sprintf('The model "%s" is not internationalized.', $this->getModelName()));
-    }
-
-    $class = $this->getI18nFormClass();
-    foreach ($cultures as $culture)
-    {
-      $method = sprintf('getCurrent%s', $this->getI18nModelName($culture));
-      $i18nObject = $this->getObject()->$method($culture);
-      $i18n = new $class($i18nObject);
-      
-      if ($i18nObject->isNew())
-      {
-        unset($i18n['id'], $i18n['culture']);
-      }
-
-      $this->embedForm($culture, $i18n, $decorator);
-    }
-  }
-
-  /**
-   * @see sfFormObject
-   */
-  protected function doUpdateObject($values)
-  {
-    $this->getObject()->fromArray($values, BasePeer::TYPE_FIELDNAME);
-  }
-
-  /**
-   * Processes cleaned up values with user defined methods.
-   *
-   * To process a value before it is used by the updateObject() method,
-   * you need to define an updateXXXColumn() method where XXX is the PHP name
-   * of the column.
-   *
-   * The method must return the processed value or false to remove the value
-   * from the array of cleaned up values.
-   *
-   * @see sfFormObject
-   */
-  public function processValues($values)
-  {
-    // see if the user has overridden some column setter
-    $valuesToProcess = $values;
-    foreach ($valuesToProcess as $field => $value)
-    {
-      try
-      {
-        $method = sprintf('update%sColumn', call_user_func(array(constant(get_class($this->getObject()).'::PEER'), 'translateFieldName'), $field, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_PHPNAME));
-      }
-      catch (Exception $e)
-      {
-        // not a "real" column of this object
-        if (!method_exists($this, $method = sprintf('update%sColumn', self::camelize($field))))
-        {
-          continue;
-        }
-      }
-
-      if (method_exists($this, $method))
-      {
-        if (false === $ret = $this->$method($value))
-        {
-          unset($values[$field]);
-        }
-        else
-        {
-          $values[$field] = $ret;
-        }
-      }
-      else
-      {
-        // save files
-        if ($this->validatorSchema[$field] instanceof sfValidatorFile)
-        {
-          $values[$field] = $this->processUploadedFile($field, null, $valuesToProcess);
-        }
-      }
-    }
-
-    return $values;
-  }
-
-  /**
-   * Returns true if the current form has some associated i18n objects.
-   *
-   * @return Boolean true if the current form has some associated i18n objects, false otherwise
-   */
-  public function isI18n()
-  {
-    return null !== $this->getI18nFormClass();
-  }
-
-  /**
-   * Returns the name of the i18n model.
-   *
-   * @return string The name of the i18n model
-   */
-  public function getI18nModelName()
-  {
-    return null;
-  }
-
-  /**
-   * Returns the name of the i18n form class.
-   *
-   * @return string The name of the i18n form class
-   */
-  public function getI18nFormClass()
-  {
-    return null;
-  }
-
-  /**
-   * Updates the default values of the form with the current values of the current object.
-   */
-  protected function updateDefaultsFromObject()
-  {
-    // update defaults for the main object
-    if ($this->isNew())
-    {
-      $this->setDefaults($this->getDefaults() + $this->getObject()->toArray(BasePeer::TYPE_FIELDNAME));
-    }
-    else
-    {
-      $this->setDefaults($this->getObject()->toArray(BasePeer::TYPE_FIELDNAME) + $this->getDefaults());
-    }
-  }
-
-  /**
-   * Saves the uploaded file for the given field.
-   *
-   * @param  string $field The field name
-   * @param  string $filename The file name of the file to save
-   * @param  array  $values An array of values
-   *
-   * @return string The filename used to save the file
-   */
-  protected function processUploadedFile($field, $filename = null, $values = null)
-  {
-    if (!$this->validatorSchema[$field] instanceof sfValidatorFile)
-    {
-      throw new LogicException(sprintf('You cannot save the current file for field "%s" as the field is not a file.', $field));
-    }
-
-    if (null === $values)
-    {
-      $values = $this->values;
-    }
-
-    if (isset($values[$field.'_delete']) && $values[$field.'_delete'])
-    {
-      $this->removeFile($field);
-
-      return '';
-    }
-
-    if (!$values[$field])
-    {
-      $column = call_user_func(array(constant(get_class($this->getObject()).'::PEER'), 'translateFieldName'), $field, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_PHPNAME);
-      $getter = 'get'.$column;
-
-      return $this->getObject()->$getter();
-    }
-
-    // we need the base directory
-    if (!$this->validatorSchema[$field]->getOption('path'))
-    {
-      return $values[$field];
-    }
-
-    $this->removeFile($field);
-
-    return $this->saveFile($field, $filename, $values[$field]);
-  }
-
-  /**
-   * Removes the current file for the field.
-   *
-   * @param string $field The field name
-   */
-  protected function removeFile($field)
-  {
-    if (!$this->validatorSchema[$field] instanceof sfValidatorFile)
-    {
-      throw new LogicException(sprintf('You cannot remove the current file for field "%s" as the field is not a file.', $field));
-    }
-
-    $column = call_user_func(array(constant(get_class($this->getObject()).'::PEER'), 'translateFieldName'), $field, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_PHPNAME);
-    $getter = 'get'.$column;
-
-    if (($directory = $this->validatorSchema[$field]->getOption('path')) && is_file($directory.DIRECTORY_SEPARATOR.$this->getObject()->$getter()))
-    {
-      unlink($directory.DIRECTORY_SEPARATOR.$this->getObject()->$getter());
-    }
-  }
-
-  /**
-   * Saves the current file for the field.
-   *
-   * @param  string          $field    The field name
-   * @param  string          $filename The file name of the file to save
-   * @param  sfValidatedFile $file     The validated file to save
-   *
-   * @return string The filename used to save the file
-   */
-  protected function saveFile($field, $filename = null, sfValidatedFile $file = null)
-  {
-    if (!$this->validatorSchema[$field] instanceof sfValidatorFile)
-    {
-      throw new LogicException(sprintf('You cannot save the current file for field "%s" as the field is not a file.', $field));
-    }
-
-    if (null === $file)
-    {
-      $file = $this->getValue($field);
-    }
-
-    $column = call_user_func(array(constant(get_class($this->getObject()).'::PEER'), 'translateFieldName'), $field, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_PHPNAME);
-    $method = sprintf('generate%sFilename', $column);
-
-    if (null !== $filename)
-    {
-      return $file->save($filename);
-    }
-    else if (method_exists($this, $method))
-    {
-      return $file->save($this->$method($file));
-    }
-    else if (method_exists($this->getObject(), $method))
-    {
-      return $file->save($this->getObject()->$method($file));
-    }
-    else
-    {
-      return $file->save();
-    }
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/generator/sfPropelFormFilterGenerator.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/generator/sfPropelFormFilterGenerator.class.php
deleted file mode 100644
index 14cb7bfe7..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/generator/sfPropelFormFilterGenerator.class.php
+++ /dev/null
@@ -1,304 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Propel filter form generator.
- *
- * This class generates a Propel filter forms.
- *
- * @package    symfony
- * @subpackage generator
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelFormFilterGenerator.class.php 24392 2009-11-25 18:35:39Z FabianLange $
- */
-class sfPropelFormFilterGenerator extends sfPropelFormGenerator
-{
-  /**
-   * Initializes the current sfGenerator instance.
-   *
-   * @param sfGeneratorManager $generatorManager A sfGeneratorManager instance
-   */
-  public function initialize(sfGeneratorManager $generatorManager)
-  {
-    parent::initialize($generatorManager);
-
-    $this->setGeneratorClass('sfPropelFormFilter');
-  }
-
-  /**
-   * Generates classes and templates in cache.
-   *
-   * @param array $params The parameters
-   *
-   * @return string The data to put in configuration cache
-   */
-  public function generate($params = array())
-  {
-    $this->params = $params;
-
-    if (!isset($this->params['connection']))
-    {
-      throw new sfParseException('You must specify a "connection" parameter.');
-    }
-
-    if (!isset($this->params['model_dir_name']))
-    {
-      $this->params['model_dir_name'] = 'model';
-    }
-
-    if (!isset($this->params['filter_dir_name']))
-    {
-      $this->params['filter_dir_name'] = 'filter';
-    }
-
-    $this->loadBuilders();
-
-    $this->dbMap = Propel::getDatabaseMap($this->params['connection']);
-
-    // create the project base class for all forms
-    $file = sfConfig::get('sf_lib_dir').'/filter/BaseFormFilterPropel.class.php';
-    if (!file_exists($file))
-    {
-      if (!is_dir($directory = dirname($file)))
-      {
-        mkdir($directory, 0777, true);
-      }
-
-      file_put_contents($file, $this->evalTemplate('sfPropelFormFilterBaseTemplate.php'));
-    }
-
-    // create a form class for every Propel class
-    foreach ($this->dbMap->getTables() as $tableName => $table)
-    {
-      $behaviors = $table->getBehaviors();
-      if (isset($behaviors['symfony']['filter']) && 'false' === $behaviors['symfony']['filter'])
-      {
-        continue;
-      }
-
-      $this->table = $table;
-
-      // find the package to store filter forms in the same directory as the model classes
-      $packages = explode('.', constant(constant($table->getClassname().'::PEER').'::CLASS_DEFAULT'));
-      array_pop($packages);
-      if (false === $pos = array_search($this->params['model_dir_name'], $packages))
-      {
-        throw new InvalidArgumentException(sprintf('Unable to find the model dir name (%s) in the package %s.', $this->params['model_dir_name'], constant(constant($table->getClassname().'::PEER').'::CLASS_DEFAULT')));
-      }
-      $packages[$pos] = $this->params['filter_dir_name'];
-      $baseDir = sfConfig::get('sf_root_dir').'/'.implode(DIRECTORY_SEPARATOR, $packages);
-
-      if (!is_dir($baseDir.'/base'))
-      {
-        mkdir($baseDir.'/base', 0777, true);
-      }
-
-      file_put_contents($baseDir.'/base/Base'.$table->getClassname().'FormFilter.class.php', $this->evalTemplate('sfPropelFormFilterGeneratedTemplate.php'));
-      if (!file_exists($classFile = $baseDir.'/'.$table->getClassname().'FormFilter.class.php'))
-      {
-        file_put_contents($classFile, $this->evalTemplate('sfPropelFormFilterTemplate.php'));
-      }
-    }
-  }
-
-  /**
-   * Returns a sfWidgetForm class name for a given column.
-   *
-   * @param  ColumnMap  $column A ColumnMap object
-   *
-   * @return string    The name of a subclass of sfWidgetForm
-   */
-  public function getWidgetClassForColumn(ColumnMap $column)
-  {
-    switch ($column->getType())
-    {
-      case PropelColumnTypes::BOOLEAN:
-        $name = 'Choice';
-        break;
-      case PropelColumnTypes::DATE:
-      case PropelColumnTypes::TIME:
-      case PropelColumnTypes::TIMESTAMP:
-        $name = 'FilterDate';
-        break;
-      default:
-        $name = 'FilterInput';
-    }
-
-    if ($column->isForeignKey())
-    {
-      $name = 'PropelChoice';
-    }
-
-    return sprintf('sfWidgetForm%s', $name);
-  }
-
-  /**
-   * Returns a PHP string representing options to pass to a widget for a given column.
-   *
-   * @param  ColumnMap $column  A ColumnMap object
-   *
-   * @return string    The options to pass to the widget as a PHP string
-   */
-  public function getWidgetOptionsForColumn(ColumnMap $column)
-  {
-    $options = array();
-
-    $withEmpty = $column->isNotNull() && !$column->isForeignKey() ? array("'with_empty' => false") : array();
-    switch ($column->getType())
-    {
-      case PropelColumnTypes::BOOLEAN:
-        $options[] = "'choices' => array('' => 'yes or no', 1 => 'yes', 0 => 'no')";
-        break;
-      case PropelColumnTypes::DATE:
-      case PropelColumnTypes::TIME:
-      case PropelColumnTypes::TIMESTAMP:
-        $options[] = "'from_date' => new sfWidgetFormDate(), 'to_date' => new sfWidgetFormDate()";
-        $options = array_merge($options, $withEmpty);
-        break;
-      default:
-        $options = array_merge($options, $withEmpty);
-    }
-
-    if ($column->isForeignKey())
-    {
-      $options[] = sprintf('\'model\' => \'%s\', \'add_empty\' => true', $this->getForeignTable($column)->getClassname());
-
-      $refColumn = $this->getForeignTable($column)->getColumn($column->getRelatedColumnName());
-      if (!$refColumn->isPrimaryKey())
-      {
-        $options[] = sprintf('\'key_method\' => \'get%s\'', $refColumn->getPhpName());
-      }
-    }
-
-    return count($options) ? sprintf('array(%s)', implode(', ', $options)) : '';
-  }
-
-  /**
-   * Returns a sfValidator class name for a given column.
-   *
-   * @param  ColumnMap $column  A ColumnMap object
-   *
-   * @return string    The name of a subclass of sfValidator
-   */
-  public function getValidatorClassForColumn(ColumnMap $column)
-  {
-    switch ($column->getType())
-    {
-      case PropelColumnTypes::BOOLEAN:
-        $name = 'Choice';
-        break;
-      case PropelColumnTypes::DOUBLE:
-      case PropelColumnTypes::FLOAT:
-      case PropelColumnTypes::NUMERIC:
-      case PropelColumnTypes::DECIMAL:
-      case PropelColumnTypes::REAL:
-        $name = 'Number';
-        break;
-      case PropelColumnTypes::INTEGER:
-      case PropelColumnTypes::SMALLINT:
-      case PropelColumnTypes::TINYINT:
-      case PropelColumnTypes::BIGINT:
-        $name = 'Integer';
-        break;
-      case PropelColumnTypes::DATE:
-      case PropelColumnTypes::TIME:
-      case PropelColumnTypes::TIMESTAMP:
-        $name = 'DateRange';
-        break;
-      default:
-        $name = 'Pass';
-    }
-
-    if ($column->isPrimaryKey() || $column->isForeignKey())
-    {
-      $name = 'PropelChoice';
-    }
-
-    return sprintf('sfValidator%s', $name);
-  }
-
-  /**
-   * Returns a PHP string representing options to pass to a validator for a given column.
-   *
-   * @param  ColumnMap $column  A ColumnMap object
-   *
-   * @return string    The options to pass to the validator as a PHP string
-   */
-  public function getValidatorOptionsForColumn(ColumnMap $column)
-  {
-    $options = array('\'required\' => false');
-
-    if ($column->isForeignKey())
-    {
-      $options[] = sprintf('\'model\' => \'%s\', \'column\' => \'%s\'', $this->getForeignTable($column)->getClassname(), $this->translateColumnName($column, true));
-    }
-    else if ($column->isPrimaryKey())
-    {
-      $options[] = sprintf('\'model\' => \'%s\', \'column\' => \'%s\'', $column->getTable()->getClassname(), $this->translateColumnName($column));
-    }
-    else
-    {
-      switch ($column->getType())
-      {
-        case PropelColumnTypes::BOOLEAN:
-          $options[] = "'choices' => array('', 1, 0)";
-          break;
-        case PropelColumnTypes::DATE:
-        case PropelColumnTypes::TIME:
-        case PropelColumnTypes::TIMESTAMP:
-          $options[] = "'from_date' => new sfValidatorDate(array('required' => false)), 'to_date' => new sfValidatorDate(array('required' => false))";
-          break;
-      }
-    }
-
-    return count($options) ? sprintf('array(%s)', implode(', ', $options)) : '';
-  }
-
-  public function getValidatorForColumn($column)
-  {
-    $format = 'new %s(%s)';
-    if (in_array($class = $this->getValidatorClassForColumn($column), array('sfValidatorInteger', 'sfValidatorNumber')))
-    {
-      $format = 'new sfValidatorSchemaFilter(\'text\', new %s(%s))';
-    }
-
-    return sprintf($format, $class, $this->getValidatorOptionsForColumn($column));
-  }
-
-  public function getType(ColumnMap $column)
-  {
-    if ($column->isForeignKey())
-    {
-      return 'ForeignKey';
-    }
-
-    switch ($column->getType())
-    {
-      case PropelColumnTypes::BOOLEAN:
-        return 'Boolean';
-      case PropelColumnTypes::DATE:
-      case PropelColumnTypes::TIME:
-      case PropelColumnTypes::TIMESTAMP:
-        return 'Date';
-      case PropelColumnTypes::DOUBLE:
-      case PropelColumnTypes::FLOAT:
-      case PropelColumnTypes::NUMERIC:
-      case PropelColumnTypes::DECIMAL:
-      case PropelColumnTypes::REAL:
-      case PropelColumnTypes::INTEGER:
-      case PropelColumnTypes::SMALLINT:
-      case PropelColumnTypes::TINYINT:
-      case PropelColumnTypes::BIGINT:
-        return 'Number';
-      default:
-        return 'Text';
-    }
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/generator/sfPropelFormGenerator.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/generator/sfPropelFormGenerator.class.php
deleted file mode 100644
index 1b6808099..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/generator/sfPropelFormGenerator.class.php
+++ /dev/null
@@ -1,526 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Propel form generator.
- *
- * This class generates a Propel forms.
- *
- * @package    symfony
- * @subpackage generator
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelFormGenerator.class.php 29661 2010-05-28 16:56:42Z Kris.Wallsmith $
- */
-class sfPropelFormGenerator extends sfGenerator
-{
-  protected
-    $dbMap = null;
-
-  /**
-   * Initializes the current sfGenerator instance.
-   *
-   * @param sfGeneratorManager $generatorManager A sfGeneratorManager instance
-   */
-  public function initialize(sfGeneratorManager $generatorManager)
-  {
-    parent::initialize($generatorManager);
-
-    $this->setGeneratorClass('sfPropelForm');
-  }
-
-  /**
-   * Generates classes and templates in cache.
-   *
-   * @param array $params The parameters
-   *
-   * @return string The data to put in configuration cache
-   */
-  public function generate($params = array())
-  {
-    $this->params = $params;
-
-    if (!isset($this->params['connection']))
-    {
-      throw new sfParseException('You must specify a "connection" parameter.');
-    }
-
-    if (!isset($this->params['model_dir_name']))
-    {
-      $this->params['model_dir_name'] = 'model';
-    }
-
-    if (!isset($this->params['form_dir_name']))
-    {
-      $this->params['form_dir_name'] = 'form';
-    }
-
-    $this->dbMap = Propel::getDatabaseMap($this->params['connection']);
-
-    $this->loadBuilders();
-    
-    // create the project base class for all forms
-    $file = sfConfig::get('sf_lib_dir').'/form/BaseFormPropel.class.php';
-    if (!file_exists($file))
-    {
-      if (!is_dir($directory = dirname($file)))
-      {
-        mkdir($directory, 0777, true);
-      }
-
-      file_put_contents($file, $this->evalTemplate('sfPropelFormBaseTemplate.php'));
-    }
-
-    // create a form class for every Propel class
-    foreach ($this->dbMap->getTables() as $tableName => $table)
-    {
-      $behaviors = $table->getBehaviors();
-      if (isset($behaviors['symfony']['form']) && 'false' === $behaviors['symfony']['form'])
-      {
-        continue;
-      }
-
-      $this->table = $table;
-
-      // find the package to store forms in the same directory as the model classes
-      $packages = explode('.', constant(constant($table->getClassname().'::PEER').'::CLASS_DEFAULT'));
-      array_pop($packages);
-      if (false === $pos = array_search($this->params['model_dir_name'], $packages))
-      {
-        throw new InvalidArgumentException(sprintf('Unable to find the model dir name (%s) in the package %s.', $this->params['model_dir_name'], constant(constant($table->getClassname().'::PEER').'::CLASS_DEFAULT')));
-      }
-      $packages[$pos] = $this->params['form_dir_name'];
-      $baseDir = sfConfig::get('sf_root_dir').'/'.implode(DIRECTORY_SEPARATOR, $packages);
-
-      if (!is_dir($baseDir.'/base'))
-      {
-        mkdir($baseDir.'/base', 0777, true);
-      }
-
-      file_put_contents($baseDir.'/base/Base'.$table->getClassname().'Form.class.php', $this->evalTemplate('sfPropelFormGeneratedTemplate.php'));
-      if (!file_exists($classFile = $baseDir.'/'.$table->getClassname().'Form.class.php'))
-      {
-        file_put_contents($classFile, $this->evalTemplate('sfPropelFormTemplate.php'));
-      }
-    }
-  }
-
-  /**
-   * Returns an array of tables that represents a many to many relationship.
-   *
-   * A table is considered to be a m2m table if it has 2 foreign keys that are also primary keys.
-   *
-   * @return array An array of tables.
-   */
-  public function getManyToManyTables()
-  {
-    $tables = array();
-
-    // go through all tables to find m2m relationships
-    foreach ($this->dbMap->getTables() as $tableName => $table)
-    {
-      foreach ($table->getColumns() as $column)
-      {
-        if ($column->isForeignKey() && $column->isPrimaryKey() && $this->table->getClassname() == $this->getForeignTable($column)->getClassname())
-        {
-          // we have a m2m relationship
-          // find the other primary key
-          foreach ($table->getColumns() as $relatedColumn)
-          {
-            if ($relatedColumn->isForeignKey() && $relatedColumn->isPrimaryKey() && $this->table->getClassname() != $this->getForeignTable($relatedColumn)->getClassname())
-            {
-              // we have the related table
-              $tables[] = array(
-                'middleTable'   => $table,
-                'relatedTable'  => $this->getForeignTable($relatedColumn),
-                'column'        => $column,
-                'relatedColumn' => $relatedColumn,
-              );
-
-              break 2;
-            }
-          }
-        }
-      }
-    }
-
-    return $tables;
-  }
-
-  /**
-   * Returns PHP names for all foreign keys of the current table.
-   *
-   * This method does not returns foreign keys that are also primary keys.
-   *
-   * @return array An array composed of:
-   *                 * The foreign table PHP name
-   *                 * The foreign key PHP name
-   *                 * A Boolean to indicate whether the column is required or not
-   *                 * A Boolean to indicate whether the column is a many to many relationship or not
-   */
-  public function getForeignKeyNames()
-  {
-    $names = array();
-    foreach ($this->table->getColumns() as $column)
-    {
-      if (!$column->isPrimaryKey() && $column->isForeignKey())
-      {
-        $names[] = array($this->getForeignTable($column)->getClassname(), $column->getPhpName(), $column->isNotNull(), false);
-      }
-    }
-
-    foreach ($this->getManyToManyTables() as $tables)
-    {
-      $names[] = array($tables['relatedTable']->getClassname(), $tables['middleTable']->getClassname(), false, true);
-    }
-
-    return $names;
-  }
-
-  /**
-   * Returns the first primary key column of the current table.
-   *
-   * @return ColumnMap A ColumnMap object
-   */
-  public function getPrimaryKey()
-  {
-    foreach ($this->table->getColumns() as $column)
-    {
-      if ($column->isPrimaryKey())
-      {
-        return $column;
-      }
-    }
-  }
-
-  /**
-   * Returns the foreign table associated with a column.
-   *
-   * @param  ColumnMap $column A ColumnMap object
-   *
-   * @return TableMap  A TableMap object
-   */
-  public function getForeignTable(ColumnMap $column)
-  {
-    return $this->dbMap->getTable($column->getRelatedTableName());
-  }
-
-  /**
-   * Returns a sfWidgetForm class name for a given column.
-   *
-   * @param  ColumnMap  $column A ColumnMap object
-   *
-   * @return string    The name of a subclass of sfWidgetForm
-   */
-  public function getWidgetClassForColumn(ColumnMap $column)
-  {
-    switch ($column->getType())
-    {
-      case PropelColumnTypes::BOOLEAN:
-        $name = 'InputCheckbox';
-        break;
-      case PropelColumnTypes::CLOB:
-      case PropelColumnTypes::LONGVARCHAR:
-        $name = 'Textarea';
-        break;
-      case PropelColumnTypes::DATE:
-        $name = 'Date';
-        break;
-      case PropelColumnTypes::TIME:
-        $name = 'Time';
-        break;
-      case PropelColumnTypes::TIMESTAMP:
-        $name = 'DateTime';
-        break;
-      default:
-        $name = 'InputText';
-    }
-
-    if ($column->isPrimaryKey())
-    {
-      $name = 'InputHidden';
-    }
-    else if ($column->isForeignKey())
-    {
-      $name = 'PropelChoice';
-    }
-
-    return sprintf('sfWidgetForm%s', $name);
-  }
-
-  /**
-   * Returns a PHP string representing options to pass to a widget for a given column.
-   *
-   * @param  ColumnMap $column  A ColumnMap object
-   *
-   * @return string    The options to pass to the widget as a PHP string
-   */
-  public function getWidgetOptionsForColumn(ColumnMap $column)
-  {
-    $options = array();
-
-    if (!$column->isPrimaryKey() && $column->isForeignKey())
-    {
-      $options[] = sprintf('\'model\' => \'%s\', \'add_empty\' => %s', $this->getForeignTable($column)->getClassname(), $column->isNotNull() ? 'false' : 'true');
-
-      $refColumn = $this->getForeignTable($column)->getColumn($column->getRelatedColumnName());
-      if (!$refColumn->isPrimaryKey())
-      {
-        $options[] = sprintf('\'key_method\' => \'get%s\'', $refColumn->getPhpName());
-      }
-    }
-
-    return count($options) ? sprintf('array(%s)', implode(', ', $options)) : '';
-  }
-
-  /**
-   * Returns a sfValidator class name for a given column.
-   *
-   * @param  ColumnMap $column  A ColumnMap object
-   *
-   * @return string    The name of a subclass of sfValidator
-   */
-  public function getValidatorClassForColumn(ColumnMap $column)
-  {
-    switch ($column->getType())
-    {
-      case PropelColumnTypes::BOOLEAN:
-        $name = 'Boolean';
-        break;
-      case PropelColumnTypes::CLOB:
-      case PropelColumnTypes::CHAR:
-      case PropelColumnTypes::VARCHAR:
-      case PropelColumnTypes::LONGVARCHAR:
-        $name = 'String';
-        break;
-      case PropelColumnTypes::DOUBLE:
-      case PropelColumnTypes::FLOAT:
-      case PropelColumnTypes::NUMERIC:
-      case PropelColumnTypes::DECIMAL:
-      case PropelColumnTypes::REAL:
-        $name = 'Number';
-        break;
-      case PropelColumnTypes::INTEGER:
-      case PropelColumnTypes::SMALLINT:
-      case PropelColumnTypes::TINYINT:
-      case PropelColumnTypes::BIGINT:
-        $name = 'Integer';
-        break;
-      case PropelColumnTypes::DATE:
-        $name = 'Date';
-        break;
-      case PropelColumnTypes::TIME:
-        $name = 'Time';
-        break;
-      case PropelColumnTypes::TIMESTAMP:
-        $name = 'DateTime';
-        break;
-      default:
-        $name = 'Pass';
-    }
-
-    if ($column->isForeignKey())
-    {
-      $name = 'PropelChoice';
-    }
-    else if ($column->isPrimaryKey())
-    {
-      $name = 'Choice';
-    }
-
-    return sprintf('sfValidator%s', $name);
-  }
-
-  /**
-   * Returns a PHP string representing options to pass to a validator for a given column.
-   *
-   * @param  ColumnMap $column  A ColumnMap object
-   *
-   * @return string    The options to pass to the validator as a PHP string
-   */
-  public function getValidatorOptionsForColumn(ColumnMap $column)
-  {
-    $options = array();
-
-    if ($column->isForeignKey())
-    {
-      $options[] = sprintf('\'model\' => \'%s\', \'column\' => \'%s\'', $this->getForeignTable($column)->getClassname(), $this->translateColumnName($column, true));
-    }
-    else if ($column->isPrimaryKey())
-    {
-      $options[] = sprintf('\'choices\' => array($this->getObject()->get%s()), \'empty_value\' => $this->getObject()->get%1$s()', $this->translateColumnName($column, false, BasePeer::TYPE_PHPNAME));
-    }
-    else
-    {
-      switch ($column->getType())
-      {
-        case PropelColumnTypes::CLOB:
-        case PropelColumnTypes::CHAR:
-        case PropelColumnTypes::VARCHAR:
-        case PropelColumnTypes::LONGVARCHAR:
-          if ($column->getSize())
-          {
-            $options[] = sprintf('\'max_length\' => %s', $column->getSize());
-          }
-          break;
-
-       case PropelColumnTypes::TINYINT:
-         $options[] = sprintf('\'min\' => %s, \'max\' => %s', -128, 127);
-         break;
-
-       case PropelColumnTypes::SMALLINT:
-         $options[] = sprintf('\'min\' => %s, \'max\' => %s', -32768, 32767);
-         break;
-
-       case PropelColumnTypes::INTEGER:
-         $options[] = sprintf('\'min\' => %s, \'max\' => %s', -2147483648, 2147483647);
-         break;
-
-       case PropelColumnTypes::BIGINT:
-         $options[] = sprintf('\'min\' => %s, \'max\' => %s', -9223372036854775808, 9223372036854775807);
-         break;
-      }
-    }
-
-    if (!$column->isNotNull() || $column->isPrimaryKey())
-    {
-      $options[] = '\'required\' => false';
-    }
-
-    return count($options) ? sprintf('array(%s)', implode(', ', $options)) : '';
-  }
-
-  /**
-   * Returns the maximum length for a column name.
-   *
-   * @return integer The length of the longer column name
-   */
-  public function getColumnNameMaxLength()
-  {
-    $max = 0;
-    foreach ($this->table->getColumns() as $column)
-    {
-      if (($m = strlen($column->getName())) > $max)
-      {
-        $max = $m;
-      }
-    }
-
-    foreach ($this->getManyToManyTables() as $tables)
-    {
-      if (($m = strlen($this->underscore($tables['middleTable']->getClassname()).'_list')) > $max)
-      {
-        $max = $m;
-      }
-    }
-
-    return $max;
-  }
-
-  /**
-   * Returns an array of primary key column names.
-   *
-   * @return array An array of primary key column names
-   */
-  public function getPrimaryKeyColumNames()
-  {
-    $pks = array();
-    foreach ($this->table->getColumns() as $column)
-    {
-      if ($column->isPrimaryKey())
-      {
-        $pks[] = $this->translateColumnName($column);
-      }
-    }
-
-    return $pks;
-  }
-
-  /**
-   * Returns a PHP string representation for the array of all primary key column names.
-   *
-   * @return string A PHP string representation for the array of all primary key column names
-   *
-   * @see getPrimaryKeyColumNames()
-   */
-  public function getPrimaryKeyColumNamesAsString()
-  {
-    return sprintf('array(\'%s\')', implode('\', \'', $this->getPrimaryKeyColumNames()));
-  }
-
-  /**
-   * Returns true if the current table is internationalized.
-   *
-   * @return Boolean true if the current table is internationalized, false otherwise
-   */
-  public function isI18n()
-  {
-    return method_exists(constant($this->table->getClassname().'::PEER'), 'getI18nModel');
-  }
-
-  /**
-   * Returns the i18n model name for the current table.
-   *
-   * @return string The model class name
-   */
-  public function getI18nModel()
-  {
-    return call_user_func(array(constant($this->table->getClassname().'::PEER'), 'getI18nModel'));
-  }
-
-  public function underscore($name)
-  {
-    return strtolower(preg_replace(array('/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), '\\1_\\2', $name));
-  }
-
-  public function getUniqueColumnNames()
-  {
-    $uniqueColumns = array();
-
-    foreach (call_user_func(array(constant($this->table->getClassname().'::PEER'), 'getUniqueColumnNames')) as $unique)
-    {
-      $uniqueColumn = array();
-      foreach ($unique as $column)
-      {
-        $uniqueColumn[] = $this->translateColumnName($this->table->getColumn($column));
-      }
-
-      $uniqueColumns[] = $uniqueColumn;
-    }
-
-    return $uniqueColumns;
-  }
-
-  public function translateColumnName($column, $related = false, $to = BasePeer::TYPE_FIELDNAME)
-  {
-    $peer = $related ? constant($column->getTable()->getDatabaseMap()->getTable($column->getRelatedTableName())->getPhpName().'::PEER') : constant($column->getTable()->getPhpName().'::PEER');
-    $field = $related ? $column->getRelatedName() : $column->getFullyQualifiedName();
-
-    return call_user_func(array($peer, 'translateFieldName'), $field, BasePeer::TYPE_COLNAME, $to);
-  }
-
-  /**
-   * Loads all Propel builders.
-   */
-  protected function loadBuilders()
-  {
-    $this->dbMap = Propel::getDatabaseMap($this->params['connection']);
-    $classes = sfFinder::type('file')->name('*TableMap.php')->in($this->generatorManager->getConfiguration()->getModelDirs());
-    foreach ($classes as $class)
-    {
-      $omClass = basename($class, 'TableMap.php');
-      if (class_exists($omClass) && is_subclass_of($omClass, 'BaseObject'))
-      {
-        $tableMapClass = basename($class, '.php');
-        $this->dbMap->addTableFromMapClass($tableMapClass);
-      }
-    }
-  }
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/generator/sfPropelGenerator.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/generator/sfPropelGenerator.class.php
deleted file mode 100644
index cda33deb4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/generator/sfPropelGenerator.class.php
+++ /dev/null
@@ -1,337 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Propel generator.
- *
- * @package    symfony
- * @subpackage propel
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelGenerator.class.php 22943 2009-10-12 12:04:19Z Kris.Wallsmith $
- */
-class sfPropelGenerator extends sfModelGenerator
-{
-  protected
-    $tableMap = null,
-    $dbMap    = null;
-
-  /**
-   * Initializes the current sfGenerator instance.
-   *
-   * @param sfGeneratorManager $generatorManager A sfGeneratorManager instance
-   */
-  public function initialize(sfGeneratorManager $generatorManager)
-  {
-    parent::initialize($generatorManager);
-
-    $this->setGeneratorClass('sfPropelModule');
-  }
-
-  /** 
-   * Configures this generator.
-   */
-  public function configure()
-  {
-    // get some model metadata
-    $this->loadMapBuilderClasses();
-
-    // load all primary keys
-    $this->loadPrimaryKeys();
-  }
-
-  /**
-   * Gets the table map for the current model class.
-   *
-   * @return TableMap A TableMap instance
-   */
-  public function getTableMap()
-  {
-    return $this->tableMap;
-  }
-
-  /**
-   * Returns an array of tables that represents a many to many relationship.
-   *
-   * A table is considered to be a m2m table if it has 2 foreign keys that are also primary keys.
-   *
-   * @return array An array of tables.
-   */
-  public function getManyToManyTables()
-  {
-    $tables = array();
-
-    // go through all tables to find m2m relationships
-    foreach ($this->dbMap->getTables() as $tableName => $table)
-    {
-      // load this table's relations and related tables
-      $table->getRelations();
-
-      foreach ($table->getColumns() as $column)
-      {
-        if ($column->isForeignKey() && $column->isPrimaryKey() && $this->getTableMap()->getClassname() == $this->dbMap->getTable($column->getRelatedTableName())->getClassname())
-        {
-          // we have a m2m relationship
-          // find the other primary key
-          foreach ($table->getColumns() as $relatedColumn)
-          {
-            if ($relatedColumn->isForeignKey() && $relatedColumn->isPrimaryKey() && $this->getTableMap()->getClassname() != $this->dbMap->getTable($relatedColumn->getRelatedTableName())->getClassname())
-            {
-              // we have the related table
-              $tables[] = array(
-                'middleTable'   => $table,
-                'relatedTable'  => $this->dbMap->getTable($relatedColumn->getRelatedTableName()),
-                'column'        => $column,
-                'relatedColumn' => $relatedColumn,
-              );
-
-              break 2;
-            }
-          }
-        }
-      }
-    }
-
-    return $tables;
-  }
-
-  /**
-   * Loads primary keys.
-   *
-   * @throws sfException
-   */
-  protected function loadPrimaryKeys()
-  {
-    $this->primaryKey = array();
-    foreach ($this->tableMap->getColumns() as $column)
-    {
-      if ($column->isPrimaryKey())
-      {
-        $this->primaryKey[] = $column->getPhpName();
-      }
-    }
-
-    if (!count($this->primaryKey))
-    {
-      throw new sfException(sprintf('Cannot generate a module for a model without a primary key (%s)', $this->modelClass));
-    }
-  }
-
-  /**
-   * Loads map builder classes.
-   *
-   * @throws sfException
-   */
-  protected function loadMapBuilderClasses()
-  {
-    $this->dbMap = Propel::getDatabaseMap();
-    $this->tableMap = call_user_func(array($this->modelClass . 'Peer', 'getTableMap'));
-    // load all related table maps, 
-    // and all tables related to the related table maps (for m2m relations)
-    foreach ($this->tableMap->getRelations() as $relation)
-    {
-      $relation->getForeignTable()->getRelations();
-    }
-  }
-
-  /**
-   * Returns the getter either non-developped: 'getFoo' or developped: '$class->getFoo()'.
-   *
-   * @param string  $column     The column name
-   * @param boolean $developed  true if you want developped method names, false otherwise
-   * @param string  $prefix     The prefix value
-   *
-   * @return string PHP code
-   */
-  public function getColumnGetter($column, $developed = false, $prefix = '')
-  {
-    try
-    {
-      $getter = 'get'.call_user_func(array(constant($this->getModelClass().'::PEER'), 'translateFieldName'), $column, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_PHPNAME);
-    }
-    catch (PropelException $e)
-    {
-      // not a real column
-      $getter = 'get'.sfInflector::camelize($column);
-    }
-
-    if (!$developed)
-    {
-      return $getter;
-    }
-
-    return sprintf('$%s%s->%s()', $prefix, $this->getSingularName(), $getter);
-  }
-
-  /**
-   * Returns the type of a column.
-   *
-   * @param  object $column A column object
-   *
-   * @return string The column type
-   */
-  public function getType($column)
-  {
-    if ($column->isForeignKey())
-    {
-      return 'ForeignKey';
-    }
-
-    switch ($column->getType())
-    {
-      case PropelColumnTypes::BOOLEAN:
-        return 'Boolean';
-      case PropelColumnTypes::DATE:
-      case PropelColumnTypes::TIMESTAMP:
-        return 'Date';
-      case PropelColumnTypes::TIME:
-        return 'Time';
-      default:
-        return 'Text';
-    }
-  }
-
-  /**
-   * Returns the default configuration for fields.
-   *
-   * @return array An array of default configuration for all fields
-   */
-  public function getDefaultFieldsConfiguration()
-  {
-    $fields = array();
-
-    $names = array();
-    foreach ($this->getTableMap()->getColumns() as $column)
-    {
-      $name = $this->translateColumnName($column);
-      $names[] = $name;
-      $fields[$name] = array_merge(array(
-        'is_link'      => (Boolean) $column->isPrimaryKey(),
-        'is_real'      => true,
-        'is_partial'   => false,
-        'is_component' => false,
-        'type'         => $this->getType($column),
-      ), isset($this->config['fields'][$name]) ? $this->config['fields'][$name] : array());
-    }
-
-    foreach ($this->getManyToManyTables() as $tables)
-    {
-      $name = sfInflector::underscore($tables['middleTable']->getClassname()).'_list';
-      $names[] = $name;
-      $fields[$name] = array_merge(array(
-        'is_link'      => false,
-        'is_real'      => false,
-        'is_partial'   => false,
-        'is_component' => false,
-        'type'         => 'Text',
-      ), isset($this->config['fields'][$name]) ? $this->config['fields'][$name] : array());
-    }
-
-    if (isset($this->config['fields']))
-    {
-      foreach ($this->config['fields'] as $name => $params)
-      {
-        if (in_array($name, $names))
-        {
-          continue;
-        }
-
-        $fields[$name] = array_merge(array(
-          'is_link'      => false,
-          'is_real'      => false,
-          'is_partial'   => false,
-          'is_component' => false,
-          'type'         => 'Text',
-        ), is_array($params) ? $params : array());
-      }
-    }
-
-    unset($this->config['fields']);
-
-    return $fields;
-  }
-
-  /**
-   * Returns the configuration for fields in a given context.
-   *
-   * @param  string $context The Context
-   *
-   * @return array An array of configuration for all the fields in a given context 
-   */
-  public function getFieldsConfiguration($context)
-  {
-    $fields = array();
-
-    $names = array();
-    foreach ($this->getTableMap()->getColumns() as $column)
-    {
-      $name = $this->translateColumnName($column);
-      $names[] = $name;
-      $fields[$name] = isset($this->config[$context]['fields'][$name]) ? $this->config[$context]['fields'][$name] : array();
-    }
-
-    foreach ($this->getManyToManyTables() as $tables)
-    {
-      $name = sfInflector::underscore($tables['middleTable']->getClassname()).'_list';
-      $names[] = $name;
-      $fields[$name] = isset($this->config[$context]['fields'][$name]) ? $this->config[$context]['fields'][$name] : array();
-    }
-
-    if (isset($this->config[$context]['fields']))
-    {
-      foreach ($this->config[$context]['fields'] as $name => $params)
-      {
-        if (in_array($name, $names))
-        {
-          continue;
-        }
-
-        $fields[$name] = is_array($params) ? $params : array();
-      }
-    }
-
-    unset($this->config[$context]['fields']);
-
-    return $fields;
-  }
-
-  /**
-   * Gets all the fields for the current model.
-   *
-   * @param  Boolean $withM2M Whether to include m2m fields or not
-   *
-   * @return array   An array of field names
-   */
-  public function getAllFieldNames($withM2M = true)
-  {
-    $names = array();
-    foreach ($this->getTableMap()->getColumns() as $column)
-    {
-      $names[] = $this->translateColumnName($column);
-    }
-
-    if ($withM2M)
-    {
-      foreach ($this->getManyToManyTables() as $tables)
-      {
-        $names[] = sfInflector::underscore($tables['middleTable']->getClassname()).'_list';
-      }
-    }
-
-    return $names;
-  }
-
-  public function translateColumnName($column, $related = false, $to = BasePeer::TYPE_FIELDNAME)
-  {
-    $peer = $related ? constant($column->getTable()->getDatabaseMap()->getTable($column->getRelatedTableName())->getPhpName().'::PEER') : constant($column->getTable()->getPhpName().'::PEER');
-    $field = $related ? $column->getRelatedName() : $column->getFullyQualifiedName();
-
-    return call_user_func(array($peer, 'translateFieldName'), $field, BasePeer::TYPE_COLNAME, $to);
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/log/sfPropelLogger.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/log/sfPropelLogger.class.php
deleted file mode 100644
index 6d7b7e2fc..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/log/sfPropelLogger.class.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A symfony logging adapter for Propel
- *
- * @package    symfony
- * @subpackage log
- * @author     Dustin Whittle <dustin.whittle@symfony-project.com>
- * @version    SVN: $Id: sfPropelLogger.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
- */
-class sfPropelLogger implements BasicLogger
-{
-  protected
-    $dispatcher = null;
-
-  /**
-   * Constructor.
-   *
-   * @param sfEventDispatcher $dispatcher
-   */
-  public function __construct(sfEventDispatcher $dispatcher = null)
-  {
-    if (null === $dispatcher)
-    {
-      $this->dispatcher = sfProjectConfiguration::getActive()->getEventDispatcher();
-    }
-    else
-    {
-      $this->dispatcher = $dispatcher;
-    }
-  }
-
-  /**
-   * A convenience function for logging an alert event.
-   *
-   * @param mixed $message the message to log.
-   */
-  public function alert($message)
-  {
-    $this->log($message, sfLogger::ALERT);
-  }
-
-  /**
-   * A convenience function for logging a critical event.
-   *
-   * @param mixed $message the message to log.
-   */
-  public function crit($message)
-  {
-    $this->log($message, sfLogger::CRIT);
-  }
-
-  /**
-   * A convenience function for logging an error event.
-   *
-   * @param mixed $message the message to log.
-   */
-  public function err($message)
-  {
-    $this->log($message, sfLogger::ERR);
-  }
-
-  /**
-   * A convenience function for logging a warning event.
-   *
-   * @param mixed $message the message to log.
-   */
-  public function warning($message)
-  {
-    $this->log($message, sfLogger::WARNING);
-  }
-
-  /**
-   * A convenience function for logging an critical event.
-   *
-   * @param mixed $message the message to log.
-   */
-  public function notice($message)
-  {
-    $this->log($message, sfLogger::NOTICE);
-  }
-
-  /**
-   * A convenience function for logging an critical event.
-   *
-   * @param mixed $message the message to log.
-   */
-  public function info($message)
-  {
-    $this->log($message, sfLogger::INFO);
-  }
-
-  /**
-   * A convenience function for logging a debug event.
-   *
-   * @param mixed $message the message to log.
-   */
-  public function debug($message)
-  {
-    $this->log($message, sfLogger::DEBUG);
-  }
-
-  /**
-   * Primary method to handle logging.
-   *
-   * @param mixed $message the message to log.
-   * @param int $severity The numeric severity. Defaults to null so that no assumptions are made about the logging backend.
-   */
-  public function log($message, $severity = sfLogger::DEBUG)
-  {
-    $this->dispatcher->notify(new sfEvent($this, 'application.log', array($message, 'priority' => $severity)));
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/mailer/Swift_PropelSpool.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/mailer/Swift_PropelSpool.class.php
deleted file mode 100644
index 4fb5bb5fc..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/mailer/Swift_PropelSpool.class.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Swift_PropelSpool is a spool that uses Propel.
- *
- * Example schema:
- *
- *  mail_message:
- *   message:    { type: clob }
- *   created_at: ~
- *
- * @package    symfony
- * @subpackage mailer
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: Swift_PropelSpool.class.php 30529 2010-08-04 16:30:29Z fabien $
- */
-class Swift_PropelSpool extends Swift_ConfigurableSpool
-{
-  protected
-    $model = null,
-    $column = null,
-    $method = null;
-
-  /**
-   * Constructor.
-   *
-   * @param string The Propel model to use to store the messages (MailMessage by default)
-   * @param string The column name to use for message storage (message by default)
-   * @param string The method to call to retrieve the messages to send (optional)
-   */
-  public function __construct($model = 'MailMessage', $column = 'message', $method = 'doSelect')
-  {
-    $this->model = $model;
-    $this->column = $column;
-    $this->method = $method;
-  }
-
-  /**
-   * Tests if this Transport mechanism has started.
-   *
-   * @return boolean
-   */
-  public function isStarted()
-  {
-    return true;
-  }
-
-  /**
-   * Starts this Transport mechanism.
-   */
-  public function start()
-  {
-  }
-
-  /**
-   * Stops this Transport mechanism.
-   */
-  public function stop()
-  {
-  }
-
-  /**
-   * Stores a message in the queue.
-   *
-   * @param Swift_Mime_Message $message The message to store
-   */
-  public function queueMessage(Swift_Mime_Message $message)
-  {
-    $object = new $this->model;
-
-    if (!$object instanceof BaseObject)
-    {
-      throw new InvalidArgumentException('The mailer message object must be a BaseObject object.');
-    }
-
-    $model = constant($this->model.'::PEER');
-    $method = 'set'.call_user_func(array($model, 'translateFieldName'), $this->column, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_PHPNAME);
-
-    $object->$method(serialize($message));
-    $object->save();
-  }
-
-  /**
-   * Sends messages using the given transport instance.
-   *
-   * @param Swift_Transport $transport         A transport instance
-   * @param string[]        &$failedRecipients An array of failures by-reference
-   *
-   * @return int The number of sent emails
-   */
-  public function flushQueue(Swift_Transport $transport, &$failedRecipients = null)
-  {
-    $criteria = new Criteria();
-    $criteria->setLimit($this->getMessageLimit());
-
-    $model = constant($this->model.'::PEER');
-    $objects = call_user_func(array($model, $this->method), $criteria);
-
-    if (!$transport->isStarted())
-    {
-      $transport->start();
-    }
-
-    $method = 'get'.call_user_func(array($model, 'translateFieldName'), $this->column, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_PHPNAME);
-    $count = 0;
-    $time = time();
-    foreach ($objects as $object)
-    {
-      if (is_resource($object->getMessage()))
-      {
-        $message = unserialize(stream_get_contents($object->getMessage()));
-      }
-      else
-      {
-          $message = unserialize($object->getMessage());
-      }
-
-      $object->delete();
-
-      try
-      {
-        $count += $transport->send($message, $failedRecipients);
-      }
-      catch (Exception $e)
-      {
-        // TODO: What to do with errors?
-      }
-
-      if ($this->getTimeLimit() && (time() - $time) >= $this->getTimeLimit())
-      {
-        break;
-      }
-    }
-
-    return $count;
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/routing/sfPropelRoute.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/routing/sfPropelRoute.class.php
deleted file mode 100644
index bfb2508b9..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/routing/sfPropelRoute.class.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * sfPropelRoute represents a route that is bound to a Propel class.
- *
- * A Propel route can represent a single Propel object or a list of objects.
- *
- * @package    symfony
- * @subpackage routing
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelRoute.class.php 21924 2009-09-11 14:59:26Z fabien $
- */
-class sfPropelRoute extends sfObjectRoute
-{
-  protected
-    $criteria = null;
-
-  public function setListCriteria(Criteria $criteria)
-  {
-    if (!$this->isBound())
-    {
-      throw new LogicException('The route is not bound.');
-    }
-
-    $this->criteria = $criteria;
-  }
-
-  protected function getObjectForParameters($parameters)
-  {
-    $this->fixOptions();
-
-    if (!isset($this->options['method']))
-    {
-      $this->options['method'] = isset($this->options['method_for_criteria']) ? $this->options['method_for_criteria'] : 'doSelectOne';
-
-      $className = $this->options['model'];
-      $criteria = new Criteria();
-      $variables = $this->getRealVariables();
-      if (!count($variables))
-      {
-        return false;
-      }
-
-      foreach ($variables as $variable)
-      {
-        try
-        {
-          $constant = call_user_func(array($className, 'translateFieldName'), $variable, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_COLNAME);
-          $criteria->add($constant, $parameters[$variable]);
-        }
-        catch (Exception $e)
-        {
-          // don't add Criteria if the variable cannot be mapped to a column
-        }
-      }
-
-      $parameters = $criteria;
-    }
-
-    return parent::getObjectForParameters($parameters);
-  }
-
-  protected function getObjectsForParameters($parameters)
-  {
-    $this->fixOptions();
-
-    if (!isset($this->options['method']))
-    {
-      $this->options['method'] = isset($this->options['method_for_criteria']) ? $this->options['method_for_criteria'] : 'doSelect';
-      $parameters = new Criteria();
-    }
-
-    if (null !== $this->criteria)
-    {
-      $parameters = $this->criteria;
-    }
-
-    return parent::getObjectForParameters($parameters);
-  }
-
-  protected function doConvertObjectToArray($object)
-  {
-    $this->fixOptions();
-
-    if (isset($this->options['convert']) || method_exists($object, 'toParams'))
-    {
-      return parent::doConvertObjectToArray($object);
-    }
-
-    $className = $this->options['model'];
-
-    $parameters = array();
-    foreach ($this->getRealVariables() as $variable)
-    {
-      try
-      {
-        $method = 'get'.call_user_func(array($className, 'translateFieldName'), $variable, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_PHPNAME);
-      }
-      catch (Exception $e)
-      {
-        $method = 'get'.sfInflector::camelize($variable);
-      }
-
-      $parameters[$variable] = $object->$method();
-    }
-
-    return $parameters;
-  }
-
-  protected function fixOptions()
-  {
-    if (!isset($this->options['object_model']))
-    {
-      $this->options['object_model'] = $this->options['model'];
-      $this->options['model'] = constant($this->options['model'].'::PEER');
-    }
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/routing/sfPropelRouteCollection.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/routing/sfPropelRouteCollection.class.php
deleted file mode 100644
index fe85ed1d4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/routing/sfPropelRouteCollection.class.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * sfPropelRouteCollection represents a collection of routes bound to Propel objects.
- *
- * @package    symfony
- * @subpackage routing
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelRouteCollection.class.php 12755 2008-11-08 09:48:03Z fabien $
- */
-class sfPropelRouteCollection extends sfObjectRouteCollection
-{
-  protected
-    $routeClass = 'sfPropelRoute';
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/phing/phing_default_overrides b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/phing/phing_default_overrides
deleted file mode 100644
index 268b8ba94..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/phing/phing_default_overrides
+++ /dev/null
@@ -1 +0,0 @@
-see sfPhing.class.php
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/phing/tasks/defaults.properties b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/phing/tasks/defaults.properties
deleted file mode 100644
index 8bc30c7d8..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/phing/tasks/defaults.properties
+++ /dev/null
@@ -1,86 +0,0 @@
-; -------------------------------------
-; These taskdefs are loaded at startup.
-; -------------------------------------
-
-; Internal system tasks
-; 
-adhoc=phing.tasks.system.AdhocTask
-adhoc-task=phing.tasks.system.AdhocTaskdefTask
-adhoc-type=phing.tasks.system.AdhocTypedefTask
-append=phing.tasks.system.AppendTask
-available=phing.tasks.system.AvailableTask
-chmod=phing.tasks.system.ChmodTask
-chown=phing.tasks.system.ChownTask
-concat=phing.tasks.system.AppendTask
-condition=phing.tasks.system.ConditionTask
-copy=phing.tasks.system.CopyTask
-cvs=phing.tasks.system.CvsTask
-cvspass=phing.tasks.system.CvsPassTask
-delete=phing.tasks.system.DeleteTask
-echo=phing.tasks.system.EchoTask
-exec=phing.tasks.system.ExecTask
-fail=phing.tasks.system.ExitTask
-foreach=phing.tasks.system.ForeachTask
-includepath=phing.tasks.system.IncludePathTask
-input=phing.tasks.system.InputTask
-mkdir=phing.tasks.system.MkdirTask
-move=phing.tasks.system.MoveTask
-phing=phing.tasks.system.PhingTask
-phingcall=phing.tasks.system.PhingCallTask
-php=phing.tasks.system.PhpEvalTask
-property=phing.tasks.system.PropertyTask
-propertyprompt=phing.tasks.system.PropertyPromptTask
-reflexive=phing.tasks.system.ReflexiveTask
-resolvepath=phing.tasks.system.ResolvePathTask
-taskdef=phing.tasks.system.TaskdefTask
-touch=phing.tasks.system.TouchTask
-tstamp=phing.tasks.system.TstampTask
-typedef=phing.tasks.system.TypedefTask
-uptodate=phing.tasks.system.UpToDateTask
-xslt=phing.tasks.system.XsltTask
-if=phing.tasks.system.IfTask
-warn=phing.tasks.system.WarnTask
-
-; "Core" contributed tasks
-; -- i.e. no taskdef needed.
-
-creole=phing.tasks.ext.creole.CreoleSQLExecTask
-pdo=phing.tasks.ext.pdo.PDOSQLExecTask
-package-as-path=phing.tasks.ext.PackageAsPathTask
-smarty=phing.tasks.ext.SmartyTask
-capsule=phing.tasks.ext.CapsuleTask
-tar=phing.tasks.ext.TarTask
-untar=phing.tasks.ext.UntarTask
-pearpkg=phing.tasks.ext.PearPackageTask
-pearpkg2=phing.tasks.ext.PearPackage2Task
-mail=phing.tasks.ext.MailTask
-zip=phing.tasks.ext.ZipTask
-unzip=phing.tasks.ext.UnzipTask
-scpsend=phing.tasks.ext.ScpSendTask
-
-; "ext" tasks
-phpdoc=phing.tasks.ext.phpdoc.PhpDocumentorTask
-phpdocext=phing.tasks.ext.phpdoc.PhpDocumentorExternalTask
-;svnlastrevision=phing.tasks.ext.svn.SvnLastRevisionTask
-;svncheckout=phing.tasks.ext.svn.SvnCheckoutTask
-;svnexport=phing.tasks.ext.svn.SvnExportTask
-;svnupdate=phing.tasks.ext.svn.SvnUpdateTask
-;phpunit3=phing.tasks.ext.phpunit.PHPUnitTask
-;phpunit3report=phing.tasks.ext.phpunit.PHPUnitReportTask
-;phpunit2=phing.tasks.ext.phpunit.PHPUnitTask
-;phpunit2report=phing.tasks.ext.phpunit.PHPUnitReportTask
-;phpunit=phing.tasks.ext.phpunit.PHPUnitTask
-;phpunitreport=phing.tasks.ext.phpunit.PHPUnitReportTask
-;coverage-setup=phing.tasks.ext.coverage.CoverageSetupTask
-;coverage-merger=phing.tasks.ext.coverage.CoverageMergerTask
-;coverage-report=phing.tasks.ext.coverage.CoverageReportTask
-;ioncubeencoder=phing.tasks.ext.ioncube.IoncubeEncoderTask
-;ioncubelicense=phing.tasks.ext.ioncube.IoncubeLicenseTask
-;simpletest=phing.tasks.ext.simpletest.SimpleTestTask
-;phplint=phing.tasks.ext.PhpLintTask
-;xmllint=phing.tasks.ext.XmlLintTask
-;analyze=phing.tasks.ext.ZendCodeAnalyzerTask
-;jsllint=phing.tasks.ext.JslLintTask
-;manifest=phing.tasks.ext.ManifestTask
-;phpcodesniffer=phing.tasks.ext.PhpCodeSnifferTask
-;ftpdeploy=phing.tasks.ext.FtpDeployTask
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/phing/types/defaults.properties b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/phing/types/defaults.properties
deleted file mode 100644
index a2d86350b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/phing/types/defaults.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-# phing default types
-commandline=phing.types.Commandline
-fileset=phing.types.FileSet
-dirset=phing.types.DirSet
-filelist=phing.types.FileList
-patternset=phing.types.PatternSet
-mapper=phing.types.Mapper
-filterchain=phing.types.FilterChain
-filterreader=phing.types.PhingFilterReader
-regexp=phing.types.RegularExpression
-param=phing.types.Parameter
-path=phing.types.Path
-selector=phing.types.selectors.SelectSelector
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPhing.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPhing.class.php
deleted file mode 100644
index 2b2d85f04..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPhing.class.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once('phing/Phing.php');
-
-/**
- * @package    symfony
- * @subpackage command
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPhing.class.php 24039 2009-11-16 17:52:14Z Kris.Wallsmith $
- */
-class sfPhing extends Phing
-{
-  static public function getPhingVersion()
-  {
-    return 'sfPhing';
-  }
-
-  /**
-   * @see Phing
-   */
-  public function runBuild()
-  {
-    // workaround for included phing 2.3 which by default loads many tasks
-    // that are not needed and incompatible (eg phing.tasks.ext.FtpDeployTask)
-    // by placing current directory on the include path our defaults will be loaded
-    // see ticket #5054
-    $includePath = get_include_path();
-    set_include_path(dirname(__FILE__).PATH_SEPARATOR.$includePath);
-    parent::runBuild();
-    set_include_path($includePath);
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPhingListener.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPhingListener.php
deleted file mode 100644
index 1c234b69c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPhingListener.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-class sfPhingListener implements BuildListener
-{
-  static protected
-    $exceptions = array(),
-    $errors     = array();
-
-  static public function hasErrors()
-  {
-    return count(self::$errors) || count(self::$exceptions);
-  }
-
-  static public function getErrors()
-  {
-    return self::$errors;
-  }
-
-  static public function getExceptions()
-  {
-    return self::$exceptions;
-  }
-
-  /**
-   * Fired before any targets are started.
-   *
-   * @param BuildEvent The BuildEvent
-   */
-  public function buildStarted(BuildEvent $event)
-  {
-    self::$exceptions = array();
-  }
-
-  /**
-   * Fired after the last target has finished.
-   *
-   * @param BuildEvent The BuildEvent
-   * @see BuildEvent::getException()
-   */
-  public function buildFinished(BuildEvent $event)
-  {
-  }
-
-  /**
-   * Fired when a target is started.
-   *
-   * @param BuildEvent The BuildEvent
-   * @see BuildEvent::getTarget()
-   */
-  public function targetStarted(BuildEvent $event)
-  {
-  }
-
-  /**
-   * Fired when a target has finished.
-   *
-   * @param BuildEvent The BuildEvent
-   * @see BuildEvent#getException()
-   */
-  public function targetFinished(BuildEvent $event)
-  {
-    if (null !== $event->getException())
-    {
-      self::$exceptions[] = $event->getException();
-    }
-  }
-
-  /**
-   * Fired when a task is started.
-   *
-   * @param BuildEvent The BuildEvent
-   * @see BuildEvent::getTask()
-   */
-  public function taskStarted(BuildEvent $event)
-  {
-  }
-
-  /**
-   *  Fired when a task has finished.
-   *
-   *  @param BuildEvent The BuildEvent
-   *  @see BuildEvent::getException()
-   */
-  public function taskFinished(BuildEvent $event)
-  {
-  }
-
-  /**
-   *  Fired whenever a message is logged.
-   *
-   *  @param BuildEvent The BuildEvent
-   *  @see BuildEvent::getMessage()
-   */
-  public function messageLogged(BuildEvent $event)
-  {
-    if ($event->getPriority() == Project::MSG_ERR)
-    {
-      if (preg_match('/XLST transformation/', $event->getMessage()))
-      {
-        // not really an error
-        return;
-      }
-
-      $msg = '';
-      if ($event->getTask() !== null)
-      {
-        $msg = sprintf('[%s] ', $event->getTask()->getTaskName());
-      }
-
-      $msg .= $event->getMessage();
-
-      self::$errors[] = $msg;
-    }
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBaseTask.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBaseTask.class.php
deleted file mode 100644
index 40336c0ca..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBaseTask.class.php
+++ /dev/null
@@ -1,357 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Base class for all symfony Propel tasks.
- *
- * @package    symfony
- * @subpackage propel
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelBaseTask.class.php 29001 2010-04-06 18:02:32Z Kris.Wallsmith $
- */
-abstract class sfPropelBaseTask extends sfBaseTask
-{
-  const CHECK_SCHEMA = true;
-  const DO_NOT_CHECK_SCHEMA = false;
-
-  static protected $done = false;
-
-  protected $additionalPhingArgs = array();
-
-  public function initialize(sfEventDispatcher $dispatcher, sfFormatter $formatter)
-  {
-    parent::initialize($dispatcher, $formatter);
-
-    if (!self::$done)
-    {
-      sfToolkit::addIncludePath(array(
-        sfConfig::get('sf_propel_runtime_path', realpath(dirname(__FILE__).'/../lib/vendor')),
-        dirname(__FILE__),
-      ));
-
-      self::$done = true;
-    }
-  }
-
-  protected function process(sfCommandManager $commandManager, $options)
-  {
-    parent::process($commandManager, $options);
-
-    // capture phing-arg options
-    if ($commandManager->getOptionSet()->hasOption('phing-arg'))
-    {
-      $this->additionalPhingArgs = $commandManager->getOptionValue('phing-arg');
-    }
-  }
-
-  protected function schemaToYML($checkSchema = self::CHECK_SCHEMA, $prefix = '')
-  {
-    $finder = sfFinder::type('file')->name('*schema.xml')->prune('doctrine');
-
-    $schemas = array_unique(array_merge($finder->in(sfConfig::get('sf_config_dir')), $finder->in($this->configuration->getPluginSubPaths('/config'))));
-    if (self::CHECK_SCHEMA === $checkSchema && !count($schemas))
-    {
-      throw new sfCommandException('You must create a schema.xml file.');
-    }
-
-    $dbSchema = new sfPropelDatabaseSchema();
-    foreach ($schemas as $schema)
-    {
-      $dbSchema->loadXML($schema);
-
-      $this->logSection('schema', sprintf('converting "%s" to YML', $schema));
-
-      $localprefix = $prefix;
-
-      // change prefix for plugins
-      if (preg_match('#plugins[/\\\\]([^/\\\\]+)[/\\\\]#', $schema, $match))
-      {
-        $localprefix = $prefix.$match[1].'-';
-      }
-
-      // save converted xml files in original directories
-      $yml_file_name = str_replace('.xml', '.yml', basename($schema));
-
-      $file = str_replace(basename($schema), $prefix.$yml_file_name,  $schema);
-      $this->logSection('schema', sprintf('putting %s', $file));
-      file_put_contents($file, $dbSchema->asYAML());
-    }
-  }
-
-  protected function schemaToXML($checkSchema = self::CHECK_SCHEMA, $prefix = '')
-  {
-    $finder = sfFinder::type('file')->name('*schema.yml')->prune('doctrine');
-    $dirs = array_merge(array(sfConfig::get('sf_config_dir')), $this->configuration->getPluginSubPaths('/config'));
-    $schemas = $finder->in($dirs);
-    if (self::CHECK_SCHEMA === $checkSchema && !count($schemas))
-    {
-      throw new sfCommandException('You must create a schema.yml file.');
-    }
-
-    $dbSchema = new sfPropelDatabaseSchema();
-
-    foreach ($schemas as $schema)
-    {
-      $schemaArray = sfYaml::load($schema);
-
-      if (!is_array($schemaArray))
-      {
-        continue; // No defined schema here, skipping
-      }
-
-      if (!isset($schemaArray['classes']))
-      {
-        // Old schema syntax: we convert it
-        $schemaArray = $dbSchema->convertOldToNewYaml($schemaArray);
-      }
-
-      $customSchemaFilename = str_replace(array(
-        str_replace(DIRECTORY_SEPARATOR, '/', sfConfig::get('sf_root_dir')).'/',
-        'plugins/',
-        'config/',
-        '/',
-        'schema.yml'
-      ), array('', '', '', '_', 'schema.custom.yml'), $schema);
-      $customSchemas = sfFinder::type('file')->name($customSchemaFilename)->in($dirs);
-
-      foreach ($customSchemas as $customSchema)
-      {
-        $this->logSection('schema', sprintf('found custom schema %s', $customSchema));
-
-        $customSchemaArray = sfYaml::load($customSchema);
-        if (!isset($customSchemaArray['classes']))
-        {
-          // Old schema syntax: we convert it
-          $customSchemaArray = $dbSchema->convertOldToNewYaml($customSchemaArray);
-        }
-        $schemaArray = sfToolkit::arrayDeepMerge($schemaArray, $customSchemaArray);
-      }
-
-      $dbSchema->loadArray($schemaArray);
-
-      $this->logSection('schema', sprintf('converting "%s" to XML', $schema));
-
-      $localprefix = $prefix;
-
-      // change prefix for plugins
-      if (preg_match('#plugins[/\\\\]([^/\\\\]+)[/\\\\]#', $schema, $match))
-      {
-        $localprefix = $prefix.$match[1].'-';
-      }
-
-      // save converted xml files in original directories
-      $xml_file_name = str_replace('.yml', '.xml', basename($schema));
-
-      $file = str_replace(basename($schema), $localprefix.$xml_file_name,  $schema);
-      $this->logSection('schema', sprintf('putting %s', $file));
-      file_put_contents($file, $dbSchema->asXML());
-    }
-  }
-
-  protected function copyXmlSchemaFromPlugins($prefix = '')
-  {
-    if (!$dirs = $this->configuration->getPluginSubPaths('/config'))
-    {
-      return;
-    }
-
-    $schemas = sfFinder::type('file')->name('*schema.xml')->prune('doctrine')->in($dirs);
-    foreach ($schemas as $schema)
-    {
-      // reset local prefix
-      $localprefix = '';
-
-      // change prefix for plugins
-      if (preg_match('#plugins[/\\\\]([^/\\\\]+)[/\\\\]#', $schema, $match))
-      {
-        // if the plugin name is not in the schema filename, add it
-        if (!strstr(basename($schema), $match[1]))
-        {
-          $localprefix = $match[1].'-';
-        }
-      }
-
-      // if the prefix is not in the schema filename, add it
-      if (!strstr(basename($schema), $prefix))
-      {
-        $localprefix = $prefix.$localprefix;
-      }
-
-      $this->getFilesystem()->copy($schema, 'config'.DIRECTORY_SEPARATOR.$localprefix.basename($schema));
-      if ('' === $localprefix)
-      {
-        $this->getFilesystem()->remove($schema);
-      }
-    }
-  }
-
-  protected function cleanup()
-  {
-    if (null === $this->commandApplication || !$this->commandApplication->withTrace())
-    {
-      $finder = sfFinder::type('file')->name('generated-*schema.xml')->name('*schema-transformed.xml');
-      $this->getFilesystem()->remove($finder->in(array('config', 'plugins')));
-    }
-  }
-
-  protected function callPhing($taskName, $checkSchema, $properties = array())
-  {
-    $schemas = sfFinder::type('file')->name('*schema.xml')->relative()->follow_link()->in(sfConfig::get('sf_config_dir'));
-    if (self::CHECK_SCHEMA === $checkSchema && !$schemas)
-    {
-      throw new sfCommandException('You must create a schema.yml or schema.xml file.');
-    }
-
-    // Call phing targets
-    sfToolkit::addIncludePath(array(
-      sfConfig::get('sf_symfony_lib_dir'),
-      sfConfig::get('sf_propel_generator_path', realpath(dirname(__FILE__).'/../vendor/propel-generator/classes')),
-    ));
-
-    $args = array();
-    $bufferPhingOutput = null === $this->commandApplication || !$this->commandApplication->withTrace();
-
-    $properties = array_merge(array(
-      'build.properties'  => 'propel.ini',
-      'project.dir'       => sfConfig::get('sf_config_dir'),
-      'propel.output.dir' => sfConfig::get('sf_root_dir'),
-    ), $properties);
-    foreach ($properties as $key => $value)
-    {
-      $args[] = "-D$key=$value";
-    }
-
-    // Build file
-    $args[] = '-f';
-    $args[] = realpath(dirname(__FILE__).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'vendor'.DIRECTORY_SEPARATOR.'propel-generator'.DIRECTORY_SEPARATOR.'build.xml');
-
-    // Logger
-    if (DIRECTORY_SEPARATOR != '\\' && (function_exists('posix_isatty') && @posix_isatty(STDOUT)))
-    {
-      $args[] = '-logger';
-      $args[] = 'phing.listener.AnsiColorLogger';
-    }
-
-    // Add our listener to detect errors
-    $args[] = '-listener';
-    $args[] = 'sfPhingListener';
-
-    // Add any arbitrary arguments last
-    foreach ($this->additionalPhingArgs as $arg)
-    {
-      if (in_array($arg, array('verbose', 'debug')))
-      {
-        $bufferPhingOutput = false;
-      }
-
-      $args[] = '-'.$arg;
-    }
-
-    $args[] = $taskName;
-
-    // filter arguments through the event dispatcher
-    $args = $this->dispatcher->filter(new sfEvent($this, 'propel.filter_phing_args'), $args)->getReturnValue();
-
-    require_once dirname(__FILE__).'/sfPhing.class.php';
-
-    // enable output buffering
-    Phing::setOutputStream(new OutputStream(fopen('php://output', 'w')));
-    Phing::startup();
-    Phing::setProperty('phing.home', getenv('PHING_HOME'));
-
-    $this->logSection('propel', 'Running "'.$taskName.'" phing task');
-
-    if ($bufferPhingOutput)
-    {
-      ob_start();
-    }
-
-    $m = new sfPhing();
-    $m->execute($args);
-    $m->runBuild();
-
-    if ($bufferPhingOutput)
-    {
-      ob_end_clean();
-    }
-
-    chdir(sfConfig::get('sf_root_dir'));
-
-    // any errors?
-    $ret = true;
-    if (sfPhingListener::hasErrors())
-    {
-      $messages = array('Some problems occurred when executing the task:');
-
-      foreach (sfPhingListener::getExceptions() as $exception)
-      {
-        $messages[] = '';
-        $messages[] = preg_replace('/^.*build\-propel\.xml/', 'build-propel.xml', $exception->getMessage());
-        $messages[] = '';
-      }
-
-      if (count(sfPhingListener::getErrors()))
-      {
-        $messages[] = 'If the exception message is not clear enough, read the output of the task for';
-        $messages[] = 'more information';
-      }
-
-      $this->logBlock($messages, 'ERROR_LARGE');
-
-      $ret = false;
-    }
-
-    return $ret;
-  }
-
-  protected function getPhingPropertiesForConnection($databaseManager, $connection)
-  {
-    $database = $databaseManager->getDatabase($connection);
-
-    return array(
-      'propel.database'          => $database->getParameter('phptype'),
-      'propel.database.driver'   => $database->getParameter('phptype'),
-      'propel.database.url'      => $database->getParameter('dsn'),
-      'propel.database.user'     => $database->getParameter('username'),
-      'propel.database.password' => $database->getParameter('password'),
-      'propel.database.encoding' => $database->getParameter('encoding'),
-    );
-  }
-
-  protected function getProperties($file)
-  {
-    $properties = array();
-
-    if (false === $lines = @file($file))
-    {
-      throw new sfCommandException('Unable to parse contents of the "sqldb.map" file.');
-    }
-
-    foreach ($lines as $line)
-    {
-      $line = trim($line);
-
-      if ('' == $line)
-      {
-        continue;
-      }
-
-      if (in_array($line[0], array('#', ';')))
-      {
-        continue;
-      }
-
-      $pos = strpos($line, '=');
-      $properties[trim(substr($line, 0, $pos))] = trim(substr($line, $pos + 1));
-    }
-
-    return $properties;
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildAllLoadTask.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildAllLoadTask.class.php
deleted file mode 100644
index 9f96c816c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildAllLoadTask.class.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php');
-
-/**
- * Generates Propel model, SQL, initializes database, and load data.
- *
- * @package    symfony
- * @subpackage propel
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelBuildAllLoadTask.class.php 23922 2009-11-14 14:58:38Z fabien $
- */
-class sfPropelBuildAllLoadTask extends sfPropelBaseTask
-{
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addOptions(array(
-      new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-      new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-      new sfCommandOption('connection', null, sfCommandOption::PARAMETER_REQUIRED, 'The connection name', 'propel'),
-      new sfCommandOption('no-confirmation', null, sfCommandOption::PARAMETER_NONE, 'Do not ask for confirmation'),
-      new sfCommandOption('skip-forms', 'F', sfCommandOption::PARAMETER_NONE, 'Skip generating forms'),
-      new sfCommandOption('classes-only', 'C', sfCommandOption::PARAMETER_NONE, 'Do not initialize the database'),
-      new sfCommandOption('phing-arg', null, sfCommandOption::PARAMETER_REQUIRED | sfCommandOption::IS_ARRAY, 'Arbitrary phing argument'),
-      new sfCommandOption('append', null, sfCommandOption::PARAMETER_NONE, 'Don\'t delete current data in the database'),
-      new sfCommandOption('dir', null, sfCommandOption::PARAMETER_REQUIRED | sfCommandOption::IS_ARRAY, 'The directories to look for fixtures'),
-    ));
-
-    $this->namespace = 'propel';
-    $this->name = 'build-all-load';
-    $this->briefDescription = 'Generates Propel model and form classes, SQL, initializes the database, and loads data';
-
-    $this->detailedDescription = <<<EOF
-The [propel:build-all-load|INFO] task is a shortcut for two other tasks:
-
-  [./symfony propel:build-all-load|INFO]
-
-The task is equivalent to:
-
-  [./symfony propel:build-all|INFO]
-  [./symfony propel:data-load|INFO]
-
-See those tasks' help pages for more information.
-
-To bypass the confirmation, you can pass the [no-confirmation|COMMENT]
-option:
-
-  [./symfony propel:buil-all-load --no-confirmation|INFO]
-EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    // load Propel configuration before Phing
-    $databaseManager = new sfDatabaseManager($this->configuration);
-
-    $buildAll = new sfPropelBuildAllTask($this->dispatcher, $this->formatter);
-    $buildAll->setCommandApplication($this->commandApplication);
-    $buildAll->setConfiguration($this->configuration);
-    $ret = $buildAll->run(array(), array(
-      'phing-arg'       => $options['phing-arg'],
-      'skip-forms'      => $options['skip-forms'],
-      'classes-only'    => $options['classes-only'],
-      'no-confirmation' => $options['no-confirmation'],
-    ));
-
-    if (0 == $ret)
-    {
-      $loadData = new sfPropelDataLoadTask($this->dispatcher, $this->formatter);
-      $loadData->setCommandApplication($this->commandApplication);
-      $loadData->setConfiguration($this->configuration);
-      $loadData->run($options['dir'], array(
-        'append' => $options['append'],
-      ));
-    }
-
-    $this->cleanup();
-
-    return $ret;
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildAllTask.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildAllTask.class.php
deleted file mode 100644
index 4e46b91f6..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildAllTask.class.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php');
-
-/**
- * Generates Propel model, SQL and initializes the database.
- *
- * @package    symfony
- * @subpackage propel
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelBuildAllTask.class.php 23922 2009-11-14 14:58:38Z fabien $
- */
-class sfPropelBuildAllTask extends sfPropelBaseTask
-{
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addOptions(array(
-      new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-      new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-      new sfCommandOption('connection', null, sfCommandOption::PARAMETER_REQUIRED, 'The connection name', 'propel'),
-      new sfCommandOption('no-confirmation', null, sfCommandOption::PARAMETER_NONE, 'Do not ask for confirmation'),
-      new sfCommandOption('skip-forms', 'F', sfCommandOption::PARAMETER_NONE, 'Skip generating forms'),
-      new sfCommandOption('classes-only', 'C', sfCommandOption::PARAMETER_NONE, 'Do not initialize the database'),
-      new sfCommandOption('phing-arg', null, sfCommandOption::PARAMETER_REQUIRED | sfCommandOption::IS_ARRAY, 'Arbitrary phing argument'),
-    ));
-
-    $this->namespace = 'propel';
-    $this->name = 'build-all';
-    $this->briefDescription = 'Generates Propel model and form classes, SQL and initializes the database';
-
-    $this->detailedDescription = <<<EOF
-The [propel:build-all|INFO] task is a shortcut for five other tasks:
-
-  [./symfony propel:build-all|INFO]
-
-The task is equivalent to:
-
-  [./symfony propel:build-model|INFO]
-  [./symfony propel:build-forms|INFO]
-  [./symfony propel:build-filters|INFO]
-  [./symfony propel:build-sql|INFO]
-  [./symfony propel:insert-sql|INFO]
-
-See those tasks' help pages for more information.
-
-To bypass confirmation prompts, you can pass the [no-confirmation|COMMENT] option:
-
-  [./symfony propel:buil-all --no-confirmation|INFO]
-
-To build all classes but skip initializing the database, use the [classes-only|COMMENT]
-option:
-
-  [./symfony propel:build-all --classes-only|INFO]
-EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $basePhingOptions = array();
-    foreach ($options['phing-arg'] as $arg)
-    {
-      $basePhingOptions[] = '--phing-arg='.escapeshellarg($arg);
-    }
-
-    $buildModel = new sfPropelBuildModelTask($this->dispatcher, $this->formatter);
-    $buildModel->setCommandApplication($this->commandApplication);
-    $buildModel->setConfiguration($this->configuration);
-    $ret = $buildModel->run(array(), array(
-      'phing-arg' => $options['phing-arg'],
-    ));
-
-    if ($ret)
-    {
-      return $ret;
-    }
-
-    if (!$options['skip-forms'])
-    {
-      $this->logBlock(array(
-        'Phing was run before and used many custom classes that might conflict with',
-        'your model classes. In case of errors try running "propel:build-forms" and',
-        '"propel:build-filters" alone. This is due to a PHP limitation that cannot be',
-        'fixed in symfony.',
-      ), 'INFO');
-
-      $buildForms = new sfPropelBuildFormsTask($this->dispatcher, $this->formatter);
-      $buildForms->setCommandApplication($this->commandApplication);
-      $buildForms->setConfiguration($this->configuration);
-      $ret = $buildForms->run();
-
-      if ($ret)
-      {
-        return $ret;
-      }
-
-      $buildFilters = new sfPropelBuildFiltersTask($this->dispatcher, $this->formatter);
-      $buildFilters->setCommandApplication($this->commandApplication);
-      $buildFilters->setConfiguration($this->configuration);
-      $ret = $buildFilters->run();
-
-      if ($ret)
-      {
-        return $ret;
-      }
-    }
-
-    if (!$options['classes-only'])
-    {
-      $buildSql = new sfPropelBuildSqlTask($this->dispatcher, $this->formatter);
-      $buildSql->setCommandApplication($this->commandApplication);
-      $buildSql->setConfiguration($this->configuration);
-      $ret = $buildSql->run(array(), array(
-        'phing-arg' => $options['phing-arg'],
-      ));
-
-      if ($ret)
-      {
-        return $ret;
-      }
-
-      $insertSql = new sfPropelInsertSqlTask($this->dispatcher, $this->formatter);
-      $insertSql->setCommandApplication($this->commandApplication);
-      $insertSql->setConfiguration($this->configuration);
-      $ret = $insertSql->run(array(), array(
-        'phing-arg'       => $options['phing-arg'],
-        'connection'      => $options['connection'],
-        'no-confirmation' => $options['no-confirmation'],
-      ));
-
-      if ($ret)
-      {
-        return $ret;
-      }
-    }
-
-    $this->reloadAutoload();
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildFiltersTask.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildFiltersTask.class.php
deleted file mode 100644
index 3594d917a..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildFiltersTask.class.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license informationation, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php');
-
-/**
- * Create filter form classes for the current model.
- *
- * @package    symfony
- * @subpackage propel
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelBuildFiltersTask.class.php 23927 2009-11-14 16:10:57Z fabien $
- */
-class sfPropelBuildFiltersTask extends sfPropelBaseTask
-{
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addOptions(array(
-      new sfCommandOption('connection', null, sfCommandOption::PARAMETER_REQUIRED, 'The connection name', 'propel'),
-      new sfCommandOption('model-dir-name', null, sfCommandOption::PARAMETER_REQUIRED, 'The model dir name', 'model'),
-      new sfCommandOption('filter-dir-name', null, sfCommandOption::PARAMETER_REQUIRED, 'The filter form dir name', 'filter'),
-      new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-      new sfCommandOption('generator-class', null, sfCommandOption::PARAMETER_REQUIRED, 'The generator class', 'sfPropelFormFilterGenerator'),
-    ));
-
-    $this->namespace = 'propel';
-    $this->name = 'build-filters';
-    $this->briefDescription = 'Creates filter form classes for the current model';
-
-    $this->detailedDescription = <<<EOF
-The [propel:build-filters|INFO] task creates filter form classes from the schema:
-
-  [./symfony propel:build-filters|INFO]
-
-The task read the schema information in [config/*schema.xml|COMMENT] and/or
-[config/*schema.yml|COMMENT] from the project and all installed plugins.
-
-The task use the [propel|COMMENT] connection as defined in [config/databases.yml|COMMENT].
-You can use another connection by using the [--connection|COMMENT] option:
-
-  [./symfony propel:build-filters --connection="name"|INFO]
-
-The model filter form classes files are created in [lib/filter|COMMENT].
-
-This task never overrides custom classes in [lib/filter|COMMENT].
-It only replaces base classes generated in [lib/filter/base|COMMENT].
-EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $this->logSection('propel', 'generating filter form classes');
-
-    $generatorManager = new sfGeneratorManager($this->configuration);
-    $generatorManager->generate($options['generator-class'], array(
-      'connection'      => $options['connection'],
-      'model_dir_name'  => $options['model-dir-name'],
-      'filter_dir_name' => $options['filter-dir-name'],
-    ));
-
-    $properties = parse_ini_file(sfConfig::get('sf_config_dir').'/properties.ini', true);
-
-    $constants = array(
-      'PROJECT_NAME' => isset($properties['symfony']['name']) ? $properties['symfony']['name'] : 'symfony',
-      'AUTHOR_NAME'  => isset($properties['symfony']['author']) ? $properties['symfony']['author'] : 'Your name here'
-    );
-
-    // customize php and yml files
-    $finder = sfFinder::type('file')->name('*.php');
-    $this->getFilesystem()->replaceTokens($finder->in(sfConfig::get('sf_lib_dir').'/filter/'), '##', '##', $constants);
-
-    $this->reloadAutoload();
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildFormsTask.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildFormsTask.class.php
deleted file mode 100644
index 8d644ed90..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildFormsTask.class.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php');
-
-/**
- * Create form classes for the current model.
- *
- * @package    symfony
- * @subpackage propel
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelBuildFormsTask.class.php 23927 2009-11-14 16:10:57Z fabien $
- */
-class sfPropelBuildFormsTask extends sfPropelBaseTask
-{
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addOptions(array(
-      new sfCommandOption('connection', null, sfCommandOption::PARAMETER_REQUIRED, 'The connection name', 'propel'),
-      new sfCommandOption('model-dir-name', null, sfCommandOption::PARAMETER_REQUIRED, 'The model dir name', 'model'),
-      new sfCommandOption('form-dir-name', null, sfCommandOption::PARAMETER_REQUIRED, 'The form dir name', 'form'),
-      new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-      new sfCommandOption('generator-class', null, sfCommandOption::PARAMETER_REQUIRED, 'The generator class', 'sfPropelFormGenerator'),
-    ));
-
-    $this->namespace = 'propel';
-    $this->name = 'build-forms';
-    $this->briefDescription = 'Creates form classes for the current model';
-
-    $this->detailedDescription = <<<EOF
-The [propel:build-forms|INFO] task creates form classes from the schema:
-
-  [./symfony propel:build-forms|INFO]
-
-The task read the schema information in [config/*schema.xml|COMMENT] and/or
-[config/*schema.yml|COMMENT] from the project and all installed plugins.
-
-The task use the [propel|COMMENT] connection as defined in [config/databases.yml|COMMENT].
-You can use another connection by using the [--connection|COMMENT] option:
-
-  [./symfony propel:build-forms --connection="name"|INFO]
-
-The model form classes files are created in [lib/form|COMMENT].
-
-This task never overrides custom classes in [lib/form|COMMENT].
-It only replaces base classes generated in [lib/form/base|COMMENT].
-EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $this->logSection('propel', 'generating form classes');
-
-    $generatorManager = new sfGeneratorManager($this->configuration);
-    $generatorManager->generate($options['generator-class'], array(
-      'connection'     => $options['connection'],
-      'model_dir_name' => $options['model-dir-name'],
-      'form_dir_name'  => $options['form-dir-name'],
-    ));
-
-    $properties = parse_ini_file(sfConfig::get('sf_config_dir').'/properties.ini', true);
-
-    $constants = array(
-      'PROJECT_NAME' => isset($properties['symfony']['name']) ? $properties['symfony']['name'] : 'symfony',
-      'AUTHOR_NAME'  => isset($properties['symfony']['author']) ? $properties['symfony']['author'] : 'Your name here'
-    );
-
-    // customize php and yml files
-    $finder = sfFinder::type('file')->name('*.php');
-    $this->getFilesystem()->replaceTokens($finder->in(sfConfig::get('sf_lib_dir').'/form/'), '##', '##', $constants);
-
-    // check for base form class
-    if (!class_exists('BaseForm'))
-    {
-      $file = sfConfig::get('sf_lib_dir').'/'.$options['form-dir-name'].'/BaseForm.class.php';
-      $this->getFilesystem()->copy(sfConfig::get('sf_symfony_lib_dir').'/task/generator/skeleton/project/lib/form/BaseForm.class.php', $file);
-      $this->getFilesystem()->replaceTokens($file, '##', '##', $constants);
-    }
-
-    $this->reloadAutoload();
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildModelTask.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildModelTask.class.php
deleted file mode 100644
index 738427ef5..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildModelTask.class.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php');
-
-/**
- * Create classes for the current model.
- *
- * @package    symfony
- * @subpackage propel
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelBuildModelTask.class.php 23922 2009-11-14 14:58:38Z fabien $
- */
-class sfPropelBuildModelTask extends sfPropelBaseTask
-{
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addOptions(array(
-      new sfCommandOption('phing-arg', null, sfCommandOption::PARAMETER_REQUIRED | sfCommandOption::IS_ARRAY, 'Arbitrary phing argument'),
-    ));
-
-    $this->namespace = 'propel';
-    $this->name = 'build-model';
-    $this->briefDescription = 'Creates classes for the current model';
-
-    $this->detailedDescription = <<<EOF
-The [propel:build-model|INFO] task creates model classes from the schema:
-
-  [./symfony propel:build-model|INFO]
-
-The task read the schema information in [config/*schema.xml|COMMENT] and/or
-[config/*schema.yml|COMMENT] from the project and all installed plugins.
-
-You mix and match YML and XML schema files. The task will convert
-YML ones to XML before calling the Propel task.
-
-The model classes files are created in [lib/model|COMMENT].
-
-This task never overrides custom classes in [lib/model|COMMENT].
-It only replaces files in [lib/model/om|COMMENT] and [lib/model/map|COMMENT].
-EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $this->schemaToXML(self::DO_NOT_CHECK_SCHEMA, 'generated-');
-    $this->copyXmlSchemaFromPlugins('generated-');
-    $ret = $this->callPhing('om', self::CHECK_SCHEMA);
-    $this->cleanup();
-
-    $this->reloadAutoload();
-
-    return !$ret;
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildSchemaTask.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildSchemaTask.class.php
deleted file mode 100644
index 785c7ce09..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildSchemaTask.class.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php');
-
-/**
- * Creates a schema.xml from an existing database.
- *
- * @package    symfony
- * @subpackage propel
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelBuildSchemaTask.class.php 23922 2009-11-14 14:58:38Z fabien $
- */
-class sfPropelBuildSchemaTask extends sfPropelBaseTask
-{
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addOptions(array(
-      new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-      new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'cli'),
-      new sfCommandOption('connection', null, sfCommandOption::PARAMETER_REQUIRED, 'The connection name', null),
-      new sfCommandOption('xml', null, sfCommandOption::PARAMETER_NONE, 'Creates an XML schema instead of a YML one'),
-      new sfCommandOption('phing-arg', null, sfCommandOption::PARAMETER_REQUIRED | sfCommandOption::IS_ARRAY, 'Arbitrary phing argument'),
-    ));
-
-    $this->namespace = 'propel';
-    $this->name = 'build-schema';
-    $this->briefDescription = 'Creates a schema from an existing database';
-
-    $this->detailedDescription = <<<EOF
-The [propel:build-schema|INFO] task introspects a database to create a schema:
-
-  [./symfony propel:build-schema|INFO]
-
-By default, the task creates a YML file, but you can also create a XML file:
-
-  [./symfony --xml propel:build-schema|INFO]
-
-The XML format contains more information than the YML one.
-EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $databaseManager = new sfDatabaseManager($this->configuration);
-
-    foreach ($databaseManager->getNames() as $connection)
-    {
-      if (null !== $options['connection'] && $options['connection'] != $connection)
-      {
-        continue;
-      }
-
-      $this->reverseDatabase($databaseManager, $connection, $options);
-    }
-  }
-
-  protected function reverseDatabase($databaseManager, $connection, $options)
-  {
-    $name = 'propel' == $connection ? 'schema' : $connection.'-schema';
-
-    $properties = $this->getPhingPropertiesForConnection($databaseManager, $connection);
-    $properties['propel.default.schema.basename'] = $name;
-
-    $ret = $this->callPhing('reverse', self::DO_NOT_CHECK_SCHEMA, $properties);
-
-    if (!$ret)
-    {
-      return 1;
-    }
-
-    $xmlSchemaPath = sfConfig::get('sf_config_dir').'/'.$name.'.xml';
-    $ymlSchemaPath = sfConfig::get('sf_config_dir').'/'.$name.'.yml';
-
-    // Fix database name
-    if (file_exists($xmlSchemaPath))
-    {
-      $schema = file_get_contents($xmlSchemaPath);
-      $schema = preg_replace('/<database\s+name="[^"]+"/s', '<database name="'.$connection.'" package="lib.model"', $schema);
-      file_put_contents($xmlSchemaPath, $schema);
-    }
-
-    if (!$options['xml'])
-    {
-      $this->schemaToYML(self::DO_NOT_CHECK_SCHEMA, '');
-      $this->cleanup();
-
-      if (file_exists($xmlSchemaPath))
-      {
-        unlink($xmlSchemaPath);
-      }
-    }
-    else
-    {
-      if (file_exists($ymlSchemaPath))
-      {
-        unlink($ymlSchemaPath);
-      }
-    }
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildSqlTask.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildSqlTask.class.php
deleted file mode 100644
index 7a342307a..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildSqlTask.class.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php');
-
-/**
- * Create SQL for the current model.
- *
- * @package    symfony
- * @subpackage propel
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelBuildSqlTask.class.php 23922 2009-11-14 14:58:38Z fabien $
- */
-class sfPropelBuildSqlTask extends sfPropelBaseTask
-{
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addOptions(array(
-      new sfCommandOption('phing-arg', null, sfCommandOption::PARAMETER_REQUIRED | sfCommandOption::IS_ARRAY, 'Arbitrary phing argument'),
-    ));
-
-    $this->namespace = 'propel';
-    $this->name = 'build-sql';
-    $this->briefDescription = 'Creates SQL for the current model';
-
-    $this->detailedDescription = <<<EOF
-The [propel:build-sql|INFO] task creates SQL statements for table creation:
-
-  [./symfony propel:build-sql|INFO]
-
-The generated SQL is optimized for the database configured in [config/propel.ini|COMMENT]:
-
-  [propel.database = mysql|INFO]
-EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $this->schemaToXML(self::DO_NOT_CHECK_SCHEMA, 'generated-');
-    $this->copyXmlSchemaFromPlugins('generated-');
-    $ret = $this->callPhing('sql', self::CHECK_SCHEMA);
-    $this->cleanup();
-///// FIXME: must change the propel.ini based on databases.yml! as done in insert-sql
-    return !$ret;
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildTask.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildTask.class.php
deleted file mode 100644
index a7de43c91..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelBuildTask.class.php
+++ /dev/null
@@ -1,257 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php');
-
-/**
- * Generates code based on your schema.
- *
- * @package    sfPropelPlugin
- * @subpackage task
- * @author     Kris Wallsmith <kris.wallsmith@symfony-project.com>
- * @version    SVN: $Id: sfPropelBuildTask.class.php 23308 2009-10-24 14:43:25Z Kris.Wallsmith $
- */
-class sfPropelBuildTask extends sfPropelBaseTask
-{
-  const
-    BUILD_MODEL   = 1,
-    BUILD_FORMS   = 2,
-    BUILD_FILTERS = 4,
-    BUILD_SQL     = 8,
-    BUILD_DB      = 16,
-
-    OPTION_MODEL       = 1,
-    OPTION_FORMS       = 3, // model, forms
-    OPTION_FILTERS     = 5, // model, filters
-    OPTION_SQL         = 8,
-    OPTION_DB          = 24, // sql, db
-    OPTION_ALL_CLASSES = 7,  // model, forms, filters
-    OPTION_ALL         = 31; // model, forms, filters, sql, db
-
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addOptions(array(
-      new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-      new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-      new sfCommandOption('no-confirmation', null, sfCommandOption::PARAMETER_NONE, 'Whether to force dropping of the database'),
-      new sfCommandOption('all', null, sfCommandOption::PARAMETER_NONE, 'Build everything and reset the database'),
-      new sfCommandOption('all-classes', null, sfCommandOption::PARAMETER_NONE, 'Build all classes'),
-      new sfCommandOption('model', null, sfCommandOption::PARAMETER_NONE, 'Build model classes'),
-      new sfCommandOption('forms', null, sfCommandOption::PARAMETER_NONE, 'Build form classes'),
-      new sfCommandOption('filters', null, sfCommandOption::PARAMETER_NONE, 'Build filter classes'),
-      new sfCommandOption('sql', null, sfCommandOption::PARAMETER_NONE, 'Build SQL'),
-      new sfCommandOption('db', null, sfCommandOption::PARAMETER_NONE, 'Drop, create, and insert SQL'),
-      new sfCommandOption('and-load', null, sfCommandOption::PARAMETER_OPTIONAL | sfCommandOption::IS_ARRAY, 'Load fixture data'),
-      new sfCommandOption('and-append', null, sfCommandOption::PARAMETER_OPTIONAL | sfCommandOption::IS_ARRAY, 'Append fixture data'),
-    ));
-
-    $this->namespace = 'propel';
-    $this->name = 'build';
-
-    $this->briefDescription = 'Generate code based on your schema';
-
-    $this->detailedDescription = <<<EOF
-The [propel:build|INFO] task generates code based on your schema:
-
-  [./symfony propel:build|INFO]
-
-You must specify what you would like built. For instance, if you want model
-and form classes built use the [--model|COMMENT] and [--forms|COMMENT] options:
-
-  [./symfony propel:build --model --forms|INFO]
-
-You can use the [--all|COMMENT] shortcut option if you would like all classes and
-SQL files generated and the database rebuilt:
-
-  [./symfony propel:build --all|INFO]
-
-This is equivalent to running the following tasks:
-
-  [./symfony propel:build-model|INFO]
-  [./symfony propel:build-forms|INFO]
-  [./symfony propel:build-filters|INFO]
-  [./symfony propel:build-sql|INFO]
-  [./symfony propel:insert-sql|INFO]
-
-You can also generate only class files by using the [--all-classes|COMMENT] shortcut
-option. When this option is used alone, the database will not be modified.
-
-  [./symfony propel:build --all-classes|INFO]
-
-The [--and-load|COMMENT] option will load data from the project and plugin
-[data/fixtures/|COMMENT] directories:
-
-  [./symfony propel:build --db --and-load|INFO]
-
-To specify what fixtures are loaded, add a parameter to the [--and-load|COMMENT] option:
-
-  [./symfony propel:build --all --and-load="data/fixtures/dev/"|INFO]
-
-To append fixture data without erasing any records from the database, include
-the [--and-append|COMMENT] option:
-
-  [./symfony propel:build --all --and-append|INFO]
-EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    if (!$mode = $this->calculateMode($options))
-    {
-      throw new InvalidArgumentException(sprintf("You must include one or more of the following build options:\n--%s\n\nSee this task's help page for more information:\n\n  php symfony help propel:build", join(', --', array_keys($this->getBuildOptions()))));
-    }
-
-    if (self::BUILD_MODEL == (self::BUILD_MODEL & $mode))
-    {
-      $task = new sfPropelBuildModelTask($this->dispatcher, $this->formatter);
-      $task->setCommandApplication($this->commandApplication);
-      $task->setConfiguration($this->configuration);
-      $ret = $task->run();
-
-      if ($ret)
-      {
-        return $ret;
-      }
-    }
-
-    if (self::BUILD_FORMS == (self::BUILD_FORMS & $mode))
-    {
-      $task = new sfPropelBuildFormsTask($this->dispatcher, $this->formatter);
-      $task->setCommandApplication($this->commandApplication);
-      $task->setConfiguration($this->configuration);
-      $ret = $task->run();
-
-      if ($ret)
-      {
-        return $ret;
-      }
-    }
-
-    if (self::BUILD_FILTERS == (self::BUILD_FILTERS & $mode))
-    {
-      $task = new sfPropelBuildFiltersTask($this->dispatcher, $this->formatter);
-      $task->setCommandApplication($this->commandApplication);
-      $task->setConfiguration($this->configuration);
-      $ret = $task->run();
-
-      if ($ret)
-      {
-        return $ret;
-      }
-    }
-
-    if (self::BUILD_SQL == (self::BUILD_SQL & $mode))
-    {
-      $task = new sfPropelBuildSqlTask($this->dispatcher, $this->formatter);
-      $task->setCommandApplication($this->commandApplication);
-      $task->setConfiguration($this->configuration);
-      $ret = $task->run();
-
-      if ($ret)
-      {
-        return $ret;
-      }
-    }
-
-    if (self::BUILD_DB == (self::BUILD_DB & $mode))
-    {
-      $task = new sfPropelInsertSqlTask($this->dispatcher, $this->formatter);
-      $task->setCommandApplication($this->commandApplication);
-      $task->setConfiguration($this->configuration);
-      $ret = $task->run(array(), array(
-        'no-confirmation' => $options['no-confirmation'],
-      ));
-
-      if ($ret)
-      {
-        return $ret;
-      }
-    }
-
-    if (count($options['and-load']) || count($options['and-append']))
-    {
-      $task = new sfPropelDataLoadTask($this->dispatcher, $this->formatter);
-      $task->setCommandApplication($this->commandApplication);
-      $task->setConfiguration($this->configuration);
-
-      if (count($options['and-load']))
-      {
-        $ret = $task->run(array(
-          'dir_or_file' => in_array(array(), $options['and-load'], true) ? null : $options['and-load'],
-        ));
-
-        if ($ret)
-        {
-          return $ret;
-        }
-      }
-
-      if (count($options['and-append']))
-      {
-        $ret = $task->run(array(
-          'dir_or_file' => in_array(array(), $options['and-append'], true) ? null : $options['and-append'],
-        ), array(
-          'append' => true,
-        ));
-
-        if ($ret)
-        {
-          return $ret;
-        }
-      }
-    }
-  }
-
-  /**
-   * Calculates a bit mode based on the supplied options.
-   *
-   * @param  array $options
-   *
-   * @return integer
-   */
-  protected function calculateMode($options = array())
-  {
-    $mode = 0;
-    foreach ($this->getBuildOptions() as $name => $value)
-    {
-      if (isset($options[$name]) && true === $options[$name])
-      {
-        $mode = $mode | $value;
-      }
-    }
-
-    return $mode;
-  }
-
-  /**
-   * Returns an array of valid build options.
-   *
-   * @return array An array of option names and their mode
-   */
-  protected function getBuildOptions()
-  {
-    $options = array();
-    foreach ($this->options as $option)
-    {
-      if (defined($constant = __CLASS__.'::OPTION_'.str_replace('-', '_', strtoupper($option->getName()))))
-      {
-        $options[$option->getName()] = constant($constant);
-      }
-    }
-
-    return $options;
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelConfigureDatabaseTask.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelConfigureDatabaseTask.class.php
deleted file mode 100644
index 643bfb437..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelConfigureDatabaseTask.class.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Configures the database connection.
- *
- * @package    symfony
- * @subpackage task
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelConfigureDatabaseTask.class.php 21908 2009-09-11 12:06:21Z fabien $
- */
-class sfPropelConfigureDatabaseTask extends sfBaseTask
-{
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addArguments(array(
-      new sfCommandArgument('dsn', sfCommandArgument::REQUIRED, 'The database dsn'),
-      new sfCommandArgument('username', sfCommandArgument::OPTIONAL, 'The database username', 'root'),
-      new sfCommandArgument('password', sfCommandArgument::OPTIONAL, 'The database password'),
-    ));
-
-    $this->addOptions(array(
-      new sfCommandOption('env', null, sfCommandOption::PARAMETER_OPTIONAL, 'The environment', 'all'),
-      new sfCommandOption('name', null, sfCommandOption::PARAMETER_OPTIONAL, 'The connection name', 'propel'),
-      new sfCommandOption('class', null, sfCommandOption::PARAMETER_OPTIONAL, 'The database class name', 'sfPropelDatabase'),
-      new sfCommandOption('app', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', null),
-    ));
-
-    $this->namespace = 'configure';
-    $this->name = 'database';
-
-    $this->briefDescription = 'Configure database DSN';
-
-    $this->detailedDescription = <<<EOF
-The [configure:database|INFO] task configures the database DSN
-for a project:
-
-  [./symfony configure:database mysql:host=localhost;dbname=example root mYsEcret|INFO]
-
-By default, the task change the configuration for all environment. If you want
-to change the dsn for a specific environment, use the [env|COMMENT] option:
-
-  [./symfony configure:database --env=dev mysql:host=localhost;dbname=example_dev root mYsEcret|INFO]
-
-To change the configuration for a specific application, use the [app|COMMENT] option:
-
-  [./symfony configure:database --app=frontend mysql:host=localhost;dbname=example root mYsEcret|INFO]
-
-You can also specify the connection name and the database class name:
-
-  [./symfony configure:database --name=main --class=ProjectDatabase mysql:host=localhost;dbname=example root mYsEcret|INFO]
-
-WARNING: The [propel.ini|COMMENT] file is also updated when you use a [Propel|COMMENT] database
-and configure for [all|COMMENT] environments with no [app|COMMENT].
-EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    // update databases.yml
-    if (null !== $options['app'])
-    {
-      $file = sfConfig::get('sf_apps_dir').'/'.$options['app'].'/config/databases.yml';
-    }
-    else
-    {
-      $file = sfConfig::get('sf_config_dir').'/databases.yml';
-    }
-
-    $config = file_exists($file) ? sfYaml::load($file) : array();
-
-    $config[$options['env']][$options['name']] = array(
-      'class' => $options['class'],
-      'param' => array_merge(isset($config[$options['env']][$options['name']]['param']) ? $config[$options['env']][$options['name']]['param'] : array(), array('dsn' => $arguments['dsn'], 'username' => $arguments['username'], 'password' => $arguments['password'])),
-    );
-
-    file_put_contents($file, sfYaml::dump($config, 4));
-
-    // update propel.ini
-    if (
-      null === $options['app'] &&
-      false !== strpos($options['class'], 'Propel') &&
-      'all' == $options['env']
-    )
-    {
-      $propelini = sfConfig::get('sf_config_dir').'/propel.ini';
-      if (file_exists($propelini))
-      {
-        $content = file_get_contents($propelini);
-        if (preg_match('/^(.+?):/', $arguments['dsn'], $match))
-        {
-          $content = preg_replace('/^propel\.database(\s*)=(\s*)(.+?)$/m', 'propel.database$1=${2}'.$match[1], $content);
-          $content = preg_replace('/^propel\.database.driver(\s*)=(\s*)(.+?)$/m', 'propel.database.driver$1=${2}'.$match[1], $content);
-          $content = preg_replace('/^propel\.database\.createUrl(\s*)=(\s*)(.+?)$/m', 'propel.database.createUrl$1=${2}'.$arguments['dsn'], $content);
-          $content = preg_replace('/^propel\.database\.url(\s*)=(\s*)(.+?)$/m', 'propel.database.url$1=${2}'.$arguments['dsn'], $content);
-
-          $content = preg_replace('/^propel\.database\.user(\s*)=(\s*)(.+?)$/m', 'propel.database.user$1=${2}'.$arguments['username'], $content);
-          $content = preg_replace('/^propel\.database\.password(\s*)=(\s*)(.+?)$/m', 'propel.database.password$1=${2}'.$arguments['password'], $content);
-
-          file_put_contents($propelini, $content);
-        }
-      }
-    }
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelDataDumpTask.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelDataDumpTask.class.php
deleted file mode 100644
index 35baaf5b6..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelDataDumpTask.class.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php');
-
-/**
- * Dumps data to the fixtures directory.
- *
- * @package    symfony
- * @subpackage propel
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelDataDumpTask.class.php 23922 2009-11-14 14:58:38Z fabien $
- */
-class sfPropelDataDumpTask extends sfPropelBaseTask
-{
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addArguments(array(
-      new sfCommandArgument('target', sfCommandArgument::OPTIONAL, 'The target filename'),
-    ));
-
-    $this->addOptions(array(
-      new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-      new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environement', 'cli'),
-      new sfCommandOption('connection', null, sfCommandOption::PARAMETER_REQUIRED, 'The connection name', 'propel'),
-      new sfCommandOption('classes', null, sfCommandOption::PARAMETER_REQUIRED, 'The class names to dump (separated by a colon)', null),
-    ));
-
-    $this->namespace = 'propel';
-    $this->name = 'data-dump';
-    $this->briefDescription = 'Dumps data to the fixtures directory';
-
-    $this->detailedDescription = <<<EOF
-The [propel:data-dump|INFO] task dumps database data:
-
-  [./symfony propel:data-dump > data/fixtures/dump.yml|INFO]
-
-By default, the task outputs the data to the standard output,
-but you can also pass a filename as a second argument:
-
-  [./symfony propel:data-dump dump.yml|INFO]
-
-The task will dump data in [data/fixtures/%target%|COMMENT]
-(data/fixtures/dump.yml in the example).
-
-The dump file is in the YML format and can be re-imported by using
-the [propel:data-load|INFO] task.
-
-By default, the task use the [propel|COMMENT] connection as defined in [config/databases.yml|COMMENT].
-You can use another connection by using the [connection|COMMENT] option:
-
-  [./symfony propel:data-dump --connection="name"|INFO]
-
-If you only want to dump some classes, use the [classes|COMMENT] option:
-
-  [./symfony propel:data-dump --classes="Article,Category"|INFO]
-
-If you want to use a specific database configuration from an application, you can use
-the [application|COMMENT] option:
-
-  [./symfony propel:data-dump --application=frontend|INFO]
-EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $databaseManager = new sfDatabaseManager($this->configuration);
-
-    $filename = $arguments['target'];
-    if (null !== $filename && !sfToolkit::isPathAbsolute($filename))
-    {
-      $dir = sfConfig::get('sf_data_dir').DIRECTORY_SEPARATOR.'fixtures';
-      $this->getFilesystem()->mkdirs($dir);
-      $filename = $dir.DIRECTORY_SEPARATOR.$filename;
-
-      $this->logSection('propel', sprintf('dumping data to "%s"', $filename));
-    }
-
-    $data = new sfPropelData();
-
-    $classes = null === $options['classes'] ? 'all' : explode(',', $options['classes']);
-
-    if (null !== $filename)
-    {
-      $data->dumpData($filename, $classes, $options['connection']);
-    }
-    else
-    {
-      fwrite(STDOUT, sfYaml::dump($data->getData($classes, $options['connection']), 3));
-    }
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelDataLoadTask.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelDataLoadTask.class.php
deleted file mode 100644
index 70e5e7887..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelDataLoadTask.class.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php');
-
-/**
- * Loads YAML fixture data.
- *
- * @package    symfony
- * @subpackage propel
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelDataLoadTask.class.php 23922 2009-11-14 14:58:38Z fabien $
- */
-class sfPropelDataLoadTask extends sfPropelBaseTask
-{
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addArguments(array(
-      new sfCommandArgument('dir_or_file', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY, 'Directory or file to load'),
-    ));
-
-    $this->addOptions(array(
-      new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-      new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'cli'),
-      new sfCommandOption('append', null, sfCommandOption::PARAMETER_NONE, 'Don\'t delete current data in the database'),
-      new sfCommandOption('connection', null, sfCommandOption::PARAMETER_REQUIRED, 'The connection name', 'propel'),
-    ));
-
-    $this->namespace = 'propel';
-    $this->name = 'data-load';
-    $this->briefDescription = 'Loads YAML fixture data';
-
-    $this->detailedDescription = <<<EOF
-The [propel:data-load|INFO] task loads data fixtures into the database:
-
-  [./symfony propel:data-load|INFO]
-
-The task loads data from all the files found in [data/fixtures/|COMMENT].
-
-If you want to load data from specific files or directories, you can append
-them as arguments:
-
-  [./symfony propel:data-load data/fixtures/dev data/fixtures/users.yml|INFO]
-
-The task use the [propel|COMMENT] connection as defined in [config/databases.yml|COMMENT].
-You can use another connection by using the [--connection|COMMENT] option:
-
-  [./symfony propel:data-load --connection="name"|INFO]
-
-If you don't want the task to remove existing data in the database,
-use the [--append|COMMENT] option:
-
-  [./symfony propel:data-load --append|INFO]
-
-If you want to use a specific database configuration from an application, you can use
-the [application|COMMENT] option:
-
-  [./symfony propel:data-load --application=frontend|INFO]
-EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $databaseManager = new sfDatabaseManager($this->configuration);
-
-    if (count($arguments['dir_or_file']))
-    {
-      $fixturesDirs = $arguments['dir_or_file'];
-    }
-    else
-    {
-      $fixturesDirs = array_merge(array(sfConfig::get('sf_data_dir').'/fixtures'), $this->configuration->getPluginSubPaths('/data/fixtures'));
-    }
-
-    $data = new sfPropelData();
-    $data->setDeleteCurrentData(!$options['append']);
-
-    $dirs = array();
-    foreach ($fixturesDirs as $fixturesDir)
-    {
-      if (!is_readable($fixturesDir))
-      {
-        continue;
-      }
-
-      $this->logSection('propel', sprintf('load data from "%s"', $fixturesDir));
-      $dirs[] = $fixturesDir;
-    }
-
-    $data->loadData($dirs, $options['connection']);
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelGenerateAdminTask.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelGenerateAdminTask.class.php
deleted file mode 100644
index 61c6cb933..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelGenerateAdminTask.class.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php');
-
-/**
- * Generates a Propel admin module.
- *
- * @package    symfony
- * @subpackage propel
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelGenerateAdminTask.class.php 28809 2010-03-26 17:19:58Z Jonathan.Wage $
- */
-class sfPropelGenerateAdminTask extends sfPropelBaseTask
-{
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addArguments(array(
-      new sfCommandArgument('application', sfCommandArgument::REQUIRED, 'The application name'),
-      new sfCommandArgument('route_or_model', sfCommandArgument::REQUIRED, 'The route name or the model class'),
-    ));
-
-    $this->addOptions(array(
-      new sfCommandOption('module', null, sfCommandOption::PARAMETER_REQUIRED, 'The module name', null),
-      new sfCommandOption('theme', null, sfCommandOption::PARAMETER_REQUIRED, 'The theme name', 'admin'),
-      new sfCommandOption('singular', null, sfCommandOption::PARAMETER_REQUIRED, 'The singular name', null),
-      new sfCommandOption('plural', null, sfCommandOption::PARAMETER_REQUIRED, 'The plural name', null),
-      new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-      new sfCommandOption('actions-base-class', null, sfCommandOption::PARAMETER_REQUIRED, 'The base class for the actions', 'sfActions'),
-    ));
-
-    $this->namespace = 'propel';
-    $this->name = 'generate-admin';
-    $this->briefDescription = 'Generates a Propel admin module';
-
-    $this->detailedDescription = <<<EOF
-The [propel:generate-admin|INFO] task generates a Propel admin module:
-
-  [./symfony propel:generate-admin frontend Article|INFO]
-
-The task creates a module in the [%frontend%|COMMENT] application for the
-[%Article%|COMMENT] model.
-
-The task creates a route for you in the application [routing.yml|COMMENT].
-
-You can also generate a Propel admin module by passing a route name:
-
-  [./symfony propel:generate-admin frontend article|INFO]
-
-The task creates a module in the [%frontend%|COMMENT] application for the
-[%article%|COMMENT] route definition found in [routing.yml|COMMENT].
-
-For the filters and batch actions to work properly, you need to add
-the [with_wildcard_routes|COMMENT] option to the route:
-
-  article:
-    class: sfPropelRouteCollection
-    options:
-      model:                Article
-      with_wildcard_routes: true
-EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    // get configuration for the given route
-    if (false !== ($route = $this->getRouteFromName($arguments['route_or_model'])))
-    {
-      $arguments['route'] = $route;
-      $arguments['route_name'] = $arguments['route_or_model'];
-
-      return $this->generateForRoute($arguments, $options);
-    }
-
-    // is it a model class name
-    if (!class_exists($arguments['route_or_model']))
-    {
-      throw new sfCommandException(sprintf('The route "%s" does not exist and there is no "%s" class.', $arguments['route_or_model'], $arguments['route_or_model']));
-    }
-
-    $r = new ReflectionClass($arguments['route_or_model']);
-    if (!$r->isSubclassOf('BaseObject'))
-    {
-      throw new sfCommandException(sprintf('"%s" is not a Propel class.', $arguments['route_or_model']));
-    }
-
-    // create a route
-    $model = $arguments['route_or_model'];
-    $name = strtolower(preg_replace(array('/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), '\\1_\\2', $model));
-
-    if (isset($options['module']))
-    {
-      $route = $this->getRouteFromName($name);
-      if ($route && !$this->checkRoute($route, $model, $options['module']))
-      {
-        $name .= '_'.$options['module'];
-      }
-    }
-
-    $routing = sfConfig::get('sf_app_config_dir').'/routing.yml';
-    $content = file_get_contents($routing);
-    $routesArray = sfYaml::load($content);
-
-    if (!isset($routesArray[$name]))
-    {
-      $primaryKey = $this->getPrimaryKey($model);
-      $module = $options['module'] ? $options['module'] : $name;
-      $content = sprintf(<<<EOF
-%s:
-  class: sfPropelRouteCollection
-  options:
-    model:                %s
-    module:               %s
-    prefix_path:          /%s
-    column:               %s
-    with_wildcard_routes: true
-
-
-EOF
-      , $name, $model, $module, isset($options['plural']) ? $options['plural'] : $module, $primaryKey).$content;
-
-      $this->logSection('file+', $routing);
-
-      if (false === file_put_contents($routing, $content))
-      {
-        throw new sfCommandException(sprintf('Unable to write to file, %s.', $routing));
-      }
-    }
-
-    $arguments['route'] = $this->getRouteFromName($name);
-    $arguments['route_name'] = $name;
-
-    return $this->generateForRoute($arguments, $options);
-  }
-
-  protected function generateForRoute($arguments, $options)
-  {
-    $routeOptions = $arguments['route']->getOptions();
-
-    if (!$arguments['route'] instanceof sfPropelRouteCollection)
-    {
-      throw new sfCommandException(sprintf('The route "%s" is not a Propel collection route.', $arguments['route_name']));
-    }
-
-    $module = $routeOptions['module'];
-    $model = $routeOptions['model'];
-
-    // execute the propel:generate-module task
-    $task = new sfPropelGenerateModuleTask($this->dispatcher, $this->formatter);
-    $task->setCommandApplication($this->commandApplication);
-    $task->setConfiguration($this->configuration);
-
-    $this->logSection('app', sprintf('Generating admin module "%s" for model "%s"', $module, $model));
-
-    return $task->run(array($arguments['application'], $module, $model), array(
-      'theme'                 => $options['theme'],
-      'route-prefix'          => $routeOptions['name'],
-      'with-propel-route'     => true,
-      'generate-in-cache'     => true,
-      'non-verbose-templates' => true,
-      'singular'              => $options['singular'],
-      'plural'                => $options['plural'],
-      'actions-base-class'    => $options['actions-base-class'],
-    ));
-  }
-
-  protected function getRouteFromName($name)
-  {
-    $config = new sfRoutingConfigHandler();
-    $routes = $config->evaluate($this->configuration->getConfigPaths('config/routing.yml'));
-
-    if (isset($routes[$name]))
-    {
-      return $routes[$name];
-    }
-
-    return false;
-  }
-
-  /**
-   * Checks whether a route references a model and module.
-   *
-   * @param mixed  $route  A route collection
-   * @param string $model  A model name
-   * @param string $module A module name
-   *
-   * @return boolean
-   */
-  protected function checkRoute($route, $model, $module)
-  {
-    if ($route instanceof sfPropelRouteCollection)
-    {
-      $options = $route->getOptions();
-      return $model == $options['model'] && $module == $options['module'];
-    }
-
-    return false;
-  }
-
-  /**
-   * Returns the name of the model's primary key column.
-   *
-   * @param string $model A model name
-   *
-   * @return string A column name
-   */
-  protected function getPrimaryKey($model)
-  {
-    $peer = constant($model.'::PEER');
-    $map = call_user_func(array($peer, 'getTableMap'));
-
-    if (!$pks = $map->getPrimaryKeys())
-    {
-      return 'id';
-    }
-
-    $column = array_shift($pks);
-
-    return call_user_func(array($peer, 'translateFieldName'), $column->getPhpName(), BasePeer::TYPE_PHPNAME, BasePeer::TYPE_FIELDNAME);
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelGenerateModuleForRouteTask.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelGenerateModuleForRouteTask.class.php
deleted file mode 100644
index 83a0e1e8c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelGenerateModuleForRouteTask.class.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php');
-
-/**
- * Generates a Propel module for a route definition.
- *
- * @package    symfony
- * @subpackage propel
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelGenerateModuleForRouteTask.class.php 23194 2009-10-19 16:37:13Z fabien $
- */
-class sfPropelGenerateModuleForRouteTask extends sfPropelBaseTask
-{
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addArguments(array(
-      new sfCommandArgument('application', sfCommandArgument::REQUIRED, 'The application name'),
-      new sfCommandArgument('route', sfCommandArgument::REQUIRED, 'The route name'),
-    ));
-
-    $this->addOptions(array(
-      new sfCommandOption('theme', null, sfCommandOption::PARAMETER_REQUIRED, 'The theme name', 'default'),
-      new sfCommandOption('non-verbose-templates', null, sfCommandOption::PARAMETER_NONE, 'Generate non verbose templates'),
-      new sfCommandOption('singular', null, sfCommandOption::PARAMETER_REQUIRED, 'The singular name', null),
-      new sfCommandOption('plural', null, sfCommandOption::PARAMETER_REQUIRED, 'The plural name', null),
-      new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-      new sfCommandOption('actions-base-class', null, sfCommandOption::PARAMETER_REQUIRED, 'The base class for the actions', 'sfActions'),
-    ));
-
-    $this->namespace = 'propel';
-    $this->name = 'generate-module-for-route';
-    $this->briefDescription = 'Generates a Propel module for a route definition';
-
-    $this->detailedDescription = <<<EOF
-The [propel:generate-module-for-route|INFO] task generates a Propel module for a route definition:
-
-  [./symfony propel:generate-module-for-route frontend article|INFO]
-
-The task creates a module in the [%frontend%|COMMENT] application for the
-[%article%|COMMENT] route definition found in [routing.yml|COMMENT].
-EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    // get configuration for the given route
-    $config = new sfRoutingConfigHandler();
-    $routes = $config->evaluate($this->configuration->getConfigPaths('config/routing.yml'));
-
-    if (!isset($routes[$arguments['route']]))
-    {
-      throw new sfCommandException(sprintf('The route "%s" does not exist.', $arguments['route']));
-    }
-
-    $routeOptions = $routes[$arguments['route']]->getOptions();
-
-    if (!$routes[$arguments['route']] instanceof sfPropelRouteCollection)
-    {
-      throw new sfCommandException(sprintf('The route "%s" is not a Propel collection route.', $arguments['route']));
-    }
-
-    $module = $routeOptions['module'];
-    $model = $routeOptions['model'];
-
-    // execute the propel:generate-module task
-    $task = new sfPropelGenerateModuleTask($this->dispatcher, $this->formatter);
-    $task->setCommandApplication($this->commandApplication);
-    $task->setConfiguration($this->configuration);
-
-    $this->logSection('app', sprintf('Generating module "%s" for model "%s"', $module, $model));
-
-    return $task->run(array($arguments['application'], $module, $model), array(
-      'theme'                 => $options['theme'],
-      'route-prefix'          => $routeOptions['name'],
-      'with-propel-route'     => true,
-      'with-show'             => $routeOptions['with_show'],
-      'non-verbose-templates' => $options['non-verbose-templates'],
-      'singular'              => $options['singular'],
-      'plural'                => $options['plural'],
-      'actions-base-class'    => $options['actions-base-class'],
-    ));
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelGenerateModuleTask.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelGenerateModuleTask.class.php
deleted file mode 100644
index 7d21c232e..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelGenerateModuleTask.class.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php');
-
-/**
- * Generates a Propel module.
- *
- * @package    symfony
- * @subpackage propel
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelGenerateModuleTask.class.php 23947 2009-11-14 20:02:28Z FabianLange $
- */
-class sfPropelGenerateModuleTask extends sfPropelBaseTask
-{
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addArguments(array(
-      new sfCommandArgument('application', sfCommandArgument::REQUIRED, 'The application name'),
-      new sfCommandArgument('module', sfCommandArgument::REQUIRED, 'The module name'),
-      new sfCommandArgument('model', sfCommandArgument::REQUIRED, 'The model class name'),
-    ));
-
-    $this->addOptions(array(
-      new sfCommandOption('theme', null, sfCommandOption::PARAMETER_REQUIRED, 'The theme name', 'default'),
-      new sfCommandOption('generate-in-cache', null, sfCommandOption::PARAMETER_NONE, 'Generate the module in cache'),
-      new sfCommandOption('non-verbose-templates', null, sfCommandOption::PARAMETER_NONE, 'Generate non verbose templates'),
-      new sfCommandOption('with-show', null, sfCommandOption::PARAMETER_NONE, 'Generate a show method'),
-      new sfCommandOption('singular', null, sfCommandOption::PARAMETER_REQUIRED, 'The singular name', null),
-      new sfCommandOption('plural', null, sfCommandOption::PARAMETER_REQUIRED, 'The plural name', null),
-      new sfCommandOption('route-prefix', null, sfCommandOption::PARAMETER_REQUIRED, 'The route prefix', null),
-      new sfCommandOption('with-propel-route', null, sfCommandOption::PARAMETER_NONE, 'Whether you will use a Propel route'),
-      new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
-      new sfCommandOption('actions-base-class', null, sfCommandOption::PARAMETER_REQUIRED, 'The base class for the actions', 'sfActions'),
-    ));
-
-    $this->namespace = 'propel';
-    $this->name = 'generate-module';
-    $this->briefDescription = 'Generates a Propel module';
-
-    $this->detailedDescription = <<<EOF
-The [propel:generate-module|INFO] task generates a Propel module:
-
-  [./symfony propel:generate-module frontend article Article|INFO]
-
-The task creates a [%module%|COMMENT] module in the [%application%|COMMENT] application
-for the model class [%model%|COMMENT].
-
-You can also create an empty module that inherits its actions and templates from
-a runtime generated module in [%sf_app_cache_dir%/modules/auto%module%|COMMENT] by
-using the [--generate-in-cache|COMMENT] option:
-
-  [./symfony propel:generate-module --generate-in-cache frontend article Article|INFO]
-
-The generator can use a customized theme by using the [--theme|COMMENT] option:
-
-  [./symfony propel:generate-module --theme="custom" frontend article Article|INFO]
-
-This way, you can create your very own module generator with your own conventions.
-
-You can also change the default actions base class (default to sfActions) of
-the generated modules:
-
-  [./symfony propel:generate-module --actions-base-class="ProjectActions" frontend article Article|INFO]
-EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $databaseManager = new sfDatabaseManager($this->configuration);
-
-    $properties = parse_ini_file(sfConfig::get('sf_config_dir').'/properties.ini', true);
-
-    $this->constants = array(
-      'PROJECT_NAME'   => isset($properties['symfony']['name']) ? $properties['symfony']['name'] : 'symfony',
-      'APP_NAME'       => $arguments['application'],
-      'MODULE_NAME'    => $arguments['module'],
-      'UC_MODULE_NAME' => ucfirst($arguments['module']),
-      'MODEL_CLASS'    => $arguments['model'],
-      'AUTHOR_NAME'    => isset($properties['symfony']['author']) ? $properties['symfony']['author'] : 'Your name here',
-    );
-
-    $method = $options['generate-in-cache'] ? 'executeInit' : 'executeGenerate';
-
-    // for backwarads compatibility symfony uses the model name as singular and plural form if none specified (#5640)
-    $options['singular']  = $options['singular'] ? $options['singular'] : $arguments['model'];
-    $options['plural']  = $options['plural'] ? $options['plural'] : $arguments['model'].'s';
-
-    $this->$method($arguments, $options);
-  }
-
-  protected function executeGenerate($arguments = array(), $options = array())
-  {
-    // generate module
-    $tmpDir = sfConfig::get('sf_cache_dir').DIRECTORY_SEPARATOR.'tmp'.DIRECTORY_SEPARATOR.md5(uniqid(rand(), true));
-    $generatorManager = new sfGeneratorManager($this->configuration, $tmpDir);
-    $generatorManager->generate('sfPropelGenerator', array(
-      'model_class'           => $arguments['model'],
-      'moduleName'            => $arguments['module'],
-      'theme'                 => $options['theme'],
-      'non_verbose_templates' => $options['non-verbose-templates'],
-      'with_show'             => $options['with-show'],
-      'singular'              => $options['singular'],
-      'plural'                => $options['plural'],
-      'route_prefix'          => $options['route-prefix'],
-      'with_propel_route'     => $options['with-propel-route'],
-      'actions_base_class'    => $options['actions-base-class'],
-    ));
-
-    $moduleDir = sfConfig::get('sf_app_module_dir').'/'.$arguments['module'];
-
-    // copy our generated module
-    $this->getFilesystem()->mirror($tmpDir.DIRECTORY_SEPARATOR.'auto'.ucfirst($arguments['module']), $moduleDir, sfFinder::type('any'));
-
-    if (!$options['with-show'])
-    {
-      $this->getFilesystem()->remove($moduleDir.'/templates/showSuccess.php');
-    }
-
-    // change module name
-    $finder = sfFinder::type('file')->name('*.php');
-    $this->getFilesystem()->replaceTokens($finder->in($moduleDir), '', '', array('auto'.ucfirst($arguments['module']) => $arguments['module']));
-
-    // customize php and yml files
-    $finder = sfFinder::type('file')->name('*.php', '*.yml');
-    $this->getFilesystem()->replaceTokens($finder->in($moduleDir), '##', '##', $this->constants);
-
-    // create basic test
-    $this->getFilesystem()->copy(sfConfig::get('sf_symfony_lib_dir').DIRECTORY_SEPARATOR.'task'.DIRECTORY_SEPARATOR.'generator'.DIRECTORY_SEPARATOR.'skeleton'.DIRECTORY_SEPARATOR.'module'.DIRECTORY_SEPARATOR.'test'.DIRECTORY_SEPARATOR.'actionsTest.php', sfConfig::get('sf_test_dir').DIRECTORY_SEPARATOR.'functional'.DIRECTORY_SEPARATOR.$arguments['application'].DIRECTORY_SEPARATOR.$arguments['module'].'ActionsTest.php');
-
-    // customize test file
-    $this->getFilesystem()->replaceTokens(sfConfig::get('sf_test_dir').DIRECTORY_SEPARATOR.'functional'.DIRECTORY_SEPARATOR.$arguments['application'].DIRECTORY_SEPARATOR.$arguments['module'].'ActionsTest.php', '##', '##', $this->constants);
-
-    // delete temp files
-    $this->getFilesystem()->remove(sfFinder::type('any')->in($tmpDir));
-  }
-
-  protected function executeInit($arguments = array(), $options = array())
-  {
-    $moduleDir = sfConfig::get('sf_app_module_dir').'/'.$arguments['module'];
-
-    // create basic application structure
-    $finder = sfFinder::type('any')->discard('.sf');
-    $dirs = $this->configuration->getGeneratorSkeletonDirs('sfPropelModule', $options['theme']);
-
-    foreach ($dirs as $dir)
-    {
-      if (is_dir($dir))
-      {
-        $this->getFilesystem()->mirror($dir, $moduleDir, $finder);
-        break;
-      }
-    }
-
-    // move configuration file
-    if (file_exists($config = $moduleDir.'/lib/configuration.php'))
-    {
-      if (file_exists($target = $moduleDir.'/lib/'.$arguments['module'].'GeneratorConfiguration.class.php'))
-      {
-        $this->getFilesystem()->remove($config);
-      }
-      else
-      {
-        $this->getFilesystem()->rename($config, $target);
-      }
-    }
-
-    // move helper file
-    if (file_exists($config = $moduleDir.'/lib/helper.php'))
-    {
-      if (file_exists($target = $moduleDir.'/lib/'.$arguments['module'].'GeneratorHelper.class.php'))
-      {
-        $this->getFilesystem()->remove($config);
-      }
-      else
-      {
-        $this->getFilesystem()->rename($config, $target);
-      }
-    }
-
-    // create basic test
-    $this->getFilesystem()->copy(sfConfig::get('sf_symfony_lib_dir').DIRECTORY_SEPARATOR.'task'.DIRECTORY_SEPARATOR.'generator'.DIRECTORY_SEPARATOR.'skeleton'.DIRECTORY_SEPARATOR.'module'.DIRECTORY_SEPARATOR.'test'.DIRECTORY_SEPARATOR.'actionsTest.php', sfConfig::get('sf_test_dir').DIRECTORY_SEPARATOR.'functional'.DIRECTORY_SEPARATOR.$arguments['application'].DIRECTORY_SEPARATOR.$arguments['module'].'ActionsTest.php');
-
-    // customize test file
-    $this->getFilesystem()->replaceTokens(sfConfig::get('sf_test_dir').DIRECTORY_SEPARATOR.'functional'.DIRECTORY_SEPARATOR.$arguments['application'].DIRECTORY_SEPARATOR.$arguments['module'].'ActionsTest.php', '##', '##', $this->constants);
-
-    // customize php and yml files
-    $finder = sfFinder::type('file')->name('*.php', '*.yml');
-    $this->constants['CONFIG'] = sprintf(<<<EOF
-    model_class:           %s
-    theme:                 %s
-    non_verbose_templates: %s
-    with_show:             %s
-    singular:              %s
-    plural:                %s
-    route_prefix:          %s
-    with_propel_route:     %s
-    actions_base_class:    %s
-EOF
-    ,
-      $arguments['model'],
-      $options['theme'],
-      $options['non-verbose-templates'] ? 'true' : 'false',
-      $options['with-show'] ? 'true' : 'false',
-      $options['singular'] ? $options['singular'] : '~',
-      $options['plural'] ? $options['plural'] : '~',
-      $options['route-prefix'] ? $options['route-prefix'] : '~',
-      $options['with-propel-route'] ? $options['with-propel-route'] : 'false',
-      $options['actions-base-class']
-    );
-    $this->getFilesystem()->replaceTokens($finder->in($moduleDir), '##', '##', $this->constants);
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelGraphvizTask.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelGraphvizTask.class.php
deleted file mode 100644
index 55312b09a..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelGraphvizTask.class.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php');
-
-/**
- * Generates a graphviz chart of current object model.
- *
- * @package    symfony
- * @subpackage propel
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelGraphvizTask.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
- */
-class sfPropelGraphvizTask extends sfPropelBaseTask
-{
-  /**
-   * @see BaseTask::configure()
-   */
-  protected function configure()
-  {
-    $this->addOptions(array(
-      new sfCommandOption('phing-arg', null, sfCommandOption::PARAMETER_REQUIRED | sfCommandOption::IS_ARRAY, 'Arbitrary phing argument'),
-    ));
-
-    $this->namespace = 'propel';
-    $this->name = 'graphviz';
-    $this->briefDescription = 'Generates a graphviz chart of current object model';
-    $this->detailedDescription = <<<EOF
-The [propel:graphviz|INFO] task creates a graphviz DOT
-visualization for automatic graph drawing of object model:
-
-  [./symfony propel:graphviz|INFO]
-EOF;
-  }
-
-  /**
-   * @see BaseTask::execute()
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $this->schemaToXML(self::DO_NOT_CHECK_SCHEMA, 'generated-');
-    $this->copyXmlSchemaFromPlugins('generated-');
-    $ret = $this->callPhing('graphviz', self::CHECK_SCHEMA);
-    $this->cleanup();
-
-    return !$ret;
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelInsertSqlTask.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelInsertSqlTask.class.php
deleted file mode 100644
index 3ba6af592..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelInsertSqlTask.class.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php');
-
-/**
- * Inserts SQL for current model.
- *
- * @package    symfony
- * @subpackage propel
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelInsertSqlTask.class.php 23922 2009-11-14 14:58:38Z fabien $
- */
-class sfPropelInsertSqlTask extends sfPropelBaseTask
-{
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->addOptions(array(
-      new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
-      new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'cli'),
-      new sfCommandOption('connection', null, sfCommandOption::PARAMETER_REQUIRED, 'The connection name', null),
-      new sfCommandOption('no-confirmation', null, sfCommandOption::PARAMETER_NONE, 'Do not ask for confirmation'),
-      new sfCommandOption('phing-arg', null, sfCommandOption::PARAMETER_REQUIRED | sfCommandOption::IS_ARRAY, 'Arbitrary phing argument'),
-    ));
-
-    $this->namespace = 'propel';
-    $this->name = 'insert-sql';
-    $this->briefDescription = 'Inserts SQL for current model';
-
-    $this->detailedDescription = <<<EOF
-The [propel:insert-sql|INFO] task creates database tables:
-
-  [./symfony propel:insert-sql|INFO]
-
-The task connects to the database and executes all SQL statements
-found in [config/sql/*schema.sql|COMMENT] files.
-
-Before execution, the task will ask you to confirm the execution
-as it deletes all data in your database.
-
-To bypass the confirmation, you can pass the [--no-confirmation|COMMENT]
-option:
-
-  [./symfony propel:insert-sql --no-confirmation|INFO]
-
-The task read the database configuration from `databases.yml`.
-You can use a specific application/environment by passing
-an [--application|INFO] or [--env|INFO] option.
-
-You can also use the [--connection|INFO] option if you want to
-only load SQL statements for a given connection.
-EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $this->schemaToXML(self::DO_NOT_CHECK_SCHEMA, 'generated-');
-    $this->copyXmlSchemaFromPlugins('generated-');
-
-    $databaseManager = new sfDatabaseManager($this->configuration);
-
-    $properties = $this->getProperties(sfConfig::get('sf_data_dir').'/sql/sqldb.map');
-    $sqls = array();
-    foreach ($properties as $file => $connection)
-    {
-      if (null !== $options['connection'] && $options['connection'] != $connection)
-      {
-        continue;
-      }
-
-      if (!isset($sqls[$connection]))
-      {
-        $sqls[$connection] = array();
-      }
-
-      $sqls[$connection][] = $file;
-    }
-
-    if (
-      !$options['no-confirmation']
-      &&
-      !$this->askConfirmation(array(
-          'WARNING: The data in the database'.(count($sqls) > 1 ? 's' : '').' related to the connection name'.(count($sqls) > 1 ? 's' : ''),
-          sprintf('         %s will be removed.', implode(', ', array_keys($sqls))),
-          '',
-          'Are you sure you want to proceed? (y/N)',
-        ), 'QUESTION_LARGE', false)
-    )
-    {
-      $this->logSection('propel', 'Task aborted.');
-
-      return 1;
-    }
-
-    $this->tmpDir = sys_get_temp_dir().'/propel_insert_sql_'.rand(11111, 99999);
-    register_shutdown_function(array($this, 'removeTmpDir'));
-    mkdir($this->tmpDir, 0777, true);
-    foreach ($sqls as $connection => $files)
-    {
-      $dir = $this->tmpDir.'/'.$connection;
-      mkdir($dir, 0777, true);
-
-      $content = '';
-      foreach ($files as $file)
-      {
-        $content .= "$file=$connection\n";
-        copy(sfConfig::get('sf_data_dir').'/sql/'.$file, $dir.'/'.$file);
-      }
-
-      file_put_contents($dir.'/sqldb.map', $content);
-      $properties = $this->getPhingPropertiesForConnection($databaseManager, $connection);
-      $properties['propel.sql.dir'] = $dir;
-
-      $ret = $this->callPhing('insert-sql', self::CHECK_SCHEMA, $properties);
-    }
-    $this->removeTmpDir();
-
-    $this->cleanup();
-
-    return !$ret;
-  }
-
-  public function removeTmpDir()
-  {
-    if (!is_dir($this->tmpDir))
-    {
-      return;
-    }
-
-    sfToolkit::clearDirectory($this->tmpDir);
-    rmdir($this->tmpDir);
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelSchemaToXmlTask.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelSchemaToXmlTask.class.php
deleted file mode 100644
index 965f85574..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelSchemaToXmlTask.class.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php');
-
-/**
- * Creates schema.yml from schema.xml.
- *
- * @package    symfony
- * @subpackage propel
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelSchemaToXmlTask.class.php 23922 2009-11-14 14:58:38Z fabien $
- */
-class sfPropelSchemaToXmlTask extends sfPropelBaseTask
-{
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->namespace = 'propel';
-    $this->name = 'schema-to-xml';
-    $this->briefDescription = 'Creates schema.xml from schema.yml';
-
-    $this->detailedDescription = <<<EOF
-The [propel:schema-to-xml|INFO] task converts YML schemas to XML:
-
-  [./symfony propel:schema-to-xml|INFO]
-EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $this->schemaToXML(self::CHECK_SCHEMA);
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelSchemaToYmlTask.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelSchemaToYmlTask.class.php
deleted file mode 100644
index f532e9aed..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/task/sfPropelSchemaToYmlTask.class.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/sfPropelBaseTask.class.php');
-
-/**
- * Creates schema.yml from schema.xml.
- *
- * @package    symfony
- * @subpackage propel
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPropelSchemaToYmlTask.class.php 23922 2009-11-14 14:58:38Z fabien $
- */
-class sfPropelSchemaToYmlTask extends sfPropelBaseTask
-{
-  /**
-   * @see sfTask
-   */
-  protected function configure()
-  {
-    $this->namespace = 'propel';
-    $this->name = 'schema-to-yml';
-    $this->briefDescription = 'Creates schema.yml from schema.xml';
-
-    $this->detailedDescription = <<<EOF
-The [propel:schema-to-yml|INFO] task converts XML schemas to YML:
-
-  [./symfony propel:schema-to-yml|INFO]
-EOF;
-  }
-
-  /**
-   * @see sfTask
-   */
-  protected function execute($arguments = array(), $options = array())
-  {
-    $this->schemaToYML(self::CHECK_SCHEMA);
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/test/sfTesterPropel.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/test/sfTesterPropel.class.php
deleted file mode 100644
index 081d1c96a..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/test/sfTesterPropel.class.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * sfTesterPropel implements tests for Propel classes.
- *
- * @package    symfony
- * @subpackage test
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfTesterPropel.class.php 21908 2009-09-11 12:06:21Z fabien $
- */
-class sfTesterPropel extends sfTester
-{
-  /**
-   * Prepares the tester.
-   */
-  public function prepare()
-  {
-  }
-
-  /**
-   * Initializes the tester.
-   */
-  public function initialize()
-  {
-  }
-
-  /**
-   * Tests a model.
-   *
-   * @param string         $model    The model class name
-   * @param array|Criteria $criteria A Criteria object or an array of conditions
-   * @param string         $value    The value to test
-   *
-   * @return sfTestFunctionalBase|sfTester
-   */
-  public function check($model, $criteria, $value = true)
-  {
-    if (null === $criteria)
-    {
-      $criteria = new Criteria();
-    }
-
-    if (is_array($criteria))
-    {
-      $conditions = $criteria;
-      $criteria = new Criteria();
-      foreach ($conditions as $column => $condition)
-      {
-        $column = call_user_func(array(constant($model.'::PEER'), 'translateFieldName'), $column, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_COLNAME);
-        $operator = Criteria::EQUAL;
-        if ('!' == $condition[0])
-        {
-          $operator = false !== strpos($condition, '%') ? Criteria::NOT_LIKE : Criteria::NOT_EQUAL;
-          $condition = substr($condition, 1);
-        }
-        else if (false !== strpos($condition, '%'))
-        {
-          $operator = Criteria::LIKE;
-        }
-
-        $criteria->add($column, $condition, $operator);
-      }
-    }
-
-    $objects = call_user_func(array(constant($model.'::PEER'), 'doSelect'), $criteria);
-
-    if (false === $value)
-    {
-      $this->tester->is(count($objects), 0, sprintf('no %s object that matches the criteria has been found', $model));
-    }
-    else if (true === $value)
-    {
-      $this->tester->cmp_ok(count($objects), '>', 0, sprintf('%s objects that matches the criteria have been found', $model));
-    }
-    else if (is_int($value))
-    {
-      $this->tester->is(count($objects), $value, sprintf('"%s" %s objects have been found', $value, $model));
-    }
-    else
-    {
-      throw new InvalidArgumentException('The "check()" method does not takes this kind of argument.');
-    }
-
-    return $this->getObjectToReturn();
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/validator/sfValidatorPropelChoice.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/validator/sfValidatorPropelChoice.class.php
deleted file mode 100644
index f433555e2..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/validator/sfValidatorPropelChoice.class.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * sfValidatorPropelChoice validates that the value is one of the rows of a table.
- *
- * @package    symfony
- * @subpackage validator
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorPropelChoice.class.php 28632 2010-03-20 14:13:37Z Kris.Wallsmith $
- */
-class sfValidatorPropelChoice extends sfValidatorBase
-{
-  /**
-   * Configures the current validator.
-   *
-   * Available options:
-   *
-   *  * model:      The model class (required)
-   *  * criteria:   A criteria to use when retrieving objects
-   *  * column:     The column name (null by default which means we use the primary key)
-   *                must be in field name format
-   *  * connection: The Propel connection to use (null by default)
-   *  * multiple:   true if the select tag must allow multiple selections
-   *  * min:        The minimum number of values that need to be selected (this option is only active if multiple is true)
-   *  * max:        The maximum number of values that need to be selected (this option is only active if multiple is true)
-   *
-   * @see sfValidatorBase
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-    $this->addRequiredOption('model');
-    $this->addOption('criteria', null);
-    $this->addOption('column', null);
-    $this->addOption('connection', null);
-    $this->addOption('multiple', false);
-    $this->addOption('min');
-    $this->addOption('max');
-
-    $this->addMessage('min', 'At least %min% values must be selected (%count% values selected).');
-    $this->addMessage('max', 'At most %max% values must be selected (%count% values selected).');
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  protected function doClean($value)
-  {
-    $criteria = null === $this->getOption('criteria') ? new Criteria() : clone $this->getOption('criteria');
-
-    if ($this->getOption('multiple'))
-    {
-      if (!is_array($value))
-      {
-        $value = array($value);
-      }
-
-      $count = count($value);
-
-      if ($this->hasOption('min') && $count < $this->getOption('min'))
-      {
-        throw new sfValidatorError($this, 'min', array('count' => $count, 'min' => $this->getOption('min')));
-      }
-
-      if ($this->hasOption('max') && $count > $this->getOption('max'))
-      {
-        throw new sfValidatorError($this, 'max', array('count' => $count, 'max' => $this->getOption('max')));
-      }
-
-      $criteria->addAnd($this->getColumn(), $value, Criteria::IN);
-
-      $dbcount = call_user_func(array(constant($this->getOption('model').'::PEER'), 'doCount'), $criteria, false, $this->getOption('connection'));
-
-      if ($dbcount != $count)
-      {
-        throw new sfValidatorError($this, 'invalid', array('value' => $value));
-      }
-    }
-    else
-    {
-      $criteria->addAnd($this->getColumn(), $value);
-
-      $dbcount = call_user_func(array(constant($this->getOption('model').'::PEER'), 'doCount'), $criteria, false, $this->getOption('connection'));
-
-      if (0 === $dbcount)
-      {
-        throw new sfValidatorError($this, 'invalid', array('value' => $value));
-      }
-    }
-
-    return $value;
-  }
-
-  /**
-   * Returns the column to use for comparison.
-   *
-   * The primary key is used by default.
-   *
-   * @return string The column name
-   */
-  protected function getColumn()
-  {
-    if ($this->getOption('column'))
-    {
-      $columnName = $this->getOption('column');
-      $from = BasePeer::TYPE_FIELDNAME;
-    }
-    else
-    {
-      $map = call_user_func(array(constant($this->getOption('model').'::PEER'), 'getTableMap'));
-      foreach ($map->getColumns() as $column)
-      {
-        if ($column->isPrimaryKey())
-        {
-          $columnName = $column->getPhpName();
-          break;
-        }
-      }
-      $from = BasePeer::TYPE_PHPNAME;
-    }
-
-    return call_user_func(array(constant($this->getOption('model').'::PEER'), 'translateFieldName'), $columnName, $from, BasePeer::TYPE_COLNAME);
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/validator/sfValidatorPropelUnique.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/validator/sfValidatorPropelUnique.class.php
deleted file mode 100644
index b68b8b24b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/validator/sfValidatorPropelUnique.class.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * sfValidatorPropelUnique validates that the uniqueness of a column.
- *
- * Warning: sfValidatorPropelUnique is susceptible to race conditions.
- * To avoid this issue, wrap the validation process and the model saving
- * inside a transaction.
- *
- * @package    symfony
- * @subpackage validator
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorPropelUnique.class.php 27940 2010-02-12 13:31:30Z Kris.Wallsmith $
- */
-class sfValidatorPropelUnique extends sfValidatorSchema
-{
-  /**
-   * Constructor.
-   *
-   * @param array  $options   An array of options
-   * @param array  $messages  An array of error messages
-   *
-   * @see sfValidatorSchema
-   */
-  public function __construct($options = array(), $messages = array())
-  {
-    parent::__construct(null, $options, $messages);
-  }
-
-  /**
-   * Configures the current validator.
-   *
-   * Available options:
-   *
-   *  * model:              The model class (required)
-   *  * column:             The unique column name in Propel field name format (required)
-   *                        If the uniqueness is for several columns, you can pass an array of field names
-   *  * field               Field name used by the form, other than the column name
-   *  * primary_key:        The primary key column name in Propel field name format (optional, will be introspected if not provided)
-   *                        You can also pass an array if the table has several primary keys
-   *  * connection:         The Propel connection to use (null by default)
-   *  * throw_global_error: Whether to throw a global error (false by default) or an error tied to the first field related to the column option array
-   *
-   * @see sfValidatorBase
-   */
-  protected function configure($options = array(), $messages = array())
-  {
-    $this->addRequiredOption('model');
-    $this->addRequiredOption('column');
-    $this->addOption('field', null);
-    $this->addOption('primary_key', null);
-    $this->addOption('connection', null);
-    $this->addOption('throw_global_error', false);
-
-    $this->setMessage('invalid', 'An object with the same "%column%" already exist.');
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  protected function doClean($values)
-  {
-    if (!is_array($values))
-    {
-      throw new InvalidArgumentException('You must pass an array parameter to the clean() method (this validator can only be used as a post validator).');
-    }
-
-    if (!is_array($this->getOption('column')))
-    {
-      $this->setOption('column', array($this->getOption('column')));
-    }
-    $columns = $this->getOption('column');
-
-    if (!is_array($field = $this->getOption('field')))
-    {
-      $this->setOption('field', $field ? array($field) : array());
-    }
-    $fields = $this->getOption('field');
-
-    $criteria = new Criteria();
-    foreach ($columns as $i => $column)
-    {
-      $name = isset($fields[$i]) ? $fields[$i] : $column;
-      if (!array_key_exists($name, $values))
-      {
-        // one of the columns has be removed from the form
-        return $values;
-      }
-
-      $colName = call_user_func(array(constant($this->getOption('model').'::PEER'), 'translateFieldName'), $column, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_COLNAME);
-
-      $criteria->add($colName, $values[$name]);
-    }
-
-    $object = call_user_func(array(constant($this->getOption('model').'::PEER'), 'doSelectOne'), $criteria, $this->getOption('connection'));
-
-    // if no object or if we're updating the object, it's ok
-    if (null === $object || $this->isUpdate($object, $values))
-    {
-      return $values;
-    }
-
-    $error = new sfValidatorError($this, 'invalid', array('column' => implode(', ', $this->getOption('column'))));
-
-    if ($this->getOption('throw_global_error'))
-    {
-      throw $error;
-    }
-
-    throw new sfValidatorErrorSchema($this, array(isset($fields[0]) ? $fields[0] : $columns[0] => $error));
-  }
-
-  /**
-   * Returns whether the object is being updated.
-   *
-   * @param BaseObject  $object   A Propel object
-   * @param array       $values   An array of values
-   *
-   * @return Boolean     true if the object is being updated, false otherwise
-   */
-  protected function isUpdate(BaseObject $object, $values)
-  {
-    // check each primary key column
-    foreach ($this->getPrimaryKeys() as $column)
-    {
-      $columnPhpName = call_user_func(array(constant($this->getOption('model').'::PEER'), 'translateFieldName'), $column, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_PHPNAME);
-      $method = 'get'.$columnPhpName;
-      if (!isset($values[$column]) or $object->$method() != $values[$column])
-      {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  /**
-   * Returns the primary keys for the model.
-   *
-   * @return array An array of primary keys
-   */
-  protected function getPrimaryKeys()
-  {
-    if (null === $this->getOption('primary_key'))
-    {
-      $primaryKeys = array();
-      $tableMap = call_user_func(array(constant($this->getOption('model').'::PEER'), 'getTableMap'));
-      foreach ($tableMap->getColumns() as $column)
-      {
-        if (!$column->isPrimaryKey())
-        {
-          continue;
-        }
-
-        $primaryKeys[] = call_user_func(array(constant($this->getOption('model').'::PEER'), 'translateFieldName'), $column->getPhpName(), BasePeer::TYPE_PHPNAME, BasePeer::TYPE_FIELDNAME);
-      }
-
-      $this->setOption('primary_key', $primaryKeys);
-    }
-
-    if (!is_array($this->getOption('primary_key')))
-    {
-      $this->setOption('primary_key', array($this->getOption('primary_key')));
-    }
-
-    return $this->getOption('primary_key');
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/BuildEvent.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/BuildEvent.php
deleted file mode 100644
index 2562a4930..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/BuildEvent.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/*
- *  $Id: BuildEvent.php 173 2007-03-12 20:34:30Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/system/lang/EventObject.php';
-
-/**
- * Encapsulates a build specific event.
- *
- * <p>We have three sources of events all handled by this class:
- * 
- * <ul>
- *  <li>Project level events</li>
- *  <li>Target level events</li>
- *  <li>Task level events</li>
- * </ul>
- *
- * <p> Events are all fired from the project class by creating an event object
- * using this class and passing it to the listeners.
- *
- * @author    Andreas Aderhold <andi@binarycloud.com>
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.10 $
- * @package   phing
- */
-class BuildEvent extends EventObject {
-
-    /**
-     * A reference to the project
-     * @var Project
-     */
-    protected $project;
-
-    /**
-     * A reference to the target
-     * @var Target
-     */
-    protected $target;
-
-    /**
-     * A reference to the task
-     *
-     * @var Task
-     */
-    protected $task;
-
-    /**
-     * The message of this event, if the event is a message
-     * @var string
-     */
-    protected $message = null;
-
-    /**
-     * The priority of the message
-     *
-     * @var    string
-     * @see    $message
-     */
-    protected $priority = Project::MSG_VERBOSE;
-
-    /**
-     * The execption that caused the event, if any
-     *
-     * @var    object
-     */
-    protected $exception = null;
-
-    /**
-     * Construct a BuildEvent for a project, task or target source event
-     *
-     * @param  object  project the project that emitted the event.
-     */
-    public function __construct($source) {
-        parent::__construct($source);
-        if ($source instanceof Project) {
-            $this->project = $source;
-            $this->target = null;
-            $this->task = null;
-        } elseif ($source instanceof Target) {
-            $this->project = $source->getProject();
-            $this->target = $source;
-            $this->task = null;
-        } elseif ($source instanceof Task) {
-            $this->project = $source->getProject();
-            $this->target = $source->getOwningTarget();
-            $this->task = $source;
-        } else {
-            throw new Exception("Can not construct BuildEvent, unknown source given.");
-        }
-    }
-
-    /**
-     * Sets the message with details and the message priority for this event.
-     *
-     * @param  string   The string message of the event
-     * @param  integer  The priority this message should have
-     */
-    public function setMessage($message, $priority) {
-        $this->message = (string) $message;
-        $this->priority = (int) $priority;
-    }
-
-    /**
-     * Set the exception that was the cause of this event.
-     *
-     * @param  Exception The exception that caused the event
-     */
-    public function setException($exception) {
-        $this->exception = $exception;
-    }
-
-    /**
-     * Returns the project instance that fired this event.
-     *
-     * The reference to the project instance is set by the constructor if this
-     * event was fired from the project class.
-     *
-     * @return  Project  The project instance that fired this event
-     */
-    public function getProject() {
-        return $this->project;
-    }
-
-    /**
-     * Returns the target instance that fired this event.
-     *
-     * The reference to the target instance is set by the constructor if this
-     * event was fired from the target class.
-     *
-     * @return Target The target that fired this event
-     */
-    public function getTarget() {
-        return $this->target;
-    }
-
-    /**
-     * Returns the target instance that fired this event.
-     *
-     * The reference to the task instance is set by the constructor if this
-     * event was fired within a task.
-     *
-     * @return Task The task that fired this event
-     */
-    public function getTask() {
-        return $this->task;
-    }
-
-    /**
-     * Returns the logging message. This field will only be set for
-     * "messageLogged" events.
-     *
-     * @return string The log message
-     */
-    function getMessage() {
-        return $this->message;
-    }
-
-    /**
-     * Returns the priority of the logging message. This field will only
-     * be set for "messageLogged" events.
-     *
-     * @return integer The message priority
-     */
-    function getPriority() {
-        return $this->priority;
-    }
-
-    /**
-     * Returns the exception that was thrown, if any.
-     * This field will only be set for "taskFinished", "targetFinished", and
-     * "buildFinished" events.
-     *
-     * @see BuildListener::taskFinished()
-     * @see BuildListener::targetFinished()
-     * @see BuildListener::buildFinished()
-     * @return Exception
-     */
-    public function getException() {
-        return $this->exception;
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/BuildException.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/BuildException.php
deleted file mode 100644
index 12fdaeea6..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/BuildException.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-/*
- *  $Id: BuildException.php 287 2007-11-04 14:59:39Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-/**
- * BuildException is for when things go wrong in a build execution.
- *
- * @author   Andreas Aderhold <andi@binarycloud.com>
- * @version  $Revision: 1.12 $
- * @package  phing
- */
-class BuildException extends Exception {
-
-    /**
-	 * Location in the xml file.
-	 * @var Location
-	 */
-    protected $location;
-            
-    /**
-	 * The nested "cause" exception.
-	 * @var Exception
-	 */
-    protected $cause;
-    
-    /**
-     * Construct a BuildException.
-     * Supported signatures:
-     *         throw new BuildException($causeExc);
-     *         throw new BuildException($msg);
-     *         throw new Buildexception($causeExc, $loc);
-     *         throw new BuildException($msg, $causeExc);
-     *         throw new BuildException($msg, $loc);
-     *         throw new BuildException($msg, $causeExc, $loc);
-     */
-    function __construct($p1, $p2 = null, $p3 = null) {        
-        
-        $cause = null;
-        $loc = null;
-        $msg = "";
-        
-        if ($p3 !== null) {
-            $cause = $p2;
-            $loc = $p3;
-            $msg = $p1;
-        } elseif ($p2 !== null) {
-            if ($p2 instanceof Exception) {
-                $cause = $p2;
-                $msg = $p1;
-            } elseif ($p2 instanceof Location) {
-                $loc = $p2;
-                if ($p1 instanceof Exception) {
-                    $cause = $p1;
-                } else {
-                    $msg = $p1;
-                }
-            }
-        } elseif ($p1 instanceof Exception) {
-            $cause = $p1;
-        } else {
-            $msg = $p1;
-        }
-        
-        parent::__construct($msg);
-        
-        if ($cause !== null) {
-            $this->cause = $cause;
-            $this->message .= " [wrapped: " . $cause->getMessage() ."]";
-        }
-        
-        if ($loc !== null) {
-            $this->setLocation($loc);
-        }                
-    }
-    
-    /**
-     * Gets the cause exception.
-     *
-     * @return Exception
-     */
-    public function getCause() {
-        return $this->cause;
-    }
-    
-    /**
-     * Gets the location of error in XML file.
-     *
-     * @return Location
-     */
-    public function getLocation() {
-        return $this->location;
-    }
-
-    /**
-     * Sets the location of error in XML file.
-     *
-     * @param Locaiton $loc
-     */
-    public function setLocation(Location $loc) {        
-        $this->location = $loc;
-        $this->message = $loc->toString() . ': ' . $this->message;
-    }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/BuildListener.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/BuildListener.php
deleted file mode 100644
index 87a06e714..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/BuildListener.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/*
- *  $Id: BuildListener.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-/**
- * Interface for build listeners.
- *
- * Classes that implement a listener must extend this class and (faux)implement
- * all methods that are decleard as dummies below.
- *
- * @author    Andreas Aderhold <andi@binarycloud.com>
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.6 $
- * @see       BuildEvent
- * @see       Project::addBuildListener()
- * @package   phing
- */
-interface BuildListener {
-
-    /**
-     * Fired before any targets are started.
-     *
-     * @param BuildEvent The BuildEvent
-     */
-    function buildStarted(BuildEvent $event);
-
-    /**
-     * Fired after the last target has finished.
-     *
-     * @param BuildEvent The BuildEvent
-     * @see BuildEvent::getException()
-     */
-    function buildFinished(BuildEvent $event);
-
-    /**
-     * Fired when a target is started.
-     *
-     * @param BuildEvent The BuildEvent
-     * @see BuildEvent::getTarget()
-     */
-    function targetStarted(BuildEvent $event);
-
-    /**
-     * Fired when a target has finished.
-     *
-     * @param BuildEvent The BuildEvent
-     * @see BuildEvent#getException()
-     */
-    function targetFinished(BuildEvent $event);
-
-    /**
-     * Fired when a task is started.
-     *
-     * @param BuildEvent The BuildEvent
-     * @see BuildEvent::getTask()
-     */
-    function taskStarted(BuildEvent $event);
-
-    /**
-     *  Fired when a task has finished.
-     *
-     *  @param BuildEvent The BuildEvent
-     *  @see BuildEvent::getException()
-     */
-    function taskFinished(BuildEvent $event);
-
-    /**
-     *  Fired whenever a message is logged.
-     *
-     *  @param BuildEvent The BuildEvent
-     *  @see BuildEvent::getMessage()
-     */
-    function messageLogged(BuildEvent $event);
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/BuildLogger.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/BuildLogger.php
deleted file mode 100755
index 65130d601..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/BuildLogger.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/*
- *  $Id: BuildLogger.php 147 2007-02-06 20:32:22Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/BuildListener.php';
-
-/**
- * Interface for build loggers.
- * 
- * Build loggers are build listeners but with some additional functionality:
- *   - They can be configured with a log level (below which they will ignore messages)
- *   - They have error and output streams 
- *
- * Classes that implement a listener must implement this interface.
- *
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.6 $
- * @see       BuildEvent
- * @see       Project::addBuildListener()
- * @package   phing
- */
-interface BuildLogger extends BuildListener {
-
-	/**
-	 * Sets the min log level that this logger should respect.
-	 * 
-	 * Messages below this level are ignored.
-	 *
-     * Constants for the message levels are in Project.php. The order of
-     * the levels, from least to most verbose, is:
-     *   - Project::MSG_ERR
-     *   - Project::MSG_WARN
-     *   - Project::MSG_INFO
-     *   - Project::MSG_VERBOSE
-     *   - Project::MSG_DEBUG
-     *
-	 * @param int $level The log level integer (e.g. Project::MSG_VERBOSE, etc.).
-	 */
-    public function setMessageOutputLevel($level);
-
-    /**
-     * Sets the standard output stream to use.
-     * @param OutputStream $output Configured output stream (e.g. STDOUT) for standard output. 
-     */
-    public function setOutputStream(OutputStream $output);
-
-    /**
-     * Sets the output stream to use for errors.
-     * @param OutputStream $err Configured output stream (e.g. STDERR) for errors.
-     */
-    public function setErrorStream(OutputStream $err);
-
-}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/ConfigurationException.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/ConfigurationException.php
deleted file mode 100644
index 1574f5cc6..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/ConfigurationException.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/*
- *  $Id: BuildException.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-/**
- * ConfigurationException is thrown by Phing during the configuration and setup phase of the project.
- *
- * @author   Hans Lellelid <hans@xmpl.org>
- * @version  $Revision$
- * @package  phing
- */
-class ConfigurationException extends Exception {
-
-    /**
-	 * Location in the xml file.
-	 * @var Location
-	 */
-    protected $location;
-
-    /**
-	 * The nested "cause" exception.
-	 * @var Exception
-	 */
-    protected $cause;
-
-    /**
-     * Construct a BuildException.
-     * Supported signatures:
-     *         throw new BuildException($causeExc);
-     *         throw new BuildException($msg);
-     *         throw new BuildException($msg, $causeExc);
-     */
-    function __construct($p1, $p2 = null, $p3 = null) {
-
-    	$cause = null;
-    	$msg = "";
-
-    	if ($p2 !== null) {
-    		if ($p2 instanceof Exception) {
-    			$cause = $p2;
-    			$msg = $p1;
-    		}
-    	} elseif ($p1 instanceof Exception) {
-    		$cause = $p1;
-    	} else {
-    		$msg = $p1;
-    	}
-
-    	parent::__construct($msg);
-
-    	if ($cause !== null) {
-    		$this->cause = $cause;
-    		$this->message .= " [wrapped: " . $cause->getMessage() ."]";
-    	}
-    }
-	
-    /**
-     * Gets the cause exception.
-     *
-     * @return Exception
-     */
-    public function getCause() {
-    	return $this->cause;
-    }
-     
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/IntrospectionHelper.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/IntrospectionHelper.php
deleted file mode 100644
index e214b8447..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/IntrospectionHelper.php
+++ /dev/null
@@ -1,542 +0,0 @@
-<?php
-
-/*
- *  $Id: IntrospectionHelper.php 144 2007-02-05 15:19:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-include_once 'phing/types/Reference.php';
-include_once 'phing/types/Path.php';
-include_once 'phing/util/StringHelper.php';
-
-/**
- * Helper class that collects the methods that a task or nested element
- * holds to set attributes, create nested elements or hold PCDATA
- * elements.
- *
- *<ul>
- * <li><strong>SMART-UP INLINE DOCS</strong></li>
- * <li><strong>POLISH-UP THIS CLASS</strong></li>
- *</ul>
- *
- * @author    Andreas Aderhold <andi@binarycloud.com>
- * @author    Hans Lellelid <hans@xmpl.org>
- * @copyright � 2001,2002 THYRELL. All rights reserved
- * @version   $Revision: 1.19 $
- * @package   phing
- */
-class IntrospectionHelper {
-
-
-
-    /** 
-     * Holds the attribute setter methods.
-     * 
-     * @var array string[]
-     */
-    private $attributeSetters = array();
-
-    /**  
-     * Holds methods to create nested elements. 
-     *
-     * @var array string[]
-     */
-    private $nestedCreators = array();
-
-    /**
-     * Holds methods to store configured nested elements. 
-     *
-     * @var array string[]
-     */
-    private $nestedStorers = array();
-    
-    /**
-     * Map from attribute names to nested types.
-     */
-    private $nestedTypes = array();
-        
-    /**
-     * New idea in phing: any class can register certain
-     * keys -- e.g. "task.current_file" -- which can be used in
-     * task attributes, if supported.  In the build XML these
-     * are referred to like this:
-     *         <regexp pattern="\n" replace="%{task.current_file}"/>
-     * In the type/task a listener method must be defined:
-     *         function setListeningReplace($slot) {}
-     * @var array string[]
-      */
-    private $slotListeners = array();
-    
-    /** 
-     * The method to add PCDATA stuff. 
-     *
-     * @var string Method name of the addText (redundant?) method, if class supports it :)
-     */
-    private $methodAddText = null;
-
-    /**
-     * The Class that's been introspected.
-     *
-     * @var     object
-     * @access  private
-     */
-    private $bean;
-    
-    /**
-     * The cache of IntrospectionHelper classes instantiated by getHelper().
-     * @var array IntrospectionHelpers[]
-     */
-    private static $helpers = array();
-    
-    /** 
-     * Factory method for helper objects. 
-     *
-     * @param string $class The class to create a Helper for
-     */
-    public static function getHelper($class) {
-        if (!isset(self::$helpers[$class])) {
-            self::$helpers[$class] = new IntrospectionHelper($class);
-        }
-        return self::$helpers[$class];
-    }
-
-    /**
-     * This function constructs a new introspection helper for a specific class.
-     * 
-     * This method loads all methods for the specified class and categorizes them
-     * as setters, creators, slot listeners, etc.  This way, the setAttribue() doesn't
-     * need to perform any introspection -- either the requested attribute setter/creator
-     * exists or it does not & a BuildException is thrown.
-     * 
-     * @param string $bean The classname for this IH.
-     */
-    function __construct($class) {
-    
-        $this->bean = new ReflectionClass($class);
-        
-        //$methods = get_class_methods($bean);
-        foreach($this->bean->getMethods() as $method) {
-        
-            if ($method->isPublic()) {                
-            
-                // We're going to keep case-insensitive method names
-                // for as long as we're allowed :)  It makes it much
-                // easier to map XML attributes to PHP class method names.
-                $name = strtolower($method->getName());
-                
-                // There are a few "reserved" names that might look like attribute setters
-                // but should actually just be skipped.  (Note: this means you can't ever
-                // have an attribute named "location" or "tasktype" or a nested element named "task".)
-                if ($name === "setlocation" || $name === "settasktype" || $name === "addtask") {
-                    continue;
-                }
-                
-                if ($name === "addtext") {
-                    
-                    $this->methodAddText = $method;
-                    
-                } elseif (strpos($name, "setlistening") === 0) {
-                    
-                    // Phing supports something unique called "RegisterSlots"
-                    // These are dynamic values that use a basic slot system so that
-                    // classes can register to listen to specific slots, and the value
-                    // will always be grabbed from the slot (and never set in the project
-                    // component).  This is useful for things like tracking the current
-                    // file being processed by a filter (e.g. AppendTask sets an append.current_file
-                    // slot, which can be ready by the XSLTParam type.)
-                    
-                    if (count($method->getParameters()) !== 1) {
-                        throw new BuildException($method->getDeclaringClass()->getName()."::".$method->getName()."() must take exactly one parameter.");
-                    }
-                                                
-                    $this->slotListeners[$name] = $method;
-                    
-                } elseif (strpos($name, "set") === 0) {
-                    
-                    // A standard attribute setter.
-                    
-                    if (count($method->getParameters()) !== 1) {
-                        throw new BuildException($method->getDeclaringClass()->getName()."::".$method->getName()."() must take exactly one parameter.");
-                    }
-                    
-                    $this->attributeSetters[$name] = $method;
-                    
-                } elseif (strpos($name, "create") === 0) {                            
-                    
-                    if (count($method->getParameters()) > 0) {
-                        throw new BuildException($method->getDeclaringClass()->getName()."::".$method->getName()."() may not take any parameters.");
-                    }
-                    
-                    // Because PHP doesn't support return types, we are going to do
-                    // two things here to guess return type:
-                    //     1) parse comments for an explicit value
-                    //     2) if that fails, assume that the part of the method after "create"
-                    //    is the name of the return type (in many cases it is not)
-                    
-                    // This isn't super important -- i.e. we're not instantaiting classes
-                    // based on this information.  It's more just so that IntrospectionHelper
-                    // can keep track of all the nested types -- and provide more helpful
-                    // exception messages, etc.
-                                
-                    preg_match('/@return[\s]+([\w]+)/', $method->getDocComment(), $matches);
-                    if (!empty($matches[1]) && class_exists($matches[1], false)) {
-                        $this->nestedTypes[$name] = $matches[1];
-                    } else {                    
-                        // assume that method createEquals() creates object of type "Equals"
-                        // (that example would be false, of course)                    
-                        $this->nestedTypes[$name] = $this->getPropertyName($name, "create");
-                    }
-                    
-                    $this->nestedCreators[$name] = $method;
-                    
-                } elseif (strpos($name, "addconfigured") === 0) {
-                    
-                    // *must* use class hints if using addConfigured ...
-                    
-                    // 1 param only
-                    $params = $method->getParameters();
-                    
-                    if (count($params) < 1) {
-                        throw new BuildException($method->getDeclaringClass()->getName()."::".$method->getName()."() must take at least one parameter.");
-                    }
-                    
-                    if (count($params) > 1) {
-                        $this->warn($method->getDeclaringClass()->getName()."::".$method->getName()."() takes more than one parameter. (IH only uses the first)");
-                    }
-                    
-                    $classname = null;
-                    
-                    if (($hint = $params[0]->getClass()) !== null) { 
-                        $classname = $hint->getName();    
-                    }                    
-                    
-                    if ($classname === null) {
-                        throw new BuildException($method->getDeclaringClass()->getName()."::".$method->getName()."() method MUST use a class hint to indicate the class type of parameter.");
-                    }
-                        
-                    $this->nestedTypes[$name] = $classname;
-                
-                    $this->nestedStorers[$name] = $method;
-                    
-                } elseif (strpos($name, "add") === 0) {
-                    
-                    // *must* use class hints if using add ...
-                    
-                    // 1 param only
-                    $params = $method->getParameters();
-                    if (count($params) < 1) {
-                        throw new BuildException($method->getDeclaringClass()->getName()."::".$method->getName()."() must take at least one parameter.");
-                    }
-                    
-                    if (count($params) > 1) {
-                        $this->warn($method->getDeclaringClass()->getName()."::".$method->getName()."() takes more than one parameter. (IH only uses the first)");
-                    }
-
-                    $classname = null;
-                    
-                    if (($hint = $params[0]->getClass()) !== null) { 
-                        $classname = $hint->getName();    
-                    }                    
-                    
-                    // we don't use the classname here, but we need to make sure it exists before
-                    // we later try to instantiate a non-existant class
-                    if ($classname === null) {
-                        throw new BuildException($method->getDeclaringClass()->getName()."::".$method->getName()."() method MUST use a class hint to indicate the class type of parameter.");
-                    }
-                
-                    $this->nestedCreators[$name] = $method;
-                } 
-            } // if $method->isPublic()        
-        } // foreach        
-    }
-
-
-    /** Sets the named attribute. */
-    function setAttribute(Project $project, $element, $attributeName, &$value) {
-        
-        // we want to check whether the value we are setting looks like
-        // a slot-listener variable:  %{task.current_file}
-        //
-        // slot-listener variables are not like properties, in that they cannot be mixed with
-        // other text values.  The reason for this disparity is that properties are only
-        // set when first constructing objects from XML, whereas slot-listeners are always dynamic.
-        //
-        // This is made possible by PHP5 (objects automatically passed by reference) and PHP's loose
-        // typing.
-        
-        if (StringHelper::isSlotVar($value)) {
-            
-            $as = "setlistening" . strtolower($attributeName);
-
-            if (!isset($this->slotListeners[$as])) {
-                $msg = $this->getElementName($project, $element) . " doesn't support a slot-listening '$attributeName' attribute.";
-                throw new BuildException($msg);
-            }
-            
-            $method = $this->slotListeners[$as];
-            
-            $key = StringHelper::slotVar($value);
-            $value = Register::getSlot($key); // returns a RegisterSlot object which will hold current value of that register (accessible using getValue())
-            
-        } else {
-            
-            // Traditional value options
-            
-            $as = "set".strtolower($attributeName);
-            
-            if (!isset($this->attributeSetters[$as])) {
-                $msg = $this->getElementName($project, $element) . " doesn't support the '$attributeName' attribute.";
-                throw new BuildException($msg);
-            }
-            
-            $method = $this->attributeSetters[$as];            
-            
-            if ($as == "setrefid") {            
-                $value = new Reference($value);
-            } else {
-            
-                // decode any html entities in string
-                $value = html_entity_decode($value);                
-                
-                // value is a string representation of a boolean type,
-                // convert it to primitive
-                if (StringHelper::isBoolean($value)) {
-
-                    $value = StringHelper::booleanValue($value);
-                }
-                
-                // does method expect a PhingFile object? if so, then 
-                // pass a project-relative file.
-                $params = $method->getParameters();
-
-                $classname = null;
-                
-                if (($hint = $params[0]->getClass()) !== null) { 
-                    $classname = $hint->getName();    
-                }
-                
-                // there should only be one param; we'll just assume ....
-                if ($classname !== null) {
-                    switch(strtolower($classname)) {
-                        case "phingfile":
-                            $value = $project->resolveFile($value);
-                            break;
-                        case "path":
-                            $value = new Path($project, $value);
-                            break;
-                        case "reference":
-                            $value = new Reference($value);
-                            break;            
-                        // any other object params we want to support should go here ...
-                    }
-                    
-                } // if hint !== null
-                
-            } // if not setrefid
-            
-        } // if is slot-listener
-        
-        try {
-            $project->log("    -calling setter ".$method->getDeclaringClass()->getName()."::".$method->getName()."()", Project::MSG_DEBUG);
-            $method->invoke($element, $value);
-        } catch(Exception $exc) {
-            throw new BuildException($exc);
-        }
-        
-    }
-
-    /** Adds PCDATA areas.*/
-    function addText(Project $project, $element, $text) {
-        if ($this->methodAddText === null) {
-            $msg = $this->getElementName($project, $element)." doesn't support nested text data.";
-            throw new BuildException($msg);
-        }        
-        try {
-            $method = $this->methodAddText;
-            $method->invoke($element, $text);
-        } catch (Exception $exc) {
-            throw new BuildException($exc);
-        }
-    }
-
-    /**
-     * Creates a named nested element. 
-     * 
-     * Valid creators can be in the form createFoo() or addFoo(Bar).
-     * @return object Returns the nested element.
-     * @throws BuildException
-     */
-    function createElement(Project $project, $element, $elementName) {
-    
-        $addMethod = "add".strtolower($elementName);
-        $createMethod = "create".strtolower($elementName);
-        $nestedElement = null;
-        
-        if (isset($this->nestedCreators[$createMethod])) {
-            
-            $method = $this->nestedCreators[$createMethod];
-             try { // try to invoke the creator method on object
-                $project->log("    -calling creator ".$method->getDeclaringClass()->getName()."::".$method->getName()."()", Project::MSG_DEBUG);
-                $nestedElement = $method->invoke($element);
-            } catch (Exception $exc) {
-                throw new BuildException($exc);
-            }            
-            
-        } elseif (isset($this->nestedCreators[$addMethod])) {            
-            
-            $method = $this->nestedCreators[$addMethod];
-            
-            // project components must use class hints to support the add methods
-            
-            try { // try to invoke the adder method on object
-            
-                $project->log("    -calling adder ".$method->getDeclaringClass()->getName()."::".$method->getName()."()", Project::MSG_DEBUG);
-                // we've already assured that correct num of params
-                // exist and that method is using class hints                
-                $params = $method->getParameters();
-
-                $classname = null;
-            
-                if (($hint = $params[0]->getClass()) !== null) { 
-                    $classname = $hint->getName();    
-                }                
-                
-                // create a new instance of the object and add it via $addMethod                
-                $nestedElement = new $classname();
-                
-                $method->invoke($element, $nestedElement);
-                                
-            } catch (Exception $exc) {
-                throw new BuildException($exc);
-            }
-        } else {
-            $msg = $this->getElementName($project, $element) . " doesn't support the '$elementName' creator/adder.";
-            throw new BuildException($msg);
-        }                                
-        
-        if ($nestedElement instanceof ProjectComponent) {
-            $nestedElement->setProject($project);
-        }
-        
-        return $nestedElement;
-    }
-
-    /**
-     * Creates a named nested element.
-     * @return void
-     * @throws BuildException
-     */
-    function storeElement($project, $element, $child, $elementName = null) {
-    
-        if ($elementName === null) {
-            return;
-        }
-        
-        $storer = "addconfigured".strtolower($elementName);
-          
-        if (isset($this->nestedStorers[$storer])) {
-            
-            $method = $this->nestedStorers[$storer];
-            
-            try {                                
-                $project->log("    -calling storer ".$method->getDeclaringClass()->getName()."::".$method->getName()."()", Project::MSG_DEBUG);                    
-                $method->invoke($element, $child);            
-            } catch (Exception $exc) {
-                throw new BuildException($exc);
-            }
-        }
-        
-    }
-
-    /** Does the introspected class support PCDATA? */
-    function supportsCharacters() {
-        return ($this->methodAddText !== null);
-    }
-
-    /** Return all attribues supported by the introspected class. */
-    function getAttributes() {
-        $attribs = array();
-        foreach (array_keys($this->attributeSetters) as $setter) {
-            $attribs[] =$this->getPropertyName($setter, "set");
-        }
-        return $attribs;
-    }
-
-    /** Return all nested elements supported by the introspected class. */
-    function getNestedElements() {
-        return $this->nestedTypes;
-    }
-    
-    /**
-     * Get the the name for an element.
-     * When possible the full classnam (phing.tasks.system.PropertyTask) will
-     * be returned.  If not available (loaded in taskdefs or typedefs) then the
-     * XML element name will be returned.
-     *
-     * @param Project $project
-     * @param object $element The Task or type element.
-     * @return string Fully qualified class name of element when possible.
-     */
-    function getElementName(Project $project, $element) {
-       
-          $taskdefs = $project->getTaskDefinitions();
-        $typedefs = $project->getDataTypeDefinitions();
-        
-        // check if class of element is registered with project (tasks & types)        
-        // most element types don't have a getTag() method
-        $elClass = get_class($element);
-        
-        if (!in_array('getTag', get_class_methods($elClass))) {
-                // loop through taskdefs and typesdefs and see if the class name
-                // matches (case-insensitive) any of the classes in there
-                foreach(array_merge($taskdefs, $typedefs) as $elName => $class) {
-                    if (0 === strcasecmp($elClass, StringHelper::unqualify($class))) {
-                        return $class;
-                    }
-                }
-                return "$elClass (unknown)";
-        } else {
-            // ->getTag() method does exist, so use it
-            $elName = $element->getTag();
-            if (isset($taskdefs[$elName])) {
-                return $taskdefs[$elName];
-            } elseif (isset($typedefs[$elName])) {
-
-                return $typedefs[$elName];
-            } else {
-                return "$elName (unknown)";
-            }
-        }        
-    }
-
-    /** extract the name of a property from a method name - subtracting  a given prefix. */
-    function getPropertyName($methodName, $prefix) {
-        $start = strlen($prefix);
-        return strtolower(substr($methodName, $start));
-    }
-    
-    /**
-     * Prints warning message to screen if -debug was used.
-     */
-    function warn($msg) {
-        if (Phing::getMsgOutputLevel() === Project::MSG_DEBUG) {
-            print("[IntrospectionHelper] " . $msg . "\n");
-        }
-    }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/Phing.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/Phing.php
deleted file mode 100644
index 328f59419..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/Phing.php
+++ /dev/null
@@ -1,1335 +0,0 @@
-<?php
-/*
- * $Id: Phing.php 385 2008-08-19 18:09:17Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Project.php';
-require_once 'phing/ProjectComponent.php';
-require_once 'phing/Target.php';
-require_once 'phing/Task.php';
-
-include_once 'phing/BuildException.php';
-include_once 'phing/ConfigurationException.php';
-include_once 'phing/BuildEvent.php';
-
-include_once 'phing/parser/Location.php';
-include_once 'phing/parser/ExpatParser.php';
-include_once 'phing/parser/AbstractHandler.php';
-include_once 'phing/parser/ProjectConfigurator.php';
-include_once 'phing/parser/RootHandler.php';
-include_once 'phing/parser/ProjectHandler.php';
-include_once 'phing/parser/TaskHandler.php';
-include_once 'phing/parser/TargetHandler.php';
-include_once 'phing/parser/DataTypeHandler.php';
-include_once 'phing/parser/NestedElementHandler.php';
-
-include_once 'phing/system/util/Properties.php';
-include_once 'phing/util/StringHelper.php';
-include_once 'phing/system/io/PhingFile.php';
-include_once 'phing/system/io/OutputStream.php';
-include_once 'phing/system/io/FileOutputStream.php';
-include_once 'phing/system/io/FileReader.php';
-include_once 'phing/system/util/Register.php';
-
-/**
- * Entry point into Phing.  This class handles the full lifecycle of a build -- from
- * parsing & handling commandline arguments to assembling the project to shutting down
- * and cleaning up in the end.
- *
- * If you are invoking Phing from an external application, this is still
- * the class to use.  Your applicaiton can invoke the start() method, passing
- * any commandline arguments or additional properties.
- *
- * @author    Andreas Aderhold <andi@binarycloud.com>
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.51 $
- * @package   phing
- */
-class Phing {
-
-	/** The default build file name */
-	const DEFAULT_BUILD_FILENAME = "build.xml";
-
-	/** Our current message output status. Follows Project::MSG_XXX */
-	private static $msgOutputLevel = Project::MSG_INFO;
-
-	/** PhingFile that we are using for configuration */
-	private $buildFile = null;
-
-	/** The build targets */
-	private $targets = array();
-
-	/**
-	 * Set of properties that are passed in from commandline or invoking code.
-	 * @var Properties
-	 */
-	private static $definedProps;
-
-	/** Names of classes to add as listeners to project */
-	private $listeners = array();
-
-	private $loggerClassname = null;
-
-	/** The class to handle input (can be only one). */
-	private $inputHandlerClassname;
-
-	/** Indicates if this phing should be run */
-	private $readyToRun = false;
-
-	/** Indicates we should only parse and display the project help information */
-	private $projectHelp = false;
-
-	/** Used by utility function getResourcePath() */
-	private static $importPaths;
-
-	/** System-wide static properties (moved from System) */
-	private static $properties = array();
-
-	/** Static system timer. */
-	private static $timer;
-
-	/** The current Project */
-	private static $currentProject;
-
-	/** Whether to capture PHP errors to buffer. */
-	private static $phpErrorCapture = false;
-
-	/** Array of captured PHP errors */
-	private static $capturedPhpErrors = array();
-
-	/**
-	 * @var OUtputStream Stream for standard output.
-	 */
-	private static $out;
-
-	/**
-	 * @var OutputStream Stream for error output.
-	 */
-	private static $err;
-
-	/**
-	 * @var boolean Whether we are using a logfile.
-	 */
-	private static $isLogFileUsed = false;
-
-	/**
-	 * Array to hold original ini settings that Phing changes (and needs
-	 * to restore in restoreIni() method).
-	 *
-	 * @var array Struct of array(setting-name => setting-value)
-	 * @see restoreIni()
-	 */
-	private static $origIniSettings = array();
-
-	/**
-	 * Entry point allowing for more options from other front ends.
-	 *
-	 * This method encapsulates the complete build lifecycle.
-	 *
-	 * @param array $args The commandline args passed to phing shell script.
-	 * @param array $additionalUserProperties   Any additional properties to be passed to Phing (alternative front-end might implement this).
-	 *                                          These additional properties will be available using the getDefinedProperty() method and will
-	 *                                          be added to the project's "user" properties
-	 * @see execute()
-	 * @see runBuild()
-	 * @throws Exception - if there is an error during build
-	 */
-	public static function start($args, array $additionalUserProperties = null) {
-
-		try {
-			$m = new Phing();
-			$m->execute($args);
-		} catch (Exception $exc) {
-			self::handleLogfile();
-			throw $exc;
-		}
-
-		if ($additionalUserProperties !== null) {
-			foreach($additionalUserProperties as $key => $value) {
-				$m->setDefinedProperty($key, $value);
-			}
-		}
-
-		try {
-			$m->runBuild();
-		} catch(Exception $exc) {
-			self::handleLogfile();
-			throw $exc;
-		}
-
-		// everything fine, shutdown
-		self::handleLogfile();
-	}
-
-	/**
-	 * Prints the message of the Exception if it's not null.
-	 * @param Exception $t
-	 */
-	public static function printMessage(Exception $t) {
-		if (self::$err === null) { // Make sure our error output is initialized
-			self::initializeOutputStreams();
-		}
-		if (self::getMsgOutputLevel() >= Project::MSG_VERBOSE) {
-			self::$err->write($t->__toString() . PHP_EOL);
-		} else {
-			self::$err->write($t->getMessage() . PHP_EOL);
-		}
-	}
-
-	/**
-	 * Sets the stdout and stderr streams if they are not already set.
-	 */
-	private static function initializeOutputStreams() {
-		if (self::$out === null) {
-			self::$out = new OutputStream(fopen("php://stdout", "w"));
-		}
-		if (self::$err === null) {
-			self::$err = new OutputStream(fopen("php://stderr", "w"));
-		}
-	}
-
-	/**
-	 * Sets the stream to use for standard (non-error) output.
-	 * @param OutputStream $stream The stream to use for standard output.
-	 */
-	public static function setOutputStream(OutputStream $stream) {
-		self::$out = $stream;
-	}
-
-	/**
-	 * Gets the stream to use for standard (non-error) output.
-	 * @return OutputStream
-	 */
-	public static function getOutputStream() {
-		return self::$out;
-	}
-
-	/**
-	 * Sets the stream to use for error output.
-	 * @param OutputStream $stream The stream to use for error output.
-	 */
-	public static function setErrorStream(OutputStream $stream) {
-		self::$err = $stream;
-	}
-
-	/**
-	 * Gets the stream to use for error output.
-	 * @return OutputStream
-	 */
-	public static function getErrorStream() {
-		return self::$err;
-	}
-
-	/**
-	 * Close logfiles, if we have been writing to them.
-	 *
-	 * @since Phing 2.3.0
-	 */
-	private static function handleLogfile() {
-		if (self::$isLogFileUsed) {
-			self::$err->close();
-			self::$out->close();
-		}
-	}
-
-	/**
-	 * Making output level a static property so that this property
-	 * can be accessed by other parts of the system, enabling
-	 * us to display more information -- e.g. backtraces -- for "debug" level.
-	 * @return int
-	 */
-	public static function getMsgOutputLevel() {
-		return self::$msgOutputLevel;
-	}
-
-	/**
-	 * Command line entry point. This method kicks off the building
-	 * of a project object and executes a build using either a given
-	 * target or the default target.
-	 *
-	 * @param array $args Command line args.
-	 * @return void
-	 */
-	public static function fire($args) {
-		self::start($args, null);
-	}
-
-	/**
-	 * Setup/initialize Phing environment from commandline args.
-	 * @param array $args commandline args passed to phing shell.
-	 * @return void
-	 */
-	public function execute($args) {
-
-		self::$definedProps = new Properties();
-		$this->searchForThis = null;
-
-		// 1) First handle any options which should always
-		// Note: The order in which these are executed is important (if multiple of these options are specified)
-
-		if (in_array('-help', $args) || in_array('-h', $args)) {
-			$this->printUsage();
-			return;
-		}
-
-		if (in_array('-version', $args) || in_array('-v', $args)) {
-			$this->printVersion();
-			return;
-		}
-
-		// 2) Next pull out stand-alone args.
-		// Note: The order in which these are executed is important (if multiple of these options are specified)
-
-		if (false !== ($key = array_search('-quiet', $args, true))) {
-			self::$msgOutputLevel = Project::MSG_WARN;
-			unset($args[$key]);
-		}
-
-		if (false !== ($key = array_search('-verbose', $args, true))) {
-			self::$msgOutputLevel = Project::MSG_VERBOSE;
-			unset($args[$key]);
-		}
-
-		if (false !== ($key = array_search('-debug', $args, true))) {
-			self::$msgOutputLevel = Project::MSG_DEBUG;
-			unset($args[$key]);
-		}
-
-		// 3) Finally, cycle through to parse remaining args
-		//
-		$keys = array_keys($args); // Use keys and iterate to max(keys) since there may be some gaps		
-		$max = $keys ? max($keys) : -1;
-		for($i=0; $i <= $max; $i++) {
-
-			if (!array_key_exists($i, $args)) {
-				// skip this argument, since it must have been removed above.
-				continue;
-			}
-
-			$arg = $args[$i];
-
-			if ($arg == "-logfile") {
-				try {
-					// see: http://phing.info/trac/ticket/65
-					if (!isset($args[$i+1])) {
-						$msg = "You must specify a log file when using the -logfile argument\n";
-						throw new ConfigurationException($msg);
-					} else {
-						$logFile = new PhingFile($args[++$i]);
-						$out = new FileOutputStream($logFile); // overwrite
-						self::setOutputStream($out);
-						self::setErrorStream($out);
-						self::$isLogFileUsed = true;
-					}
-				} catch (IOException $ioe) {
-					$msg = "Cannot write on the specified log file. Make sure the path exists and you have write permissions.";
-					throw new ConfigurationException($msg, $ioe);
-				}
-			} elseif ($arg == "-buildfile" || $arg == "-file" || $arg == "-f") {
-				if (!isset($args[$i+1])) {
-					$msg = "You must specify a buildfile when using the -buildfile argument.";
-					throw new ConfigurationException($msg);
-				} else {
-					$this->buildFile = new PhingFile($args[++$i]);
-				}
-			} elseif ($arg == "-listener") {
-				if (!isset($args[$i+1])) {
-					$msg = "You must specify a listener class when using the -listener argument";
-					throw new ConfigurationException($msg);
-				} else {
-					$this->listeners[] = $args[++$i];
-				}
-			} elseif (StringHelper::startsWith("-D", $arg)) {
-				$name = substr($arg, 2);
-				$value = null;
-				$posEq = strpos($name, "=");
-				if ($posEq !== false) {
-					$value = substr($name, $posEq+1);
-					$name  = substr($name, 0, $posEq);
-				} elseif ($i < count($args)-1) {
-					$value = $args[++$i];
-				}
-				self::$definedProps->setProperty($name, $value);
-			} elseif ($arg == "-logger") {
-				if (!isset($args[$i+1])) {
-					$msg = "You must specify a classname when using the -logger argument";
-					throw new ConfigurationException($msg);
-				} else {
-					$this->loggerClassname = $args[++$i];
-				}
-			} elseif ($arg == "-inputhandler") {
-				if ($this->inputHandlerClassname !== null) {
-					throw new ConfigurationException("Only one input handler class may be specified.");
-				}
-				if (!isset($args[$i+1])) {
-					$msg = "You must specify a classname when using the -inputhandler argument";
-					throw new ConfigurationException($msg);
-				} else {
-					$this->inputHandlerClassname = $args[++$i];
-				}
-			} elseif ($arg == "-projecthelp" || $arg == "-targets" || $arg == "-list" || $arg == "-l" || $arg == "-p") {
-				// set the flag to display the targets and quit
-				$this->projectHelp = true;
-			} elseif ($arg == "-find") {
-				// eat up next arg if present, default to build.xml
-				if ($i < count($args)-1) {
-					$this->searchForThis = $args[++$i];
-				} else {
-					$this->searchForThis = self::DEFAULT_BUILD_FILENAME;
-				}
-			} elseif (substr($arg,0,1) == "-") {
-				// we don't have any more args
-				self::$err->write("Unknown argument: $arg" . PHP_EOL);
-				self::printUsage();
-				return;
-			} else {
-				// if it's no other arg, it may be the target
-				array_push($this->targets, $arg);
-			}
-		}
-
-		// if buildFile was not specified on the command line,
-		if ($this->buildFile === null) {
-			// but -find then search for it
-			if ($this->searchForThis !== null) {
-				$this->buildFile = $this->_findBuildFile(self::getProperty("user.dir"), $this->searchForThis);
-			} else {
-				$this->buildFile = new PhingFile(self::DEFAULT_BUILD_FILENAME);
-			}
-		}
-		// make sure buildfile exists
-		if (!$this->buildFile->exists()) {
-			throw new ConfigurationException("Buildfile: " . $this->buildFile->__toString() . " does not exist!");
-		}
-
-		// make sure it's not a directory
-		if ($this->buildFile->isDirectory()) {
-			throw new ConfigurationException("Buildfile: " . $this->buildFile->__toString() . " is a dir!");
-		}
-
-		$this->readyToRun = true;
-	}
-
-	/**
-	 * Helper to get the parent file for a given file.
-	 *
-	 * @param PhingFile $file
-	 * @return PhingFile Parent file or null if none
-	 */
-	private function _getParentFile(PhingFile $file) {
-		$filename = $file->getAbsolutePath();
-		$file     = new PhingFile($filename);
-		$filename = $file->getParent();
-		return ($filename === null) ? null : new PhingFile($filename);
-	}
-
-	/**
-	 * Search parent directories for the build file.
-	 *
-	 * Takes the given target as a suffix to append to each
-	 * parent directory in search of a build file.  Once the
-	 * root of the file-system has been reached an exception
-	 * is thrown.
-	 *
-	 * @param string $start Start file path.
-	 * @param string $suffix Suffix filename to look for in parents.
-	 * @return PhingFile A handle to the build file
-	 *
-	 * @throws BuildException    Failed to locate a build file
-	 */
-	private function _findBuildFile($start, $suffix) {
-		$startf = new PhingFile($start);
-		$parent = new PhingFile($startf->getAbsolutePath());
-		$file   = new PhingFile($parent, $suffix);
-
-		// check if the target file exists in the current directory
-		while (!$file->exists()) {
-			// change to parent directory
-			$parent = $this->_getParentFile($parent);
-
-			// if parent is null, then we are at the root of the fs,
-			// complain that we can't find the build file.
-			if ($parent === null) {
-				throw new ConfigurationException("Could not locate a build file!");
-			}
-			// refresh our file handle
-			$file = new PhingFile($parent, $suffix);
-		}
-		return $file;
-	}
-
-	/**
-	 * Executes the build.
-	 * @return void
-	 */
-	function runBuild() {
-
-		if (!$this->readyToRun) {
-			return;
-		}
-
-		$project = new Project();
-
-		self::setCurrentProject($project);
-		set_error_handler(array('Phing', 'handlePhpError'));
-
-		$error = null;
-
-		$this->addBuildListeners($project);
-		$this->addInputHandler($project);
-
-		// set this right away, so that it can be used in logging.
-		$project->setUserProperty("phing.file", $this->buildFile->getAbsolutePath());
-
-		try {
-			$project->fireBuildStarted();
-			$project->init();
-		} catch (Exception $exc) {
-			$project->fireBuildFinished($exc);
-			throw $exc;
-		}
-
-		$project->setUserProperty("phing.version", $this->getPhingVersion());
-
-		$e = self::$definedProps->keys();
-		while (count($e)) {
-			$arg   = (string) array_shift($e);
-			$value = (string) self::$definedProps->getProperty($arg);
-			$project->setUserProperty($arg, $value);
-		}
-		unset($e);
-
-		$project->setUserProperty("phing.file", $this->buildFile->getAbsolutePath());
-
-		// first use the Configurator to create the project object
-		// from the given build file.
-
-		try {
-			ProjectConfigurator::configureProject($project, $this->buildFile);
-		} catch (Exception $exc) {
-			$project->fireBuildFinished($exc);
-			restore_error_handler();
-			self::unsetCurrentProject();
-			throw $exc;
-		}
-
-		// make sure that we have a target to execute
-		if (count($this->targets) === 0) {
-			$this->targets[] = $project->getDefaultTarget();
-		}
-
-		// execute targets if help param was not given
-		if (!$this->projectHelp) {
-
-			try {
-				$project->executeTargets($this->targets);
-			} catch (Exception $exc) {
-				$project->fireBuildFinished($exc);
-				restore_error_handler();
-				self::unsetCurrentProject();
-				throw $exc;
-			}
-		}
-		// if help is requested print it
-		if ($this->projectHelp) {
-			try {
-				$this->printDescription($project);
-				$this->printTargets($project);
-			} catch (Exception $exc) {
-				$project->fireBuildFinished($exc);
-				restore_error_handler();
-				self::unsetCurrentProject();
-				throw $exc;
-			}
-		}
-
-		// finally {
-		if (!$this->projectHelp) {
-			$project->fireBuildFinished(null);
-		}
-
-		restore_error_handler();
-		self::unsetCurrentProject();
-	}
-
-	/**
-	 * Bind any registered build listeners to this project.
-	 *
-	 * This means adding the logger and any build listeners that were specified
-	 * with -listener arg.
-	 *
-	 * @param Project $project
-	 * @return void
-	 */
-	private function addBuildListeners(Project $project) {
-		// Add the default listener
-		$project->addBuildListener($this->createLogger());
-
-		foreach($this->listeners as $listenerClassname) {
-			try {
-				$clz = Phing::import($listenerClassname);
-			} catch (Exception $x) {
-				$msg = "Unable to instantiate specified listener "
-				. "class " . $listenerClassname . " : "
-				. $e->getMessage();
-				throw new ConfigurationException($msg);
-			}
-
-			$listener = new $clz();
-
-			if ($listener instanceof StreamRequiredBuildLogger) {
-				throw new ConfigurationException("Unable to add " . $listenerClassname . " as a listener, since it requires explicit error/output streams. (You can specify it as a -logger.)");
-			}
-			$project->addBuildListener($listener);
-		}
-	}
-
-	/**
-	 * Creates the InputHandler and adds it to the project.
-	 *
-	 * @param Project $project the project instance.
-	 *
-	 * @throws BuildException if a specified InputHandler
-	 *                           class could not be loaded.
-	 */
-	private function addInputHandler(Project $project) {
-		if ($this->inputHandlerClassname === null) {
-			$handler = new DefaultInputHandler();
-		} else {
-			try {
-				$clz = Phing::import($this->inputHandlerClassname);
-				$handler = new $clz();
-				if ($project !== null && method_exists($handler, 'setProject')) {
-					$handler->setProject($project);
-				}
-			} catch (Exception $e) {
-				$msg = "Unable to instantiate specified input handler "
-				. "class " . $this->inputHandlerClassname . " : "
-				. $e->getMessage();
-				throw new ConfigurationException($msg);
-			}
-		}
-		$project->setInputHandler($handler);
-	}
-
-	/**
-	 * Creates the default build logger for sending build events to the log.
-	 * @return BuildLogger The created Logger
-	 */
-	private function createLogger() {
-		if ($this->loggerClassname !== null) {
-			self::import($this->loggerClassname);
-			// get class name part
-			$classname = self::import($this->loggerClassname);
-			$logger = new $classname;
-			if (!($logger instanceof BuildLogger)) {
-				throw new BuildException($classname . ' does not implement the BuildLogger interface.');
-			}
-		} else {
-			require_once 'phing/listener/DefaultLogger.php';
-			$logger = new DefaultLogger();
-		}
-		$logger->setMessageOutputLevel(self::$msgOutputLevel);
-		$logger->setOutputStream(self::$out);
-		$logger->setErrorStream(self::$err);
-		return $logger;
-	}
-
-	/**
-	 * Sets the current Project
-	 * @param Project $p
-	 */
-	public static function setCurrentProject($p) {
-		self::$currentProject = $p;
-	}
-
-	/**
-	 * Unsets the current Project
-	 */
-	public static function unsetCurrentProject() {
-		self::$currentProject = null;
-	}
-
-	/**
-	 * Gets the current Project.
-	 * @return Project Current Project or NULL if none is set yet/still.
-	 */
-	public static function getCurrentProject() {
-		return self::$currentProject;
-	}
-
-	/**
-	 * A static convenience method to send a log to the current (last-setup) Project.
-	 * If there is no currently-configured Project, then this will do nothing.
-	 * @param string $message
-	 * @param int $priority Project::MSG_INFO, etc.
-	 */
-	public static function log($message, $priority = Project::MSG_INFO) {
-		$p = self::getCurrentProject();
-		if ($p) {
-			$p->log($message, $priority);
-		}
-	}
-
-	/**
-	 * Error handler for PHP errors encountered during the build.
-	 * This uses the logging for the currently configured project.
-	 */
-	public static function handlePhpError($level, $message, $file, $line) {
-
-		// don't want to print supressed errors
-		if (error_reporting() > 0) {
-
-			if (self::$phpErrorCapture) {
-
-				self::$capturedPhpErrors[] = array('message' => $message, 'level' => $level, 'line' => $line, 'file' => $file);
-
-			} else {
-
-				$message = '[PHP Error] ' . $message;
-				$message .= ' [line ' . $line . ' of ' . $file . ']';
-
-				switch ($level) {
-
-					case E_STRICT:
-					case E_NOTICE:
-					case E_USER_NOTICE:
-						self::log($message, Project::MSG_VERBOSE);
-						break;
-					case E_WARNING:
-					case E_USER_WARNING:
-						self::log($message, Project::MSG_WARN);
-						break;
-					case E_ERROR:
-					case E_USER_ERROR:
-					default:
-						self::log($message, Project::MSG_ERR);
-
-				} // switch
-
-			} // if phpErrorCapture
-
-		} // if not @
-
-	}
-
-	/**
-	 * Begins capturing PHP errors to a buffer.
-	 * While errors are being captured, they are not logged.
-	 */
-	public static function startPhpErrorCapture() {
-		self::$phpErrorCapture = true;
-		self::$capturedPhpErrors = array();
-	}
-
-	/**
-	 * Stops capturing PHP errors to a buffer.
-	 * The errors will once again be logged after calling this method.
-	 */
-	public static function stopPhpErrorCapture() {
-		self::$phpErrorCapture = false;
-	}
-
-	/**
-	 * Clears the captured errors without affecting the starting/stopping of the capture.
-	 */
-	public static function clearCapturedPhpErrors() {
-		self::$capturedPhpErrors = array();
-	}
-
-	/**
-	 * Gets any PHP errors that were captured to buffer.
-	 * @return array array('message' => message, 'line' => line number, 'file' => file name, 'level' => error level)
-	 */
-	public static function getCapturedPhpErrors() {
-		return self::$capturedPhpErrors;
-	}
-
-	/**  Prints the usage of how to use this class */
-	public static function printUsage() {
-
-		$msg = "";
-		$msg .= "phing [options] [target [target2 [target3] ...]]" . PHP_EOL;
-		$msg .= "Options: " . PHP_EOL;
-		$msg .= "  -h -help               print this message" . PHP_EOL;
-		$msg .= "  -l -list               list available targets in this project" . PHP_EOL;
-		$msg .= "  -v -version            print the version information and exit" . PHP_EOL;
-		$msg .= "  -q -quiet              be extra quiet" . PHP_EOL;
-		$msg .= "  -verbose               be extra verbose" . PHP_EOL;
-		$msg .= "  -debug                 print debugging information" . PHP_EOL;
-		$msg .= "  -logfile <file>        use given file for log" . PHP_EOL;
-		$msg .= "  -logger <classname>    the class which is to perform logging" . PHP_EOL;
-		$msg .= "  -f -buildfile <file>   use given buildfile" . PHP_EOL;
-		$msg .= "  -D<property>=<value>   use value for given property" . PHP_EOL;
-		$msg .= "  -find <file>           search for buildfile towards the root of the" . PHP_EOL;
-		$msg .= "                         filesystem and use it" . PHP_EOL;
-		$msg .= "  -inputhandler <file>   the class to use to handle user input" . PHP_EOL;
-		//$msg .= "  -recursive <file>      search for buildfile downwards and use it" . PHP_EOL;
-		$msg .= PHP_EOL;
-		$msg .= "Report bugs to <dev@phing.tigris.org>".PHP_EOL;
-		self::$err->write($msg);
-	}
-
-	/**
-	 * Prints the current Phing version.
-	 */
-	public static function printVersion() {
-		self::$out->write(self::getPhingVersion().PHP_EOL);
-	}
-
-	/**
-	 * Gets the current Phing version based on VERSION.TXT file.
-	 * @return string
-	 * @throws BuildException - if unable to find version file.
-	 */
-	public static function getPhingVersion() {
-		$versionPath = self::getResourcePath("phing/etc/VERSION.TXT");
-		if ($versionPath === null) {
-			$versionPath = self::getResourcePath("etc/VERSION.TXT");
-		}
-		if ($versionPath === null) {
-			throw new ConfigurationException("No VERSION.TXT file found; try setting phing.home environment variable.");
-		}
-		try { // try to read file
-			$buffer = null;
-			$file = new PhingFile($versionPath);
-			$reader = new FileReader($file);
-			$reader->readInto($buffer);
-			$buffer = trim($buffer);
-			//$buffer = "PHING version 1.0, Released 2002-??-??";
-			$phingVersion = $buffer;
-		} catch (IOException $iox) {
-			throw new ConfigurationException("Can't read version information file");
-		}
-		return $phingVersion;
-	}
-
-	/**
-	 * Print the project description, if any
-	 */
-	public static function printDescription(Project $project) {
-		if ($project->getDescription() !== null) {
-			self::$out->write($project->getDescription() . PHP_EOL);
-		}
-	}
-
-	/** Print out a list of all targets in the current buildfile */
-	function printTargets($project) {
-		// find the target with the longest name
-		$maxLength = 0;
-		$targets = $project->getTargets();
-		$targetNames = array_keys($targets);
-		$targetName = null;
-		$targetDescription = null;
-		$currentTarget = null;
-
-		// split the targets in top-level and sub-targets depending
-		// on the presence of a description
-
-		$subNames = array();
-		$topNameDescMap = array();
-
-		foreach($targets as $currentTarget) {
-			$targetName = $currentTarget->getName();
-			$targetDescription = $currentTarget->getDescription();
-
-			// subtargets are targets w/o descriptions
-			if ($targetDescription === null) {
-				$subNames[] = $targetName;
-			} else {
-				// topNames and topDescriptions are handled later
-				// here we store in hash map (for sorting purposes)
-				$topNameDescMap[$targetName] = $targetDescription;
-				if (strlen($targetName) > $maxLength) {
-					$maxLength = strlen($targetName);
-				}
-			}
-		}
-
-		// Sort the arrays
-		sort($subNames); // sort array values, resetting keys (which are numeric)
-		ksort($topNameDescMap); // sort the keys (targetName) keeping key=>val associations
-
-		$topNames = array_keys($topNameDescMap);
-		$topDescriptions = array_values($topNameDescMap);
-
-		$defaultTarget = $project->getDefaultTarget();
-
-		if ($defaultTarget !== null && $defaultTarget !== "") {
-			$defaultName = array();
-			$defaultDesc = array();
-			$defaultName[] = $defaultTarget;
-
-			$indexOfDefDesc = array_search($defaultTarget, $topNames, true);
-			if ($indexOfDefDesc !== false && $indexOfDefDesc >= 0) {
-				$defaultDesc = array();
-				$defaultDesc[] = $topDescriptions[$indexOfDefDesc];
-			}
-
-			$this->_printTargets($defaultName, $defaultDesc, "Default target:", $maxLength);
-
-		}
-		$this->_printTargets($topNames, $topDescriptions, "Main targets:", $maxLength);
-		$this->_printTargets($subNames, null, "Subtargets:", 0);
-	}
-
-	/**
-	 * Writes a formatted list of target names with an optional description.
-	 *
-	 * @param array $names The names to be printed.
-	 *              Must not be <code>null</code>.
-	 * @param array $descriptions The associated target descriptions.
-	 *                     May be <code>null</code>, in which case
-	 *                     no descriptions are displayed.
-	 *                     If non-<code>null</code>, this should have
-	 *                     as many elements as <code>names</code>.
-	 * @param string $heading The heading to display.
-	 *                Should not be <code>null</code>.
-	 * @param int $maxlen The maximum length of the names of the targets.
-	 *               If descriptions are given, they are padded to this
-	 *               position so they line up (so long as the names really
-	 *               <i>are</i> shorter than this).
-	 */
-	private function _printTargets($names, $descriptions, $heading, $maxlen) {
-
-		$spaces = '  ';
-		while (strlen($spaces) < $maxlen) {
-			$spaces .= $spaces;
-		}
-		$msg = "";
-		$msg .= $heading . PHP_EOL;
-		$msg .= str_repeat("-",79) . PHP_EOL;
-
-		$total = count($names);
-		for($i=0; $i < $total; $i++) {
-			$msg .= " ";
-			$msg .= $names[$i];
-			if (!empty($descriptions)) {
-				$msg .= substr($spaces, 0, $maxlen - strlen($names[$i]) + 2);
-				$msg .= $descriptions[$i];
-			}
-			$msg .= PHP_EOL;
-		}
-		if ($total > 0) {
-			self::$out->write($msg . PHP_EOL);
-		}
-	}
-
-	/**
-	 * Import a dot-path notation class path.
-	 * @param string $dotPath
-	 * @param mixed $classpath String or object supporting __toString()
-	 * @return string The unqualified classname (which can be instantiated).
-	 * @throws BuildException - if cannot find the specified file
-	 */
-	public static function import($dotPath, $classpath = null) {
-
-		// first check to see that the class specified hasn't already been included.
-		// (this also handles case where this method is called w/ a classname rather than dotpath)
-		$classname = StringHelper::unqualify($dotPath);
-		if (class_exists($classname, false)) {
-			return $classname;
-		}
-
-		$dotClassname = basename($dotPath);
-		$dotClassnamePos = strlen($dotPath) - strlen($dotClassname);
-
-		// 1- temporarily replace escaped '.' with another illegal char (#)
-		$tmp = str_replace('\.', '##', $dotClassname);
-		// 2- swap out the remaining '.' with DIR_SEP
-		$tmp = strtr($tmp, '.', DIRECTORY_SEPARATOR);
-		// 3- swap back the escaped '.'
-		$tmp = str_replace('##', '.', $tmp);
-
-		$classFile = $tmp . ".php";
-
-		$path = substr_replace($dotPath, $classFile, $dotClassnamePos);
-
-		Phing::__import($path, $classpath);
-
-		return $classname;
-	}
-
-	/**
-	 * Import a PHP file
-	 * @param string $path Path to the PHP file
-	 * @param mixed $classpath String or object supporting __toString()
-	 * @throws BuildException - if cannot find the specified file
-	 */
-	public static function __import($path, $classpath = null) {
-
-		if ($classpath) {
-
-			// Apparently casting to (string) no longer invokes __toString() automatically.
-			if (is_object($classpath)) {
-				$classpath = $classpath->__toString();
-			}
-
-			// classpaths are currently additive, but we also don't want to just
-			// indiscriminantly prepand/append stuff to the include_path.  This means
-			// we need to parse current incldue_path, and prepend any
-			// specified classpath locations that are not already in the include_path.
-			//
-			// NOTE:  the reason why we do it this way instead of just changing include_path
-			// and then changing it back, is that in many cases applications (e.g. Propel) will
-			// include/require class files from within method calls.  This means that not all
-			// necessary files will be included in this import() call, and hence we can't
-			// change the include_path back without breaking those apps.  While this method could
-			// be more expensive than switching & switching back (not sure, but maybe), it makes it
-			// possible to write far less expensive run-time applications (e.g. using Propel), which is
-			// really where speed matters more.
-
-			$curr_parts = explode(PATH_SEPARATOR, get_include_path());
-			$add_parts = explode(PATH_SEPARATOR, $classpath);
-			$new_parts = array_diff($add_parts, $curr_parts);
-			if ($new_parts) {
-				set_include_path(implode(PATH_SEPARATOR, array_merge($new_parts, $curr_parts)));
-			}
-		}
-
-		$ret = include_once($path);
-
-		if ($ret === false) {
-			$msg = "Error importing $path";
-			if (self::getMsgOutputLevel() >= Project::MSG_DEBUG) {
-				$x = new Exception("for-path-trace-only");
-				$msg .= $x->getTraceAsString();
-			}
-			throw new ConfigurationException($msg);
-		}
-	}
-
-	/**
-	 * Looks on include path for specified file.
-	 * @return string File found (null if no file found).
-	 */
-	public static function getResourcePath($path) {
-
-		if (self::$importPaths === null) {
-			$paths = get_include_path();
-			self::$importPaths = explode(PATH_SEPARATOR, ini_get("include_path"));
-		}
-
-		$path = str_replace('\\', DIRECTORY_SEPARATOR, $path);
-		$path = str_replace('/', DIRECTORY_SEPARATOR, $path);
-
-		foreach (self::$importPaths as $prefix) {
-			$testPath = $prefix . DIRECTORY_SEPARATOR . $path;
-			if (file_exists($testPath)) {
-				return $testPath;
-			}
-		}
-
-		// Check for the property phing.home
-		$homeDir = self::getProperty('phing.home');
-		if ($homeDir) {
-			$testPath = $homeDir . DIRECTORY_SEPARATOR . $path;
-			if (file_exists($testPath)) {
-				return $testPath;
-			}
-		}
-
-		// If we are using this via PEAR then check for the file in the data dir
-		// This is a bit of a hack, but works better than previous solution of assuming
-		// data_dir is on the include_path.
-		$dataDir = '@DATA-DIR@';
-		if ($dataDir{0} != '@') { // if we're using PEAR then the @ DATA-DIR @ token will have been substituted.
-			$testPath = $dataDir . DIRECTORY_SEPARATOR . $path;
-			if (file_exists($testPath)) {
-				return $testPath;
-			}
-		} else {
-			// We're not using PEAR, so do one additional check based on path of
-			// current file (Phing.php)
-			$maybeHomeDir = realpath(dirname(__FILE__) . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR  . '..');
-			$testPath = $maybeHomeDir . DIRECTORY_SEPARATOR . $path;
-			if (file_exists($testPath)) {
-				return $testPath;
-			}
-		}
-
-		return null;
-	}
-
-	// -------------------------------------------------------------------------------------------
-	// System-wide methods (moved from System class, which had namespace conflicts w/ PEAR System)
-	// -------------------------------------------------------------------------------------------
-
-	/**
-	 * Set System constants which can be retrieved by calling Phing::getProperty($propName).
-	 * @return void
-	 */
-	private static function setSystemConstants() {
-
-		/*
-		 * PHP_OS returns on
-		 *   WindowsNT4.0sp6  => WINNT
-		 *   Windows2000      => WINNT
-		 *   Windows ME       => WIN32
-		 *   Windows 98SE     => WIN32
-		 *   FreeBSD 4.5p7    => FreeBSD
-		 *   Redhat Linux     => Linux
-		 *   Mac OS X		  => Darwin
-		 */
-		self::setProperty('host.os', PHP_OS);
-
-		// this is used by some tasks too
-		self::setProperty('os.name', PHP_OS);
-
-		// it's still possible this won't be defined,
-		// e.g. if Phing is being included in another app w/o
-		// using the phing.php script.
-		if (!defined('PHP_CLASSPATH')) {
-			define('PHP_CLASSPATH', get_include_path());
-		}
-
-		self::setProperty('php.classpath', PHP_CLASSPATH);
-
-		// try to determine the host filesystem and set system property
-		// used by Fileself::getFileSystem to instantiate the correct
-		// abstraction layer
-
-		switch (strtoupper(PHP_OS)) {
-			case 'WINNT':
-				self::setProperty('host.fstype', 'WINNT');
-				self::setProperty('php.interpreter', getenv('PHP_COMMAND'));
-				break;
-			case 'WIN32':
-				self::setProperty('host.fstype', 'WIN32');
-				break;
-			default:
-				self::setProperty('host.fstype', 'UNIX');
-				break;
-		}
-
-		self::setProperty('line.separator', PHP_EOL);
-		self::setProperty('php.version', PHP_VERSION);
-		self::setProperty('user.home', getenv('HOME'));
-		self::setProperty('application.startdir', getcwd());
-		self::setProperty('phing.startTime', gmdate('D, d M Y H:i:s', time()) . ' GMT');
-
-		// try to detect machine dependent information
-		$sysInfo = array();
-		if (strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN' && function_exists("posix_uname")) {
-			$sysInfo = posix_uname();
-		} else {
-			$sysInfo['nodename'] = php_uname('n');
-			$sysInfo['machine']= php_uname('m') ;
-			//this is a not so ideal substition, but maybe better than nothing
-			$sysInfo['domain'] = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : "unknown";
-			$sysInfo['release'] = php_uname('r');
-			$sysInfo['version'] = php_uname('v');
-		}
-
-
-		self::setProperty("host.name", isset($sysInfo['nodename']) ? $sysInfo['nodename'] : "unknown");
-		self::setProperty("host.arch", isset($sysInfo['machine']) ? $sysInfo['machine'] : "unknown");
-		self::setProperty("host.domain",isset($sysInfo['domain']) ? $sysInfo['domain'] : "unknown");
-		self::setProperty("host.os.release", isset($sysInfo['release']) ? $sysInfo['release'] : "unknown");
-		self::setProperty("host.os.version", isset($sysInfo['version']) ? $sysInfo['version'] : "unknown");
-		unset($sysInfo);
-	}
-
-	/**
-	 * This gets a property that was set via command line or otherwise passed into Phing.
-	 * "Defined" in this case means "externally defined".  The reason this method exists is to
-	 * provide a public means of accessing commandline properties for (e.g.) logger or listener
-	 * scripts.  E.g. to specify which logfile to use, PearLogger needs to be able to access
-	 * the pear.log.name property.
-	 *
-	 * @param string $name
-	 * @return string value of found property (or null, if none found).
-	 */
-	public static function getDefinedProperty($name) {
-		return self::$definedProps->getProperty($name);
-	}
-
-	/**
-	 * This sets a property that was set via command line or otherwise passed into Phing.
-	 *
-	 * @param string $name
-	 * @return string value of found property (or null, if none found).
-	 */
-	public static function setDefinedProperty($name, $value) {
-		return self::$definedProps->setProperty($name, $value);
-	}
-
-	/**
-	 * Returns property value for a System property.
-	 * System properties are "global" properties like application.startdir,
-	 * and user.dir.  Many of these correspond to similar properties in Java
-	 * or Ant.
-	 *
-	 * @param string $paramName
-	 * @return string Value of found property (or null, if none found).
-	 */
-	public static function getProperty($propName) {
-
-		// some properties are detemined on each access
-		// some are cached, see below
-
-		// default is the cached value:
-		$val = isset(self::$properties[$propName]) ? self::$properties[$propName] : null;
-
-		// special exceptions
-		switch($propName) {
-			case 'user.dir':
-				$val = getcwd();
-				break;
-		}
-
-		return $val;
-	}
-
-	/** Retuns reference to all properties*/
-	public static function &getProperties() {
-		return self::$properties;
-	}
-
-	public static function setProperty($propName, $propValue) {
-		$propName = (string) $propName;
-		$oldValue = self::getProperty($propName);
-		self::$properties[$propName] = $propValue;
-		return $oldValue;
-	}
-
-	public static function currentTimeMillis() {
-		list($usec, $sec) = explode(" ",microtime());
-		return ((float)$usec + (float)$sec);
-	}
-
-	/**
-	 * Sets the include path to PHP_CLASSPATH constant (if this has been defined).
-	 * @return void
-	 * @throws ConfigurationException - if the include_path could not be set (for some bizarre reason)
-	 */
-	private static function setIncludePaths() {
-		if (defined('PHP_CLASSPATH')) {
-			$result = set_include_path(PHP_CLASSPATH);
-			if ($result === false) {
-				throw new ConfigurationException("Could not set PHP include_path.");
-			}
-			self::$origIniSettings['include_path'] = $result; // save original value for setting back later
-		}
-	}
-
-	/**
-	 * Sets PHP INI values that Phing needs.
-	 * @return void
-	 */
-	private static function setIni() {
-
-		self::$origIniSettings['error_reporting'] = error_reporting(E_ALL);
-
-		// We won't bother storing original max_execution_time, since 1) the value in
-		// php.ini may be wrong (and there's no way to get the current value) and
-		// 2) it would mean something very strange to set it to a value less than time script
-		// has already been running, which would be the likely change.
-
-		set_time_limit(0);
-
-		self::$origIniSettings['magic_quotes_gpc'] = ini_set('magic_quotes_gpc', 'off');
-		self::$origIniSettings['short_open_tag'] = ini_set('short_open_tag', 'off');
-		self::$origIniSettings['default_charset'] = ini_set('default_charset', 'iso-8859-1');
-		self::$origIniSettings['register_globals'] = ini_set('register_globals', 'off');
-		self::$origIniSettings['allow_call_time_pass_reference'] = ini_set('allow_call_time_pass_reference', 'on');
-		self::$origIniSettings['track_errors'] = ini_set('track_errors', 1);
-
-		// should return memory limit in MB
-		$mem_limit = (int) ini_get('memory_limit');
-		if ($mem_limit < 32) {
-			// We do *not* need to save the original value here, since we don't plan to restore
-			// this after shutdown (we don't trust the effectiveness of PHP's garbage collection).
-			ini_set('memory_limit', '32M'); // nore: this may need to be higher for many projects
-		}
-	}
-
-	/**
-	 * Restores [most] PHP INI values to their pre-Phing state.
-	 *
-	 * Currently the following settings are not restored:
-	 * 	- max_execution_time (because getting current time limit is not possible)
-	 *  - memory_limit (which may have been increased by Phing)
-	 *
-	 * @return void
-	 */
-	private static function restoreIni()
-	{
-		foreach(self::$origIniSettings as $settingName => $settingValue) {
-			switch($settingName) {
-				case 'error_reporting':
-					error_reporting($settingValue);
-					break;
-				default:
-					ini_set($settingName, $settingValue);
-			}
-		}
-	}
-
-	/**
-	 * Returns reference to Timer object.
-	 * @return Timer
-	 */
-	public static function getTimer() {
-		if (self::$timer === null) {
-			include_once 'phing/system/util/Timer.php';
-			self::$timer= new Timer();
-		}
-		return self::$timer;
-	}
-
-	/**
-	 * Start up Phing.
-	 * Sets up the Phing environment but does not initiate the build process.
-	 * @return void
-	 * @throws Exception - If the Phing environment cannot be initialized.
-	 */
-	public static function startup() {
-
-		// setup STDOUT and STDERR defaults
-		self::initializeOutputStreams();
-
-		// some init stuff
-		self::getTimer()->start();
-
-		self::setSystemConstants();
-		self::setIncludePaths();
-		self::setIni();
-	}
-
-	/**
-	 * Halts the system.
-	 * @deprecated This method is deprecated and is no longer called by Phing internally.  Any
-	 * 				normal shutdown routines are handled by the shutdown() method.
-	 * @see shutdown()
-	 */
-	public static function halt() {
-		self::shutdown();
-	}
-
-	/**
-	 * Performs any shutdown routines, such as stopping timers.
-	 * @return void
-	 */
-	public static function shutdown() {
-		self::restoreIni();
-		self::getTimer()->stop();
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/Project.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/Project.php
deleted file mode 100644
index 44af72ced..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/Project.php
+++ /dev/null
@@ -1,968 +0,0 @@
-<?php
-/*
- *  $Id: Project.php 345 2008-01-30 19:46:32Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-include_once 'phing/system/io/PhingFile.php';
-include_once 'phing/util/FileUtils.php';
-include_once 'phing/TaskAdapter.php';
-include_once 'phing/util/StringHelper.php';
-include_once 'phing/BuildEvent.php';
-include_once 'phing/input/DefaultInputHandler.php';
-
-/**
- *  The Phing project class. Represents a completely configured Phing project.
- *  The class defines the project and all tasks/targets. It also contains
- *  methods to start a build as well as some properties and FileSystem
- *  abstraction.
- *
- * @author    Andreas Aderhold <andi@binarycloud.com>
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.29 $
- * @package   phing
- */
-class Project {
-
-	// Logging level constants.
-	const MSG_DEBUG = 4;
-	const MSG_VERBOSE = 3;
-	const MSG_INFO = 2;
-	const MSG_WARN = 1;
-	const MSG_ERR = 0;
-	
-    /** contains the targets */
-    private $targets         = array();
-    /** global filterset (future use) */
-    private $globalFilterSet = array();
-    /**  all globals filters (future use) */
-    private $globalFilters   = array();
-    
-    /** Project properties map (usually String to String). */
-    private $properties = array();
-    
-    /**
-     * Map of "user" properties (as created in the Ant task, for example).
-     * Note that these key/value pairs are also always put into the
-     * project properties, so only the project properties need to be queried.
-     * Mapping is String to String.
-     */
-    private $userProperties = array();
-    
-    /**
-     * Map of inherited "user" properties - that are those "user"
-     * properties that have been created by tasks and not been set
-     * from the command line or a GUI tool.
-     * Mapping is String to String.
-     */
-    private $inheritedProperties = array();
-    
-    /** task definitions for this project*/
-    private $taskdefs = array();
-    
-    /** type definitions for this project */
-    private $typedefs = array();
-    
-    /** holds ref names and a reference to the referred object*/
-    private $references = array();
-    
-    /** The InputHandler being used by this project. */
-    private $inputHandler;
-    
-    /* -- properties that come in via xml attributes -- */
-    
-    /** basedir (PhingFile object) */
-    private $basedir;
-    
-    /** the default target name */
-    private $defaultTarget = 'all';
-    
-    /** project name (required) */
-    private $name;
-    
-    /** project description */
-    private $description;
-
-    /** a FileUtils object */
-    private $fileUtils;
-    
-    /**  Build listeneers */
-    private $listeners = array();
-
-    /**
-     *  Constructor, sets any default vars.
-     */
-    function __construct() {
-        $this->fileUtils = new FileUtils();
-        $this->inputHandler = new DefaultInputHandler();
-    }
-
-    /**
-     * Sets the input handler
-     */
-    public function setInputHandler(InputHandler $handler) {
-        $this->inputHandler = $handler;
-    }
-
-    /**
-     * Retrieves the current input handler.
-     */
-    public function getInputHandler() {
-        return $this->inputHandler;
-    }
-
-    /** inits the project, called from main app */
-    function init() {
-        // set builtin properties
-        $this->setSystemProperties();
-        
-        // load default tasks
-        $taskdefs = Phing::getResourcePath("phing/tasks/defaults.properties");
-        
-        try { // try to load taskdefs
-            $props = new Properties();
-            $in = new PhingFile((string)$taskdefs);
-
-            if ($in === null) {
-                throw new BuildException("Can't load default task list");
-            }
-            $props->load($in);
-
-            $enum = $props->propertyNames();
-            foreach($enum as $key) {
-                $value = $props->getProperty($key);
-                $this->addTaskDefinition($key, $value);
-            }
-        } catch (IOException $ioe) {
-            throw new BuildException("Can't load default task list");
-        }
-
-        // load default tasks
-        $typedefs = Phing::getResourcePath("phing/types/defaults.properties");
-
-        try { // try to load typedefs
-            $props = new Properties();
-            $in    = new PhingFile((string)$typedefs);
-            if ($in === null) {
-                throw new BuildException("Can't load default datatype list");
-            }
-            $props->load($in);
-
-            $enum = $props->propertyNames();
-            foreach($enum as $key) {
-                $value = $props->getProperty($key);
-                $this->addDataTypeDefinition($key, $value);
-            }
-        } catch(IOException $ioe) {
-            throw new BuildException("Can't load default datatype list");
-        }
-    }
-
-    /** returns the global filterset (future use) */
-    function getGlobalFilterSet() {
-        return $this->globalFilterSet;
-    }
-
-    // ---------------------------------------------------------
-    // Property methods
-    // ---------------------------------------------------------
-    
-    /**
-     * Sets a property. Any existing property of the same name
-     * is overwritten, unless it is a user property.
-     * @param string $name The name of property to set.
-     *             Must not be <code>null</code>.
-     * @param string $value The new value of the property.
-     *              Must not be <code>null</code>.
-     * @return void
-     */
-    public function setProperty($name, $value) {
-	
-        // command line properties take precedence
-        if (isset($this->userProperties[$name])) {
-            $this->log("Override ignored for user property " . $name, Project::MSG_VERBOSE);
-            return;
-        }
-
-        if (isset($this->properties[$name])) {
-            $this->log("Overriding previous definition of property " . $name, Project::MSG_VERBOSE);
-        }
-
-        $this->log("Setting project property: " . $name . " -> " . $value, Project::MSG_DEBUG);
-        $this->properties[$name] = $value;
-    }
-
-    /**
-     * Sets a property if no value currently exists. If the property
-     * exists already, a message is logged and the method returns with
-     * no other effect.
-     *
-     * @param string $name The name of property to set.
-     *             Must not be <code>null</code>.
-     * @param string $value The new value of the property.
-     *              Must not be <code>null</code>.
-     * @since 2.0
-     */
-    public function setNewProperty($name, $value) {
-        if (isset($this->properties[$name])) {
-            $this->log("Override ignored for property " . $name, Project::MSG_DEBUG);
-            return;
-        }
-        $this->log("Setting project property: " . $name . " -> " . $value, Project::MSG_DEBUG);
-        $this->properties[$name] = $value;
-    }
-
-    /**
-     * Sets a user property, which cannot be overwritten by
-     * set/unset property calls. Any previous value is overwritten.
-     * @param string $name The name of property to set.
-     *             Must not be <code>null</code>.
-     * @param string $value The new value of the property.
-     *              Must not be <code>null</code>.
-     * @see #setProperty()
-     */
-    public function setUserProperty($name, $value) {
-        $this->log("Setting ro project property: " . $name . " -> " . $value, Project::MSG_DEBUG);
-        $this->userProperties[$name] = $value;
-        $this->properties[$name] = $value;
-    }
-
-    /**
-     * Sets a user property, which cannot be overwritten by set/unset
-     * property calls. Any previous value is overwritten. Also marks
-     * these properties as properties that have not come from the
-     * command line.
-     *
-     * @param string $name The name of property to set.
-     *             Must not be <code>null</code>.
-     * @param string $value The new value of the property.
-     *              Must not be <code>null</code>.
-     * @see #setProperty()
-     */
-    public function setInheritedProperty($name, $value) {
-        $this->inheritedProperties[$name] = $value;
-        $this->setUserProperty($name, $value);
-    }
-
-    /**
-     * Sets a property unless it is already defined as a user property
-     * (in which case the method returns silently).
-     *
-     * @param name The name of the property.
-     *             Must not be <code>null</code>.
-     * @param value The property value. Must not be <code>null</code>.
-     */
-    private function setPropertyInternal($name, $value) {
-        if (isset($this->userProperties[$name])) {
-			$this->log("Override ignored for user property " . $name, Project::MSG_VERBOSE);
-            return;
-        }
-        $this->properties[$name] = $value;
-    }
-
-    /**
-     * Returns the value of a property, if it is set.
-     *
-     * @param string $name The name of the property.
-     *             May be <code>null</code>, in which case
-     *             the return value is also <code>null</code>.
-     * @return string The property value, or <code>null</code> for no match
-     *         or if a <code>null</code> name is provided.
-     */
-    public function getProperty($name) {
-        if (!isset($this->properties[$name])) {
-            return null;
-        }
-        return $this->properties[$name];
-    }
-
-    /**
-     * Replaces ${} style constructions in the given value with the
-     * string value of the corresponding data types.
-     *
-     * @param value The string to be scanned for property references.
-     *              May be <code>null</code>.
-     *
-     * @return the given string with embedded property names replaced
-     *         by values, or <code>null</code> if the given string is
-     *         <code>null</code>.
-     *
-     * @exception BuildException if the given value has an unclosed
-     *                           property name, e.g. <code>${xxx</code>
-     */
-    public function replaceProperties($value) {
-        return ProjectConfigurator::replaceProperties($this, $value, $this->properties);
-    }
-
-    /**
-     * Returns the value of a user property, if it is set.
-     *
-     * @param string $name The name of the property.
-     *             May be <code>null</code>, in which case
-     *             the return value is also <code>null</code>.
-     * @return string  The property value, or <code>null</code> for no match
-     *         or if a <code>null</code> name is provided.
-     */
-     public function getUserProperty($name) {
-        if (!isset($this->userProperties[$name])) {
-            return null;
-        }
-        return $this->userProperties[$name];
-    }
-
-    /**
-     * Returns a copy of the properties table.
-     * @return array A hashtable containing all properties
-     *         (including user properties).
-     */
-    public function getProperties() {
-        return $this->properties;
-    }
-
-    /**
-     * Returns a copy of the user property hashtable
-     * @return a hashtable containing just the user properties
-     */
-    public function getUserProperties() {
-        return $this->userProperties;
-    }
-
-    /**
-     * Copies all user properties that have been set on the command
-     * line or a GUI tool from this instance to the Project instance
-     * given as the argument.
-     *
-     * <p>To copy all "user" properties, you will also have to call
-     * {@link #copyInheritedProperties copyInheritedProperties}.</p>
-     *
-     * @param Project $other the project to copy the properties to.  Must not be null.
-     * @return void
-     * @since phing 2.0
-     */
-    public function copyUserProperties(Project $other) {        
-        foreach($this->userProperties as $arg => $value) {
-            if (isset($this->inheritedProperties[$arg])) {
-                continue;
-            }
-            $other->setUserProperty($arg, $value);
-        }
-    }
-
-    /**
-     * Copies all user properties that have not been set on the
-     * command line or a GUI tool from this instance to the Project
-     * instance given as the argument.
-     *
-     * <p>To copy all "user" properties, you will also have to call
-     * {@link #copyUserProperties copyUserProperties}.</p>
-     *
-     * @param other the project to copy the properties to.  Must not be null.
-     *
-     * @since phing 2.0
-     */
-    public function copyInheritedProperties(Project $other) {
-        foreach($this->userProperties as $arg => $value) {
-            if ($other->getUserProperty($arg) !== null) {
-                continue;
-            }
-            $other->setInheritedProperty($arg, $value);
-        }        
-    }
-    
-    // ---------------------------------------------------------
-    //  END Properties methods
-    // ---------------------------------------------------------
-
-
-    function setDefaultTarget($targetName) {
-        $this->defaultTarget = (string) trim($targetName);
-    }
-
-    function getDefaultTarget() {
-        return (string) $this->defaultTarget;
-    }
-
-    /**
-     * Sets the name of the current project
-     *
-     * @param    string   name of project
-     * @return   void
-     * @access   public
-     * @author   Andreas Aderhold, andi@binarycloud.com
-     */
-
-    function setName($name) {
-        $this->name = (string) trim($name);
-        $this->setProperty("phing.project.name", $this->name);
-    }
-
-    /**
-     * Returns the name of this project
-     *
-     * @returns  string  projectname
-     * @access   public
-     * @author   Andreas Aderhold, andi@binarycloud.com
-     */
-    function getName() {
-        return (string) $this->name;
-    }
-
-    /** Set the projects description */
-    function setDescription($description) {
-        $this->description = (string) trim($description);
-    }
-
-    /** return the description, null otherwise */
-    function getDescription() {
-        return $this->description;
-    }
-
-    /** Set basedir object from xml*/
-    function setBasedir($dir) {
-        if ($dir instanceof PhingFile) {
-            $dir = $dir->getAbsolutePath();
-        }
-
-        $dir = $this->fileUtils->normalize($dir);
-
-        $dir = new PhingFile((string) $dir);
-        if (!$dir->exists()) {
-            throw new BuildException("Basedir ".$dir->getAbsolutePath()." does not exist");
-        }
-        if (!$dir->isDirectory()) {
-            throw new BuildException("Basedir ".$dir->getAbsolutePath()." is not a directory");
-        }
-        $this->basedir = $dir;
-        $this->setPropertyInternal("project.basedir", $this->basedir->getAbsolutePath());
-        $this->log("Project base dir set to: " . $this->basedir->getPath(), Project::MSG_VERBOSE);
-        
-        // [HL] added this so that ./ files resolve correctly.  This may be a mistake ... or may be in wrong place.                
-        chdir($dir->getAbsolutePath());
-    }
-
-    /**
-     * Returns the basedir of this project
-     *
-     * @returns  PhingFile  Basedir PhingFile object
-     * @access   public
-     * @throws   BuildException
-     * @author   Andreas Aderhold, andi@binarycloud.com
-     */
-    function getBasedir() {
-        if ($this->basedir === null) {            
-            try { // try to set it
-                $this->setBasedir(".");
-            } catch (BuildException $exc) {
-                throw new BuildException("Can not set default basedir. ".$exc->getMessage());
-            }
-        }
-        return $this->basedir;
-    }
-
-    /**
-     * Sets system properties and the environment variables for this project.
-     * 
-     * @return void
-     */
-    function setSystemProperties() {
-        
-        // first get system properties
-        $systemP = array_merge( self::getProperties(), Phing::getProperties() );
-        foreach($systemP as $name => $value) {
-            $this->setPropertyInternal($name, $value);
-        }
-        
-        // and now the env vars
-        foreach($_SERVER as $name => $value) {
-            // skip arrays
-            if (is_array($value)) {
-                continue;
-            }
-            $this->setPropertyInternal('env.' . $name, $value);
-        }
-        return true;
-    }
-
-
-    /**
-     * Adds a task definition.
-     * @param string $name Name of tag.
-     * @param string $class The class path to use.
-     * @param string $classpath The classpat to use.
-     */
-    function addTaskDefinition($name, $class, $classpath = null) {
-        $name  = $name;
-        $class = $class;
-        if ($class === "") {
-            $this->log("Task $name has no class defined.", Project::MSG_ERR);
-        }  elseif (!isset($this->taskdefs[$name])) {
-            Phing::import($class, $classpath);
-            $this->taskdefs[$name] = $class;
-            $this->log("  +Task definiton: $name ($class)", Project::MSG_DEBUG);
-        } else {
-            $this->log("Task $name ($class) already registerd, skipping", Project::MSG_VERBOSE);
-        }
-    }
-
-    function &getTaskDefinitions() {
-        return $this->taskdefs;
-    }
-
-    /**
-     * Adds a data type definition.
-     * @param string $name Name of tag.
-     * @param string $class The class path to use.
-     * @param string $classpath The classpat to use.
-     */
-    function addDataTypeDefinition($typeName, $typeClass, $classpath = null) {    
-        if (!isset($this->typedefs[$typeName])) {        
-            Phing::import($typeClass, $classpath);
-            $this->typedefs[$typeName] = $typeClass;
-            $this->log("  +User datatype: $typeName ($typeClass)", Project::MSG_DEBUG);
-        } else {
-            $this->log("Type $name ($class) already registerd, skipping", Project::MSG_VERBOSE);
-        }
-    }
-
-    function getDataTypeDefinitions() {
-        return $this->typedefs;
-    }
-
-    /** add a new target to the project */
-    function addTarget($targetName, &$target) {
-        if (isset($this->targets[$targetName])) {
-            throw new BuildException("Duplicate target: $targetName");
-        }
-        $this->addOrReplaceTarget($targetName, $target);
-    }
-
-    function addOrReplaceTarget($targetName, &$target) {
-        $this->log("  +Target: $targetName", Project::MSG_DEBUG);
-        $target->setProject($this);
-        $this->targets[$targetName] = $target;
-    }
-
-    function getTargets() {
-        return $this->targets;
-    }
-
-    /**
-     * Create a new task instance and return reference to it. This method is
-     * sorta factory like. A _local_ instance is created and a reference returned to
-     * that instance. Usually PHP destroys local variables when the function call
-     * ends. But not if you return a reference to that variable.
-     * This is kinda error prone, because if no reference exists to the variable
-     * it is destroyed just like leaving the local scope with primitive vars. There's no
-     * central place where the instance is stored as in other OOP like languages.
-     *
-     * [HL] Well, ZE2 is here now, and this is  still working. We'll leave this alone
-     * unless there's any good reason not to.
-     *
-     * @param    string    $taskType    Task name
-     * @returns  Task                A task object
-     * @throws   BuildException
-     *           Exception
-     */
-    function createTask($taskType) {
-        try {
-            $cls = "";
-            $tasklwr = strtolower($taskType);
-            foreach ($this->taskdefs as $name => $class) {
-                if (strtolower($name) === $tasklwr) {
-                    $cls = StringHelper::unqualify($class);                                    
-                    break;
-                }
-            }
-            
-            if ($cls === "") {
-                return null;
-            }
-            
-            if (!class_exists($cls)) {
-                throw new BuildException("Could not instantiate class $cls, even though a class was specified. (Make sure that the specified class file contains a class with the correct name.)");
-            }
-            
-            $o = new $cls();        
-    
-            if ($o instanceof Task) {
-                $task = $o;
-            } else {
-                $this->log ("  (Using TaskAdapter for: $taskType)", Project::MSG_DEBUG);
-                // not a real task, try adapter
-                $taskA = new TaskAdapter();
-                $taskA->setProxy($o);
-                $task = $taskA;
-            }
-            $task->setProject($this);
-            $task->setTaskType($taskType);
-            // set default value, can be changed by the user
-            $task->setTaskName($taskType);
-            $this->log ("  +Task: " . $taskType, Project::MSG_DEBUG);
-        } catch (Exception $t) {
-            throw new BuildException("Could not create task of type: " . $taskType, $t);
-        }
-        // everything fine return reference
-        return $task;
-    }
-
-    /**
-     * Create a task instance and return reference to it
-     * See createTask() for explanation how this works
-     *
-     * @param    string   Type name
-     * @returns  object   A datatype object
-     * @throws   BuildException
-     *           Exception
-     */
-    function createDataType($typeName) {        
-        try {
-            $cls = "";
-            $typelwr = strtolower($typeName);
-            foreach ($this->typedefs as $name => $class) {
-                if (strtolower($name) === $typelwr) {
-                    $cls = StringHelper::unqualify($class);                                    
-                    break;
-                }
-            }
-            
-            if ($cls === "") {
-                return null;
-            }
-            
-            if (!class_exists($cls)) {
-                throw new BuildException("Could not instantiate class $cls, even though a class was specified. (Make sure that the specified class file contains a class with the correct name.)");
-            }
-            
-            $type = new $cls();
-            $this->log("  +Type: $typeName", Project::MSG_DEBUG);
-            if (!($type instanceof DataType)) {
-                throw new Exception("$class is not an instance of phing.types.DataType");
-            }
-            if ($type instanceof ProjectComponent) {
-                $type->setProject($this);
-            }
-        } catch (Exception $t) {
-            throw new BuildException("Could not create type: $typeName", $t);
-        }
-        // everything fine return reference
-        return $type;
-    }
-
-    /**
-     * Executes a list of targets
-     *
-     * @param    array  List of target names to execute
-     * @returns  void
-     * @throws   BuildException
-     */
-    function executeTargets($targetNames) {
-        foreach($targetNames as $tname) {
-            $this->executeTarget($tname);
-        }
-    }
-
-    /**
-     * Executes a target
-     *
-     * @param    string  Name of Target to execute
-     * @returns  void
-     * @throws   BuildException
-     */
-    function executeTarget($targetName) {
-
-        // complain about executing void
-        if ($targetName === null) {
-            throw new BuildException("No target specified");
-        }
-
-        // invoke topological sort of the target tree and run all targets
-        // until targetName occurs.
-        $sortedTargets = $this->_topoSort($targetName, $this->targets);        
-
-        $curIndex = (int) 0;
-        $curTarget = null;
-        do {
-            try {
-                $curTarget = $sortedTargets[$curIndex++];
-                $curTarget->performTasks();
-            } catch (BuildException $exc) {
-                $this->log("Execution of target \"".$curTarget->getName()."\" failed for the following reason: ".$exc->getMessage(), Project::MSG_ERR);
-                throw $exc;
-            }
-        } while ($curTarget->getName() !== $targetName);
-    }
-
-
-    function resolveFile($fileName, $rootDir = null) {
-        if ($rootDir === null) {
-            return $this->fileUtils->resolveFile($this->basedir, $fileName);
-        } else {
-            return $this->fileUtils->resolveFile($rootDir, $fileName);
-        }
-    }    
-
-    /**
-     * Topologically sort a set of Targets.
-     * @param  $root is the (String) name of the root Target. The sort is
-     *         created in such a way that the sequence of Targets until the root
-     *         target is the minimum possible such sequence.
-     * @param  $targets is a array representing a "name to Target" mapping
-     * @return An array of Strings with the names of the targets in
-     *         sorted order.
-     */
-    function _topoSort($root, &$targets) {
-
-        $root     = (string) $root;
-        $ret      = array();
-        $state    = array();
-        $visiting = array();
-
-        // We first run a DFS based sort using the root as the starting node.
-        // This creates the minimum sequence of Targets to the root node.
-        // We then do a sort on any remaining unVISITED targets.
-        // This is unnecessary for doing our build, but it catches
-        // circular dependencies or missing Targets on the entire
-        // dependency tree, not just on the Targets that depend on the
-        // build Target.
-
-        $this->_tsort($root, $targets, $state, $visiting, $ret);
-
-        $retHuman = "";
-        for ($i=0, $_i=count($ret); $i < $_i; $i++) {
-            $retHuman .= $ret[$i]->toString()." ";
-        }
-        $this->log("Build sequence for target '$root' is: $retHuman", Project::MSG_VERBOSE);
-
-        $keys = array_keys($targets);
-        while($keys) {
-            $curTargetName = (string) array_shift($keys);
-            if (!isset($state[$curTargetName])) {
-                $st = null;
-            } else {
-                $st = (string) $state[$curTargetName];
-            }
-
-            if ($st === null) {
-                $this->_tsort($curTargetName, $targets, $state, $visiting, $ret);
-            } elseif ($st === "VISITING") {
-                throw new Exception("Unexpected node in visiting state: $curTargetName");
-            }
-        }
-
-        $retHuman = "";
-        for ($i=0,$_i=count($ret); $i < $_i; $i++) {
-            $retHuman .= $ret[$i]->toString()." ";
-        }
-        $this->log("Complete build sequence is: $retHuman", Project::MSG_VERBOSE);
-
-        return $ret;
-    }
-
-    // one step in a recursive DFS traversal of the target dependency tree.
-    // - The array "state" contains the state (VISITED or VISITING or null)
-    //   of all the target names.
-    // - The stack "visiting" contains a stack of target names that are
-    //   currently on the DFS stack. (NB: the target names in "visiting" are
-    //    exactly the target names in "state" that are in the VISITING state.)
-    // 1. Set the current target to the VISITING state, and push it onto
-    //    the "visiting" stack.
-    // 2. Throw a BuildException if any child of the current node is
-    //    in the VISITING state (implies there is a cycle.) It uses the
-    //    "visiting" Stack to construct the cycle.
-    // 3. If any children have not been VISITED, tsort() the child.
-    // 4. Add the current target to the Vector "ret" after the children
-    //    have been visited. Move the current target to the VISITED state.
-    //    "ret" now contains the sorted sequence of Targets upto the current
-    //    Target.
-
-    function _tsort($root, &$targets, &$state, &$visiting, &$ret) {
-        $state[$root] = "VISITING";
-        $visiting[]  = $root;
-
-        if (!isset($targets[$root]) || !($targets[$root] instanceof Target)) {
-            $target = null;
-        } else {
-            $target = $targets[$root];
-        }
-
-        // make sure we exist
-        if ($target === null) {
-            $sb = "Target '$root' does not exist in this project.";
-            array_pop($visiting);
-            if (!empty($visiting)) {
-                $parent = (string) $visiting[count($visiting)-1];
-                $sb .= "It is used from target '$parent'.";
-            }
-            throw new BuildException($sb);
-        }
-
-        $deps = $target->getDependencies();
-
-        while($deps) {
-            $cur = (string) array_shift($deps);
-            if (!isset($state[$cur])) {
-                $m = null;
-            } else {
-                $m = (string) $state[$cur];
-            }
-            if ($m === null) {
-                // not been visited
-                $this->_tsort($cur, $targets, $state, $visiting, $ret);
-            } elseif ($m == "VISITING") {
-                // currently visiting this node, so have a cycle
-                throw $this->_makeCircularException($cur, $visiting);
-            }
-        }
-
-        $p = (string) array_pop($visiting);
-        if ($root !== $p) {
-            throw new Exception("Unexpected internal error: expected to pop $root but got $p");
-        }
-
-        $state[$root] = "VISITED";
-        $ret[] = $target;
-    }
-
-    function _makeCircularException($end, $stk) {
-        $sb = "Circular dependency: $end";
-        do {
-            $c = (string) array_pop($stk);
-            $sb .= " <- ".$c;
-        } while($c != $end);
-        return new BuildException($sb);
-    }
-
-    /**
-     * Adds a reference to an object. This method is called when the parser
-     * detects a id="foo" attribute. It passes the id as $name and a reference
-     * to the object assigned to this id as $value
-     */
-    function addReference($name, $object) {
-        if (isset($this->references[$name])) {
-            $this->log("Overriding previous definition of reference to $name", Project::MSG_WARN);
-        }
-        $this->log("Adding reference: $name -> ".get_class($object), Project::MSG_DEBUG);
-        $this->references[$name] = $object;
-    }
-
-    /**
-     * Returns the references array.
-     * @return array
-     */
-    function getReferences() {
-        return $this->references;
-    }
-	
-	/**
-	 * Returns a specific reference.
-	 * @param string $key The reference id/key.
-	 * @return Reference or null if not defined
-	 */
-	function getReference($key)
-	{
-		if (isset($this->references[$key])) {
-		    return $this->references[$key];
-		}
-		return null; // just to be explicit
-	}
-
-    /**
-     * Abstracting and simplifyling Logger calls for project messages
-     */
-    function log($msg, $level = Project::MSG_INFO) {
-        $this->logObject($this, $msg, $level);
-    }
-
-    function logObject($obj, $msg, $level) {
-        $this->fireMessageLogged($obj, $msg, $level);
-    }
-
-    function addBuildListener(BuildListener $listener) {
-        $this->listeners[] = $listener;
-    }
-
-    function removeBuildListener(BuildListener $listener) {
-        $newarray = array();
-        for ($i=0, $size=count($this->listeners); $i < $size; $i++) {
-            if ($this->listeners[$i] !== $listener) {
-                $newarray[] = $this->listeners[$i];
-            }
-        }
-        $this->listeners = $newarray;
-    }
-
-    function getBuildListeners() {
-        return $this->listeners;
-    }
-
-    function fireBuildStarted() {
-        $event = new BuildEvent($this);        
-        foreach($this->listeners as $listener) {
-            $listener->buildStarted($event);
-        }
-    }
-
-    function fireBuildFinished($exception) {        
-        $event = new BuildEvent($this);
-        $event->setException($exception);
-        foreach($this->listeners as $listener) {
-            $listener->buildFinished($event);
-        }
-    }
-
-    function fireTargetStarted($target) {
-        $event = new BuildEvent($target);        
-           foreach($this->listeners as $listener) {
-            $listener->targetStarted($event);
-        }
-    }
-
-    function fireTargetFinished($target, $exception) {
-        $event = new BuildEvent($target);        
-        $event->setException($exception);
-        foreach($this->listeners as $listener) {
-            $listener->targetFinished($event);
-        }
-    }
-
-    function fireTaskStarted($task) {
-        $event = new BuildEvent($task);        
-        foreach($this->listeners as $listener) {
-            $listener->taskStarted($event);
-        }
-    }
-
-    function fireTaskFinished($task, $exception) {
-        $event = new BuildEvent($task);        
-        $event->setException($exception);
-        foreach($this->listeners as $listener) {
-            $listener->taskFinished($event);
-        }
-    }
-
-    function fireMessageLoggedEvent($event, $message, $priority) {
-        $event->setMessage($message, $priority);
-        foreach($this->listeners as $listener) {
-            $listener->messageLogged($event);
-        }
-    }
-
-    function fireMessageLogged($object, $message, $priority) {
-        $this->fireMessageLoggedEvent(new BuildEvent($object), $message, $priority);
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/ProjectComponent.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/ProjectComponent.php
deleted file mode 100644
index f7557c6d5..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/ProjectComponent.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/*
- *  $Id: ProjectComponent.php 176 2007-03-14 14:23:39Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-/**
- *  Abstract class providing properties and methods common to all
- *  the project components
- *
- * @author    Andreas Aderhold <andi@binarycloud.com>
- * @author    Hans Lellelid <hans@xmpl.org> 
- * @version   $Revision: 1.5 $
- * @package   phing
- */
-abstract class ProjectComponent {
-
-    /**
-     * Holds a reference to the project that a project component
-     * (a task, a target, etc.) belongs to
-     *
-     * @var Project A reference to the current project instance
-     */
-    protected $project = null;
-
-    /**
-     * References the project to the current component.
-     *
-     * @param Project $project The reference to the current project
-     */
-    public function setProject($project) {
-        $this->project = $project;
-    }
-
-    /**
-     * Returns a reference to current project
-     *
-     * @return Project Reference to current porject object
-     */
-    public function getProject() {
-        return $this->project;
-    }
-
-    /**
-     *  Logs a message with the given priority.
-     *
-     *  @param string $msg The message to be logged.
-     *  @param integer $level The message's priority at this message should have
-     */
-    public function log($msg, $level = Project::MSG_INFO) {
-        if ($this->project !== null) {
-            $this->project->log($msg, $level);
-        }
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/RuntimeConfigurable.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/RuntimeConfigurable.php
deleted file mode 100644
index e993b9c19..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/RuntimeConfigurable.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/*
- *  $Id: RuntimeConfigurable.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-/**
- *  Wrapper class that holds the attributes of a Task (or elements
- *  nested below that level) and takes care of configuring that element
- *  at runtime.
- *
- *  <strong>SMART-UP INLINE DOCS</strong>
- *
- * @author    Andreas Aderhold <andi@binarycloud.com>
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.6 $
- * @package   phing
- */
-class RuntimeConfigurable {
-
-    private $elementTag = null;
-    private $children = array();
-    private $wrappedObject = null;
-    private $attributes = array();
-    private $characters = "";
-
-
-    /** @param proxy The element to wrap. */
-    function __construct($proxy, $elementTag) {
-        $this->wrappedObject = $proxy;
-        $this->elementTag = $elementTag;
-    }
-
-    function setProxy($proxy) {
-        $this->wrappedObject = $proxy;
-    }
-
-    /** Set's the attributes for the wrapped element. */
-    function setAttributes($attributes) {
-        $this->attributes = $attributes;
-    }
-
-    /** Returns the AttributeList of the wrapped element. */
-    function getAttributes() {
-        return $this->attributes;
-    }
-
-    /** Adds child elements to the wrapped element. */
-    function addChild(RuntimeConfigurable $child) {
-        $this->children[] = $child;
-    }
-
-    /** Returns the child with index */
-    function getChild($index) {
-        return $this->children[(int)$index];
-    }
-
-    /** Add characters from #PCDATA areas to the wrapped element. */
-    function addText($data) {
-        $this->characters .= (string) $data;
-    }
-
-    function getElementTag() {
-        return $this->elementTag;
-    }
-
-
-    /** Configure the wrapped element and all children. */
-    function maybeConfigure(Project $project) {
-        $id = null;
-
-        // DataType configured in ProjectConfigurator
-        //        if ( is_a($this->wrappedObject, "DataType") )
-        //            return;
-
-        if ($this->attributes || $this->characters) {
-            ProjectConfigurator::configure($this->wrappedObject, $this->attributes, $project);
-
-            if (isset($this->attributes["id"])) {
-                $id = $this->attributes["id"];
-            }
-
-            $this->attributes = null;
-
-            if ($this->characters) {
-                ProjectConfigurator::addText($project, $this->wrappedObject, (string) $this->characters);
-                $this->characters="";
-            }
-            if ($id !== null) {
-                $project->addReference($id, $this->wrappedObject);
-            }
-        }
-
-        if ( is_array($this->children) && !empty($this->children) ) {
-            // Configure all child of this object ...
-            foreach($this->children as $child) {
-                $child->maybeConfigure($project);
-                ProjectConfigurator::storeChild($project, $this->wrappedObject, $child->wrappedObject, strtolower($child->getElementTag()));
-            }
-        }
-    }
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/Target.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/Target.php
deleted file mode 100644
index 04d4f3e1c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/Target.php
+++ /dev/null
@@ -1,317 +0,0 @@
-<?php
-/*
- * $Id: Target.php 175 2007-03-14 13:52:03Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-include_once 'phing/TaskContainer.php';
-
-/**
- *  The Target component. Carries all required target data. Implements the
- *  abstract class {@link TaskContainer}
- *
- *  @author    Andreas Aderhold <andi@binarycloud.com>
- *  @copyright � 2001,2002 THYRELL. All rights reserved
- *  @version   $Revision: 1.10 $ $Date: 2007-03-14 22:52:03 +0900 (水, 14  3月 2007) $
- *  @access    public
- *  @see       TaskContainer
- *  @package   phing
- */
-
-class Target implements TaskContainer {
-    
-    /** name of target */
-    private $name;
-    
-    /** dependencies */
-    private $dependencies = array();
-    
-    /** holds objects of children of this target */
-    private $children = array();
-    
-    /** the if cond. from xml */
-    private $ifCondition = "";
-    
-    /** the unless cond. from xml */
-    private $unlessCondition = "";
-    
-    /** description of this target */
-    private $description;
-    
-    /** reference to project */
-    private $project;
-
-    /**
-     *  References the project to the current component.
-     *
-     *  @param Project The reference to the current project
-     */
-    public function setProject(Project $project) {
-        $this->project = $project;
-    }
-
-    /**
-     *  Returns reference to current project
-     *
-     *  @return Project Reference to current porject object
-     */
-    public function getProject() {
-        return $this->project;
-    }
-
-    /**
-     *  Sets the target dependencies from xml
-     *
-     *  @param string $depends Comma separated list of targetnames that depend on
-     *                  this target
-     *  @throws BuildException
-     */
-    public function setDepends($depends) {
-        // explode should be faster than strtok
-        $deps = explode(',', $depends);
-        for ($i=0, $size=count($deps); $i < $size; $i++) {
-            $trimmed = trim($deps[$i]);
-            if ($trimmed === "") {
-                throw new BuildException("Syntax Error: Depend attribute for target ".$this->getName()." is malformed.");
-            } 
-            $this->addDependency($trimmed);
-        }
-    }
-
-    /**
-     *  Adds a singular dependent target name to the list
-     *
-     *  @param   string   The dependency target to add
-     *  @access  public
-     */
-    public function addDependency($dependency) {
-        $this->dependencies[] = (string) $dependency;
-    }
-
-    /**
-     *  Returns reference to indexed array of the dependencies this target has.
-     *
-     *  @return  array  Referece to target dependencoes
-     */
-    public function getDependencies() {
-        return $this->dependencies;
-    }
-
-    /**
-     *  Sets the name of the target
-     *
-     *  @param  string   Name of this target
-     */
-    public function setName($name) {
-        $this->name = (string) $name;
-    }
-
-    /**
-     *  Returns name of this target.
-     *
-     *  @return  string     The name of the target
-     *  @access   public
-     */
-    function getName() {
-        return (string) $this->name;
-    }
-
-    /**
-     *  Adds a task element to the list of this targets child elements
-     *
-     *  @param   object  The task object to add
-     *  @access  public
-     */
-    function addTask(Task $task) {
-        $this->children[] = $task;
-    }
-
-    /**
-     *  Adds a runtime configurable element to the list of this targets child
-     *  elements.
-     *
-     *  @param   object  The RuntimeConfigurabel object
-     *  @access  public
-     */
-    function addDataType($rtc) {
-        $this->children[] = $rtc;
-    }
-
-    /**
-     *  Returns an array of all tasks this target has as childrens.
-     *
-     *  The task objects are copied here. Don't use this method to modify
-     *  task objects.
-     *
-     *  @return  array  Task[]
-     */
-    public function getTasks() {
-        $tasks = array();
-        for ($i=0,$size=count($this->children); $i < $size; $i++) {
-            $tsk = $this->children[$i];
-            if ($tsk instanceof Task) {
-                // note: we're copying objects here!
-                $tasks[] = clone $tsk;
-            }
-        }
-        return $tasks;
-    }
-
-    /**
-     *  Set the if-condition from the XML tag, if any. The property name given
-     *  as parameter must be present so the if condition evaluates to true
-     *
-     *  @param   string  The property name that has to be present
-     *  @access  public
-     */
-    public function setIf($property) {
-        $this->ifCondition = ($property === null) ? "" : $property;
-    }
-
-    /**
-     *  Set the unless-condition from the XML tag, if any. The property name
-     *  given as parameter must be present so the unless condition evaluates
-     *  to true
-     *
-     *  @param   string  The property name that has to be present
-     *  @access  public
-     */
-    public function setUnless($property) {
-        $this->unlessCondition = ($property === null) ? "" : $property;
-    }
-
-    /**
-     *  Sets a textual description of this target.
-     *
-     *  @param string The description text
-     */
-    public function setDescription($description) {
-        if ($description !== null && strcmp($description, "") !== 0) {
-            $this->description = (string) $description;
-        } else {
-            $this->description = null;
-        }
-    }
-
-    /**
-     *  Returns the description of this target.
-     *
-     *  @return string The description text of this target
-     */
-    public function getDescription() {
-        return $this->description;
-    }
-
-    /**
-     *  Returns a string representation of this target. In our case it
-     *  simply returns the target name field
-     *
-     *  @return string The string representation of this target
-     */
-    function toString() {
-        return (string) $this->name;
-    }
-
-    /**
-     *  The entry point for this class. Does some checking, then processes and
-     *  performs the tasks for this target.
-     *
-     */
-    public function main() {
-        if ($this->testIfCondition() && $this->testUnlessCondition()) {
-            foreach($this->children as $o) {
-                if ($o instanceof Task) {
-                    // child is a task
-                    $o->perform();
-                } else {
-                    // child is a RuntimeConfigurable
-                    $o->maybeConfigure($this->project);
-                }
-            }
-        } elseif (!$this->testIfCondition()) {
-            $this->project->log("Skipped target '".$this->name."' because property '".$this->ifCondition."' not set.", Project::MSG_VERBOSE);
-        } else {
-            $this->project->log("Skipped target '".$this->name."' because property '".$this->unlessCondition."' set.", Project::MSG_VERBOSE);
-        }
-    }
-
-    /**
-     *  Performs the tasks by calling the main method of this target that
-     *  actually executes the tasks.
-     *
-     *  This method is for ZE2 and used for proper exception handling of
-     *  task exceptions.
-     */
-    public function performTasks() {
-        try {// try to execute this target
-            $this->project->fireTargetStarted($this);
-            $this->main();
-            $this->project->fireTargetFinished($this, $null=null);
-        } catch (BuildException $exc) {
-            // log here and rethrow
-            $this->project->fireTargetFinished($this, $exc);
-            throw $exc;
-        }
-    }    
-
-    /**
-     *  Tests if the property set in ifConfiditon exists.
-     *
-     *  @return  boolean  <code>true</code> if the property specified
-     *                    in <code>$this->ifCondition</code> exists;
-     *                    <code>false</code> otherwise
-     */
-    private function testIfCondition() {
-        if ($this->ifCondition === "") {
-            return true;
-        }
-
-        $properties = explode(",", $this->ifCondition);
-
-        $result = true;
-        foreach ($properties as $property) {
-            $test = ProjectConfigurator::replaceProperties($this->getProject(), $property, $this->project->getProperties());
-            $result = $result && ($this->project->getProperty($test) !== null);
-        }
-
-        return $result;
-    }
-
-    /**
-     *  Tests if the property set in unlessCondition exists.
-     *
-     *  @return  boolean  <code>true</code> if the property specified
-     *                    in <code>$this->unlessCondition</code> exists;
-     *                    <code>false</code> otherwise
-     */
-    private function testUnlessCondition() {
-        if ($this->unlessCondition === "") {
-            return true;
-        }
-        
-        $properties = explode(",", $this->unlessCondition);
-
-        $result = true;
-        foreach ($properties as $property) {
-            $test = ProjectConfigurator::replaceProperties($this->getProject(), $property, $this->project->getProperties());
-            $result = $result && ($this->project->getProperty($test) === null);
-        }
-        return $result;
-    }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/Task.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/Task.php
deleted file mode 100644
index 16bf13f98..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/Task.php
+++ /dev/null
@@ -1,265 +0,0 @@
-<?php
-/*
- *  $Id: Task.php 174 2007-03-12 21:01:37Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/ProjectComponent.php';
-include_once 'phing/RuntimeConfigurable.php';
-
-/**
- * The base class for all Tasks.
- *
- * Use {@link Project#createTask} to register a new Task.
- *
- * @author    Andreas Aderhold <andi@binarycloud.com>
- * @copyright � 2001,2002 THYRELL. All rights reserved
- * @version   $Revision: 1.11 $
- * @see       Project#createTask()
- * @package   phing
- */
-abstract class Task extends ProjectComponent {
-
-    /**
-	 * @var Target owning Target object
-	 */
-    protected $target;
-    
-    /**
-	 * @var string description of the task
-	 */
-    protected $description;
-    
-    /**
-	 * @var string internal taskname (req)
-	 */
-    protected $taskType;
-    
-    /**
-	 * @var string Taskname for logger
-	 */
-    protected $taskName;
-    
-    /**
-	 * @var Location stored buildfile location
-	 */
-    protected $location;
-    
-    /**
-	 * @var RuntimeConfigurable wrapper of the task
-	 */
-    protected $wrapper;
-
-    /**
-     * Sets the owning target this task belongs to.
-     *
-     * @param Target Reference to owning target
-     */
-    public function setOwningTarget(Target $target) {
-        $this->target = $target;
-    }
-
-    /**
-     * Returns the owning target of this task.
-     *
-     * @return Target The target object that owns this task
-     */
-    public function getOwningTarget() {
-        return $this->target;
-    }
-
-    /**
-     * Returns the name of task, used only for log messages
-     *
-     * @return string Name of this task
-     */
-    public function getTaskName() {
-        if ($this->taskName === null) {
-            // if no task name is set, then it's possible
-            // this task was created from within another task.  We don't
-            // therefore know the XML tag name for this task, so we'll just
-            // use the class name stripped of "task" suffix.  This is only
-            // for log messages, so we don't have to worry much about accuracy.
-            return preg_replace('/task$/i', '', get_class($this));
-        }
-        return $this->taskName;
-    }
-
-    /**
-     * Sets the name of this task for log messages
-     *
-     * @return string A string representing the name of this task for log
-     */
-    public function setTaskName($name) {
-        $this->taskName = (string) $name;
-    }
-
-    /**
-     * Returns the name of the task under which it was invoked,
-     * usually the XML tagname
-     *
-     * @return string The type of this task (XML Tag)
-     */
-    public function getTaskType() {
-        return $this->taskType;
-    }
-
-    /**
-     * Sets the type of the task. Usually this is the name of the XML tag
-     *
-     * @param string The type of this task (XML Tag)
-     */
-    public function setTaskType($name) {
-        $this->taskType = (string) $name;
-    }
-	
-	/**
-	 * Returns a name 
-	 * 
-	 */
-	protected function getRegisterSlot($slotName) {
-		return Register::getSlot('task.' . $this->getTaskName() . '.' . $slotName);
-	}
-	
-    /**
-     * Provides a project level log event to the task.
-     *
-     * @param string  The message to log
-     * @param integer The priority of the message
-     * @see BuildEvent
-     * @see BuildListener
-     */
-    function log($msg, $level = Project::MSG_INFO) {
-        $this->project->logObject($this, $msg, $level);
-    }
-
-    /**
-     * Sets a textual description of the task
-     *
-     * @param string $desc The text describing the task
-     */
-    public function setDescription($desc) {
-        $this->description = $desc;
-    }
-
-    /**
-     * Returns the textual description of the task
-     *
-     * @return string The text description of the task
-     */
-    public function getDescription() {
-        return $this->description;
-    }
-
-    /**
-     * Called by the parser to let the task initialize properly.
-     * Should throw a BuildException if something goes wrong with the build
-     *
-     * This is abstract here, but may not be overloaded by subclasses.
-     *
-     * @throws BuildException
-     */
-    public function init() {
-    }
-
-    /**
-     *  Called by the project to let the task do it's work. This method may be
-     *  called more than once, if the task is invoked more than once. For
-     *  example, if target1 and target2 both depend on target3, then running
-     *  <em>phing target1 target2</em> will run all tasks in target3 twice.
-     *
-     *  Should throw a BuildException if someting goes wrong with the build
-     *
-     *  This is abstract here. Must be overloaded by real tasks.
-     */
-    abstract public function main();
-
-    /**
-     * Returns the location within the buildfile this task occurs. Used
-     * by {@link BuildException} to give detailed error messages.
-     *
-     * @return Location The location object describing the position of this
-     *                  task within the buildfile.
-     */
-    function getLocation() {
-        return $this->location;
-    }
-
-    /**
-     * Sets the location within the buildfile this task occurs. Called by
-     * the parser to set location information.
-     *
-     * @param Location $location The location object describing the position of this
-     *                  		 task within the buildfile.
-     */
-    function setLocation(Location $location) {
-        $this->location = $location;
-    }
-
-    /**
-     * Returns the wrapper object for runtime configuration
-     *
-     * @return RuntimeConfigurable The wrapper object used by this task
-     */
-    function getRuntimeConfigurableWrapper() {
-        if ($this->wrapper === null) {
-            $this->wrapper = new RuntimeConfigurable($this, $this->getTaskName());
-        }
-        return $this->wrapper;
-    }
-
-    /**
-     *  Sets the wrapper object this task should use for runtime
-     *  configurable elements.
-     *
-     * @param RuntimeConfigurable $wrapper The wrapper object this task should use
-     */
-    function setRuntimeConfigurableWrapper(RuntimeConfigurable $wrapper) {
-        $this->wrapper = $wrapper;
-    }
-
-    /**
-     *  Configure this task if it hasn't been done already.
-     */
-    public function maybeConfigure() {
-        if ($this->wrapper !== null) {
-            $this->wrapper->maybeConfigure($this->project);
-        }
-    }
-
-    /**
-     * Perfrom this task
-     */
-    public function perform() {
-
-        try { // try executing task
-            $this->project->fireTaskStarted($this);
-            $this->maybeConfigure();
-            $this->main();
-            $this->project->fireTaskFinished($this, $null=null);
-        } catch (Exception $exc) {
-            if ($exc instanceof BuildException) {
-                if ($exc->getLocation() === null) {
-                    $exc->setLocation($this->getLocation());
-                }
-            }
-            $this->project->fireTaskFinished($this, $exc);
-            throw $exc;
-        }
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/TaskAdapter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/TaskAdapter.php
deleted file mode 100644
index b11f9f297..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/TaskAdapter.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/*
- *  $Id: TaskAdapter.php 144 2007-02-05 15:19:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-
-/**
- *  Use introspection to "adapt" an arbitrary ( not extending Task, but with
- *  similar patterns).
- *
- *  @author    Andreas Aderhold <andi@binarycloud.com>
- *  @copyright � 2001,2002 THYRELL. All rights reserved
- *  @version   $Revision: 1.7 $
- *  @package   phing
- */
-class TaskAdapter extends Task {
-    
-    /** target object */
-    private $proxy;
-    
-    /**
-     * Main entry point.
-     * @return void
-     */
-    function main() {
-    
-        if (method_exists($this->proxy, "setProject")) {
-            try {  // try to set project
-                $this->proxy->setProject($this->project);
-            } catch (Exception $ex) {
-                $this->log("Error setting project in " . get_class($this->proxy) . Project::MSG_ERR);
-                throw new BuildException($ex);
-            }
-        } else {
-            throw new Exception("Error setting project in class " . get_class($this->proxy));
-        }
-               
-        if (method_exists($this->proxy, "main")) {
-            try { //try to call main
-                $this->proxy->main($this->project);
-            } catch (Exception $ex) {
-                $this->log("Error in " . get_class($this->proxy), Project::MSG_ERR);
-                throw new BuildException($ex->getMessage());
-            }
-        } else {
-            throw new BuildException("Your task-like class '" . get_class($this->proxy) ."' does not have a main() method");
-        }
-    }
-
-    /**
-     * Set the target object.
-     * @param object $o
-     * @return void
-     */
-    function setProxy($o) {
-        $this->proxy = $o;
-    }
-
-    /**
-     * Gets the target object.
-     * @return object
-     */
-    function getProxy() {
-        return $this->proxy;
-    }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/TaskContainer.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/TaskContainer.php
deleted file mode 100644
index ae13feca2..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/TaskContainer.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/*
- *  $Id: TaskContainer.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-/**
- *  Abstract interface for objects which can contain tasks (targets)
- *  Used to check if a class can contain tasks (via instanceof)
- *
- *  @author    Andreas Aderhold <andi@binarycloud.com>
- *  @copyright � 2001,2002 THYRELL. All rights reserved
- *  @version   $Revision: 1.5 $ $Date: 2006-09-15 05:19:08 +0900 (金, 15  9月 2006) $
- *  @access    public
- *  @package   phing
- */
-interface TaskContainer {
-
-    /**
-     *  Adds a task to this task container. Must be implemented
-     *  by derived class
-     *
-     *  @param  object  The task to be added to the container
-     *  @access public
-     */
-    function addTask(Task $task);
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/UnknownElement.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/UnknownElement.php
deleted file mode 100644
index eb8939e71..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/UnknownElement.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-/*
- *  $Id: UnknownElement.php 205 2007-07-29 21:04:42Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-
-/**
- * Wrapper class that holds all information necessary to create a task
- * that did not exist when Phing started.
- *
- * <em> This has something to do with phing encountering an task XML element
- * it is not aware of at start time. This is a situation where special steps
- * need to be taken so that the element is then known.</em>
- *
- * @author    Andreas Aderhold <andi@binarycloud.com>
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.9 $
- * @package   phing
- */
-class UnknownElement extends Task {
-
-    private $elementName;
-    private $realThing;
-    private $children = array();
-
-    /**
-     * Constructs a UnknownElement object
-     *
-     * @param    string  The XML element name that is unknown
-     * @access   public
-     */
-    function __construct($elementName) {
-        $this->elementName = (string) $elementName;
-    }
-
-    /**
-     * Return the XML element name that this <code>UnnownElement</code>
-     * handles.
-     *
-     * @return  string  The XML element name that is unknown
-     */
-    public function getTag() {
-        return (string) $this->elementName;
-    }
-
-    /**
-     * Tries to configure the unknown element
-     *
-     * @throws  BuildException if the element can not be configured
-     */
-    public function maybeConfigure() {
-    
-        $this->realThing = $this->makeObject($this, $this->wrapper);
-        $this->wrapper->setProxy($this->realThing);
-        if ($this->realThing instanceof Task) {
-            $this->realThing->setRuntimeConfigurableWrapper($this->wrapper);
-        }
-    
-        $this->handleChildren($this->realThing, $this->wrapper);
-        $this->wrapper->maybeConfigure($this->getProject());
-                                    
-    }
-
-    /**
-     * Called when the real task has been configured for the first time.
-     *
-     * @throws  BuildException if the task can not be created
-     */
-    public function main() {
-    
-        if ($this->realThing === null) {
-            // plain impossible to get here, maybeConfigure should
-            // have thrown an exception.
-            throw new BuildException("Should not be executing UnknownElement::main() -- task/type: {$this->elementName}");
-        }
-        
-        if ($this->realThing instanceof Task) {
-            $this->realThing->main();
-        }
-        
-    }
-
-    /**
-     * Add a child element to the unknown element
-     *
-     * @param   object  The object representing the child element
-     */
-    public function addChild(UnknownElement $child) {
-        $this->children[] = $child;
-    }
-
-    /**
-     *  Handle child elemets of the unknown element, if any.
-     *
-     *  @param ProjectComponent The parent object the unkown element belongs to
-     *  @param object The parent wrapper object
-     */
-    function handleChildren(ProjectComponent $parent, $parentWrapper) {
-
-        if ($parent instanceof TaskAdapter) {
-            $parent = $parent->getProxy();
-        }
-
-        $parentClass = get_class($parent);
-        $ih = IntrospectionHelper::getHelper($parentClass);
-
-        for ($i=0, $childrenCount=count($this->children); $i < $childrenCount; $i++) {
-
-            $childWrapper = $parentWrapper->getChild($i);
-            $child = $this->children[$i];
-            $realChild = null;
-            if ($parent instanceof TaskContainer) {
-                $realChild = $this->makeTask($child, $childWrapper, false);
-                $parent->addTask($realChild);
-            } else {
-				$project = $this->project === null ? $parent->project : $this->project;
-				$realChild = $ih->createElement($project, $parent, $child->getTag());
-            }
-
-            $childWrapper->setProxy($realChild);
-            if ($realChild instanceof Task) {
-                $realChild->setRuntimeConfigurableWrapper($childWrapper);
-            }
-			
-            if ($realChild instanceof ProjectComponent) {
-            	$child->handleChildren($realChild, $childWrapper);
-            }
-            
-            if ($realChild instanceof Task) {
-                $realChild->maybeConfigure();
-            }
-        }
-    }
-
-    /**
-     * Creates a named task or data type. If the real object is a task,
-     * it is configured up to the init() stage.
-     *
-     * @param UnknownElement $ue The unknown element to create the real object for.
-     *           Must not be <code>null</code>.
-     * @param RuntimeConfigurable $w  Ignored in this implementation.
-     * @return object The Task or DataType represented by the given unknown element.
-     */
-    protected function makeObject(UnknownElement $ue, RuntimeConfigurable $w) {
-        $o = $this->makeTask($ue, $w, true);
-        if ($o === null) {
-            $o = $this->project->createDataType($ue->getTag());
-        }
-        if ($o === null) {
-            throw new BuildException("Could not create task/type: '".$ue->getTag()."'. Make sure that this class has been declared using taskdef / typedef.");
-        }
-        return $o;
-    }
-    
-    /**
-     *  Create a named task and configure it up to the init() stage.
-     *
-     * @param UnknownElement $ue The unknwon element to create a task from
-     * @param RuntimeConfigurable $w The wrapper object
-     * @param boolean $onTopLevel Whether to treat this task as if it is top-level.
-     * @return Task The freshly created task
-     */
-    protected function makeTask(UnknownElement $ue, RuntimeConfigurable $w, $onTopLevel = false) {
-
-        $task = $this->project->createTask($ue->getTag());
-
-        if ($task === null) {
-            if (!$onTopLevel) {
-                throw new BuildException("Could not create task of type: '".$this->elementName."'. Make sure that this class has been declared using taskdef.");
-            }
-            return null;            
-        }
-
-        // used to set the location within the xmlfile so that exceptions can
-        // give detailed messages
-
-        $task->setLocation($this->getLocation());
-        $attrs = $w->getAttributes();
-        if (isset($attrs['id'])) {
-            $this->project->addReference($attrs['id'], $task);
-        }
-
-        // UnknownElement always has an associated target
-        $task->setOwningTarget($this->target);
-
-        $task->init();
-        return $task;
-    }
-
-    /**
-     *  Get the name of the task to use in logging messages.
-     *
-     *  @return  string  The task's name
-     */
-    function getTaskName() {
-        return $this->realThing === null ? parent::getTaskName() : $this->realThing->getTaskName();
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/BaseFilterReader.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/BaseFilterReader.php
deleted file mode 100644
index 64788074b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/BaseFilterReader.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-/*
- *  $Id: BaseFilterReader.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-include_once 'phing/system/io/FilterReader.php';
-include_once 'phing/system/io/StringReader.php';
-
-
-/**
- * Base class for core filter readers.
- *
- * @author    <a href="mailto:yl@seasonfive.com">Yannick Lecaillez</a>
- * @version   $Revision: 1.8 $ $Date: 2007-12-21 00:44:58 +0900 (金, 21 12月 2007) $
- * @access    public
- * @see       FilterReader
- * @package   phing.filters
- */
-class BaseFilterReader extends FilterReader {
-    
-    /** Have the parameters passed been interpreted? */
-    protected $initialized = false;
-    
-    /** The Phing project this filter is part of. */
-    protected $project = null;
-
-    /**
-     * Constructor used by Phing's introspection mechanism.
-     * The original filter reader is only used for chaining
-     * purposes, never for filtering purposes (and indeed
-     * it would be useless for filtering purposes, as it has
-     * no real data to filter). ChainedReaderHelper uses
-     * this placeholder instance to create a chain of real filters.
-     * 
-     * @param Reader $in
-     */
-    function __construct($in = null) {
-        if ($in === null) {
-            $dummy = "";
-            $in = new StringReader($dummy);
-        }
-        parent::__construct($in);
-    }
-
-    /**
-     * Returns the initialized status.
-     * 
-     * @return boolean whether or not the filter is initialized
-     */
-    function getInitialized() {
-        return $this->initialized;
-    }
-
-    /**
-     * Sets the initialized status.
-     * 
-     * @param boolean $initialized Whether or not the filter is initialized.
-     */
-    function setInitialized($initialized) {
-        $this->initialized = (boolean) $initialized;
-    }
-
-    /**
-     * Sets the project to work with.
-     * 
-     * @param object $project The project this filter is part of. 
-     *                Should not be <code>null</code>.
-     */
-    function setProject(Project $project) {
-        // type check, error must never occur, bad code of it does      
-        $this->project = $project;
-    }
-
-    /**
-     * Returns the project this filter is part of.
-     * 
-     * @return object The project this filter is part of
-     */
-    function getProject() {
-        return $this->project;
-    }
-
-    /**
-     * Reads characters.
-     *
-     * @param  off  Offset at which to start storing characters.
-     * @param  len  Maximum number of characters to read.
-     *
-     * @return Characters read, or -1 if the end of the stream
-     *         has been reached
-     *
-     * @throws IOException If an I/O error occurs
-     */
-    function read($len = null) {
-        return $this->in->read($len);
-    }
-
-    /**
-     * Reads a line of text ending with '\n' (or until the end of the stream).
-     * The returned String retains the '\n'.
-     * 
-     * @return the line read, or <code>null</code> if the end of the
-               stream has already been reached
-     * 
-     * @throws IOException if the underlying reader throws one during 
-     *                        reading
-     */
-    function readLine() {
-        $line = null;
-
-        while ( ($ch = $this->in->read(1)) !== -1 ) {
-            $line .= $ch;
-            if ( $ch === "\n" )
-                break;
-        }
-
-        return $line;
-    }
-    
-    /**
-     * Returns whether the end of file has been reached with input stream.
-     * @return boolean
-     */ 
-    function eof() {
-        return $this->in->eof();
-    }
-    
-    /**
-     * Convenience method to support logging in filters.
-     * @param string $msg Message to log.
-     * @param int $level Priority level.
-     */
-    function log($msg, $level = Project::MSG_INFO) {
-        if ($this->project !== null) {
-            $this->project->log("[filter:".get_class($this)."] ".$msg, $level);    
-        }
-    }
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/BaseParamFilterReader.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/BaseParamFilterReader.php
deleted file mode 100644
index 5cfa40319..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/BaseParamFilterReader.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/*
- *  $Id: BaseParamFilterReader.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-include_once 'phing/filters/BaseFilterReader.php';
-include_once 'phing/types/Parameterizable.php';
-include_once 'phing/types/Parameter.php';
-
-/**
- * Base class for core filter readers.
- *
- * @author <a href="mailto:yl@seasonfive.com">Yannick Lecaillez</a>
- * @copyright � 2003 seasonfive. All rights reserved
- * @version   $Revision: 1.5 $ $Date: 2007-12-21 00:44:58 +0900 (金, 21 12月 2007) $
- * @access    public
- * @see       FilterReader
- * @package   phing.filters
- */
-class BaseParamFilterReader extends BaseFilterReader implements Parameterizable {
-    
-    /** The passed in parameter array. */
-    protected $_parameters = array();
-    
-    /*
-     * Sets the parameters used by this filter, and sets
-     * the filter to an uninitialized status.
-     * 
-     * @param array Array of parameters to be used by this filter.
-     *              Should not be <code>null</code>.
-    */
-    function setParameters($parameters) {
-        // type check, error must never occur, bad code of it does
-        if ( !is_array($parameters) ) {
-            throw new Exception("Expected parameters array got something else");            
-        }
-
-        $this->_parameters = $parameters;
-        $this->setInitialized(false);
-    }
-
-    /*
-     * Returns the parameters to be used by this filter.
-     * 
-     * @return the parameters to be used by this filter
-    */
-    function &getParameters() {
-        return $this->_parameters;
-    }
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/ChainableReader.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/ChainableReader.php
deleted file mode 100644
index 29553dd55..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/ChainableReader.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/*
- *  $Id: ChainableReader.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-/**
- * Interface indicating that a reader may be chained to another one.
- *
- * @author Magesh Umasankar
- */
-interface ChainableReader {
-
-    /**
-     * Returns a reader with the same configuration as this one,
-     * but filtering input from the specified reader.
-     * 
-     * @param Reader $rdr the reader which the returned reader should be filtering
-     * 
-     * @return Reader A reader with the same configuration as this one, but
-     *         filtering input from the specified reader
-     */
-    public function chain(Reader $rdr);
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/ExpandProperties.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/ExpandProperties.php
deleted file mode 100644
index f7dbe12cf..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/ExpandProperties.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/*
- *  $Id: ExpandProperties.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-require_once 'phing/filters/BaseFilterReader.php';
-include_once 'phing/filters/ChainableReader.php';
-
-/**
- * Expands Phing Properties, if any, in the data.
- * <p>
- * Example:<br>
- * <pre><expandproperties/></pre>
- * Or:
- * <pre><filterreader classname="phing.filters.ExpandProperties'/></pre>
- *
- * @author    Yannick Lecaillez <yl@seasonfive.com>
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.6 $
- * @see       BaseFilterReader
- * @package   phing.filters
- */
-class ExpandProperties extends BaseFilterReader implements ChainableReader {
-   
-    /**
-     * Returns the filtered stream. 
-     * The original stream is first read in fully, and the Phing properties are expanded.
-     * 
-     * @return mixed     the filtered stream, or -1 if the end of the resulting stream has been reached.
-     * 
-     * @exception IOException if the underlying stream throws an IOException
-     * during reading
-     */
-    function read($len = null) {
-                
-        $buffer = $this->in->read($len);
-        
-        if($buffer === -1) {
-            return -1;
-        }
-        
-        $project = $this->getProject();
-        $buffer = ProjectConfigurator::replaceProperties($project, $buffer, $project->getProperties());
-        
-        return $buffer;
-    }
-        
-    /**
-     * Creates a new ExpandProperties filter using the passed in
-     * Reader for instantiation.
-     * 
-     * @param object A Reader object providing the underlying stream.
-     *               Must not be <code>null</code>.
-     * 
-     * @return object A new filter based on this configuration, but filtering
-     *         the specified reader
-     */
-    function chain(Reader $reader) {
-        $newFilter = new ExpandProperties($reader);
-        $newFilter->setProject($this->getProject());
-        return $newFilter;
-    }
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/HeadFilter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/HeadFilter.php
deleted file mode 100644
index c8a851adc..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/HeadFilter.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-
-/*
- *  $Id: HeadFilter.php 325 2007-12-20 15:44:58Z hans $  
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-include_once 'phing/filters/BaseParamFilterReader.php';
-include_once 'phing/filters/ChainableReader.php';
-
-/**
- * Reads the first <code>n</code> lines of a stream.
- * (Default is first 10 lines.)
- * <p>
- * Example:
- * <pre><headfilter lines="3"/></pre>
- * Or:
- * <pre><filterreader classname="phing.filters.HeadFilter">
- *    <param name="lines" value="3"/>
- * </filterreader></pre>
- *
- * @author    <a href="mailto:yl@seasonfive.com">Yannick Lecaillez</a>
- * @author    hans lellelid, hans@velum.net
- * @version   $Revision: 1.6 $ $Date: 2007-12-21 00:44:58 +0900 (金, 21 12月 2007) $
- * @access    public
- * @see       FilterReader
- * @package   phing.filters
- */
-class HeadFilter extends BaseParamFilterReader implements ChainableReader {
-
-    /**
-     * Parameter name for the number of lines to be returned.
-     */ 
-    const LINES_KEY = "lines";
-    
-    /**
-     * Number of lines currently read in.
-     * @var integer
-     */ 
-    private $_linesRead = 0;
-    
-    /**
-     * Number of lines to be returned in the filtered stream.
-     * @var integer
-     */ 
-    private $_lines     = 10;
-
-    /**
-     * Returns first n lines of stream.
-     * @return the resulting stream, or -1
-     * if the end of the resulting stream has been reached
-     * 
-     * @exception IOException if the underlying stream throws an IOException
-     * during reading     
-     */
-    function read($len = null) {
-    
-        if ( !$this->getInitialized() ) {
-            $this->_initialize();
-            $this->setInitialized(true);
-        }
-        
-        // note, if buffer contains fewer lines than
-        // $this->_lines this code will not work.
-        
-        if($this->_linesRead < $this->_lines) {
-        
-            $buffer = $this->in->read($len);
-            
-            if($buffer === -1) {
-                return -1;
-            }
-            
-            // now grab first X lines from buffer
-            
-            $lines = explode("\n", $buffer);
-            
-            $linesCount = count($lines);
-            
-            // must account for possibility that the num lines requested could 
-            // involve more than one buffer read.            
-            $len = ($linesCount > $this->_lines ? $this->_lines - $this->_linesRead : $linesCount);
-            $filtered_buffer = implode("\n", array_slice($lines, 0, $len) );
-            $this->_linesRead += $len;
-            
-            return $filtered_buffer;
-        
-        }
-        
-        return -1; // EOF, since the file is "finished" as far as subsequent filters are concerned.
-    }    
-
-    /**
-     * Sets the number of lines to be returned in the filtered stream.
-     * 
-     * @param integer $lines the number of lines to be returned in the filtered stream.
-     */
-    function setLines($lines) {
-        $this->_lines = (int) $lines;
-    }
-
-    /**
-     * Returns the number of lines to be returned in the filtered stream.
-     * 
-     * @return integer The number of lines to be returned in the filtered stream.
-     */
-    function getLines() {
-        return $this->_lines;
-    }
-
-    /**
-     * Creates a new HeadFilter using the passed in
-     * Reader for instantiation.
-     * 
-     * @param object A Reader object providing the underlying stream.
-     *            Must not be <code>null</code>.
-     * 
-     * @return object A new filter based on this configuration, but filtering
-     *         the specified reader.
-     */
-    function chain(Reader $reader) {
-        $newFilter = new HeadFilter($reader);
-        $newFilter->setLines($this->getLines());
-        $newFilter->setInitialized(true);
-        $newFilter->setProject($this->getProject());        
-        return $newFilter;
-    }
-
-    /**
-     * Scans the parameters list for the "lines" parameter and uses
-     * it to set the number of lines to be returned in the filtered stream.
-     */
-    private function _initialize() {
-        $params = $this->getParameters();
-        if ( $params !== null ) {
-            for($i = 0, $_i=count($params) ; $i < $_i; $i++) {
-                if ( self::LINES_KEY == $params[$i]->getName() ) {
-                    $this->_lines = (int) $params[$i]->getValue();
-                    break;
-                }
-            }
-        }
-    }
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/LineContains.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/LineContains.php
deleted file mode 100644
index d970c62b0..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/LineContains.php
+++ /dev/null
@@ -1,258 +0,0 @@
-<?php
-
-/*
- *  $Id: LineContains.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-include_once 'phing/filters/BaseParamFilterReader.php';
-include_once 'phing/filters/BaseFilterReader.php';
-include_once 'phing/filters/ChainableReader.php';
-
-/**
- * Filter which includes only those lines that contain all the user-specified
- * strings.
- *
- * Example:
- *
- * <pre><linecontains>
- *   <contains value="foo">
- *   <contains value="bar">
- * </linecontains></pre>
- *
- * Or:
- *
- * <pre><filterreader classname="phing.filters.LineContains">
- *    <param type="contains" value="foo"/>
- *    <param type="contains" value="bar"/>
- * </filterreader></pre>
- *
- * This will include only those lines that contain <code>foo</code> and
- * <code>bar</code>.
- *
- * @author    Yannick Lecaillez <yl@seasonfive.com>
- * @author    Hans Lellelid <hans@velum.net>
- * @version   $Revision: 1.11 $
- * @see       PhingFilterReader
- * @package   phing.filters
-*/
-class LineContains extends BaseParamFilterReader implements ChainableReader {
-
-    /**
-     * The parameter name for the string to match on.
-     * @var string
-     */ 
-    const CONTAINS_KEY = "contains";
-
-    /**
-     * Array of Contains objects.
-     * @var array
-     */ 
-    private $_contains = array();
-
-    /**
-     * [Deprecated] 
-     * @var string
-     */ 
-    private $_line = null;
-
-    /**
-     * Returns all lines in a buffer that contain specified strings.
-     * @return mixed buffer, -1 on EOF
-     */
-    function read($len = null) {
-        if ( !$this->getInitialized() ) {
-            $this->_initialize();
-            $this->setInitialized(true);
-        }
-        
-        $buffer = $this->in->read($len);
-        
-        if ($buffer === -1) {
-            return -1;
-        }
-        
-        $lines = explode("\n", $buffer);        
-        $matched = array();        
-        $containsSize = count($this->_contains);
-        
-        foreach($lines as $line) {                                
-            for($i = 0 ; $i < $containsSize ; $i++) {
-                $containsStr = $this->_contains[$i]->getValue();
-                if ( strstr($line, $containsStr) === false ) {
-                    $line = null;
-                    break;
-                }
-            }                
-            if($line !== null) {
-                $matched[] = $line;
-            }                
-        }        
-        $filtered_buffer = implode("\n", $matched);    
-        return $filtered_buffer;
-    }
-    
-    /**
-     * [Deprecated. For reference only, used to be read() method.] 
-     * Returns the next character in the filtered stream, only including
-     * lines from the original stream which contain all of the specified words.
-     *
-     * @return the next character in the resulting stream, or -1
-     * if the end of the resulting stream has been reached
-     *
-     * @exception IOException if the underlying stream throws an IOException
-     * during reading
-     */
-    function readChar() {
-        if ( !$this->getInitialized() ) {
-            $this->_initialize();
-            $this->setInitialized(true);
-        }
-
-        $ch = -1;
-
-        if ( $this->_line !== null ) {
-            $ch = substr($this->_line, 0, 1);
-            if ( strlen($this->_line) === 1 )
-                $this->_line = null;
-            else
-                $this->_line = substr($this->_line, 1);
-        } else {
-            $this->_line = $this->readLine();
-            if ( $this->_line === null ) {
-                $ch = -1;
-            } else {
-                $containsSize = count($this->_contains);
-                for($i = 0 ; $i < $containsSize ; $i++) {
-                    $containsStr = $this->_contains[$i]->getValue();
-                    if ( strstr($this->_line, $containsStr) === false ) {
-                        $this->_line = null;
-                        break;
-                    }
-                }
-                return $this->readChar();
-            }
-        }
-
-        return $ch;
-    }
-
-    /**
-     * Adds a <code><contains></code> nested element.
-     *
-     * @return Contains The <code>contains</code> element added.
-     *                  Must not be <code>null</code>.
-     */
-    function createContains() {
-        $num = array_push($this->_contains, new Contains());
-        return $this->_contains[$num-1];
-    }
-
-    /**
-     * Sets the array of words which must be contained within a line read
-     * from the original stream in order for it to match this filter.
-     *
-     * @param array $contains An array of words which must be contained
-     *                 within a line in order for it to match in this filter.
-     *                 Must not be <code>null<code>.
-     */
-    function setContains($contains) {
-        // type check, error must never occur, bad code of it does
-        if ( !is_array($contains) ) {
-            throw new Exception("Excpected array got something else");
-        }
-
-        $this->_contains = $contains;
-    }
-
-    /**
-     * Returns the vector of words which must be contained within a line read
-     * from the original stream in order for it to match this filter.
-     *
-     * @return array The array of words which must be contained within a line read
-     *         from the original stream in order for it to match this filter. The
-     *         returned object is "live" - in other words, changes made to the
-     *         returned object are mirrored in the filter.
-     */
-    function getContains() {
-        return $this->_contains;
-    }
-
-    /**
-     * Creates a new LineContains using the passed in
-     * Reader for instantiation.
-     *
-     * @param object A Reader object providing the underlying stream.
-     *               Must not be <code>null</code>.
-     *
-     * @return object A new filter based on this configuration, but filtering
-     *         the specified reader
-     */
-    function chain(Reader $reader) {
-        $newFilter = new LineContains($reader);
-        $newFilter->setContains($this->getContains());
-        $newFilter->setInitialized(true);
-        $newFilter->setProject($this->getProject());        
-        return $newFilter;
-    }
-
-    /**
-     * Parses the parameters to add user-defined contains strings.
-     */
-    private function _initialize() {
-        $params = $this->getParameters();
-        if ( $params !== null ) {
-            foreach($params as $param) {
-                if ( self::CONTAINS_KEY == $param->getType() ) {
-                    $cont = new Contains();
-                    $cont->setValue($param->getValue());
-                    array_push($this->_contains, $cont);
-                    break; // because we only support a single contains
-                }
-            }
-        }
-    }
-}
-
-/**
- * Holds a contains element.
- */
-class Contains {
-
-    /**
-     * @var string
-     */ 
-    private $_value;
-    
-    /**
-     * Set 'contains' value.
-     * @param string $contains
-     */ 
-    function setValue($contains) {
-        $this->_value = (string) $contains;
-    }
-    
-    /**
-     * Returns 'contains' value.
-     * @return string
-     */ 
-    function getValue() {
-        return $this->_value;
-    }
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/LineContainsRegexp.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/LineContainsRegexp.php
deleted file mode 100644
index ff64f6cfe..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/LineContainsRegexp.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-/*
- *  $Id: LineContainsRegexp.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-include_once 'phing/filters/BaseParamFilterReader.php';
-include_once 'phing/types/RegularExpression.php';
-include_once 'phing/filters/ChainableReader.php';
-
-/**
- * Filter which includes only those lines that contain the user-specified
- * regular expression matching strings.
- *
- * Example:
- * <pre><linecontainsregexp>
- *   <regexp pattern="foo*">
- * </linecontainsregexp></pre>
- *
- * Or:
- *
- * <pre><filterreader classname="phing.filters.LineContainsRegExp">
- *    <param type="regexp" value="foo*"/>
- * </filterreader></pre>
- *
- * This will fetch all those lines that contain the pattern <code>foo</code>
- *
- * @author    Yannick Lecaillez <yl@seasonfive.com>
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.8 $
- * @see       FilterReader
- * @package   phing.filters
- */
-class LineContainsRegexp extends BaseParamFilterReader implements ChainableReader {
-
-    /**
-     * Parameter name for regular expression.
-     * @var string
-     */ 
-    const REGEXP_KEY = "regexp";
-    
-    /**
-     * Regular expressions that are applied against lines.
-     * @var array
-     */ 
-    private    $_regexps = array();
-        
-    /**
-     * Returns all lines in a buffer that contain specified strings.
-     * @return mixed buffer, -1 on EOF
-     */
-    function read($len = null) {
-    
-        if ( !$this->getInitialized() ) {
-            $this->_initialize();
-            $this->setInitialized(true);
-        }
-        
-        $buffer = $this->in->read($len);
-        
-        if ($buffer === -1) {
-            return -1;
-        }
-        
-        $lines = explode("\n", $buffer);        
-        $matched = array();        
-        
-        $regexpsSize = count($this->_regexps);
-        foreach($lines as $line) {    
-             for($i = 0 ; $i<$regexpsSize ; $i++) {
-                    $regexp = $this->_regexps[$i];
-                    $re = $regexp->getRegexp($this->getProject());
-                    $matches = $re->matches($line);
-                    if ( !$matches ) {
-                        $line = null;
-                        break;
-                    }
-            }            
-            if($line !== null) {
-                $matched[] = $line;
-            }                
-        }        
-        $filtered_buffer = implode("\n", $matched);    
-        return $filtered_buffer;
-    }
-    
-    /**
-     * Adds a <code>regexp</code> element.
-     * 
-     * @return object regExp The <code>regexp</code> element added. 
-     */
-    function createRegexp() {
-        $num = array_push($this->_regexps, new RegularExpression());
-        return $this->_regexps[$num-1];
-    }
-
-    /**
-     * Sets the vector of regular expressions which must be contained within 
-     * a line read from the original stream in order for it to match this 
-     * filter.
-     * 
-     * @param regexps An array of regular expressions which must be contained 
-     *                within a line in order for it to match in this filter. Must not be 
-     *                <code>null</code>.
-     */
-    function setRegexps($regexps) {
-        // type check, error must never occur, bad code of it does
-        if ( !is_array($regexps) ) {
-            throw new Exception("Excpected an 'array', got something else");
-        }
-        $this->_regexps = $regexps;
-    }
-
-    /**
-     * Returns the array of regular expressions which must be contained within 
-     * a line read from the original stream in order for it to match this 
-     * filter.
-     * 
-     * @return array The array of regular expressions which must be contained within 
-     *         a line read from the original stream in order for it to match this 
-     *         filter. The returned object is "live" - in other words, changes made to 
-     *         the returned object are mirrored in the filter.
-     */
-    function getRegexps() {
-        return $this->_regexps;
-    }
-
-    /**
-     * Creates a new LineContainsRegExp using the passed in
-     * Reader for instantiation.
-     * 
-     * @param object A Reader object providing the underlying stream.
-     *               Must not be <code>null</code>.
-     * 
-     * @return object A new filter based on this configuration, but filtering
-     *         the specified reader
-     */
-    function chain(Reader $reader) {
-        $newFilter = new LineContainsRegExp($reader);
-        $newFilter->setRegexps($this->getRegexps());
-        $newFilter->setInitialized(true);
-        $newFilter->setProject($this->getProject());        
-        return $newFilter;
-    }
-
-    /**
-     * Parses parameters to add user defined regular expressions.
-     */
-    private function _initialize() {
-        $params = $this->getParameters();
-        if ( $params !== null ) {
-            for($i = 0 ; $i<count($params) ; $i++) {
-                if ( self::REGEXP_KEY === $params[$i]->getType() ) {
-                    $pattern = $params[$i]->getValue();
-                    $regexp = new RegularExpression();
-                    $regexp->setPattern($pattern);
-                    array_push($this->_regexps, $regexp);
-                }
-            }
-        }
-    }
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/PrefixLines.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/PrefixLines.php
deleted file mode 100644
index f8184bdf1..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/PrefixLines.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-
-/*
- *  $Id: PrefixLines.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-include_once 'phing/filters/BaseParamFilterReader.php';
-include_once 'phing/filters/ChainableReader.php';
-
-/**
- * Attaches a prefix to every line.
- *
- * Example:
- * <pre><prefixlines prefix="Foo"/></pre>
- *
- * Or:
- *
- * <pre><filterreader classname="phing.filters.PrefixLines">
- *  <param name="prefix" value="Foo"/>
- * </filterreader></pre>
- *
- * @author    <a href="mailto:yl@seasonfive.com">Yannick Lecaillez</a>
- * @author    hans lellelid, hans@velum.net
- * @version   $Revision: 1.6 $ $Date: 2007-12-21 00:44:58 +0900 (金, 21 12月 2007) $
- * @access    public
- * @see       FilterReader
- * @package   phing.filters
-*/
-class PrefixLines extends BaseParamFilterReader implements ChainableReader {
-
-    /**
-     * Parameter name for the prefix.
-     * @var string
-     */ 
-    const PREFIX_KEY = "lines";
-    
-    /**
-     * The prefix to be used.
-     * @var string
-     */ 
-    private    $_prefix = null;
- 
-    /**
-     * Adds a prefix to each line of input stream and returns resulting stream.
-     * 
-     * @return mixed buffer, -1 on EOF
-     */
-    function read($len = null) {
-        if ( !$this->getInitialized() ) {
-            $this->_initialize();
-            $this->setInitialized(true);
-        }
-        
-        $buffer = $this->in->read($len);
-        
-        if ($buffer === -1) {
-            return -1;
-        }
-        
-        $lines = explode("\n", $buffer);        
-        $filtered = array();        
-        
-        foreach($lines as $line) {
-            $line = $this->_prefix . $line;
-            $filtered[] = $line;
-        }
-                
-        $filtered_buffer = implode("\n", $filtered);    
-        return $filtered_buffer;
-    }
-    
-    /**
-     * Sets the prefix to add at the start of each input line.
-     * 
-     * @param string $prefix The prefix to add at the start of each input line.
-     *               May be <code>null</code>, in which case no prefix
-     *               is added.
-     */
-    function setPrefix($prefix) {
-        $this->_prefix = (string) $prefix;
-    }
-
-    /**
-     * Returns the prefix which will be added at the start of each input line.
-     * 
-     * @return string The prefix which will be added at the start of each input line
-     */
-    function getPrefix() {
-        return $this->_prefix;
-    }
-
-    /**
-     * Creates a new PrefixLines filter using the passed in
-     * Reader for instantiation.
-     * 
-     * @param object A Reader object providing the underlying stream.
-     *               Must not be <code>null</code>.
-     * 
-     * @return object A new filter based on this configuration, but filtering
-     *         the specified reader
-     */
-    function chain(Reader $reader) {  
-        $newFilter = new PrefixLines($reader);
-        $newFilter->setPrefix($this->getPrefix());
-        $newFilter->setInitialized(true);
-        $newFilter->setProject($this->getProject());        
-        return $newFilter;
-    }
-
-    /**
-     * Initializes the prefix if it is available from the parameters.
-     */
-    private function _initialize() {
-        $params = $this->getParameters();
-        if ( $params !== null ) {
-            for($i = 0, $_i=count($params) ; $i < $_i ; $i++) {
-                if ( self::PREFIX_KEY == $params[$i]->getName() ) {
-                    $this->_prefix = (string) $params[$i]->getValue();
-                    break;
-                }
-            }
-        }
-    }
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/ReplaceRegexp.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/ReplaceRegexp.php
deleted file mode 100644
index 0756e01dd..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/ReplaceRegexp.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-
-/*
- *  $Id: ReplaceRegexp.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-require_once 'phing/filters/BaseFilterReader.php';
-include_once 'phing/filters/ChainableReader.php';
-include_once 'phing/types/RegularExpression.php';
-
-/**
- * Performs a regexp find/replace on stream.
- * <p>
- * Example:<br>
- * <pre>
- * <replaceregexp>
- *    <regexp pattern="\r\n" replace="\n"/>
- *    <regexp pattern="(\w+)\.xml" replace="\1.php" ignoreCase="true"/>
- * </replaceregexp>
- * </pre>
- *
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.5 $
- * @package   phing.filters
- */
-class ReplaceRegexp extends BaseFilterReader implements ChainableReader {
-    
-    /**
-     * @var array RegularExpression[]
-     */
-    private $regexps = array();            
-    
-    /**
-     * Creator method handles nested <regexp> tags.
-     * @return RegularExpression
-     */
-    function createRegexp() {
-        $num = array_push($this->regexps, new RegularExpression());
-        return $this->regexps[$num-1];
-    }
-    
-    /**
-     * Sets the current regexps.
-     * (Used when, e.g., cloning/chaining the method.)
-     * @param array RegularExpression[]
-     */
-    function setRegexps($regexps) {
-        $this->regexps = $regexps;
-    }
-    
-    /**
-     * Gets the current regexps.
-     * (Used when, e.g., cloning/chaining the method.)
-     * @return array RegularExpression[]
-     */    
-    function getRegexps() {
-        return $this->regexps;
-    }
-    
-    /**
-     * Returns the filtered stream. 
-     * The original stream is first read in fully, and the regex replace is performed.
-     * 
-     * @param int $len Required $len for Reader compliance.
-     * 
-     * @return mixed The filtered stream, or -1 if the end of the resulting stream has been reached.
-     * 
-     * @exception IOException if the underlying stream throws an IOException
-     * during reading
-     */
-    function read($len = null) {
-                
-        $buffer = $this->in->read($len);
-        
-        if($buffer === -1) {
-            return -1;
-        }
-
-        // perform regex replace here ...
-        foreach($this->regexps as $exptype) {
-            $regexp = $exptype->getRegexp($this->project);
-            try {
-                $buffer = $regexp->replace($buffer);
-                $this->log("Performing regexp replace: /".$regexp->getPattern()."/".$regexp->getReplace()."/g".($regexp->getIgnoreCase() ? 'i' : ''), Project::MSG_VERBOSE);
-            } catch (Exception $e) {
-                // perhaps mismatch in params (e.g. no replace or pattern specified)
-                $this->log("Error performing regexp replace: " . $e->getMessage(), Project::MSG_WARN);
-            }
-        }
-        
-        return $buffer;
-    }
-
-    /**
-     * Creates a new ReplaceRegExp filter using the passed in
-     * Reader for instantiation.
-     * 
-     * @param Reader $reader A Reader object providing the underlying stream.
-     *               Must not be <code>null</code>.
-     * 
-     * @return ReplaceRegExp A new filter based on this configuration, but filtering
-     *         the specified reader
-     */
-    function chain(Reader $reader) {
-        $newFilter = new ReplaceRegExp($reader);
-        $newFilter->setProject($this->getProject());
-        $newFilter->setRegexps($this->getRegexps());
-        return $newFilter;
-    }
-
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/ReplaceTokens.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/ReplaceTokens.php
deleted file mode 100644
index a43dcd463..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/ReplaceTokens.php
+++ /dev/null
@@ -1,415 +0,0 @@
-<?php
-
-/*
- *  $Id: ReplaceTokens.php 325 2007-12-20 15:44:58Z hans $  
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-include_once 'phing/filters/BaseParamFilterReader.php';
-include_once 'phing/types/TokenSource.php';
-include_once 'phing/filters/ChainableReader.php';
-
-/*
- * Replaces tokens in the original input with user-supplied values.
- *
- * Example:
- *
- * <pre><replacetokens begintoken="#" endtoken="#">;
- *   <token key="DATE" value="${TODAY}"/>
- * </replacetokens></pre>
- *
- * Or:
- *
- * <pre><filterreader classname="phing.filters.ReplaceTokens">
- *   <param type="tokenchar" name="begintoken" value="#"/>
- *   <param type="tokenchar" name="endtoken" value="#"/>
- *   <param type="token" name="DATE" value="${TODAY}"/>
- * </filterreader></pre>
- *
- * @author    <a href="mailto:yl@seasonfive.com">Yannick Lecaillez</a>
- * @author    hans lellelid, hans@velum.net
- * @version   $Revision: 1.14 $ $Date: 2007-12-21 00:44:58 +0900 (金, 21 12月 2007) $
- * @access    public
- * @see       BaseParamFilterReader
- * @package   phing.filters
- */
-class ReplaceTokens extends BaseParamFilterReader implements ChainableReader {
-
-    /**
-     * Default "begin token" character.
-     * @var string
-     */
-    const DEFAULT_BEGIN_TOKEN = "@";
-
-    /**
-     * Default "end token" character.
-     * @var string
-     */
-    const DEFAULT_END_TOKEN = "@";
-
-    /**
-     * [Deprecated] Data that must be read from, if not null.
-     * @var string
-     */
-    private    $_queuedData = null;
-
-    /**
-     * Array to hold the replacee-replacer pairs (String to String).
-     * @var array
-     */
-    private $_tokens = array();
-
-    /**
-     * Array to hold the token sources that make tokens from
-     * different sources available
-     * @var array
-     */
-    private $_tokensources = array();
-
-    /**
-     * Array holding all tokens given directly to the Filter and
-     * those passed via a TokenSource.
-     * @var array
-     */
-    private $_alltokens = null;
-
-    /**
-     * Character marking the beginning of a token.
-     * @var string
-     */
-    private    $_beginToken = "@";  // self::DEFAULT_BEGIN_TOKEN;
-
-    /**
-     * Character marking the end of a token.
-     * @var string
-     */
-    private    $_endToken = "@"; //self::DEFAULT_END_TOKEN;
-
-    /**
-     * Performs lookup on key and returns appropriate replacement string.
-     * @param array $matches Array of 1 el containing key to search for.
-     * @return string     Text with which to replace key or value of key if none is found.
-     * @access private
-     */
-    private function replaceTokenCallback($matches) {
-                
-        $key = $matches[1];
-        
-        /* Get tokens from tokensource and merge them with the
-         * tokens given directly via build file. This should be 
-         * done a bit more elegantly
-         */
-        if ($this->_alltokens === null) {
-            $this->_alltokens = array();
-
-            $count = count($this->_tokensources);
-            for ($i = 0; $i < $count; $i++) {
-                $source = $this->_tokensources[$i];
-                $this->_alltokens = array_merge($this->_alltokens, $source->getTokens());
-            }
-
-
-            $this->_alltokens = array_merge($this->_tokens, $this->_alltokens);
-        }
-
-        $tokens = $this->_alltokens;
-
-        $replaceWith = null;
-        $count = count($tokens);
-
-        for ($i = 0; $i < $count; $i++) {
-            if ($tokens[$i]->getKey() === $key) {
-                $replaceWith = $tokens[$i]->getValue();
-            }
-        }
-
-        if ($replaceWith === null) {
-            $replaceWith = $this->_beginToken . $key . $this->_endToken;            
-            $this->log("No token defined for key \"".$this->_beginToken  . $key . $this->_endToken."\"");
-        } else {
-            $this->log("Replaced \"".$this->_beginToken  . $key . $this->_endToken ."\" with \"".$replaceWith."\"");
-        }
-
-        return $replaceWith;
-    }
-
-    /**
-     * Returns stream with tokens having been replaced with appropriate values.
-     * If a replacement value is not found for a token, the token is left in the stream.
-     * 
-     * @return mixed filtered stream, -1 on EOF.
-     */
-    function read($len = null) {
-        if ( !$this->getInitialized() ) {
-            $this->_initialize();
-            $this->setInitialized(true);
-        }
-
-        // read from next filter up the chain
-        $buffer = $this->in->read($len);
-
-        if($buffer === -1) {
-            return -1;
-        }    
-        
-        // filter buffer
-        $buffer = preg_replace_callback(
-            "/".preg_quote($this->_beginToken)."([\w\.\-:]+?)".preg_quote($this->_endToken)."/",
-            array($this, 'replaceTokenCallback'), $buffer);
-
-        return $buffer;
-    }
-   
-    /**
-     * Sets the "begin token" character.
-     * 
-     * @param string $beginToken the character used to denote the beginning of a token.
-     */
-    function setBeginToken($beginToken) {
-        $this->_beginToken = (string) $beginToken;
-    }
-
-    /**
-     * Returns the "begin token" character.
-     * 
-     * @return string The character used to denote the beginning of a token.
-     */
-    function getBeginToken() {
-        return $this->_beginToken;
-    }
-
-    /**
-     * Sets the "end token" character.
-     * 
-     * @param string $endToken the character used to denote the end of a token
-     */
-    function setEndToken($endToken) {
-        $this->_endToken = (string) $endToken;
-    }
-
-    /**
-     * Returns the "end token" character.
-     * 
-     * @return the character used to denote the beginning of a token
-     */
-    function getEndToken() {
-        return $this->_endToken;
-    }
-
-    /**
-     * Adds a token element to the map of tokens to replace.
-     * 
-     * @return object The token added to the map of replacements.
-     *               Must not be <code>null</code>.
-     */
-    function createToken() {
-        $num = array_push($this->_tokens, new Token());
-        return $this->_tokens[$num-1];
-    }
-    
-    /**
-     * Adds a token source to the sources of this filter.
-     *
-     * @return  object  A Reference to the source just added.
-     */
-    function createTokensource() {
-        $num = array_push($this->_tokensources, new TokenSource());
-        return $this->_tokensources[$num-1];
-    }
-
-    /**
-     * Sets the map of tokens to replace.
-     * ; used by ReplaceTokens::chain()
-     *
-     * @param array A map (String->String) of token keys to replacement
-     *              values. Must not be <code>null</code>.
-     */
-    function setTokens($tokens) {
-        // type check, error must never occur, bad code of it does
-        if ( !is_array($tokens) ) {
-            throw new Exception("Excpected 'array', got something else");
-        }
-
-        $this->_tokens = $tokens;
-    }
-
-    /**
-     * Returns the map of tokens which will be replaced.
-     * ; used by ReplaceTokens::chain()
-     *
-     * @return array A map (String->String) of token keys to replacement values.
-     */
-    function getTokens() {
-        return $this->_tokens;
-    }
-
-    /**
-     * Sets the tokensources to use; used by ReplaceTokens::chain()
-     * 
-     * @param   array   An array of token sources.
-     */ 
-    function setTokensources($sources) {
-        // type check
-        if ( !is_array($sources)) {
-            throw new Exception("Exspected 'array', got something else");
-        }
-        $this->_tokensources = $sources;
-    }
-
-    /**
-     * Returns the token sources used by this filter; used by ReplaceTokens::chain()
-     * 
-     * @return  array
-     */
-    function getTokensources() {
-        return $this->_tokensources;
-    }
-
-    /**
-     * Creates a new ReplaceTokens using the passed in
-     * Reader for instantiation.
-     * 
-     * @param object A Reader object providing the underlying stream.
-     *               Must not be <code>null</code>.
-     * 
-     * @return object A new filter based on this configuration, but filtering
-     *         the specified reader
-     */
-    function chain(Reader $reader) {
-        $newFilter = new ReplaceTokens($reader);
-        $newFilter->setProject($this->getProject());
-        $newFilter->setBeginToken($this->getBeginToken());
-        $newFilter->setEndToken($this->getEndToken());
-        $newFilter->setTokens($this->getTokens());
-        $newFilter->setTokensources($this->getTokensources());
-        $newFilter->setInitialized(true);
-        return $newFilter;
-    }
-
-    /**
-     * Initializes tokens and loads the replacee-replacer hashtable.
-     * This method is only called when this filter is used through
-     * a <filterreader> tag in build file.
-     */
-    private function _initialize() {
-        $params = $this->getParameters();
-        if ( $params !== null ) {
-            for($i = 0 ; $i<count($params) ; $i++) {
-                if ( $params[$i] !== null ) {
-                    $type = $params[$i]->getType();
-                    if ( $type === "tokenchar" ) {
-                        $name = $params[$i]->getName();
-                        if ( $name === "begintoken" ) {
-                            $this->_beginToken = substr($params[$i]->getValue(), 0, 1);
-                        } else if ( $name === "endtoken" ) {
-                            $this->_endToken = substr($params[$i]->getValue(), 0, 1);
-                        }
-                    } else if ( $type === "token" ) {
-                        $name  = $params[$i]->getName();
-                        $value = $params[$i]->getValue();
-
-                        $tok = new Token();
-                        $tok->setKey($name);
-                        $tok->setValue($value);
-
-                        array_push($this->_tokens, $tok);
-                    } else if ( $type === "tokensource" ) {
-                        // Store data from nested tags in local array
-                        $arr = array(); $subparams = $params[$i]->getParams();
-                        $count = count($subparams);
-                        for ($i = 0; $i < $count; $i++)  {
-                            $arr[$subparams[$i]->getName()] = $subparams[$i]->getValue();
-                        }
-
-                        // Create TokenSource
-                        $tokensource = new TokenSource();
-                        if (isset($arr["classname"])) 
-                            $tokensource->setClassname($arr["classname"]);
-
-                        // Copy other parameters 1:1 to freshly created TokenSource
-                        foreach ($arr as $key => $value) {
-                            if (strtolower($key) === "classname")
-                                continue;
-                            $param = $tokensource->createParam();
-                            $param->setName($key);
-                            $param->setValue($value);
-                        }
-
-                        $this->_tokensources[] = $tokensource;
-                    }
-                }
-            }
-        }
-    }
-}
-
-/**
- * Holds a token.
- */
-class Token {
-
-    /**
-     * Token key.
-     * @var string
-     */
-    private $_key;
-
-    /**
-     * Token value.
-     * @var string
-     */
-    private $_value;
-
-    /**
-     * Sets the token key.
-     * 
-     * @param string $key The key for this token. Must not be <code>null</code>.
-     */
-    function setKey($key) {
-        $this->_key = (string) $key;
-    }
-
-    /**
-     * Sets the token value.
-     * 
-     * @param string $value The value for this token. Must not be <code>null</code>.
-     */
-    function setValue($value) {
-        $this->_value = (string) $value;
-    }
-
-    /**
-     * Returns the key for this token.
-     * 
-     * @return string The key for this token.
-     */
-    function getKey() {
-        return $this->_key;
-    }
-
-    /**
-     * Returns the value for this token.
-     * 
-     * @return string The value for this token.
-     */
-    function getValue() {
-        return $this->_value;
-    }
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/StripLineBreaks.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/StripLineBreaks.php
deleted file mode 100644
index 8c21efcf1..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/StripLineBreaks.php
+++ /dev/null
@@ -1,148 +0,0 @@
-<?php
-
-/*
- *  $Id: StripLineBreaks.php 325 2007-12-20 15:44:58Z hans $  
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-include_once 'phing/filters/BaseParamFilterReader.php';
-include_once 'phing/filters/ChainableReader.php';
-
-/**
- * Filter to flatten the stream to a single line.
- * 
- * Example:
- *
- * <pre><striplinebreaks/></pre>
- *
- * Or:
- *
- * <pre><filterreader classname="phing.filters.StripLineBreaks"/></pre>
- *
- * @author    <a href="mailto:yl@seasonfive.com">Yannick Lecaillez</a>
- * @author    hans lellelid, hans@velum.net
- * @version   $Revision: 1.8 $ $Date: 2007-12-21 00:44:58 +0900 (金, 21 12月 2007) $
- * @access    public
- * @see       BaseParamFilterReader
- * @package   phing.filters
- */
-class StripLineBreaks extends BaseParamFilterReader implements ChainableReader {
-
-    /**
-     * Default line-breaking characters.
-     * @var string
-     */
-    const DEFAULT_LINE_BREAKS = "\r\n";
-    
-    /**
-     * Parameter name for the line-breaking characters parameter.
-     * @var string
-     */
-    const LINES_BREAKS_KEY = "linebreaks";
-    
-    /**
-     * The characters that are recognized as line breaks.
-     * @var string
-     */ 
-    private    $_lineBreaks = "\r\n"; // self::DEFAULT_LINE_BREAKS;
- 
-    /**
-     * Returns the filtered stream, only including
-     * characters not in the set of line-breaking characters.
-     * 
-     * @return mixed    the resulting stream, or -1
-     *         if the end of the resulting stream has been reached.
-     * 
-     * @exception IOException if the underlying stream throws an IOException
-     *            during reading     
-     */
-    function read($len = null) {
-        if ( !$this->getInitialized() ) {
-            $this->_initialize();
-            $this->setInitialized(true);
-        }
-
-        $buffer = $this->in->read($len);
-        if($buffer === -1) {
-            return -1;
-        }
-        
-        $buffer = preg_replace("/[".$this->_lineBreaks."]/", '', $buffer);           
-
-        return $buffer;
-    }
-    
-     /**
-     * Sets the line-breaking characters.
-     * 
-     * @param string $lineBreaks A String containing all the characters to be
-     *                   considered as line-breaking.
-     */
-    function setLineBreaks($lineBreaks) {
-        $this->_lineBreaks = (string) $lineBreaks;
-    }
-
-    /**
-     * Gets the line-breaking characters.
-     * 
-     * @return string A String containing all the characters that are considered as line-breaking.
-     */ 
-    function getLineBreaks() {
-        return $this->_lineBreaks;
-    }
-
-    /**
-     * Creates a new StripLineBreaks using the passed in
-     * Reader for instantiation.
-     * 
-     * @param object A Reader object providing the underlying stream.
-     *               Must not be <code>null</code>.
-     * 
-     * @return object A new filter based on this configuration, but filtering
-     *         the specified reader
-     */
-    function chain(Reader $reader) {
-        $newFilter = new StripLineBreaks($reader);
-        $newFilter->setLineBreaks($this->getLineBreaks());
-        $newFilter->setInitialized(true);
-        $newFilter->setProject($this->getProject());        
-        return $newFilter;
-    }
-
-    /**
-     * Parses the parameters to set the line-breaking characters.
-     */
-    private function _initialize() {
-        $userDefinedLineBreaks = null;
-        $params = $this->getParameters();
-        if ( $params !== null ) {
-            for($i = 0 ; $i<count($params) ; $i++) {
-                if ( self::LINE_BREAKS_KEY === $params[$i]->getName() ) {
-                    $userDefinedLineBreaks = $params[$i]->getValue();
-                    break;
-                }
-            }
-        }
-
-        if ( $userDefinedLineBreaks !== null ) {
-            $this->_lineBreaks = $userDefinedLineBreaks;
-        }
-    }
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/StripLineComments.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/StripLineComments.php
deleted file mode 100644
index 7b70776be..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/StripLineComments.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-
-/*
- *  $Id: StripLineComments.php 325 2007-12-20 15:44:58Z hans $  
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-include_once 'phing/filters/BaseParamFilterReader.php';
-include_once 'phing/filters/ChainableReader.php';
-
-/*
- * This filter strips line comments.
- *
- * Example:
- *
- * <pre><striplinecomments>
- *   <comment value="#"/>
- *   <comment value="--"/>
- *   <comment value="REM "/>
- *   <comment value="rem "/>
- *   <comment value="//"/>
- * </striplinecomments></pre>
- *
- * Or:
- *
- * <pre><filterreader classname="phing.filters.StripLineComments">
- *   <param type="comment" value="#"/>
- *   <param type="comment" value="--"/>
- *   <param type="comment" value="REM "/>
- *   <param type="comment" value="rem "/>
- *   <param type="comment" value="//"/>
- * </filterreader></pre>
- *
- * @author    <a href="mailto:yl@seasonfive.com">Yannick Lecaillez</a>
- * @author    hans lellelid, hans@velum.net
- * @version   $Revision: 1.8 $ $Date: 2007-12-21 00:44:58 +0900 (金, 21 12月 2007) $
- * @access    public
- * @see       BaseParamFilterReader
- * @package   phing.filters
- */
-class StripLineComments extends BaseParamFilterReader implements ChainableReader {
-    
-    /** Parameter name for the comment prefix. */
-    const COMMENTS_KEY = "comment";
-    
-    /** Array that holds the comment prefixes. */
-    private $_comments = array();
-    
-    /**
-     * Returns stream only including
-     * lines from the original stream which don't start with any of the 
-     * specified comment prefixes.
-     * 
-     * @return mixed the resulting stream, or -1
-     *         if the end of the resulting stream has been reached.
-     * 
-     * @throws IOException if the underlying stream throws an IOException
-     *            during reading     
-     */
-    function read($len = null) {
-    
-        if ( !$this->getInitialized() ) {
-            $this->_initialize();
-            $this->setInitialized(true);
-        }
-        
-        $buffer = $this->in->read($len);
-        
-        if ($buffer === -1) {
-            return -1;
-        }
-        
-        $lines = explode("\n", $buffer);        
-        $filtered = array();    
-            
-        $commentsSize = count($this->_comments);
-        
-        foreach($lines as $line) {            
-            for($i = 0; $i < $commentsSize; $i++) {
-                $comment = $this->_comments[$i]->getValue();
-                if ( StringHelper::startsWith($comment, ltrim($line)) ) {
-                    $line = null;
-                    break;
-                }
-            }
-            if ($line !== null) {
-                $filtered[] = $line;
-            }
-        }
-                
-        $filtered_buffer = implode("\n", $filtered);    
-        return $filtered_buffer;
-    }        
-
-    /*
-     * Adds a <code>comment</code> element to the list of prefixes.
-     * 
-     * @return comment The <code>comment</code> element added to the
-     *                 list of comment prefixes to strip.
-    */
-    function createComment() {
-        $num = array_push($this->_comments, new Comment());
-        return $this->_comments[$num-1];
-    }
-
-    /*
-     * Sets the list of comment prefixes to strip.
-     * 
-     * @param comments A list of strings, each of which is a prefix
-     *                 for a comment line. Must not be <code>null</code>.
-    */
-    function setComments($lineBreaks) {
-        if (!is_array($lineBreaks)) {
-            throw new Exception("Excpected 'array', got something else");
-        }
-        $this->_comments = $lineBreaks;
-    }
-
-    /*
-     * Returns the list of comment prefixes to strip.
-     * 
-     * @return array The list of comment prefixes to strip.
-    */
-    function getComments() {
-        return $this->_comments;
-    }
-
-    /*
-     * Creates a new StripLineComments using the passed in
-     * Reader for instantiation.
-     * 
-     * @param reader A Reader object providing the underlying stream.
-     *               Must not be <code>null</code>.
-     * 
-     * @return a new filter based on this configuration, but filtering
-     *         the specified reader
-     */
-    function chain(Reader $reader) {
-        $newFilter = new StripLineComments($reader);
-        $newFilter->setComments($this->getComments());
-        $newFilter->setInitialized(true);
-        $newFilter->setProject($this->getProject());        
-        return $newFilter;
-    }
-
-    /*
-     * Parses the parameters to set the comment prefixes.
-    */
-    private function _initialize() {
-        $params = $this->getParameters();
-        if ( $params !== null ) {
-            for($i = 0 ; $i<count($params) ; $i++) {
-                if ( self::COMMENTS_KEY === $params[$i]->getType() ) {
-                    $comment = new Comment();
-                    $comment->setValue($params[$i]->getValue());
-                    array_push($this->_comments, $comment);
-                }
-            }
-        }
-    }
-}
-
-/*
- * The class that holds a comment representation.
-*/
-class Comment {
-    
-    /** The prefix for a line comment. */
-    private    $_value;
-
-    /*
-     * Sets the prefix for this type of line comment.
-     *
-     * @param string $value The prefix for a line comment of this type.
-     *                Must not be <code>null</code>.
-     */
-    function setValue($value) {
-        $this->_value = (string) $value;
-    }
-
-    /*
-     * Returns the prefix for this type of line comment.
-     * 
-     * @return string The prefix for this type of line comment.
-    */
-    function getValue() {
-        return $this->_value;
-    }
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/StripPhpComments.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/StripPhpComments.php
deleted file mode 100644
index 99337551e..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/StripPhpComments.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-
-/*
- *  $Id: StripPhpComments.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-include_once 'phing/filters/BaseFilterReader.php';
-include_once 'phing/filters/ChainableReader.php';
-
-/**
- * This is a Php comment and string stripper reader that filters
- * those lexical tokens out for purposes of simple Php parsing.
- * (if you have more complex Php parsing needs, use a real lexer).
- * Since this class heavily relies on the single char read function,
- * you are reccomended to make it work on top of a buffered reader.
- *
- * @author    <a href="mailto:yl@seasonfive.com">Yannick Lecaillez</a>
- * @author    hans lellelid, hans@velum.net
- * @version   $Revision: 1.6 $ $Date: 2007-12-21 00:44:58 +0900 (金, 21 12月 2007) $
- * @access    public
- * @see       FilterReader
- * @package   phing.filters
- */
-class StripPhpComments extends BaseFilterReader implements ChainableReader {
-    /**
-     * The read-ahead character, used for effectively pushing a single
-     * character back. -1 indicates that no character is in the buffer.
-     */
-    private $_readAheadCh = -1;
-
-    /**
-     * Whether or not the parser is currently in the middle of a string
-     * literal.
-     * @var boolean
-     */
-    private $_inString = false;    
-
-    /**
-     * Returns the  stream without Php comments.
-     * 
-     * @return the resulting stream, or -1
-     *         if the end of the resulting stream has been reached
-     * 
-     * @throws IOException if the underlying stream throws an IOException
-     *                        during reading     
-     */
-    function read($len = null) {
-    
-        $buffer = $this->in->read($len);
-        if($buffer === -1) {
-            return -1;
-        }
-        
-        // This regex replace /* */ and // style comments
-        $buffer = preg_replace('/\/\*[^*]*\*+([^\/*][^*]*\*+)*\/|\/\/[^\n]*|("(\\\\.|[^"\\\\])*"|\'(\\\\.|[^\'\\\\])*\'|.[^\/"\'\\\\]*)/s', "$2", $buffer);
-                
-        // The regex above is not identical to, but is based on the expression below:
-        //
-        // created by Jeffrey Friedl
-        //   and later modified by Fred Curtis.
-        //     s{
-        //          /\*         ##  Start of /* ... */ comment
-        //          [^*]*\*+    ##  Non-* followed by 1-or-more *'s
-        //          (
-        //            [^/*][^*]*\*+
-        //          )*          ##  0-or-more things which don't start with /
-        //                      ##    but do end with '*'
-        //          /           ##  End of /* ... */ comment
-        //
-        //        |         ##     OR  various things which aren't comments:
-        //
-        //          (
-        //            "           ##  Start of " ... " string
-        //            (
-        //              \\.           ##  Escaped char
-        //            |               ##    OR
-        //              [^"\\]        ##  Non "\
-        //            )*
-        //           "           ##  End of " ... " string
-        //
-        //          |         ##     OR
-        //
-        //            '           ##  Start of ' ... ' string
-        //            (
-        //              \\.           ##  Escaped char
-        //            |               ##    OR
-        //              [^'\\]        ##  Non '\
-        //            )*
-        //            '           ##  End of ' ... ' string
-        //
-        //          |         ##     OR
-        //
-        //            .           ##  Anything other char
-        //            [^/"'\\]*   ##  Chars which doesn't start a comment, string or escape
-        //          )
-        //        }{$2}gxs;
-                                
-        return $buffer;
-    }
-        
-    
-    /*
-     * Returns the next character in the filtered stream, not including
-     * Php comments.
-     * 
-     * @return the next character in the resulting stream, or -1
-     *         if the end of the resulting stream has been reached
-     * 
-     * @throws IOException if the underlying stream throws an IOException
-     *                        during reading     
-     * @deprecated
-     */
-    function readChar() {
-        $ch = -1;
-
-        if ( $this->_readAheadCh !== -1 ) {
-            $ch = $this->_readAheadCh;
-            $this->_readAheadCh = -1;
-        } else {
-            $ch = $this->in->readChar();
-            if ( $ch === "\"" ) {
-                $this->_inString = !$this->_inString;
-            } else {
-                if ( !$this->_inString ) {
-                    if ( $ch === "/" ) {
-                        $ch = $this->in->readChar();
-                        if ( $ch === "/" ) {
-                            while ( $ch !== "\n" && $ch !== -1 ) {
-                                $ch = $this->in->readChar();
-                            }
-                        } else if ( $ch === "*" ) {
-                            while ( $ch !== -1 ) {
-                                $ch = $this->in->readChar();
-                                while ( $ch === "*" && $ch !== -1 ) {
-                                    $ch = $this->in->readChar();
-                                }
-
-                                if ( $ch === "/" ) {
-                                    $ch = $this->readChar();
-                                    echo "$ch\n";
-                                    break;
-                                }
-                            }
-                        } else {
-                            $this->_readAheadCh = $ch;
-                            $ch = "/";
-                        }
-                    }
-                }
-            }
-        }
-
-        return $ch;
-    }
-
-    /**
-     * Creates a new StripPhpComments using the passed in
-     * Reader for instantiation.
-     * 
-     * @param reader A Reader object providing the underlying stream.
-     *               Must not be <code>null</code>.
-     * 
-     * @return a new filter based on this configuration, but filtering
-     *         the specified reader
-     */
-    function chain(Reader $reader) {
-        $newFilter = new StripPhpComments($reader);
-        $newFilter->setProject($this->getProject());        
-        return $newFilter;
-    }
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/StripWhitespace.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/StripWhitespace.php
deleted file mode 100644
index a45df0f2d..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/StripWhitespace.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-/*
- *  $Id $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-include_once 'phing/filters/BaseFilterReader.php';
-include_once 'phing/filters/ChainableReader.php';
-
-/**
- * Strips whitespace from [php] files using PHP stripwhitespace() method.
- * 
- * @author    Hans Lellelid, hans@velum.net
- * @version   $Revision$ $Date$
- * @see       FilterReader
- * @package   phing.filters
- * @todo -c use new PHP functions to perform this instead of regex.
- */
-class StripWhitespace extends BaseFilterReader implements ChainableReader {
-   	
-	private $processed = false;
-	
-    /**
-     * Returns the  stream without Php comments and whitespace.
-     * 
-     * @return the resulting stream, or -1
-     *         if the end of the resulting stream has been reached
-     * 
-     * @throws IOException if the underlying stream throws an IOException
-     *                        during reading     
-     */
-    function read($len = null) {
-    
-		if ($this->processed === true) {
-            return -1; // EOF
-        }
-		
-		// Read XML
-        $php = null;
-        while ( ($buffer = $this->in->read($len)) !== -1 ) {
-			$php .= $buffer;
-		}
-		
-        if ($php === null ) { // EOF?
-            return -1;
-        }
-		
-		if(empty($php)) {
-            $this->log("PHP file is empty!", Project::MSG_WARN);
-            return ''; // return empty string, don't attempt to strip whitespace
-        }
-		        
-		// write buffer to a temporary file, since php_strip_whitespace() needs a filename
-		$file = new PhingFile(tempnam(PhingFile::getTempDir(), 'stripwhitespace'));
-		file_put_contents($file->getAbsolutePath(), $php);
-		$output = php_strip_whitespace($file->getAbsolutePath());
-		unlink($file->getAbsolutePath());
-		
-		$this->processed = true;
-		
-        return $output;
-    }
-
-    /**
-     * Creates a new StripWhitespace using the passed in
-     * Reader for instantiation.
-     * 
-     * @param reader A Reader object providing the underlying stream.
-     *               Must not be <code>null</code>.
-     * 
-     * @return a new filter based on this configuration, but filtering
-     *         the specified reader
-     */
-    public function chain(Reader $reader) {
-        $newFilter = new StripWhitespace($reader);
-        $newFilter->setProject($this->getProject());        
-        return $newFilter;
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/TabToSpaces.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/TabToSpaces.php
deleted file mode 100644
index f2f5c5ed3..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/TabToSpaces.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-
-/*
- *  $Id: TabToSpaces.php 325 2007-12-20 15:44:58Z hans $  
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-require_once 'phing/filters/BaseParamFilterReader.php';
-require_once 'phing/filters/ChainableReader.php';
-
-/**
- * Converts tabs to spaces.
- *
- * Example:
- *
- * <pre><tabtospaces tablength="8"></pre>
- *
- * Or:
- *
- * <pre><filterreader classname="phing.filters.TabsToSpaces">
- *   <param name="tablength" value="8">
- * </filterreader></pre>
- *
- * @author    Yannick Lecaillez <yl@seasonfive.com>
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.9 $
- * @see       BaseParamFilterReader
- * @package   phing.filters
- */
-class TabToSpaces extends BaseParamFilterReader implements ChainableReader {
-
-    /**
-     * The default tab length. 
-     * @var int
-     */
-    const DEFAULT_TAB_LENGTH = 8;
-    
-    /**
-     * Parameter name for the length of a tab.
-     * @var string
-     */
-    const TAB_LENGTH_KEY = "tablength";
-    
-    /**
-     * Tab length in this filter.
-     * @var int
-     */  
-    private $tabLength = 8; //self::DEFAULT_TAB_LENGTH;    
-
-    /**
-     * Returns stream after converting tabs to the specified number of spaces.
-     * 
-     * @return the resulting stream, or -1
-     *         if the end of the resulting stream has been reached
-     * 
-     * @exception IOException if the underlying stream throws an IOException
-     *            during reading     
-     */
-    function read($len = null) {
-    
-        if ( !$this->getInitialized() ) {
-            $this->_initialize();
-            $this->setInitialized(true);
-        }
-
-          $buffer = $this->in->read($len);
-        
-        if($buffer === -1) {
-            return -1;
-        }
-        
-        $buffer = str_replace("\t", str_repeat(' ', $this->tabLength), $buffer);
-        
-        return $buffer;        
-    }
-    
-    /**
-     * Sets the tab length.
-     * 
-     * @param int $tabLength The number of spaces to be used when converting a tab.
-     */
-    function setTablength($tabLength) {
-        $this->tabLength = (int) $tabLength;
-    }
-
-    /**
-     * Returns the tab length.
-     * 
-     * @return int The number of spaces used when converting a tab
-     */
-    function getTablength() {
-        return $this->tabLength;
-    }
-
-    /**
-     * Creates a new TabsToSpaces using the passed in
-     * Reader for instantiation.
-     * 
-     * @param Reader $reader A Reader object providing the underlying stream.
-     *               Must not be <code>null</code>.
-     * 
-     * @return Reader A new filter based on this configuration, but filtering
-     *         the specified reader
-     */
-    function chain(Reader $reader) {
-        $newFilter = new TabToSpaces($reader);
-        $newFilter->setTablength($this->getTablength());
-        $newFilter->setInitialized(true);
-        $newFilter->setProject($this->getProject());        
-        return $newFilter;
-    }
-
-    /**
-     * Parses the parameters to set the tab length.
-     */
-    private function _initialize() {
-        $params = $this->getParameters();
-        if ( $params !== null ) {
-            for($i = 0 ; $i<count($params) ; $i++) {
-                if (self::TAB_LENGTH_KEY === $params[$i]->getName()) {
-                    $this->tabLength = $params[$i]->getValue();
-                    break;
-                }
-            }
-        }
-    }
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/TailFilter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/TailFilter.php
deleted file mode 100644
index 9f2a67042..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/TailFilter.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-/*
- *  $Id: TailFilter.php 325 2007-12-20 15:44:58Z hans $  
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-require_once 'phing/filters/BaseParamFilterReader.php';
-
-/**
- * Reads the last <code>n</code> lines of a stream. (Default is last10 lines.)
- *
- * Example:
- *
- * <pre><tailfilter lines="3" /></pre>
- *
- * Or:
- *
- * <pre><filterreader classname="phing.filters.TailFilter">
- *   <param name="lines" value="3">
- * </filterreader></pre>
- *
- * @author    <a href="mailto:yl@seasonfive.com">Yannick Lecaillez</a>
- * @author    hans lellelid, hans@velum.net
- * @copyright � 2003 seasonfive. All rights reserved
- * @version   $Revision: 1.7 $
- * @see       BaseParamFilterReader
- * @package   phing.filters
- */
-class TailFilter extends BaseParamFilterReader implements ChainableReader {
-
-    /**
-     * Parameter name for the number of lines to be returned.
-     * @var string
-     */
-    const LINES_KEY = "lines";
-    
-    
-    /**
-     * Number of lines to be returned in the filtered stream.
-     * @var integer
-     */ 
-    private $_lines = 10;
-    
-    /**
-     * Array to hold lines.
-     * @var array
-     */ 
-    private    $_lineBuffer = array();
-                
-    /**
-     * Returns the last n lines of a file.
-     * @param int $len Num chars to read.
-     * @return mixed The filtered buffer or -1 if EOF.
-     */
-    function read($len = null) {
-    
-        while ( ($buffer = $this->in->read($len)) !== -1 ) {
-            // Remove the last "\n" from buffer for
-            // prevent explode to add an empty cell at
-            // the end of array
-            $buffer= trim($buffer, "\n");
-            
-            $lines = explode("\n", $buffer);
-
-            if ( count($lines) >= $this->_lines ) {
-                // Buffer have more (or same) number of lines than needed.
-                // Fill lineBuffer with the last "$this->_lines" lasts ones.
-                $off = count($lines)-$this->_lines;
-                $this->_lineBuffer = array_slice($lines, $off);
-            } else {
-                // Some new lines ...
-                // Prepare space for insert these new ones
-                $this->_lineBuffer = array_slice($this->_lineBuffer, count($lines)-1);
-                $this->_lineBuffer = array_merge($this->_lineBuffer, $lines);
-            }
-        }
-
-        if ( empty($this->_lineBuffer) )
-            $ret = -1;
-        else {
-            $ret = implode("\n", $this->_lineBuffer);
-            $this->_lineBuffer = array();
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Sets the number of lines to be returned in the filtered stream.
-     * 
-     * @param integer $lines the number of lines to be returned in the filtered stream.
-     */
-    function setLines($lines) {
-        $this->_lines = (int) $lines;
-    }
-
-    /**
-     * Returns the number of lines to be returned in the filtered stream.
-     * 
-     * @return integer The number of lines to be returned in the filtered stream.
-     */
-    function getLines() {
-        return $this->_lines;
-    }
-
-    /**
-     * Creates a new TailFilter using the passed in
-     * Reader for instantiation.
-     * 
-     * @param object A Reader object providing the underlying stream.
-     *               Must not be <code>null</code>.
-     * 
-     * @return object A new filter based on this configuration, but filtering
-     *         the specified reader.
-     */
-    function chain(Reader $reader) {
-        $newFilter = new TailFilter($reader);
-        $newFilter->setLines($this->getLines());
-        $newFilter->setInitialized(true);
-        $newFilter->setProject($this->getProject());        
-        return $newFilter;
-    }
-
-    /**
-     * Scans the parameters list for the "lines" parameter and uses
-     * it to set the number of lines to be returned in the filtered stream.
-     */
-    private function _initialize() {
-        $params = $this->getParameters();
-        if ( $params !== null ) {
-            for($i=0, $_i=count($params); $i < $_i; $i++) {
-                if ( self::LINES_KEY == $params[$i]->getName() ) {
-                    $this->_lines = (int) $params[$i]->getValue();
-                    break;
-                }
-            }
-        }
-    }
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/TidyFilter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/TidyFilter.php
deleted file mode 100644
index 8d59c00d7..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/TidyFilter.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-/*
- *  $Id: TidyFilter.php 123 2006-09-14 20:19:08Z mrook $  
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-include_once 'phing/filters/BaseParamFilterReader.php';
-include_once 'phing/filters/ChainableReader.php';
-
-/**
- * This filter uses the bundled-with-PHP Tidy extension to filter input.
- * 
- * <p>
- * Example:<br/>
- * <pre>
- * <tidyfilter encoding="utf8">
- *   <config name="indent" value="true"/>
- *   <config name="output-xhtml" value="true"/>
- * </tidyfilter>
- * </pre>
- * 
- * @author Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.2 $ $Date: 2006-09-15 05:19:08 +0900 (金, 15  9月 2006) $
- * @package   phing.filters
- */
-class TidyFilter extends BaseParamFilterReader implements ChainableReader {
-   	
-	/** @var string Encoding of resulting document. */
-	private $encoding = 'utf8';
-   
-    /** @var array Parameter[] */
-	private $configParameters = array();
-     
-	/**
-	 * Set the encoding for resulting (X)HTML document.
-	 * @param string $v
-	 */
-	public function setEncoding($v) {
-		$this->encoding = $v;
-	}
-	
-	/**
-	 * Sets the config params.
-	 * @param array Parameter[]
-	 * @see chain()
-	 */
-	public function setConfigParameters($params)
-	{
-		$this->configParameters = $params;
-	}
-	
-	/**
-	 * Adds a <config> element (which is a Parameter).
-	 * @return Parameter
-	 */
-	public function createConfig() {
-		$num = array_push($this->configParameters, new Parameter());
-        return $this->configParameters[$num-1];
-	}
-	
-	/**
-	 * Converts the Parameter objects being used to store configuration into a simle assoc array.
-	 * @return array
-	 */
-	private function getDistilledConfig() {
-		$config = array();
-		foreach($this->configParameters as $p) {
-			$config[$p->getName()] = $p->getValue();
-		}
-		return $config;
-	}
-	
-    /**
-     * Reads input and returns Tidy-filtered output.
-     * 
-     * @return the resulting stream, or -1 if the end of the resulting stream has been reached
-     * 
-     * @throws IOException if the underlying stream throws an IOException
-     *                        during reading     
-     */
-    function read($len = null) {
-    	
-		if (!class_exists('Tidy')) {
-			throw new BuildException("You must enable the 'tidy' extension in your PHP configuration in order to use the Tidy filter.");
-		}
-		
-		if ( !$this->getInitialized() ) {
-            $this->_initialize();
-            $this->setInitialized(true);
-        }
-		
-        $buffer = $this->in->read($len);
-        if($buffer === -1) {
-            return -1;
-        }
-		
-		$config = $this->getDistilledConfig();
-		
-		$tidy = new Tidy();
-		$tidy->parseString($buffer, $config, $this->encoding);
-		$tidy->cleanRepair();
-
-		return tidy_get_output($tidy);
-		
-    }
-
-
-    /**
-     * Creates a new TidyFilter using the passed in Reader for instantiation.
-     * 
-     * @param reader A Reader object providing the underlying stream.
-     *               Must not be <code>null</code>.
-     * 
-     * @return a new filter based on this configuration, but filtering
-     *         the specified reader
-     */
-    public function chain(Reader $reader) {
-        $newFilter = new TidyFilter($reader);
-		$newFilter->setConfigParameters($this->configParameters);
-		$newFilter->setEncoding($this->encoding);
-        $newFilter->setProject($this->getProject());
-        return $newFilter;
-    }
-	
-	/**
-     * Initializes any parameters (e.g. config options).
-     * This method is only called when this filter is used through a <filterreader> tag in build file.
-     */
-    private function _initialize() {
-        $params = $this->getParameters();
-		if ($params) {
-			foreach($params as $param) {
-				if ($param->getType() == "config") {
-					$this->configParameters[] = $param;
-				} else {
-					
-					if ($param->getName() == "encoding") {
-					    $this->setEncoding($param->getValue());
-					}
-					
-				}
-				
-			}
-		}
-    }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/TranslateGettext.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/TranslateGettext.php
deleted file mode 100644
index cfd997555..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/TranslateGettext.php
+++ /dev/null
@@ -1,285 +0,0 @@
-<?php
-
-/*
- *  $Id: TranslateGettext.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-require_once 'phing/filters/BaseParamFilterReader.php';
-include_once 'phing/filters/ChainableReader.php';
-
-/**
- * Replaces gettext("message id") and _("message id") with the translated string.
- * 
- * Gettext is great for creating multi-lingual sites, but in some cases (e.g. for 
- * performance reasons) you may wish to replace the gettext calls with the translations
- * of the strings; that's what this task is for.  Note that this is similar to
- * ReplaceTokens, but both the find and the replace aspect is more complicated -- hence
- * this is a separate, stand-alone filter.
- * 
- * <p>
- * Example:<br>
- * <pre>
- * <translategettext locale="en_US" domain="messages" dir="${webroot}/local"/>
- * </pre>
- * 
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.11 $ $Date: 2007-12-21 00:44:58 +0900 (金, 21 12月 2007) $
- * @access    public
- * @see       BaseFilterReader
- * @package   phing.filters
- */
-class TranslateGettext extends BaseParamFilterReader implements ChainableReader {
-
-    // constants for specifying keys to expect
-    // when this is called using <filterreader ... />
-    const DOMAIN_KEY = "domain";
-    const DIR_KEY = "dir";
-    const LOCALE_KEY = "locale";
-    
-    /** The domain to use */
-    private $domain = 'messages';
-    
-    /** The dir containing LC_MESSAGES */
-    private $dir;
-
-    /** The locale to use */
-    private $locale;
-    
-    /** The system locale before it was changed for this filter. */
-    private $storedLocale;
-    
-    /**
-     * Set the text domain to use.
-     * The text domain must correspond to the name of the compiled .mo files.
-     * E.g. "messages" ==> $dir/LC_MESSAGES/messages.mo
-     *         "mydomain" ==> $dir/LC_MESSAGES/mydomain.mo
-     * @param string $domain
-     */
-    function setDomain($domain) {
-        $this->domain = $domain;
-    }
-    
-    /**
-     * Get the current domain.
-     * @return string
-     */
-    function getDomain() {
-        return $this->domain;
-    }
-    
-    /**
-     * Sets the root locale directory.
-     * @param PhingFile $dir
-     */
-    function setDir(PhingFile $dir) {
-        $this->dir = $dir;
-    }
-    
-    /**
-     * Gets the root locale directory.
-     * @return PhingFile
-     */
-    function getDir() {
-        return $this->dir;
-    }
-    
-    /**
-     * Sets the locale to use for translation.
-     * Note that for gettext() to work, you have to make sure this locale
-     * is specific enough for your system (e.g. some systems may allow an 'en' locale,
-     * but others will require 'en_US', etc.).
-     * @param string $locale 
-     */
-    function setLocale($locale) {
-        $this->locale = $locale;
-    }
-    
-    /**
-     * Gets the locale to use for translation.
-     * @return string
-     */
-    function getLocale() {
-        return $this->locale;
-    }
-    
-    /**
-     * Make sure that required attributes are set.
-     * @throws BuldException - if any required attribs aren't set.
-     */
-    protected function checkAttributes() {
-        if (!$this->domain || !$this->locale || !$this->dir) {
-            throw new BuildException("You must specify values for domain, locale, and dir attributes.");
-        }
-    }
-    
-    /**
-     * Initialize the gettext/locale environment.
-     * This method will change some env vars and locale settings; the
-     * restoreEnvironment should put them all back :)
-     * 
-     * @return void
-     * @throws BuildException - if locale cannot be set.
-     * @see restoreEnvironment()
-     */
-    protected function initEnvironment() {
-        $this->storedLocale = getenv("LANG");
-        
-        $this->log("Setting locale to " . $this->locale, Project::MSG_DEBUG);
-        putenv("LANG=".$this->locale);
-        $ret = setlocale(LC_ALL, $this->locale);
-        if ($ret === false) {
-            $msg = "Could not set locale to " . $this->locale
-                    . ". You may need to use fully qualified name"
-                    . " (e.g. en_US instead of en).";
-            throw new BuildException($msg);
-        }        
-        
-        $this->log("Binding domain '".$this->domain."' to "  . $this->dir, Project::MSG_DEBUG);
-        bindtextdomain($this->domain, $this->dir->getAbsolutePath());
-        textdomain($this->domain);        
-    }
-    
-    /**
-     * Restores environment settings and locale.
-     * This does _not_ restore any gettext-specific settings
-     * (e.g. textdomain()).
-     * 
-     * @return void
-     */
-    protected function restoreEnvironment() {
-        putenv("LANG=".$this->storedLocale);
-        setlocale(LC_ALL, $this->storedLocale);
-    }
-
-    /**
-     * Performs gettext translation of msgid and returns translated text.
-     * 
-     * This function simply wraps gettext() call, but provides ability to log
-     * string replacements.  (alternative would be using preg_replace with /e which
-     * would probably be faster, but no ability to debug/log.)
-     * 
-     * @param array $matches Array of matches; we're interested in $matches[2].
-     * @return string Translated text
-     */
-    private function xlateStringCallback($matches) {
-        $charbefore = $matches[1];
-        $msgid = $matches[2];
-        $translated = gettext($msgid);
-        $this->log("Translating \"$msgid\" => \"$translated\"", Project::MSG_DEBUG);
-        return $charbefore . '"' . $translated . '"';
-    }
-        
-    /**
-     * Returns the filtered stream. 
-     * The original stream is first read in fully, and then translation is performed.
-     * 
-     * @return mixed     the filtered stream, or -1 if the end of the resulting stream has been reached.
-     * 
-     * @throws IOException - if the underlying stream throws an IOException during reading
-     * @throws BuildException - if the correct params are not supplied
-     */
-    function read($len = null) {
-                
-        if ( !$this->getInitialized() ) {
-            $this->_initialize();
-            $this->setInitialized(true);
-        }
-        
-        // Make sure correct params/attribs have been set
-        $this->checkAttributes();
-        
-        $buffer = $this->in->read($len);        
-        if($buffer === -1) {
-            return -1;
-        }
-
-        // Setup the locale/gettext environment
-        $this->initEnvironment();
-        
-
-        // replace any occurrences of _("") or gettext("") with
-        // the translated value.
-        //
-        // ([^\w]|^)_\("((\\"|[^"])*)"\)
-        //  --$1---      -----$2----   
-        //                 ---$3--  [match escaped quotes or any char that's not a quote]
-        // 
-        // also match gettext() -- same as above
-        
-        $buffer = preg_replace_callback('/([^\w]|^)_\("((\\\"|[^"])*)"\)/', array($this, 'xlateStringCallback'), $buffer);
-        $buffer = preg_replace_callback('/([^\w]|^)gettext\("((\\\"|[^"])*)"\)/', array($this, 'xlateStringCallback'), $buffer);
-
-        // Check to see if there are any _('') calls and flag an error
-
-        // Check to see if there are any unmatched gettext() calls -- and flag an error        
-                    
-        $matches = array();
-        if (preg_match('/([^\w]|^)(gettext\([^\)]+\))/', $buffer, $matches)) {
-            $this->log("Unable to perform translation on: " . $matches[2], Project::MSG_WARN);
-        }
-                
-        $this->restoreEnvironment();
-        
-        return $buffer;
-    }
-
-    /**
-     * Creates a new TranslateGettext filter using the passed in
-     * Reader for instantiation.
-     * 
-     * @param Reader $reader A Reader object providing the underlying stream.
-     *               Must not be <code>null</code>.
-     * 
-     * @return TranslateGettext A new filter based on this configuration, but filtering
-     *         the specified reader
-     */
-    function chain(Reader $reader) {
-        $newFilter = new TranslateGettext($reader);
-        $newFilter->setProject($this->getProject());
-        $newFilter->setDomain($this->getDomain());
-        $newFilter->setLocale($this->getLocale());
-        $newFilter->setDir($this->getDir());
-        return $newFilter;
-    }
-
-    /**
-     * Parses the parameters if this filter is being used in "generic" mode.
-     */
-    private function _initialize() {
-        $params = $this->getParameters();
-        if ( $params !== null ) {
-            foreach($params as $param) {
-                switch($param->getType()) {
-                    case self::DOMAIN_KEY:
-                        $this->setDomain($param->getValue());
-                        break;
-                    case self::DIR_KEY:
-                        $this->setDir($this->project->resolveFile($param->getValue()));
-                        break;
-                        
-                    case self::LOCALE_KEY:
-                        $this->setLocale($param->getValue());
-                        break;                
-                } // switch
-            }
-        } // if params !== null
-    }
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/XincludeFilter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/XincludeFilter.php
deleted file mode 100644
index cd56f1a2b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/XincludeFilter.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-
-/*
- *  $Id: XincludeFilter.php,v 1.16 2005/12/07 20:05:01 hlellelid Exp $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-include_once 'phing/filters/BaseParamFilterReader.php';
-include_once 'phing/filters/ChainableReader.php';
-
-/**
- * Applies Xinclude parsing to incoming text.
- * 
- * Uses PHP DOM XML support
- * 
- * @author    Bill Karwin <bill@karwin.com>
- * @version   $Revision: 1.16 $
- * @see       FilterReader
- * @package   phing.filters
- */
-class XincludeFilter extends BaseParamFilterReader implements ChainableReader {
-
-    private $basedir = null;
-
-    public function setBasedir(PhingFile $dir)
-    {
-        $this->basedir = $dir;
-    }
-
-    public function getBasedir()
-    {
-        return $this->basedir;
-    }
-
-    /**
-     * Reads stream, applies XSLT and returns resulting stream.
-     * @return string transformed buffer.
-     * @throws BuildException - if XSLT support missing, if error in xslt processing
-     */
-    function read($len = null) {
-        
-        if (!class_exists('DomDocument')) {
-            throw new BuildException("Could not find the DomDocument class. Make sure PHP has been compiled/configured to support DOM XML.");
-        }
-        
-        if ($this->processed === true) {
-            return -1; // EOF
-        }
-        
-        // Read XML
-        $_xml = null;
-        while ( ($data = $this->in->read($len)) !== -1 )
-            $_xml .= $data;
-
-        if ($_xml === null ) { // EOF?
-            return -1;
-        }
-
-        if (empty($_xml)) {
-            $this->log("XML file is empty!", Project::MSG_WARN);
-            return ''; 
-        }
-       
-        $this->log("Transforming XML " . $this->in->getResource() . " using Xinclude ", Project::MSG_VERBOSE);
-        
-        $out = '';
-        try {
-            $out = $this->process($_xml);
-            $this->processed = true;
-        } catch (IOException $e) {            
-            throw new BuildException($e);
-        }
-
-        return $out;
-    }
-
-    /**
-     * Try to process the Xinclude transformation
-     *
-     * @param   string  XML to process.
-     *
-     * @throws BuildException   On errors
-     */
-    protected function process($xml) {    
-                
-        if ($this->basedir) {
-            $cwd = getcwd();
-            chdir($this->basedir);
-        }
-
-        $xmlDom = new DomDocument();
-        $xmlDom->loadXML($xml);
-        
-        $xmlDom->xinclude();
-
-        if ($this->basedir) {
-            chdir($cwd);
-        }
-
-        return $xmlDom->saveXML();
-    }    
-
-    /**
-     * Creates a new XincludeFilter using the passed in
-     * Reader for instantiation.
-     *
-     * @param Reader A Reader object providing the underlying stream.
-     *               Must not be <code>null</code>.
-     *
-     * @return Reader A new filter based on this configuration, but filtering
-     *         the specified reader
-     */
-    function chain(Reader $reader) {
-        $newFilter = new XincludeFilter($reader);
-        $newFilter->setProject($this->getProject());
-        $newFilter->setBasedir($this->getBasedir());
-        return $newFilter;
-    }
-
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/XsltFilter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/XsltFilter.php
deleted file mode 100644
index 5d05d62ad..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/XsltFilter.php
+++ /dev/null
@@ -1,341 +0,0 @@
-<?php
-
-/*
- *  $Id: XsltFilter.php 420 2008-10-26 19:21:39Z alexeyshockov $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-include_once 'phing/filters/BaseParamFilterReader.php';
-include_once 'phing/filters/ChainableReader.php';
-
-/**
- * Applies XSL stylesheet to incoming text.
- * 
- * Uses PHP XSLT support (libxslt).
- * 
- * @author    Hans Lellelid <hans@velum.net>
- * @author    Yannick Lecaillez <yl@seasonfive.com>
- * @author    Andreas Aderhold <andi@binarycloud.com>
- * @version   $Revision$
- * @see       FilterReader
- * @package   phing.filters
- */
-class XsltFilter extends BaseParamFilterReader implements ChainableReader {
-
-    /**
-     * Path to XSL stylesheet.
-     * @var string
-     */
-    private $xslFile   = null;
-
-    /**
-     * Whether XML file has been transformed.
-     * @var boolean
-     */
-    private $processed = false;
-    
-    /**
-     * XSLT Params.
-     * @var array
-     */
-    private $xsltParams = array();    
-    
-    /**
-     * Whether to use loadHTML() to parse the input XML file.
-     */
-    private $html = false;
-    
-    /**
-     * Create new XSLT Param object, to handle the <param/> nested element.
-     * @return XSLTParam
-     */
-    function createParam() {
-        $num = array_push($this->xsltParams, new XSLTParam());
-        return $this->xsltParams[$num-1];
-    }
-    
-    /**
-     * Sets the XSLT params for this class.
-     * This is used to "clone" this class, in the chain() method.
-     * @param array $params
-     */
-    function setParams($params) {
-        $this->xsltParams = $params;
-    }
-    
-    /**
-     * Returns the XSLT params set for this class.
-     * This is used to "clone" this class, in the chain() method.
-     * @return array
-     */
-    function getParams() {
-        return $this->xsltParams;
-    }
-        
-    /**
-     * Set the XSLT stylesheet.
-     * @param mixed $file PhingFile object or path.
-     */
-    function setStyle(PhingFile $file) {
-        $this->xslFile = $file;
-    }
-
-    /**
-     * Whether to use HTML parser for the XML.
-     * This is supported in libxml2 -- Yay!
-     * @return boolean
-     */
-    function getHtml() {
-        return $this->html;
-    }
-    
-    /**
-     * Whether to use HTML parser for XML.
-     * @param boolean $b
-     */
-    function setHtml($b) {        
-        $this->html = (boolean) $b;
-    }
-    
-    /**
-     * Get the path to XSLT stylesheet.
-     * @return mixed XSLT stylesheet path.
-     */
-    function getStyle() {
-        return $this->xslFile;
-    }
-    
-    /**
-     * Reads stream, applies XSLT and returns resulting stream.
-     * @return string transformed buffer.
-     * @throws BuildException - if XSLT support missing, if error in xslt processing
-     */
-    function read($len = null) {
-        
-        if (!class_exists('XSLTProcessor')) {
-            throw new BuildException("Could not find the XSLTProcessor class. Make sure PHP has been compiled/configured to support XSLT.");
-        }
-        
-        if ($this->processed === true) {
-            return -1; // EOF
-        }
-        
-        if ( !$this->getInitialized() ) {
-            $this->_initialize();
-            $this->setInitialized(true);
-        }
-
-        // Read XML
-        $_xml = null;
-        while ( ($data = $this->in->read($len)) !== -1 )
-            $_xml .= $data;
-
-        if ($_xml === null ) { // EOF?
-            return -1;
-        }
-
-        if(empty($_xml)) {
-            $this->log("XML file is empty!", Project::MSG_WARN);
-            return ''; // return empty string, don't attempt to apply XSLT
-        }
-       
-        // Read XSLT
-        $_xsl = null;
-        $xslFr = new FileReader($this->xslFile);
-        $xslFr->readInto($_xsl);
-        
-        $this->log("Tranforming XML " . $this->in->getResource() . " using style " . $this->xslFile->getPath(), Project::MSG_VERBOSE);
-        
-        $out = '';
-        try {
-            $out = $this->process($_xml, $_xsl);
-            $this->processed = true;
-        } catch (IOException $e) {            
-            throw new BuildException($e);
-        }
-
-        return $out;
-    }
-
-    // {{{ method _ProcessXsltTransformation($xml, $xslt) throws BuildException
-    /**
-     * Try to process the XSLT transformation
-     *
-     * @param   string  XML to process.
-     * @param   string  XSLT sheet to use for the processing.
-     *
-     * @throws BuildException   On XSLT errors
-     */
-    protected function process($xml, $xsl) {    
-                
-        $processor = new XSLTProcessor();
-        
-        $xmlDom = new DOMDocument();
-        $xslDom = new DOMDocument();        
-        
-        if ($this->html) {            
-            $xmlDom->loadHTML($xml);
-        } else {
-            $xmlDom->loadXML($xml);
-        }
-        
-        $xslDom->loadxml($xsl);
-        
-        $processor->importStylesheet($xslDom);
-
-        // ignoring param "type" attrib, because
-        // we're only supporting direct XSL params right now
-        foreach($this->xsltParams as $param) {
-            $this->log("Setting XSLT param: " . $param->getName() . "=>" . $param->getExpression(), Project::MSG_DEBUG);
-            $processor->setParameter(null, $param->getName(), $param->getExpression());
-        }
-        
-        $errorlevel = error_reporting();
-        error_reporting($errorlevel & ~E_WARNING);
-        @$result = $processor->transformToXML($xmlDom);
-        error_reporting($errorlevel);
-        
-        if (false === $result) {
-            //$errno = xslt_errno($processor);
-            //$err   = xslt_error($processor);    
-            throw new BuildException("XSLT Error");            
-        } else {
-            return $result;
-        }
-    }    
-
-    /**
-     * Creates a new XsltFilter using the passed in
-     * Reader for instantiation.
-     *
-     * @param Reader A Reader object providing the underlying stream.
-     *               Must not be <code>null</code>.
-     *
-     * @return Reader A new filter based on this configuration, but filtering
-     *         the specified reader
-     */
-    function chain(Reader $reader) {
-        $newFilter = new XsltFilter($reader);
-        $newFilter->setProject($this->getProject());
-        $newFilter->setStyle($this->getStyle());
-        $newFilter->setInitialized(true);
-        $newFilter->setParams($this->getParams());
-        $newFilter->setHtml($this->getHtml());
-        return $newFilter;
-    }
-
-    /**
-     * Parses the parameters to get stylesheet path.
-     */
-    private function _initialize() {        
-        $params = $this->getParameters();
-        if ( $params !== null ) {
-            for($i = 0, $_i=count($params) ; $i < $_i; $i++) {
-                if ( $params[$i]->getType() === null ) {
-                    if ($params[$i]->getName() === "style") {
-                        $this->setStyle($params[$i]->getValue());
-                    }
-                } elseif ($params[$i]->getType() == "param") {
-                    $xp = new XSLTParam();
-                    $xp->setName($params[$i]->getName());
-                    $xp->setExpression($params[$i]->getValue());
-                    $this->xsltParams[] = $xp;
-                }
-            }
-        }
-    }
-
-}
-
-
-/**
- * Class that holds an XSLT parameter.
- */
-class XSLTParam {
-    
-    private $name;
-    
-    private $expr;    
-    
-    /**
-     * Sets param name.
-     * @param string $name
-     */
-    public function setName($name) {
-        $this->name = $name;
-    }
-    
-    /**
-     * Get param name.
-     * @return string
-     */
-    public function getName() {
-        return $this->name;
-    }
-    
-    /**
-     * Sets expression value (alias to the setExpression()) method. 
-     *
-     * @param string $v
-     * @see setExpression()
-     */
-    public function setValue($v)
-    {
-    	$this->setExpression($v);
-    }
-    
-	/**
-     * Gets expression value (alias to the getExpression()) method. 
-     *
-     * @param string $v
-     * @see getExpression()
-     */
-    public function getValue()
-    {
-    	return $this->getExpression();
-    }
-    
-    /**
-     * Sets expression value.
-     * @param string $expr
-     */
-    public function setExpression($expr) {
-        $this->expr = $expr;
-    }
-    
-    /**
-     * Sets expression to dynamic register slot.
-     * @param RegisterSlot $expr
-     */
-    public function setListeningExpression(RegisterSlot $expr) {
-        $this->expr = $expr;    
-    }
-    
-    /**
-     * Returns expression value -- performs lookup if expr is registerslot.
-     * @return string
-     */
-    public function getExpression() {
-        if ($this->expr instanceof RegisterSlot) {
-            return $this->expr->getValue();
-        } else {
-            return $this->expr;
-        }
-    }        
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/util/ChainReaderHelper.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/util/ChainReaderHelper.php
deleted file mode 100644
index eeaad37eb..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/util/ChainReaderHelper.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-/*
- *  $Id: ChainReaderHelper.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-include_once 'phing/Project.php';
-include_once 'phing/filters/BaseFilterReader.php';
-include_once 'phing/types/PhingFilterReader.php';
-include_once 'phing/types/FilterChain.php';
-include_once 'phing/types/Parameter.php';
-include_once 'phing/util/FileUtils.php';
-include_once 'phing/util/StringHelper.php';
-include_once 'phing/filters/ChainableReader.php';
-
-/**
- * Process a FilterReader chain.
- *
- * Here, the interesting method is 'getAssembledReader'.
- * The purpose of this one is to create a simple Reader object which
- * apply all filters on another primary Reader object. 
- *
- * For example : In copyFile (phing.util.FileUtils) the primary Reader
- * is a FileReader object (more accuratly, a BufferedReader) previously 
- * setted for the source file to copy. So, consider this filterchain :
- *        
- *     <filterchain>
- *        <stripphpcomments />
- *        <linecontains>
- *            <contains value="foo">
- *        </linecontains>
- *      <tabtospaces tablength="8" />
- *    </filterchain>
- *
- *    getAssembledReader will return a Reader object wich read on each
- *    of these filters. Something like this : ('->' = 'which read data from') :
- *
- *  [TABTOSPACES] -> [LINECONTAINS] -> [STRIPPHPCOMMENTS] -> [FILEREADER]
- *                                                         (primary reader)
- *
- *  So, getAssembledReader will return the TABTOSPACES Reader object. Then
- *  each read done with this Reader object will follow this path.
- *
- *    Hope this explanation is clear :)
- *
- * TODO: Implement the classPath feature.
- *
- * @author    <a href="mailto:yl@seasonfive.com">Yannick Lecaillez</a>
- * @version   $Revision: 1.8 $ $Date: 2007-12-21 00:44:58 +0900 (金, 21 12月 2007) $
- * @access    public
- * @package   phing.filters.util
-*/
-class ChainReaderHelper {
-    
-    /** Primary reader to wich the reader chain is to be attached */
-    private $primaryReader = null;
-    
-    /** The site of the buffer to be used. */
-    private $bufferSize = 8192;
-    
-    /** Chain of filters */
-    private $filterChains = array();
-    
-    /** The Phing project */
-    private $project;
-
-    /*
-     * Sets the primary reader
-    */
-    function setPrimaryReader(Reader $reader) {
-        $this->primaryReader = $reader;
-    }
-
-    /*
-     * Set the project to work with
-    */
-    function setProject(Project $project) {
-        $this->project = $project;
-    }
-
-    /*
-     * Get the project
-    */
-    function getProject() {
-        return $this->project;
-    }
-
-    /*
-     * Sets the buffer size to be used.  Defaults to 8192,
-     * if this method is not invoked.
-    */
-    function setBufferSize($size) {
-        $this->bufferSize = $size;
-    }
-
-    /*
-     * Sets the collection of filter reader sets
-    */
-    function setFilterChains(&$fchain) {
-        $this->filterChains = &$fchain;
-    }
-
-    /*
-     * Assemble the reader
-    */
-    function getAssembledReader() {
-    
-        $instream = $this->primaryReader;
-        $filterReadersCount = count($this->filterChains);
-        $finalFilters = array();
-
-        // Collect all filter readers of all filter chains used ...
-        for($i = 0 ; $i<$filterReadersCount ; $i++) {
-            $filterchain = &$this->filterChains[$i];
-            $filterReaders = $filterchain->getFilterReaders();
-            $readerCount = count($filterReaders);
-            for($j = 0 ; $j<$readerCount ; $j++) {
-                $finalFilters[] = $filterReaders[$j];
-            }
-        }
-
-        // ... then chain the filter readers.
-        $filtersCount = count($finalFilters);
-        if ( $filtersCount > 0 ) {
-            for($i = 0 ; $i<$filtersCount ; $i++) {
-                $filter = $finalFilters[$i];
-                
-                if ( $filter instanceof PhingFilterReader ) {
-                
-                    // This filter reader is an external class.
-                    $className = $filter->getClassName();
-                    $classpath = $filter->getClasspath();
-                    $project   = $filter->getProject();
-                    
-                    if ( $className !== null ) {
-                        $cls = Phing::import($className, $classpath);
-                        $impl = new $cls();                        
-                    }
-
-                    if ( !($impl instanceof FilterReader) ) {
-                        throw new Exception($className." does not extend phing.system.io.FilterReader");
-                    }
-                    
-                    $impl->setReader($instream); // chain
-                    $impl->setProject($this->getProject()); // what about $project above ?
-
-                    if ( $impl instanceof Parameterizable ) {
-                        $impl->setParameters($filter->getParams());
-                    }
-                    
-                    $instream = $impl; // now that it's been chained
-                                                            
-                } elseif (($filter instanceof ChainableReader) && ($filter instanceof Reader)) {                   
-                    if ( $this->getProject() !== null && ($filter instanceof BaseFilterReader) ) {
-                        $filter->setProject($this->getProject());
-                    }                    
-                    $instream = $filter->chain($instream);
-                } else {
-                    throw new Exception("Cannot chain invalid filter: " . get_class($filter));
-                }
-            }
-        }
-
-        return $instream;
-    }    
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/util/IniFileTokenReader.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/util/IniFileTokenReader.php
deleted file mode 100644
index 548101264..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/filters/util/IniFileTokenReader.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/*
- *  $Id: IniFileTokenReader.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-include_once 'phing/types/TokenReader.php';
-include_once 'phing/system/io/IOException.php';
-include_once 'phing/filters/ReplaceTokens.php'; // For class Token
-
-/**
- * Class that allows reading tokens from INI files.
- * 
- * @author    Manuel Holtgewe
- * @version   $Revision: 1.7 $
- * @package   phing.filters.util
- */
-class IniFileTokenReader extends TokenReader {
-
-    /**
-     * Holds the path to the INI file that is to be read.
-     * @var object  Reference to a PhingFile Object representing
-     *              the path to the INI file.
-     */
-    private $file = null;
-
-    /**
-     * @var string  Sets the section to load from the INI file.
-     *              if omitted, all sections are loaded.
-     */
-    private $section = null;
-
-    /**
-     * Reads the next token from the INI file
-     *
-     * @throws  IOException     On error
-     * @return Token
-     */
-    function readToken() {
-        if ($this->file === null) {
-            throw new BuildException("No File set for IniFileTokenReader");
-        }
-
-        static $tokens = null;
-        if ($tokens === null) {
-            $tokens = array();
-            $arr = parse_ini_file($this->file->getAbsolutePath(), true);
-            if ($this->section === null) {
-                foreach ($arr as $sec_name => $values) {
-                    foreach($arr[$sec_name] as $key => $value) {
-                        $tok = new Token;
-                        $tok->setKey($key);
-                        $tok->setValue($value);
-                        $tokens[] = $tok;
-                    }
-                }
-            } else if (isset($arr[$this->section])) {
-                foreach ($arr[$this->section] as $key => $value) {
-                    $tok = new Token;
-                    $tok->setKey($key);
-                    $tok->setValue($value);
-                    $tokens[] = $tok;
-                }
-            }
-        }
-
-        if (count($tokens) > 0) {
-            return array_pop($tokens);
-        } else
-            return null;
-    }
-    
-    function setFile(PhingFile $file) {
-        $this->file = $file;
-    }
-
-    function setSection($str) {
-        $this->section = (string) $str;
-    }
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/input/DefaultInputHandler.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/input/DefaultInputHandler.php
deleted file mode 100644
index a525e50b2..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/input/DefaultInputHandler.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/*
- *  $Id: DefaultInputHandler.php 293 2007-11-04 16:51:45Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-require_once 'phing/input/InputHandler.php';
-include_once 'phing/system/io/ConsoleReader.php';
-
-/**
- * Prompts using print(); reads input from Console.
- *
- * @author Hans Lellelid <hans@xmpl.org> (Phing)
- * @author Stefan Bodewig <stefan.bodewig@epost.de> (Ant)
- * @version $Revision: 1.6 $
- * @package phing.input
- */
-class DefaultInputHandler implements InputHandler {
-    
-    /**
-     * Prompts and requests input.  May loop until a valid input has
-     * been entered.
-     * @throws BuildException 
-     */
-    public function handleInput(InputRequest $request) {
-        $prompt = $this->getPrompt($request);
-        $in = new ConsoleReader();           
-        do {
-            print $prompt;
-            try {
-                $input = $in->readLine();
-                if ($input === "" && ($request->getDefaultValue() !== null) ) {
-                    $input = $request->getDefaultValue();
-                }
-                $request->setInput($input);
-            } catch (Exception $e) {
-                throw new BuildException("Failed to read input from Console.", $e);
-            }
-        } while (!$request->isInputValid());
-    }
-
-    /**
-     * Constructs user prompt from a request.
-     *
-     * <p>This implementation adds (choice1,choice2,choice3,...) to the
-     * prompt for <code>MultipleChoiceInputRequest</code>s.</p>
-     *
-     * @param $request the request to construct the prompt for.
-     *                Must not be <code>null</code>.
-     */
-    protected function getPrompt(InputRequest $request) {
-        $prompt = $request->getPrompt();
-        
-        if ($request instanceof YesNoInputRequest) {
-            $prompt .= '(' . implode('/', $request->getChoices()) .')';
-        } elseif ($request instanceof MultipleChoiceInputRequest) { // (a,b,c,d)
-            $prompt .= '(' . implode(',', $request->getChoices()) . ')';            
-        }
-        if ($request->getDefaultValue() !== null) {
-            $prompt .= ' ['.$request->getDefaultValue().']';
-        }
-        $pchar = $request->getPromptChar();        
-        return $prompt . ($pchar ? $pchar . ' ' : ' ');
-    } 
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/input/InputHandler.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/input/InputHandler.php
deleted file mode 100644
index 0e746a613..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/input/InputHandler.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/*
- *  $Id: InputHandler.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-/**
- * Plugin to Phing to handle requests for user input.
- *
- * @author Stefan Bodewig <stefan.bodewig@epost.de>
- * @version $Revision: 1.3 $
- * @package phing.input
- */
-interface InputHandler {
-
-    /**
-     * Handle the request encapsulated in the argument.
-     *
-     * <p>Precondition: the request.getPrompt will return a non-null
-     * value.</p>
-     *
-     * <p>Postcondition: request.getInput will return a non-null
-     * value, request.isInputValid will return true.</p>
-     * @return void
-     * @throws BuildException
-     */
-    public function handleInput(InputRequest $request);
-    
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/input/InputRequest.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/input/InputRequest.php
deleted file mode 100644
index 9cba69605..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/input/InputRequest.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-/*
- *  $Id: InputRequest.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-/**
- * Encapsulates an input request.
- *
- * @author Hans Lellelid <hans@xmpl.org> (Phing)
- * @author Stefan Bodewig <stefan.bodewig@epost.de> (Ant)
- * @version $Revision: 1.4 $
- * @package phing.input
- */
-class InputRequest {
-
-    protected $prompt;
-    protected $input;
-    protected $defaultValue;
-    protected $promptChar;
-    
-    /**
-     * @param string $prompt The prompt to show to the user.  Must not be null.
-     */
-    public function __construct($prompt) {
-        if ($prompt === null) {
-            throw new BuildException("prompt must not be null");
-        }        
-        $this->prompt = $prompt;
-    }
-
-    /**
-     * Retrieves the prompt text.
-     */
-    public function getPrompt() {
-        return $this->prompt;
-    }
-
-    /**
-     * Sets the user provided input.
-     */
-    public function setInput($input) {
-        $this->input = $input;
-    }
-    
-    /**
-     * Is the user input valid?
-     */
-    public function isInputValid() {
-        return true;
-    }
-
-    /**
-     * Retrieves the user input.
-     */
-    public function getInput() {
-        return $this->input;
-    }
-    
-    /**
-     * Set the default value to use.
-     * @param mixed $v
-     */
-    public function setDefaultValue($v) {
-        $this->defaultValue = $v;
-    }
-    
-    /**
-     * Return the default value to use.
-     * @return mixed
-     */
-    public function getDefaultValue() {
-        return $this->defaultValue;
-    }
-    
-    /**
-     * Set the default value to use.
-     * @param string $c
-     */
-    public function setPromptChar($c) {
-        $this->promptChar = $c;
-    }
-    
-    /**
-     * Return the default value to use.
-     * @return string
-     */
-    public function getPromptChar() {
-        return $this->promptChar;
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/input/MultipleChoiceInputRequest.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/input/MultipleChoiceInputRequest.php
deleted file mode 100644
index 25e035ebf..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/input/MultipleChoiceInputRequest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/*
- *  $Id: MultipleChoiceInputRequest.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/input/InputRequest.php';
-
-/**
- * Encapsulates an input request.
- *
- * @author Stefan Bodewig <stefan.bodewig@epost.de>
- * @version $Revision: 1.5 $
- * @package phing.input
- */
-class MultipleChoiceInputRequest extends InputRequest {
-
-    protected $choices = array();
-
-    /**
-     * @param string $prompt The prompt to show to the user.  Must not be null.
-     * @param array $choices holds all input values that are allowed.
-     *                Must not be null.
-     */
-    public function __construct($prompt, $choices) {
-        parent::__construct($prompt);        
-        $this->choices = $choices;
-    }
-
-    /**
-     * @return The possible values.
-     */
-    public function getChoices() {
-        return $this->choices;
-    }
-
-    /**
-     * @return true if the input is one of the allowed values.
-     */
-    public function isInputValid() {
-        return in_array($this->getInput(), $this->choices); // not strict (?)
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/input/PropertyFileInputHandler.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/input/PropertyFileInputHandler.php
deleted file mode 100644
index e588ceade..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/input/PropertyFileInputHandler.php
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- *    any, must include the following acknowlegement:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowlegement may appear in the software itself,
- *    if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "Ant" and "Apache Software
- *    Foundation" must not be used to endorse or promote products derived
- *    from this software without prior written permission. For written
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-
-package org.apache.tools.ant.input;
-
-import org.apache.tools.ant.BuildException;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Properties;
-
-/**
- * Reads input from a property file, the file name is read from the
- * system property ant.input.properties, the prompt is the key for input.
- *
- * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
- * @version $Revision: 1.1 $
- * @since Ant 1.5
- */
-public class PropertyFileInputHandler implements InputHandler {
-    private Properties props = null;
-
-    /**
-     * Name of the system property we expect to hold the file name.
-     */
-    public static final String FILE_NAME_KEY = "ant.input.properties";
-
-    /**
-     * Empty no-arg constructor.
-     */
-    public PropertyFileInputHandler() {
-    }
-
-    /**
-     * Picks up the input from a property, using the prompt as the
-     * name of the property.
-     *
-     * @exception BuildException if no property of that name can be found.
-     */
-    public void handleInput(InputRequest request) throws BuildException {
-        readProps();
-        
-        Object o = props.get(request.getPrompt());
-        if (o == null) {
-            throw new BuildException("Unable to find input for \'"
-                                     + request.getPrompt()+"\'");
-        }
-        request.setInput(o.toString());
-        if (!request.isInputValid()) {
-            throw new BuildException("Found invalid input " + o
-                                     + " for \'" + request.getPrompt() + "\'");
-        }
-    }
-
-    /**
-     * Reads the properties file if it hasn't already been read.
-     */
-    private synchronized void readProps() throws BuildException {
-        if (props == null) {
-            String propsFile = System.getProperty(FILE_NAME_KEY);
-            if (propsFile == null) {
-                throw new BuildException("System property "
-                                         + FILE_NAME_KEY
-                                         + " for PropertyFileInputHandler not"
-                                         + " set");
-            }
-            
-            props = new Properties();
-            
-            try {
-                props.load(new FileInputStream(propsFile));
-            } catch (IOException e) {
-                throw new BuildException("Couldn't load " + propsFile, e);
-            }
-        }
-    }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/input/YesNoInputRequest.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/input/YesNoInputRequest.php
deleted file mode 100644
index d028278aa..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/input/YesNoInputRequest.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/*
- *  $Id: YesNoInputRequest.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/input/MultipleChoiceInputRequest.php';
-
-/**
- * Encapsulates an input request that returns a boolean (yes/no).
- *
- * @author Hans Lellelid <hans@xmpl.org>
- * @version $Revision: 1.4 $
- * @package phing.input
- */
-class YesNoInputRequest extends MultipleChoiceInputRequest {     
-
-    /**
-     * @return true if the input is one of the allowed values.
-     */
-    public function isInputValid() {
-        return StringHelper::isBoolean($this->input);        
-    }
-    
-    /**
-     * Converts input to boolean.
-     * @return boolean
-     */
-    public function getInput() {
-        return StringHelper::booleanValue($this->input);
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/lib/Capsule.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/lib/Capsule.php
deleted file mode 100644
index 1ea5537a2..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/lib/Capsule.php
+++ /dev/null
@@ -1,266 +0,0 @@
-<?php
-
-/**
- * Capsule is a simple "template" engine that essentially provides an isolated context
- * for PHP scripts.
- * 
- * There is no special templating language, and therefore no limitations to what
- * can be accomplished within templates. The main purpose of Capsule is to separate 
- * the business logic from display / output logic.
- * 
- * @author Hans Lellelid <hans@xmpl.org>
- * @version $Revision: 1.9 $ $Date: 2006-09-15 05:19:08 +0900 (金, 15  9月 2006) $
- */
-class Capsule {
-    
-    /**
-     * Look for templates here (if relative path provided).
-     * @var string
-     */
-    protected $templatePath;
-    
-    /**
-     * Where should output files be written?
-     * (This is named inconsistently to be compatible w/ Texen.)
-     * @var string
-     */
-    protected $outputDirectory;
-    
-    /**
-     * The variables that can be used by the templates.
-     * @var array Hash of variables.
-     */
-    public $vars = array();
-    
-    /**
-     * Has template been initialized.
-     */    
-    protected $initialized = false;
-    
-    /**
-     * Stores the pre-parse() include_path.
-     * @var string
-     */
-    private $old_include_path;
-    
-    function __construct() {
-    }
-    
-    /**
-     * Clears one or several or all variables.
-     * @param mixed $which String name of var, or array of names.
-     * @return void
-     */
-    function clear($which = null) {
-        if ($which === null) {
-            $this->vars = array();
-        } elseif (is_array($which)) {
-            foreach($which as $var) {
-                unset($this->vars[$var]);
-            }
-        } else {
-            unset($this->vars[$which]);
-        }
-    }
-    
-    /**
-     * Set the basepath to use for template lookups.
-     * @param string $v
-     */
-    function setTemplatePath($v) {
-        $this->templatePath = rtrim($v, DIRECTORY_SEPARATOR.'/');
-    }
-
-    /**
-     * Get the basepath to use for template lookups.
-     * @return string
-     */
-    function getTemplatePath() {
-        return $this->templatePath;
-    }
-    
-    /**
-     * Set a basepath to use for output file creation.
-     * @param string $v
-     */
-    function setOutputDirectory($v) {
-        $this->outputDirectory = rtrim($v, DIRECTORY_SEPARATOR.'/');
-    }
-
-    /**
-     * Get basepath to use for output file creation.
-     * @return string
-     */
-    function getOutputDirectory() {
-        return $this->outputDirectory;
-    }
-    
-    /**
-     * Low overhead (no output buffering) method to simply dump template
-     * to buffer.
-     * 
-     * @param string $__template
-     * @return void
-     * @throws Exception - if template cannot be found
-     */ 
-    function display($__template) {
-        
-        // Prepend "private" variable names with $__ in this function
-        // to keep namespace conflict potential to a minimum.
-            
-        // Alias this class to $generator.
-        $generator = $this;
-                        
-        if (isset($this->vars['this'])) {
-            throw new Exception("Assigning a variable named \$this to a context conflicts with class namespace.");
-        }
-        
-        // extract variables into local namespace
-        extract($this->vars);
-        
-        // prepend template path to include path, 
-        // so that include "path/relative/to/templates"; can be used within templates
-        $__old_inc_path = ini_get('include_path');
-        ini_set('include_path', $this->templatePath . PATH_SEPARATOR . $__old_inc_path);
-                
-        @ini_set('track_errors', true);
-        include $__template;
-        @ini_restore('track_errors');
-        
-        // restore the include path
-        ini_set('include_path', $__old_inc_path);
-        
-        if (!empty($php_errormsg)) {
-            throw new Exception("Unable to parse template " . $__template . ": " . $php_errormsg);
-        }
-    }
-    
-    /**
-     * Fetches the results of a tempalte parse and either returns
-     * the string or writes results to a specified output file.
-     *
-     * @param string $template The template filename (relative to templatePath or absolute).
-     * @param string $outputFile If specified, contents of template will also be written to this file.
-     * @param boolean $append Should output be appended to source file?
-     * @return string The "parsed" template output.
-     * @throws Exception - if template not found.
-     */
-    function parse($template, $outputFile = null, $append = false) {
-                
-        // main work done right here:
-        // hopefully this works recursively ... fingers crossed.    
-        ob_start();
-        
-        try {
-            $this->display($template);
-        } catch (Exception $e) {
-            ob_end_flush(); // flush the output on error (so we can see up to what point it parsed everything)
-            throw $e;
-        }
-                
-        $output = ob_get_contents();
-        ob_end_clean();
-        
-        if ($outputFile !== null) {
-            $outputFile = $this->resolvePath($outputFile, $this->outputDirectory);
-            
-            $flags = null;
-            if ($append) $flags = FILE_APPEND;
-            
-            if (!file_put_contents($outputFile, $output, $flags) && $output != "") {
-                throw new Exception("Unable to write output to " . $outputFile);
-            }
-        }
-
-        return $output;
-    }
-    
-    /**
-     * This returns a "best guess" path for the given file.
-     *
-     * @param string $file File name or possibly absolute path.
-     * @param string $basepath The basepath that should be prepended if $file is not absolute.
-     * @return string "Best guess" path for this file.
-     */
-    protected function resolvePath($file, $basepath) {
-        if ( !($file{0} == DIRECTORY_SEPARATOR || $file{0} == '/') 
-            // also account for C:\ style path
-                && !($file{1} == ':' && ($file{2} ==  DIRECTORY_SEPARATOR || $file{2} == '/'))) { 
-            if ($basepath != null) {
-                $file = $basepath . DIRECTORY_SEPARATOR . $file;
-            }
-        }
-        return $file;
-    }
-
-    /**
-     * Gets value of specified var or NULL if var has not been put().
-     * @param string $name Variable name to retrieve.
-     * @return mixed
-     */
-    function get($name) {
-        if (!isset($this->vars[$name])) return null;
-        return $this->vars[$name];
-    }
-    
-    /**
-     * Merges in passed hash to vars array.
-     *
-     * Given an array like:
-     *
-     *            array(     'myvar' => 'Hello',
-     *                    'myvar2' => 'Hello')
-     *
-     * Resulting template will have access to $myvar and $myvar2.
-     *
-     * @param array $vars
-     * @param boolean $recursiveMerge Should matching keys be recursively merged?
-     * @return void
-     */
-    function putAll($vars, $recursiveMerge = false) {
-        if ($recursiveMerge) {
-            $this->vars = array_merge_recursive($this->vars, $vars);
-        } else {
-            $this->vars = array_merge($this->vars, $vars);
-        }
-    }
-    
-    /**
-     * Adds a variable to the context.
-     * 
-     * Resulting template will have access to ${$name$} variable.
-     * 
-     * @param string $name
-     * @param mixed $value
-     */
-    function put($name, $value) {
-        $this->vars[$name] = $value;
-    }
-        
-    /**
-     * Put a variable into the context, assigning it by reference.
-     * This means that if the template modifies the variable, then it
-     * will also be modified in the context.
-     *
-     * @param $name
-     * @param &$value
-     */
-    function putRef($name, &$value) {
-        $this->vars[$name] = &$value;
-    }
-    
-    /**
-     * Makes a copy of the value and puts it into the context.
-     * This is primarily to force copying (cloning) of objects, rather
-     * than the default behavior which is to assign them by reference.
-     * @param string $name
-     * @param mixed $value
-     */
-    function putCopy($name, $value) {
-        if (is_object($value)) {
-            $value = clone $value;
-        }
-        $this->vars[$name] = $value;
-    }
-
-}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/lib/Zip.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/lib/Zip.php
deleted file mode 100755
index 088facdb4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/lib/Zip.php
+++ /dev/null
@@ -1,3590 +0,0 @@
-<?php
-/* vim: set ts=4 sw=4: */
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Vincent Blavet <vincent@blavet.net>                          |
-// +----------------------------------------------------------------------+
-//
-// $Id: Zip.php 325 2007-12-20 15:44:58Z hans $
-
-  // ----- Constants
-  define( 'ARCHIVE_ZIP_READ_BLOCK_SIZE', 2048 );
-
-  // ----- File list separator
-  define( 'ARCHIVE_ZIP_SEPARATOR', ',' );
-
-  // ----- Optional static temporary directory
-  //       By default temporary files are generated in the script current
-  //       path.
-  //       If defined :
-  //       - MUST BE terminated by a '/'.
-  //       - MUST be a valid, already created directory
-  //       Samples :
-  // define( 'ARCHIVE_ZIP_TEMPORARY_DIR', '/temp/' );
-  // define( 'ARCHIVE_ZIP_TEMPORARY_DIR', 'C:/Temp/' );
-  define( 'ARCHIVE_ZIP_TEMPORARY_DIR', '' );
-
-  // ----- Error codes
-  define( 'ARCHIVE_ZIP_ERR_NO_ERROR', 0 );
-  define( 'ARCHIVE_ZIP_ERR_WRITE_OPEN_FAIL', -1 );
-  define( 'ARCHIVE_ZIP_ERR_READ_OPEN_FAIL', -2 );
-  define( 'ARCHIVE_ZIP_ERR_INVALID_PARAMETER', -3 );
-  define( 'ARCHIVE_ZIP_ERR_MISSING_FILE', -4 );
-  define( 'ARCHIVE_ZIP_ERR_FILENAME_TOO_LONG', -5 );
-  define( 'ARCHIVE_ZIP_ERR_INVALID_ZIP', -6 );
-  define( 'ARCHIVE_ZIP_ERR_BAD_EXTRACTED_FILE', -7 );
-  define( 'ARCHIVE_ZIP_ERR_DIR_CREATE_FAIL', -8 );
-  define( 'ARCHIVE_ZIP_ERR_BAD_EXTENSION', -9 );
-  define( 'ARCHIVE_ZIP_ERR_BAD_FORMAT', -10 );
-  define( 'ARCHIVE_ZIP_ERR_DELETE_FILE_FAIL', -11 );
-  define( 'ARCHIVE_ZIP_ERR_RENAME_FILE_FAIL', -12 );
-  define( 'ARCHIVE_ZIP_ERR_BAD_CHECKSUM', -13 );
-  define( 'ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP', -14 );
-  define( 'ARCHIVE_ZIP_ERR_MISSING_OPTION_VALUE', -15 );
-  define( 'ARCHIVE_ZIP_ERR_INVALID_PARAM_VALUE', -16 );
-
-  // ----- Warning codes
-  define( 'ARCHIVE_ZIP_WARN_NO_WARNING', 0 );
-  define( 'ARCHIVE_ZIP_WARN_FILE_EXIST', 1 );
-
-  // ----- Methods parameters
-  define( 'ARCHIVE_ZIP_PARAM_PATH', 'path' );
-  define( 'ARCHIVE_ZIP_PARAM_ADD_PATH', 'add_path' );
-  define( 'ARCHIVE_ZIP_PARAM_REMOVE_PATH', 'remove_path' );
-  define( 'ARCHIVE_ZIP_PARAM_REMOVE_ALL_PATH', 'remove_all_path' );
-  define( 'ARCHIVE_ZIP_PARAM_SET_CHMOD', 'set_chmod' );
-  define( 'ARCHIVE_ZIP_PARAM_EXTRACT_AS_STRING', 'extract_as_string' );
-  define( 'ARCHIVE_ZIP_PARAM_NO_COMPRESSION', 'no_compression' );
-  define( 'ARCHIVE_ZIP_PARAM_BY_NAME', 'by_name' );
-  define( 'ARCHIVE_ZIP_PARAM_BY_INDEX', 'by_index' );
-  define( 'ARCHIVE_ZIP_PARAM_BY_EREG', 'by_ereg' );
-  define( 'ARCHIVE_ZIP_PARAM_BY_PREG', 'by_preg' );
-
-  define( 'ARCHIVE_ZIP_PARAM_PRE_EXTRACT', 'callback_pre_extract' );
-  define( 'ARCHIVE_ZIP_PARAM_POST_EXTRACT', 'callback_post_extract' );
-  define( 'ARCHIVE_ZIP_PARAM_PRE_ADD', 'callback_pre_add' );
-  define( 'ARCHIVE_ZIP_PARAM_POST_ADD', 'callback_post_add' );
-
-
-
-/**
-* Class for manipulating zip archive files
-*
-* A class which provided common methods to manipulate ZIP formatted
-* archive files.
-* It provides creation, extraction, deletion and add features.
-*
-* @author   Vincent Blavet <vincent@blavet.net>
-* @version  $Revision: 1.3 $
-* @package  phing.lib
-*/
-class Archive_Zip
-{
-    /**
-    * The filename of the zip archive.
-    *
-    * @var string Name of the Zip file
-    */
-    var $_zipname='';
-
-    /**
-    * File descriptor of the opened Zip file.
-    *
-    * @var int Internal zip file descriptor
-    */
-    var $_zip_fd=0;
-
-    /**
-    * @var int last error code
-    */
-    var $_error_code=1;
-
-    /**
-    * @var string Last error description
-    */
-    var $_error_string='';
-
-    // {{{ constructor
-    /**
-    * Archive_Zip Class constructor. This flavour of the constructor only
-    * declare a new Archive_Zip object, identifying it by the name of the
-    * zip file.
-    *
-    * @param    string  $p_zipname  The name of the zip archive to create
-    * @access public
-    */
-    function __construct($p_zipname)
-    {
-      if (!extension_loaded('zlib')) {
-          throw new Exception("The extension 'zlib' couldn't be found.\n".
-              "Please make sure your version of PHP was built ".
-              "with 'zlib' support.");
-      }
-
-      // ----- Set the attributes
-      $this->_zipname = $p_zipname;
-      $this->_zip_fd = 0;
-    }
-    // }}}
-
-    // {{{ create()
-    /**
-    * This method creates a Zip Archive with the filename set with
-	* the constructor.
-	* The files and directories indicated in $p_filelist
-    * are added in the archive.
-	* When a directory is in the list, the directory and its content is added
-    * in the archive.
-    * The methods takes a variable list of parameters in $p_params.
-    * The supported parameters for this method are :
-    *   'add_path' : Add a path to the archived files.
-    *   'remove_path' : Remove the specified 'root' path of the archived files.
-    *   'remove_all_path' : Remove all the path of the archived files.
-    *   'no_compression' : The archived files will not be compressed.
-    *
-    * @access public
-    * @param  mixed  $p_filelist  The list of the files or folders to add.
-    *                             It can be a string with filenames separated
-    *                             by a comma, or an array of filenames.
-    * @param  mixed  $p_params  An array of variable parameters and values.
-    * @return mixed An array of file description on success,
-	*               an error code on error
-    */
-    function create($p_filelist, $p_params=0)
-    {
-        $this->_errorReset();
-
-        // ----- Set default values
-        if ($p_params === 0) {
-    	    $p_params = array();
-        }
-        if ($this->_check_parameters($p_params,
-	                                 array('no_compression' => false,
-	                                       'add_path' => "",
-	                                       'remove_path' => "",
-	                                       'remove_all_path' => false)) != 1) {
-		    return 0;
-	    }
-
-        // ----- Look if the $p_filelist is really an array
-        $p_result_list = array();
-        if (is_array($p_filelist)) {
-            $v_result = $this->_create($p_filelist, $p_result_list, $p_params);
-        }
-
-        // ----- Look if the $p_filelist is a string
-        else if (is_string($p_filelist)) {
-            // ----- Create a list with the elements from the string
-            $v_list = explode(ARCHIVE_ZIP_SEPARATOR, $p_filelist);
-
-            $v_result = $this->_create($v_list, $p_result_list, $p_params);
-        }
-
-        // ----- Invalid variable
-        else {
-            $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER,
-	                         'Invalid variable type p_filelist');
-            $v_result = ARCHIVE_ZIP_ERR_INVALID_PARAMETER;
-        }
-
-        if ($v_result != 1) {
-            return 0;
-        }
-
-        return $p_result_list;
-    }
-    // }}}
-
-    // {{{ add()
-    /**
-    * This method add files or directory in an existing Zip Archive.
-    * If the Zip Archive does not exist it is created.
-	* The files and directories to add are indicated in $p_filelist.
-	* When a directory is in the list, the directory and its content is added
-    * in the archive.
-    * The methods takes a variable list of parameters in $p_params.
-    * The supported parameters for this method are :
-    *   'add_path' : Add a path to the archived files.
-    *   'remove_path' : Remove the specified 'root' path of the archived files.
-    *   'remove_all_path' : Remove all the path of the archived files.
-    *   'no_compression' : The archived files will not be compressed.
-    *   'callback_pre_add' : A callback function that will be called before
-    *                        each entry archiving.
-    *   'callback_post_add' : A callback function that will be called after
-    *                         each entry archiving.
-    *
-    * @access public
-    * @param    mixed  $p_filelist  The list of the files or folders to add.
-    *                               It can be a string with filenames separated
-    *                               by a comma, or an array of filenames.
-    * @param    mixed  $p_params  An array of variable parameters and values.
-    * @return mixed An array of file description on success,
-	*               0 on an unrecoverable failure, an error code is logged.
-    */
-    function add($p_filelist, $p_params=0)
-    {
-        $this->_errorReset();
-
-        // ----- Set default values
-        if ($p_params === 0) {
-        	$p_params = array();
-        }
-        if ($this->_check_parameters($p_params,
-	                                 array ('no_compression' => false,
-	                                        'add_path' => '',
-	                                        'remove_path' => '',
-	                                        'remove_all_path' => false,
-						    	     		'callback_pre_add' => '',
-							    		    'callback_post_add' => '')) != 1) {
-		    return 0;
-	    }
-
-        // ----- Look if the $p_filelist is really an array
-        $p_result_list = array();
-        if (is_array($p_filelist)) {
-            // ----- Call the create fct
-            $v_result = $this->_add($p_filelist, $p_result_list, $p_params);
-        }
-
-        // ----- Look if the $p_filelist is a string
-        else if (is_string($p_filelist)) {
-            // ----- Create a list with the elements from the string
-            $v_list = explode(ARCHIVE_ZIP_SEPARATOR, $p_filelist);
-
-            // ----- Call the create fct
-            $v_result = $this->_add($v_list, $p_result_list, $p_params);
-        }
-
-        // ----- Invalid variable
-        else {
-            $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER,
-	                         "add() : Invalid variable type p_filelist");
-            $v_result = ARCHIVE_ZIP_ERR_INVALID_PARAMETER;
-        }
-
-        if ($v_result != 1) {
-            return 0;
-        }
-
-        // ----- Return the result list
-        return $p_result_list;
-    }
-    // }}}
-
-    // {{{ listContent()
-    /**
-    * This method gives the names and properties of the files and directories
-	* which are present in the zip archive.
-    * The properties of each entries in the list are :
-    *   filename : Name of the file.
-	*              For create() or add() it's the filename given by the user.
-	*              For an extract() it's the filename of the extracted file.
-    *   stored_filename : Name of the file / directory stored in the archive.
-    *   size : Size of the stored file.
-    *   compressed_size : Size of the file's data compressed in the archive
-    *                     (without the zip headers overhead)
-    *   mtime : Last known modification date of the file (UNIX timestamp)
-    *   comment : Comment associated with the file
-    *   folder : true | false (indicates if the entry is a folder)
-    *   index : index of the file in the archive (-1 when not available)
-    *   status : status of the action on the entry (depending of the action) :
-    *            Values are :
-    *              ok : OK !
-    *              filtered : the file/dir was not extracted (filtered by user)
-    *              already_a_directory : the file can't be extracted because a
-    *                                    directory with the same name already
-	*                                    exists
-    *              write_protected : the file can't be extracted because a file
-    *                                with the same name already exists and is
-    *                                write protected
-    *              newer_exist : the file was not extracted because a newer
-	*                            file already exists
-    *              path_creation_fail : the file is not extracted because the
-	*                                   folder does not exists and can't be
-	*                                   created
-    *              write_error : the file was not extracted because there was a
-    *                            error while writing the file
-    *              read_error : the file was not extracted because there was a
-	*                           error while reading the file
-    *              invalid_header : the file was not extracted because of an
-	*                               archive format error (bad file header)
-    * Note that each time a method can continue operating when there
-    * is an error on a single file, the error is only logged in the file status.
-    *
-    * @access public
-    * @return mixed An array of file description on success,
-	*               0 on an unrecoverable failure, an error code is logged.
-    */
-    function listContent()
-    {
-        $this->_errorReset();
-
-        // ----- Check archive
-        if (!$this->_checkFormat()) {
-            return(0);
-        }
-
-        $v_list = array();
-        if ($this->_list($v_list) != 1) {
-            unset($v_list);
-            return(0);
-        }
-
-        return $v_list;
-    }
-    // }}}
-
-    // {{{ extract()
-    /**
-    * This method extract the files and folders which are in the zip archive.
-    * It can extract all the archive or a part of the archive by using filter
-    * feature (extract by name, by index, by ereg, by preg). The extraction
-    * can occur in the current path or an other path.
-    * All the advanced features are activated by the use of variable
-	* parameters.
-	* The return value is an array of entry descriptions which gives
-	* information on extracted files (See listContent()).
-	* The method may return a success value (an array) even if some files
-	* are not correctly extracted (see the file status in listContent()).
-    * The supported variable parameters for this method are :
-    *   'add_path' : Path where the files and directories are to be extracted
-    *   'remove_path' : First part ('root' part) of the memorized path
-    *                   (if similar) to remove while extracting.
-    *   'remove_all_path' : Remove all the memorized path while extracting.
-    *   'extract_as_string' :
-    *   'set_chmod' : After the extraction of the file the indicated mode
-    *                 will be set.
-    *   'by_name' : It can be a string with file/dir names separated by ',',
-    *               or an array of file/dir names to extract from the archive.
-    *   'by_index' : A string with range of indexes separated by ',',
-    *                (sample "1,3-5,12").
-    *   'by_ereg' : A regular expression (ereg) that must match the extracted
-    *               filename.
-    *   'by_preg' : A regular expression (preg) that must match the extracted
-    *               filename.
-    *   'callback_pre_extract' : A callback function that will be called before
-    *                            each entry extraction.
-    *   'callback_post_extract' : A callback function that will be called after
-    *                            each entry extraction.
-    *
-    * @access public
-    * @param    mixed  $p_params  An array of variable parameters and values.
-    * @return mixed An array of file description on success,
-	*               0 on an unrecoverable failure, an error code is logged.
-    */
-    function extract($p_params=0)
-    {
-
-        $this->_errorReset();
-
-        // ----- Check archive
-        if (!$this->_checkFormat()) {
-            return(0);
-        }
-
-        // ----- Set default values
-        if ($p_params === 0) {
-        	$p_params = array();
-        }
-        if ($this->_check_parameters($p_params,
-	                                 array ('extract_as_string' => false,
-	                                        'add_path' => '',
-	                                        'remove_path' => '',
-	                                        'remove_all_path' => false,
-					    		     		'callback_pre_extract' => '',
-						    			    'callback_post_extract' => '',
-							    		    'set_chmod' => 0,
-								    	    'by_name' => '',
-									        'by_index' => '',
-									        'by_ereg' => '',
-									        'by_preg' => '') ) != 1) {
-	    	return 0;
-	    }
-
-        // ----- Call the extracting fct
-        $v_list = array();
-        if ($this->_extractByRule($v_list, $p_params) != 1) {
-            unset($v_list);
-            return(0);
-        }
-
-        return $v_list;
-    }
-    // }}}
-
-
-    // {{{ delete()
-    /**
-    * This methods delete archive entries in the zip archive.
-    * Notice that at least one filtering rule (set by the variable parameter
-    * list) must be set.
-    * Also notice that if you delete a folder entry, only the folder entry
-    * is deleted, not all the files bellonging to this folder.
-    * The supported variable parameters for this method are :
-    *   'by_name' : It can be a string with file/dir names separated by ',',
-    *               or an array of file/dir names to delete from the archive.
-    *   'by_index' : A string with range of indexes separated by ',',
-    *                (sample "1,3-5,12").
-    *   'by_ereg' : A regular expression (ereg) that must match the extracted
-    *               filename.
-    *   'by_preg' : A regular expression (preg) that must match the extracted
-    *               filename.
-    *
-    * @access public
-    * @param    mixed  $p_params  An array of variable parameters and values.
-    * @return mixed An array of file description on success,
-	*               0 on an unrecoverable failure, an error code is logged.
-    */
-    function delete($p_params)
-    {
-        $this->_errorReset();
-
-        // ----- Check archive
-        if (!$this->_checkFormat()) {
-            return(0);
-        }
-
-        // ----- Set default values
-        if ($this->_check_parameters($p_params,
-	                                 array ('by_name' => '',
-									        'by_index' => '',
-									        'by_ereg' => '',
-									        'by_preg' => '') ) != 1) {
-	    	return 0;
-    	}
-
-        // ----- Check that at least one rule is set
-        if (   ($p_params['by_name'] == '')
-            && ($p_params['by_index'] == '')
-            && ($p_params['by_ereg'] == '')
-            && ($p_params['by_preg'] == '')) {
-            $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER,
-			                 'At least one filtering rule must'
-							 .' be set as parameter');
-            return 0;
-        }
-
-        // ----- Call the delete fct
-        $v_list = array();
-        if ($this->_deleteByRule($v_list, $p_params) != 1) {
-            unset($v_list);
-            return(0);
-        }
-
-        return $v_list;
-    }
-    // }}}
-
-    // {{{ properties()
-    /**
-    * This method gives the global properties of the archive.
-    *  The properties are :
-    *    nb : Number of files in the archive
-    *    comment : Comment associated with the archive file
-    *    status : not_exist, ok
-    *
-    * @access public
-    * @param    mixed  $p_params  {Description}
-    * @return mixed An array with the global properties or 0 on error.
-    */
-    function properties()
-    {
-        $this->_errorReset();
-
-        // ----- Check archive
-        if (!$this->_checkFormat()) {
-            return(0);
-        }
-
-        // ----- Default properties
-        $v_prop = array();
-        $v_prop['comment'] = '';
-        $v_prop['nb'] = 0;
-        $v_prop['status'] = 'not_exist';
-
-        // ----- Look if file exists
-        if (@is_file($this->_zipname)) {
-            // ----- Open the zip file
-            if (($this->_zip_fd = @fopen($this->_zipname, 'rb')) == 0) {
-                $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL,
-				                 'Unable to open archive \''.$this->_zipname
-								 .'\' in binary read mode');
-                return 0;
-            }
-
-            // ----- Read the central directory informations
-            $v_central_dir = array();
-            if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1) {
-                return 0;
-            }
-
-            $this->_closeFd();
-
-            // ----- Set the user attributes
-            $v_prop['comment'] = $v_central_dir['comment'];
-            $v_prop['nb'] = $v_central_dir['entries'];
-            $v_prop['status'] = 'ok';
-        }
-
-        return $v_prop;
-    }
-    // }}}
-
-
-    // {{{ duplicate()
-    /**
-    * This method creates an archive by copying the content of an other one.
-	* If the archive already exist, it is replaced by the new one without
-	* any warning.
-    *
-    * @access public
-    * @param  mixed  $p_archive  It can be a valid Archive_Zip object or
-	*                            the filename of a valid zip archive.
-    * @return integer 1 on success, 0 on failure.
-    */
-    function duplicate($p_archive)
-    {
-        $this->_errorReset();
-
-        // ----- Look if the $p_archive is a Archive_Zip object
-        if (   (is_object($p_archive))
-		    && (strtolower(get_class($p_archive)) == 'archive_zip')) {
-            $v_result = $this->_duplicate($p_archive->_zipname);
-        }
-
-        // ----- Look if the $p_archive is a string (so a filename)
-        else if (is_string($p_archive)) {
-            // ----- Check that $p_archive is a valid zip file
-            // TBC : Should also check the archive format
-            if (!is_file($p_archive)) {
-                $this->_errorLog(ARCHIVE_ZIP_ERR_MISSING_FILE,
-				                 "No file with filename '".$p_archive."'");
-                $v_result = ARCHIVE_ZIP_ERR_MISSING_FILE;
-            }
-            else {
-                $v_result = $this->_duplicate($p_archive);
-            }
-        }
-
-        // ----- Invalid variable
-        else {
-            $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER,
-			                 "Invalid variable type p_archive_to_add");
-            $v_result = ARCHIVE_ZIP_ERR_INVALID_PARAMETER;
-        }
-
-        return $v_result;
-    }
-    // }}}
-
-    // {{{ merge()
-    /**
-    *  This method merge a valid zip archive at the end of the
-	*  archive identified by the Archive_Zip object.
-    *  If the archive ($this) does not exist, the merge becomes a duplicate.
-    *  If the archive to add does not exist, the merge is a success.
-    *
-    * @access public
-    * @param mixed $p_archive_to_add  It can be a valid Archive_Zip object or
-	*                                 the filename of a valid zip archive.
-    * @return integer 1 on success, 0 on failure.
-    */
-    function merge($p_archive_to_add)
-    {
-        $v_result = 1;
-        $this->_errorReset();
-
-        // ----- Check archive
-        if (!$this->_checkFormat()) {
-            return(0);
-        }
-
-        // ----- Look if the $p_archive_to_add is a Archive_Zip object
-        if (   (is_object($p_archive_to_add))
-		    && (strtolower(get_class($p_archive_to_add)) == 'archive_zip')) {
-            $v_result = $this->_merge($p_archive_to_add);
-        }
-
-        // ----- Look if the $p_archive_to_add is a string (so a filename)
-        else if (is_string($p_archive_to_add)) {
-            // ----- Create a temporary archive
-            $v_object_archive = new Archive_Zip($p_archive_to_add);
-
-            // ----- Merge the archive
-            $v_result = $this->_merge($v_object_archive);
-        }
-
-        // ----- Invalid variable
-        else {
-            $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER,
-			                 "Invalid variable type p_archive_to_add");
-            $v_result = ARCHIVE_ZIP_ERR_INVALID_PARAMETER;
-        }
-
-        return $v_result;
-    }
-    // }}}
-
-    // {{{ errorCode()
-    /**
-    * Method that gives the lastest error code.
-    *
-    * @access public
-    * @return integer The error code value.
-    */
-    function errorCode()
-    {
-        return($this->_error_code);
-    }
-    // }}}
-
-    // {{{ errorName()
-    /**
-    * This method gives the latest error code name.
-    *
-    * @access public
-    * @param  boolean $p_with_code  If true, gives the name and the int value.
-    * @return string The error name.
-    */
-    function errorName($p_with_code=false)
-    {
-        $v_const_list = get_defined_constants();
-  	
-      	// ----- Extract error constants from all const.
-        for (reset($v_const_list);
-		     list($v_key, $v_value) = each($v_const_list);) {
-     	    if (substr($v_key, 0, strlen('ARCHIVE_ZIP_ERR_'))
-			    =='ARCHIVE_ZIP_ERR_') {
-    		    $v_error_list[$v_key] = $v_value;
-    	    }
-        }
-    
-        // ----- Search the name form the code value
-        $v_key=array_search($this->_error_code, $v_error_list, true);
-  	    if ($v_key!=false) {
-            $v_value = $v_key;
-  	    }
-  	    else {
-            $v_value = 'NoName';
-  	    }
-  	
-        if ($p_with_code) {
-            return($v_value.' ('.$this->_error_code.')');
-        }
-        else {
-          return($v_value);
-        }
-    }
-    // }}}
-
-    // {{{ errorInfo()
-    /**
-    * This method returns the description associated with the latest error.
-    *
-    * @access public
-    * @param  boolean $p_full If set to true gives the description with the
-    *                         error code, the name and the description.
-    *                         If set to false gives only the description
-    *                         and the error code.
-    * @return string The error description.
-    */
-    function errorInfo($p_full=false)
-    {
-        if ($p_full) {
-            return($this->errorName(true)." : ".$this->_error_string);
-        }
-        else {
-            return($this->_error_string." [code ".$this->_error_code."]");
-        }
-    }
-    // }}}
-
-
-// -----------------------------------------------------------------------------
-// ***** UNDER THIS LINE ARE DEFINED PRIVATE INTERNAL FUNCTIONS *****
-// *****                                                        *****
-// *****       THESES FUNCTIONS MUST NOT BE USED DIRECTLY       *****
-// -----------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _checkFormat()
-  // Description :
-  //   This method check that the archive exists and is a valid zip archive.
-  //   Several level of check exists. (futur)
-  // Parameters :
-  //   $p_level : Level of check. Default 0.
-  //              0 : Check the first bytes (magic codes) (default value))
-  //              1 : 0 + Check the central directory (futur)
-  //              2 : 1 + Check each file header (futur)
-  // Return Values :
-  //   true on success,
-  //   false on error, the error code is set.
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_checkFormat()
-  *
-  * { Description }
-  *
-  * @param integer $p_level
-  */
-  function _checkFormat($p_level=0)
-  {
-    $v_result = true;
-
-    // ----- Reset the error handler
-    $this->_errorReset();
-
-    // ----- Look if the file exits
-    if (!is_file($this->_zipname)) {
-      // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_MISSING_FILE,
-	                   "Missing archive file '".$this->_zipname."'");
-      return(false);
-    }
-
-    // ----- Check that the file is readeable
-    if (!is_readable($this->_zipname)) {
-      // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL,
-	                   "Unable to read archive '".$this->_zipname."'");
-      return(false);
-    }
-
-    // ----- Check the magic code
-    // TBC
-
-    // ----- Check the central header
-    // TBC
-
-    // ----- Check each file header
-    // TBC
-
-    // ----- Return
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _create()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_create()
-  *
-  * { Description }
-  *
-  */
-  function _create($p_list, &$p_result_list, &$p_params)
-  {
-    $v_result=1;
-    $v_list_detail = array();
-
-	$p_add_dir = $p_params['add_path'];
-	$p_remove_dir = $p_params['remove_path'];
-	$p_remove_all_dir = $p_params['remove_all_path'];
-
-    // ----- Open the file in write mode
-    if (($v_result = $this->_openFd('wb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Add the list of files
-    $v_result = $this->_addList($p_list, $p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_params);
-
-    // ----- Close
-    $this->_closeFd();
-
-    // ----- Return
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _add()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_add()
-  *
-  * { Description }
-  *
-  */
-  function _add($p_list, &$p_result_list, &$p_params)
-  {
-    $v_result=1;
-    $v_list_detail = array();
-
-	$p_add_dir = $p_params['add_path'];
-	$p_remove_dir = $p_params['remove_path'];
-	$p_remove_all_dir = $p_params['remove_all_path'];
-
-    // ----- Look if the archive exists or is empty and need to be created
-    if ((!is_file($this->_zipname)) || (filesize($this->_zipname) == 0)) {
-      $v_result = $this->_create($p_list, $p_result_list, $p_params);
-      return $v_result;
-    }
-
-    // ----- Open the zip file
-    if (($v_result=$this->_openFd('rb')) != 1) {
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->_closeFd();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($this->_zip_fd);
-
-    // ----- Creates a temporay file
-    $v_zip_temp_name = ARCHIVE_ZIP_TEMPORARY_DIR.uniqid('archive_zip-').'.tmp';
-
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0)
-    {
-      $this->_closeFd();
-
-      $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL,
-	                   'Unable to open temporary file \''
-					   .$v_zip_temp_name.'\' in binary write mode');
-      return Archive_Zip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the
-	// central dir
-    $v_size = $v_central_dir['offset'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
-	                  ? $v_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($this->_zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Swap the file descriptor
-    // Here is a trick : I swap the temporary fd with the zip fd, in order to 
-    // use the following methods on the temporary fil and not the real archive
-    $v_swap = $this->_zip_fd;
-    $this->_zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Add the files
-    $v_header_list = array();
-    if (($v_result = $this->_addFileList($p_list, $v_header_list,
-	                                     $p_add_dir, $p_remove_dir,
-										 $p_remove_all_dir, $p_params)) != 1)
-    {
-      fclose($v_zip_temp_fd);
-      $this->_closeFd();
-      @unlink($v_zip_temp_name);
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($this->_zip_fd);
-
-    // ----- Copy the block of file headers from the old archive
-    $v_size = $v_central_dir['size'];
-    while ($v_size != 0)
-    {
-      $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
-	                  ? $v_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($v_zip_temp_fd, $v_read_size);
-      @fwrite($this->_zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Create the Central Dir files header
-    for ($i=0, $v_count=0; $i<sizeof($v_header_list); $i++)
-    {
-      // ----- Create the file header
-      if ($v_header_list[$i]['status'] == 'ok') {
-        if (($v_result=$this->_writeCentralFileHeader($v_header_list[$i]))!=1) {
-          fclose($v_zip_temp_fd);
-          $this->_closeFd();
-          @unlink($v_zip_temp_name);
-
-          // ----- Return
-          return $v_result;
-        }
-        $v_count++;
-      }
-
-      // ----- Transform the header to a 'usable' info
-      $this->_convertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-    }
-
-    // ----- Zip file comment
-    $v_comment = '';
-
-    // ----- Calculate the size of the central header
-    $v_size = @ftell($this->_zip_fd)-$v_offset;
-
-    // ----- Create the central dir footer
-    if (($v_result = $this->_writeCentralHeader($v_count
-	                                              +$v_central_dir['entries'],
-	                                            $v_size, $v_offset,
-												$v_comment)) != 1) {
-      // ----- Reset the file list
-      unset($v_header_list);
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Swap back the file descriptor
-    $v_swap = $this->_zip_fd;
-    $this->_zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Close
-    $this->_closeFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    // ----- Delete the zip file
-    // TBC : I should test the result ...
-    @unlink($this->_zipname);
-
-    // ----- Rename the temporary file
-    // TBC : I should test the result ...
-    //@rename($v_zip_temp_name, $this->_zipname);
-    $this->_tool_Rename($v_zip_temp_name, $this->_zipname);
-
-    // ----- Return
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _openFd()
-  // Description :
-  // Parameters :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_openFd()
-  *
-  * { Description }
-  *
-  */
-  function _openFd($p_mode)
-  {
-    $v_result=1;
-
-    // ----- Look if already open
-    if ($this->_zip_fd != 0)
-    {
-      $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL,
-	                   'Zip file \''.$this->_zipname.'\' already open');
-      return Archive_Zip::errorCode();
-    }
-
-    // ----- Open the zip file
-    if (($this->_zip_fd = @fopen($this->_zipname, $p_mode)) == 0)
-    {
-      $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL,
-	                   'Unable to open archive \''.$this->_zipname
-					   .'\' in '.$p_mode.' mode');
-      return Archive_Zip::errorCode();
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _closeFd()
-  // Description :
-  // Parameters :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_closeFd()
-  *
-  * { Description }
-  *
-  */
-  function _closeFd()
-  {
-    $v_result=1;
-
-    if ($this->_zip_fd != 0)
-      @fclose($this->_zip_fd);
-    $this->_zip_fd = 0;
-
-    // ----- Return
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _addList()
-  // Description :
-  //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
-  //   different from the real path of the file. This is usefull if you want to have PclTar
-  //   running in any directory, and memorize relative path from an other directory.
-  // Parameters :
-  //   $p_list : An array containing the file or directory names to add in the tar
-  //   $p_result_list : list of added files with their properties (specially the status field)
-  //   $p_add_dir : Path to add in the filename path archived
-  //   $p_remove_dir : Path to remove in the filename path archived
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_addList()
-  *
-  * { Description }
-  *
-  */
-  function _addList($p_list, &$p_result_list,
-                    $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_params)
-  {
-    $v_result=1;
-
-    // ----- Add the files
-    $v_header_list = array();
-    if (($v_result = $this->_addFileList($p_list, $v_header_list,
-	                                     $p_add_dir, $p_remove_dir,
-										 $p_remove_all_dir, $p_params)) != 1) {
-      return $v_result;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($this->_zip_fd);
-
-    // ----- Create the Central Dir files header
-    for ($i=0,$v_count=0; $i<sizeof($v_header_list); $i++)
-    {
-      // ----- Create the file header
-      if ($v_header_list[$i]['status'] == 'ok') {
-        if (($v_result = $this->_writeCentralFileHeader($v_header_list[$i])) != 1) {
-          return $v_result;
-        }
-        $v_count++;
-      }
-
-      // ----- Transform the header to a 'usable' info
-      $this->_convertHeader2FileInfo($v_header_list[$i], $p_result_list[$i]);
-    }
-
-    // ----- Zip file comment
-    $v_comment = '';
-
-    // ----- Calculate the size of the central header
-    $v_size = @ftell($this->_zip_fd)-$v_offset;
-
-    // ----- Create the central dir footer
-    if (($v_result = $this->_writeCentralHeader($v_count, $v_size, $v_offset,
-	                                            $v_comment)) != 1)
-    {
-      // ----- Reset the file list
-      unset($v_header_list);
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _addFileList()
-  // Description :
-  //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
-  //   different from the real path of the file. This is usefull if you want to
-  //   run the lib in any directory, and memorize relative path from an other directory.
-  // Parameters :
-  //   $p_list : An array containing the file or directory names to add in the tar
-  //   $p_result_list : list of added files with their properties (specially the status field)
-  //   $p_add_dir : Path to add in the filename path archived
-  //   $p_remove_dir : Path to remove in the filename path archived
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_addFileList()
-  *
-  * { Description }
-  *
-  */
-  function _addFileList($p_list, &$p_result_list,
-                        $p_add_dir, $p_remove_dir, $p_remove_all_dir,
-						&$p_params)
-  {
-    $v_result=1;
-    $v_header = array();
-
-    // ----- Recuperate the current number of elt in list
-    $v_nb = sizeof($p_result_list);
-
-    // ----- Loop on the files
-    for ($j=0; ($j<count($p_list)) && ($v_result==1); $j++)
-    {
-      // ----- Recuperate the filename
-      $p_filename = $this->_tool_TranslateWinPath($p_list[$j], false);
-
-      // ----- Skip empty file names
-      if ($p_filename == "")
-      {
-        continue;
-      }
-
-      // ----- Check the filename
-      if (!file_exists($p_filename))
-      {
-        $this->_errorLog(ARCHIVE_ZIP_ERR_MISSING_FILE,
-		                 "File '$p_filename' does not exists");
-        return Archive_Zip::errorCode();
-      }
-
-      // ----- Look if it is a file or a dir with no all pathnre move
-      if ((is_file($p_filename)) || ((is_dir($p_filename)) && !$p_remove_all_dir)) {
-        // ----- Add the file
-        if (($v_result = $this->_addFile($p_filename, $v_header, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_params)) != 1)
-        {
-          // ----- Return status
-          return $v_result;
-        }
-
-        // ----- Store the file infos
-        $p_result_list[$v_nb++] = $v_header;
-      }
-
-      // ----- Look for directory
-      if (is_dir($p_filename))
-      {
-
-        // ----- Look for path
-        if ($p_filename != ".")
-          $v_path = $p_filename."/";
-        else
-          $v_path = "";
-
-        // ----- Read the directory for files and sub-directories
-        $p_hdir = opendir($p_filename);
-        $p_hitem = readdir($p_hdir); // '.' directory
-        $p_hitem = readdir($p_hdir); // '..' directory
-        while ($p_hitem = readdir($p_hdir))
-        {
-
-          // ----- Look for a file
-          if (is_file($v_path.$p_hitem))
-          {
-
-            // ----- Add the file
-            if (($v_result = $this->_addFile($v_path.$p_hitem, $v_header, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_params)) != 1)
-            {
-              // ----- Return status
-              return $v_result;
-            }
-
-            // ----- Store the file infos
-            $p_result_list[$v_nb++] = $v_header;
-          }
-
-          // ----- Recursive call to _addFileList()
-          else
-          {
-
-            // ----- Need an array as parameter
-            $p_temp_list[0] = $v_path.$p_hitem;
-            $v_result = $this->_addFileList($p_temp_list, $p_result_list, $p_add_dir, $p_remove_dir, $p_remove_all_dir, $p_params);
-
-            // ----- Update the number of elements of the list
-            $v_nb = sizeof($p_result_list);
-          }
-        }
-
-        // ----- Free memory for the recursive loop
-        unset($p_temp_list);
-        unset($p_hdir);
-        unset($p_hitem);
-      }
-    }
-
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _addFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_addFile()
-  *
-  * { Description }
-  *
-  */
-  function _addFile($p_filename, &$p_header, $p_add_dir, $p_remove_dir, $p_remove_all_dir, &$p_params)
-  {
-    $v_result=1;
-
-    if ($p_filename == "")
-    {
-      // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER, "Invalid file list parameter (invalid or empty list)");
-
-      // ----- Return
-      return Archive_Zip::errorCode();
-    }
-
-    // ----- Calculate the stored filename
-    $v_stored_filename = $p_filename;
-
-    // ----- Look for all path to remove
-    if ($p_remove_all_dir) {
-      $v_stored_filename = basename($p_filename);
-    }
-    // ----- Look for partial path remove
-    else if ($p_remove_dir != "")
-    {
-      $p_remove_dir = $this->_tool_TranslateWinPath($p_remove_dir, false);
-    	
-      if (substr($p_remove_dir, -1) != '/')
-        $p_remove_dir .= "/";
-
-      if ((substr($p_filename, 0, 2) == "./") || (substr($p_remove_dir, 0, 2) == "./"))
-      {
-        if ((substr($p_filename, 0, 2) == "./") && (substr($p_remove_dir, 0, 2) != "./"))
-          $p_remove_dir = "./".$p_remove_dir;
-        if ((substr($p_filename, 0, 2) != "./") && (substr($p_remove_dir, 0, 2) == "./"))
-          $p_remove_dir = substr($p_remove_dir, 2);
-      }
-
-      $v_compare = $this->_tool_PathInclusion($p_remove_dir, $p_filename);
-      if ($v_compare > 0)
-//      if (substr($p_filename, 0, strlen($p_remove_dir)) == $p_remove_dir)
-      {
-
-        if ($v_compare == 2) {
-          $v_stored_filename = "";
-        }
-        else {
-          $v_stored_filename = substr($p_filename, strlen($p_remove_dir));
-        }
-      }
-    }
-    // ----- Look for path to add
-    if ($p_add_dir != "")
-    {
-      if (substr($p_add_dir, -1) == "/")
-        $v_stored_filename = $p_add_dir.$v_stored_filename;
-      else
-        $v_stored_filename = $p_add_dir."/".$v_stored_filename;
-    }
-
-    // ----- Filename (reduce the path of stored name)
-    $v_stored_filename = $this->_tool_PathReduction($v_stored_filename);
-
-
-    /* filename length moved after call-back in release 1.3
-    // ----- Check the path length
-    if (strlen($v_stored_filename) > 0xFF)
-    {
-      // ----- Error log
-      $this->_errorLog(-5, "Stored file name is too long (max. 255) : '$v_stored_filename'");
-
-      // ----- Return
-      return Archive_Zip::errorCode();
-    }
-    */
-
-    // ----- Set the file properties
-    clearstatcache();
-    $p_header['version'] = 20;
-    $p_header['version_extracted'] = 10;
-    $p_header['flag'] = 0;
-    $p_header['compression'] = 0;
-    $p_header['mtime'] = filemtime($p_filename);
-    $p_header['crc'] = 0;
-    $p_header['compressed_size'] = 0;
-    $p_header['size'] = filesize($p_filename);
-    $p_header['filename_len'] = strlen($p_filename);
-    $p_header['extra_len'] = 0;
-    $p_header['comment_len'] = 0;
-    $p_header['disk'] = 0;
-    $p_header['internal'] = 0;
-    $p_header['external'] = (is_file($p_filename)?0xFE49FFE0:0x41FF0010);
-    $p_header['offset'] = 0;
-    $p_header['filename'] = $p_filename;
-    $p_header['stored_filename'] = $v_stored_filename;
-    $p_header['extra'] = '';
-    $p_header['comment'] = '';
-    $p_header['status'] = 'ok';
-    $p_header['index'] = -1;
-
-    // ----- Look for pre-add callback
-    if (   (isset($p_params[ARCHIVE_ZIP_PARAM_PRE_ADD]))
-	    && ($p_params[ARCHIVE_ZIP_PARAM_PRE_ADD] != '')) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->_convertHeader2FileInfo($p_header, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      eval('$v_result = '.$p_params[ARCHIVE_ZIP_PARAM_PRE_ADD].'(ARCHIVE_ZIP_PARAM_PRE_ADD, $v_local_header);');
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_header['status'] = "skipped";
-        $v_result = 1;
-      }
-
-      // ----- Update the informations
-      // Only some fields can be modified
-      if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
-        $p_header['stored_filename'] = $this->_tool_PathReduction($v_local_header['stored_filename']);
-      }
-    }
-
-    // ----- Look for empty stored filename
-    if ($p_header['stored_filename'] == "") {
-      $p_header['status'] = "filtered";
-    }
-
-    // ----- Check the path length
-    if (strlen($p_header['stored_filename']) > 0xFF) {
-      $p_header['status'] = 'filename_too_long';
-    }
-
-    // ----- Look if no error, or file not skipped
-    if ($p_header['status'] == 'ok') {
-
-      // ----- Look for a file
-      if (is_file($p_filename))
-      {
-        // ----- Open the source file
-        if (($v_file = @fopen($p_filename, "rb")) == 0) {
-          $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, "Unable to open file '$p_filename' in binary read mode");
-          return Archive_Zip::errorCode();
-        }
-        
-        if ($p_params['no_compression']) {
-          // ----- Read the file content
-          $v_content_compressed = @fread($v_file, $p_header['size']);
-
-          // ----- Calculate the CRC
-          $p_header['crc'] = crc32($v_content_compressed);
-        }
-        else {
-          // ----- Read the file content
-          $v_content = @fread($v_file, $p_header['size']);
-
-          // ----- Calculate the CRC
-          $p_header['crc'] = crc32($v_content);
-
-          // ----- Compress the file
-          $v_content_compressed = gzdeflate($v_content);
-        }
-
-        // ----- Set header parameters
-        $p_header['compressed_size'] = strlen($v_content_compressed);
-        $p_header['compression'] = 8;
-
-        // ----- Call the header generation
-        if (($v_result = $this->_writeFileHeader($p_header)) != 1) {
-          @fclose($v_file);
-          return $v_result;
-        }
-
-        // ----- Write the compressed content
-        $v_binary_data = pack('a'.$p_header['compressed_size'], $v_content_compressed);
-        @fwrite($this->_zip_fd, $v_binary_data, $p_header['compressed_size']);
-
-        // ----- Close the file
-        @fclose($v_file);
-      }
-
-      // ----- Look for a directory
-      else
-      {
-        // ----- Set the file properties
-        $p_header['filename'] .= '/';
-        $p_header['filename_len']++;
-        $p_header['size'] = 0;
-        $p_header['external'] = 0x41FF0010;   // Value for a folder : to be checked
-
-        // ----- Call the header generation
-        if (($v_result = $this->_writeFileHeader($p_header)) != 1)
-        {
-          return $v_result;
-        }
-      }
-    }
-
-    // ----- Look for pre-add callback
-    if (   (isset($p_params[ARCHIVE_ZIP_PARAM_POST_ADD]))
-	    && ($p_params[ARCHIVE_ZIP_PARAM_POST_ADD] != '')) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->_convertHeader2FileInfo($p_header, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      eval('$v_result = '.$p_params[ARCHIVE_ZIP_PARAM_POST_ADD].'(ARCHIVE_ZIP_PARAM_POST_ADD, $v_local_header);');
-      if ($v_result == 0) {
-        // ----- Ignored
-        $v_result = 1;
-      }
-
-      // ----- Update the informations
-      // Nothing can be modified
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _writeFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_writeFileHeader()
-  *
-  * { Description }
-  *
-  */
-  function _writeFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // TBC
-    //for(reset($p_header); $key = key($p_header); next($p_header)) {
-    //}
-
-    // ----- Store the offset position of the file
-    $p_header['offset'] = ftell($this->_zip_fd);
-
-    // ----- Transform UNIX mtime to DOS format mdate/mtime
-    $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvvVVVvv", 0x04034b50, $p_header['version'], $p_header['flag'],
-                          $p_header['compression'], $v_mtime, $v_mdate,
-                          $p_header['crc'], $p_header['compressed_size'], $p_header['size'],
-                          strlen($p_header['stored_filename']), $p_header['extra_len']);
-
-    // ----- Write the first 148 bytes of the header in the archive
-    fputs($this->_zip_fd, $v_binary_data, 30);
-
-    // ----- Write the variable fields
-    if (strlen($p_header['stored_filename']) != 0)
-    {
-      fputs($this->_zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
-    }
-    if ($p_header['extra_len'] != 0)
-    {
-      fputs($this->_zip_fd, $p_header['extra'], $p_header['extra_len']);
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _writeCentralFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_writeCentralFileHeader()
-  *
-  * { Description }
-  *
-  */
-  function _writeCentralFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // TBC
-    //for(reset($p_header); $key = key($p_header); next($p_header)) {
-    //}
-
-    // ----- Transform UNIX mtime to DOS format mdate/mtime
-    $v_date = getdate($p_header['mtime']);
-    $v_mtime = ($v_date['hours']<<11) + ($v_date['minutes']<<5) + $v_date['seconds']/2;
-    $v_mdate = (($v_date['year']-1980)<<9) + ($v_date['mon']<<5) + $v_date['mday'];
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvvvVVVvvvvvVV", 0x02014b50, $p_header['version'], $p_header['version_extracted'],
-                          $p_header['flag'], $p_header['compression'], $v_mtime, $v_mdate, $p_header['crc'],
-                          $p_header['compressed_size'], $p_header['size'],
-                          strlen($p_header['stored_filename']), $p_header['extra_len'], $p_header['comment_len'],
-                          $p_header['disk'], $p_header['internal'], $p_header['external'], $p_header['offset']);
-
-    // ----- Write the 42 bytes of the header in the zip file
-    fputs($this->_zip_fd, $v_binary_data, 46);
-
-    // ----- Write the variable fields
-    if (strlen($p_header['stored_filename']) != 0)
-    {
-      fputs($this->_zip_fd, $p_header['stored_filename'], strlen($p_header['stored_filename']));
-    }
-    if ($p_header['extra_len'] != 0)
-    {
-      fputs($this->_zip_fd, $p_header['extra'], $p_header['extra_len']);
-    }
-    if ($p_header['comment_len'] != 0)
-    {
-      fputs($this->_zip_fd, $p_header['comment'], $p_header['comment_len']);
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _writeCentralHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_writeCentralHeader()
-  *
-  * { Description }
-  *
-  */
-  function _writeCentralHeader($p_nb_entries, $p_size, $p_offset, $p_comment)
-  {
-    $v_result=1;
-
-    // ----- Packed data
-    $v_binary_data = pack("VvvvvVVv", 0x06054b50, 0, 0, $p_nb_entries, $p_nb_entries, $p_size, $p_offset, strlen($p_comment));
-
-    // ----- Write the 22 bytes of the header in the zip file
-    fputs($this->_zip_fd, $v_binary_data, 22);
-
-    // ----- Write the variable fields
-    if (strlen($p_comment) != 0)
-    {
-      fputs($this->_zip_fd, $p_comment, strlen($p_comment));
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _list()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_list()
-  *
-  * { Description }
-  *
-  */
-  function _list(&$p_list)
-  {
-    $v_result=1;
-
-    // ----- Open the zip file
-    if (($this->_zip_fd = @fopen($this->_zipname, 'rb')) == 0)
-    {
-      // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->_zipname.'\' in binary read mode');
-
-      // ----- Return
-      return Archive_Zip::errorCode();
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1)
-    {
-      return $v_result;
-    }
-
-    // ----- Go to beginning of Central Dir
-    @rewind($this->_zip_fd);
-    if (@fseek($this->_zip_fd, $v_central_dir['offset']))
-    {
-      // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-      // ----- Return
-      return Archive_Zip::errorCode();
-    }
-
-    // ----- Read each entry
-    for ($i=0; $i<$v_central_dir['entries']; $i++)
-    {
-      // ----- Read the file header
-      if (($v_result = $this->_readCentralFileHeader($v_header)) != 1)
-      {
-        return $v_result;
-      }
-      $v_header['index'] = $i;
-
-      // ----- Get the only interesting attributes
-      $this->_convertHeader2FileInfo($v_header, $p_list[$i]);
-      unset($v_header);
-    }
-
-    // ----- Close the zip file
-    $this->_closeFd();
-
-    // ----- Return
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _convertHeader2FileInfo()
-  // Description :
-  //   This function takes the file informations from the central directory
-  //   entries and extract the interesting parameters that will be given back.
-  //   The resulting file infos are set in the array $p_info
-  //     $p_info['filename'] : Filename with full path. Given by user (add),
-  //                           extracted in the filesystem (extract).
-  //     $p_info['stored_filename'] : Stored filename in the archive.
-  //     $p_info['size'] = Size of the file.
-  //     $p_info['compressed_size'] = Compressed size of the file.
-  //     $p_info['mtime'] = Last modification date of the file.
-  //     $p_info['comment'] = Comment associated with the file.
-  //     $p_info['folder'] = true/false : indicates if the entry is a folder or not.
-  //     $p_info['status'] = status of the action on the file.
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_convertHeader2FileInfo()
-  *
-  * { Description }
-  *
-  */
-  function _convertHeader2FileInfo($p_header, &$p_info)
-  {
-    $v_result=1;
-
-    // ----- Get the interesting attributes
-    $p_info['filename'] = $p_header['filename'];
-    $p_info['stored_filename'] = $p_header['stored_filename'];
-    $p_info['size'] = $p_header['size'];
-    $p_info['compressed_size'] = $p_header['compressed_size'];
-    $p_info['mtime'] = $p_header['mtime'];
-    $p_info['comment'] = $p_header['comment'];
-    $p_info['folder'] = (($p_header['external']&0x00000010)==0x00000010);
-    $p_info['index'] = $p_header['index'];
-    $p_info['status'] = $p_header['status'];
-
-    // ----- Return
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _extractByRule()
-  // Description :
-  //   Extract a file or directory depending of rules (by index, by name, ...)
-  // Parameters :
-  //   $p_file_list : An array where will be placed the properties of each
-  //                  extracted file
-  //   $p_path : Path to add while writing the extracted files
-  //   $p_remove_path : Path to remove (from the file memorized path) while writing the
-  //                    extracted files. If the path does not match the file path,
-  //                    the file is extracted with its memorized path.
-  //                    $p_remove_path does not apply to 'list' mode.
-  //                    $p_path and $p_remove_path are commulative.
-  // Return Values :
-  //   1 on success,0 or less on error (see error code list)
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_extractByRule()
-  *
-  * { Description }
-  *
-  */
-  function _extractByRule(&$p_file_list, &$p_params)
-  {
-    $v_result=1;
-
-	$p_path = $p_params['add_path'];
-	$p_remove_path = $p_params['remove_path'];
-	$p_remove_all_path = $p_params['remove_all_path'];
-
-    // ----- Check the path
-    if (($p_path == "")
-	    || ((substr($p_path, 0, 1) != "/")
-	    && (substr($p_path, 0, 3) != "../") && (substr($p_path,1,2)!=":/")))
-      $p_path = "./".$p_path;
-
-    // ----- Reduce the path last (and duplicated) '/'
-    if (($p_path != "./") && ($p_path != "/")) {
-      // ----- Look for the path end '/'
-      while (substr($p_path, -1) == "/") {
-        $p_path = substr($p_path, 0, strlen($p_path)-1);
-      }
-    }
-
-    // ----- Look for path to remove format (should end by /)
-    if (($p_remove_path != "") && (substr($p_remove_path, -1) != '/')) {
-      $p_remove_path .= '/';
-    }
-    $p_remove_path_size = strlen($p_remove_path);
-
-    // ----- Open the zip file
-    if (($v_result = $this->_openFd('rb')) != 1)
-    {
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1)
-    {
-      // ----- Close the zip file
-      $this->_closeFd();
-
-      return $v_result;
-    }
-
-    // ----- Start at beginning of Central Dir
-    $v_pos_entry = $v_central_dir['offset'];
-
-    // ----- Read each entry
-    $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++) {
-      // ----- Read next Central dir entry
-      @rewind($this->_zip_fd);
-      if (@fseek($this->_zip_fd, $v_pos_entry)) {
-        $this->_closeFd();
-
-        $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP,
-		                 'Invalid archive size');
-
-        return Archive_Zip::errorCode();
-      }
-
-      // ----- Read the file header
-      $v_header = array();
-      if (($v_result = $this->_readCentralFileHeader($v_header)) != 1) {
-        $this->_closeFd();
-
-        return $v_result;
-      }
-
-      // ----- Store the index
-      $v_header['index'] = $i;
-
-      // ----- Store the file position
-      $v_pos_entry = ftell($this->_zip_fd);
-
-      // ----- Look for the specific extract rules
-      $v_extract = false;
-
-      // ----- Look for extract by name rule
-      if (   (isset($p_params[ARCHIVE_ZIP_PARAM_BY_NAME]))
-          && ($p_params[ARCHIVE_ZIP_PARAM_BY_NAME] != 0)) {
-
-          // ----- Look if the filename is in the list
-          for ($j=0;
-		          ($j<sizeof($p_params[ARCHIVE_ZIP_PARAM_BY_NAME]))
-			   && (!$v_extract);
-			   $j++) {
-
-              // ----- Look for a directory
-              if (substr($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j], -1) == "/") {
-
-                  // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header['stored_filename']) > strlen($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j]))
-                      && (substr($v_header['stored_filename'], 0, strlen($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) == $p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) {
-                      $v_extract = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header['stored_filename'] == $p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j]) {
-                  $v_extract = true;
-              }
-          }
-      }
-
-      // ----- Look for extract by ereg rule
-      else if (   (isset($p_params[ARCHIVE_ZIP_PARAM_BY_EREG]))
-               && ($p_params[ARCHIVE_ZIP_PARAM_BY_EREG] != "")) {
-
-          if (ereg($p_params[ARCHIVE_ZIP_PARAM_BY_EREG], $v_header['stored_filename'])) {
-              $v_extract = true;
-          }
-      }
-
-      // ----- Look for extract by preg rule
-      else if (   (isset($p_params[ARCHIVE_ZIP_PARAM_BY_PREG]))
-               && ($p_params[ARCHIVE_ZIP_PARAM_BY_PREG] != "")) {
-
-          if (preg_match($p_params[ARCHIVE_ZIP_PARAM_BY_PREG], $v_header['stored_filename'])) {
-              $v_extract = true;
-          }
-      }
-
-      // ----- Look for extract by index rule
-      else if (   (isset($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX]))
-               && ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX] != 0)) {
-
-          // ----- Look if the index is in the list
-          for ($j=$j_start; ($j<sizeof($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX])) && (!$v_extract); $j++) {
-
-              if (($i>=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start']) && ($i<=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end'])) {
-                  $v_extract = true;
-              }
-              if ($i>=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
-              }
-
-              if ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start']>$i) {
-                  break;
-              }
-          }
-      }
-
-      // ----- Look for no rule, which means extract all the archive
-      else {
-          $v_extract = true;
-      }
-
-
-      // ----- Look for real extraction
-      if ($v_extract)
-      {
-
-        // ----- Go to the file position
-        @rewind($this->_zip_fd);
-        if (@fseek($this->_zip_fd, $v_header['offset']))
-        {
-          // ----- Close the zip file
-          $this->_closeFd();
-
-          // ----- Error log
-          $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP, 'Invalid archive size');
-
-          // ----- Return
-          return Archive_Zip::errorCode();
-        }
-
-        // ----- Look for extraction as string
-        if ($p_params[ARCHIVE_ZIP_PARAM_EXTRACT_AS_STRING]) {
-
-          // ----- Extracting the file
-          if (($v_result = $this->_extractFileAsString($v_header, $v_string)) != 1)
-          {
-            // ----- Close the zip file
-            $this->_closeFd();
-
-            return $v_result;
-          }
-
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->_convertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted])) != 1)
-          {
-            // ----- Close the zip file
-            $this->_closeFd();
-
-            return $v_result;
-          }
-
-          // ----- Set the file content
-          $p_file_list[$v_nb_extracted]['content'] = $v_string;
-
-          // ----- Next extracted file
-          $v_nb_extracted++;
-        }
-        else {
-          // ----- Extracting the file
-          if (($v_result = $this->_extractFile($v_header, $p_path, $p_remove_path, $p_remove_all_path, $p_params)) != 1)
-          {
-            // ----- Close the zip file
-            $this->_closeFd();
-
-            return $v_result;
-          }
-
-          // ----- Get the only interesting attributes
-          if (($v_result = $this->_convertHeader2FileInfo($v_header, $p_file_list[$v_nb_extracted++])) != 1)
-          {
-            // ----- Close the zip file
-            $this->_closeFd();
-
-            return $v_result;
-          }
-        }
-      }
-    }
-
-    // ----- Close the zip file
-    $this->_closeFd();
-
-    // ----- Return
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _extractFile()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_extractFile()
-  *
-  * { Description }
-  *
-  */
-  function _extractFile(&$p_entry, $p_path, $p_remove_path, $p_remove_all_path, &$p_params)
-  {
-    $v_result=1;
-
-    // ----- Read the file header
-    if (($v_result = $this->_readFileHeader($v_header)) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-
-    // ----- Check that the file header is coherent with $p_entry info
-    // TBC
-
-    // ----- Look for all path to remove
-    if ($p_remove_all_path == true) {
-        // ----- Get the basename of the path
-        $p_entry['filename'] = basename($p_entry['filename']);
-    }
-
-    // ----- Look for path to remove
-    else if ($p_remove_path != "")
-    {
-      //if (strcmp($p_remove_path, $p_entry['filename'])==0)
-      if ($this->_tool_PathInclusion($p_remove_path, $p_entry['filename']) == 2)
-      {
-
-        // ----- Change the file status
-        $p_entry['status'] = "filtered";
-
-        // ----- Return
-        return $v_result;
-      }
-
-      $p_remove_path_size = strlen($p_remove_path);
-      if (substr($p_entry['filename'], 0, $p_remove_path_size) == $p_remove_path)
-      {
-
-        // ----- Remove the path
-        $p_entry['filename'] = substr($p_entry['filename'], $p_remove_path_size);
-
-      }
-    }
-
-    // ----- Add the path
-    if ($p_path != '')
-    {
-      $p_entry['filename'] = $p_path."/".$p_entry['filename'];
-    }
-
-    // ----- Look for pre-extract callback
-    if (   (isset($p_params[ARCHIVE_ZIP_PARAM_PRE_EXTRACT]))
-	    && ($p_params[ARCHIVE_ZIP_PARAM_PRE_EXTRACT] != '')) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->_convertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      eval('$v_result = '.$p_params[ARCHIVE_ZIP_PARAM_PRE_EXTRACT].'(ARCHIVE_ZIP_PARAM_PRE_EXTRACT, $v_local_header);');
-      if ($v_result == 0) {
-        // ----- Change the file status
-        $p_entry['status'] = "skipped";
-        $v_result = 1;
-      }
-
-      // ----- Update the informations
-      // Only some fields can be modified
-      $p_entry['filename'] = $v_local_header['filename'];
-    }
-
-    // ----- Trace
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-    // ----- Look for specific actions while the file exist
-    if (file_exists($p_entry['filename']))
-    {
-
-      // ----- Look if file is a directory
-      if (is_dir($p_entry['filename']))
-      {
-
-        // ----- Change the file status
-        $p_entry['status'] = "already_a_directory";
-
-        // ----- Return
-        //return $v_result;
-      }
-      // ----- Look if file is write protected
-      else if (!is_writeable($p_entry['filename']))
-      {
-
-        // ----- Change the file status
-        $p_entry['status'] = "write_protected";
-
-        // ----- Return
-        //return $v_result;
-      }
-
-      // ----- Look if the extracted file is older
-      else if (filemtime($p_entry['filename']) > $p_entry['mtime'])
-      {
-
-        // ----- Change the file status
-        $p_entry['status'] = "newer_exist";
-
-        // ----- Return
-        //return $v_result;
-      }
-    }
-
-    // ----- Check the directory availability and create it if necessary
-    else {
-      if ((($p_entry['external']&0x00000010)==0x00000010) || (substr($p_entry['filename'], -1) == '/'))
-        $v_dir_to_check = $p_entry['filename'];
-      else if (!strstr($p_entry['filename'], "/"))
-        $v_dir_to_check = "";
-      else
-        $v_dir_to_check = dirname($p_entry['filename']);
-
-      if (($v_result = $this->_dirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
-
-        // ----- Change the file status
-        $p_entry['status'] = "path_creation_fail";
-
-        // ----- Return
-        //return $v_result;
-        $v_result = 1;
-      }
-    }
-    }
-
-    // ----- Look if extraction should be done
-    if ($p_entry['status'] == 'ok') {
-
-      // ----- Do the extraction (if not a folder)
-      if (!(($p_entry['external']&0x00000010)==0x00000010))
-      {
-
-        // ----- Look for not compressed file
-        if ($p_entry['compressed_size'] == $p_entry['size'])
-        {
-
-          // ----- Opening destination file
-          if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0)
-          {
-
-            // ----- Change the file status
-            $p_entry['status'] = "write_error";
-
-            // ----- Return
-            return $v_result;
-          }
-
-
-          // ----- Read the file by ARCHIVE_ZIP_READ_BLOCK_SIZE octets blocks
-          $v_size = $p_entry['compressed_size'];
-          while ($v_size != 0)
-          {
-            $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE ? $v_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
-            $v_buffer = fread($this->_zip_fd, $v_read_size);
-            $v_binary_data = pack('a'.$v_read_size, $v_buffer);
-            @fwrite($v_dest_file, $v_binary_data, $v_read_size);
-            $v_size -= $v_read_size;
-          }
-
-          // ----- Closing the destination file
-          fclose($v_dest_file);
-
-          // ----- Change the file mtime
-          touch($p_entry['filename'], $p_entry['mtime']);
-        }
-        else
-        {
-          // ----- Trace
-
-          // ----- Opening destination file
-          if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
-
-            // ----- Change the file status
-            $p_entry['status'] = "write_error";
-
-            return $v_result;
-          }
-
-
-          // ----- Read the compressed file in a buffer (one shot)
-          $v_buffer = @fread($this->_zip_fd, $p_entry['compressed_size']);
-
-          // ----- Decompress the file
-          $v_file_content = gzinflate($v_buffer);
-          unset($v_buffer);
-
-          // ----- Write the uncompressed data
-          @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
-          unset($v_file_content);
-
-          // ----- Closing the destination file
-          @fclose($v_dest_file);
-
-          // ----- Change the file mtime
-          touch($p_entry['filename'], $p_entry['mtime']);
-        }
-
-        // ----- Look for chmod option
-        if (   (isset($p_params[ARCHIVE_ZIP_PARAM_SET_CHMOD]))
-		    && ($p_params[ARCHIVE_ZIP_PARAM_SET_CHMOD] != 0)) {
-
-          // ----- Change the mode of the file
-          chmod($p_entry['filename'], $p_params[ARCHIVE_ZIP_PARAM_SET_CHMOD]);
-        }
-
-      }
-    }
-
-    // ----- Look for post-extract callback
-    if (   (isset($p_params[ARCHIVE_ZIP_PARAM_POST_EXTRACT]))
-	    && ($p_params[ARCHIVE_ZIP_PARAM_POST_EXTRACT] != '')) {
-
-      // ----- Generate a local information
-      $v_local_header = array();
-      $this->_convertHeader2FileInfo($p_entry, $v_local_header);
-
-      // ----- Call the callback
-      // Here I do not use call_user_func() because I need to send a reference to the
-      // header.
-      eval('$v_result = '.$p_params[ARCHIVE_ZIP_PARAM_POST_EXTRACT].'(ARCHIVE_ZIP_PARAM_POST_EXTRACT, $v_local_header);');
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _extractFileAsString()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_extractFileAsString()
-  *
-  * { Description }
-  *
-  */
-  function _extractFileAsString(&$p_entry, &$p_string)
-  {
-    $v_result=1;
-
-    // ----- Read the file header
-    $v_header = array();
-    if (($v_result = $this->_readFileHeader($v_header)) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-
-    // ----- Check that the file header is coherent with $p_entry info
-    // TBC
-
-    // ----- Trace
-
-    // ----- Do the extraction (if not a folder)
-    if (!(($p_entry['external']&0x00000010)==0x00000010))
-    {
-      // ----- Look for not compressed file
-      if ($p_entry['compressed_size'] == $p_entry['size'])
-      {
-        // ----- Trace
-
-        // ----- Reading the file
-        $p_string = fread($this->_zip_fd, $p_entry['compressed_size']);
-      }
-      else
-      {
-        // ----- Trace
-
-        // ----- Reading the file
-        $v_data = fread($this->_zip_fd, $p_entry['compressed_size']);
-
-        // ----- Decompress the file
-        $p_string = gzinflate($v_data);
-      }
-
-      // ----- Trace
-    }
-    else {
-        // TBC : error : can not extract a folder in a string
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _readFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_readFileHeader()
-  *
-  * { Description }
-  *
-  */
-  function _readFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // ----- Read the 4 bytes signature
-    $v_binary_data = @fread($this->_zip_fd, 4);
-    $v_data = unpack('Vid', $v_binary_data);
-
-    // ----- Check signature
-    if ($v_data['id'] != 0x04034b50)
-    {
-
-      // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
-
-      // ----- Return
-      return Archive_Zip::errorCode();
-    }
-
-    // ----- Read the first 42 bytes of the header
-    $v_binary_data = fread($this->_zip_fd, 26);
-
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 26)
-    {
-      $p_header['filename'] = "";
-      $p_header['status'] = "invalid_header";
-
-      // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
-
-      // ----- Return
-      return Archive_Zip::errorCode();
-    }
-
-    // ----- Extract the values
-    $v_data = unpack('vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $v_binary_data);
-
-    // ----- Get filename
-    $p_header['filename'] = fread($this->_zip_fd, $v_data['filename_len']);
-
-    // ----- Get extra_fields
-    if ($v_data['extra_len'] != 0) {
-      $p_header['extra'] = fread($this->_zip_fd, $v_data['extra_len']);
-    }
-    else {
-      $p_header['extra'] = '';
-    }
-
-    // ----- Extract properties
-    $p_header['compression'] = $v_data['compression'];
-    $p_header['size'] = $v_data['size'];
-    $p_header['compressed_size'] = $v_data['compressed_size'];
-    $p_header['crc'] = $v_data['crc'];
-    $p_header['flag'] = $v_data['flag'];
-
-    // ----- Recuperate date in UNIX format
-    $p_header['mdate'] = $v_data['mdate'];
-    $p_header['mtime'] = $v_data['mtime'];
-    if ($p_header['mdate'] && $p_header['mtime'])
-    {
-      // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
-
-      // ----- Extract date
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-      $v_day = $p_header['mdate'] & 0x001F;
-
-      // ----- Get UNIX date format
-      $p_header['mtime'] = mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
-
-    }
-    else
-    {
-      $p_header['mtime'] = time();
-    }
-
-    // ----- Other informations
-
-    // TBC
-    //for(reset($v_data); $key = key($v_data); next($v_data)) {
-    //}
-
-    // ----- Set the stored filename
-    $p_header['stored_filename'] = $p_header['filename'];
-
-    // ----- Set the status field
-    $p_header['status'] = "ok";
-
-    // ----- Return
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _readCentralFileHeader()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_readCentralFileHeader()
-  *
-  * { Description }
-  *
-  */
-  function _readCentralFileHeader(&$p_header)
-  {
-    $v_result=1;
-
-    // ----- Read the 4 bytes signature
-    $v_binary_data = @fread($this->_zip_fd, 4);
-    $v_data = unpack('Vid', $v_binary_data);
-
-    // ----- Check signature
-    if ($v_data['id'] != 0x02014b50)
-    {
-
-      // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, 'Invalid archive structure');
-
-      // ----- Return
-      return Archive_Zip::errorCode();
-    }
-
-    // ----- Read the first 42 bytes of the header
-    $v_binary_data = fread($this->_zip_fd, 42);
-
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 42)
-    {
-      $p_header['filename'] = "";
-      $p_header['status'] = "invalid_header";
-
-      // ----- Error log
-      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT, "Invalid block size : ".strlen($v_binary_data));
-
-      // ----- Return
-      return Archive_Zip::errorCode();
-    }
-
-    // ----- Extract the values
-    $p_header = unpack('vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $v_binary_data);
-
-    // ----- Get filename
-    if ($p_header['filename_len'] != 0)
-      $p_header['filename'] = fread($this->_zip_fd, $p_header['filename_len']);
-    else
-      $p_header['filename'] = '';
-
-    // ----- Get extra
-    if ($p_header['extra_len'] != 0)
-      $p_header['extra'] = fread($this->_zip_fd, $p_header['extra_len']);
-    else
-      $p_header['extra'] = '';
-
-    // ----- Get comment
-    if ($p_header['comment_len'] != 0)
-      $p_header['comment'] = fread($this->_zip_fd, $p_header['comment_len']);
-    else
-      $p_header['comment'] = '';
-
-    // ----- Extract properties
-
-    // ----- Recuperate date in UNIX format
-    if ($p_header['mdate'] && $p_header['mtime'])
-    {
-      // ----- Extract time
-      $v_hour = ($p_header['mtime'] & 0xF800) >> 11;
-      $v_minute = ($p_header['mtime'] & 0x07E0) >> 5;
-      $v_seconde = ($p_header['mtime'] & 0x001F)*2;
-
-      // ----- Extract date
-      $v_year = (($p_header['mdate'] & 0xFE00) >> 9) + 1980;
-      $v_month = ($p_header['mdate'] & 0x01E0) >> 5;
-      $v_day = $p_header['mdate'] & 0x001F;
-
-      // ----- Get UNIX date format
-      $p_header['mtime'] = mktime($v_hour, $v_minute, $v_seconde, $v_month, $v_day, $v_year);
-
-    }
-    else
-    {
-      $p_header['mtime'] = time();
-    }
-
-    // ----- Set the stored filename
-    $p_header['stored_filename'] = $p_header['filename'];
-
-    // ----- Set default status to ok
-    $p_header['status'] = 'ok';
-
-    // ----- Look if it is a directory
-    if (substr($p_header['filename'], -1) == '/')
-    {
-      $p_header['external'] = 0x41FF0010;
-    }
-
-
-    // ----- Return
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _readEndCentralDir()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_readEndCentralDir()
-  *
-  * { Description }
-  *
-  */
-  function _readEndCentralDir(&$p_central_dir)
-  {
-    $v_result=1;
-
-    // ----- Go to the end of the zip file
-    $v_size = filesize($this->_zipname);
-    @fseek($this->_zip_fd, $v_size);
-    if (@ftell($this->_zip_fd) != $v_size) {
-      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT,
-	                   'Unable to go to the end of the archive \''
-					   .$this->_zipname.'\'');
-      return Archive_Zip::errorCode();
-    }
-
-    // ----- First try : look if this is an archive with no commentaries
-	// (most of the time)
-    // in this case the end of central dir is at 22 bytes of the file end
-    $v_found = 0;
-    if ($v_size > 26) {
-      @fseek($this->_zip_fd, $v_size-22);
-      if (($v_pos = @ftell($this->_zip_fd)) != ($v_size-22)) {
-        $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT,
-		                 'Unable to seek back to the middle of the archive \''
-						 .$this->_zipname.'\'');
-        return Archive_Zip::errorCode();
-      }
-
-      // ----- Read for bytes
-      $v_binary_data = @fread($this->_zip_fd, 4);
-      $v_data = unpack('Vid', $v_binary_data);
-
-      // ----- Check signature
-      if ($v_data['id'] == 0x06054b50) {
-        $v_found = 1;
-      }
-
-      $v_pos = ftell($this->_zip_fd);
-    }
-
-    // ----- Go back to the maximum possible size of the Central Dir End Record
-    if (!$v_found) {
-      $v_maximum_size = 65557; // 0xFFFF + 22;
-      if ($v_maximum_size > $v_size)
-        $v_maximum_size = $v_size;
-      @fseek($this->_zip_fd, $v_size-$v_maximum_size);
-      if (@ftell($this->_zip_fd) != ($v_size-$v_maximum_size)) {
-        $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT,
-		                 'Unable to seek back to the middle of the archive \''
-						 .$this->_zipname.'\'');
-        return Archive_Zip::errorCode();
-      }
-
-      // ----- Read byte per byte in order to find the signature
-      $v_pos = ftell($this->_zip_fd);
-      $v_bytes = 0x00000000;
-      while ($v_pos < $v_size) {
-        // ----- Read a byte
-        $v_byte = @fread($this->_zip_fd, 1);
-
-        // -----  Add the byte
-        $v_bytes = ($v_bytes << 8) | Ord($v_byte);
-
-        // ----- Compare the bytes
-        if ($v_bytes == 0x504b0506) {
-          $v_pos++;
-          break;
-        }
-
-        $v_pos++;
-      }
-
-      // ----- Look if not found end of central dir
-      if ($v_pos == $v_size) {
-        $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT,
-		                 "Unable to find End of Central Dir Record signature");
-        return Archive_Zip::errorCode();
-      }
-    }
-
-    // ----- Read the first 18 bytes of the header
-    $v_binary_data = fread($this->_zip_fd, 18);
-
-    // ----- Look for invalid block size
-    if (strlen($v_binary_data) != 18) {
-      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT,
-	                   "Invalid End of Central Dir Record size : "
-					   .strlen($v_binary_data));
-      return Archive_Zip::errorCode();
-    }
-
-    // ----- Extract the values
-    $v_data = unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', $v_binary_data);
-
-    // ----- Check the global size
-    if (($v_pos + $v_data['comment_size'] + 18) != $v_size) {
-      $this->_errorLog(ARCHIVE_ZIP_ERR_BAD_FORMAT,
-	                   "Fail to find the right signature");
-      return Archive_Zip::errorCode();
-    }
-
-    // ----- Get comment
-    if ($v_data['comment_size'] != 0)
-      $p_central_dir['comment'] = fread($this->_zip_fd, $v_data['comment_size']);
-    else
-      $p_central_dir['comment'] = '';
-
-    $p_central_dir['entries'] = $v_data['entries'];
-    $p_central_dir['disk_entries'] = $v_data['disk_entries'];
-    $p_central_dir['offset'] = $v_data['offset'];
-    $p_central_dir['size'] = $v_data['size'];
-    $p_central_dir['disk'] = $v_data['disk'];
-    $p_central_dir['disk_start'] = $v_data['disk_start'];
-
-    // ----- Return
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _deleteByRule()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_deleteByRule()
-  *
-  * { Description }
-  *
-  */
-  function _deleteByRule(&$p_result_list, &$p_params)
-  {
-    $v_result=1;
-    $v_list_detail = array();
-
-    // ----- Open the zip file
-    if (($v_result=$this->_openFd('rb')) != 1)
-    {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1)
-    {
-      $this->_closeFd();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($this->_zip_fd);
-
-    // ----- Scan all the files
-    // ----- Start at beginning of Central Dir
-    $v_pos_entry = $v_central_dir['offset'];
-    @rewind($this->_zip_fd);
-    if (@fseek($this->_zip_fd, $v_pos_entry)) {
-      // ----- Clean
-      $this->_closeFd();
-
-      $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP,
-	                   'Invalid archive size');
-      return Archive_Zip::errorCode();
-    }
-
-    // ----- Read each entry
-    $v_header_list = array();
-    $j_start = 0;
-    for ($i=0, $v_nb_extracted=0; $i<$v_central_dir['entries']; $i++) {
-
-      // ----- Read the file header
-      $v_header_list[$v_nb_extracted] = array();
-      $v_result
-	    = $this->_readCentralFileHeader($v_header_list[$v_nb_extracted]);
-      if ($v_result != 1) {
-        // ----- Clean
-        $this->_closeFd();
-
-        return $v_result;
-      }
-
-      // ----- Store the index
-      $v_header_list[$v_nb_extracted]['index'] = $i;
-
-      // ----- Look for the specific extract rules
-      $v_found = false;
-
-      // ----- Look for extract by name rule
-      if (   (isset($p_params[ARCHIVE_ZIP_PARAM_BY_NAME]))
-          && ($p_params[ARCHIVE_ZIP_PARAM_BY_NAME] != 0)) {
-
-          // ----- Look if the filename is in the list
-          for ($j=0;
-		       ($j<sizeof($p_params[ARCHIVE_ZIP_PARAM_BY_NAME]))
-			     && (!$v_found);
-			   $j++) {
-
-              // ----- Look for a directory
-              if (substr($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j], -1) == "/") {
-
-                  // ----- Look if the directory is in the filename path
-                  if (   (strlen($v_header_list[$v_nb_extracted]['stored_filename']) > strlen($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j]))
-                      && (substr($v_header_list[$v_nb_extracted]['stored_filename'], 0, strlen($p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) == $p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) {
-                      $v_found = true;
-                  }
-                  elseif (   (($v_header_list[$v_nb_extracted]['external']&0x00000010)==0x00000010) /* Indicates a folder */
-                          && ($v_header_list[$v_nb_extracted]['stored_filename'].'/' == $p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j])) {
-                      $v_found = true;
-                  }
-              }
-              // ----- Look for a filename
-              elseif ($v_header_list[$v_nb_extracted]['stored_filename']
-			          == $p_params[ARCHIVE_ZIP_PARAM_BY_NAME][$j]) {
-                  $v_found = true;
-              }
-          }
-      }
-
-      // ----- Look for extract by ereg rule
-      else if (   (isset($p_params[ARCHIVE_ZIP_PARAM_BY_EREG]))
-               && ($p_params[ARCHIVE_ZIP_PARAM_BY_EREG] != "")) {
-
-          if (ereg($p_params[ARCHIVE_ZIP_PARAM_BY_EREG],
-		           $v_header_list[$v_nb_extracted]['stored_filename'])) {
-              $v_found = true;
-          }
-      }
-
-      // ----- Look for extract by preg rule
-      else if (   (isset($p_params[ARCHIVE_ZIP_PARAM_BY_PREG]))
-               && ($p_params[ARCHIVE_ZIP_PARAM_BY_PREG] != "")) {
-
-          if (preg_match($p_params[ARCHIVE_ZIP_PARAM_BY_PREG],
-		                 $v_header_list[$v_nb_extracted]['stored_filename'])) {
-              $v_found = true;
-          }
-      }
-
-      // ----- Look for extract by index rule
-      else if (   (isset($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX]))
-               && ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX] != 0)) {
-
-          // ----- Look if the index is in the list
-          for ($j=$j_start;
-		       ($j<sizeof($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX]))
-			     && (!$v_found);
-			   $j++) {
-
-              if (   ($i>=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start'])
-			      && ($i<=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end'])) {
-                  $v_found = true;
-              }
-              if ($i>=$p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['end']) {
-                  $j_start = $j+1;
-              }
-
-              if ($p_params[ARCHIVE_ZIP_PARAM_BY_INDEX][$j]['start']>$i) {
-                  break;
-              }
-          }
-      }
-
-      // ----- Look for deletion
-      if ($v_found) {
-        unset($v_header_list[$v_nb_extracted]);
-      }
-      else {
-        $v_nb_extracted++;
-      }
-    }
-
-    // ----- Look if something need to be deleted
-    if ($v_nb_extracted > 0) {
-
-        // ----- Creates a temporay file
-        $v_zip_temp_name = ARCHIVE_ZIP_TEMPORARY_DIR.uniqid('archive_zip-')
-		                   .'.tmp';
-
-        // ----- Creates a temporary zip archive
-        $v_temp_zip = new Archive_Zip($v_zip_temp_name);
-
-        // ----- Open the temporary zip file in write mode
-        if (($v_result = $v_temp_zip->_openFd('wb')) != 1) {
-            $this->_closeFd();
-
-            // ----- Return
-            return $v_result;
-        }
-
-        // ----- Look which file need to be kept
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
-
-            // ----- Calculate the position of the header
-            @rewind($this->_zip_fd);
-            if (@fseek($this->_zip_fd,  $v_header_list[$i]['offset'])) {
-                // ----- Clean
-                $this->_closeFd();
-                $v_temp_zip->_closeFd();
-                @unlink($v_zip_temp_name);
-
-                $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_ARCHIVE_ZIP,
-				                 'Invalid archive size');
-                return Archive_Zip::errorCode();
-            }
-
-            // ----- Read the file header
-            if (($v_result = $this->_readFileHeader($v_header_list[$i])) != 1) {
-                // ----- Clean
-                $this->_closeFd();
-                $v_temp_zip->_closeFd();
-                @unlink($v_zip_temp_name);
-
-                return $v_result;
-            }
-
-            // ----- Write the file header
-            $v_result = $v_temp_zip->_writeFileHeader($v_header_list[$i]);
-            if ($v_result != 1) {
-                // ----- Clean
-                $this->_closeFd();
-                $v_temp_zip->_closeFd();
-                @unlink($v_zip_temp_name);
-
-                return $v_result;
-            }
-
-            // ----- Read/write the data block
-            $v_result = $this->_tool_CopyBlock($this->_zip_fd,
-			                                   $v_temp_zip->_zip_fd,
-								       $v_header_list[$i]['compressed_size']);
-            if ($v_result != 1) {
-                // ----- Clean
-                $this->_closeFd();
-                $v_temp_zip->_closeFd();
-                @unlink($v_zip_temp_name);
-
-                return $v_result;
-            }
-        }
-
-        // ----- Store the offset of the central dir
-        $v_offset = @ftell($v_temp_zip->_zip_fd);
-
-        // ----- Re-Create the Central Dir files header
-        for ($i=0; $i<sizeof($v_header_list); $i++) {
-            // ----- Create the file header
-            $v_result=$v_temp_zip->_writeCentralFileHeader($v_header_list[$i]);
-            if ($v_result != 1) {
-            	// ----- Clean
-                $v_temp_zip->_closeFd();
-                $this->_closeFd();
-                @unlink($v_zip_temp_name);
-
-                return $v_result;
-            }
-
-            // ----- Transform the header to a 'usable' info
-            $v_temp_zip->_convertHeader2FileInfo($v_header_list[$i],
-			                                     $p_result_list[$i]);
-        }
-
-
-        // ----- Zip file comment
-        $v_comment = '';
-
-        // ----- Calculate the size of the central header
-        $v_size = @ftell($v_temp_zip->_zip_fd)-$v_offset;
-
-        // ----- Create the central dir footer
-        $v_result = $v_temp_zip->_writeCentralHeader(sizeof($v_header_list),
-		                                             $v_size, $v_offset,
-													 $v_comment);
-        if ($v_result != 1) {
-            // ----- Clean
-            unset($v_header_list);
-            $v_temp_zip->_closeFd();
-            $this->_closeFd();
-            @unlink($v_zip_temp_name);
-
-            return $v_result;
-        }
-
-        // ----- Close
-        $v_temp_zip->_closeFd();
-        $this->_closeFd();
-
-        // ----- Delete the zip file
-        // TBC : I should test the result ...
-        @unlink($this->_zipname);
-
-        // ----- Rename the temporary file
-        // TBC : I should test the result ...
-        //@rename($v_zip_temp_name, $this->_zipname);
-        $this->_tool_Rename($v_zip_temp_name, $this->_zipname);
-
-        // ----- Destroy the temporary archive
-        unset($v_temp_zip);
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _dirCheck()
-  // Description :
-  //   Check if a directory exists, if not it creates it and all the parents directory
-  //   which may be useful.
-  // Parameters :
-  //   $p_dir : Directory path to check.
-  // Return Values :
-  //    1 : OK
-  //   -1 : Unable to create directory
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_dirCheck()
-  *
-  * { Description }
-  *
-  * @param [type] $p_is_dir
-  */
-  function _dirCheck($p_dir, $p_is_dir=false)
-  {
-    $v_result = 1;
-
-    // ----- Remove the final '/'
-    if (($p_is_dir) && (substr($p_dir, -1)=='/')) {
-      $p_dir = substr($p_dir, 0, strlen($p_dir)-1);
-    }
-
-    // ----- Check the directory availability
-    if ((is_dir($p_dir)) || ($p_dir == "")) {
-      return 1;
-    }
-
-    // ----- Extract parent directory
-    $p_parent_dir = dirname($p_dir);
-
-    // ----- Just a check
-    if ($p_parent_dir != $p_dir) {
-      // ----- Look for parent directory
-      if ($p_parent_dir != "") {
-        if (($v_result = $this->_dirCheck($p_parent_dir)) != 1) {
-          return $v_result;
-        }
-      }
-    }
-
-    // ----- Create the directory
-    if (!@mkdir($p_dir, 0777)) {
-      $this->_errorLog(ARCHIVE_ZIP_ERR_DIR_CREATE_FAIL,
-	                   "Unable to create directory '$p_dir'");
-      return Archive_Zip::errorCode();
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _merge()
-  // Description :
-  //   If $p_archive_to_add does not exist, the function exit with a success result.
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_merge()
-  *
-  * { Description }
-  *
-  */
-  function _merge(&$p_archive_to_add)
-  {
-    $v_result=1;
-
-    // ----- Look if the archive_to_add exists
-    if (!is_file($p_archive_to_add->_zipname)) {
-      // ----- Nothing to merge, so merge is a success
-      return 1;
-    }
-
-    // ----- Look if the archive exists
-    if (!is_file($this->_zipname)) {
-      // ----- Do a duplicate
-      $v_result = $this->_duplicate($p_archive_to_add->_zipname);
-
-      return $v_result;
-    }
-
-    // ----- Open the zip file
-    if (($v_result=$this->_openFd('rb')) != 1) {
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir = array();
-    if (($v_result = $this->_readEndCentralDir($v_central_dir)) != 1) {
-      $this->_closeFd();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($this->_zip_fd);
-
-    // ----- Open the archive_to_add file
-    if (($v_result=$p_archive_to_add->_openFd('rb')) != 1) {
-      $this->_closeFd();
-      return $v_result;
-    }
-
-    // ----- Read the central directory informations
-    $v_central_dir_to_add = array();
-    $v_result = $p_archive_to_add->_readEndCentralDir($v_central_dir_to_add);
-    if ($v_result != 1) {
-      $this->_closeFd();
-      $p_archive_to_add->_closeFd();
-      return $v_result;
-    }
-
-    // ----- Go to beginning of File
-    @rewind($p_archive_to_add->_zip_fd);
-
-    // ----- Creates a temporay file
-    $v_zip_temp_name = ARCHIVE_ZIP_TEMPORARY_DIR.uniqid('archive_zip-').'.tmp';
-
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($v_zip_temp_name, 'wb')) == 0) {
-      $this->_closeFd();
-      $p_archive_to_add->_closeFd();
-      $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL,
-	                   'Unable to open temporary file \''
-					   .$v_zip_temp_name.'\' in binary write mode');
-      return Archive_Zip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the
-	// central dir
-    $v_size = $v_central_dir['offset'];
-    while ($v_size != 0) {
-      $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
-	                  ? $v_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($this->_zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Copy the files from the archive_to_add into the temporary file
-    $v_size = $v_central_dir_to_add['offset'];
-    while ($v_size != 0) {
-      $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
-	                  ? $v_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($p_archive_to_add->_zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Store the offset of the central dir
-    $v_offset = @ftell($v_zip_temp_fd);
-
-    // ----- Copy the block of file headers from the old archive
-    $v_size = $v_central_dir['size'];
-    while ($v_size != 0) {
-      $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
-	                  ? $v_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($this->_zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Copy the block of file headers from the archive_to_add
-    $v_size = $v_central_dir_to_add['size'];
-    while ($v_size != 0) {
-      $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
-	                  ? $v_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
-      $v_buffer = @fread($p_archive_to_add->_zip_fd, $v_read_size);
-      @fwrite($v_zip_temp_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Zip file comment
-    // TBC : I should merge the two comments
-    $v_comment = '';
-
-    // ----- Calculate the size of the (new) central header
-    $v_size = @ftell($v_zip_temp_fd)-$v_offset;
-
-    // ----- Swap the file descriptor
-    // Here is a trick : I swap the temporary fd with the zip fd, in order to use
-    // the following methods on the temporary fil and not the real archive fd
-    $v_swap = $this->_zip_fd;
-    $this->_zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Create the central dir footer
-    if (($v_result = $this->_writeCentralHeader($v_central_dir['entries']
-	                                          +$v_central_dir_to_add['entries'],
-												$v_size, $v_offset,
-												$v_comment)) != 1) {
-      $this->_closeFd();
-      $p_archive_to_add->_closeFd();
-      @fclose($v_zip_temp_fd);
-      $this->_zip_fd = null;
-
-      // ----- Reset the file list
-      unset($v_header_list);
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Swap back the file descriptor
-    $v_swap = $this->_zip_fd;
-    $this->_zip_fd = $v_zip_temp_fd;
-    $v_zip_temp_fd = $v_swap;
-
-    // ----- Close
-    $this->_closeFd();
-    $p_archive_to_add->_closeFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    // ----- Delete the zip file
-    // TBC : I should test the result ...
-    @unlink($this->_zipname);
-
-    // ----- Rename the temporary file
-    // TBC : I should test the result ...
-    //@rename($v_zip_temp_name, $this->_zipname);
-    $this->_tool_Rename($v_zip_temp_name, $this->_zipname);
-
-    // ----- Return
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _duplicate()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_duplicate()
-  *
-  * { Description }
-  *
-  */
-  function _duplicate($p_archive_filename)
-  {
-    $v_result=1;
-
-    // ----- Look if the $p_archive_filename exists
-    if (!is_file($p_archive_filename)) {
-
-      // ----- Nothing to duplicate, so duplicate is a success.
-      $v_result = 1;
-
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Open the zip file
-    if (($v_result=$this->_openFd('wb')) != 1) {
-      // ----- Return
-      return $v_result;
-    }
-
-    // ----- Open the temporary file in write mode
-    if (($v_zip_temp_fd = @fopen($p_archive_filename, 'rb')) == 0) {
-      $this->_closeFd();
-      $this->_errorLog(ARCHIVE_ZIP_ERR_READ_OPEN_FAIL,
-	                   'Unable to open archive file \''
-					   .$p_archive_filename.'\' in binary write mode');
-      return Archive_Zip::errorCode();
-    }
-
-    // ----- Copy the files from the archive to the temporary file
-    // TBC : Here I should better append the file and go back to erase the
-	// central dir
-    $v_size = filesize($p_archive_filename);
-    while ($v_size != 0) {
-      $v_read_size = ($v_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
-	                  ? $v_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
-      $v_buffer = fread($v_zip_temp_fd, $v_read_size);
-      @fwrite($this->_zip_fd, $v_buffer, $v_read_size);
-      $v_size -= $v_read_size;
-    }
-
-    // ----- Close
-    $this->_closeFd();
-
-    // ----- Close the temporary file
-    @fclose($v_zip_temp_fd);
-
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  /**
-  * Archive_Zip::_check_parameters()
-  *
-  * { Description }
-  *
-  * @param integer $p_error_code
-  * @param string $p_error_string
-  */
-  function _check_parameters(&$p_params, $p_default)
-  {
-    
-    // ----- Check that param is an array
-    if (!is_array($p_params)) {
-        $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER,
-		                 'Unsupported parameter, waiting for an array');
-        return Archive_Zip::errorCode();
-    }
-    
-    // ----- Check that all the params are valid
-    for (reset($p_params); list($v_key, $v_value) = each($p_params); ) {
-    	if (!isset($p_default[$v_key])) {
-            $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAMETER,
-			                 'Unsupported parameter with key \''.$v_key.'\'');
-
-            return Archive_Zip::errorCode();
-    	}
-    }
-
-	// ----- Set the default values
-    for (reset($p_default); list($v_key, $v_value) = each($p_default); ) {
-    	if (!isset($p_params[$v_key])) {
-    		$p_params[$v_key] = $p_default[$v_key];
-    	}
-    }
-    
-    // ----- Check specific parameters
-    $v_callback_list = array ('callback_pre_add','callback_post_add',
-	                          'callback_pre_extract','callback_post_extract');
-    for ($i=0; $i<sizeof($v_callback_list); $i++) {
-    	$v_key=$v_callback_list[$i];
-        if (   (isset($p_params[$v_key])) && ($p_params[$v_key] != '')) {
-            if (!function_exists($p_params[$v_key])) {
-                $this->_errorLog(ARCHIVE_ZIP_ERR_INVALID_PARAM_VALUE,
-				                 "Callback '".$p_params[$v_key]
-								 ."()' is not an existing function for "
-								 ."parameter '".$v_key."'");
-                return Archive_Zip::errorCode();
-            }
-	    }
-    }
-
-    return(1);
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _errorLog()
-  // Description :
-  // Parameters :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_errorLog()
-  *
-  * { Description }
-  *
-  * @param integer $p_error_code
-  * @param string $p_error_string
-  */
-  function _errorLog($p_error_code=0, $p_error_string='')
-  {
-      $this->_error_code = $p_error_code;
-      $this->_error_string = $p_error_string;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : _errorReset()
-  // Description :
-  // Parameters :
-  // ---------------------------------------------------------------------------
-  /**
-  * Archive_Zip::_errorReset()
-  *
-  * { Description }
-  *
-  */
-  function _errorReset()
-  {
-      $this->_error_code = 1;
-      $this->_error_string = '';
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : $this->_tool_PathReduction()
-  // Description :
-  // Parameters :
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * _tool_PathReduction()
-  *
-  * { Description }
-  *
-  */
-  function _tool_PathReduction($p_dir)
-  {
-    $v_result = "";
-
-    // ----- Look for not empty path
-    if ($p_dir != "")
-    {
-      // ----- Explode path by directory names
-      $v_list = explode("/", $p_dir);
-
-      // ----- Study directories from last to first
-      for ($i=sizeof($v_list)-1; $i>=0; $i--)
-      {
-        // ----- Look for current path
-        if ($v_list[$i] == ".")
-        {
-          // ----- Ignore this directory
-          // Should be the first $i=0, but no check is done
-        }
-        else if ($v_list[$i] == "..")
-        {
-          // ----- Ignore it and ignore the $i-1
-          $i--;
-        }
-        else if (($v_list[$i] == "") && ($i!=(sizeof($v_list)-1)) && ($i!=0))
-        {
-          // ----- Ignore only the double '//' in path,
-          // but not the first and last '/'
-        }
-        else
-        {
-          $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?"/".$v_result:"");
-        }
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : $this->_tool_PathInclusion()
-  // Description :
-  //   This function indicates if the path $p_path is under the $p_dir tree. Or,
-  //   said in an other way, if the file or sub-dir $p_path is inside the dir
-  //   $p_dir.
-  //   The function indicates also if the path is exactly the same as the dir.
-  //   This function supports path with duplicated '/' like '//', but does not
-  //   support '.' or '..' statements.
-  // Parameters :
-  // Return Values :
-  //   0 if $p_path is not inside directory $p_dir
-  //   1 if $p_path is inside directory $p_dir
-  //   2 if $p_path is exactly the same as $p_dir
-  // ---------------------------------------------------------------------------
-  /**
-  * _tool_PathInclusion()
-  *
-  * { Description }
-  *
-  */
-  function _tool_PathInclusion($p_dir, $p_path)
-  {
-    $v_result = 1;
-
-    // ----- Explode dir and path by directory separator
-    $v_list_dir = explode("/", $p_dir);
-    $v_list_dir_size = sizeof($v_list_dir);
-    $v_list_path = explode("/", $p_path);
-    $v_list_path_size = sizeof($v_list_path);
-
-    // ----- Study directories paths
-    $i = 0;
-    $j = 0;
-    while (($i < $v_list_dir_size) && ($j < $v_list_path_size) && ($v_result)) {
-
-      // ----- Look for empty dir (path reduction)
-      if ($v_list_dir[$i] == '') {
-        $i++;
-        continue;
-      }
-      if ($v_list_path[$j] == '') {
-        $j++;
-        continue;
-      }
-
-      // ----- Compare the items
-      if (   ($v_list_dir[$i] != $v_list_path[$j])
-	      && ($v_list_dir[$i] != '')
-		  && ( $v_list_path[$j] != ''))  {
-        $v_result = 0;
-      }
-
-      // ----- Next items
-      $i++;
-      $j++;
-    }
-
-    // ----- Look if everything seems to be the same
-    if ($v_result) {
-      // ----- Skip all the empty items
-      while (($j < $v_list_path_size) && ($v_list_path[$j] == '')) $j++;
-      while (($i < $v_list_dir_size) && ($v_list_dir[$i] == '')) $i++;
-
-      if (($i >= $v_list_dir_size) && ($j >= $v_list_path_size)) {
-        // ----- There are exactly the same
-        $v_result = 2;
-      }
-      else if ($i < $v_list_dir_size) {
-        // ----- The path is shorter than the dir
-        $v_result = 0;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : $this->_tool_CopyBlock()
-  // Description :
-  // Parameters :
-  //   $p_mode : read/write compression mode
-  //             0 : src & dest normal
-  //             1 : src gzip, dest normal
-  //             2 : src normal, dest gzip
-  //             3 : src & dest gzip
-  // Return Values :
-  // ---------------------------------------------------------------------------
-  /**
-  * _tool_CopyBlock()
-  *
-  * { Description }
-  *
-  * @param integer $p_mode
-  */
-  function _tool_CopyBlock($p_src, $p_dest, $p_size, $p_mode=0)
-  {
-    $v_result = 1;
-
-    if ($p_mode==0)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
-		                ? $p_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
-        $v_buffer = @fread($p_src, $v_read_size);
-        @fwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==1)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
-		                ? $p_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
-        $v_buffer = @gzread($p_src, $v_read_size);
-        @fwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==2)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
-		                ? $p_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
-        $v_buffer = @fread($p_src, $v_read_size);
-        @gzwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-    else if ($p_mode==3)
-    {
-      while ($p_size != 0)
-      {
-        $v_read_size = ($p_size < ARCHIVE_ZIP_READ_BLOCK_SIZE
-		                ? $p_size : ARCHIVE_ZIP_READ_BLOCK_SIZE);
-        $v_buffer = @gzread($p_src, $v_read_size);
-        @gzwrite($p_dest, $v_buffer, $v_read_size);
-        $p_size -= $v_read_size;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : $this->_tool_Rename()
-  // Description :
-  //   This function tries to do a simple rename() function. If it fails, it
-  //   tries to copy the $p_src file in a new $p_dest file and then unlink the
-  //   first one.
-  // Parameters :
-  //   $p_src : Old filename
-  //   $p_dest : New filename
-  // Return Values :
-  //   1 on success, 0 on failure.
-  // ---------------------------------------------------------------------------
-  /**
-  * _tool_Rename()
-  *
-  * { Description }
-  *
-  */
-  function _tool_Rename($p_src, $p_dest)
-  {
-    $v_result = 1;
-
-    // ----- Try to rename the files
-    if (!@rename($p_src, $p_dest)) {
-
-      // ----- Try to copy & unlink the src
-      if (!@copy($p_src, $p_dest)) {
-        $v_result = 0;
-      }
-      else if (!@unlink($p_src)) {
-        $v_result = 0;
-      }
-    }
-
-    // ----- Return
-    return $v_result;
-  }
-  // ---------------------------------------------------------------------------
-
-  // ---------------------------------------------------------------------------
-  // Function : $this->_tool_TranslateWinPath()
-  // Description :
-  //   Translate windows path by replacing '\' by '/' and optionally removing
-  //   drive letter.
-  // Parameters :
-  //   $p_path : path to translate.
-  //   $p_remove_disk_letter : true | false
-  // Return Values :
-  //   The path translated.
-  // ---------------------------------------------------------------------------
-  /**
-  * _tool_TranslateWinPath()
-  *
-  * { Description }
-  *
-  * @param [type] $p_remove_disk_letter
-  */
-  function _tool_TranslateWinPath($p_path, $p_remove_disk_letter=true)
-  {
-    if (stristr(php_uname(), 'windows')) {
-      // ----- Look for potential disk letter
-      if (   ($p_remove_disk_letter)
-	      && (($v_position = strpos($p_path, ':')) != false)) {
-          $p_path = substr($p_path, $v_position+1);
-      }
-      // ----- Change potential windows directory separator
-      if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
-          $p_path = strtr($p_path, '\\', '/');
-      }
-    }
-    return $p_path;
-  }
-  // ---------------------------------------------------------------------------
-
-  }
-  // End of class
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/AnsiColorLogger.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/AnsiColorLogger.php
deleted file mode 100644
index 02db3330c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/AnsiColorLogger.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-/*
- * $Id: AnsiColorLogger.php 386 2008-09-12 21:01:41Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/listener/DefaultLogger.php';
-include_once 'phing/system/util/Properties.php';
-
-/**
- * Uses ANSI Color Code Sequences to colorize messages
- * sent to the console.
- *
- * If used with the -logfile option, the output file
- * will contain all the necessary escape codes to
- * display the text in colorized mode when displayed
- * in the console using applications like cat, more,
- * etc.
- *
- * This is designed to work on terminals that support ANSI
- * color codes.  It works on XTerm, ETerm, Mindterm, etc.
- * It also works on Win9x (with ANSI.SYS loaded.)
- *
- * NOTE:
- * It doesn't work on WinNT's COMMAND.COM even with
- * ANSI.SYS loaded.
- *
- * The default colors used for differentiating
- * the message levels can be changed by editing the
- * phing/listener/defaults.properties file.
- *
- * This file contains 5 key/value pairs:
- * AnsiColorLogger.ERROR_COLOR=2;31
- * AnsiColorLogger.WARNING_COLOR=2;35
- * AnsiColorLogger.INFO_COLOR=2;36
- * AnsiColorLogger.VERBOSE_COLOR=2;32
- * AnsiColorLogger.DEBUG_COLOR=2;34
- *
- * Another option is to pass a system variable named
- * ant.logger.defaults, with value set to the path of
- * the file that contains user defined Ansi Color
- * Codes, to the <B>java</B> command using -D option.
- *
- * To change these colors use the following chart:
- *
- *      <B>ANSI COLOR LOGGER CONFIGURATION</B>
- *
- * Format for AnsiColorLogger.*=
- *  Attribute;Foreground;Background
- * 
- *  Attribute is one of the following:
- *  0 -> Reset All Attributes (return to normal mode)
- *  1 -> Bright (Usually turns on BOLD)
- *  2 -> Dim
- *  3 -> Underline
- *  5 -> link
- *  7 -> Reverse
- *  8 -> Hidden
- *
- *  Foreground is one of the following:
- *  30 -> Black
- *  31 -> Red
- *  32 -> Green
- *  33 -> Yellow
- *  34 -> Blue
- *  35 -> Magenta
- *  36 -> Cyan
- *  37 -> White
- *
- *  Background is one of the following:
- *  40 -> Black
- *  41 -> Red
- *  42 -> Green
- *  43 -> Yellow
- *  44 -> Blue
- *  45 -> Magenta
- *  46 -> Cyan
- *  47 -> White
- * 
- * @author     Hans Lellelid <hans@xmpl.org> (Phing)
- * @author     Magesh Umasankar (Ant)
- * @package    phing.listener
- * @version    $Revision$
- */
-class AnsiColorLogger extends DefaultLogger {
-
-    const ATTR_NORMAL = 0;
-    const ATTR_BRIGHT = 1;
-    const ATTR_DIM = 2;
-    const ATTR_UNDERLINE = 3;
-    const ATTR_BLINK = 5;
-    const ATTR_REVERSE = 7;
-    const ATTR_HIDDEN = 8;
-
-    const FG_BLACK = 30;
-    const FG_RED = 31;
-    const FG_GREEN = 32;
-    const FG_YELLOW = 33;
-    const FG_BLUE = 34;
-    const FG_MAGENTA = 35;
-    const FG_CYAN = 36;
-    const FG_WHITE = 37;
-
-    const BG_BLACK = 40;
-    const BG_RED = 41;
-    const BG_GREEN = 42;
-    const BG_YELLOW = 44;
-    const BG_BLUE = 44;
-    const BG_MAGENTA = 45;
-    const BG_CYAN = 46;
-    const BG_WHITE = 47;
-
-    const PREFIX = "\x1b[";
-    const SUFFIX = "m";
-    const SEPARATOR = ';';
-    const END_COLOR = "\x1b[m"; // self::PREFIX . self::SUFFIX;
-
-    private $errColor;
-    private $warnColor;
-    private $infoColor;
-    private $verboseColor;
-    private $debugColor;
-
-    private $colorsSet = false;
-    
-    /**
-     * Construct new AnsiColorLogger
-     * Perform initializations that cannot be done in var declarations.
-     */
-    public function __construct() {
-        parent::__construct();
-        $this->errColor = self::PREFIX . self::ATTR_DIM . self::SEPARATOR . self::FG_RED . self::SUFFIX;
-        $this->warnColor = self::PREFIX . self::ATTR_DIM . self::SEPARATOR . self::FG_MAGENTA . self::SUFFIX;
-        $this->infoColor = self::PREFIX . self::ATTR_DIM . self::SEPARATOR . self::FG_CYAN . self::SUFFIX;
-        $this->verboseColor = self::PREFIX . self::ATTR_DIM . self::SEPARATOR . self::FG_GREEN . self::SUFFIX;
-        $this->debugColor = self::PREFIX . self::ATTR_DIM . self::SEPARATOR . self::FG_BLUE . self::SUFFIX;
-    }
-    
-    /**
-     * Set the colors to use from a property file specified by the
-     * special ant property ant.logger.defaults
-     */
-    private final function setColors() {
-    
-        $userColorFile = Phing::getProperty("phing.logger.defaults");
-        $systemColorFile = new PhingFile(Phing::getResourcePath("phing/listener/defaults.properties"));
-
-        $in = null;
-
-        try {
-            $prop = new Properties();
-
-            if ($userColorFile !== null) {
-                $prop->load($userColorFile);
-            } else {
-                $prop->load($systemColorFile);
-            }                        
-            
-            $err = $prop->getProperty("AnsiColorLogger.ERROR_COLOR");
-            $warn = $prop->getProperty("AnsiColorLogger.WARNING_COLOR");
-            $info = $prop->getProperty("AnsiColorLogger.INFO_COLOR");
-            $verbose = $prop->getProperty("AnsiColorLogger.VERBOSE_COLOR");
-            $debug = $prop->getProperty("AnsiColorLogger.DEBUG_COLOR");
-            if ($err !== null) {
-                $this->errColor = self::PREFIX . $err . self::SUFFIX;
-            }
-            if ($warn !== null) {
-                $this->warnColor = self::PREFIX . $warn . self::SUFFIX;
-            }
-            if ($info !== null) {
-                $this->infoColor = self::PREFIX . $info . self::SUFFIX;
-            }
-            if ($verbose !== null) {
-                $this->verboseColor = self::PREFIX . $verbose . self::SUFFIX;
-            }
-            if ($debug !== null) {
-                $this->debugColor = self::PREFIX . $debug . self::SUFFIX;
-            }
-        } catch (IOException $ioe) {
-            //Ignore exception - we will use the defaults.
-        }
-    }
-
-    /**
-     * @see DefaultLogger#printMessage
-     * @param string $message
-     * @param OutputStream $stream
-     * @param int $priority
-     */
-    protected final function printMessage($message, OutputStream $stream, $priority) {
-        if ($message !== null) {
-        
-            if (!$this->colorsSet) {
-                $this->setColors();
-                $this->colorsSet = true;
-            }
-            
-            switch ($priority) {
-                case Project::MSG_ERR:
-                    $message = $this->errColor . $message . self::END_COLOR;
-                    break;
-                case Project::MSG_WARN:
-                    $message = $this->warnColor . $message . self::END_COLOR;                    
-                    break;
-                case Project::MSG_INFO:
-                    $message = $this->infoColor . $message . self::END_COLOR;
-                    break;
-                case Project::MSG_VERBOSE:
-                    $message = $this->verboseColor . $message . self::END_COLOR;
-                    break;
-                case Project::MSG_DEBUG:
-                    $message = $this->debugColor . $message . self::END_COLOR;
-                    break;
-            }
-            
-            $stream->write($message . PHP_EOL);
-        }
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/DefaultLogger.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/DefaultLogger.php
deleted file mode 100644
index f217963cd..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/DefaultLogger.php
+++ /dev/null
@@ -1,278 +0,0 @@
-<?php
-/*
- *  $Id: DefaultLogger.php 279 2007-11-01 20:11:07Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-require_once 'phing/listener/StreamRequiredBuildLogger.php';
-include_once 'phing/BuildEvent.php';
-
-/**
- *  Writes a build event to the console.
- *
- *  Currently, it only writes which targets are being executed, and
- *  any messages that get logged.
- *
- *  @author    Andreas Aderhold <andi@binarycloud.com>
- *  @copyright � 2001,2002 THYRELL. All rights reserved
- *  @version   $Revision: 1.11 $ $Date: 2007-11-02 05:11:07 +0900 (金, 02 11月 2007) $
- *  @see       BuildEvent
- *  @package   phing.listener
- */
-class DefaultLogger implements StreamRequiredBuildLogger {
-
-    /**
-     *  Size of the left column in output. The default char width is 12.
-     *  @var int
-     */
-    const LEFT_COLUMN_SIZE = 12;
-
-    /**
-     *  The message output level that should be used. The default is
-     *  <code>Project::MSG_VERBOSE</code>.
-     *  @var int
-     */
-    protected $msgOutputLevel = Project::MSG_ERR;
-
-    /**
-     *  Time that the build started
-     *  @var int
-     */
-    protected $startTime;
-    
-    /**
-     * @var OutputStream Stream to use for standard output.
-     */
-    protected $out;
-    
-    /**
-     * @var OutputStream Stream to use for error output.
-     */
-    protected $err;
-
-    /**
-     *  Construct a new default logger.
-     */
-    public function __construct() {
-    	
-    }
-
-    /**
-     *  Set the msgOutputLevel this logger is to respond to.
-     *
-     *  Only messages with a message level lower than or equal to the given
-     *  level are output to the log.
-     *
-     *  <p> Constants for the message levels are in Project.php. The order of
-     *  the levels, from least to most verbose, is:
-     *
-     *  <ul>
-     *    <li>Project::MSG_ERR</li>
-     *    <li>Project::MSG_WARN</li>
-     *    <li>Project::MSG_INFO</li>
-     *    <li>Project::MSG_VERBOSE</li>
-     *    <li>Project::MSG_DEBUG</li>
-     *  </ul>
-     *
-     *  The default message level for DefaultLogger is Project::MSG_ERR.
-     *
-     * @param int $level The logging level for the logger.
-     * @see BuildLogger#setMessageOutputLevel()
-     */
-    public function setMessageOutputLevel($level) {
-        $this->msgOutputLevel = (int) $level;
-    }
-    
-    /**
-     * Sets the output stream.
-     * @param OutputStream $output
-     * @see BuildLogger#setOutputStream()
-     */
-    public function setOutputStream(OutputStream $output) {
-    	$this->out = $output;
-    }
-	
-    /**
-     * Sets the error stream.
-     * @param OutputStream $err
-     * @see BuildLogger#setErrorStream()
-     */
-    public function setErrorStream(OutputStream $err) {
-    	$this->err = $err;
-    }
-    
-    /**
-    *  Sets the start-time when the build started. Used for calculating
-    *  the build-time.
-    *
-    *  @param  object  The BuildEvent
-    *  @access public
-    */
-    public function buildStarted(BuildEvent $event) {
-        $this->startTime = Phing::currentTimeMillis();
-        if ($this->msgOutputLevel >= Project::MSG_INFO) {
-            $this->printMessage("Buildfile: ".$event->getProject()->getProperty("phing.file"), $this->out, Project::MSG_INFO);
-        }
-    }
-
-    /**
-     *  Prints whether the build succeeded or failed, and any errors that
-     *  occured during the build. Also outputs the total build-time.
-     *
-     *  @param  object  The BuildEvent
-     *  @see    BuildEvent::getException()
-     */
-    public function buildFinished(BuildEvent $event) {
-        $error = $event->getException();
-        if ($error === null) {
-            $msg = PHP_EOL . $this->getBuildSuccessfulMessage() . PHP_EOL;
-        } else {
-            $msg = PHP_EOL . $this->getBuildFailedMessage() . PHP_EOL;
-            if (Project::MSG_VERBOSE <= $this->msgOutputLevel || !($error instanceof BuildException)) {
-                $msg .= $error->__toString().PHP_EOL;
-            } else {
-                $msg .= $error->getMessage();
-            }
-        }
-        $msg .= PHP_EOL . "Total time: " .self::formatTime(Phing::currentTimeMillis() - $this->startTime) . PHP_EOL;
-        
-    	if ($error === null) {
-            $this->printMessage($msg, $this->out, Project::MSG_VERBOSE);
-        } else {
-            $this->printMessage($msg, $this->err, Project::MSG_ERR);
-        }
-    }
-
-	/**
-     * Get the message to return when a build failed.
-     * @return string The classic "BUILD FAILED"
-     */
-    protected function getBuildFailedMessage() {
-        return "BUILD FAILED";
-    }
-
-    /**
-     * Get the message to return when a build succeeded.
-     * @return string The classic "BUILD FINISHED"
-     */
-    protected function getBuildSuccessfulMessage() {
-        return "BUILD FINISHED";
-    }
-    
-    /**
-     *  Prints the current target name
-     *
-     *  @param  object  The BuildEvent
-     *  @access public
-     *  @see    BuildEvent::getTarget()
-     */
-    public function targetStarted(BuildEvent $event) {
-        if (Project::MSG_INFO <= $this->msgOutputLevel) {
-        	$msg = PHP_EOL . $event->getProject()->getName() . ' > ' . $event->getTarget()->getName() . ':' . PHP_EOL;
-        	$this->printMessage($msg, $this->out, $event->getPriority());
-        }
-    }
-
-    /**
-     *  Fired when a target has finished. We don't need specific action on this
-     *  event. So the methods are empty.
-     *
-     *  @param  object  The BuildEvent
-     *  @see    BuildEvent::getException()
-     */
-    public function targetFinished(BuildEvent $event) {}
-
-    /**
-     *  Fired when a task is started. We don't need specific action on this
-     *  event. So the methods are empty.
-     *
-     *  @param  object  The BuildEvent
-     *  @access public
-     *  @see    BuildEvent::getTask()
-     */
-    public function taskStarted(BuildEvent $event) {}
-
-    /**
-     *  Fired when a task has finished. We don't need specific action on this
-     *  event. So the methods are empty.
-     *
-     *  @param  object  The BuildEvent
-     *  @access public
-     *  @see    BuildEvent::getException()
-     */
-    public function taskFinished(BuildEvent $event) {}
-
-    /**
-     *  Print a message to the stdout.
-     *
-     *  @param  object  The BuildEvent
-     *  @access public
-     *  @see    BuildEvent::getMessage()
-     */
-    public function messageLogged(BuildEvent $event) {
-    	$priority = $event->getPriority();
-        if ($priority <= $this->msgOutputLevel) {
-            $msg = "";
-            if ($event->getTask() !== null) {
-                $name = $event->getTask();
-                $name = $name->getTaskName();
-                $msg = str_pad("[$name] ", self::LEFT_COLUMN_SIZE, " ", STR_PAD_LEFT);
-            }
-            
-            $msg .= $event->getMessage();
-            
-            if ($priority != Project::MSG_ERR) {
-                $this->printMessage($msg, $this->out, $priority);
-            } else {
-            	$this->printMessage($msg, $this->err, $priority);
-            }
-        }
-    }
-
-    /**
-     *  Formats a time micro integer to human readable format.
-     *
-     *  @param  integer The time stamp
-     *  @access private
-     */
-    public static function formatTime($micros) {
-        $seconds = $micros;
-        $minutes = $seconds / 60;
-        if ($minutes > 1) {
-            return sprintf("%1.0f minute%s %0.2f second%s",
-                                    $minutes, ($minutes === 1 ? " " : "s "),
-                                    $seconds - floor($seconds/60) * 60, ($seconds%60 === 1 ? "" : "s"));
-        } else {
-            return sprintf("%0.4f second%s", $seconds, ($seconds%60 === 1 ? "" : "s"));
-        }
-    }
-    
-    /**
-     * Prints a message to console.
-     * 
-     * @param string $message  The message to print. 
-     *                 Should not be <code>null</code>.
-     * @param resource $stream The stream to use for message printing.
-     * @param int $priority The priority of the message. 
-     *                 (Ignored in this implementation.)
-     * @return void
-     */
-    protected function printMessage($message, OutputStream $stream, $priority) {
-    	$stream->write($message . PHP_EOL);
-    }    
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/NoBannerLogger.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/NoBannerLogger.php
deleted file mode 100644
index 8fc93cae0..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/NoBannerLogger.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/*
- * $Id: NoBannerLogger.php 227 2007-08-28 02:17:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/listener/DefaultLogger.php';
-
-/**
- *  Extends DefaultLogger to strip out empty targets.
- *
- *  @author    Andreas Aderhold <andi@binarycloud.com>
- *  @copyright � 2001,2002 THYRELL. All rights reserved
- *  @version   $Revision: 1.4 $ $Date: 2007-08-28 11:17:00 +0900 (火, 28  8月 2007) $
- *  @package   phing.listener
- */
-class NoBannerLogger extends DefaultLogger {
-
-	private $targetName = null;
-
-	function targetStarted(BuildEvent $event) {
-		$target = $event->getTarget();
-		$this->targetName = $target->getName();
-	}
-
-	function targetFinished(BuildEvent $event) {
-		$this->targetName = null;
-	}
-
-	function messageLogged(BuildEvent $event) {
-		
-		if ($event->getPriority() > $this->msgOutputLevel || null === $event->getMessage() || trim($event->getMessage() === "")) {
-			return;
-		}
-		
-		if ($this->targetName !== null) {
-			$msg = PHP_EOL . $event->getProject()->getName() . ' > ' . $this->targetName . ':' . PHP_EOL;
-			$this->printMessage($msg, $this->out, $event->getPriority());
-			$this->targetName = null;
-		}
-
-		parent::messageLogged($event);
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/PearLogListener.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/PearLogListener.php
deleted file mode 100644
index 75e327dbe..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/PearLogListener.php
+++ /dev/null
@@ -1,197 +0,0 @@
-<?php
-/*
- *  $Id: PearLogListener.php 227 2007-08-28 02:17:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-require_once 'phing/BuildListener.php';
-
-/**
- * Writes build messages to PEAR Log.
- * 
- * By default it will log to file in current directory w/ name 'phing.log'.  You can customize
- * this behavior by setting properties:
- * - pear.log.type
- * - pear.log.name
- * - pear.log.ident (note that this class changes ident to project name)
- * - pear.log.conf (note that array values are currently unsupported in Phing property files)
- * 
- * <code>
- *  phing -f build.xml -logger phing.listener.PearLogger -Dpear.log.type=file -Dpear.log.name=/path/to/log.log
- * </code>
- * 
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.3 $ $Date: 2007-08-28 11:17:00 +0900 (火, 28  8月 2007) $
- * @see       BuildEvent
- * @package   phing.listener
- */
-class PearLogListener implements BuildListener {
-
-    /**
-     *  Size of the left column in output. The default char width is 12.
-     *  @var int
-     */
-    const LEFT_COLUMN_SIZE = 12;
-
-    /**
-     *  Time that the build started
-     *  @var int
-     */
-    protected $startTime;
-    
-    /**
-     * Maps Phing Project::MSG_* constants to PEAR_LOG_* constants.
-     * @var array
-     */
-    protected static $levelMap = array( Project::MSG_DEBUG => PEAR_LOG_DEBUG,
-                                        Project::MSG_INFO => PEAR_LOG_INFO,
-                                        Project::MSG_VERBOSE => PEAR_LOG_NOTICE,
-                                        Project::MSG_WARN => PEAR_LOG_WARNING,
-                                        Project::MSG_ERR => PEAR_LOG_ERR
-                                       );
-    /**
-     * Whether logging has been configured.
-     * @var boolean
-     */
-    protected $logConfigured = false;
-    
-    /**
-     * @var Log PEAR Log object.
-     */
-   	protected $logger;
-   	
-    /**
-     * Configure the logger.
-     */
-    protected function configureLogging() {
-    	
-        $type = Phing::getDefinedProperty('pear.log.type');
-        $name = Phing::getDefinedProperty('pear.log.name');
-        $ident = Phing::getDefinedProperty('pear.log.ident');
-        $conf = Phing::getDefinedProperty('pear.log.conf');
-        
-        if ($type === null) $type = 'file';
-        if ($name === null) $name = 'phing.log';
-        if ($ident === null) $ident = 'phing';
-        if ($conf === null) $conf = array();
-        
-        include_once 'Log.php';
-        if (!class_exists('Log')) {
-        	throw new BuildException("Cannot find PEAR Log class for use by PearLogger.");
-        }
-        
-        $this->logger = Log::singleton($type, $name, $ident, $conf, self::$levelMap[$this->msgOutputLevel]);
-    }        
-    
-    /**
-     * Get the configured PEAR logger to use.
-     * This method just ensures that logging has been configured and returns the configured logger.
-     * @return Log
-     */
-    protected function logger() {
-        if (!$this->logConfigured) {
-            $this->configureLogging();
-        }
-        return $this->logger;
-    }
-
-    /**
-     *  Sets the start-time when the build started. Used for calculating
-     *  the build-time.
-     *
-     * @param  BuildEvent  The BuildEvent
-     */
-    public function buildStarted(BuildEvent $event) {
-        $this->startTime = Phing::currentTimeMillis();
-        $this->logger()->setIdent($event->getProject()->getName());
-        $this->logger()->info("Starting build with buildfile: ". $event->getProject()->getProperty("phing.file"));
-    }
-
-    /**
-     *  Logs whether the build succeeded or failed, and any errors that
-     *  occured during the build. Also outputs the total build-time.
-     *
-     * @param  BuildEvent  The BuildEvent
-     * @see    BuildEvent::getException()
-     */
-    public function buildFinished(BuildEvent $event) {
-        $error = $event->getException();
-        if ($error === null) {
-            $msg = "Finished successful build.";
-        } else {
-            $msg = "Build failed. [reason: " . $error->getMessage() ."]";
-        }
-        $this->logger()->log($msg . " Total time: " . DefaultLogger::formatTime(Phing::currentTimeMillis() - $this->startTime));
-    }
-
-    /**
-     * Logs the current target name
-     *
-     * @param  BuildEvent  The BuildEvent
-     * @see    BuildEvent::getTarget()
-     */
-    public function targetStarted(BuildEvent $event) {}
-
-    /**
-     *  Fired when a target has finished. We don't need specific action on this
-     *  event. So the methods are empty.
-     *
-     *  @param  BuildEvent  The BuildEvent
-     *  @access public
-     *  @see    BuildEvent::getException()
-     */
-    public function targetFinished(BuildEvent $event) {}
-
-    /**
-     *  Fired when a task is started. We don't need specific action on this
-     *  event. So the methods are empty.
-     *
-     *  @param  BuildEvent  The BuildEvent
-     *  @access public
-     *  @see    BuildEvent::getTask()
-     */
-    public function taskStarted(BuildEvent $event) {}
-
-    /**
-     *  Fired when a task has finished. We don't need specific action on this
-     *  event. So the methods are empty.
-     *
-     * @param  BuildEvent  The BuildEvent
-     * @see    BuildEvent::getException()
-     */
-    public function taskFinished(BuildEvent $event) {}
-
-    /**
-     *  Logs a message to the configured PEAR logger.
-     *
-     * @param  BuildEvent  The BuildEvent
-     * @see    BuildEvent::getMessage()
-     */
-    public function messageLogged(BuildEvent $event) {
-        if ($event->getPriority() <= $this->msgOutputLevel) {            
-            $msg = "";
-            if ($event->getTask() !== null) {
-                $name = $event->getTask();
-                $name = $name->getTaskName();
-                $msg = str_pad("[$name] ", self::LEFT_COLUMN_SIZE, " ", STR_PAD_LEFT);
-            }
-            $msg .= $event->getMessage();
-            $this->logger()->log($msg, self::$levelMap[$event->getPriority()]);
-        }
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/StreamRequiredBuildLogger.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/StreamRequiredBuildLogger.php
deleted file mode 100644
index f725aa60e..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/StreamRequiredBuildLogger.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/*
- *  $Id: BuildLogger.php 147 2007-02-06 20:32:22Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/BuildLogger.php';
-
-/**
- * Interface for build loggers that require that out/err streams be set in order to function.
- * 
- * This is just an empty sub-interface to BuildLogger, but is used by Phing to throw
- * graceful errors when classes like phing.listener.DefaultLogger are being used as 
- * -listener.
- *
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.6 $
- * @see       BuildEvent
- * @see       Project::addBuildListener()
- * @package   phing
- */
-interface StreamRequiredBuildLogger extends BuildLogger {
-
-}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/XmlLogger.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/XmlLogger.php
deleted file mode 100755
index cc0f411e7..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/XmlLogger.php
+++ /dev/null
@@ -1,345 +0,0 @@
-<?php
-/**
- * $Id: XmlLogger.php 291 2007-11-04 15:23:03Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/BuildLogger.php';
-require_once 'phing/listener/DefaultLogger.php';
-require_once 'phing/system/util/Timer.php';
-
-/**
- * Generates a file in the current directory with
- * an XML description of what happened during a build.
- * The default filename is "log.xml", but this can be overridden
- * with the property <code>XmlLogger.file</code>.
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: XmlLogger.php 291 2007-11-04 15:23:03Z hans $
- * @package phing.listener
- */	
-class XmlLogger implements BuildLogger {
-	
-	/** XML element name for a build. */
-	const BUILD_TAG = "build";
-	
-	/** XML element name for a target. */
-	const TARGET_TAG = "target";
-	
-	/** XML element name for a task. */
-	const TASK_TAG = "task";
-	
-	/** XML element name for a message. */
-	const MESSAGE_TAG = "message";
-	
-	/** XML attribute name for a name. */
-	const NAME_ATTR = "name";
-	
-	/** XML attribute name for a time. */
-	const TIME_ATTR = "time";
-	
-	/** XML attribute name for a message priority. */
-	const PRIORITY_ATTR = "priority";
-	
-	/** XML attribute name for a file location. */
-	const LOCATION_ATTR = "location";
-	
-	/** XML attribute name for an error description. */
-	const ERROR_ATTR = "error";
-	
-	/** XML element name for a stack trace. */
-	const STACKTRACE_TAG = "stacktrace";
-	
-	/**
-	 * @var DOMDocument The XML document created by this logger. 
-	 */
-	private $doc;
-	
-	/**
-	 * @var int Start time for entire build.
-	 */
-	private $buildTimerStart = 0;
-	
-	/**
-	 * @var DOMElement Top-level (root) build element
-	 */
-	private $buildElement;
-	
-	/**
-	 * @var array DOMElement[] The parent of the element being processed.
-	 */
-	private $elementStack = array();
-	
-	/**
-	 * @var array int[] Array of millisecond times for the various elements being processed.
-	 */
-	private $timesStack = array();
-	
-	/**
-	 * @var int
-	 */
-	private $msgOutputLevel = Project::MSG_DEBUG;
-	
-	/**
-     * @var OutputStream Stream to use for standard output.
-     */
-	private $out;
-   
-	/**
-	 * @var OutputStream Stream to use for error output.
-	 */
-	private $err;
-	
-	/**
-	 * @var string Name of filename to create.
-	 */
-	private $outFilename;
-	
-	/**
-	 *  Constructs a new BuildListener that logs build events to an XML file.
-	 */
-	public function __construct() {
-		$this->doc = new DOMDocument("1.0", "UTF-8");
-		$this->doc->formatOutput = true;
-	}
-	
-	/**
-	 * Fired when the build starts, this builds the top-level element for the
-	 * document and remembers the time of the start of the build.
-	 *
-	 * @param BuildEvent Ignored.
-	 */
-	function buildStarted(BuildEvent $event) {
-		$this->buildTimerStart = Phing::currentTimeMillis();
-		$this->buildElement = $this->doc->createElement(XmlLogger::BUILD_TAG);
-		array_push($this->elementStack, $this->buildElement);
-		array_push($this->timesStack, $this->buildTimerStart);
-	}
-	
-	/**
-	 * Fired when the build finishes, this adds the time taken and any
-	 * error stacktrace to the build element and writes the document to disk.
-	 *
-	 * @param BuildEvent $event An event with any relevant extra information.
-	 *              Will not be <code>null</code>.
-	 */
-	public function buildFinished(BuildEvent $event) {
-		
-		$elapsedTime = Phing::currentTimeMillis() - $this->buildTimerStart;
-		
-		$this->buildElement->setAttribute(XmlLogger::TIME_ATTR, DefaultLogger::formatTime($elapsedTime));
-		
-		if ($event->getException() != null) {
-			$this->buildElement->setAttribute(XmlLogger::ERROR_ATTR, $event->getException()->getMessage());
-			$errText = $this->doc->createCDATASection($event->getException()->getTraceAsString());
-			$stacktrace = $this->doc->createElement(XmlLogger::STACKTRACE_TAG);
-			$stacktrace->appendChild($errText);
-			$this->buildElement->appendChild($stacktrace);
-		}
-		
-		$this->doc->appendChild($this->buildElement);
-		
-		$outFilename = $event->getProject()->getProperty("XmlLogger.file");
-        if ($outFilename == null) {
-            $outFilename = "log.xml";
-        }
-        
-        try {
-	        $stream = $this->out;
-	        if ($stream === null) {
-	        	$stream = new FileOutputStream($outFilename); 
-	        }
-	        
-	        // Yes, we could just stream->write() but this will eventually be the better
-			// way to do this (when we need to worry about charset conversions. 
-	        $writer = new OutputStreamWriter($stream);
-	        $writer->write($this->doc->saveXML());
-	        $writer->close();
-        } catch (IOException $exc) {
-        	try {
-        		$stream->close(); // in case there is a stream open still ...
-        	} catch (Exception $x) {}
-        	throw new BuildException("Unable to write log file.", $exc);
-        }
-        
-         // cleanup:remove the buildElement
-        $this->buildElement = null;
-       
-        array_pop($this->elementStack);
-        array_pop($this->timesStack);
-	}
-        
-	
-	/**
-	 * Fired when a target starts building, remembers the current time and the name of the target.
-	 *
-	 * @param BuildEvent $event An event with any relevant extra information.
-	 *              Will not be <code>null</code>.
-	 */
-	public function targetStarted(BuildEvent $event) {
-		$target = $event->getTarget();
-		
-		$targetElement = $this->doc->createElement(XmlLogger::TARGET_TAG);
-		$targetElement->setAttribute(XmlLogger::NAME_ATTR, $target->getName());
-		
-		array_push($this->timesStack, Phing::currentTimeMillis());
-		array_push($this->elementStack, $targetElement);
-	}
-	
-	/**
-	 * Fired when a target finishes building, this adds the time taken
-	 * to the appropriate target element in the log.
-	 *
-	 * @param BuildEvent $event An event with any relevant extra information.
-	 *              Will not be <code>null</code>.
-	 */
-	public function targetFinished(BuildEvent $event) {
-		$targetTimerStart = array_pop($this->timesStack);
-		$targetElement = array_pop($this->elementStack);
-		
-		$elapsedTime = Phing::currentTimeMillis() - $targetTimerStart;
-		$targetElement->setAttribute(XmlLogger::TIME_ATTR, DefaultLogger::formatTime($elapsedTime));
-		
-		$parentElement = $this->elementStack[ count($this->elementStack) - 1 ];
-		$parentElement->appendChild($targetElement);
-	}
-	
-	/**
-	 * Fired when a task starts building, remembers the current time and the name of the task.
-	 *
-	 * @param BuildEvent $event An event with any relevant extra information.
-	 *              Will not be <code>null</code>.
-	 */
-	public function taskStarted(BuildEvent $event) {
-		$task = $event->getTask();
-		
-		$taskElement = $this->doc->createElement(XmlLogger::TASK_TAG);
-		$taskElement->setAttribute(XmlLogger::NAME_ATTR, $task->getTaskName());
-		$taskElement->setAttribute(XmlLogger::LOCATION_ATTR, $task->getLocation()->toString());
-		
-		array_push($this->timesStack, Phing::currentTimeMillis());
-		array_push($this->elementStack, $taskElement);
-	}
-	
-	/**
-	 * Fired when a task finishes building, this adds the time taken
-	 * to the appropriate task element in the log.
-	 *
-	 * @param BuildEvent $event An event with any relevant extra information.
-	 *              Will not be <code>null</code>.
-	 */		
-	public function taskFinished(BuildEvent $event) {
-		$taskTimerStart = array_pop($this->timesStack);
-		$taskElement = array_pop($this->elementStack);
-		
-		$elapsedTime = Phing::currentTimeMillis() - $taskTimerStart;
-		$taskElement->setAttribute(XmlLogger::TIME_ATTR, DefaultLogger::formatTime($elapsedTime));
-		
-		$parentElement = $this->elementStack[ count($this->elementStack) - 1 ];
-		$parentElement->appendChild($taskElement);
-	}
-	
-	/**
-	 * Fired when a message is logged, this adds a message element to the
-	 * most appropriate parent element (task, target or build) and records
-	 * the priority and text of the message.
-	 *
-	 * @param BuildEvent An event with any relevant extra information.
-	 *              Will not be <code>null</code>.
-	 */
-	public function messageLogged(BuildEvent $event)
-	{
-		$priority = $event->getPriority();
-		
-		if ($priority > $this->msgOutputLevel) {
-			return;
-		}
-		
-		$messageElement = $this->doc->createElement(XmlLogger::MESSAGE_TAG);
-		
-		switch ($priority) {
-			case Project::MSG_ERR: 
-				$name = "error"; 
-				break;
-			case Project::MSG_WARN:
-				$name = "warn";
-				break;
-			case Project::MSG_INFO:
-				$name = "info";
-				break;
-			default:
-				$name = "debug";
-				break;
-		}
-		
-		$messageElement->setAttribute(XmlLogger::PRIORITY_ATTR, $name);
-		
-		$messageText = $this->doc->createCDATASection($event->getMessage());
-		
-		$messageElement->appendChild($messageText);
-		
-		if (!empty($this->elementStack)) {
-			$this->elementStack[count($this->elementStack)-1]->appendChild($messageElement);
-		}
-	}
-
-    /**
-     *  Set the msgOutputLevel this logger is to respond to.
-     *
-     *  Only messages with a message level lower than or equal to the given
-     *  level are output to the log.
-     *
-     *  <p> Constants for the message levels are in Project.php. The order of
-     *  the levels, from least to most verbose, is:
-     *
-     *  <ul>
-     *    <li>Project::MSG_ERR</li>
-     *    <li>Project::MSG_WARN</li>
-     *    <li>Project::MSG_INFO</li>
-     *    <li>Project::MSG_VERBOSE</li>
-     *    <li>Project::MSG_DEBUG</li>
-     *  </ul>
-     *
-     *  The default message level for DefaultLogger is Project::MSG_ERR.
-     *
-     * @param int $level The logging level for the logger.
-     * @see BuildLogger#setMessageOutputLevel()
-     */
-    public function setMessageOutputLevel($level) {
-        $this->msgOutputLevel = (int) $level;
-    }
-    
-    /**
-     * Sets the output stream.
-     * @param OutputStream $output
-     * @see BuildLogger#setOutputStream()
-     */
-    public function setOutputStream(OutputStream $output) {
-    	$this->out = $output;
-    }
-	
-    /**
-     * Sets the error stream.
-     * @param OutputStream $err
-     * @see BuildLogger#setErrorStream()
-     */
-    public function setErrorStream(OutputStream $err) {
-    	$this->err = $err;
-    }
-	
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/defaults.properties b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/defaults.properties
deleted file mode 100644
index f60a3fd5e..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/listener/defaults.properties
+++ /dev/null
@@ -1,43 +0,0 @@
-####################################################
-#
-#           ANSI COLOR LOGGER CONFIGURATION
-#
-# Format for AnsiColorLogger.*=
-#  Attribute;Foreground;Background
-#
-#  Attribute is one of the following:
-#  0 -> Reset All Attributes (return to normal mode)
-#  1 -> Bright (Usually turns on BOLD)
-#  2 -> Dim
-#  3 -> Underline
-#  5 -> link
-#  7 -> Reverse
-#  8 -> Hidden
-#  
-#  Foreground is one of the following:
-#  30 -> Black
-#  31 -> Red
-#  32 -> Green
-#  33 -> Yellow
-#  34 -> Blue
-#  35 -> Magenta
-#  36 -> Cyan
-#  37 -> White
-#
-#  Background is one of the following:
-#  40 -> Black
-#  41 -> Red
-#  42 -> Green
-#  43 -> Yellow
-#  44 -> Blue
-#  45 -> Magenta
-#  46 -> Cyan
-#  47 -> White
-#
-####################################################
-
-AnsiColorLogger.ERROR_COLOR=2;31
-AnsiColorLogger.WARNING_COLOR=2;35
-AnsiColorLogger.INFO_COLOR=2;36
-AnsiColorLogger.VERBOSE_COLOR=2;32
-AnsiColorLogger.DEBUG_COLOR=2;34
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/mappers/FileNameMapper.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/mappers/FileNameMapper.php
deleted file mode 100644
index 8cb35eb8c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/mappers/FileNameMapper.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/* 
- *  $Id: FileNameMapper.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-/**
- * Interface for filename mapper classes.
- *
- * @author Andreas Aderhold, andi@binarycloud.com
- * @author Hans Lellelid <hans@xmpl.org>
- * @version $Revision: 1.7 $
- * @package phing.mappers
- */
-interface FileNameMapper {
-
-    /**
-     * The mapper implementation.
-     *
-     * @param mixed $sourceFileName The data the mapper works on.
-     * @return  array The data after the mapper has been applied; must be in array format (for some reason).
-     */
-    public function main($sourceFileName);
-
-    /**
-     * Accessor. Sets the to property. The actual implementation
-     * depends on the child class.
-     *
-     * @param string $to To what this mapper should convert the from string
-     * @return void
-     */
-    public function setTo($to);
-
-    /**
-     * Accessor. Sets the from property. What this mapper should
-     * recognize. The actual implementation is dependent upon the
-     * child class
-     *
-     * @param string $from On what this mapper should work
-     * @return void
-     */
-    public function setFrom($from);
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/mappers/FlattenMapper.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/mappers/FlattenMapper.php
deleted file mode 100644
index a8e55a2a6..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/mappers/FlattenMapper.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/* 
- *  $Id: FlattenMapper.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-require_once 'phing/mappers/FileNameMapper.php';
-
-/**
- * Removes any directory information from the passed path.
- *
- * @author   Andreas Aderhold <andi@binarycloud.com>
- * @version  $Revision: 1.9 $
- * @package  phing.mappers
- */
-class FlattenMapper implements FileNameMapper {
-
-    /**
-     * The mapper implementation. Returns string with source filename
-     * but without leading directory information
-     *
-     * @param string $sourceFileName The data the mapper works on
-     * @return array The data after the mapper has been applied
-     */
-    function main($sourceFileName) {
-        $f = new PhingFile($sourceFileName);
-        return array($f->getName());
-    }
-
-    /**
-     * Ignored here.
-     */
-    function setTo($to) {}
-
-    /**
-     * Ignored here.
-     */
-    function setFrom($from) {}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/mappers/GlobMapper.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/mappers/GlobMapper.php
deleted file mode 100644
index 7271cd80f..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/mappers/GlobMapper.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/* 
- *  $Id: GlobMapper.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-include_once 'phing/mappers/FileNameMapper.php';
-
-/**
- * description here
- *
- * @author   Andreas Aderhold, andi@binarycloud.com
- * @version  $Revision: 1.10 $
- * @package   phing.mappers
- */
-class GlobMapper implements FileNameMapper {
-
-    /**
-     * Part of &quot;from&quot; pattern before the *.
-     */
-    private $fromPrefix = null;
-
-    /**
-     * Part of &quot;from&quot; pattern after the *.
-     */
-    private $fromPostfix = null;
-
-    /**
-     * Length of the prefix (&quot;from&quot; pattern).
-     */
-    private $prefixLength;
-
-    /**
-     * Length of the postfix (&quot;from&quot; pattern).
-     */
-    private $postfixLength;
-
-    /**
-     * Part of &quot;to&quot; pattern before the *.
-     */
-    private $toPrefix = null;
-
-    /**
-     * Part of &quot;to&quot; pattern after the *.
-     */
-    private $toPostfix = null;
-
-
-    function main($_sourceFileName) {
-        if (($this->fromPrefix === null)
-            || !StringHelper::startsWith($this->fromPrefix, $_sourceFileName)
-            || !StringHelper::endsWith($this->fromPostfix, $_sourceFileName)) {
-            return null;
-        }
-        $varpart = $this->_extractVariablePart($_sourceFileName);
-        $substitution = $this->toPrefix.$varpart.$this->toPostfix;
-        return array($substitution);
-    }
-
-
-
-   function setFrom($from) {
-        $index = strrpos($from, '*');
-
-        if ($index === false) {
-            $this->fromPrefix = $from;
-            $this->fromPostfix = "";
-        } else {
-            $this->fromPrefix  = substr($from, 0, $index);
-            $this->fromPostfix = substr($from, $index+1);
-        }
-        $this->prefixLength  = strlen($this->fromPrefix);
-        $this->postfixLength = strlen($this->fromPostfix);
-    }
-
-    /**
-     * Sets the &quot;to&quot; pattern. Required.
-     */
-    function setTo($to) {
-        $index = strrpos($to, '*');
-        if ($index === false) {
-            $this->toPrefix = $to;
-            $this->toPostfix = "";
-        } else {
-            $this->toPrefix  = substr($to, 0, $index);
-            $this->toPostfix = substr($to, $index+1);
-        }
-    }
-
-    private function _extractVariablePart($_name) {
-        // ergh, i really hate php's string functions .... all but natural
-        $start = ($this->prefixLength === 0) ? 0 : $this->prefixLength;
-        $end   = ($this->postfixLength === 0) ? strlen($_name) : strlen($_name) - $this->postfixLength;
-        $len   = $end-$start;
-        return substr($_name, $start, $len);
-    }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/mappers/IdentityMapper.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/mappers/IdentityMapper.php
deleted file mode 100644
index bf2eb87ef..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/mappers/IdentityMapper.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/* 
- *  $Id: IdentityMapper.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-require_once 'phing/mappers/FileNameMapper.php';
-
-/**
- * This mapper does nothing ;)
- * 
- * @author    Andreas Aderhold <andi@binarycloud.com>
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.7 $
- * @package   phing.mappers
- */
-class IdentityMapper implements FileNameMapper {
-
-    /**
-     * The mapper implementation. Basically does nothing in this case.
-     *
-     * @param  string $sourceFileName The data the mapper works on.
-     * @return array The data after the mapper has been applied
-     */
-    function main($sourceFileName) {
-        return array($sourceFileName);
-    }
-
-    /**
-     * Ignored here.
-     */
-    function setTo($to) {}
-
-    /**
-     * Ignored here.
-     */
-    function setFrom($from) {}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/mappers/MergeMapper.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/mappers/MergeMapper.php
deleted file mode 100644
index 661cab5cc..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/mappers/MergeMapper.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/* 
- *  $Id: MergeMapper.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-include_once 'phing/mappers/FileNameMapper.php';
-
-/**
- * For merging files into a single file.  In practice just returns whatever value
- * was set for "to".
- *
- * @author    Andreas Aderhold <andi@binarycloud.com>
- * @version   $Revision: 1.8 $
- * @package   phing.mappers
- */
-class MergeMapper implements FileNameMapper {
-    
-    /** the merge */
-    private $mergedFile;
-
-    /**
-     * The mapper implementation. Basically does nothing in this case.
-     *
-     * @param    mixed     The data the mapper works on
-     * @returns  mixed     The data after the mapper has been applied
-     * @access   public
-     * @author   Andreas Aderhold, andi@binarycloud.com
-     */
-    function main($sourceFileName) {
-        if ($this->mergedFile === null) {            
-            throw new BuildException("MergeMapper error, to attribute not set");            
-        }         
-        return array($this->mergedFile);
-    }
-
-    /**
-     * Accessor. Sets the to property
-     *
-     * @param    string     To what this mapper should convert the from string
-     * @returns  boolean    True
-     * @access   public
-     * @author   Andreas Aderhold, andi@binarycloud.com
-     */
-    function setTo($to) {
-        $this->mergedFile = $to;
-    }    
-
-    /**
-     * Ignored.
-     */
-    function setFrom($from) {}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/mappers/RegexpMapper.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/mappers/RegexpMapper.php
deleted file mode 100644
index 84b7e84b7..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/mappers/RegexpMapper.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/* 
- *  $Id: RegexpMapper.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-require_once 'phing/mappers/FileNameMapper.php';
-include_once 'phing/util/StringHelper.php';
-include_once 'phing/util/regexp/Regexp.php';
-
-/**
- * Uses regular expressions to perform filename transformations.
- *
- * @author Andreas Aderhold <andi@binarycloud.com>
- * @author Hans Lellelid <hans@velum.net>
- * @version $Revision: 1.9 $
- * @package phing.mappers
- */
-class RegexpMapper implements FileNameMapper {
-
-    /**
-     * @var string
-     */
-    private $to;
-    
-    /**
-     * The Regexp engine.
-     * @var Regexp
-     */
-    private $reg;
-
-    function __construct() {                
-        // instantiage regexp matcher here
-        $this->reg = new Regexp();
-    }
-
-    /**
-     * Sets the &quot;from&quot; pattern. Required.
-     */
-    function setFrom($from) {
-        $this->reg->SetPattern($from);
-    }
-
-    /**
-     * Sets the &quot;to&quot; pattern. Required.
-     */
-    function setTo($to) {
-    
-        // [HL] I'm changing the way this works for now to just use string
-        //$this->to = StringHelper::toCharArray($to);
-        
-        $this->to = $to;
-    }
-
-    function main($sourceFileName) {
-        if ($this->reg === null  || $this->to === null || !$this->reg->matches((string) $sourceFileName)) {
-            return null;
-        }
-        return array($this->replaceReferences($sourceFileName));
-    }
-
-    /**
-     * Replace all backreferences in the to pattern with the matched groups.
-     * groups of the source.
-     * @param string $source The source filename.
-     */
-    private function replaceReferences($source) {
-        
-        // FIXME
-        // Can't we just use engine->replace() to handle this?  the Preg engine
-        // will automatically convert \1 references to $1
-        
-        // the expression has already been processed (when ->matches() was run in Main())
-        // so no need to pass $source again to the engine.
-        $groups = (array) $this->reg->getGroups();            
-        
-        // replace \1 with value of $groups[1] and return the modified "to" string
-        return preg_replace('/\\\([\d]+)/e', "\$groups[$1]", $this->to);            
-    }
-    
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/AbstractHandler.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/AbstractHandler.php
deleted file mode 100644
index 039429e45..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/AbstractHandler.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-/*
- * $Id: AbstractHandler.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-include_once 'phing/parser/ExpatParseException.php';
-
-/**
- * This is an abstract class all SAX handler classes must extend
- *
- * @author    Andreas Aderhold <andi@binarycloud.com>
- * @copyright � 2001,2002 THYRELL. All rights reserved
- * @version   $Revision: 1.6 $
- * @package   phing.parser
- */
-abstract class AbstractHandler {
-
-    public $parentHandler = null;
-    public $parser = null;
-
-    /**
-     * Constructs a SAX handler parser.
-     *
-     * The constructor must be called by all derived classes.
-     *
-     * @param   object  the parser object
-     * @param   object  the parent handler of this handler
-     */
-    protected function __construct($parser, $parentHandler) {
-        $this->parentHandler = $parentHandler;
-        $this->parser = $parser;
-        $this->parser->setHandler($this);
-    }
-        
-    /**
-     * Gets invoked when a XML open tag occurs
-     *
-     * Must be overloaded by the child class. Throws an ExpatParseException
-     * if there is no handler registered for an element.
-     *
-     * @param  string  the name of the XML element
-     * @param  array   the attributes of the XML element
-     */
-    public function startElement($name, $attribs) {
-        throw new ExpatParseException("Unexpected element $name");
-    }
-
-    /**
-     * Gets invoked when element closes method.
-     *
-     */
-    protected function finished() {}
-
-    /**
-     * Gets invoked when a XML element ends.
-     *
-     * Can be overloaded by the child class. But should not. It hands
-     * over control to the parentHandler of this.
-     *
-     * @param  string  the name of the XML element
-     */
-    public function endElement($name) {
-        $this->finished();        
-        $this->parser->setHandler($this->parentHandler);
-    }
-
-    /**
-     * Invoked by occurance of #PCDATA.
-     *
-     * @param     string  the name of the XML element
-     * @exception ExpatParserException if there is no CDATA but method
-     *            was called
-     * @access    public
-     */
-    public function characters($data) {
-        $s = trim($data);
-        if (strlen($s) > 0) {
-            throw new ExpatParseException("Unexpected text '$s'", $this->parser->getLocation());
-        }
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/AbstractSAXParser.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/AbstractSAXParser.php
deleted file mode 100644
index 064ec4b56..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/AbstractSAXParser.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/*
- *  $Id: AbstractSAXParser.php 322 2007-12-20 03:00:35Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-/**
- * The abstract SAX parser class.
- *
- * This class represents a SAX parser. It is a abstract calss that must be
- * implemented by the real parser that must extend this class
- *
- * @author    Andreas Aderhold <andi@binarycloud.com>
- * @author    Hans Lellelid <hans@xmpl.org>
- * @copyright � 2001,2002 THYRELL. All rights reserved
- * @version   $Revision: 1.13 $
- * @package   phing.parser
- */
-abstract class AbstractSAXParser {
-    
-    /** The AbstractHandler object. */
-    protected $handler;
-
-    /**
-     * Constructs a SAX parser
-     */
-    function __construct() {}
-
-    /**
-     * Sets options for PHP interal parser. Must be implemented by the parser
-     * class if it should be used.
-     */
-    abstract function parserSetOption($opt, $val);
-
-    /**
-     * Sets the current element handler object for this parser. Usually this
-     * is an object using extending "AbstractHandler".
-     *
-     * @param AbstractHandler $obj The handler object.
-     */
-    function setHandler( $obj) {
-        $this->handler = $obj;
-    }
-
-    /**
-     * Method that gets invoked when the parser runs over a XML start element.
-     *
-     * This method is called by PHP's internal parser functions and registered
-     * in the actual parser implementation.
-     * It gives control to the current active handler object by calling the
-     * <code>startElement()</code> method.
-     * 
-     * @param  object  the php's internal parser handle
-     * @param  string  the open tag name
-     * @param  array   the tag's attributes if any
-     * @throws Exception - Exceptions may be thrown by the Handler
-     */
-    function startElement($parser, $name, $attribs) {
-        $this->handler->startElement($name, $attribs);
-    }
-
-    /**
-     * Method that gets invoked when the parser runs over a XML close element.
-     *
-     * This method is called by PHP's internal parser funcitons and registered
-     * in the actual parser implementation.
-     *
-     * It gives control to the current active handler object by calling the
-     * <code>endElement()</code> method.
-     *
-     * @param   object  the php's internal parser handle
-     * @param   string  the closing tag name
-     * @throws Exception - Exceptions may be thrown by the Handler
-     */
-    function endElement($parser, $name) {
-        $this->handler->endElement($name);
-    }
-
-    /**
-     * Method that gets invoked when the parser runs over CDATA.
-     *
-     * This method is called by PHP's internal parser functions and registered
-     * in the actual parser implementation.
-     *
-     * It gives control to the current active handler object by calling the
-     * <code>characters()</code> method. That processes the given CDATA.
-     *
-     * @param resource $parser php's internal parser handle.
-     * @param string $data the CDATA
-     * @throws Exception - Exceptions may be thrown by the Handler
-     */
-    function characters($parser, $data) {
-		$this->handler->characters($data);
-    }
-
-    /**
-     * Entrypoint for parser. This method needs to be implemented by the
-     * child classt that utilizes the concrete parser
-     */
-    abstract function parse();
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/DataTypeHandler.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/DataTypeHandler.php
deleted file mode 100644
index 7e9ca502f..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/DataTypeHandler.php
+++ /dev/null
@@ -1,144 +0,0 @@
-<?php
-/*
- *  $Id: DataTypeHandler.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-include_once 'phing/RuntimeConfigurable.php';
-
-/**
- * Configures a Project (complete with Targets and Tasks) based on
- * a XML build file.
- * <p>
- * Design/ZE2 migration note:
- * If PHP would support nested classes. All the phing/parser/*Filter
- * classes would be nested within this class
- *
- * @author      Andreas Aderhold <andi@binarycloud.com>
- * @copyright � 2001,2002 THYRELL. All rights reserved
- * @version   $Revision: 1.8 $ $Date: 2006-09-15 05:19:08 +0900 (金, 15  9月 2006) $
- * @access    public
- * @package   phing.parser
- */
-
-class DataTypeHandler extends AbstractHandler {
-
-    private $target;
-    private $element;
-    private $wrapper;
-
-    /**
-     * Constructs a new DataTypeHandler and sets up everything.
-     *
-     * @param AbstractSAXParser $parser The XML parser (default: ExpatParser)
-     * @param AbstractHandler $parentHandler The parent handler that invoked this handler.
-     * @param ProjectConfigurator $configurator The ProjectConfigurator object
-     * @param Target $target The target object this datatype is contained in (null for top-level datatypes).
-     */
-    function __construct(AbstractSAXParser $parser, AbstractHandler $parentHandler, ProjectConfigurator $configurator, $target = null) { // FIXME b2 typehinting
-        parent::__construct($parser, $parentHandler);
-        $this->target = $target;
-        $this->configurator = $configurator;
-    }
-
-    /**
-     * Executes initialization actions required to setup the data structures
-     * related to the tag.
-     * <p>
-     * This includes:
-     * <ul>
-     * <li>creation of the datatype object</li>
-     * <li>calling the setters for attributes</li>
-     * <li>adding the type to the target object if any</li>
-     * <li>adding a reference to the task (if id attribute is given)</li>
-         * </ul>
-     *
-     * @param  string  the tag that comes in
-     * @param  array   attributes the tag carries
-     * @throws ExpatParseException if attributes are incomplete or invalid
-     * @access public
-     */
-    function init($propType, $attrs) {
-        // shorthands
-        $project = $this->configurator->project;
-        $configurator = $this->configurator;
-
-        try {//try
-            $this->element = $project->createDataType($propType);
-
-            if ($this->element === null) {
-                throw new BuildException("Unknown data type $propType");
-            }
-
-            if ($this->target !== null) {
-                $this->wrapper = new RuntimeConfigurable($this->element, $propType);
-                $this->wrapper->setAttributes($attrs);
-                $this->target->addDataType($this->wrapper);
-            } else {
-                $configurator->configure($this->element, $attrs, $project);
-                $configurator->configureId($this->element, $attrs);
-            }
-
-        } catch (BuildException $exc) {
-            throw new ExpatParseException($exc, $this->parser->getLocation());
-        }
-    }
-
-    /**
-     * Handles character data.
-     *
-     * @param  string  the CDATA that comes in
-     * @access public
-     */
-    function characters($data) {
-        $project = $this->configurator->project;
-        try {//try
-            $this->configurator->addText($project, $this->element, $data);
-        } catch (BuildException $exc) {
-            throw new ExpatParseException($exc->getMessage(), $this->parser->getLocation());
-        }
-    }
-
-    /**
-     * Checks for nested tags within the current one. Creates and calls
-     * handlers respectively.
-     *
-     * @param  string  the tag that comes in
-     * @param  array   attributes the tag carries
-     * @access public
-     */
-    function startElement($name, $attrs) {
-        $nef = new NestedElementHandler($this->parser, $this, $this->configurator, $this->element, $this->wrapper, $this->target);
-        $nef->init($name, $attrs);
-    }
-    
-   /**
-    * Overrides endElement for data types. Tells the type
-    * handler that processing the element had been finished so
-    * handlers know they can perform actions that need to be
-    * based on the data contained within the element.
-    *
-    * @param  string  the name of the XML element
-    * @return void
-    */
-   function endElement($name) {
-       $this->element->parsingComplete();
-       parent::endElement($name);
-   }
-         
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/ExpatParseException.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/ExpatParseException.php
deleted file mode 100644
index e8c856e68..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/ExpatParseException.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/*
- *  $Id: ExpatParseException.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
- 
-require_once 'phing/BuildException.php';
-
-/**
- * This class throws errors for Expat, the XML processor.
- *
- * @author   Andreas Aderhold, andi@binarycloud.com
- * @version  $Revision: 1.5 $ $Date: 2006-09-15 05:19:08 +0900 (金, 15  9月 2006) $
- * @package  phing.parser
- */
-class ExpatParseException extends BuildException {}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/ExpatParser.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/ExpatParser.php
deleted file mode 100644
index c8de5f4be..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/ExpatParser.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/*
- *  $Id: ExpatParser.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-require_once 'phing/parser/AbstractSAXParser.php';
-include_once 'phing/parser/ExpatParseException.php';
-include_once 'phing/system/io/IOException.php';
-include_once 'phing/system/io/FileReader.php';
-
-/**
- * This class is a wrapper for the PHP's internal expat parser.
- *
- * It takes an XML file represented by a abstract path name, and starts
- * parsing the file and calling the different "trap" methods inherited from
- * the AbstractParser class.
- *
- * Those methods then invoke the represenatative methods in the registered
- * handler classes.
- *
- * @author      Andreas Aderhold <andi@binarycloud.com>
- * @copyright � 2001,2002 THYRELL. All rights reserved
- * @version   $Revision: 1.8 $ $Date: 2006-09-15 05:19:08 +0900 (金, 15  9月 2006) $
- * @access    public
- * @package   phing.parser
- */
-
-class ExpatParser extends AbstractSAXParser {
-    
-    /** @var resource */
-    private $parser;
-    
-    /** @var Reader */
-    private $reader;
-    
-    private $file;
-    
-    private $buffer = 4096;
-    
-    private $error_string = "";
-    
-    private $line = 0;
-    
-    /** @var Location Current cursor pos in XML file. */
-    private $location;
-
-    /**
-     * Constructs a new ExpatParser object.
-     *
-     * The constructor accepts a PhingFile object that represents the filename
-     * for the file to be parsed. It sets up php's internal expat parser
-     * and options.
-     *
-     * @param Reader $reader  The Reader Object that is to be read from.
-     * @param string $filename Filename to read.
-     * @throws Exception if the given argument is not a PhingFile object
-     */
-    function __construct(Reader $reader, $filename=null) {
-
-        $this->reader = $reader;
-        if ($filename !== null) {
-            $this->file = new PhingFile($filename);
-        }
-        $this->parser = xml_parser_create();
-        $this->buffer = 4096;
-        $this->location = new Location();
-        xml_set_object($this->parser, $this);
-        xml_set_element_handler($this->parser, array($this,"startElement"),array($this,"endElement"));
-        xml_set_character_data_handler($this->parser, array($this, "characters"));
-    }
-
-    /**
-     * Override PHP's parser default settings, created in the constructor.
-     *
-     * @param  string  the option to set
-     * @throws mixed   the value to set
-     * @return boolean true if the option could be set, otherwise false
-     * @access public
-     */
-    function parserSetOption($opt, $val) {
-        return xml_parser_set_option($this->parser, $opt, $val);
-    }
-
-    /**
-     * Returns the location object of the current parsed element. It describes
-     * the location of the element within the XML file (line, char)
-     *
-     * @return object  the location of the current parser
-     * @access public
-     */
-    function getLocation() {
-        if ($this->file !== null) {
-            $path = $this->file->getAbsolutePath();
-        } else {
-            $path = $this->reader->getResource();
-        }
-        $this->location = new Location($path, xml_get_current_line_number($this->parser), xml_get_current_column_number($this->parser));
-        return $this->location;
-    }
-
-    /**
-     * Starts the parsing process.
-     *
-     * @param  string  the option to set
-     * @return int     1 if the parsing succeeded
-     * @throws ExpatParseException if something gone wrong during parsing
-     * @throws IOException if XML file can not be accessed
-     * @access public
-     */
-    function parse() {
-    
-        while ( ($data = $this->reader->read()) !== -1 ) {            
-            if (!xml_parse($this->parser, $data, $this->reader->eof())) {
-                $error = xml_error_string(xml_get_error_code($this->parser));
-                $e = new ExpatParseException($error, $this->getLocation());
-                xml_parser_free($this->parser);                
-                throw $e;  
-            }
-        }
-        xml_parser_free($this->parser);
-        
-        return 1;
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/Location.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/Location.php
deleted file mode 100644
index 767cff9df..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/Location.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/*
- *  $Id: Location.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-/**
- * Stores the file name and line number of a XML file
- *
- * @author      Andreas Aderhold <andi@binarycloud.com>
- * @copyright � 2001,2002 THYRELL. All rights reserved
- * @version   $Revision: 1.6 $ $Date: 2006-09-15 05:19:08 +0900 (金, 15  9月 2006) $
- * @access    public
- * @package   phing.parser
- */
-
-class Location {
-
-    private $fileName;
-    private $lineNumber;
-    private $columnNumber;
-
-    /**
-     * Constructs the location consisting of a file name and line number
-     *
-     * @param  string  the filename
-     * @param  integer the line number
-     * @param  integer the column number
-     * @access public
-     */
-    function Location($fileName = null, $lineNumber = null, $columnNumber = null) {
-        $this->fileName = $fileName;
-        $this->lineNumber = $lineNumber;
-        $this->columnNumber = $columnNumber;
-    }
-
-    /**
-     * Returns the file name, line number and a trailing space.
-     *
-     * An error message can be appended easily. For unknown locations,
-     * returns empty string.
-     *
-     * @return string the string representation of this Location object
-     * @access public
-     */
-    function toString() {
-        $buf = "";
-        if ($this->fileName !== null) {
-            $buf.=$this->fileName;
-            if ($this->lineNumber !== null) {
-                $buf.= ":".$this->lineNumber;
-            }
-            $buf.=":".$this->columnNumber;
-        }
-        return (string) $buf;
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/NestedElementHandler.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/NestedElementHandler.php
deleted file mode 100644
index bc7b9bdcd..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/NestedElementHandler.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-/*
- *  $Id: NestedElementHandler.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-include_once 'phing/IntrospectionHelper.php';
-include_once 'phing/TaskContainer.php';
-
-/**
- * The nested element handler class.
- *
- * This class handles the occurance of runtime registered tags like
- * datatypes (fileset, patternset, etc) and it's possible nested tags. It
- * introspects the implementation of the class and sets up the data structures.
- *
- * @author      Andreas Aderhold <andi@binarycloud.com>
- * @copyright � 2001,2002 THYRELL. All rights reserved
- * @version   $Revision: 1.10 $ $Date: 2006-09-15 05:19:08 +0900 (金, 15  9月 2006) $
- * @access    public
- * @package   phing.parser
- */
-
-class NestedElementHandler extends AbstractHandler {
-
-    /**
-     * Reference to the parent object that represents the parent tag
-     * of this nested element
-     * @var object
-     */
-    private $parent;
-
-    /**
-     * Reference to the child object that represents the child tag
-     * of this nested element
-     * @var object
-     */
-    private $child;
-
-    /**
-     *  Reference to the parent wrapper object
-     *  @var object
-     */
-    private $parentWrapper;
-
-    /**
-     *  Reference to the child wrapper object
-     *  @var object
-     */
-    private $childWrapper;
-
-    /**
-     *  Reference to the related target object
-     *  @var object the target instance
-     */
-    private $target;
-
-    /**
-     *  Constructs a new NestedElement handler and sets up everything.
-     *
-     *  @param  object  the ExpatParser object
-     *  @param  object  the parent handler that invoked this handler
-     *  @param  object  the ProjectConfigurator object
-     *  @param  object  the parent object this element is contained in
-     *  @param  object  the parent wrapper object
-     *  @param  object  the target object this task is contained in
-     *  @access public
-     */
-    function __construct($parser, $parentHandler, $configurator, $parent, $parentWrapper, $target) {
-        parent::__construct($parser, $parentHandler);
-        $this->configurator = $configurator;
-        if ($parent instanceof TaskAdapter) {
-            $this->parent = $parent->getProxy();
-        } else {
-            $this->parent = $parent;
-        }
-        $this->parentWrapper = $parentWrapper;
-        $this->target = $target;        
-    }
-
-    /**
-     * Executes initialization actions required to setup the data structures
-     * related to the tag.
-     * <p>
-     * This includes:
-     * <ul>
-     * <li>creation of the nested element</li>
-     * <li>calling the setters for attributes</li>
-     * <li>adding the element to the container object</li>
-     * <li>adding a reference to the element (if id attribute is given)</li>
-         * </ul>
-     *
-     * @param  string  the tag that comes in
-     * @param  array   attributes the tag carries
-     * @throws ExpatParseException if the setup process fails
-     * @access public
-     */
-    function init($propType, $attrs) {
-        $configurator = $this->configurator;
-        $project = $this->configurator->project;
-
-        // introspect the parent class that is custom
-        $parentClass = get_class($this->parent);
-        $ih = IntrospectionHelper::getHelper($parentClass);
-        try {
-            if ($this->parent instanceof UnknownElement) {
-                $this->child = new UnknownElement(strtolower($propType));
-                $this->parent->addChild($this->child);
-            } else {                
-                $this->child = $ih->createElement($project, $this->parent, strtolower($propType));
-            }
-            
-            $configurator->configureId($this->child, $attrs);
-            
-            if ($this->parentWrapper !== null) {
-                $this->childWrapper = new RuntimeConfigurable($this->child, $propType);
-                $this->childWrapper->setAttributes($attrs);
-                $this->parentWrapper->addChild($this->childWrapper);
-            } else {
-                $configurator->configure($this->child, $attrs, $project);
-                $ih->storeElement($project, $this->parent, $this->child, strtolower($propType));
-            }
-        } catch (BuildException $exc) {
-            throw new ExpatParseException("Error initializing nested element <$propType>", $exc, $this->parser->getLocation());
-        }
-    }
-
-    /**
-     * Handles character data.
-     *
-     * @param  string  the CDATA that comes in
-     * @throws ExpatParseException if the CDATA could not be set-up properly
-     * @access public
-     */
-    function characters($data) {
-
-        $configurator = $this->configurator;        
-        $project = $this->configurator->project;
-
-        if ($this->parentWrapper === null) {
-            try {                
-                $configurator->addText($project, $this->child, $data);
-            } catch (BuildException $exc) {
-                throw new ExpatParseException($exc->getMessage(), $this->parser->getLocation());
-            }
-        } else {                    
-            $this->childWrapper->addText($data);
-        }
-    }
-
-    /**
-     * Checks for nested tags within the current one. Creates and calls
-     * handlers respectively.
-     *
-     * @param  string  the tag that comes in
-     * @param  array   attributes the tag carries
-     * @access public
-     */
-    function startElement($name, $attrs) {
-        //print(get_class($this) . " name = $name, attrs = " . implode(",",$attrs) . "\n");
-		if ($this->child instanceof TaskContainer) {
-                // taskcontainer nested element can contain other tasks - no other
-                // nested elements possible
-			$tc = new TaskHandler($this->parser, $this, $this->configurator, $this->child, $this->childWrapper, $this->target);
-			$tc->init($name, $attrs);
-		} else {
-			$neh = new NestedElementHandler($this->parser, $this, $this->configurator, $this->child, $this->childWrapper, $this->target);
-        	$neh->init($name, $attrs);
-		}
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/ProjectConfigurator.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/ProjectConfigurator.php
deleted file mode 100644
index e9df5903f..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/ProjectConfigurator.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-/*
- * $Id: ProjectConfigurator.php 147 2007-02-06 20:32:22Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-include_once 'phing/system/io/BufferedReader.php';
-include_once 'phing/system/io/FileReader.php';
-include_once 'phing/BuildException.php';
-include_once 'phing/system/lang/FileNotFoundException.php';
-include_once 'phing/system/io/PhingFile.php';
-
-/**
- * The datatype handler class.
- *
- * This class handles the occurance of registered datatype tags like
- * FileSet
- *
- * @author      Andreas Aderhold <andi@binarycloud.com>
- * @copyright � 2001,2002 THYRELL. All rights reserved
- * @version   $Revision: 1.17 $ $Date: 2007-02-07 05:32:22 +0900 (水, 07  2月 2007) $
- * @access    public
- * @package   phing.parser
- */
-class ProjectConfigurator {
-
-    public $project;
-    public $locator;
-    
-    public $buildFile;
-    public $buildFileParent;
-        
-    /**
-     * Static call to ProjectConfigurator. Use this to configure a
-     * project. Do not use the new operator.
-     *
-     * @param  object  the Project instance this configurator should use
-     * @param  object  the buildfile object the parser should use
-     * @access public
-     */
-    public static function configureProject(Project $project, PhingFile $buildFile) {
-        $pc = new ProjectConfigurator($project, $buildFile);
-        $pc->parse();
-    }
-
-    /**
-     * Constructs a new ProjectConfigurator object
-     * This constructor is private. Use a static call to
-     * <code>configureProject</code> to configure a project.
-     *
-     * @param  object  the Project instance this configurator should use
-     * @param  object  the buildfile object the parser should use
-     * @access private
-     */
-    function __construct(Project $project, PhingFile $buildFile) {
-        $this->project = $project;
-        $this->buildFile = new PhingFile($buildFile->getAbsolutePath());
-        $this->buildFileParent = new PhingFile($this->buildFile->getParent());
-    }
-
-    /**
-     * Creates the ExpatParser, sets root handler and kick off parsing
-     * process.
-     *
-     * @throws BuildException if there is any kind of execption during
-     *         the parsing process
-     * @access private
-     */
-    protected function parse() {
-        try {
-            $reader = new BufferedReader(new FileReader($this->buildFile));
-            $parser = new ExpatParser($reader);
-            $parser->parserSetOption(XML_OPTION_CASE_FOLDING,0);
-            $parser->setHandler(new RootHandler($parser, $this));
-            $this->project->log("parsing buildfile ".$this->buildFile->getName(), Project::MSG_VERBOSE);
-            $parser->parse();
-            $reader->close();
-        } catch (Exception $exc) {
-            throw new BuildException("Error reading project file", $exc);
-        }
-    }
-
-    /**
-     * Configures an element and resolves eventually given properties.
-     *
-     * @param  object  the element to configure
-     * @param  array   the element's attributes
-     * @param  object  the project this element belongs to
-     * @throws Exception if arguments are not valid
-     * @throws BuildException if attributes can not be configured
-     * @access public
-     */
-    public static function configure($target, $attrs, Project $project) {               
-
-        if ($target instanceof TaskAdapter) {
-            $target = $target->getProxy();
-        }
-        
-		// if the target is an UnknownElement, this means that the tag had not been registered
-		// when the enclosing element (task, target, etc.) was configured.  It is possible, however, 
-		// that the tag was registered (e.g. using <taskdef>) after the original configuration.
-		// ... so, try to load it again:
-		if ($target instanceof UnknownElement) {
-			$tryTarget = $project->createTask($target->getTaskType());
-			if ($tryTarget) {
-				$target = $tryTarget;
-			}
-		}
-
-        $bean = get_class($target);
-        $ih = IntrospectionHelper::getHelper($bean);
-
-        foreach ($attrs as $key => $value) {
-            if ($key == 'id') {
-                continue;
-                // throw new BuildException("Id must be set Extermnally");
-            }            
-            $value = self::replaceProperties($project, $value, $project->getProperties());
-            try { // try to set the attribute
-                $ih->setAttribute($project, $target, strtolower($key), $value);
-            } catch (BuildException $be) {
-                // id attribute must be set externally
-                if ($key !== "id") {
-                    throw $be;
-                }
-            }
-        }
-    }
-
-    /**
-     * Configures the #CDATA of an element.
-     *
-     * @param  object  the project this element belongs to
-     * @param  object  the element to configure
-     * @param  string  the element's #CDATA
-     * @access public
-     */
-    public static function addText($project, $target, $text = null) {
-        if ($text === null || strlen(trim($text)) === 0) {
-            return;
-        }    
-        $ih = IntrospectionHelper::getHelper(get_class($target));
-        $text = self::replaceProperties($project, $text, $project->getProperties());
-        $ih->addText($project, $target, $text);
-    }
-
-    /**
-     * Stores a configured child element into its parent object
-     *
-     * @param  object  the project this element belongs to
-     * @param  object  the parent element
-     * @param  object  the child element
-     * @param  string  the XML tagname
-     * @access public
-     */
-    public static function storeChild($project, $parent, $child, $tag) {
-        $ih = IntrospectionHelper::getHelper(get_class($parent));
-        $ih->storeElement($project, $parent, $child, $tag);
-    }
-
-    // The following two properties are a sort of hack
-    // to enable a static function to serve as the callback
-    // for preg_replace_callback().  Clearly we cannot use object
-    // variables, since the replaceProperties() is called statically.
-    // This is IMO better than using global variables in the callback.
-    
-    private static $propReplaceProject;
-    private static $propReplaceProperties;
-         
-    /**
-     * Replace ${} style constructions in the given value with the
-     * string value of the corresponding data types. This method is
-     * static.
-     *
-     * @param  object  the project that should be used for property look-ups
-     * @param  string  the string to be scanned for property references
-     * @param  array   proeprty keys
-     * @return string  the replaced string or <code>null</code> if the string
-     *                 itself was null
-     */
-    public static function replaceProperties(Project $project, $value, $keys) {
-        
-        if ($value === null) {
-            return null;
-        }
-        
-        // These are a "hack" to support static callback for preg_replace_callback()
-        
-        // make sure these get initialized every time        
-        self::$propReplaceProperties = $keys;
-        self::$propReplaceProject = $project;
-        
-        // Because we're not doing anything special (like multiple passes),
-        // regex is the simplest / fastest.  PropertyTask, though, uses
-        // the old parsePropertyString() method, since it has more stringent
-        // requirements.
-        
-        $sb = preg_replace_callback('/\$\{([^}]+)\}/', array('ProjectConfigurator', 'replacePropertyCallback'), $value);
-        return $sb;        
-    }
-    
-    /**
-     * Private [static] function for use by preg_replace_callback to replace a single param.
-     * This method makes use of a static variable to hold the 
-     */
-    private static function replacePropertyCallback($matches)
-    {
-        $propertyName = $matches[1];
-        if (!isset(self::$propReplaceProperties[$propertyName])) {
-                    self::$propReplaceProject->log('Property ${'.$propertyName.'} has not been set.', Project::MSG_VERBOSE);
-                    return $matches[0];
-        } else {
-			self::$propReplaceProject->log('Property ${'.$propertyName.'} => ' . self::$propReplaceProperties[$propertyName], Project::MSG_DEBUG);
-		}
-        return self::$propReplaceProperties[$propertyName];
-    }           
-
-    /**
-     * Scan Attributes for the id attribute and maybe add a reference to
-     * project.
-     *
-     * @param object the element's object
-     * @param array  the element's attributes
-     */
-    public function configureId($target, $attr) {
-        if (isset($attr['id']) && $attr['id'] !== null) {
-            $this->project->addReference($attr['id'], $target);
-        }
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/ProjectHandler.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/ProjectHandler.php
deleted file mode 100644
index 22e961f87..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/ProjectHandler.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-/*
- * $Id: ProjectHandler.php 132 2007-01-25 19:38:05Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/parser/AbstractHandler.php';
-require_once 'phing/system/io/PhingFile.php';
-
-/**
- * Handler class for the <project> XML element This class handles all elements
- * under the <project> element.
- *
- * @author      Andreas Aderhold <andi@binarycloud.com>
- * @copyright (c) 2001,2002 THYRELL. All rights reserved
- * @version   $Revision: 1.14 $ $Date: 2007-01-26 04:38:05 +0900 (金, 26  1月 2007) $
- * @access    public
- * @package   phing.parser
- */
-class ProjectHandler extends AbstractHandler {
-
-    /**
-     * The phing project configurator object.
-     * @var ProjectConfigurator
-     */
-    private $configurator;
-
-    /**
-     * Constructs a new ProjectHandler
-     *
-     * @param  object  the ExpatParser object
-     * @param  object  the parent handler that invoked this handler
-     * @param  object  the ProjectConfigurator object
-     * @access public
-     */
-    function __construct($parser, $parentHandler, $configurator) {
-        $this->configurator = $configurator;
-        parent::__construct($parser, $parentHandler);
-    }
-
-    /**
-     * Executes initialization actions required to setup the project. Usually
-     * this method handles the attributes of a tag.
-     *
-     * @param  string  the tag that comes in
-     * @param  array   attributes the tag carries
-     * @param  object  the ProjectConfigurator object
-     * @throws ExpatParseException if attributes are incomplete or invalid
-     * @access public
-     */
-    function init($tag, $attrs) {
-        $def = null;
-        $name = null;
-        $id    = null;
-        $desc = null;
-        $baseDir = null;
-
-        // some shorthands
-        $project = $this->configurator->project;
-        $buildFileParent = $this->configurator->buildFileParent;
-
-        foreach ($attrs as $key => $value) {
-            if ($key === "default") {
-                $def = $value;
-            } elseif ($key === "name") {
-                $name = $value;
-            } elseif ($key === "id") {
-                $id = $value;
-            } elseif ($key === "basedir") {
-                $baseDir = $value;
-            } elseif ($key === "description") {
-                $desc = $value;
-            } else {
-                throw new ExpatParseException("Unexpected attribute '$key'");
-            }
-        }
-        if ($def === null) {
-            throw new ExpatParseException("The default attribute of project is required");
-        }
-        $project->setDefaultTarget($def);
-
-        if ($name !== null) {
-            $project->setName($name);
-            $project->addReference($name, $project);
-        }
-
-        if ($id !== null) {
-            $project->addReference($id, $project);
-        }
-        
-        if ($desc !== null) {
-            $project->setDescription($desc);
-        }        
-
-        if ($project->getProperty("project.basedir") !== null) {
-            $project->setBasedir($project->getProperty("project.basedir"));
-        } else {
-            if ($baseDir === null) {
-                $project->setBasedir($buildFileParent->getAbsolutePath());
-            } else {
-                // check whether the user has specified an absolute path
-                $f = new PhingFile($baseDir);
-                if ($f->isAbsolute()) {
-                    $project->setBasedir($baseDir);
-                } else {
-                    $project->setBaseDir($project->resolveFile($baseDir, $buildFileParent));
-                }
-            }
-        }
-    }
-
-    /**
-     * Handles start elements within the <project> tag by creating and
-     * calling the required handlers for the detected element.
-     *
-     * @param  string  the tag that comes in
-     * @param  array   attributes the tag carries
-     * @throws ExpatParseException if a unxepected element occurs
-     * @access public
-     */
-    function startElement($name, $attrs) {
-    
-		$project = $this->configurator->project;
-        $types = $project->getDataTypeDefinitions();
-		
-		if ($name == "target") {
-			$tf = new TargetHandler($this->parser, $this, $this->configurator);
-			$tf->init($name, $attrs);
-		} elseif (isset($types[$name])) {
-           $tyf = new DataTypeHandler($this->parser, $this, $this->configurator);
-           $tyf->init($name, $attrs);
-        } else {
-			$tf = new TaskHandler($this->parser, $this, $this->configurator);
-			$tf->init($name, $attrs);
-        }
-    }
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/RootHandler.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/RootHandler.php
deleted file mode 100644
index 80ca04560..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/RootHandler.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/*
- *  $Id: RootHandler.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/parser/AbstractHandler.php';
-include_once 'phing/parser/ExpatParseException.php';
-include_once 'phing/parser/ProjectHandler.php';
-
-/**
- * Root filter class for a phing buildfile.
- *
- * The root filter is called by the parser first. This is where the phing
- * specific parsing starts. RootHandler decides what to do next.
- *
- * @author    Andreas Aderhold <andi@binarycloud.com>
- * @copyright � 2001,2002 THYRELL. All rights reserved
- * @version   $Revision: 1.7 $
- * @package   phing.parser
- */
-class RootHandler extends AbstractHandler {
-
-    /**
-     * The phing project configurator object
-     */
-    private $configurator;
-
-    /**
-     * Constructs a new RootHandler
-     *
-     * The root filter is required so the parser knows what to do. It's
-     * called by the ExpatParser that is instatiated in ProjectConfigurator.
-     *
-     * It recieves the expat parse object ref and a reference to the
-     * configurator
-     *
-     * @param AbstractSAXParser $parser The ExpatParser object.
-     * @param ProjectConfigurator $configurator The ProjectConfigurator object.
-     */
-    function __construct(AbstractSAXParser $parser, ProjectConfigurator $configurator) {
-        $this->configurator = $configurator;
-        parent::__construct($parser, $this);
-    }
-
-    /**
-     * Kick off a custom action for a start element tag.
-     *
-     * The root element of our buildfile is the &lt;project&gt; element. The
-     * root filter handles this element if it occurs, creates ProjectHandler 
-     * to handle any nested tags & attributes of the &lt;project&gt; tag,
-     * and calls init.
-     *
-     * @param string $tag The xml tagname
-     * @param array  $attrs The attributes of the tag
-     * @throws ExpatParseException if the first element within our build file
-     *         is not the &gt;project&lt; element
-     */
-    function startElement($tag, $attrs) {
-        if ($tag === "project") {
-            $ph = new ProjectHandler($this->parser, $this, $this->configurator);
-            $ph->init($tag, $attrs);
-        } else {
-            throw new ExpatParseException("Unexpected tag <$tag> in top-level of build file.", $this->parser->getLocation());
-        }
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/TargetHandler.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/TargetHandler.php
deleted file mode 100644
index 733150312..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/TargetHandler.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/*
- * $Id: TargetHandler.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-require_once 'phing/parser/AbstractHandler.php';
-
-/**
- * The target handler class.
- *
- * This class handles the occurance of a <target> tag and it's possible
- * nested tags (datatypes and tasks).
- *
- * @author    Andreas Aderhold <andi@binarycloud.com>
- * @copyright  2001,2002 THYRELL. All rights reserved
- * @version   $Revision: 1.10 $
- * @package   phing.parser
- */
-class TargetHandler extends AbstractHandler {
-
-    /**
-     * Reference to the target object that represents the currently parsed
-     * target.
-     * @var object the target instance
-     */
-    private $target;
-
-    /**
-     * The phing project configurator object
-     * @var ProjectConfigurator
-     */
-    private $configurator;
-
-    /**
-     * Constructs a new TargetHandler
-     *
-     * @param  object  the ExpatParser object
-     * @param  object  the parent handler that invoked this handler
-     * @param  object  the ProjectConfigurator object
-     */
-    function __construct(AbstractSAXParser $parser, AbstractHandler $parentHandler, ProjectConfigurator $configurator) {
-        parent::__construct($parser, $parentHandler);
-        $this->configurator = $configurator;      
-    }
-
-    /**
-     * Executes initialization actions required to setup the data structures
-     * related to the tag.
-     * <p>
-     * This includes:
-     * <ul>
-     * <li>creation of the target object</li>
-     * <li>calling the setters for attributes</li>
-     * <li>adding the target to the project</li>
-     * <li>adding a reference to the target (if id attribute is given)</li>
-     * </ul>
-     *
-     * @param  string  the tag that comes in
-     * @param  array   attributes the tag carries
-     * @throws ExpatParseException if attributes are incomplete or invalid
-     */
-    function init($tag, $attrs) {
-        $name = null;
-        $depends = "";
-        $ifCond = null;
-        $unlessCond = null;
-        $id = null;
-        $description = null;
-
-        foreach($attrs as $key => $value) {
-            if ($key==="name") {
-                $name = (string) $value;
-            } else if ($key==="depends") {
-                $depends = (string) $value;
-            } else if ($key==="if") {
-                $ifCond = (string) $value;
-            } else if ($key==="unless") {
-                $unlessCond = (string) $value;
-            } else if ($key==="id") {
-                $id = (string) $value;
-            } else if ($key==="description") {
-                $description = (string)$value;
-            } else {
-                throw new ExpatParseException("Unexpected attribute '$key'", $this->parser->getLocation());
-            }
-        }
-
-        if ($name === null) {
-            throw new ExpatParseException("target element appears without a name attribute",  $this->parser->getLocation());
-        }
-
-        // shorthand
-        $project = $this->configurator->project;
-
-        $this->target = new Target();
-        $this->target->setName($name);
-        $this->target->setIf($ifCond);
-        $this->target->setUnless($unlessCond);
-        $this->target->setDescription($description);
-
-        $project->addTarget($name, $this->target);
-
-        if ($id !== null && $id !== "") {
-            $project->addReference($id, $this->target);
-        }
-        // take care of dependencies
-        if (strlen($depends) > 0) {
-            $this->target->setDepends($depends);
-        }
-
-    }
-
-    /**
-     * Checks for nested tags within the current one. Creates and calls
-     * handlers respectively.
-     *
-     * @param  string  the tag that comes in
-     * @param  array   attributes the tag carries
-     */
-    function startElement($name, $attrs) {
-        // shorthands
-        $project = $this->configurator->project;
-        $types = $project->getDataTypeDefinitions();
-
-        if (isset($types[$name])) {
-            $th = new DataTypeHandler($this->parser, $this, $this->configurator, $this->target);
-            $th->init($name, $attrs);
-        } else {
-            $tmp = new TaskHandler($this->parser, $this, $this->configurator, $this->target, null, $this->target);
-            $tmp->init($name, $attrs);
-        }
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/TaskHandler.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/TaskHandler.php
deleted file mode 100644
index 772295253..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/parser/TaskHandler.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-/*
- *  $Id: TaskHandler.php 147 2007-02-06 20:32:22Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-include_once 'phing/UnknownElement.php';
-
-/**
- * The task handler class.
- *
- * This class handles the occurance of a <task> tag and it's possible
- * nested tags (datatypes and tasks) that may be unknown off bat and are
- * initialized on the fly.
- *
- * @author      Andreas Aderhold <andi@binarycloud.com>
- * @copyright � 2001,2002 THYRELL. All rights reserved
- * @version   $Revision: 1.10 $
- * @package   phing.parser
- */
-class TaskHandler extends AbstractHandler {
-
-    /**
-     * Reference to the target object that contains the currently parsed
-     * task
-     * @var object the target instance
-     */
-    private $target;
-
-    /**
-     * Reference to the target object that represents the currently parsed
-     * target. This must not necessarily be a target, hence extra variable.
-     * @var object the target instance
-     */
-    private $container;
-
-    /**
-     * Reference to the task object that represents the currently parsed
-     * target.
-     * @var Task
-     */
-    private $task;
-	
-	/**
- 	 * Wrapper for the parent element, if any. The wrapper for this
-	 * element will be added to this wrapper as a child.
-	 * @var RuntimeConfigurable
-	 */
-	private $parentWrapper;
-	
-	/**
-	 * Wrapper for this element which takes care of actually configuring
-	 * the element, if this element is contained within a target.
-	 * Otherwise the configuration is performed with the configure method.
-	 * @see ProjectHelper::configure(Object,AttributeList,Project)
-	 */
-    private $wrapper;
-
-    /**
-     * The phing project configurator object
-     * @var ProjectConfigurator
-     */
-    private $configurator;
-
-    /**
-     * Constructs a new TaskHandler and sets up everything.
-     *
-     * @param AbstractSAXParser The ExpatParser object
-     * @param object $parentHandler The parent handler that invoked this handler
-     * @param ProjectConfigurator $configurator
-     * @param TaskContainer $container The container object this task is contained in (null for top-level tasks).
-	 * @param RuntimeConfigurable $parentWrapper  Wrapper for the parent element, if any.
-     * @param Target $target The target object this task is contained in (null for top-level tasks).
-     */
-    function __construct(AbstractSAXParser $parser, $parentHandler, ProjectConfigurator $configurator, $container = null, $parentWrapper = null, $target = null) {
-        
-        parent::__construct($parser, $parentHandler);
-    
-        if (($container !== null) && !($container instanceof TaskContainer)) {
-            throw new Exception("Argument expected to be a TaskContainer, got something else");
-        }
-		if (($parentWrapper !== null) && !($parentWrapper instanceof RuntimeConfigurable)) {
-            throw new Exception("Argument expected to be a RuntimeConfigurable, got something else.");
-        }
-        if (($target !== null) && !($target instanceof Target)) {
-            throw new Exception("Argument expected to be a Target, got something else");
-        }
-
-		$this->configurator = $configurator;
-        $this->container = $container;
-		$this->parentWrapper = $parentWrapper;
-        $this->target = $target;
-    }
-
-    /**
-     * Executes initialization actions required to setup the data structures
-     * related to the tag.
-     * <p>
-     * This includes:
-     * <ul>
-     * <li>creation of the task object</li>
-     * <li>calling the setters for attributes</li>
-     * <li>adding the task to the container object</li>
-     * <li>adding a reference to the task (if id attribute is given)</li>
-     * <li>executing the task if the container is the &lt;project&gt;
-     * element</li>
-     * </ul>
-     *
-     * @param string $tag The tag that comes in
-     * @param array $attrs Attributes the tag carries
-     * @throws ExpatParseException if attributes are incomplete or invalid
-     */
-    function init($tag, $attrs) {
-        // shorthands
-        try {
-            $configurator = $this->configurator;
-            $project = $this->configurator->project;
-            
-            $this->task = $project->createTask($tag);
-        } catch (BuildException $be) {
-            // swallow here, will be thrown again in
-            // UnknownElement->maybeConfigure if the problem persists.
-            print("Swallowing exception: ".$be->getMessage() . "\n");
-        }
-
-        // the task is not known of bat, try to load it on thy fly
-        if ($this->task === null) {
-            $this->task = new UnknownElement($tag);
-            $this->task->setProject($project);
-            $this->task->setTaskType($tag);
-            $this->task->setTaskName($tag);
-        }
-
-        // add file position information to the task (from parser)
-        // should be used in task exceptions to provide details
-        $this->task->setLocation($this->parser->getLocation());
-        $configurator->configureId($this->task, $attrs);
-		
-		if ($this->container) {
-			$this->container->addTask($this->task);
-		}
-		
-        // Top level tasks don't have associated targets
-		// FIXME: if we do like Ant 1.6 and create an implicitTarget in the projectconfigurator object
-		// then we don't need to check for null here ... but there's a lot of stuff that will break if we
-		// do that at this point.
-        if ($this->target !== null) {
-            $this->task->setOwningTarget($this->target);
-            $this->task->init();
-            $this->wrapper = $this->task->getRuntimeConfigurableWrapper();
-            $this->wrapper->setAttributes($attrs);
-            /*
-			Commenting this out as per thread on Premature configurate of ReuntimeConfigurables 
-            with Matthias Pigulla: http://phing.tigris.org/servlets/ReadMsg?list=dev&msgNo=251
-            
-			if ($this->parentWrapper !== null) { // this may not make sense only within this if-block, but it
-												// seems to address current use cases adequately
-		    	$this->parentWrapper->addChild($this->wrapper);
-			}
-			*/
-        } else {
-            $this->task->init();
-            $configurator->configure($this->task, $attrs, $project);
-        }
-    }
-
-    /**
-     * Executes the task at once if it's directly beneath the <project> tag.
-     */
-    protected function finished() {
-        if ($this->task !== null && $this->target === null && $this->container === null) {
-            try {
-                $this->task->perform();
-            } catch (Exception $e) {
-                $this->task->log($e->getMessage(), Project::MSG_ERR);
-                throw $e;
-            }
-        }
-    }
-
-    /**
-     * Handles character data.
-     *
-     * @param string $data The CDATA that comes in
-     */
-    function characters($data) {
-        if ($this->wrapper === null) {
-            $configurator = $this->configurator;
-            $project = $this->configurator->project;
-            try { // try
-                $configurator->addText($project, $this->task, $data);
-            } catch (BuildException $exc) {
-                throw new ExpatParseException($exc->getMessage(), $this->parser->getLocation());
-            }
-        } else {
-            $this->wrapper->addText($data);
-        }
-    }
-
-    /**
-     * Checks for nested tags within the current one. Creates and calls
-     * handlers respectively.
-     *
-     * @param string $name The tag that comes in
-     * @param array $attrs Attributes the tag carries
-     */
-    function startElement($name, $attrs) {
-        $project = $this->configurator->project;
-        if ($this->task instanceof TaskContainer) {
-            //print("TaskHandler::startElement() (TaskContainer) name = $name, attrs = " . implode(",",$attrs) . "\n");
-            $th = new TaskHandler($this->parser, $this, $this->configurator, $this->task, $this->wrapper, $this->target);
-            $th->init($name, $attrs);
-        } else {
-            //print("TaskHandler::startElement() name = $name, attrs = " . implode(",",$attrs) . "\n");
-            $tmp = new NestedElementHandler($this->parser, $this, $this->configurator, $this->task, $this->wrapper, $this->target);
-            $tmp->init($name, $attrs);
-        }
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/BufferedReader.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/BufferedReader.php
deleted file mode 100644
index 990880656..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/BufferedReader.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-/*
- *  $Id: BufferedReader.php 227 2007-08-28 02:17:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-include_once 'phing/system/io/Reader.php';
-
-/*
- * Convenience class for reading files.
- *
- * @author    <a href="mailto:yl@seasonfive.com">Yannick Lecaillez</a>
- * @version   $Revision: 1.6 $ $Date: 2007-08-28 11:17:00 +0900 (火, 28  8月 2007) $
- * @access    public
- * @see       FilterReader
- * @package   phing.system.io
-*/
-class BufferedReader extends Reader {
-
-    private $bufferSize = 0;
-    private $buffer     = null;
-    private $bufferPos  = 0;
-    
-    /**
-     * The Reader we are buffering for.
-     */
-    private $in;
-    
-    /**
-     * 
-     * @param object $reader The reader (e.g. FileReader).
-     * @param integer $buffsize The size of the buffer we should use for reading files.
-     *                             A large buffer ensures that most files (all scripts?) are parsed in 1 buffer.
-     */     
-    function __construct(Reader $reader, $buffsize = 65536) {
-        $this->in = $reader;
-        $this->bufferSize = $buffsize;
-    }
-
-    /**
-     * Reads and returns a chunk of data.
-     * @param int $len Number of bytes to read.  Default is to read configured buffer size number of bytes.
-     * @return mixed buffer or -1 if EOF.
-     */
-    function read($len = null) {
-        
-    	// if $len is specified, we'll use that; otherwise, use the configured buffer size.
-    	if ($len === null) $len = $this->bufferSize; 
-        
-        if ( ($data = $this->in->read($len)) !== -1 ) {
-		
-			// not all files end with a newline character, so we also need to check EOF
-			if (!$this->in->eof()) {
-			
-	            $notValidPart = strrchr($data, "\n");
-	            $notValidPartSize = strlen($notValidPart);
-	        
-	            if ( $notValidPartSize > 1 ) {
-	                // Block doesn't finish on a EOL
-	                // Find the last EOL and forget all following stuff
-	                $dataSize = strlen($data);
-	                $validSize = $dataSize - $notValidPartSize + 1;
-	            
-	                $data = substr($data, 0, $validSize);
-	
-	                // Rewind to the begining of the forgotten stuff.
-	                $this->in->skip(-$notValidPartSize+1);
-	            }
-				
-			} // if !EOF
-        }
-        return $data;
-    }
-    
-    function skip($n) {
-        return $this->in->skip($n);
-    }
-    
-    function reset() {
-        return $this->in->reset();
-    }
-    
-    function close() {
-        return $this->in->close();
-    }
-    
-    function open() {
-        return $this->in->open();
-    }
-    
-    /**
-     * Read a line from input stream.
-     */
-    function readLine() {
-        $line = null;
-        while ( ($ch = $this->readChar()) !== -1 ) {
-            if ( $ch === "\n" ) {
-                break;
-            }
-            $line .= $ch;
-        }
-
-        // Warning : Not considering an empty line as an EOF
-        if ( $line === null && $ch !== -1 )
-            return "";
-
-        return $line;
-    }
-    
-    /**
-     * Reads a single char from the reader.
-     * @return string single char or -1 if EOF.
-     */
-    function readChar() {        
-
-        if ( $this->buffer === null ) {
-            // Buffer is empty, fill it ...
-            $read = $this->in->read($this->bufferSize);
-            if ($read === -1) {
-                $ch = -1;
-            } else {
-                $this->buffer = $read;
-                return $this->readChar(); // recurse
-            }
-        } else {            
-            // Get next buffered char ...
-            // handle case where buffer is read-in, but is empty.  The next readChar() will return -1 EOF,
-            // so we just return empty string (char) at this point.  (Probably could also return -1 ...?)
-            $ch = ($this->buffer !== "") ? $this->buffer{$this->bufferPos} : '';
-            $this->bufferPos++;
-            if ( $this->bufferPos >= strlen($this->buffer) ) {
-                $this->buffer = null;
-                $this->bufferPos = 0;
-            }
-        }
-
-        return $ch;
-    }
-    
-    /**
-     * Returns whether eof has been reached in stream.
-     * This is important, because filters may want to know if the end of the file (and not just buffer)
-     * has been reached.
-     * @return boolean
-     */ 
-    function eof() {
-        return $this->in->eof();
-    }
-
-    function getResource() {
-        return $this->in->getResource();
-    }    
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/BufferedWriter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/BufferedWriter.php
deleted file mode 100644
index 999c4bfc3..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/BufferedWriter.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/*
- *  $Id: BufferedWriter.php 227 2007-08-28 02:17:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
- 
-include_once 'phing/system/io/Writer.php';
-
-/**
- * Convenience class for writing files.
- *
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.10 $
- * @package   phing.system.io 
- */
-class BufferedWriter extends Writer {
-    
-    /**
-     * The size of the buffer in kb.
-     */
-    private $bufferSize    = 0;
-    
-    /**
-     * @var Writer The Writer we are buffering output to.
-     */
-    private $out;
-
-    public function __construct(Writer $writer, $buffsize = 8192) {
-        $this->out = $writer;
-        $this->bufferSize = $buffsize;
-    }
-
-    public function write($buf, $off = null, $len = null) {
-        return $this->out->write($buf, $off, $len);
-    }
-    
-    public function newLine() {
-        $this->write(PHP_EOL);
-    }
-    
-    public function getResource() {
-        return $this->out->getResource();
-    }
-    
-    public function flush() {
-    	$this->out->flush();
-    }
-	
-    /**
-     * Close attached stream.
-     */
-    public function close() {
-        return $this->out->close();
-    }
-    
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/ConsoleReader.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/ConsoleReader.php
deleted file mode 100644
index 9b81cc7f8..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/ConsoleReader.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/*
- *  $Id: ConsoleReader.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
- 
-include_once 'phing/system/io/Reader.php';
-
-/**
- * Convenience class for reading console input.
- * 
- * @author Hans Lellelid <hans@xmpl.org>
- * @author Matthew Hershberger <matthewh@lightsp.com>
- * @version $Revision: 1.4 $
- * @package phing.system.io
- */
-class ConsoleReader extends Reader {
-    
-    function readLine() {
-        
-        $out = fgets(STDIN); // note: default maxlen is 1kb
-        $out = rtrim($out);
-
-        return $out;
-    }
-    
-    /**
-     * 
-     * @param int $len Num chars to read.
-     * @return string chars read or -1 if eof.
-     */
-    function read($len = null) {
-        
-        $out = fread(STDIN, $len);
-        
-        
-        return $out;
-        // FIXME
-        // read by chars doesn't work (yet?) with PHP stdin.  Maybe
-        // this is just a language feature, maybe there's a way to get
-        // ability to read chars w/o <enter> ?
-        
-    }   
-        
-    function close() {
-		// STDIN is always open
-    }
-
-    function open() {
-		// STDIN is always open
-    }
-
-    /**
-     * Whether eof has been reached with stream.
-     * @return boolean
-     */
-    function eof() {
-        return feof(STDIN);
-    }        
-    
-    /**
-     * Returns path to file we are reading.
-     * @return string
-     */
-    function getResource() {
-        return "console";
-    }
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/FileInputStream.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/FileInputStream.php
deleted file mode 100644
index 151578984..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/FileInputStream.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/*
- *  $Id: FileWriter.php 123 2006-09-14 20:19:08Z mrook $  
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/system/io/InputStream.php';
-require_once 'phing/system/io/PhingFile.php';
-
-/**
- * Input stream subclass for file streams.
- * 
- * @package   phing.system.io
- */
-class FileInputStream extends InputStream {
-	
-	/**
-	 * @var PhingFile The associated file.
-	 */
-	protected $file;
-	
-    /**
-     * Construct a new FileInputStream.
-     * @param mixed $file
-     * @throws Exception - if invalid argument specified.
-     * @throws IOException - if unable to open file.
-     */
-    public function __construct($file, $append = false) {
-    	if ($file instanceof PhingFile) {
-            $this->file = $file;
-        } elseif (is_string($file)) {
-            $this->file = new PhingFile($file);
-        } else {
-            throw new Exception("Invalid argument type for \$file.");
-        }
-        
-        $stream = @fopen($this->file->getAbsolutePath(), "rb");
-        if ($stream === false) {
-        	throw new IOException("Unable to open " . $this->file->__toString() . " for reading: " . $php_errormsg);
-        }
-        
-        parent::__construct($stream);
-    }
-    
-    /**
-     * Returns a string representation of the attached file.
-     * @return string
-     */
-    public function __toString() {
-        return $this->file->getPath();
-    }
-    
-    /**
-     * Mark is supported by FileInputStream.
-     * @return boolean TRUE
-     */
-	public function markSupported() {
-        return true;
-    }
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/FileOutputStream.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/FileOutputStream.php
deleted file mode 100644
index be3180459..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/FileOutputStream.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/*
- *  $Id: FileWriter.php 123 2006-09-14 20:19:08Z mrook $  
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/system/io/OutputStream.php';
-require_once 'phing/system/io/PhingFile.php';
-
-/**
- * Output stream subclass for file streams.
- * 
- * @package   phing.system.io
- */
-class FileOutputStream extends OutputStream {
-	
-	/**
-	 * @var PhingFile The associated file.
-	 */
-	protected $file;
-	
-    /**
-     * Construct a new FileOutputStream.
-     * @param mixed $file
-     * @param boolean $append Whether to append bytes to end of file rather than beginning.
-     * @throws Exception - if invalid argument specified.
-     * @throws IOException - if unable to open file.
-     */
-    public function __construct($file, $append = false) {
-    	if ($file instanceof PhingFile) {
-            $this->file = $file;
-        } elseif (is_string($file)) {
-            $this->file = new PhingFile($file);
-        } else {
-            throw new Exception("Invalid argument type for \$file.");
-        }
-        if ($append) {
-        	$stream = @fopen($this->file->getAbsolutePath(), "ab");
-        } else {
-        	$stream = @fopen($this->file->getAbsolutePath(), "wb");
-        }
-        if ($stream === false) {
-        	throw new IOException("Unable to open " . $this->file->__toString() . " for writing: " . $php_errormsg);
-        }
-        parent::__construct($stream);
-    }
-    
-    /**
-     * Returns a string representation of the attached file.
-     * @return string
-     */
-    public function __toString() {
-        return $this->file->getPath();
-    }
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/FileReader.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/FileReader.php
deleted file mode 100644
index 4f8b2cd69..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/FileReader.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/*
- *  $Id: FileReader.php 227 2007-08-28 02:17:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-require_once 'phing/system/io/InputStreamReader.php';
-require_once 'phing/system/io/FileInputStream.php';
-
-/**
- * Convenience class for reading files.
- * @package   phing.system.io
- */
-class FileReader extends InputStreamReader {
-
-	/**
-     * Construct a new FileReader.
-     * @param mixed $file PhingFile or string pathname.
-     */
-    public function __construct($file) {
-    	$in = new FileInputStream($file);
-    	parent::__construct($in);
-    }
-        
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/FileSystem.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/FileSystem.php
deleted file mode 100644
index 8e9c78c6c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/FileSystem.php
+++ /dev/null
@@ -1,686 +0,0 @@
-<?php
-
-/* 
- *  $Id: FileSystem.php 362 2008-03-08 10:07:53Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-/**
- * This is an abstract class for platform specific filesystem implementations
- * you have to implement each method in the platform specific filesystem implementation
- * classes Your local filesytem implementation must extend this class.
- * You should also use this class as a template to write your local implementation
- * Some native PHP filesystem specific methods are abstracted here as well. Anyway
- * you _must_ always use this methods via a PhingFile object (that by nature uses the
- * *FileSystem drivers to access the real filesystem via this class using natives.
- *
- * FIXME:
- *  - Error handling reduced to min fallthrough runtime excetions
- *    more precise errorhandling is done by the PhingFile class
- *    
- * @author Charlie Killian <charlie@tizac.com>
- * @author Hans Lellelid <hans@xmpl.org>
- * @version $Revision: 1.11 $
- * @package phing.system.io
- */
-abstract class FileSystem {    
-
-    /* properties for simple boolean attributes */
-    const BA_EXISTS    = 0x01;
-    const BA_REGULAR   = 0x02;
-    const BA_DIRECTORY = 0x04;
-    const BA_HIDDEN    = 0x08;
-    
-    /** Instance for getFileSystem() method. */
-    private static $fs;
-    
-    /**
-     * Static method to return the FileSystem singelton representing
-     * this platform's local filesystem driver.
-     * @return FileSystem
-     */
-    public static function getFileSystem() {
-        if (self::$fs === null) {
-            switch(Phing::getProperty('host.fstype')) {
-                case 'UNIX':
-                    include_once 'phing/system/io/UnixFileSystem.php';
-                    self::$fs = new UnixFileSystem();
-                break;
-                case 'WIN32':
-                    include_once 'phing/system/io/Win32FileSystem.php';
-                    self::$fs = new Win32FileSystem();
-                break;
-                case 'WINNT':
-                    include_once 'phing/system/io/WinNTFileSystem.php';
-                    self::$fs = new WinNTFileSystem();
-                break;
-                default:
-                    throw new Exception("Host uses unsupported filesystem, unable to proceed");
-            }
-        }
-        return self::$fs;
-    }
-
-    /* -- Normalization and construction -- */
-
-    /**
-     * Return the local filesystem's name-separator character.
-     */
-    abstract function getSeparator();
-
-    /**
-     * Return the local filesystem's path-separator character.
-     */
-    abstract function getPathSeparator();
-
-    /**
-     * Convert the given pathname string to normal form.  If the string is
-     * already in normal form then it is simply returned.
-     */
-    abstract function normalize($strPath);
-
-    /**
-     * Compute the length of this pathname string's prefix.  The pathname
-     * string must be in normal form.
-     */
-    abstract function prefixLength($pathname);
-
-    /**
-     * Resolve the child pathname string against the parent.
-     * Both strings must be in normal form, and the result
-     * will be a string in normal form.
-     */
-    abstract function resolve($parent, $child);
-    
-    /**
-     * Resolve the given abstract pathname into absolute form.  Invoked by the
-     * getAbsolutePath and getCanonicalPath methods in the PhingFile class.
-     */
-    abstract function resolveFile(PhingFile $f);
-
-    /**
-     * Return the parent pathname string to be used when the parent-directory
-     * argument in one of the two-argument PhingFile constructors is the empty
-     * pathname.
-     */
-    abstract function getDefaultParent();
-
-    /**
-     * Post-process the given URI path string if necessary.  This is used on
-     * win32, e.g., to transform "/c:/foo" into "c:/foo".  The path string
-     * still has slash separators; code in the PhingFile class will translate them
-     * after this method returns.
-     */
-    abstract function fromURIPath($path);
-    
-    /* -- Path operations -- */
-
-    /**
-     * Tell whether or not the given abstract pathname is absolute.
-     */
-    abstract function isAbsolute(PhingFile $f);
-
-    /** 
-     * canonicalize filename by checking on disk 
-     * @return mixed Canonical path or false if the file doesn't exist.
-     */
-    function canonicalize($strPath) {
-        return @realpath($strPath);        
-    }
-
-    /* -- Attribute accessors -- */
-
-    /**
-     * Return the simple boolean attributes for the file or directory denoted
-     * by the given abstract pathname, or zero if it does not exist or some
-     * other I/O error occurs.
-     */
-    function getBooleanAttributes($f) {
-        throw new Exception("SYSTEM ERROR method getBooleanAttributes() not implemented by fs driver");
-    }
-
-    /**
-     * Check whether the file or directory denoted by the given abstract
-     * pathname may be accessed by this process.  If the second argument is
-     * false, then a check for read access is made; if the second
-     * argument is true, then a check for write (not read-write)
-     * access is made.  Return false if access is denied or an I/O error
-     * occurs.
-     */
-    function checkAccess(PhingFile $f, $write = false) {
-        // we clear stat cache, its expensive to look up from scratch,
-        // but we need to be sure
-        @clearstatcache();
-
-
-        // Shouldn't this be $f->GetAbsolutePath() ?
-        // And why doesn't GetAbsolutePath() work?
-
-        $strPath = (string) $f->getPath();
-
-        // FIXME
-        // if file object does denote a file that yet not existst
-        // path rights are checked
-        if (!@file_exists($strPath) && !is_dir($strPath)) {
-            $strPath = $f->getParent();
-            if ($strPath === null || !is_dir($strPath)) {
-                $strPath = Phing::getProperty("user.dir");
-            }
-            //$strPath = dirname($strPath);
-        }
-
-        if (!$write) {
-            return (boolean) @is_readable($strPath);
-        } else {
-            return (boolean) @is_writable($strPath);
-        }
-    }
-	
-    /**
-     * Whether file can be deleted.
-     * @param PhingFile $f
-     * @return boolean
-     */
-    function canDelete(PhingFile $f)
-    {
-    	clearstatcache(); 
- 		$dir = dirname($f->getAbsolutePath()); 
- 		return (bool) @is_writable($dir); 
-    }
-    
-    /**
-     * Return the time at which the file or directory denoted by the given
-     * abstract pathname was last modified, or zero if it does not exist or
-     * some other I/O error occurs.
-     */
-    function getLastModifiedTime(PhingFile $f) {
-        
-        if (!$f->exists()) {
-            return 0;
-        }
-
-        @clearstatcache();
-        $strPath = (string) $f->getPath();
-        $mtime = @filemtime($strPath);
-        if (false === $mtime) {
-            // FAILED. Log and return err.
-            $msg = "FileSystem::Filemtime() FAILED. Cannot can not get modified time of $strPath. $php_errormsg";
-            throw new Exception($msg);
-        } else {
-            return (int) $mtime;
-        }
-    }
-
-    /**
-     * Return the length in bytes of the file denoted by the given abstract
-     * pathname, or zero if it does not exist, is a directory, or some other
-     * I/O error occurs.
-     */
-    function getLength(PhingFile $f) {
-        $strPath = (string) $f->getAbsolutePath();
-        $fs = filesize((string) $strPath);
-        if ($fs !== false) {
-            return $fs;
-        } else {
-            $msg = "FileSystem::Read() FAILED. Cannot get filesize of $strPath. $php_errormsg";
-            throw new Exception($msg);
-        }
-    }
-
-    /* -- File operations -- */
-
-    /**
-     * Create a new empty file with the given pathname.  Return
-     * true if the file was created and false if a
-     * file or directory with the given pathname already exists.  Throw an
-     * IOException if an I/O error occurs.
-     *
-     * @param       string      Path of the file to be created.
-     *     
-     * @throws      IOException
-     */
-    function createNewFile($strPathname) {
-        if (@file_exists($strPathname))
-            return false;
-            
-        // Create new file
-        $fp = @fopen($strPathname, "w");
-        if ($fp === false) {
-            throw new IOException("The file \"$strPathname\" could not be created");            
-        }
-        @fclose($fp);        
-        return true;
-    }
-
-    /**
-     * Delete the file or directory denoted by the given abstract pathname,
-     * returning true if and only if the operation succeeds.
-     */
-    function delete(PhingFile $f) {
-        if ($f->isDirectory()) {
-            return $this->rmdir($f->getPath());
-        } else {
-            return $this->unlink($f->getPath());
-        }
-    }
-
-    /**
-     * Arrange for the file or directory denoted by the given abstract
-     * pathname to be deleted when Phing::shutdown is called, returning
-    * true if and only if the operation succeeds.
-     */
-    function deleteOnExit($f) {
-        throw new Exception("deleteOnExit() not implemented by local fs driver");
-    }
-
-    /**
-     * List the elements of the directory denoted by the given abstract
-     * pathname.  Return an array of strings naming the elements of the
-     * directory if successful; otherwise, return <code>null</code>.
-     */
-    function listDir(PhingFile $f) {
-        $strPath = (string) $f->getAbsolutePath();
-        $d = @dir($strPath);
-        if (!$d) {
-            return null;
-        }
-        $list = array();
-        while($entry = $d->read()) {
-            if ($entry != "." && $entry != "..") {
-                array_push($list, $entry);
-            }
-        }
-        $d->close();
-        unset($d);
-        return $list;
-    }
-
-    /**
-     * Create a new directory denoted by the given abstract pathname,
-     * returning true if and only if the operation succeeds.
-     */
-    function createDirectory(&$f) {
-        return @mkdir($f->getAbsolutePath(),0755);
-    }
-
-    /**
-     * Rename the file or directory denoted by the first abstract pathname to
-     * the second abstract pathname, returning true if and only if
-     * the operation succeeds.
-     *
-     * @param PhingFile $f1 abstract source file
-     * @param PhingFile $f2 abstract destination file
-     * @return void    
-     * @throws Exception if rename cannot be performed
-     */
-    function rename(PhingFile $f1, PhingFile $f2) {        
-        // get the canonical paths of the file to rename
-        $src = $f1->getAbsolutePath();
-        $dest = $f2->getAbsolutePath();
-        if (false === @rename($src, $dest)) {
-            $msg = "Rename FAILED. Cannot rename $src to $dest. $php_errormsg";
-            throw new Exception($msg);
-        }
-    }
-
-    /**
-     * Set the last-modified time of the file or directory denoted by the
-     * given abstract pathname returning true if and only if the
-     * operation succeeds.
-     * @return void
-     * @throws Exception
-     */
-    function setLastModifiedTime(PhingFile $f, $time) {        
-        $path = $f->getPath();
-        $success = @touch($path, $time);
-        if (!$success) {
-            throw new Exception("Could not touch '" . $path . "' due to: $php_errormsg");
-        }
-    }
-
-    /**
-     * Mark the file or directory denoted by the given abstract pathname as
-     * read-only, returning <code>true</code> if and only if the operation
-     * succeeds.
-     */
-    function setReadOnly($f) {
-        throw new Exception("setReadonle() not implemented by local fs driver");
-    }
-
-    /* -- Filesystem interface -- */
-
-    /**
-     * List the available filesystem roots, return array of PhingFile objects
-     */
-    function listRoots() {
-        throw new Exception("SYSTEM ERROR [listRoots() not implemented by local fs driver]");
-    }
-
-    /* -- Basic infrastructure -- */
-
-    /**
-     * Compare two abstract pathnames lexicographically.
-     */
-    function compare($f1, $f2) {
-        throw new Exception("SYSTEM ERROR [compare() not implemented by local fs driver]");
-    }
-
-    /**
-     * Copy a file.
-     *
-     * @param PhingFile $src Source path and name file to copy.
-     * @param PhingFile $dest Destination path and name of new file.
-     *
-     * @return void     
-     * @throws Exception if file cannot be copied.
-     */
-    function copy(PhingFile $src, PhingFile $dest) {
-        global $php_errormsg;
-        $srcPath  = $src->getAbsolutePath();
-        $destPath = $dest->getAbsolutePath();
-
-        if (false === @copy($srcPath, $destPath)) { // Copy FAILED. Log and return err.
-            // Add error from php to end of log message. $php_errormsg.
-            $msg = "FileSystem::copy() FAILED. Cannot copy $srcPath to $destPath. $php_errormsg";
-            throw new Exception($msg);
-        }
-        
-        try {
-            $dest->setMode($src->getMode());
-        } catch(Exception $exc) {
-            // [MA] does chmod returns an error on systems that do not support it ?
-            // eat it up for now.
-        }
-    }
-
-	/**
-	 * Change the ownership on a file or directory.
-	 *
-	 * @param    string $pathname Path and name of file or directory.
-	 * @param    string $user The user name or number of the file or directory. See http://us.php.net/chown
-	 *
-	 * @return void
-	 * @throws Exception if operation failed.
-	 */
-	function chown($pathname, $user) {
-		if (false === @chown($pathname, $user)) {// FAILED.
-			$msg = "FileSystem::chown() FAILED. Cannot chown $pathname. User $user." . (isset($php_errormsg) ? ' ' . $php_errormsg : "");
-			throw new Exception($msg);
-		}
-    }
-    
-    /**
-     * Change the permissions on a file or directory.
-     *
-     * @param    pathname    String. Path and name of file or directory.
-     * @param    mode        Int. The mode (permissions) of the file or
-     *                        directory. If using octal add leading 0. eg. 0777.
-     *                        Mode is affected by the umask system setting.
-     *
-     * @return void     
-     * @throws Exception if operation failed.
-     */
-    function chmod($pathname, $mode) {    
-        $str_mode = decoct($mode); // Show octal in messages.    
-        if (false === @chmod($pathname, $mode)) {// FAILED.
-            $msg = "FileSystem::chmod() FAILED. Cannot chmod $pathname. Mode $str_mode." . (isset($php_errormsg) ? ' ' . $php_errormsg : "");
-            throw new Exception($msg);
-        }
-    }
-
-    /**
-     * Locks a file and throws an Exception if this is not possible.
-     * @return void
-     * @throws Exception
-     */
-    function lock(PhingFile $f) {
-        $filename = $f->getPath();
-        $fp = @fopen($filename, "w");
-        $result = @flock($fp, LOCK_EX);
-        @fclose($fp);
-        if (!$result) {
-            throw new Exception("Could not lock file '$filename'");
-        }
-    }
-
-    /**
-     * Unlocks a file and throws an IO Error if this is not possible.
-     *
-     * @throws Exception
-     * @return void
-     */
-    function unlock(PhingFile $f) {
-        $filename = $f->getPath();
-        $fp = @fopen($filename, "w");
-        $result = @flock($fp, LOCK_UN);
-        fclose($fp);
-        if (!$result) {
-            throw new Exception("Could not unlock file '$filename'");
-        }
-    }
-
-    /**
-     * Delete a file.
-     *
-     * @param    file    String. Path and/or name of file to delete.
-     *
-     * @return void
-     * @throws Exception - if an error is encountered.
-     */
-    function unlink($file) {
-        global $php_errormsg;
-        if (false === @unlink($file)) {
-            $msg = "FileSystem::unlink() FAILED. Cannot unlink '$file'. $php_errormsg";
-            throw new Exception($msg);
-        }
-    }
-
-    /**
-     * Symbolically link a file to another name.
-     * 
-     * Currently symlink is not implemented on Windows. Don't use if the application is to be portable.
-     *
-     * @param string $target Path and/or name of file to link.
-     * @param string $link Path and/or name of link to be created.
-     * @return void
-     */
-    function symlink($target, $link) {
-    
-        // If Windows OS then symlink() will report it is not supported in
-        // the build. Use this error instead of checking for Windows as the OS.
-
-        if (false === @symlink($target, $link)) {
-            // Add error from php to end of log message. $php_errormsg.
-            $msg = "FileSystem::Symlink() FAILED. Cannot symlink '$target' to '$link'. $php_errormsg";
-            throw new Exception($msg);
-        }
-
-    }
-
-    /**
-     * Set the modification and access time on a file to the present time.
-     *
-     * @param string $file Path and/or name of file to touch.
-     * @param int $time 
-     * @return void
-     */
-    function touch($file, $time = null) {
-        global $php_errormsg;
-        
-        if (null === $time) {
-            $error = @touch($file);
-        } else {
-            $error = @touch($file, $time);
-        }
-
-        if (false === $error) { // FAILED.
-            // Add error from php to end of log message. $php_errormsg.
-            $msg = "FileSystem::touch() FAILED. Cannot touch '$file'. $php_errormsg";            
-            throw new Exception($msg);            
-        }
-    }
-
-    /**
-     * Delete an empty directory OR a directory and all of its contents.
-     *
-     * @param    dir    String. Path and/or name of directory to delete.
-     * @param    children    Boolean.    False: don't delete directory contents.
-     *                                    True: delete directory contents.
-     *
-     * @return void
-     */
-    function rmdir($dir, $children = false) {
-        global $php_errormsg;
-        
-        // If children=FALSE only delete dir if empty.
-        if (false === $children) {
-        
-            if (false === @rmdir($dir)) { // FAILED.
-                // Add error from php to end of log message. $php_errormsg.
-                $msg = "FileSystem::rmdir() FAILED. Cannot rmdir $dir. $php_errormsg";
-                throw new Exception($msg);
-            }
-            
-        } else { // delete contents and dir.
-
-            $handle = @opendir($dir);
-
-            if (false === $handle) { // Error.
-
-                $msg = "FileSystem::rmdir() FAILED. Cannot opendir() $dir. $php_errormsg";                
-                throw new Exception($msg);
-
-            } else { // Read from handle.
-
-                // Don't error on readdir().
-                while (false !== ($entry = @readdir($handle))) {
-
-                    if ($entry != '.' && $entry != '..') {
-
-                        // Only add / if it isn't already the last char.
-                        // This ONLY serves the purpose of making the Logger
-                        // output look nice:)
-
-                        if (strpos(strrev($dir), DIRECTORY_SEPARATOR) === 0) {// there is a /
-                            $next_entry = $dir . $entry;
-                        } else { // no /
-                            $next_entry = $dir . DIRECTORY_SEPARATOR . $entry;
-                        }
-
-                        // NOTE: As of php 4.1.1 is_dir doesn't return FALSE it
-                        // returns 0. So use == not ===.
-
-                        // Don't error on is_dir()
-                        if (false == @is_dir($next_entry)) { // Is file.
-                            
-                            try {
-                                self::unlink($next_entry); // Delete.
-                            } catch (Exception $e) {                            
-                                $msg = "FileSystem::Rmdir() FAILED. Cannot FileSystem::Unlink() $next_entry. ". $e->getMessage();
-                                throw new Exception($msg);
-                            }
-
-                        } else { // Is directory.
-                            
-                            try {
-                                self::rmdir($next_entry, true); // Delete
-                            } catch (Exception $e) {
-                                $msg = "FileSystem::rmdir() FAILED. Cannot FileSystem::rmdir() $next_entry. ". $e->getMessage();
-                                throw new Exception($msg);
-                            }
-
-                        } // end is_dir else
-                    } // end .. if
-                } // end while
-            } // end handle if
-
-            // Don't error on closedir()
-            @closedir($handle);
-            
-            if (false === @rmdir($dir)) { // FAILED.
-                // Add error from php to end of log message. $php_errormsg.
-                $msg = "FileSystem::rmdir() FAILED. Cannot rmdir $dir. $php_errormsg";
-                throw new Exception($msg);
-            }
-            
-        }
-                
-    }
-
-    /**
-     * Set the umask for file and directory creation.
-     *
-     * @param    mode    Int. Permissions ususally in ocatal. Use leading 0 for
-     *                    octal. Number between 0 and 0777.
-     *
-     * @return void
-     * @throws Exception if there is an error performing operation.     
-     */
-    function umask($mode) {
-        global $php_errormsg;
-        
-        // CONSIDERME:
-        // Throw a warning if mode is 0. PHP converts illegal octal numbers to
-        // 0 so 0 might not be what the user intended.
-                        
-        $str_mode = decoct($mode); // Show octal in messages.
-
-        if (false === @umask($mode)) { // FAILED.
-            // Add error from php to end of log message. $php_errormsg.
-            $msg = "FileSystem::Umask() FAILED. Value $mode. $php_errormsg";
-            throw new Exception($msg);
-        }
-    }
-
-    /**
-     * Compare the modified time of two files.
-     *
-     * @param    file1    String. Path and name of file1.
-     * @param    file2    String. Path and name of file2.
-     *
-     * @return    Int.     1 if file1 is newer.
-     *                 -1 if file2 is newer.
-     *                  0 if files have the same time.
-     *                  Err object on failure.
-     *     
-     * @throws Exception - if cannot get modified time of either file.
-     */
-    function compareMTimes($file1, $file2) {
-
-        $mtime1 = filemtime($file1);
-        $mtime2 = filemtime($file2);
-
-        if ($mtime1 === false) { // FAILED. Log and return err.        
-            // Add error from php to end of log message. $php_errormsg.
-            $msg = "FileSystem::compareMTimes() FAILED. Cannot can not get modified time of $file1.";
-            throw new Exception($msg);            
-        } elseif ($mtime2 === false) { // FAILED. Log and return err.
-            // Add error from php to end of log message. $php_errormsg.
-            $msg = "FileSystem::compareMTimes() FAILED. Cannot can not get modified time of $file2.";
-            throw new Exception($msg);
-        } else { // Worked. Log and return compare.                
-            // Compare mtimes.
-            if ($mtime1 == $mtime2) {
-                return 0;
-            } else {
-                return ($mtime1 < $mtime2) ? -1 : 1;
-            } // end compare
-        }
-    }
-        
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/FileWriter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/FileWriter.php
deleted file mode 100644
index 2740ef4bf..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/FileWriter.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/*
- *  $Id: FileWriter.php 227 2007-08-28 02:17:00Z hans $  
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/system/io/OutputStreamWriter.php';
-require_once 'phing/system/io/FileOutputStream.php';
-
-/**
- * Convenience class for performing file write operations.
- *
- * @package   phing.system.io
- */
-class FileWriter extends OutputStreamWriter {
-    
-    /**
-     * Construct a new FileWriter.
-     * @param mixed $file PhingFile or string pathname.
-     * @param boolean $append Append to existing file?
-     */
-    function __construct($file, $append = false) {
-    	$out = new FileOutputStream($file, $append);
-    	parent::__construct($out);
-    }
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/FilterReader.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/FilterReader.php
deleted file mode 100644
index 86eefd90f..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/FilterReader.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/*
- *  $Id: FilterReader.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-require_once 'phing/system/io/Reader.php';
-
-/**
- * Wrapper class for readers, which can be used to apply filters.
- * @package phing.system.io
- */
-class FilterReader extends Reader {
-    
-	/** 
-	 * @var Reader
-	 */
-    protected $in;
-    
-    function __construct(Reader $in = null) {
-        $this->in = $in;
-    }
-    
-    public function setReader(Reader $in) {
-        $this->in = $in;
-    }
-    
-    public function skip($n) {
-        return $this->in->skip($n);
-    }
-    
-    /**
-     * Read data from source.
-     * FIXME: Clean up this function signature, as it a) params aren't being used
-     * and b) it doesn't make much sense.
-     */
-    public function read($len = null) {
-        return $this->in->read($len);
-    }
-
-    public function reset() {
-        return $this->in->reset();
-    }
-    
-    public function close() {
-        return $this->in->close();
-    }
-    
-    function getResource() {
-        return $this->in->getResource();
-    }
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/IOException.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/IOException.php
deleted file mode 100644
index 85bdddd9b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/IOException.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/*
- *  $Id: IOException.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-/**
- * Extends Exception to take advantage of methods therein.
- *
- * @package   phing.system.io
- */
-class IOException extends Exception {}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/InputStream.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/InputStream.php
deleted file mode 100644
index 3bc164c67..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/InputStream.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-/*
- *  $Id: FileReader.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-/**
- * Wrapper class for PHP stream that supports read operations.
- * 
- * @package   phing.system.io
- */
-class InputStream {
-	
-	/**
-	 * @var resource The attached PHP stream.
-	 */
-	protected $stream;
-	
-	/**
-	 * @var int Position of stream cursor.
-	 */
-    protected $currentPosition = 0;
-    
-    /**
-     * @var int Marked position of stream cursor.
-     */
-    protected $mark = 0;
-	
-	/**
-     * Construct a new InputStream.
-     * @param resource $stream Configured PHP stream for writing.
-     */
-    public function __construct($stream) {
-    	if (!is_resource($stream)) {
-    		throw new IOException("Passed argument is not a valid stream.");
-    	}
-    	$this->stream = $stream;
-    }
-
-    /**
-     * Skip over $n bytes.
-     * @param int $n
-     */
-    public function skip($n) {
-        $start = $this->currentPosition;
-
-        $ret = @fseek($this->stream, $n, SEEK_CUR);
-        if ( $ret === -1 )
-            return -1;
-
-        $this->currentPosition = ftell($this->stream);
-
-        if ( $start > $this->currentPosition )
-            $skipped = $start - $this->currentPosition;
-        else
-            $skipped = $this->currentPosition - $start;
-
-        return $skipped;
-    }
-    
-    /**
-     * Read data from stream until $len chars or EOF.
-     * @param int $len Num chars to read.  If not specified this stream will read until EOF.
-     * @return string chars read or -1 if eof.
-     */
-    public function read($len = null) {
-    	
-        if ($this->eof()) {
-            return -1;
-        }
-        
-        if ($len === null) { // we want to keep reading until we get an eof
-			$out = "";
-        	while(!$this->eof()) {
-        		$out .= fread($this->stream, 8192);
-        		$this->currentPosition = ftell($this->stream);
-        	}
-        } else {
-			$out = fread($this->stream, $len); // adding 1 seems to ensure that next call to read() will return EOF (-1)
-        	$this->currentPosition = ftell($this->stream);
-        }
-
-        return $out;
-    }    
-    
-    /**
-     * Marks the current position in this input stream.
-     * @throws IOException - if the underlying stream doesn't support this method.
-     */
-    public function mark() {
-    	if (!$this->markSupported()) {
-    		throw new IOException(get_class($this) . " does not support mark() and reset() methods.");
-    	}
-        $this->mark = $this->currentPosition;
-    }
-    
-    /**
-     * Whether the input stream supports mark and reset methods.
-     * @return boolean
-     */
-    public function markSupported() {
-    	return false;
-    }
-    
-    /**
-     * Repositions this stream to the position at the time the mark method was last called on this input stream.
-     * @throws IOException - if the underlying stream doesn't support this method.
-     */
-    function reset() {
-    	if (!$this->markSupported()) {
-    		throw new IOException(get_class($this) . " does not support mark() and reset() methods.");
-    	}
-        // goes back to last mark, by default this would be 0 (i.e. rewind file).
-        fseek($this->stream, SEEK_SET, $this->mark);
-        $this->mark = 0;
-    }
-	
-    /**
-     * Closes stream.
-     * @throws IOException if stream cannot be closed (note that calling close() on an already-closed stream will not raise an exception)
-     */
-    public function close() {
-        if ($this->stream === null) {
-            return;
-        }
-        if (false === @fclose($this->stream)) {
-            // FAILED.
-            $msg = "Cannot fclose " . $this->file->__toString() . " $php_errormsg";
-            throw new IOException($msg);
-        }
-        $this->stream = null;
-    }
-    
-    /**
-     * Whether eof has been reached with stream.
-     * @return boolean
-     */
-    public function eof() {
-        return feof($this->stream);
-    }
-     
-    /**
-     * Reads a entire until EOF and places contents in passed-in variable.  Stream is closed after read.
-     *
-     * @param string &$rBuffer String variable where read contents will be put.
-     * @return TRUE on success.
-     * @author  Charlie Killian, charlie@tizac.com
-     * @throws IOException - if there is an error reading from stream.
-     * @deprecated - Instead, use the read() method or a BufferedReader.
-     */
-    public function readInto(&$rBuffer) {
-		$rBuffer = $this->read();
-		$this->close();
-    }
-    
-    /**
-     * Returns string representation of attached stream.
-     * @return string
-     */
-    public function __toString() {
-        return (string) $this->stream;
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/InputStreamReader.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/InputStreamReader.php
deleted file mode 100644
index 4578f621c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/InputStreamReader.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/*
- *  $Id: FileReader.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
- 
-include_once 'phing/system/io/PhingFile.php';
-include_once 'phing/system/io/Reader.php';
-
-/**
- * Writer class for OutputStream objects.
- * 
- * Unlike the Java counterpart, this class does not (yet) handle
- * character set transformations.  This will be an important function
- * of this class with move to supporting PHP6.
- *  * @package   phing.system.io
- */
-class InputStreamReader extends Reader {
-	
-	/**
-	 * @var InputStream
-	 */
-	protected $inStream;
-	
-	/**
-     * Construct a new InputStreamReader.
-     * @param InputStream $$inStream InputStream to read from
-     */
-    public function __construct(InputStream $inStream) {
-        $this->inStream = $inStream;
-    }
-	
-    /**
-     * Close the stream.
-     */
-    public function close() {
-    	return $this->inStream->close();
-    }
-	
-    /**
-     * Skip over $n bytes.
-     * @param int $n
-     */
-    public function skip($n) {
-    	return $this->inStream->skip($n);
-    }
-    
-    /**
-     * Read data from file.
-     * @param int $len Num chars to read.
-     * @return string chars read or -1 if eof.
-     */
-    public function read($len = null) {
-    	return $this->inStream->read($len);
-    }
-    
-    /**
-     * Marks the current position in this input stream.
-     * @throws IOException - if the underlying stream doesn't support this method.
-     */
-    public function mark() {
-        $this->inStream->mark();
-    }
-    
-    /**
-     * Whether the attached stream supports mark/reset.
-     * @return boolean
-     */
-    public function markSupported() {
-    	return $this->inStream->markSupported();
-    }
-    
-    /**
-     * Repositions this stream to the position at the time the mark method was last called on this input stream.
-     * @throws IOException - if the underlying stream doesn't support this method.
-     */
-    public function reset() {
-        $this->inStream->reset();
-    }
-
-    /**
-     * Whether eof has been reached with stream.
-     * @return boolean
-     */
-    public function eof() {
-        return $this->inStream->eof();
-    }
-     
-    /**
-     * Reads a entire file and stores the data in the variable
-     * passed by reference.
-     *
-     * @param    string $file    String. Path and/or name of file to read.
-     * @param    object &$rBuffer    Reference. Variable of where to put contents.
-     *
-     * @return    TRUE on success. Err object on failure.
-     * @author  Charlie Killian, charlie@tizac.com
-     * @deprecated Use read() or BufferedReader instead.
-     */
-    public function readInto(&$rBuffer) {
-		return $this->inStream->readInto($rBuffer);
-    }
-    
-    /**
-     * Returns string representation of attached stream.
-     * @return string
-     */
-    public function getResource() {
-        return $this->inStream->__toString();
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/OutputStream.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/OutputStream.php
deleted file mode 100644
index 0c09e2d05..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/OutputStream.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-/*
- *  $Id: FileWriter.php 123 2006-09-14 20:19:08Z mrook $  
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-/**
- * Wrapper class for PHP stream that supports write operations.
- * 
- * @package   phing.system.io
- */
-class OutputStream {
-	
-	/**
-	 * @var resource The configured PHP stream.
-	 */
-    protected $stream;
-
-    /**
-     * Construct a new OutputStream.
-     * @param resource $stream Configured PHP stream for writing.
-     */
-    public function __construct($stream) {
-    	if (!is_resource($stream)) {
-    		throw new IOException("Passed argument is not a valid stream.");
-    	}
-    	$this->stream = $stream;
-    }
-	
-    /**
-     * Closes attached stream, flushing output first.
-     * @throws IOException if cannot close stream (note that attempting to close an already closed stream will not raise an IOException)
-     * @return void
-     */
-    public function close() {
-    	if ($this->stream === null) {
-            return;
-        }
-        $this->flush();
-        if (false === @fclose($this->stream)) {
-            $msg = "Cannot close " . $this->getResource() . ": $php_errormsg";
-            throw new IOException($msg);
-        }
-		$this->stream = null;
-	}
-    
-	/**
-     * Flushes stream.
-     * 
-     * @throws IOException if unable to flush data (e.g. stream is not open).
-     */
-    public function flush() {
-    	if (false === @fflush($this->stream)) {
-    		throw new IOException("Could not flush stream: " . $php_errormsg);
-    	}
-	}
-	
-    /**
-     * Writes data to stream.
-     *
-     * @param string $buf Binary/character data to write.
-     * @param int $off (Optional) offset.
-     * @param int $len (Optional) number of bytes/chars to write. 
-     * @return void
-     * @throws IOException - if there is an error writing to stream
-     */
-    public function write($buf, $off = null, $len = null) {
-        if ( $off === null && $len === null ) {
-            $to_write = $buf;
-        } elseif ($off !== null && $len === null) {
-        	$to_write = substr($buf, $off);
-        } elseif ($off === null && $len !== null) {
-            $to_write = substr($buf, 0, $len);
-        } else {
-        	$to_write = substr($buf, $off, $len);
-        }
-        
-        $result = @fwrite($this->stream, $to_write);
-
-        if ( $result === false ) {
-            throw new IOException("Error writing to stream.");
-        }
-    }
-    
-    /**
-     * Returns a string representation of the attached PHP stream.
-     * @return string
-     */
-    public function __toString() {
-        return (string) $this->stream;
-    }
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/OutputStreamWriter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/OutputStreamWriter.php
deleted file mode 100644
index 530c29218..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/OutputStreamWriter.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/*
- *  $Id: FileWriter.php 123 2006-09-14 20:19:08Z mrook $  
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-include_once 'phing/system/io/PhingFile.php';
-require_once 'phing/system/io/Writer.php';
-
-/**
- * Writer class for OutputStream objects.
- * 
- * Unlike the Java counterpart, this class does not (yet) handle
- * character set transformations.  This will be an important function
- * of this class with move to supporting PHP6.
- *
- * @package   phing.system.io
- */
-class OutputStreamWriter extends Writer {
-
-	/**
-	 * @var OutputStream
-	 */
-    protected $outStream;
-    
-    /**
-     * Construct a new OutputStreamWriter.
-     * @param OutputStream $outStream OutputStream to write to
-     */
-    public function __construct(OutputStream $outStream) {
-        $this->outStream = $outStream;
-    }
-	
-    /**
-     * Close the stream.
-     */
-    public function close() {
-    	return $this->outStream->close();
-    }
-	
-    /**
-     * Write char data to stream.
-     *
-     * @param unknown_type $buf
-     * @param unknown_type $off
-     * @param unknown_type $len
-     * @return unknown
-     */
-    public function write($buf, $off = null, $len = null) {
-    	return $this->outStream->write($buf, $off, $len);
-    }
-    
-    /**
-     * Flush output to the stream.
-     */
-	public function flush() {
-    	$this->outStream->flush();
-    }
-    
-    /**
-     * Gets a string representation of attached stream resource.
-     *
-     * @return string String representation of output stream
-     */
-    public function getResource() {
-    	return $this->outStream->__toString();
-    }
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/PhingFile.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/PhingFile.php
deleted file mode 100644
index 305bb8250..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/PhingFile.php
+++ /dev/null
@@ -1,882 +0,0 @@
-<?php
-/*
- *  $Id: PhingFile.php 362 2008-03-08 10:07:53Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-include_once 'phing/system/io/FileSystem.php';
-include_once 'phing/system/lang/NullPointerException.php';
-
-/**
- * An abstract representation of file and directory pathnames.
- *
- * @version   $Revision: 1.1 $
- * @package   phing.system.io
- */
-class PhingFile {
-
-    /** separator string, static, obtained from FileSystem */
-    public static $separator;
-
-    /** path separator string, static, obtained from FileSystem (; or :)*/
-    public static $pathSeparator;
-    
-    /**
-     * This abstract pathname's normalized pathname string.  A normalized
-     * pathname string uses the default name-separator character and does not
-     * contain any duplicate or redundant separators.
-     */
-    private $path = null;
-
-    /** The length of this abstract pathname's prefix, or zero if it has no prefix. */
-    private $prefixLength = 0;
-
-    /** constructor */
-    function __construct($arg1 = null, $arg2 = null) {
-        
-        if (self::$separator === null || self::$pathSeparator === null) {
-            $fs = FileSystem::getFileSystem();
-            self::$separator = $fs->getSeparator();
-            self::$pathSeparator = $fs->getPathSeparator();
-        }
-
-        /* simulate signature identified constructors */
-        if ($arg1 instanceof PhingFile && is_string($arg2)) {
-            $this->_constructFileParentStringChild($arg1, $arg2);
-        } elseif (is_string($arg1) && ($arg2 === null)) {
-            $this->_constructPathname($arg1);
-        } elseif(is_string($arg1) && is_string($arg2)) {
-            $this->_constructStringParentStringChild($arg1, $arg2);
-        } else {
-            if ($arg1 === null) {
-                throw new NullPointerException("Argument1 to function must not be null");
-            }
-            $this->path = (string) $arg1;
-            $this->prefixLength = (int) $arg2;
-        }
-    }
-
-    /** Returns the length of this abstract pathname's prefix. */
-    function getPrefixLength() {
-        return (int) $this->prefixLength;
-    }
-    
-    /* -- constructors not called by signature match, so we need some helpers --*/
-
-    function _constructPathname($pathname) {
-        // obtain ref to the filesystem layer
-        $fs = FileSystem::getFileSystem();
-
-        if ($pathname === null) {
-            throw new NullPointerException("Argument to function must not be null");
-        }
-
-        $this->path = (string) $fs->normalize($pathname);
-        $this->prefixLength = (int) $fs->prefixLength($this->path);
-    }
-
-    function _constructStringParentStringChild($parent, $child = null) {
-        // obtain ref to the filesystem layer
-        $fs = FileSystem::getFileSystem();
-
-        if ($child === null) {
-            throw new NullPointerException("Argument to function must not be null");
-        }
-        if ($parent !== null) {
-            if ($parent === "") {
-                $this->path = $fs->resolve($fs->getDefaultParent(), $fs->normalize($child));
-            } else {
-                $this->path = $fs->resolve($fs->normalize($parent), $fs->normalize($child));
-            }
-        } else {
-            $this->path = (string) $fs->normalize($child);
-        }
-        $this->prefixLength = (int) $fs->prefixLength($this->path);
-    }
-
-    function _constructFileParentStringChild($parent, $child = null) {
-        // obtain ref to the filesystem layer
-        $fs = FileSystem::getFileSystem();
-
-        if ($child === null) {
-            throw new NullPointerException("Argument to function must not be null");
-        }
-
-        if ($parent !== null) {
-            if ($parent->path === "") {
-                $this->path = $fs->resolve($fs->getDefaultParent(), $fs->normalize($child));
-            } else {
-                $this->path = $fs->resolve($parent->path, $fs->normalize($child));
-            }
-        } else {
-            $this->path = $fs->normalize($child);
-        }
-        $this->prefixLength = $fs->prefixLength($this->path);
-    }
-
-    /* -- Path-component accessors -- */
-
-    /**
-     * Returns the name of the file or directory denoted by this abstract
-     * pathname.  This is just the last name in the pathname's name
-     * sequence.  If the pathname's name sequence is empty, then the empty
-     * string is returned.
-     *
-     * @return  The name of the file or directory denoted by this abstract
-     *          pathname, or the empty string if this pathname's name sequence
-     *          is empty
-     */
-    function getName() {
-        // that's a lastIndexOf
-        $index = ((($res = strrpos($this->path, self::$separator)) === false) ? -1 : $res);
-        if ($index < $this->prefixLength) {
-            return substr($this->path, $this->prefixLength);
-        }
-        return substr($this->path, $index + 1);
-    }
-
-    /**
-     * Returns the pathname string of this abstract pathname's parent, or
-     * null if this pathname does not name a parent directory.
-     *
-     * The parent of an abstract pathname consists of the pathname's prefix,
-     * if any, and each name in the pathname's name sequence except for the last.
-     * If the name sequence is empty then the pathname does not name a parent
-     * directory.
-     *
-     * @return  The pathname string of the parent directory named by this
-     *          abstract pathname, or null if this pathname does not name a parent
-     */
-    function getParent() {
-        // that's a lastIndexOf
-        $index = ((($res = strrpos($this->path, self::$separator)) === false) ? -1 : $res);
-        if ($index < $this->prefixLength) {
-            if (($this->prefixLength > 0) && (strlen($this->path > $this->prefixLength))) {
-                return substr($this->path, 0, $this->prefixLength);
-            }
-            return null;
-        }
-        return substr($this->path, 0, $index);
-    }
-
-    /**
-     * Returns the abstract pathname of this abstract pathname's parent,
-     * or null if this pathname does not name a parent directory.
-     *
-     * The parent of an abstract pathname consists of the pathname's prefix,
-     * if any, and each name in the pathname's name sequence except for the
-     * last.  If the name sequence is empty then the pathname does not name
-     * a parent directory.
-     *
-     * @return  The abstract pathname of the parent directory named by this
-     *          abstract pathname, or null if this pathname
-     *          does not name a parent
-     */
-    function getParentFile() {
-        $p = $this->getParent();
-        if ($p === null) {
-            return null;
-        }
-        return new PhingFile((string) $p, (int) $this->prefixLength);
-    }
-
-    /**
-     * Converts this abstract pathname into a pathname string.  The resulting
-     * string uses the default name-separator character to separate the names
-     * in the name sequence.
-     *
-     * @return  The string form of this abstract pathname
-     */
-    function getPath() {
-        return (string) $this->path;
-    }
-
-    /**
-     * Tests whether this abstract pathname is absolute.  The definition of
-     * absolute pathname is system dependent.  On UNIX systems, a pathname is
-     * absolute if its prefix is "/".  On Win32 systems, a pathname is absolute
-     * if its prefix is a drive specifier followed by "\\", or if its prefix
-     * is "\\".
-     *
-     * @return  true if this abstract pathname is absolute, false otherwise
-     */
-    function isAbsolute() {
-        return ($this->prefixLength !== 0);
-    }
-
-
-    /**
-     * Returns the absolute pathname string of this abstract pathname.
-     *
-     * If this abstract pathname is already absolute, then the pathname
-     * string is simply returned as if by the getPath method.
-     * If this abstract pathname is the empty abstract pathname then
-     * the pathname string of the current user directory, which is named by the
-     * system property user.dir, is returned.  Otherwise this
-     * pathname is resolved in a system-dependent way.  On UNIX systems, a
-     * relative pathname is made absolute by resolving it against the current
-     * user directory.  On Win32 systems, a relative pathname is made absolute
-     * by resolving it against the current directory of the drive named by the
-     * pathname, if any; if not, it is resolved against the current user
-     * directory.
-     *
-     * @return  The absolute pathname string denoting the same file or
-     *          directory as this abstract pathname
-     * @see     #isAbsolute()
-     */
-    function getAbsolutePath() {
-        $fs = FileSystem::getFileSystem();        
-        return $fs->resolveFile($this);
-    }
-
-    /**
-     * Returns the absolute form of this abstract pathname.  Equivalent to
-     * getAbsolutePath.
-     *
-     * @return  The absolute abstract pathname denoting the same file or
-     *          directory as this abstract pathname
-     */
-    function getAbsoluteFile() {
-        return new PhingFile((string) $this->getAbsolutePath());
-    }
-
-
-    /**
-     * Returns the canonical pathname string of this abstract pathname.
-     *
-     * A canonical pathname is both absolute and unique. The precise
-     * definition of canonical form is system-dependent. This method first
-     * converts this pathname to absolute form if necessary, as if by invoking the
-     * getAbsolutePath() method, and then maps it to its unique form in a
-     * system-dependent way.  This typically involves removing redundant names
-     * such as "." and .. from the pathname, resolving symbolic links
-     * (on UNIX platforms), and converting drive letters to a standard case
-     * (on Win32 platforms).
-     *
-     * Every pathname that denotes an existing file or directory has a
-     * unique canonical form.  Every pathname that denotes a nonexistent file
-     * or directory also has a unique canonical form.  The canonical form of
-     * the pathname of a nonexistent file or directory may be different from
-     * the canonical form of the same pathname after the file or directory is
-     * created.  Similarly, the canonical form of the pathname of an existing
-     * file or directory may be different from the canonical form of the same
-     * pathname after the file or directory is deleted.
-     *
-     * @return  The canonical pathname string denoting the same file or
-     *          directory as this abstract pathname
-     */
-    function getCanonicalPath() {
-        $fs = FileSystem::getFileSystem();
-        return $fs->canonicalize($this->path);
-    }
-
-
-    /**
-     * Returns the canonical form of this abstract pathname.  Equivalent to
-     * getCanonicalPath(.
-     *
-     * @return  PhingFile The canonical pathname string denoting the same file or
-     *          directory as this abstract pathname
-     */
-    function getCanonicalFile() {
-        return new PhingFile($this->getCanonicalPath());
-    }
-
-    /**
-     * Converts this abstract pathname into a file: URL.  The
-     * exact form of the URL is system-dependent.  If it can be determined that
-     * the file denoted by this abstract pathname is a directory, then the
-     * resulting URL will end with a slash.
-     *
-     * Usage note: This method does not automatically escape
-     * characters that are illegal in URLs.  It is recommended that new code
-     * convert an abstract pathname into a URL by first converting it into a
-     * URI, via the toURI() method, and then converting the URI
-     * into a URL via the URI::toURL()
-     *
-     * @return  A URL object representing the equivalent file URL
-     *
-     *
-     */
-    function toURL() {
-        /*
-        // URL class not implemented yet
-        return new URL("file", "", $this->_slashify($this->getAbsolutePath(), $this->isDirectory()));
-        */
-    }
-
-    /**
-     * Constructs a file: URI that represents this abstract pathname.
-     * Not implemented yet
-     */
-    function toURI() {
-        /*
-        $f = $this->getAbsoluteFile();
-           $sp = (string) $this->slashify($f->getPath(), $f->isDirectory());
-           if (StringHelper::startsWith('//', $sp))
-        $sp = '//' + sp;
-           return new URI('file', null, $sp, null);
-        */
-    }
-
-    function _slashify($path, $isDirectory) {
-        $p = (string) $path;
-
-        if (self::$separator !== '/') {
-            $p = str_replace(self::$separator, '/', $p);
-        }
-
-        if (!StringHelper::startsWith('/', $p)) {
-            $p = '/'.$p;
-        }
-
-        if (!StringHelper::endsWith('/', $p) && $isDirectory) {
-            $p = $p.'/';
-        }
-
-        return $p;
-    }
-
-    /* -- Attribute accessors -- */
-
-    /**
-     * Tests whether the application can read the file denoted by this
-     * abstract pathname.
-     *
-     * @return  true if and only if the file specified by this
-     *          abstract pathname exists and can be read by the
-     *          application; false otherwise
-     */
-    function canRead() {
-        $fs = FileSystem::getFileSystem();
-
-        if ($fs->checkAccess($this)) {
-            return (boolean) @is_readable($this->getAbsolutePath());
-        }
-        return false;
-    }
-
-    /**
-     * Tests whether the application can modify to the file denoted by this
-     * abstract pathname.
-     *
-     * @return  true if and only if the file system actually
-     *          contains a file denoted by this abstract pathname and
-     *          the application is allowed to write to the file;
-     *          false otherwise.
-     *
-     */
-    function canWrite() {
-        $fs = FileSystem::getFileSystem();
-        return $fs->checkAccess($this, true);
-    }
-
-    /**
-     * Tests whether the file denoted by this abstract pathname exists.
-     *
-     * @return  true if and only if the file denoted by this
-     *          abstract pathname exists; false otherwise
-     *
-     */
-    function exists() {                
-		clearstatcache();
-        if ($this->isFile()) {
-            return @file_exists($this->path);
-        } else {
-            return @is_dir($this->path);
-        }
-    }
-
-    /**
-     * Tests whether the file denoted by this abstract pathname is a
-     * directory.
-     *
-     * @return true if and only if the file denoted by this
-     *         abstract pathname exists and is a directory;
-     *         false otherwise
-     *
-     */
-    function isDirectory() {
-		clearstatcache();
-        $fs = FileSystem::getFileSystem();
-        if ($fs->checkAccess($this) !== true) {
-            throw new IOException("No read access to ".$this->path);
-        }
-        return @is_dir($this->path);
-    }
-
-    /**
-     * Tests whether the file denoted by this abstract pathname is a normal
-     * file.  A file is normal if it is not a directory and, in
-     * addition, satisfies other system-dependent criteria.  Any non-directory
-     * file created by a Java application is guaranteed to be a normal file.
-     *
-     * @return  true if and only if the file denoted by this
-     *          abstract pathname exists and is a normal file;
-     *          false otherwise
-     */
-    function isFile() {
-		clearstatcache();
-        //$fs = FileSystem::getFileSystem();
-        return @is_file($this->path);
-    }
-
-    /**
-     * Tests whether the file named by this abstract pathname is a hidden
-     * file.  The exact definition of hidden is system-dependent.  On
-     * UNIX systems, a file is considered to be hidden if its name begins with
-     * a period character ('.').  On Win32 systems, a file is considered to be
-     * hidden if it has been marked as such in the filesystem. Currently there
-     * seems to be no way to dermine isHidden on Win file systems via PHP
-     *
-     * @return  true if and only if the file denoted by this
-     *          abstract pathname is hidden according to the conventions of the
-     *          underlying platform
-     */
-    function isHidden() {
-        $fs = FileSystem::getFileSystem();
-        if ($fs->checkAccess($this) !== true) {
-            throw new IOException("No read access to ".$this->path);
-        }
-        return (($fs->getBooleanAttributes($this) & $fs->BA_HIDDEN) !== 0);
-    }
-
-    /**
-     * Returns the time that the file denoted by this abstract pathname was
-     * last modified.
-     *
-     * @return  A integer value representing the time the file was
-     *          last modified, measured in milliseconds since the epoch
-     *          (00:00:00 GMT, January 1, 1970), or 0 if the
-     *          file does not exist or if an I/O error occurs
-     */
-    function lastModified() {
-        $fs = FileSystem::getFileSystem();
-        if ($fs->checkAccess($this) !== true) {
-            throw new IOException("No read access to " . $this->path);
-        }
-        return $fs->getLastModifiedTime($this);
-    }
-
-    /**
-     * Returns the length of the file denoted by this abstract pathname.
-     * The return value is unspecified if this pathname denotes a directory.
-     *
-     * @return  The length, in bytes, of the file denoted by this abstract
-     *          pathname, or 0 if the file does not exist
-     */
-    function length() {
-        $fs = FileSystem::getFileSystem();
-        if ($fs->checkAccess($this) !== true) {
-            throw new IOException("No read access to ".$this->path."\n");
-        }
-        return $fs->getLength($this);
-    }
-
-    /**
-     * Convenience method for returning the contents of this file as a string.
-     * This method uses file_get_contents() to read file in an optimized way.
-     * @return string
-     * @throws Exception - if file cannot be read
-     */
-    function contents() {
-        if (!$this->canRead() || !$this->isFile()) {
-            throw new IOException("Cannot read file contents!");
-        }
-        return file_get_contents($this->getAbsolutePath());
-    }
-    
-    /* -- File operations -- */
-
-    /**
-     * Atomically creates a new, empty file named by this abstract pathname if
-     * and only if a file with this name does not yet exist.  The check for the
-     * existence of the file and the creation of the file if it does not exist
-     * are a single operation that is atomic with respect to all other
-     * filesystem activities that might affect the file.
-     *
-     * @return  true if the named file does not exist and was
-     *          successfully created; <code>false</code> if the named file
-     *          already exists
-     * @throws IOException if file can't be created
-     */
-    function createNewFile($parents=true, $mode=0777) {
-        $file = FileSystem::getFileSystem()->createNewFile($this->path);
-        return $file;
-    }
-
-    /**
-     * Deletes the file or directory denoted by this abstract pathname.  If
-     * this pathname denotes a directory, then the directory must be empty in
-     * order to be deleted.
-     *
-     * @return  true if and only if the file or directory is
-     *          successfully deleted; false otherwise
-     */
-    function delete() {
-        $fs = FileSystem::getFileSystem();
-        if ($fs->canDelete($this) !== true) {
-            throw new IOException("Cannot delete " . $this->path . "\n"); 
-        }
-        return $fs->delete($this);
-    }
-
-    /**
-     * Requests that the file or directory denoted by this abstract pathname
-     * be deleted when php terminates.  Deletion will be attempted only for
-     * normal termination of php and if and if only Phing::shutdown() is
-     * called.
-     *
-     * Once deletion has been requested, it is not possible to cancel the
-     * request.  This method should therefore be used with care.
-     *
-     */
-    function deleteOnExit() {
-        $fs = FileSystem::getFileSystem();
-        $fs->deleteOnExit($this);
-    }
-
-    /**
-     * Returns an array of strings naming the files and directories in the
-     * directory denoted by this abstract pathname.
-     *
-     * If this abstract pathname does not denote a directory, then this
-     * method returns null  Otherwise an array of strings is
-     * returned, one for each file or directory in the directory.  Names
-     * denoting the directory itself and the directory's parent directory are
-     * not included in the result.  Each string is a file name rather than a
-     * complete path.
-     *
-     * There is no guarantee that the name strings in the resulting array
-     * will appear in any specific order; they are not, in particular,
-     * guaranteed to appear in alphabetical order.
-     *
-     * @return  An array of strings naming the files and directories in the
-     *          directory denoted by this abstract pathname.  The array will be
-     *          empty if the directory is empty.  Returns null if
-     *          this abstract pathname does not denote a directory, or if an
-     *          I/O error occurs.
-     *
-     */
-    function listDir($filter = null) {
-        $fs = FileSystem::getFileSystem();
-        return $fs->lister($this, $filter);
-    }
-
-    function listFiles($filter = null) {
-        $ss = $this->listDir($filter);
-        if ($ss === null) {
-            return null;
-        }
-        $n = count($ss);
-        $fs = array();
-        for ($i = 0; $i < $n; $i++) {
-            $fs[$i] = new PhingFile((string)$this->path, (string)$ss[$i]);
-        }
-        return $fs;
-    }
-
-    /**
-     * Creates the directory named by this abstract pathname, including any
-     * necessary but nonexistent parent directories.  Note that if this
-     * operation fails it may have succeeded in creating some of the necessary
-     * parent directories.
-     *
-     * @return  true if and only if the directory was created,
-     *          along with all necessary parent directories; false
-     *          otherwise
-     * @throws  IOException
-     */
-    function mkdirs() {
-        if ($this->exists()) {
-            return false;
-        }
-		try {
-			if ($this->mkdir()) {
-	            return true;
-	        }
-		} catch (IOException $ioe) {
-			// IOException from mkdir() means that directory propbably didn't exist.
-		}        
-        $parentFile = $this->getParentFile();
-        return (($parentFile !== null) && ($parentFile->mkdirs() && $this->mkdir()));
-    }
-
-    /**
-     * Creates the directory named by this abstract pathname.
-     *
-     * @return  true if and only if the directory was created; false otherwise
-     * @throws  IOException
-     */
-    function mkdir() {
-        $fs = FileSystem::getFileSystem();
-
-        if ($fs->checkAccess(new PhingFile($this->path), true) !== true) {
-            throw new IOException("No write access to " . $this->getPath());
-        }
-        return $fs->createDirectory($this);
-    }
-
-    /**
-     * Renames the file denoted by this abstract pathname.
-     *
-     * @param   destFile  The new abstract pathname for the named file
-     * @return  true if and only if the renaming succeeded; false otherwise
-     */
-    function renameTo(PhingFile $destFile) {
-        $fs = FileSystem::getFileSystem();
-        if ($fs->checkAccess($this) !== true) {
-            throw new IOException("No write access to ".$this->getPath());
-        }
-        return $fs->rename($this, $destFile);
-    }
-
-    /**
-     * Simple-copies file denoted by this abstract pathname into another
-     * PhingFile
-     *
-     * @param PhingFile $destFile  The new abstract pathname for the named file
-     * @return true if and only if the renaming succeeded; false otherwise
-     */
-    function copyTo(PhingFile $destFile) {
-        $fs = FileSystem::getFileSystem();
-
-        if ($fs->checkAccess($this) !== true) {
-            throw new IOException("No read access to ".$this->getPath()."\n");
-        }
-
-        if ($fs->checkAccess($destFile, true) !== true) {
-            throw new IOException("File::copyTo() No write access to ".$destFile->getPath());
-        }
-        return $fs->copy($this, $destFile);
-    }
-
-    /**
-     * Sets the last-modified time of the file or directory named by this
-     * abstract pathname.
-     *
-     * All platforms support file-modification times to the nearest second,
-     * but some provide more precision.  The argument will be truncated to fit
-     * the supported precision.  If the operation succeeds and no intervening
-     * operations on the file take place, then the next invocation of the
-     * lastModified method will return the (possibly truncated) time argument
-     * that was passed to this method.
-     *
-     * @param  time  The new last-modified time, measured in milliseconds since
-     *               the epoch (00:00:00 GMT, January 1, 1970)
-     * @return true if and only if the operation succeeded; false otherwise
-     */
-    function setLastModified($time) {
-        $time = (int) $time;
-        if ($time < 0) {
-            throw new Exception("IllegalArgumentException, Negative $time\n");
-        }
-
-        $fs = FileSystem::getFileSystem();
-        return $fs->setLastModifiedTime($this, $time);
-    }
-
-    /**
-     * Marks the file or directory named by this abstract pathname so that
-     * only read operations are allowed.  After invoking this method the file
-     * or directory is guaranteed not to change until it is either deleted or
-     * marked to allow write access.  Whether or not a read-only file or
-     * directory may be deleted depends upon the underlying system.
-     *
-     * @return true if and only if the operation succeeded; false otherwise
-     */
-    function setReadOnly() {
-        $fs = FileSystem::getFileSystem();
-        if ($fs->checkAccess($this, true) !== true) {
-            // Error, no write access
-            throw new IOException("No write access to " . $this->getPath());
-        }
-        return $fs->setReadOnly($this);
-    }
-
-	/**
-	 * Sets the owner of the file.
-	 * @param mixed $user User name or number.
-	 */
-	public function setUser($user) {
-		$fs = FileSystem::getFileSystem();
-		return $fs->chown($this->getPath(), $user);
-    }
-    
-	/**
-     * Retrieve the owner of this file.
-     * @return int User ID of the owner of this file. 
-     */
-    function getUser() {
-        return @fileowner($this->getPath());
-    }
-    
-    /**
-     * Sets the mode of the file
-     * @param int $mode Ocatal mode.
-     */
-    function setMode($mode) {
-        $fs = FileSystem::getFileSystem();
-        return $fs->chmod($this->getPath(), $mode);
-    }
-
-    /**
-     * Retrieve the mode of this file.
-     * @return int
-     */
-    function getMode() {
-        return @fileperms($this->getPath());
-    }
-
-    /* -- Filesystem interface -- */
-
-    /**
-     * List the available filesystem roots.
-     *
-     * A particular platform may support zero or more hierarchically-organized
-     * file systems.  Each file system has a root  directory from which all
-     * other files in that file system can be reached.
-     * Windows platforms, for example, have a root directory for each active
-     * drive; UNIX platforms have a single root directory, namely "/".
-     * The set of available filesystem roots is affected by various system-level
-     * operations such the insertion or ejection of removable media and the
-     * disconnecting or unmounting of physical or virtual disk drives.
-     *
-     * This method returns an array of PhingFile objects that
-     * denote the root directories of the available filesystem roots.  It is
-     * guaranteed that the canonical pathname of any file physically present on
-     * the local machine will begin with one of the roots returned by this
-     * method.
-     *
-     * The canonical pathname of a file that resides on some other machine
-     * and is accessed via a remote-filesystem protocol such as SMB or NFS may
-     * or may not begin with one of the roots returned by this method.  If the
-     * pathname of a remote file is syntactically indistinguishable from the
-     * pathname of a local file then it will begin with one of the roots
-     * returned by this method.  Thus, for example, PhingFile objects
-     * denoting the root directories of the mapped network drives of a Windows
-     * platform will be returned by this method, while PhingFile
-     * objects containing UNC pathnames will not be returned by this method.
-     *
-     * @return  An array of PhingFile objects denoting the available
-     *          filesystem roots, or null if the set of roots
-     *          could not be determined.  The array will be empty if there are
-     *          no filesystem roots.
-     */
-    function listRoots() {
-        $fs = FileSystem::getFileSystem();
-        return (array) $fs->listRoots();
-    }
-
-    /* -- Tempfile management -- */
-
-    /**
-     * Returns the path to the temp directory.
-     */
-    function getTempDir() {
-        return Phing::getProperty('php.tmpdir');
-    }
-
-    /**
-     * Static method that creates a unique filename whose name begins with
-     * $prefix and ends with $suffix in the directory $directory. $directory
-     * is a reference to a PhingFile Object.
-     * Then, the file is locked for exclusive reading/writing.
-     *
-     * @author      manuel holtgrewe, grin@gmx.net
-     * @throws      IOException
-     * @access      public
-     */
-    function createTempFile($prefix, $suffix, PhingFile $directory) {
-        
-        // quick but efficient hack to create a unique filename ;-)
-        $result = null;
-        do {
-            $result = new PhingFile($directory, $prefix . substr(md5(time()), 0, 8) . $suffix);
-        } while (file_exists($result->getPath()));
-
-        $fs = FileSystem::getFileSystem();
-        $fs->createNewFile($result->getPath());
-        $fs->lock($result);
-
-        return $result;
-    }
-
-    /**
-     * If necessary, $File the lock on $File is removed and then the file is
-     * deleted
-     *
-     * @access      public
-     */
-    function removeTempFile() {
-        $fs = FileSystem::getFileSystem();
-        // catch IO Exception
-        $fs->unlock($this);
-        $this->delete();
-    }
-
-
-    /* -- Basic infrastructure -- */
-
-    /**
-     * Compares two abstract pathnames lexicographically.  The ordering
-     * defined by this method depends upon the underlying system.  On UNIX
-     * systems, alphabetic case is significant in comparing pathnames; on Win32
-     * systems it is not.
-     *
-     * @param PhingFile $file Th file whose pathname sould be compared to the pathname of this file.
-     *
-     * @return int Zero if the argument is equal to this abstract pathname, a
-     *        value less than zero if this abstract pathname is
-     *        lexicographically less than the argument, or a value greater
-     *        than zero if this abstract pathname is lexicographically
-     *        greater than the argument
-     */
-    function compareTo(PhingFile $file) {
-        $fs = FileSystem::getFileSystem();
-        return $fs->compare($this, $file);
-    }
-
-    /**
-     * Tests this abstract pathname for equality with the given object.
-     * Returns <code>true</code> if and only if the argument is not
-     * <code>null</code> and is an abstract pathname that denotes the same file
-     * or directory as this abstract pathname.  Whether or not two abstract
-     * pathnames are equal depends upon the underlying system.  On UNIX
-     * systems, alphabetic case is significant in comparing pathnames; on Win32
-     * systems it is not.
-     * @return boolean
-     */
-    function equals($obj) {
-        if (($obj !== null) && ($obj instanceof PhingFile)) {
-            return ($this->compareTo($obj) === 0);
-        }
-        return false;
-    }
-
-    /** Backwards compatibility -- use PHP5's native __tostring method. */
-    function toString() {
-        return $this->getPath();
-    }
-    
-    /** PHP5's native method. */
-    function __toString() {
-        return $this->getPath();
-    }
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/Reader.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/Reader.php
deleted file mode 100644
index f4a33f039..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/Reader.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-/*
- *  $Id: Reader.php 227 2007-08-28 02:17:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-/**
- * Abstract class for reading character streams.
- * 
- * @author Hans Lellelid <hans@xmpl.org>
- * @author Yannick Lecaillez <yl@seasonfive.com>
- * @version $Revision: 1.5 $
- * @package phing.system.io
- */
-abstract class Reader {
-
-    /**
-     * Read data from source.
-     * 
-     * If length is specified, then only that number of chars is read,
-     * otherwise stream is read until EOF.
-     * 
-     * @param int $len
-     */
-    abstract public function read($len = null);
-            
-    /**
-     * Close stream.
-     * @throws IOException if there is an error closing stream
-     */
-    abstract public function close();
-    
-    /**
-     * Returns the filename, url, etc. that is being read from.
-     * This is critical for, e.g., ExpatParser's ability to know
-     * the filename that is throwing an ExpatParserException, etc.
-     * @return string
-     */
-    abstract function getResource();
-
-    /**
-     * Move stream position relative to current pos.
-     * @param int $n
-     */
-    public function skip($n) {}
-    
-    /**
-     * Reset the current position in stream to beginning or last mark (if supported).
-     */    
-    public function reset() {}
-        
-    /**
-     * If supported, places a "marker" (like a bookmark) at current stream position.
-     * A subsequent call to reset() will move stream position back
-     * to last marker (if supported).
-     */    
-    public function mark() {}
-
-    /**
-     * Whether marking is supported.
-     * @return boolean
-     */
-    public function markSupported() {
-    	return false;
-    }
-    
-    /**
-     * Is stream ready for reading.
-     * @return boolean
-     */
-    public function ready() {
-    	return true;
-    }
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/StringReader.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/StringReader.php
deleted file mode 100644
index a98cd7bbc..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/StringReader.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/*
- *  $Id: StringReader.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-/**
- * Dummy class for reading from string of characters. 
- * @package phing.system.io
- */
-class StringReader extends Reader {
-    
-	/**
-	 * @var string
-	 */
-    private $_string;
-    
-    /**
-     * @var int
-     */
-    private $mark = 0;
-    
-    /**
-     * @var int
-     */
-    private $currPos = 0;
-    
-    function __construct($string) {
-        $this->_string = $string;
-    }
-
-    function skip($n) {}
-
-    function read($len = null) {
-        if ($len === null) {
-            return $this->_string;
-        } else {            
-            if ($this->currPos >= strlen($this->_string)) {
-                return -1;
-            }            
-            $out = substr($this->_string, $this->currPos, $len);
-            $this->currPos += $len;
-            return $out;
-        }
-    }
-
-    function mark() {
-        $this->mark = $this->currPos;
-    }
-
-    function reset() {
-        $this->currPos = $this->mark;
-    }
-
-    function close() {}
-
-    function open() {}
-
-    function ready() {}
-
-    function markSupported() {
-        return true;
-    }
-    
-    function getResource() {
-        return '(string) "'.$this->_string . '"';
-    }
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/UnixFileSystem.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/UnixFileSystem.php
deleted file mode 100644
index 2eb393b6b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/UnixFileSystem.php
+++ /dev/null
@@ -1,278 +0,0 @@
-<?php
-/*
- *  $Id: UnixFileSystem.php 258 2007-10-21 00:46:45Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-include_once 'phing/system/io/FileSystem.php';
-
-/**
- * UnixFileSystem class. This class encapsulates the basic file system functions
- * for platforms using the unix (posix)-stylish filesystem. It wraps php native
- * functions suppressing normal PHP error reporting and instead uses Exception
- * to report and error.
- *
- * This class is part of a oop based filesystem abstraction and targeted to run
- * on all supported php platforms.
- *
- * Note: For debugging turn track_errors on in the php.ini. The error messages
- * and log messages from this class will then be clearer because $php_errormsg
- * is passed as part of the message.
- *
- * FIXME:
- *  - Comments
- *  - Error handling reduced to min, error are handled by PhingFile mainly
- *
- * @author    Andreas Aderhold, andi@binarycloud.com
- * @version   $Revision: 1.10 $
- * @package   phing.system.io
- */
-class UnixFileSystem extends FileSystem {
-
-    /**
-     * returns OS dependant path separator char
-     */
-    function getSeparator() {
-        return '/';
-    }
-
-    /**
-     * returns OS dependant directory separator char
-     */
-    function getPathSeparator() {
-        return ':';
-    }
-
-    /**
-     * A normal Unix pathname contains no duplicate slashes and does not end
-     * with a slash.  It may be the empty string.
-     *
-     * Check that the given pathname is normal.  If not, invoke the real
-     * normalizer on the part of the pathname that requires normalization.
-     * This way we iterate through the whole pathname string only once.
-     */
-    function normalize($strPathname) {
-        
-        if (empty($strPathname)) {
-            return;
-        }
-        
-        // Resolve home directories. We assume /home is where all home
-        // directories reside, b/c there is no other way to do this with
-        // PHP AFAIK.
-        if ($strPathname{0} === "~") {
-            if ($strPathname{1} === "/") { // like ~/foo => /home/user/foo
-                $strPathname = "/home/" . get_current_user() . substr($strPathname, 1);
-            } else { // like ~foo => /home/foo
-                $pos = strpos($strPathname, "/");
-                $name = substr($strPathname, 1, $pos - 2);
-                $strPathname = "/home/" . $name . substr($strPathname, $pos);
-            }
-        }
-
-        $n = strlen($strPathname);
-        $prevChar = 0;
-        for ($i=0; $i < $n; $i++) {
-            $c = $strPathname{$i};
-            if (($prevChar === '/') && ($c === '/')) {
-                return self::normalizer($strPathname, $n, $i - 1);
-            }
-            $prevChar = $c;
-        }
-        if ($prevChar === '/') {
-            return self::normalizer($strPathname, $n, $n - 1);
-        }
-        return $strPathname;
-    }
-
-    /**
-     * Normalize the given pathname, whose length is $len, starting at the given
-     * $offset; everything before this offset is already normal.
-     */
-    protected function normalizer($pathname, $len, $offset) {
-        if ($len === 0) {
-            return $pathname;
-        }
-        $n = (int) $len;
-        while (($n > 0) && ($pathname{$n-1} === '/')) {
-            $n--;
-        }
-        if ($n === 0) {
-            return '/';
-        }
-        $sb = "";
-
-        if ($offset > 0) {
-            $sb .= substr($pathname, 0, $offset);
-        }
-        $prevChar = 0;
-        for ($i = $offset; $i < $n; $i++) {
-            $c = $pathname{$i};
-            if (($prevChar === '/') && ($c === '/')) {
-                continue;
-            }
-            $sb .= $c;
-            $prevChar = $c;
-        }
-        return $sb;
-    }
-
-    /**
-     * Compute the length of the pathname string's prefix.  The pathname
-     * string must be in normal form.
-     */
-    function prefixLength($pathname) {
-        if (strlen($pathname === 0)) {
-            return 0;
-        }
-        return (($pathname{0} === '/') ? 1 : 0);
-    }
-
-    /**
-     * Resolve the child pathname string against the parent.
-     * Both strings must be in normal form, and the result
-     * will be in normal form.
-     */
-    function resolve($parent, $child) {
-
-        if ($child === "") {
-            return $parent;
-        }
-
-        if ($child{0} === '/') {
-            if ($parent === '/') {
-                return $child;
-            }
-            return $parent.$child;
-        }
-
-        if ($parent === '/') {
-            return $parent.$child;
-        }
-
-        return $parent.'/'.$child;
-    }
-
-    function getDefaultParent() {
-        return '/';
-    }
-
-    function isAbsolute(PhingFile $f) {
-        return ($f->getPrefixLength() !== 0);
-    }
-
-    /**
-     * the file resolver
-     */
-    function resolveFile(PhingFile $f) {
-        // resolve if parent is a file oject only
-        if ($this->isAbsolute($f)) {
-            return $f->getPath();
-        } else {
-            return $this->resolve(Phing::getProperty("user.dir"), $f->getPath());
-        }       
-    }
-
-    /* -- most of the following is mapped to the php natives wrapped by FileSystem */    
-
-    /* -- Attribute accessors -- */
-    function getBooleanAttributes(&$f) {
-        //$rv = getBooleanAttributes0($f);
-        $name = $f->getName();
-        $hidden = (strlen($name) > 0) && ($name{0} == '.');
-        return ($hidden ? $this->BA_HIDDEN : 0);
-    }
-
-    /**
-     * set file readonly on unix
-     */
-    function setReadOnly($f) {
-        if ($f instanceof File) {
-            $strPath = (string) $f->getPath();
-            $perms = (int) (@fileperms($strPath) & 0444);
-            return FileSystem::Chmod($strPath, $perms);
-        } else {
-            throw new Exception("IllegalArgutmentType: Argument is not File");
-        }
-    }
-
-    /**
-     * compares file paths lexicographically
-     */
-    function compare($f1, $f2) {
-        if ( ($f1 instanceof PhingFile) && ($f2 instanceof PhingFile) ) {
-            $f1Path = $f1->getPath();
-            $f2Path = $f2->getPath();
-            return (boolean) strcmp((string) $f1Path, (string) $f2Path);
-        } else {
-            throw new Exception("IllegalArgutmentType: Argument is not PhingFile");
-        }
-    }
-
-    /* -- fs interface --*/
-
-    function listRoots() {
-        if (!$this->checkAccess('/', false)) {
-            die ("Can not access root");
-        }
-        return array(new PhingFile("/"));
-    }
-
-    /**
-     * returns the contents of a directory in an array
-     */
-    function lister($f) {
-        $dir = @opendir($f->getAbsolutePath());
-        if (!$dir) {
-            throw new Exception("Can't open directory " . $f->__toString());
-        }
-        $vv = array();
-        while (($file = @readdir($dir)) !== false) {
-            if ($file == "." || $file == "..") {
-                continue;
-            }
-            $vv[] = (string) $file;
-        }
-        @closedir($dir);
-        return $vv;
-    }
-
-    function fromURIPath($p) {
-        if (StringHelper::endsWith("/", $p) && (strlen($p) > 1)) {
-
-            // "/foo/" --> "/foo", but "/" --> "/"            
-            $p = substr($p, 0, strlen($p) - 1);
-
-        }
-
-        return $p;
-    }
-    
-    /**
-     * Whether file can be deleted.
-     * @param PhingFile $f
-     * @return boolean
-     */
-    function canDelete(PhingFile $f) 
- 	{ 
- 		@clearstatcache(); 
- 		$dir = dirname($f->getAbsolutePath()); 
- 		return (bool) @is_writable($dir); 
-	}
-    
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/Win32FileSystem.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/Win32FileSystem.php
deleted file mode 100644
index cf66eb960..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/Win32FileSystem.php
+++ /dev/null
@@ -1,477 +0,0 @@
-<?php
-/*
- *  $Id: Win32FileSystem.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-include_once 'phing/system/io/FileSystem.php';
-
-/**
- *  @package   phing.system.io
- */
-class Win32FileSystem extends FileSystem {
-
-    protected $slash;
-    protected $altSlash;
-    protected $semicolon;
-
-    private static $driveDirCache = array();
-
-    function __construct() {
-        $this->slash = self::getSeparator();
-        $this->semicolon = self::getPathSeparator();
-        $this->altSlash = ($this->slash === '\\') ? '/' : '\\';
-    }
-
-    function isSlash($c) {
-        return ($c == '\\') || ($c == '/');
-    }
-
-    function isLetter($c) {
-        return ((ord($c) >= ord('a')) && (ord($c) <= ord('z')))
-               || ((ord($c) >= ord('A')) && (ord($c) <= ord('Z')));
-    }
-
-    function slashify($p) {
-        if ((strlen($p) > 0) && ($p{0} != $this->slash)) {
-            return $this->slash.$p;
-        }
-        else {
-            return $p;
-        }
-    }
-
-    /* -- Normalization and construction -- */
-
-    function getSeparator() {
-        // the ascii value of is the \
-        return chr(92);
-    }
-
-    function getPathSeparator() {
-        return ';';
-    }
-
-    /**
-     * A normal Win32 pathname contains no duplicate slashes, except possibly
-     * for a UNC prefix, and does not end with a slash.  It may be the empty
-     * string.  Normalized Win32 pathnames have the convenient property that
-     * the length of the prefix almost uniquely identifies the type of the path
-     * and whether it is absolute or relative:
-     *
-     *    0  relative to both drive and directory
-     *    1  drive-relative (begins with '\\')
-     *    2  absolute UNC (if first char is '\\'), else directory-relative (has form "z:foo")
-     *    3  absolute local pathname (begins with "z:\\")
-     */
-    function normalizePrefix($strPath, $len, &$sb) {
-        $src = 0;
-        while (($src < $len) && $this->isSlash($strPath{$src})) {
-            $src++;
-        }
-        $c = "";
-        if (($len - $src >= 2)
-                && $this->isLetter($c = $strPath{$src})
-                && $strPath{$src + 1} === ':') {
-            /* Remove leading slashes if followed by drive specifier.
-             * This hack is necessary to support file URLs containing drive
-             * specifiers (e.g., "file://c:/path").  As a side effect,
-             * "/c:/path" can be used as an alternative to "c:/path". */
-            $sb .= $c;
-            $sb .= ':';
-            $src += 2;
-        }
-        else {
-            $src = 0;
-            if (($len >= 2)
-                    && $this->isSlash($strPath{0})
-                    && $this->isSlash($strPath{1})) {
-                /* UNC pathname: Retain first slash; leave src pointed at
-                 * second slash so that further slashes will be collapsed
-                 * into the second slash.  The result will be a pathname
-                 * beginning with "\\\\" followed (most likely) by a host
-                 * name. */
-                $src = 1;
-                $sb.=$this->slash;
-            }
-        }
-        return $src;
-    }
-
-    /** Normalize the given pathname, whose length is len, starting at the given
-       offset; everything before this offset is already normal. */
-    protected function normalizer($strPath, $len, $offset) {
-        if ($len == 0) {
-            return $strPath;
-        }
-        if ($offset < 3) {
-            $offset = 0;    //Avoid fencepost cases with UNC pathnames
-        }
-        $src = 0;
-        $slash = $this->slash;
-        $sb = "";
-
-        if ($offset == 0) {
-            // Complete normalization, including prefix
-            $src = $this->normalizePrefix($strPath, $len, $sb);
-        } else {
-            // Partial normalization
-            $src = $offset;
-            $sb .= substr($strPath, 0, $offset);
-        }
-
-        // Remove redundant slashes from the remainder of the path, forcing all
-        // slashes into the preferred slash
-        while ($src < $len) {
-            $c = $strPath{$src++};
-            if ($this->isSlash($c)) {
-                while (($src < $len) && $this->isSlash($strPath{$src})) {
-                    $src++;
-                }
-                if ($src === $len) {
-                    /* Check for trailing separator */
-                    $sn = (int) strlen($sb);
-                    if (($sn == 2) && ($sb{1} === ':')) {
-                        // "z:\\"
-                        $sb .= $slash;
-                        break;
-                    }
-                    if ($sn === 0) {
-                        // "\\"
-                        $sb .= $slash;
-                        break;
-                    }
-                    if (($sn === 1) && ($this->isSlash($sb{0}))) {
-                        /* "\\\\" is not collapsed to "\\" because "\\\\" marks
-                        the beginning of a UNC pathname.  Even though it is
-                        not, by itself, a valid UNC pathname, we leave it as
-                        is in order to be consistent with the win32 APIs,
-                        which treat this case as an invalid UNC pathname
-                        rather than as an alias for the root directory of
-                        the current drive. */
-                        $sb .= $slash;
-                        break;
-                    }
-                    // Path does not denote a root directory, so do not append
-                    // trailing slash
-                    break;
-                } else {
-                    $sb .= $slash;
-                }
-            } else {
-                $sb.=$c;
-            }
-        }
-        $rv = (string) $sb;
-        return $rv;
-    }
-
-    /**
-     * Check that the given pathname is normal.  If not, invoke the real
-     * normalizer on the part of the pathname that requires normalization.
-     * This way we iterate through the whole pathname string only once.
-     * @param string $strPath
-     * @return string
-     */
-    function normalize($strPath) {
-        $n = strlen($strPath);
-        $slash    = $this->slash;
-        $altSlash = $this->altSlash;
-        $prev = 0;
-        for ($i = 0; $i < $n; $i++) {
-            $c = $strPath{$i};
-            if ($c === $altSlash) {
-                return $this->normalizer($strPath, $n, ($prev === $slash) ? $i - 1 : $i);
-            }
-            if (($c === $slash) && ($prev === $slash) && ($i > 1)) {
-                return $this->normalizer($strPath, $n, $i - 1);
-            }
-            if (($c === ':') && ($i > 1)) {
-                return $this->normalizer($strPath, $n, 0);
-            }
-            $prev = $c;
-        }
-        if ($prev === $slash) {
-            return $this->normalizer($strPath, $n, $n - 1);
-        }
-        return $strPath;
-    }
-
-    function prefixLength($strPath) {
-        $path  = (string) $strPath;
-        $slash = (string) $this->slash;
-        $n = (int) strlen($path);
-        if ($n === 0) {
-            return 0;
-        }
-        $c0 = $path{0};
-        $c1 = ($n > 1) ? $path{1} :
-              0;
-        if ($c0 === $slash) {
-            if ($c1 === $slash) {
-                return 2;            // absolute UNC pathname "\\\\foo"
-            }
-            return 1;                // drive-relative "\\foo"
-        }
-
-        if ($this->isLetter($c0) && ($c1 === ':')) {
-            if (($n > 2) && ($path{2}) === $slash) {
-                return 3;            // Absolute local pathname "z:\\foo" */
-            }
-            return 2;                // Directory-relative "z:foo"
-        }
-        return 0;                    // Completely relative
-    }
-
-    function resolve($parent, $child) {
-        $parent = (string) $parent;
-        $child  = (string) $child;
-        $slash  = (string) $this->slash;
-
-        $pn = (int) strlen($parent);
-        if ($pn === 0) {
-            return $child;
-        }
-        $cn = (int) strlen($child);
-        if ($cn === 0) {
-            return $parent;
-        }
-
-        $c = $child;
-        if (($cn > 1) && ($c{0} === $slash)) {
-            if ($c{1} === $slash) {
-                // drop prefix when child is a UNC pathname
-                $c = substr($c, 2);
-            }
-            else {
-                //Drop prefix when child is drive-relative */
-                $c = substr($c, 1);
-            }
-        }
-
-        $p = $parent;
-        if ($p{$pn - 1} === $slash) {
-            $p = substr($p, 0, $pn - 1);
-        }
-        return $p.$this->slashify($c);
-    }
-
-    function getDefaultParent() {
-        return (string) ("".$this->slash);
-    }
-
-    function fromURIPath($strPath) {
-        $p = (string) $strPath;
-        if ((strlen($p) > 2) && ($p{2} === ':')) {
-
-            // "/c:/foo" --> "c:/foo"
-            $p = substr($p,1);
-
-            // "c:/foo/" --> "c:/foo", but "c:/" --> "c:/"
-            if ((strlen($p) > 3) && StringHelper::endsWith('/', $p)) {
-                $p = substr($p, 0, strlen($p) - 1);
-            }
-        } elseif ((strlen($p) > 1) && StringHelper::endsWith('/', $p)) {
-            // "/foo/" --> "/foo"
-            $p = substr($p, 0, strlen($p) - 1);
-        }
-        return (string) $p;
-    }
-
-
-    /* -- Path operations -- */
-
-    function isAbsolute(PhingFile $f) {
-        $pl = (int) $f->getPrefixLength();
-        $p  = (string) $f->getPath();
-        return ((($pl === 2) && ($p{0} === $this->slash)) || ($pl === 3) || ($pl === 1 && $p{0} === $this->slash));
-    }
-
-    /** private */
-    function _driveIndex($d) {
-        $d = (string) $d{0};
-        if ((ord($d) >= ord('a')) && (ord($d) <= ord('z'))) {
-            return ord($d) - ord('a');
-        }
-        if ((ord($d) >= ord('A')) && (ord($d) <= ord('Z'))) {
-            return ord($d) - ord('A');
-        }
-        return -1;
-    }
-
-    /** private */
-    function _getDriveDirectory($drive) {
-        $drive = (string) $drive{0};
-        $i = (int) $this->_driveIndex($drive);
-        if ($i < 0) {
-            return null;
-        }
-
-        $s = (isset(self::$driveDirCache[$i]) ? self::$driveDirCache[$i] : null);
-
-        if ($s !== null) {
-            return $s;
-        }
-
-        $s = $this->_getDriveDirectory($i + 1);
-        self::$driveDirCache[$i] = $s;
-        return $s;
-    }
-
-    function _getUserPath() {
-        //For both compatibility and security, we must look this up every time
-        return (string) $this->normalize(Phing::getProperty("user.dir"));
-    }
-
-    function _getDrive($path) {
-        $path = (string) $path;
-        $pl   = $this->prefixLength($path);
-        return ($pl === 3) ? substr($path, 0, 2) : null;
-    }
-
-    function resolveFile(PhingFile $f) {
-        $path = $f->getPath();
-        $pl   = (int) $f->getPrefixLength();
-
-        if (($pl === 2) && ($path{0} === $this->slash)) {
-            return $path;            // UNC
-        }
-
-        if ($pl === 3) {
-            return $path;            // Absolute local
-        }
-
-        if ($pl === 0) {
-            return (string) ($this->_getUserPath().$this->slashify($path)); //Completely relative
-        }
-
-        if ($pl === 1) {            // Drive-relative
-            $up = (string) $this->_getUserPath();
-            $ud = (string) $this->_getDrive($up);
-            if ($ud !== null) {
-                return (string) $ud.$path;
-            }
-            return (string) $up.$path;            //User dir is a UNC path
-        }
-
-        if ($pl === 2) {                // Directory-relative
-            $up = (string) $this->_getUserPath();
-            $ud = (string) $this->_getDrive($up);
-            if (($ud !== null) && StringHelper::startsWith($ud, $path)) {
-                return (string) ($up . $this->slashify(substr($path,2)));
-            }
-            $drive = (string) $path{0};
-            $dir   = (string) $this->_getDriveDirectory($drive);
-
-            $np = (string) "";
-            if ($dir !== null) {
-                /* When resolving a directory-relative path that refers to a
-                drive other than the current drive, insist that the caller
-                have read permission on the result */
-                $p = (string) $drive . (':'.$dir.$this->slashify(substr($path,2)));
-
-                if (!$this->checkAccess($p, false)) {
-                    // FIXME
-                    // throw security error
-                    die("Can't resolve path $p");
-                }
-                return $p;
-            }
-            return (string) $drive.':'.$this->slashify(substr($path,2)); //fake it
-        }
-        
-        throw new Exception("Unresolvable path: " . $path);
-    }
-
-    /* -- most of the following is mapped to the functions mapped th php natives in FileSystem */
-
-    /* -- Attribute accessors -- */
-
-    function setReadOnly($f) {
-        // dunno how to do this on win
-        throw new Exception("WIN32FileSystem doesn't support read-only yet.");
-    }
-
-    /* -- Filesystem interface -- */
-
-    protected function _access($path) {
-        if (!$this->checkAccess($path, false)) {
-            throw new Exception("Can't resolve path $p");
-        }
-        return true;
-    }
-
-    function _nativeListRoots() {
-        // FIXME
-    }
-
-    function listRoots() {
-        $ds = _nativeListRoots();
-        $n = 0;
-        for ($i = 0; $i < 26; $i++) {
-            if ((($ds >> $i) & 1) !== 0) {
-                if (!$this->access((string)( chr(ord('A') + $i) . ':' . $this->slash))) {
-                    $ds &= ~(1 << $i);
-                } else {
-                    $n++;
-                }
-            }
-        }
-        $fs = array();
-        $j = (int) 0;
-        $slash = (string) $this->slash;
-        for ($i = 0; $i < 26; $i++) {
-            if ((($ds >> $i) & 1) !== 0) {
-                $fs[$j++] = new PhingFile(chr(ord('A') + $i) . ':' . $this->slash);
-            }
-        }
-        return $fs;
-    }
-
-    /* -- Basic infrastructure -- */
-
-    /** compares file paths lexicographically */
-    function compare(PhingFile $f1, PhingFile $f2) {
-        $f1Path = $f1->getPath();
-        $f2Path = $f2->getPath();
-        return (boolean) strcasecmp((string) $f1Path, (string) $f2Path);        
-    }
-
-
-    /**
-     * returns the contents of a directory in an array
-     */
-    function lister($f) {
-        $dir = @opendir($f->getAbsolutePath());
-        if (!$dir) {
-            throw new Exception("Can't open directory " . $f->__toString());
-        }
-        $vv = array();
-        while (($file = @readdir($dir)) !== false) {
-            if ($file == "." || $file == "..") {
-                continue;
-            }
-            $vv[] = (string) $file;
-        }
-        @closedir($dir);
-        return $vv;
-    }
-    
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/WinNTFileSystem.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/WinNTFileSystem.php
deleted file mode 100644
index d82e841a9..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/WinNTFileSystem.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/*
- *  $Id: WinNTFileSystem.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-include_once 'phing/system/io/Win32FileSystem.php';
-
-/**
- * FileSystem for Windows NT/2000.
- *  @package   phing.system.io
- */
-
-class WinNTFileSystem extends Win32FileSystem {
-
-    /* -- class only for convenience and future use everything is inherinted --*/
-
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/Writer.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/Writer.php
deleted file mode 100644
index 97c56f180..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/io/Writer.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/*
- *  $Id: Writer.php 227 2007-08-28 02:17:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-/**
- * Abstract class for writing character streams.
- * 
- * @package   phing.system.io
- */
-abstract class Writer {
-	
-	/**
-	 * Writes data to output stream.
-	 * @param string $buf
-	 * @param int $off
-	 * @param int $len
-	 */
-    abstract public function write($buf, $off = null, $len = null);
-    
-    /**
-     * Close the stream.
-     * @throws IOException - if there is an error closing stream.
-     */
-    abstract public function close();
-	
-    /**
-     * Flush the stream, if supported by the stream.
-     */
-    public function flush() {}
-    
-    /**
-     * Returns a string representation of resource filename, url, etc. that is being written to.
-     * @return string
-     */    
-    abstract public function getResource();
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/lang/Character.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/lang/Character.php
deleted file mode 100644
index 06cc7a742..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/lang/Character.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/*
- *  $Id: Character.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-/**
- * @package phing.system.lang
- */
-class Character {
-
-    // this class might be extended with plenty of ordinal char constants
-    // and the like to support the multibyte aware datatype (char) in php
-    // in form of an object.
-    // anyway just a thought
-
-    public static function isLetter($char) {
-
-        if (strlen($char) !== 1)
-            $char = 0;
-
-        $char = (int) ord($char);
-
-        if ($char >= ord('A') && $char <= ord('Z'))
-            return true;
-
-        if ($char >= ord('a') && $char <= ord('z'))
-            return true;
-
-        return false;
-    }
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/lang/EventObject.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/lang/EventObject.php
deleted file mode 100644
index b7b82582f..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/lang/EventObject.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/*
- *  $Id: EventObject.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-/**
- *  @package phing.system.lang
- */
-class EventObject {
-
-    /** The object on which the Event initially occurred. */
-    protected $source;
-
-    /** Constructs a prototypical Event. */
-    function __construct($source) {
-        if ($source === null) {
-            throw new Exception("Null source");
-        }
-        $this->source = $source;
-    }
-
-    /** The object on which the Event initially occurred. */
-    function getSource() {
-        return $this->source;
-    }
-
-    /** Returns a String representation of this EventObject.*/
-    function toString() {
-        if (method_exists($this->source, "toString")) {
-            return get_class($this)."[source=".$this->source->toString()."]";
-        } else {
-            return get_class($this)."[source=".get_class($this->source)."]";
-        }
-    }
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/lang/FileNotFoundException.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/lang/FileNotFoundException.php
deleted file mode 100644
index 13e1afd19..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/lang/FileNotFoundException.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/*
- *  $Id: FileNotFoundException.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-/**
- *  @package   phing.system.lang
- */
-class FileNotFoundException extends Exception {}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/lang/NullPointerException.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/lang/NullPointerException.php
deleted file mode 100644
index 6ad71c4ea..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/lang/NullPointerException.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/*
- *  $Id: NullPointerException.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-/**
- * @package phing.system.lang
- */
-class NullPointerException extends Exception {}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/lang/SecurityException.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/lang/SecurityException.php
deleted file mode 100644
index d7a2d0751..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/lang/SecurityException.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/*
- *  $Id: SecurityException.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-/**
- * @package phing.system.lang
- */
-class SecurityException extends Exception {}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/util/Message.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/util/Message.php
deleted file mode 100644
index 9bde82ce5..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/util/Message.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-//
-// FIXME. Logger will be renamed to Message, new level is introduces MSG_NOTICE
-// Message can handle some more later on
-//   - formatted output
-//   - sending to dialog or phpgtk whatever
-//   - etc
-//
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/util/Properties.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/util/Properties.php
deleted file mode 100644
index 7b2a17d00..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/util/Properties.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-
-/*
- *  $Id: Properties.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-include_once 'phing/system/io/PhingFile.php';
-include_once 'phing/system/io/FileWriter.php';
-
-/**
- * Convenience class for reading and writing property files.
- * 
- * FIXME
- *        - Add support for arrays (separated by ',')
- *
- * @package    phing.system.util
- * @version $Revision: 1.13 $
- */
-class Properties {
-
-    private $properties = array();
-
-    /**
-     * Load properties from a file.
-     *
-     * @param PhingFile $file
-     * @return void
-     * @throws IOException - if unable to read file.
-     */
-    function load(PhingFile $file) {
-        if ($file->canRead()) {
-            $this->parse($file->getPath(), false);                    
-        } else {
-            throw new IOException("Can not read file ".$file->getPath());
-        }
-        
-    }
-    
-    /**
-     * Replaces parse_ini_file() or better_parse_ini_file().
-     * Saves a step since we don't have to parse and then check return value
-     * before throwing an error or setting class properties.
-     * 
-     * @param string $filePath
-     * @param boolean $processSections Whether to honor [SectionName] sections in INI file.
-     * @return array Properties loaded from file (no prop replacements done yet).
-     */
-    protected function parse($filePath) {
-
-        // load() already made sure that file is readable                
-        // but we'll double check that when reading the file into 
-        // an array
-        
-        if (($lines = @file($filePath)) === false) {
-            throw new IOException("Unable to parse contents of $filePath");
-        }
-        
-        $this->properties = array();
-        $sec_name = "";
-        
-        foreach($lines as $line) {
-            
-            $line = trim($line);
-    
-            if($line == "")
-                continue;
-                    
-            if ($line{0} == '#' or $line{0} == ';') {
-                // it's a comment, so continue to next line
-                continue;
-            } else {
-                $pos = strpos($line, '=');
-                $property = trim(substr($line, 0, $pos));
-                $value = trim(substr($line, $pos + 1));                
-                $this->properties[$property] = $this->inVal($value);
-            }
-            
-        } // for each line        
-    }
-    
-    /**
-     * Process values when being read in from properties file.
-     * does things like convert "true" => true
-     * @param string $val Trimmed value.
-     * @return mixed The new property value (may be boolean, etc.)
-     */
-    protected function inVal($val) {
-        if ($val === "true") { 
-            $val = true;
-        } elseif ($val === "false") { 
-            $val = false; 
-        }
-        return $val;
-    }
-    
-    /**
-     * Process values when being written out to properties file.
-     * does things like convert true => "true"
-     * @param mixed $val The property value (may be boolean, etc.)
-     * @return string
-     */
-    protected function outVal($val) {
-        if ($val === true) {
-            $val = "true";
-        } elseif ($val === false) {
-            $val = "false";
-        }
-        return $val;
-    }
-    
-    /**
-     * Create string representation that can be written to file and would be loadable using load() method.
-     * 
-     * Essentially this function creates a string representation of properties that is ready to
-     * write back out to a properties file.  This is used by store() method.
-     *
-     * @return string
-     */
-    public function toString() {
-        $buf = "";        
-        foreach($this->properties as $key => $item) {
-            $buf .= $key . "=" . $this->outVal($item) . PHP_EOL;
-        }
-        return $buf;    
-    }
-    
-    /**
-     * Stores current properties to specified file.
-     * 
-     * @param PhingFile $file File to create/overwrite with properties.
-     * @param string $header Header text that will be placed (within comments) at the top of properties file.
-     * @return void
-     * @throws IOException - on error writing properties file.
-     */
-    function store(PhingFile $file, $header = null) {
-        // stores the properties in this object in the file denoted
-        // if file is not given and the properties were loaded from a
-        // file prior, this method stores them in the file used by load()        
-        try {
-            $fw = new FileWriter($file);
-            if ($header !== null) {
-                $fw->write( "# " . $header . PHP_EOL );
-            }
-            $fw->write($this->toString());
-            $fw->close();
-        } catch (IOException $e) {
-            throw new IOException("Error writing property file: " . $e->getMessage());
-        }                
-    }
-    
-    /**
-     * Returns copy of internal properties hash.
-     * Mostly for performance reasons, property hashes are often
-     * preferable to passing around objects.
-     *
-     * @return array
-     */
-    function getProperties() {
-        return $this->properties;
-    }
-    
-    /**
-     * Get value for specified property.
-     * This is the same as get() method.
-     *
-     * @param string $prop The property name (key).
-     * @return mixed
-     * @see get()
-     */
-    function getProperty($prop) {
-        if (!isset($this->properties[$prop])) {
-            return null;
-        }
-        return $this->properties[$prop];
-    }
-
-    /**
-     * Get value for specified property.
-     * This function exists to provide a hashtable-like interface for
-     * properties.
-     *
-     * @param string $prop The property name (key).
-     * @return mixed
-     * @see getProperty()
-     */    
-    function get($prop) {
-         if (!isset($this->properties[$prop])) {
-            return null;
-        }
-        return $this->properties[$prop];
-    }
-    
-    /**
-     * Set the value for a property.
-     *
-     * @param string $key
-     * @param mixed $value
-     * @return mixed Old property value or NULL if none was set.
-     */
-    function setProperty($key, $value) {
-    	$oldValue = null;
-    	if (isset($this->properties[$key])) {
-    		$oldValue = $this->properties[$key];
-    	}
-        $this->properties[$key] = $value;
-        return $oldValue;
-    }
-    
-    /**
-     * Set the value for a property.
-     * This function exists to provide hashtable-lie
-     * interface for properties.
-     *
-     * @param string $key
-     * @param mixed $value
-     */
-    function put($key, $value) {
-        return $this->setProperty($key, $value);
-    }
-    
-    /**
-     * Same as keys() function, returns an array of property names.
-     * @return array
-     */
-    function propertyNames() {
-        return $this->keys();
-    }
-    
-    /**
-     * Whether loaded properties array contains specified property name.
-     * @return boolean
-     */
-    function containsKey($key) {
-        return isset($this->properties[$key]);
-    }
-
-    /**
-     * Returns properties keys.
-     * Use this for foreach() {} iterations, as this is
-     * faster than looping through property values.
-     * @return array
-     */
-    function keys() {
-        return array_keys($this->properties);
-    }
-    
-    /**
-     * Whether properties list is empty.
-     * @return boolean
-     */
-    function isEmpty() {
-        return empty($this->properties);
-    }
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/util/Register.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/util/Register.php
deleted file mode 100644
index 7cc65333e..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/util/Register.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-/**
- * Static class to handle a slot-listening system.
- *
- * Unlike the slots/signals Qt model, this class manages something that is
- * more like a simple hashtable, where each slot has only one value.  For that
- * reason "Registers" makes more sense, the reference being to CPU registers.
- *
- * This could be used for anything, but it's been built for a pretty specific phing
- * need, and that is to allow access to dynamic values that are set by logic
- * that is not represented in a build file.  For exampe, we need a system for getting
- * the current resource (file) that is being processed by a filterchain in a fileset.
- * 
- * Each slot corresponds to only one read-only, dynamic-value RegisterSlot object. In
- * a build.xml register slots are expressed using a syntax similar to variables:
- * 
- * <replaceregexp>
- *    <regexp pattern="\n" replace="%{task.current_file}"/>
- * </replaceregexp>
- * 
- * The task/type must provide a supporting setter for the attribute:
- * 
- * <code>
- *     function setListeningReplace(RegisterSlot $slot) {
- *        $this->replace = $slot;
- *  }
- *
- *  // in main()
- *  if ($this->replace instanceof RegisterSlot) {
- *        $this->regexp->setReplace($this->replace->getValue());
- *  } else {
- *        $this->regexp->setReplace($this->replace);
- *  }
- * </code>
- *
- * @author Hans Lellelid <hans@xmpl.org>
- * @version $Revision: 1.3 $
- * @package phing.system.util
- */
-class Register {
-    
-    /** Slots that have been registered */
-    private static $slots = array();
-    
-    /**
-     * Returns RegisterSlot for specified key.
-     * 
-     * If not slot exists a new one is created for key.
-     * 
-     * @param string $key
-     * @return RegisterSlot
-     */
-    public static function getSlot($key) {
-        if (!isset(self::$slots[$key])) {
-            self::$slots[$key] = new RegisterSlot($key);
-        }
-        return self::$slots[$key];
-    }    
-}
-
-
-/**
- * Represents a slot in the register.
- */
-class RegisterSlot {
-    
-    /** The name of this slot. */
-    private $key;
-    
-    /** The value for this slot. */
-    private $value;
-    
-    /**
-     * Constructs a new RegisterSlot, setting the key to passed param.
-     * @param string $key
-     */
-    public function __construct($key) {
-        $this->key = (string) $key;
-    }
-    
-    /**
-     * Sets the key / name for this slot.
-     * @param string $k
-     */
-    public function setKey($k) {
-        $this->key = (string) $k;
-    }
-
-    /**
-     * Gets the key / name for this slot.
-     * @return string
-     */
-    public function getKey() {
-        return $this->key;
-    }
-    
-    /**
-     * Sets the value for this slot.
-     * @param mixed
-     */
-    public function setValue($v) {
-        $this->value = $v;
-    }
-    
-    /**
-     * Returns the value at this slot.
-     * @return mixed
-     */
-    public function getValue() {
-        return $this->value;
-    }
-    
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/util/Timer.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/util/Timer.php
deleted file mode 100644
index 8094af053..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/system/util/Timer.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/*
- *  $Id: Timer.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-
-/**
- * This class can be used to obtain the execution time of all of the scripts
- * that are executed in the process of building a page.
- *
- * Example:
- * To be done before any scripts execute:
- *
- * $Timer = new Timer;
- * $Timer->Start_Timer();
- *
- * To be done after all scripts have executed:
- *
- * $timer->Stop_Timer();
- * $timer->Get_Elapsed_Time(int number_of_places);
- *
- * @author    Charles Killian
- * @author    Hans Lellelid <hans@xmpl.org>
- * @package    phing.system.util
- * @version    $Revision: 1.5 $ $Date: 2006-09-15 05:19:08 +0900 (金, 15  9月 2006) $
- */
-class Timer {
-
-    /** start time */
-    protected $stime;
-    
-    /** end time */
-    protected $etime;  
-
-    /**
-     * This function sets the class variable $stime to the current time in
-     * microseconds.
-     * @return void
-     */
-    public function start() {
-        $this->stime = $this->getMicrotime();
-    }
-
-    /**
-     * This function sets the class variable $etime to the current time in
-     * microseconds.
-     * @return void
-     */
-    function stop() {
-        $this->etime = $this->getMicrotime();
-    }
-    
-    /**
-     * This function returns the elapsed time in seconds.
-     *
-     * Call start_time() at the beginning of script execution and end_time() at
-     * the end of script execution.  Then, call elapsed_time() to obtain the
-     * difference between start_time() and end_time().
-     *
-     * @param    $places  decimal place precision of elapsed time (default is 5)
-     * @return string Properly formatted time.
-     */
-    function getElapsedTime($places=5) {
-        $etime = $this->etime - $this->stime;
-        $format = "%0.".$places."f";
-        return (sprintf ($format, $etime));
-    }
-
-    /**
-     * This function returns the current time in microseconds.
-     *
-     * @author    Everett Michaud, Zend.com
-     * @return    current time in microseconds
-     * @access    private
-     */
-    function getMicrotime() {
-        list($usec, $sec) = explode(" ", microtime());
-        return ((float)$usec + (float)$sec);
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/defaults.properties b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/defaults.properties
deleted file mode 100644
index cf8e73930..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/defaults.properties
+++ /dev/null
@@ -1,86 +0,0 @@
-; -------------------------------------
-; These taskdefs are loaded at startup.
-; -------------------------------------
-
-; Internal system tasks
-; 
-adhoc=phing.tasks.system.AdhocTask
-adhoc-task=phing.tasks.system.AdhocTaskdefTask
-adhoc-type=phing.tasks.system.AdhocTypedefTask
-append=phing.tasks.system.AppendTask
-available=phing.tasks.system.AvailableTask
-chmod=phing.tasks.system.ChmodTask
-chown=phing.tasks.system.ChownTask
-concat=phing.tasks.system.AppendTask
-condition=phing.tasks.system.ConditionTask
-copy=phing.tasks.system.CopyTask
-cvs=phing.tasks.system.CvsTask
-cvspass=phing.tasks.system.CvsPassTask
-delete=phing.tasks.system.DeleteTask
-echo=phing.tasks.system.EchoTask
-exec=phing.tasks.system.ExecTask
-fail=phing.tasks.system.ExitTask
-foreach=phing.tasks.system.ForeachTask
-includepath=phing.tasks.system.IncludePathTask
-input=phing.tasks.system.InputTask
-mkdir=phing.tasks.system.MkdirTask
-move=phing.tasks.system.MoveTask
-phing=phing.tasks.system.PhingTask
-phingcall=phing.tasks.system.PhingCallTask
-php=phing.tasks.system.PhpEvalTask
-property=phing.tasks.system.PropertyTask
-propertyprompt=phing.tasks.system.PropertyPromptTask
-reflexive=phing.tasks.system.ReflexiveTask
-resolvepath=phing.tasks.system.ResolvePathTask
-taskdef=phing.tasks.system.TaskdefTask
-touch=phing.tasks.system.TouchTask
-tstamp=phing.tasks.system.TstampTask
-typedef=phing.tasks.system.TypedefTask
-uptodate=phing.tasks.system.UpToDateTask
-xslt=phing.tasks.system.XsltTask
-if=phing.tasks.system.IfTask
-warn=phing.tasks.system.WarnTask
-
-; "Core" contributed tasks
-; -- i.e. no taskdef needed.
-
-creole=phing.tasks.ext.creole.CreoleSQLExecTask
-pdo=phing.tasks.ext.pdo.PDOSQLExecTask
-package-as-path=phing.tasks.ext.PackageAsPathTask
-smarty=phing.tasks.ext.SmartyTask
-capsule=phing.tasks.ext.CapsuleTask
-tar=phing.tasks.ext.TarTask
-untar=phing.tasks.ext.UntarTask
-pearpkg=phing.tasks.ext.PearPackageTask
-pearpkg2=phing.tasks.ext.PearPackage2Task
-mail=phing.tasks.ext.MailTask
-zip=phing.tasks.ext.ZipTask
-unzip=phing.tasks.ext.UnzipTask
-scpsend=phing.tasks.ext.ScpSendTask
-
-; "ext" tasks
-phpdoc=phing.tasks.ext.phpdoc.PhpDocumentorTask
-phpdocext=phing.tasks.ext.phpdoc.PhpDocumentorExternalTask
-svnlastrevision=phing.tasks.ext.svn.SvnLastRevisionTask
-svncheckout=phing.tasks.ext.svn.SvnCheckoutTask
-svnexport=phing.tasks.ext.svn.SvnExportTask
-svnupdate=phing.tasks.ext.svn.SvnUpdateTask
-phpunit3=phing.tasks.ext.phpunit.PHPUnitTask
-phpunit3report=phing.tasks.ext.phpunit.PHPUnitReportTask
-phpunit2=phing.tasks.ext.phpunit.PHPUnitTask
-phpunit2report=phing.tasks.ext.phpunit.PHPUnitReportTask
-phpunit=phing.tasks.ext.phpunit.PHPUnitTask
-phpunitreport=phing.tasks.ext.phpunit.PHPUnitReportTask
-coverage-setup=phing.tasks.ext.coverage.CoverageSetupTask
-coverage-merger=phing.tasks.ext.coverage.CoverageMergerTask
-coverage-report=phing.tasks.ext.coverage.CoverageReportTask
-ioncubeencoder=phing.tasks.ext.ioncube.IoncubeEncoderTask
-ioncubelicense=phing.tasks.ext.ioncube.IoncubeLicenseTask
-simpletest=phing.tasks.ext.simpletest.SimpleTestTask
-phplint=phing.tasks.ext.PhpLintTask
-xmllint=phing.tasks.ext.XmlLintTask
-analyze=phing.tasks.ext.ZendCodeAnalyzerTask
-jsllint=phing.tasks.ext.JslLintTask
-manifest=phing.tasks.ext.ManifestTask
-phpcodesniffer=phing.tasks.ext.PhpCodeSnifferTask
-ftpdeploy=phing.tasks.ext.FtpDeployTask
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/CapsuleTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/CapsuleTask.php
deleted file mode 100644
index 3385f8071..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/CapsuleTask.php
+++ /dev/null
@@ -1,478 +0,0 @@
-<?php
-
-/*
- *  $Id: CapsuleTask.php 144 2007-02-05 15:19:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
- 
-include_once 'phing/Task.php';
-include_once 'phing/BuildException.php';
-include_once 'phing/lib/Capsule.php';
-include_once 'phing/util/StringHelper.php';
-
-/**
- * A phing task for generating output by using Capsule.
- *
- * This is based on the interface to TexenTask from Apache's Velocity engine. 
- *
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.17 $
- * @package   phing.tasks.ext
- */
-class CapsuleTask extends Task {
-
-    /**
-     * Capsule "template" engine.
-     * @var Capsule
-     */
-    protected $context;
-       
-    /**
-     * Any vars assigned via the build file.
-     * @var array AssignedVar[]
-     */
-    protected $assignedVars = array();
-    
-    /**
-     * This is the control template that governs the output.
-     * It may or may not invoke the services of worker
-     * templates.
-     * @var string
-     */
-    protected $controlTemplate;
-    
-    /**
-     * This is where Velocity will look for templates
-     * using the file template loader.
-     * @var string
-     */
-    protected $templatePath;
-    
-    /**
-     * This is where texen will place all the output
-     * that is a product of the generation process.
-     * @var string
-     */
-    protected $outputDirectory;
-    
-    /**
-     * This is the file where the generated text
-     * will be placed.
-     * @var string
-     */
-    protected $outputFile;
-
-    /**
-     * <p>
-     * These are properties that are fed into the
-     * initial context from a properties file. This
-     * is simply a convenient way to set some values
-     * that you wish to make available in the context.
-     * </p>
-     * <p>
-     * These values are not critical, like the template path
-     * or output path, but allow a convenient way to
-     * set a value that may be specific to a particular
-     * generation task.
-     * </p>
-     * <p>
-     * For example, if you are generating scripts to allow
-     * user to automatically create a database, then
-     * you might want the <code>$databaseName</code> 
-     * to be placed
-     * in the initial context so that it is available
-     * in a script that might look something like the
-     * following:
-     * <code><pre>
-     * #!bin/sh
-     * 
-     * echo y | mysqladmin create $databaseName
-     * </pre></code>
-     * The value of <code>$databaseName</code> isn't critical to
-     * output, and you obviously don't want to change
-     * the ant task to simply take a database name.
-     * So initial context values can be set with
-     * properties file.
-     *
-     * @var array
-     */
-    protected $contextProperties;
-        
-    // -----------------------------------------------------------------------
-    // The following getters & setters are used by phing to set properties
-    // specified in the XML for the capsule task.
-    // -----------------------------------------------------------------------
-    
-    /**
-     * [REQUIRED] Set the control template for the
-     * generating process.
-     * @param string $controlTemplate
-     * @return void
-     */
-    public function setControlTemplate ($controlTemplate) {
-        $this->controlTemplate = $controlTemplate;
-    }
-
-    /**
-     * Get the control template for the
-     * generating process.
-     * @return string
-     */
-    public function getControlTemplate() {
-        return $this->controlTemplate;
-    }
-
-    /**
-     * [REQUIRED] Set the path where Velocity will look
-     * for templates using the file template
-     * loader.
-     * @return void
-     * @throws Exception 
-     */
-    public function setTemplatePath($templatePath) {
-        $resolvedPath = "";        
-        $tok = strtok($templatePath, ",");
-        while ( $tok ) {            
-            // resolve relative path from basedir and leave
-            // absolute path untouched.
-            $fullPath = $this->project->resolveFile($tok);
-            $cpath = $fullPath->getCanonicalPath();
-            if ($cpath === false) {
-                $this->log("Template directory does not exist: " . $fullPath->getAbsolutePath());
-            } else {
-                $resolvedPath .= $cpath;
-            }
-            $tok = strtok(",");
-            if ( $tok ) {
-                $resolvedPath .= ",";
-            }
-        }
-        $this->templatePath = $resolvedPath;
-     }
-
-    /**
-     * Get the path where Velocity will look
-     * for templates using the file template
-     * loader.
-     * @return string
-     */
-    public function getTemplatePath() {
-        return $this->templatePath;
-    }        
-
-    /**
-     * [REQUIRED] Set the output directory. It will be
-     * created if it doesn't exist.
-     * @param PhingFile $outputDirectory
-     * @return void
-     * @throws Exception
-     */
-    public function setOutputDirectory(PhingFile $outputDirectory) {
-        try {
-            if (!$outputDirectory->exists()) {
-                $this->log("Output directory does not exist, creating: " . $outputDirectory->getPath(),Project::MSG_VERBOSE);
-                if (!$outputDirectory->mkdirs()) {
-                    throw new IOException("Unable to create Ouptut directory: " . $outputDirectory->getAbsolutePath());
-                }
-            }
-            $this->outputDirectory = $outputDirectory->getCanonicalPath();
-        } catch (IOException $ioe) {
-            throw new BuildException($ioe);
-        }
-    }
-      
-    /**
-     * Get the output directory.
-     * @return string
-     */
-    public function getOutputDirectory() {
-        return $this->outputDirectory;
-    }        
-
-    /**
-     * [REQUIRED] Set the output file for the
-     * generation process.
-     * @param string $outputFile (TODO: change this to File)
-     * @return void
-     */
-    public function setOutputFile($outputFile) {
-        $this->outputFile = $outputFile;
-    }
-
-    /**
-     * Get the output file for the
-     * generation process.
-     * @return string
-     */
-    public function getOutputFile() {
-        return $this->outputFile;
-    }        
-    
-    /**
-     * Set the context properties that will be
-     * fed into the initial context be the
-     * generating process starts.
-     * @param string $file
-     * @return void
-     */
-    public function setContextProperties($file) {
-        $sources = explode(",", $file);
-        $this->contextProperties = new Properties();
-        
-        // Always try to get the context properties resource
-        // from a file first. Templates may be taken from a JAR
-        // file but the context properties resource may be a 
-        // resource in the filesystem. If this fails than attempt
-        // to get the context properties resource from the
-        // classpath.
-        for ($i=0, $sourcesLength=count($sources); $i < $sourcesLength; $i++) {
-            $source = new Properties();
-            
-            try {
-            
-                // resolve relative path from basedir and leave
-                // absolute path untouched.
-                $fullPath = $this->project->resolveFile($sources[$i]);
-                $this->log("Using contextProperties file: " . $fullPath->toString());
-                $source->load($fullPath);
-                
-            } catch (Exception $e) {
-              
-              throw new BuildException("Context properties file " . $sources[$i] .
-                            " could not be found in the file system!");
-                     
-            }
-        
-            $keys = $source->keys();
-            
-            foreach ($keys as $key) {
-                $name = $key;
-                $value = $this->project->replaceProperties($source->getProperty($name));
-                $this->contextProperties->setProperty($name, $value);
-            }
-        }
-    }
-
-    /**
-     * Get the context properties that will be
-     * fed into the initial context be the
-     * generating process starts.
-     * @return Properties
-     */
-    public function getContextProperties() {
-        return $this->contextProperties;
-    }     
-
-    /** 
-     * Creates an "AssignedVar" class.
-     */
-    public function createAssign() {
-        $a = new AssignedVar();
-        $this->assignedVars[] = $a;
-        return $a;
-    }
-    
-    // ---------------------------------------------------------------
-    // End of XML setters & getters
-    // ---------------------------------------------------------------
-   
-    /**
-     * Creates a Smarty object.
-     *
-     * @return Smarty initialized (cleared) Smarty context.
-     * @throws Exception the execute method will catch 
-     *         and rethrow as a <code>BuildException</code>
-     */
-    public function initControlContext() {
-        $this->context->clear();
-        foreach($this->assignedVars as $var) {
-            $this->context->put($var->getName(), $var->getValue());
-        }
-        return $this->context;
-    }
-    
-    /**
-     * Execute the input script with Velocity
-     *
-     * @throws BuildException  
-     * BuildExceptions are thrown when required attributes are missing.
-     * Exceptions thrown by Velocity are rethrown as BuildExceptions.
-     */
-    public function main() {
-    
-        // Make sure the template path is set.
-        if (empty($this->templatePath)) {
-            throw new BuildException("The template path needs to be defined!");
-        }            
-    
-        // Make sure the control template is set.
-        if ($this->controlTemplate === null) {
-            throw new BuildException("The control template needs to be defined!");
-        }            
-
-        // Make sure the output directory is set.
-        if ($this->outputDirectory === null) {
-            throw new BuildException("The output directory needs to be defined!");
-        }            
-        
-        // Make sure there is an output file.
-        if ($this->outputFile === null) {
-            throw new BuildException("The output file needs to be defined!");
-        }            
-        
-        // Setup Smarty runtime.
-        
-        // Smarty uses one object to store properties and to store
-        // the context for the template (unlike Velocity).  We setup this object, calling it
-        // $this->context, and then initControlContext simply zeros out
-        // any assigned variables.
-        $this->context = new Capsule();
-                
-        if ($this->templatePath !== null) {
-            $this->log("Using templatePath: " . $this->templatePath);
-            $this->context->setTemplatePath($this->templatePath);
-        }                                                        
-                
-        // Make sure the output directory exists, if it doesn't
-        // then create it.
-        $outputDir = new PhingFile($this->outputDirectory);
-        if (!$outputDir->exists()) {
-            $this->log("Output directory does not exist, creating: " . $outputDir->getAbsolutePath());
-            $outputDir->mkdirs();
-        }
-        
-        $this->context->setOutputDirectory($outputDir->getAbsolutePath());
-        
-        $path = $this->outputDirectory . DIRECTORY_SEPARATOR . $this->outputFile;
-        $this->log("Generating to file " . $path);
-        
-        //$writer = new FileWriter($path);
-                
-        // The generator and the output path should
-        // be placed in the init context here and
-        // not in the generator class itself.
-        $c = $this->initControlContext();
-        
-        // Set any variables that need to always
-        // be loaded
-        $this->populateInitialContext($c);
-        
-        // Feed all the options into the initial
-        // control context so they are available
-        // in the control/worker templates.
-        if ($this->contextProperties !== null) {
-            
-            foreach($this->contextProperties->keys() as $property) {
-                    
-            $value = $this->contextProperties->getProperty($property);
-            
-            // Special exception (from Texen)
-            // for properties ending in file.contents:
-            // in that case we dump the contents of the file
-            // as the "value" for the Property.
-            if (preg_match('/file\.contents$/', $property)) {
-                // pull in contents of file specified 
-                                        
-                $property = substr($property, 0, strpos($property, "file.contents") - 1);
-                
-                // reset value, and then 
-                // read in teh contents of the file into that var
-                $value = "";
-                $f = new PhingFile($project->resolveFile($value)->getCanonicalPath());                        
-                if ($f->exists()) {
-                    $fr = new FileReader($f);
-                    $fr->readInto($value);
-                }
-                                                                
-            } // if ends with file.contents
-            
-            if (StringHelper::isBoolean($value)) {
-                $value = StringHelper::booleanValue($value);
-            }
-                                                            
-            $c->put($property, $value); 
-                 
-            } // foreach property
-                
-        } // if contextProperties !== null
-        
-        try {
-            $this->log("Parsing control template: " . $this->controlTemplate);
-            $c->parse($this->controlTemplate, $path);
-        } catch (Exception $ioe) {
-            throw new BuildException("Cannot write parsed template: ". $ioe->getMessage());
-        }        
-        
-        $this->cleanup();    
-    }
-
-    /**
-     * Place useful objects into the initial context.
-     *
-     *
-     * @param Capsule $context The context to populate, as retrieved from
-     * {@link #initControlContext()}.
-     * @return void
-     * @throws Exception Error while populating context.  The {@link
-     * #main()} method will catch and rethrow as a
-     * <code>BuildException</code>.
-     */
-    protected function populateInitialContext(Capsule $context) {
-        $this->context->put("now", strftime("%c", time()));
-        $this->context->put("task", $this);
-    }
-
-    /**
-     * A hook method called at the end of {@link #execute()} which can
-     * be overridden to perform any necessary cleanup activities (such
-     * as the release of database connections, etc.).  By default,
-     * does nothing.
-     * @return void
-     * @throws Exception Problem cleaning up.
-     */
-    protected function cleanup() {
-    }
-}
-
-
-/**
- * An "inner" class for holding assigned var values.
- * May be need to expand beyond name/value in the future.
- */
-class AssignedVar {
-    
-    private $name;
-    private $value;
-    
-    function setName($v) {
-        $this->name = $v;
-    }
-    
-    function setValue($v) {
-        $this->value = $v;
-    }
-    
-    function getName() {
-        return $this->name;
-    }
-    
-    function getValue() {
-        return $this->value;
-    }
-
-}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ExtractBaseTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ExtractBaseTask.php
deleted file mode 100644
index bfbceaedd..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ExtractBaseTask.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-/*
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/tasks/system/MatchingTask.php';
-
-/**
- * Base class for extracting tasks such as Unzip and Untar.
- *
- * @author    Joakim Bodin <joakim.bodin+phing@gmail.com>
- * @version   $Revision: 1.0 $
- * @package   phing.tasks.ext
- * @since     2.2.0
- */
-abstract class ExtractBaseTask extends MatchingTask {
-    /**
-     * @var PhingFile $file
-     */
-    protected $file;
-    /**
-     * @var PhingFile $todir
-     */
-    protected $todir;
-    protected $removepath;
-    protected $filesets = array(); // all fileset objects assigned to this task
-
-    /**
-     * Add a new fileset.
-     * @return FileSet
-     */
-    public function createFileSet() {
-        $this->fileset = new FileSet();
-        $this->filesets[] = $this->fileset;
-        return $this->fileset;
-    }
-
-    /**
-     * Set the name of the zip file to extract.
-     * @param PhingFile $file zip file to extract
-     */
-    public function setFile(PhingFile $file) {
-        $this->file = $file;
-    }
-
-    /**
-     * This is the base directory to look in for things to zip.
-     * @param PhingFile $baseDir
-     */
-    public function setToDir(PhingFile $todir) {
-        $this->todir = $todir;
-    }
-    
-    public function setRemovePath($removepath)
-    {
-    	$this->removepath = $removepath;
-    }
-
-    /**
-     * do the work
-     * @throws BuildException
-     */
-    public function main() {
-    
-        $this->validateAttributes();
-        
-        $filesToExtract = array();
-        if ($this->file !== null) {
-            if(!$this->isDestinationUpToDate($this->file)) {
-                $filesToExtract[] = $this->file;
-            } else {
-            	$this->log('Nothing to do: ' . $this->todir->getAbsolutePath() . ' is up to date for ' .  $this->file->getCanonicalPath(), Project::MSG_INFO);
-            }
-        }
-        
-        foreach($this->filesets as $compressedArchiveFileset) {
-            $compressedArchiveDirScanner = $compressedArchiveFileset->getDirectoryScanner($this->project);
-            $compressedArchiveFiles = $compressedArchiveDirScanner->getIncludedFiles();
-            $compressedArchiveDir = $compressedArchiveFileset->getDir($this->project);
-            
-            foreach ($compressedArchiveFiles as $compressedArchiveFilePath) {
-                $compressedArchiveFile = new PhingFile($compressedArchiveDir, $compressedArchiveFilePath);
-                if($compressedArchiveFile->isDirectory())
-                {
-                    throw new BuildException($compressedArchiveFile->getAbsolutePath() . ' compressed archive cannot be a directory.');
-                }
-                
-            	if(!$this->isDestinationUpToDate($compressedArchiveFile)) {
-            	   $filesToExtract[] = $compressedArchiveFile;
-            	} else {
-            		$this->log('Nothing to do: ' . $this->todir->getAbsolutePath() . ' is up to date for ' .  $compressedArchiveFile->getCanonicalPath(), Project::MSG_INFO);
-            	}
-            }
-        }
-        
-        foreach ($filesToExtract as $compressedArchiveFile) {
-            $this->extractArchive($compressedArchiveFile);
-        }
-    }
-    
-    abstract protected function extractArchive(PhingFile $compressedArchiveFile);
-    
-    /**
-     * @param array $files array of filenames
-     * @param PhingFile $dir
-     * @return boolean
-     */
-    protected function isDestinationUpToDate(PhingFile $compressedArchiveFile) {
-        if (!$compressedArchiveFile->exists()) {
-        	throw new BuildException("Could not find file " . $compressedArchiveFile->__toString() . " to extract.");
-        }
-        
-        $compressedArchiveContent = $this->listArchiveContent($compressedArchiveFile);
-        if(is_array($compressedArchiveContent)) {
-            
-            $fileSystem = FileSystem::getFileSystem();
-            foreach ($compressedArchiveContent as $compressArchivePathInfo) {
-                $compressArchiveFilename = $compressArchivePathInfo['filename'];
-                if(!empty($this->removepath) && strlen($compressArchiveFilename) >= strlen($this->removepath))
-                {
-                    $compressArchiveFilename = preg_replace('/^' . $this->removepath . '/','', $compressArchiveFilename);
-                }
-                $compressArchivePath = new PhingFile($this->todir, $compressArchiveFilename);
-                
-                if(!$compressArchivePath->exists() ||
-                    $fileSystem->compareMTimes($compressedArchiveFile->getCanonicalPath(), $compressArchivePath->getCanonicalPath()) == 1) {
-                    return false;
-                }
-            }
-            
-        }
-        
-        return true;
-    }
-    
-    abstract protected function listArchiveContent(PhingFile $compressedArchiveFile);
-    
-    /**
-     * Validates attributes coming in from XML
-     *
-     * @access  private
-     * @return  void
-     * @throws  BuildException
-     */
-    protected function validateAttributes() {
-    
-        if ($this->file === null && count($this->filesets) === 0) {
-            throw new BuildException("Specify at least one source compressed archive - a file or a fileset.");
-        }
-
-        if ($this->todir === null) {
-            throw new BuildException("todir must be set.");
-        }
-        
-        if ($this->todir !== null && $this->todir->exists() && !$this->todir->isDirectory()) {
-            throw new BuildException("todir must be a directory.");
-        }
-
-        if ($this->file !== null && $this->file->exists() && $this->file->isDirectory()) {
-            throw new BuildException("Compressed archive file cannot be a directory.");
-        }
-        
-        if ($this->file !== null && !$this->file->exists()) {
-        	throw new BuildException("Could not find compressed archive file " . $this->file->__toString() . " to extract.");
-        }
-    }
-    
-}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/FtpDeployTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/FtpDeployTask.php
deleted file mode 100644
index 5249a87e6..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/FtpDeployTask.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/**
- * $Id: FtpDeployTask.php 381 2008-07-29 16:22:26Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-require_once 'PEAR.php';
-
-/**
- * FtpDeployTask
- * 
- * Deploys a set of files to a remote FTP server.
- * 
- * 
- * Example usage:
- * <ftpdeploy host="host" port="21" username="user" password="password" dir="public_html" mode="ascii" clearfirst="true">
- *   <fileset dir=".">
- *     <include name="**"/>
- *     <exclude name="phing"/>
- *     <exclude name="build.xml"/>
- *     <exclude name="images/**.png"/>
- *     <exclude name="images/**.gif"/>
- *     <exclude name="images/**.jpg"/>
- *   </fileset>
- * </ftpdeploy>
- *
- * 
- * @todo Documentation
- * @author Jorrit Schippers <jorrit at ncode dot nl>
- * @since 2.3.1
- */
-class FtpDeployTask extends Task
-{
-	private $host = null;
-	private $port = 0;
-	private $username = null;
-	private $password = null;
-	private $dir = null;
-	private $filesets;
-	private $completeDirMap;
-	private $mode = null;
-	private $clearFirst = false;
-	
-	public function __construct() {
-		$this->filesets = array();
-		$this->completeDirMap = array();
-	}
-	
-	public function setHost($host) {
-		$this->host = $host;
-	}
-	
-	public function setPort($port) {
-		$this->port = (int) $port;
-	}
-	
-	public function setUsername($username) {
-		$this->username = $username;
-	}
-	
-	public function setPassword($password) {
-		$this->password = $password;
-	}
-	
-	public function setDir($dir) {
-		$this->dir = $dir;
-	}
-	
-	public function setMode($mode) {
-		switch(strtolower($mode)) {
-			case 'ascii':
-				$this->mode = FTP_ASCII;
-				break;
-			case 'binary':
-			case 'bin':
-				$this->mode = FTP_BINARY;
-				break;
-		}
-	}
-	
-	public function setClearFirst($clearFirst) {
-		$this->clearFirst = (bool) $clearFirst;
-	}
-	
-	function createFileSet() {
-		$num = array_push($this->filesets, new FileSet());
-		return $this->filesets[$num-1];
-	}
-	
-	/**
-	 * The init method: check if Net_FTP is available
-	 */
-	public function init() {
-		$paths = explode(PATH_SEPARATOR, get_include_path());
-		foreach($paths as $path) {
-			if(file_exists($path.DIRECTORY_SEPARATOR.'Net'.DIRECTORY_SEPARATOR.'FTP.php')) {
-				return true;
-			}
-		}
-		throw new BuildException('The FTP Deploy task requires the Net_FTP PEAR package.');
-	}
-	
-	/**
-	 * The main entry point method.
-	 */
-	public function main() {
-		$project = $this->getProject();
-		
-		require_once 'Net/FTP.php';
-		$ftp = new Net_FTP($this->host, $this->port);
-		$ret = $ftp->connect();
-		if(PEAR::isError($ret))
-			throw new BuildException('Could not connect to FTP server '.$this->host.' on port '.$this->port.': '.$ret->getMessage());
-		$ret = $ftp->login($this->username, $this->password);
-		if(PEAR::isError($ret))
-			throw new BuildException('Could not login to FTP server '.$this->host.' on port '.$this->port.' with username '.$this->username.': '.$ret->getMessage());
-		
-		if($this->clearFirst) {
-			// TODO change to a loop through all files and directories within current directory
-			$this->log('Clearing directory '.$this->dir, Project::MSG_INFO);
-			$dir = substr($this->dir, -1) == '/' ? $this->dir : $this->dir.'/';
-			$ftp->rm($dir, true);
-			$ftp->mkdir($dir);
-		}
-		
-		$ret = $ftp->cd($this->dir);
-		if(PEAR::isError($ret))
-			throw new BuildException('Could not change to directory '.$this->dir.': '.$ret->getMessage());
-		
-		$fs = FileSystem::getFileSystem();
-		$convert = $fs->getSeparator() == '\\';
-		
-		foreach($this->filesets as $fs) {
-			$ds = $fs->getDirectoryScanner($project);
-			$fromDir  = $fs->getDir($project);
-			$srcFiles = $ds->getIncludedFiles();
-			$srcDirs  = $ds->getIncludedDirectories();
-			foreach($srcDirs as $dirname) {
-				if($convert)
-					$dirname = str_replace('\\', '/', $dirname);
-				$this->log('Will create directory '.$dirname, Project::MSG_VERBOSE);
-				$ret = $ftp->mkdir($dirname, true);
-				if(PEAR::isError($ret))
-					throw new BuildException('Could not create directory '.$dirname.': '.$ret->getMessage());
-			}
-			foreach($srcFiles as $filename) {
-				$file = new PhingFile($fromDir->getAbsolutePath(), $filename);
-				if($convert)
-					$filename = str_replace('\\', '/', $filename);
-				$this->log('Will copy '.$file->getCanonicalPath().' to '.$filename, Project::MSG_VERBOSE);
-				$ret = $ftp->put($file->getCanonicalPath(), $filename, true, $this->mode);
-				if(PEAR::isError($ret))
-					throw new BuildException('Could not deploy file '.$filename.': '.$ret->getMessage());
-			}
-		}
-		
-		$ftp->disconnect();
-	}
-}
-?>
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/JslLintTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/JslLintTask.php
deleted file mode 100644
index ce350bf5c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/JslLintTask.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-/*
- *  $Id$
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-  
-require_once 'phing/Task.php';
-
-  /**
-  * A Javascript lint task. Checks syntax of Javascript files.
-  * Javascript lint (http://www.javascriptlint.com) must be in the system path.
-  * This class is based on Knut Urdalen's PhpLintTask.
-  *
-  * @author Stefan Priebsch <stefan.priebsch@e-novative.de>
-  */
-  class JslLintTask extends Task
-  {
-    protected $file;  // the source file (from xml attribute)
-    protected $filesets = array(); // all fileset objects assigned to this task
-
-    protected $showWarnings = true;
-    protected $haltOnFailure = false;
-    protected $hasErrors = false;
-    private $badFiles = array();
-
-    /**
-     * Sets the flag if warnings should be shown
-     * @param boolean $show
-     */
-    public function setShowWarnings($show) {
-      $this->showWarnings = StringHelper::booleanValue($show);
-    }
-
-    /**
-     * The haltonfailure property
-     * @param boolean $aValue
-     */
-    public function setHaltOnFailure($aValue) {
-      $this->haltOnFailure = $aValue;
-    }
-  
-    /**
-     * File to be performed syntax check on
-     * @param PhingFile $file
-     */
-    public function setFile(PhingFile $file) {
-      $this->file = $file;
-    }
-    
-    /**
-     * Nested creator, creates a FileSet for this task
-     *
-     * @return FileSet The created fileset object
-     */
-    function createFileSet() {
-      $num = array_push($this->filesets, new FileSet());
-      return $this->filesets[$num-1];
-    }
-  
-    /**
-     * Execute lint check against PhingFile or a FileSet
-     */
-    public function main() {
-      if(!isset($this->file) and count($this->filesets) == 0) {
-        throw new BuildException("Missing either a nested fileset or attribute 'file' set");
-      }
-  
-      if($this->file instanceof PhingFile) {
-        $this->lint($this->file->getPath());
-      } else { // process filesets
-        $project = $this->getProject();
-        foreach($this->filesets as $fs) {
-          $ds = $fs->getDirectoryScanner($project);
-          $files = $ds->getIncludedFiles();
-          $dir = $fs->getDir($this->project)->getPath();
-          foreach($files as $file) {
-            $this->lint($dir.DIRECTORY_SEPARATOR.$file);
-          }
-        }
-      }
-  
-      if ($this->haltOnFailure && $this->hasErrors) throw new BuildException('Syntax error(s) in JS files:' .implode(', ',$this->badFiles));
-    }
-  
-    /**
-     * Performs the actual syntax check
-     *
-     * @param string $file
-     * @return void
-     */
-    protected function lint($file)
-    {
-      exec('jsl', $output);
-      if (!preg_match('/JavaScript\sLint/', implode('', $output))) throw new BuildException('Javascript Lint not found');
-    
-      $command = 'jsl -output-format file:__FILE__;line:__LINE__;message:__ERROR__ -process ';
-
-      if(file_exists($file))
-      {
-        if(is_readable($file))
-        {
-          $messages = array();
-          exec($command.'"'.$file.'"', $messages);
-
-          $summary = $messages[sizeof($messages) - 1];
-
-          preg_match('/(\d+)\serror/', $summary, $matches);
-          $errorCount = $matches[1];
-          
-          preg_match('/(\d+)\swarning/', $summary, $matches);
-          $warningCount = $matches[1];
-
-          $errors = array();
-          $warnings = array();
-          if ($errorCount > 0 || $warningCount > 0) {
-            $last = false;
-            foreach ($messages as $message) {
-              $matches = array();
-              if (preg_match('/^(\.*)\^$/', $message)) {
-                $column = strlen($message);
-                if ($last == 'error') {
-                  $errors[count($errors) - 1]['column'] = $column;
-                } else if ($last == 'warning') {
-                  $warnings[count($warnings) - 1]['column'] = $column;
-                }
-                $last = false;
-              }
-              if (!preg_match('/^file:(.+);line:(\d+);message:(.+)$/', $message, $matches)) continue;
-              $msg = $matches[3];
-              $data = array('filename' => $matches[1], 'line' => $matches[2], 'message' => $msg);
-              if (preg_match('/^.*error:.+$/i', $msg)) {
-                $errors[] = $data;
-                $last = 'error';
-              } else if (preg_match('/^.*warning:.+$/i', $msg)) {
-                $warnings[] = $data;
-                $last = 'warning';
-              }
-            }
-          }
-
-          if($this->showWarnings && $warningCount > 0)
-          {
-            $this->log($file . ': ' . $warningCount . ' warnings detected', Project::MSG_WARN);
-            foreach ($warnings as $warning) {
-              $this->log('- line ' . $warning['line'] . (isset($warning['column']) ? ' column ' . $warning['column'] : '') . ': ' . $warning['message'], Project::MSG_WARN);
-            }
-          }
-            
-          if($errorCount > 0)
-          {
-            $this->log($file . ': ' . $errorCount . ' errors detected', Project::MSG_ERR);
-            foreach ($errors as $error) {
-              $this->log('- line ' . $error['line'] . (isset($error['column']) ? ' column ' . $error['column'] : '') . ': ' . $error['message'], Project::MSG_ERR);
-            }
-            $this->badFiles[] = $file;
-            $this->hasErrors = true;
-          } else if (!$this->showWarnings || $warningCount == 0) {
-            $this->log($file . ': No syntax errors detected', Project::MSG_INFO);
-          }
-        } else {
-          throw new BuildException('Permission denied: '.$file);
-        }
-      } else {
-        throw new BuildException('File not found: '.$file);
-      }
-    }
-  }
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/MailTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/MailTask.php
deleted file mode 100755
index 7d926b8de..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/MailTask.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/*
- *  $Id: MailTask.php 43 2006-03-10 14:31:51Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-include_once 'phing/Task.php';
-
-/**
- *  Send a message by mail() 
- *
- *  <mail to="user@example.org" subject="build complete">The build process is a success...</mail> 
- * 
- *  @author   Francois Harvey at SecuriWeb (http://www.securiweb.net)
- *  @version  $Revision: 1.1 $
- *  @package  phing.tasks.ext
- */
-class MailTask extends Task {
-
-    protected $recipient;
-      
-    protected $subject;
-    
-    protected $msg;
-
-    function main() {
-        $this->log('Sending mail to ' . $this->recipient );    
-        mail($this->recipient, $this->subject, $this->msg);
-    }
-
-    /** setter for message */
-    function setMsg($msg) {
-        $this->setMessage($msg);
-    }
-
-    /** alias setter */
-    function setMessage($msg) {
-        $this->msg = (string) $msg;
-    }
-    
-    /** setter for subject **/
-    function setSubject($subject) {
-        $this->subject = (string) $subject;    
-    }
-
-    /** setter for recipient **/
-    function setRecipient($recipient) {
-        $this->recipient = (string) $recipient;
-    }
-
-    /** alias for recipient **/
-    function setTo($recipient) {
-        $this->recipient = (string) $recipient;
-    }
-        
-    /** Supporting the <mail>Message</mail> syntax. */
-    function addText($msg)
-    {
-        $this->msg = (string) $msg;
-    }
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ManifestTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ManifestTask.php
deleted file mode 100644
index cbc4df1ce..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ManifestTask.php
+++ /dev/null
@@ -1,341 +0,0 @@
-<?php
-/**
- * $Id: ManifestTask.php 341 2008-01-21 14:41:07Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once "phing/Task.php";
-require_once 'phing/system/io/PhingFile.php';
-
-/**
- * ManifestTask
- * 
- * Generates a simple Manifest file with optional checksums.
- * 
- * 
- * Manifest schema:
- * ...
- * path/to/file		CHECKSUM	[CHECKSUM2]		[CHECKSUM3]
- * path/to/secondfile		CHECKSUM	[CHECKSUM2]		[CHECKSUM3]
- * ...
- * 
- * Example usage:
- * <manifest checksum="crc32" file="${dir_build}/Manifest">
- * 		<fileset refid="files_build" />
- * </manifest>
- * 
- * <manifest checksum="md5,adler32,sha256" file="${dir_build}/Manifest">
- * 		<fileset refid="files_build" />
- * </manifest>
- * 
- * 
- * 
- * @author David Persson <davidpersson at qeweurope dot org>
- * @since 2.3.1
- */
-class ManifestTask extends Task
-{
-	var $taskname = 'manifest';
-	
-	/**
-	 * Action
-	 * 
-	 * "w" for reading in files from fileSet
-	 * and writing manifest
-	 * 
-	 * or
-	 * 
-	 * "r" for reading in files from fileSet
-	 * and checking against manifest
-	 * 
-	 * @var string "r" or "w"
-	 */
-	private $action = 'w';
-	
-    /**
-     * The target file passed in the buildfile.
-     */
-    private $destFile = null;
-    
-    /**
-     * Holds filesets
-     *
-     * @var array An Array of objects
-     */
-	private $filesets = array();
-
-    /**
-     * Enable/Disable checksuming or/and select algorithm
-     * true defaults to md5
-     * false disables checksuming
-     * string "md5,sha256,..." enables generation of multiple checksums
-     * string "sha256" generates sha256 checksum only
-     * 
-     * @var mixed
-     */
-	private $checksum = false;
-	
-	/**
-	 * A string used in hashing method
-	 *
-	 * @var string
-	 */
-	private $salt = '';
-	
-	/**
-	 * Holds some data collected during runtime
-	 *
-	 * @var array
-	 */
-	private $meta = array('totalFileCount' => 0,'totalFileSize' => 0);
-	
-	
-    /**
-     * The setter for the attribute "file"
-     * This is where the manifest will be written to/read from
-     * 
-     * @param string Path to readable file
-     * @return void
-     */
-    public function setFile(PhingFile $file)
-    {
-        $this->file = $file;
-    }
-
-    /**
-     * The setter for the attribute "checksum"
-     * 
-     * @param mixed $mixed
-     * @return void
-     */
-    public function setChecksum($mixed)
-    {
-    	if(is_string($mixed)) {
-    		$data = array(strtolower($mixed));
-
-    		if(strpos($data[0],',')) {
-				$data = explode(',',$mixed);
-			}
-			
-			$this->checksum = $data;
-						    		
-    	} elseif($mixed === true) {
-	        $this->checksum = array('md5');
-    		
-    	}
-    }
-    
-    /**
-     * The setter for the optional attribute "salt"
-     *
-     * @param string $string
-     * @return void
-     */
-    public function setSalt($string) 
-    {
-    	$this->salt = $string;
-    }    
-    
-    /**
-     * Nested creator, creates a FileSet for this task
-     *
-     * @access  public
-     * @return  object  The created fileset object
-     */
-    public function createFileSet()
-    {
-        $num = array_push($this->filesets, new FileSet());
-        return $this->filesets[$num-1];
-    }
-
-    /**
-     * The init method: Do init steps.
-     */
-    public function init()
-    {
-      // nothing to do here
-    }
-
-    /**
-     * Delegate the work
-     */
-    public function main()
-    {
-		$this->validateAttributes();
-        
-		if($this->action == 'w') {
-			$this->write();
-			
-		} elseif($this->action == 'r') {
-			$this->read();
-			
-		}
-    }
-
-    /**
-     * Creates Manifest file
-     * Writes to $this->file
-     * 
-     * @throws BuildException
-     */
-    private function write()
-    {
-      	$project = $this->getProject();
-        
-    	if(!touch($this->file->getPath())) {
-			throw new BuildException("Unable to write to ".$this->file->getPath().".");
-		}        
-
-		$this->log("Writing to " . $this->file->__toString(), Project::MSG_INFO);
-
-		if(is_array($this->checksum)) {
-			$this->log("Using " . implode(', ',$this->checksum)." for checksuming.", Project::MSG_INFO);
-		}
-		
-		foreach($this->filesets as $fs) {
-			
-			$dir = $fs->getDir($this->project)->getPath();
-
-            $ds = $fs->getDirectoryScanner($project);
-            $fromDir  = $fs->getDir($project);
-            $srcFiles = $ds->getIncludedFiles();
-            $srcDirs  = $ds->getIncludedDirectories();			
-
-            foreach($ds->getIncludedFiles() as $file_path) {
-				$line = $file_path;
-				if($this->checksum) {
-					foreach($this->checksum as $algo) {
-						if(!$hash = $this->hashFile($dir.'/'.$file_path,$algo)) {
-							throw new BuildException("Hashing $dir/$file_path with $algo failed!");
-						}
-
-						$line .= "\t".$hash;
-					}
-				}
-				$line .= "\n";
-				$manifest[] = $line;
-				$this->log("Adding file ".$file_path,Project::MSG_VERBOSE);
-				$this->meta['totalFileCount'] ++;
-				$this->meta['totalFileSize'] += filesize($dir.'/'.$file_path);
-			}
-			
-		}
-		
-		file_put_contents($this->file,$manifest);
-		
-		$this->log("Done. Total files: ".$this->meta['totalFileCount'].". Total file size: ".$this->meta['totalFileSize']." bytes.", Project::MSG_INFO);    	
-    }
-    
-    /**
-     * @todo implement
-     */
-    private function read()
-    {
-    	throw new BuildException("Checking against manifest not yet supported.");
-    }
-    
-    /**
-     * Wrapper method for hash generation
-     * Automatically selects extension
-     * Falls back to built-in functions
-     * 
-     * @link  http://www.php.net/mhash
-     * @link  http://www.php.net/hash
-     * 
-     * @param string $msg The string that should be hashed
-     * @param string $algo Algorithm
-     * @return mixed String on success, false if $algo is not available 
-     */
-    private function hash($msg,$algo) 
-    {
-		if(extension_loaded('hash')) {
-			$algo = strtolower($algo);
-    		
-			if(in_array($algo,hash_algos())) {
-				return hash($algo,$this->salt.$msg);
-			}
-			
-    	}
-    	
-    	if(extension_loaded('mhash')) {
-			$algo = strtoupper($algo);
-			
-			if(defined('MHASH_'.$algo)) {
-				return mhash('MHASH_'.$algo,$this->salt.$msg);
-			
-			}
-		}
-		
-		switch(strtolower($algo)) {
-			case 'md5':
-				return md5($this->salt.$msg);
-			case 'crc32':
-				return abs(crc32($this->salt.$msg));
-		}
-		
-		return false;
-    }
-    
-    /**
-     * Hash a files contents 
-     * plus it's size an modification time
-     *
-     * @param string $file
-     * @param string $algo
-     * @return mixed String on success, false if $algo is not available 
-     */
-    private function hashFile($file,$algo)
-    {
-    	if(!file_exists($file)) {
-    		return false;
-    	}
-    	
-    	$msg = file_get_contents($file).filesize($file).filemtime($file);
-    	
-    	return $this->hash($msg,$algo);
-    }
-    
-    /**
-     * Validates attributes coming in from XML
-     *
-     * @access  private
-     * @return  void
-     * @throws  BuildException
-     */
-    protected function validateAttributes()
-    {
-        if($this->action != 'r' && $this->action != 'w') {
-    		throw new BuildException("'action' attribute has non valid value. Use 'r' or 'w'");
-    	}
-    	    	
-    	if(empty($this->salt)) {
-    		$this->log("No salt provided. Specify one with the 'salt' attribute.", Project::MSG_WARN);
-    	}
-    	
-        if (is_null($this->file) && count($this->filesets) === 0) {
-            throw new BuildException("Specify at least sources and destination - a file or a fileset.");
-        }
-
-        if (!is_null($this->file) && $this->file->exists() && $this->file->isDirectory()) {
-            throw new BuildException("Destination file cannot be a directory.");
-        }
-        
-    }     
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/PackageAsPathTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/PackageAsPathTask.php
deleted file mode 100644
index ef537cb87..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/PackageAsPathTask.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/*
- *  $Id: PackageAsPathTask.php 43 2006-03-10 14:31:51Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-require_once 'phing/Task.php';
-
-/**
- * Convert dot-notation packages to relative paths.
- *
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.5 $
- * @package   phing.tasks.ext
- */
-class PackageAsPathTask extends Task {
-
-    /** The package to convert. */
-    protected $pckg;
-
-    /** The value to store the conversion in. */
-    protected $name;
-    
-    /**
-     * Executes the package to patch converstion and stores it
-     * in the user property <code>value</code>.
-     */
-    public function main()
-    {
-        $this->project->setUserProperty($this->name, strtr($this->pckg, '.', '/'));        
-    }
-
-    /**
-     * @param string $pckg the package to convert
-     */
-    public function setPackage($pckg)
-    {
-        $this->pckg = $pckg;
-    }
-
-    /**
-     * @param string $name the Ant variable to store the path in
-     */
-    public function setName($name)
-    {
-        $this->name = $name;
-    }
-    
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/PearPackage2Task.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/PearPackage2Task.php
deleted file mode 100644
index 32673541b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/PearPackage2Task.php
+++ /dev/null
@@ -1,270 +0,0 @@
-<?php
-/*
- *  $Id: PearPackage2Task.php 210 2007-08-01 22:48:36Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/tasks/ext/PearPackageTask.php';
-
-/**
- * A task to create a PEAR package.xml version 2.0 file.
- *
- * This class uses the PEAR_PackageFileManager2 class to perform the work.
- *
- * This class is designed to be very flexible -- i.e. account for changes to the package.xml w/o
- * requiring changes to this class.  We've accomplished this by having generic <option> and <mapping>
- * nested elements.  All options are set using PEAR_PackageFileManager2::setOptions().
- *
- * The <option> tag is used to set a simple option value.
- * <code>
- * <option name="option_name" value="option_value"/>
- * or <option name="option_name">option_value</option>
- * </code>
- *
- * The <mapping> tag represents a complex data type.  You can use nested <element> (and nested <element> with
- * <element> tags) to represent the full complexity of the structure.  Bear in mind that what you are creating
- * will be mapped to an associative array that will be passed in via PEAR_PackageFileManager2::setOptions().
- * <code>
- * <mapping name="option_name">
- *  <element key="key_name" value="key_val"/>
- *  <element key="key_name" value="key_val"/>
- * </mapping>
- * </code>
- *
- * Here's an over-simple example of how this could be used:
- * <code>
- * <pearpkg2 name="phing" dir="${build.src.dir}">
- *  <fileset dir="src">
- *      <include name="**"/>
- *  </fileset>
- *  <option name="outputdirectory" value="./build"/>
- *  <option name="packagefile" value="package2.xml"/>
- *  <option name="packagedirectory" value="./${build.dist.dir}"/>
- *  <option name="baseinstalldir" value="${pkg.prefix}"/>
- *  <option name="channel" value="my.pear-channel.com"/>
- *  <option name="summary" value="${pkg.summary}"/>
- *  <option name="description" value="${pkg.description}"/>
- *  <option name="apiversion" value="${pkg.version}"/>
- *  <option name="apistability" value="beta"/>
- *  <option name="releaseversion" value="${pkg.version}"/>
- *  <option name="releasestability" value="beta"/>
- *  <option name="license" value="none"/>
- *  <option name="phpdep" value="5.0.0"/>
- *  <option name="pearinstallerdep" value="1.4.6"/>
- *  <option name="packagetype" value="php"/>
- *  <option name="notes" value="${pkg.relnotes}"/>
- *  <mapping name="maintainers">
- *   <element>
- *    <element key="handle" value="hlellelid"/>
- *    <element key="name" value="Hans"/>
- *    <element key="email" value="hans@xmpl.org"/>
- *    <element key="role" value="lead"/>
- *   </element>
- *  </mapping>
- * </pearpkg2>
- * </code>
- *
- * Look at the build.xml in the Phing base directory (assuming you have the full distro / CVS version of Phing) to
- * see a more complete example of how to call this script.
- *
- * @author   Stuart Binge <stuart.binge@complinet.com>
- * @author   Hans Lellelid <hans@xmpl.org>
- * @package  phing.tasks.ext
- * @version  $Revision: 1.9 $
- */
-class PearPackage2Task extends PearPackageTask {
-
-    public function init() {
-        include_once 'PEAR/PackageFileManager2.php';
-        if (!class_exists('PEAR_PackageFileManager2')) {
-            throw new BuildException("You must have installed PEAR_PackageFileManager in order to create a PEAR package.xml version 2.0 file.");
-        }
-    }
-
-    protected function setVersion2Options()
-    {
-        $this->pkg->setPackage($this->package);
-        $this->pkg->setDate(strftime('%Y-%m-%d'));
-        $this->pkg->setTime(strftime('%H:%M:%S')); 
-
-        $newopts = array();
-        foreach ($this->options as $opt) {
-            switch ($opt->getName()) {
-                case 'summary':
-                    $this->pkg->setSummary($opt->getValue());
-                    break;
-
-                case 'description':
-                    $this->pkg->setDescription($opt->getValue());
-                    break;
-
-                case 'uri':
-                    $this->pkg->setUri($opt->getValue());
-                    break;
-
-                case 'license':
-                    $this->pkg->setLicense($opt->getValue());
-                    break;
-
-                case 'channel':
-                    $this->pkg->setChannel($opt->getValue());
-                    break;
-
-                case 'apiversion':
-                    $this->pkg->setAPIVersion($opt->getValue());
-                    break;
-
-                case 'releaseversion':
-                    $this->pkg->setReleaseVersion($opt->getValue());
-                    break;
-
-                case 'releasestability':
-                    $this->pkg->setReleaseStability($opt->getValue());
-                    break;
-
-                case 'apistability':
-                    $this->pkg->setAPIStability($opt->getValue());
-                    break;
-
-                case 'notes':
-                    $this->pkg->setNotes($opt->getValue());
-                    break;
-
-                case 'packagetype':
-                    $this->pkg->setPackageType($opt->getValue());
-                    break;
-
-                case 'phpdep':
-                    $this->pkg->setPhpDep($opt->getValue());
-                    break;
-
-                case 'pearinstallerdep':
-                    $this->pkg->setPearinstallerDep($opt->getValue());
-                    break;
-
-                default:
-                    $newopts[] = $opt;
-                    break;
-            }
-        }
-        $this->options = $newopts;
-
-        $newmaps = array();
-        foreach ($this->mappings as $map) {
-            switch ($map->getName()) {
-                case 'deps':
-                    $deps = $map->getValue();
-                    foreach ($deps as $dep) {
-                        $type = isset($dep['optional']) ? 'optional' : 'required';
-                        $min = isset($dep['min']) ? $dep['min'] : $dep['version'];
-                        $max = isset($dep['max']) ? $dep['max'] : $dep['version'];
-                        $rec = isset($dep['recommended']) ? $dep['recommended'] : $dep['version'];
-                        $channel = isset($dep['channel']) ? $dep['channel'] : false;
-                        $uri = isset($dep['uri']) ? $dep['uri'] : false;
-
-                        if (!empty($channel)) {
-                            $this->pkg->addPackageDepWithChannel(
-                                $type, $dep['name'], $channel, $min, $max, $rec
-                            );
-                        } elseif (!empty($uri)) {
-                            $this->pkg->addPackageDepWithUri(
-                                $type, $dep['name'], $uri
-                            );
-                        }
-                    };
-                    break;
-
-                case 'extdeps':
-                    $deps = $map->getValue();
-                    foreach ($deps as $dep) {
-                        $type = isset($dep['optional']) ? 'optional' : 'required';
-                        $min = isset($dep['min']) ? $dep['min'] : $dep['version'];
-                        $max = isset($dep['max']) ? $dep['max'] : $dep['version'];
-                        $rec = isset($dep['recommended']) ? $dep['recommended'] : $dep['version'];
-
-                        $this->pkg->addExtensionDep(
-                            $type, $dep['name'], $min, $max, $rec
-                        );
-                    };
-                    break;
-
-                case 'maintainers':
-                    $maintainers = $map->getValue();
-
-                    foreach ($maintainers as $maintainer) {
-                        if (!isset($maintainer['active'])) {
-                            $maintainer['active'] = 'yes';
-                        }
-                        $this->pkg->addMaintainer(
-                            $maintainer['role'],
-                            $maintainer['handle'],
-                            $maintainer['name'],
-                            $maintainer['email'],
-                            $maintainer['active']
-                        );
-                    }
-                    break;
-
-                case 'replacements':
-                    $replacements = $map->getValue();
-
-                    foreach($replacements as $replacement) { 
-                        $this->pkg->addReplacement(
-                            $replacement['path'], 
-							$replacement['type'], 
-							$replacement['from'], 
-							$replacement['to']
-						);
-					}
-				    break;
-
-                default:
-                    $newmaps[] = $map;
-            }
-        }
-        $this->mappings = $newmaps;
-    }
-
-    /**
-     * Main entry point.
-     * @return void
-     */
-    public function main()
-    {
-        if ($this->dir === null) {
-            throw new BuildException("You must specify the \"dir\" attribute for PEAR package 2 task.");
-        }
-
-        if ($this->package === null) {
-            throw new BuildException("You must specify the \"name\" attribute for PEAR package 2 task.");
-        }
-
-        $this->pkg = new PEAR_PackageFileManager2();
-
-        $this->setVersion2Options();
-        $this->setOptions();
-
-        $this->pkg->addRelease();
-        $this->pkg->generateContents();
-        $e = $this->pkg->writePackageFile();
-        if (PEAR::isError($e)) {
-            throw new BuildException("Unable to write package file.", new Exception($e->getMessage()));
-        }
-    }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/PearPackageTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/PearPackageTask.php
deleted file mode 100644
index c14a6811d..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/PearPackageTask.php
+++ /dev/null
@@ -1,421 +0,0 @@
-<?php
-/*
- *  $Id: PearPackageTask.php 144 2007-02-05 15:19:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/tasks/system/MatchingTask.php';
-include_once 'phing/types/FileSet.php';
-
-/**
- * A task to create PEAR package.xml file.
- * 
- * This class uses the PEAR_PackageFileMaintainer class to perform the work.
- * 
- * This class is designed to be very flexible -- i.e. account for changes to the package.xml w/o
- * requiring changes to this class.  We've accomplished this by having generic <option> and <mapping>
- * nested elements.  All options are set using PEAR_PackageFileMaintainer::setOptions().
- * 
- * The <option> tag is used to set a simple option value.
- * <code>
- * <option name="option_name" value="option_value"/> 
- * or <option name="option_name">option_value</option>
- * </code>
- * 
- * The <mapping> tag represents a complex data type.  You can use nested <element> (and nested <element> with
- * <element> tags) to represent the full complexity of the structure.  Bear in mind that what you are creating
- * will be mapped to an associative array that will be passed in via PEAR_PackageFileMaintainer::setOptions().
- * <code>
- * <mapping name="option_name">
- *  <element key="key_name" value="key_val"/>
- *  <element key="key_name" value="key_val"/>
- * </mapping>
- * </code>
- * 
- * Here's an over-simple example of how this could be used:
- * <code>
- * <pearpkg name="phing" dir="${build.src.dir}" destFile="${build.base.dir}/package.xml">
- *  <fileset>
- *   <include name="**"/>
- *  </fileset>
- *  <option name="notes">Sample release notes here.</option>
- *  <option name="description">Package description</option>
- *  <option name="summary">Short description</option>
- *  <option name="version" value="2.0.0b1"/>
- *  <option name="state" value="beta"/>
- *  <mapping name="maintainers">
- *   <element>
- *    <element key="handle" value="hlellelid"/>
- *    <element key="name" value="Hans"/>
- *    <element key="email" value="hans@xmpl.org"/>
- *    <element key="role" value="lead"/>
- *   </element>
- *  </mapping>
- * </pearpkg>
- * </code>
- *
- * Look at the build.xml in the Phing base directory (assuming you have the full distro / CVS version of Phing) to
- * see a more complete example of how to call this script.
- * 
- * @author   Hans Lellelid <hans@xmpl.org>
- * @package  phing.tasks.ext
- * @version  $Revision: 1.9 $
- */
-class PearPackageTask extends MatchingTask {
-    
-    /** */        
-    protected $package;
-
-    /** Base directory for reading files. */
-    protected $dir;
-    
-    /** Package file */
-    private $packageFile;
-    
-    /** @var array FileSet[] */
-    private $filesets = array();
-    
-    /** @var PEAR_PackageFileManager */
-    protected $pkg;
-    
-    private $preparedOptions = array();
-    
-    /** @var array PearPkgOption[] */
-    protected $options = array();
-    
-    /** Nested <mapping> (complex options) types. */
-    protected $mappings = array();
-    
-    public function init() {
-        include_once 'PEAR/PackageFileManager.php';
-        if (!class_exists('PEAR_PackageFileManager')) {
-            throw new BuildException("You must have installed PEAR_PackageFileManager in order to create a PEAR package.xml file.");
-        }
-    }
-    
-    /**
-     * Sets PEAR package.xml options, based on class properties.
-     * @return void
-     */
-    protected function setOptions() {
-    
-        // 1) first prepare/populate options        
-        $this->populateOptions();
-
-        // 2) make any final adjustments (this could move into populateOptions() also)
-        
-        // default PEAR basedir would be the name of the package (e.g."phing")
-        if (!isset($this->preparedOptions['baseinstalldir'])) {
-            $this->preparedOptions['baseinstalldir'] = $this->package;
-        }
-        
-        // unless filelistgenerator has been overridden, we use Phing FileSet generator
-        if (!isset($this->preparedOptions['filelistgenerator'])) {
-            if (empty($this->filesets)) {
-                throw new BuildException("You must use a <fileset> tag to specify the files to include in the package.xml");
-            }
-            $this->preparedOptions['filelistgenerator'] = 'Fileset';
-            $this->preparedOptions['usergeneratordir'] = dirname(__FILE__) . DIRECTORY_SEPARATOR . 'pearpackage';
-            // Some PHING-specific options needed by our Fileset reader
-            $this->preparedOptions['phing_project'] = $this->project;
-            $this->preparedOptions['phing_filesets'] = $this->filesets;
-        } elseif ($this->preparedOptions['filelistgeneragor'] != 'Fileset' && !empty($this->filesets)) {
-            throw new BuildException("You cannot use <fileset> element if you have specified the \"filelistgenerator\" option.");
-        }                
-        
-        // 3) Set the options
-                
-        // No need for excessive validation here, since the  PEAR class will do its own 
-        // validation & return errors
-        $e = $this->pkg->setOptions($this->preparedOptions);
-            
-        if (PEAR::isError($e)) {
-            throw new BuildException("Unable to set options.", new Exception($e->getMessage()));
-        }
-    }
-    
-    /**
-     * Fixes the boolean in optional dependencies
-     */
-    private function fixDeps($deps)
-    {
-        foreach (array_keys($deps) as $dep)
-        {
-            if (isset($deps[$dep]['optional']) && $deps[$dep]['optional'])
-            {
-                $deps[$dep]['optional'] = "yes";
-            }
-        }
-        
-        return $deps;
-    }
-    
-    /**
-     * Adds the options that are set via attributes and the nested tags to the options array.
-     */
-    private function populateOptions() {
-        
-        // These values could be overridden if explicitly defined using nested tags    
-        $this->preparedOptions['package'] = $this->package;
-        $this->preparedOptions['packagedirectory'] = $this->dir->getAbsolutePath();
-        
-        if ($this->packageFile !== null) {
-            // create one w/ full path
-            $f = new PhingFile($this->packageFile->getAbsolutePath());
-            $this->preparedOptions['packagefile'] = $f->getName();
-            // must end in trailing slash
-            $this->preparedOptions['outputdirectory'] = $f->getParent() . DIRECTORY_SEPARATOR;
-            $this->log("Creating package file: " . $f->__toString(), Project::MSG_INFO);
-        } else {
-            $this->log("Creating [default] package.xml file in base directory.", Project::MSG_INFO);
-        }
-        
-        // converts option objects and mapping objects into 
-        // key => value options that can be passed to PEAR_PackageFileManager
-        
-        foreach($this->options as $opt) {
-            $this->preparedOptions[ $opt->getName() ] = $opt->getValue(); //no arrays yet. preg_split('/\s*,\s*/', $opt->getValue());
-        }
-        
-        foreach($this->mappings as $map) {
-            $value = $map->getValue(); // getValue returns complex value
-            
-            if ($map->getName() == 'deps')
-            {
-                $value = $this->fixDeps($value);
-            }
-            
-            $this->preparedOptions[ $map->getName() ] = $value;
-        }
-    }
-    
-    /**
-     * Main entry point.
-     * @return void
-     */
-    public function main() {        
-        
-        if ($this->dir === null) {
-            throw new BuildException("You must specify the \"dir\" attribute for PEAR package task.");
-        }
-        
-        if ($this->package === null) {
-            throw new BuildException("You must specify the \"name\" attribute for PEAR package task.");
-        }
-        
-        $this->pkg = new PEAR_PackageFileManager();                
-        
-        $this->setOptions();
-        
-        $e = $this->pkg->writePackageFile();
-        if (PEAR::isError($e)) {
-            throw new BuildException("Unable to write package file.", new Exception($e->getMessage()));
-        }
-        
-    }
-    
-    /**
-     * Used by the PEAR_PackageFileManager_PhingFileSet lister.
-     * @return array FileSet[]
-     */
-    public function getFileSets() {
-        return $this->filesets;
-    }
-    
-    // -------------------------------
-    // Set properties from XML
-    // -------------------------------
-
-    /**
-     * Nested creator, creates a FileSet for this task
-     *
-     * @return FileSet The created fileset object
-     */
-    function createFileSet() {
-        $num = array_push($this->filesets, new FileSet());
-        return $this->filesets[$num-1];
-    }
-    
-    /**
-     * Set "package" property from XML.
-     * @see setName()
-     * @param string $v
-     * @return void
-     */
-    public function setPackage($v) {
-        $this->package = $v;
-    }
-    
-    /**
-     * Sets "dir" property from XML.
-     * @param PhingFile $f
-     * @return void
-     */
-    public function setDir(PhingFile $f) {
-        $this->dir = $f;
-    }
-
-    /**
-     * Sets "name" property from XML.
-     * @param string $v
-     * @return void
-     */
-    public function setName($v) {
-        $this->package = $v;
-    }
-    
-    /**
-     * Sets the file to use for generated package.xml
-     */
-    public function setDestFile(PhingFile $f) {
-        $this->packageFile = $f;
-    }
-    
-    /**
-     * Handles nested generic <option> elements.
-     */
-    function createOption() {
-        $o = new PearPkgOption();
-        $this->options[] = $o;
-        return $o;
-    }
-    
-    /**
-     * Handles nested generic <option> elements.
-     */
-    function createMapping() {
-        $o = new PearPkgMapping();
-        $this->mappings[] = $o;
-        return $o;
-    }
-}
-
-
-
-/**
- * Generic option class is used for non-complex options.
- */
-class PearPkgOption {
-    
-    private    $name;
-    private $value;
-    
-    public function setName($v) { $this->name = $v; }
-    public function getName() { return $this->name; }
-    
-    public function setValue($v) { $this->value = $v; }
-    public function getValue() { return $this->value; }
-    public function addText($txt) { $this->value = trim($txt); }
-        
-}
-
-/**
- * Handles complex options <mapping> elements which are hashes (assoc arrays).
- */
-class PearPkgMapping {
-
-    private    $name;
-    private $elements = array();    
-    
-    public function setName($v) {
-        $this->name = $v;
-    }
-    
-    public function getName() { 
-        return $this->name;
-    }
-
-    public function createElement() { 
-        $e = new PearPkgMappingElement();
-        $this->elements[] = $e;
-        return $e;
-    }
-        
-    public function    getElements() {
-        return $this->elements;
-    }
-    
-    /**
-     * Returns the PHP hash or array of hashes (etc.) that this mapping represents.
-     * @return array
-     */
-    public function getValue() {
-        $value = array();
-        foreach($this->getElements() as $el) {
-            if ($el->getKey() !== null) {
-                $value[ $el->getKey() ] = $el->getValue();
-            } else {
-                $value[] = $el->getValue();
-            }
-        }
-        return $value;
-    }
-}
-
-/**
- * Sub-element of <mapping>.
- */
-class PearPkgMappingElement {
-
-    private    $key;
-    private $value;
-    private $elements = array();
-    
-    public function setKey($v) {
-        $this->key = $v;
-    }
-    
-    public function getKey() {
-        return $this->key;
-    }
-    
-    public function setValue($v) {
-        $this->value = $v;
-    }
-    
-    /**
-     * Returns either the simple value or
-     * the calculated value (array) of nested elements.
-     * @return mixed
-     */
-    public function getValue() {    
-        if (!empty($this->elements)) {
-            $value = array();
-            foreach($this->elements as $el) {
-                if ($el->getKey() !== null) {
-                    $value[ $el->getKey() ] = $el->getValue();
-                } else {
-                    $value[] = $el->getValue();
-                }
-            }            
-            return $value;
-        } else  {
-            return $this->value;        
-        }
-    }
-    
-    /**
-     * Handles nested <element> tags.
-     */
-    public function createElement() {
-        $e = new PearPkgMappingElement();
-        $this->elements[] = $e;
-        return $e;
-    }
-    
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/PhpCodeSnifferTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/PhpCodeSnifferTask.php
deleted file mode 100644
index 3b2bfefdc..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/PhpCodeSnifferTask.php
+++ /dev/null
@@ -1,326 +0,0 @@
-<?php
-/*
- *	$Id$
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-
-/**
- * A PHP code sniffer task. Checking the style of one or more PHP source files.
- *
- * @author	Dirk Thomas <dirk.thomas@4wdmedia.de>
- * @package	phing.tasks.ext
- */
-class PhpCodeSnifferTask extends Task {
-
-	protected $file;	// the source file (from xml attribute)
-	protected $filesets = array(); // all fileset objects assigned to this task
-
-	// parameters for php code sniffer
-	protected $standard = 'Generic';
-	protected $sniffs = array();
-	protected $showWarnings = true;
-	protected $verbosity = 0;
-	protected $tabWidth = 0;
-	protected $allowedFileExtensions = array('php');
-	protected $ignorePatterns = false;
-	protected $noSubdirectories = false;
-	protected $configData = array();
-
-	// parameters to customize output
-	protected $showSniffs = false;
-	protected $outputFormat = 'default';
-
-	/**
-	 * File to be performed syntax check on
-	 * @param PhingFile $file
-	 */
-	public function setFile(PhingFile $file) {
-		$this->file = $file;
-	}
-
-	/**
-	 * Nested creator, creates a FileSet for this task
-	 *
-	 * @return FileSet The created fileset object
-	 */
-	function createFileSet() {
-		$num = array_push($this->filesets, new FileSet());
-		return $this->filesets[$num-1];
-	}
-
-	/**
-	 * Sets the standard to test for
-	 * @param string $standard
-	 */
-	public function setStandard($standard)
-	{
-		if (DIRECTORY_SEPARATOR != '/') $standard = str_replace('/', DIRECTORY_SEPARATOR, $standard);
-		$this->standard = $standard;
-	}
-
-	/**
-	 * Sets the sniffs which the standard should be restricted to
-	 * @param string $sniffs
-	 */
-	public function setSniffs($sniffs)
-	{
-		$token = ' ,;';
-		$sniff = strtok($sniffs, $token);
-		while ($sniff !== false) {
-			$this->sniffs[] = $sniff;
-			$sniff = strtok($token);
-		}
-	}
-
-	/**
-	 * Sets the flag if warnings should be shown
-	 * @param boolean $show
-	 */
-	public function setShowWarnings($show)
-	{
-		$this->showWarnings = StringHelper::booleanValue($show);
-	}
-
-	/**
-	 * Sets the verbosity level
-	 * @param int $level
-	 */
-	public function setVerbosity($level)
-	{
-		$this->verbosity = (int)$level;
-	}
-
-	/**
-	 * Sets the tab width to replace tabs with spaces
-	 * @param int $width
-	 */
-	public function setTabWidth($width)
-	{
-		$this->tabWidth = (int)$width;
-	}
-
-	/**
-	 * Sets the allowed file extensions when using directories instead of specific files
-	 * @param array $extensions
-	 */
-	public function setAllowedFileExtensions($extensions)
-	{
-		$this->allowedFileExtensions = array();
-		$token = ' ,;';
-		$ext = strtok($extensions, $token);
-		while ($ext !== false) {
-			$this->allowedFileExtensions[] = $ext;
-			$ext = strtok($token);
-		}
-	}
-
-	/**
-	 * Sets the ignore patterns to skip files when using directories instead of specific files
-	 * @param array $extensions
-	 */
-	public function setIgnorePatterns($patterns)
-	{
-		$this->ignorePatterns = array();
-		$token = ' ,;';
-		$pattern = strtok($patterns, $token);
-		while ($pattern !== false) {
-			$this->ignorePatterns[] = $pattern;
-			$pattern = strtok($token);
-		}
-	}
-
-	/**
-	 * Sets the flag if subdirectories should be skipped
-	 * @param boolean $subdirectories
-	 */
-	public function setNoSubdirectories($subdirectories)
-	{
-		$this->noSubdirectories = StringHelper::booleanValue($subdirectories);
-	}
-
-	/**
-	 * Creates a config parameter for this task
-	 *
-	 * @return Parameter The created parameter
-	 */
-	public function createConfig() {
-		$num = array_push($this->configData, new Parameter());
-		return $this->configData[$num-1];
-	}
-
-	/**
-	 * Sets the flag if the used sniffs should be listed
-	 * @param boolean $show
-	 */
-	public function setShowSniffs($show)
-	{
-		$this->showSniffs = StringHelper::booleanValue($show);
-	}
-
-	/**
-	 * Sets the output format
-	 * @param string $format
-	 */
-	public function setFormat($format)
-	{
-		$this->outputFormat = $format;
-	}
-
-	/**
-	 * Executes PHP code sniffer against PhingFile or a FileSet
-	 */
-	public function main() {
-		if(!isset($this->file) and count($this->filesets) == 0) {
-			throw new BuildException("Missing either a nested fileset or attribute 'file' set");
-		}
-
-		require_once 'PHP/CodeSniffer.php';
-		$codeSniffer = new PHP_CodeSniffer($this->verbosity, $this->tabWidth);
-		$codeSniffer->setAllowedFileExtensions($this->allowedFileExtensions);
-		if (is_array($this->ignorePatterns)) $codeSniffer->setIgnorePatterns($this->ignorePatterns);
-		foreach ($this->configData as $configData) {
-			$codeSniffer->setConfigData($configData->getName(), $configData->getValue(), true);
-		}
-
-		if ($this->file instanceof PhingFile) {
-			$codeSniffer->process($this->file->getPath(), $this->standard, $this->sniffs, $this->noSubdirectories);
-
-		} else {
-			$fileList = array();
-			$project = $this->getProject();
-			foreach ($this->filesets as $fs) {
-				$ds = $fs->getDirectoryScanner($project);
-				$files = $ds->getIncludedFiles();
-				$dir = $fs->getDir($this->project)->getPath();
-				foreach ($files as $file) {
-					$fileList[] = $dir.DIRECTORY_SEPARATOR.$file;
-				}
-			}
-			$codeSniffer->process($fileList, $this->standard, $this->sniffs, $this->noSubdirectories);
-		}
-		$this->output($codeSniffer);
-	}
-
-	/**
-	 * Outputs the results
-	 * @param PHP_CodeSniffer $codeSniffer
-	 */
-	protected function output($codeSniffer) {
-		if ($this->showSniffs) {
-			$sniffs = $codeSniffer->getSniffs();
-			$sniffStr = '';
-			foreach ($sniffs as $sniff) {
-				$sniffStr .= '- ' . $sniff.PHP_EOL;
-			}
-			$this->log('The list of used sniffs (#' . count($sniffs) . '): ' . PHP_EOL . $sniffStr, Project::MSG_INFO);
-		}
-
-		switch ($this->outputFormat) {
-			case 'default':
-				$this->outputCustomFormat($codeSniffer);
-				break;
-			case 'xml':
-				$codeSniffer->printXMLErrorReport($this->showWarnings);
-				break;
-			case 'checkstyle':
-				$codeSniffer->printCheckstyleErrorReport($this->showWarnings);
-				break;
-			case 'csv':
-				$codeSniffer->printCSVErrorReport($this->showWarnings);
-				break;
-			case 'report':
-				$codeSniffer->printErrorReport($this->showWarnings);
-				break;
-			case 'summary':
-				$codeSniffer->printErrorReportSummary($this->showWarnings);
-				break;
-			case 'doc':
-				$codeSniffer->generateDocs($this->standard, $this->sniffs);
-				break;
-			default:
-				$this->log('Unknown output format "' . $this->outputFormat . '"', Project::MSG_INFO);
-				break;
-		}
-	}
-
-	/**
-	 * Outputs the results with a custom format
-	 * @param PHP_CodeSniffer $codeSniffer
-	 */
-	protected function outputCustomFormat($codeSniffer) {
-		$report = $codeSniffer->prepareErrorReport($this->showWarnings);
-
-		$files = $report['files'];
-		foreach ($files as $file => $attributes) {
-			$errors = $attributes['errors'];
-			$warnings = $attributes['warnings'];
-			$messages = $attributes['messages'];
-			if ($errors > 0) {
-				$this->log($file . ': ' . $errors . ' error' . ($errors > 1 ? 's' : '') . ' detected', Project::MSG_ERR);
-				$this->outputCustomFormatMessages($messages, 'ERROR');
-			} else {
-				$this->log($file . ': No syntax errors detected', Project::MSG_VERBOSE);
-			}
-			if ($warnings > 0) {
-				$this->log($file . ': ' . $warnings . ' warning' . ($warnings > 1 ? 's' : '') . ' detected', Project::MSG_WARN);
-				$this->outputCustomFormatMessages($messages, 'WARNING');
-			}
-		}
-
-		$totalErrors = $report['totals']['errors'];
-		$totalWarnings = $report['totals']['warnings'];
-		$this->log(count($files) . ' files where checked', Project::MSG_INFO);
-		if ($totalErrors > 0) {
-			$this->log($totalErrors . ' error' . ($totalErrors > 1 ? 's' : '') . ' detected', Project::MSG_ERR);
-		} else {
-			$this->log('No syntax errors detected', Project::MSG_INFO);
-		}
-		if ($totalWarnings > 0) {
-			$this->log($totalWarnings . ' warning' . ($totalWarnings > 1 ? 's' : '') . ' detected', Project::MSG_INFO);
-		}
-	}
-
-	/**
-	 * Outputs the messages of a specific type for one file
-	 * @param array $messages
-	 * @param string $type
-	 */
-	protected function outputCustomFormatMessages($messages, $type) {
-		foreach ($messages as $line => $messagesPerLine) {
-			foreach ($messagesPerLine as $column => $messagesPerColumn) {
-				foreach ($messagesPerColumn as $message) {
-					$msgType = $message['type'];
-					if ($type == $msgType) {
-						$logLevel = Project::MSG_INFO;
-						if ($msgType == 'ERROR') {
-							$logLevel = Project::MSG_ERR;
-						} else if ($msgType == 'WARNING') {
-							$logLevel = Project::MSG_WARN;
-						}
-						$text = $message['message'];
-						$string = $msgType . ' in line ' . $line . ' column ' . $column . ': ' . $text;
-						$this->log($string, $logLevel);
-					}
-				}
-			}
-		}
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/PhpLintTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/PhpLintTask.php
deleted file mode 100644
index fef702c41..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/PhpLintTask.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-/*
- *	$Id: PhpLintTask.php 342 2008-01-21 14:49:48Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-
-/**
- * A PHP lint task. Checking syntax of one or more PHP source file.
- *
- * @author	 Knut Urdalen <knut.urdalen@telio.no>
- * @author	 Stefan Priebsch <stefan.priebsch@e-novative.de>
- * @package	phing.tasks.ext
- */
-class PhpLintTask extends Task {
-
-	protected $file;	// the source file (from xml attribute)
-	protected $filesets = array(); // all fileset objects assigned to this task
-
-	protected $errorProperty;
-	protected $haltOnFailure = false;
-	protected $hasErrors = false;
-	private $badFiles = array();
-	protected $interpreter = ''; // php interpreter to use for linting
-
-    /**
-     * Initialize the interpreter with the Phing property
-     */
-    public function __construct() {
-        $this->setInterpreter(Phing::getProperty('php.interpreter'));
-    }
-
-	/**
-	 * Override default php interpreter
-	 * @todo	Do some sort of checking if the path is correct but would 
-	 *			require traversing the systems executeable path too
-	 * @param	string	$sPhp
-	 */
-	public function setInterpreter($sPhp) {
-		$this->Interpreter = $sPhp;
-	}
-
-	/**
-	 * The haltonfailure property
-	 * @param boolean $aValue
-	 */
-	public function setHaltOnFailure($aValue) {
-		$this->haltOnFailure = $aValue;
-	}
-
-	/**
-	 * File to be performed syntax check on
-	 * @param PhingFile $file
-	 */
-	public function setFile(PhingFile $file) {
-		$this->file = $file;
-	}
-
-	/**
-	 * Set an property name in which to put any errors.
-	 * @param string $propname 
-	 */
-	public function setErrorproperty($propname)
-	{
-		$this->errorProperty = $propname;
-	}
-
-	/**
-	 * Nested creator, creates a FileSet for this task
-	 *
-	 * @return FileSet The created fileset object
-	 */
-	function createFileSet() {
-		$num = array_push($this->filesets, new FileSet());
-		return $this->filesets[$num-1];
-	}
-
-	/**
-	 * Execute lint check against PhingFile or a FileSet
-	 */
-	public function main() {
-		if(!isset($this->file) and count($this->filesets) == 0) {
-			throw new BuildException("Missing either a nested fileset or attribute 'file' set");
-		}
-
-		if($this->file instanceof PhingFile) {
-			$this->lint($this->file->getPath());
-		} else { // process filesets
-			$project = $this->getProject();
-			foreach($this->filesets as $fs) {
-				$ds = $fs->getDirectoryScanner($project);
-				$files = $ds->getIncludedFiles();
-				$dir = $fs->getDir($this->project)->getPath();
-				foreach($files as $file) {
-					$this->lint($dir.DIRECTORY_SEPARATOR.$file);
-				}
-			}
-		}
-
-		if ($this->haltOnFailure && $this->hasErrors) throw new BuildException('Syntax error(s) in PHP files: '.implode(', ',$this->badFiles));
-	}
-
-	/**
-	 * Performs the actual syntax check
-	 *
-	 * @param string $file
-	 * @return void
-	 */
-	protected function lint($file) {
-        $command = $this->Interpreter == ''
-            ? 'php'
-            : $this->Interpreter;
-        $command .= ' -l ';
-		if(file_exists($file)) {
-			if(is_readable($file)) {
-				$messages = array();
-				exec($command.'"'.$file.'"', $messages);
-				if(!preg_match('/^No syntax errors detected/', $messages[0])) {
-					if (count($messages) > 1) {
-						if ($this->errorProperty) {
-							$this->project->setProperty($this->errorProperty, $messages[1]);
-						}
-						$this->log($messages[1], Project::MSG_ERR);
-					} else {
-						$this->log("Could not parse file", Project::MSG_ERR);
-					}
-					$this->badFiles[] = $file;	
-					$this->hasErrors = true;
-					
-				} else {
-					$this->log($file.': No syntax errors detected', Project::MSG_INFO);
-				}
-			} else {
-				throw new BuildException('Permission denied: '.$file);
-			}
-		} else {
-			throw new BuildException('File not found: '.$file);
-		}
-	}
-}
-
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ScpSendTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ScpSendTask.php
deleted file mode 100644
index 2ba208c35..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ScpSendTask.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-/**
- * $Id: ScpSendTask.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-
-/**
- * SCPs a File to a remote server 
- *
- * @author Andrew Eddie <andrew.eddie@jamboworks.com> 
- * @version $Id: ScpSendTask.php 325 2007-12-20 15:44:58Z hans $
- * @package phing.tasks.ext
- * @since 2.3.0
- */
-class ScpSendTask extends Task
-{
-	private $localFile = "";
-
-	private $remoteFile = "";
-
-	private $username = "";
-
-	private $password = "";
-
-	private $host = "";
-
-	private $port = 22;
-
-	private $mode = null;
-
-	private $_connection = null;
-
-	/**
-	 * Sets the remote host
-	 */
-	function setHost($h)
-	{
-		$this->host = $h;
-	}
-
-	/**
-	 * Returns the remote host
-	 */
-	function getHost()
-	{
-		return $this->host;
-	}
-
-	/**
-	 * Sets the remote host port
-	 */
-	function setPort($p)
-	{
-		$this->port = $p;
-	}
-
-	/**
-	 * Returns the remote host port
-	 */
-	function getPort()
-	{
-		return $this->port;
-	}
-
-	/**
-	 * Sets the mode value
-	 */
-	function setMode($value)
-	{
-		$this->mode = $value;
-	}
-
-	/**
-	 * Returns the mode value
-	 */
-	function getMode()
-	{
-		return $this->mode;
-	}
-
-	/**
-	 * Sets the username of the user to scp
-	 */
-	function setUsername($username)
-	{
-		$this->username = $username;
-	}
-
-	/**
-	 * Returns the username
-	 */
-	function getUsername()
-	{
-		return $this->username;
-	}
-
-	/**
-	 * Sets the password of the user to scp
-	 */
-	function setPassword($password)
-	{
-		$this->password = $password;
-	}
-
-	/**
-	 * Returns the password
-	 */
-	function getPassword()
-	{
-		return $this->password;
-	}
-
-	/**
-	 * Sets the local path to scp from
-	 */
-	function setLocalFile($lFile)
-	{
-		$this->localFile = $lFile;
-	}
-
-	/**
-	 * Returns the local path to scp from
-	 */
-	function getLocalFile($lFile)
-	{
-		return $this->localFile;
-	}
-
-	/**
-	 * Sets the remote path to scp to
-	 */
-	function setRemoteFile($rFile)
-	{
-		$this->remoteFile = $rFile;
-	}
-
-	/**
-	 * Returns the remote path to scp to
-	 */
-	function getRemoteFile($rFile)
-	{
-		return $this->remoteFile;
-	}
-
-	/**
-	* The init method: Do init steps.
-	*/
-	public function init()
-	{
-		if (function_exists('ssh2_connect')) {
-			$this->_connection = ssh2_connect($this->host, $this->port);
-			ssh2_auth_password($this->_connection, $this->username, $this->password);
-		} else {
-			print ("ERROR: SSH Extension is not installed");
-		}
-	}
-
-	/**
-	 * The main entry point method.
-	 */
-	public function main()
-	{
-		if (function_exists('ssh2_scp_send') && !is_null($this->_connection))
-		{
-			if (!is_null($this->mode)) {
-				ssh2_scp_send($this->_connection, $this->localFile, $this->remoteFile, $this->mode);
-			} else {
-				ssh2_scp_send($this->_connection, $this->localFile, $this->remoteFile);
-			}
-		} else {
-			print ("ERROR: No SSH Connection Available");
-		}
-	}
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/SmartyTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/SmartyTask.php
deleted file mode 100644
index 3c2fbc63a..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/SmartyTask.php
+++ /dev/null
@@ -1,610 +0,0 @@
-<?php
-
-/*
- *  $Id: SmartyTask.php 144 2007-02-05 15:19:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
- 
-require_once 'phing/Task.php';
-include_once 'phing/BuildException.php';
-include_once 'phing/util/StringHelper.php';
-
-/**
- * A phing task for generating output by using Smarty.
- *
- * This is based on the TexenTask from Apache's Velocity engine.  This class
- * was originally proted in order to provide a template compiling system for
- * Torque.
- *
- * TODO:
- *        - Add Path / useClasspath support?
- *
- * @author    Hans Lellelid <hans@xmpl.org> (SmartyTask)
- * @author    Jason van Zyl <jvanzyl@apache.org> (TexenTask)
- * @author    Robert Burrell Donkin <robertdonkin@mac.com>
- * @version   $Id: SmartyTask.php 144 2007-02-05 15:19:00Z hans $
- * @package   phing.tasks.ext
- */
-class SmartyTask extends Task {
-
-    /**
-     * Smarty template engine.
-     * @var Smarty
-     */
-    protected $context;
-    
-    /**
-     * Variables that are assigned to the context on parse/compile.
-     * @var array
-     */
-    protected $properties = array();
-    
-    /**
-     * This is the control template that governs the output.
-     * It may or may not invoke the services of worker
-     * templates.
-     * @var string
-     */
-    protected $controlTemplate;
-    
-    /**
-     * This is where Velocity will look for templates
-     * using the file template loader.
-     * @var string
-     */
-    protected $templatePath;
-    
-    /**
-     * This is where texen will place all the output
-     * that is a product of the generation process.
-     * @var string
-     */
-    protected $outputDirectory;
-    
-    /**
-     * This is the file where the generated text
-     * will be placed.
-     * @var string
-     */
-    protected $outputFile;
-
-    /**
-     * <p>
-     * These are properties that are fed into the
-     * initial context from a properties file. This
-     * is simply a convenient way to set some values
-     * that you wish to make available in the context.
-     * </p>
-     * <p>
-     * These values are not critical, like the template path
-     * or output path, but allow a convenient way to
-     * set a value that may be specific to a particular
-     * generation task.
-     * </p>
-     * <p>
-     * For example, if you are generating scripts to allow
-     * user to automatically create a database, then
-     * you might want the <code>$databaseName</code> 
-     * to be placed
-     * in the initial context so that it is available
-     * in a script that might look something like the
-     * following:
-     * <code><pre>
-     * #!bin/sh
-     * 
-     * echo y | mysqladmin create $databaseName
-     * </pre></code>
-     * The value of <code>$databaseName</code> isn't critical to
-     * output, and you obviously don't want to change
-     * the ant task to simply take a database name.
-     * So initial context values can be set with
-     * properties file.
-     *
-     * @var array
-     */
-    protected $contextProperties;
-        
-    /**
-     * Smarty compiles templates before parsing / replacing tokens in them.
-     * By default it will try ./templates_c, but you may wish to override this.
-     * @var string
-     */
-    protected $compilePath;
-    
-    /**
-     * Whether to force Smarty to recompile templates.
-     * Smarty does check file modification time, but you can set this
-     * to be *sure* that the template will be compiled (of course it will
-     * be slower if you do).
-     * @var boolean
-     */
-    protected $forceCompile = false;
-    
-    /**
-     * Smarty can use config files.
-     * This tells Smarty where to look for the config files.
-     * @var string
-     */
-    protected $configPath;
-    
-    /**
-     * Customize the left delimiter for Smarty tags.
-     * @var string
-     */
-    protected $leftDelimiter;
-
-    /**
-     * Customize the right delimiter for Smarty tags.
-     * @var string
-     */
-    protected $rightDelimiter;
-
-    // -----------------------------------------------------------------------
-    // The following getters & setters are used by phing to set properties
-    // specified in the XML for the smarty task.
-    // -----------------------------------------------------------------------
-    
-    public function init() {
-        include_once 'Smarty.class.php';
-        if (!class_exists('Smarty')) {
-            throw new BuildException("To use SmartyTask, you must have the path to Smarty.class.php on your include_path or your \$PHP_CLASSPATH environment variable.");
-        }
-    }
-    
-    /**
-     * [REQUIRED] Set the control template for the
-     * generating process.
-     * @param string $controlTemplate
-     * @return void
-     */
-    public function setControlTemplate ($controlTemplate) {
-        $this->controlTemplate = $controlTemplate;
-    }
-
-    /**
-     * Get the control template for the
-     * generating process.
-     * @return string
-     */
-    public function getControlTemplate() {
-        return $this->controlTemplate;
-    }
-
-    /**
-     * [REQUIRED] Set the path where Velocity will look
-     * for templates using the file template
-     * loader.
-     * @return void
-     * @throws Exception 
-     */
-    public function setTemplatePath($templatePath) {
-        $resolvedPath = "";        
-        $tok = strtok($templatePath, ",");
-        while ( $tok ) {            
-            // resolve relative path from basedir and leave
-            // absolute path untouched.
-            $fullPath = $this->project->resolveFile($tok);
-            $cpath = $fullPath->getCanonicalPath();
-            if ($cpath === false) {
-                $this->log("Template directory does not exist: " . $fullPath->getAbsolutePath());
-            } else {
-                $resolvedPath .= $cpath;
-            }
-            $tok = strtok(",");
-            if ( $tok ) {
-                $resolvedPath .= ",";
-            }
-        }
-        $this->templatePath = $resolvedPath;
-     }
-
-    /**
-     * Get the path where Velocity will look
-     * for templates using the file template
-     * loader.
-     * @return string
-     */
-    public function getTemplatePath() {
-        return $this->templatePath;
-    }        
-
-    /**
-     * [REQUIRED] Set the output directory. It will be
-     * created if it doesn't exist.
-     * @param PhingFile $outputDirectory
-     * @return void
-     * @throws Exception
-     */
-    public function setOutputDirectory(PhingFile $outputDirectory) {
-        try {            
-            if (!$outputDirectory->exists()) {
-                $this->log("Output directory does not exist, creating: " . $outputDirectory->getPath(),Project::MSG_VERBOSE);
-                if (!$outputDirectory->mkdirs()) {
-                    throw new IOException("Unable to create Ouptut directory: " . $outputDirectory->getAbsolutePath());
-                }
-            }
-            $this->outputDirectory = $outputDirectory->getCanonicalPath();
-        } catch (IOException $ioe) {
-            throw new BuildException($ioe->getMessage());
-        }
-    }
-      
-    /**
-     * Get the output directory.
-     * @return string
-     */
-    public function getOutputDirectory() {
-        return $this->outputDirectory;
-    }        
-
-    /**
-     * [REQUIRED] Set the output file for the
-     * generation process.
-     * @return void
-     */
-    public function setOutputFile($outputFile) {
-        $this->outputFile = $outputFile;
-    }
-
-    /**
-     * Get the output file for the
-     * generation process.
-     * @return string
-     */
-    public function getOutputFile() {
-        return $this->outputFile;
-    }        
-
-    /**
-     * Set the path Smarty uses as a "cache" for compiled templates.
-     * @param string $compilePath
-     */
-    public function setCompilePath($compilePath) {
-        $this->compilePath = $compilePath;
-    }
-    
-    /**
-     * Get the path Smarty uses for compiling templates.
-     * @return string
-     */
-    public function getCompilePath() {
-        return $this->compilePath;
-    }
-    
-    /**
-     * Set whether Smarty should always recompile tempaltes.
-     * @param boolean $force
-     * @return void
-     */
-    public function setForceCompile($force) {
-        $this->forceCompile = (boolean) $force;
-    }
-    
-    /**
-     * Get whether Smarty should always recompile template.
-     * @return boolean
-     */
-    public function getForceCompile() {
-        return $this->forceCompile;
-    }
-    
-    /**
-     * Set where Smarty looks for config files.
-     * @param string $configPath
-     * @return void
-     */
-    public function setConfigPath($configPath) {
-        $this->configPath = $configPath;
-    }
-    
-    /**
-     * Get the path that Smarty uses for looking for config files.
-     * @return string
-     */
-    public function getConfigPath() {
-        return $this->configPath;
-    }
-    
-    /**
-     * Set Smarty template left delimiter.
-     * @param string $delim
-     * @return void
-     */
-    public function setLeftDelimiter($delim) {
-        $this->leftDelimiter = $delim;
-    }
-    
-    /**
-     * Get Smarty template right delimiter
-     * @return string
-     */
-    public function getLeftDelimiter() {
-        return $this->leftDelimiter;
-    }
-    
-    /**
-     * Set Smarty template right delimiter.
-     * @param string $delim
-     * @return void
-     */
-    public function setRightDelimiter($delim) {
-        $this->rightDelimiter = $delim;
-    }
-    
-    /**
-     * Get Smarty template right delimiter
-     * @return string
-     */
-    public function getRightDelimiter() {
-        return $this->rightDelimiter;
-    }
-    
-    
-    /**
-     * Set the context properties that will be
-     * fed into the initial context be the
-     * generating process starts.
-     * @param string $file
-     * @return void
-     */
-    public function setContextProperties($file) {
-    
-        $sources = explode(",", $file);
-        $this->contextProperties = new Properties();
-        
-        // Always try to get the context properties resource
-        // from a file first. Templates may be taken from a JAR
-        // file but the context properties resource may be a 
-        // resource in the filesystem. If this fails than attempt
-        // to get the context properties resource from the
-        // classpath.
-        for ($i=0, $sourcesLength=count($sources); $i < $sourcesLength; $i++) {
-            $source = new Properties();
-            
-            try {
-            
-                // resolve relative path from basedir and leave
-                // absolute path untouched.
-                $fullPath = $this->project->resolveFile($sources[$i]);
-                $this->log("Using contextProperties file: " . $fullPath->__toString());
-                $source->load($fullPath);
-                
-            } catch (Exception $e) {
-              
-              throw new BuildException("Context properties file " . $sources[$i] .
-                            " could not be found in the file system!");
-                     
-            }
-        
-            $keys = $source->keys();
-            
-            foreach ($keys as $key) {
-                $name = $key;
-                $value = $this->project->replaceProperties($source->getProperty($name));
-                $this->contextProperties->setProperty($name, $value);
-            }
-        }
-    }
-
-    /**
-     * Get the context properties that will be
-     * fed into the initial context be the
-     * generating process starts.
-     * @return Properties
-     */
-    public function getContextProperties() {
-        return $this->contextProperties;
-    }     
-
-    // ---------------------------------------------------------------
-    // End of XML setters & getters
-    // ---------------------------------------------------------------
-
-   
-    /**
-     * Creates a Smarty object.
-     *
-     * @return Smarty initialized (cleared) Smarty context.
-     * @throws Exception the execute method will catch 
-     *         and rethrow as a <code>BuildException</code>
-     */
-    public function initControlContext() {        
-        $this->context->clear_all_assign();        
-        return $this->context;
-    }
-    
-    /**
-     * Execute the input script with Velocity
-     *
-     * @throws BuildException  
-     * BuildExceptions are thrown when required attributes are missing.
-     * Exceptions thrown by Velocity are rethrown as BuildExceptions.
-     */
-    public function main() {
-    
-        // Make sure the template path is set.
-        if (empty($this->templatePath)) {
-            throw new BuildException("The template path needs to be defined!");
-        }            
-    
-        // Make sure the control template is set.
-        if ($this->controlTemplate === null) {
-            throw new BuildException("The control template needs to be defined!");
-        }            
-
-        // Make sure the output directory is set.
-        if ($this->outputDirectory === null) {
-            throw new BuildException("The output directory needs to be defined!");
-        }            
-        
-        // Make sure there is an output file.
-        if ($this->outputFile === null) {
-            throw new BuildException("The output file needs to be defined!");
-        }            
-        
-        // Setup Smarty runtime.
-        
-        // Smarty uses one object to store properties and to store
-        // the context for the template (unlike Velocity).  We setup this object, calling it
-        // $this->context, and then initControlContext simply zeros out
-        // any assigned variables.
-        $this->context = new Smarty();
-        
-        if ($this->compilePath !== null) {
-            $this->log("Using compilePath: " . $this->compilePath);
-            $this->context->compile_dir = $this->compilePath;
-        }
-        
-        if ($this->configPath !== null) {
-            $this->log("Using configPath: " . $this->configPath);
-            $this->context->config_dir = $this->configPath;
-        }        
-        
-        if ($this->forceCompile !== null) {
-            $this->context->force_compile = $this->forceCompile;
-        }
-        
-        if ($this->leftDelimiter !== null) {
-            $this->context->left_delimiter = $this->leftDelimiter;
-        }
-        
-        if ($this->rightDelimiter !== null) {
-            $this->context->right_delimiter = $this->rightDelimiter;
-        }
-        
-        if ($this->templatePath !== null) {
-            $this->log("Using templatePath: " . $this->templatePath);
-            $this->context->template_dir = $this->templatePath;
-        }                                                        
-        
-        $smartyCompilePath = new PhingFile($this->context->compile_dir);
-        if (!$smartyCompilePath->exists()) {
-            $this->log("Compile directory does not exist, creating: " . $smartyCompilePath->getPath(), Project::MSG_VERBOSE);
-            if (!$smartyCompilePath->mkdirs()) {
-                throw new BuildException("Smarty needs a place to compile templates; specify a 'compilePath' or create ".$this->context->compile_dir);
-            }
-        }
-        
-        // Make sure the output directory exists, if it doesn't
-        // then create it.
-        $file = new PhingFile($this->outputDirectory);
-        if (!$file->exists()) {
-            $this->log("Output directory does not exist, creating: " . $file->getAbsolutePath());
-            $file->mkdirs();
-        }
-        
-        $path = $this->outputDirectory . DIRECTORY_SEPARATOR . $this->outputFile;
-        $this->log("Generating to file " . $path);
-        
-        $writer = new FileWriter($path);
-                
-        // The generator and the output path should
-        // be placed in the init context here and
-        // not in the generator class itself.
-        $c = $this->initControlContext();
-        
-        // Set any variables that need to always
-        // be loaded
-        $this->populateInitialContext($c);
-        
-        // Feed all the options into the initial
-        // control context so they are available
-        // in the control/worker templates.
-        if ($this->contextProperties !== null) {
-            
-            foreach($this->contextProperties->keys() as $property) {
-                    
-                $value = $this->contextProperties->getProperty($property);
-                
-                // Special exception (from Texen)
-                // for properties ending in file.contents:
-                // in that case we dump the contents of the file
-                // as the "value" for the Property.
-                if (StringHelper::endsWith("file.contents", $property)) {
-                    // pull in contents of file specified 
-                                            
-                    $property = substr($property, 0, strpos($property, "file.contents") - 1);
-                    
-                    // reset value, and then 
-                    // read in teh contents of the file into that var
-                    $value = "";
-                    $f = new PhingFile($project->resolveFile($value)->getCanonicalPath());                        
-                    if ($f->exists()) {
-                        try {
-                            $fr = new FileReader($f);
-                            $fr->readInto($value);
-                        } catch (Exception $e) {
-                            throw $e;
-                        }
-                    }    
-                                                                    
-                 } // if ends with file.contents
-                
-                    if (StringHelper::isBoolean($value)) {
-                        $value = StringHelper::booleanValue($value);
-                    }
-                                                        
-                 $c->assign($property, $value); 
-                 
-            } // foreach property
-                
-        } // if contextProperties !== null
-        
-        try {
-            //$c->display($this->controlTemplate);            
-            $writer->write($c->fetch($this->controlTemplate));
-            $writer->close();
-        } catch (IOException $ioe) {
-            $writer->close();
-            throw new BuildException("Cannot write parsed template.");
-        }        
-        
-        $this->cleanup();    
-    }
-
-    /**
-     * <p>Place useful objects into the initial context.</p>
-     *
-     * <p>TexenTask places <code>Date().toString()</code> into the
-     * context as <code>$now</code>.  Subclasses who want to vary the
-     * objects in the context should override this method.</p>
-     *
-     * <p><code>$generator</code> is not put into the context in this
-     * method.</p>
-     *
-     * @param context The context to populate, as retrieved from
-     * {@link #initControlContext()}.
-     * @return void
-     * @throws Exception Error while populating context.  The {@link
-     * #execute()} method will catch and rethrow as a
-     * <code>BuildException</code>.
-     */
-    protected function populateInitialContext(Smarty $context)  {       
-    }
-    
-    /**
-     * A hook method called at the end of {@link #execute()} which can
-     * be overridden to perform any necessary cleanup activities (such
-     * as the release of database connections, etc.).  By default,
-     * does nothing.
-     * @return void
-     * @throws Exception Problem cleaning up.
-     */
-    protected function cleanup() {
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/TarTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/TarTask.php
deleted file mode 100644
index 4f3a569ed..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/TarTask.php
+++ /dev/null
@@ -1,426 +0,0 @@
-<?php
-/*
- *  $Id: TarTask.php 220 2007-08-21 00:03:13Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/tasks/system/MatchingTask.php';
-include_once 'phing/util/SourceFileScanner.php';
-include_once 'phing/mappers/MergeMapper.php';
-include_once 'phing/util/StringHelper.php';
-
-/**
- * Creates a tar archive using PEAR Archive_Tar.
- *
- * @author    Hans Lellelid <hans@xmpl.org> (Phing)
- * @author    Stefano Mazzocchi <stefano@apache.org> (Ant)
- * @author    Stefan Bodewig <stefan.bodewig@epost.de> (Ant)
- * @author    Magesh Umasankar
- * @version   $Revision: 1.10 $
- * @package   phing.tasks.ext
- */
-class TarTask extends MatchingTask {
-    
-    const TAR_NAMELEN = 100;
-    
-    const WARN = "warn";
-    const FAIL = "fail";   
-    const OMIT = "omit";    
-    
-    private $tarFile;
-    private $baseDir;
-	private $includeEmpty = true; // Whether to include empty dirs in the TAR
-	
-    private $longFileMode = "warn";
-
-    private $filesets = array();
-    private $fileSetFiles = array();
-
-    /**
-     * Indicates whether the user has been warned about long files already.
-     */
-    private $longWarningGiven = false;
-    
-    /**
-     * Compression mode.  Available options "gzip", "bzip2", "none" (null).
-     */
-    private $compression = null;
-    
-    /**
-     * Ensures that PEAR lib exists.
-     */
-    public function init() {
-        include_once 'Archive/Tar.php';
-        if (!class_exists('Archive_Tar')) {
-            throw new BuildException("You must have installed the PEAR Archive_Tar class in order to use TarTask.");
-        }
-    }
-    
-    /**
-     * Add a new fileset
-     * @return FileSet
-     */
-    public function createTarFileSet() {
-        $this->fileset = new TarFileSet();
-        $this->filesets[] = $this->fileset;
-        return $this->fileset;
-    }
-    
-    /**
-     * Add a new fileset.  Alias to createTarFileSet() for backwards compatibility.
-     * @return FileSet
-     * @see createTarFileSet()
-     */
-    public function createFileSet() {
-        $this->fileset = new TarFileSet();
-        $this->filesets[] = $this->fileset;
-        return $this->fileset;
-    }
-
-    /**
-     * Set is the name/location of where to create the tar file.
-     * @param PhingFile $destFile The output of the tar
-     */
-    public function setDestFile(PhingFile $destFile) {
-        $this->tarFile = $destFile;
-    }
-
-    /**
-     * This is the base directory to look in for things to tar.
-     * @param PhingFile $baseDir
-     */
-    public function setBasedir(PhingFile $baseDir) {
-        $this->baseDir = $baseDir;
-    }
-
-    /**
-     * Set the include empty dirs flag.
-     * @param  boolean  Flag if empty dirs should be tarred too
-     * @return void
-     * @access public
-     */
-    function setIncludeEmptyDirs($bool) {
-        $this->includeEmpty = (boolean) $bool;
-    }
-
-    /**
-     * Set how to handle long files, those with a path&gt;100 chars.
-     * Optional, default=warn.
-     * <p>
-     * Allowable values are
-     * <ul>
-     * <li>  truncate - paths are truncated to the maximum length
-     * <li>  fail - paths greater than the maximim cause a build exception
-     * <li>  warn - paths greater than the maximum cause a warning and GNU is used
-     * <li>  gnu - GNU extensions are used for any paths greater than the maximum.
-     * <li>  omit - paths greater than the maximum are omitted from the archive
-     * </ul>
-     */
-    public function setLongfile($mode) {
-        $this->longFileMode = $mode;
-    }
-
-    /**
-     * Set compression method.
-     * Allowable values are
-     * <ul>
-     * <li>  none - no compression
-     * <li>  gzip - Gzip compression
-     * <li>  bzip2 - Bzip2 compression
-     * </ul>
-     */
-    public function setCompression($mode) {        
-        switch($mode) {
-            case "gzip":
-                $this->compression = "gz";
-                break;
-            case "bzip2":
-                $this->compression = "bz2";
-                break;
-            case "none":
-                $this->compression = null;
-                break;
-            default:
-                $this->log("Ignoring unknown compression mode: ".$mode, Project::MSG_WARN);
-                $this->compression = null;
-        }
-    }
-    
-    /**
-     * do the work
-     * @throws BuildException
-     */
-    public function main() {
-    
-        if ($this->tarFile === null) {
-            throw new BuildException("tarfile attribute must be set!", $this->getLocation());
-        }
-
-        if ($this->tarFile->exists() && $this->tarFile->isDirectory()) {
-            throw new BuildException("tarfile is a directory!", $this->getLocation());
-        }
-
-        if ($this->tarFile->exists() && !$this->tarFile->canWrite()) {
-            throw new BuildException("Can not write to the specified tarfile!", $this->getLocation());
-        }
-
-        // shouldn't need to clone, since the entries in filesets
-        // themselves won't be modified -- only elements will be added
-        $savedFileSets = $this->filesets;
-        
-        try {
-            if ($this->baseDir !== null) {
-                if (!$this->baseDir->exists()) {
-                    throw new BuildException("basedir does not exist!", $this->getLocation());
-                }
-				if (empty($this->filesets)) { // if there weren't any explicit filesets specivied, then
-	                						  // create a default, all-inclusive fileset using the specified basedir.
-	                $mainFileSet = new TarFileSet($this->fileset);
-	                $mainFileSet->setDir($this->baseDir);
-	                $this->filesets[] = $mainFileSet;
-	            }
-            }
-
-            if (empty($this->filesets)) {
-                throw new BuildException("You must supply either a basedir "
-                                         . "attribute or some nested filesets.",
-                                         $this->getLocation());
-            }                        
-            
-            // check if tar is out of date with respect to each fileset
-            if($this->tarFile->exists()) {
-	            $upToDate = true;
-	            foreach($this->filesets as $fs) {
-	                $files = $fs->getFiles($this->project, $this->includeEmpty);
-	                if (!$this->archiveIsUpToDate($files, $fs->getDir($this->project))) {
-	                    $upToDate = false;
-	                }
-	                for ($i=0, $fcount=count($files); $i < $fcount; $i++) {
-	                    if ($this->tarFile->equals(new PhingFile($fs->getDir($this->project), $files[$i]))) {
-	                        throw new BuildException("A tar file cannot include itself", $this->getLocation());
-	                    }
-	                }
-	            }
-	            if ($upToDate) {
-	                $this->log("Nothing to do: " . $this->tarFile->__toString() . " is up to date.", Project::MSG_INFO);
-	                return;
-	            }
-			}
-			
-            $this->log("Building tar: " . $this->tarFile->__toString(), Project::MSG_INFO);
-            
-            $tar = new Archive_Tar($this->tarFile->getAbsolutePath(), $this->compression);
-            
-            // print errors
-            $tar->setErrorHandling(PEAR_ERROR_PRINT);
-            
-            foreach($this->filesets as $fs) {                                
-                    $files = $fs->getFiles($this->project, $this->includeEmpty);
-                    if (count($files) > 1 && strlen($fs->getFullpath()) > 0) {
-                        throw new BuildException("fullpath attribute may only "
-                                                 . "be specified for "
-                                                 . "filesets that specify a "
-                                                 . "single file.");
-                    }
-                    $fsBasedir = $fs->getDir($this->project);
-                    $filesToTar = array();
-                    for ($i=0, $fcount=count($files); $i < $fcount; $i++) {
-                        $f = new PhingFile($fsBasedir, $files[$i]);
-                        $filesToTar[] = $f->getAbsolutePath();
-                        $this->log("Adding file " . $f->getPath() . " to archive.", Project::MSG_VERBOSE);                
-                    }                    
-                    $tar->addModify($filesToTar, '', $fsBasedir->getAbsolutePath());            
-            }
-                         
-                
-        } catch (IOException $ioe) {
-                $msg = "Problem creating TAR: " . $ioe->getMessage();
-                $this->filesets = $savedFileSets;
-                throw new BuildException($msg, $ioe, $this->getLocation());
-        }
-        
-        $this->filesets = $savedFileSets;
-    }
-           
-    /**
-     * @param array $files array of filenames
-     * @param PhingFile $dir
-     * @return boolean
-     */
-    protected function archiveIsUpToDate($files, $dir) {
-        $sfs = new SourceFileScanner($this);
-        $mm = new MergeMapper();
-        $mm->setTo($this->tarFile->getAbsolutePath());
-        return count($sfs->restrict($files, $dir, null, $mm)) == 0;
-    }
-   
-}
-
-
-/**
- * This is a FileSet with the option to specify permissions.
- * 
- * Permissions are currently not implemented by PEAR Archive_Tar,
- * but hopefully they will be in the future.
- * 
- */
-class TarFileSet extends FileSet {
-
-    private $files = null;
-
-    private $mode = 0100644;
-
-    private $userName = "";
-    private $groupName = "";
-    private $prefix = "";
-    private $fullpath = "";
-    private $preserveLeadingSlashes = false;
-
-    /**
-     *  Get a list of files and directories specified in the fileset.
-     *  @return array a list of file and directory names, relative to
-     *    the baseDir for the project.
-     */
-    public function getFiles(Project $p, $includeEmpty = true) {
-    
-        if ($this->files === null) {
-        
-            $ds = $this->getDirectoryScanner($p);
-            $this->files = $ds->getIncludedFiles();
-            
-            if ($includeEmpty) {
-            
-	            // first any empty directories that will not be implicitly added by any of the files
-				$implicitDirs = array();
-				foreach($this->files as $file) {
-					$implicitDirs[] = dirname($file);
-				} 
-				
-				$incDirs = $ds->getIncludedDirectories();
-				
-				// we'll need to add to that list of implicit dirs any directories
-				// that contain other *directories* (and not files), since otherwise
-				// we get duplicate directories in the resulting tar
-				foreach($incDirs as $dir) {
-					foreach($incDirs as $dircheck) {
-						if (!empty($dir) && $dir == dirname($dircheck)) {
-							$implicitDirs[] = $dir;
-						}
-					}
-				}
-				
-				$implicitDirs = array_unique($implicitDirs);
-				
-				// Now add any empty dirs (dirs not covered by the implicit dirs)
-				// to the files array. 
-				
-				foreach($incDirs as $dir) { // we cannot simply use array_diff() since we want to disregard empty/. dirs
-					if ($dir != "" && $dir != "." && !in_array($dir, $implicitDirs)) {
-						// it's an empty dir, so we'll add it.
-						$this->files[] = $dir;
-					}
-				}
-			} // if $includeEmpty
-			
-        } // if ($this->files===null)
-        
-        return $this->files;
-    }
-
-    /**
-     * A 3 digit octal string, specify the user, group and 
-     * other modes in the standard Unix fashion; 
-     * optional, default=0644
-     * @param string $octalString
-     */
-    public function setMode($octalString) {
-        $octal = (int) $octalString;
-        $this->mode = 0100000 | $octal;
-    }
-
-    public function getMode() {
-        return $this->mode;
-    }
-
-    /**
-     * The username for the tar entry 
-     * This is not the same as the UID, which is
-     * not currently set by the task.
-     */
-    public function setUserName($userName) {
-        $this->userName = $userName;
-    }
-
-    public function getUserName() {
-        return $this->userName;
-    }
-
-    /**
-     * The groupname for the tar entry; optional, default=""
-     * This is not the same as the GID, which is
-     * not currently set by the task.
-     */
-    public function setGroup($groupName) {
-        $this->groupName = $groupName;
-    }
-
-    public function getGroup() {
-        return $this->groupName;
-    }
-
-    /**
-     * If the prefix attribute is set, all files in the fileset
-     * are prefixed with that path in the archive.
-     * optional.
-     */
-    public function setPrefix($prefix) {
-        $this->prefix = $prefix;
-    }
-
-    public function getPrefix() {
-        return $this->prefix;
-    }
-
-    /**
-     * If the fullpath attribute is set, the file in the fileset
-     * is written with that path in the archive. The prefix attribute,
-     * if specified, is ignored. It is an error to have more than one file specified in
-     * such a fileset.
-     */
-    public function setFullpath($fullpath) {
-        $this->fullpath = $fullpath;
-    }
-
-    public function getFullpath() {
-        return $this->fullpath;
-    }
-
-    /**
-     * Flag to indicates whether leading `/'s should
-     * be preserved in the file names.
-     * Optional, default is <code>false</code>.
-     * @return void
-     */
-    public function setPreserveLeadingSlashes($b) {
-        $this->preserveLeadingSlashes = (boolean) $b;
-    }
-
-    public function getPreserveLeadingSlashes() {
-        return $this->preserveLeadingSlashes;
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/UntarTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/UntarTask.php
deleted file mode 100644
index 2d091b645..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/UntarTask.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/*
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/tasks/ext/ExtractBaseTask.php';
-
-/**
- * Extracts one or several tar archives using PEAR Archive_Tar
- *
- * @author    Joakim Bodin <joakim.bodin+phing@gmail.com>
- * @version   $Revision: 1.0 $
- * @package   phing.tasks.ext
- * @since     2.2.0
- */
-class UntarTask extends ExtractBaseTask {
-
-    /**
-     * Ensures that PEAR lib exists.
-     */
-    public function init() {
-        include_once 'Archive/Tar.php';
-        if (!class_exists('Archive_Tar')) {
-            throw new BuildException("You must have installed the PEAR Archive_Tar class in order to use UntarTask.");
-        }
-    }
-
-    protected function extractArchive(PhingFile $tarfile)
-    {
-        $this->log("Extracting tar file: " . $tarfile->__toString() . ' to ' . $this->todir->__toString(), Project::MSG_INFO);
-
-        try {
-            $tar = $this->initTar($tarfile);
-            if(!$tar->extractModify($this->todir->getAbsolutePath(), $this->removepath)) {
-                throw new BuildException('Failed to extract tar file: ' . $tarfile->getAbsolutePath());
-            }
-        } catch (IOException $ioe) {
-            $msg = "Could not extract tar file: " . $ioe->getMessage();
-            throw new BuildException($msg, $ioe, $this->getLocation());
-        }
-    }
-
-    protected function listArchiveContent(PhingFile $tarfile)
-    {
-        $tar = $this->initTar($tarfile);
-        return $tar->listContent();
-    }
-
-    /**
-     * Init a Archive_Tar class with correct compression for the given file.
-     *
-     * @param PhingFile $tarfile
-     * @return Archive_Tar the tar class instance
-     */
-    private function initTar(PhingFile $tarfile)
-    {
-        $compression = null;
-        $tarfileName = $tarfile->getName();
-        $mode = strtolower(substr($tarfileName, strrpos($tarfileName, '.')));
-
-        $compressions = array(
-                'gz' => array('.gz', '.tgz',),
-                'bz2' => array('.bz2',),
-            );
-        foreach ($compressions as $algo => $ext) {
-            if (array_search($mode, $ext) !== false) {
-                $compression = $algo;
-                break;
-            }
-        }
-
-        return new Archive_Tar($tarfile->getAbsolutePath(), $compression);
-    }
-}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/UnzipTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/UnzipTask.php
deleted file mode 100644
index a8f515d6c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/UnzipTask.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/*
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/tasks/ext/ExtractBaseTask.php';
-require_once 'phing/system/io/FileSystem.php';
-require_once 'phing/lib/Zip.php';
-
-/**
- * Extracts one or several zip archive using PEAR Archive_Zip (which is presently unreleased
- * and included with Phing).
- *
- * @author    Joakim Bodin <joakim.bodin+phing@gmail.com>
- * @version   $Revision: 1.0 $
- * @package   phing.tasks.ext
- * @since     2.2.0
- */
-class UnzipTask extends ExtractBaseTask {
-    
-    protected function extractArchive(PhingFile $zipfile)
-    {
-        $extractParams = array('add_path' => $this->todir->getAbsolutePath());
-        if(!empty($this->removepath))
-        {
-            $extractParams['remove_path'] = $this->removepath;
-        }
-        
-        $this->log("Extracting zip: " . $zipfile->__toString() . ' to ' . $this->todir->__toString(), Project::MSG_INFO);
-        
-    	try {
-        	$zip = new Archive_Zip($zipfile->getAbsolutePath());
-        	
-        	$extractResponse = $zip->extract($extractParams);
-        	if(is_array($extractResponse)) {
-        	    foreach ($extractResponse as $extractedPath) {
-        	    	$this->log('Extracted' . $extractedPath['stored_filename'] . ' to ' . $this->todir->__toString(), Project::MSG_VERBOSE);
-        	    }
-        	} else if ($extractResponse === 0) {
-        	    throw new BuildException('Failed to extract zipfile: ' . $zip->errorInfo(true));
-        	}
-        } catch (IOException $ioe) {
-            $msg = "Could not extract ZIP: " . $ioe->getMessage();
-            throw new BuildException($msg, $ioe, $this->getLocation());
-        }
-    }
-    
-    protected function listArchiveContent(PhingFile $zipfile)
-    {
-        $zip = new Archive_Zip($zipfile->getAbsolutePath());
-        return $zip->listContent();
-    }
-}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/XmlLintTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/XmlLintTask.php
deleted file mode 100644
index b28088ada..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/XmlLintTask.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-/*
- *  $Id: XmlLintTask.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-
-/**
- * A XML lint task. Checking syntax of one or more XML files against an XML Schema using the DOM extension.
- *
- * @author   Knut Urdalen <knut.urdalen@telio.no>
- * @package  phing.tasks.ext
- */
-class XmlLintTask extends Task {
-
-  protected $file;  // the source file (from xml attribute)
-  protected $schema; // the schema file (from xml attribute)
-  protected $filesets = array(); // all fileset objects assigned to this task
-
-  /**
-   * File to be performed syntax check on
-   *
-   * @param PhingFile $file
-   */
-  public function setFile(PhingFile $file) {
-    $this->file = $file;
-  }
-
-  /**
-   * XML Schema Description file to validate against
-   *
-   * @param PhingFile $schema
-   */
-  public function setSchema(PhingFile $schema) {
-    $this->schema = $schema;
-  }
-  
-  /**
-   * Nested creator, creates a FileSet for this task
-   *
-   * @return FileSet The created fileset object
-   */
-  function createFileSet() {
-    $num = array_push($this->filesets, new FileSet());
-    return $this->filesets[$num-1];
-  }
-
-  /**
-   * Execute lint check against PhingFile or a FileSet
-   */
-  public function main() {
-    if(!isset($this->schema)) {
-      throw new BuildException("Missing attribute 'schema'");
-    }
-    $schema = $this->schema->getPath();
-    if(!file_exists($schema)) {
-      throw new BuildException("File not found: ".$schema);
-    }
-    if(!isset($this->file) and count($this->filesets) == 0) {
-      throw new BuildException("Missing either a nested fileset or attribute 'file' set");
-    }
-
-    set_error_handler(array($this, 'errorHandler'));
-    if($this->file instanceof PhingFile) {
-      $this->lint($this->file->getPath());
-    } else { // process filesets
-      $project = $this->getProject();
-      foreach($this->filesets as $fs) {
-	$ds = $fs->getDirectoryScanner($project);
-	$files = $ds->getIncludedFiles();
-	$dir = $fs->getDir($this->project)->getPath();
-	foreach($files as $file) {
-	  $this->lint($dir.DIRECTORY_SEPARATOR.$file);
-	}
-      }
-    }
-    restore_error_handler();
-  }
-
-  /**
-   * Performs validation
-   *
-   * @param string $file
-   * @return void
-   */
-  protected function lint($file) {
-    if(file_exists($file)) {
-      if(is_readable($file)) {
-	$dom = new DOMDocument();
-	$dom->load($file);
-	if($dom->schemaValidate($this->schema->getPath())) {
-	  $this->log($file.' validated', Project::MSG_INFO);
-	} else {
-	  $this->log($file.' fails to validate (See messages above)', Project::MSG_ERR);
-	}
-      } else {
-	throw new BuildException('Permission denied: '.$file);
-      }
-    } else {
-      throw new BuildException('File not found: '.$file);
-    }
-  }
-
-  /**
-   * Local error handler to catch validation errors and log them through Phing
-   *
-   * @param int    $level
-   * @param string $message
-   * @param string $file
-   * @param int    $line
-   */
-  public function errorHandler($level, $message, $file, $line, $context) {
-    $matches = array();
-    preg_match('/^.*\(\): (.*)$/', $message, $matches);
-    $this->log($matches[1], Project::MSG_ERR);
-  }
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ZendCodeAnalyzerTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ZendCodeAnalyzerTask.php
deleted file mode 100644
index e2f786b2b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ZendCodeAnalyzerTask.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-/*
- *  $Id: ZendCodeAnalyzerTask.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-
-/**
- * ZendCodeAnalyzerTask analyze PHP source code using the ZendCodeAnalyzer included in Zend Studio 5.1
- * 
- * Available warnings:
- * <b>zend-error</b> - %s(line %d): %s
- * <b>oneline-comment</b> - One-line comment ends with  tag.
- * <b>bool-assign</b> - Assignment seen where boolean expression is expected. Did you mean '==' instead of '='?
- * <b>bool-print</b> - Print statement used when boolean expression is expected.
- * <b>bool-array</b> - Array used when boolean expression is expected.
- * <b>bool-object</b> - Object used when boolean expression is expected.
- * <b>call-time-ref</b> - Call-time reference is deprecated. Define function as accepting parameter by reference instead.
- * <b>if-if-else</b> - In if-if-else construction else relates to the closest if. Use braces to make the code clearer.
- * <b>define-params</b> - define() requires two or three parameters.
- * <b>define-const</b> - First parameter for define() should be string. Maybe you forgot quotes?
- * <b>break-var</b> - Break/continue with variable is dangerous - break level can be out of scope.
- * <b>break-depth</b> - Break/continue with depth more than current nesting level.
- * <b>var-once</b> - Variable '%s' encountered only once. May be a typo?
- * <b>var-arg-unused</b> - Function argument '%s' is never used.
- * <b>var-global-unused</b> - Global variable '%s' is defined but never used.
- * <b>var-use-before-def</b> - Variable '%s' is used before it was assigned.
- * <b>var-use-before-def-global</b> - Global variable '%s' is used without being assigned. You are probably relying on register_globals feature of PHP. Note that this feature is off by default.
- * <b>var-no-global</b> - PHP global variable '%s' is used as local. Maybe you wanted to define '%s' as global?
- * <b>var-value-unused</b> - Value assigned to variable '%s' is never used
- * <b>var-ref-notmodified</b> - Function parameter '%s' is passed by reference but never modified. Consider passing by value.
- * <b>return-empty-val</b> - Function '%s' has both empty return and return with value.
- * <b>return-empty-used</b> - Function '%s' has empty return but return value is used.
- * <b>return-noref</b> - Function '%s' returns reference but the value is not assigned by reference. Maybe you meant '=&' instead of '='?
- * <b>return-end-used</b> - Control reaches the end of function '%s'(file %s, line %d) but return value is used.
- * <b>sprintf-miss-args</b> - Missing arguments for sprintf: format reqires %d arguments but %d are supplied.
- * <b>sprintf-extra-args</b> - Extra arguments for sprintf: format reqires %d arguments but %d are supplied.
- * <b>unreach-code</b> - Unreachable code in function '%s'.
- * <b>include-var</b> - include/require with user-accessible variable can be dangerous. Consider using constant instead.
- * <b>non-object</b> - Variable '%s' used as object, but has different type.
- * <b>bad-escape</b> - Bad escape sequence: \%c, did you mean \\%c?
- * <b>empty-cond</b> - Condition without a body
- * <b>expr-unused</b> - Expression result is never used
- *
- * @author   Knut Urdalen <knut.urdalen@gmail.com>
- * @package  phing.tasks.ext
- */
-class ZendCodeAnalyzerTask extends Task {
-  
-  protected $analyzerPath = ""; // Path to ZendCodeAnalyzer binary
-  protected $file = "";  // the source file (from xml attribute)
-  protected $filesets = array(); // all fileset objects assigned to this task
-  protected $warnings = array();
-  protected $counter = 0;
-  protected $disable = array();
-  protected $enable = array();
-  
-  /**
-   * File to be analyzed
-   * 
-   * @param PhingFile $file
-   */
-  public function setFile(PhingFile $file) {
-    $this->file = $file;
-  }
-  
-  /**
-   * Path to ZendCodeAnalyzer binary
-   *
-   * @param string $analyzerPath
-   */
-  public function setAnalyzerPath($analyzerPath) {
-    $this->analyzerPath = $analyzerPath;
-  }
-  
-  /**
-   * Disable warning levels. Seperate warning levels with ','
-   *
-   * @param string $disable
-   */
-  public function setDisable($disable) {
-    $this->disable = explode(",", $disable);
-  }
-  
-  /**
-   * Enable warning levels. Seperate warning levels with ','
-   *
-   * @param string $enable
-   */
-  public function setEnable($enable) {
-    $this->enable = explode(",", $enable);
-  }
-  
-  /**
-   * Nested creator, creates a FileSet for this task
-   *
-   * @return FileSet The created fileset object
-   */
-  function createFileSet() {
-    $num = array_push($this->filesets, new FileSet());
-    return $this->filesets[$num-1];
-  }
-
-  /**
-   * Analyze against PhingFile or a FileSet
-   */
-  public function main() {
-    if(!isset($this->analyzerPath)) {
-      throw new BuildException("Missing attribute 'analyzerPath'");
-    }
-    if(!isset($this->file) and count($this->filesets) == 0) {
-      throw new BuildException("Missing either a nested fileset or attribute 'file' set");
-    }
-    
-    if($this->file instanceof PhingFile) {
-      $this->analyze($this->file->getPath());
-    } else { // process filesets
-      $project = $this->getProject();
-      foreach($this->filesets as $fs) {
-      	$ds = $fs->getDirectoryScanner($project);
-      	$files = $ds->getIncludedFiles();
-      	$dir = $fs->getDir($this->project)->getPath();
-      	foreach($files as $file) {
-	  $this->analyze($dir.DIRECTORY_SEPARATOR.$file);
-      	}
-      }
-    }
-    $this->log("Number of findings: ".$this->counter, Project::MSG_INFO);
-  }
-
-  /**
-   * Analyze file
-   *
-   * @param string $file
-   * @return void
-   */
-  protected function analyze($file) {
-    if(file_exists($file)) {
-      if(is_readable($file)) {
-      	
-      	// Construct shell command
-      	$cmd = $this->analyzerPath." ";
-      	foreach($this->enable as $enable) { // Enable warning levels
-      		$cmd .= " --enable $enable ";
-      	}
-      	foreach($this->disable as $disable) { // Disable warning levels
-      		$cmd .= " --disable $disable ";
-      	}
-      	$cmd .= "$file 2>&1";
-      	
-      	// Execute command
-      	$result = shell_exec($cmd);
-      	$result = explode("\n", $result);
-      	for($i=2, $size=count($result); $i<($size-1); $i++) {
-	  $this->counter++;
-	  $this->log($result[$i], Project::MSG_WARN);
-      	}
-      } else {
-      	throw new BuildException('Permission denied: '.$file);
-      }
-    } else {
-      throw new BuildException('File not found: '.$file);
-    }
-  }
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ZipTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ZipTask.php
deleted file mode 100755
index 1411a5865..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ZipTask.php
+++ /dev/null
@@ -1,265 +0,0 @@
-<?php
-/*
- *  $Id: ZipTask.php 240 2007-09-25 20:43:37Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/tasks/system/MatchingTask.php';
-include_once 'phing/util/SourceFileScanner.php';
-include_once 'phing/mappers/MergeMapper.php';
-include_once 'phing/util/StringHelper.php';
-include_once 'phing/lib/Zip.php';
-
-/**
- * Creates a zip archive using PEAR Archive_Zip (which is presently unreleased
- * and included with Phing).
- *
- * @author    Michiel Rook <michiel.rook@gmail.com>
- * @version   $Revision: 1.2 $
- * @package   phing.tasks.ext
- * @since     2.1.0
- */
-class ZipTask extends MatchingTask {
-    
-	/**
-	 * @var PhingFile
-	 */
-    private $zipFile;
-    
-    /**
-     * @var PhingFile
-     */
-    private $baseDir;
-	
-    /**
-     * Whether to include empty dirs in the archive.
-     */
-    private $includeEmpty = true;
-    
-    private $filesets = array();
-    private $fileSetFiles = array();
-
-    /**
-     * Add a new fileset.
-     * @return FileSet
-     */
-    public function createFileSet() {
-        $this->fileset = new ZipFileSet();
-        $this->filesets[] = $this->fileset;
-        return $this->fileset;
-    }
-
-    /**
-     * Set is the name/location of where to create the zip file.
-     * @param PhingFile $destFile The output of the zip
-     */
-    public function setDestFile(PhingFile $destFile) {
-        $this->zipFile = $destFile;
-    }
-
-    /**
-     * This is the base directory to look in for things to zip.
-     * @param PhingFile $baseDir
-     */
-    public function setBasedir(PhingFile $baseDir) {
-        $this->baseDir = $baseDir;
-    }
-
-    /**
-     * Set the include empty dirs flag.
-     * @param  boolean  Flag if empty dirs should be tarred too
-     * @return void
-     * @access public
-     */
-    function setIncludeEmptyDirs($bool) {
-        $this->includeEmpty = (boolean) $bool;
-    }
-    
-    /**
-     * do the work
-     * @throws BuildException
-     */
-    public function main() {
-    
-        if ($this->zipFile === null) {
-            throw new BuildException("zipfile attribute must be set!", $this->getLocation());
-        }
-
-        if ($this->zipFile->exists() && $this->zipFile->isDirectory()) {
-            throw new BuildException("zipfile is a directory!", $this->getLocation());
-        }
-
-        if ($this->zipFile->exists() && !$this->zipFile->canWrite()) {
-            throw new BuildException("Can not write to the specified zipfile!", $this->getLocation());
-        }
-
-        // shouldn't need to clone, since the entries in filesets
-        // themselves won't be modified -- only elements will be added
-        $savedFileSets = $this->filesets;
-        
-        try {
-            if ($this->baseDir !== null) {
-                if (!$this->baseDir->exists()) {
-                    throw new BuildException("basedir does not exist!", $this->getLocation());
-                }
-                
-                if (empty($this->filesets))
-                {
-	                // add the main fileset to the list of filesets to process.
-	                $mainFileSet = new ZipFileSet($this->fileset);
-	                $mainFileSet->setDir($this->baseDir);
-	                $this->filesets[] = $mainFileSet;
-                }
-            }
-
-            if (empty($this->filesets)) {
-                throw new BuildException("You must supply either a basedir "
-                                         . "attribute or some nested filesets.",
-                                         $this->getLocation());
-            }                        
-            
-            // check if zip is out of date with respect to each
-            // fileset
-            $upToDate = true;
-            foreach($this->filesets as $fs) {
-            	$files = $fs->getFiles($this->project, $this->includeEmpty);
-                if (!$this->archiveIsUpToDate($files, $fs->getDir($this->project))) {
-                    $upToDate = false;
-                }
-                for ($i=0, $fcount=count($files); $i < $fcount; $i++) {
-                    if ($this->zipFile->equals(new PhingFile($fs->getDir($this->project), $files[$i]))) {
-                        throw new BuildException("A zip file cannot include itself", $this->getLocation());
-                    }
-                }
-            }
-            
-            if ($upToDate) {
-                $this->log("Nothing to do: " . $this->zipFile->__toString() . " is up to date.", Project::MSG_INFO);
-                return;
-            }
-
-            $this->log("Building zip: " . $this->zipFile->__toString(), Project::MSG_INFO);
-            
-            $zip = new Archive_Zip($this->zipFile->getAbsolutePath());
-            
-            foreach($this->filesets as $fs) {
-            	
-            	$files = $fs->getFiles($this->project, $this->includeEmpty);
-            	
-                $fsBasedir = (null != $this->baseDir) ? $this->baseDir :
-									$fs->getDir($this->project);
-                
-                $filesToZip = array();
-                for ($i=0, $fcount=count($files); $i < $fcount; $i++) {
-                    $f = new PhingFile($fsBasedir, $files[$i]);
-                    $filesToZip[] = $f->getAbsolutePath();
-                    $this->log("Adding " . $f->getPath() . " to archive.", Project::MSG_VERBOSE);                        
-                }
-                $zip->add($filesToZip, array('remove_path' => $fsBasedir->getCanonicalPath()));
-            }
-                         
-                
-        } catch (IOException $ioe) {
-                $msg = "Problem creating ZIP: " . $ioe->getMessage();
-                $this->filesets = $savedFileSets;
-                throw new BuildException($msg, $ioe, $this->getLocation());
-        }
-        
-        $this->filesets = $savedFileSets;
-    }
-           
-    /**
-     * @param array $files array of filenames
-     * @param PhingFile $dir
-     * @return boolean
-     */
-    protected function archiveIsUpToDate($files, $dir) {
-        $sfs = new SourceFileScanner($this);
-        $mm = new MergeMapper();
-        $mm->setTo($this->zipFile->getAbsolutePath());
-        return count($sfs->restrict($files, $dir, null, $mm)) == 0;
-    }
-   
-}
-
-
-
-
-/**
- * This is a FileSet with the to specify permissions.
- * 
- * Permissions are currently not implemented by PEAR Archive_Tar,
- * but hopefully they will be in the future.
- * 
- */
-class ZipFileSet extends FileSet {
-
-    private $files = null;
-
-    /**
-     *  Get a list of files and directories specified in the fileset.
-     *  @return array a list of file and directory names, relative to
-     *    the baseDir for the project.
-     */
-    public function getFiles(Project $p, $includeEmpty = true) {
-    
-        if ($this->files === null) {
-        
-            $ds = $this->getDirectoryScanner($p);
-            $this->files = $ds->getIncludedFiles();
-            
-            if ($includeEmpty) {
-            
-	            // first any empty directories that will not be implicitly added by any of the files
-				$implicitDirs = array();
-				foreach($this->files as $file) {
-					$implicitDirs[] = dirname($file);
-				} 
-				
-				$incDirs = $ds->getIncludedDirectories();
-				
-				// we'll need to add to that list of implicit dirs any directories
-				// that contain other *directories* (and not files), since otherwise
-				// we get duplicate directories in the resulting tar
-				foreach($incDirs as $dir) {
-					foreach($incDirs as $dircheck) {
-						if (!empty($dir) && $dir == dirname($dircheck)) {
-							$implicitDirs[] = $dir;
-						}
-					}
-				}
-				
-				$implicitDirs = array_unique($implicitDirs);
-				
-				// Now add any empty dirs (dirs not covered by the implicit dirs)
-				// to the files array. 
-				
-				foreach($incDirs as $dir) { // we cannot simply use array_diff() since we want to disregard empty/. dirs
-					if ($dir != "" && $dir != "." && !in_array($dir, $implicitDirs)) {
-						// it's an empty dir, so we'll add it.
-						$this->files[] = $dir;
-					}
-				}
-			} // if $includeEmpty
-			
-        } // if ($this->files===null)
-        
-        return $this->files;
-    }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/coverage/CoverageMerger.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/coverage/CoverageMerger.php
deleted file mode 100755
index d29f28ce9..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/coverage/CoverageMerger.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/**
- * $Id: CoverageMerger.php 426 2008-10-28 19:29:49Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/system/util/Properties.php';
-
-/**
- * Saves coverage output of the test to a specified database
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: CoverageMerger.php 426 2008-10-28 19:29:49Z mrook $
- * @package phing.tasks.ext.coverage
- * @since 2.1.0
- */
-class CoverageMerger
-{
-	private static function mergeCodeCoverage($left, $right)
-	{
-		$coverageMerged = array();
-
-		reset($left);
-		reset($right);
-
-		while (current($left) && current($right))
-		{
-			$linenr_left = key($left);
-			$linenr_right = key($right);
-
-			if ($linenr_left < $linenr_right)
-			{
-				$coverageMerged[$linenr_left] = current($left);
-
-				next($left);
-			}
-			else
-			if ($linenr_right < $linenr_left)
-			{
-				$coverageMerged[$linenr_right] = current($right);
-				next($right);
-			}
-			else
-			{
-				if (current($left) < 0)
-				{
-					$coverageMerged[$linenr_right] = current($right);
-				}
-				else
-				if (current($right) < 0)
-				{
-					$coverageMerged[$linenr_right] = current($left);
-				}
-				else
-				{
-					$coverageMerged[$linenr_right] = current($left) + current($right);
-				}
-				
-				next($left);
-				next($right);
-			}
-		}
-
-		while (current($left))
-		{
-			$coverageMerged[key($left)] = current($left);
-			next($left);
-		}
-
-		while (current($right))
-		{
-			$coverageMerged[key($right)] = current($right);
-			next($right);
-		}
-
-		return $coverageMerged;
-	}
-
-	static function merge($project, $codeCoverageInformation)
-	{
-		$database = new PhingFile($project->getProperty('coverage.database'));
-
-		$props = new Properties();
-		$props->load($database);
-		
-		$coverageTotal = $codeCoverageInformation;
-		
-		foreach ($coverageTotal as $coverage)
-		{
-			foreach ($coverage as $filename => $coverageFile)
-			{
-				$filename = strtolower($filename);
-				
-				if ($props->getProperty($filename) != null)
-				{
-					$file = unserialize($props->getProperty($filename));
-					$left = $file['coverage'];
-					$right = $coverageFile;
-					if (!is_array($right)) {
-						$right = array_shift(PHPUnit_Util_CodeCoverage::bitStringToCodeCoverage(array($right), 1)); 
-					}
-						
-					$coverageMerged = CoverageMerger::mergeCodeCoverage($left, $right);
-					
-					foreach ($coverageMerged as $key => $value)
-					{
-						if ($value == -2)
-						{
-							unset($coverageMerged[$key]);
-						}
-					}
-					
-					$file['coverage'] = $coverageMerged;
-					
-					$props->setProperty($filename, serialize($file));
-				}
-			}
-		}
-
-		$props->store($database);
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/coverage/CoverageMergerTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/coverage/CoverageMergerTask.php
deleted file mode 100644
index 2d6212d76..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/coverage/CoverageMergerTask.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * $Id: CoverageMergerTask.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-require_once 'phing/system/io/PhingFile.php';
-require_once 'phing/system/io/Writer.php';
-require_once 'phing/system/util/Properties.php';
-require_once 'phing/tasks/ext/coverage/CoverageMerger.php';
-
-/**
- * Merges code coverage snippets into a code coverage database
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: CoverageMergerTask.php 325 2007-12-20 15:44:58Z hans $
- * @package phing.tasks.ext.coverage
- * @since 2.1.0
- */
-class CoverageMergerTask extends Task
-{
-	/** the list of filesets containing the .php filename rules */
-	private $filesets = array();
-
-	/**
-	 * Add a new fileset containing the .php files to process
-	 *
-	 * @param FileSet the new fileset containing .php files
-	 */
-	function addFileSet(FileSet $fileset)
-	{
-		$this->filesets[] = $fileset;
-	}
-
-	/**
-	 * Iterate over all filesets and return all the filenames.
-	 *
-	 * @return array an array of filenames
-	 */
-	private function getFilenames()
-	{
-		$files = array();
-
-		foreach ($this->filesets as $fileset)
-		{
-			$ds = $fileset->getDirectoryScanner($this->project);
-			$ds->scan();
-
-			$includedFiles = $ds->getIncludedFiles();
-			
-			foreach ($includedFiles as $file)
-			{
-				$fs = new PhingFile(basename($ds->getBaseDir()), $file);
-					
-				$files[] = $fs->getAbsolutePath();
-			}
-		}
-
-		return $files;
-	}
-	
-	function main()
-	{
-		$files = $this->getFilenames();
-		
-		$this->log("Merging " . count($files) . " coverage files");
-
-		foreach ($files as $file)
-		{
-			$coverageInformation = unserialize(file_get_contents($file));
-			
-			CoverageMerger::merge($this->project, array($coverageInformation));
-		}
-	}
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/coverage/CoverageReportTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/coverage/CoverageReportTask.php
deleted file mode 100755
index dd66b6be3..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/coverage/CoverageReportTask.php
+++ /dev/null
@@ -1,414 +0,0 @@
-<?php
-/**
- * $Id: CoverageReportTask.php 426 2008-10-28 19:29:49Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-require_once 'phing/system/io/PhingFile.php';
-require_once 'phing/system/io/Writer.php';
-require_once 'phing/system/util/Properties.php';
-require_once 'phing/tasks/ext/phpunit/PHPUnitUtil.php';
-require_once 'phing/tasks/ext/coverage/CoverageReportTransformer.php';
-
-/**
- * Transforms information in a code coverage database to XML
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: CoverageReportTask.php 426 2008-10-28 19:29:49Z mrook $
- * @package phing.tasks.ext.coverage
- * @since 2.1.0
- */
-class CoverageReportTask extends Task
-{
-	private $outfile = "coverage.xml";
-
-	private $transformers = array();
-
-	/** the classpath to use (optional) */
-	private $classpath = NULL;
-	
-	/** the path to the GeSHi library (optional) */
-	private $geshipath = "";
-	
-	/** the path to the GeSHi language files (optional) */
-	private $geshilanguagespath = "";
-	
-	function setClasspath(Path $classpath)
-	{
-		if ($this->classpath === null)
-		{
-			$this->classpath = $classpath;
-		}
-		else
-		{
-			$this->classpath->append($classpath);
-		}
-	}
-
-	function createClasspath()
-	{
-		$this->classpath = new Path();
-		return $this->classpath;
-	}
-	
-	function setGeshiPath($path)
-	{
-		$this->geshipath = $path;
-	}
-
-	function setGeshiLanguagesPath($path)
-	{
-		$this->geshilanguagespath = $path;
-	}
-
-	function __construct()
-	{
-		$this->doc = new DOMDocument();
-		$this->doc->encoding = 'UTF-8';
-		$this->doc->formatOutput = true;
-		$this->doc->appendChild($this->doc->createElement('snapshot'));
-	}
-
-	function setOutfile($outfile)
-	{
-		$this->outfile = $outfile;
-	}
-
-	/**
-	 * Generate a report based on the XML created by this task
-	 */
-	function createReport()
-	{
-		$transformer = new CoverageReportTransformer($this);
-		$this->transformers[] = $transformer;
-		return $transformer;
-	}
-
-	protected function getPackageElement($packageName)
-	{
-		$packages = $this->doc->documentElement->getElementsByTagName('package');
-
-		foreach ($packages as $package)
-		{
-			if ($package->getAttribute('name') == $packageName)
-			{
-				return $package;
-			}
-		}
-
-		return NULL;
-	}
-
-	protected function addClassToPackage($classname, $element)
-	{
-		$packageName = PHPUnitUtil::getPackageName($classname);
-
-		$package = $this->getPackageElement($packageName);
-
-		if ($package === NULL)
-		{
-			$package = $this->doc->createElement('package');
-			$package->setAttribute('name', $packageName);
-			$this->doc->documentElement->appendChild($package);
-		}
-
-		$package->appendChild($element);
-	}
-
-	protected function stripDiv($source)
-	{
-		$openpos = strpos($source, "<div");
-		$closepos = strpos($source, ">", $openpos);
-
-		$line = substr($source, $closepos + 1);
-
-		$tagclosepos = strpos($line, "</div>");
-
-		$line = substr($line, 0, $tagclosepos);
-
-		return $line;
-	}
-
-	protected function highlightSourceFile($filename)
-	{
-		if ($this->geshipath)
-		{
-			require_once $this->geshipath . '/geshi.php';
-			
-			$source = file_get_contents($filename);
-
-			$geshi = new GeSHi($source, 'php', $this->geshilanguagespath);
-
-			$geshi->enable_line_numbers(GESHI_NORMAL_LINE_NUMBERS);
-
-			$geshi->enable_strict_mode(true);
-
-			$geshi->enable_classes(true);
-
-			$geshi->set_url_for_keyword_group(3, ''); 
-
-			$html = $geshi->parse_code();
-
-			$lines = split("<li>|</li>", $html);
-
-			// skip first and last line
-			array_pop($lines);
-			array_shift($lines);
-
-			$lines = array_filter($lines);
-
-			$lines = array_map(array($this, 'stripDiv'), $lines);
-
-			return $lines;
-		}
-		else
-		{
-			$lines = file($filename);
-			
-			for ($i = 0; $i < count($lines); $i++)
-			{
-				$line = $lines[$i];
-				
-				$line = rtrim($line);
-				
-				if (function_exists('mb_convert_encoding'))
-				{
-					$lines[$i] = mb_convert_encoding($line, 'UTF-8');
-				}
-				else
-				{
-					$lines[$i] = utf8_encode($line);
-				}
-			}
-			
-			return $lines;
-		}
-	}
-
-	protected function transformSourceFile($filename, $coverageInformation, $classStartLine = 1)
-	{
-		$sourceElement = $this->doc->createElement('sourcefile');
-		$sourceElement->setAttribute('name', basename($filename));
-		
-		/**
-		 * Add original/full filename to document
-		 */
-		$sourceElement->setAttribute('sourcefile', $filename);
-
-		$filelines = $this->highlightSourceFile($filename);
-
-		$linenr = 1;
-
-		foreach ($filelines as $line)
-		{
-			$lineElement = $this->doc->createElement('sourceline');
-			$lineElement->setAttribute('coveredcount', (isset($coverageInformation[$linenr]) ? $coverageInformation[$linenr] : '0'));
-
-			if ($linenr == $classStartLine)
-			{
-				$lineElement->setAttribute('startclass', 1);
-			}
-
-			$textnode = $this->doc->createTextNode($line);
-			$lineElement->appendChild($textnode);
-
-			$sourceElement->appendChild($lineElement);
-
-			$linenr++;
-		}
-
-		return $sourceElement;
-	}
-	
-	protected function filterCovered($var)
-	{
-		return ($var >= 0);
-	}
-
-	protected function transformCoverageInformation($filename, $coverageInformation)
-	{	
-		$classes = PHPUnitUtil::getDefinedClasses($filename, $this->classpath);
-		
-		if (is_array($classes))
-		{
-			foreach ($classes as $classname)
-			{
-				$reflection = new ReflectionClass($classname);
-				
-				$methods = $reflection->getMethods();
-				
-				$classElement = $this->doc->createElement('class');
-				$classElement->setAttribute('name', $reflection->getName());
-				
-				$this->addClassToPackage($reflection->getName(), $classElement);
-
-				$classStartLine = $reflection->getStartLine();
-				
-				$methodscovered = 0;
-				$methodcount = 0;
-				
-				// Strange PHP5 reflection bug, classes without parent class or implemented interfaces seem to start one line off
-				if ($reflection->getParentClass() == NULL && count($reflection->getInterfaces()) == 0)
-				{
-					unset($coverageInformation[$classStartLine + 1]);
-				}
-				else
-				{
-					unset($coverageInformation[$classStartLine]);
-				}
-				
-				reset($coverageInformation);				
-				
-				foreach ($methods as $method)
-				{
-					// PHP5 reflection considers methods of a parent class to be part of a subclass, we don't
-					if ($method->getDeclaringClass()->getName() != $reflection->getName())
-					{
-						continue;
-					}
-
-					// small fix for XDEBUG_CC_UNUSED
-					if (isset($coverageInformation[$method->getStartLine()]))
-					{
-						unset($coverageInformation[$method->getStartLine()]);
-					}
-
-					if (isset($coverageInformation[$method->getEndLine()]))
-					{
-						unset($coverageInformation[$method->getEndLine()]);
-					}
-
-					if ($method->isAbstract())
-					{
-						continue;
-					}
-
-					$linenr = key($coverageInformation);
-
-					while ($linenr !== null && $linenr < $method->getStartLine())
-					{
-						next($coverageInformation);
-						$linenr = key($coverageInformation);
-					}
-
-					if (current($coverageInformation) > 0 && $method->getStartLine() <= $linenr && $linenr <= $method->getEndLine())
-					{
-						$methodscovered++;
-					}
-
-					$methodcount++;
-				}
-
-				$statementcount = count($coverageInformation);
-				$statementscovered = count(array_filter($coverageInformation, array($this, 'filterCovered')));
-
-				$classElement->appendChild($this->transformSourceFile($filename, $coverageInformation, $classStartLine));
-
-				$classElement->setAttribute('methodcount', $methodcount);
-				$classElement->setAttribute('methodscovered', $methodscovered);
-				$classElement->setAttribute('statementcount', $statementcount);
-				$classElement->setAttribute('statementscovered', $statementscovered);
-				$classElement->setAttribute('totalcount', $methodcount + $statementcount);
-				$classElement->setAttribute('totalcovered', $methodscovered + $statementscovered);
-			}
-		}
-	}
-
-	protected function calculateStatistics()
-	{
-		$packages = $this->doc->documentElement->getElementsByTagName('package');
-
-		$totalmethodcount = 0;
-		$totalmethodscovered = 0;
-
-		$totalstatementcount = 0;
-		$totalstatementscovered = 0;
-
-		foreach ($packages as $package)
-		{
-			$methodcount = 0;
-			$methodscovered = 0;
-
-			$statementcount = 0;
-			$statementscovered = 0;
-
-			$classes = $package->getElementsByTagName('class');
-
-			foreach ($classes as $class)
-			{
-				$methodcount += $class->getAttribute('methodcount');
-				$methodscovered += $class->getAttribute('methodscovered');
-
-				$statementcount += $class->getAttribute('statementcount');
-				$statementscovered += $class->getAttribute('statementscovered');
-			}
-
-			$package->setAttribute('methodcount', $methodcount);
-			$package->setAttribute('methodscovered', $methodscovered);
-
-			$package->setAttribute('statementcount', $statementcount);
-			$package->setAttribute('statementscovered', $statementscovered);
-
-			$package->setAttribute('totalcount', $methodcount + $statementcount);
-			$package->setAttribute('totalcovered', $methodscovered + $statementscovered);
-
-			$totalmethodcount += $methodcount;
-			$totalmethodscovered += $methodscovered;
-
-			$totalstatementcount += $statementcount;
-			$totalstatementscovered += $statementscovered;
-		}
-
-		$this->doc->documentElement->setAttribute('methodcount', $totalmethodcount);
-		$this->doc->documentElement->setAttribute('methodscovered', $totalmethodscovered);
-
-		$this->doc->documentElement->setAttribute('statementcount', $totalstatementcount);
-		$this->doc->documentElement->setAttribute('statementscovered', $totalstatementscovered);
-
-		$this->doc->documentElement->setAttribute('totalcount', $totalmethodcount + $totalstatementcount);
-		$this->doc->documentElement->setAttribute('totalcovered', $totalmethodscovered + $totalstatementscovered);
-	}
-
-	function main()
-	{
-		$this->log("Transforming coverage report");
-		
-		$database = new PhingFile($this->project->getProperty('coverage.database'));
-		
-		$props = new Properties();
-		$props->load($database);
-
-		foreach ($props->keys() as $filename)
-		{
-			$file = unserialize($props->getProperty($filename));
-			
-			$this->transformCoverageInformation($file['fullname'], $file['coverage']);
-		}
-		
-		$this->calculateStatistics();
-
-		$this->doc->save($this->outfile);
-
-		foreach ($this->transformers as $transformer)
-		{
-			$transformer->setXmlDocument($this->doc);
-			$transformer->transform();
-		}
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/coverage/CoverageReportTransformer.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/coverage/CoverageReportTransformer.php
deleted file mode 100755
index 81f4dc722..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/coverage/CoverageReportTransformer.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * $Id: CoverageReportTransformer.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-require_once 'phing/system/io/PhingFile.php';
-require_once 'phing/system/io/FileWriter.php';
-require_once 'phing/util/ExtendedFileStream.php';
-
-/**
- * Transform a Phing/Xdebug code coverage xml report.
- * The default transformation generates an html report in framed style.
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: CoverageReportTransformer.php 325 2007-12-20 15:44:58Z hans $
- * @package phing.tasks.ext.coverage
- * @since 2.1.0
- */
-class CoverageReportTransformer
-{
-	private $task = NULL;
-	private $styleDir = "";
-	private $toDir = "";
-	private $document = NULL;
-
-	function __construct(Task $task)
-	{
-		$this->task = $task;
-	}
-
-	function setStyleDir($styleDir)
-	{
-		$this->styleDir = $styleDir;
-	}
-
-	function setToDir($toDir)
-	{
-		$this->toDir = $toDir;
-	}
-
-	function setXmlDocument($document)
-	{
-		$this->document = $document;
-	}
-
-	function transform()
-	{
-        $dir = new PhingFile($this->toDir);
-
-        if (!$dir->exists())
-        {
-            throw new BuildException("Directory '" . $this->toDir . "' does not exist");
-        }
-
-		$xslfile = $this->getStyleSheet();
-
-		$xsl = new DOMDocument();
-		$xsl->load($xslfile->getAbsolutePath());
-
-		$proc = new XSLTProcessor();
-		$proc->importStyleSheet($xsl);
-
-		ExtendedFileStream::registerStream();
-
-		// no output for the framed report
-		// it's all done by extension...
-		$proc->setParameter('', 'output.dir', $dir->getAbsolutePath());
-		$proc->transformToXML($this->document);
-	}
-
-	private function getStyleSheet()
-	{
-		$xslname = "coverage-frames.xsl";
-
-		if ($this->styleDir)
-		{
-			$file = new PhingFile($this->styleDir, $xslname);
-		}
-		else
-		{
-			$path = Phing::getResourcePath("phing/etc/$xslname");
-			
-			if ($path === NULL)
-			{
-				$path = Phing::getResourcePath("etc/$xslname");
-
-				if ($path === NULL)
-				{
-					throw new BuildException("Could not find $xslname in resource path");
-				}
-			}
-			
-			$file = new PhingFile($path);
-		}
-
-		if (!$file->exists())
-		{
-			throw new BuildException("Could not find file " . $file->getPath());
-		}
-
-		return $file;
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/coverage/CoverageSetupTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/coverage/CoverageSetupTask.php
deleted file mode 100755
index 9a194b52e..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/coverage/CoverageSetupTask.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-/**
- * $Id: CoverageSetupTask.php 426 2008-10-28 19:29:49Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-require_once 'phing/system/io/PhingFile.php';
-require_once 'phing/system/io/Writer.php';
-require_once 'phing/system/util/Properties.php';
-require_once 'phing/tasks/ext/coverage/CoverageMerger.php';
-
-/**
- * Initializes a code coverage database
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: CoverageSetupTask.php 426 2008-10-28 19:29:49Z mrook $
- * @package phing.tasks.ext.coverage
- * @since 2.1.0
- */
-class CoverageSetupTask extends Task
-{
-	/** the list of filesets containing the .php filename rules */
-	private $filesets = array();
-
-	/** the filename of the coverage database */
-	private $database = "coverage.db";
-
-	/** the classpath to use (optional) */
-	private $classpath = NULL;
-
-	/**
-	 * Add a new fileset containing the .php files to process
-	 *
-	 * @param FileSet the new fileset containing .php files
-	 */
-	function addFileSet(FileSet $fileset)
-	{
-		$this->filesets[] = $fileset;
-	}
-
-	/**
-	 * Sets the filename of the coverage database to use
-	 *
-	 * @param string the filename of the database
-	 */
-	function setDatabase($database)
-	{
-		$this->database = $database;
-	}
-
-	function setClasspath(Path $classpath)
-	{
-		if ($this->classpath === null)
-		{
-			$this->classpath = $classpath;
-		}
-		else
-		{
-			$this->classpath->append($classpath);
-		}
-	}
-
-	function createClasspath()
-	{
-		$this->classpath = new Path();
-		return $this->classpath;
-	}
-	
-	/**
-	 * Iterate over all filesets and return the filename of all files.
-	 *
-	 * @return array an array of (basedir, filenames) pairs
-	 */
-	private function getFilenames()
-	{
-		$files = array();
-
-		foreach ($this->filesets as $fileset)
-		{
-			$ds = $fileset->getDirectoryScanner($this->project);
-			$ds->scan();
-
-			$includedFiles = $ds->getIncludedFiles();
-
-			foreach ($includedFiles as $file)
-			{
-				$fs = new PhingFile(realpath($ds->getBaseDir()), $file);
-					
-				$files[] = array('key' => strtolower($fs->getAbsolutePath()), 'fullname' => $fs->getAbsolutePath());
-			}
-		}
-
-		return $files;
-	}
-	
-	function init()
-	{
-		if (!extension_loaded('xdebug'))
-		{
-			throw new Exception("CoverageSetupTask depends on Xdebug being installed.");
-		}
-	}
-
-	function main()
-	{
-		$files = $this->getFilenames();
-
-		$this->log("Setting up coverage database for " . count($files) . " files");
-
-		$props = new Properties();
-
-		foreach ($files as $file)
-		{
-			$fullname = $file['fullname'];
-			$filename = $file['key'];
-			
-			$props->setProperty($filename, serialize(array('fullname' => $fullname, 'coverage' => array())));
-		}
-
-		$dbfile = new PhingFile($this->database);
-
-		$props->store($dbfile);
-
-		$this->project->setProperty('coverage.database', $dbfile->getAbsolutePath());
-	
-		foreach ($files as $file)
-		{
-			$fullname = $file['fullname'];
-			
-			xdebug_start_code_coverage(XDEBUG_CC_DEAD_CODE | XDEBUG_CC_UNUSED);
-			
-			Phing::__import($fullname, $this->classpath);
-			
-			$coverage = xdebug_get_code_coverage();
-			
-			xdebug_stop_code_coverage();
-			
-			CoverageMerger::merge($this->project, array($coverage));
-		}
-	}
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/creole/CreoleSQLExecTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/creole/CreoleSQLExecTask.php
deleted file mode 100644
index 92a157b52..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/creole/CreoleSQLExecTask.php
+++ /dev/null
@@ -1,590 +0,0 @@
-<?php
-/*
- *  $Id: CreoleSQLExecTask.php 266 2007-10-25 01:32:38Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/tasks/ext/creole/CreoleTask.php';
-include_once 'phing/system/io/StringReader.php';
-
-/**
- * Executes a series of SQL statements on a database using Creole.
- *
- * <p>Statements can
- * either be read in from a text file using the <i>src</i> attribute or from 
- * between the enclosing SQL tags.</p>
- * 
- * <p>Multiple statements can be provided, separated by semicolons (or the 
- * defined <i>delimiter</i>). Individual lines within the statements can be 
- * commented using either --, // or REM at the start of the line.</p>
- * 
- * <p>The <i>autocommit</i> attribute specifies whether auto-commit should be 
- * turned on or off whilst executing the statements. If auto-commit is turned 
- * on each statement will be executed and committed. If it is turned off the 
- * statements will all be executed as one transaction.</p>
- * 
- * <p>The <i>onerror</i> attribute specifies how to proceed when an error occurs 
- * during the execution of one of the statements. 
- * The possible values are: <b>continue</b> execution, only show the error;
- * <b>stop</b> execution and commit transaction;
- * and <b>abort</b> execution and transaction and fail task.</p>
- *
- * @author    Hans Lellelid <hans@xmpl.org> (Phing)
- * @author    Jeff Martin <jeff@custommonkey.org> (Ant)
- * @author    Michael McCallum <gholam@xtra.co.nz> (Ant)
- * @author    Tim Stephenson <tim.stephenson@sybase.com> (Ant)
- * @package   phing.tasks.ext
- * @version   $Revision: 1.21 $
- */
-class CreoleSQLExecTask extends CreoleTask {
-
-    private $goodSql = 0;
-    private $totalSql = 0;
-
-    const DELIM_ROW = "row";
-    const DELIM_NORMAL = "normal";
-
-    /**
-     * Database connection
-     */
-    private $conn = null;
-
-    /**
-     * files to load
-     */
-    private $filesets = array();
-
-    /**
-     * all filterchains objects assigned to this task
-     */
-    private $filterChains  = array();
-
-    /**
-     * SQL statement
-     */
-    private $statement = null;
-
-    /**
-     * SQL input file
-     */
-    private $srcFile = null;
-
-    /**
-     * SQL input command
-     */
-    private $sqlCommand = "";
-
-    /**
-     * SQL transactions to perform
-     */
-    private $transactions = array();
-
-    /**
-     * SQL Statement delimiter
-     */
-    private $delimiter = ";";
-    
-    /**
-     * The delimiter type indicating whether the delimiter will
-     * only be recognized on a line by itself
-     */
-    private $delimiterType = "normal"; // can't use constant just defined
-    
-    /**
-     * Print SQL results.
-     */
-    private $print = false;
-
-    /**
-     * Print header columns.
-     */
-    private $showheaders = true;
-
-    /**
-     * Results Output file.
-     */
-    private $output = null;
-
-    
-    /**
-     * Action to perform if an error is found
-     **/
-    private $onError = "abort";
-    
-    /**
-     * Encoding to use when reading SQL statements from a file
-     */
-    private $encoding = null;
-
-    /**
-     * Append to an existing file or overwrite it?
-     */
-    private $append = false;
-        
-    /**
-     * Set the name of the SQL file to be run.
-     * Required unless statements are enclosed in the build file
-     */
-    public function setSrc(PhingFile $srcFile) {       
-        $this->srcFile = $srcFile;
-    }
-    
-    /**
-     * Set an inline SQL command to execute. 
-     * NB: Properties are not expanded in this text.
-     */
-    public function addText($sql) {
-        $this->sqlCommand .= $sql;
-    }
-    
-    /**
-     * Adds a set of files (nested fileset attribute).
-     */
-    public function addFileset(FileSet $set) {
-        $this->filesets[] = $set;
-    }
-
-    /**
-     * Creates a filterchain
-     *
-     * @access public
-     * @return  object  The created filterchain object
-     */
-    function createFilterChain() {
-        $num = array_push($this->filterChains, new FilterChain($this->project));
-        return $this->filterChains[$num-1];
-    }
-
-    /**
-     * Add a SQL transaction to execute
-     */
-    public function createTransaction() {
-        $t = new SQLExecTransaction($this);
-        $this->transactions[] = $t;
-        return $t;
-    }
-    
-    /**
-     * Set the file encoding to use on the SQL files read in
-     *
-     * @param encoding the encoding to use on the files
-     */
-    public function setEncoding($encoding) {
-        $this->encoding = $encoding;
-    }
-    
-    /**
-     * Set the statement delimiter.
-     *
-     * <p>For example, set this to "go" and delimitertype to "ROW" for
-     * Sybase ASE or MS SQL Server.</p>
-     *
-     * @param delimiter
-     */
-    public function setDelimiter($delimiter)
-    {
-        $this->delimiter = $delimiter;
-    }
-
-    /**
-     * Set the Delimiter type for this sql task. The delimiter type takes two
-     * values - normal and row. Normal means that any occurence of the delimiter
-     * terminate the SQL command whereas with row, only a line containing just
-     * the delimiter is recognized as the end of the command.
-     *
-     * @param string $delimiterType
-     */
-    public function setDelimiterType($delimiterType)
-    {
-        $this->delimiterType = $delimiterType;
-    }
-    
-    /**
-     * Set the print flag.
-     *
-     * @param boolean $print
-     */
-    public function setPrint($print)
-    {
-        $this->print = (boolean) $print;
-    }
-        
-    /**
-     * Print headers for result sets from the 
-     * statements; optional, default true.
-     * @param boolean $showheaders
-     */
-    public function setShowheaders($showheaders) {
-        $this->showheaders = (boolean) $showheaders;
-    }
-
-    /**
-     * Set the output file; 
-     * optional, defaults to the console.
-     * @param PhingFile $output
-     */
-    public function setOutput(PhingFile $output) {
-        $this->output = $output;
-    }
-
-    /**
-     * whether output should be appended to or overwrite
-     * an existing file.  Defaults to false.
-     * @param $append
-     */
-    public function setAppend($append) {
-        $this->append = (boolean) $append;
-    }
-
-    
-    /**
-     * Action to perform when statement fails: continue, stop, or abort
-     * optional; default &quot;abort&quot;
-     */
-    public function setOnerror($action) {
-        $this->onError = $action;
-    }
-
-    /**
-     * Load the sql file and then execute it
-     * @throws BuildException
-     */
-    public function main()  {
-            
-        $savedTransaction = array();
-        for($i=0,$size=count($this->transactions); $i < $size; $i++) {
-            $savedTransaction[] = clone $this->transactions[$i];
-        }
-        
-        $savedSqlCommand = $this->sqlCommand;
-
-        $this->sqlCommand = trim($this->sqlCommand);
-
-        try {
-            if ($this->srcFile === null && $this->sqlCommand === "" 
-                && empty($this->filesets)) { 
-                if (count($this->transactions) === 0) {
-                    throw new BuildException("Source file or fileset, "
-                                             . "transactions or sql statement "
-                                             . "must be set!", $this->location);
-                }
-            }
-        
-            if ($this->srcFile !== null && !$this->srcFile->exists()) {
-                throw new BuildException("Source file does not exist!", $this->location);
-            }
-
-            // deal with the filesets
-            for ($i = 0,$size=count($this->filesets); $i < $size; $i++) {
-                $fs = $this->filesets[$i];
-                $ds = $fs->getDirectoryScanner($this->project);
-                $srcDir = $fs->getDir($this->project);
-                
-                $srcFiles = $ds->getIncludedFiles();
-                
-                // Make a transaction for each file
-                for ($j=0, $size=count($srcFiles); $j < $size; $j++) {
-                    $t = $this->createTransaction();
-                    $t->setSrc(new PhingFile($srcDir, $srcFiles[$j]));
-                }
-            }
-            
-            // Make a transaction group for the outer command
-            $t = $this->createTransaction();
-            if ($this->srcFile) $t->setSrc($this->srcFile);
-            $t->addText($this->sqlCommand);
-            $this->conn = $this->getConnection();
-
-            try {
-                
-                $this->statement = $this->conn->createStatement();
-                
-                $out = null;
-                
-                try {
-                    
-                    if ($this->output !== null) {
-                        $this->log("Opening output file " . $this->output, Project::MSG_VERBOSE);
-                        $out = new BufferedWriter(new FileWriter($this->output->getAbsolutePath(), $this->append));
-                    }
-                    
-                    // Process all transactions
-                    for ($i=0,$size=count($this->transactions); $i < $size; $i++) {
-                        $this->transactions[$i]->runTransaction($out);
-                        if (!$this->isAutocommit()) {
-                            $this->log("Commiting transaction", Project::MSG_VERBOSE);
-                            $this->conn->commit();
-                        }
-                    }
-                    if ($out) $out->close();
-                } catch (Exception $e) {
-                    if ($out) $out->close();
-                    throw $e;
-                } 
-            } catch (IOException $e) {
-                if (!$this->isAutocommit() && $this->conn !== null && $this->onError == "abort") {
-                    try {
-                        $this->conn->rollback();
-                    } catch (SQLException $ex) {}
-                }
-                throw new BuildException($e->getMessage(), $this->location);
-            } catch (SQLException $e){
-                if (!$this->isAutocommit() && $this->conn !== null && $this->onError == "abort") {
-                    try {
-                        $this->conn->rollback();
-                    } catch (SQLException $ex) {}
-                }
-                throw new BuildException($e->getMessage(), $this->location);
-            }
-            
-            $this->log($this->goodSql . " of " . $this->totalSql .
-                " SQL statements executed successfully");
-        } catch (Exception $e) {
-            $this->transactions = $savedTransaction;
-            $this->sqlCommand = $savedSqlCommand;
-            throw $e;
-        }
-        // finally {
-        $this->transactions = $savedTransaction;
-        $this->sqlCommand = $savedSqlCommand;
-        
-    }
-
-
-    /**
-     * read in lines and execute them
-     * @throws SQLException, IOException 
-     */
-    public function runStatements(Reader $reader, $out = null) {
-        $sql = "";
-        $line = "";
-
-		$buffer = '';
-
-        if ((is_array($this->filterChains)) && (!empty($this->filterChains))) {    
-            $in = FileUtils::getChainedReader(new BufferedReader($reader), $this->filterChains, $this->getProject());
-			while(-1 !== ($read = $in->read())) { // -1 indicates EOF
-				   $buffer .= $read;
-            }
-            $lines = explode("\n", $buffer);
-        } else {
-	        $in = new BufferedReader($reader);
-
-            while (($line = $in->readLine()) !== null) {
-				$lines[] = $line;
-			}
-		}
-
-        try {
-			foreach ($lines as $line) {
-                $line = trim($line);
-                $line = ProjectConfigurator::replaceProperties($this->project, $line,
-                        $this->project->getProperties());
-                
-                if (StringHelper::startsWith("//", $line) || 
-                    StringHelper::startsWith("--", $line) ||
-                    StringHelper::startsWith("#", $line)) {
-                    continue;
-                }
-                
-                if (strlen($line) > 4
-                        && strtoupper(substr($line,0, 4)) == "REM ") {
-                    continue;
-                }
-
-                $sql .= " " . $line;
-                $sql = trim($sql);
-
-                // SQL defines "--" as a comment to EOL
-                // and in Oracle it may contain a hint
-                // so we cannot just remove it, instead we must end it
-                if (strpos($line, "--") !== false) {
-                    $sql .= "\n";
-                }
-
-                if ($this->delimiterType == self::DELIM_NORMAL
-                        && StringHelper::endsWith($this->delimiter, $sql)
-                        || $this->delimiterType == self::DELIM_ROW
-                        && $line == $this->delimiter) {
-                    $this->log("SQL: " . $sql, Project::MSG_VERBOSE);
-                    $this->execSQL(StringHelper::substring($sql, 0, strlen($sql) - strlen($this->delimiter)), $out);
-                    $sql = "";
-                }
-            }
-
-            // Catch any statements not followed by ;
-            if ($sql !== "") {
-                $this->execSQL($sql, $out);
-            }
-        } catch (SQLException $e) {
-            throw new BuildException("Error running statements", $e);
-        }
-    }
- 
-        
-    /**
-     * Exec the sql statement.
-     * @throws SQLException 
-     */
-    protected function execSQL($sql, $out = null) {
-        // Check and ignore empty statements
-        if (trim($sql) == "") {
-            return;
-        }
-
-        try {
-            $this->totalSql++;
-            if (!$this->statement->execute($sql)) {
-                $this->log($this->statement->getUpdateCount() . " rows affected", Project::MSG_VERBOSE);
-            } else {
-                if ($this->print) {
-                    $this->printResults($out);
-                }
-            }
-            
-            $this->goodSql++;
-            
-        } catch (SQLException $e) {            
-            $this->log("Failed to execute: " . $sql, Project::MSG_ERR);
-            if ($this->onError != "continue") {            
-                throw new BuildException("Failed to execute SQL", $e);
-            }
-            $this->log($e->getMessage(), Project::MSG_ERR);
-        }
-    }
-    
-    /**
-     * print any results in the statement.
-     * @throw SQLException
-     */
-    protected function printResults($out = null) {
-        
-        $rs = null;        
-        do {
-            $rs = $this->statement->getResultSet();
-            
-            if ($rs !== null) {
-            
-                $this->log("Processing new result set.", Project::MSG_VERBOSE);            
-    
-                $line = "";
-
-                $colsprinted = false;
-                
-                while ($rs->next()) {
-                    $fields = $rs->getRow();
-                    
-                    if (!$colsprinted && $this->showheaders) {
-                        $first = true;
-                        foreach($fields as $fieldName => $ignore) {
-                            if ($first) $first = false; else $line .= ",";
-                            $line .= $fieldName;
-                        }
-                        if ($out !== null) {
-                            $out->write($line);
-                            $out->newLine();
-                        } else {
-                            print($line.PHP_EOL);
-                        }
-                        $line = "";
-                        $colsprinted = true;
-                    } // if show headers
-                    
-                    $first = true;
-                    foreach($fields as $columnValue) {
-                        
-                        if ($columnValue != null) {
-                            $columnValue = trim($columnValue);
-                        }
-
-                        if ($first) {
-                            $first = false;
-                        } else {
-                            $line .= ",";
-                        }
-                        $line .= $columnValue;
-                    }
-                    
-                    if ($out !== null) {
-                        $out->write($line);
-                        $out->newLine();
-                    } else {                    
-                        print($line . PHP_EOL);
-                    }
-                    $line = "";
-                    
-                } // while rs->next()
-            }
-        } while ($this->statement->getMoreResults());
-        print(PHP_EOL);
-        if ($out !== null) $out->newLine();
-    }
-}
-
-
-/**
- * "Inner" class that contains the definition of a new transaction element.
- * Transactions allow several files or blocks of statements
- * to be executed using the same JDBC connection and commit
- * operation in between.
- */
-class SQLExecTransaction {
-
-    private $tSrcFile = null;
-    private $tSqlCommand = "";
-    private $parent;
-    
-    function __construct($parent)
-    {
-        // Parent is required so that we can log things ...
-        $this->parent = $parent;
-    }
-    
-    public function setSrc(PhingFile $src)
-    {
-        $this->tSrcFile = $src;
-    }
-
-    public function addText($sql)
-    {
-        $this->tSqlCommand .= $sql;
-    }
-
-    /**
-     * @throws IOException, SQLException
-     */
-    public function runTransaction($out = null)
-    {
-        if (!empty($this->tSqlCommand)) {
-            $this->parent->log("Executing commands", Project::MSG_INFO);
-            $this->parent->runStatements(new StringReader($this->tSqlCommand), $out);
-        }
-
-        if ($this->tSrcFile !== null) {
-            $this->parent->log("Executing file: " . $this->tSrcFile->getAbsolutePath(),
-                Project::MSG_INFO);
-
-            $reader = new FileReader($this->tSrcFile);
-
-            $this->parent->runStatements($reader, $out);
-            $reader->close();
-        }
-    }
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/creole/CreoleTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/creole/CreoleTask.php
deleted file mode 100644
index 1aa4d6d69..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/creole/CreoleTask.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-
-/*
- *  $Id: CreoleTask.php 259 2007-10-21 01:05:43Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-include_once 'phing/types/Reference.php';
-
-/**
- * Handles Creole configuration needed by SQL type tasks.
- *
- * @author    Hans Lellelid <hans@xmpl.org> (Phing)
- * @author    Nick Chalko <nick@chalko.com> (Ant)
- * @author    Jeff Martin <jeff@custommonkey.org> (Ant)
- * @author    Michael McCallum <gholam@xtra.co.nz> (Ant)
- * @author    Tim Stephenson <tim.stephenson@sybase.com> (Ant)
- * @version   $Revision: 1.13 $
- * @package   phing.tasks.system
- */
-abstract class CreoleTask extends Task {
-
-    /**
-     * Used for caching loaders / driver. This is to avoid
-     * getting an OutOfMemoryError when calling this task
-     * multiple times in a row.
-     * 
-     * NOT IMPLEMENTED YET
-     */
-    private static $loaderMap = array();
-
-    private $caching = true;
-
-    /**
-     * Autocommit flag. Default value is false
-     */
-    private $autocommit = false;
-    
-    /**
-     * [optional] Classpath to Creole driver to use.
-     * @param string
-     */
-    private $driver;
-    
-    /**
-     * DB url.
-     */
-    private $url;
-
-    /**
-     * User name.
-     */
-    private $userId;
-
-    /**
-     * Password
-     */
-    private $password;
-
-    /**
-     * RDBMS Product needed for this SQL.
-     **/
-    private $rdbms;
-   
-      /**
-     * Initialize CreoleTask.
-     * This method includes any necessary Creole libraries and triggers
-     * appropriate error if they cannot be found.  This is not done in header
-     * because we may want this class to be loaded w/o triggering an error.
-     */
-    function init() {
-        include_once 'creole/Creole.php';
-        if (!class_exists('Creole')) {
-            throw new Exception("Creole task depends on Creole classes being on include_path. (i.e. include of 'creole/Creole.php' failed.)");
-        }
-    }
-
-    /**
-     * Caching loaders / driver. This is to avoid
-     * getting an OutOfMemoryError when calling this task
-     * multiple times in a row; default: true
-     * @param $enable
-     */
-    public function setCaching($enable) {
-        $this->caching = $enable;
-    }
-
-    /**
-     * Sets the database connection URL; required.
-     * @param url The url to set
-     */
-    public function setUrl($url) {
-        $this->url = $url;
-    }
-
-    /**
-     * Set the Creole driver to be used.
-     *
-     * @param string $driver driver class name
-     */
-    public function setDriver($driver)
-    {
-        $this->driver = $driver;
-    }
-        
-    /**
-     * Sets the password; required.
-     * @param password The password to set
-     */
-    public function setPassword($password) {
-        $this->password = $password;
-    }
-
-    /**
-     * Auto commit flag for database connection;
-     * optional, default false.
-     * @param autocommit The autocommit to set
-     */
-    public function setAutocommit($autocommit) {
-        $this->autocommit = $autocommit;
-    }
-
-    /**
-     * Sets the version string, execute task only if 
-     * rdbms version match; optional.
-     * @param version The version to set
-     */
-    public function setVersion($version) {
-        $this->version = $version;
-    }
-       
-    protected function getLoaderMap() {
-        return self::$loaderMap;
-    }
-
-
-    /**
-     * Creates a new Connection as using the driver, url, userid and password specified.
-     * The calling method is responsible for closing the connection.
-     * @return Connection the newly created connection.
-     * @throws BuildException if the UserId/Password/Url is not set or there is no suitable driver or the driver fails to load.
-     */
-    protected function getConnection() {
-            
-        if ($this->url === null) {
-            throw new BuildException("Url attribute must be set!", $this->location);
-        }
-                
-        try {
-
-            $this->log("Connecting to " . $this->getUrl(), Project::MSG_VERBOSE);
-            $info = new Properties();
-            
-            $dsn = Creole::parseDSN($this->url);
-            
-            if (!isset($dsn["username"]) && $this->userId === null) {
-                throw new BuildException("Username must be in URL or userid attribute must be set.", $this->location);                
-            }                        
-            
-            if ($this->userId) {
-                $dsn["username"] = $this->getUserId();
-            }
-            
-            if ($this->password) {
-                $dsn["password"] = $this->getPassword();
-            }
-            
-            if ($this->driver) {
-                Creole::registerDriver($dsn['phptype'], $this->driver);
-            }
-            
-            $conn = Creole::getConnection($dsn);
-            $conn->setAutoCommit($this->autocommit);
-            return $conn;
-            
-        } catch (SQLException $e) {
-            throw new BuildException($e->getMessage(), $this->location);
-        }
-
-    }
-
-    public function isCaching($value) {
-        $this->caching = $value;
-    }
-
-    /**
-     * Gets the autocommit.
-     * @return Returns a boolean
-     */
-    public function isAutocommit() {
-        return $this->autocommit;
-    }
-
-    /**
-     * Gets the url.
-     * @return Returns a String
-     */
-    public function getUrl() {
-        return $this->url;
-    }
-
-    /**
-     * Gets the userId.
-     * @return Returns a String
-     */
-    public function getUserId() {
-        return $this->userId;
-    }
-
-    /**
-     * Set the user name for the connection; required.
-     * @param userId The userId to set
-     */
-    public function setUserid($userId) {
-        $this->userId = $userId;
-    }
-
-    /**
-     * Gets the password.
-     * @return Returns a String
-     */
-    public function getPassword() {
-        return $this->password;
-    }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/dbdeploy/DbDeployTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/dbdeploy/DbDeployTask.php
deleted file mode 100755
index a1ec9e544..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/dbdeploy/DbDeployTask.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-/*
- *  $Id: DbDeployTask.php 59 2006-04-28 14:49:47Z lcrouch $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-require_once 'phing/Task.php';
-require_once 'phing/tasks/ext/dbdeploy/DbmsSyntaxFactory.php';
-
-
-/**
- *  Generate SQL script for db using dbdeploy schema version table and delta scripts
- *
- *  <dbdeploy url="mysql:host=localhost;dbname=test" userid="dbdeploy" password="dbdeploy" dir="db" outputfile=""> 
- * 
- *  @author   Luke Crouch at SourceForge (http://sourceforge.net)
- *  @version  $Revision: 1.1 $
- *  @package  phing.tasks.ext.dbdeploy
- */
-
-class DbDeployTask extends Task {
-	
-	public static $TABLE_NAME = 'changelog';
-
-	protected $url;
-	protected $userid;
-	protected $password;
-	protected $dir;
-	protected $outputFile = 'dbdeploy_deploy.sql';
-	protected $undoOutputFile = 'dbdeploy_undo.sql';
-	protected $deltaSet = 'Main';
-	protected $lastChangeToApply = 999;
-	protected $dbmsSyntax = null;
-	
-    function main() {
-    	try{
-    		// get correct DbmsSyntax object
-    		$dbms = substr($this->url, 0, strpos($this->url, ':'));
-    		$dbmsSyntaxFactory = new DbmsSyntaxFactory($dbms);
-    		$this->dbmsSyntax = $dbmsSyntaxFactory->getDbmsSyntax();
-    		
-			// open file handles for output
-    		$outputFileHandle = fopen($this->outputFile, "w+");
-    		$undoOutputFileHandle = fopen($this->undoOutputFile, "w+");
-    		
-    		// figure out which revisions are in the db already
-			$this->appliedChangeNumbers = $this->getAppliedChangeNumbers();
-			$this->log('Current db revision: ' . $this->getLastChangeAppliedInDb());
-			
-			// generate sql file needed to take db to "lastChangeToApply" version
-			$doSql = $this->doDeploy();
-			$undoSql = $this->undoDeploy();
-			
-			// write the do and undo SQL to their respective files
-			fwrite($outputFileHandle, $doSql);
-			fwrite($undoOutputFileHandle, $undoSql);
-			
-    	} catch (Exception $e){
-    		throw new BuildException($e);
-    	}
-    }
-	
-    function getAppliedChangeNumbers(){
-    	if(count($this->appliedChangeNumbers) == 0){
-	        $this->log('Getting applied changed numbers from DB: ' . $this->url );
-	    	$appliedChangeNumbers = array();
-    		$dbh = new PDO($this->url, $this->userid, $this->password);
-    		$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-	    	$sql = "SELECT * FROM " . DbDeployTask::$TABLE_NAME . " WHERE delta_set = '$this->deltaSet' ORDER BY change_number";
-			foreach($dbh->query($sql) as $change){
-	    		$appliedChangeNumbers[] = $change['change_number'];
-	    	}
-	    	$this->appliedChangeNumbers = $appliedChangeNumbers;
-    	}
-    	return $this->appliedChangeNumbers;
-    }
-    
-    function getLastChangeAppliedInDb(){
-    	return (count($this->appliedChangeNumbers) > 0) ? max($this->appliedChangeNumbers) : 0;
-    }
-
-    function doDeploy(){
-    	$sqlToPerformDeploy = '';
-    	$lastChangeAppliedInDb = $this->getLastChangeAppliedInDb();    	
-    	$files = $this->getDeltasFilesArray();
-    	ksort($files);
-    	foreach($files as $fileChangeNumber=>$fileName){
-    		if($fileChangeNumber > $lastChangeAppliedInDb && $fileChangeNumber <= $this->lastChangeToApply){
-    			$sqlToPerformDeploy .= '-- Fragment begins: ' . $fileChangeNumber . ' --' . "\n";
-    			$sqlToPerformDeploy .= 'INSERT INTO ' . DbDeployTask::$TABLE_NAME . ' (change_number, delta_set, start_dt, applied_by, description)'.
-					' VALUES ('. $fileChangeNumber .', \''. $this->deltaSet .'\', '. $this->dbmsSyntax->generateTimestamp() .', \'dbdeploy\', \''. $fileName .'\');' . "\n";
-				$fullFileName = $this->dir . '/' . $fileName;
-    			$fh = fopen($fullFileName, 'r');
-    			$contents = fread($fh, 	filesize($fullFileName));
-    			$deploySQLFromFile = substr($contents,0,strpos($contents, '-- //@UNDO'));
-    			$sqlToPerformDeploy .= $deploySQLFromFile;
-    			$sqlToPerformDeploy .= 'UPDATE ' . DbDeployTask::$TABLE_NAME . ' SET complete_dt = ' . $this->dbmsSyntax->generateTimestamp() . ' WHERE change_number = ' . $fileChangeNumber . ' AND delta_set = \'' . $this->deltaSet . '\';' . "\n";
-    			$sqlToPerformDeploy .= '-- Fragment ends: ' . $fileChangeNumber . ' --' . "\n";
-    		}
-    	}
-		return $sqlToPerformDeploy;
-    }
-    
-    function undoDeploy(){
-    	$sqlToPerformUndo = '';
-    	$lastChangeAppliedInDb = $this->getLastChangeAppliedInDb();    	
-    	$files = $this->getDeltasFilesArray();
-    	krsort($files);
-    	foreach($files as $fileChangeNumber=>$fileName){
-    		if($fileChangeNumber > $lastChangeAppliedInDb && $fileChangeNumber <= $this->lastChangeToApply){
-				$fullFileName = $this->dir . '/' . $fileName;
-    			$fh = fopen($fullFileName, 'r');
-    			$contents = fread($fh, 	filesize($fullFileName));
-    			$undoSQLFromFile = substr($contents,strpos($contents, '-- //@UNDO')+10);
-    			$sqlToPerformUndo .= $undoSQLFromFile;
-    			$sqlToPerformUndo .= 'DELETE FROM ' . DbDeployTask::$TABLE_NAME . ' WHERE change_number = ' . $fileChangeNumber . ' AND delta_set = \'' . $this->deltaSet . '\';' . "\n";
-    			$sqlToPerformUndo .= '-- Fragment ends: ' . $fileChangeNumber . ' --' . "\n";
-    		}
-    	}
-		return $sqlToPerformUndo;
-    }
-    
-   function getDeltasFilesArray(){
-    	$baseDir = realpath($this->dir);
-    	$dh = opendir($baseDir);
-    	$fileChangeNumberPrefix = '';
-    	while(($file = readdir($dh)) !== false){
-    		if(preg_match('[\d+]', $file, $fileChangeNumberPrefix)){
-    			$files[$fileChangeNumberPrefix[0]] = $file;
-    		}
-    	}
-    	return $files;
-    }
-    
-	function setUrl($url){
-		$this->url = $url;
-	}
-	
-	function setUserId($userid){
-		$this->userid = $userid;
-	}
-	
-	function setPassword($password){
-		$this->password = $password;
-	}
-
-	function setDir($dir){
-		$this->dir = $dir;
-	}
-
-	function setOutputFile($outputFile){
-		$this->outputFile = $outputFile;
-	}
-
-	function setUndoOutputFile($undoOutputFile){
-		$this->undoOutputFile = $undoOutputFile;
-	}
-	
-	function setLastChangeToApply($lastChangeToApply){
-		$this->lastChangeToApply = $lastChangeToApply;
-	}
-
-	function setDeltaSet($deltaSet){
-		$this->deltaSet = $deltaSet;
-	}
-	
-    /**
-     * Add a new fileset.
-     * @return FileSet
-     */
-    public function createFileSet() {
-        $this->fileset = new FileSet();
-        $this->filesets[] = $this->fileset;
-        return $this->fileset;
-    }
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/dbdeploy/DbmsSyntax.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/dbdeploy/DbmsSyntax.php
deleted file mode 100644
index 05b02eca9..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/dbdeploy/DbmsSyntax.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/*
- *  $Id: DbDeployTask.php 59 2006-04-28 14:49:47Z lcrouch $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-/**
- *  Utility class for generating necessary server-specific SQL commands
- *
- *  @author   Luke Crouch at SourceForge (http://sourceforge.net)
- *  @version  $Revision: 1.1 $
- *  @package  phing.tasks.ext.dbdeploy
- */
-
-abstract class DbmsSyntax
-{
-	public abstract function generateTimestamp();
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/dbdeploy/DbmsSyntaxFactory.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/dbdeploy/DbmsSyntaxFactory.php
deleted file mode 100644
index 72381f580..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/dbdeploy/DbmsSyntaxFactory.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/*
- *  $Id: DbDeployTask.php 59 2006-04-28 14:49:47Z lcrouch $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-require_once 'phing/Task.php';
-require_once 'phing/tasks/ext/dbdeploy/DbmsSyntax.php';
-
-/**
- *  Factory for generating dbms-specific syntax-generating objects
- *
- *  @author   Luke Crouch at SourceForge (http://sourceforge.net)
- *  @version  $Revision: 1.1 $
- *  @package  phing.tasks.ext.dbdeploy
- */
-
-class DbmsSyntaxFactory
-{
-	private $dbms;
-	
-	public function __construct($dbms)
-	{
-		$this->dbms = $dbms;
-	}
-	
-	public function getDbmsSyntax()
-	{
-		switch ($this->dbms){
-			case('sqlite') :
-				require_once 'phing/tasks/ext/dbdeploy/DbmsSyntaxSQLite.php';
-				return new DbmsSyntaxSQLite();
-			case('mysql'):
-				require_once 'phing/tasks/ext/dbdeploy/DbmsSyntaxMysql.php';
-				return new DbmsSyntaxMysql();
-			case('mssql'):
-				require_once 'phing/tasks/ext/dbdeploy/DbmsSyntaxMsSql.php';
-				return new DbmsSyntaxMsSql();
-			default:
-				throw new Exception($this->dbms . ' is not supported by dbdeploy task.');
-		}
-	}
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/dbdeploy/DbmsSyntaxMsSql.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/dbdeploy/DbmsSyntaxMsSql.php
deleted file mode 100644
index b1aff3260..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/dbdeploy/DbmsSyntaxMsSql.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/*
- *  $Id: DbDeployTask.php 59 2006-04-28 14:49:47Z lcrouch $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-/**
- *  Utility class for generating necessary server-specific SQL commands
- *
- *  @author   Luke Crouch at SourceForge (http://sourceforge.net)
- *  @version  $Revision: 1.1 $
- *  @package  phing.tasks.ext.dbdeploy
- */
-
-class DbmsSyntaxMsSql extends DbmsSyntax 
-{
-	public function generateTimestamp()
-	{
-		return "DATEDIFF(s, '19700101', GETDATE())";
-	}
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/dbdeploy/DbmsSyntaxMysql.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/dbdeploy/DbmsSyntaxMysql.php
deleted file mode 100644
index d2edfc556..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/dbdeploy/DbmsSyntaxMysql.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/*
- *  $Id: DbDeployTask.php 59 2006-04-28 14:49:47Z lcrouch $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-/**
- *  Utility class for generating necessary server-specific SQL commands
- *
- *  @author   Luke Crouch at SourceForge (http://sourceforge.net)
- *  @version  $Revision: 1.1 $
- *  @package  phing.tasks.ext.dbdeploy
- */
-
-class DbmsSyntaxMysql extends DbmsSyntax 
-{
-	public function generateTimestamp()
-	{
-		return "NOW()";
-	}
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/dbdeploy/DbmsSyntaxSQLite.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/dbdeploy/DbmsSyntaxSQLite.php
deleted file mode 100644
index 6352c0201..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/dbdeploy/DbmsSyntaxSQLite.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/*
- *  $Id: DbDeployTask.php 59 2006-04-28 14:49:47Z lcrouch $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-/**
- *  Utility class for generating necessary server-specific SQL commands
- *
- *  @author   Luke Crouch at SourceForge (http://sourceforge.net)
- *  @version  $Revision: 1.1 $
- *  @package  phing.tasks.ext.dbdeploy
- */
-
-class DbmsSyntaxSQLite extends DbmsSyntax 
-{
-	public function generateTimestamp()
-	{
-		return "strftime('%s','now')";
-	}
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ioncube/IoncubeComment.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ioncube/IoncubeComment.php
deleted file mode 100755
index cec034bca..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ioncube/IoncubeComment.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * $Id: IoncubeComment.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-/**
- * Wrapper for comments for ionCube tasks
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: IoncubeComment.php 325 2007-12-20 15:44:58Z hans $
- * @package phing.tasks.ext.ioncube
- * @since 2.2.0
- */
-class IoncubeComment
-{
-	private $value = "";
-	
-	public function getValue()
-	{
-		return $this->value;
-	}
-	
-	public function addText($txt)
-	{
-		$this->value = trim($txt);
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ioncube/IoncubeEncoderTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ioncube/IoncubeEncoderTask.php
deleted file mode 100755
index 2d999640c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ioncube/IoncubeEncoderTask.php
+++ /dev/null
@@ -1,487 +0,0 @@
-<?php
-/**
- * $Id: IoncubeEncoderTask.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-require_once 'phing/tasks/ext/ioncube/IoncubeComment.php';
-
-/**
- * Invokes the ionCube Encoder (PHP4 or PHP5)
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @author Andrew Eddie <andrew.eddie@jamboworks.com> 
- * @version $Id: IoncubeEncoderTask.php 325 2007-12-20 15:44:58Z hans $
- * @package phing.tasks.ext.ioncube
- * @since 2.2.0
- */
-class IoncubeEncoderTask extends Task
-{
-	private $ionSwitches = array();
-	
-	private $ionOptions = array();
-	
-	private $ionOptionsXS = array();
-
-	private $comments = array();
-	
-	private $encoderName = 'ioncube_encoder';
-	
-	private $fromDir = '';
-
-	private $ioncubePath = '/usr/local/ioncube';
-
-	private $phpVersion = '5';
-
-	private $targetOption = '';
-
-	private $toDir = '';
-
-	/**
-	 * Adds a comment to be used in encoded files
-	 */
-	function addComment(IoncubeComment $comment)
-	{
-		$this->comments[] = $comment;
-	}
-
-	/**
-	 * Sets the allowed server
-	 */
-	function setAllowedServer($value)
-	{
-		$this->ionOptionsXS['allowed-server'] = $value;
-	}
-
-	/**
-	 * Returns the allowed server setting
-	 */
-	function getAllowedServer()
-	{
-		return $this->ionOptionsXS['allowed-server'];
-	}
-
-	/**
-	 * Sets the binary option
-	 */
-	function setBinary($value)
-	{
-		$this->ionSwitches['binary'] = $value;
-	}
-
-	/**
-	 * Returns the binary option
-	 */
-	function getBinary()
-	{
-		return $this->ionSwitches['binary'];
-	}
-
-	/**
-	 * Sets files or folders to copy (separated by space)
-	 */
-	function setCopy($value)
-	{
-		$this->ionOptionsXS['copy'] = $value;
-	}
-
-	/**
-	 * Returns the copy setting
-	 */
-	function getCopy()
-	{
-		return $this->ionOptionsXS['copy'];
-	}
-
-	/**
-	 * Sets additional file patterns, files or directories to encode,
-	 * or to reverse the effect of copy (separated by space)
-	 */
-	function setEncode($value)
-	{
-		$this->ionOptionsXS['encode'] = $value;
-	}
-	
-	/**
-	 * Returns the encode setting
-	 */
-	function getEncode()
-	{
-		return $this->enionOptionsXS['encode'];
-	}
-
-	/**
-	 * Sets regexps of additional files to encrypt (separated by space)
-	 */
-	function setEncrypt($value)
-	{
-		$this->ionOptionsXS['encrypt'] = $value;
-	}
-	
-	/**
-	 * Returns regexps of additional files to encrypt (separated by space)
-	 */
-	function getEncrypt()
-	{
-		return $this->ionOptionsXS['encrypt'];
-	}
-
-	/**
-	 * Sets a period after which the files expire
-	 */
-	function setExpirein($value)
-	{
-		$this->ionOptions['expire-in'] = $value;
-	}
-	
-	/**
-	 * Returns the expireIn setting
-	 */
-	function getExpirein()
-	{
-		return $this->ionOptions['expire-in'];
-	}
-
-	/**
-	 * Sets a YYYY-MM-DD date to expire the files 
-	 */
-	function setExpireon($value)
-	{
-		$this->ionOptions['expire-on'] = $value;
-	}
-	
-	/**
-	 * Returns the expireOn setting
-	 */
-	function getExpireon()
-	{
-		return $this->ionOptions['expire-on'];
-	}
-
-	/**
-	 * Sets the source directory
-	 */
-	function setFromDir($value)
-	{
-		$this->fromDir = $value;
-	}
-
-	/**
-	 * Returns the source directory
-	 */
-	function getFromDir()
-	{
-		return $this->fromDir;
-	}
-
-	/**
-	 * Set files and directories to ignore entirely and exclude from the target directory
-	 * (separated by space).
-	 */
-	function setIgnore($value)
-	{
-		$this->ionOptionsXS['ignore'] = $value;
-	}
-
-	/**
-	 * Returns the ignore setting
-	 */
-	function getIgnore()
-	{
-		return $this->ionOptionsXS['ignore'];
-	}
-
-	/**
-	 * Sets the path to the ionCube encoder
-	 */
-	function setIoncubePath($value)
-	{
-		$this->ioncubePath = $value;
-	}
-
-	/**
-	 * Returns the path to the ionCube encoder
-	 */
-	function getIoncubePath()
-	{
-		return $this->ioncubePath;
-	}
-
-	/**
-	 * Set files and directories not to be ignored (separated by space).
-	 */
-	function setKeep($value)
-	{
-		$this->ionOptionsXS['keep'] = $value;
-	}
-
-	/**
-	 * Returns the ignore setting
-	 */
-	function getKeep()
-	{
-		return $this->ionOptionsXS['keep'];
-	}
-
-	/**
-	 * Sets the path to the license file to use
-	 */
-	function setLicensePath($value)
-	{
-		$this->ionOptions['with-license'] = $value;
-	}
-
-	/**
-	 * Returns the path to the license file to use
-	 */
-	function getLicensePath()
-	{
-		return $this->ionOptions['with-license'];
-	}
-
-	/**
-	 * Sets the no-doc-comments option
-	 */
-	function setNoDocComments($value)
-	{
-		$this->ionSwitches['no-doc-comment'] = $value;
-	}
-	
-	/**
-	 * Returns the no-doc-comments option
-	 */
-	function getNoDocComments()
-	{
-		return $this->ionSwitches['no-doc-comment'];
-	}
-	
-	/**
-	 * Sets the obfuscate option
-	 */
-	function setObfuscate($value)
-	{
-		$this->ionOptionsXS['obfuscate'] = $value;
-	}
-	
-	/**
-	 * Returns the optimize option
-	 */
-	function getObfuscate()
-	{
-		return $this->ionOptionsXS['obfuscate'];
-	}
-
-	/**
-	 * Sets the obfuscation key (required if using the obfuscate option)
-	 */
-	function setObfuscationKey($value)
-	{
-		$this->ionOptions['obfuscation-key'] = $value;
-	}
-	
-	/**
-	 * Returns the optimize option
-	 */
-	function getObfuscationKey()
-	{
-		return $this->ionOptions['obfuscation-key'];
-	}
-
-	/**
-	 * Sets the optimize option
-	 */
-	function setOptimize($value)
-	{
-		$this->ionOptions['optimize'] = $value;
-	}
-	
-	/**
-	 * Returns the optimize option
-	 */
-	function getOptimize()
-	{
-		return $this->ionOptions['optimize'];
-	}
-
-	/**
-	 * Sets the passphrase to use when encoding files
-	 */
-	function setPassPhrase($value)
-	{
-		$this->ionOptions['passphrase'] = $value;
-	}
-
-	/**
-	 * Returns the passphrase to use when encoding files
-	 */
-	function getPassPhrase()
-	{
-		return $this->ionOptions['passphrase'];
-	}
-
-	/**
-	 * Sets the version of PHP to use (defaults to 5)
-	 */
-	function setPhpVersion($value)
-	{
-		$this->phpVersion = $value;
-	}
-
-	/**
-	 * Returns the version of PHP to use (defaults to 5)
-	 */
-	function getPhpVersion()
-	{
-		return $this->phpVersion;
-	}
-	
-	/**
-	 * Sets the target directory
-	 */
-	function setToDir($value)
-	{
-		$this->toDir = $value;
-	}
-
-	/**
-	 * Returns the target directory
-	 */
-	function getToDir()
-	{
-		return $this->toDir;
-	}
-
-	/**
-	 * Sets the without-runtime-loader-support option
-	 */
-	function setWithoutRuntimeLoaderSupport($value)
-	{
-		$this->ionSwitches['without-runtime-loader-support'] = $value;
-	}
-	
-	/**
-	 * Returns the without-runtime-loader-support option
-	 */
-	function getWithoutRuntimeLoaderSupport()
-	{
-		return $this->ionSwitches['without-runtime-loader-support'];
-	}
-	
-	/**
-	 * Sets the option to use when encoding target directory already exists (defaults to none)
-	 */
-	function setTargetOption($targetOption)
-	{
-		$this->targetOption = $targetOption;
-	}
-
-	/**
-	 * Returns he option to use when encoding target directory already exists (defaults to none)
-	 */
-	function getTargetOption()
-	{
-		return $this->targetOption;
-	}
-	
-	/**
-	 * The main entry point
-	 *
-	 * @throws BuildException
-	 */
-	function main()
-	{
-		$arguments = $this->constructArguments();
-		
-		$encoder = new PhingFile($this->ioncubePath, $this->encoderName . ($this->phpVersion == 5 ? '5' : ''));
-		
-		$this->log("Running ionCube Encoder...");
-		
-		exec($encoder->__toString() . ' ' . $arguments . " 2>&1", $output, $return);
-		
-        if ($return != 0)
-        {
-			throw new BuildException("Could not execute ionCube Encoder: " . implode(' ', $output));
-        }       
-	}
-
-	/**
-	 * Constructs an argument string for the ionCube encoder
-	 */
-	private function constructArguments()
-	{
-		$arguments = '';
-		
-		foreach ($this->ionSwitches as $name => $value)
-		{
-			if ($value)
-			{
-				$arguments.= "--$name ";
-			}
-		}
-
-		foreach ($this->ionOptions as $name => $value)
-		{
-			$arguments.= "--$name '$value' ";
-		}
-
-		foreach ($this->ionOptionsXS as $name => $value)
-		{
-			foreach (explode(' ', $value) as $arg)
-			{
-				$arguments.= "--$name '$arg' ";
-			}
-		}
-
-		foreach ($this->comments as $comment)
-		{
-			$arguments.= "--add-comment '" . $comment->getValue() . "' ";
-		}
-		
-		if (!empty($this->targetOption))
-		{
-			switch ($this->targetOption)
-			{
-				case "replace":
-				case "merge":
-				case "update":
-				case "rename":
-				{
-					$arguments.= "--" . $this->targetOption . "-target ";
-				} break;
-				
-				default:
-				{
-					throw new BuildException("Unknown target option '" . $this->targetOption . "'");
-				} break;
-			}
-		}
-		
-		if ($this->fromDir != '')
-		{
-			$arguments .= $this->fromDir . ' ';
-		}
-
-		if ($this->toDir != '')
-		{
-			$arguments .= "-o " . $this->toDir . ' ';
-		}
-		
-		return $arguments;
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ioncube/IoncubeLicenseTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ioncube/IoncubeLicenseTask.php
deleted file mode 100755
index d6ff2772f..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/ioncube/IoncubeLicenseTask.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-/**
- * $Id: IoncubeLicenseTask.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-require_once 'phing/tasks/ext/ioncube/IoncubeComment.php';
-
-/**
- * Invokes the ionCube "make_license" program
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: IoncubeLicenseTask.php 325 2007-12-20 15:44:58Z hans $
- * @package phing.tasks.ext.ioncube
- * @since 2.2.0
- */
-class IoncubeLicenseTask extends Task
-{
-	private $ioncubePath = "/usr/local/ioncube";
-	
-	private $licensePath = "";
-	private $passPhrase = "";
-	
-	private $comments = array();
-
-	/**
-	 * Sets the path to the ionCube encoder
-	 */
-	function setIoncubePath($ioncubePath)
-	{
-		$this->ioncubePath = $ioncubePath;
-	}
-
-	/**
-	 * Returns the path to the ionCube encoder
-	 */
-	function getIoncubePath()
-	{
-		return $this->ioncubePath;
-	}
-
-	/**
-	 * Sets the path to the license file to use
-	 */
-	function setLicensePath($licensePath)
-	{
-		$this->licensePath = $licensePath;
-	}
-
-	/**
-	 * Returns the path to the license file to use
-	 */
-	function getLicensePath()
-	{
-		return $this->licensePath;
-	}
-
-	/**
-	 * Sets the passphrase to use when encoding files
-	 */
-	function setPassPhrase($passPhrase)
-	{
-		$this->passPhrase = $passPhrase;
-	}
-
-	/**
-	 * Returns the passphrase to use when encoding files
-	 */
-	function getPassPhrase()
-	{
-		return $this->passPhrase;
-	}
-
-	/**
-	 * Adds a comment to be used in encoded files
-	 */
-	function addComment(IoncubeComment $comment)
-	{
-		$this->comments[] = $comment;
-	}
-
-	/**
-	 * The main entry point
-	 *
-	 * @throws BuildException
-	 */
-	function main()
-	{
-		$arguments = $this->constructArguments();
-		
-		$makelicense = new PhingFile($this->ioncubePath, 'make_license');
-		
-		$this->log("Running ionCube make_license...");
-		
-		exec($makelicense->__toString() . " " . $arguments . " 2>&1", $output, $return);
-		
-        if ($return != 0)
-        {
-			throw new BuildException("Could not execute ionCube make_license: " . implode(' ', $output));
-        }       
-	}
-
-	/**
-	 * Constructs an argument string for the ionCube make_license
-	 */
-	private function constructArguments()
-	{
-		$arguments = "";
-		
-		if (!empty($this->passPhrase))
-		{
-			$arguments.= "--passphrase '" . $this->passPhrase . "' ";
-		}
-		
-		foreach ($this->comments as $comment)
-		{
-			$arguments.= "--header-line '" . $comment->getValue() . "' ";
-		}
-		
-		if (!empty($this->licensePath))
-		{
-			$arguments.= "--o '" . $this->licensePath . "' ";
-		}
-
-		return $arguments;
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pdo/PDOResultFormatter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pdo/PDOResultFormatter.php
deleted file mode 100644
index 313bcb2a4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pdo/PDOResultFormatter.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * $Id: FormatterElement.php 148 2007-02-13 11:15:53Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/system/io/PhingFile.php';
-
-/**
- * Abstract 
- *
- * @author Hans Lellelid <hans@xmpl.org>
- * @package phing.tasks.ext.pdo
- * @since 2.3.0
- */
-abstract class PDOResultFormatter
-{
-	/**
-	 * Output writer.
-	 *
-	 * @var Writer
-	 */
-	protected $out;
-
-	/**
-	 * Sets the output writer.
-	 *
-	 * @param Writer $out
-	 */
-	public function setOutput(Writer $out) {
-		$this->out = $out;
-	}
-
-	/**
-	 * Gets the output writer.
-	 *
-	 * @return Writer
-	 */
-	public function getOutput() {
-		return $this->out;
-	}
-
-	/**
-	 * Gets the preferred output filename for this formatter.
-	 * @return string
-	 */
-	abstract public function getPreferredOutfile();
-
-	/**
-	 * Perform any initialization.
-	 */
-	public function initialize() {
-
-	}
-
-	/**
-	 * Processes a specific row from PDO result set.
-	 *
-	 * @param array $row Row of PDO result set.
-	 */
-	abstract public function processRow($row);
-
-	/**
-	 * Perform any final tasks and Close the writer.
-	 */
-	public function close() {
-		$this->out->close();
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pdo/PDOSQLExecFormatterElement.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pdo/PDOSQLExecFormatterElement.php
deleted file mode 100644
index 2ef83374b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pdo/PDOSQLExecFormatterElement.php
+++ /dev/null
@@ -1,312 +0,0 @@
-<?php
-/**
- * $Id: FormatterElement.php 148 2007-02-13 11:15:53Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/system/io/PhingFile.php';
-require_once 'phing/tasks/ext/pdo/PlainPDOResultFormatter.php';
-require_once 'phing/tasks/ext/pdo/XMLPDOResultFormatter.php';
-
-/**
- * A class to represent the nested <formatter> element for PDO SQL results.
- * 
- * This class is inspired by the similarly-named class in the PHPUnit tasks.
- *
- * @author Hans Lellelid <hans@xmpl.org>
- * @package phing.tasks.ext.pdo
- * @since 2.3.0
- */
-class PDOSQLExecFormatterElement
-{
-	/**
-	 * @var PDOResultFormatter
-	 */
-	private $formatter;
-
-	/**
-	 * The type of the formatter (used for built-in formatter classes).
-	 * @var string
-	 */
-	private $type = "";
-
-	/**
-	 * Whether to use file (or write output to phing log).
-	 * @var boolean
-	 */
-	private $useFile = true;
-
-	/**
-	 * Output file for formatter.
-	 * @var PhingFile
-	 */
-	private $outfile;
-
-    /**
-     * Print header columns.
-     * @var boolean
-     */
-    private $showheaders = true;
-
-    /**
-     * Whether to format XML output.
-     * @var boolean
-     */
-    private $formatoutput = true;
-
-    /**
-     * Encoding for XML output.
-     * @var string
-     */
-    private $encoding;
-
-    /**
-	 * Column delimiter.
-	 * Defaults to ','
-	 * @var string
-	 */
-    private $coldelimiter = ",";
-
-	/**
-	 * Row delimiter.
-	 * Defaults to PHP_EOL.
-	 * @var string 
-	 */
-	private $rowdelimiter = PHP_EOL;
-
-    /**
-     * Append to an existing file or overwrite it?
-     * @var boolean
-     */
-    private $append = false;
-
-	/**
-	 * Parameters for a custom formatter.
-	 * @var array Parameter[]
-	 */
-	private $formatterParams = array();
-
-	/**
-	 * @var PDOSQLExecTask 
-	 */
-	private $parentTask;
-
-	/**
-	 * Construct a new PDOSQLExecFormatterElement with parent task.
-	 * @param  PDOSQLExecTask $parentTask
-	 */
-	public function __construct(PDOSQLExecTask $parentTask)
-	{
-		$this->parentTask = $parentTask;
-	}
-
-    /**
-     * Supports nested <param> element (for custom formatter classes).
-     * @return Parameter
-     */
-    public function createParam() {
-    	$num = array_push($this->parameters, new Parameter());
-    	return $this->parameters[$num-1];
-    }
-
-    /**
-     * Gets a configured output writer.
-     * @return Writer
-     */
-    private function getOutputWriter()
-    {
-    	if ($this->useFile) {
-    		$of = $this->getOutfile();
-    		if (!$of) {
-    			$of = new PhingFile($this->formatter->getPreferredOutfile());
-    		}
-    		return new FileWriter($of, $this->append);
-    	} else {
-    		return $this->getDefaultOutput();
-    	}
-    }
-
-    /**
-     * Configures wrapped formatter class with any attributes on this element.
-     */
-    public function prepare() {
-
-    	if (!$this->formatter) {
-    		throw new BuildException("No formatter specified (use type or classname attribute)", $this->getLocation());
-    	}
-
-    	$out = $this->getOutputWriter();
-
-    	print "Setting output writer to: " . get_class($out) . "\n";
-    	$this->formatter->setOutput($out);
-
-    	if ($this->formatter instanceof PlainPDOResultFormatter) {
-    		// set any options that apply to the plain formatter
-    		$this->formatter->setShowheaders($this->showheaders);
-    		$this->formatter->setRowdelim($this->rowdelimiter);
-    		$this->formatter->setColdelim($this->coldelimiter);
-    	} elseif ($this->formatter instanceof XMLPDOResultFormatter) {
-    		// set any options that apply to the xml formatter
-    		$this->formatter->setEncoding($this->encoding);
-    		$this->formatter->setFormatOutput($this->formatoutput);
-    	}
-
-    	foreach($this->formatterParams as $param) {
-    		$param = new Parameter();
-    		$method = 'set' . $param->getName();
-    		if (!method_exists($this->formatter, $param->getName())) {
-    			throw new BuildException("Formatter " . get_class($this->formatter) . " does not have a $method method.", $this->getLocation());
-    		}
-    		call_user_func(array($this->formatter, $method), $param->getValue());
-    	}
-    }
-
-    /**
-     * Sets the formatter type.
-     * @param string $type
-     */
-    function setType($type) {
-    	$this->type = $type;
-    	if ($this->type == "xml") {
-    		$this->formatter = new XMLPDOResultFormatter();
-    	} elseif ($this->type == "plain") {
-    		$this->formatter = new PlainPDOResultFormatter();
-    	} else {
-    		throw new BuildException("Formatter '" . $this->type . "' not implemented");
-    	}
-    }
-
-	/**
-	 * Set classname for a custom formatter (must extend PDOResultFormatter).
-	 * @param string $className
-	 */
-	function setClassName($className) {
-		$classNameNoDot = Phing::import($className);
-		$this->formatter = new $classNameNoDot();
-	}
-
-	/**
-	 * Set whether to write formatter results to file.
-	 * @param boolean $useFile
-	 */
-	function setUseFile($useFile) {
-		$this->useFile = (boolean) $useFile;
-	}
-
-	/**
-	 * Return whether to write formatter results to file.
-	 * @return boolean
-	 */
-	function getUseFile() {
-		return $this->useFile;
-	}
-
-	/**
-	 * Sets the output file for the formatter results.
-	 * @param PhingFile $outFile
-	 */
-	function setOutfile(PhingFile $outfile) {
-		$this->outfile = $outfile;
-	}
-
-	/**
-	 * Get the output file.
-	 * @return PhingFile
-	 */
-	function getOutfile() {
-		return $this->outfile;
-		/*
-		} else {
-			return new PhingFile($this->formatter->getPreferredOutfile());
-		}*/
-	}
-	
-	/**
-     * whether output should be appended to or overwrite
-     * an existing file.  Defaults to false.
-     * @param boolean $append
-     */
-    public function setAppend($append) {
-    	$this->append = (boolean) $append;
-    }
-    
-    /**
-     * Whether output should be appended to file.
-     * @return boolean
-     */
-    public function getAppend() {
-    	return $this->append;
-    }
-    
-	/**
-     * Print headers for result sets from the 
-     * statements; optional, default true.
-     * @param boolean $showheaders
-     */
-    public function setShowheaders($showheaders) {
-    	$this->showheaders = (boolean) $showheaders;
-    }
-    
-	/**
-	 * Sets the column delimiter.
-	 * @param string $v
-	 */
-	public function setColdelim($v) {
-		$this->coldelimiter = $v;
-	}
-	
-	/**
-	 * Sets the row delimiter.
-	 * @param string $v
-	 */
-	public function setRowdelim($v) {
-		$this->rowdelimiter = $v;
-	}
-	
-	/**
-	 * Set the DOM document encoding.
-	 * @param string $v
-	 */
-	public function setEncoding($v) {
-		$this->encoding = $v;
-	}
-	
-	/**
-	 * @param boolean $v
-	 */
-	public function setFormatOutput($v) {
-		$this->formatOutput = (boolean) $v;
-	}
-    
-	/**
-     * Gets a default output writer for this task.
-     * @return Writer
-     */
-    private function getDefaultOutput()
-    {
-    	return new LogWriter($this->parentTask);
-    }
-    
-	/**
-	 * Gets the formatter that has been configured based on this element.
-	 * @return PDOResultFormatter
-	 */
-	function getFormatter() {
-		return $this->formatter;
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pdo/PDOSQLExecTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pdo/PDOSQLExecTask.php
deleted file mode 100644
index 79e9895f7..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pdo/PDOSQLExecTask.php
+++ /dev/null
@@ -1,614 +0,0 @@
-<?php
-/*
- *  $Id: CreoleSQLExecTask.php 83 2006-07-07 18:17:00Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/tasks/ext/pdo/PDOTask.php';
-include_once 'phing/system/io/StringReader.php';
-include_once 'phing/tasks/ext/pdo/PDOSQLExecFormatterElement.php';
-
-/**
- * Executes a series of SQL statements on a database using PDO.
- *
- * <p>Statements can
- * either be read in from a text file using the <i>src</i> attribute or from 
- * between the enclosing SQL tags.</p>
- * 
- * <p>Multiple statements can be provided, separated by semicolons (or the 
- * defined <i>delimiter</i>). Individual lines within the statements can be 
- * commented using either --, // or REM at the start of the line.</p>
- * 
- * <p>The <i>autocommit</i> attribute specifies whether auto-commit should be 
- * turned on or off whilst executing the statements. If auto-commit is turned 
- * on each statement will be executed and committed. If it is turned off the 
- * statements will all be executed as one transaction.</p>
- * 
- * <p>The <i>onerror</i> attribute specifies how to proceed when an error occurs 
- * during the execution of one of the statements. 
- * The possible values are: <b>continue</b> execution, only show the error;
- * <b>stop</b> execution and commit transaction;
- * and <b>abort</b> execution and transaction and fail task.</p>
- *
- * @author    Hans Lellelid <hans@xmpl.org> (Phing)
- * @author    Jeff Martin <jeff@custommonkey.org> (Ant)
- * @author    Michael McCallum <gholam@xtra.co.nz> (Ant)
- * @author    Tim Stephenson <tim.stephenson@sybase.com> (Ant)
- * @package   phing.tasks.ext
- * @version   $Revision: 1.21 $
- */
-class PDOSQLExecTask extends PDOTask {
-
-	/**
-	 * Count of how many statements were executed successfully.
-	 * @var int
-	 */
-	private $goodSql = 0;
-
-	/**
-	 * Count of total number of SQL statements.
-	 * @var int
-	 */
-	private $totalSql = 0;
-
-	const DELIM_ROW = "row";
-	const DELIM_NORMAL = "normal";
-
-    /**
-     * Database connection
-     * @var PDO
-     */
-    private $conn = null;
-
-    /**
-     * Files to load
-     * @var array FileSet[]
-     */
-    private $filesets = array();
-
-    /**
-     * Formatter elements.
-     * @var array PDOSQLExecFormatterElement[]
-     */
-    private $formatters = array();
-
-    /**
-     * SQL statement
-     * @var PDOStatement
-     */
-    private $statement;
-
-    /**
-     * SQL input file
-     * @var PhingFile
-     */
-    private $srcFile;
-
-    /**
-     * SQL input command
-     * @var string
-     */
-    private $sqlCommand = "";
-
-    /**
-     * SQL transactions to perform
-     */
-    private $transactions = array();
-
-    /**
-     * SQL Statement delimiter (for parsing files)
-     * @var string
-     */
-    private $delimiter = ";";
-
-    /**
-     * The delimiter type indicating whether the delimiter will
-     * only be recognized on a line by itself
-     */
-    private $delimiterType = "normal"; // can't use constant just defined
-
-    /**
-     * Action to perform if an error is found
-     **/
-    private $onError = "abort";
-
-    /**
-     * Encoding to use when reading SQL statements from a file
-     */
-    private $encoding = null;
-
-    /**
-     * Fetch mode for PDO select queries.
-     * @var int
-     */
-    private $fetchMode;
-
-    /**
-     * Set the name of the SQL file to be run.
-     * Required unless statements are enclosed in the build file
-     */
-    public function setSrc(PhingFile $srcFile) {
-    	$this->srcFile = $srcFile;
-    }
-
-    /**
-     * Set an inline SQL command to execute. 
-     * NB: Properties are not expanded in this text.
-     */
-    public function addText($sql) {
-    	$this->sqlCommand .= $sql;
-    }
-
-    /**
-     * Adds a set of files (nested fileset attribute).
-     */
-    public function addFileset(FileSet $set) {
-    	$this->filesets[] = $set;
-    }
-
-    /**
-     * Creates a new PDOSQLExecFormatterElement for <formatter> element.
-     * @return PDOSQLExecFormatterElement
-     */
-    public function createFormatter()
-    {
-    	$fe = new PDOSQLExecFormatterElement($this);
-    	$this->formatters[] = $fe;
-    	return $fe;
-    }
-
-    /**
-     * Add a SQL transaction to execute
-     */
-    public function createTransaction() {
-    	$t = new PDOSQLExecTransaction($this);
-    	$this->transactions[] = $t;
-    	return $t;
-    }
-
-    /**
-     * Set the file encoding to use on the SQL files read in
-     *
-     * @param encoding the encoding to use on the files
-     */
-    public function setEncoding($encoding) {
-    	$this->encoding = $encoding;
-    }
-
-    /**
-     * Set the statement delimiter.
-     *
-     * <p>For example, set this to "go" and delimitertype to "ROW" for
-     * Sybase ASE or MS SQL Server.</p>
-     *
-     * @param delimiter
-     */
-    public function setDelimiter($delimiter)
-    {
-    	$this->delimiter = $delimiter;
-    }
-
-    /**
-     * Set the Delimiter type for this sql task. The delimiter type takes two
-     * values - normal and row. Normal means that any occurence of the delimiter
-     * terminate the SQL command whereas with row, only a line containing just
-     * the delimiter is recognized as the end of the command.
-     *
-     * @param string $delimiterType
-     */
-    public function setDelimiterType($delimiterType)
-    {
-    	$this->delimiterType = $delimiterType;
-    }
-
-    /**
-     * Action to perform when statement fails: continue, stop, or abort
-     * optional; default &quot;abort&quot;
-     */
-    public function setOnerror($action) {
-    	$this->onError = $action;
-    }
-
-    /**
-     * Sets the fetch mode to use for the PDO resultset.
-     * @param mixed $mode The PDO fetchmode integer or constant name.
-     */
-    public function setFetchmode($mode) {
-    	if (is_numeric($mode)) {
-    		$this->fetchMode = (int) $mode;
-    	} else {
-    		if (defined($mode)) {
-    			$this->fetchMode = constant($mode);
-    		} else {
-    			throw new BuildException("Invalid PDO fetch mode specified: " . $mode, $this->getLocation());
-    		}
-    	}
-    }
-
-    /**
-     * Gets a default output writer for this task.
-     * @return Writer
-     */
-    private function getDefaultOutput()
-    {
-    	return new LogWriter($this);
-    }
-
-    /**
-     * Load the sql file and then execute it
-     * @throws BuildException
-     */
-    public function main()  {
-
-    	// Set a default fetchmode if none was specified
-    	// (We're doing that here to prevent errors loading the class is PDO is not available.)
-    	if ($this->fetchMode === null) {
-    		$this->fetchMode = PDO::FETCH_BOTH;
-    	}
-
-    	// Initialize the formatters here.  This ensures that any parameters passed to the formatter
-    	// element get passed along to the actual formatter object
-    	foreach($this->formatters as $fe) {
-    		$fe->prepare();
-    	}
-
-    	$savedTransaction = array();
-    	for($i=0,$size=count($this->transactions); $i < $size; $i++) {
-    		$savedTransaction[] = clone $this->transactions[$i];
-    	}
-
-    	$savedSqlCommand = $this->sqlCommand;
-
-    	$this->sqlCommand = trim($this->sqlCommand);
-
-    	try {
-    		if ($this->srcFile === null && $this->sqlCommand === ""
-    		&& empty($this->filesets)) {
-    			if (count($this->transactions) === 0) {
-    				throw new BuildException("Source file or fileset, "
-    				. "transactions or sql statement "
-    				. "must be set!", $this->location);
-    			}
-    		}
-
-    		if ($this->srcFile !== null && !$this->srcFile->exists()) {
-    			throw new BuildException("Source file does not exist!", $this->location);
-    		}
-
-    		// deal with the filesets
-    		foreach($this->filesets as $fs) {
-    			$ds = $fs->getDirectoryScanner($this->project);
-    			$srcDir = $fs->getDir($this->project);
-    			$srcFiles = $ds->getIncludedFiles();
-    			// Make a transaction for each file
-    			foreach($srcFiles as $srcFile) {
-    				$t = $this->createTransaction();
-    				$t->setSrc(new PhingFile($srcDir, $srcFile));
-    			}
-    		}
-
-    		// Make a transaction group for the outer command
-    		$t = $this->createTransaction();
-    		if ($this->srcFile) $t->setSrc($this->srcFile);
-    		$t->addText($this->sqlCommand);
-    		$this->conn = $this->getConnection();
-
-    		try {
-
-    			$this->statement = null;
-
-    			// Initialize the formatters.
-    			$this->initFormatters();
-
-    			try {
-
-    				// Process all transactions
-    				for ($i=0,$size=count($this->transactions); $i < $size; $i++) {
-    					if (!$this->isAutocommit()) {
-    						$this->log("Beginning transaction", Project::MSG_VERBOSE);
-    						$this->conn->beginTransaction();
-    					}
-    					$this->transactions[$i]->runTransaction();
-    					if (!$this->isAutocommit()) {
-    						$this->log("Commiting transaction", Project::MSG_VERBOSE);
-    						$this->conn->commit();
-    					}
-    				}
-    			} catch (Exception $e) {
-    				throw $e;
-    			}
-    		} catch (IOException $e) {
-    			if (!$this->isAutocommit() && $this->conn !== null && $this->onError == "abort") {
-    				try {
-    					$this->conn->rollback();
-    				} catch (PDOException $ex) {}
-    			}
-    			throw new BuildException($e->getMessage(), $this->location);
-    		} catch (PDOException $e){
-    			if (!$this->isAutocommit() && $this->conn !== null && $this->onError == "abort") {
-    				try {
-    					$this->conn->rollback();
-    				} catch (PDOException $ex) {}
-    			}
-    			throw new BuildException($e->getMessage(), $this->location);
-    		}
-    			
-    		// Close the formatters.
-    		$this->closeFormatters();
-
-    		$this->log($this->goodSql . " of " . $this->totalSql .
-                " SQL statements executed successfully");
-
-    	} catch (Exception $e) {
-    		$this->transactions = $savedTransaction;
-    		$this->sqlCommand = $savedSqlCommand;
-    		throw $e;
-    	}
-    	// finally {
-    	$this->transactions = $savedTransaction;
-    	$this->sqlCommand = $savedSqlCommand;
-
-    }
-
-
-    /**
-     * read in lines and execute them
-     * @throws PDOException, IOException 
-     */
-    public function runStatements(Reader $reader) {
-    	$sql = "";
-		$line = "";
-		$sqlBacklog = "";
-		$hasQuery = false;
-
-		$in = new BufferedReader($reader);
-
-		try {
-			while (($line = $in->readLine()) !== null) {
-				$line = trim($line);
-				$line = ProjectConfigurator::replaceProperties($this->project, $line,
-						$this->project->getProperties());
-
-				if (StringHelper::startsWith("//", $line) ||
-					StringHelper::startsWith("--", $line) ||
-					StringHelper::startsWith("#", $line)) {
-					continue;
-				}
-
-				if (strlen($line) > 4
-						&& strtoupper(substr($line,0, 4)) == "REM ") {
-					continue;
-				}
-
-				if ($sqlBacklog !== "") {
-					$sql = $sqlBacklog;
-					$sqlBacklog = "";
-				}
-
-				$sql .= " " . $line . "\n";
-
-				// SQL defines "--" as a comment to EOL
-				// and in Oracle it may contain a hint
-				// so we cannot just remove it, instead we must end it
-				if (strpos($line, "--") !== false) {
-					$sql .= "\n";
-				}
-
-				// DELIM_ROW doesn't need this (as far as i can tell)
-				if ($this->delimiterType == self::DELIM_NORMAL) {
-
-					$reg = "#((?:\"(?:\\\\.|[^\"])*\"?)+|'(?:\\\\.|[^'])*'?|" . preg_quote($this->delimiter) . ")#";
-
-					$sqlParts = preg_split($reg, $sql, 0, PREG_SPLIT_DELIM_CAPTURE);
-					$sqlBacklog = "";
-					foreach ($sqlParts as $sqlPart) {
-						// we always want to append, even if it's a delim (which will be stripped off later)
-						$sqlBacklog .= $sqlPart;
-
-						// we found a single (not enclosed by ' or ") delimiter, so we can use all stuff before the delim as the actual query
-						if ($sqlPart === $this->delimiter) {
-							$sql = $sqlBacklog;
-							$sqlBacklog = "";
-							$hasQuery = true;
-						}
-					}
-				}
-
-				if ($hasQuery || ($this->delimiterType == self::DELIM_ROW && $line == $this->delimiter)) {
-					// this assumes there is always a delimter on the end of the SQL statement.
-					$sql = StringHelper::substring($sql, 0, strlen($sql) - 1 - strlen($this->delimiter));
-					$this->log("SQL: " . $sql, Project::MSG_VERBOSE);
-					$this->execSQL($sql);
-					$sql = "";
-					$hasQuery = false;
-				}
-			}
-
-			// Catch any statements not followed by ;
-			if ($sql !== "") {
-				$this->execSQL($sql);
-			}
-		} catch (PDOException $e) {
-			throw $e;
-		}
-    }
-
-    /**
-     * Whether the passed-in SQL statement is a SELECT statement.
-     * This does a pretty simple match, checking to see if statement starts with
-     * 'select' (but not 'select into').
-     * 
-     * @param string $sql
-     * @return boolean Whether specified SQL looks like a SELECT query.
-     */
-    protected function isSelectSql($sql)
-    {
-    	$sql = trim($sql);
-    	return (stripos($sql, 'select') === 0 && stripos($sql, 'select into ') !== 0);
-    }
-
-    /**
-     * Exec the sql statement.
-     * @throws PDOException 
-     */
-    protected function execSQL($sql) {
-
-    	// Check and ignore empty statements
-    	if (trim($sql) == "") {
-    		return;
-    	}
-
-    	try {
-    		$this->totalSql++;
-
-    		$this->statement = $this->conn->prepare($sql);
-    		$this->statement->execute();
-    		$this->log($this->statement->rowCount() . " rows affected", Project::MSG_VERBOSE);
-
-    		// only call processResults() for statements that return actual data (such as 'select')
-    		if ($this->statement->columnCount() > 0)
-    		{
-    			$this->processResults();
-    		}
-
-    		$this->statement->closeCursor();
-    		$this->statement = null;
-
-    		$this->goodSql++;
-
-    	} catch (PDOException $e) {
-    		$this->log("Failed to execute: " . $sql, Project::MSG_ERR);
-    		if ($this->onError != "continue") {
-    			throw new BuildException("Failed to execute SQL", $e);
-    		}
-    		$this->log($e->getMessage(), Project::MSG_ERR);
-    	}
-    }
-
-    /**
-     * Returns configured PDOResultFormatter objects (which were created from PDOSQLExecFormatterElement objects).
-     * @return array PDOResultFormatter[]
-     */
-    protected function getConfiguredFormatters()
-    {
-    	$formatters = array();
-    	foreach ($this->formatters as $fe) {
-    		$formatters[] = $fe->getFormatter();
-    	}
-    	return $formatters;
-    }
-
-    /**
-     * Initialize the formatters.
-     */
-    protected function initFormatters() {
-    	$formatters = $this->getConfiguredFormatters();
-    	foreach ($formatters as $formatter) {
-    		$formatter->initialize();
-    	}
-
-    }
-
-    /**
-     * Run cleanup and close formatters.
-     */
-    protected function closeFormatters() {
-    	$formatters = $this->getConfiguredFormatters();
-    	foreach ($formatters as $formatter) {
-    		$formatter->close();
-    	}
-    }
-
-    /**
-     * Passes results from query to any formatters.
-     * @throw PDOException
-     */
-    protected function processResults() {
-
-    	try {
-
-    		$this->log("Processing new result set.", Project::MSG_VERBOSE);
-
-    		$formatters = $this->getConfiguredFormatters();
-
-	    	while ($row = $this->statement->fetch($this->fetchMode)) {
-	    		foreach ($formatters as $formatter) {
-	    			$formatter->processRow($row);
-	    		}
-	    	}
-
-    	} catch (Exception $x) {
-    		$this->log("Error processing reults: " . $x->getMessage(), Project::MSG_ERR);
-    		foreach ($formatters as $formatter) {
-	    		$formatter->close();
-	    	}
-    		throw $x;
-    	}
-
-    }
-}
-
-/**
- * "Inner" class that contains the definition of a new transaction element.
- * Transactions allow several files or blocks of statements
- * to be executed using the same JDBC connection and commit
- * operation in between.
- */
-class PDOSQLExecTransaction {
-
-	private $tSrcFile = null;
-	private $tSqlCommand = "";
-	private $parent;
-
-	function __construct($parent)
-	{
-		// Parent is required so that we can log things ...
-		$this->parent = $parent;
-	}
-
-	public function setSrc(PhingFile $src)
-	{
-		$this->tSrcFile = $src;
-	}
-
-	public function addText($sql)
-	{
-		$this->tSqlCommand .= $sql;
-	}
-
-    /**
-     * @throws IOException, PDOException
-     */
-    public function runTransaction()
-    {
-    	if (!empty($this->tSqlCommand)) {
-    		$this->parent->log("Executing commands", Project::MSG_INFO);
-    		$this->parent->runStatements(new StringReader($this->tSqlCommand));
-    	}
-
-    	if ($this->tSrcFile !== null) {
-    		$this->parent->log("Executing file: " . $this->tSrcFile->getAbsolutePath(),
-    		Project::MSG_INFO);
-    		$reader = new FileReader($this->tSrcFile);
-    		$this->parent->runStatements($reader);
-    		$reader->close();
-    	}
-    }
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pdo/PDOTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pdo/PDOTask.php
deleted file mode 100644
index fd2b5620c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pdo/PDOTask.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-
-/*
- *  $Id: CreoleTask.php 59 2006-04-28 14:49:47Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-include_once 'phing/types/Reference.php';
-
-/**
- * Handles PDO configuration needed by SQL type tasks.
- *
- * @author    Hans Lellelid <hans@xmpl.org> (Phing)
- * @author    Nick Chalko <nick@chalko.com> (Ant)
- * @author    Jeff Martin <jeff@custommonkey.org> (Ant)
- * @author    Michael McCallum <gholam@xtra.co.nz> (Ant)
- * @author    Tim Stephenson <tim.stephenson@sybase.com> (Ant)
- * @version   $Revision: 1.13 $
- * @package   phing.tasks.system
- */
-abstract class PDOTask extends Task {
-
-    private $caching = true;
-
-    /**
-     * Autocommit flag. Default value is false
-     */
-    private $autocommit = false;
-    
-    /**
-     * DB url.
-     */
-    private $url;
-
-    /**
-     * User name.
-     */
-    private $userId;
-
-    /**
-     * Password
-     */
-    private $password;
-
-    /**
-     * RDBMS Product needed for this SQL.
-     **/
-    private $rdbms;
-   
-      /**
-     * Initialize CreoleTask.
-     * This method includes any necessary Creole libraries and triggers
-     * appropriate error if they cannot be found.  This is not done in header
-     * because we may want this class to be loaded w/o triggering an error.
-     */
-    function init() {
-        if (!class_exists('PDO')) {
-            throw new Exception("PDOTask depends on PDO feature being included in PHP.");
-        }
-    }
-
-    /**
-     * Caching loaders / driver. This is to avoid
-     * getting an OutOfMemoryError when calling this task
-     * multiple times in a row; default: true
-     * @param $enable
-     */
-    public function setCaching($enable) {
-        $this->caching = $enable;
-    }
-
-    /**
-     * Sets the database connection URL; required.
-     * @param url The url to set
-     */
-    public function setUrl($url) {
-        $this->url = $url;
-    }
-        
-    /**
-     * Sets the password; required.
-     * @param password The password to set
-     */
-    public function setPassword($password) {
-        $this->password = $password;
-    }
-
-    /**
-     * Auto commit flag for database connection;
-     * optional, default false.
-     * @param autocommit The autocommit to set
-     */
-    public function setAutocommit($autocommit) {
-        $this->autocommit = $autocommit;
-    }
-
-    /**
-     * Sets the version string, execute task only if 
-     * rdbms version match; optional.
-     * @param version The version to set
-     */
-    public function setVersion($version) {
-        $this->version = $version;
-    }
-       
-    protected function getLoaderMap() {
-        return self::$loaderMap;
-    }
-
-
-    /**
-     * Creates a new Connection as using the driver, url, userid and password specified.
-     * The calling method is responsible for closing the connection.
-     * @return Connection the newly created connection.
-     * @throws BuildException if the UserId/Password/Url is not set or there is no suitable driver or the driver fails to load.
-     */
-    protected function getConnection() {
-            
-        if ($this->url === null) {
-            throw new BuildException("Url attribute must be set!", $this->location);
-        }
-                
-        try {
-
-            $this->log("Connecting to " . $this->getUrl(), Project::MSG_VERBOSE);
-            
-            $user = null;
-            $pass = null;
-				
-            if ($this->userId) {
-            	$user = $this->getUserId();
-            }
-            
-            if ($this->password) {
-                $pass = $this->getPassword();
-            }            
-            
-            $conn = new PDO($this->getUrl(), $user, $pass);
-            $conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-            
-            if ($this->autocommit) {
-            	try {
-					$conn->setAttribute(PDO::ATTR_AUTOCOMMIT, $this->autocommit);
-				} catch (PDOException $pe) {
-					$this->log("Unable to enable auto-commit for this database: " . $pe->getMessage(), Project::MSG_WARN);
-				}
-			}
-            
-            return $conn;
-            
-        } catch (SQLException $e) {
-            throw new BuildException($e->getMessage(), $this->location);
-        }
-
-    }
-
-    public function isCaching($value) {
-        $this->caching = $value;
-    }
-
-    /**
-     * Gets the autocommit.
-     * @return Returns a boolean
-     */
-    public function isAutocommit() {
-        return $this->autocommit;
-    }
-
-    /**
-     * Gets the url.
-     * @return Returns a String
-     */
-    public function getUrl() {
-        return $this->url;
-    }
-
-    /**
-     * Gets the userId.
-     * @return Returns a String
-     */
-    public function getUserId() {
-        return $this->userId;
-    }
-
-    /**
-     * Set the user name for the connection; required.
-     * @param userId The userId to set
-     */
-    public function setUserid($userId) {
-        $this->userId = $userId;
-    }
-
-    /**
-     * Gets the password.
-     * @return Returns a String
-     */
-    public function getPassword() {
-        return $this->password;
-    }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pdo/PlainPDOResultFormatter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pdo/PlainPDOResultFormatter.php
deleted file mode 100644
index 29371857c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pdo/PlainPDOResultFormatter.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/**
- * $Id: FormatterElement.php 148 2007-02-13 11:15:53Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/system/io/PhingFile.php';
-require_once 'phing/tasks/ext/pdo/PDOResultFormatter.php';
-
-/**
- * Plain text formatter for PDO results. 
- *
- * @author Hans Lellelid <hans@xmpl.org>
- * @package phing.tasks.ext.pdo
- * @since 2.3.0
- */
-class PlainPDOResultFormatter extends PDOResultFormatter
-{
-	/**
-	 * Have column headers been printed?
-	 * @var boolean
-	 */
-	private $colsprinted = false;
-
-	/**
-	 * Whether to show headers.
-	 * @var boolean
-	 */
-	private $showheaders = true;
-
-	/**
-	 * Column delimiter.
-	 * Defaults to ','
-	 * @var string
-	 */
-	private $coldelimiter = ",";
-
-	/**
-	 * Row delimiter.
-	 * Defaults to PHP_EOL.
-	 * @var string 
-	 */
-	private $rowdelimiter = PHP_EOL;
-
-	/**
-	 * Set the showheaders attribute.
-	 * @param boolean $v
-	 */
-	public function setShowheaders($v) {
-		$this->showheaders = StringHelper::booleanValue($v);
-	}
-
-	/**
-	 * Sets the column delimiter.
-	 * @param string $v
-	 */
-	public function setColdelim($v) {
-		$this->coldelimiter = $v;
-	}
-
-	/**
-	 * Sets the row delimiter.
-	 * @param string $v
-	 */
-	public function setRowdelim($v) {
-		$this->rowdelimiter = $v;
-	}
-
-	/**
-	 * Processes a specific row from PDO result set.
-	 *
-	 * @param array $row Row of PDO result set.
-	 */
-	public function processRow($row) {
-
-		if (!$this->colsprinted && $this->showheaders) {
-			$first = true;
-			foreach($row as $fieldName => $ignore) {
-				if ($first) $first = false; else $line .= ",";
-				$line .= $fieldName;
-			}
-
-			$this->out->write($line);
-			$this->out->write(PHP_EOL);
-
-			$line = "";
-			$colsprinted = true;
-		} // if show headers
-
-		$first = true;
-		foreach($row as $columnValue) {
-
-			if ($columnValue != null) {
-				$columnValue = trim($columnValue);
-			}
-
-			if ($first) {
-				$first = false;
-			} else {
-				$line .= $this->coldelimiter;
-			}
-			$line .= $columnValue;
-		}
-		
-		$this->out->write($line);
-		$this->out->write($this->rowdelimiter);
-
-	}
-
-	public function getPreferredOutfile()
-	{
-		return new PhingFile('results.txt');
-	}
-	
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pdo/XMLPDOResultFormatter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pdo/XMLPDOResultFormatter.php
deleted file mode 100644
index 35c516c71..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pdo/XMLPDOResultFormatter.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-/**
- * $Id: FormatterElement.php 148 2007-02-13 11:15:53Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/system/io/PhingFile.php';
-require_once 'phing/tasks/ext/pdo/PDOResultFormatter.php';
-
-/**
- * XML formatter for PDO results.
- * 
- * This class reprsents the output of a query using a simple XML schema.
- * 
- * <results>
- * 	<row>
- * 	 <col name="id">value</col>
- * 	 <col name="name">value2</col>
- *  </row>
- *  <row>
- *   <col name="id">value</col>
- * 	 <col name="name">value2</col>
- *  </row>
- * </results>
- *
- * The actual names of the colums will depend on the fetchmode that was used
- * with PDO.
- * 
- * @author Hans Lellelid <hans@xmpl.org>
- * @package phing.tasks.ext.pdo
- * @since 2.3.0
- */
-class XMLPDOResultFormatter extends PDOResultFormatter {
-
-	/**
-	 * The XML document being created.
-	 * @var DOMDocument
-	 */
-	private $doc;
-
-	/**
-	 * @var DOMElement
-	 */
-	private $rootNode;
-
-	/**
-	 * XML document encoding
-	 *
-	 * @var string
-	 */
-	private $encoding;
-
-	/**
-	 * @var boolean
-	 */
-	private $formatOutput = true;
-	
-	/**
-	 * Set the DOM document encoding.
-	 * @param string $v
-	 */
-	public function setEncoding($v) {
-		$this->encoding = $v;
-	}
-	
-	/**
-	 * @param boolean $v
-	 */
-	public function setFormatOutput($v) {
-		$this->formatOutput = (boolean) $v;
-	}
-
-	public function initialize() {
-		$this->doc = new DOMDocument("1.0", $this->encoding);
-		$this->rootNode = $this->doc->createElement('results');
-		$this->doc->appendChild($this->rootNode);
-		$this->doc->formatOutput = $this->formatOutput;
-	}
-	
-	/**
-	 * Processes a specific row from PDO result set.
-	 *
-	 * @param array $row Row of PDO result set.
-	 */
-	public function processRow($row) {
-		
-		$rowNode = $this->doc->createElement('row');
-		$this->rootNode->appendChild($rowNode);
-
-		foreach($row as $columnName => $columnValue) {
-			
-			$colNode = $this->doc->createElement('column');
-			$colNode->setAttribute('name', $columnName);
-			
-			if ($columnValue != null) {
-				$columnValue = trim($columnValue);
-				$colNode->nodeValue = $columnValue;
-			}
-			$rowNode->appendChild($colNode);
-		}
-		
-	}
-	
-	/**
-	 * Gets a preferred filename for an output file.
-	 * 
-	 * If no filename is specified, this is where the results will be placed
-	 * (unless usefile=false).
-	 * 
-	 * @return string
-	 */
-	public function getPreferredOutfile()
-	{
-		return new PhingFile('results.xml');
-	}
-	
-	/**
-	 * Write XML to file and free the DOM objects.
-	 */
-	public function close() {
-		$this->out->write($this->doc->saveXML());
-		$this->rootNode = null;
-		$this->doc = null;
-		parent::close();
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pearpackage/Fileset.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pearpackage/Fileset.php
deleted file mode 100644
index 165983de4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/pearpackage/Fileset.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php
-/*
- *  $Id: Fileset.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-include_once 'phing/system/io/PhingFile.php';
-
-/**
- * Builds list of files for PEAR_PackageFileManager using a Phing FileSet.
- *
- * Some code here is taken from PEAR_PackageFileManager_File -- getting results from flat
- * array into the assoc array expected from getFileList().
- * 
- * @author   Greg Beaver 
- * @author   Hans Lellelid <hans@xmpl.org>
- * @package  phing.tasks.ext.pearpackage
- * @version  $Revision: 1.7 $
- */
-class PEAR_PackageFileManager_Fileset {
-
-    /**
-     * @access private
-     * @var PEAR_PackageFileManager
-     */
-    private $parent;
-    
-    /**
-     * Curent Phing Project.
-     * @var Project
-     */
-    private $project;
-    
-    /**
-     * FileSets to use.
-     * @var array FileSet[]
-     */
-    private $filesets = array();
-
-    /**
-     * Set up the FileSet filelist generator
-     *
-     * 'project' and 'filesets' are the only options that this class uses.
-     * 
-     * @param PEAR_PackageFileManager
-     * @param array
-     */
-    function __construct($parent, $options)
-    {
-        $this->parent = $parent;
-        $this->project = $options['phing_project'];
-        $this->filesets = $options['phing_filesets'];
-    }
-    
-    /**
-     * Generate the <filelist></filelist> section
-     * of the package file.
-     *
-     * This function performs the backend generation of the array
-     * containing all files in this package
-     * @return array structure of all files to include
-     */
-    function getFileList() {    
-
-        $allfiles = array();        
-        
-        foreach($this->filesets as $fs) {
-            $ds = $fs->getDirectoryScanner($this->project);
-            
-            $files = $ds->getIncludedFiles();
-            
-            // We need to store these files keyed by the basedir from DirectoryScanner
-            // so that we can resolve the fullpath of the file later.
-            if (isset($allfiles[$ds->getBasedir()]))
-            {
-                $allfiles[$ds->getBasedir()] = array_merge($allfiles[$ds->getBasedir()], $files);
-            }
-            else
-            {
-                $allfiles[$ds->getBasedir()] = $files;
-            }
-        }
-        
-        $struc = array();
-        
-        foreach($allfiles as $basedir => $files) {
-        
-            foreach($files as $file) {
-                            
-                // paths are relative to $basedir above
-                $path = strtr(dirname($file), DIRECTORY_SEPARATOR, '/');
-    
-                if (!$path || $path == '.') {
-                    $path = '/'; // for array index
-                }
-                
-				$parts = explode('.', basename($file));
-                $ext = array_pop($parts);
-                if (strlen($ext) == strlen($file)) {
-                    $ext = '';
-                }
-                
-                $f = new PhingFile($basedir, $file);
-                
-                $struc[$path][] = array('file' => basename($file),
-                                        'ext' => $ext,
-                                        'path' => (($path == '/') ? basename($file) : $path . '/' . basename($file)),
-                                        'fullpath' => $f->getAbsolutePath());        
-            }                                        
-        }
-                
-        uksort($struc,'strnatcasecmp');
-        foreach($struc as $key => $ind) {
-            usort($ind, array($this, 'sortfiles'));
-            $struc[$key] = $ind;
-        }
-
-        $tempstruc = $struc;
-        $struc = array('/' => $tempstruc['/']);
-        $bv = 0;
-        foreach($tempstruc as $key => $ind) {
-            $save = $key;
-            if ($key != '/') {
-                $struc['/'] = $this->setupDirs($struc['/'], explode('/', $key), $tempstruc[$key]);
-            }
-        }
-        uksort($struc['/'], array($this, 'mystrucsort'));
-
-        return $struc;
-    }
-
-    /**
-     * Recursively move contents of $struc into associative array
-     *
-     * The contents of $struc have many indexes like 'dir/subdir/subdir2'.
-     * This function converts them to
-     * array('dir' => array('subdir' => array('subdir2')))
-     * @param array struc is array('dir' => array of files in dir,
-     *              'dir/subdir' => array of files in dir/subdir,...)
-     * @param array array form of 'dir/subdir/subdir2' array('dir','subdir','subdir2')
-     * @return array same as struc but with array('dir' =>
-     *              array(file1,file2,'subdir' => array(file1,...)))
-     */
-    private function setupDirs($struc, $dir, $contents) {
-    
-        if (!count($dir)) {
-            foreach($contents as $dir => $files) {
-                if (is_string($dir)) {
-                    if (strpos($dir, '/')) {
-                        $test = true;
-                        $a = $contents[$dir];
-                        unset($contents[$dir]);
-                        $b = explode('/', $dir);
-                        $c = array_shift($b);
-                        if (isset($contents[$c])) {
-                            $contents[$c] = $this->setDir($contents[$c], $this->setupDirs(array(), $b, $a));
-                        } else {
-                            $contents[$c] = $this->setupDirs(array(), $b, $a);
-                        }
-                    }
-                }
-            }
-            return $contents;
-        }
-        $me = array_shift($dir);
-        if (!isset($struc[$me])) {
-            $struc[$me] = array();
-        }
-        $struc[$me] = $this->setupDirs($struc[$me], $dir, $contents);
-        return $struc;
-    }
-    
-    /**
-     * Recursively add all the subdirectories of $contents to $dir without erasing anything in
-     * $dir
-     * @param array
-     * @param array
-     * @return array processed $dir
-     */
-    function setDir($dir, $contents)
-    {
-        while(list($one,$two) = each($contents)) {
-            if (isset($dir[$one])) {
-                $dir[$one] = $this->setDir($dir[$one], $contents[$one]);
-            } else {
-                $dir[$one] = $two;
-            }
-        }
-        return $dir;
-    }
-    
-    /**
-     * Sorting functions for the file list
-     * @param string
-     * @param string
-     * @access private
-     */
-    function sortfiles($a, $b)
-    {
-        return strnatcasecmp($a['file'],$b['file']);
-    }
-    
-    function mystrucsort($a, $b)
-    {
-        if (is_numeric($a) && is_string($b)) return 1;
-        if (is_numeric($b) && is_string($a)) return -1;
-        if (is_numeric($a) && is_numeric($b))
-        {
-            if ($a > $b) return 1;
-            if ($a < $b) return -1;
-            if ($a == $b) return 0;
-        }
-        return strnatcasecmp($a,$b);
-    }
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpdoc/PhingPhpDocumentorSetup.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpdoc/PhingPhpDocumentorSetup.php
deleted file mode 100755
index 2051f4e08..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpdoc/PhingPhpDocumentorSetup.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-/**
- * $Id: PHPDocumentorTask.php 144 2007-02-05 15:19:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-/**
- * Phing subclass of the phpDocumentor_setup class provided with PhpDocumentor to work around limitations in PhpDocumentor API.
- * 
- * This class is necessary because phpDocumentor_setup does not expose a complete API for setting configuration options.  Because
- * this class must directly modify some "private" GLOBAL(!) configuration variables, it is liable to break if the PhpDocumentor
- * internal implementation changes.  Obviously this is far from ideal, but there's also no solution given the inflexibility of the
- * PhpDocumentor design. 
- * 
- * @author Hans Lellelid <hans@xmpl.org>@author hans
- * @version $Id$
- * @package phing.tasks.ext.phpdoc
- */
-class PhingPhpDocumentorSetup extends phpDocumentor_setup {
-	
-	/**
-	 * Constructs a new PhingPhpDocumentorSetup.
-	 *
-	 * @param string $configDir Directory in which to look for configuration files.
-	 */
-	public function __construct($configdir = null) {
-		global $_phpDocumentor_cvsphpfile_exts, $_phpDocumentor_setting, $_phpDocumentor_phpfile_exts;
-		
-		$this->setup = new Io();
-		$this->render = new phpDocumentor_IntermediateParser("Default Title");
-		
-		$GLOBALS['_phpDocumentor_install_dir'] = $configdir;
-        $this->parseIni();
-		
-        // These redundant-looking lines seem to actually make a difference.
-        // See: http://phing.info/trac/ticket/150
-        $_phpDocumentor_phpfile_exts = $GLOBALS['_phpDocumentor_phpfile_exts'];
-		$_phpDocumentor_cvsphpfile_exts = $GLOBALS['_phpDocumentor_cvsphpfile_exts'];
-
-		if (tokenizer_ext) {
-            $this->parse = new phpDocumentorTParser();
-        } else {
-            $this->parse = new Parser();
-        }
-        
-        $this->setMemoryLimit();
-	}
-	
-	/**
-	 * Set whether to generate sourcecode for each file parsed.
-	 *
-	 * This method exists as a hack because there is no API exposed for this in PhpDocumentor.
-	 * Note that because we are setting a "private" GLOBAL(!!) config var with this value, this
-	 * is subject to break if PhpDocumentor internals changes.  
-	 * 
-	 * @param bool $b
-	 */
-	public function setGenerateSourcecode($b) {
-		global $_phpDocumentor_setting;
-		$_phpDocumentor_setting['sourcecode'] = (boolean) $b;
-	}
-	
-	/**
-	 * Set an array of README/INSTALL/CHANGELOG file paths. 
-	 *
-	 * This method exists as a hack because there is no API exposed for this in PhpDocumentor.
-	 * Note that because we are setting a "private" GLOBAL(!!) config var with this value, this
-	 * is subject to break if PhpDocumentor internals changes.  
-	 * 
-	 * @param array $files Absolute paths to files.
-	 */
-	public function setRicFiles($files) {
-		global $_phpDocumentor_RIC_files;
-		$_phpDocumentor_RIC_files = $files;
-	}
-	
-	/**
-	 * Set comma-separated list of tags to ignore.
-	 *
-	 * This method exists as a hack because there is no API exposed for this in PhpDocumentor.
-	 * Note that because we are setting a "private" GLOBAL(!!) config var with this value, this
-	 * is subject to break if PhpDocumentor internals changes.  
-	 * 
-	 * @param string $tags
-	 */
-	public function setIgnoreTags($tags) {
-		global $_phpDocumentor_setting; 
-		$ignoretags = explode(',', $tags);
-		$ignoretags = array_map('trim', $ignoretags);
-		$tags = array();
-		foreach($ignoretags as $tag) {
-		    if (!in_array($tag,array('@global', '@access', '@package', '@ignore', '@name', '@param', '@return', '@staticvar', '@var')))
-		        $tags[] = $tag;
-		}
-		$_phpDocumentor_setting['ignoretags'] = $tags;
-	}
-	
-	/**
-	 * Set whether to parse dirs as PEAR repos. 
-	 *
-	 * This method exists as a hack because there is no API exposed for this in PhpDocumentor.
-	 * Note that because we are setting a "private" GLOBAL(!!) config var with this value, this
-	 * is subject to break if PhpDocumentor internals changes.  
-	 * 
-	 * @param bool $b
-	 */
-	public function setPear($b) {
-		global $_phpDocumentor_setting;
-		$_phpDocumentor_setting['pear'] = (boolean) $b;
-	}
-	
-	/**
-	 * Set fullpath to directory to look in for examples. 
-	 *
-	 * This method exists as a hack because there is no API exposed for this in PhpDocumentor.
-	 * Note that because we are setting a "private" GLOBAL(!!) config var with this value, this
-	 * is subject to break if PhpDocumentor internals changes.  
-	 * 
-	 * @param string $dir
-	 */
-	public function setExamplesDir($dir) {
-		global $_phpDocumentor_setting;
-		$_phpDocumentor_setting['examplesdir'] = $dir;
-	}
-	
-	/**
-	 * Sets the default package name.
-	 *
-	 * This method exists as a hack because there is no API exposed for this in PhpDocumentor.
-	 * Note that because we are setting a "private" GLOBAL(!!) config var with this value, this
-	 * is subject to break if PhpDocumentor internals changes.  
-	 * 
-	 * @param string $name
-	 */
-	public function setDefaultPackageName($name) {
-		$GLOBALS['phpDocumentor_DefaultPackageName'] = trim($name);
-	}
-	
-	/**
-	 * Sets the default category name.
-	 *
-	 * This method exists as a hack because there is no API exposed for this in PhpDocumentor.
-	 * Note that because we are setting a "private" GLOBAL(!!) config var with this value, this
-	 * is subject to break if PhpDocumentor internals changes.  
-	 * 
-	 * @param string $name
-	 */
-	public function setDefaultCategoryName($name) {
-		$GLOBALS['phpDocumentor_DefaultCategoryName'] = trim($name);
-	}
-	
-	/**
-	 * Enables quiet mode.
-	 *
-	 * This method exists as a hack because the API exposed for this method in PhpDocumentor
-	 * doesn't work correctly.
-	 * 
-	 * Note that because we are setting a "private" GLOBAL(!!) config var with this value, this
-	 * is subject to break if PhpDocumentor internals changes.  
-	 * 
-	 */
-	public function setQuietMode() {
-		global $_phpDocumentor_setting;
-		$_phpDocumentor_setting['quiet'] = true;
-		parent::setQuietMode();
-	}
-
-    /**
-     * Control whether or not warnings will be shown for undocumented elements.
-     * Useful for identifying classes and methods that haven't yet been
-     * documented.
-     * 
-     * @param  bool  $bEnable 
-     */
-    public function setUndocumentedelements($bEnable) {
-        $this->render->setUndocumentedElementWarningsMode($bEnable);
-    }
-
-    /**
-     * custom tags, will be recognized and put in tags[] instead of
-     * unknowntags[]
-     *
-     * This method exists as a hack because the API exposed for this method in
-     * PhpDocumentor doesn't work correctly.
-	 * 
-     * Note that because we are setting a "private" GLOBAL(!!) config var with
-     * this value, this is subject to break if PhpDocumentor internals changes.
-     * 
-     * @param  string  $sCustomtags 
-     */
-    public function setCustomtags($sCustomtags) {
-        global $_phpDocumentor_setting;
-        $_phpDocumentor_setting['customtags'] = $sCustomtags;
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpdoc/PhpDocumentorExternalTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpdoc/PhpDocumentorExternalTask.php
deleted file mode 100755
index e01e80bba..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpdoc/PhpDocumentorExternalTask.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<?php
-
-/**
- * $Id: PhpDocumentorExternalTask.php 352 2008-02-06 15:26:43Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/tasks/ext/phpdoc/PhpDocumentorTask.php';
-
-/**
- * Task to run phpDocumentor with an external process
- * 
- * This classes uses the commandline phpdoc script to build documentation.
- * Use this task instead of the PhpDocumentorTask when you've a clash with the
- * Smarty libraries.
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @author Markus Fischer <markus@fischer.name>
- * @version $Id: PhpDocumentorExternalTask.php 352 2008-02-06 15:26:43Z mrook $
- * @package phing.tasks.ext.phpdoc
- */	
-class PhpDocumentorExternalTask extends PhpDocumentorTask
-{
-	/**
-	 * The path to the executable for phpDocumentor
-	 */
-	protected $programPath = 'phpdoc';
-
-	protected $sourcepath = NULL;
-
-    /**
-     * @var bool  ignore symlinks to other files or directories
-     */
-    protected $ignoresymlinks = false;
-
-	/**
-	 * Sets the path to the phpDocumentor executable
-	 */
-	public function setProgramPath($programPath)
-	{
-		$this->programPath = $programPath;
-	}
-
-	/**
-	 * Returns the path to the phpDocumentor executable
-	 */
-	public function getProgramPath()
-	{
-		return $this->programPath;
-	}
-
-	/**
-     * Set the source path. A directory or a comma separate list of directories.
-	 */
-	public function setSourcepath($sourcepath)
-	{
-        $this->sourcepath = $sourcepath;
-	}
-
-    /**
-     * Ignore symlinks to other files or directories.
-     * 
-     * @param  bool  $bSet 
-     */
-    public function setIgnoresymlinks($bSet) {
-        $this->ignoresymlinks = $bSet;
-    }
-
-	/**
-	 * Main entrypoint of the task
-	 */
-	public function main()
-	{
-        $this->validate();
-		$arguments = join(' ', $this->constructArguments());
-
-		$this->log("Running phpDocumentor...");
-
-		exec($this->programPath . " " . $arguments, $output, $return);
-
-		if ($return != 0)
-		{
-			throw new BuildException("Could not execute phpDocumentor: " . implode(' ', $output));
-		}
-		
-		foreach($output as $line)
-		{
-			if(strpos($line, 'ERROR') !== false)
-			{
-				$this->log($line, Project::MSG_ERR);
-				continue;
-			}
-			
-			$this->log($line, Project::MSG_VERBOSE);
-		}
-	}
-
-	/**
-	 * Constructs an argument string for phpDocumentor
-     * @return  array
-	 */
-	protected function constructArguments()
-	{
-        $aArgs = array();
-		if ($this->title)
-		{
-			$aArgs[] = '--title "' . $this->title . '"';
-		}
-
-		if ($this->destdir)
-		{
-			$aArgs[] = '--target "' . $this->destdir->getAbsolutePath() . '"';
-		}
-
-		if ($this->sourcepath)
-		{
-			$aArgs[] = '--directory "' . $this->sourcepath . '"';
-		}
-
-		if ($this->output)
-		{
-			$aArgs[] = '--output ' . $this->output;
-		}
-
-		if ($this->linksource)
-		{
-			$aArgs[] = '--sourcecode on';
-		}
-
-		if ($this->parseprivate)
-		{
-			$aArgs[] = '--parseprivate on';
-		}
-
-		// append any files in filesets
-		$filesToParse = array();
-		foreach($this->filesets as $fs) {		    
-	        $files = $fs->getDirectoryScanner($this->project)->getIncludedFiles();
-	        foreach($files as $filename) {
-	        	 $f = new PhingFile($fs->getDir($this->project), $filename);
-	        	 $filesToParse[] = $f->getAbsolutePath();
-	        }
-		}
-        if (count($filesToParse) > 0) {
-            $aArgs[] = '--filename "' . join(',', $filesToParse) . '"';
-        }
-
-		// append any files in filesets
-		$ricFiles = array();
-		foreach($this->projDocFilesets as $fs) {		    
-	        $files = $fs->getDirectoryScanner($this->project)->getIncludedFiles();
-	        foreach($files as $filename) {
-	        	 $f = new PhingFile($fs->getDir($this->project), $filename);
-	        	 $ricFiles[] = $f->getAbsolutePath();
-	        }
-		}
-        if (count($ricFiles) > 0) {
-            $aArgs[] = '--readmeinstallchangelog "' .
-                join(',', $ricFiles) . '"';
-        }
-
-        if ($this->javadocDesc) {
-            $aArgs[] = '--javadocdesc on';
-        }
-
-        if ($this->quiet) {
-            $aArgs[] = '--quiet on';
-        }
-
-        if ($this->packages) {
-            $aArgs[] = '--packageoutput "' . $this->packages . '"';
-        }
-
-        if ($this->ignoreTags) {
-            $aArgs[] = '--ignore-tags "' . $this->ignoreTags . '"';
-        }
-
-        if ($this->defaultCategoryName) {
-            $aArgs[] = '--defaultcategoryname "' . $this->defaultCategoryName .
-                '"';
-        }
-
-		if ($this->examplesDir) {
-            $aArgs[] = '--examplesdir "' . $this->examplesDir->getAbsolutePath()
-                . '"';
-		}
-
-		if ($this->templateBase) {
-            $aArgs[] = '--templatebase "' . $this->templateBase->getAbsolutePath()
-                . '"';
-		}
-
-        if ($this->pear) {
-            $aArgs[] = '--pear on';
-        }
-
-        if ($this->undocumentedelements) {
-            $aArgs[] = '--undocumentedelements on';
-        }
-
-        if ($this->customtags) {
-            $aArgs[] = '--customtags "' . $this->customtags . '"';
-        }
-
-        if ($this->ignoresymlinks) {
-            $aArgs[] = '--ignoresymlinks on';
-        }
-
-        var_dump($aArgs);exit;
-        return $aArgs;
-	}
-
-    /**
-     * Override PhpDocumentorTask::init() because they're specific to the phpdoc
-     * API which we don't use.
-     */
-    public function init() {
-    }
-
-    /**
-     * Validates that necessary minimum options have been set. Based on
-     * PhpDocumentorTask::validate().
-     */
-    protected function validate() {
-		if (!$this->destdir) {
-            throw new BuildException("You must specify a destdir for phpdoc.",
-                $this->getLocation());
-		}
-		if (!$this->output) {
-            throw new BuildException("You must specify an output format for " .
-                "phpdoc (e.g. HTML:frames:default).", $this->getLocation());
-		}
-		if (empty($this->filesets) && !$this->sourcepath) {
-            throw new BuildException("You have not specified any files to " .
-                "include (<fileset> or sourcepath attribute) for phpdoc.",
-                    $this->getLocation());
-		}
-        if ($this->configdir) {
-            $this->log('Ignoring unsupported configdir-Attribute',
-                Project::MSG_VERBOSE);
-        }
-    }
-};
-
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpdoc/PhpDocumentorTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpdoc/PhpDocumentorTask.php
deleted file mode 100755
index d5f7786bc..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpdoc/PhpDocumentorTask.php
+++ /dev/null
@@ -1,460 +0,0 @@
-<?php
-
-/**
- * $Id: PHPDocumentorTask.php 144 2007-02-05 15:19:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-
-/**
- * Task to run PhpDocumentor.
- *
- * @author Hans Lellelid <hans@xmpl.org>
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id$
- * @package phing.tasks.ext.phpdoc
- */	
-class PhpDocumentorTask extends Task
-{
-	
-	/**
-	 * @var string Title for browser window / package index.
-	 */
-	protected $title;
-	
-	/**
-	 * @var PhingFile The target directory for output files.
-	 */
-	protected $destdir;
-
-	/**
-	 * @var array FileSet[] Filesets for files to parse.
-	 */
-	protected $filesets = array();
-	
-	/**
-	 * @var array FileSet[] Project documentation (README/INSTALL/CHANGELOG) files.
-	 */
-	protected $projDocFilesets = array();
-	
-	/**
-	 * @var string Package output format. 
-	 */
-	protected $output;
-
-	/**
-	 * @var boolean Whether to generate sourcecode for each file parsed.
-	 */
-	protected $linksource = false;
-	
-	/**
-	 * @var boolean Whether to parse private members.
-	 */
-	protected $parsePrivate = false;
-	
-	/**
-	 * @var boolean Whether to use javadoc descriptions (more primitive).
-	 */
-	protected $javadocDesc = false;
-	
-	/**
-	 * @var PhingFile Base directory for locating template files.
-	 */
-	protected $templateBase;
-	
-	/**
-	 * @var boolean Wheter to suppress output.
-	 */
-	protected $quiet = false;
-	
-	/**
-	 * @var string Comma-separated list of packages to output.
-	 */
-	protected $packages;
-	
-	/** 
-	 * @var string Comma-separated list of tags to ignore.
-	 */
-	protected $ignoreTags;
-	
-	/** 
-	 * @var string Default package name.
-	 */
-	protected $defaultPackageName;
-	
-	/**
-	 * @var string Default category name.
-	 */
-	protected $defaultCategoryName;
-	
-	/**
-	 * @var PhingFile Directory in which to look for examples.
-	 */
-	protected $examplesDir;
-	
-	/**
-	 * @var PhingFile Directory in which to look for configuration files.
-	 */
-	protected $configDir;
-	
-	/**
-	 * @var boolean Whether to parse as a PEAR repository.
-	 */
-	protected $pear = false;
-
-    /**
-     * @var boolean Control whether or not warnings will be shown for
-     *              undocumented elements. Useful for identifying classes and
-     *              methods that haven't yet been documented.
-     */
-    protected $undocumentedelements = false;
-
-    /**
-     * @var string  custom tags, will be recognized and put in tags[] instead of
-     *              unknowntags[].
-     */
-    protected $customtags = '';
-	
-	/**
-	 * Set the title for the generated documentation
-	 */
-	public function setTitle($title) {
-		$this->title = $title;
-	}
-
-	/**
-	 * Set the destination directory for the generated documentation
-	 */
-	public function setDestdir(PhingFile $destdir) {
-		$this->destdir = $destdir;
-	}
-	
-	/**
-	 * Alias for {@link setDestdir()).
-	 * @see setDestdir()
-	 */
-	public function setTarget(PhingFile $destdir) {
-		$this->setDestdir($destdir);
-	}
-
-	/**
-	 * Set the output format (e.g. HTML:Smarty:PHP).
-	 * @param string $output
-	 */		
-	public function setOutput($output) {
-		$this->output = $output;
-	}
-
-	/**
-	 * Set whether to generate sourcecode for each file parsed
-	 * @param boolean
-	 */
-	public function setSourcecode($b) {
-		$this->linksource = $b;
-	}
-	
-	/**
-	 * Set whether to suppress output.
-	 * @param boolean $b
-	 */
-	public function setQuiet($b) {
-		$this->quiet = $b;
-	}
-	
-	/**
-	 * Should private members/classes be documented
-	 * @param boolean
-	 */
-	public function setParseprivate($parseprivate) {
-		$this->parsePrivate = $parseprivate;
-	}
-	
-	/**
-	 * Whether to use javadoc descriptions (more primitive).
-	 * @param boolean
-	 */
-	public function setJavadocdesc($javadoc) {
-		$this->javadocDesc = $javadoc;
-	}
-	
-	/**
-	 * Set (comma-separated) list of packages to output.
-	 *
-	 * @param string $packages
-	 */
-	public function setPackageoutput($packages) {
-		$this->packages = $packages;
-	}
-	
-	/**
-	 * Set (comma-separated) list of tags to ignore.
-	 *
-	 * @param string $tags
-	 */
-	public function setIgnoretags($tags) {
-		$this->ignoreTags = $tags;
-	}
-	
-	/**
-	 * Set a directory to search for examples in.
-	 * @param PhingFile $d
-	 */
-	public function setExamplesdir(PhingFile $d) {
-		$this->examplesDir = $d;
-	}
-	
-	/**
-	 * Set a directory to search for configuration files in.
-	 * @param PhingFile $d
-	 */
-	public function setConfigdir(PhingFile $d) {
-		$this->configDir = $d;
-	}
-	
-	/**
-	 * Sets the default package name.
-	 * @param string $name
-	 */
-	public function setDefaultpackagename($name) {
-		$this->defaultPackageName = $name;
-	}
-	
-	/**
-	 * Sets the default category name.
-	 * @param string $name
-	 */
-	public function setDefaultcategoryname($name) {
-		$this->defaultCategoryName = $name;
-	}
-	
-	/**
-	 * Set whether to parse as PEAR repository.
-	 * @param boolean $b
-	 */
-	public function setPear($b) {
-		$this->pear = $b;
-	}
-	
-    /**
-	 * Creates a FileSet.
-	 * @return FileSet
-	 */
-    public function createFileset() {
-        $num = array_push($this->filesets, new FileSet());
-        return $this->filesets[$num-1];
-    }
-    
-    /**
-     * Creates a readme/install/changelog fileset.
-     * @return FileSet
-     */
-    public function createProjdocfileset() {
-    	$num = array_push($this->projDocFilesets, new FileSet());
-        return $this->projDocFilesets[$num-1];
-    }
- 	
-	/**
-     * Control whether or not warnings will be shown for undocumented elements.
-     * Useful for identifying classes and methods that haven't yet been
-     * documented.
-	 * @param boolean $b
-	 */
-	public function setUndocumentedelements($b) {
-		$this->undocumentedelements = $b;
-	}
-
-    /**
-     * custom tags, will be recognized and put in tags[] instead of
-     * unknowntags[].
-     * 
-     * @param  string  $sCustomtags 
-     */
-    public function setCustomtags($sCustomtags) {
-        $this->customtags = $sCustomtags;
-    }
-
-	/**
-	 * Set base location of all templates for this parse.
-	 * 
-	 * @param  PhingFile  $destdir 
-	 */
-	public function setTemplateBase(PhingFile $oTemplateBase) {
-		$this->templateBase = $oTemplateBase;
-	}
-
-    /**
-     * Searches include_path for PhpDocumentor install and adjusts include_path appropriately.
-     * @throws BuildException - if unable to find PhpDocumentor on include_path
-     */
-    protected function findPhpDocumentorInstall()
-    {
-    	$found = null;
-    	foreach(explode(PATH_SEPARATOR, get_include_path()) as $path) {
-    		$testpath = $path . DIRECTORY_SEPARATOR . 'PhpDocumentor';
-    		if (file_exists($testpath)) {
-    			$found = $testpath;
-    			break;
-    		}
-    	}
-    	if (!$found) {
-    		throw new BuildException("PhpDocumentor task depends on PhpDocumentor being installed and on include_path.", $this->getLocation());
-    	}
-    	// otherwise, adjust the include_path to path to include the PhpDocumentor directory ... 
-		set_include_path(get_include_path() . PATH_SEPARATOR . $found);
-		include_once ("phpDocumentor/Setup.inc.php");
-		if (!class_exists('phpDocumentor_setup')) {
-			throw new BuildException("Error including PhpDocumentor setup class file.");
-		}
-    }
-    
-	/**
-	 * Load the necessary environment for running PhpDoc.
-	 *
-	 * @throws BuildException - if the phpdoc classes can't be loaded.
-	 */
-	public function init()
-	{
-		$this->findPhpDocumentorInstall();
-        include_once 'phing/tasks/ext/phpdoc/PhingPhpDocumentorSetup.php';
-	}
-	
-	/**
-	 * Main entrypoint of the task
-	 */
-	function main()
-	{
-		$this->validate();
-		$configdir = $this->configDir ? $this->configDir->getAbsolutePath() : null;
-		$phpdoc = new PhingPhpDocumentorSetup($configdir);
-		$this->setPhpDocumentorOptions($phpdoc);
-		//$phpdoc->readCommandLineSettings();
-		$phpdoc->setupConverters($this->output);
-		$phpdoc->createDocs();		
-	}
-	
-	/**
-	 * Validates that necessary minimum options have been set.
-	 * @throws BuildException if validation doesn't pass
-	 */
-	protected function validate()
-	{
-		if (!$this->destdir) {
-			throw new BuildException("You must specify a destdir for phpdoc.", $this->getLocation());
-		}
-		if (!$this->output) {
-			throw new BuildException("You must specify an output format for phpdoc (e.g. HTML:frames:default).", $this->getLocation());
-		}
-		if (empty($this->filesets)) {
-			throw new BuildException("You have not specified any files to include (<fileset>) for phpdoc.", $this->getLocation());
-		}
-	}
-	
-	/**
-	 * Sets the options on the passed-in phpdoc setup object.
-	 * @param PhingPhpDocumentorSetup $phpdoc
-	 */
-	protected function setPhpDocumentorOptions(PhingPhpDocumentorSetup $phpdoc)
-	{
-		
-		// Title MUST be set first ... (because it re-initializes the internal state of the PhpDocu renderer)
-		if ($this->title) {
-			$phpdoc->setTitle($this->title);
-		}
-		
-		if ($this->parsePrivate) {
-			$phpdoc->setParsePrivate();
-		}
-		
-		if ($this->javadocDesc) {
-			$phpdoc->setJavadocDesc();
-		}
-		
-		if ($this->quiet) {
-			$phpdoc->setQuietMode();
-		}
-		
-		if ($this->destdir) {
-			$phpdoc->setTargetDir($this->destdir->getAbsolutePath());
-		}
-				
-		if ($this->packages) {
-			$phpdoc->setPackageOutput($this->packages);
-		}
-		
-		if ($this->templateBase) {
-			$phpdoc->setTemplateBase($this->templateBase->getAbsolutePath());
-		}
-		
-		if ($this->linksource) {
-			$phpdoc->setGenerateSourcecode($this->linksource);
-		}
-		
-		if ($this->examplesDir) {
-			$phpdoc->setExamplesDir($this->examplesDir->getAbsolutePath());
-		}
-		
-		if ($this->ignoreTags) {
-			$phpdoc->setIgnoreTags($this->ignoreTags);
-		}
-		
-		if ($this->defaultPackageName) {
-			$phpdoc->setDefaultPackageName($this->defaultPackageName);
-		}
-		
-		if ($this->defaultCategoryName) {
-			$phpdoc->setDefaultCategoryName($this->defaultCategoryName);
-		}
-		
-		if ($this->pear) {
-			$phpdoc->setPear($this->pear);
-		}
-		
-		// append any files in filesets
-		$filesToParse = array();
-		foreach($this->filesets as $fs) {		    
-	        $files = $fs->getDirectoryScanner($this->project)->getIncludedFiles();
-	        foreach($files as $filename) {
-	        	 $f = new PhingFile($fs->getDir($this->project), $filename);
-	        	 $filesToParse[] = $f->getAbsolutePath();
-	        }
-		}
-		//print_r(implode(",", $filesToParse));
-		$phpdoc->setFilesToParse(implode(",", $filesToParse));
-		
-		
-		// append any files in filesets
-		$ricFiles = array();
-		foreach($this->projDocFilesets as $fs) {		    
-	        $files = $fs->getDirectoryScanner($this->project)->getIncludedFiles();
-	        foreach($files as $filename) {
-	        	 $f = new PhingFile($fs->getDir($this->project), $filename);
-	        	 $ricFiles[] = $f->getAbsolutePath();
-	        }
-		}
-		$phpdoc->setRicFiles($ricFiles);
-
-        if ($this->undocumentedelements) {
-            $phpdoc->setUndocumentedelements($this->undocumentedelements);
-        }
-
-        if ($this->customtags) {
-            $phpdoc->setCustomtags($this->customtags);
-        }
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/BatchTest.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/BatchTest.php
deleted file mode 100755
index d56746d30..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/BatchTest.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-/**
- * $Id: BatchTest.php 350 2008-02-06 15:06:57Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/types/FileSet.php';
-
-/**
- * Scans a list of files given by the fileset attribute, extracts
- * all subclasses of PHPUnit(2)_Framework_TestCase / PHPUnit(2)_Framework_TestSuite.
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: BatchTest.php 350 2008-02-06 15:06:57Z mrook $
- * @package phing.tasks.ext.phpunit
- * @since 2.1.0
- */
-class BatchTest
-{
-	/** the list of filesets containing the testcase filename rules */
-	private $filesets = array();
-
-	/** the reference to the project */
-	private $project = NULL;
-
-	/** the classpath to use with Phing::__import() calls */
-	private $classpath = NULL;
-	
-	/** names of classes to exclude */
-	private $excludeClasses = array();
-	
-	/**
-	 * Create a new batchtest instance
-	 *
-	 * @param Project the project it depends on.
-	 */
-	function __construct(Project $project)
-	{
-		$this->project = $project;
-	}
-	
-	/**
-	 * Sets the classes to exclude
-	 */
-	function setExclude($exclude)
-	{
-		$this->excludeClasses = explode(" ", $exclude);
-	}
-
-	/**
-	 * Sets the classpath
-	 */
-	function setClasspath(Path $classpath)
-	{
-		if ($this->classpath === null)
-		{
-			$this->classpath = $classpath;
-		}
-		else
-		{
-			$this->classpath->append($classpath);
-		}
-	}
-
-	/**
-	 * Creates a new Path object
-	 */
-	function createClasspath()
-	{
-		$this->classpath = new Path();
-		return $this->classpath;
-	}
-
-	/**
-	 * Returns the classpath
-	 */
-	function getClasspath()
-	{
-		return $this->classpath;
-	}
-
-	/**
-	 * Add a new fileset containing the XML results to aggregate
-	 *
-	 * @param FileSet the new fileset containing XML results.
-	 */
-	function addFileSet(FileSet $fileset)
-	{
-		$this->filesets[] = $fileset;
-	}
-
-	/**
-	 * Iterate over all filesets and return the filename of all files.
-	 *
-	 * @return array an array of filenames
-	 */
-	private function getFilenames()
-	{
-		$filenames = array();
-
-		foreach ($this->filesets as $fileset)
-		{
-			$ds = $fileset->getDirectoryScanner($this->project);
-			$ds->scan();
-
-			$files = $ds->getIncludedFiles();
-
-			foreach ($files as $file)
-			{
-				$filenames[] = $ds->getBaseDir() . "/" . $file;
-			}
-		}
-
-		return $filenames;
-	}
-	
-	/**
-	 * Checks wheter $input is a subclass of PHPUnit(2)_Framework_TestCasse
-	 * or PHPUnit(2)_Framework_TestSuite
-	 */
-	private function isTestCase($input)
-	{
-		if (PHPUnitUtil::$installedVersion == 3)
-			return is_subclass_of($input, 'PHPUnit_Framework_TestCase') || is_subclass_of($input, 'PHPUnit_Framework_TestSuite');
-		else
-			return is_subclass_of($input, 'PHPUnit2_Framework_TestCase') || is_subclass_of($input, 'PHPUnit2_Framework_TestSuite');
-	}
-	
-	/**
-	 * Filters an array of classes, removes all classes that are not test cases or test suites,
-	 * or classes that are declared abstract
-	 */
-	private function filterTests($input)
-	{
-		$reflect = new ReflectionClass($input);
-		
-		return $this->isTestCase($input) && (!$reflect->isAbstract());
-	}
-
-	/**
-	 * Returns an array of test cases and test suites that are declared
-	 * by the files included by the filesets
-	 *
-	 * @return array an array of PHPUnit(2)_Framework_TestCase or PHPUnit(2)_Framework_TestSuite classes.
-	 */
-	function elements()
-	{
-		$filenames = $this->getFilenames();
-		
-		$declaredClasses = array();		
-
-		foreach ($filenames as $filename)
-		{
-			$definedClasses = PHPUnitUtil::getDefinedClasses($filename, $this->classpath);
-			
-			foreach($definedClasses as $definedClass) {
-				$this->project->log("(PHPUnit) Adding $definedClass (from $filename) to tests.", Project::MSG_DEBUG);
-			}
-			
-			$declaredClasses = array_merge($declaredClasses, $definedClasses);
-		}
-		
-		$elements = array_filter($declaredClasses, array($this, "filterTests"));
-
-		return $elements;
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/FormatterElement.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/FormatterElement.php
deleted file mode 100755
index def943b15..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/FormatterElement.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-/**
- * $Id: FormatterElement.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/system/io/PhingFile.php';
-
-/**
- * A wrapper for the implementations of PHPUnit2ResultFormatter.
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: FormatterElement.php 325 2007-12-20 15:44:58Z hans $
- * @package phing.tasks.ext.phpunit
- * @since 2.1.0
- */
-class FormatterElement
-{
-	protected $formatter = NULL;
-	
-	protected $type = "";
-	
-	protected $useFile = true;
-	
-	protected $toDir = ".";
-	
-	protected $outfile = "";
-
-	function setType($type)
-	{
-		$this->type = $type;
-		
-		if ($this->type == "summary")
-		{
-			if (PHPUnitUtil::$installedVersion == 3)
-			{
-				require_once 'phing/tasks/ext/phpunit/phpunit3/SummaryPHPUnit3ResultFormatter.php';
-				$this->formatter = new SummaryPHPUnit3ResultFormatter();
-			}
-			else			
-			{
-				require_once 'phing/tasks/ext/phpunit/phpunit2/SummaryPHPUnit2ResultFormatter.php';
-				$this->formatter = new SummaryPHPUnit2ResultFormatter();
-			}
-		}
-		else
-		if ($this->type == "xml")
-		{
-			$destFile = new PhingFile($this->toDir, 'testsuites.xml');
-
-			if (PHPUnitUtil::$installedVersion == 3)
-			{
-				require_once 'phing/tasks/ext/phpunit/phpunit3/XMLPHPUnit3ResultFormatter.php';
-				$this->formatter = new XMLPHPUnit3ResultFormatter();
-			}
-			else
-			{
-				require_once 'phing/tasks/ext/phpunit/phpunit2/XMLPHPUnit2ResultFormatter.php';
-				$this->formatter = new XMLPHPUnit2ResultFormatter();
-			}
-		}
-		else
-		if ($this->type == "plain")
-		{
-			if (PHPUnitUtil::$installedVersion == 3)
-			{
-				require_once 'phing/tasks/ext/phpunit/phpunit3/PlainPHPUnit3ResultFormatter.php';
-				$this->formatter = new PlainPHPUnit3ResultFormatter();
-			}
-			else
-			{
-				require_once 'phing/tasks/ext/phpunit/phpunit2/PlainPHPUnit2ResultFormatter.php';
-				$this->formatter = new PlainPHPUnit2ResultFormatter();
-			}
-		}
-		else
-		{
-			throw new BuildException("Formatter '" . $this->type . "' not implemented");
-		}
-	}
-
-	function setClassName($className)
-	{
-		$classNameNoDot = Phing::import($className);
-
-		$this->formatter = new $classNameNoDot();
-	}
-
-	function setUseFile($useFile)
-	{
-		$this->useFile = $useFile;
-	}
-	
-	function getUseFile()
-	{
-		return $this->useFile;
-	}
-	
-	function setToDir($toDir)
-	{
-		$this->toDir = $toDir;
-	}
-	
-	function getToDir()
-	{
-		return $this->toDir;
-	}
-
-	function setOutfile($outfile)
-	{
-		$this->outfile = $outfile;
-	}
-	
-	function getOutfile()
-	{
-		if ($this->outfile)
-		{
-			return $this->outfile;
-		}
-		else
-		{
-			return $this->formatter->getPreferredOutfile() . $this->getExtension();
-		}
-	}
-	
-	function getExtension()
-	{
-		return $this->formatter->getExtension();
-	}
-
-	function getFormatter()
-	{
-		return $this->formatter;
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/PHPUnitReportTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/PHPUnitReportTask.php
deleted file mode 100755
index 09de2184c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/PHPUnitReportTask.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-/**
- * $Id: PHPUnitReportTask.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-require_once 'phing/system/io/PhingFile.php';
-require_once 'phing/system/io/FileWriter.php';
-require_once 'phing/util/ExtendedFileStream.php';
-
-/**
- * Transform a PHPUnit2 xml report using XSLT.
- * This transformation generates an html report in either framed or non-framed
- * style. The non-framed style is convenient to have a concise report via mail, 
- * the framed report is much more convenient if you want to browse into 
- * different packages or testcases since it is a Javadoc like report.
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: PHPUnitReportTask.php 325 2007-12-20 15:44:58Z hans $
- * @package phing.tasks.ext.phpunit
- * @since 2.1.0
- */
-class PHPUnitReportTask extends Task
-{
-	private $format = "noframes";
-	private $styleDir = "";
-	private $toDir = "";
-
-	/** the directory where the results XML can be found */
-	private $inFile = "testsuites.xml";
-
-	/**
-	 * Set the filename of the XML results file to use.
-	 */
-	function setInFile($inFile)
-	{
-		$this->inFile = $inFile;
-	}
-
-	/**
-	 * Set the format of the generated report. Must be noframes or frames.
-	 */
-	function setFormat($format)
-	{
-		$this->format = $format;
-	}
-
-	/**
-	 * Set the directory where the stylesheets are located.
-	 */
-	function setStyleDir($styleDir)
-	{
-		$this->styleDir = $styleDir;
-	}
-
-	/**
-	 * Set the directory where the files resulting from the 
-	 * transformation should be written to.
-	 */
-	function setToDir($toDir)
-	{
-		$this->toDir = $toDir;
-	}
-	
-	/**
-	 * Returns the path to the XSL stylesheet
-	 */
-	private function getStyleSheet()
-	{
-		$xslname = "phpunit2-" . $this->format . ".xsl";
-
-		if ($this->styleDir)
-		{
-			$file = new PhingFile($this->styleDir, $xslname);
-		}
-		else
-		{
-			$path = Phing::getResourcePath("phing/etc/$xslname");
-			
-			if ($path === NULL)
-			{
-				$path = Phing::getResourcePath("etc/$xslname");
-
-				if ($path === NULL)
-				{
-					throw new BuildException("Could not find $xslname in resource path");
-				}
-			}
-			
-			$file = new PhingFile($path);
-		}
-
-		if (!$file->exists())
-		{
-			throw new BuildException("Could not find file " . $file->getPath());
-		}
-
-		return $file;
-	}
-	
-	/**
-	 * Transforms the DOM document
-	 */
-	private function transform(DOMDocument $document)
-	{
-		$dir = new PhingFile($this->toDir);
-		
-		if (!$dir->exists())
-		{
-			throw new BuildException("Directory '" . $this->toDir . "' does not exist");
-		}
-		
-		$xslfile = $this->getStyleSheet();
-
-		$xsl = new DOMDocument();
-		$xsl->load($xslfile->getAbsolutePath());
-
-		$proc = new XSLTProcessor();
-		$proc->importStyleSheet($xsl);
-
-		if ($this->format == "noframes")
-		{
-			$writer = new FileWriter(new PhingFile($this->toDir, "phpunit2-noframes.html"));
-			$writer->write($proc->transformToXML($document));
-			$writer->close();
-		}
-		else
-		{
-			ExtendedFileStream::registerStream();
-
-			// no output for the framed report
-			// it's all done by extension...
-			$dir = new PhingFile($this->toDir);
-			$proc->setParameter('', 'output.dir', $dir->getAbsolutePath());
-			$proc->transformToXML($document);
-		}
-	}
-	
-	/**
-	 * Fixes 'testsuite' elements with no package attribute, adds
-	 * package="default" to those elements.
-	 */
-	private function fixPackages(DOMDocument $document)
-	{
-		$testsuites = $document->getElementsByTagName('testsuite');
-		
-		foreach ($testsuites as $testsuite)
-		{
-			if (!$testsuite->hasAttribute('package'))
-			{
-				$testsuite->setAttribute('package', 'default');
-			}
-		}
-	}
-
-	/**
-	 * The main entry point
-	 *
-	 * @throws BuildException
-	 */
-	public function main()
-	{
-		$testSuitesDoc = new DOMDocument();
-		$testSuitesDoc->load($this->inFile);
-		
-		$this->fixPackages($testSuitesDoc);
-		
-		$this->transform($testSuitesDoc);
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/PHPUnitTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/PHPUnitTask.php
deleted file mode 100755
index 1a5c5f480..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/PHPUnitTask.php
+++ /dev/null
@@ -1,390 +0,0 @@
-<?php
-/**
- * $Id: PHPUnitTask.php 427 2008-10-28 19:34:15Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-require_once 'phing/system/io/PhingFile.php';
-require_once 'phing/system/io/Writer.php';
-require_once 'phing/util/LogWriter.php';
-
-/**
- * Runs PHPUnit2/3 tests.
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: PHPUnitTask.php 427 2008-10-28 19:34:15Z mrook $
- * @package phing.tasks.ext.phpunit
- * @see BatchTest
- * @since 2.1.0
- */
-class PHPUnitTask extends Task
-{
-	private $batchtests = array();
-	private $formatters = array();
-	private $haltonerror = false;
-	private $haltonfailure = false;
-	private $haltonincomplete = false;
-	private $haltonskipped = false;
-	private $errorproperty;
-	private $failureproperty;
-	private $incompleteproperty;
-	private $skippedproperty;
-	private $printsummary = false;
-	private $testfailed = false;
-	private $codecoverage = false;
-	private $groups = array();
-	private $excludeGroups = array();
-
-	/**
-	 * Initialize Task.
- 	 * This method includes any necessary PHPUnit2 libraries and triggers
-	 * appropriate error if they cannot be found.  This is not done in header
-	 * because we may want this class to be loaded w/o triggering an error.
-	 */
-	function init() {
-		if (version_compare(PHP_VERSION, '5.0.3') < 0) {
-		    throw new BuildException("PHPUnit2Task requires PHP version >= 5.0.3.", $this->getLocation());
-		}
-		
-		/**
-		 * Determine PHPUnit version number
-		 */
-		@include_once 'PHPUnit/Runner/Version.php';
-		@include_once 'PHPUnit2/Runner/Version.php';
-
-		if (class_exists('PHPUnit_Runner_Version'))
-		{
-			$version = PHPUnit_Runner_Version::id();
-		}
-		elseif (class_exists('PHPUnit2_Runner_Version'))
-		{
-			$version = PHPUnit2_Runner_Version::id();
-		}
-		else
-		{
-			throw new BuildException("PHPUnit task depends on PHPUnit 2 or 3 package being installed.", $this->getLocation());
-		}
-		
-		if (version_compare($version, "3.0.0") >= 0)
-		{
-			PHPUnitUtil::$installedVersion = 3;
-			if (version_compare($version, "3.2.0") >= 0)
-			{
-				PHPUnitUtil::$installedMinorVersion = 2;
-			}
-		}
-		else
-		{
-			PHPUnitUtil::$installedVersion = 2;
-		}
-		
-		/**
-		 * Other dependencies that should only be loaded when class is actually used.
-		 */
-		require_once 'phing/tasks/ext/phpunit/PHPUnitTestRunner.php';
-		require_once 'phing/tasks/ext/phpunit/BatchTest.php';
-		require_once 'phing/tasks/ext/phpunit/FormatterElement.php';
-
-		/**
-		 * Add some defaults to the PHPUnit filter
-		 */
-		$pwd = dirname(__FILE__);
-
-		if (PHPUnitUtil::$installedVersion == 3)
-		{
-			require_once 'PHPUnit/Framework.php';
-			require_once 'PHPUnit/Util/Filter.php';
-			
-			// point PHPUnit_MAIN_METHOD define to non-existing method
-			if (!defined('PHPUnit_MAIN_METHOD')) {
-				define('PHPUnit_MAIN_METHOD', 'PHPUnitTask::undefined');
-			}
-			
-			PHPUnit_Util_Filter::addFileToFilter($pwd . '/PHPUnitTask.php', 'PHING');
-			PHPUnit_Util_Filter::addFileToFilter($pwd . '/PHPUnitTestRunner.php', 'PHING');
-			PHPUnit_Util_Filter::addFileToFilter($pwd . '/../../../Task.php', 'PHING');
-			PHPUnit_Util_Filter::addFileToFilter($pwd . '/../../../Target.php', 'PHING');
-			PHPUnit_Util_Filter::addFileToFilter($pwd . '/../../../Project.php', 'PHING');
-			PHPUnit_Util_Filter::addFileToFilter($pwd . '/../../../Phing.php', 'PHING');
-		}
-		else
-		{
-			require_once 'PHPUnit2/Framework.php';
-			require_once 'PHPUnit2/Util/Filter.php';
-			
-			PHPUnit2_Util_Filter::addFileToFilter($pwd . '/PHPUnitTask.php');
-			PHPUnit2_Util_Filter::addFileToFilter($pwd . '/PHPUnitTestRunner.php');
-			PHPUnit2_Util_Filter::addFileToFilter($pwd . '/../../../Task.php');
-			PHPUnit2_Util_Filter::addFileToFilter($pwd . '/../../../Target.php');
-			PHPUnit2_Util_Filter::addFileToFilter($pwd . '/../../../Project.php');
-			PHPUnit2_Util_Filter::addFileToFilter($pwd . '/../../../Phing.php');
-		}
-	}
-	
-	function setErrorproperty($value)
-	{
-		$this->errorproperty = $value;
-	}
-	
-	function setFailureproperty($value)
-	{
-		$this->failureproperty = $value;
-	}
-	
-	function setIncompleteproperty($value)
-	{
-		$this->incompleteproperty = $value;
-	}
-	
-	function setSkippedproperty($value)
-	{
-		$this->skippedproperty = $value;
-	}
-	
-	function setHaltonerror($value)
-	{
-		$this->haltonerror = $value;
-	}
-
-	function setHaltonfailure($value)
-	{
-		$this->haltonfailure = $value;
-	}
-
-	function setHaltonincomplete($value)
-	{
-		$this->haltonincomplete = $value;
-	}
-
-	function setHaltonskipped($value)
-	{
-		$this->haltonskipped = $value;
-	}
-
-	function setPrintsummary($printsummary)
-	{
-		$this->printsummary = $printsummary;
-	}
-	
-	function setCodecoverage($codecoverage)
-	{
-		$this->codecoverage = $codecoverage;
-	}
-
-	function setGroups($groups)
-	{
-		if (PHPUnitUtil::$installedVersion < 3 || (PHPUnitUtil::$installedVersion == 3 && PHPUnitUtil::$installedMinorVersion < 2))
-		{
-			$this->log("The 'groups' attribute is only available with PHPUnit 3.2.0 or newer", Project::MSG_WARN);
-		}
-		$token = ' ,;';
-		$this->groups = array();
-		$tok = strtok($groups, $token);
-		while ($tok !== false) {
-			$this->groups[] = $tok;
-			$tok = strtok($token);
-		}
-	}
-
-	function setExcludeGroups($excludeGroups)
-	{
-		if (PHPUnitUtil::$installedVersion < 3 || (PHPUnitUtil::$installedVersion == 3 && PHPUnitUtil::$installedMinorVersion < 2))
-		{
-			$this->log("The 'excludeGroups' attribute is only available with PHPUnit 3.2.0 or newer", Project::MSG_WARN);
-		}
-		$token = ' ,;';
-		$this->excludeGroups = array();
-		$tok = strtok($groups, $token);
-		while ($tok !== false) {
-			$this->excludeGroups[] = $tok;
-			$tok = strtok($token);
-		}
-	}
-
-	/**
-	 * Add a new formatter to all tests of this task.
-	 *
-	 * @param FormatterElement formatter element
-	 */
-	function addFormatter(FormatterElement $fe)
-	{
-		$this->formatters[] = $fe;
-	}
-
-	/**
-	 * The main entry point
-	 *
-	 * @throws BuildException
-	 */
-	function main()
-	{
-		$tests = array();
-		
-		if ($this->printsummary)
-		{
-			$fe = new FormatterElement();
-			$fe->setType("summary");
-			$fe->setUseFile(false);
-			$this->formatters[] = $fe;
-		}
-		
-		foreach ($this->batchtests as $batchtest)
-		{
-			$tests = array_merge($tests, $batchtest->elements());
-		}			
-		
-		foreach ($this->formatters as $fe)
-		{
-			$formatter = $fe->getFormatter();			
-			$formatter->setProject($this->getProject());
-
-			if ($fe->getUseFile())
-			{
-				$destFile = new PhingFile($fe->getToDir(), $fe->getOutfile());
-				
-				$writer = new FileWriter($destFile->getAbsolutePath());
-
-				$formatter->setOutput($writer);
-			}
-			else
-			{
-				$formatter->setOutput($this->getDefaultOutput());
-			}
-
-			$formatter->startTestRun();
-		}
-		
-		foreach ($tests as $test)
-		{
-			$suite = NULL;
-			
-			if ((PHPUnitUtil::$installedVersion == 3 && is_subclass_of($test, 'PHPUnit_Framework_TestSuite')) || (PHPUnitUtil::$installedVersion == 2 && is_subclass_of($test, 'PHPUnit2_Framework_TestSuite')))
-			{
-				if (is_object($test))
-				{
-					$suite = $test;
-				}
-				else
-				{
-					$suite = new $test();
-				}
-			}
-			else
-			{
-				if (PHPUnitUtil::$installedVersion == 3)
-				{
-					require_once 'PHPUnit/Framework/TestSuite.php';
-					$suite = new PHPUnit_Framework_TestSuite(new ReflectionClass($test));
-				}
-				else
-				{
-					require_once 'PHPUnit2/Framework/TestSuite.php';
-					$suite = new PHPUnit2_Framework_TestSuite(new ReflectionClass($test));
-				}
-			}
-			
-			$this->execute($suite);
-		}
-
-		foreach ($this->formatters as $fe)
-		{
-			$formatter = $fe->getFormatter();
-			$formatter->endTestRun();
-		}
-		
-		if ($this->testfailed)
-		{
-			throw new BuildException("One or more tests failed");
-		}
-	}
-
-	/**
-	 * @throws BuildException
-	 */
-	private function execute($suite)
-	{
-		$runner = new PHPUnitTestRunner($suite, $this->project, $this->groups, $this->excludeGroups);
-		
-		$runner->setCodecoverage($this->codecoverage);
-
-		foreach ($this->formatters as $fe)
-		{
-			$formatter = $fe->getFormatter();
-
-			$runner->addFormatter($formatter);
-		}
-
-		$runner->run();
-
-		$retcode = $runner->getRetCode();
-		
-		if ($retcode == PHPUnitTestRunner::ERRORS) {
-		    if ($this->errorproperty) {
-				$this->project->setNewProperty($this->errorproperty, true);
-			}
-			if ($this->haltonerror) {
-			    $this->testfailed = true;
-			}
-		} elseif ($retcode == PHPUnitTestRunner::FAILURES) {
-			if ($this->failureproperty) {
-				$this->project->setNewProperty($this->failureproperty, true);
-			}
-			
-			if ($this->haltonfailure) {
-				$this->testfailed = true;
-			}
-		} elseif ($retcode == PHPUnitTestRunner::INCOMPLETES) {
-			if ($this->incompleteproperty) {
-				$this->project->setNewProperty($this->incompleteproperty, true);
-			}
-			
-			if ($this->haltonincomplete) {
-				$this->testfailed = true;
-			}
-		} elseif ($retcode == PHPUnitTestRunner::SKIPPED) {
-			if ($this->skippedproperty) {
-				$this->project->setNewProperty($this->skippedproperty, true);
-			}
-			
-			if ($this->haltonskipped) {
-				$this->testfailed = true;
-			}
-		}
-	}
-
-	private function getDefaultOutput()
-	{
-		return new LogWriter($this);
-	}
-
-	/**
-	 * Adds a set of tests based on pattern matching.
-	 *
-	 * @return BatchTest a new instance of a batch test.
-	 */
-	function createBatchTest()
-	{
-		$batchtest = new BatchTest($this->getProject());
-
-		$this->batchtests[] = $batchtest;
-
-		return $batchtest;
-	}
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/PHPUnitTestRunner.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/PHPUnitTestRunner.php
deleted file mode 100755
index 5f8cdee6a..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/PHPUnitTestRunner.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-/**
- * $Id: PHPUnitTestRunner.php 361 2008-03-08 09:36:07Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/tasks/ext/coverage/CoverageMerger.php';
-
-require_once 'phing/system/util/Timer.php';
-
-/**
- * Simple Testrunner for PHPUnit2/3 that runs all tests of a testsuite.
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: PHPUnitTestRunner.php 361 2008-03-08 09:36:07Z mrook $
- * @package phing.tasks.ext.phpunit
- * @since 2.1.0
- */
-class PHPUnitTestRunner
-{
-	const SUCCESS = 0;
-	const FAILURES = 1;
-	const ERRORS = 2;
-	const INCOMPLETES = 3;
-	const SKIPPED = 4;
-
-	private $test = NULL;
-	private $suite = NULL;
-	private $retCode = 0;
-	private $formatters = array();
-	
-	private $codecoverage = false;
-	
-	private $project = NULL;
-
-	private $groups = array();
-	private $excludeGroups = array();
-
-	function __construct($suite, Project $project, $groups = array(), $excludeGroups = array())
-	{
-		$this->suite = $suite;
-		$this->project = $project;
-		$this->groups = $groups;
-		$this->excludeGroups = $excludeGroups;
-		$this->retCode = self::SUCCESS;
-	}
-	
-	function setCodecoverage($codecoverage)
-	{
-		$this->codecoverage = $codecoverage;
-	}
-
-	function addFormatter($formatter)
-	{
-		$this->formatters[] = $formatter;
-	}
-
-	function run()
-	{
-		$res = NULL;
-		
-		if (PHPUnitUtil::$installedVersion == 3)
-		{
-			require_once 'PHPUnit/Framework/TestSuite.php';			
-			$res = new PHPUnit_Framework_TestResult();
-		}
-		else
-		{
-			require_once 'PHPUnit2/Framework/TestSuite.php';
-			$res = new PHPUnit2_Framework_TestResult();
-		}
-
-		if ($this->codecoverage)
-		{
-			$res->collectCodeCoverageInformation(TRUE);
-		}
-
-		foreach ($this->formatters as $formatter)
-		{
-			$res->addListener($formatter);
-		}
-
-		$this->suite->run($res, false, $this->groups, $this->excludeGroups);
-		
-		if ($this->codecoverage)
-		{
-			$coverageInformation = $res->getCodeCoverageInformation();
-			
-			if (PHPUnitUtil::$installedVersion == 3)
-			{
-				foreach ($coverageInformation as $coverage_info)
-				{
-					CoverageMerger::merge($this->project, array($coverage_info['files']));
-				}
-			}
-			else
-			{
-				CoverageMerger::merge($this->project, $coverageInformation);
-			}
-		}
-		
-		if ($res->errorCount() != 0)
-		{
-			$this->retCode = self::ERRORS;
-		}
-		else if ($res->failureCount() != 0)
-		{
-			$this->retCode = self::FAILURES;
-		}
-		else if ($res->notImplementedCount() != 0)
-		{
-			$this->retCode = self::INCOMPLETES;
-		}
-		else if (PHPUnitUtil::$installedVersion == 3 && $res->skippedCount() != 0)
-		{
-			$this->retCode = self::SKIPPED;
-		}
-	}
-
-	function getRetCode()
-	{
-		return $this->retCode;
-	}
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/PHPUnitUtil.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/PHPUnitUtil.php
deleted file mode 100755
index e408f20ee..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/PHPUnitUtil.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-/**
- * $Id: PHPUnitUtil.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-/**
- * Various utility functions
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: PHPUnitUtil.php 325 2007-12-20 15:44:58Z hans $
- * @package phing.tasks.ext.phpunit
- * @since 2.1.0
- */
-class PHPUnitUtil
-{
-	/**
-	 * Installed PHPUnit major version
-	 */
-	public static $installedVersion = 2;
-	
-	/**
-	 * Installed PHPUnit minor version
-	 */
-	public static $installedMinorVersion = 0;
-	
-	protected static $definedClasses = array();
-	
-	/**
-	 * Returns the package of a class as defined in the docblock of the class using @package
-	 *
-	 * @param string the name of the class
-	 * @return string the name of the package
-	 */
-	static function getPackageName($classname)
-	{
-		$reflect = new ReflectionClass($classname);
-
-		if (preg_match('/@package[\s]+([\.\w]+)/', $reflect->getDocComment(), $matches))
-		{
-			return $matches[1];
-		}
-		else
-		{
-			return "default";
-		}
-	}
-	
-	/**
-	 * Derives the classname from a filename.
-	 * Assumes that there is only one class defined in that particular file, and that
-	 * the naming follows the dot-path (Java) notation scheme.
-	 *
-	 * @param string the filename
-	 * @return string the name fo the class
-	 */
-	static function getClassFromFileName($filename)
-	{
-		$filename = basename($filename);
-		
-		$rpos = strrpos($filename, '.');
-		
-		if ($rpos != -1)
-		{
-			$filename = substr($filename, 0, $rpos);
-		}
-		
-		return $filename;
-	}
-
-	/**
-	 * @param string the filename
-	 * @param Path optional classpath
-	 * @return array list of classes defined in the file
-	 */
-	static function getDefinedClasses($filename, $classpath = NULL)
-	{
-		$filename = realpath($filename);
-		
-		if (!file_exists($filename))
-		{
-			throw new Exception("File '" . $filename . "' does not exist");
-		}
-		
-		if (isset(self::$definedClasses[$filename]))
-		{
-			return self::$definedClasses[$filename];
-		}
-		
-		Phing::__import($filename, $classpath);
-
-		$declaredClasses = get_declared_classes();
-		
-		foreach ($declaredClasses as $classname)
-		{
-			$reflect = new ReflectionClass($classname);
-			
-			self::$definedClasses[$reflect->getFilename()][] = $classname;
-			
-			if (is_array(self::$definedClasses[$reflect->getFilename()]))
-			{			
-				self::$definedClasses[$reflect->getFilename()] = array_unique(self::$definedClasses[$reflect->getFilename()]);
-			}
-		}
-		
-		if (isset(self::$definedClasses[$filename]))
-		{
-			return self::$definedClasses[$filename];
-		}
-		else
-		{
-			return array();
-		}
-	}
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit2/PHPUnit2ResultFormatter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit2/PHPUnit2ResultFormatter.php
deleted file mode 100755
index 427a4dccf..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit2/PHPUnit2ResultFormatter.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-/**
- * $Id: PHPUnit2ResultFormatter.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'PHPUnit2/Framework/TestListener.php';
-
-require_once 'phing/system/io/Writer.php';
-
-/**
- * This abstract class describes classes that format the results of a PHPUnit2 testrun.
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: PHPUnit2ResultFormatter.php 325 2007-12-20 15:44:58Z hans $
- * @package phing.tasks.ext.phpunit.phpunit2
- * @since 2.1.0
- */
-abstract class PHPUnit2ResultFormatter implements PHPUnit2_Framework_TestListener
-{
-	protected $out = NULL;
-	
-	protected $project = NULL;
-	
-	private $timer = NULL;
-
-	private $runCount = 0;
-	
-	private $failureCount = 0;
-	
-	private $errorCount = 0;	
-	
-	/**
-	 * Sets the writer the formatter is supposed to write its results to.
-   	 */
-	function setOutput(Writer $out)
-	{
-		$this->out = $out;	
-	}
-
-	/**
-	 * Returns the extension used for this formatter
-	 *
-	 * @return string the extension
-	 */
-	function getExtension()
-	{
-		return "";
-	}
-
-	/**
-	 * Sets the project
-	 *
-	 * @param Project the project
-	 */
-	function setProject(Project $project)
-	{
-		$this->project = $project;
-	}
-	
-	function getPreferredOutfile()
-	{
-		return "";
-	}
-	
-	function startTestRun()
-	{
-	}
-	
-	function endTestRun()
-	{
-	}
-	
-	function startTestSuite(PHPUnit2_Framework_TestSuite $suite)
-	{
-		$this->runCount = 0;
-		$this->failureCount = 0;
-		$this->errorCount = 0;
-		
-		$this->timer = new Timer();
-		$this->timer->start();
-	}
-	
-	function endTestSuite(PHPUnit2_Framework_TestSuite $suite)
-	{
-		$this->timer->stop();
-	}
-
-	function startTest(PHPUnit2_Framework_Test $test)
-	{
-		$this->runCount++;
-	}
-
-	function endTest(PHPUnit2_Framework_Test $test)
-	{
-	}
-
-	function addError(PHPUnit2_Framework_Test $test, Exception $e)
-	{
-		$this->errorCount++;
-	}
-
-	function addFailure(PHPUnit2_Framework_Test $test, PHPUnit2_Framework_AssertionFailedError $t)
-	{
-		$this->failureCount++;
-	}
-
-	function addIncompleteTest(PHPUnit2_Framework_Test $test, Exception $e)
-	{
-	}
-
-	function addSkippedTest(PHPUnit2_Framework_Test $test, Exception $e)
-	{
-	}
-	
-	function getRunCount()
-	{
-		return $this->runCount;
-	}
-	
-	function getFailureCount()
-	{
-		return $this->failureCount;
-	}
-	
-	function getErrorCount()
-	{
-		return $this->errorCount;
-	}
-	
-	function getElapsedTime()
-	{
-		if ($this->timer)
-		{
-			return $this->timer->getElapsedTime();
-		}
-		else
-		{
-			return 0;
-		}
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit2/PlainPHPUnit2ResultFormatter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit2/PlainPHPUnit2ResultFormatter.php
deleted file mode 100755
index fcf37f30b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit2/PlainPHPUnit2ResultFormatter.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * $Id: PlainPHPUnit2ResultFormatter.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'PHPUnit2/Framework/Test.php';
-require_once 'PHPUnit2/Util/Filter.php';
-
-require_once 'phing/tasks/ext/phpunit/phpunit2/PHPUnit2ResultFormatter.php';
-
-/**
- * Prints plain text output of the test to a specified Writer.
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: PlainPHPUnit2ResultFormatter.php 325 2007-12-20 15:44:58Z hans $
- * @package phing.tasks.ext.phpunit.phpunit2
- * @since 2.1.0
- */
-class PlainPHPUnit2ResultFormatter extends PHPUnit2ResultFormatter
-{
-	private $inner = "";
-	
-	function getExtension()
-	{
-		return ".txt";
-	}
-	
-	function getPreferredOutfile()
-	{
-		return "testresults";
-	}
-
-	function startTestSuite(PHPUnit2_Framework_TestSuite $suite)
-	{
-		parent::startTestSuite($suite);
-		
-		$this->inner = "";
-	}
-	
-	function endTestSuite(PHPUnit2_Framework_TestSuite $suite)
-	{
-		parent::endTestSuite($suite);
-		
-		$sb = "Testsuite: " . $suite->getName() . "\n";
-		$sb.= "Tests run: " . $this->getRunCount();
-		$sb.= ", Failures: " . $this->getFailureCount();
-		$sb.= ", Errors: " . $this->getErrorCount();
-		$sb.= ", Time elapsed: " . $this->getElapsedTime();
-		$sb.= " sec\n";
-
-		if ($this->out != NULL)
-		{
-			$this->out->write($sb);
-			$this->out->write($this->inner);
-		}
-	}
-
-	function addError(PHPUnit2_Framework_Test $test, Exception $e)
-	{
-		parent::addError($test, $e);
-		
-		$this->formatError("ERROR", $test, $e);
-	}
-
-	function addFailure(PHPUnit2_Framework_Test $test, PHPUnit2_Framework_AssertionFailedError $t)
-	{
-		parent::addFailure($test, $t);
-		
-		$this->formatError("FAILED", $test, $t);
-	}
-
-	function addIncompleteTest(PHPUnit2_Framework_Test $test, Exception $e)
-	{
-		parent::addIncompleteTest($test, $e);
-		
-		$this->formatError("INCOMPLETE", $test, $e);
-	}
-
-	private function formatError($type, PHPUnit2_Framework_Test $test, Exception $e)
-	{
-		if ($test != null)
-		{
-			$this->endTest($test);
-		}
-
-		$this->inner.= $test->getName() . " " . $type . "\n";
-		$this->inner.= $e->getMessage() . "\n";
-		$this->inner.= PHPUnit2_Util_Filter::getFilteredStackTrace($e) . "\n";
-	}
-	
-	function endTestRun()
-	{
-		parent::endTestRun();
-		
-		if ($this->out != NULL)
-		{
-			$this->out->close();
-		}
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit2/SummaryPHPUnit2ResultFormatter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit2/SummaryPHPUnit2ResultFormatter.php
deleted file mode 100755
index 6f4a044cd..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit2/SummaryPHPUnit2ResultFormatter.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * $Id: SummaryPHPUnit2ResultFormatter.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-require_once 'PHPUnit2/Framework/Test.php';
-
-require_once 'phing/tasks/ext/phpunit/phpunit2/PHPUnit2ResultFormatter.php';
-
-/**
- * Prints short summary output of the test to Phing's logging system.
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: SummaryPHPUnit2ResultFormatter.php 325 2007-12-20 15:44:58Z hans $
- * @package phing.tasks.ext.phpunit.phpunit2
- * @since 2.1.0
- */	
-class SummaryPHPUnit2ResultFormatter extends PHPUnit2ResultFormatter
-{
-	function endTestSuite(PHPUnit2_Framework_TestSuite $suite)
-	{
-		parent::endTestSuite($suite);
-		
-		$sb = "Tests run: " . $this->getRunCount();
-		$sb.= ", Failures: " . $this->getFailureCount();
-		$sb.= ", Errors: " . $this->getErrorCount();
-		$sb.= ", Time elapsed: " . $this->getElapsedTime();
-		$sb.= " sec\n";
-		
-		if ($this->out != NULL)
-		{
-			$this->out->write($sb);
-			$this->out->close();
-		}
-	}
-	
-	function getExtension()
-	{
-		return NULL;
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit2/XMLPHPUnit2ResultFormatter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit2/XMLPHPUnit2ResultFormatter.php
deleted file mode 100755
index add7fa97d..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit2/XMLPHPUnit2ResultFormatter.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * $Id: XMLPHPUnit2ResultFormatter.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'PHPUnit2/Framework/Test.php';
-require_once 'PHPUnit2/Runner/Version.php';
-
-require_once 'PHPUnit2/Util/Log/XML.php';
-
-require_once 'phing/tasks/ext/phpunit/phpunit2/PHPUnit2ResultFormatter.php';
-
-/**
- * Prints XML output of the test to a specified Writer
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: XMLPHPUnit2ResultFormatter.php 325 2007-12-20 15:44:58Z hans $
- * @package phing.tasks.ext.phpunit.phpunit2
- * @since 2.1.0
- */
-class XMLPHPUnit2ResultFormatter extends PHPUnit2ResultFormatter
-{
-	private $logger = NULL;
-	
-	function __construct()
-	{
-		$this->logger = new PHPUnit2_Util_Log_XML();
-		$this->logger->setWriteDocument(false);
-	}
-	
-	function getExtension()
-	{
-		return ".xml";
-	}
-	
-	function getPreferredOutfile()
-	{
-		return "testsuites";
-	}
-	
-	function startTestSuite(PHPUnit2_Framework_TestSuite $suite)
-	{
-		parent::startTestSuite($suite);
-		
-		$this->logger->startTestSuite($suite);
-	}
-	
-	function endTestSuite(PHPUnit2_Framework_TestSuite $suite)
-	{
-		parent::endTestSuite($suite);
-		
-		$this->logger->endTestSuite($suite);
-	}
-	
-	function startTest(PHPUnit2_Framework_Test $test)
-	{
-		parent::startTest($test);
-		
-		$this->logger->startTest($test);
-	}
-
-	function endTest(PHPUnit2_Framework_Test $test)
-	{
-		parent::endTest($test);
-		
-		$this->logger->endTest($test);
-	}
-	
-	function addError(PHPUnit2_Framework_Test $test, Exception $e)
-	{
-		parent::addError($test, $e);
-		
-		$this->logger->addError($test, $e);
-	}
-
-	function addFailure(PHPUnit2_Framework_Test $test, PHPUnit2_Framework_AssertionFailedError $t)
-	{
-		parent::addFailure($test, $t);
-		
-		$this->logger->addFailure($test, $t);
-	}
-
-	function addIncompleteTest(PHPUnit2_Framework_Test $test, Exception $e)
-	{
-		parent::addIncompleteTest($test, $e);
-		
-		$this->logger->addIncompleteTest($test, $e);
-	}
-	
-	function endTestRun()
-	{
-		parent::endTestRun();
-		
-		if ($this->out)
-		{
-			$this->out->write($this->logger->getXML());
-			$this->out->close();
-		}
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit3/PHPUnit3ResultFormatter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit3/PHPUnit3ResultFormatter.php
deleted file mode 100644
index 6c77f2725..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit3/PHPUnit3ResultFormatter.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-/**
- * $Id: PHPUnit2ResultFormatter.php 142 2007-02-04 14:06:00Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'PHPUnit/Framework/TestListener.php';
-
-require_once 'phing/system/io/Writer.php';
-
-/**
- * This abstract class describes classes that format the results of a PHPUnit2 testrun.
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: PHPUnit2ResultFormatter.php 142 2007-02-04 14:06:00Z mrook $
- * @package phing.tasks.ext.phpunit
- * @since 2.1.0
- */
-abstract class PHPUnit3ResultFormatter implements PHPUnit_Framework_TestListener
-{
-	protected $out = NULL;
-	
-	protected $project = NULL;
-	
-	private $timers = false;
-	
-	private $runCounts = false;
-	
-	private $failureCounts = false;
-	
-	private $errorCounts = false;
-	
-	private $incompleteCounts = false;
-	
-	private $skipCounts = false;
-	
-	/**
-	 * Sets the writer the formatter is supposed to write its results to.
-   	 */
-	function setOutput(Writer $out)
-	{
-		$this->out = $out;	
-	}
-
-	/**
-	 * Returns the extension used for this formatter
-	 *
-	 * @return string the extension
-	 */
-	function getExtension()
-	{
-		return "";
-	}
-
-	/**
-	 * Sets the project
-	 *
-	 * @param Project the project
-	 */
-	function setProject(Project $project)
-	{
-		$this->project = $project;
-	}
-	
-	function getPreferredOutfile()
-	{
-		return "";
-	}
-	
-	function startTestRun()
-	{
-		$this->timers = array($this->getMicrotime());
-		$this->runCounts = array(0);
-		$this->failureCounts = array(0);
-		$this->errorCounts = array(0);
-		$this->incompleteCounts = array(0);
-		$this->skipCounts = array(0);
-	}
-	
-	function endTestRun()
-	{
-	}
-	
-	function startTestSuite(PHPUnit_Framework_TestSuite $suite)
-	{
-		$this->timers[] = $this->getMicrotime();
-		$this->runCounts[] = 0;
-		$this->failureCounts[] = 0;
-		$this->errorCounts[] = 0;
-		$this->incompleteCounts[] = 0;
-		$this->skipCounts[] = 0;
-	}
-	
-	function endTestSuite(PHPUnit_Framework_TestSuite $suite)
-	{
-		$lastRunCount = array_pop($this->runCounts);
-		$this->runCounts[count($this->runCounts) - 1] += $lastRunCount;
-		
-		$lastFailureCount = array_pop($this->failureCounts);
-		$this->failureCounts[count($this->failureCounts) - 1] += $lastFailureCount;
-		
-		$lastErrorCount = array_pop($this->errorCounts);
-		$this->errorCounts[count($this->errorCounts) - 1] += $lastErrorCount;
-		
-		$lastIncompleteCount = array_pop($this->incompleteCounts);
-		$this->incompleteCounts[count($this->incompleteCounts) - 1] += $lastIncompleteCount;
-		
-		$lastSkipCount = array_pop($this->skipCounts);
-		$this->skipCounts[count($this->skipCounts) - 1] += $lastSkipCount;
-		
-		array_pop($this->timers);
-	}
-
-	function startTest(PHPUnit_Framework_Test $test)
-	{
-		$this->runCounts[count($this->runCounts) - 1]++;
-	}
-
-	function endTest(PHPUnit_Framework_Test $test, $time)
-	{
-	}
-
-	function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
-	{
-		$this->errorCounts[count($this->errorCounts) - 1]++;
-	}
-
-	function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
-	{
-		$this->failureCounts[count($this->failureCounts) - 1]++;
-	}
-
-	function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-	{
-		$this->incompleteCounts[count($this->incompleteCounts) - 1]++;
-	}
-
-	function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-	{
-		$this->skipCounts[count($this->skipCounts) - 1]++;
-	}
-	
-	function getRunCount()
-	{
-		return end($this->runCounts);
-	}
-	
-	function getFailureCount()
-	{
-		return end($this->failureCounts);
-	}
-	
-	function getErrorCount()
-	{
-		return end($this->errorCounts);
-	}
-	
-	function getIncompleteCount()
-	{
-		return end($this->incompleteCounts);
-	}
-	
-	function getSkippedCount()
-	{
-		return end($this->skipCounts);
-	}
-	
-	function getElapsedTime()
-	{
-		if (end($this->timers))
-		{
-			return $this->getMicrotime() - end($this->timers);
-		}
-		else
-		{
-			return 0;
-		}
-	}
-
-	private  function getMicrotime() {
-		list($usec, $sec) = explode(' ', microtime());
-		return (float)$usec + (float)$sec;
-	}
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit3/PlainPHPUnit3ResultFormatter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit3/PlainPHPUnit3ResultFormatter.php
deleted file mode 100644
index f2997aac3..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit3/PlainPHPUnit3ResultFormatter.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
- * $Id: PlainPHPUnit2ResultFormatter.php 142 2007-02-04 14:06:00Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/tasks/ext/phpunit/phpunit3/PHPUnit3ResultFormatter.php';
-
-/**
- * Prints plain text output of the test to a specified Writer.
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: PlainPHPUnit2ResultFormatter.php 142 2007-02-04 14:06:00Z mrook $
- * @package phing.tasks.ext.phpunit.phpunit3
- * @since 2.1.0
- */
-class PlainPHPUnit3ResultFormatter extends PHPUnit3ResultFormatter
-{
-	private $inner = "";
-	
-	function getExtension()
-	{
-		return ".txt";
-	}
-	
-	function getPreferredOutfile()
-	{
-		return "testresults";
-	}
-
-	function startTestSuite(PHPUnit_Framework_TestSuite $suite)
-	{
-		parent::startTestSuite($suite);
-		
-		$this->inner = "";
-	}
-	
-	function endTestSuite(PHPUnit_Framework_TestSuite $suite)
-	{
-		$sb = "Testsuite: " . $suite->getName() . "\n";
-		$sb.= "Tests run: " . $this->getRunCount();
-		$sb.= ", Failures: " . $this->getFailureCount();
-		$sb.= ", Errors: " . $this->getErrorCount();
-		$sb.= ", Incomplete: " . $this->getIncompleteCount();
-		$sb.= ", Skipped: " . $this->getSkippedCount();
-		$sb.= ", Time elapsed: " . sprintf('%0.5f', $this->getElapsedTime()) . " s\n";
-
-		parent::endTestSuite($suite);
-		
-		if ($this->out != NULL)
-		{
-			$this->out->write($sb);
-			$this->out->write($this->inner);
-		}
-	}
-
-	function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
-	{
-		parent::addError($test, $e, $time);
-		
-		$this->formatError("ERROR", $test, $e);
-	}
-
-	function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
-	{
-		parent::addFailure($test, $e, $time);
-		$this->formatError("FAILED", $test, $e);
-	}
-
-	function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-	{
-		parent::addIncompleteTest($test, $e, $time);
-		
-		$this->formatError("INCOMPLETE", $test);
-	}
-
-	function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-	{
-		parent::addSkippedTest($test, $e, $time);
-		$this->formatError("SKIPPED", $test);
-	}
-
-	private function formatError($type, PHPUnit_Framework_Test $test, Exception $e = null)
-	{
-		if ($test != null)
-		{
-			$this->endTest($test, time());
-		}
-		
-		$this->inner.= $test->getName() . " " . $type . "\n";
-		
-		if ($e !== null) {
-			$this->inner.= $e->getMessage() . "\n";
-			$this->inner.= PHPUnit_Util_Filter::getFilteredStackTrace($e, false) . "\n";
-		}
-	}
-	
-	function endTestRun()
-	{
-		parent::endTestRun();
-		
-		if ($this->out != NULL)
-		{
-			$this->out->close();
-		}
-	}
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit3/SummaryPHPUnit3ResultFormatter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit3/SummaryPHPUnit3ResultFormatter.php
deleted file mode 100644
index 0aca54d01..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit3/SummaryPHPUnit3ResultFormatter.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * $Id: SummaryPHPUnit2ResultFormatter.php 142 2007-02-04 14:06:00Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-require_once 'phing/tasks/ext/phpunit/phpunit3/PHPUnit3ResultFormatter.php';
-
-/**
- * Prints short summary output of the test to Phing's logging system.
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: SummaryPHPUnit2ResultFormatter.php 142 2007-02-04 14:06:00Z mrook $
- * @package phing.tasks.ext.phpunit
- * @since 2.1.0
- */	
-class SummaryPHPUnit3ResultFormatter extends PHPUnit3ResultFormatter
-{
-	function endTestSuite(PHPUnit_Framework_TestSuite $suite)
-	{
-		$sb = "Test: " . $suite->getName();
-		$sb.= ", Run: " . $this->getRunCount();
-		$sb.= ", Failures: " . $this->getFailureCount();
-		$sb.= ", Errors: " . $this->getErrorCount();
-		$sb.= ", Incomplete: " . $this->getIncompleteCount();
-		$sb.= ", Skipped: " . $this->getSkippedCount();
-		$sb.= ", Time elapsed: " . sprintf('%0.5f', $this->getElapsedTime()) . " s\n";
-		
-		parent::endTestSuite($suite);
-		
-		if ($this->out != NULL)
-		{
-			$this->out->write($sb);
-			$this->out->close();
-		}
-	}
-	
-	function getExtension()
-	{
-		return NULL;
-	}
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit3/XMLPHPUnit3ResultFormatter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit3/XMLPHPUnit3ResultFormatter.php
deleted file mode 100644
index 3e04dab44..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/phpunit/phpunit3/XMLPHPUnit3ResultFormatter.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * $Id: XMLPHPUnit2ResultFormatter.php 142 2007-02-04 14:06:00Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'PHPUnit/Util/Log/XML.php';
-
-require_once 'phing/tasks/ext/phpunit/phpunit3/PHPUnit3ResultFormatter.php';
-
-/**
- * Prints XML output of the test to a specified Writer
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: XMLPHPUnit2ResultFormatter.php 142 2007-02-04 14:06:00Z mrook $
- * @package phing.tasks.ext.phpunit
- * @since 2.1.0
- */
-class XMLPHPUnit3ResultFormatter extends PHPUnit3ResultFormatter
-{
-	/**
-	 * @var PHPUnit_Util_Log_XML
-	 */
-	private $logger = NULL;
-
-	function __construct()
-	{
-		$this->logger = new PHPUnit_Util_Log_XML(null, true);
-		$this->logger->setWriteDocument(false);
-	}
-
-	function getExtension()
-	{
-		return ".xml";
-	}
-
-	function getPreferredOutfile()
-	{
-		return "testsuites";
-	}
-
-	function startTestSuite(PHPUnit_Framework_TestSuite $suite)
-	{
-		parent::startTestSuite($suite);
-
-		$this->logger->startTestSuite($suite);
-	}
-
-	function endTestSuite(PHPUnit_Framework_TestSuite $suite)
-	{
-		parent::endTestSuite($suite);
-
-		$this->logger->endTestSuite($suite);
-	}
-
-	function startTest(PHPUnit_Framework_Test $test)
-	{
-		parent::startTest($test);
-
-		$this->logger->startTest($test);
-	}
-
-	function endTest(PHPUnit_Framework_Test $test, $time)
-	{
-		parent::endTest($test, $time);
-
-		$this->logger->endTest($test, $time);
-	}
-
-	function addError(PHPUnit_Framework_Test $test, Exception $e, $time)
-	{
-		parent::addError($test, $e, $time);
-
-		$this->logger->addError($test, $e, $time);
-	}
-
-	function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time)
-	{
-		parent::addFailure($test, $e, $time);
-
-		$this->logger->addFailure($test, $e, $time);
-	}
-
-	function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time)
-	{
-		parent::addIncompleteTest($test, $e, $time);
-
-		$this->logger->addIncompleteTest($test, $e, $time);
-	}
-
-	function endTestRun()
-	{
-		parent::endTestRun();
-
-		if ($this->out)
-		{
-			$this->out->write($this->logger->getXML());
-			$this->out->close();
-		}
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/simpletest/SimpleTestCountResultFormatter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/simpletest/SimpleTestCountResultFormatter.php
deleted file mode 100644
index 9c066f865..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/simpletest/SimpleTestCountResultFormatter.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * $Id: SimpleTestCountResultFormatter.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/tasks/ext/simpletest/SimpleTestResultFormatter.php';
-
-/**
- * Dummy result formatter used to count SimpleTest results
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: SimpleTestCountResultFormatter.php 325 2007-12-20 15:44:58Z hans $
- * @package phing.tasks.ext.simpletest
- * @since 2.2.0
- */
-class SimpleTestCountResultFormatter extends SimpleTestResultFormatter
-{
-	const SUCCESS = 0;
-	const FAILURES = 1;
-	const ERRORS = 2;
-	
-	function getRetCode()
-	{
-		if ($this->getExceptionCount() != 0)
-		{
-			return self::ERRORS;
-		}
-		else if ($this->getFailCount() != 0)
-		{
-			return self::FAILURES;
-		}
-		
-		return self::SUCCESS;
-	}	
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/simpletest/SimpleTestFormatterElement.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/simpletest/SimpleTestFormatterElement.php
deleted file mode 100644
index 181f67170..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/simpletest/SimpleTestFormatterElement.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * $Id: SimpleTestFormatterElement.php 357 2008-02-26 08:51:59Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/tasks/ext/simpletest/SimpleTestPlainResultFormatter.php';
-require_once 'phing/tasks/ext/simpletest/SimpleTestSummaryResultFormatter.php';
-require_once 'phing/tasks/ext/phpunit/FormatterElement.php';
-
-/**
- * Child class of "FormatterElement", overrides setType to provide other
- * formatter classes for SimpleTest
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: SimpleTestFormatterElement.php 357 2008-02-26 08:51:59Z mrook $
- * @package phing.tasks.ext.simpletest
- * @since 2.2.0
- */
-class SimpleTestFormatterElement extends FormatterElement
-{
-	function setType($type)
-	{
-		$this->type = $type;
-
-		if ($this->type == "xml")
-		{
-			$destFile = new PhingFile($this->toDir, 'testsuites.xml');
-			//$this->formatter = new SimpleTestXmlResultFormatter();
-		}
-		else
-		if ($this->type == "plain")
-		{
-			$this->formatter = new SimpleTestPlainResultFormatter();
-		}
-		else
-		if ($this->type == "summary")
-		{
-			$this->formatter = new SimpleTestSummaryResultFormatter();
-		}
-		else
-		{
-			throw new BuildException("Formatter '" . $this->type . "' not implemented");
-		}
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/simpletest/SimpleTestPlainResultFormatter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/simpletest/SimpleTestPlainResultFormatter.php
deleted file mode 100644
index 89a6fcec6..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/simpletest/SimpleTestPlainResultFormatter.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * $Id: SimpleTestPlainResultFormatter.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/tasks/ext/simpletest/SimpleTestResultFormatter.php';
-
-/**
- * Prints plain text output of the test to a specified Writer.
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: SimpleTestPlainResultFormatter.php 325 2007-12-20 15:44:58Z hans $
- * @package phing.tasks.ext.simpletest
- * @since 2.2.0
- */
-class SimpleTestPlainResultFormatter extends SimpleTestResultFormatter
-{
-	private $inner = "";
-	
-	function getExtension()
-	{
-		return ".txt";
-	}
-	
-	function getPreferredOutfile()
-	{
-		return "testresults";
-	}
-
-	function paintCaseStart($test_name)
-	{
-		parent::paintCaseStart($test_name);
-		
-		$this->inner = "";
-	}
-	
-	function paintCaseEnd($test_name)
-	{
-		parent::paintCaseEnd($test_name);
-		
-		/* Only count suites where more than one test was run */
-		if ($this->getRunCount())
-		{
-			$sb.= "Testsuite: $test_name\n";
-			$sb.= "Tests run: " . $this->getRunCount();
-			$sb.= ", Failures: " . $this->getFailureCount();
-			$sb.= ", Errors: " . $this->getErrorCount();
-			$sb.= ", Time elapsed: " . $this->getElapsedTime();
-			$sb.= " sec\n";
-
-			if ($this->out != NULL)
-			{
-				$this->out->write($sb);
-				$this->out->write($this->inner);
-			}
-		}
-	}
-
-	function paintError($message)
-	{
-		parent::paintError($message);
-		
-		$this->formatError("ERROR", $message);
-	}
-
-	function paintFail($message)
-	{
-		parent::paintFail($message);
-		
-		$this->formatError("FAILED", $message);
-	}
-
-	private function formatError($type, $message)
-	{
-		$this->inner.= $this->getTestName() . " " . $type . "\n";
-		$this->inner.= $message . "\n";	
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/simpletest/SimpleTestResultFormatter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/simpletest/SimpleTestResultFormatter.php
deleted file mode 100644
index b8f61dd6f..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/simpletest/SimpleTestResultFormatter.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-/**
- * $Id: SimpleTestResultFormatter.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'simpletest/scorer.php';
-
-require_once 'phing/system/io/Writer.php';
-
-/**
- * This abstract class describes classes that format the results of a SimpleTest testrun.
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: SimpleTestResultFormatter.php 325 2007-12-20 15:44:58Z hans $
- * @package phing.tasks.ext.phpunit2
- * @since 2.2.0
- */
-abstract class SimpleTestResultFormatter extends SimpleReporter
-{
-	protected $out = NULL;
-	
-	protected $project = NULL;
-	
-	private $timer = NULL;
-
-	private $runCount = 0;
-	
-	private $failureCount = 0;
-	
-	private $errorCount = 0;	
-
-	private $currentTest = "";
-	
-	/**
-	 * Sets the writer the formatter is supposed to write its results to.
-   	 */
-	function setOutput(Writer $out)
-	{
-		$this->out = $out;	
-	}
-
-	/**
-	 * Returns the extension used for this formatter
-	 *
-	 * @return string the extension
-	 */
-	function getExtension()
-	{
-		return "";
-	}
-
-	/**
-	 * Sets the project
-	 *
-	 * @param Project the project
-	 */
-	function setProject(Project $project)
-	{
-		$this->project = $project;
-	}
-	
-	function getPreferredOutfile()
-	{
-		return "";
-	}
-	
-	function paintMethodStart($test_name)
-	{
-		parent::paintMethodStart($test_name);
-		
-		$this->currentTest = $test_name;
-	}
-	
-	function paintMethodEnd($test_name)
-	{
-		parent::paintMethodEnd($test_name);
-		
-		$this->runCount++;
-	}
-	
-	function paintCaseStart($test_name)
-	{
-		parent::paintCaseStart($test_name);
-		
-		$this->runCount = 0;
-		$this->failureCount = 0;
-		$this->errorCount = 0;
-		
-		$this->timer = new Timer();
-		$this->timer->start();
-	}
-		
-	function paintCaseEnd($test_name)
-	{
-		parent::paintCaseEnd($test_name);
-		
-		$this->timer->stop();
-	}
-
-	function paintError($message)
-	{
-		parent::paintError($message);
-		
-		$this->errorCount++;
-	}
-
-	function paintFail($message)
-	{
-		parent::paintFail($message);
-		
-		$this->failureCount++;
-	}
-
-	function getRunCount()
-	{
-		return $this->runCount;
-	}
-	
-	function getFailureCount()
-	{
-		return $this->failureCount;
-	}
-	
-	function getErrorCount()
-	{
-		return $this->errorCount;
-	}
-	
-	function getTestName()
-	{
-		return $this->currentTest;
-	}
-	
-	function getElapsedTime()
-	{
-		if ($this->timer)
-		{
-			return $this->timer->getElapsedTime();
-		}
-		else
-		{
-			return 0;
-		}
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/simpletest/SimpleTestSummaryResultFormatter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/simpletest/SimpleTestSummaryResultFormatter.php
deleted file mode 100644
index 14f89c45d..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/simpletest/SimpleTestSummaryResultFormatter.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * $Id: SimpleTestSummaryResultFormatter.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/tasks/ext/simpletest/SimpleTestResultFormatter.php';
-
-/**
- * Prints short summary output of the test to Phing's logging system.
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: SimpleTestSummaryResultFormatter.php 325 2007-12-20 15:44:58Z hans $
- * @package phing.tasks.ext.simpletest
- * @since 2.2.0
- */
-class SimpleTestSummaryResultFormatter extends SimpleTestResultFormatter
-{
-	function paintCaseEnd($test_name)
-	{
-		parent::paintCaseEnd($test_name);
-		
-		/* Only count suites where more than one test was run */
-		if ($this->getRunCount())
-		{
-			$sb.= "Tests run: " . $this->getRunCount();
-			$sb.= ", Failures: " . $this->getFailureCount();
-			$sb.= ", Errors: " . $this->getErrorCount();
-			$sb.= ", Time elapsed: " . $this->getElapsedTime();
-			$sb.= " sec\n";
-
-			if ($this->out != NULL)
-			{
-				$this->out->write($sb);
-			}
-		}
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/simpletest/SimpleTestTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/simpletest/SimpleTestTask.php
deleted file mode 100644
index 59c0d4321..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/simpletest/SimpleTestTask.php
+++ /dev/null
@@ -1,237 +0,0 @@
-<?php
-/**
- * $Id: SimpleTestTask.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-require_once 'phing/system/io/PhingFile.php';
-require_once 'phing/system/io/Writer.php';
-require_once 'phing/util/LogWriter.php';
-
-/**
- * Runs SimpleTest tests.
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: SimpleTestTask.php 325 2007-12-20 15:44:58Z hans $
- * @package phing.tasks.ext.simpletest
- * @since 2.2.0
- */
-class SimpleTestTask extends Task
-{
-	private $formatters = array();
-	private $haltonerror = false;
-	private $haltonfailure = false;
-	private $failureproperty;
-	private $errorproperty;
-	private $printsummary = false;
-	private $testfailed = false;
-
-	/**
-	 * Initialize Task.
- 	 * This method includes any necessary SimpleTest libraries and triggers
-	 * appropriate error if they cannot be found.  This is not done in header
-	 * because we may want this class to be loaded w/o triggering an error.
-	 */
-	function init() {
-		@include_once 'simpletest/scorer.php';
-		
-		if (!class_exists('SimpleReporter')) {
-			throw new BuildException("SimpleTestTask depends on SimpleTest package being installed.", $this->getLocation());
-		}
-		
-		require_once 'simpletest/reporter.php';
-		require_once 'simpletest/xml.php';
-		require_once 'simpletest/test_case.php';
-		require_once 'phing/tasks/ext/simpletest/SimpleTestCountResultFormatter.php';
-		require_once 'phing/tasks/ext/simpletest/SimpleTestFormatterElement.php';
-	}
-	
-	function setFailureproperty($value)
-	{
-		$this->failureproperty = $value;
-	}
-	
-	function setErrorproperty($value)
-	{
-		$this->errorproperty = $value;
-	}
-	
-	function setHaltonerror($value)
-	{
-		$this->haltonerror = $value;
-	}
-
-	function setHaltonfailure($value)
-	{
-		$this->haltonfailure = $value;
-	}
-
-	function setPrintsummary($printsummary)
-	{
-		$this->printsummary = $printsummary;
-	}
-	
-	/**
-	 * Add a new formatter to all tests of this task.
-	 *
-	 * @param SimpleTestFormatterElement formatter element
-	 */
-	function addFormatter(SimpleTestFormatterElement $fe)
-	{
-		$this->formatters[] = $fe;
-	}
-
-	/**
-	 * Add a new fileset containing the XML results to aggregate
-	 *
-	 * @param FileSet the new fileset containing XML results.
-	 */
-	function addFileSet(FileSet $fileset)
-	{
-		$this->filesets[] = $fileset;
-	}
-
-	/**
-	 * Iterate over all filesets and return the filename of all files
-	 * that end with .php.
-	 *
-	 * @return array an array of filenames
-	 */
-	private function getFilenames()
-	{
-		$filenames = array();
-
-		foreach ($this->filesets as $fileset)
-		{
-			$ds = $fileset->getDirectoryScanner($this->project);
-			$ds->scan();
-
-			$files = $ds->getIncludedFiles();
-
-			foreach ($files as $file)
-			{
-				if (strstr($file, ".php"))
-				{
-					$filenames[] = $ds->getBaseDir() . "/" . $file;
-				}
-			}
-		}
-
-		return $filenames;
-	}
-
-	/**
-	 * The main entry point
-	 *
-	 * @throws BuildException
-	 */
-	function main()
-	{
-		$group = new GroupTest();
-		
-		$filenames = $this->getFilenames();
-		
-		foreach ($filenames as $testfile)
-		{
-			$group->addTestFile($testfile);
-		}
-		
-		if ($this->printsummary)
-		{
-			$fe = new SimpleTestFormatterElement();
-			$fe->setType('summary');
-			$fe->setUseFile(false);
-			$this->formatters[] = $fe;
-		}
-		
-		foreach ($this->formatters as $fe)
-		{
-			$formatter = $fe->getFormatter();
-			$formatter->setProject($this->getProject());
-
-			if ($fe->getUseFile())
-			{
-				$destFile = new PhingFile($fe->getToDir(), $fe->getOutfile());
-				
-				$writer = new FileWriter($destFile->getAbsolutePath());
-
-				$formatter->setOutput($writer);
-			}
-			else
-			{
-				$formatter->setOutput($this->getDefaultOutput());
-			}
-		}
-		
-		$this->execute($group);
-		
-		if ($this->testfailed)
-		{
-			throw new BuildException("One or more tests failed");
-		}
-	}
-	
-	private function execute($suite)
-	{
-		$counter = new SimpleTestCountResultFormatter();
-		$reporter = new MultipleReporter();
-		$reporter->attachReporter($counter);
-		
-		foreach ($this->formatters as $fe)
-		{
-			$formatter = $fe->getFormatter();
-
-			$reporter->attachReporter($formatter);
-		}		
-		
-		$suite->run($reporter);
-		
-		$retcode = $counter->getRetCode();
-		
-		if ($retcode == SimpleTestCountResultFormatter::ERRORS)
-		{
-		    if ($this->errorproperty)
-		    {
-				$this->project->setNewProperty($this->errorproperty, true);
-			}
-			
-			if ($this->haltonerror)
-			{
-			    $this->testfailed = true;
-			}
-		}
-		elseif ($retcode == SimpleTestCountResultFormatter::FAILURES)
-		{
-			if ($this->failureproperty)
-			{
-				$this->project->setNewProperty($this->failureproperty, true);
-			}
-			
-			if ($this->haltonfailure)
-			{
-				$this->testfailed = true;
-			}
-		}
-	}
-
-	private function getDefaultOutput()
-	{
-		return new LogWriter($this);
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/svn/SvnBaseTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/svn/SvnBaseTask.php
deleted file mode 100755
index eacaecfd0..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/svn/SvnBaseTask.php
+++ /dev/null
@@ -1,321 +0,0 @@
-<?php
-/*
- *  $Id: SvnBaseTask.php 329 2007-12-22 17:12:59Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-include_once 'phing/Task.php';
-
-/**
- * Base class for Subversion tasks
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @author Andrew Eddie <andrew.eddie@jamboworks.com> 
- * @version $Id: SvnBaseTask.php 329 2007-12-22 17:12:59Z mrook $
- * @package phing.tasks.ext.svn
- * @see VersionControl_SVN
- * @since 2.2.0
- */
-abstract class SvnBaseTask extends Task
-{
-	private $workingCopy = "";
-	
-	private $repositoryUrl = "";
-	
-	private $svnPath = "/usr/bin/svn";
-	
-	private $svn = NULL;
-	
-	private $mode = "";
-	
-	private $svnArgs = array();
-	
-	private $svnSwitches = array();
-
-	private $toDir = "";
-
-	/**
-	 * Initialize Task.
- 	 * This method includes any necessary SVN libraries and triggers
-	 * appropriate error if they cannot be found.  This is not done in header
-	 * because we may want this class to be loaded w/o triggering an error.
-	 */
-	function init() {
-		include_once 'VersionControl/SVN.php';
-		if (!class_exists('VersionControl_SVN')) {
-			throw new Exception("SvnLastRevisionTask depends on PEAR VersionControl_SVN package being installed.");
-		}
-	}
-
-	/**
-	 * Sets the path to the workingcopy
-	 */
-	function setWorkingCopy($workingCopy)
-	{
-		$this->workingCopy = $workingCopy;
-	}
-
-	/**
-	 * Returns the path to the workingcopy
-	 */
-	function getWorkingCopy()
-	{
-		return $this->workingCopy;
-	}
-
-	/**
-	 * Sets the path/URI to the repository
-	 */
-	function setRepositoryUrl($repositoryUrl)
-	{
-		$this->repositoryUrl = $repositoryUrl;
-	}
-
-	/**
-	 * Returns the path/URI to the repository
-	 */
-	function getRepositoryUrl()
-	{
-		return $this->repositoryUrl;
-	}
-
-	/**
-	 * Sets the path to the SVN executable
-	 */
-	function setSvnPath($svnPath)
-	{
-		$this->svnPath = $svnPath;
-	}
-
-	/**
-	 * Returns the path to the SVN executable
-	 */
-	function getSvnPath()
-	{
-		return $this->svnPath;
-	}
-
-	//
-	// Args
-	//
-
-	/**
-	 * Sets the path to export/checkout to
-	 */
-	function setToDir($toDir)
-	{
-		$this->toDir = $toDir;
-	}
-
-	/**
-	 * Returns the path to export/checkout to
-	 */
-	function getToDir()
-	{
-		return $this->toDir;
-	}
-
-	//
-	// Switches
-	//
-
-	/**
-	 * Sets the force switch
-	 */
-	function setForce($value)
-	{
-		$this->svnSwitches['force'] = $value;
-	}
-
-	/**
-	 * Returns the force switch
-	 */
-	function getForce()
-	{
-		return isset( $this->svnSwitches['force'] ) ? $this->svnSwitches['force'] : '';
-	}
-
-	/**
-	 * Sets the username of the user to export
-	 */
-	function setUsername($value)
-	{
-		$this->svnSwitches['username'] = $value;
-	}
-
-	/**
-	 * Returns the username
-	 */
-	function getUsername()
-	{
-		return isset( $this->svnSwitches['username'] ) ? $this->svnSwitches['username'] : '';
-	}
-
-	/**
-	 * Sets the password of the user to export
-	 */
-	function setPassword($value)
-	{
-		$this->svnSwitches['password'] = $value;
-	}
-
-	/**
-	 * Returns the password
-	 */
-	function getPassword()
-	{
-		return isset( $this->svnSwitches['password'] ) ? $this->svnSwitches['password'] : '';
-	}
-
-	/**
-	 * Sets the no-auth-cache switch
-	 */
-	function setNoCache($value)
-	{
-		$this->svnSwitches['no-auth-cache'] = $value;
-	}
-
-	/**
-	 * Returns the no-auth-cache switch
-	 */
-	function getNoCache()
-	{
-		return isset( $this->svnSwitches['no-auth-cache'] ) ? $this->svnSwitches['no-auth-cache'] : '';
-	}
-	
-	/**
-	 * Sets the non-recursive switch
-	 */
-	function setRecursive($value)
-	{
-		$this->svnSwitches['non-recursive'] = is_bool($value) ? !$value : TRUE;
-	}
-	
-	/**
-	 * Returns the non-recursive switch
-	 */
-	function getRecursive()
-	{
-		return isset( $this->svnSwitches['non-recursive'] ) ? $this->svnSwitches['non-recursive'] : '';
-	}
-
-	/**
-	 * Sets the ignore-externals switch
-	 */
-	function setIgnoreExternals($value)
-	{
-		$this->svnSwitches['ignore-externals'] = $value;
-	}
-	
-	/**
-	 * Returns the ignore-externals switch
-	 */
-	function getIgnoreExternals()
-	{
-		return isset( $this->svnSwitches['ignore-externals'] ) ? $this->svnSwitches['ignore-externals'] : '';
-	}
-	
-	/**
-	 * Creates a VersionControl_SVN class based on $mode
-	 *
-	 * @param string The SVN mode to use (info, export, checkout, ...)
-	 * @throws BuildException
-	 */
-	protected function setup($mode)
-	{
-		$this->mode = $mode;
-		
-		// Set up runtime options. Will be passed to all
-		// subclasses.
-		$options = array('fetchmode' => VERSIONCONTROL_SVN_FETCHMODE_ASSOC, 'svn_path' => $this->getSvnPath());
-		
-		// Pass array of subcommands we need to factory
-		$this->svn = VersionControl_SVN::factory($mode, $options);
-
-		if (!empty($this->repositoryUrl))
-		{
-			$this->svnArgs = array($this->repositoryUrl);
-		}
-		else
-		if (!empty($this->workingCopy))
-		{
-			if (is_dir($this->workingCopy))
-			{
-				if (in_array(".svn", scandir($this->workingCopy)))
-				{
-					$this->svnArgs = array($this->workingCopy);
-				}
-				else
-				{
-					throw new BuildException("'".$this->workingCopy."' doesn't seem to be a working copy");
-				}
-			}
-			else
-			if ($mode=='info' )
-			{
-				if (is_file($this->workingCopy))
-				{
-					$this->svnArgs = array($this->workingCopy);
-				}
-				else
-				{
-					throw new BuildException("'".$this->workingCopy."' is not a directory nor a file");
-				}
-			}
-			else
-			{
-				throw new BuildException("'".$this->workingCopy."' is not a directory");
-			}
-		}
-	}
-	
-	/**
-	 * Executes the constructed VersionControl_SVN instance
-	 *
-	 * @param array Additional arguments to pass to SVN.
-	 * @param array Switches to pass to SVN.
-	 * @return string Output generated by SVN.
-	 */
-	protected function run($args = array(), $switches = array())
-	{
-		$svnstack = PEAR_ErrorStack::singleton('VersionControl_SVN');
-		
-		$tempArgs = $this->svnArgs;
-		
-		$tempArgs = array_merge($tempArgs, $args);
-
-		$tempSwitches = $this->svnSwitches;
-		
-		$tempSwitches = array_merge($tempSwitches, $switches);
-
-		if ($output = $this->svn->run($tempArgs, $tempSwitches))
-		{
-			return $output;
-		}
-		else
-		{
-			if (count($errs = $svnstack->getErrors()))
-			{
-				$err = current($errs);
-
-				throw new BuildException("Failed to run the 'svn " . $this->mode . "' command: " . $err['message']);
-			}
-		}
-	}
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/svn/SvnCheckoutTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/svn/SvnCheckoutTask.php
deleted file mode 100644
index 9410a43dc..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/svn/SvnCheckoutTask.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * $Id: SvnCheckoutTask.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-require_once 'phing/tasks/ext/svn/SvnBaseTask.php';
-
-/**
- * Checks out a repository to a local directory
- *
- * @author Andrew Eddie <andrew.eddie@jamboworks.com>
- * @version $Id: SvnCheckoutTask.php 325 2007-12-20 15:44:58Z hans $
- * @package phing.tasks.ext.svn
- * @since 2.3.0
- */
-class SvnCheckoutTask extends SvnBaseTask
-{
-	/**
-	 * The main entry point
-	 *
-	 * @throws BuildException
-	 */
-	function main()
-	{
-		$this->setup('checkout');
-
-		$this->log("Checking out SVN repository to '" . $this->getToDir() . "'");
-
-		$this->run(array($this->getToDir()));
-	}
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/svn/SvnExportTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/svn/SvnExportTask.php
deleted file mode 100755
index d2fc790e6..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/svn/SvnExportTask.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * $Id: SvnExportTask.php 363 2008-04-10 16:06:37Z tiddy $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-require_once 'phing/tasks/ext/svn/SvnBaseTask.php';
-
-/**
- * Exports/checks out a repository to a local directory
- * with authentication 
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @author Andrew Eddie <andrew.eddie@jamboworks.com> 
- * @version $Id: SvnExportTask.php 363 2008-04-10 16:06:37Z tiddy $
- * @package phing.tasks.ext.svn
- * @since 2.2.0
- */
-class SvnExportTask extends SvnBaseTask
-{
-#
-    /**
-     * Which Revision to Export
-     * 
-     * @todo check if version_control_svn supports constants
-     * 
-     * @var string
-     */
-    private $revision = 'HEAD';
-
-    /**
-     * The main entry point
-     *
-     * @throws BuildException
-     */
-    function main()
-    {
-        $this->setup('export');
-        
-        $this->log("Exporting SVN repository to '" . $this->getToDir() . "'");
-
-        // revision
-        $switches = array(
-            'r' => $this->revision,
-        );
-
-        $this->run(array($this->getToDir()), $switches);
-    }
-
-    public function setRevision($revision)
-    {
-        $this->revision = $revision;
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/svn/SvnLastRevisionTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/svn/SvnLastRevisionTask.php
deleted file mode 100755
index 8dc495557..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/svn/SvnLastRevisionTask.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * $Id: SvnLastRevisionTask.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-require_once 'phing/tasks/ext/svn/SvnBaseTask.php';
-
-/**
- * Stores the number of the last revision of a workingcopy in a property
- *
- * @author Michiel Rook <michiel.rook@gmail.com>
- * @version $Id: SvnLastRevisionTask.php 325 2007-12-20 15:44:58Z hans $
- * @package phing.tasks.ext.svn
- * @see VersionControl_SVN
- * @since 2.1.0
- */
-class SvnLastRevisionTask extends SvnBaseTask
-{
-	private $propertyName = "svn.lastrevision";
-
-	/**
-	 * Sets the name of the property to use
-	 */
-	function setPropertyName($propertyName)
-	{
-		$this->propertyName = $propertyName;
-	}
-
-	/**
-	 * Returns the name of the property to use
-	 */
-	function getPropertyName()
-	{
-		return $this->propertyName;
-	}
-
-	/**
-	 * The main entry point
-	 *
-	 * @throws BuildException
-	 */
-	function main()
-	{
-		$this->setup('info');
-		
-		$output = $this->run();
-		
-		if (preg_match('/Rev:[\s]+([\d]+)/', $output, $matches))
-		{
-			$this->project->setProperty($this->getPropertyName(), $matches[1]);
-		}
-		else
-		{
-			throw new BuildException("Failed to parse the output of 'svn info'.");
-		}
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/svn/SvnUpdateTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/svn/SvnUpdateTask.php
deleted file mode 100644
index 234ff10e6..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/ext/svn/SvnUpdateTask.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * $Id: SvnUpdateTask.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-require_once 'phing/tasks/ext/svn/SvnBaseTask.php';
-
-/**
- * Updates a repository in local directory
- *
- * @author Andrew Eddie <andrew.eddie@jamboworks.com>
- * @version $Id: SvnUpdateTask.php 325 2007-12-20 15:44:58Z hans $
- * @package phing.tasks.ext.svn
- * @since 2.3.0
- */
-class SvnUpdateTask extends SvnBaseTask
-{
-	/**
-	 * The main entry point
-	 *
-	 * @throws BuildException
-	 */
-	function main()
-	{
-		$this->setup('update');
-
-		$this->log("Updating SVN repository at '" . $this->getToDir() . "'");
-
-		$this->run(array($this->getToDir()));
-	}
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/AdhocTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/AdhocTask.php
deleted file mode 100644
index e0c8b184c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/AdhocTask.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/*
- *  $Id: AdhocTask.php 144 2007-02-05 15:19:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-require_once 'phing/Task.php';
-
-/**
- * Abstract class for creating adhoc Phing components in buildfile.
- *
- * By itself this class can be used to declare a single class within your buildfile.
- * You can then reference this class in any task that takes custom classes (selectors,
- * mappers, filters, etc.)
- * 
- * Subclasses exist for conveniently declaring and registering tasks and types.
- * 
- * @author   Hans Lellelid <hans@xmpl.org>
- * @version  $Revision: 1.6 $
- * @package  phing.tasks.system
- */
-class AdhocTask extends Task {
-            
-    /**
-     * The PHP script
-     * @var string
-     */
-    protected $script;
-    
-    protected $newClasses = array();
-    
-    /**
-     * Main entry point
-     */
-    public function main() {    
-        $this->execute();        
-        if ($this->newClasses) {
-            foreach($this->newClasses as $classname) {
-                $this->log("Added adhoc class " . $classname, Project::MSG_VERBOSE);
-            }
-        } else {
-            $this->log("Adhoc task executed but did not result in any new classes.", Project::MSG_VERBOSE);
-        }
-    }
-    
-    /**
-     * Get array of names of newly defined classes.
-     * @return array
-     */
-    protected function getNewClasses() {
-        return $this->newClasses;
-    }
-    
-    /**
-     * Load the adhoc class, and perform any core validation.
-     * @return string The classname of the ProjectComponent class.
-     * @throws BuildException - if more than one class is defined.
-     */
-    protected function execute() {
-        $classes = get_declared_classes();        
-        eval($this->script);        
-        $this->newClasses = array_diff(get_declared_classes(), $classes);        
-    }
-            
-    /**
-     * Set the script.
-     * @param string $script
-     */
-    public function addText($script) {
-        $this->script = $script;
-    }
-           
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/AdhocTaskdefTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/AdhocTaskdefTask.php
deleted file mode 100644
index 2f436e2fe..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/AdhocTaskdefTask.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/*
- * $Id: AdhocTaskdefTask.php 144 2007-02-05 15:19:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-require_once 'phing/tasks/system/AdhocTask.php';
-
-/**
- * A class for creating adhoc tasks in build file.
- * 
- * <target name="test-adhoc">
- *        <adhoc-task name="foo"><![CDATA[
- *
- *            class FooTest extends Task {
- *                private $bar;
- *                
- *                function setBar($bar) {
- *                    $this->bar = $bar;
- *                }
- *                
- *                function main() {
- *                    $this->log("In FooTest: " . $this->bar);
- *                }
- *            }
- *
- *        ]]></adhoc-task>
- * 
- *      <foo bar="B.L.I.N.G"/>
- * </target>
- *  
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.5 $
- * @package   phing.tasks.system
- */
-class AdhocTaskdefTask extends AdhocTask {
-
-    /**
-     * The tag that refers to this task.
-     */
-    private $name;
-    
-    /**
-     * Set the tag that will represent this adhoc task/type.
-     * @param string $name
-     */       
-    public function setName($name) {
-        $this->name = $name;
-    }
-    
-    /** Main entry point */
-    public function main() {        
-        if ($this->name === null) {
-            throw new BuildException("The name attribute is required for adhoc task definition.",$this->location);
-        }
-        
-        $this->execute();
-        
-        $classes = $this->getNewClasses();
-        if (count($classes) !== 1) {
-            throw new BuildException("You must define one (and only one) class for AdhocTaskdefTask.");
-        }
-        $classname = array_shift($classes);
-        
-        // instantiate it to make sure it is an instance of Task
-        $t = new $classname();
-        if (!($t instanceof Task)) {
-            throw new BuildException("The adhoc class you defined must be an instance of phing.Task", $this->location);
-        }
-        
-        $this->log("Task " . $this->name . " will be handled by class " . $classname, Project::MSG_VERBOSE);
-        $this->project->addTaskDefinition($this->name, $classname);        
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/AdhocTypedefTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/AdhocTypedefTask.php
deleted file mode 100644
index 7fea3ee41..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/AdhocTypedefTask.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/*
- * $Id: AdhocTypedefTask.php 144 2007-02-05 15:19:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-require_once 'phing/tasks/system/AdhocTask.php';
-
-/**
- * A class for creating adhoc datatypes in build file.
- * 
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.4 $
- * @package   phing.tasks.system
- */
-class AdhocTypedefTask extends AdhocTask {
-
-    /**
-     * The tag that refers to this task.
-     */
-    private $name;
-
-    /**
-     * Set the tag that will represent this adhoc task/type.
-     * @param string $name
-     */       
-    public function setName($name) {
-        $this->name = $name;
-    }
-        
-    /** Main entry point */
-    public function main() {
-    
-        if ($this->name === null) {
-            throw new BuildException("The name attribute is required for adhoc task definition.",$this->location);
-        }
-        
-        $this->execute();
-        
-        $classes = $this->getNewClasses();
-        if (count($classes) !== 1) {
-            throw new BuildException("You must define one (and only one) class for AdhocTypedefTask.");
-        }
-        $classname = array_shift($classes);
-        
-        // instantiate it to make sure it is an instance of ProjectComponent
-        $t = new $classname();
-        if (!($t instanceof ProjectComponent)) {
-            throw new BuildException("The adhoc class you defined must be an instance of phing.ProjectComponent", $this->location);
-        }
-        
-        $this->log("Datatype " . $this->name . " will be handled by class " . $classname, Project::MSG_VERBOSE);
-        $this->project->addDataTypeDefinition($this->name, $classname);        
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/AppendTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/AppendTask.php
deleted file mode 100644
index 39fa958c6..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/AppendTask.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-/*
- *  $Id: AppendTask.php 144 2007-02-05 15:19:00Z hans $  
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-include_once 'phing/types/FileList.php';
-include_once 'phing/types/FileSet.php';
-
-/**
- *  Appends text, contents of a file or set of files defined by a filelist to a destination file.
- *
- * <code>
- * <append text="And another thing\n" destfile="badthings.log"/>
- * </code>
- * OR
- * <code>
- * <append file="header.html" destfile="fullpage.html"/>
- * <append file="body.html" destfile="fullpage.html"/>
- * <append file="footer.html" destfile="fullpage.html"/>
- * </code>
- * OR
- * <code>
- * <append destfile="${process.outputfile}">
- *    <filterchain>
- *        <xsltfilter style="${process.stylesheet}">
- *            <param name="mode" expression="${process.xslt.mode}"/>
- *            <param name="file_name" expression="%{task.append.current_file.basename}"/> <!-- Example of using a RegisterSlot variable -->
- *        </xsltfilter>
- *    </filterchain>
- *     <filelist dir="book/" listfile="book/PhingGuide.book"/>            
- * </append>
- * </code>
- * @package phing.tasks.system
- * @version $Revision: 1.14 $
- */
-class AppendTask extends Task {
-    
-    /** Append stuff to this file. */
-    private $to;
-    
-    /** Explicit file to append. */
-    private $file;
-    
-    /** Any filesets of files that should be appended. */
-    private $filesets = array();
-    
-    /** Any filelists of files that should be appended. */
-    private $filelists = array();
-    
-    /** Any filters to be applied before append happens. */
-    private $filterChains = array();
-    
-    /** Text to append. (cannot be used in conjunction w/ files or filesets) */
-    private $text;
-    
-    /** Sets specific file to append. */
-    function setFile(PhingFile $f) {        
-        $this->file = $f;
-    }
-    
-    /**
-     * Set target file to append to.
-     * @deprecated Will be removed with final release.
-     */
-    function setTo(PhingFile $f) {        
-        $this->log("The 'to' attribute is deprecated in favor of 'destFile'; please update your code.", Project::MSG_WARN);
-        $this->to = $f;
-    }
-    
-    /**
-     * The more conventional naming for method to set destination file.
-     * @param PhingFile $f
-     */
-    function setDestFile(PhingFile $f) {        
-        $this->to = $f;
-    }
-    
-    /**
-     * Supports embedded <filelist> element.
-     * @return FileList
-     */
-    function createFileList() {
-        $num = array_push($this->filelists, new FileList());
-        return $this->filelists[$num-1];
-    }
-
-    /**
-     * Nested creator, adds a set of files (nested <fileset> attribute).
-     * This is for when you don't care what order files get appended.
-     * @return FileSet
-     */
-    function createFileSet() {
-        $num = array_push($this->filesets, new FileSet());
-        return $this->filesets[$num-1];
-    }
-    
-    /**
-     * Creates a filterchain
-     *
-     * @return FilterChain The created filterchain object
-     */
-    function createFilterChain() {
-        $num = array_push($this->filterChains, new FilterChain($this->project));
-        return $this->filterChains[$num-1];
-    }    
-    
-    /**
-     * Sets text to append.  (cannot be used in conjunction w/ files or filesets).
-     * @param string $txt
-     */
-    function setText($txt) {
-        $this->text = (string) $txt;
-    }
-
-    /**
-     * Sets text to append. Supports CDATA.
-     * @param string $txt
-     */
-    function addText($txt) {
-        $this->text = (string) $txt;
-    }
-
-    
-    /** Append the file(s). */
-    function main() {
-    
-        if ($this->to === null) {
-            throw new BuildException("You must specify the 'destFile' attribute");
-        }
-        
-        if ($this->file === null && empty($this->filelists) && empty($this->filesets) && $this->text === null) {
-            throw new BuildException("You must specify a file, use a filelist, or specify a text value.");
-        }
-        
-        if ($this->text !== null && ($this->file !== null || !empty($this->filelists))) {
-            throw new BuildException("Cannot use text attribute in conjunction with file or filelists.");
-        }
-        
-        // create a filwriter to append to "to" file.
-        $writer = new FileWriter($this->to, $append=true);
-        
-        if ($this->text !== null) {            
-            
-            // simply append the text
-            $this->log("Appending string to " . $this->to->getPath());
-            
-            // for debugging primarily, maybe comment
-            // out for better performance(?)
-            $lines = explode("\n", $this->text);
-            foreach($lines as $line) {
-                $this->log($line, Project::MSG_VERBOSE);
-            }
-            
-            $writer->write($this->text);
-                        
-        } else {        
-            
-            // append explicitly-specified file
-            if ($this->file !== null) { 
-                try {
-                    $this->appendFile($writer, $this->file);
-                } catch (Exception $ioe) {
-                    $this->log("Unable to append contents of file " . $this->file->getAbsolutePath() . ": " . $ioe->getMessage(), Project::MSG_WARN);
-                }                
-            }
-            
-            // append the files in the filelists
-            foreach($this->filelists as $fl) {
-                try {
-                    $files = $fl->getFiles($this->project);
-                    $this->appendFiles($writer, $files, $fl->getDir($this->project));
-                } catch (BuildException $be) {
-                    $this->log($be->getMessage(), Project::MSG_WARN);
-                }
-            }
-            
-            // append any files in filesets
-            foreach($this->filesets as $fs) {
-                try {
-                    $files = $fs->getDirectoryScanner($this->project)->getIncludedFiles();
-                    $this->appendFiles($writer, $files, $fs->getDir($this->project));
-                } catch (BuildException $be) {
-                    $this->log($be->getMessage(), Project::MSG_WARN);
-                }
-            }                        
-            
-        } // if ($text ) {} else {}
-        
-        $writer->close();
-    }
-    
-    /**
-     * Append an array of files in a directory.
-     * @param FileWriter $writer The FileWriter that is appending to target file.
-     * @param array $files array of files to delete; can be of zero length
-     * @param PhingFile $dir directory to work from
-     */
-    private function appendFiles(FileWriter $writer, $files, PhingFile $dir) {
-        if (!empty($files)) {
-            $this->log("Attempting to append " . count($files) . " files" .($dir !== null ? ", using basedir " . $dir->getPath(): ""));
-            $basenameSlot = Register::getSlot("task.append.current_file");
-            $pathSlot = Register::getSlot("task.append.current_file.path");
-            foreach($files as $filename) {
-                try {
-                    $f = new PhingFile($dir, $filename);
-                    $basenameSlot->setValue($filename);
-                    $pathSlot->setValue($f->getPath());
-                    $this->appendFile($writer, $f);
-                } catch (Exception $ioe) {
-                    $this->log("Unable to append contents of file " . $f->getAbsolutePath() . ": " . $ioe->getMessage(), Project::MSG_WARN);
-                }
-            }
-        } // if !empty        
-    }
-    
-    private function appendFile(FileWriter $writer, PhingFile $f) {
-        $in = FileUtils::getChainedReader(new FileReader($f), $this->filterChains, $this->project);
-        while(-1 !== ($buffer = $in->read())) { // -1 indicates EOF
-            $writer->write($buffer);
-        }
-        $this->log("Appending contents of " . $f->getPath() . " to " . $this->to->getPath());    
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/AvailableTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/AvailableTask.php
deleted file mode 100644
index 0f03aa583..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/AvailableTask.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-/*
- *  $Id: AvailableTask.php 333 2007-12-28 21:30:09Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-include_once 'phing/tasks/system/condition/ConditionBase.php';
-
-/**
- *  <available> task.
- *
- *  Note: implements condition interface (see condition/Condition.php)
- *
- *  @author    Andreas Aderhold <andi@binarycloud.com>
- *  @copyright � 2001,2002 THYRELL. All rights reserved
- *  @version   $Revision: 1.11 $
- *  @package   phing.tasks.system
- */
-class AvailableTask extends Task {
-
-	/** Property to check for. */
-	private $property;
-
-	/** Value property should be set to. */
-	private $value = "true";
-
-	/** Resource to check for */
-	private $resource;
-
-	private $type = null;
-	private $filepath = null;
-
-	function setProperty($property) {
-		$this->property = (string) $property;
-	}
-
-	function setValue($value) {
-		$this->value = (string) $value;
-	}
-
-	function setFile(PhingFile $file) {
-		$this->file = $file;
-	}
-
-	function setResource($resource) {
-		$this->resource = (string) $resource;
-	}
-
-	function setType($type) {
-		$this->type = (string) strtolower($type);
-	}
-
-	function main() {
-		if ($this->property === null) {
-			throw new BuildException("property attribute is required", $this->location);
-		}
-		if ($this->evaluate()) {
-			$this->project->setProperty($this->property, $this->value);
-		}
-	}
-
-	function evaluate() {
-		if ($this->file === null && $this->resource === null) {
-			throw new BuildException("At least one of (file|resource) is required", $this->location);
-		}
-
-		if ($this->type !== null && ($this->type !== "file" && $this->type !== "dir")) {
-			throw new BuildException("Type must be one of either dir or file", $this->location);
-		}
-
-		if (($this->file !== null) && !$this->_checkFile()) {
-			$this->log("Unable to find " . $this->file->__toString() . " to set property " . $this->property, Project::MSG_VERBOSE);
-			return false;
-		}
-
-		if (($this->resource !== null) && !$this->_checkResource($this->resource)) {
-			$this->log("Unable to load resource " . $this->resource . " to set property " . $this->property, Project::MSG_VERBOSE);
-			return false;
-		}
-
-		return true;
-	}
-
-	// this is prepared for the path type
-	private function _checkFile() {
-		if ($this->filepath === null) {
-			return $this->_checkFile1($this->file);
-		} else {
-			$paths = $this->filepath->listDir();
-			for($i=0,$pcnt=count($paths); $i < $pcnt; $i++) {
-				$this->log("Searching " . $paths[$i], Project::MSG_VERBOSE);
-				$tmp = new PhingFile($paths[$i], $this->file->getName());
-				if($tmp->isFile()) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	private function _checkFile1(PhingFile $file) {
-		if ($this->type !== null) {
-			if ($this->type === "dir") {
-				return $file->isDirectory();
-			} else if ($this->type === "file") {
-				return $file->isFile();
-			}
-		}
-		return $file->exists();
-	}
-	
-	private function _checkResource($resource) {
-		if (null != ($resourcePath = Phing::getResourcePath($resource))) {
-			return $this->_checkFile1(new PhingFile($resourcePath));
-		} else {
-			return false;
-		}
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ChmodTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ChmodTask.php
deleted file mode 100644
index b17dc5352..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ChmodTask.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-/*
- *  $Id: ChmodTask.php 242 2007-09-26 15:39:45Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-include_once 'phing/types/FileSet.php';
-
-/**
- * Task that changes the permissions on a file/directory.
- *
- * @author    Manuel Holtgrewe <grin@gmx.net>
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.12 $
- * @package   phing.tasks.system
- */
-class ChmodTask extends Task {
-
-    private $file;
-
-    private $mode;
-
-    private $filesets = array();
-
-    private $filesystem;
-	
-	private $quiet = false;	
-	private $failonerror = true;
-	private $verbose = true;
-    
-	/**
-	 * This flag means 'note errors to the output, but keep going'
-	 * @see setQuiet()
-	 */
-    function setFailonerror($bool) {
-        $this->failonerror = $bool;
-    }	
-
-    /**
-     * Set quiet mode, which suppresses warnings if chmod() fails.
-	 * @see setFailonerror()
-     */
-    function setQuiet($bool) {
-        $this->quiet = $bool;
-        if ($this->quiet) {
-            $this->failonerror = false;
-        }
-    }
-    
-    /**
-     * Set verbosity, which if set to false surpresses all but an overview
-     * of what happened.
-     */
-    function setVerbose($bool) {
-        $this->verbose = (bool)$bool;
-    }
-	
-    /**
-     * Sets a single source file to touch.  If the file does not exist
-     * an empty file will be created.
-     */
-    function setFile(PhingFile $file) {        
-        $this->file = $file;
-    } 
-
-    function setMode($str) {
-        $this->mode = $str;
-    }
-
-    /**
-     * Nested creator, adds a set of files (nested fileset attribute).
-     */
-    function createFileSet() {
-        $num = array_push($this->filesets, new FileSet());
-        return $this->filesets[$num-1];
-    }
-
-    /**
-     * Execute the touch operation.
-     * @return void
-     */
-    function main() {
-        // Check Parameters
-        $this->checkParams();       
-        $this->chmod();
-    }
-    
-    /**
-     * Ensure that correct parameters were passed in.
-     * @return void
-     */
-    private function checkParams() {
-    
-        if ($this->file === null && empty($this->filesets)) {
-            throw new BuildException("Specify at least one source - a file or a fileset.");
-        }
-
-        if ($this->mode === null) {
-            throw new BuildException("You have to specify an octal mode for chmod.");
-        }
-
-        // check for mode to be in the correct format
-        if (!preg_match('/^([0-7]){3,4}$/', $this->mode)) {
-            throw new BuildException("You have specified an invalid mode.");
-        }
-     
-    }
-
-    /**
-     * Does the actual work.
-     * @return void
-     */
-    private function chmod() {
-    	
-		if (strlen($this->mode) === 4) {
-			$mode = octdec($this->mode);
-		} else {
-			// we need to prepend the 0 before converting
-			$mode = octdec("0". $this->mode);
-		}
-        
-        // counters for non-verbose output
-        $total_files = 0;
-        $total_dirs = 0;
-        
-        // one file
-        if ($this->file !== null) {
-            $total_files = 1;
-            $this->chmodFile($this->file, $mode);
-        }
-
-        // filesets
-        foreach($this->filesets as $fs) {
-                    
-            $ds = $fs->getDirectoryScanner($this->project);
-            $fromDir = $fs->getDir($this->project);
-
-            $srcFiles = $ds->getIncludedFiles();
-            $srcDirs = $ds->getIncludedDirectories();
-
-            $filecount = count($srcFiles);
-            $total_files = $total_files + $filecount;
-            for ($j = 0; $j < $filecount; $j++) {
-                $this->chmodFile(new PhingFile($fromDir, $srcFiles[$j]), $mode);
-            }
-
-            $dircount = count($srcDirs);
-            $total_dirs = $total_dirs + $dircount;
-            for ($j = 0; $j <  $dircount; $j++) {
-                $this->chmodFile(new PhingFile($fromDir, $srcDirs[$j]), $mode);
-            }
-        }
-
-        if (!$this->verbose) {
-            $this->log('Total files changed to ' . vsprintf('%o', $mode) . ': ' . $total_files);
-            $this->log('Total directories changed to ' . vsprintf('%o', $mode) . ': ' . $total_dirs);
-        }
-
-    }
-
-	/**
-	 * Actually change the mode for the file.
-	 * @param PhingFile $file
-	 * @param int $mode
-	 */
-    private function chmodFile(PhingFile $file, $mode) {
-        if ( !$file->exists() ) {
-            throw new BuildException("The file " . $file->__toString() . " does not exist");
-        }   
-		     
-		try {
-			$file->setMode($mode);
-			if ($this->verbose) {
-				$this->log("Changed file mode on '" . $file->__toString() ."' to " . vsprintf("%o", $mode));
-			}
-		} catch (Exception $e) {
-			if($this->failonerror) {
-				throw $e;
-			} else {
-				$this->log($e->getMessage(), $this->quiet ? Project::MSG_VERBOSE : Project::MSG_WARN);
-			}
-		}
-    }
-	
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ChownTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ChownTask.php
deleted file mode 100644
index 916cf53e4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ChownTask.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-/*
- *  $Id: ChownTask.php 353 2008-02-06 19:43:18Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-include_once 'phing/types/FileSet.php';
-
-/**
- * Task that changes the permissions on a file/directory.
- *
- * @author	  Mehmet Emre Yilmaz <mehmety@gmail.com>
- * @version   $Revision$
- * @package   phing.tasks.system
- */
-class ChownTask extends Task {
-
-    private $file;
-
-    private $user;
-
-    private $filesets = array();
-
-    private $filesystem;
-
-	private $quiet = false;
-	private $failonerror = true;
-	private $verbose = true;
-
-	/**
-	 * This flag means 'note errors to the output, but keep going'
-	 * @see setQuiet()
-	 */
-    function setFailonerror($bool) {
-        $this->failonerror = $bool;
-    }
-
-    /**
-     * Set quiet mode, which suppresses warnings if chown() fails.
-	 * @see setFailonerror()
-     */
-    function setQuiet($bool) {
-        $this->quiet = $bool;
-        if ($this->quiet) {
-            $this->failonerror = false;
-        }
-    }
-
-    /**
-     * Set verbosity, which if set to false surpresses all but an overview
-     * of what happened.
-     */
-    function setVerbose($bool) {
-        $this->verbose = (bool)$bool;
-    }
-
-    /**
-     * Sets a single source file to touch.  If the file does not exist
-     * an empty file will be created.
-     */
-    function setFile(PhingFile $file) {
-        $this->file = $file;
-    }
-
-    function setUser($str) {
-        $this->user = $str;
-    }
-
-    /**
-     * Nested creator, adds a set of files (nested fileset attribute).
-     */
-    function createFileSet() {
-        $num = array_push($this->filesets, new FileSet());
-        return $this->filesets[$num-1];
-    }
-
-    /**
-     * Execute the touch operation.
-     * @return void
-     */
-    function main() {
-        // Check Parameters
-        $this->checkParams();
-        $this->chown();
-    }
-
-    /**
-     * Ensure that correct parameters were passed in.
-     * @return void
-     */
-    private function checkParams() {
-
-        if ($this->file === null && empty($this->filesets)) {
-            throw new BuildException("Specify at least one source - a file or a fileset.");
-        }
-
-        if ($this->user === null) {
-            throw new BuildException("You have to specify a user for chown.");
-        }
-
-        // check for mode to be in the correct format
-
-
-    }
-
-    /**
-     * Does the actual work.
-     * @return void
-     */
-    private function chown() {
-
-		$user= $this->user;
-
-        // counters for non-verbose output
-        $total_files = 0;
-        $total_dirs = 0;
-
-        // one file
-        if ($this->file !== null) {
-            $total_files = 1;
-            $this->chownFile($this->file, $user);
-        }
-
-        // filesets
-        foreach($this->filesets as $fs) {
-
-            $ds = $fs->getDirectoryScanner($this->project);
-            $fromDir = $fs->getDir($this->project);
-
-            $srcFiles = $ds->getIncludedFiles();
-            $srcDirs = $ds->getIncludedDirectories();
-
-            $filecount = count($srcFiles);
-            $total_files = $total_files + $filecount;
-            for ($j = 0; $j < $filecount; $j++) {
-                $this->chownFile(new PhingFile($fromDir, $srcFiles[$j]), $user);
-            }
-
-            $dircount = count($srcDirs);
-            $total_dirs = $total_dirs + $dircount;
-            for ($j = 0; $j <  $dircount; $j++) {
-                $this->chownFile(new PhingFile($fromDir, $srcDirs[$j]), $user);
-            }
-        }
-
-        if (!$this->verbose) {
-            $this->log('Total files changed to ' . vsprintf('%o', $mode) . ': ' . $total_files);
-            $this->log('Total directories changed to ' . vsprintf('%o', $mode) . ': ' . $total_dirs);
-        }
-
-    }
-
-	/**
-	 * Actually change the mode for the file.
-	 * @param PhingFile $file
-	 * @param int $mode
-	 */
-    private function chownFile(PhingFile $file, $user) {
-        if ( !$file->exists() ) {
-            throw new BuildException("The file " . $file->__toString() . " does not exist");
-        }
-
-		try {
-			$file->setUser($user);
-			if ($this->verbose) {
-				$this->log("Changed file owner on '" . $file->__toString() ."' to " . $user);
-			}
-		} catch (Exception $e) {
-			if($this->failonerror) {
-				throw $e;
-			} else {
-				$this->log($e->getMessage(), $this->quiet ? Project::MSG_VERBOSE : Project::MSG_WARN);
-			}
-		}
-    }
-
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ConditionTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ConditionTask.php
deleted file mode 100644
index ae626e73f..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ConditionTask.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/*
- *  $Id: ConditionTask.php 43 2006-03-10 14:31:51Z mrook $  
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-require_once 'phing/tasks/system/condition/ConditionBase.php';
-
-/**
- *  <condition> task as a generalization of <available>
- *
- *  <p>This task supports boolean logic as well as pluggable conditions
- *  to decide, whether a property should be set.</p>
- *
- *  <p>This task does not extend Task to take advantage of
- *  ConditionBase.</p>
- *
- *  @author    Andreas Aderhold <andi@binarycloud.com>
- *  @copyright � 2001,2002 THYRELL. All rights reserved
- *  @version   $Revision: 1.7 $ $Date: 2006-03-10 23:31:51 +0900 (金, 10  3月 2006) $
- *  @access    public
- *  @package   phing.tasks.system
- */
-class ConditionTask extends ConditionBase {
-
-    private $property;
-    private $value = "true";
-
-    /**
-     * The name of the property to set. Required.
-     */
-    function setProperty($p) {
-        $this->property = $p;
-    }
-
-    /**
-     * The value for the property to set. Defaults to "true".
-     */
-    function setValue($v) {
-        $this->value = $v;
-    }
-
-    /**
-     * See whether our nested condition holds and set the property.
-     */
-    function main() {
-
-        if ($this->countConditions() > 1) {
-            throw new BuildException("You must not nest more than one condition into <condition>");
-        }
-        if ($this->countConditions() < 1) {
-            throw new BuildException("You must nest a condition into <condition>");
-        }
-        $cs = $this->getIterator();        
-        if ($cs->current()->evaluate()) {
-            $this->project->setProperty($this->property, $this->value);
-        }
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/CopyTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/CopyTask.php
deleted file mode 100644
index f71a91af1..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/CopyTask.php
+++ /dev/null
@@ -1,408 +0,0 @@
-<?php
-/*
- *  $Id: CopyTask.php 235 2007-09-05 18:42:02Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-require_once 'phing/Task.php';
-include_once 'phing/system/io/PhingFile.php';
-include_once 'phing/util/FileUtils.php';
-include_once 'phing/util/SourceFileScanner.php';
-include_once 'phing/mappers/IdentityMapper.php';
-include_once 'phing/mappers/FlattenMapper.php';
-
-/**
- * A phing copy task.  Copies a file or directory to a new file
- * or directory.  Files are only copied if the source file is newer
- * than the destination file, or when the destination file does not
- * exist. It is possible to explictly overwrite existing files.
- *
- * @author   Andreas Aderhold, andi@binarycloud.com
- * @version  $Revision: 1.16 $ $Date: 2007-09-06 03:42:02 +0900 (木, 06  9月 2007) $
- * @package  phing.tasks.system
- */
-class CopyTask extends Task {
-    
-    protected $file          = null;   // the source file (from xml attribute)
-    protected $destFile      = null;   // the destiantion file (from xml attribute)
-    protected $destDir       = null;   // the destination dir (from xml attribute)
-    protected $overwrite     = false;  // overwrite destination (from xml attribute)
-    protected $preserveLMT   = true;   // sync timestamps (from xml attribute)
-    protected $includeEmpty  = true;   // include empty dirs? (from XML)
-    protected $flatten       = false;  // apply the FlattenMapper right way (from XML)
-    protected $mapperElement = null;
-
-    protected $fileCopyMap   = array(); // asoc array containing mapped file names
-    protected $dirCopyMap    = array(); // asoc array containing mapped file names
-    protected $completeDirMap= array(); // asoc array containing complete dir names
-    protected $fileUtils     = null;    // a instance of fileutils
-    protected $filesets      = array(); // all fileset objects assigned to this task
-    protected $filterChains  = array(); // all filterchains objects assigned to this task
-
-    protected $verbosity     = Project::MSG_VERBOSE;
-
-    /**
-     * Sets up this object internal stuff. i.e. the Fileutils instance
-     *
-     * @return object   The CopyTask instnace
-     * @access public
-     */
-    function __construct() {
-        $this->fileUtils = new FileUtils();
-    }
-
-    /**
-     * Set the overwrite flag. IntrospectionHelper takes care of
-     * booleans in set* methods so we can assume that the right
-     * value (boolean primitive) is coming in here.
-     *
-     * @param  boolean  Overwrite the destination file(s) if it/they already exist
-     * @return void
-     * @access public
-     */
-    function setOverwrite($bool) {
-        $this->overwrite = (boolean) $bool;
-    }
-
-    /**
-     * Used to force listing of all names of copied files.
-     * @param boolean $verbosity
-     */
-    function setVerbose($verbosity) {
-        if ($verbosity) {
-            $this->verbosity = Project::MSG_INFO;
-        } else {
-            $this->verbosity = Project::MSG_VERBOSE;
-        }
-    }
-    
-    /**
-     * Set the preserve timestmap flag. IntrospectionHelper takes care of
-     * booleans in set* methods so we can assume that the right
-     * value (boolean primitive) is coming in here.
-     *
-     * @param  boolean  Preserve the timestamp on the destination file
-     * @return void
-     * @access public
-     */
-    function setTstamp($bool) {
-        $this->preserveLMT = (boolean) $bool;
-    }
-
-
-    /**
-     * Set the include empty dirs flag. IntrospectionHelper takes care of
-     * booleans in set* methods so we can assume that the right
-     * value (boolean primitive) is coming in here.
-     *
-     * @param  boolean  Flag if empty dirs should be cpoied too
-     * @return void
-     * @access public
-     */
-    function setIncludeEmptyDirs($bool) {
-        $this->includeEmpty = (boolean) $bool;
-    }
-
-
-    /**
-     * Set the file. We have to manually take care of the
-     * type that is coming due to limited type support in php
-     * in and convert it manually if neccessary.
-     *
-     * @param  string/object  The source file. Either a string or an PhingFile object
-     * @return void
-     * @access public
-     */
-    function setFile(PhingFile $file) {        
-        $this->file = $file;
-    }
-
-
-    /**
-     * Set the toFile. We have to manually take care of the
-     * type that is coming due to limited type support in php
-     * in and convert it manually if neccessary.
-     *
-     * @param  string/object  The dest file. Either a string or an PhingFile object
-     * @return void
-     * @access public
-     */
-    function setTofile(PhingFile $file) {       
-        $this->destFile = $file;
-    }
-
-
-    /**
-     * Set the toDir. We have to manually take care of the
-     * type that is coming due to limited type support in php
-     * in and convert it manually if neccessary.
-     *
-     * @param  string/object  The directory, either a string or an PhingFile object
-     * @return void
-     * @access public
-     */
-    function setTodir(PhingFile $dir) {        
-        $this->destDir = $dir;
-    }
-
-    /**
-     * Nested creator, creates a FileSet for this task
-     *
-     * @access  public
-     * @return  object  The created fileset object
-     */
-    function createFileSet() {
-        $num = array_push($this->filesets, new FileSet());
-        return $this->filesets[$num-1];
-    }
-
-    /**
-     * Creates a filterchain
-     *
-     * @access public
-     * @return  object  The created filterchain object
-     */
-    function createFilterChain() {
-        $num = array_push($this->filterChains, new FilterChain($this->project));
-        return $this->filterChains[$num-1];
-    }
-
-    /**
-     * Nested creator, creates one Mapper for this task
-     *
-     * @access  public
-     * @return  object  The created Mapper type object
-     * @throws  BuildException
-     */
-    function createMapper() {
-        if ($this->mapperElement !== null) {
-            throw new BuildException("Cannot define more than one mapper", $this->location);
-        }
-        $this->mapperElement = new Mapper($this->project);
-        return $this->mapperElement;
-    }
-
-    /**
-     * The main entry point where everything gets in motion.
-     *
-     * @access  public
-     * @return  true on success
-     * @throws  BuildException
-     */
-    function main() {
-    
-        $this->validateAttributes();
-
-        if ($this->file !== null) {
-            if ($this->file->exists()) {
-                if ($this->destFile === null) {
-                    $this->destFile = new PhingFile($this->destDir, (string) $this->file->getName());
-                }
-                if ($this->overwrite === true || ($this->file->lastModified() > $this->destFile->lastModified())) {
-                    $this->fileCopyMap[$this->file->getAbsolutePath()] = $this->destFile->getAbsolutePath();
-                } else {
-                    $this->log($this->file->getName()." omitted, is up to date");
-                }
-            } else {
-                // terminate build
-                throw new BuildException("Could not find file " . $this->file->__toString() . " to copy.");
-            }
-        }
-
-        $project = $this->getProject();
-
-        // process filesets
-        foreach($this->filesets as $fs) {
-            $ds = $fs->getDirectoryScanner($project);
-            $fromDir  = $fs->getDir($project);
-            $srcFiles = $ds->getIncludedFiles();
-            $srcDirs  = $ds->getIncludedDirectories();
-            
-            if (!$this->flatten && $this->mapperElement === null)
-            {
-				$this->completeDirMap[$fromDir->getAbsolutePath()] = $this->destDir->getAbsolutePath();
-			}
-            
-            $this->_scan($fromDir, $this->destDir, $srcFiles, $srcDirs);
-        }
-
-        // go and copy the stuff
-        $this->doWork();
-
-        if ($this->destFile !== null) {
-            $this->destDir = null;
-        }
-    }
-
-    /**
-     * Validates attributes coming in from XML
-     *
-     * @access  private
-     * @return  void
-     * @throws  BuildException
-     */
-    protected function validateAttributes() {
-    
-        if ($this->file === null && count($this->filesets) === 0) {
-            throw new BuildException("CopyTask. Specify at least one source - a file or a fileset.");
-        }
-
-        if ($this->destFile !== null && $this->destDir !== null) {
-            throw new BuildException("Only one of destfile and destdir may be set.");
-        }
-
-        if ($this->destFile === null && $this->destDir === null) {
-            throw new BuildException("One of destfile or destdir must be set.");
-        }
-
-        if ($this->file !== null && $this->file->exists() && $this->file->isDirectory()) {
-            throw new BuildException("Use a fileset to copy directories.");
-        }
-
-        if ($this->destFile !== null && count($this->filesets) > 0) {
-            throw new BuildException("Cannot concatenate multple files into a single file.");
-        }
-
-        if ($this->destFile !== null) {
-            $this->destDir = new PhingFile($this->destFile->getParent());
-        }
-    }
-
-    /**
-     * Compares source files to destination files to see if they
-     * should be copied.
-     *
-     * @access  private
-     * @return  void
-     */
-    private function _scan(&$fromDir, &$toDir, &$files, &$dirs) {
-        /* mappers should be generic, so we get the mappers here and
-        pass them on to builMap. This method is not redundan like it seems */
-        $mapper = null;
-        if ($this->mapperElement !== null) {
-            $mapper = $this->mapperElement->getImplementation();
-        } else if ($this->flatten) {
-            $mapper = new FlattenMapper();
-        } else {
-            $mapper = new IdentityMapper();
-        }
-        $this->buildMap($fromDir, $toDir, $files, $mapper, $this->fileCopyMap);
-        $this->buildMap($fromDir, $toDir, $dirs, $mapper, $this->dirCopyMap);
-    }
-
-    /**
-     * Builds a map of filenames (from->to) that should be copied
-     *
-     * @access  private
-     * @return  void
-     */
-    private function buildMap(&$fromDir, &$toDir, &$names, &$mapper, &$map) {
-        $toCopy = null;
-        if ($this->overwrite) {
-            $v = array();
-            foreach($names as $name) {
-                $result = $mapper->main($name);
-                if ($result !== null) {
-                    $v[] = $name;
-                }
-            }
-            $toCopy = $v;
-        } else {
-            $ds = new SourceFileScanner($this);
-            $toCopy = $ds->restrict($names, $fromDir, $toDir, $mapper);
-        }
-
-        for ($i=0,$_i=count($toCopy); $i < $_i; $i++) {
-            $src  = new PhingFile($fromDir, $toCopy[$i]);
-            $mapped = $mapper->main($toCopy[$i]);
-            $dest = new PhingFile($toDir, $mapped[0]);
-            $map[$src->getAbsolutePath()] = $dest->getAbsolutePath();
-        }
-    }
-
-
-    /**
-     * Actually copies the files
-     *
-     * @access  private
-     * @return  void
-     * @throws  BuildException
-     */
-    protected function doWork() {
-		
-		// These "slots" allow filters to retrieve information about the currently-being-process files		
-		$fromSlot = $this->getRegisterSlot("currentFromFile");
-		$fromBasenameSlot = $this->getRegisterSlot("currentFromFile.basename");	
-
-		$toSlot = $this->getRegisterSlot("currentToFile");
-		$toBasenameSlot = $this->getRegisterSlot("currentToFile.basename");	
-		
-        $mapSize = count($this->fileCopyMap);
-        $total = $mapSize;
-        if ($mapSize > 0) {
-            $this->log("Copying ".$mapSize." file".(($mapSize) === 1 ? '' : 's')." to ". $this->destDir->getAbsolutePath());
-            // walks the map and actually copies the files
-            $count=0;
-            foreach($this->fileCopyMap as $from => $to) {
-                if ($from === $to) {
-                    $this->log("Skipping self-copy of " . $from, $this->verbosity);
-                    $total--;
-                    continue;
-                }
-                $this->log("From ".$from." to ".$to, $this->verbosity);
-                try { // try to copy file
-				
-					$fromFile = new PhingFile($from);
-					$toFile = new PhingFile($to);
-					
-                    $fromSlot->setValue($fromFile->getPath());
-					$fromBasenameSlot->setValue($fromFile->getName());
-
-					$toSlot->setValue($toFile->getPath());
-					$toBasenameSlot->setValue($toFile->getName());
-					
-                    $this->fileUtils->copyFile($fromFile, $toFile, $this->overwrite, $this->preserveLMT, $this->filterChains, $this->getProject());
-			
-                    $count++;
-                } catch (IOException $ioe) {
-                    $this->log("Failed to copy " . $from . " to " . $to . ": " . $ioe->getMessage(), Project::MSG_ERR);
-                }
-            }
-        }
-
-        // handle empty dirs if appropriate
-        if ($this->includeEmpty) {
-            $destdirs = array_values($this->dirCopyMap);
-            $count = 0;
-            foreach ($destdirs as $destdir) {
-                $d = new PhingFile((string) $destdir);
-                if (!$d->exists()) {
-                    if (!$d->mkdirs()) {
-                        $this->log("Unable to create directory " . $d->__toString(), Project::MSG_ERR);
-                    } else {
-                        $count++;
-                    }
-                }
-            }
-            if ($count > 0) {
-                $this->log("Copied ".$count." empty director" . ($count == 1 ? "y" : "ies") . " to " . $this->destDir->getAbsolutePath());
-            }
-        }
-    }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/CvsPassTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/CvsPassTask.php
deleted file mode 100644
index 13635391b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/CvsPassTask.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-/*
- *  $Id: CvsPassTask.php 227 2007-08-28 02:17:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-require_once 'phing/Task.php';
-include_once 'phing/system/io/BufferedReader.php';
-include_once 'phing/system/io/BufferedWriter.php';
-include_once 'phing/util/StringHelper.php';
-
-/**
- * Adds an new entry to a CVS password file.
- *
- * @author Hans Lellelid <hans@xmpl.org> (Phing)
- * @author Jeff Martin <jeff@custommonkey.org> (Ant)
- * @version $Revision: 1.7 $
- * @package phing.tasks.system
- */
-class CVSPassTask extends Task {
-
-    /** CVS Root */
-    private $cvsRoot; 
-    /** Password file to add password to */
-    private $passFile;
-    /** Password to add to file */
-    private $password;
-
-    /** Array contain char conversion data */
-    private static $shifts = array(
-          0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14,  15,
-         16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,  30,  31,
-        114, 120,  53,  79,  96, 109,  72, 108,  70,  64,  76,  67, 116,  74,  68,  87,
-        111,  52,  75, 119,  49,  34,  82,  81,  95,  65, 112,  86, 118, 110, 122, 105,
-         41,  57,  83,  43,  46, 102,  40,  89,  38, 103,  45,  50,  42, 123,  91,  35,
-        125,  55,  54,  66, 124, 126,  59,  47,  92,  71, 115,  78,  88, 107, 106,  56,
-         36, 121, 117, 104, 101, 100,  69,  73,  99,  63,  94,  93,  39,  37,  61,  48,
-         58, 113,  32,  90,  44,  98,  60,  51,  33,  97,  62,  77,  84,  80,  85, 223,
-        225, 216, 187, 166, 229, 189, 222, 188, 141, 249, 148, 200, 184, 136, 248, 190,
-        199, 170, 181, 204, 138, 232, 218, 183, 255, 234, 220, 247, 213, 203, 226, 193,
-        174, 172, 228, 252, 217, 201, 131, 230, 197, 211, 145, 238, 161, 179, 160, 212,
-        207, 221, 254, 173, 202, 146, 224, 151, 140, 196, 205, 130, 135, 133, 143, 246,
-        192, 159, 244, 239, 185, 168, 215, 144, 139, 165, 180, 157, 147, 186, 214, 176,
-        227, 231, 219, 169, 175, 156, 206, 198, 129, 164, 150, 210, 154, 177, 134, 127,
-        182, 128, 158, 208, 162, 132, 167, 209, 149, 241, 153, 251, 237, 236, 171, 195,
-        243, 233, 253, 240, 194, 250, 191, 155, 142, 137, 245, 235, 163, 242, 178, 152 
-    );
-
-    /**
-     * Create a CVS task using the default cvspass file location.
-     */
-    public function __construct() {
-        $this->passFile = new PhingFile(
-            Phing::getProperty("cygwin.user.home",
-                Phing::getProperty("user.home"))
-            . DIRECTORY_SEPARATOR . ".cvspass");
-    }
-
-    /**
-     * Does the work.
-     *
-     * @throws BuildException if someting goes wrong with the build
-     */
-    public final function main() {
-        if ($this->cvsRoot === null) {
-            throw new BuildException("cvsroot is required");
-        }
-        if ($this->password === null) {
-            throw new BuildException("password is required");
-        }
-
-        $this->log("cvsRoot: " . $this->cvsRoot, Project::MSG_DEBUG);
-        $this->log("password: " . $this->password, Project::MSG_DEBUG);
-        $this->log("passFile: " . $this->passFile->__toString(), Project::MSG_DEBUG);
-
-        $reader = null;
-        $writer = null;
-        
-        try {
-            $buf = "";
-
-            if ($this->passFile->exists()) {
-                $reader = new BufferedReader(new FileReader($this->passFile));
-                
-                $line = null;
-                while (($line = $reader->readLine()) !== null) {
-                    if (!StringHelper::startsWith($this->cvsRoot, $line)) {
-                        $buf .= $line . PHP_EOL;
-                    }
-                }
-            }
-
-            $pwdfile = $buf . $this->cvsRoot . " A" . $this->mangle($this->password);
-
-            $this->log("Writing -> " . $pwdfile , Project::MSG_DEBUG);
-
-            $writer = new BufferedWriter(new FileWriter($this->passFile));
-            $writer->write($pwdfile);
-            $writer->newLine();
-            
-            $writer->close();
-            if ($reader) {
-                $reader->close();
-            }
-                        
-        } catch (IOException $e) {
-            if ($reader) {
-                try {
-                    $reader->close();
-                } catch (Exception $e) {}                
-            }
-            
-            if ($writer) {
-                try {
-                    $writer->close();
-                } catch (Exception $e) {}                
-            }
-            
-            throw new BuildException($e);
-        }
-    }
-    
-    /**
-     * "Encode" the password.
-     */
-    private final function mangle($password){
-        $buf = "";
-        for ($i = 0, $plen = strlen($password); $i < $plen; $i++) {
-            $buf .= chr(self::$shifts[ord($password{$i})]);
-        }
-        return $buf;
-    }
-
-    /**
-     * The CVS repository to add an entry for.
-     * @param string $cvsRoot
-     */
-    public function setCvsroot($cvsRoot) {
-        $this->cvsRoot = $cvsRoot;
-    }
-
-    /**
-     * Password file to add the entry to.
-     * @param PhingFile $passFile
-     */
-    public function setPassfile(PhingFile $passFile) {
-        $this->passFile = $passFile;
-    }
-
-    /**
-     * Password to be added to the password file.
-     * @param string $password
-     */
-    public function setPassword($password) {
-        $this->password = $password;
-    }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/CvsTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/CvsTask.php
deleted file mode 100644
index 6f58460bb..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/CvsTask.php
+++ /dev/null
@@ -1,540 +0,0 @@
-<?php
-/*
- *  $Id: CvsTask.php 227 2007-08-28 02:17:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-include_once 'phing/tasks/system/ExecTask.php';
-include_once 'phing/types/Commandline.php';
-
-/**
- * Task for performing CVS operations.
- * 
- *  NOTE: This implementation has been moved here from Cvs.java with
- *  the addition of some accessors for extensibility.  Another task
- *  can extend this with some customized output processing.
- *
- * @author Hans Lellelid <hans@xmpl.org> (Phing)
- * @author costin@dnt.ro (Ant)
- * @author stefano@apache.org (Ant)
- * @author Wolfgang Werner <wwerner@picturesafe.de> (Ant)
- * @author Kevin Ross <kevin.ross@bredex.com> (Ant)
- * @version $Revision: 1.14 $
- * @package phing.tasks.system
- */
-class CvsTask extends Task {
-
-    /** 
-     * Default compression level to use, if compression is enabled via
-     * setCompression( true ). 
-     */
-    const DEFAULT_COMPRESSION_LEVEL = 3;
-
-    private $cmd;
-
-    /** 
-     * List of Commandline children 
-     * @var array Commandline[]
-     */
-    private $commandlines = array();
-
-    /**
-     * the CVSROOT variable.
-     */
-    private $cvsRoot;
-
-    /**
-     * the CVS_RSH variable.
-     */
-    private $cvsRsh;
-
-    /**
-     * the package/module to check out.
-     */
-    private $cvsModule;
-
-    /**
-     * the default command.
-     */
-    private static $default_command = "checkout";
-    
-    /**
-     * the CVS command to execute.
-     */
-    private $command = null;
-
-    /**
-     * suppress information messages.
-     */
-    private $quiet = false;
-
-    /**
-     * compression level to use.
-     */
-    private $compression = 0;
-
-    /**
-     * report only, don't change any files.
-     */
-    private $noexec = false;
-
-    /**
-     * CVS port
-     */
-    private $port = 0;
-
-    /**
-     * CVS password file
-     * @var File
-     */
-    private $passFile = null;
-
-    /**
-     * the directory where the checked out files should be placed.
-     * @var File
-     */
-    private $dest;
-   
-    private $error;
-    
-    private $output;
-   
-    /**
-     * If true it will stop the build if cvs exits with error.
-     * Default is false. (Iulian)
-     * @var boolean
-     */
-    private $failOnError = false;
-  
-    public function init() {
-        $this->cmd = new Commandline();
-    }
-    
-    /**
-     * Sets up the environment for toExecute and then runs it.
-     * @param Commandline $toExecute
-     * @throws BuildException
-     */
-    protected function runCommand(Commandline $toExecute) {
-    
-        // We are putting variables into the script's environment
-        // and not removing them (!)  This should be fine, but is 
-        // worth remembering and testing.
-            
-        if ($this->port > 0) {
-            putenv("CVS_CLIENT_PORT=".$this->port);
-        }
-        
-         // Need a better cross platform integration with <cvspass>, so
-         // use the same filename.
-
-        if ($this->passFile === null) {
-            $defaultPassFile = new PhingFile(Phing::getProperty("cygwin.user.home", Phing::getProperty("user.home")) 
-                . DIRECTORY_SEPARATOR . ".cvspass");
-            if($defaultPassFile->exists()) {
-                $this->setPassfile($defaultPassFile);
-            }
-        }
-
-        if ($this->passFile !== null) {
-            if ($this->passFile->isFile() && $this->passFile->canRead()) {            
-                putenv("CVS_PASSFILE=" . $this->passFile->__toString());
-                $this->log("Using cvs passfile: " . $this->passFile->__toString(), Project::MSG_INFO);
-            } elseif (!$this->passFile->canRead()) {
-                $this->log("cvs passfile: " . $this->passFile->__toString() 
-                    . " ignored as it is not readable", Project::MSG_WARN);
-            } else {
-                $this->log("cvs passfile: " . $this->passFile->__toString() 
-                    . " ignored as it is not a file",
-                    Project::MSG_WARN);
-            }
-        }
-
-        if ($this->cvsRsh !== null) {
-            putenv("CVS_RSH=".$this->cvsRsh);
-        }
-
-        // Use the ExecTask to handle execution of the command        
-        $exe = new ExecTask($this->project);
-        $exe->setProject($this->project);
-        
-        //exe.setAntRun(project);
-        if ($this->dest === null) {
-            $this->dest = $this->project->getBaseDir();
-        }
-
-        if (!$this->dest->exists()) {
-            $this->dest->mkdirs();
-        }
-        
-        if ($this->output !== null) {
-            $exe->setOutput($this->output);
-        }
-
-        if ($this->error !== null) {
-            $exe->setError($this->error);
-        }
-        
-        $exe->setDir($this->dest);
-        
-        if (is_object($toExecute)) {
-            $toExecuteStr = $toExecute->__toString(); // unfortunately no more automagic for initial 5.0.0 release :(
-        }
-        
-        $exe->setCommand($toExecuteStr);
-        
-        try {
-            $actualCommandLine = $toExecuteStr; // we converted to string above
-            $this->log($actualCommandLine, Project::MSG_INFO);
-            $retCode = $exe->execute();
-            $this->log("retCode=" . $retCode, Project::MSG_DEBUG);
-            /*Throw an exception if cvs exited with error. (Iulian)*/
-            if ($this->failOnError && $retCode !== 0) {
-                throw new BuildException("cvs exited with error code "
-                                         . $retCode 
-                                         . PHP_EOL
-                                         . "Command line was ["
-                                         . $toExecute->describeCommand() . "]", $this->getLocation());
-            }
-        } catch (IOException $e) {
-            if ($this->failOnError) {
-                throw new BuildException($e, $this->getLocation());
-            } else {
-                $this->log("Caught exception: " . $e, Project::MSG_WARN);
-            }
-        } catch (BuildException $e) {
-            if ($this->failOnError) {
-                throw $e;
-            } else {
-                $t = $e->getCause();
-                if ($t === null) {
-                    $t = $e;
-                }
-                $this->log("Caught exception: " . $t, Project::MSG_WARN);
-            }
-        } catch (Exception $e) {
-            if ($this->failOnError) {
-                throw new BuildException($e, $this->getLocation());
-            } else {
-                $this->log("Caught exception: " . $e, Project::MSG_WARN);
-            }
-        }
-    }
-
-    /**
-     * 
-     * @return void
-     * @throws BuildException
-     */
-    public function main() {
-
-        $savedCommand = $this->getCommand();
-
-        if ($this->getCommand() === null && empty($this->commandlines)) {
-            // re-implement legacy behaviour:
-            $this->setCommand(self::$default_command);
-        }
-
-        $c = $this->getCommand();
-        $cloned = null;
-        if ($c !== null) {
-            $cloned = $this->cmd->__copy();
-            $cloned->createArgument(true)->setLine($c);
-            $this->addConfiguredCommandline($cloned, true);
-        }
-
-        try {
-            for ($i = 0, $vecsize=count($this->commandlines); $i < $vecsize; $i++) {
-                $this->runCommand($this->commandlines[$i]);
-            }
-            
-            // finally    {
-            if ($cloned !== null) {
-                $this->removeCommandline($cloned);
-            }
-            $this->setCommand($savedCommand);
-            
-        } catch (Exception $e) {
-            // finally {
-            if ($cloned !== null) {
-                $this->removeCommandline($cloned);
-            }
-            $this->setCommand($savedCommand);
-            throw $e;
-        }
-    }
-
-    /**
-     * The CVSROOT variable.
-     *
-     * @param string $root
-     */
-    public function setCvsRoot($root) {
-
-        // Check if not real cvsroot => set it to null
-        if ($root !== null) {
-            if (trim($root) == "") {
-                $root = null;
-            }
-        }
-
-        $this->cvsRoot = $root;
-    }
-
-    public function getCvsRoot() {
-        return $this->cvsRoot;
-    }
-
-    /**
-     * The CVS_RSH variable.
-     *
-     * @param rsh
-     */
-    public function setCvsRsh($rsh) {
-        // Check if not real cvsrsh => set it to null
-        if ($rsh !== null) {
-            if (trim($rsh) == "") {
-                $rsh = null;
-            }
-        }
-
-        $this->cvsRsh = $rsh;
-    }
-
-    public function getCvsRsh() {
-        return $this->cvsRsh;
-    }
-
-    /**
-     * Port used by CVS to communicate with the server.
-     *
-     * @param int $port
-     */
-    public function setPort($port){
-        $this->port = $port;
-    }
-
-    /**
-     * @return int
-     */
-    public function getPort() {
-        return $this->port;
-    }
-
-    /**
-     * Password file to read passwords from.
-     *
-     * @param passFile
-     */
-    public function setPassfile(PhingFile $passFile) {
-        $this->passFile = $passFile;
-    }
-    
-    /**
-     * @return File
-     */
-    public function getPassFile() {
-        return $this->passFile;
-    }
-
-    /**
-     * The directory where the checked out files should be placed.
-     *
-     * @param PhingFile $dest
-     */
-    public function setDest(PhingFile $dest) {
-        $this->dest = $dest;
-    }
-
-    public function getDest() {
-        return $this->dest;
-    }
-
-    /**
-     * The package/module to operate upon.
-     *
-     * @param string $p
-     */
-    public function setModule($m) {
-        $this->cvsModule = $m;
-    }
-
-    public function getModule(){
-        return $this->cvsModule;
-    }
-
-    /**
-     * The tag of the package/module to operate upon.
-     * @param string $p
-     */
-    public function setTag($p) {
-        // Check if not real tag => set it to null
-        if ($p !== null && trim($p) !== "") {
-            $this->appendCommandArgument("-r");
-            $this->appendCommandArgument($p);
-        }
-    }
-
-    /**
-     * This needs to be public to allow configuration
-     *      of commands externally.
-     */
-    public function appendCommandArgument($arg) {
-        $this->cmd->createArgument()->setValue($arg);
-    }
-
-    /**
-     * Use the most recent revision no later than the given date.
-     * @param p
-     */
-    public function setDate($p) {
-        if ($p !== null && trim($p) !== "") {
-            $this->appendCommandArgument("-D");
-            $this->appendCommandArgument($p);
-        }
-    }
-
-    /**
-     * The CVS command to execute.
-     * @param string $c
-     */
-    public function setCommand($c) {
-        $this->command = $c;
-    }
-    
-    public function getCommand() {
-        return $this->command;
-    }
-
-    /**
-     * If true, suppress informational messages.
-     * @param boolean $q
-     */
-    public function setQuiet($q) {
-        $this->quiet = $q;
-    }
-
-    /**
-     * If true, report only and don't change any files.
-     *
-     * @param boolean $ne
-     */
-    public function setNoexec($ne) {
-        $this->noexec = (boolean) $ne;
-    }
-
-    /**
-     * Stop the build process if the command exits with
-     * a return code other than 0.
-     * Defaults to false.
-     * @param boolean $failOnError
-     */
-    public function setFailOnError($failOnError) {
-        $this->failOnError = (boolean) $failOnError;
-    }
-
-    /**
-     * Configure a commandline element for things like cvsRoot, quiet, etc.
-     * @return string
-     */
-    protected function configureCommandline($c) {
-        if ($c === null) {
-            return;
-        }
-        $c->setExecutable("cvs");
-        
-        if ($this->cvsModule !== null) {
-            $c->createArgument()->setLine($this->cvsModule);
-        }
-        if ($this->compression > 0 && $this->compression < 10) {
-            $c->createArgument(true)->setValue("-z" . $this->compression);
-        }
-        if ($this->quiet) {
-            $c->createArgument(true)->setValue("-q");
-        }
-        if ($this->noexec) {
-            $c->createArgument(true)->setValue("-n");
-        }
-        if ($this->cvsRoot !== null) {
-            $c->createArgument(true)->setLine("-d" . $this->cvsRoot);
-        }
-    }
-
-    protected function removeCommandline(Commandline $c) {
-        $idx = array_search($c, $this->commandlines, true);
-        if ($idx === false) {
-            return false;
-        }
-        $this->commandlines = array_splice($this->commandlines, $idx, 1);
-        return true;
-    }
-
-    /**
-    * Configures and adds the given Commandline.
-    * @param insertAtStart If true, c is
-    */
-    public function addConfiguredCommandline(Commandline $c, $insertAtStart = false) {
-        if ($c === null) {
-            return; 
-        }
-        $this->configureCommandline($c);
-        if ($insertAtStart) {
-            array_unshift($this->commandlines, $c);
-        } else {
-            array_push($this->commandlines, $c);
-        }
-    }
-
-    /**
-    * If set to a value 1-9 it adds -zN to the cvs command line, else
-    * it disables compression.
-    * @param int $level
-    */
-    public function setCompressionLevel($level) {
-        $this->compression = $level;
-    }
-
-    /**
-     * If true, this is the same as compressionlevel="3".
-     *
-     * @param boolean $usecomp If true, turns on compression using default
-     * level, AbstractCvsTask.DEFAULT_COMPRESSION_LEVEL.
-     */
-    public function setCompression($usecomp) {
-        $this->setCompressionLevel($usecomp ? 
-                            self::DEFAULT_COMPRESSION_LEVEL : 0);
-    }
-
-    /**
-     * File to which output should be written.
-     * @param PhingFile $output
-     */
-    function setOutput(PhingFile $f) {
-        $this->output = $f;
-    }
-    
-    /**
-     * File to which error output should be written.
-     * @param PhingFile $output
-     */
-    function setError(PhingFile $f) {
-        $this->error = $f;
-    }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/DeleteTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/DeleteTask.php
deleted file mode 100644
index 5facc7498..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/DeleteTask.php
+++ /dev/null
@@ -1,277 +0,0 @@
-<?php
-/*
- *  $Id: DeleteTask.php 321 2007-12-14 18:00:25Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-
-/**
- * Deletes a file or directory, or set of files defined by a fileset.
- * 
- * @version   $Revision: 1.13 $
- * @package   phing.tasks.system
- */
-class DeleteTask extends Task {
-
-    protected $file;
-    protected $dir;
-    protected $filesets = array();
-    protected $includeEmpty = false;
-
-    protected $quiet = false;
-    protected $failonerror = true;
-    protected $verbosity = Project::MSG_VERBOSE;
-	
-	/** Any filelists of files that should be deleted. */
-    private $filelists = array();
-	
-    /** 
-     * Set the name of a single file to be removed.
-     * @param PhingFile $file
-     */
-    function setFile(PhingFile $file) {       
-        $this->file = $file;
-    }
-
-    /** 
-     * Set the directory from which files are to be deleted.
-     * @param PhingFile $dir
-     */
-    function setDir(PhingFile $dir) {
-        $this->dir = $dir;
-    }
-
-    /**
-     * Used to force listing of all names of deleted files.
-     * @param boolean $verbosity
-     */
-    function setVerbose($verbosity) {
-        if ($verbosity) {
-            $this->verbosity = Project::MSG_INFO;
-        } else {
-            $this->verbosity = Project::MSG_VERBOSE;
-        }
-    }
-
-    /**
-     * If the file does not exist, do not display a diagnostic
-     * message or modify the exit status to reflect an error.
-     * This means that if a file or directory cannot be deleted,
-     * then no error is reported. This setting emulates the
-     * -f option to the Unix rm command. Default is false
-    * meaning things are verbose
-     */
-    function setQuiet($bool) {
-        $this->quiet = $bool;
-        if ($this->quiet) {
-            $this->failonerror = false;
-        }
-    }
-
-    /** this flag means 'note errors to the output, but keep going' */
-    function setFailOnError($bool) {
-        $this->failonerror = $bool;
-    }
-
-
-    /** Used to delete empty directories.*/
-    function setIncludeEmptyDirs($includeEmpty) {
-        $this->includeEmpty = (boolean) $includeEmpty;
-    }
-
-    /** Nested creator, adds a set of files (nested fileset attribute). */
-    function createFileSet() {
-        $num = array_push($this->filesets, new FileSet());
-        return $this->filesets[$num-1];
-    }
-	
-	/** Nested creator, adds a set of files (nested fileset attribute). */
-    function createFileList() {
-        $num = array_push($this->filelists, new FileList());
-        return $this->filelists[$num-1];
-    }
-
-    /** Delete the file(s). */
-    function main() {
-        if ($this->file === null && $this->dir === null && count($this->filesets) === 0 && count($this->filelists) === 0) {
-            throw new BuildException("At least one of the file or dir attributes, or a fileset element, or a filelist element must be set.");
-        }
-
-        if ($this->quiet && $this->failonerror) {
-            throw new BuildException("quiet and failonerror cannot both be set to true", $this->location);
-        }
-
-        // delete a single file
-        if ($this->file !== null) {
-            if ($this->file->exists()) {
-                if ($this->file->isDirectory()) {
-                    $this->log("Directory " . $this->file->__toString() . " cannot be removed using the file attribute. Use dir instead.");
-                } else {
-                    $this->log("Deleting: " . $this->file->__toString());
-                    try {
-                        $this->file->delete();
-                    } catch(Exception $e) {
-                        $message = "Unable to delete file " . $this->file->__toString() .": " .$e->getMessage();
-                        if($this->failonerror) {
-                            throw new BuildException($message);
-                        } else {
-                            $this->log($message, $this->quiet ? Project::MSG_VERBOSE : Project::MSG_WARN);
-                        }                        
-                    }
-                }
-            } else {
-                $this->log("Could not find file " . $this->file->getAbsolutePath() . " to delete.",Project::MSG_VERBOSE);
-            }
-        }
-
-        // delete the directory
-        if ($this->dir !== null && $this->dir->exists() && $this->dir->isDirectory()) {
-            if ($this->verbosity === Project::MSG_VERBOSE) {
-                $this->log("Deleting directory " . $this->dir->__toString());
-            }
-            $this->removeDir($this->dir);
-        }
-		
-		// delete the files in the filelists
-		foreach($this->filelists as $fl) {
-			try {
-				$files = $fl->getFiles($this->project);
-				$this->removeFiles($fl->getDir($this->project), $files, $empty=array());
-			} catch (BuildException $be) {
-				// directory doesn't exist or is not readable
-					if ($this->failonerror) {
-					throw $be;
-				} else {
-					$this->log($be->getMessage(), $this->quiet ? Project::MSG_VERBOSE : Project::MSG_WARN);
-				}
-			}
-		}
-			
-        // delete the files in the filesets
-        foreach($this->filesets as $fs) {
-            try {
-                $ds = $fs->getDirectoryScanner($this->project);
-                $files = $ds->getIncludedFiles();
-                $dirs = $ds->getIncludedDirectories();
-                $this->removeFiles($fs->getDir($this->project), $files, $dirs);
-            } catch (BuildException $be) {
-                    // directory doesn't exist or is not readable
-                    if ($this->failonerror) {
-                        throw $be;
-                    } else {
-                        $this->log($be->getMessage(), $this->quiet ? Project::MSG_VERBOSE : Project::MSG_WARN);
-                    }
-                }
-        }
-    }
-    
-    /**
-     * Recursively removes a directory.
-     * @param PhingFile $d The directory to remove.
-     */
-    private function removeDir($d) {
-        $list = $d->listDir();
-        if ($list === null) {
-            $list = array();
-        }
-        
-        foreach($list as $s) {
-            $f = new PhingFile($d, $s);
-            if ($f->isDirectory()) {
-                $this->removeDir($f);
-            } else {
-                $this->log("Deleting " . $f->__toString(), $this->verbosity);
-                try {
-                    $f->delete();
-                } catch (Exception $e) {
-                    $message = "Unable to delete file " . $f->__toString() . ": " . $e->getMessage();
-                    if($this->failonerror) {
-                        throw new BuildException($message);
-                    } else {
-                        $this->log($message, $this->quiet ? Project::MSG_VERBOSE : Project::MSG_WARN);
-                    }
-                }               
-            }
-        }
-        $this->log("Deleting directory " . $d->getAbsolutePath(), $this->verbosity);
-        try {
-            $d->delete();
-        } catch (Exception $e) {
-            $message = "Unable to delete directory " . $d->__toString() . ": " . $e->getMessage();
-            if($this->failonerror) {
-              throw new BuildException($message);
-            } else {
-              $this->log($message, $this->quiet ? Project::MSG_VERBOSE : Project::MSG_WARN);
-            }
-        }               
-    }
-
-    /**
-     * remove an array of files in a directory, and a list of subdirectories
-     * which will only be deleted if 'includeEmpty' is true
-     * @param PhingFile $d directory to work from
-     * @param array &$files array of files to delete; can be of zero length
-     * @param array &$dirs array of directories to delete; can of zero length
-     */
-    private function removeFiles(PhingFile $d, &$files, &$dirs) {
-        if (count($files) > 0) {
-            $this->log("Deleting " . count($files) . " files from " . $d->__toString());
-            for ($j=0,$_j=count($files); $j < $_j; $j++) {
-                $f = new PhingFile($d, $files[$j]);
-                $this->log("Deleting " . $f->getAbsolutePath(), $this->verbosity);
-                try {
-                    $f->delete();
-                } catch (Exception $e) {
-                    $message = "Unable to delete file " . $f->__toString() . ": " . $e->getMessage();
-                    if($this->failonerror) {
-                        throw new BuildException($message);
-                    } else {
-                        $this->log($message, $this->quiet ? Project::MSG_VERBOSE : Project::MSG_WARN);
-                    }
-                }               
-
-            }
-        }
-
-        if (count($dirs) > 0 && $this->includeEmpty) {
-            $dirCount = 0;
-            for ($j=count($dirs)-1; $j>=0; --$j) {
-                $dir = new PhingFile($d, $dirs[$j]);
-                $dirFiles = $dir->listDir();
-                if ($dirFiles === null || count($dirFiles) === 0) {
-                    $this->log("Deleting " . $dir->__toString(), $this->verbosity);
-                    try {
-                        $dir->delete();
-                        $dirCount++;
-                    } catch (Exception $e) {
-                        $message="Unable to delete directory " . $dir->__toString();
-                        if($this->failonerror) {
-                            throw new BuildException($message);
-                        } else {
-                            $this->log($message, $this->quiet ? Project::MSG_VERBOSE : Project::MSG_WARN);
-                        }
-                    }
-                }
-            }
-            if ($dirCount > 0) {
-                $this->log("Deleted $dirCount director" . ($dirCount==1 ? "y" : "ies") . " from " . $d->__toString());
-            }
-        }
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/EchoTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/EchoTask.php
deleted file mode 100644
index 0a8f03f21..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/EchoTask.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-/*
- *  $Id: EchoTask.php 144 2007-02-05 15:19:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-include_once 'phing/Task.php';
-
-/**
- *  Echos a message to the logging system or to a file
- *
- *  @author   Michiel Rook <michiel.rook@gmail.com>
- *  @author   Andreas Aderhold, andi@binarycloud.com
- *  @version  $Revision: 1.5 $ $Date: 2007-02-06 00:19:00 +0900 (火, 06  2月 2007) $
- *  @package  phing.tasks.system
- */
-
-class EchoTask extends Task {
-	
-    protected $msg = "";
-    
-    protected $file = "";
-    
-    protected $append = false;
-    
-    protected $level = "info";
-
-    function main() {		
-		switch ($this->level)
-		{
-			case "error": $loglevel = Project::MSG_ERR; break;
-			case "warning": $loglevel = Project::MSG_WARN; break;
-			case "info": $loglevel = Project::MSG_INFO; break;
-			case "verbose": $loglevel = Project::MSG_VERBOSE; break;
-			case "debug": $loglevel = Project::MSG_DEBUG; break;
-		}
-		
-		if (empty($this->file))
-		{
-        	$this->log($this->msg, $loglevel);
-		}
-		else
-		{
-			if ($this->append)
-			{
-				$handle = fopen($this->file, "a");
-			}
-			else
-			{
-				$handle = fopen($this->file, "w");
-			}
-			
-			fwrite($handle, $this->msg);
-			
-			fclose($handle);
-		}
-    }
-    
-    /** setter for file */
-    function setFile($file)
-    {
-		$this->file = (string) $file;
-	}
-
-    /** setter for level */
-    function setLevel($level)
-    {
-		$this->level = (string) $level;
-	}
-
-    /** setter for append */
-    function setAppend($append)
-    {
-		$this->append = $append;
-	}
-
-    /** setter for message */
-    function setMsg($msg) {
-        $this->setMessage($msg);
-    }
-
-    /** alias setter */
-    function setMessage($msg) {
-        $this->msg = (string) $msg;
-    }
-    
-    /** Supporting the <echo>Message</echo> syntax. */
-    function addText($msg)
-    {
-        $this->msg = (string) $msg;
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ExecTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ExecTask.php
deleted file mode 100644
index 1cb736429..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ExecTask.php
+++ /dev/null
@@ -1,266 +0,0 @@
-<?php
-
-/*
- *  $Id: ExecTask.php 334 2008-01-04 14:25:20Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-
-/**
- * Executes a command on the shell.
- *
- * @author   Andreas Aderhold <andi@binarycloud.com>
- * @author   Hans Lellelid <hans@xmpl.org>
- * @version  $Revision: 1.17 $
- * @package  phing.tasks.system
- */
-class ExecTask extends Task {
-
-	/**
-	 * Command to execute.
-	 * @var string
-	 */
-	protected $command;
-
-	/**
-	 * Working directory.
-	 * @var File
-	 */
-	protected $dir;
-
-	/**
-	 * Operating system.
-	 * @var string
-	 */
-	protected $os;
-
-	/**
-	 * Whether to escape shell command using escapeshellcmd().
-	 * @var boolean
-	 */
-	protected $escape = false;
-
-	/**
-	 * Where to direct output.
-	 * @var File
-	 */
-	protected $output;
-
-	/**
-	 * Whether to passthru the output
-	 * @var boolean
-	 */
-	protected $passthru = false;
-
-	/**
-	 * Where to direct error output.
-	 * @var File
-	 */
-	protected $error;
-
-	/**
-	 * If spawn is set then [unix] programs will redirect stdout and add '&'.
-	 * @var boolean
-	 */
-	protected $spawn = false;
-
-	/**
-	 * Property name to set with return value from exec call.
-	 *
-	 * @var string
-	 */
-	protected $returnProperty;
-
-	/**
-	 * Whether to check the return code.
-	 * @var boolean
-	 */
-	protected $checkreturn = false;
-
-	/**
-	 * Main method: wraps execute() command.
-	 * @return void
-	 */
-	public function main() {
-		$this->execute();
-	}
-
-	/**
-	 * Executes a program and returns the return code.
-	 * Output from command is logged at INFO level.
-	 * @return int Return code from execution.
-	 */
-	public function execute() {
-
-		// test if os match
-		$myos = Phing::getProperty("os.name");
-		$this->log("Myos = " . $myos, Project::MSG_VERBOSE);
-		if (($this->os !== null) && (strpos($this->os, $myos) === false)) {
-			// this command will be executed only on the specified OS
-			$this->log("Not found in " . $this->os, Project::MSG_VERBOSE);
-			return 0;
-		}
-
-		if ($this->dir !== null) {
-			if ($this->dir->isDirectory()) {
-				$currdir = getcwd();
-				@chdir($this->dir->getPath());
-			} else {
-				throw new BuildException("Can't chdir to:" . $this->dir->__toString());
-			}
-		}
-
-
-		if ($this->escape == true) {
-			// FIXME - figure out whether this is correct behavior
-			$this->command = escapeshellcmd($this->command);
-		}
-
-		if ($this->error !== null) {
-			$this->command .= ' 2> ' . $this->error->getPath();
-			$this->log("Writing error output to: " . $this->error->getPath());
-		}
-
-		if ($this->output !== null) {
-			$this->command .= ' 1> ' . $this->output->getPath();
-			$this->log("Writing standard output to: " . $this->output->getPath());
-		} elseif ($this->spawn) {
-			$this->command .= ' 1>/dev/null';
-			$this->log("Sending ouptut to /dev/null");
-		}
-
-		// If neither output nor error are being written to file
-		// then we'll redirect error to stdout so that we can dump
-		// it to screen below.
-
-		if ($this->output === null && $this->error === null) {
-			$this->command .= ' 2>&1';
-		}
-
-		// we ignore the spawn boolean for windows
-		if ($this->spawn) {
-			$this->command .= ' &';
-		}
-
-		$this->log("Executing command: " . $this->command);
-
-		$output = array();
-		$return = null;
-		exec($this->command, $output, $return);
-
-		if ($this->dir !== null) {
-			@chdir($currdir);
-		}
-
-		foreach($output as $line) {
-			$this->log($line,  ($this->passthru ? Project::MSG_INFO : Project::MSG_VERBOSE));
-		}
-
-		if ($this->returnProperty) {
-			$this->project->setProperty($this->returnProperty, $return);
-		}
-
-		if($return != 0 && $this->checkreturn) {
-			throw new BuildException("Task exited with code $return");
-		}
-
-		return $return;
-	}
-
-	/**
-	 * The command to use.
-	 * @param mixed $command String or string-compatible (e.g. w/ __toString()).
-	 */
-	function setCommand($command) {
-		$this->command = "" . $command;
-	}
-
-	/**
-	 * Whether to use escapeshellcmd() to escape command.
-	 * @param boolean $escape
-	 */
-	function setEscape($escape) {
-		$this->escape = (bool) $escape;
-	}
-
-	/**
-	 * Specify the working directory for executing this command.
-	 * @param PhingFile $dir
-	 */
-	function setDir(PhingFile $dir) {
-		$this->dir = $dir;
-	}
-
-	/**
-	 * Specify OS (or muliple OS) that must match in order to execute this command.
-	 * @param string $os
-	 */
-	function setOs($os) {
-		$this->os = (string) $os;
-	}
-
-	/**
-	 * File to which output should be written.
-	 * @param PhingFile $output
-	 */
-	function setOutput(PhingFile $f) {
-		$this->output = $f;
-	}
-
-	/**
-	 * File to which error output should be written.
-	 * @param PhingFile $output
-	 */
-	function setError(PhingFile $f) {
-		$this->error = $f;
-	}
-
-	/**
-	 * Whether to use passthru the output.
-	 * @param boolean $passthru
-	 */
-	function setPassthru($passthru) {
-		$this->passthru = (bool) $passthru;
-	}
-
-	/**
-	 * Whether to suppress all output and run in the background.
-	 * @param boolean $spawn
-	 */
-	function setSpawn($spawn) {
-		$this->spawn  = (bool) $spawn;
-	}
-
-	/**
-	 * Whether to check the return code.
-	 * @param boolean $checkreturn
-	 */
-	function setCheckreturn($checkreturn) {
-		$this->checkreturn = (bool) $checkreturn;
-	}
-	
-	/**
-	 * The name of property to set to return value from exec() call.
-	 * @param string $prop
-	 */
-	function setReturnProperty($prop) {
-		$this->returnProperty = $prop;
-	}
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ExitTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ExitTask.php
deleted file mode 100644
index 5f594a3bd..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ExitTask.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/*
- *  $Id: ExitTask.php 43 2006-03-10 14:31:51Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-require_once 'phing/Task.php';
-
-/**
- * Exits the active build, giving an additional message
- * if available.
- *
- * @author    Hans Lellelid <hans@xmpl.org> (Phing)
- * @author    Nico Seessle <nico@seessle.de> (Ant)
- * @version   $Revision: 1.7 $
- * @package   phing.tasks.system
- */
-class ExitTask extends Task { 
-
-    private $message;
-    private $ifCondition;
-    private $unlessCondition;
-
-    /**
-     * A message giving further information on why the build exited.
-     *
-     * @param string $value message to output
-     */
-    public function setMsg($value) {
-        $this->setMessage($value);
-    }
-
-    /**
-     * A message giving further information on why the build exited.
-     *
-     * @param value message to output
-     */
-    public function setMessage($value) {
-        $this->message = $value;
-    }
-
-    /**
-     * Only fail if a property of the given name exists in the current project.
-     * @param c property name
-     */
-    public function setIf($c) {
-        $this->ifCondition = $c;
-    }
-
-    /**
-     * Only fail if a property of the given name does not
-     * exist in the current project.
-     * @param c property name
-     */
-    public function setUnless($c) {
-        $this->unlessCondition = $c;
-    }
-
-    /**
-     * @throws BuildException
-     */
-    public function main()  {
-        if ($this->testIfCondition() && $this->testUnlessCondition()) {
-            if ($this->message !== null) { 
-                throw new BuildException($this->message);
-            } else {
-                throw new BuildException("No message");
-            }
-        }
-    }
-
-    /**
-     * Set a multiline message.
-     */
-    public function addText($msg) {
-        if ($this->message === null) {
-            $this->message = "";
-        }
-        $this->message .= $this->project->replaceProperties($msg);
-    }
-
-    /**
-     * @return boolean
-     */
-    private function testIfCondition() {
-        if ($this->ifCondition === null || $this->ifCondition === "") {
-            return true;
-        }
-        
-        return $this->project->getProperty($this->ifCondition) !== null;
-    }
-    
-    /**
-     * @return boolean
-     */
-    private function testUnlessCondition() {
-        if ($this->unlessCondition === null || $this->unlessCondition ===  "") {
-            return true;
-        }
-        return $this->project->getProperty($this->unlessCondition) === null;
-    }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ForeachTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ForeachTask.php
deleted file mode 100644
index 6bfb7776e..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ForeachTask.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-/*
- *  $Id: ForeachTask.php 144 2007-02-05 15:19:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-include_once 'phing/tasks/system/PhingTask.php';
-
-/**
- * <foreach> task
- *
- * Task definition for the foreach task.  This task takes a list with
- * delimited values, and executes a target with set param.
- *
- * Usage:
- * <foreach list="values" target="targ" param="name" delimiter="|" />
- *
- * Attributes:
- * list      --> The list of values to process, with the delimiter character,
- *               indicated by the "delimiter" attribute, separating each value.
- * target    --> The target to call for each token, passing the token as the
- *               parameter with the name indicated by the "param" attribute.
- * param     --> The name of the parameter to pass the tokens in as to the
- *               target.
- * delimiter --> The delimiter string that separates the values in the "list"
- *               parameter.  The default is ",".
- *
- * @author    Jason Hines <jason@greenhell.com>
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.9 $
- * @package   phing.tasks.system
- */
-class ForeachTask extends Task {
-    
-    /** Delimter-separated list of values to process. */
-    private $list;
-    
-    /** Name of parameter to pass to callee */
-    private $param;
-    
-    /** Delimter that separates items in $list */
-    private $delimiter = ',';
-    
-    /**
-     * PhingCallTask that will be invoked w/ calleeTarget.
-     * @var PhingCallTask
-     */
-    private $callee;
-    
-    /**
-     * Target to execute.
-     * @var string
-     */
-    private $calleeTarget;
-
-    function init() {
-        $this->callee = $this->project->createTask("phingcall");
-        $this->callee->setOwningTarget($this->getOwningTarget());
-        $this->callee->setTaskName($this->getTaskName());
-        $this->callee->setLocation($this->getLocation());
-        $this->callee->init();
-    }
-
-    /**
-     * This method does the work.
-     * @return void
-     */   
-    function main() {
-        if ($this->list === null) {
-            throw new BuildException("Missing list to iterate through");
-        }
-        if (trim($this->list) === '') {
-            return;
-        }
-        if ($this->param === null) {
-            throw new BuildException("You must supply a property name to set on each iteration in param");
-        }
-        if ($this->calleeTarget === null) {
-            throw new BuildException("You must supply a target to perform");
-        }
-
-        $callee = $this->callee;
-        $callee->setTarget($this->calleeTarget);
-        $callee->setInheritAll(true);
-        $callee->setInheritRefs(true);
-        
-        $arr = explode($this->delimiter, $this->list);
-        
-        foreach ($arr as $value) {
-            $this->log("Setting param '$this->param' to value '$value'", Project::MSG_VERBOSE);
-            $prop = $callee->createProperty();
-            $prop->setOverride(true);
-            $prop->setName($this->param);
-            $prop->setValue($value);
-            $callee->main();
-        }
-    }
-
-    function setList($list) {
-        $this->list = (string) $list;
-    }
-
-    function setTarget($target) {
-        $this->calleeTarget = (string) $target;
-    }
-
-    function setParam($param) {
-        $this->param = (string) $param;
-    }
-
-    function setDelimiter($delimiter) {
-        $this->delimiter = (string) $delimiter;
-    }
-
-    /**
-     * @return Property
-     */
-    function createProperty() {
-        return $this->callee->createProperty();
-    }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/IfTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/IfTask.php
deleted file mode 100644
index 0ebfb0b6e..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/IfTask.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-
-/*
- *  $Id: IfTask.php 43 2006-03-10 14:31:51Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-require_once 'phing/tasks/system/condition/ConditionBase.php';
-require_once 'phing/tasks/system/SequentialTask.php';
-
-/**
- * Perform some tasks based on whether a given condition holds true or
- * not.
- *
- * <p>This task is heavily based on the Condition framework that can
- * be found in Ant 1.4 and later, therefore it cannot be used in
- * conjunction with versions of Ant prior to 1.4.</p>
- *
- * <p>This task doesn't have any attributes, the condition to test is
- * specified by a nested element - see the documentation of your
- * <code><condition&gt;</code> task (see
- * <a href="http://jakarta.apache.org/ant/manual/CoreTasks/condition.html">the
- * online documentation</a> for example) for a complete list of nested
- * elements.</p>
- *
- * <p>Just like the <code><condition&gt;</code> task, only a single
- * condition can be specified - you combine them using
- * <code><and&gt;</code> or <code><or&gt;</code> conditions.</p>
- *
- * <p>In addition to the condition, you can specify three different
- * child elements, <code><elseif&gt;</code>, <code><then&gt;</code> and
- * <code><else&gt;</code>.  All three subelements are optional.
- *
- * Both <code><then&gt;</code> and <code><else&gt;</code> must not be
- * used more than once inside the if task.  Both are
- * containers for Ant tasks, just like Ant's
- * <code><parallel&gt;</code> and <code><sequential&gt;</code>
- * tasks - in fact they are implemented using the same class as Ant's
- * <code><sequential&gt;</code> task.</p>
- *
- *  The <code><elseif&gt;</code> behaves exactly like an <code><if&gt;</code>
- * except that it cannot contain the <code><else&gt;</code> element
- * inside of it.  You may specify as may of these as you like, and the
- * order they are specified is the order they are evaluated in.  If the
- * condition on the <code><if&gt;</code> is false, then the first
- * <code><elseif&gt;</code> who's conditional evaluates to true
- * will be executed.  The <code><else&gt;</code> will be executed
- * only if the <code><if&gt;</code> and all <code><elseif&gt;</code>
- * conditions are false.
- *
- * <p>Use the following task to define the <code><if&gt;</code>
- * task before you use it the first time:</p>
- *
- * <pre><code>
- *   <taskdef name="if" classname="net.sf.antcontrib.logic.IfTask" /&gt;
- * </code></pre>
- *
- * <h3>Crude Example</h3>
- *
- * <code>
- * <if>
- *  <equals arg1="${foo}" arg2="bar" />
- *  <then>
- *    <echo message="The value of property foo is bar" />
- *  </then>
- *  <else>
- *    <echo message="The value of property foo is not bar" />
- *  </else>
- * </if>
- * </code>
- *
- * <code>
- * <if>
- *  <equals arg1="${foo}" arg2="bar" /&gt;
- *  <then>
- *   <echo message="The value of property foo is 'bar'" />
- *  </then>
- *
- *  <elseif>
- *   <equals arg1="${foo}" arg2="foo" />
- *   <then>
- *    <echo message="The value of property foo is 'foo'" />
- *   </then>
- *  </elseif>
- *
- *  <else>
- *   <echo message="The value of property foo is not 'foo' or 'bar'" />
- *  </else>
- * </if>
- * </code>
- *
- * @author <a href="mailto:stefan.bodewig@freenet.de">Stefan Bodewig</a>
- */
-class IfTask extends ConditionBase {
-
-
-    private $thenTasks = null;
-    private $elseIfTasks = array();
-    private $elseTasks = null;
-
-    /***
-     * A nested Else if task
-     */
-    public function addElseIf(ElseIfTask $ei)
-    {
-        $this->elseIfTasks[] = $ei;
-    }
-
-    /**
-     * A nested <then> element - a container of tasks that will
-     * be run if the condition holds true.
-     *
-     * <p>Not required.</p>
-     */
-    public function addThen(SequentialTask $t) {
-        if ($this->thenTasks != null) {
-            throw new BuildException("You must not nest more than one <then> into <if>");
-        }
-        $this->thenTasks = $t;
-    }
-
-    /**
-     * A nested <else> element - a container of tasks that will
-     * be run if the condition doesn't hold true.
-     *
-     * <p>Not required.</p>
-     */
-    public function addElse(SequentialTask $e) {
-        if ($this->elseTasks != null) {
-            throw new BuildException("You must not nest more than one <else> into <if>");
-        }
-        $this->elseTasks = $e;
-    }
-
-    public function main() {
-	
-        if ($this->countConditions() > 1) {
-            throw new BuildException("You must not nest more than one condition into <if>");
-        }
-        if ($this->countConditions() < 1) {
-            throw new BuildException("You must nest a condition into <if>");
-        }
-		$conditions = $this->getConditions();
-		$c = $conditions[0];
-		
-        if ($c->evaluate()) {
-            if ($this->thenTasks != null) {
-                $this->thenTasks->main();
-            }
-        } else {
-            $done = false;
-            $sz = count($this->elseIfTasks);
-			for($i=0; $i < $sz && !$done; $i++) {
-				$ei = $this->elseIfTasks[$i];
-                if ($ei->evaluate()) {
-                    $done = true;
-                    $ei->main();
-                }
-            }
-
-            if (!$done && $this->elseTasks != null) {
-                $this->elseTasks->main();
-            }
-        }
-    }
-}
-
-/**
- * "Inner" class for IfTask.
- * This class has same basic structure as the IfTask, although of course it doesn't support <else> tags.
- */
-class ElseIfTask extends ConditionBase {
-
-        private $thenTasks = null;
-
-        public function addThen(SequentialTask $t) {
-            if ($this->thenTasks != null) {
-                throw new BuildException("You must not nest more than one <then> into <elseif>");
-            }
-            $this->thenTasks = $t;
-        }
-	
-		/**
-		 * @return boolean
-		 */
-        public function evaluate() {
-		
-            if ($this->countConditions() > 1) {
-                throw new BuildException("You must not nest more than one condition into <elseif>");
-            }
-            if ($this->countConditions() < 1) {
-                throw new BuildException("You must nest a condition into <elseif>");
-            }
-			
-			$conditions = $this->getConditions();
-			$c = $conditions[0];
-
-            return $c->evaluate();
-        }
-		
-		/**
-		 * 
-		 */
-        public function main() {
-            if ($this->thenTasks != null) {
-                $this->thenTasks->main();
-            }
-        }
-    }
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/IncludePathTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/IncludePathTask.php
deleted file mode 100644
index a62db9919..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/IncludePathTask.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-/*
- * $Id: IncludePathTask.php 144 2007-02-05 15:19:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-require_once 'phing/Task.php';
-include_once 'phing/types/Path.php';
-
-/**
- * Adds a normalized path to the PHP include_path.
- * 
- * This provides a way to alter the include_path without editing any global php.ini settings
- * or PHP_CLASSPATH environment variable.
- * 
- * <code>
- *   <includepath classpath="new/path/here"/>
- * </code>
- * 
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.1 $
- * @package   phing.tasks.system
- */
-class IncludePathTask extends Task {
-   
-    /**
-     * Classname of task to register.
-     * This can be a dot-path -- relative to a location on PHP include_path.
-     * E.g. path.to.MyClass ->  path/to/MyClass.php
-     * @var string
-     */
-    private $classname;
-    
-    /**
-     * Path to add to PHP include_path to aid in finding specified class.
-     * @var Path
-     */
-    private $classpath;
-    
-    /**
-     * Refid to already defined classpath
-     */
-    private $classpathId;
-    
-    /**
-     * Set the classpath to be used when searching for component being defined
-     * 
-     * @param Path $classpath An Path object containing the classpath.
-     */
-    public function setClasspath(Path $classpath) {
-        if ($this->classpath === null) {
-            $this->classpath = $classpath;
-        } else {
-            $this->classpath->append($classpath);
-        }
-    }
-
-    /**
-     * Create the classpath to be used when searching for component being defined
-     */ 
-    public function createClasspath() {
-        if ($this->classpath === null) {
-            $this->classpath = new Path($this->project);
-        }
-        return $this->classpath->createPath();
-    }
-
-    /**
-     * Reference to a classpath to use when loading the files.
-     */
-    public function setClasspathRef(Reference $r) {
-        $this->classpathId = $r->getRefId();
-        $this->createClasspath()->setRefid($r);
-    }
-
-    
-    /** Main entry point */
-    public function main() {
-    
-        // Apparently casting to (string) no longer invokes __toString() automatically.
-        if (is_object($this->classpath)) {
-            $this->classpath = $this->classpath->__toString();
-        }
-        
-        if (empty($this->classpath)) {
-            throw new BuildException("Provided classpath was empty.");
-        }
-        
-        $curr_parts = explode(PATH_SEPARATOR, get_include_path());
-        $add_parts = explode(PATH_SEPARATOR, $this->classpath);
-        $new_parts = array_diff($add_parts, $curr_parts);
-        
-        if ($new_parts) {
-            $this->log("Prepending new include_path components: " . implode(PATH_SEPARATOR, $new_parts), Project::MSG_VERBOSE);
-            set_include_path(implode(PATH_SEPARATOR, array_merge($new_parts, $curr_parts)));
-        }
-        
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/InputTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/InputTask.php
deleted file mode 100644
index 6d437dded..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/InputTask.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-/*
- *  $Id: InputTask.php 43 2006-03-10 14:31:51Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-include_once 'phing/input/InputRequest.php';
-include_once 'phing/input/YesNoInputRequest.php';
-include_once 'phing/input/MultipleChoiceInputRequest.php';
- 
-/**
- * Reads input from the InputHandler.
- * 
- * @see       Project::getInputHandler()
- * @author    Hans Lellelid <hans@xmpl.org> (Phing)
- * @author    Ulrich Schmidt <usch@usch.net> (Ant)
- * @author    Stefan Bodewig <stefan.bodewig@epost.de> (Ant)
- * @version   $Revision: 1.6 $
- * @package   phing.tasks.system
- */
-class InputTask extends Task {
-    
-    private $validargs;
-    private $message = ""; // required
-    private $propertyName; // required
-    private $defaultValue;
-    private $promptChar;
-    
-    /**
-     * Defines valid input parameters as comma separated strings. If set, input
-     * task will reject any input not defined as accepted and requires the user
-     * to reenter it. Validargs are case sensitive. If you want 'a' and 'A' to
-     * be accepted you need to define both values as accepted arguments.
-     *
-     * @param validargs A comma separated String defining valid input args.
-     */
-    public function setValidargs ($validargs) {
-        $this->validargs = $validargs;
-    }
-
-    /**
-     * Defines the name of a property to be set from input.
-     *
-     * @param string $name Name for the property to be set from input
-     */
-    public function setPropertyName($name) {
-        $this->propertyName = $name;
-    }
-
-    /**
-     * Sets the Message which gets displayed to the user during the build run.
-     * @param message The message to be displayed.
-     */
-    public function setMessage ($message) {
-        $this->message = $message;
-    }
-
-    /**
-     * Set a multiline message.
-     */
-    public function addText($msg) {
-        $this->message .= $this->project->replaceProperties($msg);
-    }
-    
-    /**
-     * Add a default value.
-     * @param string $v
-     */
-    public function setDefaultValue($v) {
-        $this->defaultValue = $v;
-    }
-    
-    /**
-     * Set the character/string to use for the prompt.
-     * @param string $c
-     */
-    public function setPromptChar($c) {
-        $this->promptChar = $c;
-    }
-    
-    /**
-     * Actual method executed by phing.
-     * @throws BuildException
-     */
-    public function main() {
-    
-        if ($this->propertyName === null) {
-            throw new BuildException("You must specify a value for propertyName attribute.");
-        }
-        
-        if ($this->validargs !== null) {
-            $accept = preg_split('/[\s,]+/', $this->validargs);
-            
-            // is it a boolean (yes/no) inputrequest?
-            $yesno = false;
-            if (count($accept) == 2) {
-                $yesno = true;
-                foreach($accept as $ans) {
-                    if(!StringHelper::isBoolean($ans)) {
-                        $yesno = false;
-                        break;
-                    }
-                }
-            }
-            if ($yesno) $request = new YesNoInputRequest($this->message, $accept);
-            else $request = new MultipleChoiceInputRequest($this->message, $accept);
-        } else {
-            $request = new InputRequest($this->message);
-        }
-        
-        // default default is curr prop value        
-        $request->setDefaultValue($this->project->getProperty($this->propertyName));
-        
-        $request->setPromptChar($this->promptChar);
-        
-        // unless overridden...
-        if ($this->defaultValue !== null) {
-            $request->setDefaultValue($this->defaultValue);
-        }
-        
-        $this->project->getInputHandler()->handleInput($request);
-
-        $value = $request->getInput();
-        
-        if ($value !== null) {
-            $this->project->setUserProperty($this->propertyName, $value);
-        }
-    }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/MatchingTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/MatchingTask.php
deleted file mode 100644
index 64b9f7267..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/MatchingTask.php
+++ /dev/null
@@ -1,361 +0,0 @@
-<?php
-/*
- *  $Id: MatchingTask.php 43 2006-03-10 14:31:51Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-require_once 'phing/types/selectors/SelectorContainer.php';
-include_once 'phing/types/FileSet.php';
-include_once 'phing/types/PatternSet.php';
-include_once 'phing/util/DirectoryScanner.php';
-
-/**
- * This is an abstract task that should be used by all those tasks that 
- * require to include or exclude files based on pattern matching.
- *
- * This is very closely based on the ANT class of the same name.
- * 
- * @author    Hans Lellelid <hans@xmpl.org> (Phing)
- * @author    Arnout J. Kuiper <ajkuiper@wxs.nl> (Ant)
- * @author    Stefano Mazzocchi  <stefano@apache.org> (Ant)
- * @author    Sam Ruby <rubys@us.ibm.com> (Ant)
- * @author    Jon S. Stevens <jon@clearink.com> (Ant
- * @author    Stefan Bodewig <stefan.bodewig@epost.de> (Ant)
- * @author    Bruce Atherton <bruce@callenish.com> (Ant)
- * @version   $Revision: 1.4 $
- * @package   phing.tasks.system
- */
-abstract class MatchingTask extends Task implements SelectorContainer {
-
-    /** @var boolean */
-    protected $useDefaultExcludes = true;
-    
-    /** @var FileSet */
-    protected $fileset;
-    
-    /**
-     * Create instance; set fileset to new FileSet.
-     */
-    public function __construct() {
-        $this->fileset = new FileSet();
-    }
-    
-    /**
-     * @see ProjectComponent::setProject()
-     */
-    public function setProject(Project $project) {
-        parent::setProject($project);
-        $this->fileset->setProject($project);
-    }
-
-    /**
-     * add a name entry on the include list
-     * @return PatternSetNameEntry
-     */
-    public function createInclude() {
-        return $this->fileset->createInclude();
-    }
-
-    /**
-     * add a name entry on the include files list
-     * @return PatternSetNameEntry
-     */
-    public function createIncludesFile() {
-        return $this->fileset->createIncludesFile();
-    }
-
-    /**
-     * add a name entry on the exclude list
-     * @return PatternSetNameEntry
-     */
-    public function createExclude() {
-        return $this->fileset->createExclude();
-    }
-
-    /**
-     * add a name entry on the include files list
-     * @return PatternSetNameEntry
-     */
-    public function createExcludesFile() {
-        return $this->fileset->createExcludesFile();
-    }
-
-    /**
-     * add a set of patterns
-     * @return PatternSet
-     */
-    public function createPatternSet() {
-        return $this->fileset->createPatternSet();
-    }
-
-    /**
-     * Sets the set of include patterns. Patterns may be separated by a comma
-     * or a space.
-     *
-     * @param string $includes the string containing the include patterns
-     * @return void
-     */
-    public function setIncludes($includes) {
-        $this->fileset->setIncludes($includes);
-    }    
-
-    /**
-     * Sets the set of exclude patterns. Patterns may be separated by a comma
-     * or a space.
-     *
-     * @param string $excludes the string containing the exclude patterns
-     */
-    public function setExcludes($excludes) {
-        $this->fileset->setExcludes($excludes);
-    }
-
-    
-    /**
-     * Sets whether default exclusions should be used or not.
-     *
-     * @param boolean $useDefaultExcludes "true"|"on"|"yes" when default exclusions
-     *                           should be used, "false"|"off"|"no" when they
-     *                           shouldn't be used.
-     */
-    public function setDefaultexcludes($useDefaultExcludes) {
-        $this->useDefaultExcludes = (boolean) $useDefaultExcludes;
-    }
-
-    /**
-     * Returns the directory scanner needed to access the files to process.
-     * @return DirectoryScanner
-     */
-    protected function getDirectoryScanner(PhingFile $baseDir) {
-        $this->fileset->setDir($baseDir);
-        $this->fileset->setDefaultexcludes($this->useDefaultExcludes);
-        return $this->fileset->getDirectoryScanner($this->project);
-    }
-
-    /**
-     * Sets the name of the file containing the includes patterns.
-     *
-     * @param PhingFile $includesfile A string containing the filename to fetch
-     * the include patterns from.
-     * @return void
-     */
-    public function setIncludesfile(PhingFile $includesfile) {
-        $this->fileset->setIncludesfile(includesfile);
-    }
-
-    /**
-     * Sets the name of the file containing the includes patterns.
-     *
-     * @param PhingFile $excludesfile A string containing the filename to fetch
-     * the include patterns from.
-     * @return void
-     */
-    public function setExcludesfile(PhingFile $excludesfile) {
-        $this->fileset->setExcludesfile($excludesfile);
-    }
-
-    /**
-     * Sets case sensitivity of the file system
-     *
-     * @param boolean $isCaseSensitive "true"|"on"|"yes" if file system is case
-     *                           sensitive, "false"|"off"|"no" when not.
-     * @return void
-     */
-    public function setCaseSensitive($isCaseSensitive) {
-        $this->fileset->setCaseSensitive($isCaseSensitive);
-    }
-
-    /**
-     * Sets whether or not symbolic links should be followed.
-     *
-     * @param boolean $followSymlinks whether or not symbolic links should be followed
-     * @return void
-     */
-    public function setFollowSymlinks($followSymlinks) {
-        $this->fileset->setFollowSymlinks($followSymlinks);
-    }
-
-    /**
-     * Indicates whether there are any selectors here.
-     *
-     * @return boolean Whether any selectors are in this container
-     */
-    public function hasSelectors() {
-        return $this->fileset->hasSelectors();
-    }
-
-    /**
-     * Gives the count of the number of selectors in this container
-     *
-     * @return int The number of selectors in this container
-     */
-    public function selectorCount() {
-        return $this->fileset->selectorCount();
-    }
-
-    /**
-     * Returns the set of selectors as an array.
-     *
-     * @return array FileSelector[] An array of selectors in this container
-     */
-    public function getSelectors(Project $p) {
-        return $this->fileset->getSelectors($p);
-    }
-
-    /**
-     * Returns an enumerator for accessing the set of selectors.
-     *
-     * @return an enumerator that goes through each of the selectors
-     */
-    public function selectorElements() {
-        return $this->fileset->selectorElements();
-    }
-
-    /**
-     * Add a new selector into this container.
-     *
-     * @param FileSelector $selector the new selector to add
-     * @return void
-     */
-    public function appendSelector(FileSelector $selector) {
-        $this->fileset->appendSelector($selector);
-    }
-
-    /* Methods below all add specific selectors */
-
-    /**
-     * add a "Select" selector entry on the selector list
-     * @return SelectSelector
-     */
-    public function createSelector() {
-        return $this->fileset->createSelector();
-    }
-
-    /**
-     * add an "And" selector entry on the selector list
-     * @return AndSelector
-     */
-    public function createAnd() {
-        return $this->fileset->createAnd();
-    }
-
-    /**
-     * add an "Or" selector entry on the selector list
-     * @return void
-     */
-    public function createOr() {
-        return $this->fileset->createOr();
-    }
-
-    /**
-     * add a "Not" selector entry on the selector list
-     * @return NotSelector
-     */
-    public function createNot() {
-        return $this->fileset->createNot();
-    }
-
-    /**
-     * add a "None" selector entry on the selector list
-     * @return NoneSelector
-     */
-    public function createNone() {
-        return $this->fileset->createNone();
-    }
-
-    /**
-     * add a majority selector entry on the selector list
-     * @return MajoritySelector
-     */
-    public function createMajority() {
-        return $this->fileset->createMajority();
-    }
-
-    /**
-     * add a selector date entry on the selector list
-     * @return DateSelector
-     */
-    public function createDate() {
-        return $this->fileset->addDate();
-    }
-
-    /**
-     * add a selector size entry on the selector list
-     * @return SizeSelector
-     */
-    public function createSize() {
-        return $this->fileset->createSize();
-    }
-
-    /**
-     * add a selector filename entry on the selector list
-     * @return FilenameSelector
-     */
-    public function createFilename() {
-        return $this->fileset->createFilename();
-    }
-
-    /**
-     * add an extended selector entry on the selector list
-     * @return ExtendSelector
-     */
-    public function createCustom() {
-        return $this->fileset->createCustom();
-    }
-
-    /**
-     * add a contains selector entry on the selector list
-     * @return ContainsSelector
-     */
-    public function createContains() {
-        return $this->fileset->createContains();
-    }
-
-    /**
-     * add a present selector entry on the selector list
-     * @return PresentSelector
-     */
-    public function createPresent() {
-        return $this->fileset->createPresent();
-    }
-
-    /**
-     * add a depth selector entry on the selector list
-     * @return DepthSelector
-     */
-    public function createDepth() {
-        return $this->fileset->createDepth();
-    }
-
-    /**
-     * add a depends selector entry on the selector list
-     * @return DependSelector
-     */
-    public function createDepend() {
-        return $this->fileset->createDepend();
-    }
-
-    /**
-     * Accessor for the implict fileset.
-     *
-     * @return FileSet
-     */
-    protected final function getImplicitFileSet() {
-        return $this->fileset;
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/MkdirTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/MkdirTask.php
deleted file mode 100644
index 36a11dee0..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/MkdirTask.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/*
- *  $Id: MkdirTask.php 43 2006-03-10 14:31:51Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-include_once 'phing/system/io/PhingFile.php';
-
-/**
- * Task to create a directory.
- *
- * @author   Andreas Aderhold, andi@binarycloud.com
- * @version  $Revision: 1.8 $
- * @package  phing.tasks.system
- */
-class MkdirTask extends Task {
-
-    /** directory to create*/
-    private $dir;
-
-    /**
-     * create the directory and all parents
-     *
-     * @throws BuildException if dir is somehow invalid, or creation failed.
-     */
-    function main() {
-        if ($this->dir === null) {
-            throw new BuildException("dir attribute is required", $this->location);
-        }
-        if ($this->dir->isFile()) {
-            throw new BuildException("Unable to create directory as a file already exists with that name: " . $this->dir->getAbsolutePath());
-        }
-        if (!$this->dir->exists()) {
-            $result = $this->dir->mkdirs();
-            if (!$result) {
-                $msg = "Directory " . $this->dir->getAbsolutePath() . " creation was not successful for an unknown reason";
-                throw new BuildException($msg, $this->location);
-            }
-            $this->log("Created dir: " . $this->dir->getAbsolutePath());
-        }
-    }
-
-    /** the directory to create; required. */
-    function setDir(PhingFile $dir) {
-        $this->dir = $dir;
-    }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/MoveTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/MoveTask.php
deleted file mode 100644
index 5b74159fc..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/MoveTask.php
+++ /dev/null
@@ -1,247 +0,0 @@
-<?php
-/*
- *  $Id: MoveTask.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/tasks/system/CopyTask.php';
-include_once 'phing/system/io/PhingFile.php';
-include_once 'phing/system/io/IOException.php';
-
-/**
- * Moves a file or directory to a new file or directory.
- * 
- * By default, the destination file is overwritten if it
- * already exists.  When overwrite is turned off, then files
- * are only moved if the source file is newer than the
- * destination file, or when the destination file does not
- * exist.
- *
- * Source files and directories are only deleted when the file or
- * directory has been copied to the destination successfully.
- *
- * @version $Revision: 1.8 $
- * @package phing.tasks.system
- */
-class MoveTask extends CopyTask {
-
-    function __construct() {
-        parent::__construct();
-        $this->forceOverwrite = true;
-    }
-    
-    /**
-     * Validates attributes coming in from XML
-     *
-     * @access  private
-     * @return  void
-     * @throws  BuildException
-     */
-    protected function validateAttributes() {    
-        if ($this->file !== null && $this->file->isDirectory()) {
-			if (($this->destFile !== null && $this->destDir !== null)
-				|| ($this->destFile === null && $this->destDir === null)) {
-					throw new BuildException("One and only one of tofile and todir must be set.");
-			}
-            
-            if ($this->destFile === null)
-            {
-				$this->destFile = new PhingFile($this->destDir, $this->file->getName());
-			}
-            
-            if ($this->destDir === null)
-            {
-				$this->destDir = $this->destFile->getParentFile();
-			}
-            
-			$this->completeDirMap[$this->file->getAbsolutePath()] = $this->destFile->getAbsolutePath();
-			
-			$this->file = null;
-		} else {
-			parent::validateAttributes();
-		}
-    }
-    
-    protected function doWork() {
-		if (count($this->completeDirMap) > 0)
-		{
-			foreach ($this->completeDirMap as $from => $to)
-			{
-                $f = new PhingFile($from);
-                $d = new PhingFile($to);
-                
-                $moved = false;
-                try { // try to rename                    
-                    $this->log("Attempting to rename $from to $to", $this->verbosity);
-                    $this->renameFile($f, $d, $this->forceOverwrite);
-                    $moved = true;
-                } catch (IOException $ioe) {
-                    $moved = false;
-                    $this->log("Failed to rename $from to $to: " . $ioe->getMessage(), $this->verbosity);
-                }
-			}
-		}
-    
-        $copyMapSize = count($this->fileCopyMap);
-        if ($copyMapSize > 0) {
-            // files to move
-            $this->log("Moving $copyMapSize files to " . $this->destDir->getAbsolutePath());
-
-            foreach($this->fileCopyMap as $from => $to) {
-                if ($from == $to) {
-                    $this->log("Skipping self-move of $from", $this->verbosity);
-                    continue;
-                }
-
-                $moved = false;
-                $f = new PhingFile($from);
-                $d = new PhingFile($to);
-                
-                $moved = false;
-                try { // try to rename                    
-                    $this->log("Attempting to rename $from to $to", $this->verbosity);
-                    $this->renameFile($f, $d, $this->forceOverwrite);
-                    $moved = true;
-                } catch (IOException $ioe) {
-                    $moved = false;
-                    $this->log("Failed to rename $from to $to: " . $ioe->getMessage(), $this->verbosity);
-                }
-
-                if (!$moved) {                    
-                    try { // try to move
-                        $this->log("Moving $from to $to", $this->verbosity);
-
-                        $this->fileUtils->copyFile($f, $d, $this->forceOverwrite, $this->preserveLMT, $this->filterChains, $this->getProject());                        
-
-                        $f = new PhingFile($fromFile);
-                        $f->delete();
-                    } catch (IOException $ioe) {
-                        $msg = "Failed to move $from to $to: " . $ioe->getMessage();
-                        throw new BuildException($msg, $this->location);
-                    }
-                } // if !moved
-            } // foreach fileCopyMap
-        } // if copyMapSize
-
-        // handle empty dirs if appropriate
-        if ($this->includeEmpty) {
-            $e = array_keys($this->dirCopyMap);
-            $count = 0;
-            foreach ($e as $dir) {
-                $d = new PhingFile((string) $dir);
-                if (!$d->exists()) {
-                    if (!$d->mkdirs()) {
-                        $this->log("Unable to create directory " . $d->getAbsolutePath(), Project::MSG_ERR);
-                    } else {
-                        $count++;
-                    }
-                }
-            }
-            if ($count > 0) {
-                $this->log("moved $count empty director" . ($count == 1 ? "y" : "ies") . " to " . $this->destDir->getAbsolutePath());
-            }
-        }
-
-        if (count($this->filesets) > 0) {
-            // process filesets
-            foreach($this->filesets as $fs) {
-                $dir = $fs->getDir($this->project);
-                if ($this->okToDelete($dir)) {
-                    $this->deleteDir($dir);
-                }
-            }
-        }
-    }
-
-    /** Its only ok to delete a dir tree if there are no files in it. */
-    private function okToDelete($d) {
-        $list = $d->listDir();
-        if ($list === null) {
-            return false;     // maybe io error?
-        }
-        
-        foreach($list as $s) {
-            $f = new PhingFile($d, $s);
-            if ($f->isDirectory()) {
-                if (!$this->okToDelete($f)) {
-                    return false;
-                }
-            } else {
-                // found a file
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /** Go and delete the directory tree. */
-    private function deleteDir($d) {
-    
-        $list = $d->listDir();
-        if ($list === null) {
-            return;      // on an io error list() can return null
-        }
-        
-        foreach($list as $fname) {
-            $f = new PhingFile($d, $fname);
-            if ($f->isDirectory()) {
-                $this->deleteDir($f);
-            } else {
-                throw new BuildException("UNEXPECTED ERROR - The file " . $f->getAbsolutePath() . " should not exist!");
-            }
-        }
-
-        $this->log("Deleting directory " . $d->getPath(), $this->verbosity);
-        try {
-            $d->delete();
-        } catch (Exception $e) {
-            throw new BuildException("Unable to delete directory " . $d->__toString() . ": " . $e->getMessage());
-        }
-    }
-
-    /**
-     * Attempts to rename a file from a source to a destination.
-     * If overwrite is set to true, this method overwrites existing file
-     * even if the destination file is newer.
-     * Otherwise, the source f
-     * ile is renamed only if the destination file #
-     * is older than it.
-     */
-    private function renameFile(PhingFile $sourceFile, PhingFile $destFile, $overwrite) {
-        $renamed = true;
-
-        // ensure that parent dir of dest file exists!
-        $parent = $destFile->getParentFile();
-        if ($parent !== null) {
-            if (!$parent->exists()) {
-                $parent->mkdirs();
-            }
-        }
-        if ($destFile->exists()) {
-            try {
-                $destFile->delete();
-            } catch (Exception $e) {
-                throw new BuildException("Unable to remove existing file " . $destFile->__toString() . ": " . $e->getMessage());
-            }
-        }
-        $renamed = $sourceFile->renameTo($destFile);
-
-        return $renamed;
-    }
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/PhingCallTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/PhingCallTask.php
deleted file mode 100644
index 39f74dca0..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/PhingCallTask.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-/*
- *  $Id: PhingCallTask.php 299 2007-11-08 20:31:19Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-
-/**
- * Call another target in the same project.
- *
- * <samp>
- *    <target name="foo">
- *      <phingcall target="bar">
- *        <property name="property1" value="aaaaa" />
- *        <property name="foo" value="baz" />
- *       </phingcall>
- *    </target>
- *
- *    <target name="bar" depends="init">
- *      <echo message="prop is ${property1} ${foo}" />
- *    </target>
- * </samp>
- *
- * This only works as expected if neither property1 nor foo are defined in the project itself.
- *
- * @author    Andreas Aderhold <andi@binarycloud.com>
- * @copyright 2001,2002 THYRELL. All rights reserved
- * @version   $Revision: 1.9 $
- * @access    public
- * @package   phing.tasks.system
- */
-class PhingCallTask extends Task {
-
-	/**
-	 * The called Phing task.
-	 *
-	 * @var PhingTask
-	 */
-	private $callee;
-
-	/**
-	 * The target to call.
-	 *
-	 * @var string
-	 */
-	private $subTarget;
-
-	/**
-	 * Whether to inherit all properties from current project.
-	 *
-	 * @var boolean
-	 */
-	private $inheritAll = true;
-
-	/**
-	 * Whether to inherit refs from current project.
-	 *
-	 * @var boolean
-	 */
-	private $inheritRefs = false;
-
-	/**
-	 *  If true, pass all properties to the new Phing project.
-	 *  Defaults to true. Future use.
-	 *  @param boolean new value
-	 */
-	function setInheritAll($inherit) {
-		$this->inheritAll = (boolean) $inherit;
-	}
-
-	/**
-	 *  If true, pass all references to the new Phing project.
-	 *  Defaults to false. Future use.
-	 *
-	 *  @param boolean new value
-	 */
-	function setInheritRefs($inheritRefs) {
-		$this->inheritRefs = (boolean) $inheritRefs;
-	}
-
-	/**
-	 * Alias for createProperty
-	 * @see createProperty()
-	 */
-	function createParam() {
-		if ($this->callee === null) {
-			$this->init();
-		}
-		return $this->callee->createProperty();
-	}
-
-	/**
-	 * Property to pass to the invoked target.
-	 */
-	function createProperty() {
-		if ($this->callee === null) {
-			$this->init();
-		}
-		return $this->callee->createProperty();
-	}
-
-	/**
-	 * Target to execute, required.
-	 */
-	function setTarget($target) {
-		$this->subTarget = (string) $target;
-	}
-
-	/**
-	 *  init this task by creating new instance of the phing task and
-	 *  configuring it's by calling its own init method.
-	 */
-	function init() {
-		$this->callee = $this->project->createTask("phing");
-		$this->callee->setOwningTarget($this->getOwningTarget());
-		$this->callee->setTaskName($this->getTaskName());
-		$this->callee->setHaltOnFailure(true);
-		$this->callee->setLocation($this->getLocation());
-		$this->callee->init();
-	}
-
-	/**
-	 *  hand off the work to the phing task of ours, after setting it up
-	 *  @throws BuildException on validation failure or if the target didn't
-	 *  execute
-	 */
-	function main() {
-
-		$this->log("Running PhingCallTask for target '" . $this->subTarget . "'", Project::MSG_DEBUG);
-		if ($this->callee === null) {
-			$this->init();
-		}
-
-		if ($this->subTarget === null) {
-			throw new BuildException("Attribute target is required.", $this->getLocation());
-		}
-
-		$this->callee->setPhingfile($this->project->getProperty("phing.file"));
-		$this->callee->setTarget($this->subTarget);
-		$this->callee->setInheritAll($this->inheritAll);
-		$this->callee->setInheritRefs($this->inheritRefs);
-		$this->callee->main();
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/PhingTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/PhingTask.php
deleted file mode 100644
index b8d43115a..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/PhingTask.php
+++ /dev/null
@@ -1,623 +0,0 @@
-<?php
-
-/*
- *  $Id: PhingTask.php 303 2007-11-08 20:39:33Z hans $  
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-include_once 'phing/Task.php';
-include_once 'phing/util/FileUtils.php';
-include_once 'phing/types/Reference.php';
-include_once 'phing/tasks/system/PropertyTask.php';
-
-/**
- * Task that invokes phing on another build file.
- * 
- * Use this task, for example, if you have nested buildfiles in your project. Unlike
- * AntTask, PhingTask can even support filesets:
- * 
- * <pre>
- *   <phing>
- *    <fileset dir="${srcdir}">
- *      <include name="** /build.xml" /> <!-- space added after ** is there because of PHP comment syntax -->
- *      <exclude name="build.xml" />
- *    </fileset>
- *   </phing>
- * </pre>
- * 
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.20 $
- * @package   phing.tasks.system
- */
-class PhingTask extends Task {
-
-    /** the basedir where is executed the build file */
-    private $dir;
-    
-    /** build.xml (can be absolute) in this case dir will be ignored */
-    private $phingFile;
-    
-    /** the target to call if any */
-    protected $newTarget;
-    
-    /** should we inherit properties from the parent ? */
-    private $inheritAll = true;
-    
-    /** should we inherit references from the parent ? */
-    private $inheritRefs = false;
-
-    /** the properties to pass to the new project */
-    private $properties = array();
-
-    /** the references to pass to the new project */
-    private $references = array();
-
-    /** The filesets that contain the files PhingTask is to be run on. */
-    private $filesets = array();
-
-    /** the temporary project created to run the build file */
-    private $newProject;
-
-    /** Fail the build process when the called build fails? */
-    private $haltOnFailure = false;
-
-    /**
-     *  If true, abort the build process if there is a problem with or in the target build file.
-     *  Defaults to false.
-     *
-     *  @param boolean new value
-     */
-    public function setHaltOnFailure($hof) {
-        $this->haltOnFailure = (boolean) $hof;
-    }
-
-    /**
-     * Creates a Project instance for the project to call.
-     * @return void
-     */
-    public function init() {
-        $this->newProject = new Project();
-        $tdf = $this->project->getTaskDefinitions();
-        $this->newProject->addTaskDefinition("property", $tdf["property"]);
-    }
-
-    /**
-     * Called in execute or createProperty if newProject is null.
-     *
-     * <p>This can happen if the same instance of this task is run
-     * twice as newProject is set to null at the end of execute (to
-     * save memory and help the GC).</p>
-     *
-     * <p>Sets all properties that have been defined as nested
-     * property elements.</p>
-     */
-    private function reinit() {
-        $this->init();
-        $count = count($this->properties);
-        for ($i = 0; $i < $count; $i++) {
-            $p = $this->properties[$i];
-            $newP = $this->newProject->createTask("property");
-            $newP->setName($p->getName());
-            if ($p->getValue() !== null) {
-                $newP->setValue($p->getValue());
-            }
-            if ($p->getFile() !== null) {
-                $newP->setFile($p->getFile());
-            }            
-            if ($p->getPrefix() !== null) {
-                $newP->setPrefix($p->getPrefix());
-            }
-            if ($p->getRefid() !== null) {
-                $newP->setRefid($p->getRefid());
-            }
-            if ($p->getEnvironment() !== null) {
-                $newP->setEnvironment($p->getEnvironment());
-            }
-            if ($p->getUserProperty() !== null) {
-                $newP->setUserProperty($p->getUserProperty());
-            }
-            if ($p->getOverride() !== null) {
-                $newP->setOverride($p->getOverride());
-            }
-            $this->properties[$i] = $newP;
-        }
-    }
-
-    /**
-     * Main entry point for the task.
-     *
-     * @return void
-     */
-    public function main() {
-    
-        // Call Phing on the file set with the attribute "phingfile"
-        if ($this->phingFile !== null or $this->dir !== null) {
-            $this->processFile();
-        }
-
-        // if no filesets are given stop here; else process filesets
-        if (empty($this->filesets)) { 
-            return;
-        }
-        
-        // preserve old settings
-        $savedDir = $this->dir;
-        $savedPhingFile = $this->phingFile;
-        $savedTarget = $this->newTarget;
-
-        // set no specific target for files in filesets
-        // [HL] I'm commenting this out; I don't know why this should not be supported!
-        // $this->newTarget = null;
-        
-        foreach($this->filesets as $fs) {
-
-            $ds = $fs->getDirectoryScanner($this->project);
-
-            $fromDir  = $fs->getDir($this->project);
-            $srcFiles = $ds->getIncludedFiles();
-
-            foreach($srcFiles as $fname) {            
-                $f = new PhingFile($ds->getbasedir(), $fname);
-                $f = $f->getAbsoluteFile();
-                $this->phingFile = $f->getAbsolutePath();
-                $this->dir = $f->getParentFile();
-                $this->processFile();    // run Phing!
-            }
-        }        
-        
-        // side effect free programming ;-)
-        $this->dir = $savedDir;        
-        $this->phingFile = $savedPhingFile;
-        $this->newTarget = $savedTarget;
-        
-        // [HL] change back to correct dir
-        if ($this->dir !== null) {
-            chdir($this->dir->getAbsolutePath());
-        }
-        
-    }
-    
-    /**
-     * Execute phing file.
-     * 
-     * @return void
-     */
-    private function processFile()  {
-
-    	$buildFailed = false;
-        $savedDir = $this->dir;
-        $savedPhingFile = $this->phingFile;
-        $savedTarget = $this->newTarget;
-        
-		$savedBasedirAbsPath = null; // this is used to save the basedir *if* we change it
-        
-        try {
-        
-            if ($this->newProject === null) {
-                $this->reinit();
-            }
-
-            $this->initializeProject();
-            
-            if ($this->dir !== null) {
-            	
-            	$dirAbsPath = $this->dir->getAbsolutePath();
-            	
-            	// BE CAREFUL! -- when the basedir is changed for a project,
-            	// all calls to getAbsolutePath() on a relative-path dir will
-            	// be made relative to the project's basedir!  This means
-            	// that subsequent calls to $this->dir->getAbsolutePath() will be WRONG!
-            	
-            	// We need to save the current project's basedir first.
-            	$savedBasedirAbsPath = $this->getProject()->getBasedir()->getAbsolutePath();
-				 
-                $this->newProject->setBasedir($this->dir);
-                
-                // Now we must reset $this->dir so that it continues to resolve to the same
-                // path.
-                $this->dir = new PhingFile($dirAbsPath);
-                
-                if ($savedDir !== null) { // has been set explicitly
-                    $this->newProject->setInheritedProperty("project.basedir", $this->dir->getAbsolutePath());
-                }
-                
-            } else {
-            	
-            	// Since we're not changing the basedir here (for file resolution),
-            	// we don't need to worry about any side-effects in this scanrio.
-                $this->dir = $this->getProject()->getBasedir();   
-            }
-
-            $this->overrideProperties();
-            if ($this->phingFile === null) {
-                $this->phingFile = "build.xml";
-            }
-            
-            $fu = new FileUtils();
-            $file = $fu->resolveFile($this->dir, $this->phingFile);
-            $this->phingFile = $file->getAbsolutePath();
-            
-            $this->log("Calling Buildfile '" . $this->phingFile . "' with target '" . $this->newTarget . "'");
-                        
-            $this->newProject->setUserProperty("phing.file", $this->phingFile);
-                       
-            ProjectConfigurator::configureProject($this->newProject, new PhingFile($this->phingFile));
-
-            if ($this->newTarget === null) {
-                $this->newTarget = $this->newProject->getDefaultTarget();
-            }
-
-            // Are we trying to call the target in which we are defined?
-            if ($this->newProject->getBaseDir() == $this->project->getBaseDir() &&
-                $this->newProject->getProperty("phing.file") == $this->project->getProperty("phing.file") &&
-                $this->getOwningTarget() !== null &&
-                $this->newTarget == $this->getOwningTarget()->getName()) {
-
-                throw new BuildException("phing task calling its own parent target");
-            }
-
-            $this->addReferences();
-            $this->newProject->executeTarget($this->newTarget);
-            
-        } catch (Exception $e) {
-            $buildFailed = true;
-            $this->log($e->getMessage(), Project::MSG_ERR);
-        	if (Phing::getMsgOutputLevel() <= Project::MSG_DEBUG) { 
-				$lines = explode("\n", $e->getTraceAsString());
-				foreach($lines as $line) {
-					$this->log($line, Project::MSG_DEBUG);
-				}
-            }
-            // important!!! continue on to perform cleanup tasks.    
-		}
-        
-        
-        // reset environment values to prevent side-effects.
-        
-        $this->newProject = null;
-        $pkeys = array_keys($this->properties);
-        foreach($pkeys as $k) {
-            $this->properties[$k]->setProject(null);
-        }
-        
-        $this->dir = $savedDir;        
-        $this->phingFile = $savedPhingFile;
-        $this->newTarget = $savedTarget;
-        
-        // If the basedir for any project was changed, we need to set that back here.
-        if ($savedBasedirAbsPath !== null) {
-            chdir($savedBasedirAbsPath);
-        }
-
-        if ($this->haltOnFailure && $buildFailed) {
-			throw new BuildException("Execution of the target buildfile failed. Aborting.");
-		}
-    }
-
-    /**
-     * Configure the Project, i.e. make intance, attach build listeners
-     * (copy from father project), add Task and Datatype definitions,
-     * copy properties and references from old project if these options
-     * are set via the attributes of the XML tag.
-     *
-     * Developer note:
-     * This function replaces the old methods "init", "_reinit" and 
-     * "_initializeProject".
-     *
-     * @access      protected
-     */
-    private function initializeProject() {
-        
-        $this->newProject->setInputHandler($this->project->getInputHandler());
-        
-        foreach($this->project->getBuildListeners() as $listener) {
-            $this->newProject->addBuildListener($listener);
-        }
-        
-        /* Copy things from old project. Datatypes and Tasks are always
-         * copied, properties and references only if specified so/not
-         * specified otherwise in the XML definition.
-         */
-        // Add Datatype definitions
-        foreach ($this->project->getDataTypeDefinitions() as $typeName => $typeClass) {
-            $this->newProject->addDataTypeDefinition($typeName, $typeClass);
-        }
-        
-        // Add Task definitions
-        foreach ($this->project->getTaskDefinitions() as $taskName => $taskClass) {
-            if ($taskClass == "propertytask") {
-                // we have already added this taskdef in init()
-                continue;
-            }
-            $this->newProject->addTaskDefinition($taskName, $taskClass);
-        }
-
-        // set user-defined properties
-        $this->project->copyUserProperties($this->newProject);
-
-        if (!$this->inheritAll) {
-           // set System built-in properties separately,
-           // b/c we won't inherit them.
-           $this->newProject->setSystemProperties();
-
-        } else {
-            // set all properties from calling project
-            $properties = $this->project->getProperties();
-            foreach ($properties as $name => $value) {                
-                if ($name == "basedir" || $name == "phing.file" || $name == "phing.version") {
-                    // basedir and phing.file get special treatment in main()
-                    continue;
-                }
-                   // don't re-set user properties, avoid the warning message
-                if ($this->newProject->getProperty($name) === null){
-                    // no user property
-                    $this->newProject->setNewProperty($name, $value);
-                }
-            }
-            
-        }
-    
-    }
-
-    /**
-     * Override the properties in the new project with the one
-     * explicitly defined as nested elements here.
-     * @return void
-     * @throws BuildException 
-     */
-    private function overrideProperties() {     
-        foreach(array_keys($this->properties) as $i) {
-            $p = $this->properties[$i];
-            $p->setProject($this->newProject);
-            $p->main();
-        }
-        $this->project->copyInheritedProperties($this->newProject);
-    }
-
-    /**
-     * Add the references explicitly defined as nested elements to the
-     * new project.  Also copy over all references that don't override
-     * existing references in the new project if inheritrefs has been
-     * requested.
-     * 
-     * @return void
-     * @throws BuildException 
-     */
-    private function addReferences() {
-    
-        // parent project references
-        $projReferences = $this->project->getReferences();
-        
-        $newReferences = $this->newProject->getReferences();
-        
-        $subprojRefKeys = array();
-        
-        if (count($this->references) > 0) {
-            for ($i=0, $count=count($this->references); $i < $count; $i++) {
-                $ref = $this->references[$i];            
-                $refid = $ref->getRefId();
-                
-                if ($refid === null) {
-                    throw new BuildException("the refid attribute is required"
-                                             . " for reference elements");
-                }
-                if (!isset($projReferences[$refid])) {
-                    $this->log("Parent project doesn't contain any reference '"
-                        . $refid . "'",
-                        Project::MSG_WARN);
-                    continue;
-                }
-                
-                $subprojRefKeys[] = $refid;
-                //thisReferences.remove(refid);
-                $toRefid = $ref->getToRefid();
-                if ($toRefid === null) {
-                    $toRefid = $refid;
-                }
-                $this->copyReference($refid, $toRefid);
-            }
-        }
-
-        // Now add all references that are not defined in the
-        // subproject, if inheritRefs is true
-        if ($this->inheritRefs) {
-        
-            // get the keys that are were not used by the subproject
-            $unusedRefKeys = array_diff(array_keys($projReferences), $subprojRefKeys);
-            
-            foreach($unusedRefKeys as $key) {
-                if (isset($newReferences[$key])) {
-                    continue;
-                }
-                $this->copyReference($key, $key);
-            }
-        }
-    }
-
-    /**
-     * Try to clone and reconfigure the object referenced by oldkey in
-     * the parent project and add it to the new project with the key
-     * newkey.
-     *
-     * <p>If we cannot clone it, copy the referenced object itself and
-     * keep our fingers crossed.</p>
-     *
-     * @param string $oldKey
-     * @param string $newKey
-     * @return void
-     */
-    private function copyReference($oldKey, $newKey) {
-        $orig = $this->project->getReference($oldKey);
-        if ($orig === null) {
-            $this->log("No object referenced by " . $oldKey . ". Can't copy to " 
-                .$newKey, 
-                PROJECT_SG_WARN);
-            return;
-        }
-
-        $copy = clone $orig;
-
-        if ($copy instanceof ProjectComponent) {
-            $copy->setProject($this->newProject);
-        } elseif (in_array('setProject', get_class_methods(get_class($copy)))) {
-            $copy->setProject($this->newProject);
-		} elseif ($copy instanceof Project) {
-			// don't copy the old "Project" itself
-        } else {
-            $msg = "Error setting new project instance for "
-                . "reference with id " . $oldKey;
-            throw new BuildException($msg);
-        }
-        
-        $this->newProject->addReference($newKey, $copy);
-    }
-
-    /**
-     * If true, pass all properties to the new phing project.
-     * Defaults to true.
-     *
-     * @access      public
-     */
-    function setInheritAll($value) {
-        $this->inheritAll = (boolean) $value;
-    }
-
-    /**
-     * If true, pass all references to the new phing project.
-     * Defaults to false.
-     *
-     * @access      public
-     */
-    function setInheritRefs($value) {
-        $this->inheritRefs = (boolean)$value;
-    }
-
-    /**
-     * The directory to use as a base directory for the new phing project.
-     * Defaults to the current project's basedir, unless inheritall
-     * has been set to false, in which case it doesn't have a default
-     * value. This will override the basedir setting of the called project.
-     *
-     * @access      public
-     */
-    function setDir($d) {
-        if ( is_string($d) )
-            $this->dir = new PhingFile($d);
-        else
-            $this->dir = $d;
-    }
-
-    /**
-     * The build file to use.
-     * Defaults to "build.xml". This file is expected to be a filename relative
-     * to the dir attribute given.
-     *
-     * @access      public
-     */
-    function setPhingfile($s) {
-        // it is a string and not a file to handle relative/absolute
-        // otherwise a relative file will be resolved based on the current
-        // basedir.
-        $this->phingFile = $s;
-    }
-
-   /**
-    * Alias function for setPhingfile
-    *
-    * @access       public
-    */
-    function setBuildfile($s) {
-        $this->setPhingFile($s);
-    }
-
-    /**
-     * The target of the new Phing project to execute.
-     * Defaults to the new project's default target.
-     *
-     * @access      public
-     */
-    function setTarget($s) {
-        $this->newTarget = $s;
-    }
-
-    /**
-     * Support for filesets; This method returns a reference to an instance
-     * of a FileSet object.
-     *
-     * @return FileSet
-     */
-    function createFileSet() {
-        $num = array_push($this->filesets, new FileSet());
-        return $this->filesets[$num-1];
-    }
-
-    /**
-     * Property to pass to the new project.
-     * The property is passed as a 'user property'
-     *
-     * @access      public
-     */
-    function createProperty() {
-        $p = new PropertyTask();
-        $p->setFallback($this->newProject);
-        $p->setUserProperty(true);
-        $this->properties[] = $p;
-        return $p;
-    }
-
-    /**
-     * Reference element identifying a data type to carry
-     * over to the new project.
-     *
-     * @access      public
-     */
-    function createReference() {
-        $num = array_push($this->references, new PhingReference());
-        return $this->references[$num-1];
-    }
-
-}
-
-/**
- * Helper class that implements the nested <reference>
- * element of <phing> and <phingcall>.
- */
-class PhingReference extends Reference {
-
-    private $targetid = null;
-
-    /**
-     * Set the id that this reference to be stored under in the
-     * new project.
-     *
-     * @param targetid the id under which this reference will be passed to
-     *        the new project */
-    public function setToRefid($targetid) {
-        $this->targetid = $targetid;
-    }
-
-    /**
-     * Get the id under which this reference will be stored in the new
-     * project
-     *
-     * @return the id of the reference in the new project.
-     */
-    public function getToRefid() {
-        return $this->targetid;
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/PhpEvalTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/PhpEvalTask.php
deleted file mode 100644
index 3a45f4e5c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/PhpEvalTask.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-/*
- *  $Id: PhpEvalTask.php 144 2007-02-05 15:19:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-require_once 'phing/Task.php';
-
-/**
- * Executes PHP function or evaluates expression and sets return value to a property.
- *
- *    WARNING:
- *        This task can, of course, be abused with devastating effects.  E.g. do not
- *        modify internal Phing classes unless you know what you are doing.
- *
- * @author   Hans Lellelid <hans@xmpl.org>
- * @version  $Revision: 1.7 $
- * @package  phing.tasks.system
- *
- * @todo Add support for evaluating expressions
- */
-class PhpEvalTask extends Task {
-        
-    protected $expression; // Expression to evaluate
-    protected $function; // Function to execute
-    protected $class; // Class containing function to execute
-    protected $returnProperty; // name of property to set to return value 
-    protected $params = array(); // parameters for function calls
-    
-    /** Main entry point. */
-    function main() {
-        
-        if ($this->function === null && $this->expression === null) {
-            throw new BuildException("You must specify a function to execute or PHP expression to evalute.", $this->location);
-        }
-        
-        if ($this->function !== null && $this->expression !== null) {
-            throw new BuildException("You can specify function or expression, but not both.", $this->location);
-        }
-        
-        if ($this->expression !== null && !empty($this->params)) {
-            throw new BuildException("You cannot use nested <param> tags when evaluationg a PHP expression.", $this->location);
-        }
-        
-        $retval = null;
-        if ($this->function !== null) {
-            $retval = $this->callFunction();                                    
-        } elseif ($this->expression !== null) {
-            $retval = $this->evalExpression();
-        }
-        
-        if ($this->returnProperty !== null) {
-            $this->project->setProperty($this->returnProperty, $retval);
-        }
-    }
-    
-    /**
-     * Calls function and returns results.
-     * @return mixed
-     */
-    protected function callFunction() {
-                        
-        if ($this->class !== null) {
-            // import the classname & unqualify it, if necessary
-            $this->class = Phing::import($this->class);
-                        
-            $user_func = array($this->class, $this->function);
-            $h_func = $this->class . '::' . $this->function; // human-readable (for log)
-        } else {
-            $user_func = $this->function;
-            $h_func = $user_func; // human-readable (for log)
-        }
-        
-        // put parameters into simple array
-        $params = array();
-        foreach($this->params as $p) {
-            $params[] = $p->getValue();
-        }
-        
-        $this->log("Calling PHP function: " . $h_func . "()");
-        foreach($params as $p) {
-            $this->log("  param: " . $p, Project::MSG_VERBOSE);
-        } 
-        
-        $return = call_user_func_array($user_func, $params);
-        return $return;
-    }
-    
-    /**
-     * Evaluates expression and returns resulting value.
-     * @return mixed
-     */
-    protected function evalExpression() {
-        $this->log("Evaluating PHP expression: " . $this->expression);
-        if (!StringHelper::endsWith(';', trim($this->expression))) {
-            $this->expression .= ';';
-        }
-        $retval = null;
-        eval('$retval = ' . $this->expression);
-        return $retval;
-    }
-    
-    /** Set function to execute */
-    public function setFunction($f) {
-       $this->function = $f;
-    }
-
-    /** Set [static] class which contains function to execute */
-    public function setClass($c) {
-       $this->class = $c;
-    }
-    
-    /** Sets property name to set with return value of function or expression.*/
-    public function setReturnProperty($r) {
-       $this->returnProperty = $r;
-    }
-    
-    /** Set PHP expression to evaluate. */
-    public function addText($expression) {
-        $this->expression = $expression;
-    }
-
-    /** Set PHP expression to evaluate. */
-    public function setExpression($expression) {
-        $this->expression = $expression;
-    }
-    
-    /** Add a nested <param> tag. */
-    public function createParam() {
-        $p = new FunctionParam();
-        $this->params[] = $p;
-        return $p;
-    }        
-}
-
-/**
- * Supports the <param> nested tag for PhpTask.
- */
-class FunctionParam {
-
-    private $val;
-    
-    public function setValue($v) {
-        $this->val = $v;
-    }
-    
-    public function addText($v) {
-        $this->val = $v;
-    }
-    
-    public function getValue() {
-        return $this->val;
-    }
-}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/PropertyPromptTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/PropertyPromptTask.php
deleted file mode 100644
index 77279a789..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/PropertyPromptTask.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-/*
- *  $Id: PropertyPromptTask.php 272 2007-10-30 23:06:04Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-include_once 'phing/system/io/ConsoleReader.php';
-
-/**
- * Deprecated task that uses console to prompt user for property values.
- * 
- * This class is very slightly simpler than the InputTask, but lacks the ability
- * to use a non-console input handler.  You should, therefore, use InputTask.  This
- * class can serve as a reference, but will be removed in the future.
- * 
- * @author    Hans Lellelid <hans@xmpl.org> (Phing)
- * @author    Anthony J. Young-Garner <ajyoung@alum.mit.edu> (Ant)
- * @version   $Revision: 1.4 $
- * @package   phing.tasks.system
- * @deprecated - in favor of the more capable InputTask
- */ 
-class PropertyPromptTask extends Task {
-	
-	/**
-	 * The property name to set with the output.
-	 * @var string
-	 */
-    private $propertyName;        // required
-    
-    /**
-     * The default value to use if no input is entered.
-     * @var string
-     */
-    private $defaultValue;
-    
-    /**
-     * The entered value.
-     * @var string
-     */
-    private $proposedValue;
-    
-    /**
-     * The text to use for the prompt.
-     * @var string
-     */
-    private $promptText;
-    
-    /**
-     * The character to put after the text.
-     * @var string
-     */
-    private $promptCharacter;
-    
-    /**
-     * 
-     */
-    private $useExistingValue;
-
-    /**
-     * Run the PropertyPrompt task.
-     * @throws BuildException
-     */
-    public function main() {
-    	
-        $this->proposedValue = $this->project->getProperty($this->propertyName);
-        $currentValue = $this->defaultValue;
-        
-        if ($currentValue == "" && $this->proposedValue !== null) {
-        		$currentValue = $this->proposedValue;
-       	}
-       	
-        if ($this->useExistingValue !== true || $this->proposedValue === null) {
-                        
-            $this->log("Prompting user for " . $this->propertyName . ". " . $this->getDefaultMessage(), Project::MSG_VERBOSE);
-            
-            print "\n" . $this->promptText . " [" . $currentValue . "] " . $this->promptCharacter . " ";
-
-            /** future version should probably have hooks for validation of user input.*/
-            $reader = new ConsoleReader();
-            
-            try {
-                $this->proposedValue  = $reader->readLine();
-            } catch (IOException $e) {
-                $this->log("Prompt failed. Using default. (Failure reason: " . $e->getMessage().")");
-                $this->proposedValue = $this->defaultValue;
-            }
-            
-            if ($this->proposedValue === "") {
-                $this->log("No value specified, using default.", Project::MSG_VERBOSE);
-                $this->proposedValue = $this->defaultValue;
-            }
-            
-            if (isset($this->proposedValue) && $this->proposedValue !== "") {                    
-                $this->project->setProperty($this->propertyName, $this->proposedValue);
-            }
-             
-        }    
-    }
-    
-    /**
-     * Returns a string to be inserted in the log message
-     * indicating whether a default response was specified
-     * in the build file.
-     */
-    private function getDefaultMessage() {
-        if ($this->defaultValue == "") {
-            return "No default response specified.";
-        } else return "Default response is " . $this->defaultValue . ".";
-    }
-    
-    /**
-     * Returns defaultValue specified 
-     * in this task for the Property
-     * being set.
-     * @return string
-     */
-    public function getDefaultValue() {
-        return $this->defaultValue;
-    }
-    
-    /**
-     * Returns the terminating character used to 
-     * punctuate the prompt text.
-     * @return string
-     */
-    public function getPromptCharacter() {
-        return $this->promptCharacter;
-    }
-    
-    /**
-     * Returns text of the prompt.
-     * @return java.lang.String
-     */
-    public function getPromptText() {
-        return $this->promptText;
-    }
-    
-    /**
-     * Returns name of the Ant Project Property
-     * being set by this task.
-     * @return string
-     */
-    public function getPropertyName() {
-        return $this->propertyName;
-    }
-    /**
-     * Initializes this task.
-     */
-    public function init() {
-        parent::init();
-        $this->defaultValue    = "";
-        $this->promptCharacter = "?";
-        $this->useExistingValue = false;
-    }
-        
-    /**
-     * Insert the method's description here.
-     * Creation date: (12/10/2001 8:16:16 AM)
-     * @return boolean
-     */
-    public function isUseExistingValue() {
-        return $this->useExistingValue;
-    }
-    
-    /**
-     * Sets defaultValue for the Property
-     * being set by this task.
-     * @param string $newDefaultvalue
-     */
-    public function setDefaultvalue($newDefaultvalue) {
-        $this->defaultValue = $newDefaultvalue;
-    }
-    
-    /**
-     * Sets the terminating character used to 
-     * punctuate the prompt text (default is "?").
-     * @param string $newPromptcharacter
-     */
-    public function setPromptCharacter($newPromptcharacter) {
-        $this->promptCharacter = $newPromptcharacter;
-    }
-    
-    /**
-     * Sets text of the prompt.
-     * @param string $newPrompttext
-     */
-    public function setPromptText($newPrompttext) {
-        $this->promptText = $newPrompttext;
-    }
-    
-    /**
-     * Specifies the Phing Project Property
-     * being set by this task.
-     * @param newPropertyname java.lang.String
-     */
-    public function setPropertyName($newPropertyname) {
-        $this->propertyName = $newPropertyname;
-    }
-    
-    /**
-     * 
-     * @param boolean $newUseExistingValue
-     */
-    public function setUseExistingValue($newUseExistingValue) {
-        $this->useExistingValue = $newUseExistingValue;
-    }
-    
-    /**
-     * Sets the prompt text that will be presented to the user.
-     * @param string $prompt
-     * @return void
-     */
-    public function addText($prompt) {
-        $this->setPromptText($prompt);
-    }
-    
-    
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/PropertyTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/PropertyTask.php
deleted file mode 100644
index 6a650d7ee..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/PropertyTask.php
+++ /dev/null
@@ -1,438 +0,0 @@
-<?php
-
-/*
- *  $Id: PropertyTask.php 144 2007-02-05 15:19:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-include_once 'phing/Task.php';
-include_once 'phing/system/util/Properties.php';
-
-/**
- * Task for setting properties in buildfiles.
- *
- * @author    Andreas Aderhold <andi@binarycloud.com>
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision$
- * @package   phing.tasks.system
- */
-class PropertyTask extends Task {
-
-    /** name of the property */
-    protected $name; 
-    
-    /** value of the property */
-    protected $value;
-    
-    protected $reference;
-    protected $env;     // Environment
-    protected $file;
-    protected $ref;
-    protected $prefix;
-    protected $fallback;
-    
-    /** Whether to force overwrite of existing property. */
-    protected $override = false;
-    
-    /** Whether property should be treated as "user" property. */
-    protected $userProperty = false;
-
-    /**
-     * Sets a the name of current property component
-     */
-    function setName($name) {
-        $this->name = (string) $name;
-    }
-    
-    /** Get property component name. */
-    function getName() {
-        return $this->name;
-    }
-
-    /**
-     * Sets a the value of current property component.
-     * @param    mixed      Value of name, all scalars allowed
-     */
-    function setValue($value) {
-        $this->value = (string) $value;
-    }
-	
-	/**
-	 * Sets value of property to CDATA tag contents.
-	 * @param string $values
-	 * @since 2.2.0
-	 */
-	public function addText($value) {
-		$this->setValue($value);
-	}
-    
-    /** Get the value of current property component. */
-    function getValue() {
-        return $this->value;
-    }
-    
-    /** Set a file to use as the source for properties. */
-    function setFile($file) {
-        if (is_string($file)) {
-            $file = new PhingFile($file);
-        }
-        $this->file = $file;
-    }
-    
-    /** Get the PhingFile that is being used as property source. */
-    function getFile() {
-        return $this->file;
-    }
-
-    function setRefid(Reference $ref) {
-        $this->reference = $ref;
-    }
-    
-    function getRefid() {
-        return $this->reference;
-    }
-
-    /**
-     * Prefix to apply to properties loaded using <code>file</code>.
-     * A "." is appended to the prefix if not specified.
-     * @param string $prefix prefix string
-     * @return void
-     * @since 2.0
-     */
-    public function setPrefix($prefix) {
-        $this->prefix = $prefix;
-        if (!StringHelper::endsWith(".", $prefix)) {
-            $this->prefix .= ".";
-        }
-    }
-
-    /**
-     * @return string
-     * @since 2.0
-     */
-    public function getPrefix() {
-        return $this->prefix;
-    }
-
-    /**
-    * the prefix to use when retrieving environment variables.
-    * Thus if you specify environment="myenv"
-    * you will be able to access OS-specific
-    * environment variables via property names "myenv.PATH" or
-    * "myenv.TERM".
-    * <p>
-    * Note that if you supply a property name with a final
-    * "." it will not be doubled. ie environment="myenv." will still
-    * allow access of environment variables through "myenv.PATH" and
-    * "myenv.TERM". This functionality is currently only implemented
-    * on select platforms. Feel free to send patches to increase the number of platforms
-    * this functionality is supported on ;).<br>
-    * Note also that properties are case sensitive, even if the
-    * environment variables on your operating system are not, e.g. it
-    * will be ${env.Path} not ${env.PATH} on Windows 2000.
-    * @param env prefix
-    */
-    function setEnvironment($env) {
-        $this->env = (string) $env;
-    }
-
-    function getEnvironment() {
-        return $this->env;
-    }
-    
-    /**
-     * Set whether this is a user property (ro).
-     * This is deprecated in Ant 1.5, but the userProperty attribute
-     * of the class is still being set via constructor, so Phing will
-     * allow this method to function.
-     * @param boolean $v
-     */
-    function setUserProperty($v) {
-        $this->userProperty = (boolean) $v;
-    }
-    
-    function getUserProperty() {
-        return $this->userProperty;
-    }
-    
-    function setOverride($v) {
-        $this->override = (boolean) $v;
-    }
-    
-    function getOverride() {
-        return $this->override;
-    }
-    
-    function toString() {
-        return (string) $this->value;
-    }
-
-	/**
-	 * @param Project $p
-	 */
-    function setFallback($p) {
-        $this->fallback = $p;
-    }
-    
-    function getFallback() {
-        return $this->fallback;
-    }
-    /**
-     * set the property in the project to the value.
-     * if the task was give a file or env attribute
-     * here is where it is loaded
-     */
-    function main() {
-        if ($this->name !== null) {
-            if ($this->value === null && $this->ref === null) {
-                throw new BuildException("You must specify value or refid with the name attribute", $this->getLocation());
-            }
-        } else {
-            if ($this->file === null && $this->env === null ) {
-                throw new BuildException("You must specify file or environment when not using the name attribute", $this->getLocation());
-            }
-        }
-
-        if ($this->file === null && $this->prefix !== null) {
-            throw new BuildException("Prefix is only valid when loading from a file.", $this->getLocation());
-        }
-        
-        if (($this->name !== null) && ($this->value !== null)) {
-            $this->addProperty($this->name, $this->value);
-        }
-
-        if ($this->file !== null) {
-            $this->loadFile($this->file);
-        }
-
-        if ( $this->env !== null ) {
-            $this->loadEnvironment($this->env);
-        }
-
-        if (($this->name !== null) && ($this->ref !== null)) {
-            // get the refereced property
-            try {
-            $this->addProperty($this->name, $this->reference->getReferencedObject($this->project)->toString());
-            } catch (BuildException $be) {
-                if ($this->fallback !== null) {
-                     $this->addProperty($this->name, $this->reference->getReferencedObject($this->fallback)->toString());
-                } else {
-                    throw $be;
-                }
-            }
-        }
-    }
-    
-    /**
-     * load the environment values
-     * @param string $prefix prefix to place before them
-     */
-    protected function loadEnvironment($prefix) {
-
-        $props = new Properties();
-        if ( substr($prefix, strlen($prefix)-1) == '.' ) {
-            $prefix .= ".";
-        }
-        $this->log("Loading Environment $prefix", Project::MSG_VERBOSE);
-        foreach($_ENV as $key => $value) {
-            $props->setProperty($prefix . '.' . $key, $value);
-        }
-        $this->addProperties($props);
-    }
-
-    /**
-     * iterate through a set of properties,
-     * resolve them then assign them
-     */
-    protected function addProperties($props) {
-        $this->resolveAllProperties($props);
-        foreach($props->keys() as $name) {        
-            $value = $props->getProperty($name);
-            $v = $this->project->replaceProperties($value);            
-            if ($this->prefix !== null) {
-                $name = $this->prefix . $name;
-            }
-            $this->addProperty($name, $v);
-        }
-    }
-
-    /**
-     * add a name value pair to the project property set
-     * @param string $name name of property
-     * @param string $value value to set
-     */
-    protected function addProperty($name, $value) {
-        if ($this->userProperty) {
-            if ($this->project->getUserProperty($name) === null || $this->override) {
-                $this->project->setInheritedProperty($name, $value);
-            } else {
-                $this->log("Override ignored for " . $name, Project::MSG_VERBOSE);
-            }
-        } else {
-            if ($this->override) {
-                $this->project->setProperty($name, $value);
-            } else {
-                $this->project->setNewProperty($name, $value);
-            }
-        }
-    }
-
-    /**
-     * load properties from a file.
-     * @param PhingFile $file
-     */
-    protected function loadFile(PhingFile $file) {
-        $props = new Properties();
-        $this->log("Loading ". $file->getAbsolutePath(), Project::MSG_INFO);
-        try { // try to load file
-            if ($file->exists()) {
-                $props->load($file);
-                $this->addProperties($props);
-            } else {
-                $this->log("Unable to find property file: ". $file->getAbsolutePath() ."... skipped", Project::MSG_WARN);
-            }
-        } catch (IOException $ioe) {
-            throw new BuildException("Could not load properties from file.", $ioe);
-        }
-    }
-    
-    /**
-     * Given a Properties object, this method goes through and resolves
-     * any references to properties within the object.
-     * 
-     * @param Properties $props The collection of Properties that need to be resolved.
-     * @return void
-     */
-    protected function resolveAllProperties(Properties $props) {
-        
-        $keys = $props->keys();
-
-        while(count($keys)) {
-
-            // There may be a nice regex/callback way to handle this
-            // replacement, but at the moment it is pretty complex, and
-            // would probably be a lot uglier to work into a preg_replace_callback()
-            // system.  The biggest problem is the fact that a resolution may require
-            // multiple passes.
-            
-            $name     = array_shift($keys);
-            $value    = $props->getProperty($name);
-            $resolved = false;
-            
-            while(!$resolved) {
-            
-                $fragments = array();
-                $propertyRefs = array();
-
-                // [HL] this was ::parsePropertyString($this->value ...) ... this seems wrong
-                self::parsePropertyString($value, $fragments, $propertyRefs);
-
-                $resolved = true;
-                if (count($propertyRefs) !== 0) {
-
-                    $sb = "";
-
-                    $i = $fragments;
-                    $j = $propertyRefs;
-                    while(count($i)) {
-                        $fragment = array_shift($i);
-                        if ($fragment === null) {
-                            $propertyName = array_shift($j);
-
-                            if ($propertyName === $name) {
-                                // Should we maybe just log this as an error & move on?
-                                // $this->log("Property ".$name." was circularly defined.", Project::MSG_ERR);
-                                throw new BuildException("Property ".$name." was circularly defined.");
-                            }
-
-                            $fragment = $this->getProject()->getProperty($propertyName);
-                            if ($fragment === null) {
-                                if ($props->containsKey($propertyName)) {
-                                    $fragment = $props->getProperty($propertyName);
-                                    $resolved = false; // parse again (could have been replaced w/ another var)
-                                } else {
-                                    $fragment = "\${".$propertyName."}";
-                                }
-                            }
-                        }
-                        $sb .= $fragment;
-                    }
-                    
-                    $this->log("Resolved Property \"$value\" to \"$sb\"", Project::MSG_DEBUG);
-                    $value = $sb;                    
-                    $props->setProperty($name, $value);
-                                 
-                } // if (count($propertyRefs))
-                
-            } // while (!$resolved)
-            
-        } // while (count($keys)
-    }
-
-
-     /**
-     * This method will parse a string containing ${value} style
-     * property values into two lists. The first list is a collection
-     * of text fragments, while the other is a set of string property names
-     * null entries in the first list indicate a property reference from the
-     * second list.
-     *
-     * This is slower than regex, but useful for this class, which has to handle
-     * multiple parsing passes for properties.
-     *
-     * @param string $value The string to be scanned for property references
-     * @param array &$fragments The found fragments
-     * @param  array &$propertyRefs The found refs
-     */
-    protected function parsePropertyString($value, &$fragments, &$propertyRefs) {
-    
-        $prev = 0;
-        $pos  = 0;
-
-        while (($pos = strpos($value, '$', $prev)) !== false) {
-            
-            if ($pos > $prev) {
-                array_push($fragments, StringHelper::substring($value, $prev, $pos-1));
-            }
-            if ($pos === (strlen($value) - 1)) {
-                array_push($fragments, '$');
-                $prev = $pos + 1;
-            } elseif ($value{$pos+1} !== '{' ) {
-
-                // the string positions were changed to value-1 to correct
-                // a fatal error coming from function substring()
-                array_push($fragments, StringHelper::substring($value, $pos, $pos + 1));
-                $prev = $pos + 2;
-            } else {
-                $endName = strpos($value, '}', $pos);
-                if ($endName === false) {
-                    throw new BuildException("Syntax error in property: $value");
-                }
-                $propertyName = StringHelper::substring($value, $pos + 2, $endName-1);
-                array_push($fragments, null);
-                array_push($propertyRefs, $propertyName);
-                $prev = $endName + 1;
-            }
-        }
-
-        if ($prev < strlen($value)) {
-            array_push($fragments, StringHelper::substring($value, $prev));
-        }
-    }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ReflexiveTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ReflexiveTask.php
deleted file mode 100644
index df089f47a..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ReflexiveTask.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/*
- *  $Id: ReflexiveTask.php 144 2007-02-05 15:19:00Z hans $  
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-
-/**
- * This task is for using filter chains to make changes to files and overwrite the original files.
- * 
- * This task was created to serve the need for "cleanup" tasks -- e.g. a ReplaceRegexp task or strip task
- * being used to modify files and then overwrite the modified files.  In many (most?) cases you probably
- * should just use a copy task  to preserve the original source files, but this task supports situations
- * where there is no src vs. build directory, and modifying source files is actually desired.
- * 
- * <code>
- *    <reflexive>
- *        <fileset dir=".">
- *            <include pattern="*.html">
- *        </fileset>
- *        <filterchain>
- *            <replaceregexp>
- *                <regexp pattern="\n\r" replace="\n"/>
- *            </replaceregexp>
- *        </filterchain> 
- *    </reflexive>
- * </code>
- * 
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.11 $
- * @package   phing.tasks.system
- */
-class ReflexiveTask extends Task {
-    
-    /** Single file to process. */
-    private $file;
-    
-    /** Any filesets that should be processed. */
-    private $filesets = array();
-    
-    /** Any filters to be applied before append happens. */
-    private $filterChains = array();
-        
-    /** Alias for setFrom() */
-    function setFile(PhingFile $f) {
-        $this->file = $f;
-    }
-    
-    /** Nested creator, adds a set of files (nested fileset attribute). */
-    function createFileSet() {
-        $num = array_push($this->filesets, new FileSet());
-        return $this->filesets[$num-1];
-    }
-
-    /**
-     * Creates a filterchain
-     *
-     * @return  object  The created filterchain object
-     */
-    function createFilterChain() {
-        $num = array_push($this->filterChains, new FilterChain($this->project));
-        return $this->filterChains[$num-1];
-    }                    
-    
-    /** Append the file(s). */
-    function main() {
-            
-        if ($this->file === null && empty($this->filesets)) {
-            throw new BuildException("You must specify a file or fileset(s) for the <reflexive> task.");
-        }
-        
-        // compile a list of all files to modify, both file attrib and fileset elements
-        // can be used.
-        
-        $files = array();
-        
-        if ($this->file !== null) {
-            $files[] = $this->file;
-        }
-        
-        if (!empty($this->filesets)) {
-            $filenames = array();
-            foreach($this->filesets as $fs) {
-                try {
-                    $ds = $fs->getDirectoryScanner($this->project);
-                    $filenames = $ds->getIncludedFiles(); // get included filenames
-                    $dir = $fs->getDir($this->project);
-                    foreach ($filenames as $fname) {
-                        $files[] = new PhingFile($dir, $fname);
-                    }
-                } catch (BuildException $be) {
-                    $this->log($be->getMessage(), Project::MSG_WARN);
-                }
-            }                        
-        }
-        
-        $this->log("Applying reflexive processing to " . count($files) . " files.");
-
-		// These "slots" allow filters to retrieve information about the currently-being-process files		
-		$slot = $this->getRegisterSlot("currentFile");
-		$basenameSlot = $this->getRegisterSlot("currentFile.basename");	
-
-        
-        foreach($files as $file) {
-			// set the register slots
-			
-			$slot->setValue($file->getPath());
-			$basenameSlot->setValue($file->getName());
-			
-            // 1) read contents of file, pulling through any filters
-            $in = null;
-            try {                
-                $contents = "";
-                $in = FileUtils::getChainedReader(new FileReader($file), $this->filterChains, $this->project);
-                while(-1 !== ($buffer = $in->read())) {
-                    $contents .= $buffer;
-                }
-                $in->close();
-            } catch (Exception $e) {
-                if ($in) $in->close();
-                $this->log("Erorr reading file: " . $e->getMessage(), Project::MSG_WARN);
-            }
-            
-            try {
-                // now create a FileWriter w/ the same file, and write to the file
-                $out = new FileWriter($file);
-                $out->write($contents);
-                $out->close();
-                $this->log("Applying reflexive processing to " . $file->getPath(), Project::MSG_VERBOSE);
-            } catch (Exception $e) {
-                if ($out) $out->close();
-                $this->log("Error writing file back: " . $e->getMessage(), Project::MSG_WARN);
-            }
-            
-        }
-                                
-    }   
-
-}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ResolvePathTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ResolvePathTask.php
deleted file mode 100644
index 35187f897..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/ResolvePathTask.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/*
- *  $Id: ResolvePathTask.php 144 2007-02-05 15:19:00Z hans $  
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-
-/**
- * Task for resolving relative paths and setting absolute path in property value.
- * 
- * This task was created to address a need for resolving absolute paths of files / directories.
- * In many cases a relative directory (e.g. "./build") is specified, but it needs to be treated
- * as an absolute path since other build files (e.g. in subdirs) should all be using the same
- * path -- and not treating it as a relative path to their own directory.
- * 
- * <code>
- * <property name="relative_path" value="./dirname"/>
- * <resolvepath propertyName="absolute_path" file="${relative_path}"/>
- * <echo>Resolved [absolute] path: ${absolute_path}</echo>
- * </code>
- * 
- * TODO:
- *      - Possibly integrate this with PackageAsPath, for handling/resolving dot-path paths.
- * 
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.6 $
- * @package   phing.tasks.system
- */
-class ResolvePathTask extends Task {
-
-    /** Name of property to set. */
-    private $propertyName;
-    
-    /** The [possibly] relative file/path that needs to be resolved. */
-    private $file;
-    
-    /** Base directory used for resolution. */
-    private $dir;
-    
-    /**
-     * Set the name of the property to set.
-     * @param string $v Property name
-     * @return void
-     */
-    public function setPropertyName($v) {
-        $this->propertyName = $v;
-    }
-    
-    /**
-     * Sets a base dir to use for resolution.
-     * @param PhingFile $d
-     */
-    function setDir(PhingFile $d) {
-        $this->dir = $d;
-    }
-    
-    /**
-     * Sets a path (file or directory) that we want to resolve.
-     * This is the same as setFile() -- just more generic name so that it's
-     * clear that you can also use it to set directory.
-     * @param string $f
-     * @see setFile()
-     */
-    function setPath($f) {
-        $this->file = $f;
-    }
-    
-    /**
-     * Sets a file that we want to resolve.
-     * @param string $f
-     */
-    function setFile($f) {
-        $this->file = $f;
-    }
-
-    /**
-     * Perform the resolution & set property.
-     */
-    public function main() {        
-        
-        if (!$this->propertyName) {
-            throw new BuildException("You must specify the propertyName attribute", $this->getLocation());
-        }
-        
-        // Currently only files are supported
-        if ($this->file === null) {
-            throw new BuildException("You must specify a path to resolve", $this->getLocation());
-        }
-        
-		$fs = FileSystem::getFileSystem();
-		
-        // if dir attribute was specified then we should
-        // use that as basedir to which file was relative.
-		// -- unless the file specified is an absolute path
-        if ($this->dir !== null && !$fs->isAbsolute(new PhingFile($this->file))) {
-            $resolved = new PhingFile($this->dir->getPath(), $this->file);
-        } else {
-            // otherwise just resolve it relative to project basedir
-            $resolved = $this->project->resolveFile($this->file);
-        }
-        
-        $this->log("Resolved " . $this->file . " to " . $resolved->getAbsolutePath(), Project::MSG_INFO);
-        $this->project->setProperty($this->propertyName, $resolved->getAbsolutePath());
-    }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/SequentialTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/SequentialTask.php
deleted file mode 100644
index 8eafd05e2..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/SequentialTask.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/*
- *  $Id: SequentialTask.php 43 2006-03-10 14:31:51Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-require_once 'phing/TaskContainer.php';
-
-/**
- * Sequential is a container task that contains other Phing Task objects.
- *
- * The sequential task has no attributes and does not support any nested
- * elements apart from Ant tasks. Any valid Ant task may be embedded within the
- * sequential task.
- *
- * @since 2.1.2
- */
-class SequentialTask extends Task implements TaskContainer {
-
-    /** Optional Vector holding the nested tasks */
-    private $nestedTasks = array();
-
-    /**
-     * Add a nested task to Sequential.
-     * @param Task $nestedTask  Nested task to execute Sequential
-     */
-    public function addTask(Task $nestedTask) {
-        $this->nestedTasks[] = $nestedTask;
-    }
-
-    /**
-     * Execute all nestedTasks.
-     * @throws BuildException if one of the nested tasks fails.
-     */
-    public function main() {
-		foreach($this->nestedTasks as $task) {
-			$task->perform();
-		}
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/TaskdefTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/TaskdefTask.php
deleted file mode 100644
index 63382038c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/TaskdefTask.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-/*
- * $Id: TaskdefTask.php 144 2007-02-05 15:19:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-require_once 'phing/Task.php';
-
-/**
- * Register a task for use within a buildfile.
- * 
- * This is for registering your own tasks -- or any non-core Task -- for use within a buildfile.
- * If you find that you are using a particular class frequently, you may want to edit the 
- * phing/tasks/defaults.properties file so that it is included by default. You may also
- * want to submit it (if LGPL or compatible license) to be included in Phing distribution.
- * 
- * <pre>
- *   <taskdef name="mytag" classname="path.to.MyHandlingClass"/>
- *   .
- *   .
- *   <mytag param1="val1" param2="val2"/>
- * </pre>
- * 
- * TODO:
- *    -- possibly refactor since this is almost the same as TypeDefTask
- *      (right now these are just too simple to really justify creating an abstract class)
- * 
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.11 $
- * @package   phing.tasks.system
- */
-class TaskdefTask extends Task {
-
-    /** Tag name for task that will be used in XML */
-    private $name;
-    
-    /**
-     * Classname of task to register.
-     * This can be a dot-path -- relative to a location on PHP include_path.
-     * E.g. path.to.MyClass ->  path/to/MyClass.php
-     * @var string
-     */
-    private $classname;
-    
-    /**
-     * Path to add to PHP include_path to aid in finding specified class.
-     * @var Path
-     */
-    private $classpath;
-    
-    /**
-     * Refid to already defined classpath
-     */
-    private $classpathId;
-    
-    /**
-     * Set the classpath to be used when searching for component being defined
-     * 
-     * @param Path $classpath An Path object containing the classpath.
-     */
-    public function setClasspath(Path $classpath) {
-        if ($this->classpath === null) {
-            $this->classpath = $classpath;
-        } else {
-            $this->classpath->append($classpath);
-        }
-    }
-
-    /**
-     * Create the classpath to be used when searching for component being defined
-     */ 
-    public function createClasspath() {
-        if ($this->classpath === null) {
-            $this->classpath = new Path($this->project);
-        }
-        return $this->classpath->createPath();
-    }
-
-    /**
-     * Reference to a classpath to use when loading the files.
-     */
-    public function setClasspathRef(Reference $r) {
-        $this->classpathId = $r->getRefId();
-        $this->createClasspath()->setRefid($r);
-    }
-
-    /**
-     * Sets the name that will be used in XML buildfile.
-     * @param string $name
-     */
-    public function setName($name)    {
-        $this->name = $name;
-    }
-    
-    /**
-     * Sets the class name / dotpath to use.
-     * @param string $class
-     */
-    public function setClassname($class) {
-        $this->classname = $class;
-    }
-    
-    /** Main entry point */
-    public function main() {
-        if ($this->name === null || $this->classname === null) {
-            throw new BuildException("You must specify name and class attributes for <taskdef>.");
-        }
-        $this->log("Task " . $this->name . " will be handled by class " . $this->classname, Project::MSG_VERBOSE);
-        $this->project->addTaskDefinition($this->name, $this->classname, $this->classpath);
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/TouchTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/TouchTask.php
deleted file mode 100644
index bc57cbb7b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/TouchTask.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-/*
- *  $Id: TouchTask.php 144 2007-02-05 15:19:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-include_once 'phing/util/DirectoryScanner.php';
-include_once 'phing/types/FileSet.php';
-include_once 'phing/util/FileUtils.php';
-include_once 'phing/system/io/PhingFile.php';
-include_once 'phing/system/io/IOException.php';
-
-/**
- * Touch a file and/or fileset(s); corresponds to the Unix touch command.
- *
- * If the file to touch doesn't exist, an empty one is created.
- *
- * @version $Revision: 1.12 $
- * @package phing.tasks.system
- */
-class TouchTask extends Task {
-
-    private $file;
-    private $millis    = -1;
-    private $dateTime;
-    private $filesets = array();
-    private $fileUtils;
-
-    function __construct() {
-        $this->fileUtils = new FileUtils();
-    }
-
-    /**
-     * Sets a single source file to touch.  If the file does not exist
-     * an empty file will be created.
-     */
-    function setFile(PhingFile $file) {        
-        $this->file = $file;
-    }
-
-    /**
-     * the new modification time of the file
-     * in milliseconds since midnight Jan 1 1970.
-     * Optional, default=now
-     */
-    function setMillis($millis) {
-        $this->millis = (int) $millis;
-    }
-
-    /**
-     * the new modification time of the file
-     * in the format MM/DD/YYYY HH:MM AM or PM;
-     * Optional, default=now
-     */
-    function setDatetime($dateTime) {
-        $this->dateTime = (string) $dateTime;
-    }
-
-    /**
-     * Nested creator, adds a set of files (nested fileset attribute).
-     * @return FileSet
-     */
-    function createFileSet() {
-        $num = array_push($this->filesets, new FileSet());
-        return $this->filesets[$num-1];
-    }
-
-    /**
-     * Execute the touch operation.
-     */
-    function main() {
-        $savedMillis = $this->millis;
-
-        if ($this->file === null && count($this->filesets) === 0) {
-            throw new BuildException("Specify at least one source - a file or a fileset.");
-        }
-
-        if ($this->file !== null && $this->file->exists() && $this->file->isDirectory()) {
-            throw new BuildException("Use a fileset to touch directories.");
-        }
-
-        try { // try to touch file
-            if ($this->dateTime !== null) {
-                $this->setMillis(strtotime($this->dateTime));
-                if ($this->millis < 0) {
-                    throw new BuildException("Date of {$this->dateTime} results in negative milliseconds value relative to epoch (January 1, 1970, 00:00:00 GMT).");
-                }
-            }
-            $this->_touch();
-        } catch (Exception $ex) {
-            throw new BuildException("Error touch()ing file", $ex, $this->location);
-        }
-        
-        $this->millis = $savedMillis;
-        
-    }
-
-    /**
-     * Does the actual work.
-     */
-    function _touch() {
-        if ($this->file !== null) {
-            if (!$this->file->exists()) {
-                $this->log("Creating " . $this->file->__toString(), Project::MSG_INFO);
-                try { // try to create file
-                    $this->file->createNewFile();
-                } catch(IOException  $ioe) {
-                    throw new BuildException("Error creating new file " . $this->file->__toString(), $ioe, $this->location);
-                }
-            }
-        }
-
-        $resetMillis = false;
-        if ($this->millis < 0) {
-            $resetMillis = true;
-            $this->millis = Phing::currentTimeMillis();
-        }
-
-        if ($this->file !== null) {
-            $this->touchFile($this->file);
-        }
-
-        // deal with the filesets
-        foreach($this->filesets as $fs) {
-        
-            $ds = $fs->getDirectoryScanner($this->getProject());
-            $fromDir = $fs->getDir($this->getProject());
-
-            $srcFiles = $ds->getIncludedFiles();
-            $srcDirs = $ds->getIncludedDirectories();
-
-            for ($j=0,$_j=count($srcFiles); $j < $_j; $j++) {
-                $this->touchFile(new PhingFile($fromDir, (string) $srcFiles[$j]));
-            }
-            
-            for ($j=0,$_j=count($srcDirs); $j < $_j ; $j++) {
-                $this->touchFile(new PhingFile($fromDir, (string) $srcDirs[$j]));
-            }
-        }
-
-        if ($resetMillis) {
-            $this->millis = -1;
-        }
-    }
-
-    private function touchFile($file) {
-        if ( !$file->canWrite() ) {
-            throw new BuildException("Can not change modification date of read-only file " . $file->__toString());
-        }
-        $file->setLastModified($this->millis);
-    }
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/TstampTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/TstampTask.php
deleted file mode 100644
index bff2daba0..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/TstampTask.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-/*
- *  $Id: TstampTask.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-require_once 'phing/Task.php';
-
-/**
- * Sets properties to the current time, or offsets from the current time.
- * The default properties are TSTAMP, DSTAMP and TODAY;
- *
- * Based on Ant's Tstamp task.
- * 
- * @author   Michiel Rook <michiel.rook@gmail.com>
- * @version  $Revision: 1.6 $
- * @package  phing.tasks.system
- * @since    2.2.0
- */
-class TstampTask extends Task
-{
-	private $customFormats = array();
-	
-	private $prefix = "";
-	
-	/**
-	 * Set a prefix for the properties. If the prefix does not end with a "."
-	 * one is automatically added.
-	 * @param prefix the prefix to use.
-	 */
-	public function setPrefix($prefix)
-	{
-		$this->prefix = $prefix;
-		
-		if (!empty($this->prefix))
-		{
-			$this->prefix.= ".";
-		}
-	}
-	
-    /**
-     * Adds a custom format
-     *
-	 * @param TstampCustomFormat custom format
-     */
-	public function addFormat(TstampCustomFormat $cf)
-	{
-		$this->customFormats[] = $cf;
-	}
-
-    /**
-     * Create the timestamps. Custom ones are done before
-     * the standard ones.
-     *
-     * @throws BuildException
-     */
-    public function main()
-    {
-		foreach ($this->customFormats as $cf)
-		{
-			$cf->execute($this);
-		}
-		
-		$dstamp = strftime('%Y%m%d');
-		$this->prefixProperty('DSTAMP', $dstamp);
-		
-		$tstamp = strftime('%H%M');
-		$this->prefixProperty('TSTAMP', $tstamp);
-		
-		$today = strftime('%B %d %Y');
-		$this->prefixProperty('TODAY', $today);
-	}
-	
-    /**
-     * helper that encapsulates prefix logic and property setting
-     * policy (i.e. we use setNewProperty instead of setProperty).
-     */
-    public function prefixProperty($name, $value)
-    {
-        $this->getProject()->setNewProperty($this->prefix . $name, $value);
-    }
-}
-
-class TstampCustomFormat
-{
-	private $propertyName = "";
-	private $pattern = "";
-	private $locale = "";
-	
-	/**
-	 * The property to receive the date/time string in the given pattern
-	 *
-	 * @param propertyName the name of the property.
-	 */
-	public function setProperty($propertyName)
-	{
-		$this->propertyName = $propertyName;
-	}
-
-	/**
-	 * The date/time pattern to be used. The values are as
-	 * defined by the PHP strftime() function.
-	 *
-	 * @param pattern
-	 */
-	public function setPattern($pattern)
-	{
-		$this->pattern = $pattern;
-	}
-	
-	/**
-	 * The locale used to create date/time string.
-	 *
-	 * @param locale
-	 */
-	public function setLocale($locale)
-	{
-		$this->locale = $locale;
-	}
-	
-	/**
-	 * validate parameter and execute the format.
-	 *
-	 * @param TstampTask reference to task
-	 */
-	public function execute(TstampTask $tstamp)
-	{
-		if (empty($this->propertyName))
-		{
-			throw new BuildException("property attribute must be provided");
-		}
-
-		if (empty($this->pattern))
-		{
-			throw new BuildException("pattern attribute must be provided");
-		}
-		
-		if (!empty($this->locale))
-		{
-			setlocale(LC_ALL, $this->locale);
-		}
-		
-		$value = strftime($this->pattern);
-		$tstamp->prefixProperty($this->propertyName, $value);
-		
-		if (!empty($this->locale))
-		{
-			// reset locale
-			setlocale(LC_ALL, NULL);
-		}
-	}
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/TypedefTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/TypedefTask.php
deleted file mode 100644
index 05e4412ea..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/TypedefTask.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-/*
- *  $Id: TypedefTask.php 43 2006-03-10 14:31:51Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-
-/**
- * Register a datatype for use within a buildfile.
- * 
- * This is for registering your own datatypes for use within a buildfile.
- * 
- * If you find that you are using a particular class frequently, you may want to edit the 
- * phing/types/defaults.properties file so that it is included by default.  You may also
- * want to submit it (if LGPL or compatible license) to be included in Phing distribution.
- * 
- * <pre>
- *   <typedef name="mytype" classname="path.to.MyHandlingClass"/>
- *   .
- *   <sometask ...>
- *     <mytype param1="val1" param2="val2"/>
- *   </sometask>
- * </pre>
- * 
- * TODO:
- *    -- possibly refactor since this is almost the same as TaskDefTask
- *      (right now these are just too simple to really justify creating an abstract class)
- * 
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version   $Revision: 1.7 $
- * @package   phing.tasks.system
- */
-class TypedefTask extends Task {
-    
-    /** Tag name for datatype that will be used in XML */
-    private $name;
-    
-    /**
-     * Classname of task to register.
-     * This can be a dot-path -- relative to a location on PHP include_path.
-     * E.g. path.to.MyClass ->  path/to/MyClass.php
-     * @var string
-     */
-    private $classname;
-    
-    /**
-     * Path to add to PHP include_path to aid in finding specified class.
-     * @var Path
-     */
-    private $classpath;
-    
-    /** Refid to already defined classpath */
-    private $classpathId;
-    
-    /**
-     * Set the classpath to be used when searching for component being defined
-     * 
-     * @param Path $classpath An Path object containing the classpath.
-     */
-    public function setClasspath(Path $classpath) {
-        if ($this->classpath === null) {
-            $this->classpath = $classpath;
-        } else {
-            $this->classpath->append($classpath);
-        }
-    }
-
-    /**
-     * Create the classpath to be used when searching for component being defined
-     */ 
-    public function createClasspath() {
-        if ($this->classpath === null) {
-            $this->classpath = new Path($this->project);
-        }
-        return $this->classpath->createPath();
-    }
-
-    /**
-     * Reference to a classpath to use when loading the files.
-     */
-    public function setClasspathRef(Reference $r) {
-        $this->classpathId = $r->getRefId();
-        $this->createClasspath()->setRefid($r);
-    }
-    
-    /** Main entry point */
-    public function main() {
-        if ($this->name === null || $this->classname === null) {
-            throw new BuildException("You must specify name and class attributes for <typedef>.");
-        }        
-        $this->project->addDataTypeDefinition($this->name, $this->classname, $this->classpath);
-    }
-    
-    /**
-     * Sets the name that will be used in XML buildfile.
-     * @param string $name
-     */
-    public function setName($name)    {
-        $this->name = $name;
-    }
-    
-    /**
-     * Sets the class name / dotpath to use.
-     * @param string $class
-     */
-    public function setClassname($class) {
-        $this->classname = $class;
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/UpToDateTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/UpToDateTask.php
deleted file mode 100644
index b6229f523..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/UpToDateTask.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-/*
- * $Id: UpToDateTask.php 144 2007-02-05 15:19:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-include_once 'phing/tasks/system/condition/Condition.php';
-include_once 'phing/util/DirectoryScanner.php';
-include_once 'phing/util/SourceFileScanner.php';
-include_once 'phing/mappers/MergeMapper.php';
-
-/**
- * Sets the given property if the specified target has a timestamp
- * greater than all of the source files.
- *
- * @author    Hans Lellelid <hans@xmpl.org> (Phing)
- * @author    William Ferguson <williamf@mincom.com> (Ant)
- * @author    Hiroaki Nakamura <hnakamur@mc.neweb.ne.jp> (Ant)
- * @author    Stefan Bodewig <stefan.bodewig@epost.de> (Ant)
- * @version   $Revision: 1.6 $
- * @package   phing.tasks.system
- */
-class UpToDateTask extends Task implements Condition {
-
-    private $_property;
-    private $_value;
-    private $_sourceFile;
-    private $_targetFile;
-    private $sourceFileSets = array();
-
-    protected $mapperElement = null;
-
-    /**
-     * The property to set if the target file is more up-to-date than
-     * (each of) the source file(s).
-     *
-     * @param property the name of the property to set if Target is up-to-date.
-     */
-    public function setProperty($property) {
-        $this->_property = $property;
-    }
-
-    /**
-     * The value to set the named property to if the target file is more
-     * up-to-date than (each of) the source file(s). Defaults to 'true'.
-     *
-     * @param value the value to set the property to if Target is up-to-date
-     */
-    public function setValue($value) {
-        $this->_value = $value;
-    }
-
-    /**
-     * Returns the value, or "true" if a specific value wasn't provided.
-     */
-    private function getValue() {
-        return ($this->_value !== null) ? $this->_value : "true";
-    } 
-
-    /**
-     * The file which must be more up-to-date than (each of) the source file(s)
-     * if the property is to be set.
-     *
-     * @param file the file we are checking against.
-     */
-    public function setTargetFile($file) {
-        if (is_string($file)) {
-            $file = new PhingFile($file);
-        }
-        $this->_targetFile = $file;
-    }
-
-    /**
-     * The file that must be older than the target file
-     * if the property is to be set.
-     *
-     * @param file the file we are checking against the target file.
-     */
-    public function setSrcfile($file) {
-        if (is_string($file)) {
-            $file = new PhingFile($file);
-        }
-        $this->_sourceFile = $file;
-    }
-
-    /**
-     * Nested <srcfiles> element.
-     */
-    public function createSrcfiles() {
-        $fs = new FileSet();
-        $this->sourceFileSets[] = $fs;
-        return $fs;
-    }
-
-    /**
-     * Defines the FileNameMapper to use (nested mapper element).
-     */
-    public function createMapper() {
-        if ($this->mapperElement !== null) {
-            throw new BuildException("Cannot define more than one mapper",
-                                     $this->location);
-        }
-        $this->mapperElement = new Mapper($this->getProject());
-        return $this->mapperElement;
-    }
-
-    /**
-     * Evaluate (all) target and source file(s) to
-     * see if the target(s) is/are up-to-date.
-     * @return boolean
-     */
-    public function evaluate() {
-        if (count($this->sourceFileSets) === 0 && $this->_sourceFile === null) {
-            throw new BuildException("At least one srcfile or a nested "
-                                     . "<srcfiles> element must be set.");
-        }
-
-        if (count($this->sourceFileSets) > 0 && $this->_sourceFile !== null) {
-            throw new BuildException("Cannot specify both the srcfile "
-                                     . "attribute and a nested <srcfiles> "
-                                     . "element.");
-        }
-
-        if ($this->_targetFile === null && $this->mapperElement === null) {
-            throw new BuildException("The targetfile attribute or a nested "
-                                     . "mapper element must be set.");
-        }
-
-        // if the target file is not there, then it can't be up-to-date
-        if ($this->_targetFile !== null && !$this->_targetFile->exists()) {
-            return false;
-        } 
-
-        // if the source file isn't there, throw an exception
-        if ($this->_sourceFile !== null && !$this->_sourceFile->exists()) {
-            throw new BuildException($this->_sourceFile->getAbsolutePath() 
-                                     . " not found.");
-        }
-
-        $upToDate = true;
-        for($i=0,$size=count($this->sourceFileSets); $i < $size && $upToDate; $i++) {
-            $fs = $this->sourceFileSets[$i];
-            $ds = $fs->getDirectoryScanner($this->project);
-            $upToDate = $upToDate && $this->scanDir($fs->getDir($this->project),
-                                           $ds->getIncludedFiles());
-        }
-
-        if ($this->_sourceFile !== null) {
-            if ($this->mapperElement === null) {
-                $upToDate = $upToDate &&
-                    ($this->_targetFile->lastModified() >= $this->_sourceFile->lastModified());
-            } else {
-                $sfs = new SourceFileScanner($this);
-                $upToDate = $upToDate &&
-                    count($sfs->restrict($this->_sourceFile->getAbsolutePath(),
-                                  null, null, 
-                                  $this->mapperElement->getImplementation())) === 0;                   
-            }
-        }
-        return $upToDate;
-    }
-
-
-    /**
-     * Sets property to true if target file(s) have a more recent timestamp
-     * than (each of) the corresponding source file(s).
-     * @throws BuildException 
-     */
-    public function main() {
-        if ($this->_property === null) {
-            throw new BuildException("property attribute is required.", 
-                                     $this->location);
-        }
-        $upToDate = $this->evaluate();
-        if ($upToDate) {
-            $this->project->setNewProperty($this->_property, $this->getValue());
-            if ($this->mapperElement === null) {
-                $this->log("File \"" . $this->_targetFile->getAbsolutePath() 
-                    . "\" is up-to-date.", Project::MSG_VERBOSE);
-            } else {
-                $this->log("All target files are up-to-date.",
-                    Project::MSG_VERBOSE);
-            }
-        }
-    }
-
-    protected function scanDir(PhingFile $srcDir, $files) {
-        $sfs = new SourceFileScanner($this);
-        $mapper = null;
-        $dir = $srcDir;
-        if ($this->mapperElement === null) {
-            $mm = new MergeMapper();
-            $mm->setTo($this->_targetFile->getAbsolutePath());
-            $mapper = $mm;
-            $dir = null;
-        } else {
-            $mapper = $this->mapperElement->getImplementation();
-        }
-        return (count($sfs->restrict($files, $srcDir, $dir, $mapper)) === 0);
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/WarnTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/WarnTask.php
deleted file mode 100644
index fcdaf1433..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/WarnTask.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/*
- *  $Id: WarnTask.php 144 2007-02-05 15:19:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-require_once 'phing/tasks/system/EchoTask.php';
-
-/**
- * Simple task to echo a warning message (Project::MSG_WARN) to all output devices.
- *
- * @author   Hans Lellelid <hans@xmpl.org>
- * @version  $Revision: 1.1 $ $Date: 2007-02-06 00:19:00 +0900 (火, 06  2月 2007) $
- * @package  phing.tasks.system
- */
-class WarnTask extends EchoTask {
-    function main() {
-        $this->log($this->msg, Project::MSG_WARN);
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/XsltTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/XsltTask.php
deleted file mode 100644
index 5bae8ce35..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/XsltTask.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/*
- *  $Id: XsltTask.php 144 2007-02-05 15:19:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/tasks/system/CopyTask.php';
-include_once 'phing/system/io/FileReader.php';
-include_once 'phing/system/io/FileWriter.php';
-include_once 'phing/filters/XsltFilter.php';
-
-/**
- * Implements an XSLT processing filter while copying files.
- *
- * This is a shortcut for calling the <copy> task with the XSLTFilter used
- * in the <filterchains> section.
- * 
- * @author    Andreas Aderhold, andi@binarycloud.com
- * @version   $Revision: 1.8 $
- * @package   phing.tasks.system
- */
-class XsltTask extends CopyTask {
-    
-    /** XSLTFilter object that we use to handle transformation. */
-    private $xsltFilter;
-    
-    /** Parameters to pass to XSLT procesor. */
-    private $parameters = array();
-    
-    /**
-     * Setup the filterchains w/ XSLTFilter that we will use while copying the files.
-     */
-    function init() {
-        $xf = new XsltFilter();
-        $chain = $this->createFilterChain($this->getProject());
-        $chain->addXsltFilter($xf);
-        $this->xsltFilter = $xf;        
-    }
-    
-    /**
-     * Set any XSLT Param and invoke CopyTask::main()
-     * @see CopyTask::main()
-     */
-    function main() {        
-        $this->log("Doing XSLT transformation using stylesheet " . $this->xsltFilter->getStyle(), Project::MSG_VERBOSE);
-        $this->xsltFilter->setParams($this->parameters);
-        parent::main();
-    }
-    
-    /**
-     * Set the stylesheet to use.
-     * @param PhingFile $style
-     */
-    function setStyle(PhingFile $style) {
-        $this->xsltFilter->setStyle($style);
-    }
-    
-    /**
-     * Support nested <param> tags useing XSLTParam class.
-     * @return XSLTParam
-     */
-    function createParam() {
-        $num = array_push($this->parameters, new XSLTParam());
-        return $this->parameters[$num-1];
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/AndCondition.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/AndCondition.php
deleted file mode 100644
index 9d9e61ba4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/AndCondition.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/*
- * $Id: AndCondition.php 43 2006-03-10 14:31:51Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/tasks/system/condition/ConditionBase.php';
-
-/**
- *  <and> condition container.
- *
- *  Iterates over all conditions and returns false as soon as one
- *  evaluates to false.
- * 
- *  @author    Hans Lellelid <hans@xmpl.org>
- *  @author    Andreas Aderhold <andi@binarycloud.com>
- *  @copyright � 2001,2002 THYRELL. All rights reserved
- *  @version   $Revision: 1.7 $
- *  @package   phing.tasks.system.condition
- */
-class AndCondition extends ConditionBase implements Condition {
-
-    public function evaluate() {
-        foreach($this as $c) { // ConditionBase implements IteratorAggregator
-              if (!$c->evaluate()) {
-                return false;
-            }
-        }
-        return true;       
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/Condition.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/Condition.php
deleted file mode 100644
index 7b18c517f..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/Condition.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/*
- *  $Id: Condition.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-/**
- * Condition interface specification:
- *
- * Each condition must implement a method applying to this prototye:
- *
- * @author Hans Lellelid <hans@xmpl.org>
- * @version $Revision: 1.4 $
- * @package phing.tasks.system.condition
- */
-interface Condition {
-    /**
-     * @return boolean
-     * @throws BuildException
-     */
-    public function evaluate();
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/ConditionBase.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/ConditionBase.php
deleted file mode 100644
index 3f7498074..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/ConditionBase.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-/*
- *  $Id: ConditionBase.php 43 2006-03-10 14:31:51Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/ProjectComponent.php';
-include_once 'phing/Project.php';
-include_once 'phing/tasks/system/AvailableTask.php';
-include_once 'phing/tasks/system/condition/Condition.php';
-
-/**
- *  Abstract baseclass for the <condition> task as well as several
- *  conditions - ensures that the types of conditions inside the task
- *  and the "container" conditions are in sync.
- * 
- *    @author    Hans Lellelid <hans@xmpl.org>
- *  @author    Andreas Aderhold <andi@binarycloud.com>
- *  @copyright � 2001,2002 THYRELL. All rights reserved
- *  @version   $Revision: 1.16 $
- *  @package   phing.tasks.system.condition
- */
-abstract class ConditionBase extends ProjectComponent implements IteratorAggregate {
-        
-    public $conditions = array(); // needs to be public for "inner" class access
-
-    function countConditions() {
-        return count($this->conditions);
-    }
-    
-    /**
-     * Required for IteratorAggregate
-     */
-    function getIterator() {
-        return new ConditionEnumeration($this);
-    }
-    
-    function getConditions() {
-        return $this->conditions;
-    }
-
-    /**
-     * @return void
-     */
-    function addAvailable(AvailableTask $a) {
-        $this->conditions[] = $a;
-    }
-
-    /**
-     * @return NotCondition
-     */
-    function createNot() {
-        include_once 'phing/tasks/system/condition/NotCondition.php';
-        $num = array_push($this->conditions, new NotCondition());
-        return $this->conditions[$num-1];        
-    }
-
-    /**
-     * @return AndCondition
-     */
-    function createAnd() {
-        include_once 'phing/tasks/system/condition/AndCondition.php';
-        $num = array_push($this->conditions, new AndCondition());
-        return $this->conditions[$num-1];
-    }
-    
-    /**
-     * @return OrCondition
-     */
-    function createOr() {
-        include_once 'phing/tasks/system/condition/OrCondition.php';
-        $num = array_push($this->conditions, new OrCondition());
-        return $this->conditions[$num-1];        
-    }
-
-    /**
-     * @return EqualsCondition
-     */
-    function createEquals() {
-        include_once 'phing/tasks/system/condition/EqualsCondition.php';  
-        $num = array_push($this->conditions, new EqualsCondition());
-        return $this->conditions[$num-1];
-    }
-
-    /**
-     * @return OsCondition
-     */
-    function createOs() {
-        include_once 'phing/tasks/system/condition/OsCondition.php';
-        $num = array_push($this->conditions, new OsCondition());
-        return $this->conditions[$num-1];
-    }
-   
-    /**
-     * @return IsFalseCondition
-     */
-    function createIsFalse() {
-        include_once 'phing/tasks/system/condition/IsFalseCondition.php';
-        $num = array_push($this->conditions, new IsFalseCondition());
-        return $this->conditions[$num-1];
-    }
-   
-    /**
-     * @return IsTrueCondition
-     */
-    function createIsTrue() {
-        include_once 'phing/tasks/system/condition/IsTrueCondition.php';
-        $num = array_push($this->conditions, new IsTrueCondition());
-        return $this->conditions[$num-1];
-    }
-   
-    /**
-     * @return ContainsCondition
-     */
-    function createContains() {
-        include_once 'phing/tasks/system/condition/ContainsCondition.php';
-        $num = array_push($this->conditions, new ContainsCondition());
-        return $this->conditions[$num-1];
-    }
-   
-    /**
-     * @return IsSetCondition
-     */
-    function createIsSet() {
-        include_once 'phing/tasks/system/condition/IsSetCondition.php';
-        $num = array_push($this->conditions, new IsSetCondition());
-        return $this->conditions[$num-1];
-    }
-
-    /**
-     * @return ReferenceExistsCondition
-     */
-    function createReferenceExists() {
-        include_once 'phing/tasks/system/condition/ReferenceExistsCondition.php';
-        $num = array_push($this->conditions, new ReferenceExistsCondition());
-        return $this->conditions[$num-1];
-    }
-
-}
-
-/**
- * "Inner" class for handling enumerations.
- * Uses build-in PHP5 iterator support.
- */
-class ConditionEnumeration implements Iterator {
-    
-    /** Current element number */
-    private $num = 0;
-    
-    /** "Outer" ConditionBase class. */
-    private $outer;
-
-    function __construct(ConditionBase $outer) {
-        $this->outer = $outer;
-    }
-    
-    public function valid() {
-        return $this->outer->countConditions() > $this->num;
-    }
-
-    function current() {
-        $o = $this->outer->conditions[$this->num];
-        if ($o instanceof ProjectComponent) {
-            $o->setProject($this->outer->getProject());
-        }
-        return $o;
-    }
-    
-    function next() {
-        $this->num++;
-    }
-    
-    function key() {
-        return $this->num;
-    }
-    
-    function rewind() {
-        $this->num = 0;
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/ContainsCondition.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/ContainsCondition.php
deleted file mode 100644
index 47979e194..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/ContainsCondition.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/*
- *  $Id: ContainsCondition.php 410 2008-10-21 13:10:52Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-require_once 'phing/tasks/system/condition/Condition.php';
-
-/**
- * Is one string part of another string?
- *
- * @author Hans Lellelid <hans@xmpl.org> (Phing)
- * @author Stefan Bodewig <stefan.bodewig@epost.de> (Ant)
- * @version $Revision: 1.3 $
- * @package phing.tasks.system.condition
- */
-class ContainsCondition implements Condition {
-
-    private $string;
-    private $subString;
-    private $caseSensitive = true;
-
-    /**
-     * The string to search in.
-     * @param string $a1
-     */
-    public function setString($a1) {
-        $this->string = $a1;
-    }
-
-    /**
-     * The string to search for.
-     * @param string $a2
-     */
-    public function setSubstring($a2) {
-        $this->subString = $a2;
-    }
-
-    /**
-     * Whether to search ignoring case or not.
-     */
-    public function setCaseSensitive($b) {
-        $this->caseSensitive = (boolean) $b;
-    }
-
-    /** 
-     * Check whether string contains substring.
-     * @throws BuildException
-     */
-    public function evaluate()  {
-        if ($this->string === null || $this->subString === null) {
-            throw new BuildException("both string and substring are required "
-                                     . "in contains");
-        }
-
-        return $this->caseSensitive 
-            ? strpos($this->string, $this->subString) !== false
-            : strpos(strtolower($this->string), strtolower($this->subString)) !== false;
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/EqualsCondition.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/EqualsCondition.php
deleted file mode 100644
index 82f5db939..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/EqualsCondition.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/*
- *  $Id: EqualsCondition.php 43 2006-03-10 14:31:51Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/tasks/system/condition/Condition.php';
-
-/**
- *  A simple string comparator.  Compares two strings for eqiality in a
- *  binary safe manner. Implements the condition interface specification.
- *
- *  @author    Andreas Aderhold <andi@binarycloud.com>
- *  @copyright � 2001,2002 THYRELL. All rights reserved
- *  @version   $Revision: 1.7 $ $Date: 2006-03-10 23:31:51 +0900 (金, 10  3月 2006) $
- *  @access    public
- *  @package   phing.tasks.system.condition
- */
-class EqualsCondition implements Condition {
-
-    private $arg1;
-    private $arg2;
-    private $trim = false;
-    private $caseSensitive = true;
-    
-    public function setArg1($a1) {
-        $this->arg1 = $a1;
-    }
-
-    public function setArg2($a2) {
-        $this->arg2 = $a2;
-    }
-
-    /**
-     * Should we want to trim the arguments before comparing them?
-     * @param boolean $b
-     */
-    public function setTrim($b) {
-        $this->trim = (boolean) $b;
-    }
-
-    /**
-     * Should the comparison be case sensitive?
-     * @param boolean $b
-     */
-    public function setCaseSensitive($b) {
-        $this->caseSensitive = (boolean) $b;
-    } 
-    
-    public function evaluate() {
-        if ($this->arg1 === null || $this->arg2 === null) {
-            throw new BuildException("Both arg1 and arg2 are required in equals.");
-        }
-        
-        if ($this->trim) {
-            $this->arg1 = trim($this->arg1);
-            $this->arg2 = trim($this->arg2);
-        }
-        
-        //print("[comparison] Comparing '".$this->arg1."' and '".$this->arg2."'\n");
-        return $this->caseSensitive ? $this->arg1 === $this->arg2 : strtolower($this->arg1) === strtolower($this->arg2);
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/IsFalseCondition.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/IsFalseCondition.php
deleted file mode 100644
index ee0a3a78f..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/IsFalseCondition.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/*
- *  $Id: IsFalseCondition.php 43 2006-03-10 14:31:51Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/ProjectComponent.php';
-require_once 'phing/tasks/system/condition/Condition.php';
-
-/**
- * Condition that tests whether a given string evals to false.
- * 
- * @author Hans Lellelid (Phing)
- * @author Steve Loughran (Ant)
- * @version $Revision: 1.4 $
- * @package phing.tasks.system.condition
- */
-class IsFalseCondition extends ProjectComponent implements Condition {
-    
-    /**  
-     * what we eval
-     */ 
-    private $value;
-
-    /**
-     * Set the value to be tested.
-     * @param boolean $value
-     */ 
-    public function setValue($value) {
-        $this->value = $value;
-    }
-
-    /**
-     * return the inverted value;
-     * @throws BuildException if someone forgot to spec a value
-     */ 
-    public function evaluate() {
-        if ($this->value === null) {
-            throw new BuildException("Nothing to test for falsehood");
-        }
-        return !$this->value;
-    }
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/IsSetCondition.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/IsSetCondition.php
deleted file mode 100644
index d31bd1397..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/IsSetCondition.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/*
- *  $Id: IsSetCondition.php 43 2006-03-10 14:31:51Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/ProjectComponent.php';
-require_once 'phing/tasks/system/condition/Condition.php';
-
-/**
- * Condition that tests whether a given property has been set.
- *
- * @author Hans Lellelid <hans@xmpl.org> (Phing)
- * @author Stefan Bodewig <stefan.bodewig@epost.de> (Ant)
- * @version $Revision: 1.4 $
- * @package phing.tasks.system.condition
- */
-class IsSetCondition extends ProjectComponent implements Condition {
-    
-    private $property;
-
-    public function setProperty($p) {
-        $this->property = $p;
-    }
-
-    /**
-     * Check whether property is set.
-     * @throws BuildException
-     */
-    public function evaluate()  {
-        if ($this->property === null) {
-            throw new BuildException("No property specified for isset "
-                                     . "condition");
-        }        
-        return $this->project->getProperty($this->property) !== null;
-    }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/IsTrueCondition.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/IsTrueCondition.php
deleted file mode 100644
index 36e506be6..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/IsTrueCondition.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/*
- *  $Id: IsTrueCondition.php 43 2006-03-10 14:31:51Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/ProjectComponent.php';
-require_once 'phing/tasks/system/condition/Condition.php';
-
-/**
- * Condition that tests whether a given string evals to true.
- *
- * @author Hans Lellelid <hans@xmpl.org> (Phing)
- * @author Steve Loughran (Ant)
- * @package phing.tasks.system.condition
- */
-class IsTrueCondition extends ProjectComponent implements Condition {
-
-    /**  
-     * what we eval
-     */ 
-    private $value;
-
-    /**
-     * Set the value to be tested.
-     * @param boolean $value
-     */ 
-    public function setValue($value) {
-        $this->value = $value;
-    }
-
-    /**
-     * return the inverted value;
-     * @throws BuildException if someone forgot to spec a value
-     */ 
-    public function evaluate() {
-        if ($this->value === null) {
-            throw new BuildException("Nothing to test for falsehood");
-        }
-        return $this->value;
-    }
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/NotCondition.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/NotCondition.php
deleted file mode 100644
index 1bbc78b30..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/NotCondition.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/*
- *  $Id: NotCondition.php 43 2006-03-10 14:31:51Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/tasks/system/condition/ConditionBase.php';
-
-/**
- *  <not> condition.
- *
- *  Evaluates to true if the single condition nested into it is false
- *  and vice versa.
- *
- *  @author    Andreas Aderhold <andi@binarycloud.com>
- *  @copyright � 2001,2002 THYRELL. All rights reserved
- *  @version   $Revision: 1.6 $ $Date: 2006-03-10 23:31:51 +0900 (金, 10  3月 2006) $
- *  @access    public
- *  @package   phing.tasks.system.condition
- */
-class NotCondition extends ConditionBase implements Condition {
-
-    function evaluate() {
-        if ($this->countConditions() > 1) {
-            throw new BuildException("You must not nest more than one condition into <not>");
-        }
-        if ($this->countConditions() < 1) {
-            throw new BuildException("You must nest a condition into <not>");
-        }
-        $conds = $this->getIterator();
-        return !$conds->current()->evaluate();
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/OrCondition.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/OrCondition.php
deleted file mode 100644
index 8afc46650..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/OrCondition.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/*
- *  $Id: OrCondition.php 43 2006-03-10 14:31:51Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/tasks/system/condition/ConditionBase.php';
-
-/**
- *  <or> condition container.
- *
- *  Iterates over all conditions and returns true as soon as one
- *  evaluates to true.
- *
- *  @author    Andreas Aderhold <andi@binarycloud.com>
- *  @copyright  2001,2002 THYRELL. All rights reserved
- *  @version   $Revision: 1.8 $ $Date: 2006-03-10 23:31:51 +0900 (金, 10  3月 2006) $
- *  @access    public
- *  @package   phing.tasks.system.condition
- */
-class OrCondition extends ConditionBase implements Condition {
-
-    function evaluate() {
-        foreach($this as $c) { // ConditionBase implements IteratorAggregator
-              if ($c->evaluate()) {
-                return true;
-            }
-        }
-        return false;
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/OsCondition.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/OsCondition.php
deleted file mode 100644
index f57b1be3b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/OsCondition.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/*
- *  $Id: OsCondition.php 43 2006-03-10 14:31:51Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/tasks/system/condition/ConditionBase.php';
-
-/**
- *  Condition that tests the OS type.
- *
- *  @author    Andreas Aderhold <andi@binarycloud.com>
- *  @copyright � 2001,2002 THYRELL. All rights reserved
- *  @version   $Revision: 1.8 $ $Date: 2006-03-10 23:31:51 +0900 (金, 10  3月 2006) $
- *  @access    public
- *  @package   phing.tasks.system.condition
- */
-class OsCondition implements Condition {
-
-    private $family;
-
-    function setFamily($f) {
-        $this->family = strtolower($f);
-    }
-
-    function evaluate() {
-        $osName = strtolower(Phing::getProperty("os.name"));
-		
-        if ($this->family !== null) {
-            if ($this->family === "windows") {
-                return StringHelper::startsWith("win", $osName);
-            } elseif ($this->family === "mac") {
-                return (strpos($osName, "mac") !== false || strpos($osName, "darwin") !== false);
-            } elseif ($this->family === ("unix")) {
-				return (
-					StringHelper::endsWith("ix", $osName) ||
-					StringHelper::endsWith("ux", $osName) ||
-					StringHelper::endsWith("bsd", $osName) ||
-					StringHelper::startsWith("sunos", $osName) ||
-					StringHelper::startsWith("darwin", $osName)
-				);
-            }
-            throw new BuildException("Don't know how to detect os family '" . $this->family . "'");
-        }
-        return false;
-    }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/ReferenceExistsCondition.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/ReferenceExistsCondition.php
deleted file mode 100644
index 9f55e8165..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/tasks/system/condition/ReferenceExistsCondition.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/*
- *  $Id: ReferenceExistsCondition.php 227 2007-08-28 02:17:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/ProjectComponent.php'; require_once 'phing/tasks/system/condition/Condition.php';
-
-/**
- * Condition that tests whether a given reference exists.
- *
- * @author Matthias Pigulla <mp@webfactory.de> (Phing)
- * @version $Revision: 1.1 $
- * @package phing.tasks.system.condition  */
-class ReferenceExistsCondition extends ProjectComponent implements Condition {
-    
-    private $refid;
-
-    public function setRef($id) {
-      $this->refid = (string) $id;
-    }
-
-    /**
-     * Check whether the reference exists.
-     * @throws BuildException
-     */
-    public function evaluate()  {
-        if ($this->refid === null) {
-            throw new BuildException("No ref attribute specified for reference-exists "
-                                     . "condition");
-        }        
-        $refs = $this->project->getReferences();
-        return isset($refs[$this->refid]);
-    }
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/AbstractFileSet.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/AbstractFileSet.php
deleted file mode 100644
index 4abbd9cc4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/AbstractFileSet.php
+++ /dev/null
@@ -1,570 +0,0 @@
-<?php
-/*
- *  $Id: AbstractFileSet.php 144 2007-02-05 15:19:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-include_once 'phing/system/io/PhingFile.php';
-include_once 'phing/types/DataType.php';
-include_once 'phing/types/PatternSet.php';
-include_once 'phing/types/selectors/BaseSelector.php';
-include_once 'phing/types/selectors/SelectorContainer.php';
-include_once 'phing/types/selectors/BaseSelectorContainer.php';
-
-// Load all of the selectors (not really necessary but
-// helps reveal parse errors right away)
-
-include_once 'phing/types/selectors/AndSelector.php';
-include_once 'phing/types/selectors/ContainsSelector.php';
-include_once 'phing/types/selectors/ContainsRegexpSelector.php';
-include_once 'phing/types/selectors/DateSelector.php';
-include_once 'phing/types/selectors/DependSelector.php';
-include_once 'phing/types/selectors/DepthSelector.php';
-include_once 'phing/types/selectors/ExtendSelector.php';
-include_once 'phing/types/selectors/FilenameSelector.php';
-include_once 'phing/types/selectors/MajoritySelector.php';
-include_once 'phing/types/selectors/NoneSelector.php';
-include_once 'phing/types/selectors/NotSelector.php';
-include_once 'phing/types/selectors/OrSelector.php';
-include_once 'phing/types/selectors/PresentSelector.php';
-include_once 'phing/types/selectors/SizeSelector.php';
-include_once 'phing/types/selectors/TypeSelector.php';
-
-include_once 'phing/util/DirectoryScanner.php';
-
-/**
- * The FileSet class provides methods and properties for accessing
- * and managing filesets. It extends ProjectComponent and thus inherits
- * all methods and properties (not explicitly declared). See ProjectComponent
- * for further detail.
- *
- * TODO:
- *   - merge this with patternsets: FileSet extends PatternSet !!!
- *     requires additional mods to the parsing algo
- *         [HL] .... not sure if that really makes so much sense.  I think
- *            that perhaps they should use common utility class if there really
- *            is that much shared functionality
- *
- * @author    Andreas Aderhold <andi@binarycloud.com>
- * @author    Hans Lellelid <hans@xmpl.org>
- * @version    $Revision: 1.15 $ $Date: 2007-02-06 00:19:00 +0900 (火, 06  2月 2007) $
- * @see        ProjectComponent
- * @package    phing.types
- */
-class AbstractFileSet extends DataType implements SelectorContainer {
-    
-    // These vars are public for cloning purposes
-    
-    /**
-     * @var boolean
-     */
-    public $useDefaultExcludes = true;
-    
-    /**
-     * @var PatternSet
-     */
-    public $defaultPatterns;
-    
-    public $additionalPatterns = array();
-    public $dir;
-    public $isCaseSensitive = true;    
-    public $selectors = array();
-    
-    function __construct($fileset = null) {
-        if ($fileset !== null && ($fileset instanceof FileSet)) {
-            $this->dir = $fileset->dir;
-            $this->defaultPatterns = $fileset->defaultPatterns;
-            $this->additionalPatterns = $fileset->additionalPatterns;
-            $this->useDefaultExcludes = $fileset->useDefaultExcludes;
-            $this->isCaseSensitive = $fileset->isCaseSensitive;
-            $this->selectors = $fileset->selectors;
-        }
-        $this->defaultPatterns = new PatternSet();
-    }
-
-
-    /**
-    * Makes this instance in effect a reference to another PatternSet
-    * instance.
-    * You must not set another attribute or nest elements inside
-    * this element if you make it a reference.
-    */
-    function setRefid(Reference $r) {
-        if ((isset($this->dir) && !is_null($this->dir)) || $this->defaultPatterns->hasPatterns()) {
-            throw $this->tooManyAttributes();
-        }
-        if (!empty($this->additionalPatterns)) {
-            throw $this->noChildrenAllowed();
-        }
-        if (!empty($this->selectors)) {
-            throw $this->noChildrenAllowed();
-        }
-        parent::setRefid($r);
-    }
-
-
-    function setDir($dir) {
-        if ($this->isReference()) {
-            throw $this->tooManyAttributes();
-        }
-        if ($dir instanceof PhingFile) {
-            $dir = $dir->getPath();
-        }
-        $this->dir = new PhingFile((string) $dir);
-    }
-
-
-    function getDir(Project $p) {
-        if ($this->isReference()) {
-            return $this->getRef($p)->getDir($p);
-        }
-        return $this->dir;
-    }
-
-
-    function createPatternSet() {
-        if ($this->isReference()) {
-            throw $this->noChildrenAllowed();
-        }
-        $num = array_push($this->additionalPatterns, new PatternSet());
-        return $this->additionalPatterns[$num-1];
-    }
-
-    /**
-    * add a name entry on the include list
-    */
-    function createInclude() {
-        if ($this->isReference()) {
-            throw $this->noChildrenAllowed();
-        }
-        return $this->defaultPatterns->createInclude();
-    }
-
-    /**
-     * add a name entry on the include files list
-     */
-    function createIncludesFile() {
-        if ($this->isReference()) {
-            throw $this->noChildrenAllowed();
-        }
-        return $this->defaultPatterns->createIncludesFile();
-    }
-
-    /**
-     * add a name entry on the exclude list
-     */
-    function createExclude() {
-        if ($this->isReference()) {
-            throw $this->noChildrenAllowed();
-        }
-        return $this->defaultPatterns->createExclude();
-    }
-
-    /**
-     * add a name entry on the include files list
-     */
-    function createExcludesFile() {
-        if ($this->isReference()) {
-            throw $this->noChildrenAllowed();
-            return;
-        }
-        return $this->defaultPatterns->createExcludesFile();
-    }
-
-    /**
-     * Sets the set of include patterns. Patterns may be separated by a comma
-     * or a space.
-     */
-    function setIncludes($includes) {
-        if ($this->isReference()) {
-            throw $this->tooManyAttributes();
-        }
-        $this->defaultPatterns->setIncludes($includes);
-    }
-
-    /**
-     * Sets the set of exclude patterns. Patterns may be separated by a comma
-     * or a space.
-     */
-    function setExcludes($excludes) {
-        if ($this->isReference()) {
-            throw $this->tooManyAttributes();
-        }
-        $this->defaultPatterns->setExcludes($excludes);
-    }
-
-    /**
-     * Sets the name of the file containing the includes patterns.
-     *
-     * @param $incl The file to fetch the include patterns from.
-     * @throws BE
-     */
-    function setIncludesfile($incl) {
-        if ($this->isReference()) {
-            throw $this->tooManyAttributes();
-        }
-        $this->defaultPatterns->setIncludesfile($incl);
-    }
-
-    /**
-     * Sets the name of the file containing the includes patterns.
-     *
-     * @param $excl The file to fetch the exclude patterns from.
-     * @throws BE
-     */
-    function setExcludesfile($excl) {
-        if ($this->isReference()) {
-            throw $this->tooManyAttributes();
-        }
-        $this->defaultPatterns->setExcludesfile($excl);
-    }
-
-    /**
-     * Sets whether default exclusions should be used or not.
-     *
-     * @param $useDefaultExcludes "true"|"on"|"yes" when default exclusions
-     *                           should be used, "false"|"off"|"no" when they
-     *                           shouldn't be used.
-     */
-    function setDefaultexcludes($useDefaultExcludes) {
-        if ($this->isReference()) {
-            throw $this->tooManyAttributes();
-        }
-        $this->useDefaultExcludes = $useDefaultExcludes;
-    }
-
-    /**
-     * Sets case sensitivity of the file system
-     */
-    function setCaseSensitive($isCaseSensitive) {
-        $this->isCaseSensitive = $isCaseSensitive;
-    }
-
-    /** returns a reference to the dirscanner object belonging to this fileset */
-    function getDirectoryScanner(Project $p) {
-        if ($this->isReference()) {
-            $o = $this->getRef($p);
-            return $o->getDirectoryScanner($p);
-        }
-
-        if ($this->dir === null) {
-            throw new BuildException("No directory specified for fileset.");
-        }
-        if (!$this->dir->exists()) {
-            throw new BuildException("Directory ".$this->dir->getAbsolutePath()." not found.");
-        }
-        if (!$this->dir->isDirectory()) {
-            throw new BuildException($this->dir->getAbsolutePath()." is not a directory.");
-        }
-        $ds = new DirectoryScanner();
-        $this->setupDirectoryScanner($ds, $p);
-        $ds->scan();
-        return $ds;
-    }
-
-    /** feed dirscanner with infos defined by this fileset */
-    protected function setupDirectoryScanner(DirectoryScanner $ds, Project $p) {
-        if ($ds === null) {
-            throw new Exception("DirectoryScanner cannot be null");
-        }
-        // FIXME - pass dir directly wehn dirscanner supports File
-        $ds->setBasedir($this->dir->getPath());
-        
-        foreach($this->additionalPatterns as $addPattern) {
-            $this->defaultPatterns->append($addPattern, $p);
-        }              
-
-        $ds->setIncludes($this->defaultPatterns->getIncludePatterns($p));
-        $ds->setExcludes($this->defaultPatterns->getExcludePatterns($p));
-
-        $p->log("FileSet: Setup file scanner in dir " . $this->dir->__toString() . " with " . $this->defaultPatterns->toString(), Project::MSG_DEBUG);
-        
-        if ($ds instanceof SelectorScanner) {
-            $ds->setSelectors($this->getSelectors($p));
-        }
-        
-        if ($this->useDefaultExcludes) {
-            $ds->addDefaultExcludes();
-        }
-        $ds->setCaseSensitive($this->isCaseSensitive);
-    }
-
-
-    /**
-     * Performs the check for circular references and returns the
-     * referenced FileSet.
-     */
-    function getRef(Project $p) {
-        if (!$this->checked) {
-            $stk = array();
-            array_push($stk, $this);
-            $this->dieOnCircularReference($stk, $p);            
-        }
-
-        $o = $this->ref->getReferencedObject($p);
-        if (!($o instanceof FileSet)) {
-            $msg = $this->ref->getRefId()." doesn't denote a fileset";
-            throw new BuildException($msg);
-        } else {
-            return $o;
-        }
-    }
-    
-    // SelectorContainer methods
-
-    /**
-     * Indicates whether there are any selectors here.
-     *
-     * @return boolean Whether any selectors are in this container
-     */
-    public function hasSelectors() {
-        if ($this->isReference() && $this->getProject() !== null) {
-            return $this->getRef($this->getProject())->hasSelectors();
-        }
-        return !empty($this->selectors);
-    }
-
-    /**
-     * Indicates whether there are any patterns here.
-     *
-     * @return boolean Whether any patterns are in this container.
-     */
-    public function hasPatterns() {
-    
-        if ($this->isReference() && $this->getProject() !== null) {
-            return $this->getRef($this->getProject())->hasPatterns();            
-        }
-
-        if ($this->defaultPatterns->hasPatterns($this->getProject())) {
-            return true;
-        }
-
-        for($i=0,$size=count($this->additionalPatterns); $i < $size; $i++) {
-            $ps = $this->additionalPatterns[$i];
-            if ($ps->hasPatterns($this->getProject())) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-    
-    /**
-     * Gives the count of the number of selectors in this container
-     *
-     * @return int The number of selectors in this container
-     */
-    public function selectorCount() {
-        if ($this->isReference() && $this->getProject() !== null) {
-            try {
-                return $this->getRef($this->getProject())->selectorCount();
-            } catch (Exception $e) {
-                throw $e;
-            }
-        }
-        return count($this->selectors);
-    }
-
-    /**
-     * Returns the set of selectors as an array.
-     *
-     * @return an array of selectors in this container
-     */
-    public function getSelectors(Project $p) {
-        if ($this->isReference()) {
-            return $this->getRef($p)->getSelectors($p);            
-        } else {
-            // *copy* selectors
-            $result = array();
-            for($i=0,$size=count($this->selectors); $i < $size; $i++) {
-                $result[] = clone $this->selectors[$i];
-            }
-            return $result;
-        }
-    }
-
-    /**
-     * Returns an array for accessing the set of selectors.
-     *
-     * @return array The array of selectors
-     */
-    public function selectorElements() {
-        if ($this->isReference() && $this->getProject() !== null) {
-            return $this->getRef($this->getProject())->selectorElements();            
-        }
-        return $this->selectors;
-    }
-
-    /**
-     * Add a new selector into this container.
-     *
-     * @param selector the new selector to add
-     */
-    public function appendSelector(FileSelector $selector) {
-        if ($this->isReference()) {
-            throw $this->noChildrenAllowed();
-        }
-        $this->selectors[] = $selector;
-    }    
-
-    /* Methods below all add specific selectors */
-
-    /**
-     * add a "Select" selector entry on the selector list
-     */
-    public function createSelector() {
-        $o = new SelectSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add an "And" selector entry on the selector list
-     */
-    public function createAnd() {
-        $o = new AndSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add an "Or" selector entry on the selector list
-     */
-    public function createOr() {
-        $o = new OrSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add a "Not" selector entry on the selector list
-     */
-    public function createNot() {
-        $o = new NotSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add a "None" selector entry on the selector list
-     */
-    public function createNone() {
-        $o = new NoneSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add a majority selector entry on the selector list
-     */
-    public function createMajority() {
-        $o = new MajoritySelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add a selector date entry on the selector list
-     */
-    public function createDate() {
-        $o = new DateSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add a selector size entry on the selector list
-     */
-    public function createSize() {
-        $o = new SizeSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add a selector filename entry on the selector list
-     */
-    public function createFilename() {
-        $o = new FilenameSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add an extended selector entry on the selector list
-     */
-    public function createCustom() {
-        $o = new ExtendSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add a contains selector entry on the selector list
-     */
-    public function createContains() {
-        $o = new ContainsSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add a contains selector entry on the selector list
-     */
-    public function createContainsRegexp() {
-        $o = new ContainsRegexpSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add a present selector entry on the selector list
-     */
-    public function createPresent() {
-        $o = new PresentSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add a depth selector entry on the selector list
-     */
-    public function createDepth() {
-        $o = new DepthSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add a depends selector entry on the selector list
-     */
-    public function createDepend() {        
-        $o = new DependSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-    
-    /**
-     * add a type selector entry on the selector list
-     */
-    public function createType() {
-        $o = new TypeSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Commandline.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Commandline.php
deleted file mode 100644
index ff2898c16..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Commandline.php
+++ /dev/null
@@ -1,467 +0,0 @@
-<?php
-/*
- *  $Id: Commandline.php 227 2007-08-28 02:17:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-
-/**
- * Commandline objects help handling command lines specifying processes to
- * execute.
- *
- * The class can be used to define a command line as nested elements or as a
- * helper to define a command line by an application.
- * <p>
- * <code>
- * &lt;someelement&gt;<br>
- * &nbsp;&nbsp;&lt;acommandline executable="/executable/to/run"&gt;<br>
- * &nbsp;&nbsp;&nbsp;&nbsp;&lt;argument value="argument 1" /&gt;<br>
- * &nbsp;&nbsp;&nbsp;&nbsp;&lt;argument line="argument_1 argument_2 argument_3" /&gt;<br>
- * &nbsp;&nbsp;&nbsp;&nbsp;&lt;argument value="argument 4" /&gt;<br>
- * &nbsp;&nbsp;&lt;/acommandline&gt;<br>
- * &lt;/someelement&gt;<br>
- * </code>
- * The element <code>someelement</code> must provide a method
- * <code>createAcommandline</code> which returns an instance of this class.
- *
- * @author thomas.haas@softwired-inc.com
- * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
- */
-class Commandline {
-
-    /**
-     * @var array CommandlineArguments[]
-     */
-    public $arguments = array(); // public so "inner" class can access
-    
-    /**
-     * Full path (if not on %PATH% env var) to executable program.
-     * @var string
-     */
-    public $executable; // public so "inner" class can access
-
-    const DISCLAIMER = "The ' characters around the executable and arguments are not part of the command.";
-
-    public function __construct($to_process = null) {
-        if ($to_process !== null) {                 
-            $tmp = $this->translateCommandline($to_process);
-            if ($tmp) {
-                $this->setExecutable(array_shift($tmp)); // removes first el
-                foreach($tmp as $arg) { // iterate through remaining elements
-                    $this->createArgument()->setValue($arg);
-                }
-            }
-        }    
-    }
-
-
-    /**
-     * Creates an argument object and adds it to our list of args.
-     *
-     * <p>Each commandline object has at most one instance of the
-     * argument class.</p>
-     *
-     * @param boolean $insertAtStart if true, the argument is inserted at the
-     * beginning of the list of args, otherwise it is appended.
-     * @return CommandlineArgument
-     */
-    public function createArgument($insertAtStart = false) {
-        $argument = new CommandlineArgument($this);
-        if ($insertAtStart) {
-            array_unshift($this->arguments, $argument);
-        } else {
-            array_push($this->arguments, $argument);
-        }
-        return $argument;
-    }
-
-    /**
-     * Sets the executable to run.
-     */
-    public function setExecutable($executable) {
-        if (!$executable) {
-            return;
-        }
-        $this->executable = $executable;
-        $this->executable = strtr($this->executable, '/', DIRECTORY_SEPARATOR);
-        $this->executable = strtr($this->executable, '\\', DIRECTORY_SEPARATOR);
-    }
-
-    public function getExecutable() {
-        return $this->executable;
-    }
-
-    public function addArguments($line) {
-        foreach($line as $arg) {
-            $this->createArgument()->setValue($arg);
-        }
-    }
-
-    /**
-     * Returns the executable and all defined arguments.
-     * @return array
-     */
-    public function getCommandline() {
-        $args = $this->getArguments();
-        if ($this->executable === null) {
-            return $args;
-        }
-        return array_merge(array($this->executable), $args);
-    }
-
-
-    /**
-     * Returns all arguments defined by <code>addLine</code>,
-     * <code>addValue</code> or the argument object.
-     */
-    public function getArguments() {
-        $result = array();
-        foreach($this->arguments as $arg) {
-            $parts = $arg->getParts();
-            if ($parts !== null) {                           
-                foreach($parts as $part) {
-                    $result[] = $part;
-                }
-            }
-        }
-        return $result;
-    }
-
-    public function __toString() {
-        return self::toString($this->getCommandline());
-    }
-
-    /**
-     * Put quotes around the given String if necessary.
-     *
-     * <p>If the argument doesn't include spaces or quotes, return it
-     * as is. If it contains double quotes, use single quotes - else
-     * surround the argument by double quotes.</p>
-     *
-     * @exception BuildException if the argument contains both, single
-     *                           and double quotes.
-     */
-    public static function quoteArgument($argument) {
-        if (strpos($argument, "\"") !== false) {
-            if (strpos($argument, "'") !== false) {
-                throw new BuildException("Can't handle single and double quotes in same argument");
-            } else {
-                return escapeshellarg($argument);
-            }
-        } elseif (strpos($argument, "'") !== false || strpos($argument, " ") !== false) {
-            return escapeshellarg($argument);
-            //return '\"' . $argument . '\"';
-        } else {
-            return $argument;
-        }
-    }
-        
-    /**
-     * Quotes the parts of the given array in way that makes them
-     * usable as command line arguments.
-     */
-    public static function toString($lines) {
-        // empty path return empty string
-        if (!$lines) {
-            return "";
-        }
-
-        // path containing one or more elements
-        $result = "";
-        for ($i = 0, $len=count($lines); $i < $len; $i++) {
-            if ($i > 0) {
-                $result .= ' ';
-            }
-            $result .= self::quoteArgument($lines[$i]);
-        }
-        return $result;
-    }
-    
-    /**
-     *
-     * @param string $to_process
-     * @return array
-     */
-    public static function translateCommandline($to_process) {
-        
-        if (!$to_process) {
-            return array();
-        }
-            
-        // parse with a simple finite state machine
-
-        $normal = 0;
-        $inQuote = 1;
-        $inDoubleQuote = 2;
-        
-        $state = $normal;
-        $args = array();
-        $current = "";
-        $lastTokenHasBeenQuoted = false;
-        
-        $tok = strtok($to_process, "");
-        $tokens = preg_split('/(["\' ])/', $to_process, -1, PREG_SPLIT_DELIM_CAPTURE);
-        while(($nextTok = array_shift($tokens)) !== null) {
-            switch ($state) {
-            case $inQuote:
-                if ("'" == $nextTok) {
-                    $lastTokenHasBeenQuoted = true;
-                    $state = $normal;
-                } else {
-                    $current .= $nextTok;
-                }
-                break;
-            case $inDoubleQuote:
-                if ("\"" == $nextTok) {
-                    $lastTokenHasBeenQuoted = true;
-                    $state = $normal;
-                } else {
-                    $current .= $nextTok;
-                }
-                break;
-            default:
-                if ("'" == $nextTok) {
-                    $state = $inQuote;
-                } elseif ("\"" == $nextTok) {
-                    $state = $inDoubleQuote;
-                } elseif (" " == $nextTok) {
-                    if ($lastTokenHasBeenQuoted || strlen($current) != 0) {
-                        $args[] = $current;
-                        $current = "";
-                    }
-                } else {
-                    $current .= $nextTok;
-                }
-                $lastTokenHasBeenQuoted = false;
-                break;
-            }
-        }
-
-        if ($lastTokenHasBeenQuoted || strlen($current) != 0) {
-            $args[] = $current;
-        }
-
-        if ($state == $inQuote || $state == $inDoubleQuote) {
-            throw new BuildException("unbalanced quotes in " . $to_process);
-        }
-
-        return $args;
-    }
-
-    /**
-     * @return int Number of components in current commandline.
-     */
-    public function size() {
-        return count($this->getCommandline());
-    }
-
-    public function __copy() {
-        $c = new Commandline();
-        $c->setExecutable($this->executable);
-        $c->addArguments($this->getArguments());
-        return $c;
-    }
-
-    /**
-     * Clear out the whole command line.  */
-    public function clear() {
-        $this->executable = null;
-        $this->arguments->removeAllElements();
-    }
-
-    /**
-     * Clear out the arguments but leave the executable in place for
-     * another operation.
-     */
-    public function clearArgs() {
-        $this->arguments = array();
-    }
-
-    /**
-     * Return a marker.
-     *
-     * <p>This marker can be used to locate a position on the
-     * commandline - to insert something for example - when all
-     * parameters have been set.</p>
-     * @return CommandlineMarker
-     */
-    public function createMarker() {
-        return new CommandlineMarker($this, count($this->arguments));
-    }
-
-    /**
-     * Returns a String that describes the command and arguments
-     * suitable for verbose output before a call to
-     * <code>Runtime.exec(String[])<code>.
-     *
-     * <p>This method assumes that the first entry in the array is the
-     * executable to run.</p>
-     * @param array $args CommandlineArgument[] to use
-     * @return string
-     */
-    public function describeCommand($args = null) {
-       
-        if ($args === null) {
-            $args = $this->getCommandline();
-        }
-           
-        if (!$args) {
-            return "";
-        }
-        
-        $buf = "Executing '";
-        $buf .= $args[0];
-        $buf .= "'";
-        if (count($args) > 0) {
-            $buf .= " with ";
-            $buf .= $this->describeArguments($args, 1);
-        } else {
-            $buf .= self::DISCLAIMER;
-        }
-        return $buf;
-    }
-
-    /**
-     * Returns a String that describes the arguments suitable for
-     * verbose output before a call to
-     * <code>Runtime.exec(String[])<code>
-     * @param $args arguments to use (default is to use current class args)
-     * @param $offset ignore entries before this index
-     * @return string
-     */
-    protected function describeArguments($args = null, $offset = 0) {
-        if ($args === null) {
-            $args = $this->getArguments();
-        }                
-        
-        if ($args === null || count($args) <= $offset) {
-            return "";
-        }
-        
-        $buf = "argument";
-        if (count($args) > $offset) {
-            $buf .= "s";
-        }
-        $buf .= ":" . PHP_EOL;
-        for ($i = $offset, $alen=count($args); $i < $alen; $i++) {
-            $buf .= "'" . $args[$i] . "'" . PHP_EOL;
-        }
-        $buf .= self::DISCLAIMER;
-        return $buf;
-    }
-}
-
-
-/**
- * "Inner" class used for nested xml command line definitions.
- */
-class CommandlineArgument {
-
-    private $parts = array();
-    private $outer;
-    
-    public function __construct(Commandline $outer) {
-        $this->outer = $outer;
-    }
-    
-    /**
-     * Sets a single commandline argument.
-     *
-     * @param string $value a single commandline argument.
-     */
-    public function setValue($value) {
-        $this->parts = array($value);
-    }
-
-    /**
-     * Line to split into several commandline arguments.
-     *
-     * @param line line to split into several commandline arguments
-     */
-    public function setLine($line) {
-        if ($line === null) {
-            return;
-        }
-        $this->parts = $this->outer->translateCommandline($line);
-    }
-
-    /**
-     * Sets a single commandline argument and treats it like a
-     * PATH - ensures the right separator for the local platform
-     * is used.
-     *
-     * @param value a single commandline argument.
-     */
-    public function setPath($value) {
-        $this->parts = array( (string) $value );
-    }
-
-    /**
-     * Sets a single commandline argument to the absolute filename
-     * of the given file.
-     *
-     * @param value a single commandline argument.
-     */
-    public function setFile(PhingFile $value) {
-        $this->parts = array($value->getAbsolutePath());
-    }
-
-    /**
-     * Returns the parts this Argument consists of.
-     * @return array string[]
-     */
-    public function getParts() {
-        return $this->parts;
-    }
-}
-
-/**
- * Class to keep track of the position of an Argument.
- */
-// <p>This class is there to support the srcfile and targetfile
-// elements of &lt;execon&gt; and &lt;transform&gt; - don't know
-// whether there might be additional use cases.</p> --SB
-class CommandlineMarker {
-
-    private $position;
-    private $realPos = -1;
-    private $outer;
-    
-    public function __construct(Comandline $outer, $position) {
-        $this->outer = $outer;
-        $this->position = $position;
-    }
-
-    /**
-     * Return the number of arguments that preceeded this marker.
-     *
-     * <p>The name of the executable - if set - is counted as the
-     * very first argument.</p>
-     */
-    public function getPosition() {
-        if ($this->realPos == -1) {
-            $realPos = ($this->outer->executable === null ? 0 : 1);
-            for ($i = 0; $i < $position; $i++) {
-                $arg = $this->arguments[$i];
-                $realPos += count($arg->getParts());
-            }
-        }
-        return $this->realPos;
-    }
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/DataType.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/DataType.php
deleted file mode 100644
index f4e26436e..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/DataType.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-/*
- *  $Id: DataType.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-require_once 'phing/ProjectComponent.php';
-include_once 'phing/BuildException.php';
-
-/**
- * Base class for those classes that can appear inside the build file
- * as stand alone data types.
- *
- * This class handles the common description attribute and provides
- * a default implementation for reference handling and checking for
- * circular references that is appropriate for types that can not be
- * nested inside elements of the same type (i.e. patternset but not path)
- *
- * @package   phing.types
- */
-class DataType extends ProjectComponent {
-
-    /** The descriptin the user has set. */
-    public $description = null;
-
-    /** Value to the refid attribute. Type of Reference*/
-    public $ref = null;
-
-    /**
-     * Are we sure we don't hold circular references?
-     *
-     * Subclasses are responsible for setting this value to false
-     * if we'd need to investigate this condition (usually because a
-     * child element has been added that is a subclass of DataType).
-     * @var boolean
-     */
-    protected $checked = true;
-  
-    /**
-     * Sets a description of the current data type. It will be useful
-     * in commenting what we are doing.
-     */
-    function setDescription($desc) {
-        $this->description = (string) $desc;
-    }
-
-    /** Return the description for the current data type. */
-    function getDescription() {
-        return $this->description;
-    }
-
-    /** Has the refid attribute of this element been set? */
-    function isReference() {
-        return ($this->ref !== null);
-    }
-
-    /**
-     * Set the value of the refid attribute.
-     *
-     * Subclasses may need to check whether any other attributes
-     * have been set as well or child elements have been created and
-     * thus override this method. if they do they must call parent::setRefid()
-	 * 
-	 * @param Reference $r
-	 * @return void
-     */
-    function setRefid(Reference $r) {
-        $this->ref = $r;
-        $this->checked = false;
-    }
-
-    /**
-     * Check to see whether any DataType we hold references to is
-     * included in the Stack (which holds all DataType instances that
-     * directly or indirectly reference this instance, including this
-     * instance itself).
-     *
-     * If one is included, throw a BuildException created by circularReference
-     *
-     * This implementation is appropriate only for a DataType that
-     * cannot hold other DataTypes as children.
-     *
-     * The general contract of this method is that it shouldn't do
-     * anything if checked is true and set it to true on exit.
-     */
-    function dieOnCircularReference(&$stk, Project $p) {
-        if ($this->checked || !$this->isReference()) {
-            return;
-        }
-
-        $o = $this->ref->getReferencedObject($p);
-
-        if ($o instanceof DataType) {
-            
-            // TESTME - make sure that in_array() works just as well here
-            //
-            // check if reference is in stack
-            //$contains = false;
-            //for ($i=0, $size=count($stk); $i < $size; $i++) {
-            //    if ($stk[$i] === $o) {
-            //        $contains = true;
-            //        break;
-            //    }
-            //}
-
-            if (in_array($o, $stk, true)) {
-                // throw build exception
-                throw $this->circularReference();
-            } else {
-                array_push($stk, $o);
-                $o->dieOnCircularReference($stk, $p);
-                array_pop($stk);
-            }
-        }
-        $this->checked = true;
-    }
-
-    /** Performs the check for circular references and returns the referenced object. */
-    function getCheckedRef($requiredClass, $dataTypeName) {
-    
-        if (!$this->checked) {
-            // should be in stack
-            $stk = array();
-            $stk[] = $this;
-            $this->dieOnCircularReference($stk, $this->getProject());            
-        }
-
-        $o = $this->ref->getReferencedObject($this->getProject());
-        if (!($o instanceof $requiredClass) ) {
-            throw new BuildException($this->ref->getRefId()." doesn't denote a " . $dataTypeName);
-        } else {
-            return $o;
-        }
-    }
-
-    /**
-     * Creates an exception that indicates that refid has to be the
-     * only attribute if it is set.
-     */
-    function tooManyAttributes() {
-        return new BuildException( "You must not specify more than one attribute when using refid" );
-    }
-
-    /**
-     * Creates an exception that indicates that this XML element must
-     * not have child elements if the refid attribute is set.
-     */
-    function noChildrenAllowed() {
-        return new BuildException("You must not specify nested elements when using refid");
-    }
-
-    /**
-     * Creates an exception that indicates the user has generated a
-     * loop of data types referencing each other.
-     */
-    function circularReference() {
-        return new BuildException("This data type contains a circular reference.");
-    }
-    
-    /**
-     * Template method being called when the data type has been 
-     * parsed completely.
-     * @return void
-     */
-    function parsingComplete() {}
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Description.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Description.php
deleted file mode 100644
index de6088546..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Description.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/*
- *  $Id: Description.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-/**
- * Description is used to provide a project-wide description element
- * (that is, a description that applies to a buildfile as a whole).
- * If present, the &lt;description&gt; element is printed out before the
- * target descriptions.
- * 
- * Description has no attributes, only text.  There can only be one
- * project description per project.  A second description element will
- * overwrite the first.
- *
- * @author Hans Lellelid <hans@xmpl.org> (Phing)
- * @author Craeg Strong <cstrong@arielpartners.com> (Ant)
- * @package phing.types
- */
-class Description extends DataType {
-
-    /**
-     * Adds descriptive text to the project.
-     *
-     * @return void
-     */
-    public function addText($text) {
-        $currentDescription = $this->project->getDescription();
-        if ($currentDescription === null) {
-            $this->project->setDescription($text);
-        } else {
-            $this->project->setDescription($currentDescription . $text);
-        }
-    }
-    
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/DirSet.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/DirSet.php
deleted file mode 100644
index 097349cf3..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/DirSet.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/*
- * $Id: DirSet.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-include_once 'phing/types/AbstractFileSet.php';
-
-/**
- * Subclass as hint for supporting tasks that the included directories
- * instead of files should be used.
- *
- * @package phing.types
- */
-class DirSet extends AbstractFileSet {
-    
-    public function __construct($dirset = null) {
-        parent::__construct($dirset);
-    }    
-
-    /**
-     * Return a DirSet that has the same basedir and same patternsets
-     * as this one.
-     */
-    public function __clone() {
-        if ($this->isReference()) {
-            return new DirSet($this->getRef($this->getProject()));
-        } else {
-            return new DirSet($this);
-        }
-    }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/FileList.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/FileList.php
deleted file mode 100644
index 0fa3bda68..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/FileList.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php
-/*
- *  $Id: FileList.php 209 2007-08-01 22:42:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-require_once 'phing/types/DataType.php';
-include_once 'phing/system/io/PhingFile.php';
-
-/**
- * FileList represents an explicitly named list of files. FileLists
- * are useful when you want to capture a list of files regardless of
- * whether they currently exist.
- *
- * <filelist 
- *    id="docfiles" 
- *   dir="${phing.docs.dir}"
- *   files="chapters/Installation.html,chapters/Setup.html"/> 
- *
- * OR 
- * 
- * <filelist
- *         dir="${doc.src.dir}"
- *         listfile="${phing.docs.dir}/PhingGuide.book"/>
- * 
- * (or a mixture of files="" and listfile="" can be used)
- * 
- * @author Hans Lellelid <hans@xmpl.org>
- * @version $Revision: 1.10 $
- * @package phing.types
- */
-class FileList extends DataType {
-        
-    // public for "cloning" purposes
-    
-    /** Array containing all filenames. */
-    public $filenames = array();
-    
-    /** Base directory for this file list. */
-    public $dir;
-    
-    /** PhingFile that contains a list of files (one per line). */
-    public $listfile;
-    
-    /**
-     * Construct a new FileList.
-     * @param array $filelist;
-     */
-    function __construct($filelist = null) {
-        if ($filelist !== null) {
-            $this->dir       = $filelist->dir;
-            $this->filenames = $filelist->filenames;
-            $this->listfile = $filelist->listfile;
-        }
-    }
-
-    /**
-     * Makes this instance in effect a reference to another FileList
-     * instance.
-     */
-    function setRefid(Reference $r) {
-        if ($this->dir !== null || count($this->filenames) !== 0) {
-            throw $this->tooManyAttributes();
-        }
-        parent::setRefid($r);
-    }
-
-    /**
-     * Base directory for files in list.
-     * @param PhingFile $dir
-     */
-    function setDir(PhingFile $dir) {
-        if ($this->isReference()) {
-            throw $this->tooManyAttributes();
-        }
-        if (!($dir instanceof PhingFile)) {
-            $dir = new PhingFile($dir);
-        }
-        $this->dir = $dir;
-    }
-    
-    /**
-     * Get the basedir for files in list.
-     * @return PhingFile
-     */
-    function getDir(Project $p) {
-        if ($this->isReference()) {
-            $ref = $this->getRef($p);
-            return $ref->getDir($p);
-        }
-        return $this->dir;
-    }
-    
-    /**
-     * Set the array of files in list.
-     * @param array $filenames
-     */
-    function setFiles($filenames) {
-        if ($this->isReference()) {
-            throw $this->tooManyAttributes();
-        }
-        if (!empty($filenames)) {
-            $tok = strtok($filenames, ", \t\n\r");            
-            while ($tok !== false) {
-                $fname = trim($tok);
-                if ($fname !== "") {
-                    $this->filenames[] = $tok;
-                }
-                $tok = strtok(", \t\n\r");
-            }
-        }
-    }
-    
-    /**
-     * Sets a source "list" file that contains filenames to add -- one per line.
-     * @param string $file
-     */
-    function setListFile($file) {
-        if ($this->isReference()) {
-            throw $this->tooManyAttributes();
-        }
-        if (!($file instanceof PhingFile)) {
-            $file = new PhingFile($file);
-        }
-        $this->listfile = $file;
-    }
-    
-    /**
-     * Get the source "list" file that contains file names.
-     * @param Project $p
-     * @return PhingFile
-     */
-    function getListFile(Project $p) {
-        if ($this->isReference()) {
-            $ref = $this->getRef($p);
-            return $ref->getListFile($p);
-        }
-        return $this->listfile;
-    }
-
-    /**
-     * Returns the list of files represented by this FileList.
-     * @param Project $p
-     * @return array
-     */
-    function getFiles(Project $p) {
-    
-        if ($this->isReference()) {
-            $ret = $this->getRef($p);
-            $ret = $ret->getFiles($p);
-            return $ret;
-        }
-        
-        if ($this->listfile !== null) {
-            $this->readListFile($p);
-        }
-        
-        return $this->filenames;
-    }
-
-
-    /**
-      * Performs the check for circular references and returns the
-      * referenced FileSet.
-      * @param Project $p
-      */
-    function getRef(Project $p) {
-        if (!$this->checked) {
-            $stk = array();
-            array_push($stk, $this);
-            $this->dieOnCircularReference($stk, $p);            
-        }
-
-        $o = $this->ref->getReferencedObject($p);
-        if (!($o instanceof FileList)) {
-            throw new BuildException($this->ref->getRefId()." doesn't denote a filelist");
-        } else {
-            return $o;
-        }
-    }
-
-    /**
-     * Reads file names from a file and adds them to the files array.
-     * @param Project $p
-     */
-    private function readListFile(Project $p) {
-        $listReader = null;
-        try {
-            // Get a FileReader
-            $listReader = new BufferedReader(new FileReader($this->listfile)); 
-        
-            $line = $listReader->readLine();
-            while ($line !== null) {
-                if (!empty($line)) {
-                    $line = $p->replaceProperties($line);
-                    $this->filenames[] = trim($line);
-                }
-                $line = $listReader->readLine();
-            }            
-        } catch (Exception $e)  {
-            if ($listReader) $listReader->close();            
-            throw new BuildException("An error occured while reading from list file " . $this->listfile->__toString() . ": " . $e->getMessage()); 
-        } 
-        
-        $listReader->close();        
-    }
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/FileSet.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/FileSet.php
deleted file mode 100644
index 012e030f6..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/FileSet.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/*
- * $Id: FileSet.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/types/AbstractFileSet.php';
-
-/**
- * Moved out of MatchingTask to make it a standalone object that could
- * be referenced (by scripts for example).
- *
- * @author Hans Lellelid <hans@xmpl.org> (Phing)
- * @author Arnout J. Kuiper <ajkuiper@wxs.nl> (Ant)
- * @author Stefano Mazzocchi <stefano@apache.org> (Ant)
- * @author Sam Ruby <rubys@us.ibm.com> (Ant)
- * @author Jon S. Stevens <jon@clearink.com> (Ant)
- * @author Stefan Bodewig <stefan.bodewig@epost.de> (Ant)
- * @author Magesh Umasankar (Ant)
- * @package phing.types
- */
-class FileSet extends AbstractFileSet {
-    
-    function __construct($fileset = null) {
-        parent::__construct($fileset);
-    }
-
-    /**
-     * Return a FileSet that has the same basedir and same patternsets
-     * as this one.
-     */
-    public function __clone() {
-        if ($this->isReference()) {
-            return new FileSet($this->getRef($this->getProject()));
-        } else {
-            return new FileSet($this);
-        }
-    }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/FilterChain.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/FilterChain.php
deleted file mode 100644
index 1126f98f4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/FilterChain.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/*
- *  $Id: FilterChain.php 247 2007-10-16 21:09:37Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-include_once 'phing/types/DataType.php';
-include_once 'phing/filters/HeadFilter.php';
-include_once 'phing/filters/TailFilter.php';
-include_once 'phing/filters/LineContains.php';
-include_once 'phing/filters/LineContainsRegexp.php';
-include_once 'phing/filters/ExpandProperties.php';
-include_once 'phing/filters/PrefixLines.php';
-include_once 'phing/filters/ReplaceRegexp.php';
-include_once 'phing/filters/ReplaceTokens.php';
-include_once 'phing/filters/StripPhpComments.php';
-include_once 'phing/filters/StripLineBreaks.php';
-include_once 'phing/filters/StripLineComments.php';
-include_once 'phing/filters/StripWhitespace.php';
-include_once 'phing/filters/TabToSpaces.php';
-include_once 'phing/filters/TidyFilter.php';
-include_once 'phing/filters/TranslateGettext.php';
-include_once 'phing/filters/XincludeFilter.php';
-include_once 'phing/filters/XsltFilter.php';
-
-/*
- * FilterChain may contain a chained set of filter readers.
- *
- * @author    Yannick Lecaillez <yl@seasonfive.com>
- * @version   $Revision: 1.11 $
- * @package   phing.types
- */
-class FilterChain extends DataType {
-
-    private $filterReaders = array();
-
-    function __construct(Project $project) {
-        $this->project = $project;
-    }
-
-    function getFilterReaders() {
-        return $this->filterReaders;
-    }
-
-    function addExpandProperties(ExpandProperties $o) {
-        $o->setProject($this->project);
-        $this->filterReaders[] = $o;
-    }
-
-    function addGettext(TranslateGettext $o) {
-        $o->setProject($this->project);
-        $this->filterReaders[] = $o;
-    }
-    
-    function addHeadFilter(HeadFilter $o) {
-        $o->setProject($this->project);
-        $this->filterReaders[] = $o;
-    }
-    
-    function addTailFilter(TailFilter $o) {
-        $o->setProject($this->project);
-        $this->filterReaders[] = $o;
-    }
-    
-    function addLineContains(LineContains $o) {
-        $o->setProject($this->project);
-        $this->filterReaders[] = $o;
-    }
-    
-    function addLineContainsRegExp(LineContainsRegExp $o) {
-        $o->setProject($this->project);
-        $this->filterReaders[] = $o;
-    }
-    
-    function addPrefixLines(PrefixLines $o) {
-        $o->setProject($this->project);
-        $this->filterReaders[] = $o;
-    }
-    
-    function addReplaceTokens(ReplaceTokens $o) {
-        $o->setProject($this->project);
-        $this->filterReaders[] = $o;
-    }
-
-    function addReplaceRegexp(ReplaceRegexp $o) {
-        $o->setProject($this->project);
-        $this->filterReaders[] = $o;
-    }
-    
-    function addStripPhpComments(StripPhpComments $o) {
-        $o->setProject($this->project);
-        $this->filterReaders[] = $o;
-    }
-    
-    function addStripLineBreaks(StripLineBreaks $o) {
-        $o->setProject($this->project);
-        $this->filterReaders[] = $o;
-    }
-    
-    function addStripLineComments(StripLineComments $o) {
-        $o->setProject($this->project);
-        $this->filterReaders[] = $o;        
-    }
-    
-	function addStripWhitespace(StripWhitespace $o) {
-        $o->setProject($this->project);
-        $this->filterReaders[] = $o;
-    }
-    
-	function addTidyFilter(TidyFilter $o) {
-        $o->setProject($this->project);
-        $this->filterReaders[] = $o;
-    }
-	
-    function addTabToSpaces(TabToSpaces $o) {
-        $o->setProject($this->project);
-        $this->filterReaders[] = $o;
-    }
-    
-    function addXincludeFilter(XincludeFilter $o) {
-        $o->setProject($this->project);
-        $this->filterReaders[] = $o;
-    }
-
-    function addXsltFilter(XsltFilter $o) {
-        $o->setProject($this->project);
-        $this->filterReaders[] = $o;
-    }
-    
-    function addFilterReader(PhingFilterReader $o) {
-        $o->setProject($this->project);
-        $this->filterReaders[] = $o;
-    }
-
-    /*
-     * Makes this instance in effect a reference to another FilterChain 
-     * instance.
-     *
-     * <p>You must not set another attribute or nest elements inside
-     * this element if you make it a reference.</p>
-     *
-     * @param r the reference to which this instance is associated
-     * @throw BuildException if this instance already has been configured.
-    */
-    function setRefid(Reference $r) {
-    
-        if ( count($this->filterReaders) === 0 ) {
-            throw $this->tooManyAttributes();
-        }
-
-        // change this to get the objects from the other reference
-        $o = $r->getReferencedObject($this->getProject());
-        if ( $o instanceof FilterChain ) {
-            $this->filterReaders = $o->getFilterReaders();
-        } else {
-            throw new BuildException($r->getRefId()." doesn't refer to a FilterChain");
-        }
-        parent::setRefid($r);
-    }
-    
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Mapper.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Mapper.php
deleted file mode 100644
index 3de8e6e19..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Mapper.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-/*
- *  $Id: Mapper.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-include_once 'phing/types/DataType.php';
-include_once 'phing/types/Path.php';
-
-/**
- * Filename Mapper maps source file name(s) to target file name(s).
- * 
- * Built-in mappers can be accessed by specifying they "type" attribute:
- * <code>
- * <mapper type="glob" from="*.php" to="*.php.bak"/>
- * </code>
- * Custom mappers can be specified by providing a dot-path to a include_path-relative
- * class:
- * <code>
- * <mapper classname="myapp.mappers.DevToProdMapper" from="*.php" to="*.php"/>
- * <!-- maps all PHP files from development server to production server, for example -->
- * </code>
- *
- * @author Hans Lellelid <hans@xmpl.org>
- * @package phing.types
- */
-class Mapper extends DataType {
-
-    protected $type;    
-    protected $classname;
-    protected $from;
-    protected $to;
-    protected $classpath;
-    protected $classpathId;
-
-    
-    function __construct(Project $project) {
-        $this->project = $project;
-    }
-    
-    /**
-     * Set the classpath to be used when searching for component being defined
-     * 
-     * @param Path $classpath An Path object containing the classpath.
-     */
-    public function setClasspath(Path $classpath) {
-        if ($this->isReference()) {
-            throw $this->tooManyAttributes();
-        }
-        if ($this->classpath === null) {
-            $this->classpath = $classpath;
-        } else {
-            $this->classpath->append($classpath);
-        }
-    }
-
-    /**
-     * Create the classpath to be used when searching for component being defined
-     */ 
-    public function createClasspath() {
-        if ($this->isReference()) {
-            throw $this->tooManyAttributes();
-        }
-        if ($this->classpath === null) {
-            $this->classpath = new Path($this->project);
-        }
-        return $this->classpath->createPath();
-    }
-
-    /**
-     * Reference to a classpath to use when loading the files.
-     */
-    public function setClasspathRef(Reference $r) {
-        if ($this->isReference()) {
-            throw $this->tooManyAttributes();
-        }
-        $this->classpathId = $r->getRefId();
-        $this->createClasspath()->setRefid($r);
-    }
-
-    /** Set the type of FileNameMapper to use. */
-    function setType($type) {
-        if ($this->isReference()) {
-            throw $this->tooManyAttributes();
-        }
-        $this->type = $type;
-    }
-
-    /** Set the class name of the FileNameMapper to use. */
-    function setClassname($classname) {
-        if ($this->isReference()) {
-            throw $this->tooManyAttributes();
-        }
-        $this->classname = $classname;
-    }
-
-    /**
-     * Set the argument to FileNameMapper.setFrom
-     */
-    function setFrom($from) {
-        if ($this->isReference()) {
-            throw $this->tooManyAttributes();
-        }
-        $this->from = $from;
-    }
-
-    /**
-     * Set the argument to FileNameMapper.setTo
-     */
-    function setTo($to) {
-        if ($this->isReference()) {
-            throw $this->tooManyAttributes();
-        }
-        $this->to = $to;
-    }
-
-    /**
-     * Make this Mapper instance a reference to another Mapper.
-     *
-     * You must not set any other attribute if you make it a reference.
-     */
-    function setRefid($r) {
-        if ($this->type !== null || $this->from !== null || $this->to !== null) {
-            throw DataType::tooManyAttributes();
-        }
-        parent::setRefid($r);
-    }
-
-    /** Factory, returns inmplementation of file name mapper as new instance */
-    function getImplementation() {
-        if ($this->isReference()) {
-            $tmp = $this->getRef();
-            return $tmp->getImplementation();
-        }
-
-        if ($this->type === null && $this->classname === null) {
-            throw new BuildException("either type or classname attribute must be set for <mapper>");
-        }
-        
-        if ($this->type !== null) {
-            switch($this->type) {
-            case 'identity':
-                $this->classname = 'phing.mappers.IdentityMapper';
-                break;
-            case 'flatten':
-                $this->classname = 'phing.mappers.FlattenMapper';
-                break;
-            case 'glob':
-                $this->classname = 'phing.mappers.GlobMapper';
-                break;
-            case 'regexp':
-            case 'regex':
-                $this->classname = 'phing.mappers.RegexpMapper';            
-                break;
-            case 'merge':
-                $this->classname = 'phing.mappers.MergeMapper';                
-                break;
-            default:
-                throw new BuildException("Mapper type {$this->type} not known");
-                break;
-            }
-        }
-
-        // get the implementing class
-        $cls = Phing::import($this->classname, $this->classpath);
-        
-        $m = new $cls;
-        $m->setFrom($this->from);
-        $m->setTo($this->to);
-        
-        return $m;
-    }
-
-    /** Performs the check for circular references and returns the referenced Mapper. */
-    private function getRef() {
-        if (!$this->checked) {
-            $stk = array();
-            $stk[] = $this;
-            $this->dieOnCircularReference($stk, $this->project);            
-        }
-
-        $o = $this->ref->getReferencedObject($this->project);
-        if (!($o instanceof Mapper)) {
-            $msg = $this->ref->getRefId()." doesn't denote a mapper";
-            throw new BuildException($msg);
-        } else {
-            return $o;
-        }
-    }
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Parameter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Parameter.php
deleted file mode 100644
index 527c71571..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Parameter.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/*
- *  $Id: Parameter.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-include_once 'phing/types/DataType.php';
-
-/*
- * A parameter is composed of a name, type and value. Nested
- * Parameters are also possible, but the using task/type has
- * to support them
- *
- * @author    Manuel Holtgrewe
- * @author    <a href="mailto:yl@seasonfive.com">Yannick Lecaillez</a>
- * @package   phing.types
-*/
-class Parameter extends DataType {
-
-    /** Parameter name */
-    protected $name;
-    
-    /** Paramter type */
-    protected $type;
-    
-    /** Parameter value */
-    protected $value;
-    
-    /** Nested parameters */
-    protected $parameters = array();
-
-    function setName($name) {
-        $this->name = (string) $name;
-    }
-    
-    function setType($type) {
-        $this->type = (string) $type;
-    }
-
-	/**
-     * Sets value to dynamic register slot.
-     * @param RegisterSlot $value
-     */
-    public function setListeningValue(RegisterSlot $value) {
-        $this->value = $value;
-    }
-	
-    function setValue($value) {
-        $this->value = (string) $value;
-    }
-
-    function getName() {
-        return $this->name;
-    }
-
-    function getType() {
-        return $this->type;
-    }
-
-    function getValue() {
-		if ($this->value instanceof RegisterSlot) {
-            return $this->value->getValue();
-        } else {
-            return $this->value;
-        }
-    }
-    
-    /**
-     * @return Parameter
-     */
-    function createParam() {
-        $num = array_push($this->parameters, new Parameter());
-        return $this->parameters[$num-1];
-    }
-
-    /**
-     * @return array Nested parameters.
-     */
-    function getParams() {
-        return $this->parameters;
-    }
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Parameterizable.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Parameterizable.php
deleted file mode 100644
index a31213e5d..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Parameterizable.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/*
- * $Id: Parameterizable.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-/**
- * Parameterizable objects take genric key value pairs.
- *
- * @author Hans Lellelid, hans@xmpl.org (Phing)
- * @author Magesh Umasankar (Ant)
- * @package phing.types
- */
-interface Parameterizable {
-    function setParameters($parameters);
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Path.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Path.php
deleted file mode 100644
index cafd12f35..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Path.php
+++ /dev/null
@@ -1,450 +0,0 @@
-<?php
-/*
- *  $Id: Path.php 377 2008-06-27 16:02:16Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/types/DataType.php';
-include_once 'phing/util/PathTokenizer.php';
-include_once 'phing/types/FileSet.php';
-
-/**
- * This object represents a path as used by include_path or PATH
- * environment variable.
- *
- * This class has been adopted from the Java Ant equivalent.  The ability have
- * path structures in Phing is important; however, because of how PHP classes interact
- * the ability to specify CLASSPATHs makes less sense than Java.Rather than providing
- * CLASSPATH for any tasks that take classes as parameters, perhaps a better
- * solution in PHP is to have an IncludePath task, which prepends paths to PHP's include_path
- * INI variable. This gets around the problem that simply using a path to load the initial
- * PHP class is not enough (in most cases the loaded class may assume that it is on the global
- * PHP include_path, and will try to load dependent classes accordingly).  The other option is
- * to provide a way for this class to add paths to the include path, if desired -- or to create
- * an IncludePath subclass.  Once added, though, when would a path be removed from the include path?
- *
- * <p>
- * <code>
- * &lt;sometask&gt;<br>
- * &nbsp;&nbsp;&lt;somepath&gt;<br>
- * &nbsp;&nbsp;&nbsp;&nbsp;&lt;pathelement location="/path/to/file" /&gt;<br>
- * &nbsp;&nbsp;&nbsp;&nbsp;&lt;pathelement path="/path/to/class2;/path/to/class3" /&gt;<br>
- * &nbsp;&nbsp;&nbsp;&nbsp;&lt;pathelement location="/path/to/file3" /&gt;<br>
- * &nbsp;&nbsp;&lt;/somepath&gt;<br>
- * &lt;/sometask&gt;<br>
- * </code>
- * <p>
- * The object implemention <code>sometask</code> must provide a method called
- * <code>createSomepath</code> which returns an instance of <code>Path</code>.
- * Nested path definitions are handled by the Path object and must be labeled
- * <code>pathelement</code>.<p>
- *
- * The path element takes a parameter <code>path</code> which will be parsed
- * and split into single elements. It will usually be used
- * to define a path from an environment variable.
- *
- * @author Hans Lellelid <hans@xmpl.org> (Phing)
- * @author Thomas.Haas@softwired-inc.com (Ant)
- * @author Stefan Bodewig <stefan.bodewig@epost.de> (Ant)
- * @package phing.types
- */
-class Path extends DataType {
-
-    private $elements = array();
-
-    /**
-     * Constructor for internally instantiated objects sets project.
-     * @param Project $project
-     * @param string $path (for use by IntrospectionHelper)
-     */
-    public function __construct($project = null, $path = null) {
-        if ($project !== null) {
-            $this->setProject($project);
-        }
-        if ($path !== null) {
-            $this->createPathElement()->setPath($path);
-        }
-    }
-
-    /**
-     * Adds a element definition to the path.
-     * @param $location the location of the element to add (must not be
-     * <code>null</code> nor empty.
-     * @throws BuildException
-     */
-    public function setDir(PhingFile $location) {
-        if ($this->isReference()) {
-            throw $this->tooManyAttributes();
-        }
-        $this->createPathElement()->setDir($location);
-    }
-
-    /**
-     * Parses a path definition and creates single PathElements.
-     * @param path the path definition.
-     * @throws BuildException
-     */
-    public function setPath($path) {
-        if ($this->isReference()) {
-            throw $this->tooManyAttributes();
-        }
-        $this->createPathElement()->setPath($path);
-    }
-
-    /**
-     * Makes this instance in effect a reference to another Path instance.
-     *
-     * <p>You must not set another attribute or nest elements inside
-     * this element if you make it a reference.</p>
-     * @throws BuildException
-     */
-    public function setRefid(Reference $r)  {
-        if (!empty($this->elements)) {
-            throw $this->tooManyAttributes();
-        }
-        $this->elements[] = $r;
-        parent::setRefid($r);
-    }
-
-    /**
-     * Creates the nested <code>&lt;pathelement&gt;</code> element.
-     * @throws BuildException
-     */
-    public function createPathElement() {
-        if ($this->isReference()) {
-            throw $this->noChildrenAllowed();
-        }
-        $pe = new PathElement($this);
-        $this->elements[] = $pe;
-        return $pe;
-    }
-
-    /**
-     * Adds a nested <code>&lt;fileset&gt;</code> element.
-     * @throws BuildException
-     */
-    public function addFileset(FileSet $fs) {
-        if ($this->isReference()) {
-            throw $this->noChildrenAllowed();
-        }
-        $this->elements[] = $fs;
-        $this->checked = false;
-    }
-
-    /**
-     * Adds a nested <code>&lt;dirset&gt;</code> element.
-     * @throws BuildException
-     */
-    public function addDirset(DirSet $dset) {
-        if ($this->isReference()) {
-            throw $this->noChildrenAllowed();
-        }
-        $this->elements[] = $dset;
-        $this->checked = false;
-    }
-
-    /**
-     * Creates a nested <code>&lt;path&gt;</code> element.
-     * @throws BuildException
-     */
-    public function createPath() {
-        if ($this->isReference()) {
-            throw $this->noChildrenAllowed();
-        }
-        $p = new Path($this->project);
-        $this->elements[] = $p;
-        $this->checked = false;
-        return $p;
-    }
-
-    /**
-     * Append the contents of the other Path instance to this.
-     */
-    public function append(Path $other) {
-        if ($other === null) {
-            return;
-        }
-        $l = $other->listPaths();
-        foreach($l as $path) {
-            if (!in_array($path, $this->elements, true)) {
-                $this->elements[] = $path;
-            }
-        }
-    }
-
-     /**
-     * Adds the components on the given path which exist to this
-     * Path. Components that don't exist, aren't added.
-     *
-     * @param Path $source - Source path whose components are examined for existence.
-     */
-    public function addExisting(Path $source) {
-        $list = $source->listPaths();
-        foreach($list as $el) {
-            $f = null;
-            if ($this->project !== null) {
-                $f = $this->project->resolveFile($el);
-            } else {
-                $f = new PhingFile($el);
-            }
-
-            if ($f->exists()) {
-                $this->setDir($f);
-            } else {
-                $this->log("dropping " . $f->__toString() . " from path as it doesn't exist",
-                    Project::MSG_VERBOSE);
-            }
-        }
-    }
-
-    /**
-     * Returns all path elements defined by this and nested path objects.
-     * @return array List of path elements.
-     */
-    public function listPaths() {
-        if (!$this->checked) {
-            // make sure we don't have a circular reference here
-            $stk = array();
-            array_push($stk, $this);
-            $this->dieOnCircularReference($stk, $this->project);
-        }
-
-        $result = array();
-        for ($i = 0, $elSize=count($this->elements); $i < $elSize; $i++) {
-            $o = $this->elements[$i];
-            if ($o instanceof Reference) {
-                $o = $o->getReferencedObject($this->project);
-                // we only support references to paths right now
-                if (!($o instanceof Path)) {
-                    $msg = $r->getRefId() . " doesn't denote a path";
-                    throw new BuildException($msg);
-                }
-            }
-
-            if (is_string($o)) {
-                $result[] = $o;
-            } elseif ($o instanceof PathElement) {
-                $parts = $o->getParts();
-                if ($parts === null) {
-                    throw new BuildException("You must either set location or"
-                        . " path on <pathelement>");
-                }
-                foreach($parts as $part) {
-                    $result[] = $part;
-                }
-            } elseif ($o instanceof Path) {
-                $p = $o;
-                if ($p->getProject() === null) {
-                    $p->setProject($this->getProject());
-                }
-                $parts = $p->listPaths();
-                foreach($parts as $part) {
-                    $result[] = $part;
-                }
-            } elseif ($o instanceof DirSet) {
-                $dset = $o;
-                $ds = $dset->getDirectoryScanner($this->project);
-                $dirstrs = $ds->getIncludedDirectories();
-                $dir = $dset->getDir($this->project);
-                foreach($dirstrs as $dstr) {
-                    $d = new PhingFile($dir, $dstr);
-                    $result[] = $d->getAbsolutePath();
-                }
-            } elseif ($o instanceof FileList) {
-                $fl = $o;
-                $dirstrs = $fl->getFiles($this->project);
-                $dir = $fl->getDir($this->project);
-                foreach($dirstrs as $dstr) {
-                    $d = new PhingFile($dir, $dstr);
-                    $result[] = $d->getAbsolutePath();
-                }
-            }
-        }
-
-        return array_unique($result);
-    }
-
-
-    /**
-     * Returns a textual representation of the path, which can be used as
-     * CLASSPATH or PATH environment variable definition.
-     * @return string A textual representation of the path.
-     */
-    public function __toString() {
-
-        $list = $this->listPaths();
-
-        // empty path return empty string
-        if (empty($list)) {
-            return "";
-        }
-
-        return implode(PATH_SEPARATOR, $list);
-    }
-
-    /**
-     * Splits a PATH (with : or ; as separators) into its parts.
-     * @param Project $project
-     * @param string $source
-     */
-    public static function translatePath(Project $project, $source) {
-        $result = array();
-        if ($source == null) {
-          return "";
-        }
-
-        $tok = new PathTokenizer($source);
-        while ($tok->hasMoreTokens()) {
-            $pathElement = $tok->nextToken();
-            try {
-                $element = self::resolveFile($project, $pathElement);
-                for ($i = 0, $_i=strlen($element); $i < $_i; $i++) {
-                    self::translateFileSep($element, $i);
-                }
-                $result[] = $element;
-            } catch (BuildException $e) {
-                $this->project->log("Dropping path element " . $pathElement
-                    . " as it is not valid relative to the project",
-                    Project::MSG_VERBOSE);
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns its argument with all file separator characters
-     * replaced so that they match the local OS conventions.
-     */
-    public static function translateFile($source) {
-        if ($source == null) {
-          return "";
-        }
-
-        $result = $source;
-        for ($i = 0, $_i=strlen($source); $i < $_i; $i++) {
-            self::translateFileSep($result, $i);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Translates all occurrences of / or \ to correct separator of the
-     * current platform and returns whether it had to do any
-     * replacements.
-     */
-    protected static function translateFileSep(&$buffer, $pos) {
-        if ($buffer{$pos} == '/' || $buffer{$pos} == '\\') {
-            $buffer{$pos} = DIRECTORY_SEPARATOR;
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * How many parts does this Path instance consist of.
-     * DEV NOTE: expensive call! list is generated, counted, and then
-     * discareded.
-     * @return int
-     */
-    public function size() {
-        return count($this->listPaths());
-    }
-
-    /**
-     * Return a Path that holds the same elements as this instance.
-     */
-    public function __clone() {
-        $p = new Path($this->project);
-        $p->append($this);
-        return $p;
-    }
-
-    /**
-     * Overrides the version of DataType to recurse on all DataType
-     * child elements that may have been added.
-     * @throws BuildException
-     */
-    public function dieOnCircularReference(&$stk, Project $p) {
-
-        if ($this->checked) {
-            return;
-        }
-
-        // elements can contain strings, FileSets, Reference, etc.
-        foreach($this->elements as $o) {
-
-            if ($o instanceof Reference) {
-                $o = $o->getReferencedObject($p);
-            }
-
-            if ($o instanceof DataType) {
-                if (in_array($o, $stk, true)) {
-                    throw $this->circularReference();
-                } else {
-                    array_push($stk, $o);
-                    $o->dieOnCircularReference($stk, $p);
-                    array_pop($stk);
-                }
-            }
-        }
-
-        $this->checked = true;
-    }
-
-    /**
-     * Resolve a filename with Project's help - if we know one that is.
-     *
-     * <p>Assume the filename is absolute if project is null.</p>
-     */
-    private static function resolveFile(Project $project, $relativeName) {
-        if ($project !== null) {
-            $f = $project->resolveFile($relativeName);
-            return $f->getAbsolutePath();
-        }
-        return $relativeName;
-    }
-
-}
-
-
-/**
- * Helper class, holds the nested <code>&lt;pathelement&gt;</code> values.
- */
-class PathElement {
-
-    private $parts = array();
-    private $outer;
-
-    public function __construct(Path $outer) {
-        $this->outer = $outer;
-    }
-
-    public function setDir(PhingFile $loc) {
-        $this->parts = array(Path::translateFile($loc->getAbsolutePath()));
-    }
-
-    public function setPath($path) {
-        $this->parts = Path::translatePath($this->outer->getProject(), $path);
-    }
-
-    public function getParts() {
-        return $this->parts;
-    }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/PatternSet.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/PatternSet.php
deleted file mode 100644
index ba63e36e8..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/PatternSet.php
+++ /dev/null
@@ -1,491 +0,0 @@
-<?php
-/*
- *  $Id: PatternSet.php 257 2007-10-21 00:27:07Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-include_once 'phing/system/io/FileReader.php';
-include_once 'phing/types/DataType.php';
-
-/**
- * The patternset storage component. Carries all necessary data and methods
- * for the patternset stuff.
- *
- * @author   Andreas Aderhold, andi@binarycloud.com
- * @version  $Revision: 1.8 $
- * @package  phing.types
- */
-class PatternSet extends DataType {
-
-	private $includeList = array();
-	private $excludeList = array();
-	private $includesFileList = array();
-	private $excludesFileList = array();
-
-    /**
-     * Makes this instance in effect a reference to another PatternSet
-     * instance.
-     * You must not set another attribute or nest elements inside
-     * this element if you make it a reference.
-     */
-    function setRefid(Reference $r) {
-    	if (!empty($this->includeList) || !empty($this->excludeList)) {
-    		throw $this->tooManyAttributes();
-    	}
-    	parent::setRefid($r);
-    }
-
-
-    /**
-    * Add a name entry on the include list
-    *
-    * @returns PatternSetNameEntry Reference to object
-    * @throws  BuildException
-    */
-    function createInclude() {
-    	if ($this->isReference()) {
-    		throw $this->noChildrenAllowed();
-    	}
-    	return $this->addPatternToList($this->includeList);
-    }
-
-
-    /**
-    * Add a name entry on the include files list
-    *
-    * @returns PatternSetNameEntry Reference to object
-    * @throws  BuildException
-    */
-    function createIncludesFile() {
-    	if ($this->isReference()) {
-    		throw $this->noChildrenAllowed();
-    	}
-    	return $this->addPatternToList($this->includesFileList);
-    }
-
-    /**
-    * Add a name entry on the exclude list
-    *
-    * @returns PatternSetNameEntry Reference to object
-    * @throws  BuildException
-    */
-    function createExclude() {
-    	if ($this->isReference()) {
-    		throw $this->noChildrenAllowed();
-    	}
-    	return $this->addPatternToList($this->excludeList);
-    }
-
-    /**
-	 * add a name entry on the exclude files list
-	 *
-	 * @returns PatternSetNameEntry Reference to object
-	 * @throws  BuildException
-	 */
-    function createExcludesFile() {
-    	if ($this->isReference()) {
-    		throw $this->noChildrenAllowed();
-    		return;
-    	}
-    	return $this->addPatternToList($this->excludesFileList);
-    }
-
-
-    /**
-     * Sets the set of include patterns. Patterns may be separated by a comma
-     * or a space.
-     *
-     * @param   string the string containing the include patterns
-     * @returns void
-     * @throws  BuildException
-     */
-    function setIncludes($includes) {
-    	if ($this->isReference()) {
-    		throw $this->tooManyAttributes();
-    	}
-    	if ($includes !== null && strlen($includes) > 0) {
-    		$tok = strtok($includes, ", ");
-    		while ($tok !== false) {
-    			$o = $this->createInclude();
-    			$o->setName($tok);
-    			$tok = strtok(", ");
-    		}
-    	}
-    }
-
-
-	/**
-	 * Sets the set of exclude patterns. Patterns may be separated by a comma
-	 * or a space.
-	 *
-	 * @param string the string containing the exclude patterns
-	 * @returns void
-     * @throws  BuildException
-	 */
-    function setExcludes($excludes) {
-    	if ($this->isReference()) {
-    		throw $this->tooManyAttributes();
-    	}
-    	if ($excludes !== null && strlen($excludes) > 0) {
-    		$tok = strtok($excludes, ", ");
-    		while ($tok !== false) {
-    			$o = $this->createExclude();
-    			$o->setName($tok);
-    			$tok = strtok(", ");
-    		}
-    	}
-    }
-
-    /**
-     * add a name entry to the given list
-     *
-     * @param array List onto which the nameentry should be added
-     * @returns PatternSetNameEntry  Reference to the created PsetNameEntry instance
-     */
-    private function addPatternToList(&$list) {
-    	$num = array_push($list, new PatternSetNameEntry());
-    	return $list[$num-1];
-    }
-
-    /**
-     * Sets the name of the file containing the includes patterns.
-     *
-     * @param includesFile The file to fetch the include patterns from.
-     */
-    function setIncludesFile($includesFile) {
-    	if ($this->isReference()) {
-    		throw $this->tooManyAttributes();
-    	}
-    	if ($includesFile instanceof File) {
-    		$includesFile = $includesFile->getPath();
-    	}
-    	$o = $this->createIncludesFile();
-    	$o->setName($includesFile);
-    }
-
-    /**
-     * Sets the name of the file containing the excludes patterns.
-     *
-     * @param excludesFile The file to fetch the exclude patterns from.
-     */
-    function setExcludesFile($excludesFile) {
-    	if ($this->isReference()) {
-    		throw $this->tooManyAttributes();
-    	}
-    	if ($excludesFile instanceof File) {
-    		$excludesFile = $excludesFile->getPath();
-    	}
-    	$o = $this->createExcludesFile();
-    	$o->setName($excludesFile);
-    }
-
-
-    /**
-     *  Reads path matching patterns from a file and adds them to the
-     *  includes or excludes list
-     */
-    private function readPatterns(PhingFile $patternfile, &$patternlist, Project $p) {
-    	$patternReader = null;
-    	try {
-    		// Get a FileReader
-    		$patternReader = new BufferedReader(new FileReader($patternfile));
-
-    		// Create one NameEntry in the appropriate pattern list for each
-    		// line in the file.
-    		$line = $patternReader->readLine();
-    		while ($line !== null) {
-    			if (!empty($line)) {
-    				$line = $p->replaceProperties($line);
-    				$this->addPatternToList($patternlist)->setName($line);
-    			}
-    			$line = $patternReader->readLine();
-    		}
-
-    	} catch (IOException $ioe)  {
-    		$msg = "An error occured while reading from pattern file: " . $patternfile->__toString();
-    		if($patternReader) $patternReader->close();
-    		throw new BuildException($msg, $ioe);
-    	}
-
-    	$patternReader->close();
-    }
-
-
-    /** Adds the patterns of the other instance to this set. */
-    function append($other, $p) {
-    	if ($this->isReference()) {
-    		throw new BuildException("Cannot append to a reference");
-    	}
-
-    	$incl = $other->getIncludePatterns($p);
-    	if ($incl !== null) {
-    		foreach($incl as $incl_name) {
-    			$o = $this->createInclude();
-    			$o->setName($incl_name);
-    		}
-    	}
-
-    	$excl = $other->getExcludePatterns($p);
-    	if ($excl !== null) {
-    		foreach($excl as $excl_name) {
-    			$o = $this->createExclude();
-    			$o->setName($excl_name);
-    		}
-    	}
-    }
-
-    /** Returns the filtered include patterns. */
-    function getIncludePatterns(Project $p) {
-    	if ($this->isReference()) {
-    		$o = $this->getRef($p);
-    		return $o->getIncludePatterns($p);
-    	} else {
-    		$this->readFiles($p);
-    		return $this->makeArray($this->includeList, $p);
-    	}
-    }
-
-    /** Returns the filtered exclude patterns. */
-    function getExcludePatterns(Project $p) {
-    	if ($this->isReference()) {
-    		$o = $this->getRef($p);
-    		return $o->getExcludePatterns($p);
-    	} else {
-    		$this->readFiles($p);
-    		return $this->makeArray($this->excludeList, $p);
-    	}
-    }
-
-    /** helper for FileSet. */
-    function hasPatterns() {
-    	return (boolean) count($this->includesFileList) > 0 || count($this->excludesFileList) > 0
-    	|| count($this->includeList) > 0 || count($this->excludeList) > 0;
-    }
-
-    /**
-     * Performs the check for circular references and returns the
-     * referenced PatternSet.
-     */
-    function getRef(Project $p) {
-    	if (!$this->checked) {
-    		$stk = array();
-    		array_push($stk, $this);
-    		$this->dieOnCircularReference($stk, $p);
-    	}
-    	$o = $this->ref->getReferencedObject($p);
-    	if (!($o instanceof PatternSet)) {
-    		$msg = $this->ref->getRefId()." doesn't denote a patternset";
-    		throw new BuildException($msg);
-    	} else {
-    		return $o;
-    	}
-    }
-
-    /** Convert a array of PatternSetNameEntry elements into an array of Strings. */
-    private function makeArray(&$list, Project $p) {
-
-    	if (count($list) === 0) {
-    		return null;
-    	}
-
-    	$tmpNames = array();
-    	foreach($list as $ne) {
-    		$pattern = (string) $ne->evalName($p);
-    		if ($pattern !== null && strlen($pattern) > 0) {
-    			array_push($tmpNames, $pattern);
-    		}
-    	}
-    	return $tmpNames;
-    }
-
-    /** Read includesfile or excludesfile if not already done so. */
-    private function readFiles(Project $p) {
-    	if (!empty($this->includesFileList)) {
-    		foreach($this->includesFileList as $ne) {
-    			$fileName = (string) $ne->evalName($p);
-    			if ($fileName !== null) {
-    				$inclFile = $p->resolveFile($fileName);
-    				if (!$inclFile->exists()) {
-    					throw new BuildException("Includesfile ".$inclFile->getAbsolutePath()." not found.");
-    				}
-    				$this->readPatterns($inclFile, $this->includeList, $p);
-    			}
-    		}
-    		$this->includesFileList = array();
-    	}
-
-    	if (!empty($this->excludesFileList)) {
-    		foreach($this->excludesFileList as $ne) {
-    			$fileName = (string) $ne->evalName($p);
-    			if ($fileName !== null) {
-    				$exclFile = $p->resolveFile($fileName);
-    				if (!$exclFile->exists()) {
-    					throw new BuildException("Excludesfile ".$exclFile->getAbsolutePath()." not found.");
-    					return;
-    				}
-    				$this->readPatterns($exclFile, $this->excludeList, $p);
-    			}
-    		}
-    		$this->excludesFileList = array();
-    	}
-    }
-
-
-    function toString() {
-
-    	// We can't compile includeList into array because, toString() does
-    	// not know about project:
-    	//
-    	// $includes = $this->makeArray($this->includeList, $this->project);
-    	// $excludes = $this->makeArray($this->excludeList, $this->project);
-
-    	if (empty($this->includeList)) {
-    		$includes = "empty";
-    	} else {
-    		$includes = "";
-    		foreach($this->includeList as $ne) {
-    			$includes .= $ne->toString() . ",";
-    		}
-    		$includes = rtrim($includes, ",");
-    	}
-
-    	if (empty($this->excludeList)) {
-    		$excludes = "empty";
-    	} else {
-    		$excludes = "";
-    		foreach($this->excludeList as $ne) {
-    			$excludes .= $ne->toString() . ",";
-    		}
-    		$excludes = rtrim($excludes, ",");
-    	}
-
-    	return "patternSet{ includes: $includes  excludes: $excludes }";
-    }
-}
-
-
-/**
- * "Internal" class for holding an include/exclude pattern.
- */
-class PatternSetNameEntry {
-
-	/**
-	 * The pattern.
-	 * @var string
-	 */
-	private $name;
-
-    /**
-     * The if-condition property for this pattern to be applied.
-     * @var string
-     */
-    private $ifCond;
-
-    /**
-     * The unless-condition property for this pattern to be applied.
-     * @var string 
-     */
-    private $unlessCond;
-
-    /**
-     * An alias for the setName() method.
-     * @see setName()
-     * @param string $pattern
-     */
-    public function setPattern($pattern) {
-    	$this->setName($pattern);
-    }
-
-    /**
-     * Set the pattern text.
-     * @param string $name The pattern
-     */
-    public function setName($name) {
-    	$this->name = (string) $name;
-    }
-
-	/**
-	 * Sets an if-condition property for this pattern to match.
-	 * @param string $cond
-	 */
-	public function setIf($cond) {
-		$this->ifCond = (string) $cond;
-	}
-
-
-	/**
-	 * Sets an unless-condition property for this pattern to match.
-	 * @param string $cond
-	 */
-	public function setUnless($cond) {
-		$this->unlessCond = (string) $cond;
-	}
-
-	/**
-	 * Get the pattern text.
-	 * @return string The pattern.
-	 */
-	public function getName() {
-		return $this->name;
-	}
-
-	/**
-	 * Evaluates the pattern.
-	 * @return string The pattern or null if it is ruled out by a condition. 
-	 */
-	public function evalName(Project $project) {
-		return $this->valid($project) ? $this->name : null;
-	}
-
-
-    /**
-     * Checks whether pattern should be applied based on whether the if and unless
-     * properties are set in project.
-     * @param Project $project
-     * @return boolean
-     */
-    public function valid(Project $project) {
-    	if ($this->ifCond !== null && $project->getProperty($this->ifCond) === null) {
-    		return false;
-    	} else if ($this->unlessCond !== null && $project->getProperty($this->unlessCond) !== null) {
-    		return false;
-    	}
-    	return true;
-    }
-
-	/**
-	 * Gets a string representation of this pattern.
-	 * @return string
-	 */
-	public function toString() {
-		$buf = $this->name;
-		if (($this->ifCond !== null) || ($this->unlessCond !== null)) {
-			$buf .= ":";
-			$connector = "";
-
-			if ($this->ifCond !== null) {
-				$buf .= "if->{$this->ifCond}";
-				$connector = ";";
-			}
-			if ($this->unlessCond !== null) {
-				$buf .= "$connector unless->{$this->unlessCond}";
-			}
-		}
-		return $buf;
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/PhingFilterReader.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/PhingFilterReader.php
deleted file mode 100644
index 50ad074e5..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/PhingFilterReader.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/*
- *  $Id: PhingFilterReader.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-include_once 'phing/types/DataType.php';
-include_once 'phing/types/Parameter.php';
-
-/*
- * A PhingFilterReader is a wrapper class that encloses the className
- * and configuration of a Configurable FilterReader.
- *
- * @author    Yannick Lecaillez <yl@seasonfive.com>
- * @version   $Revision: 1.9 $
- * @see       FilterReader
- * @package   phing.types
-*/
-class PhingFilterReader extends DataType {
-
-    private $className;
-    private $parameters = array();
-    private $classPath;
-
-    function setClassName($className) {
-        $this->className = $className;
-    }
-
-    function getClassName() {
-        return $this->className;
-    }
-
-    /**
-     * Set the classpath to load the FilterReader through (attribute).
-     * @param Path $classpath
-     */
-    function setClasspath(Path $classpath) {
-        if ( $this->isReference() ) {
-            throw $this->tooManyAttributes();
-        }
-        if ( $this->classPath === null ) {
-            $this->classPath = $classpath;
-        } else {
-            $this->classPath->append($classpath);
-        }
-    }
-
-    /*
-     * Set the classpath to load the FilterReader through (nested element).
-    */
-    function createClasspath() {
-        if ( $this->isReference() ) {
-            throw $this->noChildrenAllowed();
-        }        
-        if ( $this->classPath === null ) {
-            $this->classPath = new Path($this->project);
-        }
-        return $this->classPath->createPath();
-    }
-
-    function getClasspath() {
-        return $this->classPath;
-    }
-
-    function setClasspathRef(Reference $r) {
-        if ( $this->isReference() ) {
-            throw $this->tooManyAttributes();
-        }
-        $o = $this->createClasspath();
-        $o->setRefid($r);
-    }
-	
-	function addParam(Parameter $param) {
-		$this->parameters[] = $param;
-	}
-
-    function createParam() {
-        $num = array_push($this->parameters, new Parameter());
-        return $this->parameters[$num-1];
-    }
-		
-    function getParams() {
-        // We return a COPY
-        $ret = array();
-        for($i=0,$size=count($this->parameters); $i < $size; $i++) {
-            $ret[] = clone $this->parameters[$i];
-        }
-        return $ret;
-    }
-
-    /*
-     * Makes this instance in effect a reference to another PhingFilterReader 
-     * instance.
-     *
-     * <p>You must not set another attribute or nest elements inside
-     * this element if you make it a reference.</p>
-     *
-     * @param Reference $r the reference to which this instance is associated
-     * @exception BuildException if this instance already has been configured.
-    */
-    function setRefid(Reference $r) {
-        if ( (count($this->parameters) !== 0) || ($this->className !== null) ) {
-            throw $this->tooManyAttributes();
-        }
-        $o = $r->getReferencedObject($this->getProject());
-        if ( $o instanceof PhingFilterReader ) {
-            $this->setClassName($o->getClassName());
-            $this->setClasspath($o->getClassPath());
-            foreach($o->getParams() as $p) {
-                $this->addParam($p);
-            }
-        } else {
-            $msg = $r->getRefId()." doesn\'t refer to a PhingFilterReader";
-            throw new BuildException($msg);
-        }
-
-        parent::setRefid($r);
-    }
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Reference.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Reference.php
deleted file mode 100644
index 3e5363671..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/Reference.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/*
- * $Id: Reference.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-/** Class to hold a reference to another object in the project.
- * @package phing.types
- */
-class Reference {
-
-    protected $refid;
-
-    function __construct($id = null) {
-        if ($id !== null) {
-            $this->setRefId($id);
-        }
-    }
-
-    function setRefId($id) {
-        $this->refid = (string) $id;
-    }
-
-    function getRefId() {
-        return $this->refid;
-    }
-
-    /** returns reference to object in references container of project */
-    function getReferencedObject($project) {    
-        if ($this->refid === null) {
-            throw new BuildException("No reference specified");
-        }
-        $refs = $project->getReferences();
-        $o = @$refs[$this->refid];
-        if (!is_object($o)) {       
-            throw new BuildException("Reference {$this->refid} not found.");
-        }
-        return $o;
-    }
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/RegularExpression.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/RegularExpression.php
deleted file mode 100644
index 5339f149e..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/RegularExpression.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/*
- *  $Id: RegularExpression.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-include_once 'phing/types/DataType.php';
-include_once 'phing/Project.php';
-include_once 'phing/util/regexp/Regexp.php';
-
-/*
- * A regular expression datatype.  Keeps an instance of the
- * compiled expression for speed purposes.  This compiled
- * expression is lazily evaluated (it is compiled the first
- * time it is needed).  The syntax is the dependent on which
- * regular expression type you are using.
- *
- * @author    <a href="mailto:yl@seasonfive.com">Yannick Lecaillez</a>
- * @version   $Revision: 1.6 $ $Date: 2007-12-21 00:44:58 +0900 (金, 21 12月 2007) $
- * @access    public
- * @see       phing.util.regex.RegexMatcher
- * @package   phing.types
-*/
-class RegularExpression extends DataType {
-
-    private $regexp   = null;
-    private $ignoreCase = false;
-    
-    function __construct() {
-        $this->regexp  = new Regexp();
-    }
-
-    function setPattern($pattern) {
-        $this->regexp->setPattern($pattern);
-    }
-
-    function setReplace($replace) {
-        $this->regexp->setReplace($replace);
-    }
-    
-    function getPattern($p) {
-        if ( $this->isReference() ) {
-            $ref = $this->getRef($p);
-            return $ref->getPattern($p);
-        }
-        return $this->regexp->getPattern();
-    }
-
-    function getReplace($p) {
-        if ( $this->isReference() ) {
-            $ref = $this->getRef($p);
-            return $ref->getReplace($p);
-        }
-
-        return $this->regexp->getReplace();
-    }
-    
-    function setIgnoreCase($bit) {
-        $this->regexp->setIgnoreCase($bit);
-    }
-    
-    function getIgnoreCase() {
-        return $this->regexp->getIgnoreCase();
-    }
-    
-    function getRegexp(Project $p) {
-        if ( $this->isReference() ) {
-            $ref = $this->getRef($p);
-            return $ref->getRegexp($p);
-        }
-        return $this->regexp;
-    }
-
-    function getRef(Project $p) {
-        if ( !$this->checked ) {
-            $stk = array();
-            array_push($stk, $this);
-            $this->dieOnCircularReference($stk, $p);            
-        }
-
-        $o = $this->ref->getReferencedObject($p);
-        if ( !($o instanceof RegularExpression) ) {
-            throw new BuildException($this->ref->getRefId()." doesn't denote a RegularExpression");
-        } else {
-            return $o;
-        }
-    }
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/TokenReader.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/TokenReader.php
deleted file mode 100644
index 72339917f..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/TokenReader.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/*
- *  $Id: TokenReader.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-// include_once 'phing/system/io/Reader.php'; // really this is unrelated to Reader
-include_once 'phing/system/io/IOException.php';
-include_once 'phing/filters/ReplaceTokens.php'; // For class Token
-
-/**
- * Abstract class for TokenReaders.
- * 
- * @author    Manuel Holtgewe
- * @version   $Revision: 1.5 $
- * @package   phing.filters.util
- */
-abstract class TokenReader {
-
-    /**
-     * Reference to the Project the TokenReader is used in.
-     * @var Project 
-     */
-    protected $project;
-
-    /**
-     * Constructor
-     * @param   object  Reference to the project the TokenReader is used in.
-     */
-    function __construct(Project $project) {
-        $this->project = $project;
-    }
-
-    /**
-     * Utility function for logging
-     */
-    function log($level, $msg) {
-        $this->project->log($level, $msg);
-    }
-
-    /**
-     * Reads the next token from the Reader
-     *
-     * @throws IOException - On error
-     * @return string
-     */
-    abstract public function readToken();
-    
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/TokenSource.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/TokenSource.php
deleted file mode 100644
index ccaee637e..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/TokenSource.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-/*
- *  $Id: TokenSource.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
-*/
-
-require_once 'phing/types/DataType.php';
-include_once 'phing/util/StringHelper.php';
-
-/**
- * A parameter is composed of a name, type and value.
- *
- * Example of usage:
- *
- * <replacetokens>
- *   <tokensource classname="phing.filters.util.IniFileTokenReader">
- *     <!-- all params for the TokenReader here -->
- *     <param name="file" value="tokens.ini" />
- *   </tokensource>
- * </replacetokens>
- *
- * or:
- * 
- * <filterreader classname="phing.filters.ReplaceTokens">
- *   <param type="tokensource>
- *     <param name="classname" value="phing.filters.util.IniFileTokenReader" />
- *     <param name="file" value="tokens.ini" />
- *   </param>
- * </filterreader>
- *
- * @author    <a href="mailto:yl@seasonfive.com">Yannick Lecaillez</a>
- * @package   phing.types
- */
-class TokenSource extends DataType {
-
-    /**
-     * String to hold the path to the TokenReader
-     * @var     string
-     */
-    protected $classname = null;
-
-    /**
-     * Array holding parameters for the wrapped TokenReader.
-     * @var array
-     */
-    protected $parameters = array();
-
-    /**
-     * Reference to the TokenReader used by this TokenSource
-     * @var TokenReader
-     */
-    protected $reader;
-
-    /**
-     * Array with key/value pairs of tokens
-     */
-    protected $tokens = array();
-
-    /**
-     * This method is called to load the sources from the reader
-     * into the buffer of the source.
-     */
-    function load() {
-        // Create new Reader
-        if ($this->classname === null) {
-            throw new BuildException("No Classname given to TokenSource.");
-        }
-        
-        $classname = Phing::import($this->classname);        
-        $this->reader = new $classname($this->project);
-
-        // Configure Reader
-        $this->configureTokenReader($this->reader);
-
-        // Load Tokens
-        try {
-            while ($token = $this->reader->readToken()) {
-                $this->tokens[] = $token;
-            }
-        } catch (BuildException $e) {
-            $this->log("Error reading TokenSource: " . $e->getMessage(), Project::MSG_WARN);
-        } catch (IOException $e) {
-            $this->log("Error reading TokenSource: " . $e->getMessage(), Project::MSG_WARN);
-        }
-    }
-
-    /**
-     * This function uses the wrapper to read the tokens and then
-     * returns them.
-     *
-     * @access  public
-     */
-    function getTokens() {
-        if ($this->tokens === null)
-            $this->Load();
-
-        return $this->tokens;
-    }
-
-    /**
-     * Configures a TokenReader with the parameters passed to the
-     * TokenSource.
-     * @param TokenReader $reader
-     */
-    private function configureTokenReader(TokenReader $reader) {
-        $count = count($this->parameters);
-        for ($i = 0; $i < $count; $i++) {
-            $method_name = "Set" . $this->parameters[$i]->getName();
-            $value = $this->parameters[$i]->getValue();
-            $reader->$method_name($value);
-        }
-    }
-    
-    /**
-     * Set the classname (dot-path) to use for handling token replacement.
-     * @param string $c
-     */
-    function setClassname($c) {
-        $this->classname = $c;
-    }
-    
-    /**
-     * Returns the qualified classname (dot-path) to use for handling token replacement.
-     * @return string
-     */
-    function getClassname() {
-        return $this->classname;
-    }
-
-    /**
-     * Create nested <param> tag.
-     * Uses standard name/value Parameter class.
-     * @return Parameter
-     */
-    function createParam() {
-        $num = array_push($this->parameters, new Parameter());
-        return $this->parameters[$num-1];
-    }
-}
-
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/defaults.properties b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/defaults.properties
deleted file mode 100644
index a2d86350b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/defaults.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-# phing default types
-commandline=phing.types.Commandline
-fileset=phing.types.FileSet
-dirset=phing.types.DirSet
-filelist=phing.types.FileList
-patternset=phing.types.PatternSet
-mapper=phing.types.Mapper
-filterchain=phing.types.FilterChain
-filterreader=phing.types.PhingFilterReader
-regexp=phing.types.RegularExpression
-param=phing.types.Parameter
-path=phing.types.Path
-selector=phing.types.selectors.SelectSelector
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/AndSelector.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/AndSelector.php
deleted file mode 100644
index 37c27aa21..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/AndSelector.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/*
- * $Id: AndSelector.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/types/selectors/BaseSelectorContainer.php';
-
-/**
- * This selector has a collection of other selectors, all of which have to
- * select a file in order for this selector to select it.
- *
- * @author Hans Lellelid, hans@xmpl.org (Phing)
- * @author <a href="mailto:bruce@callenish.com">Bruce Atherton</a> (Ant)
- * @package phing.types.selectors
- */
-class AndSelector extends BaseSelectorContainer {
-
-    public function toString() {
-        $buf = "";
-        if ($this->hasSelectors()) {
-            $buf .= "{andselect: ";
-            $buf .= parent::toString();
-            $buf .= "}";
-        }
-        return $buf;
-    }
-
-    /**
-     * Returns true (the file is selected) only if all other selectors
-     * agree that the file should be selected.
-     *
-     * @param basedir the base directory the scan is being done from
-     * @param filename the name of the file to check
-     * @param file a PhingFile object for the filename that the selector
-     * can use
-     * @return whether the file should be selected or not
-     */
-    public function isSelected(PhingFile $basedir, $filename, PhingFile $file) {
-        $this->validate();
-        $selectors = $this->selectorElements();       
-           for($i=0,$size=count($selectors); $i < $size; $i++) {
-            $result = $selectors[$i]->isSelected($basedir, $filename, $file);
-            if (!$result) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/BaseExtendSelector.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/BaseExtendSelector.php
deleted file mode 100644
index aa5f05448..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/BaseExtendSelector.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/*
- * $Id: BaseExtendSelector.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-require_once 'phing/types/selectors/ExtendFileSelector.php';
-require_once 'phing/types/selectors/BaseSelector.php';
-include_once 'phing/types/Parameter.php';
-
-/**
- * Convenience base class for all selectors accessed through ExtendSelector.
- * It provides support for gathering the parameters together as well as for
- * assigning an error message and throwing a build exception if an error is
- * detected.
- *
- * @author Hans Lellelid, hans@xmpl.org (Phing)
- * @author Bruce Atherton, bruce@callenish.com (Ant)
- * @package phing.types.selectors
- */
-abstract class BaseExtendSelector extends BaseSelector implements ExtendFileSelector {
-
-    /** The passed in parameter array. */
-    protected $parameters = null;
-
-    /**
-     * Set all the Parameters for this custom selector, collected by
-     * the ExtendSelector class.
-     *
-     * @param parameters the complete set of parameters for this selector
-     */
-    public function setParameters($parameters) {
-        $this->parameters = $parameters;
-    }
-
-    /**
-     * Allows access to the parameters gathered and set within the
-     * &lt;custom&gt; tag.
-     *
-     * @return the set of parameters defined for this selector
-     */
-    protected function getParameters() {
-        return $this->parameters;
-    }
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/BaseSelector.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/BaseSelector.php
deleted file mode 100644
index a19f3d387..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/BaseSelector.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/*
- * $Id: BaseSelector.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/types/selectors/FileSelector.php';
-
-/**
- * A convenience base class that you can subclass Selectors from. It
- * provides some helpful common behaviour. Note that there is no need
- * for Selectors to inherit from this class, it is only necessary that
- * they implement FileSelector.
- *
- * @author <a href="mailto:bruce@callenish.com">Bruce Atherton</a>
- * @package phing.types.selectors
- */
-abstract class BaseSelector extends DataType implements FileSelector {
-
-    private $errmsg = null;
-
-    /**
-     * Allows all selectors to indicate a setup error. Note that only
-     * the first error message is recorded.
-     *
-     * @param msg The error message any BuildException should throw.
-     */
-    public function setError($msg) {
-        if ($this->errmsg === null) {
-            $this->errmsg = $msg;
-        }
-    }
-
-    /**
-     * Returns any error messages that have been set.
-     *
-     * @return the error condition
-     */
-    public function getError() {
-        return $this->errmsg;
-    }
-
-
-    /**
-     * <p>Subclasses can override this method to provide checking of their
-     * state. So long as they call validate() from isSelected(), this will
-     * be called automatically (unless they override validate()).</p>
-     * <p>Implementations should check for incorrect settings and call
-     * setError() as necessary.</p>
-     */
-    public function verifySettings() {
-    }
-
-    /**
-     * Subclasses can use this to throw the requisite exception
-     * in isSelected() in the case of an error condition.
-     */
-    public function validate() {
-        if ($this->getError() === null) {
-            $this->verifySettings();
-        }
-        if ($this->getError() !== null) {
-            throw new BuildException($this->errmsg);
-        }
-    }   
-
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/BaseSelectorContainer.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/BaseSelectorContainer.php
deleted file mode 100644
index d7591d924..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/BaseSelectorContainer.php
+++ /dev/null
@@ -1,270 +0,0 @@
-<?php
-
-/*
- * $Id: BaseSelectorContainer.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/types/selectors/SelectorContainer.php';
-require_once 'phing/types/selectors/BaseSelector.php';
-
-/**
- * This is the base class for selectors that can contain other selectors.
- *
- * @author <a href="mailto:bruce@callenish.com">Bruce Atherton</a> (Ant)
- * @package phing.types.selectors
- */
-abstract class BaseSelectorContainer extends BaseSelector implements SelectorContainer {
-
-    private $selectorsList = array();
-
-    /**
-     * Indicates whether there are any selectors here.
-     */
-    public function hasSelectors() {
-        return !(empty($this->selectorsList));
-    }
-
-    /**
-     * Gives the count of the number of selectors in this container
-     */
-    public function selectorCount() {
-        return count($this->selectorsList);
-    }
-
-    /**
-     * Returns a copy of the selectors as an array.
-     */
-    public function getSelectors(Project $p) {
-        $result = array();
-        for($i=0,$size=count($this->selectorsList); $i < $size; $i++) {
-            $result[] = clone $this->selectorsList[$i];
-        }
-        return $result;
-    }
-
-    /**
-     * Returns an array for accessing the set of selectors (not a copy).
-     */
-    public function selectorElements() {
-        return $this->selectorsList;
-    }
-
-    /**
-     * Convert the Selectors within this container to a string. This will
-     * just be a helper class for the subclasses that put their own name
-     * around the contents listed here.
-     *
-     * @return comma separated list of Selectors contained in this one
-     */
-    public function toString() {
-        $buf = "";
-        $arr = $this->selectorElements();
-        for($i=0,$size=count($arr); $i < $size; $i++) {
-            $buf .= $arr[$i]->toString() . (isset($arr[$i+1]) ? ', ' : '');
-        }
-        return $buf;
-    }
-
-    /**
-     * Add a new selector into this container.
-     *
-     * @param selector the new selector to add
-     * @return the selector that was added
-     */
-    public function appendSelector(FileSelector $selector) {
-        $this->selectorsList[] = $selector;
-    }
-
-    /**
-     * <p>This implementation validates the container by calling
-     * verifySettings() and then validates each contained selector
-     * provided that the selector implements the validate interface.
-     * </p>
-     * <p>Ordinarily, this will validate all the elements of a selector
-     * container even if the isSelected() method of some elements is
-     * never called. This has two effects:</p>
-     * <ul>
-     * <li>Validation will often occur twice.
-     * <li>Since it is not required that selectors derive from
-     * BaseSelector, there could be selectors in the container whose
-     * error conditions are not detected if their isSelected() call
-     * is never made.
-     * </ul>
-     */
-    public function validate() {
-        $this->verifySettings();
-        $errmsg = $this->getError();
-        if ($errmsg !== null) {
-            throw new BuildException($errmsg);
-        }
-        foreach($this->selectorsList as $o) {
-            if ($o instanceof BaseSelector) {
-                $o->validate();
-            }
-        }    
-    }
-
-    /* Methods below all add specific selectors */
-
-    /**
-     * add a "Select" selector entry on the selector list
-     */
-    public function createSelector() {
-        $o = new SelectSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add an "And" selector entry on the selector list
-     */
-    public function createAnd() {
-        $o = new AndSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add an "Or" selector entry on the selector list
-     */
-    public function createOr() {
-        $o = new OrSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add a "Not" selector entry on the selector list
-     */
-    public function createNot() {
-        $o = new NotSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add a "None" selector entry on the selector list
-     */
-    public function createNone() {
-        $o = new NoneSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add a majority selector entry on the selector list
-     */
-    public function createMajority() {
-        $o = new MajoritySelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add a selector date entry on the selector list
-     */
-    public function createDate() {
-        $o = new DateSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add a selector size entry on the selector list
-     */
-    public function createSize() {
-        $o = new SizeSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add a selector filename entry on the selector list
-     */
-    public function createFilename() {
-        $o = new FilenameSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add an extended selector entry on the selector list
-     */
-    public function createCustom() {
-        $o = new ExtendSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add a contains selector entry on the selector list
-     */
-    public function createContains() {
-        $o = new ContainsSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add a contains selector entry on the selector list
-     */
-    public function createContainsRegexp() {
-        $o = new ContainsRegexpSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add a present selector entry on the selector list
-     */
-    public function createPresent() {
-        $o = new PresentSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add a depth selector entry on the selector list
-     */
-    public function createDepth() {
-        $o = new DepthSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-
-    /**
-     * add a depends selector entry on the selector list
-     */
-    public function createDepend() {
-        $o = new DependSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-    
-    /**
-     * add a type selector entry on the selector list
-     */
-    public function createType() {
-        $o = new TypeSelector();
-        $this->appendSelector($o);
-        return $o;
-    }
-    
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/ContainsRegexpSelector.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/ContainsRegexpSelector.php
deleted file mode 100644
index 0782d161c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/ContainsRegexpSelector.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-
-/*
- * $Id: ContainsRegexpSelector.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/types/selectors/BaseExtendSelector.php';
-include_once 'phing/types/RegularExpression.php';
-
-/**
- * Selector that filters files based on whether they contain a
- * particular string using regexp.
- * 
- * @author    Hans Lellelid <hans@xmpl.org> (Phing)
- * @author    Bruce Atherton <bruce@callenish.com> (Ant)
- * @version   $Revision: 1.3 $
- * @package   phing.types.selectors
- */
-class ContainsRegexpSelector extends BaseExtendSelector {
-
-    /** @var string The expression set from XML. */
-    private $userProvidedExpression;
-    
-    /** @var Regexp */
-    private $myExpression;
-     
-    private $casesensitive = true;
-    
-    /** @var RegularExpression */
-    private $myRegExp;
-    
-    const EXPRESSION_KEY = "expression";
-    
-    const CASE_KEY = "casesensitive";
-    
-    public function toString() {
-        $buf = "{containsregexpselector expression: ";
-        $buf .= $this->userProvidedExpression;
-        $buf .= " casesensitive: ";
-        if ($this->casesensitive) {
-            $buf .= "true";
-        } else {
-            $buf .= "false";
-        }
-        $buf .= "}";
-        return $buf;
-    }
-
-    /**
-     * The expression to match on within a file.
-     *
-     * @param string $exp the string that a file must contain to be selected.
-     */
-    public function setExpression($exp) {
-        $this->userProvidedExpression = $exp;
-    }
-
-    /**
-     * Whether to ignore case in the regex match.
-     *
-     * @param boolean $casesensitive whether to pay attention to case sensitivity
-     */
-    public function setCasesensitive($casesensitive) {
-        $this->casesensitive = $casesensitive;
-    }
-
-    /**
-     * When using this as a custom selector, this method will be called.
-     * It translates each parameter into the appropriate setXXX() call.
-     *
-     * @param array $parameters the complete set of parameters for this selector
-     */
-    public function setParameters($parameters) {
-        parent::setParameters($parameters);
-        if ($parameters !== null) {
-            for ($i=0,$size=count($parameters); $i < $size; $i++) {
-                $paramname = $parameters[$i]->getName();
-                switch(strtolower($paramname)) {
-                    case self::EXPRESSION_KEY:
-                        $this->setExpression($parameters[$i]->getValue());
-                        break;
-                    case self::CASE_KEY:
-                        $this->setCasesensitive($parameters[$i]->getValue());
-                        break;
-                    default:
-                        $this->setError("Invalid parameter " . $paramname);
-                }                
-            } // for each param
-        } // if params
-    }
-
-    /**
-     * Checks to make sure all settings are kosher. In this case, it
-     * means that the pattern attribute has been set.
-     *
-     */
-    public function verifySettings() {
-        if ($this->userProvidedExpression === null) {
-            $this->setError("The expression attribute is required");
-        }
-    }
-
-    /**
-     * The heart of the matter. This is where the selector gets to decide
-     * on the inclusion of a file in a particular fileset.
-     *
-     * @param basedir the base directory the scan is being done from
-     * @param filename is the name of the file to check
-     * @param file a PhingFile object the selector can use
-     * @return whether the file should be selected or not
-     */
-    public function isSelected(PhingFile $basedir, $filename, PhingFile $file) {
-
-        $this->validate();
-
-        if ($file->isDirectory()) {
-            return true;
-        }
-        
-        if ($this->myRegExp === null) {
-            $this->myRegExp = new RegularExpression();
-            $this->myRegExp->setPattern($this->userProvidedExpression);            
-            if (!$this->casesensitive) {
-                $this->myRegExp->setIgnoreCase(true);
-            }
-            $this->myExpression = $this->myRegExp->getRegexp($this->getProject());
-        }
-                        
-        $in = null;
-        try {
-            $in = new BufferedReader(new FileReader($file));        
-            $teststr = $in->readLine();
-            while ($teststr !== null) {
-                if ($this->myExpression->matches($teststr)) {
-                    return true;
-                }
-                $teststr = $in->readLine();
-            }
-            return false;
-        } catch (IOException $ioe) {
-            if ($in) $in->close();
-            throw new BuildException("Could not read file " . $filename);
-        }
-        $in->close();                
-    }
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/ContainsSelector.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/ContainsSelector.php
deleted file mode 100644
index ebcbce4c0..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/ContainsSelector.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-/*
- * $Id: ContainsSelector.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-include_once 'phing/types/selectors/BaseExtendSelector.php';
-
-/**
- * Selector that filters files based on whether they contain a
- * particular string.
- * 
- * @author Hans Lellelid <hans@xmpl.org> (Phing)
- * @author Bruce Atherton <bruce@callenish.com> (Ant)
- * @package phing.types.selectors
- */
-class ContainsSelector extends BaseExtendSelector {
-
-    private $contains = null;
-    private $casesensitive = true;
-    const CONTAINS_KEY = "text";
-    const CASE_KEY = "casesensitive";
-
-    public function toString() {
-        $buf = "{containsselector text: ";
-        $buf .= $this->contains;
-        $buf .= " casesensitive: ";
-        if ($this->casesensitive) {
-            $buf .= "true";
-        } else {
-            $buf .= "false";
-        }
-        $buf .= "}";
-        return $buf;
-    }
-
-    /**
-     * The string to search for within a file.
-     *
-     * @param string $contains the string that a file must contain to be selected.
-     */
-    public function setText($contains) {
-        $this->contains = $contains;
-    }
-
-    /**
-     * Whether to ignore case in the string being searched.
-     *
-     * @param boolean $casesensitive whether to pay attention to case sensitivity
-     */
-    public function setCasesensitive($casesensitive) {
-        $this->casesensitive = $casesensitive;
-    }
-
-    /**
-     * When using this as a custom selector, this method will be called.
-     * It translates each parameter into the appropriate setXXX() call.
-     *
-     * @param array $parameters the complete set of parameters for this selector
-     */
-    public function setParameters($parameters) {
-        parent::setParameters($parameters);
-        if ($parameters !== null) {
-            for ($i=0,$size=count($parameters); $i < $size; $i++) {
-                $paramname = $parameters[$i]->getName();
-                switch(strtolower($paramname)) {
-                    case self::CONTAINS_KEY:
-                        $this->setText($parameters[$i]->getValue());
-                        break;
-                    case self::CASE_KEY:
-                        $this->setCasesensitive($parameters[$i]->getValue());
-                        break;
-                    default:
-                        $this->setError("Invalid parameter " . $paramname);
-                }                
-            } // for each param
-        } // if params
-    }
-
-    /**
-     * Checks to make sure all settings are kosher. In this case, it
-     * means that the pattern attribute has been set.
-     *
-     */
-    public function verifySettings() {
-        if ($this->contains === null) {
-            $this->setError("The text attribute is required");
-        }
-    }
-
-    /**
-     * The heart of the matter. This is where the selector gets to decide
-     * on the inclusion of a file in a particular fileset.
-     *
-     * @param basedir the base directory the scan is being done from
-     * @param filename is the name of the file to check
-     * @param file a PhingFile object the selector can use
-     * @return whether the file should be selected or not
-     */
-    public function isSelected(PhingFile $basedir, $filename, PhingFile $file) {
-
-        $this->validate();
-
-        if ($file->isDirectory()) {
-            return true;
-        }
-
-        $userstr = $this->contains;
-        if (!$this->casesensitive) {
-            $userstr = strtolower($this->contains);
-        }
-        
-        $in = null;
-        try {
-            $in = new BufferedReader(new FileReader($file));        
-            $teststr = $in->readLine();
-            while ($teststr !== null) {
-                if (!$this->casesensitive) {
-                    $teststr = strtolower($teststr);
-                }
-                if (strpos($teststr, $userstr) !== false) {
-                    return true;
-                }
-                $teststr = $in->readLine();
-            }
-            return false;
-        } catch (IOException $ioe) {
-            if ($in) $in->close();
-            throw new BuildException("Could not read file " . $filename);
-        }
-        $in->close();                
-    }
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/DateSelector.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/DateSelector.php
deleted file mode 100644
index f373ab875..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/DateSelector.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-
-/*
- * $Id: DateSelector.php 396 2008-10-15 14:26:00Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/types/selectors/BaseExtendSelector.php';
-
-/**
- * Selector that chooses files based on their last modified date. Ant uses
- * millisecond precision (thanks to Java); PHP is forced to use only seconds
- * precision.
- *
- * @author    Hans Lellelid <hans@xmpl.org> (Phing)
- * @author    Bruce Atherton <bruce@callenish.com> (Ant)
- * @version   $Revision: 1.10 $
- * @package   phing.types.selecctors
- */
-class DateSelector extends BaseExtendSelector {
-
-    private $seconds = -1; // millis in Ant, but PHP doesn't support that level of precision
-    private $dateTime = null;
-    private $includeDirs = false;
-    private $granularity = 0;
-    private $cmp = 2;
-    const MILLIS_KEY = "millis";
-    const DATETIME_KEY = "datetime";
-    const CHECKDIRS_KEY = "checkdirs";
-    const GRANULARITY_KEY = "granularity";
-    const WHEN_KEY = "when";
-    private static $timeComparisons = array("before", "after", "equal");
-    
-    public function __construct() {
-        //if (Os.isFamily("dos")) {
-        //    granularity = 2000;
-        //}
-    }
-
-    public function toString() {
-        $buf = "{dateselector date: ";
-        $buf .= $this->dateTime;
-        $buf .= " compare: ";
-        if ($this->cmp === 0) {
-            $buf .= "before";
-        } elseif ($this->cmp === 1) {
-            $buf .= "after";
-        } else {
-            $buf .= "equal";
-        }
-        $buf .= " granularity: ";
-        $buf .= $this->granularity;
-        $buf .= "}";
-        return $buf;
-    }
-
-    /**
-     * For users that prefer to express time in seconds since 1970
-     *
-     * @param int $seconds the time to compare file's last modified date to,
-     *        expressed in milliseconds
-     */
-    public function setSeconds($seconds) {
-        $this->seconds = (int) $seconds;
-    }
-
-    /**
-     * Returns the seconds value the selector is set for.
-     */
-    public function getSeconds() {
-        return $this->seconds;
-    }
-
-    /**
-     * Sets the date. The user must supply it in MM/DD/YYYY HH:MM AM_PM
-     * format
-     *
-     * @param string $dateTime a string in MM/DD/YYYY HH:MM AM_PM format
-     */
-    public function setDatetime($dateTime) {        
-        $dt = strtotime($dateTime);
-        if ($dt == -1) {
-            $this->setError("Date of " . $dateTime
-                        . " Cannot be parsed correctly. It should be in"
-                        . " a format parsable by PHP's strtotime() function.");
-        } else {        
-            $this->dateTime = $dateTime;
-            $this->setSeconds($dt);
-        }
-    }
-
-    /**
-     * Should we be checking dates on directories?
-     *
-     * @param boolean $includeDirs whether to check the timestamp on directories
-     */
-    public function setCheckdirs($includeDirs) {
-        $this->includeDirs = (boolean) $includeDirs;
-    }
-
-    /**
-     * Sets the number of milliseconds leeway we will give before we consider
-     * a file not to have matched a date.
-     * @param int $granularity
-     */
-    public function setGranularity($granularity) {
-        $this->granularity = (int) $granularity;
-    }
-
-    /**
-     * Sets the type of comparison to be done on the file's last modified
-     * date.
-     *
-     * @param string $cmp The comparison to perform
-     */
-    public function setWhen($cmp) {
-        $idx = array_search($cmp, self::$timeComparisons, true);
-        if ($idx === null) {
-            $this->setError("Invalid value for ".WHEN_KEY.": ".$cmp);
-        } else {
-            $this->cmp = $idx;
-        }
-    }
-
-    /**
-     * When using this as a custom selector, this method will be called.
-     * It translates each parameter into the appropriate setXXX() call.
-     *
-     * @param array $parameters the complete set of parameters for this selector
-     */
-    public function setParameters($parameters) {
-        parent::setParameters($parameters);
-        if ($parameters !== null) {
-            for ($i=0,$size=count($parameters); $i < $size; $i++) {
-                $paramname = $parameters[$i]->getName();
-                switch(strtolower($paramname)) {
-                    case self::MILLIS_KEY:
-                        $this->setMillis($parameters[$i]->getValue());
-                        break;
-                    case self::DATETIME_KEY:
-                        $this->setDatetime($parameters[$i]->getValue());
-                        break;
-                    case self::CHECKDIRS_KEY:
-                        $this->setCheckdirs($parameters[$i]->getValue());
-                        break;                    
-                    case self::GRANULARITY_KEY:
-                        $this->setGranularity($parameters[$i]->getValue());
-                        break;
-                    case self::WHEN_KEY:
-                        $this->setWhen($parameters[$i]->getValue());
-                        break;
-                    default:
-                        $this->setError("Invalid parameter " . $paramname);
-                } // switch
-            }
-        }
-    }
-
-    /**
-     * This is a consistency check to ensure the selector's required
-     * values have been set.
-     */
-    public function verifySettings() {
-        if ($this->dateTime === null && $this->seconds < 0) {
-            $this->setError("You must provide a datetime or the number of "
-                . "seconds.");
-        } elseif ($this->seconds < 0) {
-            $this->setError("Date of " . $this->dateTime
-                . " results in negative seconds"
-                . " value relative to epoch (January 1, 1970, 00:00:00 GMT).");
-        }
-    }
-
-    /**
-     * The heart of the matter. This is where the selector gets to decide
-     * on the inclusion of a file in a particular fileset.
-     *
-     * @param PhingFile $basedir the base directory the scan is being done from
-     * @param string $filename is the name of the file to check
-     * @param PhingFile $file is a PhingFile object the selector can use
-     * @return boolean Whether the file should be selected or not
-     */
-    public function isSelected(PhingFile $basedir, $filename, PhingFile $file) {
-        $this->validate();
-        if ($file->isDirectory() && ($this->includeDirs === false)) {
-            return true;
-        }
-        if ($this->cmp === 0) {
-            return (($file->lastModified() - $this->granularity) < $this->seconds);
-        } elseif ($this->cmp === 1) {
-            return (($file->lastModified() - $this->granularity) > $this->seconds);
-        } else {
-            return (abs($file->lastModified() -  $this->seconds) <= $this->granularity);
-        }
-    }
-
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/DependSelector.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/DependSelector.php
deleted file mode 100644
index 86e7cf6dd..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/DependSelector.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-
-/*
- * $Id: DependSelector.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/types/selectors/BaseSelector.php';
- 
-/**
- * Selector that filters files based on whether they are newer than
- * a matching file in another directory tree. It can contain a mapper
- * element, so isn't available as an ExtendSelector (since those
- * parameters can't hold other elements).
- *
- * @author    Hans Lellelid <hans@xmpl.org> (Phing)
- * @author    Bruce Atherton <bruce@callenish.com> (Ant)
- * @version   $Revision: 1.8 $
- * @package   phing.types.selectors
- */
-class DependSelector extends BaseSelector {
-
-    private $targetdir = null;
-    private $mapperElement = null;
-    private $map = null;
-    private $granularity = 0;
-
-    public function __construct() {
-        // not yet supported:
-        //if (Os.isFamily("dos")) {
-        //    $this->granularity = 2000;
-        //}
-    }
-
-    public function toString() {
-        $buf = "{dependselector targetdir: ";
-        if ($this->targetdir === null) {
-            $buf .= "NOT YET SET";
-        } else {
-            $buf .= $this->targetdir->getName();
-        }        
-        $buf .= " granularity: ";
-        $buf .= $this->granularity;
-        if ($this->map !== null) {
-            $buf .= " mapper: ";
-            $buf .= $this->map->toString();
-        } elseif ($this->mapperElement !== null) {
-            $buf .= " mapper: ";
-            $buf .= $this->mapperElement->toString();
-        }
-        $buf .= "}";
-        return $buf;
-    }
-
-    /**
-     * The name of the file or directory which is checked for out-of-date
-     * files.
-     *
-     * @param targetdir the directory to scan looking for files.
-     */
-    public function setTargetdir(PhingFile $targetdir) {
-        $this->targetdir = $targetdir;
-    }
-
-    /**
-     * Sets the number of milliseconds leeway we will give before we consider
-     * a file out of date.
-     */
-    public function setGranularity($granularity) {
-        $this->granularity = (int) granularity;
-    }
-
-    /**
-     * Defines the FileNameMapper to use (nested mapper element).
-     * @throws BuildException
-     */
-    public function createMapper() {
-        if ($this->mapperElement !== null) {
-            throw new BuildException("Cannot define more than one mapper");
-        }
-        $this->mapperElement = new Mapper($this->project);
-        return $this->mapperElement;
-    }
-
-
-    /**
-     * Checks to make sure all settings are kosher. In this case, it
-     * means that the dest attribute has been set and we have a mapper.
-     */
-    public function verifySettings() {
-        if ($this->targetdir === null) {
-            $this->setError("The targetdir attribute is required.");
-        }
-        if ($this->mapperElement === null) {
-            $this->map = new IdentityMapper();
-        } else {
-            $this->map = $this->mapperElement->getImplementation();
-        }
-        if ($this->map === null) {
-            $this->setError("Could not set <mapper> element.");
-        }
-    }
-
-    /**
-     * The heart of the matter. This is where the selector gets to decide
-     * on the inclusion of a file in a particular fileset.
-     *
-     * @param basedir the base directory the scan is being done from
-     * @param filename is the name of the file to check
-     * @param file is a PhingFile object the selector can use
-     * @return whether the file should be selected or not
-     */
-    public function isSelected(PhingFile $basedir, $filename, PhingFile $file) {
-
-        $this->validate();
-        
-        // Determine file whose out-of-dateness is to be checked
-        $destfiles = $this->map->main($filename);
-        
-        // If filename does not match the To attribute of the mapper
-        // then filter it out of the files we are considering
-        if ($destfiles === null) {
-            return false;
-        }
-        // Sanity check
-        if (count($destfiles) !== 1 || $destfiles[0] === null) {
-            throw new BuildException("Invalid destination file results for " . $this->targetdir . " with filename " . $filename);
-        }
-        $destname = $destfiles[0];
-        $destfile = new PhingFile($this->targetdir, $destname);
-
-        return SelectorUtils::isOutOfDate($file, $destfile, $this->granularity);
-    }
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/DepthSelector.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/DepthSelector.php
deleted file mode 100644
index b23b863db..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/DepthSelector.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-/*
- * $Id: DepthSelector.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-require_once 'phing/types/selectors/BaseExtendSelector.php';
-
-/**
- * Selector that filters files based on the how deep in the directory
- * tree they are.
- *
- * @author    Hans Lellelid <hans@xmpl.org> (Phing)
- * @author    Bruce Atherton <bruce@callenish.com> (Ant)
- * @version   $Revision: 1.7 $
- * @package   phing.types.selectors
- */
-class DepthSelector extends BaseExtendSelector {
-
-    public $min = -1;
-    public $max = -1;
-    const MIN_KEY = "min";
-    const MAX_KEY = "max";
-
-    public function toString() {
-        $buf = "{depthselector min: ";
-        $buf .= $this->min;
-        $buf .= " max: ";
-        $buf .= $this->max;
-        $buf .= "}";
-        return $buf;
-    }
-
-    /**
-     * The minimum depth below the basedir before a file is selected.
-     *
-     * @param min minimum directory levels below basedir to go
-     */
-    public function setMin($min) {
-        $this->min = (int) $min;
-    }
-
-    /**
-     * The minimum depth below the basedir before a file is selected.
-     *
-     * @param min maximum directory levels below basedir to go
-     */
-    public function setMax($max) {
-        $this->max = (int) $max;
-    }
-
-    /**
-     * When using this as a custom selector, this method will be called.
-     * It translates each parameter into the appropriate setXXX() call.
-     *
-     * @param parameters the complete set of parameters for this selector
-     */
-    public function setParameters($parameters) {
-        parent::setParameters($parameters);
-        if ($parameters !== null) {
-            for ($i = 0, $size=count($parameters); $i < $size; $i++) {
-                $paramname = $parameters[$i]->getName();
-                switch(strtolower($paramname)) {
-                    case self::MIN_KEY:
-                        $this->setMin($parameters[$i]->getValue());
-                        break;
-                    case self::MAX_KEY:
-                        $this->setMax($parameters[$i]->getValue());
-                        break;
-                        
-                    default:
-                        $this->setError("Invalud parameter " . $paramname);
-                } // switch                
-            }
-        }
-    }
-
-    /**
-     * Checks to make sure all settings are kosher. In this case, it
-     * means that the max depth is not lower than the min depth.
-     */
-    public function verifySettings() {
-        if ($this->min < 0 && $this->max < 0) {
-            $this->setError("You must set at least one of the min or the " .
-                    "max levels.");
-        }
-        if ($this->max < $this->min && $this->max > -1) {
-            $this->setError("The maximum depth is lower than the minimum.");
-        }
-    }
-
-    /**
-     * The heart of the matter. This is where the selector gets to decide
-     * on the inclusion of a file in a particular fileset. Most of the work
-     * for this selector is offloaded into SelectorUtils, a static class
-     * that provides the same services for both FilenameSelector and
-     * DirectoryScanner.
-     *
-     * @param basedir the base directory the scan is being done from
-     * @param filename is the name of the file to check
-     * @param file is a PhingFile object the selector can use
-     * @return whether the file should be selected or not
-     */
-    public function isSelected(PhingFile $basedir, $filename, PhingFile $file) {
-
-        $this->validate();
-
-        $depth = -1;
-        // If you felt daring, you could cache the basedir absolute path
-        $abs_base = $basedir->getAbsolutePath();
-        $abs_file = $file->getAbsolutePath();
-        
-        $tok_base = explode(DIRECTORY_SEPARATOR, $abs_base);
-        $tok_file = explode(DIRECTORY_SEPARATOR, $abs_file);
-        
-        for($i=0,$size=count($tok_file); $i < $size; $i++) {
-            $filetoken = $tok_file[$i];
-            if (isset($tok_base[$i])) {
-                $basetoken = $tok_base[$i];
-                // Sanity check. Ditch it if you want faster performance
-                if ($basetoken !== $filetoken) {
-                    throw new BuildException("File " . $filename .
-                        " does not appear within " . $abs_base . "directory");
-                }
-            } else { // no more basepath tokens
-                $depth++;
-                if ($this->max > -1 && $depth > $this->max) {
-                    return false;
-                }
-            }
-        }
-        if (isset($tok_base[$i + 1])) {
-            throw new BuildException("File " . $filename .
-                " is outside of " . $abs_base . "directory tree");
-        }
-        if ($this->min > -1 && $depth < $this->min) {
-            return false;
-        }
-        return true;
-    }
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/ExtendFileSelector.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/ExtendFileSelector.php
deleted file mode 100644
index 6f3990bf5..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/ExtendFileSelector.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/*
- * $Id: ExtendFileSelector.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/types/Parameterizable.php';
-require_once 'phing/types/selectors/FileSelector.php';
-
-/**
- * This is the interface to be used by all custom selectors, those that are
- * called through the &lt;custom&gt; tag. It is the amalgamation of two
- * interfaces, the FileSelector and the Paramterizable interface. Note that
- * you will almost certainly want the default behaviour for handling
- * Parameters, so you probably want to use the BaseExtendSelector class
- * as the base class for your custom selector rather than implementing
- * this interface from scratch.
- *
- * @author Hans Lellelid <hans@xmpl.org> (Phing)
- * @author Bruce Atherton <bruce@callenish.com> (Ant)
- * @package phing.types.selectors
- */
-interface ExtendFileSelector extends Parameterizable, FileSelector {
-  // No further methods necessary. This is just an amalgamation of two other
-  // interfaces.
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/ExtendSelector.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/ExtendSelector.php
deleted file mode 100644
index 168199e61..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/ExtendSelector.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-/*
- * $Id: ExtendSelector.php 277 2007-11-01 01:25:23Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-include_once 'phing/util/StringHelper.php';
-
-/**
- * Selector that selects files by forwarding the request on to other classes.
- *
- * TODO - Consider adding Path (phing.types.Path) support to this class
- *         and to the Mappers class.  See Ant versions for implimentation details.
- * 
- * @author Hans Lellelid <hans@xmpl.org> (Phing)
- * @author Bruce Atherton <bruce@callenish.com> (Ant)
- * @package phing.types.selectors
- */
-class ExtendSelector extends BaseSelector {
-
-    private $classname;
-    private $dynselector;
-    private $parameters = array();
-
-    /**
-     * Sets the classname of the custom selector.
-     *
-     * @param classname is the class which implements this selector
-     */
-    public function setClassname($classname) {
-        $this->classname = $classname;
-    }
-
-    /**
-     * Instantiates the identified custom selector class.
-     */
-    public function selectorCreate() {
-        if ($this->classname !== null && $this->classname !== "") {      
-            try {
-                // assume it's fully qualified, import it
-                $cls = Phing::import($this->classname);
-       
-                // make sure class exists
-                if (class_exists($cls)) {
-                    $this->dynselector = new $cls();
-                } else {
-                    $this->setError("Selector " . $this->classname . " not initialized, no such class");
-                }            
-            } catch (Exception $e) {
-                $this->setError("Selector " . $this->classname . " not initialized, could not create class: " . $e->getMessage());
-            }            
-        } else {
-            $this->setError("There is no classname specified");
-        }
-    }
-
-    /**
-     * Create new parameters to pass to custom selector.
-     *
-     * @param p The new Parameter object
-     */
-    public function addParam(Parameter $p) {
-        $this->parameters[] = $p;
-    }
-
-    /**
-     * These are errors specific to ExtendSelector only. If there are
-     * errors in the custom selector, it should throw a BuildException
-     * when isSelected() is called.
-     */
-    public function verifySettings() {
-        // Creation is done here rather than in isSelected() because some
-        // containers may do a validation pass before running isSelected(),
-        // but we need to check for the existence of the created class.
-        if ($this->dynselector === null) {
-            $this->selectorCreate();
-        }
-        
-        if (empty($this->classname)) {
-            $this->setError("The classname attribute is required");
-        } elseif ($this->dynselector === null) {
-            $this->setError("Internal Error: The custom selector was not created");
-        } elseif ( !($this->dynselector instanceof ExtendFileSelector) && (count($this->parameters) > 0)) {
-            $this->setError("Cannot set parameters on custom selector that does not "
-                   . "implement ExtendFileSelector.");
-        }
-    }
-
-
-    /**
-     * Allows the custom selector to choose whether to select a file. This
-     * is also where the Parameters are passed to the custom selector.
-     *
-     * @throws BuildException
-     */
-    public function isSelected(PhingFile $basedir, $filename, PhingFile $file) {
-        
-        $this->validate();
-        
-        if (count($this->parameters) > 0 && $this->dynselector instanceof ExtendFileSelector) {            
-            // We know that dynselector must be non-null if no error message
-            $this->dynselector->setParameters($this->parameters);
-        }
-        return $this->dynselector->isSelected($basedir, $filename, $file);
-    }
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/FileSelector.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/FileSelector.php
deleted file mode 100644
index 45623f5d4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/FileSelector.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/*
- * $Id: FileSelector.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-/**
- * This is the interface to be used by all selectors.
- *
- * @author Hans Lellelid, hans@xmpl.org (Phing)
- * @author Bruce Atherton, bruce@callenish.com (Ant)
- * @package phing.types.selectors
- */
-interface FileSelector {
-
-    /**
-     * Method that each selector will implement to create their
-     * selection behaviour. If there is a problem with the setup
-     * of a selector, it can throw a BuildException to indicate
-     * the problem.
-     *
-     * @param basedir A PhingFile object for the base directory
-     * @param filename The name of the file to check
-     * @param file A PhingFile object for this filename
-     * @return whether the file should be selected or not
-     * @throws BuildException if the selector was not configured correctly
-     */
-    public function isSelected(PhingFile $basedir, $filename, PhingFile $file);
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/FilenameSelector.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/FilenameSelector.php
deleted file mode 100644
index c15893e62..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/FilenameSelector.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-
-/*
- * $Id: FilenameSelector.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-
-include_once 'phing/types/selectors/BaseExtendSelector.php';
-
-/**
- * Selector that filters files based on the filename.
- *
- * @author Hans Lellelid, hans@xmpl.org (Phing)
- * @author Bruce Atherton, bruce@callenish.com (Ant)
- * @package phing.types.selectors
- */
-class FilenameSelector extends BaseExtendSelector {
-
-    private $pattern = null;
-    private $casesensitive = true;
-    private $negated = false;
-    const NAME_KEY = "name";
-    const CASE_KEY = "casesensitive";
-    const NEGATE_KEY = "negate";
-
-    public function toString() {
-        $buf = "{filenameselector name: ";
-        $buf .= $this->pattern;
-        $buf .= " negate: ";
-        if ($this->negated) {
-            $buf .= "true";
-        } else {
-            $buf .= "false";
-        }
-        $buf .= " casesensitive: ";
-        if ($this->casesensitive) {
-            $buf .= "true";
-        } else {
-            $buf .= "false";
-        }
-        $buf .= "}";
-        return $buf;
-    }
-
-    /**
-     * The name of the file, or the pattern for the name, that
-     * should be used for selection.
-     *
-     * @param pattern the file pattern that any filename must match
-     *                against in order to be selected.
-     */
-    public function setName($pattern) {
-        $pattern = str_replace('\\', DIRECTORY_SEPARATOR, $pattern);
-        $pattern = str_replace('/', DIRECTORY_SEPARATOR, $pattern);
-                
-        if (StringHelper::endsWith(DIRECTORY_SEPARATOR, $pattern)) {
-            $pattern .= "**";
-        }
-        $this->pattern = $pattern;
-    }
-
-    /**
-     * Whether to ignore case when checking filenames.
-     *
-     * @param casesensitive whether to pay attention to case sensitivity
-     */
-    public function setCasesensitive($casesensitive) {
-        $this->casesensitive = $casesensitive;
-    }
-
-    /**
-     * You can optionally reverse the selection of this selector,
-     * thereby emulating an &lt;exclude&gt; tag, by setting the attribute
-     * negate to true. This is identical to surrounding the selector
-     * with &lt;not&gt;&lt;/not&gt;.
-     *
-     * @param negated whether to negate this selection
-     */
-    public function setNegate($negated) {
-        $this->negated = $negated;
-    }
-
-    /**
-     * When using this as a custom selector, this method will be called.
-     * It translates each parameter into the appropriate setXXX() call.
-     *
-     * @param array $parameters the complete set of parameters for this selector
-     */
-    public function setParameters($parameters) {
-        parent::setParameters($parameters);
-        if ($parameters !== null) {
-            for ($i=0, $len=count($parameters); $i < $len; $i++) {
-                $paramname = $parameters[$i]->getName();
-                switch(strtolower($paramname)) {
-                    case self::NAME_KEY:
-                        $this->setName($parameters[$i]->getValue());
-                        break;
-                    case self::CASE_KEY:
-                        $this->setCasesensitive($parameters[$i]->getValue());
-                        break;
-                    case self::NEGATE_KEY:
-                        $this->setNegate($parameters[$i]->getValue());
-                        break;
-                    default:
-                        $this->setError("Invalid parameter " . $paramname);
-                }
-            } // for each param
-        } // if params
-    }
-
-    /**
-     * Checks to make sure all settings are kosher. In this case, it
-     * means that the name attribute has been set.
-     *
-     */
-    public function verifySettings() {
-        if ($this->pattern === null) {
-            $this->setError("The name attribute is required");
-        }
-    }
-
-    /**
-     * The heart of the matter. This is where the selector gets to decide
-     * on the inclusion of a file in a particular fileset. Most of the work
-     * for this selector is offloaded into SelectorUtils, a static class
-     * that provides the same services for both FilenameSelector and
-     * DirectoryScanner.
-     *
-     * @param basedir the base directory the scan is being done from
-     * @param filename is the name of the file to check
-     * @param file is a PhingFile object the selector can use
-     * @return whether the file should be selected or not
-     */
-    public function isSelected(PhingFile $basedir, $filename, PhingFile $file) {
-        $this->validate();
-        return (SelectorUtils::matchPath($this->pattern, $filename, $this->casesensitive) 
-            === !($this->negated));
-    }
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/MajoritySelector.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/MajoritySelector.php
deleted file mode 100644
index f53f6f740..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/MajoritySelector.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-/*
- * $Id: MajoritySelector.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-
-/**
- * This selector is here just to shake up your thinking a bit. Don't get
- * too caught up in boolean, there are other ways you can evaluate a
- * collection of selectors. This one takes a vote of the selectors it
- * contains, and majority wins. You could also have an "all-but-one"
- * selector, a "weighted-average" selector, and so on. These are left
- * as exercises for the reader (as are the usecases where this would
- * be necessary).
- *
- * @author Hans Lellelid <hans@xmpl.org> (Phing)
- * @author Bruce Atherton <bruce@callenish.com> (Ant)
- * @package phing.types.selectors
- */
-class MajoritySelector extends BaseSelectorContainer {
-
-    private $allowtie = true;
-
-    public function toString() {
-        $buf = "";
-        if ($this->hasSelectors()) {
-            $buf .= "{majorityselect: ";
-            $buf .= parent::toString();
-            $buf .= "}";
-        }
-        return $buf;
-    }
-
-    public function setAllowtie($tiebreaker) {
-        $this->allowtie = $tiebreaker;
-    }
-
-    /**
-     * Returns true (the file is selected) if most of the other selectors
-     * agree. In case of a tie, go by the allowtie setting. That defaults
-     * to true, meaning in case of a tie, the file is selected.
-     *
-     * @param basedir the base directory the scan is being done from
-     * @param filename is the name of the file to check
-     * @param file is a PhingFile object for the filename that the selector
-     * can use
-     * @return whether the file should be selected or not
-     */
-    public function isSelected(PhingFile $basedir, $filename, PhingFile $file) {
-        
-        $this->validate();
-        
-        $yesvotes = 0;
-        $novotes = 0;
-        
-        $selectors = $this->selectorElements();
-        for($i=0,$size=count($selectors); $i < $size; $i++) {
-            $result = $selectors[$i]->isSelected($basedir,$filename,$file);
-            if ($result) {
-                $yesvotes = $yesvotes + 1;
-            } else {
-                $novotes = $novotes + 1;
-            }
-        }
-        if ($yesvotes > $novotes) {
-            return true;
-        }
-        else if ($novotes > $yesvotes) {
-            return false;
-        }
-        // At this point, we know we have a tie.
-        return $this->allowtie;
-    }
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/NoneSelector.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/NoneSelector.php
deleted file mode 100644
index 355623363..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/NoneSelector.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/*
- * $Id: NoneSelector.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-require_once 'phing/types/selectors/BaseSelectorContainer.php';
-
-/**
- * This selector has a collection of other selectors. All of those selectors
- * must refuse to select a file before the file is considered selected by
- * this selector.
- *
- * @author Hans Lellelid <hans@xmpl.org>
- * @author Bruce Atherton <bruce@callenish.com> (Ant)
- * @package phing.types.selectors
- */
-class NoneSelector extends BaseSelectorContainer {
-
-    public function toString() {
-        $buf = "";
-        if ($this->hasSelectors()) {
-            $buf .= "{noneselect: ";
-            $buf .= parent::toString();
-            $buf .= "}";
-        }
-        return $buf;
-    }
-
-    /**
-     * Returns true (the file is selected) only if all other selectors
-     * agree that the file should not be selected.
-     *
-     * @param basedir the base directory the scan is being done from
-     * @param filename is the name of the file to check
-     * @param file is a java.io.File object for the filename that the selector
-     * can use
-     * @return whether the file should be selected or not
-     */
-    public function isSelected(PhingFile $basedir, $filename, PhingFile $file) {
-        
-        $this->validate();
-        
-        $selectors = $this->selectorElements();        
-
-        for($i=0,$size=count($selectors); $i < $size; $i++) {
-            $result = $selectors[$i]->isSelected($basedir, $filename, $file);
-            if ($result) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/NotSelector.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/NotSelector.php
deleted file mode 100644
index b9680b8d0..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/NotSelector.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/*
- * $Id: NotSelector.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/types/selectors/NoneSelector.php';
-
-/**
- * This selector has one other selectors whose meaning it inverts. It
- * actually relies on NoneSelector for its implementation of the
- * isSelected() method, but it adds a check to ensure there is only one
- * other selector contained within.
- *
- * @author Hans Lellelid <hans@xmpl.org> (Phing)
- * @author Bruce Atherton <bruce@callenish.com> (Ant)
- * @package phing.types.selectors
- */
-class NotSelector extends NoneSelector {
-
-    public function toString() {
-        $buf = "";
-        if ($this->hasSelectors()) {
-            $buf .= "{notselect: ";
-            $buf .= parent::toString();
-            $buf .= "}";
-        }
-        return $buf;
-    }
-
-    /**
-     * Makes sure that there is only one entry, sets an error message if
-     * not.
-     */
-    public function verifySettings() {
-        if ($this->selectorCount() != 1) {
-            $this->setError("One and only one selector is allowed within the " .
-                    "<not> tag");
-        }
-    }
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/OrSelector.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/OrSelector.php
deleted file mode 100644
index ca8cb8bef..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/OrSelector.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/*
- * $Id: OrSelector.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/types/selectors/BaseSelectorContainer.php';
- 
-/**
- * This selector has a collection of other selectors, any of which have to
- * select a file in order for this selector to select it.
- *
- * @author Hans Lellelid <hans@xmpl.org> (Phing)
- * @author Bruce Atherton <bruce@callenish.com> (Ant)
- * @package phing.types.selectors
- */
-class OrSelector extends BaseSelectorContainer {
-
-    public function toString() {
-        $buf = "";
-        if ($this->hasSelectors()) {
-            $buf .= "{orselect: ";
-            $buf .= parent::toString();
-            $buf .= "}";
-        }
-        return $buf;
-    }
-
-    /**
-     * Returns true (the file is selected) if any of the other selectors
-     * agree that the file should be selected.
-     *
-     * @param basedir the base directory the scan is being done from
-     * @param filename the name of the file to check
-     * @param file a PhingFile object for the filename that the selector
-     * can use
-     * @return boolean Whether the file should be selected or not
-     */
-    public function isSelected(PhingFile $basedir, $filename, PhingFile $file) {
-        
-        $this->validate();
-        
-        $selectors = $this->selectorElements();
-
-        // First, check that all elements are correctly configured
-        
-        for($i=0,$size=count($selectors); $i < $size; $i++) {
-            $result = $selectors[$i]->isSelected($basedir, $filename, $file);
-            if ($result) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/PresentSelector.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/PresentSelector.php
deleted file mode 100644
index 563ce9a05..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/PresentSelector.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-/*
- * $Id: PresentSelector.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-/**
- * Selector that filters files based on whether they appear in another
- * directory tree. It can contain a mapper element, so isn't available
- * as an ExtendSelector (since those parameters can't hold other
- * elements).
- *
- * @author Hans Lellelid <hans@xmpl.org> (Phing)
- * @author Bruce Atherton <bruce@callenish.com> (Ant)
- * @package phing.types.selectors
- */
-class PresentSelector extends BaseSelector {
-
-    private $targetdir = null;
-    private $mapperElement = null;
-    private $map = null;
-    private $destmustexist = true;
-    private static $filePresence = array("srconly", "both");
-    
-    public function toString() {
-        $buf = "{presentselector targetdir: ";
-        if ($this->targetdir === null) {
-            $buf .= "NOT YET SET";
-        } else {
-            $buf .= $this->targetdir->getName();
-        }
-        $buf .= " present: ";
-        if ($this->destmustexist) {
-            $buf .= "both";
-        } else {
-            $buf .= "srconly";
-        }
-        if ($this->map !== null) {
-            $buf .= $this->map->toString();
-        } elseif ($this->mapperElement !== null) {
-            $buf .= $this->mapperElement->toString();
-        }
-        $buf .= "}";
-        return $buf;
-    }
-
-    /**
-     * The name of the file or directory which is checked for matching
-     * files.
-     *
-     * @param targetdir the directory to scan looking for matching files.
-     */
-    public function setTargetdir(PhingFile $targetdir) {
-        $this->targetdir = $targetdir;
-    }
-
-    /**
-     * Defines the FileNameMapper to use (nested mapper element).
-     * @throws BuildException 
-     */
-    public function createMapper() {
-        if ($this->mapperElement !== null) {
-            throw new BuildException("Cannot define more than one mapper");
-        }
-        $this->mapperElement = new Mapper($this->getProject());
-        return $this->mapperElement;
-    }
-
-
-    /**
-     * This sets whether to select a file if its dest file is present.
-     * It could be a <code>negate</code> boolean, but by doing things
-     * this way, we get some documentation on how the system works.
-     * A user looking at the documentation should clearly understand
-     * that the ONLY files whose presence is being tested are those
-     * that already exist in the source directory, hence the lack of
-     * a <code>destonly</code> option.
-     *
-     * @param string $fp An attribute set to either <code>srconly</code or
-     *           ><code>both</code>.
-     */
-    public function setPresent($fp) {
-        $idx = array_search($fp, self::$filePresence, true);
-        if ( $idx === 0 ) {
-            $this->destmustexist = false;
-        }
-    }
-
-    /**
-     * Checks to make sure all settings are kosher. In this case, it
-     * means that the targetdir attribute has been set and we have a mapper.
-     */
-    public function verifySettings() {
-        if ($this->targetdir === null) {
-            $this->setError("The targetdir attribute is required.");
-        }
-        if ($this->mapperElement === null) {
-            $this->map = new IdentityMapper();
-        } else {
-            $this->map = $this->mapperElement->getImplementation();
-        }
-        if ($this->map === null) {
-            $this->setError("Could not set <mapper> element.");
-        }
-    }
-
-    /**
-     * The heart of the matter. This is where the selector gets to decide
-     * on the inclusion of a file in a particular fileset.
-     *
-     * @param basedir the base directory the scan is being done from
-     * @param filename is the name of the file to check
-     * @param file is a PhingFile object the selector can use
-     * @return whether the file should be selected or not
-     */
-    public function isSelected(PhingFile $basedir, $filename, PhingFile $file) {
-
-        $this->validate();
-
-        // Determine file whose existence is to be checked
-        $destfiles = $this->map->main($filename);
-        // If filename does not match the To attribute of the mapper
-        // then filter it out of the files we are considering
-        if ($destfiles === null) {
-            return false;
-        }
-        // Sanity check
-        if (count($destfiles) !== 1 || $destfiles[0] === null) {
-            throw new BuildException("Invalid destination file results for "
-                . $this->targetdir . " with filename " . $filename);
-        }
-        $destname = $destfiles[0];
-        $destfile = new PhingFile($this->targetdir, $destname);
-        return $destfile->exists() === $this->destmustexist;
-    }
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/SelectSelector.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/SelectSelector.php
deleted file mode 100644
index c04cd66e3..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/SelectSelector.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-/*
- * $Id: SelectSelector.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/types/selectors/AndSelector.php';
-
-/**
- * This selector just holds one other selector and forwards all
- * requests to it. It exists so that there is a single selector
- * type that can exist outside of any targets, as an element of
- * project. It overrides all of the reference stuff so that it
- * works as expected. Note that this is the only selector you
- * can reference.
- *
- * @author    Hans Lellelid <hans@xmpl.org> (Phing)
- * @author    Bruce Atherton <bruce@callenish.com> (Ant)
- * @version   $Revision: 1.6 $
- * @package   phing.types.selectors
- */
-class SelectSelector extends AndSelector {
-         
-    public function toString() {
-        $buf = "";
-        if ($this->hasSelectors()) {
-            $buf .= "{select: ";
-            $buf .= parent::toString();
-            $buf .= "}";
-        }
-        return $buf;
-    }
-
-    /**
-     * Performs the check for circular references and returns the
-     * referenced Selector.
-     */
-    private function getRef() {
-        $o = $this->getCheckedRef(get_class($this), "SelectSelector");
-        return $o;
-    }
-
-    /**
-     * Indicates whether there are any selectors here.
-     */
-    public function hasSelectors() {
-        if ($this->isReference()) {
-            return $this->getRef()->hasSelectors();
-        }
-        return parent::hasSelectors();
-    }
-
-    /**
-     * Gives the count of the number of selectors in this container
-     */
-    public function selectorCount() {
-        if ($this->isReference()) {
-            return $this->getRef()->selectorCount();
-        }
-        return parent::selectorCount();
-    }
-
-    /**
-     * Returns the set of selectors as an array.
-     */
-    public function getSelectors(Project $p) {
-        if ($this->isReference()) {
-            return $this->getRef()->getSelectors($p);
-        }
-        return parent::getSelectors($p);
-    }
-
-    /**
-     * Returns an enumerator for accessing the set of selectors.
-     */
-    public function selectorElements() {
-        if ($this->isReference()) {
-            return $this->getRef()->selectorElements();
-        }
-        return parent::selectorElements();
-    }
-
-    /**
-     * Add a new selector into this container.
-     *
-     * @param selector the new selector to add
-     * @return the selector that was added
-     */
-    public function appendSelector(FileSelector $selector) {
-        if ($this->isReference()) {
-            throw $this->noChildrenAllowed();
-        }
-        parent::appendSelector($selector);
-    }
-
-    /**
-     * Makes sure that there is only one entry, sets an error message if
-     * not.
-     */
-    public function verifySettings() {
-        if ($this->selectorCount() != 1) {
-            $this->setError("One and only one selector is allowed within the "
-            . "<selector> tag");
-        }
-    }
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/SelectorContainer.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/SelectorContainer.php
deleted file mode 100644
index 9fd21dc05..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/SelectorContainer.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-
-/*
- * $Id: SelectorContainer.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-
-/**
- * This is the interface for selectors that can contain other selectors.
- *
- * @author <a href="mailto:bruce@callenish.com">Bruce Atherton</a>
- * @package phing.types.selectors
- */
-interface SelectorContainer {
-
-    /**
-     * Indicates whether there are any selectors here.
-     *
-     * @return whether any selectors are in this container
-     */
-    public function hasSelectors();
-
-    /**
-     * Gives the count of the number of selectors in this container
-     *
-     * @return the number of selectors in this container
-     */
-    public function selectorCount();
-
-    /**
-     * Returns a *copy* of the set of selectors as an array.
-     *
-     * @return an array of selectors in this container
-     */
-    public function getSelectors(Project $p);
-
-    /**
-     * Returns an array for accessing the set of selectors.
-     *
-     * @return an enumerator that goes through each of the selectors
-     */
-    public function selectorElements();
-
-    /**
-     * Add a new selector into this container.
-     *
-     * @param selector the new selector to add
-     * @return the selector that was added
-     */
-    public function appendSelector(FileSelector $selector);
-
-    /* Methods below all add specific selectors */
-
-    /**
-     * add a "Select" selector entry on the selector list
-     */
-    public function createSelector();
-
-    /**
-     * add an "And" selector entry on the selector list
-     */
-    public function createAnd();
-
-    /**
-     * add an "Or" selector entry on the selector list
-     */
-    public function createOr();
-
-    /**
-     * add a "Not" selector entry on the selector list
-     */
-    public function createNot();
-
-    /**
-     * add a "None" selector entry on the selector list
-     */
-    public function createNone();
-
-    /**
-     * add a majority selector entry on the selector list
-     */
-    public function createMajority();
-
-    /**
-     * add a selector date entry on the selector list
-     */
-    public function createDate();
-
-    /**
-     * add a selector size entry on the selector list
-     */
-    public function createSize();
-
-    /**
-     * add a selector filename entry on the selector list
-     */
-    public function createFilename();
-
-    /**
-     * add an extended selector entry on the selector list
-     */
-    public function createCustom();
-
-    /**
-     * add a contains selector entry on the selector list
-     */
-    public function createContains();
-
-    /**
-     * add a present selector entry on the selector list
-     */
-    public function createPresent();
-
-    /**
-     * add a depth selector entry on the selector list
-     */
-    public function createDepth();
-
-    /**
-     * add a depends selector entry on the selector list
-     */
-    public function createDepend();
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/SelectorScanner.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/SelectorScanner.php
deleted file mode 100644
index aa2234f6e..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/SelectorScanner.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/*
- * $Id: SelectorScanner.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-
-/**
- * An interface used to describe the actions required by any type of
- * directory scanner that supports Selecters.
- *
- * @author Hans Lellelid <hans@xmpl.org> (Phing)
- * @author Bruce Atherton <bruce@callenish.com> (Ant)
- * @package phing.types.selectors
- */
-interface SelectorScanner {
-
-    /**
-     * Sets the selectors the scanner should use.
-     *
-     * @param selectors the list of selectors
-     */
-    public function setSelectors($selectors);
-
-    /**
-     * Directories which were selected out of a scan.
-     *
-     * @param selectors list selector objects
-     */
-    public function getDeselectedDirectories();
-
-    /**
-     * Files which were selected out of a scan.
-     *
-     * @param selectors list selector objects
-     */
-    public function getDeselectedFiles();
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/SelectorUtils.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/SelectorUtils.php
deleted file mode 100644
index b77dcbf5b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/SelectorUtils.php
+++ /dev/null
@@ -1,440 +0,0 @@
-<?php
-
-/*
- * $Id: SelectorUtils.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
- 
-include_once 'phing/util/StringHelper.php';
-
-/**
- * <p>This is a utility class used by selectors and DirectoryScanner. The
- * functionality more properly belongs just to selectors, but unfortunately
- * DirectoryScanner exposed these as protected methods. Thus we have to
- * support any subclasses of DirectoryScanner that may access these methods.
- * </p>
- * <p>This is a Singleton.</p>
- *
- * @author Hans Lellelid, hans@xmpl.org (Phing)
- * @author Arnout J. Kuiper, ajkuiper@wxs.nl (Ant)
- * @author Magesh Umasankar
- * @author Bruce Atherton, bruce@callenish.com (Ant)
- * @package phing.types.selectors
- */
-class SelectorUtils {
-
-    private static $instance;
-
-     /**
-      * Retrieves the instance of the Singleton.
-      */
-    public static function getInstance() {
-        if (!isset(self::$instance)) {
-            self::$instance = new SelectorUtils();
-        }
-        return self::$instance;
-    }
-
-    /**
-     * Tests whether or not a given path matches the start of a given
-     * pattern up to the first "**".
-     * <p>
-     * This is not a general purpose test and should only be used if you
-     * can live with false positives. For example, <code>pattern=**\a</code>
-     * and <code>str=b</code> will yield <code>true</code>.
-     *
-     * @param pattern The pattern to match against. Must not be
-     *                <code>null</code>.
-     * @param str     The path to match, as a String. Must not be
-     *                <code>null</code>.
-     * @param isCaseSensitive Whether or not matching should be performed
-     *                        case sensitively.
-     *
-     * @return whether or not a given path matches the start of a given
-     * pattern up to the first "**".
-     */
-    public static function matchPatternStart($pattern, $str, $isCaseSensitive = true) {
-
-        // When str starts with a DIRECTORY_SEPARATOR, pattern has to start with a
-        // DIRECTORY_SEPARATOR.
-        // When pattern starts with a DIRECTORY_SEPARATOR, str has to start with a
-        // DIRECTORY_SEPARATOR.
-        if (StringHelper::startsWith(DIRECTORY_SEPARATOR, $str) !==
-            StringHelper::startsWith(DIRECTORY_SEPARATOR, $pattern)) {
-            return false;
-        }
-
-        $patDirs = explode(DIRECTORY_SEPARATOR, $pattern);
-        $strDirs = explode(DIRECTORY_SEPARATOR, $str);
-
-        $patIdxStart = 0;
-        $patIdxEnd   = count($patDirs)-1;
-        $strIdxStart = 0;
-        $strIdxEnd   = count($strDirs)-1;
-
-        // up to first '**'
-        while ($patIdxStart <= $patIdxEnd && $strIdxStart <= $strIdxEnd) {
-            $patDir = $patDirs[$patIdxStart];
-            if ($patDir == "**") {
-                break;
-            }
-            if (!self::match($patDir, $strDirs[$strIdxStart], $isCaseSensitive)) {
-                return false;
-            }
-            $patIdxStart++;
-            $strIdxStart++;
-        }
-
-        if ($strIdxStart > $strIdxEnd) {
-            // String is exhausted
-            return true;
-        } elseif ($patIdxStart > $patIdxEnd) {
-            // String not exhausted, but pattern is. Failure.
-            return false;
-        } else {
-            // pattern now holds ** while string is not exhausted
-            // this will generate false positives but we can live with that.
-            return true;
-        }
-    }
-    
-    /**
-     * Tests whether or not a given path matches a given pattern.
-     *
-     * @param pattern The pattern to match against. Must not be
-     *                <code>null</code>.
-     * @param str     The path to match, as a String. Must not be
-     *                <code>null</code>.
-     * @param isCaseSensitive Whether or not matching should be performed
-     *                        case sensitively.
-     *
-     * @return <code>true</code> if the pattern matches against the string,
-     *         or <code>false</code> otherwise.
-     */
-    public static function matchPath($pattern, $str, $isCaseSensitive = true) {
-    
-        // When str starts with a DIRECTORY_SEPARATOR, pattern has to start with a
-        // DIRECTORY_SEPARATOR.
-        // When pattern starts with a DIRECTORY_SEPARATOR, str has to start with a
-        // DIRECTORY_SEPARATOR.
-        if (StringHelper::startsWith(DIRECTORY_SEPARATOR, $str) !==
-            StringHelper::startsWith(DIRECTORY_SEPARATOR, $pattern)) {
-            return false;
-        }
-
-        $patDirs = explode(DIRECTORY_SEPARATOR, $pattern);
-        $strDirs = explode(DIRECTORY_SEPARATOR, $str);
-
-        $patIdxStart = 0;
-        $patIdxEnd   = count($patDirs)-1;
-        $strIdxStart = 0;
-        $strIdxEnd   = count($strDirs)-1;
-        
-        // up to first '**'
-        while ($patIdxStart <= $patIdxEnd && $strIdxStart <= $strIdxEnd) {
-            $patDir = $patDirs[$patIdxStart];
-            if ($patDir == "**") {
-                break;
-            }
-            if (!self::match($patDir, $strDirs[$strIdxStart], $isCaseSensitive)) {
-                return false;
-            }
-            $patIdxStart++;
-            $strIdxStart++;
-        }
-        if ($strIdxStart > $strIdxEnd) {
-            // String is exhausted
-            for ($i=$patIdxStart; $i <= $patIdxEnd; $i++) {
-                if ($patDirs[$i] != "**") {
-                    return false;
-                }
-            }
-            return true;
-        } elseif ($patIdxStart > $patIdxEnd) {
-            // String not exhausted, but pattern is. Failure.
-            return false;
-        }
-
-        // up to last '**'
-        while ($patIdxStart <= $patIdxEnd && $strIdxStart <= $strIdxEnd) {
-            $patDir = $patDirs[$patIdxEnd];
-            if ($patDir == "**") {
-                break;
-            }
-            if (!self::match($patDir, $strDirs[$strIdxEnd], $isCaseSensitive)) {
-                return false;
-            }
-            $patIdxEnd--;
-            $strIdxEnd--;
-        }
-        
-        if ($strIdxStart > $strIdxEnd) {
-            // String is exhausted
-            for ($i = $patIdxStart; $i <= $patIdxEnd; $i++) {
-                if ($patDirs[$i] != "**") {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        while ($patIdxStart != $patIdxEnd && $strIdxStart <= $strIdxEnd) {
-            $patIdxTmp = -1;
-            for ($i = $patIdxStart+1; $i <= $patIdxEnd; $i++) {
-                if ($patDirs[$i] == "**") {
-                    $patIdxTmp = $i;
-                    break;
-                }
-            }
-            if ($patIdxTmp == $patIdxStart+1) {
-                // '**/**' situation, so skip one
-                $patIdxStart++;
-                continue;
-            }
-            // Find the pattern between padIdxStart & padIdxTmp in str between
-            // strIdxStart & strIdxEnd
-            $patLength = ($patIdxTmp-$patIdxStart-1);
-            $strLength = ($strIdxEnd-$strIdxStart+1);
-            $foundIdx  = -1;
-
-            //strLoop:    (start of outer loop)
-            for ($i=0; $i <= $strLength - $patLength; $i++) {                
-                for ($j = 0; $j < $patLength; $j++) {
-                    $subPat = $patDirs[$patIdxStart+$j+1];
-                    $subStr = $strDirs[$strIdxStart+$i+$j];
-                    if (!self::match($subPat, $subStr, $isCaseSensitive)) {
-                        continue 2; // continue up two levels (to strLoop:)
-                    }
-                }                                
-                $foundIdx = $strIdxStart+$i; // only reached if all sub patterns matched
-                break;
-            }
-
-            if ($foundIdx == -1) {
-                return false;
-            }
-
-            $patIdxStart = $patIdxTmp;
-            $strIdxStart = $foundIdx + $patLength;
-        }
-
-        for ($i = $patIdxStart; $i <= $patIdxEnd; $i++) {
-            if ($patDirs[$i] != "**") {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Tests whether or not a string matches against a pattern.
-     * The pattern may contain two special characters:<br>
-     * '*' means zero or more characters<br>
-     * '?' means one and only one character
-     *
-     * @param pattern The pattern to match against.
-     *                Must not be <code>null</code>.
-     * @param str     The string which must be matched against the pattern.
-     *                Must not be <code>null</code>.
-     * @param isCaseSensitive Whether or not matching should be performed
-     *                        case sensitively.
-     *
-     *
-     * @return <code>true</code> if the string matches against the pattern,
-     *         or <code>false</code> otherwise.
-     */
-    public static function match($pattern, $str, $isCaseSensitive = true) {
-    
-        $patArr = StringHelper::toCharArray($pattern);
-        $strArr = StringHelper::toCharArray($str);
-        $patIdxStart = 0;
-        $patIdxEnd   = count($patArr)-1;
-        $strIdxStart = 0;
-        $strIdxEnd   = count($strArr)-1;
-        
-        $containsStar = false;
-        for ($i = 0, $size=count($patArr); $i < $size; $i++) {
-            if ($patArr[$i] == '*') {
-                $containsStar = true;
-                break;
-            }
-        }
-
-        if (!$containsStar) {
-            // No '*'s, so we make a shortcut
-            if ($patIdxEnd != $strIdxEnd) {
-                return false; // Pattern and string do not have the same size
-            }
-            for ($i = 0; $i <= $patIdxEnd; $i++) {
-                $ch = $patArr[$i];
-                if ($ch != '?') {
-                    if ($isCaseSensitive && $ch !== $strArr[$i]) {
-                        return false;// Character mismatch
-                    }
-                    if (!$isCaseSensitive && strtoupper($ch) !==
-                        strtoupper($strArr[$i])) {
-                        return false; // Character mismatch
-                    }
-                }
-            }
-            return true; // String matches against pattern
-        }
-
-        if ($patIdxEnd == 0) {
-            return true; // Pattern contains only '*', which matches anything
-        }
-
-        // Process characters before first star
-        while(($ch = $patArr[$patIdxStart]) != '*' && $strIdxStart <= $strIdxEnd) {
-            if ($ch != '?') {
-                if ($isCaseSensitive && $ch !== $strArr[$strIdxStart]) {
-                    return false;// Character mismatch
-                }
-                if (!$isCaseSensitive && strtoupper($ch) !==
-                    strtoupper($strArr[$strIdxStart])) {
-                    return false;// Character mismatch
-                }
-            }
-            $patIdxStart++;
-            $strIdxStart++;
-        }
-        
-        if ($strIdxStart > $strIdxEnd) {
-            // All characters in the string are used. Check if only '*'s are
-            // left in the pattern. If so, we succeeded. Otherwise failure.
-            for ($i = $patIdxStart; $i <= $patIdxEnd; $i++) {
-                if ($patArr[$i] != '*') {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        // Process characters after last star
-        while(($ch = $patArr[$patIdxEnd]) != '*' && $strIdxStart <= $strIdxEnd) {
-            if ($ch != '?') {
-                if ($isCaseSensitive && $ch !== $strArr[$strIdxEnd]) {
-                    return false;// Character mismatch
-                }
-                if (!$isCaseSensitive && strtoupper($ch) !==
-                    strtoupper($strArr[$strIdxEnd])) {
-                    return false;// Character mismatch
-                }
-            }
-            $patIdxEnd--;
-            $strIdxEnd--;
-        }
-        if ($strIdxStart > $strIdxEnd) {
-            // All characters in the string are used. Check if only '*'s are
-            // left in the pattern. If so, we succeeded. Otherwise failure.
-            for ($i = $patIdxStart; $i <= $patIdxEnd; $i++) {
-                if ($patArr[$i] != '*') {
-                    return false;
-                }
-            }
-            return true;
-        }
-
-        // process pattern between stars. padIdxStart and patIdxEnd point
-        // always to a '*'.
-        while ($patIdxStart !== $patIdxEnd && $strIdxStart <= $strIdxEnd) {
-            $patIdxTmp = -1;
-            for ($i = $patIdxStart+1; $i <= $patIdxEnd; $i++) {
-                if ($patArr[$i] == '*') {
-                    $patIdxTmp = $i;
-                    break;
-                }
-            }
-            if ($patIdxTmp === $patIdxStart + 1) {
-                // Two stars next to each other, skip the first one.
-                $patIdxStart++;
-                continue;
-            }
-            // Find the pattern between padIdxStart & padIdxTmp in str between
-            // strIdxStart & strIdxEnd
-            $patLength = ($patIdxTmp - $patIdxStart - 1);
-            $strLength = ($strIdxEnd - $strIdxStart + 1);
-            $foundIdx  = -1;
-            
-            //strLoop:
-            for ($i = 0; $i <= $strLength - $patLength; $i++) {
-                for ($j = 0; $j < $patLength; $j++) {
-                    $ch = $patArr[$patIdxStart+$j+1];
-                    if ($ch != '?') {
-                        if ($isCaseSensitive && $ch !== $strArr[$strIdxStart+$i+$j]) {
-                               continue 2; //continue to strLoop:
-                        }
-                        if (!$isCaseSensitive && strtoupper($ch) !==
-                            strtoupper($strArr[$strIdxStart+$i+$j])) {
-                               continue 2; //continue to strLoop:
-                        }
-                    }
-                }
-                // only reached if sub loop completed w/o invoking continue 2
-                $foundIdx = $strIdxStart + $i;
-                break;
-            }
-
-            if ($foundIdx == -1) {
-                return false;
-            }
-
-            $patIdxStart = $patIdxTmp;
-            $strIdxStart = $foundIdx + $patLength;
-        }
-
-        // All characters in the string are used. Check if only '*'s are left
-        // in the pattern. If so, we succeeded. Otherwise failure.
-        for ($i = $patIdxStart; $i <= $patIdxEnd; $i++) {
-            if ($patArr[$i] != '*') {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Returns dependency information on these two files. If src has been
-     * modified later than target, it returns true. If target doesn't exist,
-     * it likewise returns true. Otherwise, target is newer than src and
-     * is not out of date, thus the method returns false. It also returns
-     * false if the src file doesn't even exist, since how could the
-     * target then be out of date.
-     *
-     * @param PhingFile $src the original file
-     * @param PhingFile $target the file being compared against
-     * @param int $granularity the amount in seconds of slack we will give in
-     *        determining out of dateness
-     * @return whether the target is out of date
-     */
-    public static function isOutOfDate(PhingFile $src, PhingFile $target, $granularity) {
-        if (!$src->exists()) {
-            return false;
-        }
-        if (!$target->exists()) {
-            return true;
-        }
-        if (($src->lastModified() - $granularity) > $target->lastModified()) {
-            return true;
-        }
-        return false;
-    }
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/SizeSelector.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/SizeSelector.php
deleted file mode 100644
index b542033cf..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/SizeSelector.php
+++ /dev/null
@@ -1,228 +0,0 @@
-<?php
-
-/*
- * $Id: SizeSelector.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-
-/**
- * Selector that filters files based on their size.
- *
- * @author Hans Lellelid <hans@xmpl.org> (Phing)
- * @author Bruce Atherton <bruce@callenish.com> (Ant)
- * @package phing.types.selectors
- */
-class SizeSelector extends BaseExtendSelector {
-
-    private $size = -1;
-    private $multiplier = 1;
-    private $sizelimit = -1;
-    private $cmp = 2;
-    const SIZE_KEY = "value";
-    const UNITS_KEY = "units";
-    const WHEN_KEY = "when";
-
-    private static $sizeComparisons =  array("less", "more", "equal");
-    private static $byteUnits = array("K", "k", "kilo", "KILO",
-                                 "Ki", "KI", "ki", "kibi", "KIBI",
-                                 "M", "m", "mega", "MEGA",
-                                 "Mi", "MI", "mi", "mebi", "MEBI",
-                                 "G", "g", "giga", "GIGA",
-                                 "Gi", "GI", "gi", "gibi", "GIBI",
-                                 "T", "t", "tera", "TERA",
-            /* You wish! */      "Ti", "TI", "ti", "tebi", "TEBI"
-                                 );
-
-    public function toString() {
-        $buf = "{sizeselector value: ";
-        $buf .= $this->sizelimit;
-        $buf .= "compare: ";
-        if ($this->cmp === 0) {
-            $buf .= "less";
-        } elseif ($this->cmp === 1) {
-            $buf .= "more";
-        } else {
-            $buf .= "equal";
-        }
-        $buf .= "}";
-        return $buf;
-    }
-
-    /**
-     * A size selector needs to know what size to base its selecting on.
-     * This will be further modified by the multiplier to get an
-     * actual size limit.
-     *
-     * @param size the size to select against expressed in units
-     */
-    public function setValue($size) {
-        $this->size = $size;
-        if (($this->multiplier !== 0) && ($this->size > -1)) {
-            $this->sizelimit = $size * $this->multiplier;
-        }
-    }
-
-    /**
-     * Sets the units to use for the comparison. This is a little
-     * complicated because common usage has created standards that
-     * play havoc with capitalization rules. Thus, some people will
-     * use "K" for indicating 1000's, when the SI standard calls for
-     * "k". Others have tried to introduce "K" as a multiple of 1024,
-     * but that falls down when you reach "M", since "m" is already
-     * defined as 0.001.
-     * <p>
-     * To get around this complexity, a number of standards bodies
-     * have proposed the 2^10 standard, and at least one has adopted
-     * it. But we are still left with a populace that isn't clear on
-     * how capitalization should work.
-     * <p>
-     * We therefore ignore capitalization as much as possible.
-     * Completely mixed case is not possible, but all upper and lower
-     * forms are accepted for all long and short forms. Since we have
-     * no need to work with the 0.001 case, this practice works here.
-     * <p>
-     * This function translates all the long and short forms that a
-     * unit prefix can occur in and translates them into a single
-     * multiplier.
-     *
-     * @param $units The units to compare the size to.
-     * @return void
-     */
-    public function setUnits($units) {
-        $i = array_search($units, self::$byteUnits, true);
-        if ($i === false) $i = -1; // make it java-like
-        
-        $this->multiplier = 0;
-        if (($i > -1) && ($i < 4)) {
-            $this->multiplier = 1000;
-        } elseif (($i > 3) && ($i < 9)) {
-            $this->multiplier = 1024;
-        } elseif (($i > 8) && ($i < 13)) {
-            $this->multiplier = 1000000;
-        } elseif (($i > 12) && ($i < 18)) {
-            $this->multiplier = 1048576;
-        } elseif (($i > 17) && ($i < 22)) {
-            $this->multiplier = 1000000000;
-        } elseif (($i > 21) && ($i < 27)) {
-            $this->multiplier = 1073741824;
-        } elseif (($i > 26) && ($i < 31)) {
-            $this->multiplier = 1000000000000;
-        } elseif (($i > 30) && ($i < 36)) {
-            $this->multiplier = 1099511627776;
-        }
-        if (($this->multiplier > 0) && ($this->size > -1)) {
-            $this->sizelimit = $this->size * $this->multiplier;
-        }
-    }
-
-    /**
-     * This specifies when the file should be selected, whether it be
-     * when the file matches a particular size, when it is smaller,
-     * or whether it is larger.
-     *
-     * @param cmp The comparison to perform, an EnumeratedAttribute
-     */
-    public function setWhen($cmp) {
-        $c = array_search($cmp, self::$sizeComparisons, true);
-        if ($c !== false) {
-            $this->cmp = $c;
-        }
-    }
-
-    /**
-     * When using this as a custom selector, this method will be called.
-     * It translates each parameter into the appropriate setXXX() call.
-     *
-     * @param parameters the complete set of parameters for this selector
-     */
-    public function setParameters($parameters) {
-        parent::setParameters($parameters);
-        if ($parameters !== null) {
-            for ($i = 0, $size=count($parameters); $i < $size; $i++) {
-                $paramname = $parameters[$i]->getName();
-                switch(strtolower($paramname)) {
-                    case self::SIZE_KEY:
-                        try {
-                            $this->setValue($parameters[$i]->getValue());
-                           } catch (Exception $nfe) {
-                               $this->setError("Invalid size setting "
-                                . $parameters[$i]->getValue());
-                           }
-                        break;
-                    case self::UNITS_KEY:                                                
-                        $this->setUnits($parameters[$i]->getValue());
-                        break;
-                    case self::WHEN_KEY:
-                        $this->setWhen($parameters[$i]->getValue());
-                        break;
-                    default:    
-                        $this->setError("Invalid parameter " . $paramname);
-                }
-            }
-        }
-    }
-
-    /**
-     * <p>Checks to make sure all settings are kosher. In this case, it
-     * means that the size attribute has been set (to a positive value),
-     * that the multiplier has a valid setting, and that the size limit
-     * is valid. Since the latter is a calculated value, this can only
-     * fail due to a programming error.
-     * </p>
-     * <p>If a problem is detected, the setError() method is called.
-     * </p>
-     */
-    public function verifySettings() {
-        if ($this->size < 0) {
-            $this->setError("The value attribute is required, and must be positive");
-        } elseif ($this->multiplier < 1) {
-            $this->setError("Invalid Units supplied, must be K,Ki,M,Mi,G,Gi,T,or Ti");
-        } elseif ($this->sizelimit < 0) {
-            $this->setError("Internal error: Code is not setting sizelimit correctly");
-        }
-    }
-
-    /**
-     * The heart of the matter. This is where the selector gets to decide
-     * on the inclusion of a file in a particular fileset.
-     *
-     * @param basedir A PhingFile object for the base directory
-     * @param filename The name of the file to check
-     * @param file A PhingFile object for this filename
-     * @return whether the file should be selected or not
-     */
-    public function isSelected(PhingFile $basedir, $filename, PhingFile $file) {
-
-        $this->validate();
-
-        // Directory size never selected for
-        if ($file->isDirectory()) {
-            return true;
-        }
-        if ($this->cmp === 0) {
-            return ($file->length() < $this->sizelimit);
-        } elseif ($this->cmp === 1) {
-            return ($file->length() > $this->sizelimit);
-        } else {
-            return ($file->length() === $this->sizelimit);
-        }
-    }
-    
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/TypeSelector.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/TypeSelector.php
deleted file mode 100644
index a5e5449ac..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/types/selectors/TypeSelector.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-/*
- * $Id: TypeSelector.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/types/selectors/BaseExtendSelector.php';
-
-/**
- * Selector that selects a certain kind of file: directory or regular file.
- * 
- * @author    Hans Lellelid <hans@xmpl.org> (Phing)
- * @author    Jeff Turner <jefft@apache.org> (Ant)
- * @version   $Revision: 1.3 $
- * @package   phing.types.selectors
- */
-class TypeSelector extends BaseExtendSelector {
-
-    private $type;
-
-    /** Key to used for parameterized custom selector */
-    const TYPE_KEY = "type";
-    
-    /** Valid types */
-    private static $types = array('file', 'dir');
-    
-    /**
-     * @return string A string describing this object
-     */
-    public function toString() {
-        $buf = "{typeselector type: " . $this->type . "}";
-        return $buf;
-    }
-
-    /**
-     * Set the type of file to require.
-     * @param string $type The type of file - 'file' or 'dir'
-     */
-    public function setType($type) {       
-        $this->type = $type;
-    }
-
-    /**
-     * When using this as a custom selector, this method will be called.
-     * It translates each parameter into the appropriate setXXX() call.
-     *
-     * @param array $parameters the complete set of parameters for this selector
-     */
-    public function setParameters($parameters) {
-        parent::setParameters($parameters);
-        if ($parameters !== null) {
-            for ($i = 0, $size=count($parameters); $i < $size; $i++) {
-                $paramname = $parameters[$i]->getName();
-                if (self::TYPE_KEY == strtolower($paramname)) {
-                    $this->setType($parameters[$i]->getValue());
-                } else {
-                    $this->setError("Invalid parameter " . $paramname);
-                }
-            }
-        }
-    }
-
-    /**
-     * Checks to make sure all settings are kosher. In this case, it
-     * means that the pattern attribute has been set.
-     *
-     */
-    public function verifySettings() {
-        if ($this->type === null) {
-            $this->setError("The type attribute is required");
-        } elseif (!in_array($this->type, self::$types, true)) {
-            $this->setError("Invalid type specified; must be one of (" . implode(self::$types) . ")");
-        }
-    }
-
-    /**
-     * The heart of the matter. This is where the selector gets to decide
-     * on the inclusion of a file in a particular fileset.
-     *
-     * @param PhingFile $basedir the base directory the scan is being done from
-     * @param string $filename is the name of the file to check
-     * @param PhingFile $file is a PhingFile object the selector can use
-     * @return boolean Whether the file should be selected or not
-     */
-    public function isSelected(PhingFile $basedir, $filename, PhingFile $file) {
-
-        // throw BuildException on error
-        $this->validate();
-
-        if ($file->isDirectory()) {
-            return $this->type === 'dir';
-        } else {
-            return $this->type === 'file';
-        }
-    }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/DirectoryScanner.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/DirectoryScanner.php
deleted file mode 100644
index 42a43f8a2..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/DirectoryScanner.php
+++ /dev/null
@@ -1,712 +0,0 @@
-<?php
-/*
- *  $Id: DirectoryScanner.php 277 2007-11-01 01:25:23Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/types/selectors/SelectorScanner.php'; 
-include_once 'phing/util/StringHelper.php';
-include_once 'phing/types/selectors/SelectorUtils.php';
-
-/**
- * Class for scanning a directory for files/directories that match a certain
- * criteria.
- *
- * These criteria consist of a set of include and exclude patterns. With these
- * patterns, you can select which files you want to have included, and which
- * files you want to have excluded.
- *
- * The idea is simple. A given directory is recursively scanned for all files
- * and directories. Each file/directory is matched against a set of include
- * and exclude patterns. Only files/directories that match at least one
- * pattern of the include pattern list, and don't match a pattern of the
- * exclude pattern list will be placed in the list of files/directories found.
- *
- * When no list of include patterns is supplied, "**" will be used, which
- * means that everything will be matched. When no list of exclude patterns is
- * supplied, an empty list is used, such that nothing will be excluded.
- *
- * The pattern matching is done as follows:
- * The name to be matched is split up in path segments. A path segment is the
- * name of a directory or file, which is bounded by DIRECTORY_SEPARATOR
- * ('/' under UNIX, '\' under Windows).
- * E.g. "abc/def/ghi/xyz.php" is split up in the segments "abc", "def", "ghi"
- * and "xyz.php".
- * The same is done for the pattern against which should be matched.
- *
- * Then the segments of the name and the pattern will be matched against each
- * other. When '**' is used for a path segment in the pattern, then it matches
- * zero or more path segments of the name.
- *
- * There are special case regarding the use of DIRECTORY_SEPARATOR at
- * the beginning of the pattern and the string to match:
- * When a pattern starts with a DIRECTORY_SEPARATOR, the string
- * to match must also start with a DIRECTORY_SEPARATOR.
- * When a pattern does not start with a DIRECTORY_SEPARATOR, the
- * string to match may not start with a DIRECTORY_SEPARATOR.
- * When one of these rules is not obeyed, the string will not
- * match.
- *
- * When a name path segment is matched against a pattern path segment, the
- * following special characters can be used:
- *   '*' matches zero or more characters,
- *   '?' matches one character.
- *
- * Examples:
- *
- * "**\*.php" matches all .php files/dirs in a directory tree.
- *
- * "test\a??.php" matches all files/dirs which start with an 'a', then two
- * more characters and then ".php", in a directory called test.
- *
- * "**" matches everything in a directory tree.
- *
- * "**\test\**\XYZ*" matches all files/dirs that start with "XYZ" and where
- * there is a parent directory called test (e.g. "abc\test\def\ghi\XYZ123").
- *
- * Case sensitivity may be turned off if necessary.  By default, it is
- * turned on.
- *
- * Example of usage:
- *   $ds = new DirectroyScanner();
- *   $includes = array("**\*.php");
- *   $excludes = array("modules\*\**");
- *   $ds->SetIncludes($includes);
- *   $ds->SetExcludes($excludes);
- *   $ds->SetBasedir("test");
- *   $ds->SetCaseSensitive(true);
- *   $ds->Scan();
- *
- *   print("FILES:");
- *   $files = ds->GetIncludedFiles();
- *   for ($i = 0; $i < count($files);$i++) {
- *     println("$files[$i]\n");
- *   }
- *
- * This will scan a directory called test for .php files, but excludes all
- * .php files in all directories under a directory called "modules"
- *
- * This class is complete preg/ereg free port of the Java class
- * org.apache.tools.ant.DirectoryScanner. Even functions that use preg/ereg
- * internally (like split()) are not used. Only the _fast_ string functions
- * and comparison operators (=== !=== etc) are used for matching and tokenizing.
- *
- *  @author   Arnout J. Kuiper, ajkuiper@wxs.nl
- *  @author   Magesh Umasankar, umagesh@rediffmail.com
- *  @author   Andreas Aderhold, andi@binarycloud.com
- *
- *  @version   $Revision: 1.15 $
- *  @package   phing.util
- */
-class DirectoryScanner implements SelectorScanner {
-
-    /** default set of excludes */
-    protected $DEFAULTEXCLUDES = array(
-        "**/*~",
-        "**/#*#",
-        "**/.#*",
-        "**/%*%",
-        "**/CVS",
-        "**/CVS/**",
-        "**/.cvsignore",
-        "**/SCCS",
-        "**/SCCS/**",
-        "**/vssver.scc",
-		"**/.svn",
-		"**/.svn/**",
-		"**/._*",
-		"**/.DS_Store",
-    );
-
-    /** The base directory which should be scanned. */
-    protected $basedir;
-
-    /** The patterns for the files that should be included. */
-    protected $includes = null;
-
-    /** The patterns for the files that should be excluded. */
-    protected $excludes = null;
-
-    /**
-     * The files that where found and matched at least one includes, and matched
-     * no excludes.
-     */
-    protected $filesIncluded;
-
-    /** The files that where found and did not match any includes. Trie */
-    protected $filesNotIncluded;
-
-    /**
-     * The files that where found and matched at least one includes, and also
-     * matched at least one excludes. Trie object.
-     */
-    protected $filesExcluded;
-
-    /**
-     * The directories that where found and matched at least one includes, and
-     * matched no excludes.
-     */
-    protected $dirsIncluded;
-
-    /** The directories that where found and did not match any includes. */
-    protected $dirsNotIncluded;
-
-    /**
-     * The files that where found and matched at least one includes, and also
-     * matched at least one excludes.
-     */
-    protected $dirsExcluded;
-
-    /** Have the vars holding our results been built by a slow scan? */
-    protected $haveSlowResults = false;
-
-    /** Should the file system be treated as a case sensitive one? */
-    protected $isCaseSensitive = true;
-
-    /** Selectors */
-    protected $selectors = null;
-    
-    protected $filesDeselected;
-    protected $dirsDeselected;
-    
-    /** if there are no deselected files */
-    protected $everythingIncluded = true;        
-
-    /**
-     * Does the path match the start of this pattern up to the first "**".
-     * This is a static mehtod and should always be called static
-     *
-     * This is not a general purpose test and should only be used if you
-     * can live with false positives.
-     *
-     * pattern=**\a and str=b will yield true.
-     *
-     * @param   pattern             the (non-null) pattern to match against
-     * @param   str                 the (non-null) string (path) to match
-     * @param   isCaseSensitive     must matches be case sensitive?
-     * @return  boolean             true if matches, otherwise false
-     */
-    function matchPatternStart($pattern, $str, $isCaseSensitive = true) {
-        return SelectorUtils::matchPatternStart($pattern, $str, $isCaseSensitive);
-    }
-
-    /**
-     * Matches a path against a pattern. Static
-     *
-     * @param pattern            the (non-null) pattern to match against
-     * @param str                the (non-null) string (path) to match
-     * @param isCaseSensitive    must a case sensitive match be done?
-     *
-     * @return true when the pattern matches against the string.
-     *         false otherwise.
-     */
-    function matchPath($pattern, $str, $isCaseSensitive = true) {
-        return SelectorUtils::matchPath($pattern, $str, $isCaseSensitive);
-    }
-
-    /**
-     * Matches a string against a pattern. The pattern contains two special
-     * characters:
-     * '*' which means zero or more characters,
-     * '?' which means one and only one character.
-     *
-     * @param  pattern the (non-null) pattern to match against
-     * @param  str     the (non-null) string that must be matched against the
-     *                 pattern
-     *
-     * @return boolean true when the string matches against the pattern,
-     *                 false otherwise.
-     * @access public
-     */
-    function match($pattern, $str, $isCaseSensitive = true) {
-        return SelectorUtils::match($pattern, $str, $isCaseSensitive);
-    }
-
-    /**
-     * Sets the basedir for scanning. This is the directory that is scanned
-     * recursively. All '/' and '\' characters are replaced by
-     * DIRECTORY_SEPARATOR
-     *
-     * @param basedir the (non-null) basedir for scanning
-     */
-    function setBasedir($_basedir) {
-        $_basedir = str_replace('\\', DIRECTORY_SEPARATOR, $_basedir);
-        $_basedir = str_replace('/', DIRECTORY_SEPARATOR, $_basedir);
-        $this->basedir = $_basedir;
-    }
-
-    /**
-     * Gets the basedir that is used for scanning. This is the directory that
-     * is scanned recursively.
-     *
-     * @return the basedir that is used for scanning
-     */
-    function getBasedir() {
-        return $this->basedir;
-    }
-
-    /**
-     * Sets the case sensitivity of the file system
-     *
-     * @param specifies if the filesystem is case sensitive
-     */
-    function setCaseSensitive($_isCaseSensitive) {
-        $this->isCaseSensitive = ($_isCaseSensitive) ? true : false;
-    }
-
-    /**
-     * Sets the set of include patterns to use. All '/' and '\' characters are
-     * replaced by DIRECTORY_SEPARATOR. So the separator used need
-     * not match DIRECTORY_SEPARATOR.
-     *
-     * When a pattern ends with a '/' or '\', "**" is appended.
-     *
-     * @param includes list of include patterns
-     */
-    function setIncludes($_includes = array()) {
-        if (empty($_includes) || is_null($_includes)) {
-            $this->includes = null;
-        } else {
-            for ($i = 0; $i < count($_includes); $i++) {
-                $pattern = null;
-                $pattern = str_replace('\\', DIRECTORY_SEPARATOR, $_includes[$i]);
-                $pattern = str_replace('/', DIRECTORY_SEPARATOR, $pattern);
-                if (StringHelper::endsWith(DIRECTORY_SEPARATOR, $pattern)) {
-                    $pattern .= "**";
-                }
-                $this->includes[] = $pattern;
-            }
-        }
-    }
-
-    /**
-     * Sets the set of exclude patterns to use. All '/' and '\' characters are
-     * replaced by <code>File.separatorChar</code>. So the separator used need
-     * not match <code>File.separatorChar</code>.
-     *
-     * When a pattern ends with a '/' or '\', "**" is appended.
-     *
-     * @param excludes list of exclude patterns
-     */
-
-    function setExcludes($_excludes = array()) {
-        if (empty($_excludes) || is_null($_excludes)) {
-            $this->excludes = null;
-        } else {
-            for ($i = 0; $i < count($_excludes); $i++) {
-                $pattern = null;
-                $pattern = str_replace('\\', DIRECTORY_SEPARATOR, $_excludes[$i]);
-                $pattern = str_replace('/', DIRECTORY_SEPARATOR, $pattern);
-                if (StringHelper::endsWith(DIRECTORY_SEPARATOR, $pattern)) {
-                    $pattern .= "**";
-                }
-                $this->excludes[] = $pattern;
-            }
-        }
-    }
-
-    /**
-     * Scans the base directory for files that match at least one include
-     * pattern, and don't match any exclude patterns.
-     *
-     */
-    function scan() {
-    
-        if ((empty($this->basedir)) || (!@is_dir($this->basedir))) {
-            return false;
-        }
-
-        if ($this->includes === null) {
-            // No includes supplied, so set it to 'matches all'
-            $this->includes = array("**");
-        }
-        if (is_null($this->excludes)) {
-            $this->excludes = array();
-        }
-
-        $this->filesIncluded = array();
-        $this->filesNotIncluded = array();
-        $this->filesExcluded = array();
-        $this->dirsIncluded = array();
-        $this->dirsNotIncluded = array();
-        $this->dirsExcluded = array();
-        $this->dirsDeselected = array();
-        $this->filesDeselected = array();
-        
-        if ($this->isIncluded("")) {
-            if (!$this->isExcluded("")) {
-                if ($this->isSelected("", $this->basedir)) {
-                    $this->dirsIncluded[] = "";
-                } else {
-                    $this->dirsDeselected[] = "";
-                }                
-            } else {
-                $this->dirsExcluded[] = "";
-            }
-        } else {
-            $this->dirsNotIncluded[] = "";
-        }
-
-        $this->scandir($this->basedir, "", true);
-        return true;
-    }
-
-    /**
-     * Toplevel invocation for the scan.
-     *
-     * Returns immediately if a slow scan has already been requested.
-     */
-    protected function slowScan() {
-
-        if ($this->haveSlowResults) {
-            return;
-        }
-
-        // copy trie object add CopyInto() method
-        $excl    = $this->dirsExcluded;
-        $notIncl = $this->dirsNotIncluded;
-
-        for ($i=0, $_i=count($excl); $i < $_i; $i++) {
-            if (!$this->couldHoldIncluded($excl[$i])) {
-                $this->scandir($this->basedir.$excl[$i], $excl[$i].DIRECTORY_SEPARATOR, false);
-            }
-        }
-
-        for ($i=0, $_i=count($notIncl); $i < $_i; $i++) {
-            if (!$this->couldHoldIncluded($notIncl[$i])) {
-                $this->scandir($this->basedir.$notIncl[$i], $notIncl[$i].DIRECTORY_SEPARATOR, false);
-            }
-        }
-
-        $this->haveSlowResults = true;
-    }
-
-    /**
-     * Lists contens of a given directory and returns array with entries
-     *
-     * @param   src String. Source path and name file to copy.
-     *
-     * @access  public
-     * @return  array  directory entries
-     * @author  Albert Lash, alash@plateauinnovation.com
-     */
-
-    function listDir($_dir) {
-        $d = dir($_dir);
-        $list = array();
-        while($entry = $d->read()) {
-            if ($entry != "." && $entry != "..") {
-                $list[] = $entry;
-            }
-        }
-        $d->close();
-        return $list;
-    }
-
-    /**
-     * Scans the passed dir for files and directories. Found files and
-     * directories are placed in their respective collections, based on the
-     * matching of includes and excludes. When a directory is found, it is
-     * scanned recursively.
-     *
-     * @param dir   the directory to scan
-     * @param vpath the path relative to the basedir (needed to prevent
-     *              problems with an absolute path when using dir)
-     *
-     * @access private
-     * @see #filesIncluded
-     * @see #filesNotIncluded
-     * @see #filesExcluded
-     * @see #dirsIncluded
-     * @see #dirsNotIncluded
-     * @see #dirsExcluded
-     */
-    private function scandir($_rootdir, $_vpath, $_fast) {
-        
-        if (!is_readable($_rootdir)) {
-            return;
-        }                                
-        
-        $newfiles = self::listDir($_rootdir);
-        
-        for ($i=0,$_i=count($newfiles); $i < $_i; $i++) {
-            
-            $file = $_rootdir . DIRECTORY_SEPARATOR . $newfiles[$i];
-            $name = $_vpath . $newfiles[$i];
-
-            if (@is_dir($file)) {
-                if ($this->isIncluded($name)) {
-                    if (!$this->isExcluded($name)) {
-                        if ($this->isSelected($name, $file)) {
-                            $this->dirsIncluded[] = $name;
-                            if ($_fast) {
-                                $this->scandir($file, $name.DIRECTORY_SEPARATOR, $_fast);
-                            }
-                        } else {
-                            $this->everythingIncluded = false;
-                            $this->dirsDeselected[] = $name;
-                            if ($_fast && $this->couldHoldIncluded($name)) {
-                                $this->scandir($file, $name.DIRECTORY_SEPARATOR, $_fast);
-                            }                            
-                        }                                                
-                    } else {
-                        $this->everythingIncluded = false;
-                        $this->dirsExcluded[] = $name;
-                        if ($_fast && $this->couldHoldIncluded($name)) {
-                            $this->scandir($file, $name.DIRECTORY_SEPARATOR, $_fast);
-                        }
-                    }
-                } else {
-                    $this->everythingIncluded = false;
-                    $this->dirsNotIncluded[] = $name;
-                    if ($_fast && $this->couldHoldIncluded($name)) {
-                        $this->scandir($file, $name.DIRECTORY_SEPARATOR, $_fast);
-                    }
-                }
-                
-                if (!$_fast) {
-                    $this->scandir($file, $name.DIRECTORY_SEPARATOR, $_fast);
-                }
-                
-            } elseif (@is_file($file)) {
-                if ($this->isIncluded($name)) {
-                    if (!$this->isExcluded($name)) {
-                        if ($this->isSelected($name, $file)) {
-                            $this->filesIncluded[] = $name;
-                        } else {
-                            $this->everythingIncluded = false;
-                            $this->filesDeselected[] = $name;
-                        }                        
-                    } else {
-                        $this->everythingIncluded = false;
-                        $this->filesExcluded[] = $name;
-                    }
-                } else {
-                    $this->everythingIncluded = false;
-                    $this->filesNotIncluded[] = $name;
-                }
-            }
-        }
-    }
-
-    /**
-     * Tests whether a name matches against at least one include pattern.
-     *
-     * @param name the name to match
-     * @return <code>true</code> when the name matches against at least one
-     *         include pattern, <code>false</code> otherwise.
-     */
-    protected function isIncluded($_name) {
-        for ($i=0, $_i=count($this->includes); $i < $_i; $i++) {
-            if (DirectoryScanner::matchPath($this->includes[$i], $_name, $this->isCaseSensitive)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Tests whether a name matches the start of at least one include pattern.
-     *
-     * @param name the name to match
-     * @return <code>true</code> when the name matches against at least one
-     *         include pattern, <code>false</code> otherwise.
-     */
-    protected function couldHoldIncluded($_name) {
-        for ($i = 0; $i < count($this->includes); $i++) {
-            if (DirectoryScanner::matchPatternStart($this->includes[$i], $_name, $this->isCaseSensitive)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Tests whether a name matches against at least one exclude pattern.
-     *
-     * @param name the name to match
-     * @return <code>true</code> when the name matches against at least one
-     *         exclude pattern, <code>false</code> otherwise.
-     */
-    protected function isExcluded($_name) {
-        for ($i = 0; $i < count($this->excludes); $i++) {
-            if (DirectoryScanner::matchPath($this->excludes[$i], $_name, $this->isCaseSensitive)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Get the names of the files that matched at least one of the include
-     * patterns, and matched none of the exclude patterns.
-     * The names are relative to the basedir.
-     *
-     * @return the names of the files
-     */
-    function getIncludedFiles() {
-        return $this->filesIncluded;        
-    }
-
-    /**
-     * Get the names of the files that matched at none of the include patterns.
-     * The names are relative to the basedir.
-     *
-     * @return the names of the files
-     */
-    function getNotIncludedFiles() {
-        $this->slowScan();
-        return $this->filesNotIncluded;
-    }
-
-    /**
-     * Get the names of the files that matched at least one of the include
-     * patterns, an matched also at least one of the exclude patterns.
-     * The names are relative to the basedir.
-     *
-     * @return the names of the files
-     */
-
-    function getExcludedFiles() {
-        $this->slowScan();
-        return $this->filesExcluded;
-    }
-
-    /**
-     * <p>Returns the names of the files which were selected out and
-     * therefore not ultimately included.</p>
-     *
-     * <p>The names are relative to the base directory. This involves
-     * performing a slow scan if one has not already been completed.</p>
-     *
-     * @return the names of the files which were deselected.
-     *
-     * @see #slowScan
-     */
-    public function getDeselectedFiles() {
-        $this->slowScan();        
-        return $this->filesDeselected;
-    }
-
-    /**
-     * Get the names of the directories that matched at least one of the include
-     * patterns, an matched none of the exclude patterns.
-     * The names are relative to the basedir.
-     *
-     * @return the names of the directories
-     */
-
-    function getIncludedDirectories() {
-        return $this->dirsIncluded;        
-    }
-
-    /**
-     * Get the names of the directories that matched at none of the include
-     * patterns.
-     * The names are relative to the basedir.
-     *
-     * @return the names of the directories
-     */
-    function getNotIncludedDirectories() {
-        $this->slowScan();
-        return $this->dirsNotIncluded;        
-    }
-
-    /**
-     * <p>Returns the names of the directories which were selected out and
-     * therefore not ultimately included.</p>
-     *
-     * <p>The names are relative to the base directory. This involves
-     * performing a slow scan if one has not already been completed.</p>
-     *
-     * @return the names of the directories which were deselected.
-     *
-     * @see #slowScan
-     */
-    public function getDeselectedDirectories() {
-        $this->slowScan();
-        return $this->dirsDeselected;
-    }
-    
-    /**
-     * Get the names of the directories that matched at least one of the include
-     * patterns, an matched also at least one of the exclude patterns.
-     * The names are relative to the basedir.
-     *
-     * @return the names of the directories
-     */
-    function getExcludedDirectories() {
-        $this->slowScan();
-        return $this->dirsExcluded;        
-    }
-
-    /**
-     * Adds the array with default exclusions to the current exclusions set.
-     *
-     */
-    function addDefaultExcludes() {
-        //$excludesLength = ($this->excludes == null) ? 0 : count($this->excludes);
-        foreach($this->DEFAULTEXCLUDES as $pattern) {
-            $pattern = str_replace('\\', DIRECTORY_SEPARATOR, $pattern);
-            $pattern = str_replace('/', DIRECTORY_SEPARATOR, $pattern);
-            $this->excludes[] = $pattern;
-        }
-    }
-    
-    /**
-     * Sets the selectors that will select the filelist.
-     *
-     * @param selectors specifies the selectors to be invoked on a scan
-     */
-    public function setSelectors($selectors) {
-        $this->selectors = $selectors;
-    }
-
-    /**
-     * Returns whether or not the scanner has included all the files or
-     * directories it has come across so far.
-     *
-     * @return <code>true</code> if all files and directories which have
-     *         been found so far have been included.
-     */
-    public function isEverythingIncluded() {
-        return $this->everythingIncluded;
-    }
-        
-    /**
-     * Tests whether a name should be selected.
-     *
-     * @param string $name The filename to check for selecting.
-     * @param string $file The full file path.
-     * @return boolean False when the selectors says that the file
-     *         should not be selected, True otherwise.
-     */
-    protected function isSelected($name, $file) {
-        if ($this->selectors !== null) {
-        	$basedir = new PhingFile($this->basedir);
-        	$file = new PhingFile($file);
-        	foreach($this->selectors as $selector) {
-        		if (!$selector->isSelected($basedir, $name, $file)) {
-        			return false;
-        		}
-        	}
-        }
-        return true;
-    }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/ExtendedFileStream.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/ExtendedFileStream.php
deleted file mode 100755
index b8a366781..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/ExtendedFileStream.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-	include_once 'phing/system/io/PhingFile.php';
-
-	/**
-	 * $Id: ExtendedFileStream.php 325 2007-12-20 15:44:58Z hans $
-	 *
-	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-	 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-	 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-	 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-	 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-	 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-	 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-	 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-	 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-	 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-	 *
-	 * This software consists of voluntary contributions made by many individuals
-	 * and is licensed under the LGPL. For more information please see
-	 * <http://phing.info>.
-	 */
-
-	/**
-	 * Extended file stream wrapper class which auto-creates directories
-	 *
-	 * @author Michiel Rook <michiel.rook@gmail.com>
-	 * @version $Id: ExtendedFileStream.php 325 2007-12-20 15:44:58Z hans $
-	 * @package phing.util
-	 */
-	class ExtendedFileStream
-	{
-		private $fp = NULL;
-		
-		static function registerStream()
-		{
-			if (!in_array("efile", stream_get_wrappers()))
-			{
-				stream_wrapper_register("efile", "ExtendedFileStream");
-			}
-		}
-		
-		private function createDirectories($path)
-		{
-			$f = new PhingFile($path);
-			if (!$f->exists()) {
-				$f->mkdirs();
-			}
-		}
-		
-		function stream_open($path, $mode, $options, &$opened_path)
-		{
-			/** Small fix for Windows */
-			if ($path[8] == DIRECTORY_SEPARATOR)
-			{
-				$filepath = substr($path, 7);
-			}
-			else
-			{
-				$filepath = substr($path, 8);
-			}
-			
-			$this->createDirectories(dirname($filepath));
-			
-			$this->fp = fopen($filepath, $mode);
-			
-			return true;
-		}
-		
-		function stream_close()
-		{
-			fclose($this->fp);
-			$this->fp = NULL;
-		}
-		
-		function stream_read($count)
-		{
-			return fread($this->fp, $count);
-		}
-		
-		function stream_write($data)
-		{
-			return fwrite($this->fp, $data);
-		}
-		
-		function stream_eof()
-		{
-			return feof($this->fp);
-		}
-		
-		function stream_tell()
-		{
-			return ftell($this->fp);
-		}
-		
-		function stream_seek($offset, $whence)
-		{
-			return fseek($this->fp, $offset, $whence);
-		}
-		
-		function stream_flush()
-		{
-			return fflush($this->fp);
-		}
-		
-		function stream_stat()
-		{
-			return fstat($this->fp);
-		}
-		
-		function unlink($path)
-		{
-			return FALSE;
-		}
-		
-		function rename($path_from, $path_to)
-		{
-			return FALSE;
-		}
-		
-		function mkdir($path, $mode, $options)
-		{
-			return FALSE;
-		}
-		
-		function rmdir($path, $options)
-		{
-			return FALSE;
-		}		
-	};
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/FileUtils.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/FileUtils.php
deleted file mode 100644
index 3039773b5..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/FileUtils.php
+++ /dev/null
@@ -1,294 +0,0 @@
-<?php
-/*
- *  $Id: FileUtils.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-include_once 'phing/system/lang/Character.php';
-include_once 'phing/util/StringHelper.php';
-include_once 'phing/system/io/BufferedReader.php';
-include_once 'phing/system/io/BufferedWriter.php';
-include_once 'phing/filters/util/ChainReaderHelper.php';
-include_once 'phing/system/io/PhingFile.php';
-
-/**
- * File utility class.
- * - handles os independent stuff etc
- * - mapper stuff
- * - filter stuff
- *
- * @package  phing.util
- * @version  $Revision: 1.10 $
- */
-class FileUtils {
-        
-    /**
-     * Returns a new Reader with filterchains applied.  If filterchains are empty,
-     * simply returns passed reader.
-     * 
-     * @param Reader $in Reader to modify (if appropriate).
-     * @param array &$filterChains filter chains to apply.
-     * @param Project $project
-     * @return Reader Assembled Reader (w/ filter chains).
-     */
-    public static function getChainedReader(Reader $in, &$filterChains, Project $project) {
-        if (!empty($filterChains)) {
-            $crh = new ChainReaderHelper();
-            $crh->setBufferSize(65536); // 64k buffer, but isn't being used (yet?)
-            $crh->setPrimaryReader($in);
-            $crh->setFilterChains($filterChains);
-            $crh->setProject($project);
-            $rdr = $crh->getAssembledReader();
-            return $rdr;
-        } else {
-            return $in;
-        }
-    }
-    
-    /**
-     * Copies a file using filter chains.
-     * 
-     * @param PhingFile $sourceFile
-     * @param PhingFile $destFile
-     * @param boolean $overwrite
-     * @param boolean $preserveLastModified
-     * @param array $filterChains 
-     * @param Project $project
-     * @return void
-     */
-    function copyFile(PhingFile $sourceFile, PhingFile $destFile, $overwrite = false, $preserveLastModified = true, &$filterChains = null, Project $project) {
-       
-        if ($overwrite || !$destFile->exists() || $destFile->lastModified() < $sourceFile->lastModified()) {
-            if ($destFile->exists() && $destFile->isFile()) {
-                $destFile->delete();
-            }
-
-            // ensure that parent dir of dest file exists!
-            $parent = $destFile->getParentFile();
-            if ($parent !== null && !$parent->exists()) {
-                $parent->mkdirs();
-            }
-
-            if ((is_array($filterChains)) && (!empty($filterChains))) {
-                
-                $in = self::getChainedReader(new BufferedReader(new FileReader($sourceFile)), $filterChains, $project);
-                $out = new BufferedWriter(new FileWriter($destFile));                
-                
-                // New read() methods returns a big buffer.                
-                while(-1 !== ($buffer = $in->read())) { // -1 indicates EOF
-                    $out->write($buffer);
-                }
-                
-                if ( $in !== null )
-                    $in->close();
-                if ( $out !== null )
-                    $out->close();
-            } else {
-                // simple copy (no filtering)
-                $sourceFile->copyTo($destFile);
-            }
-
-            if ($preserveLastModified) {
-                $destFile->setLastModified($sourceFile->lastModified());
-            }
-
-        }
-    }
-
-    /**
-     * Interpret the filename as a file relative to the given file -
-     * unless the filename already represents an absolute filename.
-     *
-     * @param  $file the "reference" file for relative paths. This
-     *         instance must be an absolute file and must not contain
-     *         ./ or ../ sequences (same for \ instead of /).
-     * @param  $filename a file name
-     *
-     * @return PhingFile A PhingFile object pointing to an absolute file that doesn't contain ./ or ../ sequences
-     *         and uses the correct separator for the current platform.
-     */
-    function resolveFile($file, $filename) {
-        // remove this and use the static class constant File::seperator
-        // as soon as ZE2 is ready
-        $fs = FileSystem::getFileSystem();
-
-        $filename = str_replace('/', $fs->getSeparator(), str_replace('\\', $fs->getSeparator(), $filename));
-
-        // deal with absolute files
-        if (StringHelper::startsWith($fs->getSeparator(), $filename) ||
-                (strlen($filename) >= 2 && Character::isLetter($filename{0}) && $filename{1} === ':')) {
-            return new PhingFile($this->normalize($filename));
-        }
-
-        if (strlen($filename) >= 2 && Character::isLetter($filename{0}) && $filename{1} === ':') {
-            return new PhingFile($this->normalize($filename));
-        }
-
-        $helpFile = new PhingFile($file->getAbsolutePath());
-
-        $tok = strtok($filename, $fs->getSeparator());
-        while ($tok !== false) {
-            $part = $tok;
-            if ($part === '..') {
-                $parentFile = $helpFile->getParent();
-                if ($parentFile === null) {
-                    $msg = "The file or path you specified ($filename) is invalid relative to ".$file->getPath();
-                    throw new IOException($msg);
-                }
-                $helpFile = new PhingFile($parentFile);
-            } else if ($part === '.') {
-                // Do nothing here
-            } else {
-                $helpFile = new PhingFile($helpFile, $part);
-            }
-            $tok = strtok($fs->getSeparator());
-        }
-        return new PhingFile($helpFile->getAbsolutePath());
-    }
-
-    /**
-     * Normalize the given absolute path.
-     *
-     * This includes:
-     *   - Uppercase the drive letter if there is one.
-     *   - Remove redundant slashes after the drive spec.
-     *   - resolve all ./, .\, ../ and ..\ sequences.
-     *   - DOS style paths that start with a drive letter will have
-     *     \ as the separator.
-     * @param string $path Path to normalize.
-     * @return string
-     */
-    function normalize($path) {
-    
-        $path = (string) $path;
-        $orig = $path;
-
-        $path = str_replace('/', DIRECTORY_SEPARATOR, str_replace('\\', DIRECTORY_SEPARATOR, $path));
-
-        // make sure we are dealing with an absolute path
-        if (!StringHelper::startsWith(DIRECTORY_SEPARATOR, $path)
-                && !(strlen($path) >= 2 && Character::isLetter($path{0}) && $path{1} === ':')) {
-            throw new IOException("$path is not an absolute path");
-        }
-
-        $dosWithDrive = false;
-        $root = null;
-
-        // Eliminate consecutive slashes after the drive spec
-
-        if (strlen($path) >= 2 && Character::isLetter($path{0}) && $path{1} === ':') {
-            $dosWithDrive = true;
-
-            $ca = str_replace('/', '\\', $path);
-            $ca = StringHelper::toCharArray($ca);
-
-            $path = strtoupper($ca[0]).':';
-            
-            for ($i=2, $_i=count($ca); $i < $_i; $i++) {
-                if (($ca[$i] !== '\\') ||
-                        ($ca[$i] === '\\' && $ca[$i - 1] !== '\\')
-                   ) {
-                    $path .= $ca[$i];
-                }
-            }
-         
-            $path = str_replace('\\', DIRECTORY_SEPARATOR, $path);
-
-            if (strlen($path) == 2) {
-                $root = $path;
-                $path = "";
-            } else {
-                $root = substr($path, 0, 3);
-                $path = substr($path, 3);
-            }
-
-        } else {
-            if (strlen($path) == 1) {
-                $root = DIRECTORY_SEPARATOR;
-                $path = "";
-            } else if ($path{1} == DIRECTORY_SEPARATOR) {
-                // UNC drive
-                $root = DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR;
-                $path = substr($path, 2);
-            }
-            else {
-                $root = DIRECTORY_SEPARATOR;
-                $path = substr($path, 1);
-            }
-        }
-
-        $s = array();
-        array_push($s, $root);
-        $tok = strtok($path, DIRECTORY_SEPARATOR);
-        while ($tok !== false) {            
-            $thisToken = $tok;
-            if ("." === $thisToken) {
-                $tok = strtok(DIRECTORY_SEPARATOR);
-                continue;
-            } elseif (".." === $thisToken) {
-                if (count($s) < 2) {
-                    // using '..' in path that is too short
-                    throw new IOException("Cannot resolve path: $orig");
-                } else {
-                    array_pop($s);
-                }
-            } else { // plain component
-                array_push($s, $thisToken);
-            }
-            $tok = strtok(DIRECTORY_SEPARATOR);
-        }
-
-        $sb = "";
-        for ($i=0,$_i=count($s); $i < $_i; $i++) {
-            if ($i > 1) {
-                // not before the filesystem root and not after it, since root
-                // already contains one
-                $sb .= DIRECTORY_SEPARATOR;
-            }
-            $sb .= (string) $s[$i];
-        }
-
-
-        $path = (string) $sb;
-        if ($dosWithDrive === true) {
-            $path = str_replace('/', '\\', $path);
-        }
-        return $path;
-    }
-    
-    /**
-     * @return boolean Whether contents of two files is the same.
-     */
-    public function contentEquals(PhingFile $file1, PhingFile $file2) {
-        
-        if (!($file1->exists() || $file2->exists())) {
-            return false;
-        }
-
-        if (!($file1->canRead() || $file2->canRead())) {
-            return false;
-        }
-        
-        $c1 = file_get_contents($file1->getAbsolutePath());
-        $c2 = file_get_contents($file2->getAbsolutePath());
-        
-        return trim($c1) == trim($c2);    
-    }
-    
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/LogWriter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/LogWriter.php
deleted file mode 100755
index f680617e5..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/LogWriter.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-	/**
-	 * $Id: LogWriter.php 325 2007-12-20 15:44:58Z hans $
-	 *
-	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-	 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-	 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-	 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-	 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-	 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-	 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-	 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-	 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-	 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-	 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-	 *
-	 * This software consists of voluntary contributions made by many individuals
-	 * and is licensed under the LGPL. For more information please see
-	 * <http://phing.info>.
-	 */
-	
-	require_once 'phing/system/io/Writer.php';
-	require_once 'phing/Task.php';
-
-	/**
-	 * Extends the Writer class to output messages to Phing's log
-	 *
-	 * @author Michiel Rook <michiel.rook@gmail.com>
-	 * @version $Id: LogWriter.php 325 2007-12-20 15:44:58Z hans $
-	 * @package phing.util
-	 */
-	class LogWriter extends Writer
-	{
-		private $task = NULL;
-		
-		private $level = NULL;
-		
-		/**
-		 * Constructs a new LogWriter object
-		 */
-		function __construct(Task $task, $level = Project::MSG_INFO)
-		{
-			$this->task = $task;
-			$this->level = $level;
-		}
-		
-		/**
-		 * @see Writer::write()
-		 */
-		function write($buf, $off = null, $len = null)
-		{
-			$lines = explode("\n", $buf);
-			
-			foreach ($lines as $line)
-			{
-				if ($line == "")
-				{
-					continue;
-				}
-				
-				$this->task->log($line, $this->level);
-			}
-		}
-		
-		/**
-		 * @see Writer::reset()
-		 */
-		function reset()
-		{
-		}
-
-		/**
-		 * @see Writer::close()
-		 */
-		function close()
-		{
-		}
-		
-		/**
-		 * @see Writer::open()
-		 */
-		function open()
-		{
-		}
-		
-		/**
-		 * @see Writer::getResource()
-		 */
-		function getResource()
-		{
-			return $this->task;
-		}
-	}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/PathTokenizer.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/PathTokenizer.php
deleted file mode 100755
index 3d8a68bd6..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/PathTokenizer.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-/*
- *  $Id: PathTokenizer.php 123 2006-09-14 20:19:08Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-
-
-include_once 'phing/util/StringHelper.php';
-
-
-
-/**
-
- * A Path tokenizer takes a path and returns the components that make up
-
- * that path.
-
- *
-
- * The path can use path separators of either ':' or ';' and file separators
-
- * of either '/' or '\'.
-
- *
-
- * @author Hans Lellelid <hans@xmpl.org> (Phing)
-
- * @author Conor MacNeill (Ant)
-
- * @author Jeff Tulley <jtulley@novell.com>  (Ant)
-
- * @pacakge phing.util
-
- */ 
-
-class PathTokenizer {
-
-    
-
-    /**
-
-     * A array of tokens, created by preg_split().
-
-     */
-
-    private $tokens = array();
-
-    
-
-    /**
-
-     * A string which stores any path components which have been read ahead
-
-     * due to DOS filesystem compensation.
-
-     * @var string
-
-     */
-
-    private $lookahead;
-
-    
-
-    /**
-
-     * Flag to indicate whether or not we are running on a platform with a
-
-     * DOS style filesystem
-
-     * @var boolean
-
-     */
-
-    private $dosStyleFilesystem;
-
-
-
-    /**
-
-     * Constructs a path tokenizer for the specified path.
-
-     * 
-
-     * @param path The path to tokenize. Must not be <code>null</code>.
-
-     */
-
-    public function __construct($path) {
-
-        // on Windows and Unix, we can ignore delimiters and still have
-
-        // enough information to tokenize correctly.    
-
-        $this->tokens = preg_split("/[;:]/", $path, -1, PREG_SPLIT_NO_EMPTY);
-
-        $this->dosStyleFilesystem = ( PATH_SEPARATOR == ';');
-
-    }
-
-
-
-    /**
-
-     * Tests if there are more path elements available from this tokenizer's
-
-     * path. If this method returns <code>true</code>, then a subsequent call 
-
-     * to nextToken will successfully return a token.
-
-     * 
-
-     * @return <code>true</code> if and only if there is at least one token 
-
-     * in the string after the current position; <code>false</code> otherwise.
-
-     */
-
-    public function hasMoreTokens() {
-
-        if ($this->lookahead !== null) {
-
-            return true;
-
-        }        
-
-        return !empty($this->tokens);
-
-    }
-
-    
-
-    /**
-
-     * Returns the next path element from this tokenizer.
-
-     * 
-
-     * @return the next path element from this tokenizer.
-
-     * 
-
-     * @throws Exception if there are no more elements in this tokenizer's path.
-
-     */
-
-    public function nextToken() {
-
-            
-
-        if ($this->lookahead !== null) {
-
-            $token = $this->lookahead;
-
-            $this->lookahead = null;
-
-        } else {
-
-            $token = trim(array_shift($this->tokens));
-
-        }
-
-            
-
-
-
-        if (strlen($token) === 1 && Character::isLetter($token{0})
-
-                                && $this->dosStyleFilesystem
-
-                                && !empty($this->tokens)) {
-
-            // we are on a dos style system so this path could be a drive
-
-            // spec. We look at the next token
-
-            $nextToken = trim(array_shift($this->tokens));
-
-            if (StringHelper::startsWith('\\', $nextToken) || StringHelper::startsWith('/', $nextToken)) {
-
-                // we know we are on a DOS style platform and the next path
-
-                // starts with a slash or backslash, so we know this is a 
-
-                // drive spec
-
-                $token .= ':' . $nextToken;
-
-            } else {
-
-                // store the token just read for next time
-
-                $this->lookahead = $nextToken;
-
-            }
-
-        }
-
-        
-
-        return $token;
-
-    }
-
-
-
-    /**
-
-     * Non StringTokenizer function, that indicates whether the specified path is contained in loaded tokens.
-
-     * We can do this easily because in PHP implimentation we're using arrays.
-
-     * @param string $path path to search for.
-
-     * @return boolean
-
-     */
-
-    public function contains($path) {
-
-        return in_array($path, $this->tokens, true);        
-
-    }
-
-    
-
-}
-
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/SourceFileScanner.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/SourceFileScanner.php
deleted file mode 100644
index df11efd71..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/SourceFileScanner.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-/*
- *  $Id: SourceFileScanner.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-/**
- *  Utility class that collects the functionality of the various
- *  scanDir methods that have been scattered in several tasks before.
- *
- *  The only method returns an array of source files. The array is a
- *  subset of the files given as a parameter and holds only those that
- *  are newer than their corresponding target files.
- *  @package   phing.util
- */
-class SourceFileScanner {
-
-    /** Instance of FileUtils */
-    private $fileUtils;
-    
-    /** Task this class is working for -- for logging purposes. */
-    private $task;
-
-    /**
-     * @param task The task we should log messages through
-     */
-    function __construct($task) {
-        $this->task = $task;
-        $this->fileUtils = new FileUtils();
-    }
-
-    /**
-     * Restrict the given set of files to those that are newer than
-     * their corresponding target files.
-     *
-     * @param files   the original set of files
-     * @param srcDir  all files are relative to this directory
-     * @param destDir target files live here. if null file names
-     *                returned by the mapper are assumed to be absolute.
-     * @param FilenameMapper  knows how to construct a target file names from
-     *                source file names.
-     * @param force   Boolean that determines if the files should be
-     *                forced to be copied.
-     */
-    function restrict(&$files, $srcDir, $destDir, $mapper, $force = false) {
-        $now = time();
-        $targetList = "";
-
-        /*
-          If we're on Windows, we have to munge the time up to 2 secs to
-          be able to check file modification times.
-          (Windows has a max resolution of two secs for modification times)
-        */
-        $osname = strtolower(Phing::getProperty('os.name'));
-
-        // indexOf()
-        $index = ((($res = strpos($osname, 'win')) === false) ? -1 : $res);
-        if ($index  >= 0 ) {
-            $now += 2000;
-        }
-
-        $v = array();
-
-        for ($i=0, $size=count($files); $i < $size; $i++) {
-        
-            $targets = $mapper->main($files[$i]);
-            if (empty($targets)) {
-                $this->task->log($files[$i]." skipped - don't know how to handle it", Project::MSG_VERBOSE);
-                continue;
-            }
-
-            $src = null;
-            try {
-                if ($srcDir === null) {
-                    $src = new PhingFile($files[$i]);
-                } else {
-                    $src = $this->fileUtils->resolveFile($srcDir, $files[$i]);
-                }
-    
-                if ($src->lastModified() > $now) {
-                    $this->task->log("Warning: ".$files[$i]." modified in the future (".$src->lastModified()." > ".$now.")", Project::MSG_WARN);
-                }
-            } catch (IOException $ioe) {
-                $this->task->log("Unable to read file ".$files[$i]." (skipping): " . $ioe->getMessage());
-                continue;
-            }
-            
-            $added = false;
-            $targetList = "";
-
-            for ($j=0,$_j=count($targets); (!$added && $j < $_j); $j++) {
-
-                $dest = null;
-                if ($destDir === null) {
-                    $dest = new PhingFile($targets[$j]);
-                } else {
-                    $dest = $this->fileUtils->resolveFile($destDir, $targets[$j]);
-                }
-
-                if (!$dest->exists()) {
-                    $this->task->log($files[$i]." added as " . $dest->__toString() . " doesn't exist.", Project::MSG_VERBOSE);
-                    $v[] =$files[$i];
-                    $added = true;
-                } elseif ($src->lastModified() > $dest->lastModified()) {
-                    $this->task->log($files[$i]." added as " . $dest->__toString() . " is outdated.", Project::MSG_VERBOSE );
-                    $v[]=$files[$i];
-                    $added = true;
-                } elseif ($force === true) {
-                    $this->task->log($files[$i]." added as " . $dest->__toString() . " is forced to be overwritten.", Project::MSG_VERBOSE );
-                    $v[]=$files[$i];
-                    $added = true;
-                } else {
-                    if (strlen($targetList) > 0) {
-                        $targetList .= ", ";
-                    }
-                    $targetList .= $dest->getAbsolutePath();
-                }
-            }
-
-            if (!$added) {
-                $this->task->log($files[$i]." omitted as ".$targetList." ".(count($targets) === 1 ? " is " : " are ")."up to date.",  Project::MSG_VERBOSE);
-            }
-
-        }
-        $result = array();
-        $result = $v;
-        return $result;
-    }
-
-    /**
-     * Convenience layer on top of restrict that returns the source
-     * files as PhingFile objects (containing absolute paths if srcDir is
-     * absolute).
-     */
-    function restrictAsFiles(&$files, &$srcDir, &$destDir, &$mapper) {
-        $res = $this->restrict($files, $srcDir, $destDir, $mapper);
-        $result = array();
-        for ($i=0; $i<count($res); $i++) {
-            $result[$i] = new PhingFile($srcDir, $res[$i]);
-        }
-        return $result;
-    }
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/StringHelper.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/StringHelper.php
deleted file mode 100644
index 5c1b7bef3..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/StringHelper.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php
-
-/**
- * String helper utility class.
- *
- * This class includes some Java-like functions for parsing strings,
- * as well as some functions for getting qualifiers / unqualifying phing-style
- * classpaths.  (e.g. "phing.util.StringHelper").
- *
- * @author Hans Lellelid <hans@xmpl.org>
- * @package phing.system.util
- */
-class StringHelper {
-
-    private static $TRUE_VALUES = array("on", "true", "t", "yes");
-    private static $FALSE_VALUES = array("off", "false", "f", "no");
-    
-    /**
-     * Replaces identifier tokens with corresponding text values in passed string.
-     *
-     * @params array $strings Array of strings to multiply. (If string is passed, will convert to array)
-     * @params array $tokens The tokens to search for.
-     * @params array $replacements The values with which to replace found tokens.
-     * @return string
-     */
-    public static function multiply($strings, $tokens, $replacements) {
-        $strings = (array) $strings;
-        $results = array();
-        foreach ($strings as $string) {
-            $results[] = str_replace($tokens, $replacements, $string);
-        }        
-        return $results;
-    }
-
-    /**
-     * Remove qualification to name.
-     * E.g. eg.Cat -> Cat
-     * @param string $qualifiedName
-     * @param string $separator Character used to separate.
-     */
-    public static function unqualify($qualifiedName, $separator = '.') {
-        // if false, then will be 0
-        $pos = strrpos($qualifiedName, $separator);
-        if ($pos === false) { 
-            return $qualifiedName;  // there is no '.' in the qualifed name
-        } else {
-            return substr($qualifiedName, $pos + 1); // start just after '.'
-        }
-    }
-
-    /** 
-     * Converts a string to an indexed array of chars
-     * There's really no reason for this to be used in PHP, since strings
-     * are all accessible using the $string{0} notation.
-     * @param string $string
-     * @return array
-     * @deprecated
-     */
-    public static function toCharArray($str) {
-        $ret=array();
-        $len=strlen($str);
-        for ($i=0; $i < $len; $i++) {
-            $ret[] = $str{$i};
-        }
-        return $ret;
-    }
-    
-    /**
-     * Get the qualifier part of a qualified name.
-     * E.g. eg.Cat -> eg
-     * @return string
-     */    
-    public static function qualifier($qualifiedName, $seperator = '.') {
-        $pos = strrchr($qualifiedName, $seperator);
-        if ($pos === false) {
-            return '';
-        } else {
-            return substr($qualifiedName, 0, $pos);
-        }
-    }
-    
-    /**
-     * @param array $columns String[]
-     * @param string $prefix
-     * @return array String[]
-     */ 
-    public static function prefix( $columns, $prefix) {
-        if ($prefix == null) return $columns;
-        $qualified = array();
-        foreach($columns as $key => $column) {
-            $qualified[$key] = $prefix . $column;
-        }        
-        return $qualified;
-    }
-    
-    /**
-     *
-     * @return string
-     */ 
-    public static function root($qualifiedName, $separator = '.') {
-        $loc = strpos($qualifiedName, $separator);
-        return ($loc === false) ? $qualifiedName : substr($qualifiedName, 0, $loc);
-    }
-    
-    /**
-     * @return int
-     */
-    public static function hashCode($string) {
-        return crc32($string);
-    }
-    
-    /**
-     * @return boolean
-     */ 
-    public static function booleanValue($s) {
-        if (is_bool($s)) {
-            return $s; // it's already boolean (not a string)
-        }
-        // otherwise assume it's something like "true" or "t"
-        $trimmed = strtolower(trim($s));
-        return (boolean) in_array($trimmed, self::$TRUE_VALUES);
-    }
-
-    /** tests if a string is a representative of a boolean */
-    public static function isBoolean($s) {
-
-        if (is_bool($s)) {
-            return true; // it already is boolean
-        }
-        
-        if ($s === "" || $s === null || !is_string($s)) {
-            return false; // not a valid string for testing
-        }
-
-        $test = trim(strtolower($s));
-        return (boolean) in_array($test, array_merge(self::$FALSE_VALUES, self::$TRUE_VALUES));
-    }
-        
-    /**
-     * Creates a key based on any number of passed params.
-     * @return string
-     */
-    public static function key() {
-        $args = func_get_args();
-        return serialize($args);
-    }    
-    
-    /** tests if a string starts with a given string */
-    public static function startsWith($check, $string) {
-        if ($check === "" || $check === $string) {
-            return true;
-        } else {
-            return (strpos($string, $check) === 0) ? true : false;
-        }
-    }
-    
-    /** tests if a string ends with a given string */
-    public static function endsWith($check, $string) {
-        if ($check === "" || $check === $string) {
-            return true;
-        } else {
-            return (strpos(strrev($string), strrev($check)) === 0) ? true : false;
-        }
-    }            
-
-    /**
-     * a natural way of getting a subtring, php's circular string buffer and strange
-     * return values suck if you want to program strict as of C or friends 
-     */
-    public static function substring($string, $startpos, $endpos = -1) {
-        $len    = strlen($string);
-        $endpos = (int) (($endpos === -1) ? $len-1 : $endpos);
-        if ($startpos > $len-1 || $startpos < 0) {
-            trigger_error("substring(), Startindex out of bounds must be 0<n<$len", E_USER_ERROR);
-        }
-        if ($endpos > $len-1 || $endpos < $startpos) {
-            trigger_error("substring(), Endindex out of bounds must be $startpos<n<".($len-1), E_USER_ERROR);
-        }
-        if ($startpos === $endpos) {
-            return (string) $string{$startpos};
-        } else {
-            $len = $endpos-$startpos;
-        }
-        return substr($string, $startpos, $len+1);
-    }
-
-    /**
-     * Does the value correspond to a slot variable?
-     * @param string $value    
-     */
-    public static function isSlotVar($value) {
-        $value = trim($value);
-        if ($value === "") return false;
-        return preg_match('/^%\{([\w\.\-]+)\}$/', $value);
-    }
-    
-    /**
-     * Extracts the variable name for a slot var in the format %{task.current_file}
-     * @param string $var The var from build file.
-     * @return string Extracted name part.
-     */
-    public static function slotVar($var) {
-        return trim($var, '%{} ');
-    }
-    
-}
-
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/regexp/PregEngine.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/regexp/PregEngine.php
deleted file mode 100644
index 52c56f67b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/regexp/PregEngine.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/* 
- *  $Id: PregEngine.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-require_once 'phing/util/regexp/RegexpEngine.php';
-
-/**
- * PREG Regexp Engine.
- * Implements a regexp engine using PHP's preg_match(), preg_match_all(), and preg_replace() functions.
- * 
- * @author hans lellelid, hans@velum.net
- * @package phing.util.regex
- */
-class PregEngine implements RegexpEngine {
-
-    /**
-     * @var boolean
-     */
-    private $ignoreCase = false;
-        
-    /**
-     * Sets whether or not regex operation is case sensitive.
-     * @param boolean $bit
-     * @return void
-     */
-    function setIgnoreCase($bit) {
-        $this->ignoreCase = (boolean) $bit;
-    }
-
-    /**
-     * Gets whether or not regex operation is case sensitive.
-     * @return boolean
-     */
-    function getIgnoreCase() {
-        return $this->ignoreCase;
-    }
-        
-    /**
-     * The pattern needs to be converted into PREG style -- which includes adding expression delims & any flags, etc.
-     * @param string $pattern
-     * @return string prepared pattern.
-     */
-    private function preparePattern($pattern)
-    {
-        return '/'.$pattern.'/'.($this->ignoreCase ? 'i' : '');
-    }
-    
-    /**
-     * Matches pattern against source string and sets the matches array.
-     * @param string $pattern The regex pattern to match.
-     * @param string $source The source string.
-     * @param array $matches The array in which to store matches.
-     * @return boolean Success of matching operation.
-     */
-    function match($pattern, $source, &$matches) { 
-        return preg_match($this->preparePattern($pattern), $source, $matches);
-    }
-
-    /**
-     * Matches all patterns in source string and sets the matches array.
-     * @param string $pattern The regex pattern to match.
-     * @param string $source The source string.
-     * @param array $matches The array in which to store matches.
-     * @return boolean Success of matching operation.
-     */        
-    function matchAll($pattern, $source, &$matches) {
-        return preg_match_all($this->preparePattern($pattern), $source, $matches);
-    }
-
-    /**
-     * Replaces $pattern with $replace in $source string.
-     * References to \1 group matches will be replaced with more preg-friendly
-     * $1.
-     * @param string $pattern The regex pattern to match.
-     * @param string $replace The string with which to replace matches.
-     * @param string $source The source string.
-     * @return string The replaced source string.
-     */        
-    function replace($pattern, $replace, $source) {
-        // convert \1 -> $1, because we want to use the more generic \1 in the XML
-        // but PREG prefers $1 syntax.
-        $replace = preg_replace('/\\\(\d+)/', '\$$1', $replace);
-        return preg_replace($this->preparePattern($pattern), $replace, $source);
-    }
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/regexp/Regexp.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/regexp/Regexp.php
deleted file mode 100644
index 625de1c91..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/regexp/Regexp.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-/* 
- *  $Id: Regexp.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-/**
- * A factory class for regex functions.
- * @author Hans Lellelid <hans@xmpl.org>
- * @package  phing.util.regexp
- * @version $Revision: 1.5 $
- */
-class Regexp {
-
-    /**
-     * Matching groups found. 
-     * @var array
-     */
-    private $groups = array();
-     
-    /**
-     * Pattern to match.
-     * @var string
-     */
-    private $pattern;
-    
-    /**
-     * Replacement pattern.
-     * @var string
-     */
-    private $replace;
-    
-    /**
-     * The regex engine -- e.g. 'preg' or 'ereg';
-     * @var RegexpEngine
-     */
-    private $engine;
-    
-    /**
-     * Constructor sets the regex engine to use (preg by default).
-     * @param string $_engineType The regex engine to use.
-     */
-    function __construct($engineType='preg') {        
-        if ($engineType == 'preg') {
-            include_once 'phing/util/regexp/PregEngine.php';
-            $this->engine = new PregEngine();
-        } elseif ($engineType == 'ereg') {
-            include_once 'phing/util/regexp/EregEngine.php';
-            $this->engine = new EregEngine();
-        } else {
-            throw new BuildException("Invalid engine type for Regexp: " . $engineType);
-        }                
-    }
-
-    /**
-     * Sets pattern to use for matching.
-     * @param string $pat The pattern to match on.
-     * @return void
-     */
-    public function setPattern($pat) {
-        $this->pattern = (string) $pat;        
-    }
-    
-    
-    /**
-     * Gets pattern to use for matching.
-     * @return string The pattern to match on.
-     */
-    public function getPattern() {
-        return $this->pattern;
-    }
-    
-    /**
-     * Sets replacement string.
-     * @param string $rep The pattern to replace matches with.
-     * @return void
-     */
-    public function setReplace($rep) {
-        $this->replace = (string) $rep;
-    }
-    
-    /**
-     * Gets replacement string.
-     * @return string The pattern to replace matches with.
-     * @return void
-     */
-    public function getReplace() {
-        return $this->replace;
-    }
-    
-    /**
-     * Performs match of specified pattern against $subject.
-     * @param string $subject The subject, on which to perform matches.
-     * @return boolean Whether or not pattern matches subject string passed.
-     */
-    public function matches($subject) {
-        if($this->pattern === null) {            
-            throw new Exception("No pattern specified for regexp match().");
-        }
-        return $this->engine->match($this->pattern, $subject, $this->groups);
-    }
-    
-    /**
-     * Performs replacement of specified pattern and replacement strings.
-     * @param string $subject Text on which to perform replacement.
-     * @return string subject after replacement has been performed.
-     */
-    public function replace($subject) {
-        if ($this->pattern === null || $this->replace === null) {
-            throw new Exception("Missing pattern or replacement string regexp replace().");
-        }        
-        return $this->engine->replace($this->pattern, $this->replace, $subject);
-    }
-    
-    /**
-     * Get array of matched groups.
-     * @return array Matched groups
-     */ 
-    function getGroups() {
-        return $this->groups;
-    }
-
-    /**
-     * Get specific matched group. 
-     * @param integer $idx
-     * @return string specified group or NULL if group is not set.
-     */ 
-    function getGroup($idx) { 
-        if (!isset($this->groups[$idx])) {
-            return null;
-        }
-        return $this->groups[$idx];
-    }
-    
-    /**
-     * Sets whether the regexp matching is case insensitive.
-     * (default is false -- i.e. case sensisitive)
-     * @param boolean $bit
-     */ 
-    function setIgnoreCase($bit) {
-        $this->engine->setIgnoreCase($bit);
-    }
-    
-    /**
-     * Gets whether the regexp matching is case insensitive.
-     * @return boolean
-     */
-    function getIgnoreCase() {
-        return $this->engine->getIgnoreCase();
-    }
-} 
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/regexp/RegexpEngine.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/regexp/RegexpEngine.php
deleted file mode 100644
index 54bd422e0..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/phing/util/regexp/RegexpEngine.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/* 
- *  $Id: RegexpEngine.php 325 2007-12-20 15:44:58Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>. 
- */
-
-/**
- * Contains some shared attributes and methods -- and some abstract methods with
- * engine-specific implementations that sub-classes must override.
- * 
- * @author Hans Lellelid <hans@velum.net>
- * @package phing.util.regex
- * @version $Revision: 1.4 $
- */
-interface RegexpEngine {
-    
-    /**
-     * Sets whether or not regex operation should ingore case.
-     * @param boolean $bit
-     * @return void
-     */
-    public function setIgnoreCase($bit);
-    
-    /**
-     * Returns status of ignore case flag.
-     * @return boolean
-     */
-    public function getIgnoreCase();
-    
-    /**
-     * Matches pattern against source string and sets the matches array.
-     * @param string $pattern The regex pattern to match.
-     * @param string $source The source string.
-     * @param array $matches The array in which to store matches.
-     * @return boolean Success of matching operation.
-     */
-    function match($pattern, $source, &$matches);
-    
-    /**
-     * Matches all patterns in source string and sets the matches array.
-     * @param string $pattern The regex pattern to match.
-     * @param string $source The source string.
-     * @param array $matches The array in which to store matches.
-     * @return boolean Success of matching operation.
-     */    
-    function matchAll($pattern, $source, &$matches);
-
-    /**
-     * Replaces $pattern with $replace in $source string.
-     * @param string $pattern The regex pattern to match.
-     * @param string $replace The string with which to replace matches.
-     * @param string $source The source string.
-     * @return string The replaced source string.
-     */        
-    function replace($pattern, $replace, $source);
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/bin/propel-gen b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/bin/propel-gen
deleted file mode 100755
index 11c929f01..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/bin/propel-gen
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-# Shell wrapper for Propel generator
-# $Id$
-#
-# This script will do the following:
-# - check for PHING_COMMAND env, if found, use it.
-#   - if not found assume php is on the path
-# - check for PROPEL_GEN_HOME evn, if found use it
-#   - if not look for it
-
-if [ -z "$PROPEL_GEN_HOME" ] ; then
-
-  # echo "WARNING: PROPEL_GEN_HOME environment not set. Attempting to guess."
-
-  # try to find Propel
-  if [ -d /opt/propel/generator ] ; then 
-    PROPEL_GEN_HOME=/opt/propel/generator
-  fi
-
-  if [ -d "${HOME}/opt/propel/generator" ] ; then 
-    PROPEL_GEN_HOME="${HOME}/opt/propel/generator"
-  fi
-
-  if [ -d "/usr/local/propel/generator" ] ; then 
-    PROPEL_GEN_HOME="/usr/local/propel/generator"
-  fi
-
-  if [ -d "${HOME}/usr/propel/generator" ] ; then 
-    PROPEL_GEN_HOME="${HOME}/usr/propel/generator"
-  fi
-  
-  ## resolve links - $0 may be a link to phing's home
-  PRG="$0"
-  progname=`basename "$0"`
-  saveddir=`pwd`
-
-  # need this for relative symlinks
-  dirname_prg=`dirname "$PRG"`
-  cd "$dirname_prg"
-  
-  while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-	PRG="$link"
-    else
-	PRG=`dirname "$PRG"`"/$link"
-    fi
-  done
-  
-  PROPEL_GEN_HOME=`dirname "$PRG"`/..
-
-  cd "$saveddir"
-
-  # make it fully qualified
-  PROPEL_GEN_HOME=`cd "$PROPEL_GEN_HOME" && pwd`
-  
-  # make it available in PHP via getenv("PROPEL_GEN_HOME")
-  export PROPEL_GEN_HOME
-fi
-
-if (test -z "$PHING_COMMAND") ; then
-	# echo "WARNING: PHING_COMMAND environment not set. (Assuming phing on PATH)"
-	export PHING_COMMAND="phing"
-fi
-
-$PHING_COMMAND -f $PROPEL_GEN_HOME/build.xml -Dusing.propel-gen=true -Dproject.dir=$*
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/bin/propel-gen.bat b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/bin/propel-gen.bat
deleted file mode 100755
index 2a25b7a0a..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/bin/propel-gen.bat
+++ /dev/null
@@ -1,47 +0,0 @@
-@echo off
-
-rem *********************************************************************
-rem ** The Propel generator convenience script for Windows based systems
-rem ** $Id$
-rem *********************************************************************
-
-rem This script will do the following:
-rem - check for PHING_COMMAND env, if found, use it.
-rem   - if not found detect php, if found use it, otherwise err and terminate
-rem - check for PROPEL_GEN_HOME evn, if found use it
-rem   - if not found error and leave
-
-if "%OS%"=="Windows_NT" @setlocal
-
-rem %~dp0 is expanded pathname of the current script under NT
-set DEFAULT_PROPEL_GEN_HOME=%~dp0..
-
-goto init
-goto cleanup
-
-:init
-
-if "%PROPEL_GEN_HOME%" == "" set PROPEL_GEN_HOME=%DEFAULT_PROPEL_GEN_HOME%
-set DEFAULT_PROPEL_GEN_HOME=
-
-if "%PHING_COMMAND%" == "" goto no_phingcommand
-
-goto run
-goto cleanup
-
-:run
-%PHING_COMMAND% -f "%PROPEL_GEN_HOME%\build.xml" -Dusing.propel-gen=true -Dproject.dir=%*
-goto cleanup
-
-:no_phingcommand
-REM echo ------------------------------------------------------------------------
-REM echo WARNING: Set environment var PHING_COMMAND to the location of your phing
-REM echo          executable (e.g. C:\PHP\phing.bat). 
-REM echo Proceeding with assumption that phing.bat is on Path
-REM echo ------------------------------------------------------------------------
-set PHING_COMMAND=phing.bat
-goto init
-
-:cleanup
-if "%OS%"=="Windows_NT" @endlocal
-REM pause
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/build-propel.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/build-propel.xml
deleted file mode 100644
index 6837c2cbe..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/build-propel.xml
+++ /dev/null
@@ -1,542 +0,0 @@
-<project name="propel" default="main">
-
-  <!--
-    Note - You should not have to edit this file.
-
-    Instead, if calling build-propel.xml directly, edit the build.properties
-    that is in the same directory. If calling build-propel.xml via another
-    build file, you can also use the build.properties in the same directory,
-    or set the property propel.contextProperties to the file
-    to use in place of build.properties (e.g. project.properties).
-  -->
-
-  <property name="build.properties" value="build.properties"/>
-  <property name="propel.contextProperties" value="./${build.properties}"/>
-  <property name="propel.home" value="."/>
-
-  <available file="${propel.home}/build.properties" property="globalBuildPopertiesExists"/>
-
-  <if>
-  	<and>
-  		<isset property="globalBuildPopertiesExists"/>
-  	</and>
-  	<then>
-	    <property file="${propel.home}/build.properties"/>
-    </then>
-  </if>
-
-  <!--
-    The default.properties file will map old properties to the new ones along
-    with setting the corret defaults.
-  -->
-  <property file="${propel.home}/default.properties"/>
-
-  <!--
-    Do forward declarations of all of our tasks to
-    centralize them and clean up the targets.
-  -->
-
-  <path id="propelclasses">
-    <pathelement dir="${propel.home}/classes/"/>
-  </path>
-
-  <taskdef
-    name="propel-data-model"
-    classname="propel.phing.PropelDataModelTemplateTask" classpathRef="propelclasses"/>
-  <taskdef
-    name="propel-om"
-    classname="propel.phing.PropelOMTask" classpathRef="propelclasses"/>
-  <taskdef
-    name="propel-data-dtd"
-    classname="propel.phing.PropelDataDTDTask" classpathRef="propelclasses"/>
-  <taskdef
-    name="propel-data-dump"
-    classname="propel.phing.PropelDataDumpTask" classpathRef="propelclasses"/>
-  <taskdef
-    name="propel-data-sql"
-    classname="propel.phing.PropelDataSQLTask" classpathRef="propelclasses"/>
-   <taskdef
-    name="propel-creole-transform"
-    classname="propel.phing.PropelCreoleTransformTask" classpathRef="propelclasses"/>
-   <taskdef
-    name="propel-schema-reverse"
-    classname="propel.phing.PropelSchemaReverseTask" classpathRef="propelclasses"/>
-  <taskdef
-    name="propel-sql"
-    classname="propel.phing.PropelSQLTask" classpathRef="propelclasses"/>
-  <taskdef
-    name="propel-sql-exec"
-    classname="propel.phing.PropelSQLExec" classpathRef="propelclasses"/>
-  <taskdef
-    name="propel-graphviz"
-    classname="propel.phing.PropelGraphvizTask" classpathRef="propelclasses"/>
-  <taskdef
-    name="propel-convert-conf"
-    classname="propel.phing.PropelConvertConfTask" classpathRef="propelclasses"/>
-
-  <!-- ================================================================ -->
-  <!-- M A I N  T A R G E T                                             -->
-  <!-- ================================================================ -->
-  <!-- This default target will run all the targets that generate       -->
-  <!-- source. You will probably only run this target once then         -->
-  <!-- call individual targets as necessary to update your sources      -->
-  <!-- when you change your XML schema.                                 -->
-  <!-- ================================================================ -->
-
-  <target
-    name="main"
-  	depends="mysqli-check"
-    description="==> generates sql + om classes">
-
-    <phingcall target="sql"/>
-    <phingcall target="om"/>
-    <phingcall target="convert-conf"/>
-  </target>
-
-  <!-- ================================================================ -->
-  <!-- C H E C K  R U N  O N L Y  O N  S C H E M A  C H A N G E         -->
-  <!-- ================================================================ -->
-  <!-- Maps the propel.runOnlyOnSchemaChange to                         -->
-  <!-- propel.internal.runOnlyOnSchemaChange                            -->
-  <!-- ================================================================ -->
-
-  <target name="check-run-only-on-schema-change">
-    <condition property="propel.internal.runOnlyOnSchemaChange">
-      <equals arg1="${propel.runOnlyOnSchemaChange}" arg2="true"/>
-    </condition>
-  </target>
-
-  <!-- ================================================================ -->
-  <!-- G E N E R A T E  P R O J E C T  S Q L                            -->
-  <!-- ================================================================ -->
-  <!-- Generate the SQL for your project, These are in addition         -->
-  <!-- to the base Turbine tables! The tables you require for your      -->
-  <!-- project should be specified in project-schema.xml.               -->
-  <!-- ================================================================ -->
-
-  <target
-    name="sql-check"
-    depends="check-run-only-on-schema-change"
-    if="propel.internal.runOnlyOnSchemaChange">
-    <uptodate
-      property="propel.internal.sql.uptodate"
-      targetfile="${propel.sql.dir}/${propel.schema.default.basename}.sql">
-      <srcfiles dir="${propel.schema.dir}" includes="**/${propel.schema.default.basename}.xml" />
-    </uptodate>
-  </target>
-
-  <!--	temporary target to check whether postgres is being used with identifier quoting ON.
-		If so, a warning is issued, since identifier quoting is only paritally implemented & this point.  -->
-  <target name="pgsql-quoting-check">
-  	<if>
-  		<and>
-			<equals arg1="${propel.database}" arg2="pgsql"/>
-			<equals arg1="${propel.disableIdentifierQuoting}" arg2=""/>
-		</and>
-		<then>
-			<warn>ATTENTION: It appears you are using PostgreSQL and you have identifier-quoting turned on.</warn>
-			<warn>It is suggested that you disable identifier quoting when using PostgreSQL -- especially if you</warn>
-			<warn>have case-sensitive columns in your database.</warn>
-			<warn></warn>
-			<warn>To disable identifier quoting, add the following property to your build.properties (or specify</warn>
-			<warn>it using -D on commandline):</warn>
-			<warn></warn>
-			<warn>propel.disableIdentifierQuoting=true</warn>
-			<warn></warn>
-			<warn>You can ignore this warning if you understand the issues related to case-sensitivity and Propel's</warn>
-			<warn>DDL-only implementation of identifier quoting.</warn>
-		</then>
-	</if>
-  </target>
-
-	  <!--	temporary target to check whether mysqli is being used
-			If so, a warning is issued, since this is deprecated  -->
-	  <target name="mysqli-check">
-	  	<if>
-	  		<and>
-				<equals arg1="${propel.database}" arg2="mysqli"/>
-			</and>
-			<then>
-				<warn>ATTENTION: It appears you are using the mysqli driver.</warn>
-				<warn></warn>
-				<warn>This driver is no longer supported by Propel because Propel now uses PDO for database connections.</warn>
-				<warn>Please use mysqli driver instead.</warn>
-				<fail>Use 'mysql' instead of 'mysqli' for your propel.database property.</fail>
-			</then>
-		</if>
-	  </target>
-	
-  <target
-    name="sql"
-    depends="sql-check,pgsql-quoting-check,mysqli-check"
-    unless="propel.internal.sql.uptodate"
-    description="==> generates the SQL for your project">
-
-    <echo message="+------------------------------------------+"/>
-    <echo message="|                                          |"/>
-    <echo message="| Generating SQL for YOUR Propel project!  |"/>
-    <echo message="|                                          |"/>
-    <echo message="+------------------------------------------+"/>
-
-    <phingcall target="sql-template"/>
-
-  </target>
-
-  <target name="sql-template">
-    <propel-sql
-      validate="${propel.schema.validate}"
-      xsd="${propel.schema.xsd.file}"
-      xsl="${propel.schema.xsl.file}"
-      outputDirectory="${propel.sql.dir}"
-      sqldbmap="${propel.sql.dir}/sqldb.map"
-      targetDatabase="${propel.database}"
-      packageObjectModel="${propel.packageObjectModel}"
-      url="${propel.database.url}"
-      userId="${propel.database.user}"
-      password="${propel.database.password}">
-      <mapper type="glob" from="${propel.sql.mapper.from}" to="${propel.sql.mapper.to}"/>
-      <schemafileset dir="${propel.schema.dir}"
-        includes="${propel.schema.sql.includes}"
-        excludes="${propel.schema.sql.excludes}"
-      />
-    </propel-sql>
-  </target>
-
-  <!-- ================================================================ -->
-  <!-- C R E A T E  T A R G E T  D A T A B A S E                        -->
-  <!-- ================================================================ -->
-  <!-- Create the target database by executing a generated script       -->
-  <!-- that is capable of performing the task.                          -->
-  <!-- ================================================================ -->
-
-  <target name="create-db-check">
-    <condition property="propel.internal.manualCreation">
-      <equals arg1="${propel.database.manualCreation}" arg2="true"/>
-    </condition>
-  </target>
-
-  <target
-    name="create-db"
-    unless="propel.internal.manualCreation"
-    depends="create-db-check,mysqli-check"
-    description="==> generates the target database">
-
-    <fail message="create-db target temporarily disabled, while we replace creole components."/>
-
-	<!--
-    <propel-data-model
-      validate="${propel.schema.validate}"
-      xsd="${propel.schema.xsd.file}"
-      xsl="${propel.schema.xsl.file}"
-      controlTemplate="${propel.template.sqlDbInit}"
-      outputDirectory="${propel.sql.dir}"
-      outputFile="create-db.sql"
-      targetDatabase="${propel.database}"
-      dbEncoding="${propel.database.encoding}"
-      templatePath="${propel.templatePath}"
-      packageObjectModel="${propel.packageObjectModel}">
-      <schemafileset dir="${propel.schema.dir}"
-        includes="${propel.schema.create-db.includes}"
-        excludes="${propel.schema.create-db.excludes}"
-      />
-    </propel-data-model>
-
-    <echo message="Executing the create-db.sql script ..."/>
-
-    <sql
-      autocommit="true"
-      driver="${propel.database.driver}"
-      onerror="continue"
-      src="${propel.sql.dir}/create-db.sql"
-      url="${propel.database.createUrl}"
-    />
-    -->
-  </target>
-
-  <!-- ================================================================ -->
-  <!-- I N S E R T  S I N G L E  S Q L  F I L E S                       -->
-  <!-- ================================================================ -->
-
-  <target
-    name="insert-sql"
-    description="==> inserts the generated sql ">
-
-    <propel-sql-exec
-      autocommit="true"
-      onerror="continue"
-      sqldbmap="${propel.sql.dir}/sqldb.map"
-      srcDir="${propel.sql.dir}"
-      url="${propel.database.buildUrl}"
-      userId="${propel.database.user}"
-      password="${propel.database.password}"
-    />
-  </target>
-
-  <!-- ================================================================ -->
-  <!-- C R E O L E   T O   X M L                                        -->
-  <!-- ================================================================ -->
-
-  <target
-    name="creole"
-    description="==> generate xml schema from Creole metadata">
-
-    <echo message="+-----------------------------------------------+"/>
-    <echo message="|                                               |"/>
-    <echo message="| Generating XML from Creole connection !       |"/>
-    <echo message="|                                               |"/>
-    <echo message="+-----------------------------------------------+"/>
-
-    <propel-creole-transform
-      dbDriver="${propel.database.creole.driver}"
-      dbSchema="${propel.database.schema}"
-      dbEncoding="${propel.database.encoding}"
-      dbUrl="${propel.database.creole.url}"
-      outputFile="${propel.schema.dir}/${propel.default.schema.basename}.xml"
-      samePhpName="${propel.samePhpName}"
-      addVendorInfo="${propel.addVendorInfo}"
-      addValidators="${propel.addValidators}"
-    />
-
-  </target>
-  
-  <!-- ================================================================ -->
-  <!-- N E W   R E V E R S E   T O   X M L                              -->
-  <!-- ================================================================ -->
-
-  <target
-    name="reverse"
-    description="==> generate xml schema from reverse-engineered database (new)">
-
-    <echo message="+-----------------------------------------------+"/>
-    <echo message="|                                               |"/>
-    <echo message="| Generating XML from PDO connection !          |"/>
-    <echo message="|                                               |"/>
-    <echo message="+-----------------------------------------------+"/>
-
-    <propel-schema-reverse
-      databaseName="${propel.project}"
-      dbSchema="${propel.database.schema}"
-      dbEncoding="${propel.database.encoding}"
-      url="${propel.database.buildUrl}"
-      userId="${propel.database.user}"
-      password="${propel.database.password}"
-      outputFile="${propel.schema.dir}/${propel.default.schema.basename}.xml"
-      samePhpName="${propel.samePhpName}"
-      addVendorInfo="${propel.addVendorInfo}"
-      addValidators="${propel.addValidators}"
-    />
-
-  </target>
-
-
-  <!-- ================================================================ -->
-  <!-- Generate SQL from XML data file                                  -->
-  <!-- ================================================================ -->
-
-  <target
-    name="datasql"
-    description="==> generates sql from data xml">
-
-    <echo message="+-----------------------------------------------+"/>
-    <echo message="|                                               |"/>
-    <echo message="| Generating SQL from data XML !                |"/>
-    <echo message="|                                               |"/>
-    <echo message="+-----------------------------------------------+"/>
-
-    <propel-data-sql
-      validate="${propel.schema.validate}"
-      xsd="${propel.schema.xsd.file}"
-      xsl="${propel.schema.xsl.file}"
-      outputDirectory="${propel.sql.dir}"
-      sqldbmap="${propel.sql.dir}/sqldb.map"
-      dbEncoding="${propel.database.encoding}"
-      targetDatabase="${propel.database}"
-      datadbmap="${propel.schema.dir}/datadb.map"
-      srcDir="${propel.schema.dir}">
-      <mapper type="glob" from="${propel.datasql.mapper.from}" to="${propel.datasql.mapper.to}"/>
-      <schemafileset dir="${propel.schema.dir}"
-        includes="${propel.schema.datadtd.includes}"
-        excludes="${propel.schema.datadtd.excludes}"
-      />
-    </propel-data-sql>
-  </target>
-
-  <!-- ================================================================ -->
-  <!-- Dump data from database into xml file                            -->
-  <!-- ================================================================ -->
-
-  <target
-    name="datadump"
-    description="==> dump data from database into xml file">
-
-    <echo message="+-----------------------------------------------+"/>
-    <echo message="|                                               |"/>
-    <echo message="| Dumping the data from database into XML       |"/>
-    <echo message="|                                               |"/>
-    <echo message="+-----------------------------------------------+"/>
-
-    <propel-data-dump
-      validate="${propel.schema.validate}"
-      xsd="${propel.schema.xsd.file}"
-      xsl="${propel.schema.xsl.file}"
-      targetDatabase="${propel.database}"
-      datadbmap="${propel.schema.dir}/datadb.map"
-      databaseDriver="${propel.database.driver}"
-      dbEncoding="${propel.database.encoding}"
-      databaseUrl="${propel.database.url}"
-      databaseUser="${propel.database.user}"
-      databasePassword="${propel.database.password}"
-      outputDirectory="${propel.schema.dir}">
-      <mapper type="glob" from="${propel.datadump.mapper.from}" to="${propel.datadump.mapper.to}"/>
-      <schemafileset dir="${propel.schema.dir}"
-        includes="${propel.schema.datadtd.includes}"
-        excludes="${propel.schema.datadtd.excludes}"
-      />
-     </propel-data-dump>
-  </target>
-
-  <!-- ================================================================ -->
-  <!-- G E N E R A T E  P R O J E C T  D A T A  D T D                   -->
-  <!-- ================================================================ -->
-  <!-- Generate the DATA DTD for your project                           -->
-  <!-- ================================================================ -->
-
-  <target
-    name="datadtd"
-    description="==> generates the DATA DTD for your project">
-
-    <echo message="+-----------------------------------------------+"/>
-    <echo message="|                                               |"/>
-    <echo message="| Generating Data DTD for YOUR Propel project!  |"/>
-    <echo message="|                                               |"/>
-    <echo message="+-----------------------------------------------+"/>
-
-    <propel-data-dtd
-      validate="${propel.schema.validate}"
-      xsd="${propel.schema.xsd.file}"
-      xsl="${propel.schema.xsl.file}"
-      targetDatabase="${propel.database}"
-      outputDirectory="${propel.output.dir}"
-      templatePath="${propel.templatePath}">
-      <!-- TODO: add properties for the mapper type, from, and to -->
-      <mapper type="glob" from="${propel.datadtd.mapper.from}" to="${propel.datadtd.mapper.to}"/>
-      <schemafileset dir="${propel.schema.dir}"
-        includes="${propel.schema.datadtd.includes}"
-        excludes="${propel.schema.datadtd.excludes}"
-      />
-    </propel-data-dtd>
-  </target>
-
-  <!-- ================================================================ -->
-  <!-- G E N E R A T E  P R O J E C T  P E E R  B A S E D  O M          -->
-  <!-- ================================================================ -->
-  <!-- Generate the Peer-based object model for your project.           -->
-  <!-- These are in addition to the base Propel OM!                     -->
-  <!-- ================================================================ -->
-
-  <target
-    name="om-check"
-    depends="check-run-only-on-schema-change"
-    if="propel.internal.runOnlyOnSchemaChange">
-    <uptodate
-      property="propel.internal.om.uptodate"
-      targetfile="${propel.php.dir}/report.${propel.project}.om.generation">
-      <srcfiles dir="${propel.schema.dir}" includes="**/${propel.schema.om.includes}.xml" />
-    </uptodate>
-  </target>
-
-  <target
-    name="om"
-    depends="om-check,mysqli-check"
-    unless="propel.internal.om.uptodate"
-    description="==> generates the Peer-based object model for your project">
-
-    <echo message="+------------------------------------------+"/>
-    <echo message="|                                          |"/>
-    <echo message="| Generating Peer-based Object Model for   |"/>
-    <echo message="| YOUR Propel project!                     |"/>
-    <echo message="|                                          |"/>
-    <echo message="+------------------------------------------+"/>
-
-    <phingcall target="om-template"/>
-    <!--<phingcall target="om-tar"/>-->
-  </target>
-
-  <target name="om-template">
-    <propel-om
-      validate="${propel.schema.validate}"
-      xsd="${propel.schema.xsd.file}"
-      xsl="${propel.schema.xsl.file}"
-      outputDirectory="${propel.php.dir}"
-      targetDatabase="${propel.database}"
-      targetPackage="${propel.targetPackage}"
-      targetPlatform="${propel.targetPlatform}"
-      packageObjectModel="${propel.packageObjectModel}">
-      <schemafileset dir="${propel.schema.dir}"
-        includes="${propel.schema.om.includes}"
-        excludes="${propel.schema.om.excludes}"
-      />
-    </propel-om>
-  </target>
-
-  <!-- ================================================================== -->
-  <!-- X M L   R U N T I M E   C O N F   T O   P H P   A R R A Y          -->
-  <!-- ================================================================== -->
-
-  <target
-    name="convert-conf"
-    description="==> converts properties file to PHP array">
-
-    <echo message="+------------------------------------------+"/>
-    <echo message="|                                          |"/>
-    <echo message="| Converting runtime config file to an     |"/>
-    <echo message="| array dump for improved performance.     |"/>
-    <echo message="|                                          |"/>
-    <echo message="+------------------------------------------+"/>
-    
-    <echo>Output file: ${propel.runtime.phpconf.file}</echo>
-    <echo>XMLFile: ${propel.conf.dir}/${propel.runtime.conf.file}</echo>
-
-    <propel-convert-conf
-      targetDatabase="${propel.database}"
-      xsd="${propel.schema.xsd.file}"
-      xsl="${propel.schema.xsl.file}"
-      xmlConfFile="${propel.conf.dir}/${propel.runtime.conf.file}"
-      outputDirectory="${propel.phpconf.dir}"
-      outputFile="${propel.runtime.phpconf.file}"
-      packageObjectModel="${propel.packageObjectModel}">
-      <schemafileset dir="${propel.schema.dir}"
-        includes="${propel.schema.sql.includes}"
-        excludes="${propel.schema.sql.excludes}"
-      />
-     </propel-convert-conf>
-
-  </target>
-
-  <target
-    name="graphviz"
-    depends="sql-check"
-    description="==> generates Graphviz file for your project">
-
-    <echo message="+------------------------------------------+"/>
-    <echo message="|                                          |"/>
-    <echo message="| Generating Graphiz for YOUR Propel       |"/>
-    <echo message="| project!                                 |"/>
-    <echo message="|                                          |"/>
-    <echo message="+------------------------------------------+"/>
-
-    <propel-graphviz
-      outputDirectory="${propel.graph.dir}"
-      targetDatabase="${propel.database}"
-      sqldbmap="${propel.sql.dir}/sqldb.map"
-      packageObjectModel="${propel.packageObjectModel}">
-      <mapper type="glob" from="${propel.sql.mapper.from}" to="${propel.sql.mapper.to}"/>
-      <schemafileset dir="${propel.schema.dir}"
-        includes="${propel.schema.sql.includes}"
-        excludes="${propel.schema.sql.excludes}"
-      />
-    </propel-graphviz>
-  </target>
-
-
-</project>
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/build.properties-sample b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/build.properties-sample
deleted file mode 100644
index bcb8a2f41..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/build.properties-sample
+++ /dev/null
@@ -1,194 +0,0 @@
-# -------------------------------------------------------------------
-#
-# P R O P E L  C O N F I G U R A T I O N  F I L E
-#
-# -------------------------------------------------------------------
-# This file contains some example properties.  Ideally properties
-# should be specified in the project-specific build.properties file;
-# however, this file can be used to specify non-default properties 
-# that you would like to use accross all of your Propel projects.
-# -------------------------------------------------------------------
-#
-
-propel.home = .
-
-# -------------------------------------------------------------------
-#
-#  P R O J E C T
-#
-# -------------------------------------------------------------------
-# This is the name of your Propel project. The name of your Propel
-# project is used (by default) to determine where the generator will
-# find needed configuration files and will place resuilting build
-# files. E.g. if your project is named 'killerapp', Propel will 
-# look here for schema.xml and runtime-conf.xml files:
-# 
-#   projects/killerapp/
-#
-# -------------------------------------------------------------------
-
-# You can set this here, but it's preferrable to set this in a 
-# project-specific build.properties file.
-#
-# propel.project = bookstore
-
-# -------------------------------------------------------------------
-#
-#  T A R G E T  D A T A B A S E
-#
-# -------------------------------------------------------------------
-# This is the target database, only considered when generating
-# the SQL for your Propel project. Your possible choices are:
-#
-#   mssql, mysql, oracle, pgsql, sqlite
-# -------------------------------------------------------------------
-
-# You can set this here, but it's preferrable to set this in a 
-# project-specific build.properties file.
-#
-# propel.database = mysql
-
-# -------------------------------------------------------------------
-#
-#  O B J E C T  M O D E L  I N F O R M A T I O N
-#
-# -------------------------------------------------------------------
-# These settings will allow you to customize the way your
-# Peer-based object model is created.
-# -------------------------------------------------------------------
-# addGenericAccessors
-#   If true, Propel adds methods to get database fields by name/position.
-#
-# addGenericMutators
-#   If true, Propel adds methods to set database fields by name/position.
-#
-# addSaveMethod
-#   If true, Propel adds tracking code to determine how to save objects.
-#
-# addTimeStamp
-#   If true, Propel true puts time stamps in phpdoc of generated om files.
-#
-# basePrefix
-#   A string to pre-pend to the file names of base data and peer objects.
-#
-# complexObjectModel
-#   If true, Propel generates data objects with collection support and 
-#   methods to easily retreive foreign key relationships.
-#
-# targetPackage
-#   Sets the PHP "package" the om files will generated to, e.g. 
-#   "com.company.project.om".
-#
-# targetPlatform
-#   Sets whether Propel is building classes for php5 (default) 
-#   or php4 (experimental).
-#
-# packageObjectModel
-#   Sets whether Propel is packaging ObjectModel fro several 
-#   [package].schema.xml files. The <database package="packageName">
-#   attribute has to be set then. (warning: this is experimental!)
-#
-# -------------------------------------------------------------------
-
-# classes will be put in (and  included from) this directory
-# e.g. if package is "bookstore" then om will expect include('bookstore/Book.php'); to work.
-# use dot-path notation -- e.g. my.bookstore -> my/bookstore.
-#
-propel.targetPackage = ${propel.project}
-
-propel.addGenericAccessors = false
-propel.addGenericMutators = false
-propel.addSaveMethod = true
-propel.addTimeStamp = true
-propel.basePrefix = Base
-propel.complexObjectModel = true
-propel.targetPlatform = php5
-propel.packageObjectModel = false
-
-# -------------------------------------------------------------------
-#
-#  D B   C O N N E C T I O N   S E T T I N G S
-#
-# -------------------------------------------------------------------
-# Creole connection settings. These connection settings are used by
-# build tagets that perform database operations (e.g. 'insert-sql',
-# 'creole').
-#
-# You can set them here, but it's preferrable to set these properties
-# in a project-specific build.properties file.
-#
-
-# If you want to use a custom driver, specify it below, otherwise
-# leave it blank or comment it out to use Creole stock driver.
-#
-# propel.database.driver = creole.drivers.sqlite.SQLiteConnection
-
-# Note that if you do not wish to specify the database (e.g. if you
-# are using multiple databses) you can use the @DB@ token which
-# will be replaced with a database at runtime.
-#
-# propel.database.url = mysql://root@localhost/bookstore
-
-# For MySQL or Oracle, you also need to specify username & password 
-# propel.database.user = [db username]
-# propel.database.password = [db password]
-
-# Use the URL below to specify a DSN to used to create the database.
-# Note that this URL should not contain the database name, as you will
-# get an error if the database does not exist.
-# (This does not apply to SQLite since the databse is automatically created
-# when the connection is made -- if it does not already exist.)
-#
-# propel.database.createUrl = mysql://root@localhost/
-
-
-# -------------------------------------------------------------------
-#
-# C R E O L E  TO  X M L
-#
-# -------------------------------------------------------------------
-# These settings only applies to the 'creole' target.  
-# -------------------------------------------------------------------
-#
-# samePhpName 
-#   If true, the Creole task will set the phpName attribute for the 
-#   tables and columns to be the same as SQL name.
-#
-# addVendorInfo 
-#   If true, the Creole task will add vendor specific information 
-#   to the database schema
-#
-# addValidators 
-#   Bitfield like option to turn on/off addition of Validator and 
-#   Rule tags to the schema. Uses a boolean syntax like in php.ini.
-#   Allowed tokens are: 
-#      none       add no validators)
-#      all        add all validators)
-#      maxlength  add maxlengths for string type columns)
-#      maxvalue   add maxvalue for numeric columns)
-#      type       add notmatch validators for numeric columns)
-#      required   add required validators for required columns)
-#      unique     add unique validators for unique indexes)
-#   Allowed operators are: 
-#      &          bitwise AND 
-#      |          bitwise OR
-#      ~          bitwise NOT
-#
-# -------------------------------------------------------------------
-
-# propel.samePhpName = false
-# propel.addVendorInfo=true
-# propel.addValidators=none
-
-
-# -------------------------------------------------------------------
-#
-#  D A T A B A S E   B U I L D   C O N F I G
-#
-# -------------------------------------------------------------------
-# Some databases provide some configuration options that can be set
-# in this script.  
-#
-# === MySQL
-# propel.mysql.tableType
-#   Use this property to set the table type of generated tables (e.g. InnoDB, MyISAM).
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/build.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/build.xml
deleted file mode 100644
index b2dfcd165..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/build.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<!--
-    Use this file to faciliate easy per-project building.
-    
-    Simply create a build.properties file in your project directory,
-    for example ./projects/bookstore/build.properties, that contains
-    any needed (i.e. to override) values for that project.
-    
-    Call this build script and specify the name of the project and
-    (optionally) the name of the target you wish to execute (default is
-    'main' target) of build-propel.xml.
-
-    Normal use:
-    $> phing   -Dproject=bookstore
-    
-    Specific target: 
-    $> phing -Dproject=bookstore -Dtarget=insert-sql
-
--->
-<project name="propel-project-builder" default="main">
-
-<!-- in case ${project.dir} was specified on command line, we set the project.dir
-     property here.  If it wasn't set, then this will be bogus, but it will
-     be overridden by the "set-project-dir" target. -->    
-<resolvepath propertyName="propel.project.dir" file="${project.dir}" dir="${application.startdir}"/>
-
-<!-- set a default target if none provided -->
-<property name="target" value="main"/>
-
-<!-- Set a default name for the build.properties file.
-		This allows for overriding the name of the build.properties file; however,
-		Propel still expects to find the file in the ${propel.project.dir}.
- -->
-<property name="build.properties" value="build.properties"/>
-	
-<target name="check-buildprops-exists">
-  <available file="${propel.project.dir}/${build.properties}" property="projBuildPopertiesExists"/>  
-</target>
-
-<target name="check-buildprops" unless="projBuildPopertiesExists" depends="check-buildprops-exists">
-		<echo message="====================================================="/>
-		<echo message="Could not open ${build.properties} file:"/>
-		<echo message="		${propel.project.dir}/${build.properties}"/>
-		<echo message=" "/>
-		<echo message="Make sure that '${propel.project.dir}' is a valid path"/>
-		<echo message="and that it contains a ${build.properties} file."/>
-		<echo message="====================================================="/>	
-		
-		<fail message="Missing configuration file (see description above)."/>
-</target>
-
-<target name="check-project-or-dir-set">
-  <condition property="projectOrDirSet">
-  		<or>
-			<isset property="project"/>
-			<isset property="project.dir"/>
-		</or>
-  </condition>
-</target>
-
-<target name="check-buildprops-for-propel-gen" if="using.propel-gen" unless="projBuildPopertiesExists" depends="check-buildprops-exists">
-	<echo message="=========================================================="/>
-	<echo message="Could not open ${build.properties} file:"/>
-	<echo message="		${propel.project.dir}/${build.properties}"/>
-	<echo message=" "/>
-	<echo message="Project directory not specified or invalid. You must "/>
-	<echo message="specify the path to your project directory and your "/>
-	<echo message="project directory must contain your ${build.properties} "/>
-	<echo message="and schema.xml files.                                "/>
-	<echo message=" "/>
-	<echo message="Usage: "/>
-	<echo message=" "/>
-	<echo message="$&gt; propel-gen /path/to/projectdir [target]"/>
-	<echo message=" "/>
-	<echo message="=========================================================="/>	
-	<fail message="No project directory specified."/>
-</target>
-
-<target name="check-project-set" unless="projectOrDirSet" depends="check-project-or-dir-set">
-		<echo message="====================================================="/>
-		<echo message="Project not specified. You must enter a project name. "/>
-		<echo message="In the future you can enter it on the command line: "/>
-		<echo message=" "/>
-		<echo message="-Dproject=bookstore"/>
-		<echo message=" "/>
-		<echo message="This will attempt to find your project directory in"/>
-		<echo message="the default directory (./projects/bookstore)."/>
-		<echo message=" "/>
-		<echo message="You can also avoid this message and specicfy a custom "/>
-		<echo message="directory, using the project.dir property:"/>
-		<echo message=" "/>
-		<echo message="-Dproject.dir=/path/to/bookstore"/>
-		<echo message="====================================================="/>	
-		<input propertyname="project" promptChar=":">Project name</input>
-		<property name="propel.project" value="${project}" override="true"/>
-</target>
-
-<target name="set-project-dir" unless="project.dir" depends="check-project-set">
-	<echo>No project.dir was specified, using default path: ./projects/${project}</echo>
-	<property name="propel.project.dir" value="./projects/${project}" override="true"/>
-</target>
-
-<target name="configure" depends="set-project-dir,check-buildprops-for-propel-gen,check-buildprops">
-	<if>
-		<isset property="additional.properties"/>
-		<then>
-			<echo>Processing additional properties file: ${additional.properties}</echo>
-			<resolvepath propertyName="additional.properties.resolved" file="${additional.properties}" dir="${application.startdir}"/>
-			<property file="${additional.properties.resolved}"/>
-		</then>
-	</if>
-	<echo msg="Loading project-specific props from ${propel.project.dir}/${build.properties}"/>
-	<property file="${propel.project.dir}/${build.properties}"/>
-</target>
-
-<target name="main" depends="configure" description="The main target. Includes project-specific build.properties and calls the build-propel.xml script">
-
- <phing phingfile="./build-propel.xml" target="${target}"/>
- 
-</target>
-
-<!-- 
- Convenience mappings to build-propel.xml main targets 
- 
- This makes it possible to use this buildfile w/o needing to specify
- target as a property, e.g.:
- 
- $> phing -Dproject=bookstore insert-sql
- 
- The main reason for this is just consistency w/ old build-propel.xml file
- (primarily for documentation & user confusion avoidance reasons).  There are relatively
- few & infrequently changing main targets of build-propel.xml, so it's a non-
- issue as far as maintenance is concerned.
--->
-
-<target name="convert-conf" depends="configure">
-	<phing phingfile="build-propel.xml" target="convert-conf"/>
-</target>
-
-<target name="create-db" depends="configure">
-	<phing phingfile="build-propel.xml" target="create-db"/>
-</target>
-
-<target name="creole" depends="configure">
-	<phing phingfile="build-propel.xml" target="creole"/>
-</target>
-
-<target name="reverse" depends="configure">
-	<phing phingfile="build-propel.xml" target="reverse"/>
-</target>
-
-<target name="datadtd" depends="configure">
-	<phing phingfile="build-propel.xml" target="datadtd"/>
-</target>
-
-<target name="datadump" depends="configure">
-	<phing phingfile="build-propel.xml" target="datadump"/>
-</target>
-
-<target name="datasql" depends="configure">
-	<phing phingfile="build-propel.xml" target="datasql"/>
-</target>
-
-<target name="insert-sql" depends="configure">
-	<phing phingfile="build-propel.xml" target="insert-sql"/>
-</target>
-
-<target name="om" depends="configure">
-	<phing phingfile="build-propel.xml" target="om"/>
-</target>
-
-<target name="new-om" depends="configure">
-	<phing phingfile="build-propel.xml" target="new-om"/>
-</target>
-
-<target name="sql" depends="configure">
-	<phing phingfile="build-propel.xml" target="sql"/>
-</target>
-
-<target name="old-sql" depends="configure">
-	<phing phingfile="build-propel.xml" target="old-sql"/>
-</target>
-
-<target name="graphviz" depends="configure">
-	<phing phingfile="build-propel.xml" target="graphviz"/>
-</target>
-
-
-</project>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/build.xml-local b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/build.xml-local
deleted file mode 100644
index d4d4e4c74..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/build.xml-local
+++ /dev/null
@@ -1,124 +0,0 @@
-<!--
-    Use this file to faciliate easy per-project building.
-    
-    Simply create a build.properties file in this directory,
-    that contains any needed (i.e. to override) values for this project.
-    
-    Call this build script and specify the name of the project and
-    (optionally) the name of the target you wish to execute (default is
-    'main' target) of build-propel.xml.
-
-    Normal use:
-    $> phing
-    
-    Specific target: 
-    $> phing -Dtarget=insert-sql
-
--->
-<project name="propel-project-builder" default="main" basedir=".">
-
-<!-- set to this dir -->    
-<property name="project.dir" value="."/>
-
-<!-- set a default target if none provided -->
-<property name="target" value="main"/>
-
-<target name="buildpropescheck">
-  <available file="./build.properties" property="projBuildPopertiesExists"/>  
-</target>
-
-<target name="init">
-	<echo msg="Loading project-specific props from ./build.properties"/>
-	<property file="./build.properties"/>
-</target>
-
-<target name="checkproject" unless="propel.project">
-    <fail msg="Build failed. Please make sure that propel.project is set to your project-name in local build.properties"/>
-</target>
-<target name="checkhome" unless="propel.home">
-    <fail msg="Build failed. Please make sure that propel.home is set to the propel-generator-dir in local build.properties"/>
-</target>
-<target name="checkschemadir" unless="propel.schema.dir">
-    <fail msg="Build failed. Please make sure that propel.schema.dir is set to '.' in local build.properties"/>
-</target>
-<target name="checkconfdir" unless="propel.conf.dir">
-    <fail msg="Build failed. Please make sure that propel.conf.dir is set to '.' in local build.properties"/>
-</target>
-<target name="checkoutputdir" unless="propel.output.dir">
-    <fail msg="Build failed. Please make sure that propel.output.dir is set to a directory of your choice (e.g. './build/') local build.properties"/>
-</target>
-<target name="configure" depends="init,checkproject,checkhome,checkschemadir,checkconfdir,checkoutputdir">
-    <property name="project" value="{$propel.project}"/>
-</target>
-
-<target name="main" depends="configure" 
-  description="The main target. Includes project-specific build.properties and calls the build-propel.xml script">	
-
- <phing phingfile="${propel.home}/build-propel.xml" target="${target}"/>
- 
-</target>
-
-<!-- 
- Convenience mappings to build-propel.xml main targets 
- 
- This makes it possible to use this buildfile w/o needing to specify
- target as a property, e.g.:
- 
- $> phing -Dproject=bookstore insert-sql
- 
- The main reason for this is just consistency w/ old build-propel.xml file
- (primarily for documentation & user confusion avoidance reasons).  There are relatively
- few & infrequently changing main targets of build-propel.xml, so it's a non-
- issue as far as maintenance is concerned.
--->
-
-<target name="convert-props" depends="configure">
-	<phing phingfile="${propel.home}/build-propel.xml" target="convert-props"/>
-</target>
-
-<target name="create-db" depends="configure">
-	<phing phingfile="${propel.home}/build-propel.xml" target="create-db"/>
-</target>
-
-<target name="creole" depends="configure">
-	<phing phingfile="${propel.home}/build-propel.xml" target="creole"/>
-</target>
-
-<target name="datadtd" depends="configure">
-	<phing phingfile="${propel.home}/build-propel.xml" target="datadtd"/>
-</target>
-
-<target name="datadump" depends="configure">
-	<phing phingfile="${propel.home}/build-propel.xml" target="datadump"/>
-</target>
-
-<target name="datasql" depends="configure">
-	<phing phingfile="${propel.home}/build-propel.xml" target="datasql"/>
-</target>
-
-<target name="insert-sql" depends="configure">
-	<phing phingfile="${propel.home}/build-propel.xml" target="insert-sql"/>
-</target>
-
-<target name="om" depends="configure">
-	<phing phingfile="${propel.home}/build-propel.xml" target="om"/>
-</target>
-
-<target name="new-om" depends="configure">
-	<phing phingfile="${propel.home}/build-propel.xml" target="new-om"/>
-</target>
-
-<target name="sql" depends="configure">
-	<phing phingfile="${propel.home}/build-propel.xml" target="sql"/>
-</target>
-
-<target name="old-sql" depends="configure">
-	<phing phingfile="${propel.home}/build-propel.xml" target="old-sql"/>
-</target>
-
-<target name="graphviz" depends="configure">
-	<phing phingfile="${propel.home}/build-propel.xml" target="graphviz"/>
-</target>
-
-
-</project>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/EngineException.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/EngineException.php
deleted file mode 100644
index 224c34be0..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/EngineException.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/*
- *  $Id: EngineException.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'phing/BuildException.php';
-
-/**
- * The base class of all exceptions thrown by the engine.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Daniel Rall <dlr@collab.net> (Torque)
- * @author     Jason van Zyl <jvz@apache.org> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine
- */
-class EngineException extends BuildException {}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/GeneratorConfig.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/GeneratorConfig.php
deleted file mode 100644
index d50c1c85f..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/GeneratorConfig.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-
-/*
- *  $Id: GeneratorConfig.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * A class that holds build properties and provide a class loading mechanism for the generator.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine
- */
-class GeneratorConfig {
-
-  /**
-   * The build properties.
-   *
-   * @var        array
-   */
-  private $buildProperties = array();
-
-  /**
-   * Construct a new GeneratorConfig.
-   * @param      mixed $props Array or Iterator
-   */
-  public function __construct($props = null)
-  {
-    if ($props) $this->setBuildProperties($props);
-  }
-
-  /**
-   * Gets the build properties.
-   * @return     array
-   */
-  public function getBuildProperties()
-  {
-    return $this->buildProperties;
-  }
-
-  /**
-   * Parses the passed-in properties, renaming and saving eligible properties in this object.
-   *
-   * Renames the propel.xxx properties to just xxx and renames any xxx.yyy properties
-   * to xxxYyy as PHP doesn't like the xxx.yyy syntax.
-   *
-   * @param      mixed $props Array or Iterator
-   */
-  public function setBuildProperties($props)
-  {
-    $this->buildProperties = array();
-
-    $renamedPropelProps = array();
-    foreach ($props as $key => $propValue) {
-      if (strpos($key, "propel.") === 0) {
-        $newKey = substr($key, strlen("propel."));
-        $j = strpos($newKey, '.');
-        while ($j !== false) {
-          $newKey =  substr($newKey, 0, $j) . ucfirst(substr($newKey, $j + 1));
-          $j = strpos($newKey, '.');
-        }
-        $this->setBuildProperty($newKey, $propValue);
-      }
-    }
-  }
-
-  /**
-   * Gets a specific propel (renamed) property from the build.
-   *
-   * @param      string $name
-   * @return     mixed
-   */
-  public function getBuildProperty($name)
-  {
-    return isset($this->buildProperties[$name]) ? $this->buildProperties[$name] : null;
-  }
-
-  /**
-   * Sets a specific propel (renamed) property from the build.
-   *
-   * @param      string $name
-   * @param      mixed $value
-   */
-  public function setBuildProperty($name, $value)
-  {
-    $this->buildProperties[$name] = $value;
-  }
-
-  /**
-   * Resolves and returns the class name based on the specified property value.
-   *
-   * @param      string $propname The name of the property that holds the class path (dot-path notation).
-   * @return     string The class name.
-   * @throws     BuildException If the classname cannot be determined or class cannot be loaded.
-   */
-  public function getClassname($propname)
-  {
-    $classpath = $this->getBuildProperty($propname);
-    if (empty($classpath)) {
-      throw new BuildException("Unable to find class path for '$propname' property.");
-    }
-
-    // This is a slight hack to workaround camel case inconsistencies for the DDL classes.
-    // Basically, we want to turn ?.?.?.sqliteDDLBuilder into ?.?.?.SqliteDDLBuilder
-    $lastdotpos = strrpos($classpath, '.');
-    if ($lastdotpos !== null) {
-      $classpath{$lastdotpos+1} = strtoupper($classpath{$lastdotpos+1});
-    } else {
-      $classpath = ucfirst($classpath);
-    }
-
-    if (empty($classpath)) {
-      throw new BuildException("Unable to find class path for '$propname' property.");
-    }
-
-    $clazz = Phing::import($classpath);
-
-    return $clazz;
-  }
-
-  /**
-   * Resolves and returns the builder class name.
-   *
-   * @param      string $type
-   * @return     string The class name.
-   */
-  public function getBuilderClassname($type)
-  {
-    $propname = 'builder' . ucfirst(strtolower($type)) . 'Class';
-    return $this->getClassname($propname);
-  }
-
-  /**
-   * Creates and configures a new Platform class.
-   *
-   * @param      PDO $con
-   * @return     Platform
-   */
-  public function getConfiguredPlatform(PDO $con = null)
-  {
-    $clazz = $this->getClassname("platformClass");
-    $platform = new $clazz();
-
-    if (!$platform instanceof Platform) {
-      throw new BuildException("Specified platform class ($clazz) does not implement Platform interface.", $this->getLocation());
-    }
-
-    $platform->setConnection($con);
-    $platform->setGeneratorConfig($this);
-    return $platform;
-  }
-
-  /**
-   * Creates and configures a new SchemaParser class for specified platform.
-   * @param      PDO $con
-   * @return     SchemaParser
-   */
-  public function getConfiguredSchemaParser(PDO $con = null)
-  {
-    $clazz = $this->getClassname("reverseParserClass");
-    $parser = new $clazz();
-    if (!$parser instanceof SchemaParser) {
-      throw new BuildException("Specified platform class ($clazz) does implement SchemaParser interface.", $this->getLocation());
-    }
-    $parser->setConnection($con);
-    $parser->setGeneratorConfig($this);
-    return $parser;
-  }
-
-  /**
-   * Gets a configured data model builder class for specified table and based on type.
-   *
-   * @param      Table $table
-   * @param      string $type The type of builder ('ddl', 'sql', etc.)
-   * @return     DataModelBuilder
-   */
-  public function getConfiguredBuilder(Table $table, $type, $cache = true)
-  {
-    $classname = $this->getBuilderClassname($type);
-    $builder = new $classname($table);
-    $builder->setGeneratorConfig($this);
-    return $builder;
-  }
-
-  /**
-   * Gets a configured Pluralizer class.
-   *
-   * @return     Pluralizer
-   */
-  public function getConfiguredPluralizer()
-  {
-    $classname = $this->getBuilderClassname('pluralizer');
-    $pluralizer = new $classname();
-    return $pluralizer;
-  }
-  
-  /**
-   * Gets a configured behavior class
-   *
-   * @param string $name a behavior name
-   * @return string a behavior class name
-   */
-  public function getConfiguredBehavior($name)
-  {
-    $propname = 'behavior' . ucfirst(strtolower($name)) . 'Class';
-    try {
-      $ret = $this->getClassname($propname);
-    } catch (BuildException $e) {
-      // class path not configured
-      $ret = false;
-    }
-    return $ret;    
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/behavior/AlternativeCodingStandardsBehavior.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/behavior/AlternativeCodingStandardsBehavior.php
deleted file mode 100644
index aaa9863a4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/behavior/AlternativeCodingStandardsBehavior.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-
-/*
- *  $Id: AlternativeCodingStandardsBehavior.php $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
- 
-/**
- * Changes the coding standard of Propel generated Model classes
- *  - Opening brackets always use newline, e.g.
- *     if ($foo) {
- *       ...
- *     } else {
- *       ...
- *     }
- *    Becomes:
- *     if ($foo)
- *     {
- *       ...
- *     }
- *     else
- *     {
- *       ...
- *     }
- *  - closing comments are removed, e.g.
- *     } // save()
- *    Becomes:
- *     }
- *   - tabs are replaced by 2 whitespaces
- *   - comments are stripped (optional)
- *
- * @author     François Zaninotto
- * @version    $Revision: 1066 $
- * @package    propel.engine.behavior
- */
-class AlternativeCodingStandardsBehavior extends Behavior
-{
-	// default parameters value
-  protected $parameters = array(
-  	'brackets_newline'        => 'true',
-  	'remove_closing_comments' => 'true',
-  	'use_whitespace'          => 'true',
-  	'tab_size'                => 2,
-  	'strip_comments'          => 'false'
-  );
-  
-	public function objectFilter(&$script)
-	{
-		return $this->filter($script);
-	}
-	
-	public function extensionObjectFilter(&$script)
-	{
-		return $this->filter($script);
-	}
-
-	public function peerFilter(&$script)
-	{
-		return $this->filter($script);
-	}
-
-	public function extensionPeerFilter(&$script)
-	{
-		return $this->filter($script);
-	}
-	
-	public function tableMapFilter(&$script)
-	{
-		return $this->filter($script);
-	}
-
-	/**
-	 * Transform the coding standards of a PHP sourcecode string
-	 * 
-	 * @param string $script A script string to be filtered, passed as reference
-	 */
-	protected function filter(&$script)
-	{
-		$filter = array();
-		if($this->getParameter('brackets_newline') == 'true') {
-			$filter['#^(\t*)\}\h(else|elseif|catch)(.*)\h\{$#m'] = "$1}
-$1$2$3
-$1{";
-			$filter['#^(\t*)(\w.*)\h\{$#m'] = "$1$2
-$1{";
-		}
-		if ($this->getParameter('remove_closing_comments') == 'true') {
-			$filter['#^(\t*)} //.*$#m'] = "$1}";
-		}
-		if ($this->getParameter('use_whitespace') == 'true') {
-			$filter['#\t#'] = str_repeat(' ', $this->getParameter('tab_size'));
-		}
-		
-		$script = preg_replace(array_keys($filter), array_values($filter), $script);
-		
-		if ($this->getParameter('strip_comments') == 'true') {
-			$script = self::stripComments($script);
-		}
-	}
-	
-	/**
-	 * Remove inline and codeblock comments from a PHP code string
-	 * @param  string $code The input code
-	 * @return string       The input code, without comments
-	 */
-	public static function stripComments($code)
-	{
-		$output  = '';
-		$commentTokens = array(T_COMMENT, T_DOC_COMMENT);
-		foreach (token_get_all($code) as $token) {
-			if (is_array($token)) {
-		    if (in_array($token[0], $commentTokens)) continue;
-				$token = $token[1];
-		  }
-		  $output .= $token;
-		}
-		
-		return $output;
-	}
-}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/behavior/AutoAddPkBehavior.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/behavior/AutoAddPkBehavior.php
deleted file mode 100644
index 580d27e45..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/behavior/AutoAddPkBehavior.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/*
- *  $Id: AutoAddPkBehavior.php 1268 2009-10-30 22:51:21Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
- 
-/**
- * Adds a primary key to models defined without one
- *
- * @author     François Zaninotto
- * @version    $Revision: 1066 $
- * @package    propel.engine.behavior
- */
-class AutoAddPkBehavior extends Behavior
-{
-  // default parameters value
-  protected $parameters = array(
-    'name'          => 'id',
-    'autoIncrement' => 'true',
-    'type'          => 'INTEGER'
-  );
-
-  /**
-   * Copy the behavior to the database tables
-   * Only for tables that have no Pk
-   */
-  public function modifyDatabase()
-  {
-    foreach ($this->getDatabase()->getTables() as $table)
-    {
-      if(!$table->hasPrimaryKey())
-      {
-        $b = clone $this;
-        $table->addBehavior($b);
-      }
-    }
-  }
-  
-  /**
-   * Add the primary key to the current table
-   */
-  public function modifyTable()
-  {
-    if (!$this->getTable()->hasPrimaryKey())
-    {
-      $columnAttributes = array_merge(array('primaryKey' => 'true'), $this->getParameters());
-      $this->getTable()->addColumn($columnAttributes);
-    }
-  }
-}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/behavior/SoftDeleteBehavior.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/behavior/SoftDeleteBehavior.php
deleted file mode 100644
index c85f2fc3b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/behavior/SoftDeleteBehavior.php
+++ /dev/null
@@ -1,259 +0,0 @@
-<?php
-
-/*
- *  $Id: SoftDeleteBehavior.php $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
- 
-/**
- * Gives a model class the ability to remain in database even when the user deletes object
- * Uses an additional column storing the deletion date
- * And an additional condition for every read query to only consider rows with no deletion date
- *
- * @author     François Zaninotto
- * @version    $Revision: 1066 $
- * @package    propel.engine.behavior
- */
-class SoftDeleteBehavior extends Behavior
-{
-	// default parameters value
-  protected $parameters = array(
-    'add_columns'    => 'true',
-    'deleted_column' => 'deleted_at',
-  );
-  
-  /**
-   * Add the deleted_column to the current table
-   */
-  public function modifyTable()
-  {
-    if ($this->getParameter('add_columns') == 'true')
-    {
-      $this->getTable()->addColumn(array(
-        'name' => $this->getParameter('deleted_column'),
-        'type' => 'TIMESTAMP'
-      ));
-    }
-  }
-  
-  protected function getColumnSetter()
-  {
-  	return 'set' . $this->getColumnForParameter('deleted_column')->getPhpName();
-  }
-  
-  public function preDelete()
-  {
-  	return <<<EOT
-if (!empty(\$ret) && {$this->getTable()->getPhpName()}Peer::isSoftDeleteEnabled()) {
-	\$this->{$this->getColumnSetter()}(time());
-	\$this->save();
-	\$con->commit();
-	return;
-}
-EOT;
-  }
-  
-  public function preSelect()
-  {
-  	return <<<EOT
-if ({$this->getTable()->getPhpName()}Peer::isSoftDeleteEnabled()) {
-	\$criteria->add({$this->getColumnForParameter('deleted_column')->getConstantName()}, null, Criteria::ISNULL);
-} else {
-	{$this->getTable()->getPhpName()}Peer::enableSoftDelete();
-}
-EOT;
-  }
-  
-  public function objectMethods()
-  {
-  	return <<<EOT
-
-/**
- * Bypass the soft_delete behavior and force a hard delete of the current object
- */
-public function forceDelete(PropelPDO \$con = null)
-{
-	{$this->getTable()->getPhpName()}Peer::disableSoftDelete();
-	\$this->delete(\$con);
-}
-
-/**
- * Undelete a row that was soft_deleted
- *
- * @return     int The number of rows affected by this update and any referring fk objects' save() operations.
- */
-public function unDelete(PropelPDO \$con = null)
-{
-	\$this->{$this->getColumnSetter()}(null);
-	return \$this->save(\$con);
-}
-EOT;
-  }
-  
-  public function staticAttributes()
-  {
-  	return "protected static \$softDelete = true;
-";
-  }
-  
-  public function staticMethods()
-  {
-  	$script = "
-
-/**
- * Enable the soft_delete behavior for this model
- */
-public static function enableSoftDelete()
-{
-	self::\$softDelete = true;
-}
-
-/**
- * Disable the soft_delete behavior for this model
- */
-public static function disableSoftDelete()
-{
-	self::\$softDelete = false;
-}
-
-/**
- * Check the soft_delete behavior for this model
- * @return boolean true if the soft_delete behavior is enabled
- */
-public static function isSoftDeleteEnabled()
-{
-	return self::\$softDelete;
-}
-";
-	
-	$script .= "
-/**
- * Soft delete records, given a {$this->getTable()->getPhpName()} or Criteria object OR a primary key value.
- *
- * @param      mixed \$values Criteria or {$this->getTable()->getPhpName()} object or primary key or array of primary keys
- *              which is used to create the DELETE statement
- * @param      PropelPDO \$con the connection to use
- * @return     int 	The number of affected rows (if supported by underlying database driver).
- * @throws     PropelException Any exceptions caught during processing will be
- *		          rethrown wrapped into a PropelException.
- */
-public static function doSoftDelete(\$values, PropelPDO \$con = null)
-{
-	if (\$values instanceof Criteria) {
-		// rename for clarity
-		\$criteria = clone \$values;
-	} elseif (\$values instanceof {$this->getTable()->getPhpName()}) {
-		// create criteria based on pk values
-		\$criteria = \$values->buildPkeyCriteria();
-	} else {
-		// it must be the primary key
-		\$criteria = new Criteria(self::DATABASE_NAME);";
-		$pks = $this->getTable()->getPrimaryKey();
-		if (count($pks)>1) {
-			$i = 0;
-			foreach ($pks as $col) {
-				$script .= "
-		\$criteria->add({$col->getConstantName()}, \$values[$i], Criteria::EQUAL);";
-				$i++;
-			}
-		} else  {
-			$col = $pks[0];
-			$script .= "
-		\$criteria->add({$col->getConstantName()}, (array) \$values, Criteria::IN);";
-		}
-		$script .= "
-	}
-	\$criteria->add({$this->getColumnForParameter('deleted_column')->getConstantName()}, time());
-	return {$this->getTable()->getPhpName()}Peer::doUpdate(\$criteria, \$con);
-}
-
-/**
- * Delete or soft delete records, depending on {$this->getTable()->getPhpName()}Peer::\$softDelete
- *
- * @param      mixed \$values Criteria or {$this->getTable()->getPhpName()} object or primary key or array of primary keys
- *              which is used to create the DELETE statement
- * @param      PropelPDO \$con the connection to use
- * @return     int 	The number of affected rows (if supported by underlying database driver).
- * @throws     PropelException Any exceptions caught during processing will be
- *		          rethrown wrapped into a PropelException.
- */
-public static function doDelete2(\$values, PropelPDO \$con = null)
-{
-	if ({$this->getTable()->getPhpName()}Peer::isSoftDeleteEnabled()) {
-		return {$this->getTable()->getPhpName()}Peer::doSoftDelete(\$values, \$con);
-	} else {
-		return {$this->getTable()->getPhpName()}Peer::doForceDelete(\$values, \$con);
-	}	
-}
-
-/**
- * Method to soft delete all rows from the {$this->getTable()->getName()} table.
- *
- * @param      PropelPDO \$con the connection to use
- * @return     int The number of affected rows (if supported by underlying database driver).
- * @throws     PropelException Any exceptions caught during processing will be
- *		          rethrown wrapped into a PropelException.
- */
-public static function doSoftDeleteAll(PropelPDO \$con = null)
-{
-	if (\$con === null) {
-		\$con = Propel::getConnection({$this->getTable()->getPhpName()}Peer::DATABASE_NAME, Propel::CONNECTION_WRITE);
-	}
-	\$selectCriteria = new Criteria();
-	\$selectCriteria->add({$this->getColumnForParameter('deleted_column')->getConstantName()}, null, Criteria::ISNULL);
-	\$selectCriteria->setDbName({$this->getTable()->getPhpName()}Peer::DATABASE_NAME);
-	\$modifyCriteria = new Criteria();
-	\$modifyCriteria->add({$this->getColumnForParameter('deleted_column')->getConstantName()}, time());
-	return BasePeer::doUpdate(\$selectCriteria, \$modifyCriteria, \$con);
-}
-
-/**
- * Delete or soft delete all records, depending on {$this->getTable()->getPhpName()}Peer::\$softDelete
- *
- * @param      PropelPDO \$con the connection to use
- * @return     int 	The number of affected rows (if supported by underlying database driver).
- * @throws     PropelException Any exceptions caught during processing will be
- *		          rethrown wrapped into a PropelException.
- */
-public static function doDeleteAll2(PropelPDO \$con = null)
-{
-	if ({$this->getTable()->getPhpName()}Peer::isSoftDeleteEnabled()) {
-		return {$this->getTable()->getPhpName()}Peer::doSoftDeleteAll(\$con);
-	} else {
-		return {$this->getTable()->getPhpName()}Peer::doForceDeleteAll(\$con);
-	}	
-}
-";
-	return $script;
-  }
-  
-  public function peerFilter(&$script)
-  {
-  	$script = str_replace(array(
-  		'public static function doDelete(', 
-  		'public static function doDelete2(',
-  		'public static function doDeleteAll(', 
-  		'public static function doDeleteAll2('
-  	), array(
-  		'public static function doForceDelete(',
-  		'public static function doDelete(',
-  		'public static function doForceDeleteAll(',
-  		'public static function doDeleteAll('
-  	), $script);
-  }
-}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/behavior/TimestampableBehavior.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/behavior/TimestampableBehavior.php
deleted file mode 100644
index d8dd924ca..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/behavior/TimestampableBehavior.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/*
- *  $Id: TimestampableBehavior.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * Gives a model class the ability to track creation and last modification dates
- * Uses two additional columns storing the creation and update date
- *
- * @author     François Zaninotto
- * @version    $Revision: 1066 $
- * @package    propel.engine.behavior
- */
-class TimestampableBehavior extends Behavior
-{
-  // default parameters value
-  protected $parameters = array(
-    'add_columns'   => 'true',
-    'create_column' => 'created_at',
-    'update_column' => 'updated_at'
-  );
-  
-  /**
-   * Add the create_column and update_columns to the current table
-   */
-  public function modifyTable()
-  {
-    if ($this->getParameter('add_columns') == 'true')
-    {
-      $this->getTable()->addColumn(array(
-        'name' => $this->getParameter('create_column'),
-        'type' => 'TIMESTAMP'
-      ));
-      $this->getTable()->addColumn(array(
-        'name' => $this->getParameter('update_column'),
-        'type' => 'TIMESTAMP'
-      ));
-    }
-  }
-  
-  /**
-   * Get the setter of one of the columns of the behavior
-   * 
-   * @param  string $column One of the behavior colums, 'create_column' or 'update_column'
-   * @return string The related setter, 'setCreatedOn' or 'setUpdatedOn'
-   */
-  protected function getColumnSetter($column)
-  {
-    return 'set' . $this->getColumnForParameter($column)->getPhpName();
-  }
-  
-  /**
-   * Add code in ObjectBuilder::preSave
-   *
-   * @return string The code to put at the hook
-   */
-  public function preSave()
-  {
-    return "\$this->" . $this->getColumnSetter('update_column') . "(time());";
-  }
-  
-  /**
-   * Add code in ObjectBuilder::preInsert
-   *
-   * @return string The code to put at the hook
-   */
-  public function preInsert()
-  {
-    return "\$this->" . $this->getColumnSetter('create_column') . "(time());";    
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/DataModelBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/DataModelBuilder.php
deleted file mode 100644
index b6b0572ce..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/DataModelBuilder.php
+++ /dev/null
@@ -1,496 +0,0 @@
-<?php
-
-/*
- *  $Id: DataModelBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-
-/**
- * This is the base class for any builder class that is using the data model.
- *
- * This could be extended by classes that build SQL DDL, PHP classes, configuration
- * files, input forms, etc.
- *
- * The GeneratorConfig needs to be set on this class in order for the builders
- * to be able to access the propel generator build properties.  You should be
- * safe if you always use the GeneratorConfig to get a configured builder class
- * anyway.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder
- */
-abstract class DataModelBuilder {
-
-	/**
-	 * The current table.
-	 * @var        Table
-	 */
-	private $table;
-
-	/**
-	 * The generator config object holding build properties, etc.
-	 *
-	 * @var        GeneratorConfig
-	 */
-	private $generatorConfig;
-
-	/**
-	 * An array of warning messages that can be retrieved for display (e.g. as part of phing build process).
-	 * @var        array string[]
-	 */
-	private $warnings = array();
-
-	/**
-	 * Peer builder class for current table.
-	 * @var        DataModelBuilder
-	 */
-	private $peerBuilder;
-
-	/**
-	 * Stub Peer builder class for current table.
-	 * @var        DataModelBuilder
-	 */
-	private $stubPeerBuilder;
-
-	/**
-	 * Object builder class for current table.
-	 * @var        DataModelBuilder
-	 */
-	private $objectBuilder;
-
-	/**
-	 * Stub Object builder class for current table.
-	 * @var        DataModelBuilder
-	 */
-	private $stubObjectBuilder;
-
-	/**
-	 * Stub Interface builder class for current table.
-	 * @var        DataModelBuilder
-	 */
-	private $interfaceBuilder;
-
-	/**
-	 * Stub child object for current table.
-	 * @var        DataModelBuilder
-	 */
-	private $multiExtendObjectBuilder;
-
-	/**
-	 * Node object builder for current table.
-	 * @var        DataModelBuilder
-	 */
-	private $nodeBuilder;
-
-	/**
-	 * Node peer builder for current table.
-	 * @var        DataModelBuilder
-	 */
-	private $nodePeerBuilder;
-
-	/**
-	 * Stub node object builder for current table.
-	 * @var        DataModelBuilder
-	 */
-	private $stubNodeBuilder;
-
-	/**
-	 * Stub node peer builder for current table.
-	 * @var        DataModelBuilder
-	 */
-	private $stubNodePeerBuilder;
-
-	/**
-	 * NestedSet object builder for current table.
-	 * @var        DataModelBuilder
-	 */
-	private $nestedSetBuilder;
-
-	/**
-	 * NestedSet peer builder for current table.
-	 * @var        DataModelBuilder
-	 */
-	private $nestedSetPeerBuilder;
-
-	/**
-	 * The DDL builder for current table.
-	 * @var        DDLBuilder
-	 */
-	private $ddlBuilder;
-
-	/**
-	 * The Data-SQL builder for current table.
-	 * @var        DataSQLBuilder
-	 */
-	private $dataSqlBuilder;
-
-	/**
-	 * The Pluralizer class to use.
-	 * @var        Pluralizer
-	 */
-	private $pluralizer;
-
-
-	/**
-	 * Creates new instance of DataModelBuilder subclass.
-	 * @param      Table $table The Table which we are using to build [OM, DDL, etc.].
-	 */
-	public function __construct(Table $table)
-	{
-		$this->table = $table;
-	}
-
-	/**
-	 * Returns new or existing Peer builder class for this table.
-	 * @return     PeerBuilder
-	 */
-	public function getPeerBuilder()
-	{
-		if (!isset($this->peerBuilder)) {
-			$this->peerBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'peer');
-		}
-		return $this->peerBuilder;
-	}
-
-	/**
-	 * Returns new or existing Pluralizer class.
-	 * @return     Pluralizer
-	 */
-	public function getPluralizer()
-	{
-		if (!isset($this->pluralizer)) {
-			$this->pluralizer = $this->getGeneratorConfig()->getConfiguredPluralizer();
-		}
-		return $this->pluralizer;
-	}
-
-	/**
-	 * Returns new or existing stub Peer builder class for this table.
-	 * @return     PeerBuilder
-	 */
-	public function getStubPeerBuilder()
-	{
-		if (!isset($this->stubPeerBuilder)) {
-			$this->stubPeerBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'peerstub');
-		}
-		return $this->stubPeerBuilder;
-	}
-
-	/**
-	 * Returns new or existing Object builder class for this table.
-	 * @return     ObjectBuilder
-	 */
-	public function getObjectBuilder()
-	{
-		if (!isset($this->objectBuilder)) {
-			$this->objectBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'object');
-		}
-		return $this->objectBuilder;
-	}
-
-	/**
-	 * Returns new or existing stub Object builder class for this table.
-	 * @return     ObjectBuilder
-	 */
-	public function getStubObjectBuilder()
-	{
-		if (!isset($this->stubObjectBuilder)) {
-			$this->stubObjectBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'objectstub');
-		}
-		return $this->stubObjectBuilder;
-	}
-
-	/**
-	 * Returns new or existing stub Interface builder class for this table.
-	 * @return     ObjectBuilder
-	 */
-	public function getInterfaceBuilder()
-	{
-		if (!isset($this->interfaceBuilder)) {
-			$this->interfaceBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'interface');
-		}
-		return $this->interfaceBuilder;
-	}
-
-	/**
-	 * Returns new or existing stub child object builder class for this table.
-	 * @return     ObjectBuilder
-	 */
-	public function getMultiExtendObjectBuilder()
-	{
-		if (!isset($this->multiExtendObjectBuilder)) {
-			$this->multiExtendObjectBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'objectmultiextend');
-		}
-		return $this->multiExtendObjectBuilder;
-	}
-
-	/**
-	 * Returns new or existing node Object builder class for this table.
-	 * @return     ObjectBuilder
-	 */
-	public function getNodeBuilder()
-	{
-		if (!isset($this->nodeBuilder)) {
-			$this->nodeBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'node');
-		}
-		return $this->nodeBuilder;
-	}
-
-	/**
-	 * Returns new or existing node Peer builder class for this table.
-	 * @return     PeerBuilder
-	 */
-	public function getNodePeerBuilder()
-	{
-		if (!isset($this->nodePeerBuilder)) {
-			$this->nodePeerBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'nodepeer');
-		}
-		return $this->nodePeerBuilder;
-	}
-
-	/**
-	 * Returns new or existing stub node Object builder class for this table.
-	 * @return     ObjectBuilder
-	 */
-	public function getStubNodeBuilder()
-	{
-		if (!isset($this->stubNodeBuilder)) {
-			$this->stubNodeBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'nodestub');
-		}
-		return $this->stubNodeBuilder;
-	}
-
-	/**
-	 * Returns new or existing stub node Peer builder class for this table.
-	 * @return     PeerBuilder
-	 */
-	public function getStubNodePeerBuilder()
-	{
-		if (!isset($this->stubNodePeerBuilder)) {
-			$this->stubNodePeerBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'nodepeerstub');
-		}
-		return $this->stubNodePeerBuilder;
-	}
-
-	/**
-	 * Returns new or existing nested set object builder class for this table.
-	 * @return     ObjectBuilder
-	 */
-	public function getNestedSetBuilder()
-	{
-		if (!isset($this->nestedSetBuilder)) {
-			$this->nestedSetBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'nestedset');
-		}
-		return $this->nestedSetBuilder;
-	}
-
-	/**
-	 * Returns new or existing nested set Peer builder class for this table.
-	 * @return     PeerBuilder
-	 */
-	public function getNestedSetPeerBuilder()
-	{
-		if (!isset($this->nestedSetPeerBuilder)) {
-			$this->nestedSetPeerBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'nestedsetpeer');
-		}
-		return $this->nestedSetPeerBuilder;
-	}
-
-	/**
-	 * Returns new or existing ddl builder class for this table.
-	 * @return     DDLBuilder
-	 */
-	public function getDDLBuilder()
-	{
-		if (!isset($this->ddlBuilder)) {
-			$this->ddlBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'ddl');
-		}
-		return $this->ddlBuilder;
-	}
-
-	/**
-	 * Returns new or existing data sql builder class for this table.
-	 * @return     DataSQLBuilder
-	 */
-	public function getDataSQLBuilder()
-	{
-		if (!isset($this->dataSqlBuilder)) {
-			$this->dataSqlBuilder = $this->getGeneratorConfig()->getConfiguredBuilder($this->getTable(), 'datasql');
-		}
-		return $this->dataSqlBuilder;
-	}
-
-	/**
-	 * Convenience method to return a NEW Peer class builder instance
-	 * .
-	 * This is used very frequently from the peer and object builders to get
-	 * a peer builder for a RELATED table.
-	 *
-	 * @param      Table $table
-	 * @return     PeerBuilder
-	 */
-	public function getNewPeerBuilder(Table $table)
-	{
-		return $this->getGeneratorConfig()->getConfiguredBuilder($table, 'peer');
-	}
-
-	/**
-	 * Convenience method to return a NEW Object class builder instance.
-	 *
-	 * This is used very frequently from the peer and object builders to get
-	 * an object builder for a RELATED table.
-	 *
-	 * @param      Table $table
-	 * @return     ObjectBuilder
-	 */
-	public function getNewObjectBuilder(Table $table)
-	{
-		return $this->getGeneratorConfig()->getConfiguredBuilder($table, 'object');
-	}
-
-	/**
-	 * Gets the GeneratorConfig object.
-	 *
-	 * @return     GeneratorConfig
-	 */
-	public function getGeneratorConfig()
-	{
-		return $this->generatorConfig;
-	}
-
-	/**
-	 * Get a specific [name transformed] build property.
-	 *
-	 * @param      string $name
-	 * @return     string
-	 */
-	public function getBuildProperty($name)
-	{
-		if ($this->getGeneratorConfig()) {
-			return $this->getGeneratorConfig()->getBuildProperty($name);
-		}
-		return null; // just to be explicit
-	}
-
-	/**
-	 * Sets the GeneratorConfig object.
-	 *
-	 * @param      GeneratorConfig $v
-	 */
-	public function setGeneratorConfig(GeneratorConfig $v)
-	{
-		$this->generatorConfig = $v;
-	}
-
-	/**
-	 * Sets the table for this builder.
-	 * @param      Table $table
-	 */
-	public function setTable(Table $table)
-	{
-		$this->table = $table;
-	}
-
-	/**
-	 * Returns the current Table object.
-	 * @return     Table
-	 */
-	public function getTable()
-	{
-		return $this->table;
-	}
-
-	/**
-	 * Convenience method to returns the Platform class for this table (database).
-	 * @return     Platform
-	 */
-	public function getPlatform()
-	{
-		if ($this->getTable() && $this->getTable()->getDatabase()) {
-			return $this->getTable()->getDatabase()->getPlatform();
-		}
-	}
-
-	/**
-	 * Convenience method to returns the database for current table.
-	 * @return     Database
-	 */
-	public function getDatabase()
-	{
-		if ($this->getTable()) {
-			return $this->getTable()->getDatabase();
-		}
-	}
-
-	/**
-	 * Pushes a message onto the stack of warnings.
-	 * @param      string $msg The warning message.
-	 */
-	protected function warn($msg)
-	{
-		$this->warnings[] = $msg;
-	}
-
-	/**
-	 * Gets array of warning messages.
-	 * @return     array string[]
-	 */
-	public function getWarnings()
-	{
-		return $this->warnings;
-	}
-
-	/**
-	 * Wraps call to Platform->quoteIdentifier() with a check to see whether quoting is enabled.
-	 *
-	 * All subclasses should call this quoteIdentifier() method rather than calling the Platform
-	 * method directly.  This method is used by both DataSQLBuilder and DDLBuilder, and potentially
-	 * in the OM builders also, which is why it is defined in this class.
-	 *
-	 * @param      string $text The text to quote.
-	 * @return     string Quoted text.
-	 */
-	public function quoteIdentifier($text)
-	{
-		if (!$this->getBuildProperty('disableIdentifierQuoting')) {
-			return $this->getPlatform()->quoteIdentifier($text);
-		}
-		return $text;
-	}
-
-	/**
-	 * Returns the name of the current class being built, with a possible prefix.
-	 * @return     string
-	 * @see        OMBuilder#getClassname()
-	 */
-	public function prefixClassname($identifier)
-	{
-		return $this->getBuildProperty('classPrefix') . $identifier;
-	}
-
-	/**
-	 * Returns the name of the current table being built, with a possible prefix.
-	 * @return     string
-	 */
-	public function prefixTablename($identifier)
-	{
-		return $this->getBuildProperty('tablePrefix') . $identifier;
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/ClassTools.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/ClassTools.php
deleted file mode 100644
index 6061f4795..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/ClassTools.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-/*
- *  $Id: ClassTools.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-
- /**
-  * Tools to support class & package inclusion and referencing.
-  *
-  * @author     Hans Lellelid <hans@xmpl.org>
-  * @version    $Revision: 1262 $
-  * @package    propel.engine.builder.om
-  */
-class ClassTools {
-
-	/**
-	 * Gets just classname, given a dot-path to class.
-	 * @param      string $qualifiedName
-	 * @return     string
-	 */
-	public static function classname($qualifiedName)
-	{
-		$pos = strrpos($qualifiedName, '.');
-		if ($pos === false) {
-			return $qualifiedName;  // there is no '.' in the qualifed name
-		} else {
-			return substr($qualifiedName, $pos + 1); // start just after '.'
-		}
-	}
-
-	/**
-	 * Gets the path to be used in include()/require() statement.
-	 *
-	 * Supports multiple function signatures:
-	 *
-	 * (1) getFilePath($dotPathClass);
-	 * (2) getFilePath($dotPathPrefix, $className);
-	 * (3) getFilePath($dotPathPrefix, $className, $extension);
-	 *
-	 * @param      string $path dot-path to class or to package prefix.
-	 * @param      string $classname class name
-	 * @param      string $extension The extension to use on the file.
-	 * @return     string The constructed file path.
-	 */
-	public static function getFilePath($path, $classname = null, $extension = '.php')
-	{
-		$path = strtr(ltrim($path, '.'), '.', '/');
-		if ($classname !== null) {
-			if ($path !== "") { $path .= '/'; }
-			return $path . $classname . $extension;
-		} else {
-			return $path . $extension;
-		}
-	}
-
-	/**
-	 * Gets the basePeer path if specified for table/db.
-	 * If not, will return 'propel.util.BasePeer'
-	 * @return     string
-	 */
-	public static function getBasePeer(Table $table) {
-		$class = $table->getBasePeer();
-		if ($class === null) {
-			$class = "propel.util.BasePeer";
-		}
-		return $class;
-	}
-
-	/**
-	 * Gets the baseClass path if specified for table/db.
-	 * If not, will return 'propel.om.BaseObject'
-	 * @return     string
-	 */
-	public static function getBaseClass(Table $table) {
-		$class = $table->getBaseClass();
-		if ($class === null) {
-			$class = "propel.om.BaseObject";
-		}
-		return $class;
-	}
-
-	/**
-	 * Gets the interface path if specified for table.
-	 * If not, will return 'propel.om.Persistent'.
-	 * @return     string
-	 */
-	public static function getInterface(Table $table) {
-		$interface = $table->getInterface();
-		if ($interface === null && !$table->isReadOnly()) {
-			$interface = "propel.om.Persistent";
-		}
-		return $interface;
-	}
-
-	/**
-	 * Gets a list of PHP reserved words.
-	 *
-	 * @return     array string[]
-	 */
-	public static function getPhpReservedWords()
-	{
-		return array(
-			'and', 'or', 'xor', 'exception', '__FILE__', '__LINE__',
-			'array', 'as', 'break', 'case', 'class', 'const', 'continue',
-			'declare', 'default', 'die', 'do', 'echo', 'else', 'elseif', 'empty',
-			'enddeclare', 'endfor', 'endforeach', 'endif', 'endswitch', 'endwhile',
-			'eval', 'exit', 'extends', 'for', 'foreach', 'function', 'global',
-			'if', 'include', 'include_once', 'isset', 'list', 'new', 'print', 'require',
-			'require_once', 'return', 'static', 'switch', 'unset', 'use', 'var', 'while',
-			'__FUNCTION__', '__CLASS__', '__METHOD__', 'final', 'php_user_filter', 'interface',
-			'implements', 'extends', 'public', 'protected', 'private', 'abstract', 'clone', 'try', 'catch',
-			'throw', 'this', 'namespace'
-		);
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/OMBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/OMBuilder.php
deleted file mode 100644
index af916ea09..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/OMBuilder.php
+++ /dev/null
@@ -1,368 +0,0 @@
-<?php
-
-/*
- *  $Id: OMBuilder.php 1524 2010-02-04 17:22:16Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/DataModelBuilder.php';
-
-/**
- * Baseclass for OM-building classes.
- *
- * OM-building classes are those that build a PHP (or other) class to service
- * a single table.  This includes Peer classes, Entity classes, Map classes,
- * Node classes, Nested Set classes, etc.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder.om
- */
-abstract class OMBuilder extends DataModelBuilder {
-
-	/**
-	 * Builds the PHP source for current class and returns it as a string.
-	 *
-	 * This is the main entry point and defines a basic structure that classes should follow.
-	 * In most cases this method will not need to be overridden by subclasses.  This method
-	 * does assume that the output language is PHP code, so it will need to be overridden if
-	 * this is not the case.
-	 *
-	 * @return     string The resulting PHP sourcecode.
-	 */
-	public function build()
-	{
-		$this->validateModel();
-
-		$script = "<" . "?php\n"; // intentional concatenation
-		if ($this->isAddIncludes()) {
-			$this->addIncludes($script);
-		}
-		$this->addClassOpen($script);
-		$this->addClassBody($script);
-		$this->addClassClose($script);
-		return $script;
-	}
-
-	/**
-	 * Validates the current table to make sure that it won't
-	 * result in generated code that will not parse.
-	 *
-	 * This method may emit warnings for code which may cause problems
-	 * and will throw exceptions for errors that will definitely cause
-	 * problems.
-	 */
-	protected function validateModel()
-	{
-		// Validation is currently only implemented in the subclasses.
-	}
-
-	/**
-	 * Creates a $obj = new Book(); code snippet. Can be used by frameworks, for instance, to
-	 * extend this behavior, e.g. initialize the object after creating the instance or so.
-	 *
-	 * @return     string Some code
-	 */
-	public function buildObjectInstanceCreationCode($objName, $clsName)
-	{
-		return "$objName = new $clsName();";
-	}
-
-	/**
-	 * Returns the qualified (prefixed) classname that is being built by the current class.
-	 * This method must be implemented by child classes.
-	 * @return     string
-	 */
-	abstract public function getUnprefixedClassname();
-
-	/**
-	 * Returns the prefixed clasname that is being built by the current class.
-	 * @return     string
-	 * @see        DataModelBuilder#prefixClassname()
-	 */
-	public function getClassname()
-	{
-		return $this->prefixClassname($this->getUnprefixedClassname());
-	}
-	/**
-	 * Gets the dot-path representation of current class being built.
-	 * @return     string
-	 */
-	public function getClasspath()
-	{
-		if ($this->getPackage()) {
-			$path = $this->getPackage() . '.' . $this->getClassname();
-		} else {
-			$path = $this->getClassname();
-		}
-		return $path;
-	}
-
-	/**
-	 * Gets the full path to the file for the current class.
-	 * @return     string
-	 */
-	public function getClassFilePath()
-	{
-		return ClassTools::getFilePath($this->getPackage(), $this->getClassname());
-	}
-
-	/**
-	 * Gets package name for this table.
-	 * This is overridden by child classes that have different packages.
-	 * @return     string
-	 */
-	public function getPackage()
-	{
-		$pkg = ($this->getTable()->getPackage() ? $this->getTable()->getPackage() : $this->getDatabase()->getPackage());
-		if (!$pkg) {
-			$pkg = $this->getBuildProperty('targetPackage');
-		}
-		return $pkg;
-	}
-
-	/**
-	 * Returns filesystem path for current package.
-	 * @return     string
-	 */
-	public function getPackagePath()
-	{
-		return strtr($this->getPackage(), '.', '/');
-	}
-
-	/**
-	 * Shortcut method to return the [stub] peer classname for current table.
-	 * This is the classname that is used whenever object or peer classes want
-	 * to invoke methods of the peer classes.
-	 * @return     string (e.g. 'MyPeer')
-	 * @see        StubPeerBuilder::getClassname()
-	 */
-	public function getPeerClassname() {
-		return $this->getStubPeerBuilder()->getClassname();
-	}
-
-	/**
-	 * Returns the object classname for current table.
-	 * This is the classname that is used whenever object or peer classes want
-	 * to invoke methods of the object classes.
-	 * @return     string (e.g. 'My')
-	 * @see        StubPeerBuilder::getClassname()
-	 */
-	public function getObjectClassname() {
-		return $this->getStubObjectBuilder()->getClassname();
-	}
-
-	/**
-	 * Get the column constant name (e.g. PeerName::COLUMN_NAME).
-	 *
-	 * @param      Column $col The column we need a name for.
-	 * @param      string $classname The Peer classname to use.
-	 *
-	 * @return     string If $classname is provided, then will return $classname::COLUMN_NAME; if not, then the peername is looked up for current table to yield $currTablePeer::COLUMN_NAME.
-	 */
-	public function getColumnConstant($col, $classname = null)
-	{
-		if ($col === null) {
-			$e = new Exception("No col specified.");
-			print $e;
-			throw $e;
-		}
-		if ($classname === null) {
-			return $this->getBuildProperty('classPrefix') . $col->getConstantName();
-		}
-		// was it overridden in schema.xml ?
-		if ($col->getPeerName()) {
-			$const = strtoupper($col->getPeerName());
-		} else {
-			$const = strtoupper($col->getName());
-		}
-		return $classname.'::'.$const;
-	}
-
-	/**
-	 * Gets the basePeer path if specified for table/db.
-	 * If not, will return 'propel.util.BasePeer'
-	 * @return     string
-	 */
-	public function getBasePeer(Table $table) {
-		$class = $table->getBasePeer();
-		if ($class === null) {
-			$class = "propel.util.BasePeer";
-		}
-		return $class;
-	}
-
-	/**
-	 * Convenience method to get the foreign Table object for an fkey.
-	 * @return     Table
-	 */
-	protected function getForeignTable(ForeignKey $fk)
-	{
-		return $this->getTable()->getDatabase()->getTable($fk->getForeignTableName());
-	}
-
-	/**
-	 * Gets the PHP method name affix to be used for fkeys for the current table (not referrers to this table).
-	 *
-	 * The difference between this method and the getRefFKPhpNameAffix() method is that in this method the
-	 * classname in the affix is the foreign table classname.
-	 *
-	 * @param      ForeignKey $fk The local FK that we need a name for.
-	 * @param      boolean $plural Whether the php name should be plural (e.g. initRelatedObjs() vs. addRelatedObj()
-	 * @return     string
-	 */
-	public function getFKPhpNameAffix(ForeignKey $fk, $plural = false)
-	{
-		if ($fk->getPhpName()) {
-			if ($plural) {
-				return $this->getPluralizer()->getPluralForm($fk->getPhpName());
-			} else {
-				return $fk->getPhpName();
-			}
-		} else {
-			$className = $this->getForeignTable($fk)->getPhpName();
-			if ($plural) {
-				$className = $this->getPluralizer()->getPluralForm($className);
-			}
-			return $className . $this->getRelatedBySuffix($fk, true);
-		}
-	}
-
-	/**
-	 * Gets the PHP method name affix to be used for referencing foreign key methods and variable names (e.g. set????(), $coll???).
-	 *
-	 * The difference between this method and the getFKPhpNameAffix() method is that in this method the
-	 * classname in the affix is the classname of the local fkey table.
-	 *
-	 * @param      ForeignKey $fk The referrer FK that we need a name for.
-	 * @param      boolean $plural Whether the php name should be plural (e.g. initRelatedObjs() vs. addRelatedObj()
-	 * @return     string
-	 */
-	public function getRefFKPhpNameAffix(ForeignKey $fk, $plural = false)
-	{
-		if ($fk->getRefPhpName()) {
-			if ($plural) {
-				return $this->getPluralizer()->getPluralForm($fk->getRefPhpName());
-			} else {
-				return $fk->getRefPhpName();
-			}
-		} else {
-			$className = $fk->getTable()->getPhpName();
-			if ($plural) {
-				$className = $this->getPluralizer()->getPluralForm($className);
-			}
-			return $className . $this->getRelatedBySuffix($fk);
-		}
-	}
-
-	/**
-	 * Gets the "RelatedBy*" suffix (if needed) that is attached to method and variable names.
-	 *
-	 * The related by suffix is based on the local columns of the foreign key.  If there is more than
-	 * one column in a table that points to the same foreign table, then a 'RelatedByLocalColName' suffix
-	 * will be appended.
-	 *
-	 * @return     string
-	 */
-	protected function getRelatedBySuffix(ForeignKey $fk, $columnCheck = false)
-	{
-		$relCol = "";
-		foreach ($fk->getLocalColumns() as $columnName) {
-			$column = $fk->getTable()->getColumn($columnName);
-			if (!$column) {
-				throw new Exception("Could not fetch column: $columnName in table " . $fk->getTable()->getName());
-			}
-
-			if ( count($column->getTable()->getForeignKeysReferencingTable($fk->getForeignTableName())) > 1
-			|| $fk->getForeignTableName() == $fk->getTable()->getName()) {
-				// if there are seeral foreign keys that point to the same table
-				// then we need to generate methods like getAuthorRelatedByColName()
-				// instead of just getAuthor().  Currently we are doing the same
-				// for self-referential foreign keys, to avoid confusion.
-				$relCol .= $column->getPhpName();
-			}
-		}
-
-		#var_dump($fk->getForeignTableName() . ' - ' .$fk->getTableName() . ' - ' . $this->getTable()->getName());
-
-		#$fk->getForeignTableName() != $this->getTable()->getName() &&
-		// @todo comment on it
-		if ($columnCheck && !$relCol && $fk->getTable()->getColumn($fk->getForeignTableName())) {
-			foreach ($fk->getLocalColumns() as $columnName) {
-				$column = $fk->getTable()->getColumn($columnName);
-				$relCol .= $column->getPhpName();
-			}
-		}
-
-
-		if ($relCol != "") {
-			$relCol = "RelatedBy" . $relCol;
-		}
-
-		return $relCol;
-	}
-	
-	/**
-	 * Whether to add the include statements.
-	 * This is based on the build property propel.addIncludes
-	 */
-	protected function isAddIncludes()
-	{
-		return $this->getBuildProperty('addIncludes');
-	}
-	
-	/**
-   * Checks whether any registered behavior on that table has a modifier for a hook
-   * @param string $hookName The name of the hook as called from one of this class methods, e.g. "preSave"
-   * @param string $modifier The name of the modifier object providing the method in the behavior
-   * @return boolean
-   */
-  public function hasBehaviorModifier($hookName, $modifier)
-  {
-    $modifierGetter = 'get' . $modifier;
-    foreach ($this->getTable()->getBehaviors() as $behavior) {
-      if(method_exists($behavior->$modifierGetter(), $hookName)) { 
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Checks whether any registered behavior on that table has a modifier for a hook
-   * @param string $hookName The name of the hook as called from one of this class methods, e.g. "preSave"
-   * @param string $modifier The name of the modifier object providing the method in the behavior
-	 * @param string &$script The script will be modified in this method.
-   */
-  public function applyBehaviorModifier($hookName, $modifier, &$script, $tab = "		")
-  {
-    $modifierGetter = 'get' . $modifier;
-    foreach ($this->getTable()->getBehaviors() as $behavior) {
-      $modifier = $behavior->$modifierGetter();
-      if(method_exists($modifier, $hookName)) {
-        if (strpos($hookName, 'Filter') !== false) {
-          // filter hook: the script string will be modified by the behavior
-          $modifier->$hookName($script);
-        } else {
-          // regular hook: the behavior returns a string to append to the script string
-          $script .= "\n" . $tab . '// ' . $behavior->getName() . " behavior\n";
-          $script .= preg_replace('/^/m', $tab, $modifier->$hookName());           
-         }
-      }
-    }
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/ObjectBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/ObjectBuilder.php
deleted file mode 100644
index 4432c74c2..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/ObjectBuilder.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-
-/*
- *  $Id: ObjectBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/OMBuilder.php';
-
-/**
- * Base class for Peer-building classes.
- *
- * This class is designed so that it can be extended by a PHP4PeerBuilder in addition
- * to the "standard" PHP5PeerBuilder and PHP5ComplexOMPeerBuilder.  Hence, this class
- * should not have any actual template code in it -- simply basic logic & utility
- * methods.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder.om
- */
-abstract class ObjectBuilder extends OMBuilder {
-
-	/**
-	 * Constructs a new PeerBuilder subclass.
-	 */
-	public function __construct(Table $table) {
-		parent::__construct($table);
-	}
-
-	/**
-	 * This method adds the contents of the generated class to the script.
-	 *
-	 * This method is abstract and should be overridden by the subclasses.
-	 *
-	 * Hint: Override this method in your subclass if you want to reorganize or
-	 * drastically change the contents of the generated peer class.
-	 *
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	abstract protected function addClassBody(&$script);
-
-	/**
-	 * Adds the getter methods for the column values.
-	 * This is here because it is probably generic enough to apply to templates being generated
-	 * in different langauges (e.g. PHP4 and PHP5).
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addColumnAccessorMethods(&$script)
-	{
-		$table = $this->getTable();
-
-		foreach ($table->getColumns() as $col) {
-
-			// if they're not using the DateTime class than we will generate "compatibility" accessor method
-			if ($col->getType() === PropelTypes::DATE || $col->getType() === PropelTypes::TIME || $col->getType() === PropelTypes::TIMESTAMP) {
-				$this->addTemporalAccessor($script, $col);
-			} else {
-				$this->addDefaultAccessor($script, $col);
-			}
-
-			if ($col->isLazyLoad()) {
-				$this->addLazyLoader($script, $col);
-			}
-		}
-	}
-
-	/**
-	 * Adds the mutator (setter) methods for setting column values.
-	 * This is here because it is probably generic enough to apply to templates being generated
-	 * in different langauges (e.g. PHP4 and PHP5).
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addColumnMutatorMethods(&$script)
-	{
-		foreach ($this->getTable()->getColumns() as $col) {
-
-			if ($col->isLobType()) {
-				$this->addLobMutator($script, $col);
-			} elseif ($col->getType() === PropelTypes::DATE || $col->getType() === PropelTypes::TIME || $col->getType() === PropelTypes::TIMESTAMP) {
-				$this->addTemporalMutator($script, $col);
-			} else {
-				$this->addDefaultMutator($script, $col);
-			}
-		}
-	}
-
-
-	/**
-	 * Gets the baseClass path if specified for table/db.
-	 * If not, will return 'propel.om.BaseObject'
-	 * @return     string
-	 */
-	protected function getBaseClass() {
-		$class = $this->getTable()->getBaseClass();
-		if ($class === null) {
-			$class = "propel.om.BaseObject";
-		}
-		return $class;
-	}
-
-	/**
-	 * Gets the interface path if specified for current table.
-	 * If not, will return 'propel.om.Persistent'.
-	 * @return     string
-	 */
-	protected function getInterface() {
-		$interface = $this->getTable()->getInterface();
-		if ($interface === null && !$this->getTable()->isReadOnly()) {
-			$interface = "propel.om.Persistent";
-		}
-		return $interface;
-	}
-
-	/**
-	 * Whether to add the generic mutator methods (setByName(), setByPosition(), fromArray()).
-	 * This is based on the build property propel.addGenericMutators, and also whether the
-	 * table is read-only or an alias.
-	 */
-	protected function isAddGenericMutators()
-	{
-		$table = $this->getTable();
-		return (!$table->isAlias() && $this->getBuildProperty('addGenericMutators') && !$table->isReadOnly());
-	}
-
-	/**
-	 * Whether to add the generic accessor methods (getByName(), getByPosition(), toArray()).
-	 * This is based on the build property propel.addGenericAccessors, and also whether the
-	 * table is an alias.
-	 */
-	protected function isAddGenericAccessors()
-	{
-		$table = $this->getTable();
-		return (!$table->isAlias() && $this->getBuildProperty('addGenericAccessors'));
-	}
-
-	/**
-	 * Whether to add the validate() method.
-	 * This is based on the build property propel.addValidateMethod
-	 */
-	protected function isAddValidateMethod()
-	{
-		return $this->getBuildProperty('addValidateMethod');
-	}
-	
-	protected function hasDefaultValues()
-	{
-		foreach ($this->getTable()->getColumns() as $col) {
-			if($col->getDefaultValue() !== null) return true;
-		}
-		return false;
-	}
-
-  /**
-   * Checks whether any registered behavior on that table has a modifier for a hook
-   * @param string $hookName The name of the hook as called from one of this class methods, e.g. "preSave"
-   * @return boolean
-   */
-  public function hasBehaviorModifier($hookName)
-  {
-    return parent::hasBehaviorModifier($hookName, 'ObjectBuilderModifier');
-  }
-
-  /**
-   * Checks whether any registered behavior on that table has a modifier for a hook
-   * @param string $hookName The name of the hook as called from one of this class methods, e.g. "preSave"
-	 * @param string &$script The script will be modified in this method.
-   */
-  public function applyBehaviorModifier($hookName, &$script, $tab = "		")
-  {
-    return parent::applyBehaviorModifier($hookName, 'ObjectBuilderModifier', $script, $tab);
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/PeerBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/PeerBuilder.php
deleted file mode 100644
index dc87a0c24..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/PeerBuilder.php
+++ /dev/null
@@ -1,299 +0,0 @@
-<?php
-
-/*
- *  $Id: PeerBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/OMBuilder.php';
-
-/**
- * Base class for Peer-building classes.
- *
- * This class is designed so that it can be extended by a PHP4PeerBuilder in addition
- * to the "standard" PHP5PeerBuilder and PHP5ComplexOMPeerBuilder.  Hence, this class
- * should not have any actual template code in it -- simply basic logic & utility
- * methods.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder.om
- */
-abstract class PeerBuilder extends OMBuilder {
-
-	protected $basePeerClass;
-	protected $basePeerClassname;
-
-	/**
-	 * Constructs a new PeerBuilder subclass.
-	 */
-	public function __construct(Table $table) {
-		parent::__construct($table);
-		$this->basePeerClassname = $this->basePeerClass = $this->getBasePeer($table);
-		$pos = strrpos($this->basePeerClassname, '.');
-		if ($pos !== false) {
-			$this->basePeerClassname = substr($this->basePeerClassname, $pos + 1);
-		}
-	}
-
-	/**
-	 * Adds the addSelectColumns(), doCount(), etc. methods.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addSelectMethods(&$script)
-	{
-		$this->addAddSelectColumns($script);
-
-		$this->addDoCount($script);
-
-		// consider refactoring the doSelect stuff
-		// into a top-level method
-		$this->addDoSelectOne($script);
-		$this->addDoSelect($script);
-		$this->addDoSelectStmt($script);	 // <-- there's PDO code in here
-
-		$this->addAddInstanceToPool($script);
-		$this->addRemoveInstanceFromPool($script);
-		$this->addGetInstanceFromPool($script);
-		$this->addClearInstancePool($script);
-		$this->addClearRelatedInstancePool($script);
-
-		$this->addGetPrimaryKeyHash($script);
-		$this->addPopulateObjects($script); // <-- there's PDO code in here
-
-	}
-
-	/**
-	 * Adds the correct getOMClass() method, depending on whether this table uses inheritance.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetOMClassMethod(&$script)
-	{
-		$table = $this->getTable();
-		if ($table->getChildrenColumn()) {
-			if ($table->isAbstract()) {
-				$this->addGetOMClass_Inheritance_Abstract($script);
-			} else {
-				$this->addGetOMClass_Inheritance($script);
-			}
-		} else {
-			if ($table->isAbstract()) {
-				$this->addGetOMClass_NoInheritance_Abstract($script);
-			} else {
-				$this->addGetOMClass_NoInheritance($script);
-			}
-		}
-	}
-
-	/**
-	 * Adds the doInsert(), doUpdate(), doDeleteAll(), doValidate(), etc. methods.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addUpdateMethods(&$script)
-	{
-		$this->addDoInsert($script);
-		$this->addDoUpdate($script);
-		$this->addDoDeleteAll($script);
-		$this->addDoDelete($script);
-		if ($this->isDeleteCascadeEmulationNeeded()) {
-			$this->addDoOnDeleteCascade($script);
-		}
-		if ($this->isDeleteSetNullEmulationNeeded()) {
-			$this->addDoOnDeleteSetNull($script);
-		}
-		$this->addDoValidate($script);
-	}
-
-	/**
-	 * Adds the retrieveByPK() (and possibly retrieveByPKs()) method(s) appropriate for this class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addRetrieveByPKMethods(&$script)
-	{
-		if (count($this->getTable()->getPrimaryKey()) === 1) {
-			$this->addRetrieveByPK_SinglePK($script);
-			$this->addRetrieveByPKs_SinglePK($script);
-		} else {
-			$this->addRetrieveByPK_MultiPK($script);
-		}
-	}
-
-	/**
-	 * This method adds the contents of the generated class to the script.
-	 *
-	 * This method contains the high-level logic that determines which methods
-	 * get generated.
-	 *
-	 * Hint: Override this method in your subclass if you want to reorganize or
-	 * drastically change the contents of the generated peer class.
-	 *
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassBody(&$script)
-	{
-
-		$table = $this->getTable();
-
-		if (!$table->isAlias()) {
-			$this->addConstantsAndAttributes($script);
-		}
-
-		$this->addTranslateFieldName($script);
-		$this->addGetFieldNames($script);
-
-		if (!$table->isAlias()) {
-			$this->addAlias($script); // alias() utility method (deprecated?)
-			$this->addSelectMethods($script);
-			$this->addGetTableMap($script);
-		}
-		
-		$this->addBuildTableMap($script);
-
-		$this->addGetOMClassMethod($script);
-
-		// add the insert, update, delete, validate etc. methods
-		if (!$table->isAlias() && !$table->isReadOnly()) {
-			$this->addUpdateMethods($script);
-		}
-
-		if (count($table->getPrimaryKey()) > 0) {
-			$this->addRetrieveByPKMethods($script);
-		}
-	}
-
-	/**
-	 * Whether the platform in use requires ON DELETE CASCADE emulation and whether there are references to this table.
-	 * @return     boolean
-	 */
-	protected function isDeleteCascadeEmulationNeeded()
-	{
-		$table = $this->getTable();
-		if ((!$this->getPlatform()->supportsNativeDeleteTrigger() || $this->getBuildProperty('emulateForeignKeyConstraints')) && count($table->getReferrers()) > 0) {
-			foreach ($table->getReferrers() as $fk) {
-				if ($fk->getOnDelete() == ForeignKey::CASCADE) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Whether the platform in use requires ON DELETE SETNULL emulation and whether there are references to this table.
-	 * @return     boolean
-	 */
-	protected function isDeleteSetNullEmulationNeeded()
-	{
-		$table = $this->getTable();
-		if ((!$this->getPlatform()->supportsNativeDeleteTrigger() || $this->getBuildProperty('emulateForeignKeyConstraints')) && count($table->getReferrers()) > 0) {
-			foreach ($table->getReferrers() as $fk) {
-				if ($fk->getOnDelete() == ForeignKey::SETNULL) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Whether to add the generic mutator methods (setByName(), setByPosition(), fromArray()).
-	 * This is based on the build property propel.addGenericMutators, and also whether the
-	 * table is read-only or an alias.
-	 * @return     boolean
-	 */
-	protected function isAddGenericMutators()
-	{
-		$table = $this->getTable();
-		return (!$table->isAlias() && $this->getBuildProperty('addGenericMutators') && !$table->isReadOnly());
-	}
-
-	/**
-	 * Whether to add the generic accessor methods (getByName(), getByPosition(), toArray()).
-	 * This is based on the build property propel.addGenericAccessors, and also whether the
-	 * table is an alias.
-	 * @return     boolean
-	 */
-	protected function isAddGenericAccessors()
-	{
-		$table = $this->getTable();
-		return (!$table->isAlias() && $this->getBuildProperty('addGenericAccessors'));
-	}
-
-	/**
-	 * Returns the retrieveByPK method name to use for this table.
-	 * If the table is an alias then the method name looks like "retrieveTablenameByPK"
-	 * otherwise simply "retrieveByPK".
-	 * @return     string
-	 */
-	public function getRetrieveMethodName()
-	{
-		if ($this->getTable()->isAlias()) {
-			$retrieveMethod = "retrieve" . $this->getTable()->getPhpName() . "ByPK";
-		} else {
-			$retrieveMethod = "retrieveByPK";
-		}
-		return $retrieveMethod;
-	}
-
-
-	/**
-	 * COMPATIBILITY: Get the column constant name (e.g. PeerName::COLUMN_NAME).
-	 *
-	 * This method exists simply because it belonged to the 'PeerBuilder' that this
-	 * class is replacing (because of name conflict more than actual functionality overlap).
-	 * When the new builder model is finished this method will be removed.
-	 *
-	 * @param      Column $col The column we need a name for.
-	 * @param      string $phpName The PHP Name of the peer class. The 'Peer' is appended automatically.
-	 *
-	 * @return     string If $phpName is provided, then will return {$phpName}Peer::COLUMN_NAME; if not, just COLUMN_NAME.
-	 * @deprecated
-	 */
-	public static function getColumnName(Column $col, $phpName = null) {
-		// was it overridden in schema.xml ?
-		if ($col->getPeerName()) {
-			$const = strtoupper($col->getPeerName());
-		} else {
-			$const = strtoupper($col->getName());
-		}
-		if ($phpName !== null) {
-			return $phpName . 'Peer::' . $const;
-		} else {
-			return $const;
-		}
-	}
-	
-	/**
-   * Checks whether any registered behavior on that table has a modifier for a hook
-   * @param string $hookName The name of the hook as called from one of this class methods, e.g. "preSave"
-   * @return boolean
-   */
-  public function hasBehaviorModifier($hookName)
-  {
-    return parent::hasBehaviorModifier($hookName, 'PeerBuilderModifier');
-  }
-
-  /**
-   * Checks whether any registered behavior on that table has a modifier for a hook
-   * @param string $hookName The name of the hook as called from one of this class methods, e.g. "preSave"
-	 * @param string &$script The script will be modified in this method.
-   */
-  public function applyBehaviorModifier($hookName, &$script, $tab = "		")
-  {
-    return parent::applyBehaviorModifier($hookName, 'PeerBuilderModifier', $script, $tab);
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5ExtensionNodeBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5ExtensionNodeBuilder.php
deleted file mode 100644
index d84958295..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5ExtensionNodeBuilder.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-/*
- *  $Id: PHP5ExtensionNodeBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/ObjectBuilder.php';
-
-/**
- * Generates the empty PHP5 stub node object class for user object model (OM).
- *
- * This class produces the empty stub class that can be customized with application
- * business logic, custom behavior, etc.
- *
- * This class replaces the ExtensionNode.tpl, with the intent of being easier for users
- * to customize (through extending & overriding).
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder.om.php5
- */
-class PHP5ExtensionNodeBuilder extends ObjectBuilder {
-
-	/**
-	 * Returns the name of the current class being built.
-	 * @return     string
-	 */
-	public function getUnprefixedClassname()
-	{
-		return $this->getTable()->getPhpName() . 'Node';
-	}
-
-	/**
-	 * Adds the include() statements for files that this class depends on or utilizes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addIncludes(&$script)
-	{
-		$script .= "
-require '".$this->getNodeBuilder()->getClassFilePath()."';
-";
-	} // addIncludes()
-
-	/**
-	 * Adds class phpdoc comment and openning of class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassOpen(&$script)
-	{
-
-		$table = $this->getTable();
-		$tableName = $table->getName();
-		$tableDesc = $table->getDescription();
-
-		$baseClassname = $this->getNodeBuilder()->getClassname();
-
-		$script .= "
-
-/**
- * Skeleton subclass for representing a node from the '$tableName' table.
- *
- * $tableDesc
- *";
-		if ($this->getBuildProperty('addTimeStamp')) {
-			$now = strftime('%c');
-			$script .= "
- * This class was autogenerated by Propel " . $this->getBuildProperty('version') . " on:
- *
- * $now
- *";
-		}
-		$script .= "
- * You should add additional methods to this class to meet the
- * application requirements.  This class will only be generated as
- * long as it does not already exist in the output directory.
- *
- * @package    ".$this->getPackage()."
- */
-class ".$this->getClassname()." extends $baseClassname {
-";
-	}
-
-	/**
-	 * Specifies the methods that are added as part of the stub object class.
-	 *
-	 * By default there are no methods for the empty stub classes; override this method
-	 * if you want to change that behavior.
-	 *
-	 * @see        ObjectBuilder::addClassBody()
-	 */
-	protected function addClassBody(&$script)
-	{
-		// there is no class body
-	}
-
-	/**
-	 * Closes class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassClose(&$script)
-	{
-		$script .= "
-} // " . $this->getClassname() . "
-";
-	}
-
-} // PHP5ExtensionObjectBuilder
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5ExtensionNodePeerBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5ExtensionNodePeerBuilder.php
deleted file mode 100644
index fd97c3ddd..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5ExtensionNodePeerBuilder.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-
-/*
- *  $Id: PHP5ExtensionNodePeerBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/PeerBuilder.php';
-
-/**
- * Generates the empty PHP5 stub node peer class for user object model (OM).
- *
- * This class produces the empty stub class that can be customized with application
- * business logic, custom behavior, etc.
- *
- * This class replaces the ExtensionNodePeer.tpl, with the intent of being easier for users
- * to customize (through extending & overriding).
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder.om.php5
- */
-class PHP5ExtensionNodePeerBuilder extends PeerBuilder {
-
-	/**
-	 * Returns the name of the current class being built.
-	 * @return     string
-	 */
-	public function getUnprefixedClassname()
-	{
-		return $this->getStubNodeBuilder()->getClassname() . 'Peer';
-	}
-
-	/**
-	 * Adds the include() statements for files that this class depends on or utilizes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addIncludes(&$script)
-	{
-		$script .="
-require '".$this->getNodePeerBuilder()->getClassFilePath()."';
-";
-	} // addIncludes()
-
-	/**
-	 * Adds class phpdoc comment and openning of class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassOpen(&$script)
-	{
-
-		$table = $this->getTable();
-		$tableName = $table->getName();
-		$tableDesc = $table->getDescription();
-
-		$baseClassname = $this->getNodePeerBuilder()->getClassname();
-
-		$script .= "
-
-/**
- * Skeleton subclass for performing query and update operations on nodes of the '$tableName' table.
- *
- * $tableDesc
- *";
-		if ($this->getBuildProperty('addTimeStamp')) {
-			$now = strftime('%c');
-			$script .= "
- * This class was autogenerated by Propel " . $this->getBuildProperty('version') . " on:
- *
- * $now
- *";
-		}
-		$script .= "
- * You should add additional methods to this class to meet the
- * application requirements.  This class will only be generated as
- * long as it does not already exist in the output directory.
- *
- * @package    ".$this->getPackage()."
- */
-class ".$this->getClassname()." extends $baseClassname {
-";
-	}
-
-		/**
-	 * Specifies the methods that are added as part of the stub peer class.
-	 *
-	 * By default there are no methods for the empty stub classes; override this method
-	 * if you want to change that behavior.
-	 *
-	 * @see        ObjectBuilder::addClassBody()
-	 */
-
-	protected function addClassBody(&$script)
-	{
-		// there is no class body
-	}
-
-	/**
-	 * Closes class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassClose(&$script)
-	{
-		$script .= "
-} // " . $this->getClassname() . "
-";
-	}
-
-} // PHP5ExtensionPeerBuilder
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5ExtensionObjectBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5ExtensionObjectBuilder.php
deleted file mode 100644
index 83a9aa00f..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5ExtensionObjectBuilder.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-
-/*
- *  $Id: PHP5ExtensionObjectBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/ObjectBuilder.php';
-
-/**
- * Generates the empty PHP5 stub object class for user object model (OM).
- *
- * This class produces the empty stub class that can be customized with application
- * business logic, custom behavior, etc.
- *
- * This class replaces the ExtensionObject.tpl, with the intent of being easier for users
- * to customize (through extending & overriding).
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder.om.php5
- */
-class PHP5ExtensionObjectBuilder extends ObjectBuilder {
-
-	/**
-	 * Returns the name of the current class being built.
-	 * @return     string
-	 */
-	public function getUnprefixedClassname()
-	{
-		return $this->getTable()->getPhpName();
-	}
-
-	/**
-	 * Adds the include() statements for files that this class depends on or utilizes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addIncludes(&$script)
-	{
-		switch($this->getTable()->treeMode()) {
-			case 'NestedSet':
-				$requiredClassFilePath = $this->getNestedSetBuilder()->getClassFilePath();
-			break;
-
-			case 'MaterializedPath':
-			case 'AdjacencyList':
-			default:
-				$requiredClassFilePath = $this->getObjectBuilder()->getClassFilePath();
-			break;
-		}
-
-		$script .="
-require '".$requiredClassFilePath."';
-";
-	} // addIncludes()
-
-	/**
-	 * Adds class phpdoc comment and openning of class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassOpen(&$script)
-	{
-
-		$table = $this->getTable();
-		$tableName = $table->getName();
-		$tableDesc = $table->getDescription();
-
-		switch($table->treeMode()) {
-			case 'NestedSet':
-				$baseClassname = $this->getNestedSetBuilder()->getClassname();
-			break;
-
-			case 'MaterializedPath':
-			case "AdjacencyList":
-			default:
-				$baseClassname = $this->getObjectBuilder()->getClassname();
-			break;
-		}
-
-		$script .= "
-
-/**
- * Skeleton subclass for representing a row from the '$tableName' table.
- *
- * $tableDesc
- *";
-		if ($this->getBuildProperty('addTimeStamp')) {
-			$now = strftime('%c');
-			$script .= "
- * This class was autogenerated by Propel " . $this->getBuildProperty('version') . " on:
- *
- * $now
- *";
-		}
-		$script .= "
- * You should add additional methods to this class to meet the
- * application requirements.  This class will only be generated as
- * long as it does not already exist in the output directory.
- *
- * @package    ".$this->getPackage()."
- */
-".($table->isAbstract() ? "abstract " : "")."class ".$this->getClassname()." extends $baseClassname {
-";
-	}
-
-	/**
-	 * Specifies the methods that are added as part of the stub object class.
-	 *
-	 * By default there are no methods for the empty stub classes; override this method
-	 * if you want to change that behavior.
-	 *
-	 * @see        ObjectBuilder::addClassBody()
-	 */
-	protected function addClassBody(&$script)
-	{
-	  if ($this->hasDefaultValues()) {
-	    $this->addConstructor($script);
-	  }
-	}
-
-		/**
-	 * Adds the applyDefaults() method, which is called from the constructor.
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addConstructor()
-	 */
-	protected function addConstructor(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Initializes internal state of ".$this->getClassname()." object.
-	 * @see        parent::__construct()
-	 */
-	public function __construct()
-	{
-		// Make sure that parent constructor is always invoked, since that
-		// is where any default values for this object are set.
-		parent::__construct();
-	}
-";
-	}
-
-	/**
-	 * Closes class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassClose(&$script)
-	{
-		$script .= "
-} // " . $this->getClassname() . "
-";
-		$this->applyBehaviorModifier('extensionObjectFilter', $script, "");
-	}
-
-} // PHP5ExtensionObjectBuilder
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5ExtensionPeerBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5ExtensionPeerBuilder.php
deleted file mode 100644
index 66b920df0..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5ExtensionPeerBuilder.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-/*
- *  $Id: PHP5ExtensionPeerBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/PeerBuilder.php';
-
-/**
- * Generates the empty PHP5 stub peer class for user object model (OM).
- *
- * This class produces the empty stub class that can be customized with application
- * business logic, custom behavior, etc.
- *
- * This class replaces the ExtensionPeer.tpl, with the intent of being easier for users
- * to customize (through extending & overriding).
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder.om.php5
- */
-class PHP5ExtensionPeerBuilder extends PeerBuilder {
-
-	/**
-	 * Returns the name of the current class being built.
-	 * @return     string
-	 */
-	public function getUnprefixedClassname()
-	{
-		return $this->getStubObjectBuilder()->getUnprefixedClassname() . 'Peer';
-	}
-
-	/**
-	 * Adds the include() statements for files that this class depends on or utilizes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addIncludes(&$script)
-	{
-		switch($this->getTable()->treeMode()) {
-			case 'NestedSet':
-				$requiredClassFilePath = $this->getNestedSetPeerBuilder()->getClassFilePath();
-			break;
-
-			case 'MaterializedPath':
-			case 'AdjacencyList':
-			default:
-				$requiredClassFilePath = $this->getPeerBuilder()->getClassFilePath();
-			break;
-		}
-
-		$script .="
-require '".$requiredClassFilePath."';
-";
-	} // addIncludes()
-
-	/**
-	 * Adds class phpdoc comment and openning of class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassOpen(&$script)
-	{
-		$table = $this->getTable();
-		$tableName = $table->getName();
-		$tableDesc = $table->getDescription();
-
-		switch($table->treeMode()) {
-			case 'NestedSet':
-				$baseClassname = $this->getNestedSetPeerBuilder()->getClassname();
-			break;
-
-			case 'MaterializedPath':
-			case 'AdjacencyList':
-			default:
-				$baseClassname = $this->getPeerBuilder()->getClassname();
-			break;
-		}
-
-		$script .= "
-
-/**
- * Skeleton subclass for performing query and update operations on the '$tableName' table.
- *
- * $tableDesc
- *";
-		if ($this->getBuildProperty('addTimeStamp')) {
-			$now = strftime('%c');
-			$script .= "
- * This class was autogenerated by Propel " . $this->getBuildProperty('version') . " on:
- *
- * $now
- *";
-		}
-		$script .= "
- * You should add additional methods to this class to meet the
- * application requirements.  This class will only be generated as
- * long as it does not already exist in the output directory.
- *
- * @package    ".$this->getPackage()."
- */
-class ".$this->getClassname()." extends $baseClassname {
-";
-	}
-
-		/**
-	 * Specifies the methods that are added as part of the stub peer class.
-	 *
-	 * By default there are no methods for the empty stub classes; override this method
-	 * if you want to change that behavior.
-	 *
-	 * @see        ObjectBuilder::addClassBody()
-	 */
-
-	protected function addClassBody(&$script)
-	{
-		// there is no class body
-	}
-
-	/**
-	 * Closes class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassClose(&$script)
-	{
-		$script .= "
-} // " . $this->getClassname() . "
-";
-		$this->applyBehaviorModifier('extensionPeerFilter', $script, "");
-	}
-
-
-} // PHP5ExtensionPeerBuilder
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5InterfaceBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5InterfaceBuilder.php
deleted file mode 100644
index 7bc6085f5..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5InterfaceBuilder.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-/*
- *  $Id: PHP5InterfaceBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/ObjectBuilder.php';
-
-/**
- * Generates the empty PHP5 stub interface for user object model (OM).
- *
- * This class produces the empty stub interface when the interface="" attribute is used
- * in the the schema xml.
- *
- * This class replaces the Interface.tpl, with the intent of being easier for users
- * to customize (through extending & overriding).
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder.om.php5
- */
-class PHP5InterfaceBuilder extends ObjectBuilder {
-
-	/**
-	 * Returns the name of the current class being built.
-	 * @return     string
-	 */
-	public function getUnprefixedClassname()
-	{
-		return ClassTools::classname($this->getInterface());
-	}
-
-	/**
-	 * Adds the include() statements for files that this class depends on or utilizes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addIncludes(&$script)
-	{
-
-	} // addIncludes()
-
-	/**
-	 * Adds class phpdoc comment and openning of class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassOpen(&$script)
-	{
-
-		$table = $this->getTable();
-		$tableName = $table->getName();
-		$tableDesc = $table->getDescription();
-
-		$baseClassname = $this->getObjectBuilder()->getClassname();
-
-		$script .= "
-/**
- * This is an interface that should be filled with the public api of the $tableName objects.
- *
- * $tableDesc
- *";
-		if ($this->getBuildProperty('addTimeStamp')) {
-			$now = strftime('%c');
-			$script .= "
- * This class was autogenerated by Propel " . $this->getBuildProperty('version') . " on:
- *
- * $now
- *";
-		}
-		$script .= "
- * You should add additional method declarations to this interface to meet the
- * application requirements.  This interface will only be generated as
- * long as it does not already exist in the output directory.
- *
- * @package    ".$this->getPackage()."
- */
-interface ".$this->getClassname()." {
-";
-	}
-
-	/**
-	 * Specifies the methods that are added as part of the stub object class.
-	 *
-	 * By default there are no methods for the empty stub classes; override this method
-	 * if you want to change that behavior.
-	 *
-	 * @see        ObjectBuilder::addClassBody()
-	 */
-	protected function addClassBody(&$script)
-	{
-		// there is no class body
-	}
-
-	/**
-	 * Closes class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassClose(&$script)
-	{
-		$script .= "
-} // " . $this->getClassname() . "
-";
-	}
-
-} // PHP5ExtensionObjectBuilder
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5MultiExtendObjectBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5MultiExtendObjectBuilder.php
deleted file mode 100644
index 35967a469..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5MultiExtendObjectBuilder.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-
-/*
- *  $Id: PHP5MultiExtendObjectBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/ObjectBuilder.php';
-
-/**
- * Generates the empty PHP5 stub object class for use with inheritance in the user object model (OM).
- *
- * This class produces the empty stub class that can be customized with application
- * business logic, custom behavior, etc.
- *
- * This class replaces the MultiExtendObject.tpl, with the intent of being easier for users
- * to customize (through extending & overriding).
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder.om.php5
- */
-class PHP5MultiExtendObjectBuilder extends ObjectBuilder {
-
-	/**
-	 * The current child "object" we are operating on.
-	 */
-	private $child;
-
-	/**
-	 * Returns the name of the current class being built.
-	 * @return     string
-	 */
-	public function getUnprefixedClassname()
-	{
-		return $this->getChild()->getClassname();
-	}
-
-	/**
-	 * Override method to return child package, if specified.
-	 * @return     string
-	 */
-	public function getPackage()
-	{
-		return ($this->child->getPackage() ? $this->child->getPackage() : parent::getPackage());
-	}
-
-	/**
-	 * Set the child object that we're operating on currrently.
-	 * @param      $child Inheritance
-	 */
-	public function setChild(Inheritance $child)
-	{
-		$this->child = $child;
-	}
-
-	/**
-	 * Returns the child object we're operating on currently.
-	 * @return     Inheritance
-	 * @throws     BuildException - if child was not set.
-	 */
-	public function getChild()
-	{
-		if (!$this->child) {
-			throw new BuildException("The PHP5MultiExtendObjectBuilder needs to be told which child class to build (via setChild() method) before it can build the stub class.");
-		}
-		return $this->child;
-	}
-
-	/**
-	 * Returns classpath to parent class.
-	 * @return     string
-	 */
-	protected function getParentClasspath()
-	{
-		if ($this->getChild()->getAncestor()) {
-			return $this->getChild()->getAncestor();
-		} else {
-			return $this->getObjectBuilder()->getClasspath();
-		}
-	}
-
-	/**
-	 * Returns classname of parent class.
-	 * @return     string
-	 */
-	protected function getParentClassname()
-	{
-		return ClassTools::classname($this->getParentClasspath());
-	}
-
-	/**
-	 * Gets the file path to the parent class.
-	 * @return     string
-	 */
-	protected function getParentClassFilePath()
-	{
-		return ClassTools::getFilePath($this->getParentClasspath());
-	}
-
-	/**
-	 * Adds the include() statements for files that this class depends on or utilizes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addIncludes(&$script)
-	{
-	} // addIncludes()
-
-	/**
-	 * Adds class phpdoc comment and openning of class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassOpen(&$script)
-	{
-
-		$table = $this->getTable();
-		$tableName = $table->getName();
-		$tableDesc = $table->getDescription();
-
-		$baseClassname = $this->getObjectBuilder()->getClassname();
-
-		$script .= "
-
-/**
- * Skeleton subclass for representing a row from one of the subclasses of the '$tableName' table.
- *
- * $tableDesc
- *";
-		if ($this->getBuildProperty('addTimeStamp')) {
-			$now = strftime('%c');
-			$script .= "
- * This class was autogenerated by Propel " . $this->getBuildProperty('version') . " on:
- *
- * $now
- *";
-		}
-		$script .= "
- * You should add additional methods to this class to meet the
- * application requirements.  This class will only be generated as
- * long as it does not already exist in the output directory.
- *
- * @package    ".$this->getPackage()."
- */
-class ".$this->getClassname()." extends ".$this->getParentClassname()." {
-";
-	}
-
-	/**
-	 * Specifies the methods that are added as part of the stub object class.
-	 *
-	 * By default there are no methods for the empty stub classes; override this method
-	 * if you want to change that behavior.
-	 *
-	 * @see        ObjectBuilder::addClassBody()
-	 */
-	protected function addClassBody(&$script)
-	{
-		$child = $this->getChild();
-		$col = $child->getColumn();
-		$cfc = $col->getPhpName();
-
-		$const = "CLASSKEY_".strtoupper($child->getKey());
-
-		$script .= "
-	/**
-	 * Constructs a new ".$this->getChild()->getClassname()." class, setting the ".$col->getName()." column to ".$this->getPeerClassname()."::$const.
-	 */
-	public function __construct()
-	{";
-		$script .= "
-		parent::__construct();
-		\$this->set$cfc(".$this->getPeerClassname()."::CLASSKEY_".strtoupper($child->getKey()).");
-	}
-";
-	}
-
-	/**
-	 * Closes class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassClose(&$script)
-	{
-		$script .= "
-} // " . $this->getClassname() . "
-";
-	}
-
-} // PHP5ExtensionObjectBuilder
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5NestedSetBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5NestedSetBuilder.php
deleted file mode 100644
index a31ffc79f..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5NestedSetBuilder.php
+++ /dev/null
@@ -1,1145 +0,0 @@
-<?php
-/*
- *  $Id: PHP5NestedSetBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/ObjectBuilder.php';
-
-/**
- * Generates a PHP5 tree node Object class for user object model (OM) using Nested Set way.
- *
- * This class produces the base tree node object class (e.g. BaseMyTableNestedSet) which contains all
- * the custom-built accessor and setter methods.
- *
- * @author     Heltem <heltem@o2php.com>
- * @package    propel.engine.builder.om.php5
- */
-class PHP5NestedSetBuilder extends ObjectBuilder {
-
-	/**
-	 * Gets the package for the [base] object classes.
-	 * @return     string
-	 */
-	public function getPackage()
-	{
-		return parent::getPackage() . ".om";
-	}
-
-	/**
-	 * Returns the name of the current class being built.
-	 * @return     string
-	 */
-	public function getUnprefixedClassname()
-	{
-		return $this->getBuildProperty('basePrefix') . $this->getStubObjectBuilder()->getUnprefixedClassname() . 'NestedSet';
-	}
-
-	/**
-	 * Adds the include() statements for files that this class depends on or utilizes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addIncludes(&$script)
-	{
-		$script .="
-require '".$this->getObjectBuilder()->getClassFilePath()."';
-";
-	} // addIncludes()
-
-	/**
-	 * Adds class phpdoc comment and openning of class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassOpen(&$script)
-	{
-
-		$table = $this->getTable();
-		$tableName = $table->getName();
-		$tableDesc = $table->getDescription();
-
-		$script .= "
-/**
- * Base class that represents a row from the '$tableName' table.
- *
- * $tableDesc
- *";
-		if ($this->getBuildProperty('addTimeStamp')) {
-			$now = strftime('%c');
-			$script .= "
- * This class was autogenerated by Propel " . $this->getBuildProperty('version') . " on:
- *
- * $now
- *";
-		}
-		$script .= "
- * @package    ".$this->getPackage()."
- */
-abstract class ".$this->getClassname()." extends ".$this->getObjectBuilder()->getClassname()." implements NodeObject {
-";
-	}
-
-	/**
-	 * Specifies the methods that are added as part of the basic OM class.
-	 * This can be overridden by subclasses that wish to add more methods.
-	 * @see        ObjectBuilder::addClassBody()
-	 */
-	protected function addClassBody(&$script)
-	{
-		$table = $this->getTable();
-
-		$this->addAttributes($script);
-
-		$this->addGetIterator($script);
-
-		$this->addSave($script);
-		$this->addDelete($script);
-
-		$this->addMakeRoot($script);
-
-		$this->addGetLevel($script);
-		$this->addGetPath($script);
-
-		$this->addGetNumberOfChildren($script);
-		$this->addGetNumberOfDescendants($script);
-
-		$this->addGetChildren($script);
-		$this->addGetDescendants($script);
-
-		$this->addSetLevel($script);
-
-		$this->addSetChildren($script);
-		$this->addSetParentNode($script);
-		$this->addSetPrevSibling($script);
-		$this->addSetNextSibling($script);
-
-		$this->addIsRoot($script);
-		$this->addIsLeaf($script);
-		$this->addIsEqualTo($script);
-
-		$this->addHasParent($script);
-		$this->addHasChildren($script);
-		$this->addHasPrevSibling($script);
-		$this->addHasNextSibling($script);
-
-		$this->addRetrieveParent($script);
-		$this->addRetrieveFirstChild($script);
-		$this->addRetrieveLastChild($script);
-		$this->addRetrievePrevSibling($script);
-		$this->addRetrieveNextSibling($script);
-
-		$this->addInsertAsFirstChildOf($script);
-		$this->addInsertAsLastChildOf($script);
-
-		$this->addInsertAsPrevSiblingOf($script);
-		$this->addInsertAsNextSiblingOf($script);
-
-		$this->addMoveToFirstChildOf($script);
-		$this->addMoveToLastChildOf($script);
-
-		$this->addMoveToPrevSiblingOf($script);
-		$this->addMoveToNextSiblingOf($script);
-
-		$this->addInsertAsParentOf($script);
-
-		$this->addGetLeft($script);
-		$this->addGetRight($script);
-		$this->addGetScopeId($script);
-
-		$this->addSetLeft($script);
-		$this->addSetRight($script);
-		$this->addSetScopeId($script);
-	}
-
-	/**
-	 * Closes class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassClose(&$script)
-	{
-		$script .= "
-} // " . $this->getClassname() . "
-";
-	}
-
-
-	/**
-	 * Adds class attributes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addAttributes(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Store level of node
-	 * @var        int
-	 */
-	protected \$level = null;
-
-	/**
-	 * Store if node has prev sibling
-	 * @var        bool
-	 */
-	protected \$hasPrevSibling = null;
-
-	/**
-	 * Store node if has prev sibling
-	 * @var        $objectClassName
-	 */
-	protected \$prevSibling = null;
-
-	/**
-	 * Store if node has next sibling
-	 * @var        bool
-	 */
-	protected \$hasNextSibling = null;
-
-	/**
-	 * Store node if has next sibling
-	 * @var        $objectClassName
-	 */
-	protected \$nextSibling = null;
-
-	/**
-	 * Store if node has parent node
-	 * @var        bool
-	 */
-	protected \$hasParentNode = null;
-
-	/**
-	 * The parent node for this node.
-	 * @var        $objectClassName
-	 */
-	protected \$parentNode = null;
-
-	/**
-	 * Store children of the node
-	 * @var        array
-	 */
-	protected \$_children = null;
-";
-	}
-
-	protected function addGetIterator(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns a pre-order iterator for this node and its children.
-	 *
-	 * @return     NodeIterator
-	 */
-	public function getIterator()
-	{
-		return new NestedSetRecursiveIterator(\$this);
-	}
-";
-	}
-
-	protected function addSave(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Saves modified object data to the datastore.
-	 * If object is saved without left/right values, set them as undefined (0)
-	 *
-	 * @param      PropelPDO Connection to use.
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
-	 *                 May be unreliable with parent/children/brother changes
-	 * @throws     PropelException
-	 */
-	public function save(PropelPDO \$con = null)
-	{
-		\$left = \$this->getLeftValue();
-		\$right = \$this->getRightValue();
-		if (empty(\$left) || empty(\$right)) {
-			\$root = $peerClassname::retrieveRoot(\$this->getScopeIdValue(), \$con);
-			$peerClassname::insertAsLastChildOf(\$this, \$root, \$con);
-		}
-
-		return parent::save(\$con);
-	}
-";
-	}
-
-	protected function addDelete(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Removes this object and all descendants from datastore.
-	 *
-	 * @param      PropelPDO Connection to use.
-	 * @return     void
-	 * @throws     PropelException
-	 */
-	public function delete(PropelPDO \$con = null)
-	{
-		// delete node first
-		parent::delete(\$con);
-
-		// delete descendants and then shift tree
-		$peerClassname::deleteDescendants(\$this, \$con);
-	}
-";
-	}
-
-	protected function addMakeRoot(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Sets node properties to make it a root node.
-	 *
-	 * @return     $objectClassName The current object (for fluent API support)
-	 * @throws     PropelException
-	 */
-	public function makeRoot()
-	{
-		$peerClassname::createRoot(\$this);
-		return \$this;
-	}
-";
-	}
-
-	protected function addGetLevel(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets the level if set, otherwise calculates this and returns it
-	 *
-	 * @param      PropelPDO Connection to use.
-	 * @return     int
-	 */
-	public function getLevel(PropelPDO \$con = null)
-	{
-		if (null === \$this->level) {
-			\$this->level = $peerClassname::getLevel(\$this, \$con);
-		}
-		return \$this->level;
-	}
-";
-	}
-
-	protected function addSetLevel(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Sets the level of the node in the tree
-	 *
-	 * @param      int \$v new value
-	 * @return     $objectClassName The current object (for fluent API support)
-	 */
-	public function setLevel(\$level)
-	{
-		\$this->level = \$level;
-		return \$this;
-	}
-";
-	}
-
-	protected function addSetChildren(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Sets the children array of the node in the tree
-	 *
-	 * @param      array of $objectClassName \$children	array of Propel node object
-	 * @return     $objectClassName The current object (for fluent API support)
-	 */
-	public function setChildren(array \$children)
-	{
-		\$this->_children = \$children;
-		return \$this;
-	}
-";
-	}
-
-	protected function addSetParentNode(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Sets the parentNode of the node in the tree
-	 *
-	 * @param      $objectClassName \$parent Propel node object
-	 * @return     $objectClassName The current object (for fluent API support)
-	 */
-	public function setParentNode(NodeObject \$parent = null)
-	{
-		\$this->parentNode = (true === (\$this->hasParentNode = $peerClassname::isValid(\$parent))) ? \$parent : null;
-		return \$this;
-	}
-";
-	}
-
-	protected function addSetPrevSibling(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Sets the previous sibling of the node in the tree
-	 *
-	 * @param      $objectClassName \$node Propel node object
-	 * @return     $objectClassName The current object (for fluent API support)
-	 */
-	public function setPrevSibling(NodeObject \$node = null)
-	{
-		\$this->prevSibling = \$node;
-		\$this->hasPrevSibling = $peerClassname::isValid(\$node);
-		return \$this;
-	}
-";
-	}
-
-	protected function addSetNextSibling(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Sets the next sibling of the node in the tree
-	 *
-	 * @param      $objectClassName \$node Propel node object
-	 * @return     $objectClassName The current object (for fluent API support)
-	 */
-	public function setNextSibling(NodeObject \$node = null)
-	{
-		\$this->nextSibling = \$node;
-		\$this->hasNextSibling = $peerClassname::isValid(\$node);
-		return \$this;
-	}
-";
-	}
-
-	protected function addGetPath(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Get the path to the node in the tree
-	 *
-	 * @param      PropelPDO Connection to use.
-	 * @return     array
-	 */
-	public function getPath(PropelPDO \$con = null)
-	{
-		return $peerClassname::getPath(\$this, \$con);
-	}
-";
-	}
-
-	protected function addGetNumberOfChildren(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets the number of children for the node (direct descendants)
-	 *
-	 * @param      PropelPDO Connection to use.
-	 * @return     int
-	 */
-	public function getNumberOfChildren(PropelPDO \$con = null)
-	{
-		return $peerClassname::getNumberOfChildren(\$this, \$con);
-	}
-";
-	}
-
-	protected function addGetNumberOfDescendants(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets the total number of descendants for the node
-	 *
-	 * @param      PropelPDO Connection to use.
-	 * @return     int
-	 */
-	public function getNumberOfDescendants(PropelPDO \$con = null)
-	{
-		return $peerClassname::getNumberOfDescendants(\$this, \$con);
-	}
-";
-	}
-
-	protected function addGetChildren(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets the children for the node
-	 *
-	 * @param      PropelPDO Connection to use.
-	 * @return     array
-	 */
-	public function getChildren(PropelPDO \$con = null)
-	{
-		\$this->getLevel();
-
-		if (is_array(\$this->_children)) {
-			return \$this->_children;
-		}
-
-		return $peerClassname::retrieveChildren(\$this, \$con);
-	}
-";
-	}
-
-	protected function addGetDescendants(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets the descendants for the node
-	 *
-	 * @param      PropelPDO Connection to use.
-	 * @return     array
-	 */
-	public function getDescendants(PropelPDO \$con = null)
-	{
-		\$this->getLevel();
-
-		return $peerClassname::retrieveDescendants(\$this, \$con);
-	}
-";
-	}
-
-	protected function addIsRoot(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Returns true if node is the root node of the tree.
-	 *
-	 * @return     bool
-	 */
-	public function isRoot()
-	{
-		return $peerClassname::isRoot(\$this);
-	}
-";
-	}
-
-	protected function addIsLeaf(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Return true if the node is a leaf node
-	 *
-	 * @return     bool
-	 */
-	public function isLeaf()
-	{
-		return $peerClassname::isLeaf(\$this);
-	}
-";
-	}
-
-	protected function addIsEqualTo(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Tests if object is equal to \$node
-	 *
-	 * @param      object \$node		Propel object for node to compare to
-	 * @return     bool
-	 */
-	public function isEqualTo(NodeObject \$node)
-	{
-		return $peerClassname::isEqualTo(\$this, \$node);
-	}
-";
-	}
-
-	protected function addHasParent(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Tests if object has an ancestor
-	 *
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     bool
-	 */
-	public function hasParent(PropelPDO \$con = null)
-	{
-		if (null === \$this->hasParentNode) {
-			$peerClassname::hasParent(\$this, \$con);
-		}
-		return \$this->hasParentNode;
-	}
-";
-	}
-
-	protected function addHasChildren(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Determines if the node has children / descendants
-	 *
-	 * @return     bool
-	 */
-	public function hasChildren()
-	{
-		return  $peerClassname::hasChildren(\$this);
-	}
-";
-	}
-
-	protected function addHasPrevSibling(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Determines if the node has previous sibling
-	 *
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     bool
-	 */
-	public function hasPrevSibling(PropelPDO \$con = null)
-	{
-		if (null === \$this->hasPrevSibling) {
-			$peerClassname::hasPrevSibling(\$this, \$con);
-		}
-		return \$this->hasPrevSibling;
-	}
-";
-	}
-
-	protected function addHasNextSibling(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Determines if the node has next sibling
-	 *
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     bool
-	 */
-	public function hasNextSibling(PropelPDO \$con = null)
-	{
-		if (null === \$this->hasNextSibling) {
-			$peerClassname::hasNextSibling(\$this, \$con);
-		}
-		return \$this->hasNextSibling;
-	}
-";
-	}
-
-	protected function addRetrieveParent(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets ancestor for the given node if it exists
-	 *
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public function retrieveParent(PropelPDO \$con = null)
-	{
-		if (null === \$this->hasParentNode) {
-			\$this->parentNode = $peerClassname::retrieveParent(\$this, \$con);
-			\$this->hasParentNode = $peerClassname::isValid(\$this->parentNode);
-		}
-		return \$this->parentNode;
-	}
-";
-	}
-
-	protected function addRetrieveFirstChild(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets first child if it exists
-	 *
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public function retrieveFirstChild(PropelPDO \$con = null)
-	{
-		if (\$this->hasChildren(\$con)) {
-			if (is_array(\$this->_children)) {
-				return \$this->_children[0];
-			}
-
-			return $peerClassname::retrieveFirstChild(\$this, \$con);
-		}
-		return false;
-	}
-";
-	}
-
-	protected function addRetrieveLastChild(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets last child if it exists
-	 *
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public function retrieveLastChild(PropelPDO \$con = null)
-	{
-		if (\$this->hasChildren(\$con)) {
-			if (is_array(\$this->_children)) {
-				\$last = count(\$this->_children) - 1;
-				return \$this->_children[\$last];
-			}
-
-			return $peerClassname::retrieveLastChild(\$this, \$con);
-		}
-		return false;
-	}
-";
-	}
-
-	protected function addRetrievePrevSibling(&$script)
-	{
-		$script .= "
-	/**
-	 * Gets prev sibling for the given node if it exists
-	 *
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public function retrievePrevSibling(PropelPDO \$con = null)
-	{
-		if (\$this->hasPrevSibling(\$con)) {
-			return \$this->prevSibling;
-		}
-		return \$this->hasPrevSibling;
-	}
-";
-	}
-
-	protected function addRetrieveNextSibling(&$script)
-	{
-		$script .= "
-	/**
-	 * Gets next sibling for the given node if it exists
-	 *
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public function retrieveNextSibling(PropelPDO \$con = null)
-	{
-		if (\$this->hasNextSibling(\$con)) {
-			return \$this->nextSibling;
-		}
-		return \$this->hasNextSibling;
-	}
-";
-	}
-
-	protected function addInsertAsFirstChildOf(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Inserts as first child of given destination node \$parent
-	 *
-	 * @param      $objectClassName \$parent	Propel object for destination node
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     $objectClassName The current object (for fluent API support)
-	 * @throws     PropelException - if this object already exists
-	 */
-	public function insertAsFirstChildOf(NodeObject \$parent, PropelPDO \$con = null)
-	{
-		if (!\$this->isNew())
-		{
-			throw new PropelException(\"$objectClassName must be new.\");
-		}
-		$peerClassname::insertAsFirstChildOf(\$this, \$parent, \$con);
-		return \$this;
-	}
-";
-	}
-
-	protected function addInsertAsLastChildOf(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Inserts as last child of given destination node \$parent
-	 *
-	 * @param      $objectClassName \$parent	Propel object for destination node
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     $objectClassName The current object (for fluent API support)
-	 * @throws     PropelException - if this object already exists
-	 */
-	public function insertAsLastChildOf(NodeObject \$parent, PropelPDO \$con = null)
-	{
-		if (!\$this->isNew())
-		{
-			throw new PropelException(\"$objectClassName must be new.\");
-		}
-		$peerClassname::insertAsLastChildOf(\$this, \$parent, \$con);
-		return \$this;
-	}
-";
-	}
-
-	protected function addInsertAsPrevSiblingOf(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Inserts \$node as previous sibling to given destination node \$dest
-	 *
-	 * @param      $objectClassName \$dest	Propel object for destination node
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     $objectClassName The current object (for fluent API support)
-	 * @throws     PropelException - if this object already exists
-	 */
-	public function insertAsPrevSiblingOf(NodeObject \$dest, PropelPDO \$con = null)
-	{
-		if (!\$this->isNew())
-		{
-			throw new PropelException(\"$objectClassName must be new.\");
-		}
-		$peerClassname::insertAsPrevSiblingOf(\$this, \$dest, \$con);
-		return \$this;
-	}
-";
-	}
-
-	protected function addInsertAsNextSiblingOf(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Inserts \$node as next sibling to given destination node \$dest
-	 *
-	 * @param      $objectClassName \$dest	Propel object for destination node
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     $objectClassName The current object (for fluent API support)
-	 * @throws     PropelException - if this object already exists
-	 */
-	public function insertAsNextSiblingOf(NodeObject \$dest, PropelPDO \$con = null)
-	{
-		if (!\$this->isNew())
-		{
-			throw new PropelException(\"$objectClassName must be new.\");
-		}
-		$peerClassname::insertAsNextSiblingOf(\$this, \$dest, \$con);
-		return \$this;
-	}
-";
-	}
-
-	protected function addMoveToFirstChildOf(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Moves node to be first child of \$parent
-	 *
-	 * @param      $objectClassName \$parent	Propel object for destination node
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     $objectClassName The current object (for fluent API support)
-	 */
-	public function moveToFirstChildOf(NodeObject \$parent, PropelPDO \$con = null)
-	{
-		if (\$this->isNew())
-		{
-			throw new PropelException(\"$objectClassName must exist in tree.\");
-		}
-		$peerClassname::moveToFirstChildOf(\$parent, \$this, \$con);
-		return \$this;
-	}
-";
-	}
-
-	protected function addMoveToLastChildOf(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Moves node to be last child of \$parent
-	 *
-	 * @param      $objectClassName \$parent	Propel object for destination node
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     $objectClassName The current object (for fluent API support)
-	 */
-	public function moveToLastChildOf(NodeObject \$parent, PropelPDO \$con = null)
-	{
-		if (\$this->isNew())
-		{
-			throw new PropelException(\"$objectClassName must exist in tree.\");
-		}
-		$peerClassname::moveToLastChildOf(\$parent, \$this, \$con);
-		return \$this;
-	}
-";
-	}
-
-	protected function addMoveToPrevSiblingOf(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Moves node to be prev sibling to \$dest
-	 *
-	 * @param      $objectClassName \$dest	Propel object for destination node
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     $objectClassName The current object (for fluent API support)
-	 */
-	public function moveToPrevSiblingOf(NodeObject \$dest, PropelPDO \$con = null)
-	{
-		if (\$this->isNew())
-		{
-			throw new PropelException(\"$objectClassName must exist in tree.\");
-		}
-		$peerClassname::moveToPrevSiblingOf(\$dest, \$this, \$con);
-		return \$this;
-	}
-";
-	}
-
-	protected function addMoveToNextSiblingOf(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Moves node to be next sibling to \$dest
-	 *
-	 * @param      $objectClassName \$dest	Propel object for destination node
-	 * @param      PropelPDO \$con Connection to use.
-	 * @return     $objectClassName The current object (for fluent API support)
-	 */
-	public function moveToNextSiblingOf(NodeObject \$dest, PropelPDO \$con = null)
-	{
-		if (\$this->isNew())
-		{
-			throw new PropelException(\"$objectClassName must exist in tree.\");
-		}
-		$peerClassname::moveToNextSiblingOf(\$dest, \$this, \$con);
-		return \$this;
-	}
-";
-	}
-
-	protected function addInsertAsParentOf(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Inserts node as parent of given node.
-	 *
-	 * @param      $objectClassName \$node Propel object for destination node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     $objectClassName The current object (for fluent API support)
-	 */
-	public function insertAsParentOf(NodeObject \$node, PropelPDO \$con = null)
-	{
-		$peerClassname::insertAsParentOf(\$this, \$node, \$con);
-		return \$this;
-	}
-";
-	}
-
-	protected function addGetLeft(&$script)
-	{
-		$table = $this->getTable();
-
-		foreach ($table->getColumns() as $col) {
-			if ($col->isNestedSetLeftKey()) {
-				$left_col_getter_name = 'get'.$col->getPhpName();
-				break;
-			}
-		}
-
-		$script .= "
-	/**
-	 * Wraps the getter for the left value
-	 *
-	 * @return     int
-	 */
-	public function getLeftValue()
-	{
-		return \$this->$left_col_getter_name();
-	}
-";
-	}
-
-	protected function addGetRight(&$script)
-	{
-		$table = $this->getTable();
-
-		foreach ($table->getColumns() as $col) {
-			if ($col->isNestedSetRightKey()) {
-				$right_col_getter_name = 'get'.$col->getPhpName();
-				break;
-			}
-		}
-
-		$script .= "
-	/**
-	 * Wraps the getter for the right value
-	 *
-	 * @return     int
-	 */
-	public function getRightValue()
-	{
-		return \$this->$right_col_getter_name();
-	}
-";
-	}
-
-	protected function addGetScopeId(&$script)
-	{
-		$table = $this->getTable();
-
-		$scope_col_getter_name = null;
-		foreach ($table->getColumns() as $col) {
-			if ($col->isTreeScopeKey()) {
-				$scope_col_getter_name = 'get'.$col->getPhpName();
-				break;
-			}
-		}
-
-		$script .= "
-	/**
-	 * Wraps the getter for the scope value
-	 *
-	 * @return     int or null if scope is disabled
-	 */
-	public function getScopeIdValue()
-	{";
-		if ($scope_col_getter_name) {
-			$script .= "
-		return \$this->$scope_col_getter_name();";
-		} else {
-			$script .= "
-		return null;";
-		}
-		$script .= "
-	}
-";
-	}
-
-	protected function addSetLeft(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$table = $this->getTable();
-
-		foreach ($table->getColumns() as $col) {
-			if ($col->isNestedSetLeftKey()) {
-				$left_col_setter_name = 'set'.$col->getPhpName();
-				break;
-			}
-		}
-
-		$script .= "
-	/**
-	 * Set the value left column
-	 *
-	 * @param      int \$v new value
-	 * @return     $objectClassName The current object (for fluent API support)
-	 */
-	public function setLeftValue(\$v)
-	{
-		\$this->$left_col_setter_name(\$v);
-		return \$this;
-	}
-";
-	}
-
-	protected function addSetRight(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$table = $this->getTable();
-
-		foreach ($table->getColumns() as $col) {
-			if ($col->isNestedSetRightKey()) {
-				$right_col_setter_name = 'set'.$col->getPhpName();
-				break;
-			}
-		}
-
-		$script .= "
-	/**
-	 * Set the value of right column
-	 *
-	 * @param      int \$v new value
-	 * @return     $objectClassName The current object (for fluent API support)
-	 */
-	public function setRightValue(\$v)
-	{
-		\$this->$right_col_setter_name(\$v);
-		return \$this;
-	}
-";
-	}
-
-	protected function addSetScopeId(&$script)
-	{
-		$objectClassName = $this->getStubObjectBuilder()->getClassname();
-		$table = $this->getTable();
-
-		$scope_col_setter_name = null;
-		foreach ($table->getColumns() as $col) {
-			if ($col->isTreeScopeKey()) {
-				$scope_col_setter_name = 'set'.$col->getPhpName();
-				break;
-			}
-		}
-
-		$script .= "
-	/**
-	 * Set the value of scope column
-	 *
-	 * @param      int \$v new value
-	 * @return     $objectClassName The current object (for fluent API support)
-	 */
-	public function setScopeIdValue(\$v)
-	{";
-		if ($scope_col_setter_name) {
-			$script .= "
-		\$this->$scope_col_setter_name(\$v);";
-		}
-		$script .= "
-		return \$this;
-	}
-";
-
-	}
-
-} // PHP5NestedSetBuilder
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5NestedSetPeerBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5NestedSetPeerBuilder.php
deleted file mode 100644
index 28d0ff244..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5NestedSetPeerBuilder.php
+++ /dev/null
@@ -1,1737 +0,0 @@
-<?php
-
-/*
- *  $Id: PHP5NestedSetPeerBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/PeerBuilder.php';
-
-/**
- * Generates a PHP5 tree nested set Peer class for user object model (OM).
- *
- * This class produces the base tree nested set object class (e.g. BaseMyTable) which contains all
- * the custom-built accessor and setter methods.
- *
- * This class replaces the Node.tpl, with the intent of being easier for users
- * to customize (through extending & overriding).
- *
- * @author     heltem <heltem@o2php.com>
- * @package    propel.engine.builder.om.php5
- */
-class PHP5NestedSetPeerBuilder extends PeerBuilder {
-
-	/**
-	 * Gets the package for the [base] object classes.
-	 * @return     string
-	 */
-	public function getPackage()
-	{
-		return parent::getPackage() . ".om";
-	}
-
-	/**
-	 * Returns the name of the current class being built.
-	 * @return     string
-	 */
-	public function getUnprefixedClassname()
-	{
-		return $this->getBuildProperty('basePrefix') . $this->getStubObjectBuilder()->getUnprefixedClassname() . 'NestedSetPeer';
-	}
-
-	/**
-	 * Adds the include() statements for files that this class depends on or utilizes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addIncludes(&$script)
-	{
-		$script .="
-require '".$this->getPeerBuilder()->getClassFilePath()."';
-";
-	} // addIncludes()
-
-	/**
-	 * Adds class phpdoc comment and openning of class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassOpen(&$script)
-	{
-
-		$table = $this->getTable();
-		$tableName = $table->getName();
-		$tableDesc = $table->getDescription();
-
-		$script .= "
-/**
- * Base static class for performing query operations on the tree contained by the '$tableName' table.
- *
- * $tableDesc
- *";
-		if ($this->getBuildProperty('addTimeStamp')) {
-			$now = strftime('%c');
-			$script .= "
- * This class was autogenerated by Propel " . $this->getBuildProperty('version') . " on:
- *
- * $now
- *";
-		}
-		$script .= "
- * @package    ".$this->getPackage()."
- */
-abstract class ".$this->getClassname()." extends ".$this->getPeerBuilder()->getClassName()." implements NodePeer {
-";
-	}
-
-	/**
-	 * Specifies the methods that are added as part of the basic OM class.
-	 * This can be overridden by subclasses that wish to add more methods.
-	 * @see        ObjectBuilder::addClassBody()
-	 */
-	protected function addClassBody(&$script)
-	{
-		$table = $this->getTable();
-
-		// FIXME
-		// - Probably the build needs to be customized for supporting
-		// tables that are "aliases".  -- definitely a fringe usecase, though.
-
-		$this->addConstants($script);
-
-		$this->addCreateRoot($script);
-
-		$this->addRetrieveRoot($script);
-
-		$this->addInsertAsFirstChildOf($script);
-		$this->addInsertAsLastChildOf($script);
-		$this->addInsertAsPrevSiblingOf($script);
-		$this->addInsertAsNextSiblingOf($script);
-		$this->addInsertAsParentOf($script);
-
-		$this->addInsertRoot($script);
-		$this->addInsertParent($script);
-
-		$this->addDeleteRoot($script);
-		$this->addDeleteNode($script);
-
-		$this->addMoveToFirstChildOf($script);
-		$this->addMoveToLastChildOf($script);
-		$this->addMoveToPrevSiblingOf($script);
-		$this->addMoveToNextSiblingOf($script);
-
-		$this->addRetrieveFirstChild($script);
-		$this->addRetrieveLastChild($script);
-		$this->addRetrievePrevSibling($script);
-		$this->addRetrieveNextSibling($script);
-
-		$this->addRetrieveTree($script);
-		$this->addRetrieveBranch($script);
-		$this->addRetrieveChildren($script);
-		$this->addRetrieveDescendants($script);
-		$this->addRetrieveSiblings($script);
-		$this->addRetrieveParent($script);
-
-		$this->addGetLevel($script);
-		$this->addGetNumberOfChildren($script);
-		$this->addGetNumberOfDescendants($script);
-		$this->addGetPath($script);
-
-		$this->addIsValid($script);
-		$this->addIsRoot($script);
-		$this->addIsLeaf($script);
-		$this->addIsChildOf($script);
-		$this->addIsChildOfOrSiblingTo($script);
-		$this->addIsEqualTo($script);
-
-		$this->addHasParent($script);
-		$this->addHasPrevSibling($script);
-		$this->addHasNextSibling($script);
-		$this->addHasChildren($script);
-
-		$this->addDeleteDescendants($script);
-
-		$this->addGetNode($script);
-
-		$this->addHydrateDescendants($script);
-		$this->addHydrateChildren($script);
-
-		$this->addShiftRParent($script);
-		$this->addUpdateLoadedNode($script);
-		$this->addUpdateDBNode($script);
-
-		$this->addShiftRLValues($script);
-		$this->addShiftRLRange($script);
-	}
-
-	/**
-	 * Closes class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassClose(&$script)
-	{
-		$script .= "
-} // " . $this->getClassname() . "
-";
-	}
-
-	protected function addConstants(&$script)
-	{
-		$table = $this->getTable();
-		$tableName = $table->getName();
-
-		$colname = array();
-
-		foreach ($table->getColumns() as $col) {
-			if ($col->isNestedSetLeftKey()) {
-				$colname['left'] = $this->prefixTablename($tableName) . '.' . strtoupper($col->getName());
-			}
-
-			if ($col->isNestedSetRightKey()) {
-				$colname['right'] = $this->prefixTablename($tableName) . '.' . strtoupper($col->getName());
-			}
-
-			if ($col->isTreeScopeKey()) {
-				$colname['scope'] = $this->prefixTablename($tableName) . '.' . strtoupper($col->getName());
-			}
-
-			if (3 == count($colname)) {
-				break;
-			}
-		}
-
-		if(!isset($colname['left'])) {
-			throw new EngineException("One column must have nestedSetLeftKey attribute set to true for [" . $table->getName() . "] table");
-		}
-
-		if(!isset($colname['right'])) {
-			throw new EngineException("One column must have nestedSetRightKey attribute set to true for [" . $table->getName() . "] table");
-		}
-
-		$colname['scope'] = isset($colname['scope']) ? $colname['scope'] : null;
-
-		$script .= "
-	/**
-	 * Left column for the set
-	 */
-	const LEFT_COL = " . var_export($colname['left'], true) . ";
-
-	/**
-	 * Right column for the set
-	 */
-	const RIGHT_COL = " . var_export($colname['right'], true) . ";
-
-	/**
-	 * Scope column for the set
-	 */
-	const SCOPE_COL = " . var_export($colname['scope'], true) . ";
-";
-	}
-
-	protected function addCreateRoot(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Creates the supplied node as the root node.
-	 *
-	 * @param      $objectClassname \$node	Propel object for model
-	 * @throws     PropelException
-	 */
-	public static function createRoot(NodeObject \$node)
-	{
-		if (\$node->getLeftValue()) {
-			throw new PropelException('Cannot turn an existing node into a root node.');
-		}
-
-		\$node->setLeftValue(1);
-		\$node->setRightValue(2);
-	}
-";
-	}
-
-	protected function addRetrieveRoot(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Returns the root node for a given scope id
-	 *
-	 * @param      int \$scopeId		Scope id to determine which root node to return
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     $objectClassname			Propel object for root node
-	 */
-	public static function retrieveRoot(\$scopeId = null, PropelPDO \$con = null)
-	{
-		\$c = new Criteria($peerClassname::DATABASE_NAME);
-
-		\$c->add(self::LEFT_COL, 1, Criteria::EQUAL);
-
-		if (self::SCOPE_COL) {
-			\$c->add(self::SCOPE_COL, \$scopeId, Criteria::EQUAL);
-		}
-
-		return $peerClassname::doSelectOne(\$c, \$con);
-	}
-";
-	}
-
-	protected function addInsertAsFirstChildOf(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Inserts \$child as first child of given \$parent node
-	 *
-	 * @param      $objectClassname \$child	Propel object for child node
-	 * @param      $objectClassname \$parent	Propel object for parent node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     void
-	 */
-	public static function insertAsFirstChildOf(NodeObject \$child, NodeObject \$parent, PropelPDO \$con = null)
-	{
-		// Update \$child node properties
-		\$child->setLeftValue(\$parent->getLeftValue() + 1);
-		\$child->setRightValue(\$parent->getLeftValue() + 2);
-		\$child->setParentNode(\$parent);
-
-		\$sidv = null;
-		if (self::SCOPE_COL) {
-			\$child->setScopeIdValue(\$sidv = \$parent->getScopeIdValue());
-		}
-
-		// Update database nodes
-		self::shiftRLValues(\$child->getLeftValue(), 2, \$con, \$sidv);
-
-		// Update all loaded nodes
-		self::updateLoadedNode(\$parent, 2, \$con);
-	}
-";
-	}
-
-	protected function addInsertAsLastChildOf(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Inserts \$child as last child of destination node \$parent
-	 *
-	 * @param      $objectClassname \$child		Propel object for child node
-	 * @param      $objectClassname \$parent	Propel object for parent node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     void
-	 */
-	public static function insertAsLastChildOf(NodeObject \$child, NodeObject \$parent, PropelPDO \$con = null)
-	{
-		// Update \$child node properties
-		\$child->setLeftValue(\$parent->getRightValue());
-		\$child->setRightValue(\$parent->getRightValue() + 1);
-		\$child->setParentNode(\$parent);
-
-		\$sidv = null;
-		if (self::SCOPE_COL) {
-			\$child->setScopeIdValue(\$sidv = \$parent->getScopeIdValue());
-		}
-
-		// Update database nodes
-		self::shiftRLValues(\$child->getLeftValue(), 2, \$con, \$sidv);
-
-		// Update all loaded nodes
-		self::updateLoadedNode(\$parent, 2, \$con);
-	}
-";
-	}
-
-	protected function addInsertAsPrevSiblingOf(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Inserts \$sibling as previous sibling to destination node \$node
-	 *
-	 * @param      $objectClassname \$node		Propel object for destination node
-	 * @param      $objectClassname \$sibling	Propel object for source node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     void
-	 */
-	public static function insertAsPrevSiblingOf(NodeObject \$node, NodeObject \$sibling, PropelPDO \$con = null)
-	{
-		if (\$sibling->isRoot()) {
-			throw new PropelException('Root nodes cannot have siblings');
-		}
-
-		\$node->setLeftValue(\$sibling->getLeftValue());
-		\$node->setRightValue(\$sibling->getLeftValue() + 1);
-		\$node->setParentNode(\$sibling->retrieveParent());
-
-		\$sidv = null;
-		if (self::SCOPE_COL) {
-			\$node->setScopeIdValue(\$sidv = \$sibling->getScopeIdValue());
-		}
-
-		// Update database nodes
-		self::shiftRLValues(\$node->getLeftValue(), 2, \$con, \$sidv);
-
-		// Update all loaded nodes
-		self::updateLoadedNode(\$sibling->retrieveParent(), 2, \$con);
-	}
-";
-	}
-
-	protected function addInsertAsNextSiblingOf(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Inserts \$sibling as next sibling to destination node \$node
-	 *
-	 * @param      $objectClassname \$node		Propel object for destination node
-	 * @param      $objectClassname \$sibling	Propel object for source node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     void
-	 */
-	public static function insertAsNextSiblingOf(NodeObject \$node, NodeObject \$sibling, PropelPDO \$con = null)
-	{
-		if (\$sibling->isRoot()) {
-			throw new PropelException('Root nodes cannot have siblings');
-		}
-
-		\$node->setLeftValue(\$sibling->getRightValue() + 1);
-		\$node->setRightValue(\$sibling->getRightValue() + 2);
-		\$node->setParentNode(\$sibling->retrieveParent());
-
-		\$sidv = null;
-		if (self::SCOPE_COL) {
-			\$node->setScopeIdValue(\$sidv = \$sibling->getScopeIdValue());
-		}
-
-		// Update database nodes
-		self::shiftRLValues(\$node->getLeftValue(), 2, \$con, \$sidv);
-
-		// Update all loaded nodes
-		self::updateLoadedNode(\$sibling->retrieveParent(), 2, \$con);
-	}
-";
-	}
-
-	protected function addInsertAsParentOf(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Inserts \$parent as parent of given node.
-	 *
-	 * @param      $objectClassname \$parent	Propel object for given parent node
-	 * @param      $objectClassname \$node	Propel object for given destination node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     void
-	 */
-	public static function insertAsParentOf(NodeObject \$parent, NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$sidv = null;
-		if (self::SCOPE_COL) {
-			\$sidv = \$node->getScopeIdValue();
-		}
-
-		self::shiftRLValues(\$node->getLeftValue(), 1, \$con, \$sidv);
-		self::shiftRLValues(\$node->getRightValue() + 2, 1, \$con, \$sidv);
-
-		if (self::SCOPE_COL) {
-			\$parent->setScopeIdValue(\$sidv);
-		}
-
-		\$parent->setLeftValue(\$node->getLeftValue());
-		\$parent->setRightValue(\$node->getRightValue() + 2);
-
-		\$previous_parent = \$node->retrieveParent();
-		\$parent->setParentNode(\$previous_parent);
-		\$node->setParentNode(\$parent);
-
-		\$node->save(\$con);
-
-		// Update all loaded nodes
-		self::updateLoadedNode(\$previous_parent, 2, \$con);
-	}
-";
-	}
-
-	protected function addInsertRoot(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Inserts \$node as root node
-	 *
-	 * @param      $objectClassname \$node	Propel object as root node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     void
-	 */
-	public static function insertRoot(NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$sidv = null;
-		if (self::SCOPE_COL) {
-			\$sidv = \$node->getScopeIdValue();
-		}
-
-		$peerClassname::insertAsParentOf($peerClassname::retrieveRoot(\$sidv, \$con), \$node, \$con);
-	}
-";
-	}
-
-	protected function addInsertParent(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Inserts \$parent as parent to destination node \$child
-	 *
-	 * @deprecated 1.3 - 2007/11/06
-	 * @see        insertAsParentOf()
-	 * @param      $objectClassname \$child	Propel object to become child node
-	 * @param      $objectClassname \$parent	Propel object as parent node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     void
-	 */
-	public static function insertParent(NodeObject \$child, NodeObject \$parent, PropelPDO \$con = null)
-	{
-		self::insertAsParentOf(\$parent, \$child, \$con);
-	}
-";
-	}
-
-	protected function addDeleteRoot(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Delete root node
-	 *
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     boolean		Deletion status
-	 */
-	public static function deleteRoot(\$scopeId = null, PropelPDO \$con = null)
-	{
-		if (!self::SCOPE_COL) {
-			\$scopeId = null;
-		}
-		\$root = $peerClassname::retrieveRoot(\$scopeId, \$con);
-		if ($peerClassname::getNumberOfChildren(\$root) == 1) {
-			return $peerClassname::deleteNode(\$root, \$con);
-		} else {
-			return false;
-		}
-	}
-";
-	}
-
-	protected function addDeleteNode(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Delete \$dest node
-	 *
-	 * @param      $objectClassname \$dest	Propel object node to delete
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     boolean		Deletion status
-	 */
-	public static function deleteNode(NodeObject \$dest, PropelPDO \$con = null)
-	{
-		if (\$dest->getLeftValue() == 1) {
-			// deleting root implies conditions (see deleteRoot() method)
-			return $peerClassname::deleteRoot(\$con);
-		}
-
-		\$sidv = null;
-		if (self::SCOPE_COL) {
-			\$sidv = \$dest->getScopeIdValue();
-		}
-
-		self::shiftRLRange(\$dest->getLeftValue(), \$dest->getRightValue(), -1, \$con, \$sidv);
-		self::shiftRLValues(\$dest->getRightValue() + 1, -2, \$con, \$sidv);
-		return \$dest->delete(\$con);
-	}
-";
-	}
-
-	protected function addMoveToFirstChildOf(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Moves \$child to be first child of \$parent
-	 *
-	 * @param      $objectClassname \$parent	Propel object for parent node
-	 * @param      $objectClassname \$child		Propel object for child node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     void
-	 */
-	public static function moveToFirstChildOf(NodeObject \$parent, NodeObject \$child, PropelPDO \$con = null)
-	{
-		if (\$parent->getScopeIdValue() != \$child->getScopeIdValue()) {
-			throw new PropelException('Moving nodes across trees is not supported');
-		}
-		\$destLeft = \$parent->getLeftValue() + 1;
-		self::updateDBNode(\$child, \$destLeft, \$con);
-
-		// Update all loaded nodes
-		self::updateLoadedNode(\$parent, 2, \$con);
-	}
-";
-	}
-
-	protected function addMoveToLastChildOf(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Moves \$child to be last child of \$parent
-	 *
-	 * @param      $objectClassname \$parent	Propel object for parent node
-	 * @param      $objectClassname \$child		Propel object for child node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     void
-	 */
-	public static function moveToLastChildOf(NodeObject \$parent, NodeObject \$child, PropelPDO \$con = null)
-	{
-		if (\$parent->getScopeIdValue() != \$child->getScopeIdValue()) {
-			throw new PropelException('Moving nodes across trees is not supported');
-		}
-		\$destLeft = \$parent->getRightValue();
-		self::updateDBNode(\$child, \$destLeft, \$con);
-
-		// Update all loaded nodes
-		self::updateLoadedNode(\$parent, 2, \$con);
-	}
-";
-	}
-
-	protected function addMoveToPrevSiblingOf(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Moves \$node to be prev sibling to \$dest
-	 *
-	 * @param      $objectClassname \$dest	Propel object for destination node
-	 * @param      $objectClassname \$node	Propel object for source node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     void
-	 */
-	public static function moveToPrevSiblingOf(NodeObject \$dest, NodeObject \$node, PropelPDO \$con = null)
-	{
-		if (\$dest->getScopeIdValue() != \$node->getScopeIdValue()) {
-			throw new PropelException('Moving nodes across trees is not supported');
-		}
-		\$destLeft = \$dest->getLeftValue();
-		self::updateDBNode(\$node, \$destLeft, \$con);
-
-		// Update all loaded nodes
-		self::updateLoadedNode(\$dest->retrieveParent(), 2, \$con);
-	}
-";
-	}
-
-	protected function addMoveToNextSiblingOf(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Moves \$node to be next sibling to \$dest
-	 *
-	 * @param      $objectClassname \$dest	Propel object for destination node
-	 * @param      $objectClassname \$node	Propel object for source node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     void
-	 */
-	public static function moveToNextSiblingOf(NodeObject \$dest, NodeObject \$node, PropelPDO \$con = null)
-	{
-		if (\$dest->getScopeIdValue() != \$node->getScopeIdValue()) {
-			throw new PropelException('Moving nodes across trees is not supported');
-		}
-		\$destLeft = \$dest->getRightValue();
-		\$destLeft = \$destLeft + 1;
-		self::updateDBNode(\$node, \$destLeft, \$con);
-
-		// Update all loaded nodes
-		self::updateLoadedNode(\$dest->retrieveParent(), 2, \$con);
-	}
-";
-	}
-
-	protected function addRetrieveFirstChild(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets first child for the given node if it exists
-	 *
-	 * @param      $objectClassname \$node	Propel object for src node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public static function retrieveFirstChild(NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$c = new Criteria($peerClassname::DATABASE_NAME);
-		\$c->add(self::LEFT_COL, \$node->getLeftValue() + 1, Criteria::EQUAL);
-		if (self::SCOPE_COL) {
-			\$c->add(self::SCOPE_COL, \$node->getScopeIdValue(), Criteria::EQUAL);
-		}
-
-		return $peerClassname::doSelectOne(\$c, \$con);
-	}
-";
-	}
-
-	protected function addRetrieveLastChild(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets last child for the given node if it exists
-	 *
-	 * @param      $objectClassname \$node	Propel object for src node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public static function retrieveLastChild(NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$c = new Criteria($peerClassname::DATABASE_NAME);
-		\$c->add(self::RIGHT_COL, \$node->getRightValue() - 1, Criteria::EQUAL);
-		if (self::SCOPE_COL) {
-			\$c->add(self::SCOPE_COL, \$node->getScopeIdValue(), Criteria::EQUAL);
-		}
-
-		return $peerClassname::doSelectOne(\$c, \$con);
-	}
-";
-	}
-
-	protected function addRetrievePrevSibling(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets prev sibling for the given node if it exists
-	 *
-	 * @param      $objectClassname \$node	Propel object for src node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     mixed 		Propel object if exists else null
-	 */
-	public static function retrievePrevSibling(NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$c = new Criteria($peerClassname::DATABASE_NAME);
-		\$c->add(self::RIGHT_COL, \$node->getLeftValue() - 1, Criteria::EQUAL);
-		if (self::SCOPE_COL) {
-			\$c->add(self::SCOPE_COL, \$node->getScopeIdValue(), Criteria::EQUAL);
-		}
-		\$prevSibling = $peerClassname::doSelectOne(\$c, \$con);
-		\$node->setPrevSibling(\$prevSibling);
-		return \$prevSibling;
-	}
-";
-	}
-
-	protected function addRetrieveNextSibling(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets next sibling for the given node if it exists
-	 *
-	 * @param      $objectClassname \$node	Propel object for src node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public static function retrieveNextSibling(NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$c = new Criteria($peerClassname::DATABASE_NAME);
-		\$c->add(self::LEFT_COL, \$node->getRightValue() + 1, Criteria::EQUAL);
-		if (self::SCOPE_COL) {
-			\$c->add(self::SCOPE_COL, \$node->getScopeIdValue(), Criteria::EQUAL);
-		}
-		\$nextSibling = $peerClassname::doSelectOne(\$c, \$con);
-		\$node->setNextSibling(\$nextSibling);
-		return \$nextSibling;
-	}
-";
-	}
-
-	protected function addRetrieveTree(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Retrieves the entire tree from root
-	 *
-	 * @param      PropelPDO \$con	Connection to use.
-	 */
-	public static function retrieveTree(\$scopeId = null, PropelPDO \$con = null)
-	{
-		\$c = new Criteria($peerClassname::DATABASE_NAME);
-		\$c->addAscendingOrderByColumn(self::LEFT_COL);
-		if (self::SCOPE_COL) {
-			\$c->add(self::SCOPE_COL, \$scopeId, Criteria::EQUAL);
-		}
-		\$stmt = $peerClassname::doSelectStmt(\$c, \$con);
-		if (false !== (\$row = \$stmt->fetch(PDO::FETCH_NUM))) {
-			\$omClass = $peerClassname::getOMClass(\$row, 0);
-			\$cls = substr('.'.\$omClass, strrpos('.'.\$omClass, '.') + 1);
-
-			\$key = ".$peerClassname."::getPrimaryKeyHashFromRow(\$row, 0);
-			if (null === (\$root = ".$peerClassname."::getInstanceFromPool(\$key))) {
-				" . $this->buildObjectInstanceCreationCode('$root', '$cls') . "
-				\$root->hydrate(\$row);
-			}
-
-			\$root->setLevel(0);
-			$peerClassname::hydrateDescendants(\$root, \$stmt);
-			$peerClassname::addInstanceToPool(\$root);
-			
-			\$stmt->closeCursor();
-			return \$root;
-		}
-		return false;
-	}
-";
-	}
-
-	protected function addRetrieveBranch(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Retrieves the entire tree from parent \$node
-	 *
-	 * @param      $objectClassname \$node	Propel object for parent node
-	 * @param      PropelPDO \$con	Connection to use.
-	 */
-	public static function retrieveBranch(NodeObject \$node, PropelPDO \$con = null)
-	{
-		return $peerClassname::retrieveDescendants(\$node, \$con);
-	}
-";
-	}
-
-	protected function addRetrieveChildren(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets direct children for the node
-	 *
-	 * @param      $objectClassname \$node	Propel object for parent node
-	 * @param      PropelPDO \$con	Connection to use.
-	 */
-	public static function retrieveChildren(NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$c = new Criteria($peerClassname::DATABASE_NAME);
-		\$c->addAscendingOrderByColumn(self::LEFT_COL);
-		if (self::SCOPE_COL) {
-			\$c->add(self::SCOPE_COL, \$node->getScopeIdValue(), Criteria::EQUAL);
-		}
-		\$c->add(self::LEFT_COL, \$node->getLeftValue(), Criteria::GREATER_THAN);
-		\$c->addAnd(self::RIGHT_COL, \$node->getRightValue(), Criteria::LESS_THAN);
-		\$stmt = $peerClassname::doSelectStmt(\$c, \$con);
-
-		return $peerClassname::hydrateChildren(\$node, \$stmt);
-	}
-";
-	}
-
-	protected function addRetrieveDescendants(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets all descendants for the node
-	 *
-	 * @param      $objectClassname \$node	Propel object for parent node
-	 * @param      PropelPDO \$con	Connection to use.
-	 */
-	public static function retrieveDescendants(NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$c = new Criteria($peerClassname::DATABASE_NAME);
-		\$c->addAscendingOrderByColumn(self::LEFT_COL);
-		if (self::SCOPE_COL) {
-			\$c->add(self::SCOPE_COL, \$node->getScopeIdValue(), Criteria::EQUAL);
-		}
-		\$c->add(self::LEFT_COL, \$node->getLeftValue(), Criteria::GREATER_THAN);
-		\$c->addAnd(self::RIGHT_COL, \$node->getRightValue(), Criteria::LESS_THAN);
-		\$stmt = $peerClassname::doSelectStmt(\$c, \$con);
-
-		return $peerClassname::hydrateDescendants(\$node, \$stmt);
-	}
-";
-	}
-
-	protected function addRetrieveSiblings(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets all siblings for the node
-	 *
-	 * @param      $objectClassname \$node	Propel object for src node
-	 * @param      PropelPDO \$con	Connection to use.
-	 */
-	public static function retrieveSiblings(NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$parent = $peerClassname::retrieveParent(\$node, \$con);
-		\$siblings = $peerClassname::retrieveChildren(\$parent, \$con);
-
-		return \$siblings;
-	}
-";
-	}
-
-	protected function addRetrieveParent(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets immediate ancestor for the given node if it exists
-	 *
-	 * @param      $objectClassname \$node	Propel object for src node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     mixed 		Propel object if exists else null
-	 */
-	public static function retrieveParent(NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$c = new Criteria($peerClassname::DATABASE_NAME);
-		\$c1 = \$c->getNewCriterion(self::LEFT_COL, \$node->getLeftValue(), Criteria::LESS_THAN);
-		\$c2 = \$c->getNewCriterion(self::RIGHT_COL, \$node->getRightValue(), Criteria::GREATER_THAN);
-
-		\$c1->addAnd(\$c2);
-
-		\$c->add(\$c1);
-		if (self::SCOPE_COL) {
-			\$c->add(self::SCOPE_COL, \$node->getScopeIdValue(), Criteria::EQUAL);
-		}
-		\$c->addAscendingOrderByColumn(self::RIGHT_COL);
-
-		\$parent = $peerClassname::doSelectOne(\$c, \$con);
-
-		\$node->setParentNode(\$parent);
-
-		return \$parent;
-	}
-";
-	}
-
-	protected function addGetLevel(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets level for the given node
-	 *
-	 * @param      $objectClassname \$node	Propel object for src node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     int			Level for the given node
-	 */
-	public static function getLevel(NodeObject \$node, PropelPDO \$con = null)
-	{
-		if (\$con === null) {
-			\$con = Propel::getConnection($peerClassname::DATABASE_NAME, Propel::CONNECTION_READ);
-		}
-
-		\$sql = \"SELECT COUNT(*) AS level FROM \" . self::TABLE_NAME . \" WHERE \" . self::LEFT_COL . \" < :left AND \" . self::RIGHT_COL . \" > :right\";
-
-		if (self::SCOPE_COL) {
-			\$sql .= ' AND ' . self::SCOPE_COL . ' = :scope';
-		}
-
-		\$stmt = \$con->prepare(\$sql);
-		\$stmt->bindValue(':left', \$node->getLeftValue(), PDO::PARAM_INT);
-		\$stmt->bindValue(':right', \$node->getRightValue(), PDO::PARAM_INT);
-		if (self::SCOPE_COL) {
-			\$stmt->bindValue(':scope', \$node->getScopeIdValue());
-		}
-		\$stmt->execute();
-		\$row = \$stmt->fetch();
-		return \$row['level'];
-	}
-";
-	}
-
-	protected function addGetNumberOfChildren(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets number of direct children for given node
-	 *
-	 * @param      $objectClassname \$node	Propel object for src node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     int			Level for the given node
-	 */
-	public static function getNumberOfChildren(NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$children = $peerClassname::retrieveChildren(\$node);
-		return count(\$children);
-	}
-";
-	}
-
-	protected function addGetNumberOfDescendants(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Gets number of descendants for given node
-	 *
-	 * @param      $objectClassname \$node	Propel object for src node
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     int			Level for the given node
-	 */
-	public static function getNumberOfDescendants(NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$right = \$node->getRightValue();
-		\$left = \$node->getLeftValue();
-		\$num = (\$right - \$left - 1) / 2;
-		return \$num;
-	}
-";
-	}
-
-	protected function addGetPath(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Returns path to a specific node as an array, useful to create breadcrumbs
-	 *
-	 * @param      $objectClassname \$node	Propel object of node to create path to
-	 * @param      PropelPDO \$con	Connection to use.
-	 * @return     array			Array in order of heirarchy
-	 */
-	public static function getPath(NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$criteria = new Criteria();
-		if (self::SCOPE_COL) {
-			\$criteria->add(self::SCOPE_COL, \$node->getScopeIdValue(), Criteria::EQUAL);
-		}
-		\$criteria->add(self::LEFT_COL, \$node->getLeftValue(), Criteria::LESS_EQUAL);
-		\$criteria->add(self::RIGHT_COL, \$node->getRightValue(), Criteria::GREATER_EQUAL);
-		\$criteria->addAscendingOrderByColumn(self::LEFT_COL);
-
-		return self::doSelect(\$criteria, \$con);
-	}
-";
-	}
-
-	protected function addIsValid(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Tests if node is valid
-	 *
-	 * @param      $objectClassname \$node	Propel object for src node
-	 * @return     bool
-	 */
-	public static function isValid(NodeObject \$node = null)
-	{
-		if (is_object(\$node) && \$node->getRightValue() > \$node->getLeftValue()) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-";
-	}
-
-	protected function addIsRoot(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Tests if node is a root
-	 *
-	 * @param      $objectClassname \$node	Propel object for src node
-	 * @return     bool
-	 */
-	public static function isRoot(NodeObject \$node)
-	{
-		return (\$node->getLeftValue()==1);
-	}
-";
-	}
-
-	protected function addIsLeaf(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Tests if node is a leaf
-	 *
-	 * @param      $objectClassname \$node	Propel object for src node
-	 * @return     bool
-	 */
-	public static function isLeaf(NodeObject \$node)
-	{
-		return ((\$node->getRightValue()-\$node->getLeftValue())==1);
-	}
-";
-	}
-
-	protected function addIsChildOf(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Tests if \$child is a child of \$parent
-	 *
-	 * @param      $objectClassname \$child	Propel object for node
-	 * @param      $objectClassname \$parent	Propel object for node
-	 * @return     bool
-	 */
-	public static function isChildOf(NodeObject \$child, NodeObject \$parent)
-	{
-		return ((\$child->getLeftValue()>\$parent->getLeftValue()) && (\$child->getRightValue()<\$parent->getRightValue()));
-	}
-";
-	}
-
-	protected function addIsChildOfOrSiblingTo(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Tests if \$node1 is a child of or equal to \$node2
-	 *
-	 * @deprecated 1.3 - 2007/11/09
-	 * @param      $objectClassname \$node1		Propel object for node
-	 * @param      $objectClassname \$node2		Propel object for node
-	 * @return     bool
-	 */
-	public static function isChildOfOrSiblingTo(NodeObject \$node1, NodeObject \$node2)
-	{
-		return ((\$node1->getLeftValue()>=\$node2->getLeftValue()) and (\$node1->getRightValue()<=\$node2->getRightValue()));
-	}
-";
-	}
-
-	protected function addIsEqualTo(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Tests if \$node1 is equal to \$node2
-	 *
-	 * @param      $objectClassname \$node1		Propel object for node
-	 * @param      $objectClassname \$node2		Propel object for node
-	 * @return     bool
-	 */
-	public static function isEqualTo(NodeObject \$node1, NodeObject \$node2)
-	{
-		\$also = true;
-		if (self::SCOPE_COL) {
-			\$also = (\$node1->getScopeIdValue() === \$node2->getScopeIdValue());
-		}
-		return \$node1->getLeftValue() == \$node2->getLeftValue() && \$node1->getRightValue() == \$node2->getRightValue() && \$also;
-	}
-";
-	}
-
-	protected function addHasParent(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Tests if \$node has an ancestor
-	 *
-	 * @param      $objectClassname \$node		Propel object for node
-	 * @param      PropelPDO \$con		Connection to use.
-	 * @return     bool
-	 */
-	public static function hasParent(NodeObject \$node, PropelPDO \$con = null)
-	{
-		return $peerClassname::isValid($peerClassname::retrieveParent(\$node, \$con));
-	}
-";
-	}
-
-	protected function addHasPrevSibling(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Tests if \$node has prev sibling
-	 *
-	 * @param      $objectClassname \$node		Propel object for node
-	 * @param      PropelPDO \$con		Connection to use.
-	 * @return     bool
-	 */
-	public static function hasPrevSibling(NodeObject \$node, PropelPDO \$con = null)
-	{
-		return $peerClassname::isValid($peerClassname::retrievePrevSibling(\$node, \$con));
-	}
-";
-	}
-
-	protected function addHasNextSibling(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Tests if \$node has next sibling
-	 *
-	 * @param      $objectClassname \$node		Propel object for node
-	 * @param      PropelPDO \$con		Connection to use.
-	 * @return     bool
-	 */
-	public static function hasNextSibling(NodeObject \$node, PropelPDO \$con = null)
-	{
-		return $peerClassname::isValid($peerClassname::retrieveNextSibling(\$node, \$con));
-	}
-";
-	}
-
-	protected function addHasChildren(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Tests if \$node has children
-	 *
-	 * @param      $objectClassname \$node		Propel object for node
-	 * @return     bool
-	 */
-	public static function hasChildren(NodeObject \$node)
-	{
-		return ((\$node->getRightValue()-\$node->getLeftValue())>1);
-	}
-";
-	}
-
-	protected function addDeleteDescendants(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Deletes \$node and all of its descendants
-	 *
-	 * @param      $objectClassname \$node		Propel object for source node
-	 * @param      PropelPDO \$con		Connection to use.
-	 */
-	public static function deleteDescendants(NodeObject \$node, PropelPDO \$con = null)
-	{
-		\$left = \$node->getLeftValue();
-		\$right = \$node->getRightValue();
-
-		\$c = new Criteria($peerClassname::DATABASE_NAME);
-		\$c1 = \$c->getNewCriterion(self::LEFT_COL, \$left, Criteria::GREATER_THAN);
-		\$c2 = \$c->getNewCriterion(self::RIGHT_COL, \$right, Criteria::LESS_THAN);
-
-		\$c1->addAnd(\$c2);
-
-		\$c->add(\$c1);
-		if (self::SCOPE_COL) {
-			\$c->add(self::SCOPE_COL, \$node->getScopeIdValue(), Criteria::EQUAL);
-		}
-		\$c->addAscendingOrderByColumn(self::RIGHT_COL);
-
-		\$result = $peerClassname::doDelete(\$c, \$con);
-
-		self::shiftRLValues(\$right + 1, \$left - \$right -1, \$con, \$node->getScopeIdValue());
-
-		return \$result;
-	}
-";
-	}
-
-	protected function addGetNode(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Returns a node given its primary key or the node itself
-	 *
-	 * @param      int/$objectClassname \$node	Primary key/instance of required node
-	 * @param      PropelPDO \$con		Connection to use.
-	 * @return     object		Propel object for model
-	 */
-	public static function getNode(\$node, PropelPDO \$con = null)
-	{
-		if (is_object(\$node)) {
-			return \$node;
-		} else {
-			\$object = $peerClassname::retrieveByPK(\$node, \$con);
-			\$rtn = is_object(\$object) ? \$object : false;
-			return \$rtn;
-		}
-	}
-";
-	}
-
-	protected function addHydrateDescendants(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Hydrate recursively the descendants of the given node
-	 * @param      $objectClassname \$node	Propel object for src node
-	 * @param      PDOStatement \$stmt	Executed PDOStatement
-	 */
-	protected static function hydrateDescendants(NodeObject \$node, PDOStatement \$stmt)
-	{
-		\$descendants = array();
-		\$children = array();
-		\$prevSibling = null;
-";
-
-		if (!$table->getChildrenColumn()) {
-			$script .= "
-		// set the class once to avoid overhead in the loop
-		\$cls = $peerClassname::getOMClass();
-		\$cls = substr('.'.\$cls, strrpos('.'.\$cls, '.') + 1);
-";
-		}
-
-		$script .= "
-		while (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
-			\$key = ".$peerClassname."::getPrimaryKeyHashFromRow(\$row, 0);
-			if (null === (\$child = ".$peerClassname."::getInstanceFromPool(\$key))) {";
-
-		if ($table->getChildrenColumn()) {
-			$script .= "
-				// class must be set each time from the record row
-				\$cls = ".$peerClassname."::getOMClass(\$row, 0);
-				\$cls = substr('.'.\$cls, strrpos('.'.\$cls, '.') + 1);
-";
-		}
-
-		$script .= "
-				" . $this->buildObjectInstanceCreationCode('$child', '$cls') . "
-				\$child->hydrate(\$row);
-			}
-
-			\$child->setLevel(\$node->getLevel() + 1);
-			\$child->setParentNode(\$node);
-			if (!empty(\$prevSibling)) {
-				\$child->setPrevSibling(\$prevSibling);
-				\$prevSibling->setNextSibling(\$child);
-			}
-
-			\$descendants[] = \$child;
-
-			if (\$child->hasChildren()) {
-				\$descendants = array_merge(\$descendants, $peerClassname::hydrateDescendants(\$child, \$stmt));
-			} else {
-				\$child->setChildren(array());
-			}
-
-			\$children[] = \$child;
-			\$prevSibling = \$child;
-
-			$peerClassname::addInstanceToPool(\$child);
-			if (\$child->getRightValue() + 1 == \$node->getRightValue()) {
-				\$child->setNextSibling(null);
-				break;
-			}
-		}
-		\$node->setChildren(\$children);
-		return \$descendants;
-	}
-";
-	}
-
-	protected function addHydrateChildren(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Hydrate the children of the given node
-	 * @param      $objectClassname \$node Propel object for src node
-	 * @param      PDOStatement \$stmt Executed PDOStatement
-	 */
-	protected static function hydrateChildren(NodeObject \$node, PDOStatement \$stmt)
-	{
-		\$children = array();
-		\$prevRight = 0;
-";
-
-		if (!$table->getChildrenColumn()) {
-			$script .= "
-		// set the class once to avoid overhead in the loop
-		\$cls = $peerClassname::getOMClass();
-		\$cls = substr('.'.\$cls, strrpos('.'.\$cls, '.') + 1);
-";
-		}
-
-		$script .= "
-		while (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
-			\$key = ".$peerClassname."::getPrimaryKeyHashFromRow(\$row, 0);
-			if (null === (\$child = ".$peerClassname."::getInstanceFromPool(\$key))) {";
-			
-		if ($table->getChildrenColumn()) {
-			$script .= "
-				// class must be set each time from the record row
-				\$cls = ".$peerClassname."::getOMClass(\$row, 0);
-				\$cls = substr('.'.\$cls, strrpos('.'.\$cls, '.') + 1);
-";
-		}
-
-		$script .= "
-				" . $this->buildObjectInstanceCreationCode('$child', '$cls') . "
-				\$child->hydrate(\$row);
-			}
-
-			\$child->setLevel(\$node->getLevel() + 1);
-
-			if (\$child->getRightValue() > \$prevRight) {
-				\$children[] = \$child;
-				\$prevRight = \$child->getRightValue();
-			}
-
-			if (\$child->getRightValue() + 1 == \$node->getRightValue()) {
-				break;
-			}
-		}
-		\$node->setChildren(\$children);
-		return \$children;
-	}
-";
-	}
-
-	/**
-	 * @deprecated 1.3 - 2008/03/11
-	 * Won't be fixed, defect by design
-	 * Never trust it
-	 */
-	protected function addShiftRParent(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Adds '\$delta' to all parent R values.
-	 * '\$delta' can also be negative.
-	 *
-	 * @deprecated 1.3 - 2008/03/11
-	 * @param      $objectClassname \$node	Propel object for parent node
-	 * @param      int \$delta	Value to be shifted by, can be negative
-	 * @param      PropelPDO \$con		Connection to use.
-	 */
-	protected static function shiftRParent(NodeObject \$node, \$delta, PropelPDO \$con = null)
-	{
-		if (\$node->hasParent(\$con)) {
-			\$parent = \$node->retrieveParent();
-			self::shiftRParent(\$parent, \$delta, \$con);
-		}
-		\$node->setRightValue(\$node->getRightValue() + \$delta);
-	}
-";
-	}
-
-	protected function addUpdateLoadedNode(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$table = $this->getTable();
-
-		$script .= "
-	/**
-	 * Reload all already loaded nodes to sync them with updated db
-	 *
-	 * @param      $objectClassname \$node	Propel object for parent node
-	 * @param      int \$delta	Value to be shifted by, can be negative
-	 * @param      PropelPDO \$con		Connection to use.
-	 */
-	protected static function updateLoadedNode(NodeObject \$node, \$delta, PropelPDO \$con = null)
-	{
-		if (Propel::isInstancePoolingEnabled()) {
-			\$keys = array();
-			foreach (self::\$instances as \$obj) {
-				\$keys[] = \$obj->getPrimaryKey();
-			}
-
-			if (!empty(\$keys)) {
-				// We don't need to alter the object instance pool; we're just modifying these ones
-				// already in the pool.
-				\$criteria = new Criteria(self::DATABASE_NAME);";
-		if (count($table->getPrimaryKey()) === 1) {
-			$pkey = $table->getPrimaryKey();
-			$col = array_shift($pkey);
-			$script .= "
-				\$criteria->add(".$this->getColumnConstant($col).", \$keys, Criteria::IN);
-";
-		} else {
-			$fields = array();
-			foreach ($table->getPrimaryKey() as $k => $col) {
-				$fields[] = $this->getColumnConstant($col);
-			};
-			$script .= "
-
-				// Loop on each instances in pool
-				foreach (\$keys as \$values) {
-				  // Create initial Criterion
-					\$cton = \$criteria->getNewCriterion(" . $fields[0] . ", \$values[0]);";
-			unset($fields[0]);
-			foreach ($fields as $k => $col) {
-				$script .= "
-
-					// Create next criterion
-					\$nextcton = \$criteria->getNewCriterion(" . $col . ", \$values[$k]);
-					// And merge it with the first
-					\$cton->addAnd(\$nextcton);";
-			}
-			$script .= "
-
-					// Add final Criterion to Criteria
-					\$criteria->addOr(\$cton);
-				}";
-			}
-
-			$script .= "
-				\$stmt = $peerClassname::doSelectStmt(\$criteria, \$con);
-				while (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
-					\$key = $peerClassname::getPrimaryKeyHashFromRow(\$row, 0);
-					if (null !== (\$object = $peerClassname::getInstanceFromPool(\$key))) {";
-			$n = 0;
-			foreach ($table->getColumns() as $col) {
-				if ($col->isNestedSetLeftKey()) {
-					$script .= "
-						\$object->setLeftValue(\$row[$n]);";
-				} else if ($col->isNestedSetRightKey()) {
-					$script .= "
-						\$object->setRightValue(\$row[$n]);";
-				}
-				$n++;
-			}
-			$script .= "
-					}
-				}
-				\$stmt->closeCursor();
-			}
-		}
-	}
-";
-	}
-
-	protected function addUpdateDBNode(&$script)
-	{
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Move \$node and its children to location \$destLeft and updates rest of tree
-	 *
-	 * @param      $objectClassname \$node Propel object for node to update
-	 * @param      int	\$destLeft Destination left value
-	 * @param      PropelPDO \$con		Connection to use.
-	 */
-	protected static function updateDBNode(NodeObject \$node, \$destLeft, PropelPDO \$con = null)
-	{
-		\$left = \$node->getLeftValue();
-		\$right = \$node->getRightValue();
-
-		\$treeSize = \$right - \$left +1;
-
-		self::shiftRLValues(\$destLeft, \$treeSize, \$con, \$node->getScopeIdValue());
-
-		if (\$left >= \$destLeft) { // src was shifted too?
-			\$left += \$treeSize;
-			\$right += \$treeSize;
-		}
-
-		// now there's enough room next to target to move the subtree
-		self::shiftRLRange(\$left, \$right, \$destLeft - \$left, \$con, \$node->getScopeIdValue());
-
-		// correct values after source
-		self::shiftRLValues(\$right + 1, -\$treeSize, \$con, \$node->getScopeIdValue());
-	}
-";
-	}
-
-	protected function addShiftRLValues(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Adds '\$delta' to all L and R values that are >= '\$first'. '\$delta' can also be negative.
-	 *
-	 * @param      int \$first		First node to be shifted
-	 * @param      int \$delta		Value to be shifted by, can be negative
-	 * @param      PropelPDO \$con		Connection to use.
-	 */
-	protected static function shiftRLValues(\$first, \$delta, PropelPDO \$con = null, \$scopeId = null)
-	{
-		if (\$con === null) {
-			\$con = Propel::getConnection($peerClassname::DATABASE_NAME, Propel::CONNECTION_WRITE);
-		}
-
-		\$leftUpdateCol = self::LEFT_COL;
-		\$rightUpdateCol = self::RIGHT_COL;
-
-		// Shift left column values
-		\$whereCriteria = new Criteria($peerClassname::DATABASE_NAME);
-		\$criterion = \$whereCriteria->getNewCriterion(
-			self::LEFT_COL,
-			\$first,
-			Criteria::GREATER_EQUAL);
-
-		if (self::SCOPE_COL) {
-			\$criterion->addAnd(
-				\$whereCriteria->getNewCriterion(
-					self::SCOPE_COL,
-					\$scopeId,
-					Criteria::EQUAL));
-		}
-		\$whereCriteria->add(\$criterion);
-
-		\$valuesCriteria = new Criteria($peerClassname::DATABASE_NAME);
-		\$valuesCriteria->add(
-			self::LEFT_COL,
-			array('raw' => \$leftUpdateCol . ' + ?', 'value' => \$delta),
-			Criteria::CUSTOM_EQUAL);
-
-		{$this->basePeerClassname}::doUpdate(\$whereCriteria, \$valuesCriteria, \$con);
-
-		// Shift right column values
-		\$whereCriteria = new Criteria($peerClassname::DATABASE_NAME);
-		\$criterion = \$whereCriteria->getNewCriterion(
-			self::RIGHT_COL,
-			\$first,
-			Criteria::GREATER_EQUAL);
-
-		if (self::SCOPE_COL) {
-			\$criterion->addAnd(
-				\$whereCriteria->getNewCriterion(
-					self::SCOPE_COL,
-					\$scopeId,
-					Criteria::EQUAL));
-		}
-		\$whereCriteria->add(\$criterion);
-
-		\$valuesCriteria = new Criteria($peerClassname::DATABASE_NAME);
-		\$valuesCriteria->add(
-		  self::RIGHT_COL,
-			array('raw' => \$rightUpdateCol . ' + ?', 'value' => \$delta),
-			Criteria::CUSTOM_EQUAL);
-
-		{$this->basePeerClassname}::doUpdate(\$whereCriteria, \$valuesCriteria, \$con);
-	}
-";
-	}
-
-	protected function addShiftRLRange(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Adds '\$delta' to all L and R values that are >= '\$first' and <= '\$last'.
-	 * '\$delta' can also be negative.
-	 *
-	 * @param      int \$first	First node to be shifted (L value)
-	 * @param      int \$last	Last node to be shifted (L value)
-	 * @param      int \$delta	Value to be shifted by, can be negative
-	 * @param      PropelPDO \$con		Connection to use.
-	 * @return     array 		Shifted L and R values
-	 */
-	protected static function shiftRLRange(\$first, \$last, \$delta, PropelPDO \$con = null, \$scopeId = null)
-	{
-		if (\$con === null) {
-			\$con = Propel::getConnection($peerClassname::DATABASE_NAME, Propel::CONNECTION_WRITE);
-		}
-
-		\$leftUpdateCol = substr(self::LEFT_COL, strrpos(self::LEFT_COL, '.') + 1);
-		\$rightUpdateCol = substr(self::RIGHT_COL, strrpos(self::RIGHT_COL, '.') + 1);
-
-		// Shift left column values
-		\$whereCriteria = new Criteria($peerClassname::DATABASE_NAME);
-		\$criterion = \$whereCriteria->getNewCriterion(self::LEFT_COL, \$first, Criteria::GREATER_EQUAL);
-		\$criterion->addAnd(\$whereCriteria->getNewCriterion(self::LEFT_COL, \$last, Criteria::LESS_EQUAL));
-		if (self::SCOPE_COL) {
-			\$criterion->addAnd(\$whereCriteria->getNewCriterion(self::SCOPE_COL, \$scopeId, Criteria::EQUAL));
-		}
-		\$whereCriteria->add(\$criterion);
-
-		\$valuesCriteria = new Criteria($peerClassname::DATABASE_NAME);
-		\$valuesCriteria->add(
-			self::LEFT_COL,
-			array('raw' => \$leftUpdateCol . ' + ?', 'value' => \$delta),
-			Criteria::CUSTOM_EQUAL);
-
-		{$this->basePeerClassname}::doUpdate(\$whereCriteria, \$valuesCriteria, \$con);
-
-		// Shift right column values
-		\$whereCriteria = new Criteria($peerClassname::DATABASE_NAME);
-		\$criterion = \$whereCriteria->getNewCriterion(self::RIGHT_COL, \$first, Criteria::GREATER_EQUAL);
-		\$criterion->addAnd(\$whereCriteria->getNewCriterion(self::RIGHT_COL, \$last, Criteria::LESS_EQUAL));
-		if (self::SCOPE_COL) {
-			\$criterion->addAnd(\$whereCriteria->getNewCriterion(self::SCOPE_COL, \$scopeId, Criteria::EQUAL));
-		}
-		\$whereCriteria->add(\$criterion);
-
-		\$valuesCriteria = new Criteria($peerClassname::DATABASE_NAME);
-		\$valuesCriteria->add(
-			self::RIGHT_COL,
-			array('raw' => \$rightUpdateCol . ' + ?', 'value' => \$delta),
-			Criteria::CUSTOM_EQUAL);
-
-		{$this->basePeerClassname}::doUpdate(\$whereCriteria, \$valuesCriteria, \$con);
-
-		return array('left' => \$first + \$delta, 'right' => \$last + \$delta);
-	}
-";
-	}
-
-} // PHP5NestedSetPeerBuilder
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5NodeBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5NodeBuilder.php
deleted file mode 100644
index dc832505e..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5NodeBuilder.php
+++ /dev/null
@@ -1,1115 +0,0 @@
-<?php
-
-/*
- *  $Id: PHP5NodeBuilder.php 1264 2009-10-26 21:58:09Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/ObjectBuilder.php';
-
-/**
- * Generates a PHP5 tree node Object class for user object model (OM).
- *
- * This class produces the base tree node object class (e.g. BaseMyTable) which contains all
- * the custom-built accessor and setter methods.
- *
- * This class replaces the Node.tpl, with the intent of being easier for users
- * to customize (through extending & overriding).
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder.om.php5
- */
-class PHP5NodeBuilder extends ObjectBuilder {
-
-	/**
-	 * Gets the package for the [base] object classes.
-	 * @return     string
-	 */
-	public function getPackage()
-	{
-		return parent::getPackage() . ".om";
-	}
-
-	/**
-	 * Returns the name of the current class being built.
-	 * @return     string
-	 */
-	public function getUnprefixedClassname()
-	{
-		return $this->getBuildProperty('basePrefix') . $this->getStubNodeBuilder()->getUnprefixedClassname();
-	}
-
-	/**
-	 * Adds the include() statements for files that this class depends on or utilizes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addIncludes(&$script)
-	{
-	} // addIncludes()
-
-	/**
-	 * Adds class phpdoc comment and openning of class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassOpen(&$script)
-	{
-
-		$table = $this->getTable();
-		$tableName = $table->getName();
-		$tableDesc = $table->getDescription();
-
-		$script .= "
-/**
- * Base class that represents a row from the '$tableName' table.
- *
- * $tableDesc
- *";
-		if ($this->getBuildProperty('addTimeStamp')) {
-			$now = strftime('%c');
-			$script .= "
- * This class was autogenerated by Propel " . $this->getBuildProperty('version') . " on:
- *
- * $now
- *";
-		}
-		$script .= "
- * @package    ".$this->getPackage()."
- */
-abstract class ".$this->getClassname()." implements IteratorAggregate {
-";
-	}
-
-	/**
-	 * Specifies the methods that are added as part of the basic OM class.
-	 * This can be overridden by subclasses that wish to add more methods.
-	 * @see        ObjectBuilder::addClassBody()
-	 */
-	protected function addClassBody(&$script)
-	{
-		$table = $this->getTable();
-
-		$this->addAttributes($script);
-
-		$this->addConstructor($script);
-
-		$this->addCallOverload($script);
-		$this->addSetIteratorOptions($script);
-		$this->addGetIterator($script);
-
-		$this->addGetNodeObj($script);
-		$this->addGetNodePath($script);
-		$this->addGetNodeIndex($script);
-		$this->addGetNodeLevel($script);
-
-		$this->addHasChildNode($script);
-		$this->addGetChildNodeAt($script);
-		$this->addGetFirstChildNode($script);
-		$this->addGetLastChildNode($script);
-		$this->addGetSiblingNode($script);
-
-		$this->addGetParentNode($script);
-		$this->addGetAncestors($script);
-		$this->addIsRootNode($script);
-
-		$this->addSetNew($script);
-		$this->addSetDeleted($script);
-		$this->addAddChildNode($script);
-		$this->addMoveChildNode($script);
-		$this->addSave($script);
-
-		$this->addDelete($script);
-		$this->addEquals($script);
-
-		$this->addAttachParentNode($script);
-		$this->addAttachChildNode($script);
-		$this->addDetachParentNode($script);
-		$this->addDetachChildNode($script);
-		$this->addShiftChildNodes($script);
-		$this->addInsertNewChildNode($script);
-
-		$this->addAdjustStatus($script);
-		$this->addAdjustNodePath($script);
-
-	}
-
-	/**
-	 * Closes class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassClose(&$script)
-	{
-		$script .= "
-} // " . $this->getClassname() . "
-";
-	}
-
-
-	/**
-	 * Adds class attributes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addAttributes(&$script)
-	{
-		$script .= "
-	/**
-	 * @var        ".$this->getStubObjectBuilder()->getClassname()." object wrapped by this node.
-	 */
-	protected \$obj = null;
-
-	/**
-	 * The parent node for this node.
-	 * @var        ".$this->getStubNodeBuilder()->getClassname()."
-	 */
-	protected \$parentNode = null;
-
-	/**
-	 * Array of child nodes for this node. Nodes indexes are one-based.
-	 * @var        array
-	 */
-	protected \$childNodes = array();
-";
-	}
-
-	/**
-	 * Adds the constructor.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addConstructor(&$script)
-	{
-		$script .= "
-	/**
-	 * Constructor.
-	 *
-	 * @param      ".$this->getStubObjectBuilder()->getClassname()." \$obj Object wrapped by this node.
-	 */
-	public function __construct(\$obj = null)
-	{
-		if (\$obj !== null) {
-			\$this->obj = \$obj;
-		} else {
-			\$setNodePath = 'set' . ".$this->getStubNodePeerBuilder()->getClassname()."::NPATH_PHPNAME;
-			\$this->obj = new ".$this->getStubObjectBuilder()->getClassname()."();
-			\$this->obj->\$setNodePath('0');
-		}
-	}
-";
-	}
-
-
-
-	protected function addCallOverload(&$script)
-	{
-		$script .= "
-	/**
-	 * Convenience overload for wrapped object methods.
-	 *
-	 * @param      string Method name to call on wrapped object.
-	 * @param      mixed Parameter accepted by wrapped object set method.
-	 * @return     mixed Return value of wrapped object method.
-	 * @throws     PropelException Fails if method is not defined for wrapped object.
-	 */
-	public function __call(\$name, \$parms)
-	{
-		if (method_exists(\$this->obj, \$name))
-			return call_user_func_array(array(\$this->obj, \$name), \$parms);
-		else
-			throw new PropelException('get method not defined: \$name');
-	}
-";
-	}
-
-	protected function addSetIteratorOptions(&$script)
-	{
-		$script .= "
-
-	/**
-	 * Sets the default options for iterators created from this object.
-	 * The options are specified in map format. The following options
-	 * are supported by all iterators. Some iterators may support other
-	 * options:
-	 *
-	 *   \"querydb\" - True if nodes should be retrieved from database.
-	 *   \"con\" - Connection to use if retrieving from database.
-	 *
-	 * @param      string Type of iterator to use (\"pre\", \"post\", \"level\").
-	 * @param      array Map of option name => value.
-	 * @return     void
-	 * @todo       Implement other iterator types (i.e. post-order, level, etc.)
-	 */
-	public function setIteratorOptions(\$type, \$opts)
-	{
-		\$this->itType = \$type;
-		\$this->itOpts = \$opts;
-	}
-";
-	}
-
-	protected function addGetIterator(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns a pre-order iterator for this node and its children.
-	 *
-	 * @param      string Type of iterator to use (\"pre\", \"post\", \"level\")
-	 * @param      array Map of option name => value.
-	 * @return     NodeIterator
-	 */
-	public function getIterator(\$type = null, \$opts = null)
-	{
-		if (\$type === null)
-			\$type = (isset(\$this->itType) ? \$this->itType : 'Pre');
-
-		if (\$opts === null)
-			\$opts = (isset(\$this->itOpts) ? \$this->itOpts : array());
-
-		\$itclass = ucfirst(strtolower(\$type)) . 'OrderNodeIterator';
-
-    require_once('propel/om/' . \$itclass . '.php'); 
-		return new \$itclass(\$this, \$opts); 
-	}
-";
-	}
-
-	protected function addGetNodeObj(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns the object wrapped by this class.
-	 * @return     ".$this->getStubObjectBuilder()->getClassname()."
-	 */
-	public function getNodeObj()
-	{
-		return \$this->obj;
-	}
-";
-	}
-
-	protected function addGetNodePath(&$script)
-	{
-		$script .= "
-	/**
-	 * Convenience method for retrieving nodepath.
-	 * @return     string
-	 */
-	public function getNodePath()
-	{
-		\$getNodePath = 'get' . ".$this->getStubNodePeerBuilder()->getClassname()."::NPATH_PHPNAME;
-		return \$this->obj->\$getNodePath();
-	}
-";
-	}
-
-	protected function addGetNodeIndex(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns one-based node index among siblings.
-	 * @return     int
-	 */
-	public function getNodeIndex()
-	{
-		\$npath =& \$this->getNodePath();
-		\$sep = strrpos(\$npath, ".$this->getStubNodePeerBuilder()->getClassname()."::NPATH_SEP);
-		return (int) (\$sep !== false ? substr(\$npath, \$sep+1) : \$npath);
-	}
-";
-	}
-
-	protected function addGetNodeLevel(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns one-based node level within tree (root node is level 1).
-	 * @return     int
-	 */
-	public function getNodeLevel()
-	{
-		return (substr_count(\$this->getNodePath(), ".$this->getStubNodePeerBuilder()->getClassname()."::NPATH_SEP) + 1);
-	}
-";
-	}
-
-	protected function addHasChildNode(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns true if specified node is a child of this node. If recurse is
-	 * true, checks if specified node is a descendant of this node.
-	 *
-	 * @param      ".$this->getStubNodeBuilder()->getClassname()." Node to look for.
-	 * @param      boolean True if strict comparison should be used.
-	 * @param      boolean True if all descendants should be checked.
-	 * @return     boolean
-	 */
-	public function hasChildNode(\$node, \$strict = false, \$recurse = false)
-	{
-		foreach (\$this->childNodes as \$childNode)
-		{
-			if (\$childNode->equals(\$node, \$strict))
-				return true;
-
-			if (\$recurse && \$childNode->hasChildNode(\$node, \$recurse))
-				return true;
-		}
-
-		return false;
-	}
-";
-	}
-
-	protected function addGetChildNodeAt(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns child node at one-based index. Retrieves from database if not
-	 * loaded yet.
-	 *
-	 * @param      int One-based child node index.
-	 * @param      boolean True if child should be retrieved from database.
-	 * @param      PropelPDO Connection to use if retrieving from database.
-	 * @return     ".$this->getStubNodeBuilder()->getClassname()."
-	 */
-	public function getChildNodeAt(\$i, \$querydb = false, PropelPDO \$con = null)
-	{
-		if (\$querydb &&
-			!\$this->obj->isNew() &&
-			!\$this->obj->isDeleted() &&
-			!isset(\$this->childNodes[\$i]))
-		{
-			\$criteria = new Criteria(".$this->getStubPeerBuilder()->getClassname()."::DATABASE_NAME);
-			\$criteria->add(".$this->getStubNodePeerBuilder()->getClassname()."::NPATH_COLNAME, \$this->getNodePath() . ".$this->getStubNodePeerBuilder()->getClassname()."::NPATH_SEP . \$i, Criteria::EQUAL);
-
-			if (\$childObj = ".$this->getStubPeerBuilder()->getClassname()."::doSelectOne(\$criteria, \$con))
-				\$this->attachChildNode(new ".$this->getStubNodeBuilder()->getClassname()."(\$childObj));
-		}
-
-		return (isset(\$this->childNodes[\$i]) ? \$this->childNodes[\$i] : null);
-	}
-";
-	}
-
-	protected function addGetFirstChildNode(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns first child node (if any). Retrieves from database if not loaded yet.
-	 *
-	 * @param      boolean True if child should be retrieved from database.
-	 * @param      PropelPDO Connection to use if retrieving from database.
-	 * @return     ".$this->getStubNodeBuilder()->getClassname()."
-	 */
-	public function getFirstChildNode(\$querydb = false, PropelPDO \$con = null)
-	{
-		return \$this->getChildNodeAt(1, \$querydb, \$con);
-	}
-";
-	}
-
-	protected function addGetLastChildNode(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Returns last child node (if any).
-	 *
-	 * @param      boolean True if child should be retrieved from database.
-	 * @param      PropelPDO Connection to use if retrieving from database.
-	 */
-	public function getLastChildNode(\$querydb = false, PropelPDO \$con = null)
-	{
-		\$lastNode = null;
-
-		if (\$this->obj->isNew() || \$this->obj->isDeleted())
-		{
-			end(\$this->childNodes);
-			\$lastNode = (count(\$this->childNodes) ? current(\$this->childNodes) : null);
-		}
-		else if (\$querydb)
-		{
-			\$db = Propel::getDb($peerClassname::DATABASE_NAME);
-			\$criteria = new Criteria($peerClassname::DATABASE_NAME);
-			\$criteria->add($nodePeerClassname::NPATH_COLNAME, \$this->getNodePath() . $nodePeerClassname::NPATH_SEP . '%', Criteria::LIKE);
-			\$criteria->addAnd($nodePeerClassname::NPATH_COLNAME, \$this->getNodePath() . $nodePeerClassname::NPATH_SEP . '%' . $nodePeerClassname::NPATH_SEP . '%', Criteria::NOT_LIKE);
-			$peerClassname::addSelectColumns(\$criteria);
-			\$criteria->addAsColumn('npathlen', \$db->strLength($nodePeerClassname::NPATH_COLNAME));
-			\$criteria->addDescendingOrderByColumn('npathlen');
-			\$criteria->addDescendingOrderByColumn($nodePeerClassname::NPATH_COLNAME);
-
-			\$lastObj = $peerClassname::doSelectOne(\$criteria, \$con);
-
-			if (\$lastObj !== null)
-			{
-				\$lastNode = new ".$this->getStubNodeBuilder()->getClassname()."(\$lastObj);
-
-				end(\$this->childNodes);
-				\$endNode = (count(\$this->childNodes) ? current(\$this->childNodes) : null);
-
-				if (\$endNode)
-				{
-					if (\$endNode->getNodePath() > \$lastNode->getNodePath())
-						throw new PropelException('Cached child node inconsistent with database.');
-					else if (\$endNode->getNodePath() == \$lastNode->getNodePath())
-						\$lastNode = \$endNode;
-					else
-						\$this->attachChildNode(\$lastNode);
-				}
-				else
-				{
-					\$this->attachChildNode(\$lastNode);
-				}
-			}
-		}
-
-		return \$lastNode;
-	}
-";
-	}
-
-	protected function addGetSiblingNode(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns next (or previous) sibling node or null. Retrieves from database if
-	 * not loaded yet.
-	 *
-	 * @param      boolean True if previous sibling should be returned.
-	 * @param      boolean True if sibling should be retrieved from database.
-	 * @param      PropelPDO Connection to use if retrieving from database.
-	 * @return     ".$this->getStubNodeBuilder()->getClassname()."
-	 */
-	public function getSiblingNode(\$prev = false, \$querydb = false, PropelPDO \$con = null)
-	{
-		\$nidx = \$this->getNodeIndex();
-
-		if (\$this->isRootNode())
-		{
-			return null;
-		}
-		else if (\$prev)
-		{
-			if (\$nidx > 1 && (\$parentNode = \$this->getParentNode(\$querydb, \$con)))
-				return \$parentNode->getChildNodeAt(\$nidx-1, \$querydb, \$con);
-			else
-				return null;
-		}
-		else
-		{
-			if (\$parentNode = \$this->getParentNode(\$querydb, \$con))
-				return \$parentNode->getChildNodeAt(\$nidx+1, \$querydb, \$con);
-			else
-				return null;
-		}
-	}
-";
-	}
-
-	protected function addGetParentNode(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Returns parent node. Loads from database if not cached yet.
-	 *
-	 * @param      boolean True if parent should be retrieved from database.
-	 * @param      PropelPDO Connection to use if retrieving from database.
-	 * @return     ".$this->getStubNodeBuilder()->getClassname()."
-	 */
-	public function getParentNode(\$querydb = true, PropelPDO \$con = null)
-	{
-		if (\$querydb &&
-			\$this->parentNode === null &&
-			!\$this->isRootNode() &&
-			!\$this->obj->isNew() &&
-			!\$this->obj->isDeleted())
-		{
-			\$npath =& \$this->getNodePath();
-			\$sep = strrpos(\$npath, $nodePeerClassname::NPATH_SEP);
-			\$ppath = substr(\$npath, 0, \$sep);
-
-			\$criteria = new Criteria($peerClassname::DATABASE_NAME);
-			\$criteria->add($nodePeerClassname::NPATH_COLNAME, \$ppath, Criteria::EQUAL);
-
-			if (\$parentObj = $peerClassname::doSelectOne(\$criteria, \$con))
-			{
-				\$parentNode = new ".$this->getStubNodeBuilder()->getClassname()."(\$parentObj);
-				\$parentNode->attachChildNode(\$this);
-			}
-		}
-
-		return \$this->parentNode;
-	}
-";
-	}
-
-	protected function addGetAncestors(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns an array of all ancestor nodes, starting with the root node
-	 * first.
-	 *
-	 * @param      boolean True if ancestors should be retrieved from database.
-	 * @param      PropelPDO Connection to use if retrieving from database.
-	 * @return     array
-	 */
-	public function getAncestors(\$querydb = false, PropelPDO \$con = null)
-	{
-		\$ancestors = array();
-		\$parentNode = \$this;
-
-		while (\$parentNode = \$parentNode->getParentNode(\$querydb, \$con))
-			array_unshift(\$ancestors, \$parentNode);
-
-		return \$ancestors;
-	}
-";
-	}
-
-	protected function addIsRootNode(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns true if node is the root node of the tree.
-	 * @return     boolean
-	 */
-	public function isRootNode()
-	{
-		return (\$this->getNodePath() === '1');
-	}
-";
-	}
-
-	protected function addSetNew(&$script)
-	{
-		$script .= "
-	/**
-	 * Changes the state of the object and its descendants to 'new'.
-	 * Also changes the node path to '0' to indicate that it is not a
-	 * stored node.
-	 *
-	 * @param      boolean
-	 * @return     void
-	 */
-	public function setNew(\$b)
-	{
-		\$this->adjustStatus('new', \$b);
-		\$this->adjustNodePath(\$this->getNodePath(), '0');
-	}
-";
-	}
-
-	protected function addSetDeleted(&$script)
-	{
-		$script .= "
-	/**
-	 * Changes the state of the object and its descendants to 'deleted'.
-	 *
-	 * @param      boolean
-	 * @return     void
-	 */
-	public function setDeleted(\$b)
-	{
-		\$this->adjustStatus('deleted', \$b);
-	}
-";
-	}
-
-	protected function addAddChildNode(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Adds the specified node (and its children) as a child to this node. If a
-	 * valid \$beforeNode is specified, the node will be inserted in front of
-	 * \$beforeNode. If \$beforeNode is not specified the node will be appended to
-	 * the end of the child nodes.
-	 *
-	 * @param      ".$this->getStubNodeBuilder()->getClassname()." Node to add.
-	 * @param      ".$this->getStubNodeBuilder()->getClassname()." Node to insert before.
-	 * @param      PropelPDO Connection to use.
-	 */
-	public function addChildNode(\$node, \$beforeNode = null, PropelPDO \$con = null)
-	{
-		if (\$this->obj->isNew() && !\$node->obj->isNew())
-			throw new PropelException('Cannot add stored nodes to a new node.');
-
-		if (\$this->obj->isDeleted() || \$node->obj->isDeleted())
-			throw new PropelException('Cannot add children in a deleted state.');
-
-		if (\$this->hasChildNode(\$node))
-			throw new PropelException('Node is already a child of this node.');
-
-		if (\$beforeNode && !\$this->hasChildNode(\$beforeNode))
-			throw new PropelException('Invalid beforeNode.');
-
-		if (\$con === null)
-			\$con = Propel::getConnection($peerClassname::DATABASE_NAME, Propel::CONNECTION_WRITE);
-		
-		if (!\$this->obj->isNew()) \$con->beginTransaction();
-		
-		try {	
-			if (\$beforeNode)
-			{
-				// Inserting before a node.
-				\$childIdx = \$beforeNode->getNodeIndex();
-				\$this->shiftChildNodes(1, \$beforeNode->getNodeIndex(), \$con);
-			}
-			else
-			{
-				// Appending child node.
-				if (\$lastNode = \$this->getLastChildNode(true, \$con))
-					\$childIdx = \$lastNode->getNodeIndex()+1;
-				else
-					\$childIdx = 1;
-			}
-
-			// Add the child (and its children) at the specified index.
-
-			if (!\$this->obj->isNew() && \$node->obj->isNew())
-			{
-				\$this->insertNewChildNode(\$node, \$childIdx, \$con);
-			}
-			else
-			{
-				// \$this->isNew() && \$node->isNew() ||
-				// !\$this->isNew() && !node->isNew()
-
-				\$srcPath = \$node->getNodePath();
-				\$dstPath = \$this->getNodePath() . $nodePeerClassname::NPATH_SEP . \$childIdx;
-
-				if (!\$node->obj->isNew())
-				{
-					$nodePeerClassname::moveNodeSubTree(\$srcPath, \$dstPath, \$con);
-					\$parentNode = \$node->getParentNode(true, \$con);
-				}
-				else
-				{
-					\$parentNode = \$node->getParentNode();
-				}
-
-				if (\$parentNode)
-				{
-					\$parentNode->detachChildNode(\$node);
-					\$parentNode->shiftChildNodes(-1, \$node->getNodeIndex()+1, \$con);
-				}
-
-				\$node->adjustNodePath(\$srcPath, \$dstPath);
-			}
-
-			if (!\$this->obj->isNew()) \$con->commit();
-
-			\$this->attachChildNode(\$node);
-
-		} catch (SQLException \$e) {
-			if (!\$this->obj->isNew()) \$con->rollBack();
-			throw new PropelException(\$e);
-		}
-	}
-";
-	}
-
-	protected function addMoveChildNode(&$script)
-	{
-		$script .= "
-	/**
-	 * Moves the specified child node in the specified direction.
-	 *
-	 * @param      ".$this->getStubNodeBuilder()->getClassname()." Node to move.
-	 * @param      int Number of spaces to move among siblings (may be negative).
-	 * @param      PropelPDO Connection to use.
-	 * @throws     PropelException
-	 */
-	public function moveChildNode(\$node, \$direction, PropelPDO \$con = null)
-	{
-		throw new PropelException('moveChildNode() not implemented yet.');
-	}
-";
-	}
-
-
-	protected function addSave(&$script)
-	{
-
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Saves modified object data to the datastore.
-	 *
-	 * @param      boolean If true, descendants will be saved as well.
-	 * @param      PropelPDO Connection to use.
-	 */
-	public function save(\$recurse = false, PropelPDO \$con = null)
-	{
-		if (\$this->obj->isDeleted())
-			throw new PropelException('Cannot save deleted node.');
-
-		if (substr(\$this->getNodePath(), 0, 1) == '0')
-			throw new PropelException('Cannot save unattached node.');
-
-		if (\$this->obj->isColumnModified($nodePeerClassname::NPATH_COLNAME))
-			throw new PropelException('Cannot save manually modified node path.');
-
-		\$this->obj->save(\$con);
-
-		if (\$recurse)
-		{
-			foreach (\$this->childNodes as \$childNode)
-				\$childNode->save(\$recurse, \$con);
-		}
-	}
-";
-	}
-
-
-	protected function addDelete(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Removes this object and all descendants from datastore.
-	 *
-	 * @param      PropelPDO Connection to use.
-	 * @return     void
-	 * @throws     PropelException
-	 */
-	public function delete(PropelPDO \$con = null)
-	{
-		if (\$this->obj->isDeleted()) {
-			throw new PropelException('This node has already been deleted.');
-		}
-
-		if (\$con === null) {
-			\$con = Propel::getConnection($peerClassname::DATABASE_NAME, Propel::CONNECTION_WRITE);
-		}
-			
-		if (!\$this->obj->isNew()) {
-			$nodePeerClassname::deleteNodeSubTree(\$this->getNodePath(), \$con);
-		}
-
-		if (\$parentNode = \$this->getParentNode(true, \$con)) {
-			\$parentNode->detachChildNode(\$this);
-			\$parentNode->shiftChildNodes(-1, \$this->getNodeIndex()+1, \$con);
-		}
-
-		\$this->setDeleted(true);
-	}
-";
-	}
-
-	protected function addEquals(&$script)
-	{
-		$nodeClassname = $this->getStubNodeBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Compares the object wrapped by this node with that of another node. Use
-	 * this instead of equality operators to prevent recursive dependency
-	 * errors.
-	 *
-	 * @param      $nodeClassname Node to compare.
-	 * @param      boolean True if strict comparison should be used.
-	 * @return     boolean
-	 */
-	public function equals(\$node, \$strict = false)
-	{
-		if (\$strict) {
-			return (\$this->obj === \$node->obj);
-		} else {
-			return (\$this->obj == \$node->obj);
-		}
-	}
-";
-	}
-
-	protected function addAttachParentNode(&$script)
-	{
-		$nodeClassname = $this->getStubNodeBuilder()->getClassname();
-		$script .= "
-	/**
-	 * This method is used internally when constructing the tree structure
-	 * from the database. To set the parent of a node, you should call
-	 * addChildNode() on the parent.
-	 *
-	 * @param      $nodeClassname Parent node to attach.
-	 * @return     void
-	 * @throws     PropelException
-	 */
-	public function attachParentNode(\$node)
-	{
-		if (!\$node->hasChildNode(\$this, true))
-			throw new PropelException('Failed to attach parent node for non-child.');
-
-		\$this->parentNode = \$node;
-	}
-";
-	}
-
-
-	protected function addAttachChildNode(&$script)
-	{
-		$nodeClassname = $this->getStubNodeBuilder()->getClassname();
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * This method is used internally when constructing the tree structure
-	 * from the database. To add a child to a node you should call the
-	 * addChildNode() method instead.
-	 *
-	 * @param      $nodeClassname Child node to attach.
-	 * @return     void
-	 * @throws     PropelException
-	 */
-	public function attachChildNode(\$node)
-	{
-		if (\$this->hasChildNode(\$node))
-			throw new PropelException('Failed to attach child node. Node already exists.');
-
-		if (\$this->obj->isDeleted() || \$node->obj->isDeleted())
-			throw new PropelException('Failed to attach node in deleted state.');
-
-		if (\$this->obj->isNew() && !\$node->obj->isNew())
-			throw new PropelException('Failed to attach non-new child to new node.');
-
-		if (!\$this->obj->isNew() && \$node->obj->isNew())
-			throw new PropelException('Failed to attach new child to non-new node.');
-
-		if (\$this->getNodePath() . $nodePeerClassname::NPATH_SEP . \$node->getNodeIndex() != \$node->getNodePath())
-			throw new PropelException('Failed to attach child node. Node path mismatch.');
-
-		\$this->childNodes[\$node->getNodeIndex()] = \$node;
-		ksort(\$this->childNodes);
-
-		\$node->attachParentNode(\$this);
-	}
-";
-	}
-
-	protected function addDetachParentNode(&$script)
-	{
-		$nodeClassname = $this->getStubNodeBuilder()->getClassname();
-		$script .= "
-	/**
-	 * This method is used internally when deleting nodes. It is used to break
-	 * the link to this node's parent.
-	 * @param      $nodeClassname Parent node to detach from.
-	 * @return     void
-	 * @throws     PropelException
-	 */
-	public function detachParentNode(\$node)
-	{
-		if (!\$node->hasChildNode(\$this, true))
-			throw new PropelException('Failed to detach parent node from non-child.');
-
-		unset(\$node->childNodes[\$this->getNodeIndex()]);
-		\$this->parentNode = null;
-	}
-";
-	}
-
-	protected function addDetachChildNode(&$script)
-	{
-		$script .= "
-	/**
-	 * This method is used internally when deleting nodes. It is used to break
-	 * the link to this between this node and the specified child.
-	 * @param      ".$this->getStubNodeBuilder()->getClassname()." Child node to detach.
-	 * @return     void
-	 * @throws     PropelException
-	 */
-	public function detachChildNode(\$node)
-	{
-		if (!\$this->hasChildNode(\$node, true))
-			throw new PropelException('Failed to detach non-existent child node.');
-
-		unset(\$this->childNodes[\$node->getNodeIndex()]);
-		\$node->parentNode = null;
-	}
-";
-	}
-
-	protected function addShiftChildNodes(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Shifts child nodes in the specified direction and offset index. This
-	 * method assumes that there is already space available in the
-	 * direction/offset indicated.
-	 *
-	 * @param      int Direction/# spaces to shift. 1=leftshift, 1=rightshift
-	 * @param      int Node index to start shift at.
-	 * @param      PropelPDO The connection to be used.
-	 * @return     void
-	 * @throws     PropelException
-	 */
-	protected function shiftChildNodes(\$direction, \$offsetIdx, PropelPDO \$con)
-	{
-		if (\$this->obj->isDeleted())
-			throw new PropelException('Cannot shift nodes for deleted object');
-
-		\$lastNode = \$this->getLastChildNode(true, \$con);
-		\$lastIdx = (\$lastNode !== null ? \$lastNode->getNodeIndex() : 0);
-
-		if (\$lastNode === null || \$offsetIdx > \$lastIdx)
-			return;
-
-		if (\$con === null)
-			\$con = Propel::getConnection($peerClassname::DATABASE_NAME);
-
-		if (!\$this->obj->isNew())
-		{
-			// Shift nodes in database.
-			
-			\$con->beginTransaction();
-			
-			try {
-				\$n = \$lastIdx - \$offsetIdx + 1;
-				\$i = \$direction < 1 ? \$offsetIdx : \$lastIdx;
-
-				while (\$n--)
-				{
-					\$srcPath = \$this->getNodePath() . $nodePeerClassname::NPATH_SEP . \$i;			  // 1.2.2
-					\$dstPath = \$this->getNodePath() . $nodePeerClassname::NPATH_SEP . (\$i+\$direction); // 1.2.3
-
-					$nodePeerClassname::moveNodeSubTree(\$srcPath, \$dstPath, \$con);
-
-					\$i -= \$direction;
-				}
-
-				\$con->commit();
-
-			} catch (SQLException \$e) {
-				\$con->rollBack();
-				throw new PropelException(\$e);
-			}
-		}
-
-		// Shift the in-memory objects.
-
-		\$n = \$lastIdx - \$offsetIdx + 1;
-		\$i = \$direction < 1 ? \$offsetIdx : \$lastIdx;
-
-		while (\$n--)
-		{
-			if (isset(\$this->childNodes[\$i]))
-			{
-				\$srcPath = \$this->getNodePath() . $nodePeerClassname::NPATH_SEP . \$i;			  // 1.2.2
-				\$dstPath = \$this->getNodePath() . $nodePeerClassname::NPATH_SEP . (\$i+\$direction); // 1.2.3
-
-				\$this->childNodes[\$i+\$direction] = \$this->childNodes[\$i];
-				\$this->childNodes[\$i+\$direction]->adjustNodePath(\$srcPath, \$dstPath);
-
-				unset(\$this->childNodes[\$i]);
-			}
-
-			\$i -= \$direction;
-		}
-
-		ksort(\$this->childNodes);
-	}
-";
-	}
-
-	protected function addInsertNewChildNode(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$nodeClassname = $this->getStubNodePeerBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Inserts the node and its children at the specified childIdx.
-	 *
-	 * @param      $nodeClassname Node to insert.
-	 * @param      int One-based child index to insert at.
-	 * @param      PropelPDO Connection to use.
-	 * @param      void
-	 */
-	protected function insertNewChildNode(\$node, \$childIdx, PropelPDO \$con)
-	{
-		if (!\$node->obj->isNew())
-			throw new PropelException('Failed to insert non-new node.');
-
-		\$setNodePath = 'set' . $nodePeerClassname::NPATH_PHPNAME;
-
-		\$node->obj->\$setNodePath(\$this->getNodePath() . $nodePeerClassname::NPATH_SEP . \$childIdx);
-		\$node->obj->save(\$con);
-
-		\$i = 1;
-		foreach (\$node->childNodes as \$childNode)
-			\$node->insertNewChildNode(\$childNode, \$i++, \$con);
-	}
-";
-	}
-
-	protected function addAdjustStatus(&$script)
-	{
-		$script .= "
-	/**
-	 * Adjust new/deleted status of node and all children.
-	 *
-	 * @param      string Status to change ('New' or 'Deleted')
-	 * @param      boolean Value for status.
-	 * @return     void
-	 */
-	protected function adjustStatus(\$status, \$b)
-	{
-		\$setStatus = 'set' . \$status;
-
-		\$this->obj->\$setStatus(\$b);
-
-		foreach (\$this->childNodes as \$childNode)
-			\$childNode->obj->\$setStatus(\$b);
-	}
-";
-	}
-
-	protected function addAdjustNodePath(&$script)
-	{
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$script .= "
-	/**
-	 * Adjust path of node and all children. This is used internally when
-	 * inserting/moving nodes.
-	 *
-	 * @param      string Section of old path to change.
-	 * @param      string New section to replace old path with.
-	 * @return     void
-	 */
-	protected function adjustNodePath(\$oldBasePath, \$newBasePath)
-	{
-		\$setNodePath = 'set' . $nodePeerClassname::NPATH_PHPNAME;
-
-		\$this->obj->\$setNodePath(\$newBasePath .  substr(\$this->getNodePath(), strlen(\$oldBasePath)));
-		\$this->obj->resetModified($nodePeerClassname::NPATH_COLNAME);
-
-		foreach (\$this->childNodes as \$childNode)
-			\$childNode->adjustNodePath(\$oldBasePath, \$newBasePath);
-	}
-";
-	}
-
-} // PHP5NodeObjectBuilder
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5NodePeerBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5NodePeerBuilder.php
deleted file mode 100644
index 58a3f6de2..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5NodePeerBuilder.php
+++ /dev/null
@@ -1,765 +0,0 @@
-<?php
-
-/*
- *  $Id: PHP5NodePeerBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/PeerBuilder.php';
-
-/**
- * Generates a PHP5 tree node Peer class for user object model (OM).
- *
- * This class produces the base tree node object class (e.g. BaseMyTable) which contains all
- * the custom-built accessor and setter methods.
- *
- * This class replaces the Node.tpl, with the intent of being easier for users
- * to customize (through extending & overriding).
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder.om.php5
- */
-class PHP5NodePeerBuilder extends PeerBuilder {
-
-	/**
-	 * Gets the package for the [base] object classes.
-	 * @return     string
-	 */
-	public function getPackage()
-	{
-		return parent::getPackage() . ".om";
-	}
-
-	/**
-	 * Returns the name of the current class being built.
-	 * @return     string
-	 */
-	public function getUnprefixedClassname()
-	{
-		return $this->getBuildProperty('basePrefix') . $this->getStubNodePeerBuilder()->getUnprefixedClassname();
-	}
-
-	/**
-	 * Adds the include() statements for files that this class depends on or utilizes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addIncludes(&$script)
-	{
-	} // addIncludes()
-
-	/**
-	 * Adds class phpdoc comment and openning of class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassOpen(&$script)
-	{
-
-		$table = $this->getTable();
-		$tableName = $table->getName();
-		$tableDesc = $table->getDescription();
-
-		$script .= "
-/**
- * Base  static class for performing query operations on the tree contained by the '$tableName' table.
- *
- * $tableDesc
- *";
-		if ($this->getBuildProperty('addTimeStamp')) {
-			$now = strftime('%c');
-			$script .= "
- * This class was autogenerated by Propel " . $this->getBuildProperty('version') . " on:
- *
- * $now
- *";
-		}
-		$script .= "
- * @package    ".$this->getPackage()."
- */
-abstract class ".$this->getClassname()." {
-";
-	}
-
-	/**
-	 * Specifies the methods that are added as part of the basic OM class.
-	 * This can be overridden by subclasses that wish to add more methods.
-	 * @see        ObjectBuilder::addClassBody()
-	 */
-	protected function addClassBody(&$script)
-	{
-		$table = $this->getTable();
-
-		// FIXME
-		// - Probably the build needs to be customized for supporting
-		// tables that are "aliases".  -- definitely a fringe usecase, though.
-
-		$this->addConstants($script);
-
-		$this->addIsCodeBase($script);
-
-		$this->addRetrieveMethods($script);
-
-		$this->addCreateNewRootNode($script);
-		$this->addInsertNewRootNode($script);
-		$this->addMoveNodeSubTree($script);
-		$this->addDeleteNodeSubTree($script);
-
-		$this->addBuildFamilyCriteria($script);
-		$this->addBuildTree($script);
-
-		$this->addPopulateNodes($script);
-
-	}
-
-	/**
-	 * Closes class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassClose(&$script)
-	{
-		$script .= "
-} // " . $this->getClassname() . "
-";
-	}
-
-	protected function addConstants(&$script)
-	{
-		$table = $this->getTable();
-
-		$npath_colname = '';
-		$npath_phpname = '';
-		$npath_len = 0;
-		$npath_sep = '';
-		foreach ($table->getColumns() as $col) {
-			if ($col->isNodeKey()) {
-				$npath_colname = $table->getName() . '.' . strtoupper($col->getName());
-				$npath_phpname = $col->getPhpName();
-				$npath_len = $col->getSize();
-				$npath_sep = $col->getNodeKeySep();
-				break;
-			}
-		}
-		$script .= "
-	const NPATH_COLNAME = '$npath_colname';
-	const NPATH_PHPNAME = '$npath_phpname';
-	const NPATH_SEP		= '$npath_sep';
-	const NPATH_LEN		= $npath_len;
-";
-	}
-
-
-	protected function addIsCodeBase(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Temp function for CodeBase hacks that will go away.
-	 */
-	public static function isCodeBase(\$con = null)
-	{
-		if (\$con === null)
-			\$con = Propel::getConnection($peerClassname::DATABASE_NAME);
-
-		return (get_class(\$con) == 'ODBCConnection' &&
-				get_class(\$con->getAdapter()) == 'CodeBaseAdapter');
-	}
-";
-	}
-
-
-	protected function addCreateNewRootNode(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$nodeObjectClassname = $this->getStubNodeBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Create a new Node at the top of tree. This method will destroy any
-	 * existing root node (along with its children).
-	 *
-	 * Use at your own risk!
-	 *
-	 * @param      $objectClassname Object wrapped by new node.
-	 * @param      PropelPDO Connection to use.
-	 * @return     $nodeObjectClassname
-	 * @throws     PropelException
-	 */
-	public static function createNewRootNode(\$obj, PropelPDO \$con = null)
-	{
-		if (\$con === null)
-			\$con = Propel::getConnection($peerClassname::DATABASE_NAME, Propel::CONNECTION_WRITE);
-		
-		\$con->beginTransaction();
-		
-		try {
-			self::deleteNodeSubTree('1', \$con);
-
-			\$setNodePath = 'set' . self::NPATH_PHPNAME;
-
-			\$obj->\$setNodePath('1');
-			\$obj->save(\$con);
-
-			\$con->commit();
-		} catch (PropelException \$e) {
-			\$con->rollBack();
-			throw \$e;
-		}
-
-		return new $nodeObjectClassname(\$obj);
-	}
-";
-	}
-
-	protected function addInsertNewRootNode(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$nodeObjectClassname = $this->getStubNodeBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Inserts a new Node at the top of tree. Any existing root node (along with
-	 * its children) will be made a child of the new root node. This is a
-	 * safer alternative to createNewRootNode().
-	 *
-	 * @param      $objectClassname Object wrapped by new node.
-	 * @param      PropelPDO Connection to use.
-	 * @return     $nodeObjectClassname
-	 * @throws     PropelException
-	 */
-	public static function insertNewRootNode(\$obj, PropelPDO \$con = null)
-	{
-		if (\$con === null)
-			\$con = Propel::getConnection($peerClassname::DATABASE_NAME, Propel::CONNECTION_WRITE);
-		
-		\$con->beginTransaction();
-		try {
-			// Move root tree to an invalid node path.
-			$nodePeerClassname::moveNodeSubTree('1', '0', \$con);
-
-			\$setNodePath = 'set' . self::NPATH_PHPNAME;
-
-			// Insert the new root node.
-			\$obj->\$setNodePath('1');
-			\$obj->save(\$con);
-
-			// Move the old root tree as a child of the new root.
-			$nodePeerClassname::moveNodeSubTree('0', '1' . self::NPATH_SEP . '1', \$con);
-
-			\$con->commit();
-		} catch (PropelException \$e) {
-			\$con->rollBack();
-			throw \$e;
-		}
-
-		return new $nodeObjectClassname(\$obj);
-	}
-";
-	}
-
-	/**
-	 * Adds the methods for retrieving nodes.
-	 */
-	protected function addRetrieveMethods(&$script)
-	{
-		$this->addRetrieveNodes($script);
-		$this->addRetrieveNodeByPK($script);
-		$this->addRetrieveNodeByNP($script);
-		$this->addRetrieveRootNode($script);
-
-	}
-
-	protected function addRetrieveNodes(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Retrieves an array of tree nodes based on specified criteria. Optionally
-	 * includes all parent and/or child nodes of the matching nodes.
-	 *
-	 * @param      Criteria Criteria to use.
-	 * @param      boolean True if ancestors should also be retrieved.
-	 * @param      boolean True if descendants should also be retrieved.
-	 * @param      PropelPDO Connection to use.
-	 * @return     array Array of root nodes.
-	 */
-	public static function retrieveNodes(\$criteria, \$ancestors = false, \$descendants = false, PropelPDO \$con = null)
-	{
-		\$criteria = $nodePeerClassname::buildFamilyCriteria(\$criteria, \$ancestors, \$descendants);
-		\$stmt = ".$this->getStubPeerBuilder()->getClassname()."::doSelectStmt(\$criteria, \$con);
-		return self::populateNodes(\$stmt, \$criteria);
-	}
-";
-	}
-
-	protected function addRetrieveNodeByPK(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$nodeObjectClassname = $this->getStubNodeBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Retrieves a tree node based on a primary key. Optionally includes all
-	 * parent and/or child nodes of the matching node.
-	 *
-	 * @param      mixed $objectClassname primary key (array for composite keys)
-	 * @param      boolean True if ancestors should also be retrieved.
-	 * @param      boolean True if descendants should also be retrieved.
-	 * @param      PropelPDO Connection to use.
-	 * @return     $nodeObjectClassname
-	 */
-	public static function retrieveNodeByPK(\$pk, \$ancestors = false, \$descendants = false, PropelPDO \$con = null)
-	{
-		throw new PropelException('retrieveNodeByPK() not implemented yet.');
-	}
-";
-	}
-
-	protected function addRetrieveNodeByNP(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$nodeObjectClassname = $this->getStubNodeBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Retrieves a tree node based on a node path. Optionally includes all
-	 * parent and/or child nodes of the matching node.
-	 *
-	 * @param      string Node path to retrieve.
-	 * @param      boolean True if ancestors should also be retrieved.
-	 * @param      boolean True if descendants should also be retrieved.
-	 * @param      PropelPDO Connection to use.
-	 * @return     $objectClassname
-	 */
-	public static function retrieveNodeByNP(\$np, \$ancestors = false, \$descendants = false, PropelPDO \$con = null)
-	{
-		\$criteria = new Criteria($peerClassname::DATABASE_NAME);
-		\$criteria->add(self::NPATH_COLNAME, \$np, Criteria::EQUAL);
-		\$criteria = self::buildFamilyCriteria(\$criteria, \$ancestors, \$descendants);
-		\$stmt = $peerClassname::doSelectStmt(\$criteria, \$con);
-		\$nodes = self::populateNodes(\$stmt, \$criteria);
-		return (count(\$nodes) == 1 ? \$nodes[0] : null);
-	}
-";
-	}
-
-	protected function addRetrieveRootNode(&$script)
-	{
-		$script .= "
-	/**
-	 * Retrieves the root node.
-	 *
-	 * @param      string Node path to retrieve.
-	 * @param      boolean True if descendants should also be retrieved.
-	 * @param      PropelPDO Connection to use.
-	 * @return     ".$this->getStubNodeBuilder()->getClassname()."
-	 */
-	public static function retrieveRootNode(\$descendants = false, PropelPDO \$con = null)
-	{
-		return self::retrieveNodeByNP('1', false, \$descendants, \$con);
-	}
-";
-	}
-
-	protected function addMoveNodeSubTree(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$nodeObjectClassname = $this->getStubNodeBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Moves the node subtree at srcpath to the dstpath. This method is intended
-	 * for internal use by the BaseNode object. Note that it does not check for
-	 * preexisting nodes at the dstpath. It also does not update the  node path
-	 * of any Node objects that might currently be in memory.
-	 *
-	 * Use at your own risk!
-	 *
-	 * @param      string Source node path to move (root of the src subtree).
-	 * @param      string Destination node path to move to (root of the dst subtree).
-	 * @param      PropelPDO Connection to use.
-	 * @return     void
-	 * @throws     PropelException
-	 * @todo       This is currently broken for simulated 'onCascadeDelete's.
-	 * @todo       Need to abstract the SQL better. The CONCAT sql function doesn't
-	 *       seem to be standardized (i.e. mssql), so maybe it needs to be moved
-	 *       to DBAdapter.
-	 */
-	public static function moveNodeSubTree(\$srcPath, \$dstPath, PropelPDO \$con = null)
-	{
-		if (substr(\$dstPath, 0, strlen(\$srcPath)) == \$srcPath)
-			throw new PropelException('Cannot move a node subtree within itself.');
-
-		if (\$con === null)
-			\$con = Propel::getConnection($peerClassname::DATABASE_NAME, Propel::CONNECTION_WRITE);
-
-		/**
-		 * Example:
-		 * UPDATE table
-		 * SET npath = CONCAT('1.3', SUBSTRING(npath, 6, 74))
-		 * WHERE npath = '1.2.2' OR npath LIKE '1.2.2.%'
-		 */
-
-		\$npath = $nodePeerClassname::NPATH_COLNAME;
-		//the following dot isn`t mean`t a nodeKeySeperator
-		\$setcol = substr(\$npath, strrpos(\$npath, '.')+1);
-		\$setcollen = $nodePeerClassname::NPATH_LEN;
-		\$db = Propel::getDb($peerClassname::DATABASE_NAME);
-
-		// <hack>
-		if ($nodePeerClassname::isCodeBase(\$con))
-		{
-			// This is a hack to get CodeBase working. It will eventually be removed.
-			// It is a workaround for the following CodeBase bug:
-			//   -Prepared statement parameters cannot be embedded in SQL functions (i.e. CONCAT)
-			\$sql = \"UPDATE \" . $peerClassname::TABLE_NAME . \" \" .
-				   \"SET \$setcol=\" . \$db->concatString(\"'\$dstPath'\", \$db->subString(\$npath, strlen(\$srcPath)+1, \$setcollen)) . \" \" .
-				   \"WHERE \$npath = '\$srcPath' OR \$npath LIKE '\" . \$srcPath . $nodePeerClassname::NPATH_SEP . \"%'\";
-
-			\$con->executeUpdate(\$sql);
-		}
-		else
-		{
-		// </hack>
-			\$sql = \"UPDATE \" . $peerClassname::TABLE_NAME . \" \" .
-				   \"SET \$setcol=\" . \$db->concatString('?', \$db->subString(\$npath, '?', '?')) . \" \" .
-				   \"WHERE \$npath = ? OR \$npath LIKE ?\";
-
-			\$stmt = \$con->prepare(\$sql);
-			\$stmt->bindValue(1, \$dstPath); // string
-			\$srcPathPlus1 = strlen(\$srcPath)+1;
-			\$stmt->bindValue(2, \$srcPathPlus1); // int
-			\$stmt->bindValue(3, \$setcollen);// int
-			\$stmt->bindValue(4, \$srcPath);// string
-			\$srcPathWC = \$srcPath . $nodePeerClassname::NPATH_SEP . '%';
-			\$stmt->bindValue(5, \$srcPathWC); // string
-			\$stmt->execute();			
-		// <hack>
-		}
-	}
-";
-	}
-
-	protected function addDeleteNodeSubTree(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$nodeObjectClassname = $this->getStubNodeBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Deletes the node subtree at the specified node path from the database.
-	 *
-	 * @param      string Node path to delete
-	 * @param      PropelPDO Connection to use.
-	 * @return     void
-	 * @throws     PropelException
-	 * @todo       This is currently broken for simulated 'onCascadeDelete's.
-	 */
-	public static function deleteNodeSubTree(\$nodePath, PropelPDO \$con = null)
-	{
-		if (\$con === null)
-			\$con = Propel::getConnection($peerClassname::DATABASE_NAME, Propel::CONNECTION_WRITE);
-
-		/**
-		 * DELETE FROM table
-		 * WHERE npath = '1.2.2' OR npath LIKE '1.2.2.%'
-		 */
-
-		\$criteria = new Criteria($peerClassname::DATABASE_NAME);
-		\$criteria->add($nodePeerClassname::NPATH_COLNAME, \$nodePath, Criteria::EQUAL);
-		\$criteria->addOr($nodePeerClassname::NPATH_COLNAME, \$nodePath . self::NPATH_SEP . '%', Criteria::LIKE);
-		{$this->basePeerClassname}::doDelete(\$criteria, \$con);
-	}
-";
-	}
-
-	protected function addBuildFamilyCriteria(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$nodeObjectClassname = $this->getStubNodeBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Builds the criteria needed to retrieve node ancestors and/or descendants.
-	 *
-	 * @param      Criteria Criteria to start with
-	 * @param      boolean True if ancestors should be retrieved.
-	 * @param      boolean True if descendants should be retrieved.
-	 * @return     Criteria
-	 */
-	public static function buildFamilyCriteria(\$criteria, \$ancestors = false, \$descendants = false)
-	{
-		/*
-			Example SQL to retrieve nodepath '1.2.3' with both ancestors and descendants:
-
-			SELECT L.NPATH, L.LABEL, test.NPATH, UCASE(L.NPATH)
-			FROM test L, test
-			WHERE test.NPATH='1.2.3' AND
-				 (L.NPATH=SUBSTRING(test.NPATH, 1, LENGTH(L.NPATH)) OR
-				  test.NPATH=SUBSTRING(L.NPATH, 1, LENGTH(test.NPATH)))
-			ORDER BY UCASE(L.NPATH) ASC
-		*/
-
-		if (\$criteria === null)
-			\$criteria = new Criteria($peerClassname::DATABASE_NAME);
-
-		if (!\$criteria->getSelectColumns())
-			$peerClassname::addSelectColumns(\$criteria);
-
-		\$db = Propel::getDb(\$criteria->getDbName());
-
-		if ((\$ancestors || \$descendants) && \$criteria->size())
-		{
-			// If we are retrieving ancestors/descendants, we need to do a
-			// self-join to locate them. The exception to this is if no search
-			// criteria is specified. In this case we're retrieving all nodes
-			// anyway, so there is no need to do a self-join.
-
-			// The left-side of the self-join will contain the columns we'll
-			// use to build node objects (target node records along with their
-			// ancestors and/or descendants). The right-side of the join will
-			// contain the target node records specified by the initial criteria.
-			// These are used to match the appropriate ancestor/descendant on
-			// the left.
-
-			// Specify an alias for the left-side table to use.
-			\$criteria->addAlias('L', $peerClassname::TABLE_NAME);
-
-			// Make sure we have select columns to begin with.
-			if (!\$criteria->getSelectColumns())
-				$peerClassname::addSelectColumns(\$criteria);
-
-			// Replace any existing columns for the right-side table with the
-			// left-side alias.
-			\$selectColumns = \$criteria->getSelectColumns();
-			\$criteria->clearSelectColumns();
-			foreach (\$selectColumns as \$colName)
-				\$criteria->addSelectColumn(str_replace($peerClassname::TABLE_NAME, 'L', \$colName));
-
-			\$a = null;
-			\$d = null;
-
-			\$npathL = $peerClassname::alias('L', $nodePeerClassname::NPATH_COLNAME);
-			\$npathR = $nodePeerClassname::NPATH_COLNAME;
-			\$npath_len = $nodePeerClassname::NPATH_LEN;
-
-			if (\$ancestors)
-			{
-				// For ancestors, match left-side node paths which are contained
-				// by right-side node paths.
-				\$a = \$criteria->getNewCriterion(\$npathL,
-								                \"\$npathL=\" . \$db->subString(\$npathR, 1, \$db->strLength(\$npathL), \$npath_len),
-								                Criteria::CUSTOM);
-			}
-
-			if (\$descendants)
-			{
-				// For descendants, match left-side node paths which contain
-				// right-side node paths.
-				\$d = \$criteria->getNewCriterion(\$npathR,
-								                \"\$npathR=\" . \$db->subString(\$npathL, 1, \$db->strLength(\$npathR), \$npath_len),
-								                Criteria::CUSTOM);
-			}
-
-			if (\$a)
-			{
-				if (\$d) \$a->addOr(\$d);
-				\$criteria->addAnd(\$a);
-			}
-			else if (\$d)
-			{
-				\$criteria->addAnd(\$d);
-			}
-
-			// Add the target node path column. This is used by populateNodes().
-			\$criteria->addSelectColumn(\$npathR);
-
-			// Sort by node path to speed up tree construction in populateNodes()
-			\$criteria->addAsColumn('npathlen', \$db->strLength(\$npathL));
-			\$criteria->addAscendingOrderByColumn('npathlen');
-			\$criteria->addAscendingOrderByColumn(\$npathL);
-		}
-		else
-		{
-			// Add the target node path column. This is used by populateNodes().
-			\$criteria->addSelectColumn($nodePeerClassname::NPATH_COLNAME);
-
-			// Sort by node path to speed up tree construction in populateNodes()
-			\$criteria->addAsColumn('npathlen', \$db->strLength($nodePeerClassname::NPATH_COLNAME));
-			\$criteria->addAscendingOrderByColumn('npathlen');
-			\$criteria->addAscendingOrderByColumn($nodePeerClassname::NPATH_COLNAME);
-		}
-
-		return \$criteria;
-	}
-";
-	}
-
-	protected function addBuildTree(&$script)
-	{
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$nodeObjectClassname = $this->getStubNodeBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * This method reconstructs as much of the tree structure as possible from
-	 * the given array of objects. Depending on how you execute your query, it
-	 * is possible for the ResultSet to contain multiple tree fragments (i.e.
-	 * subtrees). The array returned by this method will contain one entry
-	 * for each subtree root node it finds. The remaining subtree nodes are
-	 * accessible from the $nodeObjectClassname methods of the
-	 * subtree root nodes.
-	 *
-	 * @param      array Array of $nodeObjectClassname objects
-	 * @return     array Array of $nodeObjectClassname objects
-	 */
-	public static function buildTree(\$nodes)
-	{
-		// Subtree root nodes to return
-		\$rootNodes = array();
-
-		// Build the tree relations
-		foreach (\$nodes as \$node)
-		{
-			\$sep = strrpos(\$node->getNodePath(), $nodePeerClassname::NPATH_SEP);
-			\$parentPath = (\$sep !== false ? substr(\$node->getNodePath(), 0, \$sep) : '');
-			\$parentNode = null;
-
-			// Scan other nodes for parent.
-			foreach (\$nodes as \$pnode)
-			{
-				if (\$pnode->getNodePath() === \$parentPath)
-				{
-					\$parentNode = \$pnode;
-					break;
-				}
-			}
-
-			// If parent was found, attach as child, otherwise its a subtree root
-			if (\$parentNode)
-				\$parentNode->attachChildNode(\$node);
-			else
-				\$rootNodes[] = \$node;
-		}
-
-		return \$rootNodes;
-	}
-";
-	}
-
-	protected function addPopulateNodes(&$script)
-	{
-		$table = $this->getTable();
-
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$objectClassname = $this->getStubObjectBuilder()->getClassname();
-
-		$nodePeerClassname = $this->getStubNodePeerBuilder()->getClassname();
-		$nodeObjectClassname = $this->getStubNodeBuilder()->getClassname();
-
-		$script .= "
-	/**
-	 * Populates the $objectClassname objects from the
-	 * specified ResultSet, wraps them in $nodeObjectClassname
-	 * objects and build the appropriate node relationships.
-	 * The array returned by this method will only include the initial targets
-	 * of the query, even if ancestors/descendants were also requested.
-	 * The ancestors/descendants will be cached in memory and are accessible via
-	 * the getNode() methods.
-	 *
-	 * @param      PDOStatement \$stmt	Executed PDOStatement
-	 * @param      Criteria
-	 * @return     array Array of $nodeObjectClassname objects.
-	 */
-	public static function populateNodes(PDOStatement \$stmt, \$criteria)
-	{
-		\$nodes = array();
-		\$targets = array();
-		\$targetfld = count(\$criteria->getSelectColumns());
-";
-
-		if (!$table->getChildrenColumn()) {
-			$script .= "
-		// set the class once to avoid overhead in the loop
-		\$cls = $peerClassname::getOMClass();
-		\$cls = substr('.'.\$cls, strrpos('.'.\$cls, '.') + 1);
-";
-		}
-
-		$script .= "
-		// populate the object(s)
-		foreach(\$stmt->fetchAll() AS \$row)
-		{
-			if (!isset(\$nodes[\$row[0]]))
-			{
-";
-		if ($table->getChildrenColumn()) {
-			$script .= "
-				// class must be set each time from the record row
-				\$cls = $peerClassname::getOMClass(\$row, 1);
-				\$cls = substr('.'.\$cls, strrpos('.'.\$cls, '.') + 1);
-";
-		}
-
-		$script .= "
-		" . $this->buildObjectInstanceCreationCode('$obj', '$cls') . "
-				\$obj->hydrate(\$row);
-
-				\$nodes[\$row[0]] = new $nodeObjectClassname(\$obj);
-			}
-
-			\$node = \$nodes[\$row[0]];
-
-			if (\$node->getNodePath() === \$row[\$targetfld])
-				\$targets[\$node->getNodePath()] = \$node;
-		}
-
-		$nodePeerClassname::buildTree(\$nodes);
-
-		return array_values(\$targets);
-	}
-";
-	}
-
-} // PHP5NodePeerBuilder
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5ObjectBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5ObjectBuilder.php
deleted file mode 100644
index beb6fdc7e..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5ObjectBuilder.php
+++ /dev/null
@@ -1,4071 +0,0 @@
-<?php
-
-/*
- *  $Id: PHP5ObjectBuilder.php 1639 2010-03-25 22:11:59Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/ObjectBuilder.php';
-
-/**
- * Generates a PHP5 base Object class for user object model (OM).
- *
- * This class produces the base object class (e.g. BaseMyTable) which contains all
- * the custom-built accessor and setter methods.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder.om.php5
- */
-class PHP5ObjectBuilder extends ObjectBuilder {
-
-	/**
-	 * Gets the package for the [base] object classes.
-	 * @return     string
-	 */
-	public function getPackage()
-	{
-		return parent::getPackage() . ".om";
-	}
-
-	/**
-	 * Returns the name of the current class being built.
-	 * @return     string
-	 */
-	public function getUnprefixedClassname()
-	{
-		return $this->getBuildProperty('basePrefix') . $this->getStubObjectBuilder()->getUnprefixedClassname();
-	}
-
-	/**
-	 * Validates the current table to make sure that it won't
-	 * result in generated code that will not parse.
-	 *
-	 * This method may emit warnings for code which may cause problems
-	 * and will throw exceptions for errors that will definitely cause
-	 * problems.
-	 */
-	protected function validateModel()
-	{
-		parent::validateModel();
-
-		$table = $this->getTable();
-
-		// Check to see whether any generated foreign key names
-		// will conflict with column names.
-
-		$colPhpNames = array();
-		$fkPhpNames = array();
-
-		foreach ($table->getColumns() as $col) {
-			$colPhpNames[] = $col->getPhpName();
-		}
-
-		foreach ($table->getForeignKeys() as $fk) {
-			$fkPhpNames[] = $this->getFKPhpNameAffix($fk, $plural = false);
-		}
-
-		$intersect = array_intersect($colPhpNames, $fkPhpNames);
-		if (!empty($intersect)) {
-			throw new EngineException("One or more of your column names for [" . $table->getName() . "] table conflict with foreign key names (" . implode(", ", $intersect) . ")");
-		}
-
-		// Check foreign keys to see if there are any foreign keys that
-		// are also matched with an inversed referencing foreign key
-		// (this is currently unsupported behavior)
-		// see: http://propel.phpdb.org/trac/ticket/549
-
-		foreach ($table->getForeignKeys() as $fk) {
-			if ($fk->isMatchedByInverseFK()) {
-				throw new EngineException("The 1:1 relationship expressed by foreign key " . $fk->getName() . " is defined in both directions; Propel does not currently support this (if you must have both foreign key constraints, consider adding this constraint with a custom SQL file.)" );
-			}
-		}
-	}
-
-	/**
-	 * Returns the appropriate formatter (from platform) for a date/time column.
-	 * @param      Column $col
-	 * @return     string
-	 */
-	protected function getTemporalFormatter(Column $col)
-	{
-		$fmt = null;
-		if ($col->getType() === PropelTypes::DATE) {
-			$fmt = $this->getPlatform()->getDateFormatter();
-		} elseif ($col->getType() === PropelTypes::TIME) {
-			$fmt = $this->getPlatform()->getTimeFormatter();
-		} elseif ($col->getType() === PropelTypes::TIMESTAMP) {
-			$fmt = $this->getPlatform()->getTimestampFormatter();
-		}
-		return $fmt;
-	}
-
-	/**
-	 * Returns the type-casted and stringified default value for the specified Column.
-	 * This only works for scalar default values currently.
-	 * @return     string The default value or 'NULL' if there is none.
-	 */
-	protected function getDefaultValueString(Column $col)
-	{
-		$defaultValue = var_export(null, true);
-		if (($val = $col->getPhpDefaultValue()) !== null) {
-			if ($col->isTemporalType()) {
-				$fmt = $this->getTemporalFormatter($col);
-				try {
-					if (!($this->getPlatform() instanceof MysqlPlatform &&
-					($val === '0000-00-00 00:00:00' || $val === '0000-00-00'))) {
-						// while technically this is not a default value of NULL,
-						// this seems to be closest in meaning.
-						$defDt = new DateTime($val);
-						$defaultValue = var_export($defDt->format($fmt), true);
-					}
-				} catch (Exception $x) {
-					// prevent endless loop when timezone is undefined
-					date_default_timezone_set('America/Los_Angeles');
-					throw new EngineException("Unable to parse default temporal value for " . $col->getFullyQualifiedName() . ": " .$this->getDefaultValueString($col), $x);
-				}
-			} else {
-				if ($col->isPhpPrimitiveType()) {
-					settype($val, $col->getPhpType());
-					$defaultValue = var_export($val, true);
-				} elseif ($col->isPhpObjectType()) {
-					$defaultValue = 'new '.$col->getPhpType().'(' . var_export($val, true) . ')';
-				} else {
-					throw new EngineException("Cannot get default value string for " . $col->getFullyQualifiedName());
-				}
-			}
-		}
-		return $defaultValue;
-	}
-
-	/**
-	 * Adds the include() statements for files that this class depends on or utilizes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addIncludes(&$script)
-	{
-	} // addIncludes()
-
-	/**
-	 * Adds class phpdoc comment and openning of class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassOpen(&$script)
-	{
-
-		$table = $this->getTable();
-		$tableName = $table->getName();
-		$tableDesc = $table->getDescription();
-		$interface = $this->getInterface();
-
-		$script .= "
-/**
- * Base class that represents a row from the '$tableName' table.
- *
- * $tableDesc
- *";
-		if ($this->getBuildProperty('addTimeStamp')) {
-			$now = strftime('%c');
-			$script .= "
- * This class was autogenerated by Propel " . $this->getBuildProperty('version') . " on:
- *
- * $now
- *";
-		}
-		$script .= "
- * @package    ".$this->getPackage()."
- */
-abstract class ".$this->getClassname()." extends ".ClassTools::classname($this->getBaseClass())." ";
-
-		$interface = ClassTools::getInterface($table);
-		if ($interface) {
-			$script .= " implements " . ClassTools::classname($interface);
-		}
-
-		$script .= " {
-
-";
-	}
-
-	/**
-	 * Specifies the methods that are added as part of the basic OM class.
-	 * This can be overridden by subclasses that wish to add more methods.
-	 * @see        ObjectBuilder::addClassBody()
-	 */
-	protected function addClassBody(&$script)
-	{
-		$table = $this->getTable();
-		if (!$table->isAlias()) {
-			$this->addConstants($script);
-			$this->addAttributes($script);
-		}
-
-    if ($this->hasDefaultValues()) {
-      $this->addApplyDefaultValues($script);
-      $this->addConstructor($script);
-    }
-
-		$this->addColumnAccessorMethods($script);
-		$this->addColumnMutatorMethods($script);
-
-		$this->addHasOnlyDefaultValues($script);
-
-		$this->addHydrate($script);
-		$this->addEnsureConsistency($script);
-
-		if (!$table->isReadOnly()) {
-			$this->addManipulationMethods($script);
-		}
-
-    if ($this->isAddValidateMethod())
-    {
-      $this->addValidationMethods($script);
-    }
-
-		if ($this->isAddGenericAccessors()) {
-			$this->addGetByName($script);
-			$this->addGetByPosition($script);
-			$this->addToArray($script);
-		}
-
-		if ($this->isAddGenericMutators()) {
-			$this->addSetByName($script);
-			$this->addSetByPosition($script);
-			$this->addFromArray($script);
-		}
-
-		$this->addBuildCriteria($script);
-		$this->addBuildPkeyCriteria($script);
-		$this->addGetPrimaryKey($script);
-		$this->addSetPrimaryKey($script);
-
-		$this->addCopy($script);
-
-		if (!$table->isAlias()) {
-			$this->addGetPeer($script);
-		}
-
-		$this->addFKMethods($script);
-		$this->addRefFKMethods($script);
-		$this->addClearAllReferences($script);
-		
-		// apply behaviors
-    $this->applyBehaviorModifier('objectMethods', $script, "	");
-		
-		$this->addPrimaryString($script);
-	}
-
-	/**
-	 * Closes class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassClose(&$script)
-	{
-		$script .= "
-} // " . $this->getClassname() . "
-";
-    $this->applyBehaviorModifier('objectFilter', $script, "");
-	}
-
-	/**
-	 * Adds any constants to the class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addConstants(&$script)
-	{
-		// nothing to do here any more
-		// fieldnameTypeConstants have been moved to class BasePeer [sv]
-	}
-
-	/**
-	 * Adds class attributes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addAttributes(&$script)
-	{
-		$table = $this->getTable();
-
-		$script .= "
-	/**
-	 * The Peer class.
-	 * Instance provides a convenient way of calling static methods on a class
-	 * that calling code may not be able to identify.
-	 * @var        ".$this->getPeerClassname()."
-	 */
-	protected static \$peer;
-";
-		if (!$table->isAlias()) {
-			$this->addColumnAttributes($script);
-		}
-
-		foreach ($table->getForeignKeys() as $fk) {
-			$this->addFKAttributes($script, $fk);
-		}
-
-		foreach ($table->getReferrers() as $refFK) {
-			// if ($refFK->getTable()->getName() != $table->getName()) {
-			$this->addRefFKAttributes($script, $refFK);
-			// }
-		}
-
-		$this->addAlreadyInSaveAttribute($script);
-		$this->addAlreadyInValidationAttribute($script);
-		
-		// apply behaviors
-    $this->applyBehaviorModifier('objectAttributes', $script, "	");
-	}
-
-	/**
-	 * Adds variables that store column values.
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addColumnNameConstants()
-	 */
-	protected function addColumnAttributes(&$script) {
-
-		$table = $this->getTable();
-
-		foreach ($table->getColumns() as $col) {
-			$this->addColumnAttributeComment($script, $col);
-			$this->addColumnAttributeDeclaration($script, $col);
-			if ($col->isLazyLoad() ) {
-				$this->addColumnAttributeLoaderComment($script, $col);
-				$this->addColumnAttributeLoaderDeclaration($script, $col);
-			}
-		}
-	}
-
-	/**
-	 * Add comment about the attribute (variable) that stores column values
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col
-	 **/
-	protected function addColumnAttributeComment(&$script, Column $col) {
-		$cptype = $col->getPhpType();
-		$clo = strtolower($col->getName());
-
-		$script .= "
-	/**
-	 * The value for the $clo field.";
-		if ($col->getDefaultValue()) {
-			if ($col->getDefaultValue()->isExpression()) {
-				$script .= "
-	 * Note: this column has a database default value of: (expression) ".$col->getDefaultValue()->getValue();
-			} else {
-				$script .= "
-	 * Note: this column has a database default value of: ". $this->getDefaultValueString($col);
-			}
-		}
-		$script .= "
-	 * @var        $cptype
-	 */";
-	}
-
-	/**
-	 * Adds the declaration of a column value storage attribute
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col
-	 **/
-	protected function addColumnAttributeDeclaration(&$script, Column $col) {
-		$clo = strtolower($col->getName());
-		$script .= "
-	protected \$" . $clo . ";
-";
-	}
-
-	/**
-	 * Adds the comment about the attribute keeping track if an attribute value has been loaded
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col
-	 **/
-	protected function addColumnAttributeLoaderComment(&$script, Column $col) {
-		$script .= "
-	/**
-	 * Whether the lazy-loaded $clo value has been loaded from database.
-	 * This is necessary to avoid repeated lookups if $clo column is NULL in the db.
-	 * @var        boolean
-	 */";
-	}
-
-	/**
-	 * Adds the declaration of the attribute keeping track of an attribute's loaded state
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col
-	 **/
-	protected function addColumnAttributeLoaderDeclaration(&$script, Column $col) {
-		$clo = strtolower($col->getName());
-		$script .= "
-	protected \$".$clo."_isLoaded = false;
-";
-	}
-
-	/**
-	 * Adds the getPeer() method.
-	 * This is a convenient, non introspective way of getting the Peer class for a particular object.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetPeer(&$script)
-	{
-		$this->addGetPeerComment($script);
-		$this->addGetPeerFunctionOpen($script);
-		$this->addGetPeerFunctionBody($script);
-		$this->addGetPeerFunctionClose($script);
-	}
-
-	/**
-	 * Add the comment for the getPeer method
-	 * @param      string &$script The script will be modified in this method.
-	 **/
-	protected function addGetPeerComment(&$script) {
-		$script .= "
-	/**
-	 * Returns a peer instance associated with this om.
-	 *
-	 * Since Peer classes are not to have any instance attributes, this method returns the
-	 * same instance for all member of this class. The method could therefore
-	 * be static, but this would prevent one from overriding the behavior.
-	 *
-	 * @return     ".$this->getPeerClassname()."
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration (function opening) for the getPeer method
-	 * @param      string &$script The script will be modified in this method.
-	 **/
-	protected function addGetPeerFunctionOpen(&$script) {
-		$script .= "
-	public function getPeer()
-	{";
-	}
-
-	/**
-	 * Adds the body of the getPeer method
-	 * @param      string &$script The script will be modified in this method.
-	 **/
-	protected function addGetPeerFunctionBody(&$script) {
-		$script .= "
-		if (self::\$peer === null) {
-			" . $this->buildObjectInstanceCreationCode('self::$peer', $this->getPeerClassname()) . "
-		}
-		return self::\$peer;";
-	}
-
-	/**
-	 * Add the function close for the getPeer method
-	 * Note: this is just a } and the body ends with a return statement, so it's quite useless. But it's here anyway for consisency, cause there's a close function for all functions and in some other instances, they are useful
-	 * @param      string &$script The script will be modified in this method.
-	 **/
-	protected function addGetPeerFunctionClose(&$script) {
-		$script .= "
-	}
-";
-	}
-
-	/**
-	 * Adds the constructor for this object.
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addConstructor()
-	 */
-	protected function addConstructor(&$script)
-	{
-		$this->addConstructorComment($script);
-		$this->addConstructorOpen($script);
-		$this->addConstructorBody($script);
-		$this->addConstructorClose($script);
-	}
-
-	/**
-	 * Adds the comment for the constructor
-	 * @param      string &$script The script will be modified in this method.
-	 **/
-	protected function addConstructorComment(&$script) {
-		$script .= "
-	/**
-	 * Initializes internal state of ".$this->getClassname()." object.
-	 * @see        applyDefaults()
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration for the constructor
-	 * @param      string &$script The script will be modified in this method.
-	 **/
-	protected function addConstructorOpen(&$script) {
-		$script .= "
-	public function __construct()
-	{";
-	}
-
-	/**
-	 * Adds the function body for the constructor
-	 * @param      string &$script The script will be modified in this method.
-	 **/
-	protected function addConstructorBody(&$script) {
-		$script .= "
-		parent::__construct();
-		\$this->applyDefaultValues();";
-	}
-
-	/**
-	 * Adds the function close for the constructor
-	 * @param      string &$script The script will be modified in this method.
-	 **/
-	protected function addConstructorClose(&$script) {
-		$script .= "
-	}
-";
-	}
-
-	/**
-	 * Adds the applyDefaults() method, which is called from the constructor.
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addConstructor()
-	 */
-	protected function addApplyDefaultValues(&$script)
-	{
-		$this->addApplyDefaultValuesComment($script);
-		$this->addApplyDefaultValuesOpen($script);
-		$this->addApplyDefaultValuesBody($script);
-		$this->addApplyDefaultValuesClose($script);
-	}
-
-	/**
-	 * Adds the comment for the applyDefaults method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addApplyDefaultValues()
-	 **/
-	protected function addApplyDefaultValuesComment(&$script) {
-		$script .= "
-	/**
-	 * Applies default values to this object.
-	 * This method should be called from the object's constructor (or
-	 * equivalent initialization method).
-	 * @see        __construct()
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration for the applyDefaults method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addApplyDefaultValues()
-	 **/
-	protected function addApplyDefaultValuesOpen(&$script) {
-		 $script .= "
-	public function applyDefaultValues()
-	{";
-	}
-
-	/**
-	 * Adds the function body of the applyDefault method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addApplyDefaultValues()
-	 **/
-	protected function addApplyDefaultValuesBody(&$script) {
-		$table = $this->getTable();
-		// FIXME - Apply support for PHP default expressions here
-		// see: http://propel.phpdb.org/trac/ticket/378
-
-		$colsWithDefaults = array();
-		foreach ($table->getColumns() as $col) {
-			$def = $col->getDefaultValue();
-			if ($def !== null && !$def->isExpression()) {
-				$colsWithDefaults[] = $col;
-			}
-		}
-
-		$colconsts = array();
-		foreach ($colsWithDefaults as $col) {
-			$clo = strtolower($col->getName());
-			$script .= "
-		\$this->".$clo." = ".$this->getDefaultValueString($col).";";
-
-		}
-	}
-
-
-	/**
-	 * Adds the function close for the applyDefaults method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addApplyDefaultValues()
-	 **/
-	protected function addApplyDefaultValuesClose(&$script) {
-		$script .= "
-	}
-";
-	}
-
-	// --------------------------------------------------------------
-	//
-	// A C C E S S O R    M E T H O D S
-	//
-	// --------------------------------------------------------------
-
-	/**
-	 * Adds a date/time/timestamp getter method.
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        parent::addColumnAccessors()
-	 */
-	protected function addTemporalAccessor(&$script, Column $col)
-	{
-		$this->addTemporalAccessorComment($script, $col);
-		$this->addTemporalAccessorOpen($script, $col);
-		$this->addTemporalAccessorBody($script, $col);
-		$this->addTemporalAccessorClose($script, $col);
-	} // addTemporalAccessor
-
-
-	/**
-	 * Adds the comment for a temporal accessor
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addTemporalAccessor
-	 **/
-	protected function addTemporalAccessorComment(&$script, Column $col) {
-		$clo = strtolower($col->getName());
-		$useDateTime = $this->getBuildProperty('useDateTimeClass');
-
-		$dateTimeClass = $this->getBuildProperty('dateTimeClass');
-		if (!$dateTimeClass) {
-			$dateTimeClass = 'DateTime';
-		}
-
-		$handleMysqlDate = false;
-		if ($this->getPlatform() instanceof MysqlPlatform) {
-			if ($col->getType() === PropelTypes::TIMESTAMP) {
-				$handleMysqlDate = true;
-				$mysqlInvalidDateString = '0000-00-00 00:00:00';
-			} elseif ($col->getType() === PropelTypes::DATE) {
-				$handleMysqlDate = true;
-				$mysqlInvalidDateString = '0000-00-00';
-			}
-			// 00:00:00 is a valid time, so no need to check for that.
-		}
-
-		$script .= "
-	/**
-	 * Get the [optionally formatted] temporal [$clo] column value.
-	 * ".$col->getDescription();
-		if (!$useDateTime) {
-			$script .= "
-	 * This accessor only only work with unix epoch dates.  Consider enabling the propel.useDateTimeClass
-	 * option in order to avoid converstions to integers (which are limited in the dates they can express).";
-		}
-		$script .= "
-	 *
-	 * @param      string \$format The date/time format string (either date()-style or strftime()-style).
-	 *							If format is NULL, then the raw ".($useDateTime ? 'DateTime object' : 'unix timestamp integer')." will be returned.";
-		if ($useDateTime) {
-			$script .= "
-	 * @return     mixed Formatted date/time value as string or $dateTimeClass object (if format is NULL), NULL if column is NULL" .($handleMysqlDate ? ', and 0 if column value is ' . $mysqlInvalidDateString : '');
-		} else {
-			$script .= "
-	 * @return     mixed Formatted date/time value as string or (integer) unix timestamp (if format is NULL), NULL if column is NULL".($handleMysqlDate ? ', and 0 if column value is ' . $mysqlInvalidDateString : '');
-		}
-		$script .= "
-	 * @throws     PropelException - if unable to parse/validate the date/time value.
-	 */";
-	}
-
-
-	/**
-	 * Adds the function declaration for a temporal accessor
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addTemporalAccessor
-	 **/
-	protected function addTemporalAccessorOpen(&$script, Column $col) {
-		$cfc = $col->getPhpName();
-
-		$defaultfmt = null;
-				$visibility = $col->getAccessorVisibility();
-
-		// Default date/time formatter strings are specified in build.properties
-		if ($col->getType() === PropelTypes::DATE) {
-			$defaultfmt = $this->getBuildProperty('defaultDateFormat');
-		} elseif ($col->getType() === PropelTypes::TIME) {
-			$defaultfmt = $this->getBuildProperty('defaultTimeFormat');
-		} elseif ($col->getType() === PropelTypes::TIMESTAMP) {
-			$defaultfmt = $this->getBuildProperty('defaultTimeStampFormat');
-		}
-		if (empty($defaultfmt)) { $defaultfmt = null; }
-
-		$script .= "
-	".$visibility." function get$cfc(\$format = ".var_export($defaultfmt, true)."";
-		if ($col->isLazyLoad()) $script .= ", \$con = null";
-		$script .= ")
-	{";
-	}
-
-	/**
-	 * Adds the body of the temporal accessor
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addTemporalAccessor
-	 **/
-	protected function addTemporalAccessorBody(&$script, Column $col) {
-		$cfc = $col->getPhpName();
-		$clo = strtolower($col->getName());
-
-		$useDateTime = $this->getBuildProperty('useDateTimeClass');
-
-		$dateTimeClass = $this->getBuildProperty('dateTimeClass');
-		if (!$dateTimeClass) {
-			$dateTimeClass = 'DateTime';
-		}
-
-		$defaultfmt = null;
-
-		// Default date/time formatter strings are specified in build.properties
-		if ($col->getType() === PropelTypes::DATE) {
-			$defaultfmt = $this->getBuildProperty('defaultDateFormat');
-		} elseif ($col->getType() === PropelTypes::TIME) {
-			$defaultfmt = $this->getBuildProperty('defaultTimeFormat');
-		} elseif ($col->getType() === PropelTypes::TIMESTAMP) {
-			$defaultfmt = $this->getBuildProperty('defaultTimeStampFormat');
-		}
-		if (empty($defaultfmt)) { $defaultfmt = null; }
-
-		$handleMysqlDate = false;
-		if ($this->getPlatform() instanceof MysqlPlatform) {
-			if ($col->getType() === PropelTypes::TIMESTAMP) {
-				$handleMysqlDate = true;
-				$mysqlInvalidDateString = '0000-00-00 00:00:00';
-			} elseif ($col->getType() === PropelTypes::DATE) {
-				$handleMysqlDate = true;
-				$mysqlInvalidDateString = '0000-00-00';
-			}
-			// 00:00:00 is a valid time, so no need to check for that.
-		}
-
-		if ($col->isLazyLoad()) {
-			$script .= "
-		if (!\$this->".$clo."_isLoaded && \$this->$clo === null && !\$this->isNew()) {
-			\$this->load$cfc(\$con);
-		}
-";
-		}
-		$script .= "
-		if (\$this->$clo === null) {
-			return null;
-		}
-
-";
-		if ($handleMysqlDate) {
-			$script .= "
-		if (\$this->$clo === '$mysqlInvalidDateString') {
-			// while technically this is not a default value of NULL,
-			// this seems to be closest in meaning.
-			return null;
-		} else {
-			try {
-				\$dt = new $dateTimeClass(\$this->$clo);
-			} catch (Exception \$x) {
-				throw new PropelException(\"Internally stored date/time/timestamp value could not be converted to $dateTimeClass: \" . var_export(\$this->$clo, true), \$x);
-			}
-		}
-";
-		} else {
-			$script .= "
-
-		try {
-			\$dt = new $dateTimeClass(\$this->$clo);
-		} catch (Exception \$x) {
-			throw new PropelException(\"Internally stored date/time/timestamp value could not be converted to $dateTimeClass: \" . var_export(\$this->$clo, true), \$x);
-		}
-";
-		} // if handleMyqlDate
-
-		$script .= "
-		if (\$format === null) {";
-		if ($useDateTime) {
-			$script .= "
-			// Because propel.useDateTimeClass is TRUE, we return a $dateTimeClass object.
-			return \$dt;";
-		} else {
-			$script .= "
-			// We cast here to maintain BC in API; obviously we will lose data if we're dealing with pre-/post-epoch dates.
-			return (int) \$dt->format('U');";
-		}
-		$script .= "
-		} elseif (strpos(\$format, '%') !== false) {
-			return strftime(\$format, \$dt->format('U'));
-		} else {
-			return \$dt->format(\$format);
-		}";
-	}
-
-
-	/**
-	 * Adds the body of the temporal accessor
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addTemporalAccessorClose
-	 **/
-	protected function addTemporalAccessorClose(&$script, Column $col) {
-		$script .= "
-	}
-";
-	}
-
-	/**
-	 * Adds a normal (non-temporal) getter method.
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        parent::addColumnAccessors()
-	 */
-	protected function addDefaultAccessor(&$script, Column $col)
-	{
-		$this->addDefaultAccessorComment($script, $col);
-		$this->addDefaultAccessorOpen($script, $col);
-		$this->addDefaultAccessorBody($script, $col);
-		$this->addDefaultAccessorClose($script, $col);
-	}
-
-	/**
-	 * Add the comment for a default accessor method (a getter)
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addDefaultAccessor()
-	 **/
-	protected function addDefaultAccessorComment(&$script, Column $col) {
-		$clo=strtolower($col->getName());
-
-		$script .= "
-	/**
-	 * Get the [$clo] column value.
-	 * ".$col->getDescription();
-		if ($col->isLazyLoad()) {
-			$script .= "
-	 * @param      PropelPDO An optional PropelPDO connection to use for fetching this lazy-loaded column.";
-		}
-		$script .= "
-	 * @return     ".$col->getPhpType()."
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration for a default accessor
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addDefaultAccessor()
-	 **/
-	protected function addDefaultAccessorOpen(&$script, Column $col) {
-		$cfc = $col->getPhpName();
-		$visibility = $col->getAccessorVisibility();
-
-		$script .= "
-	".$visibility." function get$cfc(";
-		if ($col->isLazyLoad()) $script .= "PropelPDO \$con = null";
-		$script .= ")
-	{";
-	}
-
-	/**
-	 * Adds the function body for a default accessor method
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addDefaultAccessor()
-	 **/
-	protected function addDefaultAccessorBody(&$script, Column $col) {
-		$cfc = $col->getPhpName();
-		$clo = strtolower($col->getName());
-		if ($col->isLazyLoad()) {
-			$script .= "
-		if (!\$this->".$clo."_isLoaded && \$this->$clo === null && !\$this->isNew()) {
-			\$this->load$cfc(\$con);
-		}
-";
-		}
-
-		$script .= "
-		return \$this->$clo;";
-	}
-
-	/**
-	 * Adds the function close for a default accessor method
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addDefaultAccessor()
-	 **/
-	protected function addDefaultAccessorClose(&$script, Column $col) {
-		$script .= "
-	}
-";
-	}
-
-	/**
-	 * Adds the lazy loader method.
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        parent::addColumnAccessors()
-	 */
-	protected function addLazyLoader(&$script, Column $col)
-	{
-		$this->addLazyLoaderComment($script, $col);
-		$this->addLazyLoaderOpen($script, $col);
-		$this->addLazyLoaderBody($script, $col);
-		$this->addLazyLoaderClose($script, $col);
-	}
-
-	/**
-	 * Adds the comment for the lazy loader method
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addLazyLoader()
-	 **/
-	protected function addLazyLoaderComment(&$script, Column $col) {
-		$clo = strtolower($col->getName());
-
-		$script .= "
-	/**
-	 * Load the value for the lazy-loaded [$clo] column.
-	 *
-	 * This method performs an additional query to return the value for
-	 * the [$clo] column, since it is not populated by
-	 * the hydrate() method.
-	 *
-	 * @param      \$con PropelPDO (optional) The PropelPDO connection to use.
-	 * @return     void
-	 * @throws     PropelException - any underlying error will be wrapped and re-thrown.
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration for the lazy loader method
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addLazyLoader()
-	 **/
-	protected function addLazyLoaderOpen(&$script, Column $col) {
-		$cfc = $col->getPhpName();
-		$script .= "
-	protected function load$cfc(PropelPDO \$con = null)
-	{";
-	}
-
-	/**
-	 * Adds the function body for the lazy loader method
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addLazyLoader()
-	 **/
-	protected function addLazyLoaderBody(&$script, Column $col) {
-		$platform = $this->getPlatform();
-		$clo = strtolower($col->getName());
-
-		$script .= "
-		\$c = \$this->buildPkeyCriteria();
-		\$c->addSelectColumn(".$this->getColumnConstant($col).");
-		try {
-			\$stmt = ".$this->getPeerClassname()."::doSelectStmt(\$c, \$con);
-			\$row = \$stmt->fetch(PDO::FETCH_NUM);
-			\$stmt->closeCursor();";
-
-		if ($col->isLobType() && !$platform->hasStreamBlobImpl()) {
-			$script .= "
-			if (\$row[0] !== null) {
-				\$this->$clo = fopen('php://memory', 'r+');
-				fwrite(\$this->$clo, \$row[0]);
-				rewind(\$this->$clo);
-			} else {
-				\$this->$clo = null;
-			}";
-		} elseif ($col->isPhpPrimitiveType()) {
-			$script .= "
-			\$this->$clo = (\$row[0] !== null) ? (".$col->getPhpType().") \$row[0] : null;";
-		} elseif ($col->isPhpObjectType()) {
-			$script .= "
-			\$this->$clo = (\$row[0] !== null) ? new ".$col->getPhpType()."(\$row[0]) : null;";
-		} else {
-			$script .= "
-			\$this->$clo = \$row[0];";
-		}
-
-		$script .= "
-			\$this->".$clo."_isLoaded = true;
-		} catch (Exception \$e) {
-			throw new PropelException(\"Error loading value for [$clo] column on demand.\", \$e);
-		}";
-	}
-
-	/**
-	 * Adds the function close for the lazy loader
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addLazyLoader()
-	 **/
-	protected function addLazyLoaderClose(&$script, Column $col) {
-		$script .= "
-	}";
-	} // addLazyLoader()
-
-	// --------------------------------------------------------------
-	//
-	// M U T A T O R    M E T H O D S
-	//
-	// --------------------------------------------------------------
-
-	/**
-	 * Adds the open of the mutator (setter) method for a column.
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 */
-	protected function addMutatorOpen(&$script, Column $col)
-	{
-		$this->addMutatorComment($script, $col);
-		$this->addMutatorOpenOpen($script, $col);
-		$this->addMutatorOpenBody($script, $col);
-	}
-
-	/**
-	 * Adds the comment for a mutator
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addMutatorOpen()
-	 **/
-	protected function addMutatorComment(&$script, Column $col) {
-		$clo = strtolower($col->getName());
-		$script .= "
-	/**
-	 * Set the value of [$clo] column.
-	 * ".$col->getDescription()."
-	 * @param      ".$col->getPhpType()." \$v new value
-	 * @return     ".$this->getObjectClassname()." The current object (for fluent API support)
-	 */";
-	}
-
-	/**
-	 * Adds the mutator function declaration
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addMutatorOpen()
-	 **/
-	protected function addMutatorOpenOpen(&$script, Column $col) {
-		$cfc = $col->getPhpName();
-		$visibility = $col->getMutatorVisibility();
-
-		$script .= "
-	".$visibility." function set$cfc(\$v)
-	{";
-	}
-
-	/**
-	 * Adds the mutator open body part
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addMutatorOpen()
-	 **/
-	protected function addMutatorOpenBody(&$script, Column $col) {
-		$clo = strtolower($col->getName());
-				$cfc = $col->getPhpName();
-		if ($col->isLazyLoad()) {
-			$script .= "
-		// explicitly set the is-loaded flag to true for this lazy load col;
-		// it doesn't matter if the value is actually set or not (logic below) as
-		// any attempt to set the value means that no db lookup should be performed
-		// when the get$cfc() method is called.
-		\$this->".$clo."_isLoaded = true;
-";
-		}
-	}
-
-	/**
-	 * Adds the close of the mutator (setter) method for a column.
-	 *
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 */
-	protected function addMutatorClose(&$script, Column $col)
-	{
-		$this->addMutatorCloseBody($script, $col);
-		$this->addMutatorCloseClose($script, $col);
-	}
-
-	/**
-	 * Adds the body of the close part of a mutator
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addMutatorClose()
-	 **/
-	protected function addMutatorCloseBody(&$script, Column $col) {
-		$table = $this->getTable();
-		$cfc = $col->getPhpName();
-		$clo = strtolower($col->getName());
-
-		if ($col->isForeignKey()) {
-
-			foreach ($col->getForeignKeys() as $fk) {
-
-				$tblFK =  $table->getDatabase()->getTable($fk->getForeignTableName());
-				$colFK = $tblFK->getColumn($fk->getMappedForeignColumn($col->getName()));
-
-				$varName = $this->getFKVarName($fk);
-
-				$script .= "
-		if (\$this->$varName !== null && \$this->".$varName."->get".$colFK->getPhpName()."() !== \$v) {
-			\$this->$varName = null;
-		}
-";
-			} // foreach fk
-		} /* if col is foreign key */
-
-		foreach ($col->getReferrers() as $refFK) {
-
-			$tblFK = $this->getDatabase()->getTable($refFK->getForeignTableName());
-
-			if ( $tblFK->getName() != $table->getName() ) {
-
-				foreach ($col->getForeignKeys() as $fk) {
-
-					$tblFK = $table->getDatabase()->getTable($fk->getForeignTableName());
-					$colFK = $tblFK->getColumn($fk->getMappedForeignColumn($col->getName()));
-
-					if ($refFK->isLocalPrimaryKey()) {
-						$varName = $this->getPKRefFKVarName($refFK);
-						$script .= "
-		// update associated ".$tblFK->getPhpName()."
-		if (\$this->$varName !== null) {
-			\$this->{$varName}->set".$colFK->getPhpName()."(\$v);
-		}
-";
-					} else {
-						$collName = $this->getRefFKCollVarName($refFK);
-						$script .= "
-
-		// update associated ".$tblFK->getPhpName()."
-		if (\$this->$collName !== null) {
-			foreach (\$this->$collName as \$referrerObject) {
-				  \$referrerObject->set".$colFK->getPhpName()."(\$v);
-			  }
-		  }
-";
-					} // if (isLocalPrimaryKey
-				} // foreach col->getPrimaryKeys()
-			} // if tablFk != table
-
-		} // foreach
-	}
-
-	/**
-	 * Adds the close for the mutator close
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        addMutatorClose()
-	 **/
-	protected function addMutatorCloseClose(&$script, Column $col) {
-		$cfc = $col->getPhpName();
-		$script .= "
-		return \$this;
-	} // set$cfc()
-";
-	}
-
-	/**
-	 * Adds a setter for BLOB columns.
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        parent::addColumnMutators()
-	 */
-	protected function addLobMutator(&$script, Column $col)
-	{
-		$this->addMutatorOpen($script, $col);
-		$clo = strtolower($col->getName());
-		$script .= "
-		// Because BLOB columns are streams in PDO we have to assume that they are
-		// always modified when a new value is passed in.  For example, the contents
-		// of the stream itself may have changed externally.
-		if (!is_resource(\$v) && \$v !== null) {
-			\$this->$clo = fopen('php://memory', 'r+');
-			fwrite(\$this->$clo, \$v);
-			rewind(\$this->$clo);
-		} else { // it's already a stream
-			\$this->$clo = \$v;
-		}
-		\$this->modifiedColumns[] = ".$this->getColumnConstant($col).";
-";
-		$this->addMutatorClose($script, $col);
-	} // addLobMutatorSnippet
-
-	/**
-	 * Adds a setter method for date/time/timestamp columns.
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        parent::addColumnMutators()
-	 */
-	protected function addTemporalMutator(&$script, Column $col)
-	{
-		$cfc = $col->getPhpName();
-		$clo = strtolower($col->getName());
-		$visibility = $col->getMutatorVisibility();
-
-		$dateTimeClass = $this->getBuildProperty('dateTimeClass');
-		if (!$dateTimeClass) {
-			$dateTimeClass = 'DateTime';
-		}
-
-		$script .= "
-	/**
-	 * Sets the value of [$clo] column to a normalized version of the date/time value specified.
-	 * ".$col->getDescription()."
-	 * @param      mixed \$v string, integer (timestamp), or DateTime value.  Empty string will
-	 *						be treated as NULL for temporal objects.
-	 * @return     ".$this->getObjectClassname()." The current object (for fluent API support)
-	 */
-	".$visibility." function set$cfc(\$v)
-	{";
-		if ($col->isLazyLoad()) {
-			$script .= "
-		// explicitly set the is-loaded flag to true for this lazy load col;
-		// it doesn't matter if the value is actually set or not (logic below) as
-		// any attempt to set the value means that no db lookup should be performed
-		// when the get$cfc() method is called.
-		\$this->".$clo."_isLoaded = true;
-";
-		}
-
-		$fmt = var_export($this->getTemporalFormatter($col), true);
-
-		$script .= "
-		// we treat '' as NULL for temporal objects because DateTime('') == DateTime('now')
-		// -- which is unexpected, to say the least.
-		if (\$v === null || \$v === '') {
-			\$dt = null;
-		} elseif (\$v instanceof DateTime) {
-			\$dt = \$v;
-		} else {
-			// some string/numeric value passed; we normalize that so that we can
-			// validate it.
-			try {
-				if (is_numeric(\$v)) { // if it's a unix timestamp
-					\$dt = new $dateTimeClass('@'.\$v, new DateTimeZone('UTC'));
-					// We have to explicitly specify and then change the time zone because of a
-					// DateTime bug: http://bugs.php.net/bug.php?id=43003
-					\$dt->setTimeZone(new DateTimeZone(date_default_timezone_get()));
-				} else {
-					\$dt = new $dateTimeClass(\$v);
-				}
-			} catch (Exception \$x) {
-				throw new PropelException('Error parsing date/time value: ' . var_export(\$v, true), \$x);
-			}
-		}
-
-		if ( \$this->$clo !== null || \$dt !== null ) {
-			// (nested ifs are a little easier to read in this case)
-
-			\$currNorm = (\$this->$clo !== null && \$tmpDt = new $dateTimeClass(\$this->$clo)) ? \$tmpDt->format($fmt) : null;
-			\$newNorm = (\$dt !== null) ? \$dt->format($fmt) : null;
-
-			if ( (\$currNorm !== \$newNorm) // normalized values don't match ";
-
-		if (($def = $col->getDefaultValue()) !== null && !$def->isExpression()) {
-			$defaultValue = $this->getDefaultValueString($col);
-			$script .= "
-					|| (\$dt->format($fmt) === $defaultValue) // or the entered value matches the default";
-		}
-
-		$script .= "
-					)
-			{
-				\$this->$clo = (\$dt ? \$dt->format($fmt) : null);
-				\$this->modifiedColumns[] = ".$this->getColumnConstant($col).";
-			}
-		} // if either are not null
-";
-		$this->addMutatorClose($script, $col);
-	}
-
-	/**
-	 * Adds setter method for "normal" columns.
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      Column $col The current column.
-	 * @see        parent::addColumnMutators()
-	 */
-	protected function addDefaultMutator(&$script, Column $col)
-	{
-		$clo = strtolower($col->getName());
-
-		$this->addMutatorOpen($script, $col);
-
-		// Perform type-casting to ensure that we can use type-sensitive
-		// checking in mutators.
-		if ($col->isPhpPrimitiveType()) {
-			$script .= "
-		if (\$v !== null) {
-			\$v = (".$col->getPhpType().") \$v;
-		}
-";
-		}
-
-		$script .= "
-		if (\$this->$clo !== \$v";
-		if (($def = $col->getDefaultValue()) !== null && !$def->isExpression()) {
-			$script .= " || \$this->isNew()";
-		}
-		$script .= ") {
-			\$this->$clo = \$v;
-			\$this->modifiedColumns[] = ".$this->getColumnConstant($col).";
-		}
-";
-		$this->addMutatorClose($script, $col);
-	}
-
-	/**
-	 * Adds the hasOnlyDefaultValues() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addHasOnlyDefaultValues(&$script)
-	{
-		$this->addHasOnlyDefaultValuesComment($script);
-		$this->addHasOnlyDefaultValuesOpen($script);
-		$this->addHasOnlyDefaultValuesBody($script);
-		$this->addHasOnlyDefaultValuesClose($script);
-	}
-
-	/**
-	 * Adds the comment for the hasOnlyDefaultValues method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addHasOnlyDefaultValues
-	 **/
-	protected function addHasOnlyDefaultValuesComment(&$script) {
-		$script .= "
-	/**
-	 * Indicates whether the columns in this object are only set to default values.
-	 *
-	 * This method can be used in conjunction with isModified() to indicate whether an object is both
-	 * modified _and_ has some values set which are non-default.
-	 *
-	 * @return     boolean Whether the columns in this object are only been set with default values.
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration for the hasOnlyDefaultValues method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addHasOnlyDefaultValues
-	 **/
-	protected function addHasOnlyDefaultValuesOpen(&$script) {
-		$script .= "
-	public function hasOnlyDefaultValues()
-	{";
-	}
-
-	/**
-	 * Adds the function body for the hasOnlyDefaultValues method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addHasOnlyDefaultValues
-	 **/
-	protected function addHasOnlyDefaultValuesBody(&$script) {
-		$table = $this->getTable();
-		$colsWithDefaults = array();
-		foreach ($table->getColumns() as $col) {
-			$def = $col->getDefaultValue();
-			if ($def !== null && !$def->isExpression()) {
-				$colsWithDefaults[] = $col;
-			}
-		}
-
-		foreach ($colsWithDefaults as $col) {
-
-			$clo = strtolower($col->getName());
-			$def = $col->getDefaultValue();
-
-			$script .= "
-			if (\$this->$clo !== " . $this->getDefaultValueString($col).") {
-				return false;
-			}
-";
-		}
-	}
-
-	/**
-	 * Adds the function close for the hasOnlyDefaultValues method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addHasOnlyDefaultValues
-	 **/
-	protected function addHasOnlyDefaultValuesClose(&$script) {
-		$script .= "
-		// otherwise, everything was equal, so return TRUE
-		return true;";
-		$script .= "
-	} // hasOnlyDefaultValues()
-";
-	}
-
-	/**
-	 * Adds the hydrate() method, which sets attributes of the object based on a ResultSet.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addHydrate(&$script)
-	{
-		$this->addHydrateComment($script);
-		$this->addHydrateOpen($script);
-		$this->addHydrateBody($script);
-		$this->addHydrateClose($script);
-	}
-
-	/**
-	 * Adds the comment for the hydrate method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addHydrate()
-	 */
-	protected function addHydrateComment(&$script) {
-		$script .= "
-	/**
-	 * Hydrates (populates) the object variables with values from the database resultset.
-	 *
-	 * An offset (0-based \"start column\") is specified so that objects can be hydrated
-	 * with a subset of the columns in the resultset rows.  This is needed, for example,
-	 * for results of JOIN queries where the resultset row includes columns from two or
-	 * more tables.
-	 *
-	 * @param      array \$row The row returned by PDOStatement->fetch(PDO::FETCH_NUM)
-	 * @param      int \$startcol 0-based offset column which indicates which restultset column to start with.
-	 * @param      boolean \$rehydrate Whether this object is being re-hydrated from the database.
-	 * @return     int next starting column
-	 * @throws     PropelException  - Any caught Exception will be rewrapped as a PropelException.
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration for the hydrate method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addHydrate()
-	 */
-	protected function addHydrateOpen(&$script) {
-		$script .= "
-	public function hydrate(\$row, \$startcol = 0, \$rehydrate = false)
-	{";
-	}
-
-	/**
-	 * Adds the function body for the hydrate method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addHydrate()
-	 */
-	protected function addHydrateBody(&$script) {
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-		$script .= "
-		try {
-";
-		$n = 0;
-		foreach ($table->getColumns() as $col) {
-			if (!$col->isLazyLoad()) {
-				$clo = strtolower($col->getName());
-				if ($col->isLobType() && !$platform->hasStreamBlobImpl()) {
-					$script .= "
-			if (\$row[\$startcol + $n] !== null) {
-				\$this->$clo = fopen('php://memory', 'r+');
-				fwrite(\$this->$clo, \$row[\$startcol + $n]);
-				rewind(\$this->$clo);
-			} else {
-				\$this->$clo = null;
-			}";
-				} elseif ($col->isPhpPrimitiveType()) {
-					$script .= "
-			\$this->$clo = (\$row[\$startcol + $n] !== null) ? (".$col->getPhpType().") \$row[\$startcol + $n] : null;";
-				} elseif ($col->isPhpObjectType()) {
-					$script .= "
-			\$this->$clo = (\$row[\$startcol + $n] !== null) ? new ".$col->getPhpType()."(\$row[\$startcol + $n]) : null;";
-				} else {
-					$script .= "
-			\$this->$clo = \$row[\$startcol + $n];";
-				}
-				$n++;
-			} // if col->isLazyLoad()
-		} /* foreach */
-
-		if ($this->getBuildProperty("addSaveMethod")) {
-			$script .= "
-			\$this->resetModified();
-";
-		}
-
-		$script .= "
-			\$this->setNew(false);
-
-			if (\$rehydrate) {
-				\$this->ensureConsistency();
-			}
-
-			// FIXME - using NUM_COLUMNS may be clearer.
-			return \$startcol + $n; // $n = ".$this->getPeerClassname()."::NUM_COLUMNS - ".$this->getPeerClassname()."::NUM_LAZY_LOAD_COLUMNS).
-
-		} catch (Exception \$e) {
-			throw new PropelException(\"Error populating ".$this->getStubObjectBuilder()->getClassname()." object\", \$e);
-		}";
-	}
-
-	/**
-	 * Adds the function close for the hydrate method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addHydrate()
-	 */
-	protected function addHydrateClose(&$script) {
-		$script .= "
-	}
-";
-	}
-
-	/**
-	 * Adds the buildPkeyCriteria method
-	 * @param      string &$script The script will be modified in this method.
-	 **/
-	protected function addBuildPkeyCriteria(&$script) {
-		$this->addBuildPkeyCriteriaComment($script);
-		$this->addBuildPkeyCriteriaOpen($script);
-		$this->addBuildPkeyCriteriaBody($script);
-		$this->addBuildPkeyCriteriaClose($script);
-	}
-
-	/**
-	 * Adds the comment for the buildPkeyCriteria method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addBuildPkeyCriteria()
-	 **/
-	protected function addBuildPkeyCriteriaComment(&$script) {
-		$script .= "
-	/**
-	 * Builds a Criteria object containing the primary key for this object.
-	 *
-	 * Unlike buildCriteria() this method includes the primary key values regardless
-	 * of whether or not they have been modified.
-	 *
-	 * @return     Criteria The Criteria object containing value(s) for primary key(s).
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration for the buildPkeyCriteria method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addBuildPkeyCriteria()
-	 **/
-	protected function addBuildPkeyCriteriaOpen(&$script) {
-		$script .= "
-	public function buildPkeyCriteria()
-	{";
-	}
-
-	/**
-	 * Adds the function body for the buildPkeyCriteria method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addBuildPkeyCriteria()
-	 **/
-	protected function addBuildPkeyCriteriaBody(&$script) {
-		$script .= "
-		\$criteria = new Criteria(".$this->getPeerClassname()."::DATABASE_NAME);
-";
-		foreach ($this->getTable()->getColumns() as $col) {
-			$clo = strtolower($col->getName());
-			if ($col->isPrimaryKey()) {
-				$script .= "
-		\$criteria->add(".$this->getColumnConstant($col).", \$this->$clo);";
-			}
-		}
-	}
-
-	/**
-	 * Adds the function close for the buildPkeyCriteria method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addBuildPkeyCriteria()
-	 **/
-	protected function addBuildPkeyCriteriaClose(&$script) {
-		$script .= "
-
-		return \$criteria;
-	}
-";
-	}
-
-	/**
-	 * Adds the buildCriteria method
-	 * @param      string &$script The script will be modified in this method.
-	 **/
-	protected function addBuildCriteria(&$script)
-	{
-		$this->addBuildCriteriaComment($script);
-		$this->addBuildCriteriaOpen($script);
-		$this->addBuildCriteriaBody($script);
-		$this->addBuildCriteriaClose($script);
-	}
-
-	/**
-	 * Adds comment for the buildCriteria method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addBuildCriteria()
-	 **/
-	protected function addBuildCriteriaComment(&$script) {
-		$script .= "
-	/**
-	 * Build a Criteria object containing the values of all modified columns in this object.
-	 *
-	 * @return     Criteria The Criteria object containing all modified values.
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration of the buildCriteria method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addBuildCriteria()
-	 **/
-	protected function addBuildCriteriaOpen(&$script) {
-		$script .= "
-	public function buildCriteria()
-	{";
-	}
-
-	/**
-	 * Adds the function body of the buildCriteria method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addBuildCriteria()
-	 **/
-	protected function addBuildCriteriaBody(&$script) {
-		$script .= "
-		\$criteria = new Criteria(".$this->getPeerClassname()."::DATABASE_NAME);
-";
-		foreach ($this->getTable()->getColumns() as $col) {
-			$clo = strtolower($col->getName());
-			$script .= "
-		if (\$this->isColumnModified(".$this->getColumnConstant($col).")) \$criteria->add(".$this->getColumnConstant($col).", \$this->$clo);";
-		}
-	}
-
-	/**
-	 * Adds the function close of the buildCriteria method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addBuildCriteria()
-	 **/
-	protected function addBuildCriteriaClose(&$script) {
-		$script .= "
-
-		return \$criteria;
-	}
-";
-	}
-
-	/**
-	 * Adds the toArray method
-	 * @param      string &$script The script will be modified in this method.
-	 **/
-	protected function addToArray(&$script)
-	{
-		$this->addToArrayComment($script);
-		$this->addToArrayOpen($script);
-		$this->addToArrayBody($script);
-		$this->addToArrayClose($script);
-	}
-
-	/**
-	 * Adds the comment of the toArray method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addToArray()
-	 **/
-	protected function addToArrayComment(&$script) {
-		$script .= "
-	/**
-	 * Exports the object as an array.
-	 *
-	 * You can specify the key type of the array by passing one of the class
-	 * type constants.
-	 *
-	 * @param      string \$keyType (optional) One of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME
-	 *                        BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. Defaults to BasePeer::TYPE_PHPNAME.
-	 * @param      boolean \$includeLazyLoadColumns (optional) Whether to include lazy loaded columns.  Defaults to TRUE.
-	 * @return     an associative array containing the field names (as keys) and field values
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration of the toArray method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addToArray()
-	 **/
-	protected function addToArrayOpen(&$script) {
-		$script .= "
-	public function toArray(\$keyType = BasePeer::TYPE_PHPNAME, \$includeLazyLoadColumns = true)
-	{";
-	}
-
-	/**
-	 * Adds the function body of the toArray method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addToArray()
-	 **/
-	protected function addToArrayBody(&$script) {
-		$script .= "
-		\$keys = ".$this->getPeerClassname()."::getFieldNames(\$keyType);
-		\$result = array(";
-		foreach ($this->getTable()->getColumns() as $num => $col) {
-			if ($col->isLazyLoad()) {
-				 $script .= "
-			\$keys[$num] => (\$includeLazyLoadColumns) ? \$this->get".$col->getPhpName()."() : null,";
-			} else {
-				$script .= "
-			\$keys[$num] => \$this->get".$col->getPhpName()."(),";
-			}
-		}
-		$script .= "
-		);";
-	}
-
-	/**
-	 * Adds the function close of the toArray method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addToArray()
-	 **/
-	protected function addToArrayClose(&$script) {
-		$script .= "
-		return \$result;
-	}
-";
-	} // addToArray()
-
-	/**
-	 * Adds the getByName method
-	 * @param      string &$script The script will be modified in this method.
-	 **/
-	protected function addGetByName(&$script)
-	{
-		$this->addGetByNameComment($script);
-		$this->addGetByNameOpen($script);
-		$this->addGetByNameBody($script);
-		$this->addGetByNameClose($script);
-	}
-
-	/**
-	 * Adds the comment for the getByName method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addGetByName
-	 **/
-	protected function addGetByNameComment(&$script) {
-		$script .= "
-	/**
-	 * Retrieves a field from the object by name passed in as a string.
-	 *
-	 * @param      string \$name name
-	 * @param      string \$type The type of fieldname the \$name is of:
-	 *                     one of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME
-	 *                     BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM
-	 * @return     mixed Value of field.
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration for the getByName method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addGetByName
-	 **/
-	protected function addGetByNameOpen(&$script) {
-		$script .= "
-	public function getByName(\$name, \$type = BasePeer::TYPE_PHPNAME)
-	{";
-	}
-
-	/**
-	 * Adds the function body for the getByName method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addGetByName
-	 **/
-	protected function addGetByNameBody(&$script) {
-		$script .= "
-		\$pos = ".$this->getPeerClassname()."::translateFieldName(\$name, \$type, BasePeer::TYPE_NUM);
-		\$field = \$this->getByPosition(\$pos);";
-	}
-
-	/**
-	 * Adds the function close for the getByName method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addGetByName
-	 **/
-	protected function addGetByNameClose(&$script) {
-		$script .= "
-		return \$field;
-	}
-";
-	}
-
-	/**
-	 * Adds the getByPosition method
-	 * @param      string &$script The script will be modified in this method.
-	 **/
-	protected function addGetByPosition(&$script)
-	{
-		$this->addGetByPositionComment($script);
-		$this->addGetByPositionOpen($script);
-		$this->addGetByPositionBody($script);
-		$this->addGetByPositionClose($script);
-	}
-
-	/**
-	 * Adds comment for the getByPosition method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addGetByPosition
-	 **/
-	protected function addGetByPositionComment(&$script) {
-		$script .= "
-	/**
-	 * Retrieves a field from the object by Position as specified in the xml schema.
-	 * Zero-based.
-	 *
-	 * @param      int \$pos position in xml schema
-	 * @return     mixed Value of field at \$pos
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration for the getByPosition method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addGetByPosition
-	 **/
-	protected function addGetByPositionOpen(&$script) {
-		$script .= "
-	public function getByPosition(\$pos)
-	{";
-	}
-
-	/**
-	 * Adds the function body for the getByPosition method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addGetByPosition
-	 **/
-	protected function addGetByPositionBody(&$script) {
-		$table = $this->getTable();
-		$script .= "
-		switch(\$pos) {";
-		$i = 0;
-		foreach ($table->getColumns() as $col) {
-			$cfc = $col->getPhpName();
-			$cptype = $col->getPhpType();// not safe to use it because some methods may return objects (Blob)
-			$script .= "
-			case $i:
-				return \$this->get$cfc();
-				break;";
-			$i++;
-		} /* foreach */
-		$script .= "
-			default:
-				return null;
-				break;
-		} // switch()";
-	}
-
-	/**
-	 * Adds the function close for the getByPosition method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addGetByPosition
-	 **/
-	protected function addGetByPositionClose(&$script) {
-		$script .= "
-	}
-";
-	}
-
-	protected function addSetByName(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Sets a field from the object by name passed in as a string.
-	 *
-	 * @param      string \$name peer name
-	 * @param      mixed \$value field value
-	 * @param      string \$type The type of fieldname the \$name is of:
-	 *                     one of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME
-	 *                     BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM
-	 * @return     void
-	 */
-	public function setByName(\$name, \$value, \$type = BasePeer::TYPE_PHPNAME)
-	{
-		\$pos = ".$this->getPeerClassname()."::translateFieldName(\$name, \$type, BasePeer::TYPE_NUM);
-		return \$this->setByPosition(\$pos, \$value);
-	}
-";
-	}
-
-	protected function addSetByPosition(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Sets a field from the object by Position as specified in the xml schema.
-	 * Zero-based.
-	 *
-	 * @param      int \$pos position in xml schema
-	 * @param      mixed \$value field value
-	 * @return     void
-	 */
-	public function setByPosition(\$pos, \$value)
-	{
-		switch(\$pos) {";
-		$i = 0;
-		foreach ($table->getColumns() as $col) {
-			$cfc = $col->getPhpName();
-			$cptype = $col->getPhpType();
-			$script .= "
-			case $i:
-				\$this->set$cfc(\$value);
-				break;";
-			$i++;
-		} /* foreach */
-		$script .= "
-		} // switch()
-	}
-";
-	} // addSetByPosition()
-
-	protected function addFromArray(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Populates the object using an array.
-	 *
-	 * This is particularly useful when populating an object from one of the
-	 * request arrays (e.g. \$_POST).  This method goes through the column
-	 * names, checking to see whether a matching key exists in populated
-	 * array. If so the setByName() method is called for that column.
-	 *
-	 * You can specify the key type of the array by additionally passing one
-	 * of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME,
-	 * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM.
-	 * The default key type is the column's phpname (e.g. 'AuthorId')
-	 *
-	 * @param      array  \$arr     An array to populate the object from.
-	 * @param      string \$keyType The type of keys the array uses.
-	 * @return     void
-	 */
-	public function fromArray(\$arr, \$keyType = BasePeer::TYPE_PHPNAME)
-	{
-		\$keys = ".$this->getPeerClassname()."::getFieldNames(\$keyType);
-";
-		foreach ($table->getColumns() as $num => $col) {
-			$cfc = $col->getPhpName();
-			$cptype = $col->getPhpType();
-			$script .= "
-		if (array_key_exists(\$keys[$num], \$arr)) \$this->set$cfc(\$arr[\$keys[$num]]);";
-		} /* foreach */
-		$script .= "
-	}
-";
-	} // addFromArray
-
-	/**
-	 * Adds a delete() method to remove the object form the datastore.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDelete(&$script)
-	{
-		$this->addDeleteComment($script);
-		$this->addDeleteOpen($script);
-		$this->addDeleteBody($script);
-		$this->addDeleteClose($script);
-	}
-
-	/**
-	 * Adds the comment for the delete function
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addDelete()
-	 **/
-	protected function addDeleteComment(&$script) {
-		$script .= "
-	/**
-	 * Removes this object from datastore and sets delete attribute.
-	 *
-	 * @param      PropelPDO \$con
-	 * @return     void
-	 * @throws     PropelException
-	 * @see        BaseObject::setDeleted()
-	 * @see        BaseObject::isDeleted()
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration for the delete function
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addDelete()
-	 **/
-	protected function addDeleteOpen(&$script) {
-		$script .= "
-	public function delete(PropelPDO \$con = null)
-	{";
-	}
-
-	/**
-	 * Adds the function body for the delete function
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addDelete()
-	 **/
-	protected function addDeleteBody(&$script) {
-		$script .= "
-		if (\$this->isDeleted()) {
-			throw new PropelException(\"This object has already been deleted.\");
-		}
-
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_WRITE);
-		}
-		
-		\$con->beginTransaction();
-		try {";
-		if($this->getGeneratorConfig()->getBuildProperty('addHooks')) {
-			$script .= "
-			\$ret = \$this->preDelete(\$con);";
-			// apply behaviors
-			$this->applyBehaviorModifier('preDelete', $script, "			");
-			$script .= "
-			if (\$ret) {
-				".$this->getPeerClassname()."::doDelete(\$this, \$con);
-				\$this->postDelete(\$con);";
-			// apply behaviors
-			$this->applyBehaviorModifier('postDelete', $script, "				");
-			$script .= "
-				\$this->setDeleted(true);
-				\$con->commit();
-			} else {
-				\$con->commit();
-			}";
-		} else {
-			// apply behaviors
-			$this->applyBehaviorModifier('preDelete', $script, "			");
-			$script .= "
-			".$this->getPeerClassname()."::doDelete(\$this, \$con);";
-			// apply behaviors
-			$this->applyBehaviorModifier('postDelete', $script, "			");
-			$script .= "
-			\$this->setDeleted(true);
-			\$con->commit();";
-		}
-
-		$script .= "
-		} catch (PropelException \$e) {
-			\$con->rollBack();
-			throw \$e;
-		}";
-	}
-
-	/**
-	 * Adds the function close for the delete function
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addDelete()
-	 **/
-	protected function addDeleteClose(&$script) {
-		$script .= "
-	}
-";
-	} // addDelete()
-
-	/**
-	 * Adds a reload() method to re-fetch the data for this object from the database.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addReload(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Reloads this object from datastore based on primary key and (optionally) resets all associated objects.
-	 *
-	 * This will only work if the object has been saved and has a valid primary key set.
-	 *
-	 * @param      boolean \$deep (optional) Whether to also de-associated any related objects.
-	 * @param      PropelPDO \$con (optional) The PropelPDO connection to use.
-	 * @return     void
-	 * @throws     PropelException - if this object is deleted, unsaved or doesn't have pk match in db
-	 */
-	public function reload(\$deep = false, PropelPDO \$con = null)
-	{
-		if (\$this->isDeleted()) {
-			throw new PropelException(\"Cannot reload a deleted object.\");
-		}
-
-		if (\$this->isNew()) {
-			throw new PropelException(\"Cannot reload an unsaved object.\");
-		}
-
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_READ);
-		}
-
-		// We don't need to alter the object instance pool; we're just modifying this instance
-		// already in the pool.
-
-		\$stmt = ".$this->getPeerClassname()."::doSelectStmt(\$this->buildPkeyCriteria(), \$con);
-		\$row = \$stmt->fetch(PDO::FETCH_NUM);
-		\$stmt->closeCursor();
-		if (!\$row) {
-			throw new PropelException('Cannot find matching row in the database to reload object values.');
-		}
-		\$this->hydrate(\$row, 0, true); // rehydrate
-";
-
-		// support for lazy load columns
-		foreach ($table->getColumns() as $col) {
-			if ($col->isLazyLoad()) {
-				$clo = strtolower($col->getName());
-				$script .= "
-		// Reset the $clo lazy-load column
-		\$this->" . $clo . " = null;
-		\$this->".$clo."_isLoaded = false;
-";
-			}
-		}
-
-		$script .= "
-		if (\$deep) {  // also de-associate any related objects?
-";
-
-		foreach ($table->getForeignKeys() as $fk) {
-			$varName = $this->getFKVarName($fk);
-			$script .= "
-			\$this->".$varName." = null;";
-		}
-
-		foreach ($table->getReferrers() as $refFK) {
-			if ($refFK->isLocalPrimaryKey()) {
-				$script .= "
-			\$this->".$this->getPKRefFKVarName($refFK)." = null;
-";
-			} else {
-				$script .= "
-			\$this->".$this->getRefFKCollVarName($refFK)." = null;
-			\$this->".$this->getRefFKLastCriteriaVarName($refFK)." = null;
-";
-			}
-		}
-
-		$script .= "
-		} // if (deep)
-	}
-";
-	} // addReload()
-
-	/**
-	 * Adds the methods related to refreshing, saving and deleting the object.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addManipulationMethods(&$script)
-	{
-		$this->addReload($script);
-		$this->addDelete($script);
-		$this->addSave($script);
-		$this->addDoSave($script);
-	}
-
-	/**
-	 * Adds the methods related to validationg the object.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addValidationMethods(&$script)
-	{
-		$this->addValidationFailuresAttribute($script);
-		$this->addGetValidationFailures($script);
-		$this->addValidate($script);
-		$this->addDoValidate($script);
-	}
-
-	/**
-	 * Adds the $validationFailures attribute to store ValidationFailed objects.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addValidationFailuresAttribute(&$script)
-	{
-		$script .= "
-	/**
-	 * Array of ValidationFailed objects.
-	 * @var        array ValidationFailed[]
-	 */
-	protected \$validationFailures = array();
-";
-	}
-
-	/**
-	 * Adds the getValidationFailures() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetValidationFailures(&$script)
-	{
-		$script .= "
-	/**
-	 * Gets any ValidationFailed objects that resulted from last call to validate().
-	 *
-	 *
-	 * @return     array ValidationFailed[]
-	 * @see        validate()
-	 */
-	public function getValidationFailures()
-	{
-		return \$this->validationFailures;
-	}
-";
-	} // addGetValidationFailures()
-
-	/**
-	 * Adds the correct getPrimaryKey() method for this object.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetPrimaryKey(&$script)
-	{
-		$pkeys = $this->getTable()->getPrimaryKey();
-		if (count($pkeys) == 1) {
-			$this->addGetPrimaryKey_SinglePK($script);
-		} elseif (count($pkeys) > 1) {
-			$this->addGetPrimaryKey_MultiPK($script);
-		} else {
-			// no primary key -- this is deprecated, since we don't *need* this method anymore
-			$this->addGetPrimaryKey_NoPK($script);
-		}
-	}
-
-	/**
-	 * Adds the getPrimaryKey() method for tables that contain a single-column primary key.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetPrimaryKey_SinglePK(&$script)
-	{
-		$table = $this->getTable();
-		$pkeys = $table->getPrimaryKey();
-		$cptype = $pkeys[0]->getPhpType();
-
-		$script .= "
-	/**
-	 * Returns the primary key for this object (row).
-	 * @return     $cptype
-	 */
-	public function getPrimaryKey()
-	{
-		return \$this->get".$pkeys[0]->getPhpName()."();
-	}
-";
-	} // addetPrimaryKey_SingleFK
-
-	/**
-	 * Adds the setPrimaryKey() method for tables that contain a multi-column primary key.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetPrimaryKey_MultiPK(&$script)
-	{
-
-		$script .= "
-	/**
-	 * Returns the composite primary key for this object.
-	 * The array elements will be in same order as specified in XML.
-	 * @return     array
-	 */
-	public function getPrimaryKey()
-	{
-		\$pks = array();
-";
-		$i = 0;
-		foreach ($this->getTable()->getPrimaryKey() as $pk) {
-			$script .= "
-		\$pks[$i] = \$this->get".$pk->getPhpName()."();
-";
-			$i++;
-		} /* foreach */
-		$script .= "
-		return \$pks;
-	}
-";
-	} // addGetPrimaryKey_MultiFK()
-
-	/**
-	 * Adds the getPrimaryKey() method for objects that have no primary key.
-	 * This "feature" is dreprecated, since the getPrimaryKey() method is not required
-	 * by the Persistent interface (or used by the templates).  Hence, this method is also
-	 * deprecated.
-	 * @param      string &$script The script will be modified in this method.
-	 * @deprecated
-	 */
-	protected function addGetPrimaryKey_NoPK(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns NULL since this table doesn't have a primary key.
-	 * This method exists only for BC and is deprecated!
-	 * @return     null
-	 */
-	public function getPrimaryKey()
-	{
-		return null;
-	}
-";
-	}
-	/**
-	 * Adds the correct setPrimaryKey() method for this object.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addSetPrimaryKey(&$script)
-	{
-		$pkeys = $this->getTable()->getPrimaryKey();
-		if (count($pkeys) == 1) {
-			$this->addSetPrimaryKey_SinglePK($script);
-		} elseif (count($pkeys) > 1) {
-			$this->addSetPrimaryKey_MultiPK($script);
-		} else {
-			// no primary key -- this is deprecated, since we don't *need* this method anymore
-			$this->addSetPrimaryKey_NoPK($script);
-		}
-	}
-
-	/**
-	 * Adds the setPrimaryKey() method for tables that contain a single-column primary key.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addSetPrimaryKey_SinglePK(&$script)
-	{
-
-		$pkeys = $this->getTable()->getPrimaryKey();
-		$col = $pkeys[0];
-		$clo=strtolower($col->getName());
-		$ctype = $col->getPhpType();
-
-		$script .= "
-	/**
-	 * Generic method to set the primary key ($clo column).
-	 *
-	 * @param      $ctype \$key Primary key.
-	 * @return     void
-	 */
-	public function setPrimaryKey(\$key)
-	{
-		\$this->set".$col->getPhpName()."(\$key);
-	}
-";
-	} // addSetPrimaryKey_SinglePK
-
-	/**
-	 * Adds the setPrimaryKey() method for tables that contain a multi-columnprimary key.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addSetPrimaryKey_MultiPK(&$script)
-	{
-
-		$script .="
-	/**
-	 * Set the [composite] primary key.
-	 *
-	 * @param      array \$keys The elements of the composite key (order must match the order in XML file).
-	 * @return     void
-	 */
-	public function setPrimaryKey(\$keys)
-	{
-";
-		$i = 0;
-		foreach ($this->getTable()->getPrimaryKey() as $pk) {
-			$pktype = $pk->getPhpType();
-			$script .= "
-		\$this->set".$pk->getPhpName()."(\$keys[$i]);
-";
-			$i++;
-		} /* foreach ($table->getPrimaryKey() */
-		$script .= "
-	}
-";
-	} // addSetPrimaryKey_MultiPK
-
-	/**
-	 * Adds the setPrimaryKey() method for objects that have no primary key.
-	 * This "feature" is dreprecated, since the setPrimaryKey() method is not required
-	 * by the Persistent interface (or used by the templates).  Hence, this method is also
-	 * deprecated.
-	 * @param      string &$script The script will be modified in this method.
-	 * @deprecated
-	 */
-	protected function addSetPrimaryKey_NoPK(&$script)
-	{
-		$script .="
-	/**
-	 * Dummy primary key setter.
-	 *
-	 * This function only exists to preserve backwards compatibility.  It is no longer
-	 * needed or required by the Persistent interface.  It will be removed in next BC-breaking
-	 * release of Propel.
-	 *
-	 * @deprecated
-	 */
-	 public function setPrimaryKey(\$pk)
-	 {
-		 // do nothing, because this object doesn't have any primary keys
-	 }
-";
-	}
-
-	// --------------------------------------------------------------------
-	// Complex OM Methods
-	// --------------------------------------------------------------------
-
-	/**
-	 * Constructs variable name for fkey-related objects.
-	 * @param      ForeignKey $fk
-	 * @return     string
-	 */
-	protected function getFKVarName(ForeignKey $fk)
-	{
-		return 'a' . $this->getFKPhpNameAffix($fk, $plural = false);
-	}
-
-	/**
-	 * Constructs variable name for objects which referencing current table by specified foreign key.
-	 * @param      ForeignKey $fk
-	 * @return     string
-	 */
-	protected function getRefFKCollVarName(ForeignKey $fk)
-	{
-		return 'coll' . $this->getRefFKPhpNameAffix($fk, $plural = true);
-	}
-
-	/**
-	 * Constructs variable name for single object which references current table by specified foreign key
-	 * which is ALSO a primary key (hence one-to-one relationship).
-	 * @param      ForeignKey $fk
-	 * @return     string
-	 */
-	protected function getPKRefFKVarName(ForeignKey $fk)
-	{
-		return 'single' . $this->getRefFKPhpNameAffix($fk, $plural = false);
-	}
-
-	/**
-	 * Gets variable name for the Criteria which was used to fetch the objects which
-	 * referencing current table by specified foreign key.
-	 * @param      ForeignKey $fk
-	 * @return     string
-	 */
-	protected function getRefFKLastCriteriaVarName(ForeignKey $fk)
-	{
-		return 'last' . $this->getRefFKPhpNameAffix($fk, $plural = false) . 'Criteria';
-	}
-
-	// ----------------------------------------------------------------
-	//
-	// F K    M E T H O D S
-	//
-	// ----------------------------------------------------------------
-
-	/**
-	 * Adds the methods that get & set objects related by foreign key to the current object.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addFKMethods(&$script)
-	{
-		foreach ($this->getTable()->getForeignKeys() as $fk) {
-			$this->addFKMutator($script, $fk);
-			$this->addFKAccessor($script, $fk);
-		} // foreach fk
-	}
-
-	/**
-	 * Adds the class attributes that are needed to store fkey related objects.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addFKAttributes(&$script, ForeignKey $fk)
-	{
-		$className = $this->getForeignTable($fk)->getPhpName();
-		$varName = $this->getFKVarName($fk);
-
-		$script .= "
-	/**
-	 * @var        $className
-	 */
-	protected $".$varName.";
-";
-	}
-
-	/**
-	 * Adds the mutator (setter) method for setting an fkey related object.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addFKMutator(&$script, ForeignKey $fk)
-	{
-		$table = $this->getTable();
-		$tblFK = $this->getForeignTable($fk);
-
-		$joinTableObjectBuilder = $this->getNewObjectBuilder($tblFK);
-
-		$className = $joinTableObjectBuilder->getObjectClassname();
-		$varName = $this->getFKVarName($fk);
-
-		$script .= "
-	/**
-	 * Declares an association between this object and a $className object.
-	 *
-	 * @param      $className \$v
-	 * @return     ".$this->getObjectClassname()." The current object (for fluent API support)
-	 * @throws     PropelException
-	 */
-	public function set".$this->getFKPhpNameAffix($fk, $plural = false)."($className \$v = null)
-	{";
-		foreach ($fk->getLocalColumns() as $columnName) {
-			$column = $table->getColumn($columnName);
-			$lfmap = $fk->getLocalForeignMapping();
-			$colFKName = $lfmap[$columnName];
-			$colFK = $tblFK->getColumn($colFKName);
-			$script .= "
-		if (\$v === null) {
-			\$this->set".$column->getPhpName()."(".$this->getDefaultValueString($column).");
-		} else {
-			\$this->set".$column->getPhpName()."(\$v->get".$colFK->getPhpName()."());
-		}
-";
-
-		} /* foreach local col */
-
-		$script .= "
-		\$this->$varName = \$v;
-";
-
-		// Now add bi-directional relationship binding, taking into account whether this is
-		// a one-to-one relationship.
-
-		if ($fk->isLocalPrimaryKey()) {
-			$script .= "
-		// Add binding for other direction of this 1:1 relationship.
-		if (\$v !== null) {
-			\$v->set".$this->getRefFKPhpNameAffix($fk, $plural = false)."(\$this);
-		}
-";
-		} else {
-			$script .= "
-		// Add binding for other direction of this n:n relationship.
-		// If this object has already been added to the $className object, it will not be re-added.
-		if (\$v !== null) {
-			\$v->add".$this->getRefFKPhpNameAffix($fk, $plural = false)."(\$this);
-		}
-";
-
-		}
-
-		$script .= "
-		return \$this;
-	}
-";
-	}
-
-	/**
-	 * Adds the accessor (getter) method for getting an fkey related object.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addFKAccessor(&$script, ForeignKey $fk)
-	{
-		$table = $this->getTable();
-
-		$varName = $this->getFKVarName($fk);
-		$pCollName = $this->getFKPhpNameAffix($fk, $plural = true);
-		
-		$fkPeerBuilder = $this->getNewPeerBuilder($this->getForeignTable($fk));
-		$fkObjectBuilder = $this->getNewObjectBuilder($this->getForeignTable($fk))->getStubObjectBuilder();
-		$className = $fkObjectBuilder->getClassname(); // get the Classname that has maybe a prefix
-		
-		$and = "";
-		$comma = "";
-		$conditional = "";
-		$argmap = array(); // foreign -> local mapping
-		$argsize = 0;
-		foreach ($fk->getLocalColumns() as $columnName) {
-			
-			$lfmap = $fk->getLocalForeignMapping();
-			
-			$localColumn = $table->getColumn($columnName);
-			$foreignColumn = $fk->getForeignTable()->getColumn($lfmap[$columnName]);
-			
-			$column = $table->getColumn($columnName);
-			$cptype = $column->getPhpType();
-			$clo = strtolower($column->getName());
-			
-			if ($cptype == "integer" || $cptype == "float" || $cptype == "double") {
-				$conditional .= $and . "\$this->". $clo ." != 0";
-			} elseif ($cptype == "string") {
-				$conditional .= $and . "(\$this->" . $clo ." !== \"\" && \$this->".$clo." !== null)";
-			} else {
-				$conditional .= $and . "\$this->" . $clo ." !== null";
-			}
-			
-			$argmap[] = array('foreign' => $foreignColumn, 'local' => $localColumn);
-			$and = " && ";
-			$comma = ", ";
-			$argsize = $argsize + 1;
-		}
-		
-		// If the related column is a primary kay and if it's a simple association,
-		// The use retrieveByPk() instead of doSelect() to take advantage of instance pooling
-		$useRetrieveByPk = count($argmap) == 1 && $argmap[0]['foreign']->isPrimaryKey();
-
-		$script .= "
-
-	/**
-	 * Get the associated $className object
-	 *
-	 * @param      PropelPDO Optional Connection object.
-	 * @return     $className The associated $className object.
-	 * @throws     PropelException
-	 */
-	public function get".$this->getFKPhpNameAffix($fk, $plural = false)."(PropelPDO \$con = null)
-	{";
-		$script .= "
-		if (\$this->$varName === null && ($conditional)) {";
-		if ($useRetrieveByPk) {
-			$script .= "
-			\$this->$varName = ".$fkPeerBuilder->getPeerClassname()."::retrieveByPk(\$this->$clo);";
-		} else {
-			$script .= "
-			\$c = new Criteria(".$fkPeerBuilder->getPeerClassname()."::DATABASE_NAME);";
-			foreach ($argmap as $el) {
-				$fcol = $el['foreign'];
-				$lcol = $el['local'];
-				$clo = strtolower($lcol->getName());
-				$script .= "
-			\$c->add(".$fkPeerBuilder->getColumnConstant($fcol).", \$this->".$clo.");";
-			}
-			$script .= "
-			\$this->$varName = ".$fkPeerBuilder->getPeerClassname()."::doSelectOne(\$c, \$con);";
-		}
-		if ($fk->isLocalPrimaryKey()) {
-			$script .= "
-			// Because this foreign key represents a one-to-one relationship, we will create a bi-directional association.
-			\$this->{$varName}->set".$this->getRefFKPhpNameAffix($fk, $plural = false)."(\$this);";
-		} else {
-			$script .= "
-			/* The following can be used additionally to
-			   guarantee the related object contains a reference
-			   to this object.  This level of coupling may, however, be
-			   undesirable since it could result in an only partially populated collection
-			   in the referenced object.
-			   \$this->{$varName}->add".$this->getRefFKPhpNameAffix($fk, $plural = true)."(\$this);
-			 */";
-		}
-
-		$script .= "
-		}
-		return \$this->$varName;
-	}
-";
-
-	} // addFKAccessor
-
-	/**
-	 * Adds a convenience method for setting a related object by specifying the primary key.
-	 * This can be used in conjunction with the getPrimaryKey() for systems where nothing is known
-	 * about the actual objects being related.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addFKByKeyMutator(&$script, ForeignKey $fk)
-	{
-		$table = $this->getTable();
-
-		#$className = $this->getForeignTable($fk)->getPhpName();
-		$methodAffix = $this->getFKPhpNameAffix($fk);
-		#$varName = $this->getFKVarName($fk);
-
-		$script .= "
-	/**
-	 * Provides convenient way to set a relationship based on a
-	 * key.  e.g.
-	 * <code>\$bar->setFooKey(\$foo->getPrimaryKey())</code>
-	 *";
-		if (count($fk->getLocalColumns()) > 1) {
-			$script .= "
-	 * Note: It is important that the xml schema used to create this class
-	 * maintains consistency in the order of related columns between
-	 * ".$table->getName()." and ". $tblFK->getName().".
-	 * If for some reason this is impossible, this method should be
-	 * overridden in <code>".$table->getPhpName()."</code>.";
-		}
-		$script .= "
-	 * @return     ".$this->getObjectClassname()." The current object (for fluent API support)
-	 * @throws     PropelException
-	 */
-	public function set".$methodAffix."Key(\$key)
-	{
-";
-		if (count($fk->getLocalColumns()) > 1) {
-			$i = 0;
-			foreach ($fk->getLocalColumns() as $colName) {
-				$col = $table->getColumn($colName);
-				$fktype = $col->getPhpType();
-				$script .= "
-			\$this->set".$col->getPhpName()."( ($fktype) \$key[$i] );
-";
-				$i++;
-			} /* foreach */
-		} else {
-			$lcols = $fk->getLocalColumns();
-			$colName = $lcols[0];
-			$col = $table->getColumn($colName);
-			$fktype = $col->getPhpType();
-			$script .= "
-		\$this->set".$col->getPhpName()."( ($fktype) \$key);
-";
-		}
-		$script .= "
-		return \$this;
-	}
-";
-	} // addFKByKeyMutator()
-
-	/**
-	 * Adds the method that fetches fkey-related (referencing) objects but also joins in data from another table.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addRefFKGetJoinMethods(&$script, ForeignKey $refFK)
-	{
-		$table = $this->getTable();
-		$tblFK = $refFK->getTable();
-		$join_behavior = $this->getGeneratorConfig()->getBuildProperty('useLeftJoinsInDoJoinMethods') ? 'Criteria::LEFT_JOIN' : 'Criteria::INNER_JOIN';
-
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$relCol = $this->getRefFKPhpNameAffix($refFK, $plural=true);
-		$collName = $this->getRefFKCollVarName($refFK);
-		$lastCriteriaName = $this->getRefFKLastCriteriaVarName($refFK);
-
-		$fkPeerBuilder = $this->getNewPeerBuilder($tblFK);
-
-		$lastTable = "";
-		foreach ($tblFK->getForeignKeys() as $fk2) {
-
-			$tblFK2 = $this->getForeignTable($fk2);
-			$doJoinGet = !$tblFK2->isForReferenceOnly();
-
-			// it doesn't make sense to join in rows from the curent table, since we are fetching
-			// objects related to *this* table (i.e. the joined rows will all be the same row as current object)
-			if ($this->getTable()->getPhpName() == $tblFK2->getPhpName()) {
-				$doJoinGet = false;
-			}
-
-			$relCol2 = $this->getFKPhpNameAffix($fk2, $plural = false);
-
-			if ( $this->getRelatedBySuffix($refFK) != "" &&
-			($this->getRelatedBySuffix($refFK) == $this->getRelatedBySuffix($fk2))) {
-				$doJoinGet = false;
-			}
-
-			if ($doJoinGet) {
-				$script .= "
-
-	/**
-	 * If this collection has already been initialized with
-	 * an identical criteria, it returns the collection.
-	 * Otherwise if this ".$table->getPhpName()." is new, it will return
-	 * an empty collection; or if this ".$table->getPhpName()." has previously
-	 * been saved, it will retrieve related $relCol from storage.
-	 *
-	 * This method is protected by default in order to keep the public
-	 * api reasonable.  You can provide public methods for those you
-	 * actually need in ".$table->getPhpName().".
-	 */
-	public function get".$relCol."Join".$relCol2."(\$criteria = null, \$con = null, \$join_behavior = $join_behavior)
-	{";
-				$script .= "
-		if (\$criteria === null) {
-			\$criteria = new Criteria($peerClassname::DATABASE_NAME);
-		}
-		elseif (\$criteria instanceof Criteria)
-		{
-			\$criteria = clone \$criteria;
-		}
-
-		if (\$this->$collName === null) {
-			if (\$this->isNew()) {
-				\$this->$collName = array();
-			} else {
-";
-				foreach ($refFK->getForeignColumns() as $columnName) {
-					$column = $table->getColumn($columnName);
-					$flMap = $refFK->getForeignLocalMapping();
-					$colFKName = $flMap[$columnName];
-					$colFK = $tblFK->getColumn($colFKName);
-					if ($colFK === null) {
-						throw new EngineException("Column $colFKName not found in " . $tblFK->getName());
-					}
-					$clo = strtolower($column->getName());
-					$script .= "
-				\$criteria->add(".$fkPeerBuilder->getColumnConstant($colFK).", \$this->$clo);
-";
-				} // end foreach ($fk->getForeignColumns()
-
-				$script .= "
-				\$this->$collName = ".$fkPeerBuilder->getPeerClassname()."::doSelectJoin$relCol2(\$criteria, \$con, \$join_behavior);
-			}
-		} else {
-			// the following code is to determine if a new query is
-			// called for.  If the criteria is the same as the last
-			// one, just return the collection.
-";
-				foreach ($refFK->getForeignColumns() as $columnName) {
-					$column = $table->getColumn($columnName);
-					$flMap = $refFK->getForeignLocalMapping();
-					$colFKName = $flMap[$columnName];
-					$colFK = $tblFK->getColumn($colFKName);
-					$clo = strtolower($column->getName());
-					$script .= "
-			\$criteria->add(".$fkPeerBuilder->getColumnConstant($colFK).", \$this->$clo);
-";
-				} /* end foreach ($fk->getForeignColumns() */
-
-				$script .= "
-			if (!isset(\$this->$lastCriteriaName) || !\$this->".$lastCriteriaName."->equals(\$criteria)) {
-				\$this->$collName = ".$fkPeerBuilder->getPeerClassname()."::doSelectJoin$relCol2(\$criteria, \$con, \$join_behavior);
-			}
-		}
-		\$this->$lastCriteriaName = \$criteria;
-
-		return \$this->$collName;
-	}
-";
-			} /* end if ($doJoinGet) */
-
-		} /* end foreach ($tblFK->getForeignKeys() as $fk2) { */
-
-	} // function
-
-
-	// ----------------------------------------------------------------
-	//
-	// R E F E R R E R    F K    M E T H O D S
-	//
-	// ----------------------------------------------------------------
-
-	/**
-	 * Adds the attributes used to store objects that have referrer fkey relationships to this object.
-	 * <code>protected collVarName;</code>
-	 * <code>private lastVarNameCriteria = null;</code>
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addRefFKAttributes(&$script, ForeignKey $refFK)
-	{
-		$joinedTableObjectBuilder = $this->getNewObjectBuilder($refFK->getTable());
-		$className = $joinedTableObjectBuilder->getObjectClassname();
-
-		if ($refFK->isLocalPrimaryKey()) {
-			$script .= "
-	/**
-	 * @var        $className one-to-one related $className object
-	 */
-	protected $".$this->getPKRefFKVarName($refFK).";
-";
-		} else {
-			$script .= "
-	/**
-	 * @var        array {$className}[] Collection to store aggregation of $className objects.
-	 */
-	protected $".$this->getRefFKCollVarName($refFK).";
-
-	/**
-	 * @var        Criteria The criteria used to select the current contents of ".$this->getRefFKCollVarName($refFK).".
-	 */
-	private $".$this->getRefFKLastCriteriaVarName($refFK)." = null;
-";
-		}
-	}
-
-	/**
-	 * Adds the methods for retrieving, initializing, adding objects that are related to this one by foreign keys.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addRefFKMethods(&$script)
-	{
-		foreach ($this->getTable()->getReferrers() as $refFK) {
-			if ($refFK->isLocalPrimaryKey()) {
-				$this->addPKRefFKGet($script, $refFK);
-				$this->addPKRefFKSet($script, $refFK);
-			} else {
-				$this->addRefFKClear($script, $refFK);
-				$this->addRefFKInit($script, $refFK);
-				$this->addRefFKGet($script, $refFK);
-				$this->addRefFKCount($script, $refFK);
-				$this->addRefFKAdd($script, $refFK);
-				$this->addRefFKGetJoinMethods($script, $refFK);
-			}
-		}
-	}
-
-	/**
-	 * Adds the method that clears the referrer fkey collection.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addRefFKClear(&$script, ForeignKey $refFK) {
-
-		$relCol = $this->getRefFKPhpNameAffix($refFK, $plural = true);
-		$collName = $this->getRefFKCollVarName($refFK);
-
-		$script .= "
-	/**
-	 * Clears out the $collName collection (array).
-	 *
-	 * This does not modify the database; however, it will remove any associated objects, causing
-	 * them to be refetched by subsequent calls to accessor method.
-	 *
-	 * @return     void
-	 * @see        add$relCol()
-	 */
-	public function clear$relCol()
-	{
-		\$this->$collName = null; // important to set this to NULL since that means it is uninitialized
-	}
-";
-	} // addRefererClear()
-
-	/**
-	 * Adds the method that initializes the referrer fkey collection.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addRefFKInit(&$script, ForeignKey $refFK) {
-
-		$relCol = $this->getRefFKPhpNameAffix($refFK, $plural = true);
-		$collName = $this->getRefFKCollVarName($refFK);
-
-		$script .= "
-	/**
-	 * Initializes the $collName collection (array).
-	 *
-	 * By default this just sets the $collName collection to an empty array (like clear$collName());
-	 * however, you may wish to override this method in your stub class to provide setting appropriate
-	 * to your application -- for example, setting the initial array to the values stored in database.
-	 *
-	 * @return     void
-	 */
-	public function init$relCol()
-	{
-		\$this->$collName = array();
-	}
-";
-	} // addRefererInit()
-
-	/**
-	 * Adds the method that adds an object into the referrer fkey collection.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addRefFKAdd(&$script, ForeignKey $refFK)
-	{
-		$tblFK = $refFK->getTable();
-
-		$joinedTableObjectBuilder = $this->getNewObjectBuilder($refFK->getTable());
-		$className = $joinedTableObjectBuilder->getObjectClassname();
-
-		$collName = $this->getRefFKCollVarName($refFK);
-
-		$script .= "
-	/**
-	 * Method called to associate a $className object to this object
-	 * through the $className foreign key attribute.
-	 *
-	 * @param      $className \$l $className
-	 * @return     void
-	 * @throws     PropelException
-	 */
-	public function add".$this->getRefFKPhpNameAffix($refFK, $plural = false)."($className \$l)
-	{
-		if (\$this->$collName === null) {
-			\$this->init".$this->getRefFKPhpNameAffix($refFK, $plural = true)."();
-		}
-		if (!in_array(\$l, \$this->$collName, true)) { // only add it if the **same** object is not already associated
-			array_push(\$this->$collName, \$l);
-			\$l->set".$this->getFKPhpNameAffix($refFK, $plural = false)."(\$this);
-		}
-	}
-";
-	} // addRefererAdd
-
-	/**
-	 * Adds the method that returns the size of the referrer fkey collection.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addRefFKCount(&$script, ForeignKey $refFK)
-	{
-		$table = $this->getTable();
-		$tblFK = $refFK->getTable();
-
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-
-		$fkPeerBuilder = $this->getNewPeerBuilder($refFK->getTable());
-		$relCol = $this->getRefFKPhpNameAffix($refFK, $plural = true);
-
-		$collName = $this->getRefFKCollVarName($refFK);
-		$lastCriteriaName = $this->getRefFKLastCriteriaVarName($refFK);
-
-		$className = $fkPeerBuilder->getObjectClassname();
-
-		$script .= "
-	/**
-	 * Returns the number of related $className objects.
-	 *
-	 * @param      Criteria \$criteria
-	 * @param      boolean \$distinct
-	 * @param      PropelPDO \$con
-	 * @return     int Count of related $className objects.
-	 * @throws     PropelException
-	 */
-	public function count$relCol(Criteria \$criteria = null, \$distinct = false, PropelPDO \$con = null)
-	{";
-
-		$script .= "
-		if (\$criteria === null) {
-			\$criteria = new Criteria($peerClassname::DATABASE_NAME);
-		} else {
-			\$criteria = clone \$criteria;
-		}
-
-		if (\$distinct) {
-			\$criteria->setDistinct();
-		}
-
-		\$count = null;
-
-		if (\$this->$collName === null) {
-			if (\$this->isNew()) {
-				\$count = 0;
-			} else {
-";
-		foreach ($refFK->getLocalColumns() as $colFKName) {
-			// $colFKName is local to the referring table (i.e. foreign to this table)
-			$lfmap = $refFK->getLocalForeignMapping();
-			$localColumn = $this->getTable()->getColumn($lfmap[$colFKName]);
-			$colFK = $refFK->getTable()->getColumn($colFKName);
-			$clo = strtolower($localColumn->getName());
-			$script .= "
-				\$criteria->add(".$fkPeerBuilder->getColumnConstant($colFK).", \$this->$clo);
-";
-		} // end foreach ($fk->getForeignColumns()
-
-		$script .= "
-				\$count = ".$fkPeerBuilder->getPeerClassname()."::doCount(\$criteria, false, \$con);
-			}
-		} else {
-			// criteria has no effect for a new object
-			if (!\$this->isNew()) {
-				// the following code is to determine if a new query is
-				// called for.  If the criteria is the same as the last
-				// one, just return count of the collection.
-";
-		foreach ($refFK->getLocalColumns() as $colFKName) {
-			// $colFKName is local to the referring table (i.e. foreign to this table)
-			$lfmap = $refFK->getLocalForeignMapping();
-			$localColumn = $this->getTable()->getColumn($lfmap[$colFKName]);
-			$colFK = $refFK->getTable()->getColumn($colFKName);
-			$clo = strtolower($localColumn->getName());
-			$script .= "
-
-				\$criteria->add(".$fkPeerBuilder->getColumnConstant($colFK).", \$this->$clo);
-";
-		} // foreach ($fk->getForeignColumns()
-		$script .= "
-				if (!isset(\$this->$lastCriteriaName) || !\$this->".$lastCriteriaName."->equals(\$criteria)) {
-					\$count = ".$fkPeerBuilder->getPeerClassname()."::doCount(\$criteria, false, \$con);
-				} else {
-					\$count = count(\$this->$collName);
-				}
-			} else {
-				\$count = count(\$this->$collName);
-			}
-		}
-		return \$count;
-	}
-";
-	} // addRefererCount
-
-	/**
-	 * Adds the method that returns the referrer fkey collection.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addRefFKGet(&$script, ForeignKey $refFK)
-	{
-		$table = $this->getTable();
-		$tblFK = $refFK->getTable();
-
-		$peerClassname = $this->getStubPeerBuilder()->getClassname();
-		$fkPeerBuilder = $this->getNewPeerBuilder($refFK->getTable());
-		$relCol = $this->getRefFKPhpNameAffix($refFK, $plural = true);
-
-		$collName = $this->getRefFKCollVarName($refFK);
-		$lastCriteriaName = $this->getRefFKLastCriteriaVarName($refFK);
-
-		$className = $fkPeerBuilder->getObjectClassname();
-
-		$script .= "
-	/**
-	 * Gets an array of $className objects which contain a foreign key that references this object.
-	 *
-	 * If this collection has already been initialized with an identical Criteria, it returns the collection.
-	 * Otherwise if this ".$this->getObjectClassname()." has previously been saved, it will retrieve
-	 * related $relCol from storage. If this ".$this->getObjectClassname()." is new, it will return
-	 * an empty collection or the current collection, the criteria is ignored on a new object.
-	 *
-	 * @param      PropelPDO \$con
-	 * @param      Criteria \$criteria
-	 * @return     array {$className}[]
-	 * @throws     PropelException
-	 */
-	public function get$relCol(\$criteria = null, PropelPDO \$con = null)
-	{";
-
-		$script .= "
-		if (\$criteria === null) {
-			\$criteria = new Criteria($peerClassname::DATABASE_NAME);
-		}
-		elseif (\$criteria instanceof Criteria)
-		{
-			\$criteria = clone \$criteria;
-		}
-
-		if (\$this->$collName === null) {
-			if (\$this->isNew()) {
-			   \$this->$collName = array();
-			} else {
-";
-		foreach ($refFK->getLocalColumns() as $colFKName) {
-			// $colFKName is local to the referring table (i.e. foreign to this table)
-			$lfmap = $refFK->getLocalForeignMapping();
-			$localColumn = $this->getTable()->getColumn($lfmap[$colFKName]);
-			$colFK = $refFK->getTable()->getColumn($colFKName);
-
-			$clo = strtolower($localColumn->getName());
-
-			$script .= "
-				\$criteria->add(".$fkPeerBuilder->getColumnConstant($colFK).", \$this->$clo);
-";
-		} // end foreach ($fk->getForeignColumns()
-
-		$script .= "
-				".$fkPeerBuilder->getPeerClassname()."::addSelectColumns(\$criteria);
-				\$this->$collName = ".$fkPeerBuilder->getPeerClassname()."::doSelect(\$criteria, \$con);
-			}
-		} else {
-			// criteria has no effect for a new object
-			if (!\$this->isNew()) {
-				// the following code is to determine if a new query is
-				// called for.  If the criteria is the same as the last
-				// one, just return the collection.
-";
-		foreach ($refFK->getLocalColumns() as $colFKName) {
-			// $colFKName is local to the referring table (i.e. foreign to this table)
-			$lfmap = $refFK->getLocalForeignMapping();
-			$localColumn = $this->getTable()->getColumn($lfmap[$colFKName]);
-			$colFK = $refFK->getTable()->getColumn($colFKName);
-			$clo = strtolower($localColumn->getName());
-			$script .= "
-
-				\$criteria->add(".$fkPeerBuilder->getColumnConstant($colFK).", \$this->$clo);
-";
-		} // foreach ($fk->getForeignColumns()
-		$script .= "
-				".$fkPeerBuilder->getPeerClassname()."::addSelectColumns(\$criteria);
-				if (!isset(\$this->$lastCriteriaName) || !\$this->".$lastCriteriaName."->equals(\$criteria)) {
-					\$this->$collName = ".$fkPeerBuilder->getPeerClassname()."::doSelect(\$criteria, \$con);
-				}
-			}
-		}
-		\$this->$lastCriteriaName = \$criteria;
-		return \$this->$collName;
-	}
-";
-	} // addRefererGet()
-
-	/**
-	 * Adds the method that gets a one-to-one related referrer fkey.
-	 * This is for one-to-one relationship special case.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addPKRefFKGet(&$script, ForeignKey $refFK)
-	{
-		$table = $this->getTable();
-		$tblFK = $refFK->getTable();
-
-		$joinedTableObjectBuilder = $this->getNewObjectBuilder($refFK->getTable());
-		$joinedTablePeerBuilder = $this->getNewObjectBuilder($refFK->getTable());
-		$className = $joinedTableObjectBuilder->getObjectClassname();
-
-		$varName = $this->getPKRefFKVarName($refFK);
-
-		$script .= "
-	/**
-	 * Gets a single $className object, which is related to this object by a one-to-one relationship.
-	 *
-	 * @param      PropelPDO \$con
-	 * @return     $className
-	 * @throws     PropelException
-	 */
-	public function get".$this->getRefFKPhpNameAffix($refFK, $plural = false)."(PropelPDO \$con = null)
-	{
-";
-		$script .= "
-		if (\$this->$varName === null && !\$this->isNew()) {";
-
-		$lfmap = $refFK->getLocalForeignMapping();
-
-		// remember: this object represents the foreign table,
-		// so we need foreign columns of the reffk to know the local columns
-		// that we need to set :)
-
-		$localcols = $refFK->getForeignColumns();
-
-		// we know that at least every column in the primary key of the foreign table
-		// is represented in this foreign key
-
-		$params = array();
-		foreach ($tblFK->getPrimaryKey() as $col) {
-			$localColumn = $table->getColumn($lfmap[$col->getName()]);
-			$clo = strtolower($localColumn->getName());
-			$params[] = "\$this->$clo";
-		}
-
-		$script .= "
-			\$this->$varName = ".$joinedTableObjectBuilder->getPeerClassname()."::retrieveByPK(".implode(", ", $params).", \$con);
-		}
-
-		return \$this->$varName;
-	}
-";
-	} // addPKRefFKGet()
-
-	/**
-	 * Adds the method that sets a one-to-one related referrer fkey.
-	 * This is for one-to-one relationships special case.
-	 * @param      string &$script The script will be modified in this method.
-	 * @param      ForeignKey $refFK The referencing foreign key.
-	 */
-	protected function addPKRefFKSet(&$script, ForeignKey $refFK)
-	{
-		$tblFK = $refFK->getTable();
-
-		$joinedTableObjectBuilder = $this->getNewObjectBuilder($refFK->getTable());
-		$className = $joinedTableObjectBuilder->getObjectClassname();
-
-		$varName = $this->getPKRefFKVarName($refFK);
-
-		$script .= "
-	/**
-	 * Sets a single $className object as related to this object by a one-to-one relationship.
-	 *
-	 * @param      $className \$l $className
-	 * @return     ".$this->getObjectClassname()." The current object (for fluent API support)
-	 * @throws     PropelException
-	 */
-	public function set".$this->getRefFKPhpNameAffix($refFK, $plural = false)."($className \$v)
-	{
-		\$this->$varName = \$v;
-
-		// Make sure that that the passed-in $className isn't already associated with this object
-		if (\$v->get".$this->getFKPhpNameAffix($refFK, $plural = false)."() === null) {
-			\$v->set".$this->getFKPhpNameAffix($refFK, $plural = false)."(\$this);
-		}
-
-		return \$this;
-	}
-";
-	} // addPKRefFKSet
-
-	// ----------------------------------------------------------------
-	//
-	// M A N I P U L A T I O N    M E T H O D S
-	//
-	// ----------------------------------------------------------------
-
-	/**
-	 * Adds the workhourse doSave() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoSave(&$script)
-	{
-		$table = $this->getTable();
-
-		$reloadOnUpdate = $table->isReloadOnUpdate();
-		$reloadOnInsert = $table->isReloadOnInsert();
-
-		$script .= "
-	/**
-	 * Performs the work of inserting or updating the row in the database.
-	 *
-	 * If the object is new, it inserts it; otherwise an update is performed.
-	 * All related objects are also updated in this method.
-	 *
-	 * @param      PropelPDO \$con";
-		if ($reloadOnUpdate || $reloadOnInsert) {
-			$script .= "
-	 * @param      boolean \$skipReload Whether to skip the reload for this object from database.";
-		}
-		$script .= "
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
-	 * @throws     PropelException
-	 * @see        save()
-	 */
-	protected function doSave(PropelPDO \$con".($reloadOnUpdate || $reloadOnInsert ? ", \$skipReload = false" : "").")
-	{
-		\$affectedRows = 0; // initialize var to track total num of affected rows
-		if (!\$this->alreadyInSave) {
-			\$this->alreadyInSave = true;
-";
-		if ($reloadOnInsert || $reloadOnUpdate) {
-			$script .= "
-			\$reloadObject = false;
-";
-		}
-
-		if (count($table->getForeignKeys())) {
-
-			$script .= "
-			// We call the save method on the following object(s) if they
-			// were passed to this object by their coresponding set
-			// method.  This object relates to these object(s) by a
-			// foreign key reference.
-";
-
-			foreach ($table->getForeignKeys() as $fk)
-			{
-				$aVarName = $this->getFKVarName($fk);
-				$script .= "
-			if (\$this->$aVarName !== null) {
-				if (\$this->".$aVarName."->isModified() || \$this->".$aVarName."->isNew()) {
-					\$affectedRows += \$this->".$aVarName."->save(\$con);
-				}
-				\$this->set".$this->getFKPhpNameAffix($fk, $plural = false)."(\$this->$aVarName);
-			}
-";
-			} // foreach foreign k
-		} // if (count(foreign keys))
-		
-		if ($table->hasAutoIncrementPrimaryKey() ) {
-		$script .= "
-			if (\$this->isNew() ) {
-				\$this->modifiedColumns[] = " . $this->getColumnConstant($table->getAutoIncrementPrimaryKey() ) . ";
-			}";
-		}
-
-		$script .= "
-
-			// If this object has been modified, then save it to the database.
-			if (\$this->isModified()";
-
-		$script .= ") {
-				if (\$this->isNew()) {
-					\$pk = ".$this->getPeerClassname()."::doInsert(\$this, \$con);";
-		if ($reloadOnInsert) {
-			$script .= "
-					if (!\$skipReload) {
-						\$reloadObject = true;
-					}";
-		}
-		$script .= "
-					\$affectedRows += 1; // we are assuming that there is only 1 row per doInsert() which
-										 // should always be true here (even though technically
-										 // BasePeer::doInsert() can insert multiple rows).
-";
-		if ($table->getIdMethod() != IDMethod::NO_ID_METHOD) {
-
-			if (count($pks = $table->getPrimaryKey())) {
-				foreach ($pks as $pk) {
-					if ($pk->isAutoIncrement()) {
-						$script .= "
-					\$this->set".$pk->getPhpName()."(\$pk);  //[IMV] update autoincrement primary key
-";
-					}
-				}
-			}
-		} // if (id method != "none")
-
-		$script .= "
-					\$this->setNew(false);
-				} else {";
-		if ($reloadOnUpdate) {
-			$script .= "
-					if (!\$skipReload) {
-						\$reloadObject = true;
-					}";
-		}
-		$script .= "
-					\$affectedRows += ".$this->getPeerClassname()."::doUpdate(\$this, \$con);
-				}
-";
-
-		// We need to rewind any LOB columns
-		foreach ($table->getColumns() as $col) {
-			$clo = strtolower($col->getName());
-			if ($col->isLobType()) {
-				$script .= "
-				// Rewind the $clo LOB column, since PDO does not rewind after inserting value.
-				if (\$this->$clo !== null && is_resource(\$this->$clo)) {
-					rewind(\$this->$clo);
-				}
-";
-			}
-		}
-
-		$script .= "
-				\$this->resetModified(); // [HL] After being saved an object is no longer 'modified'
-			}
-";
-
-		foreach ($table->getReferrers() as $refFK) {
-
-			if ($refFK->isLocalPrimaryKey()) {
-				$varName = $this->getPKRefFKVarName($refFK);
-				$script .= "
-			if (\$this->$varName !== null) {
-				if (!\$this->{$varName}->isDeleted()) {
-						\$affectedRows += \$this->{$varName}->save(\$con);
-				}
-			}
-";
-			} else {
-				$collName = $this->getRefFKCollVarName($refFK);
-				$script .= "
-			if (\$this->$collName !== null) {
-				foreach (\$this->$collName as \$referrerFK) {
-					if (!\$referrerFK->isDeleted()) {
-						\$affectedRows += \$referrerFK->save(\$con);
-					}
-				}
-			}
-";
-			} // if refFK->isLocalPrimaryKey()
-
-		} /* foreach getReferrers() */
-		$script .= "
-			\$this->alreadyInSave = false;
-";
-		if ($reloadOnInsert || $reloadOnUpdate) {
-			$script .= "
-			if (\$reloadObject) {
-				\$this->reload(\$con);
-			}
-";
-		}
-		$script .= "
-		}
-		return \$affectedRows;
-	} // doSave()
-";
-
-	}
-
-	/**
-	 * Adds the $alreadyInSave attribute, which prevents attempting to re-save the same object.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addAlreadyInSaveAttribute(&$script)
-	{
-		$script .= "
-	/**
-	 * Flag to prevent endless save loop, if this object is referenced
-	 * by another object which falls in this transaction.
-	 * @var        boolean
-	 */
-	protected \$alreadyInSave = false;
-";
-	}
-
-	/**
-	 * Adds the save() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addSave(&$script)
-	{
-		$this->addSaveComment($script);
-		$this->addSaveOpen($script);
-		$this->addSaveBody($script);
-		$this->addSaveClose($script);
-	}
-
-	/**
-	 * Adds the comment for the save method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addSave()
-	 **/
-	protected function addSaveComment(&$script) {
-		$table = $this->getTable();
-		$reloadOnUpdate = $table->isReloadOnUpdate();
-		$reloadOnInsert = $table->isReloadOnInsert();
-
-		$script .= "
-	/**
-	 * Persists this object to the database.
-	 *
-	 * If the object is new, it inserts it; otherwise an update is performed.
-	 * All modified related objects will also be persisted in the doSave()
-	 * method.  This method wraps all precipitate database operations in a
-	 * single transaction.";
-		if ($reloadOnUpdate) {
-			$script .= "
-	 *
-	 * Since this table was configured to reload rows on update, the object will
-	 * be reloaded from the database if an UPDATE operation is performed (unless
-	 * the \$skipReload parameter is TRUE).";
-		}
-		if ($reloadOnInsert) {
-			$script .= "
-	 *
-	 * Since this table was configured to reload rows on insert, the object will
-	 * be reloaded from the database if an INSERT operation is performed (unless
-	 * the \$skipReload parameter is TRUE).";
-		}
-		$script .= "
-	 *
-	 * @param      PropelPDO \$con";
-		if ($reloadOnUpdate || $reloadOnInsert) {
-			$script .= "
-	 * @param      boolean \$skipReload Whether to skip the reload for this object from database.";
-		}
-		$script .= "
-	 * @return     int The number of rows affected by this insert/update and any referring fk objects' save() operations.
-	 * @throws     PropelException
-	 * @see        doSave()
-	 */";
-	}
-
-	/**
-	 * Adds the function declaration for the save method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addSave()
-	 **/
-	protected function addSaveOpen(&$script) {
-		$table = $this->getTable();
-		$reloadOnUpdate = $table->isReloadOnUpdate();
-		$reloadOnInsert = $table->isReloadOnInsert();
-		$script .= "
-	public function save(PropelPDO \$con = null".($reloadOnUpdate || $reloadOnInsert ? ", \$skipReload = false" : "").")
-	{";
-	}
-
-	/**
-	 * Adds the function body for the save method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addSave()
-	 **/
-	protected function addSaveBody(&$script) {
-		$table = $this->getTable();
-		$reloadOnUpdate = $table->isReloadOnUpdate();
-		$reloadOnInsert = $table->isReloadOnInsert();
-
-		$script .= "
-		if (\$this->isDeleted()) {
-			throw new PropelException(\"You cannot save an object that has been deleted.\");
-		}
-
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_WRITE);
-		}
-		
-		\$con->beginTransaction();
-		\$isInsert = \$this->isNew();
-		try {";
-		
-		if($this->getGeneratorConfig()->getBuildProperty('addHooks')) {
-			// save with runtime hools
-			$script .= "
-			\$ret = \$this->preSave(\$con);";
-			$this->applyBehaviorModifier('preSave', $script, "			");
-			$script .= "
-			if (\$isInsert) {
-				\$ret = \$ret && \$this->preInsert(\$con);";
-			$this->applyBehaviorModifier('preInsert', $script, "				");
-			$script .= "
-			} else {
-				\$ret = \$ret && \$this->preUpdate(\$con);";
-			$this->applyBehaviorModifier('preUpdate', $script, "				");
-			$script .= "
-			}
-			if (\$ret) {
-				\$affectedRows = \$this->doSave(\$con".($reloadOnUpdate || $reloadOnInsert ? ", \$skipReload" : "").");
-				if (\$isInsert) {
-					\$this->postInsert(\$con);";
-			$this->applyBehaviorModifier('postInsert', $script, "					");
-			$script .= "
-				} else {
-					\$this->postUpdate(\$con);";
-			$this->applyBehaviorModifier('postUpdate', $script, "					");
-			$script .= "
-				}
-				\$this->postSave(\$con);";
-				$this->applyBehaviorModifier('postSave', $script, "				");
-				$script .= "
-				".$this->getPeerClassname()."::addInstanceToPool(\$this);
-			} else {
-				\$affectedRows = 0;
-			}
-			\$con->commit();
-			return \$affectedRows;";
-		} else {
-			// save without runtime hooks
-	    $this->applyBehaviorModifier('preSave', $script, "			");
-			if ($this->hasBehaviorModifier('preUpdate'))
-			{
-			  $script .= "
-			if(!\$isInsert) {";
-	      $this->applyBehaviorModifier('preUpdate', $script, "				");
-	      $script .= "
-			}";
-			}
-			if ($this->hasBehaviorModifier('preInsert'))
-			{
-			  $script .= "
-			if(\$isInsert) {";
-	    	$this->applyBehaviorModifier('preInsert', $script, "				");
-	      $script .= "
-			}";
-			}
-			$script .= "
-			\$affectedRows = \$this->doSave(\$con".($reloadOnUpdate || $reloadOnInsert ? ", \$skipReload" : "").");";
-	    $this->applyBehaviorModifier('postSave', $script, "			");
-			if ($this->hasBehaviorModifier('postUpdate'))
-			{
-			  $script .= "
-			if(!\$isInsert) {";
-	      $this->applyBehaviorModifier('postUpdate', $script, "				");
-	      $script .= "
-			}";
-			}
-			if ($this->hasBehaviorModifier('postInsert'))
-			{
-			  $script .= "
-			if(\$isInsert) {";
-	      $this->applyBehaviorModifier('postInsert', $script, "				");
-	      $script .= "
-			}";
-			}
-			$script .= "
-			\$con->commit();
-			".$this->getPeerClassname()."::addInstanceToPool(\$this);
-			return \$affectedRows;";
-		}
-		
-		$script .= "
-		} catch (PropelException \$e) {
-			\$con->rollBack();
-			throw \$e;
-		}";
-	}
-
-	/**
-	 * Adds the function close for the save method
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addSave()
-	 **/
-	protected function addSaveClose(&$script) {
-		$script .= "
-	}
-";
-	}
-
-	/**
-	 * Adds the $alreadyInValidation attribute, which prevents attempting to re-validate the same object.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addAlreadyInValidationAttribute(&$script)
-	{
-		$script .= "
-	/**
-	 * Flag to prevent endless validation loop, if this object is referenced
-	 * by another object which falls in this transaction.
-	 * @var        boolean
-	 */
-	protected \$alreadyInValidation = false;
-";
-	}
-
-	/**
-	 * Adds the validate() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addValidate(&$script)
-	{
-		$script .= "
-	/**
-	 * Validates the objects modified field values and all objects related to this table.
-	 *
-	 * If \$columns is either a column name or an array of column names
-	 * only those columns are validated.
-	 *
-	 * @param      mixed \$columns Column name or an array of column names.
-	 * @return     boolean Whether all columns pass validation.
-	 * @see        doValidate()
-	 * @see        getValidationFailures()
-	 */
-	public function validate(\$columns = null)
-	{
-		\$res = \$this->doValidate(\$columns);
-		if (\$res === true) {
-			\$this->validationFailures = array();
-			return true;
-		} else {
-			\$this->validationFailures = \$res;
-			return false;
-		}
-	}
-";
-	} // addValidate()
-
-	/**
-	 * Adds the workhourse doValidate() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoValidate(&$script)
-	{
-		$table = $this->getTable();
-
-		$script .= "
-	/**
-	 * This function performs the validation work for complex object models.
-	 *
-	 * In addition to checking the current object, all related objects will
-	 * also be validated.  If all pass then <code>true</code> is returned; otherwise
-	 * an aggreagated array of ValidationFailed objects will be returned.
-	 *
-	 * @param      array \$columns Array of column names to validate.
-	 * @return     mixed <code>true</code> if all validations pass; array of <code>ValidationFailed</code> objets otherwise.
-	 */
-	protected function doValidate(\$columns = null)
-	{
-		if (!\$this->alreadyInValidation) {
-			\$this->alreadyInValidation = true;
-			\$retval = null;
-
-			\$failureMap = array();
-";
-		if (count($table->getForeignKeys()) != 0) {
-			$script .= "
-
-			// We call the validate method on the following object(s) if they
-			// were passed to this object by their coresponding set
-			// method.  This object relates to these object(s) by a
-			// foreign key reference.
-";
-			foreach ($table->getForeignKeys() as $fk) {
-				$aVarName = $this->getFKVarName($fk);
-				$script .= "
-			if (\$this->".$aVarName." !== null) {
-				if (!\$this->".$aVarName."->validate(\$columns)) {
-					\$failureMap = array_merge(\$failureMap, \$this->".$aVarName."->getValidationFailures());
-				}
-			}
-";
-			} /* for () */
-		} /* if count(fkeys) */
-
-		$script .= "
-
-			if ((\$retval = ".$this->getPeerClassname()."::doValidate(\$this, \$columns)) !== true) {
-				\$failureMap = array_merge(\$failureMap, \$retval);
-			}
-
-";
-
-		foreach ($table->getReferrers() as $refFK) {
-			if ($refFK->isLocalPrimaryKey()) {
-				$varName = $this->getPKRefFKVarName($refFK);
-				$script .= "
-				if (\$this->$varName !== null) {
-					if (!\$this->".$varName."->validate(\$columns)) {
-						\$failureMap = array_merge(\$failureMap, \$this->".$varName."->getValidationFailures());
-					}
-				}
-";
-			} else {
-				$collName = $this->getRefFKCollVarName($refFK);
-				$script .= "
-				if (\$this->$collName !== null) {
-					foreach (\$this->$collName as \$referrerFK) {
-						if (!\$referrerFK->validate(\$columns)) {
-							\$failureMap = array_merge(\$failureMap, \$referrerFK->getValidationFailures());
-						}
-					}
-				}
-";
-			}
-		} /* foreach getReferrers() */
-
-		$script .= "
-
-			\$this->alreadyInValidation = false;
-		}
-
-		return (!empty(\$failureMap) ? \$failureMap : true);
-	}
-";
-	} // addDoValidate()
-
-	/**
-	 * Adds the ensureConsistency() method to ensure that internal state is correct.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addEnsureConsistency(&$script)
-	{
-		$table = $this->getTable();
-
-		$script .= "
-	/**
-	 * Checks and repairs the internal consistency of the object.
-	 *
-	 * This method is executed after an already-instantiated object is re-hydrated
-	 * from the database.  It exists to check any foreign keys to make sure that
-	 * the objects related to the current object are correct based on foreign key.
-	 *
-	 * You can override this method in the stub class, but you should always invoke
-	 * the base method from the overridden method (i.e. parent::ensureConsistency()),
-	 * in case your model changes.
-	 *
-	 * @throws     PropelException
-	 */
-	public function ensureConsistency()
-	{
-";
-		foreach ($table->getColumns() as $col) {
-
-			$clo=strtolower($col->getName());
-
-			if ($col->isForeignKey()) {
-				foreach ($col->getForeignKeys() as $fk) {
-
-					$tblFK = $table->getDatabase()->getTable($fk->getForeignTableName());
-					$colFK = $tblFK->getColumn($fk->getMappedForeignColumn($col->getName()));
-					$varName = $this->getFKVarName($fk);
-
-					$script .= "
-		if (\$this->".$varName." !== null && \$this->$clo !== \$this->".$varName."->get".$colFK->getPhpName()."()) {
-			\$this->$varName = null;
-		}";
-				} // foraech
-			} /* if col is foreign key */
-
-		} // foreach
-
-		$script .= "
-	} // ensureConsistency
-";
-	} // addCheckRelConsistency
-
-	/**
-	 * Adds the copy() method, which (in complex OM) includes the $deepCopy param for making copies of related objects.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addCopy(&$script)
-	{
-		$this->addCopyInto($script);
-
-		$table = $this->getTable();
-
-		$script .= "
-	/**
-	 * Makes a copy of this object that will be inserted as a new row in table when saved.
-	 * It creates a new object filling in the simple attributes, but skipping any primary
-	 * keys that are defined for the table.
-	 *
-	 * If desired, this method can also make copies of all associated (fkey referrers)
-	 * objects.
-	 *
-	 * @param      boolean \$deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-	 * @return     ".$this->getObjectClassname()." Clone of current object.
-	 * @throws     PropelException
-	 */
-	public function copy(\$deepCopy = false)
-	{
-		// we use get_class(), because this might be a subclass
-		\$clazz = get_class(\$this);
-		" . $this->buildObjectInstanceCreationCode('$copyObj', '$clazz') . "
-		\$this->copyInto(\$copyObj, \$deepCopy);
-		return \$copyObj;
-	}
-";
-	} // addCopy()
-
-	/**
-	 * Adds the copyInto() method, which takes an object and sets contents to match current object.
-	 * In complex OM this method includes the $deepCopy param for making copies of related objects.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addCopyInto(&$script)
-	{
-		$table = $this->getTable();
-
-		$script .= "
-	/**
-	 * Sets contents of passed object to values from current object.
-	 *
-	 * If desired, this method can also make copies of all associated (fkey referrers)
-	 * objects.
-	 *
-	 * @param      object \$copyObj An object of ".$this->getObjectClassname()." (or compatible) type.
-	 * @param      boolean \$deepCopy Whether to also copy all rows that refer (by fkey) to the current row.
-	 * @throws     PropelException
-	 */
-	public function copyInto(\$copyObj, \$deepCopy = false)
-	{
-";
-
-		$autoIncCols = array();
-		foreach ($table->getColumns() as $col) {
-			/* @var        $col Column */
-			if ($col->isAutoIncrement()) {
-				$autoIncCols[] = $col;
-			}
-		}
-
-		foreach ($table->getColumns() as $col) {
-			if (!in_array($col, $autoIncCols, true)) {
-				$script .= "
-		\$copyObj->set".$col->getPhpName()."(\$this->".strtolower($col->getName()).");
-";
-			}
-		} // foreach
-
-		// Avoid useless code by checking to see if there are any referrers
-		// to this table:
-		if (count($table->getReferrers()) > 0) {
-			$script .= "
-
-		if (\$deepCopy) {
-			// important: temporarily setNew(false) because this affects the behavior of
-			// the getter/setter methods for fkey referrer objects.
-			\$copyObj->setNew(false);
-";
-			foreach ($table->getReferrers() as $fk) {
-				//HL: commenting out self-referrential check below
-				//		it seems to work as expected and is probably desireable to have those referrers from same table deep-copied.
-				//if ( $fk->getTable()->getName() != $table->getName() ) {
-
-				if ($fk->isLocalPrimaryKey()) {
-
-					$afx = $this->getRefFKPhpNameAffix($fk, $plural = false);
-					$script .= "
-			\$relObj = \$this->get$afx();
-			if (\$relObj) {
-				\$copyObj->set$afx(\$relObj->copy(\$deepCopy));
-			}
-";
-				} else {
-
-					$script .= "
-			foreach (\$this->get".$this->getRefFKPhpNameAffix($fk, true)."() as \$relObj) {
-				if (\$relObj !== \$this) {  // ensure that we don't try to copy a reference to ourselves
-					\$copyObj->add".$this->getRefFKPhpNameAffix($fk)."(\$relObj->copy(\$deepCopy));
-				}
-			}
-";
-				}
-				// HL: commenting out close of self-referential check
-				// } /* if tblFK != table */
-			} /* foreach */
-			$script .= "
-		} // if (\$deepCopy)
-";
-		} /* if (count referrers > 0 ) */
-
-		$script .= "
-
-		\$copyObj->setNew(true);
-";
-
-		// Note: we're no longer resetting non-autoincrement primary keys to default values
-		// due to: http://propel.phpdb.org/trac/ticket/618
-		foreach ($autoIncCols as $col) {
-				$coldefval = $col->getPhpDefaultValue();
-				$coldefval = var_export($coldefval, true);
-				$script .= "
-		\$copyObj->set".$col->getPhpName() ."($coldefval); // this is a auto-increment column, so set to default value
-";
-		} // foreach
-		$script .= "
-	}
-";
-	} // addCopyInto()
-
-
-	/**
-	 * Adds clearAllReferencers() method which resets all the collections of referencing
-	 * fk objects.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClearAllReferences(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Resets all collections of referencing foreign keys.
-	 *
-	 * This method is a user-space workaround for PHP's inability to garbage collect objects
-	 * with circular references.  This is currently necessary when using Propel in certain
-	 * daemon or large-volumne/high-memory operations.
-	 *
-	 * @param      boolean \$deep Whether to also clear the references on all associated objects.
-	 */
-	public function clearAllReferences(\$deep = false)
-	{
-		if (\$deep) {";
-		$vars = array();
-		foreach ($this->getTable()->getReferrers() as $refFK) {
-			if ($refFK->isLocalPrimaryKey()) {
-				$varName = $this->getPKRefFKVarName($refFK);
-				$vars[] = $varName;
-				$script .= "
-			if (\$this->$varName) {
-				\$this->{$varName}->clearAllReferences(\$deep);
-			}";
-			} else {
-				$varName = $this->getRefFKCollVarName($refFK);
-				$vars[] = $varName;
-				$script .= "
-			if (\$this->$varName) {
-				foreach ((array) \$this->$varName as \$o) {
-					\$o->clearAllReferences(\$deep);
-				}
-			}";
-			}
-		}
-
-		$script .= "
-		} // if (\$deep)
-";
-
-		foreach ($vars as $varName) {
-			$script .= "
-		\$this->$varName = null;";
-		}
-
-		foreach ($table->getForeignKeys() as $fk) {
-			$className = $this->getForeignTable($fk)->getPhpName();
-			$varName = $this->getFKVarName($fk);
-			$script .= "
-			\$this->$varName = null;";
-		}
-
-		$script .= "
-	}
-";
-	}
-
-  /**
-   * Adds a magic __toString() method if a string column was defined as primary string
-	 * @param      string &$script The script will be modified in this method.
-   */
-  protected function addPrimaryString(&$script)
-  {
-    foreach ($this->getTable()->getColumns() as $column) {
-      if ($column->isPrimaryString()) {
-        $script .= "
-	/**
-	 * Return the string representation of this object
-	 *
-	 * @return string The value of the '{$column->getName()}' column
-	 */
-  public function __toString()
-  {
-    return (string) \$this->get{$column->getPhpName()}();
-  }
-";
-        break;
-      }
-    }
-  }
-} // PHP5ObjectBuilder
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5PeerBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5PeerBuilder.php
deleted file mode 100644
index fa29313ab..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5PeerBuilder.php
+++ /dev/null
@@ -1,2645 +0,0 @@
-<?php
-
-/*
- *  $Id: PHP5PeerBuilder.php 1450 2010-01-12 21:19:00Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/PeerBuilder.php';
-
-/**
- * Generates a PHP5 base Peer class for user object model (OM).
- *
- * This class produces the base peer class (e.g. BaseMyPeer) which contains all
- * the custom-built query and manipulator methods.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder.om.php5
- */
-class PHP5PeerBuilder extends PeerBuilder {
-
-	/**
-	 * Validates the current table to make sure that it won't
-	 * result in generated code that will not parse.
-	 *
-	 * This method may emit warnings for code which may cause problems
-	 * and will throw exceptions for errors that will definitely cause
-	 * problems.
-	 */
-	protected function validateModel()
-	{
-		parent::validateModel();
-
-		$table = $this->getTable();
-
-		// Check to see if any of the column constants are PHP reserved words.
-		$colConstants = array();
-
-		foreach ($table->getColumns() as $col) {
-			$colConstants[] = $this->getColumnName($col);
-		}
-
-		$reservedConstants = array_map('strtoupper', ClassTools::getPhpReservedWords());
-
-		$intersect = array_intersect($reservedConstants, $colConstants);
-		if (!empty($intersect)) {
-			throw new EngineException("One or more of your column names for [" . $table->getName() . "] table conflict with a PHP reserved word (" . implode(", ", $intersect) . ")");
-		}
-	}
-
-	/**
-	 * Returns the name of the current class being built.
-	 * @return     string
-	 */
-	public function getUnprefixedClassname()
-	{
-		return $this->getBuildProperty('basePrefix') . $this->getStubPeerBuilder()->getUnprefixedClassname();
-	}
-
-	/**
-	 * Gets the package for the [base] peer classes.
-	 * @return     string
-	 */
-	public function getPackage()
-	{
-		return parent::getPackage() . ".om";
-	}
-
-	/**
-	 * Adds the include() statements for files that this class depends on or utilizes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addIncludes(&$script)
-	{
-	} // addIncludes()
-
-	/**
-	 * Adds class phpdoc comment and openning of class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassOpen(&$script) {
-
-		$tableName = $this->getTable()->getName();
-		$tableDesc = $this->getTable()->getDescription();
-
-		$script .= "
-/**
- * Base static class for performing query and update operations on the '$tableName' table.
- *
- * $tableDesc
- *";
-		if ($this->getBuildProperty('addTimeStamp')) {
-			$now = strftime('%c');
-			$script .= "
- * This class was autogenerated by Propel " . $this->getBuildProperty('version') . " on:
- *
- * $now
- *";
-		}
-
-		$extendingPeerClass = '';
-		if ($this->basePeerClassname !== 'BasePeer') {
-			$extendingPeerClass = ' extends ' . $this->basePeerClassname;
-		}
-
-		$script .= "
- * @package    ".$this->getPackage()."
- */
-abstract class ".$this->getClassname(). $extendingPeerClass . " {
-";
-	}
-
-	/**
-	 * Closes class.
-	 * Adds closing brace at end of class and the static map builder registration code.
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addStaticTableMapRegistration()
-	 */
-	protected function addClassClose(&$script)
-	{
-	  // apply behaviors
-    $this->applyBehaviorModifier('staticMethods', $script, "	");
-		
-		$script .= "
-} // " . $this->getClassname() . "
-";
-		$this->addStaticTableMapRegistration($script);
-	}
-
-	/**
-	 * Adds the static map builder registration code.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addStaticTableMapRegistration(&$script)
-	{
-		$table = $this->getTable();
-
-		$script .= "
-// This is the static code needed to register the TableMap for this table with the main Propel class.
-//
-".$this->getClassName()."::buildTableMap();
-
-";
-    $this->applyBehaviorModifier('peerFilter', $script, "");
-	}
-
-  public function getTableMapClass()
-  {
-    return $this->getTablePhpName() . 'TableMap';
-  }
-  
-  public function getTablePhpName()
-  {
-  	return ($this->getTable()->isAbstract() ? '' : $this->getStubObjectBuilder()->getClassname());
-  }
-
-	/**
-	 * Adds constant and variable declarations that go at the top of the class.
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        addColumnNameConstants()
-	 */
-	protected function addConstantsAndAttributes(&$script)
-	{
-		$dbName = $this->getDatabase()->getName();
-	  $tableName = $this->prefixTableName($this->getTable()->getName());
-	  $tablePhpName = $this->getTablePhpName();
-		$script .= "
-	/** the default database name for this class */
-	const DATABASE_NAME = '$dbName';
-
-	/** the table name for this class */
-	const TABLE_NAME = '$tableName';
-
-	/** the related Propel class for this table */
-	const OM_CLASS = '$tablePhpName';
-
-	/** A class that can be returned by this peer. */
-	const CLASS_DEFAULT = '".$this->getStubObjectBuilder()->getClasspath()."';
-
-	/** the related TableMap class for this table */
-	const TM_CLASS = '".$this->getTableMapClass()."';
-	
-	/** The total number of columns. */
-	const NUM_COLUMNS = ".$this->getTable()->getNumColumns().";
-
-	/** The number of lazy-loaded columns. */
-	const NUM_LAZY_LOAD_COLUMNS = ".$this->getTable()->getNumLazyLoadColumns().";
-";
-		$this->addColumnNameConstants($script);
-		$this->addInheritanceColumnConstants($script);
-
-		$script .= "
-	/**
-	 * An identiy map to hold any loaded instances of ".$this->getObjectClassname()." objects.
-	 * This must be public so that other peer classes can access this when hydrating from JOIN
-	 * queries.
-	 * @var        array ".$this->getObjectClassname()."[]
-	 */
-	public static \$instances = array();
-
-";
-
-		// apply behaviors
-    $this->applyBehaviorModifier('staticAttributes', $script, "	");
-		
-		$this->addFieldNamesAttribute($script);
-		$this->addFieldKeysAttribute($script);
-	}
-
-	/**
-	 * Adds the COLUMN_NAME contants to the class definition.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addColumnNameConstants(&$script)
-	{
-		foreach ($this->getTable()->getColumns() as $col) {
-			$script .= "
-	/** the column name for the ".strtoupper($col->getName()) ." field */
-	const ".$this->getColumnName($col) ." = '".$this->prefixTablename($this->getTable()->getName()).".".strtoupper($col->getName())."';
-";
-		} // foreach
-	}
-
-	protected function addFieldNamesAttribute(&$script)
-	{
-		$table = $this->getTable();
-
-		$tableColumns = $table->getColumns();
-
-		$script .= "
-	/**
-	 * holds an array of fieldnames
-	 *
-	 * first dimension keys are the type constants
-	 * e.g. self::\$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
-	 */
-	private static \$fieldNames = array (
-		BasePeer::TYPE_PHPNAME => array (";
-		foreach ($tableColumns as $col) {
-			$script .= "'".$col->getPhpName()."', ";
-		}
-		$script .= "),
-		BasePeer::TYPE_STUDLYPHPNAME => array (";
-		foreach ($tableColumns as $col) {
-			$script .= "'".$col->getStudlyPhpName()."', ";
-		}
-		$script .= "),
-		BasePeer::TYPE_COLNAME => array (";
-		foreach ($tableColumns as $col) {
-			$script .= $this->getColumnConstant($col, 'self').", ";
-		}
-		$script .= "),
-		BasePeer::TYPE_FIELDNAME => array (";
-		foreach ($tableColumns as $col) {
-			$script .= "'".$col->getName()."', ";
-		}
-		$script .= "),
-		BasePeer::TYPE_NUM => array (";
-		foreach ($tableColumns as $num => $col) {
-			$script .= "$num, ";
-		}
-		$script .= ")
-	);
-";
-	}
-
-	protected function addFieldKeysAttribute(&$script)
-	{
-		$table = $this->getTable();
-
-		$tableColumns = $table->getColumns();
-
-		$script .= "
-	/**
-	 * holds an array of keys for quick access to the fieldnames array
-	 *
-	 * first dimension keys are the type constants
-	 * e.g. self::\$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0
-	 */
-	private static \$fieldKeys = array (
-		BasePeer::TYPE_PHPNAME => array (";
-		foreach ($tableColumns as $num => $col) {
-			$script .= "'".$col->getPhpName()."' => $num, ";
-		}
-		$script .= "),
-		BasePeer::TYPE_STUDLYPHPNAME => array (";
-		foreach ($tableColumns as $num => $col) {
-			$script .= "'".$col->getStudlyPhpName()."' => $num, ";
-		}
-		$script .= "),
-		BasePeer::TYPE_COLNAME => array (";
-		foreach ($tableColumns as $num => $col) {
-			$script .= $this->getColumnConstant($col, 'self')." => $num, ";
-		}
-		$script .= "),
-		BasePeer::TYPE_FIELDNAME => array (";
-		foreach ($tableColumns as $num => $col) {
-			$script .= "'".$col->getName()."' => $num, ";
-		}
-		$script .= "),
-		BasePeer::TYPE_NUM => array (";
-		foreach ($tableColumns as $num => $col) {
-			$script .= "$num, ";
-		}
-		$script .= ")
-	);
-";
-	} // addFielKeysAttribute
-
-
-	protected function addGetFieldNames(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns an array of field names.
-	 *
-	 * @param      string \$type The type of fieldnames to return:
-	 *                      One of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME
-	 *                      BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM
-	 * @return     array A list of field names
-	 */
-
-	static public function getFieldNames(\$type = BasePeer::TYPE_PHPNAME)
-	{
-		if (!array_key_exists(\$type, self::\$fieldNames)) {
-			throw new PropelException('Method getFieldNames() expects the parameter \$type to be one of the class constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME, BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. ' . \$type . ' was given.');
-		}
-		return self::\$fieldNames[\$type];
-	}
-";
-
-	} // addGetFieldNames()
-
-	protected function addTranslateFieldName(&$script)
-	{
-		$script .= "
-	/**
-	 * Translates a fieldname to another type
-	 *
-	 * @param      string \$name field name
-	 * @param      string \$fromType One of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME
-	 *                         BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM
-	 * @param      string \$toType   One of the class type constants
-	 * @return     string translated name of the field.
-	 * @throws     PropelException - if the specified name could not be found in the fieldname mappings.
-	 */
-	static public function translateFieldName(\$name, \$fromType, \$toType)
-	{
-		\$toNames = self::getFieldNames(\$toType);
-		\$key = isset(self::\$fieldKeys[\$fromType][\$name]) ? self::\$fieldKeys[\$fromType][\$name] : null;
-		if (\$key === null) {
-			throw new PropelException(\"'\$name' could not be found in the field names of type '\$fromType'. These are: \" . print_r(self::\$fieldKeys[\$fromType], true));
-		}
-		return \$toNames[\$key];
-	}
-";
-	} // addTranslateFieldName()
-
-	/**
-	 * Adds the buildTableMap() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addBuildTableMap(&$script)
-	{
-		$script .= "
-	/**
-	 * Add a TableMap instance to the database for this peer class.
-	 */
-	public static function buildTableMap()
-	{
-	  \$dbMap = Propel::getDatabaseMap(".$this->getClassname()."::DATABASE_NAME);
-	  if (!\$dbMap->hasTable(".$this->getClassname()."::TABLE_NAME))
-	  {
-	    \$dbMap->addTableObject(new ".$this->getTableMapClass()."());
-	  }
-	}
-";
-	}
-
-	/**
-	 * Adds the CLASSKEY_* and CLASSNAME_* constants used for inheritance.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	public function addInheritanceColumnConstants(&$script)
-	{
-		if ($this->getTable()->getChildrenColumn()) {
-
-			$col = $this->getTable()->getChildrenColumn();
-			$cfc = $col->getPhpName();
-
-			if ($col->isEnumeratedClasses()) {
-
-				if ($col->isPhpPrimitiveNumericType()) $quote = "";
-				else $quote = '"';
-
-				foreach ($col->getChildren() as $child) {
-					$childBuilder = $this->getMultiExtendObjectBuilder();
-					$childBuilder->setChild($child);
-
-					$script .= "
-	/** A key representing a particular subclass */
-	const CLASSKEY_".strtoupper($child->getKey())." = '" . $child->getKey() . "';
-";
-
-					if (strtoupper($child->getClassname()) != strtoupper($child->getKey())) {
-						$script .= "
-	/** A key representing a particular subclass */
-	const CLASSKEY_".strtoupper($child->getClassname())." = '" . $child->getKey() . "';
-";
-					}
-
-					$script .= "
-	/** A class that can be returned by this peer. */
-	const CLASSNAME_".strtoupper($child->getKey())." = '". $childBuilder->getClasspath() . "';
-";
-				} /* foreach children */
-			} /* if col->isenumerated...() */
-		} /* if table->getchildrencolumn() */
-
-	} //
-
-	/**
-	 * Adds the alias() utility method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addAlias(&$script)
-	{
-		$script .= "
-	/**
-	 * Convenience method which changes table.column to alias.column.
-	 *
-	 * Using this method you can maintain SQL abstraction while using column aliases.
-	 * <code>
-	 *		\$c->addAlias(\"alias1\", TablePeer::TABLE_NAME);
-	 *		\$c->addJoin(TablePeer::alias(\"alias1\", TablePeer::PRIMARY_KEY_COLUMN), TablePeer::PRIMARY_KEY_COLUMN);
-	 * </code>
-	 * @param      string \$alias The alias for the current table.
-	 * @param      string \$column The column name for current table. (i.e. ".$this->getPeerClassname()."::COLUMN_NAME).
-	 * @return     string
-	 */
-	public static function alias(\$alias, \$column)
-	{
-		return str_replace(".$this->getPeerClassname()."::TABLE_NAME.'.', \$alias.'.', \$column);
-	}
-";
-	} // addAliasMethod
-
-	/**
-	 * Adds the addSelectColumns() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addAddSelectColumns(&$script)
-	{
-		$script .= "
-	/**
-	 * Add all the columns needed to create a new object.
-	 *
-	 * Note: any columns that were marked with lazyLoad=\"true\" in the
-	 * XML schema will not be added to the select list and only loaded
-	 * on demand.
-	 *
-	 * @param      criteria object containing the columns to add.
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	public static function addSelectColumns(Criteria \$criteria)
-	{";
-		foreach ($this->getTable()->getColumns() as $col) {
-			if (!$col->isLazyLoad()) {
-				$script .= "
-		\$criteria->addSelectColumn(".$this->getPeerClassname()."::".$this->getColumnName($col).");";
-			} // if !col->isLazyLoad
-		} // foreach
-		$script .="
-	}
-";
-	} // addAddSelectColumns()
-
-	/**
-	 * Adds the doCount() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoCount(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns the number of rows matching criteria.
-	 *
-	 * @param      Criteria \$criteria
-	 * @param      boolean \$distinct Whether to select only distinct columns; deprecated: use Criteria->setDistinct() instead.
-	 * @param      PropelPDO \$con
-	 * @return     int Number of matching rows.
-	 */
-	public static function doCount(Criteria \$criteria, \$distinct = false, PropelPDO \$con = null)
-	{
-		// we may modify criteria, so copy it first
-		\$criteria = clone \$criteria;
-
-		// We need to set the primary table name, since in the case that there are no WHERE columns
-		// it will be impossible for the BasePeer::createSelectSql() method to determine which
-		// tables go into the FROM clause.
-		\$criteria->setPrimaryTableName(".$this->getPeerClassname()."::TABLE_NAME);
-
-		if (\$distinct && !in_array(Criteria::DISTINCT, \$criteria->getSelectModifiers())) {
-			\$criteria->setDistinct();
-		}
-
-		if (!\$criteria->hasSelectClause()) {
-			".$this->getPeerClassname()."::addSelectColumns(\$criteria);
-		}
-
-		\$criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count
-		\$criteria->setDbName(self::DATABASE_NAME); // Set the correct dbName
-
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_READ);
-		}";
-		
-		// apply behaviors
-    $this->applyBehaviorModifier('preSelect', $script);
-    
-		$script .= "
-		// BasePeer returns a PDOStatement
-		\$stmt = ".$this->basePeerClassname."::doCount(\$criteria, \$con);
-
-		if (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
-			\$count = (int) \$row[0];
-		} else {
-			\$count = 0; // no rows returned; we infer that means 0 matches.
-		}
-		\$stmt->closeCursor();
-		return \$count;
-	}";
-	}
-
-	/**
-	 * Adds the doSelectOne() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoSelectOne(&$script)
-	{
-		$script .= "
-	/**
-	 * Method to select one object from the DB.
-	 *
-	 * @param      Criteria \$criteria object used to create the SELECT statement.
-	 * @param      PropelPDO \$con
-	 * @return     ".$this->getObjectClassname()."
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	public static function doSelectOne(Criteria \$criteria, PropelPDO \$con = null)
-	{
-		\$critcopy = clone \$criteria;
-		\$critcopy->setLimit(1);
-		\$objects = ".$this->getPeerClassname()."::doSelect(\$critcopy, \$con);
-		if (\$objects) {
-			return \$objects[0];
-		}
-		return null;
-	}";
-	}
-
-	/**
-	 * Adds the doSelect() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoSelect(&$script)
-	{
-		$script .= "
-	/**
-	 * Method to do selects.
-	 *
-	 * @param      Criteria \$criteria The Criteria object used to build the SELECT statement.
-	 * @param      PropelPDO \$con
-	 * @return     array Array of selected Objects
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	public static function doSelect(Criteria \$criteria, PropelPDO \$con = null)
-	{
-		return ".$this->getPeerClassname()."::populateObjects(".$this->getPeerClassname()."::doSelectStmt(\$criteria, \$con));
-	}";
-	}
-
-	/**
-	 * Adds the doSelectStmt() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoSelectStmt(&$script)
-	{
-
-		$script .= "
-	/**
-	 * Prepares the Criteria object and uses the parent doSelect() method to execute a PDOStatement.
-	 *
-	 * Use this method directly if you want to work with an executed statement durirectly (for example
-	 * to perform your own object hydration).
-	 *
-	 * @param      Criteria \$criteria The Criteria object used to build the SELECT statement.
-	 * @param      PropelPDO \$con The connection to use
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 * @return     PDOStatement The executed PDOStatement object.
-	 * @see        ".$this->basePeerClassname."::doSelect()
-	 */
-	public static function doSelectStmt(Criteria \$criteria, PropelPDO \$con = null)
-	{
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_READ);
-		}
-
-		if (!\$criteria->hasSelectClause()) {
-			\$criteria = clone \$criteria;
-			".$this->getPeerClassname()."::addSelectColumns(\$criteria);
-		}
-
-		// Set the correct dbName
-		\$criteria->setDbName(self::DATABASE_NAME);";
-		// apply behaviors
-		if ($this->hasBehaviorModifier('preSelect'))
-		{
-      $this->applyBehaviorModifier('preSelect', $script);
-		}
-		$script .= "
-
-		// BasePeer returns a PDOStatement
-		return ".$this->basePeerClassname."::doSelect(\$criteria, \$con);
-	}";
-	}
-
-	/**
-	 * Adds the PHP code to return a instance pool key for the passed-in primary key variable names.
-	 *
-	 * @param      array $pkphp An array of PHP var names / method calls representing complete pk.
-	 */
-	protected function getInstancePoolKeySnippet($pkphp)
-	{
-		$pkphp = (array) $pkphp; // make it an array if it is not.
-		$script = "";
-		if (count($pkphp) > 1) {
-			$script .= "serialize(array(";
-			$i = 0;
-			foreach ($pkphp as $pkvar) {
-				$script .= ($i++ ? ', ' : '') . "(string) $pkvar";
-			}
-			$script .= "))";
-		} else {
-			$script .= "(string) " . $pkphp[0];
-		}
-		return $script;
-	}
-
-	/**
-	 * Creates a convenience method to add objects to an instance pool.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addAddInstanceToPool(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Adds an object to the instance pool.
-	 *
-	 * Propel keeps cached copies of objects in an instance pool when they are retrieved
-	 * from the database.  In some cases -- especially when you override doSelect*()
-	 * methods in your stub classes -- you may need to explicitly add objects
-	 * to the cache in order to ensure that the same objects are always returned by doSelect*()
-	 * and retrieveByPK*() calls.
-	 *
-	 * @param      ".$this->getObjectClassname()." \$value A ".$this->getObjectClassname()." object.
-	 * @param      string \$key (optional) key to use for instance map (for performance boost if key was already calculated externally).
-	 */
-	public static function addInstanceToPool(".$this->getObjectClassname()." \$obj, \$key = null)
-	{
-		if (Propel::isInstancePoolingEnabled()) {
-			if (\$key === null) {";
-
-		$pks = $this->getTable()->getPrimaryKey();
-
-		$php = array();
-		foreach ($pks as $pk) {
-			$php[] = '$obj->get' . $pk->getPhpName() . '()';
-		}
-		$script .= "
-				\$key = ".$this->getInstancePoolKeySnippet($php).";";
-		$script .= "
-			} // if key === null
-			self::\$instances[\$key] = \$obj;
-		}
-	}
-";
-	} // addAddInstanceToPool()
-
-	/**
-	 *  Creates a convenience method to remove objects form an instance pool.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addRemoveInstanceFromPool(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Removes an object from the instance pool.
-	 *
-	 * Propel keeps cached copies of objects in an instance pool when they are retrieved
-	 * from the database.  In some cases -- especially when you override doDelete
-	 * methods in your stub classes -- you may need to explicitly remove objects
-	 * from the cache in order to prevent returning objects that no longer exist.
-	 *
-	 * @param      mixed \$value A ".$this->getObjectClassname()." object or a primary key value.
-	 */
-	public static function removeInstanceFromPool(\$value)
-	{";
-		$script .= "
-		if (Propel::isInstancePoolingEnabled() && \$value !== null) {";
-		$pks = $table->getPrimaryKey();
-
-		$script .= "
-			if (is_object(\$value) && \$value instanceof ".$this->getObjectClassname().") {";
-
-			$php = array();
-			foreach ($pks as $pk) {
-				$php[] = '$value->get' . $pk->getPhpName() . '()';
-			}
-			$script .= "
-				\$key = ".$this->getInstancePoolKeySnippet($php).";";
-
-		$script .= "
-			} elseif (".(count($pks) > 1 ? "is_array(\$value) && count(\$value) === " . count($pks) : "is_scalar(\$value)").") {
-				// assume we've been passed a primary key";
-
-		if (count($pks) > 1) {
-			$php = array();
-			for ($i=0; $i < count($pks); $i++) {
-				$php[] = "\$value[$i]";
-			}
-		} else {
-			$php = '$value';
-		}
-		$script .= "
-				\$key = ".$this->getInstancePoolKeySnippet($php).";";
-		$script .= "
-			} else {
-				\$e = new PropelException(\"Invalid value passed to removeInstanceFromPool().  Expected primary key or ".$this->getObjectClassname()." object; got \" . (is_object(\$value) ? get_class(\$value) . ' object.' : var_export(\$value,true)));
-				throw \$e;
-			}
-
-			unset(self::\$instances[\$key]);
-		}
-	} // removeInstanceFromPool()
-";
-	} // addRemoveFromInstancePool()
-
-	/**
-	 * Adds method to clear the instance pool.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClearInstancePool(&$script)
-	{
-		$script .= "
-	/**
-	 * Clear the instance pool.
-	 *
-	 * @return     void
-	 */
-	public static function clearInstancePool()
-	{
-		self::\$instances = array();
-	}
-	";
-	}
-
-	/**
-	 * Adds method to clear the instance pool of related tables.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClearRelatedInstancePool(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Method to invalidate the instance pool of all tables related to " . $table->getName() . "
-	 * by a foreign key with ON DELETE CASCADE
-	 */
-	public static function clearRelatedInstancePool()
-	{";
-		// Handle ON DELETE CASCADE for updating instance pool
-
-		foreach ($table->getReferrers() as $fk) {
-
-			// $fk is the foreign key in the other table, so localTableName will
-			// actually be the table name of other table
-			$tblFK = $fk->getTable();
-
-			$joinedTablePeerBuilder = $this->getNewPeerBuilder($tblFK);
-			$tblFKPackage = $joinedTablePeerBuilder->getStubPeerBuilder()->getPackage();
-
-			if (!$tblFK->isForReferenceOnly()) {
-				// we can't perform operations on tables that are
-				// not within the schema (i.e. that we have no map for, etc.)
-
-				$fkClassName = $joinedTablePeerBuilder->getObjectClassname();
-
-				// i'm not sure whether we can allow delete cascade for foreign keys
-				// within the same table?  perhaps we can?
-				if ( ($fk->getOnDelete() == ForeignKey::CASCADE || $fk->getOnDelete() == ForeignKey::SETNULL )
-				&& $tblFK->getName() != $table->getName()) {
-					$script .= "
-		// invalidate objects in ".$joinedTablePeerBuilder->getPeerClassname()." instance pool, since one or more of them may be deleted by ON DELETE CASCADE rule.
-		".$joinedTablePeerBuilder->getPeerClassname()."::clearInstancePool();
-";
-				} // if fk is on delete cascade
-			} // if (! for ref only)
-		} // foreach
-		$script .= "
-	}
-";
-	}
-
-	/**
-	 * Adds method to get an the instance from the pool, given a key.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetInstanceFromPool(&$script)
-	{
-		$script .= "
-	/**
-	 * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
-	 *
-	 * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
-	 * a multi-column primary key, a serialize()d version of the primary key will be returned.
-	 *
-	 * @param      string \$key The key (@see getPrimaryKeyHash()) for this instance.
-	 * @return     ".$this->getObjectClassname()." Found object or NULL if 1) no instance exists for specified key or 2) instance pooling has been disabled.
-	 * @see        getPrimaryKeyHash()
-	 */
-	public static function getInstanceFromPool(\$key)
-	{
-		if (Propel::isInstancePoolingEnabled()) {
-			if (isset(self::\$instances[\$key])) {
-				return self::\$instances[\$key];
-			}
-		}
-		return null; // just to be explicit
-	}
-	";
-	}
-
-	/**
-	 * Adds method to get a version of the primary key that can be used as a unique key for identifier map.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetPrimaryKeyHash(&$script)
-	{
-		$script .= "
-	/**
-	 * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
-	 *
-	 * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
-	 * a multi-column primary key, a serialize()d version of the primary key will be returned.
-	 *
-	 * @param      array \$row PropelPDO resultset row.
-	 * @param      int \$startcol The 0-based offset for reading from the resultset row.
-	 * @return     string A string version of PK or NULL if the components of primary key in result array are all null.
-	 */
-	public static function getPrimaryKeyHashFromRow(\$row, \$startcol = 0)
-	{";
-
-		// We have to iterate through all the columns so that we know the offset of the primary
-		// key columns.
-		$n = 0;
-		$pk = array();
-		$cond = array();
-		foreach ($this->getTable()->getColumns() as $col) {
-			if (!$col->isLazyLoad()) {
-				if ($col->isPrimaryKey()) {
-					$part = $n ? "\$row[\$startcol + $n]" : "\$row[\$startcol]";
-					$cond[] = $part . " === null";
-					$pk[] = $part;
-				}
-				$n++;
-			}
-		}
-
-		$script .= "
-		// If the PK cannot be derived from the row, return NULL.
-		if (".implode(' && ', $cond).") {
-			return null;
-		}
-		return ".$this->getInstancePoolKeySnippet($pk).";
-	}
-";
-	} // addGetPrimaryKeyHash
-
-	/**
-	 * Adds the populateObjects() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addPopulateObjects(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * The returned array will contain objects of the default type or
-	 * objects that inherit from the default.
-	 *
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	public static function populateObjects(PDOStatement \$stmt)
-	{
-		\$results = array();
-	";
-		if (!$table->getChildrenColumn()) {
-			$script .= "
-		// set the class once to avoid overhead in the loop
-		\$cls = ".$this->getPeerClassname()."::getOMClass(false);";
-		}
-
-		$script .= "
-		// populate the object(s)
-		while (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
-			\$key = ".$this->getPeerClassname()."::getPrimaryKeyHashFromRow(\$row, 0);
-			if (null !== (\$obj = ".$this->getPeerClassname()."::getInstanceFromPool(\$key))) {
-				// We no longer rehydrate the object, since this can cause data loss.
-				// See http://propel.phpdb.org/trac/ticket/509
-				// \$obj->hydrate(\$row, 0, true); // rehydrate
-				\$results[] = \$obj;
-			} else {";
-		if ($table->getChildrenColumn()) {
-			$script .= "
-				// class must be set each time from the record row
-				\$cls = ".$this->getPeerClassname()."::getOMClass(\$row, 0);
-				\$cls = substr('.'.\$cls, strrpos('.'.\$cls, '.') + 1);
-				" . $this->buildObjectInstanceCreationCode('$obj', '$cls') . "
-				\$obj->hydrate(\$row);
-				\$results[] = \$obj;
-				".$this->getPeerClassname()."::addInstanceToPool(\$obj, \$key);";
-		} else {
-			$script .= "
-				" . $this->buildObjectInstanceCreationCode('$obj', '$cls') . "
-				\$obj->hydrate(\$row);
-				\$results[] = \$obj;
-				".$this->getPeerClassname()."::addInstanceToPool(\$obj, \$key);";
-		}
-		$script .= "
-			} // if key exists
-		}
-		\$stmt->closeCursor();
-		return \$results;
-	}";
-	}
-
-	/**
-	 * Adds a getOMClass() for non-abstract tables that have inheritance.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetOMClass_Inheritance(&$script)
-	{
-		$col = $this->getTable()->getChildrenColumn();
-		$script .= "
-	/**
-	 * The returned Class will contain objects of the default type or
-	 * objects that inherit from the default.
-	 *
-	 * @param      array \$row PropelPDO result row.
-	 * @param      int \$colnum Column to examine for OM class information (first is 0).
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	public static function getOMClass(\$row, \$colnum)
-	{
-		try {
-";
-		if ($col->isEnumeratedClasses()) {
-			$script .= "
-			\$omClass = null;
-			\$classKey = \$row[\$colnum + " . ($col->getPosition() - 1) . "];
-
-			switch(\$classKey) {
-";
-			foreach ($col->getChildren() as $child) {
-				$script .= "
-				case self::CLASSKEY_".strtoupper($child->getKey()).":
-					\$omClass = self::CLASSNAME_".strtoupper($child->getKey()).";
-					break;
-";
-			} /* foreach */
-			$script .= "
-				default:
-					\$omClass = self::CLASS_DEFAULT;
-";
-			$script .= "
-			} // switch
-";
-		} else { /* if not enumerated */
-			$script .= "
-			\$omClass = \$row[\$colnum + ".($col->getPosition()-1)."];
-			\$omClass = substr('.'.\$omClass, strrpos('.'.\$omClass, '.') + 1);
-";
-		}
-		$script .= "
-		} catch (Exception \$e) {
-			throw new PropelException('Unable to get OM class.', \$e);
-		}
-		return \$omClass;
-	}
-";
-	}
-
-	/**
-	 * Adds a getOMClass() signature for abstract tables that have inheritance.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetOMClass_Inheritance_Abstract(&$script)
-	{
-		$script .= "
-	/**
-	 * The returned Class will contain objects of the default type or
-	 * objects that inherit from the default.
-	 *
-	 * This method must be overridden by the stub subclass, because
-	 * ".$this->getObjectClassname()." is declared abstract in the schema.
-	 *
-	 * @param      ResultSet \$rs ResultSet with pointer to record containing om class.
-	 * @param      int \$colnum Column to examine for OM class information (first is 1).
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	abstract public static function getOMClass();
-";
-	}
-
-	/**
-	 * Adds a getOMClass() for non-abstract tables that do note use inheritance.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetOMClass_NoInheritance(&$script)
-	{
-		$script .= "
-	/**
-	 * The class that the Peer will make instances of.
-	 *
-	 * If \$withPrefix is true, the returned path
-	 * uses a dot-path notation which is tranalted into a path
-	 * relative to a location on the PHP include_path.
-	 * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
-	 *
-	 * @param      boolean $withPrefix Whether or not to return the path wit hthe class name 
-	 * @return     string path.to.ClassName
-	 */
-	public static function getOMClass(\$withPrefix = true)
-	{
-		return \$withPrefix ? ".$this->getPeerClassname()."::CLASS_DEFAULT : ".$this->getPeerClassname()."::OM_CLASS;
-	}
-";
-	}
-
-	/**
-	 * Adds a getOMClass() signature for abstract tables that do not have inheritance.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetOMClass_NoInheritance_Abstract(&$script)
-	{
-		$script .= "
-	/**
-	 * The class that the Peer will make instances of.
-	 *
-	 * This method must be overridden by the stub subclass, because
-	 * ".$this->getObjectClassname()." is declared abstract in the schema.
-	 */
-	abstract public static function getOMClass(\$withPrefix = true);
-";
-	}
-
-	/**
-	 * Adds the doInsert() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoInsert(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Method perform an INSERT on the database, given a ".$this->getObjectClassname()." or Criteria object.
-	 *
-	 * @param      mixed \$values Criteria or ".$this->getObjectClassname()." object containing data that is used to create the INSERT statement.
-	 * @param      PropelPDO \$con the PropelPDO connection to use
-	 * @return     mixed The new primary key.
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	public static function doInsert(\$values, PropelPDO \$con = null)
-	{
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_WRITE);
-		}
-
-		if (\$values instanceof Criteria) {
-			\$criteria = clone \$values; // rename for clarity
-		} else {
-			\$criteria = \$values->buildCriteria(); // build Criteria from ".$this->getObjectClassname()." object
-		}
-";
-
-		foreach ($table->getColumns() as $col) {
-			$cfc = $col->getPhpName();
-			if ($col->isPrimaryKey() && $col->isAutoIncrement() && $table->getIdMethod() != "none" && !$table->isAllowPkInsert()) {
-				$script .= "
-		if (\$criteria->containsKey(".$this->getColumnConstant($col).") && \$criteria->keyContainsValue(" . $this->getColumnConstant($col) . ") ) {
-			throw new PropelException('Cannot insert a value for auto-increment primary key ('.".$this->getColumnConstant($col).".')');
-		}
-";
-				if (!$this->getPlatform()->supportsInsertNullPk())
-				{
-				  $script .= "
-		// remove pkey col since this table uses auto-increment and passing a null value for it is not valid 
-		\$criteria->remove(".$this->getColumnConstant($col).");
-";
-				}
-			} elseif ($col->isPrimaryKey() && $col->isAutoIncrement() && $table->getIdMethod() != "none" && $table->isAllowPkInsert() && !$this->getPlatform()->supportsInsertNullPk()) {
-				  $script .= "
-		// remove pkey col if it is null since this table does not accept that
-		if (\$criteria->containsKey(".$this->getColumnConstant($col).") && !\$criteria->keyContainsValue(" . $this->getColumnConstant($col) . ") ) {
-			\$criteria->remove(".$this->getColumnConstant($col).");
-		}
-";
-			}
-		}
-		$script .= "
-
-		// Set the correct dbName
-		\$criteria->setDbName(self::DATABASE_NAME);
-
-		try {
-			// use transaction because \$criteria could contain info
-			// for more than one table (I guess, conceivably)
-			\$con->beginTransaction();
-			\$pk = ".$this->basePeerClassname."::doInsert(\$criteria, \$con);
-			\$con->commit();
-		} catch(PropelException \$e) {
-			\$con->rollBack();
-			throw \$e;
-		}
-
-		return \$pk;
-	}
-";
-	}
-
-	/**
-	 * Adds the doUpdate() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoUpdate(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Method perform an UPDATE on the database, given a ".$this->getObjectClassname()." or Criteria object.
-	 *
-	 * @param      mixed \$values Criteria or ".$this->getObjectClassname()." object containing data that is used to create the UPDATE statement.
-	 * @param      PropelPDO \$con The connection to use (specify PropelPDO connection object to exert more control over transactions).
-	 * @return     int The number of affected rows (if supported by underlying database driver).
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	public static function doUpdate(\$values, PropelPDO \$con = null)
-	{
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_WRITE);
-		}
-
-		\$selectCriteria = new Criteria(self::DATABASE_NAME);
-
-		if (\$values instanceof Criteria) {
-			\$criteria = clone \$values; // rename for clarity
-";
-		foreach ($table->getColumns() as $col) {
-			if ($col->isPrimaryKey()) {
-				$script .= "
-			\$comparison = \$criteria->getComparison(".$this->getColumnConstant($col).");
-			\$selectCriteria->add(".$this->getColumnConstant($col).", \$criteria->remove(".$this->getColumnConstant($col)."), \$comparison);
-";
-			}  /* if col is prim key */
-		} /* foreach */
-
-		$script .= "
-		} else { // \$values is ".$this->getObjectClassname()." object
-			\$criteria = \$values->buildCriteria(); // gets full criteria
-			\$selectCriteria = \$values->buildPkeyCriteria(); // gets criteria w/ primary key(s)
-		}
-
-		// set the correct dbName
-		\$criteria->setDbName(self::DATABASE_NAME);
-
-		return {$this->basePeerClassname}::doUpdate(\$selectCriteria, \$criteria, \$con);
-	}
-";
-	}
-
-	/**
-	 * Adds the doDeleteAll() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoDeleteAll(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Method to DELETE all rows from the ".$table->getName()." table.
-	 *
-	 * @return     int The number of affected rows (if supported by underlying database driver).
-	 */
-	public static function doDeleteAll(\$con = null)
-	{
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_WRITE);
-		}
-		\$affectedRows = 0; // initialize var to track total num of affected rows
-		try {
-			// use transaction because \$criteria could contain info
-			// for more than one table or we could emulating ON DELETE CASCADE, etc.
-			\$con->beginTransaction();
-			";
-		if ($this->isDeleteCascadeEmulationNeeded()) {
-			$script .="\$affectedRows += ".$this->getPeerClassname()."::doOnDeleteCascade(new Criteria(".$this->getPeerClassname()."::DATABASE_NAME), \$con);
-			";
-		}
-		if ($this->isDeleteSetNullEmulationNeeded()) {
-			$script .= $this->getPeerClassname() . "::doOnDeleteSetNull(new Criteria(".$this->getPeerClassname() . "::DATABASE_NAME), \$con);
-			";
-		}
-		$script .= "\$affectedRows += {$this->basePeerClassname}::doDeleteAll(".$this->getPeerClassname()."::TABLE_NAME, \$con);
-			// Because this db requires some delete cascade/set null emulation, we have to
-			// clear the cached instance *after* the emulation has happened (since
-			// instances get re-added by the select statement contained therein).
-			".$this->getPeerClassname()."::clearInstancePool();
-			".$this->getPeerClassname()."::clearRelatedInstancePool();
-			\$con->commit();
-			return \$affectedRows;
-		} catch (PropelException \$e) {
-			\$con->rollBack();
-			throw \$e;
-		}
-	}
-";
-	}
-
-	/**
-	 * Adds the doDelete() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoDelete(&$script)
-	{
-		$table = $this->getTable();
-		$emulateCascade = $this->isDeleteCascadeEmulationNeeded() || $this->isDeleteSetNullEmulationNeeded();
-		$script .= "
-	/**
-	 * Method perform a DELETE on the database, given a ".$this->getObjectClassname()." or Criteria object OR a primary key value.
-	 *
-	 * @param      mixed \$values Criteria or ".$this->getObjectClassname()." object or primary key or array of primary keys
-	 *              which is used to create the DELETE statement
-	 * @param      PropelPDO \$con the connection to use
-	 * @return     int 	The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
-	 *				if supported by native driver or if emulated using Propel.
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	 public static function doDelete(\$values, PropelPDO \$con = null)
-	 {
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_WRITE);
-		}
-
-		if (\$values instanceof Criteria) {";
-		if (!$emulateCascade) {
-			$script .= "
-			// invalidate the cache for all objects of this type, since we have no
-			// way of knowing (without running a query) what objects should be invalidated
-			// from the cache based on this Criteria.
-			".$this->getPeerClassname()."::clearInstancePool();";
-		}
-		$script .= "
-			// rename for clarity
-			\$criteria = clone \$values;
-		} elseif (\$values instanceof ".$this->getObjectClassname().") { // it's a model object";
-		if (!$emulateCascade) {
-			$script .= "
-			// invalidate the cache for this single object
-			".$this->getPeerClassname()."::removeInstanceFromPool(\$values);";
-		}
-		if (count($table->getPrimaryKey()) > 0) {
-			$script .= "
-			// create criteria based on pk values
-			\$criteria = \$values->buildPkeyCriteria();";
-		} else {
-			$script .= "
-			// create criteria based on pk value
-			\$criteria = \$values->buildCriteria();";
-		}
-
-		$script .= "
-		} else { // it's a primary key, or an array of pks";
-		$script .= "
-			\$criteria = new Criteria(self::DATABASE_NAME);";
-
-		if (count($table->getPrimaryKey()) === 1) {
-			$pkey = $table->getPrimaryKey();
-			$col = array_shift($pkey);
-			$script .= "
-			\$criteria->add(".$this->getColumnConstant($col).", (array) \$values, Criteria::IN);";
-			if (!$emulateCascade) {
-				$script .= "
-			// invalidate the cache for this object(s)
-			foreach ((array) \$values as \$singleval) {
-				".$this->getPeerClassname()."::removeInstanceFromPool(\$singleval);
-			}";
-			}
-		} else {
-			$script .= "
-			// primary key is composite; we therefore, expect
-			// the primary key passed to be an array of pkey values
-			if (count(\$values) == count(\$values, COUNT_RECURSIVE)) {
-				// array is not multi-dimensional
-				\$values = array(\$values);
-			}
-			foreach (\$values as \$value) {";
-			$i=0;
-			foreach ($table->getPrimaryKey() as $col) {
-				if ($i == 0) {
-					$script .= "
-				\$criterion = \$criteria->getNewCriterion(".$this->getColumnConstant($col).", \$value[$i]);";
-				} else {
-					$script .= "
-				\$criterion->addAnd(\$criteria->getNewCriterion(".$this->getColumnConstant($col).", \$value[$i]));";
-				}
-				$i++;
-			}
-			$script .= "
-				\$criteria->addOr(\$criterion);";
-			if (!$emulateCascade) {
-				$script .= "
-				// we can invalidate the cache for this single PK
-				".$this->getPeerClassname()."::removeInstanceFromPool(\$value);";
-			}
-			$script .= "
-			}";
-		} /* if count(table->getPrimaryKeys()) */
-
-		$script .= "
-		}
-
-		// Set the correct dbName
-		\$criteria->setDbName(self::DATABASE_NAME);
-
-		\$affectedRows = 0; // initialize var to track total num of affected rows
-
-		try {
-			// use transaction because \$criteria could contain info
-			// for more than one table or we could emulating ON DELETE CASCADE, etc.
-			\$con->beginTransaction();
-			";
-
-		if ($this->isDeleteCascadeEmulationNeeded()) {
-			$script .= "\$affectedRows += ".$this->getPeerClassname()."::doOnDeleteCascade(\$criteria, \$con);
-			";
-		}
-		if ($this->isDeleteSetNullEmulationNeeded()) {
-			$script .= $this->getPeerClassname() . "::doOnDeleteSetNull(\$criteria, \$con);
-			";
-		}
-
-		if ($emulateCascade) {
-			$script .= "
-			// Because this db requires some delete cascade/set null emulation, we have to
-			// clear the cached instance *after* the emulation has happened (since
-			// instances get re-added by the select statement contained therein).
-			if (\$values instanceof Criteria) {
-				".$this->getPeerClassname()."::clearInstancePool();
-			} elseif (\$values instanceof ".$this->getObjectClassname().") { // it's a model object
-				".$this->getPeerClassname()."::removeInstanceFromPool(\$values);
-			} else { // it's a primary key, or an array of pks
-				foreach ((array) \$values as \$singleval) {
-					".$this->getPeerClassname()."::removeInstanceFromPool(\$singleval);
-				}
-			}
-			";
-		}
-
-		$script .= "
-			\$affectedRows += {$this->basePeerClassname}::doDelete(\$criteria, \$con);
-			".$this->getPeerClassname()."::clearRelatedInstancePool();
-			\$con->commit();
-			return \$affectedRows;
-		} catch (PropelException \$e) {
-			\$con->rollBack();
-			throw \$e;
-		}
-	}
-";
-	}
-
-	/**
-	 * Adds the doOnDeleteCascade() method, which provides ON DELETE CASCADE emulation.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoOnDeleteCascade(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * This is a method for emulating ON DELETE CASCADE for DBs that don't support this
-	 * feature (like MySQL or SQLite).
-	 *
-	 * This method is not very speedy because it must perform a query first to get
-	 * the implicated records and then perform the deletes by calling those Peer classes.
-	 *
-	 * This method should be used within a transaction if possible.
-	 *
-	 * @param      Criteria \$criteria
-	 * @param      PropelPDO \$con
-	 * @return     int The number of affected rows (if supported by underlying database driver).
-	 */
-	protected static function doOnDeleteCascade(Criteria \$criteria, PropelPDO \$con)
-	{
-		// initialize var to track total num of affected rows
-		\$affectedRows = 0;
-
-		// first find the objects that are implicated by the \$criteria
-		\$objects = ".$this->getPeerClassname()."::doSelect(\$criteria, \$con);
-		foreach (\$objects as \$obj) {
-";
-
-		foreach ($table->getReferrers() as $fk) {
-
-			// $fk is the foreign key in the other table, so localTableName will
-			// actually be the table name of other table
-			$tblFK = $fk->getTable();
-
-			$joinedTablePeerBuilder = $this->getNewPeerBuilder($tblFK);
-			$tblFKPackage = $joinedTablePeerBuilder->getStubPeerBuilder()->getPackage();
-
-			if (!$tblFK->isForReferenceOnly()) {
-				// we can't perform operations on tables that are
-				// not within the schema (i.e. that we have no map for, etc.)
-
-				$fkClassName = $joinedTablePeerBuilder->getObjectClassname();
-
-				// i'm not sure whether we can allow delete cascade for foreign keys
-				// within the same table?  perhaps we can?
-				if ( $fk->getOnDelete() == ForeignKey::CASCADE && $tblFK->getName() != $table->getName()) {
-
-					// backwards on purpose
-					$columnNamesF = $fk->getLocalColumns();
-					$columnNamesL = $fk->getForeignColumns();
-
-					$script .= "
-
-			// delete related $fkClassName objects
-			\$criteria = new Criteria(".$joinedTablePeerBuilder->getPeerClassname()."::DATABASE_NAME);
-			";
-					for ($x=0,$xlen=count($columnNamesF); $x < $xlen; $x++) {
-						$columnFK = $tblFK->getColumn($columnNamesF[$x]);
-						$columnL = $table->getColumn($columnNamesL[$x]);
-
-						$script .= "
-			\$criteria->add(".$joinedTablePeerBuilder->getColumnConstant($columnFK) .", \$obj->get".$columnL->getPhpName()."());";
-					}
-
-					$script .= "
-			\$affectedRows += ".$joinedTablePeerBuilder->getPeerClassname()."::doDelete(\$criteria, \$con);";
-
-				} // if cascade && fkey table name != curr table name
-
-			} // if not for ref only
-		} // foreach foreign keys
-		$script .= "
-		}
-		return \$affectedRows;
-	}
-";
-	} // end addDoOnDeleteCascade
-
-	/**
-	 * Adds the doOnDeleteSetNull() method, which provides ON DELETE SET NULL emulation.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoOnDeleteSetNull(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * This is a method for emulating ON DELETE SET NULL DBs that don't support this
-	 * feature (like MySQL or SQLite).
-	 *
-	 * This method is not very speedy because it must perform a query first to get
-	 * the implicated records and then perform the deletes by calling those Peer classes.
-	 *
-	 * This method should be used within a transaction if possible.
-	 *
-	 * @param      Criteria \$criteria
-	 * @param      PropelPDO \$con
-	 * @return     void
-	 */
-	protected static function doOnDeleteSetNull(Criteria \$criteria, PropelPDO \$con)
-	{
-
-		// first find the objects that are implicated by the \$criteria
-		\$objects = ".$this->getPeerClassname()."::doSelect(\$criteria, \$con);
-		foreach (\$objects as \$obj) {
-";
-
-		// This logic is almost exactly the same as that in doOnDeleteCascade()
-		// it may make sense to refactor this, provided that thigns don't
-		// get too complicated.
-
-		foreach ($table->getReferrers() as $fk) {
-
-			// $fk is the foreign key in the other table, so localTableName will
-			// actually be the table name of other table
-			$tblFK = $fk->getTable();
-			$refTablePeerBuilder = $this->getNewPeerBuilder($tblFK);
-
-			if (!$tblFK->isForReferenceOnly()) {
-				// we can't perform operations on tables that are
-				// not within the schema (i.e. that we have no map for, etc.)
-
-				$fkClassName = $refTablePeerBuilder->getObjectClassname();
-
-				// i'm not sure whether we can allow delete setnull for foreign keys
-				// within the same table?  perhaps we can?
-				if ( $fk->getOnDelete() == ForeignKey::SETNULL &&
-				$fk->getTable()->getName() != $table->getName()) {
-
-					// backwards on purpose
-					$columnNamesF = $fk->getLocalColumns();
-					$columnNamesL = $fk->getForeignColumns(); // should be same num as foreign
-					$script .= "
-			// set fkey col in related $fkClassName rows to NULL
-			\$selectCriteria = new Criteria(".$this->getPeerClassname()."::DATABASE_NAME);
-			\$updateValues = new Criteria(".$this->getPeerClassname()."::DATABASE_NAME);";
-
-					for ($x=0,$xlen=count($columnNamesF); $x < $xlen; $x++) {
-						$columnFK = $tblFK->getColumn($columnNamesF[$x]);
-						$columnL = $table->getColumn($columnNamesL[$x]);
-						$script .= "
-			\$selectCriteria->add(".$refTablePeerBuilder->getColumnConstant($columnFK).", \$obj->get".$columnL->getPhpName()."());
-			\$updateValues->add(".$refTablePeerBuilder->getColumnConstant($columnFK).", null);
-";
-					}
-
-					$script .= "
-					{$this->basePeerClassname}::doUpdate(\$selectCriteria, \$updateValues, \$con); // use BasePeer because generated Peer doUpdate() methods only update using pkey
-";
-				} // if setnull && fkey table name != curr table name
-			} // if not for ref only
-		} // foreach foreign keys
-
-		$script .= "
-		}
-	}
-";
-	}
-
-	/**
-	 * Adds the doValidate() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoValidate(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Validates all modified columns of given ".$this->getObjectClassname()." object.
-	 * If parameter \$columns is either a single column name or an array of column names
-	 * than only those columns are validated.
-	 *
-	 * NOTICE: This does not apply to primary or foreign keys for now.
-	 *
-	 * @param      ".$this->getObjectClassname()." \$obj The object to validate.
-	 * @param      mixed \$cols Column name or array of column names.
-	 *
-	 * @return     mixed TRUE if all columns are valid or the error message of the first invalid column.
-	 */
-	public static function doValidate(".$this->getObjectClassname()." \$obj, \$cols = null)
-	{
-		\$columns = array();
-
-		if (\$cols) {
-			\$dbMap = Propel::getDatabaseMap(".$this->getPeerClassname()."::DATABASE_NAME);
-			\$tableMap = \$dbMap->getTable(".$this->getPeerClassname()."::TABLE_NAME);
-
-			if (! is_array(\$cols)) {
-				\$cols = array(\$cols);
-			}
-
-			foreach (\$cols as \$colName) {
-				if (\$tableMap->containsColumn(\$colName)) {
-					\$get = 'get' . \$tableMap->getColumn(\$colName)->getPhpName();
-					\$columns[\$colName] = \$obj->\$get();
-				}
-			}
-		} else {
-";
-		foreach ($table->getValidators() as $val) {
-			$col = $val->getColumn();
-			if (!$col->isAutoIncrement()) {
-				$script .= "
-		if (\$obj->isNew() || \$obj->isColumnModified(".$this->getColumnConstant($col)."))
-			\$columns[".$this->getColumnConstant($col)."] = \$obj->get".$col->getPhpName()."();
-";
-			} // if
-		} // foreach
-
-		$script .= "
-		}
-
-		return {$this->basePeerClassname}::doValidate(".$this->getPeerClassname()."::DATABASE_NAME, ".$this->getPeerClassname()."::TABLE_NAME, \$columns);
-	}
-";
-	} // end addDoValidate()
-
-	/**
-	 * Adds the retrieveByPK method for tables with single-column primary key.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addRetrieveByPK_SinglePK(&$script)
-	{
-		$table = $this->getTable();
-		$pks = $table->getPrimaryKey();
-		$col = $pks[0];
-
-		$script .= "
-	/**
-	 * Retrieve a single object by pkey.
-	 *
-	 * @param      ".$col->getPhpType()." \$pk the primary key.
-	 * @param      PropelPDO \$con the connection to use
-	 * @return     " .$this->getObjectClassname(). "
-	 */
-	public static function ".$this->getRetrieveMethodName()."(\$pk, PropelPDO \$con = null)
-	{
-
-		if (null !== (\$obj = ".$this->getPeerClassname()."::getInstanceFromPool(".$this->getInstancePoolKeySnippet('$pk')."))) {
-			return \$obj;
-		}
-
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_READ);
-		}
-
-		\$criteria = new Criteria(".$this->getPeerClassname()."::DATABASE_NAME);
-		\$criteria->add(".$this->getColumnConstant($col).", \$pk);
-
-		\$v = ".$this->getPeerClassname()."::doSelect(\$criteria, \$con);
-
-		return !empty(\$v) > 0 ? \$v[0] : null;
-	}
-";
-	}
-
-	/**
-	 * Adds the retrieveByPKs method for tables with single-column primary key.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addRetrieveByPKs_SinglePK(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Retrieve multiple objects by pkey.
-	 *
-	 * @param      array \$pks List of primary keys
-	 * @param      PropelPDO \$con the connection to use
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	public static function ".$this->getRetrieveMethodName()."s(\$pks, PropelPDO \$con = null)
-	{
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_READ);
-		}
-
-		\$objs = null;
-		if (empty(\$pks)) {
-			\$objs = array();
-		} else {
-			\$criteria = new Criteria(".$this->getPeerClassname()."::DATABASE_NAME);";
-		$k1 = $table->getPrimaryKey();
-		$script .= "
-			\$criteria->add(".$this->getColumnConstant($k1[0]).", \$pks, Criteria::IN);";
-		$script .= "
-			\$objs = ".$this->getPeerClassname()."::doSelect(\$criteria, \$con);
-		}
-		return \$objs;
-	}
-";
-	}
-
-	/**
-	 * Adds the retrieveByPK method for tables with multi-column primary key.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addRetrieveByPK_MultiPK(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-	/**
-	 * Retrieve object using using composite pkey values.";
-		foreach ($table->getPrimaryKey() as $col) {
-			$clo = strtolower($col->getName());
-			$cptype = $col->getPhpType();
-			$script .= "
-	 * @param      $cptype $".$clo;
-		}
-		$script .= "
-	 * @param      PropelPDO \$con
-	 * @return     ".$this->getObjectClassname()."
-	 */
-	public static function ".$this->getRetrieveMethodName()."(";
-
-		$php = array();
-		foreach ($table->getPrimaryKey() as $col) {
-			$clo = strtolower($col->getName());
-			$php[] = '$' . $clo;
-		} /* foreach */
-
-		$script .= implode(', ', $php);
-
-		$script .= ", PropelPDO \$con = null) {
-		\$key = ".$this->getInstancePoolKeySnippet($php).";";
- 		$script .= "
- 		if (null !== (\$obj = ".$this->getPeerClassname()."::getInstanceFromPool(\$key))) {
- 			return \$obj;
-		}
-
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_READ);
-		}
-		\$criteria = new Criteria(".$this->getPeerClassname()."::DATABASE_NAME);";
-		foreach ($table->getPrimaryKey() as $col) {
-			$clo = strtolower($col->getName());
-			$script .= "
-		\$criteria->add(".$this->getColumnConstant($col).", $".$clo.");";
-		}
-		$script .= "
-		\$v = ".$this->getPeerClassname()."::doSelect(\$criteria, \$con);
-
-		return !empty(\$v) ? \$v[0] : null;
-	}";
-	}
-
-	/**
-	 * Adds the getTableMap() method which is a convenience method for apps to get DB metadata.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetTableMap(&$script)
-	{
-		$script .= "
-	/**
-	 * Returns the TableMap related to this peer.
-	 * This method is not needed for general use but a specific application could have a need.
-	 * @return     TableMap
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	public static function getTableMap()
-	{
-		return Propel::getDatabaseMap(self::DATABASE_NAME)->getTable(self::TABLE_NAME);
-	}
-";
-	}
-
-	/**
-	 * Adds the complex OM methods to the base addSelectMethods() function.
-	 * @param      string &$script The script will be modified in this method.
-	 * @see        PeerBuilder::addSelectMethods()
-	 */
-	protected function addSelectMethods(&$script)
-	{
-		$table = $this->getTable();
-
-		parent::addSelectMethods($script);
-
-		$this->addDoCountJoin($script);
-		$this->addDoSelectJoin($script);
-
-		$countFK = count($table->getForeignKeys());
-
-		$includeJoinAll = true;
-
-		foreach ($this->getTable()->getForeignKeys() as $fk) {
-			$tblFK = $table->getDatabase()->getTable($fk->getForeignTableName());
-			if ($tblFK->isForReferenceOnly()) {
-				$includeJoinAll = false;
-			}
-		}
-
-		if ($includeJoinAll) {
-			if ($countFK > 0) {
-				$this->addDoCountJoinAll($script);
-				$this->addDoSelectJoinAll($script);
-			}
-			if ($countFK > 1) {
-				$this->addDoCountJoinAllExcept($script);
-				$this->addDoSelectJoinAllExcept($script);
-			}
-		}
-
-	}
-
-	/**
-	 * Get the column offsets of the primary key(s) for specified table.
-	 *
-	 * @param      Table $tbl
-	 * @return     array int[] The column offsets of the primary key(s).
-	 */
-	protected function getPrimaryKeyColOffsets(Table $tbl)
-	{
-		$offsets = array();
-		$idx = 0;
-		foreach ($tbl->getColumns() as $col) {
-			if ($col->isPrimaryKey()) {
-				$offsets[] = $idx;
-			}
-			$idx++;
-		}
-		return $offsets;
-	}
-
-  public function addCriteriaJoin($fk, $table, $joinTable, $joinedTablePeerBuilder)
-  {
-    $script = '';
-		$lfMap = $fk->getLocalForeignMapping();
-		$lftCols = $fk->getLocalColumns();
-		if (count($lftCols) == 1)
-		{
-		  // simple foreign key
-		  $lftCol = $lftCols[0];
-		  $script .= sprintf("
-		\$criteria->addJoin(%s, %s, \$join_behavior);\n",
-        $this->getColumnConstant($table->getColumn($lftCol) ),
-        $joinedTablePeerBuilder->getColumnConstant($joinTable->getColumn( $lfMap[$lftCol] ) ));
-		}
-		else
-		{
-		  // composite foreign key
-		  $script .= "
-		\$criteria->addMultipleJoin(array(\n";
-		  foreach ($lftCols as $columnName ) {
-		    $script .= sprintf("        array(%s, %s),\n", 
-				  $this->getColumnConstant($table->getColumn($columnName) ),
-				  $joinedTablePeerBuilder->getColumnConstant($joinTable->getColumn( $lfMap[$columnName] ) )
-				);
-			}
-			$script .= "      ), \$join_behavior);\n";
-		}
-		return $script;
-  }
-  
-	/**
-	 * Adds the doSelectJoin*() methods.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoSelectJoin(&$script)
-	{
-		$table = $this->getTable();
-		$className = $this->getObjectClassname();
-		$countFK = count($table->getForeignKeys());
-		$join_behavior = $this->getJoinBehavior();
-
-		if ($countFK >= 1) {
-
-			foreach ($table->getForeignKeys() as $fk) {
-
-				$joinTable = $table->getDatabase()->getTable($fk->getForeignTableName());
-
-				if (!$joinTable->isForReferenceOnly()) {
-
-					// This condition is necessary because Propel lacks a system for
-					// aliasing the table if it is the same table.
-					if ( $fk->getForeignTableName() != $table->getName() ) {
-
-						$thisTableObjectBuilder = $this->getNewObjectBuilder($table);
-						$joinedTableObjectBuilder = $this->getNewObjectBuilder($joinTable);
-						$joinedTablePeerBuilder = $this->getNewPeerBuilder($joinTable);
-
-						$joinClassName = $joinedTableObjectBuilder->getObjectClassname();
-
-						$script .= "
-
-	/**
-	 * Selects a collection of $className objects pre-filled with their $joinClassName objects.
-	 * @param      Criteria  \$criteria
-	 * @param      PropelPDO \$con
-	 * @param      String    \$join_behavior the type of joins to use, defaults to $join_behavior
-	 * @return     array Array of $className objects.
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	public static function doSelectJoin".$thisTableObjectBuilder->getFKPhpNameAffix($fk, $plural = false)."(Criteria \$criteria, \$con = null, \$join_behavior = $join_behavior)
-	{
-		\$criteria = clone \$criteria;
-
-		// Set the correct dbName if it has not been overridden
-		if (\$criteria->getDbName() == Propel::getDefaultDB()) {
-			\$criteria->setDbName(self::DATABASE_NAME);
-		}
-
-		".$this->getPeerClassname()."::addSelectColumns(\$criteria);
-		\$startcol = (".$this->getPeerClassname()."::NUM_COLUMNS - ".$this->getPeerClassname()."::NUM_LAZY_LOAD_COLUMNS);
-		".$joinedTablePeerBuilder->getPeerClassname()."::addSelectColumns(\$criteria);
-";
-
-            $script .= $this->addCriteriaJoin($fk, $table, $joinTable, $joinedTablePeerBuilder);
-        		
-            // apply behaviors
-            $this->applyBehaviorModifier('preSelect', $script);
-						
-            $script .= "
-		\$stmt = ".$this->basePeerClassname."::doSelect(\$criteria, \$con);
-		\$results = array();
-
-		while (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
-			\$key1 = ".$this->getPeerClassname()."::getPrimaryKeyHashFromRow(\$row, 0);
-			if (null !== (\$obj1 = ".$this->getPeerClassname()."::getInstanceFromPool(\$key1))) {
-				// We no longer rehydrate the object, since this can cause data loss.
-				// See http://propel.phpdb.org/trac/ticket/509
-				// \$obj1->hydrate(\$row, 0, true); // rehydrate
-			} else {
-";
-						if ($table->getChildrenColumn()) {
-							$script .= "
-				\$omClass = ".$this->getPeerClassname()."::getOMClass(\$row, 0);
-				\$cls = substr('.'.\$omClass, strrpos('.'.\$omClass, '.') + 1);
-";
-						} else {
-							$script .= "
-				\$cls = ".$this->getPeerClassname()."::getOMClass(false);
-";
-						}
-						$script .= "
-				" . $this->buildObjectInstanceCreationCode('$obj1', '$cls') . "
-				\$obj1->hydrate(\$row);
-				".$this->getPeerClassname()."::addInstanceToPool(\$obj1, \$key1);
-			} // if \$obj1 already loaded
-
-			\$key2 = ".$joinedTablePeerBuilder->getPeerClassname()."::getPrimaryKeyHashFromRow(\$row, \$startcol);
-			if (\$key2 !== null) {
-				\$obj2 = ".$joinedTablePeerBuilder->getPeerClassname()."::getInstanceFromPool(\$key2);
-				if (!\$obj2) {
-";
-						if ($joinTable->getChildrenColumn()) {
-							$script .= "
-					\$omClass = ".$joinedTablePeerBuilder->getPeerClassname()."::getOMClass(\$row, \$startcol);
-					\$cls = substr('.'.\$omClass, strrpos('.'.\$omClass, '.') + 1);
-";
-						} else {
-							$script .= "
-					\$cls = ".$joinedTablePeerBuilder->getPeerClassname()."::getOMClass(false);
-";
-						}
-
-						$script .= "
-					" . $this->buildObjectInstanceCreationCode('$obj2', '$cls') . "
-					\$obj2->hydrate(\$row, \$startcol);
-					".$joinedTablePeerBuilder->getPeerClassname()."::addInstanceToPool(\$obj2, \$key2);
-				} // if obj2 already loaded
-				
-				// Add the \$obj1 (".$this->getObjectClassname().") to \$obj2 (".$joinedTablePeerBuilder->getObjectClassname().")";
-					if ($fk->isLocalPrimaryKey()) {
-						$script .= "
-				// one to one relationship
-				\$obj1->set" . $joinedTablePeerBuilder->getObjectClassname() . "(\$obj2);";
-					} else {
-					$script .= "
-				\$obj2->add" . $joinedTableObjectBuilder->getRefFKPhpNameAffix($fk, $plural = false)."(\$obj1);";
-					}
-					$script .= "
-
-			} // if joined row was not null
-
-			\$results[] = \$obj1;
-		}
-		\$stmt->closeCursor();
-		return \$results;
-	}
-";
-					} // if fk table name != this table name
-				} // if ! is reference only
-			} // foreach column
-		} // if count(fk) > 1
-
-	} // addDoSelectJoin()
-
-	/**
-	 * Adds the doCountJoin*() methods.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoCountJoin(&$script)
-	{
-		$table = $this->getTable();
-		$className = $this->getObjectClassname();
-		$countFK = count($table->getForeignKeys());
-		$join_behavior = $this->getJoinBehavior();
-
-		if ($countFK >= 1) {
-
-			foreach ($table->getForeignKeys() as $fk) {
-
-				$joinTable = $table->getDatabase()->getTable($fk->getForeignTableName());
-
-				if (!$joinTable->isForReferenceOnly()) {
-
-					if ( $fk->getForeignTableName() != $table->getName() ) {
-
-						$thisTableObjectBuilder = $this->getNewObjectBuilder($table);
-						$joinedTableObjectBuilder = $this->getNewObjectBuilder($joinTable);
-						$joinedTablePeerBuilder = $this->getNewPeerBuilder($joinTable);
-
-						$joinClassName = $joinedTableObjectBuilder->getObjectClassname();
-
-						$script .= "
-
-	/**
-	 * Returns the number of rows matching criteria, joining the related ".$thisTableObjectBuilder->getFKPhpNameAffix($fk, $plural = false)." table
-	 *
-	 * @param      Criteria \$criteria
-	 * @param      boolean \$distinct Whether to select only distinct columns; deprecated: use Criteria->setDistinct() instead.
-	 * @param      PropelPDO \$con
-	 * @param      String    \$join_behavior the type of joins to use, defaults to $join_behavior
-	 * @return     int Number of matching rows.
-	 */
-	public static function doCountJoin".$thisTableObjectBuilder->getFKPhpNameAffix($fk, $plural = false)."(Criteria \$criteria, \$distinct = false, PropelPDO \$con = null, \$join_behavior = $join_behavior)
-	{
-		// we're going to modify criteria, so copy it first
-		\$criteria = clone \$criteria;
-
-		// We need to set the primary table name, since in the case that there are no WHERE columns
-		// it will be impossible for the BasePeer::createSelectSql() method to determine which
-		// tables go into the FROM clause.
-		\$criteria->setPrimaryTableName(".$this->getPeerClassname()."::TABLE_NAME);
-
-		if (\$distinct && !in_array(Criteria::DISTINCT, \$criteria->getSelectModifiers())) {
-			\$criteria->setDistinct();
-		}
-
-		if (!\$criteria->hasSelectClause()) {
-			".$this->getPeerClassname()."::addSelectColumns(\$criteria);
-		}
-		
-		\$criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count
-		
-		// Set the correct dbName
-		\$criteria->setDbName(self::DATABASE_NAME);
-
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_READ);
-		}
-";
-            $script .= $this->addCriteriaJoin($fk, $table, $joinTable, $joinedTablePeerBuilder);
-         		
-            // apply behaviors
-            $this->applyBehaviorModifier('preSelect', $script);
-            
-            $script .= "
-		\$stmt = ".$this->basePeerClassname."::doCount(\$criteria, \$con);
-
-		if (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
-			\$count = (int) \$row[0];
-		} else {
-			\$count = 0; // no rows returned; we infer that means 0 matches.
-		}
-		\$stmt->closeCursor();
-		return \$count;
-	}
-";
-					} // if fk table name != this table name
-				} // if ! is reference only
-			} // foreach column
-		} // if count(fk) > 1
-
-	} // addDoCountJoin()
-
-	/**
-	 * Adds the doSelectJoinAll() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoSelectJoinAll(&$script)
-	{
-		$table = $this->getTable();
-		$className = $this->getObjectClassname();
-		$join_behavior = $this->getJoinBehavior();
-
-		$script .= "
-
-	/**
-	 * Selects a collection of $className objects pre-filled with all related objects.
-	 *
-	 * @param      Criteria  \$criteria
-	 * @param      PropelPDO \$con
-	 * @param      String    \$join_behavior the type of joins to use, defaults to $join_behavior
-	 * @return     array Array of $className objects.
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	public static function doSelectJoinAll(Criteria \$criteria, \$con = null, \$join_behavior = $join_behavior)
-	{
-		\$criteria = clone \$criteria;
-
-		// Set the correct dbName if it has not been overridden
-		if (\$criteria->getDbName() == Propel::getDefaultDB()) {
-			\$criteria->setDbName(self::DATABASE_NAME);
-		}
-
-		".$this->getPeerClassname()."::addSelectColumns(\$criteria);
-		\$startcol2 = (".$this->getPeerClassname()."::NUM_COLUMNS - ".$this->getPeerClassname()."::NUM_LAZY_LOAD_COLUMNS);
-";
-		$index = 2;
-		foreach ($table->getForeignKeys() as $fk) {
-
-			// Want to cover this case, but the code is not there yet.
-			// Propel lacks a system for aliasing tables of the same name.
-			if ( $fk->getForeignTableName() != $table->getName() ) {
-				$joinTable = $table->getDatabase()->getTable($fk->getForeignTableName());
-				$new_index = $index + 1;
-
-				$joinedTablePeerBuilder = $this->getNewPeerBuilder($joinTable);
-				$joinClassName = $joinedTablePeerBuilder->getObjectClassname();
-
-				$script .= "
-		".$joinedTablePeerBuilder->getPeerClassname()."::addSelectColumns(\$criteria);
-		\$startcol$new_index = \$startcol$index + (".$joinedTablePeerBuilder->getPeerClassname()."::NUM_COLUMNS - ".$joinedTablePeerBuilder->getPeerClassname()."::NUM_LAZY_LOAD_COLUMNS);
-";
-				$index = $new_index;
-
-			} // if fk->getForeignTableName != table->getName
-		} // foreach [sub] foreign keys
-
-		foreach ($table->getForeignKeys() as $fk) {
-			// want to cover this case, but the code is not there yet.
-			if ( $fk->getForeignTableName() != $table->getName() ) {
-				$joinTable = $table->getDatabase()->getTable($fk->getForeignTableName());
-				$joinedTablePeerBuilder = $this->getNewPeerBuilder($joinTable);
-        $script .= $this->addCriteriaJoin($fk, $table, $joinTable, $joinedTablePeerBuilder);
-			}
-		}
-		
-		// apply behaviors
-    $this->applyBehaviorModifier('preSelect', $script);
-		
-    $script .= "
-		\$stmt = ".$this->basePeerClassname."::doSelect(\$criteria, \$con);
-		\$results = array();
-
-		while (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
-			\$key1 = ".$this->getPeerClassname()."::getPrimaryKeyHashFromRow(\$row, 0);
-			if (null !== (\$obj1 = ".$this->getPeerClassname()."::getInstanceFromPool(\$key1))) {
-				// We no longer rehydrate the object, since this can cause data loss.
-				// See http://propel.phpdb.org/trac/ticket/509
-				// \$obj1->hydrate(\$row, 0, true); // rehydrate
-			} else {";
-
-		if ($table->getChildrenColumn()) {
-			$script .= "
-				\$omClass = ".$this->getPeerClassname()."::getOMClass(\$row, 0);
-        \$cls = substr('.'.\$omClass, strrpos('.'.\$omClass, '.') + 1);
-";
-		} else {
-			$script .= "
-				\$cls = ".$this->getPeerClassname()."::getOMClass(false);
-";
-		}
-
-		$script .= "
-				" . $this->buildObjectInstanceCreationCode('$obj1', '$cls') . "
-				\$obj1->hydrate(\$row);
-				".$this->getPeerClassname()."::addInstanceToPool(\$obj1, \$key1);
-			} // if obj1 already loaded
-";
-
-		$index = 1;
-		foreach ($table->getForeignKeys() as $fk ) {
-			// want to cover this case, but the code is not there yet.
-			// Why not? -because we'd have to alias the tables in the JOIN
-			if ( $fk->getForeignTableName() != $table->getName() ) {
-				$joinTable = $table->getDatabase()->getTable($fk->getForeignTableName());
-
-				$thisTableObjectBuilder = $this->getNewObjectBuilder($table);
-				$joinedTableObjectBuilder = $this->getNewObjectBuilder($joinTable);
-				$joinedTablePeerBuilder = $this->getNewPeerBuilder($joinTable);
-
-
-				$joinClassName = $joinedTableObjectBuilder->getObjectClassname();
-				$interfaceName = $joinClassName;
-
-				if ($joinTable->getInterface()) {
-					$interfaceName = $this->prefixClassname($joinTable->getInterface());
-				}
-
-				$index++;
-
-				$script .= "
-			// Add objects for joined $joinClassName rows
-
-			\$key$index = ".$joinedTablePeerBuilder->getPeerClassname()."::getPrimaryKeyHashFromRow(\$row, \$startcol$index);
-			if (\$key$index !== null) {
-				\$obj$index = ".$joinedTablePeerBuilder->getPeerClassname()."::getInstanceFromPool(\$key$index);
-				if (!\$obj$index) {
-";
-				if ($joinTable->getChildrenColumn()) {
-					$script .= "
-					\$omClass = ".$joinedTablePeerBuilder->getPeerClassname()."::getOMClass(\$row, \$startcol$index);
-          \$cls = substr('.'.\$omClass, strrpos('.'.\$omClass, '.') + 1);
-";
-				} else {
-					$script .= "
-					\$cls = ".$joinedTablePeerBuilder->getPeerClassname()."::getOMClass(false);
-";
-				} /* $joinTable->getChildrenColumn() */
-
-				$script .= "
-					" . $this->buildObjectInstanceCreationCode('$obj' . $index, '$cls') . "
-					\$obj".$index."->hydrate(\$row, \$startcol$index);
-					".$joinedTablePeerBuilder->getPeerClassname()."::addInstanceToPool(\$obj$index, \$key$index);
-				} // if obj$index loaded
-
-				// Add the \$obj1 (".$this->getObjectClassname().") to the collection in \$obj".$index." (".$joinedTablePeerBuilder->getObjectClassname().")";
-				if ($fk->isLocalPrimaryKey()) {
-					$script .= "
-				\$obj1->set".$joinedTablePeerBuilder->getObjectClassname()."(\$obj".$index.");";
-				} else {
-					$script .= "
-				\$obj".$index."->add".$joinedTableObjectBuilder->getRefFKPhpNameAffix($fk, $plural = false)."(\$obj1);";
-				}
-				$script .= "
-			} // if joined row not null
-";
-
-			} // $fk->getForeignTableName() != $table->getName()
-		} //foreach foreign key
-
-		$script .= "
-			\$results[] = \$obj1;
-		}
-		\$stmt->closeCursor();
-		return \$results;
-	}
-";
-
-	} // end addDoSelectJoinAll()
-
-
-	/**
-	 * Adds the doCountJoinAll() method.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoCountJoinAll(&$script)
-	{
-		$table = $this->getTable();
-		$className = $this->getObjectClassname();
-		$join_behavior = $this->getJoinBehavior();
-
-		$script .= "
-
-	/**
-	 * Returns the number of rows matching criteria, joining all related tables
-	 *
-	 * @param      Criteria \$criteria
-	 * @param      boolean \$distinct Whether to select only distinct columns; deprecated: use Criteria->setDistinct() instead.
-	 * @param      PropelPDO \$con
-	 * @param      String    \$join_behavior the type of joins to use, defaults to $join_behavior
-	 * @return     int Number of matching rows.
-	 */
-	public static function doCountJoinAll(Criteria \$criteria, \$distinct = false, PropelPDO \$con = null, \$join_behavior = $join_behavior)
-	{
-		// we're going to modify criteria, so copy it first
-		\$criteria = clone \$criteria;
-
-		// We need to set the primary table name, since in the case that there are no WHERE columns
-		// it will be impossible for the BasePeer::createSelectSql() method to determine which
-		// tables go into the FROM clause.
-		\$criteria->setPrimaryTableName(".$this->getPeerClassname()."::TABLE_NAME);
-
-		if (\$distinct && !in_array(Criteria::DISTINCT, \$criteria->getSelectModifiers())) {
-			\$criteria->setDistinct();
-		}
-
-		if (!\$criteria->hasSelectClause()) {
-			".$this->getPeerClassname()."::addSelectColumns(\$criteria);
-		}
-		
-		\$criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count
-		
-		// Set the correct dbName
-		\$criteria->setDbName(self::DATABASE_NAME);
-
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_READ);
-		}
-";
-
-		foreach ($table->getForeignKeys() as $fk) {
-			// want to cover this case, but the code is not there yet.
-			if ( $fk->getForeignTableName() != $table->getName() ) {
-				$joinTable = $table->getDatabase()->getTable($fk->getForeignTableName());
-				$joinedTablePeerBuilder = $this->getNewPeerBuilder($joinTable);
-        $script .= $this->addCriteriaJoin($fk, $table, $joinTable, $joinedTablePeerBuilder);
-			} // if fk->getForeignTableName != table->getName
-		} // foreach [sub] foreign keys
-		
-		// apply behaviors
-    $this->applyBehaviorModifier('preSelect', $script);
-		
-    $script .= "
-		\$stmt = ".$this->basePeerClassname."::doCount(\$criteria, \$con);
-
-		if (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
-			\$count = (int) \$row[0];
-		} else {
-			\$count = 0; // no rows returned; we infer that means 0 matches.
-		}
-		\$stmt->closeCursor();
-		return \$count;
-	}";
-	} // end addDoCountJoinAll()
-
-	/**
-	 * Adds the doSelectJoinAllExcept*() methods.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoSelectJoinAllExcept(&$script)
-	{
-		$table = $this->getTable();
-		$join_behavior = $this->getJoinBehavior();
-
-		// ------------------------------------------------------------------------
-		// doSelectJoinAllExcept*()
-		// ------------------------------------------------------------------------
-
-		// 2) create a bunch of doSelectJoinAllExcept*() methods
-		// -- these were existing in original Torque, so we should keep them for compatibility
-
-		$fkeys = $table->getForeignKeys();  // this sep assignment is necessary otherwise sub-loops over
-		// getForeignKeys() will cause this to only execute one time.
-		foreach ($fkeys as $fk ) {
-
-			$tblFK = $table->getDatabase()->getTable($fk->getForeignTableName());
-
-			$excludedTable = $table->getDatabase()->getTable($fk->getForeignTableName());
-
-			$thisTableObjectBuilder = $this->getNewObjectBuilder($table);
-			$excludedTableObjectBuilder = $this->getNewObjectBuilder($excludedTable);
-			$excludedTablePeerBuilder = $this->getNewPeerBuilder($excludedTable);
-
-			$excludedClassName = $excludedTableObjectBuilder->getObjectClassname();
-
-
-			$script .= "
-
-	/**
-	 * Selects a collection of ".$this->getObjectClassname()." objects pre-filled with all related objects except ".$thisTableObjectBuilder->getFKPhpNameAffix($fk).".
-	 *
-	 * @param      Criteria  \$criteria
-	 * @param      PropelPDO \$con
-	 * @param      String    \$join_behavior the type of joins to use, defaults to $join_behavior
-	 * @return     array Array of ".$this->getObjectClassname()." objects.
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *		 rethrown wrapped into a PropelException.
-	 */
-	public static function doSelectJoinAllExcept".$thisTableObjectBuilder->getFKPhpNameAffix($fk, $plural = false)."(Criteria \$criteria, \$con = null, \$join_behavior = $join_behavior)
-	{
-		\$criteria = clone \$criteria;
-
-		// Set the correct dbName if it has not been overridden
-		// \$criteria->getDbName() will return the same object if not set to another value
-		// so == check is okay and faster
-		if (\$criteria->getDbName() == Propel::getDefaultDB()) {
-			\$criteria->setDbName(self::DATABASE_NAME);
-		}
-
-		".$this->getPeerClassname()."::addSelectColumns(\$criteria);
-		\$startcol2 = (".$this->getPeerClassname()."::NUM_COLUMNS - ".$this->getPeerClassname()."::NUM_LAZY_LOAD_COLUMNS);
-";
-			$index = 2;
-			foreach ($table->getForeignKeys() as $subfk) {
-				// want to cover this case, but the code is not there yet.
-				// Why not? - because we would have to alias the tables in the join
-				if ( !($subfk->getForeignTableName() == $table->getName())) {
-					$joinTable = $table->getDatabase()->getTable($subfk->getForeignTableName());
-					$joinTablePeerBuilder = $this->getNewPeerBuilder($joinTable);
-					$joinClassName = $joinTablePeerBuilder->getObjectClassname();
-
-					if ($joinClassName != $excludedClassName) {
-						$new_index = $index + 1;
-						$script .= "
-		".$joinTablePeerBuilder->getPeerClassname()."::addSelectColumns(\$criteria);
-		\$startcol$new_index = \$startcol$index + (".$joinTablePeerBuilder->getPeerClassname()."::NUM_COLUMNS - ".$joinTablePeerBuilder->getPeerClassname()."::NUM_LAZY_LOAD_COLUMNS);
-";
-						$index = $new_index;
-					} // if joinClassName not excludeClassName
-				} // if subfk is not curr table
-			} // foreach [sub] foreign keys
-
-			foreach ($table->getForeignKeys() as $subfk) {
-				// want to cover this case, but the code is not there yet.
-				if ( $subfk->getForeignTableName() != $table->getName() ) {
-					$joinTable = $table->getDatabase()->getTable($subfk->getForeignTableName());
-					$joinedTablePeerBuilder = $this->getNewPeerBuilder($joinTable);
-					$joinClassName = $joinedTablePeerBuilder->getObjectClassname();
-
-					if ($joinClassName != $excludedClassName)
-					{
-            $script .= $this->addCriteriaJoin($subfk, $table, $joinTable, $joinedTablePeerBuilder);
-					}
-				}
-			} // foreach fkeys
-			
-			// apply behaviors
-      $this->applyBehaviorModifier('preSelect', $script);
-			
-      $script .= "
-
-		\$stmt = ".$this->basePeerClassname ."::doSelect(\$criteria, \$con);
-		\$results = array();
-
-		while (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
-			\$key1 = ".$this->getPeerClassname()."::getPrimaryKeyHashFromRow(\$row, 0);
-			if (null !== (\$obj1 = ".$this->getPeerClassname()."::getInstanceFromPool(\$key1))) {
-				// We no longer rehydrate the object, since this can cause data loss.
-				// See http://propel.phpdb.org/trac/ticket/509
-				// \$obj1->hydrate(\$row, 0, true); // rehydrate
-			} else {";
-			if ($table->getChildrenColumn()) {
-				$script .= "
-				\$omClass = ".$this->getPeerClassname()."::getOMClass(\$row, 0);
-				\$cls = substr('.'.\$omClass, strrpos('.'.\$omClass, '.') + 1);
-";
-			} else {
-				$script .= "
-				\$cls = ".$this->getPeerClassname()."::getOMClass(false);
-";
-			}
-
-			$script .= "
-				" . $this->buildObjectInstanceCreationCode('$obj1', '$cls') . "
-				\$obj1->hydrate(\$row);
-				".$this->getPeerClassname()."::addInstanceToPool(\$obj1, \$key1);
-			} // if obj1 already loaded
-";
-
-			$index = 1;
-			foreach ($table->getForeignKeys() as $subfk ) {
-		  // want to cover this case, but the code is not there yet.
-		  if ( $subfk->getForeignTableName() != $table->getName() ) {
-
-		  	$joinTable = $table->getDatabase()->getTable($subfk->getForeignTableName());
-
-		  	$joinedTableObjectBuilder = $this->getNewObjectBuilder($joinTable);
-		  	$joinedTablePeerBuilder = $this->getNewPeerBuilder($joinTable);
-
-		  	$joinClassName = $joinedTableObjectBuilder->getObjectClassname();
-
-		  	$interfaceName = $joinClassName;
-		  	if ($joinTable->getInterface()) {
-		  		$interfaceName = $this->prefixClassname($joinTable->getInterface());
-		  	}
-
-		  	if ($joinClassName != $excludedClassName) {
-
-		  		$index++;
-
-		  		$script .= "
-				// Add objects for joined $joinClassName rows
-
-				\$key$index = ".$joinedTablePeerBuilder->getPeerClassname()."::getPrimaryKeyHashFromRow(\$row, \$startcol$index);
-				if (\$key$index !== null) {
-					\$obj$index = ".$joinedTablePeerBuilder->getPeerClassname()."::getInstanceFromPool(\$key$index);
-					if (!\$obj$index) {
-	";
-
-		  		if ($joinTable->getChildrenColumn()) {
-		  			$script .= "
-						\$omClass = ".$joinedTablePeerBuilder->getPeerClassname()."::getOMClass(\$row, \$startcol$index);
-            \$cls = substr('.'.\$omClass, strrpos('.'.\$omClass, '.') + 1);
-";
-		  		} else {
-		  			$script .= "
-						\$cls = ".$joinedTablePeerBuilder->getPeerClassname()."::getOMClass(false);
-";
-		  		} /* $joinTable->getChildrenColumn() */
-		  		$script .= "
-					" . $this->buildObjectInstanceCreationCode('$obj' . $index, '$cls') . "
-					\$obj".$index."->hydrate(\$row, \$startcol$index);
-					".$joinedTablePeerBuilder->getPeerClassname()."::addInstanceToPool(\$obj$index, \$key$index);
-				} // if \$obj$index already loaded
-
-				// Add the \$obj1 (".$this->getObjectClassname().") to the collection in \$obj".$index." (".$joinedTablePeerBuilder->getObjectClassname().")";
-				if ($subfk->isLocalPrimaryKey()) {
-					$script .= "
-				\$obj1->set".$joinedTablePeerBuilder->getObjectClassname()."(\$obj".$index.");";
-				} else {
-					$script .= "
-				\$obj".$index."->add".$joinedTableObjectBuilder->getRefFKPhpNameAffix($subfk, $plural = false)."(\$obj1);";
-				}
-				$script .= "
-
-			} // if joined row is not null
-";
-					} // if ($joinClassName != $excludedClassName) {
-		  } // $subfk->getForeignTableName() != $table->getName()
-			} // foreach
-			$script .= "
-			\$results[] = \$obj1;
-		}
-		\$stmt->closeCursor();
-		return \$results;
-	}
-";
-		} // foreach fk
-
-	} // addDoSelectJoinAllExcept
-
-	/**
-	 * Adds the doCountJoinAllExcept*() methods.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addDoCountJoinAllExcept(&$script)
-	{
-		$table = $this->getTable();
-		$join_behavior = $this->getJoinBehavior();
-
-		$fkeys = $table->getForeignKeys();  // this sep assignment is necessary otherwise sub-loops over
-		// getForeignKeys() will cause this to only execute one time.
-		foreach ($fkeys as $fk ) {
-
-			$tblFK = $table->getDatabase()->getTable($fk->getForeignTableName());
-
-			$excludedTable = $table->getDatabase()->getTable($fk->getForeignTableName());
-
-			$thisTableObjectBuilder = $this->getNewObjectBuilder($table);
-			$excludedTableObjectBuilder = $this->getNewObjectBuilder($excludedTable);
-			$excludedTablePeerBuilder = $this->getNewPeerBuilder($excludedTable);
-
-			$excludedClassName = $excludedTableObjectBuilder->getObjectClassname();
-
-			$script .= "
-
-	/**
-	 * Returns the number of rows matching criteria, joining the related ".$thisTableObjectBuilder->getFKPhpNameAffix($fk, $plural = false)." table
-	 *
-	 * @param      Criteria \$criteria
-	 * @param      boolean \$distinct Whether to select only distinct columns; deprecated: use Criteria->setDistinct() instead.
-	 * @param      PropelPDO \$con
-	 * @param      String    \$join_behavior the type of joins to use, defaults to $join_behavior
-	 * @return     int Number of matching rows.
-	 */
-	public static function doCountJoinAllExcept".$thisTableObjectBuilder->getFKPhpNameAffix($fk, $plural = false)."(Criteria \$criteria, \$distinct = false, PropelPDO \$con = null, \$join_behavior = $join_behavior)
-	{
-		// we're going to modify criteria, so copy it first
-		\$criteria = clone \$criteria;
-
-		// We need to set the primary table name, since in the case that there are no WHERE columns
-		// it will be impossible for the BasePeer::createSelectSql() method to determine which
-		// tables go into the FROM clause.
-		\$criteria->setPrimaryTableName(".$this->getPeerClassname()."::TABLE_NAME);
-		
-		if (\$distinct && !in_array(Criteria::DISTINCT, \$criteria->getSelectModifiers())) {
-			\$criteria->setDistinct();
-		}
-
-		if (!\$criteria->hasSelectClause()) {
-			".$this->getPeerClassname()."::addSelectColumns(\$criteria);
-		}
-		
-		\$criteria->clearOrderByColumns(); // ORDER BY should not affect count
-		
-		// Set the correct dbName
-		\$criteria->setDbName(self::DATABASE_NAME);
-
-		if (\$con === null) {
-			\$con = Propel::getConnection(".$this->getPeerClassname()."::DATABASE_NAME, Propel::CONNECTION_READ);
-		}
-	";
-
-			foreach ($table->getForeignKeys() as $subfk) {
-				// want to cover this case, but the code is not there yet.
-				if ( $subfk->getForeignTableName() != $table->getName() ) {
-					$joinTable = $table->getDatabase()->getTable($subfk->getForeignTableName());
-					$joinedTablePeerBuilder = $this->getNewPeerBuilder($joinTable);
-					$joinClassName = $joinedTablePeerBuilder->getObjectClassname();
-
-					if ($joinClassName != $excludedClassName)
-					{
-            $script .= $this->addCriteriaJoin($subfk, $table, $joinTable, $joinedTablePeerBuilder);
-					}
-				}
-			} // foreach fkeys
-			
-			// apply behaviors
-      $this->applyBehaviorModifier('preSelect', $script);
-			
-      $script .= "
-		\$stmt = ".$this->basePeerClassname."::doCount(\$criteria, \$con);
-
-		if (\$row = \$stmt->fetch(PDO::FETCH_NUM)) {
-			\$count = (int) \$row[0];
-		} else {
-			\$count = 0; // no rows returned; we infer that means 0 matches.
-		}
-		\$stmt->closeCursor();
-		return \$count;
-	}
-";
-		} // foreach fk
-
-	} // addDoCountJoinAllExcept
-
-	/**
-	 * returns the desired join behavior as set in the build properties
-	 * see trac ticket #588, #491
-	 *
-	 */
-	protected function getJoinBehavior()
-	{
-		return $this->getGeneratorConfig()->getBuildProperty('useLeftJoinsInDoJoinMethods') ? 'Criteria::LEFT_JOIN' : 'Criteria::INNER_JOIN';
-	}
-
-} // PHP5PeerBuilder
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5TableMapBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5TableMapBuilder.php
deleted file mode 100644
index a31d09996..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/om/php5/PHP5TableMapBuilder.php
+++ /dev/null
@@ -1,340 +0,0 @@
-<?php
-
-/*
- *  $Id: PHP5MapBuilderBuilder.php 1159 2009-09-22 15:24:20Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/om/OMBuilder.php';
-
-/**
- * Generates the PHP5 table map class for user object model (OM).
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder.om.php5
- */
-class PHP5TableMapBuilder extends OMBuilder {
-
-	/**
-	 * Gets the package for the map builder classes.
-	 * @return     string
-	 */
-	public function getPackage()
-	{
-		return parent::getPackage() . '.map';
-	}
-
-	/**
-	 * Returns the name of the current class being built.
-	 * @return     string
-	 */
-	public function getUnprefixedClassname()
-	{
-		return $this->getTable()->getPhpName() . 'TableMap';
-	}
-
-	/**
-	 * Adds the include() statements for files that this class depends on or utilizes.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addIncludes(&$script)
-	{
-	} // addIncludes()
-
-	/**
-	 * Adds class phpdoc comment and openning of class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassOpen(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-
-/**
- * This class defines the structure of the '".$table->getName()."' table.
- *
- *";
-		if ($this->getBuildProperty('addTimeStamp')) {
-			$now = strftime('%c');
-			$script .= "
- * This class was autogenerated by Propel " . $this->getBuildProperty('version') . " on:
- *
- * $now
- *";
-		}
-		$script .= "
- *
- * This map class is used by Propel to do runtime db structure discovery.
- * For example, the createSelectSql() method checks the type of a given column used in an
- * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
- * (i.e. if it's a text column type).
- *
- * @package    ".$this->getPackage()."
- */
-class ".$this->getClassname()." extends TableMap {
-";
-	}
-
-	/**
-	 * Specifies the methods that are added as part of the map builder class.
-	 * This can be overridden by subclasses that wish to add more methods.
-	 * @see        ObjectBuilder::addClassBody()
-	 */
-	protected function addClassBody(&$script)
-	{
-		$this->addConstants($script);
-		$this->addAttributes($script);
-		$this->addInitialize($script);
-		$this->addBuildRelations($script);
-		$this->addGetBehaviors($script);
-	}
-
-	/**
-	 * Adds any constants needed for this TableMap class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addConstants(&$script)
-	{
-		$script .= "
-	/**
-	 * The (dot-path) name of this class
-	 */
-	const CLASS_NAME = '".$this->getClasspath()."';
-";
-	}
-
-	/**
-	 * Adds any attributes needed for this TableMap class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addAttributes(&$script)
-	{
-	}
-
-	/**
-	 * Closes class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addClassClose(&$script)
-	{
-		$script .= "
-} // " . $this->getClassname() . "
-";
-		$this->applyBehaviorModifier('tableMapFilter', $script, "");
-	}
-
-	/**
-	 * Adds the addInitialize() method to the  table map class.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addInitialize(&$script)
-	{
-
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-		$ddlBuilder = $this->getDDLBuilder();
-
-		$script .= "
-	/**
-	 * Initialize the table attributes, columns and validators
-	 * Relations are not initialized by this method since they are lazy loaded
-	 *
-	 * @return     void
-	 * @throws     PropelException
-	 */
-	public function initialize()
-	{
-	  // attributes
-		\$this->setName('".$table->getName()."');
-		\$this->setPhpName('".$table->getPhpName()."');
-		\$this->setClassname('" . $this->getObjectClassname() . "');
-		\$this->setPackage('" . parent::getPackage() . "');";
-		if ($table->getIdMethod() == "native") {
-			$script .= "
-		\$this->setUseIdGenerator(true);";
-		} else {
-			$script .= "
-		\$this->setUseIdGenerator(false);";
-		}
-
-		if ($table->getIdMethodParameters()) {
-			$params = $table->getIdMethodParameters();
-			$imp = $params[0];
-			$script .= "
-		\$this->setPrimaryKeyMethodInfo('".$imp->getValue()."');";
-		} elseif ($table->getIdMethod() == IDMethod::NATIVE && ($platform->getNativeIdMethod() == Platform::SEQUENCE || $platform->getNativeIdMethod() == Platform::SERIAL)) {
-			$script .= "
-		\$this->setPrimaryKeyMethodInfo('".$this->prefixTablename($ddlBuilder->getSequenceName())."');";
-		}
-
-		// Add columns to map
-			$script .= "
-		// columns";
-		foreach ($table->getColumns() as $col) {
-			$cup=strtoupper($col->getName());
-		  $cfc=$col->getPhpName();
-			if (!$col->getSize()) {
-				$size = "null";
-			} else {
-				$size = $col->getSize();
-			}
-			$default = $col->getDefaultValueString();
-			if ($col->isPrimaryKey()) {
-				if ($col->isForeignKey()) {
-					foreach ($col->getForeignKeys() as $fk) {
-						$script .= "
-		\$this->addForeignPrimaryKey('$cup', '$cfc', '".$col->getType()."' , '".$fk->getForeignTableName()."', '".strtoupper($fk->getMappedForeignColumn($col->getName()))."', ".($col->isNotNull() ? 'true' : 'false').", ".$size.", $default);";
-					}
-				} else {
-					$script .= "
-		\$this->addPrimaryKey('$cup', '$cfc', '".$col->getType()."', ".var_export($col->isNotNull(), true).", ".$size.", $default);";
-				}
-			} else {
-				if ($col->isForeignKey()) {
-					foreach ($col->getForeignKeys() as $fk) {
-						$script .= "
-		\$this->addForeignKey('$cup', '$cfc', '".$col->getType()."', '".$fk->getForeignTableName()."', '".strtoupper($fk->getMappedForeignColumn($col->getName()))."', ".($col->isNotNull() ? 'true' : 'false').", ".$size.", $default);";
-					}
-			} else {
-					$script .= "
-		\$this->addColumn('$cup', '$cfc', '".$col->getType()."', ".var_export($col->isNotNull(), true).", ".$size.", $default);";
-				}
-			} // if col-is prim key
-		} // foreach
-
-		// validators
-    $script .= "
-		// validators";
-		foreach ($table->getValidators() as $val) {
-			$col = $val->getColumn();
-			$cup = strtoupper($col->getName());
-			foreach ($val->getRules() as $rule) {
-				if ($val->getTranslate() !== Validator::TRANSLATE_NONE) {
-					$script .= "
-		\$this->addValidator('$cup', '".$rule->getName()."', '".$rule->getClass()."', '".str_replace("'", "\'", $rule->getValue())."', ".$val->getTranslate()."('".str_replace("'", "\'", $rule->getMessage())."'));";
-				} else {
-					$script .= "
-		\$this->addValidator('$cup', '".$rule->getName()."', '".$rule->getClass()."', '".str_replace("'", "\'", $rule->getValue())."', '".str_replace("'", "\'", $rule->getMessage())."');";
-				} // if ($rule->getTranslation() ...
-  			} // foreach rule
-		}  // foreach validator
-
-		$script .= "
-	} // initialize()
-";
-
-	}
-
-	/**
-	 * Adds the method that build the RelationMap objects
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addBuildRelations(&$script)
-	{
-		$script .= "
-	/**
-	 * Build the RelationMap objects for this table relationships
-	 */
-	public function buildRelations()
-	{";
-    foreach ($this->getTable()->getForeignKeys() as $fkey)
-    {
-      $columnMapping = 'array(';
-      foreach ($fkey->getLocalForeignMapping() as $key => $value)
-      {
-        $columnMapping .= "'$key' => '$value', ";
-      }
-      $columnMapping .= ')';
-      $onDelete = $fkey->hasOnDelete() ? "'" . $fkey->getOnDelete() . "'" : 'null';
-      $onUpdate = $fkey->hasOnUpdate() ? "'" . $fkey->getOnUpdate() . "'" : 'null';
-      $script .= "
-    \$this->addRelation('" . $this->getFKPhpNameAffix($fkey) . "', '" . $fkey->getForeignTable()->getPhpName() . "', RelationMap::MANY_TO_ONE, $columnMapping, $onDelete, $onUpdate);";
-    }
-    foreach ($this->getTable()->getReferrers() as $fkey)
-    {
-      $columnMapping = 'array(';
-      foreach ($fkey->getForeignLocalMapping() as $key => $value)
-      {
-        $columnMapping .= "'$key' => '$value', ";
-      }
-      $columnMapping .= ')';
-      $onDelete = $fkey->hasOnDelete() ? "'" . $fkey->getOnDelete() . "'" : 'null';
-      $onUpdate = $fkey->hasOnUpdate() ? "'" . $fkey->getOnUpdate() . "'" : 'null';
-      $script .= "
-    \$this->addRelation('" . $this->getRefFKPhpNameAffix($fkey) . "', '" . $fkey->getTable()->getPhpName() . "', RelationMap::ONE_TO_" . ($fkey->isLocalPrimaryKey() ? "ONE" : "MANY") .", $columnMapping, $onDelete, $onUpdate);";
-    }
-    $script .= "
-	} // buildRelations()
-";
-	}
-
-	/**
-	 * Adds the behaviors getter
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	protected function addGetBehaviors(&$script)
-	{
-	  if ($behaviors = $this->getTable()->getBehaviors())
-	  {
-  		$script .= "
-	/**
-	 * 
-	 * Gets the list of behaviors registered for this table
-	 * 
-	 * @return array Associative array (name => parameters) of behaviors
-	 */
-	public function getBehaviors()
-	{
-		return array(";
-      foreach ($behaviors as $behavior)
-      {        
-        $script .= "
-			'{$behavior->getName()}' => array(";
-        foreach ($behavior->getParameters() as $key => $value)
-        {
-          $script .= "'$key' => '$value', ";
-        }
-        $script .= "),";
-      }
-      $script .= "
-		);
-	} // getBehaviors()
-";
-    }
-	}
-
-  /**
-   * Checks whether any registered behavior on that table has a modifier for a hook
-   * @param string $hookName The name of the hook as called from one of this class methods, e.g. "preSave"
-   * @return boolean
-   */
-  public function hasBehaviorModifier($hookName)
-  {
-    return parent::hasBehaviorModifier($hookName, 'TableMapBuilderModifier');
-  }
-
-  /**
-   * Checks whether any registered behavior on that table has a modifier for a hook
-   * @param string $hookName The name of the hook as called from one of this class methods, e.g. "preSave"
-	 * @param string &$script The script will be modified in this method.
-   */
-  public function applyBehaviorModifier($hookName, &$script, $tab = "		")
-  {
-    return parent::applyBehaviorModifier($hookName, 'TableMapBuilderModifier', $script, $tab);
-  }
-} // PHP5TableMapBuilder
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/DDLBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/DDLBuilder.php
deleted file mode 100644
index 74cc16359..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/DDLBuilder.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-
-/*
- *  $Id: DDLBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/DataModelBuilder.php';
-
-/**
- * Baseclass for SQL DDL-building classes.
- *
- * DDL-building classes are those that build all the SQL DDL for a single table.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder.sql
- */
-abstract class DDLBuilder extends DataModelBuilder {
-
-	/**
-	 * Builds the SQL for current table and returns it as a string.
-	 *
-	 * This is the main entry point and defines a basic structure that classes should follow.
-	 * In most cases this method will not need to be overridden by subclasses.
-	 *
-	 * @return     string The resulting SQL DDL.
-	 */
-	public function build()
-	{
-		$script = "";
-		$this->addTable($script);
-		$this->addIndices($script);
-		$this->addForeignKeys($script);
-		return $script;
-	}
-
-	/**
-	 * Gets the name to use for creating a sequence for the current table.
-	 *
-	 * This will create a new name or use one specified in an id-method-parameter
-	 * tag, if specified.
-	 *
-	 * @return     string Sequence name for this table.
-	 */
-	public function getSequenceName()
-	{
-		$table = $this->getTable();
-		static $longNamesMap = array();
-		$result = null;
-		if ($table->getIdMethod() == IDMethod::NATIVE) {
-			$idMethodParams = $table->getIdMethodParameters();
-			$maxIdentifierLength = $table->getDatabase()->getPlatform()->getMaxColumnNameLength();
-			if (empty($idMethodParams)) {
-				if (strlen($table->getName() . "_SEQ") > $maxIdentifierLength) {
-					if (!isset($longNamesMap[$table->getName()])) {
-						$longNamesMap[$table->getName()] = strval(count($longNamesMap) + 1);
-					}
-					$result = substr($table->getName(), 0, $maxIdentifierLength - strlen("_SEQ_" . $longNamesMap[$table->getName()])) . "_SEQ_" . $longNamesMap[$table->getName()];
-				}
-				else {
-					$result = substr($table->getName(), 0, $maxIdentifierLength -4) . "_SEQ";
-				}
-			} else {
-				$result = substr($idMethodParams[0]->getValue(), 0, $maxIdentifierLength);
-			}
-		}
-		return $result;
-	}
-
-	/**
-	 * Builds the DDL SQL for a Column object.
-	 * @return     string
-	 */
-	public function getColumnDDL(Column $col)
-	{
-		$platform = $this->getPlatform();
-		$domain = $col->getDomain();
-
-		$sb = "";
-		$sb .= $this->quoteIdentifier($col->getName()) . " ";
-		$sb .= $domain->getSqlType();
-		if ($platform->hasSize($domain->getSqlType())) {
-			$sb .= $domain->printSize();
-		}
-		$sb .= " ";
-		$sb .= $col->getDefaultSetting() . " ";
-		$sb .= $col->getNotNullString() . " ";
-		$sb .= $col->getAutoIncrementString();
-
-		return trim($sb);
-	}
-
-	/**
-	 * Creates a delimiter-delimited string list of column names, quoted using quoteIdentifier().
-	 * @param      array Column[] or string[]
-	 * @param      string $delim The delimiter to use in separating the column names.
-	 * @return     string
-	 */
-	public function getColumnList($columns, $delim=',')
-	{
-		$list = array();
-		foreach ($columns as $col) {
-			if ($col instanceof Column) {
-				$col = $col->getName();
-			}
-			$list[] = $this->quoteIdentifier($col);
-		}
-		return implode($delim, $list);
-	}
-
-	/**
-	 * This function adds any _database_ start/initialization SQL.
-	 * This is designed to be called for a database, not a specific table, hence it is static.
-	 * @return     string The DDL is returned as astring.
-	 */
-	public static function getDatabaseStartDDL()
-	{
-		return '';
-	}
-
-	/**
-	 * This function adds any _database_ end/cleanup SQL.
-	 * This is designed to be called for a database, not a specific table, hence it is static.
-	 * @return     string The DDL is returned as astring.
-	 */
-	public static function getDatabaseEndDDL()
-	{
-		return '';
-	}
-
-	/**
-	 * Resets any static variables between building a SQL file for a database.
-	 *
-	 * Theoretically, Propel could build multiple .sql files for multiple databases; in
-	 * many cases we don't want static values to persist between these.  This method provides
-	 * a way to clear out static values between iterations, if the subclasses choose to implement
-	 * it.
-	 */
-	public static function reset()
-	{
-		// nothing by default
-	}
-
-	/**
-	 * Adds table definition.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	abstract protected function addTable(&$script);
-
-	/**
-	 * Adds index definitions.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	abstract protected function addIndices(&$script);
-
-	/**
-	 * Adds foreign key constraint definitions.
-	 * @param      string &$script The script will be modified in this method.
-	 */
-	abstract protected function addForeignKeys(&$script);
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/DataSQLBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/DataSQLBuilder.php
deleted file mode 100644
index 35d93491b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/DataSQLBuilder.php
+++ /dev/null
@@ -1,264 +0,0 @@
-<?php
-
-/*
- *  $Id: DataSQLBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/DataModelBuilder.php';
-require_once 'propel/engine/database/model/PropelTypes.php';
-
-/**
- * Baseclass for SQL data dump SQL building classes.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder.sql
- */
-abstract class DataSQLBuilder extends DataModelBuilder {
-
-	/**
-	 * Perform any reset between runs of this builder.
-	 *
-	 * This can be used, for example, to clear any stored start/end SQL.
-	 */
-	public static function reset()
-	{
-		// does nothing by default
-	}
-
-	/**
-	 * Gets any SQL to place at the start of all the row inserts.
-	 *
-	 * @return     string
-	 */
-	public static function getDatabaseStartSql()
-	{
-		return '';
-	}
-
-	/**
-	 * Gets any SQL to place at the end of all the row inserts.
-	 *
-	 * @return     string
-	 */
-	public static function getDatabaseEndSql()
-	{
-		return '';
-	}
-
-	/**
-	 * Gets any SQL to place before row inserts for a new table.
-	 *
-	 * @return     string
-	 */
-	public function getTableStartSql()
-	{
-		return '';
-	}
-
-	/**
-	 * Gets any SQL to place at the end of row inserts for a table.
-	 *
-	 * @return     string
-	 */
-	public function getTableEndSql()
-	{
-		return '';
-	}
-
-	/**
-	 * The main method in this class, returns the SQL for INSERTing data into a row.
-	 * @param      DataRow $row The row to process.
-	 * @return     string
-	 */
-	public function buildRowSql(DataRow $row)
-	{
-		$sql = "";
-		$platform = $this->getPlatform();
-		$table = $this->getTable();
-
-		$sql .= "INSERT INTO ".$this->quoteIdentifier($this->prefixTablename($this->getTable()->getName()))." (";
-
-		// add column names to SQL
-		$colNames = array();
-		foreach ($row->getColumnValues() as $colValue) {
-			$colNames[] = $this->quoteIdentifier($colValue->getColumn()->getName());
-		}
-
-		$sql .= implode(',', $colNames);
-
-		$sql .= ") VALUES (";
-
-		$colVals = array();
-		foreach ($row->getColumnValues() as $colValue) {
-			$colVals[] = $this->getColumnValueSql($colValue);
-		}
-
-		$sql .= implode(',', $colVals);
-		$sql .= ");
-";
-
-		return $sql;
-	}
-
-	/**
-	 * Gets the propertly escaped (and quoted) value for a column.
-	 * @param      ColumnValue $colValue
-	 * @return     mixed The proper value to be added to the string.
-	 */
-	protected function getColumnValueSql(ColumnValue $colValue)
-	{
-		$column = $colValue->getColumn();
-		$method = 'get' . $column->getPhpNative() . 'Sql';
-		return $this->$method($colValue->getValue());
-	}
-
-
-
-	/**
-	 * Gets a representation of a binary value suitable for use in a SQL statement.
-	 * Default behavior is true = 1, false = 0.
-	 * @param      boolean $value
-	 * @return     int
-	 */
-	protected function getBooleanSql($value)
-	{
-		return (int) $value;
-	}
-
-
-	/**
-	 * Gets a representation of a BLOB/LONGVARBINARY value suitable for use in a SQL statement.
-	 * @param      mixed $blob Blob object or string data.
-	 * @return     string
-	 */
-	protected function getBlobSql($blob)
-	{
-		// they took magic __toString() out of PHP5.0.0; this sucks
-		if (is_object($blob)) {
-			return $this->getPlatform()->quote($blob->__toString());
-		} else {
-			return $this->getPlatform()->quote($blob);
-		}
-	}
-
-	/**
-	 * Gets a representation of a CLOB/LONGVARCHAR value suitable for use in a SQL statement.
-	 * @param      mixed $clob Clob object or string data.
-	 * @return     string
-	 */
-	protected function getClobSql($clob)
-	{
-		// they took magic __toString() out of PHP5.0.0; this sucks
-		if (is_object($clob)) {
-			return $this->getPlatform()->quote($clob->__toString());
-		} else {
-			return $this->getPlatform()->quote($clob);
-		}
-	}
-
-	/**
-	 * Gets a representation of a date value suitable for use in a SQL statement.
-	 * @param      string $value
-	 * @return     string
-	 */
-	protected function getDateSql($value)
-	{
-		return "'" . date('Y-m-d', strtotime($value)) . "'";
-	}
-
-	/**
-	 * Gets a representation of a decimal value suitable for use in a SQL statement.
-	 * @param      double $value
-	 * @return     float
-	 */
-	protected function getDecimalSql($value)
-	{
-		return (float) $value;
-	}
-
-	/**
-	 * Gets a representation of a double value suitable for use in a SQL statement.
-	 * @param      double $value
-	 * @return     double
-	 */
-	protected function getDoubleSql($value)
-	{
-		return (double) $value;
-	}
-
-	/**
-	 * Gets a representation of a float value suitable for use in a SQL statement.
-	 * @param      float $value
-	 * @return     float
-	 */
-	protected function getFloatSql($value)
-	{
-		return (float) $value;
-	}
-
-	/**
-	 * Gets a representation of an integer value suitable for use in a SQL statement.
-	 * @param      int $value
-	 * @return     int
-	 */
-	protected function getIntSql($value)
-	{
-		return (int) $value;
-	}
-
-	/**
-	 * Gets a representation of a NULL value suitable for use in a SQL statement.
-	 * @return     null
-	 */
-	protected function getNullSql()
-	{
-		return 'NULL';
-	}
-
-	/**
-	 * Gets a representation of a string value suitable for use in a SQL statement.
-	 * @param      string $value
-	 * @return     string
-	 */
-	protected function getStringSql($value)
-	{
-		return $this->getPlatform()->quote($value);
-	}
-
-	/**
-	 * Gets a representation of a time value suitable for use in a SQL statement.
-	 * @param      string $value
-	 * @return     string
-	 */
-	protected function getTimeSql($paramIndex, $value)
-	{
-		return "'" . date('H:i:s', strtotime($value)) . "'";
-	}
-
-	/**
-	 * Gets a representation of a timestamp value suitable for use in a SQL statement.
-	 * @param      string $value
-	 * @return     string
-	 */
-	function getTimestampSql($value)
-	{
-		return "'" . date('Y-m-d H:i:s', strtotime($value)) . "'";
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/mssql/MssqlDDLBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/mssql/MssqlDDLBuilder.php
deleted file mode 100644
index f3eb8daff..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/mssql/MssqlDDLBuilder.php
+++ /dev/null
@@ -1,185 +0,0 @@
-<?php
-
-/*
- *  $Id: MssqlDDLBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/sql/DDLBuilder.php';
-
-/**
- * The SQL DDL-building class for MS SQL Server.
- *
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder.sql.pgsql
- */
-class MssqlDDLBuilder extends DDLBuilder {
-
-	private static $dropCount = 0;
-
-	/**
-	 *
-	 * @see        parent::addDropStatement()
-	 */
-	protected function addDropStatements(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		foreach ($table->getForeignKeys() as $fk) {
-			$script .= "
-IF EXISTS (SELECT 1 FROM sysobjects WHERE type ='RI' AND name='".$fk->getName()."')
-	ALTER TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))." DROP CONSTRAINT ".$this->quoteIdentifier($fk->getName()).";
-";
-		}
-
-
-		self::$dropCount++;
-
-		$script .= "
-IF EXISTS (SELECT 1 FROM sysobjects WHERE type = 'U' AND name = '".$this->prefixTablename($table->getName())."')
-BEGIN
-	 DECLARE @reftable_".self::$dropCount." nvarchar(60), @constraintname_".self::$dropCount." nvarchar(60)
-	 DECLARE refcursor CURSOR FOR
-	 select reftables.name tablename, cons.name constraintname
-	  from sysobjects tables,
-		   sysobjects reftables,
-		   sysobjects cons,
-		   sysreferences ref
-	   where tables.id = ref.rkeyid
-		 and cons.id = ref.constid
-		 and reftables.id = ref.fkeyid
-		 and tables.name = '".$this->prefixTablename($table->getName())."'
-	 OPEN refcursor
-	 FETCH NEXT from refcursor into @reftable_".self::$dropCount.", @constraintname_".self::$dropCount."
-	 while @@FETCH_STATUS = 0
-	 BEGIN
-	   exec ('alter table '+@reftable_".self::$dropCount."+' drop constraint '+@constraintname_".self::$dropCount.")
-	   FETCH NEXT from refcursor into @reftable_".self::$dropCount.", @constraintname_".self::$dropCount."
-	 END
-	 CLOSE refcursor
-	 DEALLOCATE refcursor
-	 DROP TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))."
-END
-";
-	}
-
-	/**
-	 * @see        parent::addColumns()
-	 */
-	protected function addTable(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		$script .= "
-/* ---------------------------------------------------------------------- */
-/* ".$table->getName()."											*/
-/* ---------------------------------------------------------------------- */
-
-";
-
-		$this->addDropStatements($script);
-
-		$script .= "
-
-CREATE TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))."
-(
-	";
-
-		$lines = array();
-
-		foreach ($table->getColumns() as $col) {
-			$lines[] = $this->getColumnDDL($col);
-		}
-
-		if ($table->hasPrimaryKey()) {
-			$lines[] = "CONSTRAINT ".$this->quoteIdentifier($table->getName()."_PK") . " PRIMARY KEY (".$this->getColumnList($table->getPrimaryKey()).")";
-		}
-
-		foreach ($table->getUnices() as $unique ) {
-			$lines[] = "UNIQUE (".$this->getColumnList($unique->getColumns()).")";
-		}
-
-		$sep = ",
-	";
-		$script .= implode($sep, $lines);
-		$script .= "
-);
-";
-	}
-
-	/**
-	 * Adds CREATE INDEX statements for this table.
-	 * @see        parent::addIndices()
-	 */
-	protected function addIndices(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		foreach ($table->getIndices() as $index) {
-			$script .= "
-CREATE ";
-			if ($index->getIsUnique()) {
-				$script .= "UNIQUE";
-			}
-			$script .= "INDEX ".$this->quoteIdentifier($index->getName())." ON ".$this->quoteIdentifier($this->prefixTablename($table->getName()))." (".$this->getColumnList($index->getColumns()).");
-";
-		}
-	}
-
-	/**
-	 *
-	 * @see        parent::addForeignKeys()
-	 */
-	protected function addForeignKeys(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		foreach ($table->getForeignKeys() as $fk) {
-			$script .= "
-BEGIN
-ALTER TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))." ADD CONSTRAINT ".$this->quoteIdentifier($fk->getName())." FOREIGN KEY (".$this->getColumnList($fk->getLocalColumns()) .") REFERENCES ".$this->quoteIdentifier($this->prefixTablename($fk->getForeignTableName()))." (".$this->getColumnList($fk->getForeignColumns()).")";
-			if ($fk->hasOnUpdate()) {
-				if ($fk->getOnUpdate() == ForeignKey::SETNULL) { // there may be others that also won't work
-					// we have to skip this because it's unsupported.
-					$this->warn("MSSQL doesn't support the 'SET NULL' option for ON UPDATE (ignoring for ".$this->getColumnList($fk->getLocalColumns())." fk).");
-				} else {
-					$script .= " ON UPDATE ".$fk->getOnUpdate();
-				}
-
-			}
-			if ($fk->hasOnDelete()) {
-				if ($fk->getOnDelete() == ForeignKey::SETNULL) { // there may be others that also won't work
-					// we have to skip this because it's unsupported.
-					$this->warn("MSSQL doesn't support the 'SET NULL' option for ON DELETE (ignoring for ".$this->getColumnList($fk->getLocalColumns())." fk).");
-				} else {
-					$script .= " ON DELETE ".$fk->getOnDelete();
-				}
-			}
-			$script .= "
-END
-;
-";
-		}
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/mssql/MssqlDataSQLBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/mssql/MssqlDataSQLBuilder.php
deleted file mode 100644
index f4ca3b0d4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/mssql/MssqlDataSQLBuilder.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/*
- *  $Id: MssqlDataSQLBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/sql/DataSQLBuilder.php';
-
-/**
- * MS SQL Server class for building data dump SQL.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder.sql.mssql
- */
-class MssqlDataSQLBuilder extends DataSQLBuilder {
-
-	/**
-	 *
-	 * @param      mixed $blob Blob object or string containing data.
-	 * @return     string
-	 */
-	protected function getBlobSql($blob)
-	{
-		// they took magic __toString() out of PHP5.0.0; this sucks
-		if (is_object($blob)) {
-			$blob = $blob->__toString();
-		}
-		$data = unpack("H*hex", $blob);
-		return '0x'.$data['hex']; // no surrounding quotes!
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/mysql/MysqlDDLBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/mysql/MysqlDDLBuilder.php
deleted file mode 100644
index 472819b3e..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/mysql/MysqlDDLBuilder.php
+++ /dev/null
@@ -1,425 +0,0 @@
-<?php
-
-/*
- *  $Id: MysqlDDLBuilder.php 1690 2010-04-19 21:59:18Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/sql/DDLBuilder.php';
-
-/**
- * DDL Builder class for MySQL.
- *
- * @author     David Z�lke
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder.sql.mysql
- */
-class MysqlDDLBuilder extends DDLBuilder {
-
-	/**
-	 * Returns some header SQL that disables foreign key checking.
-	 * @return     string DDL
-	 */
-	public static function getDatabaseStartDDL()
-	{
-		$ddl = "
-# This is a fix for InnoDB in MySQL >= 4.1.x
-# It \"suspends judgement\" for fkey relationships until are tables are set.
-SET FOREIGN_KEY_CHECKS = 0;
-";
-		return $ddl;
-	}
-
-	/**
-	 * Returns some footer SQL that re-enables foreign key checking.
-	 * @return     string DDL
-	 */
-	public static function getDatabaseEndDDL()
-	{
-		$ddl = "
-# This restores the fkey checks, after having unset them earlier
-SET FOREIGN_KEY_CHECKS = 1;
-";
-		return $ddl;
-	}
-
-
-	/**
-	 *
-	 * @see        parent::addDropStatement()
-	 */
-	protected function addDropStatements(&$script)
-	{
-		$script .= "
-DROP TABLE IF EXISTS ".$this->quoteIdentifier($this->prefixTablename($this->getTable()->getName())).";
-";
-	}
-
-	/**
-	 * Builds the SQL for current table and returns it as a string.
-	 *
-	 * This is the main entry point and defines a basic structure that classes should follow.
-	 * In most cases this method will not need to be overridden by subclasses.
-	 *
-	 * @return     string The resulting SQL DDL.
-	 */
-	public function build()
-	{
-		$script = "";
-		$this->addTable($script);
-		return $script;
-	}
-
-	/**
-	 *
-	 * @see        parent::addColumns()
-	 */
-	protected function addTable(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		$script .= "
-#-----------------------------------------------------------------------------
-#-- ".$table->getName()."
-#-----------------------------------------------------------------------------
-";
-
-		$this->addDropStatements($script);
-
-		$script .= "
-
-CREATE TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))."
-(
-	";
-
-		$lines = array();
-
-		$databaseType = $this->getPlatform()->getDatabaseType();
-
-		foreach ($table->getColumns() as $col) {
-			$entry = $this->getColumnDDL($col);
-			$colinfo = $col->getVendorInfoForType($databaseType);
-			if ( $colinfo->hasParameter('Charset') ) {
-				$entry .= ' CHARACTER SET '.$platform->quote($colinfo->getParamter('Charset'));
-			}
-			if ( $colinfo->hasParameter('Collate') ) {
-				$entry .= ' COLLATE '.$platform->quote($colinfo->getParamter('Collate'));
-			}
-			if ($col->getDescription()) {
-				$entry .= " COMMENT ".$platform->quote($col->getDescription());
-			}
-			$lines[] = $entry;
-		}
-
-		if ($table->hasPrimaryKey()) {
-			$lines[] = "PRIMARY KEY (".$this->getColumnList($table->getPrimaryKey()).")";
-		}
-
-		$this->addIndicesLines($lines);
-		$this->addForeignKeysLines($lines);
-
-		$sep = ",
-	";
-		$script .= implode($sep, $lines);
-
-		$script .= "
-)";
-
-		$mysqlTableType = $this->getBuildProperty("mysqlTableType");
-		if (!$mysqlTableType) {
-			$vendorSpecific = $table->getVendorInfoForType($this->getPlatform()->getDatabaseType());
-			if ($vendorSpecific->hasParameter('Type')) {
-				$mysqlTableType = $vendorSpecific->getParameter('Type');
-			} elseif ($vendorSpecific->hasParameter('Engine')) {
-				$mysqlTableType = $vendorSpecific->getParameter('Engine');
-			} else {
-				$mysqlTableType = 'MyISAM';
-			}
-		}
-
-		$script .= "Type=$mysqlTableType";
-
-		$dbVendorSpecific = $table->getDatabase()->getVendorInfoForType($databaseType);
-		$tableVendorSpecific = $table->getVendorInfoForType($databaseType);
-		$vendorSpecific = $dbVendorSpecific->getMergedVendorInfo($tableVendorSpecific);
-
-		if ( $vendorSpecific->hasParameter('Charset') ) {
-			$script .= ' CHARACTER SET '.$platform->quote($vendorSpecific->getParameter('Charset'));
-		}
-		if ( $vendorSpecific->hasParameter('Collate') ) {
-			$script .= ' COLLATE '.$platform->quote($vendorSpecific->getParameter('Collate'));
-		}
-		if ( $vendorSpecific->hasParameter('Checksum') ) {
-			$script .= ' CHECKSUM='.$platform->quote($vendorSpecific->getParameter('Checksum'));
-		}
-		if ( $vendorSpecific->hasParameter('Pack_Keys') ) {
-			$script .= ' PACK_KEYS='.$platform->quote($vendorSpecific->getParameter('Pack_Keys'));
-		}
-		if ( $vendorSpecific->hasParameter('Delay_key_write') ) {
-			$script .= ' DELAY_KEY_WRITE='.$platform->quote($vendorSpecific->getParameter('Delay_key_write'));
-		}
-
-		if ($table->getDescription()) {
-			$script .= " COMMENT=".$platform->quote($table->getDescription());
-		}
-		$script .= ";
-";
-	}
-
-	/**
-	 * Creates a comma-separated list of column names for the index.
-	 * For MySQL unique indexes there is the option of specifying size, so we cannot simply use
-	 * the getColumnsList() method.
-	 * @param      Index $index
-	 * @return     string
-	 */
-	private function getIndexColumnList(Index $index)
-	{
-		$platform = $this->getPlatform();
-
-		$cols = $index->getColumns();
-		$list = array();
-		foreach ($cols as $col) {
-			$list[] = $this->quoteIdentifier($col) . ($index->hasColumnSize($col) ? '(' . $index->getColumnSize($col) . ')' : '');
-		}
-		return implode(', ', $list);
-	}
-
-	/**
-	 * Adds indexes
-	 */
-	protected function addIndicesLines(&$lines)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		foreach ($table->getUnices() as $unique) {
-			$lines[] = "UNIQUE KEY ".$this->quoteIdentifier($unique->getName())." (".$this->getIndexColumnList($unique).")";
-		}
-
-		foreach ($table->getIndices() as $index ) {
-			$vendorInfo = $index->getVendorInfoForType($platform->getDatabaseType());
-			$lines[] .= (($vendorInfo && $vendorInfo->getParameter('Index_type') == 'FULLTEXT') ? 'FULLTEXT ' : '') . "KEY " . $this->quoteIdentifier($index->getName()) . "(" . $this->getIndexColumnList($index) . ")";
-		}
-
-	}
-
-	/**
-	 * Adds foreign key declarations & necessary indexes for mysql (if they don't exist already).
-	 * @see        parent::addForeignKeys()
-	 */
-	protected function addForeignKeysLines(&$lines)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-
-		/**
-		 * A collection of indexed columns. The keys is the column name
-		 * (concatenated with a comma in the case of multi-col index), the value is
-		 * an array with the names of the indexes that index these columns. We use
-		 * it to determine which additional indexes must be created for foreign
-		 * keys. It could also be used to detect duplicate indexes, but this is not
-		 * implemented yet.
-		 * @var array
-		 */
-		$_indices = array();
-		
-		$this->collectIndexedColumns('PRIMARY', $table->getPrimaryKey(), $_indices, 'getName');
-		
-		$_tableIndices = array_merge($table->getIndices(), $table->getUnices());
-		foreach ($_tableIndices as $_index) {
-		  $this->collectIndexedColumns($_index->getName(), $_index->getColumns(), $_indices);
-		}
-
-		// we're determining which tables have foreign keys that point to this table, since MySQL needs an index on
-		// any column that is referenced by another table (yep, MySQL _is_ a PITA)
-		$counter = 0;
-		$allTables = $table->getDatabase()->getTables();
-		foreach ($allTables as $_table) {
-			foreach ($_table->getForeignKeys() as $_foreignKey) {
-				if ($_foreignKey->getForeignTableName() == $table->getName()) {
-				  $referencedColumns = $_foreignKey->getForeignColumns();
-				  $referencedColumnsHash = $this->getColumnList($referencedColumns);
-				  if (!array_key_exists($referencedColumnsHash, $_indices)) {
-						// no matching index defined in the schema, so we have to create one
-						$indexName = "I_referenced_".$_foreignKey->getName()."_".(++$counter);
-						$lines[] = "INDEX ".$this->quoteIdentifier($indexName)." (" .$referencedColumnsHash.")";
-						// Add this new index to our collection, otherwise we might add it again (bug #725)
-						$this->collectIndexedColumns($indexName, $referencedColumns, $_indices);
-					}
-				}
-			}
-		}
-
-		foreach ($table->getForeignKeys() as $fk) {
-
-			$indexName = $this->quoteIdentifier(substr_replace($fk->getName(), 'FI_',  strrpos($fk->getName(), 'FK_'), 3));
-			
-			$localColumns = $fk->getLocalColumns();
-			$localColumnsHash = $this->getColumnList($localColumns);
-
-			if (!array_key_exists($localColumnsHash, $_indices)) {
-				// no matching index defined in the schema, so we have to create one. MySQL needs indices on any columns that serve as foreign keys. these are not auto-created prior to 4.1.2
-				$lines[] = "INDEX $indexName (".$localColumnsHash.")";
-				$this->collectIndexedColumns($indexName, $localColumns, $_indices);
-			}
-			$str = "CONSTRAINT ".$this->quoteIdentifier($fk->getName())."
-		FOREIGN KEY (".$this->getColumnList($fk->getLocalColumns()).")
-		REFERENCES ".$this->quoteIdentifier($this->prefixTablename($fk->getForeignTableName())) . " (".$this->getColumnList($fk->getForeignColumns()).")";
-			if ($fk->hasOnUpdate()) {
-				$str .= "
-		ON UPDATE ".$fk->getOnUpdate();
-			}
-			if ($fk->hasOnDelete()) {
-				$str .= "
-		ON DELETE ".$fk->getOnDelete();
-			}
-			$lines[] = $str;
-		}
-	}
-	
-	/**
-	 * Helper function to collect indexed columns.
-	 * @param array $columns The column names, or objects with a $callback method
-	 * @param array $indexedColumns The collected indexes
-	 * @param string $callback The name of a method to call on each of $columns to get the column name, if needed.
-	 * @return unknown_type
-	 */
-	private function collectIndexedColumns($indexName, $columns, &$collectedIndexes, $callback = null)
-	{
-	  // Get the actual column names, using the callback if needed.
-	  // DDLBuilder::getColumnList tests $col instanceof Column, and no callback - maybe we should too?
-	  $colnames = $columns;
-	  if ($callback) {
-	    $colnames = array();
-	    foreach ($columns as $col) {
-	      $colnames[] = $col->$callback();
-	    }
-	  }
-	  
-	  /**
-	   * "If the table has a multiple-column index, any leftmost prefix of the
-	   * index can be used by the optimizer to find rows. For example, if you
-	   * have a three-column index on (col1, col2, col3), you have indexed search
-	   * capabilities on (col1), (col1, col2), and (col1, col2, col3)."
-	   * @link http://dev.mysql.com/doc/refman/5.5/en/mysql-indexes.html
-	   */
-	  $indexedColumns = array();
-	  foreach ($colnames as $colname) {
-	    $indexedColumns[] = $this->quoteIdentifier($colname);
-	    $indexedColumnsHash = implode(',', $indexedColumns);
-	    if (!array_key_exists($indexedColumnsHash, $collectedIndexes)) {
-	      $collectedIndexes[$indexedColumnsHash] = array();
-	    }
-	    $collectedIndexes[$indexedColumnsHash][] = $indexName;
-	  }
-	}
-
-	/**
-	 * Checks whether passed-in array of Column objects contains a column with specified name.
-	 * @param      array Column[] or string[]
-	 * @param      string $searchcol Column name to search for
-	 */
-	private function containsColname($columns, $searchcol)
-	{
-		foreach ($columns as $col) {
-			if ($col instanceof Column) {
-				$col = $col->getName();
-			}
-			if ($col == $searchcol) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Not used for MySQL since foreign keys are declared inside table declaration.
-	 * @see        addForeignKeysLines()
-	 */
-	protected function addForeignKeys(&$script)
-	{
-	}
-
-	/**
-	 * Not used for MySQL since indexes are declared inside table declaration.
-	 * @see        addIndicesLines()
-	 */
-	protected function addIndices(&$script)
-	{
-	}
-
-	/**
-	 * Builds the DDL SQL for a Column object.
-	 * @return     string
-	 */
-	public function getColumnDDL(Column $col)
-	{
-		$platform = $this->getPlatform();
-		$domain = $col->getDomain();
-		$sqlType = $domain->getSqlType();
-		$notNullString = $col->getNotNullString();
-		$defaultSetting = $col->getDefaultSetting();
-
-		// Special handling of TIMESTAMP/DATETIME types ...
-		// See: http://propel.phpdb.org/trac/ticket/538
-		if ($sqlType == 'DATETIME') {
-			$def = $domain->getDefaultValue();
-			if ($def && $def->isExpression()) { // DATETIME values can only have constant expressions
-				$sqlType = 'TIMESTAMP';
-			}
-		} elseif ($sqlType == 'DATE') {
-			$def = $domain->getDefaultValue();
-			if ($def && $def->isExpression()) {
-				throw new EngineException("DATE columns cannot have default *expressions* in MySQL.");
-			}
-		} elseif ($sqlType == 'TEXT' || $sqlType == 'BLOB') {
-			if ($domain->getDefaultValue()) {
-				throw new EngineException("BLOB and TEXT columns cannot have DEFAULT values. in MySQL.");
-			}
-		}
-
-		$sb = "";
-		$sb .= $this->quoteIdentifier($col->getName()) . " ";
-		$sb .= $sqlType;
-		if ($platform->hasSize($sqlType)) {
-			$sb .= $domain->printSize();
-		}
-		$sb .= " ";
-
-		if ($sqlType == 'TIMESTAMP') {
-			$notNullString = $col->getNotNullString();
-			$defaultSetting = $col->getDefaultSetting();
-			if ($notNullString == '') {
-				$notNullString = 'NULL';
-			}
-			if ($defaultSetting == '' && $notNullString == 'NOT NULL') {
-				$defaultSetting = 'DEFAULT CURRENT_TIMESTAMP';
-			}
-			$sb .= $notNullString . " " . $defaultSetting . " ";
-		} else {
-			$sb .= $defaultSetting . " ";
-			$sb .= $notNullString . " ";
-		}
-		$sb .= $col->getAutoIncrementString();
-
-		return trim($sb);
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/mysql/MysqlDataSQLBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/mysql/MysqlDataSQLBuilder.php
deleted file mode 100644
index 735c5a8b0..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/mysql/MysqlDataSQLBuilder.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- *  $Id: MysqlDataSQLBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/sql/DataSQLBuilder.php';
-
-/**
- * MySQL class for building data dump SQL.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder.sql.mysql
- */
-class MysqlDataSQLBuilder extends DataSQLBuilder {
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/oracle/OracleDDLBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/oracle/OracleDDLBuilder.php
deleted file mode 100644
index a2d1abeca..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/oracle/OracleDDLBuilder.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-/*
- *  $Id: OracleDDLBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/sql/DDLBuilder.php';
-
-/**
- * The SQL DDL-building class for Oracle.
- *
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder.sql.pgsql
- */
-class OracleDDLBuilder extends DDLBuilder {
-
-	/**
-	 *
-	 * @see        parent::addDropStatement()
-	 */
-	protected function addDropStatements(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-		$script .= "
-DROP TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))." CASCADE CONSTRAINTS;
-";
-		if ($table->getIdMethod() == "native") {
-			$script .= "
-DROP SEQUENCE ".$this->quoteIdentifier($this->prefixTablename($this->getSequenceName())).";
-";
-		}
-	}
-
-	/**
-	 *
-	 * @see        parent::addColumns()
-	 */
-	protected function addTable(&$script)
-	{
-		$table = $this->getTable();
-		$script .= "
-
-/* -----------------------------------------------------------------------
-   ".$table->getName()."
-   ----------------------------------------------------------------------- */
-";
-
-		$this->addDropStatements($script);
-
-		$script .= "
-
-CREATE TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))."
-(
-	";
-
-		$lines = array();
-
-		foreach ($table->getColumns() as $col) {
-			$lines[] = $this->getColumnDDL($col);
-		}
-
-		$sep = ",
-	";
-		$script .= implode($sep, $lines);
-		$script .= "
-);
-";
-		$this->addPrimaryKey($script);
-		$this->addSequences($script);
-
-	}
-
-	/**
-	 *
-	 *
-	 */
-	protected function addPrimaryKey(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-		$tableName = $table->getName();
-		$length = strlen($tableName);
-		if ($length > 27) {
-			$length = 27;
-		}
-		if ( is_array($table->getPrimaryKey()) && count($table->getPrimaryKey()) ) {
-			$script .= "
-	ALTER TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))."
-		ADD CONSTRAINT ".$this->quoteIdentifier(substr($tableName,0,$length)."_PK")."
-	PRIMARY KEY (";
-			$delim = "";
-			foreach ($table->getPrimaryKey() as $col) {
-				$script .= $delim . $this->quoteIdentifier($col->getName());
-				$delim = ",";
-			}
-	$script .= ");
-";
-		}
-	}
-
-	/**
-	 * Adds CREATE SEQUENCE statements for this table.
-	 *
-	 */
-	protected function addSequences(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-		if ($table->getIdMethod() == "native") {
-			$script .= "CREATE SEQUENCE ".$this->quoteIdentifier($this->prefixTablename($this->getSequenceName()))." INCREMENT BY 1 START WITH 1 NOMAXVALUE NOCYCLE NOCACHE ORDER;
-";
-		}
-	}
-
-
-	/**
-	 * Adds CREATE INDEX statements for this table.
-	 * @see        parent::addIndices()
-	 */
-	protected function addIndices(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-		foreach ($table->getIndices() as $index) {
-			$script .= "CREATE ";
-			if ($index->getIsUnique()) {
-				$script .= "UNIQUE";
-			}
-			$script .= "INDEX ".$this->quoteIdentifier($index->getName()) ." ON ".$this->quoteIdentifier($this->prefixTablename($table->getName()))." (".$this->getColumnList($index->getColumns()).");
-";
-		}
-	}
-
-	/**
-	 *
-	 * @see        parent::addForeignKeys()
-	 */
-	protected function addForeignKeys(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-		foreach ($table->getForeignKeys() as $fk) {
-			$script .= "
-ALTER TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))." ADD CONSTRAINT ".$this->quoteIdentifier($fk->getName())." FOREIGN KEY (".$this->getColumnList($fk->getLocalColumns()) .") REFERENCES ".$this->quoteIdentifier($this->prefixTablename($fk->getForeignTableName()))." (".$this->getColumnList($fk->getForeignColumns()).")";
-			if ($fk->hasOnUpdate()) {
-				$this->warn("ON UPDATE not yet implemented for Oracle builder.(ignoring for ".$this->getColumnList($fk->getLocalColumns())." fk).");
-				//$script .= " ON UPDATE ".$fk->getOnUpdate();
-			}
-			if ($fk->hasOnDelete()) {
-				$script .= " ON DELETE ".$fk->getOnDelete();
-			}
-			$script .= ";
-";
-		}
-	}
-
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/oracle/OracleDataSQLBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/oracle/OracleDataSQLBuilder.php
deleted file mode 100644
index e9fb60ba6..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/oracle/OracleDataSQLBuilder.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- *  $Id: OracleDataSQLBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/sql/DataSQLBuilder.php';
-
-/**
- * Oracle class for building data dump SQL.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder.sql.oracle
- */
-class OracleDataSQLBuilder extends DataSQLBuilder {
-
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/pgsql/PgsqlDDLBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/pgsql/PgsqlDDLBuilder.php
deleted file mode 100644
index 379911fd0..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/pgsql/PgsqlDDLBuilder.php
+++ /dev/null
@@ -1,316 +0,0 @@
-<?php
-
-/*
- *  $Id: PgsqlDDLBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/sql/DDLBuilder.php';
-
-/**
- * The SQL DDL-building class for PostgreSQL.
- *
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder.sql.pgsql
- */
-class PgsqlDDLBuilder extends DDLBuilder {
-
-
-	/**
-	 * Array that keeps track of already
-	 * added schema names
-	 *
-	 * @var        Array of schema names
-	 */
-	protected static $addedSchemas = array();
-
-	/**
-	 * Queue of constraint SQL that will be added to script at the end.
-	 *
-	 * PostgreSQL seems (now?) to not like constraints for tables that don't exist,
-	 * so the solution is to queue up the statements and execute it at the end.
-	 *
-	 * @var        array
-	 */
-	protected static $queuedConstraints = array();
-
-	/**
-	 * Reset static vars between db iterations.
-	 */
-	public static function reset()
-	{
-		self::$addedSchemas = array();
-		self::$queuedConstraints = array();
-	}
-
-	/**
-	 * Returns all the ALTER TABLE ADD CONSTRAINT lines for inclusion at end of file.
-	 * @return     string DDL
-	 */
-	public static function getDatabaseEndDDL()
-	{
-		$ddl = implode("", self::$queuedConstraints);
-		return $ddl;
-	}
-
-	/**
-	 * Get the schema for the current table
-	 *
-	 * @author     Markus Lervik <markus.lervik@necora.fi>
-	 * @access     protected
-	 * @return     schema name if table has one, else
-	 *         null
-	 **/
-	protected function getSchema()
-	{
-		$table = $this->getTable();
-		$vi = $table->getVendorInfoForType($this->getPlatform()->getDatabaseType());
-		if ($vi->hasParameter('schema')) {
-			return $vi->getParameter('schema');
-		}
-		return null;
-	}
-
-	/**
-	 * Add a schema to the generated SQL script
-	 *
-	 * @author     Markus Lervik <markus.lervik@necora.fi>
-	 * @access     protected
-	 * @return     string with CREATE SCHEMA statement if
-	 *         applicable, else empty string
-	 **/
-	protected function addSchema()
-	{
-
-		$schemaName = $this->getSchema();
-
-		if ($schemaName !== null) {
-
-			if (!in_array($schemaName, self::$addedSchemas)) {
-		$platform = $this->getPlatform();
-				self::$addedSchemas[] = $schemaName;
-		return "\nCREATE SCHEMA " . $this->quoteIdentifier($schemaName) . ";\n";
-			}
-		}
-
-		return '';
-
-	}
-
-	/**
-	 *
-	 * @see        parent::addDropStatement()
-	 */
-	protected function addDropStatements(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		$script .= "
-DROP TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))." CASCADE;
-";
-
-		if ($table->getIdMethod() == IDMethod::NATIVE && $table->getIdMethodParameters()) {
-			$script .= "
-DROP SEQUENCE ".$this->quoteIdentifier($this->prefixTablename(strtolower($this->getSequenceName()))).";
-";
-		}
-	}
-
-	/**
-	 *
-	 * @see        parent::addColumns()
-	 */
-	protected function addTable(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		$script .= "
------------------------------------------------------------------------------
--- ".$table->getName()."
------------------------------------------------------------------------------
-";
-
-		$script .= $this->addSchema();
-
-		$schemaName = $this->getSchema();
-		if ($schemaName !== null) {
-			$script .= "\nSET search_path TO " . $this->quoteIdentifier($schemaName) . ";\n";
-		}
-
-		$this->addDropStatements($script);
-		$this->addSequences($script);
-
-		$script .= "
-
-CREATE TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))."
-(
-	";
-
-		$lines = array();
-
-		foreach ($table->getColumns() as $col) {
-			/* @var $col Column */
-			$colDDL = $this->getColumnDDL($col);
-			if ($col->isAutoIncrement() && $table->getIdMethodParameters() == null) {
-				if ($col->getType() === PropelTypes::BIGINT) {
-					$colDDL = str_replace($col->getDomain()->getSqlType(), 'bigserial', $colDDL);
-				} else {
-					$colDDL = str_replace($col->getDomain()->getSqlType(), 'serial', $colDDL);
-				}
-			}
-			$lines[] = $colDDL;
-		}
-
-		if ($table->hasPrimaryKey()) {
-			$lines[] = "PRIMARY KEY (".$this->getColumnList($table->getPrimaryKey()).")";
-		}
-
-		foreach ($table->getUnices() as $unique ) {
-			$lines[] = "CONSTRAINT ".$this->quoteIdentifier($unique->getName())." UNIQUE (".$this->getColumnList($unique->getColumns()).")";
-		}
-
-		$sep = ",
-	";
-		$script .= implode($sep, $lines);
-		$script .= "
-);
-
-COMMENT ON TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))." IS " . $platform->quote($table->getDescription()).";
-
-";
-
-		$this->addColumnComments($script);
-
-		$script .= "\nSET search_path TO public;";
-
-	}
-
-	/**
-	 * Adds comments for the columns.
-	 *
-	 */
-	protected function addColumnComments(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		foreach ($this->getTable()->getColumns() as $col) {
-			if ( $col->getDescription() != '' ) {
-				$script .= "
-COMMENT ON COLUMN ".$this->quoteIdentifier($this->prefixTablename($table->getName())).".".$this->quoteIdentifier($col->getName())." IS ".$platform->quote($col->getDescription()) .";
-";
-			}
-		}
-	}
-
-	/**
-	 * Override to provide sequence names that conform to postgres' standard when
-	 * no id-method-parameter specified.
-	 *
-	 * @see        DataModelBuilder::getSequenceName()
-	 * @return     string
-	 */
-	public function getSequenceName()
-	{
-		$table = $this->getTable();
-		static $longNamesMap = array();
-		$result = null;
-		if ($table->getIdMethod() == IDMethod::NATIVE) {
-			$idMethodParams = $table->getIdMethodParameters();
-			if (empty($idMethodParams)) {
-				$result = null;
-				// We're going to ignore a check for max length (mainly
-				// because I'm not sure how Postgres would handle this w/ SERIAL anyway)
-				foreach ($table->getColumns() as $col) {
-					if ($col->isAutoIncrement()) {
-						$result = $table->getName() . '_' . $col->getName() . '_seq';
-						break; // there's only one auto-increment column allowed
-					}
-				}
-			} else {
-				$result = $idMethodParams[0]->getValue();
-			}
-		}
-		return $result;
-	}
-
-	/**
-	 * Adds CREATE SEQUENCE statements for this table.
-	 *
-	 */
-	protected function addSequences(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		if ($table->getIdMethod() == IDMethod::NATIVE && $table->getIdMethodParameters() != null) {
-			$script .= "
-CREATE SEQUENCE ".$this->quoteIdentifier($this->prefixTablename(strtolower($this->getSequenceName()))).";
-";
-		}
-	}
-
-
-	/**
-	 * Adds CREATE INDEX statements for this table.
-	 * @see        parent::addIndices()
-	 */
-	protected function addIndices(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		foreach ($table->getIndices() as $index) {
-			$script .= "
-CREATE ";
-			if ($index->getIsUnique()) {
-				$script .= "UNIQUE";
-			}
-			$script .= "INDEX ".$this->quoteIdentifier($index->getName())." ON ".$this->quoteIdentifier($this->prefixTablename($table->getName()))." (".$this->getColumnList($index->getColumns()).");
-";
-		}
-	}
-
-	/**
-	 *
-	 * @see        parent::addForeignKeys()
-	 */
-	protected function addForeignKeys(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		foreach ($table->getForeignKeys() as $fk) {
-			$privscript = "
-ALTER TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))." ADD CONSTRAINT ".$this->quoteIdentifier($fk->getName())." FOREIGN KEY (".$this->getColumnList($fk->getLocalColumns()) .") REFERENCES ".$this->quoteIdentifier($this->prefixTablename($fk->getForeignTableName()))." (".$this->getColumnList($fk->getForeignColumns()).")";
-			if ($fk->hasOnUpdate()) {
-				$privscript .= " ON UPDATE ".$fk->getOnUpdate();
-			}
-			if ($fk->hasOnDelete()) {
-				$privscript .= " ON DELETE ".$fk->getOnDelete();
-			}
-			$privscript .= ";
-";
-			self::$queuedConstraints[] = $privscript;
-		}
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/pgsql/PgsqlDataSQLBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/pgsql/PgsqlDataSQLBuilder.php
deleted file mode 100644
index 33d3d78d1..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/pgsql/PgsqlDataSQLBuilder.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-/*
- *  $Id: PgsqlDataSQLBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/sql/DataSQLBuilder.php';
-
-/**
- * PostgreSQL class for building data dump SQL.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder.sql.pgsql
- */
-class PgsqlDataSQLBuilder extends DataSQLBuilder {
-
-	/**
-	 * The largets serial value encountered this far.
-	 *
-	 * @var        int
-	 */
-	private $maxSeqVal;
-
-	/**
-	 * Construct a new PgsqlDataSQLBuilder object.
-	 *
-	 * @param      Table $table
-	 */
-	public function __construct(Table $table)
-	{
-		parent::__construct($table);
-	}
-
-	/**
-	 * The main method in this class, returns the SQL for INSERTing data into a row.
-	 * @param      DataRow $row The row to process.
-	 * @return     string
-	 */
-	public function buildRowSql(DataRow $row)
-	{
-		$sql = parent::buildRowSql($row);
-
-		$table = $this->getTable();
-
-		if ($table->hasAutoIncrementPrimaryKey() && $table->getIdMethod() == IDMethod::NATIVE) {
-			foreach ($row->getColumnValues() as $colValue) {
-				if ($colValue->getColumn()->isAutoIncrement()) {
-					if ($colValue->getValue() > $this->maxSeqVal) {
-						$this->maxSeqVal = $colValue->getValue();
-					}
-				}
-			}
-		}
-
-		return $sql;
-	}
-
-	public function getTableEndSql()
-	{
-		$table = $this->getTable();
-		$sql = "";
-		if ($table->hasAutoIncrementPrimaryKey() && $table->getIdMethod() == IDMethod::NATIVE) {
-			$seqname = $this->prefixTablename($this->getDDLBuilder()->getSequenceName());
-			$sql .= "SELECT pg_catalog.setval('$seqname', ".((int)$this->maxSeqVal).");
-";
-		}
-		return $sql;
-	}
-
-	/**
-	 * Get SQL value to insert for Postgres BOOLEAN column.
-	 * @param      boolean $value
-	 * @return     string The representation of boolean for Postgres ('t' or 'f').
-	 */
-	protected function getBooleanSql($value)
-	{
-		if ($value === 'f' || $value === 'false' || $value === "0") {
-			$value = false;
-		}
-		return ($value ? "'t'" : "'f'");
-	}
-
-	/**
-	 *
-	 * @param      mixed $blob Blob object or string containing data.
-	 * @return     string
-	 */
-	protected function getBlobSql($blob)
-	{
-		// they took magic __toString() out of PHP5.0.0; this sucks
-		if (is_object($blob)) {
-			$blob = $blob->__toString();
-		}
-		return "'" . pg_escape_bytea($blob) . "'";
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/sqlite/SqliteDDLBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/sqlite/SqliteDDLBuilder.php
deleted file mode 100644
index bfd6beaa1..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/sqlite/SqliteDDLBuilder.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-
-/*
- *  $Id: SqliteDDLBuilder.php 1595 2010-03-15 09:45:51Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/sql/DDLBuilder.php';
-
-/**
- * The SQL DDL-building class for SQLite.
- *
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder.sql.pgsql
- */
-class SqliteDDLBuilder extends DDLBuilder {
-
-	/**
-	 *
-	 * @see        parent::addDropStatement()
-	 */
-	protected function addDropStatements(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		$script .= "
-DROP TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName())).";
-";
-	}
-
-	/**
-	 *
-	 * @see        parent::addColumns()
-	 */
-	protected function addTable(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		$script .= "
------------------------------------------------------------------------------
--- ".$table->getName()."
------------------------------------------------------------------------------
-";
-
-		$this->addDropStatements($script);
-
-		$script .= "
-
-CREATE TABLE ".$this->quoteIdentifier($this->prefixTablename($table->getName()))."
-(
-	";
-
-		$lines = array();
-
-		foreach ($table->getColumns() as $col) {
-			$lines[] = $this->getColumnDDL($col);
-		}
-
-		if ($table->hasPrimaryKey() && count($table->getPrimaryKey()) > 1) {
-			$lines[] = "PRIMARY KEY (".$this->getColumnList($table->getPrimaryKey()).")";
-		}
-
-		foreach ($table->getUnices() as $unique ) {
-			$lines[] = "UNIQUE (".$this->getColumnList($unique->getColumns()).")";
-		}
-
-		$sep = ",
-	";
-		$script .= implode($sep, $lines);
-		$script .= "
-);
-";
-	}
-
-	/**
-	 * Adds CREATE INDEX statements for this table.
-	 * @see        parent::addIndices()
-	 */
-	protected function addIndices(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		foreach ($table->getIndices() as $index) {
-			$script .= "
-CREATE ";
-			if ($index->getIsUnique()) {
-				$script .= "UNIQUE";
-			}
-			$script .= "INDEX ".$this->quoteIdentifier($index->getName())." ON ".$this->quoteIdentifier($this->prefixTablename($table->getName()))." (".$this->getColumnList($index->getColumns()).");
-";
-		}
-	}
-
-	/**
-	 *
-	 * @see        parent::addForeignKeys()
-	 */
-	protected function addForeignKeys(&$script)
-	{
-		$table = $this->getTable();
-		$platform = $this->getPlatform();
-
-		foreach ($table->getForeignKeys() as $fk) {
-			$script .= "
--- SQLite does not support foreign keys; this is just for reference
--- FOREIGN KEY (".$this->getColumnList($fk->getLocalColumns()).") REFERENCES ".$this->prefixTablename($fk->getForeignTableName())." (".$this->getColumnList($fk->getForeignColumns()).")
-";
-		}
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/sqlite/SqliteDataSQLBuilder.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/sqlite/SqliteDataSQLBuilder.php
deleted file mode 100644
index 3422a6104..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/sql/sqlite/SqliteDataSQLBuilder.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/*
- *  $Id: SqliteDataSQLBuilder.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/sql/DataSQLBuilder.php';
-
-/**
- * SQLite class for building data dump SQL.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.engine.builder.sql.sqlite
- */
-class SqliteDataSQLBuilder extends DataSQLBuilder {
-
-	/**
-	 * Returns string processed by sqlite_udf_encode_binary() to ensure that binary contents will be handled correctly by sqlite.
-	 * @param      mixed $blob Blob or string
-	 * @return     string encoded text
-	 */
-	protected function getBlobSql($blob)
-	{
-		// they took magic __toString() out of PHP5.0.0; this sucks
-		if (is_object($blob)) {
-			$blob = $blob->__toString();
-		}
-		return "'" . sqlite_udf_encode_binary($blob) . "'";
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/util/DefaultEnglishPluralizer.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/util/DefaultEnglishPluralizer.php
deleted file mode 100644
index 5ef3ec692..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/util/DefaultEnglishPluralizer.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/*
- *  $Id: DefaultEnglishPluralizer.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/builder/util/Pluralizer.php';
-
-/**
- * The default Enlglish pluralizer class.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.engine.generator
- */
-class DefaultEnglishPluralizer implements Pluralizer {
-
-	/**
-	 * Generate a plural name based on the passed in root.
-	 * @param      string $root The root that needs to be pluralized (e.g. Author)
-	 * @return     string The plural form of $root (e.g. Authors).
-	 */
-	public function getPluralForm($root)
-	{
-		return $root . 's';
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/util/Pluralizer.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/util/Pluralizer.php
deleted file mode 100644
index f0ad1b467..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/util/Pluralizer.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/*
- *  $Id: Pluralizer.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * The generic interface to create a plural form of a name.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.engine.generator
- */
-interface Pluralizer {
-
-	/**
-	 * Generate a plural name based on the passed in root.
-	 * @param      string $root The root that needs to be pluralized (e.g. Author)
-	 * @return     string The plural form of $root.
-	 */
-	public function getPluralForm($root);
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/util/transform/XmlToDataSQL.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/util/transform/XmlToDataSQL.php
deleted file mode 100644
index 14be59e15..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/builder/util/transform/XmlToDataSQL.php
+++ /dev/null
@@ -1,276 +0,0 @@
-<?php
-
-/*
- *  $Id: XmlToDataSQL.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'phing/parser/AbstractHandler.php';
-
-/**
- * A Class that is used to parse an data dump XML file and create SQL using a DataSQLBuilder class.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.transform
- */
-class XmlToDataSQL extends AbstractHandler {
-
-	/**
-	 * The GeneratorConfig associated with the build.
-	 *
-	 * @var        GeneratorConfig
-	 */
-	private $generatorConfig;
-
-	/**
-	 * The database.
-	 *
-	 * @var        Database
-	 */
-	private $database;
-
-	/**
-	 * The output writer for the SQL file.
-	 *
-	 * @var        Writer
-	 */
-	private $sqlWriter;
-
-	/**
-	 * The database (and output SQL file) encoding.
-	 *
-	 * Values will be converted to this encoding in the output file.
-	 *
-	 * @var        string
-	 */
-	private $encoding;
-
-	/**
-	 * The classname of the static class that will perform the building.
-	 *
-	 * This is needed because there are some pre/post methods that get called
-	 * on the static class.
-	 *
-	 * @var        string
-	 */
-	private $builderClazz;
-
-	/**
-	 * The name of the current table being processed.
-	 *
-	 * @var        string
-	 */
-	private $currTableName;
-
-	/**
-	 * The DataSQLBuilder for the current table.
-	 *
-	 * @var        DataSQLBuilder
-	 */
-	private $currBuilder;
-
-	/**
-	 * Expat Parser.
-	 *
-	 * @var        ExpatParser
-	 */
-	public $parser;
-
-	/**
-	 * Flag for enabing debug output to aid in parser tracing.
-	 */
-	const DEBUG = false;
-
-	/**
-	 * Construct new XmlToDataSQL class.
-	 *
-	 * This class is passed the Database object so that it knows what to expect from
-	 * the XML file.
-	 *
-	 * @param      Database $database
-	 * @param      GeneratorConfig $config
-	 * @param      string $encoding Database encoding
-	 */
-	public function __construct(Database $database, GeneratorConfig $config, $encoding = 'iso-8859-1')
-	{
-		$this->database = $database;
-		$this->generatorConfig = $config;
-		$this->encoding = $encoding;
-	}
-
-	/**
-	 * Transform the data dump input file into SQL and writes it to the output stream.
-	 *
-	 * @param      PhingFile $xmlFile
-	 * @param      Writer $out
-	 */
-	public function transform(PhingFile $xmlFile, Writer $out)
-	{
-		$this->sqlWriter = $out;
-
-		// Reset some vars just in case this is being run multiple times.
-		$this->currTableName = $this->currBuilder = null;
-
-		$this->builderClazz = $this->generatorConfig->getBuilderClassname('datasql');
-
-		try {
-			$fr = new FileReader($xmlFile);
-		} catch (Exception $e) {
-			throw new BuildException("XML File not found: " . $xmlFile->getAbsolutePath());
-		}
-
-		$br = new BufferedReader($fr);
-
-		$this->parser = new ExpatParser($br);
-		$this->parser->parserSetOption(XML_OPTION_CASE_FOLDING, 0);
-		$this->parser->setHandler($this);
-
-		try {
-			$this->parser->parse();
-		} catch (Exception $e) {
-			print $e->getMessage() . "\n";
-			$br->close();
-		}
-		$br->close();
-	}
-
-	/**
-	 * Handles opening elements of the xml file.
-	 */
-	public function startElement($name, $attributes)
-	{
-		try {
-			if ($name == "dataset") {
-				// Clear any start/end DLL
-				call_user_func(array($this->builderClazz, 'reset'));
-				$this->sqlWriter->write(call_user_func(array($this->builderClazz, 'getDatabaseStartSql')));
-			} else {
-
-				// we're processing a row of data
-				// where tag name is phpName e.g. <BookReader .... />
-
-				$table = $this->database->getTableByPhpName($name);
-
-				$columnValues = array();
-				foreach ($attributes as $name => $value) {
-					$col = $table->getColumnByPhpName($name);
-					$columnValues[] = new ColumnValue($col, iconv('utf-8',$this->encoding, $value));
-				}
-
-				$data = new DataRow($table, $columnValues);
-
-				if ($this->currTableName !== $table->getName()) {
-					// new table encountered
-
-					if ($this->currBuilder !== null) {
-						$this->sqlWriter->write($this->currBuilder->getTableEndSql());
-					}
-
-					$this->currTableName = $table->getName();
-					$this->currBuilder = $this->generatorConfig->getConfiguredBuilder($table, 'datasql');
-
-					$this->sqlWriter->write($this->currBuilder->getTableStartSql());
-				}
-
-				// Write the SQL
-				$this->sqlWriter->write($this->currBuilder->buildRowSql($data));
-
-			}
-
-		} catch (Exception $e) {
-			// Exceptions have traditionally not bubbled up nicely from the expat parser,
-			// so we also print the stack trace here.
-			print $e;
-			throw $e;
-		}
-	}
-
-
-	/**
-	 * Handles closing elements of the xml file.
-	 *
-	 * @param      $name The local name (without prefix), or the empty string if
-	 *         Namespace processing is not being performed.
-	 */
-	public function endElement($name)
-	{
-		if (self::DEBUG) {
-			print("endElement(" . $name . ") called\n");
-		}
-		if ($name == "dataset") {
-			if ($this->currBuilder !== null) {
-				$this->sqlWriter->write($this->currBuilder->getTableEndSql());
-			}
-			$this->sqlWriter->write(call_user_func(array($this->builderClazz, 'getDatabaseEndSql')));
-		}
-	}
-
-} // XmlToData
-
-/**
- * "inner class"
- * @package    propel.engine.database.transform
- */
-class DataRow
-{
-	private $table;
-	private $columnValues;
-
-	public function __construct(Table $table, $columnValues)
-	{
-		$this->table = $table;
-		$this->columnValues = $columnValues;
-	}
-
-	public function getTable()
-	{
-		return $this->table;
-	}
-
-	public function getColumnValues()
-	{
-		return $this->columnValues;
-	}
-}
-
-/**
- * "inner" class
- * @package    propel.engine.database.transform
- */
-class ColumnValue {
-
-	private $col;
-	private $val;
-
-	public function __construct(Column $col, $val)
-	{
-		$this->col = $col;
-		$this->val = $val;
-	}
-
-	public function getColumn()
-	{
-		return $this->col;
-	}
-
-	public function getValue()
-	{
-		return $this->val;
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/AppData.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/AppData.php
deleted file mode 100644
index 9ebedb409..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/AppData.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-/*
- *  $Id: AppData.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-include_once 'propel/engine/EngineException.php';
-include_once 'propel/engine/database/model/Database.php';
-
-/**
- * A class for holding application data structures.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Leon Messerschmidt <leon@opticode.co.za> (Torque)
- * @author     John McNally <jmcnally@collab.net> (Torque)
- * @author     Daniel Rall <dlr@finemaltcoding.com> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class AppData {
-
-	/**
-	 * The list of databases for this application.
-	 * @var        array Database[]
-	 */
-	private $dbList = array();
-
-	/**
-	 * The platform class for our database(s).
-	 * @var        string
-	 */
-	private $platform;
-
-	/**
-	 * Name of the database. Only one database definition
-	 * is allowed in one XML descriptor.
-	 */
-	private $name;
-
-	/**
-	 * Flag to ensure that initialization is performed only once.
-	 * @var        boolean
-	 */
-	private $isInitialized = false;
-
-	/**
-	 * Creates a new instance for the specified database type.
-	 *
-	 * @param      Platform $platform The platform object to use for any databases added to this application model.
-	 */
-	public function __construct(Platform $platform)
-	{
-		$this->platform = $platform;
-	}
-  
-	/**
-	 * Gets the platform object to use for any databases added to this application model. 
-	 *
-	 * @return Platform
-	 */
-	public function getPlatform()
-	{
-	  return $this->platform;
-	}
-	
-	/**
-	 * Set the name of the database.
-	 *
-	 * @param      name of the database.
-	 */
-	public function setName($name)
-	{
-		$this->name = $name;
-	}
-
-	/**
-	 * Get the name of the database.
-	 *
-	 * @return     String name
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
-
-	/**
-	 * Get the short name of the database (without the '-schema' postfix).
-	 *
-	 * @return     String name
-	 */
-	public function getShortName()
-	{
-		return str_replace("-schema", "", $this->name);
-	}
-
-	/**
-	 * Return an array of all databases
-	 *
-	 * @return     Array of Database objects
-	 */
-	public function getDatabases($doFinalInit = true)
-	{
-		// this is temporary until we'll have a clean solution
-		// for packaging datamodels/requiring schemas
-		if ($doFinalInit) {
-			$this->doFinalInitialization();
-		}
-		return $this->dbList;
-	}
-
-	/**
-	 * Returns whether this application has multiple databases.
-	 *
-	 * @return     boolean True if the application has multiple databases
-	 */
-	public function hasMultipleDatabases()
-	{
-		return (count($this->dbList) > 1);
-	}
-
-	/**
-	 * Return the database with the specified name.
-	 *
-	 * @param      name database name
-	 * @return     A Database object.  If it does not exist it returns null
-	 */
-	public function getDatabase($name = null, $doFinalInit = true)
-	{
-		// this is temporary until we'll have a clean solution
-		// for packaging datamodels/requiring schemas
-		if ($doFinalInit) {
-			$this->doFinalInitialization();
-		}
-
-		if ($name === null) {
-			return $this->dbList[0];
-		}
-
-		for ($i=0,$size=count($this->dbList); $i < $size; $i++) {
-			$db = $this->dbList[$i];
-			if ($db->getName() === $name) {
-				return $db;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Add a database to the list and sets the AppData property to this
-	 * AppData
-	 *
-	 * @param      db the database to add
-	 */
-	public function addDatabase($db)
-	{
-		if ($db instanceof Database) {
-			$db->setAppData($this);
-			if ($db->getPlatform() === null) {
-				$db->setPlatform($this->platform);
-			}
-			$this->dbList[] = $db;
-			return $db;
-		} else {
-			// XML attributes array / hash
-			$d = new Database();
-			$d->loadFromXML($db);
-			return $this->addDatabase($d); // calls self w/ different param type
-		}
-
-	}
-
-	/**
-	 *
-	 * @return     void
-	 */
-	private function doFinalInitialization()
-	{
-		if (!$this->isInitialized) {
-			for ($i=0, $size=count($this->dbList); $i < $size; $i++) {
-				$this->dbList[$i]->doFinalInitialization();
-			}
-			$this->isInitialized = true;
-		}
-	}
-
-	/**
-	 * Creats a string representation of this AppData.
-	 * The representation is given in xml format.
-	 *
-	 * @return     string Representation in xml format
-	 */
-	public function toString()
-	{
-		$result = "<app-data>\n";
-		for ($i=0,$size=count($this->dbList); $i < $size; $i++) {
-			$result .= $this->dbList[$i]->toString();
-		}
-		$result .= "</app-data>";
-		return $result;
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Behavior.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Behavior.php
deleted file mode 100644
index efbeef259..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Behavior.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-/*
- *  $Id: Behavior.php 989 2008-03-11 14:29:30Z heltem $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-include_once 'propel/engine/database/model/Index.php';
-
-/**
- * Information about behaviors of a table.
- *
- * @author     François Zaninotto
- * @version    $Revision: 989 $
- * @package    propel.engine.database.model
- */
-class Behavior extends XMLElement {
-
-  protected $table;
-  protected $database;
-  protected $name;
-  protected $parameters = array();
-  
-  public function setName($name)
-  {
-    $this->name = $name;
-  }  
-  
-  public function getName()
-  {
-    return $this->name;
-  }
-  
-  public function setTable(Table $table)
-  {
-    $this->table = $table;
-  }
-
-  public function getTable()
-  {
-    return $this->table;
-  }
-
-  public function setDatabase(Database $database)
-  {
-    $this->database = $database;
-  }
-
-  public function getDatabase()
-  {
-    return $this->database;
-  }
-  
-  /**
-   * Add a parameter
-   * Expects an associative array looking like array('name' => 'foo', 'value' => bar)
-   *
-   * @param array associative array with name and value keys
-   */
-  public function addParameter($attribute)
-  {
-    $attribute = array_change_key_case($attribute, CASE_LOWER);
-    $this->parameters[$attribute['name']] = $attribute['value'];
-  }
-  
-  /**
-   * Overrides the behavior parameters
-   * Expects an associative array looking like array('foo' => 'bar')
-   *
-   * @param array associative array
-   */
-  public function setParameters($parameters)
-  {
-    $this->parameters = $parameters;
-  }
-  
-  /**
-   * Get the associative array of parameters
-   * @return array 
-   */
-  public function getParameters()
-  {
-    return $this->parameters;
-  }
-
-  public function getParameter($name)
-  {
-    return $this->parameters[$name];
-  }
-
-  /**
-   * This method is automatically called on database behaviors when the database model is finished
-   * Propagate the behavior to the tables of the database
-   * Override this method to have a database behavior do something special
-   */
-  public function modifyDatabase()
-  {
-    foreach ($this->getDatabase()->getTables() as $table)
-    {
-      $b = clone $this;
-      $table->addBehavior($b);
-    }
-  }
-  
-  /**
-   * This method is automatically called on table behaviors when the database model is finished
-   * Override it to add columns to the current table
-   */
-  public function modifyTable()
-  {
-  }
-  
-  /**
-   * Retrieve a column object using a name stored in the behavior parameters
-   * Useful for table behaviors
-   * 
-   * @param  string    $param Name of the parameter storing the column name
-   * @return ColumnMap        The column of the table supporting the behavior
-   */
-  public function getColumnForParameter($param)
-  {
-  	return $this->getTable()->getColumn($this->getParameter($param));
-  }
-  
-  /**
-   * Sets up the Behavior object based on the attributes that were passed to loadFromXML().
-   * @see        parent::loadFromXML()
-   */
-  protected function setupObject()
-  {
-    $this->name = $this->getAttribute("name");
-  }
-    
-  /**
-   * @see        parent::appendXml(DOMNode)
-   */
-  public function appendXml(DOMNode $node)
-  {
-    $doc = ($node instanceof DOMDocument) ? $node : $node->ownerDocument;
-
-    $bNode = $node->appendChild($doc->createElement('behavior'));
-    $bNode->setAttribute('name', $this->getName());
-
-    foreach ($this->parameters as $name => $value) {
-      $parameterNode = $bNode->appendChild($doc->createElement('parameter'));
-      $parameterNode->setAttribute('name', $name);
-      $parameterNode->setAttribute('value', $value);
-    }
-  }
-  
-  public function getTableModifier()
-  {
-    return $this;
-  }  
-  
-  public function getObjectBuilderModifier()
-  {
-    return $this;
-  }
-
-  public function getPeerBuilderModifier()
-  {
-    return $this;
-  }
-  
-  public function getTableMapBuilderModifier()
-  {
-    return $this;
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Column.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Column.php
deleted file mode 100644
index 2ca8b1c3b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Column.php
+++ /dev/null
@@ -1,1184 +0,0 @@
-<?php
-/*
- *  $Id: Column.php 1594 2010-03-15 09:16:23Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/model/XMLElement.php';
-include_once 'propel/engine/EngineException.php';
-include_once 'propel/engine/database/model/PropelTypes.php';
-include_once 'propel/engine/database/model/Inheritance.php';
-include_once 'propel/engine/database/model/Domain.php';
-include_once 'propel/engine/database/model/ColumnDefaultValue.php';
-
-/**
- * A Class for holding data about a column used in an Application.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Leon Messerschmidt <leon@opticode.co.za> (Torque)
- * @author     Jason van Zyl <jvanzyl@apache.org> (Torque)
- * @author     Jon S. Stevens <jon@latchkey.com> (Torque)
- * @author     Daniel Rall <dlr@finemaltcoding.com> (Torque)
- * @author     Byron Foster <byron_foster@yahoo.com> (Torque)
- * @author     Bernd Goldschmidt <bgoldschmidt@rapidsoft.de>
- * @version    $Revision: 1594 $
- * @package    propel.engine.database.model
- */
-class Column extends XMLElement {
-
-  const DEFAULT_TYPE = "VARCHAR";
-  const DEFAULT_VISIBILITY = 'public';
-  public static $valid_visibilities = array('public', 'protected', 'private');
-
-  private $name;
-  private $description;
-  private $phpName = null;
-  private $phpNamingMethod;
-  private $isNotNull = false;
-  private $size;
-  private $namePrefix;
-  private $accessorVisibility;
-  private $mutatorVisibility;
-
-  /**
-   * The name to use for the Peer constant that identifies this column.
-   * (Will be converted to all-uppercase in the templates.)
-   * @var        string
-   */
-  private $peerName;
-
-  /**
-   * Native PHP type (scalar or class name)
-   * @var        string "string", "boolean", "int", "double"
-   */
-  private $phpType;
-
-  /**
-   * @var        Table
-   */
-  private $parentTable;
-
-  private $position;
-  private $isPrimaryKey = false;
-  private $isNodeKey = false;
-  private $nodeKeySep;
-  private $isNestedSetLeftKey = false;
-  private $isNestedSetRightKey = false;
-  private $isTreeScopeKey = false;
-  private $isUnique = false;
-  private $isAutoIncrement = false;
-  private $isLazyLoad = false;
-  private $defaultValue;
-  private $referrers;
-  private $isPrimaryString = false;
-
-  // only one type is supported currently, which assumes the
-  // column either contains the classnames or a key to
-  // classnames specified in the schema.  Others may be
-  // supported later.
-  private $inheritanceType;
-  private $isInheritance;
-  private $isEnumeratedClasses;
-  private $inheritanceList;
-  private $needsTransactionInPostgres; //maybe this can be retrieved from vendorSpecificInfo
-
-  /** class name to do input validation on this column */
-  private $inputValidator = null;
-
-  /**
-   * @var        Domain The domain object associated with this Column.
-   */
-  private $domain;
-
-  /**
-   * Creates a new column and set the name
-   *
-   * @param      name column name
-   */
-  public function __construct($name = null)
-  {
-    $this->name = $name;
-  }
-
-  /**
-   * Return a comma delimited string listing the specified columns.
-   *
-   * @param      columns Either a list of <code>Column</code> objects, or
-   * a list of <code>String</code> objects with column names.
-   * @deprecated Use the DDLBuilder->getColumnList() method instead; this will be removed in 1.3
-   */
-  public static function makeList($columns, Platform $platform)
-  {
-    $list = array();
-    foreach ($columns as $col) {
-      if ($col instanceof Column) {
-        $col = $col->getName();
-      }
-      $list[] = $platform->quoteIdentifier($col);
-    }
-    return implode(", ", $list);
-  }
-
-  /**
-   * Sets up the Column object based on the attributes that were passed to loadFromXML().
-   * @see        parent::loadFromXML()
-   */
-  protected function setupObject()
-  {
-    try {
-      $dom = $this->getAttribute("domain");
-      if ($dom)  {
-        $this->getDomain()->copy($this->getTable()->getDatabase()->getDomain($dom));
-      } else {
-        $type = strtoupper($this->getAttribute("type"));
-        if ($type) {
-          $this->getDomain()->copy($this->getPlatform()->getDomainForType($type));
-        } else {
-          $this->getDomain()->copy($this->getPlatform()->getDomainForType(self::DEFAULT_TYPE));
-        }
-      }
-
-      $this->name = $this->getAttribute("name");
-      $this->phpName = $this->getAttribute("phpName");
-      $this->phpType = $this->getAttribute("phpType");
-
-      if ($this->getAttribute("prefix", null) !== null) {
-        $this->namePrefix = $this->getAttribute("prefix");
-      } elseif ($this->getTable()->getAttribute('columnPrefix', null) !== null) {
-        $this->namePrefix = $this->getTable()->getAttribute('columnPrefix');
-      } else {
-        $this->namePrefix = '';
-      }
-
-      // Accessor visibility
-      if ($this->getAttribute('accessorVisibility', null) !==  null) {
-        $this->setAccessorVisibility($this->getAttribute('accessorVisibility'));
-      } elseif ($this->getTable()->getAttribute('defaultAccessorVisibility', null) !== null) {
-        $this->setAccessorVisibility($this->getTable()->getAttribute('defaultAccessorVisibility'));
-      } elseif ($this->getTable()->getDatabase()->getAttribute('defaultAccessorVisibility', null) !== null) {
-        $this->setAccessorVisibility($this->getTable()->getDatabase()->getAttribute('defaultAccessorVisibility'));
-      } else {
-        $this->setAccessorVisibility(self::DEFAULT_VISIBILITY);
-      }
-
-      // Mutator visibility
-      if ($this->getAttribute('mutatorVisibility', null) !==  null) {
-        $this->setMutatorVisibility($this->getAttribute('mutatorVisibility'));
-      } elseif ($this->getTable()->getAttribute('defaultMutatorVisibility', null) !== null) {
-        $this->setMutatorVisibility($this->getTable()->getAttribute('defaultMutatorVisibility'));
-      } elseif ($this->getTable()->getDatabase()->getAttribute('defaultMutatorVisibility', null) !== null) {
-        $this->setMutatorVisibility($this->getTable()->getDatabase()->getAttribute('defaultMutatorVisibility'));
-      } else {
-        $this->setMutatorVisibility(self::DEFAULT_VISIBILITY);
-      }
-
-      $this->peerName = $this->getAttribute("peerName");
-
-      // retrieves the method for converting from specified name to a PHP name, defaulting to parent tables default method
-      $this->phpNamingMethod = $this->getAttribute("phpNamingMethod", $this->parentTable->getDatabase()->getDefaultPhpNamingMethod());
-
-      $this->isPrimaryString = $this->booleanValue($this->getAttribute("primaryString"));
-      
-      $this->isPrimaryKey = $this->booleanValue($this->getAttribute("primaryKey"));
-
-      $this->isNodeKey = $this->booleanValue($this->getAttribute("nodeKey"));
-      $this->nodeKeySep = $this->getAttribute("nodeKeySep", ".");
-
-      $this->isNestedSetLeftKey = $this->booleanValue($this->getAttribute("nestedSetLeftKey"));
-      $this->isNestedSetRightKey = $this->booleanValue($this->getAttribute("nestedSetRightKey"));
-      $this->isTreeScopeKey = $this->booleanValue($this->getAttribute("treeScopeKey"));
-
-      $this->isNotNull = ($this->booleanValue($this->getAttribute("required"), false) || $this->isPrimaryKey); // primary keys are required
-
-      //AutoIncrement/Sequences
-      $this->isAutoIncrement = $this->booleanValue($this->getAttribute("autoIncrement"));
-      $this->isLazyLoad = $this->booleanValue($this->getAttribute("lazyLoad"));
-
-      // Add type, size information to associated Domain object
-      $this->getDomain()->replaceSqlType($this->getAttribute("sqlType"));
-      if (!$this->getAttribute("size") && $this->getDomain()->getType() == 'VARCHAR' && !$this->getAttribute("sqlType")) {
-        $size = 255;
-      } else {
-        $size = $this->getAttribute("size");
-      }
-      $this->getDomain()->replaceSize($size);
-      $this->getDomain()->replaceScale($this->getAttribute("scale"));
-
-      $defval = $this->getAttribute("defaultValue", $this->getAttribute("default"));
-      if ($defval !== null && strtolower($defval) !== 'null') {
-        $this->getDomain()->setDefaultValue(new ColumnDefaultValue($defval, ColumnDefaultValue::TYPE_VALUE));
-      } elseif ($this->getAttribute("defaultExpr") !== null) {
-        $this->getDomain()->setDefaultValue(new ColumnDefaultValue($this->getAttribute("defaultExpr"), ColumnDefaultValue::TYPE_EXPR));
-      }
-
-      $this->inheritanceType = $this->getAttribute("inheritance");
-      $this->isInheritance = ($this->inheritanceType !== null
-      && $this->inheritanceType !== "false"); // here we are only checking for 'false', so don't
-      // use boleanValue()
-
-      $this->inputValidator = $this->getAttribute("inputValidator");
-      $this->description = $this->getAttribute("description");
-    } catch (Exception $e) {
-      throw new EngineException("Error setting up column " . var_export($this->getAttribute("name"), true) . ": " . $e->getMessage());
-    }
-  }
-
-  /**
-   * Gets domain for this column, creating a new empty domain object if none is set.
-   * @return     Domain
-   */
-  public function getDomain()
-  {
-    if ($this->domain === null) {
-      $this->domain = new Domain();
-    }
-    return $this->domain;
-  }
-
-  /**
-   * Returns table.column
-   */
-  public function getFullyQualifiedName()
-  {
-    return ($this->parentTable->getName() . '.' . $this->getName());
-  }
-
-  /**
-   * Get the name of the column
-   */
-  public function getName()
-  {
-    return $this->name;
-  }
-
-  /**
-   * Set the name of the column
-   */
-  public function setName($newName)
-  {
-    $this->name = $newName;
-  }
-
-  /**
-   * Get the description for the Table
-   */
-  public function getDescription()
-  {
-    return $this->description;
-  }
-
-  /**
-   * Set the description for the Table
-   *
-   * @param      newDescription description for the Table
-   */
-  public function setDescription($newDescription)
-  {
-    $this->description = $newDescription;
-  }
-
-  /**
-   * Get name to use in PHP sources. It will set & return
-   * a self-generated phpName from it's name if it's
-   * not already set.
-   * @return     string
-   */
-  public function getPhpName()
-  {
-    if ($this->phpName === null) {
-      $this->setPhpName();
-    }
-    return $this->phpName;
-  }
-
-  /**
-   * Set name to use in PHP sources.
-   * 
-   * It will generate a phpName from it's name if no
-   * $phpName is passed.
-   * 
-   * @param   String $phpName PhpName to be set
-   */
-  public function setPhpName($phpName = null)
-  {
-    if ($phpName == null) {
-      $this->phpName = self::generatePhpName($this->name, $this->phpNamingMethod, $this->namePrefix);
-    } else {
-      $this->phpName = $phpName;
-    }
-  }
-
-  /**
-   * Get studly version of PHP name.
-   *
-   * The studly name is the PHP name with the first character lowercase.
-   *
-   * @return     string
-   */
-  public function getStudlyPhpName()
-  {
-    $phpname = $this->getPhpName();
-    if (strlen($phpname) > 1) {
-      return strtolower(substr($phpname, 0, 1)) . substr($phpname, 1);
-    } else { // 0 or 1 chars (I suppose that's rare)
-      return strtolower($phpname);
-    }
-  }
-
-  /**
-   * Get the visibility of the accessors of this column / attribute
-   * @return     string
-   */
-  public function getAccessorVisibility() {
-    if ($this->accessorVisibility !== null) {
-      return $this->accessorVisibility;
-    } else {
-      return self::DEFAULT_VISIBILITY;
-    }
-  }
-
-  /**
-   * Set the visibility of the accessor methods for this column / attribute
-   * @param      $newVisibility string
-   */
-  public function setAccessorVisibility($newVisibility) {
-    if (in_array($newVisibility, self::$valid_visibilities)) {
-      $this->accessorVisibility = $newVisibility;
-    } else {
-      $this->accessorVisibility = self::DEFAULT_VISIBILITY;
-    }
-
-  }
-
-  /**
-   * Get the visibility of the mutator of this column / attribute
-   * @return     string
-   */
-  public function getMutatorVisibility() {
-    if ($this->mutatorVisibility !== null) {
-      return $this->mutatorVisibility;
-    } else {
-      return self::DEFAULT_VISIBILITY;
-    }
-  }
-
-  /**
-   * Set the visibility of the mutator methods for this column / attribute
-   * @param      $newVisibility string
-   */
-  public function setMutatorVisibility($newVisibility) {
-    if (in_array($newVisibility, self::$valid_visibilities)) {
-      $this->mutatorVisibility = $newVisibility;
-    } else {
-      $this->mutatorVisibility = self::DEFAULT_VISIBILITY;
-    }
-
-  }
-
-  /**
-   * Get the column constant name (e.g. PeerName::COLUMN_NAME).
-   *
-   * @return     string A column constant name for insertion into PHP code
-   */
-  public function getConstantName()
-  {
-    $classname = $this->getTable()->getPhpName() . 'Peer';
-    // was it overridden in schema.xml ?
-    if ($this->getPeerName()) {
-      $const = strtoupper($this->getPeerName());
-    } else {
-      $const = strtoupper($this->getName());
-    }
-    return $classname.'::'.$const;
-  }
-
-  /**
-   * Get the Peer constant name that will identify this column.
-   * @return     string
-   */
-  public function getPeerName() {
-    return $this->peerName;
-  }
-
-  /**
-   * Set the Peer constant name that will identify this column.
-   * @param      $name string
-   */
-  public function setPeerName($name) {
-    $this->peerName = $name;
-  }
-
-  /**
-   * Get type to use in PHP sources.
-   *
-   * If no type has been specified, then uses results of getPhpNative().
-   *
-   * @return     string The type name.
-   * @see        getPhpNative()
-   */
-  public function getPhpType()
-  {
-    if ($this->phpType !== null) {
-      return $this->phpType;
-    }
-    return $this->getPhpNative();
-  }
-
-  /**
-   * Get the location of this column within the table (one-based).
-   * @return     int value of position.
-   */
-  public function getPosition()
-  {
-    return $this->position;
-  }
-
-  /**
-   * Get the location of this column within the table (one-based).
-   * @param      int $v Value to assign to position.
-   */
-  public function setPosition($v)
-  {
-    $this->position = $v;
-  }
-
-  /**
-   * Set the parent Table of the column
-   */
-  public function setTable(Table $parent)
-  {
-    $this->parentTable = $parent;
-  }
-
-  /**
-   * Get the parent Table of the column
-   */
-  public function getTable()
-  {
-    return $this->parentTable;
-  }
-
-  /**
-   * Returns the Name of the table the column is in
-   */
-  public function getTableName()
-  {
-    return $this->parentTable->getName();
-  }
-
-  /**
-   * Adds a new inheritance definition to the inheritance list and set the
-   * parent column of the inheritance to the current column
-   * @param      mixed $inhdata Inheritance or XML data.
-   */
-  public function addInheritance($inhdata)
-  {
-    if ($inhdata instanceof Inheritance) {
-      $inh = $inhdata;
-      $inh->setColumn($this);
-      if ($this->inheritanceList === null) {
-        $this->inheritanceList = array();
-        $this->isEnumeratedClasses = true;
-      }
-      $this->inheritanceList[] = $inh;
-      return $inh;
-    } else {
-      $inh = new Inheritance();
-      $inh->loadFromXML($inhdata);
-      return $this->addInheritance($inh);
-    }
-  }
-
-  /**
-   * Get the inheritance definitions.
-   */
-  public function getChildren()
-  {
-    return $this->inheritanceList;
-  }
-
-  /**
-   * Determine if this column is a normal property or specifies a
-   * the classes that are represented in the table containing this column.
-   */
-  public function isInheritance()
-  {
-    return $this->isInheritance;
-  }
-
-  /**
-   * Determine if possible classes have been enumerated in the xml file.
-   */
-  public function isEnumeratedClasses()
-  {
-    return $this->isEnumeratedClasses;
-  }
-
-  /**
-   * Return the isNotNull property of the column
-   */
-  public function isNotNull()
-  {
-    return $this->isNotNull;
-  }
-
-  /**
-   * Set the isNotNull property of the column
-   */
-  public function setNotNull($status)
-  {
-    $this->isNotNull = (boolean) $status;
-  }
-
-  /**
-   * Return NOT NULL String for this column
-   *
-   * @return     "NOT NULL" if null values are not allowed or an empty string.
-   */
-  public function getNotNullString()
-  {
-    return $this->getTable()->getDatabase()->getPlatform()->getNullString($this->isNotNull());
-  }
-
-  /**
-   * Set whether the column is the primary string, 
-   * i.e. whether its value is the default string representation of the table
-   * @param      boolean $v
-   */
-  public function setPrimaryString($v)
-  {
-    $this->isPrimaryString = (boolean) $v;
-  }
-
-  /**
-   * Return true if the column is the primary string,
-   * i.e. if its value is the default string representation of the table
-   */
-  public function isPrimaryString()
-  {
-    return $this->isPrimaryString;
-  }
-
-  /**
-   * Set whether the column is a primary key or not.
-   * @param      boolean $v
-   */
-  public function setPrimaryKey($v)
-  {
-    $this->isPrimaryKey = (boolean) $v;
-  }
-
-  /**
-   * Return true if the column is a primary key
-   */
-  public function isPrimaryKey()
-  {
-    return $this->isPrimaryKey;
-  }
-
-  /**
-   * Set if the column is the node key of a tree
-   */
-  public function setNodeKey($nk)
-  {
-    $this->isNodeKey = (boolean) $nk;
-  }
-
-  /**
-   * Return true if the column is a node key of a tree
-   */
-  public function isNodeKey()
-  {
-    return $this->isNodeKey;
-  }
-
-  /**
-   * Set if the column is the node key of a tree
-   */
-  public function setNodeKeySep($sep)
-  {
-    $this->nodeKeySep = (string) $sep;
-  }
-
-  /**
-   * Return true if the column is a node key of a tree
-   */
-  public function getNodeKeySep()
-  {
-    return $this->nodeKeySep;
-  }
-
-  /**
-   * Set if the column is the nested set left key of a tree
-   */
-  public function setNestedSetLeftKey($nslk)
-  {
-    $this->isNestedSetLeftKey = (boolean) $nslk;
-  }
-
-  /**
-   * Return true if the column is a nested set key of a tree
-   */
-  public function isNestedSetLeftKey()
-  {
-    return $this->isNestedSetLeftKey;
-  }
-
-  /**
-   * Set if the column is the nested set right key of a tree
-   */
-  public function setNestedSetRightKey($nsrk)
-  {
-    $this->isNestedSetRightKey = (boolean) $nsrk;
-  }
-
-  /**
-   * Return true if the column is a nested set right key of a tree
-   */
-  public function isNestedSetRightKey()
-  {
-    return $this->isNestedSetRightKey;
-  }
-
-  /**
-   * Set if the column is the scope key of a tree
-   */
-  public function setTreeScopeKey($tsk)
-  {
-    $this->isTreeScopeKey = (boolean) $tsk;
-  }
-
-  /**
-   * Return true if the column is a scope key of a tree
-   * @return     boolean
-   */
-  public function isTreeScopeKey()
-  {
-    return $this->isTreeScopeKey;
-  }
-
-  /**
-   * Set true if the column is UNIQUE
-   * @param      boolean $u
-   */
-  public function setUnique($u)
-  {
-    $this->isUnique = $u;
-  }
-
-  /**
-   * Get the UNIQUE property.
-   * @return     boolean
-   */
-  public function isUnique()
-  {
-    return $this->isUnique;
-  }
-
-  /**
-   * Return true if the column requires a transaction in Postgres
-   * @return     boolean
-   */
-  public function requiresTransactionInPostgres()
-  {
-    return $this->needsTransactionInPostgres;
-  }
-
-  /**
-   * Utility method to determine if this column is a foreign key.
-   * @return     boolean
-   */
-  public function isForeignKey()
-  {
-    return (count($this->getForeignKeys()) > 0);
-  }
-
-  /**
-   * Whether this column is a part of more than one foreign key.
-   * @return     boolean
-   */
-  public function hasMultipleFK()
-  {
-    return (count($this->getForeignKeys()) > 1);
-  }
-
-  /**
-   * Get the foreign key objects for this column (if it is a foreign key or part of a foreign key)
-   * @return     array
-   */
-  public function getForeignKeys()
-  {
-    return $this->parentTable->getColumnForeignKeys($this->name);
-  }
-
-  /**
-   * Adds the foreign key from another table that refers to this column.
-   */
-  public function addReferrer(ForeignKey $fk)
-  {
-    if ($this->referrers === null) {
-      $this->referrers = array();
-    }
-    $this->referrers[] = $fk;
-  }
-
-  /**
-   * Get list of references to this column.
-   */
-  public function getReferrers()
-  {
-    if ($this->referrers === null) {
-      $this->referrers = array();
-    }
-    return $this->referrers;
-  }
-
-  /**
-   * Sets the domain up for specified Propel type.
-   *
-   * Calling this method will implicitly overwrite any previously set type,
-   * size, scale (or other domain attributes).
-   *
-   * @param      string $propelType
-   */
-  public function setDomainForType($propelType)
-  {
-    $this->getDomain()->copy($this->getPlatform()->getDomainForType($propelType));
-  }
-
-  /**
-   * Sets the propel colunm type.
-   * @param      string $propelType
-   * @see        Domain::setType()
-   */
-  public function setType($propelType)
-  {
-    $this->getDomain()->setType($propelType);
-    if ($propelType == PropelTypes::VARBINARY|| $propelType == PropelTypes::LONGVARBINARY || $propelType == PropelTypes::BLOB) {
-      $this->needsTransactionInPostgres = true;
-    }
-  }
-
-  /**
-   * Returns the Propel column type as a string.
-   * @return     string The constant representing Creole type: e.g. "VARCHAR".
-   * @see        Domain::getType()
-   */
-  public function getType()
-  {
-    return $this->getDomain()->getType();
-  }
-
-  /**
-   * Returns the column PDO type integer for this column's Propel type.
-   * @return     int The integer value representing PDO type param: e.g. PDO::PARAM_INT
-   */
-  public function getPDOType()
-  {
-    return PropelTypes::getPDOType($this->getType());
-  }
-
-  /**
-   * Returns the column type as given in the schema as an object
-   */
-  public function getPropelType()
-  {
-    return $this->getType();
-  }
-
-  /**
-   * Utility method to know whether column needs Blob/Lob handling.
-   * @return     boolean
-   */
-  public function isLobType()
-  {
-    return PropelTypes::isLobType($this->getType());
-  }
-
-  /**
-   * Utility method to see if the column is text type.
-   */
-  public function isTextType()
-  {
-    return PropelTypes::isTextType($this->getType());
-  }
-
-  /**
-   * Utility method to see if the column is numeric type.
-   * @return     boolean
-   */
-  public function isNumericType()
-  {
-    return PropelTypes::isNumericType($this->getType());
-  }
-
-  /**
-   * Utility method to know whether column is a temporal column.
-   * @return     boolean
-   */
-  public function isTemporalType()
-  {
-    return PropelTypes::isTemporalType($this->getType());
-  }
-
-  /**
-   * @see        XMLElement::appendXml(DOMNode)
-   */
-  public function appendXml(DOMNode $node)
-  {
-    $doc = ($node instanceof DOMDocument) ? $node : $node->ownerDocument;
-
-    $colNode = $node->appendChild($doc->createElement('column'));
-    $colNode->setAttribute('name', $this->name);
-
-    if ($this->phpName !== null) {
-      $colNode->setAttribute('phpName', $this->getPhpName());
-    }
-
-    $colNode->setAttribute('type', $this->getType());
-
-    $domain = $this->getDomain();
-
-    if ($domain->getSize() !== null) {
-      $colNode->setAttribute('size', $domain->getSize());
-    }
-
-    if ($domain->getScale() !== null) {
-      $colNode->setAttribute('scale', $domain->getScale());
-    }
-
-    if ($this->isPrimaryKey) {
-      $colNode->setAttribute('primaryKey', var_export($this->isPrimaryKey, true));
-    }
-
-    if ($this->isAutoIncrement) {
-      $colNode->setAttribute('autoIncrement', var_export($this->isAutoIncrement, true));
-    }
-
-    if ($this->isNotNull) {
-      $colNode->setAttribute('required', 'true');
-    } else {
-      $colNode->setAttribute('required', 'false');
-    }
-
-    if ($domain->getDefaultValue() !== null) {
-      $def = $domain->getDefaultValue();
-      if ($def->isExpression()) {
-        $colNode->setAttribute('defaultExpr', $def->getValue());
-      } else {
-        $colNode->setAttribute('defaultValue', $def->getValue());
-      }
-    }
-
-    if ($this->isInheritance()) {
-      $colNode->setAttribute('inheritance', $this->inheritanceType);
-      foreach ($this->inheritanceList as $inheritance) {
-        $inheritance->appendXml($colNode);
-      }
-    }
-
-    if ($this->isNodeKey()) {
-      $colNode->setAttribute('nodeKey', 'true');
-      if ($this->getNodeKeySep() !== null) {
-        $colNode->setAttribute('nodeKeySep', $this->nodeKeySep);
-      }
-    }
-
-    foreach ($this->vendorInfos as $vi) {
-      $vi->appendXml($colNode);
-    }
-  }
-
-  /**
-   * Returns the size of the column
-   * @return     string
-   */
-  public function getSize()
-  {
-    return $this->domain->getSize();
-  }
-
-  /**
-   * Set the size of the column
-   * @param      string $newSize
-   */
-  public function setSize($newSize)
-  {
-    $this->domain->setSize($newSize);
-  }
-
-  /**
-   * Returns the scale of the column
-   * @return     string
-   */
-  public function getScale()
-  {
-    return $this->domain->getScale();
-  }
-
-  /**
-   * Set the scale of the column
-   * @param      string $newScale
-   */
-  public function setScale($newScale)
-  {
-    $this->domain->setScale($newScale);
-  }
-
-  /**
-   * Return the size in brackets for use in an sql
-   * schema if the type is String.  Otherwise return an empty string
-   */
-  public function printSize()
-  {
-    return $this->domain->printSize();
-  }
-
-  /**
-   * Return a string that will give this column a default value.
-   * @return     string
-   */
-  public function getDefaultSetting()
-  {
-    $dflt = "";
-    $defaultValue = $this->getDefaultValue();
-    if ($defaultValue !== null) {
-      $dflt .= "default ";
-
-      if ($this->getDefaultValue()->isExpression()) {
-        $dflt .= $this->getDefaultValue()->getValue();
-      } else {
-        if ($this->isTextType()) {
-          $dflt .= $this->getPlatform()->quote($defaultValue->getValue());
-        } elseif ($this->getType() == PropelTypes::BOOLEAN) {
-          $dflt .= $this->getPlatform()->getBooleanString($defaultValue->getValue());
-        } else {
-          $dflt .= $defaultValue->getValue();
-        }
-      }
-    }
-    return $dflt;
-  }
-
-  /**
-   * Return a string that will give this column a default value in PHP
-   * @return     string
-   */
-  public function getDefaultValueString()
-  {
-    $defaultValue = $this->getDefaultValue();
-    if ($defaultValue !== null) {
-      if ($this->isNumericType()) {
-        $dflt = (float) $defaultValue->getValue();
-      } elseif ($this->isTextType() || $this->getDefaultValue()->isExpression()) {
-        $dflt = "'" . str_replace("'", "\'", $defaultValue->getValue()) . "'";
-      } elseif ($this->getType() == PropelTypes::BOOLEAN) {
-        $dflt = $this->booleanValue($defaultValue->getValue()) ? 'true' : 'false';
-      } else {
-        $dflt = "'" . $defaultValue->getValue() . "'";
-      }
-    } else {
-      $dflt = "null";
-    }
-    return $dflt;
-  }
-  
-  /**
-   * Set a string that will give this column a default value.
-   */
-  public function setDefaultValue($def)
-  {
-    $this->domain->setDefaultValue($def);
-  }
-
-  /**
-   * Get the default value object for this column.
-   * @return     ColumnDefaultValue
-   * @see        Domain::getDefaultValue()
-   */
-  public function getDefaultValue()
-  {
-    return $this->domain->getDefaultValue();
-  }
-
-  /**
-   * Get the default value suitable for use in PHP.
-   * @return     mixed
-   * @see        Domain::getPhpDefaultValue()
-   */
-  public function getPhpDefaultValue()
-  {
-    return $this->domain->getPhpDefaultValue();
-  }
-
-  /**
-   * Returns the class name to do input validation
-   */
-  public function getInputValidator()
-  {
-    return $this->inputValidator;
-  }
-
-  /**
-   * Return auto increment/sequence string for the target database. We need to
-   * pass in the props for the target database!
-   */
-  public function isAutoIncrement()
-  {
-    return $this->isAutoIncrement;
-  }
-
-  /**
-   * Return auto increment/sequence string for the target database. We need to
-   * pass in the props for the target database!
-   */
-  public function isLazyLoad()
-  {
-    return $this->isLazyLoad;
-  }
-
-  /**
-   * Gets the auto-increment string.
-   * @return     string
-   */
-  public function getAutoIncrementString()
-  {
-    if ($this->isAutoIncrement()&& IDMethod::NATIVE === $this->getTable()->getIdMethod()) {
-      return $this->getPlatform()->getAutoIncrement();
-    } elseif ($this->isAutoIncrement()) {
-      throw new EngineException("You have specified autoIncrement for column '" . $this->name . "' but you have not specified idMethod=\"native\" for table '" . $this->getTable()->getName() . "'.");
-    }
-    return "";
-  }
-
-  /**
-   * Set the auto increment value.
-   * Use isAutoIncrement() to find out if it is set or not.
-   */
-  public function setAutoIncrement($value)
-  {
-    $this->isAutoIncrement = (boolean) $value;
-  }
-
-  /**
-   * Set the column type from a string property
-   * (normally a string from an sql input file)
-   *
-   * @deprecated Do not use; this will be removed in next release.
-   */
-  public function setTypeFromString($typeName, $size)
-  {
-    $tn = strtoupper($typeName);
-    $this->setType($tn);
-
-    if ($size !== null) {
-      $this->size = $size;
-    }
-
-    if (strpos($tn, "CHAR") !== false) {
-      $this->domain->setType(PropelTypes::VARCHAR);
-    } elseif (strpos($tn, "INT") !== false) {
-      $this->domain->setType(PropelTypes::INTEGER);
-    } elseif (strpos($tn, "FLOAT") !== false) {
-      $this->domain->setType(PropelTypes::FLOAT);
-    } elseif (strpos($tn, "DATE") !== false) {
-      $this->domain->setType(PropelTypes::DATE);
-    } elseif (strpos($tn, "TIME") !== false) {
-      $this->domain->setType(PropelTypes::TIMESTAMP);
-    } else if (strpos($tn, "BINARY") !== false) {
-      $this->domain->setType(PropelTypes::LONGVARBINARY);
-    } else {
-      $this->domain->setType(PropelTypes::VARCHAR);
-    }
-  }
-
-  /**
-   * Return a string representation of the native PHP type which corresponds
-   * to the propel type of this column. Use in the generation of Base objects.
-   *
-   * @return     string PHP datatype used by propel.
-   */
-  public function getPhpNative()
-  {
-    return PropelTypes::getPhpNative($this->getType());
-  }
-
-  /**
-   * Returns true if the column's PHP native type is an boolean, int, long, float, double, string.
-   * @return     boolean
-   * @see        PropelTypes::isPhpPrimitiveType()
-   */
-  public function isPhpPrimitiveType()
-  {
-    return PropelTypes::isPhpPrimitiveType($this->getPhpType());
-  }
-
-  /**
-   * Return true if column's PHP native type is an boolean, int, long, float, double.
-   * @return     boolean
-   * @see        PropelTypes::isPhpPrimitiveNumericType()
-   */
-  public function isPhpPrimitiveNumericType()
-  {
-    return PropelTypes::isPhpPrimitiveNumericType($this->getPhpType());
-  }
-
-  /**
-   * Returns true if the column's PHP native type is a class name.
-   * @return     boolean
-   * @see        PropelTypes::isPhpObjectType()
-   */
-  public function isPhpObjectType()
-  {
-    return PropelTypes::isPhpObjectType($this->getPhpType());
-  }
-
-  /**
-   * Get the platform/adapter impl.
-   *
-   * @return     Platform
-   */
-  public function getPlatform()
-  {
-    return $this->getTable()->getDatabase()->getPlatform();
-  }
-
-  /**
-   *
-   * @return     string
-   * @deprecated Use DDLBuilder->getColumnDDL() instead; this will be removed in 1.3
-   */
-  public function getSqlString()
-  {
-    $sb = "";
-    $sb .= $this->getPlatform()->quoteIdentifier($this->getName()) . " ";
-    $sb .= $this->getDomain()->getSqlType();
-    if ($this->getPlatform()->hasSize($this->getDomain()->getSqlType())) {
-      $sb .= $this->getDomain()->printSize();
-    }
-    $sb .= " ";
-    $sb .= $this->getDefaultSetting() . " ";
-    $sb .= $this->getNotNullString() . " ";
-    $sb .= $this->getAutoIncrementString();
-    return trim($sb);
-  }
-  
-  public static function generatePhpName($name, $phpNamingMethod = PhpNameGenerator::CONV_METHOD_CLEAN, $namePrefix = null) {
-    return NameFactory::generateName(NameFactory::PHP_GENERATOR, array($name, $phpNamingMethod, $namePrefix));
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/ColumnDefaultValue.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/ColumnDefaultValue.php
deleted file mode 100644
index a77eaf4a3..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/ColumnDefaultValue.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/*
- *  $Id: ColumnDefaultValue.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * A class for holding a column default value.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class ColumnDefaultValue {
-
-	const TYPE_VALUE = "value";
-	const TYPE_EXPR = "expr";
-
-	/**
-	 * @var        string The default value, as specified in the schema.
-	 */
-	private $value;
-
-	/**
-	 * @var        string The type of value represented by this object (DefaultValue::TYPE_VALUE or DefaultValue::TYPE_EXPR).
-	 */
-	private $type = ColumnDefaultValue::TYPE_VALUE;
-
-	/**
-	 * Creates a new DefaultValue object.
-	 *
-	 * @param      string $value The default value, as specified in the schema.
-	 * @param      string $type The type of default value (DefaultValue::TYPE_VALUE or DefaultValue::TYPE_EXPR)
-	 */
-	public function __construct($value, $type = null)
-	{
-		$this->setValue($value);
-		if ($type !== null) {
-			$this->setType($type);
-		}
-	}
-
-	/**
-	 * @return     string The type of default value (DefaultValue::TYPE_VALUE or DefaultValue::TYPE_EXPR)
-	 */
-	public function getType()
-	{
-		return $this->type;
-	}
-
-	/**
-	 * @param      string $type The type of default value (DefaultValue::TYPE_VALUE or DefaultValue::TYPE_EXPR)
-	 */
-	public function setType($type)
-	{
-		$this->type = $type;
-	}
-
-	/**
-	 * Convenience method to indicate whether the value in this object is an expression (as opposed to simple value).
-	 *
-	 * @return     boolean Whether value this object holds is an expression.
-	 */
-	public function isExpression()
-	{
-		return ($this->type == self::TYPE_EXPR);
-	}
-
-	/**
-	 * @return     string The value, as specified in the schema.
-	 */
-	public function getValue()
-	{
-		return $this->value;
-	}
-
-	/**
-	 * @param      string $value The value, as specified in the schema.
-	 */
-	public function setValue($value)
-	{
-		$this->value = $value;
-	}
-
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/ConstraintNameGenerator.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/ConstraintNameGenerator.php
deleted file mode 100644
index 204b63e2c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/ConstraintNameGenerator.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/*
- *  $Id: ConstraintNameGenerator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-
-/**
- * A <code>NameGenerator</code> implementation for table-specific
- * constraints.  Conforms to the maximum column name length for the
- * type of database in use.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Daniel Rall <dlr@finemaltcoding.com> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class ConstraintNameGenerator implements NameGenerator {
-	/**
-	 * Conditional compilation flag.
-	 */
-	const DEBUG = false;
-
-	/**
-	 * First element of <code>inputs</code> should be of type {@link Database}, second
-	 * should be a table name, third is the type identifier (spared if
-	 * trimming is necessary due to database type length constraints),
-	 * and the fourth is a <code>Integer</code> indicating the number
-	 * of this contraint.
-	 *
-	 * @see        NameGenerator
-	 * @throws     EngineException
-	 */
-	public function generateName($inputs)
-	{
-
-		$db = $inputs[0];
-		$name = $inputs[1];
-		$namePostfix = $inputs[2];
-		$constraintNbr = (string) $inputs[3];
-
-		// Calculate maximum RDBMS-specific column character limit.
-		$maxBodyLength = -1;
-		try {
-			$maxColumnNameLength = (int) $db->getPlatform()->getMaxColumnNameLength();
-			$maxBodyLength = ($maxColumnNameLength - strlen($namePostfix)
-					- strlen($constraintNbr) - 2);
-
-			if (self::DEBUG) {
-				print("maxColumnNameLength=" . $maxColumnNameLength
-						. " maxBodyLength=" . $maxBodyLength . "\n");
-			}
-		} catch (EngineException $e) {
-			echo $e;
-			throw $e;
-		}
-
-		// Do any necessary trimming.
-		if ($maxBodyLength !== -1 && strlen($name) > $maxBodyLength) {
-			$name = substr($name, 0, $maxBodyLength);
-		}
-
-		$name .= self::STD_SEPARATOR_CHAR . $namePostfix
-			. self::STD_SEPARATOR_CHAR . $constraintNbr;
-
-		return $name;
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Database.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Database.php
deleted file mode 100644
index e883e2784..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Database.php
+++ /dev/null
@@ -1,588 +0,0 @@
-<?php
-
-/*
- *  $Id: Database.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/model/XMLElement.php';
-include_once 'propel/engine/database/model/IDMethod.php';
-include_once 'propel/engine/database/model/NameGenerator.php';
-include_once 'propel/engine/database/model/Table.php';
-include_once 'propel/engine/database/model/Behavior.php';
-
-
-/**
- * A class for holding application data structures.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Leon Messerschmidt <leon@opticode.co.za> (Torque)
- * @author     John McNally<jmcnally@collab.net> (Torque)
- * @author     Martin Poeschl<mpoeschl@marmot.at> (Torque)
- * @author     Daniel Rall<dlr@collab.net> (Torque)
- * @author     Byron Foster <byron_foster@yahoo.com> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class Database extends XMLElement {
-
-	private $platform;
-	private $tableList = array();
-	private $curColumn;
-	private $name;
-	private $pkg;
-	private $baseClass;
-	private $basePeer;
-	private $defaultIdMethod;
-	private $defaultPhpNamingMethod;
-	private $defaultTranslateMethod;
-	private $dbParent;
-	private $tablesByName = array();
-	private $tablesByPhpName = array();
-	private $heavyIndexing;
-
-	private $domainMap = array();
-
-  /**
-   * List of behaviors registered for this table
-   * 
-   * @var array
-   */
-  protected $behaviors = array();
-
-	/**
-	 * Constructs a new Database object.
-	 *
-	 * @param      string $name
-	 */
-	public function __construct($name = null)
-	{
-		$this->name = $name;
-	}
-
-	/**
-	 * Sets up the Database object based on the attributes that were passed to loadFromXML().
-	 * @see        parent::loadFromXML()
-	 */
-	protected function setupObject()
-	{
-		$this->name = $this->getAttribute("name");
-		$this->pkg = $this->getAttribute("package");
-		$this->baseClass = $this->getAttribute("baseClass");
-		$this->basePeer = $this->getAttribute("basePeer");
-		$this->defaultIdMethod = $this->getAttribute("defaultIdMethod", IDMethod::NATIVE);
-		$this->defaultPhpNamingMethod = $this->getAttribute("defaultPhpNamingMethod", NameGenerator::CONV_METHOD_UNDERSCORE);
-		$this->defaultTranslateMethod = $this->getAttribute("defaultTranslateMethod", Validator::TRANSLATE_NONE);
-		$this->heavyIndexing = $this->booleanValue($this->getAttribute("heavyIndexing"));
-	}
-
-	/**
-	 * Returns the Platform implementation for this database.
-	 *
-	 * @return     Platform a Platform implementation
-	 */
-	public function getPlatform()
-	{
-		return $this->platform;
-	}
-
-	/**
-	 * Sets the Platform implementation for this database.
-	 *
-	 * @param      Platform $platform A Platform implementation
-	 */
-	public function setPlatform($platform)
-	{
-		$this->platform = $platform;
-	}
-
-	/**
-	 * Get the name of the Database
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
-
-	/**
-	 * Set the name of the Database
-	 */
-	public function setName($name)
-	{
-		$this->name = $name;
-	}
-
-	/**
-	 * Get the value of package.
-	 * @return     value of package.
-	 */
-	public function getPackage()
-	{
-		return $this->pkg;
-	}
-
-	/**
-	 * Set the value of package.
-	 * @param      v  Value to assign to package.
-	 */
-	public function setPackage($v)
-	{
-		$this->pkg = $v;
-	}
-
-	/**
-	 * Get the value of baseClass.
-	 * @return     value of baseClass.
-	 */
-	public function getBaseClass()
-	{
-		return $this->baseClass;
-	}
-
-	/**
-	 * Set the value of baseClass.
-	 * @param      v  Value to assign to baseClass.
-	 */
-	public function setBaseClass($v)
-	{
-		$this->baseClass = $v;
-	}
-
-	/**
-	 * Get the value of basePeer.
-	 * @return     value of basePeer.
-	 */
-	public function getBasePeer()
-	{
-		return $this->basePeer;
-	}
-
-	/**
-	 * Set the value of basePeer.
-	 * @param      v Value to assign to basePeer.
-	 */
-	public function setBasePeer($v)
-	{
-		$this->basePeer = $v;
-	}
-
-	/**
-	 * Get the value of defaultIdMethod.
-	 * @return     value of defaultIdMethod.
-	 */
-	public function getDefaultIdMethod()
-	{
-		return $this->defaultIdMethod;
-	}
-
-	/**
-	 * Set the value of defaultIdMethod.
-	 * @param      v Value to assign to defaultIdMethod.
-	 */
-	public function setDefaultIdMethod($v)
-	{
-		$this->defaultIdMethod = $v;
-	}
-
-	/**
-	 * Get the value of defaultPHPNamingMethod which specifies the
-	 * method for converting schema names for table and column to PHP names.
-	 * @return     string The default naming conversion used by this database.
-	 */
-	public function getDefaultPhpNamingMethod()
-	{
-		return $this->defaultPhpNamingMethod;
-	}
-
-	/**
-	 * Set the value of defaultPHPNamingMethod.
-	 * @param      string $v The default naming conversion for this database to use.
-	 */
-	public function setDefaultPhpNamingMethod($v)
-	{
-		$this->defaultPhpNamingMethod = $v;
-	}
-
-	/**
-	 * Get the value of defaultTranslateMethod which specifies the
-	 * method for translate validator error messages.
-	 * @return     string The default translate method.
-	 */
-	public function getDefaultTranslateMethod()
-	{
-		return $this->defaultTranslateMethod;
-	}
-
-	/**
-	 * Set the value of defaultTranslateMethod.
-	 * @param      string $v The default translate method to use.
-	 */
-	public function setDefaultTranslateMethod($v)
-	{
-		$this->defaultTranslateMethod = $v;
-	}
-
-	/**
-	 * Get the value of heavyIndexing.
-	 *
-	 * This is a synonym for getHeavyIndexing().
-	 *
-	 * @return     boolean Value of heavyIndexing.
-	 * @see        getHeavyIndexing()
-	 */
-	public function isHeavyIndexing()
-	{
-		return $this->getHeavyIndexing();
-	}
-
-	/**
-	 * Get the value of heavyIndexing.
-	 *
-	 * @return     boolean Value of heavyIndexing.
-	 */
-	public function getHeavyIndexing()
-	{
-		return $this->heavyIndexing;
-	}
-
-	/**
-	 * Set the value of heavyIndexing.
-	 * @param      boolean $v  Value to assign to heavyIndexing.
-	 */
-	public function setHeavyIndexing($v)
-	{
-		$this->heavyIndexing = (boolean) $v;
-	}
-
-	/**
-	 * Return an array of all tables
-	 */
-	public function getTables()
-	{
-		return $this->tableList;
-	}
-
-	/**
-	 * Return the table with the specified name.
-	 * @param      string $name The name of the table (e.g. 'my_table')
-	 * @return     Table a Table object or null if it doesn't exist
-	 */
-	public function getTable($name)
-	{
-		if (isset($this->tablesByName[$name])) {
-			return $this->tablesByName[$name];
-		}
-		return null; // just to be explicit
-	}
-
-	/**
-	 * Return the table with the specified phpName.
-	 * @param      string $phpName the PHP Name of the table (e.g. 'MyTable')
-	 * @return     Table a Table object or null if it doesn't exist
-	 */
-	public function getTableByPhpName($phpName)
-	{
-		if (isset($this->tablesByPhpName[$phpName])) {
-			return $this->tablesByPhpName[$phpName];
-		}
-		return null; // just to be explicit
-	}
-
-	/**
-	 * An utility method to add a new table from an xml attribute.
-	 */
-	public function addTable($data)
-	{
-		if ($data instanceof Table) {
-			$tbl = $data; // alias
-			$tbl->setDatabase($this);
-			if (isset($this->tablesByName[$tbl->getName()])) {
-				throw new EngineException("Duplicate table declared: " . $tbl->getName());
-			}
-			$this->tableList[] = $tbl;
-			$this->tablesByName[ $tbl->getName() ] = $tbl;
-			$this->tablesByPhpName[ $tbl->getPhpName() ] = $tbl;
-			if ($tbl->getPackage() === null) {
-				$tbl->setPackage($this->getPackage());
-			}
-			return $tbl;
-		} else {
-			$tbl = new Table();
-			$tbl->setDatabase($this);
-			$tbl->loadFromXML($data);
-			return $this->addTable($tbl); // call self w/ different param
-		}
-	}
-
-	/**
-	 * Set the parent of the database
-	 */
-	public function setAppData(AppData $parent)
-	{
-		$this->dbParent = $parent;
-	}
-
-	/**
-	 * Get the parent of the table
-	 */
-	public function getAppData()
-	{
-		return $this->dbParent;
-	}
-
-	/**
-	 * Adds Domain object from <domain> tag.
-	 * @param      mixed XML attributes (array) or Domain object.
-	 */
-	public function addDomain($data) {
-
-		if ($data instanceof Domain) {
-			$domain = $data; // alias
-			$domain->setDatabase($this);
-			$this->domainMap[ $domain->getName() ] = $domain;
-			return $domain;
-		} else {
-			$domain = new Domain();
-			$domain->setDatabase($this);
-			$domain->loadFromXML($data);
-			return $this->addDomain($domain); // call self w/ different param
-		}
-	}
-
-	/**
-	 * Get already configured Domain object by name.
-	 * @return     Domain
-	 */
-	public function getDomain($domainName)
-	{
-		if (isset($this->domainMap[$domainName])) {
-			return $this->domainMap[$domainName];
-		}
-		return null; // just to be explicit
-	}
-
-  public function getGeneratorConfig()
-  {
-    return $this->getAppData()->getPlatform()->getGeneratorConfig();
-  }
-  
-  /**
-   * Adds a new Behavior to the database
-   * @return Behavior A behavior instance
-   */
-  public function addBehavior($bdata)
-  {
-    if ($bdata instanceof Behavior) {
-      $behavior = $bdata;
-      $behavior->setDatabase($this);
-      $this->behaviors[$behavior->getName()] = $behavior;
-      return $behavior;
-    } else {
-      $class = $this->getConfiguredBehavior($bdata['name']);
-      $behavior = new $class();
-      $behavior->loadFromXML($bdata);
-      return $this->addBehavior($behavior);
-    }
-  }
-  
-  /**
-   * Get the database behaviors
-   * @return Array of Behavior objects
-   */
-  public function getBehaviors()
-  {
-    return $this->behaviors;
-  }
-  
-  /**
-   * Get one database behavior by name
-   * @param string $name the behavior name
-   * @return Behavior a behavior object
-   */
-  public function getBehavior($name)
-  {
-    return $this->behaviors[$name];
-  }
-
-
-	public function doFinalInitialization()
-	{
-	  $config = $this->getGeneratorConfig();
-    if($config && ($defaultBehaviors = $config->getBuildProperty('behaviorDefault')))
-    {
-      // add generic behaviors from build.properties 
-      $defaultBehaviors = explode(',', $defaultBehaviors);
-      foreach ($defaultBehaviors as $behavior)
-      {
-        $this->addBehavior(array('name' => trim($behavior)));
-      }
-    }
-    
-    // execute behavior database modifiers
-    foreach ($this->getBehaviors() as $behavior)
-    {
-      $behavior->modifyDatabase();
-    }
-
-		$tables = $this->getTables();
-
-		for ($i=0,$size=count($tables); $i < $size; $i++) {
-			$currTable = $tables[$i];
-
-			// check schema integrity
-			// if idMethod="autoincrement", make sure a column is
-			// specified as autoIncrement="true"
-			// FIXME: Handle idMethod="native" via DB adapter.
-			/*
-
-			--- REMOVING THIS BECAUSE IT'S ANNOYING
-
-			if ($currTable->getIdMethod() == IDMethod::NATIVE ) {
-			$columns = $currTable->getColumns();
-			$foundOne = false;
-			for ($j=0, $cLen=count($columns); $j < $cLen && !$foundOne; $j++) {
-			$foundOne = $columns[$j]->isAutoIncrement();
-			}
-
-			if (!$foundOne) {
-			$errorMessage = "Table '" . $currTable->getName()
-			. "' is set to use native id generation, but it does not "
-			. "have a column which declared as the one to "
-			. "auto increment (i.e. autoIncrement=\"true\")";
-
-			throw new BuildException($errorMessage);
-			}
-			}
-			*/
-
-			$currTable->doFinalInitialization();
-
-			// setup reverse fk relations
-			$fks = $currTable->getForeignKeys();
-			for ($j=0, $fksLen=count($fks); $j < $fksLen; $j++) {
-				$currFK = $fks[$j];
-				$foreignTable = $this->getTable($currFK->getForeignTableName());
-				if ($foreignTable === null) {
-					throw new BuildException("ERROR!! Attempt to set foreign"
-					. " key to nonexistent table, "
-					. $currFK->getForeignTableName() . "!");
-				}
-
-				$referrers = $foreignTable->getReferrers();
-				if ($referrers === null || !in_array($currFK, $referrers, true) ) {
-					$foreignTable->addReferrer($currFK);
-				}
-
-				// local column references
-				$localColumnNames = $currFK->getLocalColumns();
-
-				for ($k=0,$lcnLen=count($localColumnNames); $k < $lcnLen; $k++) {
-
-					$local = $currTable->getColumn($localColumnNames[$k]);
-
-					// give notice of a schema inconsistency.
-					// note we do not prevent the npe as there is nothing
-					// that we can do, if it is to occur.
-					if ($local === null) {
-						throw new BuildException("ERROR!! Attempt to define foreign"
-						. " key with nonexistent column, "
-						. $localColumnNames[$k] . ", in table, "
-						. $currTable->getName() . "!");
-					}
-
-					//check for foreign pk's
-					if ($local->isPrimaryKey()) {
-						$currTable->setContainsForeignPK(true);
-					}
-
-				} // for each local col name
-
-				// foreign column references
-				$foreignColumnNames = $currFK->getForeignColumns();
-				for ($k=0,$fcnLen=count($localColumnNames); $k < $fcnLen; $k++) {
-					$foreign = $foreignTable->getColumn($foreignColumnNames[$k]);
-					// if the foreign column does not exist, we may have an
-					// external reference or a misspelling
-					if ($foreign === null) {
-						throw new BuildException("ERROR!! Attempt to set foreign"
-						. " key to nonexistent column, "
-						. $foreignColumnNames[$k] . ", in table, "
-						. $foreignTable->getName() . "!");
-					} else {
-						$foreign->addReferrer($currFK);
-					}
-				} // for each foreign col ref
-			}
-		}
-	}
-
-	/**
-	 * @see        XMLElement::appendXml(DOMNode)
-	 */
-	public function appendXml(DOMNode $node)
-	{
-		$doc = ($node instanceof DOMDocument) ? $node : $node->ownerDocument;
-
-		$dbNode = $node->appendChild($doc->createElement('database'));
-
-		$dbNode->setAttribute('name', $this->name);
-
-		if ($this->pkg) {
-			$dbNode->setAttribute('package', $this->pkg);
-		}
-
-		if ($this->defaultIdMethod) {
-			$dbNode->setAttribute('defaultIdMethod', $this->defaultIdMethod);
-		}
-
-		if ($this->baseClass) {
-			$dbNode->setAttribute('baseClass', $this->baseClass);
-		}
-
-		if ($this->basePeer) {
-			$dbNode->setAttribute('basePeer', $this->basePeer);
-		}
-
-		if ($this->defaultPhpNamingMethod) {
-			$dbNode->setAttribute('defaultPhpNamingMethod', $this->defaultPhpNamingMethod);
-		}
-
-		if ($this->defaultTranslateMethod) {
-			$dbNode->setAttribute('defaultTranslateMethod', $this->defaultTranslateMethod);
-		}
-
-		/*
-
-		FIXME - Before we can add support for domains in the schema, we need
-		to have a method of the Column that indicates whether the column was mapped
-		to a SPECIFIC domain (since Column->getDomain() will always return a Domain object)
-
-		foreach ($this->domainMap as $domain) {
-		$domain->appendXml($dbNode);
-		}
-		*/
-		foreach ($this->vendorInfos as $vi) {
-			$vi->appendXml($dbNode);
-		}
-
-		foreach ($this->tableList as $table) {
-			$table->appendXml($dbNode);
-		}
-
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Domain.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Domain.php
deleted file mode 100644
index 337695132..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Domain.php
+++ /dev/null
@@ -1,396 +0,0 @@
-<?php
-/*
- *  $Id: Domain.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/model/XMLElement.php';
-
-/**
- * A class for holding data about a domain used in the schema.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Martin Poeschl <mpoeschl@marmot.at> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class Domain extends XMLElement {
-
-	/**
-	 * @var        string The name of this domain
-	 */
-	private $name;
-
-	/**
-	 * @var        string Description for this domain.
-	 */
-	private $description;
-
-	/**
-	 * @var        int Size
-	 */
-	private $size;
-
-	/**
-	 * @var        int Scale
-	 */
-	private $scale;
-
-	/**
-	 * @var        int Propel type from schema
-	 */
-	private $propelType;
-
-	/**
-	 * @var        string The SQL type to use for this column
-	 */
-	private $sqlType;
-
-	/**
-	 * @var        ColumnDefaultValue A default value
-	 */
-	private $defaultValue;
-
-	/**
-	 * @var        Database
-	 */
-	private $database;
-
-	/**
-	 * Creates a new Domain object.
-	 * If this domain needs a name, it must be specified manually.
-	 *
-	 * @param      string $type Propel type.
-	 * @param      string $sqlType SQL type.
-	 * @param      string $size
-	 * @param      string $scale
-	 */
-	public function __construct($type = null, $sqlType = null, $size = null, $scale = null)
-	{
-		$this->propelType = $type;
-		$this->sqlType = ($sqlType !== null) ? $sqlType : $type;
-		$this->size = $size;
-		$this->scale = $scale;
-	}
-
-	/**
-	 * Copy the values from current object into passed-in Domain.
-	 * @param      Domain $domain Domain to copy values into.
-	 */
-	public function copy(Domain $domain)
-	{
-		$this->defaultValue = $domain->getDefaultValue();
-		$this->description = $domain->getDescription();
-		$this->name = $domain->getName();
-		$this->scale = $domain->getScale();
-		$this->size = $domain->getSize();
-		$this->sqlType = $domain->getSqlType();
-		$this->propelType = $domain->getType();
-	}
-
-	/**
-	 * Sets up the Domain object based on the attributes that were passed to loadFromXML().
-	 * @see        parent::loadFromXML()
-	 */
-	protected function setupObject()
-	{
-		$schemaType = strtoupper($this->getAttribute("type"));
-		$this->copy($this->getDatabase()->getPlatform()->getDomainForType($schemaType));
-
-		//Name
-		$this->name = $this->getAttribute("name");
-
-		// Default value
-		$defval = $this->getAttribute("defaultValue", $this->getAttribute("default"));
-		if ($defval !== null) {
-			$this->setDefaultValue(new ColumnDefaultValue($defval, ColumnDefaultValue::TYPE_VALUE));
-		} elseif ($this->getAttribute("defaultExpr") !== null) {
-			$this->setDefaultValue(new ColumnDefaultValue($this->getAttribute("defaultExpr"), ColumnDefaultValue::TYPE_EXPR));
-		}
-
-		$this->size = $this->getAttribute("size");
-		$this->scale = $this->getAttribute("scale");
-		$this->description = $this->getAttribute("description");
-	}
-
-	/**
-	 * Sets the owning database object (if this domain is being setup via XML).
-	 * @param      Database $database
-	 */
-	public function setDatabase(Database $database)
-	{
-		$this->database = $database;
-	}
-
-	/**
-	 * Gets the owning database object (if this domain was setup via XML).
-	 * @return     Database
-	 */
-	public function getDatabase()
-	{
-		return $this->database;
-	}
-
-	/**
-	 * @return     string Returns the description.
-	 */
-	public function getDescription()
-	{
-		return $this->description;
-	}
-
-	/**
-	 * @param      string $description The description to set.
-	 */
-	public function setDescription($description)
-	{
-		$this->description = $description;
-	}
-
-	/**
-	 * @return     string Returns the name.
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
-
-	/**
-	 * @param      string $name The name to set.
-	 */
-	public function setName($name)
-	{
-		$this->name = $name;
-	}
-
-	/**
-	 * @return     string Returns the scale.
-	 */
-	public function getScale()
-	{
-		return $this->scale;
-	}
-
-	/**
-	 * @param      string $scale The scale to set.
-	 */
-	public function setScale($scale)
-	{
-		$this->scale = $scale;
-	}
-
-	/**
-	 * Replaces the size if the new value is not null.
-	 *
-	 * @param      string $value The size to set.
-	 */
-	public function replaceScale($value)
-	{
-		if ($value !== null) {
-			$this->scale = $value;
-		}
-	}
-
-	/**
-	 * @return     int Returns the size.
-	 */
-	public function getSize()
-	{
-		return $this->size;
-	}
-
-	/**
-	 * @param      int $size The size to set.
-	 */
-	public function setSize($size)
-	{
-		$this->size = $size;
-	}
-
-	/**
-	 * Replaces the size if the new value is not null.
-	 *
-	 * @param      int $value The size to set.
-	 */
-	public function replaceSize($value)
-	{
-		if ($value !== null) {
-			$this->size = $value;
-		}
-	}
-
-	/**
-	 * @return     string Returns the propelType.
-	 */
-	public function getType()
-	{
-		return $this->propelType;
-	}
-
-	/**
-	 * @param      string $propelType The PropelTypes type to set.
-	 */
-	public function setType($propelType)
-	{
-		$this->propelType = $propelType;
-	}
-
-	/**
-	 * Replaces the type if the new value is not null.
-	 *
-	 * @param      string $value The tyep to set.
-	 */
-	public function replaceType($value)
-	{
-		if ($value !== null) {
-			$this->propelType = $value;
-		}
-	}
-
-	/**
-	 * Gets the default value object.
-	 * @return     ColumnDefaultValue The default value object for this domain.
-	 */
-	public function getDefaultValue()
-	{
-		return $this->defaultValue;
-	}
-
-	/**
-	 * Gets the default value, type-casted for use in PHP OM.
-	 * @return     mixed
-	 * @see        getDefaultValue()
-	 */
-	public function getPhpDefaultValue()
-	{
-		if ($this->defaultValue === null) {
-			return null;
-		} else {
-			if ($this->defaultValue->isExpression()) {
-				throw new EngineException("Cannot get PHP version of default value for default value EXPRESSION.");
-			}
-			if ($this->propelType === PropelTypes::BOOLEAN) {
-				return $this->booleanValue($this->defaultValue->getValue());
-			} else {
-				return $this->defaultValue->getValue();
-			}
-		}
-	}
-
-	/**
-	 * @param      ColumnDefaultValue $value The column default value to set.
-	 */
-	public function setDefaultValue(ColumnDefaultValue $value)
-	{
-		$this->defaultValue = $value;
-	}
-
-	/**
-	 * Replaces the default value if the new value is not null.
-	 *
-	 * @param      ColumnDefaultValue $value The defualt value object
-	 */
-	public function replaceDefaultValue(ColumnDefaultValue $value = null)
-	{
-		if ($value !== null) {
-			$this->defaultValue = $value;
-		}
-	}
-
-	/**
-	 * @return     string Returns the sqlType.
-	 */
-	public function getSqlType()
-	{
-		return $this->sqlType;
-	}
-
-	/**
-	 * @param      string $sqlType The sqlType to set.
-	 */
-	public function setSqlType($sqlType)
-	{
-		$this->sqlType = $sqlType;
-	}
-
-	/**
-	 * Replaces the SQL type if the new value is not null.
-	 * @param      string $sqlType The native SQL type to use for this domain.
-	 */
-	public function replaceSqlType($sqlType)
-	{
-		if ($sqlType !== null) {
-			$this->sqlType = $sqlType;
-		}
-	}
-
-	/**
-	 * Return the size and scale in brackets for use in an sql schema.
-	 *
-	 * @return     string Size and scale or an empty String if there are no values
-	 *         available.
-	 */
-	public function printSize()
-	{
-		if ($this->size !== null && $this->scale !== null)  {
-			return '(' . $this->size . ',' . $this->scale . ')';
-		} elseif ($this->size !== null) {
-			return '(' . $this->size . ')';
-		} else {
-			return "";
-		}
-	}
-
-	/**
-	 * @see        XMLElement::appendXml(DOMNode)
-	 */
-	public function appendXml(DOMNode $node)
-	{
-		$doc = ($node instanceof DOMDocument) ? $node : $node->ownerDocument;
-
-		$domainNode = $node->appendChild($doc->createElement('domain'));
-		$domainNode->setAttribute('type', $this->getType());
-		$domainNode->setAttribute('name', $this->getName());
-
-		if ($this->sqlType !== $this->getType()) {
-			$domainNode->setAttribute('sqlType', $this->sqlType);
-		}
-
-		$def = $this->getDefaultValue();
-		if ($def) {
-			if ($def->isExpression()) {
-				$domainNode->setAttribute('defaultExpr', $def->getValue());
-			} else {
-				$domainNode->setAttribute('defaultValue', $def->getValue());
-			}
-		}
-
-		if ($this->size) {
-			$domainNode->setAttribute('size', $this->size);
-		}
-
-		if ($this->scale) {
-			$domainNode->setAttribute('scale', $this->scale);
-		}
-
-		if ($this->description) {
-			$domainNode->setAttribute('description', $this->description);
-		}
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/ForeignKey.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/ForeignKey.php
deleted file mode 100644
index 9275538fc..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/ForeignKey.php
+++ /dev/null
@@ -1,442 +0,0 @@
-<?php
-/*
- *  $Id: ForeignKey.php 1448 2010-01-12 18:02:08Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/model/XMLElement.php';
-
-/**
- * A Class for information about foreign keys of a table.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @author     Fedor <fedor.karpelevitch@home.com>
- * @author     Daniel Rall <dlr@finemaltcoding.com>
- * @version    $Revision: 1448 $
- * @package    propel.engine.database.model
- */
-class ForeignKey extends XMLElement {
-
-	private $foreignTableName;
-	private $name;
-	private $phpName;
-	private $refPhpName;
-	private $onUpdate;
-	private $onDelete;
-	private $parentTable;
-	private $localColumns = array();
-	private $foreignColumns = array();
-
-	// the uppercase equivalent of the onDelete/onUpdate values in the dtd
-	const NONE     = "";            // No "ON [ DELETE | UPDATE]" behaviour specified.
-	const NOACTION  = "NO ACTION";
-	const CASCADE  = "CASCADE";
-	const RESTRICT = "RESTRICT";
-	const SETDEFAULT  = "SET DEFAULT";
-	const SETNULL  = "SET NULL";
-
-	/**
-	 * Constructs a new ForeignKey object.
-	 *
-	 * @param      string $name
-	 */
-	public function __construct($name=null)
-	{
-		$this->name = $name;
-	}
-
-	/**
-	 * Sets up the ForeignKey object based on the attributes that were passed to loadFromXML().
-	 * @see        parent::loadFromXML()
-	 */
-	protected function setupObject()
-	{
-		$this->foreignTableName = $this->getAttribute("foreignTable");
-		$this->name = $this->getAttribute("name");
-		$this->phpName = $this->getAttribute("phpName");
-		$this->refPhpName = $this->getAttribute("refPhpName");
-		$this->onUpdate = $this->normalizeFKey($this->getAttribute("onUpdate"));
-		$this->onDelete = $this->normalizeFKey($this->getAttribute("onDelete"));
-	}
-
-	/**
-	 * normalizes the input of onDelete, onUpdate attributes
-	 */
-	private function normalizeFKey($attrib)
-	{
-		if ($attrib === null  || strtoupper($attrib) == "NONE") {
-			$attrib = self::NONE;
-		}
-		$attrib = strtoupper($attrib);
-		if ($attrib == "SETNULL") {
-			$attrib =  self::SETNULL;
-		}
-		return $attrib;
-	}
-
-	/**
-	 * returns whether or not the onUpdate attribute is set
-	 */
-	public function hasOnUpdate()
-	{
-		return ($this->onUpdate !== self::NONE);
-	}
-
-	/**
-	 * returns whether or not the onDelete attribute is set
-	 */
-	public function hasOnDelete()
-	{
-		return ($this->onDelete !== self::NONE);
-	}
-
-	/**
-	 * returns the onUpdate attribute
-	 * @return     string
-	 */
-	public function getOnUpdate()
-	{
-		return $this->onUpdate;
-	}
-
-	/**
-	 * Returns the onDelete attribute
-	 * @return     string
-	 */
-	public function getOnDelete()
-	{
-		return $this->onDelete;
-	}
-
-	/**
-	 * sets the onDelete attribute
-	 */
-	public function setOnDelete($value)
-	{
-		$this->onDelete = $this->normalizeFKey($value);
-	}
-
-	/**
-	 * sets the onUpdate attribute
-	 */
-	public function setOnUpdate($value)
-	{
-		$this->onUpdate = $this->normalizeFKey($value);
-	}
-
-	/**
-	 * Returns the name attribute.
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
-
-	/**
-	 * Sets the name attribute.
-	 */
-	public function setName($name)
-	{
-		$this->name = $name;
-	}
-
-	/**
-	 * Gets the phpName for this foreign key (if any).
-	 * @return     string
-	 */
-	public function getPhpName()
-	{
-		return $this->phpName;
-	}
-
-	/**
-	 * Sets a phpName to use for this foreign key.
-	 * @param      string $name
-	 */
-	public function setPhpName($name)
-	{
-		$this->phpName = $name;
-	}
-
-	/**
-	 * Gets the refPhpName for this foreign key (if any).
-	 * @return     string
-	 */
-	public function getRefPhpName()
-	{
-		return $this->refPhpName;
-	}
-
-	/**
-	 * Sets a refPhpName to use for this foreign key.
-	 * @param      string $name
-	 */
-	public function setRefPhpName($name)
-	{
-		$this->refPhpName = $name;
-	}
-
-	/**
-	 * Get the foreignTableName of the FK
-	 */
-	public function getForeignTableName()
-	{
-		return $this->foreignTableName;
-	}
-
-	/**
-	 * Set the foreignTableName of the FK
-	 */
-	public function setForeignTableName($tableName)
-	{
-		$this->foreignTableName = $tableName;
-	}
-
-	/**
-	 * Gets the resolved foreign Table model object.
-	 * @return     Table
-	 */
-	public function getForeignTable()
-	{
-		return $this->getTable()->getDatabase()->getTable($this->getForeignTableName());
-	}
-
-	/**
-	 * Set the parent Table of the foreign key
-	 */
-	public function setTable(Table $parent)
-	{
-		$this->parentTable = $parent;
-	}
-
-	/**
-	 * Get the parent Table of the foreign key
-	 */
-	public function getTable()
-	{
-		return $this->parentTable;
-	}
-
-	/**
-	 * Returns the Name of the table the foreign key is in
-	 */
-	public function getTableName()
-	{
-		return $this->parentTable->getName();
-	}
-
-	/**
-	 * Adds a new reference entry to the foreign key.
-	 */
-	public function addReference($p1, $p2 = null)
-	{
-		if (is_array($p1)) {
-			$this->addReference(@$p1["local"], @$p1["foreign"]);
-		} else {
-			if ($p1 instanceof Column) {
-				$p1 = $p1->getName();
-			}
-			if ($p2 instanceof Column) {
-				$p2 = $p2->getName();
-			}
-			$this->localColumns[] = $p1;
-			$this->foreignColumns[] = $p2;
-		}
-	}
-
-	/**
-	 * Return a comma delimited string of local column names
-	 * @deprecated because Column::makeList() is deprecated; use the array-returning getLocalColumns() and DDLBuilder->getColumnList() instead instead.
-	 */
-	public function getLocalColumnNames()
-	{
-		return Column::makeList($this->getLocalColumns(), $this->getTable()->getDatabase()->getPlatform());
-	}
-
-	/**
-	 * Return a comma delimited string of foreign column names
-	 * @deprecated because Column::makeList() is deprecated; use the array-returning getForeignColumns() and DDLBuilder->getColumnList() instead instead.
-	 */
-	public function getForeignColumnNames()
-	{
-		return Column::makeList($this->getForeignColumns(), $this->getTable()->getDatabase()->getPlatform());
-	}
-
-	/**
-	 * Return an array of local column names.
-	 * @return     array string[]
-	 */
-	public function getLocalColumns()
-	{
-		return $this->localColumns;
-	}
-
-	/**
-	 * Utility method to get local column to foreign column
-	 * mapping for this foreign key.
-	 */
-	public function getLocalForeignMapping()
-	{
-		$h = array();
-		for ($i=0, $size=count($this->localColumns); $i < $size; $i++) {
-			$h[$this->localColumns[$i]] = $this->foreignColumns[$i];
-		}
-		return $h;
-	}
-
-	/**
-	 * Get the foreign column mapped to specified local column.
-	 * @return     string Column name.
-	 */
-	public function getMappedForeignColumn($local)
-	{
-		$m = $this->getLocalForeignMapping();
-		if (isset($m[$local])) {
-			return $m[$local];
-		}
-		return null;
-	}
-
-	/**
-	 * Get the local column mapped to specified foreign column.
-	 * @return     string Column name.
-	 */
-	public function getMappedLocalColumn($foreign)
-	{
-		$m = $this->getForeignLocalMapping();
-		if (isset($m[$foreign])) {
-			return $m[$foreign];
-		}
-		return null;
-	}
-
-	/**
-	 * Return an array of foreign column objects.
-	 * @return     array Column[]
-	 */
-	public function getForeignColumns()
-	{
-		return $this->foreignColumns;
-	}
-
-	/**
-	 * Utility method to get local column to foreign column
-	 * mapping for this foreign key.
-	 */
-	public function getForeignLocalMapping()
-	{
-		$h = array();
-		for ($i=0, $size=count($this->localColumns); $i < $size; $i++) {
-			$h[ $this->foreignColumns[$i] ] = $this->localColumns[$i];
-		}
-		return $h;
-	}
-
-	/**
-	 * Whether this foreign key is also the primary key of the local table.
-	 *
-	 * @return     boolean
-	 */
-	public function isLocalPrimaryKey()
-	{
-		$localCols = $this->getLocalColumns();
-
-		$localPKColumnObjs = $this->getTable()->getPrimaryKey();
-
-		$localPKCols = array();
-		foreach ($localPKColumnObjs as $lPKCol) {
-			$localPKCols[] = $lPKCol->getName();
-		}
-		//
-		//		print "Local key columns: \n";
-		//		print_r($localCols);
-		//
-		//		print "Local table primary key columns: \n";
-		//		print_r($localPKCols);
-
-		return (!array_diff($localPKCols, $localCols));
-	}
-
-	/**
-	 * Whether this foreign key is matched by an invertes foreign key (on foreign table).
-	 *
-	 * This is to prevent duplicate columns being generated for a 1:1 relationship that is represented
-	 * by foreign keys on both tables.  I don't know if that's good practice ... but hell, why not
-	 * support it.
-	 *
-	 * @param      ForeignKey $fk
-	 * @return     boolean
-	 * @link       http://propel.phpdb.org/trac/ticket/549
-	 */
-	public function isMatchedByInverseFK()
-	{
-		return (bool) $this->getInverseFK();
-	}
-	
-	public function getInverseFK()
-	{
-		$foreignTable = $this->getForeignTable();
-		$map = $this->getForeignLocalMapping();
-
-		foreach ($foreignTable->getForeignKeys() as $refFK) {
-			$fkMap = $refFK->getLocalForeignMapping();
-			if ( ($refFK->getTableName() == $this->getTableName()) && ($map == $fkMap) ) { // compares keys and values, but doesn't care about order, included check to make sure it's the same table (fixes #679)
-				return $refFK;
-			}
-		}
-	}
-
-	/**
-	 * @see        XMLElement::appendXml(DOMNode)
-	 */
-	public function appendXml(DOMNode $node)
-	{
-		$doc = ($node instanceof DOMDocument) ? $node : $node->ownerDocument;
-
-		$fkNode = $node->appendChild($doc->createElement('foreign-key'));
-
-		$fkNode->setAttribute('foreignTable', $this->getForeignTableName());
-		$fkNode->setAttribute('name', $this->getName());
-
-		if ($this->getPhpName()) {
-			$fkNode->setAttribute('phpName', $this->getPhpName());
-		}
-
-		if ($this->getRefPhpName()) {
-			$fkNode->setAttribute('refPhpName', $this->getRefPhpName());
-		}
-
-		if ($this->getOnDelete()) {
-			$fkNode->setAttribute('onDelete', $this->getOnDelete());
-		}
-
-		if ($this->getOnUpdate()) {
-			$fkNode->setAttribute('onUpdate', $this->getOnUpdate());
-		}
-
-		for ($i=0, $size=count($this->localColumns); $i < $size; $i++) {
-			$refNode = $fkNode->appendChild($doc->createElement('reference'));
-			$refNode->setAttribute('local', $this->localColumns[$i]);
-			$refNode->setAttribute('foreign', $this->foreignColumns[$i]);
-		}
-
-		foreach ($this->vendorInfos as $vi) {
-			$vi->appendXml($fkNode);
-		}
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/IDMethod.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/IDMethod.php
deleted file mode 100644
index a5e9c6f33..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/IDMethod.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/*
- *  $Id: IDMethod.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * Interface for various ID retrieval method types
- * (i.e. auto-increment, sequence, ID broker, etc.).
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Daniel Rall <dlr@collab.net> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-interface IDMethod {
-
-	/**
-	 * Key generation via database-specific ID method
-	 * (i.e. auto-increment for MySQL, sequence for Oracle, etc.).
-	 */
-	const NATIVE = "native";
-
-	/**
-	 * No RDBMS key generation (keys may be generated by the
-	 * application).
-	 */
-	const NO_ID_METHOD = "none";
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/IdMethodParameter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/IdMethodParameter.php
deleted file mode 100644
index 9ac93ad97..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/IdMethodParameter.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-/*
- *  $Id: IdMethodParameter.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/model/XMLElement.php';
-
-/**
- * Information related to an ID method.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     John McNally <jmcnally@collab.net> (Torque)
- * @author     Daniel Rall <dlr@collab.net> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class IdMethodParameter extends XMLElement {
-
-	private $name;
-	private $value;
-	private $parentTable;
-
-   /**
-	 * Sets up the IdMethodParameter object based on the attributes that were passed to loadFromXML().
-	 * @see        parent::loadFromXML()
-	 */
-	protected function setupObject()
-	{
-		$this->name = $this->getAttribute("name");
-		$this->value = $this->getAttribute("value");
-	}
-
-	/**
-	 * Get the parameter name
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
-
-	/**
-	 * Set the parameter name
-	 */
-	public function setName($name)
-	{
-		$this->name = $name;
-	}
-
-	/**
-	 * Get the parameter value
-	 */
-	public function getValue()
-	{
-		return $this->value;
-	}
-
-	/**
-	 * Set the parameter value
-	 */
-	public function setValue($value)
-	{
-		$this->value = $value;
-	}
-
-	/**
-	 * Set the parent Table of the id method
-	 */
-	public function setTable(Table $parent)
-	{
-		$this->parentTable = $parent;
-	}
-
-	/**
-	 * Get the parent Table of the id method
-	 */
-	public function getTable()
-	{
-		return $this->parentTable;
-	}
-
-	/**
-	 * Returns the Name of the table the id method is in
-	 */
-	public function getTableName()
-	{
-		return $this->parentTable->getName();
-	}
-
-	/**
-	 * @see        XMLElement::appendXml(DOMNode)
-	 */
-	public function appendXml(DOMNode $node)
-	{
-		$doc = ($node instanceof DOMDocument) ? $node : $node->ownerDocument;
-
-		$paramNode = $node->appendChild($doc->createElement('id-method-parameter'));
-		if ($this->getName()) {
-			$paramNode->setAttribute('name', $this->getName());
-		}
-		$paramNode->setAttribute('value', $this->getValue());
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Index.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Index.php
deleted file mode 100644
index a80feacf2..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Index.php
+++ /dev/null
@@ -1,286 +0,0 @@
-<?php
-
-/*
- *  $Id: Index.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/model/XMLElement.php';
-include_once 'propel/engine/EngineException.php';
-
-/**
- * Information about indices of a table.
- *
- * @author     Jason van Zyl <vanzyl@apache.org>
- * @author     Daniel Rall <dlr@finemaltcoding.com>
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class Index extends XMLElement {
-
-	/** enables debug output */
-	const DEBUG = false;
-
-	private $indexName;
-	private $parentTable;
-
-	/** @var        array string[] */
-	private $indexColumns;
-
-	/** @var        array  */
-	private $indexColumnSizes = array();
-
-	/**
-	 * Creates a new Index instance.
-	 *
-	 * @param      string $name
-	 */
-	public function __construct($name=null)
-	{
-		$this->indexName = $name;
-	}
-
-	private function createName()
-	{
-		$table = $this->getTable();
-		$inputs = array();
-		$inputs[] = $table->getDatabase();
-		$inputs[] = $table->getName();
-		if ($this->isUnique()) {
-			$inputs[] = "U";
-		} else {
-			$inputs[] = "I";
-		}
-		// ASSUMPTION: This Index not yet added to the list.
-		if ($this->isUnique()) {
-			$inputs[] = count($table->getUnices()) + 1;
-		} else {
-			$inputs[] = count($table->getIndices()) + 1;
-		}
-
-		$this->indexName = NameFactory::generateName(
-		NameFactory::CONSTRAINT_GENERATOR, $inputs);
-	}
-
-	/**
-	 * Sets up the Index object based on the attributes that were passed to loadFromXML().
-	 * @see        parent::loadFromXML()
-	 */
-	protected function setupObject()
-	{
-		$this->indexName = $this->getAttribute("name");
-	}
-
-	/**
-	 * @see        #isUnique()
-	 * @deprecated Use isUnique() instead.
-	 */
-	public function getIsUnique()
-	{
-		return $this->isUnique();
-	}
-
-	/**
-	 * Returns the uniqueness of this index.
-	 */
-	public function isUnique()
-	{
-		return false;
-	}
-
-	/**
-	 * @see        #getName()
-	 * @deprecated Use getName() instead.
-	 */
-	public function getIndexName()
-	{
-		return $this->getName();
-	}
-
-	/**
-	 * Gets the name of this index.
-	 */
-	public function getName()
-	{
-		if ($this->indexName === null) {
-			try {
-				// generate an index name if we don't have a supplied one
-				$this->createName();
-			} catch (EngineException $e) {
-				// still no name
-			}
-		}
-		return substr($this->indexName, 0, $this->getTable()->getDatabase()->getPlatform()->getMaxColumnNameLength());
-	}
-
-	/**
-	 * @see        #setName(String name)
-	 * @deprecated Use setName(String name) instead.
-	 */
-	public function setIndexName($name)
-	{
-		$this->setName($name);
-	}
-
-	/**
-	 * Set the name of this index.
-	 */
-	public function setName($name)
-	{
-		$this->indexName = $name;
-	}
-
-	/**
-	 * Set the parent Table of the index
-	 */
-	public function setTable(Table $parent)
-	{
-		$this->parentTable = $parent;
-	}
-
-	/**
-	 * Get the parent Table of the index
-	 */
-	public function getTable()
-	{
-		return $this->parentTable;
-	}
-
-	/**
-	 * Returns the Name of the table the index is in
-	 */
-	public function getTableName()
-	{
-		return $this->parentTable->getName();
-	}
-
-	/**
-	 * Adds a new column to an index.
-	 * @param      mixed $data Column or attributes from XML.
-	 */
-	public function addColumn($data)
-	{
-		if ($data instanceof Column) {
-			$column = $data;
-			$this->indexColumns[] = $column->getName();
-			if ($column->getSize()) {
-				$this->indexColumnSizes[$column->getName()] = $column->getSize();
-			}
-		} else {
-			$attrib = $data;
-			$name = $attrib["name"];
-			$this->indexColumns[] = $name;
-			if (isset($attrib["size"])) {
-				$this->indexColumnSizes[$name] = $attrib["size"];
-			}
-		}
-	}
-
-	/**
-	 * Sets array of columns to use for index.
-	 *
-	 * @param      array $indexColumns Column[]
-	 */
-	public function setColumns(array $indexColumns)
-	{
-		$this->indexColumns = array();
-		$this->indexColumnSizes = array();
-		foreach ($indexColumns as $col) {
-			$this->addColumn($col);
-		}
-	}
-
-	/**
-	 * Whether there is a size for the specified column.
-	 * @param      string $name
-	 * @return     boolean
-	 */
-	public function hasColumnSize($name)
-	{
-		return isset($this->indexColumnSizes[$name]);
-	}
-
-	/**
-	 * Returns the size for the specified column, if given.
-	 * @param      string $name
-	 * @return     numeric The size or NULL
-	 */
-	public function getColumnSize($name)
-	{
-		if (isset($this->indexColumnSizes[$name])) {
-			return $this->indexColumnSizes[$name];
-		}
-		return null; // just to be explicit
-	}
-
-	/**
-	 * @see        #getColumnList()
-	 * @deprecated Use getColumnList() instead (which is not deprecated too!)
-	 */
-	public function getIndexColumnList()
-	{
-		return $this->getColumnList();
-	}
-
-	/**
-	 * Return a comma delimited string of the columns which compose this index.
-	 * @deprecated because Column::makeList() is deprecated; use the array-returning getColumns() and DDLBuilder->getColumnList() instead instead.
-	 */
-	public function getColumnList()
-	{
-		return Column::makeList($this->getColumns(), $this->getTable()->getDatabase()->getPlatform());
-	}
-
-	/**
-	 * @see        #getColumns()
-	 * @deprecated Use getColumns() instead.
-	 */
-	public function getIndexColumns()
-	{
-		return $this->getColumns();
-	}
-
-	/**
-	 * Return the list of local columns. You should not edit this list.
-	 * @return     array string[]
-	 */
-	public function getColumns()
-	{
-		return $this->indexColumns;
-	}
-
-	/**
-	 * @see        XMLElement::appendXml(DOMNode)
-	 */
-	public function appendXml(DOMNode $node)
-	{
-		$doc = ($node instanceof DOMDocument) ? $node : $node->ownerDocument;
-
-		$idxNode = $node->appendChild($doc->createElement('index'));
-		$idxNode->setAttribute('name', $this->getName());
-
-		foreach ($this->indexColumns as $colname) {
-			$idxColNode = $idxNode->appendChild($doc->createElement('index-column'));
-			$idxColNode->setAttribute('name', $colname);
-		}
-
-		foreach ($this->vendorInfos as $vi) {
-			$vi->appendXml($idxNode);
-		}
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Inheritance.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Inheritance.php
deleted file mode 100644
index becdf7132..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Inheritance.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-/*
- *  $Id: Inheritance.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/model/XMLElement.php';
-
-/**
- * A Class for information regarding possible objects representing a table
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     John McNally <jmcnally@collab.net> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class Inheritance extends XMLElement {
-
-	private $key;
-	private $className;
-	private $pkg;
-	private $ancestor;
-	private $parent;
-
-	/**
-	 * Sets up the Inheritance object based on the attributes that were passed to loadFromXML().
-	 * @see        parent::loadFromXML()
-	 */
-	protected function setupObject()
-	{
-		$this->key = $this->getAttribute("key");
-		$this->className = $this->getAttribute("class");
-		$this->pkg = $this->getAttribute("package");
-		$this->ancestor = $this->getAttribute("extends");
-	}
-
-	/**
-	 * Get the value of key.
-	 * @return     value of key.
-	 */
-	public function getKey()
-	{
-		return $this->key;
-	}
-
-	/**
-	 * Set the value of key.
-	 * @param      v  Value to assign to key.
-	 */
-	public function setKey($v)
-	{
-		$this->key = $v;
-	}
-
-	/**
-	 * Get the value of parent.
-	 * @return     value of parent.
-	 */
-	public function getColumn()
-	{
-		return $this->parent;
-	}
-
-	/**
-	 * Set the value of parent.
-	 * @param      v  Value to assign to parent.
-	 */
-	public function setColumn(Column  $v)
-	{
-		$this->parent = $v;
-	}
-
-	/**
-	 * Get the value of className.
-	 * @return     value of className.
-	 */
-	public function getClassName()
-	{
-		return $this->className;
-	}
-
-	/**
-	 * Set the value of className.
-	 * @param      v  Value to assign to className.
-	 */
-	public function setClassName($v)
-	{
-		$this->className = $v;
-	}
-
-	/**
-	 * Get the value of package.
-	 * @return     value of package.
-	 */
-	public function getPackage()
-	{
-		return $this->pkg;
-	}
-
-	/**
-	 * Set the value of package.
-	 * @param      v  Value to assign to package.
-	 */
-	public function setPackage($v)
-	{
-		$this->pkg = $v;
-	}
-
-	/**
-	 * Get the value of ancestor.
-	 * @return     value of ancestor.
-	 */
-	public function getAncestor()
-	{
-		return $this->ancestor;
-	}
-
-	/**
-	 * Set the value of ancestor.
-	 * @param      v  Value to assign to ancestor.
-	 */
-	public function setAncestor($v)
-	{
-		$this->ancestor = $v;
-	}
-
-	/**
-	 * @see        XMLElement::appendXml(DOMNode)
-	 */
-	public function appendXml(DOMNode $node)
-	{
-		$doc = ($node instanceof DOMDocument) ? $node : $node->ownerDocument;
-
-		$inherNode = $node->appendChild($doc->createElement('inheritance'));
-		$inherNode->setAttribute('key', $this->key);
-		$inherNode->setAttribute('class', $this->className);
-
-		if ($this->ancestor !== null) {
-			$inherNode->setAttribute('extends', $this->ancestor);
-		}
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/NameFactory.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/NameFactory.php
deleted file mode 100644
index c38b8fda4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/NameFactory.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/*
- *  $Id: NameFactory.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-include_once 'propel/engine/EngineException.php';
-include_once 'propel/engine/database/model/NameGenerator.php';
-include_once 'propel/engine/database/model/PhpNameGenerator.php';
-include_once 'propel/engine/database/model/ConstraintNameGenerator.php';
-
-/**
- * A name generation factory.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Daniel Rall <dlr@finemaltcoding.com> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class NameFactory {
-
-	/**
-	 * The class name of the PHP name generator.
-	 */
-	const PHP_GENERATOR = 'PhpNameGenerator';
-
-	/**
-	 * The fully qualified class name of the constraint name generator.
-	 */
-	const CONSTRAINT_GENERATOR = 'ConstraintNameGenerator';
-
-	/**
-	 * The single instance of this class.
-	 */
-	private static $instance;
-
-	/**
-	 * The cache of <code>NameGenerator</code> algorithms in use for
-	 * name generation, keyed by fully qualified class name.
-	 */
-	private static $algorithms = array();
-
-	/**
-	 * Factory method which retrieves an instance of the named generator.
-	 *
-	 * @param      name The fully qualified class name of the name
-	 * generation algorithm to retrieve.
-	 */
-	protected static function getAlgorithm($name)
-	{
-		if (!isset(self::$algorithms[$name])) {
-			self::$algorithms[$name] = new $name();
-		}
-		return self::$algorithms[$name];
-	}
-
-	/**
-	 * Given a list of <code>String</code> objects, implements an
-	 * algorithm which produces a name.
-	 *
-	 * @param      string $algorithmName The fully qualified class name of the {@link NameGenerator}
-	 *             implementation to use to generate names.
-	 * @param      array $inputs Inputs used to generate a name.
-	 * @return     The generated name.
-	 * @throws     EngineException
-	 */
-	public static function generateName($algorithmName, $inputs)
-	{
-		$algorithm = self::getAlgorithm($algorithmName);
-		return $algorithm->generateName($inputs);
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/NameGenerator.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/NameGenerator.php
deleted file mode 100644
index 841e623fb..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/NameGenerator.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/*
- *  $Id: NameGenerator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * The generic interface to a name generation algorithm.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Daniel Rall <dlr@finemaltcoding.com> (Torque)
- * @author     Byron Foster <byron_foster@yahoo.com> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-interface NameGenerator {
-	/**
-	 * The character used by most implementations as the separator
-	 * between name elements.
-	 */
-	const STD_SEPARATOR_CHAR = '_';
-
-	/**
-	 * Traditional method for converting schema table and column names
-	 * to PHP names.  The <code>CONV_METHOD_XXX</code> constants
-	 * define how names for columns and tables in the database schema
-	 * will be converted to PHP source names.
-	 *
-	 * @see        PhpNameGenerator::underscoreMethod()
-	 */
-	const CONV_METHOD_UNDERSCORE = "underscore";
-
-	/**
-	 * Heavier method for converting schema table and column names 
-	 * to PHP names. Similar to {@link #CONV_METHOD_UNDERSCORE} but
-	 * this one will pass only letters and numbers through and will
-	 * use as separator any character that is not a letter or a number
-	 * inside the string to be converted. The <code>CONV_METHOD_XXX</code> 
-	 * constants define how names for columns and tales in the 
-	 * database schema will be converted to PHP source names. 
-	 */
-	const CONV_METHOD_CLEAN = "clean";
-	
-	/**
-	 * Similar to {@link #CONV_METHOD_UNDERSCORE} except nothing is
-	 * converted to lowercase.
-	 *
-	 * @see        PhpNameGenerator::phpnameMethod()
-	 */
-	const CONV_METHOD_PHPNAME = "phpname";
-
-	/**
-	 * Specifies no modification when converting from a schema column
-	 * or table name to a PHP name.
-	 */
-	const CONV_METHOD_NOCHANGE = "nochange";
-
-	/**
-	 * Given a list of <code>String</code> objects, implements an
-	 * algorithm which produces a name.
-	 *
-	 * @param      inputs Inputs used to generate a name.
-	 * @return     The generated name.
-	 * @throws     EngineException
-	 */
-	public function generateName($inputs);
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/PhpNameGenerator.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/PhpNameGenerator.php
deleted file mode 100644
index 38d93a3eb..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/PhpNameGenerator.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-/*
- *  $Id: PhpNameGenerator.php 1514 2010-02-02 20:30:58Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-include_once 'propel/engine/database/model/NameGenerator.php';
-
-/**
- * A <code>NameGenerator</code> implementation for PHP-esque names.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Daniel Rall <dlr@finemaltcoding.com> (Torque)
- * @author     Byron Foster <byron_foster@yahoo.com> (Torque)
- * @author     Bernd Goldschmidt <bgoldschmidt@rapidsoft.de>
- * @version    $Revision: 1514 $
- * @package    propel.engine.database.model
- */
-class PhpNameGenerator implements NameGenerator {
-
-	/**
-	 * <code>inputs</code> should consist of two (three) elements, the
-	 * original name of the database element and the method for
-	 * generating the name.
-	 * The optional third element may contain a prefix that will be
-	 * stript from name prior to generate the resulting name.
-	 * There are currently three methods:
-	 * <code>CONV_METHOD_NOCHANGE</code> - xml names are converted
-	 * directly to php names without modification.
-	 * <code>CONV_METHOD_UNDERSCORE</code> will capitalize the first
-	 * letter, remove underscores, and capitalize each letter before
-	 * an underscore.  All other letters are lowercased. "phpname"
-	 * works the same as the <code>CONV_METHOD_PHPNAME</code> method
-	 * but will not lowercase any characters.
-	 *
-	 * @param      inputs list expected to contain two (optional: three) parameters,
-	 * element 0 contains name to convert, element 1 contains method for conversion,
-	 * optional element 2 contains prefix to be striped from name
-	 * @return     The generated name.
-	 * @see        NameGenerator
-	 */
-	public function generateName($inputs)
-	{
-		$schemaName = $inputs[0];
-		$method = $inputs[1];
-
-		if (count($inputs)>2) {
-			$prefix = $inputs[2];
-			if ($prefix != '' && substr($schemaName, 0, strlen($prefix)) == $prefix) {
-				$schemaName = substr($schemaName, strlen($prefix));
-			}
-		}
-
-		$phpName = null;
-
-		switch ($method) {
-			case self::CONV_METHOD_CLEAN:
-				$phpName = $this->cleanMethod($schemaName);
-				break;
-			case self::CONV_METHOD_PHPNAME:
-				$phpName = $this->phpnameMethod($schemaName);
-				break;
-			case self::CONV_METHOD_NOCHANGE:
-				$phpName = $this->nochangeMethod($schemaName);
-				break;
-			case self::CONV_METHOD_UNDERSCORE:
-			default:
-				$phpName = $this->underscoreMethod($schemaName);
-		}
-
-		return $phpName;
-	}
-
-	/**
-	 * Converts a database schema name to php object name.  Removes
-	 * <code>STD_SEPARATOR_CHAR</code>, capitilizes first letter of
-	 * name and each letter after the <code>STD_SEPERATOR</code>,
-	 * converts the rest of the letters to lowercase.
-	 *
-	 * my_CLASS_name -> MyClassName
-	 *
-	 * @param      string $schemaName name to be converted.
-	 * @return     string Converted name.
-	 * @see        NameGenerator
-	 * @see        #underscoreMethod()
-	 */
-	protected function underscoreMethod($schemaName)
-	{
-		$name = "";
-		$tok = strtok($schemaName, self::STD_SEPARATOR_CHAR);
-		while ($tok) {
-			$name .= ucfirst(strtolower($tok));
-			$tok = strtok(self::STD_SEPARATOR_CHAR);
-		}
-		return $name;
-	}
-	
-	/**
-	 * Converts a database schema name to php object name.  Removes
-	 * any character that is not a letter or a number and capitilizes 
-	 * first letter of the name, the first letter of each alphanumeric 
-	 * block and converts the rest of the letters to lowercase.
-	 * 
-	 * T$NAMA$RFO_max => TNamaRfoMax
-	 *
-	 * @param      string $schemaName name to be converted.
-	 * @return     string Converted name.
-	 * @see        NameGenerator
-	 * @see        #underscoreMethod()
-	 */
-	protected function cleanMethod($schemaName)
-	{
-		$name = "";
-		$regexp = '/([a-z0-9]+)/i';
-		$matches = array();
-		if (preg_match_all($regexp, $schemaName, $matches)) {
-			foreach($matches[1] AS $tok) {
-				$name .= ucfirst(strtolower($tok));
-			}
-		} else {
-			return $schemaName;
-		}
-		return $name;
-	}
-
-	/**
-	 * Converts a database schema name to php object name.  Operates
-	 * same as underscoreMethod but does not convert anything to
-	 * lowercase.
-	 *
-	 * my_CLASS_name -> MyCLASSName
-	 *
-	 * @param      string $schemaName name to be converted.
-	 * @return     string Converted name.
-	 * @see        NameGenerator
-	 * @see        #underscoreMethod(String)
-	 */
-	protected function phpnameMethod($schemaName)
-	{
-		$name = "";
-		$tok = strtok($schemaName, self::STD_SEPARATOR_CHAR);
-		while ($tok !== false) {
-			$name .= ucfirst($tok);
-			$tok = strtok(self::STD_SEPARATOR_CHAR);
-		}
-		return $name;
-	}
-
-	/**
-	 * Converts a database schema name to PHP object name.  In this
-	 * case no conversion is made.
-	 *
-	 * @param      string $name name to be converted.
-	 * @return     string The <code>name</code> parameter, unchanged.
-	 */
-	protected function nochangeMethod($name)
-	{
-		return $name;
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/PropelTypes.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/PropelTypes.php
deleted file mode 100644
index aeebb1806..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/PropelTypes.php
+++ /dev/null
@@ -1,331 +0,0 @@
-<?php
-/*
- *  $Id: PropelTypes.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * A class that maps PropelTypes to PHP native types, PDO types (and Creole types).
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class PropelTypes {
-
-	const CHAR = "CHAR";
-	const VARCHAR = "VARCHAR";
-	const LONGVARCHAR = "LONGVARCHAR";
-	const CLOB = "CLOB";
-	const NUMERIC = "NUMERIC";
-	const DECIMAL = "DECIMAL";
-	const TINYINT = "TINYINT";
-	const SMALLINT = "SMALLINT";
-	const INTEGER = "INTEGER";
-	const BIGINT = "BIGINT";
-	const REAL = "REAL";
-	const FLOAT = "FLOAT";
-	const DOUBLE = "DOUBLE";
-	const BINARY = "BINARY";
-	const VARBINARY = "VARBINARY";
-	const LONGVARBINARY = "LONGVARBINARY";
-	const BLOB = "BLOB";
-	const DATE = "DATE";
-	const TIME = "TIME";
-	const TIMESTAMP = "TIMESTAMP";
-
-	const BU_DATE = "BU_DATE";
-	const BU_TIMESTAMP = "BU_TIMESTAMP";
-
-	const BOOLEAN = "BOOLEAN";
-
-	private static $TEXT_TYPES = array (
-						self::CHAR, self::VARCHAR, self::LONGVARCHAR, self::CLOB, self::DATE, self::TIME, self::TIMESTAMP, self::BU_DATE, self::BU_TIMESTAMP
-					);
-
-	private static $LOB_TYPES = array (
-						self::VARBINARY, self::LONGVARBINARY, self::BLOB
-					);
-
-	private static $TEMPORAL_TYPES = array (
-						self::DATE, self::TIME, self::TIMESTAMP, self::BU_DATE, self::BU_TIMESTAMP
-					);
-
-	private static $NUMERIC_TYPES = array (
-						self::SMALLINT, self::TINYINT, self::INTEGER, self::BIGINT, self::FLOAT, self::DOUBLE, self::NUMERIC, self::DECIMAL, self::REAL
-					);
-
-	const CHAR_NATIVE_TYPE = "string";
-	const VARCHAR_NATIVE_TYPE = "string";
-	const LONGVARCHAR_NATIVE_TYPE = "string";
-	const CLOB_NATIVE_TYPE = "string"; // Clob
-	const NUMERIC_NATIVE_TYPE = "string";
-	const DECIMAL_NATIVE_TYPE = "string";
-	const BOOLEAN_NATIVE_TYPE = "boolean";
-	const TINYINT_NATIVE_TYPE = "int";
-	const SMALLINT_NATIVE_TYPE = "int";
-	const INTEGER_NATIVE_TYPE = "int";
-	const BIGINT_NATIVE_TYPE = "string";
-	const REAL_NATIVE_TYPE = "double";
-	const FLOAT_NATIVE_TYPE = "double";
-	const DOUBLE_NATIVE_TYPE = "double";
-	const BINARY_NATIVE_TYPE = "string";
-	const VARBINARY_NATIVE_TYPE = "string";
-	const LONGVARBINARY_NATIVE_TYPE = "string";
-	const BLOB_NATIVE_TYPE = "resource";
-	const BU_DATE_NATIVE_TYPE = "string";
-	const DATE_NATIVE_TYPE = "string";
-	const TIME_NATIVE_TYPE = "string";
-	const TIMESTAMP_NATIVE_TYPE = "string";
-	const BU_TIMESTAMP_NATIVE_TYPE = "string";
-
-	/**
-	 * Mapping between Propel types and PHP native types.
-	 *
-	 * @var        array
-	 */
-	private static $propelToPHPNativeMap = array(
-			self::CHAR => self::CHAR_NATIVE_TYPE,
-			self::VARCHAR => self::VARCHAR_NATIVE_TYPE,
-			self::LONGVARCHAR => self::LONGVARCHAR_NATIVE_TYPE,
-			self::CLOB => self::CLOB_NATIVE_TYPE,
-			self::NUMERIC => self::NUMERIC_NATIVE_TYPE,
-			self::DECIMAL => self::DECIMAL_NATIVE_TYPE,
-			self::TINYINT => self::TINYINT_NATIVE_TYPE,
-			self::SMALLINT => self::SMALLINT_NATIVE_TYPE,
-			self::INTEGER => self::INTEGER_NATIVE_TYPE,
-			self::BIGINT => self::BIGINT_NATIVE_TYPE,
-			self::REAL => self::REAL_NATIVE_TYPE,
-			self::FLOAT => self::FLOAT_NATIVE_TYPE,
-			self::DOUBLE => self::DOUBLE_NATIVE_TYPE,
-			self::BINARY => self::BINARY_NATIVE_TYPE,
-			self::VARBINARY => self::VARBINARY_NATIVE_TYPE,
-			self::LONGVARBINARY => self::LONGVARBINARY_NATIVE_TYPE,
-			self::BLOB => self::BLOB_NATIVE_TYPE,
-			self::DATE => self::DATE_NATIVE_TYPE,
-			self::BU_DATE => self::BU_DATE_NATIVE_TYPE,
-			self::TIME => self::TIME_NATIVE_TYPE,
-			self::TIMESTAMP => self::TIMESTAMP_NATIVE_TYPE,
-			self::BU_TIMESTAMP => self::BU_TIMESTAMP_NATIVE_TYPE,
-			self::BOOLEAN => self::BOOLEAN_NATIVE_TYPE,
-	);
-
-	/**
-	 * Mapping between Propel types and Creole types (for rev-eng task)
-	 *
-	 * @var        array
-	 */
-	private static $propelTypeToCreoleTypeMap = array(
-
-			self::CHAR => self::CHAR,
-			self::VARCHAR => self::VARCHAR,
-			self::LONGVARCHAR => self::LONGVARCHAR,
-			self::CLOB => self::CLOB,
-			self::NUMERIC => self::NUMERIC,
-			self::DECIMAL => self::DECIMAL,
-			self::TINYINT => self::TINYINT,
-			self::SMALLINT => self::SMALLINT,
-			self::INTEGER => self::INTEGER,
-			self::BIGINT => self::BIGINT,
-			self::REAL => self::REAL,
-			self::FLOAT => self::FLOAT,
-			self::DOUBLE => self::DOUBLE,
-			self::BINARY => self::BINARY,
-			self::VARBINARY => self::VARBINARY,
-			self::LONGVARBINARY => self::LONGVARBINARY,
-			self::BLOB => self::BLOB,
-			self::DATE => self::DATE,
-			self::TIME => self::TIME,
-			self::TIMESTAMP => self::TIMESTAMP,
-			self::BOOLEAN => self::BOOLEAN,
-
-			// These are pre-epoch dates, which we need to map to String type
-			// since they cannot be properly handled using strtotime() -- or even numeric
-			// timestamps on Windows.
-			self::BU_DATE => self::VARCHAR,
-			self::BU_TIMESTAMP => self::VARCHAR,
-
-	);
-
-	/**
-	 * Mapping between Propel types and PDO type contants (for prepared statement setting).
-	 *
-	 * @var        array
-	 */
-	private static $propelTypeToPDOTypeMap = array(
-			self::CHAR => PDO::PARAM_STR,
-			self::VARCHAR => PDO::PARAM_STR,
-			self::LONGVARCHAR => PDO::PARAM_STR,
-			self::CLOB => PDO::PARAM_STR,
-			self::NUMERIC => PDO::PARAM_INT,
-			self::DECIMAL => PDO::PARAM_STR,
-			self::TINYINT => PDO::PARAM_INT,
-			self::SMALLINT => PDO::PARAM_INT,
-			self::INTEGER => PDO::PARAM_INT,
-			self::BIGINT => PDO::PARAM_INT,
-			self::REAL => PDO::PARAM_STR,
-			self::FLOAT => PDO::PARAM_STR,
-			self::DOUBLE => PDO::PARAM_STR,
-			self::BINARY => PDO::PARAM_STR,
-			self::VARBINARY => PDO::PARAM_LOB,
-			self::LONGVARBINARY => PDO::PARAM_LOB,
-			self::BLOB => PDO::PARAM_LOB,
-			self::DATE => PDO::PARAM_STR,
-			self::TIME => PDO::PARAM_STR,
-			self::TIMESTAMP => PDO::PARAM_STR,
-			self::BOOLEAN => PDO::PARAM_BOOL,
-
-			// These are pre-epoch dates, which we need to map to String type
-			// since they cannot be properly handled using strtotime() -- or even numeric
-			// timestamps on Windows.
-			self::BU_DATE => PDO::PARAM_STR,
-			self::BU_TIMESTAMP => PDO::PARAM_STR,
-	);
-
-	/**
-	 * Return native PHP type which corresponds to the
-	 * Creole type provided. Use in the base object class generation.
-	 *
-	 * @param      $propelType The Propel type name.
-	 * @return     string Name of the native PHP type
-	 */
-	public static function getPhpNative($propelType)
-	{
-		return self::$propelToPHPNativeMap[$propelType];
-	}
-
-	/**
-	 * Returns the correct Creole type _name_ for propel added types
-	 *
-	 * @param      $type the propel added type.
-	 * @return     string Name of the the correct Creole type (e.g. "VARCHAR").
-	 */
-	public static function getCreoleType($type)
-	{
-		return  self::$propelTypeToCreoleTypeMap[$type];
-	}
-
-	/**
-	 * Resturns the PDO type (PDO::PARAM_* constant) value.
-	 * @return     int
-	 */
-	public static function getPDOType($type)
-	{
-		return self::$propelTypeToPDOTypeMap[$type];
-	}
-
-	/**
-	 * Returns Propel type constant corresponding to Creole type code.
-	 * Used but Propel Creole task.
-	 *
-	 * @param      int $sqlType The Creole SQL type constant.
-	 * @return     string The Propel type to use or NULL if none found.
-	 */
-	public static function getPropelType($sqlType)
-	{
-		if (isset(self::$creoleToPropelTypeMap[$sqlType])) {
-			return self::$creoleToPropelTypeMap[$sqlType];
-		}
-	}
-
-	/**
-	 * Get array of Propel types.
-	 *
-	 * @return     array string[]
-	 */
-	public static function getPropelTypes()
-	{
-		return array_keys(self::$propelTypeToCreoleTypeMap);
-	}
-
-	/**
-	 * Whether passed type is a temporal (date/time/timestamp) type.
-	 *
-	 * @param      string $type Propel type
-	 * @return     boolean
-	 */
-	public static function isTemporalType($type)
-	{
-		return in_array($type, self::$TEMPORAL_TYPES);
-	}
-
-	/**
-	 * Returns true if values for the type need to be quoted.
-	 *
-	 * @param      string $type The Propel type to check.
-	 * @return     boolean True if values for the type need to be quoted.
-	 */
-	public static function isTextType($type)
-	{
-		return in_array($type, self::$TEXT_TYPES);
-	}
-
-	/**
-	 * Returns true if values for the type are numeric.
-	 *
-	 * @param      string $type The Propel type to check.
-	 * @return     boolean True if values for the type need to be quoted.
-	 */
-	public static function isNumericType($type)
-	{
-		return in_array($type, self::$NUMERIC_TYPES);
-	}
-
-	/**
-	 * Returns true if type is a LOB type (i.e. would be handled by Blob/Clob class).
-	 * @param      string $type Propel type to check.
-	 * @return     boolean
-	 */
-	public static function isLobType($type)
-	{
-		return in_array($type, self::$LOB_TYPES);
-	}
-
-	/**
-	 * Convenience method to indicate whether a passed-in PHP type is a primitive.
-	 *
-	 * @param      string $phpType The PHP type to check
-	 * @return     boolean Whether the PHP type is a primitive (string, int, boolean, float)
-	 */
-	public static function isPhpPrimitiveType($phpType)
-	{
-		return in_array($phpType, array("boolean", "int", "double", "float", "string"));
-	}
-
-	/**
-	 * Convenience method to indicate whether a passed-in PHP type is a numeric primitive.
-	 *
-	 * @param      string $phpType The PHP type to check
-	 * @return     boolean Whether the PHP type is a primitive (string, int, boolean, float)
-	 */
-	public static function isPhpPrimitiveNumericType($phpType)
-	{
-		return in_array($phpType, array("boolean", "int", "double", "float"));
-	}
-
-	/**
-	 * Convenience method to indicate whether a passed-in PHP type is an object.
-	 *
-	 * @param      string $phpType The PHP type to check
-	 * @return     boolean Whether the PHP type is a primitive (string, int, boolean, float)
-	 */
-	public static function isPhpObjectType($phpType)
-	{
-		return (!self::isPhpPrimitiveType($phpType) && !in_array($phpType, array("resource", "array")));
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Rule.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Rule.php
deleted file mode 100644
index e222b00d1..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Rule.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-/*
- *  $Id: Rule.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/model/XMLElement.php';
-
-/**
- * Data about a validation rule used in an application.
- *
- * @author     Michael Aichler <aichler@mediacluster.de> (Propel)
- * @author     John McNally <jmcnally@collab.net> (Intake)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class Rule extends XMLElement {
-
-	private $name;
-	private $value;
-	private $message;
-	private $validator;
-	private $classname;
-
-	/**
-	 * Sets up the Rule object based on the attributes that were passed to loadFromXML().
-	 * @see        parent::loadFromXML()
-	 */
-	protected function setupObject()
-	{
-		$this->name = $this->getAttribute("name");
-		$this->value = $this->getAttribute("value");
-		$this->classname = $this->getAttribute("class");
-
-		/*
-		* Set some default values if they are not specified.
-		* This is escpecially useful for maxLength; the size
-		* is already known by the column and this way it is
-		* not necessary to manage the same size two times.
-		*
-		* Currently there is only one such supported default:
-		*   - maxLength value = column max length
-		*   (this default cannot be easily set at runtime w/o changing
-		*   design of class system in undesired ways)
-		*/
-		if ($this->value === null) {
-			switch($this->name) {
-				case 'maxLength':
-					$this->value = $this->validator->getColumn()->getSize();
-					break;
-			}
-		}
-
-		$this->message = $this->getAttribute("message");
-	}
-
-	/**
-	 * Sets the owning validator for this rule.
-	 * @param      Validator $validator
-	 * @see        Validator::addRule()
-	 */
-	public function setValidator(Validator $validator)
-	{
-		$this->validator = $validator;
-	}
-
-	/**
-	 * Gets the owning validator for this rule.
-	 * @return     Validator
-	 */
-	public function getValidator()
-	{
-		return $this->validator;
-	}
-
-	/**
-	 * Sets the dot-path name of class to use for rule.
-	 * If no class is specified in XML, then a classname will
-	 * be built based on the 'name' attrib.
-	 * @param      string $classname dot-path classname (e.g. myapp.propel.MyValidator)
-	 */
-	public function setClass($classname)
-	{
-		$this->classname = $classname;
-	}
-
-	/**
-	 * Gets the dot-path name of class to use for rule.
-	 * If no class was specified, this method will build a default classname
-	 * based on the 'name' attribute.  E.g. 'maxLength' -> 'propel.validator.MaxLengthValidator'
-	 * @return     string dot-path classname (e.g. myapp.propel.MyValidator)
-	 */
-	public function getClass()
-	{
-		if ($this->classname === null && $this->name !== null) {
-			return "propel.validator." . ucfirst($this->name) . "Validator";
-		}
-		return $this->classname;
-	}
-
-	/**
-	 * Sets the name of the validator for this rule.
-	 * This name is used to build the classname if none was specified.
-	 * @param      string $name Validator name for this rule (e.g. "maxLength", "required").
-	 * @see        getClass()
-	 */
-	public function setName($name)
-	{
-		$this->name = $name;
-	}
-
-	/**
-	 * Gets the name of the validator for this rule.
-	 * @return     string Validator name for this rule (e.g. "maxLength", "required").
-	 */
-	public function getName()
-	{
-		return $this->name;
-	}
-
-	/**
-	 * Sets the value parameter for this validator rule.
-	 * Note: not all validators need a value parameter (e.g. 'required' validator
-	 * does not).
-	 * @param      string $value
-	 */
-	public function setValue($value)
-	{
-		$this->value = $value;
-	}
-
-	/**
-	 * Gets the value parameter for this validator rule.
-	 * @return     string
-	 */
-	public function getValue()
-	{
-		return $this->value;
-	}
-
-	/**
-	 * Sets the message that will be displayed to the user if validation fails.
-	 * This message may be a Gettext msgid (if translation="gettext") or some other
-	 * id for an alternative not-yet-supported translation system.  It may also
-	 * be a simple, single-language string.
-	 * @param      string $message
-	 * @see        setTranslation()
-	 */
-	public function setMessage($message)
-	{
-		$this->message = $message;
-	}
-
-	/**
-	 * Gets the message that will be displayed to the user if validation fails.
-	 * This message may be a Gettext msgid (if translation="gettext") or some other
-	 * id for an alternative not-yet-supported translation system.  It may also
-	 * be a simple, single-language string.
-	 * @return     string
-	 * @see        setTranslation()
-	 */
-	public function getMessage()
-	{
-		$message = str_replace('${value}', $this->getValue(), $this->message);
-		return $message;
-	}
-
-	/**
-	 * @see        XMLElement::appendXml(DOMNode)
-	 */
-	public function appendXml(DOMNode $node)
-	{
-		$doc = ($node instanceof DOMDocument) ? $node : $node->ownerDocument;
-
-		$ruleNode = $node->appendChild($doc->createElement('rule'));
-		$ruleNode->setAttribute('name', $this->getName());
-
-		if ($this->getValue() !== null) {
-			$ruleNode->setAttribute('value', $this->getValue());
-		}
-
-		if ($this->classname !== null) {
-			$ruleNode->setAttribute('class', $this->getClass());
-		}
-
-		$ruleNode->setAttribute('message', $this->getMessage());
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Table.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Table.php
deleted file mode 100644
index 7e4cc3310..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Table.php
+++ /dev/null
@@ -1,1429 +0,0 @@
-<?php
-
-/*
- *  $Id: Table.php 1268 2009-10-30 22:51:21Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/model/XMLElement.php';
-include_once 'propel/engine/EngineException.php';
-include_once 'propel/engine/database/model/IDMethod.php';
-include_once 'propel/engine/database/model/NameFactory.php';
-include_once 'propel/engine/database/model/Column.php';
-include_once 'propel/engine/database/model/Unique.php';
-include_once 'propel/engine/database/model/ForeignKey.php';
-include_once 'propel/engine/database/model/IdMethodParameter.php';
-include_once 'propel/engine/database/model/Validator.php';
-include_once 'propel/engine/database/model/Behavior.php';
-
-
-/**
- * Data about a table used in an application.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Leon Messerschmidt <leon@opticode.co.za> (Torque)
- * @author     Jason van Zyl <jvanzyl@apache.org> (Torque)
- * @author     Martin Poeschl <mpoeschl@marmot.at> (Torque)
- * @author     John McNally <jmcnally@collab.net> (Torque)
- * @author     Daniel Rall <dlr@collab.net> (Torque)
- * @author     Byron Foster <byron_foster@yahoo.com> (Torque)
- * @version    $Revision: 1268 $
- * @package    propel.engine.database.model
- */
-class Table extends XMLElement implements IDMethod {
-
-  /**
-   * Enables some debug printing.
-   */
-  const DEBUG = false;
-
-  /**
-   * Columns for this table.
-   *
-   * @var        array Column[]
-   */
-  private $columnList = array();
-
-  /**
-   * Validators for this table.
-   *
-   * @var        array Validator[]
-   */
-  private $validatorList = array();
-
-  /**
-   * Foreign keys for this table.
-   *
-   * @var        array ForeignKey[]
-   */
-  private $foreignKeys = array();
-
-  /**
-   * Indexes for this table.
-   *
-   * @var        array Index[]
-   */
-  private $indices = array();
-
-  /**
-   * Unique indexes for this table.
-   *
-   * @var        array Unique[]
-   */
-  private $unices = array();
-
-  /**
-   * Any parameters for the ID method (currently supports changing sequence name).
-   *
-   * @var        array
-   */
-  private $idMethodParameters = array();
-
-  /**
-   * Table name.
-   *
-   * @var        string
-   */
-  private $name;
-
-  /**
-   * Table description.
-   *
-   * @var        string
-   */
-  private $description;
-
-  /**
-   * phpName for the table.
-   *
-   * @var        string
-   */
-  private $phpName;
-
-  /**
-   * ID method for the table (e.g. IDMethod::NATIVE, IDMethod::NONE).
-   *
-   * @var        string
-   */
-  private $idMethod;
-
-  /**
-   * Wether an INSERT with set PK is allowed on tables with IDMethod::NATIVE
-   *
-   * @var        boolean
-   */
-  private $allowPkInsert;
-
-  /**
-   * Strategry to use for converting column name to phpName.
-   *
-   * @var        string
-   */
-  private $phpNamingMethod;
-
-  /**
-   * The Database that this table belongs to.
-   *
-   * @var        Database
-   */
-  private $database;
-
-  /**
-   * Foreign Keys that refer to this table.
-   *
-   * @var        array ForeignKey[]
-   */
-  private $referrers = array();
-
-  /**
-   * Names of foreign tables.
-   *
-   * @var        array string[]
-   */
-  private $foreignTableNames;
-
-  /**
-   * Whether this table contains a foreign primary key.
-   *
-   * @var        boolean
-   */
-  private $containsForeignPK;
-
-  /**
-   * The inheritance column for this table (if any).
-   *
-   * @var        Column
-   */
-  private $inheritanceColumn;
-
-  /**
-   * Whether to skip generation of SQL for this table.
-   *
-   * @var        boolean
-   */
-  private $skipSql;
-
-  /**
-   * Whether this table is "read-only".
-   *
-   * @var        boolean
-   */
-  private $readOnly;
-
-  /**
-   * Whether this table should result in abstract OM classes.
-   *
-   * @var        boolean
-   */
-  private $abstractValue;
-
-  /**
-   * Whether this table is an alias for another table.
-   *
-   * @var        string
-   */
-  private $alias;
-
-  /**
-   * The interface that the generated "object" class should implement.
-   *
-   * @var        string
-   */
-  private $enterface;
-
-  /**
-   * The package for the generated OM.
-   *
-   * @var        string
-   */
-  private $pkg;
-
-  /**
-   * The base class to extend for the generated "object" class.
-   *
-   * @var        string
-   */
-  private $baseClass;
-
-  /**
-   * The base peer class to extend for generated "peer" class.
-   *
-   * @var        string
-   */
-  private $basePeer;
-
-  /**
-   * Map of columns by name.
-   *
-   * @var        array
-   */
-  private $columnsByName = array();
-
-  /**
-   * Map of columns by phpName.
-   *
-   * @var        array
-   */
-  private $columnsByPhpName = array();
-
-  /**
-   * Whether this table needs to use transactions in Postgres.
-   *
-   * @var        string
-   * @deprecated
-   */
-  private $needsTransactionInPostgres;
-
-  /**
-   * Whether to perform additional indexing on this table.
-   *
-   * @var        boolean
-   */
-  private $heavyIndexing;
-
-  /**
-   * Whether this table is for reference only.
-   *
-   * @var        boolean
-   */
-  private $forReferenceOnly;
-
-  /**
-   * The tree mode (nested set, etc.) implemented by this table.
-   *
-   * @var        string
-   */
-  private $treeMode;
-
-  /**
-   * Whether to reload the rows in this table after insert.
-   *
-   * @var        boolean
-   */
-  private $reloadOnInsert;
-
-  /**
-   * Whether to reload the rows in this table after update.
-   *
-   * @var        boolean
-   */
-  private $reloadOnUpdate;
-
-  /**
-   * List of behaviors registered for this table
-   * 
-   * @var array
-   */
-  protected $behaviors = array();
-
-  /**
-   * Constructs a table object with a name
-   *
-   * @param      string $name table name
-   */
-  public function __construct($name = null)
-  {
-    $this->name = $name;
-  }
-
-  /**
-   * Sets up the Rule object based on the attributes that were passed to loadFromXML().
-   * @see        parent::loadFromXML()
-   */
-  public function setupObject()
-  {
-    $this->name = $this->getAttribute("name");
-    $this->phpName = $this->getAttribute("phpName");
-    $this->idMethod = $this->getAttribute("idMethod", $this->getDatabase()->getDefaultIdMethod());
-    $this->allowPkInsert = $this->booleanValue($this->getAttribute("allowPkInsert"));
-
-    // retrieves the method for converting from specified name to a PHP name.
-    $this->phpNamingMethod = $this->getAttribute("phpNamingMethod", $this->getDatabase()->getDefaultPhpNamingMethod());
-
-    $this->skipSql = $this->booleanValue($this->getAttribute("skipSql"));
-    $this->readOnly = $this->booleanValue($this->getAttribute("readOnly"));
-
-    $this->pkg = $this->getAttribute("package");
-    $this->abstractValue = $this->booleanValue($this->getAttribute("abstract"));
-    $this->baseClass = $this->getAttribute("baseClass");
-    $this->basePeer = $this->getAttribute("basePeer");
-    $this->alias = $this->getAttribute("alias");
-
-    $this->heavyIndexing = ( $this->booleanValue($this->getAttribute("heavyIndexing"))
-    || ("false" !== $this->getAttribute("heavyIndexing")
-    && $this->getDatabase()->isHeavyIndexing() ) );
-    $this->description = $this->getAttribute("description");
-    $this->enterface = $this->getAttribute("interface"); // sic ('interface' is reserved word)
-    $this->treeMode = $this->getAttribute("treeMode");
-
-    $this->reloadOnInsert = $this->booleanValue($this->getAttribute("reloadOnInsert"));
-    $this->reloadOnUpdate = $this->booleanValue($this->getAttribute("reloadOnUpdate"));
-  }
-
-  /**
-   * <p>A hook for the SAX XML parser to call when this table has
-   * been fully loaded from the XML, and all nested elements have
-   * been processed.</p>
-   *
-   * <p>Performs heavy indexing and naming of elements which weren't
-   * provided with a name.</p>
-   */
-  public function doFinalInitialization()
-  {
-    // Heavy indexing must wait until after all columns composing
-    // a table's primary key have been parsed.
-    if ($this->heavyIndexing) {
-      $this->doHeavyIndexing();
-    }
-
-    // Name any indices which are missing a name using the
-    // appropriate algorithm.
-    $this->doNaming();
-
-    // execute behavior table modifiers
-    foreach ($this->getBehaviors() as $behavior)
-    {
-      $behavior->getTableModifier()->modifyTable();
-    }
-    
-    // if idMethod is "native" and in fact there are no autoIncrement
-    // columns in the table, then change it to "none"
-    $anyAutoInc = false;
-    foreach ($this->getColumns() as $col) {
-      if ($col->isAutoIncrement()) {
-        $anyAutoInc = true;
-      }
-    }
-    if ($this->getIdMethod() === IDMethod::NATIVE && !$anyAutoInc) {
-      $this->setIdMethod(IDMethod::NO_ID_METHOD);
-    }
-    
-    // If there is no PK, then throw an error. Propel 1.3 requires primary keys.
-    $pk = $this->getPrimaryKey();
-    if (empty($pk)) {
-      throw new EngineException("Table '".$this->getName()."' does not have a primary key defined.  Propel requires all tables to have a primary key.");
-    }
-
-  }
-
-  /**
-   * <p>Adds extra indices for multi-part primary key columns.</p>
-   *
-   * <p>For databases like MySQL, values in a where clause much
-   * match key part order from the left to right.  So, in the key
-   * definition <code>PRIMARY KEY (FOO_ID, BAR_ID)</code>,
-   * <code>FOO_ID</code> <i>must</i> be the first element used in
-   * the <code>where</code> clause of the SQL query used against
-   * this table for the primary key index to be used.  This feature
-   * could cause problems under MySQL with heavily indexed tables,
-   * as MySQL currently only supports 16 indices per table (i.e. it
-   * might cause too many indices to be created).</p>
-   *
-   * <p>See <a href="http://www.mysql.com/doc/E/X/EXPLAIN.html">the
-   * manual</a> for a better description of why heavy indexing is
-   * useful for quickly searchable database tables.</p>
-   */
-  private function doHeavyIndexing()
-  {
-    if (self::DEBUG) {
-      print("doHeavyIndex() called on table " . $this->name."\n");
-    }
-
-    $pk = $this->getPrimaryKey();
-    $size = count($pk);
-
-    // We start at an offset of 1 because the entire column
-    // list is generally implicitly indexed by the fact that
-    // it's a primary key.
-    for ($i=1; $i < $size; $i++) {
-      $idx = new Index();
-      $idx->setColumns(array_slice($pk, $i, $size));
-      $this->addIndex($idx);
-    }
-  }
-
-  /**
-   * Names composing objects which haven't yet been named.  This
-   * currently consists of foreign-key and index entities.
-   */
-  private function doNaming() {
-
-    // Assure names are unique across all databases.
-    try {
-      for ($i=0, $size = count($this->foreignKeys); $i < $size; $i++) {
-        $fk = $this->foreignKeys[$i];
-        $name = $fk->getName();
-        if (empty($name)) {
-          $name = $this->acquireConstraintName("FK", $i + 1);
-          $fk->setName($name);
-        }
-      }
-
-      for ($i = 0, $size = count($this->indices); $i < $size; $i++) {
-        $index = $this->indices[$i];
-        $name = $index->getName();
-        if (empty($name)) {
-          $name = $this->acquireConstraintName("I", $i + 1);
-          $index->setName($name);
-        }
-      }
-
-      for ($i = 0, $size = count($this->unices); $i < $size; $i++) {
-        $index = $this->unices[$i];
-        $name = $index->getName();
-        if (empty($name)) {
-          $name = $this->acquireConstraintName("U", $i + 1);
-          $index->setName($name);
-        }
-      }
-
-      // NOTE: Most RDBMSes can apparently name unique column
-      // constraints/indices themselves (using MySQL and Oracle
-      // as test cases), so we'll assume that we needn't add an
-      // entry to the system name list for these.
-    } catch (EngineException $nameAlreadyInUse) {
-      print $nameAlreadyInUse->getMessage() . "\n";
-      print $nameAlreadyInUse->getTraceAsString();
-    }
-  }
-
-  /**
-   * Macro to a constraint name.
-   *
-   * @param      nameType constraint type
-   * @param      nbr unique number for this constraint type
-   * @return     unique name for constraint
-   * @throws     EngineException
-   */
-  private function acquireConstraintName($nameType, $nbr)
-  {
-    $inputs = array();
-    $inputs[] = $this->getDatabase();
-    $inputs[] = $this->getName();
-    $inputs[] = $nameType;
-    $inputs[] = $nbr;
-    return NameFactory::generateName(NameFactory::CONSTRAINT_GENERATOR, $inputs);
-  }
-
-  /**
-   * Gets the value of base class for classes produced from this table.
-   *
-   * @return     The base class for classes produced from this table.
-   */
-  public function getBaseClass()
-  {
-    if ($this->isAlias() && $this->baseClass === null) {
-      return $this->alias;
-    } elseif ($this->baseClass === null) {
-      return $this->getDatabase()->getBaseClass();
-    } else {
-      return $this->baseClass;
-    }
-  }
-
-  /**
-   * Set the value of baseClass.
-   * @param      v  Value to assign to baseClass.
-   */
-  public function setBaseClass($v)
-  {
-    $this->baseClass = $v;
-  }
-
-  /**
-   * Get the value of basePeer.
-   * @return     value of basePeer.
-   */
-  public function getBasePeer()
-  {
-    if ($this->isAlias() && $this->basePeer === null) {
-      return $this->alias . "Peer";
-    } elseif ($this->basePeer === null) {
-      return $this->getDatabase()->getBasePeer();
-    } else {
-      return $this->basePeer;
-    }
-  }
-
-  /**
-   * Set the value of basePeer.
-   * @param      v  Value to assign to basePeer.
-   */
-  public function setBasePeer($v)
-  {
-    $this->basePeer = $v;
-  }
-
-  /**
-   * A utility function to create a new column from attrib and add it to this
-   * table.
-   *
-   * @param      $coldata xml attributes or Column class for the column to add
-   * @return     the added column
-   */
-  public function addColumn($data)
-  {
-    if ($data instanceof Column) {
-      $col = $data;
-      $col->setTable($this);
-      if ($col->isInheritance()) {
-        $this->inheritanceColumn = $col;
-      }
-      $this->columnList[] = $col;
-      $this->columnsByName[$col->getName()] = $col;
-      $this->columnsByPhpName[$col->getPhpName()] = $col;
-      $col->setPosition(count($this->columnList));
-      $this->needsTransactionInPostgres |= $col->requiresTransactionInPostgres();
-      return $col;
-    } else {
-      $col = new Column();
-      $col->setTable($this);
-      $col->loadFromXML($data);
-      return $this->addColumn($col); // call self w/ different param
-    }
-  }
-
-  /**
-   * Add a validator to this table.
-   *
-   * Supports two signatures:
-   * - addValidator(Validator $validator)
-   * - addValidator(array $attribs)
-   *
-   * @param      mixed $data Validator object or XML attribs (array) from <validator /> element.
-   * @return     Validator The added Validator.
-   * @throws     EngineException
-   */
-  public function addValidator($data)
-  {
-    if ($data instanceof Validator) {
-      $validator = $data;
-      $col = $this->getColumn($validator->getColumnName());
-      if ($col == null) {
-        throw new EngineException("Failed adding validator to table '" . $this->getName() .
-        "': column '" . $validator->getColumnName() . "' does not exist !");
-      }
-      $validator->setColumn($col);
-      $validator->setTable($this);
-      $this->validatorList[] = $validator;
-      return $validator;
-    } else {
-      $validator = new Validator();
-      $validator->setTable($this);
-      $validator->loadFromXML($data);
-      return $this->addValidator($validator);
-    }
-  }
-
-  /**
-   * A utility function to create a new foreign key
-   * from attrib and add it to this table.
-   */
-  public function addForeignKey($fkdata)
-  {
-    if ($fkdata instanceof ForeignKey) {
-      $fk = $fkdata;
-      $fk->setTable($this);
-      $this->foreignKeys[] = $fk;
-
-      if ($this->foreignTableNames === null) {
-        $this->foreignTableNames = array();
-      }
-      if (!in_array($fk->getForeignTableName(), $this->foreignTableNames)) {
-        $this->foreignTableNames[] = $fk->getForeignTableName();
-      }
-      return $fk;
-    } else {
-      $fk = new ForeignKey();
-      $fk->loadFromXML($fkdata);
-      return $this->addForeignKey($fk);
-    }
-  }
-
-  /**
-   * Gets the column that subclasses of the class representing this
-   * table can be produced from.
-   * @return     Column
-   */
-  public function getChildrenColumn()
-  {
-    return $this->inheritanceColumn;
-  }
-
-  /**
-   * Get the subclasses that can be created from this table.
-   * @return     array string[] Class names
-   */
-  public function getChildrenNames()
-  {
-    if ($this->inheritanceColumn === null
-    || !$this->inheritanceColumn->isEnumeratedClasses()) {
-      return null;
-    }
-    $children = $this->inheritanceColumn->getChildren();
-    $names = array();
-    for ($i = 0, $size=count($children); $i < $size; $i++) {
-      $names[] = get_class($children[$i]);
-    }
-    return $names;
-  }
-
-  /**
-   * Adds the foreign key from another table that refers to this table.
-   */
-  public function addReferrer(ForeignKey $fk)
-  {
-    if ($this->referrers === null) {
-      $this->referrers = array();
-    }
-    $this->referrers[] = $fk;
-  }
-
-  /**
-   * Get list of references to this table.
-   */
-  public function getReferrers()
-  {
-    return $this->referrers;
-  }
-
-  /**
-   * Set whether this table contains a foreign PK
-   */
-  public function setContainsForeignPK($b)
-  {
-    $this->containsForeignPK = (boolean) $b;
-  }
-
-  /**
-   * Determine if this table contains a foreign PK
-   */
-  public function getContainsForeignPK()
-  {
-    return $this->containsForeignPK;
-  }
-
-  /**
-   * A list of tables referenced by foreign keys in this table
-   */
-  public function getForeignTableNames()
-  {
-    if ($this->foreignTableNames === null) {
-      $this->foreignTableNames = array();
-    }
-    return $this->foreignTableNames;
-  }
-
-  /**
-   * Return true if the column requires a transaction in Postgres
-   */
-  public function requiresTransactionInPostgres()
-  {
-    return $this->needsTransactionInPostgres;
-  }
-
-  /**
-   * A utility function to create a new id method parameter
-   * from attrib or object and add it to this table.
-   */
-  public function addIdMethodParameter($impdata)
-  {
-    if ($impdata instanceof IdMethodParameter) {
-      $imp = $impdata;
-      $imp->setTable($this);
-      if ($this->idMethodParameters === null) {
-        $this->idMethodParameters = array();
-      }
-      $this->idMethodParameters[] = $imp;
-      return $imp;
-    } else {
-      $imp = new IdMethodParameter();
-      $imp->loadFromXML($impdata);
-      return $this->addIdMethodParameter($imp); // call self w/ diff param
-    }
-  }
-
-  /**
-   * Adds a new index to the index list and set the
-   * parent table of the column to the current table
-   */
-  public function addIndex($idxdata)
-  {
-    if ($idxdata instanceof Index) {
-      $index = $idxdata;
-      $index->setTable($this);
-      $index->getName(); // we call this method so that the name is created now if it doesn't already exist.
-      $this->indices[] = $index;
-      return $index;
-    } else {
-      $index = new Index($this);
-      $index->loadFromXML($idxdata);
-      return $this->addIndex($index);
-    }
-  }
-
-  /**
-   * Adds a new Unique to the Unique list and set the
-   * parent table of the column to the current table
-   */
-  public function addUnique($unqdata)
-  {
-    if ($unqdata instanceof Unique) {
-      $unique = $unqdata;
-      $unique->setTable($this);
-      $unique->getName(); // we call this method so that the name is created now if it doesn't already exist.
-      $this->unices[] = $unique;
-      return $unique;
-    } else {
-      $unique = new Unique($this);
-      $unique->loadFromXML($unqdata);
-      return $this->addUnique($unique);
-    }
-  }
-
-  /**
-   * Retrieves the configuration object, filled by build.properties
-   *
-   * @return GeneratorConfig
-   */
-  public function getGeneratorConfig()
-  {
-    return $this->getDatabase()->getAppData()->getPlatform()->getGeneratorConfig();
-  }
-  
-  /**
-   * Adds a new Behavior to the table
-   * @return Behavior A behavior instance
-   */
-  public function addBehavior($bdata)
-  {
-    if ($bdata instanceof Behavior) {
-      $behavior = $bdata;
-      $behavior->setTable($this);
-      $this->behaviors[$behavior->getName()] = $behavior;
-      return $behavior;
-    } else {
-      $class = $this->getConfiguredBehavior($bdata['name']);
-      $behavior = new $class();
-      $behavior->loadFromXML($bdata);
-      return $this->addBehavior($behavior);
-    }
-  }
-  
-  /**
-   * Get the table behaviors
-   * @return Array of Behavior objects
-   */
-  public function getBehaviors()
-  {
-    return $this->behaviors;
-  }
-  
-  /**
-   * Get one table behavior by name
-   * @param string $name the behavior name
-   * @return Behavior a behavior object
-   */
-  public function getBehavior($name)
-  {
-    return $this->behaviors[$name];
-  }
-
-  /**
-   * Get the name of the Table
-   */
-  public function getName()
-  {
-    return $this->name;
-  }
-
-  /**
-   * Set the name of the Table
-   */
-  public function setName($newName)
-  {
-    $this->name = $newName;
-  }
-
-  /**
-   * Get the description for the Table
-   */
-  public function getDescription()
-  {
-    return $this->description;
-  }
-
-  /**
-   * Set the description for the Table
-   *
-   * @param      newDescription description for the Table
-   */
-  public function setDescription($newDescription)
-  {
-    $this->description = $newDescription;
-  }
-
-  /**
-   * Get name to use in PHP sources
-   * @return     string
-   */
-  public function getPhpName()
-  {
-    if ($this->phpName === null) {
-      $inputs = array();
-      $inputs[] = $this->name;
-      $inputs[] = $this->phpNamingMethod;
-      try {
-        $this->phpName = NameFactory::generateName(NameFactory::PHP_GENERATOR, $inputs);
-      } catch (EngineException $e) {
-        print $e->getMessage() . "\n";
-        print $e->getTraceAsString();
-      }
-    }
-    return $this->phpName;
-  }
-
-  /**
-   * Set name to use in PHP sources
-   * @param      string $phpName
-   */
-  public function setPhpName($phpName)
-  {
-    $this->phpName = $phpName;
-  }
-
-  /**
-   * Get the method for generating pk's
-   * [HL] changing behavior so that Database default
-   *        method is returned if no method has been specified
-   *        for the table.
-   * @return     string
-   */
-  public function getIdMethod()
-  {
-    if ($this->idMethod === null) {
-      return IDMethod::NO_ID_METHOD;
-    } else {
-      return $this->idMethod;
-    }
-  }
-
-  /**
-   * Whether we allow to insert primary keys on tables with
-   * idMethod=native
-   *
-   * @return     boolean
-   */
-  public function isAllowPkInsert()
-  {
-    return $this->allowPkInsert;
-  }
-
-
-  /**
-   * Set the method for generating pk's
-   */
-  public function setIdMethod($idMethod)
-  {
-    $this->idMethod = $idMethod;
-  }
-
-  /**
-   * Skip generating sql for this table (in the event it should
-   * not be created from scratch).
-   * @return     boolean Value of skipSql.
-   */
-  public function isSkipSql()
-  {
-    return ($this->skipSql || $this->isAlias() || $this->isForReferenceOnly());
-  }
-
-  /**
-   * Is table read-only, in which case only accessors (and relationship setters)
-   * will be created.
-   * @return     boolan Value of readOnly.
-   */
-  public function isReadOnly()
-  {
-    return $this->readOnly;
-  }
-
-  /**
-   * Set whether this table should have its creation sql generated.
-   * @param      boolean $v Value to assign to skipSql.
-   */
-  public function setSkipSql($v)
-  {
-    $this->skipSql = $v;
-  }
-
-  /**
-   * Whether to force object to reload on INSERT.
-   * @return     boolean
-   */
-  public function isReloadOnInsert()
-  {
-    return $this->reloadOnInsert;
-  }
-
-  /**
-   * Whether to force object to reload on UPDATE.
-   * @return     boolean
-   */
-  public function isReloadOnUpdate()
-  {
-    return $this->reloadOnUpdate;
-  }
-
-  /**
-   * PhpName of om object this entry references.
-   * @return     value of external.
-   */
-  public function getAlias()
-  {
-    return $this->alias;
-  }
-
-  /**
-   * Is this table specified in the schema or is there just
-   * a foreign key reference to it.
-   * @return     value of external.
-   */
-  public function isAlias()
-  {
-    return ($this->alias !== null);
-  }
-
-  /**
-   * Set whether this table specified in the schema or is there just
-   * a foreign key reference to it.
-   * @param      v  Value to assign to alias.
-   */
-  public function setAlias($v)
-  {
-    $this->alias = $v;
-  }
-
-
-  /**
-   * Interface which objects for this table will implement
-   * @return     value of interface.
-   */
-  public function getInterface()
-  {
-    return $this->enterface;
-  }
-
-  /**
-   * Interface which objects for this table will implement
-   * @param      v  Value to assign to interface.
-   */
-  public function setInterface($v)
-  {
-    $this->enterface = $v;
-  }
-
-  /**
-   * When a table is abstract, it marks the business object class that is
-   * generated as being abstract. If you have a table called "FOO", then the
-   * Foo BO will be <code>public abstract class Foo</code>
-   * This helps support class hierarchies
-   *
-   * @return     value of abstractValue.
-   */
-  public function isAbstract()
-  {
-    return $this->abstractValue;
-  }
-
-  /**
-   * When a table is abstract, it marks the business object
-   * class that is generated as being abstract. If you have a
-   * table called "FOO", then the Foo BO will be
-   * <code>public abstract class Foo</code>
-   * This helps support class hierarchies
-   *
-   * @param      v  Value to assign to abstractValue.
-   */
-  public function setAbstract($v)
-  {
-    $this->abstractValue = (boolean) $v;
-  }
-
-  /**
-   * Get the value of package.
-   * @return     value of package.
-   */
-  public function getPackage()
-  {
-    return $this->pkg;
-  }
-
-  /**
-   * Set the value of package.
-   * @param      v  Value to assign to package.
-   */
-  public function setPackage($v)
-  {
-    $this->pkg = $v;
-  }
-
-  /**
-   * Returns an Array containing all the columns in the table
-   * @return     array Column[]
-   */
-  public function getColumns()
-  {
-    return $this->columnList;
-  }
-
-  /**
-   * Utility method to get the number of columns in this table
-   */
-  public function getNumColumns()
-  {
-    return count($this->columnList);
-  }
-
-  /**
-   * Utility method to get the number of columns in this table
-   */
-  public function getNumLazyLoadColumns()
-  {
-    $count = 0;
-    foreach ($this->columnList as $col) {
-      if ($col->isLazyLoad()) {
-        $count++;
-      }
-    }
-    return $count;
-  }
-
-  /**
-   * Returns an Array containing all the validators in the table
-   * @return     array Validator[]
-   */
-  public function getValidators()
-  {
-    return $this->validatorList;
-  }
-
-  /**
-   * Returns an Array containing all the FKs in the table.
-   * @return     array ForeignKey[]
-   */
-  public function getForeignKeys()
-  {
-    return $this->foreignKeys;
-  }
-
-  /**
-   * Returns a Collection of parameters relevant for the chosen
-   * id generation method.
-   */
-  public function getIdMethodParameters()
-  {
-    return $this->idMethodParameters;
-  }
-
-  /**
-   * Returns an Array containing all the FKs in the table
-   * @return     array Index[]
-   */
-  public function getIndices()
-  {
-    return $this->indices;
-  }
-
-  /**
-   * Returns an Array containing all the UKs in the table
-   * @return     array Unique[]
-   */
-  public function getUnices()
-  {
-    return $this->unices;
-  }
-
-  /**
-   * Returns a specified column.
-   * @return     Column Return a Column object or null if it does not exist.
-   */
-  public function getColumn($name)
-  {
-    return @$this->columnsByName[$name];
-  }
-
-  /**
-   * Returns a specified column.
-   * @return     Column Return a Column object or null if it does not exist.
-   */
-  public function getColumnByPhpName($phpName)
-  {
-    return @$this->columnsByPhpName[$phpName];
-  }
-
-  /**
-   * Get all the foreign keys from this table to the specufued tabke.
-   * @return     array ForeignKey[]
-   */
-  public function getForeignKeysReferencingTable($tablename)
-  {
-    $matches = array();
-    $keys = $this->getForeignKeys();
-    foreach ($keys as $fk) {
-      if ($fk->getForeignTableName() === $tablename) {
-        $matches[] = $fk;
-      }
-    }
-    return $matches;
-  }
-
-  /**
-   * Return the foreign keys that includes col in it's list of local columns.
-   * Eg. Foreign key (a,b,c) refrences tbl(x,y,z) will be returned of col is either a,b or c.
-   * @param      string $col
-   * @return     array ForeignKey[] or null if there is no FK for specified column.
-   */
-  public function getColumnForeignKeys($colname)
-  {
-    $matches = array();
-    foreach ($this->foreignKeys as $fk) {
-      if (in_array($colname, $fk->getLocalColumns())) {
-        $matches[] = $fk;
-      }
-    }
-    return $matches;
-  }
-
-  /**
-   * Returns true if the table contains a specified column
-   * @param      mixed $col Column or column name.
-   */
-  public function containsColumn($col)
-  {
-    if ($col instanceof Column) {
-      return in_array($col, $this->columnList);
-    } else {
-      return ($this->getColumn($col) !== null);
-    }
-  }
-
-  /**
-   * Set the database that contains this table.
-   *
-   * @param      Database $db
-   */
-  public function setDatabase(Database $db)
-  {
-    $this->database = $db;
-  }
-
-  /**
-   * Get the database that contains this table.
-   *
-   * @return     Database
-   */
-  public function getDatabase()
-  {
-    return $this->database;
-  }
-
-  /**
-   * Flag to determine if code/sql gets created for this table.
-   * Table will be skipped, if return true.
-   * @return     boolean
-   */
-  public function isForReferenceOnly()
-  {
-    return $this->forReferenceOnly;
-  }
-
-  /**
-   * Flag to determine if code/sql gets created for this table.
-   * Table will be skipped, if set to true.
-   * @param      boolean $v
-   */
-  public function setForReferenceOnly($v)
-  {
-    $this->forReferenceOnly = (boolean) $v;
-  }
-
-  /**
-   * Flag to determine if tree node class should be generated for this table.
-   * @return     valur of treeMode
-   */
-  public function treeMode()
-  {
-    return $this->treeMode;
-  }
-
-  /**
-   * Flag to determine if tree node class should be generated for this table.
-   * @param      v  Value to assign to treeMode.
-   */
-  public function setTreeMode($v)
-  {
-    $this->treeMode = $v;
-  }
-
-  /**
-   * Appends XML nodes to passed-in DOMNode.
-   *
-   * @param      DOMNode $node
-   */
-  public function appendXml(DOMNode $node)
-  {
-    $doc = ($node instanceof DOMDocument) ? $node : $node->ownerDocument;
-
-    $tableNode = $node->appendChild($doc->createElement('table'));
-    $tableNode->setAttribute('name', $this->getName());
-
-    if ($this->phpName !== null) {
-      $tableNode->setAttribute('phpName', $this->phpName);
-    }
-
-    if ($this->idMethod !== null) {
-      $tableNode->setAttribute('idMethod', $this->idMethod);
-    }
-
-    if ($this->skipSql !== null) {
-      $tableNode->setAttribute('idMethod', var_export($this->skipSql, true));
-    }
-
-    if ($this->readOnly !== null) {
-      $tableNode->setAttribute('readOnly', var_export($this->readOnly, true));
-    }
-
-    if ($this->treeMode !== null) {
-      $tableNode->setAttribute('treeMode', $this->treeMode);
-    }
-
-    if ($this->reloadOnInsert !== null) {
-      $tableNode->setAttribute('reloadOnInsert', var_export($this->reloadOnInsert, true));
-    }
-
-    if ($this->reloadOnUpdate !== null) {
-      $tableNode->setAttribute('reloadOnUpdate', var_export($this->reloadOnUpdate, true));
-    }
-
-    if ($this->forReferenceOnly !== null) {
-      $tableNode->setAttribute('forReferenceOnly', var_export($this->forReferenceOnly, true));
-    }
-
-    if ($this->abstractValue !== null) {
-      $tableNode->setAttribute('abstract', var_export($this->abstractValue, true));
-    }
-
-    if ($this->enterface !== null) {
-      $tableNode->setAttribute('interface', $this->enterface);
-    }
-
-    if ($this->description !== null) {
-      $tableNode->setAttribute('description', $this->description);
-    }
-
-    if ($this->baseClass !== null) {
-      $tableNode->setAttribute('baseClass', $this->baseClass);
-    }
-
-    if ($this->basePeer !== null) {
-      $tableNode->setAttribute('basePeer', $this->basePeer);
-    }
-
-    foreach ($this->columnList as $col) {
-      $col->appendXml($tableNode);
-    }
-
-    foreach ($this->validatorList as $validator) {
-      $validator->appendXml($tableNode);
-    }
-
-    foreach ($this->foreignKeys as $fk) {
-      $fk->appendXml($tableNode);
-    }
-
-    foreach ($this->idMethodParameters as $param) {
-      $param->appendXml($tableNode);
-    }
-
-    foreach ($this->indices as $index) {
-      $index->appendXml($tableNode);
-    }
-
-    foreach ($this->unices as $unique) {
-      $unique->appendXml($tableNode);
-    }
-
-    foreach ($this->vendorInfos as $vi) {
-      $vi->appendXml($tableNode);
-    }
-
-  }
-
-  /**
-   * Returns the collection of Columns which make up the single primary
-   * key for this table.
-   *
-   * @return     array Column[] A list of the primary key parts.
-   */
-  public function getPrimaryKey()
-  {
-    $pk = array();
-    foreach ($this->columnList as $col) {
-      if ($col->isPrimaryKey()) {
-        $pk[] = $col;
-      }
-    }
-    return $pk;
-  }
-
-  /**
-   * Determine whether this table has a primary key.
-   *
-   * @return     boolean Whether this table has any primary key parts.
-   */
-  public function hasPrimaryKey()
-  {
-    return (count($this->getPrimaryKey()) > 0);
-  }
-
-  /**
-   * Determine whether this table has any auto-increment primary key(s).
-   *
-   * @return     boolean Whether this table has a non-"none" id method and has a primary key column that is auto-increment.
-   */
-  public function hasAutoIncrementPrimaryKey()
-  {
-    if ($this->getIdMethod() != IDMethod::NO_ID_METHOD) {
-      $pks =$this->getPrimaryKey();
-      foreach ($pks as $pk) {
-        if ($pk->isAutoIncrement()) {
-          return true;
-        }
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Gets the auto increment PK
-   *
-   * @return    Column if any auto increment PK column
-   */
-  public function getAutoIncrementPrimaryKey()
-  {
-    if ($this->getIdMethod() != IDMethod::NO_ID_METHOD) {
-      $pks =$this->getPrimaryKey();
-      foreach ($pks as $pk) {
-        if ($pk->isAutoIncrement()) {
-          return $pk;
-        }
-      }
-    }
-    return null;
-  }
-
-  /**
-   * Returns all parts of the primary key, separated by commas.
-   *
-   * @return     A CSV list of primary key parts.
-   * @deprecated Use the DDLBuilder->getColumnList() with the #getPrimaryKey() method.
-   */
-  public function printPrimaryKey()
-  {
-    return $this->printList($this->columnList);
-  }
-
-  /**
-   * Returns the elements of the list, separated by commas.
-   * @param      array $list
-   * @return     A CSV list.
-   * @deprecated Use the DDLBuilder->getColumnList() with the #getPrimaryKey() method.
-   */
-  private function printList($list){
-    $result = "";
-    $comma = 0;
-    for ($i=0,$_i=count($list); $i < $_i; $i++) {
-      $col = $list[$i];
-      if ($col->isPrimaryKey()) {
-        $result .= ($comma++ ? ',' : '') . $this->getDatabase()->getPlatform()->quoteIdentifier($col->getName());
-      }
-    }
-    return $result;
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Unique.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Unique.php
deleted file mode 100644
index 4ef0fe7a4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Unique.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/*
- *  $Id: Unique.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-include_once 'propel/engine/database/model/Index.php';
-
-/**
- * Information about unique columns of a table.  This class assumes
- * that in the underlying RDBMS, unique constraints and unique indices
- * are roughly equivalent.  For example, adding a unique constraint to
- * a column also creates an index on that column (this is known to be
- * true for MySQL and Oracle).
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Jason van Zyl <jvanzyl@apache.org> (Torque)
- * @author     Daniel Rall <dlr@collab.net> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class Unique extends Index {
-
-	/**
-	 * Returns <code>true</code>.
-	 */
-	public function isUnique()
-	{
-		return true;
-	}
-
-	/**
-	 * @see        XMLElement::appendXml(DOMNode)
-	 */
-	public function appendXml(DOMNode $node)
-	{
-		$doc = ($node instanceof DOMDocument) ? $node : $node->ownerDocument;
-
-		$uniqueNode = $node->appendChild($doc->createElement('unique'));
-		$uniqueNode->setAttribute('name', $this->getName());
-		$columns = $this->getColumns();
-		foreach ($this->getColumns() as $colname) {
-			$uniqueColNode = $uniqueNode->appendChild($doc->createElement('unique-column'));
-			$uniqueColNode->setAttribute('name', $colname);
-		}
-
-		foreach ($this->vendorInfos as $vi) {
-			$vi->appendXml($uniqueNode);
-		}
-	}
-
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Validator.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Validator.php
deleted file mode 100644
index 5cd34e83f..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/Validator.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-/*
- *  $Id: Validator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/model/XMLElement.php';
-include_once 'propel/engine/EngineException.php';
-include_once 'propel/engine/database/model/PropelTypes.php';
-include_once 'propel/engine/database/model/Rule.php';
-
-/**
- * Validator.
- *
- * @author     Michael Aichler <aichler@mediacluster.de> (Propel)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class Validator extends XMLElement {
-
-	const TRANSLATE_NONE = "none";
-	const TRANSLATE_GETTEXT = "gettext";
-
-	/**
-	 * The column this validator applies to.
-	 *
-	 * @var        Column
-	 */
-	private $column;
-
-	/**
-	 * The rules for the validation.
-	 *
-	 * @var        array Rule[]
-	 */
-	private $ruleList = array();
-
-	/**
-	 * The translation mode.
-	 *
-	 * @var        string
-	 */
-	private $translate;
-
-	/**
-	 * Parent table.
-	 *
-	 * @var        Table
-	 */
-	private $table;
-
-	/**
-	 * Sets up the Validator object based on the attributes that were passed to loadFromXML().
-	 * @see        parent::loadFromXML()
-	 */
-	protected function setupObject()
-	{
-		$this->column = $this->getTable()->getColumn($this->getAttribute("column"));
-		$this->translate = $this->getAttribute("translate", $this->getTable()->getDatabase()->getDefaultTranslateMethod());;
-	}
-
-	/**
-	 * Add a Rule to this validator.
-	 * Supports two signatures:
-	 * - addRule(Rule $rule)
-	 * - addRule(array $attribs)
-	 * @param      mixed $data Rule object or XML attribs (array) from <rule/> element.
-	 * @return     Rule The added Rule.
-	 */
-	public function addRule($data)
-	{
-		if ($data instanceof Rule) {
-			$rule = $data; // alias
-			$rule->setValidator($this);
-			$this->ruleList[] = $rule;
-			return $rule;
-		}
-		else {
-			$rule = new Rule();
-			$rule->setValidator($this);
-			$rule->loadFromXML($data);
-			return $this->addRule($rule); // call self w/ different param
-		}
-	}
-
-	/**
-	 * Gets an array of all added rules for this validator.
-	 * @return     array Rule[]
-	 */
-	public function getRules()
-	{
-		return $this->ruleList;
-	}
-
-	/**
-	 * Gets the name of the column that this Validator applies to.
-	 * @return     string
-	 */
-	public function getColumnName()
-	{
-		return $this->column->getName();
-	}
-
-	/**
-	 * Sets the Column object that this validator applies to.
-	 * @param      Column $column
-	 * @see        Table::addValidator()
-	 */
-	public function setColumn(Column $column)
-	{
-		$this->column = $column;
-	}
-
-	/**
-	 * Gets the Column object that this validator applies to.
-	 * @return     Column
-	 */
-	public function getColumn()
-	{
-		return $this->column;
-	}
-
-	/**
-	 * Set the owning Table.
-	 * @param      Table $table
-	 */
-	public function setTable(Table $table)
-	{
-		$this->table = $table;
-	}
-
-	/**
-	 * Get the owning Table.
-	 * @return     Table
-	 */
-	public function getTable()
-	{
-		return $this->table;
-	}
-
-	/**
-	 * Set the translation mode to use for the message.
-	 * Currently only "gettext" and "none" are supported.  The default is "none".
-	 * @param      string $method Translation method ("gettext", "none").
-	 */
-	public function setTranslate($method)
-	{
-		$this->translate = $method;
-	}
-
-	/**
-	 * Get the translation mode to use for the message.
-	 * Currently only "gettext" and "none" are supported.  The default is "none".
-	 * @return     string Translation method ("gettext", "none").
-	 */
-	public function getTranslate()
-	{
-		return $this->translate;
-	}
-
-	/**
-	 * @see        XMLElement::appendXml(DOMNode)
-	 */
-	public function appendXml(DOMNode $node)
-	{
-		$doc = ($node instanceof DOMDocument) ? $node : $node->ownerDocument;
-
-		$valNode = $node->appendChild($doc->createElement('validator'));
-		$valNode->setAttribute('column', $this->getColumnName());
-
-		if ($this->translate !== null) {
-			$valNode->setAttribute('translate', $this->translate);
-		}
-
-		foreach ($this->ruleList as $rule) {
-			$rule->appendXml($valNode);
-		}
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/VendorInfo.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/VendorInfo.php
deleted file mode 100644
index f163c64d6..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/VendorInfo.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-/*
- *  $Id: VendorInfo.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/model/XMLElement.php';
-include_once 'propel/engine/EngineException.php';
-
-/**
- * Object to hold vendor-specific info.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-class VendorInfo extends XMLElement {
-
-	/**
-	 * The vendor RDBMS type.
-	 *
-	 * @var        string
-	 */
-	private $type;
-
-	/**
-	 * Vendor parameters.
-	 *
-	 * @var        array
-	 */
-	private $parameters = array();
-
-	/**
-	 * Creates a new VendorInfo instance.
-	 *
-	 * @param      string $type RDBMS type (optional)
-	 */
-	public function __construct($type = null)
-	{
-		$this->type = $type;
-	}
-
-	/**
-	 * Sets up this object based on the attributes that were passed to loadFromXML().
-	 * @see        parent::loadFromXML()
-	 */
-	protected function setupObject()
-	{
-		$this->type = $this->getAttribute("type");
-	}
-
-	/**
-	 * Set RDBMS type for this vendor-specific info.
-	 *
-	 * @param      string $v
-	 */
-	public function setType($v)
-	{
-		$this->type = $v;
-	}
-
-	/**
-	 * Get RDBMS type for this vendor-specific info.
-	 *
-	 * @return     string
-	 */
-	public function getType()
-	{
-		return $this->type;
-	}
-
-	/**
-	 * Adds a new vendor parameter to this object.
-	 * @param      array $attrib Attributes from XML.
-	 */
-	public function addParameter($attrib)
-	{
-		$name = $attrib["name"];
-		$this->parameters[$name] = $attrib["value"];
-	}
-
-	/**
-	 * Sets parameter value.
-	 *
-	 * @param      string $name
-	 * @param      mixed $value The value for the parameter.
-	 */
-	public function setParameter($name, $value)
-	{
-		$this->parameters[$name] = $value;
-	}
-
-	/**
-	 * Gets parameter value.
-	 *
-	 * @param      string $name
-	 * @return     mixed Paramter value.
-	 */
-	public function getParameter($name)
-	{
-		if (isset($this->parameters[$name])) {
-			return $this->parameters[$name];
-		}
-		return null; // just to be explicit
-	}
-
-	/**
-	 * Whether parameter exists.
-	 *
-	 * @param      string $name
-	 */
-	public function hasParameter($name)
-	{
-		return isset($this->parameters[$name]);
-	}
-
-	/**
-	 * Sets assoc array of parameters for venfor specific info.
-	 *
-	 * @param      array $params Paramter data.
-	 */
-	public function setParameters(array $params = array())
-	{
-		$this->parameters = $params;
-	}
-
-	/**
-	 * Gets assoc array of parameters for venfor specific info.
-	 *
-	 * @return     array
-	 */
-	public function getParameters()
-	{
-		return $this->parameters;
-	}
-
-	/**
-	 * Gets a new merged VendorInfo object.
-	 * @param      VendorInfo $info
-	 * @return     VendorInfo new object with merged parameters
-	 */
-	public function getMergedVendorInfo(VendorInfo $merge)
-	{
-		$newParams = array_merge($this->getParameters(), $merge->getParameters());
-		$newInfo = new VendorInfo($this->getType());
-		$newInfo->setParameters($newParams);
-		return $newInfo;
-	}
-
-	/**
-	 * @see        XMLElement::appendXml(DOMNode)
-	 */
-	public function appendXml(DOMNode $node)
-	{
-		$doc = ($node instanceof DOMDocument) ? $node : $node->ownerDocument;
-
-		$vendorNode = $node->appendChild($doc->createElement("vendor"));
-		$vendorNode->setAttribute("type", $this->getType());
-
-		foreach ($this->parameters as $key => $value) {
-			$parameterNode = $doc->createElement("parameter");
-			$parameterNode->setAttribute("name", $key);
-			$parameterNode->setAttribute("value", $value);
-			$vendorNode->appendChild($parameterNode);
-		}
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/XMLElement.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/XMLElement.php
deleted file mode 100644
index 7e57128dc..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/model/XMLElement.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-/*
- *  $Id: XMLElement.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-include_once 'propel/engine/database/model/VendorInfo.php';
-
-/**
- * An abstract class for elements represented by XML tags (e.g. Column, Table).
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.model
- */
-abstract class XMLElement {
-
-	/**
-	 * The name => value attributes from XML.
-	 *
-	 * @var        array
-	 */
-	protected $attributes = array();
-
-	/**
-	 * Any associated vendor-specific information objects.
-	 *
-	 * @var        array VendorInfo[]
-	 */
-	protected $vendorInfos = array();
-
-	/**
-	 * Replaces the old loadFromXML() so that we can use loadFromXML() to load the attribs into the class.
-	 */
-	abstract protected function setupObject();
-
-	/**
-	 * This is the entry point method for loading data from XML.
-	 * It calls a setupObject() method that must be implemented by the child class.
-	 * @param      array $attributes The attributes for the XML tag.
-	 */
-	public function loadFromXML($attributes)
-	{
-		$this->attributes = array_change_key_case($attributes, CASE_LOWER);
-		$this->setupObject();
-	}
-
-	/**
-	 * Returns the assoc array of attributes.
-	 * All attribute names (keys) are lowercase.
-	 * @return     array
-	 */
-	public function getAttributes()
-	{
-		return $this->attributes;
-	}
-
-	/**
-	 * Gets a particular attribute by [case-insensitive] name.
-	 * If attribute is not set then the $defaultValue is returned.
-	 * @param      string $name The [case-insensitive] name of the attribute to lookup.
-	 * @param      mixed $defaultValue The default value to use in case the attribute is not set.
-	 * @return     mixed The value of the attribute or $defaultValue if not set.
-	 */
-	public function getAttribute($name, $defaultValue = null)
-	{
-		$name = strtolower($name);
-		if (isset($this->attributes[$name])) {
-			return $this->attributes[$name];
-		} else {
-			return $defaultValue;
-		}
-	}
-
-	/**
-	 * Converts value specified in XML to a boolean value.
-	 * This is to support the default value when used w/ a boolean column.
-	 * @return     value
-	 */
-	protected function booleanValue($val)
-	{
-		if (is_numeric($val)) {
-			return (bool) $val;
-		} else {
-			return (in_array(strtolower($val), array('true', 't', 'y', 'yes'), true) ? true : false);
-		}
-	}
-
-	/**
-	 * Appends DOM elements to represent this object in XML.
-	 * @param      DOMNode $node
-	 */
-	abstract public function appendXml(DOMNode $node);
-
-	/**
-	 * Sets an associated VendorInfo object.
-	 *
-	 * @param      mixed $data VendorInfo object or XML attrib data (array)
-	 * @return     VendorInfo
-	 */
-	public function addVendorInfo($data)
-	{
-		if ($data instanceof VendorInfo) {
-			$vi = $data;
-			$this->vendorInfos[$vi->getType()] = $vi;
-			return $vi;
-		} else {
-			$vi = new VendorInfo();
-			$vi->loadFromXML($data);
-			return $this->addVendorInfo($vi); // call self w/ different param
-		}
-	}
-
-	/**
-	 * Gets the any associated VendorInfo object.
-	 * @return     VendorInfo
-	 */
-	public function getVendorInfoForType($type)
-	{
-		if (isset($this->vendorInfos[$type])) {
-			return $this->vendorInfos[$type];
-		} else {
-			// return an empty object
-			return new VendorInfo();
-		}
-	}
-
-  /**
-   * Find the best class name for a given behavior
-   * Looks in build.properties for path like propel.behavior.[bname].class
-   * If not found, tries to autoload [Bname]Behavior
-   * If no success, returns 'Behavior'
-   * 
-   * @param  string $bname behavior name, e.g. 'timestampable'
-   * @return string        behavior class name, e.g. 'TimestampableBehavior'
-   */
-  public function getConfiguredBehavior($bname)
-  {
-    if ($config = $this->getGeneratorConfig()) {
-      if ($class = $config->getConfiguredBehavior($bname)) {
-        return $class;
-      }
-    }
-    // first fallback: maybe the behavior is loaded or autoloaded
-    $gen = new PhpNameGenerator();
-    if(class_exists($class = $gen->generateName($bname, PhpNameGenerator::CONV_METHOD_PHPNAME) . 'Behavior')) {
-      return $class;
-    }
-    // second fallback: use parent behavior class (mostly for unit tests)
-    return 'Behavior';
-  }
-
-	/**
-	 * String representation of the current object.
-	 *
-	 * This is an xml representation with the XML declaration removed.
-	 *
-	 * @see        appendXml()
-	 */
-	public function toString()
-	{
-		$doc = new DOMDocument('1.0');
-		$doc->formatOutput = true;
-		$this->appendXml($doc);
-		$xmlstr = $doc->saveXML();
-		return trim(preg_replace('/<\?xml.*?\?>/', '', $xmlstr));
-	}
-	
-	/**
-	 * Magic string method
-	 * @see toString()
-	 */
-	public function __toString()
-	{
-	  return $this->toString();
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/BaseSchemaParser.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/BaseSchemaParser.php
deleted file mode 100644
index 81ca63741..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/BaseSchemaParser.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/*
- *  $Id: BaseSchemaParser.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/reverse/SchemaParser.php';
-
-/**
- * Base class for reverse engineering a database schema.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.reverse
- */
-abstract class BaseSchemaParser implements SchemaParser {
-
-	/**
-	 * The database connection.
-	 * @var        PDO
-	 */
-	protected $dbh;
-
-	/**
-	 * Stack of warnings.
-	 *
-	 * @var        array string[]
-	 */
-	protected $warnings = array();
-
-	/**
-	 * GeneratorConfig object holding build properties.
-	 *
-	 * @var        GeneratorConfig
-	 */
-	private $generatorConfig;
-
-	/**
-	 * Map native DB types to Propel types.
-	 * (Override in subclasses.)
-	 * @var        array
-	 */
-	protected $nativeToPropelTypeMap;
-
-	/**
-	 * Map to hold reverse type mapping (initialized on-demand).
-	 *
-	 * @var        array
-	 */
-	protected $reverseTypeMap;
-
-	/**
-	 * @param      PDO $dbh Optional database connection
-	 */
-	public function __construct(PDO $dbh = null)
-	{
-		if ($dbh) $this->setConnection($dbh);
-	}
-
-	/**
-	 * Sets the database connection.
-	 *
-	 * @param      PDO $dbh
-	 */
-	public function setConnection(PDO $dbh)
-	{
-		$this->dbh = $dbh;
-	}
-
-	/**
-	 * Gets the database connection.
-	 * @return     PDO
-	 */
-	public function getConnection()
-	{
-		return $this->dbh;
-	}
-
-	/**
-	 * Pushes a message onto the stack of warnings.
-	 *
-	 * @param      string $msg The warning message.
-	 */
-	protected function warn($msg)
-	{
-		$this->warnings[] = $msg;
-	}
-
-	/**
-	 * Gets array of warning messages.
-	 *
-	 * @return     array string[]
-	 */
-	public function getWarnings()
-	{
-		return $this->warnings;
-	}
-
-	/**
-	 * Sets the GeneratorConfig to use in the parsing.
-	 *
-	 * @param      GeneratorConfig $config
-	 */
-	public function setGeneratorConfig(GeneratorConfig $config)
-	{
-		$this->generatorConfig = $config;
-	}
-
-	/**
-	 * Gets the GeneratorConfig option.
-	 *
-	 * @return     GeneratorConfig
-	 */
-	public function getGeneratorConfig()
-	{
-		return $this->generatorConfig;
-	}
-
-	/**
-	 * Gets a specific propel (renamed) property from the build.
-	 *
-	 * @param      string $name
-	 * @return     mixed
-	 */
-	public function getBuildProperty($name)
-	{
-		if ($this->generatorConfig !== null) {
-			return $this->generatorConfig->getBuildProperty($name);
-		}
-		return null;
-	}
-
-	/**
-	 * Gets a type mapping from native type to Propel type.
-	 *
-	 * @return     array The mapped Propel type.
-	 */
-	abstract protected function getTypeMapping();
-
-	/**
-	 * Gets a mapped Propel type for specified native type.
-	 *
-	 * @param      string $nativeType
-	 * @return     string The mapped Propel type.
-	 */
-	protected function getMappedPropelType($nativeType)
-	{
-		if ($this->nativeToPropelTypeMap === null) {
-			$this->nativeToPropelTypeMap = $this->getTypeMapping();
-		}
-		if (isset($this->nativeToPropelTypeMap[$nativeType])) {
-			return $this->nativeToPropelTypeMap[$nativeType];
-		}
-		return null;
-	}
-
-	/**
-	 * Give a best guess at the native type.
-	 *
-	 * @param      string $propelType
-	 * @return     string The native SQL type that best matches the specified Propel type.
-	 */
-	protected function getMappedNativeType($propelType)
-	{
-		if ($this->reverseTypeMap === null) {
-			$this->reverseTypeMap = array_flip($this->getTypeMapping());
-		}
-		return isset($this->reverseTypeMap[$propelType]) ? $this->reverseTypeMap[$propelType] : null;
-	}
-
-	/**
-	 * Gets a new VendorInfo object for this platform with specified params.
-	 *
-	 * @param      array $params
-	 */
-	protected function getNewVendorInfoObject(array $params)
-	{
-		$type = $this->getGeneratorConfig()->getConfiguredPlatform()->getDatabaseType();
-		$vi = new VendorInfo($type);
-		$vi->setParameters($params);
-		return $vi;
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/SchemaParser.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/SchemaParser.php
deleted file mode 100644
index 6f5fbfe4a..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/SchemaParser.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/*
- *  $Id: SchemaParser.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * Interface for reverse engineering schema parsers.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.reverse
- */
-interface SchemaParser {
-
-	/**
-	 * Gets the database connection.
-	 * @return     PDO
-	 */
-	public function getConnection();
-
-	/**
-	 * Sets the database connection.
-	 *
-	 * @param      PDO $dbh
-	 */
-	public function setConnection(PDO $dbh);
-
-	/**
-	 * Sets the GeneratorConfig to use in the parsing.
-	 *
-	 * @param      GeneratorConfig $config
-	 */
-	public function setGeneratorConfig(GeneratorConfig $config);
-
-	/**
-	 * Gets a specific propel (renamed) property from the build.
-	 *
-	 * @param      string $name
-	 * @return     mixed
-	 */
-	public function getBuildProperty($name);
-
-	/**
-	 * Gets array of warning messages.
-	 * @return     array string[]
-	 */
-	public function getWarnings();
-
-	/**
-	 * Parse the schema and populate passed-in Database model object.
-	 *
-	 * @param      Database $database
-	 */
-	public function parse(Database $database);
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/mssql/MssqlSchemaParser.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/mssql/MssqlSchemaParser.php
deleted file mode 100644
index 9cab29aa3..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/mssql/MssqlSchemaParser.php
+++ /dev/null
@@ -1,248 +0,0 @@
-<?php
-/*
- *  $Id: MssqlSchemaParser.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/reverse/BaseSchemaParser.php';
-
-/**
- * Microsoft SQL Server database schema parser.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.reverse.mssql
- */
-class MssqlSchemaParser extends BaseSchemaParser {
-
-	/**
-	 * Map MSSQL native types to Propel types.
-	 * @var        array
-	 */
-	private static $mssqlTypeMap = array(
-		"binary" => CreoleTypes::BINARY,
-		"bit" => PropelTypes::BOOLEAN,
-		"char" => PropelTypes::CHAR,
-		"datetime" => PropelTypes::TIMESTAMP,
-		"decimal() identity"  => PropelTypes::DECIMAL,
-		"decimal"  => PropelTypes::DECIMAL,
-		"image" => PropelTypes::LONGVARBINARY,
-		"int" => PropelTypes::INTEGER,
-		"int identity" => PropelTypes::INTEGER,
-		"integer" => PropelTypes::INTEGER,
-		"money" => PropelTypes::DECIMAL,
-		"nchar" => PropelTypes::CHAR,
-		"ntext" => PropelTypes::LONGVARCHAR,
-		"numeric() identity" => PropelTypes::NUMERIC,
-		"numeric" => PropelTypes::NUMERIC,
-		"nvarchar" => PropelTypes::VARCHAR,
-		"real" => PropelTypes::REAL,
-		"float" => PropelTypes::FLOAT,
-		"smalldatetime" => PropelTypes::TIMESTAMP,
-		"smallint" => PropelTypes::SMALLINT,
-		"smallint identity" => PropelTypes::SMALLINT,
-		"smallmoney" => PropelTypes::DECIMAL,
-		"sysname" => PropelTypes::VARCHAR,
-		"text" => PropelTypes::LONGVARCHAR,
-		"timestamp" => PropelTypes::BINARY,
-		"tinyint identity" => PropelTypes::TINYINT,
-		"tinyint" => PropelTypes::TINYINT,
-		"uniqueidentifier" => PropelTypes::CHAR,
-		"varbinary" => PropelTypes::VARBINARY,
-		"varchar" => PropelTypes::VARCHAR,
-		"uniqueidentifier" => PropelTypes::CHAR,
-	// SQL Server 2000 only
-		"bigint identity" => PropelTypes::BIGINT,
-		"bigint" => PropelTypes::BIGINT,
-		"sql_variant" => PropelTypes::VARCHAR,
-	);
-
-	/**
-	 * Gets a type mapping from native types to Propel types
-	 *
-	 * @return     array
-	 */
-	protected function getTypeMapping()
-	{
-		return self::$mssqlTypeMap;
-	}
-
-	/**
-	 *
-	 */
-	public function parse(Database $database)
-	{
-		$stmt = $this->dbh->query("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_TYPE = 'BASE TABLE' AND TABLE_NAME <> 'dtproperties'");
-
-		// First load the tables (important that this happen before filling out details of tables)
-		$tables = array();
-		while ($row = $stmt->fetch(PDO::FETCH_NUM)) {
-			$name = $row[0];
-			$table = new Table($name);
-			$database->addTable($table);
-			$tables[] = $table;
-		}
-
-		// Now populate only columns.
-		foreach ($tables as $table) {
-			$this->addColumns($table);
-		}
-
-		// Now add indexes and constraints.
-		foreach ($tables as $table) {
-			$this->addForeignKeys($table);
-			$this->addIndexes($table);
-			$this->addPrimaryKey($table);
-		}
-
-	}
-
-
-	/**
-	 * Adds Columns to the specified table.
-	 *
-	 * @param      Table $table The Table model class to add columns to.
-	 */
-	protected function addColumns(Table $table)
-	{
-		$stmt = $this->dbh->query("sp_columns '" . $table->getName() . "'");
-
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			$name = $row['COLUMN_NAME'];
-			$type = $row['TYPE_NAME'];
-			$size = $row['LENGTH'];
-			$is_nullable = $row['NULLABLE'];
-			$default = $row['COLUMN_DEF'];
-			$precision = $row['PRECISION'];
-			$scale = $row['SCALE'];
-			$autoincrement = false;
-			if (strtolower($type) == "int identity") {
-				$autoincrement = true;
-			}
-
-			$propelType = $this->getMappedPropelType($type);
-			if (!$propelType) {
-				$propelType = Column::DEFAULT_TYPE;
-				$this->warn("Column [" . $table->getName() . "." . $name. "] has a column type (".$type.") that Propel does not support.");
-			}
-
-			$column = new Column($name);
-			$column->setTable($table);
-			$column->setDomainForType($propelType);
-			// We may want to provide an option to include this:
-			// $column->getDomain()->replaceSqlType($type);
-			$column->getDomain()->replaceSize($size);
-			$column->getDomain()->replaceScale($scale);
-			if ($default !== null) {
-				$column->getDomain()->setDefaultValue(new ColumnDefaultValue($default, ColumnDefaultValue::TYPE_VALUE));
-			}
-			$column->setAutoIncrement($autoincrement);
-			$column->setNotNull(!$is_nullable);
-
-			$table->addColumn($column);
-		}
-
-
-	} // addColumn()
-
-	/**
-	 * Load foreign keys for this table.
-	 */
-	protected function addForeignKeys(Table $table)
-	{
-		$database = $table->getDatabase();
-
-		$stmt = $this->dbh->query("SELECT ccu1.TABLE_NAME, ccu1.COLUMN_NAME, ccu2.TABLE_NAME AS FK_TABLE_NAME, ccu2.COLUMN_NAME AS FK_COLUMN_NAME
-									FROM INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE ccu1 INNER JOIN
-								      INFORMATION_SCHEMA.TABLE_CONSTRAINTS tc1 ON tc1.CONSTRAINT_NAME = ccu1.CONSTRAINT_NAME AND
-								      CONSTRAINT_TYPE = 'Foreign Key' INNER JOIN
-								      INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS rc1 ON rc1.CONSTRAINT_NAME = tc1.CONSTRAINT_NAME INNER JOIN
-								      INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE ccu2 ON ccu2.CONSTRAINT_NAME = rc1.UNIQUE_CONSTRAINT_NAME
-									WHERE (ccu1.table_name = '".$table->getName()."')");
-
-		$row = $stmt->fetch(PDO::FETCH_NUM);
-
-		$foreignKeys = array(); // local store to avoid duplicates
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			$lcol = $row['COLUMN_NAME'];
-			$ftbl = $row['FK_TABLE_NAME'];
-			$fcol = $row['FK_COLUMN_NAME'];
-
-
-			$foreignTable = $database->getTable($ftbl);
-			$foreignColumn = $foreignTable->getColumn($fcol);
-			$localColumn   = $table->getColumn($lcol);
-
-			if (!isset($foreignKeys[$name])) {
-				$fk = new ForeignKey($name);
-				$fk->setForeignTableName($foreignTable->getName());
-				//$fk->setOnDelete($fkactions['ON DELETE']);
-				//$fk->setOnUpdate($fkactions['ON UPDATE']);
-				$table->addForeignKey($fk);
-				$foreignKeys[$name] = $fk;
-			}
-			$foreignKeys[$name]->addReference($localColumn, $foreignColumn);
-		}
-
-	}
-
-	/**
-	 * Load indexes for this table
-	 */
-	protected function addIndexes(Table $table)
-	{
-		$stmt = $this->dbh->query("sp_indexes_rowset " . $table->getName());
-
-		$indexes = array();
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-			$colName = $row["COLUMN_NAME"];
-			$name = $row['INDEX_NAME'];
-
-			// FIXME -- Add UNIQUE support
-			if (!isset($indexes[$name])) {
-				$indexes[$name] = new Index($name);
-				$table->addIndex($indexes[$name]);
-			}
-
-			$indexes[$name]->addColumn($table->getColumn($colName));
-		}
-	}
-
-	/**
-	 * Loads the primary key for this table.
-	 */
-	protected function addPrimaryKey(Table $table)
-	{
-		$stmt = $this->dbh->query("SELECT COLUMN_NAME
-						FROM INFORMATION_SCHEMA.TABLE_CONSTRAINTS
-								INNER JOIN INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE ON
-					  INFORMATION_SCHEMA.TABLE_CONSTRAINTS.CONSTRAINT_NAME = INFORMATION_SCHEMA.CONSTRAINT_COLUMN_USAGE.constraint_name
-						WHERE     (INFORMATION_SCHEMA.TABLE_CONSTRAINTS.CONSTRAINT_TYPE = 'PRIMARY KEY') AND
-					  (INFORMATION_SCHEMA.TABLE_CONSTRAINTS.TABLE_NAME = '".$table->getName()."')");
-
-		// Loop through the returned results, grouping the same key_name together
-		// adding each column for that key.
-		while ($row = $stmt->fetch(PDO::FETCH_NUM)) {
-			$name = $row[0];
-			$table->getColumn($name)->setPrimaryKey(true);
-		}
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/mysql/MysqlSchemaParser.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/mysql/MysqlSchemaParser.php
deleted file mode 100644
index e7991b6a4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/mysql/MysqlSchemaParser.php
+++ /dev/null
@@ -1,337 +0,0 @@
-<?php
-/*
- *  $Id: MysqlSchemaParser.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/reverse/BaseSchemaParser.php';
-
-/**
- * Mysql database schema parser.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.reverse.mysql
- */
-class MysqlSchemaParser extends BaseSchemaParser {
-
-	/**
-	 * @var        boolean
-	 */
-	private $addVendorInfo = false;
-
-	/**
-	 * Map MySQL native types to Propel types.
-	 * @var        array
-	 */
-	private static $mysqlTypeMap = array(
-		'tinyint' => PropelTypes::TINYINT,
-		'smallint' => PropelTypes::SMALLINT,
-		'mediumint' => PropelTypes::SMALLINT,
-		'int' => PropelTypes::INTEGER,
-		'integer' => PropelTypes::INTEGER,
-		'bigint' => PropelTypes::BIGINT,
-		'int24' => PropelTypes::BIGINT,
-		'real' => PropelTypes::REAL,
-		'float' => PropelTypes::FLOAT,
-		'decimal' => PropelTypes::DECIMAL,
-		'numeric' => PropelTypes::NUMERIC,
-		'double' => PropelTypes::DOUBLE,
-		'char' => PropelTypes::CHAR,
-		'varchar' => PropelTypes::VARCHAR,
-		'date' => PropelTypes::DATE,
-		'time' => PropelTypes::TIME,
-		'year' => PropelTypes::INTEGER,
-		'datetime' => PropelTypes::TIMESTAMP,
-		'timestamp' => PropelTypes::TIMESTAMP,
-		'tinyblob' => PropelTypes::BINARY,
-		'blob' => PropelTypes::BLOB,
-		'mediumblob' => PropelTypes::BLOB,
-		'longblob' => PropelTypes::BLOB,
-		'longtext' => PropelTypes::CLOB,
-		'tinytext' => PropelTypes::VARCHAR,
-		'mediumtext' => PropelTypes::LONGVARCHAR,
-		'text' => PropelTypes::LONGVARCHAR,
-		'enum' => PropelTypes::CHAR,
-		'set' => PropelTypes::CHAR,
-	);
-
-	/**
-	 * Gets a type mapping from native types to Propel types
-	 *
-	 * @return     array
-	 */
-	protected function getTypeMapping()
-	{
-		return self::$mysqlTypeMap;
-	}
-
-	/**
-	 *
-	 */
-	public function parse(Database $database)
-	{
-		$this->addVendorInfo = $this->getGeneratorConfig()->getBuildProperty('addVendorInfo');
-
-		$stmt = $this->dbh->query("SHOW TABLES");
-
-		// First load the tables (important that this happen before filling out details of tables)
-		$tables = array();
-		while ($row = $stmt->fetch(PDO::FETCH_NUM)) {
-			$name = $row[0];
-			$table = new Table($name);
-			$database->addTable($table);
-			$tables[] = $table;
-		}
-
-		// Now populate only columns.
-		foreach ($tables as $table) {
-			$this->addColumns($table);
-		}
-
-		// Now add indexes and constraints.
-		foreach ($tables as $table) {
-			$this->addForeignKeys($table);
-			$this->addIndexes($table);
-			$this->addPrimaryKey($table);
-			if ($this->addVendorInfo) {
-				$this->addTableVendorInfo($table);
-			}
-		}
-	}
-
-
-	/**
-	 * Adds Columns to the specified table.
-	 *
-	 * @param      Table $table The Table model class to add columns to.
-	 */
-	protected function addColumns(Table $table)
-	{
-		$stmt = $this->dbh->query("SHOW COLUMNS FROM `" . $table->getName() . "`");
-
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			$name = $row['Field'];
-			$is_nullable = ($row['Null'] == 'YES');
-			$autoincrement = (strpos($row['Extra'], 'auto_increment') !== false);
-			$size = null;
-			$precision = null;
-			$scale = null;
-
-			if (preg_match('/^(\w+)[\(]?([\d,]*)[\)]?( |$)/', $row['Type'], $matches)) {
-				//            colname[1]   size/precision[2]
-				$nativeType = $matches[1];
-				if ($matches[2]) {
-					if ( ($cpos = strpos($matches[2], ',')) !== false) {
-						$size = (int) substr($matches[2], 0, $cpos);
-						$precision = $size;
-						$scale = (int) substr($matches[2], $cpos + 1);
-					} else {
-						$size = (int) $matches[2];
-					}
-				}
-			} elseif (preg_match('/^(\w+)\(/', $row['Type'], $matches)) {
-				$nativeType = $matches[1];
-			} else {
-				$nativeType = $row['Type'];
-			}
-
-			//BLOBs can't have any default values in MySQL
-			$default = preg_match('~blob|text~', $nativeType) ? null : $row['Default'];
-
-			$propelType = $this->getMappedPropelType($nativeType);
-			if (!$propelType) {
-				$propelType = Column::DEFAULT_TYPE;
-				$this->warn("Column [" . $table->getName() . "." . $name. "] has a column type (".$nativeType.") that Propel does not support.");
-			}
-
-			$column = new Column($name);
-			$column->setTable($table);
-			$column->setDomainForType($propelType);
-			// We may want to provide an option to include this:
-			// $column->getDomain()->replaceSqlType($type);
-			$column->getDomain()->replaceSize($size);
-			$column->getDomain()->replaceScale($scale);
-			if ($default !== null) {
-				$column->getDomain()->setDefaultValue(new ColumnDefaultValue($default, ColumnDefaultValue::TYPE_VALUE));
-			}
-			$column->setAutoIncrement($autoincrement);
-			$column->setNotNull(!$is_nullable);
-
-			if ($this->addVendorInfo) {
-				$vi = $this->getNewVendorInfoObject($row);
-				$column->addVendorInfo($vi);
-			}
-
-			$table->addColumn($column);
-		}
-
-
-	} // addColumn()
-
-	/**
-	 * Load foreign keys for this table.
-	 */
-	protected function addForeignKeys(Table $table)
-	{
-		$database = $table->getDatabase();
-
-		$stmt = $this->dbh->query("SHOW CREATE TABLE `" . $table->getName(). "`");
-		$row = $stmt->fetch(PDO::FETCH_NUM);
-
-		$foreignKeys = array(); // local store to avoid duplicates
-
-		// Get the information on all the foreign keys
-		$regEx = '/CONSTRAINT `([^`]+)` FOREIGN KEY \((.+)\) REFERENCES `([^`]*)` \((.+)\)(.*)/';
-		if (preg_match_all($regEx,$row[1],$matches)) {
-			$tmpArray = array_keys($matches[0]);
-			foreach ($tmpArray as $curKey) {
-				$name = $matches[1][$curKey];
-				$rawlcol = $matches[2][$curKey];
-				$ftbl = $matches[3][$curKey];
-				$rawfcol = $matches[4][$curKey];
-				$fkey = $matches[5][$curKey];
-				
-				$lcols = array();
-				foreach(preg_split('/`, `/', $rawlcol) as $piece) {
-					$lcols[] = trim($piece, '` ');
-				}
-				
-				$fcols = array();
-				foreach(preg_split('/`, `/', $rawfcol) as $piece) {
-					$fcols[] = trim($piece, '` ');
-				}
-				
-				//typical for mysql is RESTRICT
-				$fkactions = array(
-					'ON DELETE'	=> ForeignKey::RESTRICT,
-					'ON UPDATE'	=> ForeignKey::RESTRICT,
-				);
-
-				if ($fkey) {
-					//split foreign key information -> search for ON DELETE and afterwords for ON UPDATE action
-					foreach (array_keys($fkactions) as $fkaction) {
-						$result = NULL;
-						preg_match('/' . $fkaction . ' (' . ForeignKey::CASCADE . '|' . ForeignKey::SETNULL . ')/', $fkey, $result);
-						if ($result && is_array($result) && isset($result[1])) {
-							$fkactions[$fkaction] = $result[1];
-						}
-					}
-				}
-				
-				$localColumns = array();
-				$foreignColumns = array();
-				
-				$foreignTable = $database->getTable($ftbl);
-				
-				foreach($fcols as $fcol) {
-					$foreignColumns[] = $foreignTable->getColumn($fcol);
-				}
-				foreach($lcols as $lcol) {
-					$localColumns[] = $table->getColumn($lcol);
-				}
-
-				if (!isset($foreignKeys[$name])) {
-					$fk = new ForeignKey($name);
-					$fk->setForeignTableName($foreignTable->getName());
-					$fk->setOnDelete($fkactions['ON DELETE']);
-					$fk->setOnUpdate($fkactions['ON UPDATE']);
-					$table->addForeignKey($fk);
-					$foreignKeys[$name] = $fk;
-				}
-				
-				for($i=0; $i < count($localColumns); $i++) {
-					$foreignKeys[$name]->addReference($localColumns[$i], $foreignColumns[$i]);
-				}
-				
-			}
-
-		}
-
-	}
-
-	/**
-	 * Load indexes for this table
-	 */
-	protected function addIndexes(Table $table)
-	{
-		$stmt = $this->dbh->query("SHOW INDEX FROM `" . $table->getName() . "`");
-
-		// Loop through the returned results, grouping the same key_name together
-		// adding each column for that key.
-
-		$indexes = array();
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-			$colName = $row["Column_name"];
-			$name = $row["Key_name"];
-
-			if ($name == "PRIMARY") {
-				continue;
-			}
-
-			if (!isset($indexes[$name])) {
-				$isUnique = ($row["Non_unique"] == 0);
-				if ($isUnique) {
-					$indexes[$name] = new Unique($name);
-				} else {
-					$indexes[$name] = new Index($name);
-				}
-				if ($this->addVendorInfo) {
-					$vi = $this->getNewVendorInfoObject($row);
-					$indexes[$name]->addVendorInfo($vi);
-				}
-				$table->addIndex($indexes[$name]);
-			}
-
-			$indexes[$name]->addColumn($table->getColumn($colName));
-		}
-	}
-
-	/**
-	 * Loads the primary key for this table.
-	 */
-	protected function addPrimaryKey(Table $table)
-	{
-		$stmt = $this->dbh->query("SHOW KEYS FROM `" . $table->getName() . "`");
-
-		// Loop through the returned results, grouping the same key_name together
-		// adding each column for that key.
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-			// Skip any non-primary keys.
-			if ($row['Key_name'] !== 'PRIMARY') {
-				continue;
-			}
-			$name = $row["Column_name"];
-			$table->getColumn($name)->setPrimaryKey(true);
-		}
-	}
-
-	/**
-	 * Adds vendor-specific info for table.
-	 *
-	 * @param      Table $table
-	 */
-	protected function addTableVendorInfo(Table $table)
-	{
-		$stmt = $this->dbh->query("SHOW TABLE STATUS LIKE '" . $table->getName() . "'");
-		$row = $stmt->fetch(PDO::FETCH_ASSOC);
-		$vi = $this->getNewVendorInfoObject($row);
-		$table->addVendorInfo($vi);
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/oracle/OracleSchemaParser.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/oracle/OracleSchemaParser.php
deleted file mode 100644
index d2e2f6859..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/oracle/OracleSchemaParser.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-/*
- *  $Id: OracleSchemaParser.php 989 2008-03-11 14:29:30Z heltem $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/reverse/BaseSchemaParser.php';
-
-/**
- * Oracle database schema parser.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @author     Guillermo Gutierrez <ggutierrez@dailycosas.net> (Adaptation)
- * @version    $Revision: 1010 $
- * @package    propel.engine.database.reverse.oracle
- */
-class OracleSchemaParser extends BaseSchemaParser {
-
-	/**
-	 * Map Oracle native types to Propel types.
-	 *
-	 * There really aren't any Oracle native types, so we're just
-	 * using the MySQL ones here.
-	 * 
-	 * Left as unsupported: 
-	 *   BFILE, 
-	 *   RAW, 
-	 *   ROWID
-	 * 
-	 * Supported but non existant as a specific type in Oracle: 
-	 *   DECIMAL (NUMBER with scale), 
-	 *   DOUBLE (FLOAT with precision = 126) 
-	 *
-	 * @var        array
-	 */
-	private static $oracleTypeMap = array(
-		'BLOB'		=> PropelTypes::BLOB,
-		'CHAR'		=> PropelTypes::CHAR,
-		'CLOB'		=> PropelTypes::CLOB,
-		'DATE'		=> PropelTypes::DATE,
-		'DECIMAL'	=> PropelTypes::DECIMAL,
-		'DOUBLE'	=> PropelTypes::DOUBLE,
-		'FLOAT'		=> PropelTypes::FLOAT,
-		'LONG'		=> PropelTypes::LONGVARCHAR,
-		'NCHAR'		=> PropelTypes::CHAR,
-		'NCLOB'		=> PropelTypes::CLOB,
-		'NUMBER'	=> PropelTypes::BIGINT,
-		'NVARCHAR2'	=> PropelTypes::VARCHAR,
-		'TIMESTAMP'	=> PropelTypes::TIMESTAMP,
-		'VARCHAR2'	=> PropelTypes::VARCHAR,
-	);
-
-	/**
-	 * Gets a type mapping from native types to Propel types
-	 *
-	 * @return     array
-	 */
-	protected function getTypeMapping()
-	{
-		return self::$oracleTypeMap;
-	}
-
-	/**
-	 * Searches for tables in the database. Maybe we want to search also the views.
-	 * @param	Database $database The Database model class to add tables to.
-	 */
-	public function parse(Database $database)
-	{
-		$tables = array();
-		$stmt = $this->dbh->query("SELECT OBJECT_NAME FROM USER_OBJECTS WHERE OBJECT_TYPE = 'TABLE'");
-		/* @var stmt PDOStatement */
-		// First load the tables (important that this happen before filling out details of tables)
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-			$table = new Table($row['OBJECT_NAME']);
-			$database->addTable($table);
-			// Add columns, primary keys and indexes.
-			$this->addColumns($table);
-			$this->addPrimaryKey($table);
-			$this->addIndexes($table);
-			$tables[] = $table;
-		}
-		foreach ($tables as $table) {
-			$this->addForeignKeys($table);
-		}
-	}
-
-	/**
-	 * Adds Columns to the specified table.
-	 *
-	 * @param      Table $table The Table model class to add columns to.
-	 */
-	protected function addColumns(Table $table)
-	{
-		$stmt = $this->dbh->query("SELECT COLUMN_NAME, DATA_TYPE, NULLABLE, DATA_LENGTH, DATA_SCALE, DATA_DEFAULT FROM USER_TAB_COLS WHERE TABLE_NAME = '" . $table->getName() . "'");
-		/* @var stmt PDOStatement */
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-			$size = $row["DATA_LENGTH"];
-			$scale = $row["DATA_SCALE"];
-			$default = $row['DATA_DEFAULT'];
-			$type = $row["DATA_TYPE"];
-			$isNullable = ($row['NULLABLE'] == 'Y');
-			if ($type == "NUMBER" && $row["DATA_SCALE"] > 0) {
-				$type = "DECIMAL";
-			}
-			if ($type == "FLOAT"&& $row["DATA_PRECISION"] == 126) {
-				$type = "DOUBLE";
-			}
-			if (strpos($type, 'TIMESTAMP(') !== false) {
-				$type = substr($type, 0, strpos($type, '('));
-				$default = "0000-00-00 00:00:00";
-				$size = null;
-				$scale = null;
-			}
-			if ($type == "DATE") {
-				$default = "0000-00-00";
-				$size = null;
-				$scale = null;
-			}
-				
-			$propelType = $this->getMappedPropelType($type);
-			if (!$propelType) {
-				$propelType = Column::DEFAULT_TYPE;
-				$this->warn("Column [" . $table->getName() . "." . $row['COLUMN_NAME']. "] has a column type (".$row["DATA_TYPE"].") that Propel does not support.");
-			}
-
-			$column = new Column($row['COLUMN_NAME']);
-			$column->setPhpName(); // Prevent problems with strange col names
-			$column->setTable($table);
-			$column->setDomainForType($propelType);
-			$column->getDomain()->replaceSize($size);
-			$column->getDomain()->replaceScale($scale);
-			if ($default !== null) {
-				$column->getDomain()->setDefaultValue(new ColumnDefaultValue($default, ColumnDefaultValue::TYPE_VALUE));
-			}
-			$column->setAutoIncrement(false); // Not yet supported
-			$column->setNotNull(!$isNullable);
-			$table->addColumn($column);
-		}
-		
-	} // addColumn()
-
-	/**
-	 * Adds Indexes to the specified table.
-	 *
-	 * @param      Table $table The Table model class to add columns to.
-	 */
-	protected function addIndexes(Table $table)
-	{
-		$stmt = $this->dbh->query("SELECT COLUMN_NAME, INDEX_NAME FROM USER_IND_COLUMNS WHERE TABLE_NAME = '" . $table->getName() . "' ORDER BY COLUMN_NAME");
-		/* @var stmt PDOStatement */
-		$rows = $stmt->fetchAll(PDO::FETCH_ASSOC);
-		if (count($rows) > 0) {
-			$index = new Index($rows[0]['INDEX_NAME']);
-			foreach($rows AS $row) {
-				$index->addColumn($row['COLUMN_NAME']);
-			}
-			$table->addIndex($index);
-		}
-	}
-	
-	/**
-	 * Load foreign keys for this table.
-	 * 
-	 * @param      Table $table The Table model class to add FKs to
-	 */
-	protected function addForeignKeys(Table $table)
-	{	
-		// local store to avoid duplicates
-		$foreignKeys = array(); 
-		
-		$stmt = $this->dbh->query("SELECT CONSTRAINT_NAME, DELETE_RULE, R_CONSTRAINT_NAME FROM USER_CONSTRAINTS WHERE CONSTRAINT_TYPE = 'R' AND TABLE_NAME = '" . $table->getName(). "'");
-		/* @var stmt PDOStatement */
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-			// Local reference
-			$stmt2 = $this->dbh->query("SELECT COLUMN_NAME FROM USER_CONS_COLUMNS WHERE CONSTRAINT_NAME = '".$row['CONSTRAINT_NAME']."' AND TABLE_NAME = '" . $table->getName(). "'");
-			/* @var stmt2 PDOStatement */
-			$localReferenceInfo = $stmt2->fetch(PDO::FETCH_ASSOC);
-			
-			// Foreign reference
-			$stmt2 = $this->dbh->query("SELECT TABLE_NAME, COLUMN_NAME FROM USER_CONS_COLUMNS WHERE CONSTRAINT_NAME = '".$row['R_CONSTRAINT_NAME']."'");
-			$foreignReferenceInfo = $stmt2->fetch(PDO::FETCH_ASSOC);
-						
-			if (!isset($foreignKeys[$row["CONSTRAINT_NAME"]])) {
-				$fk = new ForeignKey($row["CONSTRAINT_NAME"]);
-				$fk->setForeignTableName($foreignReferenceInfo['TABLE_NAME']);
-				$fk->setOnDelete($row["DELETE_RULE"]);
-				$fk->setOnUpdate($row["DELETE_RULE"]);
-				$fk->addReference(array("local" => $localReferenceInfo['COLUMN_NAME'], "foreign" => $foreignReferenceInfo['COLUMN_NAME']));
-				$table->addForeignKey($fk);
-				$foreignKeys[$row["CONSTRAINT_NAME"]] = $fk;
-			}
-		}
-	}
-
-	/**
-	 * Loads the primary key for this table.
-	 * 
-	 * @param      Table $table The Table model class to add PK to. 
-	 */
-	protected function addPrimaryKey(Table $table)
-	{
-		$stmt = $this->dbh->query("SELECT COLS.COLUMN_NAME FROM USER_CONSTRAINTS CONS, USER_CONS_COLUMNS COLS WHERE CONS.CONSTRAINT_NAME = COLS.CONSTRAINT_NAME AND CONS.TABLE_NAME = '".$table->getName()."' AND CONS.CONSTRAINT_TYPE = 'P'");
-		/* @var stmt PDOStatement */
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-			// This fixes a strange behavior by PDO. Sometimes the
-			// row values are inside an index 0 of an array
-			if (array_key_exists(0, $row)) {
-				$row = $row[0];
-			}
-			$table->getColumn($row['COLUMN_NAME'])->setPrimaryKey(true);
-		}	
-	}
-
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/pgsql/PgsqlSchemaParser.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/pgsql/PgsqlSchemaParser.php
deleted file mode 100644
index 6fabe9211..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/pgsql/PgsqlSchemaParser.php
+++ /dev/null
@@ -1,545 +0,0 @@
-<?php
-/*
- *  $Id: PgsqlSchemaParser.php 1397 2009-12-31 08:05:10Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/reverse/BaseSchemaParser.php';
-
-/**
- * Postgresql database schema parser.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @version    $Revision: 1397 $
- * @package    propel.engine.database.reverse.pgsql
- */
-class PgsqlSchemaParser extends BaseSchemaParser {
-
-	/**
-	 * Map PostgreSQL native types to Propel types.
-	 * @var        array
-	 */
-	 /** Map MySQL native types to Creole (JDBC) types. */
-	private static $pgsqlTypeMap = array(
-				'bool' => PropelTypes::BOOLEAN,
-				'boolean' => PropelTypes::BOOLEAN,
-				'tinyint' => PropelTypes::TINYINT,
-				'smallint' => PropelTypes::SMALLINT,
-				'mediumint' => PropelTypes::SMALLINT,
-				'int' => PropelTypes::INTEGER,
-				'int4' => PropelTypes::INTEGER,
-				'integer' => PropelTypes::INTEGER,
-				'int8' => PropelTypes::BIGINT,
-				'bigint' => PropelTypes::BIGINT,
-				'int24' => PropelTypes::BIGINT,
-				'real' => PropelTypes::REAL,
-				'float' => PropelTypes::FLOAT,
-				'decimal' => PropelTypes::DECIMAL,
-				'numeric' => PropelTypes::NUMERIC,
-				'double' => PropelTypes::DOUBLE,
-				'char' => PropelTypes::CHAR,
-				'varchar' => PropelTypes::VARCHAR,
-				'date' => PropelTypes::DATE,
-				'time' => PropelTypes::TIME,
-				'timetz' => PropelTypes::TIME,
-				//'year' => PropelTypes::YEAR,  PropelTypes::YEAR does not exist... does this need to be mapped to a different propel type?
-				'datetime' => PropelTypes::TIMESTAMP,
-				'timestamp' => PropelTypes::TIMESTAMP,
-				'timestamptz' => PropelTypes::TIMESTAMP,
-				'bytea' => PropelTypes::BLOB,
-				'text' => PropelTypes::LONGVARCHAR,
-	);
-
-	/**
-	 * Gets a type mapping from native types to Propel types
-	 *
-	 * @return     array
-	 */
-	protected function getTypeMapping()
-	{
-		return self::$pgsqlTypeMap;
-	}
-
-	/**
-	 *
-	 */
-	public function parse(Database $database)
-	{
-		$stmt = $this->dbh->query("SELECT version() as ver");
-		$nativeVersion = $stmt->fetchColumn();
-
-		if (!$nativeVersion) {
-			throw new EngineException("Failed to get database version");
-		}
-
-		$arrVersion = sscanf ($nativeVersion, '%*s %d.%d');
-		$version = sprintf ("%d.%d", $arrVersion[0], $arrVersion[1]);
-
-		// Clean up
-		$stmt = null;
-
-		$stmt = $this->dbh->query("SELECT c.oid,
-								    case when n.nspname='public' then c.relname else n.nspname||'.'||c.relname end as relname
-								    FROM pg_class c join pg_namespace n on (c.relnamespace=n.oid)
-								    WHERE c.relkind = 'r'
-								      AND n.nspname NOT IN ('information_schema','pg_catalog')
-								      AND n.nspname NOT LIKE 'pg_temp%'
-								      AND n.nspname NOT LIKE 'pg_toast%'
-								    ORDER BY relname");
-
-		$tableWraps = array();
-
-		// First load the tables (important that this happen before filling out details of tables)
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-			$name = $row['relname'];
-			$oid = $row['oid'];
-			$table = new Table($name);
-			$database->addTable($table);
-
-			// Create a wrapper to hold these tables and their associated OID
-			$wrap = new stdClass;
-			$wrap->table = $table;
-			$wrap->oid = $oid;
-			$tableWraps[] = $wrap;
-		}
-
-		// Now populate only columns.
-		foreach ($tableWraps as $wrap) {
-			$this->addColumns($wrap->table, $wrap->oid, $version);
-		}
-
-		// Now add indexes and constraints.
-		foreach ($tableWraps as $wrap) {
-			$this->addForeignKeys($wrap->table, $wrap->oid, $version);
-			$this->addIndexes($wrap->table, $wrap->oid, $version);
-			$this->addPrimaryKey($wrap->table, $wrap->oid, $version);
-		}
-
-		// TODO - Handle Sequences ...
-
-	}
-
-
-	 /**
-	 * Adds Columns to the specified table.
-	 *
-	 * @param      Table $table The Table model class to add columns to.
-	 * @param      int $oid The table OID
-	 * @param      string $version The database version.
-	 */
-	protected function addColumns(Table $table, $oid, $version)
-	{
-
-		// Get the columns, types, etc.
-		// Based on code from pgAdmin3 (http://www.pgadmin.org/)
-		$stmt = $this->dbh->prepare("SELECT
-								        att.attname,
-								        att.atttypmod,
-								        att.atthasdef,
-								        att.attnotnull,
-								        def.adsrc,
-								        CASE WHEN att.attndims > 0 THEN 1 ELSE 0 END AS isarray,
-								        CASE
-								            WHEN ty.typname = 'bpchar'
-								                THEN 'char'
-								            WHEN ty.typname = '_bpchar'
-								                THEN '_char'
-								            ELSE
-								                ty.typname
-								        END AS typname,
-								        ty.typtype
-								    FROM pg_attribute att
-								        JOIN pg_type ty ON ty.oid=att.atttypid
-								        LEFT OUTER JOIN pg_attrdef def ON adrelid=att.attrelid AND adnum=att.attnum
-								    WHERE att.attrelid = ? AND att.attnum > 0
-								        AND att.attisdropped IS FALSE
-								    ORDER BY att.attnum");
-
-		$stmt->bindValue(1, $oid, PDO::PARAM_INT);
-		$stmt->execute();
-
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			$size = null;
-			$precision = null;
-			$scale = null;
-
-			// Check to ensure that this column isn't an array data type
-			if (((int) $row['isarray']) === 1) {
-				throw new EngineException (sprintf ("Array datatypes are not currently supported [%s.%s]", $this->name, $row['attname']));
-			} // if (((int) $row['isarray']) === 1)
-
-			$name = $row['attname'];
-
-			// If they type is a domain, Process it
-			if (strtolower ($row['typtype']) == 'd') {
-				$arrDomain = $this->processDomain ($row['typname']);
-				$type = $arrDomain['type'];
-				$size = $arrDomain['length'];
-				$precision = $size;
-				$scale = $arrDomain['scale'];
-				$boolHasDefault = (strlen (trim ($row['atthasdef'])) > 0) ? $row['atthasdef'] : $arrDomain['hasdefault'];
-				$default = (strlen (trim ($row['adsrc'])) > 0) ? $row['adsrc'] : $arrDomain['default'];
-				$is_nullable = (strlen (trim ($row['attnotnull'])) > 0) ? $row['attnotnull'] : $arrDomain['notnull'];
-				$is_nullable = (($is_nullable == 't') ? false : true);
-			} else {
-				$type = $row['typname'];
-				$arrLengthPrecision = $this->processLengthScale ($row['atttypmod'], $type);
-				$size = $arrLengthPrecision['length'];
-				$precision = $size;
-				$scale = $arrLengthPrecision['scale'];
-				$boolHasDefault = $row['atthasdef'];
-				$default = $row['adsrc'];
-				$is_nullable = (($row['attnotnull'] == 't') ? false : true);
-			} // else (strtolower ($row['typtype']) == 'd')
-
-			$autoincrement = null;
-
-			// if column has a default
-			if (($boolHasDefault == 't') && (strlen (trim ($default)) > 0)) {
-				if (!preg_match('/^nextval\(/', $default)) {
-					$strDefault= preg_replace ('/::[\W\D]*/', '', $default);
-					$default = str_replace ("'", '', $strDefault);
-				} else {
-					$autoincrement = true;
-					$default = null;
-				}
-			} else {
-				$default = null;
-			}
-
-			$propelType = $this->getMappedPropelType($type);
-			if (!$propelType) {
-				$propelType = Column::DEFAULT_TYPE;
-				$this->warn("Column [" . $table->getName() . "." . $name. "] has a column type (".$type.") that Propel does not support.");
-			}
-
-			$column = new Column($name);
-			$column->setTable($table);
-			$column->setDomainForType($propelType);
-			// We may want to provide an option to include this:
-			// $column->getDomain()->replaceSqlType($type);
-			$column->getDomain()->replaceSize($size);
-			$column->getDomain()->replaceScale($scale);
-			if ($default !== null) {
-				$column->getDomain()->setDefaultValue(new ColumnDefaultValue($default, ColumnDefaultValue::TYPE_VALUE));
-			}
-			$column->setAutoIncrement($autoincrement);
-			$column->setNotNull(!$is_nullable);
-
-			$table->addColumn($column);
-		}
-
-
-	} // addColumn()
-
-	private function processLengthScale($intTypmod, $strName)
-	{
-		// Define the return array
-		$arrRetVal = array ('length'=>null, 'scale'=>null);
-
-		// Some datatypes don't have a Typmod
-		if ($intTypmod == -1)
-		{
-			return $arrRetVal;
-		} // if ($intTypmod == -1)
-
-		// Numeric Datatype?
-		if ($strName == $this->getMappedNativeType(PropelTypes::NUMERIC)) {
-			$intLen = ($intTypmod - 4) >> 16;
-			$intPrec = ($intTypmod - 4) & 0xffff;
-			$intLen = sprintf ("%ld", $intLen);
-			if ($intPrec)
-			{
-				$intPrec = sprintf ("%ld", $intPrec);
-			} // if ($intPrec)
-			$arrRetVal['length'] = $intLen;
-			$arrRetVal['scale'] = $intPrec;
-		} // if ($strName == $this->getMappedNativeType(PropelTypes::NUMERIC))
-		elseif ($strName == $this->getMappedNativeType(PropelTypes::TIME) || $strName == 'timetz'
-			|| $strName == $this->getMappedNativeType(PropelTypes::TIMESTAMP) || $strName == 'timestamptz'
-			|| $strName == 'interval' || $strName == 'bit')
-		{
-			$arrRetVal['length'] = sprintf ("%ld", $intTypmod);
-		} // elseif (TIME, TIMESTAMP, INTERVAL, BIT)
-		else
-		{
-			$arrRetVal['length'] = sprintf ("%ld", ($intTypmod - 4));
-		} // else
-		return $arrRetVal;
-	} // private function processLengthScale ($intTypmod, $strName)
-
-	private function processDomain($strDomain)
-	{
-		if (strlen(trim ($strDomain)) < 1) {
-			throw new EngineException ("Invalid domain name [" . $strDomain . "]");
-		}
-
-		$stmt = $this->dbh->prepare("SELECT
-								        d.typname as domname,
-								        b.typname as basetype,
-								        d.typlen,
-								        d.typtypmod,
-								        d.typnotnull,
-								        d.typdefault
-								    FROM pg_type d
-								        INNER JOIN pg_type b ON b.oid = CASE WHEN d.typndims > 0 then d.typelem ELSE d.typbasetype END
-								    WHERE
-								        d.typtype = 'd'
-								        AND d.typname = ?
-								    ORDER BY d.typname");
-		$stmt->bindValue(1, $strDomain);
-		$stmt->execute();
-
-		$row = $stmt->fetch(PDO::FETCH_ASSOC);
-		if (!$row) {
-			throw new EngineException ("Domain [" . $strDomain . "] not found.");
-		}
-
-		$arrDomain = array ();
-		$arrDomain['type'] = $row['basetype'];
-		$arrLengthPrecision = $this->processLengthScale($row['typtypmod'], $row['basetype']);
-		$arrDomain['length'] = $arrLengthPrecision['length'];
-		$arrDomain['scale'] = $arrLengthPrecision['scale'];
-		$arrDomain['notnull'] = $row['typnotnull'];
-		$arrDomain['default'] = $row['typdefault'];
-		$arrDomain['hasdefault'] = (strlen (trim ($row['typdefault'])) > 0) ? 't' : 'f';
-
-		$stmt = null; // cleanup
-		return $arrDomain;
-	} // private function processDomain($strDomain)
-
-	/**
-	 * Load foreign keys for this table.
-	 */
-	protected function addForeignKeys(Table $table, $oid, $version)
-	{
-		$database = $table->getDatabase();
-		$stmt = $this->dbh->prepare("SELECT
-								          conname,
-								          confupdtype,
-								          confdeltype,
-								          CASE nl.nspname WHEN 'public' THEN cl.relname ELSE nl.nspname||'.'||cl.relname END as fktab,
-								          a2.attname as fkcol,
-								          CASE nr.nspname WHEN 'public' THEN cr.relname ELSE nr.nspname||'.'||cr.relname END as reftab,
-								          a1.attname as refcol
-								    FROM pg_constraint ct
-								         JOIN pg_class cl ON cl.oid=conrelid
-								         JOIN pg_class cr ON cr.oid=confrelid
-								         JOIN pg_namespace nl ON nl.oid = cl.relnamespace
-								         JOIN pg_namespace nr ON nr.oid = cr.relnamespace
-								         LEFT JOIN pg_catalog.pg_attribute a1 ON a1.attrelid = ct.confrelid
-								         LEFT JOIN pg_catalog.pg_attribute a2 ON a2.attrelid = ct.conrelid
-								    WHERE
-								         contype='f'
-								         AND conrelid = ?
-								         AND a2.attnum = ct.conkey[1]
-								         AND a1.attnum = ct.confkey[1]
-								    ORDER BY conname");
-		$stmt->bindValue(1, $oid);
-		$stmt->execute();
-
-		$foreignKeys = array(); // local store to avoid duplicates
-
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			$name = $row['conname'];
-			$local_table = $row['fktab'];
-			$local_column = $row['fkcol'];
-			$foreign_table = $row['reftab'];
-			$foreign_column = $row['refcol'];
-
-			// On Update
-			switch ($row['confupdtype']) {
-			  case 'c':
-				$onupdate = ForeignKey::CASCADE; break;
-			  case 'd':
-				$onupdate = ForeignKey::SETDEFAULT; break;
-			  case 'n':
-				$onupdate = ForeignKey::SETNULL; break;
-			  case 'r':
-				$onupdate = ForeignKey::RESTRICT; break;
-			  default:
-			  case 'a':
-				//NOACTION is the postgresql default
-				$onupdate = ForeignKey::NONE; break;
-			}
-			// On Delete
-			switch ($row['confdeltype']) {
-			  case 'c':
-				$ondelete = ForeignKey::CASCADE; break;
-			  case 'd':
-				$ondelete = ForeignKey::SETDEFAULT; break;
-			  case 'n':
-				$ondelete = ForeignKey::SETNULL; break;
-			  case 'r':
-				$ondelete = ForeignKey::RESTRICT; break;
-			  default:
-			  case 'a':
-				//NOACTION is the postgresql default
-				$ondelete = ForeignKey::NONE; break;
-			}
-
-			$foreignTable = $database->getTable($foreign_table);
-			$foreignColumn = $foreignTable->getColumn($foreign_column);
-
-			$localTable   = $database->getTable($local_table);
-			$localColumn   = $localTable->getColumn($local_column);
-
-			if (!isset($foreignKeys[$name])) {
-				$fk = new ForeignKey($name);
-				$fk->setForeignTableName($foreignTable->getName());
-				$fk->setOnDelete($ondelete);
-				$fk->setOnUpdate($onupdate);
-				$table->addForeignKey($fk);
-				$foreignKeys[$name] = $fk;
-			}
-
-			$foreignKeys[$name]->addReference($localColumn, $foreignColumn);
-		}
-	}
-
-	/**
-	 * Load indexes for this table
-	 */
-	protected function addIndexes(Table $table, $oid, $version)
-	{
-		$stmt = $this->dbh->prepare("SELECT
-										DISTINCT ON(cls.relname)
-										cls.relname as idxname,
-								        indkey,
-								        indisunique
-								    FROM pg_index idx
-								         JOIN pg_class cls ON cls.oid=indexrelid
-								    WHERE indrelid = ? AND NOT indisprimary
-								    ORDER BY cls.relname");
-
-		$stmt->bindValue(1, $oid);
-		$stmt->execute();
-
-		$stmt2 = $this->dbh->prepare("SELECT a.attname
-										FROM pg_catalog.pg_class c JOIN pg_catalog.pg_attribute a ON a.attrelid = c.oid
-										WHERE c.oid = ? AND a.attnum = ? AND NOT a.attisdropped
-										ORDER BY a.attnum");
-
-		$indexes = array();
-
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-			$name = $row["idxname"];
-			$unique = ($row["indisunique"] == 't') ? true : false;
-			if (!isset($indexes[$name])) {
-				if ($unique) {
-					$indexes[$name] = new Unique($name);
-				} else {
-					$indexes[$name] = new Index($name);
-				}
-				$table->addIndex($indexes[$name]);
-			}
-
-			$arrColumns = explode (' ', $row['indkey']);
-			foreach ($arrColumns as $intColNum)
-			{
-			   	$stmt2->bindValue(1, $oid);
-			   	$stmt2->bindValue(2, $intColNum);
-			   	$stmt2->execute();
-
-				$row2 = $stmt2->fetch(PDO::FETCH_ASSOC);
-
-				$indexes[$name]->addColumn($table->getColumn($row2['attname']));
-
-			} // foreach ($arrColumns as $intColNum)
-
-		}
-
-	}
-
-	/**
-	 * Loads the primary key for this table.
-	 */
-	protected function addPrimaryKey(Table $table, $oid, $version)
-	{
-
-		$stmt = $this->dbh->prepare("SELECT
-										DISTINCT ON(cls.relname)
-										cls.relname as idxname,
-										indkey,
-										indisunique
-									FROM pg_index idx
-										JOIN pg_class cls ON cls.oid=indexrelid
-									WHERE indrelid = ? AND indisprimary
-									ORDER BY cls.relname");
-		$stmt->bindValue(1, $oid);
-		$stmt->execute();
-
-		// Loop through the returned results, grouping the same key_name together
-		// adding each column for that key.
-
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-			$arrColumns = explode (' ', $row['indkey']);
-			foreach ($arrColumns as $intColNum) {
-				$stmt2 = $this->dbh->prepare("SELECT a.attname
-												FROM pg_catalog.pg_class c JOIN pg_catalog.pg_attribute a ON a.attrelid = c.oid
-												WHERE c.oid = ? AND a.attnum = ? AND NOT a.attisdropped
-												ORDER BY a.attnum");
-				$stmt2->bindValue(1, $oid);
-				$stmt2->bindValue(2, $intColNum);
-				$stmt2->execute();
-
-				$row2 = $stmt2->fetch(PDO::FETCH_ASSOC);
-				$table->getColumn($row2['attname'])->setPrimaryKey(true);
-
-			} // foreach ($arrColumns as $intColNum)
-		}
-
-	}
-
-	/**
-	 * Adds the sequences for this database.
-	 *
-	 * @return     void
-	 * @throws     SQLException
-	 */
-	protected function addSequences(Database $database)
-	{
-		/*
-		-- WE DON'T HAVE ANY USE FOR THESE YET IN REVERSE ENGINEERING ...
-		$this->sequences = array();
-		$result = pg_query($this->conn->getResource(), "SELECT c.oid,
-								                        case when n.nspname='public' then c.relname else n.nspname||'.'||c.relname end as relname
-								                        FROM pg_class c join pg_namespace n on (c.relnamespace=n.oid)
-								                        WHERE c.relkind = 'S'
-								                          AND n.nspname NOT IN ('information_schema','pg_catalog')
-								                          AND n.nspname NOT LIKE 'pg_temp%'
-								                          AND n.nspname NOT LIKE 'pg_toast%'
-								                        ORDER BY relname");
-
-		if (!$result) {
-			throw new SQLException("Could not list sequences", pg_last_error($this->dblink));
-		}
-
-		while ($row = pg_fetch_assoc($result)) {
-			// FIXME -- decide what info we need for sequences & then create a SequenceInfo object (if needed)
-			$obj = new stdClass;
-			$obj->name = $row['relname'];
-			$obj->oid = $row['oid'];
-			$this->sequences[strtoupper($row['relname'])] = $obj;
-		}
-		*/
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/sqlite/SqliteSchemaParser.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/sqlite/SqliteSchemaParser.php
deleted file mode 100644
index ca1c22f55..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/reverse/sqlite/SqliteSchemaParser.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-/*
- *  $Id: SqliteSchemaParser.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/database/reverse/BaseSchemaParser.php';
-
-/**
- * SQLite database schema parser.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.reverse.mysql
- */
-class SqliteSchemaParser extends BaseSchemaParser {
-
-	/**
-	 * Map Sqlite native types to Propel types.
-	 *
-	 * There really aren't any SQLite native types, so we're just
-	 * using the MySQL ones here.
-	 *
-	 * @var        array
-	 */
-	private static $sqliteTypeMap = array(
-		'tinyint' => PropelTypes::TINYINT,
-		'smallint' => PropelTypes::SMALLINT,
-		'mediumint' => PropelTypes::SMALLINT,
-		'int' => PropelTypes::INTEGER,
-		'integer' => PropelTypes::INTEGER,
-		'bigint' => PropelTypes::BIGINT,
-		'int24' => PropelTypes::BIGINT,
-		'real' => PropelTypes::REAL,
-		'float' => PropelTypes::FLOAT,
-		'decimal' => PropelTypes::DECIMAL,
-		'numeric' => PropelTypes::NUMERIC,
-		'double' => PropelTypes::DOUBLE,
-		'char' => PropelTypes::CHAR,
-		'varchar' => PropelTypes::VARCHAR,
-		'date' => PropelTypes::DATE,
-		'time' => PropelTypes::TIME,
-		'year' => PropelTypes::INTEGER,
-		'datetime' => PropelTypes::TIMESTAMP,
-		'timestamp' => PropelTypes::TIMESTAMP,
-		'tinyblob' => PropelTypes::BINARY,
-		'blob' => PropelTypes::BLOB,
-		'mediumblob' => PropelTypes::BLOB,
-		'longblob' => PropelTypes::BLOB,
-		'longtext' => PropelTypes::CLOB,
-		'tinytext' => PropelTypes::VARCHAR,
-		'mediumtext' => PropelTypes::LONGVARCHAR,
-		'text' => PropelTypes::LONGVARCHAR,
-		'enum' => PropelTypes::CHAR,
-		'set' => PropelTypes::CHAR,
-	);
-
-	/**
-	 * Gets a type mapping from native types to Propel types
-	 *
-	 * @return     array
-	 */
-	protected function getTypeMapping()
-	{
-		return self::$sqliteTypeMap;
-	}
-
-	/**
-	 *
-	 */
-	public function parse(Database $database)
-	{
-		$stmt = $this->dbh->query("SELECT name FROM sqlite_master WHERE type='table' UNION ALL SELECT name FROM sqlite_temp_master WHERE type='table' ORDER BY name;");
-
-		// First load the tables (important that this happen before filling out details of tables)
-		$tables = array();
-		while ($row = $stmt->fetch(PDO::FETCH_NUM)) {
-			$name = $row[0];
-			$table = new Table($name);
-			$database->addTable($table);
-			$tables[] = $table;
-		}
-
-		// Now populate only columns.
-		foreach ($tables as $table) {
-			$this->addColumns($table);
-		}
-
-		// Now add indexes and constraints.
-		foreach ($tables as $table) {
-			$this->addIndexes($table);
-		}
-
-	}
-
-
-	/**
-	 * Adds Columns to the specified table.
-	 *
-	 * @param      Table $table The Table model class to add columns to.
-	 * @param      int $oid The table OID
-	 * @param      string $version The database version.
-	 */
-	protected function addColumns(Table $table)
-	{
-		$stmt = $this->dbh->query("PRAGMA table_info('" . $table->getName() . "')");
-
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			$name = $row['name'];
-
-			$fulltype = $row['type'];
-			$size = null;
-			$precision = null;
-			$scale = null;
-
-			if (preg_match('/^([^\(]+)\(\s*(\d+)\s*,\s*(\d+)\s*\)$/', $fulltype, $matches)) {
-				$type = $matches[1];
-				$precision = $matches[2];
-				$scale = $matches[3]; // aka precision
-			} elseif (preg_match('/^([^\(]+)\(\s*(\d+)\s*\)$/', $fulltype, $matches)) {
-				$type = $matches[1];
-				$size = $matches[2];
-			} else {
-				$type = $fulltype;
-			}
-			// If column is primary key and of type INTEGER, it is auto increment
-			// See: http://sqlite.org/faq.html#q1
-			$autoincrement = ($row['pk'] == 1 && strtolower($type) == 'integer');
-			$not_null = $row['notnull'];
-			$default = $row['dflt_value'];
-
-
-			$propelType = $this->getMappedPropelType($type);
-			if (!$propelType) {
-				$propelType = Column::DEFAULT_TYPE;
-				$this->warn("Column [" . $table->getName() . "." . $name. "] has a column type (".$type.") that Propel does not support.");
-			}
-
-			$column = new Column($name);
-			$column->setTable($table);
-			$column->setDomainForType($propelType);
-			// We may want to provide an option to include this:
-			// $column->getDomain()->replaceSqlType($type);
-			$column->getDomain()->replaceSize($size);
-			$column->getDomain()->replaceScale($scale);
-			if ($default !== null) {
-				$column->getDomain()->setDefaultValue(new ColumnDefaultValue($default, ColumnDefaultValue::TYPE_VALUE));
-			}
-			$column->setAutoIncrement($autoincrement);
-			$column->setNotNull($not_null);
-
-
-			if (($row['pk'] == 1) || (strtolower($type) == 'integer')) {
-				$column->setPrimaryKey(true);
-			}
-
-			$table->addColumn($column);
-
-		}
-
-
-	} // addColumn()
-
-	/**
-	 * Load indexes for this table
-	 */
-	protected function addIndexes(Table $table)
-	{
-		$stmt = $this->dbh->query("PRAGMA index_list('" . $table->getName() . "')");
-
-		while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-
-			$name = $row['name'];
-			$index = new Index($name);
-
-			$stmt2 = $this->dbh->query("PRAGMA index_info('".$name."')");
-			while ($row2 = $stmt2->fetch(PDO::FETCH_ASSOC)) {
-				$colname = $row2['name'];
-				$index->addColumn($table->getColumn($colname));
-			}
-
-			$table->addIndex($index);
-
-		}
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/transform/XmlToAppData.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/transform/XmlToAppData.php
deleted file mode 100644
index 8e36adaa1..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/database/transform/XmlToAppData.php
+++ /dev/null
@@ -1,409 +0,0 @@
-<?php
-
-/*
- *  $Id: XmlToAppData.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-include_once 'propel/engine/database/model/AppData.php';
-
-// Phing dependencies
-require_once 'phing/parser/AbstractHandler.php';
-include_once 'phing/system/io/FileReader.php';
-
-/**
- * A class that is used to parse an input xml schema file and creates an AppData
- * PHP object.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Leon Messerschmidt <leon@opticode.co.za> (Torque)
- * @author     Jason van Zyl <jvanzyl@apache.org> (Torque)
- * @author     Martin Poeschl <mpoeschl@marmot.at> (Torque)
- * @author     Daniel Rall <dlr@collab.net> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.database.transform
- */
-class XmlToAppData extends AbstractHandler {
-
-	/** enables debug output */
-	const DEBUG = false;
-
-	private $app;
-	private $platform;
-	private $currDB;
-	private $currTable;
-	private $currColumn;
-	private $currFK;
-	private $currIndex;
-	private $currUnique;
-	private $currValidator;
-	private $currBehavior;
-	private $currVendorObject;
-
-	private $isForReferenceOnly;
-	private $currentPackage;
-	private $currentXmlFile;
-	private $defaultPackage;
-
-	private $encoding;
-
-	/** two-dimensional array,
-		first dimension is for schemas(key is the path to the schema file),
-		second is for tags within the schema */
-	private $schemasTagsStack = array();
-
-	public $parser;
-
-	/**
-	 * Creates a new instance for the specified database type.
-	 *
-	 * @param      Platform $platform The type of database for the application.
-	 * @param      string $defaultPackage the default PHP package used for the om
-	 * @param      string $encoding The database encoding.
-	 */
-	public function __construct(Platform $platform, $defaultPackage, $encoding = 'iso-8859-1')
-	{
-		$this->app = new AppData($platform);
-		$this->platform = $platform;
-		$this->defaultPackage = $defaultPackage;
-		$this->firstPass = true;
-		$this->encoding = $encoding;
-	}
-
-	/**
-	 * Parses a XML input file and returns a newly created and
-	 * populated AppData structure.
-	 *
-	 * @param      string $xmlFile The input file to parse.
-	 * @return     AppData populated by <code>xmlFile</code>.
-	 */
-	public function parseFile($xmlFile)
-	{
-		// we don't want infinite recursion
-		if ($this->isAlreadyParsed($xmlFile)) {
-			return;
-		}
-
-		$domDocument = new DomDocument('1.0', 'UTF-8');
-		$domDocument->load($xmlFile);
-
-		// store current schema file path
-		$this->schemasTagsStack[$xmlFile] = array();
-
-		$this->currentXmlFile = $xmlFile;
-
-		try {
-			$fr = new FileReader($xmlFile);
-		} catch (Exception $e) {
-			$f = new PhingFile($xmlFile);
-			throw new Exception("XML File not found: " . $f->getAbsolutePath());
-		}
-
-		$br = new BufferedReader($fr);
-
-		$this->parser = new ExpatParser($br);
-		$this->parser->parserSetOption(XML_OPTION_CASE_FOLDING, 0);
-		$this->parser->setHandler($this);
-
-		try {
-			$this->parser->parse();
-		} catch (Exception $e) {
-			$br->close();
-			throw $e;
-		}
-		$br->close();
-
-		array_pop($this->schemasTagsStack);
-
-		return $this->app;
-	}
-
-	/**
-	 * Handles opening elements of the xml file.
-	 *
-	 * @param      string $uri
-	 * @param      string $localName The local name (without prefix), or the empty string if
-	 *		 Namespace processing is not being performed.
-	 * @param      string $rawName The qualified name (with prefix), or the empty string if
-	 *		 qualified names are not available.
-	 * @param      string $attributes The specified or defaulted attributes
-	 */
-	public function startElement($name, $attributes) {
-
-		try {
-
-	  $parentTag = $this->peekCurrentSchemaTag();
-
-	  if ($parentTag === false) {
-
-				switch($name) {
-					case "database":
-						if ($this->isExternalSchema()) {
-							$this->currentPackage = @$attributes["package"];
-							if ($this->currentPackage === null) {
-								$this->currentPackage = $this->defaultPackage;
-							}
-						} else {
-							$this->currDB = $this->app->addDatabase($attributes);
-						}
-					break;
-
-					default:
-						$this->_throwInvalidTagException($name);
-				}
-
-			} elseif  ($parentTag == "database") {
-
-				switch($name) {
-
-					case "external-schema":
-						$xmlFile = @$attributes["filename"];
-
-						//"referenceOnly" attribute is valid in the main schema XML file only,
-						//and it's ingnored in the nested external-schemas
-						if (!$this->isExternalSchema()) {
-							$isForRefOnly = @$attributes["referenceOnly"];
-							$this->isForReferenceOnly = ($isForRefOnly !== null ? (strtolower($isForRefOnly) === "true") : true); // defaults to TRUE
-						}
-
-						if ($xmlFile{0} != '/') {
-							$f = new PhingFile($this->currentXmlFile);
-							$xf = new PhingFile($f->getParent(), $xmlFile);
-							$xmlFile = $xf->getPath();
-						}
-
-						$this->parseFile($xmlFile);
-					break;
-
-    		  case "domain":
-					  $this->currDB->addDomain($attributes);
-				  break;
-
-					case "table":
-						$this->currTable = $this->currDB->addTable($attributes);
-						if ($this->isExternalSchema()) {
-							$this->currTable->setForReferenceOnly($this->isForReferenceOnly);
-							$this->currTable->setPackage($this->currentPackage);
-						}
-					break;
-
-					case "vendor":
-						$this->currVendorObject = $this->currDB->addVendorInfo($attributes);
-					break;
-
-					case "behavior":
-					  $this->currBehavior = $this->currDB->addBehavior($attributes);
-					break;
-
-					default:
-						$this->_throwInvalidTagException($name);
-				}
-
-			} elseif  ($parentTag == "table") {
-
-				switch($name) {
-					case "column":
-						$this->currColumn = $this->currTable->addColumn($attributes);
-					break;
-
-					case "foreign-key":
-						$this->currFK = $this->currTable->addForeignKey($attributes);
-					break;
-
-					case "index":
-						$this->currIndex = $this->currTable->addIndex($attributes);
-					break;
-
-					case "unique":
-						$this->currUnique = $this->currTable->addUnique($attributes);
-					break;
-
-					case "vendor":
-						$this->currVendorObject = $this->currTable->addVendorInfo($attributes);
-					break;
-
-		  		case "validator":
-					  $this->currValidator = $this->currTable->addValidator($attributes);
-		  		break;
-
-		  		case "id-method-parameter":
-						$this->currTable->addIdMethodParameter($attributes);
-					break;
-          
-					case "behavior":
-					  $this->currBehavior = $this->currTable->addBehavior($attributes);
-					break;
-					
-					default:
-						$this->_throwInvalidTagException($name);
-				}
-
-			} elseif  ($parentTag == "column") {
-
-				switch($name) {
-					case "inheritance":
-						$this->currColumn->addInheritance($attributes);
-					break;
-
-					case "vendor":
-						$this->currVendorObject = $this->currColumn->addVendorInfo($attributes);
-					break;
-
-					default:
-						$this->_throwInvalidTagException($name);
-				}
-
-			} elseif ($parentTag == "foreign-key") {
-
-				switch($name) {
-					case "reference":
-						$this->currFK->addReference($attributes);
-					break;
-
-					case "vendor":
-						$this->currVendorObject = $this->currUnique->addVendorInfo($attributes);
-					break;
-
-					default:
-						$this->_throwInvalidTagException($name);
-				}
-
-			} elseif  ($parentTag == "index") {
-
-				switch($name) {
-					case "index-column":
-						$this->currIndex->addColumn($attributes);
-					break;
-
-					case "vendor":
-						$this->currVendorObject = $this->currIndex->addVendorInfo($attributes);
-					break;
-
-					default:
-						$this->_throwInvalidTagException($name);
-				}
-
-			} elseif ($parentTag == "unique") {
-
-				switch($name) {
-					case "unique-column":
-						$this->currUnique->addColumn($attributes);
-					break;
-
-					case "vendor":
-						$this->currVendorObject = $this->currUnique->addVendorInfo($attributes);
-					break;
-
-					default:
-						$this->_throwInvalidTagException($name);
-				}
-			} elseif ($parentTag == "behavior") {
-
-				switch($name) {
-					case "parameter":
-						$this->currBehavior->addParameter($attributes);
-					break;
-
-					default:
-						$this->_throwInvalidTagException($name);
-				}
-			} elseif ($parentTag == "validator") {
-				switch($name) {
-					case "rule":
-						$this->currValidator->addRule($attributes);
-					break;
-					default:
-						$this->_throwInvalidTagException($name);
-				}
-			} elseif ($parentTag == "vendor") {
-
-				switch($name) {
-					case "parameter":
-						$this->currVendorObject->addParameter($attributes);
-					break;
-					default:
-						$this->_throwInvalidTagException($name);
-				}
-
-			} else {
-				// it must be an invalid tag
-				$this->_throwInvalidTagException($name);
-			}
-
-			$this->pushCurrentSchemaTag($name);
-
-		} catch (BuildException $e) {
-			throw $e;
-		} catch (Exception $e) {
-			echo $e;
-			echo "\n";
-			throw $e;
-		}
-	}
-
-	function _throwInvalidTagException($tag_name)
-	{
-		throw new BuildException("Unexpected tag <" . $tag_name . ">", $this->parser->getLocation());
-	}
-
-	/**
-	 * Handles closing elements of the xml file.
-	 *
-	 * @param      uri
-	 * @param      localName The local name (without prefix), or the empty string if
-	 *		 Namespace processing is not being performed.
-	 * @param      rawName The qualified name (with prefix), or the empty string if
-	 *		 qualified names are not available.
-	 */
-	public function endElement($name)
-	{
-		if (self::DEBUG) {
-			print("endElement(" . $name . ") called\n");
-		}
-
-		$this->popCurrentSchemaTag();
-	}
-
-	protected function peekCurrentSchemaTag()
-	{
-				$keys = array_keys($this->schemasTagsStack);
-		return end($this->schemasTagsStack[end($keys)]);
-	}
-
-	protected function popCurrentSchemaTag()
-	{
-				$keys = array_keys($this->schemasTagsStack);
-		array_pop($this->schemasTagsStack[end($keys)]);
-	}
-
-	protected function pushCurrentSchemaTag($tag)
-	{
-				$keys = array_keys($this->schemasTagsStack);
-		$this->schemasTagsStack[end($keys)][] = $tag;
-	}
-
-	protected function isExternalSchema()
-	{
-		return (sizeof($this->schemasTagsStack) > 1);
-	}
-
-	protected function isAlreadyParsed($filePath)
-	{
-		return isset($this->schemasTagsStack[$filePath]);
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/DefaultPlatform.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/DefaultPlatform.php
deleted file mode 100644
index f8710e8b5..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/DefaultPlatform.php
+++ /dev/null
@@ -1,309 +0,0 @@
-<?php
-/*
- *  $Id: DefaultPlatform.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/platform/Platform.php';
-include_once 'propel/engine/database/model/Domain.php';
-include_once 'propel/engine/database/model/PropelTypes.php';
-
-/**
- * Default implementation for the Platform interface.
- *
- * @author     Martin Poeschl <mpoeschl@marmot.at> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.platform
- */
-class DefaultPlatform implements Platform {
-
-	/**
-	 * Mapping from Propel types to Domain objects.
-	 *
-	 * @var        array
-	 */
-	private $schemaDomainMap;
-
-	/**
-	 * GeneratorConfig object holding build properties.
-	 *
-	 * @var        GeneratorConfig
-	 */
-	private $generatorConfig;
-
-	/**
-	 * @var        PDO Database connection.
-	 */
-	private $con;
-
-	/**
-	 * Default constructor.
-	 * @param      PDO $con Optional database connection to use in this platform.
-	 */
-	public function __construct(PDO $con = null)
-	{
-		if ($con) $this->setConnection($con);
-		$this->initialize();
-	}
-
-	/**
-	 * Set the database connection to use for this Platform class.
-	 * @param      PDO $con Database connection to use in this platform.
-	 */
-	public function setConnection(PDO $con = null)
-	{
-		$this->con = $con;
-	}
-
-	/**
-	 * Sets the GeneratorConfig to use in the parsing.
-	 *
-	 * @param      GeneratorConfig $config
-	 */
-	public function setGeneratorConfig(GeneratorConfig $config)
-	{
-		$this->generatorConfig = $config;
-	}
-
-	/**
-	 * Gets the GeneratorConfig option.
-	 *
-	 * @return     GeneratorConfig
-	 */
-	public function getGeneratorConfig()
-	{
-		return $this->generatorConfig;
-	}
-
-	/**
-	 * Gets a specific propel (renamed) property from the build.
-	 *
-	 * @param      string $name
-	 * @return     mixed
-	 */
-	protected function getBuildProperty($name)
-	{
-		if ($this->generatorConfig !== null) {
-			return $this->generatorConfig->getBuildProperty($name);
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the database connection to use for this Platform class.
-	 * @return     PDO The database connection or NULL if none has been set.
-	 */
-	public function getConnection()
-	{
-		return $this->con;
-	}
-
-	/**
-	 * Initialize the type -> Domain mapping.
-	 */
-	protected function initialize()
-	{
-		$this->schemaDomainMap = array();
-		foreach (PropelTypes::getPropelTypes() as $type) {
-			$this->schemaDomainMap[$type] = new Domain($type);
-		}
-		// BU_* no longer needed, so map these to the DATE/TIMESTAMP domains
-		$this->schemaDomainMap[PropelTypes::BU_DATE] = new Domain(PropelTypes::DATE);
-		$this->schemaDomainMap[PropelTypes::BU_TIMESTAMP] = new Domain(PropelTypes::TIMESTAMP);
-
-		// Boolean is a bit special, since typically it must be mapped to INT type.
-		$this->schemaDomainMap[PropelTypes::BOOLEAN] = new Domain(PropelTypes::BOOLEAN, "INTEGER");
-	}
-
-	/**
-	 * Adds a mapping entry for specified Domain.
-	 * @param      Domain $domain
-	 */
-	protected function setSchemaDomainMapping(Domain $domain)
-	{
-		$this->schemaDomainMap[$domain->getType()] = $domain;
-	}
-
-	/**
-	 * Returns the short name of the database type that this platform represents.
-	 * For example MysqlPlatform->getDatabaseType() returns 'mysql'.
-	 * @return     string
-	 */
-	public function getDatabaseType()
-	{
-		$clazz = get_class($this);
-		$pos = strpos($clazz, 'Platform');
-		return strtolower(substr($clazz,0,$pos));
-	}
-
-	/**
-	 * @see        Platform::getMaxColumnNameLength()
-	 */
-	public function getMaxColumnNameLength()
-	{
-		return 64;
-	}
-
-	/**
-	 * @see        Platform::getNativeIdMethod()
-	 */
-	public function getNativeIdMethod()
-	{
-		return Platform::IDENTITY;
-	}
-
-	/**
-	 * @see        Platform::getDomainForType()
-	 */
-	public function getDomainForType($propelType)
-	{
-		if (!isset($this->schemaDomainMap[$propelType])) {
-			throw new EngineException("Cannot map unknown Propel type " . var_export($propelType, true) . " to native database type.");
-		}
-		return $this->schemaDomainMap[$propelType];
-	}
-
-	/**
-	 * @return     string Returns the SQL fragment to use if null values are disallowed.
-	 * @see        Platform::getNullString(boolean)
-	 */
-	public function getNullString($notNull)
-	{
-		return ($notNull ? "NOT NULL" : "");
-	}
-
-	/**
-	 * @see        Platform::getAutoIncrement()
-	 */
-	public function getAutoIncrement()
-	{
-		return "IDENTITY";
-	}
-
-	/**
-	 * @see        Platform::hasScale(String)
-	 */
-	public function hasScale($sqlType)
-	{
-		return true;
-	}
-
-	/**
-	 * @see        Platform::hasSize(String)
-	 */
-	public function hasSize($sqlType)
-	{
-		return true;
-	}
-
-	/**
-	 * @see        Platform::quote()
-	 */
-	public function quote($text)
-	{
-		if ($this->getConnection()) {
-			return $this->getConnection()->quote($text);
-		} else {
-			return "'" . $this->disconnectedEscapeText($text) . "'";
-		}
-	}
-
-	/**
-	 * Method to escape text when no connection has been set.
-	 *
-	 * The subclasses can implement this using string replacement functions
-	 * or native DB methods.
-	 *
-	 * @param      string $text Text that needs to be escaped.
-	 * @return     string
-	 */
-	protected function disconnectedEscapeText($text)
-	{
-		return str_replace("'", "''", $text);
-	}
-
-	/**
-	 * @see        Platform::quoteIdentifier()
-	 */
-	public function quoteIdentifier($text)
-	{
-		return '"' . $text . '"';
-	}
-
-	/**
-	 * @see        Platform::supportsNativeDeleteTrigger()
-	 */
-	public function supportsNativeDeleteTrigger()
-	{
-		return false;
-	}
-
-	/**
-	 * @see        Platform::supportsInsertNullPk()
-	 */
-	public function supportsInsertNullPk()
-	{
-		return true;
-	}
-	
-	/**
-	 * Whether the underlying PDO driver for this platform returns BLOB columns as streams (instead of strings).
-	 * @return     boolean
-	 */
-	public function hasStreamBlobImpl()
-	{
-		return false;
-	}
-
-	/**
-	 * @see        Platform::getBooleanString()
-	 */
-	public function getBooleanString($b)
-	{
-		$b = ($b === true || strtolower($b) === 'true' || $b === 1 || $b === '1' || strtolower($b) === 'y' || strtolower($b) === 'yes');
-		return ($b ? '1' : '0');
-	}
-
-	/**
-	 * Gets the preferred timestamp formatter for setting date/time values.
-	 * @return     string
-	 */
-	public function getTimestampFormatter()
-	{
-		return DateTime::ISO8601;
-	}
-
-	/**
-	 * Gets the preferred time formatter for setting date/time values.
-	 * @return     string
-	 */
-	public function getTimeFormatter()
-	{
-		return 'H:i:s';
-	}
-
-	/**
-	 * Gets the preferred date formatter for setting date/time values.
-	 * @return     string
-	 */
-	public function getDateFormatter()
-	{
-		return 'Y-m-d';
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/MssqlPlatform.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/MssqlPlatform.php
deleted file mode 100644
index a486a7c0b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/MssqlPlatform.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/*
- *  $Id: MssqlPlatform.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/platform/DefaultPlatform.php';
-include_once 'propel/engine/database/model/Domain.php';
-
-/**
- * MS SQL Platform implementation.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Martin Poeschl <mpoeschl@marmot.at> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.platform
- */
-class MssqlPlatform extends DefaultPlatform {
-
-	/**
-	 * Initializes db specific domain mapping.
-	 */
-	protected function initialize()
-	{
-		parent::initialize();
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::INTEGER, "INT"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BOOLEAN, "INT"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::DOUBLE, "FLOAT"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARCHAR, "TEXT"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::CLOB, "TEXT"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::DATE, "DATETIME"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BU_DATE, "DATETIME"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::TIME, "DATETIME"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::TIMESTAMP, "DATETIME"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BU_TIMESTAMP, "DATETIME"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BINARY, "BINARY(7132)"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::VARBINARY, "IMAGE"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARBINARY, "IMAGE"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BLOB, "IMAGE"));
-	}
-
-	/**
-	 * @see        Platform#getMaxColumnNameLength()
-	 */
-	public function getMaxColumnNameLength()
-	{
-		return 128;
-	}
-
-	/**
-	 * @return     Explicitly returns <code>NULL</code> if null values are
-	 * allowed (as recomended by Microsoft).
-	 * @see        Platform#getNullString(boolean)
-	 */
-	public function getNullString($notNull)
-	{
-		return ($notNull ? "NOT NULL" : "NULL");
-	}
-
-	/**
-	 * @see        Platform::supportsNativeDeleteTrigger()
-	 */
-	public function supportsNativeDeleteTrigger()
-	{
-		return true;
-	}
-
-	/**
-	 * @see        Platform::supportsInsertNullPk()
-	 */
-	public function supportsInsertNullPk()
-	{
-		return false;
-	}
-	
-	/**
-	 * @see        Platform::hasSize(String)
-	 */
-	public function hasSize($sqlType)
-	{
-		return !("INT" == $sqlType || "TEXT" == $sqlType);
-	}
-
-	/**
-	 * @see        Platform::quoteIdentifier()
-	 */
-	public function quoteIdentifier($text)
-	{
-		return '[' . $text . ']';
-	}
-
-   /**
-   * Gets the preferred timestamp formatter for setting date/time values.
-   * @return     string
-   */
-  public function getTimestampFormatter()
-  {
-    return 'Y-m-d H:i:s';
-  }
-
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/MysqlPlatform.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/MysqlPlatform.php
deleted file mode 100644
index 68ff4029a..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/MysqlPlatform.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/*
- *  $Id: MysqlPlatform.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/platform/DefaultPlatform.php';
-
-/**
- * MySql Platform implementation.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Martin Poeschl <mpoeschl@marmot.at> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.platform
- */
-class MysqlPlatform extends DefaultPlatform {
-
-	/**
-	 * Initializes db specific domain mapping.
-	 */
-	protected function initialize()
-	{
-		parent::initialize();
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BOOLEAN, "TINYINT"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::NUMERIC, "DECIMAL"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARCHAR, "TEXT"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BINARY, "BLOB"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::VARBINARY, "MEDIUMBLOB"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARBINARY, "LONGBLOB"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BLOB, "LONGBLOB"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::CLOB, "LONGTEXT"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::TIMESTAMP, "DATETIME"));
-	}
-
-	/**
-	 * @see        Platform#getAutoIncrement()
-	 */
-	public function getAutoIncrement()
-	{
-		return "AUTO_INCREMENT";
-	}
-
-	/**
-	 * @see        Platform#getMaxColumnNameLength()
-	 */
-	public function getMaxColumnNameLength()
-	{
-		return 64;
-	}
-
-	/**
-	 * @see        Platform::supportsNativeDeleteTrigger()
-	 */
-	public function supportsNativeDeleteTrigger()
-	{
-		$usingInnoDB = false;
-		if (class_exists('DataModelBuilder', false))
-		{
-			$usingInnoDB = strtolower($this->getBuildProperty('mysqlTableType')) == 'innodb';
-		}
-		return $usingInnoDB || false;
-	}
-
-	/**
-	 * @see        Platform#hasSize(String)
-	 */
-	public function hasSize($sqlType)
-	{
-		return !("MEDIUMTEXT" == $sqlType || "LONGTEXT" == $sqlType
-				|| "BLOB" == $sqlType || "MEDIUMBLOB" == $sqlType
-				|| "LONGBLOB" == $sqlType);
-	}
-
-	/**
-	 * Escape the string for RDBMS.
-	 * @param      string $text
-	 * @return     string
-	 */
-	public function disconnectedEscapeText($text)
-	{
-		if (function_exists('mysql_escape_string')) {
-			return mysql_escape_string($text);
-		} else {
-			return addslashes($text);
-		}
-	}
-
-	/**
-	 * @see        Platform::quoteIdentifier()
-	 */
-	public function quoteIdentifier($text)
-	{
-		return '`' . $text . '`';
-	}
-
-	/**
-	 * Gets the preferred timestamp formatter for setting date/time values.
-	 * @return     string
-	 */
-	public function getTimestampFormatter()
-	{
-		return 'Y-m-d H:i:s';
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/OraclePlatform.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/OraclePlatform.php
deleted file mode 100644
index 06217c992..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/OraclePlatform.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/*
- *  $Id: OraclePlatform.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/platform/DefaultPlatform.php';
-
-/**
- * Oracle Platform implementation.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Martin Poeschl <mpoeschl@marmot.at> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.platform
- */
-class OraclePlatform extends DefaultPlatform {
-
-	/**
-	 * Initializes db specific domain mapping.
-	 */
-	protected function initialize()
-	{
-		parent::initialize();
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BOOLEAN, "NUMBER", "1", "0"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::TINYINT, "NUMBER", "3", "0"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::SMALLINT, "NUMBER", "5", "0"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::INTEGER, "NUMBER"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BIGINT, "NUMBER", "20", "0"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::REAL, "NUMBER"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::DOUBLE, "FLOAT"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::DECIMAL, "NUMBER"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::NUMERIC, "NUMBER"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::VARCHAR, "NVARCHAR2"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARCHAR, "NVARCHAR2", "2000")); 
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::TIME, "TIME")); 
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::DATE, "DATE")); 
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::TIMESTAMP, "TIMESTAMP")); 
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BINARY, "LONG RAW"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::VARBINARY, "BLOB"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARBINARY, "LONG RAW"));
-	}
-
-	/**
-	 * @see        Platform#getMaxColumnNameLength()
-	 */
-	public function getMaxColumnNameLength()
-	{
-		return 30;
-	}
-
-	/**
-	 * @see        Platform#getNativeIdMethod()
-	 */
-	public function getNativeIdMethod()
-	{
-		return Platform::SEQUENCE;
-	}
-
-	/**
-	 * @see        Platform#getAutoIncrement()
-	 */
-	public function getAutoIncrement()
-	{
-		return "";
-	}
-
-	/**
-	 * @see        Platform::supportsNativeDeleteTrigger()
-	 */
-	public function supportsNativeDeleteTrigger()
-	{
-		return true;
-	}
-
-	/**
-	 * Whether the underlying PDO driver for this platform returns BLOB columns as streams (instead of strings).
-	 * @return     boolean
-	 */
-	public function hasStreamBlobImpl()
-	{
-		return true;
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/PgsqlPlatform.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/PgsqlPlatform.php
deleted file mode 100644
index 99e919e4e..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/PgsqlPlatform.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/*
- *  $Id: PgsqlPlatform.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/platform/DefaultPlatform.php';
-
-/**
- * Postgresql Platform implementation.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Martin Poeschl <mpoeschl@marmot.at> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.platform
- */
-class PgsqlPlatform extends DefaultPlatform {
-
-	/**
-	 * Initializes db specific domain mapping.
-	 */
-	protected function initialize()
-	{
-		parent::initialize();
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BOOLEAN, "BOOLEAN"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::TINYINT, "INT2"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::SMALLINT, "INT2"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BIGINT, "INT8"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::REAL, "FLOAT"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::DOUBLE, "DOUBLE PRECISION"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARCHAR, "TEXT"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BINARY, "BYTEA"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::VARBINARY, "BYTEA"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARBINARY, "BYTEA"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BLOB, "BYTEA"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::CLOB, "TEXT"));
-	}
-
-	/**
-	 * @see        Platform#getNativeIdMethod()
-	 */
-	public function getNativeIdMethod()
-	{
-		return Platform::SERIAL;
-	}
-
-	/**
-	 * @see        Platform#getAutoIncrement()
-	 */
-	public function getAutoIncrement()
-	{
-		return "";
-	}
-
-	/**
-	 * @see        Platform#getMaxColumnNameLength()
-	 */
-	public function getMaxColumnNameLength()
-	{
-		return 32;
-	}
-
-	/**
-	 * Escape the string for RDBMS.
-	 * @param      string $text
-	 * @return     string
-	 */
-	public function disconnectedEscapeText($text)
-	{
-		if (function_exists('pg_escape_string')) {
-			return pg_escape_string($text);
-		} else {
-			return parent::disconnectedEscapeText($text);
-		}
-	}
-
-	/**
-	 * @see        Platform::getBooleanString()
-	 */
-	public function getBooleanString($b)
-	{
-		// parent method does the checking for allowes tring
-		// representations & returns integer
-		$b = parent::getBooleanString($b);
-		return ($b ? "'t'" : "'f'");
-	}
-
-	/**
-	 * @see        Platform::supportsNativeDeleteTrigger()
-	 */
-	public function supportsNativeDeleteTrigger()
-	{
-		return true;
-	}
-
-	/**
-	 * @see        Platform::hasSize(String)
-	 * TODO collect info for all platforms
-	 */
-	public function hasSize($sqlType)
-	{
-		return !("BYTEA" == $sqlType || "TEXT" == $sqlType);
-	}
-
-	/**
-	 * Whether the underlying PDO driver for this platform returns BLOB columns as streams (instead of strings).
-	 * @return     boolean
-	 */
-	public function hasStreamBlobImpl()
-	{
-		return true;
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/Platform.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/Platform.php
deleted file mode 100644
index bf5b449a4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/Platform.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-/*
- *  $Id: Platform.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * Interface for RDBMS platform specific behaviour.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Martin Poeschl <mpoeschl@marmot.at> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.engine.platform
- */
-interface Platform {
-
-	/**
-	 * Constant for auto-increment id method.
-	 */
-	const IDENTITY = "identity";
-
-	/**
-	 * Constant for sequence id method.
-	 */
-	const SEQUENCE = "sequence";
-
-	/**
-	 * Constant for serial id method (postgresql).
-	 */
-	const SERIAL = "serial";
-
-	/**
-	 * Sets a database connection to use (for quoting, etc.).
-	 * @param      PDO $con The database connection to use in this Platform class.
-	 */
-	public function setConnection(PDO $con = null);
-
-	/**
-	 * Returns the database connection to use for this Platform class.
-	 * @return     PDO The database connection or NULL if none has been set.
-	 */
-	public function getConnection();
-
-	/**
-	 * Sets the GeneratorConfig which contains any generator build properties.
-	 *
-	 * @param      GeneratorConfig $config
-	 */
-	public function setGeneratorConfig(GeneratorConfig $config);
-
-	/**
-	 * Gets the GeneratorConfig object.
-	 *
-	 * @return     GeneratorConfig
-	 */
-	public function getGeneratorConfig();
-
-	/**
-	 * Returns the short name of the database type that this platform represents.
-	 * For example MysqlPlatform->getDatabaseType() returns 'mysql'.
-	 * @return     string
-	 */
-	public function getDatabaseType();
-
-	/**
-	 * Returns the native IdMethod (sequence|identity)
-	 *
-	 * @return     string The native IdMethod (Platform:IDENTITY, Platform::SEQUENCE).
-	 */
-	public function getNativeIdMethod();
-
-	/**
-	 * Returns the max column length supported by the db.
-	 *
-	 * @return     int The max column length
-	 */
-	public function getMaxColumnNameLength();
-
-	/**
-	 * Returns the db specific domain for a jdbcType.
-	 *
-	 * @param      string $creoleType the creole type name.
-	 * @return     Domain The db specific domain.
-	 */
-	public function getDomainForType($creoleType);
-
-	/**
-	 * @return     string The RDBMS-specific SQL fragment for <code>NULL</code>
-	 * or <code>NOT NULL</code>.
-	 */
-	public function getNullString($notNull);
-
-	/**
-	 * @return     The RDBMS-specific SQL fragment for autoincrement.
-	 */
-	public function getAutoIncrement();
-
-	/**
-	 * Returns if the RDBMS-specific SQL type has a size attribute.
-	 *
-	 * @param      string $sqlType the SQL type
-	 * @return     boolean True if the type has a size attribute
-	 */
-	public function hasSize($sqlType);
-
-	/**
-	 * Returns if the RDBMS-specific SQL type has a scale attribute.
-	 *
-	 * @param      string $sqlType the SQL type
-	 * @return     boolean True if the type has a scale attribute
-	 */
-	public function hasScale($sqlType);
-
-	/**
-	 * Quote and escape needed characters in the string for unerlying RDBMS.
-	 * @param      string $text
-	 * @return     string
-	 */
-	public function quote($text);
-
-	/**
-	 * Quotes identifiers used in database SQL.
-	 * @param      string $text
-	 * @return     string Quoted identifier.
-	 */
-	public function quoteIdentifier($text);
-
-	/**
-	 * Whether RDBMS supports native ON DELETE triggers (e.g. ON DELETE CASCADE).
-	 * @return     boolean
-	 */
-	public function supportsNativeDeleteTrigger();
-  
-	/**
-	 * Whether RDBMS supports INSERT null values in autoincremented primary keys
-	 * @return     boolean
-	 */
-	public function supportsInsertNullPk();
-	
-	/**
-	 * Returns the boolean value for the RDBMS.
-	 *
-	 * This value should match the boolean value that is set
-	 * when using Creole's PreparedStatement::setBoolean().
-	 *
-	 * This function is used to set default column values when building
-	 * SQL.
-	 *
-	 * @param      mixed $tf A boolean or string representation of boolean ('y', 'true').
-	 * @return     mixed
-	 */
-	public function getBooleanString($tf);
-
-	/**
-	 * Whether the underlying PDO driver for this platform returns BLOB columns as streams (instead of strings).
-	 * @return     boolean
-	 */
-	public function hasStreamBlobImpl();
-
-	/**
-	 * Gets the preferred timestamp formatter for setting date/time values.
-	 * @return     string
-	 */
-	public function getTimestampFormatter();
-
-	/**
-	 * Gets the preferred date formatter for setting time values.
-	 * @return     string
-	 */
-	public function getDateFormatter();
-
-	/**
-	 * Gets the preferred time formatter for setting time values.
-	 * @return     string
-	 */
-	public function getTimeFormatter();
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/SqlitePlatform.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/SqlitePlatform.php
deleted file mode 100644
index 350c71710..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/engine/platform/SqlitePlatform.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/*
- *  $Id: SqlitePlatform.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/engine/platform/DefaultPlatform.php';
-
-/**
- * SQLite Platform implementation.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.engine.platform
- */
-class SqlitePlatform extends DefaultPlatform {
-
-	/**
-	 * Initializes db specific domain mapping.
-	 */
-	protected function initialize()
-	{
-		parent::initialize();
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::NUMERIC, "DECIMAL"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARCHAR, "MEDIUMTEXT"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::DATE, "DATETIME"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BINARY, "BLOB"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::VARBINARY, "MEDIUMBLOB"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::LONGVARBINARY, "LONGBLOB"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::BLOB, "LONGBLOB"));
-		$this->setSchemaDomainMapping(new Domain(PropelTypes::CLOB, "LONGTEXT"));
-	}
-
-	/**
-	 * @see        Platform#getAutoIncrement()
-	 * @link       http://www.sqlite.org/autoinc.html
-	 */
-	public function getAutoIncrement()
-	{
-
-		return "PRIMARY KEY";
-	}
-
-	/**
-	 * @see        Platform#getMaxColumnNameLength()
-	 */
-	public function getMaxColumnNameLength()
-	{
-		return 1024;
-	}
-
-	/**
-	 * @see        Platform#hasSize(String)
-	 */
-	public function hasSize($sqlType) {
-		return !("MEDIUMTEXT" == $sqlType || "LONGTEXT" == $sqlType
-				|| "BLOB" == $sqlType || "MEDIUMBLOB" == $sqlType
-				|| "LONGBLOB" == $sqlType);
-	}
-
-	/**
-	 * Escape the string for RDBMS.
-	 * @param      string $text
-	 * @return     string
-	 */
-	public function disconnectedEscapeText($text)
-	{
-		if (function_exists('sqlite_escape_string')) {
-			return sqlite_escape_string($text);
-		} else {
-			return parent::disconnectedEscapeText($text);
-		}
-	}
-
-	/**
-	 * @see        Platform::quoteIdentifier()
-	 */
-	public function quoteIdentifier($text)
-	{
-		return '[' . $text . ']';
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/AbstractPropelDataModelTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/AbstractPropelDataModelTask.php
deleted file mode 100644
index d9946d0d4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/AbstractPropelDataModelTask.php
+++ /dev/null
@@ -1,611 +0,0 @@
-<?php
-
-/*
- *  $Id: AbstractPropelDataModelTask.php 1684 2010-04-16 20:56:45Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-//include_once 'phing/tasks/ext/CapsuleTask.php';
-require_once 'phing/Task.php';
-include_once 'propel/engine/GeneratorConfig.php';
-include_once 'propel/engine/database/model/AppData.php';
-include_once 'propel/engine/database/model/Database.php';
-include_once 'propel/engine/database/transform/XmlToAppData.php';
-
-/**
- * An abstract base Propel task to perform work related to the XML schema file.
- *
- * The subclasses invoke templates to do the actual writing of the resulting files.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Jason van Zyl <jvanzyl@zenplex.com> (Torque)
- * @author     Daniel Rall <dlr@finemaltcoding.com> (Torque)
- * @package    propel.phing
- */
-abstract class AbstractPropelDataModelTask extends Task {
-
-	/**
-	 * Fileset of XML schemas which represent our data models.
-	 * @var        array Fileset[]
-	 */
-	protected $schemaFilesets = array();
-
-	/**
-	 * Data models that we collect. One from each XML schema file.
-	 */
-	protected $dataModels = array();
-
-	/**
-	 * Have datamodels been initialized?
-	 * @var        boolean
-	 */
-	private $dataModelsLoaded = false;
-
-	/**
-	 * Map of data model name to database name.
-	 * Should probably stick to the convention
-	 * of them being the same but I know right now
-	 * in a lot of cases they won't be.
-	 */
-	protected $dataModelDbMap;
-
-	/**
-	 * Hashtable containing the names of all the databases
-	 * in our collection of schemas.
-	 */
-	protected $databaseNames; // doesn't seem to be used anywhere
-
-	/**
-	 * The target database(s) we are generating SQL
-	 * for. Right now we can only deal with a single
-	 * target, but we will support multiple targets
-	 * soon.
-	 */
-	protected $targetDatabase;
-
-	/**
-	 * DB encoding to use for XmlToAppData object
-	 */
-	protected $dbEncoding = 'iso-8859-1';
-
-	/**
-	 * Target PHP package to place the generated files in.
-	 */
-	protected $targetPackage;
-
-	/**
-	 * @var        Mapper
-	 */
-	protected $mapperElement;
-
-	/**
-	 * Destination directory for results of template scripts.
-	 * @var        PhingFile
-	 */
-	protected $outputDirectory;
-
-	/**
-	 * Whether to package the datamodels or not
-	 * @var        PhingFile
-	 */
-	protected $packageObjectModel;
-
-	/**
-	 * Whether to perform validation (XSD) on the schema.xml file(s).
-	 * @var        boolean
-	 */
-	protected $validate;
-
-	/**
-	 * The XSD schema file to use for validation.
-	 * @var        PhingFile
-	 */
-	protected $xsdFile;
-
-	/**
-	 * XSL file to use to normalize (or otherwise transform) schema before validation.
-	 * @var        PhingFile
-	 */
-	protected $xslFile;
-
-	/**
-	 * Optional database connection url.
-	 * @var        string
-	 */
-	private $url = null;
-
-	/**
-	 * Optional database connection user name.
-	 * @var        string
-	 */
-	private $userId = null;
-
-	/**
-	 * Optional database connection password.
-	 * @var        string
-	 */
-	private $password = null;
-
-	/**
-	 * PDO Connection.
-	 * @var        PDO
-	 */
-	private $conn = false;
-
-	/**
-	 * An initialized GeneratorConfig object containing the converted Phing props.
-	 *
-	 * @var        GeneratorConfig
-	 */
-	private $generatorConfig;
-
-	/**
-	 * Return the data models that have been
-	 * processed.
-	 *
-	 * @return     List data models
-	 */
-	public function getDataModels()
-	{
-		if (!$this->dataModelsLoaded) $this->loadDataModels();
-		return $this->dataModels;
-	}
-
-	/**
-	 * Return the data model to database name map.
-	 *
-	 * @return     Hashtable data model name to database name map.
-	 */
-	public function getDataModelDbMap()
-	{
-		if (!$this->dataModelsLoaded) $this->loadDataModels();
-		return $this->dataModelDbMap;
-	}
-
-	/**
-	 * Adds a set of xml schema files (nested fileset attribute).
-	 *
-	 * @param      set a Set of xml schema files
-	 */
-	public function addSchemaFileset(Fileset $set)
-	{
-		$this->schemaFilesets[] = $set;
-	}
-
-	/**
-	 * Get the current target database.
-	 *
-	 * @return     String target database(s)
-	 */
-	public function getTargetDatabase()
-	{
-		return $this->targetDatabase;
-	}
-
-	/**
-	 * Set the current target database. (e.g. mysql, oracle, ..)
-	 *
-	 * @param      v target database(s)
-	 */
-	public function setTargetDatabase($v)
-	{
-		$this->targetDatabase = $v;
-	}
-
-	/**
-	 * Get the current target package.
-	 *
-	 * @return     string target PHP package.
-	 */
-	public function getTargetPackage()
-	{
-		return $this->targetPackage;
-	}
-
-	/**
-	 * Set the current target package. This is where generated PHP classes will
-	 * live.
-	 *
-	 * @param      string $v target PHP package.
-	 */
-	public function setTargetPackage($v)
-	{
-		$this->targetPackage = $v;
-	}
-
-	/**
-	 * Set the packageObjectModel switch on/off
-	 *
-	 * @param      string $v The build.property packageObjectModel
-	 */
-	public function setPackageObjectModel($v)
-	{
-		$this->packageObjectModel = ($v === '1' ? true : false);
-	}
-
-	/**
-	 * Set whether to perform validation on the datamodel schema.xml file(s).
-	 * @param      boolean $v
-	 */
-	public function setValidate($v)
-	{
-		$this->validate = $v;
-	}
-
-	/**
-	 * Set the XSD schema to use for validation of any datamodel schema.xml file(s).
-	 * @param      $v PhingFile
-	 */
-	public function setXsd(PhingFile $v)
-	{
-		$this->xsdFile = $v;
-	}
-
-	/**
-	 * Set the normalization XSLT to use to transform datamodel schema.xml file(s) before validation and parsing.
-	 * @param      $v PhingFile
-	 */
-	public function setXsl(PhingFile $v)
-	{
-		$this->xslFile = $v;
-	}
-
-	/**
-	 * [REQUIRED] Set the output directory. It will be
-	 * created if it doesn't exist.
-	 * @param      PhingFile $outputDirectory
-	 * @return     void
-	 * @throws     Exception
-	 */
-	public function setOutputDirectory(PhingFile $outputDirectory) {
-		try {
-			if (!$outputDirectory->exists()) {
-				$this->log("Output directory does not exist, creating: " . $outputDirectory->getPath(),Project::MSG_VERBOSE);
-				if (!$outputDirectory->mkdirs()) {
-					throw new IOException("Unable to create Ouptut directory: " . $outputDirectory->getAbsolutePath());
-				}
-			}
-			$this->outputDirectory = $outputDirectory->getCanonicalPath();
-		} catch (IOException $ioe) {
-			throw new BuildException($ioe);
-		}
-	}
-
-	/**
-	 * Set the current target database encoding.
-	 *
-	 * @param      v target database encoding
-	 */
-	public function setDbEncoding($v)
-	{
-		$this->dbEncoding = $v;
-	}
-
-	/**
-	 * Set the DB connection url.
-	 *
-	 * @param      string $url connection url
-	 */
-	public function setUrl($url)
-	{
-		$this->url = $url;
-	}
-
-	/**
-	 * Set the user name for the DB connection.
-	 *
-	 * @param      string $userId database user
-	 */
-	public function setUserid($userId)
-	{
-		$this->userId = $userId;
-	}
-
-	/**
-	 * Set the password for the DB connection.
-	 *
-	 * @param      string $password database password
-	 */
-	public function setPassword($password)
-	{
-		$this->password = $password;
-	}
-
-	/**
-	 * Get the output directory.
-	 * @return     string
-	 */
-	public function getOutputDirectory() {
-		return $this->outputDirectory;
-	}
-
-	/**
-	 * Nested creator, creates one Mapper for this task.
-	 *
-	 * @return     Mapper  The created Mapper type object.
-	 * @throws     BuildException
-	 */
-	public function createMapper() {
-		if ($this->mapperElement !== null) {
-			throw new BuildException("Cannot define more than one mapper.", $this->location);
-		}
-		$this->mapperElement = new Mapper($this->project);
-		return $this->mapperElement;
-	}
-
-	/**
-	 * Maps the passed in name to a new filename & returns resolved File object.
-	 * @param      string $from
-	 * @return     PhingFile Resolved File object.
-	 * @throws     BuilException    - if no Mapper element se
-	 *                          - if unable to map new filename.
-	 */
-	protected function getMappedFile($from)
-	{
-		if (!$this->mapperElement) {
-			throw new BuildException("This task requires you to use a <mapper/> element to describe how filename changes should be handled.");
-		}
-
-		$mapper = $this->mapperElement->getImplementation();
-		$mapped = $mapper->main($from);
-		if (!$mapped) {
-			throw new BuildException("Cannot create new filename based on: " . $from);
-		}
-		// Mappers always return arrays since it's possible for some mappers to map to multiple names.
-		$outFilename = array_shift($mapped);
-		$outFile = new PhingFile($this->getOutputDirectory(), $outFilename);
-		return $outFile;
-	}
-
-	/**
-	 * Gets the PDO connection, if URL specified.
-	 * @return     PDO Connection to use (for quoting, Platform class, etc.) or NULL if no connection params were specified.
-	 */
-	public function getConnection()
-	{
-		if ($this->conn === false) {
-			$this->conn = null;
-			if ($this->url) {
-				$buf = "Using database settings:\n"
-					. " URL: " . $this->url . "\n"
-					. ($this->userId ? " user: " . $this->userId . "\n" : "")
-				. ($this->password ? " password: " . $this->password . "\n" : "");
-
-				$this->log($buf, Project::MSG_VERBOSE);
-
-				// Set user + password to null if they are empty strings
-				if (!$this->userId) { $this->userId = null; }
-				if (!$this->password) { $this->password = null; }
-				try {
-					$this->conn = new PDO($this->url, $this->userId, $this->password);
-					$this->conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-				} catch (PDOException $x) {
-					$this->log("Unable to create a PDO connection: " . $x->getMessage(), Project::MSG_WARN);
-				}
-			}
-		}
-		return $this->conn;
-	}
-
-	/**
-	 * Gets all matching XML schema files and loads them into data models for class.
-	 * @return     void
-	 */
-	protected function loadDataModels()
-	{
-		$ads = array();
-
-		// Get all matched files from schemaFilesets
-		foreach ($this->schemaFilesets as $fs) {
-			$ds = $fs->getDirectoryScanner($this->project);
-			$srcDir = $fs->getDir($this->project);
-
-			$dataModelFiles = $ds->getIncludedFiles();
-
-			$platform = $this->getGeneratorConfig()->getConfiguredPlatform();
-
-			// Make a transaction for each file
-			foreach ($dataModelFiles as $dmFilename) {
-
-				$this->log("Processing: ".$dmFilename);
-				$xmlFile = new PhingFile($srcDir, $dmFilename);
-
-				$dom = new DomDocument('1.0', 'UTF-8');
-				$dom->load($xmlFile->getAbsolutePath());
-
-				// normalize (or transform) the XML document using XSLT
-				if ($this->xslFile) {
-					$this->log("Transforming " . $xmlFile->getPath() . " using stylesheet " . $this->xslFile->getPath(), Project::MSG_VERBOSE);
-					if (!class_exists('XSLTProcessor')) {
-						$this->log("Could not perform XLST transformation.  Make sure PHP has been compiled/configured to support XSLT.", Project::MSG_ERR);
-					} else {
-						// modify schema to include any external schema's (and remove the external-schema nodes)
-						$this->includeExternalSchemas($dom, $srcDir);
-						// normalize the document using normalizer stylesheet
-
-						$xsl = new XsltProcessor();
-						$xsl->importStyleSheet(DomDocument::load($this->xslFile->getAbsolutePath()));
-						$transformed = $xsl->transformToDoc($dom);
-						$newXmlFilename = substr($xmlFile->getName(), 0, strrpos($xmlFile->getName(), '.')) . '-transformed.xml';
-
-						// now overwrite previous vars to point to newly transformed file
-						$xmlFile = new PhingFile($srcDir, $newXmlFilename);
-						$transformed->save($xmlFile->getAbsolutePath());
-						$this->log("\t- Using new (post-transformation) XML file: " . $xmlFile->getPath(), Project::MSG_VERBOSE);
-
-						$dom = new DomDocument('1.0', 'UTF-8');
-						$dom->load($xmlFile->getAbsolutePath());
-					}
-				}
-
-				// validate the XML document using XSD schema
-				if ($this->validate && $this->xsdFile) {
-					$this->log("Validating XML doc (".$xmlFile->getPath().") using schema file " . $this->xsdFile->getPath(), Project::MSG_VERBOSE);
-					if (!$dom->schemaValidate($this->xsdFile->getAbsolutePath())) {
-						throw new EngineException("XML schema file (".$xmlFile->getPath().") does not validate. See warnings above for reasons validation failed (make sure error_reporting is set to show E_WARNING if you don't see any).", $this->getLocation());
-					}
-				}
-
-				$xmlParser = new XmlToAppData($platform, $this->getTargetPackage(), $this->dbEncoding);
-				$ad = $xmlParser->parseFile($xmlFile->getAbsolutePath());
-				$ad->setName($dmFilename); // <-- Important: use the original name, not the -transformed name.
-				$ads[] = $ad;
-			}
-		}
-
-		if (empty($ads)) {
-			throw new BuildException("No schema files were found (matching your schema fileset definition).");
-		}
-
-		if (!$this->packageObjectModel) {
-
-			$this->dataModels = $ads;
-			$this->databaseNames = array(); // doesn't seem to be used anywhere
-			$this->dataModelDbMap = array();
-
-			// Different datamodels may state the same database
-			// names, we just want the unique names of databases.
-			foreach ($this->dataModels as $dm) {
-				$database = $dm->getDatabase();
-				$this->dataModelDbMap[$dm->getName()] = $database->getName();
-				$this->databaseNames[$database->getName()] = $database->getName(); // making list of *unique* dbnames.
-			}
-		} else {
-
-			$this->joinDatamodels($ads);
-			$this->dataModels[0]->getDatabases(); // calls doFinalInitialization()
-		}
-
-		$this->dataModelsLoaded = true;
-	}
-
-	/**
-	 * Replaces all external-schema nodes with the content of xml schema that node refers to
-	 *
-	 * Recurses to include any external schema referenced from in an included xml (and deeper)
-	 * Note: this function very much assumes at least a reasonable XML schema, maybe it'll proof
-	 * users don't have those and adding some more informative exceptions would be better
-	 *
-	 * @param      DomDocument $dom
-	 * @param      string $srcDir
-	 * @return     void (objects, DomDocument, are references by default in PHP 5, so returning it is useless)
-	 **/
-	protected function includeExternalSchemas(DomDocument $dom, $srcDir) {
-		$databaseNode = $dom->getElementsByTagName("database")->item(0);
-		$externalSchemaNodes = $dom->getElementsByTagName("external-schema");
-		$fs = FileSystem::getFileSystem();
-		while ($externalSchema = $externalSchemaNodes->item(0)) {
-			$include = $externalSchema->getAttribute("filename");
-			$externalSchema->parentNode->removeChild($externalSchema);
-			if ($fs->prefixLength($include) != 0) {
-				$externalSchemaFile = new PhingFile($include);
-			} else {
-				$externalSchemaFile = new PhingFile($srcDir, $include);
-			}
-			$externalSchemaDom = new DomDocument('1.0', 'UTF-8');
-			$externalSchemaDom->load($externalSchemaFile->getAbsolutePath());
-			$this->includeExternalSchemas($externalSchemaDom, $srcDir);
-			foreach ($externalSchemaDom->getElementsByTagName("table") as $tableNode) { // see xsd, datatase may only have table or external-schema, the latter was just deleted so this should cover everything
-				$databaseNode->appendChild($dom->importNode($tableNode, true));
-			}
-		}
-	}
-	/**
-	 * Joins the datamodels collected from schema.xml files into one big datamodel
-	 *
-	 * This applies only when the the packageObjectModel option is set. We need to
-	 * join the datamodels in this case to allow for foreign keys that point to
-	 * tables in different packages.
-	 *
-	 * @param      array $ads The datamodels to join
-	 */
-	protected function joinDatamodels($ads) {
-
-		foreach ($ads as $ad) {
-			$db = $ad->getDatabase(null, false);
-			$this->dataModelDbMap[$ad->getName()] = $db->getName();
-		}
-
-		foreach ($ads as $addAd) {
-
-			$ad = &$this->dataModels[0];
-			if (!isset($ad)) {
-				$addAd->setName('JoinedDataModel');
-				$ad = $addAd;
-				continue;
-			}
-			foreach ($addAd->getDatabases(false) as $addDb) {
-				$addDbName = $addDb->getName();
-				if (!$package = $addDb->getPackage()) {
-					throw new BuildException('No package found for database "' . $addDbName . '" in ' . $addAd->getName() . '. The propel.packageObjectModel property requires the package attribute to be set for each database.');
-				}
-				$db = $ad->getDatabase($addDbName, false);
-				if (!$db) {
-					$ad->addDatabase($addDb);
-					continue;
-				}
-				foreach ($addDb->getTables() as $addTable) {
-					$table = $db->getTable($addTable->getName());
-					if ($table) {
-						throw new BuildException('Duplicate table found: ' . $addDbName . '.');
-					}
-					$db->addTable($addTable);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Gets the GeneratorConfig object for this task or creates it on-demand.
-	 * @return     GeneratorConfig
-	 */
-	protected function getGeneratorConfig()
-	{
-		if ($this->generatorConfig === null) {
-			$this->generatorConfig = new GeneratorConfig();
-			$this->generatorConfig->setBuildProperties($this->getProject()->getProperties());
-		}
-		return $this->generatorConfig;
-	}
-
-	/**
-	 * Checks this class against Basic requrements of any propel datamodel task.
-	 *
-	 * @throws     BuildException 	- if schema fileset was not defined
-	 * 							- if no output directory was specified
-	 */
-	protected function validate()
-	{
-		if (empty($this->schemaFilesets)) {
-			throw new BuildException("You must specify a fileset of XML schemas.", $this->getLocation());
-		}
-
-		// Make sure the output directory is set.
-		if ($this->outputDirectory === null) {
-			throw new BuildException("The output directory needs to be defined!", $this->getLocation());
-		}
-
-		if ($this->validate) {
-			if (!$this->xsdFile) {
-				throw new BuildException("'validate' set to TRUE, but no XSD specified (use 'xsd' attribute).", $this->getLocation());
-			}
-		}
-
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelConvertConfTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelConvertConfTask.php
deleted file mode 100644
index f5f9c2804..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelConvertConfTask.php
+++ /dev/null
@@ -1,312 +0,0 @@
-<?php
-
-/*
- *  $Id: PropelConvertConfTask.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'phing/Task.php';
-require_once 'propel/phing/PropelDataModelTemplateTask.php';
-require_once 'propel/engine/builder/om/OMBuilder.php';
-include_once 'propel/engine/builder/om/ClassTools.php';
-
-/**
- * This Task converts the XML runtime configuration file into a PHP array for faster performance.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.phing
- */
-class PropelConvertConfTask extends AbstractPropelDataModelTask {
-
-	/**
-	 * @var        PhingFile The XML runtime configuration file to be converted.
-	 */
-	private $xmlConfFile;
-
-	/**
-	 * @var        string This is the file where the converted conf array dump will be placed.
-	 */
-	private $outputFile;
-
-	/**
-	 * @var        string This is the file where the classmap manifest converted conf array dump will be placed.
-	 */
-	private $outputClassmapFile;
-
-	/**
-	 * [REQUIRED] Set the input XML runtime conf file.
-	 * @param      PhingFile $v The XML runtime configuration file to be converted.
-	 */
-	public function setXmlConfFile(PhingFile $v)
-	{
-		$this->xmlConfFile = $v;
-	}
-
-	/**
-	 * [REQUIRED] Set the output filename for the converted runtime conf.
-	 * The directory is specified using AbstractPropelDataModelTask#setOutputDirectory().
-	 * @param      string $outputFile
-	 * @see        AbstractPropelDataModelTask#setOutputDirectory()
-	 */
-	public function setOutputFile($outputFile)
-	{
-		// this is a string, not a file
-		$this->outputFile = $outputFile;
-	}
-
-	/**
-	 * [REQUIRED] Set the output filename for the autoload classmap.
-	 * The directory is specified using AbstractPropelDataModelTask#setOutputDirectory().
-	 * @param      string $outputFile
-	 * @see        AbstractPropelDataModelTask#setOutputDirectory()
-	 */
-	public function setOutputClassmapFile($outputFile)
-	{
-		// this is a string, not a file
-		$this->outputClassmapFile = $outputFile;
-	}
-
-	/**
-	 * The main method does the work of the task.
-	 */
-	public function main()
-	{
-		// Check to make sure the input and output files were specified and that the input file exists.
-
-		if (!$this->xmlConfFile || !$this->xmlConfFile->exists()) {
-			throw new BuildException("No valid xmlConfFile specified.", $this->getLocation());
-		}
-
-		if (!$this->outputFile) {
-			throw new BuildException("No outputFile specified.", $this->getLocation());
-		}
-
-		// Create a PHP array from the XML file
-
-		$xmlDom = new DOMDocument();
-		$xmlDom->load($this->xmlConfFile->getAbsolutePath());
-		$xml = simplexml_load_string($xmlDom->saveXML());
-		$phpconf = self::simpleXmlToArray($xml);
-		
-		/* For some reason the array generated from runtime-conf.xml has separate
-		 * 'log' section and 'propel' sections. To maintain backward compatibility
-		 * we need to put 'log' back into the 'propel' section.
-		 */
-		$log = array();
-		if (isset($phpconf['log'])) {
-			$phpconf['propel']['log'] = $phpconf['log'];
-			unset($phpconf['log']);
-		}
-
-		if(isset($phpconf['propel'])) {
-			$phpconf = $phpconf['propel'];
-		}
-			
-		// add generator version
-		$phpconf['generator_version'] = $this->getGeneratorConfig()->getBuildProperty('version');
-		
-		// add classmap
-		$phpconf['classmap'] = $this->getClassMap();
-		
-		// Write resulting PHP data to output file:
-
-		$outfile = new PhingFile($this->outputDirectory, $this->outputFile);
-		$output = "<?php\n";
-		$output .= "// This file generated by Propel " . $phpconf['propel']['generator_version'] . " convert-conf target".($this->getGeneratorConfig()->getBuildProperty('addTimestamp') ? " on " . strftime("%c") : '') . "\n";
-		$output .= "// from XML runtime conf file " . $this->xmlConfFile->getPath() . "\n";
-		$output .= "return ";
-		$output .= var_export($phpconf, true);
-		$output .= ";";
-
-		$this->log("Creating PHP runtime conf file: " . $outfile->getPath());
-		if (!file_put_contents($outfile->getAbsolutePath(), $output)) {
-			throw new BuildException("Error creating output file: " . $outfile->getAbsolutePath(), $this->getLocation());
-		}
-
-	} // main()
-
-	/**
-	 * Recursive function that converts an SimpleXML object into an array.
-	 * @author     Christophe VG (based on code form php.net manual comment)
-	 * @param      object SimpleXML object.
-	 * @return     array Array representation of SimpleXML object.
-	 */
-	private static function simpleXmlToArray($xml)
-	{
-		$ar = array();
-
-		foreach ( $xml->children() as $k => $v ) {
-
-			// recurse the child
-			$child = self::simpleXmlToArray( $v );
-
-			//print "Recursed down and found: " . var_export($child, true) . "\n";
-
-			// if it's not an array, then it was empty, thus a value/string
-			if ( count($child) == 0 ) {
-				$child = self::getConvertedXmlValue($v);
-
-			}
-
-			// add the childs attributes as if they where children
-			foreach ( $v->attributes() as $ak => $av ) {
-
-				// if the child is not an array, transform it into one
-				if ( !is_array( $child ) ) {
-					$child = array( "value" => $child );
-				}
-
-				if ($ak == 'id') {
-					// special exception: if there is a key named 'id'
-					// then we will name the current key after that id
-					$k = self::getConvertedXmlValue($av);
-				} else {
-					// otherwise, just add the attribute like a child element
-					$child[$ak] = self::getConvertedXmlValue($av);
-				}
-			}
-
-			// if the $k is already in our children list, we need to transform
-			// it into an array, else we add it as a value
-			if ( !in_array( $k, array_keys($ar) ) ) {
-				$ar[$k] = $child;
-			} else {
-				// (This only applies to nested nodes that do not have an @id attribute)
-
-				// if the $ar[$k] element is not already an array, then we need to make it one.
-				// this is a bit of a hack, but here we check to also make sure that if it is an
-				// array, that it has numeric keys.  this distinguishes it from simply having other
-				// nested element data.
-
-				if ( !is_array($ar[$k]) || !isset($ar[$k][0]) ) { $ar[$k] = array($ar[$k]); }
-				$ar[$k][] = $child;
-			}
-
-		}
-
-		return $ar;
-	}
-
-	/**
-	 * Process XML value, handling boolean, if appropriate.
-	 * @param      object The simplexml value object.
-	 * @return     mixed
-	 */
-	private static function getConvertedXmlValue($value)
-	{
-		$value = (string) $value; // convert from simplexml to string
-		// handle booleans specially
-		$lwr = strtolower($value);
-		if ($lwr === "false") {
-			$value = false;
-		} elseif ($lwr === "true") {
-			$value = true;
-		}
-		return $value;
-	}
-	
-	/**
-	 * Lists data model classes and builds an associative array className => classPath
-	 * To be used for autoloading
-	 * @return array
-	 */
-	protected function getClassMap()
-	{
-		$phpconfClassmap = array();
-
-		$generatorConfig = $this->getGeneratorConfig();
-
-		foreach ($this->getDataModels() as $dataModel) {
-
-			foreach ($dataModel->getDatabases() as $database) {
-
-				$classMap = array();
-
-				foreach ($database->getTables() as $table) {
-
-					if (!$table->isForReferenceOnly()) {
-
-						// Classes that I'm assuming do not need to be mapped (because they will be required by subclasses):
-						//	- base peer and object classes
-						//	- interfaces
-						//	- base node peer and object classes
-
-						// -----------------------------------------------------
-						// Add Peer & Object stub classes and MapBuilder classes
-						// -----------------------------------------------------
-						// (this code is based on PropelOMTask)
-
-						foreach (array('tablemap', 'peerstub', 'objectstub') as $target) {
-							$builder = $generatorConfig->getConfiguredBuilder($table, $target);
-							$this->log("Adding class mapping: " . $builder->getClassname() . ' => ' . $builder->getClassFilePath());
-							$classMap[$builder->getClassname()] = $builder->getClassFilePath();
-						}
-
-						if ($col = $table->getChildrenColumn()) {
-							if ($col->isEnumeratedClasses()) {
-								foreach ($col->getChildren() as $child) {
-									$builder = $generatorConfig->getConfiguredBuilder($table, 'objectmultiextend');
-									$builder->setChild($child);
-									$this->log("Adding class mapping: " . $builder->getClassname() . ' => ' . $builder->getClassFilePath());
-									$classMap[$builder->getClassname()] = $builder->getClassFilePath();
-								}
-							}
-						}
-
-						$baseClass = $table->getBaseClass();
-						if ( $baseClass !== null ) {
-							$className = ClassTools::classname($baseClass);
-							if (!isset($classMap[$className])) {
-								$classPath = ClassTools::getFilePath($baseClass);
-								$this->log('Adding class mapping: ' . $className . ' => ' . $classPath);
-								$classMap[$className] = $classPath;
-							}
-						}
-
-						$basePeer = $table->getBasePeer();
-						if ( $basePeer !== null ) {
-							$className = ClassTools::classname($basePeer);
-							if (!isset($classMap[$className])) {
-								$classPath = ClassTools::getFilePath($basePeer);
-								$this->log('Adding class mapping: ' . $className . ' => ' . $classPath);
-								$classMap[$className] = $classPath;
-							}
-						}
-						
-						// ------------------------
-						// Create tree Node classes
-						// ------------------------
-
-						if ('MaterializedPath' == $table->treeMode()) {
-							foreach (array('nodepeerstub', 'nodestub') as $target) {
-								$builder = $generatorConfig->getConfiguredBuilder($table, $target);
-								$this->log("Adding class mapping: " . $builder->getClassname() . ' => ' . $builder->getClassFilePath());
-								$classMap[$builder->getClassname()] = $builder->getClassFilePath();
-							}
-						}
-
-					} // if (!$table->isReferenceOnly())
-				}
-
-				$phpconfClassmap = array_merge($phpconfClassmap, $classMap);
-			}
-		}
-		
-		return $phpconfClassmap;
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelCreoleTransformTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelCreoleTransformTask.php
deleted file mode 100644
index 44469076d..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelCreoleTransformTask.php
+++ /dev/null
@@ -1,829 +0,0 @@
-<?php
-
-/*
- *  $Id: PropelCreoleTransformTask.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'phing/Task.php';
-include_once 'propel/engine/database/model/PropelTypes.php';
-
-/**
- * This class generates an XML schema of an existing database from
- * Creole metadata.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Jason van Zyl <jvanzyl@periapt.com> (Torque)
- * @author     Fedor Karpelevitch <fedor.karpelevitch@barra.com> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.phing
- */
-class PropelCreoleTransformTask extends Task {
-
-	/** Name of XML database schema produced. */
-	protected $xmlSchema;
-
-	/** Creole URL. */
-	protected $dbUrl;
-
-	/** Creole driver. */
-	protected $dbDriver;
-
-	/** Creole user name. */
-	protected $dbUser;
-
-	/** Creole password. */
-	protected $dbPassword;
-
-	/** DB encoding to use */
-	protected $dbEncoding = 'iso-8859-1';
-
-	/** DB schema to use. */
-	protected $dbSchema;
-
-	/** parsed DB DSN */
-	protected $dsn;
-
-	/** DOM document produced. */
-	protected $doc;
-
-	/** The document root element. */
-	protected $databaseNode;
-
-	/** Hashtable of columns that have primary keys. */
-	protected $primaryKeys;
-
-	/** Hashtable to track what table a column belongs to. */
-	// doesn't seem to be used
-	// protected $columnTableMap;
-
-	/** whether to use same name for phpName or not */
-	protected $samePhpName;
-
-	/** whether to add vendor info or not */
-	protected $addVendorInfo;
-
-	/**
-	 * Bitfield to switch on/off which validators will be created.
-	 *
-	 * @var        int
-	 */
-	protected $validatorBits;
-
-	/**
-	 * Collect validatorInfos to create validators.
-	 *
-	 * @var        int
-	 */
-	protected $validatorInfos;
-
-	/**
-	 * Zero bit for no validators
-	 */
-	const VALIDATORS_NONE = 0;
-
-	/**
-	 * Bit for maxLength validator
-	 */
-	const VALIDATORS_MAXLENGTH = 1;
-
-	/**
-	 * Bit for maxValue validator
-	 */
-	const VALIDATORS_MAXVALUE = 2;
-
-	/**
-	 * Bit for type validator
-	 */
-	const VALIDATORS_TYPE = 4;
-
-	/**
-	 * Bit for required validator
-	 */
-	const VALIDATORS_REQUIRED = 8;
-
-	/**
-	 * Bit for unique validator
-	 */
-	const VALIDATORS_UNIQUE = 16;
-
-	/**
-	 * Bit for all validators
-	 */
-	const VALIDATORS_ALL = 255;
-
-	/**
-	 * Maps validator type tokens to bits
-	 *
-	 * The tokens are used in the propel.addValidators property to define
-	 * which validators are to be added
-	 *
-	 * @static
-	 * @var        array
-	 */
-	static protected $validatorBitMap = array (
-		'none' => PropelCreoleTransformTask::VALIDATORS_NONE,
-		'maxlength' => PropelCreoleTransformTask::VALIDATORS_MAXLENGTH,
-		'maxvalue' => PropelCreoleTransformTask::VALIDATORS_MAXVALUE,
-		'type' => PropelCreoleTransformTask::VALIDATORS_TYPE,
-		'required' => PropelCreoleTransformTask::VALIDATORS_REQUIRED,
-		'unique' => PropelCreoleTransformTask::VALIDATORS_UNIQUE,
-		'all' => PropelCreoleTransformTask::VALIDATORS_ALL,
-	);
-
-	/**
-	 * Defines messages that are added to validators
-	 *
-	 * @static
-	 * @var        array
-	 */
-	static protected $validatorMessages = array (
-		'maxlength' => array (
-			'msg' => 'The field %s must be not longer than %s characters.',
-			'var' => array('colName', 'value')
-	),
-		'maxvalue' => array (
-			'msg' => 'The field %s must be not greater than %s.',
-			'var' => array('colName', 'value')
-	),
-		'type' => array (
-			'msg' => 'The field %s is not a valid value.',
-			'var' => array('colName')
-	),
-		'required' => array (
-			'msg' => 'The field %s is required.',
-			'var' => array('colName')
-	),
-		'unique' => array (
-			'msg' => 'This %s already exists in table %s.',
-			'var' => array('colName', 'tableName')
-	),
-	);
-
-	public function getDbSchema()
-	{
-		return $this->dbSchema;
-	}
-
-	public function setDbSchema($dbSchema)
-	{
-		$this->dbSchema = $dbSchema;
-	}
-
-	public function setDbUrl($v)
-	{
-		$this->dbUrl = $v;
-	}
-
-	public function setDbDriver($v)
-	{
-		$this->dbDriver = $v;
-	}
-
-	public function setDbUser($v)
-	{
-		$this->dbUser = $v;
-	}
-
-	public function setDbPassword($v)
-	{
-		$this->dbPassword = $v;
-	}
-
-	public function setDbEncoding($v)
-	{
-		$this->dbEncoding = $v;
-	}
-
-	public function setOutputFile($v)
-	{
-		$this->xmlSchema = $v;
-	}
-
-	public function setSamePhpName($v)
-	{
-		$this->samePhpName = $v;
-	}
-
-	public function setAddVendorInfo($v)
-	{
-		$this->addVendorInfo = (boolean) $v;
-	}
-
-	/**
-	 * Sets set validator bitfield from a comma-separated list of "validator bit" names.
-	 *
-	 * @param      string $v The comma-separated list of which validators to add.
-	 * @return     void
-	 */
-	public function setAddValidators($v)
-	{
-		$validKeys = array_keys(self::$validatorBitMap);
-
-		// lowercase input
-		$v = strtolower($v);
-
-		$bits = self::VALIDATORS_NONE;
-
-		$exprs = explode(',', $v);
-		foreach ($exprs as $expr) {
-			$expr = trim($expr);
-			if (!isset(self::$validatorBitMap[$expr])) {
-				throw new BuildException("Unable to interpret validator in expression ('$v'): " . $expr);
-			}
-			$bits |= self::$validatorBitMap[$expr];
-		}
-
-		$this->validatorBits = $bits;
-	}
-
-	public function isSamePhpName()
-	{
-		return $this->samePhpName;
-	}
-
-	/**
-	 * Default constructor.
-	 * @return     void
-	 * @throws     BuildException
-	 */
-	public function main()
-	{
-		include_once 'creole/Creole.php';
-		if (!class_exists('Creole')) {
-			throw new BuildException( get_class($this) . " task depends on Creole classes being on include_path. (i.e. include of 'creole/Creole.php' failed.)", $this->getLocation());
-		}
-
-		$this->log("Propel - CreoleToXMLSchema starting");
-		$this->log("Your DB settings are:");
-		$this->log("driver : " . ($this->dbDriver ? $this->dbDriver : "(default)"));
-		$this->log("URL : " . $this->dbUrl);
-
-		//(not yet supported) $this->log("schema : " . $this->dbSchema);
-		//DocumentTypeImpl docType = new DocumentTypeImpl(null, "database", null,
-		//	   "http://jakarta.apache.org/turbine/dtd/database.dtd");
-
-		$this->doc = new DOMDocument('1.0', 'utf-8');
-		$this->doc->formatOutput = true; // pretty printing
-
-		$this->doc->appendChild($this->doc->createComment("Autogenerated by CreoleToXMLSchema!"));
-
-		try {
-			$this->generateXML();
-			$this->log("Writing XML to file: " . $this->xmlSchema);
-			$outFile = new PhingFile($this->xmlSchema);
-			$out = new FileWriter($outFile);
-			$xmlstr = $this->doc->saveXML();
-			$out->write($xmlstr);
-			$out->close();
-		} catch (Exception $e) {
-			$this->log("There was an error building XML from metadata: " . $e->getMessage(), Project::MSG_ERR);
-		}
-		$this->log("Propel - CreoleToXMLSchema finished");
-	}
-
-	/**
-	 * Generates an XML database schema from Creole metadata.
-	 *
-	 * @return     void
-	 * @throws     Exception a generic exception.
-	 */
-	public function generateXML()
-	{
-		// Establish db connection
-		$con = $this->getConnection();
-
-		// Get the database Metadata.
-		$dbInfo = $con->getDatabaseInfo();
-
-		// create and add the database node
-		$databaseNode = $this->createDatabaseNode($dbInfo);
-		$this->doc->appendChild($databaseNode);
-	}
-
-	/**
-	 * Establishes a Creole database connection
-	 *
-	 * @return     object The connection
-	 */
-	protected function getConnection() {
-
-		// Attemtp to connect to a database.
-		$this->dsn = Creole::parseDSN($this->dbUrl);
-		if ($this->dbUser) {
-			$this->dsn["username"] = $this->dbUser;
-		}
-		if ($this->dbPassword) {
-			$this->dsn["password"] = $this->dbPassword;
-		}
-		if ($this->dbDriver) {
-			Creole::registerDriver($this->dsn['phptype'], $this->dbDriver);
-		}
-		$con = Creole::getConnection($this->dsn);
-		$this->log("DB connection established");
-
-		return $con;
-	}
-
-	/**
-	 * Creates a database node
-	 *
-	 * @param      object $dbInfo The dbInfo for this db
-	 * @return     object The database node instance
-	 */
-	protected function createDatabaseNode($dbInfo) {
-
-		$this->log("Processing database");
-
-		$node = $this->doc->createElement("database");
-		$node->setAttribute("name", $dbInfo->getName());
-
-		if ($vendorNode = $this->createVendorInfoNode($dbInfo->getVendorSpecificInfo())) {
-			$node->appendChild($vendorNode);
-		}
-
-		// create and add table nodes
-		foreach ($dbInfo->getTables() as $table) {
-			$tableNode = $this->createTableNode($table);
-			$node->appendChild($tableNode);
-		}
-
-		return $node;
-	}
-
-	/**
-	 * Creates a table node
-	 *
-	 * @param      object $table The table
-	 * @return     object The table node instance
-	 */
-	protected function createTableNode($table) {
-
-		$this->log("Processing table: " . $table->toString());
-
-		$node = $this->doc->createElement("table");
-		$node->setAttribute("name", $table->getName());
-		if ($this->isSamePhpName()) {
-			$node->setAttribute("phpName", $table->getName());
-		}
-		if ($vendorNode = $this->createVendorInfoNode($table->getVendorSpecificInfo())) {
-			$node->appendChild($vendorNode);
-		}
-
-		// Create and add column nodes, register column validators
-		$columns = $table->getColumns();
-		foreach ($columns as $column) {
-			$columnNode = $this->createColumnNode($column);
-			$node->appendChild($columnNode);
-			$this->registerValidatorsForColumn($column);
-			if ($column->isAutoIncrement()) {
-				$idMethod = 'native';
-			}
-		}
-		if (isset($idMethod)) {
-			$node->setAttribute("idMethod", $idMethod);
-		}
-
-		// Create and add foreign key nodes.
-		$foreignKeys = $table->getForeignKeys();
-		foreach ($foreignKeys as $foreignKey) {
-			$foreignKeyNode = $this->createForeignKeyNode($foreignKey);
-			$node->appendChild($foreignKeyNode);
-		}
-
-		// Create and add index nodes.
-		$indices =  $table->getIndices();
-		foreach ($indices as $index) {
-			$indexNode = $this->createIndexNode($index);
-			$node->appendChild($indexNode);
-		}
-
-		// add an id-method-parameter if we have a sequence that matches table_colname_seq
-		//
-		//
-		$pkey = $table->getPrimaryKey();
-		if ($pkey) {
-			$cols = $pkey->getColumns();
-			if (count($cols) === 1) {
-				$col = array_shift($cols);
-				if ($col->isAutoIncrement()) {
-					$seq_name = $table->getName().'_'.$col->getName().'_seq';
-					if ($table->getDatabase()->isSequence($seq_name)) {
-						$idMethodParameterNode = $this->doc->createElement("id-method-parameter");
-						$idMethodParameterNode->setAttribute("value", $seq_name);
-						$node->appendChild($idMethodParameterNode);
-					}
-				}
-			}
-		}
-
-
-		// Create and add validator and rule nodes.
-		$nodes = array();
-		$tableName = $table->getName();
-		if (isset($this->validatorInfos[$tableName])) {
-			foreach ($this->validatorInfos[$tableName] as $colName => $rules) {
-				$column = $table->getColumn($colName);
-				$colName = $column->getName();
-				foreach ($rules as $rule) {
-					if (!isset($nodes[$colName])) {
-						$nodes[$colName] = $this->createValidator($column, $rule['type']);
-						$node->appendChild($nodes[$colName]);
-					}
-					$ruleNode = $this->createRuleNode($column, $rule);
-					$nodes[$colName]->appendChild($ruleNode);
-				}
-			}
-		}
-
-		return $node;
-	}
-
-	/**
-	 * Returns the Propel type for given Creole type.
-	 *
-	 * This used to be part of the PropelTypes class when Creole was an integral
-	 * part of the Propel build process.  As of Propel 1.3, though, this method
-	 * is only needed in this reverse-engineering code.
-	 *
-	 * @param      int $creoleType Creole type (e.g. CreoleTypes::CHAR)
-	 * @return     string Equivalent Propel type (e.g. PropelTypes::CHAR)
-	 */
-	protected static function getMappedPropelType($creoleType)
-	{
-		static $creoleToPropelTypeMap;
-		if ($creoleToPropelTypeMap === null) {
-			$creoleToPropelTypeMap = array();
-			$creoleToPropelTypeMap[CreoleTypes::CHAR] = PropelTypes::CHAR;
-			$creoleToPropelTypeMap[CreoleTypes::VARCHAR] = PropelTypes::VARCHAR;
-			$creoleToPropelTypeMap[CreoleTypes::LONGVARCHAR] = PropelTypes::LONGVARCHAR;
-			$creoleToPropelTypeMap[CreoleTypes::CLOB] = PropelTypes::CLOB;
-			$creoleToPropelTypeMap[CreoleTypes::NUMERIC] = PropelTypes::NUMERIC;
-			$creoleToPropelTypeMap[CreoleTypes::DECIMAL] = PropelTypes::DECIMAL;
-			$creoleToPropelTypeMap[CreoleTypes::TINYINT] = PropelTypes::TINYINT;
-			$creoleToPropelTypeMap[CreoleTypes::SMALLINT] = PropelTypes::SMALLINT;
-			$creoleToPropelTypeMap[CreoleTypes::INTEGER] = PropelTypes::INTEGER;
-			$creoleToPropelTypeMap[CreoleTypes::BIGINT] = PropelTypes::BIGINT;
-			$creoleToPropelTypeMap[CreoleTypes::REAL] = PropelTypes::REAL;
-			$creoleToPropelTypeMap[CreoleTypes::FLOAT] = PropelTypes::FLOAT;
-			$creoleToPropelTypeMap[CreoleTypes::DOUBLE] = PropelTypes::DOUBLE;
-			$creoleToPropelTypeMap[CreoleTypes::BINARY] = PropelTypes::BINARY;
-			$creoleToPropelTypeMap[CreoleTypes::VARBINARY] = PropelTypes::VARBINARY;
-			$creoleToPropelTypeMap[CreoleTypes::LONGVARBINARY] = PropelTypes::LONGVARBINARY;
-			$creoleToPropelTypeMap[CreoleTypes::BLOB] = PropelTypes::BLOB;
-			$creoleToPropelTypeMap[CreoleTypes::DATE] = PropelTypes::DATE;
-			$creoleToPropelTypeMap[CreoleTypes::TIME] = PropelTypes::TIME;
-			$creoleToPropelTypeMap[CreoleTypes::TIMESTAMP] = PropelTypes::TIMESTAMP;
-			$creoleToPropelTypeMap[CreoleTypes::BOOLEAN] = PropelTypes::BOOLEAN;
-			$creoleToPropelTypeMap[CreoleTypes::YEAR] = PropelTypes::INTEGER;
-		}
-
-		if (isset($creoleToPropelTypeMap[$creoleType])) {
-			return $creoleToPropelTypeMap[$creoleType];
-		}
-	}
-
-	/**
-	 * Creates an column node
-	 *
-	 * @param      object $column The Creole column
-	 * @return     object The column node instance
-	 */
-	protected function createColumnNode($column) {
-
-		$node = $this->doc->createElement("column");
-
-		$table = $column->getTable();
-		$colName = $column->getName();
-		$colType = $column->getType();
-		$colSize = $column->getSize();
-		$colScale = $column->getScale();
-
-		if ($colType === CreoleTypes::OTHER) {
-			$this->log("Column [" . $table->getName() . "." . $colName . "] has a column type (".$column->getNativeType().") that Propel does not support.", Project::MSG_WARN);
-		}
-
-		$node->setAttribute("name", $colName);
-
-		if ($this->isSamePhpName()) {
-			$node->setAttribute("phpName", $colName);
-		}
-
-		$node->setAttribute("type", self::getMappedPropelType($colType));
-
-		if ($colSize > 0 && (
-		$colType == CreoleTypes::CHAR
-		|| $colType == CreoleTypes::VARCHAR
-		|| $colType == CreoleTypes::LONGVARCHAR
-		|| $colType == CreoleTypes::DECIMAL
-		|| $colType == CreoleTypes::FLOAT
-		|| $colType == CreoleTypes::NUMERIC)) {
-			$node->setAttribute("size", (string) $colSize);
-		}
-
-		if ($colScale > 0 && (
-		$colType == CreoleTypes::DECIMAL
-		|| $colType == CreoleTypes::FLOAT
-		|| $colType == CreoleTypes::NUMERIC)) {
-			$node->setAttribute("scale", (string) $colScale);
-		}
-
-		if (!$column->isNullable()) {
-			$node->setAttribute("required", "true");
-		}
-
-		if ($column->isAutoIncrement()) {
-			$node->setAttribute("autoIncrement", "true");
-		}
-
-		if (in_array($colName, $this->getTablePkCols($table))) {
-			$node->setAttribute("primaryKey", "true");
-		}
-
-		if (($defValue = $column->getDefaultValue()) !== null) {
-			$node->setAttribute("default", iconv($this->dbEncoding, 'utf-8', $defValue));
-		}
-
-		if ($vendorNode = $this->createVendorInfoNode($column->getVendorSpecificInfo())) {
-			$node->appendChild($vendorNode);
-		}
-
-		return $node;
-	}
-
-	/**
-	 * Returns the primary key columns for a table
-	 *
-	 * @param      object $table The table
-	 * @return     array The primary keys
-	 */
-	protected function getTablePkCols($table) {
-
-		static $columns = array();
-
-		$tableName = $table->getName();
-		if (!isset($columns[$tableName])) {
-			$columns[$tableName] = array();
-			$primaryKey = $table->getPrimaryKey();
-			if ($primaryKey) {
-				foreach ($primaryKey->getColumns() as $colObject) {
-					$columns[$tableName][] = $colObject->getName();
-				}
-			}
-		}
-		return $columns[$tableName];
-	}
-
-	/**
-	 * Creates an foreign key node
-	 *
-	 * @param      object $foreignKey The foreign key
-	 * @return     object The foreign key node instance
-	 */
-	protected function createForeignKeyNode($foreignKey) {
-
-		$node = $this->doc->createElement("foreign-key");
-		if ($vendorNode = $this->createVendorInfoNode($foreignKey->getVendorSpecificInfo())) {
-			$node->appendChild($vendorNode);
-		}
-
-		$refs = $foreignKey->getReferences();
-		// all references must be to same table, so we can grab table from the first, foreign column
-		$node->setAttribute("foreignTable", $refs[0][1]->getTable()->getName());
-		$node->setAttribute("onDelete", $refs[0][2]);
-		$node->setAttribute("onUpdate", $refs[0][3]);
-		for ($m = 0, $size = count($refs); $m < $size; $m++) {
-			$refNode = $this->doc->createElement("reference");
-			$refData = $refs[$m];
-			$refNode->setAttribute("local", $refData[0]->getName());
-			$refNode->setAttribute("foreign", $refData[1]->getName());
-			$node->appendChild($refNode);
-		}
-
-		return $node;
-	}
-
-	/**
-	 * Creates an index node
-	 *
-	 * @param      object $index The index
-	 * @return     object The index node instance
-	 */
-	protected function createIndexNode($index) {
-
-		$indexType = $index->isUnique() ?  'unique' : 'index';
-
-		$node = $this->doc->createElement($indexType);
-		$node->setAttribute("name", $index->getName());
-
-		$columns = $index->getColumns();
-		foreach ($columns as $column) {
-			$tableName = $column->getTable()->getName();
-			$colName = $column->getName();
-			$columnNode = $this->doc->createElement("{$indexType}-column");
-			$columnNode->setAttribute("name", $colName);
-			$node->appendChild($columnNode);
-			if ($indexType == 'unique' && $this->isValidatorRequired('unique')) {
-				$this->validatorInfos[$tableName][$colName][] = array('type' => 'unique');
-			}
-		}
-
-		if ($vendorNode = $this->createVendorInfoNode($index->getVendorSpecificInfo())) {
-			$node->appendChild($vendorNode);
-		}
-
-		return $node;
-	}
-
-	/**
-	 * Checks whether to add validators of specified type or not
-	 *
-	 * @param      int $type The validator type constant.
-	 * @return     boolean
-	 */
-	protected function isValidatorRequired($type) {
-		return (($this->validatorBits & $type) === $type);
-	}
-
-	/**
-	 * Registers column type specific validators if necessary
-	 *
-	 * We'll first collect the validators/rule infos and add them later on to
-	 * have them appended to the table tag as a block.
-	 *
-	 * CreoleTypes are:
-	 *
-	 * 		BOOLEAN
-	 * 		BIGINT, SMALLINT, TINYINT, INTEGER
-	 * 		FLOAT, DOUBLE, NUMERIC, DECIMAL, REAL
-	 * 		BIGINT, SMALLINT, TINYINT, INTEGER
-	 * 		TEXT
-	 * 		BLOB, CLOB, BINARY, VARBINARY, LONGVARBINARY
-	 * 		DATE, YEAR, TIME
-	 * 		TIMESTAMP
-	 *
-	 * We will add the following type specific validators:
-	 *
-	 *      for notNull columns: required validator
-	 *      for unique indexes: unique validator
-	 * 		for varchar types: maxLength validators (CHAR, VARCHAR, LONGVARCHAR)
-	 * 		for numeric types: maxValue validators (BIGINT, SMALLINT, TINYINT, INTEGER, FLOAT, DOUBLE, NUMERIC, DECIMAL, REAL)
-	 * 		for integer and timestamp types: notMatch validator with [^\d]+ (BIGINT, SMALLINT, TINYINT, INTEGER, TIMESTAMP)
-	 * 		for float types: notMatch validator with [^\d\.]+ (FLOAT, DOUBLE, NUMERIC, DECIMAL, REAL)
-	 *
-	 * @param      object $column The Creole column
-	 * @return     void
-	 * @todo       find out how to evaluate the appropriate size and adjust maxValue rule values appropriate
-	 * @todo       find out if float type column values must always notMatch('[^\d\.]+'), i.e. digits and point for any db vendor, language etc.
-	 */
-	protected function registerValidatorsForColumn($column) {
-
-		$table = $column->getTable();
-		$tableName = $table->getName();
-
-		$colName = $column->getName();
-		$colType = $column->getType();
-		$colSize = $column->getSize();
-
-		if ($this->isValidatorRequired(self::VALIDATORS_REQUIRED)) {
-			$ruleInfo = array('type' => 'required');
-			$this->validatorInfos[$tableName][$colName][] = $ruleInfo;
-		}
-		$isPrimarykeyCol = in_array($colName, $this->getTablePkCols($table));
-		if ($this->isValidatorRequired(self::VALIDATORS_UNIQUE) && $isPrimarykeyCol) {
-			$ruleInfo = array('type' => 'unique');
-			$this->validatorInfos[$tableName][$colName][] = $ruleInfo;
-		}
-		if ($this->isValidatorRequired(self::VALIDATORS_MAXLENGTH) &&
-		$colSize > 0 && in_array($colType, array(
-		CreoleTypes::CHAR,
-		CreoleTypes::VARCHAR,
-		CreoleTypes::LONGVARCHAR))) {
-			$ruleInfo = array('type' => 'maxLength', 'value' => $colSize);
-			$this->validatorInfos[$tableName][$colName][] = $ruleInfo;
-		}
-		if ($this->isValidatorRequired(self::VALIDATORS_MAXVALUE) &&
-		$colSize > 0 && in_array($colType, array(
-		CreoleTypes::SMALLINT,
-		CreoleTypes::TINYINT,
-		CreoleTypes::INTEGER,
-		CreoleTypes::BIGINT,
-		CreoleTypes::FLOAT,
-		CreoleTypes::DOUBLE,
-		CreoleTypes::NUMERIC,
-		CreoleTypes::DECIMAL,
-		CreoleTypes::REAL))) {
-
-			// TODO: how to evaluate the appropriate size??
-			$this->log("WARNING: maxValue validator added for column $colName. You will have to adjust the size value manually.", Project::MSG_WARN);
-			$ruleInfo = array('type' => 'maxValue', 'value' => $colSize);
-			$this->validatorInfos[$tableName][$colName][] = $ruleInfo;
-		}
-		if ($this->isValidatorRequired(self::VALIDATORS_TYPE) &&
-		$colSize > 0 && in_array($colType, array(
-		CreoleTypes::SMALLINT,
-		CreoleTypes::TINYINT,
-		CreoleTypes::INTEGER,
-		CreoleTypes::TIMESTAMP))) {
-			$ruleInfo = array('type' => 'type', 'value' => '[^\d]+');
-			$this->validatorInfos[$tableName][$colName][] = $ruleInfo;
-		}
-		if ($this->isValidatorRequired(self::VALIDATORS_TYPE) &&
-		$colSize > 0 && in_array($colType, array(
-		CreoleTypes::FLOAT,
-		CreoleTypes::DOUBLE,
-		CreoleTypes::NUMERIC,
-		CreoleTypes::DECIMAL,
-		CreoleTypes::REAL))) {
-			// TODO: is this always true??
-			$ruleInfo = array('type' => 'type', 'value' => '[^\d\.]+');
-			$this->validatorInfos[$tableName][$colName][] = $ruleInfo;
-		}
-	}
-
-	/**
-	 * Creates a validator node
-	 *
-	 * @param      object  $column    The Creole column
-	 * @param      integer $type      The validator type
-	 * @return     object The validator node instance
-	 */
-	protected function createValidator($column, $type) {
-
-		$node = $this->doc->createElement('validator');
-		$node->setAttribute('column', $column->getName());
-
-		return $node;
-	}
-
-	/**
-	 * Creates a rule node
-	 *
-	 * @param      object  $column The Creole column
-	 * @param      array   $rule   The rule info
-	 * @return     object The rule node instance
-	 */
-	protected function createRuleNode($column, $rule) {
-
-		extract($rule);
-
-		// create message
-		$colName = $column->getName();
-		$tableName = $column->getTable()->getName();
-		$msg = self::$validatorMessages[strtolower($type)];
-		$tmp = compact($msg['var']);
-		array_unshift($tmp, $msg['msg']);
-		$msg = call_user_func_array('sprintf', $tmp);
-
-		// add node
-		$node = $this->doc->createElement('rule');
-		$node->setAttribute('name', $type == 'type' ? 'notMatch' : $type);
-		$node->setAttribute('message', $msg);
-
-		return $node;
-	}
-
-	/**
-	 * Creates a vendor info node
-	 *
-	 * returns false if no vendor info can or has to be added
-	 *
-	 * @param      array   $vendorInfo The validator info
-	 * @return     object|boolean The vendor info instance or false
-	 */
-	protected function createVendorInfoNode($vendorInfo)
-	{
-		if (!$vendorInfo OR !$this->addVendorInfo) {
-			return false;
-		}
-
-		$vendorNode = $this->doc->createElement("vendor");
-		$vendorNode->setAttribute("type", $this->dsn["phptype"]);
-
-		foreach ($vendorInfo as $key => $value) {
-			$parameterNode = $this->doc->createElement("parameter");
-			$value = iconv($this->dbEncoding, "utf-8", $value);
-			$parameterNode->setAttribute("name", $key);
-			$parameterNode->setAttribute("value", $value);
-			$vendorNode->appendChild($parameterNode);
-		}
-
-		return $vendorNode;
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelDataDTDTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelDataDTDTask.php
deleted file mode 100644
index e63a72807..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelDataDTDTask.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-/*
- *  $Id: PropelDataDTDTask.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/phing/PropelDataModelTemplateTask.php';
-include_once 'propel/engine/builder/om/ClassTools.php';
-
-/**
- * This Task creates the OM classes based on the XML schema file.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.phing
- */
-class PropelDataDTDTask extends PropelDataModelTemplateTask {
-
-
-	public function main() {
-
-		// check to make sure task received all correct params
-		$this->validate();
-
-		if (!$this->mapperElement) {
-			throw new BuildException("You must use a <mapper/> element to describe how names should be transformed.");
-		}
-
-		$basepath = $this->getOutputDirectory();
-
-		// Get new Capsule context
-		$generator = $this->createContext();
-		$generator->put("basepath", $basepath); // make available to other templates
-
-		// we need some values that were loaded into the template context
-		$basePrefix = $generator->get('basePrefix');
-		$project = $generator->get('project');
-
-		foreach ($this->getDataModels() as $dataModel) {
-
-			$this->log("Processing Datamodel : " . $dataModel->getName());
-
-			foreach ($dataModel->getDatabases() as $database) {
-
-				$outFile = $this->getMappedFile($dataModel->getName());
-
-				$generator->put("tables", $database->getTables());
-				$generator->parse("data/dtd/dataset.tpl", $outFile->getAbsolutePath());
-
-				$this->log("Generating DTD for database: " . $database->getName());
-				$this->log("Creating DTD file: " . $outFile->getPath());
-
-				foreach ($database->getTables() as $tbl) {
-					$this->log("\t + " . $tbl->getName());
-					$generator->put("table", $tbl);
-					$generator->parse("data/dtd/table.tpl", $outFile->getAbsolutePath(), true);
-				}
-
-			} // foreach database
-
-		} // foreach dataModel
-
-
-	} // main()
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelDataDumpTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelDataDumpTask.php
deleted file mode 100644
index 4c94d2634..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelDataDumpTask.php
+++ /dev/null
@@ -1,365 +0,0 @@
-<?php
-
-/*
- *  $Id: PropelDataDumpTask.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * Dumps the contenst of selected databases to XML data dump file.
- *
- * The generated XML files can have corresponding DTD files generated using the
- * PropelDataDTDTask.  The results of the data dump can be converted to SQL using
- * the PropelDataSQLTask class.
- *
- * The database may be specified (via 'databaseName' attribute) if you only want to dump
- * the contents of one database.  Otherwise it is assumed that all databases described
- * by datamodel schema file(s) will be dumped.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Fedor Karpelevitch <fedor.karpelevitch@home.com> (Torque)
- * @author     Jason van Zyl <jvanzyl@zenplex.com> (Torque)
- * @author     Daniel Rall <dlr@finemaltcoding.com> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.phing
- */
-class PropelDataDumpTask extends AbstractPropelDataModelTask {
-
-	/**
-	 * Database name.
-	 * The database name may be optionally specified in the XML if you only want
-	 * to dump the contents of one database.
-	 */
-	private $databaseName;
-
-	/**
-	 * Database URL used for Creole connection.
-	 * This is a PEAR-compatible (loosely) DSN URL.
-	 */
-	private $databaseUrl;
-
-	/**
-	 * Database driver used for Creole connection.
-	 * This should normally be left blank so that default (Creole built-in) driver for database type is used.
-	 */
-	private $databaseDriver;
-
-	/**
-	 * Database user used for Creole connection.
-	 * @deprecated Put username in databaseUrl.
-	 */
-	private $databaseUser;
-
-	/**
-	 * Database password used for Creole connection.
-	 * @deprecated Put password in databaseUrl.
-	 */
-	private $databasePassword;
-
-	/**
-	 * Properties file that maps a data XML file to a particular database.
-	 * @var        PhingFile
-	 */
-	private $datadbmap;
-
-	/**
-	 * The database connection used to retrieve the data to dump.
-	 * Needs to be public so that the TableInfo class can access it.
-	 */
-	public $conn;
-
-	/**
-	 * The statement used to acquire the data to dump.
-	 */
-	private $stmt;
-
-	/**
-	 * Set the file that maps between data XML files and databases.
-	 *
-	 * @param      PhingFile $sqldbmap the db map
-	 * @return     void
-	 */
-	public function setDataDbMap(PhingFile $datadbmap)
-	{
-		$this->datadbmap = $datadbmap;
-	}
-
-	/**
-	 * Get the file that maps between data XML files and databases.
-	 *
-	 * @return     PhingFile $datadbmap.
-	 */
-	public function getDataDbMap()
-	{
-		return $this->datadbmap;
-	}
-
-	/**
-	 * Get the database name to dump
-	 *
-	 * @return     The DatabaseName value
-	 */
-	public function getDatabaseName()
-	{
-		return $this->databaseName;
-	}
-
-	/**
-	 * Set the database name
-	 *
-	 * @param      v The new DatabaseName value
-	 */
-	public function setDatabaseName($v)
-	{
-		$this->databaseName = $v;
-	}
-
-	/**
-	 * Get the database url
-	 *
-	 * @return     The DatabaseUrl value
-	 */
-	public function getDatabaseUrl()
-	{
-		return $this->databaseUrl;
-	}
-
-	/**
-	 * Set the database url
-	 *
-	 * @param      string $v The PEAR-compatible database DSN URL.
-	 */
-	public function setDatabaseUrl($v)
-	{
-		$this->databaseUrl = $v;
-	}
-
-	/**
-	 * Get the database user
-	 *
-	 * @return     string database user
-	 * @deprecated
-	 */
-	public function getDatabaseUser()
-	{
-		return $this->databaseUser;
-	}
-
-	/**
-	 * Set the database user
-	 *
-	 * @param      string $v The new DatabaseUser value
-	 * @deprecated Specify user in DSN URL.
-	 */
-	public function setDatabaseUser($v)
-	{
-		$this->databaseUser = $v;
-	}
-
-	/**
-	 * Get the database password
-	 *
-	 * @return     string database password
-	 */
-	public function getDatabasePassword()
-	{
-		return $this->databasePassword;
-	}
-
-	/**
-	 * Set the database password
-	 *
-	 * @param      string $v The new DatabasePassword value
-	 * @deprecated Specify database password in DSN URL.
-	 */
-	public function setDatabasePassword($v)
-	{
-		$this->databasePassword = $v;
-	}
-
-	/**
-	 * Get the database driver name
-	 *
-	 * @return     string database driver name
-	 */
-	public function getDatabaseDriver()
-	{
-		return $this->databaseDriver;
-	}
-
-	/**
-	 * Set the database driver name
-	 *
-	 * @param      string $v The new DatabaseDriver value
-	 */
-	public function setDatabaseDriver($v)
-	{
-		$this->databaseDriver = $v;
-	}
-
-	/**
-	 * Create the data XML -> database map.
-	 *
-	 * This is necessary because there is currently no other method of knowing which
-	 * data XML files correspond to which database.  This map allows us to convert multiple
-	 * data XML files into SQL.
-	 *
-	 * @throws     IOException - if unable to store properties
-	 */
-	private function createDataDbMap()
-	{
-		if ($this->getDataDbMap() === null) {
-			return;
-		}
-
-		// Produce the sql -> database map
-		$datadbmap = new Properties();
-
-		// Check to see if the sqldbmap has already been created.
-		if ($this->getDataDbMap()->exists()) {
-			$datadbmap->load($this->getDataDbMap());
-		}
-
-		foreach ($this->getDataModels() as $dataModel) {            // there is really one 1 db per datamodel
-			foreach ($dataModel->getDatabases() as $database) {
-
-				// if database name is specified, then we only want to dump that one db.
-				if (empty($this->databaseName) || ($this->databaseName && $database->getName() == $this->databaseName)) {
-					$outFile = $this->getMappedFile($dataModel->getName());
-					$datadbmap->setProperty($outFile->getName(), $database->getName());
-				}
-			}
-		}
-
-		try {
-			$datadbmap->store($this->getDataDbMap(), "Data XML file -> Database map");
-		} catch (IOException $e) {
-			throw new IOException("Unable to store properties: ". $e->getMessage());
-		}
-	}
-
-	/**
-	 * Iterates through each datamodel/database, dumps the contents of all tables and creates a DOM XML doc.
-	 *
-	 * @return     void
-	 * @throws     BuildException
-	 */
-	public function main()
-	{
-		$this->validate();
-
-		$buf = "Database settings:\n"
-			. " driver: " . ($this->databaseDriver ? $this->databaseDriver : "(default)" ). "\n"
-			. " URL: " . $this->databaseUrl . "\n"
-			. ($this->databaseUser ? " user: " . $this->databaseUser . "\n" : "")
-			. ($this->databasePassword ? " password: " . $this->databasePassword . "\n" : "");
-
-		$this->log($buf, Project::MSG_VERBOSE);
-
-		// 1) First create the Data XML -> database name map.
-		$this->createDataDbMap();
-
-		// 2) Now go create the XML files from teh database(s)
-		foreach ($this->getDataModels() as $dataModel) {            // there is really one 1 db per datamodel
-			foreach ($dataModel->getDatabases() as $database) {
-
-				// if database name is specified, then we only want to dump that one db.
-				if (empty($this->databaseName) || ($this->databaseName && $database->getName() == $this->databaseName)) {
-
-					$outFile = $this->getMappedFile($dataModel->getName());
-
-					$this->log("Dumping data to XML for database: " . $database->getName());
-					$this->log("Writing to XML file: " . $outFile->getName());
-
-					try {
-
-						$url = str_replace("@DB@", $database->getName(), $this->databaseUrl);
-
-						if ($url !== $this->databaseUrl) {
-							$this->log("New (resolved) URL: " . $url, Project::MSG_VERBOSE);
-						}
-
-						if (empty($url)) {
-							throw new BuildException("Unable to connect to database; no PDO connection URL specified.", $this->getLocation());
-						}
-
-						$this->conn = new PDO($url, $this->databaseUser, $this->databasePassword);
-						$this->conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-
-						$doc = $this->createXMLDoc($database);
-						$doc->save($outFile->getAbsolutePath());
-
-					} catch (SQLException $se) {
-						$this->log("SQLException while connecting to DB: ". $se->getMessage(), Project::MSG_ERR);
-						throw new BuildException($se);
-					}
-				} // if databaseName && database->getName == databaseName
-			} // foreach database
-		} // foreach datamodel
-	}
-
-	/**
-	 * Gets PDOStatement of query to fetch all data from a table.
-	 * @param      string $tableName
-	 * @param      Platform $platform
-	 * @return     PDOStatement
-	 */
-	private function getTableDataStmt($tableName, Platform $platform)
-	{
-		return $this->conn->query("SELECT * FROM " . $platform->quoteIdentifier( $tableName ) );
-	}
-
-	/**
-	 * Creates a DOM document containing data for specified database.
-	 * @param      Database $database
-	 * @return     DOMDocument
-	 */
-	private function createXMLDoc(Database $database)
-	{
-		$doc = new DOMDocument('1.0', 'utf-8');
-		$doc->formatOutput = true; // pretty printing
-		$doc->appendChild($doc->createComment("Created by data/dump/Control.tpl template."));
-
-		$dsNode = $doc->createElement("dataset");
-		$dsNode->setAttribute("name", "all");
-		$doc->appendChild($dsNode);
-
-		$platform = $this->getGeneratorConfig()->getConfiguredPlatform($this->conn);
-
-		$this->log("Building DOM tree containing data from tables:");
-
-		foreach ($database->getTables() as $tbl) {
-			$this->log("\t+ " . $tbl->getName());
-			$stmt = $this->getTableDataStmt($tbl->getName(), $platform);
-			while ($row = $stmt->fetch()) {
-				$rowNode = $doc->createElement($tbl->getPhpName());
-				foreach ($tbl->getColumns() as $col) {
-					$cval = $row[$col->getName()];
-					if ($cval !== null) {
-						$rowNode->setAttribute($col->getPhpName(), iconv($this->dbEncoding, 'utf-8', $cval));
-					}
-				}
-				$dsNode->appendChild($rowNode);
-				unset($rowNode);
-			}
-			unset($stmt);
-		}
-
-		return $doc;
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelDataModelTemplateTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelDataModelTemplateTask.php
deleted file mode 100644
index 8c6a7fd1c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelDataModelTemplateTask.php
+++ /dev/null
@@ -1,228 +0,0 @@
-<?php
-
-/*
- *  $Id: PropelDataModelTemplateTask.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/phing/AbstractPropelDataModelTask.php';
-include_once 'propel/engine/database/model/AppData.php';
-include_once 'propel/engine/database/model/Database.php';
-include_once 'propel/engine/database/transform/XmlToAppData.php';
-
-/**
- * A generic class that simply loads the data model and parses a control template.
- *
- * This class exists largely for compatibility with early Propel where this was
- * a CapsuleTask subclass.  This class also makes it easy to quickly add some custom
- * datamodel-based transformations (by allowing you to put the logic in the templates).
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.phing
- * @version    $Revision: 1262 $
- */
-class PropelDataModelTemplateTask extends AbstractPropelDataModelTask {
-
-	/**
-	 * This is the file where the generated text
-	 * will be placed.
-	 * @var        string
-	 */
-	protected $outputFile;
-
-	/**
-	 * Path where Capsule looks for templates.
-	 * @var        PhingFile
-	 */
-	protected $templatePath;
-
-	/**
-	 * This is the control template that governs the output.
-	 * It may or may not invoke the services of worker
-	 * templates.
-	 * @var        string
-	 */
-	protected $controlTemplate;
-
-	/**
-	 * [REQUIRED] Set the output file for the
-	 * generation process.
-	 * @param      string $outputFile (TODO: change this to File)
-	 * @return     void
-	 */
-	public function setOutputFile($outputFile) {
-		$this->outputFile = $outputFile;
-	}
-
-	/**
-	 * Get the output file for the
-	 * generation process.
-	 * @return     string
-	 */
-	public function getOutputFile() {
-		return $this->outputFile;
-	}
-
-	/**
-	 * [REQUIRED] Set the control template for the
-	 * generating process.
-	 * @param      string $controlTemplate
-	 * @return     void
-	 */
-	public function setControlTemplate ($controlTemplate) {
-		$this->controlTemplate = $controlTemplate;
-	}
-
-	/**
-	 * Get the control template for the
-	 * generating process.
-	 * @return     string
-	 */
-	public function getControlTemplate() {
-		return $this->controlTemplate;
-	}
-
-	/**
-	 * [REQUIRED] Set the path where Capsule will look
-	 * for templates using the file template
-	 * loader.
-	 * @return     void
-	 * @throws     Exception
-	 */
-	public function setTemplatePath($templatePath) {
-		$resolvedPath = "";
-		$tok = strtok($templatePath, ",");
-		while ( $tok ) {
-			// resolve relative path from basedir and leave
-			// absolute path untouched.
-			$fullPath = $this->project->resolveFile($tok);
-			$cpath = $fullPath->getCanonicalPath();
-			if ($cpath === false) {
-				$this->log("Template directory does not exist: " . $fullPath->getAbsolutePath());
-			} else {
-				$resolvedPath .= $cpath;
-			}
-			$tok = strtok(",");
-			if ( $tok ) {
-				$resolvedPath .= ",";
-			}
-		}
-		$this->templatePath = $resolvedPath;
-	 }
-
-	/**
-	 * Get the path where Velocity will look
-	 * for templates using the file template
-	 * loader.
-	 * @return     string
-	 */
-	public function getTemplatePath() {
-		return $this->templatePath;
-	}
-
-	/**
-	 * Creates a new Capsule context with some basic properties set.
-	 * (Capsule is a simple PHP encapsulation system -- aka a php "template" class.)
-	 * @return     Capsule
-	 */
-	protected function createContext() {
-
-		$context = new Capsule();
-
-		// Make sure the output directory exists, if it doesn't
-		// then create it.
-		$outputDir = new PhingFile($this->outputDirectory);
-		if (!$outputDir->exists()) {
-			$this->log("Output directory does not exist, creating: " . $outputDir->getAbsolutePath());
-			$outputDir->mkdirs();
-		}
-
-		// Place our set of data models into the context along
-		// with the names of the databases as a convenience for now.
-		$context->put("targetDatabase", $this->getTargetDatabase());
-		$context->put("targetPackage", $this->getTargetPackage());
-		$context->put("now", strftime("%c"));
-
-		$this->log("Target database type: " . $this->getTargetDatabase());
-		$this->log("Target package: " . $this->getTargetPackage());
-		$this->log("Using template path: " . $this->templatePath);
-		$this->log("Output directory: " . $this->getOutputDirectory());
-
-		$context->setTemplatePath($this->templatePath);
-		$context->setOutputDirectory($this->outputDirectory);
-
-		$this->populateContextProperties($context);
-
-		return $context;
-	}
-
-	/**
-	 * Adds the propel build properties to the passed Capsule context.
-	 *
-	 * @param      Capsule $context
-	 * @see        GeneratorConfig::getBuildProperties()
-	 */
-	public function populateContextProperties(Capsule $context)
-	{
-		foreach ($this->getGeneratorConfig()->getBuildProperties() as $key => $propValue) {
-			$this->log('Adding property ${' . $key . '} to context', Project::MSG_DEBUG);
-			$context->put($key, $propValue);
-		}
-	}
-
-	/**
-	 * Performs validation for single-file mode.
-	 * @throws     BuildException - if there are any validation errors
-	 */
-	protected function singleFileValidate()
-	{
-		parent::validate();
-
-		// Make sure the control template is set.
-		if ($this->controlTemplate === null) {
-			throw new BuildException("The control template needs to be defined!");
-		}
-		// Make sure there is an output file.
-		if ($this->outputFile === null) {
-			throw new BuildException("The output file needs to be defined!");
-		}
-
-	}
-
-	/**
-	 * Creates Capsule context and parses control template.
-	 * @return     void
-	 */
-	public function main()
-	{
-		$this->singleFileValidate();
-		$context = $this->createContext();
-
-		$context->put("dataModels", $this->getDataModels());
-
-		$path = $this->outputDirectory . DIRECTORY_SEPARATOR . $this->outputFile;
-		$this->log("Generating to file " . $path);
-
-		try {
-			$this->log("Parsing control template: " . $this->controlTemplate);
-			$context->parse($this->controlTemplate, $path);
-		} catch (Exception $ioe) {
-			throw new BuildException("Cannot write parsed template: ". $ioe->getMessage());
-		}
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelDataSQLTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelDataSQLTask.php
deleted file mode 100644
index 5f397be4b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelDataSQLTask.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-
-/*
- *  $Id: PropelDataSQLTask.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-include_once 'propel/engine/database/model/AppData.php';
-include_once 'propel/engine/database/model/Database.php';
-include_once 'propel/engine/database/transform/XmlToAppData.php';
-include_once 'propel/engine/builder/util/transform/XmlToDataSQL.php';
-
-/**
- * Task that transforms XML datadump files into files containing SQL INSERT statements.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Jason van Zyl  <jvanzyl@periapt.com> (Torque)
- * @author     John McNally  <jmcnally@collab.net> (Torque)
- * @author     Fedor Karpelevitch  <fedor.karpelevitch@home.com> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.phing
- */
-class PropelDataSQLTask extends AbstractPropelDataModelTask {
-
-	/**
-	 * Properties file that maps an SQL file to a particular database.
-	 * @var        PhingFile
-	 */
-	private $sqldbmap;
-
-	/**
-	 * Properties file that maps a data XML file to a particular database.
-	 * @var        PhingFile
-	 */
-	private $datadbmap;
-
-	/**
-	 * The base directory in which to find data XML files.
-	 * @var        PhingFile
-	 */
-	private $srcDir;
-
-	/**
-	 * Set the file that maps between SQL files and databases.
-	 *
-	 * @param      PhingFile $sqldbmap the sql -> db map.
-	 * @return     void
-	 */
-	public function setSqlDbMap(PhingFile $sqldbmap)
-	{
-		$this->sqldbmap = $sqldbmap;
-	}
-
-	/**
-	 * Get the file that maps between SQL files and databases.
-	 *
-	 * @return     PhingFile sqldbmap.
-	 */
-	public function getSqlDbMap()
-	{
-		return $this->sqldbmap;
-	}
-
-	/**
-	 * Set the file that maps between data XML files and databases.
-	 *
-	 * @param      PhingFile $sqldbmap the db map
-	 * @return     void
-	 */
-	public function setDataDbMap(PhingFile $datadbmap)
-	{
-		$this->datadbmap = $datadbmap;
-	}
-
-	/**
-	 * Get the file that maps between data XML files and databases.
-	 *
-	 * @return     PhingFile $datadbmap.
-	 */
-	public function getDataDbMap()
-	{
-		return $this->datadbmap;
-	}
-
-	/**
-	 * Set the src directory for the data xml files listed in the datadbmap file.
-	 * @param      PhingFile $srcDir data xml source directory
-	 */
-	public function setSrcDir(PhingFile $srcDir)
-	{
-		$this->srcDir = $srcDir;
-	}
-
-	/**
-	 * Get the src directory for the data xml files listed in the datadbmap file.
-	 *
-	 * @return     PhingFile data xml source directory
-	 */
-	public function getSrcDir()
-	{
-		return $this->srcDir;
-	}
-
-	/**
-	 * Search through all data models looking for matching database.
-	 * @return     Database or NULL if none found.
-	 */
-	private function getDatabase($name)
-	{
-		foreach ($this->getDataModels() as $dm) {
-			foreach ($dm->getDatabases() as $db) {
-				if ($db->getName() == $name) {
-					return $db;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Main method parses the XML files and creates SQL files.
-	 *
-	 * @return     void
-	 * @throws     Exception If there is an error parsing the data xml.
-	 */
-	public function main()
-	{
-		$this->validate();
-
-		$targetDatabase = $this->getTargetDatabase();
-
-		$platform = $this->getGeneratorConfig()->getConfiguredPlatform();
-
-		// Load the Data XML -> DB Name properties
-		$map = new Properties();
-		try {
-			$map->load($this->getDataDbMap());
-		} catch (IOException $ioe) {
-			throw new BuildException("Cannot open and process the datadbmap!", $ioe);
-		}
-
-		// Parse each file in the data -> db map
-		foreach ($map->keys() as $dataXMLFilename) {
-
-			$dataXMLFile = new PhingFile($this->srcDir, $dataXMLFilename);
-
-			// if file exists then proceed
-			if ($dataXMLFile->exists()) {
-
-				$dbname = $map->get($dataXMLFilename);
-
-				$db = $this->getDatabase($dbname);
-
-				if (!$db) {
-					throw new BuildException("Cannot find instantiated Database for name '$dbname' from datadbmap file.");
-				}
-
-				$db->setPlatform($platform);
-
-				$outFile = $this->getMappedFile($dataXMLFilename);
-				$sqlWriter = new FileWriter($outFile);
-
-				$this->log("Creating SQL from XML data dump file: " . $dataXMLFile->getAbsolutePath());
-
-				try {
-					$dataXmlParser = new XmlToDataSQL($db, $this->getGeneratorConfig(), $this->dbEncoding);
-					$dataXmlParser->transform($dataXMLFile, $sqlWriter);
-				} catch (Exception $e) {
-					throw new BuildException("Exception parsing data XML: " . $e->getMessage(), $x);
-				}
-
-				// Place the generated SQL file(s)
-				$p = new Properties();
-				if ($this->getSqlDbMap()->exists()) {
-					$p->load($this->getSqlDbMap());
-				}
-
-				$p->setProperty($outFile->getName(), $db->getName());
-				$p->store($this->getSqlDbMap(), "Sqlfile -> Database map");
-
-			} else {
-				$this->log("File '" . $dataXMLFile->getAbsolutePath()
-						. "' in datadbmap does not exist, so skipping it.", Project::MSG_WARN);
-			}
-
-		} // foreach data xml file
-
-	} // main()
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelGraphvizTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelGraphvizTask.php
deleted file mode 100644
index 32ceee4d6..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelGraphvizTask.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-
-/*
- *  $Id: PropelGraphvizTask.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/phing/AbstractPropelDataModelTask.php';
-include_once 'propel/engine/database/model/AppData.php';
-
-/**
- * A task to generate Graphviz dot files from Propel datamodel.
- *
- * @author     Mark Kimsal
- * @version    $Revision: 1262 $
- * @package    propel.phing
- */
-class PropelGraphvizTask extends AbstractPropelDataModelTask {
-
-	/**
-	 * The properties file that maps an SQL file to a particular database.
-	 * @var        PhingFile
-	 */
-	private $sqldbmap;
-
-	/**
-	 * Name of the database.
-	 */
-	private $database;
-
-	/**
-	 * Name of the output directory.
-	 */
-	private $outDir;
-
-
-	/**
-	 * Set the sqldbmap.
-	 * @param      PhingFile $sqldbmap The db map.
-	 */
-	public function setOutputDirectory(PhingFile $out)
-	{
-		if (!$out->exists()) {
-			$out->mkdirs();
-		}
-		$this->outDir = $out;
-	}
-
-
-	/**
-	 * Set the sqldbmap.
-	 * @param      PhingFile $sqldbmap The db map.
-	 */
-	public function setSqlDbMap(PhingFile $sqldbmap)
-	{
-		$this->sqldbmap = $sqldbmap;
-	}
-
-	/**
-	 * Get the sqldbmap.
-	 * @return     PhingFile $sqldbmap.
-	 */
-	public function getSqlDbMap()
-	{
-		return $this->sqldbmap;
-	}
-
-	/**
-	 * Set the database name.
-	 * @param      string $database
-	 */
-	public function setDatabase($database)
-	{
-		$this->database = $database;
-	}
-
-	/**
-	 * Get the database name.
-	 * @return     string
-	 */
-	public function getDatabase()
-	{
-		return $this->database;
-	}
-
-
-	public function main()
-	{
-
-		$count = 0;
-
-		$dotSyntax = '';
-
-		// file we are going to create
-
-		$dbMaps = $this->getDataModelDbMap();
-
-		foreach ($this->getDataModels() as $dataModel) {
-
-			$dotSyntax .= "digraph G {\n";
-			foreach ($dataModel->getDatabases() as $database) {
-
-				$this->log("db: " . $database->getName());
-
-				//print the tables
-				foreach ($database->getTables() as $tbl) {
-
-					$this->log("\t+ " . $tbl->getName());
-
-					++$count;
-					$dotSyntax .= 'node'.$tbl->getName().' [label="{<table>'.$tbl->getName().'|<cols>';
-
-					foreach ($tbl->getColumns() as $col) {
-						$dotSyntax .= $col->getName() . ' (' . $col->getType()  . ')';
-						if (count($col->getForeignKeys()) > 0) {
-							$dotSyntax .= ' [FK]';
-						} elseif ($col->isPrimaryKey()) {
-							$dotSyntax .= ' [PK]';
-						}
-						$dotSyntax .= '\l';
-					}
-					$dotSyntax .= '}", shape=record];';
-					$dotSyntax .= "\n";
-				}
-
-				//print the relations
-
-				$count = 0;
-				$dotSyntax .= "\n";
-				foreach ($database->getTables() as $tbl) {
-					++$count;
-
-					foreach ($tbl->getColumns() as $col) {
-						$fk = $col->getForeignKeys();
-						if ( count($fk) == 0 or $fk === null ) continue;
-						if ( count($fk) > 1 ) throw( new Exception("not sure what to do here...") );
-						$fk = $fk[0];   // try first one
-						$dotSyntax .= 'node'.$tbl->getName() .':cols -> node'.$fk->getForeignTableName() . ':table [label="' . $col->getName() . '=' . implode(',', $fk->getForeignColumns()) . ' "];';
-						$dotSyntax .= "\n";
-					}
-				}
-
-
-
-			} // foreach database
-			$dotSyntax .= "}\n";
-
-			$this->writeDot($dotSyntax,$this->outDir,$database->getName());
-
-		$dotSyntax = '';
-
-		} //foreach datamodels
-
-	} // main()
-
-
-	/**
-	 * probably insecure
-	 */
-	function writeDot($dotSyntax, PhingFile $outputDir, $baseFilename) {
-		$file = new PhingFile($outputDir, $baseFilename . '.schema.dot');
-		$this->log("Writing dot file to " . $file->getAbsolutePath());
-		file_put_contents($file->getAbsolutePath(), $dotSyntax);
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelOMTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelOMTask.php
deleted file mode 100644
index f3ff24041..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelOMTask.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?php
-
-/*
- *  $Id: PropelOMTask.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'propel/phing/AbstractPropelDataModelTask.php';
-include_once 'propel/engine/builder/om/ClassTools.php';
-require_once 'propel/engine/builder/om/OMBuilder.php';
-
-/**
- * This Task creates the OM classes based on the XML schema file.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.phing
- */
-class PropelOMTask extends AbstractPropelDataModelTask {
-
-	/**
-	 * The platform (php4, php5, etc.) for which the om is being built.
-	 * @var        string
-	 */
-	private $targetPlatform;
-
-	/**
-	 * Sets the platform (php4, php5, etc.) for which the om is being built.
-	 * @param      string $v
-	 */
-	public function setTargetPlatform($v) {
-		$this->targetPlatform = $v;
-	}
-
-	/**
-	 * Gets the platform (php4, php5, etc.) for which the om is being built.
-	 * @return     string
-	 */
-	public function getTargetPlatform() {
-		return $this->targetPlatform;
-	}
-
-	/**
-	 * Utility method to create directory for package if it doesn't already exist.
-	 * @param      string $path The [relative] package path.
-	 * @throws     BuildException - if there is an error creating directories
-	 */
-	protected function ensureDirExists($path)
-	{
-		$f = new PhingFile($this->getOutputDirectory(), $path);
-		if (!$f->exists()) {
-			if (!$f->mkdirs()) {
-				throw new BuildException("Error creating directories: ". $f->getPath());
-			}
-		}
-	}
-
-	/**
-	 * Uses a builder class to create the output class.
-	 * This method assumes that the DataModelBuilder class has been initialized with the build properties.
-	 * @param      OMBuilder $builder
-	 * @param      boolean $overwrite Whether to overwrite existing files with te new ones (default is YES).
-	 * @todo       -cPropelOMTask Consider refactoring build() method into AbstractPropelDataModelTask (would need to be more generic).
-	 */
-	protected function build(OMBuilder $builder, $overwrite = true)
-	{
-
-		$path = $builder->getClassFilePath();
-		$this->ensureDirExists(dirname($path));
-
-		$_f = new PhingFile($this->getOutputDirectory(), $path);
-		if ($overwrite || !$_f->exists()) {
-			$this->log("\t\t-> " . $builder->getClassname() . " [builder: " . get_class($builder) . "]");
-			$script = $builder->build();
-			file_put_contents($_f->getAbsolutePath(), $script);
-			foreach ($builder->getWarnings() as $warning) {
-				$this->log($warning, Project::MSG_WARN);
-			}
-		} else {
-			$this->log("\t\t-> (exists) " . $builder->getClassname());
-		}
-
-	}
-
-	/**
-	 * Main method builds all the targets for a typical propel project.
-	 */
-	public function main()
-	{
-		// check to make sure task received all correct params
-		$this->validate();
-
-		$generatorConfig = $this->getGeneratorConfig();
-
-		foreach ($this->getDataModels() as $dataModel) {
-			$this->log("Processing Datamodel : " . $dataModel->getName());
-
-			foreach ($dataModel->getDatabases() as $database) {
-
-				$this->log("  - processing database : " . $database->getName());
-
-				foreach ($database->getTables() as $table) {
-
-					if (!$table->isForReferenceOnly()) {
-
-						$this->log("\t+ " . $table->getName());
-
-						// -----------------------------------------------------------------------------------------
-						// Create Peer, Object, and TableMap classes
-						// -----------------------------------------------------------------------------------------
-
-						// these files are always created / overwrite any existing files
-						foreach (array('peer', 'object', 'tablemap') as $target) {
-							$builder = $generatorConfig->getConfiguredBuilder($table, $target);
-							$this->build($builder);
-						}
-
-						// -----------------------------------------------------------------------------------------
-						// Create [empty] stub Peer and Object classes if they don't exist
-						// -----------------------------------------------------------------------------------------
-
-						// these classes are only generated if they don't already exist
-						foreach (array('peerstub', 'objectstub') as $target) {
-							$builder = $generatorConfig->getConfiguredBuilder($table, $target);
-							$this->build($builder, $overwrite=false);
-						}
-
-						// -----------------------------------------------------------------------------------------
-						// Create [empty] stub child Object classes if they don't exist
-						// -----------------------------------------------------------------------------------------
-
-						// If table has enumerated children (uses inheritance) then create the empty child stub classes if they don't already exist.
-						if ($table->getChildrenColumn()) {
-							$col = $table->getChildrenColumn();
-							if ($col->isEnumeratedClasses()) {
-								foreach ($col->getChildren() as $child) {
-									$builder = $generatorConfig->getConfiguredBuilder($table, 'objectmultiextend');
-									$builder->setChild($child);
-									$this->build($builder, $overwrite=false);
-								} // foreach
-							} // if col->is enumerated
-						} // if tbl->getChildrenCol
-
-
-						// -----------------------------------------------------------------------------------------
-						// Create [empty] Interface if it doesn't exist
-						// -----------------------------------------------------------------------------------------
-
-						// Create [empty] interface if it does not already exist
-						if ($table->getInterface()) {
-							$builder = $generatorConfig->getConfiguredBuilder($table, 'interface');
-							$this->build($builder, $overwrite=false);
-						}
-
-						// -----------------------------------------------------------------------------------------
-						// Create tree Node classes
-						// -----------------------------------------------------------------------------------------
-
-						if ($table->treeMode()) {
-							switch($table->treeMode()) {
-								case 'NestedSet':
-									foreach (array('nestedsetpeer', 'nestedset') as $target) {
-										$builder = $generatorConfig->getConfiguredBuilder($table, $target);
-										$this->build($builder);
-									}
-								break;
-
-								case 'MaterializedPath':
-									foreach (array('nodepeer', 'node') as $target) {
-										$builder = $generatorConfig->getConfiguredBuilder($table, $target);
-										$this->build($builder);
-									}
-
-									foreach (array('nodepeerstub', 'nodestub') as $target) {
-										$builder = $generatorConfig->getConfiguredBuilder($table, $target);
-										$this->build($builder, $overwrite=false);
-									}
-								break;
-
-								case 'AdjacencyList':
-									// No implementation for this yet.
-								default:
-								break;
-							}
-
-						} // if Table->treeMode()
-
-
-					} // if !$table->isForReferenceOnly()
-
-				} // foreach table
-
-			} // foreach database
-
-		} // foreach dataModel
-
-	} // main()
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelSQLExec.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelSQLExec.php
deleted file mode 100644
index d7bc55437..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelSQLExec.php
+++ /dev/null
@@ -1,711 +0,0 @@
-<?php
-
-/*
- *  $Id: PropelSQLExec.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'phing/Task.php';
-
-/**
- * Executes all SQL files referenced in the sqldbmap file against their mapped databases.
- *
- * This task uses an SQL -> Database map in the form of a properties
- * file to insert each SQL file listed into its designated database.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @author     Dominik del Bondio
- * @author     Jeff Martin <jeff@custommonkey.org> (Torque)
- * @author     Michael McCallum <gholam@xtra.co.nz> (Torque)
- * @author     Tim Stephenson <tim.stephenson@sybase.com> (Torque)
- * @author     Jason van Zyl <jvanzyl@apache.org> (Torque)
- * @author     Martin Poeschl <mpoeschl@marmot.at> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.phing
- */
-class PropelSQLExec extends Task {
-
-	private $goodSql = 0;
-	private $totalSql = 0;
-
-	const DELIM_ROW = "row";
-	const DELIM_NORMAL = "normal";
-
-	/**
-	 * The delimiter type indicating whether the delimiter will
-	 * only be recognized on a line by itself
-	 */
-	private $delimiterType = "normal"; // can't use constant just defined
-
-	//private static $delimiterTypes = array(DELIM_NORMAL, DELIM_ROW);
-	//private static $errorActions = array("continue", "stop", "abort");
-
-	/** PDO Database connection */
-	private $conn = null;
-
-	/** Autocommit flag. Default value is false */
-	private $autocommit = false;
-
-	/** DB url. */
-	private $url = null;
-
-	/** User name. */
-	private $userId = null;
-
-	/** Password */
-	private $password = null;
-
-	/** SQL input command */
-	private $sqlCommand = "";
-
-	/** SQL transactions to perform */
-	private $transactions = array();
-
-	/** SQL Statement delimiter */
-	private $delimiter = ";";
-
-	/** Print SQL results. */
-	private $print = false;
-
-	/** Print header columns. */
-	private $showheaders = true;
-
-	/** Results Output file. */
-	private $output = null;
-
-	/** RDBMS Product needed for this SQL. */
-	private $rdbms = null;
-
-	/** RDBMS Version needed for this SQL. */
-	private $version = null;
-
-	/** Action to perform if an error is found */
-	private $onError = "abort";
-
-	/** Encoding to use when reading SQL statements from a file */
-	private $encoding = null;
-
-	/** Src directory for the files listed in the sqldbmap. */
-	private $srcDir;
-
-	/** Properties file that maps an individual SQL file to a database. */
-	private $sqldbmap;
-
-	/**
-	 * Set the sqldbmap properties file.
-	 *
-	 * @param      sqldbmap filename for the sqldbmap
-	 */
-	public function setSqlDbMap($sqldbmap)
-	{
-		$this->sqldbmap = $this->project->resolveFile($sqldbmap);
-	}
-
-	/**
-	 * Get the sqldbmap properties file.
-	 *
-	 * @return     filename for the sqldbmap
-	 */
-	public function getSqlDbMap()
-	{
-		return $this->sqldbmap;
-	}
-
-	/**
-	 * Set the src directory for the sql files listed in the sqldbmap file.
-	 *
-	 * @param      PhingFile $srcDir sql source directory
-	 */
-	public function setSrcDir(PhingFile $srcDir)
-	{
-		$this->srcDir = $srcDir;
-	}
-
-	/**
-	 * Get the src directory for the sql files listed in the sqldbmap file.
-	 *
-	 * @return     PhingFile SQL Source directory
-	 */
-	public function getSrcDir()
-	{
-		return $this->srcDir;
-	}
-
-	/**
-	 * Set the sql command to execute
-	 *
-	 * @param      sql sql command to execute
-	 */
-	public function addText($sql)
-	{
-		$this->sqlCommand .= $sql;
-	}
-
-	/**
-	 * Set the DB connection url.
-	 *
-	 * @param      string $url connection url
-	 */
-	public function setUrl($url)
-	{
-		$this->url = $url;
-	}
-
-	/**
-	 * Set the user name for the DB connection.
-	 *
-	 * @param      string $userId database user
-	 * @deprecated Specify userid in the DSN URL.
-	 */
-	public function setUserid($userId)
-	{
-		$this->userId = $userId;
-	}
-
-	/**
-	 * Set the password for the DB connection.
-	 *
-	 * @param      string $password database password
-	 * @deprecated Specify password in the DSN URL.
-	 */
-	public function setPassword($password)
-	{
-		$this->password = $password;
-	}
-
-	/**
-	 * Set the autocommit flag for the DB connection.
-	 *
-	 * @param      boolean $autocommit the autocommit flag
-	 */
-	public function setAutoCommit($autocommit)
-	{
-		$this->autocommit = (boolean) $autocommit;
-	}
-
-	/**
-	 * Set the statement delimiter.
-	 *
-	 * <p>For example, set this to "go" and delimitertype to "ROW" for
-	 * Sybase ASE or MS SQL Server.</p>
-	 *
-	 * @param      string $delimiter
-	 */
-	public function setDelimiter($delimiter)
-	{
-		$this->delimiter = $delimiter;
-	}
-
-	/**
-	 * Set the Delimiter type for this sql task. The delimiter type takes two
-	 * values - normal and row. Normal means that any occurence of the delimiter
-	 * terminate the SQL command whereas with row, only a line containing just
-	 * the delimiter is recognized as the end of the command.
-	 *
-	 * @param      string $delimiterType
-	 */
-	public function setDelimiterType($delimiterType)
-	{
-		$this->delimiterType = $delimiterType;
-	}
-
-	/**
-	 * Set the print flag.
-	 *
-	 * @param      boolean $print
-	 */
-	public function setPrint($print)
-	{
-		$this->print = (boolean) $print;
-	}
-
-	/**
-	 * Set the showheaders flag.
-	 *
-	 * @param      boolean $showheaders
-	 */
-	public function setShowheaders($showheaders)
-	{
-		$this->showheaders = (boolean) $showheaders;
-	}
-
-	/**
-	 * Set the output file.
-	 *
-	 * @param      PhingFile $output
-	 */
-	public function setOutput(PhingFile $output)
-	{
-		$this->output = $output;
-	}
-
-	/**
-	 * Set the action to perform onerror
-	 *
-	 * @param      string $action
-	 */
-	public function setOnerror($action)
-	{
-		$this->onError = $action;
-	}
-
-	/**
-	 * Load the sql file and then execute it
-	 *
-	 * @throws     BuildException
-	 */
-	public function main()
-	{
-		$this->sqlCommand = trim($this->sqlCommand);
-
-		if ($this->sqldbmap === null || $this->getSqlDbMap()->exists() === false) {
-			throw new BuildException("You haven't provided an sqldbmap, or "
-					. "the one you specified doesn't exist: " . $this->sqldbmap->getPath());
-		}
-
-		if ($this->url === null) {
-			throw new BuildException("DSN url attribute must be set!");
-		}
-
-		$map = new Properties();
-
-		try {
-			$map->load($this->getSqlDbMap());
-		} catch (IOException $ioe) {
-			throw new BuildException("Cannot open and process the sqldbmap!");
-		}
-
-		$databases = array();
-
-		foreach ($map->keys() as $sqlfile) {
-
-			$database = $map->getProperty($sqlfile);
-
-			// Q: already there?
-			if (!isset($databases[$database])) {
-			// A: No.
-				$databases[$database] = array();
-			}
-
-			// We want to make sure that the base schemas
-			// are inserted first.
-			if (strpos($sqlfile, "schema.sql") !== false) {
-				// add to the beginning of the array
-				array_unshift($databases[$database], $sqlfile);
-			} else {
-				array_push($databases[$database], $sqlfile);
-			}
-		}
-
-		foreach ($databases as $db => $files) {
-			$transactions = array();
-
-			foreach ($files as $fileName) {
-
-				$file = new PhingFile($this->srcDir, $fileName);
-
-				if ($file->exists()) {
-					$this->log("Executing statements in file: " . $file->__toString());
-					$transaction = new PropelSQLExecTransaction($this);
-					$transaction->setSrc($file);
-					$transactions[] = $transaction;
-				} else {
-					$this->log("File '" . $file->__toString()
-							. "' in sqldbmap does not exist, so skipping it.");
-				}
-			}
-			$this->insertDatabaseSqlFiles($this->url, $db, $transactions);
-		}
-	}
-
-	/**
-	 * Take the base url, the target database and insert a set of SQL
-	 * files into the target database.
-	 *
-	 * @param      string $url
-	 * @param      string $database
-	 * @param      array $transactions
-	 */
-	private function insertDatabaseSqlFiles($url, $database, $transactions)
-	{
-		$url = str_replace("@DB@", $database, $url);
-		$this->log("Our new url -> " . $url);
-
-		try {
-
-			$buf = "Database settings:" . PHP_EOL
-			. " URL: " . $url . PHP_EOL
-			. ($this->userId ? " user: " . $this->userId . PHP_EOL : "")
-			. ($this->password ? " password: " . $this->password . PHP_EOL : "");
-
-			$this->log($buf, Project::MSG_VERBOSE);
-
-			// Set user + password to null if they are empty strings
-			if (!$this->userId) { $this->userId = null; }
-
-			if (!$this->password) { $this->password = null; }
-
-			$this->conn = new PDO($url, $this->userId, $this->password);
-			$this->conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-
-			// $this->conn->setAutoCommit($this->autocommit);
-			// $this->statement = $this->conn->createStatement();
-
-			$out = null;
-
-			try {
-				if ($this->output !== null) {
-					$this->log("Opening PrintStream to output file " . $this->output->__toString(), Project::MSG_VERBOSE);
-					$out = new FileWriter($this->output);
-				}
-
-				// Process all transactions
-				for ($i=0,$size=count($transactions); $i < $size; $i++) {
-					$transactions[$i]->runTransaction($out);
-					if (!$this->autocommit) {
-						$this->log("Commiting transaction", Project::MSG_VERBOSE);
-						$this->conn->commit();
-					}
-				}
-			} catch (Exception $e) {
-				if ($out) $out->close();
-			}
-
-		} catch (IOException $e) {
-
-			if (!$this->autocommit && $this->conn !== null && $this->onError == "abort") {
-				try {
-					$this->conn->rollBack();
-				} catch (PDOException $ex) {
-					// do nothing.
-					System::println("Rollback failed.");
-				}
-			}
-			if ($this->statement) $this->statement = null; // close
-			throw new BuildException($e);
-		} catch (PDOException $e) {
-			if (!$this->autocommit && $this->conn !== null && $this->onError == "abort") {
-				try {
-					$this->conn->rollBack();
-				} catch (PDOException $ex) {
-					// do nothing.
-					System::println("Rollback failed");
-				}
-			}
-			if ($this->statement) $this->statement = null; // close
-			throw new BuildException($e);
-		}
-
-		   $this->statement = null; // close
-
-		$this->log($this->goodSql . " of " . $this->totalSql
-				. " SQL statements executed successfully");
-	}
-
-	/**
-	 * Read the statements from the .sql file and execute them.
-	 * Lines starting with '//', '--' or 'REM ' are ignored.
-	 *
-	 * Developer note:  must be public in order to be called from
-	 * sudo-"inner" class PropelSQLExecTransaction.
-	 *
-	 * @param      Reader $reader
-	 * @param      $out Optional output stream.
-	 * @throws     PDOException
-	 * @throws     IOException
-	 */
-	public function runStatements(Reader $reader, $out = null)
-	{
-		$sql = "";
-		$line = "";
-		$sqlBacklog = "";
-		$hasQuery = false;
-
-		$in = new BufferedReader($reader);
-
-		$parser['pointer'] = 0;
-		$parser['isInString'] = false;
-		$parser['stringQuotes'] = "";
-		$parser['backslashCount'] = 0;
-		$parser['parsedString'] = "";
-
-		$sqlParts = array();
-
-		while (($line = $in->readLine()) !== null) {
-
-			$line = trim($line);
-			$line = ProjectConfigurator::replaceProperties($this->project, $line,
-			$this->project->getProperties());
-
-			if (StringHelper::startsWith("//", $line)
-				|| StringHelper::startsWith("--", $line)
-		 		|| StringHelper::startsWith("#", $line)) {
-				continue;
-			}
-
-			if (strlen($line) > 4 && strtoupper(substr($line,0, 4)) == "REM ") {
-				continue;
-			}
-
-			if ($sqlBacklog !== "") {
-				$sql = $sqlBacklog;
-				$sqlBacklog = "";
-			}
-
-			$sql .= " " . $line . PHP_EOL;
-
-			// SQL defines "--" as a comment to EOL
-			// and in Oracle it may contain a hint
-			// so we cannot just remove it, instead we must end it
-			if (strpos($line, "--") !== false) {
-				$sql .= PHP_EOL;
-			}
-
-			// DELIM_ROW doesn't need this (as far as i can tell)
-			if ($this->delimiterType == self::DELIM_NORMAL) {
-
-				// old regex, being replaced due to segfaults:
-				// See: http://propel.phpdb.org/trac/ticket/294
-				//$reg = "#((?:\"(?:\\\\.|[^\"])*\"?)+|'(?:\\\\.|[^'])*'?|" . preg_quote($this->delimiter) . ")#";
-				//$sqlParts = preg_split($reg, $sql, 0, PREG_SPLIT_DELIM_CAPTURE);
-
-				$i = $parser['pointer'];
-				$c = strlen($sql);
-				while ($i < $c) {
-
-					$char = $sql[$i];
-
-					switch($char) {
-						case "\\":
-							$parser['backslashCount']++;
-							$this->log("c$i: found ".$parser['backslashCount']." backslash(es)", Project::MSG_VERBOSE);
-							break;
-						case "'":
-						case "\"":
-							if ($parser['isInString'] && $parser['stringQuotes'] == $char) {
-								if (($parser['backslashCount'] & 1) == 0) {
-									#$this->log("$i: out of string", Project::MSG_VERBOSE);
-									$parser['isInString'] = false;
-								} else {
-									$this->log("c$i: rejected quoted delimiter", Project::MSG_VERBOSE);
-								}
-
-							} elseif (!$parser['isInString']) {
-								$parser['stringQuotes']	= $char;
-								$parser['isInString'] = true;
-								#$this->log("$i: into string with $parser['stringQuotes']", Project::MSG_VERBOSE);
-							}
-							break;
-					}
-
-					if ($char == $this->delimiter && !$parser['isInString']) {
-						$this->log("c$i: valid end of command found!", Project::MSG_VERBOSE);
-						$sqlParts[] = $parser['parsedString'];
-						$sqlParts[] = $this->delimiter;
-						break;
-					}
-					$parser['parsedString'] .= $char;
-					if ($char !== "\\") {
-						if ($parser['backslashCount']) $this->log("$i: backslash reset", Project::MSG_VERBOSE);
-						$parser['backslashCount'] = 0;
-					}
-					$i++;
-					$parser['pointer']++;
-				}
-
-				$sqlBacklog = "";
-				foreach ($sqlParts as $sqlPart) {
-					// we always want to append, even if it's a delim (which will be stripped off later)
-					$sqlBacklog .= $sqlPart;
-
-					// we found a single (not enclosed by ' or ") delimiter, so we can use all stuff before the delim as the actual query
-					if ($sqlPart === $this->delimiter) {
-						$sql = $sqlBacklog;
-						$sqlBacklog = "";
-						$hasQuery = true;
-					}
-				}
-			}
-
-			if ($hasQuery || ($this->delimiterType == self::DELIM_ROW && $line == $this->delimiter)) {
-				// this assumes there is always a delimter on the end of the SQL statement.
-				$sql = StringHelper::substring($sql, 0, strlen($sql) - 1 - strlen($this->delimiter));
-				$this->log("SQL: " . $sql, Project::MSG_VERBOSE);
-				$this->execSQL($sql, $out);
-				$sql = "";
-				$hasQuery = false;
-
-				$parser['pointer'] = 0;
-				$parser['isInString'] = false;
-				$parser['stringQuotes'] = "";
-				$parser['backslashCount'] = 0;
-				$parser['parsedString'] = "";
-				$sqlParts = array();
-			}
-		}
-
-		// Catch any statements not followed by ;
-		if ($sql !== "") {
-			$this->execSQL($sql, $out);
-		}
-	}
-
-	/**
-	 * Exec the sql statement.
-	 *
-	 * @param      sql
-	 * @param      out
-	 * @throws     PDOException
-	 */
-	protected function execSQL($sql, $out = null)
-	{
-		// Check and ignore empty statements
-		if (trim($sql) == "") {
-			return;
-		}
-
-		try {
-			$this->totalSql++;
-
-			if (!$this->autocommit) $this->conn->beginTransaction();
-
-			$stmt = $this->conn->prepare($sql);
-			$stmt->execute();
-			$this->log($stmt->rowCount() . " rows affected", Project::MSG_VERBOSE);
-
-			if (!$this->autocommit) $this->conn->commit();
-
-			$this->goodSql++;
-		} catch (PDOException $e) {
-			$this->log("Failed to execute: " . $sql, Project::MSG_ERR);
-			if ($this->onError != "continue") {
-				throw $e;
-			}
-			$this->log($e->getMessage(), Project::MSG_ERR);
-		}
-	}
-
-	/**
-	 * print any results in the statement.
-	 *
-	 * @param      out
-	 * @throws     PDOException
-	 */
-	protected function printResults($out = null)
-	{
-		$rs = null;
-
-		do {
-			$rs = $this->statement->getResultSet();
-
-			if ($rs !== null) {
-
-				$this->log("Processing new result set.", Project::MSG_VERBOSE);
-
-				$line = "";
-
-				$colsprinted = false;
-
-				while ($rs->next()) {
-
-					if (!$colsprinted && $this->showheaders) {
-						$first = true;
-						foreach ($this->fields as $fieldName => $ignore) {
-							if ($first) $first = false; else $line .= ",";
-							$line .= $fieldName;
-						}
-					} // if show headers
-
-					$first = true;
-					foreach ($rs->fields as $columnValue) {
-
-						if ($columnValue != null) {
-							$columnValue = trim($columnValue);
-						}
-
-						if ($first) {
-							$first = false;
-						} else {
-							$line .= ",";
-						}
-						$line .= $columnValue;
-					}
-
-					if ($out !== null) {
-						$out->write($line);
-						$out->newLine();
-					}
-
-					System::println($line);
-					$line = "";
-				} // while rs->next()
-			}
-		} while ($this->statement->getMoreResults());
-		System::println();
-		if ($out !== null) $out->newLine();
-	}
-
-}
-
-/**
- * "Inner" class that contains the definition of a new transaction element.
- * Transactions allow several files or blocks of statements
- * to be executed using the same Creole connection and commit
- * operation in between.
- * @package    propel.phing
- */
-class PropelSQLExecTransaction {
-
-	private $tSrcFile = null;
-	private $tSqlCommand = "";
-	private $parent;
-
-	function __construct($parent)
-	{
-		// Parent is required so that we can log things ...
-		$this->parent = $parent;
-	}
-
-	public function setSrc(PhingFile $src)
-	{
-		$this->tSrcFile = $src;
-	}
-
-	public function addText($sql)
-	{
-		$this->tSqlCommand .= $sql;
-	}
-
-	/**
-	 * @throws     IOException, PDOException
-	 */
-	public function runTransaction($out = null)
-	{
-		if (!empty($this->tSqlCommand)) {
-			$this->parent->log("Executing commands", Project::MSG_INFO);
-			$this->parent->runStatements($this->tSqlCommand, $out);
-		}
-
-		if ($this->tSrcFile !== null) {
-			$this->parent->log("Executing file: " . $this->tSrcFile->getAbsolutePath(), Project::MSG_INFO);
-			$reader = new FileReader($this->tSrcFile);
-			$this->parent->runStatements($reader, $out);
-			$reader->close();
-		}
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelSQLTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelSQLTask.php
deleted file mode 100644
index 9da5501dc..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelSQLTask.php
+++ /dev/null
@@ -1,261 +0,0 @@
-<?php
-
-/*
- *  $Id: PropelSQLTask.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-include_once 'propel/engine/database/model/AppData.php';
-
-/**
- * The task for building SQL DDL based on the XML datamodel.
- *
- * This class uses the new DDLBuilder classes instead of the Capsule PHP templates.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.phing
- */
-class PropelSQLTask extends AbstractPropelDataModelTask {
-
-	/**
-	 * The properties file that maps an SQL file to a particular database.
-	 * @var        PhingFile
-	 */
-	private $sqldbmap;
-
-	/**
-	 * Name of the database.
-	 */
-	private $database;
-
-	/**
-	 * Set the sqldbmap.
-	 * @param      PhingFile $sqldbmap The db map.
-	 */
-	public function setSqlDbMap(PhingFile $sqldbmap)
-	{
-		$this->sqldbmap = $sqldbmap;
-	}
-
-	/**
-	 * Get the sqldbmap.
-	 * @return     PhingFile $sqldbmap.
-	 */
-	public function getSqlDbMap()
-	{
-		return $this->sqldbmap;
-	}
-
-	/**
-	 * Set the database name.
-	 * @param      string $database
-	 */
-	public function setDatabase($database)
-	{
-		$this->database = $database;
-	}
-
-	/**
-	 * Get the database name.
-	 * @return     string
-	 */
-	public function getDatabase()
-	{
-		return $this->database;
-	}
-
-	/**
-	 * Create the sql -> database map.
-	 *
-	 * @throws     IOException - if unable to store properties
-	 */
-	protected function createSqlDbMap()
-	{
-		if ($this->getSqlDbMap() === null) {
-			return;
-		}
-
-		// Produce the sql -> database map
-		$sqldbmap = new Properties();
-
-		// Check to see if the sqldbmap has already been created.
-		if ($this->getSqlDbMap()->exists()) {
-			$sqldbmap->load($this->getSqlDbMap());
-		}
-
-		if ($this->packageObjectModel) {
-			// in this case we'll get the sql file name from the package attribute
-			$dataModels = $this->packageDataModels();
-			foreach ($dataModels as $package => $dataModel) {
-				foreach ($dataModel->getDatabases() as $database) {
-					$name = ($package ? $package . '.' : '') . 'schema.xml';
-					$sqlFile = $this->getMappedFile($name);
-					$sqldbmap->setProperty($sqlFile->getName(), $database->getName());
-				}
-			}
-		} else {
-			// the traditional way is to map the schema.xml filenames
-			$dmMap = $this->getDataModelDbMap();
-			foreach (array_keys($dmMap) as $dataModelName) {
-				$sqlFile = $this->getMappedFile($dataModelName);
-				if ($this->getDatabase() === null) {
-					$databaseName = $dmMap[$dataModelName];
-				} else {
-					$databaseName = $this->getDatabase();
-				}
-				$sqldbmap->setProperty($sqlFile->getName(), $databaseName);
-			}
-		}
-
-		try {
-			$sqldbmap->store($this->getSqlDbMap(), "Sqlfile -> Database map");
-		} catch (IOException $e) {
-			throw new IOException("Unable to store properties: ". $e->getMessage());
-		}
-	}
-
-	public function main() {
-
-		$this->validate();
-
-		if (!$this->mapperElement) {
-			throw new BuildException("You must use a <mapper/> element to describe how names should be transformed.");
-		}
-
-		if ($this->packageObjectModel) {
-			$dataModels = $this->packageDataModels();
-		} else {
-			$dataModels = $this->getDataModels();
-		}
-
-		// 1) first create a map of filenames to databases; this is used by other tasks like
-		// the SQLExec task.
-		$this->createSqlDbMap();
-
-		// 2) Now actually create the DDL based on the datamodel(s) from XML schema file.
-		$targetDatabase = $this->getTargetDatabase();
-
-		$generatorConfig = $this->getGeneratorConfig();
-
-		$builderClazz = $generatorConfig->getBuilderClassname('ddl');
-
-		foreach ($dataModels as $package => $dataModel) {
-
-			foreach ($dataModel->getDatabases() as $database) {
-
-				// Clear any start/end DLL
-				call_user_func(array($builderClazz, 'reset'));
-
-				// file we are going to create
-				if (!$this->packageObjectModel) {
-					$name = $dataModel->getName();
-				} else {
-					$name = ($package ? $package . '.' : '') . 'schema.xml';
-				}
-
-				$outFile = $this->getMappedFile($name);
-
-				$this->log("Writing to SQL file: " . $outFile->getPath());
-
-				// First add any "header" SQL
-				$ddl = call_user_func(array($builderClazz, 'getDatabaseStartDDL'));
-
-				foreach ($database->getTables() as $table) {
-
-					if (!$table->isSkipSql()) {
-						$builder = $generatorConfig->getConfiguredBuilder($table, 'ddl');
-						$this->log("\t+ " . $table->getName() . " [builder: " . get_class($builder) . "]");
-						$ddl .= $builder->build();
-						foreach ($builder->getWarnings() as $warning) {
-							$this->log($warning, Project::MSG_WARN);
-						}
-					} else {
-						$this->log("\t + (skipping) " . $table->getName());
-					}
-
-				} // foreach database->getTables()
-
-				// Finally check to see if there is any "footer" SQL
-				$ddl .= call_user_func(array($builderClazz, 'getDatabaseEndDDL'));
-
-				#var_dump($outFile->getAbsolutePath());
-				// Now we're done.  Write the file!
-				file_put_contents($outFile->getAbsolutePath(), $ddl);
-
-			} // foreach database
-		} //foreach datamodels
-
-	} // main()
-
-	/**
-	 * Packages the datamodels to one datamodel per package
-	 *
-	 * This applies only when the the packageObjectModel option is set. We need to
-	 * re-package the datamodels to allow the database package attribute to control
-	 * which tables go into which SQL file.
-	 *
-	 * @return     array The packaged datamodels
-	 */
-	protected function packageDataModels() {
-
-		static $packagedDataModels;
-
-		if (is_null($packagedDataModels)) {
-
-			$dataModels = $this->getDataModels();
-			$dataModel = array_shift($dataModels);
-			$packagedDataModels = array();
-
-			$platform = $this->getGeneratorConfig()->getConfiguredPlatform();
-
-			foreach ($dataModel->getDatabases() as $db) {
-				foreach ($db->getTables() as $table) {
-					$package = $table->getPackage();
-					if (!isset($packagedDataModels[$package])) {
-						$dbClone = $this->cloneDatabase($db);
-						$dbClone->setPackage($package);
-						$ad = new AppData($platform);
-						$ad->setName($dataModel->getName());
-						$ad->addDatabase($dbClone);
-						$packagedDataModels[$package] = $ad;
-					}
-					$packagedDataModels[$package]->getDatabase($db->getName())->addTable($table);
-				}
-			}
-		}
-
-		return $packagedDataModels;
-	}
-
-	protected function cloneDatabase($db) {
-
-		$attributes = array (
-			'name' => $db->getName(),
-			'baseClass' => $db->getBaseClass(),
-			'basePeer' => $db->getBasePeer(),
-			'defaultIdMethod' => $db->getDefaultIdMethod(),
-			'defaultPhpNamingMethod' => $db->getDefaultPhpNamingMethod(),
-			'defaultTranslateMethod' => $db->getDefaultTranslateMethod(),
-			'heavyIndexing' => $db->getHeavyIndexing(),
-		);
-
-		$clone = new Database();
-		$clone->loadFromXML($attributes);
-		return $clone;
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelSchemaReverseTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelSchemaReverseTask.php
deleted file mode 100644
index bfedaded1..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/classes/propel/phing/PropelSchemaReverseTask.php
+++ /dev/null
@@ -1,556 +0,0 @@
-<?php
-
-/*
- *  $Id: PropelSchemaReverseTask.php 945 2008-01-30 02:14:46Z hans $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require_once 'phing/tasks/ext/pdo/PDOTask.php';
-include_once 'propel/engine/GeneratorConfig.php';
-include_once 'propel/engine/database/model/PropelTypes.php';
-
-/**
- * This class generates an XML schema of an existing database from
- * the database metadata.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @version    $Revision: 945 $
- * @package    propel.phing
- */
-class PropelSchemaReverseTask extends PDOTask {
-
-	/**
-	 * Zero bit for no validators
-	 */
-	const VALIDATORS_NONE = 0;
-
-	/**
-	 * Bit for maxLength validator
-	 */
-	const VALIDATORS_MAXLENGTH = 1;
-
-	/**
-	 * Bit for maxValue validator
-	 */
-	const VALIDATORS_MAXVALUE = 2;
-
-	/**
-	 * Bit for type validator
-	 */
-	const VALIDATORS_TYPE = 4;
-
-	/**
-	 * Bit for required validator
-	 */
-	const VALIDATORS_REQUIRED = 8;
-
-	/**
-	 * Bit for unique validator
-	 */
-	const VALIDATORS_UNIQUE = 16;
-
-	/**
-	 * Bit for all validators
-	 */
-	const VALIDATORS_ALL = 255;
-
-	/**
-	 * File to contain XML database schema.
-	 * @var        PhingFIle
-	 */
-	protected $xmlSchema;
-
-	/**
-	 * DB encoding to use
-	 * @var        string
-	 */
-	protected $dbEncoding = 'iso-8859-1';
-
-	/**
-	 * DB schema to use.
-	 * @var        string
-	 */
-	protected $dbSchema;
-
-	/**
-	 * The datasource name (used for <database name=""> in schema.xml)
-	 *
-	 * @var        string
-	 */
-	protected $databaseName;
-
-	/**
-	 * DOM document produced.
-	 * @var        DOMDocument
-	 */
-	protected $doc;
-
-	/**
-	 * The document root element.
-	 * @var        DOMElement
-	 */
-	protected $databaseNode;
-
-	/**
-	 * Hashtable of columns that have primary keys.
-	 * @var        array
-	 */
-	protected $primaryKeys;
-
-	/**
-	 * Whether to use same name for phpName or not.
-	 * @var        boolean
-	 */
-	protected $samePhpName;
-
-	/**
-	 * whether to add vendor info or not
-	 * @var        boolean
-	 */
-	protected $addVendorInfo;
-
-	/**
-	 * Bitfield to switch on/off which validators will be created.
-	 *
-	 * @var        int
-	 */
-	protected $validatorBits = PropelSchemaReverseTask::VALIDATORS_NONE;
-
-	/**
-	 * Collect validatorInfos to create validators.
-	 *
-	 * @var        int
-	 */
-	protected $validatorInfos;
-
-	/**
-	 * An initialized GeneratorConfig object containing the converted Phing props.
-	 *
-	 * @var        GeneratorConfig
-	 */
-	private $generatorConfig;
-
-	/**
-	 * Maps validator type tokens to bits
-	 *
-	 * The tokens are used in the propel.addValidators property to define
-	 * which validators are to be added
-	 *
-	 * @var        array
-	 */
-	static protected $validatorBitMap = array (
-		'none' => PropelSchemaReverseTask::VALIDATORS_NONE,
-		'maxlength' => PropelSchemaReverseTask::VALIDATORS_MAXLENGTH,
-		'maxvalue' => PropelSchemaReverseTask::VALIDATORS_MAXVALUE,
-		'type' => PropelSchemaReverseTask::VALIDATORS_TYPE,
-		'required' => PropelSchemaReverseTask::VALIDATORS_REQUIRED,
-		'unique' => PropelSchemaReverseTask::VALIDATORS_UNIQUE,
-		'all' => PropelSchemaReverseTask::VALIDATORS_ALL,
-	);
-
-	/**
-	 * Defines messages that are added to validators
-	 *
-	 * @var        array
-	 */
-	static protected $validatorMessages = array (
-		'maxlength' => array (
-			'msg' => 'The field %s must be not longer than %s characters.',
-			'var' => array('colName', 'value')
-	),
-		'maxvalue' => array (
-			'msg' => 'The field %s must be not greater than %s.',
-			'var' => array('colName', 'value')
-	),
-		'type' => array (
-			'msg' => 'The column %s must be an %s value.',
-			'var' => array('colName', 'value')
-	),
-		'required' => array (
-			'msg' => 'The field %s is required.',
-			'var' => array('colName')
-	),
-		'unique' => array (
-			'msg' => 'This %s already exists in table %s.',
-			'var' => array('colName', 'tableName')
-	),
-	);
-
-	/**
-	 * Gets the (optional) schema name to use.
-	 *
-	 * @return     string
-	 */
-	public function getDbSchema()
-	{
-		return $this->dbSchema;
-	}
-
-	/**
-	 * Sets the name of a database schema to use (optional).
-	 *
-	 * @param      string $dbSchema
-	 */
-	public function setDbSchema($dbSchema)
-	{
-		$this->dbSchema = $dbSchema;
-	}
-
-	/**
-	 * Gets the database encoding.
-	 *
-	 * @return     string
-	 */
-	public function getDbEncoding($v)
-	{
-		return $this->dbEncoding;
-	}
-
-	/**
-	 * Sets the database encoding.
-	 *
-	 * @param      string $v
-	 */
-	public function setDbEncoding($v)
-	{
-		$this->dbEncoding = $v;
-	}
-
-	/**
-	 * Gets the datasource name.
-	 *
-	 * @return     string
-	 */
-	public function getDatabaseName()
-	{
-		return $this->databaseName;
-	}
-
-	/**
-	 * Sets the datasource name.
-	 *
-	 * This will be used as the <database name=""> value in the generated schema.xml
-	 *
-	 * @param      string $v
-	 */
-	public function setDatabaseName($v)
-	{
-		$this->databaseName = $v;
-	}
-
-	/**
-	 * Sets the output name for the XML file.
-	 *
-	 * @param      PhingFile $v
-	 */
-	public function setOutputFile(PhingFile $v)
-	{
-		$this->xmlSchema = $v;
-	}
-
-	/**
-	 * Set whether to use the column name as phpName without any translation.
-	 *
-	 * @param      boolean $v
-	 */
-	public function setSamePhpName($v)
-	{
-		$this->samePhpName = $v;
-	}
-
-	/**
-	 * Set whether to add vendor info to the schema.
-	 *
-	 * @param      boolean $v
-	 */
-	public function setAddVendorInfo($v)
-	{
-		$this->addVendorInfo = (boolean) $v;
-	}
-
-	/**
-	 * Sets set validator bitfield from a comma-separated list of "validator bit" names.
-	 *
-	 * @param      string $v The comma-separated list of which validators to add.
-	 * @return     void
-	 */
-	public function setAddValidators($v)
-	{
-		$validKeys = array_keys(self::$validatorBitMap);
-
-		// lowercase input
-		$v = strtolower($v);
-
-		$bits = self::VALIDATORS_NONE;
-
-		$exprs = explode(',', $v);
-		foreach ($exprs as $expr) {
-			$expr = trim($expr);
-			if(!empty($expr)) {
-  			if (!isset(self::$validatorBitMap[$expr])) {
-  				throw new BuildException("Unable to interpret validator in expression ('$v'): " . $expr);
-  			}
-  			$bits |= self::$validatorBitMap[$expr];
-			}
-		}
-
-		$this->validatorBits = $bits;
-	}
-
-	/**
-	 * Checks whether to add validators of specified type or not
-	 *
-	 * @param      int $type The validator type constant.
-	 * @return     boolean
-	 */
-	protected function isValidatorRequired($type)
-	{
-		return (($this->validatorBits & $type) === $type);
-	}
-
-	/**
-	 * Whether to use the column name as phpName without any translation.
-	 *
-	 * @return     boolean
-	 */
-	public function isSamePhpName()
-	{
-		return $this->samePhpName;
-	}
-
-	/**
-	 * @throws     BuildException
-	 */
-	public function main()
-	{
-		if (!$this->getDatabaseName()) {
-			throw new BuildException("databaseName attribute is required for schema reverse engineering", $this->getLocation());
-		}
-
-		//(not yet supported) $this->log("schema : " . $this->dbSchema);
-		//DocumentTypeImpl docType = new DocumentTypeImpl(null, "database", null,
-		//	   "http://jakarta.apache.org/turbine/dtd/database.dtd");
-
-		$this->doc = new DOMDocument('1.0', 'utf-8');
-		$this->doc->formatOutput = true; // pretty printing
-
-		$this->doc->appendChild($this->doc->createComment("Autogenerated by ".get_class($this)." class."));
-
-		try {
-
-			$database = $this->buildModel();
-
-			if ($this->validatorBits !== self::VALIDATORS_NONE) {
-				$this->addValidators($database);
-			}
-
-			$database->appendXml($this->doc);
-
-			$this->log("Writing XML to file: " . $this->xmlSchema->getPath());
-			$out = new FileWriter($this->xmlSchema);
-			$xmlstr = $this->doc->saveXML();
-			$out->write($xmlstr);
-			$out->close();
-
-		} catch (Exception $e) {
-			$this->log("There was an error building XML from metadata: " . $e->getMessage(), Project::MSG_ERR);
-		}
-
-		$this->log("Schema reverse engineering finished");
-	}
-
-	/**
-	 * Gets the GeneratorConfig object for this task or creates it on-demand.
-	 * @return     GeneratorConfig
-	 */
-	protected function getGeneratorConfig()
-	{
-		if ($this->generatorConfig === null) {
-			$this->generatorConfig = new GeneratorConfig();
-			$this->generatorConfig->setBuildProperties($this->getProject()->getProperties());
-		}
-		return $this->generatorConfig;
-	}
-
-	/**
-	 * Builds the model classes from the database schema.
-	 * @return     Database The built-out Database (with all tables, etc.)
-	 */
-	protected function buildModel()
-	{
-		$config = $this->getGeneratorConfig();
-		$con = $this->getConnection();
-
-		$database = new Database($this->getDatabaseName());
-		$database->setPlatform($config->getConfiguredPlatform($con));
-
-		// Some defaults ...
-		$database->setDefaultIdMethod(IDMethod::NATIVE);
-
-		$parser = $config->getConfiguredSchemaParser($con);
-
-		$parser->parse($database);
-
-		return $database;
-	}
-
-	/**
-	 * Adds any requested validators to the data model.
-	 *
-	 * We will add the following type specific validators:
-	 *
-	 *      for notNull columns: required validator
-	 *      for unique indexes: unique validator
-	 * 		for varchar types: maxLength validators (CHAR, VARCHAR, LONGVARCHAR)
-	 * 		for numeric types: maxValue validators (BIGINT, SMALLINT, TINYINT, INTEGER, FLOAT, DOUBLE, NUMERIC, DECIMAL, REAL)
-	 * 		for integer and timestamp types: notMatch validator with [^\d]+ (BIGINT, SMALLINT, TINYINT, INTEGER, TIMESTAMP)
-	 * 		for float types: notMatch validator with [^\d\.]+ (FLOAT, DOUBLE, NUMERIC, DECIMAL, REAL)
-	 *
-	 * @param      Database $database The Database model.
-	 * @return     void
-	 * @todo       find out how to evaluate the appropriate size and adjust maxValue rule values appropriate
-	 * @todo       find out if float type column values must always notMatch('[^\d\.]+'), i.e. digits and point for any db vendor, language etc.
-	 */
-	protected function addValidators(Database $database)
-	{
-
-		$platform = $this->getGeneratorConfig()->getConfiguredPlatform();
-
-		foreach ($database->getTables() as $table) {
-
-			$set = new PropelSchemaReverse_ValidatorSet();
-
-			foreach ($table->getColumns() as $col) {
-
-				if ($col->isNotNull() && $this->isValidatorRequired(self::VALIDATORS_REQUIRED)) {
-					$validator = $set->getValidator($col);
-					$validator->addRule($this->getValidatorRule($col, 'required'));
-				}
-
-				if (in_array($col->getType(), array(PropelTypes::CHAR, PropelTypes::VARCHAR, PropelTypes::LONGVARCHAR))
-						&& $col->getSize() && $this->isValidatorRequired(self::VALIDATORS_MAXLENGTH)) {
-					$validator = $set->getValidator($col);
-					$validator->addRule($this->getValidatorRule($col, 'maxLength', $col->getSize()));
-				}
-
-				if ($col->isNumericType() && $this->isValidatorRequired(self::VALIDATORS_MAXVALUE)) {
-					$this->log("WARNING: maxValue validator added for column ".$col->getName().". You will have to adjust the size value manually.", Project::MSG_WARN);
-					$validator = $set->getValidator($col);
-					$validator->addRule($this->getValidatorRule($col, 'maxSize', 'REPLACEME'));
-				}
-
-				if ($col->isPhpPrimitiveType() && $this->isValidatorRequired(self::VALIDATORS_TYPE)) {
-					$validator = $set->getValidator($col);
-					$validator->addRule($this->getValidatorRule($col, 'type', $col->getPhpType()));
-				}
-
-			}
-
-			foreach ($table->getUnices() as $unique) {
-				$colnames = $unique->getColumns();
-				if (count($colnames) == 1) { // currently 'unique' validator only works w/ single columns.
-					$col = $table->getColumn($colnames[0]);
-					$validator = $set->getValidator($col);
-					$validator->addRule($this->getValidatorRule($col, 'unique'));
-				}
-			}
-
-			foreach ($set->getValidators() as $validator) {
-				$table->addValidator($validator);
-			}
-
-		} // foreach table
-
-	}
-
-	/**
-	 * Gets validator rule for specified type (string).
-	 *
-	 * @param      Column $column The column that is being validated.
-	 * @param      string $type The type (string) for validator (e.g. 'required').
-	 * @param      mixed $value The value for the validator (if applicable)
-	 */
-	protected function getValidatorRule(Column $column, $type, $value = null)
-	{
-		$rule = new Rule();
-		$rule->setName($type);
-		if ($value !== null) {
-			$rule->setValue($value);
-		}
-		$rule->setMessage($this->getRuleMessage($column, $type, $value));
-		return $rule;
-	}
-
-	/**
-	 * Gets the message for a specified rule.
-	 *
-	 * @param      Column $column
-	 * @param      string $type
-	 * @param      mixed $value
-	 */
-	protected function getRuleMessage(Column $column, $type, $value)
-	{
-		// create message
-		$colName = $column->getName();
-		$tableName = $column->getTable()->getName();
-		$msg = self::$validatorMessages[strtolower($type)];
-		$tmp = compact($msg['var']);
-		array_unshift($tmp, $msg['msg']);
-		$msg = call_user_func_array('sprintf', $tmp);
-		return $msg;
-	}
-
-}
-
-/**
- * A helper class to store validator sets indexed by column.
- * @package    propel.phing
- */
-class PropelSchemaReverse_ValidatorSet {
-
-	/**
-	 * Map of column names to validators.
-	 *
-	 * @var        array Validator[]
-	 */
-	private $validators = array();
-
-	/**
-	 * Gets a single validator for specified column name.
-	 * @param      Column $column
-	 * @return     Validator
-	 */
-	public function getValidator(Column $column)
-	{
-		$key = $column->getName();
-		if (!isset($this->validators[$key])) {
-			$this->validators[$key] = new Validator();
-			$this->validators[$key]->setColumn($column);
-		}
-		return $this->validators[$key];
-	}
-
-	/**
-	 * Gets all validators.
-	 * @return     array Validator[]
-	 */
-	public function getValidators()
-	{
-		return $this->validators;
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/default.properties b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/default.properties
deleted file mode 100644
index ed96ec5a3..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/default.properties
+++ /dev/null
@@ -1,264 +0,0 @@
-# -------------------------------------------------------------------
-#
-#  D E F A U L T   P R O P E R T I E S
-#
-# -------------------------------------------------------------------
-# This file sets default properties.  You can override any of these
-# by specifying your new value in the build.properties file for your
-# project or a top-level build.properties file. Either way, you
-# should not need to edit this file.
-# -------------------------------------------------------------------
-
-
-# -------------------------------------------------------------------
-#
-#  B A S I C   P R O P E R T I E S
-#
-# -------------------------------------------------------------------
-
-propel.version = 1.4.2
-
-propel.home = .
-
-propel.project =
-propel.database =
-propel.targetPackage = ${propel.project}
-propel.runOnlyOnSchemaChange = false
-
-# Default behavior settings
-#
-propel.targetPlatform = php5
-propel.packageObjectModel = false
-propel.schema.validate = true
-propel.useDateTimeClass = true
-propel.dateTimeClass = DateTime
-
-# controls what type of joins will be used in the doSelectJoin*() peer methods, 
-# if set to true, LEFT JOINS will be used, INNER JOINS otherwise
-# see ticket #491, #588
-propel.useLeftJoinsInDoJoinMethods = true
-
-# -------------------------------------------------------------------
-#
-#  D A T A B A S E   S E T T I N G S
-#
-# -------------------------------------------------------------------
-
-propel.database.url =
-propel.database.buildUrl = ${propel.database.url}
-propel.database.createUrl = ${propel.database.buildUrl}
-
-propel.database.driver =
-
-propel.database.schema =
-propel.database.encoding =
-propel.database.manualCreation = false
-
-# if these arent blank then when we try to connect with insert-sql to a database
-# that doesnt require them and it isnt in the build.properties it sends
-# the ${blah} for the username and password
-propel.database.user =
-propel.database.password =
-
-# Creole database settings for reverse engineering applications
-# -------------------------------------------------------------
-
-# by default leave the databaseDriver blank, so that bundled driver is used by Creole
-propel.database.creole.driver =
-propel.database.creole.url =
-
-# -------------------------------------------------------------------
-#
-#  C R E O L E  TO  X M L  S E T T I N G S
-#
-# -------------------------------------------------------------------
-
-propel.samePhpName = false
-propel.addVendorInfo = false
-propel.addValidators = none
-
-# -------------------------------------------------------------------
-#
-#  T E M P L A T E   V A R I A B L E S
-#
-# -------------------------------------------------------------------
-
-propel.addGenericAccessors = false
-propel.addGenericMutators = false
-propel.addSaveMethod = true
-propel.addTimeStamp = false
-propel.addValidateMethod = true
-propel.addIncludes = true
-propel.addHooks = true
-propel.basePrefix = Base
-propel.saveException = PropelException
-propel.emulateForeignKeyConstraints = false
-
-# Identifier quoting is only implemented at the DDL layer at this point.
-# Since this may result in undesired behavior (especially in Postgres),
-# it can be disabled by setting this property to true in your build.properties file.
-propel.disableIdentifierQuoting = false
-
-# These are the default formats that will be used when fetching values
-# from temporal columns in Propel.  You can always specify these when
-# calling the methods directly, but for methods like getByName()
-# it is nice to change the defaults.
-
-propel.defaultTimeStampFormat = Y-m-d H:i:s
-propel.defaultTimeFormat = %X
-propel.defaultDateFormat = %x
-
-propel.omtar.src.base = false
-propel.omtar.src.extension = false
-propel.omtar.bin.base = false
-propel.omtar.bin.extension = false
-propel.omtar.deleteFiles = false
-
-
-# -------------------------------------------------------------------
-#
-#  C O N T R O L   T E M P L A T E S
-#
-# -------------------------------------------------------------------
-#
-# This is a deprecated idea, that will almost certainly be completely
-# removed in Propel 1.2 and/or 2.0.
-#
-
-propel.template.conf = ${propel.home}/templates/conf/Control.tpl
-propel.template.sql = ${propel.home}/templates/sql/base/Control.tpl
-propel.template.sqlDbInit = ${propel.home}/templates/sql/db-init/Control.tpl
-
-
-# -------------------------------------------------------------------
-#
-#  D I R E C T O R I E S
-#
-# -------------------------------------------------------------------
-
-propel.project.dir = ${propel.home}/projects/${propel.project}
-
-propel.output.dir = ${propel.project.dir}/build
-propel.schema.dir = ${propel.project.dir}
-propel.templatePath = ${propel.home}/templates
-propel.conf.dir = ${propel.project.dir}
-
-propel.doc.dir = ${propel.output.dir}/doc
-propel.php.dir = ${propel.output.dir}/classes
-propel.phpconf.dir = ${propel.output.dir}/conf
-propel.phpdoc.dir = ${propel.output.dir}/phpdoc
-propel.sql.dir = ${propel.output.dir}/sql
-propel.graph.dir = ${propel.output.dir}/graph
-propel.omtar.dir = ${propel.output.dir}
-
-
-# -------------------------------------------------------------------
-#
-#  D E F A U L T   F I L E   N A M ES
-#
-# -------------------------------------------------------------------
-
-# propel.sqlfile
-
-propel.runtime.conf.file = runtime-conf.xml
-propel.runtime.phpconf.file = ${propel.project}-conf.php
-propel.runtime.phpconf-classmap.file = ${propel.project}-classmap.php
-propel.default.schema.basename = schema
-
-# Can't use because of inconsistencies in where the files
-# are named (some from build-propel.xml, but some from within templates)
-# propel.default.data.basename = ${propel.project}-data
-
-propel.schema.xsd.file = ${propel.home}/resources/xsd/database.xsd
-propel.schema.xsl.file = ${propel.home}/resources/xsl/database.xsl
-
-# -------------------------------------------------------------------
-#
-#  I N C L U D E   A N D   E X C L U D E   S E T T I N G S
-#
-# -------------------------------------------------------------------
-
-propel.schema.sql.includes = *schema.xml
-propel.schema.sql.excludes =
-propel.schema.doc.includes = *schema.xml
-propel.schema.doc.excludes =
-propel.schema.create-db.includes = *schema.xml
-propel.schema.create-db.excludes =
-propel.schema.init-sql.includes = *schema.xml
-propel.schema.init-sql.excludes = id-table-schema.xml
-propel.schema.om.includes = *schema.xml
-propel.schema.om.excludes = id-table-schema.xml
-propel.schema.datadtd.includes = *schema.xml
-propel.schema.datadtd.excludes = id-table-schema.xml
-
-# -------------------------------------------------------------------
-#
-#  M A P P E R   S E T T I N G S
-#
-# -------------------------------------------------------------------
-
-# (note: data xml files are selected based on datadbmap file)
-propel.datasql.mapper.from = *.xml
-propel.datasql.mapper.to = *.sql
-
-propel.datadump.mapper.from = *schema.xml
-propel.datadump.mapper.to = *data.xml
-
-propel.datadtd.mapper.from = *.xml
-propel.datadtd.mapper.to = *.dtd
-
-propel.sql.mapper.from = *.xml
-propel.sql.mapper.to = *.sql
-
-
-# -------------------------------------------------------------------
-#
-#  B U I L D E R    S E T T I N G S
-#
-# -------------------------------------------------------------------
-
-# Object Model builders
-propel.builder.peer.class = propel.engine.builder.om.php5.PHP5PeerBuilder
-propel.builder.object.class = propel.engine.builder.om.php5.PHP5ObjectBuilder
-propel.builder.objectstub.class = propel.engine.builder.om.php5.PHP5ExtensionObjectBuilder
-propel.builder.peerstub.class = propel.engine.builder.om.php5.PHP5ExtensionPeerBuilder
-
-propel.builder.objectmultiextend.class = propel.engine.builder.om.php5.PHP5MultiExtendObjectBuilder
-
-propel.builder.tablemap.class = propel.engine.builder.om.php5.PHP5TableMapBuilder
-
-propel.builder.interface.class = propel.engine.builder.om.php5.PHP5InterfaceBuilder
-
-propel.builder.node.class = propel.engine.builder.om.php5.PHP5NodeBuilder
-propel.builder.nodepeer.class = propel.engine.builder.om.php5.PHP5NodePeerBuilder
-propel.builder.nodestub.class = propel.engine.builder.om.php5.PHP5ExtensionNodeBuilder
-propel.builder.nodepeerstub.class = propel.engine.builder.om.php5.PHP5ExtensionNodePeerBuilder
-
-propel.builder.nestedset.class = propel.engine.builder.om.php5.PHP5NestedSetBuilder
-propel.builder.nestedsetpeer.class = propel.engine.builder.om.php5.PHP5NestedSetPeerBuilder
-
-propel.builder.pluralizer.class = propel.engine.builder.util.DefaultEnglishPluralizer
-
-# SQL builders
-
-propel.builder.ddl.class = propel.engine.builder.sql.${propel.database}.${propel.database}DDLBuilder
-propel.builder.datasql.class = propel.engine.builder.sql.${propel.database}.${propel.database}DataSQLBuilder
-
-# Platform classes
-
-propel.platform.class = propel.engine.platform.${propel.database}Platform
-
-# Schema Parser (reverse-engineering) classes
-
-propel.reverse.parser.class = propel.engine.database.reverse.${propel.database}.${propel.database}SchemaParser
-
-# -------------------------------------------------------------------
-#
-#  B E H A V I O R   S E T T I N G S
-#
-# -------------------------------------------------------------------
-
-propel.behavior.timestampable.class = propel.engine.behavior.TimestampableBehavior
-propel.behavior.alternative_coding_standards.class = propel.engine.behavior.AlternativeCodingStandardsBehavior
-propel.behavior.soft_delete.class = propel.engine.behavior.SoftDeleteBehavior
-propel.behavior.auto_add_pk.class = propel.engine.behavior.AutoAddPkBehavior
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/pear/BuildPropelGenPEARPackageTask.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/pear/BuildPropelGenPEARPackageTask.php
deleted file mode 100644
index 025f0de87..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/pear/BuildPropelGenPEARPackageTask.php
+++ /dev/null
@@ -1,270 +0,0 @@
-<?php
-/*
- *  $Id: BuildPropelGenPEARPackageTask.php 1750 2010-05-09 12:33:47Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/tasks/system/MatchingTask.php';
-include_once 'phing/types/FileSet.php';
-include_once 'phing/tasks/ext/pearpackage/Fileset.php';
-
-/**
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    phing.tasks.ext
- * @version    $Revision: 1750 $
- */
-class BuildPropelGenPEARPackageTask extends MatchingTask {
-
-	/** Base directory for reading files. */
-	private $dir;
-
-	private $version;
-	private $state = 'stable';
-	private $notes;
-
-	private $filesets = array();
-
-	/** Package file */
-	private $packageFile;
-
-	public function init() {
-		include_once 'PEAR/PackageFileManager2.php';
-		if (!class_exists('PEAR_PackageFileManager2')) {
-			throw new BuildException("You must have installed PEAR_PackageFileManager2 (PEAR_PackageFileManager >= 1.6.0) in order to create a PEAR package.xml file.");
-		}
-	}
-
-	private function setOptions($pkg){
-
-		$options['baseinstalldir'] = 'propel';
-		$options['packagedirectory'] = $this->dir->getAbsolutePath();
-
-		if (empty($this->filesets)) {
-			throw new BuildException("You must use a <fileset> tag to specify the files to include in the package.xml");
-		}
-
-		$options['filelistgenerator'] = 'Fileset';
-
-		// Some PHING-specific options needed by our Fileset reader
-		$options['phing_project'] = $this->getProject();
-		$options['phing_filesets'] = $this->filesets;
-
-		if ($this->packageFile !== null) {
-			// create one w/ full path
-			$f = new PhingFile($this->packageFile->getAbsolutePath());
-			$options['packagefile'] = $f->getName();
-			// must end in trailing slash
-			$options['outputdirectory'] = $f->getParent() . DIRECTORY_SEPARATOR;
-			$this->log("Creating package file: " . $f->getPath(), Project::MSG_INFO);
-		} else {
-			$this->log("Creating [default] package.xml file in base directory.", Project::MSG_INFO);
-		}
-
-		// add install exceptions
-		$options['installexceptions'] = array(	'pear/pear-propel-gen' => '/',
-												'pear/pear-propel-gen.bat' => '/',
-												'pear/pear-build.xml' => '/',
-												'pear/build.properties' => '/',
-												);
-
-		$options['dir_roles'] = array(	'projects' => 'data',
-										'test' => 'test',
-										'templates' => 'data',
-										'resources' => 'data');
-
-		$options['exceptions'] = array(	'pear/pear-propel-gen.bat' => 'script',
-										'pear/pear-propel-gen' => 'script',
-										'pear/pear-build.xml' => 'data',
-										'build.xml' => 'data',
-										'build-propel.xml' => 'data',
-									);
-
-		$pkg->setOptions($options);
-
-	}
-
-	/**
-	 * Main entry point.
-	 * @return     void
-	 */
-	public function main() {
-
-		if ($this->dir === null) {
-			throw new BuildException("You must specify the \"dir\" attribute for PEAR package task.");
-		}
-
-		if ($this->version === null) {
-			throw new BuildException("You must specify the \"version\" attribute for PEAR package task.");
-		}
-
-		$package = new PEAR_PackageFileManager2();
-
-		$this->setOptions($package);
-
-		// the hard-coded stuff
-		$package->setPackage('propel_generator');
-		$package->setSummary('Generator component of the Propel PHP object persistence layer');
-		$package->setDescription('Propel is an object persistence layer for PHP5 based on Apache Torque. This package provides the generator engine that builds PHP classes and SQL DDL based on an XML representation of your data model.');
-		$package->setChannel('pear.propelorm.org');
-		$package->setPackageType('php');
-
-		$package->setReleaseVersion($this->version);
-		$package->setAPIVersion($this->version);
-
-		$package->setReleaseStability($this->state);
-		$package->setAPIStability($this->state);
-
-		$package->setNotes($this->notes);
-
-		$package->setLicense('LGPL', 'http://www.gnu.org/licenses/lgpl.html');
-
-		// Add package maintainers
-		$package->addMaintainer('lead', 'hans', 'Hans Lellelid', 'hans@xmpl.org');
-		$package->addMaintainer('lead', 'david', 'David Zuelke', 'dz@bitxtender.com');
-		$package->addMaintainer('lead', 'francois', 'Francois Zaninotto', 'fzaninotto@[gmail].com');
-
-		// (wow ... this is a poor design ...)
-		//
-		// note that the order of the method calls below is creating
-		// sub-"release" sections which have specific rules.  This replaces
-		// the platformexceptions system in the older version of PEAR's package.xml
-		//
-		// Programmatically, I feel the need to re-iterate that this API for PEAR_PackageFileManager
-		// seems really wrong.  Sub-sections should be encapsulated in objects instead of having
-		// a "flat" API that does not represent the structure being created....
-
-
-		// creating a sub-section for 'windows'
-			$package->addRelease();
-			$package->setOSInstallCondition('windows');
-			$package->addInstallAs('pear/pear-propel-gen.bat', 'propel-gen.bat');
-			$package->addIgnoreToRelease('pear/pear-propel-gen');
-
-		// creating a sub-section for non-windows
-			$package->addRelease();
-			$package->addInstallAs('pear/pear-propel-gen', 'propel-gen');
-			$package->addIgnoreToRelease('pear/pear-propel-gen.bat');
-
-
-		// "core" dependencies
-		$package->setPhpDep('5.2.4');
-		$package->setPearinstallerDep('1.4.0');
-
-		// "package" dependencies
-		$package->addPackageDepWithChannel( 'required', 'phing', 'pear.phing.info', '2.3.0');
-
-		$package->addExtensionDep('required', 'pdo');
-		$package->addExtensionDep('required', 'xml');
-		$package->addExtensionDep('required', 'xsl');
-
-		// now add the replacements ....
-		$package->addReplacement('Phing.php', 'pear-config', '@DATA-DIR@', 'data_dir');
-		$package->addReplacement('pear/pear-propel-gen.bat', 'pear-config', '@PHP-BIN@', 'php_bin');
-		$package->addReplacement('pear/pear-propel-gen.bat', 'pear-config', '@BIN-DIR@', 'bin_dir');
-		$package->addReplacement('pear/pear-propel-gen.bat', 'pear-config', '@PEAR-DIR@', 'php_dir');
-		$package->addReplacement('pear/pear-propel-gen.bat', 'pear-config', '@DATA-DIR@', 'data_dir');
-
-		$package->addReplacement('pear/pear-propel-gen', 'pear-config', '@PHP-BIN@', 'php_bin');
-		$package->addReplacement('pear/pear-propel-gen', 'pear-config', '@BIN-DIR@', 'bin_dir');
-		$package->addReplacement('pear/pear-propel-gen', 'pear-config', '@PEAR-DIR@', 'php_dir');
-		$package->addReplacement('pear/pear-propel-gen', 'pear-config', '@DATA-DIR@', 'data_dir');
-
-		$package->addReplacement('pear/pear-build.xml', 'pear-config', '@PHP-BIN@', 'php_bin');
-		$package->addReplacement('pear/pear-build.xml', 'pear-config', '@BIN-DIR@', 'bin_dir');
-		$package->addReplacement('pear/pear-build.xml', 'pear-config', '@PEAR-DIR@', 'php_dir');
-		$package->addReplacement('pear/pear-build.xml', 'pear-config', '@DATA-DIR@', 'data_dir');
-
-
-		// now we run this weird generateContents() method that apparently
-		// is necessary before we can add replacements ... ?
-		$package->generateContents();
-
-		$e = $package->writePackageFile();
-
-		if (PEAR::isError($e)) {
-			throw new BuildException("Unable to write package file.", new Exception($e->getMessage()));
-		}
-
-	}
-
-	/**
-	 * Used by the PEAR_PackageFileManager_PhingFileSet lister.
-	 * @return     array FileSet[]
-	 */
-	public function getFileSets() {
-		return $this->filesets;
-	}
-
-	// -------------------------------
-	// Set properties from XML
-	// -------------------------------
-
-	/**
-	 * Nested creator, creates a FileSet for this task
-	 *
-	 * @return     FileSet The created fileset object
-	 */
-	function createFileSet() {
-		$num = array_push($this->filesets, new FileSet());
-		return $this->filesets[$num-1];
-	}
-
-	/**
-	 * Set the version we are building.
-	 * @param      string $v
-	 * @return     void
-	 */
-	public function setVersion($v){
-		$this->version = $v;
-	}
-
-	/**
-	 * Set the state we are building.
-	 * @param      string $v
-	 * @return     void
-	 */
-	public function setState($v) {
-		$this->state = $v;
-	}
-
-	/**
-	 * Sets release notes field.
-	 * @param      string $v
-	 * @return     void
-	 */
-	public function setNotes($v) {
-		$this->notes = $v;
-	}
-	/**
-	 * Sets "dir" property from XML.
-	 * @param      PhingFile $f
-	 * @return     void
-	 */
-	public function setDir(PhingFile $f) {
-		$this->dir = $f;
-	}
-
-	/**
-	 * Sets the file to use for generated package.xml
-	 */
-	public function setDestFile(PhingFile $f) {
-		$this->packageFile = $f;
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/pear/build-pear-package.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/pear/build-pear-package.xml
deleted file mode 100644
index 691134a76..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/pear/build-pear-package.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-	This build file creates a minimal package of propel-generator files,
-	builds a package.xml for installation using PEAR and creates the necessary TGZ file.
-
-	It's pretty easy to build the PEAR package:
-
-	$> cd /path/to/propel-generator
-	$> phing -Dversion=1.0.0RC1 -f pear\build-pear-package.xml
-
--->
-
-<project name="propel_generator" default="main">
-
-	<property name="propelgen.home" value=".."/>
-	<property name="build.base.dir" value="build"/>
-	<property name="pkgname" value="${phing.project.name}-${version}"/>
-	<property name="build.src.dir" value="${build.base.dir}/${pkgname}"/>
-
-	<!-- some default properties -->
-	<property name="notes"><![CDATA[This is a release of the 1.4 branch of the Propel Generator.
-See: http://propel.phpdb.org/trac/query?status=closed&milestone=1.4&resolution=fixed&order=priority for CHANGELOG.
-	]]></property>
-	<property name="state" value="stable"/>
-
-	<taskdef
-    name="pear-package"
-    classname="BuildPropelGenPEARPackageTask" classpath="."/>
-
-	<fileset dir="${propelgen.home}/classes/propel" id="classes">
-		<include name="**"/>
-	</fileset>
-
-	<fileset dir="${propelgen.home}" id="data">
-		<!--<include name="build.xml"/>-->
-		<include name="build-propel.xml"/>
-		<include name="pear/pear-build.xml"/>
-		<include name="pear/pear-propel*"/>
-		<include name="pear/build.properties"/>
-		<include name="default.properties"/>
-		<include name="resources/**"/>
-	</fileset>
-
-	<!--
-		==============================================
-		Main entry point
-		==============================================
-	-->
-	<target name="main" if="version" depends="versioncheck">
-		<phingcall target="build"/>
-		<phingcall target="pear-package"/>
-		<phingcall target="tar"/>
-	</target>
-
-	<!--
-	 ===================================================================
-	 Target: checks if language was given, otherwise fail
-	 ===================================================================
-	-->
-	<target name="versioncheck" unless="version">
-		<echo message="====================================================="/>
-		<echo message="Version not specified. You must enter a version. In"/>
-		<echo message="the future you can add this to build.properties or"/>
-		<echo message="enter it on the command line: "/>
-		<echo message=" "/>
-		<echo message="-Dversion=1.0.0"/>
-		<echo message="====================================================="/>
-		<input propertyname="version" promptChar=":">Propel version for package</input>
-
-		<property name="pkgname" value="${phing.project.name}-${version}" override="true"/>
-		<property name="build.src.dir" value="${build.base.dir}/${pkgname}" override="true"/>
-
-	</target>
-
-	<!--
-		==============================================
-		Copy the desired files into the build/ dir
-		making sure to put them in the directory
-		structure that will be needed for PEAR install
-		==============================================
-	-->
-	<target name="build">
-		<echo>-----------------------------</echo>
-		<echo>| Creating directory layout |</echo>
-		<echo>-----------------------------</echo>
-
-		<delete dir="${build.base.dir}"/>
-		<mkdir dir="${build.base.dir}"/>
-
-		<copy todir="${build.src.dir}">
-			<fileset refid="classes"/>
-			<fileset refid="data"/>
-		</copy>
-
-		<!-- some files need to be manually moved here to save headache when
-		doing the pear package.xml creation -->
-		<move file="${build.src.dir}/pear/build.properties" todir="${build.src.dir}"/>
-		<move file="${build.src.dir}/pear/pear-build.xml" todir="${build.src.dir}"/>
-
-		<chmod file="${build.src.dir}/pear/pear-propel-gen" mode="755"/>
-
-	</target>
-
-	<!--
-		==============================================
-		Create a PEAR package.xml which will guide the
-		installation.
-		==============================================
-	-->
-	<target name="pear-package">
-
-		<echo>-----------------------------</echo>
-		<echo>| Creating PEAR package.xml |</echo>
-		<echo>-----------------------------</echo>
-		<echo></echo>
-
-		<pear-package dir="${build.src.dir}" destFile="${build.base.dir}/package.xml" version="${version}" state="${state}" notes="${notes}">
-
-			<fileset dir="${build.src.dir}">
-				<include name="**"/>
-			</fileset>
-
-		</pear-package>
-
-	</target>
-
-	<!--
-		==============================================
-		Create a tar.gz of the files, which will be
-		installed by pear package manager.
-		==============================================
-	-->
-	<target name="tar">
-		<echo>-----------------------------</echo>
-		<echo>| Creating tar.gz package   |</echo>
-		<echo>-----------------------------</echo>
-		<property name="tarfile" value="${build.base.dir}/${pkgname}.tgz"/>
-		<delete	file="${tarfile}"/>
-		<tar destFile="${tarfile}" basedir="${build.base.dir}" />
-	</target>
-
-</project>
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/pear/build.properties b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/pear/build.properties
deleted file mode 100644
index fe317e435..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/pear/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-# In this file you can define any properties taht you want to affect
-# all projects built using the propel-gen script on this system
-#
-# See http://propel.phpdb.org/trac/wiki/Users/Documentation/BuildProperties for a
-# list of available properties.
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/pear/pear-build.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/pear/pear-build.xml
deleted file mode 100644
index 89be4fcaa..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/pear/pear-build.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<!--
-    Use this file to faciliate easy per-project building using 
-	PEAR-installed Propel-generator.
-
-	This Phing script is invoked via the shell script propel-gen (.bat
-	for Windows).  Normally you should not need to edit this script or
-	be aware of it in any way.
-	
-    Normal use:
-    $> propel-gen /path/to/my/project
-    
-    Specific target: 
-    $> propel-gen insert-sql /path/to/my/project 
-
--->
-<project name="propel-project-builder" default="main">
-
-<!-- set a default target if none provided -->
-<property name="target" value="main"/>
-
-<resolvepath propertyName="propel.project.dir" file="${project.dir}" dir="${application.startdir}"/>
-
-<target name="projdircheckExists">
-  <condition property="projDirExists">
-  	<and>
-		<not>
-			<equals arg1="${propel.project.dir}" arg2="" trim="true"/>
-		</not>
-		<available file="${propel.project.dir}/build.properties"/>
-	</and>
-  </condition>
-</target>
-
-<target name="projdircheck" depends="projdircheckExists" unless="projDirExists">
-	<echo message="====================================================="/>
-	<echo message="Project directory not specified or invalid. You must "/>
-	<echo message="specify the path to your project directory and your "/>
-	<echo message="project directory must contain your build.properties "/>
-	<echo message="and schema.xml files.                                "/>
-	<echo message=" "/>
-	<echo message="Usage: "/>
-	<echo message=" "/>
-	<echo message="$&gt; propel-gen /path/to/projectdir [target]"/>
-	<echo message=" "/>
-	<echo message="====================================================="/>	
-	<fail message="No project directory specified."/>
-</target>
-
-<target name="configure" depends="projdircheck">
-	<if>
-		<isset property="additional.properties"/>
-		<then>
-			<echo>Processing additional properties file: ${additional.properties}</echo>
-			<resolvepath propertyName="additional.properties.resolved" file="${additional.properties}" dir="${application.startdir}"/>
-			<property file="${additional.properties.resolved}"/>
-		</then>
-	</if>
-	<echo msg="Loading project-specific props from ${project.dir}/build.properties"/>
-	<property file="${propel.project.dir}/build.properties"/>
-</target>
-
-<target name="main" depends="configure" 
-  description="The main target. Includes project-specific build.properties and calls the build-propel.xml script">	
-
- <!--<property file="${project.dir}/build.properties"/>-->
- <phing phingfile="build-propel.xml" target="${target}"/>
- 
-</target>
-
-
-<!-- 
- Convenience mappings to build-propel.xml main targets 
- 
- This makes it possible to use this buildfile w/o needing to specify
- target as a property, e.g.:
- 
- $> phing -Dproject=bookstore insert-sql
- 
- The main reason for this is just consistency w/ old build-propel.xml file
- (primarily for documentation & user confusion avoidance reasons).  There are relatively
- few & infrequently changing main targets of build-propel.xml, so it's a non-
- issue as far as maintenance is concerned.
--->
-
-<target name="convert-conf" depends="configure">
-	<phing phingfile="build-propel.xml" target="convert-conf"/>
-</target>
-
-<target name="create-db" depends="configure">
-	<phing phingfile="build-propel.xml" target="create-db"/>
-</target>
-
-<target name="creole" depends="configure">
-	<phing phingfile="build-propel.xml" target="creole"/>
-</target>
-
-<target name="reverse" depends="configure">
-	<phing phingfile="build-propel.xml" target="reverse"/>
-</target>
-
-<target name="datadtd" depends="configure">
-	<phing phingfile="build-propel.xml" target="datadtd"/>
-</target>
-
-<target name="datadump" depends="configure">
-	<phing phingfile="build-propel.xml" target="datadump"/>
-</target>
-
-<target name="datasql" depends="configure">
-	<phing phingfile="build-propel.xml" target="datasql"/>
-</target>
-
-<target name="insert-sql" depends="configure">
-	<phing phingfile="build-propel.xml" target="insert-sql"/>
-</target>
-
-<target name="om" depends="configure">
-	<phing phingfile="build-propel.xml" target="om"/>
-</target>
-
-<target name="sql" depends="configure">
-	<phing phingfile="build-propel.xml" target="sql"/>
-</target>
-
-</project>
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/pear/pear-propel-gen b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/pear/pear-propel-gen
deleted file mode 100644
index 588c107b1..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/pear/pear-propel-gen
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# ------------------------------------------------------------------------
-# The phing build script for Unix based systems
-# $Id: pear-propel-gen,v 1.2 2004/10/17 13:24:09 hlellelid Exp $
-# ------------------------------------------------------------------------
-
-# -------------------------------------------------------------------------
-# Do not change anything below this line unless you know what you're doing.
-# -------------------------------------------------------------------------
-
-# (currently this is not reached)
-if (test -z "$PHING_COMMAND") ; then
-	echo "WARNING: PHP_COMMAND environment not set. (Assuming phing on PATH)"
-	export PHING_COMMAND="phing"
-fi
-
-$PHING_COMMAND -f @DATA-DIR@/propel_generator/pear-build.xml -Dproject.dir=$*
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/pear/pear-propel-gen.bat b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/pear/pear-propel-gen.bat
deleted file mode 100644
index c6c453557..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/pear/pear-propel-gen.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-@ECHO OFF
-
-:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-:: The propel-gen build script for Windows based systems
-:: $Id: pear-propel-gen.bat,v 1.2 2004/10/17 13:24:09 hlellelid Exp $
-:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-
-::----------------------------------------------------------------------------------
-:: Please set following to the "phing" script.  By default this is expected to be
-:: on your path.  (You don't need to modify this file if that is the case.)
-  
-  SET phingScript=phing
-
-::---------------------------------------------------------------------------------
-::---------------------------------------------------------------------------------
-:: Do not modify below this line!! (Unless you know what your doing :)
-::---------------------------------------------------------------------------------
-::---------------------------------------------------------------------------------
-
-"%phingScript%" -f "@DATA-DIR@\propel_generator\pear-build.xml" -Dproject.dir=%*
-GOTO :EOF
-
-:PAUSE_END
-PAUSE
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/resources/dtd/database.dtd b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/resources/dtd/database.dtd
deleted file mode 100644
index a18514f23..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/resources/dtd/database.dtd
+++ /dev/null
@@ -1,176 +0,0 @@
-<!--
-    Propel XML database schema DTD
-    $Id: database.dtd,v 1.7 2005/03/30 11:38:18 hlellelid Exp $
-
-    This is based very closely on the schema DTD for Torque, but
-    some differences do exist.
--->
-
-<!--
-
-defaultPhpNamingMethod determines how a table or column name,
-from the name attribute in the xml database file, is converted to a
-PHP class or method name.
-
-     nochange   - indicates not change is performed.
-     underscore - Underscores are removed, First letter is
-              capitalized, first letter after an underscore
-              is capitalized, the rest of the letters are
-              converted to lowercase.
-     phpname   - same as underscore, but no letters are converted
-              to lowercase.
--->
-
-<!ELEMENT database (external-schema*, table+, behavior+)>
-<!ATTLIST database
-  name CDATA #IMPLIED
-  defaultIdMethod (native|none) "none"
-  defaultTranslateMethode CDATA #IMPLIED
-  package CDATA #IMPLIED
-  baseClass CDATA #IMPLIED
-  basePeer CDATA #IMPLIED
-  defaultPhpNamingMethod (nochange|underscore|phpname) "underscore"
-  heavyIndexing (true|false) "false"
->
-
-<!ELEMENT external-schema EMPTY>
-<!ATTLIST external-schema
-  filename CDATA #REQUIRED
->
-
-<!--
-     note: the interface="true", requires that useManagers=true in the
-     properties file.
--->
-<!ELEMENT table (column+,(foreign-key|index|unique|id-method-parameter|validator|behavior|vendor)*)>
-<!ATTLIST table
-  name CDATA #REQUIRED
-  phpName CDATA #IMPLIED
-  idMethod (native|autoincrement|sequence|none|null) "null"
-  skipSql (true|false) "false"
-  readOnly (true|false) "false"
-  abstract (true|false) "false"
-  treeMode (MaterializedPath|NestedSet|AdjacencyList) "AdjacencyList"
-  package CDATA #IMPLIED
-  baseClass CDATA #IMPLIED
-  basePeer CDATA #IMPLIED
-  alias CDATA #IMPLIED
-  interface CDATA #IMPLIED
-  phpNamingMethod (nochange|underscore|phpname) #IMPLIED
-  heavyIndexing (true|false) #IMPLIED
-  description CDATA #IMPLIED
->
-
-<!ELEMENT id-method-parameter EMPTY>
-<!ATTLIST id-method-parameter
-  name CDATA "default"
-  value CDATA #REQUIRED
->
-
-<!ELEMENT column ((inheritance|vendor)*)>
-<!ATTLIST column
-  name CDATA #REQUIRED
-  phpName CDATA #IMPLIED
-  peerName CDATA #IMPLIED
-  primaryKey (true|false) "false"
-  required (true|false) "false"
-  type
-    (
-          BIT  | TINYINT | SMALLINT    | INTEGER    | BIGINT    | FLOAT
-        | REAL | NUMERIC | DECIMAL     | CHAR       | VARCHAR   | LONGVARCHAR
-        | DATE | TIME    | TIMESTAMP   | BINARY     | VARBINARY | LONGVARBINARY
-        | NULL | OTHER   | PHP_OBJECT  | DISTINCT   | STRUCT    | ARRAY
-        | BLOB | CLOB    | REF         | BOOLEANINT | BOOLEANCHAR
-        | DOUBLE | BOOLEAN
-    ) "VARCHAR"
-  phpType CDATA #IMPLIED
-  sqlType CDATA #IMPLIED
-  size CDATA #IMPLIED
-  scale CDATA #IMPLIED
-  default CDATA #IMPLIED
-  defaultValue CDATA #IMPLIED
-  defaultExpr CDATA #IMPLIED
-  autoIncrement (true|false) "false"
-  inheritance (single|false) "false"
-  inputValidator CDATA #IMPLIED
-  phpNamingMethod (nochange|underscore|phpname) #IMPLIED
-  description CDATA #IMPLIED
-  lazyLoad (true|false) "false"
-  primaryString (true|false) "false"
->
-
-<!ELEMENT inheritance EMPTY>
-<!ATTLIST inheritance
-  key CDATA #REQUIRED
-  class CDATA #REQUIRED
-  package CDATA #IMPLIED
-  extends CDATA #IMPLIED
->
-
-<!ELEMENT foreign-key (reference+, vendor*)>
-<!ATTLIST foreign-key
-  foreignTable CDATA #REQUIRED
-  name CDATA #IMPLIED
-  phpName CDATA #IMPLIED
-  refPhpName CDATA #IMPLIED
-  onUpdate (CASCADE|cascade|SETNULL|setnull|RESTRICT|restrict|NONE|none) "none"
-  onDelete (CASCADE|cascade|SETNULL|setnull|RESTRICT|restrict|NONE|none) "none"
->
-
-<!ELEMENT reference EMPTY>
-<!ATTLIST reference
-  local CDATA #REQUIRED
-  foreign CDATA #REQUIRED
->
-
-<!ELEMENT index (index-column+)>
-<!ATTLIST index
-  name CDATA #IMPLIED
->
-
-<!ELEMENT behavior (parameter+)>
-<!ATTLIST index
-  name CDATA #IMPLIED
->
-
-<!ELEMENT index-column (vendor*)>
-<!ATTLIST index-column
-  name CDATA #REQUIRED
-  size CDATA #IMPLIED
->
-
-<!ELEMENT unique (unique-column+)>
-<!ATTLIST unique
-  name CDATA #IMPLIED
->
-
-<!ELEMENT unique-column (vendor*)>
-<!ATTLIST unique-column
-  name CDATA #REQUIRED
->
-
-<!ELEMENT validator (rule+)>
-<!ATTLIST validator
-  column CDATA #REQUIRED
-  translate CDATA #IMPLIED
->
-
-<!ELEMENT rule EMPTY>
-<!ATTLIST rule
-  name (mask|maxLength|maxValue|minLength|minValue|required|unique|validValues|class) #REQUIRED
-  class CDATA #IMPLIED
-  value CDATA #IMPLIED
-  size ID #IMPLIED
-  message CDATA #IMPLIED
->
-
-<!ELEMENT vendor (parameter+)>
-<!ATTLIST vendor
-  type CDATA #REQUIRED
->
-
-<!ELEMENT parameter EMPTY>
-<!ATTLIST parameter
-  name CDATA #REQUIRED
-  value CDATA #REQUIRED
->
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/resources/xsd/custom_datatypes.xsd b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/resources/xsd/custom_datatypes.xsd
deleted file mode 100755
index 12e8327cb..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/resources/xsd/custom_datatypes.xsd
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-	<xs:simpleType name='custom_datatypes'>
-		<xs:restriction base='xs:string'>
-		</xs:restriction>
-	</xs:simpleType>
-</xs:schema>
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/resources/xsd/database.xsd b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/resources/xsd/database.xsd
deleted file mode 100755
index 8a1d2ca74..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/resources/xsd/database.xsd
+++ /dev/null
@@ -1,397 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<!-- XML Schema for the Propel schema file
-		  This is just the first draft derived from the existing DTD
-		  and some additional restrictions have been included
-
-		  Comments are a quite rare, I guess most things are pretty
-		  readable. An additional xml schema: custom_datatypes.xsd is
-		  also included. For now this file is unused, but that will
-		  change; don't worry.
-
-		  Ron -->
-
-	<xs:include schemaLocation="custom_datatypes.xsd"/>
-
-	<xs:element name="database" type="database"/>
-	<xs:element name="vendor" type="vendor"/>
-
-	<xs:simpleType name="file">
-		<xs:restriction base="xs:string">
-			<!-- Match any relative or absolute path and file containing letters, numbers and _ -->
-			<xs:pattern value="((\.{1,2}|[\w_]*)/)*([\w_]*\.?)+"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="default_datatypes">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="BIT"/>
-			<xs:enumeration value="TINYINT"/>
-			<xs:enumeration value="SMALLINT"/>
-			<xs:enumeration value="INTEGER"/>
-			<xs:enumeration value="BIGINT"/>
-			<xs:enumeration value="FLOAT"/>
-			<xs:enumeration value="REAL"/>
-			<xs:enumeration value="NUMERIC"/>
-			<xs:enumeration value="DECIMAL"/>
-			<xs:enumeration value="CHAR"/>
-			<xs:enumeration value="VARCHAR"/>
-			<xs:enumeration value="LONGVARCHAR"/>
-			<xs:enumeration value="DATE"/>
-			<xs:enumeration value="TIME"/>
-			<xs:enumeration value="TIMESTAMP"/>
-			<xs:enumeration value="BINARY"/>
-			<xs:enumeration value="VARBINARY"/>
-			<xs:enumeration value="LONGVARBINARY"/>
-			<xs:enumeration value="NULL"/>
-			<xs:enumeration value="OTHER"/>
-			<xs:enumeration value="PHP_OBJECT"/>
-			<xs:enumeration value="DISTINCT"/>
-			<xs:enumeration value="STRUCT"/>
-			<xs:enumeration value="ARRAY"/>
-			<xs:enumeration value="BLOB"/>
-			<xs:enumeration value="CLOB"/>
-			<xs:enumeration value="REF"/>
-			<xs:enumeration value="BOOLEANINT"/>
-			<xs:enumeration value="BOOLEANCHAR"/>
-			<xs:enumeration value="DOUBLE"/>
-			<xs:enumeration value="BOOLEAN"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="datatype">
-		<xs:union memberTypes="default_datatypes custom_datatypes"/>
-	</xs:simpleType>
-
-	<xs:simpleType name="dbidmethod">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="native"/>
-			<xs:enumeration value="none"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="tbidmethod">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="autoincrement"/>
-			<xs:enumeration value="sequence"/>
-			<xs:enumeration value="null"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="idmethod">
-		<xs:union memberTypes="dbidmethod tbidmethod"/>
-	</xs:simpleType>
-
-	<xs:simpleType name="phpnamingmethod">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="nochange"/>
-			<xs:enumeration value="underscore"/>
-			<xs:enumeration value="phpname"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="delete">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="cascade"/>
-			<xs:enumeration value="set null"/>
-			<xs:enumeration value="setnull"/>
-			<xs:enumeration value="restrict"/>
-			<xs:enumeration value="none"/>
-			<xs:enumeration value=""/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="update">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="cascade"/>
-			<xs:enumeration value="setnull"/>
-			<xs:enumeration value="set null"/>
-			<xs:enumeration value="restrict"/>
-			<xs:enumeration value="none"/>
-			<xs:enumeration value=""/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="rulename">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="mask"/>
-			<xs:enumeration value="maxLength"/>
-			<xs:enumeration value="maxValue"/>
-			<xs:enumeration value="minLength"/>
-			<xs:enumeration value="minValue"/>
-			<xs:enumeration value="required"/>
-			<xs:enumeration value="unique"/>
-			<xs:enumeration value="validValues"/>
-			<xs:enumeration value="notMatch"/>
-			<xs:enumeration value="match"/>
-			<xs:enumeration value="class"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="inh_option">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="single"/>
-			<xs:enumeration value="false"/>
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="sql_type">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[\w\s\[\]\(\),\.']+"/>
-		</xs:restriction>
-	</xs:simpleType>
-	
-	<xs:simpleType name="php_type">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[\w_]+"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:simpleType name="treemode">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="AdjacencyList"/>
-			<xs:enumeration value="MaterializedPath"/>
-			<xs:enumeration value="NestedSet"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Visibility for column accessor and mutator methods -->
-	<xs:simpleType name="visibility">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="public"/>
-			<xs:enumeration value="protected"/>
-			<xs:enumeration value="private"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Restrict column name to letters (upper- and lowercase), numbers and the _ -->
-	<xs:simpleType name="column_name">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[\w_]+"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Restrict php name to letters (upper- and lowercase), numbers and the _ -->
-	<xs:simpleType name="php_name">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[\w_]+"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Restrict php class name to letters (upper- and lowercase), numbers and the _. Dot seperated -->
-	<xs:simpleType name="php_class">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="([\w_]+.?)+"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Restrict table name to letters (upper- and lowercase), numbers and the _ -->
-	<xs:simpleType name="table_name">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[\w_]+"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Restrict index name to letters (upper- and lowercase), numbers and the _ -->
-	<xs:simpleType name="index_name">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[\w_]+"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<!-- Restrict foreign column name to letters (upper- and lowercase), numbers and the _ -->
-	<xs:simpleType name="foreign_name">
-		<xs:restriction base="xs:string">
-			<xs:pattern value="[\w_]+"/>
-		</xs:restriction>
-	</xs:simpleType>
-
-	<xs:complexType name="parameter">
-		<xs:attribute name="name" type="xs:string" use="required"/>
-		<xs:attribute name="value" type="xs:string" use="required"/>
-	</xs:complexType>
-
-	<xs:complexType name="validator">
-		<xs:sequence>
-			<xs:element name="rule" type="rule" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="column" type="column_name" use="required"/>
-		<xs:attribute name="translate" type="xs:string" use="optional"/>
-	</xs:complexType>
-
-	<xs:complexType name="vendor">
-		<xs:sequence>
-			<xs:element name="parameter" type="parameter" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="type" use="required"/>
-	</xs:complexType>
-
-	<xs:complexType name="rule">
-		<xs:attribute name="name" type="rulename" use="required"/>
-		<xs:attribute name="value" type="xs:string" use="optional"/>
-		<xs:attribute name="size" type="xs:positiveInteger" use="optional"/>
-		<xs:attribute name="message" type="xs:string" use="optional"/>
-		<xs:attribute name="class" type="xs:string" use="optional"/>
-	</xs:complexType>
-
-	<xs:complexType name="id-method-parameter">
-		<xs:attribute name="name" type="xs:string" use="optional"/>
-		<xs:attribute name="value" type="xs:string" use="required"/>
-	</xs:complexType>
-
-	<xs:complexType name="index">
-		<xs:choice maxOccurs="unbounded">
-			<xs:element name="index-column" type="index-column" minOccurs="1" maxOccurs="unbounded"/>
-			<xs:element ref="vendor" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:choice>
-		<xs:attribute name="name" type="index_name" use="optional"/>
-	</xs:complexType>
-
-	<xs:complexType name="unique">
-		<xs:choice maxOccurs="unbounded">
-			<xs:element name="unique-column" type="unique-column" minOccurs="1" maxOccurs="unbounded"/>
-			<xs:element ref="vendor" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:choice>
-		<xs:attribute name="name" type="index_name" use="optional"/>
-	</xs:complexType>
-
-	<xs:complexType name="index-column">
-		<xs:sequence>
-			<xs:element ref="vendor" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="name" type="column_name" use="required"/>
-		<xs:attribute name="size" type="xs:positiveInteger" use="optional"/>
-	</xs:complexType>
-
-	<xs:complexType name="unique-column">
-		<xs:sequence>
-			<xs:element ref="vendor" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="name" type="column_name" use="required"/>
-		<xs:attribute name="size" type="xs:positiveInteger" use="optional"/>
-	</xs:complexType>
-
-	<xs:complexType name="inheritance">
-		<xs:attribute name="key" type="xs:string" use="required"/>
-		<xs:attribute name="class" type="xs:string" use="required"/>
-		<xs:attribute name="package" type="xs:string" use="optional"/>
-		<xs:attribute name="extends" type="xs:string" use="optional"/>
-	</xs:complexType>
-
-	<xs:complexType name="reference">
-		<xs:attribute name="local" type="column_name" use="required"/>
-		<xs:attribute name="foreign" type="column_name" use="required"/>
-	</xs:complexType>
-
-	<xs:complexType name="behavior">
-		<xs:choice maxOccurs="unbounded">
-			<xs:element name="parameter" type="parameter" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:choice>
-		<xs:attribute name="name" type="xs:string" use="optional"/>
-	</xs:complexType>
-
-	<xs:complexType name="column">
-		<xs:choice maxOccurs="unbounded">
-			<xs:element name="inheritance" type="inheritance" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element ref="vendor" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:choice>
-		<xs:attribute name="name" type="column_name" use="required"/>
-		<xs:attribute name="phpName" type="php_name" use="optional"/>
-		<xs:attribute name="peerName" type="php_class" use="optional"/>
-		<xs:attribute name="prefix" type="column_name" use="optional"/>
-		<xs:attribute name="accessorVisibility" type="visibility" use="optional"/>
-		<xs:attribute name="mutatorVisibility" type="visibility" use="optional"/>
-		<xs:attribute name="primaryKey" type="xs:boolean" default="false"/>
-		<xs:attribute name="required" type="xs:boolean" default="false"/>
-		<xs:attribute name="type" type="datatype" default="VARCHAR"/>
-		<xs:attribute name="sqlType" type="sql_type" use="optional"/>
-		<xs:attribute name="phpType" type="php_type" use="optional"/>
-		<xs:attribute name="size" type="xs:nonNegativeInteger" use="optional"/>
-		<xs:attribute name="scale" type="xs:nonNegativeInteger" use="optional"/>
-		<xs:attribute name="default" type="xs:string" use="optional"/>
-		<xs:attribute name="defaultValue" type="xs:string" use="optional"/>
-		<xs:attribute name="defaultExpr" type="xs:string" use="optional"/>
-		<xs:attribute name="autoIncrement" type="xs:boolean" default="false"/>
-		<xs:attribute name="inheritance" type="inh_option" default="false"/>
-		<xs:attribute name="inputValidator" type="xs:string" use="optional"/>
-		<xs:attribute name="phpNamingMethod" type="phpnamingmethod" use="optional"/>
-		<xs:attribute name="description" type="xs:string" use="optional"/>
-		<xs:attribute name="lazyLoad" type="xs:boolean" default="false"/>
-		<xs:attribute name="nodeKeySep" type="xs:string" use="optional"/>
-		<xs:attribute name="nodeKey" type="xs:string" use="optional"/>
-		<xs:attribute name="nestedSetLeftKey" type="xs:boolean" default="false"/>
-		<xs:attribute name="nestedSetRightKey" type="xs:boolean" default="false"/>
-		<xs:attribute name="treeScopeKey" type="xs:boolean" default="false"/>
-		<xs:attribute name="require" type="xs:string" use="optional"/>
-		<xs:attribute name="primaryString" type="xs:boolean" default="false"/>
-	</xs:complexType>
-
-	<xs:complexType name="foreign-key">
-		<xs:choice maxOccurs="unbounded">
-			<xs:element name="reference" type="reference" minOccurs="1" maxOccurs="unbounded"/>
-			<xs:element ref="vendor" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:choice>
-		<xs:attribute name="foreignTable" type="table_name" use="required"/>
-		<xs:attribute name="name" type="foreign_name" use="optional"/>
-		<xs:attribute name="phpName" type="php_name" use="optional"/>
-		<xs:attribute name="refPhpName" type="php_name" use="optional"/>
-		<xs:attribute name="onDelete" type="delete" default="none"/>
-		<xs:attribute name="onUpdate" type="update" default="none"/>
-	</xs:complexType>
-
-	<xs:complexType name="external-schema">
-		<xs:attribute name="filename" type="file" use="required"/>
-	</xs:complexType>
-
-	<xs:complexType name="table">
-		<xs:choice maxOccurs="unbounded">
-			<xs:element name="column" type="column" maxOccurs="unbounded"/>
-			<xs:element name="foreign-key" type="foreign-key" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="index" type="index" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="unique" type="unique" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="id-method-parameter" type="id-method-parameter" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="validator" type="validator" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="behavior" type="behavior" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element ref="vendor" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:choice>
-		<xs:attribute name="name" type="table_name" use="required"/>
-		<xs:attribute name="phpName" type="php_class" use="optional"/>
-		<xs:attribute name="columnPrefix" type="column_name" use="optional"/>
-		<xs:attribute name="defaultAccessorVisibility" type="visibility" use="optional"/>
-		<xs:attribute name="defaultMutatorVisibility" type="visibility" use="optional"/>
-		<xs:attribute name="idMethod" type="idmethod" use='optional'/>
-		<xs:attribute name="allowPkInsert" type="xs:boolean" default="false" use="optional"/>
-		<xs:attribute name="skipSql" type="xs:boolean" default="false"/>
-		<xs:attribute name="readOnly" type="xs:boolean" default="false"/>
-		<xs:attribute name="abstract" type="xs:boolean" default="false"/>
-		<xs:attribute name="baseClass" type="php_class" use="optional"/>
-		<xs:attribute name="basePeer" type="php_class" use="optional"/>
-		<xs:attribute name="alias" type="table_name" use="optional"/>
-		<xs:attribute name="package" type="xs:string" use="optional"/>
-		<xs:attribute name="interface" type="xs:string" use="optional"/>
-		<xs:attribute name="phpNamingMethod" type="phpnamingmethod" use='optional'/>
-		<xs:attribute name="heavyIndexing" type="xs:boolean" use="optional"/>
-		<xs:attribute name="description" type="xs:string"/>
-		<xs:attribute name="treeMode" type="treemode" use="optional"/>
-		<xs:attribute name="reloadOnInsert" type="xs:boolean" default="false"/>
-		<xs:attribute name="reloadOnUpdate" type="xs:boolean" default="false"/>
-	</xs:complexType>
-
-	<xs:complexType name="database">
-		<xs:choice maxOccurs="unbounded">
-			<xs:element name="external-schema" type="external-schema" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="table" type="table" minOccurs="1" maxOccurs="unbounded"/>
-			<xs:element name="behavior" type="behavior" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:choice>
-		<xs:attribute name="name" type="xs:string" use="optional"/>
-		<xs:attribute name="defaultIdMethod" type="dbidmethod" default="none"/>
-		<xs:attribute name="defaultTranslateMethod" type="xs:string" use="optional"/>
-		<xs:attribute name="defaultAccessorVisibility" type="visibility" use="optional"/>
-		<xs:attribute name="defaultMutatorVisibility" type="visibility" use="optional"/>
-		<xs:attribute name="package" type="php_class" use="optional"/>
-		<xs:attribute name="baseClass" type="php_class" use="optional"/>
-		<xs:attribute name="basePeer" type="php_class" use="optional"/>
-		<xs:attribute name="defaultPhpNamingMethod" type="phpnamingmethod" default="underscore"/>
-		<xs:attribute name="heavyIndexing" type="xs:boolean" default="false"/>
-	</xs:complexType>
-</xs:schema>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/resources/xsl/database.xsl b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/resources/xsl/database.xsl
deleted file mode 100755
index 81d8217ad..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel-generator/resources/xsl/database.xsl
+++ /dev/null
@@ -1,292 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE xsl:stylesheet [<!ENTITY nbsp "&#160;">]>
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-	<!--
-	XSL Stylesheet to normalize a database schema
-	-->
-
-	<!--
-	Output indented UTF 8 XML 
-	-->
-	<xsl:output method="xml" indent="yes" encoding="UTF-8" />
-
-	<!--
-	Matches root database node, the only allowed root node
-
-	Starts the normalization process
-	-->
-	<xsl:template match='/database'>
-		<database>
-			<xsl:if test='not(boolean(@defaultIdMethod))'>
-				<xsl:attribute name='defaultIdMethod'>native</xsl:attribute>
-			</xsl:if>
-			<xsl:if test='not(boolean(@defaultPhpNamingMethod))'>
-				<xsl:attribute name='defaultPhpNamingMethod'>underscore</xsl:attribute>
-			</xsl:if>
-			<xsl:if test='not(boolean(@heavyIndexing))'>
-				<xsl:attribute name='heavyIndexing'>false</xsl:attribute>
-			</xsl:if>
-			<xsl:apply-templates select='@*'/>
-			<xsl:apply-templates select='external-schema'/>
-			<xsl:apply-templates select='table'/>
-			<xsl:apply-templates select='behavior'/>
-		</database>
-	</xsl:template>
-
-	<!--
-	Normalizes any defaultPhpNamingMethod attribute by making it lowercase
-	-->	
-	<xsl:template match='@defaultPhPNamingMethod'>
-		<xsl:attribute name='defaultPhPNamingMethod'><xsl:value-of select='translate(., "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz")'/></xsl:attribute>
-	</xsl:template>
-
-	<!--
-	Normalizes any onDelete attribute by making it lowercase, or none if it is empty (makes onDelete='' act the same as onDelete='none')
-	-->	
-	<xsl:template match='@onDelete' name='onDelete'>
-		<xsl:choose>
-			<xsl:when test='.=""'>
-				<xsl:attribute name='onDelete'>none</xsl:attribute>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:attribute name='onDelete'><xsl:value-of select='translate(., "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz")'/></xsl:attribute>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-
-	<!--
-	Handle OnDelete the same as onDelete
-	-->
-	<xsl:template match='@OnDelete'>
-		<xsl:call-template name='onDelete'/>
-	</xsl:template>
-
-	<!--
-	Normalizes any onUpdate attribute by making it lowercase, or none if it is empty (similar to onDelete)
-	-->	
-	<xsl:template match='@onUpdate' name='onUpdate'>
-		<xsl:choose>
-			<xsl:when test='.=""'>
-				<xsl:attribute name='onUpdate'>none</xsl:attribute>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:attribute name='onUpdate'><xsl:value-of select='translate(., "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz")'/></xsl:attribute>
-			</xsl:otherwise>
-		</xsl:choose>
-	</xsl:template>
-
-	<!--
-	Handle OnUpdate the same as onUpdate
-	-->
-	<xsl:template match='@OnUpdate'>
-		<xsl:call-template name='onUpdate'/>
-	</xsl:template>
-
-	<!--
-	Tranlate IdMethod attribute to idMethod attribute
-	-->
-	<xsl:template match='@IdMethod'>
-		<xsl:attribute name='idMethod'><xsl:value-of select='.'/></xsl:attribute>
-	</xsl:template>
-
-	<!--
-	Just copy any attribute
-	-->
-	<xsl:template match='@*' priority='-1'>
-		<xsl:copy-of select='.'/>
-	</xsl:template>
-
-	<!--
-	Normalize a table, add some attribute with default values if ommitted and normalize all attribute and childnodes
-	-->
-	<xsl:template match='table'>
-		<table>
-			<xsl:if test='not(boolean(@skipSql))'>
-				<xsl:attribute name='skipSql'>false</xsl:attribute>
-			</xsl:if>
-			<xsl:if test='not(boolean(@abstract))'>
-				<xsl:attribute name='abstract'>false</xsl:attribute>
-			</xsl:if>
-			<xsl:apply-templates select='@*'/>
-			<xsl:apply-templates select='column'/>
-			<xsl:apply-templates select='foreign-key'/>
-			<xsl:apply-templates select='index'/>
-			<xsl:apply-templates select='unique'/>
-			<xsl:apply-templates select='id-method-parameter'/>
-			<xsl:apply-templates select='validator'/>
-			<xsl:apply-templates select='vendor'/>
-			<xsl:apply-templates select='behavior'/>
-		</table>
-	</xsl:template>
-
-	<!--
-	Normalize a foreign-key, add some attribute with default values if ommitted and normalize all attribute and childnodes
-	-->
-	<xsl:template match='foreign-key'>
-		<foreign-key>
-			<xsl:if test='not(boolean(@onDelete)) and not(boolean(@OnDelete))'>
-				<xsl:attribute name='onDelete'>none</xsl:attribute>
-			</xsl:if>
-			<xsl:if test='not(boolean(@onUpdate)) and not(boolean(@OnUpdate))'>
-				<xsl:attribute name='onUpdate'>none</xsl:attribute>
-			</xsl:if>
-			<xsl:apply-templates select='@*'/>
-			<xsl:apply-templates select='reference'/>
-			<xsl:apply-templates select='vendor'/>
-		</foreign-key>
-	</xsl:template>
-
-	<!--
-	Just copy the index node with attributes and add the index-column
-	-->
-	<xsl:template match='index'>
-		<index>
-			<xsl:apply-templates select='@*'/>
-			<xsl:apply-templates select='index-column'/>
-		</index>
-	</xsl:template>
-
-	<!--
-	Just copy the unique node with attributes and add the unique-column
-	-->
-	<xsl:template match='unique'>
-		<unique>
-			<xsl:apply-templates select='@*'/>
-			<xsl:apply-templates select='unique-column'/>
-		</unique>
-	</xsl:template>
-
-	<!--
-	Just copy the behavior node with attributes and add the param
-	-->
-	<xsl:template match='behavior'>
-		<behavior>
-			<xsl:apply-templates select='@*'/>
-			<xsl:apply-templates select='parameter'/>
-		</behavior>
-	</xsl:template>
-
-
-	<!--
-	Just copy the unique-column node with attributes and add the vendor node
-	-->
-	<xsl:template match='unique-column'>
-		<unique-column>
-			<xsl:apply-templates select='@*'/>
-			<xsl:apply-templates select='vendor'/>
-		</unique-column>
-	</xsl:template>
-
-	<!--
-	Just copy the index-column node with attributes and add the vendor node
-	-->
-	<xsl:template match='index-column'>
-		<index-column>
-			<xsl:apply-templates select='@*'/>
-			<xsl:apply-templates select='vendor'/>
-		</index-column>
-	</xsl:template>
-
-	<!--
-	Add default name to id-method-parameter (if none) and copy its attributes
-	-->
-	<xsl:template match='id-method-parameter'>
-		<id-method-parameter>
-			<xsl:if test='not(boolean(@name))'>
-				<xsl:attribute name='name'>default</xsl:attribute>
-			</xsl:if>
-			<xsl:apply-templates select='@*'/>
-		</id-method-parameter>
-	</xsl:template>
-
-	<!--
-	Just copy the validator node with attributes and add the rule node
-	-->
-	<xsl:template match='validator'>
-		<validator>
-			<xsl:apply-templates select='@*'/>
-			<xsl:apply-templates select='rule'/>
-		</validator>
-	</xsl:template>
-
-	<!--
-	Adds a default name to the rule (if none given) and copy the attributes
-	-->
-	<xsl:template match='rule'>
-		<rule>
-			<xsl:if test='not(boolean(@name))'>
-				<xsl:attribute name='name'>class</xsl:attribute>
-			</xsl:if>
-			<xsl:apply-templates select='@*'/>
-		</rule>
-	</xsl:template>
-
-	<!--
-	Strip all childnodes (if any) from a parameter node
-	-->
-	<xsl:template match='parameter'>
-		<parameter>
-			<xsl:apply-templates select='@*'/>
-		</parameter>
-	</xsl:template>
-
-	<!--
-	Just copy the vendor node with attributes and add the parameter node
-	-->
-	<xsl:template match='vendor'>
-		<vendor>
-			<xsl:apply-templates select='@*'/>
-			<xsl:apply-templates select='parameter'/>
-		</vendor>
-	</xsl:template>
-
-	<!--
-	Strip all childnodes from an inheritance node
-	-->
-	<xsl:template match='inheritance'>
-		<inheritance>
-			<xsl:apply-templates select='@*'/>
-		</inheritance>
-	</xsl:template>
-
-	<!--
-	Normalize a column node, add default values for missing attributes and copy the content
-	-->
-	<xsl:template match='column'>
-		<column>
-			<xsl:if test='not(boolean(@primaryKey))'>
-				<xsl:attribute name='primaryKey'>false</xsl:attribute>
-			</xsl:if>
-			<xsl:if test='not(boolean(@required))'>
-				<xsl:attribute name='required'>false</xsl:attribute>
-			</xsl:if>
-			<xsl:if test='not(boolean(@type))'>
-				<xsl:attribute name='type'>VARCHAR</xsl:attribute>
-			</xsl:if>
-			<xsl:if test='not(boolean(@autoIncrement))'>
-				<xsl:attribute name='autoIncrement'>false</xsl:attribute>
-			</xsl:if>
-			<xsl:if test='not(boolean(@lazyLoad))'>
-				<xsl:attribute name='lazyLoad'>false</xsl:attribute>
-			</xsl:if>
-			<xsl:if test='@type = "VARCHAR" and not(boolean(@sqlType)) and not(boolean(@size))'>
-				<xsl:attribute name='size'>255</xsl:attribute>
-			</xsl:if>
-			<xsl:apply-templates select='@*'/>
-			<xsl:apply-templates select='inheritance'/>
-			<xsl:apply-templates select='vendor'/>
-		</column>
-	</xsl:template>
-
-	<!--
-	Strip all childnodes from an reference node
-	-->
-	<xsl:template match='reference'>
-		<reference>
-			<xsl:apply-templates select='@*'/>
-		</reference>
-	</xsl:template>
-
-</xsl:stylesheet>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/Propel.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/Propel.php
deleted file mode 100644
index 2e96a6226..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/Propel.php
+++ /dev/null
@@ -1,841 +0,0 @@
-<?php
-/*
- *  $Id: Propel.php 1691 2010-04-19 22:01:20Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-require 'propel/PropelException.php';
-require 'propel/adapter/DBAdapter.php';
-require 'propel/util/PropelPDO.php';
-
-/**
- * Propel's main resource pool and initialization & configuration class.
- *
- * This static class is used to handle Propel initialization and to maintain all of the
- * open database connections and instantiated database maps.
- *
- * @author     Hans Lellelid <hans@xmpl.rg> (Propel)
- * @author     Daniel Rall <dlr@finemaltcoding.com> (Torque)
- * @author     Magnús Þór Torfason <magnus@handtolvur.is> (Torque)
- * @author     Jason van Zyl <jvanzyl@apache.org> (Torque)
- * @author     Rafal Krzewski <Rafal.Krzewski@e-point.pl> (Torque)
- * @author     Martin Poeschl <mpoeschl@marmot.at> (Torque)
- * @author     Henning P. Schmiedehausen <hps@intermeta.de> (Torque)
- * @author     Kurt Schrader <kschrader@karmalab.org> (Torque)
- * @version    $Revision: 1691 $
- * @package    propel
- */
-class Propel
-{
-	/**
-	 * A constant for <code>default</code>.
-	 */
-	const DEFAULT_NAME = "default";
-
-	/**
-	 * A constant defining 'System is unusuable' logging level
-	 */
-	const LOG_EMERG = 0;
-
-	/**
-	 * A constant defining 'Immediate action required' logging level
-	 */
-	const LOG_ALERT = 1;
-
-	/**
-	 * A constant defining 'Critical conditions' logging level
-	 */
-	const LOG_CRIT = 2;
-
-	/**
-	 * A constant defining 'Error conditions' logging level
-	 */
-	const LOG_ERR = 3;
-
-	/**
-	 * A constant defining 'Warning conditions' logging level
-	 */
-	const LOG_WARNING = 4;
-
-	/**
-	 * A constant defining 'Normal but significant' logging level
-	 */
-	const LOG_NOTICE = 5;
-
-	/**
-	 * A constant defining 'Informational' logging level
-	 */
-	const LOG_INFO = 6;
-
-	/**
-	 * A constant defining 'Debug-level messages' logging level
-	 */
-	const LOG_DEBUG = 7;
-
-	/**
-	 * The Propel version.
-	 */
-	const VERSION = '1.4.2';
-
-	/**
-	 * The class name for a PDO object.
-	 */
-	const CLASS_PDO = 'PDO';
-
-	/**
-	 * The class name for a PropelPDO object.
-	 */
-	const CLASS_PROPEL_PDO = 'PropelPDO';
-
-	/**
-	 * The class name for a DebugPDO object.
-	 */
-	const CLASS_DEBUG_PDO = 'DebugPDO';
-
-	/**
-	 * Constant used to request a READ connection (applies to replication).
-	 */
-	const CONNECTION_READ = 'read';
-
-	/**
-	 * Constant used to request a WRITE connection (applies to replication).
-	 */
-	const CONNECTION_WRITE = 'write';
-
-	/**
-	 * @var        string The db name that is specified as the default in the property file
-	 */
-	private static $defaultDBName;
-
-	/**
-	 * @var        array The global cache of database maps
-	 */
-	private static $dbMaps = array();
-
-	/**
-	 * @var        array The cache of DB adapter keys
-	 */
-	private static $adapterMap = array();
-
-	/**
-	 * @var        array Cache of established connections (to eliminate overhead).
-	 */
-	private static $connectionMap = array();
-
-	/**
-	 * @var        PropelConfiguration Propel-specific configuration.
-	 */
-	private static $configuration;
-
-	/**
-	 * @var        bool flag to set to true once this class has been initialized
-	 */
-	private static $isInit = false;
-
-	/**
-	 * @var        Log optional logger
-	 */
-	private static $logger = null;
-
-	/**
-	 * @var        string The name of the database mapper class
-	 */
-	private static $databaseMapClass = 'DatabaseMap';
-
-	/**
-	 * @var        bool Whether the object instance pooling is enabled
-	 */
-	private static $instancePoolingEnabled = true;
-
-	/**
-	 * @var        bool For replication, whether to force the use of master connection.
-	 */
-	private static $forceMasterConnection = false;
-
-	/**
-	 * @var        array A map of class names and their file paths for autoloading
-	 */
-	private static $autoloadMap = array(
-		'PropelException' => 'propel/PropelException.php',
-
-		'DBAdapter'       => 'propel/adapter/DBAdapter.php',
-		'DBMSSQL'         => 'propel/adapter/DBMSSQL.php',
-		'MssqlPropelPDO'  => 'propel/adapter/MSSQL/MssqlPropelPDO.php',
-		'MssqlDebugPDO'   => 'propel/adapter/MSSQL/MssqlDebugPDO.php',	
-		'MssqlDateTime'   => 'propel/adapter/MSSQL/MssqlDateTime.class.php',
-		'DBMySQL'         => 'propel/adapter/DBMySQL.php',
-		'DBMySQLi'        => 'propel/adapter/DBMySQLi.php',
-		'DBNone'          => 'propel/adapter/DBNone.php',
-		'DBOracle'        => 'propel/adapter/DBOracle.php',
-		'DBPostgres'      => 'propel/adapter/DBPostgres.php',
-		'DBSQLite'        => 'propel/adapter/DBSQLite.php',
-		'DBSybase'        => 'propel/adapter/DBSybase.php',
-
-		'BasicLogger'       => 'propel/logger/BasicLogger.php',
-		'MojaviLogAdapter'  => 'propel/logger/MojaviLogAdapter.php',
-
-		'ColumnMap'    => 'propel/map/ColumnMap.php',
-		'DatabaseMap'  => 'propel/map/DatabaseMap.php',
-		'TableMap'     => 'propel/map/TableMap.php',
-		'RelationMap'  => 'propel/map/RelationMap.php',
-		'ValidatorMap' => 'propel/map/ValidatorMap.php',
-
-		'BaseObject'                    => 'propel/om/BaseObject.php',
-		'NodeObject'                    => 'propel/om/NodeObject.php',
-		'Persistent'                    => 'propel/om/Persistent.php',
-		'PreOrderNodeIterator'          => 'propel/om/PreOrderNodeIterator.php',
-		'NestedSetPreOrderNodeIterator' => 'propel/om/NestedSetPreOrderNodeIterator.php',
-		'NestedSetRecursiveIterator'    => 'propel/om/NestedSetRecursiveIterator.php',
-
-		'BasePeer'            => 'propel/util/BasePeer.php',
-		'NodePeer'            => 'propel/util/NodePeer.php',
-		'Criteria'            => 'propel/util/Criteria.php',
-		'Join'                => 'propel/util/Join.php',
-		'PeerInfo'            => 'propel/util/PeerInfo.php',
-		'PropelColumnTypes'   => 'propel/util/PropelColumnTypes.php',
-		'PropelConfiguration' => 'propel/util/PropelConfiguration.php',
-		'PropelConfigurationIterator' => 'propel/util/PropelConfigurationIterator.php',
-		'PropelPDO'           => 'propel/util/PropelPDO.php',
-		'PropelPager'         => 'propel/util/PropelPager.php',
-		'PropelDateTime'      => 'propel/util/PropelDateTime.php',
-		'DebugPDO'            => 'propel/util/DebugPDO.php',
-		'DebugPDOStatement'   => 'propel/util/DebugPDOStatement.php',
-
-
-		'BasicValidator'      => 'propel/validator/BasicValidator.php',
-		'MatchValidator'      => 'propel/validator/MatchValidator.php',
-		'MaxLengthValidator'  => 'propel/validator/MaxLengthValidator.php',
-		'MaxValueValidator'   => 'propel/validator/MaxValueValidator.php',
-		'MinLengthValidator'  => 'propel/validator/MinLengthValidator.php',
-		'MinValueValidator'   => 'propel/validator/MinValueValidator.php',
-		'NotMatchValidator'   => 'propel/validator/NotMatchValidator.php',
-		'RequiredValidator'   => 'propel/validator/RequiredValidator.php',
-		'UniqueValidator'     => 'propel/validator/UniqueValidator.php',
-		'ValidValuesValidator' => 'propel/validator/ValidValuesValidator.php',
-		'ValidationFailed'    => 'propel/validator/ValidationFailed.php',
-	);
-
-	/**
-	 * Initializes Propel
-	 *
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *                             rethrown wrapped into a PropelException.
-	 */
-	public static function initialize()
-	{
-		if (self::$configuration === null) {
-			throw new PropelException("Propel cannot be initialized without a valid configuration. Please check the log files for further details.");
-		}
-
-		self::configureLogging();
-
-		// reset the connection map (this should enable runtime changes of connection params)
-		self::$connectionMap = array();
-		
-		if (isset(self::$configuration['classmap']) && is_array(self::$configuration['classmap'])) {
-		  self::$autoloadMap = array_merge(self::$configuration['classmap'], self::$autoloadMap);
-	  }
-		
-		self::$isInit = true;
-	}
-
-	/**
-	 * Configure Propel using a PHP (array) config file.
-	 *
-	 * @param      string Path (absolute or relative to include_path) to config file.
-	 *
-	 * @throws     PropelException If configuration file cannot be opened.
-	 *                             (E_WARNING probably will also be raised by PHP)
-	 */
-	public static function configure($configFile)
-	{
-		$configuration = include($configFile);
-		if ($configuration === false) {
-			throw new PropelException("Unable to open configuration file: " . var_export($configFile, true));
-		}
-		self::setConfiguration($configuration);
-	}
-
-	/**
-	 * Configure the logging system, if config is specified in the runtime configuration.
-	 */
-	protected static function configureLogging()
-	{
-		if (self::$logger === null) {
-			if (isset(self::$configuration['log']) && is_array(self::$configuration['log']) && count(self::$configuration['log'])) {
-				include_once 'Log.php'; // PEAR Log class
-				$c = self::$configuration['log'];
-				$type = isset($c['type']) ? $c['type'] : 'file';
-				$name = isset($c['name']) ? $c['name'] : './propel.log';
-				$ident = isset($c['ident']) ? $c['ident'] : 'propel';
-				$conf = isset($c['conf']) ? $c['conf'] : array();
-				$level = isset($c['level']) ? $c['level'] : PEAR_LOG_DEBUG;
-				self::$logger = Log::singleton($type, $name, $ident, $conf, $level);
-			} // if isset()
-		}
-	}
-
-	/**
-	 * Initialization of Propel with a PHP (array) configuration file.
-	 *
-	 * @param      string $c The Propel configuration file path.
-	 *
-	 * @throws     PropelException Any exceptions caught during processing will be
-	 *                             rethrown wrapped into a PropelException.
-	 */
-	public static function init($c)
-	{
-		self::configure($c);
-		self::initialize();
-	}
-
-	/**
-	 * Determine whether Propel has already been initialized.
-	 *
-	 * @return     bool True if Propel is already initialized.
-	 */
-	public static function isInit()
-	{
-		return self::$isInit;
-	}
-
-	/**
-	 * Sets the configuration for Propel and all dependencies.
-	 *
-	 * @param      mixed The Configuration (array or PropelConfiguration)
-	 */
-	public static function setConfiguration($c)
-	{
-		if (is_array($c)) {
-			if (isset($c['propel']) && is_array($c['propel'])) {
-			  $c = $c['propel'];
-		  }
-			$c = new PropelConfiguration($c);
-		}
-		self::$configuration = $c;
-	}
-
-	/**
-	 * Get the configuration for this component.
-	 *
-	 * @param      int - PropelConfiguration::TYPE_ARRAY: return the configuration as an array
-	 *                   (for backward compatibility this is the default)
-	 *                 - PropelConfiguration::TYPE_ARRAY_FLAT: return the configuration as a flat array
-	 *                   ($config['name.space.item'])
-	 *                 - PropelConfiguration::TYPE_OBJECT: return the configuration as a PropelConfiguration instance
-	 * @return     mixed The Configuration (array or PropelConfiguration)
-	 */
-	public static function getConfiguration($type = PropelConfiguration::TYPE_ARRAY)
-	{
-		return self::$configuration->getParameters($type);
-	}
-
-	/**
-	 * Override the configured logger.
-	 *
-	 * This is primarily for things like unit tests / debugging where
-	 * you want to change the logger without altering the configuration file.
-	 *
-	 * You can use any logger class that implements the propel.logger.BasicLogger
-	 * interface.  This interface is based on PEAR::Log, so you can also simply pass
-	 * a PEAR::Log object to this method.
-	 *
-	 * @param      object The new logger to use. ([PEAR] Log or BasicLogger)
-	 */
-	public static function setLogger($logger)
-	{
-		self::$logger = $logger;
-	}
-
-	/**
-	 * Returns true if a logger, for example PEAR::Log, has been configured,
-	 * otherwise false.
-	 *
-	 * @return     bool True if Propel uses logging
-	 */
-	public static function hasLogger()
-	{
-		return (self::$logger !== null);
-	}
-
-	/**
-	 * Get the configured logger.
-	 *
-	 * @return     object Configured log class ([PEAR] Log or BasicLogger).
-	 */
-	public static function logger()
-	{
-		return self::$logger;
-	}
-
-	/**
-	 * Logs a message
-	 * If a logger has been configured, the logger will be used, otherwrise the
-	 * logging message will be discarded without any further action
-	 *
-	 * @param      string The message that will be logged.
-	 * @param      string The logging level.
-	 *
-	 * @return     bool True if the message was logged successfully or no logger was used.
-	 */
-	public static function log($message, $level = self::LOG_DEBUG)
-	{
-		if (self::hasLogger()) {
-			$logger = self::logger();
-			switch ($level) {
-				case self::LOG_EMERG:
-					return $logger->log($message, $level);
-				case self::LOG_ALERT:
-					return $logger->alert($message);
-				case self::LOG_CRIT:
-					return $logger->crit($message);
-				case self::LOG_ERR:
-					return $logger->err($message);
-				case self::LOG_WARNING:
-					return $logger->warning($message);
-				case self::LOG_NOTICE:
-					return $logger->notice($message);
-				case self::LOG_INFO:
-					return $logger->info($message);
-				default:
-					return $logger->debug($message);
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Returns the database map information. Name relates to the name
-	 * of the connection pool to associate with the map.
-	 *
-	 * The database maps are "registered" by the generated map builder classes.
-	 *
-	 * @param      string The name of the database corresponding to the DatabaseMap to retrieve.
-	 *
-	 * @return     DatabaseMap The named <code>DatabaseMap</code>.
-	 *
-	 * @throws     PropelException - if database map is null or propel was not initialized properly.
-	 */
-	public static function getDatabaseMap($name = null)
-	{
-		if ($name === null) {
-			$name = self::getDefaultDB();
-			if ($name === null) {
-				throw new PropelException("DatabaseMap name is null!");
-			}
-		}
-
-		if (!isset(self::$dbMaps[$name])) {
-			$clazz = self::$databaseMapClass;
-			self::$dbMaps[$name] = new $clazz($name);
-		}
-
-		return self::$dbMaps[$name];
-	}
-
-	/**
-	 * Sets the database map object to use for specified datasource.
-	 *
-	 * @param      string $name The datasource name.
-	 * @param      DatabaseMap $map The database map object to use for specified datasource.
-	 */
-	public static function setDatabaseMap($name, DatabaseMap $map)
-	{
-		if ($name === null) {
-			$name = self::getDefaultDB();
-		}
-		self::$dbMaps[$name] = $map;
-	}
-
-	/**
-	 * For replication, set whether to always force the use of a master connection.
-	 *
-	 * @param      boolean $bit True or False
-	 */
-	public static function setForceMasterConnection($bit)
-	{
-		self::$forceMasterConnection = (bool) $bit;
-	}
-
-	/**
-	 * For replication, whether to always force the use of a master connection.
-	 *
-	 * @return     boolean
-	 */
-	public static function getForceMasterConnection()
-	{
-		return self::$forceMasterConnection;
-	}
-
-	/**
-	 * Sets a Connection for specified datasource name.
-	 *
-	 * @param      string $name The datasource name for the connection being set.
-	 * @param      PropelPDO $con The PDO connection.
-	 * @param      string $mode Whether this is a READ or WRITE connection (Propel::CONNECTION_READ, Propel::CONNECTION_WRITE)
-	 */
-	public static function setConnection($name, PropelPDO $con, $mode = Propel::CONNECTION_WRITE)
-	{
-		if ($name === null) {
-			$name = self::getDefaultDB();
-		}
-		if ($mode == Propel::CONNECTION_READ) {
-			self::$connectionMap[$name]['slave'] = $con;
-		} else {
-			self::$connectionMap[$name]['master'] = $con;
-		}
-	}
-
-	/**
-	 * Gets an already-opened PDO connection or opens a new one for passed-in db name.
-	 *
-	 * @param      string $name The datasource name that is used to look up the DSN from the runtime configuation file.
-	 * @param      string $mode The connection mode (this applies to replication systems).
-	 *
-	 * @return     PDO A database connection
-	 *
-	 * @throws     PropelException - if connection cannot be configured or initialized.
-	 */
-	public static function getConnection($name = null, $mode = Propel::CONNECTION_WRITE)
-	{
-		if ($name === null) {
-			$name = self::getDefaultDB();
-		}
-
-		// IF a WRITE-mode connection was requested
-		// or Propel is configured to always use the master connection
-		// or the slave for this connection has already been set to FALSE (indicating no slave)
-		// THEN return the master connection.
-		if ($mode != Propel::CONNECTION_READ || self::$forceMasterConnection || (isset(self::$connectionMap[$name]['slave']) && self::$connectionMap[$name]['slave'] === false)) {
-			if (!isset(self::$connectionMap[$name]['master'])) {
-				// load connection parameter for master connection
-				$conparams = isset(self::$configuration['datasources'][$name]['connection']) ? self::$configuration['datasources'][$name]['connection'] : null;
-				if (empty($conparams)) {
-					throw new PropelException('No connection information in your runtime configuration file for datasource ['.$name.']');
-				}
-				// initialize master connection
-				$con = Propel::initConnection($conparams, $name);
-				self::$connectionMap[$name]['master'] = $con;
-			}
-
-			return self::$connectionMap[$name]['master'];
-
-		} else {
-
-			if (!isset(self::$connectionMap[$name]['slave'])) {
-
-				// we've already ensured that the configuration exists, in previous if-statement
-				$slaveconfigs = isset(self::$configuration['datasources'][$name]['slaves']) ? self::$configuration['datasources'][$name]['slaves'] : null;
-
-				if (empty($slaveconfigs)) { // no slaves configured for this datasource
-					self::$connectionMap[$name]['slave'] = false;
-					return self::getConnection($name, Propel::CONNECTION_WRITE); // Recurse to get the WRITE connection
-				} else { // Initialize a new slave
-					if (isset($slaveconfigs['connection']['dsn'])) { // only one slave connection configured
-						$conparams = $slaveconfigs['connection'];
-					} else {
-						$randkey = array_rand($slaveconfigs['connection']);
-						$conparams = $slaveconfigs['connection'][$randkey];
-						if (empty($conparams)) {
-							throw new PropelException('No connection information in your runtime configuration file for SLAVE ['.$randkey.'] to datasource ['.$name.']');
-						}
-					}
-
-					// initialize master connection
-					$con = Propel::initConnection($conparams, $name);
-					self::$connectionMap[$name]['slave'] = $con;
-				}
-
-			} // if datasource slave not set
-
-			return self::$connectionMap[$name]['slave'];
-
-		} // if mode == CONNECTION_WRITE
-
-	} // getConnection()
-
-	/**
-	 * Opens a new PDO connection for passed-in db name.
-	 *
-	 * @param      array $conparams Connection paramters.
-	 * @param      string $name Datasource name.
-	 * @param      string $defaultClass The PDO subclass to instantiate if there is no explicit classname
-	 * 									specified in the connection params (default is Propel::CLASS_PROPEL_PDO)
-	 *
-	 * @return     PDO A database connection of the given class (PDO, PropelPDO, SlavePDO or user-defined)
-	 *
-	 * @throws     PropelException - if lower-level exception caught when trying to connect.
-	 */
-	public static function initConnection($conparams, $name, $defaultClass = Propel::CLASS_PROPEL_PDO)
-	{
-
-		$dsn = $conparams['dsn'];
-		if ($dsn === null) {
-			throw new PropelException('No dsn specified in your connection parameters for datasource ['.$name.']');
-		}
-
-		if (isset($conparams['classname']) && !empty($conparams['classname'])) {
-			$classname = $conparams['classname'];
-			if (!class_exists($classname)) {
-				throw new PropelException('Unable to load specified PDO subclass: ' . $classname);
-			}
-		} else {
-			$classname = $defaultClass;
-		}
-
-		$user = isset($conparams['user']) ? $conparams['user'] : null;
-		$password = isset($conparams['password']) ? $conparams['password'] : null;
-
-		// load any driver options from the config file
-		// driver options are those PDO settings that have to be passed during the connection construction
-		$driver_options = array();
-		if ( isset($conparams['options']) && is_array($conparams['options']) ) {
-			try {
-				self::processDriverOptions( $conparams['options'], $driver_options );
-			} catch (PropelException $e) {
-				throw new PropelException('Error processing driver options for datasource ['.$name.']', $e);
-			}
-		}
-
-		try {
-			$con = new $classname($dsn, $user, $password, $driver_options);
-			$con->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-		} catch (PDOException $e) {
-			throw new PropelException("Unable to open PDO connection", $e);
-		}
-
-		// load any connection options from the config file
-		// connection attributes are those PDO flags that have to be set on the initialized connection
-		if (isset($conparams['attributes']) && is_array($conparams['attributes'])) {
-			$attributes = array();
-			try {
-				self::processDriverOptions( $conparams['attributes'], $attributes );
-			} catch (PropelException $e) {
-				throw new PropelException('Error processing connection attributes for datasource ['.$name.']', $e);
-			}
-			foreach ($attributes as $key => $value) {
-				$con->setAttribute($key, $value);
-			}
-		}
-
-		// initialize the connection using the settings provided in the config file. this could be a "SET NAMES <charset>" query for MySQL, for instance
-		$adapter = self::getDB($name);
-		$adapter->initConnection($con, isset($conparams['settings']) && is_array($conparams['settings']) ? $conparams['settings'] : array());
-
-		return $con;
-	}
-
-	/**
-	 * Internal function to handle driver options or conneciton attributes in PDO.
-	 *
-	 * Process the INI file flags to be passed to each connection.
-	 *
-	 * @param      array Where to find the list of constant flags and their new setting.
-	 * @param      array Put the data into here
-	 *
-	 * @throws     PropelException If invalid options were specified.
-	 */
-	private static function processDriverOptions($source, &$write_to)
-	{
-		foreach ($source as $option => $optiondata) {
-			if (is_string($option) && strpos($option, '::') !== false) {
-				$key = $option;
-			} elseif (is_string($option)) {
-				$key = 'PropelPDO::' . $option;
-			}
-			if (!defined($key)) {
-				throw new PropelException("Invalid PDO option/attribute name specified: ".$key);
-			}
-			$key = constant($key);
-
-			$value = $optiondata['value'];
-			if (is_string($value) && strpos($value, '::') !== false) {
-				if (!defined($value)) {
-					throw new PropelException("Invalid PDO option/attribute value specified: ".$value);
-				}
-				$value = constant($value);
-			}
-
-			$write_to[$key] = $value;
-		}
-	}
-
-	/**
-	 * Returns database adapter for a specific datasource.
-	 *
-	 * @param      string The datasource name.
-	 *
-	 * @return     DBAdapter The corresponding database adapter.
-	 *
-	 * @throws     PropelException If unable to find DBdapter for specified db.
-	 */
-	public static function getDB($name = null)
-	{
-		if ($name === null) {
-			$name = self::getDefaultDB();
-		}
-
-		if (!isset(self::$adapterMap[$name])) {
-			if (!isset(self::$configuration['datasources'][$name]['adapter'])) {
-				throw new PropelException("Unable to find adapter for datasource [" . $name . "].");
-			}
-			$db = DBAdapter::factory(self::$configuration['datasources'][$name]['adapter']);
-			// register the adapter for this name
-			self::$adapterMap[$name] = $db;
-		}
-
-		return self::$adapterMap[$name];
-	}
-
-	/**
-	 * Sets a database adapter for specified datasource.
-	 *
-	 * @param      string $name The datasource name.
-	 * @param      DBAdapter $adapter The DBAdapter implementation to use.
-	 */
-	public static function setDB($name, DBAdapter $adapter)
-	{
-		if ($name === null) {
-			$name = self::getDefaultDB();
-		}
-		self::$adapterMap[$name] = $adapter;
-	}
-
-	/**
-	 * Returns the name of the default database.
-	 *
-	 * @return     string Name of the default DB
-	 */
-	public static function getDefaultDB()
-	{
-		if (self::$defaultDBName === null) {
-			// Determine default database name.
-			self::$defaultDBName = isset(self::$configuration['datasources']['default']) ? self::$configuration['datasources']['default'] : self::DEFAULT_NAME;
-		}
-		return self::$defaultDBName;
-	}
-
-	/**
-	 * Closes any associated resource handles.
-	 *
-	 * This method frees any database connection handles that have been
-	 * opened by the getConnection() method.
-	 */
-	public static function close()
-	{
-		foreach (self::$connectionMap as $idx => $cons) {
-			// Propel::log("Closing connections for " . $idx, Propel::LOG_DEBUG);
-			unset(self::$connectionMap[$idx]);
-		}
-	}
-
-	/**
-	 * Autoload function for loading propel dependencies.
-	 *
-	 * @param      string The class name needing loading.
-	 *
-	 * @return     boolean TRUE if the class was loaded, false otherwise.
-	 */
-	public static function autoload($className)
-	{
-		if (isset(self::$autoloadMap[$className])) {
-			require(self::$autoloadMap[$className]);
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Include once a file specified in DOT notation and reutrn unqualified clasname.
-	 *
-	 * Typically, Propel uses autoload is used to load classes and expects that all classes
-	 * referenced within Propel are included in Propel's autoload map.  This method is only
-	 * called when a specific non-Propel classname was specified -- for example, the
-	 * classname of a validator in the schema.xml.  This method will attempt to include that
-	 * class via autoload and then relative to a location on the include_path.
-	 *
-	 * @param      string $class dot-path to clas (e.g. path.to.my.ClassName).
-	 * @return     string unqualified classname
-	 */
-	public static function importClass($path) {
-
-		// extract classname
-		if (($pos = strrpos($path, '.')) === false) {
-			$class = $path;
-		} else {
-			$class = substr($path, $pos + 1);
-		}
-
-		// check if class exists, using autoloader to attempt to load it.
-		if (class_exists($class, $useAutoload=true)) {
-			return $class;
-		}
-
-		// turn to filesystem path
-		$path = strtr($path, '.', DIRECTORY_SEPARATOR) . '.php';
-
-		// include class
-		$ret = include_once($path);
-		if ($ret === false) {
-			throw new PropelException("Unable to import class: " . $class . " from " . $path);
-		}
-
-		// return qualified name
-		return $class;
-	}
-
-	/**
-	 * Set your own class-name for Database-Mapping. Then
-	 * you can change the whole TableMap-Model, but keep its
-	 * functionality for Criteria.
-	 *
-	 * @param      string The name of the class.
-	 */
-	public static function setDatabaseMapClass($name)
-	{
-		self::$databaseMapClass = $name;
-	}
-
-	/**
-	 * Disable instance pooling.
-	 */
-	public static function disableInstancePooling()
-	{
-		self::$instancePoolingEnabled = false;
-	}
-
-	/**
-	 * Enable instance pooling (enabled by default).
-	 */
-	public static function enableInstancePooling()
-	{
-		self::$instancePoolingEnabled = true;
-	}
-
-	/**
-	 *  the instance pooling behaviour. True by default.
-	 *
-	 * @return     boolean Whether the pooling is enabled or not.
-	 */
-	public static function isInstancePoolingEnabled()
-	{
-		return self::$instancePoolingEnabled;
-	}
-}
-
-spl_autoload_register(array('Propel', 'autoload'));
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/PropelException.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/PropelException.php
deleted file mode 100644
index f9c958396..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/PropelException.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/*
- *  $Id: PropelException.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * The base class of all exceptions thrown by Propel.
- * @author     Hans Lellelid <hans@xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel
- */
-class PropelException extends Exception {
-
-	/** The nested "cause" exception. */
-	protected $cause;
-
-	function __construct($p1, $p2 = null) {
-
-		$cause = null;
-
-		if ($p2 !== null) {
-			$msg = $p1;
-			$cause = $p2;
-		} else {
-			if ($p1 instanceof Exception) {
-				$msg = "";
-				$cause = $p1;
-			} else {
-				$msg = $p1;
-			}
-		}
-
-		parent::__construct($msg);
-
-		if ($cause !== null) {
-			$this->cause = $cause;
-			$this->message .= " [wrapped: " . $cause->getMessage() ."]";
-		}
-	}
-
-	function getCause() {
-		return $this->cause;
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBAdapter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBAdapter.php
deleted file mode 100644
index a01a85da1..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBAdapter.php
+++ /dev/null
@@ -1,306 +0,0 @@
-<?php
-/*
- *  $Id: DBAdapter.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * DBAdapter</code> defines the interface for a Propel database adapter.
- *
- * <p>Support for new databases is added by subclassing
- * <code>DBAdapter</code> and implementing its abstract interface, and by
- * registering the new database adapter and corresponding Creole
- * driver in the private adapters map (array) in this class.</p>
- *
- * <p>The Propel database adapters exist to present a uniform
- * interface to database access across all available databases.  Once
- * the necessary adapters have been written and configured,
- * transparent swapping of databases is theoretically supported with
- * <i>zero code change</i> and minimal configuration file
- * modifications.</p>
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Jon S. Stevens <jon@latchkey.com> (Torque)
- * @author     Brett McLaughlin <bmclaugh@algx.net> (Torque)
- * @author     Daniel Rall <dlr@finemaltcoding.com> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.adapter
- */
-abstract class DBAdapter {
-
-	const ID_METHOD_NONE = 0;
-	const ID_METHOD_AUTOINCREMENT = 1;
-	const ID_METHOD_SEQUENCE = 2;
-
-	/**
-	 * Creole driver to Propel adapter map.
-	 * @var        array
-	 */
-	private static $adapters = array(
-		'mysql' => 'DBMySQL',
-		'mysqli' => 'DBMySQLi',
-		'mssql' => 'DBMSSQL',
-    'dblib' => 'DBMSSQL',
-		'sybase' => 'DBSybase',
-		'oracle' => 'DBOracle',
-		'pgsql' => 'DBPostgres',
-		'sqlite' => 'DBSQLite',
-		'' => 'DBNone',
-	);
-
-	/**
-	 * Creates a new instance of the database adapter associated
-	 * with the specified Creole driver.
-	 *
-	 * @param      string $driver The name of the Propel/Creole driver to
-	 * create a new adapter instance for or a shorter form adapter key.
-	 * @return     DBAdapter An instance of a Propel database adapter.
-	 * @throws     PropelException if the adapter could not be instantiated.
-	 */
-	public static function factory($driver) {
-		$adapterClass = isset(self::$adapters[$driver]) ? self::$adapters[$driver] : null;
-		if ($adapterClass !== null) {
-			$a = new $adapterClass();
-			return $a;
-		} else {
-			throw new PropelException("Unsupported Propel driver: " . $driver . ": Check your configuration file");
-		}
-	}
-
-	/**
-	 * This method is called after a connection was created to run necessary
-	 * post-initialization queries or code.
-	 *
-	 * If a charset was specified, this will be set before any other queries
-	 * are executed.
-	 *
-	 * This base method runs queries specified using the "query" setting.
-	 *
-	 * @param      PDO   A PDO connection instance.
-	 * @param      array An array of settings.
-	 * @see        setCharset()
-	 */
-	public function initConnection(PDO $con, array $settings)
-	{
-		if (isset($settings['charset']['value'])) {
-			$this->setCharset($con, $settings['charset']['value']);
-		}
-		if (isset($settings['queries']) && is_array($settings['queries'])) {
-			foreach ($settings['queries'] as $queries) {
-				foreach ((array)$queries as $query) {
-					$con->exec($query);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Sets the character encoding using SQL standard SET NAMES statement.
-	 *
-	 * This method is invoked from the default initConnection() method and must
-	 * be overridden for an RDMBS which does _not_ support this SQL standard.
-	 *
-	 * @param      PDO   A PDO connection instance.
-	 * @param      string The charset encoding.
-	 * @see        initConnection()
-	 */
-	public function setCharset(PDO $con, $charset)
-	{
-		$con->exec("SET NAMES '" . $charset . "'");
-	}
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      string The string to transform to upper case.
-	 * @return     string The upper case string.
-	 */
-	public abstract function toUpperCase($in);
-
-	/**
-	 * Returns the character used to indicate the beginning and end of
-	 * a piece of text used in a SQL statement (generally a single
-	 * quote).
-	 *
-	 * @return     string The text delimeter.
-	 */
-	public function getStringDelimiter()
-	{
-		return '\'';
-	}
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      string $in The string whose case to ignore.
-	 * @return     string The string in a case that can be ignored.
-	 */
-	public abstract function ignoreCase($in);
-
-	/**
-	 * This method is used to ignore case in an ORDER BY clause.
-	 * Usually it is the same as ignoreCase, but some databases
-	 * (Interbase for example) does not use the same SQL in ORDER BY
-	 * and other clauses.
-	 *
-	 * @param      string $in The string whose case to ignore.
-	 * @return     string The string in a case that can be ignored.
-	 */
-	public function ignoreCaseInOrderBy($in)
-	{
-		return $this->ignoreCase($in);
-	}
-
-	/**
-	 * Returns SQL which concatenates the second string to the first.
-	 *
-	 * @param      string String to concatenate.
-	 * @param      string String to append.
-	 * @return     string
-	 */
-	public abstract function concatString($s1, $s2);
-
-	/**
-	 * Returns SQL which extracts a substring.
-	 *
-	 * @param      string String to extract from.
-	 * @param      int Offset to start from.
-	 * @param      int Number of characters to extract.
-	 * @return     string
-	 */
-	public abstract function subString($s, $pos, $len);
-
-	/**
-	 * Returns SQL which calculates the length (in chars) of a string.
-	 *
-	 * @param      string String to calculate length of.
-	 * @return     string
-	 */
-	public abstract function strLength($s);
-
-
-	/**
-	 * Quotes database objec identifiers (table names, col names, sequences, etc.).
-	 * @param      string $text The identifier to quote.
-	 * @return     string The quoted identifier.
-	 */
-	public function quoteIdentifier($text)
-	{
-		return '"' . $text . '"';
-	}
-
-	/**
-	 * Quotes a database table which could have space seperating it from an alias, both should be identified seperately
-	 * @param      string $table The table name to quo
-	 * @return     string The quoted table name
-	 **/
-	public function quoteIdentifierTable($table) {
-		return implode(" ", array_map(array($this, "quoteIdentifier"), explode(" ", $table) ) );
-	}
-
-	/**
-	 * Returns the native ID method for this RDBMS.
-	 * @return     int one of DBAdapter:ID_METHOD_SEQUENCE, DBAdapter::ID_METHOD_AUTOINCREMENT.
-	 */
-	protected function getIdMethod()
-	{
-		return DBAdapter::ID_METHOD_AUTOINCREMENT;
-	}
-
-	/**
-	 * Whether this adapter uses an ID generation system that requires getting ID _before_ performing INSERT.
-	 * @return     boolean
-	 */
-	public function isGetIdBeforeInsert()
-	{
-		return ($this->getIdMethod() === DBAdapter::ID_METHOD_SEQUENCE);
-	}
-
-	/**
-	 * Whether this adapter uses an ID generation system that requires getting ID _before_ performing INSERT.
-	 * @return     boolean
-	 */
-	public function isGetIdAfterInsert()
-	{
-		return ($this->getIdMethod() === DBAdapter::ID_METHOD_AUTOINCREMENT);
-	}
-
-	/**
-	 * Gets the generated ID (either last ID for autoincrement or next sequence ID).
-	 * @return     mixed
-	 */
-	public function getId(PDO $con, $name = null)
-	{
-		return $con->lastInsertId($name);
-	}
-
-	/**
-	 * Returns timestamp formatter string for use in date() function.
-	 * @return     string
-	 */
-	public function getTimestampFormatter()
-	{
-		return "Y-m-d H:i:s";
-	}
-
-	/**
-	 * Returns date formatter string for use in date() function.
-	 * @return     string
-	 */
-	public function getDateFormatter()
-	{
-		return "Y-m-d";
-	}
-
-	/**
-	 * Returns time formatter string for use in date() function.
-	 * @return     string
-	 */
-	public function getTimeFormatter()
-	{
-		return "H:i:s";
-	}
-
-	/**
-	 * Should Column-Names get identifiers for inserts or updates.
-	 * By default false is returned -> backwards compability.
-	 *
-	 * it`s a workaround...!!!
-	 *
-	 * @todo       should be abstract
-	 * @return     boolean
-	 * @deprecated
-	 */
-	public function useQuoteIdentifier()
-	{
-		return false;
-	}
-
-	/**
-	 * Modifies the passed-in SQL to add LIMIT and/or OFFSET.
-	 */
-	public abstract function applyLimit(&$sql, $offset, $limit);
-
-	/**
-	 * Gets the SQL string that this adapter uses for getting a random number.
-	 *
-	 * @param      mixed $seed (optional) seed value for databases that support this
-	 */
-	public abstract function random($seed = null);
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBMSSQL.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBMSSQL.php
deleted file mode 100644
index 963a66771..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBMSSQL.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-
-/*
-*  $Id: DBMSSQL.php 1262 2009-10-26 20:54:39Z francois $
-*
-* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-* This software consists of voluntary contributions made by many individuals
-* and is licensed under the LGPL. For more information please see
-* <http://propel.phpdb.org>.
-*/
-
-/**
- * This is used to connect to a MSSQL database.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @version    $Revision: 1262 $
- * @package    propel.adapter
- */
-class DBMSSQL extends DBAdapter {
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      in The string to transform to upper case.
-	 * @return     The upper case string.
-	 */
-	public function toUpperCase($in)
-	{
-		return "UPPER(" . $in . ")";
-	}
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      in The string whose case to ignore.
-	 * @return     The string in a case that can be ignored.
-	 */
-	public function ignoreCase($in)
-	{
-		return "UPPER(" . $in . ")";
-	}
-
-	/**
-	 * Returns SQL which concatenates the second string to the first.
-	 *
-	 * @param      string String to concatenate.
-	 * @param      string String to append.
-	 * @return     string
-	 */
-	public function concatString($s1, $s2)
-	{
-		return "($s1 + $s2)";
-	}
-
-	/**
-	 * Returns SQL which extracts a substring.
-	 *
-	 * @param      string String to extract from.
-	 * @param      int Offset to start from.
-	 * @param      int Number of characters to extract.
-	 * @return     string
-	 */
-	public function subString($s, $pos, $len)
-	{
-		return "SUBSTRING($s, $pos, $len)";
-	}
-
-	/**
-	 * Returns SQL which calculates the length (in chars) of a string.
-	 *
-	 * @param      string String to calculate length of.
-	 * @return     string
-	 */
-	public function strLength($s)
-	{
-		return "LEN($s)";
-	}
-
-	/**
-	 * @see        DBAdapter::quoteIdentifier()
-	 */
-	public function quoteIdentifier($text)
-	{
-		return '[' . $text . ']';
-	}
-
-	/**
-	 * @see        DBAdapter::random()
-	 */
-	public function random($seed = null)
-	{
-		return 'rand('.((int) $seed).')';
-	}
-
-  /**
-   * Simulated Limit/Offset
-   * This rewrites the $sql query to apply the offset and limit.
-   * @see        DBAdapter::applyLimit()
-   * @author     Justin Carlson <justin.carlson@gmail.com>
-   * @author     Benjamin Runnels <kraven@kraven.org>
-   */
-  public function applyLimit(&$sql, $offset, $limit)
-  {
-    // make sure offset and limit are numeric
-    if (!is_numeric($offset) || !is_numeric($limit))
-    {
-      throw new Exception("DBMSSQL::applyLimit() expects a number for argument 2 and 3");
-    }
-
-    //split the select and from clauses out of the original query
-    $selectSegment = array();
-    preg_match('/\Aselect(.*)from(.*)/si',$sql,$selectSegment);
-    if (count($selectSegment)==3)
-    {      
-      $selectStatement = trim($selectSegment[1]);
-      $fromStatement = trim($selectSegment[2]);      
-    }
-    else
-    {
-      throw new Exception("DBMSSQL::applyLimit() could not locate the select statement at the start of the query. ");
-    }
-
-    //handle the ORDER BY clause if present
-    $orderSegment = array();
-    preg_match('/order by(.*)\Z/si',$fromStatement,$orderSegment);
-    if (count($orderSegment)==2)
-    {
-      //remove the ORDER BY from $sql
-      $fromStatement = trim(str_replace($orderSegment[0], '', $fromStatement));
-      //the ORDER BY clause is used in our inner select ROW_NUMBER() clause
-      $countColumn = trim($orderSegment[1]);
-    }
-
-    //setup inner and outer select selects
-    $innerSelect = '';
-    $outerSelect = '';
-    foreach(explode(', ',$selectStatement) as $selCol) {
-      @list($column,,$alias) = explode(' ', $selCol);
-      //make sure the current column isn't * or an aggregate
-      if ($column!='*' && !strstr($column,'(')) {
-        //we can use the first non-aggregate column for ROW_NUMBER() if it wasn't already set from an order by clause
-        if(!isset($countColumn)) {
-          $countColumn = $column;
-        }
-
-        //add an alias to the inner select so all columns will be unique
-        $innerSelect .= $column." AS [$column],";
-        
-        //use the alias in the outer select if one was present on the original select column
-        if(isset($alias)) {
-          $outerSelect .= "[$column] AS $alias,";
-        } else {
-          $outerSelect .= "[$column],";
-        }        
-      } else {
-        //agregate columns must always have an alias clause
-        if(!isset($alias)) {
-          throw new Exception("DBMSSQL::applyLimit() requires aggregate columns to have an Alias clause");
-        }
-        //use the whole aggregate column in the inner select
-        $innerSelect .= "$selCol,";
-        //only add the alias for the aggregate to the outer select
-        $outerSelect .= "$alias,";
-      }
-    }
-
-    //check if we got this far and still don't have a viable column to user with ROW_NUMBER()
-    if(!isset($countColumn)) {
-      throw new Exception("DBMSSQL::applyLimit() requires an ORDER BY clause or at least one non-aggregate column in the select statement");
-    }
-
-    //ROW_NUMBER() starts at 1 not 0
-    $from = ($offset+1);
-    $to = ($limit+$offset);
-       
-    //substring our select strings to get rid of the last comma and add our FROM and SELECT clauses
-    $innerSelect = "SELECT ROW_NUMBER() OVER(ORDER BY $countColumn) AS RowNumber, ".substr($innerSelect,0,-1).' FROM';
-    $outerSelect = 'SELECT '.substr($outerSelect,0,-1).' FROM';
-
-    // build the query
-    $sql = "$outerSelect ($innerSelect $fromStatement) AS derivedb WHERE RowNumber BETWEEN $from AND $to";
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBMySQL.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBMySQL.php
deleted file mode 100644
index caad4eee3..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBMySQL.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-
-/*
- *  $Id: DBMySQL.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * This is used in order to connect to a MySQL database.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Jon S. Stevens <jon@clearink.com> (Torque)
- * @author     Brett McLaughlin <bmclaugh@algx.net> (Torque)
- * @author     Daniel Rall <dlr@finemaltcoding.com> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.adapter
- */
-class DBMySQL extends DBAdapter {
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      in The string to transform to upper case.
-	 * @return     The upper case string.
-	 */
-	public function toUpperCase($in)
-	{
-		return "UPPER(" . $in . ")";
-	}
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      in The string whose case to ignore.
-	 * @return     The string in a case that can be ignored.
-	 */
-	public function ignoreCase($in)
-	{
-		return "UPPER(" . $in . ")";
-	}
-
-	/**
-	 * Returns SQL which concatenates the second string to the first.
-	 *
-	 * @param      string String to concatenate.
-	 * @param      string String to append.
-	 * @return     string
-	 */
-	public function concatString($s1, $s2)
-	{
-		return "CONCAT($s1, $s2)";
-	}
-
-	/**
-	 * Returns SQL which extracts a substring.
-	 *
-	 * @param      string String to extract from.
-	 * @param      int Offset to start from.
-	 * @param      int Number of characters to extract.
-	 * @return     string
-	 */
-	public function subString($s, $pos, $len)
-	{
-		return "SUBSTRING($s, $pos, $len)";
-	}
-
-	/**
-	 * Returns SQL which calculates the length (in chars) of a string.
-	 *
-	 * @param      string String to calculate length of.
-	 * @return     string
-	 */
-	public function strLength($s)
-	{
-		return "CHAR_LENGTH($s)";
-	}
-
-
-	/**
-	 * Locks the specified table.
-	 *
-	 * @param      Connection $con The Creole connection to use.
-	 * @param      string $table The name of the table to lock.
-	 * @throws     PDOException No Statement could be created or
-	 * executed.
-	 */
-	public function lockTable(PDO $con, $table)
-	{
-		$con->exec("LOCK TABLE " . $table . " WRITE");
-	}
-
-	/**
-	 * Unlocks the specified table.
-	 *
-	 * @param      PDO $con The PDO connection to use.
-	 * @param      string $table The name of the table to unlock.
-	 * @throws     PDOException No Statement could be created or
-	 * executed.
-	 */
-	public function unlockTable(PDO $con, $table)
-	{
-		$statement = $con->exec("UNLOCK TABLES");
-	}
-
-	/**
-	 * @see        DBAdapter::quoteIdentifier()
-	 */
-	public function quoteIdentifier($text)
-	{
-		return '`' . $text . '`';
-	}
-
-	/**
-	 * @see        DBAdapter::useQuoteIdentifier()
-	 */
-	public function useQuoteIdentifier()
-	{
-		return true;
-	}
-
-	/**
-	 * @see        DBAdapter::applyLimit()
-	 */
-	public function applyLimit(&$sql, $offset, $limit)
-	{
-		if ( $limit > 0 ) {
-			$sql .= " LIMIT " . ($offset > 0 ? $offset . ", " : "") . $limit;
-		} else if ( $offset > 0 ) {
-			$sql .= " LIMIT " . $offset . ", 18446744073709551615";
-		}
-	}
-
-	/**
-	 * @see        DBAdapter::random()
-	 */
-	public function random($seed = null)
-	{
-		return 'rand('.((int) $seed).')';
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBNone.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBNone.php
deleted file mode 100644
index 8e5085363..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBNone.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-/*
- *  $Id: DBNone.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * This adapter  is used when you do not have a database installed.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Jon S. Stevens <jon@clearink.com> (Torque)
- * @author     Brett McLaughlin <bmclaugh@algx.net> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.adapter
- */
-class DBNone extends DBAdapter {
-
-	/**
-	 * @see        DBAdapter::initConnection()
-	 */
-	public function initConnection(PDO $con, array $settings)
-	{
-	}
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      in The string to transform to upper case.
-	 * @return     The upper case string.
-	 */
-	public function toUpperCase($in)
-	{
-		return $in;
-	}
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      in The string whose case to ignore.
-	 * @return     The string in a case that can be ignored.
-	 */
-	public function ignoreCase($in)
-	{
-		return $in;
-	}
-
-	/**
-	 * Returns SQL which concatenates the second string to the first.
-	 *
-	 * @param      string String to concatenate.
-	 * @param      string String to append.
-	 * @return     string
-	 */
-	public function concatString($s1, $s2)
-	{
-		return ($s1 . $s2);
-	}
-
-	/**
-	 * Returns SQL which extracts a substring.
-	 *
-	 * @param      string String to extract from.
-	 * @param      int Offset to start from.
-	 * @param      int Number of characters to extract.
-	 * @return     string
-	 */
-	public function subString($s, $pos, $len)
-	{
-		return substr($s, $pos, $len);
-	}
-
-	/**
-	 * Returns SQL which calculates the length (in chars) of a string.
-	 *
-	 * @param      string String to calculate length of.
-	 * @return     string
-	 */
-	public function strLength($s)
-	{
-		return strlen($s);
-	}
-	
-	/**
-	 * Modifies the passed-in SQL to add LIMIT and/or OFFSET.
-	 */
-	public function applyLimit(&$sql, $offset, $limit)
-	{		
-	}
-
-	/**
-	 * Gets the SQL string that this adapter uses for getting a random number.
-	 *
-	 * @param      mixed $seed (optional) seed value for databases that support this
-	 */
-	public function random($seed = null)
-	{
-	}
-	
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBOracle.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBOracle.php
deleted file mode 100644
index 759c0d654..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBOracle.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-/*
- *  $Id: DBOracle.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * Oracle adapter.
- *
- * @author     David Giffin <david@giffin.org> (Propel)
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Jon S. Stevens <jon@clearink.com> (Torque)
- * @author     Brett McLaughlin <bmclaugh@algx.net> (Torque)
- * @author     Bill Schneider <bschneider@vecna.com> (Torque)
- * @author     Daniel Rall <dlr@finemaltcoding.com> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.adapter
- */
-class DBOracle extends DBAdapter {
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      string $in The string to transform to upper case.
-	 * @return     string The upper case string.
-	 */
-	public function toUpperCase($in)
-	{
-		return "UPPER(" . $in . ")";
-	}
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      string $in The string whose case to ignore.
-	 * @return     string The string in a case that can be ignored.
-	 */
-	public function ignoreCase($in)
-	{
-		return "UPPER(" . $in . ")";
-	}
-
-	/**
-	 * Returns SQL which concatenates the second string to the first.
-	 *
-	 * @param      string String to concatenate.
-	 * @param      string String to append.
-	 * @return     string
-	 */
-	public function concatString($s1, $s2)
-	{
-		return "CONCAT($s1, $s2)";
-	}
-
-	/**
-	 * Returns SQL which extracts a substring.
-	 *
-	 * @param      string String to extract from.
-	 * @param      int Offset to start from.
-	 * @param      int Number of characters to extract.
-	 * @return     string
-	 */
-	public function subString($s, $pos, $len)
-	{
-		return "SUBSTR($s, $pos, $len)";
-	}
-
-	/**
-	 * Returns SQL which calculates the length (in chars) of a string.
-	 *
-	 * @param      string String to calculate length of.
-	 * @return     string
-	 */
-	public function strLength($s)
-	{
-		return "LENGTH($s)";
-	}
-
-	/**
-	 * @see        DBAdapter::applyLimit()
-	 */
-	public function applyLimit(&$sql, $offset, $limit)
-	{
-		 $sql =
-			'SELECT B.* FROM (  '
-			.  'SELECT A.*, rownum AS PROPEL$ROWNUM FROM (  '
-			. $sql
-			. '  ) A '
-			.  ' ) B WHERE ';
-
-		if ( $offset > 0 ) {
-			$sql				.= ' B.PROPEL$ROWNUM > ' . $offset;
-
-			if ( $limit > 0 )
-			{
-				$sql			.= ' AND B.PROPEL$ROWNUM <= '
-									. ( $offset + $limit );
-			}
-		} else {
-			$sql				.= ' B.PROPEL$ROWNUM <= ' . $limit;
-		}
-	}
-
-	protected function getIdMethod()
-	{
-		return DBAdapter::ID_METHOD_SEQUENCE;
-	}
-
-	public function getId(PDO $con, $name = null)
-	{
-		if ($name === null) {
-			throw new PropelException("Unable to fetch next sequence ID without sequence name.");
-		}
-
-		$stmt = $con->query("SELECT " . $name . ".nextval FROM dual");
-		$row = $stmt->fetch(PDO::FETCH_NUM);
-
-		return $row[0];
-	}
-
-	public function random($seed=NULL)
-	{
-		return 'dbms_random.value';
-	}
-
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBPostgres.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBPostgres.php
deleted file mode 100644
index 3dc32cd53..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBPostgres.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-
-/*
- *  $Id: DBPostgres.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * This is used to connect to PostgresQL databases.
- *
- * <a href="http://www.pgsql.org">http://www.pgsql.org</a>
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Hakan Tandogan <hakan42@gmx.de> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.adapter
- */
-class DBPostgres extends DBAdapter {
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      string $in The string to transform to upper case.
-	 * @return     string The upper case string.
-	 */
-	public function toUpperCase($in)
-	{
-		return "UPPER(" . $in . ")";
-	}
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      in The string whose case to ignore.
-	 * @return     The string in a case that can be ignored.
-	 */
-	public function ignoreCase($in)
-	{
-		return "UPPER(" . $in . ")";
-	}
-
-	/**
-	 * Returns SQL which concatenates the second string to the first.
-	 *
-	 * @param      string String to concatenate.
-	 * @param      string String to append.
-	 * @return     string
-	 */
-	public function concatString($s1, $s2)
-	{
-		return "($s1 || $s2)";
-	}
-
-	/**
-	 * Returns SQL which extracts a substring.
-	 *
-	 * @param      string String to extract from.
-	 * @param      int Offset to start from.
-	 * @param      int Number of characters to extract.
-	 * @return     string
-	 */
-	public function subString($s, $pos, $len)
-	{
-		return "substring($s from $pos" . ($len > -1 ? "for $len" : "") . ")";
-	}
-
-	/**
-	 * Returns SQL which calculates the length (in chars) of a string.
-	 *
-	 * @param      string String to calculate length of.
-	 * @return     string
-	 */
-	public function strLength($s)
-	{
-		return "char_length($s)";
-	}
-
-	/**
-	 * @see        DBAdapter::getIdMethod()
-	 */
-	protected function getIdMethod()
-	{
-		return DBAdapter::ID_METHOD_SEQUENCE;
-	}
-
-	/**
-	 * Gets ID for specified sequence name.
-	 */
-	public function getId(PDO $con, $name = null)
-	{
-		if ($name === null) {
-			throw new PropelException("Unable to fetch next sequence ID without sequence name.");
-		}
-		$stmt = $con->query("SELECT nextval(".$con->quote($name).")");
-		$row = $stmt->fetch(PDO::FETCH_NUM);
-		return $row[0];
-	}
-
-	/**
-	 * Returns timestamp formatter string for use in date() function.
-	 * @return     string
-	 */
-	public function getTimestampFormatter()
-	{
-		return "Y-m-d H:i:s O";
-	}
-
-	/**
-	 * Returns timestamp formatter string for use in date() function.
-	 * @return     string
-	 */
-	public function getTimeFormatter()
-	{
-		return "H:i:s O";
-	}
-
-	/**
-	 * @see        DBAdapter::applyLimit()
-	 */
-	public function applyLimit(&$sql, $offset, $limit)
-	{
-		if ( $limit > 0 ) {
-			$sql .= " LIMIT ".$limit;
-		}
-		if ( $offset > 0 ) {
-			$sql .= " OFFSET ".$offset;
-		}
-	}
-	
-	/**
-	 * @see        DBAdapter::random()
-	 */
-	public function random($seed=NULL)
-	{
-		return 'random()';
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBSQLite.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBSQLite.php
deleted file mode 100644
index f7bdf6673..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/DBSQLite.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-/*
- *  $Id: DBSQLite.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * This is used in order to connect to a SQLite database.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.adapter
- */
-class DBSQLite extends DBAdapter {
-
-	/**
-	 * For SQLite this method has no effect, since SQLite doesn't support specifying a character
-	 * set (or, another way to look at it, it doesn't require a single character set per DB).
-	 *
-	 * @param      PDO   A PDO connection instance.
-	 * @param      string The charset encoding.
-	 * @throws     PropelException If the specified charset doesn't match sqlite_libencoding()
-	 */
-	public function setCharset(PDO $con, $charset)
-	{
-	}
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      in The string to transform to upper case.
-	 * @return     The upper case string.
-	 */
-	public function toUpperCase($in)
-	{
-		return 'UPPER(' . $in . ')';
-	}
-
-	/**
-	 * This method is used to ignore case.
-	 *
-	 * @param      in The string whose case to ignore.
-	 * @return     The string in a case that can be ignored.
-	 */
-	public function ignoreCase($in)
-	{
-		return 'UPPER(' . $in . ')';
-	}
-
-	/**
-	 * Returns SQL which concatenates the second string to the first.
-	 *
-	 * @param      string String to concatenate.
-	 * @param      string String to append.
-	 * @return     string
-	 */
-	public function concatString($s1, $s2)
-	{
-		return "($s1 || $s2)";
-	}
-
-	/**
-	 * Returns SQL which extracts a substring.
-	 *
-	 * @param      string String to extract from.
-	 * @param      int Offset to start from.
-	 * @param      int Number of characters to extract.
-	 * @return     string
-	 */
-	public function subString($s, $pos, $len)
-	{
-		return "substr($s, $pos, $len)";
-	}
-
-	/**
-	 * Returns SQL which calculates the length (in chars) of a string.
-	 *
-	 * @param      string String to calculate length of.
-	 * @return     string
-	 */
-	public function strLength($s)
-	{
-		return "length($s)";
-	}
-
-	/**
-	 * @see        DBAdapter::quoteIdentifier()
-	 */
-	public function quoteIdentifier($text)
-	{
-		return '[' . $text . ']';
-	}
-
-	/**
-	 * @see        DBAdapter::applyLimit()
-	 */
-	public function applyLimit(&$sql, $offset, $limit)
-	{
-		if ( $limit > 0 ) {
-			$sql .= " LIMIT " . $limit . ($offset > 0 ? " OFFSET " . $offset : "");
-		} elseif ( $offset > 0 ) {
-			$sql .= " LIMIT -1 OFFSET " . $offset;
-		}
-	}
-
-	public function random($seed=NULL)
-	{
-		return 'random()';
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/MSSQL/MssqlDateTime.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/MSSQL/MssqlDateTime.class.php
deleted file mode 100644
index 4df0f8c28..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/MSSQL/MssqlDateTime.class.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * MSSQL Server returns datetimes in a format that strtotime doesn't handle so we need to extend DateTime
- *
- * @package    propel.adapter.MSSQL
- */
-class MssqlDateTime extends DateTime
-{
-  public function __construct($datetime='now', DateTimeZone $tz = null)
-  {
-    //if the date is bad account for Mssql datetime format
-    if ($datetime != 'now' && strtotime($datetime) === false)
-    {
-      $datetime = substr($datetime,0, -6).substr($datetime,-2);
-    }
-
-    if($tz instanceof DateTimeZone)
-    {
-      parent::__construct($datetime,$tz);
-    }
-    else
-    {
-      parent::__construct($datetime);
-    }
-  }
-}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/MSSQL/MssqlDebugPDO.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/MSSQL/MssqlDebugPDO.php
deleted file mode 100644
index ac66f42b4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/MSSQL/MssqlDebugPDO.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-/**
- * dblib doesn't support transactions so we need to add a workaround for transactions, last insert ID, and quoting
- *
- * @package    propel.adapter.MSSQL
- */
-class MssqlDebugPDO extends DebugPDO
-{
-	/**
-	 * Begin a transaction.
-	 *
-	 * It is necessary to override the abstract PDO transaction functions here, as
-	 * the PDO driver for MSSQL does not support transactions.
-	 */
-	public function beginTransaction()
-	{
-		$return = true;
-		$opcount = $this->getNestedTransactionCount();
-		if ( $opcount === 0 ) {
-			$return = self::exec('BEGIN TRANSACTION');
-			$this->isUncommitable = false;
-		}
-		$this->incrementNestedTransactionCount();
-		return $return;
-	}
-	
-	/**
-	 * Commit a transaction.
-	 *
-	 * It is necessary to override the abstract PDO transaction functions here, as
-	 * the PDO driver for MSSQL does not support transactions.
-	 */
-  public function commit()
-	{
-		$return = true;
-		$opcount = $this->getNestedTransactionCount();
-		if ($opcount > 0) {
-			if ($opcount === 1) {
-				if ($this->isUncommitable) {
-					throw new PropelException('Cannot commit because a nested transaction was rolled back');
-				} else {
-					$return = self::exec('COMMIT TRANSACTION');
-				}
-			}
-			$this->decrementNestedTransactionCount();
-		}
-		return $return;
-	}
-
-	/**
-	 * Roll-back a transaction.
-	 *
-	 * It is necessary to override the abstract PDO transaction functions here, as
-	 * the PDO driver for MSSQL does not support transactions.
-	 */
-	public function rollBack()
-	{
-		$return = true;
-		$opcount = $this->getNestedTransactionCount();
-		if ($opcount > 0) {
-			if ($opcount === 1) { 
-				$return = self::exec('ROLLBACK TRANSACTION'); 
-			} else {
-				$this->isUncommitable = true;
-			}
-			$this->decrementNestedTransactionCount(); 
-		}
-		return $return;
-	}
-
-	/**
-	 * Rollback the whole transaction, even if this is a nested rollback
-	 * and reset the nested transaction count to 0.
-	 *
-	 * It is necessary to override the abstract PDO transaction functions here, as
-	 * the PDO driver for MSSQL does not support transactions.
-	 */
-	public function forceRollBack()
-	{
-		$return = true;
-		$opcount = $this->getNestedTransactionCount();
-		if ($opcount > 0) {
-			// If we're in a transaction, always roll it back
-			// regardless of nesting level.
-			$return = self::exec('ROLLBACK TRANSACTION');
-			
-			// reset nested transaction count to 0 so that we don't
-			// try to commit (or rollback) the transaction outside this scope.
-			$this->nestedTransactionCount = 0;
-		}
-		return $return;
-	}
-
-	public function lastInsertId($seqname = null)
-	{
-		$result = self::query('SELECT SCOPE_IDENTITY()');
-		return (int)$result->fetchColumn();
-	}
-	
-	public function quoteIdentifier($text)
-	{
-		return '[' . $text . ']';
-	}
-	
-	public function useQuoteIdentifier()
-	{
-		return true;
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/MSSQL/MssqlPropelPDO.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/MSSQL/MssqlPropelPDO.php
deleted file mode 100644
index 10753a393..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/adapter/MSSQL/MssqlPropelPDO.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-/**
- * dblib doesn't support transactions so we need to add a workaround for transactions, last insert ID, and quoting
- *
- * @package    propel.adapter.MSSQL
- */
-class MssqlPropelPDO extends PropelPDO
-{
-	/**
-	 * Begin a transaction.
-	 *
-	 * It is necessary to override the abstract PDO transaction functions here, as
-	 * the PDO driver for MSSQL does not support transactions.
-	 */
-	public function beginTransaction()
-	{
-		$return = true;
-		$opcount = $this->getNestedTransactionCount();
-		if ( $opcount === 0 ) {
-			$return = self::exec('BEGIN TRANSACTION');
-			$this->isUncommitable = false;
-		}
-		$this->incrementNestedTransactionCount();
-		return $return;
-	}
-	
-	/**
-	 * Commit a transaction.
-	 *
-	 * It is necessary to override the abstract PDO transaction functions here, as
-	 * the PDO driver for MSSQL does not support transactions.
-	 */
-  public function commit()
-	{
-		$return = true;
-		$opcount = $this->getNestedTransactionCount();
-		if ($opcount > 0) {
-			if ($opcount === 1) {
-				if ($this->isUncommitable) {
-					throw new PropelException('Cannot commit because a nested transaction was rolled back');
-				} else {
-					$return = self::exec('COMMIT TRANSACTION');
-				}
-			}
-			$this->decrementNestedTransactionCount();
-		}
-		return $return;
-	}
-
-	/**
-	 * Roll-back a transaction.
-	 *
-	 * It is necessary to override the abstract PDO transaction functions here, as
-	 * the PDO driver for MSSQL does not support transactions.
-	 */
-	public function rollBack()
-	{
-		$return = true;
-		$opcount = $this->getNestedTransactionCount();
-		if ($opcount > 0) {
-			if ($opcount === 1) { 
-				$return = self::exec('ROLLBACK TRANSACTION'); 
-			} else {
-				$this->isUncommitable = true;
-			}
-			$this->decrementNestedTransactionCount(); 
-		}
-		return $return;
-	}
-
-	/**
-	 * Rollback the whole transaction, even if this is a nested rollback
-	 * and reset the nested transaction count to 0.
-	 *
-	 * It is necessary to override the abstract PDO transaction functions here, as
-	 * the PDO driver for MSSQL does not support transactions.
-	 */
-	public function forceRollBack()
-	{
-		$return = true;
-		$opcount = $this->getNestedTransactionCount();
-		if ($opcount > 0) {
-			// If we're in a transaction, always roll it back
-			// regardless of nesting level.
-			$return = self::exec('ROLLBACK TRANSACTION');
-			
-			// reset nested transaction count to 0 so that we don't
-			// try to commit (or rollback) the transaction outside this scope.
-			$this->nestedTransactionCount = 0;
-		}
-		return $return;
-	}
-
-	public function lastInsertId($seqname = null)
-	{
-		$result = self::query('SELECT SCOPE_IDENTITY()');
-		return (int)$result->fetchColumn();
-	}
-	
-	public function quoteIdentifier($text)
-	{
-		return '[' . $text . ']';
-	}
-	
-	public function useQuoteIdentifier()
-	{
-		return true;
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/logger/BasicLogger.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/logger/BasicLogger.php
deleted file mode 100644
index 556424a9e..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/logger/BasicLogger.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-/*
- *  $Id: BasicLogger.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-
-/**
- * This is a minimalistic interface that any logging class must implement for Propel.
- *
- * The API for this interface is based on the PEAR::Log interface.  It provides a simple
- * API that can be used by Propel independently of Log backend.
- *
- * PEAR::Log and perhaps the Log API was developed by Chuck Hagenbuch <chuck@horde.org>
- * and Jon Parise <jon@php.net>.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.logger
- */
-interface BasicLogger {
-
-	/**
-	 * A convenience function for logging an alert event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function alert($message);
-
-	/**
-	 * A convenience function for logging a critical event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function crit($message);
-
-	/**
-	 * A convenience function for logging an error event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function err($message);
-
-	/**
-	 * A convenience function for logging a warning event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function warning($message);
-	/**
-	 * A convenience function for logging an critical event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function notice($message);
-	/**
-	 * A convenience function for logging an critical event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function info($message);
-
-	/**
-	 * A convenience function for logging a debug event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function debug($message);
-
-	/**
-	 * Primary method to handle logging.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 * @param      int     $severity   The numeric severity.  Defaults to null so that no
-	 *                              assumptions are made about the logging backend.
-	 */
-	public function log($message, $severity = null);
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/logger/MojaviLogAdapter.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/logger/MojaviLogAdapter.php
deleted file mode 100644
index f60908257..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/logger/MojaviLogAdapter.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-/*
- *  $Id: MojaviLogAdapter.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * Mojavi logging adapter for propel
- *
- * @author     Brandon Keepers <brandon@opensoul.org>
- * @version    $Revision: 1262 $
- * @package    propel.logger
- */
-class MojaviLogAdapter implements BasicLogger {
-
-	/**
-	 * Instance of mojavi logger
-	 */
-	private $logger = null;
-
-	/**
-	 * constructor for setting up Mojavi log adapter
-	 *
-	 * @param      ErrorLog   $logger   instance of Mojavi error log obtained by
-	 *                               calling LogManager::getLogger();
-	 */
-	public function __construct($logger = null)
-	{
-		$this->logger = $logger;
-	}
-
-	/**
-	 * A convenience function for logging an alert event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function alert($message)
-	{
-		$this->log($message, 'alert');
-	}
-
-	/**
-	 * A convenience function for logging a critical event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function crit($message)
-	{
-		$this->log($message, 'crit');
-	}
-
-	/**
-	 * A convenience function for logging an error event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function err($message)
-	{
-		$this->log($message, 'err');
-	}
-
-	/**
-	 * A convenience function for logging a warning event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function warning($message)
-	{
-		$this->log($message, 'warning');
-	}
-
-
-	/**
-	 * A convenience function for logging an critical event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function notice($message)
-	{
-		$this->log($message, 'notice');
-	}
-	/**
-	 * A convenience function for logging an critical event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function info($message)
-	{
-		$this->log($message, 'info');
-	}
-
-	/**
-	 * A convenience function for logging a debug event.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 */
-	public function debug($message)
-	{
-		$this->log($message, 'debug');
-	}
-
-	/**
-	 * Primary method to handle logging.
-	 *
-	 * @param      mixed   $message    String or Exception object containing the message
-	 *                              to log.
-	 * @param      int     $severity   The numeric severity.  Defaults to null so that no
-	 *                              assumptions are made about the logging backend.
-	 */
-	public function log($message, $severity = null)
-	{
-		if (is_null($this->logger))
-			$this->logger = LogManager::getLogger('propel');
-
-		switch($severity)
-		{
-			case 'crit':
-				$method = 'fatal';
-				break;
-			case 'err':
-				$method = 'error';
-				break;
-			case 'alert':
-			case 'warning':
-				$method = 'warning';
-				break;
-			case 'notice':
-			case 'info':
-				$method = 'info';
-				break;
-			case 'debug':
-			default:
-				$method = 'debug';
-		}
-
-		// get a backtrace to pass class, function, file, & line to Mojavi logger
-		$trace = debug_backtrace();
-
-		// call the appropriate Mojavi logger method
-		$this->logger->{$method} (
-			$message,
-			$trace[2]['class'],
-			$trace[2]['function'],
-			$trace[1]['file'],
-			$trace[1]['line']
-			);
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/map/ColumnMap.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/map/ColumnMap.php
deleted file mode 100644
index 25aed6e6f..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/map/ColumnMap.php
+++ /dev/null
@@ -1,475 +0,0 @@
-<?php
-
-/*
- *  $Id: ColumnMap.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * ColumnMap is used to model a column of a table in a database.
- *
- * GENERAL NOTE
- * ------------
- * The propel.map classes are abstract building-block classes for modeling
- * the database at runtime.  These classes are similar (a lite version) to the
- * propel.engine.database.model classes, which are build-time modeling classes.
- * These classes in themselves do not do any database metadata lookups.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     John D. McNally <jmcnally@collab.net> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.map
- */
-class ColumnMap {
-
-  // Propel type of the column
-  protected $type;
-
-  // Size of the column
-  protected $size = 0;
-
-  // Is it a primary key?
-  protected $pk = false;
-
-  // Is null value allowed?
-  protected $notNull = false;
-
-  // The default value for this column
-  protected $defaultValue;
-
-  // Name of the table that this column is related to
-  protected $relatedTableName = "";
-
-  // Name of the column that this column is related to
-  protected $relatedColumnName = "";
-
-  // The TableMap for this column
-  protected $table;
-
-  // The name of the column
-  protected $columnName;
-
-  // The php name of the column
-  protected $phpName;
-
-  // The validators for this column
-  protected $validators = array();
-
-  /**
-   * Constructor.
-   *
-   * @param      string $name The name of the column.
-   * @param      TableMap containingTable TableMap of the table this column is in.
-   */
-  public function __construct($name, TableMap $containingTable)
-  {
-    $this->columnName = $name;
-    $this->table = $containingTable;
-  }
-
-  /**
-   * Get the name of a column.
-   *
-   * @return     string A String with the column name.
-   */
-  public function getName()
-  {
-    return $this->columnName;
-  }
-
-  /**
-   * Get the table map this column belongs to.
-   * @return     TableMap
-   */
-  public function getTable()
-  {
-    return $this->table;
-  }
-
-  /**
-   * Get the name of the table this column is in.
-   *
-   * @return     string A String with the table name.
-   */
-  public function getTableName()
-  {
-    return $this->table->getName();
-  }
-  
-  /**
-   * Get the table name + column name.
-   *
-   * @return     string A String with the full column name.
-   */
-  public function getFullyQualifiedName()
-  {
-    return $this->getTableName() . "." . $this->columnName;
-  }
-
-  /**
-   * Set the php anme of this column.
-   *
-   * @param      string $phpName A string representing the PHP name.
-   * @return     void
-   */
-  public function setPhpName($phpName)
-  {
-    $this->phpName = $phpName;
-  }
-  
-  /**
-   * Get the name of a column.
-   *
-   * @return     string A String with the column name.
-   */
-  public function getPhpName()
-  {
-    return $this->phpName;
-  }
-  
-  /**
-   * Set the Propel type of this column.
-   *
-   * @param      string $type A string representing the Propel type (e.g. PropelColumnTypes::DATE).
-   * @return     void
-   */
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-  
-  /**
-   * Get the Propel type of this column.
-   *
-   * @return     string A string representing the Propel type (e.g. PropelColumnTypes::DATE).
-   */
-  public function getType()
-  {
-    return $this->type;
-  }
-
-  /**
-   * Get the PDO type of this column.
-   *
-   * @return     int The PDO::PARMA_* value
-   */
-  public function getPdoType()
-  {
-    return PropelColumnTypes::getPdoType($this->type);
-  }
-
-  /**
-   * Whether this is a BLOB, LONGVARBINARY, or VARBINARY.
-   * @return     boolean
-   */
-  public function isLob()
-  {
-    return ($this->type == PropelColumnTypes::BLOB || $this->type == PropelColumnTypes::VARBINARY || $this->type == PropelColumnTypes::LONGVARBINARY);
-  }
-
-  /**
-   * Whether this is a DATE/TIME/TIMESTAMP column.
-   *
-   * @return     boolean
-   * @since      1.3
-   */
-  public function isTemporal()
-  {
-    return ($this->type == PropelColumnTypes::TIMESTAMP || $this->type == PropelColumnTypes::DATE || $this->type == PropelColumnTypes::TIME || $this->type == PropelColumnTypes::BU_DATE  || $this->type == PropelColumnTypes::BU_TIMESTAMP);
-  }
-  
-  /**
-   * Whether this is a DATE/TIME/TIMESTAMP column that is post-epoch (1970).
-   *
-   * PHP cannot handle pre-epoch timestamps well -- hence the need to differentiate
-   * between epoch and pre-epoch timestamps.
-   *
-   * @return     boolean
-   * @deprecated Propel supports non-epoch dates
-   */
-  public function isEpochTemporal()
-  {
-    return ($this->type == PropelColumnTypes::TIMESTAMP || $this->type == PropelColumnTypes::DATE || $this->type == PropelColumnTypes::TIME);
-  }
-
-  /**
-   * Whether this column is numeric (int, decimal, bigint etc).
-   * @return     boolean
-   */
-  public function isNumeric()
-  {
-    return ($this->type == PropelColumnTypes::NUMERIC || $this->type == PropelColumnTypes::DECIMAL || $this->type == PropelColumnTypes::TINYINT || $this->type == PropelColumnTypes::SMALLINT || $this->type == PropelColumnTypes::INTEGER || $this->type == PropelColumnTypes::BIGINT || $this->type == PropelColumnTypes::REAL || $this->type == PropelColumnTypes::FLOAT || $this->type == PropelColumnTypes::DOUBLE);
-  }
-
-  /**
-   * Whether this column is a text column (varchar, char, longvarchar).
-   * @return     boolean
-   */
-  public function isText()
-  {
-    return ($this->type == PropelColumnTypes::VARCHAR || $this->type == PropelColumnTypes::LONGVARCHAR || $this->type == PropelColumnTypes::CHAR);
-  }
-
-  /**
-   * Set the size of this column.
-   *
-   * @param      int $size An int specifying the size.
-   * @return     void
-   */
-  public function setSize($size)
-  {
-    $this->size = $size;
-  }
-  
-  /**
-   * Get the size of this column.
-   *
-   * @return     int An int specifying the size.
-   */
-  public function getSize()
-  {
-    return $this->size;
-  }
-
-  /**
-   * Set if this column is a primary key or not.
-   *
-   * @param      boolean $pk True if column is a primary key.
-   * @return     void
-   */
-  public function setPrimaryKey($pk)
-  {
-    $this->pk = $pk;
-  }
-  
-  /**
-   * Is this column a primary key?
-   *
-   * @return     boolean True if column is a primary key.
-   */
-  public function isPrimaryKey()
-  {
-    return $this->pk;
-  }
-
-  /**
-   * Set if this column may be null.
-   *
-   * @param      boolean nn True if column may be null.
-   * @return     void
-   */
-  public function setNotNull($nn)
-  {
-    $this->notNull = $nn;
-  }
-  
-  /**
-   * Is null value allowed ?
-   *
-   * @return     boolean True if column may not be null.
-   */
-  public function isNotNull()
-  {
-    return ($this->notNull || $this->isPrimaryKey());
-  }
-
-  /**
-   * Sets the default value for this column.
-   * @param      mixed $defaultValue the default value for the column
-   * @return     void
-   */
-  public function setDefaultValue($defaultValue)
-  {
-    $this->defaultValue = $defaultValue;
-  }
-  
-  /**
-   * Gets the default value for this column.
-   * @return     mixed String or NULL
-   */
-  public function getDefaultValue()
-  {
-    return $this->defaultValue;
-  }
-
-  /**
-   * Set the foreign key for this column.
-   *
-   * @param      string tableName The name of the table that is foreign.
-   * @param      string columnName The name of the column that is foreign.
-   * @return     void
-   */
-  public function setForeignKey($tableName, $columnName)
-  {
-    if ($tableName && $columnName) {
-      $this->relatedTableName = $tableName;
-      $this->relatedColumnName = $columnName;
-    } else {
-      $this->relatedTableName = "";
-      $this->relatedColumnName = "";
-    }
-  }
-
-  /**
-   * Is this column a foreign key?
-   *
-   * @return     boolean True if column is a foreign key.
-   */
-  public function isForeignKey()
-  {
-    if ($this->relatedTableName) {
-      return true;
-    } else {
-      return false;
-    }
-  }
-  
-  /**
-   * Get the RelationMap object for this foreign key
-   */
-  public function getRelation()
-  {
-    if(!$this->relatedTableName) return null;
-    foreach ($this->getTable()->getRelations() as $name => $relation)
-    {
-      if($relation->getType() == RelationMap::MANY_TO_ONE)
-      {
-        if ($relation->getForeignTable()->getName() == $this->getRelatedTableName()
-         && array_key_exists($this->getFullyQualifiedName(), $relation->getColumnMappings()))
-        {
-          return $relation;
-        }
-      }
-    }
-  }
-  
-  /**
-   * Get the table.column that this column is related to.
-   *
-   * @return     string A String with the full name for the related column.
-   */
-  public function getRelatedName()
-  {
-    return $this->relatedTableName . "." . $this->relatedColumnName;
-  }
-
-  /**
-   * Get the table name that this column is related to.
-   *
-   * @return     string A String with the name for the related table.
-   */
-  public function getRelatedTableName()
-  {
-    return $this->relatedTableName;
-  }
-
-  /**
-   * Get the column name that this column is related to.
-   *
-   * @return     string A String with the name for the related column.
-   */
-  public function getRelatedColumnName()
-  {
-    return $this->relatedColumnName;
-  }
-  
-  /**
-   * Get the TableMap object that this column is related to.
-   *
-   * @return     TableMap The related TableMap object
-   * @throws     PropelException when called on a column with no foreign key
-   */
-  public function getRelatedTable()
-  {
-    if ($this->relatedTableName) {
-      return $this->table->getDatabaseMap()->getTable($this->relatedTableName);
-    } else {
-      throw new PropelException("Cannot fetch RelatedTable for column with no foreign key: " . $this->columnName);
-    }
-  }
-  
-  /**
-   * Get the TableMap object that this column is related to.
-   *
-   * @return     ColumnMap The related ColumnMap object
-   * @throws     PropelException when called on a column with no foreign key
-   */
-  public function getRelatedColumn()
-  {
-    return $this->getRelatedTable()->getColumn($this->relatedColumnName);
-  }
-
-  public function addValidator($validator)
-  {
-    $this->validators[] = $validator;
-  }
-
-  public function hasValidators()
-  {
-    return count($this->validators) > 0;
-  }
-
-  public function getValidators()
-  {
-    return $this->validators;
-  }
-  
-  /**
-   * Performs DB-specific ignore case, but only if the column type necessitates it.
-   * @param      string $str The expression we want to apply the ignore case formatting to (e.g. the column name).
-   * @param      DBAdapter $db
-   */
-  public function ignoreCase($str, DBAdapter $db)
-  {
-    if ($this->isText()) {
-      return $db->ignoreCase($str);
-    } else {
-      return $str;
-    }
-  }
-  
-  /**
-   * Normalizes the column name, removing table prefix and uppercasing.
-   *
-   * article.first_name becomes FIRST_NAME
-   *
-   * @param      string $name
-   * @return     string Normalized column name.
-   */
-  public static function normalizeName($name)
-  {
-    if (false !== ($pos = strpos($name, '.'))) {
-      $name = substr($name, $pos + 1);
-    }
-    $name = strtoupper($name);
-    return $name;
-  }
-  
-  // deprecated methods
-  
-  /**
-   * Gets column name
-   * @deprecated Use getName() instead
-   * @return     string
-   * @deprecated Use getName() instead.
-   */
-  public function getColumnName()
-  {
-    return $this->getName();
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/map/DatabaseMap.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/map/DatabaseMap.php
deleted file mode 100644
index 8e6de6c68..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/map/DatabaseMap.php
+++ /dev/null
@@ -1,200 +0,0 @@
-<?php
-
-/*
- *  $Id: DatabaseMap.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * DatabaseMap is used to model a database.
- *
- * GENERAL NOTE
- * ------------
- * The propel.map classes are abstract building-block classes for modeling
- * the database at runtime.  These classes are similar (a lite version) to the
- * propel.engine.database.model classes, which are build-time modeling classes.
- * These classes in themselves do not do any database metadata lookups.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     John D. McNally <jmcnally@collab.net> (Torque)
- * @author     Daniel Rall <dlr@collab.net> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.map
- */
-class DatabaseMap
-{
-
-  /** @var string Name of the database. */
-  protected $name;
-
-  /** @var array TableMap[] Tables in the database, using table name as key */ 
-  protected $tables = array();
-  
-  /** @var array TableMap[] Tables in the database, using table phpName as key */
-  protected $tablesByPhpName = array();
-
-  /**
-   * Constructor.
-   *
-   * @param      string $name Name of the database.
-   */
-  public function __construct($name)
-  {
-    $this->name = $name;
-  }
-  
-  /**
-   * Get the name of this database.
-   *
-   * @return     string The name of the database.
-   */
-  public function getName()
-  {
-    return $this->name;
-  }
-  
-  /**
-   * Add a new table to the database by name.
-   *
-   * @param      string $tableName The name of the table.
-   * @return     TableMap The newly created TableMap.
-   */
-  public function addTable($tableName)
-  {
-    $this->tables[$tableName] = new TableMap($tableName, $this);
-    return $this->tables[$tableName];
-  }
-  
-  /**
-   * Add a new table object to the database.
-   *
-   * @param      TableMap $table The table to add
-   */
-  public function addTableObject(TableMap $table)
-  {
-    $table->setDatabaseMap($this);
-    $this->tables[$table->getName()] = $table;
-    $this->tablesByPhpName[$table->getPhpName()] = $table;
-  }
-  
-  /**
-   * Add a new table to the database, using the tablemap class name.
-   *
-   * @param      string $tableMapClass The name of the table map to add
-   * @return     TableMap The TableMap object
-   */
-  public function addTableFromMapClass($tableMapClass)
-  {
-    $table = new $tableMapClass();
-    if(!$this->hasTable($table->getName())) {
-      $this->addTableObject($table);
-      return $table;
-    } else {
-      return $this->getTable($table->getName());
-    }
-  }
-  
-  /**
-   * Does this database contain this specific table?
-   *
-   * @param      string $name The String representation of the table.
-   * @return     boolean True if the database contains the table.
-   */
-  public function hasTable($name)
-  {
-    if ( strpos($name, '.') > 0) {
-      $name = substr($name, 0, strpos($name, '.'));
-    }
-    return isset($this->tables[$name]);
-  }
-
-  /**
-   * Get a TableMap for the table by name.
-   *
-   * @param      string $name Name of the table.
-   * @return     TableMap A TableMap
-   * @throws     PropelException if the table is undefined
-   */
-  public function getTable($name)
-  {
-    if (!isset($this->tables[$name])) {
-      throw new PropelException("Cannot fetch TableMap for undefined table: " . $name );
-    }
-    return $this->tables[$name];
-  }
-
-  /**
-   * Get a TableMap[] of all of the tables in the database.
-   *
-   * @return     array A TableMap[].
-   */
-  public function getTables()
-  {
-    return $this->tables;
-  }
-
-  /**
-   * Get a ColumnMap for the column by name.
-   * Name must be fully qualified, e.g. book.AUTHOR_ID
-   *
-   * @param      $qualifiedColumnName Name of the column.
-   * @return     ColumnMap A TableMap
-   * @throws     PropelException if the table is undefined, or if the table is undefined
-   */  
-  public function getColumn($qualifiedColumnName)
-  {
-    list($tableName, $columnName) = explode('.', $qualifiedColumnName);
-    return $this->getTable($tableName)->getColumn($columnName, false);
-  }
-  
-  // deprecated methods
-  
-  /**
-   * Does this database contain this specific table?
-   *
-   * @deprecated Use hasTable() instead
-   * @param      string $name The String representation of the table.
-   * @return     boolean True if the database contains the table.
-   */
-  public function containsTable($name)
-  {
-    return $this->hasTable($name);
-  }
-  
-  public function getTableByPhpName($phpName)
-  {
-    if (array_key_exists($phpName, $this->tablesByPhpName)) {
-      return $this->tablesByPhpName[$phpName];
-    } else if (class_exists($tmClass = $phpName . 'TableMap')) {
-      $this->addTableFromMapClass($tmClass);
-      return $this->tablesByPhpName[$phpName];
-    } else {
-      throw new PropelException("Cannot fetch TableMap for undefined table phpName: " . $phpName);
-    }
-  }
-  
-  /** 
-   * Convenience method to get the DBAdapter registered with Propel for this database. 
-   * @return  DBAdapter
-   * @see     Propel::getDB(string) 
-   */ 
-  public function getDBAdapter() 
-  { 
-    return Propel::getDB($this->name); 
-  }  
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/map/RelationMap.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/map/RelationMap.php
deleted file mode 100644
index d24c57667..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/map/RelationMap.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-
-/*
- *  $Id: RelationMap.php 1153 2009-09-20 18:08:53Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * RelationMap is used to model a database relationship.
- *
- * GENERAL NOTE
- * ------------
- * The propel.map classes are abstract building-block classes for modeling
- * the database at runtime.  These classes are similar (a lite version) to the
- * propel.engine.database.model classes, which are build-time modeling classes.
- * These classes in themselves do not do any database metadata lookups.
- *
- * @author     Francois Zaninotto
- * @version    $Revision: 1153 $
- * @package    propel.map
- */
-class RelationMap {
-
-  const
-    MANY_TO_ONE = 1,
-    ONE_TO_MANY = 2,
-    ONE_TO_ONE = 3;
-    
-  protected 
-    $name,
-    $type,
-    $localTable,
-    $foreignTable,
-    $localColumns = array(),
-    $foreignColumns = array(),
-    $onUpdate, $onDelete;
-
-  /**
-   * Constructor.
-   *
-   * @param      string $name Name of the database.
-   */
-  public function __construct($name)
-  {
-    $this->name = $name;
-  }
-  
-  /**
-   * Get the name of this database.
-   *
-   * @return     string The name of the database.
-   */
-  public function getName()
-  {
-    return $this->name;
-  }
-
-  /**
-   * Set the type
-   *
-   * @param      integer $type The relation type (either self::HAS_ONE, or self::HAS_MANY)
-   */
-  public function setType($type)
-  {
-    $this->type = $type;
-  }
-
-  /**
-   * Get the type
-   *
-   * @return      integer the relation type
-   */
-  public function getType()
-  {
-    return $this->type;
-  }
-
-  /**
-   * Set the local table
-   *
-   * @param      TableMap $table The local table for this relationship
-   */
-  public function setLocalTable($table)
-  {
-    $this->localTable = $table;
-  }
-
-  /**
-   * Get the local table
-   *
-   * @return      TableMap The local table for this relationship
-   */
-  public function getLocalTable()
-  {
-    return $this->localTable;
-  }
-
-  /**
-   * Set the foreign table
-   *
-   * @param      TableMap $table The foreign table for this relationship
-   */
-  public function setForeignTable($table)
-  {
-    $this->foreignTable = $table;
-  }
-
-  /**
-   * Get the foreign table
-   *
-   * @return      TableMap The foreign table for this relationship
-   */
-  public function getForeignTable()
-  {
-    return $this->foreignTable;
-  }
-  
-  /**
-   * Add a column mapping
-   *
-   * @param   ColumnMap $local The local column
-   * @param   ColumnMap $foreign The foreign column
-   */
-  public function addColumnMapping(ColumnMap $local, ColumnMap $foreign)
-  {
-    $this->localColumns[] = $local;
-    $this->foreignColumns[] = $foreign;
-  }
-  
-  /**
-   * Get an associative array mapping local column names to foreign column names
-   *
-   * @return Array Associative array (local => foreign) of fully qualified column names
-   */
-  public function getColumnMappings()
-  {
-    $h = array();
-    for ($i=0, $size=count($this->localColumns); $i < $size; $i++) {
-      $h[$this->localColumns[$i]->getFullyQualifiedName()] = $this->foreignColumns[$i]->getFullyQualifiedName();
-    }
-    return $h;
-  }
-  
-  /**
-   * Get the local columns
-   *
-   * @return      Array list of ColumnMap objects
-   */
-  public function getLocalColumns()
-  {
-    return $this->localColumns;
-  }
-  
-  /**
-   * Get the foreign columns
-   *
-   * @return      Array list of ColumnMap objects
-   */
-  public function getForeignColumns()
-  {
-    return $this->foreignColumns;
-  }
-  
-  /**
-   * Set the onUpdate behavior
-   *
-   * @param      string $onUpdate
-   */
-  public function setOnUpdate($onUpdate)
-  {
-    $this->onUpdate = $onUpdate;
-  }
-
-  /**
-   * Get the onUpdate behavior
-   *
-   * @return      integer the relation type
-   */
-  public function getOnUpdate()
-  {
-    return $this->onUpdate;
-  }
-  
-  /**
-   * Set the onDelete behavior
-   *
-   * @param      string $onDelete
-   */
-  public function setOnDelete($onDelete)
-  {
-    $this->onDelete = $onDelete;
-  }
-
-  /**
-   * Get the onDelete behavior
-   *
-   * @return      integer the relation type
-   */
-  public function getOnDelete()
-  {
-    return $this->onDelete;
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/map/TableMap.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/map/TableMap.php
deleted file mode 100644
index 2306b6f7d..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/map/TableMap.php
+++ /dev/null
@@ -1,654 +0,0 @@
-<?php
-/*
- *  $Id: TableMap.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * TableMap is used to model a table in a database.
- *
- * GENERAL NOTE
- * ------------
- * The propel.map classes are abstract building-block classes for modeling
- * the database at runtime.  These classes are similar (a lite version) to the
- * propel.engine.database.model classes, which are build-time modeling classes.
- * These classes in themselves do not do any database metadata lookups.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     John D. McNally <jmcnally@collab.net> (Torque)
- * @author     Daniel Rall <dlr@finemaltcoding.com> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.map
- */
-class TableMap {
-
-  // The columns in the table
-  protected $columns = array();
-
-  // The database this table belongs to
-  protected $dbMap;
-
-  // The name of the table
-  protected $tableName;
-
-  // The PHP name of the table
-  protected $phpName;
-
-  // The Classname for this table
-  protected $classname;
-
-  // The Package for this table
-  protected $package;
-  
-  // Whether to use an id generator for pkey
-  protected $useIdGenerator;
-  
-  // The primary key columns in the table
-  protected $primaryKeys = array();
-  
-  // The foreign key columns in the table
-  protected $foreignKeys = array();
-
-  // The relationships in the table
-  protected $relations = array();
-
-  // Relations are lazy loaded. This property tells if the relations are loaded or not
-  protected $relationsBuilt = false;
-  
-  // Object to store information that is needed if the for generating primary keys
-  protected $pkInfo;
-  
-  /**
-   * Construct a new TableMap.
-   *
-   */
-  public function __construct($name = null, $dbMap = null)
-  {
-    if(!is_null($name)) $this->setName($name);
-    if(!is_null($dbMap)) $this->setDatabaseMap($dbMap);
-    $this->initialize();
-  }
-  
-  /**
-   * Initialize the TableMap to build columns, relations, etc
-   * This method should be overridden by descendents
-   */
-  public function initialize()
-  {
-  }
-
-  /**
-   * Set the DatabaseMap containing this TableMap.
-   *
-   * @param     DatabaseMap $dbMap A DatabaseMap.
-   */
-  public function setDatabaseMap(DatabaseMap $dbMap)
-  {
-    $this->dbMap = $dbMap;
-  }
-  
-  /**
-   * Get the DatabaseMap containing this TableMap.
-   *
-   * @return     DatabaseMap A DatabaseMap.
-   */
-  public function getDatabaseMap()
-  {
-    return $this->dbMap;
-  }
-
-  /**
-   * Set the name of the Table.
-   *
-   * @param      string $name The name of the table.
-   */
-  public function setName($name)
-  {
-    $this->tableName = $name;
-  }
-  
-  /**
-   * Get the name of the Table.
-   *
-   * @return     string A String with the name of the table.
-   */
-  public function getName()
-  {
-    return $this->tableName;
-  }
-
-  /**
-   * Set the PHP name of the Table.
-   *
-   * @param      string $phpName The PHP Name for this table
-   */
-  public function setPhpName($phpName)
-  {
-    $this->phpName = $phpName;
-  }
-  
-  /**
-   * Get the PHP name of the Table.
-   *
-   * @return     string A String with the name of the table.
-   */
-  public function getPhpName()
-  {
-    return $this->phpName;
-  }
-
-  /**
-   * Set the Classname of the Table. Could be useful for calling
-   * Peer and Object methods dynamically.
-   * @param      string $classname The Classname
-   */
-  public function setClassname($classname)
-  {
-    $this->classname = $classname;
-  }
-
-  /**
-   * Get the Classname of the Propel-Classes belonging to this table.
-   * @return     string
-   */
-  public function getClassname()
-  {
-    return $this->classname;
-  }
-  
-  /**
-   * Set the Package of the Table
-   *
-   * @param      string $package The Package
-   */
-  public function setPackage($package)
-  {
-    $this->package = $package;
-  }
-
-  /**
-   * Get the Package of the table.
-   * @return     string
-   */
-  public function getPackage()
-  {
-    return $this->package;
-  }
-    
-  /**
-   * Set whether or not to use Id generator for primary key.
-   * @param      boolean $bit
-   */
-  public function setUseIdGenerator($bit)
-  {
-    $this->useIdGenerator = $bit;
-  }
-
-  /**
-   * Whether to use Id generator for primary key.
-   * @return     boolean
-   */
-  public function isUseIdGenerator()
-  {
-    return $this->useIdGenerator;
-  }
-
-  /**
-   * Sets the pk information needed to generate a key
-   *
-   * @param      $pkInfo information needed to generate a key
-   */
-  public function setPrimaryKeyMethodInfo($pkInfo)
-  {
-    $this->pkInfo = $pkInfo;
-  }
-  
-  /**
-   * Get the information used to generate a primary key
-   *
-   * @return     An Object.
-   */
-  public function getPrimaryKeyMethodInfo()
-  {
-    return $this->pkInfo;
-  }
-
-  /**
-   * Add a column to the table.
-   *
-   * @param      string name A String with the column name.
-   * @param      string $type A string specifying the Propel type.
-   * @param      boolean $isNotNull Whether column does not allow NULL values.
-   * @param      int $size An int specifying the size.
-   * @param      boolean $pk True if column is a primary key.
-   * @param      string $fkTable A String with the foreign key table name.
-   * @param      $fkColumn A String with the foreign key column name.
-   * @param      string $defaultValue The default value for this column.
-   * @return     ColumnMap The newly created column.
-   */
-  public function addColumn($name, $phpName, $type, $isNotNull = false, $size = null, $defaultValue = null, $pk = false, $fkTable = null, $fkColumn = null)
-  {
-
-    $col = new ColumnMap($name, $this);
-
-    if ($fkTable && $fkColumn) {
-      if (strpos($fkColumn, '.') > 0 && strpos($fkColumn, $fkTable) !== false) {
-        $fkColumn = substr($fkColumn, strlen($fkTable) + 1);
-      }
-      $col->setForeignKey($fkTable, $fkColumn);
-      $this->foreignKeys[$name] = $col;
-    }
-
-    $col->setType($type);
-    $col->setSize($size);
-    $col->setPhpName($phpName);
-    $col->setNotNull($isNotNull);
-    $col->setDefaultValue($defaultValue);
-    if ($pk) {
-      $col->setPrimaryKey(true);
-      $this->primaryKeys[$name] = $col;
-    }
-    $this->columns[$name] = $col;
-
-    return $this->columns[$name];
-  }
-  
-  /**
-   * Add a pre-created column to this table. It will replace any
-   * existing column.
-   *
-   * @param      ColumnMap $cmap A ColumnMap.
-   * @return     ColumnMap The added column map.
-   */
-  public function addConfiguredColumn($cmap)
-  {
-    $this->columns[ $cmap->getColumnName() ] = $cmap;
-    return $cmap;
-  }
-  
-  /**
-   * Does this table contain the specified column?
-   *
-   * @param      mixed   $name name of the column or ColumnMap instance
-   * @param      boolean $normalize Normalize the column name (if column name not like FIRST_NAME)
-   * @return     boolean True if the table contains the column.
-   */
-  public function hasColumn($name, $normalize = true)
-  {
-    if ($name instanceof ColumnMap) {
-      $name = $name->getColumnName();
-    } else if($normalize) {
-      $name = ColumnMap::normalizeName($name);
-    }
-    return isset($this->columns[$name]);
-  }
-  
-  /**
-   * Get a ColumnMap for the named table.
-   *
-   * @param      string    $name A String with the name of the table.
-   * @param      boolean   $normalize Normalize the column name (if column name not like FIRST_NAME)
-   * @return     ColumnMap A ColumnMap.
-   * @throws     PropelException if the column is undefined
-   */
-  public function getColumn($name, $normalize = true)
-  {
-    if ($normalize) {
-      $name = ColumnMap::normalizeName($name);
-    }
-    if (!$this->containsColumn($name, false)) {
-      throw new PropelException("Cannot fetch ColumnMap for undefined column: " . $name);
-    }
-    return $this->columns[$name];
-  }
-  
-  /**
-   * Get a ColumnMap[] of the columns in this table.
-   *
-   * @return     array A ColumnMap[].
-   */
-  public function getColumns()
-  {
-    return $this->columns;
-  }
-
-  /**
-   * Add a primary key column to this Table.
-   *
-   * @param      string $columnName A String with the column name.
-   * @param      string $type A string specifying the Propel type.
-   * @param      boolean $isNotNull Whether column does not allow NULL values.
-   * @param      $size An int specifying the size.
-   * @return     ColumnMap Newly added PrimaryKey column.
-   */
-  public function addPrimaryKey($columnName, $phpName, $type, $isNotNull = false, $size = null, $defaultValue = null)
-  {
-    return $this->addColumn($columnName, $phpName, $type, $isNotNull, $size, $defaultValue, true, null, null);
-  }
-
-  /**
-   * Add a foreign key column to the table.
-   *
-   * @param      string $columnName A String with the column name.
-   * @param      string $type A string specifying the Propel type.
-   * @param      string $fkTable A String with the foreign key table name.
-   * @param      string $fkColumn A String with the foreign key column name.
-   * @param      boolean $isNotNull Whether column does not allow NULL values.
-   * @param      int $size An int specifying the size.
-   * @param      string $defaultValue The default value for this column.
-   * @return     ColumnMap Newly added ForeignKey column.
-   */
-  public function addForeignKey($columnName, $phpName, $type, $fkTable, $fkColumn, $isNotNull = false, $size = 0, $defaultValue = null)
-  {
-    return $this->addColumn($columnName, $phpName, $type, $isNotNull, $size, $defaultValue, false, $fkTable, $fkColumn);
-  }
-
-  /**
-   * Add a foreign primary key column to the table.
-   *
-   * @param      string $columnName A String with the column name.
-   * @param      string $type A string specifying the Propel type.
-   * @param      string $fkTable A String with the foreign key table name.
-   * @param      string $fkColumn A String with the foreign key column name.
-   * @param      boolean $isNotNull Whether column does not allow NULL values.
-   * @param      int $size An int specifying the size.
-   * @param      string $defaultValue The default value for this column.
-   * @return     ColumnMap Newly created foreign pkey column.
-   */
-  public function addForeignPrimaryKey($columnName, $phpName, $type, $fkTable, $fkColumn, $isNotNull = false, $size = 0, $defaultValue = null)
-  {
-    return $this->addColumn($columnName, $phpName, $type, $isNotNull, $size, $defaultValue, true, $fkTable, $fkColumn);
-  }
-  
-  /**
-   * Returns array of ColumnMap objects that make up the primary key for this table
-   *
-   * @return     array ColumnMap[]
-   */
-  public function getPrimaryKeys()
-  {
-    return $this->primaryKeys;
-  }
-  
-  /**
-   * Returns array of ColumnMap objects that are foreign keys for this table
-   *
-   * @return     array ColumnMap[]
-   */
-  public function getForeignKeys()
-  {
-    return $this->foreignKeys;
-  }
-
-  /**
-  * Add a validator to a table's column
-  *
-  * @param      string $columnName The name of the validator's column
-  * @param      string $name The rule name of this validator
-  * @param      string $classname The dot-path name of class to use (e.g. myapp.propel.MyValidator)
-  * @param      string $value
-  * @param      string $message The error message which is returned on invalid values
-  * @return     void
-  */
-  public function addValidator($columnName, $name, $classname, $value, $message)
-  {
-    if (false !== ($pos = strpos($columnName, '.'))) {
-      $columnName = substr($columnName, $pos + 1);
-    }
-
-    $col = $this->getColumn($columnName);
-    if ($col !== null) {
-      $validator = new ValidatorMap($col);
-      $validator->setName($name);
-      $validator->setClass($classname);
-      $validator->setValue($value);
-      $validator->setMessage($message);
-      $col->addValidator($validator);
-    }
-  }
-  
-  /**
-   * Build relations
-   * Relations are lazy loaded for performance reasons
-   * This method should be overridden by descendents
-   */
-  public function buildRelations()
-  {
-  }  
-  
-  /**
-   * Adds a RelationMap to the table
-   * 
-   * @param      string $name The relation name
-   * @param      string $tablePhpName The related table name
-   * @param      integer $type The relation type (either RelationMap::MANY_TO_ONE, RelationMap::ONE_TO_MANY, or RelationMAp::ONE_TO_ONE) 
-   * @param      array $columnMapping An associative array mapping column names (local => foreign)
-   * @return     RelationMap the built RelationMap object
-   */
-  public function addRelation($name, $tablePhpName, $type, $columnMapping = array(), $onDelete = null, $onUpdate = null)
-  {
-    // note: using phpName for the second table allows the use of DatabaseMap::getTableByPhpName()
-    // and this method autoloads the TableMap if the table isn't loaded yet
-    $relation = new RelationMap($name);
-    $relation->setType($type);
-    $relation->setOnUpdate($onUpdate);
-    $relation->setOnDelete($onDelete);
-    // set tables
-    if ($type == RelationMap::MANY_TO_ONE) {
-      $relation->setLocalTable($this);
-      $relation->setForeignTable($this->dbMap->getTableByPhpName($tablePhpName));
-    } else {
-      $relation->setLocalTable($this->dbMap->getTableByPhpName($tablePhpName));
-      $relation->setForeignTable($this);
-      $columnMapping  = array_flip($columnMapping);
-    }
-    // set columns
-    foreach ($columnMapping as $key => $value)
-    {
-      $relation->addColumnMapping(
-        $relation->getLocalTable()->getColumn($key),
-        $relation->getForeignTable()->getColumn($value)
-      );
-    }
-    $this->relations[$name] = $relation;
-    return $relation;
-  }
-
-  /**
-   * Gets a RelationMap of the table by relation name
-   *
-   * @param       String $name The relation name 
-   * @return      boolean true if the relation exists
-   */
-  public function hasRelation($name)
-  {
-    return array_key_exists($name, $this->getRelations());
-  }
-  
-  /**
-   * Gets a RelationMap of the table by relation name
-   *
-   * @param       String $name The relation name 
-   * @return      RelationMap The relation object
-   * @throws      PropelException When called on an inexistent relation
-   */
-  public function getRelation($name)
-  {
-    if (!array_key_exists($name, $this->getRelations()))
-    {
-      throw new PropelException('Calling getRelation() on an unknown relation, ' . $name);
-    }
-    return $this->relations[$name];
-  }
-
-  /**
-   * Gets the RelationMap objects of the table
-   * This method will build the relations if they are not built yet
-   * 
-   * @return      Array list of RelationMap objects
-   */
-  public function getRelations()
-  {
-    if(!$this->relationsBuilt)
-    {
-      $this->buildRelations();
-      $this->relationsBuilt = true;
-    }
-    return $this->relations;
-  }
-
-  /**
-   * 
-   * Gets the list of behaviors registered for this table
-   *
-   * @return array
-   */
-  public function getBehaviors()
-  {
-    return array();
-  }
-
-  // Deprecated methods and attributres, to be removed
-  
-  /**
-   * Does this table contain the specified column?
-   *
-   * @deprecated Use hasColumn instead
-   * @param      mixed   $name name of the column or ColumnMap instance
-   * @param      boolean $normalize Normalize the column name (if column name not like FIRST_NAME)
-   * @return     boolean True if the table contains the column.
-   */
-  public function containsColumn($name, $normalize = true)
-  {
-    return $this->hasColumn($name, $normalize);
-  }
-  
-  /**
-   * Normalizes the column name, removing table prefix and uppercasing.
-   * article.first_name becomes FIRST_NAME
-   *
-   * @deprecated Use ColumnMap::normalizeColumName() instead
-   * @param      string $name
-   * @return     string Normalized column name.
-   */
-  protected function normalizeColName($name)
-  {
-    return ColumnMap::normalizeName($name);
-  }
-  
-  /**
-   * Returns array of ColumnMap objects that make up the primary key for this table.
-   *
-   * @deprecated Use getPrimaryKeys instead
-   * @return     array ColumnMap[]
-   */
-  public function getPrimaryKeyColumns()
-  {
-    return array_values($this->primaryKeys);
-  }
-    
-  //---Utility methods for doing intelligent lookup of table names
-
-  /** 
-   * The prefix on the table name. 
-   * @deprecated Not used anywhere in Propel
-   */
-  private $prefix;
-
-  /**
-   * Get table prefix name.
-   *
-   * @deprecated Not used anywhere in Propel
-   * @return     string A String with the prefix.
-   */
-  public function getPrefix()
-  {
-    return $this->prefix;
-  }
-
-  /**
-   * Set table prefix name.
-   *
-   * @deprecated Not used anywhere in Propel
-   * @param      string $prefix The prefix for the table name (ie: SCARAB for
-   * SCARAB_PROJECT).
-   * @return     void
-   */
-  public function setPrefix($prefix)
-  {
-    $this->prefix = $prefix;
-  }
-  
-  /**
-   * Tell me if i have PREFIX in my string.
-   *
-   * @deprecated Not used anywhere in Propel
-   * @param      data A String.
-   * @return     boolean True if prefix is contained in data.
-   */
-  protected function hasPrefix($data)
-  {
-    return (strpos($data, $this->prefix) === 0);
-  }
-
-  /**
-   * Removes the PREFIX if found
-   *
-   * @deprecated Not used anywhere in Propel
-   * @param      string $data A String.
-   * @return     string A String with data, but with prefix removed.
-   */
-  protected function removePrefix($data)
-  {
-    return $this->hasPrefix($data) ? substr($data, strlen($this->prefix)) : $data;
-  }
-
-  /**
-   * Removes the PREFIX, removes the underscores and makes
-   * first letter caps.
-   *
-   * SCARAB_FOO_BAR becomes FooBar.
-   *
-   * @deprecated Not used anywhere in Propel. At buildtime, use Column::generatePhpName() for that purpose
-   * @param      data A String.
-   * @return     string A String with data processed.
-   */
-  public final function removeUnderScores($data)
-  {
-    $out = '';
-    $tmp = $this->removePrefix($data);
-    $tok = strtok($tmp, '_');
-    while ($tok) {
-      $out .= ucfirst($tok);
-      $tok = strtok('_');
-    }
-    return $out;
-  }
-
-  /**
-   * Makes the first letter caps and the rest lowercase.
-   *
-   * @deprecated Not used anywhere in Propel.
-   * @param      string $data A String.
-   * @return     string A String with data processed.
-   */
-  private function firstLetterCaps($data)
-  {
-    return(ucfirst(strtolower($data)));
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/map/ValidatorMap.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/map/ValidatorMap.php
deleted file mode 100644
index 84da6be1b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/map/ValidatorMap.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/*
- *  $Id: ValidatorMap.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * ValidatorMap is used to model a column validator.
- *
- * GENERAL NOTE
- * ------------
- * The propel.map classes are abstract building-block classes for modeling
- * the database at runtime.  These classes are similar (a lite version) to the
- * propel.engine.database.model classes, which are build-time modeling classes.
- * These classes in themselves do not do any database metadata lookups.
- *
- * @author     Michael Aichler <aichler@mediacluster.de>
- * @version    $Revision: 1262 $
- * @package    propel.map
- */
-class ValidatorMap
-{
-	/** rule name of this validator */
-	private $name;
-	/** the dot-path to class to use for validator */
-	private $classname;
-	/** value to check against */
-	private $value;
-	/** execption message thrown on invalid input */
-	private $message;
-	/** related column */
-	private $column;
-
-	public function __construct($containingColumn)
-	{
-		$this->column = $containingColumn;
-	}
-
-	public function getColumn()
-	{
-		return $this->column;
-	}
-
-	public function getColumnName()
-	{
-		return $this->column->getColumnName();
-	}
-
-	public function setName($name)
-	{
-		$this->name = $name;
-	}
-
-	public function setClass($classname)
-	{
-		$this->classname = $classname;
-	}
-
-	public function setValue($value)
-	{
-		$this->value = $value;
-	}
-
-	public function setMessage($message)
-	{
-		$this->message = $message;
-	}
-
-	public function getName()
-	{
-		return $this->name;
-	}
-
-	public function getClass()
-	{
-		return $this->classname;
-	}
-
-	public function getValue()
-	{
-		return $this->value;
-	}
-
-	public function getMessage()
-	{
-		return $this->message;
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/om/BaseObject.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/om/BaseObject.php
deleted file mode 100644
index 6bde9773c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/om/BaseObject.php
+++ /dev/null
@@ -1,266 +0,0 @@
-<?php
-
-/*
- *  $Id: BaseObject.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * This class contains attributes and methods that are used by all
- * business objects within the system.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Frank Y. Kim <frank.kim@clearink.com> (Torque)
- * @author     John D. McNally <jmcnally@collab.net> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.om
- */
-abstract class BaseObject {
-
-	/**
-	 * attribute to determine if this object has previously been saved.
-	 * @var        boolean
-	 */
-	private $_new = true;
-
-	/**
-	 * attribute to determine whether this object has been deleted.
-	 * @var        boolean
-	 */
-	private $_deleted = false;
-
-	/**
-	 * The columns that have been modified in current object.
-	 * Tracking modified columns allows us to only update modified columns.
-	 * @var        array
-	 */
-	protected $modifiedColumns = array();
-
-	/**
-	 * Empty constructor (this allows people with their own BaseObject implementation to use its constructor)
-	 */
-	public function __construct() {
-
-	}
-
-	/**
-	 * Returns whether the object has been modified.
-	 *
-	 * @return     boolean True if the object has been modified.
-	 */
-	public function isModified()
-	{
-		return !empty($this->modifiedColumns);
-	}
-
-	/**
-	 * Has specified column been modified?
-	 *
-	 * @param      string $col
-	 * @return     boolean True if $col has been modified.
-	 */
-	public function isColumnModified($col)
-	{
-		return in_array($col, $this->modifiedColumns);
-	}
-
-	/**
-	 * Get the columns that have been modified in this object.
-	 * @return     array A unique list of the modified column names for this object.
-	 */
-	public function getModifiedColumns()
-	{
-		return array_unique($this->modifiedColumns);
-	}
-
-	/**
-	 * Returns whether the object has ever been saved.  This will
-	 * be false, if the object was retrieved from storage or was created
-	 * and then saved.
-	 *
-	 * @return     true, if the object has never been persisted.
-	 */
-	public function isNew()
-	{
-		return $this->_new;
-	}
-
-	/**
-	 * Setter for the isNew attribute.  This method will be called
-	 * by Propel-generated children and Peers.
-	 *
-	 * @param      boolean $b the state of the object.
-	 */
-	public function setNew($b)
-	{
-		$this->_new = (boolean) $b;
-	}
-
-	/**
-	 * Whether this object has been deleted.
-	 * @return     boolean The deleted state of this object.
-	 */
-	public function isDeleted()
-	{
-		return $this->_deleted;
-	}
-
-	/**
-	 * Specify whether this object has been deleted.
-	 * @param      boolean $b The deleted state of this object.
-	 * @return     void
-	 */
-	public function setDeleted($b)
-	{
-		$this->_deleted = (boolean) $b;
-	}
-
-	/**
-	 * Code to be run before persisting the object
-	 * @param PropelPDO $con
-	 * @return bloolean
-	 */
-	public function preSave(PropelPDO $con = null)
-	{
-		return true;
-	}
-
-	/**
-	 * Code to be run after persisting the object
-	 * @param PropelPDO $con
-	 */
-	public function postSave(PropelPDO $con = null) { }
-
-	/**
-	 * Code to be run before inserting to database
-	 * @param PropelPDO $con
-	 * @return boolean
-	 */
-	public function preInsert(PropelPDO $con = null)
-	{
-		return true;
-	}
-	
-	/**
-	 * Code to be run after inserting to database
-	 * @param PropelPDO $con 
-	 */
-	public function postInsert(PropelPDO $con = null) { }
-
-	/**
-	 * Code to be run before updating the object in database
-	 * @param PropelPDO $con
-	 * @return boolean
-	 */
-	public function preUpdate(PropelPDO $con = null)
-	{
-		return true;
-	}
-
-	/**
-	 * Code to be run after updating the object in database
-	 * @param PropelPDO $con
-	 */
-	public function postUpdate(PropelPDO $con = null) { }
-
-	/**
-	 * Code to be run before deleting the object in database
-	 * @param PropelPDO $con
-	 * @return boolean
-	 */
-	public function preDelete(PropelPDO $con = null)
-	{
-		return true;
-	}
-
-	/**
-	 * Code to be run after deleting the object in database
-	 * @param PropelPDO $con
-	 */
-	public function postDelete(PropelPDO $con = null) { }
-	
-	/**
-	 * Sets the modified state for the object to be false.
-	 * @param      string $col If supplied, only the specified column is reset.
-	 * @return     void
-	 */
-	public function resetModified($col = null)
-	{
-		if ($col !== null)
-		{
-			while (($offset = array_search($col, $this->modifiedColumns)) !== false)
-				array_splice($this->modifiedColumns, $offset, 1);
-		}
-		else
-		{
-			$this->modifiedColumns = array();
-		}
-	}
-
-	/**
-	 * Compares this with another <code>BaseObject</code> instance.  If
-	 * <code>obj</code> is an instance of <code>BaseObject</code>, delegates to
-	 * <code>equals(BaseObject)</code>.  Otherwise, returns <code>false</code>.
-	 *
-	 * @param      obj The object to compare to.
-	 * @return     Whether equal to the object specified.
-	 */
-	public function equals($obj)
-	{
-		$thisclazz = get_class($this);
-		if (is_object($obj) && $obj instanceof $thisclazz) {
-			if ($this === $obj) {
-				return true;
-			} elseif ($this->getPrimaryKey() === null || $obj->getPrimaryKey() === null)  {
-				return false;
-			} else {
-				return ($this->getPrimaryKey() === $obj->getPrimaryKey());
-			}
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * If the primary key is not <code>null</code>, return the hashcode of the
-	 * primary key.  Otherwise calls <code>Object.hashCode()</code>.
-	 *
-	 * @return     int Hashcode
-	 */
-	public function hashCode()
-	{
-		$ok = $this->getPrimaryKey();
-		if ($ok === null) {
-			return crc32(serialize($this));
-		}
-		return crc32(serialize($ok)); // serialize because it could be an array ("ComboKey")
-	}
-
-	/**
-	 * Logs a message using Propel::log().
-	 *
-	 * @param      string $msg
-	 * @param      int $priority One of the Propel::LOG_* logging levels
-	 * @return     boolean
-	 */
-	protected function log($msg, $priority = Propel::LOG_INFO)
-	{
-		return Propel::log(get_class($this) . ': ' . $msg, $priority);
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/om/NestedSetRecursiveIterator.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/om/NestedSetRecursiveIterator.php
deleted file mode 100644
index 5e6f632d4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/om/NestedSetRecursiveIterator.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/*
- *  $Id: NestedSetRecursiveIterator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * Pre-order node iterator for Node objects.
- *
- * @author     Heltem <heltem@o2php.com>
- * @version    $Revision: 1262 $
- * @package    propel.om
- */
-class NestedSetRecursiveIterator implements RecursiveIterator
-{
-	protected $topNode = null;
-
-	protected $curNode = null;
-
-	public function __construct($node) {
-		$this->topNode = $node;
-		$this->curNode = $node;
-	}
-
-	public function rewind() {
-		$this->curNode = $this->topNode;
-	}
-
-	public function valid() {
-		return ($this->curNode !== null);
-	}
-
-	public function current() {
-		return $this->curNode;
-	}
-
-	public function key() {
-		$key = array();
-		foreach ($this->curNode->getPath() as $node) {
-			$key[] = $node->getPrimaryKey();
-		}
-		return implode('.', $key);
-	}
-
-	public function next() {
-		$nextNode = null;
-
-		if ($this->valid()) {
-			while (null === $nextNode) {
-				if (null === $this->curNode) {
-					break;
-				}
-
-				if ($this->curNode->hasNextSibling()) {
-					$nextNode = $this->curNode->retrieveNextSibling();
-				} else {
-					break;
-				}
-			}
-			$this->curNode = $nextNode;
-		}
-		return $this->curNode;
-	}
-
-	public function hasChildren() {
-		return $this->curNode->hasChildren();
-	}
-
-	public function getChildren() {
-		return new NestedSetRecursiveIterator($this->curNode->retrieveFirstChild());
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/om/NodeObject.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/om/NodeObject.php
deleted file mode 100644
index 4b5a61acb..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/om/NodeObject.php
+++ /dev/null
@@ -1,334 +0,0 @@
-<?php
-/*
- *  $Id: NodeObject.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * This interface defines methods that must be implemented by all
- * business objects within the system to handle Node object.
- *
- * @author     Heltem <heltem@o2php.com> (Propel)
- * @version    $Revision: 1262 $
- * @package    propel.om
- */
-interface NodeObject extends IteratorAggregate {
-	/**
-	 * If object is saved without left/right values, set them as undefined (0)
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     void
-	 * @throws     PropelException
-	 */
-	public function save(PropelPDO $con = null);
-
-	/**
-	 * Delete node and descendants
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     void
-	 * @throws     PropelException
-	 */
-	public function delete(PropelPDO $con = null);
-
-	/**
-	 * Sets node properties to make it a root node.
-	 *
-	 * @return     object The current object (for fluent API support)
-	 * @throws     PropelException
-	 */
-	public function makeRoot();
-
-	/**
-	 * Gets the level if set, otherwise calculates this and returns it
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     int
-	 */
-	public function getLevel(PropelPDO $con = null);
-
-	/**
-	 * Get the path to the node in the tree
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     array
-	 */
-	public function getPath(PropelPDO $con = null);
-
-	/**
-	 * Gets the number of children for the node (direct descendants)
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     int
-	 */
-	public function getNumberOfChildren(PropelPDO $con = null);
-
-	/**
-	 * Gets the total number of desceandants for the node
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     int
-	 */
-	public function getNumberOfDescendants(PropelPDO $con = null);
-
-	/**
-	 * Gets the children for the node
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     array
-	 */
-	public function getChildren(PropelPDO $con = null);
-
-	/**
-	 * Gets the descendants for the node
-	 *
-	 * @param      PropelPDO $con	Connection to use.
- 	 * @return     array
-	 */
-	public function getDescendants(PropelPDO $con = null);
-
-	/**
-	 * Sets the level of the node in the tree
-	 *
-	 * @param      int $v new value
-	 * @return     object The current object (for fluent API support)
-	 */
-	public function setLevel($level);
-
-	/**
-	 * Sets the children array of the node in the tree
-	 *
-	 * @param      array of Node $children	array of Propel node object
-	 * @return     object The current object (for fluent API support)
-	 */
-	public function setChildren(array $children);
-
-	/**
-	 * Sets the parentNode of the node in the tree
-	 *
-	 * @param      Node $parent Propel node object
-	 * @return     object The current object (for fluent API support)
-	 */
-	public function setParentNode(NodeObject $parent = null);
-
-	/**
-	 * Sets the previous sibling of the node in the tree
-	 *
-	 * @param      Node $node Propel node object
-	 * @return     object The current object (for fluent API support)
-	 */
-	public function setPrevSibling(NodeObject $node = null);
-
-	/**
-	 * Sets the next sibling of the node in the tree
-	 *
-	 * @param      Node $node Propel node object
-	 * @return     object The current object (for fluent API support)
-	 */
-	public function setNextSibling(NodeObject $node = null);
-
-	/**
-	 * Determines if the node is the root node
-	 *
-	 * @return     bool
-	 */
-	public function isRoot();
-
-	/**
-	 * Determines if the node is a leaf node
-	 *
-	 * @return     bool
-	 */
-	public function isLeaf();
-
-	/**
-	 * Tests if object is equal to $node
-	 *
-	 * @param      object $node	Propel object for node to compare to
-	 * @return     bool
-	 */
-	public function isEqualTo(NodeObject $node);
-
-	/**
-	 * Tests if object has an ancestor
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     bool
-	 */
-	public function hasParent(PropelPDO $con = null);
-
-	/**
-	 * Determines if the node has children / descendants
-	 *
-	 * @return     bool
-	 */
-	public function hasChildren();
-
-	/**
-	 * Determines if the node has previous sibling
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     bool
-	 */
-	public function hasPrevSibling(PropelPDO $con = null);
-
-	/**
-	 * Determines if the node has next sibling
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     bool
-	 */
-	public function hasNextSibling(PropelPDO $con = null);
-
-	/**
-	 * Gets ancestor for the given node if it exists
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public function retrieveParent(PropelPDO $con = null);
-
-	/**
-	 * Gets first child if it exists
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public function retrieveFirstChild(PropelPDO $con = null);
-
-	/**
-	 * Gets last child if it exists
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public function retrieveLastChild(PropelPDO $con = null);
-
-	/**
-	 * Gets prev sibling for the given node if it exists
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public function retrievePrevSibling(PropelPDO $con = null);
-
-	/**
-	 * Gets next sibling for the given node if it exists
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public function retrieveNextSibling(PropelPDO $con = null);
-
-	/**
-	 * Inserts as first child of destination node $parent
-	 *
-	 * @param      object $parent	Propel object for given destination node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     object The current object (for fluent API support)
-	 */
-	public function insertAsFirstChildOf(NodeObject $parent, PropelPDO $con = null);
-
-	/**
-	 * Inserts as last child of destination node $parent
-	 *
-	 * @param      object $parent	Propel object for given destination node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     object The current object (for fluent API support)
-	 */
-	public function insertAsLastChildOf(NodeObject $parent, PropelPDO $con = null);
-
-	/**
-	 * Inserts node as previous sibling to destination node $dest
-	 *
-	 * @param      object $dest	Propel object for given destination node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     object The current object (for fluent API support)
-	 */
-	public function insertAsPrevSiblingOf(NodeObject $dest, PropelPDO $con = null);
-
-	/**
-	 * Inserts node as next sibling to destination node $dest
-	 *
-	 * @param      object $dest	Propel object for given destination node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     object The current object (for fluent API support)
-	 */
-	public function insertAsNextSiblingOf(NodeObject $dest, PropelPDO $con = null);
-
-	/**
-	 * Moves node to be first child of $parent
-	 *
-	 * @param      object $parent	Propel object for destination node
-	 * @param      PropelPDO $con Connection to use.
-	 * @return     void
-	 */
-	public function moveToFirstChildOf(NodeObject $parent, PropelPDO $con = null);
-
-	/**
-	 * Moves node to be last child of $parent
-	 *
-	 * @param      object $parent	Propel object for destination node
-	 * @param      PropelPDO $con Connection to use.
-	 * @return     void
-	 */
-	public function moveToLastChildOf(NodeObject $parent, PropelPDO $con = null);
-
-	/**
-	 * Moves node to be prev sibling to $dest
-	 *
-	 * @param      object $dest	Propel object for destination node
-	 * @param      PropelPDO $con Connection to use.
-	 * @return     void
-	 */
-	public function moveToPrevSiblingOf(NodeObject $dest, PropelPDO $con = null);
-
-	/**
-	 * Moves node to be next sibling to $dest
-	 *
-	 * @param      object $dest	Propel object for destination node
-	 * @param      PropelPDO $con Connection to use.
-	 * @return     void
-	 */
-	public function moveToNextSiblingOf(NodeObject $dest, PropelPDO $con = null);
-
-	/**
-	 * Inserts node as parent of given node.
-	 *
-	 * @param      object $node  Propel object for given destination node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     void
-	 * @throws     Exception      When trying to insert node as parent of a root node
-	 */
-	public function insertAsParentOf(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Wraps the getter for the scope value
-	 *
-	 * @return     int
-	 */
-	public function getScopeIdValue();
-
-	/**
-	 * Set the value of scope column
-	 *
-	 * @param      int $v new value
-	 * @return     object The current object (for fluent API support)
-	 */
-	public function setScopeIdValue($v);
-} // NodeObject
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/om/Persistent.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/om/Persistent.php
deleted file mode 100644
index 506e87a5e..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/om/Persistent.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/*
- *  $Id: Persistent.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * This interface defines methods related to saving an object
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     John D. McNally <jmcnally@collab.net> (Torque)
- * @author     Fedor K. <fedor@apache.org> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.om
- */
-interface Persistent {
-
-	/**
-	 * getter for the object primaryKey.
-	 *
-	 * @return     ObjectKey the object primaryKey as an Object
-	 */
-	public function getPrimaryKey();
-
-	/**
-	 * Sets the PrimaryKey for the object.
-	 *
-	 * @param      mixed $primaryKey The new PrimaryKey object or string (result of PrimaryKey.toString()).
-	 * @return     void
-	 * @throws     Exception, This method might throw an exceptions
-	 */
-	public function setPrimaryKey($primaryKey);
-
-
-	/**
-	 * Returns whether the object has been modified, since it was
-	 * last retrieved from storage.
-	 *
-	 * @return     boolean True if the object has been modified.
-	 */
-	public function isModified();
-
-	/**
-	 * Has specified column been modified?
-	 *
-	 * @param      string $col
-	 * @return     boolean True if $col has been modified.
-	 */
-	public function isColumnModified($col);
-
-	/**
-	 * Returns whether the object has ever been saved.  This will
-	 * be false, if the object was retrieved from storage or was created
-	 * and then saved.
-	 *
-	 * @return     boolean True, if the object has never been persisted.
-	 */
-	public function isNew();
-
-	/**
-	 * Setter for the isNew attribute.  This method will be called
-	 * by Propel-generated children and Peers.
-	 *
-	 * @param      boolean $b the state of the object.
-	 */
-	public function setNew($b);
-
-	/**
-	 * Resets (to false) the "modified" state for this object.
-	 *
-	 * @return     void
-	 */
-	public function resetModified();
-
-	/**
-	 * Whether this object has been deleted.
-	 * @return     boolean The deleted state of this object.
-	 */
-	public function isDeleted();
-
-	/**
-	 * Specify whether this object has been deleted.
-	 * @param      boolean $b The deleted state of this object.
-	 * @return     void
-	 */
-	public function setDeleted($b);
-
-	/**
-	 * Deletes the object.
-	 * @param      PropelPDO $con
-	 * @return     void
-	 * @throws     Exception
-	 */
-	public function delete(PropelPDO $con = null);
-
-	/**
-	 * Saves the object.
-	 * @param      PropelPDO $con
-	 * @return     void
-	 * @throws     Exception
-	 */
-	public function save(PropelPDO $con = null);
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/om/PreOrderNodeIterator.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/om/PreOrderNodeIterator.php
deleted file mode 100644
index 6986d3662..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/om/PreOrderNodeIterator.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/*
- *  $Id: PreOrderNodeIterator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * Pre-order node iterator for Node objects.
- *
- * @author     Dave Lawson <dlawson@masterytech.com>
- * @version    $Revision: 1262 $
- * @package    propel.om
- */
-class PreOrderNodeIterator implements Iterator
-{
-	private $topNode = null;
-
-	private $curNode = null;
-
-	private $querydb = false;
-
-	private $con = null;
-
-	public function __construct($node, $opts) {
-		$this->topNode = $node;
-		$this->curNode = $node;
-
-		if (isset($opts['con']))
-			$this->con = $opts['con'];
-
-		if (isset($opts['querydb']))
-			$this->querydb = $opts['querydb'];
-	}
-
-	public function rewind() {
-		$this->curNode = $this->topNode;
-	}
-
-	public function valid() {
-		return ($this->curNode !== null);
-	}
-
-	public function current() {
-		return $this->curNode;
-	}
-
-	public function key() {
-		return $this->curNode->getNodePath();
-	}
-
-	public function next() {
-
-		if ($this->valid())
-		{
-			$nextNode = $this->curNode->getFirstChildNode($this->querydb, $this->con);
-
-			while ($nextNode === null)
-			{
-				if ($this->curNode === null || $this->curNode->equals($this->topNode))
-					break;
-
-				$nextNode = $this->curNode->getSiblingNode(false, $this->querydb, $this->con);
-
-				if ($nextNode === null)
-					$this->curNode = $this->curNode->getParentNode($this->querydb, $this->con);
-			}
-
-			$this->curNode = $nextNode;
-		}
-
-		return $this->curNode;
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/BasePeer.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/BasePeer.php
deleted file mode 100644
index 28bf2228a..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/BasePeer.php
+++ /dev/null
@@ -1,1064 +0,0 @@
-<?php
-/*
- *  $Id: BasePeer.php 1608 2010-03-15 23:09:22Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * This is a utility class for all generated Peer classes in the system.
- *
- * Peer classes are responsible for isolating all of the database access
- * for a specific business object.  They execute all of the SQL
- * against the database.  Over time this class has grown to include
- * utility methods which ease execution of cross-database queries and
- * the implementation of concrete Peers.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Kaspars Jaudzems <kaspars.jaudzems@inbox.lv> (Propel)
- * @author     Heltem <heltem@o2php.com> (Propel)
- * @author     Frank Y. Kim <frank.kim@clearink.com> (Torque)
- * @author     John D. McNally <jmcnally@collab.net> (Torque)
- * @author     Brett McLaughlin <bmclaugh@algx.net> (Torque)
- * @author     Stephen Haberman <stephenh@chase3000.com> (Torque)
- * @version    $Revision: 1608 $
- * @package    propel.util
- */
-class BasePeer
-{
-
-	/** Array (hash) that contains the cached mapBuilders. */
-	private static $mapBuilders = array();
-
-	/** Array (hash) that contains cached validators */
-	private static $validatorMap = array();
-
-	/**
-	 * phpname type
-	 * e.g. 'AuthorId'
-	 */
-	const TYPE_PHPNAME = 'phpName';
-
-	/**
-	 * studlyphpname type
-	 * e.g. 'authorId'
-	 */
-	const TYPE_STUDLYPHPNAME = 'studlyPhpName';
-
-	/**
-	 * column (peer) name type
-	 * e.g. 'book.AUTHOR_ID'
-	 */
-	const TYPE_COLNAME = 'colName';
-
-	/**
-	 * column fieldname type
-	 * e.g. 'author_id'
-	 */
-	const TYPE_FIELDNAME = 'fieldName';
-
-	/**
-	 * num type
-	 * simply the numerical array index, e.g. 4
-	 */
-	const TYPE_NUM = 'num';
-
-	static public function getFieldnames ($classname, $type = self::TYPE_PHPNAME) {
-
-		// TODO we should take care of including the peer class here
-
-		$peerclass = 'Base' . $classname . 'Peer'; // TODO is this always true?
-		$callable = array($peerclass, 'getFieldnames');
-		$args = array($type);
-
-		return call_user_func_array($callable, $args);
-	}
-
-	static public function translateFieldname($classname, $fieldname, $fromType, $toType) {
-
-		// TODO we should take care of including the peer class here
-
-		$peerclass = 'Base' . $classname . 'Peer'; // TODO is this always true?
-		$callable = array($peerclass, 'translateFieldname');
-		$args = array($fieldname, $fromType, $toType);
-
-		return call_user_func_array($callable, $args);
-	}
-
-	/**
-	 * Method to perform deletes based on values and keys in a
-	 * Criteria.
-	 *
-	 * @param      Criteria $criteria The criteria to use.
-	 * @param      PropelPDO $con A PropelPDO connection object.
-	 * @return     int	The number of rows affected by last statement execution.  For most
-	 * 				uses there is only one delete statement executed, so this number
-	 * 				will correspond to the number of rows affected by the call to this
-	 * 				method.  Note that the return value does require that this information
-	 * 				is returned (supported) by the PDO driver.
-	 * @throws     PropelException
-	 */
-	public static function doDelete(Criteria $criteria, PropelPDO $con)
-	{
-		$db = Propel::getDB($criteria->getDbName());
-		$dbMap = Propel::getDatabaseMap($criteria->getDbName());
-
-		// Set up a list of required tables (one DELETE statement will
-		// be executed per table)
-
-		$tables_keys = array();
-		foreach ($criteria as $c) {
-			foreach ($c->getAllTables() as $tableName) {
-				$tableName2 = $criteria->getTableForAlias($tableName);
-				if ($tableName2 !== null) {
-					$tables_keys[$tableName2 . ' ' . $tableName] = true;
-				} else {
-					$tables_keys[$tableName] = true;
-				}
-			}
-		} // foreach criteria->keys()
-
-		$affectedRows = 0; // initialize this in case the next loop has no iterations.
-
-		$tables = array_keys($tables_keys);
-
-		foreach ($tables as $tableName) {
-
-			$whereClause = array();
-			$selectParams = array();
-			foreach ($dbMap->getTable($tableName)->getColumns() as $colMap) {
-				$key = $tableName . '.' . $colMap->getColumnName();
-				if ($criteria->containsKey($key)) {
-					$sb = "";
-					$criteria->getCriterion($key)->appendPsTo($sb, $selectParams);
-					$whereClause[] = $sb;
-				}
-			}
-
-			if (empty($whereClause)) {
-				throw new PropelException("Cowardly refusing to delete from table $tableName with empty WHERE clause.");
-			}
-
-			// Execute the statement.
-			try {
-				$sql = "DELETE FROM " . $tableName . " WHERE " .  implode(" AND ", $whereClause);
-				$stmt = $con->prepare($sql);
-				self::populateStmtValues($stmt, $selectParams, $dbMap, $db);
-				$stmt->execute();
-				$affectedRows = $stmt->rowCount();
-			} catch (Exception $e) {
-				Propel::log($e->getMessage(), Propel::LOG_ERR);
-				throw new PropelException("Unable to execute DELETE statement.",$e);
-			}
-
-		} // for each table
-
-		return $affectedRows;
-	}
-
-	/**
-	 * Method to deletes all contents of specified table.
-	 *
-	 * This method is invoked from generated Peer classes like this:
-	 * <code>
-	 * public static function doDeleteAll($con = null)
-	 * {
-	 *   if ($con === null) $con = Propel::getConnection(self::DATABASE_NAME);
-	 *   BasePeer::doDeleteAll(self::TABLE_NAME, $con);
-	 * }
-	 * </code>
-	 *
-	 * @param      string $tableName The name of the table to empty.
-	 * @param      PropelPDO $con A PropelPDO connection object.
-	 * @return     int	The number of rows affected by the statement.  Note
-	 * 				that the return value does require that this information
-	 * 				is returned (supported) by the Creole db driver.
-	 * @throws     PropelException - wrapping SQLException caught from statement execution.
-	 */
-	public static function doDeleteAll($tableName, PropelPDO $con)
-	{
-		try {
-			$sql = "DELETE FROM " . $tableName;
-			$stmt = $con->prepare($sql);
-			$stmt->execute();
-			return $stmt->rowCount();
-		} catch (Exception $e) {
-			Propel::log($e->getMessage(), Propel::LOG_ERR);
-			throw new PropelException("Unable to perform DELETE ALL operation.", $e);
-		}
-	}
-
-	/**
-	 * Method to perform inserts based on values and keys in a
-	 * Criteria.
-	 * <p>
-	 * If the primary key is auto incremented the data in Criteria
-	 * will be inserted and the auto increment value will be returned.
-	 * <p>
-	 * If the primary key is included in Criteria then that value will
-	 * be used to insert the row.
-	 * <p>
-	 * If no primary key is included in Criteria then we will try to
-	 * figure out the primary key from the database map and insert the
-	 * row with the next available id using util.db.IDBroker.
-	 * <p>
-	 * If no primary key is defined for the table the values will be
-	 * inserted as specified in Criteria and null will be returned.
-	 *
-	 * @param      Criteria $criteria Object containing values to insert.
-	 * @param      PropelPDO $con A PropelPDO connection.
-	 * @return     mixed The primary key for the new row if (and only if!) the primary key
-	 *				is auto-generated.  Otherwise will return <code>null</code>.
-	 * @throws     PropelException
-	 */
-	public static function doInsert(Criteria $criteria, PropelPDO $con) {
-
-		// the primary key
-		$id = null;
-
-		$db = Propel::getDB($criteria->getDbName());
-
-		// Get the table name and method for determining the primary
-		// key value.
-		$keys = $criteria->keys();
-		if (!empty($keys)) {
-			$tableName = $criteria->getTableName( $keys[0] );
-		} else {
-			throw new PropelException("Database insert attempted without anything specified to insert");
-		}
-
-		$dbMap = Propel::getDatabaseMap($criteria->getDbName());
-		$tableMap = $dbMap->getTable($tableName);
-		$keyInfo = $tableMap->getPrimaryKeyMethodInfo();
-		$useIdGen = $tableMap->isUseIdGenerator();
-		//$keyGen = $con->getIdGenerator();
-
-		$pk = self::getPrimaryKey($criteria);
-
-		// only get a new key value if you need to
-		// the reason is that a primary key might be defined
-		// but you are still going to set its value. for example:
-		// a join table where both keys are primary and you are
-		// setting both columns with your own values
-
-		// pk will be null if there is no primary key defined for the table
-		// we're inserting into.
-		if ($pk !== null && $useIdGen && !$criteria->keyContainsValue($pk->getFullyQualifiedName()) && $db->isGetIdBeforeInsert()) {
-			try {
-				$id = $db->getId($con, $keyInfo);
-			} catch (Exception $e) {
-				throw new PropelException("Unable to get sequence id.", $e);
-			}
-			$criteria->add($pk->getFullyQualifiedName(), $id);
-		}
-
-		try {
-			$adapter = Propel::getDB($criteria->getDBName());
-
-			$qualifiedCols = $criteria->keys(); // we need table.column cols when populating values
-			$columns = array(); // but just 'column' cols for the SQL
-			foreach ($qualifiedCols as $qualifiedCol) {
-				$columns[] = substr($qualifiedCol, strrpos($qualifiedCol, '.') + 1);
-			}
-
-			// add identifiers
-			if ($adapter->useQuoteIdentifier()) {
-				$columns = array_map(array($adapter, 'quoteIdentifier'), $columns);
-			}
-
-			$sql = 'INSERT INTO ' . $tableName
-			. ' (' . implode(',', $columns) . ')'
-			. ' VALUES (';
-			// . substr(str_repeat("?,", count($columns)), 0, -1) . 
-			for($p=1, $cnt=count($columns); $p <= $cnt; $p++) {
-				$sql .= ':p'.$p;
-				if ($p !== $cnt) $sql .= ',';
-			}
-			$sql .= ')';
-
-			$stmt = $con->prepare($sql);
-			self::populateStmtValues($stmt, self::buildParams($qualifiedCols, $criteria), $dbMap, $db);
-			$stmt->execute();
-
-		} catch (Exception $e) {
-			Propel::log($e->getMessage(), Propel::LOG_ERR);
-			throw new PropelException("Unable to execute INSERT statement.", $e);
-		}
-
-		// If the primary key column is auto-incremented, get the id now.
-		if ($pk !== null && $useIdGen && $db->isGetIdAfterInsert()) {
-			try {
-				$id = $db->getId($con, $keyInfo);
-			} catch (Exception $e) {
-				throw new PropelException("Unable to get autoincrement id.", $e);
-			}
-		}
-
-		return $id;
-	}
-
-	/**
-	 * Method used to update rows in the DB.  Rows are selected based
-	 * on selectCriteria and updated using values in updateValues.
-	 * <p>
-	 * Use this method for performing an update of the kind:
-	 * <p>
-	 * WHERE some_column = some value AND could_have_another_column =
-	 * another value AND so on.
-	 *
-	 * @param      $selectCriteria A Criteria object containing values used in where
-	 *		clause.
-	 * @param      $updateValues A Criteria object containing values used in set
-	 *		clause.
-	 * @param      PropelPDO $con The PropelPDO connection object to use.
-	 * @return     int	The number of rows affected by last update statement.  For most
-	 * 				uses there is only one update statement executed, so this number
-	 * 				will correspond to the number of rows affected by the call to this
-	 * 				method.  Note that the return value does require that this information
-	 * 				is returned (supported) by the Creole db driver.
-	 * @throws     PropelException
-	 */
-	public static function doUpdate(Criteria $selectCriteria, Criteria $updateValues, PropelPDO $con) {
-
-		$db = Propel::getDB($selectCriteria->getDbName());
-		$dbMap = Propel::getDatabaseMap($selectCriteria->getDbName());
-
-		// Get list of required tables, containing all columns
-		$tablesColumns = $selectCriteria->getTablesColumns();
-
-		// we also need the columns for the update SQL
-		$updateTablesColumns = $updateValues->getTablesColumns();
-
-		$affectedRows = 0; // initialize this in case the next loop has no iterations.
-
-		foreach ($tablesColumns as $tableName => $columns) {
-
-			$whereClause = array();
-			
-			$params = array();
-
-			$stmt = null;
-			try {
-
-				$sql = "UPDATE " . $tableName . " SET ";
-				$p = 1;
-				foreach ($updateTablesColumns[$tableName] as $col) {
-					$updateColumnName = substr($col, strrpos($col, '.') + 1);
-					// add identifiers for the actual database?
-					if ($db->useQuoteIdentifier()) {
-						$updateColumnName = $db->quoteIdentifier($updateColumnName);
-					}
-					if ($updateValues->getComparison($col) != Criteria::CUSTOM_EQUAL) {
-						$sql .= $updateColumnName . '=:p'.$p++.', ';
-					} else {
-						$param = $updateValues->get($col);
-						$sql .= $updateColumnName . ' = ';
-						if (is_array($param)) {
-							if (isset($param['raw'])) {
-								$raw = $param['raw'];
-								$rawcvt = '';
-								// parse the $params['raw'] for ? chars
-								for($r=0,$len=strlen($raw); $r < $len; $r++) {
-									if ($raw{$r} == '?') {
-										$rawcvt .= ':p'.$p++;
-									} else {
-										$rawcvt .= $raw{$r};
-									}
-								}
-								$sql .= $rawcvt . ', ';
-							} else {
-								$sql .= ':p'.$p++.', ';
-							}
-							if (isset($param['value'])) {
-								$updateValues->put($col, $param['value']);
-							}
-						} else {
-							$updateValues->remove($col);
-							$sql .= $param . ', ';
-						}
-					}
-				}
-				
-				$params = self::buildParams($updateTablesColumns[$tableName], $updateValues);
-				
-				foreach ($columns as $colName) {
-					$sb = "";
-					$selectCriteria->getCriterion($colName)->appendPsTo($sb, $params);
-					$whereClause[] = $sb;
-				}
-			
-				$sql = substr($sql, 0, -2) . " WHERE " .  implode(" AND ", $whereClause);
-
-				$stmt = $con->prepare($sql);
-
-				// Replace ':p?' with the actual values
-				self::populateStmtValues($stmt, $params, $dbMap, $db);
-
-				$stmt->execute();
-
-				$affectedRows = $stmt->rowCount();
-
-				$stmt = null; // close
-
-			} catch (Exception $e) {
-				if ($stmt) $stmt = null; // close
-				Propel::log($e->getMessage(), Propel::LOG_ERR);
-				throw new PropelException("Unable to execute UPDATE statement.", $e);
-			}
-
-		} // foreach table in the criteria
-
-		return $affectedRows;
-	}
-
-	/**
-	 * Executes query build by createSelectSql() and returns the resultset statement.
-	 *
-	 * @param      Criteria $criteria A Criteria.
-	 * @param      PropelPDO $con A PropelPDO connection to use.
-	 * @return     PDOStatement The resultset.
-	 * @throws     PropelException
-	 * @see        createSelectSql()
-	 */
-	public static function doSelect(Criteria $criteria, PropelPDO $con = null)
-	{
-		$dbMap = Propel::getDatabaseMap($criteria->getDbName());
-		$db = Propel::getDB($criteria->getDbName());
-
-		if ($con === null) {
-			$con = Propel::getConnection($criteria->getDbName(), Propel::CONNECTION_READ);
-		}
-
-		$stmt = null;
-
-		if ($criteria->isUseTransaction()) $con->beginTransaction();
-
-		try {
-
-			$params = array();
-			$sql = self::createSelectSql($criteria, $params);
-
-			$stmt = $con->prepare($sql);
-
-			self::populateStmtValues($stmt, $params, $dbMap, $db);
-
-			$stmt->execute();
-
-			if ($criteria->isUseTransaction()) $con->commit();
-
-		} catch (Exception $e) {
-			if ($stmt) $stmt = null; // close
-			if ($criteria->isUseTransaction()) $con->rollBack();
-			Propel::log($e->getMessage(), Propel::LOG_ERR);
-			throw new PropelException($e);
-		}
-
-		return $stmt;
-	}
-
-	/**
-	 * Executes a COUNT query using either a simple SQL rewrite or, for more complex queries, a
-	 * sub-select of the SQL created by createSelectSql() and returns the statement.
-	 *
-	 * @param      Criteria $criteria A Criteria.
-	 * @param      PropelPDO $con A PropelPDO connection to use.
-	 * @return     PDOStatement The resultset statement.
-	 * @throws     PropelException
-	 * @see        createSelectSql()
-	 */
-	public static function doCount(Criteria $criteria, PropelPDO $con = null)
-	{
-		$dbMap = Propel::getDatabaseMap($criteria->getDbName());
-		$db = Propel::getDB($criteria->getDbName());
-
-		if ($con === null) {
-			$con = Propel::getConnection($criteria->getDbName(), Propel::CONNECTION_READ);
-		}
-
-		$stmt = null;
-
-		if ($criteria->isUseTransaction()) $con->beginTransaction();
-
-		$needsComplexCount = ($criteria->getGroupByColumns() || $criteria->getOffset()
-								|| $criteria->getLimit() || $criteria->getHaving() || in_array(Criteria::DISTINCT, $criteria->getSelectModifiers()));
-
-		try {
-
-			$params = array();
-
-			if ($needsComplexCount) {
-				if (self::needsSelectAliases($criteria)) {
-					self::turnSelectColumnsToAliases($criteria);
-				}
-				$selectSql = self::createSelectSql($criteria, $params);
-				$sql = 'SELECT COUNT(*) FROM (' . $selectSql . ') AS propelmatch4cnt';
-			} else {
-				// Replace SELECT columns with COUNT(*)
-				$criteria->clearSelectColumns()->addSelectColumn('COUNT(*)');
-				$sql = self::createSelectSql($criteria, $params);
-			}
-
-			$stmt = $con->prepare($sql);
-			self::populateStmtValues($stmt, $params, $dbMap, $db);
-			$stmt->execute();
-
-			if ($criteria->isUseTransaction()) $con->commit();
-
-		} catch (Exception $e) {
-			if ($stmt) $stmt = null; // close
-			if ($criteria->isUseTransaction()) $con->rollBack();
-			Propel::log($e->getMessage(), Propel::LOG_ERR);
-			throw new PropelException($e);
-		}
-
-		return $stmt;
-	}
-
-	/**
-	 * Populates values in a prepared statement.
-	 *
-	 * This method is designed to work with the createSelectSql() method, which creates
-	 * both the SELECT SQL statement and populates a passed-in array of parameter
-	 * values that should be substituted.
-	 *
-	 * <code>
-	 * $params = array();
-	 * $sql = BasePeer::createSelectSql($criteria, $params);
-	 * BasePeer::populateStmtValues($stmt, $params, Propel::getDatabaseMap($critera->getDbName()), Propel::getDB($criteria->getDbName()));
-	 * </code>
-	 *
-	 * @param      PDOStatement $stmt
-	 * @param      array $params array('column' => ..., 'table' => ..., 'value' => ...)
-	 * @param      DatabaseMap $dbMap
-	 * @return     int The number of params replaced.
-	 * @see        createSelectSql()
-	 * @see        doSelect()
-	 */
-	public static function populateStmtValues(PDOStatement $stmt, array $params, DatabaseMap $dbMap, DBAdapter $db)
-	{
-		$i = 1;
-		foreach ($params as $param) {
-			$tableName = $param['table'];
-			$columnName = $param['column'];
-			$value = $param['value'];
-
-			if ($value === null) {
-
-				$stmt->bindValue(':p'.$i++, null, PDO::PARAM_NULL);
-
-			} elseif (isset($tableName) ) {
-
-				$cMap = $dbMap->getTable($tableName)->getColumn($columnName);
-				$type = $cMap->getType();
-				$pdoType = $cMap->getPdoType();
-
-				// FIXME - This is a temporary hack to get around apparent bugs w/ PDO+MYSQL
-				// See http://pecl.php.net/bugs/bug.php?id=9919
-				if ($pdoType == PDO::PARAM_BOOL && $db instanceof DBMySQL) {
-					$value = (int) $value;
-					$pdoType = PDO::PARAM_INT;
-				} elseif (is_numeric($value) && $cMap->isEpochTemporal()) { // it's a timestamp that needs to be formatted
-					if ($type == PropelColumnTypes::TIMESTAMP) {
-						$value = date($db->getTimestampFormatter(), $value);
-					} else if ($type == PropelColumnTypes::DATE) {
-						$value = date($db->getDateFormatter(), $value);
-					} else if ($type == PropelColumnTypes::TIME) {
-						$value = date($db->getTimeFormatter(), $value);
-					}
-				} elseif ($value instanceof DateTime && $cMap->isTemporal()) { // it's a timestamp that needs to be formatted
-					if ($type == PropelColumnTypes::TIMESTAMP || $type == PropelColumnTypes::BU_TIMESTAMP) {
-						$value = $value->format($db->getTimestampFormatter());
-					} else if ($type == PropelColumnTypes::DATE || $type == PropelColumnTypes::BU_DATE) {
-						$value = $value->format($db->getDateFormatter());
-					} else if ($type == PropelColumnTypes::TIME) {
-						$value = $value->format($db->getTimeFormatter());
-					}
-				} elseif (is_resource($value) && $cMap->isLob()) {
-					// we always need to make sure that the stream is rewound, otherwise nothing will
-					// get written to database.
-					rewind($value);
-				}
-
-				$stmt->bindValue(':p'.$i++, $value, $pdoType);
-			} else {
-				$stmt->bindValue(':p'.$i++, $value);
-			}
-		} // foreach
-	}
-
-	/**
-	 * Applies any validators that were defined in the schema to the specified columns.
-	 *
-	 * @param      string $dbName The name of the database
-	 * @param      string $tableName The name of the table
-	 * @param      array $columns Array of column names as key and column values as value.
-	 */
-	public static function doValidate($dbName, $tableName, $columns)
-	{
-		$dbMap = Propel::getDatabaseMap($dbName);
-		$tableMap = $dbMap->getTable($tableName);
-		$failureMap = array(); // map of ValidationFailed objects
-		foreach ($columns as $colName => $colValue) {
-			if ($tableMap->containsColumn($colName)) {
-				$col = $tableMap->getColumn($colName);
-				foreach ($col->getValidators() as $validatorMap) {
-					$validator = BasePeer::getValidator($validatorMap->getClass());
-					if ($validator && ($col->isNotNull() || $colValue !== null) && $validator->isValid($validatorMap, $colValue) === false) {
-						if (!isset($failureMap[$colName])) { // for now we do one ValidationFailed per column, not per rule
-							$failureMap[$colName] = new ValidationFailed($colName, $validatorMap->getMessage(), $validator);
-						}
-					}
-				}
-			}
-		}
-		return (!empty($failureMap) ? $failureMap : true);
-	}
-
-	/**
-	 * Helper method which returns the primary key contained
-	 * in the given Criteria object.
-	 *
-	 * @param      Criteria $criteria A Criteria.
-	 * @return     ColumnMap If the Criteria object contains a primary
-	 *		  key, or null if it doesn't.
-	 * @throws     PropelException
-	 */
-	private static function getPrimaryKey(Criteria $criteria)
-	{
-		// Assume all the keys are for the same table.
-		$keys = $criteria->keys();
-		$key = $keys[0];
-		$table = $criteria->getTableName($key);
-
-		$pk = null;
-
-		if (!empty($table)) {
-
-			$dbMap = Propel::getDatabaseMap($criteria->getDbName());
-
-			if ($dbMap === null) {
-				throw new PropelException("\$dbMap is null");
-			}
-
-			if ($dbMap->getTable($table) === null) {
-				throw new PropelException("\$dbMap->getTable() is null");
-			}
-
-			$columns = $dbMap->getTable($table)->getColumns();
-			foreach (array_keys($columns) as $key) {
-				if ($columns[$key]->isPrimaryKey()) {
-					$pk = $columns[$key];
-					break;
-				}
-			}
-		}
-		return $pk;
-	}
-
-	/**
-	 * Checks whether the Criteria needs to use column aliasing
-	 * This is implemented in a service class rather than in Criteria itself
-	 * in order to avoid doing the tests when it's not necessary (e.g. for SELECTs)
-	 */
-	public static function needsSelectAliases(Criteria $criteria)
-	{
-		$columnNames = array();
-		foreach ($criteria->getSelectColumns() as $fullyQualifiedColumnName) {
-			if ($pos = strrpos($fullyQualifiedColumnName, '.')) {
-				$columnName = substr($fullyQualifiedColumnName, $pos);
-				if (isset($columnNames[$columnName])) {
-					// more than one column with the same name, so aliasing is required
-					return true;
-				}
-				$columnNames[$columnName] = true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Ensures uniqueness of select column names by turning them all into aliases
-	 * This is necessary for queries on more than one table when the tables share a column name
-	 * @see http://propel.phpdb.org/trac/ticket/795
-	 *
-	 * @param Criteria $criteria
-	 * 
-	 * @return Criteria The input, with Select columns replaced by aliases
-	 */
-	public static function turnSelectColumnsToAliases(Criteria $criteria)
-	{
-		$selectColumns = $criteria->getSelectColumns();
-		// clearSelectColumns also clears the aliases, so get them too
-		$asColumns = $criteria->getAsColumns();
-		$criteria->clearSelectColumns();
-		$columnAliases = $asColumns;
-		// add the select columns back
-		foreach ($selectColumns as $clause) {
-			// Generate a unique alias
-			$baseAlias = preg_replace('/\W/', '_', $clause);
-			$alias = $baseAlias;
-			// If it already exists, add a unique suffix
-			$i = 0;
-			while (isset($columnAliases[$alias])) {
-				$i++;
-				$alias = $baseAlias . '_' . $i;
-			}
-			// Add it as an alias
-			$criteria->addAsColumn($alias, $clause);
-			$columnAliases[$alias] = $clause;
-		}
-		// Add the aliases back, don't modify them
-		foreach ($asColumns as $name => $clause) {
-			$criteria->addAsColumn($name, $clause);
-		}
-		
-		return $criteria;
-	}
-	
-	/**
-	 * Method to create an SQL query based on values in a Criteria.
-	 *
-	 * This method creates only prepared statement SQL (using ? where values
-	 * will go).  The second parameter ($params) stores the values that need
-	 * to be set before the statement is executed.  The reason we do it this way
-	 * is to let the PDO layer handle all escaping & value formatting.
-	 *
-	 * @param      Criteria $criteria Criteria for the SELECT query.
-	 * @param      array &$params Parameters that are to be replaced in prepared statement.
-	 * @return     string
-	 * @throws     PropelException Trouble creating the query string.
-	 */
-	public static function createSelectSql(Criteria $criteria, &$params)
-	{
-		$db = Propel::getDB($criteria->getDbName());
-		$dbMap = Propel::getDatabaseMap($criteria->getDbName());
-
-		// redundant definition $selectModifiers = array();
-		$selectClause = array();
-		$fromClause = array();
-		$joinClause = array();
-		$joinTables = array();
-		$whereClause = array();
-		$orderByClause = array();
-		// redundant definition $groupByClause = array();
-
-		$orderBy = $criteria->getOrderByColumns();
-		$groupBy = $criteria->getGroupByColumns();
-		$ignoreCase = $criteria->isIgnoreCase();
-		$select = $criteria->getSelectColumns();
-		$aliases = $criteria->getAsColumns();
-
-		// simple copy
-		$selectModifiers = $criteria->getSelectModifiers();
-
-		// get selected columns
-		foreach ($select as $columnName) {
-
-			// expect every column to be of "table.column" formation
-			// it could be a function:  e.g. MAX(books.price)
-
-			$tableName = null;
-
-			$selectClause[] = $columnName; // the full column name: e.g. MAX(books.price)
-
-			$parenPos = strrpos($columnName, '(');
-			$dotPos = strrpos($columnName, '.', ($parenPos !== false ? $parenPos : 0));
-
-			// [HL] I think we really only want to worry about adding stuff to
-			// the fromClause if this function has a TABLE.COLUMN in it at all.
-			// e.g. COUNT(*) should not need this treatment -- or there needs to
-			// be special treatment for '*'
-			if ($dotPos !== false) {
-
-				if ($parenPos === false) { // table.column
-					$tableName = substr($columnName, 0, $dotPos);
-				} else { // FUNC(table.column)
-					$tableName = substr($columnName, $parenPos + 1, $dotPos - ($parenPos + 1));
-					// functions may contain qualifiers so only take the last
-					// word as the table name.
-					// COUNT(DISTINCT books.price)
-					$lastSpace = strpos($tableName, ' ');
-					if ($lastSpace !== false) { // COUNT(DISTINCT books.price)
-						$tableName = substr($tableName, $lastSpace + 1);
-					}
-				}
-				$tableName2 = $criteria->getTableForAlias($tableName);
-				if ($tableName2 !== null) {
-					$fromClause[] = $tableName2 . ' ' . $tableName;
-				} else {
-					$fromClause[] = $tableName;
-				}
-
-			} // if $dotPost !== null
-		}
-
-		// set the aliases
-		foreach ($aliases as $alias => $col) {
-			$selectClause[] = $col . " AS " . $alias;
-		}
-
-		// add the criteria to WHERE clause
-		// this will also add the table names to the FROM clause if they are not already
-		// invluded via a LEFT JOIN
-		foreach ($criteria->keys() as $key) {
-
-			$criterion = $criteria->getCriterion($key);
-			$someCriteria = $criterion->getAttachedCriterion();
-			$someCriteriaLength = count($someCriteria);
-			$table = null;
-			for ($i=0; $i < $someCriteriaLength; $i++) {
-				$tableName = $someCriteria[$i]->getTable();
-
-				$table = $criteria->getTableForAlias($tableName);
-				if ($table !== null) {
-					$fromClause[] = $table . ' ' . $tableName;
-				} else {
-					$fromClause[] = $tableName;
-					$table = $tableName;
-				}
-
-				$ignoreCase =
-				(($criteria->isIgnoreCase()
-				|| $someCriteria[$i]->isIgnoreCase())
-				&& (strpos($dbMap->getTable($table)->getColumn($someCriteria[$i]->getColumn())->getType(), "VARCHAR") !== false)
-				);
-
-				$someCriteria[$i]->setIgnoreCase($ignoreCase);
-			}
-
-			$criterion->setDB($db);
-
-			$sb = "";
-			$criterion->appendPsTo($sb, $params);
-			$whereClause[] = $sb;
-		}
-
-		// Handle joins
-		// joins with a null join type will be added to the FROM clause and the condition added to the WHERE clause.
-		// joins of a specified type: the LEFT side will be added to the fromClause and the RIGHT to the joinClause
-		foreach ((array) $criteria->getJoins() as $join) { 
-			// The join might have been established using an alias name
-			$leftTable = $join->getLeftTableName();
-			$leftTableAlias = '';
-			if ($realTable = $criteria->getTableForAlias($leftTable)) {
-				$leftTableAlias = " $leftTable";
-				$leftTable = $realTable;
-			}
-
-			$rightTable = $join->getRightTableName();
-			$rightTableAlias = '';
-			if ($realTable = $criteria->getTableForAlias($rightTable)) {
-				$rightTableAlias = " $rightTable";
-				$rightTable = $realTable;
-			}
-
-			// determine if casing is relevant.
-			if ($ignoreCase = $criteria->isIgnoreCase()) {
-				$leftColType = $dbMap->getTable($leftTable)->getColumn($join->getLeftColumnName())->getType();
-				$rightColType = $dbMap->getTable($rightTable)->getColumn($join->getRightColumnName())->getType();
-				$ignoreCase = ($leftColType == 'string' || $rightColType == 'string');
-			}
-
-			// build the condition
-			$condition = '';
-			foreach ($join->getConditions() as $index => $conditionDesc)
-			{
-				if ($ignoreCase) {
-					$condition .= $db->ignoreCase($conditionDesc['left']) . $conditionDesc['operator'] . $db->ignoreCase($conditionDesc['right']);
-				} else {
-					$condition .= implode($conditionDesc);
-				}
-				if ($index + 1 < $join->countConditions()) {
-					$condition .= ' AND ';
-				}
-			}
-
-			// add 'em to the queues..
-			if ($joinType = $join->getJoinType()) {
-			  // real join
-				if (!$fromClause) {
-					$fromClause[] = $leftTable . $leftTableAlias;
-				}
-				$joinTables[] = $rightTable . $rightTableAlias;
-				$joinClause[] = $join->getJoinType() . ' ' . $rightTable . $rightTableAlias . " ON ($condition)";
-			} else {
-			  // implicit join, translates to a where
-				$fromClause[] = $leftTable . $leftTableAlias;
-				$fromClause[] = $rightTable . $rightTableAlias;
-				$whereClause[] = $condition;
-			}
-		}
-
-		// Unique from clause elements
-		$fromClause = array_unique($fromClause);
-		$fromClause = array_diff($fromClause, array(''));
-		
-		// tables should not exist in both the from and join clauses
-		if ($joinTables && $fromClause) {
-			foreach ($fromClause as $fi => $ftable) {
-				if (in_array($ftable, $joinTables)) {
-					unset($fromClause[$fi]);
-				}
-			}
-		}
-
-		// Add the GROUP BY columns
-		$groupByClause = $groupBy;
-
-		$having = $criteria->getHaving();
-		$havingString = null;
-		if ($having !== null) {
-			$sb = "";
-			$having->appendPsTo($sb, $params);
-			$havingString = $sb;
-		}
-
-		if (!empty($orderBy)) {
-
-			foreach ($orderBy as $orderByColumn) {
-
-				// Add function expression as-is.
-
-				if (strpos($orderByColumn, '(') !== false) {
-					$orderByClause[] = $orderByColumn;
-					continue;
-				}
-
-				// Split orderByColumn (i.e. "table.column DESC")
-
-				$dotPos = strrpos($orderByColumn, '.');
-
-				if ($dotPos !== false) {
-					$tableName = substr($orderByColumn, 0, $dotPos);
-					$columnName = substr($orderByColumn, $dotPos+1);
-				}
-				else {
-					$tableName = '';
-					$columnName = $orderByColumn;
-				}
-
-				$spacePos = strpos($columnName, ' ');
-
-				if ($spacePos !== false) {
-					$direction = substr($columnName, $spacePos);
-					$columnName = substr($columnName, 0, $spacePos);
-				}
-				else {
-					$direction = '';
-				}
-
-				$tableAlias = $tableName;
-				if ($aliasTableName = $criteria->getTableForAlias($tableName)) {
-					$tableName = $aliasTableName;
-				}
-
-				$columnAlias = $columnName;
-				if ($asColumnName = $criteria->getColumnForAs($columnName)) {
-					$columnName = $asColumnName;
-				}
-
-				$column = $tableName ? $dbMap->getTable($tableName)->getColumn($columnName) : null;
-
-				if ($criteria->isIgnoreCase() && $column && $column->isText()) {
-					$orderByClause[] = $db->ignoreCaseInOrderBy("$tableAlias.$columnAlias") . $direction;
-					$selectClause[] = $db->ignoreCaseInOrderBy("$tableAlias.$columnAlias");
-				} else {
-					$orderByClause[] = $orderByColumn;
-				}
-			}
-		}
-
-		if (empty($fromClause) && $criteria->getPrimaryTableName()) {
-			$fromClause[] = $criteria->getPrimaryTableName();
-		}
-
-		// from / join tables quoten if it is necessary
-		if ($db->useQuoteIdentifier()) {
-			$fromClause = array_map(array($db, 'quoteIdentifierTable'), $fromClause);
-			$joinClause = $joinClause ? $joinClause : array_map(array($db, 'quoteIdentifierTable'), $joinClause);
-		}
-
-		// build from-clause
-		$from = '';
-		if (!empty($joinClause) && count($fromClause) > 1) {
-			$from .= implode(" CROSS JOIN ", $fromClause);
-		} else {
-			$from .= implode(", ", $fromClause);
-		}
-		
-		$from .= $joinClause ? ' ' . implode(' ', $joinClause) : '';
-
-		// Build the SQL from the arrays we compiled
-		$sql =  "SELECT "
-		.($selectModifiers ? implode(" ", $selectModifiers) . " " : "")
-		.implode(", ", $selectClause)
-		." FROM "  . $from
-		.($whereClause ? " WHERE ".implode(" AND ", $whereClause) : "")
-		.($groupByClause ? " GROUP BY ".implode(",", $groupByClause) : "")
-		.($havingString ? " HAVING ".$havingString : "")
-		.($orderByClause ? " ORDER BY ".implode(",", $orderByClause) : "");
-
-		// APPLY OFFSET & LIMIT to the query.
-		if ($criteria->getLimit() || $criteria->getOffset()) {
-			$db->applyLimit($sql, $criteria->getOffset(), $criteria->getLimit());
-		}
-
-		return $sql;
-	}
-
-	/**
-	 * Builds a params array, like the kind populated by Criterion::appendPsTo().
-	 * This is useful for building an array even when it is not using the appendPsTo() method.
-	 * @param      array $columns
-	 * @param      Criteria $values
-	 * @return     array params array('column' => ..., 'table' => ..., 'value' => ...)
-	 */
-	private static function buildParams($columns, Criteria $values)
-	{
-		$params = array();
-		foreach ($columns as $key) {
-			if ($values->containsKey($key)) {
-				$crit = $values->getCriterion($key);
-				$params[] = array('column' => $crit->getColumn(), 'table' => $crit->getTable(), 'value' => $crit->getValue());
-			}
-		}
-		return $params;
-	}
-
-	/**
-	 * This function searches for the given validator $name under propel/validator/$name.php,
-	 * imports and caches it.
-	 *
-	 * @param      string $classname The dot-path name of class (e.g. myapp.propel.MyValidator)
-	 * @return     Validator object or null if not able to instantiate validator class (and error will be logged in this case)
-	 */
-	public static function getValidator($classname)
-	{
-		try {
-			$v = isset(self::$validatorMap[$classname]) ? self::$validatorMap[$classname] : null;
-			if ($v === null) {
-				$cls = Propel::importClass($classname);
-				$v = new $cls();
-				self::$validatorMap[$classname] = $v;
-			}
-			return $v;
-		} catch (Exception $e) {
-			Propel::log("BasePeer::getValidator(): failed trying to instantiate " . $classname . ": ".$e->getMessage(), Propel::LOG_ERR);
-		}
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/Criteria.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/Criteria.php
deleted file mode 100644
index 42f11be63..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/Criteria.php
+++ /dev/null
@@ -1,1754 +0,0 @@
-<?php
-/*
- *  $Id: Criteria.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * This is a utility class for holding criteria information for a query.
- *
- * BasePeer constructs SQL statements based on the values in this class.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Kaspars Jaudzems <kaspars.jaudzems@inbox.lv> (Propel)
- * @author     Frank Y. Kim <frank.kim@clearink.com> (Torque)
- * @author     John D. McNally <jmcnally@collab.net> (Torque)
- * @author     Brett McLaughlin <bmclaugh@algx.net> (Torque)
- * @author     Eric Dobbs <eric@dobbse.net> (Torque)
- * @author     Henning P. Schmiedehausen <hps@intermeta.de> (Torque)
- * @author     Sam Joseph <sam@neurogrid.com> (Torque)
- * @version    $Revision: 1262 $
- * @package    propel.util
- */
-class Criteria implements IteratorAggregate {
-
-	/** Comparison type. */
-	const EQUAL = "=";
-
-	/** Comparison type. */
-	const NOT_EQUAL = "<>";
-
-	/** Comparison type. */
-	const ALT_NOT_EQUAL = "!=";
-
-	/** Comparison type. */
-	const GREATER_THAN = ">";
-
-	/** Comparison type. */
-	const LESS_THAN = "<";
-
-	/** Comparison type. */
-	const GREATER_EQUAL = ">=";
-
-	/** Comparison type. */
-	const LESS_EQUAL = "<=";
-
-	/** Comparison type. */
-	const LIKE = " LIKE ";
-
-	/** Comparison type. */
-	const NOT_LIKE = " NOT LIKE ";
-
-	/** PostgreSQL comparison type */
-	const ILIKE = " ILIKE ";
-
-	/** PostgreSQL comparison type */
-	const NOT_ILIKE = " NOT ILIKE ";
-
-	/** Comparison type. */
-	const CUSTOM = "CUSTOM";
-
-	/** Comparison type for update */
-	const CUSTOM_EQUAL = "CUSTOM_EQUAL";
-
-	/** Comparison type. */
-	const DISTINCT = "DISTINCT ";
-
-	/** Comparison type. */
-	const IN = " IN ";
-
-	/** Comparison type. */
-	const NOT_IN = " NOT IN ";
-
-	/** Comparison type. */
-	const ALL = "ALL ";
-
-	/** Comparison type. */
-	const JOIN = "JOIN";
-
-	/** Binary math operator: AND */
-	const BINARY_AND = "&";
-
-	/** Binary math operator: OR */
-	const BINARY_OR = "|";
-
-	/** "Order by" qualifier - ascending */
-	const ASC = "ASC";
-
-	/** "Order by" qualifier - descending */
-	const DESC = "DESC";
-
-	/** "IS NULL" null comparison */
-	const ISNULL = " IS NULL ";
-
-	/** "IS NOT NULL" null comparison */
-	const ISNOTNULL = " IS NOT NULL ";
-
-	/** "CURRENT_DATE" ANSI SQL function */
-	const CURRENT_DATE = "CURRENT_DATE";
-
-	/** "CURRENT_TIME" ANSI SQL function */
-	const CURRENT_TIME = "CURRENT_TIME";
-
-	/** "CURRENT_TIMESTAMP" ANSI SQL function */
-	const CURRENT_TIMESTAMP = "CURRENT_TIMESTAMP";
-
-	/** "LEFT JOIN" SQL statement */
-	const LEFT_JOIN = "LEFT JOIN";
-
-	/** "RIGHT JOIN" SQL statement */
-	const RIGHT_JOIN = "RIGHT JOIN";
-
-	/** "INNER JOIN" SQL statement */
-	const INNER_JOIN = "INNER JOIN";
-
-	private $ignoreCase = false;
-	private $singleRecord = false;
-	private $selectModifiers = array();
-	private $selectColumns = array();
-	private $orderByColumns = array();
-	private $groupByColumns = array();
-	private $having = null;
-	private $asColumns = array();
-	private $joins = array();
-
-	/** The name of the database. */
-	private $dbName;
-
-	/**
-	 * The primary table for this Criteria.
-	 * Useful in cases where there are no select or where
-	 * columns.
-	 * @var        string
-	 */
-	private $primaryTableName;
-
-	/** The name of the database as given in the contructor. */
-	private $originalDbName;
-
-	/**
-	 * To limit the number of rows to return.  <code>0</code> means return all
-	 * rows.
-	 */
-	private $limit = 0;
-
-	/** To start the results at a row other than the first one. */
-	private $offset = 0;
-
-	// flag to note that the criteria involves a blob.
-	private $blobFlag = null;
-
-	private $aliases = array();
-
-	private $useTransaction = false;
-
-	/**
-	 * Primary storage of criteria data.
-	 * @var        array
-	 */
-	private $map = array();
-
-	/**
-	 * Creates a new instance with the default capacity which corresponds to
-	 * the specified database.
-	 *
-	 * @param      dbName The dabase name.
-	 */
-	public function __construct($dbName = null)
-	{
-		$this->setDbName($dbName);
-		$this->originalDbName = $dbName;
-	}
-
-	/**
-	 * Implementing SPL IteratorAggregate interface.  This allows
-	 * you to foreach () over a Criteria object.
-	 */
-	public function getIterator()
-	{
-		return new CriterionIterator($this);
-	}
-
-	/**
-	 * Get the criteria map.
-	 * @return     array
-	 */
-	public function getMap()
-	{
-		return $this->map;
-	}
-
-	/**
-	 * Brings this criteria back to its initial state, so that it
-	 * can be reused as if it was new. Except if the criteria has grown in
-	 * capacity, it is left at the current capacity.
-	 * @return     void
-	 */
-	public function clear()
-	{
-		$this->map = array();
-		$this->ignoreCase = false;
-		$this->singleRecord = false;
-		$this->selectModifiers = array();
-		$this->selectColumns = array();
-		$this->orderByColumns = array();
-		$this->groupByColumns = array();
-		$this->having = null;
-		$this->asColumns = array();
-		$this->joins = array();
-		$this->dbName = $this->originalDbName;
-		$this->offset = 0;
-		$this->limit = -1;
-		$this->blobFlag = null;
-		$this->aliases = array();
-		$this->useTransaction = false;
-	}
-
-	/**
-	 * Add an AS clause to the select columns. Usage:
-	 *
-	 * <code>
-	 * Criteria myCrit = new Criteria();
-	 * myCrit->addAsColumn("alias", "ALIAS(".MyPeer::ID.")");
-	 * </code>
-	 *
-	 * @param      string $name Wanted Name of the column (alias).
-	 * @param      string $clause SQL clause to select from the table
-	 *
-	 * If the name already exists, it is replaced by the new clause.
-	 *
-	 * @return     Criteria A modified Criteria object.
-	 */
-	public function addAsColumn($name, $clause)
-	{
-		$this->asColumns[$name] = $clause;
-		return $this;
-	}
-
-	/**
-	 * Get the column aliases.
-	 *
-	 * @return     array An assoc array which map the column alias names
-	 * to the alias clauses.
-	 */
-	public function getAsColumns()
-	{
-		return $this->asColumns;
-	}
-
-		/**
-	 * Returns the column name associated with an alias (AS-column).
-	 *
-	 * @param      string $alias
-	 * @return     string $string
-	 */
-	public function getColumnForAs($as)
-	{
-		if (isset($this->asColumns[$as])) {
-			return $this->asColumns[$as];
-		}
-	}
-
-	/**
-	 * Allows one to specify an alias for a table that can
-	 * be used in various parts of the SQL.
-	 *
-	 * @param      string $alias
-	 * @param      string $table
-	 * @return     void
-	 */
-	public function addAlias($alias, $table)
-	{
-		$this->aliases[$alias] = $table;
-	}
-
-	/**
-	 * Returns the table name associated with an alias.
-	 *
-	 * @param      string $alias
-	 * @return     string $string
-	 */
-	public function getTableForAlias($alias)
-	{
-		if (isset($this->aliases[$alias])) {
-			return $this->aliases[$alias];
-		}
-	}
-
-	/**
-	 * Get the keys for the criteria map.
-	 * @return     array
-	 */
-	public function keys()
-	{
-		return array_keys($this->map);
-	}
-
-	/**
-	 * Does this Criteria object contain the specified key?
-	 *
-	 * @param      string $column [table.]column
-	 * @return     boolean True if this Criteria object contain the specified key.
-	 */
-	public function containsKey($column)
-	{
-		// must use array_key_exists() because the key could
-		// exist but have a NULL value (that'd be valid).
-		return array_key_exists($column, $this->map);
-	}
-
-	/**
-	 * Does this Criteria object contain the specified key and does it have a value set for the key 
-	 *
-	 * @param      string $column [table.]column
-	 * @return     boolean True if this Criteria object contain the specified key and a value for that key
-	 */
-	public function keyContainsValue($column)
-	{
-		// must use array_key_exists() because the key could
-		// exist but have a NULL value (that'd be valid).
-		return (array_key_exists($column, $this->map) && ($this->map[$column]->getValue() !== null) );
-	}
-
-	/**
-	 * Will force the sql represented by this criteria to be executed within
-	 * a transaction.  This is here primarily to support the oid type in
-	 * postgresql.  Though it can be used to require any single sql statement
-	 * to use a transaction.
-	 * @return     void
-	 */
-	public function setUseTransaction($v)
-	{
-		$this->useTransaction = (boolean) $v;
-	}
-
-	/**
-	 * Whether the sql command specified by this criteria must be wrapped
-	 * in a transaction.
-	 *
-	 * @return     boolean
-	 */
-	public function isUseTransaction()
-	{
-		return $this->useTransaction;
-	}
-
-	/**
-	 * Method to return criteria related to columns in a table.
-	 *
-	 * @param      string $column Column name.
-	 * @return     Criterion A Criterion or null if $column is invalid.
-	 */
-	public function getCriterion($column)
-	{
-		if ( isset ( $this->map[$column] ) ) {
-			return $this->map[$column];
-		}
-		return null;
-	}
-
-	/**
-	 * Method to return criterion that is not added automatically
-	 * to this Criteria.  This can be used to chain the
-	 * Criterions to form a more complex where clause.
-	 *
-	 * @param      string $column Full name of column (for example TABLE.COLUMN).
-	 * @param      mixed $value
-	 * @param      string $comparison
-	 * @return     Criterion
-	 */
-	public function getNewCriterion($column, $value, $comparison = null)
-	{
-		return new Criterion($this, $column, $value, $comparison);
-	}
-
-	/**
-	 * Method to return a String table name.
-	 *
-	 * @param      string $name Name of the key.
-	 * @return     string The value of the object at key.
-	 */
-	public function getColumnName($name)
-	{
-		if (isset($this->map[$name])) {
-			return $this->map[$name]->getColumn();
-		}
-		return null;
-	}
-
-	/**
-	 * Shortcut method to get an array of columns indexed by table.
-	 * @return     array array(table => array(table.column1, table.column2))
-	 */
-	public function getTablesColumns()
-	{
-		$tables = array();
-		foreach ( array_keys ( $this->map ) as $key) {
-			$t = substr ( $key, 0, strrpos ( $key, '.' ) );
-			if ( ! isset ( $tables[$t] ) ) {
-				$tables[$t] = array( $key );
-			} else {
-				$tables[$t][] = $key;
-			}
-		}
-		return $tables;
-	}
-
-	/**
-	 * Method to return a comparison String.
-	 *
-	 * @param      string $key String name of the key.
-	 * @return     string A String with the value of the object at key.
-	 */
-	public function getComparison($key)
-	{
-		if ( isset ( $this->map[$key] ) ) {
-			return $this->map[$key]->getComparison();
-		}
-		return null;
-	}
-
-	/**
-	 * Get the Database(Map) name.
-	 *
-	 * @return     string A String with the Database(Map) name.
-	 */
-	public function getDbName()
-	{
-		return $this->dbName;
-	}
-
-	/**
-	 * Set the DatabaseMap name.  If <code>null</code> is supplied, uses value
-	 * provided by <code>Propel::getDefaultDB()</code>.
-	 *
-	 * @param      string $dbName The Database (Map) name.
-	 * @return     void
-	 */
-	public function setDbName($dbName = null)
-	{
-		$this->dbName = ($dbName === null ? Propel::getDefaultDB() : $dbName);
-	}
-
-	/**
-	 * Get the primary table for this Criteria.
-	 *
-	 * This is useful for cases where a Criteria may not contain
-	 * any SELECT columns or WHERE columns.  This must be explicitly
-	 * set, of course, in order to be useful.
-	 *
-	 * @return     string
-	 */
-	public function getPrimaryTableName()
-	{
-		return $this->primaryTableName;
-	}
-
-	/**
-	 * Sets the primary table for this Criteria.
-	 *
-	 * This is useful for cases where a Criteria may not contain
-	 * any SELECT columns or WHERE columns.  This must be explicitly
-	 * set, of course, in order to be useful.
-	 *
-	 * @param      string $v
-	 */
-	public function setPrimaryTableName($tableName)
-	{
-		$this->primaryTableName = $tableName;
-	}
-
-	/**
-	 * Method to return a String table name.
-	 *
-	 * @param      string $name The name of the key.
-	 * @return     string The value of table for criterion at key.
-	 */
-	public function getTableName($name)
-	{
-		if (isset($this->map[$name])) {
-			return $this->map[$name]->getTable();
-		}
-		return null;
-	}
-
-	/**
-	 * Method to return the value that was added to Criteria.
-	 *
-	 * @param      string $name A String with the name of the key.
-	 * @return     mixed The value of object at key.
-	 */
-	public function getValue($name)
-	{
-		if (isset($this->map[$name])) {
-			return $this->map[$name]->getValue();
-		}
-		return null;
-	}
-
-	/**
-	 * An alias to getValue() -- exposing a Hashtable-like interface.
-	 *
-	 * @param      string $key An Object.
-	 * @return     mixed The value within the Criterion (not the Criterion object).
-	 */
-	public function get($key)
-	{
-		return $this->getValue($key);
-	}
-
-	/**
-	 * Overrides Hashtable put, so that this object is returned
-	 * instead of the value previously in the Criteria object.
-	 * The reason is so that it more closely matches the behavior
-	 * of the add() methods. If you want to get the previous value
-	 * then you should first Criteria.get() it yourself. Note, if
-	 * you attempt to pass in an Object that is not a String, it will
-	 * throw a NPE. The reason for this is that none of the add()
-	 * methods support adding anything other than a String as a key.
-	 *
-	 * @param      string $key
-	 * @param      mixed $value
-	 * @return     Instance of self.
-	 */
-	public function put($key, $value)
-	{
-		return $this->add($key, $value);
-	}
-
-	/**
-	 * Copies all of the mappings from the specified Map to this Criteria
-	 * These mappings will replace any mappings that this Criteria had for any
-	 * of the keys currently in the specified Map.
-	 *
-	 * if the map was another Criteria, its attributes are copied to this
-	 * Criteria, overwriting previous settings.
-	 *
-	 * @param      mixed $t Mappings to be stored in this map.
-	 */
-	public function putAll($t)
-	{
-
-		if (is_array($t)) {
-
-			foreach ($t as $key=>$value) {
-
-				if ($value instanceof Criterion) {
-
-					$this->map[$key] = $value;
-
-				} else {
-
-					$this->put($key, $value);
-
-				}
-
-			}
-
-		} elseif ($t instanceof Criteria) {
-
-			$this->joins = $t->joins;
-
-		}
-
-	}
-
-
-	/**
-	 * This method adds a new criterion to the list of criterias.
-	 * If a criterion for the requested column already exists, it is
-	 * replaced. If is used as follow:
-	 *
-	 * <p>
-	 * <code>
-	 * $crit = new Criteria();
-	 * $crit->add(&quot;column&quot;,
-	 *                                      &quot;value&quot;
-	 *                                      &quot;Criteria::GREATER_THAN&quot;);
-	 * </code>
-	 *
-	 * Any comparison can be used.
-	 *
-	 * The name of the table must be used implicitly in the column name,
-	 * so the Column name must be something like 'TABLE.id'. If you
-	 * don't like this, you can use the add(table, column, value) method.
-	 *
-	 * @param      string $critOrColumn The column to run the comparison on, or Criterion object.
-	 * @param      mixed $value
-	 * @param      string $comparison A String.
-	 *
-	 * @return     A modified Criteria object.
-	 */
-	public function add($p1, $value = null, $comparison = null)
-	{
-		if ($p1 instanceof Criterion) {
-			$this->map[$p1->getTable() . '.' . $p1->getColumn()] = $p1;
-		} else {
-			$this->map[$p1] = new Criterion($this, $p1, $value, $comparison);
-		}
-		return $this;
-	}
-
-	/**
-	 * This is the way that you should add a straight (inner) join of two tables.  For
-	 * example:
-	 *
-	 * <p>
-	 * AND PROJECT.PROJECT_ID=FOO.PROJECT_ID
-	 * <p>
-	 *
-	 * left = PROJECT.PROJECT_ID
-	 * right = FOO.PROJECT_ID
-	 *
-	 * @param      mixed $left A String with the left side of the join.
-	 * @param      mixed $right A String with the right side of the join.
-	 * @param      mixed $operator A String with the join operator e.g. LEFT JOIN, ...
-   *
-	 * @return     Criteria A modified Criteria object.
-	 */
-	public function addJoin($left, $right, $operator = null)
-	{
-		$join = new Join();
-    if (!is_array($left)) {
-      // simple join
-      $join->addCondition($left, $right);
-    } else {
-      // join with multiple conditions
-      // deprecated: use addMultipleJoin() instead
-      foreach ($left as $key => $value)
-      {
-        $join->addCondition($value, $right[$key]);
-      }
-    }
-		$join->setJoinType($operator);
-		
-		return $this->addJoinObject($join);
-	}
-
-	/**
-	 * Add a join with multiple conditions
-	 * see http://propel.phpdb.org/trac/ticket/167, http://propel.phpdb.org/trac/ticket/606
-	 * 
-	 * Example usage:
-	 * $c->addMultipleJoin(array(
-	 *     array(LeftPeer::LEFT_COLUMN, RightPeer::RIGHT_COLUMN),  // if no third argument, defaults to Criteria::EQUAL
-	 *     array(FoldersPeer::alias( 'fo', FoldersPeer::LFT ), FoldersPeer::alias( 'parent', FoldersPeer::RGT ), Criteria::LESS_EQUAL )
-	 *   ),
-	 *   Criteria::LEFT_JOIN
- 	 * );
-	 * 
-	 * @see        addJoin()
-	 * @param      array $conditions An array of conditions, each condition being an array (left, right, operator)
-	 * @param      string $joinType  A String with the join operator. Defaults to an implicit join.
-	 *
-	 * @return     Criteria A modified Criteria object.
-	 */
-	public function addMultipleJoin($conditions, $joinType = null) 
-  {
-		$join = new Join();
-		foreach ($conditions as $condition) {
-		  $join->addCondition($condition[0], $condition[1], isset($condition[2]) ? $condition[2] : Criteria::EQUAL);
-		}
-		$join->setJoinType($joinType);
-		
-		return $this->addJoinObject($join);
-	}
-	
-	/**
-	 * Add a join object to the Criteria
-	 *
-	 * @param Join $join A join object
-	 *
-	 * @return Criteria A modified Criteria object
-	 */
-	public function addJoinObject(Join $join)
-	{
-	  if (!in_array($join, $this->joins)) { // compare equality, NOT identity
-			$this->joins[] = $join;
-		}
-		return $this;
-	}
-
-
-	/**
-	 * Get the array of Joins.
-	 * @return     array Join[]
-	 */
-	public function getJoins()
-	{
-		return $this->joins;
-	}
-
-	/**
-	 * Adds "ALL" modifier to the SQL statement.
-	 * @return     Criteria Modified Criteria object (for fluent API)
-	 */
-	public function setAll()
-	{
-		$this->selectModifiers[] = self::ALL;
-		return $this;
-	}
-
-	/**
-	 * Adds "DISTINCT" modifier to the SQL statement.
-	 * @return     Criteria Modified Criteria object (for fluent API)
-	 */
-	public function setDistinct()
-	{
-		$this->selectModifiers[] = self::DISTINCT;
-		return $this;
-	}
-
-	/**
-	 * Sets ignore case.
-	 *
-	 * @param      boolean $b True if case should be ignored.
-	 * @return     Criteria Modified Criteria object (for fluent API)
-	 */
-	public function setIgnoreCase($b)
-	{
-		$this->ignoreCase = (boolean) $b;
-		return $this;
-	}
-
-	/**
-	 * Is ignore case on or off?
-	 *
-	 * @return     boolean True if case is ignored.
-	 */
-	public function isIgnoreCase()
-	{
-		return $this->ignoreCase;
-	}
-
-	/**
-	 * Set single record?  Set this to <code>true</code> if you expect the query
-	 * to result in only a single result record (the default behaviour is to
-	 * throw a PropelException if multiple records are returned when the query
-	 * is executed).  This should be used in situations where returning multiple
-	 * rows would indicate an error of some sort.  If your query might return
-	 * multiple records but you are only interested in the first one then you
-	 * should be using setLimit(1).
-	 *
-	 * @param      boolean $b Set to TRUE if you expect the query to select just one record.
-	 * @return     Criteria Modified Criteria object (for fluent API)
-	 */
-	public function setSingleRecord($b)
-	{
-		$this->singleRecord = (boolean) $b;
-		return $this;
-	}
-
-	/**
-	 * Is single record?
-	 *
-	 * @return     boolean True if a single record is being returned.
-	 */
-	public function isSingleRecord()
-	{
-		return $this->singleRecord;
-	}
-
-	/**
-	 * Set limit.
-	 *
-	 * @param      limit An int with the value for limit.
-	 * @return     Criteria Modified Criteria object (for fluent API)
-	 */
-	public function setLimit($limit)
-	{
-		// TODO: do we enforce int here? 32bit issue if we do
-		$this->limit = $limit;
-		return $this;
-	}
-
-	/**
-	 * Get limit.
-	 *
-	 * @return     int An int with the value for limit.
-	 */
-	public function getLimit()
-	{
-		return $this->limit;
-	}
-
-	/**
-	 * Set offset.
-	 *
-	 * @param      int $offset An int with the value for offset.  (Note this values is
-	 * 							cast to a 32bit integer and may result in truncatation)
-	 * @return     Criteria Modified Criteria object (for fluent API)
-	 */
-	public function setOffset($offset)
-	{
-		$this->offset = (int) $offset;
-		return $this;
-	}
-
-	/**
-	 * Get offset.
-	 *
-	 * @return     An int with the value for offset.
-	 */
-	public function getOffset()
-	{
-		return $this->offset;
-	}
-
-	/**
-	 * Add select column.
-	 *
-	 * @param      string $name Name of the select column.
-	 * @return     Criteria Modified Criteria object (for fluent API)
-	 */
-	public function addSelectColumn($name)
-	{
-		$this->selectColumns[] = $name;
-		return $this;
-	}
-	
-	/**
-	 * Whether this Criteria has any select columns.
-	 * 
-	 * This will include columns added with addAsColumn() method.
-	 *
-	 * @return     boolean
-	 * @see        addAsColumn()
-	 * @see        addSelectColumn()
-	 */
-	public function hasSelectClause()
-	{
-		return (!empty($this->selectColumns) || !empty($this->asColumns));
-	}
-	
-	/**
-	 * Get select columns.
-	 *
-	 * @return     array An array with the name of the select
-	 * columns.
-	 */
-	public function getSelectColumns()
-	{
-		return $this->selectColumns;
-	}
-
-	/**
-	 * Clears current select columns.
-	 *
-	 * @return     Criteria Modified Criteria object (for fluent API)
-	 */
-	public function clearSelectColumns() {
-		$this->selectColumns = $this->asColumns = array();
-		return $this;
-	}
-
-	/**
-	 * Get select modifiers.
-	 *
-	 * @return     An array with the select modifiers.
-	 */
-	public function getSelectModifiers()
-	{
-		return $this->selectModifiers;
-	}
-
-	/**
-	 * Add group by column name.
-	 *
-	 * @param      string $groupBy The name of the column to group by.
-	 * @return     A modified Criteria object.
-	 */
-	public function addGroupByColumn($groupBy)
-	{
-		$this->groupByColumns[] = $groupBy;
-		return $this;
-	}
-
-	/**
-	 * Add order by column name, explicitly specifying ascending.
-	 *
-	 * @param      name The name of the column to order by.
-	 * @return     A modified Criteria object.
-	 */
-	public function addAscendingOrderByColumn($name)
-	{
-		$this->orderByColumns[] = $name . ' ' . self::ASC;
-		return $this;
-	}
-
-	/**
-	 * Add order by column name, explicitly specifying descending.
-	 *
-	 * @param      string $name The name of the column to order by.
-	 * @return     Criteria Modified Criteria object (for fluent API)
-	 */
-	public function addDescendingOrderByColumn($name)
-	{
-		$this->orderByColumns[] = $name . ' ' . self::DESC;
-		return $this;
-	}
-
-	/**
-	 * Get order by columns.
-	 *
-	 * @return     array An array with the name of the order columns.
-	 */
-	public function getOrderByColumns()
-	{
-		return $this->orderByColumns;
-	}
-
-	/**
-	 * Clear the order-by columns.
-	 *
-	 * @return     Criteria Modified Criteria object (for fluent API)
-	 */
-	public function clearOrderByColumns()
-	{
-		$this->orderByColumns = array();
-		return $this;
-	}
-
-	/**
-	 * Clear the group-by columns.
-	 *
-	 * @return     Criteria
-	 */
-	public function clearGroupByColumns()
-	{
-		$this->groupByColumns = array();
-		return $this;
-	}
-
-	/**
-	 * Get group by columns.
-	 *
-	 * @return     array
-	 */
-	public function getGroupByColumns()
-	{
-		return $this->groupByColumns;
-	}
-
-	/**
-	 * Get Having Criterion.
-	 *
-	 * @return     Criterion A Criterion object that is the having clause.
-	 */
-	public function getHaving()
-	{
-		return $this->having;
-	}
-
-	/**
-	 * Remove an object from the criteria.
-	 *
-	 * @param      string $key A string with the key to be removed.
-	 * @return     mixed The removed value.
-	 */
-	public function remove($key)
-	{
-		if ( isset ( $this->map[$key] ) ) {
-			$removed = $this->map[$key];
-			unset ( $this->map[$key] );
-			if ( $removed instanceof Criterion ) {
-				return $removed->getValue();
-			}
-			return $removed;
-		}
-	}
-
-	/**
-	 * Build a string representation of the Criteria.
-	 *
-	 * @return     string A String with the representation of the Criteria.
-	 */
-	public function toString()
-	{
-
-		$sb = "Criteria:";
-		try {
-
-			$params = array();
-			$sb .= "\nSQL (may not be complete): "
-			  . BasePeer::createSelectSql($this, $params);
-
-			$sb .= "\nParams: ";
-			$paramstr = array();
-			foreach ($params as $param) {
-				$paramstr[] = $param['table'] . '.' . $param['column'] . ' => ' . var_export($param['value'], true);
-			}
-			$sb .= implode(", ", $paramstr);
-
-		} catch (Exception $exc) {
-			$sb .= "(Error: " . $exc->getMessage() . ")";
-		}
-
-		return $sb;
-	}
-
-	/**
-	 * Returns the size (count) of this criteria.
-	 * @return     int
-	 */
-	public function size()
-	{
-		return count($this->map);
-	}
-
-	/**
-	 * This method checks another Criteria to see if they contain
-	 * the same attributes and hashtable entries.
-	 * @return     boolean
-	 */
-	public function equals($crit)
-	{
-		$isEquiv = false;
-		if ($crit === null || !($crit instanceof Criteria)) {
-			$isEquiv = false;
-		} elseif ($this === $crit) {
-			$isEquiv = true;
-		} elseif ($this->size() === $crit->size()) {
-
-			// Important: nested criterion objects are checked
-
-			$criteria = $crit; // alias
-			if ($this->offset === $criteria->getOffset()
-				&& $this->limit === $criteria->getLimit()
-				&& $this->ignoreCase === $criteria->isIgnoreCase()
-				&& $this->singleRecord === $criteria->isSingleRecord()
-				&& $this->dbName === $criteria->getDbName()
-				&& $this->selectModifiers === $criteria->getSelectModifiers()
-				&& $this->selectColumns === $criteria->getSelectColumns()
-				&& $this->orderByColumns === $criteria->getOrderByColumns()
-				&& $this->groupByColumns === $criteria->getGroupByColumns()
-			   )
-			{
-				$isEquiv = true;
-				foreach ($criteria->keys() as $key) {
-					if ($this->containsKey($key)) {
-						$a = $this->getCriterion($key);
-						$b = $criteria->getCriterion($key);
-						if (!$a->equals($b)) {
-							$isEquiv = false;
-							break;
-						}
-					} else {
-						$isEquiv = false;
-						break;
-					}
-				}
-			}
-		}
-		return $isEquiv;
-	}
-
-	/**
-	 * This method adds a prepared Criterion object to the Criteria as a having clause.
-	 * You can get a new, empty Criterion object with the
-	 * getNewCriterion() method.
-	 *
-	 * <p>
-	 * <code>
-	 * $crit = new Criteria();
-	 * $c = $crit->getNewCriterion(BasePeer::ID, 5, Criteria::LESS_THAN);
-	 * $crit->addHaving($c);
-	 * </code>
-	 *
-	 * @param      having A Criterion object
-	 *
-	 * @return     A modified Criteria object.
-	 */
-	public function addHaving(Criterion $having)
-	{
-		$this->having = $having;
-		return $this;
-	}
-
-	/**
-	 * This method adds a new criterion to the list of criterias.
-	 * If a criterion for the requested column already exists, it is
-	 * "AND"ed to the existing criterion.
-	  *
-	 * addAnd(column, value, comparison)
-	 * <code>
-	 * $crit = $orig_crit->addAnd(&quot;column&quot;,
-	 *                                      &quot;value&quot;
-	 *                                      &quot;Criterion::GREATER_THAN&quot;);
-	 * </code>
-	 *
-	 * addAnd(column, value)
-	 * <code>
-	 * $crit = $orig_crit->addAnd(&quot;column&quot;, &quot;value&quot;);
-	 * </code>
-	 *
-	 * addAnd(Criterion)
-	 * <code>
-	 * $crit = new Criteria();
-	 * $c = $crit->getNewCriterion(BasePeer::ID, 5, Criteria::LESS_THAN);
-	 * $crit->addAnd($c);
-	 * </code>
-	 *
-	 * Any comparison can be used, of course.
-	 *
-	 *
-	 * @return     Criteria A modified Criteria object.
-	 */
-	public function addAnd($p1, $p2 = null, $p3 = null)
-	{
-		if ($p3 !== null) {
-			// addAnd(column, value, comparison)
-			$oc = $this->getCriterion($p1);
-			$nc = new Criterion($this, $p1, $p2, $p3);
-			if ( $oc === null) {
-				$this->map[$p1] = $nc;
-			} else {
-				$oc->addAnd($nc);
-			}
-		} elseif ($p2 !== null) {
-			// addAnd(column, value)
-			$this->addAnd($p1, $p2, self::EQUAL);
-		} elseif ($p1 instanceof Criterion) {
-			// addAnd(Criterion)
-			$oc = $this->getCriterion($p1->getTable() . '.' . $p1->getColumn());
-			if ($oc === null) {
-				$this->add($p1);
-			} else {
-				$oc->addAnd($p1);
-			}
-		} elseif ($p2 === null && $p3 === null) {
-			// client has not specified $p3 (comparison)
-			// which means Criteria::EQUAL but has also specified $p2 == null
-			// which is a valid combination we should handle by creating "IS NULL"
-			$this->addAnd($p1, $p2, self::EQUAL);
-		}
-		return $this;
-	}
-
-	/**
-	 * This method adds a new criterion to the list of criterias.
-	 * If a criterion for the requested column already exists, it is
-	 * "OR"ed to the existing criterion.
-	 *
-	 * Any comparison can be used.
-	 *
-	 * Supports a number of different signatures:
-	 *
-	 * addOr(column, value, comparison)
-	 * <code>
-	 * $crit = $orig_crit->addOr(&quot;column&quot;,
-	 *                                      &quot;value&quot;
-	 *                                      &quot;Criterion::GREATER_THAN&quot;);
-	 * </code>
-	 *
-	 * addOr(column, value)
-	 * <code>
-	 * $crit = $orig_crit->addOr(&quot;column&quot;, &quot;value&quot;);
-	 * </code>
-	 *
-	 * addOr(Criterion)
-	 *
-	 * @return     Criteria A modified Criteria object.
-	 */
-	public function addOr($p1, $p2 = null, $p3 = null)
-	{
-		if ($p3 !== null) {
-			// addOr(column, value, comparison)
-			$nc = new Criterion($this, $p1, $p2, $p3);
-			$oc = $this->getCriterion($p1);
-			if ($oc === null) {
-				$this->map[$p1] = $nc;
-			} else {
-				$oc->addOr($nc);
-			}
-		} elseif ($p2 !== null) {
-			// addOr(column, value)
-			$this->addOr($p1, $p2, self::EQUAL);
-		} elseif ($p1 instanceof Criterion) {
-			// addOr(Criterion)
-			$oc = $this->getCriterion($p1->getTable() . '.' . $p1->getColumn());
-			if ($oc === null) {
-				$this->add($p1);
-			} else {
-				$oc->addOr($p1);
-			}
-		} elseif ($p2 === null && $p3 === null) {
-			// client has not specified $p3 (comparison)
-			// which means Criteria::EQUAL but has also specified $p2 == null
-			// which is a valid combination we should handle by creating "IS NULL"
-			$this->addOr($p1, $p2, self::EQUAL);
-		}
-
-		return $this;
-	}
-}
-
-// --------------------------------------------------------------------
-// Criterion Iterator class -- allows foreach ($criteria as $criterion)
-// --------------------------------------------------------------------
-
-/**
- * Class that implements SPL Iterator interface.  This allows foreach () to
- * be used w/ Criteria objects.  Probably there is no performance advantage
- * to doing it this way, but it makes sense -- and simpler code.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @package    propel.util
- */
-class CriterionIterator implements Iterator {
-
-	private $idx = 0;
-	private $criteria;
-	private $criteriaKeys;
-	private $criteriaSize;
-
-	public function __construct(Criteria $criteria) {
-		$this->criteria = $criteria;
-		$this->criteriaKeys = $criteria->keys();
-		$this->criteriaSize = count($this->criteriaKeys);
-	}
-
-	public function rewind() {
-		$this->idx = 0;
-	}
-
-	public function valid() {
-		return $this->idx < $this->criteriaSize;
-	}
-
-	public function key() {
-		return $this->criteriaKeys[$this->idx];
-	}
-
-	public function current() {
-		return $this->criteria->getCriterion($this->criteriaKeys[$this->idx]);
-	}
-
-	public function next() {
-		$this->idx++;
-	}
-
-}
-
-// --------------------------------------------------------------------
-// Criterion "inner" class
-// --------------------------------------------------------------------
-
-/**
- * This is an "inner" class that describes an object in the criteria.
- *
- * In Torque this is an inner class of the Criteria class.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @package    propel.util
- */
-class Criterion  {
-
-	const UND = " AND ";
-	const ODER = " OR ";
-
-	/** Value of the CO. */
-	private $value;
-
-	/** Comparison value.
-	 * @var        SqlEnum
-	 */
-	private $comparison;
-
-	/** Table name. */
-	private $table;
-
-	/** Real table name */
-	private $realtable;
-
-	/** Column name. */
-	private $column;
-
-	/** flag to ignore case in comparision */
-	private $ignoreStringCase = false;
-
-	/**
-	 * The DBAdaptor which might be used to get db specific
-	 * variations of sql.
-	 */
-	private $db;
-
-	/**
-	 * other connected criteria and their conjunctions.
-	 */
-	private $clauses = array();
-	private $conjunctions = array();
-
-	/** "Parent" Criteria class */
-	private $parent;
-
-	/**
-	 * Create a new instance.
-	 *
-	 * @param      Criteria $parent The outer class (this is an "inner" class).
-	 * @param      string $column TABLE.COLUMN format.
-	 * @param      mixed $value
-	 * @param      string $comparison
-	 */
-	public function __construct(Criteria $outer, $column, $value, $comparison = null)
-	{
-		$this->value = $value;
-		$dotPos = strrpos($column,'.');
-		if ($dotPos === false) {
-			// no dot => aliased column
-			$this->table = null;
-			$this->column = $column;
-		} else {
-			$this->table = substr($column, 0, $dotPos); 
-			$this->column = substr($column, $dotPos+1, strlen($column));
-		}
-		$this->comparison = ($comparison === null ? Criteria::EQUAL : $comparison);
-		$this->init($outer);
-	}
-
-	/**
-	* Init some properties with the help of outer class
-	* @param      Criteria $criteria The outer class
-	*/
-	public function init(Criteria $criteria)
-	{
-		//init $this->db
-		try {
-			$db = Propel::getDB($criteria->getDbName());
-			$this->setDB($db);
-		} catch (Exception $e) {
-			// we are only doing this to allow easier debugging, so
-			// no need to throw up the exception, just make note of it.
-			Propel::log("Could not get a DBAdapter, sql may be wrong", Propel::LOG_ERR);
-		}
-
-		//init $this->realtable
-		$realtable = $criteria->getTableForAlias($this->table);
-		if (! strlen ( $realtable ) ) {
-			$realtable = $this->table;
-		}
-		$this->realtable = $realtable;
-
-	}
-
-	/**
-	 * Get the column name.
-	 *
-	 * @return     string A String with the column name.
-	 */
-	public function getColumn()
-	{
-		return $this->column;
-	}
-
-	/**
-	 * Set the table name.
-	 *
-	 * @param      name A String with the table name.
-	 * @return     void
-	 */
-	public function setTable($name)
-	{
-		$this->table = $name;
-	}
-
-	/**
-	 * Get the table name.
-	 *
-	 * @return     string A String with the table name.
-	 */
-	public function getTable()
-	{
-		return $this->table;
-	}
-
-	/**
-	 * Get the comparison.
-	 *
-	 * @return     string A String with the comparison.
-	 */
-	public function getComparison()
-	{
-		return $this->comparison;
-	}
-
-	/**
-	 * Get the value.
-	 *
-	 * @return     mixed An Object with the value.
-	 */
-	public function getValue()
-	{
-		return $this->value;
-	}
-
-	/**
-	 * Get the value of db.
-	 * The DBAdapter which might be used to get db specific
-	 * variations of sql.
-	 * @return     DBAdapter value of db.
-	 */
-	public function getDB()
-	{
-		return $this->db;
-	}
-
-	/**
-	 * Set the value of db.
-	 * The DBAdapter might be used to get db specific variations of sql.
-	 * @param      DBAdapter $v Value to assign to db.
-	 * @return     void
-	 */
-	public function setDB(DBAdapter $v)
-	{
-		$this->db = $v;
-		foreach ( $this->clauses as $clause ) {
-			$clause->setDB($v);
-		}
-	}
-
-	/**
-	 * Sets ignore case.
-	 *
-	 * @param      boolean $b True if case should be ignored.
-	 * @return     Criterion A modified Criterion object.
-	 */
-	public function setIgnoreCase($b)
-	{
-		$this->ignoreStringCase = (boolean) $b;
-		return $this;
-	}
-
-	/**
-	 * Is ignore case on or off?
-	 *
-	 * @return     boolean True if case is ignored.
-	 */
-	 public function isIgnoreCase()
-	 {
-		 return $this->ignoreStringCase;
-	 }
-
-	/**
-	 * Get the list of clauses in this Criterion.
-	 * @return     array
-	 */
-	private function getClauses()
-	{
-		return $this->clauses;
-	}
-
-	/**
-	 * Get the list of conjunctions in this Criterion
-	 * @return     array
-	 */
-	public function getConjunctions()
-	{
-		return $this->conjunctions;
-	}
-
-	/**
-	 * Append an AND Criterion onto this Criterion's list.
-	 */
-	public function addAnd(Criterion $criterion)
-	{
-		$this->clauses[] = $criterion;
-		$this->conjunctions[] = self::UND;
-		return $this;
-	}
-
-	/**
-	 * Append an OR Criterion onto this Criterion's list.
-	 * @return     Criterion
-	 */
-	public function addOr(Criterion $criterion)
-	{
-		$this->clauses[] = $criterion;
-		$this->conjunctions[] = self::ODER;
-		return $this;
-	}
-
-	/**
-	 * Appends a Prepared Statement representation of the Criterion
-	 * onto the buffer.
-	 *
-	 * @param      string &$sb The string that will receive the Prepared Statement
-	 * @param      array $params A list to which Prepared Statement parameters
-	 * will be appended
-	 * @return     void
-	 * @throws     PropelException - if the expression builder cannot figure out how to turn a specified
-	 *                           expression into proper SQL.
-	 */
-	public function appendPsTo(&$sb, array &$params)
-	{
-		if ($this->column === null) {
-			return;
-		}
-
-		$db = $this->getDb();
-		$sb .= str_repeat ( '(', count($this->clauses) );
-
-		if (Criteria::CUSTOM === $this->comparison) {
-			if ($this->value !== "") {
-				$sb .= (string) $this->value;
-			}
-		} else {
-
-			if  ($this->table === null) {
-				$field = $this->column;
-			} else {
-				$field = $this->table . '.' . $this->column;
-			}
-
-			// Check to see if table is an alias & store real name, if so
-			// (real table name is needed for the returned $params array)
-			$realtable = $this->realtable;
-
-			// There are several different types of expressions that need individual handling:
-			// IN/NOT IN, LIKE/NOT LIKE, and traditional expressions.
-
-			// OPTION 1:  table.column IN (?, ?) or table.column NOT IN (?, ?)
-			if ($this->comparison === Criteria::IN || $this->comparison === Criteria::NOT_IN) {
-				
-				$_bindParams = array(); // the param names used in query building
-				$_idxstart = count($params);
-				$valuesLength = 0;
-				foreach ( (array) $this->value as $value ) {
-					$valuesLength++; // increment this first to correct for wanting bind params to start with :p1
-					$params[] = array('table' => $realtable, 'column' => $this->column, 'value' => $value);
-					$_bindParams[] = ':p'.($_idxstart + $valuesLength);
-				}
-				if ( $valuesLength !== 0 ) {
-					$sb .= $field . $this->comparison . '(' . implode(',', $_bindParams) . ')';
-				} else {
-					$sb .= ($this->comparison === Criteria::IN) ? "1<>1" : "1=1";
-				}
-				unset ( $value, $valuesLength );
-
-			// OPTION 2:  table.column LIKE ? or table.column NOT LIKE ?  (or ILIKE for Postgres)
-			} elseif ($this->comparison === Criteria::LIKE || $this->comparison === Criteria::NOT_LIKE
-				|| $this->comparison === Criteria::ILIKE || $this->comparison === Criteria::NOT_ILIKE) {
-				// Handle LIKE, NOT LIKE (and related ILIKE, NOT ILIKE for Postgres)
-
-				// If selection is case insensitive use ILIKE for PostgreSQL or SQL
-				// UPPER() function on column name for other databases.
-				if ($this->ignoreStringCase) {
-					if ($db instanceof DBPostgres) {
-						if ($this->comparison === Criteria::LIKE) {
-							$this->comparison = Criteria::ILIKE;
-						} elseif ($this->comparison === Criteria::NOT_LIKE) {
-							$this->comparison = Criteria::NOT_ILIKE;
-						}
-					} else {
-						$field = $db->ignoreCase($field);
-					}
-				}
-				
-				$params[] = array('table' => $realtable, 'column' => $this->column, 'value' => $this->value);
-				
-				$sb .= $field . $this->comparison;
-
-				// If selection is case insensitive use SQL UPPER() function
-				// on criteria or, if Postgres we are using ILIKE, so not necessary.
-				if ($this->ignoreStringCase && !($db instanceof DBPostgres)) {
-					$sb .= $db->ignoreCase(':p'.count($params));
-				} else {
-					$sb .= ':p'.count($params);
-				}
-				
-			// OPTION 3:  table.column = ? or table.column >= ? etc. (traditional expressions, the default)
-			} else {
-
-				// NULL VALUES need special treatment because the SQL syntax is different
-				// i.e. table.column IS NULL rather than table.column = null
-				if ($this->value !== null) {
-
-					// ANSI SQL functions get inserted right into SQL (not escaped, etc.)
-					if ($this->value === Criteria::CURRENT_DATE || $this->value === Criteria::CURRENT_TIME || $this->value === Criteria::CURRENT_TIMESTAMP) {
-						$sb .= $field . $this->comparison . $this->value;
-					} else {
-						
-						$params[] = array('table' => $realtable, 'column' => $this->column, 'value' => $this->value);
-						
-						// default case, it is a normal col = value expression; value
-						// will be replaced w/ '?' and will be inserted later using PDO bindValue()
-						if ($this->ignoreStringCase) {
-							$sb .= $db->ignoreCase($field) . $this->comparison . $db->ignoreCase(':p'.count($params));
-						} else {
-							$sb .= $field . $this->comparison . ':p'.count($params);
-						}
-						
-					}
-				} else {
-
-					// value is null, which means it was either not specified or specifically
-					// set to null.
-					if ($this->comparison === Criteria::EQUAL || $this->comparison === Criteria::ISNULL) {
-						$sb .= $field . Criteria::ISNULL;
-					} elseif ($this->comparison === Criteria::NOT_EQUAL || $this->comparison === Criteria::ISNOTNULL) {
-						$sb .= $field . Criteria::ISNOTNULL;
-					} else {
-						// for now throw an exception, because not sure how to interpret this
-						throw new PropelException("Could not build SQL for expression: $field " . $this->comparison . " NULL");
-					}
-
-				}
-
-			}
-		}
-
-		foreach ( $this->clauses as $key=>$clause ) {
-			$sb .= $this->conjunctions[$key];
-			$clause->appendPsTo($sb, $params);
-			$sb .= ')';
-		}
-	}
-
-	/**
-	 * This method checks another Criteria to see if they contain
-	 * the same attributes and hashtable entries.
-	 * @return     boolean
-	 */
-	public function equals($obj)
-	{
-		// TODO: optimize me with early outs
-		if ($this === $obj) {
-			return true;
-		}
-
-		if (($obj === null) || !($obj instanceof Criterion)) {
-			return false;
-		}
-
-		$crit = $obj;
-
-		$isEquiv = ( ( ($this->table === null && $crit->getTable() === null)
-			|| ( $this->table !== null && $this->table === $crit->getTable() )
-						  )
-			&& $this->column === $crit->getColumn()
-			&& $this->comparison === $crit->getComparison());
-
-		// check chained criterion
-
-		$clausesLength = count($this->clauses);
-		$isEquiv &= (count($crit->getClauses()) == $clausesLength);
-		$critConjunctions = $crit->getConjunctions();
-		$critClauses = $crit->getClauses();
-		for ($i=0; $i < $clausesLength && $isEquiv; $i++) {
-			$isEquiv &= ($this->conjunctions[$i] === $critConjunctions[$i]);
-			$isEquiv &= ($this->clauses[$i] === $critClauses[$i]);
-		}
-
-		if ($isEquiv) {
-			$isEquiv &= $this->value === $crit->getValue();
-		}
-
-		return $isEquiv;
-	}
-
-	/**
-	 * Returns a hash code value for the object.
-	 */
-	public function hashCode()
-	{
-		$h = crc32(serialize($this->value)) ^ crc32($this->comparison);
-
-		if ($this->table !== null) {
-			$h ^= crc32($this->table);
-		}
-
-		if ($this->column !== null) {
-			$h ^= crc32($this->column);
-		}
-
-		foreach ( $this->clauses as $clause ) {
-			// TODO: i KNOW there is a php incompatibility with the following line
-			// but i dont remember what it is, someone care to look it up and
-			// replace it if it doesnt bother us?
-			// $clause->appendPsTo($sb='',$params=array());
-			$sb = '';
-			$params = array();
-			$clause->appendPsTo($sb,$params);
-			$h ^= crc32(serialize(array($sb,$params)));
-			unset ( $sb, $params );
-		}
-
-		return $h;
-	}
-
-	/**
-	 * Get all tables from nested criterion objects
-	 * @return     array
-	 */
-	public function getAllTables()
-	{
-		$tables = array();
-		$this->addCriterionTable($this, $tables);
-		return $tables;
-	}
-
-	/**
-	 * method supporting recursion through all criterions to give
-	 * us a string array of tables from each criterion
-	 * @return     void
-	 */
-	private function addCriterionTable(Criterion $c, array &$s)
-	{
-		$s[] = $c->getTable();
-		foreach ( $c->getClauses() as $clause ) {
-			$this->addCriterionTable($clause, $s);
-		}
-	}
-
-	/**
-	 * get an array of all criterion attached to this
-	 * recursing through all sub criterion
-	 * @return     array Criterion[]
-	 */
-	public function getAttachedCriterion()
-	{
-		$crits = array();
-		$this->traverseCriterion($this, $crits);
-		return $crits;
-	}
-
-	/**
-	 * method supporting recursion through all criterions to give
-	 * us an array of them
-	 * @param      Criterion $c
-	 * @param      array &$a
-	 * @return     void
-	 */
-	private function traverseCriterion(Criterion $c, array &$a)
-	{
-		$a[] = $c;
-		foreach ( $c->getClauses() as $clause ) {
-			$this->traverseCriterion($clause, $a);
-		}
-	}
-}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/DebugPDO.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/DebugPDO.php
deleted file mode 100644
index a546b6c95..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/DebugPDO.php
+++ /dev/null
@@ -1,550 +0,0 @@
-<?php
-/*
- *  $Id: DebugPDO.php 1343 2009-11-29 22:36:48Z david $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * PDO connection subclass that provides some basic support for query counting and logging.
- *
- * This class is ONLY intended for development use.  This class is also a work in-progress
- * and, as such, it should be expected that this class' API may change.
- * 
- * The following runtime configuration items affect the behaviour of this class:
- * 
- * - debugpdo.logging.enabled (default: true)
- *   Should any logging take place
- * 
- * - debugpdo.logging.innerglue (default: ": ")
- *   String to use for combining the title of a detail and its value
- * 
- * - debugpdo.logging.outerglue (default: " | ")
- *   String to use for combining details together on a log line
- * 
- * - debugpdo.logging.realmemoryusage (default: false)
- *   Parameter to memory_get_usage() and memory_get_peak_usage() calls 
- * 
- * - debugpdo.logging.methods (default: DebugPDO::$defaultLogMethods)
- *   An array of method names ("Class::method") to be included in method call logging
- * 
- * - debugpdo.logging.onlyslow (default: false)
- *   Suppress logging of non-slow queries.
- * 
- * - debugpdo.logging.details.slow.enabled (default: false)
- *   Enables flagging of slow method calls
- * 
- * - debugpdo.logging.details.slow.threshold (default: 0.1)
- *   Method calls taking more seconds than this threshold are considered slow 
- * 
- * - debugpdo.logging.details.time.enabled (default: false)
- *   Enables logging of method execution times
- * 
- * - debugpdo.logging.details.time.precision (default: 3)
- *   Determines the precision of the execution time logging
- * 
- * - debugpdo.logging.details.time.pad (default: 10)
- *   How much horizontal space to reserve for the execution time on a log line
- * 
- * - debugpdo.logging.details.mem.enabled (default: false)
- *   Enables logging of the instantaneous PHP memory consumption
- * 
- * - debugpdo.logging.details.mem.precision (default: 1)
- *   Determines the precision of the memory consumption logging
- * 
- * - debugpdo.logging.details.mem.pad (default: 9)
- *   How much horizontal space to reserve for the memory consumption on a log line
- * 
- * - debugpdo.logging.details.memdelta.enabled (default: false)
- *   Enables logging differences in memory consumption before and after the method call
- * 
- * - debugpdo.logging.details.memdelta.precision (default: 1)
- *   Determines the precision of the memory difference logging
- * 
- * - debugpdo.logging.details.memdelta.pad (default: 10)
- *   How much horizontal space to reserve for the memory difference on a log line
- * 
- * - debugpdo.logging.details.mempeak.enabled (default: false)
- *   Enables logging the peak memory consumption thus far by the currently executing PHP script
- * 
- * - debugpdo.logging.details.mempeak.precision (default: 1)
- *   Determines the precision of the memory peak logging
- * 
- * - debugpdo.logging.details.mempeak.pad (default: 9)
- *   How much horizontal space to reserve for the memory peak on a log line
- * 
- * - debugpdo.logging.details.querycount.enabled (default: false)
- *   Enables logging of the number of queries performed by the DebugPDO instance thus far
- * 
- * - debugpdo.logging.details.querycount.pad (default: 2)
- *   How much horizontal space to reserve for the query count on a log line
- * 
- * - debugpdo.logging.details.method.enabled (default: false)
- *   Enables logging of the name of the method call
- * 
- * - debugpdo.logging.details.method.pad (default: 28)
- *   How much horizontal space to reserve for the method name on a log line
- * 
- * The order in which the logging details are enabled is significant, since it determines the order in
- * which they will appear in the log file.
- * 
- * @example    // Enable simple query profiling, flagging calls taking over 1.5 seconds as slow:
- *             $config = Propel::getConfiguration(PropelConfiguration::TYPE_OBJECT);
- *             $config->setParameter('debugpdo.logging.details.slow.enabled', true);
- *             $config->setParameter('debugpdo.logging.details.slow.threshold', 1.5);
- *             $config->setParameter('debugpdo.logging.details.time.enabled', true);
- * 
- * @author     Francois Zaninotto
- * @author     Cameron Brunner <cameron.brunner@gmail.com>
- * @author     Hans Lellelid <hans@xmpl.org>
- * @author     Christian Abegg <abegg.ch@gmail.com>
- * @author     Jarno Rantanen <jarno.rantanen@tkk.fi>
- * @since      2006-09-22
- * @package    propel.util
- */
-class DebugPDO extends PropelPDO
-{
-	const DEFAULT_SLOW_THRESHOLD        = 0.1;
-	const DEFAULT_ONLYSLOW_ENABLED      = false;
-	
-	/**
-	 * Count of queries performed.
-	 * 
-	 * @var        int
-	 */
-	protected $queryCount = 0;
-	
-	/**
-	 * SQL code of the latest performed query.
-	 * 
-	 * @var        string
-	 */
-	protected $lastExecutedQuery;
-
-	/**
-	 * The statement class to use.
-	 *
-	 * @var        string
-	 */
-	protected $statementClass = 'DebugPDOStatement';
-
-	/**
-	 * Configured BasicLogger (or compatible) logger.
-	 *
-	 * @var        BasicLogger
-	 */
-	protected $logger;
-
-	/**
-	 * The log level to use for logging.
-	 *
-	 * @var        int
-	 */
-	private $logLevel = Propel::LOG_DEBUG;
-	
-	/**
-	 * The default value for runtime config item "debugpdo.logging.methods".
-	 *
-	 * @var        array
-	 */
-	protected static $defaultLogMethods = array(
-		'DebugPDO::exec',
-		'DebugPDO::query',
-		'DebugPDOStatement::execute',
-	);
-	
-	/**
-	 * Creates a DebugPDO instance representing a connection to a database.
-	 *
-	 * This method is overridden in order to specify a custom PDOStatement class and to implement logging.
-	 *
-	 * @param      string $dsn Connection DSN.
-	 * @param      string $username (optional) The user name for the DSN string.
-	 * @param      string $password (optional) The password for the DSN string.
-	 * @param      array $driver_options (optional) A key=>value array of driver-specific connection options.
-	 * @throws     PDOException if there is an error during connection initialization.
-	 */
-	public function __construct($dsn, $username = null, $password = null, $driver_options = array())
-	{
-		$debug = $this->getDebugSnapshot();
-		
-		parent::__construct($dsn, $username, $password, $driver_options);
-		
-		$this->configureStatementClass($suppress=true);
-		$this->log('', null, __METHOD__, $debug);
-	}
-
-	/**
-	 * Configures the PDOStatement class for this connection.
-	 * 
-	 * @param      boolean $suppressError Whether to suppress an exception if the statement class cannot be set.
-	 * @throws     PropelException if the statement class cannot be set (and $suppressError is false).
-	 */
-	protected function configureStatementClass($suppressError = false)
-	{
-		// extending PDOStatement is not supported with persistent connections
-		if (!$this->getAttribute(PDO::ATTR_PERSISTENT)) {
-			$this->setAttribute(PDO::ATTR_STATEMENT_CLASS, array($this->getStatementClass(), array($this)));
-		} elseif (!$suppressError) {
-			throw new PropelException('Extending PDOStatement is not supported with persistent connections.');
-		}
-	}
-
-	/**
-	 * Sets the custom classname to use for PDOStatement.
-	 *
-	 * It is assumed that the specified classname has been loaded (or can be loaded
-	 * on-demand with autoload).
-	 *
-	 * @param      string $classname Name of the statement class to use.
-	 */
-	public function setStatementClass($classname)
-	{
-		$this->statementClass = $classname;
-		$this->configureStatementClass();
-	}
-
-	/**
-	 * Gets the custom classname to use for PDOStatement.
-	 * 
-	 * @return     string
-	 */
-	public function getStatementClass()
-	{
-		return $this->statementClass;
-	}
-
-	/**
-	 * Returns the number of queries this DebugPDO instance has performed on the database connection.
-	 * 
-	 * When using DebugPDOStatement as the statement class, any queries by DebugPDOStatement instances
-	 * are counted as well.
-	 * 
-	 * @return     int
-	 * @throws     PropelException if persistent connection is used (since unable to override PDOStatement in that case).
-	 */
-	public function getQueryCount()
-	{
-		// extending PDOStatement is not supported with persistent connections
-		if ($this->getAttribute(PDO::ATTR_PERSISTENT)) {
-			throw new PropelException('Extending PDOStatement is not supported with persistent connections. ' .
-																'Count would be inaccurate, because we cannot count the PDOStatment::execute() calls. ' .
-																'Either don\'t use persistent connections or don\'t call PropelPDO::getQueryCount()');
-		}
-		return $this->queryCount;
-	}
-
-	/**
-	 * Increments the number of queries performed by this DebugPDO instance.
-	 * 
-	 * Returns the original number of queries (ie the value of $this->queryCount before calling this method).
-	 * 
-	 * @return     int
-	 */
-	public function incrementQueryCount()
-	{
-		$this->queryCount++;
-	}
-
-	/**
-	 * Get the SQL code for the latest query executed by Propel
-	 * 
-	 * @return string Executable SQL code
-	 */
-	public function getLastExecutedQuery() 
-	{ 
-		return $this->lastExecutedQuery; 
-	}
-	
-	/**
-	 * Set the SQL code for the latest query executed by Propel
-	 * 
-	 * @param string $query Executable SQL code
-	 */
-	public function setLastExecutedQuery($query) 
-	{ 
-		$this->lastExecutedQuery = $query; 
-	}
-
-	/**
-	 * Prepares a statement for execution and returns a statement object.
-	 * 
-	 * Overrides PDO::prepare() to add logging and query counting.
-	 * 
-	 * @param      string $sql This must be a valid SQL statement for the target database server.
-	 * @param      array One or more key=>value pairs to set attribute values for the PDOStatement object that this method returns.
-	 * @return     PDOStatement
-	 */
-	public function prepare($sql, $driver_options = array())
-	{
-		$debug	= $this->getDebugSnapshot();
-		$return	= parent::prepare($sql, $driver_options);
-		
-		$this->log($sql, null, __METHOD__, $debug);
-		
-		return $return;
-	}
-
-	/**
-	 * Execute an SQL statement and return the number of affected rows.
-	 * 
-	 * Overridden for query counting and logging.
-	 * 
-	 * @return     int
-	 */
-	public function exec($sql)
-	{
-		$debug	= $this->getDebugSnapshot();
-		$return	= parent::exec($sql);
-
-		$this->log($sql, null, __METHOD__, $debug);
-		$this->setLastExecutedQuery($sql); 	
-		$this->incrementQueryCount();
-		
-		return $return;
-	}
-
-	/**
-	 * Executes an SQL statement, returning a result set as a PDOStatement object.  Despite its signature here,
-	 * this method takes a variety of parameters.
-	 * 
-	 * Overridden for query counting and logging.
-	 * 
-	 * @see        http://php.net/manual/en/pdo.query.php for a description of the possible parameters.
-	 * @return     PDOStatement
-	 */
-	public function query()
-	{
-		$debug	= $this->getDebugSnapshot();
-		$args	= func_get_args();
-		if (version_compare(PHP_VERSION, '5.3', '<')) {
-			$return	= call_user_func_array(array($this, 'parent::query'), $args);
-		} else {
-			$return	= call_user_func_array('parent::query', $args);
-		}
-		
-		$sql = $args[0];
-		$this->log($sql, null, __METHOD__, $debug);
-		$this->setLastExecutedQuery($sql);
-		$this->incrementQueryCount();
-		
-		return $return;
-	}
-
-	/**
-	 * Sets the logging level to use for logging method calls and SQL statements.
-	 *
-	 * @param      int $level Value of one of the Propel::LOG_* class constants.
-	 */
-	public function setLogLevel($level)
-	{
-		$this->logLevel = $level;
-	}
-
-	/**
-	 * Sets a logger to use.
-	 * 
-	 * The logger will be used by this class to log various method calls and their properties.
-	 * 
-	 * @param      BasicLogger $logger A Logger with an API compatible with BasicLogger (or PEAR Log).
-	 */
-	public function setLogger($logger)
-	{
-		$this->logger = $logger;
-	}
-
-	/**
-	 * Logs the method call or SQL using the Propel::log() method or a registered logger class.
-	 * 
-	 * @uses       self::getLogPrefix()
-	 * @see        self::setLogger()
-	 * 
-	 * @param      string $msg Message to log.
-	 * @param      int $level (optional) Log level to use; will use self::setLogLevel() specified level by default.
-	 * @param      string $methodName (optional) Name of the method whose execution is being logged.
-	 * @param      array $debugSnapshot (optional) Previous return value from self::getDebugSnapshot().
-	 */
-	public function log($msg, $level = null, $methodName = null, array $debugSnapshot = null)
-	{
-		// If logging has been specifically disabled, this method won't do anything
-		if (!$this->getLoggingConfig('enabled', true))
-			return;
-		
-		// If the method being logged isn't one of the ones to be logged, bail
-		if (!in_array($methodName, $this->getLoggingConfig('methods', self::$defaultLogMethods)))
-			return;
-		
-		// If a logging level wasn't provided, use the default one
-		if ($level === null)
-			$level = $this->logLevel;
-
-        // Determine if this query is slow enough to warrant logging
-        if ($this->getLoggingConfig("onlyslow", self::DEFAULT_ONLYSLOW_ENABLED))
-        {
-            $now = $this->getDebugSnapshot();
-            if ($now['microtime'] - $debugSnapshot['microtime'] < $this->getLoggingConfig("details.slow.threshold", self::DEFAULT_SLOW_THRESHOLD)) return;
-        }
-		
-		// If the necessary additional parameters were given, get the debug log prefix for the log line
-		if ($methodName && $debugSnapshot)
-			$msg = $this->getLogPrefix($methodName, $debugSnapshot) . $msg;
-		
-		// We won't log empty messages
-		if (!$msg)
-			return;
-		
-		// Delegate the actual logging forward
-		if ($this->logger)
-			$this->logger->log($msg, $level);
-		else
-			Propel::log($msg, $level);
-	}
-	
-	/**
-	 * Returns a snapshot of the current values of some functions useful in debugging.
-	 *
-	 * @return     array
-	 */
-	public function getDebugSnapshot()
-	{
-		return array(
-			'microtime'				=> microtime(true),
-			'memory_get_usage'		=> memory_get_usage($this->getLoggingConfig('realmemoryusage', false)),
-			'memory_get_peak_usage'	=> memory_get_peak_usage($this->getLoggingConfig('realmemoryusage', false)),
-			);
-	}
-	
-	/**
-	 * Returns a named configuration item from the Propel runtime configuration, from under the
-	 * 'debugpdo.logging' prefix.  If such a configuration setting hasn't been set, the given default
-	 * value will be returned. 
-	 *
-	 * @param      string $key Key for which to return the value.
-	 * @param      mixed $defaultValue Default value to apply if config item hasn't been set.
-	 * @return     mixed
-	 */
-	protected function getLoggingConfig($key, $defaultValue)
-	{
-		return Propel::getConfiguration(PropelConfiguration::TYPE_OBJECT)->getParameter("debugpdo.logging.$key", $defaultValue);
-	}
-	
-	/**
-	 * Returns a prefix that may be prepended to a log line, containing debug information according
-	 * to the current configuration.
-	 * 
-	 * Uses a given $debugSnapshot to calculate how much time has passed since the call to self::getDebugSnapshot(),
-	 * how much the memory consumption by PHP has changed etc.
-	 *
-	 * @see        self::getDebugSnapshot()
-	 * 
-	 * @param      string $methodName Name of the method whose execution is being logged.
-	 * @param      array $debugSnapshot A previous return value from self::getDebugSnapshot().
-	 * @return     string
-	 */
-	protected function getLogPrefix($methodName, $debugSnapshot)
-	{
-		$prefix		= '';
-		$now		= $this->getDebugSnapshot();
-		$logDetails	= array_keys($this->getLoggingConfig('details', array()));
-		$innerGlue	= $this->getLoggingConfig('innerglue', ': ');
-		$outerGlue	= $this->getLoggingConfig('outerglue', ' | ');
-		
-		// Iterate through each detail that has been configured to be enabled
-		foreach ($logDetails as $detailName) {
-			
-			if (!$this->getLoggingConfig("details.$detailName.enabled", false))
-				continue;
-			
-			switch ($detailName) {
-				
-				case 'slow';
-					$value = $now['microtime'] - $debugSnapshot['microtime'] >= $this->getLoggingConfig("details.$detailName.threshold", self::DEFAULT_SLOW_THRESHOLD) ? 'YES' : ' NO';
-					break;
-				
-				case 'time':
-					$value = number_format($now['microtime'] - $debugSnapshot['microtime'], $this->getLoggingConfig("details.$detailName.precision", 3)) . ' sec';
-					$value = str_pad($value, $this->getLoggingConfig("details.$detailName.pad", 10), ' ', STR_PAD_LEFT);
-					break;
-				
-				case 'mem':
-					$value = self::getReadableBytes($now['memory_get_usage'], $this->getLoggingConfig("details.$detailName.precision", 1));
-					$value = str_pad($value, $this->getLoggingConfig("details.$detailName.pad", 9), ' ', STR_PAD_LEFT);
-					break;
-				
-				case 'memdelta':
-					$value = $now['memory_get_usage'] - $debugSnapshot['memory_get_usage'];
-					$value = ($value > 0 ? '+' : '') . self::getReadableBytes($value, $this->getLoggingConfig("details.$detailName.precision", 1));
-					$value = str_pad($value, $this->getLoggingConfig("details.$detailName.pad", 10), ' ', STR_PAD_LEFT);
-					break;
-				
-				case 'mempeak':
-					$value = self::getReadableBytes($now['memory_get_peak_usage'], $this->getLoggingConfig("details.$detailName.precision", 1));
-					$value = str_pad($value, $this->getLoggingConfig("details.$detailName.pad", 9), ' ', STR_PAD_LEFT);
-					break;
-				
-				case 'querycount':
-					$value = $this->getQueryCount();
-					$value = str_pad($value, $this->getLoggingConfig("details.$detailName.pad", 2), ' ', STR_PAD_LEFT);
-					break;
-				
-				case 'method':
-					$value = $methodName;
-					$value = str_pad($value, $this->getLoggingConfig("details.$detailName.pad", 28), ' ', STR_PAD_RIGHT);
-					break;
-				
-				default:
-					$value = 'n/a';
-					break;
-				
-			}
-			
-			$prefix .= $detailName . $innerGlue . $value . $outerGlue;
-			
-		}
-		
-		return $prefix;
-	}
-	
-	/**
-	 * Returns a human-readable representation of the given byte count.
-	 *
-	 * @param      int $bytes Byte count to convert.
-	 * @param      int $precision How many decimals to include.
-	 * @return     string
-	 */
-	protected function getReadableBytes($bytes, $precision)
-	{
-		$suffix	= array('B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
-	    $total	= count($suffix);
-	    
-	    for ($i = 0; $bytes > 1024 && $i < $total; $i++)
-	    	$bytes /= 1024;
-	    
-	    return number_format($bytes, $precision) . ' ' . $suffix[$i];
-	}
-	
-	/**
-	 * If so configured, makes an entry to the log of the state of this DebugPDO instance just prior to its destruction.
-	 *
-	 * @see        self::log()
-	 */
-	public function __destruct()
-	{
-		$this->log('', null, __METHOD__, $this->getDebugSnapshot());
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/DebugPDOStatement.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/DebugPDOStatement.php
deleted file mode 100644
index a1452c54d..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/DebugPDOStatement.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/*
- *  $Id: DebugPDOStatement.php 1601 2010-03-15 13:06:11Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * PDOStatement that provides some enhanced functionality needed by Propel.
- *
- * Simply adds the ability to count the number of queries executed and log the queries/method calls.
- *
- * @author     Oliver Schonrock <oliver@realtsp.com>
- * @author     Jarno Rantanen <jarno.rantanen@tkk.fi>
- * @since      2007-07-12
- * @package    propel.util
- */
-class DebugPDOStatement extends PDOStatement
-{
-
-	/**
-	 * The PDO connection from which this instance was created.
-	 * 
-	 * @var        DebugPDO
-	 */
-	protected $pdo;
-	
-	/**
-	 * Hashmap for resolving the PDO::PARAM_* class constants to their human-readable names.
-	 * 
-	 * This is only used in logging the binding of variables.
-	 * 
-	 * @see        self::bindValue()
-	 * @var        array
-	 */
-	protected static $typeMap = array(
-		PDO::PARAM_BOOL => "PDO::PARAM_BOOL",
-		PDO::PARAM_INT => "PDO::PARAM_INT",
-		PDO::PARAM_STR => "PDO::PARAM_STR",
-		PDO::PARAM_LOB => "PDO::PARAM_LOB",
-		PDO::PARAM_NULL => "PDO::PARAM_NULL",
-	);
-
-  /**
-   * @var array The values that have been bound
-   */
-  protected $boundValues = array();
-
-	/**
-	 * Construct a new statement class with reference to main DebugPDO object from
-	 * which this instance was created.
-	 * 
-	 * @param      DebugPDO $pdo Reference to the parent PDO instance.
-	 */
-	protected function __construct(DebugPDO $pdo)
-	{
-		$this->pdo = $pdo;
-	}
-
-	public function getExecutedQueryString()
-	{
-		$sql = $this->queryString;
-		
-		$matches = array();
-		if (preg_match_all('/(:p[0-9]+\b)/', $sql, $matches)) {
-			$size = count($matches[1]);
-			for ($i = $size-1; $i >= 0; $i--) { 
-				$pos = $matches[1][$i];
-				$sql = str_replace($pos, $this->boundValues[$pos], $sql);
-			}
-		}
-		
-		return $sql;
-	}
-
-	/**
-	 * Executes a prepared statement.  Returns a boolean value indicating success.
-	 * 
-	 * Overridden for query counting and logging.
-	 * 
-	 * @return     bool
-	 */
-	public function execute($input_parameters = null)
-	{
-		$debug	= $this->pdo->getDebugSnapshot();
-		$return	= parent::execute($input_parameters);
-		
-		$sql = $this->getExecutedQueryString();
-		$this->pdo->log($sql, null, __METHOD__, $debug);
-		$this->pdo->setLastExecutedQuery($sql); 
-		$this->pdo->incrementQueryCount();
-		
-		return $return;
-	}
-
-	/**
-	 * Binds a value to a corresponding named or question mark placeholder in the SQL statement
-	 * that was use to prepare the statement.  Returns a boolean value indicating success.
-	 *
-	 * @param      int $pos Parameter identifier (for determining what to replace in the query).
-	 * @param      mixed $value The value to bind to the parameter.
-	 * @param      int $type Explicit data type for the parameter using the PDO::PARAM_* constants. Defaults to PDO::PARAM_STR.
-	 * @return     boolean
-	 */
-	public function bindValue($pos, $value, $type = PDO::PARAM_STR)
-	{
-		$debug		= $this->pdo->getDebugSnapshot();
-		$typestr	= isset(self::$typeMap[$type]) ? self::$typeMap[$type] : '(default)';
-		$return		= parent::bindValue($pos, $value, $type);
-		$valuestr	= $type == PDO::PARAM_LOB ? '[LOB value]' : var_export($value, true);
-		$msg		= "Binding $valuestr at position $pos w/ PDO type $typestr";
-
-    $this->boundValues[$pos] = $valuestr;
-		
-		$this->pdo->log($msg, null, __METHOD__, $debug);
-		
-		return $return;
-	}
-	
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/Join.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/Join.php
deleted file mode 100644
index 448859e44..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/Join.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<?php
-/*
- *  $Id: Join.php 1126 2009-09-15 12:55:35Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * Data object to describe a join between two tables, for example
- * <pre>
- * table_a LEFT JOIN table_b ON table_a.id = table_b.a_id
- * </pre>
- *
- * @author     Francois Zaninotto (Propel)
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @author     Kaspars Jaudzems <kaspars.jaudzems@inbox.lv> (Propel)
- * @author     Frank Y. Kim <frank.kim@clearink.com> (Torque)
- * @author     John D. McNally <jmcnally@collab.net> (Torque)
- * @author     Brett McLaughlin <bmclaugh@algx.net> (Torque)
- * @author     Eric Dobbs <eric@dobbse.net> (Torque)
- * @author     Henning P. Schmiedehausen <hps@intermeta.de> (Torque)
- * @author     Sam Joseph <sam@neurogrid.com> (Torque)
- * @package    propel.util
- */
-class Join
-{
-  // default comparison type
-	const EQUAL = "=";
-	
-	// the left parts of the join condition
-	protected $left = array();
-
-	// the right parts of the join condition
-	protected $right = array();
-
-	// the comparison operators for each pair of columns in the join condition
-	protected $operator = array();
-	
-	// the type of the join (LEFT JOIN, ...), or null for an implicit join
-	protected $joinType = null;
-	
-	// the number of conditions in the join
-	protected $count = 0;
-
-	/**
-	 * Constructor
-	 * Use it preferably with no arguments, and then use addCondition() and setJoinType()
-	 * Syntax with arguments used mainly for backwards compatibility
-	 *
-	 * @param string $leftColumn  The left column of the join condition
-	 *                            (may contain an alias name)
-	 * @param string $rightColumn The right column of the join condition
-	 *                            (may contain an alias name)
-	 * @param string $joinType    The type of the join. Valid join types are null (implicit join),
-	 *                            Criteria::LEFT_JOIN, Criteria::RIGHT_JOIN, and Criteria::INNER_JOIN
-	 */
-	public function __construct($leftColumn = null, $rightColumn = null, $joinType = null)
-	{
-		if(!is_null($leftColumn)) {
-		  if (!is_array($leftColumn)) {
-		    // simple join
-		    $this->addCondition($leftColumn, $rightColumn);
-		  } else {
-		    // join with multiple conditions
-		    if (count($leftColumn) != count($rightColumn) ) {
-			    throw new PropelException("Unable to create join because the left column count isn't equal to the right column count");
-		    }
-		    foreach ($leftColumn as $key => $value)
-		    {
-		      $this->addCondition($value, $rightColumn[$key]);
-		    }
-		  }
-		  $this->setJoinType($joinType);
-		}
-	}
-	
-	/**
-	 * Join condition definition
-	 *
-	 * @param string $left     The left column of the join condition
-	 *                         (may contain an alias name)
-	 * @param string $right    The right column of the join condition
-	 *                         (may contain an alias name)
-	 * @param string $joinType The type of the join. Valid join types are null (implicit join),
-	 *                         Criteria::LEFT_JOIN, Criteria::RIGHT_JOIN, and Criteria::INNER_JOIN
-	 */
-	public function addCondition($left, $right, $operator = self::EQUAL)
-	{
-		$this->left[] = $left;
-		$this->right[] = $right;
-		$this->operator[] = $operator;
-		$this->count++;
-	}
-	
-	/**
-	 * Retrieve the number of conditions in the join
-	 *
-	 * @return integer The number of conditions in the join
-	 */
-	public function countConditions()
-	{
-	  return $this->count;
-	}
-	
-	/**
-	 * Return an array of the join conditions
-	 *
-	 * @return array An array of arrays representing (left, comparison, right) for each condition
-	 */
-	public function getConditions()
-	{
-	  $conditions = array();
-	  for ($i=0; $i < $this->count; $i++) { 
-	    $conditions[] = array(
-	      'left'     => $this->getLeftColumn($i), 
-	      'operator' => $this->getOperator($i),
-	      'right'    => $this->getRightColumn($i)
-	    );
-	  }
-	  return $conditions;
-	}
-
-  /**
-   * @return     the comparison operator for the join condition
-   */
-  public function getOperator($index = 0)
-  {
-    return $this->operator[$index];
-  }
-	
-	public function getOperators()
-	{
-	  return $this->operator;
-	}
-  
-	/**
-	 * Set the join type
-	 *
-	 * @param string  $joinType The type of the join. Valid join types are
-	 *        null (adding the join condition to the where clause),
-	 *        Criteria::LEFT_JOIN(), Criteria::RIGHT_JOIN(), and Criteria::INNER_JOIN()
-	 */
-	public function setJoinType($joinType = null)
-	{
-	  $this->joinType = $joinType;
-	}
-	
-	/**
-	 * Get the join type
-	 *
-	 * @return string The type of the join, i.e. Criteria::LEFT_JOIN(), ...,
-	 *         or null for adding the join condition to the where Clause
-	 */
-	public function getJoinType()
-	{
-		return $this->joinType;
-	}
-
-	/**
-	 * @return     the left column of the join condition
-	 */
-	public function getLeftColumn($index = 0)
-	{
-		return $this->left[$index];
-	}
-	
-	/**
-	 * @return     all right columns of the join condition
-	 */
-	public function getLeftColumns() 
-	{
-		return $this->left;
-	}
-
-
-	public function getLeftColumnName($index = 0)
-	{
-		return substr($this->left[$index], strrpos($this->left[$index], '.') + 1);
-	}
-
-	public function getLeftTableName($index = 0)
-	{
-		return substr($this->left[$index], 0, strrpos($this->left[$index], '.'));
-	}
-
-	/**
-	 * @return     the right column of the join condition
-	 */
-	public function getRightColumn($index = 0)
-	{
-		return $this->right[$index];
-	}
-	
-	/**
-	 * @return     all right columns of the join condition
-	 */
-	public function getRightColumns() 
-	{
-		return $this->right;
-	}
-
-	public function getRightColumnName($index = 0)
-	{
-		return substr($this->right[$index], strrpos($this->right[$index], '.') + 1);
-	}
-
-	public function getRightTableName($index = 0)
-	{
-		return substr($this->right[$index], 0, strrpos($this->right[$index], '.'));
-	}
-
-	/**
-	 * returns a String representation of the class,
-	 * mainly for debugging purposes
-	 *
-	 * @return string     A String representation of the class
-	 */
-	public function toString()
-	{
-		$result = '';
-		if ($this->joinType !== null)
-		{
-			$result .= $this->joinType . ' : ';
-		}
-		foreach ($$this->getConditions() as $index => $condition)
-		{
-		  $result .= implode($condition);
-		  if ($index + 1 < $this->count) {
-				$result .= ' AND ';
-			}
-		}
-    $result .= '(ignoreCase not considered)';
-    
-		return $result;
-	}
-}
- 
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/NodePeer.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/NodePeer.php
deleted file mode 100644
index e70c0ff75..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/NodePeer.php
+++ /dev/null
@@ -1,379 +0,0 @@
-<?php
-/*
- *  $Id: NodePeer.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * This is a utility interface for all generated NodePeer classes in the system.
- *
- * @author     Heltem <heltem@o2php.com> (Propel)
- * @version    $Revision: 1262 $
- * @package    propel.util
- */
-interface NodePeer {
-	/**
-	 * Creates the supplied node as the root node.
-	 *
-	 * @param      object $node	Propel object for model
-	 * @return     object		Inserted propel object for model
-	 */
-	public static function createRoot(NodeObject $node);
-
-	/**
-	 * Returns the root node for a given scope id
-	 *
-	 * @param      int $scopeId		Scope id to determine which root node to return
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     object			Propel object for root node
-	 */
-	public static function retrieveRoot($scopeId = 1, PropelPDO $con = null);
-
-	/**
-	 * Inserts $child as first child of destination node $parent
-	 *
-	 * @param      object $child	Propel object for child node
-	 * @param      object $parent	Propel object for parent node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     void
-	 */
-	public static function insertAsFirstChildOf(NodeObject $child, NodeObject $parent, PropelPDO $con = null);
-
-	/**
-	 * Inserts $child as last child of destination node $parent
-	 *
-	 * @param      object $child	Propel object for child node
-	 * @param      object $parent	Propel object for parent node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     void
-	 */
-	public static function insertAsLastChildOf(NodeObject $child, NodeObject $parent, PropelPDO $con = null);
-
-	/**
-	 * Inserts $sibling as previous sibling to destination node $node
-	 *
-	 * @param      object $node		Propel object for destination node
-	 * @param      object $sibling	Propel object for source node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     void
-	 */
-	public static function insertAsPrevSiblingOf(NodeObject $node, NodeObject $sibling, PropelPDO $con = null);
-
-	/**
-	 * Inserts $sibling as next sibling to destination node $node
-	 *
-	 * @param      object $node		Propel object for destination node
-	 * @param      object $sibling	Propel object for source node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     void
-	 */
-	public static function insertAsNextSiblingOf(NodeObject $node, NodeObject $sibling, PropelPDO $con = null);
-
-	/**
-	 * Inserts $parent as parent of given $node.
-	 *
-	 * @param      object $parent  	Propel object for given parent node
-	 * @param      object $node  	Propel object for given destination node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     void
-	 * @throws     Exception      When trying to insert node as parent of a root node
-	 */
-	public static function insertAsParentOf(NodeObject $parent, NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Inserts $node as root node
-	 *
-	 * @param      object $node	Propel object as root node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     void
-	 */
-	public static function insertRoot(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Delete root node
-	 *
-	 * @param      int $scopeId		Scope id to determine which root node to delete
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     boolean		Deletion status
-	 */
-	public static function deleteRoot($scopeId = 1, PropelPDO $con = null);
-
-	/**
-	 * Delete $dest node
-	 *
-	 * @param      object $dest	Propel object node to delete
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     boolean		Deletion status
-	 */
-	public static function deleteNode(NodeObject $dest, PropelPDO $con = null);
-
-	/**
-	 * Moves $child to be first child of $parent
-	 *
-	 * @param      object $parent	Propel object for parent node
-	 * @param      object $child	Propel object for child node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     void
-	 */
-	public static function moveToFirstChildOf(NodeObject $parent, NodeObject $child, PropelPDO $con = null);
-
-	/**
-	 * Moves $node to be last child of $dest
-	 *
-	 * @param      object $dest	Propel object for destination node
-	 * @param      object $node	Propel object for source node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     void
-	 */
-	public static function moveToLastChildOf(NodeObject $dest, NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Moves $node to be prev sibling to $dest
-	 *
-	 * @param      object $dest	Propel object for destination node
-	 * @param      object $node	Propel object for source node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     void
-	 */
-	public static function moveToPrevSiblingOf(NodeObject $dest, NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Moves $node to be next sibling to $dest
-	 *
-	 * @param      object $dest	Propel object for destination node
-	 * @param      object $node	Propel object for source node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     void
-	 */
-	public static function moveToNextSiblingOf(NodeObject $dest, NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Gets first child for the given node if it exists
-	 *
-	 * @param      object $node	Propel object for src node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public static function retrieveFirstChild(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Gets last child for the given node if it exists
-	 *
-	 * @param      object $node	Propel object for src node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public static function retrieveLastChild(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Gets prev sibling for the given node if it exists
-	 *
-	 * @param      object $node	Propel object for src node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public static function retrievePrevSibling(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Gets next sibling for the given node if it exists
-	 *
-	 * @param      object $node	Propel object for src node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public static function retrieveNextSibling(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Retrieves the entire tree from root
-	 *
-	 * @param      int $scopeId		Scope id to determine which scope tree to return
-	 * @param      PropelPDO $con	Connection to use.
-	 */
-	public static function retrieveTree($scopeId = 1, PropelPDO $con = null);
-
-	/**
-	 * Retrieves the entire tree from parent $node
-	 *
-	 * @param      PropelPDO $con	Connection to use.
-	 */
-	public static function retrieveBranch(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Gets direct children for the node
-	 *
-	 * @param      object $node	Propel object for parent node
-	 * @param      PropelPDO $con	Connection to use.
-	 */
-	public static function retrieveChildren(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Gets all descendants for the node
-	 *
-	 * @param      object $node	Propel object for parent node
-	 * @param      PropelPDO $con	Connection to use.
-	 */
-	public static function retrieveDescendants(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Gets all siblings for the node
-	 *
-	 * @param      object $node	Propel object for src node
-	 * @param      PropelPDO $con	Connection to use.
-	 */
-	public static function retrieveSiblings(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Gets ancestor for the given node if it exists
-	 *
-	 * @param      object $node	Propel object for src node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     mixed 		Propel object if exists else false
-	 */
-	public static function retrieveParent(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Gets level for the given node
-	 *
-	 * @param      object $node	Propel object for src node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     int			Level for the given node
-	 */
-	public static function getLevel(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Gets number of direct children for given node
-	 *
-	 * @param      object $node	Propel object for src node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     int			Level for the given node
-	 */
-	public static function getNumberOfChildren(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Gets number of descendants for given node
-	 *
-	 * @param      object $node	Propel object for src node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     int			Level for the given node
-	 */
-	public static function getNumberOfDescendants(NodeObject $node, PropelPDO $con = null);
-
- 	/**
-	 * Returns path to a specific node as an array, useful to create breadcrumbs
-	 *
-	 * @param      object $node	Propel object of node to create path to
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     array		Array in order of heirarchy
-	 */
-	public static function getPath(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Tests if node is valid
-	 *
-	 * @param      object $node	Propel object for src node
-	 * @return     bool
-	 */
-	public static function isValid(NodeObject $node = null);
-
-	/**
-	 * Tests if node is a root
-	 *
-	 * @param      object $node	Propel object for src node
-	 * @return     bool
-	 */
-	public static function isRoot(NodeObject $node);
-
-	/**
-	 * Tests if node is a leaf
-	 *
-	 * @param      object $node	Propel object for src node
-	 * @return     bool
-	 */
-	public static function isLeaf(NodeObject $node);
-
-	/**
-	 * Tests if $child is a child of $parent
-	 *
-	 * @param      object $child	Propel object for node
-	 * @param      object $parent	Propel object for node
-	 * @return     bool
-	 */
-	public static function isChildOf(NodeObject $child, NodeObject $parent);
-
-	/**
-	 * Tests if $node1 is equal to $node2
-	 *
-	 * @param      object $node1	Propel object for node
-	 * @param      object $node2	Propel object for node
-	 * @return     bool
-	 */
-	public static function isEqualTo(NodeObject $node1, NodeObject $node2);
-
-	/**
-	 * Tests if $node has an ancestor
-	 *
-	 * @param      object $node	Propel object for node
-	 * @param      PropelPDO $con		Connection to use.
-	 * @return     bool
-	 */
-	public static function hasParent(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Tests if $node has prev sibling
-	 *
-	 * @param      object $node	Propel object for node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     bool
-	 */
-	public static function hasPrevSibling(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Tests if $node has next sibling
-	 *
-	 * @param      object $node	Propel object for node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     bool
-	 */
-	public static function hasNextSibling(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Tests if $node has children
-	 *
-	 * @param      object $node	Propel object for node
-	 * @return     bool
-	 */
-	public static function hasChildren(NodeObject $node);
-
-	/**
-	 * Deletes $node and all of its descendants
-	 *
-	 * @param      object $node	Propel object for source node
-	 * @param      PropelPDO $con	Connection to use.
-	 */
-	public static function deleteDescendants(NodeObject $node, PropelPDO $con = null);
-
-	/**
-	 * Returns a node given its primary key or the node itself
-	 *
-	 * @param      int/object $node	Primary key/instance of required node
-	 * @param      PropelPDO $con	Connection to use.
-	 * @return     object		Propel object for model
-	 */
-	public static function getNode($node, PropelPDO $con = null);
-
-} // NodePeer
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/PropelColumnTypes.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/PropelColumnTypes.php
deleted file mode 100644
index 81bc1f28b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/PropelColumnTypes.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/*
- *  $Id: PropelColumnTypes.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * Enumeration of Propel types.
- *
- * THIS CLASS MUST BE KEPT UP-TO-DATE WITH THE MORE EXTENSIVE GENERATOR VERSION OF THIS CLASS.
- *
- * @author     Hans Lellelid <hans@xmpl.org> (Propel)
- * @version    $Revision: 1262 $
- * @package    propel.util
- */
-class PropelColumnTypes {
-
-	const CHAR = "CHAR";
-	const VARCHAR = "VARCHAR";
-	const LONGVARCHAR = "LONGVARCHAR";
-	const CLOB = "CLOB";
-	const NUMERIC = "NUMERIC";
-	const DECIMAL = "DECIMAL";
-	const TINYINT = "TINYINT";
-	const SMALLINT = "SMALLINT";
-	const INTEGER = "INTEGER";
-	const BIGINT = "BIGINT";
-	const REAL = "REAL";
-	const FLOAT = "FLOAT";
-	const DOUBLE = "DOUBLE";
-	const BINARY = "BINARY";
-	const VARBINARY = "VARBINARY";
-	const LONGVARBINARY = "LONGVARBINARY";
-	const BLOB = "BLOB";
-	const DATE = "DATE";
-	const TIME = "TIME";
-	const TIMESTAMP = "TIMESTAMP";
-
-	const BU_DATE = "BU_DATE";
-	const BU_TIMESTAMP = "BU_TIMESTAMP";
-
-	const BOOLEAN = "BOOLEAN";
-
-	private static $propelToPdoMap = array(
-		self::CHAR 			=> PDO::PARAM_STR,
-		self::VARCHAR 		=> PDO::PARAM_STR,
-		self::LONGVARCHAR 	=> PDO::PARAM_STR,
-		self::CLOB 			=> PDO::PARAM_LOB,
-		self::NUMERIC 		=> PDO::PARAM_STR,
-		self::DECIMAL 		=> PDO::PARAM_STR,
-		self::TINYINT 		=> PDO::PARAM_INT,
-		self::SMALLINT 		=> PDO::PARAM_INT,
-		self::INTEGER 		=> PDO::PARAM_INT,
-		self::BIGINT 		=> PDO::PARAM_STR,
-		self::REAL 			=> PDO::PARAM_STR,
-		self::FLOAT 		=> PDO::PARAM_STR,
-		self::DOUBLE 		=> PDO::PARAM_STR,
-		self::BINARY 		=> PDO::PARAM_STR,
-		self::VARBINARY 	=> PDO::PARAM_STR,
-		self::LONGVARBINARY => PDO::PARAM_STR,
-		self::BLOB 			=> PDO::PARAM_LOB,
-		self::DATE 			=> PDO::PARAM_STR,
-		self::TIME 			=> PDO::PARAM_STR,
-		self::TIMESTAMP 	=> PDO::PARAM_STR,
-		self::BU_DATE 		=> PDO::PARAM_STR,
-		self::BU_TIMESTAMP 	=> PDO::PARAM_STR,
-		self::BOOLEAN 		=> PDO::PARAM_BOOL,
-	);
-
-	/**
-	 * Resturns the PDO type (PDO::PARAM_* constant) value for the Propel type provided.
-	 * @param      string $propelType
-	 * @return     int
-	 */
-	public static function getPdoType($propelType)
-	{
-		return self::$propelToPdoMap[$propelType];
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/PropelConfiguration.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/PropelConfiguration.php
deleted file mode 100644
index d802fc924..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/PropelConfiguration.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-/*
- *  $Id: PropelConfiguration.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * PropelConfiguration is a container for all Propel's configuration data.
- *
- * PropelConfiguration implements ArrayAccess interface so the configuration
- * can be accessed as an array or using a simple getter and setter. The whole
- * configuration can also be retrieved as a nested arrays, flat array or as a
- * PropelConfiguration instance.
- *
- * @author     Veikko M�kinen <veikko@veikko.fi>
- * @version    $Revision: 1262 $
- * @package    propel
- */
-class PropelConfiguration implements ArrayAccess
-{
-	const TYPE_ARRAY = 1;
-
-	const TYPE_ARRAY_FLAT = 2;
-
-	const TYPE_OBJECT = 3;
-
-	/**
-	* @var        array An array of parameters
-	*/
-	protected $parameters = array();
-
-	/**
-	 * Construct a new configuration container
-	 *
-	 * @param      array $parameters
-	 */
-	public function __construct(array $parameters = array())
-	{
-		$this->parameters = $parameters;
-	}
-
-	/**
-	 * @see        http://www.php.net/ArrayAccess
-	 */
-	public function offsetExists($offset)
-	{
-		return isset($this->parameter[$offset]) || array_key_exists($offset, $this->parameters);
-	}
-
-	/**
-	 * @see        http://www.php.net/ArrayAccess
-	 */
-	public function offsetSet($offset, $value)
-	{
-		$this->parameter[$offset] = $value;
-	}
-
-	/**
-	 * @see        http://www.php.net/ArrayAccess
-	 */
-	public function offsetGet($offset)
-	{
-		return $this->parameters[$offset];
-	}
-
-	/**
-	 * @see        http://www.php.net/ArrayAccess
-	 */
-	public function offsetUnset($offset)
-	{
-		unset($this->parameters[$offset]);
-	}
-
-	/**
-	 * Get parameter value from the container
-	 *
-	 * @param      string $name    Parameter name
-	 * @param      mixed  $default Default value to be used if the
-	 *                             requested value is not found
-	 * @return     mixed           Parameter value or the default
-	 */
-	public function getParameter($name, $default = null)
-	{
-		$ret = $this->parameters;
-		$parts = explode('.', $name); //name.space.name
-		while ($part = array_shift($parts)) {
-			if (array_key_exists($part, $ret)) {
-				$ret = $ret[$part];
-			} else {
-				return $default;
-			}
-		}
-		return $ret;
-	}
-
-	/**
-	 * Store a value to the container
-	 *
-	 * @param      string $name Configuration item name (name.space.name)
-	 * @param      mixed $value Value to be stored
-	 */
-	public function setParameter($name, $value)
-	{
-		$param = &$this->parameters;
-		$parts = explode('.', $name); //name.space.name
-		while ($part = array_shift($parts)) {
-			$param = &$param[$part];
-		}
-		$param = $value;
-	}
-
-	/**
-	 *
-	 *
-	 * @param      int $type
-	 * @return     mixed
-	 */
-	public function getParameters($type = PropelConfiguration::TYPE_ARRAY)
-	{
-		switch ($type) {
-			case PropelConfiguration::TYPE_ARRAY:
-				return $this->parameters;
-			case PropelConfiguration::TYPE_ARRAY_FLAT:
-				return $this->toFlatArray();
-			case PropelConfiguration::TYPE_OBJECT:
-				return $this;
-			default:
-				throw new PropelException('Unknown configuration type: '. var_export($type, true));
-		}
-
-	}
-
-
-	/**
-	 * Get the configuration as a flat array. ($array['name.space.item'] = 'value')
-	 *
-	 * @return     array
-	 */
-	protected function toFlatArray()
-	{
-		$result = array();
-		$it = new PropelConfigurationIterator(new RecursiveArrayIterator($this->parameters), RecursiveIteratorIterator::SELF_FIRST);
-		foreach($it as $key => $value) {
-			$ns = $it->getDepth() ? $it->getNamespace() . '.'. $key : $key;
-			if ($it->getNodeType() == PropelConfigurationIterator::NODE_ITEM) {
-				$result[$ns] = $value;
-			}
-		}
-
-		return $result;
-	}
-
-}
-
-?>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/PropelConfigurationIterator.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/PropelConfigurationIterator.php
deleted file mode 100644
index 26d1edc90..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/PropelConfigurationIterator.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-/*
- *  $Id: PropelConfigurationIterator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * PropelConfigurationIterator is used internally by PropelConfiguration to
- * build a flat array from nesting configuration arrays.
- *
- * @author     Veikko M�kinen <veikko@veikko.fi>
- * @version    $Revision: 1262 $
- * @package    propel
- */
-class PropelConfigurationIterator extends RecursiveIteratorIterator
-{
-	/**
-	 * Node is a parent node
-	 */
-	const NODE_PARENT = 0;
-
-	/**
-	 * Node is an actual configuration item
-	 */
-	const NODE_ITEM = 1;
-
-	/**
-	 * Namespace stack when recursively iterating the configuration tree
-	 *
-	 * @var        array
-	 */
-	protected $namespaceStack = array();
-
-	/**
-	 * Current node type. Possible values: null (undefined), self::NODE_PARENT or self::NODE_ITEM
-	 *
-	 * @var        int
-	 */
-	protected $nodeType = null;
-
-	/**
-	 * Get current namespace
-	 *
-	 * @return     string
-	 */
-	public function getNamespace()
-	{
-		return implode('.', $this->namespaceStack);
-	}
-
-	/**
-	 * Get current node type.
-	 *
-	 * @see        http://www.php.net/RecursiveIteratorIterator
-	 * @return     int
-	 *             - null (undefined)
-	 *             - self::NODE_PARENT
-	 *             - self::NODE_ITEM
-	 */
-	public function getNodeType()
-	{
-		return $this->nodeType;
-	}
-
-	/**
-	 * Get the current element
-	 *
-	 * @see        http://www.php.net/RecursiveIteratorIterator
-	 * @return     mixed
-	 */
-	public function current()
-	{
-		$current = parent::current();
-		if (is_array($current)) {
-			$this->namespaceStack[] = $this->key();
-			$this->nodeType = self::NODE_PARENT;
-		}
-		else {
-			$this->nodeType = self::NODE_ITEM;
-		}
-
-		return $current;
-	}
-
-	/**
-	 * Called after current child iterator is invalid and right before it gets destructed.
-	 *
-	 * @see        http://www.php.net/RecursiveIteratorIterator
-	 */
-	public function endChildren()
-	{
-		if ($this->namespaceStack) {
-			array_pop($this->namespaceStack);
-		}
-	}
-
-}
-
-?>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/PropelDateTime.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/PropelDateTime.php
deleted file mode 100644
index 4913e6215..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/PropelDateTime.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/*
- *  $Id: PropelDateTime.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * DateTime subclass which supports serialization.
- *
- * Currently Propel is not using this for storing date/time objects
- * within model objeects; however, we are keeping it in the repository
- * because it is useful if you want to store a DateTime object in a session.
- *
- * @author     Alan Pinstein
- * @author     Soenke Ruempler
- * @author     Hans Lellelid
- * @package    propel.util
- */
-class PropelDateTime extends DateTime
-{
-
-	/**
-	 * A string representation of the date, for serialization.
-	 * @var        string
-	 */
-	private $dateString;
-
-	/**
-	 * A string representation of the time zone, for serialization.
-	 * @var        string
-	 */
-	private $tzString;
-
-	/**
-	 * Convenience method to enable a more fluent API.
-	 * @param      string $date Date/time value.
-	 * @param      DateTimeZone $tz (optional) timezone
-	 */
-	public static function newInstance($date, DateTimeZone $tz = null)
-	{
-		if ($tz) {
-			return new DateTime($date, $tz);
-		} else {
-			return new DateTime($date);
-		}
-	}
-
-	/**
-	 * PHP "magic" function called when object is serialized.
-	 * Sets an internal property with the date string and returns properties
-	 * of class that should be serialized.
-	 * @return     array string[]
-	 */
-	function __sleep()
-	{
-		// We need to use a string without a time zone, due to
-		// PHP bug: http://bugs.php.net/bug.php?id=40743
-		$this->dateString = $this->format('Y-m-d H:i:s');
-		$this->tzString = $this->getTimeZone()->getName();
-		return array('dateString', 'tzString');
-	}
-
-	/**
-	 * PHP "magic" function called when object is restored from serialized state.
-	 * Calls DateTime constructor with previously stored string value of date.
-	 */
-	function __wakeup()
-	{
-		parent::__construct($this->dateString, new DateTimeZone($this->tzString));
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/PropelPDO.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/PropelPDO.php
deleted file mode 100644
index b51fa1070..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/PropelPDO.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?php
-/*
- *  $Id: PropelPDO.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-
-/**
- * PDO connection subclass that provides the basic fixes to PDO that are required by Propel.
- *
- * This class was designed to work around the limitation in PDO where attempting to begin
- * a transaction when one has already been begun will trigger a PDOException.  Propel
- * relies on the ability to create nested transactions, even if the underlying layer
- * simply ignores these (because it doesn't support nested transactions).
- *
- * The changes that this class makes to the underlying API include the addition of the
- * getNestedTransactionDepth() and isInTransaction() and the fact that beginTransaction()
- * will no longer throw a PDOException (or trigger an error) if a transaction is already
- * in-progress.
- *
- * @author     Cameron Brunner <cameron.brunner@gmail.com>
- * @author     Hans Lellelid <hans@xmpl.org>
- * @author     Christian Abegg <abegg.ch@gmail.com>
- * @since      2006-09-22
- * @package    propel.util
- */
-class PropelPDO extends PDO {
-
-	/**
-	 * Attribute to use to set whether to cache prepared statements.
-	 */
-	const PROPEL_ATTR_CACHE_PREPARES = -1;
-
-	/**
-	 * The current transaction depth.
-	 * @var        int
-	 */
-	protected $nestedTransactionCount = 0;
-
-	/**
-	 * Cache of prepared statements (PDOStatement) keyed by md5 of SQL.
-	 *
-	 * @var        array [md5(sql) => PDOStatement]
-	 */
-	protected $preparedStatements = array();
-
-	/**
-	 * Whether to cache prepared statements.
-	 *
-	 * @var        boolean
-	 */
-	protected $cachePreparedStatements = false;
-	
-	/**
-	 * Whether the final commit is possible
-	 * Is false if a nested transaction is rolled back
-	 */
-	protected $isUncommitable = false;
-
-	/**
-	 * Gets the current transaction depth.
-	 * @return     int
-	 */
-	public function getNestedTransactionCount()
-	{
-		return $this->nestedTransactionCount;
-	}
-
-	/**
-	 * Set the current transaction depth.
-	 * @param      int $v The new depth.
-	 */
-	protected function setNestedTransactionCount($v)
-	{
-		$this->nestedTransactionCount = $v;
-	}
-
-	/**
-	 * Decrements the current transaction depth by one.
-	 */
-	protected function decrementNestedTransactionCount()
-	{
-		$this->nestedTransactionCount--;
-	}
-
-	/**
-	 * Increments the current transaction depth by one.
-	 */
-	protected function incrementNestedTransactionCount()
-	{
-		$this->nestedTransactionCount++;
-	}
-
-	/**
-	 * Is this PDO connection currently in-transaction?
-	 * This is equivalent to asking whether the current nested transaction count
-	 * is greater than 0.
-	 * @return     boolean
-	 */
-	public function isInTransaction()
-	{
-		return ($this->getNestedTransactionCount() > 0);
-	}
-	
-	/**
-	 * Overrides PDO::beginTransaction() to prevent errors due to already-in-progress transaction.
-	 */
-	public function beginTransaction()
-	{
-		$return = true;
-		$opcount = $this->getNestedTransactionCount();
-		if ( $opcount === 0 ) {
-			$return = parent::beginTransaction();
-			$this->isUncommitable = false;
-		}
-		$this->incrementNestedTransactionCount();
-		return $return;
-	}
-
-	/**
-	 * Overrides PDO::commit() to only commit the transaction if we are in the outermost
-	 * transaction nesting level.
-	 */
-	public function commit()
-	{
-		$return = true;
-		$opcount = $this->getNestedTransactionCount();
-		if ($opcount > 0) {
-			if ($opcount === 1) {
-				if ($this->isUncommitable) {
-					throw new PropelException('Cannot commit because a nested transaction was rolled back');
-				} else {
-					$return = parent::commit();
-				}
-			}
-			$this->decrementNestedTransactionCount();
-		}
-		return $return;
-	}
-
-	/**
-	 * Overrides PDO::rollBack() to only rollback the transaction if we are in the outermost
-	 * transaction nesting level
-	 * @return     boolean Whether operation was successful.
-	 */
-	public function rollBack()
-	{
-		$return = true;
-		$opcount = $this->getNestedTransactionCount();
-		if ($opcount > 0) {
-			if ($opcount === 1) { 
-				$return = parent::rollBack(); 
-			} else {
-				$this->isUncommitable = true;
-			}
-			$this->decrementNestedTransactionCount(); 
-		}
-		return $return;
-	}
-
-	/**
-	* Rollback the whole transaction, even if this is a nested rollback
-	* and reset the nested transaction count to 0.
-	* @return     boolean Whether operation was successful.
-	*/
-	public function forceRollBack()
-	{
-		$return = true;
-		$opcount = $this->getNestedTransactionCount();
-		if ($opcount > 0) {
-			// If we're in a transaction, always roll it back
-			// regardless of nesting level.
-			$return = parent::rollBack();
-			
-			// reset nested transaction count to 0 so that we don't
-			// try to commit (or rollback) the transaction outside this scope.
-			$this->nestedTransactionCount = 0;
-		}
-		return $return;
-	}
-  
-	/**
-	 * Sets a connection attribute.
-	 *
-	 * This is overridden here to provide support for setting Propel-specific attributes
-	 * too.
-	 *
-	 * @param      int $attribute The attribute to set (e.g. PropelPDO::PROPEL_ATTR_CACHE_PREPARES).
-	 * @param      mixed $value The attribute value.
-	 */
-	public function setAttribute($attribute, $value)
-	{
-		switch($attribute) {
-			case self::PROPEL_ATTR_CACHE_PREPARES:
-				$this->cachePreparedStatements = $value;
-				break;
-			default:
-				parent::setAttribute($attribute, $value);
-		}
-	}
-
-	/**
-	 * Gets a connection attribute.
-	 *
-	 * This is overridden here to provide support for setting Propel-specific attributes
-	 * too.
-	 *
-	 * @param      int $attribute The attribute to get (e.g. PropelPDO::PROPEL_ATTR_CACHE_PREPARES).
-	 */
-	public function getAttribute($attribute)
-	{
-		switch($attribute) {
-			case self::PROPEL_ATTR_CACHE_PREPARES:
-				return $this->cachePreparedStatements;
-				break;
-			default:
-				return parent::getAttribute($attribute);
-		}
-	}
-
-	/**
-	 * Overrides PDO::prepare() to add query caching support if the
-	 * PropelPDO::PROPEL_ATTR_CACHE_PREPARES was set to true.
-	 * .
-	 * @param      string $sql
-	 * @param      array
-	 * @return     PDOStatement
-	 */
-	public function prepare($sql, $driver_options = array())
-	{
-		if ($this->cachePreparedStatements) {
-			$key = $sql;
-			if (!isset($this->preparedStatements[$key])) {
-				$stmt = parent::prepare($sql, $driver_options);
-				$this->preparedStatements[$key] = $stmt;
-				return $stmt;
-			} else {
-				return $this->preparedStatements[$key];
-			}
-		} else {
-			return parent::prepare($sql, $driver_options);
-		}
-	}
-
-	/**
-	 * Clears any stored prepared statements for this connection.
-	 */
-	public function clearStatementCache()
-	{
-		$this->preparedStatements = array();
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/PropelPager.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/PropelPager.php
deleted file mode 100644
index 1bac7b408..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/util/PropelPager.php
+++ /dev/null
@@ -1,607 +0,0 @@
-<?php
-/*
- *  $Id: PropelPager.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- *  PropelPager
- *
- *  Example Usage:
- *
- *  require_once 'propel/util/PropelPager.php';
- *  require_once 'PEACH/Propel/Poem/poemPeer.php';
- *
- *  $c = new Criteria();
- *  $c->addDescendingOrderByColumn(poemPeer::SID);
- *
- *  // with join
- *  $pager = new PropelPager($c, 'poemPeer', 'doSelectJoinPoemUsers', 1, 50);
- *
- *  // without Join
- *
- *  $pager = new PropelPager($c, 'poemPeer', 'doSelect', 1, 50);
- *
- * Some template:
- *
- * <p>
- * Total Pages: <?=$pager->getTotalPages()?>  Total Records: <?=$pager->getTotalRecordCount()?>
- * </p>
- * <table>
- * <tr>
- * <td>
- * <?if ($link = $pager->getFirstPage):?>
- * <a href="somescript?page=<?=$link?>"><?=$link?></a>|
- * <?endif?>
- * </td>
- * <td>
- * <?if ($link = $pager->getPrev()):?>
- * <a href="somescript?page=<?=$link?>">Previous</a>|
- * <?endif?>
- * </td>
- * <td>
- * <?foreach ($pager->getPrevLinks() as $link):?>
- * <a href="somescript?page=<?=$link?>"><?=$link?></a>|
- * <?endforeach?>
- * </td>
- * <td><?=$pager->getPage()?></td>
- * <td>
- * <?foreach ($pager->getNextLinks() as $link):?>
- * | <a href="somescript?page=<?=$link?>"><?=$link?></a>
- * <?endforeach?>
- * </td>
- * <td>
- * <?if ($link = $pager->getNext()):?>
- * <a href="somescript?page=<?=$link?>">Last</a>|
- * <?endif?>
- * </td>
- * <td>
- * <?if ($link = $pager->getLastPage()):?>
- * <a href="somescript?page=<?=$link?>"><?=$link?></a>|
- * <?endif?>
- * </td>
- * </tr>
- * </table>
- * <table id="latestPoems">
- * <tr>
- * <th>Title</th>
- * <th>Auteur</th>
- * <th>Date</th>
- * <th>comments</th>
- * </tr>
- * <?foreach ($pager->getResult() as $poem):?>
- * <tr>
- * <td><?=$poem->getTitle()?></td>
- * <td><?=$poem->getPoemUsers()->getUname()?></td>
- * <td><?=$poem->getTime()?></td>
- * <td><?=$poem->getComments()?></td>
- * </tr>
- * <?endforeach?>
- * </table>
- *
- *
- * @author     Rob Halff <info@rhalff.com>
- * @author	   Niklas Närhinen <niklas@narhinen.net>
- * @version    $Revision: 1262 $
- * @copyright  Copyright (c) 2004 Rob Halff: LGPL - See LICENCE
- * @package    propel.util
- */
-class PropelPager implements Countable, Iterator {
-
-	private $recordCount;
-	private $pages;
-	private $peerClass;
-	private $peerSelectMethod;
-	private $peerCountMethod;
-	private $criteria;
-	private $countCriteria;
-	private $page;
-	private $rs = null;
-	
-	//Iterator vars
-	private $currentKey = 0;
-
-	/** @var        int Start row (offset) */
-	protected $start = 0;
-
-	/** @var        int Max rows to return (0 means all) */
-	protected $max = 0;
-
-	/**
-	 * Create a new Propel Pager.
-	 * @param      Criteria $c
-	 * @param      string $peerClass The name of the static Peer class.
-	 * @param      string $peerSelectMethod The name of the static method for selecting content from the Peer class.
-	 * @param      int $page The current page (1-based).
-	 * @param      int $rowsPerPage The number of rows that should be displayed per page.
-	 */
-	public function __construct($c = null, $peerClass = null, $peerSelectMethod = null, $page = 1, $rowsPerPage = 25)
-	{
-		if (!isset($c)) {
-			$c = new Criteria();
-		}
-		$this->setCriteria($c);
-		$this->setPeerClass($peerClass);
-		$this->setPeerSelectMethod($peerSelectMethod);
-		$this->guessPeerCountMethod();
-		$this->setPage($page);
-		$this->setRowsPerPage($rowsPerPage);
-	}
-
-	/**
-	 * Set the criteria for this pager.
-	 * @param      Criteria $c
-	 * @return     void
-	 */
-	public function setCriteria(Criteria $c)
-	{
-		$this->criteria = $c;
-	}
-
-	/**
-	 * Return the Criteria object for this pager.
-	 * @return     Criteria
-	 */
-	public function getCriteria()
-	{
-		return $this->criteria;
-	}
-
-	/**
-	 * Set the Peer Classname
-	 *
-	 * @param      string $class
-	 * @return     void
-	 */
-	public function setPeerClass($class)
-	{
-		$this->peerClass = $class;
-	}
-
-	/**
-	 * Return the Peer Classname.
-	 * @return     string
-	 */
-	public function getPeerClass()
-	{
-		return $this->peerClass;
-	}
-
-	/**
-	 * Set the Peer select method.
-	 * This exists for legacy support, please use setPeerSelectMethod().
-	 * @param      string $method The name of the static method to call on the Peer class.
-	 * @return     void
-	 * @see        setPeerSelectMethod()
-	 * @deprecated
-	 */
-	public function setPeerMethod($method)
-	{
-		$this->setPeerSelectMethod($method);
-	}
-
-	/**
-	 * Return the Peer select method.
-	 * This exists for legacy support, please use getPeerSelectMethod().
-	 * @return     string
-	 * @see        getPeerSelectMethod()
-	 * @deprecated
-	 */
-	public function getPeerMethod()
-	{
-		return $this->getPeerSelectMethod();
-	}
-
-	/**
-	 * Set the Peer select method.
-	 *
-	 * @param      string $method The name of the static method to call on the Peer class.
-	 * @return     void
-	 */
-	public function setPeerSelectMethod($method)
-	{
-		$this->peerSelectMethod = $method;
-	}
-
-	/**
-	 * Return the Peer select method.
-	 * @return     string
-	 */
-	public function getPeerSelectMethod()
-	{
-		return $this->peerSelectMethod;
-	}
-
-	/**
-	 * Sets the Count method.
-	 * This is set based on the Peer method, for example if Peer method is doSelectJoin*() then the
-	 * count method will be doCountJoin*().
-	 * @param      string $method The name of the static method to call on the Peer class.
-	 */
-	public function setPeerCountMethod($method)
-	{
-		$this->peerCountMethod = $method;
-	}
-
-	/**
-	 * Return the Peer count method.
-	 */
-	public function getPeerCountMethod()
-	{
-		return $this->peerCountMethod;
-	}
-
-	/**
-	 * Guesses the Peer count method based on the select method.
-	 */
-	private function guessPeerCountMethod()
-	{
-		$selectMethod = $this->getPeerSelectMethod();
-		if ($selectMethod == 'doSelect') {
-			$countMethod = 'doCount';
-		} elseif ( ($pos = stripos($selectMethod, 'doSelectJoin')) === 0) {
-			$countMethod = 'doCount' . substr($selectMethod, strlen('doSelect'));
-		} else {
-			// we will fall back to doCount() if we don't understand the join
-			// method; however, it probably won't be accurate.  Maybe triggering an error would
-			// be appropriate ...
-			$countMethod = 'doCount';
-		}
-		$this->setPeerCountMethod($countMethod);
-	}
-
-	/**
-	 * Get the paged resultset
-	 *
-	 * @return     mixed $rs
-	 */
-	public function getResult()
-	{
-		if (!isset($this->rs)) {
-			$this->doRs();
-		}
-
-		return $this->rs;
-	}
-
-	/**
-	 * Get the paged resultset
-	 *
-	 * Main method which creates a paged result set based on the criteria
-	 * and the requested peer select method.
-	 *
-	 */
-	private function doRs()
-	{
-		$this->criteria->setOffset($this->start);
-		$this->criteria->setLimit($this->max);
-		$this->rs = call_user_func(array($this->getPeerClass(), $this->getPeerSelectMethod()), $this->criteria);
-	}
-
-	/**
-	 * Get the first page
-	 *
-	 * For now I can only think of returning 1 always.
-	 * It should probably return 0 if there are no pages
-	 *
-	 * @return     int 1
-	 */
-	public function getFirstPage()
-	{
-		return '1';
-	}
-
-	/**
-	 * Convenience method to indicate whether current page is the first page.
-	 *
-	 * @return     boolean
-	 */
-	public function atFirstPage()
-	{
-		return $this->getPage() == $this->getFirstPage();
-	}
-
-	/**
-	 * Get last page
-	 *
-	 * @return     int $lastPage
-	 */
-	public function getLastPage()
-	{
-		$totalPages = $this->getTotalPages();
-		if ($totalPages == 0) {
-			return 1;
-		} else {
-			return $totalPages;
-		}
-	}
-
-	/**
-	 * Convenience method to indicate whether current page is the last page.
-	 *
-	 * @return     boolean
-	 */
-	public function atLastPage()
-	{
-		return $this->getPage() == $this->getLastPage();
-	}
-
-	/**
-	 * get total pages
-	 *
-	 * @return     int $this->pages
-	 */
-	public function getTotalPages() {
-		if (!isset($this->pages)) {
-			$recordCount = $this->getTotalRecordCount();
-			if ($this->max > 0) {
-					$this->pages = ceil($recordCount/$this->max);
-			} else {
-					$this->pages = 0;
-			}
-		}
-		return $this->pages;
-	}
-
-	/**
-	 * get an array of previous id's
-	 *
-	 * @param      int $range
-	 * @return     array $links
-	 */
-	public function getPrevLinks($range = 5)
-	{
-		$total = $this->getTotalPages();
-		$start = $this->getPage() - 1;
-		$end = $this->getPage() - $range;
-		$first =  $this->getFirstPage();
-		$links = array();
-		for ($i=$start; $i>$end; $i--) {
-			if ($i < $first) {
-					break;
-			}
-			$links[] = $i;
-		}
-
-		return array_reverse($links);
-	}
-
-	/**
-	 * get an array of next id's
-	 *
-	 * @param      int $range
-	 * @return     array $links
-	 */
-	public function getNextLinks($range = 5)
-	{
-		$total = $this->getTotalPages();
-		$start = $this->getPage() + 1;
-		$end = $this->getPage() + $range;
-		$last =  $this->getLastPage();
-		$links = array();
-		for ($i=$start; $i<$end; $i++) {
-			if ($i > $last) {
-					break;
-			}
-			$links[] = $i;
-		}
-
-		return $links;
-	}
-
-	/**
-	 * Returns whether last page is complete
-	 *
-	 * @return     bool Last page complete or not
-	 */
-	public function isLastPageComplete()
-	{
-		return !($this->getTotalRecordCount() % $this->max);
-	}
-
-	/**
-	 * get previous id
-	 *
-	 * @return     mixed $prev
-	 */
-	public function getPrev() {
-		if ($this->getPage() != $this->getFirstPage()) {
-				$prev = $this->getPage() - 1;
-		} else {
-				$prev = false;
-		}
-		return $prev;
-	}
-
-	/**
-	 * get next id
-	 *
-	 * @return     mixed $next
-	 */
-	public function getNext() {
-		if ($this->getPage() != $this->getLastPage()) {
-				$next = $this->getPage() + 1;
-		} else {
-				$next = false;
-		}
-		return $next;
-	}
-
-	/**
-	 * Set the current page number (First page is 1).
-	 * @param      int $page
-	 * @return     void
-	 */
-	public function setPage($page)
-	{
-		$this->page = $page;
-		// (re-)calculate start rec
-		$this->calculateStart();
-	}
-
-	/**
-	 * Get current page.
-	 * @return     int
-	 */
-	public function getPage()
-	{
-		return $this->page;
-	}
-
-	/**
-	 * Set the number of rows per page.
-	 * @param      int $r
-	 */
-	public function setRowsPerPage($r)
-	{
-		$this->max = $r;
-		// (re-)calculate start rec
-		$this->calculateStart();
-	}
-
-	/**
-	 * Get number of rows per page.
-	 * @return     int
-	 */
-	public function getRowsPerPage()
-	{
-		return $this->max;
-	}
-
-	/**
-	 * Calculate startrow / max rows based on current page and rows-per-page.
-	 * @return     void
-	 */
-	private function calculateStart()
-	{
-		$this->start = ( ($this->page - 1) * $this->max );
-	}
-
-	/**
-	 * Gets the total number of (un-LIMITed) records.
-	 *
-	 * This method will perform a query that executes un-LIMITed query.
-	 *
-	 * @return     int Total number of records - disregarding page, maxrows, etc.
-	 */
-	public function getTotalRecordCount()
-	{
-
-				if (!isset($this->rs)) {
-					$this->doRs();
-				}
-
-				if (empty($this->recordCount)) {
-						$this->countCriteria = clone $this->criteria;
-						$this->countCriteria->setLimit(0);
-						$this->countCriteria->setOffset(0);
-
-						$this->recordCount = call_user_func(
-								        array(
-								                $this->getPeerClass(),
-												$this->getPeerCountMethod()
-								             ),
-								        $this->countCriteria
-								        );
-
-				}
-
-				return $this->recordCount;
-
-	}
-
-	/**
-	 * Sets the start row or offset.
-	 * @param      int $v
-	 */
-	public function setStart($v)
-	{
-		$this->start = $v;
-	}
-
-	/**
-	 * Sets max rows (limit).
-	 * @param      int $v
-	 * @return     void
-	 */
-	public function setMax($v)
-	{
-		$this->max = $v;
-	}
-	
-	/**
-	 * Returns the count of the current page's records
-	 * @return 	int
-	 */
-	public function count()
-	{
-		return count($this->getResult());
-	}
-	
-	/**
-	 * Returns the current element of the iterator
-	 * @return mixed
-	 */
-	public function current()
-	{
-		if (!isset($this->rs)) {
-			$this->doRs();
-		}
-		return $this->rs[$this->currentKey];
-	}
-	
-	/**
-	 * Returns the current key of the iterator
-	 * @return int
-	 */
-	public function key()
-	{
-		return $this->currentKey;
-	}
-	
-	/**
-	 * Advances the iterator to the next element
-	 * @return void
-	 */
-	public function next()
-	{
-		$this->currentKey++;
-	}
-	
-	/**
-	 * Resets the iterator to the first element
-	 * @return void
-	 */
-	public function rewind()
-	{
-		$this->currentKey = 0;
-	}
-	
-	/**
-	 * Checks if the current key exists in the container
-	 * @return boolean
-	 */
-	public function valid()
-	{
-		if (!isset($this->rs)) {
-			$this->doRs();
-		}
-		return in_array($this->currentKey, array_keys($this->rs));
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/BasicValidator.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/BasicValidator.php
deleted file mode 100644
index 24e216821..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/BasicValidator.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/*
- *  $Id: BasicValidator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * Basic Validator interface.
- *
- * BasicValidator objects perform validation without any knowledge of column/table
- * context.  They are simply given an input and some value and asked whether the input
- * is valid.
- *
- * @author     Michael Aichler <aichler@mediacluster.de>
- * @version    $Revision: 1262 $
- * @package    propel.validator
- */
-interface BasicValidator
-{
-
-	/**
-	 * Determine whether a value meets the criteria specified
-	 *
-	 * @param      ValidatorMap $map A column map object for the column to be validated.
-	 * @param      string $str a <code>String</code> to be tested
-	 *
-	 * @return     mixed TRUE if valid, error message otherwise
-	 */
-	public function isValid(ValidatorMap $map, $str);
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/MatchValidator.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/MatchValidator.php
deleted file mode 100644
index 283e91c09..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/MatchValidator.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/*
- *  $Id: MatchValidator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * A validator for regular expressions.
- *
- * This validator will return true, when the passed value *matches* the
- * regular expression.
- *
- * ## This class replaces the former class MaskValidator ##
- *
- * If you do want to test if the value does *not* match an expression,
- * you can use the MatchValidator class instead.
- *
- * Below is an example usage for your Propel xml schema file.
- *
- * <code>
- *   <column name="email" type="VARCHAR" size="128" required="true" />
- *   <validator column="username">
- *     <!-- allow strings that match the email adress pattern -->
- *     <rule
- *       name="match"
- *       value="/^([a-zA-Z0-9])+([\.a-zA-Z0-9_-])*@([a-zA-Z0-9])+(\.[a-zA-Z0-9_-]+)+$/"
- *       message="Please enter a valid email address." />
- *   </validator>
- * </code>
- *
- * @author     Michael Aichler <aichler@mediacluster.de>
- * @author     Hans Lellelid <hans@xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.validator
- */
-class MatchValidator implements BasicValidator
-{
-	/**
-	 * Prepares the regular expression entered in the XML
-	 * for use with preg_match().
-	 * @param      string $exp
-	 * @return     string Prepared regular expession.
-	 */
-	private function prepareRegexp($exp)
-	{
-		// remove surrounding '/' marks so that they don't get escaped in next step
-		if ($exp{0} !== '/' || $exp{strlen($exp)-1} !== '/' ) {
-			$exp = '/' . $exp . '/';
-		}
-
-		// if they did not escape / chars; we do that for them
-		$exp = preg_replace('/([^\\\])\/([^$])/', '$1\/$2', $exp);
-
-		return $exp;
-	}
-
-	/**
-	 * Whether the passed string matches regular expression.
-	 */
-	public function isValid (ValidatorMap $map, $str)
-	{
-		return (preg_match($this->prepareRegexp($map->getValue()), $str) != 0);
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/MaxLengthValidator.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/MaxLengthValidator.php
deleted file mode 100644
index 7737e0705..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/MaxLengthValidator.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/*
- *  $Id: MaxLengthValidator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * A validator for maximum string length.
- *
- * Below is an example usage for your Propel xml schema file.
- *
- * Note that if you have specified the size attribute in the column tag
- * you do not have to specify it as value in the validator rule again as
- * this is done automatically.
- *
- * <code>
- *   <column name="username" type="VARCHAR" size="25" required="true" />
- *
- *   <validator column="username">
- *     <rule name="maxLength" message="Passwort must be at least ${value} characters !" />
- *   </validator>
- * </code>
- *
- * @author     Michael Aichler <aichler@mediacluster.de>
- * @version    $Revision: 1262 $
- * @package    propel.validator
- */
-class MaxLengthValidator implements BasicValidator
-{
-
-  public function isValid (ValidatorMap $map, $str)
-  {
-	return strlen($str) <= intval($map->getValue());
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/MaxValueValidator.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/MaxValueValidator.php
deleted file mode 100644
index 432265297..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/MaxValueValidator.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/*
- *  $Id: MaxValueValidator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * A validator for maximum values.
- *
- * Below is an example usage for your Propel xml schema file.
- *
- * <code>
- *   <column name="articles" type="INTEGER" required="true" />
- *
- *   <validator column="articles">
- *     <rule name="minValue" value="1"  message="Minimum value for selected articles is ${value} !" />
- *     <rule name="maxValue" value="10"  message="Maximum value for selected articles is ${value} !" />
- *   </validator>
- * </code>
- *
- * @author     Michael Aichler <aichler@mediacluster.de>
- * @version    $Revision: 1262 $
- * @package    propel.validator
- */
-class MaxValueValidator implements BasicValidator
-{
-
-	/**
-	 * @see        BasicValidator::isValid()
-	 */
-	public function isValid (ValidatorMap $map, $value)
-	{
-		if (is_null($value) == false && is_numeric($value) == true) {
-			return intval($value) <= intval($map->getValue());
-		}
-
-		return false;
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/MinLengthValidator.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/MinLengthValidator.php
deleted file mode 100644
index b6c3ebdda..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/MinLengthValidator.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/*
- *  $Id: MinLengthValidator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * A validator for minimum string length.
- *
- * <code>
- *   <column name="password" type="VARCHAR" size="34" required="true" />
- *
- *   <validator column="password">
- *     <rule name="minLength" value="5" message="Passwort must be at least ${value} characters !" />
- *   </validator>
- * </code>
- *
- * @author     Michael Aichler <aichler@mediacluster.de>
- * @version    $Revision: 1262 $
- * @package    propel.validator
- */
-class MinLengthValidator implements BasicValidator
-{
-
-	/**
-	 * @see        BasicValidator::isValid()
-	 */
-	public function isValid (ValidatorMap $map, $str)
-	{
-		return strlen($str) >= intval($map->getValue());
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/MinValueValidator.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/MinValueValidator.php
deleted file mode 100644
index 5d1cfda9a..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/MinValueValidator.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/*
- *  $Id: MinValueValidator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * A validator for minimum values.
- *
- * Below is an example usage for your Propel xml schema file.
- *
- * <code>
- *   <column name="articles" type="INTEGER" required="true" />
- *
- *   <validator column="articles">
- *     <rule name="minValue" value="1"  message="Minimum value for selected articles is ${value} !" />
- *     <rule name="maxValue" value="10"  message="Maximum value for selected articles is ${value} !" />
- *   </validator>
- * </code>
- *
- * @author     Michael Aichler <aichler@mediacluster.de>
- * @version    $Revision: 1262 $
- * @package    propel.validator
- */
-class MinValueValidator implements BasicValidator
-{
-
-	/**
-	 * @see        BasicValidator::isValid()
-	 */
-	public function isValid (ValidatorMap $map, $value)
-	{
-	  if (is_null($value) == false && is_numeric($value)) {
-		  return intval($value) >= intval($map->getValue());
-	  }
-
-	  return false;
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/NotMatchValidator.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/NotMatchValidator.php
deleted file mode 100644
index a37261533..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/NotMatchValidator.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/*
- *  $Id: NotMatchValidator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * A validator for regular expressions.
- *
- * This validator will return true, when the passed value does *not* match
- * the regular expression.
- *
- * If you do want to test if the value *matches* an expression, you can use
- * the MatchValidator class instead.
- *
- * Below is an example usage for your Propel xml schema file.
- *
- * <code>
- *   <column name="ISBN" type="VARCHAR" size="20" required="true" />
- *   <validator column="username">
- *     <!-- disallow everything that's not a digit or minus -->
- *     <rule
- *       name="notMatch"
- *       value="/[^\d-]+/"
- *       message="Please enter a valid email adress." />
- *   </validator>
- * </code>
- *
- * @author     Michael Aichler <aichler@mediacluster.de>
- * @author     Hans Lellelid <hans@xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.validator
- */
-class NotMatchValidator implements BasicValidator
-{
-	/**
-	 * Prepares the regular expression entered in the XML
-	 * for use with preg_match().
-	 * @param      string $exp
-	 * @return     string Prepared regular expession.
-	 */
-	private function prepareRegexp($exp)
-	{
-		// remove surrounding '/' marks so that they don't get escaped in next step
-		if ($exp{0} !== '/' || $exp{strlen($exp)-1} !== '/' ) {
-			$exp = '/' . $exp . '/';
-		}
-
-		// if they did not escape / chars; we do that for them
-		$exp = preg_replace('/([^\\\])\/([^$])/', '$1\/$2', $exp);
-
-		return $exp;
-	}
-
-	/**
-	 * Whether the passed string matches regular expression.
-	 */
-	public function isValid (ValidatorMap $map, $str)
-	{
-		return (preg_match($this->prepareRegexp($map->getValue()), $str) == 0);
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/RequiredValidator.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/RequiredValidator.php
deleted file mode 100644
index 28daf4192..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/RequiredValidator.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/*
- *  $Id: RequiredValidator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * A validator for required fields.
- *
- * Below is an example usage for your Propel xml schema file.
- *
- * <code>
- *   <column name="username" type="VARCHAR" size="25" required="true" />
- *
- *   <validator column="username">
- *     <rule name="required" message="Username is required." />
- *   </validator>
- * </code>
- *
- * @author     Michael Aichler <aichler@mediacluster.de>
- * @version    $Revision: 1262 $
- * @package    propel.validator
- */
-class RequiredValidator implements BasicValidator
-{
-
-	/**
-	 * @see        BasicValidator::isValid()
-	 */
-	public function isValid (ValidatorMap $map, $str)
-	{
-		return ($str !== null && $str !== "");
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/TypeValidator.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/TypeValidator.php
deleted file mode 100644
index 994d17cce..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/TypeValidator.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/*
- *  $Id: TypeValidator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * A validator for validating the (PHP) type of the value submitted.
- *
- * <code>
- *   <column name="some_int" type="INTEGER" required="true"/>
- *
- *   <validator column="some_int">
- *     <rule name="type" value="integer" message="Please specify an integer value for some_int column." />
- *   </validator>
- * </code>
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.validator
- */
-class TypeValidator implements BasicValidator
-{
-
-	public function isValid(ValidatorMap $map, $value)
-	{
-		return (gettype($value) == $map->getValue());
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/UniqueValidator.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/UniqueValidator.php
deleted file mode 100644
index 5bb10bf9b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/UniqueValidator.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/*
- *  $Id: UniqueValidator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * A validator for unique column names.
- *
- * <code>
- *   <column name="username" type="VARCHAR" size="25" required="true" />
- *
- *   <validator column="username">
- *     <rule name="unique" message="Username already exists !" />
- *   </validator>
- * </code>
- *
- * @author     Michael Aichler <aichler@mediacluster.de>
- * @version    $Revision: 1262 $
- * @package    propel.validator
- */
-class UniqueValidator implements BasicValidator
-{
-
-	/**
-	 * @see        BasicValidator::isValid()
-	 */
-	public function isValid (ValidatorMap $map, $str)
-	{
-		$column = $map->getColumn();
-
-		$c = new Criteria();
-		$c->add($column->getFullyQualifiedName(), $str, Criteria::EQUAL);
-
-		$table = $column->getTable()->getClassName();
-
-		$clazz = $table . 'Peer';
-		$count = call_user_func(array($clazz, 'doCount'), $c);
-
-		$isValid = ($count === 0);
-
-		return $isValid;
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/ValidValuesValidator.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/ValidValuesValidator.php
deleted file mode 100644
index f3b4885c1..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/ValidValuesValidator.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/*
- *  $Id: ValidValuesValidator.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-/**
- * A validator for valid values (e.g. for enum fields)
- *
- * <code>
- *   <column name="address_type" type="VARCHAR" required="true" default="delivery" />
- *
- *   <validator column="address_type">
- *     <rule name="validValues" value="account|delivery" message="Please select a valid address type." />
- *   </validator>
- * </code>
- *
- * @author     Michael Aichler <aichler@mediacluster.de>
- * @version    $Revision: 1262 $
- * @package    propel.validator
- */
-class ValidValuesValidator implements BasicValidator
-{
-
-	public function isValid (ValidatorMap $map, $str)
-	{
-		return in_array($str, preg_split("/[|,]/", $map->getValue()));
-	}
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/ValidationFailed.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/ValidationFailed.php
deleted file mode 100644
index 47e759c85..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/vendor/propel/validator/ValidationFailed.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/*
- *  $Id: ValidationFailed.php 1262 2009-10-26 20:54:39Z francois $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://propel.phpdb.org>.
- */
-
-
-/**
- * Simple class that serves as a container for any information about a failed validation.
- *
- * Currently this class stores the qualified column name (e.g. tablename.COLUMN_NAME) and
- * the message that should be displayed to the user.
- *
- * An array of these objects will be returned by BasePeer::doValidate() if validation
- * failed.
- *
- * @author     Hans Lellelid <hans@xmpl.org>
- * @version    $Revision: 1262 $
- * @package    propel.validator
- * @see        BasePeer::doValidate()
- */
-class ValidationFailed {
-
-	/** Column name in tablename.COLUMN_NAME format */
-	private $colname;
-
-	/** Message to display to user. */
-	private $message;
-
-	/** Validator object that caused this to fail. */
-	private $validator;
-
-	/**
-	 * Construct a new ValidationFailed object.
-	 * @param      string $colname Column name.
-	 * @param      string $message Message to display to user.
-	 * @param      object $validator The Validator that caused this column to fail.
-	 */
-	public function __construct($colname, $message, $validator = null)
-	{
-		$this->colname = $colname;
-		$this->message = $message;
-		$this->validator = $validator;
-	}
-
-	/**
-	 * Set the column name.
-	 * @param      string $v
-	 */
-	public function setColumn($v)
-	{
-		$this->colname = $v;
-	}
-
-	/**
-	 * Gets the column name.
-	 * @return     string Qualified column name (tablename.COLUMN_NAME)
-	 */
-	public function getColumn()
-	{
-		return $this->colname;
-	}
-
-	/**
-	 * Set the message for the validation failure.
-	 * @param      string $v
-	 */
-	public function setMessage($v)
-	{
-		$this->message = $v;
-	}
-
-	/**
-	 * Gets the message for the validation failure.
-	 * @return     string
-	 */
-	public function getMessage()
-	{
-		return $this->message;
-	}
-
-	/**
-	 * Set the validator object that caused this to fail.
-	 * @param      object $v
-	 */
-	public function setValidator($v)
-	{
-		$this->validator = $v;
-	}
-
-	/**
-	 * Gets the validator object that caused this to fail.
-	 * @return     object
-	 */
-	public function getValidator()
-	{
-		return $this->validator;
-	}
-
-	/**
-	 * "magic" method to get string represenation of object.
-	 * Maybe someday PHP5 will support the invoking this method automatically
-	 * on (string) cast.  Until then it's pretty useless.
-	 * @return     string
-	 */
-	public function __toString()
-	{
-		return $this->getMessage();
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/widget/sfWidgetFormPropelChoice.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/widget/sfWidgetFormPropelChoice.class.php
deleted file mode 100644
index 655de8490..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/lib/widget/sfWidgetFormPropelChoice.class.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * sfWidgetFormPropelChoice represents a choice widget for a model.
- *
- * @package    symfony
- * @subpackage widget
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormPropelChoice.class.php 29679 2010-05-30 14:46:03Z Kris.Wallsmith $
- */
-class sfWidgetFormPropelChoice extends sfWidgetFormChoice
-{
-  /**
-   * @see sfWidget
-   */
-  public function __construct($options = array(), $attributes = array())
-  {
-    $options['choices'] = array();
-
-    parent::__construct($options, $attributes);
-  }
-
-  /**
-   * Constructor.
-   *
-   * Available options:
-   *
-   *  * model:       The model class (required)
-   *  * add_empty:   Whether to add a first empty value or not (false by default)
-   *                 If the option is not a Boolean, the value will be used as the text value
-   *  * method:      The method to use to display object values (__toString by default)
-   *  * key_method:  The method to use to display the object keys (getPrimaryKey by default) 
-   *  * order_by:    An array composed of two fields:
-   *                   * The column to order by the results (must be in the PhpName format)
-   *                   * asc or desc
-   *  * criteria:    A criteria to use when retrieving objects
-   *  * connection:  The Propel connection to use (null by default)
-   *  * multiple:    true if the select tag must allow multiple selections
-   *  * peer_method: The peer method to use to fetch objects
-   *
-   * @see sfWidgetFormSelect
-   */
-  protected function configure($options = array(), $attributes = array())
-  {
-    $this->addRequiredOption('model');
-    $this->addOption('add_empty', false);
-    $this->addOption('method', '__toString');
-    $this->addOption('key_method', 'getPrimaryKey');
-    $this->addOption('order_by', null);
-    $this->addOption('criteria', null);
-    $this->addOption('connection', null);
-    $this->addOption('multiple', false);
-    $this->addOption('peer_method', 'doSelect');
-
-    parent::configure($options, $attributes);
-  }
-
-  /**
-   * Returns the choices associated to the model.
-   *
-   * @return array An array of choices
-   */
-  public function getChoices()
-  {
-    $choices = array();
-    if (false !== $this->getOption('add_empty'))
-    {
-      $choices[''] = true === $this->getOption('add_empty') ? '' : $this->translate($this->getOption('add_empty'));
-    }
-
-    $class = constant($this->getOption('model').'::PEER');
-
-    $criteria = null === $this->getOption('criteria') ? new Criteria() : clone $this->getOption('criteria');
-    if ($order = $this->getOption('order_by'))
-    {
-      $method = sprintf('add%sOrderByColumn', 0 === strpos(strtoupper($order[1]), 'ASC') ? 'Ascending' : 'Descending');
-      $criteria->$method(call_user_func(array($class, 'translateFieldName'), $order[0], BasePeer::TYPE_PHPNAME, BasePeer::TYPE_COLNAME));
-    }
-    $objects = call_user_func(array($class, $this->getOption('peer_method')), $criteria, $this->getOption('connection'));
-
-    $methodKey = $this->getOption('key_method');
-    if (!method_exists($this->getOption('model'), $methodKey))
-    {
-      throw new RuntimeException(sprintf('Class "%s" must implement a "%s" method to be rendered in a "%s" widget', $this->getOption('model'), $methodKey, __CLASS__));
-    }
-
-    $methodValue = $this->getOption('method');
-    if (!method_exists($this->getOption('model'), $methodValue))
-    {
-      throw new RuntimeException(sprintf('Class "%s" must implement a "%s" method to be rendered in a "%s" widget', $this->getOption('model'), $methodValue, __CLASS__));
-    }
-
-    foreach ($objects as $object)
-    {
-      $choices[$object->$methodKey()] = $object->$methodValue();
-    }
-
-    return $choices;
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/bin/prove.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/bin/prove.php
deleted file mode 100644
index ff29c23b5..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/bin/prove.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once dirname(__FILE__).'/../../../../../lib/vendor/lime/lime.php';
-require_once dirname(__FILE__).'/../../../../../lib/util/sfToolkit.class.php';
-require_once dirname(__FILE__).'/../../../../../lib/util/sfFinder.class.php';
-
-if ($files = glob(sfToolkit::getTmpDir().DIRECTORY_SEPARATOR.'/sf_autoload_unit_*'))
-{
-  foreach ($files as $file)
-  {
-    unlink($file);
-  }
-}
-
-$h = new lime_harness(new lime_output_color);
-$h->base_dir = realpath(dirname(__FILE__).'/..');
-
-$h->register(sfFinder::type('file')->prune('fixtures')->name('*Test.php')->in(array(
-  $h->base_dir.'/unit',
-  $h->base_dir.'/functional',
-)));
-
-exit($h->run() ? 0 : 1);
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/bootstrap/functional.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/bootstrap/functional.php
deleted file mode 100644
index ac867e1e4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/bootstrap/functional.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-// we need SQLite for functional tests
-if (!extension_loaded('SQLite') && !extension_loaded('pdo_SQLite'))
-{
-  return false;
-}
-
-if (!isset($root_dir))
-{
-  $root_dir = realpath(dirname(__FILE__).sprintf('/../%s/fixtures', isset($type) ? $type : 'functional'));
-}
-
-require_once $root_dir.'/config/ProjectConfiguration.class.php';
-$configuration = ProjectConfiguration::getApplicationConfiguration($app, 'test', isset($debug) ? $debug : true);
-sfContext::createInstance($configuration);
-
-// remove all cache
-sf_functional_test_shutdown();
-register_shutdown_function('sf_functional_test_shutdown');
-
-$configuration->initializePropel($app);
-if (isset($fixtures))
-{
-  $configuration->loadFixtures($fixtures);
-}
-
-function sf_functional_test_shutdown_cleanup()
-{
-  sfToolkit::clearDirectory(sfConfig::get('sf_cache_dir'));
-  sfToolkit::clearDirectory(sfConfig::get('sf_log_dir'));
-}
-
-function sf_functional_test_shutdown()
-{
-  // try/catch needed due to http://bugs.php.net/bug.php?id=33598
-  try
-  {
-    sf_functional_test_shutdown_cleanup();
-  }
-  catch (Exception $e)
-  {
-    echo $e.PHP_EOL;
-  }
-}
-
-return true;
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/bootstrap/unit.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/bootstrap/unit.php
deleted file mode 100644
index 94b4912a5..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/bootstrap/unit.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/../../../../../test/bootstrap/unit.php');
-
-require_once(dirname(__FILE__).'/../../../../autoload/sfSimpleAutoload.class.php');
-$autoload = sfSimpleAutoload::getInstance(sys_get_temp_dir().DIRECTORY_SEPARATOR.sprintf('sf_autoload_unit_propel_%s.data', md5(__FILE__)));
-$autoload->addDirectory(realpath(dirname(__FILE__).'/../../lib'));
-$autoload->register();
-
-$_test_dir = realpath(dirname(__FILE__).'/..');
-
-sfToolkit::addIncludePath(realpath(dirname(__FILE__).'/../../lib/vendor'));
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crud10Test.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crud10Test.php
deleted file mode 100644
index ee2a7ef09..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crud10Test.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-$app = 'crud';
-$fixtures = 'fixtures/fixtures.yml';
-if (!include(dirname(__FILE__).'/../../bootstrap/functional.php'))
-{
-  return;
-}
-
-require_once(dirname(__FILE__).'/crudBrowser.class.php');
-
-$b = new CrudBrowser();
-$b->browse(array('with-show'));
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crud2Test.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crud2Test.php
deleted file mode 100644
index ada38a0ed..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crud2Test.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-$app = 'crud';
-$fixtures = 'fixtures/fixtures.yml';
-if (!include(dirname(__FILE__).'/../../bootstrap/functional.php'))
-{
-  return;
-}
-
-require_once(dirname(__FILE__).'/crudBrowser.class.php');
-
-$b = new CrudBrowser();
-$b->browse(array('generate-in-cache'));
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crud3Test.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crud3Test.php
deleted file mode 100644
index 8f7e67bc8..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crud3Test.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-$app = 'crud';
-$fixtures = 'fixtures/fixtures.yml';
-if (!include(dirname(__FILE__).'/../../bootstrap/functional.php'))
-{
-  return;
-}
-
-require_once(dirname(__FILE__).'/crudBrowser.class.php');
-
-$b = new CrudBrowser();
-$b->browse(array('generate-in-cache', 'non-verbose-templates'));
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crud6Test.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crud6Test.php
deleted file mode 100644
index 48dd2289f..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crud6Test.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-$app = 'crud';
-$fixtures = 'fixtures/fixtures.yml';
-if (!include(dirname(__FILE__).'/../../bootstrap/functional.php'))
-{
-  return;
-}
-
-require_once(dirname(__FILE__).'/crudBrowser.class.php');
-
-$b = new CrudBrowser();
-$b->browse(array());
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crud7Test.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crud7Test.php
deleted file mode 100644
index 08e801c85..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crud7Test.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-$app = 'crud';
-$fixtures = 'fixtures/fixtures.yml';
-if (!include(dirname(__FILE__).'/../../bootstrap/functional.php'))
-{
-  return;
-}
-
-require_once(dirname(__FILE__).'/crudBrowser.class.php');
-
-$b = new CrudBrowser();
-$b->browse(array('non-verbose-templates'));
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crud9Test.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crud9Test.php
deleted file mode 100644
index e563dcad8..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crud9Test.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-$app = 'crud';
-$fixtures = 'fixtures/fixtures.yml';
-if (!include(dirname(__FILE__).'/../../bootstrap/functional.php'))
-{
-  return;
-}
-
-require_once(dirname(__FILE__).'/crudBrowser.class.php');
-
-$b = new CrudBrowser();
-$b->browse(array('generate-in-cache', 'with-show'));
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crudBrowser.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crudBrowser.class.php
deleted file mode 100644
index 318c35cd5..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/crudBrowser.class.php
+++ /dev/null
@@ -1,359 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-class CrudBrowser extends sfTestBrowser
-{
-  protected
-    $urlPrefix = 'article',
-    $singularName = 'Article',
-    $pluralName = 'Articles',
-    $projectDir = '';
-
-  public function setup($options)
-  {
-    $this->projectDir = dirname(__FILE__).'/../fixtures';
-    $this->cleanup();
-
-    chdir($this->projectDir);
-    $task = new sfPropelGenerateModuleTask(new sfEventDispatcher(), new sfFormatter());
-    $options[] = 'env=test';
-    $options[] = 'singular='.$this->singularName;
-    $options[] = 'plural='.$this->pluralName;
-    $options[] = '--non-verbose-templates';
-    $task->run(array('crud', 'article', 'Article'), $options);
-
-    require_once($this->projectDir.'/config/ProjectConfiguration.class.php');
-    sfContext::createInstance(ProjectConfiguration::getApplicationConfiguration('crud', 'test', true, $this->projectDir));
-
-    return $options;
-  }
-
-  public function teardown()
-  {
-    $this->cleanup();
-
-    return $this;
-  }
-
-  public function browse($options)
-  {
-    $options = $this->setup($options);
-
-    // list page
-    $this->
-      info('list page')->
-      get('/'.$this->urlPrefix)->
-      with('request')->begin()->
-        isParameter('module', $this->urlPrefix)->
-        isParameter('action', 'index')->
-      end()->
-      with('response')->begin()->
-        isStatusCode(200)->
-
-        checkElement('h1', $this->pluralName.' List')->
-
-        checkElement('table thead tr th:nth(0)', 'Id')->
-        checkElement('table thead tr th:nth(1)', 'Title')->
-        checkElement('table thead tr th:nth(2)', 'Body')->
-        checkElement('table thead tr th:nth(3)', 'Online')->
-        checkElement('table thead tr th:nth(4)', 'Excerpt')->
-        checkElement('table thead tr th:nth(5)', 'Category')->
-        checkElement('table thead tr th:nth(6)', 'Created at')->
-        checkElement('table thead tr th:nth(7)', 'End date')->
-        checkElement('table thead tr th:nth(8)', 'Book')->
-
-        checkElement('table tbody tr td:nth(0)', '1')->
-        checkElement('table tbody tr td:nth(1)', 'foo title')->
-        checkElement('table tbody tr td:nth(2)', 'bar body')->
-        checkElement('table tbody tr td:nth(3)', '1')->
-        checkElement('table tbody tr td:nth(4)', 'foo excerpt')->
-        checkElement('table tbody tr td:nth(5)', '1')->
-        checkElement('table tbody tr td:nth(6)', '/^\d{4}\-\d{2}\-\d{2} \d{2}\:\d{2}\:\d{2}$/')->
-        checkElement('table tbody tr td:nth(7)', '')->
-        checkElement('table tbody tr td:nth(8)', '')->
-        checkElement(sprintf('a[href*="/%s/new"]', $this->urlPrefix))->
-        checkElement(sprintf('tbody a[href*="/%s/1%s"]', $this->urlPrefix, in_array('with-show', $options) ? '' : '/edit'))->
-        checkElement(sprintf('tbody a[href*="/%s/2%s"]', $this->urlPrefix, in_array('with-show', $options) ? '' : '/edit'))->
-      end()
-    ;
-
-    // create page
-    $this->
-      info('create page')->
-      click('New')->
-      with('request')->begin()->
-        isParameter('module', $this->urlPrefix)->
-        isParameter('action', 'new')->
-        isParameter('id', null)->
-      end()->
-      with('response')->begin()->
-        isStatusCode(200)->
-        checkElement('h1', 'New '.$this->singularName)->
-        checkElement(sprintf('a[href*="/%s"]', $this->urlPrefix), 'Back to list')->
-        checkElement(sprintf('a[href*="/%s/"]', $this->urlPrefix), false)->
-      end()->
-      checkFormValues(array(
-        'title'               => '',
-        'body'                => '',
-        'Online'              => false,
-        'category_id'         => 0,
-        'end_date'            => array('year' => '', 'month' => '', 'day' => '', 'hour' => '', 'minute' => ''),
-        'book_id'             => 0,
-        'author_article_list' => array(),
-      ))
-    ;
-
-    // save
-    $this->
-      info('save')->
-      saveValues($options, array(
-        'title'               => 'my real title',
-        'body'                => 'my real body',
-        'Online'              => true,
-        'category_id'         => 2,
-        'end_date'            => array('year' => '', 'month' => '', 'day' => '', 'hour' => '', 'minute' => ''),
-        'book_id'             => null,
-        'author_article_list' => array(1, 2),
-      ), 3, true)
-    ;
-
-    // go back to the list
-    $this->
-      info('go back to the list')->
-      click('Back to list')->
-      with('request')->begin()->
-        isParameter('module', $this->urlPrefix)->
-        isParameter('action', 'index')->
-      end()->
-      with('response')->isStatusCode(200)
-    ;
-
-    // edit page
-    $this->info('edit page');
-    if (!in_array('with-show', $options) && ($options['with-show'] === true))
-    {
-      $this->click('3');
-    }
-    else
-    {
-      $this->get(sprintf('/%s/3/edit', $this->urlPrefix));
-    }
-
-    $this->
-      with('request')->begin()->
-        isParameter('module', $this->urlPrefix)->
-        isParameter('action', 'edit')->
-        isParameter('id', 3)->
-      end()->
-      with('response')->begin()->
-        isStatusCode(200)->
-        checkElement('h1', 'Edit '.$this->singularName)->
-        checkElement(sprintf('a[href*="/%s"]', $this->urlPrefix), 'Back to list')->
-        checkElement(sprintf('a[href*="/%s/3"]', $this->urlPrefix), 'Delete')->
-        checkElement(sprintf('a[href*="/%s/3"][onclick*="confirm"]', $this->urlPrefix))->
-        checkElement('table tbody th:nth(0)', 'Title')->
-        checkElement('table tbody th:nth(1)', 'Body')->
-        checkElement('table tbody th:nth(2)', 'Online')->
-        checkElement('table tbody th:nth(3)', 'Excerpt')->
-        checkElement('table tbody th:nth(4)', 'Category')->
-        checkElement('table tbody th:nth(5)', 'Created at')->
-        checkElement('table tbody th:nth(6)', 'End date')->
-        checkElement('table tbody th:nth(7)', 'Book')->
-        checkElement('table tbody th:nth(8)', 'Author article list')->
-        checkElement('table tbody td select[id="article_category_id"][name="article[category_id]"] option', 2)->
-        checkElement('table tbody td select[id="article_book_id"][name="article[book_id]"] option', 2)->
-      end()
-    ;
-
-    // save / validation
-    $values = array(
-      'id'                  => 1009299,
-      'title'               => '',
-      'body'                => 'my body',
-      'Online'              => true,
-      'excerpt'             => 'my excerpt',
-      'category_id'         => null,
-      'end_date'            => array('year' => 0, 'month' => 0, 'day' => 15, 'hour' => '10', 'minute' => '20'),
-      'book_id'             => 149999,
-      'author_article_list' => array(0, 5),
-    );
-
-    $this->
-      info('save / validation')->
-      click('Save', array('article' => $values))->
-      with('request')->begin()->
-        isParameter('module', $this->urlPrefix)->
-        isParameter('action', 'update')->
-      end()->
-      checkFormValues(array_merge($values, array(
-        'end_date' => array('year' => null, 'month' => null, 'day' => 15, 'hour' => '10', 'minute' => '20')))
-      )->
-      with('response')->begin()->
-        isStatusCode(200)->
-        checkElement('ul[class="error_list"] li:contains("Required.")', 2)->
-        checkElement('ul[class="error_list"] li:contains("Invalid.")', 4)->
-      end()
-    ;
-
-    // save
-    $this->
-      info('save')->
-      saveValues($options, array(
-        'id'                  => 3,
-        'title'               => 'my title',
-        'body'                => 'my body',
-        'Online'              => false,
-        'category_id'         => 1,
-        'end_date'            => array('year' => date('Y'), 'month' => 10, 'day' => 15, 'hour' => '10', 'minute' => '20'),
-        'book_id'             => 1,
-        'author_article_list' => array(1, 3),
-      ), 3, false)
-    ;
-
-    // go back to the list
-    $this->
-      info('go back to the list')->
-      click('Back to list')->
-      with('request')->begin()->
-        isParameter('module', $this->urlPrefix)->
-        isParameter('action', 'index')->
-      end()->
-      with('response')->isStatusCode(200)
-    ;
-
-    // delete
-    $this->
-      info('delete')->
-      get(sprintf('/%s/3/edit', $this->urlPrefix))->
-      click('Delete', array(), array('method' => 'delete', '_with_csrf' => true))->
-      with('request')->begin()->
-        isParameter('module', $this->urlPrefix)->
-        isParameter('action', 'delete')->
-      end()->
-      with('response')->begin()->
-        isRedirected()->
-        followRedirect()->
-      end()->
-      with('request')->begin()->
-        isParameter('module', $this->urlPrefix)->
-        isParameter('action', 'index')->
-      end()->
-      with('response')->isStatusCode(200)->
-
-      get(sprintf('/%s/3/edit', $this->urlPrefix))->
-      with('response')->isStatusCode(404)
-    ;
-
-    if (in_array('with-show', $options))
-    {
-      // show page
-      $this->
-        info('show page')->
-        get(sprintf('/%s/2', $this->urlPrefix))->
-        with('request')->begin()->
-          isParameter('module', $this->urlPrefix)->
-          isParameter('action', 'show')->
-          isParameter('id', 2)->
-        end()->
-        with('response')->begin()->
-          isStatusCode(200)->
-          checkElement(sprintf('a[href*="/%s/2%s"]', $this->urlPrefix, in_array('with-show', $options) ? '' : '/edit'), 'Edit')->
-          checkElement(sprintf('a[href*="/%s"]', $this->urlPrefix), 'List', array('position' => 1))->
-          checkElement('body table tbody tr:nth(0)', '/Id\:\s+2/')->
-          checkElement('body table tbody tr:nth(1)', '/Title\:\s+foo foo title/')->
-          checkElement('body table tbody tr:nth(2)', '/Body\:\s+bar bar body/')->
-          checkElement('body table tbody tr:nth(3)', '/Online\:\s+/')->
-          checkElement('body table tbody tr:nth(4)', '/Excerpt\:\s+foo excerpt/')->
-          checkElement('body table tbody tr:nth(5)', '/Category\:\s+2/')->
-          checkElement('body table tbody tr:nth(6)', '/Created at\:\s+[0-9\-\:\s]+/')->
-          checkElement('body table tbody tr:nth(7)', '/End date\:\s+[0-9\-\:\s]+/')->
-          checkElement('body table tbody tr:nth(8)', '/Book\:\s+/')->
-        end()
-      ;
-    }
-    else
-    {
-      $this->get(sprintf('/%s/show/id/2', $this->urlPrefix))->with('response')->isStatusCode(404);
-    }
-
-    $this->teardown();
-
-    return $this;
-  }
-
-  public function saveValues($options, $values, $id, $creation)
-  {
-    $this->
-      click('Save', array('article' => $values))->
-      with('request')->begin()->
-        isParameter('module', $this->urlPrefix)->
-        isParameter('action', $creation ? 'create' : 'update')->
-      end()->
-      with('response')->begin()->
-        isRedirected()->
-        followRedirect()->
-      end()->
-      with('response')->begin()->
-        isStatusCode(200)->
-      end()->
-      with('request')->begin()->
-        isParameter('module', $this->urlPrefix)->
-        isParameter('action', 'edit')->
-        isParameter('id', $id)->
-      end()->
-      checkFormValues($values)
-    ;
-
-    return $this;
-  }
-
-  public function checkFormValues(array $values)
-  {
-    return $this->with('response')->begin()->
-      checkElement(sprintf('table tbody td input[id="article_title"][name="article[title]"][value="%s"]', $values['title']))->
-
-      checkElement('table tbody td textarea[id="article_body"][name="article[body]"]', $values['body'])->
-
-      checkElement(sprintf('table tbody td input[id="article_Online"][name="article[Online]"][type="checkbox"]%s', $values['Online'] ? '[checked="checked"]' : ''))->
-
-      checkElement(sprintf('table tbody td select[id="article_category_id"][name="article[category_id]"] option[value="1"]%s', $values['category_id'] == 1 ? '[selected="selected"]' : ''), 'Category 1')->
-      checkElement(sprintf('table tbody td select[id="article_category_id"][name="article[category_id]"] option[value="2"]%s', $values['category_id'] == 2 ? '[selected="selected"]' : ''), 'Category 2')->
-
-      checkElement(sprintf('table tbody td select[id="article_book_id"][name="article[book_id]"] option[value=""]%s', $values['book_id'] == '' ? '[selected="selected"]' : ''), '')->
-      checkElement(sprintf('table tbody td select[id="article_book_id"][name="article[book_id]"] option[value="1"]%s', $values['book_id'] == 1 ? '[selected="selected"]' : ''), 'The definitive guide to symfony')->
-
-      checkElement(sprintf('table tbody td select[id="article_author_article_list"][name="article[author_article_list][]"] option[value="1"]%s', in_array(1, $values['author_article_list']) ? '[selected="selected"]' : ''), 'Fabien')->
-      checkElement(sprintf('table tbody td select[id="article_author_article_list"][name="article[author_article_list][]"] option[value="2"]%s', in_array(2, $values['author_article_list']) ? '[selected="selected"]' : ''), 'Thomas')->
-      checkElement(sprintf('table tbody td select[id="article_author_article_list"][name="article[author_article_list][]"] option[value="3"]%s', in_array(3, $values['author_article_list']) ? '[selected="selected"]' : ''), 'Hélène')->
-
-      checkElement('table tbody td select[id="article_end_date_year"][name="article[end_date][year]"] option[selected="selected"]', (string) $values['end_date']['year'])->
-      checkElement('table tbody td select[id="article_end_date_month"][name="article[end_date][month]"] option[selected="selected"]', (string) $values['end_date']['month'])->
-      checkElement('table tbody td select[id="article_end_date_day"][name="article[end_date][day]"] option[selected="selected"]', (string) $values['end_date']['day'])->
-      checkElement('table tbody td select[id="article_end_date_hour"][name="article[end_date][hour]"] option[selected="selected"]', (string) $values['end_date']['hour'])->
-      checkElement('table tbody td select[id="article_end_date_minute"][name="article[end_date][minute]"] option[selected="selected"]', (string) $values['end_date']['minute'])->
-    end();
-  }
-
-  protected function clearDirectory($dir)
-  {
-    sfToolkit::clearDirectory($dir);
-    if (is_dir($dir))
-    {
-      rmdir($dir);
-    }
-  }
-
-  protected function cleanup()
-  {
-    $this->clearDirectory(sprintf($this->projectDir.'/apps/crud/modules/%s', $this->urlPrefix));
-    $this->clearDirectory(sprintf($this->projectDir.'/cache/crud/test/modules/auto%s', ucfirst($this->urlPrefix)));
-    $this->clearDirectory($this->projectDir.'/test/functional/crud');
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/rest1Test.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/rest1Test.php
deleted file mode 100644
index d41fcd957..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/rest1Test.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-$app = 'crud';
-$fixtures = 'fixtures/fixtures.yml';
-if (!include(dirname(__FILE__).'/../../bootstrap/functional.php'))
-{
-  return;
-}
-
-require_once(dirname(__FILE__).'/restBrowser.class.php');
-
-$b = new RestBrowser();
-$b->browse(array());
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/rest2Test.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/rest2Test.php
deleted file mode 100644
index 51d9a26f8..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/rest2Test.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-$app = 'crud';
-$fixtures = 'fixtures/fixtures.yml';
-if (!include(dirname(__FILE__).'/../../bootstrap/functional.php'))
-{
-  return;
-}
-
-require_once(dirname(__FILE__).'/restBrowser.class.php');
-
-$b = new RestBrowser();
-$b->browse(array('non-verbose-templates'));
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/restBrowser.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/restBrowser.class.php
deleted file mode 100644
index be12bd027..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/crud/restBrowser.class.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/crudBrowser.class.php');
-
-class RestBrowser extends CrudBrowser
-{
-  protected
-    $urlPrefix = 'articles';
-
-  public function setup($options)
-  {
-    $this->projectDir = dirname(__FILE__).'/../fixtures';
-    $this->cleanup();
-
-    chdir($this->projectDir);
-    $task = new sfPropelGenerateModuleForRouteTask(new sfEventDispatcher(), new sfFormatter());
-    $options[] = 'env=test';
-    $options[] = '--non-verbose-templates';
-    $task->run(array('crud', 'articles'), $options);
-
-    require_once($this->projectDir.'/config/ProjectConfiguration.class.php');
-    sfContext::createInstance(ProjectConfiguration::getApplicationConfiguration('crud', 'test', true, $this->projectDir));
-
-    $options['with-show'] = true;
-
-    return $options;
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/app.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/app.yml
deleted file mode 100644
index 24e262133..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/app.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-# default values
-all:
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/backend_compatConfiguration.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/backend_compatConfiguration.class.php
deleted file mode 100644
index 3956bd299..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/backend_compatConfiguration.class.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-class backend_compatConfiguration extends sfApplicationConfiguration
-{
-  public function configure()
-  {
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/cache.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/cache.yml
deleted file mode 100644
index c120397aa..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/cache.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-default:
-  enabled:     false
-  with_layout: false
-  lifetime:    86400
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/factories.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/factories.yml
deleted file mode 100644
index 1b33b566d..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/factories.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-prod:
-  logger:
-    class:   sfNoLogger
-    param:
-      level:   err
-      loggers: ~
-
-test:
-  response:
-    class: sfWebResponse
-    param:
-      send_http_headers: false
-
-  storage:
-    class: sfSessionTestStorage
-    param:
-      session_path: %SF_TEST_CACHE_DIR%/sessions
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/filters.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/filters.yml
deleted file mode 100644
index 0d5b9c82b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/filters.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-rendering: ~
-security:  ~
-
-# generally, you will want to insert your own filters here
-
-
-cache:     ~
-
-execution: ~
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/routing.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/routing.yml
deleted file mode 100644
index e77531a48..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/routing.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# default rules
-homepage:
-  url:   /
-  param: { module: default, action: index }
-
-default_symfony:
-  url:   /symfony/:action/*
-  param: { module: default }
-
-default_index:
-  url:   /:module
-  param: { action: index }
-
-default:
-  url:   /:module/:action/*
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/security.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/security.yml
deleted file mode 100644
index 2a35e05a1..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/security.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-default:
-  is_secure: false
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/settings.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/settings.yml
deleted file mode 100644
index 0cb8cdd77..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/settings.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-prod:
-  .settings:
-    logging_enabled: false
-    no_script_name:  false
-
-dev:
-  .settings:
-    error_reporting:        <?php echo (E_ALL | E_STRICT)."\n" ?>
-    web_debug:              true
-    cache:                  false
-    no_script_name:         false
-    etag:                   false
-
-test:
-  .settings:
-    error_reporting:        <?php echo ((E_ALL | E_STRICT) ^ E_NOTICE)."\n" ?>
-    cache:                  false
-    web_debug:              false
-    no_script_name:         false
-    etag:                   false
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/view.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/view.yml
deleted file mode 100644
index 901d83070..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/config/view.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-default:
-  http_metas:
-    content-type: text/html
-
-  metas:
-    title:        symfony project
-    robots:       index, follow
-    description:  symfony project
-    keywords:     symfony, project
-    language:     en
-
-  stylesheets:    [main]
-
-  javascripts:    [ ]
-
-  has_layout:     true
-  layout:         layout
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/lib/myUser.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/lib/myUser.class.php
deleted file mode 100644
index 4c793028e..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/lib/myUser.class.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-class myUser extends sfBasicSecurityUser
-{
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/article/actions/actions.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/article/actions/actions.class.php
deleted file mode 100644
index 221959f46..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/article/actions/actions.class.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * article actions.
- *
- * @package    project
- * @subpackage article
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 5125 2007-09-16 00:53:55Z dwhittle $
- */
-class articleActions extends autoarticleActions
-{
-  public function executeMyAction()
-  {
-    return $this->renderText('Selected '.implode(', ', $this->getRequestParameter('sf_admin_batch_selection', array())));
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/article/config/generator.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/article/config/generator.yml
deleted file mode 100644
index f14e48338..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/article/config/generator.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-generator:
-  class:              sfPropelAdminGenerator
-  param:
-    model_class:      Article
-    theme:            default
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/article/templates/_body.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/article/templates/_body.php
deleted file mode 100644
index 2c327c3f2..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/article/templates/_body.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php if ('list' == $type): ?>
-before <?php echo $article->getBody() ?> after
-<?php elseif ('edit' == $type): ?>
-<textarea name="article[body]" id="article_body">before <?php echo $article->getBody() ?> after</textarea>
-<?php elseif ('filter' == $type): ?>
-<input type="text" name="body_filter" value="before after" />
-<?php else: ?>
-SOMETHING WRONG HAPPENED
-<?php endif; ?>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/error/actions/actions.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/error/actions/actions.class.php
deleted file mode 100644
index c61837e45..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/error/actions/actions.class.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-/**
- * error actions.
- *
- * @package    project
- * @subpackage error
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 5125 2007-09-16 00:53:55Z dwhittle $
- */
-class errorActions extends autoerrorActions
-{
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/error/config/generator.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/error/config/generator.yml
deleted file mode 100644
index f974efcda..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/error/config/generator.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-generator:
-  class:              sfPropelAdminGenerator
-  param:
-    model_class:      FakeClass
-    theme:            default
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/inheritance/actions/actions.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/inheritance/actions/actions.class.php
deleted file mode 100644
index e48a12b39..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/inheritance/actions/actions.class.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * inheritance actions.
- *
- * @package    project
- * @subpackage inheritance
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 5125 2007-09-16 00:53:55Z dwhittle $
- */
-class inheritanceActions extends autoinheritanceActions
-{
-  protected function addFiltersCriteria($c)
-  {
-    if ($this->getRequestParameter('filter'))
-    {
-      $c->add(ArticlePeer::ONLINE, true);
-    }
-  }
-
-  protected function addSortCriteria($c)
-  {
-    if ($this->getRequestParameter('sort'))
-    {
-      $c->addAscendingOrderByColumn(ArticlePeer::TITLE);
-    }
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/inheritance/config/generator.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/inheritance/config/generator.yml
deleted file mode 100644
index f14e48338..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/inheritance/config/generator.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-generator:
-  class:              sfPropelAdminGenerator
-  param:
-    model_class:      Article
-    theme:            default
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/validation/actions/actions.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/validation/actions/actions.class.php
deleted file mode 100644
index 312c47463..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/validation/actions/actions.class.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-/**
- * validation actions.
- *
- * @package    project
- * @subpackage validation
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 5125 2007-09-16 00:53:55Z dwhittle $
- */
-class validationActions extends autovalidationActions
-{
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/validation/config/generator.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/validation/config/generator.yml
deleted file mode 100644
index f14e48338..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/validation/config/generator.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-generator:
-  class:              sfPropelAdminGenerator
-  param:
-    model_class:      Article
-    theme:            default
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/validation/validate/edit.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/validation/validate/edit.yml
deleted file mode 100644
index e40ab2ed2..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/modules/validation/validate/edit.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-methods:
-  post:
-    - "article{title}"
-    - "article{body}"
-
-names:
-  article{title}:
-    required:     true
-    required_msg: required
-
-  article{body}:
-    required:     true
-    required_msg: required
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/templates/layout.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/templates/layout.php
deleted file mode 100644
index 6d75aa8e4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/backend_compat/templates/layout.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-
-<?php echo include_http_metas() ?>
-<?php echo include_metas() ?>
-
-<?php echo include_title() ?>
-
-<link rel="shortcut icon" href="/favicon.ico" />
-
-
-    <?php include_stylesheets() ?>
-    <?php include_javascripts() ?>
-</head>
-<body>
-
-<?php echo $sf_content ?>
-
-</body>
-</html>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/app.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/app.yml
deleted file mode 100644
index 24e262133..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/app.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-# default values
-all:
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/cache.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/cache.yml
deleted file mode 100644
index c120397aa..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/cache.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-default:
-  enabled:     false
-  with_layout: false
-  lifetime:    86400
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/crudConfiguration.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/crudConfiguration.class.php
deleted file mode 100644
index f616c7066..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/crudConfiguration.class.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-class crudConfiguration extends sfApplicationConfiguration
-{
-  public function configure()
-  {
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/factories.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/factories.yml
deleted file mode 100644
index 1b33b566d..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/factories.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-prod:
-  logger:
-    class:   sfNoLogger
-    param:
-      level:   err
-      loggers: ~
-
-test:
-  response:
-    class: sfWebResponse
-    param:
-      send_http_headers: false
-
-  storage:
-    class: sfSessionTestStorage
-    param:
-      session_path: %SF_TEST_CACHE_DIR%/sessions
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/filters.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/filters.yml
deleted file mode 100644
index 0d5b9c82b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/filters.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-rendering: ~
-security:  ~
-
-# generally, you will want to insert your own filters here
-
-
-cache:     ~
-
-execution: ~
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/routing.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/routing.yml
deleted file mode 100644
index 4d41fce29..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/routing.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-article:
-  class:        sfPropelRouteCollection
-  type:         collection
-  options:      { model: Article, route_class: sfRequestRoute }
-  requirements: { id: \d+ }
-
-articles:
-  class:        sfPropelRouteCollection
-  type:         collection
-  options:      { model: Article, singular: article }
-  requirements: { id: \d+ }
-
-# default rules
-homepage:
-  url:   /
-  param: { module: default, action: index }
-
-default_symfony:
-  url:   /symfony/:action/*
-  param: { module: default }
-
-default_index:
-  url:   /:module
-  param: { action: index }
-
-default:
-  url:   /:module/:action/*
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/security.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/security.yml
deleted file mode 100644
index 2a35e05a1..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/security.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-default:
-  is_secure: false
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/settings.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/settings.yml
deleted file mode 100644
index 97f0adc40..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/settings.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-prod:
-  .settings:
-    logging_enabled: false
-    no_script_name:  false
-
-dev:
-  .settings:
-    error_reporting:        <?php echo (E_ALL | E_STRICT)."\n" ?>
-    web_debug:              true
-    cache:                  false
-    no_script_name:         false
-    etag:                   false
-
-test:
-  .settings:
-    error_reporting:        <?php echo ((E_ALL | E_STRICT) ^ E_NOTICE)."\n" ?>
-    cache:                  false
-    web_debug:              false
-    no_script_name:         false
-    etag:                   false
-
-all:
-  .settings:
-    csrf_secret: F=84rfz3
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/view.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/view.yml
deleted file mode 100644
index 901d83070..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/config/view.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-default:
-  http_metas:
-    content-type: text/html
-
-  metas:
-    title:        symfony project
-    robots:       index, follow
-    description:  symfony project
-    keywords:     symfony, project
-    language:     en
-
-  stylesheets:    [main]
-
-  javascripts:    [ ]
-
-  has_layout:     true
-  layout:         layout
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/lib/myUser.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/lib/myUser.class.php
deleted file mode 100644
index 4c793028e..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/lib/myUser.class.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-class myUser extends sfBasicSecurityUser
-{
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/modules/error/actions/actions.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/modules/error/actions/actions.class.php
deleted file mode 100644
index c61837e45..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/modules/error/actions/actions.class.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-/**
- * error actions.
- *
- * @package    project
- * @subpackage error
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 5125 2007-09-16 00:53:55Z dwhittle $
- */
-class errorActions extends autoerrorActions
-{
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/modules/error/config/generator.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/modules/error/config/generator.yml
deleted file mode 100644
index 9591bf9cb..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/modules/error/config/generator.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-generator:
-  class:              sfPropelCrudGenerator
-  param:
-    model_class:      FakeClass
-    theme:            default
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/templates/layout.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/templates/layout.php
deleted file mode 100644
index 6d75aa8e4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/crud/templates/layout.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-
-<?php echo include_http_metas() ?>
-<?php echo include_metas() ?>
-
-<?php echo include_title() ?>
-
-<link rel="shortcut icon" href="/favicon.ico" />
-
-
-    <?php include_stylesheets() ?>
-    <?php include_javascripts() ?>
-</head>
-<body>
-
-<?php echo $sf_content ?>
-
-</body>
-</html>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/app.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/app.yml
deleted file mode 100644
index 1899f5faa..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/app.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-# default values
-#all:
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/cache.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/cache.yml
deleted file mode 100644
index c120397aa..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/cache.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-default:
-  enabled:     false
-  with_layout: false
-  lifetime:    86400
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/factories.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/factories.yml
deleted file mode 100644
index 1b33b566d..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/factories.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-prod:
-  logger:
-    class:   sfNoLogger
-    param:
-      level:   err
-      loggers: ~
-
-test:
-  response:
-    class: sfWebResponse
-    param:
-      send_http_headers: false
-
-  storage:
-    class: sfSessionTestStorage
-    param:
-      session_path: %SF_TEST_CACHE_DIR%/sessions
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/filters.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/filters.yml
deleted file mode 100644
index 0cbf8a7a4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/filters.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-rendering: ~
-security:  ~
-
-# insert your own filters here
-
-cache:     ~
-
-execution: ~
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/frontendConfiguration.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/frontendConfiguration.class.php
deleted file mode 100644
index 12b3e0b67..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/frontendConfiguration.class.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-class frontendConfiguration extends sfApplicationConfiguration
-{
-  public function configure()
-  {
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/routing.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/routing.yml
deleted file mode 100644
index e77531a48..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/routing.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# default rules
-homepage:
-  url:   /
-  param: { module: default, action: index }
-
-default_symfony:
-  url:   /symfony/:action/*
-  param: { module: default }
-
-default_index:
-  url:   /:module
-  param: { action: index }
-
-default:
-  url:   /:module/:action/*
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/security.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/security.yml
deleted file mode 100644
index 2a35e05a1..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/security.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-default:
-  is_secure: false
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/settings.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/settings.yml
deleted file mode 100644
index 73fd9fc6b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/settings.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-prod:
-  .settings:
-    no_script_name:         false
-    logging_enabled:        false
-
-dev:
-  .settings:
-    error_reporting:        <?php echo (E_ALL | E_STRICT)."\n" ?>
-    web_debug:              true
-    cache:                  false
-    no_script_name:         false
-    etag:                   false
-
-test:
-  .settings:
-    error_reporting:        <?php echo ((E_ALL | E_STRICT) ^ E_NOTICE)."\n" ?>
-    cache:                  false
-    web_debug:              false
-    no_script_name:         false
-    etag:                   false
-
-all:
-  .settings:
-    # Form security secret (CSRF protection)
-    csrf_secret:       false     # Unique secret to enable CSRF protection or false to disable
-
-    # Output escaping settings
-    escaping_strategy:      false            # Determines how variables are made available to templates. Accepted values: true, false.
-    escaping_method:        ESC_SPECIALCHARS # Function or helper used for escaping. Accepted values: ESC_RAW, ESC_ENTITIES, ESC_JS, ESC_JS_NO_ENTITIES, and ESC_SPECIALCHARS.
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/view.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/view.yml
deleted file mode 100644
index ba06e3ef7..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/config/view.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-default:
-  http_metas:
-    content-type: text/html
-
-  metas:
-    #title:        symfony project
-    #description:  symfony project
-    #keywords:     symfony, project
-    #language:     en
-    robots:       index, follow
-
-  stylesheets:    [main]
-
-  javascripts:    []
-
-  has_layout:     true
-  layout:         layout
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/lib/myUser.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/lib/myUser.class.php
deleted file mode 100644
index 4c793028e..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/lib/myUser.class.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-class myUser extends sfBasicSecurityUser
-{
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/attachment/actions/actions.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/attachment/actions/actions.class.php
deleted file mode 100644
index 9bbcfa903..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/attachment/actions/actions.class.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * attachment actions.
- *
- * @package    test
- * @subpackage attachment
- * @author     Your name here
- * @version    SVN: $Id: actions.class.php 16987 2009-04-04 14:16:46Z fabien $
- */
-class attachmentActions extends sfActions
-{
-  public function executeIndex($request)
-  {
-    $this->form = new AttachmentForm();
-    unset($this->form['article_id']);
-
-    if ($request->isMethod(sfRequest::POST))
-    {
-      $this->form->bind($request->getParameter('attachment'), $request->getFiles('attachment'));
-
-      if ($this->form->isValid())
-      {
-        $this->form->save();
-
-        $this->redirect('attachment/ok');
-      }
-    }
-  }
-
-  public function executeEmbedded($request)
-  {
-    $this->form = new ArticleForm(null, array('with_attachment' => true));
-
-    if (
-      $request->isMethod(sfRequest::POST)
-      &&
-      $this->form->bindAndSave($request->getParameter('article'), $request->getFiles('article'))
-    )
-    {
-      $this->redirect('attachment/ok');
-    }
-
-    $this->setTemplate('index');
-  }
-
-  public function executeOk()
-  {
-    return $this->renderText('ok');
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/attachment/templates/indexSuccess.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/attachment/templates/indexSuccess.php
deleted file mode 100644
index 834a1547a..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/attachment/templates/indexSuccess.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<form action="<?php echo url_for('attachment/'.sfContext::getInstance()->getActionName()) ?>" method="post" enctype="multipart/form-data">
-  <table>
-    <?php echo $form ?>
-    <tr>
-      <td colspan="2">
-        <input type="submit" value="submit" />
-      </td>
-    </tr>
-  </table>
-</form>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/choice/actions/actions.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/choice/actions/actions.class.php
deleted file mode 100644
index 4f14326ce..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/choice/actions/actions.class.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * choice actions.
- *
- * @package    ##PROJECT_NAME##
- * @subpackage choice
- * @author     Your name here
- * @version    SVN: $Id: actions.class.php 16987 2009-04-04 14:16:46Z fabien $
- */
-class choiceActions extends sfActions
-{
-  public function executeArticle($request)
-  {
-    $this->form = new ArticleForm();
-
-    if ($request->getParameter('impossible_validator'))
-    {
-      $criteria = new Criteria();
-      $criteria->add(CategoryPeer::ID, null, Criteria::ISNULL);
-
-      $this->form->getValidator('category_id')->setOption('criteria', $criteria);
-    }
-
-    if ($request->getParameter('impossible_validator_many'))
-    {
-      $criteria = new Criteria();
-      $criteria->add(AuthorPeer::ID, null, Criteria::ISNULL);
-
-      $this->form->getValidator('author_article_list')->setOption('criteria', $criteria);
-    }
-
-    if ($request->isMethod(sfRequest::POST))
-    {
-      $this->form->bind($request->getParameter('article'));
-
-      if ($this->form->isValid())
-      {
-        $this->form->save();
-
-        $this->redirect('choice/ok');
-      }
-    }
-  }
-
-  public function executeOk()
-  {
-    return $this->renderText('ok');
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/choice/templates/articleSuccess.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/choice/templates/articleSuccess.php
deleted file mode 100644
index ba0e0516a..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/choice/templates/articleSuccess.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<form action="<?php echo url_for('choice/article') ?>" method="post">
-  <table>
-    <?php echo $form ?>
-    <tr>
-      <td colspan="2">
-        <input type="submit" value="submit" />
-      </td>
-    </tr>
-  </table>
-</form>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/i18n/actions/actions.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/i18n/actions/actions.class.php
deleted file mode 100644
index 6395c6f35..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/i18n/actions/actions.class.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * i18n actions.
- *
- * @package    test
- * @subpackage i18n
- * @author     Your name here
- * @version    SVN: $Id: actions.class.php 24597 2009-11-30 19:53:50Z Kris.Wallsmith $
- */
-class i18nActions extends sfActions
-{
-  public function executeIndex()
-  {
-    $this->getUser()->setCulture('fr');
-
-    $this->movies = MoviePeer::doSelect(new Criteria());
-  }
-
-  public function executeDefault()
-  {
-    $this->movies = MoviePeer::doSelect(new Criteria());
-
-    $this->setTemplate('index');
-  }
-
-  public function executeMovie($request)
-  {
-    $this->form = new MovieForm(MoviePeer::retrieveByPk($request->getParameter('id')));
-
-    if ($request->isMethod(sfRequest::POST))
-    {
-      $this->form->bind($request->getParameter('movie'));
-
-      if ($this->form->isValid())
-      {
-        $movie = $this->form->save();
-
-        $this->redirect('i18n/movie?id='.$movie->getId());
-      }
-    }
-  }
-
-  public function executeProducts()
-  {
-    $this->products = ProductPeer::doSelect(new Criteria());
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/i18n/templates/indexSuccess.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/i18n/templates/indexSuccess.php
deleted file mode 100644
index 59c9778db..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/i18n/templates/indexSuccess.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<ul id="movies">
-  <?php foreach ($movies as $movie): ?>
-    <li class="toString"><?php echo $movie ?></li>
-    <li class="default"><?php echo $movie->getTitle() ?></li>
-    <li class="fr"><?php echo $movie->getTitle('fr') ?></li>
-    <li class="it"><?php echo $movie->getTitle('it') ?></li>
-  <?php endforeach; ?>
-</ul>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/i18n/templates/movieSuccess.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/i18n/templates/movieSuccess.php
deleted file mode 100644
index a6b357a29..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/i18n/templates/movieSuccess.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<form action="" method="post">
-  <table>
-    <?php echo $form ?>
-    <tr>
-      <td colspan="2">
-        <input type="submit" value="submit" />
-      </td>
-    </tr>
-  </table>
-</form>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/i18n/templates/productsSuccess.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/i18n/templates/productsSuccess.php
deleted file mode 100644
index 0b06efe84..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/i18n/templates/productsSuccess.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<ul id="products">
-  <?php foreach ($products as $product): ?>
-    <li class="toString"><?php echo $product ?></li>
-  <?php endforeach; ?>
-</ul>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/pager/actions/actions.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/pager/actions/actions.class.php
deleted file mode 100644
index 2b4fbd5a6..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/pager/actions/actions.class.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-class pagerActions extends sfActions
-{
-  public function executeInterfaces()
-  {
-    $this->pager = new sfPropelPager('Article');
-    $this->pager->init();
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/pager/templates/interfacesSuccess.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/pager/templates/interfacesSuccess.php
deleted file mode 100644
index 5cd6d9c51..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/pager/templates/interfacesSuccess.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<ul id="pagerResults">
-  <?php foreach ($pager as $i => $article): ?>
-    <li id="pagerResult<?php echo $i ?>"><?php echo $article->getTitle() ?></li>
-  <?php endforeach; ?>
-</ul>
-
-<span id="pagerCount"><?php echo count($pager) ?></span>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/pooling/actions/actions.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/pooling/actions/actions.class.php
deleted file mode 100644
index 8f9eafebe..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/pooling/actions/actions.class.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * pooling actions.
- *
- * @package    ##PROJECT_NAME##
- * @subpackage pooling
- * @author     Your name here
- * @version    SVN: $Id: actions.class.php 14025 2008-12-14 15:41:43Z Kris.Wallsmith $
- */
-class poolingActions extends sfActions
-{
-  public function executeAddArticleButDontSave(sfWebRequest $request)
-  {
-    $article = new Article();
-    $article->setTitle(__METHOD__.'()');
-
-    $category = CategoryPeer::retrieveByPK($request->getParameter('category_id'));
-    $category->addArticle($article);
-
-    return sfView::NONE;
-  }
-
-  public function executeAddArticleAndSave(sfWebRequest $request)
-  {
-    $article = new Article();
-    $article->setTitle(__METHOD__.'()');
-
-    $category = CategoryPeer::retrieveByPK($request->getParameter('category_id'));
-    $category->addArticle($article);
-    $category->save();
-
-    return sfView::NONE;
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/unique/actions/actions.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/unique/actions/actions.class.php
deleted file mode 100644
index 205d89899..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/unique/actions/actions.class.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-/**
- * unique actions.
- *
- * @package    test
- * @subpackage unique
- * @author     Your name here
- * @version    SVN: $Id: actions.class.php 16987 2009-04-04 14:16:46Z fabien $
- */
-class uniqueActions extends sfActions
-{
-  public function executeArticle($request)
-  {
-    $this->form = new ArticleForm();
-
-    if ($request->isMethod(sfRequest::POST))
-    {
-      $this->form->bind($request->getParameter('article'));
-
-      if ($this->form->isValid())
-      {
-        $this->form->save();
-
-        $this->redirect('unique/ok');
-      }
-    }
-  }
-
-  public function executeEdit($request)
-  {
-    $this->form = new ArticleForm(ArticlePeer::doSelectOne(new Criteria()));
-
-    if ($request->isMethod(sfRequest::POST))
-    {
-      $this->form->bind($request->getParameter('article'));
-
-      if ($this->form->isValid())
-      {
-        $this->form->save();
-
-        $this->redirect('unique/edit');
-      }
-    }
-  }
-
-  public function executeCategory($request)
-  {
-    $category = CategoryPeer::retrieveByPk($request->getParameter('category[id]'));
-    $this->form = new CategoryForm($category);
-
-    if ($request->getParameter('global'))
-    {
-      $this->form->getValidatorSchema()->getPostValidator()->setOption('throw_global_error', true);
-    }
-
-    if ($request->isMethod(sfRequest::POST))
-    {
-      $this->form->bind($request->getParameter('category'));
-
-      if ($this->form->isValid())
-      {
-        $this->form->save();
-
-        $this->redirect('unique/ok');
-      }
-    }
-  }
-
-  public function executeOk()
-  {
-    return $this->renderText('ok');
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/unique/templates/articleSuccess.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/unique/templates/articleSuccess.php
deleted file mode 100644
index cb699ddd6..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/unique/templates/articleSuccess.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<form action="<?php echo url_for('unique/article') ?>" method="post">
-  <table>
-    <?php echo $form ?>
-    <tr>
-      <td colspan="2">
-        <input type="submit" value="submit" />
-      </td>
-    </tr>
-  </table>
-</form>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/unique/templates/categorySuccess.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/unique/templates/categorySuccess.php
deleted file mode 100644
index 12161925c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/unique/templates/categorySuccess.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<form action="<?php echo url_for('unique/category') ?>" method="post">
-  <table>
-    <?php echo $form ?>
-    <tr>
-      <td colspan="2">
-        <input type="submit" value="submit" />
-      </td>
-    </tr>
-  </table>
-</form>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/unique/templates/editSuccess.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/unique/templates/editSuccess.php
deleted file mode 100644
index 7dde17313..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/modules/unique/templates/editSuccess.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<form action="<?php echo url_for('unique/edit') ?>" method="post">
-  <table>
-    <?php echo $form ?>
-    <tr>
-      <td colspan="2">
-        <input type="submit" value="submit" />
-      </td>
-    </tr>
-  </table>
-</form>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/templates/layout.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/templates/layout.php
deleted file mode 100644
index cb547ebbf..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/apps/frontend/templates/layout.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-
-<?php include_http_metas() ?>
-<?php include_metas() ?>
-
-<?php include_title() ?>
-
-<link rel="shortcut icon" href="/favicon.ico" />
-
-
-    <?php include_stylesheets() ?>
-    <?php include_javascripts() ?>
-</head>
-<body>
-
-<?php echo $sf_content ?>
-
-</body>
-</html>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/ProjectConfiguration.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/ProjectConfiguration.class.php
deleted file mode 100644
index db538a313..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/ProjectConfiguration.class.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-require_once dirname(__FILE__).'/../../../../../../autoload/sfCoreAutoload.class.php';
-sfCoreAutoload::register();
-
-class ProjectConfiguration extends sfProjectConfiguration
-{
-  public function setup()
-  {
-    $this->enableAllPluginsExcept(array('sfDoctrinePlugin'));
-  }
-
-  public function initializePropel($app)
-  {
-    // build Propel om/map/sql/forms
-    $files = glob(sfConfig::get('sf_lib_dir').'/model/om/*.php');
-    if (false === $files || !count($files))
-    {
-      chdir(sfConfig::get('sf_root_dir'));
-      $task = new sfPropelBuildModelTask($this->dispatcher, new sfFormatter());
-      ob_start();
-      $task->run();
-      $output = ob_get_clean();
-    }
-
-    $files = glob(sfConfig::get('sf_data_dir').'/sql/*.php');
-    if (false === $files || !count($files))
-    {
-      chdir(sfConfig::get('sf_root_dir'));
-      $task = new sfPropelBuildSqlTask($this->dispatcher, new sfFormatter());
-      ob_start();
-      $task->run();
-      $output = ob_get_clean();
-    }
-
-    $files = glob(sfConfig::get('sf_lib_dir').'/form/base/*.php');
-    if (false === $files || !count($files))
-    {
-      chdir(sfConfig::get('sf_root_dir'));
-      $task = new sfPropelBuildFormsTask($this->dispatcher, new sfFormatter());
-      $task->run(array(), array('application='.$app));
-    }
-  }
-
-  public function loadFixtures($fixtures)
-  {
-    // initialize database manager
-    $databaseManager = new sfDatabaseManager($this);
-
-    // cleanup database
-    $db = sfConfig::get('sf_data_dir').DIRECTORY_SEPARATOR.'/database.sqlite';
-    if (file_exists($db))
-    {
-      unlink($db);
-    }
-
-    // initialize database
-    $sql = file_get_contents(sfConfig::get('sf_data_dir').DIRECTORY_SEPARATOR.'sql'.DIRECTORY_SEPARATOR.'lib.model.schema.sql');
-    $sql = preg_replace('/^\s*\-\-.+$/m', '', $sql);
-    $sql = preg_replace('/^\s*DROP TABLE .+?$/m', '', $sql);
-    $con = Propel::getConnection();
-    $tables = preg_split('/CREATE TABLE/', $sql);
-    foreach ($tables as $table)
-    {
-      $table = trim($table);
-      if (!$table)
-      {
-        continue;
-      }
-
-      $con->query('CREATE TABLE '.$table);
-    }
-
-    // load fixtures
-    $data = new sfPropelData();
-    if (is_array($fixtures))
-    {
-      $data->loadDataFromArray($fixtures);
-    }
-    else
-    {
-      $data->loadData(sfConfig::get('sf_data_dir').'/'.$fixtures);
-    }
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/databases.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/databases.yml
deleted file mode 100644
index 919b67ff2..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/databases.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-test:
-  propel:
-    param:
-      classname:  DebugPDO
-
-all:
-  propel:
-    class:  sfPropelDatabase
-    param:
-      dsn:  sqlite:%SF_DATA_DIR%/database.sqlite
-      pooling: true
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/propel.ini b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/propel.ini
deleted file mode 100644
index efeb24c21..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/propel.ini
+++ /dev/null
@@ -1,55 +0,0 @@
-propel.targetPackage       = lib.model
-propel.packageObjectModel  = true
-propel.project             = project
-propel.database            = sqlite
-propel.database.driver     = sqlite
-propel.database.createUrl  = sqlite:%SF_DATA_DIR%/database.sqlite
-propel.database.url        = sqlite:%SF_DATA_DIR%/database.sqlite
-propel.database.creole.url = ${propel.database.url}
-propel.database.user       = root
-propel.database.password   = 
-propel.database.encoding   = utf8
-
-; mysql options
-propel.mysql.tableType     = InnoDB
-
-propel.addVendorInfo       = true
-propel.addGenericAccessors = true
-propel.addGenericMutators  = true
-propel.addTimeStamp        = true
-propel.addValidators       = false
-propel.addIncludes         = false
-
-propel.useDateTimeClass       = true
-propel.defaultTimeStampFormat = Y-m-d H:i:s
-propel.defaultTimeFormat      = H:i:s
-propel.defaultDateFormat      = Y-m-d
-
-propel.schema.validate        = false
-propel.samePhpName            = false
-propel.disableIdentifierQuoting     = false
-propel.emulateForeignKeyConstraints = true
-
-; directories
-propel.home                    = .
-propel.output.dir              = %SF_ROOT_DIR%
-propel.schema.dir              = ${propel.output.dir}/config
-propel.conf.dir                = ${propel.output.dir}/config
-propel.phpconf.dir             = ${propel.output.dir}/config
-propel.sql.dir                 = ${propel.output.dir}/data/sql
-propel.runtime.conf.file       = runtime-conf.xml
-propel.php.dir                 = ${propel.output.dir}
-propel.default.schema.basename = schema
-propel.datadump.mapper.from    = *schema.xml
-propel.datadump.mapper.to      = *data.xml
-
-propel.builder.addComments  = true
-propel.builder.addBehaviors = true
-
-; behaviors
-propel.behavior.default                        = symfony,symfony_i18n
-propel.behavior.symfony.class                  = plugins.sfPropelPlugin.lib.behavior.SfPropelBehaviorSymfony
-propel.behavior.symfony_i18n.class             = plugins.sfPropelPlugin.lib.behavior.SfPropelBehaviorI18n
-propel.behavior.symfony_i18n_translation.class = plugins.sfPropelPlugin.lib.behavior.SfPropelBehaviorI18nTranslation
-propel.behavior.symfony_behaviors.class        = plugins.sfPropelPlugin.lib.behavior.SfPropelBehaviorSymfonyBehaviors
-propel.behavior.symfony_timestampable.class    = plugins.sfPropelPlugin.lib.behavior.SfPropelBehaviorTimestampable
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/properties.ini b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/properties.ini
deleted file mode 100644
index 071643da8..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/properties.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[symfony]
-  name=##PROJECT_NAME##
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/rsync_exclude.txt b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/rsync_exclude.txt
deleted file mode 100644
index 2d99665d9..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/rsync_exclude.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-.svn
-/web/uploads/*
-/cache/*
-/log/*
-/web/*_dev.php
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/schema.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/schema.xml
deleted file mode 100644
index 64163b9d8..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/config/schema.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<database name="propel" defaultIdMethod="native" package="lib.model">
-
-  <table name="article">
-    <column name="id" type="integer" required="true" primaryKey="true" autoincrement="true" />
-    <column name="title" type="varchar" size="255" required="true" />
-    <column name="body" type="longvarchar" />
-    <column name="Online" type="boolean" />
-    <column name="excerpt" type="varchar" />
-    <column name="category_id" type="integer" required="true" />
-    <foreign-key foreignTable="category">
-      <reference local="category_id" foreign="id" />
-    </foreign-key>
-    <column name="created_at" type="timestamp" />
-    <column name="end_date" type="timestamp" />
-    <column name="book_id" type="integer" />
-    <foreign-key foreignTable="book">
-      <reference local="book_id" foreign="id" onDelete="setnull" />
-    </foreign-key>
-
-    <unique name="unique_title_category">
-      <unique-column name="title" />
-      <unique-column name="category_id" />
-    </unique>
-  </table>
-
-  <table name="category">
-    <column name="id" type="integer" required="true" primaryKey="true" autoincrement="true" />
-    <column name="name" type="varchar" size="255" />
-    <unique name="unique_name">
-      <unique-column name="name" />
-    </unique>
-    <unique name="unique_name1">
-      <unique-column name="name" />
-    </unique>
-  </table>
-
-  <table name="book">
-    <column name="id" type="integer" required="true" primaryKey="true" autoincrement="true" />
-    <column name="name" type="varchar" size="255" />
-  </table>
-
-  <table name="author">
-    <column name="id" type="integer" required="true" primaryKey="true" autoincrement="true" />
-    <column name="name" type="varchar" size="255" />
-  </table>
-
-  <table name="author_article">
-    <behavior name="symfony">
-      <parameter name="form" value="false"/>
-      <parameter name="filter" value="false"/>
-    </behavior>
-    <column name="author_id" type="integer" primaryKey="true" />
-    <foreign-key foreignTable="author">
-      <reference local="author_id" foreign="id" />
-    </foreign-key>
-    <column name="article_id" type="integer" primaryKey="true" />
-    <foreign-key foreignTable="article">
-      <reference local="article_id" foreign="id" />
-    </foreign-key>
-  </table>
-
-  <table name="product" phpName="Product" isI18N="true" i18nTable="product_i18n">
-    <column autoIncrement="false" name="id" type="integer" required="true" primaryKey="true" autoincrement="true"/>
-    <column primaryKey="false" required="false" autoIncrement="false" name="price" type="float"/>
-    <column name="a_primary_string" type="varchar" size="64" primaryString="true"/>
-  </table>
-
-  <table name="product_i18n" phpName="ProductI18n">
-    <column autoIncrement="false" name="id" type="integer" required="true" primaryKey="true"/>
-    <column autoIncrement="false" name="culture" isCulture="true" type="varchar" size="7" required="true" primaryKey="true"/>
-    <column primaryKey="false" required="false" autoIncrement="false" name="name" type="varchar" size="50" primaryString="true"/>
-    <foreign-key onDelete="none" onUpdate="none" foreignTable="product" refPhpName="Translation">
-      <reference local="id" foreign="id"/>
-    </foreign-key>
-  </table>
-
-  <table name="movie" isI18N="true" i18nTable="movie_i18n">
-    <column name="id" type="integer" required="true" primaryKey="true" autoincrement="true" />
-    <column name="director" type="varchar" size="255" />
-  </table>
-
-  <table name="movie_i18n">
-    <column name="id" type="integer" required="true" primaryKey="true" />
-    <foreign-key foreignTable="movie" onDelete="cascade">
-      <reference local="id" foreign="id"/>
-    </foreign-key>
-    <column name="culture" type="varchar" size="7" required="true" primaryKey="true" isCulture="true" />
-    <column name="title" type="varchar" primaryString="true" />
-    <unique>
-     <unique-column name="title" />
-    </unique>
-  </table>
-
-  <table name="attachment">
-    <column name="id" type="integer" required="true" primaryKey="true" autoincrement="true" />
-    <column name="article_id" type="integer" />
-    <column name="name" type="varchar" size="255" />
-    <column name="file" type="varchar" size="255" />
-    <foreign-key foreignTable="article">
-      <reference local="article_id" foreign="id" onDelete="setnull" />
-    </foreign-key>
-  </table>
-
-</database>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/data/environment.migrated b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/data/environment.migrated
deleted file mode 100644
index e69de29bb..000000000
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/data/fixtures/fixtures.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/data/fixtures/fixtures.yml
deleted file mode 100644
index 152f0d6a9..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/data/fixtures/fixtures.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-Book:
-  book_1:
-    name: The definitive guide to symfony
-
-Category:
-  category_1:
-    name: Category 1
-
-  category_2:
-    name: Category 2
-
-Article:
-  article_1:
-    title:       foo title
-    body:        bar body
-    excerpt:     foo excerpt
-    online:      true
-    category_id: category_1
-    created_at:  <?php echo time() ?>
-
-  article_2:
-    title:       foo foo title
-    body:        bar bar body
-    excerpt:     foo excerpt
-    online:      false
-    category_id: category_2
-    created_at:  <?php echo time() ?>
-
-Author:
-  fabien:
-    name: Fabien
-    author_articles: [article_1, article_2]
-  thomas:
-    name: Thomas
-    author_articles: [article_1]
-  helene:
-    name: Hélène
-
-Movie:
-  la_vita_e_bella:
-    director: Roberto Benigni
-
-MovieI18n:
-  la_vita_e_bella_it:
-    id:      la_vita_e_bella
-    culture: it
-    title:   La Vita è bella
-  la_vita_e_bella_fr:
-    id:      la_vita_e_bella
-    culture: fr
-    title:   La Vie est belle
-
-Product:
-  product1:
-    price: 5.00
-    a_primary_string: PRIMARY STRING
-
-ProductI18n:
-  product1_en:
-    id: product1
-    culture: en
-    name: PRIMARY STRING I18N
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/ArticleFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/ArticleFormFilter.class.php
deleted file mode 100644
index 5203dcfd5..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/ArticleFormFilter.class.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * Article filter form.
- *
- * @package    ##PROJECT_NAME##
- * @subpackage filter
- * @author     Your name here
- * @version    SVN: $Id: ArticleFormFilter.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
- */
-class ArticleFormFilter extends BaseArticleFormFilter
-{
-  public function configure()
-  {
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/AttachmentFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/AttachmentFormFilter.class.php
deleted file mode 100644
index 832249315..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/AttachmentFormFilter.class.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * Attachment filter form.
- *
- * @package    ##PROJECT_NAME##
- * @subpackage filter
- * @author     Your name here
- * @version    SVN: $Id: AttachmentFormFilter.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
- */
-class AttachmentFormFilter extends BaseAttachmentFormFilter
-{
-  public function configure()
-  {
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/AuthorFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/AuthorFormFilter.class.php
deleted file mode 100644
index 318a93376..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/AuthorFormFilter.class.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * Author filter form.
- *
- * @package    ##PROJECT_NAME##
- * @subpackage filter
- * @author     Your name here
- * @version    SVN: $Id: AuthorFormFilter.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
- */
-class AuthorFormFilter extends BaseAuthorFormFilter
-{
-  public function configure()
-  {
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/BaseFormFilterPropel.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/BaseFormFilterPropel.class.php
deleted file mode 100644
index 3dbd7f02f..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/BaseFormFilterPropel.class.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * Project filter form base class.
- *
- * @package    ##PROJECT_NAME##
- * @subpackage filter
- * @author     Your name here
- * @version    SVN: $Id: BaseFormFilterPropel.class.php 23306 2009-10-24 13:59:13Z Kris.Wallsmith $
- */
-abstract class BaseFormFilterPropel extends sfFormFilterPropel
-{
-  public function setup()
-  {
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/BookFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/BookFormFilter.class.php
deleted file mode 100644
index 780c34346..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/BookFormFilter.class.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * Book filter form.
- *
- * @package    ##PROJECT_NAME##
- * @subpackage filter
- * @author     Your name here
- * @version    SVN: $Id: BookFormFilter.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
- */
-class BookFormFilter extends BaseBookFormFilter
-{
-  public function configure()
-  {
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/CategoryFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/CategoryFormFilter.class.php
deleted file mode 100644
index 9437f746b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/CategoryFormFilter.class.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * Category filter form.
- *
- * @package    ##PROJECT_NAME##
- * @subpackage filter
- * @author     Your name here
- * @version    SVN: $Id: CategoryFormFilter.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
- */
-class CategoryFormFilter extends BaseCategoryFormFilter
-{
-  public function configure()
-  {
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/MovieFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/MovieFormFilter.class.php
deleted file mode 100644
index 71c62d7cb..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/MovieFormFilter.class.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * Movie filter form.
- *
- * @package    ##PROJECT_NAME##
- * @subpackage filter
- * @author     Your name here
- * @version    SVN: $Id: MovieFormFilter.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
- */
-class MovieFormFilter extends BaseMovieFormFilter
-{
-  public function configure()
-  {
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/MovieI18nFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/MovieI18nFormFilter.class.php
deleted file mode 100644
index c66c10ca0..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/MovieI18nFormFilter.class.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * MovieI18n filter form.
- *
- * @package    ##PROJECT_NAME##
- * @subpackage filter
- * @author     Your name here
- * @version    SVN: $Id: MovieI18nFormFilter.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
- */
-class MovieI18nFormFilter extends BaseMovieI18nFormFilter
-{
-  public function configure()
-  {
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/ProductFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/ProductFormFilter.class.php
deleted file mode 100644
index c1db32f1b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/ProductFormFilter.class.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * Product filter form.
- *
- * @package    ##PROJECT_NAME##
- * @subpackage filter
- * @author     Your name here
- * @version    SVN: $Id: ProductFormFilter.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
- */
-class ProductFormFilter extends BaseProductFormFilter
-{
-  public function configure()
-  {
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/ProductI18nFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/ProductI18nFormFilter.class.php
deleted file mode 100644
index 2163c7448..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/filter/ProductI18nFormFilter.class.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * ProductI18n filter form.
- *
- * @package    ##PROJECT_NAME##
- * @subpackage filter
- * @author     Your name here
- * @version    SVN: $Id: ProductI18nFormFilter.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
- */
-class ProductI18nFormFilter extends BaseProductI18nFormFilter
-{
-  public function configure()
-  {
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/ArticleForm.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/ArticleForm.class.php
deleted file mode 100644
index f2900804b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/ArticleForm.class.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * Article form.
- *
- * @package    form
- * @subpackage article
- * @version    SVN: $Id: ArticleForm.class.php 14010 2008-12-13 14:27:57Z Kris.Wallsmith $
- */
-class ArticleForm extends BaseArticleForm
-{
-  public function configure()
-  {
-    if ($category = $this->getObject()->getCategory())
-    {
-      $this->embedForm('category', new CategoryForm($this->getObject()->getCategory()));
-    }
-
-    if ($this->getOption('with_attachment'))
-    {
-      $attachment = new Attachment();
-      $attachment->setArticle($this->object);
-
-      $attachmentForm = new AttachmentForm($attachment);
-      unset($attachmentForm['article_id']);
-
-      $this->embedForm('attachment', $attachmentForm);
-    }
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/AttachmentForm.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/AttachmentForm.class.php
deleted file mode 100644
index d58eb0ede..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/AttachmentForm.class.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/**
- * Attachment form.
- *
- * @package    form
- * @subpackage attachment
- * @version    SVN: $Id: AttachmentForm.class.php 24068 2009-11-17 06:39:35Z Kris.Wallsmith $
- */
-class AttachmentForm extends BaseAttachmentForm
-{
-  public function configure()
-  {
-    $this->widgetSchema['file'] = new sfWidgetFormInputFile();
-    $this->validatorSchema['file'] = new sfValidatorFile(array(
-      'path' => sfConfig::get('sf_cache_dir'),
-      'mime_type_guessers' => array(),
-    ));
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/AuthorForm.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/AuthorForm.class.php
deleted file mode 100644
index c8f5a916b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/AuthorForm.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * Author form.
- *
- * @package    form
- * @subpackage author
- * @version    SVN: $Id: AuthorForm.class.php 6884 2008-01-02 10:32:24Z dwhittle $
- */
-class AuthorForm extends BaseAuthorForm
-{
-  public function configure()
-  {
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/BaseForm.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/BaseForm.class.php
deleted file mode 100644
index 9aa6b04f0..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/BaseForm.class.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-/**
- * Base project form.
- * 
- * @package    ##PROJECT_NAME##
- * @subpackage form
- * @author     Your name here
- * @version    SVN: $Id: BaseForm.class.php 18331 2009-05-16 11:13:47Z Kris.Wallsmith $
- */
-class BaseForm extends sfFormSymfony
-{
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/BaseFormPropel.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/BaseFormPropel.class.php
deleted file mode 100644
index 3e59578e9..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/BaseFormPropel.class.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-/**
- * Project form base class.
- *
- * @package    form
- * @version    SVN: $Id: BaseFormPropel.class.php 6884 2008-01-02 10:32:24Z dwhittle $
- */
-abstract class BaseFormPropel extends sfFormPropel
-{
-  public function setup()
-  {
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/BookForm.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/BookForm.class.php
deleted file mode 100644
index aabc25048..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/BookForm.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * Book form.
- *
- * @package    form
- * @subpackage book
- * @version    SVN: $Id: BookForm.class.php 6884 2008-01-02 10:32:24Z dwhittle $
- */
-class BookForm extends BaseBookForm
-{
-  public function configure()
-  {
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/CategoryForm.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/CategoryForm.class.php
deleted file mode 100644
index d76e957a2..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/CategoryForm.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * Category form.
- *
- * @package    form
- * @subpackage category
- * @version    SVN: $Id: CategoryForm.class.php 6884 2008-01-02 10:32:24Z dwhittle $
- */
-class CategoryForm extends BaseCategoryForm
-{
-  public function configure()
-  {
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/MovieForm.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/MovieForm.class.php
deleted file mode 100644
index eabce4c92..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/MovieForm.class.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * Movie form.
- *
- * @package    form
- * @subpackage movie
- * @version    SVN: $Id: MovieForm.class.php 12854 2008-11-09 20:08:32Z fabien $
- */
-class MovieForm extends BaseMovieForm
-{
-  public function configure()
-  {
-    $this->embedI18n(array('en', 'fr'));
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/MovieI18nForm.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/MovieI18nForm.class.php
deleted file mode 100644
index 98c922153..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/MovieI18nForm.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * MovieI18n form.
- *
- * @package    form
- * @subpackage movie_i18n
- * @version    SVN: $Id: MovieI18nForm.class.php 8424 2008-04-11 18:23:01Z dwhittle $
- */
-class MovieI18nForm extends BaseMovieI18nForm
-{
-  public function configure()
-  {
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/ProductForm.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/ProductForm.class.php
deleted file mode 100644
index e5647b66e..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/ProductForm.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * Product form.
- *
- * @package    form
- * @subpackage product
- * @version    SVN: $Id: ProductForm.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
- */
-class ProductForm extends BaseProductForm
-{
-  public function configure()
-  {
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/ProductI18nForm.class.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/ProductI18nForm.class.php
deleted file mode 100644
index ddbacb7fd..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/form/ProductI18nForm.class.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * ProductI18n form.
- *
- * @package    form
- * @subpackage product_i18n
- * @version    SVN: $Id: ProductI18nForm.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
- */
-class ProductI18nForm extends BaseProductI18nForm
-{
-  public function configure()
-  {
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Article.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Article.php
deleted file mode 100644
index cea1b98b6..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Article.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * Subclass for representing a row from the 'article' table.
- *
- * 
- *
- * @package lib.model
- */ 
-class Article extends BaseArticle
-{
-	/**
-	 * Initializes internal state of Article object.
-	 * @see        parent::__construct()
-	 */
-	public function __construct()
-	{
-		// Make sure that parent constructor is always invoked, since that
-		// is where any default values for this object are set.
-		parent::__construct();
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/ArticlePeer.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/ArticlePeer.php
deleted file mode 100644
index 8899d3b73..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/ArticlePeer.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * Subclass for performing query and update operations on the 'article' table.
- *
- * 
- *
- * @package lib.model
- */ 
-class ArticlePeer extends BaseArticlePeer
-{
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Attachment.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Attachment.php
deleted file mode 100644
index 040b3495d..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Attachment.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/**
- * Subclass for representing a row from the 'attachment' table.
- *
- * 
- *
- * @package lib.model
- */ 
-class Attachment extends BaseAttachment
-{
-  public function generateFileFilename($file)
-  {
-    return 'uploaded'.$file->getExtension($file->getOriginalExtension());
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/AttachmentPeer.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/AttachmentPeer.php
deleted file mode 100644
index 505f0b254..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/AttachmentPeer.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * Subclass for performing query and update operations on the 'attachment' table.
- *
- * 
- *
- * @package lib.model
- */ 
-class AttachmentPeer extends BaseAttachmentPeer
-{
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Author.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Author.php
deleted file mode 100644
index c6bb79c74..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Author.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Subclass for representing a row from the 'author' table.
- *
- *
- *
- * @package lib.model
- */
-class Author extends BaseAuthor
-{
-	/**
-	 * Initializes internal state of Author object.
-	 * @see        parent::__construct()
-	 */
-	public function __construct()
-	{
-		// Make sure that parent constructor is always invoked, since that
-		// is where any default values for this object are set.
-		parent::__construct();
-	}
-
-	public function __toString()
-  {
-    return $this->getName();
-  }
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/AuthorArticle.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/AuthorArticle.php
deleted file mode 100644
index 0382a8b63..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/AuthorArticle.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * Subclass for representing a row from the 'author_article' table.
- *
- * 
- *
- * @package lib.model
- */ 
-class AuthorArticle extends BaseAuthorArticle
-{
-	/**
-	 * Initializes internal state of AuthorArticle object.
-	 * @see        parent::__construct()
-	 */
-	public function __construct()
-	{
-		// Make sure that parent constructor is always invoked, since that
-		// is where any default values for this object are set.
-		parent::__construct();
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/AuthorArticlePeer.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/AuthorArticlePeer.php
deleted file mode 100644
index 195aa0dcc..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/AuthorArticlePeer.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * Subclass for performing query and update operations on the 'author_article' table.
- *
- * 
- *
- * @package lib.model
- */ 
-class AuthorArticlePeer extends BaseAuthorArticlePeer
-{
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/AuthorPeer.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/AuthorPeer.php
deleted file mode 100644
index 27a9553cb..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/AuthorPeer.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * Subclass for performing query and update operations on the 'author' table.
- *
- * 
- *
- * @package lib.model
- */ 
-class AuthorPeer extends BaseAuthorPeer
-{
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Book.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Book.php
deleted file mode 100644
index d393ec96b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Book.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Subclass for representing a row from the 'book' table.
- *
- *
- *
- * @package lib.model
- */
-class Book extends BaseBook
-{
-	/**
-	 * Initializes internal state of Book object.
-	 * @see        parent::__construct()
-	 */
-	public function __construct()
-	{
-		// Make sure that parent constructor is always invoked, since that
-		// is where any default values for this object are set.
-		parent::__construct();
-	}
-
-  public function __toString()
-  {
-    return $this->getName();
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/BookPeer.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/BookPeer.php
deleted file mode 100644
index 3857e5529..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/BookPeer.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * Subclass for performing query and update operations on the 'book' table.
- *
- * 
- *
- * @package lib.model
- */ 
-class BookPeer extends BaseBookPeer
-{
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Category.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Category.php
deleted file mode 100644
index d0ce250d7..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Category.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Subclass for representing a row from the 'category' table.
- *
- *
- *
- * @package lib.model
- */
-class Category extends BaseCategory
-{
-	/**
-	 * Initializes internal state of Category object.
-	 * @see        parent::__construct()
-	 */
-	public function __construct()
-	{
-		// Make sure that parent constructor is always invoked, since that
-		// is where any default values for this object are set.
-		parent::__construct();
-	}
-
-  public function __toString()
-  {
-    return $this->getName();
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/CategoryPeer.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/CategoryPeer.php
deleted file mode 100644
index bdfcef45b..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/CategoryPeer.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * Subclass for performing query and update operations on the 'category' table.
- *
- * 
- *
- * @package lib.model
- */ 
-class CategoryPeer extends BaseCategoryPeer
-{
-  static public function getByName($name)
-  {
-    $c = new Criteria();
-    $c->add(self::NAME, $name);
-
-    return self::doSelectOne($c);
-  }
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Movie.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Movie.php
deleted file mode 100644
index 58cfaf9e3..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Movie.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * Subclass for representing a row from the 'movie' table.
- *
- * 
- *
- * @package lib.model
- */ 
-class Movie extends BaseMovie
-{
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/MovieI18n.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/MovieI18n.php
deleted file mode 100644
index 3732140ce..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/MovieI18n.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * Subclass for representing a row from the 'movie_i18n' table.
- *
- * 
- *
- * @package lib.model
- */ 
-class MovieI18n extends BaseMovieI18n
-{
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/MovieI18nPeer.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/MovieI18nPeer.php
deleted file mode 100644
index 49eba4e44..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/MovieI18nPeer.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * Subclass for performing query and update operations on the 'movie_i18n' table.
- *
- * 
- *
- * @package lib.model
- */ 
-class MovieI18nPeer extends BaseMovieI18nPeer
-{
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/MoviePeer.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/MoviePeer.php
deleted file mode 100644
index cef96d935..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/MoviePeer.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-/**
- * Subclass for performing query and update operations on the 'movie' table.
- *
- * 
- *
- * @package lib.model
- */ 
-class MoviePeer extends BaseMoviePeer
-{
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Product.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Product.php
deleted file mode 100644
index e15bbc127..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/Product.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * Subclass for representing a row from the 'product' table.
- *
- * 
- *
- * @package    lib.model
- * @subpackage model
- */
-class Product extends BaseProduct
-{
-	/**
-	 * Initializes internal state of Product object.
-	 * @see        parent::__construct()
-	 */
-	public function __construct()
-	{
-		// Make sure that parent constructor is always invoked, since that
-		// is where any default values for this object are set.
-		parent::__construct();
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/ProductI18n.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/ProductI18n.php
deleted file mode 100644
index 95d711034..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/ProductI18n.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * Subclass for representing a row from the 'product_i18n' table.
- *
- * 
- *
- * @package    lib.model
- * @subpackage model
- */
-class ProductI18n extends BaseProductI18n
-{
-	/**
-	 * Initializes internal state of ProductI18n object.
-	 * @see        parent::__construct()
-	 */
-	public function __construct()
-	{
-		// Make sure that parent constructor is always invoked, since that
-		// is where any default values for this object are set.
-		parent::__construct();
-	}
-
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/ProductI18nPeer.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/ProductI18nPeer.php
deleted file mode 100644
index e6bc45763..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/ProductI18nPeer.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-/**
- * Subclass for performing query and update operations on the 'product_i18n' table.
- *
- * 
- *
- * @package    lib.model
- * @subpackage model
- */
-class ProductI18nPeer extends BaseProductI18nPeer
-{
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/ProductPeer.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/ProductPeer.php
deleted file mode 100644
index 0a924689c..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/lib/model/ProductPeer.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-/**
- * Subclass for performing query and update operations on the 'product' table.
- *
- * 
- *
- * @package    lib.model
- * @subpackage model
- */
-class ProductPeer extends BaseProductPeer
-{
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/symfony b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/symfony
deleted file mode 100755
index 3ea1419a8..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/fixtures/symfony
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-chdir(dirname(__FILE__));
-require_once(dirname(__FILE__).'/config/ProjectConfiguration.class.php');
-$configuration = new ProjectConfiguration();
-include($configuration->getSymfonyLibDir().'/command/cli.php');
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/formTest.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/formTest.php
deleted file mode 100644
index dc7323c2e..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/formTest.php
+++ /dev/null
@@ -1,280 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-$app = 'frontend';
-$fixtures = 'fixtures/fixtures.yml';
-if (!include(dirname(__FILE__).'/../bootstrap/functional.php'))
-{
-  return;
-}
-
-$b = new sfTestBrowser();
-
-// file upload
-$fileToUpload = dirname(__FILE__).'/fixtures/config/databases.yml';
-$uploadedFile = sfConfig::get('sf_cache_dir').'/uploaded.yml';
-$name = 'test';
-$b->
-  get('/attachment/index')->
-  with('request')->begin()->
-    isParameter('module', 'attachment')->
-    isParameter('action', 'index')->
-  end()->
-  with('response')->isStatusCode(200)->
-  click('submit', array('attachment' => array('name' => $name, 'file' => $fileToUpload)))->
-  with('response')->begin()->
-    isRedirected()->
-    followRedirect()->
-  end()->
-  with('response')->begin()->
-    matches('/ok/')->
-  end()
-;
-
-$b->test()->ok(file_exists($uploadedFile), 'file is uploaded');
-$b->test()->is(file_get_contents($uploadedFile), file_get_contents($fileToUpload), 'file is correctly uploaded');
-
-$c = new Criteria();
-$c->add(AttachmentPeer::NAME, $name);
-$attachments = AttachmentPeer::doSelect($c);
-
-$b->test()->is(count($attachments), 1, 'the attachment has been saved in the database');
-$b->test()->is($attachments[0]->getFile(), 'uploaded.yml', 'the attachment filename has been saved in the database');
-
-@unlink($uploadedFile);
-AttachmentPeer::doDeleteAll();
-$b->test()->ok(!file_exists($uploadedFile), 'uploaded file is deleted');
-
-// file upload in embedded form
-$b->
-  getAndCheck('attachment', 'embedded')->
-  with('response')->begin()->
-    checkElement('input[name="article[attachment][article_id]"]', false)->
-    checkElement('input[type="file"][name="article[attachment][file]"]')->
-  end()->
-
-  setField('article[title]', 'Test Article')->
-  setField('article[attachment][name]', $name)->
-  setField('article[attachment][file]', $fileToUpload)->
-  click('submit')->
-
-  with('form')->hasErrors(false)->
-
-  with('response')->begin()->
-    isRedirected()->
-    followRedirect()->
-  end()->
-  with('response')->begin()->
-    matches('/ok/')->
-  end()
-;
-
-$b->test()->ok(file_exists($uploadedFile), 'file is uploaded');
-$b->test()->is(file_get_contents($uploadedFile), file_get_contents($fileToUpload), 'file is correctly uploaded');
-
-$c = new Criteria();
-$c->add(AttachmentPeer::NAME, $name);
-$attachments = AttachmentPeer::doSelect($c);
-
-$b->test()->is(count($attachments), 1, 'the attachment has been saved in the database');
-$b->test()->ok($attachments[0]->getArticleId(), 'the attachment is tied to an article');
-$b->test()->is($attachments[0]->getFile(), 'uploaded.yml', 'the attachment filename has been saved in the database');
-
-// sfValidatorPropelUnique
-
-// create a category with a unique name
-$b->
-  get('/unique/category')->
-  with('request')->begin()->
-    isParameter('module', 'unique')->
-    isParameter('action', 'category')->
-  end()->
-  with('response')->isStatusCode(200)->
-  click('submit', array('category' => array('name' => 'foo')))->
-  with('response')->begin()->
-    isRedirected()->
-    followRedirect()->
-  end()->
-  with('response')->begin()->
-    matches('/ok/')->
-  end()
-;
-
-// create another category with the same name
-// we must have an error
-$b->
-  get('/unique/category')->
-  with('request')->begin()->
-    isParameter('module', 'unique')->
-    isParameter('action', 'category')->
-  end()->
-  with('response')->isStatusCode(200)->
-  click('submit', array('category' => array('name' => 'foo')))->
-  with('form')->begin()->
-    hasErrors(1)->
-    hasGlobalError(false)->
-    isError('name', 'invalid')->
-  end()->
-  with('response')->begin()->
-    checkElement('td[colspan="2"] .error_list li', 0)->
-    checkElement('.error_list li', 'An object with the same "name" already exist.')->
-    checkElement('.error_list li', 1)->
-  end()
-;
-
-// same thing but with a global error
-$b->
-  get('/unique/category')->
-  with('request')->begin()->
-    isParameter('module', 'unique')->
-    isParameter('action', 'category')->
-  end()->
-  with('response')->isStatusCode(200)->
-  click('submit', array('category' => array('name' => 'foo'), 'global' => 1))->
-  with('form')->begin()->
-    hasErrors(1)->
-    hasGlobalError('invalid')->
-    isError('name', false)->
-  end()->
-  with('response')->begin()->
-    checkElement('td[colspan="2"] .error_list li', 'An object with the same "name" already exist.')->
-    checkElement('td[colspan="2"] .error_list li', 1)->
-  end()
-;
-
-// updating the same category again with the same name is allowed
-$b->
-  get('/unique/category?category[id]='.CategoryPeer::getByName('foo')->getId())->
-  with('request')->begin()->
-    isParameter('module', 'unique')->
-    isParameter('action', 'category')->
-  end()->
-  with('response')->isStatusCode(200)->
-  click('submit')->
-  with('response')->begin()->
-    isRedirected()->
-    followRedirect()->
-  end()->
-  with('response')->begin()->
-    matches('/ok/')->
-  end()
-;
-
-// create an article with a unique title-category_id
-$b->
-  get('/unique/article')->
-  with('request')->begin()->
-    isParameter('module', 'unique')->
-    isParameter('action', 'article')->
-  end()->
-  with('response')->isStatusCode(200)->
-  click('submit', array('article' => array('title' => 'foo', 'category_id' => 1)))->
-  with('response')->begin()->
-    isRedirected()->
-    followRedirect()->
-  end()->
-  with('response')->begin()->
-    matches('/ok/')->
-  end()
-;
-
-// create another article with the same title but a different category_id
-$b->
-  get('/unique/article')->
-  with('request')->begin()->
-    isParameter('module', 'unique')->
-    isParameter('action', 'article')->
-  end()->
-  with('response')->isStatusCode(200)->
-  click('submit', array('article' => array('title' => 'foo', 'category_id' => 2)))->
-  with('response')->begin()->
-    isRedirected()->
-    followRedirect()->
-  end()->
-  with('response')->begin()->
-    matches('/ok/')->
-  end()
-;
-
-// create another article with the same title and category_id as the first one
-// we must have an error
-$b->
-  get('/unique/article')->
-  with('request')->begin()->
-    isParameter('module', 'unique')->
-    isParameter('action', 'article')->
-  end()->
-  with('response')->isStatusCode(200)->
-  click('submit', array('article' => array('title' => 'foo', 'category_id' => 1)))->
-  with('response')->checkElement('.error_list li', 'An object with the same "title, category_id" already exist.')
-;
-
-// update the category from the article form
-$b->
-  get('/unique/edit')->
-  with('request')->begin()->
-    isParameter('module', 'unique')->
-    isParameter('action', 'edit')->
-  end()->
-  with('response')->begin()->
-    isStatusCode(200)->
-    checkElement('input[value="foo title"]')->
-    checkElement('#article_category_id option[selected="selected"]', 1)->
-    checkElement('input[value="Category 1"]')->
-  end()->
-  click('submit', array('article' => array('title' => 'foo bar', 'category' => array('name' => 'Category foo'))))->
-  with('response')->begin()->
-    isRedirected()->
-    followRedirect()->
-  end()->
-  with('response')->begin()->
-    checkElement('input[value="foo bar"]')->
-    checkElement('#article_category_id option[selected="selected"]', 1)->
-    checkElement('input[value="Category foo"]')->
-  end()
-;
-
-// sfValidatorPropelChoice
-
-// submit a form with an impossible choice validator
-$b->
-  get('/choice/article')->
-  with('request')->begin()->
-    isParameter('module', 'choice')->
-    isParameter('action', 'article')->
-  end()->
-  with('response')->begin()->
-    isStatusCode(200)->
-  end()->
-  click('submit', array('article' => array('title' => 'foobar', 'category_id' => 1, 'author_article_list' => array(1)), 'impossible_validator' => 1))->
-  with('form')->begin()->
-    hasErrors(1)->
-    isError('category_id', 'invalid')->
-  end()
-;
-
-// sfValidatorPropelChoice (multiple == true)
-
-// submit a form with an impossible choice validator
-$b->
-  get('/choice/article')->
-  with('request')->begin()->
-    isParameter('module', 'choice')->
-    isParameter('action', 'article')->
-  end()->
-  with('response')->begin()->
-    isStatusCode(200)->
-  end()->
-  click('submit', array('article' => array('title' => 'foobar', 'category_id' => 1, 'author_article_list' => array(1)), 'impossible_validator_many' => 1))->
-  with('form')->begin()->
-    hasErrors(1)->
-    isError('author_article_list', 'invalid')->
-  end()
-;
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/i18nTest.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/i18nTest.php
deleted file mode 100644
index 64ff6a7d2..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/i18nTest.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-$app = 'frontend';
-$fixtures = 'fixtures/fixtures.yml';
-if (!include(dirname(__FILE__).'/../bootstrap/functional.php'))
-{
-  return;
-}
-
-$b = new sfTestBrowser(new sfBrowser());
-$b->setTester('propel', 'sfTesterPropel');
-
-// en
-$b->
-  get('/i18n/default')->
-  with('request')->begin()->
-    isParameter('module', 'i18n')->
-    isParameter('action', 'default')->
-  end()->
-  with('response')->begin()->
-    isStatusCode(200)->
-    checkElement('#movies .toString:first', '')->
-    checkElement('#movies .default:first', '')->
-    checkElement('#movies .it:first', 'La Vita è bella')->
-    checkElement('#movies .fr:first', 'La Vie est belle')->
-  end()
-;
-
-// fr
-$b->
-  get('/i18n/index')->
-  with('request')->begin()->
-    isParameter('module', 'i18n')->
-    isParameter('action', 'index')->
-  end()->
-  with('response')->begin()->
-    isStatusCode(200)->
-    checkElement('#movies .toString:first', 'La Vie est belle')->
-    checkElement('#movies .default:first', 'La Vie est belle')->
-    checkElement('#movies .it:first', 'La Vita è bella')->
-    checkElement('#movies .fr:first', 'La Vie est belle')->
-  end()
-;
-
-// still fr
-$b->
-  get('/i18n/default')->
-  with('request')->begin()->
-    isParameter('module', 'i18n')->
-    isParameter('action', 'default')->
-  end()->
-  with('response')->begin()->
-    isStatusCode(200)->
-    checkElement('#movies .toString:first', 'La Vie est belle')->
-    checkElement('#movies .default:first', 'La Vie est belle')->
-    checkElement('#movies .it:first', 'La Vita è bella')->
-    checkElement('#movies .fr:first', 'La Vie est belle')->
-  end()
-;
-
-// i18n forms
-$b->
-  get('/i18n/movie')->
-  with('request')->begin()->
-    isParameter('module', 'i18n')->
-    isParameter('action', 'movie')->
-  end()->
-  with('response')->begin()->
-    isStatusCode(200)->
-    checkElement('#movie_fr_id', false)->
-    checkElement('#movie_fr_culture', false)->
-  end()->
-  
-  click('submit', array('movie' => array('director' => 'Robert Aldrich', 'en' => array('title' => 'The Dirty Dozen'), 'fr' => array('title' => 'Les Douze Salopards'))))->
-  with('response')->begin()->
-    isRedirected()->
-    followRedirect()->
-  end()->
-  with('response')->begin()->
-    checkElement('input[value="Robert Aldrich"]')->
-    checkElement('input[value="The Dirty Dozen"]')->
-    checkElement('input[value="Les Douze Salopards"]')->
-    checkElement('#movie_fr_id', true)->
-    checkElement('#movie_fr_culture', true)->
-  end()->
-
-  with('propel')->begin()->
-    check('Movie', array(), 2)->
-    check('Movie', array('director' => 'Robert Aldrich', 'id' => 2))->
-    check('MovieI18N', array(), 4)->
-    check('MovieI18N', array('id' => 2), 2)->
-    check('MovieI18N', array('culture' => 'fr', 'id' => 2, 'title' => 'Les Douze Salopards'))->
-    check('MovieI18N', array('culture' => 'en', 'id' => 2, 'title' => 'The Dirty Dozen'))->
-  end()->
-
-  click('submit', array('movie' => array('director' => 'Robert Aldrich (1)', 'en' => array('title' => 'The Dirty Dozen (1)'), 'fr' => array('title' => 'Les Douze Salopards (1)'))))->
-  with('response')->begin()->
-    isRedirected()->
-    followRedirect()->
-  end()->
-  with('response')->begin()->
-    checkElement('input[value="Robert Aldrich (1)"]')->
-    checkElement('input[value="The Dirty Dozen (1)"]')->
-    checkElement('input[value="Les Douze Salopards (1)"]')->
-  end()->
-
-  with('propel')->begin()->
-    check('Movie', array(), 2)->
-    check('Movie', array('director' => 'Robert Aldrich (1)', 'id' => 2))->
-    check('MovieI18N', array(), 4)->
-    check('MovieI18N', array('id' => 2), 2)->
-    check('MovieI18N', array('culture' => 'fr', 'id' => 2, 'title' => 'Les Douze Salopards (1)'))->
-    check('MovieI18N', array('culture' => 'en', 'id' => 2, 'title' => 'The Dirty Dozen (1)'))->
-  end()->
-
-  // Bug #7486
-  click('submit')->
-  
-  with('form')->begin()->
-    hasErrors(false)->
-  end()->
-
-  get('/i18n/movie')->
-  click('submit', array('movie' => array('director' => 'Robert Aldrich', 'en' => array('title' => 'The Dirty Dozen (1)'), 'fr' => array('title' => 'Les Douze Salopards (1)'))))->
-
-  with('form')->begin()->
-    hasErrors(2)->
-  end()->
-
-  click('submit', array('movie' => array('director' => 'Robert Aldrich', 'en' => array('title' => 'The Dirty Dozen'), 'fr' => array('title' => 'Les Douze Salopards'))))->
-
-  with('form')->begin()->
-    hasErrors(false)->
-  end()->
-  with('response')->begin()->
-    isRedirected()->
-    followRedirect()->
-  end()->
-  with('response')->begin()->
-    checkElement('input[value="Robert Aldrich"]')->
-    checkElement('input[value="The Dirty Dozen"]')->
-    checkElement('input[value="Les Douze Salopards"]')->
-  end()
-  // END: Bug #7486
-;
-
-$b->getAndCheck('i18n', 'products')
-  ->with('response')->begin()
-    ->checkElement('ul#products li.toString', 'PRIMARY STRING')
-  ->end()
-;
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/pagerTest.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/pagerTest.php
deleted file mode 100644
index 2482af1a0..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/pagerTest.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-$app = 'frontend';
-$fixtures = 'fixtures/fixtures.yml';
-if (!include(dirname(__FILE__).'/../bootstrap/functional.php'))
-{
-  return;
-}
-
-$browser = new sfTestFunctional(new sfBrowser());
-
-ArticlePeer::doDeleteAll();
-$category = CategoryPeer::doSelectOne(new Criteria());
-
-foreach (range(1, 20) as $n)
-{
-  $article = new Article();
-  $article->setTitle(sprintf('Article #%s', $n));
-  $article->setCategory($category);
-  $article->save();
-}
-
-$browser
-  ->getAndCheck('pager', 'interfaces')
-
-  ->with('response')->begin()
-    ->checkElement('#pagerResults li', 10)
-    
-    ->checkElement('#pagerCount:contains(20)')
-  ->end()
-;
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/poolingTest.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/poolingTest.php
deleted file mode 100644
index 3b93cbb26..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/functional/poolingTest.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-$app = 'frontend';
-$fixtures = 'fixtures/fixtures.yml';
-if (!include(dirname(__FILE__).'/../bootstrap/functional.php'))
-{
-  return;
-}
-
-$b = new sfTestFunctional(new sfBrowser(), null, array('propel' => 'sfTesterPropel'));
-
-ArticlePeer::doDeleteAll();
-$c = CategoryPeer::doSelectOne(new Criteria());
-$hash = spl_object_hash($c);
-
-$b->
-  get('/pooling/addArticleButDontSave/category_id/'.$c->getId())->
-  with('propel')->check('Article', null, 0)->
-
-  get('/pooling/addArticleAndSave/category_id/'.$c->getId())->
-  with('propel')->check('Article', null, 1)
-;
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/database/sfPropelDatabaseTest.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/database/sfPropelDatabaseTest.php
deleted file mode 100644
index 0adf192d5..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/database/sfPropelDatabaseTest.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-$t = new lime_test(1);
-
-class ProjectConfiguration extends sfProjectConfiguration
-{
-  protected $plugins = array('sfPropelPlugin');
-}
-new ProjectConfiguration();
-
-// ->__construct()
-$t->diag('->__construct()');
-
-$configuration = array(
-  'propel' => array(
-    'datasources' => array(
-      'propel' => array(
-        'adapter' => 'mysql',
-        'connection' => array(
-          'dsn' => 'mysql:dbname=testdb;host=localhost',
-          'user' => 'foo',
-          'password' => 'bar',
-          'classname' => 'PropelPDO',
-          'options' => array(
-            'ATTR_PERSISTENT' => true,
-            'ATTR_AUTOCOMMIT' => false,
-          ),
-          'settings' => array(
-            'charset' => array('value' => 'utf8'),
-            'queries' => array(),
-          ),
-        ),
-      ),
-      'default' => 'propel',
-    ),
-  ),
-);
-
-$parametersTests = array(
-  'dsn'        => 'mysql:dbname=testdb;host=localhost',
-  'username'   => 'foo',
-  'password'   => 'bar',
-  'encoding'   => 'utf8',
-  'persistent' => true,
-  'options'    => array('ATTR_AUTOCOMMIT' => false)
-);
-
-$p = new sfPropelDatabase($parametersTests);
-$t->is_deeply($p->getConfiguration(), $configuration, '->__construct() creates a valid propel configuration from parameters');
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/debug/sfWebDebugPanelPropelTest.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/debug/sfWebDebugPanelPropelTest.php
deleted file mode 100644
index afe113973..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/debug/sfWebDebugPanelPropelTest.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-$t = new lime_test(5);
-
-class sfWebDebugPanelPropelTest extends sfWebDebugPanelPropel
-{
-  protected function getPropelConfiguration()
-  {
-    $config = new PropelConfiguration(array());
-    $config->setParameter('debugpdo.logging.details.slow.enabled', true);
-    $config->setParameter('debugpdo.logging.details.slow.threshold', 1);
-    return $config;
-  }
-}
-
-class sfWebDebugPanelPropelTestDifferentGlue extends sfWebDebugPanelPropel
-{
-  protected function getPropelConfiguration()
-  {
-    $config = new PropelConfiguration(array());
-    $config->setParameter('debugpdo.logging.outerglue', 'xx');
-    $config->setParameter('debugpdo.logging.innerglue', '/ ');
-    $config->setParameter('debugpdo.logging.details.slow.enabled', true);
-    $config->setParameter('debugpdo.logging.details.slow.threshold', 5);
-    return $config;
-  }
-}
-
-// ->getPanelContent()
-$t->diag('->getPanelContent()');
-
-$dispatcher = new sfEventDispatcher();
-$logger = new sfVarLogger($dispatcher);
-$logger->log('{sfPropelLogger} SELECT * FROM foo WHERE bar<1');
-$logger->log('{sfPropelLogger} time: 3.42 sec | mem: 2.8 MB | SELECT * FROM foo WHERE aText like \' | foo\'');
-$panel = new sfWebDebugPanelPropelTest(new sfWebDebug($dispatcher, $logger));
-$content = $panel->getPanelContent();
-$t->like($content, '/bar&lt;1/', '->getPanelContent() returns escaped queries');
-$t->like($content, '/aText like &#039; | foo&#039;/', '->getPanelContent() works with glue string in SQL');
-$t->like($content, '/sfWebDebugWarning/', '->getPanelContent() contains a slow query warning');
-
-$logger = new sfVarLogger($dispatcher);
-$logger->log('{sfPropelLogger} time/ 3.42 secxxmem/ 2.8 MBxxSELECT * FROM foo WHERE bar == 42');
-$panel = new sfWebDebugPanelPropelTestDifferentGlue(new sfWebDebug($dispatcher, $logger));
-$content = $panel->getPanelContent();
-$t->like($content, '/time\/ 3.42 sec, mem\/ 2.8 MB/', '->getPanelContent() works with strange glue strings');
-$t->unlike($content, '/sfWebDebugWarning/', '->getPanelContent() should not contain a slow warning');
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/fixtures/new_schema.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/fixtures/new_schema.yml
deleted file mode 100644
index 44e2121b1..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/fixtures/new_schema.yml
+++ /dev/null
@@ -1,113 +0,0 @@
-connection:           propel
-defaultIdMethod:      none
-package:              lib.model
-propel_behaviors:
-  timestampable:
-    boolean:       true
-    create_column: create_date
-
-classes:
-  Group:
-    tableName:        ab_group
-    package:          foo.bar.lib.model
-    columns:
-      id:
-      name:           varchar(50)
-      type:           varchar(50)
-    inheritance:
-      column:         type
-      classes:
-        tight:        Group_Tight
-        loose:        { phpName: Group_Loose, package: some.other.package }
-
-  User:
-    tableName:        cd_user
-    isI18N:           true
-    i18nTable:        cd_user_i18n
-    columns:
-      first_name:     { type: varchar, size: 255, default: "Anonymous" }
-      last_name:      varchar(50)
-      age:            { type: integer, required: true, index: true }
-      ab_group_id:
-      created_at:
-
-  CdUserI18n:
-    tableName:        cd_user_i18n
-    columns:
-      description:    longvarchar
-
-  EfArticle:
-    tableName:       ef_article
-    columns:
-      title:          { type: longvarchar, required: true, index: unique }
-      stripped_title: { type: longvarchar, required: true, primaryKey: true, sequence: my_custom_sequence_name }
-      user_id:
-      my_group:       { type: integer, foreignTable: ab_group, foreignReference: id, onDelete: setnull }
-      my_other_group: { type: integer, foreignTable: ab_group, foreignReference: id, onDelete: setnull, phpName: MyOtherGroupPhpName, fkPhpName: MyOtherGroupFkPhpName, fkRefPhpName: MyOtherGroupFkRefPhpName }
-      created_at:     timestamp
-      updated_at:
-
-  Article:
-    tableName:        ij_article
-    columns:
-      title:          varchar(50)
-      user_id:        { type: integer }
-      created_at:
-    foreignKeys:
-      -
-        foreignTable: cd_user
-        onDelete:     cascade
-        phpName:      SomePhpName
-        refPhpName:   SomeRefPhpName
-        references:
-          - { local: user_id, foreign: id }
-    indexes:
-      my_index:       [title(10), user_id]
-    uniques:
-      my_other_index: [created_at(10)]
-    behaviors:
-      paranoid: { column: deleted_at }
-      act_as_nested_set:
-    propel_behaviors:
-      paranoid: { column: deleted_at }
-      act_as_nested_set:
-
-  KlArticle:
-    tableName:        kl_article
-    columns:
-      title:          varchar(50)
-      user_id:        { type: integer, phpName: AuthorId }
-    foreignKeys:
-      -
-        foreignClass: User
-        phpName: Author
-        references:
-          -  { local: user_id, foreign: id }
-
-  AbGroupI18n:
-    tableName:        ab_group_i18n
-    columns:
-      motto:          longvarchar
-
-  History:
-    tableName:      history
-    columns:
-      id:
-      type:         { type: varchar(64) }
-    inheritance:
-      column:       type
-      classes:
-        new_user:   History_NewUser
-        new_page:   History_NewPage
-
-  myNestedSetNode:
-    tableName: my_nested_sets
-    columns:
-      id:
-      lft: { type: integer, required: true }
-      rgt: { type: integer, required: true }
-      scope: { type: integer, required: true }
-    nestedSet:
-      left: lft
-      right: rgt
-      scope: scope
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/fixtures/schema.xml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/fixtures/schema.xml
deleted file mode 100644
index edcb50825..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/fixtures/schema.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<database name="propel" defaultIdMethod="none" package="lib.model">
-
-  <behavior name="timestampable">
-    <parameter name="boolean" value="true"/>
-    <parameter name="create_column" value="create_date"/>
-  </behavior>
-
-  <table name="ab_group" phpName="Group" package="foo.bar.lib.model" isI18N="true" i18nTable="ab_group_i18n">
-    <column name="id" type="integer" required="true" primaryKey="true" autoIncrement="true" />
-    <column name="name" type="varchar" size="50" />
-    <column name="type" type="varchar" size="50" inheritance="single">
-      <inheritance extends="foo.bar.lib.model.Group" key="tight" class="Group_Tight" />
-      <inheritance extends="foo.bar.lib.model.Group" key="loose" class="Group_Loose" package="some.other.package" />
-    </column>
-  </table>
-
-  <table name="cd_user" phpName="User" isI18N="true" i18nTable="cd_user_i18n">
-    <column name="first_name" type="varchar" size="255" default="Anonymous" />
-    <column name="last_name" type="varchar" size="50" />
-    <column name="age" type="integer" required="true" />
-    <index>
-      <index-column name="age" />
-    </index>
-    <column name="ab_group_id" type="integer" />
-    <foreign-key foreignTable="ab_group">
-      <reference local="ab_group_id" foreign="id" />
-    </foreign-key>
-    <column name="created_at" type="timestamp" />
-    <column name="id" type="integer" required="true" primaryKey="true" autoIncrement="true" />
-  </table>
-
-  <table name="cd_user_i18n">
-    <column name="description" type="longvarchar" />
-    <column name="id" type="integer" required="true" primaryKey="true" />
-    <foreign-key foreignTable="cd_user" onDelete="cascade">
-      <reference local="id" foreign="id" />
-    </foreign-key>
-    <column name="culture" isCulture="true" type="varchar" size="7" required="true" primaryKey="true" />
-  </table>
-
-  <table name="ef_article">
-    <column name="title" type="longvarchar" required="true" />
-    <unique>
-      <unique-column name="title" />
-    </unique>
-    <column name="stripped_title" type="longvarchar" required="true" primaryKey="true" />
-    <id-method-parameter value="my_custom_sequence_name" />
-    <column name="user_id" type="integer" />
-    <foreign-key foreignTable="cd_user">
-      <reference local="user_id" foreign="id" />
-    </foreign-key>
-    <column name="my_group" type="integer" />
-    <foreign-key foreignTable="ab_group" onDelete="setnull">
-      <reference local="my_group" foreign="id" />
-    </foreign-key>
-    <column name="my_other_group" type="integer" phpName="MyOtherGroupPhpName" />
-    <foreign-key foreignTable="ab_group" onDelete="setnull" phpName="MyOtherGroupFkPhpName" refPhpName="MyOtherGroupFkRefPhpName">
-      <reference local="my_other_group" foreign="id" />
-    </foreign-key>
-    <column name="created_at" type="timestamp" />
-    <column name="updated_at" type="timestamp" />
-  </table>
-
-  <table name="ij_article" phpName="Article" behaviors="a:2:{s:8:&quot;paranoid&quot;;a:1:{s:6:&quot;column&quot;;s:10:&quot;deleted_at&quot;;}s:17:&quot;act_as_nested_set&quot;;N;}">
-    <behavior name="paranoid">
-      <parameter name="column" value="deleted_at" />
-    </behavior>
-    <behavior name="act_as_nested_set" />
-    <column name="title" type="varchar" size="50" />
-    <column name="user_id" type="integer" />
-    <column name="created_at" type="timestamp" />
-    <column name="id" type="integer" required="true" primaryKey="true" autoIncrement="true" />
-    <index name="my_index">
-      <index-column name="title" size="10" />
-      <index-column name="user_id" />
-    </index>
-    <unique name="my_other_index">
-      <unique-column name="created_at" size="10" />
-    </unique>
-    <foreign-key foreignTable="cd_user" onDelete="cascade" phpName="SomePhpName" refPhpName="SomeRefPhpName">
-      <reference local="user_id" foreign="id" />
-    </foreign-key>
-  </table>
-
-  <table name="kl_article">
-    <column name="title" type="varchar" size="50" />
-    <column name="user_id" type="integer" phpName="AuthorId" />
-    <column name="id" type="integer" required="true" primaryKey="true" autoIncrement="true" />
-    <foreign-key phpName="Author" foreignTable="cd_user">
-      <reference local="user_id" foreign="id" />
-    </foreign-key>
-  </table>
-
-  <table name="ab_group_i18n">
-    <column name="motto" type="longvarchar" />
-    <column name="id" type="integer" required="true" primaryKey="true" />
-    <foreign-key foreignTable="ab_group" onDelete="cascade">
-      <reference local="id" foreign="id" />
-    </foreign-key>
-    <column name="culture" isCulture="true" type="varchar" size="7" required="true" primaryKey="true" />
-  </table>
-
-  <table name="history">
-    <column name="id" type="integer" required="true" primaryKey="true" autoIncrement="true" />
-    <column name="type" type="varchar" size="64" inheritance="single">
-      <inheritance extends="lib.model.History" key="new_user" class="History_NewUser" />
-      <inheritance extends="lib.model.History" key="new_page" class="History_NewPage" />
-    </column>
-  </table>
-
-  <table name="my_nested_sets" phpName="myNestedSetNode" treeMode="NestedSet">
-    <column name="id" type="integer" required="true" primaryKey="true" autoIncrement="true" />
-    <column name="lft" type="integer" required="true" nestedSetLeftKey="true" />
-    <column name="rgt" type="integer" required="true" nestedSetRightKey="true" />
-    <column name="scope" type="integer" required="true" treeScopeKey="true" />
-  </table>
-
-</database>
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/fixtures/schema.yml b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/fixtures/schema.yml
deleted file mode 100644
index ee100b669..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/fixtures/schema.yml
+++ /dev/null
@@ -1,95 +0,0 @@
-propel:
-  _attributes:      { defaultIdMethod: none, package: lib.model }
-  _propel_behaviors:
-    timestampable:
-      boolean: true
-      create_column: create_date
-
-  ab_group:
-    _attributes:    { phpName: Group, package: foo.bar.lib.model }
-    id:
-    name:           varchar(50)
-    type:           varchar(50)
-    _inheritance:
-      column:       type
-      classes:
-        tight:      Group_Tight
-        loose:      { phpName: Group_Loose, package: some.other.package }
-
-  cd_user:
-    _attributes:    { phpName: User, isI18N: true, i18nTable: cd_user_i18n }
-    first_name:     { type: varchar, size: 255, default: "Anonymous" }
-    last_name:      varchar(50)
-    age:            { type: integer, required: true, index: true }
-    ab_group_id:
-    created_at:
-
-  cd_user_i18n:
-    description:    longvarchar
-
-  ef_article:
-    title:          { type: longvarchar, required: true, index: unique }
-    stripped_title: { type: longvarchar, required: true, primaryKey: true, sequence: my_custom_sequence_name }
-    user_id:
-    my_group:       { type: integer, foreignTable: ab_group, foreignReference: id, onDelete: setnull }
-    my_other_group: { type: integer, foreignTable: ab_group, foreignReference: id, onDelete: setnull, phpName: MyOtherGroupPhpName, fkPhpName: MyOtherGroupFkPhpName, fkRefPhpName: MyOtherGroupFkRefPhpName }
-    created_at:     timestamp
-    updated_at:
-
-  ij_article:
-    _attributes:    { phpName: Article }
-    title:          varchar(50)
-    user_id:        { type: integer }
-    _foreignKeys:
-      -
-        foreignTable: cd_user
-        onDelete:     cascade
-        phpName:      SomePhpName
-        refPhpName:   SomeRefPhpName
-        references:
-          - { local: user_id, foreign: id }
-    created_at:
-    _indexes:
-      my_index:       [title(10), user_id]
-    _uniques:
-      my_other_index: [created_at(10)]
-    _behaviors:
-      paranoid: { column: deleted_at }
-      act_as_nested_set:
-    _propel_behaviors:
-      paranoid: { column: deleted_at }
-      act_as_nested_set:
-
-  kl_article:
-    title:          varchar(50)
-    user_id:        { type: integer, phpName: AuthorId }
-    _foreignKeys:
-      -
-        foreignClass: User
-        phpName: Author
-        references:
-          - { local: user_id, foreign: id }
-
-  ab_group_i18n:
-    motto:            longvarchar
-
-  history:
-    _attributes:    { phpName: History }
-    id:
-    type:           { type: varchar(64) }
-    _inheritance:
-      column:       type
-      classes:
-        new_user:   History_NewUser
-        new_page:   History_NewPage
-
-  my_nested_sets:
-    _attributes: { phpName: myNestedSetNode }
-    id:
-    lft:    { type: integer, required: true }
-    rgt:    { type: integer, required: true }
-    scope:  { type: integer, required: true }
-    _nestedSet:
-      left:   lft
-      right:  rgt
-      scope:  scope
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/form/sfFormPropelTest.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/form/sfFormPropelTest.php
deleted file mode 100644
index 819a8e216..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/form/sfFormPropelTest.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-$app = 'frontend';
-include dirname(__FILE__).'/../../bootstrap/functional.php';
-include $configuration->getSymfonyLibDir().'/vendor/lime/lime.php';
-
-$t = new lime_test(2);
-
-// ->__construct()
-$t->diag('->__construct()');
-
-class DefaultValuesForm extends AuthorForm
-{
-  public function configure()
-  {
-    $this->setDefault('name', 'John Doe');
-  }
-}
-
-$author = new Author();
-$form = new DefaultValuesForm($author);
-$t->is($form->getDefault('name'), 'John Doe', '->__construct() uses form defaults for new objects');
-
-$author = new Author();
-$author->setName('Jacques Doe');
-$author->save();
-$form = new DefaultValuesForm($author);
-$t->is($form->getDefault('name'), 'Jacques Doe', '->__construct() uses object value as a default for existing objects');
-$author->delete();
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/sfMixerTest.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/sfMixerTest.php
deleted file mode 100644
index f306bbe20..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/sfMixerTest.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/../bootstrap/unit.php');
-
-$t = new lime_test(10);
-
-class myClass
-{
-  public $ret = '';
-  static public $retStatic = '';
-
-  public function myMethod()
-  {
-    $this->ret  = "before myMethod\n";
-    sfMixer::callMixins();
-    $this->ret .= "after myMethod\n";
-
-    return $this->ret;
-  }
-
-  public function myMethodWithSeveralHooks()
-  {
-    $this->ret  = "before myMethodWithSeveralHooks\n";
-    sfMixer::callMixins('before');
-
-    $this->ret .= "myMethodWithSeveralHooks\n";
-    sfMixer::callMixins();
-
-    $this->ret .= "after myMethodWithSeveralHooks\n";
-    sfMixer::callMixins('after');
-
-    return $this->ret;
-  }
-
-  public function myMethodWithArgs($arg1, $arg2 = 'default')
-  {
-    $this->ret  = "before myMethodWithArgs\n";
-    sfMixer::callMixins();
-    $this->ret .= "after myMethodWithArgs\n";
-
-    return $this->ret;
-  }
-
-  static public function myStaticMethod()
-  {
-    self::$retStatic = "before myStaticMethod\n";
-    sfMixer::callMixins();
-    self::$retStatic .= "after myStaticMethod\n";
-
-    return self::$retStatic;
-  }
-
-  static public function myStaticMethodWithArgs($arg1, $arg2 = 'default')
-  {
-    self::$retStatic = "before myStaticMethodWithArgs\n";
-    sfMixer::callMixins();
-    self::$retStatic .= "after myStaticMethodWithArgs\n";
-
-    return self::$retStatic;
-  }
-
-  function __call($method, $arguments)
-  {
-    $r  = "before __call\n";
-    $r .= sfMixer::callMixins();
-    $r .= "after __call\n";
-
-    return $r;
-  }
-}
-
-$m = new myClass();
-
-$t->is($m->myMethod(), "before myMethod\nafter myMethod\n", 'method call without mixins');
-$t->is(myClass::myStaticMethod(), "before myStaticMethod\nafter myStaticMethod\n", 'static method call without mixins');
-
-try
-{
-  $m->newMethod();
-  $t->fail('method call that does not exist');
-}
-catch (Exception $e)
-{
-  $t->pass('method call that does not exist');
-}
-
-class myClassMixins
-{
-  public function myMixinMethod($object)
-  {
-    $object->ret .= "in myMethod mixin method\n";
-  }
-
-  public function myMethodWithSeveralHooks($object)
-  {
-    $object->ret .= "in myMethodWithSeveralHooks mixin method for default hook\n";
-  }
-
-  public function myMethodWithSeveralHooksBefore($object)
-  {
-    $object->ret .= "in myMethodWithSeveralHooks mixin method for before hook\n";
-  }
-
-  public function myMethodWithSeveralHooksAfter($object)
-  {
-    $object->ret .= "in myMethodWithSeveralHooks mixin method for after hook\n";
-  }
-
-// TODO
-  public function myStaticMixinMethod($object)
-  {
-    $object->ret .= "in myStaticMethod mixin method\n";
-  }
-
-  public function myMixinMethodWithArgs($object, $arg1, $arg2 = 'default')
-  {
-    $object->ret .= "in myMethodWithArgs mixin method ($arg1, $arg2)\n";
-  }
-
-  public function myMixinStaticMethod()
-  {
-    myClass::$retStatic .= "in myStaticMethod mixin method\n";
-  }
-
-  public function myMixinStaticMethodWithArgs($class, $arg1, $arg2 = 'default')
-  {
-    myClass::$retStatic .= "in myStaticMethodWithArgs mixin method ($arg1, $arg2)\n";
-  }
-
-  public function newMethod($object)
-  {
-    return "in newMethod mixin method\n";
-  }
-
-  public function newMethodWithArgs($object, $arg1, $arg2 = 'default')
-  {
-    return "in newMethodWithArgs mixin method ($arg1, $arg2)\n";
-  }
-}
-
-sfMixer::register('myClass:myMethod', array('myClassMixins', 'myMixinMethod'));
-sfMixer::register('myClass:myStaticMethod', array('myClassMixins', 'myMixinStaticMethod'));
-
-$t->is($m->myMethod(), "before myMethod\nin myMethod mixin method\nafter myMethod\n", 'method call with a mixin');
-$t->is(myClass::myStaticMethod(), "before myStaticMethod\nin myStaticMethod mixin method\nafter myStaticMethod\n", 'static method call with a mixin');
-
-sfMixer::register('myClass:myMethodWithArgs', array('myClassMixins', 'myMixinMethodWithArgs'));
-$t->is($m->myMethodWithArgs('value'), "before myMethodWithArgs\nin myMethodWithArgs mixin method (value, default)\nafter myMethodWithArgs\n", 'method call with arguments with a mixin');
-
-sfMixer::register('myClass:myStaticMethodWithArgs', array('myClassMixins', 'myMixinStaticMethodWithArgs'));
-$t->is(myClass::myStaticMethodWithArgs('value'), "before myStaticMethodWithArgs\nin myStaticMethodWithArgs mixin method (value, default)\nafter myStaticMethodWithArgs\n", 'static method call with arguments with a mixin');
-
-sfMixer::register('myClass', array('myClassMixins', 'newMethod'));
-$t->is($m->newMethod(), "before __call\nin newMethod mixin method\nafter __call\n", 'method call from a mixin');
-
-sfMixer::register('myClass', array('myClassMixins', 'newMethodWithArgs'));
-$t->is($m->newMethodWithArgs('value'), "before __call\nin newMethodWithArgs mixin method (value, default)\nafter __call\n", 'method call from a mixin with arguments');
-
-sfMixer::register('myClass:myMethodWithSeveralHooks:before', array('myClassMixins', 'myMethodWithSeveralHooksBefore'));
-sfMixer::register('myClass:myMethodWithSeveralHooks', array('myClassMixins', 'myMethodWithSeveralHooks'));
-sfMixer::register('myClass:myMethodWithSeveralHooks:after', array('myClassMixins', 'myMethodWithSeveralHooksAfter'));
-$t->is($m->myMethodWithSeveralHooks(), "before myMethodWithSeveralHooks\nin myMethodWithSeveralHooks mixin method for before hook\nmyMethodWithSeveralHooks\nin myMethodWithSeveralHooks mixin method for default hook\nafter myMethodWithSeveralHooks\nin myMethodWithSeveralHooks mixin method for after hook\n", 'method call with several registered hooks');
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/sfPropelDatabaseSchemaTest.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/sfPropelDatabaseSchemaTest.php
deleted file mode 100644
index 0346a6d99..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/sfPropelDatabaseSchemaTest.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * (c) Francois Zaninotto <francois.zaninotto@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/../bootstrap/unit.php');
-
-class my_lime_test extends lime_test
-{
-  public function is_array_explicit($test, $target, $prefix = '')
-  {
-    foreach ($test as $key => $value)
-    {
-      if (is_array($value))
-      {
-        $this->is_array_explicit($value, $target[$key], $prefix.' '.$key);
-      }
-      else
-      {
-        $this->is($value, $target[$key], sprintf('%s %s is %s', $prefix, $key, $value));
-      }
-    }
-  }
-
-  public function is_line_by_line($exp1, $exp2)
-  {
-    $array_exp1 = explode("\n", $exp1);
-    $array_exp2 = explode("\n", $exp2);
-    $nb_lines = count($array_exp1);
-    for ($i=0; $i < $nb_lines; $i++)
-    {
-      if(!$array_exp1[$i]) continue; // Skip blank lines to avoid testing nothing
-      $this->is(trim($array_exp1[$i]), trim($array_exp2[$i]), sprintf('Line %d matches %s', $i, $array_exp1[$i]));
-    }
-  }
-}
-
-require_once(dirname(__FILE__).'/../../../../../test/bootstrap/unit.php');
-require_once(dirname(__FILE__).'/../../lib/addon/sfPropelDatabaseSchema.class.php');
-require_once(dirname(__FILE__).'/../../../../util/sfInflector.class.php');
-require_once(dirname(__FILE__).'/../../../../util/sfToolkit.class.php');
-require_once(dirname(__FILE__).'/../../../../yaml/sfYaml.php');
-
-$t = new my_lime_test(401);
-
-$t->diag('Classical YAML to XML conversion');
-$p = new sfPropelDatabaseSchema();
-$p->loadYAML(dirname(__FILE__).'/fixtures/schema.yml');
-$target = file_get_contents(dirname(__FILE__).'/fixtures/schema.xml');
-$t->is_line_by_line($p->asXML(), $target);
-
-$t->diag('New YAML to XML conversion');
-$p = new sfPropelDatabaseSchema();
-$p->loadYAML(dirname(__FILE__).'/fixtures/new_schema.yml');
-$target = file_get_contents(dirname(__FILE__).'/fixtures/schema.xml');
-$t->is_line_by_line($p->asXML(), $target);
-
-$t->diag('New YAML to Old YAML conversion');
-$old_yml_target = sfYaml::load(dirname(__FILE__).'/fixtures/schema.yml');
-$p = new sfPropelDatabaseSchema();
-$new_yml_transformed = $p->convertNewToOldYaml(sfYaml::load(dirname(__FILE__).'/fixtures/new_schema.yml'));
-$t->is_array_explicit($new_yml_transformed, $old_yml_target);
-
-$t->diag('Old YAML to New YAML conversion');
-$new_yml_target = sfYaml::load(dirname(__FILE__).'/fixtures/new_schema.yml');
-$p = new sfPropelDatabaseSchema();
-$old_yml_transformed = $p->convertOldToNewYaml(sfYaml::load(dirname(__FILE__).'/fixtures/schema.yml'));
-$t->is_array_explicit($old_yml_transformed, $new_yml_target);
-
-
-$t->todo('XML and classical YAML internal representation');
-$p1 = new sfPropelDatabaseSchema();
-$p1->loadXML(dirname(__FILE__).'/fixtures/schema.xml');
-$p2 = new sfPropelDatabaseSchema();
-$p2->loadYAML(dirname(__FILE__).'/fixtures/schema.yml');
-//$t->is_array_explicit($p1->asArray(), $p2->asArray());
-
-$t->todo('XML and classical YAML compared as XML');
-//$t->is_line_by_line($p1->asXML(), $p2->asXML());
-
-$t->todo('XML and classical YAML compared as YAML');
-//$t->is_line_by_line($p1->asYAML(), $p2->asYAML());
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/task/sfPhingTest.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/task/sfPhingTest.php
deleted file mode 100644
index 09c3cdab4..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/task/sfPhingTest.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once dirname(__FILE__).'/../../bootstrap/unit.php';
-
-$t = new lime_test(1);
-
-// ::getPhingVersion()
-$t->diag('::getPhingVersion()');
-
-$t->is(sfPhing::getPhingVersion(), 'sfPhing', '::getPhingVersion() returns "sfPhing"');
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/validator/sfValidatorPropelUniqueTest.php b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/validator/sfValidatorPropelUniqueTest.php
deleted file mode 100644
index 011f7a6fe..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/test/unit/validator/sfValidatorPropelUniqueTest.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-$app = 'frontend';
-include dirname(__FILE__).'/../../bootstrap/functional.php';
-include $configuration->getSymfonyLibDir().'/vendor/lime/lime.php';
-
-$t = new lime_test(2);
-
-// ->clean()
-$t->diag('->clean()');
-
-$validator = new sfValidatorPropelUnique(array('model' => 'Author', 'column' => 'name'));
-
-$author = new Author();
-$author->setName('==NAME==');
-$author->save();
-
-try
-{
-  $validator->clean(array('name' => '==NAME=='));
-  $t->fail('->clean() throws an error on the column');
-}
-catch (sfValidatorErrorSchema $errors)
-{
-  $t->is(isset($errors['name']), true, '->clean() throws an error on the column');
-}
-catch (Exception $e)
-{
-  $t->fail('->clean() throws an error on the column');
-  $t->diag('    '.$e->getMessage());
-}
-
-$validator->setOption('field', 'author_name');
-
-try
-{
-  $validator->clean(array('author_name' => '==NAME=='));
-  $t->fail('->clean() throws an error on the field');
-}
-catch (sfValidatorErrorSchema $errors)
-{
-  $t->is(isset($errors['author_name']), true, '->clean() throws an error on the field');
-}
-catch (Exception $e)
-{
-  $t->fail('->clean() throws an error on the field');
-  $t->diag('    '.$e->getMessage());
-}
-
-$author->delete();
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/css/default.css b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/css/default.css
deleted file mode 100644
index 7abcfd8d6..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/css/default.css
+++ /dev/null
@@ -1,271 +0,0 @@
-#sf_admin_container a
-{
-  color: #464646;
-  text-decoration: none;
-}
-
-#sf_admin_container a:hover
-{
-  color: #000;
-  text-decoration: underline;
-}
-
-#sf_admin_container h1
-{
-  margin: 0;
-  padding: 0;
-  margin-bottom: 20px;
-}
-
-#sf_admin_container th
-{
-  background-color: #e7eef6;
-  white-space: nowrap;
-}
-
-#sf_admin_container td, #sf_admin_container th
-{
-  border: 0;
-  border-bottom: 1px solid #ddd;
-  border-top: 1px solid #ddd;
-  text-align: left;
-  vertical-align: top;
-}
-
-#sf_admin_container tr
-{
-  background-color: #fff;
-  border-left: 1px solid #ddd;
-  border-right: 1px solid #ddd;
-}
-
-#sf_admin_container ul.error_list
-{
-  margin: 0;
-  margin-bottom: 7px;
-  color: #d33;
-  border: none;
-  background-color: #f33;
-}
-
-#sf_admin_container ul.error_list li
-{
-  padding: 4px;
-  padding-left: 25px;
-  list-style: none;
-  color: #fff;
-  background: url(../images/error.png) no-repeat 4px 4px;
-}
-
-#sf_admin_container tr:hover
-{
-  background-color: #ffe;
-}
-
-#sf_admin_container input, #sf_admin_container textarea
-{
-  width: auto;
-}
-
-#sf_admin_container .radio_list, #sf_admin_container .checkbox_list
-{
-  margin: 0;
-}
-
-#sf_admin_container .radio_list li, #sf_admin_container .checkbox_list li
-{
-  list-style: none;
-  display: inline;
-}
-
-#sf_admin_container .double_list_select, #sf_admin_container .double_list_select-selected
-{
-  width: 12em;
-}
-
-#sf_admin_container .double_list_label
-{
-  font-weight: bold;
-}
-
-#sf_admin_container tfoot td
-{
-  margin: 0;
-  list-style: none;
-  text-align: right;
-}
-
-#sf_admin_container thead img, #sf_admin_container tfoot img
-{
-  vertical-align: middle;
-}
-
-#sf_admin_bar
-{
-  float: right;
-  margin-left: 20px;
-}
-
-.sf_admin_pagination
-{
-  float: right;
-}
-
-#sf_admin_container ul.sf_admin_td_actions
-{
-  margin: 0;
-  padding: 0;
-  list-style-type: none;
-}
-
-#sf_admin_container ul.sf_admin_td_actions li
-{
-  list-style-type: none;
-  display: inline;
-  margin-right: 10px;
-  font-size: 90%;
-}
-
-#sf_admin_container ul.sf_admin_actions
-{
-  margin: 10px 0;
-  list-style-type: none;
-}
-
-#sf_admin_container ul.sf_admin_actions li
-{
-  list-style-type: none;
-  display: inline;
-  margin-right: 10px;
-}
-
-#sf_admin_container ul.sf_admin_actions li a,
-#sf_admin_container ul.sf_admin_td_actions li a
-{
-  padding-left: 20px;
-  background: url(../images/default.png) no-repeat 0 0;
-}
-
-#sf_admin_container ul li.sf_admin_action_new a
-{
-  background: url(../images/new.png) no-repeat 0 0;
-}
-
-#sf_admin_container ul li.sf_admin_action_delete a
-{
-  background: url(../images/delete.png) no-repeat 0 0;
-}
-
-#sf_admin_container ul li.sf_admin_action_list a
-{
-  background: url(../images/list.png) no-repeat 0 0;
-}
-
-#sf_admin_container ul li.sf_admin_action_edit a
-{
-  background: url(../images/edit.png) no-repeat 0 0;
-}
-
-#sf_admin_container .notice
-{
-  margin: 4px 0;
-  padding: 4px 4px 4px 30px;
-  background: url(../images/tick.png) no-repeat 10px 4px;
-  border-top: 1px solid #ddd;
-  border-bottom: 1px solid #ddd;
-  background-color: #ffc;
-}
-
-#sf_admin_container .error
-{
-  margin: 4px 0;
-  padding: 4px 4px 4px 30px;
-  background: url(../images/error.png) no-repeat 10px 4px;
-  border-top: 1px solid #ddd;
-  border-bottom: 1px solid #ddd;
-  background-color: #f33;
-  color: #fff;
-}
-
-#sf_admin_container .sf_admin_row_0 td
-{
-}
-
-#sf_admin_container .sf_admin_row_1 td
-{
-/*  background-color: #eee;*/
-}
-
-#sf_admin_container fieldset h2
-{
-  padding: 3px;
-  color: #333;
-  background-color: #ccf;
-  font-size: 11px;
-  margin: 0;
-}
-
-#sf_admin_container fieldset
-{
-  margin-bottom: 3px;
-  border: 1px solid #ddd;
-  border-bottom: 0px;
-  background-color: #fff;
-}
-
-#sf_admin_container fieldset.collapsed * { display:none; }
-#sf_admin_container fieldset.collapsed h2, #sf_admin_container fieldset.collapsed { display:block !important; }
-#sf_admin_container fieldset.collapsed .collapse-toggle { display: inline !important; }
-#sf_admin_container fieldset.collapse h2 a.collapse-toggle { color:#ffc; }
-#sf_admin_container fieldset.collapse h2 a.collapse-toggle:hover { text-decoration:underline; }
-
-#sf_admin_container label
-{
-  display: block;
-  padding: 0 1em 3px 0;
-  float: left;
-  text-align: left;
-  width: 8em;
-  color: #666;
-  font-weight: normal !important;
-}
-
-#sf_admin_container ul label, #sf_admin_container td label
-{
-  display: inline;
-  float: none !important;
-}
-
-#sf_admin_container .sf_admin_form_row
-{
-  clear: both;
-  padding: 10px;
-  border-bottom: 1px solid #ddd;
-}
-
-#sf_admin_container .sf_admin_form_row .content
-{
-  padding-left: 9em;
-}
-
-#sf_admin_container .help
-{
-  padding-left: 9em;
-  color: #aaa;
-}
-
-#sf_admin_container td .help
-{
-  padding-left: 0;
-}
-
-#sf_admin_container .errors input, #sf_admin_container .errors select
-{
-  border: 1px solid #f22;
-}
-
-#sf_admin_container .sf_admin_list .sf_admin_boolean
-{
-  text-align: center;
-}
-
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/css/global.css b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/css/global.css
deleted file mode 100644
index 9760cb288..000000000
--- a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/css/global.css
+++ /dev/null
@@ -1,34 +0,0 @@
-/* http://yui.yahooapis.com/2.6.0/build/reset/reset-min.css
-Copyright (c) 2008, Yahoo! Inc. All rights reserved.
-Code licensed under the BSD License:
-http://developer.yahoo.net/yui/license.txt
-version: 2.6.0
-*/
-html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:text-top;}sub{vertical-align:text-bottom;}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit;}input,textarea,select{*font-size:100%;}legend{color:#000;}del,ins{text-decoration:none;}
-
-/* http://yui.yahooapis.com/2.6.0/build/fonts/fonts-min.css
-Copyright (c) 2008, Yahoo! Inc. All rights reserved.
-Code licensed under the BSD License:
-http://developer.yahoo.net/yui/license.txt
-version: 2.6.0
-*/
-body{font:13px/1.231 arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;}select,input,button,textarea{font:99% arial,helvetica,clean,sans-serif;}table{font-size:inherit;font:100%;}pre,code,kbd,samp,tt{font-family:monospace;*font-size:108%;line-height:100%;}
-
-/* http://yui.yahooapis.com/2.6.0/build/base/base-min.css
-Copyright (c) 2008, Yahoo! Inc. All rights reserved.
-Code licensed under the BSD License:
-http://developer.yahoo.net/yui/license.txt
-version: 2.6.0
-*/
-h1{font-size:138.5%;}h2{font-size:123.1%;}h3{font-size:108%;}h1,h2,h3{margin:1em 0;}h1,h2,h3,h4,h5,h6,strong{font-weight:bold;}abbr,acronym{border-bottom:1px dotted #000;cursor:help;} em{font-style:italic;}blockquote,ul,ol,dl{margin:1em;}ol,ul,dl{margin-left:2em;}ol li{list-style:decimal outside;}ul li{list-style:disc outside;}dl dd{margin-left:1em;}th,td{border:1px solid #000;padding:.5em;}th{font-weight:bold;text-align:center;}caption{margin-bottom:.5em;text-align:center;}p,fieldset,table,pre{margin-bottom:1em;}input[type=text],input[type=password],textarea{width:12.25em;*width:11.9em;}
-
-html
-{
-  background-color: #eee;
-}
-
-body
-{
-  padding: 30px;
-  text-align: left;
-}
diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/asc.png b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/asc.png
deleted file mode 100755
index 12ba77067f7ff2a40772b7109492fe50962abf2f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 287
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i=8^mK6yskoK&=l_3uX4QtyMkj}j
zj5;Ug>{z)w(I@9$5{qE>rr1L12A+^Jf?V(C-0_{mJ>lT}{r^3_Ga3E({98Yg?ZDrE
zzrV|~$rSZeBp*C}wa+o)Xw$>*>+K789yK57>~uS(yPMx|#)(Y^f0(jb5(VT{`tq#9
z#2FTM7C!%{%#-#hC*iiENe91>x|L$1$a~wGo`X)ElNnteU*ahfDvERP@;JeGyd%vb
gkGU-^jfum6A^N^obBSMU4bbrnp00i_>zopr0B_lC>Hq)$

diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/default.png b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/default.png
deleted file mode 100755
index 95b13aefdf683ad5e1725022b2a2c4d539155b26..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 267
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i>J^>lFzskoK&=l_3uX4QtyMyCTz
z$y?T0yH5&U)!ZWy$iu)`=9{|6<o}*J@yo0VAHIHdzci=!OxW-0>53<!=4&utTWig!
z(rXa=;rV&_w&&;PKfbD?so8niG=bScLf&DzyWxZH@9*;{DJfO(GORrKx=CC=?t!U;
zlM~Z+#{d8RGAGwC#LlbI6lAHWtUNd)hk0AhO{Y!V66`kSOe_)%Gg++zk6l=&4Rk1j
Mr>mdKI;Vst0QV|k1poj5

diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/delete.png b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/delete.png
deleted file mode 100755
index c7798043231455c50262219c841092d98fcf3e5c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 325
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i<@_jGX#skoK&=l_3uX4QtyMkj}j
zj5;Ug%w4%sf$N#No5|LK!tXaX7w&qnfA<<4W)9`d1L}P*TkGB2c<TTEOD&i<sY&x6
ze^T=ihoY844Tay2_4530<of^T-`NKWT3p8z%shBh+TWS-h%@{>zN7rKSlj*mbqf<F
zNO<t&D=0O`JNTx!DjTT%lQu9k{PXYU<i@i{Sb7|DfbxA482@km|A*0f=H)Xz4_`by
zoWKLN<;BK^hpc(r+y=FOj&San?`SsL@u=jvIgY%gPxd(YIVH*bn#rkffFXE!zUBT7
S18JZa89ZJ6T-G@yGywp!(1X|j

diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/desc.png b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/desc.png
deleted file mode 100755
index f65b7036398edca2ebc6ac57ff85acc8a0d90c86..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 285
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i=;_jGX#skoK&=l_3uX4QtyMkj}j
zj5;Ug>{z+`;#0?e$u43MQ{H-Q;r_RJ#_mHriZ{9ci~7!y{P*wgafU@7C7aGR{NMD8
zkEg!we`~UU{B*?^Y=8Q{mZcO-NKE<h_cy;x^ACl>oVE=MxOMLBlK0_W9ih-Et7yd|
z(YTO@?`!=2e+LXrzDQn7W?9Xh@W4Do+4CiXWX0;@LpQVIADA@=TIwsPs^lo1>(Es+
g<okPuMIeEpE6c-g;l&O+pwk&VUHx3vIVCg!0AcfPh5!Hn

diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/edit.png b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/edit.png
deleted file mode 100755
index 4cc0c3ebb495b47d019decb847cb0bdaad77baeb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 411
zcmV;M0c8G(P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzElET{RCwBA
z{Qv(y10{fofkMDSNWqc30*1HGpM#w#EGfwdqHQKkz;1wN%~lKpGJu-hSe3x+UC;0R
zhZ%y?1>0M^;q17nyZ^tAS<JAjHkLu><6j0Hpx6}#uxl6zh5<;kk(NHgjq9%&4oCGd
zT;XSCkP=ZPE)YSQ^;NYQ9=!a<@aN}mFus%8&#>$FJqC0yFd|1IC=5g;+5Q`88!$Zi
z@Ea~JBf!dV?&<}G*Ux`3B6|_T1t87lCT0w;elsz!akGQ5q9iw1^P+55M!e}@_wL>Q
zn|;(6PM$f%pdii#)XV{<L3~`Av4#Q2kRykWFvtk8f@yr3QNjS^0uZgHrUvHMZn*{a
zGrnj>Ne4%c9AU7rv0=D%>lT<#$Y!juFd&(UVgmpI3;=^sd5#UthH(G@002ovPDHLk
FV1gkYtpET3

diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/error.png b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/error.png
deleted file mode 100755
index 6631294a5938a38a962c0220b400ea14ed0c6191..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 438
zcmV;n0ZIOeP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzSV=@dRCwB?lDkU8Koo}mi9y!2FmEte
zdt(b5A3#ME#anA(C0N*4+6flg`2dzagMyDBB5NTC66<Amb6H8U8}~TLWJ6|mBBBQd
z&Sd8M&woya**DWD2^!in-6gXOo?6&|RofS71n21%?(+lbM2xcX*8DQy+kj`onprBl
zrWGK*cM0@9fzT7n1-d@?=Ao{wk``D`RBxkxb&+o8P7Z(x<5v!d@19Em3JYIF&LZ&j
zwGkJlzIqGj2L%C<`$D8*{OExA&Y2MCN|*xGK|f5z`RbzLLX}KluOZ>Ag|Tr{!W2no
z#+Qm@4~h8psW?pRHzYg|8NejOA<ic&Kpf-a?j_|5Ge{~l6}WzVFaN?(O~Modoeof~
zDl;Iyb(~Ilq;eh^oKpt)%53UfItbcY+e+nPBrb|Wblx7zdme_faO_t84w(D?N@C#;
g!59(YKk+TV0CEAdE4fe6@c;k-07*qoM6N<$f;VHiuK)l5

diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/first.png b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/first.png
deleted file mode 100755
index 4576517480fc171c81b01c3db3450b3adb5510f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 435
zcmV;k0ZjghP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzRY^oaRCwBA{Qv(y10{e3M3~Qp^NBT$
z5k#C!g&F|UT<Xfe@b@34>i<Z(n1Dpj9<UH2+yx*tQC18L_dhc*eEbE`0P`7)4WikZ
z85sCj85n}i85q`{gct&M!Q-zGg}vqwe!&T-W~c#^Eg|Ar$58zVH{i=}h{SKG7e4<+
z7%<BkA^zz%!gVMHz$AYBMdi=8Lx{y3goypa<^q`CVTwWgr49&w*gn+oz-hp@KL{7V
z*l-si2PjmW38nz#=g&}0APi!A?nLmH*h9kU3y}TwH^N}J0bl<>Fv!Uu4Abbb6Ct+J
z5l92YzW>Ey!1uohg&_PBgn^;;3y8gTA;dwk@%tZ^F!%!%4A_I2W*LD*C@>J2fixFT
z2MfsBuc!tvDtu-5|3id<ffXpp2F0w*2sRrM`^pVOen8F(j2v$uF$D7BcPPe}nZOK6
dvok<|0RS`Qx@hqD&<p?o002ovPDHLkV1n1zxc2}6

diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/last.png b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/last.png
deleted file mode 100755
index 0d5a621e19ffa2715135d5609f41e937b6f54cca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 436
zcmV;l0ZaagP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzR!KxbRCwB?Q@u{ZFcALSBn2@r@c=vp
z<!1tk9Vje_m4%6grvL`Tgm?o4Z;&FfAi6WKF|e|vAv9`|24Bt>CnQ2hwRHB~=kGq9
z&$i0*9J36UrrvEC|5r`XG(0u}l6<xeWYZ=)uVi)fbm13}Dk~t);X3dh0>Ok6<YeO0
zI_Ch39?<Ur4?`9yEBJ_*c-iCl^u;6_f$KHKPoC@N?1=M~XiI@)%67g2go!o5N7^4v
zS_EX{=n053wyRY>5}9Dc36d6pz-$m<|IsGgY%ne{@v0TLRe|c6zf()11c|BAqM^S9
z!o&*PZQ6vr0b>$Vp9p9OL@5*Rx42XqyT0wXU~yW%g;HRg)rtK<ohUfnM5{n*Uf_=3
ze6vbV2fDG2UKezRORbOU0%|!z9xnl&-s~Fl9P4*0{_C6l57ob*=0CYQs&;Jbug_FC
evwr6v0R{lGVz4=QG~+M;0000<MNUMnLSTX-`@4<+

diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/list.png b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/list.png
deleted file mode 100755
index 95b13aefdf683ad5e1725022b2a2c4d539155b26..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 267
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i>J^>lFzskoK&=l_3uX4QtyMyCTz
z$y?T0yH5&U)!ZWy$iu)`=9{|6<o}*J@yo0VAHIHdzci=!OxW-0>53<!=4&utTWig!
z(rXa=;rV&_w&&;PKfbD?so8niG=bScLf&DzyWxZH@9*;{DJfO(GORrKx=CC=?t!U;
zlM~Z+#{d8RGAGwC#LlbI6lAHWtUNd)hk0AhO{Y!V66`kSOe_)%Gg++zk6l=&4Rk1j
Mr>mdKI;Vst0QV|k1poj5

diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/new.png b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/new.png
deleted file mode 100755
index d91b835978fcfb0c4080632205a05160cad79737..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 288
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmUzPnffIy#(?lOI#yL
zg7ec#$`gxH85~pclTsBta}(23gHjVyDhp4h+5i=8@^o<wskoK&=l_3uX4QtyMyCTz
z$!G4)?DCa+X5&`UnezQ6OYDdE<FV5iTPE@xddrma;QjvnN2(cDGuC^WGaOyH|Noz3
zs>eIdHvBgVtKnI}_J{HEi%0%_wZHg{S&p)9(pjd#^}f!YZP`@IwE?^dH@dHK_Z;Vc
z>-w>2fuivYwywq1va7`%3Qu=T(ffCJ4?|GDntP0n0@K9aJsBa7TYvmDIxIOSOCoV*
k=ba^IEFSC>R5-w(Q|oBI^WCO5K-V*Py85}Sb4q9e0MGYyUH||9

diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/next.png b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/next.png
deleted file mode 100755
index d5bd836bea17614b6767a9b61cea74c2dd5cee8f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 448
zcmV;x0YCnUP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzVo5|nRCwB?Q@c*XFcdv*l9q{y58x{Z
zDq`TZmPe705Gxx43ts^Uu^=JD4<H^NKnh}l?hI@UUAu%fG-}cY-(EXTXoQez={ons
z=Nw;K*CI(0Ofqbm+^ZD-*G<sW+*bx#e6$7(hU4rcqbkYi#2ft*X$8dDtpcAN!0)p_
zpG@cUtysXc1JqsMuE{281+9RIr!M2eHx`}GGd_3)x)IP0^XDw-gciFo5Dhtw=YURR
z@R>CJid6Iq4D`a@3lI)CX!o6GgD<Mg@uLC*Uo8+}`^ktd7l3uo;OoVF1$NdT$z0lZ
zY)B-?VYyM|w*j438{8}z!BzvfUop7mF=@;oh*^BQ%%#%Ul;nq1gKLlD-If~k6iJio
z4JKyIirO_bh*bw}c=;|Qp^!ai%j>oT2jvLz24Xfq63zgQTr8__ER&Zr`TK`?581aM
qrrKN`RozqZ*JBzblRoDk0R{lQil`%kyy@5g0000<MNUMnLSTX^;=P{$

diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/previous.png b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/previous.png
deleted file mode 100755
index 4d089a7f86689008e5a44be7a6c7710a842d6dea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 452
zcmV;#0XzPQP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzW=TXrRCwBA{Qv(y10{e3M3~Qp^NBT$
z5k#C!g&F|UT<Xfe@b@34>i<Z(n1Dpj9<UH2+yx*tQC18L_dhc*eEbE`0P`7)4WikZ
z85sCj85n}i85q`{gct&M!Q-z8g&^E-4iV2g0TG{U3E^iQL-i-zfG@ux690h2G@xsK
zL%s4DC_c*?!T<Cd;W`upU=p)z7#M#1g@`2{VqlnWhv3H?gsAz4%>^L8FF;ZpeSm>s
zsRM!^whuKtup02~4?+UuB6L1VfI`KYU<yEf_1z881j6%e85lfwBKS+}A>s4|$o~2p
zVKCf)uYVxedl$snAPn+?$4&%)r6Z6As`>sGivi#NA`~JU@(UPZUPydUZ2bO*B@F(c
zrNDqah}6djBtn6K$PA>pfI3(})_z4bfKlNq!~Y*53=FJ5Nj4~EWk#^skl0slAo2rp
uUSQ;S1BoG!7r#R>zRUz>P@0_q0t^6Dhq7>n--PP`0000<MNUMnLSTaBxwxqS

diff --git a/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/tick.png b/lib/vendor/symfony/lib/plugins/sfPropelPlugin/web/images/tick.png
deleted file mode 100755
index fdff9338580ad20a4d05ee9919e0bc90097a4f69..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 344
zcmV-e0jK_nP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUy>PbXFRCwBA
z{Qv(y10{fofkHsB0W2`a+?}b!sE7HNG1+}K$u9V><1Whp!bk=oTmS+vQ_%s?b^kS7
zq!|AE{mUT3Xv%Pf;W6=H0Me}NAj<Ij&u<3F|3(aZc5eiG0jmKZ#UPB#m$l|+`1Si2
zgA}6?!~VTnK(1uO8i*i&iJ5Z3HG*gm|L3n?49c8V42Spc#L$f40(mwQhM&KGGVmKP
zfiZ{;5<7lqFILUy1~8sJdYD0p(+uon5C*Y9Vz@M8xB#T^{P7bEs@xV}3}WNc47L@P
q7tj(CJi*}72#a#Yp`V!m0t^5$9bpeWG*CwX0000<MNUMnLSTZ`AB=MV


From c842e42100164e9a7ca3254fc8119844df2b30e1 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Tue, 27 Mar 2012 19:06:19 +0900
Subject: [PATCH 059/630] add unit test for opActivityQueryBuilder (refs #2908)

---
 lib/util/opActivityQueryBuilder.class.php     |   2 +-
 test/fixtures/common/test_data.yml            |   8 +
 test/unit/util/opActivityQueryBuilderTest.php | 201 ++++++++++++++++++
 3 files changed, 210 insertions(+), 1 deletion(-)
 create mode 100644 test/unit/util/opActivityQueryBuilderTest.php

diff --git a/lib/util/opActivityQueryBuilder.class.php b/lib/util/opActivityQueryBuilder.class.php
index f3bedfcaa..c286e924e 100644
--- a/lib/util/opActivityQueryBuilder.class.php
+++ b/lib/util/opActivityQueryBuilder.class.php
@@ -60,7 +60,7 @@ public function includeSelf()
     return $this;
   }
 
-  public function includeFriends($target_member_id)
+  public function includeFriends($target_member_id = null)
   {
     $this->include['friend'] = $target_member_id ?: $this->viewerId;
     return $this;
diff --git a/test/fixtures/common/test_data.yml b/test/fixtures/common/test_data.yml
index d5dd6d4dc..40985f5fb 100644
--- a/test/fixtures/common/test_data.yml
+++ b/test/fixtures/common/test_data.yml
@@ -897,37 +897,45 @@ SkinConfig:
 
 ActivityData:
   dummy_activity1:
+    id: 1
     Member: first_member
     body: "dummy1"
   dummy_activity2:
+    id: 2
     Member: first_member
     body: "dummy2"
     public_flag: 0
   dummy_activity3:
+    id: 3
     Member: first_member
     body: "dummy3"
     public_flag: 2
   dummy_activity4:
+    id: 4
     Member: first_member
     body: "dummy4"
     public_flag: 3
   dummy_activity5:
+    id: 5
     Member: first_member
     body: "dummy5"
     foreign_table: "member_relationship"
     foreign_id: 1
   dummy_activity6:
+    id: 6
     Member: first_member
     body: "dummy6"
     foreign_table: "member_relationship"
     foreign_id: 2
   dummy_activity7:
+    id: 7
     Member: first_member
     body: "dummy7"
     template: "test_template"
     template_param:
       "%foo%" : "bar"
   dummy_activity8:
+    id: 8
     Member: first_member
     body: "dummy8"
     template: "xxxx_template"
diff --git a/test/unit/util/opActivityQueryBuilderTest.php b/test/unit/util/opActivityQueryBuilderTest.php
new file mode 100644
index 000000000..09a7488a1
--- /dev/null
+++ b/test/unit/util/opActivityQueryBuilderTest.php
@@ -0,0 +1,201 @@
+<?php
+include_once dirname(__FILE__) . '/../../bootstrap/unit.php';
+include_once dirname(__FILE__) . '/../../bootstrap/database.php';
+sfContext::createInstance($configuration);
+
+$t = new lime_test(15, new lime_output_color());
+
+//==============================================================================
+$t->diag('opActivityQueryBuilder::create()');
+
+$builder = opActivityQueryBuilder::create();
+$t->cmp_ok($builder, 'instanceof', 'opActivityQueryBuilder', '::create() returns opActivityQueryBuilder instance.');
+
+$builder2 = opActivityQueryBuilder::create();
+$t->cmp_ok($builder2, '!==', $builder, 'opActivityQueryBuilder is NOT singleton.');
+
+
+//==============================================================================
+$t->diag('opActivityQueryBuilder::buildQuery()');
+
+$query = opActivityQueryBuilder::create()->buildQuery();
+$t->cmp_ok($query, 'instanceof', 'Doctrine_Query', '->buildQuery() returns Doctrine_Query instance.');
+
+$query->free();
+
+
+//==============================================================================
+$t->diag('opActivityQueryBuilder::includeSelf()');
+
+$builder = opActivityQueryBuilder::create()
+  ->setViewerId(1)
+  ->includeSelf();
+
+$query = $builder->buildQuery();
+$result = $query->execute();
+
+$t->is($result->getPrimaryKeys(), array(8, 7, 6, 5, 4, 3, 2, 1), '->includeSelf() viewerId = 1');
+
+$result->free(true);
+$query->free();
+
+//------------------------------------------------------------
+$builder = opActivityQueryBuilder::create()
+  ->setViewerId(2)
+  ->includeSelf();
+
+$query = $builder->buildQuery();
+$result = $query->execute();
+
+$t->is($result->getPrimaryKeys(), array(), '->includeSelf() viewerId = 2');
+
+$result->free(true);
+$query->free();
+
+
+//==============================================================================
+$t->diag('opActivityQueryBuilder::includeFriends()');
+
+$builder = opActivityQueryBuilder::create()
+  ->setViewerId(1)
+  ->includeFriends();
+
+$query = $builder->buildQuery();
+$result = $query->execute();
+
+$t->is($result->getPrimaryKeys(), array(1055), '->includeFriends() viewerId = 1');
+
+$result->free(true);
+$query->free();
+
+//------------------------------------------------------------
+$builder = opActivityQueryBuilder::create()
+  ->setViewerId(2)
+  ->includeFriends();
+
+$query = $builder->buildQuery();
+$result = $query->execute();
+
+$t->is($result->getPrimaryKeys(), array(8, 7, 6, 5, 3, 2, 1), '->includeFriends() viewerId = 2');
+
+$result->free(true);
+$query->free();
+
+
+//==============================================================================
+$t->diag('opActivityQueryBuilder::includeSns()');
+
+$builder = opActivityQueryBuilder::create()
+  ->includeSns();
+
+$query = $builder->buildQuery();
+$result = $query->execute();
+
+$t->is($result->getPrimaryKeys(), array(1056, 1055, 8, 7, 6, 5, 2, 1));
+
+$result->free(true);
+$query->free();
+
+
+//==============================================================================
+$t->diag('opActivityQueryBuilder::includeMember()');
+
+$builder = opActivityQueryBuilder::create()
+  ->setViewerId(1)
+  ->includeMember(1);
+
+$query = $builder->buildQuery();
+$result = $query->execute();
+
+$t->is($result->getPrimaryKeys(), array(8, 7, 6, 5, 4, 3, 2, 1), '->includeMember(1) viewerId = 1');
+
+$result->free(true);
+$query->free();
+
+//------------------------------------------------------------
+$builder = opActivityQueryBuilder::create()
+  ->setViewerId(2)
+  ->includeMember(1);
+
+$query = $builder->buildQuery();
+$result = $query->execute();
+
+$t->is($result->getPrimaryKeys(), array(8, 7, 6, 5, 3, 2, 1), '->includeMember(1) viewerId = 2 (first_member is friend)');
+
+$result->free(true);
+$query->free();
+
+//------------------------------------------------------------
+$builder = opActivityQueryBuilder::create()
+  ->setViewerId(3)
+  ->includeMember(1);
+
+$query = $builder->buildQuery();
+$result = $query->execute();
+
+$t->is($result->getPrimaryKeys(), array(8, 7, 6, 5, 2, 1), '->includeMember(1) viewerId = 3 (first_member is not friend)');
+
+$result->free(true);
+$query->free();
+
+
+//==============================================================================
+$t->diag('opActivityQueryBuilder multiple conditions');
+
+$builder = opActivityQueryBuilder::create()
+  ->setViewerId(1)
+  ->includeSelf()
+  ->includeFriends();
+
+$query = $builder->buildQuery();
+$result = $query->execute();
+
+$t->is($result->getPrimaryKeys(), array(1055, 8, 7, 6, 5, 4, 3, 2, 1), '->includeSelf()->includeFriends() viewerId = 1');
+
+$result->free(true);
+$query->free();
+
+//------------------------------------------------------------
+$builder = opActivityQueryBuilder::create()
+  ->setViewerId(2)
+  ->includeSelf()
+  ->includeFriends();
+
+$query = $builder->buildQuery();
+$result = $query->execute();
+
+$t->is($result->getPrimaryKeys(), array(8, 7, 6, 5, 3, 2, 1), '->includeSelf()->includeFriends() viewerId = 2');
+
+$result->free(true);
+$query->free();
+
+//------------------------------------------------------------
+$builder = opActivityQueryBuilder::create()
+  ->setViewerId(1)
+  ->includeSelf()
+  ->includeFriends()
+  ->includeSns();
+
+$query = $builder->buildQuery();
+$result = $query->execute();
+
+$t->is($result->getPrimaryKeys(), array(1056, 1055, 8, 7, 6, 5, 4, 3, 2, 1), '->includeSelf()->includeFriends()->includeSns() viewerId = 1');
+
+$result->free(true);
+$query->free();
+
+//------------------------------------------------------------
+$builder = opActivityQueryBuilder::create()
+  ->setViewerId(2)
+  ->includeSelf()
+  ->includeFriends()
+  ->includeSns();
+
+$query = $builder->buildQuery();
+$result = $query->execute();
+
+$t->is($result->getPrimaryKeys(), array(1056, 1055, 8, 7, 6, 5, 3, 2, 1), '->includeSelf()->includeFriends()->includeSns() viewerId = 2');
+
+$result->free(true);
+$query->free();
+

From d89ca8a270fddfc1fbd82a40ef8944a80339d46e Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 29 Mar 2012 12:06:33 +0900
Subject: [PATCH 060/630] fix http status code of json api when running in
 debug mode (refs #2908)

---
 lib/exception/opErrorHttpException.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/exception/opErrorHttpException.class.php b/lib/exception/opErrorHttpException.class.php
index e17112af6..868af2b23 100644
--- a/lib/exception/opErrorHttpException.class.php
+++ b/lib/exception/opErrorHttpException.class.php
@@ -49,7 +49,7 @@ public function printStackTrace()
 
       $response->setStatusCode($this->httpStatusCode);
 
-      return parent::printStackTrace();
+      return sfException::printStackTrace(); // skip sfError404Exception::printStackTrace()
     }
     else
     {

From 46738c9033eac32578200f9636cb7c2155189d15 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 29 Feb 2012 19:18:36 +0900
Subject: [PATCH 061/630] enable json API by default (refs #2889)

---
 data/fixtures/013_enable_jsonapi.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 data/fixtures/013_enable_jsonapi.yml

diff --git a/data/fixtures/013_enable_jsonapi.yml b/data/fixtures/013_enable_jsonapi.yml
new file mode 100644
index 000000000..be002c88b
--- /dev/null
+++ b/data/fixtures/013_enable_jsonapi.yml
@@ -0,0 +1,4 @@
+SnsConfig:
+  json_api:
+    name: "enable_jsonapi"
+    value: 1

From c33b3a058d78462caba614686ef9292562bfce96 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Mon, 20 Feb 2012 16:52:22 +0900
Subject: [PATCH 062/630] replace to use API in smartphone pages (refs #2227)

---
 .../templates/_smtCommunityListBox.php        | 51 ++++++++++++++++++-
 .../member/templates/smtProfileSuccess.php    | 29 +++++++++--
 2 files changed, 75 insertions(+), 5 deletions(-)

diff --git a/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php b/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php
index 0cd24f752..e34aab1b5 100644
--- a/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php
+++ b/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php
@@ -59,12 +59,18 @@
   <?php endif; ?>
   <?php if (!$isAdmin) : ?>
   <?php if ($isCommunityMember) : ?>
-  <?php echo link_to(__('Leave this %community%', array('%community%' => $op_term['community']->titleize())), '@community_quit?id=' . $community->getId()) ?><br>
+  <p id="leaveCommunityLink"><a href="#" id="leaveCommunity"><?php echo __('Leave this %community%', array('%community%' => $op_term['community']->titleize())) ?></a></p>
+  <p id="leaveCommunityLoading" class="hide"><?php echo op_image_tag('ajax-loader.gif') ?></p>
+  <p id="leaveCommunityFinish" class="hide"><?php echo __('You have just quitted this %community%.') ?></p>
+  <p id="leaveCommunityError" class="hide"><?php echo __('You haven\'t joined this %community% yet.') ?></p>
   <?php else : ?>
   <?php if ($isCommunityPreMember) : ?>
   <?php echo __('You are waiting for the participation approval by %community%\'s administrator.', array('%community%' => $op_term['community']->titleize())) ?>
   <?php else: ?>
-  <?php echo link_to(__('Join this %community%', array('%community%' => $op_term['community']->titleize())), '@community_join?id=' . $community->getId()) ?><br>
+  <p id="joinCommunityLink"><a href="#" id="joinCommunity"><?php echo __('Join this %community%', array('%community%' => $op_term['community']->titleize())) ?></a></p>
+  <p id="joinCommunityLoading" class="hide"><?php echo op_image_tag('ajax-loader.gif') ?></p>
+  <p id="joinCommunityFinish" class="hide"><?php echo __('You have just joined to this %community%.') ?></p>
+  <p id="joinCommunityError" class="hide"><?php echo __('You are already joined to this %community%.') ?></p>
   <?php endif; ?>
   <?php endif; ?>
   <?php endif; ?>
@@ -72,3 +78,44 @@
 </tbody>
 </table>
 </div>
+<script type="text/javascript">
+$(function(){
+
+  $('#leaveCommunity').click(function(){
+    $('#leaveCommunityLoading').show();
+    $('#leaveCommunityLink').hide();
+    $.ajax({
+      type: 'GET',
+      url: openpne.apiBase + 'community/join.json',
+      data: 'community_id=<?php echo $community->getId() ?>&leave=true&apiKey=' + openpne.apiKey,
+      success: function(json){
+        $('#leaveCommunityFinish').show();
+        $('#leaveCommunityLoading').hide();
+      },
+      error: function(XMLHttpRequest, textStatus, errorThrown){
+        $('#leaveCommunityError').show();
+        $('#leaveCommunityLoading').hide();
+      },
+    });
+  });
+
+  $('#joinCommunity').click(function(){
+    $('#joinCommunityLoading').show();
+    $('#joinCommunityLink').hide();
+    $.ajax({
+      type: 'GET',
+      url: openpne.apiBase + 'community/join.json',
+      data: 'community_id=<?php echo $community->getId() ?>&apiKey=' + openpne.apiKey,
+      success: function(json){
+        $('#joinCommunityFinish').show();
+        $('#joinCommunityLoading').hide();
+      },
+      error: function(XMLHttpRequest, textStatus, errorThrown){
+        $('#joinCommunityError').show();
+        $('#joinCommunityLoading').hide();
+      },
+    });
+  });
+
+});
+</script>
diff --git a/apps/pc_frontend/modules/member/templates/smtProfileSuccess.php b/apps/pc_frontend/modules/member/templates/smtProfileSuccess.php
index 92a0e4b5a..74ddae25f 100644
--- a/apps/pc_frontend/modules/member/templates/smtProfileSuccess.php
+++ b/apps/pc_frontend/modules/member/templates/smtProfileSuccess.php
@@ -9,10 +9,33 @@
 <?php else: ?>
 <?php if (!$relation->isFriend() && opConfig::get('enable_friend_link') && $relation->isAllowed($sf_user->getRawValue()->getMember(), 'friend_link')): ?>
 <?php ob_start() ?>
+<script type="text/javascript">
+$(function(){
+  $('#addFriend').click(function(){
+    $('#addFriendLinkLoading').show();
+    $('#addFriendLink').hide();
+    $.ajax({
+      type: 'GET',
+      url: openpne.apiBase + 'member/friend_request.json',
+      data: 'member_id=<?php echo $member->getId() ?>&apiKey=' + openpne.apiKey,
+      success: function(json){
+        $('#addFriendLinkFinish').show();
+        $('#addFriendLinkLoading').hide();
+      },
+      error: function(XMLHttpRequest, textStatus, errorThrown){
+        $('#addFriendLinkError').show();
+        $('#addFriendLinkLoading').hide();
+      },
+    });
+  });
+});
+</script>
 <div class="alert-message block-message warning">
-<p><?php echo __('If %1% is your friend, let us add to %my_friend% it!', array('%1%' => $member->getName(), '%my_friend%' => $op_term['my_friend']->pluralize())) ?><br />
-<?php echo link_to(__('Add %my_friend%', array('%my_friend%' => $op_term['my_friend']->pluralize())), 'friend/link?id='.$member->getId()) ?>
-</p>
+<p><?php echo __('If %1% is your friend, let us add to %my_friend% it!', array('%1%' => $member->getName(), '%my_friend%' => $op_term['my_friend']->pluralize())) ?></p>
+<p id="addFriendLink"><a href="#" id="addFriend"><?php echo __('Add %my_friend%', array('%my_friend%' => $op_term['my_friend']->pluralize())) ?></a></p>
+<p id="addFriendLinkLoading" class="hide"><?php echo op_image_tag('ajax-loader.gif') ?></p>
+<p id="addFriendLinkFinish" class="hide"><?php echo __('You have requested %friend% link.', array('%friend%' => $op_term['friend'])) ?></p>
+<p id="addFriendLinkError" class="hide"><?php echo __('%Friend% request is already sent.', array('%Friend%' => $op_term['friend'])) ?></p>
 </div>
 <?php $content = ob_get_clean() ?>
 <?php op_include_parts('descriptionBox', 'informationAboutThisIsYourProfilePage', array('body' => $content)) ?>

From d5c6eca8b913559f2e85e376e882c2d8bb21c9a0 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Mon, 20 Feb 2012 16:54:11 +0900
Subject: [PATCH 063/630] modified tosaka template for smartphone (refs #2227)

---
 apps/pc_frontend/templates/_tosaka.php | 10 +++---
 web/js/smt_notify.js                   | 42 +++++++++++++++++---------
 web/js/smt_tosaka.js                   |  2 +-
 3 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/apps/pc_frontend/templates/_tosaka.php b/apps/pc_frontend/templates/_tosaka.php
index 0c700c478..99f33b42f 100644
--- a/apps/pc_frontend/templates/_tosaka.php
+++ b/apps/pc_frontend/templates/_tosaka.php
@@ -15,24 +15,24 @@
 <!-- NCFORM TMPL -->
 
 <script id="pushListTemplate" type="text/x-jquery-tmpl">
-    <div class="{{if unread==false}}isread {{/if}}{{if category=="message" || category=="other"}}divlink {{/if}}row push"  data-notify-id="${id}" data-location-url="${url}" data-member-id="${member_id_from}">
+    <div class="{{if unread==false}}isread {{/if}}{{if category=="message" || category=="other"}}nclink {{/if}}row push"  data-notify-id="${id}" data-location-url="${url}" data-member-id="${member_id_from}">
       <div class="span3 push_icon">
         <img style="margin-left: 5px;" src="${icon_url}" class="rad4" width="48" height="48">
       </div>
       <div class="span9 push_content">
         <div class="row">
           {{if category=="link" && unread==false}}
-          フレンドリンクが来ました。
+          <?php echo __('Friend link request has come.'); ?>
           {{else}}
           {{html body}}
           {{/if}}
         </div>
         {{if category=="link"}}
-        <div class="row">
+        <div class="row{{if unread==false}} hide{{/if}}">
             <button class="span2 btn primary small friend-notify-button friend-accept">YES</button>
             <button class="span2 btn small friend-notify-button friend-reject">NO</button>
-            <div class="center hide" id="ncfriendloading"><?php echo op_image_tag('ajax-loader.gif') ?></div>
-            <div class="center hide" id="ncfriendresultmessage"></div>
+            <div class="center hide ncfriendloading"><?php echo op_image_tag('ajax-loader.gif') ?></div>
+            <div class="center hide ncfriendresultmessage"></div>
         </div>
         {{/if}}
       </div>
diff --git a/web/js/smt_notify.js b/web/js/smt_notify.js
index e1bca671b..662a5d5c2 100644
--- a/web/js/smt_notify.js
+++ b/web/js/smt_notify.js
@@ -21,8 +21,9 @@
 				$(this).removeClass('hover');
 			})
 			$(this).click(function(){
-				$.getJSON( openpne.apiBase + 'push/read.json' , { 'id': notifyId, 'apiKey': openpne.apiKey }, function(d){});
-				window.location = linkUrl;
+				$.getJSON( openpne.apiBase + 'push/read.json' , { 'id': notifyId, 'apiKey': openpne.apiKey }, function(d){
+					window.location = linkUrl;
+				});
 			});
 		});
 	};
@@ -30,9 +31,9 @@
 	$.fn.friendLink = function(settings){
 		return this.each(function(){
 			$(this).click(function(){
-				$(settings.buttonElement).hide();
-				$(settings.ncfriendloadingElement).show();
-        var pushElement = $(this).parents('.push');
+				$(this).parent().find('.friend-notify-button').hide();
+				$(this).parent().find('.ncfriendloading:first').show();
+			        var pushElement = $(this).parents('.push');
 				var memberId = pushElement.attr('data-member-id');
 				var notifyId = pushElement.attr('data-notify-id');
 				$.getJSON( openpne.apiBase + 'push/read.json' , { 'id': notifyId, 'apiKey': openpne.apiKey }, function(d){});
@@ -43,12 +44,18 @@
 					dataType: 'json',
 					success: function(data) {
 						if(data.status=='success'){
-							$(settings.ncfriendloadingElement).hide();
-							$(settings.ncfriendresultmessageElement).text('フレンド申請を承認しました。');
+							$(this).parent().find('.ncfriendloading:first').hide();
+							$(this).parent().find('.ncfriendresultmessage').text('フレンド申請を承認しました。');
+							$(this).parent().find('.ncfriendresultmessage').show();
 						}else{
 							alert(data.message);
 						}   
-					}
+					},
+					error: function(r, s, e){
+						$(this).parent().find('.ncfriendloading:first').hide();
+						$(this).parent().find('.ncfriendresultmessage').text('既に承認済みか拒否済みです。');
+						$(this).parent().find('.ncfriendresultmessage').show(); 
+                                        }
 				});
 			});
 		});
@@ -58,9 +65,9 @@
 	$.fn.friendUnlink = function(settings){
 		return this.each(function(){
 			$(this).click(function(){
-				$(settings.buttonElement).hide();
-				$(settings.ncfriendloadingElement).show();
-        var pushElement = $(this).parents('.push');
+				$(this).parent().find('.friend-notify-button').hide();
+				$(this).parent().find('.ncfriendloading:first').show();
+			        var pushElement = $(this).parents('.push');
 				var memberId = pushElement.attr('data-member-id');
 				var notifyId = pushElement.attr('data-notify-id');
 				$.getJSON( openpne.apiBase + 'push/read.json' , { 'id': notifyId, 'apiKey': openpne.apiKey }, function(d){});
@@ -71,13 +78,18 @@
 					dataType: 'json',
 					success: function(data) {
 						if(data.status=='success'){
-							$(settings.ncfriendloadingElement).hide();
-							$(settings.ncfriendresultmessageElement).show();
-							$(settings.ncfriendresultmessageElement).text('フレンド申請を拒否しました。');
+							$(this).parent().find('.ncfriendloading:first').hide();
+							$(this).parent().find('.ncfriendresultmessage').text('フレンド申請を拒否しました。');
+							$(this).parent().find('.ncfriendresultmessage').show();
 						}else{
 							alert(data.message);
 						}   
-					}
+					},
+					error: function(r, s, e){
+						$(this).parent().find('.ncfriendloading:first').hide();
+						$(this).parent().find('.ncfriendresultmessage').text('既に承認済みか拒否済みです。');
+						$(this).parent().find('.ncfriendresultmessage').show(); 
+                                        }
 				});
 			});
 		});
diff --git a/web/js/smt_tosaka.js b/web/js/smt_tosaka.js
index 2f2eeb2a6..3e0cfccd5 100644
--- a/web/js/smt_tosaka.js
+++ b/web/js/smt_tosaka.js
@@ -7,13 +7,13 @@ $(document).ready(function(){
       if(json.status=='success')
       {
         $pushHtml = $("#pushListTemplate").tmpl(json.data);
-        $('.divlink', $pushHtml).pushLink();
 	$('.friend-accept', $pushHtml).friendLink({ buttonElement: '.friend-notify-button', ncfriendloadingElement: '#ncfriendloading', ncfriendresultmessageElement: '#ncfriendresultmessage', });
 	$('.friend-reject', $pushHtml).friendUnlink({ buttonElement: '.friend-notify-button', ncfriendloadingElement: '#ncfriendloading', ncfriendresultmessageElement: '#ncfriendresultmessage', })
         $("#pushList").html($pushHtml);
       }else{
         alert(json.message);
       }
+      $('.nclink').pushLink();
       $('#pushList').show();
       $('#pushLoading').hide();
     });

From 98f42881aa8c611dc5478cc9f98a50e26dff5038 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 23 Feb 2012 14:22:26 +0900
Subject: [PATCH 064/630] upgrade bootstrap.css to 2.0 (refs #2838)

---
 .../templates/_smtCommunityListBox.php        |    2 +-
 .../community/templates/smtEditSuccess.php    |   12 +-
 .../community/templates/smtJoinInput.php      |    2 +-
 .../community/templates/smtQuitSuccess.php    |    2 +-
 .../default/templates/_smtLoginFormBox.php    |    8 +-
 .../modules/default/templates/_smtMenu.php    |    6 +-
 .../modules/friend/templates/smtLinkInput.php |    2 +-
 .../member/templates/_smtProfileListBox.php   |    2 +-
 .../templates/smtConfigImageSuccess.php       |    2 +-
 .../member/templates/smtConfigSuccess.php     |    4 +-
 .../templates/smtEditProfileSuccess.php       |   24 +-
 .../member/templates/smtInviteSuccess.php     |    6 +-
 .../member/templates/smtProfileSuccess.php    |    4 +-
 apps/pc_frontend/templates/_tosaka.php        |   25 +-
 apps/pc_frontend/templates/smtLayoutGroup.php |    4 +-
 apps/pc_frontend/templates/smtLayoutHome.php  |    4 +-
 .../pc_frontend/templates/smtLayoutMember.php |    4 +-
 apps/pc_frontend/templates/smtLayoutSns.php   |    4 +-
 web/css/bootstrap.css                         | 4064 ++++++++++-------
 web/css/smt_main.css                          |   52 +
 web/img/glyphicons-halflings-white.png        |  Bin 0 -> 4352 bytes
 web/img/glyphicons-halflings.png              |  Bin 0 -> 4352 bytes
 22 files changed, 2597 insertions(+), 1636 deletions(-)
 create mode 100644 web/img/glyphicons-halflings-white.png
 create mode 100644 web/img/glyphicons-halflings.png

diff --git a/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php b/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php
index e34aab1b5..790577dcc 100644
--- a/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php
+++ b/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php
@@ -11,7 +11,7 @@
   </div>
 </div>
 <div class="row">
-<table class="zebra-striped">
+<table class="table-striped">
 <tbody>
 <tr>
   <td><?php echo __('Date Created') ?></td>
diff --git a/apps/pc_frontend/modules/community/templates/smtEditSuccess.php b/apps/pc_frontend/modules/community/templates/smtEditSuccess.php
index 6fff56c8f..fbd678b5e 100644
--- a/apps/pc_frontend/modules/community/templates/smtEditSuccess.php
+++ b/apps/pc_frontend/modules/community/templates/smtEditSuccess.php
@@ -23,7 +23,7 @@
 <?php endif; ?>
 <?php if ($errors): ?>
 <div class="row">
-<div class="alert-message block-message error">
+<div class="alert alert-error">
 <a class="close" href="#">x</a>
 <?php foreach ($errors as $error): ?>
 <p><?php echo __($error) ?></p>
@@ -40,7 +40,7 @@
   </div>
   <div class="span12 <?php echo $cf->hasError() ? 'clearfix error' : '' ?>">
     <?php if ($cf->hasError()): ?>
-    <span class="label important"><?php echo __($cf->getError()) ?></span>
+    <span class="label label-important"><?php echo __($cf->getError()) ?></span>
     <?php endif ?>
     <?php echo $cf->render(array('class' => 'span12')) ?>
     <span class="help-block"><?php echo $cf->renderHelp() ?></span>
@@ -55,7 +55,7 @@
   <div class="span12"><?php echo $ccf->renderLabel() ?></div>
   <div class="<?php echo $ccf->hasError() ? 'clearfix error' : '' ?>">
     <?php if ($ccf->hasError()): ?>
-    <span class="label important"><?php echo __($ccf->getError()) ?></span>
+    <span class="label label-important"><?php echo __($ccf->getError()) ?></span>
     <?php endif ?>
     <?php echo $ccf->render(array('class' => 'span12')) ?>
     <span class="help-block"><?php echo $ccf->renderHelp() ?></span>
@@ -70,7 +70,7 @@
   <div class="span12"><?php echo $cff->renderLabel(); ?></div>
   <div class="span12 <? echo $cff->hasError() ? 'clearfix error' : '' ?>">
     <?php if ($cff->hasError()): ?>
-    <span class="label important"><?php echo __($cff->getError()) ?></span>
+    <span class="label label-important"><?php echo __($cff->getError()) ?></span>
     <?php endif ?>
     <?php echo $cff->render(array('class' => 'span12')) ?>
     <span class="help-block"><?php echo $cff->renderHelp() ?></span>
@@ -81,7 +81,7 @@
 
 <div class="row">
 <div class="span5">
-<input type="submit" name="submit" value="<?php echo __('Send') ?>" class="btn primary" />
+<input type="submit" name="submit" value="<?php echo __('Send') ?>" class="btn btn-primary" />
 <?php echo $communityForm->renderHiddenFields(); ?>
 <?php echo $communityConfigForm->renderHiddenFields(); ?>
 <?php echo $communityFileForm->renderHiddenFields(); ?>
@@ -91,7 +91,7 @@
 <div class="span5">
   <?php if (!$communityForm->isNew() && $isDeleteCommunity): ?>
   <?php echo form_tag(url_for('@community_delete?id='.$community->getId())) ?>
-  <span class="label important">DANGER</span>: <input type="submit" name="submit" value="<?php echo __('Delete'); ?>" class="btn danger" />
+  <span class="label label-important">DANGER</span>: <input type="submit" name="submit" value="<?php echo __('Delete'); ?>" class="btn btn-danger" />
   </form>
   <?php endif; ?>
 </div>
diff --git a/apps/pc_frontend/modules/community/templates/smtJoinInput.php b/apps/pc_frontend/modules/community/templates/smtJoinInput.php
index f933ee961..52b4e8e35 100644
--- a/apps/pc_frontend/modules/community/templates/smtJoinInput.php
+++ b/apps/pc_frontend/modules/community/templates/smtJoinInput.php
@@ -17,7 +17,7 @@
     </div>
     <?php endif; ?>
     <?php endforeach; ?>
-    <div class="center"><input type="submit" name="submit" value="<?php echo __('Send') ?>" class="btn primary" /></div>
+    <div class="center"><input type="submit" name="submit" value="<?php echo __('Send') ?>" class="btn btn-primary" /></div>
     <?php echo $form->renderHiddenFields(); ?>
     </form>
   </div>
diff --git a/apps/pc_frontend/modules/community/templates/smtQuitSuccess.php b/apps/pc_frontend/modules/community/templates/smtQuitSuccess.php
index fec4fdd33..2b5532ec0 100644
--- a/apps/pc_frontend/modules/community/templates/smtQuitSuccess.php
+++ b/apps/pc_frontend/modules/community/templates/smtQuitSuccess.php
@@ -17,7 +17,7 @@
     </div>
     <?php endif; ?>
     <?php endforeach; ?>
-    <input type="submit" name="submit" value="<?php echo __('Send') ?>" class="btn danger" />
+    <input type="submit" name="submit" value="<?php echo __('Send') ?>" class="btn btn-danger" />
     <?php echo $form->renderHiddenFields(); ?>
     </form>
   </div>
diff --git a/apps/pc_frontend/modules/default/templates/_smtLoginFormBox.php b/apps/pc_frontend/modules/default/templates/_smtLoginFormBox.php
index c029cb0bb..6eb9dd230 100644
--- a/apps/pc_frontend/modules/default/templates/_smtLoginFormBox.php
+++ b/apps/pc_frontend/modules/default/templates/_smtLoginFormBox.php
@@ -8,7 +8,7 @@
 <?php endif; ?>
 <?php if ($errors): ?>
 <div class="row">
-<div class="alert-message block-message error">
+<div class="alert alert-error">
 <a class="close" href="#">x</a>
 <?php foreach ($errors as $error): ?>
 <p><?php echo __($error) ?></p>
@@ -27,7 +27,7 @@
   </div>
   <div class="span3 <?php echo $field->hasError() ? 'clearfix error' : '' ?>">
     <?php if ($field->hasError()): ?>
-    <span class="label important"><?php echo __($field->getError()); ?>
+    <span class="label label-important"><?php echo __($field->getError()); ?>
     <?php endif; ?>
     <?php echo $field->render(); ?>
     <span class="help-block"><?php echo $field->renderHelp(); ?></span>
@@ -41,7 +41,7 @@
   </div>
   <div class="span12 <?php echo $field->hasError() ? 'clearfix error' : '' ?>">
     <?php if ($field->hasError()): ?>
-    <span class="label important"><?php echo __($field->getError()) ?></span>
+    <span class="label label-important"><?php echo __($field->getError()) ?></span>
     <?php endif ?>
     <?php if (in_array($field->getWidget()->getOption('type'), array('text', 'password'))): ?>
     <?php echo $field->render(array('class' => 'span12')); ?>
@@ -57,7 +57,7 @@
 
 <div class="row">
 <div class="span12">
-<input type="submit" name="submit" value="<?php echo __('Login'); ?>" class="btn primary span12" />
+<input type="submit" name="submit" value="<?php echo __('Login'); ?>" class="btn btn-primary span12" />
 <?php echo $form->renderHiddenFields(); ?>
 </form>
 </div>
diff --git a/apps/pc_frontend/modules/default/templates/_smtMenu.php b/apps/pc_frontend/modules/default/templates/_smtMenu.php
index d18134429..906ae329e 100644
--- a/apps/pc_frontend/modules/default/templates/_smtMenu.php
+++ b/apps/pc_frontend/modules/default/templates/_smtMenu.php
@@ -1,8 +1,10 @@
 <!-- MENUFORM TMPL -->
 <div class="menuform hide toggle1">
   <div class="row">
-    <div class="span10 offset1 center white font14 toggle1_close">
-      MENU
+    <div class="span10 offset1 white font14 toggle1_close">
+      <div class="center">
+        MENU
+      </div>
     </div>
     <div class="span1">
       <?php echo op_image_tag('UPARROW', array('class' => 'toggle1_close')) ?>
diff --git a/apps/pc_frontend/modules/friend/templates/smtLinkInput.php b/apps/pc_frontend/modules/friend/templates/smtLinkInput.php
index 48ebd36a7..4f5e5068a 100644
--- a/apps/pc_frontend/modules/friend/templates/smtLinkInput.php
+++ b/apps/pc_frontend/modules/friend/templates/smtLinkInput.php
@@ -16,7 +16,7 @@
     </div>
     <?php endif; ?>
     <?php endforeach; ?>
-    <input type="submit" name="submit" value="<?php echo __('Send') ?>" class="btn primary" />
+    <input type="submit" name="submit" value="<?php echo __('Send') ?>" class="btn btn-primary" />
     <?php echo $form->renderHiddenFields(); ?>
     </form>
   </div>
diff --git a/apps/pc_frontend/modules/member/templates/_smtProfileListBox.php b/apps/pc_frontend/modules/member/templates/_smtProfileListBox.php
index 514374417..53ad4cdb1 100644
--- a/apps/pc_frontend/modules/member/templates/_smtProfileListBox.php
+++ b/apps/pc_frontend/modules/member/templates/_smtProfileListBox.php
@@ -42,7 +42,7 @@
   <div class="gadget_header span12"><?php echo __('Profile') ?></div>
 </div>
 <div class="row">
-<table class="zebra-striped">
+<table class="table-striped span12">
 <tbody>
 <tr><td><?php echo $op_term['nickname'] ?></td><td><?php echo $member->getName(); ?></td></tr>
 <?php foreach ($list as $k => $v): ?>
diff --git a/apps/pc_frontend/modules/member/templates/smtConfigImageSuccess.php b/apps/pc_frontend/modules/member/templates/smtConfigImageSuccess.php
index d938dd4bc..7b58cba35 100644
--- a/apps/pc_frontend/modules/member/templates/smtConfigImageSuccess.php
+++ b/apps/pc_frontend/modules/member/templates/smtConfigImageSuccess.php
@@ -21,7 +21,7 @@
 <?php echo $form->renderFormTag(url_for('member/configImage')) ?>
 <?php echo $form['file'] ?>
 <?php echo $form->renderHiddenFields(); ?>
-<input type="submit" name="submit" value="<?php echo __('Upload') ?>" class="btn primary" />
+<input type="submit" name="submit" value="<?php echo __('Upload') ?>" class="btn btn-primary" />
 </form>
 <?php if (3 >= $sf_user->getMember()->getMemberImage()->count()): ?>
 <?php echo __('Send E-mail that has a photo to use as your image.') ?><br>
diff --git a/apps/pc_frontend/modules/member/templates/smtConfigSuccess.php b/apps/pc_frontend/modules/member/templates/smtConfigSuccess.php
index 73365f8ee..6c87b7e83 100644
--- a/apps/pc_frontend/modules/member/templates/smtConfigSuccess.php
+++ b/apps/pc_frontend/modules/member/templates/smtConfigSuccess.php
@@ -26,7 +26,7 @@
 <?php endif; ?>
 <?php if ($errors): ?>
 <div class="row">
-<div class="alert-message block-message error">
+<div class="alert alert-error">
 <?php foreach ($errors as $error): ?>
 <p><?php echo __($error) ?></p>
 <?php endforeach; ?>
@@ -44,7 +44,7 @@
 </div>
 <?php endif; ?>
 <?php endforeach; ?>
-<input type="submit" name="submit" value="<?php echo __('Send') ?>" class="btn danger" />
+<input type="submit" name="submit" value="<?php echo __('Send') ?>" class="btn btn-danger" />
 <?php echo $form->renderHiddenFields(); ?>
 </form>
 </div>
diff --git a/apps/pc_frontend/modules/member/templates/smtEditProfileSuccess.php b/apps/pc_frontend/modules/member/templates/smtEditProfileSuccess.php
index 0d54d0b42..500ddfa9d 100644
--- a/apps/pc_frontend/modules/member/templates/smtEditProfileSuccess.php
+++ b/apps/pc_frontend/modules/member/templates/smtEditProfileSuccess.php
@@ -13,7 +13,7 @@
 
 <?php if ($errors): ?>
 <div class="row">
-<div class="alert-message block-message error">
+<div class="alert alert-error">
 <a class="close" href="#">x</a>
 <?php foreach ($errors as $error): ?>
 <p><?php echo __($error) ?></p>
@@ -22,18 +22,18 @@
 </div>
 <?php endif; ?>
 
-<div class="row">
-<table class="zebra-striped">
+<div class="row" style="margin-left: 0px;">
+<table class="table-striped">
 <?php foreach ($memberForm as $mf): ?>
 <?php if (!$mf->isHidden()): ?>
 <tr>
-  <th><?php echo $mf->renderLabel(); ?></th>
   <td>
+  <div class="form-label span12"><?php echo $mf->renderLabel() ?></div>
   <div class="<?php echo $mf->hasError() ? 'clearfix error' : '' ?>">
     <?php if ($mf->hasError()): ?>
-    <span class="label important"><?php echo __($mf->getError()); ?></span>
+    <span class="label label-important"><?php echo __($mf->getError()); ?></span>
     <?php endif ?>
-    <?php echo $mf->render(array('class' => 'span16')) ?>
+    <?php echo $mf->render(array('class' => 'span12')) ?>
     <span class="help-block"><?php echo $mf->renderHelp(); ?></span>
   </div>
   </td>
@@ -43,16 +43,16 @@
 <?php foreach ($profileForm as $pf): ?>
 <?php if (!$pf->isHidden()): ?>
 <tr>
-  <th><?php echo $pf->renderLabel(); ?></th>
   <td>
+  <div class="form-label span12"><?php echo $pf->renderLabel() ?></div>
   <div class="<?php $mf->hasError() ? 'clearfix error' : '' ?>">
     <?php if ($mf->hasError()): ?>
-    <span class="label important"><?php echo __($pf->getError()); ?></span>
+    <span class="label label-important"><?php echo __($pf->getError()); ?></span>
     <?php endif ?>
     <?php if ($pf->getWidget()->getOption('widget') instanceof sfWidgetFormDate): ?>
     <?php echo $pf->render(array('class' => 'span8')) ?>
     <?php else: ?>
-    <?php echo $pf->render(array('class' => 'span16')) ?>
+    <?php echo $pf->render(array('class' => 'span12')) ?>
     <?php endif ?>
     <span class="help-block"><?php echo $pf->renderHelp() ?></span>
   </div>
@@ -63,6 +63,10 @@
 <?php echo $memberForm->renderHiddenFields(); ?>
 <?php echo $profileForm->renderHiddenFields(); ?>
 </table>
-<input type="submit" name="subtmi" value="<?php echo __('Send') ?>" class="btn primary" />
+<div class="center">
+<input type="submit" name="submit" value="<?php echo __('Send') ?>" class="btn btn-primary" />
+<input type="reset" name="reset" value="<?php echo __('Reset') ?>" class="btn btn-danger" />
+</div>
+
 </form>
 </div>
diff --git a/apps/pc_frontend/modules/member/templates/smtInviteSuccess.php b/apps/pc_frontend/modules/member/templates/smtInviteSuccess.php
index a0e759842..76eabca86 100644
--- a/apps/pc_frontend/modules/member/templates/smtInviteSuccess.php
+++ b/apps/pc_frontend/modules/member/templates/smtInviteSuccess.php
@@ -8,7 +8,7 @@
 <?php endif; ?>
 <?php if ($errors): ?>
 <div class="row">
-<div class="alert-message block-message error">
+<div class="alert alert-error">
 <a class="close" href="#">x</a>
 <?php foreach ($errors as $error): ?>
 <p><?php echo __($error) ?></p>
@@ -25,7 +25,7 @@
 </div>
 <div class="span12 <?php echo $f->hasError() ? 'clearfix error' : '' ?>">
   <?php if ($f->hasError()): ?>
-  <span class="label important"><?php echo __($f->getError()) ?></span><br>
+  <span class="label label-important"><?php echo __($f->getError()) ?></span><br>
   <?php endif ?>
   <?php echo $f->render(array('class' => 'span12')) ?>
   <span class="help-block"><?php echo $f->renderHelp() ?></span>
@@ -33,6 +33,6 @@
 <?php endif; ?>
 <?php endforeach; ?>
 <?php echo $form->renderHiddenFields(); ?>
-<input type="submit" name="submit" value="<?php echo __('Send'); ?>" class="btn primary" />
+<input type="submit" name="submit" value="<?php echo __('Send'); ?>" class="btn btn-primary" />
 </form>
 </div>
diff --git a/apps/pc_frontend/modules/member/templates/smtProfileSuccess.php b/apps/pc_frontend/modules/member/templates/smtProfileSuccess.php
index 74ddae25f..f81e84be1 100644
--- a/apps/pc_frontend/modules/member/templates/smtProfileSuccess.php
+++ b/apps/pc_frontend/modules/member/templates/smtProfileSuccess.php
@@ -1,6 +1,6 @@
 <?php if ($relation->isSelf()): ?>
 <?php ob_start() ?>
-<div class="alert-message block-message info">
+<div class="alert alert-info">
 <p><?php echo __('Other members look your page like this.') ?></p>
 <p><?php echo link_to(__('Edit profile'), '@member_editProfile') ?></p>
 </div>
@@ -30,7 +30,7 @@
   });
 });
 </script>
-<div class="alert-message block-message warning">
+<div class="alert alert-warning">
 <p><?php echo __('If %1% is your friend, let us add to %my_friend% it!', array('%1%' => $member->getName(), '%my_friend%' => $op_term['my_friend']->pluralize())) ?></p>
 <p id="addFriendLink"><a href="#" id="addFriend"><?php echo __('Add %my_friend%', array('%my_friend%' => $op_term['my_friend']->pluralize())) ?></a></p>
 <p id="addFriendLinkLoading" class="hide"><?php echo op_image_tag('ajax-loader.gif') ?></p>
diff --git a/apps/pc_frontend/templates/_tosaka.php b/apps/pc_frontend/templates/_tosaka.php
index 99f33b42f..8e6cfb995 100644
--- a/apps/pc_frontend/templates/_tosaka.php
+++ b/apps/pc_frontend/templates/_tosaka.php
@@ -1,8 +1,10 @@
 <!-- NCFORM TMPL -->
 <div class="ncform hide toggle1">
   <div class="row">
-    <div class="span10 offset1 center white font14 toggle1_close">
-      通知センター
+    <div class="span10 offset1 white font14 toggle1_close">
+      <div class="center">
+      <?php echo __('Notification Center') ?>
+      </div>
     </div>
     <div class="span1">
       <?php echo op_image_tag('UPARROW', array('class' => 'toggle1_close')) ?>
@@ -29,7 +31,7 @@
         </div>
         {{if category=="link"}}
         <div class="row{{if unread==false}} hide{{/if}}">
-            <button class="span2 btn primary small friend-notify-button friend-accept">YES</button>
+            <button class="span2 btn btn-primary small friend-notify-button friend-accept">YES</button>
             <button class="span2 btn small friend-notify-button friend-reject">NO</button>
             <div class="center hide ncfriendloading"><?php echo op_image_tag('ajax-loader.gif') ?></div>
             <div class="center hide ncfriendresultmessage"></div>
@@ -40,13 +42,13 @@
 </script>
 <script id="pushCountTemplate" type="text/x-jquery-tmpl">
   {{if message!==0}}
-  <span class="nc_icon1 label important" id="nc_count1">${message}</span>
+  <span class="nc_icon1 label label-important" id="nc_count1">${message}</span>
   {{/if}}
   {{if link!==0}}
-  <span class="nc_icon2 label important" id="nc_count2">${link}</span>
+  <span class="nc_icon2 label label-important" id="nc_count2">${link}</span>
   {{/if}}
   {{if other!==0}}
-  <span class="nc_icon3 label important" id="nc_count3">${other}</span>
+  <span class="nc_icon3 label label-important" id="nc_count3">${other}</span>
   {{/if}}
 </script>
 
@@ -56,8 +58,10 @@
 <!-- POSTFORM TMPL -->
 <div class="postform hide toggle1">
   <div class="row">
-    <div class="span10 offset1 center white font14 toggle1_close">
-      投稿フォーム
+    <div class="span10 offset1 white font14 toggle1_close">
+      <div class="center">
+      <?php echo __('Post form') ?>
+      </div>
     </div>
     <div class="span1">
       <?php echo op_image_tag('UPARROW', array('class' => 'toggle1_close')) ?>
@@ -67,7 +71,8 @@
     <textarea id="tosaka_postform_body" class="span12" rows="4"></textarea>
   </div>
   <div class="row">
-    <button id="tosaka_postform_submit" class="span10 offset1 btn small primary">POST</button>
+    <button id="tosaka_postform_submit" class="span10 offset1 btn small btn-primary"><?php echo __('%post_activity%') ?></button>
+    <div class="center hide" id="timelinePostLoading"><?php echo op_image_tag('ajax-loader.gif') ?></div>
   </div>
 </div>
 <!-- POSTFORM TMPL -->
@@ -79,7 +84,7 @@
         <div class="span4"><?php echo op_image_tag('LOGO.png', array('height' => '32', 'class' => 'menubutton')); ?></div>
         <div id="notification_center" class="span4 center"><?php echo op_image_tag('NOTIFY_CENTER.png', array('height' => '32', 'class' => 'ncbutton')) ?>
         </div>
-        <div class="span3 offset1 center"><?php echo op_image_tag('POST.png', array('height' => '32', 'class' =>'postbutton')) ?></div>
+        <div class="span3 offset1"><?php echo op_image_tag('POST.png', array('height' => '32', 'class' =>'postbutton')) ?></div>
       </div>
     </div>
   </div>
diff --git a/apps/pc_frontend/templates/smtLayoutGroup.php b/apps/pc_frontend/templates/smtLayoutGroup.php
index c52bbda81..c33f95c7a 100644
--- a/apps/pc_frontend/templates/smtLayoutGroup.php
+++ b/apps/pc_frontend/templates/smtLayoutGroup.php
@@ -49,7 +49,7 @@
 
 <?php if ($sf_user->hasFlash('error')): ?>
 <div id="global-error" class="row">
-  <div class="alert-message block-message error">
+  <div class="alert alert-error">
     <?php echo __($sf_user->getFlash('error')); ?>
   </div>
 </div>
@@ -57,7 +57,7 @@
 
 <?php if ($sf_user->hasFlash('notice')): ?>
 <div id="global-error" class="row">
-  <div class="alert-message block-message info">
+  <div class="alert alert-info">
     <?php echo __($sf_user->getFlash('notice')); ?>
   </div>
 </div>
diff --git a/apps/pc_frontend/templates/smtLayoutHome.php b/apps/pc_frontend/templates/smtLayoutHome.php
index fba74c85d..c9ed3f7c0 100644
--- a/apps/pc_frontend/templates/smtLayoutHome.php
+++ b/apps/pc_frontend/templates/smtLayoutHome.php
@@ -52,7 +52,7 @@
 
 <?php if ($sf_user->hasFlash('error')): ?>
 <div id="global-error" class="row">
-  <div class="alert-message block-message error">
+  <div class="alert alert-error">
     <?php echo __($sf_user->getFlash('error')); ?>
   </div>
 </div>
@@ -60,7 +60,7 @@
 
 <?php if ($sf_user->hasFlash('notice')): ?>
 <div id="global-error" class="row">
-  <div class="alert-message block-message info">
+  <div class="alert alert-info">
     <?php echo __($sf_user->getFlash('notice')); ?>
   </div>
 </div>
diff --git a/apps/pc_frontend/templates/smtLayoutMember.php b/apps/pc_frontend/templates/smtLayoutMember.php
index 1b44287cb..2729f0f2f 100644
--- a/apps/pc_frontend/templates/smtLayoutMember.php
+++ b/apps/pc_frontend/templates/smtLayoutMember.php
@@ -55,7 +55,7 @@
 
 <?php if ($sf_user->hasFlash('error')): ?>
 <div id="global-error" class="row">
-  <div class="alert-message block-message error">
+  <div class="alert alert-error">
     <?php echo __($sf_user->getFlash('error')); ?>
   </div>
 </div>
@@ -63,7 +63,7 @@
 
 <?php if ($sf_user->hasFlash('notice')): ?>
 <div id="global-error" class="row">
-  <div class="alert-message block-message info">
+  <div class="alert alert-info">
     <?php echo __($sf_user->getFlash('notice')); ?>
   </div>
 </div>
diff --git a/apps/pc_frontend/templates/smtLayoutSns.php b/apps/pc_frontend/templates/smtLayoutSns.php
index 0dd91cf9a..ef1006b2f 100644
--- a/apps/pc_frontend/templates/smtLayoutSns.php
+++ b/apps/pc_frontend/templates/smtLayoutSns.php
@@ -56,7 +56,7 @@
 
 <?php if ($sf_user->hasFlash('error')): ?>
 <div id="global-error" class="row">
-  <div class="alert-message block-message error">
+  <div class="alert alert-error">
     <?php echo __($sf_user->getFlash('error')); ?>
   </div>
 </div>
@@ -64,7 +64,7 @@
 
 <?php if ($sf_user->hasFlash('notice')): ?>
 <div id="global-error" class="row">
-  <div class="alert-message block-message info">
+  <div class="alert alert-info">
     <?php echo __($sf_user->getFlash('notice')); ?>
   </div>
 </div>
diff --git a/web/css/bootstrap.css b/web/css/bootstrap.css
index 63711555a..2ef76098f 100644
--- a/web/css/bootstrap.css
+++ b/web/css/bootstrap.css
@@ -1,102 +1,12 @@
 /*!
- * Bootstrap @VERSION
+ * Bootstrap v2.0.0
  *
- * Copyright 2011 Twitter, Inc
+ * Copyright 2012 Twitter, Inc
  * Licensed under the Apache License v2.0
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: @DATE
  */
-/* Reset.less
- * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here	that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
- * ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */
-html, body {
-  margin: 0;
-  padding: 0;
-}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-p,
-blockquote,
-pre,
-a,
-abbr,
-acronym,
-address,
-cite,
-code,
-del,
-dfn,
-em,
-img,
-q,
-s,
-samp,
-small,
-strike,
-strong,
-sub,
-sup,
-tt,
-var,
-dd,
-dl,
-dt,
-li,
-ol,
-ul,
-fieldset,
-form,
-label,
-legend,
-button,
-table,
-caption,
-tbody,
-tfoot,
-thead,
-tr,
-th,
-td {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  font-weight: normal;
-  font-style: normal;
-  font-size: 100%;
-  line-height: 1;
-  font-family: inherit;
-}
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-ol, ul {
-  list-style: none;
-}
-q:before,
-q:after,
-blockquote:before,
-blockquote:after {
-  content: "";
-}
-html {
-  overflow-y: scroll;
-  font-size: 100%;
-  -webkit-text-size-adjust: 100%;
-  -ms-text-size-adjust: 100%;
-}
-a:focus {
-  outline: thin dotted;
-}
-a:hover, a:active {
-  outline: 0;
-}
 article,
 aside,
 details,
@@ -117,10 +27,23 @@ audio, canvas, video {
 audio:not([controls]) {
   display: none;
 }
+html {
+  font-size: 100%;
+  -webkit-text-size-adjust: 100%;
+  -ms-text-size-adjust: 100%;
+}
+a:focus {
+  outline: thin dotted;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+a:hover, a:active {
+  outline: 0;
+}
 sub, sup {
+  position: relative;
   font-size: 75%;
   line-height: 0;
-  position: relative;
   vertical-align: baseline;
 }
 sup {
@@ -130,6 +53,8 @@ sub {
   bottom: -0.25em;
 }
 img {
+  max-width: 100%;
+  height: auto;
   border: 0;
   -ms-interpolation-mode: bicubic;
 }
@@ -137,18 +62,17 @@ button,
 input,
 select,
 textarea {
-  font-size: 100%;
   margin: 0;
-  vertical-align: baseline;
-  *vertical-align: middle;
+  font-size: 100%;
+  vertical-align: middle;
 }
 button, input {
-  line-height: normal;
   *overflow: visible;
+  line-height: normal;
 }
 button::-moz-focus-inner, input::-moz-focus-inner {
-  border: 0;
   padding: 0;
+  border: 0;
 }
 button,
 input[type="button"],
@@ -163,106 +87,41 @@ input[type="search"] {
   -moz-box-sizing: content-box;
   box-sizing: content-box;
 }
-input[type="search"]::-webkit-search-decoration {
+input[type="search"]::-webkit-search-decoration, input[type="search"]::-webkit-search-cancel-button {
   -webkit-appearance: none;
 }
 textarea {
   overflow: auto;
   vertical-align: top;
 }
-/* Variables.less
- * Variables to customize the look and feel of Bootstrap
- * ----------------------------------------------------- */
-/* Mixins.less
- * Snippets of reusable CSS to develop faster and keep code readable
- * ----------------------------------------------------------------- */
-/*
- * Scaffolding
- * Basic and global styles for generating a grid system, structural layout, and page templates
- * ------------------------------------------------------------------------------------------- */
 body {
-  background-color: #ffffff;
   margin: 0;
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 13px;
-  font-weight: normal;
   line-height: 18px;
-  color: #404040;
-}
-.container {
-  width: 320px;
-  margin-left: auto;
-  margin-right: auto;
-  zoom: 1;
-}
-.container:before, .container:after {
-  display: table;
-  content: "";
-  zoom: 1;
-}
-.container:after {
-  clear: both;
-}
-.container-fluid {
-  position: relative;
-  min-width: 940px;
-  padding-left: 20px;
-  padding-right: 20px;
-  zoom: 1;
-}
-.container-fluid:before, .container-fluid:after {
-  display: table;
-  content: "";
-  zoom: 1;
-}
-.container-fluid:after {
-  clear: both;
-}
-.container-fluid > .sidebar {
-  position: absolute;
-  top: 0;
-  left: 20px;
-  width: 220px;
-}
-.container-fluid > .content {
-  margin-left: 240px;
+  color: #333333;
+  background-color: #ffffff;
 }
 a {
-  color: #0069d6;
+  color: #0088cc;
   text-decoration: none;
-  line-height: inherit;
-  font-weight: inherit;
 }
 a:hover {
-  color: #00438a;
+  color: #005580;
   text-decoration: underline;
 }
-.pull-right {
-  float: right;
-}
-.pull-left {
-  float: left;
-}
-.hide {
-  display: none;
-}
-.show {
-  display: block;
-}
 .row {
-  zoom: 1;
   margin-left: -4px;
+  *zoom: 1;
 }
 .row:before, .row:after {
   display: table;
   content: "";
-  zoom: 1;
 }
 .row:after {
   clear: both;
 }
-.row > [class*="span"] {
-  display: inline;
+[class*="span"] {
   float: left;
   margin-left: 4px;
 }
@@ -299,105 +158,136 @@ a:hover {
 .span11 {
   width: 293px;
 }
-.span12 {
+.span12, .container {
   width: 320px;
 }
-.span13 {
-  width: 347px;
+.offset1 {
+  margin-left: 31px;
 }
-.span14 {
-  width: 374px;
+.offset2 {
+  margin-left: 58px;
 }
-.span15 {
-  width: 401px;
+.offset3 {
+  margin-left: 85px;
 }
-.span16 {
-  width: 428px;
+.offset4 {
+  margin-left: 112px;
 }
-.span17 {
-  width: 455px;
+.offset5 {
+  margin-left: 139px;
 }
-.span18 {
-  width: 482px;
+.offset6 {
+  margin-left: 166px;
 }
-.span19 {
-  width: 509px;
+.offset7 {
+  margin-left: 193px;
 }
-.span20 {
-  width: 536px;
+.offset8 {
+  margin-left: 220px;
 }
-.span21 {
-  width: 563px;
+.offset9 {
+  margin-left: 247px;
 }
-.span22 {
-  width: 590px;
+.offset10 {
+  margin-left: 274px;
 }
-.span23 {
-  width: 617px;
+.offset11 {
+  margin-left: 301px;
 }
-.span24 {
-  width: 644px;
+.row-fluid {
+  width: 100%;
+  *zoom: 1;
 }
-.row > .offset1 {
-  margin-left: 31px;
+.row-fluid:before, .row-fluid:after {
+  display: table;
+  content: "";
 }
-.row > .offset2 {
-  margin-left: 58px;
+.row-fluid:after {
+  clear: both;
 }
-.row > .offset3 {
-  margin-left: 85px;
+.row-fluid > [class*="span"] {
+  float: left;
+  margin-left: 2.127659574%;
 }
-.row > .offset4 {
-  margin-left: 112px;
+.row-fluid > [class*="span"]:first-child {
+  margin-left: 0;
 }
-.row > .offset5 {
-  margin-left: 139px;
+.row-fluid .span1 {
+  width: 6.382978723%;
 }
-.row > .offset6 {
-  margin-left: 166px;
+.row-fluid .span2 {
+  width: 14.89361702%;
 }
-.row > .offset7 {
-  margin-left: 193px;
+.row-fluid .span3 {
+  width: 23.404255317%;
 }
-.row > .offset8 {
-  margin-left: 220px;
+.row-fluid .span4 {
+  width: 31.914893614%;
 }
-.row > .offset9 {
-  margin-left: 247px;
+.row-fluid .span5 {
+  width: 40.425531911%;
 }
-.row > .offset10 {
-  margin-left: 274px;
+.row-fluid .span6 {
+  width: 48.93617020799999%;
 }
-.row > .offset11 {
-  margin-left: 301px;
+.row-fluid .span7 {
+  width: 57.446808505%;
+}
+.row-fluid .span8 {
+  width: 65.95744680199999%;
+}
+.row-fluid .span9 {
+  width: 74.468085099%;
+}
+.row-fluid .span10 {
+  width: 82.97872339599999%;
+}
+.row-fluid .span11 {
+  width: 91.489361693%;
+}
+.row-fluid .span12 {
+  width: 99.99999998999999%;
+}
+.container {
+  width: 320px;
+  margin-left: auto;
+  margin-right: auto;
+  *zoom: 1;
 }
-.row > .offset12 {
-  margin-left: 328px;
+.container:before, .container:after {
+  display: table;
+  content: "";
 }
-.span-one-third {
-  width: 300px;
+.container:after {
+  clear: both;
 }
-.span-two-thirds {
-  width: 620px;
+.container-fluid {
+  padding-left: 4px;
+  padding-right: 4px;
+  *zoom: 1;
 }
-.row > .offset-one-third {
-  margin-left: 340px;
+.container-fluid:before, .container-fluid:after {
+  display: table;
+  content: "";
 }
-.row > .offset-two-thirds {
-  margin-left: 660px;
+.container-fluid:after {
+  clear: both;
 }
-/* Typography.less
- * Headings, body text, lists, code, and more for a versatile and durable typography system
- * ---------------------------------------------------------------------------------------- */
 p {
+  margin: 0 0 9px;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 13px;
-  font-weight: normal;
   line-height: 18px;
-  margin-bottom: 9px;
 }
 p small {
   font-size: 11px;
-  color: #bfbfbf;
+  color: #999999;
+}
+.lead {
+  margin-bottom: 18px;
+  font-size: 20px;
+  font-weight: 200;
+  line-height: 27px;
 }
 h1,
 h2,
@@ -405,8 +295,10 @@ h3,
 h4,
 h5,
 h6 {
+  margin: 0;
   font-weight: bold;
-  color: #404040;
+  color: #333333;
+  text-rendering: optimizelegibility;
 }
 h1 small,
 h2 small,
@@ -414,10 +306,10 @@ h3 small,
 h4 small,
 h5 small,
 h6 small {
-  color: #bfbfbf;
+  font-weight: normal;
+  color: #999999;
 }
 h1 {
-  margin-bottom: 18px;
   font-size: 30px;
   line-height: 36px;
 }
@@ -429,36 +321,43 @@ h2 {
   line-height: 36px;
 }
 h2 small {
-  font-size: 14px;
-}
-h3,
-h4,
-h5,
-h6 {
-  line-height: 36px;
+  font-size: 18px;
 }
 h3 {
+  line-height: 27px;
   font-size: 18px;
 }
 h3 small {
   font-size: 14px;
 }
+h4, h5, h6 {
+  line-height: 18px;
+}
 h4 {
-  font-size: 16px;
+  font-size: 14px;
 }
 h4 small {
   font-size: 12px;
 }
 h5 {
-  font-size: 14px;
+  font-size: 12px;
 }
 h6 {
-  font-size: 13px;
-  color: #bfbfbf;
+  font-size: 11px;
+  color: #999999;
   text-transform: uppercase;
 }
+.page-header {
+  padding-bottom: 17px;
+  margin: 18px 0;
+  border-bottom: 1px solid #eeeeee;
+}
+.page-header h1 {
+  line-height: 1;
+}
 ul, ol {
-  margin: 0 0 18px 25px;
+  padding: 0;
+  margin: 0 0 9px 25px;
 }
 ul ul,
 ul ol,
@@ -474,154 +373,162 @@ ol {
 }
 li {
   line-height: 18px;
-  color: #808080;
 }
 ul.unstyled {
-  list-style: none;
   margin-left: 0;
+  list-style: none;
 }
 dl {
   margin-bottom: 18px;
 }
-dl dt, dl dd {
+dt, dd {
   line-height: 18px;
 }
-dl dt {
+dt {
   font-weight: bold;
 }
-dl dd {
+dd {
   margin-left: 9px;
 }
 hr {
-  margin: 20px 0 19px;
+  margin: 18px 0;
   border: 0;
-  border-bottom: 1px solid #eee;
+  border-top: 1px solid #e5e5e5;
+  border-bottom: 1px solid #ffffff;
 }
 strong {
-  font-style: inherit;
   font-weight: bold;
 }
 em {
   font-style: italic;
-  font-weight: inherit;
-  line-height: inherit;
 }
 .muted {
-  color: #bfbfbf;
+  color: #999999;
+}
+abbr {
+  font-size: 90%;
+  text-transform: uppercase;
+  border-bottom: 1px dotted #ddd;
+  cursor: help;
 }
 blockquote {
-  margin-bottom: 18px;
-  border-left: 5px solid #eee;
-  padding-left: 15px;
+  padding: 0 0 0 15px;
+  margin: 0 0 18px;
+  border-left: 5px solid #eeeeee;
 }
 blockquote p {
-  font-size: 14px;
-  font-weight: 300;
-  line-height: 18px;
   margin-bottom: 0;
+  font-size: 16px;
+  font-weight: 300;
+  line-height: 22.5px;
 }
 blockquote small {
   display: block;
-  font-size: 12px;
-  font-weight: 300;
   line-height: 18px;
-  color: #bfbfbf;
+  color: #999999;
 }
 blockquote small:before {
   content: '\2014 \00A0';
 }
+blockquote.pull-right {
+  float: right;
+  padding-left: 0;
+  padding-right: 15px;
+  border-left: 0;
+  border-right: 5px solid #eeeeee;
+}
+blockquote.pull-right p, blockquote.pull-right small {
+  text-align: right;
+}
+q:before,
+q:after,
+blockquote:before,
+blockquote:after {
+  content: "";
+}
 address {
   display: block;
-  line-height: 18px;
   margin-bottom: 18px;
+  line-height: 18px;
+  font-style: normal;
+}
+small {
+  font-size: 100%;
+}
+cite {
+  font-style: normal;
 }
 code, pre {
   padding: 0 3px 2px;
-  font-family: Monaco, Andale Mono, Courier New, monospace;
+  font-family: Menlo, Monaco, "Courier New", monospace;
   font-size: 12px;
+  color: #333333;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
 }
 code {
-  background-color: #fee9cc;
-  color: rgba(0, 0, 0, 0.75);
-  padding: 1px 3px;
+  padding: 3px 4px;
+  color: #d14;
+  background-color: #f7f7f9;
+  border: 1px solid #e1e1e8;
 }
 pre {
-  background-color: #f5f5f5;
   display: block;
   padding: 8.5px;
-  margin: 0 0 18px;
-  line-height: 18px;
+  margin: 0 0 9px;
   font-size: 12px;
+  line-height: 18px;
+  background-color: #f5f5f5;
   border: 1px solid #ccc;
   border: 1px solid rgba(0, 0, 0, 0.15);
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
   white-space: pre;
   white-space: pre-wrap;
-  word-wrap: break-word;
+  word-break: break-all;
 }
-/* Forms.less
- * Base styles for various input types, form layouts, and states
- * ------------------------------------------------------------- */
-form {
+pre.prettyprint {
   margin-bottom: 18px;
 }
+pre code {
+  padding: 0;
+  background-color: transparent;
+}
+form {
+  margin: 0 0 18px;
+}
 fieldset {
-  margin-bottom: 18px;
-  padding-top: 18px;
+  padding: 0;
+  margin: 0;
+  border: 0;
 }
-fieldset legend {
+legend {
   display: block;
-  padding-left: 150px;
+  width: 100%;
+  padding: 0;
+  margin-bottom: 27px;
   font-size: 19.5px;
-  line-height: 1;
-  color: #404040;
-  *padding: 0 0 5px 145px;
-  /* IE6-7 */
-
-  *line-height: 1.5;
-  /* IE6-7 */
-
-}
-form .clearfix {
-  margin-bottom: 18px;
-  zoom: 1;
-}
-form .clearfix:before, form .clearfix:after {
-  display: table;
-  content: "";
-  zoom: 1;
-}
-form .clearfix:after {
-  clear: both;
+  line-height: 36px;
+  color: #333333;
+  border: 0;
+  border-bottom: 1px solid #eee;
 }
 label,
 input,
+button,
 select,
 textarea {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 13px;
   font-weight: normal;
-  line-height: normal;
-}
-label {
-  padding-top: 6px;
-  font-size: 13px;
   line-height: 18px;
-  float: left;
-  width: 130px;
-  text-align: right;
-  color: #404040;
 }
-form .input {
-  margin-left: 150px;
-}
-input[type=checkbox], input[type=radio] {
-  cursor: pointer;
+label {
+  display: block;
+  margin-bottom: 5px;
+  color: #333333;
 }
 input,
 textarea,
@@ -631,282 +538,187 @@ select,
   width: 210px;
   height: 18px;
   padding: 4px;
+  margin-bottom: 9px;
   font-size: 13px;
   line-height: 18px;
-  color: #808080;
+  color: #555555;
   border: 1px solid #ccc;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
 }
-select {
-  padding: initial;
+.uneditable-textarea {
+  width: auto;
+  height: auto;
+}
+label input, label textarea, label select {
+  display: block;
 }
-input[type=checkbox], input[type=radio] {
+input[type="image"], input[type="checkbox"], input[type="radio"] {
   width: auto;
   height: auto;
   padding: 0;
   margin: 3px 0;
   *margin-top: 0;
-  /* IE6-7 */
+  /* IE7 */
 
   line-height: normal;
-  border: none;
+  border: 0;
+  cursor: pointer;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
 }
-input[type=file] {
-  background-color: #ffffff;
+input[type="file"] {
   padding: initial;
-  border: initial;
   line-height: initial;
+  border: initial;
+  background-color: #ffffff;
+  background-color: initial;
   -webkit-box-shadow: none;
   -moz-box-shadow: none;
   box-shadow: none;
 }
-input[type=button], input[type=reset], input[type=submit] {
+input[type="button"], input[type="reset"], input[type="submit"] {
   width: auto;
   height: auto;
 }
-select, input[type=file] {
-  height: 27px;
-  *height: auto;
-  line-height: 27px;
+select, input[type="file"] {
+  height: 28px;
+  /* In IE7, the height of the select element cannot be changed by height, only font-size */
+
   *margin-top: 4px;
   /* For IE7, add top margin to align select with labels */
 
+  line-height: 28px;
 }
-select[multiple] {
-  height: inherit;
+select {
+  width: 220px;
   background-color: #ffffff;
 }
+select[multiple], select[size] {
+  height: auto;
+}
+input[type="image"] {
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
 textarea {
   height: auto;
 }
-.uneditable-input {
-  background-color: #ffffff;
-  display: block;
-  border-color: #eee;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
-  cursor: not-allowed;
+input[type="hidden"] {
+  display: none;
 }
-:-moz-placeholder {
-  color: #bfbfbf;
+.radio, .checkbox {
+  padding-left: 18px;
 }
-::-webkit-input-placeholder {
-  color: #bfbfbf;
+.radio input[type="radio"], .checkbox input[type="checkbox"] {
+  float: left;
+  margin-left: -18px;
+}
+.controls > .radio:first-child, .controls > .checkbox:first-child {
+  padding-top: 5px;
+}
+.radio.inline, .checkbox.inline {
+  display: inline-block;
+  margin-bottom: 0;
+  vertical-align: middle;
+}
+.radio.inline + .radio.inline, .checkbox.inline + .checkbox.inline {
+  margin-left: 10px;
+}
+.controls > .radio.inline:first-child, .controls > .checkbox.inline:first-child {
+  padding-top: 0;
 }
 input, textarea {
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
   -webkit-transition: border linear 0.2s, box-shadow linear 0.2s;
   -moz-transition: border linear 0.2s, box-shadow linear 0.2s;
   -ms-transition: border linear 0.2s, box-shadow linear 0.2s;
   -o-transition: border linear 0.2s, box-shadow linear 0.2s;
   transition: border linear 0.2s, box-shadow linear 0.2s;
-  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
-  -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
-  box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1);
 }
 input:focus, textarea:focus {
-  outline: 0;
   border-color: rgba(82, 168, 236, 0.8);
-  -webkit-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
-  -moz-box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
-  box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.1), 0 0 8px rgba(82, 168, 236, 0.6);
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
+  outline: 0;
+  outline: thin dotted \9;
+  /* IE6-8 */
+
 }
-input[type=file]:focus, input[type=checkbox]:focus, select:focus {
+input[type="file"]:focus, input[type="checkbox"]:focus, select:focus {
   -webkit-box-shadow: none;
   -moz-box-shadow: none;
   box-shadow: none;
-  outline: 1px dotted #666;
-}
-form .clearfix.error > label, form .clearfix.error .help-block, form .clearfix.error .help-inline {
-  color: #b94a48;
-}
-form .clearfix.error input, form .clearfix.error textarea {
-  color: #b94a48;
-  border-color: #ee5f5b;
-}
-form .clearfix.error input:focus, form .clearfix.error textarea:focus {
-  border-color: #e9322d;
-  -webkit-box-shadow: 0 0 6px #f8b9b7;
-  -moz-box-shadow: 0 0 6px #f8b9b7;
-  box-shadow: 0 0 6px #f8b9b7;
-}
-form .clearfix.error .input-prepend .add-on, form .clearfix.error .input-append .add-on {
-  color: #b94a48;
-  background-color: #fce6e6;
-  border-color: #b94a48;
-}
-form .clearfix.warning > label, form .clearfix.warning .help-block, form .clearfix.warning .help-inline {
-  color: #c09853;
-}
-form .clearfix.warning input, form .clearfix.warning textarea {
-  color: #c09853;
-  border-color: #ccae64;
-}
-form .clearfix.warning input:focus, form .clearfix.warning textarea:focus {
-  border-color: #be9a3f;
-  -webkit-box-shadow: 0 0 6px #e5d6b1;
-  -moz-box-shadow: 0 0 6px #e5d6b1;
-  box-shadow: 0 0 6px #e5d6b1;
-}
-form .clearfix.warning .input-prepend .add-on, form .clearfix.warning .input-append .add-on {
-  color: #c09853;
-  background-color: #d2b877;
-  border-color: #c09853;
-}
-form .clearfix.success > label, form .clearfix.success .help-block, form .clearfix.success .help-inline {
-  color: #468847;
-}
-form .clearfix.success input, form .clearfix.success textarea {
-  color: #468847;
-  border-color: #57a957;
-}
-form .clearfix.success input:focus, form .clearfix.success textarea:focus {
-  border-color: #458845;
-  -webkit-box-shadow: 0 0 6px #9acc9a;
-  -moz-box-shadow: 0 0 6px #9acc9a;
-  box-shadow: 0 0 6px #9acc9a;
-}
-form .clearfix.success .input-prepend .add-on, form .clearfix.success .input-append .add-on {
-  color: #468847;
-  background-color: #bcddbc;
-  border-color: #468847;
+  outline: thin dotted;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
 }
-.input-mini,
-input.mini,
-textarea.mini,
-select.mini {
+.input-mini {
   width: 60px;
 }
-.input-small,
-input.small,
-textarea.small,
-select.small {
+.input-small {
   width: 90px;
 }
-.input-medium,
-input.medium,
-textarea.medium,
-select.medium {
+.input-medium {
   width: 150px;
 }
-.input-large,
-input.large,
-textarea.large,
-select.large {
+.input-large {
   width: 210px;
 }
-.input-xlarge,
-input.xlarge,
-textarea.xlarge,
-select.xlarge {
+.input-xlarge {
   width: 270px;
 }
-.input-xxlarge,
-input.xxlarge,
-textarea.xxlarge,
-select.xxlarge {
+.input-xxlarge {
   width: 530px;
 }
-textarea.xxlarge {
-  overflow-y: auto;
-}
-input.span1, textarea.span1 {
-  display: inline-block;
+input[class*="span"],
+select[class*="span"],
+textarea[class*="span"],
+.uneditable-input {
   float: none;
-  width: 13px;
   margin-left: 0;
 }
-input.span2, textarea.span2 {
-  display: inline-block;
-  float: none;
+input.span1, textarea.span1, .uneditable-input.span1 {
+  width: 13px;
+}
+input.span2, textarea.span2, .uneditable-input.span2 {
   width: 40px;
-  margin-left: 0;
 }
-input.span3, textarea.span3 {
-  display: inline-block;
-  float: none;
+input.span3, textarea.span3, .uneditable-input.span3 {
   width: 67px;
-  margin-left: 0;
 }
-input.span4, textarea.span4 {
-  display: inline-block;
-  float: none;
+input.span4, textarea.span4, .uneditable-input.span4 {
   width: 94px;
-  margin-left: 0;
 }
-input.span5, textarea.span5 {
-  display: inline-block;
-  float: none;
+input.span5, textarea.span5, .uneditable-input.span5 {
   width: 121px;
-  margin-left: 0;
 }
-input.span6, textarea.span6 {
-  display: inline-block;
-  float: none;
+input.span6, textarea.span6, .uneditable-input.span6 {
   width: 148px;
-  margin-left: 0;
 }
-input.span7, textarea.span7 {
-  display: inline-block;
-  float: none;
+input.span7, textarea.span7, .uneditable-input.span7 {
   width: 175px;
-  margin-left: 0;
 }
-input.span8, textarea.span8 {
-  display: inline-block;
-  float: none;
+input.span8, textarea.span8, .uneditable-input.span8 {
   width: 202px;
-  margin-left: 0;
 }
-input.span9, textarea.span9 {
-  display: inline-block;
-  float: none;
+input.span9, textarea.span9, .uneditable-input.span9 {
   width: 229px;
-  margin-left: 0;
 }
-input.span10, textarea.span10 {
-  display: inline-block;
-  float: none;
+input.span10, textarea.span10, .uneditable-input.span10 {
   width: 256px;
-  margin-left: 0;
 }
-input.span11, textarea.span11 {
-  display: inline-block;
-  float: none;
+input.span11, textarea.span11, .uneditable-input.span11 {
   width: 283px;
-  margin-left: 0;
 }
-input.span12, textarea.span12 {
-  display: inline-block;
-  float: none;
+input.span12, textarea.span12, .uneditable-input.span12 {
   width: 310px;
-  margin-left: 0;
-}
-input.span13, textarea.span13 {
-  display: inline-block;
-  float: none;
-  width: 337px;
-  margin-left: 0;
-}
-input.span14, textarea.span14 {
-  display: inline-block;
-  float: none;
-  width: 364px;
-  margin-left: 0;
-}
-input.span15, textarea.span15 {
-  display: inline-block;
-  float: none;
-  width: 391px;
-  margin-left: 0;
-}
-input.span16, textarea.span16 {
-  display: inline-block;
-  float: none;
-  width: 418px;
-  margin-left: 0;
 }
 input[disabled],
 select[disabled],
@@ -918,77 +730,160 @@ textarea[readonly] {
   border-color: #ddd;
   cursor: not-allowed;
 }
-.actions {
-  background: #f5f5f5;
+.control-group.warning > label, .control-group.warning .help-block, .control-group.warning .help-inline {
+  color: #c09853;
+}
+.control-group.warning input, .control-group.warning select, .control-group.warning textarea {
+  color: #c09853;
+  border-color: #c09853;
+}
+.control-group.warning input:focus, .control-group.warning select:focus, .control-group.warning textarea:focus {
+  border-color: #a47e3c;
+  -webkit-box-shadow: 0 0 6px #dbc59e;
+  -moz-box-shadow: 0 0 6px #dbc59e;
+  box-shadow: 0 0 6px #dbc59e;
+}
+.control-group.warning .input-prepend .add-on, .control-group.warning .input-append .add-on {
+  color: #c09853;
+  background-color: #fcf8e3;
+  border-color: #c09853;
+}
+.control-group.error > label, .control-group.error .help-block, .control-group.error .help-inline {
+  color: #b94a48;
+}
+.control-group.error input, .control-group.error select, .control-group.error textarea {
+  color: #b94a48;
+  border-color: #b94a48;
+}
+.control-group.error input:focus, .control-group.error select:focus, .control-group.error textarea:focus {
+  border-color: #953b39;
+  -webkit-box-shadow: 0 0 6px #d59392;
+  -moz-box-shadow: 0 0 6px #d59392;
+  box-shadow: 0 0 6px #d59392;
+}
+.control-group.error .input-prepend .add-on, .control-group.error .input-append .add-on {
+  color: #b94a48;
+  background-color: #f2dede;
+  border-color: #b94a48;
+}
+.control-group.success > label, .control-group.success .help-block, .control-group.success .help-inline {
+  color: #468847;
+}
+.control-group.success input, .control-group.success select, .control-group.success textarea {
+  color: #468847;
+  border-color: #468847;
+}
+.control-group.success input:focus, .control-group.success select:focus, .control-group.success textarea:focus {
+  border-color: #356635;
+  -webkit-box-shadow: 0 0 6px #7aba7b;
+  -moz-box-shadow: 0 0 6px #7aba7b;
+  box-shadow: 0 0 6px #7aba7b;
+}
+.control-group.success .input-prepend .add-on, .control-group.success .input-append .add-on {
+  color: #468847;
+  background-color: #dff0d8;
+  border-color: #468847;
+}
+input:focus:required:invalid, textarea:focus:required:invalid, select:focus:required:invalid {
+  color: #b94a48;
+  border-color: #ee5f5b;
+}
+input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, select:focus:required:invalid:focus {
+  border-color: #e9322d;
+  -webkit-box-shadow: 0 0 6px #f8b9b7;
+  -moz-box-shadow: 0 0 6px #f8b9b7;
+  box-shadow: 0 0 6px #f8b9b7;
+}
+.form-actions {
+  padding: 17px 20px 18px;
   margin-top: 18px;
   margin-bottom: 18px;
-  padding: 17px 20px 18px 150px;
+  background-color: #f5f5f5;
   border-top: 1px solid #ddd;
-  -webkit-border-radius: 0 0 3px 3px;
-  -moz-border-radius: 0 0 3px 3px;
-  border-radius: 0 0 3px 3px;
 }
-.actions .secondary-action {
-  float: right;
+.uneditable-input {
+  display: block;
+  background-color: #ffffff;
+  border-color: #eee;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
+  cursor: not-allowed;
 }
-.actions .secondary-action a {
-  line-height: 30px;
+:-moz-placeholder {
+  color: #999999;
 }
-.actions .secondary-action a:hover {
-  text-decoration: underline;
+::-webkit-input-placeholder {
+  color: #999999;
 }
-.help-inline, .help-block {
-  font-size: 13px;
-  line-height: 18px;
-  color: #bfbfbf;
+.help-block {
+  margin-top: 5px;
+  margin-bottom: 0;
+  color: #999999;
 }
 .help-inline {
-  padding-left: 5px;
-  *position: relative;
-  /* IE6-7 */
-
-  *top: -5px;
-  /* IE6-7 */
+  display: inline-block;
+  *display: inline;
+  /* IE7 inline-block hack */
 
+  *zoom: 1;
+  margin-bottom: 9px;
+  vertical-align: middle;
+  padding-left: 5px;
 }
-.help-block {
-  display: block;
-  max-width: 600px;
+.input-prepend, .input-append {
+  margin-bottom: 5px;
+  *zoom: 1;
 }
-.inline-inputs {
-  color: #808080;
+.input-prepend:before,
+.input-append:before,
+.input-prepend:after,
+.input-append:after {
+  display: table;
+  content: "";
 }
-.inline-inputs span {
-  padding: 0 2px 0 1px;
+.input-prepend:after, .input-append:after {
+  clear: both;
 }
-.input-prepend input, .input-append input {
+.input-prepend input,
+.input-append input,
+.input-prepend .uneditable-input,
+.input-append .uneditable-input {
   -webkit-border-radius: 0 3px 3px 0;
   -moz-border-radius: 0 3px 3px 0;
   border-radius: 0 3px 3px 0;
 }
-.input-prepend .add-on, .input-append .add-on {
+.input-prepend input:focus,
+.input-append input:focus,
+.input-prepend .uneditable-input:focus,
+.input-append .uneditable-input:focus {
   position: relative;
-  background: #f5f5f5;
-  border: 1px solid #ccc;
   z-index: 2;
+}
+.input-prepend .uneditable-input, .input-append .uneditable-input {
+  border-left-color: #ccc;
+}
+.input-prepend .add-on, .input-append .add-on {
   float: left;
   display: block;
   width: auto;
   min-width: 16px;
   height: 18px;
-  padding: 4px 4px 4px 5px;
   margin-right: -1px;
+  padding: 4px 5px;
   font-weight: normal;
   line-height: 18px;
-  color: #bfbfbf;
+  color: #999999;
   text-align: center;
   text-shadow: 0 1px 0 #ffffff;
+  background-color: #f5f5f5;
+  border: 1px solid #ccc;
   -webkit-border-radius: 3px 0 0 3px;
   -moz-border-radius: 3px 0 0 3px;
   border-radius: 3px 0 0 3px;
 }
 .input-prepend .active, .input-append .active {
-  background: #a9dba9;
+  background-color: #a9dba9;
   border-color: #46a546;
 }
 .input-prepend .add-on {
@@ -996,1187 +891,1886 @@ textarea[readonly] {
   /* IE6-7 */
 
 }
-.input-append input {
+.input-append input, .input-append .uneditable-input {
   float: left;
   -webkit-border-radius: 3px 0 0 3px;
   -moz-border-radius: 3px 0 0 3px;
   border-radius: 3px 0 0 3px;
 }
+.input-append .uneditable-input {
+  border-right-color: #ccc;
+}
 .input-append .add-on {
+  margin-right: 0;
+  margin-left: -1px;
   -webkit-border-radius: 0 3px 3px 0;
   -moz-border-radius: 0 3px 3px 0;
   border-radius: 0 3px 3px 0;
-  margin-right: 0;
-  margin-left: -1px;
 }
-.inputs-list {
-  margin: 0 0 5px;
-  width: 100%;
+.input-append input:first-child {
+  *margin-left: -160px;
 }
-.inputs-list li {
-  display: block;
-  padding: 0;
-  width: 100%;
+.input-append input:first-child + .add-on {
+  *margin-left: -21px;
 }
-.inputs-list label {
-  display: block;
-  float: none;
-  width: auto;
-  padding: 0;
-  margin-left: 20px;
-  line-height: 18px;
-  text-align: left;
-  white-space: normal;
+.search-query {
+  padding-left: 14px;
+  padding-right: 14px;
+  margin-bottom: 0;
+  -webkit-border-radius: 14px;
+  -moz-border-radius: 14px;
+  border-radius: 14px;
+}
+.form-search input,
+.form-inline input,
+.form-horizontal input,
+.form-search textarea,
+.form-inline textarea,
+.form-horizontal textarea,
+.form-search select,
+.form-inline select,
+.form-horizontal select,
+.form-search .help-inline,
+.form-inline .help-inline,
+.form-horizontal .help-inline,
+.form-search .uneditable-input,
+.form-inline .uneditable-input,
+.form-horizontal .uneditable-input {
+  display: inline-block;
+  margin-bottom: 0;
 }
-.inputs-list label strong {
-  color: #808080;
-}
-.inputs-list label small {
-  font-size: 11px;
-  font-weight: normal;
-}
-.inputs-list .inputs-list {
-  margin-left: 25px;
-  margin-bottom: 10px;
-  padding-top: 0;
-}
-.inputs-list:first-child {
-  padding-top: 6px;
-}
-.inputs-list li + li {
-  padding-top: 2px;
-}
-.inputs-list input[type=radio], .inputs-list input[type=checkbox] {
-  margin-bottom: 0;
-  margin-left: -20px;
-  float: left;
-}
-.form-stacked {
-  padding-left: 20px;
-}
-.form-stacked fieldset {
-  padding-top: 9px;
-}
-.form-stacked legend {
-  padding-left: 0;
+.form-search label,
+.form-inline label,
+.form-search .input-append,
+.form-inline .input-append,
+.form-search .input-prepend,
+.form-inline .input-prepend {
+  display: inline-block;
 }
-.form-stacked label {
-  display: block;
-  float: none;
-  width: auto;
-  font-weight: bold;
-  text-align: left;
-  line-height: 20px;
-  padding-top: 0;
+.form-search .input-append .add-on,
+.form-inline .input-prepend .add-on,
+.form-search .input-append .add-on,
+.form-inline .input-prepend .add-on {
+  vertical-align: middle;
 }
-.form-stacked .clearfix {
+.control-group {
   margin-bottom: 9px;
 }
-.form-stacked .clearfix div.input {
-  margin-left: 0;
+.form-horizontal legend + .control-group {
+  margin-top: 18px;
+  -webkit-margin-top-collapse: separate;
 }
-.form-stacked .inputs-list {
-  margin-bottom: 0;
+.form-horizontal .control-group {
+  margin-bottom: 18px;
+  *zoom: 1;
 }
-.form-stacked .inputs-list li {
-  padding-top: 0;
+.form-horizontal .control-group:before, .form-horizontal .control-group:after {
+  display: table;
+  content: "";
 }
-.form-stacked .inputs-list li label {
-  font-weight: normal;
-  padding-top: 0;
+.form-horizontal .control-group:after {
+  clear: both;
 }
-.form-stacked div.clearfix.error {
-  padding-top: 10px;
-  padding-bottom: 10px;
-  padding-left: 10px;
-  margin-top: 0;
-  margin-left: -10px;
+.form-horizontal .control-group > label {
+  float: left;
+  width: 140px;
+  padding-top: 5px;
+  text-align: right;
 }
-.form-stacked .actions {
-  margin-left: -20px;
-  padding-left: 20px;
+.form-horizontal .controls {
+  margin-left: 160px;
+}
+.form-horizontal .form-actions {
+  padding-left: 160px;
 }
-/*
- * Tables.less
- * Tables for, you guessed it, tabular data
- * ---------------------------------------- */
 table {
+  max-width: 100%;
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+.table {
   width: 100%;
   margin-bottom: 18px;
-  padding: 0;
-  font-size: 13px;
-  border-collapse: collapse;
 }
-table th, table td {
-  padding: 10px 10px 9px;
+.table th, .table td {
+  padding: 8px;
   line-height: 18px;
   text-align: left;
+  border-top: 1px solid #ddd;
 }
-table th {
-  padding-top: 9px;
+.table th {
   font-weight: bold;
-  vertical-align: middle;
+  vertical-align: bottom;
 }
-table td {
+.table td {
   vertical-align: top;
-  border-top: 1px solid #ddd;
 }
-table tbody th {
-  border-top: 1px solid #ddd;
-  vertical-align: top;
+.table thead:first-child tr th, .table thead:first-child tr td {
+  border-top: 0;
 }
-.condensed-table th, .condensed-table td {
-  padding: 5px 5px 4px;
+.table tbody + tbody {
+  border-top: 2px solid #ddd;
 }
-.bordered-table {
+.table-condensed th, .table-condensed td {
+  padding: 4px 5px;
+}
+.table-bordered {
   border: 1px solid #ddd;
   border-collapse: separate;
-  *border-collapse: collapse;
-  /* IE7, collapse table to remove spacing */
-
+  *border-collapse: collapsed;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
 }
-.bordered-table th + th, .bordered-table td + td, .bordered-table th + td {
+.table-bordered th + th,
+.table-bordered td + td,
+.table-bordered th + td,
+.table-bordered td + th {
   border-left: 1px solid #ddd;
 }
-.bordered-table thead tr:first-child th:first-child, .bordered-table tbody tr:first-child td:first-child {
+.table-bordered thead:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child th, .table-bordered tbody:first-child tr:first-child td {
+  border-top: 0;
+}
+.table-bordered thead:first-child tr:first-child th:first-child, .table-bordered tbody:first-child tr:first-child td:first-child {
   -webkit-border-radius: 4px 0 0 0;
   -moz-border-radius: 4px 0 0 0;
   border-radius: 4px 0 0 0;
 }
-.bordered-table thead tr:first-child th:last-child, .bordered-table tbody tr:first-child td:last-child {
+.table-bordered thead:first-child tr:first-child th:last-child, .table-bordered tbody:first-child tr:first-child td:last-child {
   -webkit-border-radius: 0 4px 0 0;
   -moz-border-radius: 0 4px 0 0;
   border-radius: 0 4px 0 0;
 }
-.bordered-table tbody tr:last-child td:first-child {
+.table-bordered thead:last-child tr:last-child th:first-child, .table-bordered tbody:last-child tr:last-child td:first-child {
   -webkit-border-radius: 0 0 0 4px;
   -moz-border-radius: 0 0 0 4px;
   border-radius: 0 0 0 4px;
 }
-.bordered-table tbody tr:last-child td:last-child {
+.table-bordered thead:last-child tr:last-child th:last-child, .table-bordered tbody:last-child tr:last-child td:last-child {
   -webkit-border-radius: 0 0 4px 0;
   -moz-border-radius: 0 0 4px 0;
   border-radius: 0 0 4px 0;
 }
+.table-striped tbody tr:nth-child(odd) td, .table-striped tbody tr:nth-child(odd) th {
+  background-color: #f9f9f9;
+}
 table .span1 {
-  width: 3px;
+  float: none;
+  width: 7px;
+  margin-left: 0;
 }
 table .span2 {
-  width: 9px;
+  float: none;
+  width: 34px;
+  margin-left: 0;
 }
 table .span3 {
-  width: 15px;
+  float: none;
+  width: 61px;
+  margin-left: 0;
 }
 table .span4 {
-  width: 21px;
+  float: none;
+  width: 88px;
+  margin-left: 0;
 }
 table .span5 {
-  width: 27px;
+  float: none;
+  width: 115px;
+  margin-left: 0;
 }
 table .span6 {
-  width: 33px;
+  float: none;
+  width: 142px;
+  margin-left: 0;
 }
 table .span7 {
-  width: 39px;
+  float: none;
+  width: 169px;
+  margin-left: 0;
 }
 table .span8 {
-  width: 45px;
+  float: none;
+  width: 196px;
+  margin-left: 0;
 }
 table .span9 {
-  width: 51px;
+  float: none;
+  width: 223px;
+  margin-left: 0;
 }
 table .span10 {
-  width: 57px;
+  float: none;
+  width: 250px;
+  margin-left: 0;
 }
 table .span11 {
-  width: 63px;
+  float: none;
+  width: 277px;
+  margin-left: 0;
 }
 table .span12 {
-  width: 69px;
+  float: none;
+  width: 304px;
+  margin-left: 0;
 }
-table .span13 {
-  width: 75px;
+[class^="icon-"] {
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  vertical-align: text-top;
+  background-image: url(../img/glyphicons-halflings.png);
+  background-position: 14px 14px;
+  background-repeat: no-repeat;
+  *margin-right: .3em;
 }
-table .span14 {
-  width: 81px;
+[class^="icon-"]:last-child {
+  *margin-left: 0;
 }
-table .span15 {
-  width: 87px;
+.icon-white {
+  background-image: url(../img/glyphicons-halflings-white.png);
 }
-table .span16 {
-  width: 93px;
+.icon-glass {
+  background-position: 0      0;
 }
-.zebra-striped tbody tr:nth-child(odd) td, .zebra-striped tbody tr:nth-child(odd) th {
-  background-color: #f9f9f9;
+.icon-music {
+  background-position: -24px 0;
 }
-.zebra-striped tbody tr:hover td, .zebra-striped tbody tr:hover th {
-  background-color: #f5f5f5;
+.icon-search {
+  background-position: -48px 0;
 }
-table .header {
-  cursor: pointer;
+.icon-envelope {
+  background-position: -72px 0;
 }
-table .header:after {
-  content: "";
-  float: right;
-  margin-top: 7px;
-  border-width: 0 4px 4px;
-  border-style: solid;
-  border-color: #000 transparent;
-  visibility: hidden;
+.icon-heart {
+  background-position: -96px 0;
 }
-table .headerSortUp, table .headerSortDown {
-  background-color: rgba(141, 192, 219, 0.25);
-  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+.icon-star {
+  background-position: -120px 0;
 }
-table .header:hover:after {
-  visibility: visible;
+.icon-star-empty {
+  background-position: -144px 0;
 }
-table .headerSortDown:after, table .headerSortDown:hover:after {
-  visibility: visible;
-  filter: alpha(opacity=60);
-  -khtml-opacity: 0.6;
-  -moz-opacity: 0.6;
-  opacity: 0.6;
+.icon-user {
+  background-position: -168px 0;
 }
-table .headerSortUp:after {
-  border-bottom: none;
-  border-left: 4px solid transparent;
-  border-right: 4px solid transparent;
-  border-top: 4px solid #000;
-  visibility: visible;
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
-  filter: alpha(opacity=60);
-  -khtml-opacity: 0.6;
-  -moz-opacity: 0.6;
-  opacity: 0.6;
+.icon-film {
+  background-position: -192px 0;
 }
-table .blue {
-  color: #049cdb;
-  border-bottom-color: #049cdb;
+.icon-th-large {
+  background-position: -216px 0;
 }
-table .headerSortUp.blue, table .headerSortDown.blue {
-  background-color: #ade6fe;
+.icon-th {
+  background-position: -240px 0;
 }
-table .green {
-  color: #46a546;
-  border-bottom-color: #46a546;
+.icon-th-list {
+  background-position: -264px 0;
 }
-table .headerSortUp.green, table .headerSortDown.green {
-  background-color: #cdeacd;
+.icon-ok {
+  background-position: -288px 0;
 }
-table .red {
-  color: #9d261d;
-  border-bottom-color: #9d261d;
+.icon-remove {
+  background-position: -312px 0;
 }
-table .headerSortUp.red, table .headerSortDown.red {
-  background-color: #f4c8c5;
+.icon-zoom-in {
+  background-position: -336px 0;
 }
-table .yellow {
-  color: #ffc40d;
-  border-bottom-color: #ffc40d;
+.icon-zoom-out {
+  background-position: -360px 0;
 }
-table .headerSortUp.yellow, table .headerSortDown.yellow {
-  background-color: #fff6d9;
+.icon-off {
+  background-position: -384px 0;
 }
-table .orange {
-  color: #f89406;
-  border-bottom-color: #f89406;
+.icon-signal {
+  background-position: -408px 0;
 }
-table .headerSortUp.orange, table .headerSortDown.orange {
-  background-color: #fee9cc;
+.icon-cog {
+  background-position: -432px 0;
 }
-table .purple {
-  color: #7a43b6;
-  border-bottom-color: #7a43b6;
+.icon-trash {
+  background-position: -456px 0;
 }
-table .headerSortUp.purple, table .headerSortDown.purple {
-  background-color: #e2d5f0;
+.icon-home {
+  background-position: 0 -24px;
 }
-/* Patterns.less
- * Repeatable UI elements outside the base styles provided from the scaffolding
- * ---------------------------------------------------------------------------- */
-.topbar {
-  height: 40px;
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  z-index: 10000;
-  overflow: visible;
+.icon-file {
+  background-position: -24px -24px;
 }
-.topbar a {
-  color: #bfbfbf;
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+.icon-time {
+  background-position: -48px -24px;
 }
-.topbar h3 a:hover, .topbar .brand:hover, .topbar ul .active > a {
-  background-color: #333;
-  background-color: rgba(255, 255, 255, 0.05);
-  color: #ffffff;
-  text-decoration: none;
+.icon-road {
+  background-position: -72px -24px;
 }
-.topbar h3 {
-  position: relative;
+.icon-download-alt {
+  background-position: -96px -24px;
 }
-.topbar h3 a, .topbar .brand {
-  float: left;
-  display: block;
-  padding: 8px 20px 12px;
-  margin-left: -20px;
-  color: #ffffff;
-  font-size: 20px;
-  font-weight: 200;
-  line-height: 1;
+.icon-download {
+  background-position: -120px -24px;
 }
-.topbar p {
-  margin: 0;
-  line-height: 40px;
+.icon-upload {
+  background-position: -144px -24px;
 }
-.topbar p a:hover {
-  background-color: transparent;
-  color: #ffffff;
+.icon-inbox {
+  background-position: -168px -24px;
 }
-.topbar form {
-  float: left;
-  margin: 5px 0 0 0;
-  position: relative;
-  filter: alpha(opacity=100);
-  -khtml-opacity: 1;
-  -moz-opacity: 1;
-  opacity: 1;
+.icon-play-circle {
+  background-position: -192px -24px;
 }
-.topbar form.pull-right {
-  float: right;
+.icon-repeat {
+  background-position: -216px -24px;
 }
-.topbar input {
-  background-color: #444;
-  background-color: rgba(255, 255, 255, 0.3);
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: normal;
-  font-weight: 13px;
-  line-height: 1;
-  padding: 4px 9px;
-  color: #ffffff;
-  color: rgba(255, 255, 255, 0.75);
-  border: 1px solid #111;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25);
-  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25);
-  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.25);
-  -webkit-transition: none;
-  -moz-transition: none;
-  -ms-transition: none;
-  -o-transition: none;
-  transition: none;
+.icon-refresh {
+  background-position: -240px -24px;
 }
-.topbar input:-moz-placeholder {
-  color: #e6e6e6;
+.icon-list-alt {
+  background-position: -264px -24px;
 }
-.topbar input::-webkit-input-placeholder {
-  color: #e6e6e6;
+.icon-lock {
+  background-position: -287px -24px;
 }
-.topbar input:hover {
-  background-color: #bfbfbf;
-  background-color: rgba(255, 255, 255, 0.5);
-  color: #ffffff;
+.icon-flag {
+  background-position: -312px -24px;
 }
-.topbar input:focus, .topbar input.focused {
-  outline: 0;
-  background-color: #ffffff;
-  color: #404040;
-  text-shadow: 0 1px 0 #ffffff;
-  border: 0;
-  padding: 5px 10px;
-  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-  -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
-  box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+.icon-headphones {
+  background-position: -336px -24px;
 }
-.topbar-inner, .topbar .fill {
-  background-color: #222;
-  background-color: #222222;
-  background-repeat: repeat-x;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));
-  background-image: -moz-linear-gradient(top, #333333, #222222);
-  background-image: -ms-linear-gradient(top, #333333, #222222);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));
-  background-image: -webkit-linear-gradient(top, #333333, #222222);
-  background-image: -o-linear-gradient(top, #333333, #222222);
-  background-image: linear-gradient(top, #333333, #222222);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
-  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
-  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+.icon-volume-off {
+  background-position: -360px -24px;
 }
-.topbar div > ul, .nav {
-  display: block;
-  float: left;
-  margin: 0 10px 0 0;
-  position: relative;
-  left: 0;
+.icon-volume-down {
+  background-position: -384px -24px;
 }
-.topbar div > ul > li, .nav > li {
-  display: block;
-  float: left;
+.icon-volume-up {
+  background-position: -408px -24px;
 }
-.topbar div > ul a, .nav a {
-  display: block;
-  float: none;
-  padding: 10px 10px 11px;
-  line-height: 19px;
-  text-decoration: none;
+.icon-qrcode {
+  background-position: -432px -24px;
 }
-.topbar div > ul a:hover, .nav a:hover {
-  color: #ffffff;
-  text-decoration: none;
+.icon-barcode {
+  background-position: -456px -24px;
 }
-.topbar div > ul .active > a, .nav .active > a {
-  background-color: #222;
-  background-color: rgba(0, 0, 0, 0.5);
+.icon-tag {
+  background-position: 0 -48px;
 }
-.topbar div > ul.secondary-nav, .nav.secondary-nav {
-  float: right;
-  margin-left: 10px;
-  margin-right: 0;
+.icon-tags {
+  background-position: -25px -48px;
 }
-.topbar div > ul.secondary-nav .menu-dropdown,
-.nav.secondary-nav .menu-dropdown,
-.topbar div > ul.secondary-nav .dropdown-menu,
-.nav.secondary-nav .dropdown-menu {
-  right: 0;
-  border: 0;
+.icon-book {
+  background-position: -48px -48px;
 }
-.topbar div > ul a.menu:hover,
-.nav a.menu:hover,
-.topbar div > ul li.open .menu,
-.nav li.open .menu,
-.topbar div > ul .dropdown-toggle:hover,
-.nav .dropdown-toggle:hover,
-.topbar div > ul .dropdown.open .dropdown-toggle,
-.nav .dropdown.open .dropdown-toggle {
-  background: #444;
-  background: rgba(255, 255, 255, 0.05);
-}
-.topbar div > ul .menu-dropdown,
-.nav .menu-dropdown,
-.topbar div > ul .dropdown-menu,
-.nav .dropdown-menu {
-  background-color: #333;
-}
-.topbar div > ul .menu-dropdown a.menu,
-.nav .menu-dropdown a.menu,
-.topbar div > ul .dropdown-menu a.menu,
-.nav .dropdown-menu a.menu,
-.topbar div > ul .menu-dropdown .dropdown-toggle,
-.nav .menu-dropdown .dropdown-toggle,
-.topbar div > ul .dropdown-menu .dropdown-toggle,
-.nav .dropdown-menu .dropdown-toggle {
-  color: #ffffff;
+.icon-bookmark {
+  background-position: -72px -48px;
 }
-.topbar div > ul .menu-dropdown a.menu.open,
-.nav .menu-dropdown a.menu.open,
-.topbar div > ul .dropdown-menu a.menu.open,
-.nav .dropdown-menu a.menu.open,
-.topbar div > ul .menu-dropdown .dropdown-toggle.open,
-.nav .menu-dropdown .dropdown-toggle.open,
-.topbar div > ul .dropdown-menu .dropdown-toggle.open,
-.nav .dropdown-menu .dropdown-toggle.open {
-  background: #444;
-  background: rgba(255, 255, 255, 0.05);
-}
-.topbar div > ul .menu-dropdown li a,
-.nav .menu-dropdown li a,
-.topbar div > ul .dropdown-menu li a,
-.nav .dropdown-menu li a {
-  color: #999;
-  text-shadow: 0 1px 0 rgba(0, 0, 0, 0.5);
-}
-.topbar div > ul .menu-dropdown li a:hover,
-.nav .menu-dropdown li a:hover,
-.topbar div > ul .dropdown-menu li a:hover,
-.nav .dropdown-menu li a:hover {
-  background-color: #191919;
-  background-repeat: repeat-x;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#292929), to(#191919));
-  background-image: -moz-linear-gradient(top, #292929, #191919);
-  background-image: -ms-linear-gradient(top, #292929, #191919);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #292929), color-stop(100%, #191919));
-  background-image: -webkit-linear-gradient(top, #292929, #191919);
-  background-image: -o-linear-gradient(top, #292929, #191919);
-  background-image: linear-gradient(top, #292929, #191919);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#292929', endColorstr='#191919', GradientType=0);
-  color: #ffffff;
+.icon-print {
+  background-position: -96px -48px;
 }
-.topbar div > ul .menu-dropdown .active a,
-.nav .menu-dropdown .active a,
-.topbar div > ul .dropdown-menu .active a,
-.nav .dropdown-menu .active a {
-  color: #ffffff;
+.icon-camera {
+  background-position: -120px -48px;
 }
-.topbar div > ul .menu-dropdown .divider,
-.nav .menu-dropdown .divider,
-.topbar div > ul .dropdown-menu .divider,
-.nav .dropdown-menu .divider {
-  background-color: #222;
-  border-color: #444;
+.icon-font {
+  background-position: -144px -48px;
 }
-.topbar ul .menu-dropdown li a, .topbar ul .dropdown-menu li a {
-  padding: 4px 15px;
+.icon-bold {
+  background-position: -167px -48px;
 }
-li.menu, .dropdown {
-  position: relative;
+.icon-italic {
+  background-position: -192px -48px;
 }
-a.menu:after, .dropdown-toggle:after {
-  width: 0;
-  height: 0;
-  display: inline-block;
-  content: "&darr;";
-  text-indent: -99999px;
-  vertical-align: top;
-  margin-top: 8px;
-  margin-left: 4px;
-  border-left: 4px solid transparent;
-  border-right: 4px solid transparent;
-  border-top: 4px solid #ffffff;
-  filter: alpha(opacity=50);
-  -khtml-opacity: 0.5;
-  -moz-opacity: 0.5;
-  opacity: 0.5;
+.icon-text-height {
+  background-position: -216px -48px;
 }
-.menu-dropdown, .dropdown-menu {
-  background-color: #ffffff;
-  float: left;
-  display: none;
-  position: absolute;
-  top: 40px;
-  z-index: 900;
-  min-width: 160px;
-  max-width: 220px;
-  _width: 160px;
-  margin-left: 0;
-  margin-right: 0;
-  padding: 6px 0;
-  zoom: 1;
-  border-color: #999;
-  border-color: rgba(0, 0, 0, 0.2);
-  border-style: solid;
-  border-width: 0 1px 1px;
-  -webkit-border-radius: 0 0 6px 6px;
-  -moz-border-radius: 0 0 6px 6px;
-  border-radius: 0 0 6px 6px;
-  -webkit-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
-  -moz-box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
-  -webkit-background-clip: padding-box;
-  -moz-background-clip: padding-box;
-  background-clip: padding-box;
+.icon-text-width {
+  background-position: -240px -48px;
 }
-.menu-dropdown li, .dropdown-menu li {
-  float: none;
-  display: block;
-  background-color: none;
+.icon-align-left {
+  background-position: -264px -48px;
 }
-.menu-dropdown .divider, .dropdown-menu .divider {
-  height: 1px;
-  margin: 5px 0;
-  overflow: hidden;
-  background-color: #eee;
-  border-bottom: 1px solid #ffffff;
+.icon-align-center {
+  background-position: -288px -48px;
 }
-.topbar .dropdown-menu a, .dropdown-menu a {
-  display: block;
-  padding: 4px 15px;
-  clear: both;
-  font-weight: normal;
-  line-height: 18px;
-  color: #808080;
-  text-shadow: 0 1px 0 #ffffff;
+.icon-align-right {
+  background-position: -312px -48px;
 }
-.topbar .dropdown-menu a:hover,
-.dropdown-menu a:hover,
-.topbar .dropdown-menu a.hover,
-.dropdown-menu a.hover {
-  background-color: #dddddd;
-  background-repeat: repeat-x;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));
-  background-image: -moz-linear-gradient(top, #eeeeee, #dddddd);
-  background-image: -ms-linear-gradient(top, #eeeeee, #dddddd);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));
-  background-image: -webkit-linear-gradient(top, #eeeeee, #dddddd);
-  background-image: -o-linear-gradient(top, #eeeeee, #dddddd);
-  background-image: linear-gradient(top, #eeeeee, #dddddd);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0);
-  color: #404040;
-  text-decoration: none;
-  -webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025);
-  -moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025);
-  box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.025), inset 0 -1px rgba(0, 0, 0, 0.025);
+.icon-align-justify {
+  background-position: -336px -48px;
 }
-.open .menu,
-.dropdown.open .menu,
-.open .dropdown-toggle,
-.dropdown.open .dropdown-toggle {
-  color: #ffffff;
-  background: #ccc;
-  background: rgba(0, 0, 0, 0.3);
+.icon-list {
+  background-position: -360px -48px;
 }
-.open .menu-dropdown,
-.dropdown.open .menu-dropdown,
-.open .dropdown-menu,
-.dropdown.open .dropdown-menu {
-  display: block;
+.icon-indent-left {
+  background-position: -384px -48px;
 }
-.tabs, .pills {
-  margin: 0 0 18px;
-  padding: 0;
-  list-style: none;
-  zoom: 1;
+.icon-indent-right {
+  background-position: -408px -48px;
 }
-.tabs:before,
-.pills:before,
-.tabs:after,
-.pills:after {
-  display: table;
-  content: "";
-  zoom: 1;
+.icon-facetime-video {
+  background-position: -432px -48px;
 }
-.tabs:after, .pills:after {
-  clear: both;
+.icon-picture {
+  background-position: -456px -48px;
 }
-.tabs > li, .pills > li {
-  float: left;
+.icon-pencil {
+  background-position: 0 -72px;
 }
-.tabs > li > a, .pills > li > a {
-  display: block;
+.icon-map-marker {
+  background-position: -24px -72px;
 }
-.tabs {
-  border-color: #ddd;
-  border-style: solid;
-  border-width: 0 0 1px;
+.icon-adjust {
+  background-position: -48px -72px;
 }
-.tabs > li {
-  position: relative;
-  margin-bottom: -1px;
+.icon-tint {
+  background-position: -72px -72px;
 }
-.tabs > li > a {
-  padding: 0 15px;
-  margin-right: 2px;
-  line-height: 34px;
-  border: 1px solid transparent;
-  -webkit-border-radius: 4px 4px 0 0;
-  -moz-border-radius: 4px 4px 0 0;
-  border-radius: 4px 4px 0 0;
+.icon-edit {
+  background-position: -96px -72px;
 }
-.tabs > li > a:hover {
-  text-decoration: none;
-  background-color: #eee;
-  border-color: #eee #eee #ddd;
+.icon-share {
+  background-position: -120px -72px;
 }
-.tabs .active > a, .tabs .active > a:hover {
-  color: #808080;
-  background-color: #ffffff;
-  border: 1px solid #ddd;
-  border-bottom-color: transparent;
-  cursor: default;
+.icon-check {
+  background-position: -144px -72px;
 }
-.tabs .menu-dropdown, .tabs .dropdown-menu {
-  top: 35px;
-  border-width: 1px;
-  -webkit-border-radius: 0 6px 6px 6px;
-  -moz-border-radius: 0 6px 6px 6px;
-  border-radius: 0 6px 6px 6px;
+.icon-move {
+  background-position: -168px -72px;
 }
-.tabs a.menu:after, .tabs .dropdown-toggle:after {
-  border-top-color: #999;
-  margin-top: 15px;
-  margin-left: 5px;
+.icon-step-backward {
+  background-position: -192px -72px;
 }
-.tabs li.open.menu .menu, .tabs .open.dropdown .dropdown-toggle {
-  border-color: #999;
+.icon-fast-backward {
+  background-position: -216px -72px;
 }
-.tabs li.open a.menu:after, .tabs .dropdown.open .dropdown-toggle:after {
-  border-top-color: #555;
+.icon-backward {
+  background-position: -240px -72px;
 }
-.pills a {
-  margin: 5px 3px 5px 0;
-  padding: 0 15px;
-  line-height: 30px;
-  text-shadow: 0 1px 1px #ffffff;
-  -webkit-border-radius: 15px;
-  -moz-border-radius: 15px;
-  border-radius: 15px;
+.icon-play {
+  background-position: -264px -72px;
 }
-.pills a:hover {
-  color: #ffffff;
-  text-decoration: none;
-  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25);
-  background-color: #00438a;
+.icon-pause {
+  background-position: -288px -72px;
 }
-.pills .active a {
-  color: #ffffff;
-  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.25);
-  background-color: #0069d6;
+.icon-stop {
+  background-position: -312px -72px;
 }
-.pills-vertical > li {
-  float: none;
+.icon-forward {
+  background-position: -336px -72px;
 }
-.tab-content > .tab-pane,
-.pill-content > .pill-pane,
-.tab-content > div,
-.pill-content > div {
-  display: none;
+.icon-fast-forward {
+  background-position: -360px -72px;
 }
-.tab-content > .active, .pill-content > .active {
-  display: block;
+.icon-step-forward {
+  background-position: -384px -72px;
 }
-.breadcrumb {
-  padding: 7px 14px;
-  margin: 0 0 18px;
-  background-color: #f5f5f5;
-  background-repeat: repeat-x;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));
-  background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5);
-  background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));
-  background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5);
-  background-image: -o-linear-gradient(top, #ffffff, #f5f5f5);
-  background-image: linear-gradient(top, #ffffff, #f5f5f5);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);
-  border: 1px solid #ddd;
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-  -webkit-box-shadow: inset 0 1px 0 #ffffff;
-  -moz-box-shadow: inset 0 1px 0 #ffffff;
-  box-shadow: inset 0 1px 0 #ffffff;
+.icon-eject {
+  background-position: -408px -72px;
 }
-.breadcrumb li {
-  display: inline;
-  text-shadow: 0 1px 0 #ffffff;
+.icon-chevron-left {
+  background-position: -432px -72px;
 }
-.breadcrumb .divider {
-  padding: 0 5px;
-  color: #bfbfbf;
+.icon-chevron-right {
+  background-position: -456px -72px;
 }
-.breadcrumb .active a {
-  color: #404040;
+.icon-plus-sign {
+  background-position: 0 -96px;
 }
-.hero-unit {
-  background-color: #f5f5f5;
-  margin-bottom: 30px;
-  padding: 60px;
-  -webkit-border-radius: 6px;
-  -moz-border-radius: 6px;
-  border-radius: 6px;
+.icon-minus-sign {
+  background-position: -24px -96px;
 }
-.hero-unit h1 {
-  margin-bottom: 0;
-  font-size: 60px;
-  line-height: 1;
-  letter-spacing: -1px;
+.icon-remove-sign {
+  background-position: -48px -96px;
 }
-.hero-unit p {
-  font-size: 18px;
-  font-weight: 200;
-  line-height: 27px;
+.icon-ok-sign {
+  background-position: -72px -96px;
 }
-footer {
-  margin-top: 17px;
-  padding-top: 17px;
-  border-top: 1px solid #eee;
+.icon-question-sign {
+  background-position: -96px -96px;
 }
-.page-header {
-  margin-bottom: 17px;
-  border-bottom: 1px solid #ddd;
-  -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-  -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-  box-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+.icon-info-sign {
+  background-position: -120px -96px;
 }
-.page-header h1 {
-  margin-bottom: 8px;
-}
-.btn.danger,
-.alert-message.danger,
-.btn.danger:hover,
-.alert-message.danger:hover,
-.btn.error,
-.alert-message.error,
-.btn.error:hover,
-.alert-message.error:hover,
-.btn.success,
-.alert-message.success,
-.btn.success:hover,
-.alert-message.success:hover,
-.btn.info,
-.alert-message.info,
-.btn.info:hover,
-.alert-message.info:hover {
-  color: #ffffff;
+.icon-screenshot {
+  background-position: -144px -96px;
 }
-.btn .close, .alert-message .close {
-  font-family: Arial, sans-serif;
-  line-height: 18px;
+.icon-remove-circle {
+  background-position: -168px -96px;
 }
-.btn.danger,
-.alert-message.danger,
-.btn.error,
-.alert-message.error {
-  background-color: #c43c35;
-  background-repeat: repeat-x;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));
-  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));
-  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
-  background-image: linear-gradient(top, #ee5f5b, #c43c35);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  border-color: #c43c35 #c43c35 #882a25;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+.icon-ok-circle {
+  background-position: -192px -96px;
 }
-.btn.success, .alert-message.success {
-  background-color: #57a957;
-  background-repeat: repeat-x;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));
-  background-image: -moz-linear-gradient(top, #62c462, #57a957);
-  background-image: -ms-linear-gradient(top, #62c462, #57a957);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));
-  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
-  background-image: -o-linear-gradient(top, #62c462, #57a957);
-  background-image: linear-gradient(top, #62c462, #57a957);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  border-color: #57a957 #57a957 #3d773d;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+.icon-ban-circle {
+  background-position: -216px -96px;
 }
-.btn.info, .alert-message.info {
-  background-color: #339bb9;
-  background-repeat: repeat-x;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));
-  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));
-  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
-  background-image: linear-gradient(top, #5bc0de, #339bb9);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  border-color: #339bb9 #339bb9 #22697d;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+.icon-arrow-left {
+  background-position: -240px -96px;
 }
-.btn {
-  cursor: pointer;
-  display: inline-block;
-  background-color: #e6e6e6;
-  background-repeat: no-repeat;
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
-  background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
-  background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
-  background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
-  background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
-  background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
-  padding: 5px 14px 6px;
-  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
-  color: #333;
-  font-size: 13px;
-  line-height: normal;
-  border: 1px solid #ccc;
-  border-bottom-color: #bbb;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-  -webkit-transition: 0.1s linear all;
-  -moz-transition: 0.1s linear all;
-  -ms-transition: 0.1s linear all;
-  -o-transition: 0.1s linear all;
-  transition: 0.1s linear all;
+.icon-arrow-right {
+  background-position: -264px -96px;
 }
-.btn:hover {
-  background-position: 0 -15px;
-  color: #333;
-  text-decoration: none;
+.icon-arrow-up {
+  background-position: -289px -96px;
 }
-.btn:focus {
-  outline: 1px dotted #666;
+.icon-arrow-down {
+  background-position: -312px -96px;
 }
-.btn.primary {
-  color: #ffffff;
-  background-color: #0064cd;
-  background-repeat: repeat-x;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));
-  background-image: -moz-linear-gradient(top, #049cdb, #0064cd);
-  background-image: -ms-linear-gradient(top, #049cdb, #0064cd);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));
-  background-image: -webkit-linear-gradient(top, #049cdb, #0064cd);
-  background-image: -o-linear-gradient(top, #049cdb, #0064cd);
-  background-image: linear-gradient(top, #049cdb, #0064cd);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#049cdb', endColorstr='#0064cd', GradientType=0);
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  border-color: #0064cd #0064cd #003f81;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+.icon-share-alt {
+  background-position: -336px -96px;
 }
-.btn.active, .btn:active {
-  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
-  box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.25), 0 1px 2px rgba(0, 0, 0, 0.05);
+.icon-resize-full {
+  background-position: -360px -96px;
 }
-.btn.disabled {
-  cursor: default;
-  background-image: none;
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  filter: alpha(opacity=65);
-  -khtml-opacity: 0.65;
-  -moz-opacity: 0.65;
-  opacity: 0.65;
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
+.icon-resize-small {
+  background-position: -384px -96px;
 }
-.btn[disabled] {
-  cursor: default;
-  background-image: none;
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  filter: alpha(opacity=65);
-  -khtml-opacity: 0.65;
-  -moz-opacity: 0.65;
-  opacity: 0.65;
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
+.icon-plus {
+  background-position: -408px -96px;
 }
-.btn.large {
-  font-size: 15px;
-  line-height: normal;
-  padding: 9px 14px 9px;
-  -webkit-border-radius: 6px;
-  -moz-border-radius: 6px;
-  border-radius: 6px;
+.icon-minus {
+  background-position: -433px -96px;
 }
-.btn.small {
-  padding: 7px 9px 7px;
-  font-size: 11px;
+.icon-asterisk {
+  background-position: -456px -96px;
 }
-:root .alert-message, :root .btn {
-  border-radius: 0 \0;
+.icon-exclamation-sign {
+  background-position: 0 -120px;
 }
-button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
-  padding: 0;
-  border: 0;
+.icon-gift {
+  background-position: -24px -120px;
 }
-.close {
-  float: right;
-  color: #000000;
-  font-size: 20px;
-  font-weight: bold;
-  line-height: 13.5px;
-  text-shadow: 0 1px 0 #ffffff;
-  filter: alpha(opacity=25);
-  -khtml-opacity: 0.25;
-  -moz-opacity: 0.25;
-  opacity: 0.25;
+.icon-leaf {
+  background-position: -48px -120px;
 }
-.close:hover {
-  color: #000000;
-  text-decoration: none;
-  filter: alpha(opacity=40);
-  -khtml-opacity: 0.4;
-  -moz-opacity: 0.4;
-  opacity: 0.4;
+.icon-fire {
+  background-position: -72px -120px;
 }
-.alert-message {
-  position: relative;
-  padding: 7px 15px;
-  margin-bottom: 18px;
-  color: #404040;
-  background-color: #eedc94;
-  background-repeat: repeat-x;
-  background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1), to(#eedc94));
-  background-image: -moz-linear-gradient(top, #fceec1, #eedc94);
-  background-image: -ms-linear-gradient(top, #fceec1, #eedc94);
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #fceec1), color-stop(100%, #eedc94));
-  background-image: -webkit-linear-gradient(top, #fceec1, #eedc94);
-  background-image: -o-linear-gradient(top, #fceec1, #eedc94);
-  background-image: linear-gradient(top, #fceec1, #eedc94);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fceec1', endColorstr='#eedc94', GradientType=0);
-  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
-  border-color: #eedc94 #eedc94 #e4c652;
-  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
-  border-width: 1px;
-  border-style: solid;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
-  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
-  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.25);
+.icon-eye-open {
+  background-position: -96px -120px;
 }
-.alert-message .close {
-  margin-top: 1px;
-  *margin-top: 0;
+.icon-eye-close {
+  background-position: -120px -120px;
 }
-.alert-message a {
-  font-weight: bold;
-  color: #404040;
+.icon-warning-sign {
+  background-position: -144px -120px;
 }
-.alert-message.danger p a,
-.alert-message.error p a,
-.alert-message.success p a,
-.alert-message.info p a {
-  color: #ffffff;
+.icon-plane {
+  background-position: -168px -120px;
 }
-.alert-message h5 {
-  line-height: 18px;
+.icon-calendar {
+  background-position: -192px -120px;
 }
-.alert-message p {
-  margin-bottom: 0;
+.icon-random {
+  background-position: -216px -120px;
 }
-.alert-message div {
-  margin-top: 5px;
-  margin-bottom: 2px;
-  line-height: 28px;
+.icon-comment {
+  background-position: -240px -120px;
 }
-.alert-message .btn {
-  -webkit-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
-  -moz-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
-  box-shadow: 0 1px 0 rgba(255, 255, 255, 0.25);
+.icon-magnet {
+  background-position: -264px -120px;
 }
-.alert-message.block-message {
-  background-image: none;
-  background-color: #fdf5d9;
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  padding: 14px;
-  border-color: #fceec1;
-  -webkit-box-shadow: none;
-  -moz-box-shadow: none;
-  box-shadow: none;
+.icon-chevron-up {
+  background-position: -288px -120px;
 }
-.alert-message.block-message ul, .alert-message.block-message p {
-  margin-right: 30px;
+.icon-chevron-down {
+  background-position: -313px -119px;
 }
-.alert-message.block-message ul {
-  margin-bottom: 0;
+.icon-retweet {
+  background-position: -336px -120px;
 }
-.alert-message.block-message li {
-  color: #404040;
+.icon-shopping-cart {
+  background-position: -360px -120px;
 }
-.alert-message.block-message .alert-actions {
-  margin-top: 5px;
+.icon-folder-close {
+  background-position: -384px -120px;
 }
-.alert-message.block-message.error, .alert-message.block-message.success, .alert-message.block-message.info {
-  color: #404040;
-  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+.icon-folder-open {
+  background-position: -408px -120px;
 }
-.alert-message.block-message.error {
-  background-color: #fddfde;
-  border-color: #fbc7c6;
+.icon-resize-vertical {
+  background-position: -432px -119px;
 }
-.alert-message.block-message.success {
-  background-color: #d1eed1;
-  border-color: #bfe7bf;
+.icon-resize-horizontal {
+  background-position: -456px -118px;
 }
-.alert-message.block-message.info {
-  background-color: #ddf4fb;
-  border-color: #c6edf9;
+.dropdown {
+  position: relative;
 }
-.alert-message.block-message.danger p a,
-.alert-message.block-message.error p a,
-.alert-message.block-message.success p a,
-.alert-message.block-message.info p a {
-  color: #404040;
+.dropdown-toggle {
+  *margin-bottom: -3px;
 }
-.pagination {
-  height: 36px;
-  margin: 18px 0;
+.dropdown-toggle:active, .open .dropdown-toggle {
+  outline: 0;
 }
-.pagination ul {
+.caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  text-indent: -99999px;
+  *text-indent: 0;
+  vertical-align: top;
+  border-left: 4px solid transparent;
+  border-right: 4px solid transparent;
+  border-top: 4px solid #000000;
+  opacity: 0.3;
+  filter: alpha(opacity=30);
+  content: "\2193";
+}
+.dropdown .caret {
+  margin-top: 8px;
+  margin-left: 2px;
+}
+.dropdown:hover .caret, .open.dropdown .caret {
+  opacity: 1;
+  filter: alpha(opacity=100);
+}
+.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: 1000;
   float: left;
+  display: none;
+  min-width: 160px;
+  max-width: 220px;
+  _width: 160px;
+  padding: 4px 0;
   margin: 0;
-  border: 1px solid #ddd;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  -webkit-border-radius: 3px;
-  -moz-border-radius: 3px;
-  border-radius: 3px;
-  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+  list-style: none;
+  background-color: #ffffff;
+  border-color: #ccc;
+  border-color: rgba(0, 0, 0, 0.2);
+  border-style: solid;
+  border-width: 1px;
+  -webkit-border-radius: 0 0 5px 5px;
+  -moz-border-radius: 0 0 5px 5px;
+  border-radius: 0 0 5px 5px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+  -moz-background-clip: padding;
+  background-clip: padding-box;
+  *border-right-width: 2px;
+  *border-bottom-width: 2px;
 }
-.pagination li {
-  display: inline;
+.dropdown-menu.bottom-up {
+  top: auto;
+  bottom: 100%;
+  margin-bottom: 2px;
 }
-.pagination a {
-  float: left;
-  padding: 0 14px;
-  line-height: 34px;
-  border-right: 1px solid;
-  border-right-color: #ddd;
-  border-right-color: rgba(0, 0, 0, 0.15);
-  *border-right-color: #ddd;
-  /* IE6-7 */
-
+.dropdown-menu .divider {
+  height: 1px;
+  margin: 5px 1px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+  *width: 100%;
+  *margin: -5px 0 5px;
+}
+.dropdown-menu a {
+  display: block;
+  padding: 3px 15px;
+  clear: both;
+  font-weight: normal;
+  line-height: 18px;
+  color: #555555;
+  white-space: nowrap;
+}
+.dropdown-menu li > a:hover, .dropdown-menu .active > a, .dropdown-menu .active > a:hover {
+  color: #ffffff;
   text-decoration: none;
+  background-color: #0088cc;
+}
+.dropdown.open {
+  *z-index: 1000;
+}
+.dropdown.open .dropdown-toggle {
+  color: #ffffff;
+  background: #ccc;
+  background: rgba(0, 0, 0, 0.3);
+}
+.dropdown.open .dropdown-menu {
+  display: block;
+}
+.typeahead {
+  margin-top: 2px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.well {
+  min-height: 20px;
+  padding: 19px;
+  margin-bottom: 20px;
+  background-color: #f5f5f5;
+  border: 1px solid #eee;
+  border: 1px solid rgba(0, 0, 0, 0.05);
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+}
+.well blockquote {
+  border-color: #ddd;
+  border-color: rgba(0, 0, 0, 0.15);
+}
+.fade {
+  -webkit-transition: opacity 0.15s linear;
+  -moz-transition: opacity 0.15s linear;
+  -ms-transition: opacity 0.15s linear;
+  -o-transition: opacity 0.15s linear;
+  transition: opacity 0.15s linear;
+  opacity: 0;
+}
+.fade.in {
+  opacity: 1;
+}
+.collapse {
+  -webkit-transition: height 0.35s ease;
+  -moz-transition: height 0.35s ease;
+  -ms-transition: height 0.35s ease;
+  -o-transition: height 0.35s ease;
+  transition: height 0.35s ease;
+  position: relative;
+  overflow: hidden;
+  height: 0;
+}
+.collapse.in {
+  height: auto;
+}
+.close {
+  float: right;
+  font-size: 20px;
+  font-weight: bold;
+  line-height: 18px;
+  color: #000000;
+  text-shadow: 0 1px 0 #ffffff;
+  opacity: 0.2;
+  filter: alpha(opacity=20);
+}
+.close:hover {
+  color: #000000;
+  text-decoration: none;
+  opacity: 0.4;
+  filter: alpha(opacity=40);
+  cursor: pointer;
+}
+.btn {
+  display: inline-block;
+  padding: 4px 10px 4px;
+  font-size: 13px;
+  line-height: 18px;
+  color: #333333;
+  text-align: center;
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+  background-color: #fafafa;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(25%, #ffffff), to(#e6e6e6));
+  background-image: -webkit-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -moz-linear-gradient(top, #ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -ms-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: -o-linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-image: linear-gradient(#ffffff, #ffffff 25%, #e6e6e6);
+  background-repeat: no-repeat;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
+  border: 1px solid #ccc;
+  border-bottom-color: #bbb;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  cursor: pointer;
+  *margin-left: .3em;
+}
+.btn:first-child {
+  *margin-left: 0;
+}
+.btn:hover {
+  color: #333333;
+  text-decoration: none;
+  background-color: #e6e6e6;
+  background-position: 0 -15px;
+  -webkit-transition: background-position 0.1s linear;
+  -moz-transition: background-position 0.1s linear;
+  -ms-transition: background-position 0.1s linear;
+  -o-transition: background-position 0.1s linear;
+  transition: background-position 0.1s linear;
+}
+.btn:focus {
+  outline: thin dotted;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+.btn.active, .btn:active {
+  background-image: none;
+  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+  background-color: #e6e6e6;
+  background-color: #d9d9d9 \9;
+  color: rgba(0, 0, 0, 0.5);
+  outline: 0;
+}
+.btn.disabled, .btn[disabled] {
+  cursor: default;
+  background-image: none;
+  background-color: #e6e6e6;
+  opacity: 0.65;
+  filter: alpha(opacity=65);
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+.btn-large {
+  padding: 9px 14px;
+  font-size: 15px;
+  line-height: normal;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+}
+.btn-large .icon {
+  margin-top: 1px;
+}
+.btn-small {
+  padding: 5px 9px;
+  font-size: 11px;
+  line-height: 16px;
+}
+.btn-small .icon {
+  margin-top: -1px;
+}
+.btn-primary,
+.btn-primary:hover,
+.btn-warning,
+.btn-warning:hover,
+.btn-danger,
+.btn-danger:hover,
+.btn-success,
+.btn-success:hover,
+.btn-info,
+.btn-info:hover {
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  color: #ffffff;
+}
+.btn-primary.active,
+.btn-warning.active,
+.btn-danger.active,
+.btn-success.active,
+.btn-info.active {
+  color: rgba(255, 255, 255, 0.75);
+}
+.btn-primary {
+  background-color: #006dcc;
+  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -o-linear-gradient(top, #0088cc, #0044cc);
+  background-image: linear-gradient(top, #0088cc, #0044cc);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
+  border-color: #0044cc #0044cc #002a80;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-primary:hover,
+.btn-primary:active,
+.btn-primary.active,
+.btn-primary.disabled,
+.btn-primary[disabled] {
+  background-color: #0044cc;
+}
+.btn-primary:active, .btn-primary.active {
+  background-color: #003399 \9;
+}
+.btn-warning {
+  background-color: #faa732;
+  background-image: -moz-linear-gradient(top, #fbb450, #f89406);
+  background-image: -ms-linear-gradient(top, #fbb450, #f89406);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));
+  background-image: -webkit-linear-gradient(top, #fbb450, #f89406);
+  background-image: -o-linear-gradient(top, #fbb450, #f89406);
+  background-image: linear-gradient(top, #fbb450, #f89406);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);
+  border-color: #f89406 #f89406 #ad6704;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-warning:hover,
+.btn-warning:active,
+.btn-warning.active,
+.btn-warning.disabled,
+.btn-warning[disabled] {
+  background-color: #f89406;
+}
+.btn-warning:active, .btn-warning.active {
+  background-color: #c67605 \9;
+}
+.btn-danger {
+  background-color: #da4f49;
+  background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
+  background-image: linear-gradient(top, #ee5f5b, #bd362f);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);
+  border-color: #bd362f #bd362f #802420;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-danger:hover,
+.btn-danger:active,
+.btn-danger.active,
+.btn-danger.disabled,
+.btn-danger[disabled] {
+  background-color: #bd362f;
+}
+.btn-danger:active, .btn-danger.active {
+  background-color: #942a25 \9;
+}
+.btn-success {
+  background-color: #5bb75b;
+  background-image: -moz-linear-gradient(top, #62c462, #51a351);
+  background-image: -ms-linear-gradient(top, #62c462, #51a351);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));
+  background-image: -webkit-linear-gradient(top, #62c462, #51a351);
+  background-image: -o-linear-gradient(top, #62c462, #51a351);
+  background-image: linear-gradient(top, #62c462, #51a351);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);
+  border-color: #51a351 #51a351 #387038;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-success:hover,
+.btn-success:active,
+.btn-success.active,
+.btn-success.disabled,
+.btn-success[disabled] {
+  background-color: #51a351;
+}
+.btn-success:active, .btn-success.active {
+  background-color: #408140 \9;
+}
+.btn-info {
+  background-color: #49afcd;
+  background-image: -moz-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: -ms-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));
+  background-image: -webkit-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: -o-linear-gradient(top, #5bc0de, #2f96b4);
+  background-image: linear-gradient(top, #5bc0de, #2f96b4);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);
+  border-color: #2f96b4 #2f96b4 #1f6377;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+.btn-info:hover,
+.btn-info:active,
+.btn-info.active,
+.btn-info.disabled,
+.btn-info[disabled] {
+  background-color: #2f96b4;
+}
+.btn-info:active, .btn-info.active {
+  background-color: #24748c \9;
+}
+button.btn, input[type="submit"].btn {
+  *padding-top: 2px;
+  *padding-bottom: 2px;
+}
+button.btn::-moz-focus-inner, input[type="submit"].btn::-moz-focus-inner {
+  padding: 0;
+  border: 0;
+}
+button.btn.large, input[type="submit"].btn.large {
+  *padding-top: 7px;
+  *padding-bottom: 7px;
+}
+button.btn.small, input[type="submit"].btn.small {
+  *padding-top: 3px;
+  *padding-bottom: 3px;
+}
+.btn-group {
+  position: relative;
+  *zoom: 1;
+  *margin-left: .3em;
+}
+.btn-group:before, .btn-group:after {
+  display: table;
+  content: "";
+}
+.btn-group:after {
+  clear: both;
+}
+.btn-group:first-child {
+  *margin-left: 0;
+}
+.btn-group + .btn-group {
+  margin-left: 5px;
+}
+.btn-toolbar {
+  margin-top: 9px;
+  margin-bottom: 9px;
+}
+.btn-toolbar .btn-group {
+  display: inline-block;
+  *display: inline;
+  /* IE7 inline-block hack */
+
+  *zoom: 1;
+}
+.btn-group .btn {
+  position: relative;
+  float: left;
+  margin-left: -1px;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.btn-group .btn:first-child {
+  margin-left: 0;
+  -webkit-border-top-left-radius: 4px;
+  -moz-border-radius-topleft: 4px;
+  border-top-left-radius: 4px;
+  -webkit-border-bottom-left-radius: 4px;
+  -moz-border-radius-bottomleft: 4px;
+  border-bottom-left-radius: 4px;
+}
+.btn-group .btn:last-child, .btn-group .dropdown-toggle {
+  -webkit-border-top-right-radius: 4px;
+  -moz-border-radius-topright: 4px;
+  border-top-right-radius: 4px;
+  -webkit-border-bottom-right-radius: 4px;
+  -moz-border-radius-bottomright: 4px;
+  border-bottom-right-radius: 4px;
+}
+.btn-group .btn.large:first-child {
+  margin-left: 0;
+  -webkit-border-top-left-radius: 6px;
+  -moz-border-radius-topleft: 6px;
+  border-top-left-radius: 6px;
+  -webkit-border-bottom-left-radius: 6px;
+  -moz-border-radius-bottomleft: 6px;
+  border-bottom-left-radius: 6px;
+}
+.btn-group .btn.large:last-child, .btn-group .large.dropdown-toggle {
+  -webkit-border-top-right-radius: 6px;
+  -moz-border-radius-topright: 6px;
+  border-top-right-radius: 6px;
+  -webkit-border-bottom-right-radius: 6px;
+  -moz-border-radius-bottomright: 6px;
+  border-bottom-right-radius: 6px;
+}
+.btn-group .btn:hover,
+.btn-group .btn:focus,
+.btn-group .btn:active,
+.btn-group .btn.active {
+  z-index: 2;
+}
+.btn-group .dropdown-toggle:active, .btn-group.open .dropdown-toggle {
+  outline: 0;
+}
+.btn-group .dropdown-toggle {
+  padding-left: 8px;
+  padding-right: 8px;
+  -webkit-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 1px 0 0 rgba(255, 255, 255, 0.125), inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  *padding-top: 5px;
+  *padding-bottom: 5px;
+}
+.btn-group.open {
+  *z-index: 1000;
+}
+.btn-group.open .dropdown-menu {
+  display: block;
+  margin-top: 1px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+}
+.btn-group.open .dropdown-toggle {
+  background-image: none;
+  -webkit-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 1px 6px rgba(0, 0, 0, 0.15), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+.btn .caret {
+  margin-top: 7px;
+  margin-left: 0;
+}
+.btn:hover .caret, .open.btn-group .caret {
+  opacity: 1;
+  filter: alpha(opacity=100);
+}
+.btn-primary .caret,
+.btn-danger .caret,
+.btn-info .caret,
+.btn-success .caret {
+  border-top-color: #ffffff;
+  opacity: 0.75;
+  filter: alpha(opacity=75);
+}
+.btn-small .caret {
+  margin-top: 4px;
+}
+.alert {
+  padding: 8px 35px 8px 14px;
+  margin-bottom: 18px;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+  background-color: #fcf8e3;
+  border: 1px solid #fbeed5;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.alert, .alert-heading {
+  color: #c09853;
+}
+.alert .close {
+  position: relative;
+  top: -2px;
+  right: -21px;
+  line-height: 18px;
+}
+.alert-success {
+  background-color: #dff0d8;
+  border-color: #d6e9c6;
+}
+.alert-success, .alert-success .alert-heading {
+  color: #468847;
+}
+.alert-danger, .alert-error {
+  background-color: #f2dede;
+  border-color: #eed3d7;
+}
+.alert-danger,
+.alert-error,
+.alert-danger .alert-heading,
+.alert-error .alert-heading {
+  color: #b94a48;
+}
+.alert-info {
+  background-color: #d9edf7;
+  border-color: #bce8f1;
+}
+.alert-info, .alert-info .alert-heading {
+  color: #3a87ad;
+}
+.alert-block {
+  padding-top: 14px;
+  padding-bottom: 14px;
+}
+.alert-block > p, .alert-block > ul {
+  margin-bottom: 0;
+}
+.alert-block p + p {
+  margin-top: 5px;
+}
+.nav {
+  margin-left: 0;
+  margin-bottom: 18px;
+  list-style: none;
+}
+.nav > li > a {
+  display: block;
+}
+.nav > li > a:hover {
+  text-decoration: none;
+  background-color: #eeeeee;
+}
+.nav-list {
+  padding-left: 14px;
+  padding-right: 14px;
+  margin-bottom: 0;
+}
+.nav-list > li > a, .nav-list .nav-header {
+  display: block;
+  padding: 3px 15px;
+  margin-left: -15px;
+  margin-right: -15px;
+  text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
+}
+.nav-list .nav-header {
+  font-size: 11px;
+  font-weight: bold;
+  line-height: 18px;
+  color: #999999;
+  text-transform: uppercase;
+}
+.nav-list > li + .nav-header {
+  margin-top: 9px;
+}
+.nav-list .active > a, .nav-list .active > a:hover {
+  color: #ffffff;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.2);
+  background-color: #0088cc;
+}
+.nav-list [class^="icon-"] {
+  margin-right: 2px;
+}
+.nav-tabs, .nav-pills {
+  *zoom: 1;
+}
+.nav-tabs:before,
+.nav-pills:before,
+.nav-tabs:after,
+.nav-pills:after {
+  display: table;
+  content: "";
+}
+.nav-tabs:after, .nav-pills:after {
+  clear: both;
+}
+.nav-tabs > li, .nav-pills > li {
+  float: left;
+}
+.nav-tabs > li > a, .nav-pills > li > a {
+  padding-right: 12px;
+  padding-left: 12px;
+  margin-right: 2px;
+  line-height: 14px;
+}
+.nav-tabs {
+  border-bottom: 1px solid #ddd;
+}
+.nav-tabs > li {
+  margin-bottom: -1px;
+}
+.nav-tabs > li > a {
+  padding-top: 9px;
+  padding-bottom: 9px;
+  border: 1px solid transparent;
+  -webkit-border-radius: 4px 4px 0 0;
+  -moz-border-radius: 4px 4px 0 0;
+  border-radius: 4px 4px 0 0;
+}
+.nav-tabs > li > a:hover {
+  border-color: #eeeeee #eeeeee #dddddd;
+}
+.nav-tabs > .active > a, .nav-tabs > .active > a:hover {
+  color: #555555;
+  background-color: #ffffff;
+  border: 1px solid #ddd;
+  border-bottom-color: transparent;
+  cursor: default;
+}
+.nav-pills > li > a {
+  padding-top: 8px;
+  padding-bottom: 8px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  -webkit-border-radius: 5px;
+  -moz-border-radius: 5px;
+  border-radius: 5px;
+}
+.nav-pills .active > a, .nav-pills .active > a:hover {
+  color: #ffffff;
+  background-color: #0088cc;
+}
+.nav-stacked > li {
+  float: none;
+}
+.nav-stacked > li > a {
+  margin-right: 0;
+}
+.nav-tabs.nav-stacked {
+  border-bottom: 0;
+}
+.nav-tabs.nav-stacked > li > a {
+  border: 1px solid #ddd;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.nav-tabs.nav-stacked > li:first-child > a {
+  -webkit-border-radius: 4px 4px 0 0;
+  -moz-border-radius: 4px 4px 0 0;
+  border-radius: 4px 4px 0 0;
+}
+.nav-tabs.nav-stacked > li:last-child > a {
+  -webkit-border-radius: 0 0 4px 4px;
+  -moz-border-radius: 0 0 4px 4px;
+  border-radius: 0 0 4px 4px;
+}
+.nav-tabs.nav-stacked > li > a:hover {
+  border-color: #ddd;
+  z-index: 2;
+}
+.nav-pills.nav-stacked > li > a {
+  margin-bottom: 3px;
+}
+.nav-pills.nav-stacked > li:last-child > a {
+  margin-bottom: 1px;
+}
+.nav-tabs .dropdown-menu, .nav-pills .dropdown-menu {
+  margin-top: 1px;
+  border-width: 1px;
+}
+.nav-pills .dropdown-menu {
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.nav-tabs .dropdown-toggle .caret, .nav-pills .dropdown-toggle .caret {
+  border-top-color: #0088cc;
+  margin-top: 6px;
+}
+.nav-tabs .dropdown-toggle:hover .caret, .nav-pills .dropdown-toggle:hover .caret {
+  border-top-color: #005580;
+}
+.nav-tabs .active .dropdown-toggle .caret, .nav-pills .active .dropdown-toggle .caret {
+  border-top-color: #333333;
+}
+.nav > .dropdown.active > a:hover {
+  color: #000000;
+  cursor: pointer;
+}
+.nav-tabs .open .dropdown-toggle, .nav-pills .open .dropdown-toggle, .nav > .open.active > a:hover {
+  color: #ffffff;
+  background-color: #999999;
+  border-color: #999999;
+}
+.nav .open .caret, .nav .open.active .caret, .nav .open a:hover .caret {
+  border-top-color: #ffffff;
+  opacity: 1;
+  filter: alpha(opacity=100);
+}
+.tabs-stacked .open > a:hover {
+  border-color: #999999;
+}
+.tabbable {
+  *zoom: 1;
+}
+.tabbable:before, .tabbable:after {
+  display: table;
+  content: "";
+}
+.tabbable:after {
+  clear: both;
+}
+.tabs-below .nav-tabs, .tabs-right .nav-tabs, .tabs-left .nav-tabs {
+  border-bottom: 0;
+}
+.tab-content > .tab-pane, .pill-content > .pill-pane {
+  display: none;
+}
+.tab-content > .active, .pill-content > .active {
+  display: block;
+}
+.tabs-below .nav-tabs {
+  border-top: 1px solid #ddd;
+}
+.tabs-below .nav-tabs > li {
+  margin-top: -1px;
+  margin-bottom: 0;
+}
+.tabs-below .nav-tabs > li > a {
+  -webkit-border-radius: 0 0 4px 4px;
+  -moz-border-radius: 0 0 4px 4px;
+  border-radius: 0 0 4px 4px;
+}
+.tabs-below .nav-tabs > li > a:hover {
+  border-bottom-color: transparent;
+  border-top-color: #ddd;
+}
+.tabs-below .nav-tabs .active > a, .tabs-below .nav-tabs .active > a:hover {
+  border-color: transparent #ddd #ddd #ddd;
+}
+.tabs-left .nav-tabs > li, .tabs-right .nav-tabs > li {
+  float: none;
+}
+.tabs-left .nav-tabs > li > a, .tabs-right .nav-tabs > li > a {
+  min-width: 74px;
+  margin-right: 0;
+  margin-bottom: 3px;
+}
+.tabs-left .nav-tabs {
+  float: left;
+  margin-right: 19px;
+  border-right: 1px solid #ddd;
+}
+.tabs-left .nav-tabs > li > a {
+  margin-right: -1px;
+  -webkit-border-radius: 4px 0 0 4px;
+  -moz-border-radius: 4px 0 0 4px;
+  border-radius: 4px 0 0 4px;
+}
+.tabs-left .nav-tabs > li > a:hover {
+  border-color: #eeeeee #dddddd #eeeeee #eeeeee;
+}
+.tabs-left .nav-tabs .active > a, .tabs-left .nav-tabs .active > a:hover {
+  border-color: #ddd transparent #ddd #ddd;
+  *border-right-color: #ffffff;
+}
+.tabs-right .nav-tabs {
+  float: right;
+  margin-left: 19px;
+  border-left: 1px solid #ddd;
+}
+.tabs-right .nav-tabs > li > a {
+  margin-left: -1px;
+  -webkit-border-radius: 0 4px 4px 0;
+  -moz-border-radius: 0 4px 4px 0;
+  border-radius: 0 4px 4px 0;
+}
+.tabs-right .nav-tabs > li > a:hover {
+  border-color: #eeeeee #eeeeee #eeeeee #dddddd;
+}
+.tabs-right .nav-tabs .active > a, .tabs-right .nav-tabs .active > a:hover {
+  border-color: #ddd #ddd #ddd transparent;
+  *border-left-color: #ffffff;
+}
+.navbar {
+  overflow: visible;
+  margin-bottom: 18px;
+}
+.navbar-inner {
+  padding-left: 20px;
+  padding-right: 20px;
+  background-color: #2c2c2c;
+  background-image: -moz-linear-gradient(top, #333333, #222222);
+  background-image: -ms-linear-gradient(top, #333333, #222222);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));
+  background-image: -webkit-linear-gradient(top, #333333, #222222);
+  background-image: -o-linear-gradient(top, #333333, #222222);
+  background-image: linear-gradient(top, #333333, #222222);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+}
+.btn-navbar {
+  display: none;
+  float: right;
+  padding: 7px 10px;
+  margin-left: 5px;
+  margin-right: 5px;
+  background-color: #2c2c2c;
+  background-image: -moz-linear-gradient(top, #333333, #222222);
+  background-image: -ms-linear-gradient(top, #333333, #222222);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));
+  background-image: -webkit-linear-gradient(top, #333333, #222222);
+  background-image: -o-linear-gradient(top, #333333, #222222);
+  background-image: linear-gradient(top, #333333, #222222);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
+  border-color: #222222 #222222 #000000;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
+}
+.btn-navbar:hover,
+.btn-navbar:active,
+.btn-navbar.active,
+.btn-navbar.disabled,
+.btn-navbar[disabled] {
+  background-color: #222222;
+}
+.btn-navbar:active, .btn-navbar.active {
+  background-color: #080808 \9;
+}
+.btn-navbar .icon-bar {
+  display: block;
+  width: 18px;
+  height: 2px;
+  background-color: #f5f5f5;
+  -webkit-border-radius: 1px;
+  -moz-border-radius: 1px;
+  border-radius: 1px;
+  -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+  -moz-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+  box-shadow: 0 1px 0 rgba(0, 0, 0, 0.25);
+}
+.btn-navbar .icon-bar + .icon-bar {
+  margin-top: 3px;
+}
+.nav-collapse.collapse {
+  height: auto;
+}
+.navbar .brand:hover {
+  text-decoration: none;
+}
+.navbar .brand {
+  float: left;
+  display: block;
+  padding: 8px 20px 12px;
+  margin-left: -20px;
+  font-size: 20px;
+  font-weight: 200;
+  line-height: 1;
+  color: #ffffff;
+}
+.navbar .navbar-text {
+  margin-bottom: 0;
+  line-height: 40px;
+  color: #999999;
+}
+.navbar .navbar-text a:hover {
+  color: #ffffff;
+  background-color: transparent;
+}
+.navbar .btn, .navbar .btn-group {
+  margin-top: 5px;
+}
+.navbar .btn-group .btn {
+  margin-top: 0;
+}
+.navbar-form {
+  margin-bottom: 0;
+  *zoom: 1;
+}
+.navbar-form:before, .navbar-form:after {
+  display: table;
+  content: "";
+}
+.navbar-form:after {
+  clear: both;
+}
+.navbar-form input, .navbar-form select {
+  display: inline-block;
+  margin-top: 5px;
+  margin-bottom: 0;
+}
+.navbar-form .radio, .navbar-form .checkbox {
+  margin-top: 5px;
+}
+.navbar-form input[type="image"], .navbar-form input[type="checkbox"], .navbar-form input[type="radio"] {
+  margin-top: 3px;
+}
+.navbar-search {
+  position: relative;
+  float: left;
+  margin-top: 6px;
+  margin-bottom: 0;
+}
+.navbar-search .search-query {
+  padding: 4px 9px;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 1;
+  color: #ffffff;
+  color: rgba(255, 255, 255, 0.75);
+  background: #666;
+  background: rgba(255, 255, 255, 0.3);
+  border: 1px solid #111;
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
+  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0px rgba(255, 255, 255, 0.15);
+  -webkit-transition: none;
+  -moz-transition: none;
+  -ms-transition: none;
+  -o-transition: none;
+  transition: none;
+}
+.navbar-search .search-query :-moz-placeholder {
+  color: #eeeeee;
+}
+.navbar-search .search-query::-webkit-input-placeholder {
+  color: #eeeeee;
+}
+.navbar-search .search-query:hover {
+  color: #ffffff;
+  background-color: #999999;
+  background-color: rgba(255, 255, 255, 0.5);
+}
+.navbar-search .search-query:focus, .navbar-search .search-query.focused {
+  padding: 5px 10px;
+  color: #333333;
+  text-shadow: 0 1px 0 #ffffff;
+  background-color: #ffffff;
+  border: 0;
+  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+  -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+  box-shadow: 0 0 3px rgba(0, 0, 0, 0.15);
+  outline: 0;
+}
+.navbar-fixed-top {
+  position: fixed;
+  top: 0;
+  right: 0;
+  left: 0;
+  z-index: 1030;
+}
+.navbar-fixed-top .navbar-inner {
+  padding-left: 0;
+  padding-right: 0;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+.navbar .nav {
+  position: relative;
+  left: 0;
+  display: block;
+  float: left;
+  margin: 0 10px 0 0;
+}
+.navbar .nav.pull-right {
+  float: right;
+}
+.navbar .nav > li {
+  display: block;
+  float: left;
+}
+.navbar .nav > li > a {
+  float: none;
+  padding: 10px 10px 11px;
+  line-height: 19px;
+  color: #999999;
+  text-decoration: none;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+}
+.navbar .nav > li > a:hover {
+  background-color: transparent;
+  color: #ffffff;
+  text-decoration: none;
+}
+.navbar .nav .active > a, .navbar .nav .active > a:hover {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #222222;
+  background-color: rgba(0, 0, 0, 0.5);
+}
+.navbar .divider-vertical {
+  height: 40px;
+  width: 1px;
+  margin: 0 9px;
+  overflow: hidden;
+  background-color: #222222;
+  border-right: 1px solid #333333;
+}
+.navbar .nav.pull-right {
+  margin-left: 10px;
+  margin-right: 0;
+}
+.navbar .dropdown-menu {
+  margin-top: 1px;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+}
+.navbar .dropdown-menu:before {
+  content: '';
+  display: inline-block;
+  border-left: 7px solid transparent;
+  border-right: 7px solid transparent;
+  border-bottom: 7px solid #ccc;
+  border-bottom-color: rgba(0, 0, 0, 0.2);
+  position: absolute;
+  top: -7px;
+  left: 9px;
+}
+.navbar .dropdown-menu:after {
+  content: '';
+  display: inline-block;
+  border-left: 6px solid transparent;
+  border-right: 6px solid transparent;
+  border-bottom: 6px solid #ffffff;
+  position: absolute;
+  top: -6px;
+  left: 10px;
+}
+.navbar .nav .dropdown-toggle .caret, .navbar .nav .open.dropdown .caret {
+  border-top-color: #ffffff;
+}
+.navbar .nav .active .caret {
+  opacity: 1;
+  filter: alpha(opacity=100);
+}
+.navbar .nav .open > .dropdown-toggle, .navbar .nav .active > .dropdown-toggle, .navbar .nav .open.active > .dropdown-toggle {
+  background-color: transparent;
+}
+.navbar .nav .active > .dropdown-toggle:hover {
+  color: #ffffff;
+}
+.navbar .nav.pull-right .dropdown-menu {
+  left: auto;
+  right: 0;
+}
+.navbar .nav.pull-right .dropdown-menu:before {
+  left: auto;
+  right: 12px;
+}
+.navbar .nav.pull-right .dropdown-menu:after {
+  left: auto;
+  right: 13px;
+}
+.breadcrumb {
+  padding: 7px 14px;
+  margin: 0 0 18px;
+  background-color: #fbfbfb;
+  background-image: -moz-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: -ms-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));
+  background-image: -webkit-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: -o-linear-gradient(top, #ffffff, #f5f5f5);
+  background-image: linear-gradient(top, #ffffff, #f5f5f5);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);
+  border: 1px solid #ddd;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  -webkit-box-shadow: inset 0 1px 0 #ffffff;
+  -moz-box-shadow: inset 0 1px 0 #ffffff;
+  box-shadow: inset 0 1px 0 #ffffff;
+}
+.breadcrumb li {
+  display: inline;
+  text-shadow: 0 1px 0 #ffffff;
+}
+.breadcrumb .divider {
+  padding: 0 5px;
+  color: #999999;
+}
+.breadcrumb .active a {
+  color: #333333;
+}
+.pagination {
+  height: 36px;
+  margin: 18px 0;
+}
+.pagination ul {
+  display: inline-block;
+  *display: inline;
+  /* IE7 inline-block hack */
+
+  *zoom: 1;
+  margin-left: 0;
+  margin-bottom: 0;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+.pagination li {
+  display: inline;
+}
+.pagination a {
+  float: left;
+  padding: 0 14px;
+  line-height: 34px;
+  text-decoration: none;
+  border: 1px solid #ddd;
+  border-left-width: 0;
+}
+.pagination a:hover, .pagination .active a {
+  background-color: #f5f5f5;
+}
+.pagination .active a {
+  color: #999999;
+  cursor: default;
+}
+.pagination .disabled a, .pagination .disabled a:hover {
+  color: #999999;
+  background-color: transparent;
+  cursor: default;
+}
+.pagination li:first-child a {
+  border-left-width: 1px;
+  -webkit-border-radius: 3px 0 0 3px;
+  -moz-border-radius: 3px 0 0 3px;
+  border-radius: 3px 0 0 3px;
+}
+.pagination li:last-child a {
+  -webkit-border-radius: 0 3px 3px 0;
+  -moz-border-radius: 0 3px 3px 0;
+  border-radius: 0 3px 3px 0;
+}
+.pagination-centered {
+  text-align: center;
+}
+.pagination-right {
+  text-align: right;
+}
+.pager {
+  margin-left: 0;
+  margin-bottom: 18px;
+  list-style: none;
+  text-align: center;
+  *zoom: 1;
+}
+.pager:before, .pager:after {
+  display: table;
+  content: "";
+}
+.pager:after {
+  clear: both;
+}
+.pager li {
+  display: inline;
+}
+.pager a {
+  display: inline-block;
+  padding: 5px 14px;
+  background-color: #fff;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 15px;
+  -moz-border-radius: 15px;
+  border-radius: 15px;
+}
+.pager a:hover {
+  text-decoration: none;
+  background-color: #f5f5f5;
+}
+.pager .next a {
+  float: right;
 }
-.pagination a:hover, .pagination .active a {
-  background-color: #c7eefe;
+.pager .previous a {
+  float: left;
 }
-.pagination .disabled a, .pagination .disabled a:hover {
-  background-color: transparent;
-  color: #bfbfbf;
+.modal-open .dropdown-menu {
+  z-index: 2050;
 }
-.pagination .next a {
-  border: 0;
+.modal-open .dropdown.open {
+  *z-index: 2050;
 }
-.well {
-  background-color: #f5f5f5;
-  margin-bottom: 20px;
-  padding: 19px;
-  min-height: 20px;
-  border: 1px solid #eee;
-  border: 1px solid rgba(0, 0, 0, 0.05);
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-  -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.05);
+.modal-open .popover {
+  z-index: 2060;
 }
-.well blockquote {
-  border-color: #ddd;
-  border-color: rgba(0, 0, 0, 0.15);
+.modal-open .tooltip {
+  z-index: 2070;
 }
 .modal-backdrop {
-  background-color: #000000;
   position: fixed;
   top: 0;
-  left: 0;
   right: 0;
   bottom: 0;
-  z-index: 10000;
+  left: 0;
+  z-index: 1040;
+  background-color: #000000;
 }
 .modal-backdrop.fade {
   opacity: 0;
 }
 .modal-backdrop, .modal-backdrop.fade.in {
-  filter: alpha(opacity=80);
-  -khtml-opacity: 0.8;
-  -moz-opacity: 0.8;
   opacity: 0.8;
+  filter: alpha(opacity=80);
 }
 .modal {
   position: fixed;
   top: 50%;
   left: 50%;
-  z-index: 11000;
+  z-index: 1050;
+  max-height: 500px;
+  overflow: auto;
   width: 560px;
   margin: -250px 0 0 -280px;
   background-color: #ffffff;
@@ -2195,9 +2789,6 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   -moz-background-clip: padding-box;
   background-clip: padding-box;
 }
-.modal .close {
-  margin-top: 7px;
-}
 .modal.fade {
   -webkit-transition: opacity .3s linear, top .3s ease-out;
   -moz-transition: opacity .3s linear, top .3s ease-out;
@@ -2210,18 +2801,19 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   top: 50%;
 }
 .modal-header {
+  padding: 9px 15px;
   border-bottom: 1px solid #eee;
-  padding: 5px 15px;
+}
+.modal-header .close {
+  margin-top: 2px;
 }
 .modal-body {
   padding: 15px;
 }
-.modal-body form {
-  margin-bottom: 0;
-}
 .modal-footer {
-  background-color: #f5f5f5;
   padding: 14px 15px 15px;
+  margin-bottom: 0;
+  background-color: #f5f5f5;
   border-top: 1px solid #ddd;
   -webkit-border-radius: 0 0 6px 6px;
   -moz-border-radius: 0 0 6px 6px;
@@ -2229,13 +2821,11 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   -webkit-box-shadow: inset 0 1px 0 #ffffff;
   -moz-box-shadow: inset 0 1px 0 #ffffff;
   box-shadow: inset 0 1px 0 #ffffff;
-  zoom: 1;
-  margin-bottom: 0;
+  *zoom: 1;
 }
 .modal-footer:before, .modal-footer:after {
   display: table;
   content: "";
-  zoom: 1;
 }
 .modal-footer:after {
   clear: both;
@@ -2243,29 +2833,35 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
 .modal-footer .btn {
   float: right;
   margin-left: 5px;
+  margin-bottom: 0;
 }
-.modal .popover, .modal .twipsy {
-  z-index: 12000;
-}
-.twipsy {
-  display: block;
+.tooltip {
   position: absolute;
+  z-index: 1020;
+  display: block;
   visibility: visible;
   padding: 5px;
   font-size: 11px;
-  z-index: 1000;
-  filter: alpha(opacity=80);
-  -khtml-opacity: 0.8;
-  -moz-opacity: 0.8;
-  opacity: 0.8;
+  opacity: 0;
+  filter: alpha(opacity=0);
 }
-.twipsy.fade.in {
-  filter: alpha(opacity=80);
-  -khtml-opacity: 0.8;
-  -moz-opacity: 0.8;
+.tooltip.in {
   opacity: 0.8;
+  filter: alpha(opacity=80);
+}
+.tooltip.top {
+  margin-top: -2px;
+}
+.tooltip.right {
+  margin-left: 2px;
 }
-.twipsy.above .twipsy-arrow {
+.tooltip.bottom {
+  margin-top: 2px;
+}
+.tooltip.left {
+  margin-left: -2px;
+}
+.tooltip.top .tooltip-arrow {
   bottom: 0;
   left: 50%;
   margin-left: -5px;
@@ -2273,7 +2869,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   border-right: 5px solid transparent;
   border-top: 5px solid #000000;
 }
-.twipsy.left .twipsy-arrow {
+.tooltip.left .tooltip-arrow {
   top: 50%;
   right: 0;
   margin-top: -5px;
@@ -2281,7 +2877,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   border-bottom: 5px solid transparent;
   border-left: 5px solid #000000;
 }
-.twipsy.below .twipsy-arrow {
+.tooltip.bottom .tooltip-arrow {
   top: 0;
   left: 50%;
   margin-left: -5px;
@@ -2289,7 +2885,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   border-right: 5px solid transparent;
   border-bottom: 5px solid #000000;
 }
-.twipsy.right .twipsy-arrow {
+.tooltip.right .tooltip-arrow {
   top: 50%;
   left: 0;
   margin-top: -5px;
@@ -2297,18 +2893,18 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   border-bottom: 5px solid transparent;
   border-right: 5px solid #000000;
 }
-.twipsy-inner {
+.tooltip-inner {
+  max-width: 200px;
   padding: 3px 8px;
-  background-color: #000000;
-  color: white;
+  color: #ffffff;
   text-align: center;
-  max-width: 200px;
   text-decoration: none;
+  background-color: #000000;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
 }
-.twipsy-arrow {
+.tooltip-arrow {
   position: absolute;
   width: 0;
   height: 0;
@@ -2317,11 +2913,23 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   position: absolute;
   top: 0;
   left: 0;
-  z-index: 1000;
-  padding: 5px;
+  z-index: 1010;
   display: none;
+  padding: 5px;
+}
+.popover.top {
+  margin-top: -5px;
 }
-.popover.above .arrow {
+.popover.right {
+  margin-left: 5px;
+}
+.popover.bottom {
+  margin-top: 5px;
+}
+.popover.left {
+  margin-left: -5px;
+}
+.popover.top .arrow {
   bottom: 0;
   left: 50%;
   margin-left: -5px;
@@ -2337,7 +2945,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   border-bottom: 5px solid transparent;
   border-right: 5px solid #000000;
 }
-.popover.below .arrow {
+.popover.bottom .arrow {
   top: 0;
   left: 50%;
   margin-left: -5px;
@@ -2358,12 +2966,12 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   width: 0;
   height: 0;
 }
-.popover .inner {
-  background: #000000;
-  background: rgba(0, 0, 0, 0.8);
+.popover-inner {
   padding: 3px;
-  overflow: hidden;
   width: 280px;
+  overflow: hidden;
+  background: #000000;
+  background: rgba(0, 0, 0, 0.8);
   -webkit-border-radius: 6px;
   -moz-border-radius: 6px;
   border-radius: 6px;
@@ -2371,18 +2979,18 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
   box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
 }
-.popover .title {
-  background-color: #f5f5f5;
+.popover-title {
   padding: 9px 15px;
   line-height: 1;
+  background-color: #f5f5f5;
+  border-bottom: 1px solid #eee;
   -webkit-border-radius: 3px 3px 0 0;
   -moz-border-radius: 3px 3px 0 0;
   border-radius: 3px 3px 0 0;
-  border-bottom: 1px solid #eee;
 }
-.popover .content {
-  background-color: #ffffff;
+.popover-content {
   padding: 14px;
+  background-color: #ffffff;
   -webkit-border-radius: 0 0 3px 3px;
   -moz-border-radius: 0 0 3px 3px;
   border-radius: 0 0 3px 3px;
@@ -2390,19 +2998,51 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   -moz-background-clip: padding-box;
   background-clip: padding-box;
 }
-.popover .content p, .popover .content ul, .popover .content ol {
+.popover-content p, .popover-content ul, .popover-content ol {
   margin-bottom: 0;
 }
-.fade {
-  -webkit-transition: opacity 0.15s linear;
-  -moz-transition: opacity 0.15s linear;
-  -ms-transition: opacity 0.15s linear;
-  -o-transition: opacity 0.15s linear;
-  transition: opacity 0.15s linear;
-  opacity: 0;
+.thumbnails {
+  margin-left: -20px;
+  list-style: none;
+  *zoom: 1;
 }
-.fade.in {
-  opacity: 1;
+.thumbnails:before, .thumbnails:after {
+  display: table;
+  content: "";
+}
+.thumbnails:after {
+  clear: both;
+}
+.thumbnails > li {
+  float: left;
+  margin: 0 0 18px 20px;
+}
+.thumbnail {
+  display: block;
+  padding: 4px;
+  line-height: 1;
+  border: 1px solid #ddd;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
+  -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
+  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
+}
+a.thumbnail:hover {
+  border-color: #0088cc;
+  -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+  -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+  box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+}
+.thumbnail > img {
+  display: block;
+  max-width: 100%;
+  margin-left: auto;
+  margin-right: auto;
+}
+.thumbnail .caption {
+  padding: 9px;
 }
 .label {
   padding: 1px 3px 2px;
@@ -2410,58 +3050,316 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   font-weight: bold;
   color: #ffffff;
   text-transform: uppercase;
-  white-space: nowrap;
-  background-color: #bfbfbf;
+  background-color: #999999;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
 }
-.label.important {
-  background-color: #c43c35;
+.label-important {
+  background-color: #b94a48;
 }
-.label.warning {
+.label-warning {
   background-color: #f89406;
 }
-.label.success {
-  background-color: #46a546;
+.label-success {
+  background-color: #468847;
+}
+.label-info {
+  background-color: #3a87ad;
+}
+@-webkit-keyframes progress-bar-stripes {
+  from {
+    background-position: 0 0;
+  }
+  to {
+    background-position: 40px 0;
+  }
+}
+@-moz-keyframes progress-bar-stripes {
+  from {
+    background-position: 0 0;
+  }
+  to {
+    background-position: 40px 0;
+  }
+}
+@keyframes progress-bar-stripes {
+  from {
+    background-position: 0 0;
+  }
+  to {
+    background-position: 40px 0;
+  }
+}
+.progress {
+  overflow: hidden;
+  height: 18px;
+  margin-bottom: 18px;
+  background-color: #f7f7f7;
+  background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -ms-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));
+  background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-image: linear-gradient(top, #f5f5f5, #f9f9f9);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);
+  -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+  -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+  box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
 }
-.label.notice {
-  background-color: #62cffc;
+.progress .bar {
+  width: 0%;
+  height: 18px;
+  color: #ffffff;
+  font-size: 12px;
+  text-align: center;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  background-color: #0e90d2;
+  background-image: -moz-linear-gradient(top, #149bdf, #0480be);
+  background-image: -ms-linear-gradient(top, #149bdf, #0480be);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));
+  background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
+  background-image: -o-linear-gradient(top, #149bdf, #0480be);
+  background-image: linear-gradient(top, #149bdf, #0480be);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);
+  -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  -webkit-transition: width 0.6s ease;
+  -moz-transition: width 0.6s ease;
+  -ms-transition: width 0.6s ease;
+  -o-transition: width 0.6s ease;
+  transition: width 0.6s ease;
+}
+.progress-striped .bar {
+  background-color: #62c462;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  -webkit-background-size: 40px 40px;
+  -moz-background-size: 40px 40px;
+  -o-background-size: 40px 40px;
+  background-size: 40px 40px;
+}
+.progress.active .bar {
+  -webkit-animation: progress-bar-stripes 2s linear infinite;
+  -moz-animation: progress-bar-stripes 2s linear infinite;
+  animation: progress-bar-stripes 2s linear infinite;
+}
+.progress-danger .bar {
+  background-color: #dd514c;
+  background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -ms-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));
+  background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: -o-linear-gradient(top, #ee5f5b, #c43c35);
+  background-image: linear-gradient(top, #ee5f5b, #c43c35);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);
 }
-.media-grid {
-  margin-left: -4px;
-  margin-bottom: 0;
-  zoom: 1;
+.progress-danger.progress-striped .bar {
+  background-color: #ee5f5b;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress-success .bar {
+  background-color: #5eb95e;
+  background-image: -moz-linear-gradient(top, #62c462, #57a957);
+  background-image: -ms-linear-gradient(top, #62c462, #57a957);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));
+  background-image: -webkit-linear-gradient(top, #62c462, #57a957);
+  background-image: -o-linear-gradient(top, #62c462, #57a957);
+  background-image: linear-gradient(top, #62c462, #57a957);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
 }
-.media-grid:before, .media-grid:after {
-  display: table;
-  content: "";
-  zoom: 1;
+.progress-success.progress-striped .bar {
+  background-color: #62c462;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+}
+.progress-info .bar {
+  background-color: #4bb1cf;
+  background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));
+  background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
+  background-image: linear-gradient(top, #5bc0de, #339bb9);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);
 }
-.media-grid:after {
-  clear: both;
+.progress-info.progress-striped .bar {
+  background-color: #5bc0de;
+  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));
+  background-image: -webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
+  background-image: linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
 }
-.media-grid li {
-  display: inline;
+.accordion {
+  margin-bottom: 18px;
 }
-.media-grid a {
-  float: left;
-  padding: 4px;
-  margin: 0 0 18px 4px;
-  border: 1px solid #ddd;
+.accordion-group {
+  margin-bottom: 2px;
+  border: 1px solid #e5e5e5;
   -webkit-border-radius: 4px;
   -moz-border-radius: 4px;
   border-radius: 4px;
-  -webkit-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
-  -moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
-  box-shadow: 0 1px 1px rgba(0, 0, 0, 0.075);
 }
-.media-grid a img {
+.accordion-heading {
+  border-bottom: 0;
+}
+.accordion-heading .accordion-toggle {
   display: block;
+  padding: 8px 15px;
 }
-.media-grid a:hover {
-  border-color: #0069d6;
-  -webkit-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
-  -moz-box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
-  box-shadow: 0 1px 4px rgba(0, 105, 214, 0.25);
+.accordion-inner {
+  padding: 9px 15px;
+  border-top: 1px solid #e5e5e5;
+}
+.carousel {
+  position: relative;
+  margin-bottom: 18px;
+  line-height: 1;
+}
+.carousel-inner {
+  overflow: hidden;
+  width: 100%;
+  position: relative;
+}
+.carousel .item {
+  display: none;
+  position: relative;
+  -webkit-transition: 0.6s ease-in-out left;
+  -moz-transition: 0.6s ease-in-out left;
+  -ms-transition: 0.6s ease-in-out left;
+  -o-transition: 0.6s ease-in-out left;
+  transition: 0.6s ease-in-out left;
+}
+.carousel .item > img {
+  display: block;
+  line-height: 1;
+}
+.carousel .active, .carousel .next, .carousel .prev {
+  display: block;
+}
+.carousel .active {
+  left: 0;
+}
+.carousel .next, .carousel .prev {
+  position: absolute;
+  top: 0;
+  width: 100%;
+}
+.carousel .next {
+  left: 100%;
+}
+.carousel .prev {
+  left: -100%;
+}
+.carousel .next.left, .carousel .prev.right {
+  left: 0;
+}
+.carousel .active.left {
+  left: -100%;
+}
+.carousel .active.right {
+  left: 100%;
+}
+.carousel-control {
+  position: absolute;
+  top: 40%;
+  left: 15px;
+  width: 40px;
+  height: 40px;
+  margin-top: -20px;
+  font-size: 60px;
+  font-weight: 100;
+  line-height: 30px;
+  color: #ffffff;
+  text-align: center;
+  background: #222222;
+  border: 3px solid #ffffff;
+  -webkit-border-radius: 23px;
+  -moz-border-radius: 23px;
+  border-radius: 23px;
+  opacity: 0.5;
+  filter: alpha(opacity=50);
+}
+.carousel-control.right {
+  left: auto;
+  right: 15px;
+}
+.carousel-control:hover {
+  color: #ffffff;
+  text-decoration: none;
+  opacity: 0.9;
+  filter: alpha(opacity=90);
+}
+.carousel-caption {
+  position: absolute;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  padding: 10px 15px 5px;
+  background: #333333;
+  background: rgba(0, 0, 0, 0.75);
+}
+.carousel-caption h4, .carousel-caption p {
+  color: #ffffff;
+}
+.hero-unit {
+  padding: 60px;
+  margin-bottom: 30px;
+  background-color: #f5f5f5;
+  -webkit-border-radius: 6px;
+  -moz-border-radius: 6px;
+  border-radius: 6px;
+}
+.hero-unit h1 {
+  margin-bottom: 0;
+  font-size: 60px;
+  line-height: 1;
+  letter-spacing: -1px;
+}
+.hero-unit p {
+  font-size: 18px;
+  font-weight: 200;
+  line-height: 27px;
+}
+.pull-right {
+  float: right;
+}
+.pull-left {
+  float: left;
+}
+.hide {
+  display: none;
+}
+.show {
+  display: block;
+}
+.invisible {
+  visibility: hidden;
 }
diff --git a/web/css/smt_main.css b/web/css/smt_main.css
index 6b4847b03..b984f50c4 100644
--- a/web/css/smt_main.css
+++ b/web/css/smt_main.css
@@ -1,3 +1,55 @@
+body {
+  margin: 0 auto;
+}
+
+.input-prepend input[class*="span"], .input-append input[class*="span"] {
+  width: auto;
+}
+
+input[type="checkbox"], input[type="radio"] {
+  border: 1px solid #ccc;
+}
+
+.form-horizontal .control-group > label {
+  float: none;
+  width: auto;
+  padding-top: 0;
+  text-align: left;
+}
+
+.form-horizontal .controls {
+  margin-left: 0;
+}
+.form-horizontal .control-list {
+  padding-top: 0;
+}
+
+.form-horizontal .form-actions {
+  padding-left: 10px;
+  padding-right: 10px;
+}
+
+.modal {
+  position: absolute;
+  top: 10px;
+  left: 10px;
+  right: 10px;
+  width: auto;
+  margin: 0;
+}
+
+.modal.fade.in {
+  top: auto;
+}
+.modal-header .close {
+  padding: 10px;
+  margin: -10px;
+}
+
+.carousel-caption {
+  position: static;
+}
+
 #slot_face .row {
   padding: 0 0 0 4px;
 }
diff --git a/web/img/glyphicons-halflings-white.png b/web/img/glyphicons-halflings-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..a20760bfde58d1c92cee95116059fba03c68d689
GIT binary patch
literal 4352
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

literal 0
HcmV?d00001

diff --git a/web/img/glyphicons-halflings.png b/web/img/glyphicons-halflings.png
new file mode 100644
index 0000000000000000000000000000000000000000..92d4445dfd0af414835467132cf50c7c38a303af
GIT binary patch
literal 4352
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

literal 0
HcmV?d00001


From 0fe4d84be6eb4b4bb9c17d95460072a3527420b6 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Tue, 21 Feb 2012 14:06:40 +0900
Subject: [PATCH 065/630] add 'keyword' parameter to member/search.json API
 (refs #2698)

---
 .../modules/member/actions/actions.class.php    | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/apps/api/modules/member/actions/actions.class.php b/apps/api/modules/member/actions/actions.class.php
index 1ce3cc92e..84c5b91da 100644
--- a/apps/api/modules/member/actions/actions.class.php
+++ b/apps/api/modules/member/actions/actions.class.php
@@ -32,10 +32,16 @@ public function executeCommunity(sfWebRequest $request)
       $memberId = $this->getUser()->getMemberId();
     }
 
-    $this->communities = Doctrine::getTable('Community')->createQuery('c')
+    $query = Doctrine::getTable('Community')->createQuery('c')
       ->innerJoin('c.CommunityMember cm WITH cm.is_pre = false AND cm.member_id = ?', $memberId)
-      ->limit(sfConfig::get('op_json_api_limit', 20))
-      ->execute();
+      ->limit(sfConfig::get('op_json_api_limit', 20));
+
+    if (isset($request['keyword']))
+    {
+      $query->whereLike('c.name', $request['keyword']);
+    }
+
+    $this->communities = $query->execute();
 
     $this->setTemplate('array', 'community');
   }
@@ -63,6 +69,11 @@ public function executeSearch(sfWebRequest $request)
       }
     }
 
+    if (isset($request['keyword']))
+    {
+      $query->andWhereLike('m.name', $request['keyword']);
+    }
+
     $this->members = $query
       ->limit(sfConfig::get('op_json_api_limit', 20))
       ->execute();

From 593b04817d84a5f0fbef1019ec20da41a16c00db Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 23 Feb 2012 14:19:13 +0900
Subject: [PATCH 066/630] modify i18n message of activity postform (refs #2227)

---
 apps/pc_frontend/i18n/messages.ja.xml  | 8 ++++++++
 apps/pc_frontend/templates/_tosaka.php | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/pc_frontend/i18n/messages.ja.xml b/apps/pc_frontend/i18n/messages.ja.xml
index e366baddf..ff92afc26 100644
--- a/apps/pc_frontend/i18n/messages.ja.xml
+++ b/apps/pc_frontend/i18n/messages.ja.xml
@@ -1371,6 +1371,14 @@
         <source>View this page on regular style</source>
         <target>このページをPC版で表示</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>Post</source>
+        <target>投稿する</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>What are you doing now?</source>
+        <target>今なにしてる？</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/apps/pc_frontend/templates/_tosaka.php b/apps/pc_frontend/templates/_tosaka.php
index 8e6cfb995..39266a6b0 100644
--- a/apps/pc_frontend/templates/_tosaka.php
+++ b/apps/pc_frontend/templates/_tosaka.php
@@ -68,7 +68,7 @@
     </div>
   </div>
   <div class="row posttextarea">
-    <textarea id="tosaka_postform_body" class="span12" rows="4"></textarea>
+    <textarea id="tosaka_postform_body" class="span12" rows="4" placeholder="<?php echo __('What are you doing now?') ?>"></textarea>
   </div>
   <div class="row">
     <button id="tosaka_postform_submit" class="span10 offset1 btn small btn-primary"><?php echo __('%post_activity%') ?></button>

From 895e59347d1c29aae85e3b706b0769c224365829 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 23 Feb 2012 17:58:02 +0900
Subject: [PATCH 067/630] fix error response of push API (fixes #2698).

---
 apps/api/modules/push/actions/actions.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/api/modules/push/actions/actions.class.php b/apps/api/modules/push/actions/actions.class.php
index d79b01220..068f2424d 100644
--- a/apps/api/modules/push/actions/actions.class.php
+++ b/apps/api/modules/push/actions/actions.class.php
@@ -68,7 +68,7 @@ public function executeRead(sfWebRequest $request)
     }
     else
     {
-      return $this->renderJSON(array('status' => 'error'));
+      $this->forward404('Request parameter id does not exist.');
     }
   }
 

From 9ca25baa2ba758c1d0de42be28decda779d45b18 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 24 Feb 2012 11:51:59 +0900
Subject: [PATCH 068/630] minor cleanups (fixes #2841, #2843, #2845; refs
 #2842)

---
 .../modules/community/templates/_smtCommunityListBox.php      | 2 --
 .../modules/community/templates/smtEditSuccess.php            | 2 +-
 apps/pc_frontend/modules/member/actions/components.class.php  | 4 ++--
 .../pc_frontend/modules/member/templates/smtInviteSuccess.php | 2 +-
 lib/model/doctrine/MemberRelationship.class.php               | 1 -
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php b/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php
index 790577dcc..6d16b46be 100644
--- a/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php
+++ b/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php
@@ -6,8 +6,6 @@
     <hr class="toumei" />
     <?php echo op_image_tag_sf_image($community->getImageFileName(), array('size' => '320x320', 'format' => 'jpg')) ?>
     <hr class="toumei" />
-    <?php if ($isAdmin) : ?>
-    <?php endif; ?>
   </div>
 </div>
 <div class="row">
diff --git a/apps/pc_frontend/modules/community/templates/smtEditSuccess.php b/apps/pc_frontend/modules/community/templates/smtEditSuccess.php
index fbd678b5e..7764593e5 100644
--- a/apps/pc_frontend/modules/community/templates/smtEditSuccess.php
+++ b/apps/pc_frontend/modules/community/templates/smtEditSuccess.php
@@ -68,7 +68,7 @@
 <?php foreach ($communityFileForm as $cff): ?>
 <?php if (!$cff->isHidden()): ?>
   <div class="span12"><?php echo $cff->renderLabel(); ?></div>
-  <div class="span12 <? echo $cff->hasError() ? 'clearfix error' : '' ?>">
+  <div class="span12 <?php echo $cff->hasError() ? 'clearfix error' : '' ?>">
     <?php if ($cff->hasError()): ?>
     <span class="label label-important"><?php echo __($cff->getError()) ?></span>
     <?php endif ?>
diff --git a/apps/pc_frontend/modules/member/actions/components.class.php b/apps/pc_frontend/modules/member/actions/components.class.php
index 4d83dc03f..b626226dc 100644
--- a/apps/pc_frontend/modules/member/actions/components.class.php
+++ b/apps/pc_frontend/modules/member/actions/components.class.php
@@ -36,7 +36,7 @@ public function executeSmtProfileListBox($request)
 
   public function executeSmtMemberFriendListBox($request)
   {
-    if ($request->hasParameter('id') && 'profile'!=sfContext::getInstance()->getActionName())
+    if ($request->hasParameter('id') && 'profile' !== sfContext::getInstance()->getActionName())
     {
       $this->member = Doctrine::getTable('Member')->find($request->getParameter('id'));
     }
@@ -48,7 +48,7 @@ public function executeSmtMemberFriendListBox($request)
 
   public function executeSmtMemberJoinCommunityListBox($request)
   {
-    if ($request->hasParameter('id') && 'profile'!=sfContext::getInstance()->getActionName())
+    if ($request->hasParameter('id') && 'profile' !== sfContext::getInstance()->getActionName())
     {
       $this->member = Doctrine::getTable('Member')->find($request->getParameter('id'));
     }
diff --git a/apps/pc_frontend/modules/member/templates/smtInviteSuccess.php b/apps/pc_frontend/modules/member/templates/smtInviteSuccess.php
index 76eabca86..d0da5abf6 100644
--- a/apps/pc_frontend/modules/member/templates/smtInviteSuccess.php
+++ b/apps/pc_frontend/modules/member/templates/smtInviteSuccess.php
@@ -25,7 +25,7 @@
 </div>
 <div class="span12 <?php echo $f->hasError() ? 'clearfix error' : '' ?>">
   <?php if ($f->hasError()): ?>
-  <span class="label label-important"><?php echo __($f->getError()) ?></span><br>
+  <span class="label label-important"><?php echo __($f->getError()) ?></span><br />
   <?php endif ?>
   <?php echo $f->render(array('class' => 'span12')) ?>
   <span class="help-block"><?php echo $f->renderHelp() ?></span>
diff --git a/lib/model/doctrine/MemberRelationship.class.php b/lib/model/doctrine/MemberRelationship.class.php
index 1100f2793..39b9c0f16 100644
--- a/lib/model/doctrine/MemberRelationship.class.php
+++ b/lib/model/doctrine/MemberRelationship.class.php
@@ -24,7 +24,6 @@ public function postSave($event)
   {
     if ($this->isFriendPreFrom())
     {
-      // FIXME : Help! finx my centence in English!
       opNotificationCenter::notify($this->getMemberRelatedByMemberIdFrom(), $this->getMember(), 'Do you accept friend request?', array('category' => 'link',));
     }
   }

From 57c0a40cf227eff61e407e76bf9233604fabcb6e Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 24 Feb 2012 15:14:31 +0900
Subject: [PATCH 069/630] hide tosaka when user is not logged in on smartphone
 (fixes #2844)

---
 apps/pc_frontend/templates/_tosaka.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/pc_frontend/templates/_tosaka.php b/apps/pc_frontend/templates/_tosaka.php
index 39266a6b0..ec424312e 100644
--- a/apps/pc_frontend/templates/_tosaka.php
+++ b/apps/pc_frontend/templates/_tosaka.php
@@ -1,3 +1,4 @@
+<?php if(opToolkit::isSecurePage()): ?>
 <!-- NCFORM TMPL -->
 <div class="ncform hide toggle1">
   <div class="row">
@@ -76,15 +77,18 @@
   </div>
 </div>
 <!-- POSTFORM TMPL -->
+<?php endif ?>
 
 <div id="slot_tosaka">
   <div class="row">
     <div class="span12">
       <div class="row">
         <div class="span4"><?php echo op_image_tag('LOGO.png', array('height' => '32', 'class' => 'menubutton')); ?></div>
+        <?php if (opToolkit::isSecurePage()): ?>
         <div id="notification_center" class="span4 center"><?php echo op_image_tag('NOTIFY_CENTER.png', array('height' => '32', 'class' => 'ncbutton')) ?>
         </div>
         <div class="span3 offset1"><?php echo op_image_tag('POST.png', array('height' => '32', 'class' =>'postbutton')) ?></div>
+        <?php endif ?>
       </div>
     </div>
   </div>

From 9e4f3ec0ff8d0ecde426b69dd4d938c314f87d6f Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 24 Feb 2012 15:18:24 +0900
Subject: [PATCH 070/630] fixed smartphone form layout (fixes #2846)

---
 web/css/smt_main.css | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/web/css/smt_main.css b/web/css/smt_main.css
index b984f50c4..91ee561e7 100644
--- a/web/css/smt_main.css
+++ b/web/css/smt_main.css
@@ -2,14 +2,36 @@ body {
   margin: 0 auto;
 }
 
+label {
+  display: inline;
+}
+
+.radio_list {
+  display: inline-block;
+}
+
+.radio_list li {
+  list-style: none;
+  margin-bottom: 5px;
+}
+
 .input-prepend input[class*="span"], .input-append input[class*="span"] {
   width: auto;
 }
 
 input[type="checkbox"], input[type="radio"] {
+  width: auto!important;
   border: 1px solid #ccc;
 }
 
+.input-prepend .add-on, .input-append .add-on {
+  padding: 0;
+}
+
+.realtime-searchbox {
+  padding: 0px; width: 300px;
+}
+
 .form-horizontal .control-group > label {
   float: none;
   width: auto;

From 46588868e294b6fa2939ca4c2e94fb6a9404b3a9 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 19 Jan 2012 19:48:43 +0900
Subject: [PATCH 071/630] add support for linkification of activity

---
 apps/api/lib/helper/opJsonApiHelper.php | 28 ++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/apps/api/lib/helper/opJsonApiHelper.php b/apps/api/lib/helper/opJsonApiHelper.php
index 4c7a99137..05f3bad15 100644
--- a/apps/api/lib/helper/opJsonApiHelper.php
+++ b/apps/api/lib/helper/opJsonApiHelper.php
@@ -65,7 +65,7 @@ function op_api_activity($activity)
     'id' => $activity->getId(),
     'member' => op_api_member($member),
     'body' => $activity->getBody(),
-    'body_html' => op_auto_link_text(nl2br(op_api_force_escape($activity->getBody()))),
+    'body_html' => op_activity_linkification(nl2br(op_api_force_escape($activity->getBody()))),
     'uri' => $activity->getUri(),
     'source' => $activity->getSource(),
     'source_uri' => $activity->getSourceUri(),
@@ -73,6 +73,32 @@ function op_api_activity($activity)
   );
 }
 
+function op_activity_linkification($body, $options = array())
+{
+  $body = op_auto_link_text($body);
+
+  return preg_replace_callback('/(@+)([-._0-9A-Za-z]+)/', 'op_activity_linkification_callback', $body);
+}
+
+function op_activity_linkification_callback($matches)
+{
+  $at = $matches[1];
+  $screenName = $matches[2];
+  $screenNameConfig = Doctrine::getTable('MemberConfig')->createQuery()
+    ->select('member_id')
+    ->addWhere('name = "op_screen_name"')
+    ->addWhere('value = ?', $screenName)
+    ->fetchOne(array(), Doctrine::HYDRATE_NONE);
+
+  if ($screenNameConfig)
+  {
+    $memberId = $screenNameConfig[0];
+    return link_to($at.$screenName, op_api_member_profile_url($memberId), array('target' => '_blank'));
+  }
+
+  return $matches[0];
+}
+
 function op_api_force_escape($text)
 {
   if (!sfConfig::get('sf_escaping_strategy'))

From 9dffdca2c3e620ba739868344fa7143d0309fb52 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 19 Jan 2012 18:55:12 +0900
Subject: [PATCH 072/630] add activity/community.json

---
 apps/api/config/routing.yml                   |  5 +++
 .../activity/actions/actions.class.php        | 42 +++++++++++++++++++
 lib/util/opActivityQueryBuilder.class.php     | 25 +++++++++--
 3 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/apps/api/config/routing.yml b/apps/api/config/routing.yml
index 58cfa94e0..60365e530 100644
--- a/apps/api/config/routing.yml
+++ b/apps/api/config/routing.yml
@@ -34,6 +34,11 @@ activity_friends:
   param: { module: activity, action: friends, sf_format: json }
   requirements: { sf_method: [get] }
 
+activity_community:
+  url: /activity/community.json
+  param: { module: activity, action: community, sf_format: json }
+  requirements: { sf_method: [get] }
+
 activity_post:
   url: /activity/post.json
   param: { module: activity, action: post, sf_format: json }
diff --git a/apps/api/modules/activity/actions/actions.class.php b/apps/api/modules/activity/actions/actions.class.php
index c20b46547..fd2ed891b 100644
--- a/apps/api/modules/activity/actions/actions.class.php
+++ b/apps/api/modules/activity/actions/actions.class.php
@@ -28,6 +28,15 @@ public function executeSearch(sfWebRequest $request)
       {
         $builder->includeFriends($request['target_id'] ? $request['target_id'] : null);
       }
+      elseif ('community' === $request['target'])
+      {
+        $this->forward400Unless($request['target_id'], 'target_id parameter not specified.');
+        $builder
+          ->includeSelf()
+          ->includeFriends()
+          ->includeSns()
+          ->setCommunityId($request['target_id']);
+      }
       else
       {
         $this->forward400('target parameter is invalid.');
@@ -112,6 +121,28 @@ public function executeFriends(sfWebRequest $request)
     $this->forward('activity', 'search');
   }
 
+  public function executeCommunity(sfWebRequest $request)
+  {
+    $request['target'] = 'community';
+
+    if (isset($request['community_id']))
+    {
+      $request['target_id'] = $request['community_id'];
+      unset($request['community_id']);
+    }
+    elseif (isset($request['id']))
+    {
+      $request['target_id'] = $request['id'];
+      unset($request['id']);
+    }
+    else
+    {
+      $this->forward400('community_id parameter not specified.');
+    }
+
+    $this->forward('activity', 'search');
+  }
+
   public function executePost(sfWebRequest $request)
   {
     $this->forward400Unless(isset($request['body']), 'body parameter not specified.');
@@ -139,6 +170,17 @@ public function executePost(sfWebRequest $request)
       $options['uri'] = $request['url'];
     }
 
+    if (isset($request['target']) && 'community' === $request['target'])
+    {
+      if (isset($request['target_id']))
+      {
+        $this->forward400('target_id parameter not specified.');
+      }
+
+      $options['foreign_table'] = 'community';
+      $options['foreign_id'] = $request['target_id'];
+    }
+
     $options['source'] = 'API';
 
     $this->activity = Doctrine::getTable('ActivityData')->updateActivity($memberId, $body, $options);
diff --git a/lib/util/opActivityQueryBuilder.class.php b/lib/util/opActivityQueryBuilder.class.php
index c286e924e..cd243148d 100644
--- a/lib/util/opActivityQueryBuilder.class.php
+++ b/lib/util/opActivityQueryBuilder.class.php
@@ -20,6 +20,7 @@ class opActivityQueryBuilder
   protected
     $table,
     $viewerId = null,
+    $communityId = null,
     $inactiveIds,
     $include;
 
@@ -42,6 +43,12 @@ public function setViewerId($viewerId)
     return $this;
   }
 
+  public function setCommunityId($community_id)
+  {
+    $this->communityId = $community_id;
+    return $this;
+  }
+
   public function resetInclude()
   {
     $this->include = array(
@@ -49,6 +56,7 @@ public function resetInclude()
       'friend' => false,
       'sns' => false,
       'member' => false,
+      'community' => false,
     );
 
     return $this;
@@ -107,10 +115,21 @@ public function buildQuery()
 
     $subQuery = array_map(array($this, 'trimSubqueryWhere'), $subQuery);
 
-    $query->andWhere(implode(' OR ', $subQuery))
-      ->orderBy('id DESC');
+    $query->andWhere(implode(' OR ', $subQuery));
 
-    return $query;
+    if (null === $this->communityId)
+    {
+      $query->addWhere('a.foreign_table IS NULL OR a.foreign_table <> "community"');
+    }
+    else
+    {
+      $query
+        ->addWhere('a.foreign_table = "community"')
+        ->addWhere('a.foreign_id = ?', $this->communityId)
+        ->addWhere('EXISTS (FROM CommunityMember cm WHERE cm.member_id = a.member_id AND cm.community_id = ?)', $this->communityId);
+    }
+
+    return $query->orderBy('id DESC');
   }
 
   protected function buildSelfQuery($query)

From badf0563605fb4545353c2b083a763937a983adb Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 5 Jan 2012 14:04:35 +0900
Subject: [PATCH 073/630] add activity/mentions.json

---
 apps/api/config/routing.yml                   |  5 ++++
 .../activity/actions/actions.class.php        | 17 ++++++++++++
 lib/util/opActivityQueryBuilder.class.php     | 26 +++++++++++++++++++
 3 files changed, 48 insertions(+)

diff --git a/apps/api/config/routing.yml b/apps/api/config/routing.yml
index 60365e530..a53bdbca0 100644
--- a/apps/api/config/routing.yml
+++ b/apps/api/config/routing.yml
@@ -39,6 +39,11 @@ activity_community:
   param: { module: activity, action: community, sf_format: json }
   requirements: { sf_method: [get] }
 
+activity_mentions:
+  url: /activity/mentions.json
+  param: { module: activity, action: mentions, sf_format: json }
+  requirements: { sf_method: [get] }
+
 activity_post:
   url: /activity/post.json
   param: { module: activity, action: post, sf_format: json }
diff --git a/apps/api/modules/activity/actions/actions.class.php b/apps/api/modules/activity/actions/actions.class.php
index fd2ed891b..dbc76c1a6 100644
--- a/apps/api/modules/activity/actions/actions.class.php
+++ b/apps/api/modules/activity/actions/actions.class.php
@@ -213,4 +213,21 @@ public function executeDelete(sfWebRequest $request)
 
     return $this->renderJSON(array('status' => 'success'));
   }
+
+  public function executeMentions(sfWebRequest $request)
+  {
+    $builder = opActivityQueryBuilder::create()
+      ->setViewerId($this->getUser()->getMemberId())
+      ->includeMentions();
+
+    $query = $builder->buildQuery()
+      ->andWhere('in_reply_to_activity_id IS NULL')
+      ->andWhere('foreign_table IS NULL')
+      ->andWhere('foreign_id IS NULL')
+      ->limit(20);
+
+    $this->activityData = $query->execute();
+
+    $this->setTemplate('array');
+  }
 }
diff --git a/lib/util/opActivityQueryBuilder.class.php b/lib/util/opActivityQueryBuilder.class.php
index cd243148d..f77b087d9 100644
--- a/lib/util/opActivityQueryBuilder.class.php
+++ b/lib/util/opActivityQueryBuilder.class.php
@@ -55,6 +55,7 @@ public function resetInclude()
       'self' => false,
       'friend' => false,
       'sns' => false,
+      'mention' => false,
       'member' => false,
       'community' => false,
     );
@@ -80,6 +81,12 @@ public function includeSns()
     return $this;
   }
 
+  public function includeMentions()
+  {
+    $this->include['mention'] = true;
+    return $this;
+  }
+
   public function includeMember($member_id)
   {
     $this->include['member'] = $member_id;
@@ -108,6 +115,11 @@ public function buildQuery()
       $subQuery[] = $this->buildAllMemberQuery($query->createSubquery());
     }
 
+    if ($this->include['mention'])
+    {
+      $subQuery[] = $this->buildMentionQuery($query->createSubquery());
+    }
+
     if ($this->include['member'])
     {
       $subQuery[] = $this->buildMemberQueryWithCheckRel($query->createSubquery(), $this->include['member']);
@@ -212,6 +224,20 @@ protected function buildMemberQueryWithCheckRel($query, $member_id = null)
     return $query;
   }
 
+  protected function buildMentionQuery($query)
+  {
+    $friendQuery = $this->buildFriendQuery($query->createSubquery())
+      ->andWhereLike('a.template_param', '|'.$this->viewerId.'|');
+
+    $snsQuery = $this->buildAllMemberQuery($query->createSubquery())
+      ->andWhereLike('a.template_param', '|'.$this->viewerId.'|');
+
+    $subQuery = array_map(array($this, 'trimSubqueryWhere'), array($friendQuery, $snsQuery));
+    $query->andWhere(implode(' OR ', $subQuery));
+
+    return $query;
+  }
+
   protected function trimSubqueryWhere($subquery)
   {
     return '('.implode(' ', $subquery->getDqlPart('where')).')';

From 96099de4b7fedd08c356d7842088a1e17f30174b Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Tue, 28 Feb 2012 14:42:23 +0900
Subject: [PATCH 074/630] add ability to post activity to community timeline
 (refs #2849)

---
 apps/api/modules/activity/actions/actions.class.php | 2 +-
 apps/pc_frontend/templates/_tosaka.php              | 4 ++++
 apps/pc_frontend/templates/smtLayoutGroup.php       | 4 ++--
 web/js/smt_tosaka.js                                | 5 +++++
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/apps/api/modules/activity/actions/actions.class.php b/apps/api/modules/activity/actions/actions.class.php
index dbc76c1a6..9f6e67ca3 100644
--- a/apps/api/modules/activity/actions/actions.class.php
+++ b/apps/api/modules/activity/actions/actions.class.php
@@ -172,7 +172,7 @@ public function executePost(sfWebRequest $request)
 
     if (isset($request['target']) && 'community' === $request['target'])
     {
-      if (isset($request['target_id']))
+      if (!isset($request['target_id']))
       {
         $this->forward400('target_id parameter not specified.');
       }
diff --git a/apps/pc_frontend/templates/_tosaka.php b/apps/pc_frontend/templates/_tosaka.php
index ec424312e..28f1c98e9 100644
--- a/apps/pc_frontend/templates/_tosaka.php
+++ b/apps/pc_frontend/templates/_tosaka.php
@@ -72,7 +72,11 @@
     <textarea id="tosaka_postform_body" class="span12" rows="4" placeholder="<?php echo __('What are you doing now?') ?>"></textarea>
   </div>
   <div class="row">
+    <?php if ($community): ?>
+    <button id="tosaka_postform_submit" data-community-id="<?php echo $community->getId() ?>" class="span10 offset1 btn small btn-primary"><?php echo __('%post_activity%') ?></button>
+    <?php else: ?>
     <button id="tosaka_postform_submit" class="span10 offset1 btn small btn-primary"><?php echo __('%post_activity%') ?></button>
+    <?php endif; ?>
     <div class="center hide" id="timelinePostLoading"><?php echo op_image_tag('ajax-loader.gif') ?></div>
   </div>
 </div>
diff --git a/apps/pc_frontend/templates/smtLayoutGroup.php b/apps/pc_frontend/templates/smtLayoutGroup.php
index c33f95c7a..3eb090fae 100644
--- a/apps/pc_frontend/templates/smtLayoutGroup.php
+++ b/apps/pc_frontend/templates/smtLayoutGroup.php
@@ -33,9 +33,9 @@
 <?php include_javascripts() ?>
 </head>
 <body id="<?php printf('page_%s_%s', $this->getModuleName(), $this->getActionName()) ?>" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
-<?php include_partial('global/tosaka') ?>
+<?php $community = $sf_response->getDisplayCommunity() ?>
+<?php include_partial('global/tosaka', array('community' => $community)) ?>
 <div id="face" class="row">
-  <?php $community = $sf_response->getDisplayCommunity() ?>
   <?php if ($community): ?>
   <div class="span2">
     <?php echo op_image_tag_sf_image($community->getImageFileName(), array('size' => '48x48')) ?>
diff --git a/web/js/smt_tosaka.js b/web/js/smt_tosaka.js
index 3e0cfccd5..db74d2017 100644
--- a/web/js/smt_tosaka.js
+++ b/web/js/smt_tosaka.js
@@ -45,6 +45,11 @@ $(document).ready(function(){
       apiKey: openpne.apiKey,
       body: body_text
     };
+    if ($('#tosaka_postform_submit').attr('data-community-id'))
+    {
+      params.target = 'community';
+      params.target_id = $('#tosaka_postform_submit').attr('data-community-id');
+    }
 
     $.getJSON(openpne.apiBase + 'activity/post.json', params, function(json) {
       if (json.status == 'success') {

From c5815858da6519ea0983ccc37ff0a064f3c4692f Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 29 Feb 2012 13:26:42 +0900
Subject: [PATCH 075/630] modify default terms of SNS in fixtures. (fixes
 #2886)

---
 data/fixtures/010_import_sns_terms.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/data/fixtures/010_import_sns_terms.yml b/data/fixtures/010_import_sns_terms.yml
index 067034e55..dd4146a41 100644
--- a/data/fixtures/010_import_sns_terms.yml
+++ b/data/fixtures/010_import_sns_terms.yml
@@ -76,33 +76,33 @@ SnsTerm:
     application: "pc_frontend"
     Translation:
       ja_JP:
-        value: "アクティビティ"
+        value: "タイムライン"
       en:
-        value: "activity"
+        value: "Timeline"
 
   term_activity_mobile_frontend:
     name: "activity"
     application: "mobile_frontend"
     Translation:
       ja_JP:
-        value: "ｱｸﾃｨﾋﾞﾃｨ"
+        value: "ﾀｲﾑﾗｲﾝ"
       en:
-        value: "activity"
+        value: "Timeline"
 
   term_post_activity_pc_frontend:
     name: "post_activity"
     application: "pc_frontend"
     Translation:
       ja_JP:
-        value: "アクティビティ投稿"
+        value: "つぶやく"
       en:
-        value: "Post Activity"
+        value: "Tweet"
 
   term_post_activity_mobile_frontend:
     name: "post_activity"
     application: "mobile_frontend"
     Translation:
       ja_JP:
-        value: "投稿"
+        value: "つぶやく"
       en:
-        value: "Post Activity"
+        value: "Tweet"

From cb4b63d71d7d550c632015018f6aa2d581eb4362 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 29 Feb 2012 13:29:11 +0900
Subject: [PATCH 076/630] hide postform in tosaka after post activity. (fixes
 #2884)

---
 web/js/smt_tosaka.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/js/smt_tosaka.js b/web/js/smt_tosaka.js
index db74d2017..bbd0c62cc 100644
--- a/web/js/smt_tosaka.js
+++ b/web/js/smt_tosaka.js
@@ -54,6 +54,7 @@ $(document).ready(function(){
     $.getJSON(openpne.apiBase + 'activity/post.json', params, function(json) {
       if (json.status == 'success') {
         body_elem.val('');
+        $(".postform").toggle();
       }
     });
   });

From c11ce60c06b9d0388c117ab03066e3f01627f7be Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 29 Mar 2012 16:42:42 +0900
Subject: [PATCH 077/630] add 'activity_id' parameter to activity/search.json
 API (refs #2698)

---
 apps/api/modules/activity/actions/actions.class.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/api/modules/activity/actions/actions.class.php b/apps/api/modules/activity/actions/actions.class.php
index 9f6e67ca3..33c95e028 100644
--- a/apps/api/modules/activity/actions/actions.class.php
+++ b/apps/api/modules/activity/actions/actions.class.php
@@ -81,6 +81,11 @@ public function executeSearch(sfWebRequest $request)
       $query->addWhere('id > ?', $request['since_id']);
     }
 
+    if (isset($request['activity_id']))
+    {
+      $query->addWhere('id = ?', $request['activity_id']);
+    }
+
     $this->activityData = $query
       ->andWhere('in_reply_to_activity_id IS NULL')
       ->execute();

From 8713dc6c124a8c5b4878fd6ccb50d877b5930743 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 29 Feb 2012 18:20:27 +0900
Subject: [PATCH 078/630] modify friend link notification message for i18n.
 (refs #2227)

---
 apps/pc_frontend/i18n/messages.ja.xml  | 4 ++++
 apps/pc_frontend/templates/_tosaka.php | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/pc_frontend/i18n/messages.ja.xml b/apps/pc_frontend/i18n/messages.ja.xml
index ff92afc26..d0f374bc6 100644
--- a/apps/pc_frontend/i18n/messages.ja.xml
+++ b/apps/pc_frontend/i18n/messages.ja.xml
@@ -1379,6 +1379,10 @@
         <source>What are you doing now?</source>
         <target>今なにしてる？</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>%Friend% link request</source>
+        <target>%Friend%申請</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/apps/pc_frontend/templates/_tosaka.php b/apps/pc_frontend/templates/_tosaka.php
index 28f1c98e9..e6c6f5b9e 100644
--- a/apps/pc_frontend/templates/_tosaka.php
+++ b/apps/pc_frontend/templates/_tosaka.php
@@ -24,11 +24,13 @@
       </div>
       <div class="span9 push_content">
         <div class="row">
+          <div class="span9">
           {{if category=="link" && unread==false}}
-          <?php echo __('Friend link request has come.'); ?>
+          <?php echo __('%Friend% link request'); ?>
           {{else}}
           {{html body}}
           {{/if}}
+          </div>
         </div>
         {{if category=="link"}}
         <div class="row{{if unread==false}} hide{{/if}}">

From 808d8c49c3205e3ed1a3c3fb637c46b3d397068b Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 29 Feb 2012 13:24:21 +0900
Subject: [PATCH 079/630] modify default smartphone navigation items. (fixes
 #2886)

---
 .../modules/default/templates/_smtMenu.php    |  4 +++
 .../012_import_smartphone_navi_menu.yml       | 28 ++++++-------------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/apps/pc_frontend/modules/default/templates/_smtMenu.php b/apps/pc_frontend/modules/default/templates/_smtMenu.php
index 906ae329e..4ce2718ab 100644
--- a/apps/pc_frontend/modules/default/templates/_smtMenu.php
+++ b/apps/pc_frontend/modules/default/templates/_smtMenu.php
@@ -16,8 +16,12 @@
       <?php if ($navs): ?>
       <?php foreach ($navs as $nav): ?>
       <?php if (op_is_accessible_url($nav->uri)): ?>
+      <?php if('@member_profile_mine' === $nav->uri): ?>
+      <?php echo link_to($sf_user->getMember()->getName(), $nav->uri, array('class' => 'btn btn-info', 'id' => sprintf('smtMenu_%1', op_url_to_id($nav->uri, true)))) ?>
+      <?php else: ?>
       <?php echo link_to($nav->caption, $nav->uri, array('class' => 'btn', 'id' => sprintf('smtMenu_%1', op_url_to_id($nav->uri, true)))) ?>
       <?php endif ?>
+      <?php endif ?>
       <?php endforeach ?>
       <?php endif ?>
     </div>
diff --git a/data/fixtures/012_import_smartphone_navi_menu.yml b/data/fixtures/012_import_smartphone_navi_menu.yml
index 79663fa87..87ecd5b98 100644
--- a/data/fixtures/012_import_smartphone_navi_menu.yml
+++ b/data/fixtures/012_import_smartphone_navi_menu.yml
@@ -19,40 +19,30 @@ Navigation:
       en:
         caption: "Profile"
 
-  smartphone_default_navigation_profile_edit:
+  smartphone_default_navigation_member_search:
     type: "smartphone_default"
-    uri: "@member_editProfile"
+    uri: "@member_search"
     sort_order: 20
     Translation:
       ja_JP:
-        caption: "プロフィール編集"
+        caption: "メンバー検索"
       en:
-        caption: "Edit Profile"
+        caption: "Member Search"
 
-  smartphone_default_navigation_community_all:
+  smartphone_default_navigation_community_search:
     type: "smartphone_default"
-    uri: "@community_home?id=1"
+    uri: "@community_search"
     sort_order: 30
     Translation:
       ja_JP:
-        caption: "allコミュニティ"
+        caption: "コミュニティ検索"
       en:
-        caption: "all Community"
-
-  smartphone_default_navigation_config:
-    type: "smartphone_default"
-    uri: "@member_config"
-    sort_order: 40
-    Translation:
-      ja_JP:
-        caption: "設定変更"
-      en:
-        caption: "Settings"
+        caption: "Community Search"
 
   smartphone_default_navigation_logout:
     type: "smartphone_default"
     uri: "@member_logout"
-    sort_order: 50
+    sort_order: 40
     Translation:
       ja_JP:
         caption: "ログアウト"

From a94e65b4062ac42e1cb15837f02b208c9780209c Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 29 Feb 2012 19:35:03 +0900
Subject: [PATCH 080/630] added option of disable read push. (refs #2756)

---
 web/js/smt_notify.js | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/web/js/smt_notify.js b/web/js/smt_notify.js
index 662a5d5c2..2d2b57beb 100644
--- a/web/js/smt_notify.js
+++ b/web/js/smt_notify.js
@@ -11,6 +11,11 @@
 	var _readyBound = false;
 
 	$.fn.pushLink = function(settings){
+
+		settings = $.extend({
+			isDisableRead: false,
+		}, settings);
+
 		return this.each(function(){
 			var linkUrl = $(this).attr('data-location-url');
 			var notifyId = $(this).attr('data-notify-id');
@@ -21,9 +26,16 @@
 				$(this).removeClass('hover');
 			})
 			$(this).click(function(){
-				$.getJSON( openpne.apiBase + 'push/read.json' , { 'id': notifyId, 'apiKey': openpne.apiKey }, function(d){
+				if ( false == settings.isDisableRead )
+                                {
+					$.getJSON( openpne.apiBase + 'push/read.json' , { 'id': notifyId, 'apiKey': openpne.apiKey }, function(d){
+						window.location = linkUrl;
+					});
+				}
+				else
+				{
 					window.location = linkUrl;
-				});
+				}
 			});
 		});
 	};

From 9f11f6b50da93411c7595118c3f9daf5aae60795 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 29 Feb 2012 20:04:34 +0900
Subject: [PATCH 081/630] move smartphone switch link. (refs #2227)

---
 apps/pc_frontend/modules/default/templates/_smtMenu.php | 1 +
 apps/pc_frontend/templates/smtLayoutGroup.php           | 3 ---
 apps/pc_frontend/templates/smtLayoutHome.php            | 3 ---
 apps/pc_frontend/templates/smtLayoutMember.php          | 3 ---
 apps/pc_frontend/templates/smtLayoutSns.php             | 3 ---
 web/js/smt_main.js                                      | 2 +-
 6 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/apps/pc_frontend/modules/default/templates/_smtMenu.php b/apps/pc_frontend/modules/default/templates/_smtMenu.php
index 4ce2718ab..32f5e3de5 100644
--- a/apps/pc_frontend/modules/default/templates/_smtMenu.php
+++ b/apps/pc_frontend/modules/default/templates/_smtMenu.php
@@ -23,6 +23,7 @@
       <?php endif ?>
       <?php endif ?>
       <?php endforeach ?>
+      <a href="<?php echo url_for('@homepage') ?>" id="smt-switch" class="btn btn-info"><?php echo __('View this page on regular style') ?></a>
       <?php endif ?>
     </div>
   </div>
diff --git a/apps/pc_frontend/templates/smtLayoutGroup.php b/apps/pc_frontend/templates/smtLayoutGroup.php
index 3eb090fae..cbb0c0374 100644
--- a/apps/pc_frontend/templates/smtLayoutGroup.php
+++ b/apps/pc_frontend/templates/smtLayoutGroup.php
@@ -65,9 +65,6 @@
 
 <?php echo $sf_content ?>
 
-<div id="smt-switch" class="row" style="display: none">
-<a class="btn info"><?php echo __('View this page on regular style') ?></a>
-</div>
 
 </body>
 </html>
diff --git a/apps/pc_frontend/templates/smtLayoutHome.php b/apps/pc_frontend/templates/smtLayoutHome.php
index c9ed3f7c0..c00035e16 100644
--- a/apps/pc_frontend/templates/smtLayoutHome.php
+++ b/apps/pc_frontend/templates/smtLayoutHome.php
@@ -68,9 +68,6 @@
 
 <?php echo $sf_content ?>
 
-<div id="smt-switch" class="row" style="display: none">
-<a class="btn info"><?php echo __('View this page on regular style') ?></a>
-</div>
 
 </body>
 </html>
diff --git a/apps/pc_frontend/templates/smtLayoutMember.php b/apps/pc_frontend/templates/smtLayoutMember.php
index 2729f0f2f..ac70047c4 100644
--- a/apps/pc_frontend/templates/smtLayoutMember.php
+++ b/apps/pc_frontend/templates/smtLayoutMember.php
@@ -71,9 +71,6 @@
 
 <?php echo $sf_content ?>
 
-<div id="smt-switch" class="row" style="display: none">
-<a class="btn info"><?php echo __('View this page on regular style') ?></a>
-</div>
 
 </body>
 </html>
diff --git a/apps/pc_frontend/templates/smtLayoutSns.php b/apps/pc_frontend/templates/smtLayoutSns.php
index ef1006b2f..b88f60b8c 100644
--- a/apps/pc_frontend/templates/smtLayoutSns.php
+++ b/apps/pc_frontend/templates/smtLayoutSns.php
@@ -72,9 +72,6 @@
 
 <?php echo $sf_content ?>
 
-<div id="smt-switch" class="row" style="display: none">
-<a class="btn info"><?php echo __('View this page on regular style') ?></a>
-</div>
 
 </body>
 </html>
diff --git a/web/js/smt_main.js b/web/js/smt_main.js
index 5c27120fa..681d9901f 100644
--- a/web/js/smt_main.js
+++ b/web/js/smt_main.js
@@ -3,6 +3,6 @@ $(function(){
     .show()
     .click(function() {
       document.cookie = "disable_smt=1";
-      location.reload();
+      location.href = $(this).attr('href');
     });
 });

From 583e0954ed2f4d793469df6a6c0eed7e37180099 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 29 Feb 2012 20:05:01 +0900
Subject: [PATCH 082/630] modify i18n message for smartphone switch button.
 (fixes #2227)

---
 apps/pc_frontend/i18n/messages.ja.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/pc_frontend/i18n/messages.ja.xml b/apps/pc_frontend/i18n/messages.ja.xml
index d0f374bc6..93ad84793 100644
--- a/apps/pc_frontend/i18n/messages.ja.xml
+++ b/apps/pc_frontend/i18n/messages.ja.xml
@@ -1365,11 +1365,11 @@
       </trans-unit>
       <trans-unit id="">
         <source>View this page on smartphone style</source>
-        <target>このページをスマートフォン版で表示</target>
+        <target>スマートフォン表示に切り替え</target>
       </trans-unit>
       <trans-unit id="">
         <source>View this page on regular style</source>
-        <target>このページをPC版で表示</target>
+        <target>PC表示に切り替え</target>
       </trans-unit>
       <trans-unit id="">
         <source>Post</source>

From 5026aaeef016aaac34910f7e057a71bf9c3e77c9 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 29 Feb 2012 20:23:54 +0900
Subject: [PATCH 083/630] remove member information on smtLayoutSns layout.
 (refs #2227)

---
 apps/pc_frontend/templates/smtLayoutSns.php | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/apps/pc_frontend/templates/smtLayoutSns.php b/apps/pc_frontend/templates/smtLayoutSns.php
index b88f60b8c..4c78061ba 100644
--- a/apps/pc_frontend/templates/smtLayoutSns.php
+++ b/apps/pc_frontend/templates/smtLayoutSns.php
@@ -37,21 +37,6 @@
 <?php if (opToolkit::isSecurePage()): ?>
 <?php include_partial('global/tosaka') ?>
 
-<div id="face" class="row">
-  <div class="span2">
-    <?php echo op_image_tag_sf_image($sf_user->getMember()->getImageFileName(), array('size' => '48x48')) ?>
-  </div>
-  <div class="span8">
-    <div class="row face-name"><?php echo $sf_user->getMember()->getName() ?></div>
-    <div class="row screen-name">
-      <?php $screenName = $sf_user->getMember()->getConfig('op_screen_name') ?>
-      <?php if ($screenName): ?>
-      <a href="#">@<?php echo $screenName ?></a>
-      <?php endif ?>
-    </div>
-  </div>
-  <div class="span2 center"><?php echo link_to(op_image_tag('HomeIcon.png', array('height' => '48')), '@homepage') ?></div>
-</div>
 <?php endif ?>
 
 <?php if ($sf_user->hasFlash('error')): ?>

From 6404cd1ff4cfc7e1e2837bcea8e5a9ab8d6778bd Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 29 Feb 2012 20:26:23 +0900
Subject: [PATCH 084/630] fixed layout of member search page on smartphone
 (fixes #2227)

---
 apps/pc_frontend/modules/member/config/view.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/pc_frontend/modules/member/config/view.yml b/apps/pc_frontend/modules/member/config/view.yml
index b5569dc26..5f7393ca7 100644
--- a/apps/pc_frontend/modules/member/config/view.yml
+++ b/apps/pc_frontend/modules/member/config/view.yml
@@ -44,6 +44,9 @@ smtEditProfileSuccess:
 smtConfigSuccess:
   layout: smtLayoutHome
 
+smtSearchSuccess:
+  layout: smtLayoutSns
+
 smtConfigImageSuccess:
   layout: smtLayoutHome
 

From a18840e33720ef8ca757245a1d393b6284eb67d4 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 29 Feb 2012 20:35:32 +0900
Subject: [PATCH 085/630] fixed to hide loading on tosaka notification (refs
 #2756)

---
 apps/pc_frontend/templates/_tosaka.php | 2 +-
 web/js/smt_notify.js                   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/pc_frontend/templates/_tosaka.php b/apps/pc_frontend/templates/_tosaka.php
index e6c6f5b9e..fbe2ca8e9 100644
--- a/apps/pc_frontend/templates/_tosaka.php
+++ b/apps/pc_frontend/templates/_tosaka.php
@@ -28,7 +28,7 @@
           {{if category=="link" && unread==false}}
           <?php echo __('%Friend% link request'); ?>
           {{else}}
-          {{html body}}
+          フレンドリクエストを承認しますか？
           {{/if}}
           </div>
         </div>
diff --git a/web/js/smt_notify.js b/web/js/smt_notify.js
index 2d2b57beb..60bd01415 100644
--- a/web/js/smt_notify.js
+++ b/web/js/smt_notify.js
@@ -56,7 +56,7 @@
 					dataType: 'json',
 					success: function(data) {
 						if(data.status=='success'){
-							$(this).parent().find('.ncfriendloading:first').hide();
+							$('.ncfriendloading').hide();
 							$(this).parent().find('.ncfriendresultmessage').text('フレンド申請を承認しました。');
 							$(this).parent().find('.ncfriendresultmessage').show();
 						}else{
@@ -64,7 +64,7 @@
 						}   
 					},
 					error: function(r, s, e){
-						$(this).parent().find('.ncfriendloading:first').hide();
+						$('.ncfriendloading').hide();
 						$(this).parent().find('.ncfriendresultmessage').text('既に承認済みか拒否済みです。');
 						$(this).parent().find('.ncfriendresultmessage').show(); 
                                         }
@@ -90,7 +90,7 @@
 					dataType: 'json',
 					success: function(data) {
 						if(data.status=='success'){
-							$(this).parent().find('.ncfriendloading:first').hide();
+							$('.ncfriendloading').hide();
 							$(this).parent().find('.ncfriendresultmessage').text('フレンド申請を拒否しました。');
 							$(this).parent().find('.ncfriendresultmessage').show();
 						}else{
@@ -98,7 +98,7 @@
 						}   
 					},
 					error: function(r, s, e){
-						$(this).parent().find('.ncfriendloading:first').hide();
+						$('.ncfriendloading').hide();
 						$(this).parent().find('.ncfriendresultmessage').text('既に承認済みか拒否済みです。');
 						$(this).parent().find('.ncfriendresultmessage').show(); 
                                         }

From 207d349e19a1b753de3cde20136f814eabe5cd97 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 14 Mar 2012 19:48:59 +0900
Subject: [PATCH 086/630] fixed to generate image for square size. (fixes
 #2890)

---
 .../sfImageGeneratorImageTransform.php        | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php b/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php
index 4b442c90b..b9fab745e 100644
--- a/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php
+++ b/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php
@@ -56,6 +56,23 @@ protected function doResize($tmpfilename)
       throw new sfException($result->getMessage());
     }
 
+    $srcWidth = $this->transform->getImageWidth();
+    $srcHeight = $this->transform->getImageHeight();
+    if ($srcWidth > $srcHeight)
+    {
+      $srcX = ceil(($srcWidth - $srcHeight) / 2);
+      $srcY = 0;
+      $srcW = $srcHeight;
+      $srcH = $srcHeight;
+    }
+    else
+    {
+      $srcX = 0;
+      $srcY = ceil(($srcHeight - $srcWidth) / 2);
+      $srcW = $srcWidth;
+      $srcH = $srcWidth;
+    }
+ 
     // for mobile phone
     if ('jpg' === $this->format)
     {
@@ -64,7 +81,16 @@ protected function doResize($tmpfilename)
 
     if ($this->width && $this->height)
     {
+      $this->transform->crop($srcW, $srcH, $srcX, $srcY);
+      $tmpoutputfilename = tempnam(sys_get_temp_dir(), 'IGITF');
+      $result = $this->transform->save($tmpoutputfilename);
+      if (PEAR::isError($result))
+      {
+        throw new sfException($result->getMessage());
+      }
+      $this->transform->load($tmpoutputfilename);
       $this->transform->fit($this->width, $this->height);
+      unlink($tmpoutputfilename);     
     }
   }
 

From ad33dea197a1cc53d472f704afe1acec94d46dc9 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 15 Mar 2012 18:00:54 +0900
Subject: [PATCH 087/630] add notification center for PC (refs #2767)

---
 apps/pc_frontend/i18n/messages.ja.xml      |   4 +
 apps/pc_frontend/templates/_header.php     |  54 +++++
 apps/pc_frontend/templates/_layout.php     |   4 +
 plugins/opSkinBasicPlugin/web/css/main.css | 226 ++++++++++++++++++++-
 web/js/jquery.notify.js                    |  90 ++++++++
 web/js/op_notify.js                        |  46 +++++
 6 files changed, 421 insertions(+), 3 deletions(-)
 create mode 100755 web/js/jquery.notify.js
 create mode 100755 web/js/op_notify.js

diff --git a/apps/pc_frontend/i18n/messages.ja.xml b/apps/pc_frontend/i18n/messages.ja.xml
index 93ad84793..91370382b 100644
--- a/apps/pc_frontend/i18n/messages.ja.xml
+++ b/apps/pc_frontend/i18n/messages.ja.xml
@@ -1383,6 +1383,10 @@
         <source>%Friend% link request</source>
         <target>%Friend%申請</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>There is no new notification.</source>
+        <target>新しい通知はありません</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/apps/pc_frontend/templates/_header.php b/apps/pc_frontend/templates/_header.php
index f87be598d..1eeb6cfdf 100644
--- a/apps/pc_frontend/templates/_header.php
+++ b/apps/pc_frontend/templates/_header.php
@@ -1,5 +1,59 @@
 <h1><?php echo link_to($op_config['sns_name'], '@homepage') ?></h1>
 
+<?php if(opToolkit::isSecurePage()): ?>
+<div id="notificationCenter">
+  <?php echo op_image_tag('NOTIFY_CENTER.png', array('height' => '32', 'class' => 'ncbutton')) ?>
+  <div id="notificationCenterDetail">
+    <div id="notificationCenterDetailHeader">
+      <?php echo __('Notification Center') ?>
+    </div>
+    <div id="notificationCenterLoading">
+      <?php echo op_image_tag('ajax-loader.gif') ?>
+    </div>
+    <div id="notificationCenterError">
+      <?php echo __('There is no new notification.') ?>
+    </div>
+  </div>
+</div>
+
+<script id="notificationCenterListTemplate" type="text/x-jquery-tmpl">
+    <div class="{{if unread==false}}isread {{/if}}{{if category=="message" || category=="other"}}nclink {{/if}}push" data-notify-id="${id}" data-location-url="${url}" data-member-id="${member_id_from}">
+      <div class="push_icon">
+        <img src="${icon_url}" width="48">
+      </div>
+      <div class="push_content">
+      {{if category=="link"}}
+        {{if unread==false}}
+        <?php echo __('Friend request') ?>
+        {{else}}
+        <?php echo __('Do you accept friend request?') ?>
+        <div class="push_yesno">
+          <button class="friend-accept">YES</button>
+          <button class="friend-reject">NO</button>
+          <div class="ncfriendloading"><?php echo op_image_tag('ajax-loader.gif') ?></div>
+          <div class="ncfriendresultmessage"></div>
+        </div>
+        {{/if}}
+      {{else}}
+        ${body}
+      {{/if}}
+      </div>
+    </div>
+</script>
+
+<script id="notificationCenterCountTemplate" type="text/x-jquery-tmpl">
+  {{if message!==0}}
+  <span id="nc_icon1">${message}</span>
+  {{/if}}
+  {{if link!==0}}
+  <span id="nc_icon2">${link}</span>
+  {{/if}}
+  {{if other!==0}}
+  <span id="nc_icon3">${other}</span>
+  {{/if}}
+</script>
+
+<?php endif ?>
 
 <div id="globalNav">
 <?php
diff --git a/apps/pc_frontend/templates/_layout.php b/apps/pc_frontend/templates/_layout.php
index 6b555d80f..e9dc90848 100644
--- a/apps/pc_frontend/templates/_layout.php
+++ b/apps/pc_frontend/templates/_layout.php
@@ -12,6 +12,10 @@
 <?php
 use_helper('Javascript');
 
+use_javascript('jquery.min.js');
+use_javascript('jquery.tmpl.min.js');
+use_javascript('jquery.notify.js');
+use_javascript('op_notify.js');
 $json = array(
   'apiKey' => $sf_user->getMemberApiKey(),
   'apiBase' => app_url_for('api', 'homepage'),
diff --git a/plugins/opSkinBasicPlugin/web/css/main.css b/plugins/opSkinBasicPlugin/web/css/main.css
index 6e36a673c..4a9082710 100644
--- a/plugins/opSkinBasicPlugin/web/css/main.css
+++ b/plugins/opSkinBasicPlugin/web/css/main.css
@@ -307,7 +307,9 @@ pre {
  *--------------------------------------------*/
 #Header {
   background: #092f56 url(../images/bg_header.gif) repeat-x scroll 0 0;
-  overflow: hidden;
+  overflow: visible;
+  width: 100%;
+  height: 80px;
 }
 
 #HeaderContainer {
@@ -333,14 +335,232 @@ pre {
   text-decoration: none;
 }
 
+/*----------------------------------------------
+ * Notification Center
+ *--------------------------------------------*/
+
+#notificationCenter {
+  width: 97px;
+  padding: 40px 14px 0 14px;
+  float: left;
+  position: relative;
+}
+
+#notificationCenterDetail {
+  width: 300px; 
+  background: #FFFFFF;
+  border: 1px solid #000000;
+  position: absolute;
+  left: 15px;
+  top: 80px;
+  overflow: visible;
+  z-index: 100;
+  display: none;
+}
+
+#notificationCenterDetailHeader {
+  width: 286px;
+  padding: 7px;
+  background: #D2D2D2;
+  border-bottom: 1px solid #E6E6E6;
+  text-align: left;
+  display: inline-block;
+  font-size: 14px;
+  font-weight: bold;
+}
+
+#notificationCenterLoading {
+  width: 300px;
+  padding: 21px 0;
+  background: #FFFFFF;
+  text-align: center;
+  border-top: 0px; 
+  display: inline-block;  
+}
+
+#notificationCenterError {
+  width: 300px;
+  padding: 20px 0;
+  background: #FFFFFF;
+  text-align: center;
+  display: inline-block;
+  font-size: 11px;
+  display: none; 
+}
+
+.notificationCenterList {
+  background: #DDD;
+}
+
+#notificationCenterDetail .push {
+  border-bottom: 1px solid #E6E6E6;
+  padding: 4px 0;
+  display: inline-block;
+  background: #ddd;
+}
+
+#notificationCenterDetail .push:hover {
+  cursor: pointer;
+  background-color: #cfe7ea;
+}
+
+#notificationCenterDetail .isread {
+  background: #FFFFFF;
+}
+
+#notificationCenterDetail .push_icon {
+  width: 48px;
+  padding: 1px;
+  display: inline;
+  float: left;
+}
+
+#notificationCenterDetail .push_content {
+  font-size: 11px;
+  min-height: 50px;
+  padding: 0 2px;
+  width: 246px;
+  float: right;
+  display: inline;
+}
+
+#notificationCenter .push_content .push_yesno {
+  display: block;
+  width: 242px;
+  text-align: center;
+  padding-top: 5px;
+}
+
+#notificationCenter .push_content .push_yesno button {
+  display: inline-block;
+  padding: 2px 8px;
+  font-size: 12px;
+  line-height: 18px;
+  color: #333;
+  text-align: center;
+  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+  background-color: #FAFAFA;
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(white), color-stop(25%, white), to(#E6E6E6));
+  background-image: -webkit-linear-gradient(white, white 25%, #E6E6E6);
+  background-image: -moz-linear-gradient(top, white, white 25%, #E6E6E6);
+  background-image: -ms-linear-gradient(white, white 25%, #E6E6E6);
+  background-image: -o-linear-gradient(white, white 25%, #E6E6E6);
+  background-image: linear-gradient(white, white 25%, #E6E6E6);
+  background-repeat: no-repeat;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);
+  border: 1px solid #CCC;
+  border-bottom-color: #BBB;
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+  cursor: pointer;
+  height: 22px;
+}
+
+#notificationCenter .push_content .push_yesno button:hover {
+  text-decoration: none;
+  background-color: #e6e6e6;
+  background-position: 0 -15px;
+  -webkit-transition: background-position 0.1s linear;
+  -moz-transition: background-position 0.1s linear;
+  -ms-transition: background-position 0.1s linear;
+  -o-transition: background-position 0.1s linear;
+  transition: background-position 0.1s linear;
+  text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+  color: #ffffff;
+}
+
+#notificationCenter .push_content .push_yesno button:focus {
+  outline: thin dotted;
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
+
+#notificationCenter .push_content .push_yesno button.friend-accept {
+  background-color: #006dcc;
+  background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
+  background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
+  background-image: -o-linear-gradient(top, #0088cc, #0044cc);
+  background-image: linear-gradient(top, #0088cc, #0044cc);
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
+  border-color: #0044cc #0044cc #002a80;
+  border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+  color: #FFF;
+}
+
+#notificationCenter .push_content .push_yesno button.friend-accept:hover {
+  background-color: #0044cc;
+}
+
+#notificationCenter .push_content .ncfriendloading, #notificationCenter .push_content .ncfriendresultmessage {
+  text-align: center;
+  display: none;
+}
+
+#nc_icon1 {
+  position:absolute;
+  top: 58px;
+  left: 33px;
+  line-height: 10px;
+  background-color: #B94A48;
+  padding: 1px 3px 2px;
+  font-size: 9.75px;
+  font-weight: bold;
+  color: white;
+  text-transform: uppercase;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px; 
+}
+
+#nc_icon2 {
+  position:absolute;
+  top: 58px;
+  left: 67px;
+  line-height: 10px;
+  background-color: #B94A48;
+  padding: 1px 3px 2px;
+  font-size: 9.75px;
+  font-weight: bold;
+  color: white;
+  text-transform: uppercase;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px; 
+}
+
+#nc_icon3 {
+  position:absolute;
+  top: 58px;
+  left: 99px;
+  line-height: 10px;
+  background-color: #B94A48;
+  padding: 1px 3px 2px;
+  font-size: 9.75px;
+  font-weight: bold;
+  color: white;
+  text-transform: uppercase;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px; 
+}
+
+
 /*----------------------------------------------
  * Navigation
  *--------------------------------------------*/
 #globalNav {
   padding-top: 40px;
   text-align: right;
-  width: 850px;
-  float: left;
+  width: 720px;
+  float: right;
 }
 
 #globalNav li {
diff --git a/web/js/jquery.notify.js b/web/js/jquery.notify.js
new file mode 100755
index 000000000..77198bd7e
--- /dev/null
+++ b/web/js/jquery.notify.js
@@ -0,0 +1,90 @@
+(function($){
+  $.fn.pushLink = function(settings){
+    settings = $.extend({
+      isDisableRead: false,
+    }, settings);
+
+    return this.each(function(){
+      var linkUrl = $(this).attr('data-location-url');
+      var notifyId = $(this).attr('data-notify-id');
+      $(this).click(function(){
+        if ( false == settings.isDisableRead )
+        {
+          $.getJSON( openpne.apiBase + 'push/read.json' , { 'id': notifyId, 'apiKey': openpne.apiKey }, function(d){
+            window.location = linkUrl;
+          });
+        }
+        else
+        {
+          window.location = linkUrl;
+	}
+      });
+    });
+  };
+
+  $.fn.friendLink = function(settings){
+    return this.each(function(){
+      $(this).click(function(){
+        $(this).parent().find('button').hide();
+        $(this).siblings('.ncfriendloading').show();
+        var pushElement = $(this).parents('.push');
+        var memberId = pushElement.attr('data-member-id');
+        var notifyId = pushElement.attr('data-notify-id');
+        $.getJSON( openpne.apiBase + 'push/read.json' , { 'id': notifyId, 'apiKey': openpne.apiKey }, function(d){});
+        $.ajax({
+          url: openpne.apiBase + 'member/friend_accept.json',
+          type: 'GET',
+          data: 'member_id=' + memberId + '&apiKey=' + openpne.apiKey,
+          dataType: 'json',
+          success: function(data) {
+            if(data.status=='success'){
+              $('.ncfriendloading').hide();
+              $(this).parent().find('.ncfriendresultmessage').text('リクエストを承認しました');
+              $(this).parent().find('.ncfriendresultmessage').show();
+            }else{
+              alert(data.message);
+            }
+          },
+          error: function(r, s, e){
+            $('.ncfriendloading').hide();
+            $(this).parent().find('.ncfriendresultmessage').text('既に承認済みです');
+            $(this).parent().find('.ncfriendresultmessage').show(); 
+          }
+        });
+      });
+    });
+  };
+
+  $.fn.friendUnlink = function(settings){
+    return this.each(function(){
+      $(this).click(function(){
+        $(this).parent().find('button').hide();
+        $(this).siblings('.ncfriendloading').show();
+        var pushElement = $(this).parents('.push');
+        var memberId = pushElement.attr('data-member-id');
+        var notifyId = pushElement.attr('data-notify-id');
+        $.getJSON( openpne.apiBase + 'push/read.json' , { 'id': notifyId, 'apiKey': openpne.apiKey }, function(d){});
+        $.ajax({
+          url: openpne.apiBase + 'member/friend_reject.json',
+          type: 'GET',
+          data: 'member_id=' + memberId + '&apiKey=' + openpne.apiKey,
+          dataType: 'json',
+          success: function(data) {
+            if(data.status=='success'){
+              $('.ncfriendloading').hide();
+              $('.ncfrinedresultmessage', $(this).parent()).text('リクエストを拒否しました');
+              $('.ncfrinedresultmessage', $(this).parent()).show();
+             }else{
+              alert(data.message);
+            }   
+          },
+          error: function(r, s, e) {
+            $('.ncfriendloading').hide();
+            $(this).parent().find('.ncfriendresultmessage').text('既に拒否済みです');
+            $(this).parent().find('.ncfriendresultmessage').show(); 
+          }
+        });
+      });
+    });
+  };
+})(jQuery);
diff --git a/web/js/op_notify.js b/web/js/op_notify.js
new file mode 100755
index 000000000..20315a196
--- /dev/null
+++ b/web/js/op_notify.js
@@ -0,0 +1,46 @@
+$(document).ready(function(){
+  var is_read_flag = false;
+  $.getJSON( openpne.apiBase + 'push/count.json?apiKey=' + openpne.apiKey, function(json){
+    if(json.status=='success')
+    {
+      $pushHtml = $("#notificationCenterCountTemplate").tmpl(json.data);
+      $("#notificationCenter").append($pushHtml);
+    }
+  });
+
+  $('.ncbutton').click(function(){
+    if ('none' == $('#notificationCenterDetail').css('display'))
+    {
+      $('#notificationCenterDetail').show();
+      if (is_read_flag == false)
+      {
+        $.getJSON( openpne.apiBase + 'push/search.json?apiKey=' + openpne.apiKey, function(json){
+          if(json.status=='success')
+          {
+            if(json.data[0])
+            {
+              $pushHtml = $('#notificationCenterListTemplate').tmpl(json.data);
+              $('.friend-accept', $pushHtml).friendLink();
+              $('.friend-reject', $pushHtml).friendUnlink()
+              $('#notificationCenterLoading').hide();
+              $('#notificationCenterError').hide();
+              $('#notificationCenterDetail').append($pushHtml);
+            }else{
+              $('#notificationCenterLoading').hide();
+              $('#notificationCenterError').show();
+            }            
+          }else{
+            $('#notificationCenterLoading').hide();
+            $('#notificationCenterError').show();
+          }
+          $('.nclink').pushLink();
+        });
+        is_read_flag = true;
+      }
+    }
+    else
+    {
+      $('#notificationCenterDetail').hide();
+    }
+  });
+});

From 0b28cb49cc63b58e8aba1a523d0f167600ab3db3 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 16 Mar 2012 23:32:32 +0900
Subject: [PATCH 088/630] activity/post.json API should reject empty post
 (fixes #2698)

---
 apps/api/modules/activity/actions/actions.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/api/modules/activity/actions/actions.class.php b/apps/api/modules/activity/actions/actions.class.php
index 33c95e028..4eda7db69 100644
--- a/apps/api/modules/activity/actions/actions.class.php
+++ b/apps/api/modules/activity/actions/actions.class.php
@@ -150,10 +150,10 @@ public function executeCommunity(sfWebRequest $request)
 
   public function executePost(sfWebRequest $request)
   {
-    $this->forward400Unless(isset($request['body']), 'body parameter not specified.');
+    $body = (string)$request['body'];
+    $this->forward400If('' === $body, 'body parameter not specified.');
 
     $memberId = $this->getUser()->getMemberId();
-    $body = $request['body'];
     $options = array();
 
     if (isset($request['public_flag']))

From 9cd46f722195955eb478f0aefb8f39b78d712192 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 29 Mar 2012 14:34:49 +0900
Subject: [PATCH 089/630] move code of retrieving notifications to
 opNotificationCenter class (refs #2756)

---
 .../modules/push/actions/actions.class.php    | 27 +++----------------
 lib/util/opNotificationCenter.class.php       | 24 +++++++++++++++++
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/apps/api/modules/push/actions/actions.class.php b/apps/api/modules/push/actions/actions.class.php
index 068f2424d..c12b4695a 100644
--- a/apps/api/modules/push/actions/actions.class.php
+++ b/apps/api/modules/push/actions/actions.class.php
@@ -19,14 +19,16 @@ class pushActions extends opJsonApiActions
 {
   public function executeSearch(sfWebRequest $request)
   {
-    $this->notifications = $this->getNotifications();
+    $member = $this->getUser()->getMember();
+    $notifications = opNotificationCenter::getNotifications($member);
 
     $this->setTemplate('array');
   }
 
   public function executeCount(sfWebRequest $request)
   {
-    $notifications = $this->getNotifications();
+    $member = $this->getUser()->getMember();
+    $notifications = opNotificationCenter::getNotifications($member);
 
     $this->count = array(
       'link'    => 0,
@@ -71,25 +73,4 @@ public function executeRead(sfWebRequest $request)
       $this->forward404('Request parameter id does not exist.');
     }
   }
-
-  protected function getNotifications(Member $member = null)
-  {
-    if (!$member)
-    {
-      $member = $this->getUser()->getMember();
-    }
-
-    $notifications = $member->getConfig('notification_center');
-
-    if (!$notifications)
-    {
-      $notifications = array();
-    }
-    else
-    {
-      $notifications = unserialize($notifications);
-    }
-
-    return $notifications;
-  }
 }
diff --git a/lib/util/opNotificationCenter.class.php b/lib/util/opNotificationCenter.class.php
index 8a31c3c1e..974e81210 100644
--- a/lib/util/opNotificationCenter.class.php
+++ b/lib/util/opNotificationCenter.class.php
@@ -75,4 +75,28 @@ public function setRead(Member $target, $notificationId)
 
     return $success;
   }
+
+  static public function getNotifications(Member $member = null)
+  {
+    if (null === $member)
+    {
+      $member = sfContext::getInstance()->getUser()->getMember();
+    }
+
+    $notificationObject = Doctrine::getTable('MemberConfig')
+      ->findOneByMemberIdAndName($member->getId(), 'notification_center');
+
+    if (!$notificationObject)
+    {
+      $notifications = array();
+    }
+    else
+    {
+      $notifications = unserialize($notificationObject->getValue());
+    }
+
+    $notificationObject->free(true);
+
+    return $notifications;
+  }
 }

From 8615aadedfb2b6592338d0e8097996fc5c93ac0d Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 29 Mar 2012 14:53:58 +0900
Subject: [PATCH 090/630] change notification serializing order (refs #2756)

---
 lib/util/opNotificationCenter.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/util/opNotificationCenter.class.php b/lib/util/opNotificationCenter.class.php
index 974e81210..53e1c3f8a 100644
--- a/lib/util/opNotificationCenter.class.php
+++ b/lib/util/opNotificationCenter.class.php
@@ -31,11 +31,11 @@ static public function notify(Member $from, Member $to, $body, array $options =
       $notifications = unserialize($notificationObject->getValue());
     }
 
-    $notifications[] = $notificationItem;
+    array_unshift($notifications, $notificationItem);
 
     if (sfConfig::get('op_notification_limit', 20) > count($notifications))
     {
-      array_slice($notifications, -1, -sfConfig::get('op_notification_limit', 20));
+      array_slice($notifications, 0, sfConfig::get('op_notification_limit', 20));
     }
 
     $notificationObject->setValue(serialize($notifications));

From 8c91389cf80210ec231abcb3dfdc68f60bb69b4c Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 29 Mar 2012 16:39:05 +0900
Subject: [PATCH 091/630] add support for i18n in push API (refs #2756)

---
 apps/api/lib/helper/opJsonApiHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/api/lib/helper/opJsonApiHelper.php b/apps/api/lib/helper/opJsonApiHelper.php
index 05f3bad15..7cc149b8e 100644
--- a/apps/api/lib/helper/opJsonApiHelper.php
+++ b/apps/api/lib/helper/opJsonApiHelper.php
@@ -183,7 +183,7 @@ function op_api_notification($notification)
 
   return array(
     'id' => $notification['id'],
-    'body' => $notification['body'],
+    'body' => __($notification['body']),
     'category' => $notification['category'],
     'unread' => $notification['unread'],
     'created_at' => date('r', strtotime($notification['created_at'])),

From 92fbeea55fc0d452323970983d3940ef59706540 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Tue, 27 Mar 2012 11:49:54 +0900
Subject: [PATCH 092/630] fixed global navigation style broken (fixes #2767)

---
 plugins/opSkinBasicPlugin/web/css/main.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/opSkinBasicPlugin/web/css/main.css b/plugins/opSkinBasicPlugin/web/css/main.css
index 4a9082710..ca56894fa 100644
--- a/plugins/opSkinBasicPlugin/web/css/main.css
+++ b/plugins/opSkinBasicPlugin/web/css/main.css
@@ -561,6 +561,8 @@ pre {
   text-align: right;
   width: 720px;
   float: right;
+  overflow: hidden;
+  height: 40px;
 }
 
 #globalNav li {

From 9ab0f6894a5ece0b11c08658d16a062ed8cb8a95 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Tue, 27 Mar 2012 14:54:10 +0900
Subject: [PATCH 093/630] fixed member config page style broken on smartphone
 (fixes #2227)

---
 .../modules/member/templates/smtConfigSuccess.php           | 2 +-
 web/css/smt_main.css                                        | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/pc_frontend/modules/member/templates/smtConfigSuccess.php b/apps/pc_frontend/modules/member/templates/smtConfigSuccess.php
index 6c87b7e83..08d5fce4b 100644
--- a/apps/pc_frontend/modules/member/templates/smtConfigSuccess.php
+++ b/apps/pc_frontend/modules/member/templates/smtConfigSuccess.php
@@ -34,7 +34,7 @@
 </div>
 <?php endif; ?>
 
-<div class="row span12" style="margin-left: 5px;">
+<div class="row" style="margin-left: 0px;">
 <?php foreach ($form as $f): ?>
 <?php if (!$f->isHidden()): ?>
 <div class="clearfix <?php $f->hasError() ? 'error' : '' ?>">
diff --git a/web/css/smt_main.css b/web/css/smt_main.css
index 91ee561e7..d1b87a246 100644
--- a/web/css/smt_main.css
+++ b/web/css/smt_main.css
@@ -19,6 +19,12 @@ label {
   width: auto;
 }
 
+ul > li > input[type="text"], 
+ul > li > input[type="textarea"],
+ul > li > input[type="password"] {
+  width: 285px;
+}
+
 input[type="checkbox"], input[type="radio"] {
   width: auto!important;
   border: 1px solid #ccc;

From 1c60d72585ca02bc5e7e4b438d418370d5406711 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Tue, 27 Mar 2012 14:56:51 +0900
Subject: [PATCH 094/630] fixed notification center templates on smartphone
 (fixes #2756)

---
 apps/pc_frontend/i18n/messages.ja.xml  |  4 ++++
 apps/pc_frontend/templates/_tosaka.php | 11 ++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/apps/pc_frontend/i18n/messages.ja.xml b/apps/pc_frontend/i18n/messages.ja.xml
index 91370382b..ac679e0e3 100644
--- a/apps/pc_frontend/i18n/messages.ja.xml
+++ b/apps/pc_frontend/i18n/messages.ja.xml
@@ -1383,6 +1383,10 @@
         <source>%Friend% link request</source>
         <target>%Friend%申請</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>Do you accept %friend% link request?</source>
+        <target>%Friend%申請を許可しますか？</target>
+      </trans-unit>
       <trans-unit id="">
         <source>There is no new notification.</source>
         <target>新しい通知はありません</target>
diff --git a/apps/pc_frontend/templates/_tosaka.php b/apps/pc_frontend/templates/_tosaka.php
index fbe2ca8e9..450ac4904 100644
--- a/apps/pc_frontend/templates/_tosaka.php
+++ b/apps/pc_frontend/templates/_tosaka.php
@@ -25,10 +25,15 @@
       <div class="span9 push_content">
         <div class="row">
           <div class="span9">
-          {{if category=="link" && unread==false}}
-          <?php echo __('%Friend% link request'); ?>
+          {{if category=="link"}}
+            {{if unread==false}}
+              <?php echo __('%Friend% link request') ?>
+            {{/if}}
+            {{if unread==true}}
+              <?php echo __('Do you accept %friend% link request?') ?>
+            {{/if}}
           {{else}}
-          フレンドリクエストを承認しますか？
+            {{html body}}
           {{/if}}
           </div>
         </div>

From 628dfbd532a2ca42c74b2f6cfe4605457ff5b6f7 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Tue, 27 Mar 2012 14:58:27 +0900
Subject: [PATCH 095/630] (fixes #2756) fixed friend link request button text
 on smartphone notification center

---
 apps/pc_frontend/templates/_tosaka.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/pc_frontend/templates/_tosaka.php b/apps/pc_frontend/templates/_tosaka.php
index 450ac4904..f2e96e318 100644
--- a/apps/pc_frontend/templates/_tosaka.php
+++ b/apps/pc_frontend/templates/_tosaka.php
@@ -39,8 +39,8 @@
         </div>
         {{if category=="link"}}
         <div class="row{{if unread==false}} hide{{/if}}">
-            <button class="span2 btn btn-primary small friend-notify-button friend-accept">YES</button>
-            <button class="span2 btn small friend-notify-button friend-reject">NO</button>
+            <button class="span2 btn btn-primary small friend-notify-button friend-accept"<?php echo __('Accept') ?></button>
+            <button class="span2 btn small friend-notify-button friend-reject"><?php echo __('Reject') ?></button>
             <div class="center hide ncfriendloading"><?php echo op_image_tag('ajax-loader.gif') ?></div>
             <div class="center hide ncfriendresultmessage"></div>
         </div>

From cda0dbb5237fbaa056f2fb2260fa42ce984fddde Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Tue, 27 Mar 2012 15:24:40 +0900
Subject: [PATCH 096/630] fixed notification center style on smartphone (fixes
 #2756)

---
 apps/pc_frontend/templates/_tosaka.php | 2 +-
 web/css/smt_main.css                   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/pc_frontend/templates/_tosaka.php b/apps/pc_frontend/templates/_tosaka.php
index f2e96e318..0ead6db54 100644
--- a/apps/pc_frontend/templates/_tosaka.php
+++ b/apps/pc_frontend/templates/_tosaka.php
@@ -18,7 +18,7 @@
 <!-- NCFORM TMPL -->
 
 <script id="pushListTemplate" type="text/x-jquery-tmpl">
-    <div class="{{if unread==false}}isread {{/if}}{{if category=="message" || category=="other"}}nclink {{/if}}row push"  data-notify-id="${id}" data-location-url="${url}" data-member-id="${member_id_from}">
+    <div class="{{if unread==false}}isread {{/if}}{{if category=="message" || category=="other"}}nclink {{/if}}row push marginl0"  data-notify-id="${id}" data-location-url="${url}" data-member-id="${member_id_from}">
       <div class="span3 push_icon">
         <img style="margin-left: 5px;" src="${icon_url}" class="rad4" width="48" height="48">
       </div>
diff --git a/web/css/smt_main.css b/web/css/smt_main.css
index d1b87a246..8f40e242e 100644
--- a/web/css/smt_main.css
+++ b/web/css/smt_main.css
@@ -302,6 +302,10 @@ hr.white2 {
   line-height: 12px;
 }
 
+.marginl0 {
+  margin-left: 0px!important;
+}
+
 * {
   word-break: break-all;
 }

From 8bea339f9f55f3e6c7c941a3f0a3c67f789c75be Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 30 Mar 2012 14:31:11 +0900
Subject: [PATCH 097/630] add ability to configure footer gadget for smartphone
 (refs #2227)

---
 .../default/actions/components.class.php      |  6 ++++++
 .../templates/_smartphoneFooterGadgets.php    |  7 +++++++
 apps/pc_frontend/templates/smtLayoutGroup.php |  3 +++
 apps/pc_frontend/templates/smtLayoutHome.php  |  3 +++
 .../pc_frontend/templates/smtLayoutMember.php |  3 +++
 apps/pc_frontend/templates/smtLayoutSns.php   |  3 +++
 lib/config/config/gadget_config.yml           |  6 ++++++
 .../config/smartphone_footer_gadget.yml       | 20 +++++++++++++++++++
 web/css/gadgetPlot.css                        |  2 ++
 9 files changed, 53 insertions(+)
 create mode 100644 apps/pc_frontend/modules/default/templates/_smartphoneFooterGadgets.php
 create mode 100644 lib/config/config/smartphone_footer_gadget.yml

diff --git a/apps/pc_frontend/modules/default/actions/components.class.php b/apps/pc_frontend/modules/default/actions/components.class.php
index e7586f38b..aedf735f5 100644
--- a/apps/pc_frontend/modules/default/actions/components.class.php
+++ b/apps/pc_frontend/modules/default/actions/components.class.php
@@ -46,6 +46,12 @@ public function executeSmtMenu()
     $this->navs = Doctrine::getTable('Navigation')->retrieveByType($type);
   }
 
+  public function executeSmartphoneFooterGadgets()
+  {
+    $gadgets = Doctrine::getTable('Gadget')->retrieveGadgetsByTypesName('smartphoneFooter');
+    $this->gadgets = $gadgets['smartphoneFooterContents'];
+  }
+
   public function executeSideBannerGadgets()
   {
     $gadgets = Doctrine::getTable('Gadget')->retrieveGadgetsByTypesName('sideBanner');
diff --git a/apps/pc_frontend/modules/default/templates/_smartphoneFooterGadgets.php b/apps/pc_frontend/modules/default/templates/_smartphoneFooterGadgets.php
new file mode 100644
index 000000000..91ebf6d65
--- /dev/null
+++ b/apps/pc_frontend/modules/default/templates/_smartphoneFooterGadgets.php
@@ -0,0 +1,7 @@
+<?php if ($gadgets): ?>
+<?php foreach ($gadgets as $gadget): ?>
+<?php if ($gadget->isEnabled()): ?>
+<?php include_component($gadget->getComponentModule(), $gadget->getComponentAction(), array('gadget' => $gadget)); ?>
+<?php endif; ?>
+<?php endforeach; ?>
+<?php endif; ?>
diff --git a/apps/pc_frontend/templates/smtLayoutGroup.php b/apps/pc_frontend/templates/smtLayoutGroup.php
index cbb0c0374..f4eeadfe6 100644
--- a/apps/pc_frontend/templates/smtLayoutGroup.php
+++ b/apps/pc_frontend/templates/smtLayoutGroup.php
@@ -65,6 +65,9 @@
 
 <?php echo $sf_content ?>
 
+<div id="smartphoneFooter">
+<?php include_component('default', 'smartphoneFooterGadgets') ?>
+</div>
 
 </body>
 </html>
diff --git a/apps/pc_frontend/templates/smtLayoutHome.php b/apps/pc_frontend/templates/smtLayoutHome.php
index c00035e16..76bfdd73b 100644
--- a/apps/pc_frontend/templates/smtLayoutHome.php
+++ b/apps/pc_frontend/templates/smtLayoutHome.php
@@ -68,6 +68,9 @@
 
 <?php echo $sf_content ?>
 
+<div id="smartphoneFooter">
+<?php include_component('default', 'smartphoneFooterGadgets') ?>
+</div>
 
 </body>
 </html>
diff --git a/apps/pc_frontend/templates/smtLayoutMember.php b/apps/pc_frontend/templates/smtLayoutMember.php
index ac70047c4..dc076e536 100644
--- a/apps/pc_frontend/templates/smtLayoutMember.php
+++ b/apps/pc_frontend/templates/smtLayoutMember.php
@@ -71,6 +71,9 @@
 
 <?php echo $sf_content ?>
 
+<div id="smartphoneFooter">
+<?php include_component('default', 'smartphoneFooterGadgets') ?>
+</div>
 
 </body>
 </html>
diff --git a/apps/pc_frontend/templates/smtLayoutSns.php b/apps/pc_frontend/templates/smtLayoutSns.php
index 4c78061ba..f7ccfedf3 100644
--- a/apps/pc_frontend/templates/smtLayoutSns.php
+++ b/apps/pc_frontend/templates/smtLayoutSns.php
@@ -57,6 +57,9 @@
 
 <?php echo $sf_content ?>
 
+<div id="smartphoneFooter">
+<?php include_component('default', 'smartphoneFooterGadgets') ?>
+</div>
 
 </body>
 </html>
diff --git a/lib/config/config/gadget_config.yml b/lib/config/config/gadget_config.yml
index d6608c315..1205cb79a 100644
--- a/lib/config/config/gadget_config.yml
+++ b/lib/config/config/gadget_config.yml
@@ -79,6 +79,12 @@ smartphoneLogin:
     default: layoutD
   plot_action: [design, smartphoneLoginGadgetPlot]
 
+smartphoneFooter:
+  name: "スマートフォン版フッター"
+  layout:
+    default: layoutD
+  plot_action: [design, smartphoneFooterGadgetPlot]
+
 dailyNews:
   name: "デイリーニュース（PCメールアドレス向け）"
   layout:
diff --git a/lib/config/config/smartphone_footer_gadget.yml b/lib/config/config/smartphone_footer_gadget.yml
new file mode 100644
index 000000000..8b3493eac
--- /dev/null
+++ b/lib/config/config/smartphone_footer_gadget.yml
@@ -0,0 +1,20 @@
+freeArea:
+  caption:
+    ja_JP: "フリーエリア"
+  description:
+    ja_JP: "フリーエリアを設置できます"
+  component: [default, freeAreaBox]
+  config:
+    title:
+      Name:       "title"
+      Caption:    "タイトル"
+      FormType:   "input"
+      ValueType:  "text"
+      IsRequired: false
+    value:
+      Name:       "value"
+      Caption:    "内容"
+      FormType:   "rich_textarea"
+      ValueType:  "text"
+      IsRequired: false
+
diff --git a/web/css/gadgetPlot.css b/web/css/gadgetPlot.css
index 9632b45b2..3a7986d2c 100644
--- a/web/css/gadgetPlot.css
+++ b/web/css/gadgetPlot.css
@@ -103,6 +103,7 @@ body
 #plotSmartphoneProfileContents div,
 #plotSmartphoneCommunityContents div,
 #plotSmartphoneLoginContents div,
+#plotSmartphoneFooterContents div,
 #plotDailyNewsContents div,
 #plotMobileDailyNewsContents div
 {
@@ -140,6 +141,7 @@ body
 #plotSmartphoneProfileContents div.emptyGadget,
 #plotSmartphoneCommunityContents div.emptyGadget,
 #plotSmartphoneLoginContents div.emptyGadget,
+#plotSmartphoneFooterContents div.emptyGadget,
 #plotDailyNewsContents div.emptyGadget,
 #plotMobileDailyNewsContents div.emptyGadget
 {

From d212337b13f7bc1e559301be595a9f6927f5d7da Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 30 Mar 2012 18:06:07 +0900
Subject: [PATCH 098/630] fixed smartphone header (tosaka) styles (refs #2227)

---
 .../modules/default/templates/_smtMenu.php    |  45 ++----
 apps/pc_frontend/templates/_tosaka.php        |  32 ++--
 web/css/smt_main.css                          | 153 ++++++++++++++++++
 web/js/smt_tosaka.js                          |  22 ++-
 4 files changed, 207 insertions(+), 45 deletions(-)

diff --git a/apps/pc_frontend/modules/default/templates/_smtMenu.php b/apps/pc_frontend/modules/default/templates/_smtMenu.php
index 32f5e3de5..8e205d974 100644
--- a/apps/pc_frontend/modules/default/templates/_smtMenu.php
+++ b/apps/pc_frontend/modules/default/templates/_smtMenu.php
@@ -1,31 +1,14 @@
-<!-- MENUFORM TMPL -->
-<div class="menuform hide toggle1">
-  <div class="row">
-    <div class="span10 offset1 white font14 toggle1_close">
-      <div class="center">
-        MENU
-      </div>
-    </div>
-    <div class="span1">
-      <?php echo op_image_tag('UPARROW', array('class' => 'toggle1_close')) ?>
-    </div>
-  </div>
-
-  <div class="menu-middle row">
-    <div class="span11 offset1">
-      <?php if ($navs): ?>
-      <?php foreach ($navs as $nav): ?>
-      <?php if (op_is_accessible_url($nav->uri)): ?>
-      <?php if('@member_profile_mine' === $nav->uri): ?>
-      <?php echo link_to($sf_user->getMember()->getName(), $nav->uri, array('class' => 'btn btn-info', 'id' => sprintf('smtMenu_%1', op_url_to_id($nav->uri, true)))) ?>
-      <?php else: ?>
-      <?php echo link_to($nav->caption, $nav->uri, array('class' => 'btn', 'id' => sprintf('smtMenu_%1', op_url_to_id($nav->uri, true)))) ?>
-      <?php endif ?>
-      <?php endif ?>
-      <?php endforeach ?>
-      <a href="<?php echo url_for('@homepage') ?>" id="smt-switch" class="btn btn-info"><?php echo __('View this page on regular style') ?></a>
-      <?php endif ?>
-    </div>
-  </div>
-</div>
-<!-- MENUFORM TMPL -->
+<ul class="nav">
+  <?php if ($navs): ?>
+  <?php foreach ($navs as $nav): ?>
+  <?php if (op_is_accessible_url($nav->uri)): ?>
+  <?php if('@member_profile_mine' === $nav->uri): ?>
+  <li class="active"><?php echo link_to($sf_user->getMember()->getName(), $nav->uri, array('id' => sprintf('smtMenu_%1', op_url_to_id($nav->uri, true)))) ?></li>
+  <?php else: ?>
+  <li><?php echo link_to($nav->caption, $nav->uri, array('id' => sprintf('smtMenu_%1', op_url_to_id($nav->uri, true)))) ?></li>
+  <?php endif ?>
+  <?php endif ?>
+  <?php endforeach ?>
+  <li><a href="<?php echo url_for('@homepage') ?>" id="smt-switch"><?php echo __('View this page on regular style') ?></a></li>
+  <?php endif ?>
+</ul>
diff --git a/apps/pc_frontend/templates/_tosaka.php b/apps/pc_frontend/templates/_tosaka.php
index 0ead6db54..2f9833529 100644
--- a/apps/pc_frontend/templates/_tosaka.php
+++ b/apps/pc_frontend/templates/_tosaka.php
@@ -61,8 +61,6 @@
 </script>
 
 
-<?php include_component('default', 'smtMenu') ?>
-
 <!-- POSTFORM TMPL -->
 <div class="postform hide toggle1">
   <div class="row">
@@ -90,17 +88,29 @@
 <!-- POSTFORM TMPL -->
 <?php endif ?>
 
-<div id="slot_tosaka">
-  <div class="row">
-    <div class="span12">
-      <div class="row">
-        <div class="span4"><?php echo op_image_tag('LOGO.png', array('height' => '32', 'class' => 'menubutton')); ?></div>
-        <?php if (opToolkit::isSecurePage()): ?>
-        <div id="notification_center" class="span4 center"><?php echo op_image_tag('NOTIFY_CENTER.png', array('height' => '32', 'class' => 'ncbutton')) ?>
+<!-- new tosaka template -->
+
+<div class="navbar navbar-fixed-top">
+  <div class="navbar-inner">
+    <div class="container">
+      <div class="nav-collapse toggle1">
+        <div class="row">
+          <div class="span10 offset1 white font14 toggle1_close">MENU</div>
+          <div class="span1">
+            <?php echo op_image_tag('UPARROW', array('class' => 'toggle1_close')) ?>
+          </div>
         </div>
-        <div class="span3 offset1"><?php echo op_image_tag('POST.png', array('height' => '32', 'class' =>'postbutton')) ?></div>
-        <?php endif ?>
+        <?php include_component('default', 'smtMenu') ?>
+      </div>
+      <a class="btn btn-navbar brand" data-toggle="collapse" data-target=".nav-collapse"><?php echo $op_config['sns_name'] ?></a>
+      <?php if (opToolkit::isSecurePage()): ?>
+      <div id="notification_center" class="center">
+        <?php echo op_image_tag('NOTIFY_CENTER.png', array('height' => '32', 'class' => 'ncbutton')) ?>
       </div>
+      <div class="right"><?php echo op_image_tag('POST.png', array('height' => '32', 'class' =>'postbutton')) ?></div>
+      <?php endif ?>
     </div>
   </div>
 </div>
+
+<!-- end tosaka template -->
diff --git a/web/css/smt_main.css b/web/css/smt_main.css
index 8f40e242e..776b5fb0d 100644
--- a/web/css/smt_main.css
+++ b/web/css/smt_main.css
@@ -148,6 +148,9 @@ input[type="checkbox"], input[type="radio"] {
 
 #notification_center {
   position: relative;
+  display: inline;
+  text-align: center;
+  margin: 0 10px;
 }
 .nc_icon1 {
   position:absolute;
@@ -365,3 +368,153 @@ table th {
 table td {
   border-top: none !important;
 }
+
+.navbar .brand
+{
+  padding: 4px 20px 8px;
+}
+
+/*----------------------------------------------
+ * define tosaka style
+ *---------------------------------------------*/
+.container {
+  width: auto;
+}
+
+.row-fluid {
+  width: 100%;
+}
+.row {
+  margin-left: 0;
+}
+
+.row > [class*="span"],
+.row-fluid > [class*="span"] {
+  margin: 0;
+}
+
+.input-prepend input[class*="span"],
+.input-append input[class*="span"] {
+  width: auto;
+}
+
+.navbar-fixed-top {
+  position: static;
+  margin-bottom: 8px;
+}
+
+.navbar-fixed-top .navbar-inner {
+    padding: 5px;
+}
+
+.navbar .brand {
+  padding-left: 10px;
+  padding-right: 10px;
+  margin: 0 0 0 -5px;
+  min-width: 90px;
+  max-width: 100px;
+  overflow: hidden;
+  text-align: center;
+}
+
+.navbar .nav-collapse {
+  clear: left;
+}
+
+.navbar .nav {
+  float: none;
+  margin: 0 0 9px;
+}
+
+.navbar .nav > li {
+  border-bottom: 1px #000000 solid;
+  float: none;
+}
+
+.navbar .nav > .divider-vertical {
+  display: none;
+}
+
+.navbar .nav .nav-header {
+  color: #999999;
+  text-shadow: none;
+}
+
+.navbar .nav > li > a,
+.navbar .dropdown-menu a {
+  padding: 9px 15px;
+  font-weight: bold;
+  color: #999999;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+
+.navbar .nav > li > a:hover,
+.navbar .dropdown-menu a:hover {
+  background-color: #222222;
+}
+
+.navbar .dropdown-menu {
+  position: static;
+  top: auto;
+  left: auto;
+  float: none;
+  display: block;
+  max-width: none;
+  margin: 0 15px;
+  padding: 0;
+  background-color: transparent;
+  border: none;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+}
+
+.navbar .dropdown-menu:before,
+.navbar .dropdown-menu:after {
+  display: none;
+}
+
+.navbar .dropdown-menu .divider {
+  display: none;
+}
+
+.navbar-form,
+.navbar-search {
+  float: none;
+  padding: 9px 15px;
+  margin: 9px 0;
+  border-top: 1px solid #222222;
+  border-bottom: 1px solid #222222;
+  -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+  -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+  box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
+}
+
+.navbar .nav.pull-right {
+  float: none;
+  margin-left: 0;
+}
+
+.navbar-static .navbar-inner {
+  padding-left: 10px;
+  padding-right: 10px;
+}
+
+.btn-navbar {
+  display: block;
+}
+
+.nav-collapse {
+  overflow: hidden;
+  height: 0;
+}
+
+.container .right {
+  float: right;
+}
+
diff --git a/web/js/smt_tosaka.js b/web/js/smt_tosaka.js
index bbd0c62cc..7f17b2b75 100644
--- a/web/js/smt_tosaka.js
+++ b/web/js/smt_tosaka.js
@@ -17,11 +17,13 @@ $(document).ready(function(){
       $('#pushList').show();
       $('#pushLoading').hide();
     });
+    collapse_toggle($('.nav-collapse'));
   });
 
-  $(".menubutton").click(function(){
-    $(".toggle1:not(.menuform)").hide();
-    $(".menuform").toggle();
+  $(".btn-navbar").click(function(){
+    $(".toggle1:not(.nav-collapse)").hide();
+    $('.nav-collapse').show();
+    collapse_toggle($('.nav-collapse'));
   });
 
   $(".postbutton").click(function(){
@@ -30,6 +32,7 @@ $(document).ready(function(){
     if($(".postform").is(":visible")){
       $(".posttextarea").focus();
     }
+    collapse_toggle($('.nav-collapse'));
   });
 
   $(".toggle1_close").click(function(){
@@ -69,3 +72,16 @@ $(document).ready(function(){
     }
   });
 });
+
+function collapse_toggle(elm)
+{
+  if (elm.hasClass('collapse'))
+  {
+    elm.removeClass('collapse');
+  }
+  else
+  {
+    elm.addClass('collapse');
+  }
+}
+

From 6c1ccec806b221cb073e4672c9e3034e8bccce41 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 30 Mar 2012 18:09:23 +0900
Subject: [PATCH 099/630] (fixes #2227) fixed to show smartphone header
 (tosaka) when user is not logged in

---
 apps/pc_frontend/templates/smtLayoutSns.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apps/pc_frontend/templates/smtLayoutSns.php b/apps/pc_frontend/templates/smtLayoutSns.php
index f7ccfedf3..2eb3785f0 100644
--- a/apps/pc_frontend/templates/smtLayoutSns.php
+++ b/apps/pc_frontend/templates/smtLayoutSns.php
@@ -34,11 +34,8 @@
 </head>
 <body id="<?php printf('page_%s_%s', $this->getModuleName(), $this->getActionName()) ?>" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
 
-<?php if (opToolkit::isSecurePage()): ?>
 <?php include_partial('global/tosaka') ?>
 
-<?php endif ?>
-
 <?php if ($sf_user->hasFlash('error')): ?>
 <div id="global-error" class="row">
   <div class="alert alert-error">

From 36d6260acb287808f98cf49855b666fec8c8c4b5 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 30 Mar 2012 18:20:37 +0900
Subject: [PATCH 100/630] (fixes #2227) fixed login template style on
 smartphone.

---
 .../modules/default/templates/_smtLoginFormBox.php            | 2 +-
 web/css/smt_main.css                                          | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/pc_frontend/modules/default/templates/_smtLoginFormBox.php b/apps/pc_frontend/modules/default/templates/_smtLoginFormBox.php
index 6eb9dd230..a02e32c78 100644
--- a/apps/pc_frontend/modules/default/templates/_smtLoginFormBox.php
+++ b/apps/pc_frontend/modules/default/templates/_smtLoginFormBox.php
@@ -57,7 +57,7 @@
 
 <div class="row">
 <div class="span12">
-<input type="submit" name="submit" value="<?php echo __('Login'); ?>" class="btn btn-primary span12" />
+<input type="submit" name="submit" value="<?php echo __('Login'); ?>" class="btn btn-primary span12 btn320" />
 <?php echo $form->renderHiddenFields(); ?>
 </form>
 </div>
diff --git a/web/css/smt_main.css b/web/css/smt_main.css
index 776b5fb0d..01f1b4ad1 100644
--- a/web/css/smt_main.css
+++ b/web/css/smt_main.css
@@ -309,6 +309,10 @@ hr.white2 {
   margin-left: 0px!important;
 }
 
+input.btn320[type="submit"] {
+  width: 320px;
+}
+
 * {
   word-break: break-all;
 }

From 26403c4242b1d6ee5a96cb96b23e24f89eaeb3fd Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 30 Mar 2012 18:24:38 +0900
Subject: [PATCH 101/630] (refs #2227) add ability to show SNS register link on
 smartphone login page.

---
 .../modules/default/templates/_smtLoginFormBox.php           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/pc_frontend/modules/default/templates/_smtLoginFormBox.php b/apps/pc_frontend/modules/default/templates/_smtLoginFormBox.php
index a02e32c78..c2c688c7f 100644
--- a/apps/pc_frontend/modules/default/templates/_smtLoginFormBox.php
+++ b/apps/pc_frontend/modules/default/templates/_smtLoginFormBox.php
@@ -60,6 +60,11 @@
 <input type="submit" name="submit" value="<?php echo __('Login'); ?>" class="btn btn-primary span12 btn320" />
 <?php echo $form->renderHiddenFields(); ?>
 </form>
+<?php if ($form->getAuthAdapter()->getAuthConfig('invite_mode') == 2
+  && opToolkit::isEnabledRegistration('pc')
+  && $form->getAuthAdapter()->getAuthConfig('self_invite_action')) : ?>
+<?php echo link_to(__('Register'), $form->getAuthAdapter()->getAuthConfig('self_invite_action')) ?>
+<?php endif; ?>
 </div>
 
 <?php endforeach; ?>

From 1d7cedb059084c54af6cac275f75fe7487c47fce Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Sat, 31 Mar 2012 16:15:43 +0900
Subject: [PATCH 102/630] fixed fatal error in notification center util
 function (fixes #2756)

---
 lib/util/opNotificationCenter.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/util/opNotificationCenter.class.php b/lib/util/opNotificationCenter.class.php
index 53e1c3f8a..52b72292b 100644
--- a/lib/util/opNotificationCenter.class.php
+++ b/lib/util/opNotificationCenter.class.php
@@ -93,10 +93,9 @@ static public function getNotifications(Member $member = null)
     else
     {
       $notifications = unserialize($notificationObject->getValue());
+      $notificationObject->free(true);
     }
 
-    $notificationObject->free(true);
-
     return $notifications;
   }
 }

From 3ca14f4acb58d40e67ae0a57a95f61c1a93da68e Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Sat, 31 Mar 2012 16:35:27 +0900
Subject: [PATCH 103/630] fixed minor smartphone styles. (fixes #2227)

---
 apps/pc_frontend/templates/_tosaka.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/pc_frontend/templates/_tosaka.php b/apps/pc_frontend/templates/_tosaka.php
index 2f9833529..5774bc157 100644
--- a/apps/pc_frontend/templates/_tosaka.php
+++ b/apps/pc_frontend/templates/_tosaka.php
@@ -2,7 +2,7 @@
 <!-- NCFORM TMPL -->
 <div class="ncform hide toggle1">
   <div class="row">
-    <div class="span10 offset1 white font14 toggle1_close">
+    <div class="span11 white font14 toggle1_close">
       <div class="center">
       <?php echo __('Notification Center') ?>
       </div>
@@ -64,7 +64,7 @@
 <!-- POSTFORM TMPL -->
 <div class="postform hide toggle1">
   <div class="row">
-    <div class="span10 offset1 white font14 toggle1_close">
+    <div class="span11 white font14 toggle1_close">
       <div class="center">
       <?php echo __('Post form') ?>
       </div>
@@ -78,9 +78,9 @@
   </div>
   <div class="row">
     <?php if ($community): ?>
-    <button id="tosaka_postform_submit" data-community-id="<?php echo $community->getId() ?>" class="span10 offset1 btn small btn-primary"><?php echo __('%post_activity%') ?></button>
+    <button id="tosaka_postform_submit" data-community-id="<?php echo $community->getId() ?>" class="span12 btn small btn-primary"><?php echo __('%post_activity%') ?></button>
     <?php else: ?>
-    <button id="tosaka_postform_submit" class="span10 offset1 btn small btn-primary"><?php echo __('%post_activity%') ?></button>
+    <button id="tosaka_postform_submit" class="span12 btn small btn-primary"><?php echo __('%post_activity%') ?></button>
     <?php endif; ?>
     <div class="center hide" id="timelinePostLoading"><?php echo op_image_tag('ajax-loader.gif') ?></div>
   </div>
@@ -95,7 +95,7 @@
     <div class="container">
       <div class="nav-collapse toggle1">
         <div class="row">
-          <div class="span10 offset1 white font14 toggle1_close">MENU</div>
+          <div class="span11 white font14 toggle1_close">MENU</div>
           <div class="span1">
             <?php echo op_image_tag('UPARROW', array('class' => 'toggle1_close')) ?>
           </div>

From 173eabd11bb969c1250d0cd8bc6dda64174b53b9 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Sat, 31 Mar 2012 16:38:55 +0900
Subject: [PATCH 104/630] add license notations (fixes #2756)

---
 lib/util/opNotificationCenter.class.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/lib/util/opNotificationCenter.class.php b/lib/util/opNotificationCenter.class.php
index 52b72292b..642b4aa98 100644
--- a/lib/util/opNotificationCenter.class.php
+++ b/lib/util/opNotificationCenter.class.php
@@ -1,5 +1,21 @@
 <?php
 
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * opNotificationCenter
+ *
+ * @package    OpenPNE
+ * @subpackage util
+ * @author     Kimura Youichi <kim.upsilon@gmail.com>
+ * @author     Shouta Kashiwagi <kashiwagi@tejimaya.com>
+ */
 class opNotificationCenter
 {
   static public function notify(Member $from, Member $to, $body, array $options = null)

From a959d0fa070691c2af2a09ed3cba6915ec40e606 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Sat, 31 Mar 2012 16:43:48 +0900
Subject: [PATCH 105/630] fixed coding standards (fixes #2756)

---
 lib/util/opNotificationCenter.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util/opNotificationCenter.class.php b/lib/util/opNotificationCenter.class.php
index 642b4aa98..450c9080a 100644
--- a/lib/util/opNotificationCenter.class.php
+++ b/lib/util/opNotificationCenter.class.php
@@ -94,7 +94,7 @@ public function setRead(Member $target, $notificationId)
 
   static public function getNotifications(Member $member = null)
   {
-    if (null === $member)
+    if (is_null($member))
     {
       $member = sfContext::getInstance()->getUser()->getMember();
     }

From 43bb5ec82b9abd7310712c5ea7a2ce0cac52db42 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 10 Mar 2011 19:35:20 +0900
Subject: [PATCH 106/630] add support for 'sf_route' to
 opApplicationConfiguration::generateAppUrl() (fixes #1966)

---
 lib/config/opApplicationConfiguration.class.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/config/opApplicationConfiguration.class.php b/lib/config/opApplicationConfiguration.class.php
index 92b0d9173..5730ea76f 100644
--- a/lib/config/opApplicationConfiguration.class.php
+++ b/lib/config/opApplicationConfiguration.class.php
@@ -548,8 +548,16 @@ public function setCacheDir($cacheDir)
 
   public function generateAppUrl($application, $parameters = array(), $absolute = false)
   {
-    list($route, $parameters) = sfContext::getInstance()->getController()
-      ->convertUrlStringToParameters($parameters);
+    if (is_array($parameters) && isset($parameters['sf_route']))
+    {
+      $route = $parameters['sf_route'];
+      unset($parameters['sf_route']);
+    }
+    else
+    {
+      list($route, $parameters) = sfContext::getInstance()->getController()
+        ->convertUrlStringToParameters($parameters);
+    }
 
     return $this->getAppRouting($application)->generate($route, $parameters, $absolute);
   }

From 7fcb4a66da532e8f12327c13e723b9b5c4537a5d Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Sat, 31 Mar 2012 17:08:02 +0900
Subject: [PATCH 107/630] fixed fatal error in activity/search.json. (fixes
 #2698)

---
 apps/api/modules/activity/actions/actions.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/api/modules/activity/actions/actions.class.php b/apps/api/modules/activity/actions/actions.class.php
index 4eda7db69..9cf307f07 100644
--- a/apps/api/modules/activity/actions/actions.class.php
+++ b/apps/api/modules/activity/actions/actions.class.php
@@ -46,7 +46,7 @@ public function executeSearch(sfWebRequest $request)
     {
       if (isset($request['member_id']))
       {
-        $builder->includeMember(explode(',', $request['member_id']));
+        $builder->includeMember($request['member_id']);
       }
       else
       {

From 7697b6fdd9ca2c668192b5fd10475284906c2c4b Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Sun, 1 Apr 2012 10:21:31 +0900
Subject: [PATCH 108/630] (fixes #2323) fixed to link correct url

---
 lib/helper/opUtilHelper.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/helper/opUtilHelper.php b/lib/helper/opUtilHelper.php
index eb4c17465..d06fe70fa 100644
--- a/lib/helper/opUtilHelper.php
+++ b/lib/helper/opUtilHelper.php
@@ -327,8 +327,8 @@ function op_format_date($date, $format = 'd', $culture = null, $charset = null)
       \/?
       [a-zA-Z0-9_\-\/.,:;\~\?@&=+$%#!()]*
     )
-    ([[:punct:]]|\s|<|$)    # trailing text
-   ~x');
+    ([^a-zA-Z0-9_\-\/.,:;\~\?@&=+$%#!()]|\s|<|$)    # trailing text
+   ~xu');
 }
 
 function op_url_cmd($text)

From 454f44d972ffa96f27880b45d62ef8206642e858 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Sun, 1 Apr 2012 10:27:08 +0900
Subject: [PATCH 109/630] (refs #2323) fixed for cording standard

---
 lib/helper/opUtilHelper.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/helper/opUtilHelper.php b/lib/helper/opUtilHelper.php
index d06fe70fa..315112ae0 100644
--- a/lib/helper/opUtilHelper.php
+++ b/lib/helper/opUtilHelper.php
@@ -38,13 +38,13 @@ function op_link_to_for_pager($name, $internal_uri, $page_no, $options)
     $absolute = (boolean) $html_options['absolute'];
     unset($html_options['absolute_url']);
   }
-  
+
   $internal_uri = sprintf($internal_uri, $page_no);
   $html_options['href'] = url_for($internal_uri, $absolute);
 
   if (isset($html_options['query_string']))
   {
-    if (strpos($html_options['href'], '?') !== false)
+    if (false !== strpos($html_options['href'], '?'))
     {
       $html_options['href'] .= '&'.$html_options['query_string'];
     }
@@ -59,7 +59,7 @@ function op_link_to_for_pager($name, $internal_uri, $page_no, $options)
   {
     $name = $html_options['href'];
   }
- 
+
   return content_tag('a', $name, $html_options);
 }
 
@@ -137,6 +137,7 @@ function pager_navigation($pager, $link_to, $is_total = true, $query_string = ''
       'query_string' => $query_string
     )
   ));
+
   return get_partial('global/pagerNavigation', $params);
 }
 
@@ -216,7 +217,7 @@ function _app_url_for_internal_uri($application, $internal_uri, $absolute = fals
 function _create_script_name($application, $environment)
 {
   $script_name = $application;
-  if ($environment !== 'prod')
+  if ('prod' !== $environment)
   {
     $script_name .= '_'.$environment;
   }
@@ -341,7 +342,7 @@ function _op_url_cmd($matches)
   $url = $matches[2].$matches[3];
   $cmd = '';
 
-  if ($matches[2] == 'www.')
+  if ('www.' == $matches[2])
   {
     $cmd .= 'www.';
     $url = 'http://www.'.$url;
@@ -372,6 +373,7 @@ function _op_url_cmd($matches)
 //-->
 </script>
 EOD;
+
   return $result.$matches[4];
 }
 
@@ -381,6 +383,7 @@ function _op_url_cmd($matches)
 function op_auto_link_text($text, $link = 'urls', $href_options = array('target' => '_blank'), $truncate = true, $truncate_len = 57, $pad = '...')
 {
   use_helper('Text');
+
   return auto_link_text($text, $link, $href_options, $truncate, $truncate_len, $pad);
 }
 
@@ -813,7 +816,7 @@ function op_decoration($string, $is_strip = false, $is_use_stylesheet = null, $i
   if (is_null($is_use_stylesheet))
   {
     $is_use_stylesheet = true;
-    if (sfConfig::get('sf_app') == 'mobile_frontend')
+    if ('mobile_frontend' == sfConfig::get('sf_app'))
     {
       $is_use_stylesheet = false;
     }
@@ -852,7 +855,7 @@ function op_is_accessable_url($uri)
 
 function op_distance_of_time_in_words($from_time, $to_time, $include_seconds = false, $format = '%s ago')
 {
-  $to_time = $to_time? $to_time: time();
+  $to_time = $to_time ? $to_time: time();
 
   $distance_in_minutes = floor(abs($to_time - $from_time) / 60);
   $distance_in_seconds = floor(abs($to_time - $from_time));
@@ -1060,6 +1063,7 @@ function op_get_gadget_type($type1, $type2)
   }
   $type = sfInflector::camelize($type1.'_'.$type2);
   $type = strtolower(substr($type, 0, 1)).substr($type, 1);
+
   return $type;
 }
 

From c9913534bb992be33acd301d42a926deb8ad6fb0 Mon Sep 17 00:00:00 2001
From: Fumie Toyooka <dymojet@google.com>
Date: Thu, 8 Dec 2011 16:38:08 +0900
Subject: [PATCH 110/630] (fixes #2676) remove class attribute of template of
 "/monitoring/editImage".

---
 .../modules/monitoring/templates/editImageSuccess.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/pc_backend/modules/monitoring/templates/editImageSuccess.php b/apps/pc_backend/modules/monitoring/templates/editImageSuccess.php
index 98298bbd8..b39613f10 100644
--- a/apps/pc_backend/modules/monitoring/templates/editImageSuccess.php
+++ b/apps/pc_backend/modules/monitoring/templates/editImageSuccess.php
@@ -13,7 +13,7 @@
     <?php echo $form ?>
     <tr>
       <td colspan="2">
-        <input class="input_sbumit" type="submit" value="<?php echo __('画像投稿') ?>" />
+        <input type="submit" value="<?php echo __('画像投稿') ?>" />
       </td>
     </tr>
   </table>

From 94515d98f87747603b42b4397c0561039bff011a Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Mon, 2 Apr 2012 01:06:31 +0900
Subject: [PATCH 111/630] fixed for coding standard (fixes #2698)

---
 apps/api/lib/helper/opJsonApiHelper.php       |  6 ++--
 apps/api/lib/myUser.class.php                 |  4 +--
 lib/exception/opErrorHttpException.class.php  |  5 +--
 lib/i18n/opI18N.class.php                     |  8 ++---
 .../doctrine/ActivityDataTable.class.php      | 33 ++++++++++++-------
 lib/model/doctrine/Member.class.php           |  2 +-
 .../doctrine/MemberRelationship.class.php     |  7 ++--
 lib/util/opToolkit.class.php                  |  2 +-
 8 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/apps/api/lib/helper/opJsonApiHelper.php b/apps/api/lib/helper/opJsonApiHelper.php
index 7cc149b8e..3aa1a548d 100644
--- a/apps/api/lib/helper/opJsonApiHelper.php
+++ b/apps/api/lib/helper/opJsonApiHelper.php
@@ -19,7 +19,7 @@ function op_api_member($member)
 {
   $viewMemberId = sfContext::getInstance()->getUser()->getMemberId();
 
-  $memberImageFileName = $member->getImageFileName();
+  $memberImageFileName = $member->getImage();
   if (!$memberImageFileName)
   {
     $memberImage = op_image_path('no_image.gif', true);
@@ -51,9 +51,9 @@ function op_api_member($member)
   );
 }
 
-function op_api_member_profile_url($member_id)
+function op_api_member_profile_url($memberId)
 {
-  return app_url_for('pc_frontend', array('sf_route' => 'obj_member_profile', 'id' => $member_id), true);
+  return app_url_for('pc_frontend', array('sf_route' => 'obj_member_profile', 'id' => $memberId), true);
 }
 
 function op_api_activity($activity)
diff --git a/apps/api/lib/myUser.class.php b/apps/api/lib/myUser.class.php
index 7b0c6b115..244397526 100644
--- a/apps/api/lib/myUser.class.php
+++ b/apps/api/lib/myUser.class.php
@@ -43,7 +43,7 @@ public function getMemberByApiKey($apiKey)
 
   public function getMember()
   {
-    if (null !== $this->member)
+    if (!is_null($this->member))
     {
       return $this->member;
     }
@@ -58,7 +58,7 @@ public function getMember()
     }
 
     $member = $this->getMemberByApiKey($apiKey);
-    if (null === $member)
+    if (is_null($member))
     {
       $exception = new opErrorHttpException('Invalid API key.');
       throw $exception->setHttpStatusCode(401);
diff --git a/lib/exception/opErrorHttpException.class.php b/lib/exception/opErrorHttpException.class.php
index 868af2b23..7d55c5ce5 100644
--- a/lib/exception/opErrorHttpException.class.php
+++ b/lib/exception/opErrorHttpException.class.php
@@ -28,6 +28,7 @@ public function getHttpStatusCode()
   public function setHttpStatusCode($statusCode)
   {
     $this->httpStatusCode = $statusCode;
+
     return $this;
   }
 
@@ -36,12 +37,12 @@ public function setHttpStatusCode($statusCode)
    */
   public function printStackTrace()
   {
-    $exception = null === $this->wrappedException ? $this : $this->wrappedException;
+    $exception = is_null($this->wrappedException) ? $this : $this->wrappedException;
 
     if (sfConfig::get('sf_debug'))
     {
       $response = sfContext::getInstance()->getResponse();
-      if (null === $response)
+      if (is_null($response))
       {
         $response = new sfWebResponse(sfContext::getInstance()->getEventDispatcher());
         sfContext::getInstance()->setResponse($response);
diff --git a/lib/i18n/opI18N.class.php b/lib/i18n/opI18N.class.php
index 5f3bd9208..d387ba49f 100644
--- a/lib/i18n/opI18N.class.php
+++ b/lib/i18n/opI18N.class.php
@@ -22,7 +22,7 @@ public function initialize(sfApplicationConfiguration $configuration, sfCache $c
 
     $this->terms = Doctrine::getTable('SnsTerm');
     $application = sfConfig::get('sf_app');
-    if($application == 'pc_backend')
+    if ('pc_backend' == $application)
     {
         $application = 'pc_frontend';
     }
@@ -74,7 +74,7 @@ public function setMessageSource($dirs, $culture = null)
     {
       $this->generateApplicationMessages($dirs);
 
-      if (null === $dirs)
+      if (!is_null($dirs))
       {
         $this->messageSource = $this->createMessageSource();
       }
@@ -84,12 +84,12 @@ public function setMessageSource($dirs, $culture = null)
       }
     }
 
-    if (null !== $this->cache)
+    if (!is_null($this->cache))
     {
       $this->messageSource->setCache($this->cache);
     }
 
-    if (null !== $culture)
+    if (!is_null($culture))
     {
       $this->setCulture($culture);
     }
diff --git a/lib/model/doctrine/ActivityDataTable.class.php b/lib/model/doctrine/ActivityDataTable.class.php
index fa2bb7314..9a08c1097 100644
--- a/lib/model/doctrine/ActivityDataTable.class.php
+++ b/lib/model/doctrine/ActivityDataTable.class.php
@@ -141,6 +141,7 @@ public function updateActivity($memberId, $body, $options = array())
   public function publicFlagToCaption($flag)
   {
     $i18n = sfContext::getInstance()->getI18N();
+
     return $i18n->__(self::$publicFlags[$flag]);
   }
 
@@ -187,6 +188,8 @@ public function getViewablePublicFlags($flag)
       case self::PUBLIC_FLAG_OPEN:
         $flags[] = self::PUBLIC_FLAG_OPEN;
         break;
+      default: 
+        break;
     }
 
     return $flags;
@@ -203,6 +206,7 @@ protected function getMyMemberId()
     {
       return sfContext::getInstance()->getUser()->getMemberId();
     }
+
     return null;
   }
 
@@ -218,10 +222,10 @@ protected function getPager(Doctrine_Query $q, $page, $size)
 
   public function addFriendActivityQuery(Doctrine_Query $q, $memberId, $isCheckApp = true)
   {
-    if (null === $memberId)
+    if (is_null($memberId))
     {
       $memberId = $this->getMyMemberId();
-      if (null === $memberId)
+      if (is_null($memberId))
       {
         throw new LogicException('The user is not login.');
       }
@@ -245,7 +249,7 @@ public function addFriendActivityQuery(Doctrine_Query $q, $memberId, $isCheckApp
 
     if ($isCheckApp)
     {
-      if (sfConfig::get('sf_app') == 'mobile_frontend')
+      if ('mobile_frontend' == sfConfig::get('sf_app'))
       {
         $q->andWhere('is_mobile = ?', true);
       }
@@ -260,10 +264,11 @@ public function getFriendActivityList($memberId = null, $limit = 5, $isCheckApp
   {
     $q = $this->getOrderdQuery();
     $this->addFriendActivityQuery($q, $memberId, $isCheckApp);
-    if (null !== $limit)
+    if (!is_null($limit))
     {
       $q->limit($limit);
     }
+
     return $q->execute();
   }
 
@@ -271,26 +276,27 @@ public function getFriendActivityListPager($memberId = null, $page = 1, $size =
   {
     $q = $this->getOrderdQuery();
     $this->addFriendActivityQuery($q, $memberId, $isCheckApp);
+
     return $this->getPager($q, $page, $size);
   }
 
   public function addActivityQuery(Doctrine_Query $q, $memberId = null, $viewerMemberId = null, $isCheckApp = true)
   {
-    if (null === $memberId)
+    if (is_null($memberId))
     {
       $memberId = $this->getMyMemberId();
-      if (null === $memberId)
+      if (is_null($memberId))
       {
         throw new LogicException('The user is not login.');
       }
     }
 
-    if (null === $viewerMemberId)
+    if (is_null($viewerMemberId))
     {
       $viewerMemberId = $this->getMyMemberId();
     }
 
-    if (null === $viewerMemberId)
+    if (is_null($viewerMemberId))
     {
       $flag = self::PUBLIC_FLAG_OPEN;
     }
@@ -338,10 +344,11 @@ public function getActivityList($memberId = null, $viewerMemberId = null, $limit
   {
     $q = $this->getOrderdQuery();
     $this->addActivityQuery($q, $memberId, $viewerMemberId, $isCheckApp);
-    if (null !== $limit)
+    if (!is_null($limit))
     {
       $q->limit($limit);
     }
+
     return $q->execute();
   }
 
@@ -349,6 +356,7 @@ public function getActivityListPager($memberId = null, $viewerMemberId = null, $
   {
     $q = $this->getOrderdQuery();
     $this->addActivityQuery($q, $memberId, $viewerMemberId, $isCheckApp);
+
     return $this->getPager($q, $page, $size);
   }
 
@@ -358,7 +366,7 @@ public function addAllMemberActivityQuery($q, $isCheckApp = true)
 
     if ($isCheckApp)
     {
-      if (sfConfig::get('sf_app') == 'mobile_frontend')
+      if ('mobile_frontend' == sfConfig::get('sf_app'))
       {
         $q->andWhere('is_mobile = ?', true);
       }
@@ -375,7 +383,7 @@ public function getAllMemberActivityList($limit = 5, $isCheckApp = true)
   {
     $q = $this->getOrderdQuery();
     $this->addAllMemberActivityQuery($q, $isCheckApp);
-    if (null !== $limit)
+    if (!is_null($limit))
     {
       $q->limit($limit);
     }
@@ -387,12 +395,13 @@ public function getAllMemberActivityListPager($page = 1, $size = 20, $isCheckApp
   {
     $q = $this->getOrderdQuery();
     $this->addAllMemberActivityQuery($q, $isCheckApp);
+
     return $this->getPager($q, $page, $size);
   }
 
   public function getTemplateConfig()
   {
-    if (null === $this->templateConfig)
+    if (is_null($this->templateConfig))
     {
       $this->templateConfig = include(sfContext::getInstance()->getConfigCache()->checkConfig('config/activity_template.yml'));
     }
diff --git a/lib/model/doctrine/Member.class.php b/lib/model/doctrine/Member.class.php
index 55d55f67a..decd49e3b 100644
--- a/lib/model/doctrine/Member.class.php
+++ b/lib/model/doctrine/Member.class.php
@@ -391,7 +391,7 @@ public function getApiKey()
   {
     $apiKey = $this->getConfig('api_key');
 
-    if (null === $apiKey)
+    if (is_null($apiKey))
     {
       $apiKey = $this->generateApiKey();
     }
diff --git a/lib/model/doctrine/MemberRelationship.class.php b/lib/model/doctrine/MemberRelationship.class.php
index 39b9c0f16..4a1811bbc 100644
--- a/lib/model/doctrine/MemberRelationship.class.php
+++ b/lib/model/doctrine/MemberRelationship.class.php
@@ -97,18 +97,21 @@ public function removeFriendPre()
 
   public function getToInstance()
   {
-    if ($this->toInstance) {
+    if ($this->toInstance) 
+    {
       return $this->toInstance;
     }
 
     $relation = Doctrine::getTable('MemberRelationship')->retrieveByFromAndTo($this->getMemberIdTo(), $this->getMemberIdFrom());
-    if (!$relation) {
+    if (!$relation) 
+    {
       $relation = new MemberRelationship();
       $relation->setMemberIdFrom($this->getMemberIdTo());
       $relation->setMemberIdTo($this->getMemberIdFrom());
     }
 
     $this->toInstance = $relation;
+
     return $this->toInstance;
   }
 
diff --git a/lib/util/opToolkit.class.php b/lib/util/opToolkit.class.php
index d0db038a8..614e12624 100644
--- a/lib/util/opToolkit.class.php
+++ b/lib/util/opToolkit.class.php
@@ -529,7 +529,7 @@ public function getRandom($length = 64)
         if ($fp != null)
         {
           $header = true;
-          while (feof($fp) === false)
+          while (!feof($fp))
           {
             $s = fgets($fp, 4096);
             if ($header)

From 636b6cea1e9cf691ab5566299bf22530b65ec604 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Mon, 2 Apr 2012 13:15:18 +0900
Subject: [PATCH 112/630] fixed to reject ban member. (fixes #2698)

---
 apps/api/lib/myUser.class.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/api/lib/myUser.class.php b/apps/api/lib/myUser.class.php
index 244397526..d23c4a60e 100644
--- a/apps/api/lib/myUser.class.php
+++ b/apps/api/lib/myUser.class.php
@@ -64,6 +64,12 @@ public function getMember()
       throw $exception->setHttpStatusCode(401);
     }
 
+    if ($member->isOnBlackList() || $member->getIsLoginRejected())
+    {
+      $exception = new opErrorHttpException('You are not allowd to log in.');
+      throw $exception->setHttpStatusCode(403);
+    }
+
     $this->member = $member;
 
     return $member;

From c3ac6b9f5924521a69a6a1053a5ba60739fc7a34 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Mon, 2 Apr 2012 13:32:29 +0900
Subject: [PATCH 113/630] fixed to use isset() to check reject parameter.
 (fixes #2698)

---
 apps/api/modules/member/actions/actions.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/api/modules/member/actions/actions.class.php b/apps/api/modules/member/actions/actions.class.php
index 84c5b91da..a105aa95f 100644
--- a/apps/api/modules/member/actions/actions.class.php
+++ b/apps/api/modules/member/actions/actions.class.php
@@ -109,7 +109,7 @@ public function executeFriendAccept(sfWebRequest $request)
       $this->forward404('Invalid member_id.');
     }
 
-    if (!$request['reject'])
+    if (!isset($request['reject']))
     {
       $preRequest->setFriend();
     }

From 208df003215d0dcd11b6a49141c4f3c057561b8f Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Mon, 2 Apr 2012 14:05:49 +0900
Subject: [PATCH 114/630] remove Propel util classes. (fixes #2822)

---
 lib/util/sfPropelBaseTask.class.php | 14 --------------
 lib/util/sfPropelBehavior.class.php | 21 ---------------------
 2 files changed, 35 deletions(-)
 delete mode 100644 lib/util/sfPropelBaseTask.class.php
 delete mode 100644 lib/util/sfPropelBehavior.class.php

diff --git a/lib/util/sfPropelBaseTask.class.php b/lib/util/sfPropelBaseTask.class.php
deleted file mode 100644
index 8fac32631..000000000
--- a/lib/util/sfPropelBaseTask.class.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-// dummy class for BC
-abstract class sfPropelBaseTask extends sfBaseTask
-{
-}
diff --git a/lib/util/sfPropelBehavior.class.php b/lib/util/sfPropelBehavior.class.php
deleted file mode 100644
index 98e84afb1..000000000
--- a/lib/util/sfPropelBehavior.class.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-// dummy class for BC
-abstract class sfPropelBehavior
-{
-  public function registerMethods()
-  {
-  }
-
-  public function add()
-  {
-  }
-}

From 6376c1bbd05e320a32544f4d1d8427b4f933f086 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Mon, 2 Apr 2012 14:39:06 +0900
Subject: [PATCH 115/630] modified image_size setting to choice selectable
 value. (fixes #2089)

---
 lib/config/config/sns_config.yml       | 2 +-
 lib/util/opFormItemGenerator.class.php | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/config/config/sns_config.yml b/lib/config/config/sns_config.yml
index dcb3cbf3a..abd47dd33 100644
--- a/lib/config/config/sns_config.yml
+++ b/lib/config/config/sns_config.yml
@@ -273,7 +273,7 @@ mobile:
     Name:        "mobile_image_max_size"
     Caption:     "画像の最大サイズ設定"
     Help:        "許可されている画像サイズを\"横x縦\"で指定してください。<br />(空欄の場合フルサイズになります)"
-    FormType:    "input"
+    FormType:    "image_size"
     ValueType:   "image_size"
     IsRequired:  false
     Default:     "320x320"
diff --git a/lib/util/opFormItemGenerator.class.php b/lib/util/opFormItemGenerator.class.php
index e5a5b4fc0..c8c45dcb2 100644
--- a/lib/util/opFormItemGenerator.class.php
+++ b/lib/util/opFormItemGenerator.class.php
@@ -149,6 +149,13 @@ public static function generateWidget($field, $choices = array())
         $list = opToolkit::arrayMapRecursive(array(sfContext::getInstance()->getI18N(), '__'), $list);
         $obj = new sfWidgetFormChoice(array('choices' => $list));
         break;
+      case 'image_size':
+        foreach (sfImageHandler::getAllowedSize() as $v)
+        {
+          $params['choices'][$v] = sfContext::getInstance()->getI18N()->__($v);
+        }
+        $obj = new sfWidgetFormChoice($params);
+        break;
       default:
         $obj = new sfWidgetFormInput($params);
         break;

From 145e68f520cb19dedd0735f180ab27c8db787ab6 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Mon, 2 Apr 2012 14:58:05 +0900
Subject: [PATCH 116/630] add translate catalogs for 'Public flag' and 'More'.
 (fixes #2912)

---
 apps/pc_frontend/i18n/messages.ja.xml |  4 ++++
 i18n/messages.ja.xml                  | 16 ++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/apps/pc_frontend/i18n/messages.ja.xml b/apps/pc_frontend/i18n/messages.ja.xml
index ac679e0e3..f398c70c1 100644
--- a/apps/pc_frontend/i18n/messages.ja.xml
+++ b/apps/pc_frontend/i18n/messages.ja.xml
@@ -382,6 +382,10 @@
         <source>Delete</source>
         <target>削除</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>More</source>
+        <target>もっと見る</target>
+      </trans-unit>
       <trans-unit id="">
         <source>You can upload 3 photos.</source>
         <target>写真は最大3枚までアップロードできます。</target>
diff --git a/i18n/messages.ja.xml b/i18n/messages.ja.xml
index c5f559ec8..ec5f82acd 100644
--- a/i18n/messages.ja.xml
+++ b/i18n/messages.ja.xml
@@ -134,6 +134,22 @@
         <source>Couldn't send E-mail. Please retry or contact to administrator.</source>
         <target>メールの送信に失敗しました。もう一度実行するか管理者に連絡して下さい。</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>The inputted value is already exist.</source>
+        <target>すでに登録されています。</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>"%value%" must be at most %max%.</source>
+        <target>"%value%" は %max% 以下でなければなりません。</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>"%value%" must be at least %min%.</source>
+        <target>"%value%" は %min% 以上でなければなりません。</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Public flag</source>
+        <target>公開範囲</target>
+      </trans-unit> 
     </body>
   </file>
 </xliff>

From 4bf6a06cd3d6a2e2699835f2c4e6012b9bd076bb Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Mon, 2 Apr 2012 15:32:47 +0900
Subject: [PATCH 117/630] add a page of member invitation form (fixes #2227)

---
 .../modules/member/config/view.yml            |  8 +++-
 .../member/templates/smtInviteInput.php       | 38 +++++++++++++++++++
 .../member/templates/smtInviteSuccess.php     | 16 ++------
 3 files changed, 48 insertions(+), 14 deletions(-)
 create mode 100644 apps/pc_frontend/modules/member/templates/smtInviteInput.php

diff --git a/apps/pc_frontend/modules/member/config/view.yml b/apps/pc_frontend/modules/member/config/view.yml
index 5f7393ca7..17054a177 100644
--- a/apps/pc_frontend/modules/member/config/view.yml
+++ b/apps/pc_frontend/modules/member/config/view.yml
@@ -50,5 +50,11 @@ smtSearchSuccess:
 smtConfigImageSuccess:
   layout: smtLayoutHome
 
+smtInviteInput:
+  layout: smtLayoutSns
+
 smtInviteSuccess:
-  layout: smtLayoutHome
+  layout: smtLayoutSns
+
+smtInviteError:
+  layout: smtLayoutSns
diff --git a/apps/pc_frontend/modules/member/templates/smtInviteInput.php b/apps/pc_frontend/modules/member/templates/smtInviteInput.php
new file mode 100644
index 000000000..d0da5abf6
--- /dev/null
+++ b/apps/pc_frontend/modules/member/templates/smtInviteInput.php
@@ -0,0 +1,38 @@
+<form action="<?php echo url_for('@member_invite'); ?>" method="post">
+<div class="row">
+  <div class="gadget_header span12"> <?php echo __('Invite a friend to %1%', array('%1%' => $op_config['sns_name'])); ?> </div>
+</div>
+<?php $errors = array(); ?>
+<?php if ($form->hasGlobalErrors()): ?>
+<?php $errors[] = $form->renderGlobalErrors(); ?>
+<?php endif; ?>
+<?php if ($errors): ?>
+<div class="row">
+<div class="alert alert-error">
+<a class="close" href="#">x</a>
+<?php foreach ($errors as $error): ?>
+<p><?php echo __($error) ?></p>
+<?php endforeach; ?>
+</div>
+</div>
+<?php endif; ?>
+<div class="row">
+
+<?php foreach ($form as $f): ?>
+<?php if (!$f->isHidden()): ?>
+<div class="span12" style="text-align: left;">
+<?php echo $f->renderLabel(); ?>
+</div>
+<div class="span12 <?php echo $f->hasError() ? 'clearfix error' : '' ?>">
+  <?php if ($f->hasError()): ?>
+  <span class="label label-important"><?php echo __($f->getError()) ?></span><br />
+  <?php endif ?>
+  <?php echo $f->render(array('class' => 'span12')) ?>
+  <span class="help-block"><?php echo $f->renderHelp() ?></span>
+</div>
+<?php endif; ?>
+<?php endforeach; ?>
+<?php echo $form->renderHiddenFields(); ?>
+<input type="submit" name="submit" value="<?php echo __('Send'); ?>" class="btn btn-primary" />
+</form>
+</div>
diff --git a/apps/pc_frontend/modules/member/templates/smtInviteSuccess.php b/apps/pc_frontend/modules/member/templates/smtInviteSuccess.php
index d0da5abf6..f91f9299c 100644
--- a/apps/pc_frontend/modules/member/templates/smtInviteSuccess.php
+++ b/apps/pc_frontend/modules/member/templates/smtInviteSuccess.php
@@ -1,23 +1,13 @@
-<form action="<?php echo url_for('@member_invite'); ?>" method="post">
 <div class="row">
   <div class="gadget_header span12"> <?php echo __('Invite a friend to %1%', array('%1%' => $op_config['sns_name'])); ?> </div>
 </div>
-<?php $errors = array(); ?>
-<?php if ($form->hasGlobalErrors()): ?>
-<?php $errors[] = $form->renderGlobalErrors(); ?>
-<?php endif; ?>
-<?php if ($errors): ?>
 <div class="row">
-<div class="alert alert-error">
-<a class="close" href="#">x</a>
-<?php foreach ($errors as $error): ?>
-<p><?php echo __($error) ?></p>
-<?php endforeach; ?>
+<div class="alert alert-success">
+<p><?php echo __('Sent.') ?></p>
 </div>
 </div>
-<?php endif; ?>
-<div class="row">
 
+<div class="row">
 <?php foreach ($form as $f): ?>
 <?php if (!$f->isHidden()): ?>
 <div class="span12" style="text-align: left;">

From 693e3fcf73698d997b5c251d6139fe4e3e830251 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Mon, 2 Apr 2012 16:18:58 +0900
Subject: [PATCH 118/630] replace getImage() into getImageFileName() (fixes
 #2698)

---
 apps/api/lib/helper/opJsonApiHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/api/lib/helper/opJsonApiHelper.php b/apps/api/lib/helper/opJsonApiHelper.php
index 3aa1a548d..14c2bb055 100644
--- a/apps/api/lib/helper/opJsonApiHelper.php
+++ b/apps/api/lib/helper/opJsonApiHelper.php
@@ -19,7 +19,7 @@ function op_api_member($member)
 {
   $viewMemberId = sfContext::getInstance()->getUser()->getMemberId();
 
-  $memberImageFileName = $member->getImage();
+  $memberImageFileName = $member->getImageFileName();
   if (!$memberImageFileName)
   {
     $memberImage = op_image_path('no_image.gif', true);

From a6f74587700f5f3c94c913e61f37364c85cda9aa Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 4 Apr 2012 13:28:12 +0900
Subject: [PATCH 119/630] fixed some items that have been pointed in the review
 (fixes #2756)

---
 apps/api/lib/helper/opJsonApiHelper.php         | 2 +-
 apps/api/modules/push/actions/actions.class.php | 2 +-
 apps/pc_frontend/i18n/messages.ja.xml           | 6 +++++-
 apps/pc_frontend/templates/_tosaka.php          | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/apps/api/lib/helper/opJsonApiHelper.php b/apps/api/lib/helper/opJsonApiHelper.php
index 14c2bb055..3af31b057 100644
--- a/apps/api/lib/helper/opJsonApiHelper.php
+++ b/apps/api/lib/helper/opJsonApiHelper.php
@@ -183,7 +183,7 @@ function op_api_notification($notification)
 
   return array(
     'id' => $notification['id'],
-    'body' => __($notification['body']),
+    'body' => sfContext::getInstance()->getI18N()->__($notification['body']),
     'category' => $notification['category'],
     'unread' => $notification['unread'],
     'created_at' => date('r', strtotime($notification['created_at'])),
diff --git a/apps/api/modules/push/actions/actions.class.php b/apps/api/modules/push/actions/actions.class.php
index c12b4695a..896eb5fb6 100644
--- a/apps/api/modules/push/actions/actions.class.php
+++ b/apps/api/modules/push/actions/actions.class.php
@@ -20,7 +20,7 @@ class pushActions extends opJsonApiActions
   public function executeSearch(sfWebRequest $request)
   {
     $member = $this->getUser()->getMember();
-    $notifications = opNotificationCenter::getNotifications($member);
+    $this->notifications = opNotificationCenter::getNotifications($member);
 
     $this->setTemplate('array');
   }
diff --git a/apps/pc_frontend/i18n/messages.ja.xml b/apps/pc_frontend/i18n/messages.ja.xml
index f398c70c1..f89a9c659 100644
--- a/apps/pc_frontend/i18n/messages.ja.xml
+++ b/apps/pc_frontend/i18n/messages.ja.xml
@@ -1389,7 +1389,11 @@
       </trans-unit>
       <trans-unit id="">
         <source>Do you accept %friend% link request?</source>
-        <target>%Friend%申請を許可しますか？</target>
+        <target>%friend%申請を許可しますか？</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Notification Center</source>
+        <target>通知センター</target>
       </trans-unit>
       <trans-unit id="">
         <source>There is no new notification.</source>
diff --git a/apps/pc_frontend/templates/_tosaka.php b/apps/pc_frontend/templates/_tosaka.php
index 5774bc157..556e497cf 100644
--- a/apps/pc_frontend/templates/_tosaka.php
+++ b/apps/pc_frontend/templates/_tosaka.php
@@ -39,7 +39,7 @@
         </div>
         {{if category=="link"}}
         <div class="row{{if unread==false}} hide{{/if}}">
-            <button class="span2 btn btn-primary small friend-notify-button friend-accept"<?php echo __('Accept') ?></button>
+            <button class="span2 btn btn-primary small friend-notify-button friend-accept"><?php echo __('Accept') ?></button>
             <button class="span2 btn small friend-notify-button friend-reject"><?php echo __('Reject') ?></button>
             <div class="center hide ncfriendloading"><?php echo op_image_tag('ajax-loader.gif') ?></div>
             <div class="center hide ncfriendresultmessage"></div>

From 78e084b2937477fd4d3c23e6b23bf4442033d822 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 4 Apr 2012 14:00:47 +0900
Subject: [PATCH 120/630] added CSRF Error Catalogue. (fixes #2914)

---
 apps/pc_frontend/i18n/form_member.ja.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/pc_frontend/i18n/form_member.ja.xml b/apps/pc_frontend/i18n/form_member.ja.xml
index 5278e3c65..95cbf3c86 100644
--- a/apps/pc_frontend/i18n/form_member.ja.xml
+++ b/apps/pc_frontend/i18n/form_member.ja.xml
@@ -14,6 +14,10 @@
         <source>"%value%" is too long (%max_length% characters max).</source>
         <target>%max_length%文字以内で入力してください。</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>CSRF attack detected.</source>
+        <target>前の画面を読み直して、操作をやり直してください。</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>

From ff30e7c4f0a0bed159cd7c35dd0139a6c4c0b2c6 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 4 Apr 2012 14:07:11 +0900
Subject: [PATCH 121/630] modified to close global error messages on smartphone
 template (fixes #2227)

---
 web/js/smt_main.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/js/smt_main.js b/web/js/smt_main.js
index 681d9901f..aaa86c626 100644
--- a/web/js/smt_main.js
+++ b/web/js/smt_main.js
@@ -5,4 +5,7 @@ $(function(){
       document.cookie = "disable_smt=1";
       location.href = $(this).attr('href');
     });
+  $('a.close').click(function() {
+    $(this).parent().hide();
+  });
 });

From 085e4e99b7c818ddb610bb5a385fed5da1b7d5f3 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 22 Mar 2012 12:24:56 +0900
Subject: [PATCH 122/630] Revert "eager loading in fetching i18n translation
 records (fixes #1898)"

This reverts commit 9a2a26d06d488a9aab89ee0efa39e2a1dc73cbc1.

Conflicts:

	lib/util/opDoctrineQuery.class.php
---
 lib/i18n/opI18N.class.php                    |  4 ++++
 lib/model/doctrine/NavigationTable.class.php |  1 -
 lib/model/doctrine/SnsTermTable.class.php    |  2 +-
 lib/util/opDoctrineQuery.class.php           | 13 -------------
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/lib/i18n/opI18N.class.php b/lib/i18n/opI18N.class.php
index d387ba49f..5865c148a 100644
--- a/lib/i18n/opI18N.class.php
+++ b/lib/i18n/opI18N.class.php
@@ -28,6 +28,10 @@ public function initialize(sfApplicationConfiguration $configuration, sfCache $c
     }
     $this->terms = Doctrine::getTable('SnsTerm');
     $this->terms->configure($this->culture, $application);
+    if (!$this->terms['member'])
+    {
+      $this->terms->configure('en', $application);
+    }
   }
 
   public function generateApplicationMessages($dirs)
diff --git a/lib/model/doctrine/NavigationTable.class.php b/lib/model/doctrine/NavigationTable.class.php
index 1c376bdb5..c8c21f9af 100644
--- a/lib/model/doctrine/NavigationTable.class.php
+++ b/lib/model/doctrine/NavigationTable.class.php
@@ -13,7 +13,6 @@ class NavigationTable extends Doctrine_Table
   public function retrieveByType($type)
   {
     return $this->createQuery()
-      ->leftJoinTranslation('Navigation')
       ->where('type = ?', $type)
       ->orderBy('sort_order')
       ->execute();
diff --git a/lib/model/doctrine/SnsTermTable.class.php b/lib/model/doctrine/SnsTermTable.class.php
index 6572c3fba..fc36e288c 100644
--- a/lib/model/doctrine/SnsTermTable.class.php
+++ b/lib/model/doctrine/SnsTermTable.class.php
@@ -104,7 +104,7 @@ protected function getTerms()
 
       if ($this->culture)
       {
-        $q->leftJoinTranslation('SnsTerm', $this->culture);
+        $q->andWhere('id IN (SELECT id FROM SnsTermTranslation WHERE lang = ?)', $this->culture);
       }
 
       foreach ($q->execute() as $term)
diff --git a/lib/util/opDoctrineQuery.class.php b/lib/util/opDoctrineQuery.class.php
index 28a6b5ad2..7e5db73bc 100644
--- a/lib/util/opDoctrineQuery.class.php
+++ b/lib/util/opDoctrineQuery.class.php
@@ -277,19 +277,6 @@ public function getFrom()
     return $this->_dqlParts['from'];
   }
 
-  public function leftJoinTranslation($tableName, $culture = null)
-  {
-    $culture = $culture !== null ? $culture : opDoctrineRecord::getDefaultCulture();
-    $fallbackCulture = sfConfig::get('sf_default_culture');
-
-    if ($culture === $fallbackCulture)
-    {
-      return $this->leftJoin($tableName.'.Translation t WITH t.lang = ?', $culture);
-    }
-
-    return $this->leftJoin($tableName.'.Translation t WITH t.lang IN (?, ?)', array($culture, $fallbackCulture));
-  }
-
   public function whereLike($expr, $param, $matchType = self::MATCH_BROAD, $not = false)
   {
     return $this->andWhereLike($expr, $param, $matchType, $not);

From 36966416a63086ebcbcb72fd91af7aa7c370c31c Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 9 Feb 2012 22:06:54 +0900
Subject: [PATCH 123/630] (fixes #2708) updated the mobile_ip_address list

---
 lib/config/config/mobile_ip_address.yml | 54 ++++++++++++++++++++-----
 1 file changed, 45 insertions(+), 9 deletions(-)

diff --git a/lib/config/config/mobile_ip_address.yml b/lib/config/config/mobile_ip_address.yml
index e7c194337..4ec001c0b 100644
--- a/lib/config/config/mobile_ip_address.yml
+++ b/lib/config/config/mobile_ip_address.yml
@@ -1,5 +1,27 @@
+######################################
+# Copyright 2005-2012 OpenPNE Project (http://www.openpne.jp/)
+# 
+# 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.
+######################################
+
+######################################
+#  2012/01/12 リリース版
+#  ・WILLCOM 2012/1/11 IPアドレス帯域の追加に対応
+#  ・DoCoMo, SoftBank の参照先URLを変更
+######################################
+
 # DoCoMo (2010/06/24更新)
-# http://www.nttdocomo.co.jp/service/imode/make/content/ip/index.html
+# http://www.nttdocomo.co.jp/service/developer/make/content/ip/index.html
 docomo:
   - 210.153.84.0/24
   - 210.136.161.0/24
@@ -53,13 +75,13 @@ ezweb:
   - 111.86.147.224/27
 
 # SoftBank (2011/2/10更新)
-# http://creation.mb.softbank.jp/web/web_ip.html
+# http://creation.mb.softbank.jp/mc/tech/tech_web/web_ipaddress.html
 softbank:
   - 123.108.237.0/27
   - 202.253.96.224/27
   - 210.146.7.192/26
 
-# WILLCOM (2011/08/23更新)
+# WILLCOM (2012/01/12更新)
 # http://www.willcom-inc.com/ja/service/contents_service/create/center_info/
 willcom:
   - 61.198.128.0/24
@@ -158,14 +180,20 @@ willcom:
   - 114.21.149.0/24
   - 125.28.0.0/24
   - 125.28.1.0/24
-  - 125.28.15.0/24
-  - 125.28.16.0/24
-  - 125.28.17.0/24
   - 125.28.2.0/24
   - 125.28.3.0/24
   - 125.28.4.0/24
   - 125.28.5.0/24
+  - 125.28.6.0/24
+  - 125.28.7.0/24
   - 125.28.8.0/24
+  - 125.28.11.0/24
+  - 125.28.12.0/24
+  - 125.28.13.0/24
+  - 125.28.14.0/24
+  - 125.28.15.0/24
+  - 125.28.16.0/24
+  - 125.28.17.0/24
   - 210.168.246.0/24
   - 210.168.247.0/24
   - 210.169.92.0/24
@@ -184,20 +212,28 @@ willcom:
   - 211.18.235.0/24
   - 211.18.236.0/24
   - 211.18.237.0/24
+  - 211.18.238.0/24
+  - 211.18.239.0/24
+  - 219.108.2.0/24
+  - 219.108.3.0/24
+  - 219.108.4.0/24
+  - 219.108.5.0/24
+  - 219.108.6.0/24
+  - 219.108.7.0/24
+  - 219.108.8.0/24
+  - 219.108.9.0/24
   - 219.108.10.0/24
   - 219.108.11.0/24
   - 219.108.12.0/24
   - 219.108.13.0/24
   - 219.108.14.0/24
   - 219.108.15.0/24
-  - 219.108.7.0/24
-  - 219.108.8.0/24
-  - 219.108.9.0/24
   - 221.119.0.0/24
   - 221.119.1.0/24
   - 221.119.2.0/24
   - 221.119.3.0/24
   - 221.119.4.0/24
+  - 221.119.5.0/24
   - 221.119.6.0/24
   - 221.119.7.0/24
   - 221.119.8.0/24

From 55bb2ae977d8a8cf8ca0bffaafe6c104784f3743 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 20 Oct 2011 16:29:40 +0900
Subject: [PATCH 124/630] fix double call Member::getImage() (fixes #2535)

---
 lib/model/doctrine/Member.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/model/doctrine/Member.class.php b/lib/model/doctrine/Member.class.php
index decd49e3b..5dd0d1ade 100644
--- a/lib/model/doctrine/Member.class.php
+++ b/lib/model/doctrine/Member.class.php
@@ -195,9 +195,10 @@ public function getImage()
 
   public function getImageFileName()
   {
-    if ($this->getImage())
+    $image = $this->getImage();
+    if ($image)
     {
-      return $this->getImage()->getFile();
+      return $image->getFile();
     }
 
     return false;

From d0c699683a281f5c272e66983019d7f2e1f5409f Mon Sep 17 00:00:00 2001
From: mtakai <m.takai@tejimaya.com>
Date: Mon, 5 Dec 2011 21:29:00 +0900
Subject: [PATCH 125/630] (fixes #2517) updated the mobile_ip_address list

---
 lib/config/config/mobile_ip_address.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/config/config/mobile_ip_address.yml b/lib/config/config/mobile_ip_address.yml
index 4ec001c0b..5d1ea6072 100644
--- a/lib/config/config/mobile_ip_address.yml
+++ b/lib/config/config/mobile_ip_address.yml
@@ -74,6 +74,12 @@ ezweb:
   - 111.86.147.192/27
   - 111.86.147.224/27
 
+# au 2011年秋冬モデル以降 (2011/10/17更新)
+# http://www.au.kddi.com/ezfactory/tec/spec/ezsava_ip.html
+  - 111.107.116.0/26
+  - 111.107.116.64/26
+  - 111.107.116.192/28
+
 # SoftBank (2011/2/10更新)
 # http://creation.mb.softbank.jp/mc/tech/tech_web/web_ipaddress.html
 softbank:

From 44c0e393ec5fd5c619c7717292b2a4c3e3fa5c39 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 4 Apr 2012 16:08:45 +0900
Subject: [PATCH 126/630] fixed smartphone form style for bootstrap 2.0 (fixes
 #2838)

---
 .../community/templates/smtEditSuccess.php    | 32 ++++++++------
 .../community/templates/smtJoinInput.php      | 15 ++++---
 .../community/templates/smtQuitSuccess.php    | 17 ++++---
 .../modules/friend/templates/smtLinkInput.php | 15 ++++---
 .../member/templates/smtConfigSuccess.php     | 13 ++++--
 .../templates/smtEditProfileSuccess.php       | 44 ++++++++++---------
 .../member/templates/smtInviteSuccess.php     | 18 ++++----
 web/css/smt_main.css                          |  4 ++
 8 files changed, 96 insertions(+), 62 deletions(-)

diff --git a/apps/pc_frontend/modules/community/templates/smtEditSuccess.php b/apps/pc_frontend/modules/community/templates/smtEditSuccess.php
index 7764593e5..9314785e4 100644
--- a/apps/pc_frontend/modules/community/templates/smtEditSuccess.php
+++ b/apps/pc_frontend/modules/community/templates/smtEditSuccess.php
@@ -35,16 +35,16 @@
 <div class="row">
 <?php foreach ($communityForm as $cf): ?>
 <?php if (!$cf->isHidden()): ?>
-  <div class="span12">
-  <?php echo $cf->renderLabel(); ?>
-  </div>
-  <div class="span12 <?php echo $cf->hasError() ? 'clearfix error' : '' ?>">
+<div class="control-group<?php echo $cf->hasError()? ' error' : '' ?>">
+  <label class="control-label"><?php echo $cf->renderLabel() ?></label>
+  <div class="controls">
     <?php if ($cf->hasError()): ?>
-    <span class="label label-important"><?php echo __($cf->getError()) ?></span>
+    <span class="label label-important label-block"><?php echo __($cf->getError()); ?></span>
     <?php endif ?>
     <?php echo $cf->render(array('class' => 'span12')) ?>
-    <span class="help-block"><?php echo $cf->renderHelp() ?></span>
+    <span class="help-block"><?php echo $cf->renderHelp(); ?></span>    
   </div>
+</div>
 <?php endif; ?>
 <?php endforeach; ?>
 </div>
@@ -52,14 +52,16 @@
 <div class="row">
 <?php foreach ($communityConfigForm as $ccf): ?>
 <?php if (!$ccf->isHidden()): ?>
-  <div class="span12"><?php echo $ccf->renderLabel() ?></div>
-  <div class="<?php echo $ccf->hasError() ? 'clearfix error' : '' ?>">
+<div class="control-group<?php echo $ccf->hasError()? ' error' : '' ?>">
+  <label class="control-label"><?php echo $ccf->renderLabel() ?></label>
+  <div class="controls">
     <?php if ($ccf->hasError()): ?>
-    <span class="label label-important"><?php echo __($ccf->getError()) ?></span>
+    <span class="label label-important label-block"><?php echo __($ccf->getError()); ?></span>
     <?php endif ?>
     <?php echo $ccf->render(array('class' => 'span12')) ?>
-    <span class="help-block"><?php echo $ccf->renderHelp() ?></span>
+    <span class="help-block"><?php echo $ccf->renderHelp(); ?></span>    
   </div>
+</div>
 <?php endif; ?>
 <?php endforeach; ?>
 </div>
@@ -67,14 +69,16 @@
 <div class="row">
 <?php foreach ($communityFileForm as $cff): ?>
 <?php if (!$cff->isHidden()): ?>
-  <div class="span12"><?php echo $cff->renderLabel(); ?></div>
-  <div class="span12 <?php echo $cff->hasError() ? 'clearfix error' : '' ?>">
+<div class="control-group<?php echo $cff->hasError()? ' error' : '' ?>">
+  <label class="control-label"><?php echo $cff->renderLabel() ?></label>
+  <div class="controls">
     <?php if ($cff->hasError()): ?>
-    <span class="label label-important"><?php echo __($cff->getError()) ?></span>
+    <span class="label label-important label-block"><?php echo __($cff->getError()); ?></span>
     <?php endif ?>
     <?php echo $cff->render(array('class' => 'span12')) ?>
-    <span class="help-block"><?php echo $cff->renderHelp() ?></span>
+    <span class="help-block"><?php echo $cff->renderHelp(); ?></span>    
   </div>
+</div>
 <?php endif; ?>
 <?php endforeach; ?>
 </div>
diff --git a/apps/pc_frontend/modules/community/templates/smtJoinInput.php b/apps/pc_frontend/modules/community/templates/smtJoinInput.php
index 52b4e8e35..caf8de05d 100644
--- a/apps/pc_frontend/modules/community/templates/smtJoinInput.php
+++ b/apps/pc_frontend/modules/community/templates/smtJoinInput.php
@@ -10,11 +10,16 @@
     <?php echo form_tag($sf_request->getCurrentUri()); ?>
     <?php foreach ($form as $field): ?>
     <?php if (!$field->isHidden()): ?>
-    <div class="clearfix <?php $field->hasError() ? 'error' : '' ?>">
-    <label for="xlInput3" class="span12"><?php echo $field->renderLabel() ?></label>
-    <?php echo $field->render(array('class' => 'span12')) ?>
-    <span class="help-block"><?php echo $field->renderHelp() ?></span>
-    </div>
+      <div class="control-group<?php echo $field->hasError()? ' error' : '' ?>">
+        <label class="control-label"><?php echo $field->renderLabel() ?></label>
+        <div class="controls">
+        <?php if ($field->hasError()): ?>
+        <span class="label label-important label-block"><?php echo __($field->getError()); ?></span>
+        <?php endif ?>
+        <?php echo $field->render(array('class' => 'span12')) ?>
+        <span class="help-block"><?php echo $field->renderHelp(); ?></span>    
+        </div>
+      </div>
     <?php endif; ?>
     <?php endforeach; ?>
     <div class="center"><input type="submit" name="submit" value="<?php echo __('Send') ?>" class="btn btn-primary" /></div>
diff --git a/apps/pc_frontend/modules/community/templates/smtQuitSuccess.php b/apps/pc_frontend/modules/community/templates/smtQuitSuccess.php
index 2b5532ec0..3f18c9153 100644
--- a/apps/pc_frontend/modules/community/templates/smtQuitSuccess.php
+++ b/apps/pc_frontend/modules/community/templates/smtQuitSuccess.php
@@ -7,18 +7,25 @@
   <div class="span8"><?php echo link_to($community->getName(), '@community_home?id='.$id) ?></div>
   <div class="span12 center"><?php echo __('Do you really quit the following %community%?') ?></div>
   <div class="span12 center">
+    <div class="row">
     <?php echo form_tag($sf_request->getCurrentUri()); ?>
     <?php foreach ($form as $field): ?>
     <?php if (!$field->isHidden()): ?>
-    <div class="clearfix <?php $field->hasError() ? 'error' : '' ?>">
-    <label for="xlInput3" class="span12"><?php echo $field->renderLabel() ?></label>
-    <?php echo $field->render(array('class' => 'span12')) ?>
-    <span class="help-block"><?php echo $field->renderHelp() ?></span>
-    </div>
+      <div class="control-group<?php echo $field->hasError()? ' error' : '' ?>">
+        <label class="control-label"><?php echo $field->renderLabel() ?></label>
+        <div class="controls">
+        <?php if ($field->hasError()): ?>
+        <span class="label label-important label-block"><?php echo __($field->getError()); ?></span>
+        <?php endif ?>
+        <?php echo $field->render(array('class' => 'span12')) ?>
+        <span class="help-block"><?php echo $field->renderHelp(); ?></span>    
+        </div>
+      </div>
     <?php endif; ?>
     <?php endforeach; ?>
     <input type="submit" name="submit" value="<?php echo __('Send') ?>" class="btn btn-danger" />
     <?php echo $form->renderHiddenFields(); ?>
     </form>
+    </div>
   </div>
 </div>
diff --git a/apps/pc_frontend/modules/friend/templates/smtLinkInput.php b/apps/pc_frontend/modules/friend/templates/smtLinkInput.php
index 4f5e5068a..47e120508 100644
--- a/apps/pc_frontend/modules/friend/templates/smtLinkInput.php
+++ b/apps/pc_frontend/modules/friend/templates/smtLinkInput.php
@@ -9,11 +9,16 @@
     <?php echo form_tag($sf_request->getCurrentUri()); ?>
     <?php foreach ($form as $field): ?>
     <?php if (!$field->isHidden()): ?>
-    <div class="clearfix <?php $field->hasError() ? 'error' : '' ?>">
-    <label for="xlInput3" class="span12"><?php echo $field->renderLabel() ?></label>
-    <?php echo $field->render(array('class' => 'span12')) ?>
-    <span class="help-block"><?php echo $field->renderHelp() ?></span>
-    </div>
+      <div class="control-group<?php echo $field->hasError()? ' error' : '' ?>">
+        <label class="control-label"><?php echo $field->renderLabel() ?></label>
+        <div class="controls">
+        <?php if ($field->hasError()): ?>
+        <span class="label label-important label-block"><?php echo __($field->getError()); ?></span>
+        <?php endif ?>
+        <?php echo $field->render(array('class' => 'span12')) ?>
+        <span class="help-block"><?php echo $field->renderHelp(); ?></span>    
+        </div>
+      </div>
     <?php endif; ?>
     <?php endforeach; ?>
     <input type="submit" name="submit" value="<?php echo __('Send') ?>" class="btn btn-primary" />
diff --git a/apps/pc_frontend/modules/member/templates/smtConfigSuccess.php b/apps/pc_frontend/modules/member/templates/smtConfigSuccess.php
index 08d5fce4b..2fd4c47ea 100644
--- a/apps/pc_frontend/modules/member/templates/smtConfigSuccess.php
+++ b/apps/pc_frontend/modules/member/templates/smtConfigSuccess.php
@@ -37,10 +37,15 @@
 <div class="row" style="margin-left: 0px;">
 <?php foreach ($form as $f): ?>
 <?php if (!$f->isHidden()): ?>
-<div class="clearfix <?php $f->hasError() ? 'error' : '' ?>">
-<label for="xlInput3" class="span12"><?php echo $f->renderLabel() ?></label>
-<?php echo $f->render(array('class' => 'span12')) ?>
-<span class="help-block"><?php echo $f->renderHelp() ?></span>
+<div class="control-group<?php echo $f->hasError()? ' error' : '' ?>">
+  <label class="control-label"><?php echo $f->renderLabel() ?></label>
+  <div class="controls">
+    <?php if ($f->hasError()): ?>
+    <span class="label label-important label-block"><?php echo __($f->getError()); ?></span>
+    <?php endif ?>
+    <?php echo $f->render(array('class' => 'span12')) ?>
+    <span class="help-block"><?php echo $f->renderHelp(); ?></span>    
+  </div>
 </div>
 <?php endif; ?>
 <?php endforeach; ?>
diff --git a/apps/pc_frontend/modules/member/templates/smtEditProfileSuccess.php b/apps/pc_frontend/modules/member/templates/smtEditProfileSuccess.php
index 500ddfa9d..36767e68d 100644
--- a/apps/pc_frontend/modules/member/templates/smtEditProfileSuccess.php
+++ b/apps/pc_frontend/modules/member/templates/smtEditProfileSuccess.php
@@ -28,14 +28,16 @@
 <?php if (!$mf->isHidden()): ?>
 <tr>
   <td>
-  <div class="form-label span12"><?php echo $mf->renderLabel() ?></div>
-  <div class="<?php echo $mf->hasError() ? 'clearfix error' : '' ?>">
-    <?php if ($mf->hasError()): ?>
-    <span class="label label-important"><?php echo __($mf->getError()); ?></span>
-    <?php endif ?>
-    <?php echo $mf->render(array('class' => 'span12')) ?>
-    <span class="help-block"><?php echo $mf->renderHelp(); ?></span>
-  </div>
+    <div class="control-group<?php echo $mf->hasError()? ' error' : '' ?>">
+      <label class="control-label"><?php echo $mf->renderLabel() ?></label>
+      <div class="controls">
+        <?php if ($mf->hasError()): ?>
+        <span class="label label-important label-block"><?php echo __($mf->getError()); ?></span>
+        <?php endif ?>
+        <?php echo $mf->render(array('class' => 'span12')) ?>
+        <span class="help-block"><?php echo $mf->renderHelp(); ?></span>    
+      </div>
+    </div>
   </td>
 </tr>
 <?php endif; ?>
@@ -44,18 +46,20 @@
 <?php if (!$pf->isHidden()): ?>
 <tr>
   <td>
-  <div class="form-label span12"><?php echo $pf->renderLabel() ?></div>
-  <div class="<?php $mf->hasError() ? 'clearfix error' : '' ?>">
-    <?php if ($mf->hasError()): ?>
-    <span class="label label-important"><?php echo __($pf->getError()); ?></span>
-    <?php endif ?>
-    <?php if ($pf->getWidget()->getOption('widget') instanceof sfWidgetFormDate): ?>
-    <?php echo $pf->render(array('class' => 'span8')) ?>
-    <?php else: ?>
-    <?php echo $pf->render(array('class' => 'span12')) ?>
-    <?php endif ?>
-    <span class="help-block"><?php echo $pf->renderHelp() ?></span>
-  </div>
+    <div class="control-group<?php echo $pf->hasError()? ' error' : '' ?>">
+      <label class="control-label"><?php echo $pf->renderLabel() ?></label>
+      <div class="controls">
+        <?php if ($pf->hasError()): ?>
+        <span class="label label-important label-block"><?php echo __($pf->getError()); ?></span>
+        <?php endif ?>
+        <?php if ($pf->getWidget()->getOption('widget') instanceof sfWidgetFormDate): ?>
+        <?php echo $pf->render(array('class' => 'span4')) ?>
+        <?php else: ?>
+        <?php echo $pf->render(array('class' => 'span12')) ?>
+        <?php endif ?>
+        <span class="help-block"><?php echo $pf->renderHelp(); ?></span>    
+      </div>
+    </div>
   </td>
 </tr>
 <?php endif; ?>
diff --git a/apps/pc_frontend/modules/member/templates/smtInviteSuccess.php b/apps/pc_frontend/modules/member/templates/smtInviteSuccess.php
index f91f9299c..3c3cf9bca 100644
--- a/apps/pc_frontend/modules/member/templates/smtInviteSuccess.php
+++ b/apps/pc_frontend/modules/member/templates/smtInviteSuccess.php
@@ -10,15 +10,15 @@
 <div class="row">
 <?php foreach ($form as $f): ?>
 <?php if (!$f->isHidden()): ?>
-<div class="span12" style="text-align: left;">
-<?php echo $f->renderLabel(); ?>
-</div>
-<div class="span12 <?php echo $f->hasError() ? 'clearfix error' : '' ?>">
-  <?php if ($f->hasError()): ?>
-  <span class="label label-important"><?php echo __($f->getError()) ?></span><br />
-  <?php endif ?>
-  <?php echo $f->render(array('class' => 'span12')) ?>
-  <span class="help-block"><?php echo $f->renderHelp() ?></span>
+<div class="control-group<?php echo $f->hasError()? ' error' : '' ?>">
+  <label class="control-label"><?php echo $f->renderLabel() ?></label>
+  <div class="controls">
+    <?php if ($f->hasError()): ?>
+    <span class="label label-important label-block"><?php echo __($f->getError()); ?></span>
+    <?php endif ?>
+    <?php echo $f->render(array('class' => 'span12')) ?>
+    <span class="help-block"><?php echo $f->renderHelp(); ?></span>    
+  </div>
 </div>
 <?php endif; ?>
 <?php endforeach; ?>
diff --git a/web/css/smt_main.css b/web/css/smt_main.css
index 01f1b4ad1..a88963646 100644
--- a/web/css/smt_main.css
+++ b/web/css/smt_main.css
@@ -6,6 +6,10 @@ label {
   display: inline;
 }
 
+.label-block {
+  display: block;
+}
+
 .radio_list {
   display: inline-block;
 }

From 425ca82e22184de74ddf3ace8a47e029e4d8dfd3 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Tue, 21 Feb 2012 14:08:18 +0900
Subject: [PATCH 127/630] add support for realtime searching (refs #2227)

---
 .../community/actions/actions.class.php       | 22 +++++++++
 .../community/actions/components.class.php    |  6 +++
 .../modules/community/config/view.yml         |  3 ++
 .../_smtCommunityMemberJoinListBox.php        | 26 +++++++++-
 .../community/templates/smtSearchSuccess.php  | 46 ++++++++++++++++++
 .../modules/member/actions/actions.class.php  | 21 ++++++++
 .../templates/_smtMemberFriendListBox.php     | 22 ++++++++-
 .../_smtMemberJoinCommunityListBox.php        | 19 ++++++++
 .../member/templates/smtSearchSuccess.php     | 48 +++++++++++++++++++
 9 files changed, 211 insertions(+), 2 deletions(-)
 create mode 100644 apps/pc_frontend/modules/community/templates/smtSearchSuccess.php
 create mode 100644 apps/pc_frontend/modules/member/templates/smtSearchSuccess.php

diff --git a/apps/pc_frontend/modules/community/actions/actions.class.php b/apps/pc_frontend/modules/community/actions/actions.class.php
index f0930ac45..b242af744 100644
--- a/apps/pc_frontend/modules/community/actions/actions.class.php
+++ b/apps/pc_frontend/modules/community/actions/actions.class.php
@@ -205,4 +205,26 @@ public function executeSmtQuit(opWebRequest $request)
 
     return $result;
   }
+
+ /**
+  * Executes search action
+  *
+  * @param opWebRequest $request A request object
+  */
+  public function executeSearch($request)
+  {
+    $this->forwardIf($request->isSmartphone(), 'community', 'smtSearch');
+
+    return parent::executeSearch($request);
+  }
+
+ /**
+  * Executes smtSearch action
+  *
+  * @param opWebRequest $request A request object
+  */
+  public function executeSmtSearch(opWebRequest $request)
+  {
+    return sfView::SUCCESS;
+  }
 }
diff --git a/apps/pc_frontend/modules/community/actions/components.class.php b/apps/pc_frontend/modules/community/actions/components.class.php
index 1f48fbd88..85299f69b 100644
--- a/apps/pc_frontend/modules/community/actions/components.class.php
+++ b/apps/pc_frontend/modules/community/actions/components.class.php
@@ -56,4 +56,10 @@ public function executeSmtCommunityListBox($request)
     $this->communityAdmin = $this->community->getAdminMember();
     $this->communitySubAdmins = $this->community->getSubAdminMembers();
   }
+
+  public function executeSmtCommunityMemberJoinListBox($request)
+  {
+    $this->id = $request->getParameter('id');
+    $this->community = Doctrine::getTable('Community')->find($this->id);
+  }
 }
diff --git a/apps/pc_frontend/modules/community/config/view.yml b/apps/pc_frontend/modules/community/config/view.yml
index ee36a0e75..796c929d4 100644
--- a/apps/pc_frontend/modules/community/config/view.yml
+++ b/apps/pc_frontend/modules/community/config/view.yml
@@ -24,3 +24,6 @@ smtQuitSuccess:
 
 smtQuitError:
   layout: smtLayoutSns
+
+smtSearchSuccess:
+  layout: smtLayoutSns
diff --git a/apps/pc_frontend/modules/community/templates/_smtCommunityMemberJoinListBox.php b/apps/pc_frontend/modules/community/templates/_smtCommunityMemberJoinListBox.php
index 3ec922db0..f50e6a4ab 100644
--- a/apps/pc_frontend/modules/community/templates/_smtCommunityMemberJoinListBox.php
+++ b/apps/pc_frontend/modules/community/templates/_smtCommunityMemberJoinListBox.php
@@ -9,6 +9,21 @@
 $(function(){
   $.getJSON( openpne.apiBase + 'member/search.json?target=community&target_id=<?php echo $community->getId() ?>&apiKey=' + openpne.apiKey, function(json) {
     $('#communityMemberJoinListTemplate').tmpl(json.data).appendTo('#communityMemberJoinList');
+    $('#communityMemberJoinList').show();
+    $('#communityMemberJoinListLoading').hide();
+  });
+  $('#communityMemberJoinListSearch').keyup(function(){
+    $('#communityMemberJoinListLoading').show();
+    $('#communityMemberJoinList').hide();
+    $('#communityMemberJoinList').empty();
+    var keyword = $('#communityMemberJoinListSearch').val();
+    var requestData = { target: 'community', target_id: <?php echo $community->getId(); ?>, keyword: keyword, apiKey: openpne.apiKey };
+    $.getJSON( openpne.apiBase + 'member/search.json', requestData, function(json) {
+      $result = $('#communityMemberJoinListTemplate').tmpl(json.data);
+      $('#communityMemberJoinList').html($result);
+      $('#communityMemberJoinList').show();
+      $('#communityMemberJoinListLoading').hide();
+    });
   });
 });
 </script>
@@ -18,5 +33,14 @@
   <div class="gadget_header span12"><?php echo __('%community% Members', array('%community%' => $op_term['community'])) ?></div>
 </div>
 <hr class="toumei" />
-<div class="row" id="communityMemberJoinList">
+<div class="row" id="communityMemberJoinListSearchBox">
+<div class="input-prepend span12">
+<span class="add-on"><i class="icon-search"></i></span>
+<input type="text" id="communityMemberJoinListSearch" class="realtime-searchbox" value="" />
+</div>
+</div>
+<div class="row hide" id="communityMemberJoinList">
+</div>
+<div class="row center" id="communityMemberJoinListLoading" style="margin-left: 0;">
+<?php echo op_image_tag('ajax-loader.gif') ?>
 </div>
diff --git a/apps/pc_frontend/modules/community/templates/smtSearchSuccess.php b/apps/pc_frontend/modules/community/templates/smtSearchSuccess.php
new file mode 100644
index 000000000..765248a95
--- /dev/null
+++ b/apps/pc_frontend/modules/community/templates/smtSearchSuccess.php
@@ -0,0 +1,46 @@
+<?php use_helper('Javascript') ?>
+<script id="joinCommunityListTemplate" type="text/x-jquery-tmpl">
+  <div class="span3">
+    <div class="row_memberimg row"><div class="span3 center"><a href="${community_url}"><img src="${community_image_url}" class="rad10" width="57" height="57"></a></div></div>
+    <div class="row_membername font10 row"><div class="span3 center"><a href="${community_url}">${name}</a> (${member_count})</div></div>
+  </div>
+</script>
+<script type="text/javascript">
+$(function(){
+  $.getJSON( openpne.apiBase + 'member/community.json?apiKey=' + openpne.apiKey, function(json) {
+    $('#joinCommunityListTemplate').tmpl(json.data).appendTo('#memberJoinCommunityList');
+    $('#memberJoinCommunityList').show();
+    $('#memberJoinCommunityListLoading').hide();
+  });
+  $('#joinCommunitySearch').keypress(function(){
+    $('#memberJoinCommunityListLoading').show();
+    $('#memberJoinCommunityList').hide();
+    $('#memberKoinCommunityList').empty();
+    var keyword = $('#joinCommunitySearch').val();
+    var requestData = { keyword: keyword, apiKey: openpne.apiKey };
+    $.getJSON( openpne.apiBase + 'member/community.json', requestData, function(json) {
+      $result = $('#joinCommunityListTemplate').tmpl(json.data);
+      $('#memberJoinCommunityList').html($result);
+      $('#memberJoinCommunityList').show();
+      $('#memberJoinCommunityListLoading').hide();
+    });
+  });
+});
+</script>
+
+<hr class="toumei" />
+<div class="row">
+  <div class="gadget_header span12"><?php echo __('Search %community%', array('%community%' => $op_term['community']->titleize()->pluralize())) ?></div>
+</div>
+<hr class="toumei" />
+<div class="row" id="joinCommunitySearchBox">
+<div class="input-prepend span12">
+<span class="add-on"><i class="icon-search"></i></span>
+<input type="text" id="joinCommunitySearch" class="realtime-searchbox" value="" />
+</div>
+</div>
+<div class="row hide" id="memberJoinCommunityList">
+</div>
+<div class="row" id="memberJoinCommunityListLoading" style="margin-left: 0; text-align: center;">
+<?php echo op_image_tag('ajax-loader.gif') ?>
+</div>
diff --git a/apps/pc_frontend/modules/member/actions/actions.class.php b/apps/pc_frontend/modules/member/actions/actions.class.php
index c53fd50ad..118a492b6 100644
--- a/apps/pc_frontend/modules/member/actions/actions.class.php
+++ b/apps/pc_frontend/modules/member/actions/actions.class.php
@@ -321,6 +321,27 @@ public function executeSmtConfig(opWebRequest $request)
     return parent::executeConfig($request);
   }
 
+ /**
+  * Executes search action
+  *
+  * @param opWebRequest $request a request object
+  */
+  public function executeSearch($request)
+  {
+    $this->forwardIf($request->isSmartphone(), 'member', 'smtSearch');
+
+    return parent::executeSearch($request);
+  }
+
+ /**
+  * Executes smtSearch action
+  *
+  * @param opWebRequest $request a request object
+  */
+  public function executeSmtSearch(opWebRequest $request)
+  {
+    return sfView::SUCCESS;
+  }
 
  /**
   * Executes invite action
diff --git a/apps/pc_frontend/modules/member/templates/_smtMemberFriendListBox.php b/apps/pc_frontend/modules/member/templates/_smtMemberFriendListBox.php
index 50cd01c19..a737adfe8 100644
--- a/apps/pc_frontend/modules/member/templates/_smtMemberFriendListBox.php
+++ b/apps/pc_frontend/modules/member/templates/_smtMemberFriendListBox.php
@@ -8,10 +8,24 @@
 <script type="text/javascript">
 $(function(){
   $.getJSON( openpne.apiBase + 'member/search.json?target=friend&target_id=<?php echo $member->getId() ?>&apiKey=' + openpne.apiKey, function(json) {
-    $('#friendListTemplate').tmpl(json.data).appendTo('#memberFriendList');
+    $result = $('#friendListTemplate').tmpl(json.data);
+    $('#memberFriendList').html($result);
     $('#memberFriendList').show();
     $('#memberFriendListLoading').hide();
   });
+  $('#memberFriendSearch').keyup(function(){
+    $('#memberFriendListLoading').show();
+    $('#memberFriendList').hide();
+    $('#memberFriendList').empty();
+    var keyword = $('#memberFriendSearch').val();
+    var requestData = { target: 'friend', target_id: <?php echo $member->getId(); ?>, keyword: keyword, apiKey: openpne.apiKey };
+    $.getJSON( openpne.apiBase + 'member/search.json', requestData, function(json) {
+      $result = $('#friendListTemplate').tmpl(json.data);
+      $('#memberFriendList').html($result);
+      $('#memberFriendList').show();
+      $('#memberFriendListLoading').hide();
+    });
+  });
 });
 </script>
 
@@ -20,6 +34,12 @@
   <div class="gadget_header span12"><?php echo __('%friend% List', array('%friend%' => $op_term['friend'])) ?></div>
 </div>
 <hr class="toumei" />
+<div class="row" id="memberFriendSearchBox">
+<div class="input-prepend span12">
+<span class="add-on"><i class="icon-search"></i></span>
+<input type="text" id="memberFriendSearch" class="realtime-searchbox" value="" />
+</div>
+</div> 
 <div class="row" id="memberFriendList">
 </div> 
 <div class="row" id="memberFriendListLoading" style="margin-left: 0; text-align: center;">
diff --git a/apps/pc_frontend/modules/member/templates/_smtMemberJoinCommunityListBox.php b/apps/pc_frontend/modules/member/templates/_smtMemberJoinCommunityListBox.php
index a682de2d0..e2a48b6ea 100644
--- a/apps/pc_frontend/modules/member/templates/_smtMemberJoinCommunityListBox.php
+++ b/apps/pc_frontend/modules/member/templates/_smtMemberJoinCommunityListBox.php
@@ -12,6 +12,19 @@
     $('#memberJoinCommunityList').show();
     $('#memberJoinCommunityListLoading').hide();
   });
+  $('#joinCommunitySearch').keyup(function(){
+    $('#memberJoinCommunityListLoading').show();
+    $('#memberJoinCommunityList').hide();
+    $('#memberKoinCommunityList').empty();
+    var keyword = $('#joinCommunitySearch').val();
+    var requestData = { member_id: <?php echo $member->getId(); ?>, keyword: keyword, apiKey: openpne.apiKey };
+    $.getJSON( openpne.apiBase + 'member/community.json', requestData, function(json) {
+      $result = $('#joinCommunityListTemplate').tmpl(json.data);
+      $('#memberJoinCommunityList').html($result);
+      $('#memberJoinCommunityList').show();
+      $('#memberJoinCommunityListLoading').hide();
+    });
+  });
 });
 </script>
 
@@ -20,6 +33,12 @@
   <div class="gadget_header span12"><?php echo __('%community% List', array('%community%' => $op_term['community'])) ?></div>
 </div>
 <hr class="toumei" />
+<div class="row" id="joinCommunitySearchBox">
+<div class="input-prepend span12">
+<span class="add-on"><i class="icon-search"></i></span>
+<input type="text" id="joinCommunitySearch" class="realtime-searchbox" value="" />
+</div>
+</div> 
 <div class="row hide" id="memberJoinCommunityList">
 </div>
 <div class="row" id="memberJoinCommunityListLoading" style="margin-left: 0; text-align: center;">
diff --git a/apps/pc_frontend/modules/member/templates/smtSearchSuccess.php b/apps/pc_frontend/modules/member/templates/smtSearchSuccess.php
new file mode 100644
index 000000000..15d6191fd
--- /dev/null
+++ b/apps/pc_frontend/modules/member/templates/smtSearchSuccess.php
@@ -0,0 +1,48 @@
+<?php use_helper('Javascript') ?>
+<script id="friendListTemplate" type="text/x-jquery-tmpl">
+  <div class="span3">
+    <div class="row_memberimg row"><div class="span3 center"><a href="${profile_url}"><img src="${profile_image}" class="rad10" width="57" height="57" /></a></div></div>
+    <div class="row_membername font10 row"><div class="span3 center"><a href="${profile_url}">${name}</a> (${friends_count})</div></div>
+  </div>
+</script>
+<script type="text/javascript">
+$(function(){
+  $.getJSON( openpne.apiBase + 'member/search.json?apiKey=' + openpne.apiKey, function(json) {
+    $result = $('#friendListTemplate').tmpl(json.data);
+    $('#memberFriendList').html($result);
+    $('#memberFriendList').show();
+    $('#memberFriendListLoading').hide();
+  });
+  $('#memberFriendSearch').keypress(function(){
+    $('#memberFriendListLoading').show();
+    $('#memberFriendList').hide();
+    $('#memberFriendList').empty();
+    var keyword = $('#memberFriendSearch').val();
+    var requestData = { keyword: keyword, apiKey: openpne.apiKey };
+    $.getJSON( openpne.apiBase + 'member/search.json', requestData, function(json) {
+      $result = $('#friendListTemplate').tmpl(json.data);
+      $('#memberFriendList').html($result);
+      $('#memberFriendList').show();
+      $('#memberFriendListLoading').hide();
+    });
+  });
+});
+</script>
+
+<hr class="toumei" />
+<div class="row">
+  <div class="gadget_header span12"><?php echo __('Search Members') ?></div>
+</div>
+<hr class="toumei" />
+<div class="row" id="memberFriendSearchBox">
+<div class="input-prepend span12">
+<span class="add-on"><i class="icon-search"></i></span>
+<input type="text" id="memberFriendSearch" class="realtime-searchbox" value="" />
+</div>
+</div>
+<div class="row" id="memberFriendList">
+</div>
+<div class="row" id="memberFriendListLoading" style="margin-left: 0; text-align: center;">
+<?php echo op_image_tag('ajax-loader.gif') ?>
+</div>
+

From 006638e5315938b72a05edd9692e82f203992846 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 4 Apr 2012 16:34:24 +0900
Subject: [PATCH 128/630] fixed falal error on smartphone community page when
 communiuty does not exist (fixes #2227)

---
 apps/pc_frontend/modules/community/actions/actions.class.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/pc_frontend/modules/community/actions/actions.class.php b/apps/pc_frontend/modules/community/actions/actions.class.php
index b242af744..8c7aac9b9 100644
--- a/apps/pc_frontend/modules/community/actions/actions.class.php
+++ b/apps/pc_frontend/modules/community/actions/actions.class.php
@@ -40,6 +40,8 @@ public function executeSmtHome(opWebRequest $request)
     $this->contentsGadgets = $gadgets['smartphoneCommunityContents'];
 
     $this->community = Doctrine::getTable('Community')->find($this->id);
+    $this->forward404Unless($this->community);
+
     $this->getResponse()->setDisplayCommunity($this->community);
 
     return sfView::SUCCESS;

From 5bd27b44b7212ec5f80fafc650c34b941e79ba1c Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 4 Apr 2012 16:46:36 +0900
Subject: [PATCH 129/630] add object parameter on op_doctrine event. (fixes
 #2916)

---
 lib/util/opDoctrineEventNotifier.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util/opDoctrineEventNotifier.class.php b/lib/util/opDoctrineEventNotifier.class.php
index 5ed8f03d9..50a78a092 100644
--- a/lib/util/opDoctrineEventNotifier.class.php
+++ b/lib/util/opDoctrineEventNotifier.class.php
@@ -25,7 +25,7 @@ protected static function notify($when, $action, $doctrineEvent)
     }
 
     $dispatcher = sfContext::getInstance()->getEventDispatcher();
-    $dispatcher->notify(new sfEvent(null, sprintf('op_doctrine.%s_%s_%s', $when, $action, get_class($doctrineEvent->getInvoker()))));
+    $dispatcher->notify(new sfEvent(null, sprintf('op_doctrine.%s_%s_%s', $when, $action, get_class($doctrineEvent->getInvoker())), array('object' => $doctrineEvent->getInvoker())));
   }
 
   public function preSave(Doctrine_Event $event)

From 5568e82d9832ef6628f4ed172f1e5ae55d31a2ed Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 4 Apr 2012 17:16:46 +0900
Subject: [PATCH 130/630] Revert "(refs #626) fixed not to show community to
 community member when user is a community member"

This reverts commit c9fea286397c46302ff92405ed6c63b26b03a682.
---
 lib/acl/opCommunityAclBuilder.class.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/acl/opCommunityAclBuilder.class.php b/lib/acl/opCommunityAclBuilder.class.php
index e54daacdd..449c2d7b6 100644
--- a/lib/acl/opCommunityAclBuilder.class.php
+++ b/lib/acl/opCommunityAclBuilder.class.php
@@ -57,10 +57,6 @@ static public function buildResource($resource, $targetMembers)
     {
       $acl->allow('alien', null, 'view');
     }
-    else if ('auth_commu_member' ===  $resource->getConfig('public_flag'))
-    {
-      $acl->allow('member', null, 'view');
-    }
     else
     {
       $event = new sfEvent(sfContext::getInstance(), 'op_acl.unknown_community_public_flag', array('public_flag' => $resource->getConfig('public_flag')));

From 731de86ddda5badbdf12fda14fc9314c267d3b05 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 4 Apr 2012 17:16:57 +0900
Subject: [PATCH 131/630] Revert "(refs #626) added untracked file"

This reverts commit 63682026ee0149dd75c9ec3b763ef79c4f418b21.
---
 lib/acl/opCommunityAclBuilder.class.php | 92 -------------------------
 1 file changed, 92 deletions(-)
 delete mode 100644 lib/acl/opCommunityAclBuilder.class.php

diff --git a/lib/acl/opCommunityAclBuilder.class.php b/lib/acl/opCommunityAclBuilder.class.php
deleted file mode 100644
index 449c2d7b6..000000000
--- a/lib/acl/opCommunityAclBuilder.class.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * opCommunityTopicAclBuilder
- *
- * @package    OpenPNE
- * @subpackage acl
- * @author     Eitarow Fukamachi <fukamachi@tejimaya.net>
- */
-class opCommunityAclBuilder extends opAclBuilder
-{
-  static protected
-    $resource = array();
-
-  static public function clearCache()
-  {
-    self::$resource = array();
-  }
-
-  static public function getAcl()
-  {
-    $acl = new Zend_Acl();
-    $acl->addRole(new Zend_Acl_Role('alien'));
-    $acl->addRole(new Zend_Acl_Role('guest'), 'alien');
-    $acl->addRole(new Zend_Acl_Role('member'), 'guest');
-    $acl->addRole(new Zend_Acl_Role('subadmin'), 'member');
-    $acl->addRole(new Zend_Acl_Role('admin'), 'subadmin');
-
-    $acl->allow('subadmin', null, 'edit');
-    $acl->allow('subadmin', null, 'delete');
-
-    return $acl;
-  }
-
-  static public function buildResource($resource, $targetMembers)
-  {
-    if (isset(self::$resource[$resource->getId()]))
-    {
-      return self::$resource[$resource->getId()];
-    }
-
-    $acl = self::getAcl();
-
-    if ('public' === $resource->getConfig('public_flag'))
-    {
-      $acl->allow('guest', null, 'view');
-    }
-    else if ('open' === $resource->getConfig('public_flag'))
-    {
-      $acl->allow('alien', null, 'view');
-    }
-    else
-    {
-      $event = new sfEvent(sfContext::getInstance(), 'op_acl.unknown_community_public_flag', array('public_flag' => $resource->getConfig('public_flag')));
-      sfContext::getInstance()->getEventDispatcher()->filter($event, $acl);
-      $acl = $event->getReturnValue();
-    }
-
-    foreach ($targetMembers as $member)
-    {
-      if ($member)
-      {
-        $role = new Zend_Acl_Role($member->getId());
-        if ($resource->isAdmin($member->getId()))
-        {
-          $acl->addRole($role, 'admin');
-        }
-        else if ($resource->isPrivilegeBelong($member->getId()))
-        {
-          $acl->addRole($role, 'member');
-        }
-        else
-        {
-          $acl->addRole($role, 'guest');
-        }
-      }
-    }
-
-    self::$resource[$resource->getId()] = $acl;
-
-    return $acl;
-  }
-}
-

From 7cd03243b5b83559ce1c8bdd5d0f034b2da96ef7 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 4 Apr 2012 17:21:20 +0900
Subject: [PATCH 132/630] Revert "(refs #626) reflected
 http://github.com/fukamachi/OpenPNE3/tree/open-community"

This reverts commit 80e214e47e3cc8007a4a6d11c5d5372fc2d7032a.

Conflicts:

	lib/action/opCommunityAction.class.php
	test/functional/pc_frontend/communityActionsTest.php
---
 apps/mobile_frontend/i18n/messages.ja.xml     |   8 -
 .../modules/community/config/security.yml     |   7 -
 apps/pc_frontend/i18n/messages.ja.xml         |   8 -
 .../modules/community/config/security.yml     |   7 -
 lib/action/opCommunityAction.class.php        |  26 +--
 lib/config/config/community_config.yml        |  11 -
 lib/routing/opDynamicAclRoute.class.php       |   5 -
 lib/util/opToolkit.class.php                  |   9 -
 test/fixtures/common/test_data.yml            |  37 ---
 .../pc_frontend/communityActionsTest.php      | 221 +-----------------
 10 files changed, 13 insertions(+), 326 deletions(-)

diff --git a/apps/mobile_frontend/i18n/messages.ja.xml b/apps/mobile_frontend/i18n/messages.ja.xml
index 363d0a99b..2a8f0c631 100644
--- a/apps/mobile_frontend/i18n/messages.ja.xml
+++ b/apps/mobile_frontend/i18n/messages.ja.xml
@@ -162,14 +162,6 @@
         <source>%Community% Members</source>
         <target>%Community%ﾒﾝﾊﾞｰ</target>
       </trans-unit>
-      <trans-unit id="">
-        <source>Everyone can see</source>
-        <target>Web全体に公開</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Only SNS members can see</source>
-        <target>SNS参加者のみ公開</target>
-      </trans-unit>
       <trans-unit>
         <source>Everyone can join</source>
         <target>誰でも参加できる</target>
diff --git a/apps/mobile_frontend/modules/community/config/security.yml b/apps/mobile_frontend/modules/community/config/security.yml
index 4e641023f..d92f54d55 100644
--- a/apps/mobile_frontend/modules/community/config/security.yml
+++ b/apps/mobile_frontend/modules/community/config/security.yml
@@ -1,10 +1,3 @@
 all:
   is_secure: true
   credentials: SNSMember
-
-home:
-  is_secure: false
-
-memberList:
-  is_secure: false
-
diff --git a/apps/pc_frontend/i18n/messages.ja.xml b/apps/pc_frontend/i18n/messages.ja.xml
index f89a9c659..498a6c06e 100644
--- a/apps/pc_frontend/i18n/messages.ja.xml
+++ b/apps/pc_frontend/i18n/messages.ja.xml
@@ -598,14 +598,6 @@
         <source>Remove the current photo</source>
         <target>この写真を削除する</target>
       </trans-unit>
-      <trans-unit id="">
-        <source>Everyone can see</source>
-        <target>Web全体に公開</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Only SNS members can see</source>
-        <target>SNS参加者のみ公開</target>
-      </trans-unit>
       <trans-unit id="">
         <source>Everyone can join</source>
         <target>誰でも参加可能</target>
diff --git a/apps/pc_frontend/modules/community/config/security.yml b/apps/pc_frontend/modules/community/config/security.yml
index 4e641023f..d92f54d55 100644
--- a/apps/pc_frontend/modules/community/config/security.yml
+++ b/apps/pc_frontend/modules/community/config/security.yml
@@ -1,10 +1,3 @@
 all:
   is_secure: true
   credentials: SNSMember
-
-home:
-  is_secure: false
-
-memberList:
-  is_secure: false
-
diff --git a/lib/action/opCommunityAction.class.php b/lib/action/opCommunityAction.class.php
index 426da8b03..c71e49d30 100644
--- a/lib/action/opCommunityAction.class.php
+++ b/lib/action/opCommunityAction.class.php
@@ -17,11 +17,6 @@
  */
 abstract class opCommunityAction extends sfActions
 {
-  static protected function getAcl($community, $member = null)
-  {
-    return opCommunityAclBuilder::buildResource($community, array($member));
-  }
-
   public function preExecute()
   {
     $this->id = $this->getRequestParameter('id');
@@ -33,16 +28,6 @@ public function preExecute()
     $this->isSubAdmin = Doctrine::getTable('CommunityMember')->isSubAdmin($memberId, $this->id);
     $this->isEditCommunity = $this->isAdmin || $this->isSubAdmin;
     $this->isDeleteCommunity = $this->isAdmin;
-
-    $this->role = $memberId ? $memberId : 'alien';
-  }
-
-  public function postExecute()
-  {
-    if ($this->getUser()->getMember())
-    {
-      opToolkit::setIsSecure($this);
-    }
   }
 
  /**
@@ -54,8 +39,6 @@ public function executeHome($request)
   {
     $this->community = Doctrine::getTable('Community')->find($this->id);
     $this->forward404Unless($this->community, 'Undefined community.');
-    $acl = self::getAcl($this->community, $this->getUser()->getMember());
-    $this->forward404Unless($acl->isAllowed($this->role, null, 'view'));
     $this->communityAdmin = $this->community->getAdminMember();
     $this->communitySubAdmins = $this->community->getSubAdminMembers();
 
@@ -76,7 +59,6 @@ public function executeEdit($request)
     $this->forward404If($this->id && !$this->isEditCommunity);
 
     $this->community = Doctrine::getTable('Community')->find($this->id);
-
     if (!$this->community)
     {
       $this->community = new Community();
@@ -151,17 +133,16 @@ public function executeSearch($request)
   public function executeDelete($request)
   {
     $this->forward404If($this->id && !$this->isDeleteCommunity);
-    $this->community = Doctrine::getTable('Community')->find($this->id);
 
     if ($request->isMethod('post'))
     {
       if($request->hasParameter('is_delete'))
       {
         $request->checkCSRFProtection();
-
-        if ($this->community)
+        $community = Doctrine::getTable('Community')->find($this->id);
+        if ($community)
         {
-          $this->community->delete();
+          $community->delete();
         }
         $this->redirect('community/search');
       }
@@ -170,6 +151,7 @@ public function executeDelete($request)
         $this->redirect('@community_home?id=' . $this->id);
       }
     }
+    $this->community = Doctrine::getTable('Community')->find($this->id);
   }
 
  /**
diff --git a/lib/config/config/community_config.yml b/lib/config/config/community_config.yml
index 1c5548a55..030c2f252 100644
--- a/lib/config/config/community_config.yml
+++ b/lib/config/config/community_config.yml
@@ -1,15 +1,4 @@
 general:
-  public_flag:
-    Name: "public_flag"
-    Caption: "Authority to See Community"
-    FormType: "radio"
-    ValueType: "string"
-    IsUnique: false
-    IsRequired: true
-    Default: "public"
-    Choices:
-      public: "Only SNS members can see"
-      open: "Everyone can see"
   register_policy:
     Name:       "register_policy"
     Caption:    "Register policy"
diff --git a/lib/routing/opDynamicAclRoute.class.php b/lib/routing/opDynamicAclRoute.class.php
index 3b8cfaf1d..366a36742 100644
--- a/lib/routing/opDynamicAclRoute.class.php
+++ b/lib/routing/opDynamicAclRoute.class.php
@@ -29,11 +29,6 @@ public function getObject()
   {
     $result = parent::getObject();
 
-    if (!$role = $this->getCurrentMemberId())
-    {
-      $role = 'alien';
-    }
-
     if ($result instanceof opAccessControlRecordInterface)
     {
       if (!$result->isAllowed($this->getCurrentMember(), $this->options['privilege']))
diff --git a/lib/util/opToolkit.class.php b/lib/util/opToolkit.class.php
index 614e12624..61fb77134 100644
--- a/lib/util/opToolkit.class.php
+++ b/lib/util/opToolkit.class.php
@@ -383,15 +383,6 @@ public static function isSecurePage()
     return true;
   }
 
-  public static function setIsSecure($action)
-  {
-    $security = $action->getSecurityConfiguration();
-
-    $security[$action->getActionName()]['is_secure'] = true;
-
-    $action->setSecurityConfiguration($security);
-  }
-
   public static function clearCache()
   {
     $filesystem = new sfFilesystem();
diff --git a/test/fixtures/common/test_data.yml b/test/fixtures/common/test_data.yml
index 40985f5fb..9ab4805bb 100644
--- a/test/fixtures/common/test_data.yml
+++ b/test/fixtures/common/test_data.yml
@@ -369,26 +369,6 @@ MemberConfig:
     value: "sns2@example.com"
     Member: third_member
 
-  fourth_member_pc_address:
-    name: "pc_address"
-    value: "sns4@example.com"
-    Member: fourth_member
-
-  fourth_member_password:
-    name: "password"
-    value: <?php echo md5('password') . "\n"; ?>
-    Member: fourth_member
-
-  fifth_member_pc_address:
-    name: "pc_address"
-    value: "sns5@example.com"
-    Member: fifth_member
-
-  fifth_member_password:
-    name: "password"
-    value: <?php echo md5('password') . "\n"; ?>
-    Member: fifth_member
-
 AdminUser:
   first_admin:
     id: ~
@@ -525,18 +505,10 @@ CommunityConfig:
     Community: community_2
     name: "register_policy"
     value: "close"
-  community_2_public_flag:
-    Community: community_2
-    name: "public_flag"
-    value: "public"
   community_3_is_default:
     Community: community_3
     name: "is_default"
     value: true
-  community_3_public_flag:
-    Community: community_3
-    name: "public_flag"
-    value: "open"
 
 CommunityMember:
   community_1_first_member:
@@ -545,24 +517,15 @@ CommunityMember:
   community_1_second_member:
     Community: community_1
     Member: second_member
-  community_1_fourth_member:
-    Community: community_1
-    Member: fourth_member
   community_2_second_member:
     Community: community_2
     Member: second_member
-  community_2_fourth_member:
-    Community: community_2
-    Member: fourth_member
   community_3_first_member:
     Community: community_3
     Member: first_member
   Community_3_second_member:
     Community: community_3
     Member: second_member
-  community_3_fourth_member:
-    Community: community_3
-    Member: fourth_member
   community_4_first_member:
     Community: community_4
     Member: first_member
diff --git a/test/functional/pc_frontend/communityActionsTest.php b/test/functional/pc_frontend/communityActionsTest.php
index 1216f7edf..d6aab41e4 100644
--- a/test/functional/pc_frontend/communityActionsTest.php
+++ b/test/functional/pc_frontend/communityActionsTest.php
@@ -1,215 +1,12 @@
 <?php 
 include(dirname(__FILE__).'/../../bootstrap/functional.php');
 
-$user = new opTestFunctional(new opBrowser(), new lime_test(null));
-$user
-->info('1. Testing alien')
-->info('public_flag: public')
-->get('/community/2')
-  ->info('1-1. Alien cannot access the community home')
-  ->with('request')->begin()
-    ->isParameter('module', 'community')
-    ->isParameter('action', 'home')
-  ->end()
-  ->with('response')->begin()
-    ->isStatusCode(404)
-  ->end()
-->info('public_flag: open')
-->get('/community/3')
-  ->info('1-2. Alien can access the community home')
-  ->with('request')->begin()
-    ->isParameter('module', 'community')
-    ->isParameter('action', 'home')
-  ->end()
-  ->with('response')->isStatusCode(200)
-;
-
-opCommunityAclBuilder::clearCache();
-if (class_exists('opCommunityTopicAclBuilder'))
-{
-  opCommunityTopicAclBuilder::clearCache();
-}
-$user->login('sns4@example.com', 'password');
-$user
-->info('2. Testing Community Member')
-->info('public_flag: public')
-->get('/community/2')
-  ->info('2-1. Community Member can access the community home')
-  ->with('request')->begin()
-    ->isParameter('module', 'community')
-    ->isParameter('action', 'home')
-  ->end()
-  ->with('response')->isStatusCode(200)
-->info('public_flag: open')
-->get('/community/3')
-  ->info('2-2. Community Member can access the community home')
-  ->with('request')->begin()
-    ->isParameter('module', 'community')
-    ->isParameter('action', 'home')
-  ->end()
-  ->with('response')->isStatusCode(200)
-;
-
-opCommunityAclBuilder::clearCache();
-if (class_exists('opCommunityTopicAclBuilder'))
-{
-  opCommunityTopicAclBuilder::clearCache();
-}
-$user->login('sns5@example.com', 'password');
-$user
-->info('3. Testing SNS Member')
-->info('public_flag: public')
-->get('/community/2')
-  ->info('3-1. SNS Member can access the community home')
-  ->with('request')->begin()
-    ->isParameter('module', 'community')
-    ->isParameter('action', 'home')
-  ->end()
-  ->with('response')->isStatusCode(200)
-->info('public_flag: open')
-->get('/community/3')
-  ->info('3-2. SNS Member can access the community home')
-  ->with('request')->begin()
-    ->isParameter('module', 'community')
-    ->isParameter('action', 'home')
-  ->end()
-  ->with('response')->isStatusCode(200)
-;
-
-$user->login('sns@example.com', 'password');
-$user
-  ->info('community/search')
-  ->get('/community/search')
-  ->with('html_escape')->begin()
-    ->isAllEscapedData('CommunityCategory', 'name')
-    ->isAllEscapedData('Community', 'name')
-    ->countEscapedData(1, 'CommunityConfig', 'value', array(
-      'width' => 36,
-      'rows'  => 3,
-    ))
-  ->end()
-
-// CSRF
-  ->info('/community/edit - CSRF')
-  ->post('/community/edit')
-  ->checkCSRF()
-
-  ->info('/config/communityTopicNotificationMail/1 - CSRF')
-  ->post('/config/communityTopicNotificationMail/1', array('topic_notify' => array()))
-  ->followRedirect()
-  ->checkCSRF()
-
-  ->info('/community/dropMember/id/1/member_id/2 - CSRF')
-  ->post('/community/dropMember/id/1/member_id/2')
-  ->checkCSRF()
-
-  ->info('/community/subAdminRequest/id/1/member_id/2 - CSRF')
-  ->post('/community/subAdminRequest/id/1/member_id/2', array('admin_request' => array()))
-  ->checkCSRF()
-
-  ->info('/community/removeSubAdmin/id/5/member_id/2 - CSRF')
-  ->post('/community/removeSubAdmin/id/5/member_id/2')
-  ->checkCSRF()
-
-  ->info('/community/changeAdminRequest/id/1/member_id/2 - CSRF')
-  ->post('/community/changeAdminRequest/id/1/member_id/2', array('admin_request' => array()))
-  ->checkCSRF()
-
-  ->info('community/delete/1 - CSRF')
-  ->post('community/delete/1', array('is_delete' => 1))
-  ->checkCSRF()
-
-  ->login('sns2@example.com', 'password')
-  ->info('/community/quit?id=1 - CSRF')
-  ->post('/community/quit?id=1')
-  ->checkCSRF()
-
-  ->login('sns3@example.com', 'password')
-  ->info('/community/join?id=1 - CSRF')
-  ->post('/community/join?id=1', array('community_join' => array()))
-  ->checkCSRF()
-
-// XSS
-  ->login('html1@example.com', 'password')
-
-  ->info('/member/home - XSS')
-  ->get('/member/home')
-  ->with('html_escape')->begin()
-    ->isAllEscapedData('Community', 'name')
-  ->end()
-
-  ->info('/community/changeAdminRequest/id/1055/member_id/1056 - XSS')
-  ->get('/community/changeAdminRequest/id/1055/member_id/1056')
-  ->with('html_escape')->begin()
-    ->isAllEscapedData('Member', 'name')
-    ->isAllEscapedData('Community', 'name')
-  ->end()
-
-  ->info('/community/changeAdminRequest/id/1055/member_id/1056 - XSS')
-  ->get('/community/changeAdminRequest/id/1055/member_id/1056')
-  ->with('html_escape')->begin()
-    ->isAllEscapedData('Member', 'name')
-    ->isAllEscapedData('Community', 'name')
-  ->end()
-
-  ->info('/community/dropMember/id/1055/member_id/1056 - XSS')
-  ->get('/community/dropMember/id/1055/member_id/1056')
-  ->with('html_escape')->begin()
-    ->isAllEscapedData('Member', 'name')
-  ->end()
-
-  ->info('/community/joinlist - XSS')
-  ->get('/community/joinlist')
-  ->with('html_escape')->begin()
-    ->isAllEscapedData('Community', 'name')
-  ->end()
-
-  ->info('/community/memberList/id/1055 - XSS')
-  ->get('/community/memberList/id/1055')
-  ->with('html_escape')->begin()
-    ->isAllEscapedData('Member', 'name')
-  ->end()
-
-  ->info('/community/memberManage/id/1055 - XSS')
-  ->get('/community/memberManage/id/1055')
-  ->with('html_escape')->begin()
-    ->isAllEscapedData('Member', 'name')
-  ->end()
-
-  ->info('/community/search - XSS')
-  ->get('/community/search', array('community' => array('name' => 'Community.name')))
-  ->with('html_escape')->begin()
-    ->isAllEscapedData('Community', 'name')
-    ->countEscapedData(1, 'CommunityConfig', 'value', array('width' => 36))
-  ->end()
-
-  ->info('/community/removeSubAdmin/id/1056/member_id/1056 - XSS')
-  ->get('/community/removeSubAdmin/id/1056/member_id/1056')
-  ->with('html_escape')->begin()
-    ->isAllEscapedData('Member', 'name')
-  ->end()
-
-  ->info('/community/1055 - XSS')
-  ->get('/community/1055')
-  ->with('html_escape')->begin()
-    ->isAllEscapedData('Member', 'name')
-    ->isAllEscapedData('Community', 'name')
-    ->countEscapedData(1, 'CommunityConfig', 'value', array('width' => 36))
-  ->end()
-
-  ->login('html2@example.com', 'password')
-
-  ->info('/community/quit/id/1055 - XSS')
-  ->get('/community/quit/id/1055')
-  ->with('html_escape')->begin()
-    ->isAllEscapedData('Community', 'name')
-  ->end()
-
-  ->login('sns@example.com', 'password')
-
-  ->info('/community/join?id=1055 - XSS')
-  ->get('/community/join?id=1055')
-  ->with('html_escape')->begin()
-    ->isAllEscapedData('Community', 'name')
-  ->end()
-;
+// create a new test browser
+$browser = new sfTestBrowser();
+
+$browser->
+  get('/community/index')->
+  isStatusCode(200)->
+  isRequestParameter('module', 'community')->
+  isRequestParameter('action', 'index')->
+  checkResponseElement('body', '!/This is a temporary page/');

From 8ac00d5cf76359adad298b33237f1616ab3f1a02 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 4 Apr 2012 18:08:31 +0900
Subject: [PATCH 133/630] changed javascript event on member and community
 realtime search page. (fixes #2227)

---
 .../community/templates/_smtCommunityMemberJoinListBox.php    | 4 +++-
 .../modules/community/templates/smtSearchSuccess.php          | 4 +++-
 .../modules/member/templates/_smtMemberFriendListBox.php      | 4 +++-
 .../member/templates/_smtMemberJoinCommunityListBox.php       | 4 +++-
 .../pc_frontend/modules/member/templates/smtSearchSuccess.php | 2 ++
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/apps/pc_frontend/modules/community/templates/_smtCommunityMemberJoinListBox.php b/apps/pc_frontend/modules/community/templates/_smtCommunityMemberJoinListBox.php
index f50e6a4ab..a785392c3 100644
--- a/apps/pc_frontend/modules/community/templates/_smtCommunityMemberJoinListBox.php
+++ b/apps/pc_frontend/modules/community/templates/_smtCommunityMemberJoinListBox.php
@@ -12,10 +12,12 @@
     $('#communityMemberJoinList').show();
     $('#communityMemberJoinListLoading').hide();
   });
-  $('#communityMemberJoinListSearch').keyup(function(){
+  $('#communityMemberJoinListSearch').keypress(function(){
     $('#communityMemberJoinListLoading').show();
     $('#communityMemberJoinList').hide();
     $('#communityMemberJoinList').empty();
+  });
+  $('#communityMemberJoinListSearch').blur(function(){
     var keyword = $('#communityMemberJoinListSearch').val();
     var requestData = { target: 'community', target_id: <?php echo $community->getId(); ?>, keyword: keyword, apiKey: openpne.apiKey };
     $.getJSON( openpne.apiBase + 'member/search.json', requestData, function(json) {
diff --git a/apps/pc_frontend/modules/community/templates/smtSearchSuccess.php b/apps/pc_frontend/modules/community/templates/smtSearchSuccess.php
index 765248a95..104a907d2 100644
--- a/apps/pc_frontend/modules/community/templates/smtSearchSuccess.php
+++ b/apps/pc_frontend/modules/community/templates/smtSearchSuccess.php
@@ -15,7 +15,9 @@
   $('#joinCommunitySearch').keypress(function(){
     $('#memberJoinCommunityListLoading').show();
     $('#memberJoinCommunityList').hide();
-    $('#memberKoinCommunityList').empty();
+    $('#memberJoinCommunityList').empty();
+  });
+  $('#joinCommunitySearch').blur(function(){
     var keyword = $('#joinCommunitySearch').val();
     var requestData = { keyword: keyword, apiKey: openpne.apiKey };
     $.getJSON( openpne.apiBase + 'member/community.json', requestData, function(json) {
diff --git a/apps/pc_frontend/modules/member/templates/_smtMemberFriendListBox.php b/apps/pc_frontend/modules/member/templates/_smtMemberFriendListBox.php
index a737adfe8..130e23b9b 100644
--- a/apps/pc_frontend/modules/member/templates/_smtMemberFriendListBox.php
+++ b/apps/pc_frontend/modules/member/templates/_smtMemberFriendListBox.php
@@ -13,10 +13,12 @@
     $('#memberFriendList').show();
     $('#memberFriendListLoading').hide();
   });
-  $('#memberFriendSearch').keyup(function(){
+  $('#memberFriendSearch').keypress(function(){
     $('#memberFriendListLoading').show();
     $('#memberFriendList').hide();
     $('#memberFriendList').empty();
+  });
+  $('#memberFriendSearch').blur(function(){
     var keyword = $('#memberFriendSearch').val();
     var requestData = { target: 'friend', target_id: <?php echo $member->getId(); ?>, keyword: keyword, apiKey: openpne.apiKey };
     $.getJSON( openpne.apiBase + 'member/search.json', requestData, function(json) {
diff --git a/apps/pc_frontend/modules/member/templates/_smtMemberJoinCommunityListBox.php b/apps/pc_frontend/modules/member/templates/_smtMemberJoinCommunityListBox.php
index e2a48b6ea..386b1fea0 100644
--- a/apps/pc_frontend/modules/member/templates/_smtMemberJoinCommunityListBox.php
+++ b/apps/pc_frontend/modules/member/templates/_smtMemberJoinCommunityListBox.php
@@ -12,10 +12,12 @@
     $('#memberJoinCommunityList').show();
     $('#memberJoinCommunityListLoading').hide();
   });
-  $('#joinCommunitySearch').keyup(function(){
+  $('#joinCommunitySearch').keypress(function(){
     $('#memberJoinCommunityListLoading').show();
     $('#memberJoinCommunityList').hide();
     $('#memberKoinCommunityList').empty();
+  });
+  $('#joinCommunitySearch').blur(function(){
     var keyword = $('#joinCommunitySearch').val();
     var requestData = { member_id: <?php echo $member->getId(); ?>, keyword: keyword, apiKey: openpne.apiKey };
     $.getJSON( openpne.apiBase + 'member/community.json', requestData, function(json) {
diff --git a/apps/pc_frontend/modules/member/templates/smtSearchSuccess.php b/apps/pc_frontend/modules/member/templates/smtSearchSuccess.php
index 15d6191fd..08c84be9a 100644
--- a/apps/pc_frontend/modules/member/templates/smtSearchSuccess.php
+++ b/apps/pc_frontend/modules/member/templates/smtSearchSuccess.php
@@ -17,6 +17,8 @@
     $('#memberFriendListLoading').show();
     $('#memberFriendList').hide();
     $('#memberFriendList').empty();
+  });
+  $('#memberFriendSearch').blur(function(){
     var keyword = $('#memberFriendSearch').val();
     var requestData = { keyword: keyword, apiKey: openpne.apiKey };
     $.getJSON( openpne.apiBase + 'member/search.json', requestData, function(json) {

From 0032525de61519a766e531f446d69df38aadc2d1 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 5 Apr 2012 13:37:11 +0900
Subject: [PATCH 134/630] fixed to leave community when member is joined
 community (fixes #2698)

---
 apps/api/modules/community/actions/actions.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/api/modules/community/actions/actions.class.php b/apps/api/modules/community/actions/actions.class.php
index e40de9bd3..a4cea8bfa 100644
--- a/apps/api/modules/community/actions/actions.class.php
+++ b/apps/api/modules/community/actions/actions.class.php
@@ -82,7 +82,7 @@ public function executeJoin(sfWebRequest $request)
     $communityJoinPolicy = $community->getConfig('register_policy');
 
     $communityMember = Doctrine::getTable('CommunityMember')
-      ->retrieveByMemberIdAndCommunityId($viewMemberId, $community->getId());
+      ->retrieveByMemberIdAndCommunityId($memberId, $community->getId());
 
     if ($request['leave'])
     {

From 073942944fdf3b9cdc65a5ab44c8a0f1c6c05cc5 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 5 Apr 2012 13:38:43 +0900
Subject: [PATCH 135/630] fixed to search for all community. (fixes #2227)

---
 .../modules/community/templates/smtSearchSuccess.php          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/pc_frontend/modules/community/templates/smtSearchSuccess.php b/apps/pc_frontend/modules/community/templates/smtSearchSuccess.php
index 104a907d2..cdb200007 100644
--- a/apps/pc_frontend/modules/community/templates/smtSearchSuccess.php
+++ b/apps/pc_frontend/modules/community/templates/smtSearchSuccess.php
@@ -7,7 +7,7 @@
 </script>
 <script type="text/javascript">
 $(function(){
-  $.getJSON( openpne.apiBase + 'member/community.json?apiKey=' + openpne.apiKey, function(json) {
+  $.getJSON( openpne.apiBase + 'community/search.json?apiKey=' + openpne.apiKey, function(json) {
     $('#joinCommunityListTemplate').tmpl(json.data).appendTo('#memberJoinCommunityList');
     $('#memberJoinCommunityList').show();
     $('#memberJoinCommunityListLoading').hide();
@@ -20,7 +20,7 @@
   $('#joinCommunitySearch').blur(function(){
     var keyword = $('#joinCommunitySearch').val();
     var requestData = { keyword: keyword, apiKey: openpne.apiKey };
-    $.getJSON( openpne.apiBase + 'member/community.json', requestData, function(json) {
+    $.getJSON( openpne.apiBase + 'community/search.json', requestData, function(json) {
       $result = $('#joinCommunityListTemplate').tmpl(json.data);
       $('#memberJoinCommunityList').html($result);
       $('#memberJoinCommunityList').show();

From cee224f5d8f3f3cd8cd59ef36ac22c4311436875 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 5 Apr 2012 13:39:39 +0900
Subject: [PATCH 136/630] fixed table style on smartphone community info
 template. (fixes #2227)

---
 .../modules/community/templates/_smtCommunityListBox.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php b/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php
index 6d16b46be..99741ed09 100644
--- a/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php
+++ b/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php
@@ -9,7 +9,7 @@
   </div>
 </div>
 <div class="row">
-<table class="table-striped">
+<table class="table table-striped span12">
 <tbody>
 <tr>
   <td><?php echo __('Date Created') ?></td>

From 3f0e88c0a260461b189e61215e6ec7fb9090747e Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 5 Apr 2012 13:48:44 +0900
Subject: [PATCH 137/630] removed community deletable implements on smartphone
 (fixes #2227)

---
 .../modules/community/templates/smtEditSuccess.php     | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/apps/pc_frontend/modules/community/templates/smtEditSuccess.php b/apps/pc_frontend/modules/community/templates/smtEditSuccess.php
index 9314785e4..306e5211b 100644
--- a/apps/pc_frontend/modules/community/templates/smtEditSuccess.php
+++ b/apps/pc_frontend/modules/community/templates/smtEditSuccess.php
@@ -84,21 +84,13 @@
 </div>
 
 <div class="row">
-<div class="span5">
+<div class="span12">
 <input type="submit" name="submit" value="<?php echo __('Send') ?>" class="btn btn-primary" />
 <?php echo $communityForm->renderHiddenFields(); ?>
 <?php echo $communityConfigForm->renderHiddenFields(); ?>
 <?php echo $communityFileForm->renderHiddenFields(); ?>
 </form>
 </div>
-
-<div class="span5">
-  <?php if (!$communityForm->isNew() && $isDeleteCommunity): ?>
-  <?php echo form_tag(url_for('@community_delete?id='.$community->getId())) ?>
-  <span class="label label-important">DANGER</span>: <input type="submit" name="submit" value="<?php echo __('Delete'); ?>" class="btn btn-danger" />
-  </form>
-  <?php endif; ?>
-</div>
 </div>
 
 </div>

From b0e45e10174b158c82ab5b7242b8aabdf58ca4a2 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 5 Apr 2012 14:00:28 +0900
Subject: [PATCH 138/630] modified community edit submit button style on
 smartphone (refs #2227)

---
 apps/pc_frontend/modules/community/templates/smtEditSuccess.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/pc_frontend/modules/community/templates/smtEditSuccess.php b/apps/pc_frontend/modules/community/templates/smtEditSuccess.php
index 306e5211b..aa22f4ef1 100644
--- a/apps/pc_frontend/modules/community/templates/smtEditSuccess.php
+++ b/apps/pc_frontend/modules/community/templates/smtEditSuccess.php
@@ -84,7 +84,7 @@
 </div>
 
 <div class="row">
-<div class="span12">
+<div class="span12 center">
 <input type="submit" name="submit" value="<?php echo __('Send') ?>" class="btn btn-primary" />
 <?php echo $communityForm->renderHiddenFields(); ?>
 <?php echo $communityConfigForm->renderHiddenFields(); ?>

From 54a5a24de9b7113e7ed8e7d7bf19a82f5cda66d3 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 5 Apr 2012 14:36:15 +0900
Subject: [PATCH 139/630] fixed valiable type in sfImageHandlerPlugin (fixes
 #2890)

---
 .../lib/image/generator/sfImageGeneratorImageTransform.php    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php b/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php
index b9fab745e..630c972c0 100644
--- a/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php
+++ b/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php
@@ -60,7 +60,7 @@ protected function doResize($tmpfilename)
     $srcHeight = $this->transform->getImageHeight();
     if ($srcWidth > $srcHeight)
     {
-      $srcX = ceil(($srcWidth - $srcHeight) / 2);
+      $srcX = (int)ceil(($srcWidth - $srcHeight) / 2);
       $srcY = 0;
       $srcW = $srcHeight;
       $srcH = $srcHeight;
@@ -68,7 +68,7 @@ protected function doResize($tmpfilename)
     else
     {
       $srcX = 0;
-      $srcY = ceil(($srcHeight - $srcWidth) / 2);
+      $srcY = (int)ceil(($srcHeight - $srcWidth) / 2);
       $srcW = $srcWidth;
       $srcH = $srcWidth;
     }

From 1634e32acb972b01eaa86850e1c8037c61ba2bce Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 5 Apr 2012 16:22:30 +0900
Subject: [PATCH 140/630] modified to use nl2br function in smartphone
 community description (refs #2227)

---
 .../modules/community/templates/_smtCommunityListBox.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php b/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php
index 99741ed09..211f4131a 100644
--- a/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php
+++ b/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php
@@ -48,7 +48,7 @@
 </tr>
 <tr>
   <td><?php echo __('%community% Description', array('%community%' => $op_term['community']->titleize()), 'form_community') ?></td>
-  <td><?php echo $community->getConfig('description'); ?></td>
+  <td><?php echo nl2br($community->getConfig('description')) ?></td>
 </tr>
 <tr>
   <td></td>

From b04f9759e18ccc320b5272bb0f82c4f72ca81aaa Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 5 Apr 2012 16:27:59 +0900
Subject: [PATCH 141/630] modified to load util.js on all page because
 smartphone switch implement requires util.js (refs #2227)

---
 apps/pc_frontend/config/view.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/pc_frontend/config/view.yml b/apps/pc_frontend/config/view.yml
index 2a98916c7..86198fc3b 100644
--- a/apps/pc_frontend/config/view.yml
+++ b/apps/pc_frontend/config/view.yml
@@ -11,7 +11,7 @@ default:
 
   stylesheets:    []
 
-  javascripts:    []
+  javascripts:    ['util.js']
 
   has_layout:     true
   layout:         layoutC

From 8f491ca79d9b37b001149b9ce76a6f90604c3248 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 5 Apr 2012 16:56:17 +0900
Subject: [PATCH 142/630] Revert "add translate catalogs for 'Public flag' and
 'More'. (fixes #2912)"

This reverts commit 145e68f520cb19dedd0735f180ab27c8db787ab6.
---
 apps/pc_frontend/i18n/messages.ja.xml |  4 ----
 i18n/messages.ja.xml                  | 16 ----------------
 2 files changed, 20 deletions(-)

diff --git a/apps/pc_frontend/i18n/messages.ja.xml b/apps/pc_frontend/i18n/messages.ja.xml
index 498a6c06e..8d2cdefb4 100644
--- a/apps/pc_frontend/i18n/messages.ja.xml
+++ b/apps/pc_frontend/i18n/messages.ja.xml
@@ -382,10 +382,6 @@
         <source>Delete</source>
         <target>削除</target>
       </trans-unit>
-      <trans-unit id="">
-        <source>More</source>
-        <target>もっと見る</target>
-      </trans-unit>
       <trans-unit id="">
         <source>You can upload 3 photos.</source>
         <target>写真は最大3枚までアップロードできます。</target>
diff --git a/i18n/messages.ja.xml b/i18n/messages.ja.xml
index ec5f82acd..c5f559ec8 100644
--- a/i18n/messages.ja.xml
+++ b/i18n/messages.ja.xml
@@ -134,22 +134,6 @@
         <source>Couldn't send E-mail. Please retry or contact to administrator.</source>
         <target>メールの送信に失敗しました。もう一度実行するか管理者に連絡して下さい。</target>
       </trans-unit>
-      <trans-unit id="">
-        <source>The inputted value is already exist.</source>
-        <target>すでに登録されています。</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>"%value%" must be at most %max%.</source>
-        <target>"%value%" は %max% 以下でなければなりません。</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>"%value%" must be at least %min%.</source>
-        <target>"%value%" は %min% 以上でなければなりません。</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Public flag</source>
-        <target>公開範囲</target>
-      </trans-unit> 
     </body>
   </file>
 </xliff>

From 9bbd4c1cb046e4aabfa3fa6804c2a0d3779df91c Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@tejimaya.com>
Date: Tue, 4 Oct 2011 16:00:19 +0900
Subject: [PATCH 143/630] (fixes #2425) validate duplicated value

---
 i18n/messages.ja.xml                            |  8 ++++++--
 lib/model/doctrine/MemberProfileTable.class.php |  9 +++++++++
 lib/validator/opValidatorProfile.class.php      | 12 ++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/i18n/messages.ja.xml b/i18n/messages.ja.xml
index c5f559ec8..d129a2b14 100644
--- a/i18n/messages.ja.xml
+++ b/i18n/messages.ja.xml
@@ -124,16 +124,20 @@
       </trans-unit>
       <trans-unit id="">
         <source>Receive a notice mail when member joined</source>
-	<target>参加お知らせメール受信設定</target>
+        <target>参加お知らせメール受信設定</target>
       </trans-unit>
       <trans-unit id="">
         <source>Send a notice mail to administrator when new member joined the %community%.</source>
-	<target>%community%に新しく参加者が加わったときに、管理者(あなた)にメールを送ります。</target>
+        <target>%community%に新しく参加者が加わったときに、管理者(あなた)にメールを送ります。</target>
       </trans-unit>
       <trans-unit id="">
         <source>Couldn't send E-mail. Please retry or contact to administrator.</source>
         <target>メールの送信に失敗しました。もう一度実行するか管理者に連絡して下さい。</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>Duplicate</source>
+        <target>すでに登録されています</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/lib/model/doctrine/MemberProfileTable.class.php b/lib/model/doctrine/MemberProfileTable.class.php
index 6dbd2a7db..d7cd7e68b 100644
--- a/lib/model/doctrine/MemberProfileTable.class.php
+++ b/lib/model/doctrine/MemberProfileTable.class.php
@@ -93,6 +93,15 @@ public function retrieveByMemberIdAndProfileId($memberId, $profileId)
       ->fetchOne();
   }
 
+  public function retrieveByProfileIdAndValueExceptMemberId($profileId, $profileValue, $memberId)
+  {
+    return $this->createQuery()
+      ->where('profile_id = ?', $profileId)
+      ->andWhere('value = ?', $profileValue)
+      ->andWhereNotIn('member_id', array($memberId))
+      ->fetchArray();
+  }
+
   public function retrieveByMemberIdAndProfileName($memberId, $profileName, $hydrationMode = Doctrine::HYDRATE_RECORD)
   {
     static $queryCacheHash;
diff --git a/lib/validator/opValidatorProfile.class.php b/lib/validator/opValidatorProfile.class.php
index dd47cd455..2d988965f 100644
--- a/lib/validator/opValidatorProfile.class.php
+++ b/lib/validator/opValidatorProfile.class.php
@@ -47,6 +47,18 @@ protected function doClean($value)
       $clean['public_flag'] = $validator->clean($value['public_flag']);
     }
 
+    if ($this->profile->getIsUnique())
+    {
+      $profileId = $this->profile->getId();
+      $memberId = sfContext::getInstance()->getUser()->getMemberId();
+      $profiles = Doctrine::getTable('MemberProfile')->retrieveByProfileIdAndValueExceptMemberId($profileId, $value['value'], $memberId);
+
+      if (0 < count($profiles))
+      {
+        throw new sfValidatorError($this, 'Duplicate');
+      }
+    }
+
     return $clean;
   }
 }

From ac394cc28a660f1e659a5ce2690087b84a7d09d1 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@tejimaya.com>
Date: Tue, 4 Oct 2011 17:18:28 +0900
Subject: [PATCH 144/630] (refs #2425) fixed for coding standard

---
 lib/model/doctrine/MemberProfileTable.class.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/model/doctrine/MemberProfileTable.class.php b/lib/model/doctrine/MemberProfileTable.class.php
index d7cd7e68b..99fef7297 100644
--- a/lib/model/doctrine/MemberProfileTable.class.php
+++ b/lib/model/doctrine/MemberProfileTable.class.php
@@ -163,7 +163,7 @@ public function searchMemberIds($profile = array(), $ids = null, $isCheckPublicF
 
       if ($item->isPreset())
       {
-        if ($item->getFormType() === 'date')
+        if ('date' === $item->getFormType())
         {
           $dateValue = $value;
           foreach ($dateValue as $k => $v)
@@ -174,7 +174,7 @@ public function searchMemberIds($profile = array(), $ids = null, $isCheckPublicF
               continue;
             }
 
-            if ($dateValue !== 'year')
+            if ('year' !== $dateValue)
             {
               $dateValue[$k] = sprintf('%02d', $dateValue[$k]);
             }
@@ -183,7 +183,7 @@ public function searchMemberIds($profile = array(), $ids = null, $isCheckPublicF
           $value = implode('-', $dateValue);
         }
       }
-      elseif ($item->getFormType() === 'date')
+      elseif ('date' === $item->getFormType())
       {
         $options = $item->getProfileOption();
         $i = 0;
@@ -239,7 +239,7 @@ public function filterMemberIdByProfile($ids, $column, $value, Profile $item, $p
         $publicFlags[] = 4;
       }
 
-      if ($item->isMultipleSelect() && $item->getFormType() !== 'date')
+      if ($item->isMultipleSelect() && 'date' !== $item->getFormType())
       {
         $q->addFrom('MemberProfile pm')
           ->andWhere('m.tree_key = pm.id')
@@ -406,12 +406,12 @@ public function assert(Zend_Acl $acl, Zend_Acl_Role_Interface $role = null, Zend
   {
     if (ProfileTable::PUBLIC_FLAG_FRIEND == $resource->getPublicFlag())
     {
-      return ($role->getRoleId() === 'self' || $role->getRoleId() === 'friend');
+      return ('self' === $role->getRoleId() || 'friend' === $role->getRoleId());
     }
 
     if (ProfileTable::PUBLIC_FLAG_PRIVATE == $resource->getPublicFlag())
     {
-      return ($role->getRoleId() === 'self');
+      return ('self' === $role->getRoleId());
     }
 
     return true;

From e2aa49e6863a6c13b7cb383b0beebdae855693d2 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@tejimaya.com>
Date: Wed, 5 Oct 2011 12:48:56 +0900
Subject: [PATCH 145/630] (fixes #2425) optimize DQL and rename method

---
 lib/model/doctrine/MemberProfileTable.class.php | 8 ++++----
 lib/validator/opValidatorProfile.class.php      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/model/doctrine/MemberProfileTable.class.php b/lib/model/doctrine/MemberProfileTable.class.php
index 99fef7297..e4b8f2318 100644
--- a/lib/model/doctrine/MemberProfileTable.class.php
+++ b/lib/model/doctrine/MemberProfileTable.class.php
@@ -93,13 +93,13 @@ public function retrieveByMemberIdAndProfileId($memberId, $profileId)
       ->fetchOne();
   }
 
-  public function retrieveByProfileIdAndValueExceptMemberId($profileId, $profileValue, $memberId)
+  public function isDuplicatedProfileValue($profileId, $profileValue, $memberId)
   {
-    return $this->createQuery()
+    return (bool) $this->createQuery()
       ->where('profile_id = ?', $profileId)
       ->andWhere('value = ?', $profileValue)
-      ->andWhereNotIn('member_id', array($memberId))
-      ->fetchArray();
+      ->andWhere('member_id <> ? ' , $memberId)
+      ->fetchOne(null, Doctrine_Core::HYDRATE_NONE);
   }
 
   public function retrieveByMemberIdAndProfileName($memberId, $profileName, $hydrationMode = Doctrine::HYDRATE_RECORD)
diff --git a/lib/validator/opValidatorProfile.class.php b/lib/validator/opValidatorProfile.class.php
index 2d988965f..623bf169b 100644
--- a/lib/validator/opValidatorProfile.class.php
+++ b/lib/validator/opValidatorProfile.class.php
@@ -51,9 +51,9 @@ protected function doClean($value)
     {
       $profileId = $this->profile->getId();
       $memberId = sfContext::getInstance()->getUser()->getMemberId();
-      $profiles = Doctrine::getTable('MemberProfile')->retrieveByProfileIdAndValueExceptMemberId($profileId, $value['value'], $memberId);
 
-      if (0 < count($profiles))
+      $isDuplicate = Doctrine::getTable('MemberProfile')->isDuplicatedProfileValue($profileId, $value['value'], $memberId);
+      if ($isDuplicate)
       {
         throw new sfValidatorError($this, 'Duplicate');
       }

From 57d09825d55e402cc72d17ef1d4f70f3fc5208fd Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@tejimaya.com>
Date: Wed, 5 Oct 2011 12:50:11 +0900
Subject: [PATCH 146/630] (refs #2425) fixed i18n

---
 i18n/messages.ja.xml                       | 4 ++--
 lib/validator/opValidatorProfile.class.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/i18n/messages.ja.xml b/i18n/messages.ja.xml
index d129a2b14..a8d529dc9 100644
--- a/i18n/messages.ja.xml
+++ b/i18n/messages.ja.xml
@@ -135,8 +135,8 @@
         <target>メールの送信に失敗しました。もう一度実行するか管理者に連絡して下さい。</target>
       </trans-unit>
       <trans-unit id="">
-        <source>Duplicate</source>
-        <target>すでに登録されています</target>
+        <source>The inputted value is already exist.</source>
+        <target>すでに登録されています。</target>
       </trans-unit>
     </body>
   </file>
diff --git a/lib/validator/opValidatorProfile.class.php b/lib/validator/opValidatorProfile.class.php
index 623bf169b..5609f0374 100644
--- a/lib/validator/opValidatorProfile.class.php
+++ b/lib/validator/opValidatorProfile.class.php
@@ -55,7 +55,7 @@ protected function doClean($value)
       $isDuplicate = Doctrine::getTable('MemberProfile')->isDuplicatedProfileValue($profileId, $value['value'], $memberId);
       if ($isDuplicate)
       {
-        throw new sfValidatorError($this, 'Duplicate');
+        throw new sfValidatorError($this, 'The inputted value is already exist.');
       }
     }
 

From 9149cba3836f86cf44a3841f61ed216e1a3579ae Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@tejimaya.com>
Date: Thu, 6 Oct 2011 23:22:41 +0900
Subject: [PATCH 147/630] (fixes #2425) add help to unique setting

---
 apps/pc_backend/i18n/messages.ja.xml    | 8 ++++++++
 lib/form/doctrine/ProfileForm.class.php | 1 +
 2 files changed, 9 insertions(+)

diff --git a/apps/pc_backend/i18n/messages.ja.xml b/apps/pc_backend/i18n/messages.ja.xml
index e2bbc1532..258ea8996 100644
--- a/apps/pc_backend/i18n/messages.ja.xml
+++ b/apps/pc_backend/i18n/messages.ja.xml
@@ -1453,6 +1453,14 @@
         <source>Not allowed</source>
         <target>許可されていません。</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>Logged out.</source>
+        <target>ログアウトしました。</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>This setting is applied only for Input type "Text" or "Paragraph text".</source>
+        <target>この設定はフォームタイプが「テキスト」または「テキスト（複数行）」の場合のみ適用されます。</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/lib/form/doctrine/ProfileForm.class.php b/lib/form/doctrine/ProfileForm.class.php
index 599bd391e..c9a5a2fde 100644
--- a/lib/form/doctrine/ProfileForm.class.php
+++ b/lib/form/doctrine/ProfileForm.class.php
@@ -102,6 +102,7 @@ public function configure()
     $this->widgetSchema->setHelps(array(
       'name' => 'Identification name can contain only underscore or alphanumeric characters. (must have at least one alphabet.)',
       'is_public_web' => 'Anyone in the world may view member profiles',
+      'is_unique' => 'This setting is applied only for Input type "Text" or "Paragraph text".',
     ));
   }
 

From 55f906f5876f2ae38dcbba2e2fe8b9c578eeef57 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@tejimaya.com>
Date: Thu, 6 Oct 2011 23:25:14 +0900
Subject: [PATCH 148/630] (fixes #2425) fixed for coding standard

---
 lib/form/doctrine/ProfileForm.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/form/doctrine/ProfileForm.class.php b/lib/form/doctrine/ProfileForm.class.php
index c9a5a2fde..4c22f4421 100644
--- a/lib/form/doctrine/ProfileForm.class.php
+++ b/lib/form/doctrine/ProfileForm.class.php
@@ -175,7 +175,7 @@ public function save($con = null)
 
     $values = $this->getValues();
 
-    if ($values['form_type'] === 'date')
+    if ('date' === $values['form_type'])
     {
       if (!$profile->getProfileOption()->count())
       {

From e3bcf4224699318ca79e1de3fde0dfbf1601209b Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@tejimaya.com>
Date: Fri, 7 Oct 2011 16:39:14 +0900
Subject: [PATCH 149/630] (fixes #2425) fixed to make check duplication in the
 case of 'text' or 'textarea'

---
 lib/validator/opValidatorProfile.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/validator/opValidatorProfile.class.php b/lib/validator/opValidatorProfile.class.php
index 5609f0374..91bcabad8 100644
--- a/lib/validator/opValidatorProfile.class.php
+++ b/lib/validator/opValidatorProfile.class.php
@@ -47,7 +47,7 @@ protected function doClean($value)
       $clean['public_flag'] = $validator->clean($value['public_flag']);
     }
 
-    if ($this->profile->getIsUnique())
+    if ($this->profile->getIsUnique() && in_array($this->profile->getFormType(), array('text', 'textarea')))
     {
       $profileId = $this->profile->getId();
       $memberId = sfContext::getInstance()->getUser()->getMemberId();

From 32f9d0fa1271f37e14614ad6b25bd3667f23b94a Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@tejimaya.com>
Date: Fri, 7 Oct 2011 18:03:32 +0900
Subject: [PATCH 150/630] (fixes #2425) fixed invalid input type

---
 lib/validator/opValidatorProfile.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/validator/opValidatorProfile.class.php b/lib/validator/opValidatorProfile.class.php
index 91bcabad8..5c408c2e5 100644
--- a/lib/validator/opValidatorProfile.class.php
+++ b/lib/validator/opValidatorProfile.class.php
@@ -47,7 +47,7 @@ protected function doClean($value)
       $clean['public_flag'] = $validator->clean($value['public_flag']);
     }
 
-    if ($this->profile->getIsUnique() && in_array($this->profile->getFormType(), array('text', 'textarea')))
+    if ($this->profile->getIsUnique() && in_array($this->profile->getFormType(), array('input', 'textarea')))
     {
       $profileId = $this->profile->getId();
       $memberId = sfContext::getInstance()->getUser()->getMemberId();

From 274645903d32950834f762d23c37b4440c911fe5 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Mon, 2 Apr 2012 14:58:05 +0900
Subject: [PATCH 151/630] add translate catalogs for 'Public flag' and 'More'.
 (fixes #2912)

---
 apps/pc_frontend/i18n/messages.ja.xml | 4 ++++
 i18n/messages.ja.xml                  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/apps/pc_frontend/i18n/messages.ja.xml b/apps/pc_frontend/i18n/messages.ja.xml
index 8d2cdefb4..498a6c06e 100644
--- a/apps/pc_frontend/i18n/messages.ja.xml
+++ b/apps/pc_frontend/i18n/messages.ja.xml
@@ -382,6 +382,10 @@
         <source>Delete</source>
         <target>削除</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>More</source>
+        <target>もっと見る</target>
+      </trans-unit>
       <trans-unit id="">
         <source>You can upload 3 photos.</source>
         <target>写真は最大3枚までアップロードできます。</target>
diff --git a/i18n/messages.ja.xml b/i18n/messages.ja.xml
index a8d529dc9..9ac02c3a0 100644
--- a/i18n/messages.ja.xml
+++ b/i18n/messages.ja.xml
@@ -138,6 +138,10 @@
         <source>The inputted value is already exist.</source>
         <target>すでに登録されています。</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>Public flag</source>
+        <target>公開範囲</target>
+      </trans-unit> 
     </body>
   </file>
 </xliff>

From a93cd834e19052b19503dae48d88648e2cfda2f2 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 5 Apr 2012 17:30:08 +0900
Subject: [PATCH 152/630] (refs #2756) fixed to reload push/search.json when
 notification center is hide

---
 web/js/smt_tosaka.js | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/web/js/smt_tosaka.js b/web/js/smt_tosaka.js
index 7f17b2b75..b7c296070 100644
--- a/web/js/smt_tosaka.js
+++ b/web/js/smt_tosaka.js
@@ -3,20 +3,23 @@ $(document).ready(function(){
     $(".toggle1:not(.ncform)").hide();
     $(".ncform").toggle();
     $('#pushLoading').show();
-    $.getJSON( openpne.apiBase + 'push/search.json?apiKey=' + openpne.apiKey, function(json){
-      if(json.status=='success')
-      {
-        $pushHtml = $("#pushListTemplate").tmpl(json.data);
-	$('.friend-accept', $pushHtml).friendLink({ buttonElement: '.friend-notify-button', ncfriendloadingElement: '#ncfriendloading', ncfriendresultmessageElement: '#ncfriendresultmessage', });
-	$('.friend-reject', $pushHtml).friendUnlink({ buttonElement: '.friend-notify-button', ncfriendloadingElement: '#ncfriendloading', ncfriendresultmessageElement: '#ncfriendresultmessage', })
-        $("#pushList").html($pushHtml);
-      }else{
-        alert(json.message);
-      }
-      $('.nclink').pushLink();
-      $('#pushList').show();
-      $('#pushLoading').hide();
-    });
+    if('none' !== $('.ncform').css('display'))
+    {
+      $.getJSON( openpne.apiBase + 'push/search.json?apiKey=' + openpne.apiKey, function(json){
+        if(json.status=='success')
+        {
+          $pushHtml = $("#pushListTemplate").tmpl(json.data);
+          $('.friend-accept', $pushHtml).friendLink({ buttonElement: '.friend-notify-button', ncfriendloadingElement: '#ncfriendloading', ncfriendresultmessageElement: '#ncfriendresultmessage', });
+          $('.friend-reject', $pushHtml).friendUnlink({ buttonElement: '.friend-notify-button', ncfriendloadingElement: '#ncfriendloading', ncfriendresultmessageElement: '#ncfriendresultmessage', })
+          $("#pushList").html($pushHtml);
+        }else{
+          alert(json.message);
+        }
+        $('.nclink').pushLink();
+        $('#pushList').show();
+        $('#pushLoading').hide();
+      });
+    }
     collapse_toggle($('.nav-collapse'));
   });
 

From 70b5dc7d7f164e0ecbb94efc2cf95a1484a21f6f Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 5 Apr 2012 17:35:44 +0900
Subject: [PATCH 153/630] fixed i18n context in notification center (fixes
 #2767)

---
 apps/pc_frontend/templates/_header.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/pc_frontend/templates/_header.php b/apps/pc_frontend/templates/_header.php
index 1eeb6cfdf..a70c487a2 100644
--- a/apps/pc_frontend/templates/_header.php
+++ b/apps/pc_frontend/templates/_header.php
@@ -24,9 +24,9 @@
       <div class="push_content">
       {{if category=="link"}}
         {{if unread==false}}
-        <?php echo __('Friend request') ?>
+        <?php echo __('%Friend% link request') ?>
         {{else}}
-        <?php echo __('Do you accept friend request?') ?>
+        <?php echo __('Do you accept %friend% link request?') ?>
         <div class="push_yesno">
           <button class="friend-accept">YES</button>
           <button class="friend-reject">NO</button>

From 4d37b7574d7b2e435334a6fbf896a6a08bd30ed6 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 5 Apr 2012 17:57:53 +0900
Subject: [PATCH 154/630] (fixes #2698) fixed to response 401 Error when user
 login action is rejected.

---
 apps/api/lib/myUser.class.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/apps/api/lib/myUser.class.php b/apps/api/lib/myUser.class.php
index d23c4a60e..1b1af5c7a 100644
--- a/apps/api/lib/myUser.class.php
+++ b/apps/api/lib/myUser.class.php
@@ -58,18 +58,12 @@ public function getMember()
     }
 
     $member = $this->getMemberByApiKey($apiKey);
-    if (is_null($member))
+    if (is_null($member) || $member->isOnBlackList() || $member->getIsLoginRejected())
     {
       $exception = new opErrorHttpException('Invalid API key.');
       throw $exception->setHttpStatusCode(401);
     }
 
-    if ($member->isOnBlackList() || $member->getIsLoginRejected())
-    {
-      $exception = new opErrorHttpException('You are not allowd to log in.');
-      throw $exception->setHttpStatusCode(403);
-    }
-
     $this->member = $member;
 
     return $member;

From 2f62b0c2962d1304769a78133877190439d8926a Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 6 Apr 2012 12:32:35 +0900
Subject: [PATCH 155/630] fixed some items that have been pointed in the review
 of note-24 (refs #2756)

---
 lib/util/opNotificationCenter.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/util/opNotificationCenter.class.php b/lib/util/opNotificationCenter.class.php
index 450c9080a..69691aaa0 100644
--- a/lib/util/opNotificationCenter.class.php
+++ b/lib/util/opNotificationCenter.class.php
@@ -48,10 +48,11 @@ static public function notify(Member $from, Member $to, $body, array $options =
     }
 
     array_unshift($notifications, $notificationItem);
+    $notificationLimit = sfConfig::get('op_notification_limit', 20);
 
-    if (sfConfig::get('op_notification_limit', 20) > count($notifications))
+    if ($notificationLimit < count($notifications))
     {
-      array_slice($notifications, 0, sfConfig::get('op_notification_limit', 20));
+      $notifications = array_slice($notifications, 0, $notificationLimit);
     }
 
     $notificationObject->setValue(serialize($notifications));

From 7ab4f92a3e5511816e815f661c2b2043b4292eaf Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 6 Apr 2012 12:35:52 +0900
Subject: [PATCH 156/630] added full size option in setting of mobile max image
 size (fixes #2089)

---
 apps/pc_backend/i18n/messages.ja.xml   | 4 ++++
 lib/util/opFormItemGenerator.class.php | 1 +
 2 files changed, 5 insertions(+)

diff --git a/apps/pc_backend/i18n/messages.ja.xml b/apps/pc_backend/i18n/messages.ja.xml
index 258ea8996..6791ca150 100644
--- a/apps/pc_backend/i18n/messages.ja.xml
+++ b/apps/pc_backend/i18n/messages.ja.xml
@@ -1461,6 +1461,10 @@
         <source>This setting is applied only for Input type "Text" or "Paragraph text".</source>
         <target>この設定はフォームタイプが「テキスト」または「テキスト（複数行）」の場合のみ適用されます。</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>Full Size</source>
+        <target>フルサイズ</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/lib/util/opFormItemGenerator.class.php b/lib/util/opFormItemGenerator.class.php
index c8c45dcb2..2618c4bfe 100644
--- a/lib/util/opFormItemGenerator.class.php
+++ b/lib/util/opFormItemGenerator.class.php
@@ -154,6 +154,7 @@ public static function generateWidget($field, $choices = array())
         {
           $params['choices'][$v] = sfContext::getInstance()->getI18N()->__($v);
         }
+        $params['choices'] = $params['choices'] + array('' => sfContext::getInstance()->getI18N()->__('Full Size'));
         $obj = new sfWidgetFormChoice($params);
         break;
       default:

From a5608967a1544c33377b40f18e4716c904e69ded Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 6 Apr 2012 13:28:03 +0900
Subject: [PATCH 157/630] fixed notification count position on smartphone (refs
 #2756)

---
 web/css/smt_main.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web/css/smt_main.css b/web/css/smt_main.css
index a88963646..e114d49aa 100644
--- a/web/css/smt_main.css
+++ b/web/css/smt_main.css
@@ -158,19 +158,19 @@ input[type="checkbox"], input[type="radio"] {
 }
 .nc_icon1 {
   position:absolute;
-  top: 18px;
+  top: 2px;
   left: 24px;
   line-height: 10px;
 }
 .nc_icon2 {
   position:absolute;
-  top: 18px;
+  top: 2px;
   left: 58px;
   line-height: 10px;
 }
 .nc_icon3 {
   position:absolute;
-  top: 18px;
+  top: 2px;
   left: 90px;
   line-height: 10px;
 }

From b18d622805190957398ba2d72599f407d6944bf1 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 6 Apr 2012 13:53:35 +0900
Subject: [PATCH 158/630] fixed to return correct member image url on
 notification center api. (refs #2698, fixes #2756)

---
 apps/api/lib/helper/opJsonApiHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/api/lib/helper/opJsonApiHelper.php b/apps/api/lib/helper/opJsonApiHelper.php
index 3af31b057..502ff901d 100644
--- a/apps/api/lib/helper/opJsonApiHelper.php
+++ b/apps/api/lib/helper/opJsonApiHelper.php
@@ -176,7 +176,7 @@ function op_api_notification($notification)
   {
     $iconUrl = op_image_path('no_image.gif', true);
   }
-  elseif (0 !== strpos('http://', $iconUrl))
+  elseif (false !== strpos('http://', $iconUrl))
   {
     $iconUrl = sf_image_path($iconUrl, array('size' => '48x48'), true);
   }

From 537d400e7f3bb0aa171cc595956836d9d4fc7c27 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 6 Apr 2012 14:04:52 +0900
Subject: [PATCH 159/630] fixed to show error message and remove unnecessary
 characters on notification center (PC) (fixes #2767)

---
 web/js/jquery.notify.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/web/js/jquery.notify.js b/web/js/jquery.notify.js
index 77198bd7e..b6b27babb 100755
--- a/web/js/jquery.notify.js
+++ b/web/js/jquery.notify.js
@@ -17,7 +17,7 @@
         else
         {
           window.location = linkUrl;
-	}
+        }
       });
     });
   };
@@ -39,16 +39,16 @@
           success: function(data) {
             if(data.status=='success'){
               $('.ncfriendloading').hide();
-              $(this).parent().find('.ncfriendresultmessage').text('リクエストを承認しました');
-              $(this).parent().find('.ncfriendresultmessage').show();
+              $('.push_yesno .ncfriendresultmessage').text('リクエストを承認しました');
+              $('.push_yesno .ncfriendresultmessage').show();
             }else{
               alert(data.message);
             }
           },
           error: function(r, s, e){
             $('.ncfriendloading').hide();
-            $(this).parent().find('.ncfriendresultmessage').text('既に承認済みです');
-            $(this).parent().find('.ncfriendresultmessage').show(); 
+            $('.push_yesno .ncfriendresultmessage').text('既に承認済みです');
+            $('.push_yesno .ncfriendresultmessage').show(); 
           }
         });
       });
@@ -72,16 +72,16 @@
           success: function(data) {
             if(data.status=='success'){
               $('.ncfriendloading').hide();
-              $('.ncfrinedresultmessage', $(this).parent()).text('リクエストを拒否しました');
-              $('.ncfrinedresultmessage', $(this).parent()).show();
-             }else{
+              $('.push_yesno .ncfriendresultmessage').text('リクエストを拒否しました');
+              $('.push_yesno .ncfriendresultmessage').show();
+            }else{
               alert(data.message);
             }   
           },
           error: function(r, s, e) {
             $('.ncfriendloading').hide();
-            $(this).parent().find('.ncfriendresultmessage').text('既に拒否済みです');
-            $(this).parent().find('.ncfriendresultmessage').show(); 
+            $('.push_yesno .ncfriendresultmessage').text('既に拒否済みです');
+            $('.push_yesno .ncfriendresultmessage').show(); 
           }
         });
       });

From 0acdde3352c507772804929158f3d3d11c39d24e Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 5 Apr 2012 18:04:39 +0900
Subject: [PATCH 160/630] fix some gadgets sortable in PC view (fixes #2617)

---
 apps/pc_frontend/modules/member/templates/homeSuccess.php | 8 ++++----
 apps/pc_frontend/templates/_partsInformationBox.php       | 2 +-
 apps/pc_frontend/templates/_partsMemberImageBox.php       | 2 ++
 apps/pc_frontend/templates/_partsSearchFormLine.php       | 2 ++
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/apps/pc_frontend/modules/member/templates/homeSuccess.php b/apps/pc_frontend/modules/member/templates/homeSuccess.php
index eaf96df42..5c6a29ca7 100644
--- a/apps/pc_frontend/modules/member/templates/homeSuccess.php
+++ b/apps/pc_frontend/modules/member/templates/homeSuccess.php
@@ -8,7 +8,7 @@
 <?php endif; ?>
 <?php endforeach; ?>
 <?php end_slot() ?>
-<?php echo javascript_tag('$("#Top").sortable({ axis: "y", items: "> div", handle: "div.partsHeading", update: function(event,ui){storeSort(event, ui)} });') ?>
+<?php echo javascript_tag('$("#Top").sortable({ axis: "y", items: "> div", handle: "div.sortHandle, div.partsHeading", update: function(event,ui){storeSort(event, ui)} });') ?>
 <?php endif; ?>
 
 <?php if (isset($sideMenuGadgets)): ?>
@@ -19,7 +19,7 @@
 <?php endif; ?>
 <?php endforeach; ?>
 <?php end_slot() ?>
-<?php echo javascript_tag('$("#Left").sortable({ axis: "y", items: "> div", handle: "div.partsHeading", update: function(event,ui){storeSort(event, ui)} });') ?>
+<?php echo javascript_tag('$("#Left").sortable({ axis: "y", items: "> div", handle: "div.sortHandle, div.partsHeading", update: function(event,ui){storeSort(event, ui)} });') ?>
 <?php endif; ?>
 
 <?php if (isset($contentsGadgets)): ?>
@@ -28,7 +28,7 @@
 <?php include_component($gadget->getComponentModule(), $gadget->getComponentAction(), array('gadget' => $gadget)); ?>
 <?php endif; ?>
 <?php endforeach; ?>
-<?php echo javascript_tag('$("#Center").sortable({ axis: "y", items: "> div", handle: "div.partsHeading", update: function(event,ui){storeSort(event, ui)} });') ?>
+<?php echo javascript_tag('$("#Center").sortable({ axis: "y", items: "> div", handle: "div.sortHandle, div.partsHeading", update: function(event,ui){storeSort(event, ui)} });') ?>
 <?php endif; ?>
 
 <?php if (isset($bottomGadgets)): ?>
@@ -39,7 +39,7 @@
 <?php endif; ?>
 <?php endforeach; ?>
 <?php end_slot() ?>
-<?php echo javascript_tag('$("#Bottom").sortable({ item: "> div.partsHeading" });') ?>
+<?php echo javascript_tag('$("#Bottom").sortable({ item: "div.sortHandle, div.partsHeading" });') ?>
 <?php endif; ?>
 
 <?php echo javascript_tag('
diff --git a/apps/pc_frontend/templates/_partsInformationBox.php b/apps/pc_frontend/templates/_partsInformationBox.php
index 896578dbb..b42792c89 100644
--- a/apps/pc_frontend/templates/_partsInformationBox.php
+++ b/apps/pc_frontend/templates/_partsInformationBox.php
@@ -1,6 +1,6 @@
 <?php $options->setDefault('single', true) ?>
 
-<div class="body">
+<div class="body sortHandle">
 <?php include_customizes($id, 'bodyTop') ?>
 <?php include_customizes('information', 'bodyTop') ?>
 <?php echo $options->getRaw('body') ?>
diff --git a/apps/pc_frontend/templates/_partsMemberImageBox.php b/apps/pc_frontend/templates/_partsMemberImageBox.php
index e382eff1e..1a4af0234 100644
--- a/apps/pc_frontend/templates/_partsMemberImageBox.php
+++ b/apps/pc_frontend/templates/_partsMemberImageBox.php
@@ -1,6 +1,7 @@
 <?php $options->setDefault('single', true) ?>
 <?php $options->setDefault('name_method', 'getNameAndCount') ?>
 
+<div class="sortHandle">
 <p class="photo">
 <?php $imgParam = array('size' => '180x180', 'alt' => $options->object->getName()) ?>
 <?php $nameMethod = $options->name_method ?>
@@ -11,3 +12,4 @@
 <?php endif; ?>
 </p>
 <p class="text"><?php echo $options->object->$nameMethod() ?></p>
+</div>
diff --git a/apps/pc_frontend/templates/_partsSearchFormLine.php b/apps/pc_frontend/templates/_partsSearchFormLine.php
index 5620c54c2..545b8a7db 100644
--- a/apps/pc_frontend/templates/_partsSearchFormLine.php
+++ b/apps/pc_frontend/templates/_partsSearchFormLine.php
@@ -1,5 +1,6 @@
 <?php $options->setDefault('single', true) ?>
 
+<div class="sortHandle">
 <form action="<?php echo url_for('@global_search') ?>" method="get">
 <ul>
 <li><?php echo op_image_tag('icon_search.gif', array('alt' => 'search')) ?></li>
@@ -21,3 +22,4 @@
 </li>
 </ul>
 </form>
+</div>

From 444329e9ee1ac225ebc027c7d367fed3f3f7e980 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 6 Apr 2012 15:14:52 +0900
Subject: [PATCH 161/630] replace tab characters into space characters. (refs
 #2227)

---
 web/js/smt_notify.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/web/js/smt_notify.js b/web/js/smt_notify.js
index 60bd01415..f5a080977 100644
--- a/web/js/smt_notify.js
+++ b/web/js/smt_notify.js
@@ -71,8 +71,7 @@
 				});
 			});
 		});
-        };
-
+  };
 
 	$.fn.friendUnlink = function(settings){
 		return this.each(function(){
@@ -105,6 +104,6 @@
 				});
 			});
 		});
-        };
+  };
 
 })(jQuery);

From 02d4af6fe6febd1246cc7a60c3af4b912d793111 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 6 Apr 2012 15:15:57 +0900
Subject: [PATCH 162/630] fixed for coding standards (refs #2227)

---
 .../modules/member/templates/_smtProfileListBox.php           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/pc_frontend/modules/member/templates/_smtProfileListBox.php b/apps/pc_frontend/modules/member/templates/_smtProfileListBox.php
index 53ad4cdb1..f218fb221 100644
--- a/apps/pc_frontend/modules/member/templates/_smtProfileListBox.php
+++ b/apps/pc_frontend/modules/member/templates/_smtProfileListBox.php
@@ -16,14 +16,14 @@
     continue;
   }
 
-  if ($profile->getFormType() === 'textarea')
+  if ('textarea' === $profile->getFormType())
   {
     $profileValue = op_auto_link_text(nl2br($profileValue));
   }
 
   if ($profile->getProfile()->isPreset())
   {
-    if ($profile->getFormType() === 'country_select')
+    if ('country_select' === $profile->getFormType())
     {
       $profileValue = $culture->getCountry($profileValue);
     }

From 3c2350aa167bd1e950559d2344df0caa7320cfde Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 6 Apr 2012 15:17:05 +0900
Subject: [PATCH 163/630] replaced <br> tag into XHTML <br /> tag (refs #2227)

---
 .../modules/community/templates/_smtCommunityListBox.php        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php b/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php
index 211f4131a..8569abae2 100644
--- a/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php
+++ b/apps/pc_frontend/modules/community/templates/_smtCommunityListBox.php
@@ -29,7 +29,7 @@
 <?php if (count($subAdminCaption)): ?>
 <tr>
   <td><?php echo __('Sub Administrator') ?></td>
-  <td><?php echo implode("<br>\n", $subAdminCaption) ?></td>
+  <td><?php echo implode("<br />\n", $subAdminCaption) ?></td>
 </tr>
 <?php endif; ?>
 <?php if ($community->community_category_id): ?>

From ffb51830fc4e1685cba630cb2de62f349113e3e6 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 6 Apr 2012 15:17:53 +0900
Subject: [PATCH 164/630] added and replaced into opWebRequest method. (refs
 #2227)

---
 .../community/actions/actions.class.php       |  8 +++---
 .../modules/friend/actions/actions.class.php  |  4 +--
 .../modules/member/actions/actions.class.php  | 28 +++++++++----------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/apps/pc_frontend/modules/community/actions/actions.class.php b/apps/pc_frontend/modules/community/actions/actions.class.php
index 8c7aac9b9..4f69cdf0d 100644
--- a/apps/pc_frontend/modules/community/actions/actions.class.php
+++ b/apps/pc_frontend/modules/community/actions/actions.class.php
@@ -22,7 +22,7 @@ class communityActions extends opCommunityAction
   *
   * @param opWebRequest $request A request object
   */
-  public function executeHome($request)
+  public function executeHome(opWebRequest $request)
   {
     $this->forwardIf($request->isSmartphone(), 'community', 'smtHome');
 
@@ -52,7 +52,7 @@ public function executeSmtHome(opWebRequest $request)
   *
   * @param opWebRequest $request A request object
   */
-  public function executeEdit($request)
+  public function executeEdit(opWebRequest $request)
   {
     $this->forwardIf($request->isSmartphone(), 'community', 'smtEdit');
 
@@ -119,7 +119,7 @@ public function executeSmtMemberList(opWebRequest $request)
   *
   * @param opWebRequest $request A request object
   */
-  public function executeJoinlist($request)
+  public function executeJoinlist(opWebRequest $request)
   {
     $this->forwardIf($request->isSmartphone(), 'community', 'smtJoinlist');
 
@@ -213,7 +213,7 @@ public function executeSmtQuit(opWebRequest $request)
   *
   * @param opWebRequest $request A request object
   */
-  public function executeSearch($request)
+  public function executeSearch(opWebRequest $request)
   {
     $this->forwardIf($request->isSmartphone(), 'community', 'smtSearch');
 
diff --git a/apps/pc_frontend/modules/friend/actions/actions.class.php b/apps/pc_frontend/modules/friend/actions/actions.class.php
index ce3bef579..fb4e71d84 100644
--- a/apps/pc_frontend/modules/friend/actions/actions.class.php
+++ b/apps/pc_frontend/modules/friend/actions/actions.class.php
@@ -27,7 +27,7 @@ public function preExecute()
     }
   }
 
-  public function executeList(sfWebRequest $request)
+  public function executeList(opWebRequest $request)
   {
     $this->forwardIf($request->isSmartphone(), 'friend', 'smtList');
 
@@ -36,7 +36,7 @@ public function executeList(sfWebRequest $request)
     return parent::executeList($request);
   }
 
-  public function executeSmtList($request)
+  public function executeSmtList(opWebRequest $request)
   {
     $this->member = Doctrine::getTable('Member')->find($this->id);
     $this->getResponse()->setDisplayMember($this->member);
diff --git a/apps/pc_frontend/modules/member/actions/actions.class.php b/apps/pc_frontend/modules/member/actions/actions.class.php
index 118a492b6..f2b046ca8 100644
--- a/apps/pc_frontend/modules/member/actions/actions.class.php
+++ b/apps/pc_frontend/modules/member/actions/actions.class.php
@@ -22,7 +22,7 @@ class memberActions extends opMemberAction
   *
   * @param opWebRequest $request A request object
   */
-  public function executeHome($request)
+  public function executeHome(opWebRequest $request)
   {
     $this->forwardIf($request->isSmartphone(), 'member', 'smtHome');
 
@@ -69,7 +69,7 @@ public function executeSmtHome(opWebRequest $request)
   *
   * @param opWevRequest $request A request object
   */
-  public function executeLogin($request)
+  public function executeLogin(opWebRequest $request)
   {
     if (opConfig::get('external_pc_login_url') && $request->isMethod(sfWebRequest::GET))
     {
@@ -112,7 +112,7 @@ public function executeLogin($request)
   *
   * @param opWebRequest $request A request object
   */
-  public function executeProfile($request)
+  public function executeProfile(opWebRequest $request)
   {
     $this->forwardIf($request->isSmartphone(), 'member', 'smtProfile');
 
@@ -163,7 +163,7 @@ public function executeSmtProfile(opWebRequest $request)
   *
   * @param opWebRequest $request A request object
   */
-  public function executeConfigImage($request)
+  public function executeConfigImage(opWebRequest $request)
   {
     $this->forwardIf($request->isSmartphone(), 'member', 'smtConfigImage');
 
@@ -236,7 +236,7 @@ public function executeSmtConfigImage(opWebRequest $request)
   *
   * @param sfRequest $request A request object
   */
-  public function executeConfigJsonApi($request)
+  public function executeConfigJsonApi(opWebRequest $request)
   {
     $this->forward404Unless(opConfig::get('enable_jsonapi'));
 
@@ -256,9 +256,9 @@ public function executeConfigJsonApi($request)
  /**
   * Executes registerMobileToRegisterEnd action
   *
-  * @param sfRequest $request A request object
+  * @param opWebRequest $request A request object
   */
-  public function executeRegisterMobileToRegisterEnd(sfWebRequest $request)
+  public function executeRegisterMobileToRegisterEnd(opWebRequest $request)
   {
     opActivateBehavior::disable();
     $this->form = new registerMobileForm($this->getUser()->getMember());
@@ -276,16 +276,16 @@ public function executeRegisterMobileToRegisterEnd(sfWebRequest $request)
     return sfView::SUCCESS;
   }
 
-  public function executeRegisterMobileToRegisterEndFinish(sfWebRequest $request)
+  public function executeRegisterMobileToRegisterEndFinish(opWebRequest $request)
   {
   }
 
   /**
    * Executes changeLanguage action
    *
-   * @param sfWebRequest $request a request object
+   * @param opWebRequest $request a request object
    */
-  public function executeChangeLanguage(sfWebRequest $request)
+  public function executeChangeLanguage(opWebRequest $request)
   {
     if ($request->isMethod(sfWebRequest::POST))
     {
@@ -304,7 +304,7 @@ public function executeChangeLanguage(sfWebRequest $request)
   *
   * @param opWebRequest $request a request object
   */
-  public function executeConfig($request)
+  public function executeConfig(opWebRequest $request)
   {
     $this->forwardIf($request->isSmartphone(), 'member', 'smtConfig');
 
@@ -326,7 +326,7 @@ public function executeSmtConfig(opWebRequest $request)
   *
   * @param opWebRequest $request a request object
   */
-  public function executeSearch($request)
+  public function executeSearch(opWebRequest $request)
   {
     $this->forwardIf($request->isSmartphone(), 'member', 'smtSearch');
 
@@ -348,7 +348,7 @@ public function executeSmtSearch(opWebRequest $request)
   *
   * @param opWebRequest $request a request object
   */
-  public function executeInvite($request)
+  public function executeInvite(opWebRequest $request)
   {
     $this->forwardIf($request->isSmartphone(), 'member', 'smtInvite');
 
@@ -372,7 +372,7 @@ public function executeSmtInvite(opWebRequest $request)
   *
   * @param opWebRequest $request a request object
   */
-  public function executeEditProfile($request)
+  public function executeEditProfile(opWebRequest $request)
   {
     $this->forwardIf($request->isSmartphone(), 'member', 'smtEditProfile');
 

From ea07a952226fd94dc71547ea7da1707de48e2990 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 6 Apr 2012 15:20:10 +0900
Subject: [PATCH 165/630] replaced long valiable name in foreach loop. (refs
 #2227)

---
 .../modules/member/templates/_smtProfileListBox.php           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/pc_frontend/modules/member/templates/_smtProfileListBox.php b/apps/pc_frontend/modules/member/templates/_smtProfileListBox.php
index f218fb221..8cd21bf5b 100644
--- a/apps/pc_frontend/modules/member/templates/_smtProfileListBox.php
+++ b/apps/pc_frontend/modules/member/templates/_smtProfileListBox.php
@@ -45,8 +45,8 @@
 <table class="table-striped span12">
 <tbody>
 <tr><td><?php echo $op_term['nickname'] ?></td><td><?php echo $member->getName(); ?></td></tr>
-<?php foreach ($list as $k => $v): ?>
-<tr><td><?php echo __($k); ?></td><td><?php echo $v; ?></td></tr>
+<?php foreach ($list as $profileKey => $profileValue): ?>
+<tr><td><?php echo __($profileKey); ?></td><td><?php echo $profileValue; ?></td></tr>
 <?php endforeach; ?>
 </tbody>
 </table>

From 100c67dba984aeb430732a18f709c4cb57a005a3 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 6 Apr 2012 16:22:37 +0900
Subject: [PATCH 166/630] (fixes #2227) remove
 setDisplayMember,setDisplayCommunity,getDisplayMember,getDisplayCommunity
 function in opWebResponse method and use sfConfig method to show smartphone
 header.

---
 .../community/actions/actions.class.php       | 12 +++++------
 .../modules/friend/actions/actions.class.php  |  4 ++--
 .../modules/member/actions/actions.class.php  |  2 +-
 apps/pc_frontend/templates/smtLayoutGroup.php |  2 +-
 .../pc_frontend/templates/smtLayoutMember.php |  2 +-
 lib/response/opWebResponse.class.php          | 20 -------------------
 6 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/apps/pc_frontend/modules/community/actions/actions.class.php b/apps/pc_frontend/modules/community/actions/actions.class.php
index 4f69cdf0d..7397f8eb6 100644
--- a/apps/pc_frontend/modules/community/actions/actions.class.php
+++ b/apps/pc_frontend/modules/community/actions/actions.class.php
@@ -42,7 +42,7 @@ public function executeSmtHome(opWebRequest $request)
     $this->community = Doctrine::getTable('Community')->find($this->id);
     $this->forward404Unless($this->community);
 
-    $this->getResponse()->setDisplayCommunity($this->community);
+    sfConfig::set('op_smartphone_header', $this->community);
 
     return sfView::SUCCESS;
   }
@@ -82,7 +82,7 @@ public function executeSmtEdit(opWebRequest $request)
     }
     else
     {
-      $this->getResponse()->setDisplayCommunity($this->community);
+      sfConfig::set('op_smartphone_header', $this->community);
     }
 
     return $result;
@@ -109,7 +109,7 @@ public function executeSmtMemberList(opWebRequest $request)
   {
     $result = parent::executeMemberList($request);
 
-    $this->getResponse()->setDisplayCommunity($this->community);
+    sfConfig::set('op_smartphone_header', $this->community);
 
     return $result;
   }
@@ -151,7 +151,7 @@ public function executeSmtJoinlist(opWebRequest $request)
       $this->targetMember = $this->getUser()->getMember();
     }
 
-    $this->getResponse()->setDisplayMember($this->targetMember);
+    sfConfig::set('op_smartphone_header', $this->targetMember);
 
     return $result;
   }
@@ -177,7 +177,7 @@ public function executeSmtJoin(opWebRequest $request)
   {
     $result = parent::executeJoin($request);
 
-    $this->getResponse()->setDisplayCommunity($this->community);
+    sfConfig::set('op_smartphone_header', $this->community);
 
     return $result;
   }
@@ -203,7 +203,7 @@ public function executeSmtQuit(opWebRequest $request)
   {
     $result = parent::executeQuit($request);
 
-    $this->getResponse()->setDisplayCommunity($this->community);
+    sfConfig::set('op_smartphone_header', $this->community);
 
     return $result;
   }
diff --git a/apps/pc_frontend/modules/friend/actions/actions.class.php b/apps/pc_frontend/modules/friend/actions/actions.class.php
index fb4e71d84..bfce3358b 100644
--- a/apps/pc_frontend/modules/friend/actions/actions.class.php
+++ b/apps/pc_frontend/modules/friend/actions/actions.class.php
@@ -39,7 +39,7 @@ public function executeList(opWebRequest $request)
   public function executeSmtList(opWebRequest $request)
   {
     $this->member = Doctrine::getTable('Member')->find($this->id);
-    $this->getResponse()->setDisplayMember($this->member);
+    sfConfig::set('op_smartphone_header', $this->member);
 
     return sfView::SUCCESS;
   }
@@ -55,7 +55,7 @@ public function executeSmtLink(opWebRequest $request)
   {
     $result = parent::executeLink($request);
 
-    $this->getResponse()->setDisplayMember($this->member);
+    sfConfig::set('op_smartphone_header', $this->member);
 
     return $result;
   }
diff --git a/apps/pc_frontend/modules/member/actions/actions.class.php b/apps/pc_frontend/modules/member/actions/actions.class.php
index f2b046ca8..68a2973ae 100644
--- a/apps/pc_frontend/modules/member/actions/actions.class.php
+++ b/apps/pc_frontend/modules/member/actions/actions.class.php
@@ -153,7 +153,7 @@ public function executeSmtProfile(opWebRequest $request)
 
     $result = parent::executeProfile($request);
 
-    $this->getResponse()->setDisplayMember($this->member);
+    sfConfig::set('op_smartphone_header', $this->member);
 
     return $result;
   }
diff --git a/apps/pc_frontend/templates/smtLayoutGroup.php b/apps/pc_frontend/templates/smtLayoutGroup.php
index f4eeadfe6..cc3a032ef 100644
--- a/apps/pc_frontend/templates/smtLayoutGroup.php
+++ b/apps/pc_frontend/templates/smtLayoutGroup.php
@@ -33,7 +33,7 @@
 <?php include_javascripts() ?>
 </head>
 <body id="<?php printf('page_%s_%s', $this->getModuleName(), $this->getActionName()) ?>" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
-<?php $community = $sf_response->getDisplayCommunity() ?>
+<?php $community = sfConfig::get('op_smartphone_header', false) ?>
 <?php include_partial('global/tosaka', array('community' => $community)) ?>
 <div id="face" class="row">
   <?php if ($community): ?>
diff --git a/apps/pc_frontend/templates/smtLayoutMember.php b/apps/pc_frontend/templates/smtLayoutMember.php
index dc076e536..48b541b1f 100644
--- a/apps/pc_frontend/templates/smtLayoutMember.php
+++ b/apps/pc_frontend/templates/smtLayoutMember.php
@@ -35,7 +35,7 @@
 <body id="<?php printf('page_%s_%s', $this->getModuleName(), $this->getActionName()) ?>" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
 <?php include_partial('global/tosaka') ?>
 <div id="face" class="row">
-  <?php $member = $sf_response->getDisplayMember() ?>
+  <?php $member = sfConfig::get('op_smartphone_header', $sf_user) ?>
   <?php if ($member): ?>
   <div class="span2">
     <?php echo op_image_tag_sf_image($member->getImageFileName(), array('size' => '48x48')) ?>
diff --git a/lib/response/opWebResponse.class.php b/lib/response/opWebResponse.class.php
index fd1282db6..b293d5dcf 100644
--- a/lib/response/opWebResponse.class.php
+++ b/lib/response/opWebResponse.class.php
@@ -31,26 +31,6 @@ public function getTitle()
     return $result;
   }
 
-  public function getDisplayMember()
-  {
-    return $this->displayMember;
-  }
-
-  public function setDisplayMember(Member $member)
-  {
-    $this->displayMember = $member;
-  }
-
-  public function getDisplayCommunity()
-  {
-    return $this->displayCommunity;
-  }
-
-  public function setDisplayCommunity(Community $community)
-  {
-    $this->displayCommunity = $community;
-  }
-
   public function generateMobileUidCookie()
   {
     $request = sfContext::getInstance()->getRequest();

From 23a8a171e2d3619d5e03d69915f1f48270ea69fe Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 6 Apr 2012 16:27:46 +0900
Subject: [PATCH 167/630] Revert "(fixes #2227) remove
 setDisplayMember,setDisplayCommunity,getDisplayMember,getDisplayCommunity
 function in opWebResponse method and use sfConfig method to show smartphone
 header."

This reverts commit 100c67dba984aeb430732a18f709c4cb57a005a3.
---
 .../community/actions/actions.class.php       | 12 +++++------
 .../modules/friend/actions/actions.class.php  |  4 ++--
 .../modules/member/actions/actions.class.php  |  2 +-
 apps/pc_frontend/templates/smtLayoutGroup.php |  2 +-
 .../pc_frontend/templates/smtLayoutMember.php |  2 +-
 lib/response/opWebResponse.class.php          | 20 +++++++++++++++++++
 6 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/apps/pc_frontend/modules/community/actions/actions.class.php b/apps/pc_frontend/modules/community/actions/actions.class.php
index 7397f8eb6..4f69cdf0d 100644
--- a/apps/pc_frontend/modules/community/actions/actions.class.php
+++ b/apps/pc_frontend/modules/community/actions/actions.class.php
@@ -42,7 +42,7 @@ public function executeSmtHome(opWebRequest $request)
     $this->community = Doctrine::getTable('Community')->find($this->id);
     $this->forward404Unless($this->community);
 
-    sfConfig::set('op_smartphone_header', $this->community);
+    $this->getResponse()->setDisplayCommunity($this->community);
 
     return sfView::SUCCESS;
   }
@@ -82,7 +82,7 @@ public function executeSmtEdit(opWebRequest $request)
     }
     else
     {
-      sfConfig::set('op_smartphone_header', $this->community);
+      $this->getResponse()->setDisplayCommunity($this->community);
     }
 
     return $result;
@@ -109,7 +109,7 @@ public function executeSmtMemberList(opWebRequest $request)
   {
     $result = parent::executeMemberList($request);
 
-    sfConfig::set('op_smartphone_header', $this->community);
+    $this->getResponse()->setDisplayCommunity($this->community);
 
     return $result;
   }
@@ -151,7 +151,7 @@ public function executeSmtJoinlist(opWebRequest $request)
       $this->targetMember = $this->getUser()->getMember();
     }
 
-    sfConfig::set('op_smartphone_header', $this->targetMember);
+    $this->getResponse()->setDisplayMember($this->targetMember);
 
     return $result;
   }
@@ -177,7 +177,7 @@ public function executeSmtJoin(opWebRequest $request)
   {
     $result = parent::executeJoin($request);
 
-    sfConfig::set('op_smartphone_header', $this->community);
+    $this->getResponse()->setDisplayCommunity($this->community);
 
     return $result;
   }
@@ -203,7 +203,7 @@ public function executeSmtQuit(opWebRequest $request)
   {
     $result = parent::executeQuit($request);
 
-    sfConfig::set('op_smartphone_header', $this->community);
+    $this->getResponse()->setDisplayCommunity($this->community);
 
     return $result;
   }
diff --git a/apps/pc_frontend/modules/friend/actions/actions.class.php b/apps/pc_frontend/modules/friend/actions/actions.class.php
index bfce3358b..fb4e71d84 100644
--- a/apps/pc_frontend/modules/friend/actions/actions.class.php
+++ b/apps/pc_frontend/modules/friend/actions/actions.class.php
@@ -39,7 +39,7 @@ public function executeList(opWebRequest $request)
   public function executeSmtList(opWebRequest $request)
   {
     $this->member = Doctrine::getTable('Member')->find($this->id);
-    sfConfig::set('op_smartphone_header', $this->member);
+    $this->getResponse()->setDisplayMember($this->member);
 
     return sfView::SUCCESS;
   }
@@ -55,7 +55,7 @@ public function executeSmtLink(opWebRequest $request)
   {
     $result = parent::executeLink($request);
 
-    sfConfig::set('op_smartphone_header', $this->member);
+    $this->getResponse()->setDisplayMember($this->member);
 
     return $result;
   }
diff --git a/apps/pc_frontend/modules/member/actions/actions.class.php b/apps/pc_frontend/modules/member/actions/actions.class.php
index 68a2973ae..f2b046ca8 100644
--- a/apps/pc_frontend/modules/member/actions/actions.class.php
+++ b/apps/pc_frontend/modules/member/actions/actions.class.php
@@ -153,7 +153,7 @@ public function executeSmtProfile(opWebRequest $request)
 
     $result = parent::executeProfile($request);
 
-    sfConfig::set('op_smartphone_header', $this->member);
+    $this->getResponse()->setDisplayMember($this->member);
 
     return $result;
   }
diff --git a/apps/pc_frontend/templates/smtLayoutGroup.php b/apps/pc_frontend/templates/smtLayoutGroup.php
index cc3a032ef..f4eeadfe6 100644
--- a/apps/pc_frontend/templates/smtLayoutGroup.php
+++ b/apps/pc_frontend/templates/smtLayoutGroup.php
@@ -33,7 +33,7 @@
 <?php include_javascripts() ?>
 </head>
 <body id="<?php printf('page_%s_%s', $this->getModuleName(), $this->getActionName()) ?>" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
-<?php $community = sfConfig::get('op_smartphone_header', false) ?>
+<?php $community = $sf_response->getDisplayCommunity() ?>
 <?php include_partial('global/tosaka', array('community' => $community)) ?>
 <div id="face" class="row">
   <?php if ($community): ?>
diff --git a/apps/pc_frontend/templates/smtLayoutMember.php b/apps/pc_frontend/templates/smtLayoutMember.php
index 48b541b1f..dc076e536 100644
--- a/apps/pc_frontend/templates/smtLayoutMember.php
+++ b/apps/pc_frontend/templates/smtLayoutMember.php
@@ -35,7 +35,7 @@
 <body id="<?php printf('page_%s_%s', $this->getModuleName(), $this->getActionName()) ?>" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
 <?php include_partial('global/tosaka') ?>
 <div id="face" class="row">
-  <?php $member = sfConfig::get('op_smartphone_header', $sf_user) ?>
+  <?php $member = $sf_response->getDisplayMember() ?>
   <?php if ($member): ?>
   <div class="span2">
     <?php echo op_image_tag_sf_image($member->getImageFileName(), array('size' => '48x48')) ?>
diff --git a/lib/response/opWebResponse.class.php b/lib/response/opWebResponse.class.php
index b293d5dcf..fd1282db6 100644
--- a/lib/response/opWebResponse.class.php
+++ b/lib/response/opWebResponse.class.php
@@ -31,6 +31,26 @@ public function getTitle()
     return $result;
   }
 
+  public function getDisplayMember()
+  {
+    return $this->displayMember;
+  }
+
+  public function setDisplayMember(Member $member)
+  {
+    $this->displayMember = $member;
+  }
+
+  public function getDisplayCommunity()
+  {
+    return $this->displayCommunity;
+  }
+
+  public function setDisplayCommunity(Community $community)
+  {
+    $this->displayCommunity = $community;
+  }
+
   public function generateMobileUidCookie()
   {
     $request = sfContext::getInstance()->getRequest();

From c2edba3e8b2b0e4e3621a7d9e33f330f49304021 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 6 Apr 2012 19:03:47 +0900
Subject: [PATCH 168/630] (fixes #2227) remove
 setDisplayMember,setDisplayCommunity,getDisplayMember,getDisplayCommunity
 function in opWebResponse method and use opSmartphoneLayoutUtil class method.

---
 .../community/actions/actions.class.php       | 12 +++---
 .../modules/friend/actions/actions.class.php  |  4 +-
 .../modules/member/actions/actions.class.php  |  2 +-
 apps/pc_frontend/templates/smtLayoutGroup.php | 13 ++++---
 .../pc_frontend/templates/smtLayoutMember.php |  9 ++---
 lib/response/opWebResponse.class.php          | 20 ----------
 lib/util/opSmartphoneLayoutUtil.class.php     | 37 +++++++++++++++++++
 7 files changed, 58 insertions(+), 39 deletions(-)
 create mode 100644 lib/util/opSmartphoneLayoutUtil.class.php

diff --git a/apps/pc_frontend/modules/community/actions/actions.class.php b/apps/pc_frontend/modules/community/actions/actions.class.php
index 4f69cdf0d..63c5db55e 100644
--- a/apps/pc_frontend/modules/community/actions/actions.class.php
+++ b/apps/pc_frontend/modules/community/actions/actions.class.php
@@ -42,7 +42,7 @@ public function executeSmtHome(opWebRequest $request)
     $this->community = Doctrine::getTable('Community')->find($this->id);
     $this->forward404Unless($this->community);
 
-    $this->getResponse()->setDisplayCommunity($this->community);
+    opSmartphoneLayoutUtil::setLayoutParameters(array('community' => $this->community));
 
     return sfView::SUCCESS;
   }
@@ -82,7 +82,7 @@ public function executeSmtEdit(opWebRequest $request)
     }
     else
     {
-      $this->getResponse()->setDisplayCommunity($this->community);
+      opSmartphoneLayoutUtil::setLayoutParameters(array('community' => $this->community));
     }
 
     return $result;
@@ -109,7 +109,7 @@ public function executeSmtMemberList(opWebRequest $request)
   {
     $result = parent::executeMemberList($request);
 
-    $this->getResponse()->setDisplayCommunity($this->community);
+    opSmartphoneLayoutUtil::setLayoutParameters(array('community' => $this->community));
 
     return $result;
   }
@@ -151,7 +151,7 @@ public function executeSmtJoinlist(opWebRequest $request)
       $this->targetMember = $this->getUser()->getMember();
     }
 
-    $this->getResponse()->setDisplayMember($this->targetMember);
+    opSmartphoneLayoutUtil::setLayoutParameters(array('member' => $this->member)); 
 
     return $result;
   }
@@ -177,7 +177,7 @@ public function executeSmtJoin(opWebRequest $request)
   {
     $result = parent::executeJoin($request);
 
-    $this->getResponse()->setDisplayCommunity($this->community);
+    opSmartphoneLayoutUtil::setLayoutParameters(array('community' => $this->community));
 
     return $result;
   }
@@ -203,7 +203,7 @@ public function executeSmtQuit(opWebRequest $request)
   {
     $result = parent::executeQuit($request);
 
-    $this->getResponse()->setDisplayCommunity($this->community);
+    opSmartphoneLayoutUtil::setLayoutParameters(array('community' => $this->community));
 
     return $result;
   }
diff --git a/apps/pc_frontend/modules/friend/actions/actions.class.php b/apps/pc_frontend/modules/friend/actions/actions.class.php
index fb4e71d84..f21aa8acc 100644
--- a/apps/pc_frontend/modules/friend/actions/actions.class.php
+++ b/apps/pc_frontend/modules/friend/actions/actions.class.php
@@ -39,7 +39,7 @@ public function executeList(opWebRequest $request)
   public function executeSmtList(opWebRequest $request)
   {
     $this->member = Doctrine::getTable('Member')->find($this->id);
-    $this->getResponse()->setDisplayMember($this->member);
+    opSmartphoneLayoutUtil::setLayoutParameters(array('member' => $this->member));
 
     return sfView::SUCCESS;
   }
@@ -55,7 +55,7 @@ public function executeSmtLink(opWebRequest $request)
   {
     $result = parent::executeLink($request);
 
-    $this->getResponse()->setDisplayMember($this->member);
+    opSmartphoneLayoutUtil::setLayoutParameters(array('member' => $this->member));
 
     return $result;
   }
diff --git a/apps/pc_frontend/modules/member/actions/actions.class.php b/apps/pc_frontend/modules/member/actions/actions.class.php
index f2b046ca8..3edb5101b 100644
--- a/apps/pc_frontend/modules/member/actions/actions.class.php
+++ b/apps/pc_frontend/modules/member/actions/actions.class.php
@@ -153,7 +153,7 @@ public function executeSmtProfile(opWebRequest $request)
 
     $result = parent::executeProfile($request);
 
-    $this->getResponse()->setDisplayMember($this->member);
+    opSmartphoneLayoutUtil::setLayoutParameters(array('member' => $this->member));
 
     return $result;
   }
diff --git a/apps/pc_frontend/templates/smtLayoutGroup.php b/apps/pc_frontend/templates/smtLayoutGroup.php
index f4eeadfe6..ed246043e 100644
--- a/apps/pc_frontend/templates/smtLayoutGroup.php
+++ b/apps/pc_frontend/templates/smtLayoutGroup.php
@@ -33,15 +33,18 @@
 <?php include_javascripts() ?>
 </head>
 <body id="<?php printf('page_%s_%s', $this->getModuleName(), $this->getActionName()) ?>" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
-<?php $community = $sf_response->getDisplayCommunity() ?>
-<?php include_partial('global/tosaka', array('community' => $community)) ?>
+<?php if (isset($op_layout['community'])): ?>
+<?php include_partial('global/tosaka', array('community' => $op_layout['community'])) ?>
+<?php else: ?>
+<?php include_partial('global/tosaka') ?>
+<?php endif ?>
 <div id="face" class="row">
-  <?php if ($community): ?>
+  <?php if (isset($op_layout['community'])): ?>
   <div class="span2">
-    <?php echo op_image_tag_sf_image($community->getImageFileName(), array('size' => '48x48')) ?>
+    <?php echo op_image_tag_sf_image($op_layout['community']->getImageFileName(), array('size' => '48x48')) ?>
   </div>
   <div class="span8">
-    <div class="row face-name"><?php echo $community->getName() ?></div>
+    <div class="row face-name"><?php echo $op_layout['community']->getName() ?></div>
   </div>
   <div class="span2 center"><?php echo link_to(op_image_tag('HomeIcon.png', array('height' => '48')), '@homepage') ?></div>
   <?php endif ?>
diff --git a/apps/pc_frontend/templates/smtLayoutMember.php b/apps/pc_frontend/templates/smtLayoutMember.php
index dc076e536..b904fdeb2 100644
--- a/apps/pc_frontend/templates/smtLayoutMember.php
+++ b/apps/pc_frontend/templates/smtLayoutMember.php
@@ -35,15 +35,14 @@
 <body id="<?php printf('page_%s_%s', $this->getModuleName(), $this->getActionName()) ?>" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
 <?php include_partial('global/tosaka') ?>
 <div id="face" class="row">
-  <?php $member = $sf_response->getDisplayMember() ?>
-  <?php if ($member): ?>
+  <?php if (isset($op_layout['member'])): ?>
   <div class="span2">
-    <?php echo op_image_tag_sf_image($member->getImageFileName(), array('size' => '48x48')) ?>
+    <?php echo op_image_tag_sf_image($op_layout['member']->getImageFileName(), array('size' => '48x48')) ?>
   </div>
   <div class="span8">
-    <div class="row face-name"><?php echo $member->getName() ?></div>
+    <div class="row face-name"><?php echo $op_layout['member']->getName() ?></div>
     <div class="row screen-name">
-      <?php $screenName = $member->getConfig('op_screen_name') ?>
+      <?php $screenName = $op_layout['member']->getConfig('op_screen_name') ?>
       <?php if ($screenName): ?>
       <a href="#">@<?php echo $screenName ?></a>
       <?php endif ?>
diff --git a/lib/response/opWebResponse.class.php b/lib/response/opWebResponse.class.php
index fd1282db6..b293d5dcf 100644
--- a/lib/response/opWebResponse.class.php
+++ b/lib/response/opWebResponse.class.php
@@ -31,26 +31,6 @@ public function getTitle()
     return $result;
   }
 
-  public function getDisplayMember()
-  {
-    return $this->displayMember;
-  }
-
-  public function setDisplayMember(Member $member)
-  {
-    $this->displayMember = $member;
-  }
-
-  public function getDisplayCommunity()
-  {
-    return $this->displayCommunity;
-  }
-
-  public function setDisplayCommunity(Community $community)
-  {
-    $this->displayCommunity = $community;
-  }
-
   public function generateMobileUidCookie()
   {
     $request = sfContext::getInstance()->getRequest();
diff --git a/lib/util/opSmartphoneLayoutUtil.class.php b/lib/util/opSmartphoneLayoutUtil.class.php
new file mode 100644
index 000000000..05a6fbfd7
--- /dev/null
+++ b/lib/util/opSmartphoneLayoutUtil.class.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * opNotificationCenter
+ *
+ * @package    OpenPNE
+ * @subpackage util
+ * @author     Shouta Kashiwagi <kashiwagi@tejimaya.com>
+ */
+class opSmartphoneLayoutUtil
+{
+  protected static $parameters;
+
+  static public function setLayoutParameters($parameters)
+  {
+    self::$parameters = $parameters;
+    sfContext::getInstance()->getEventDispatcher()->connect('template.filter_parameters', array(__CLASS__, 'filterTemplateParameters'));
+  }
+
+  static public function filterTemplateParameters(sfEvent $event, $parameters)
+  {
+    if (isset($parameters['sf_type']) && 'layout' === $parameters['sf_type'])
+    {
+      $parameters['op_layout'] = self::$parameters;
+    }
+
+    return $parameters;
+  }
+}

From 8b54c3afc16dde696b4c33ebbd6d91901a186223 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 6 Apr 2012 19:25:29 +0900
Subject: [PATCH 169/630] (fixes #2517, fixes #2708) updated the
 mobile_ip_address list

---
 lib/config/config/mobile_ip_address.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/config/config/mobile_ip_address.yml b/lib/config/config/mobile_ip_address.yml
index 5d1ea6072..b34b2b5ca 100644
--- a/lib/config/config/mobile_ip_address.yml
+++ b/lib/config/config/mobile_ip_address.yml
@@ -15,9 +15,8 @@
 ######################################
 
 ######################################
-#  2012/01/12 リリース版
-#  ・WILLCOM 2012/1/11 IPアドレス帯域の追加に対応
-#  ・DoCoMo, SoftBank の参照先URLを変更
+#  2012/03/23 リリース版
+#  ・au (2012年4月予定)IPアドレス帯域削除対応
 ######################################
 
 # DoCoMo (2010/06/24更新)
@@ -32,7 +31,7 @@ docomo:
   - 202.229.177.0/24
   - 202.229.178.0/24
 
-# au (2012/03/22更新)
+# au 2011年夏モデル以前 (2012/03/23更新)
 # http://www.au.kddi.com/ezfactory/tec/spec/ezsava_ip.html
 ezweb:
   - 210.230.128.224/28

From bfc258b3df1716ffa3dde0f6c7aa2326b9825714 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 6 Apr 2012 20:54:50 +0900
Subject: [PATCH 170/630] added opDoctrineEvent class (fixes #2916)

---
 lib/event/opDoctrineEvent.class.php        | 32 ++++++++++++++++++++++
 lib/util/opDoctrineEventNotifier.class.php |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 lib/event/opDoctrineEvent.class.php

diff --git a/lib/event/opDoctrineEvent.class.php b/lib/event/opDoctrineEvent.class.php
new file mode 100644
index 000000000..912c28eec
--- /dev/null
+++ b/lib/event/opDoctrineEvent.class.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * opDoctrineEvent
+ *
+ * @package    OpenPNE
+ * @subpackage event
+ * @author     Shouta Kashiwagi <kashwiagi@openpne.jp>
+ */
+class opDoctrineEvent extends sfEvent
+{
+  protected $doctrineEvent;
+
+  public function __construct(Doctrine_Event $event, $when, $action, $parameters = array())
+  {
+    parent::__construct($event->getInvoker(), sprintf('op_doctrine.%s_%s_%s', $when, $action, get_class($event->getInvoker())), $parameters);
+    $this->doctrineEvent = $event;
+  }
+
+  public function getDoctrineEvent()
+  {
+    return $this->doctrineEvent;
+  }
+}
diff --git a/lib/util/opDoctrineEventNotifier.class.php b/lib/util/opDoctrineEventNotifier.class.php
index 50a78a092..332f975fe 100644
--- a/lib/util/opDoctrineEventNotifier.class.php
+++ b/lib/util/opDoctrineEventNotifier.class.php
@@ -25,7 +25,7 @@ protected static function notify($when, $action, $doctrineEvent)
     }
 
     $dispatcher = sfContext::getInstance()->getEventDispatcher();
-    $dispatcher->notify(new sfEvent(null, sprintf('op_doctrine.%s_%s_%s', $when, $action, get_class($doctrineEvent->getInvoker())), array('object' => $doctrineEvent->getInvoker())));
+    $dispatcher->notify(new opDoctrineEvent($doctrineEvent, $when, $action));
   }
 
   public function preSave(Doctrine_Event $event)

From 3be54c51fc5a312d8a66671a6d91bf9f1fc3b84b Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 6 Apr 2012 21:01:27 +0900
Subject: [PATCH 171/630] added api unit test. (fixes #2908)

---
 test/unit/api/opJsonApiTest.php | 182 ++++++++++++++++++++++++++++++++
 1 file changed, 182 insertions(+)
 create mode 100644 test/unit/api/opJsonApiTest.php

diff --git a/test/unit/api/opJsonApiTest.php b/test/unit/api/opJsonApiTest.php
new file mode 100644
index 000000000..8e7589dfb
--- /dev/null
+++ b/test/unit/api/opJsonApiTest.php
@@ -0,0 +1,182 @@
+<?php
+$app = 'api';
+
+include_once dirname(__FILE__) . '/../../bootstrap/unit.php';
+include_once dirname(__FILE__) . '/../../bootstrap/database.php';
+
+$configuration = ProjectConfiguration::getApplicationConfiguration('api', 'test', isset($debug) ? $debug : true);
+sfContext::createInstance($configuration);
+
+$numOfTest = 42;
+
+$t = new lime_test($numOfTest, new lime_output_color());
+$browser = new opBrowser();
+
+/************************
+ * Test apiKey Response (5)
+ ************************/
+
+Doctrine::getTable('SnsConfig')->set('enable_jsonapi', false);
+$member1ApiKey = Doctrine::getTable('Member')->find(1)->getApiKey();
+
+$browser->get('/activity/search.json');
+$t->is($browser->getResponse()->getStatusCode(), 404, '[apiKey] JSON API is not enabled.');
+
+Doctrine::getTable('SnsConfig')->set('enable_jsonapi', true);
+
+$browser->get('/activity/search.json');
+$t->is($browser->getResponse()->getStatusCode(), 401, '[apiKey] apiKey not specified');
+
+$browser->get('/activity/search.json', array('apiKey' => ''));
+$t->is($browser->getResponse()->getStatusCode(), 401, '[apiKey] empty apiKey');
+
+$browser->get('/activity/search.json', array('apiKey' => 'aaaaaaaaaa'));
+$t->is($browser->getResponse()->getStatusCode(), 401, '[apiKey] invalid apiKey');
+
+$browser->get('/activity/search.json', array('apiKey' => $member1ApiKey));
+$t->is($browser->getResponse()->getStatusCode(), 200, '[apiKey] valid apiKey');
+
+/****************************
+ * Test activity/search.json (10)
+ ***************************/
+
+$browser->get('/activity/search.json', array('apiKey' => $member1ApiKey));
+$t->is($browser->getResponse()->getStatusCode(), 200, '[activity/search.json] valid request');
+
+$browser->get('/activity/search.json', array('apiKey' => $member1ApiKey, 'target' => 'hoge'));
+$t->is($browser->getResponse()->getStatusCode(), 400, '[activity/search.json] invalid parameter');
+
+$browser->get('/activity/search.json', array('apiKey' => $member1ApiKey, 'target' => 'friend'));
+$t->is($browser->getResponse()->getStatusCode(), 200, '[activity/search.json] target => friend is valid parameter.');
+
+$browser->get('/activity/search.json', array('apiKey' => $member1ApiKey, 'target' => 'community'));
+$t->is($browser->getResponse()->getStatusCode(), 400, '[activity/search.json] target => community parameter requires target_id parameter.');
+
+$browser->get('/activity/seaech.json', array('apiKey' => $member1ApiKey, 'target' => 'community', 'target_id' => '1'));
+$t->is($browser->getResponse()->getStatusCode(), 200, '[activity/search.json] target => community is valid parameter.');
+
+$browser->get('/activity/search.json', array('apiKey' => $member1ApiKey, 'activity_id' => ''));
+$t->is($browser->getResponse()->getStatusCode(), 400, '[activity/search.json] activiy_id parameter is not set.');
+
+$browser->get('/activity/search.json', array('apiKey' => $member1ApiKey, 'activity_id' => 'hogefuga'));
+$t->is($browser->getResponse()->getStatusCode(), 400, '[activity/search.json] activity_id => hogefuga is invalid parameter');
+
+$browser->get('/activity/search.json', array('apiKey' => $member1ApiKey, 'activity_id' => '1'));
+$t->is($browser->getResponse()->getStatusCode(), 200, '[activity/search.json] activity_id => 1 is valid parameter');
+
+$browser->get('/activity/search.json', array('apiKey' => $member1ApiKey, 'member_id' => ''));
+$t->is($browser->getResponse()->getStatusCode(), 200, '[activity/search.json] member_id parameter is valid parameter.');
+
+$browser->get('/activity/search.json', array('apiKey' => $member1ApiKey, 'max_id' => '', 'since_id' => ''));
+$t->is($browser->getResponse()->getStatusCode(), 200, '[activity/search.json] max_id and since_id parameter is valid parameter.');
+
+
+/*************************
+ * Test activity/post.json (7)
+ *************************/
+
+$browser->get('/activity/post.json', array('apiKey' => $member1ApiKey));
+$t->is($browser->getResponse()->getStatusCode(), 400, '[activity/post.json] body parameter is required.');
+
+$browser->get('/activity/post.json', array('apiKey' => $member1ApiKey, 'body' => 'hogefuga'));
+$t->is($browser->getResponse()->getStatusCode(), 200, '[activity/post.json] body => hogefuga parameter should be posted.');
+
+$browser->get('/activity/post.json', array('apiKey' => $member1ApiKey, 'body' => ' '));
+$t->is($browser->getResponse()->getStatusCode(), 400, '[activity/post.json] body => (space) parameter should be rejected.');
+
+$browser->get('/activity/post.json', array('apiKey' => $member1ApiKey, 'body' => '\t'));
+$t->is($browser->getResponse()->getStatusCode(), 400, '[activity/post.json] body => (tabs) parameter should be rejected.');
+
+$browser->get('/activity/post.json', array('apiKey' => $member1ApiKey, 'body' => 'hogefuga', 'target' => 'hoge'));
+$t->is($browser->getResponse()->getStatusCode(), 200, '[activity/post.json] target parameter (except: \'community\') should not be set.');
+
+$browser->get('/activity/post.json', array('apiKey' => $member1ApiKey, 'body' => 'hogefuga', 'target' => 'community'));
+$t->is($browser->getResponse()->getStatusCode(), 400, '[activity/post.json] target_id parameter is required.');
+
+$browser->get('/activity/post.json', array('apiKey' => $member1ApiKey, 'body' => 'hogefuga', 'target_id' => 'community', 'target_id' => '1'));
+$t->is($browser->getResponse()->getStatusCode(), 200, '[activity/post.json] target => community and target_id => 1 parameter should be posted.');
+
+
+/*******************************
+ * Test activity/delete.json (4)
+ *******************************/
+
+$browser->get('/activity/delete.json', array('apiKey' => $member1ApiKey));
+$t->is($browser->getResponse()->getStatusCode(), 400, '[activity/delete.json] activity_id parameter is required.');
+
+$browser->get('/activity/delete.json', array('apiKey' => $member1ApiKey, 'activity_id' => 1));
+$t->is($browser->getResponse()->getStatusCode(), 200, '[activity/delete.json] activity_id => 1 is valid parameter.');
+
+$browser->get('/activity/delete.json', array('apiKey' => $member1ApiKey, 'id' => 2));
+$t->is($browser->getResponse()->getStatusCode(), 404, '[activity/delete.json] id => 2 parameter is invalid parameter (not found).');
+
+$browser->get('/activity/delete.json', array('apiKey' => $member1ApiKey, 'activity_id' => 3));
+$t->is($browser->getResponse()->getStatusCode(), 403, '[activity/delete.json] id => 3 activity data is not allowed to delete.');
+
+
+/********************************
+ * test member/search.json (5)
+ ********************************/
+
+$browser->get('/member/search.json', array('apiKey' => $member1ApiKey, 'target' => 'friend'));
+$t->is($browser->getResponse()->getStatusCode(), 400, '[member/search.json] target => friend parameter is invalid.');
+
+$browser->get('/member/search.json', array('apiKey' => $member1ApiKey, 'target' => 'friend', 'target_id' => 1));
+$t->is($browser->getResponse()->getStatusCode(), 200, '[member/search.json] target => friend and target_id parameter is valid.');
+
+$browser->get('/member/search.json', array('apiKey' => $member1ApiKey, 'target' =>'community'));
+$t->is($browser->getResponse()->getStatusCode(), 400, '[member/search.json] target => community parameter is invalid.');
+
+$browser->get('/member/search.json', array('apiKey' => $member1ApiKey, 'target' =>'community', 'target_id' => 1));
+$t->is($browser->getResponse()->getStatusCode(), 200, '[member/search.json] target => community and target_id parameter is valid.');
+
+$browser->get('/member/search.json', array('apiKey' => $member1ApiKey, 'keyword' => 'dummy'));
+$t->is($browser->getResponse()->getStatusCode(), 200, '[member/search.json] target => dummy parameter id valid.');
+
+
+/*******************************
+ * test community/search.json (9)
+ *******************************/
+
+$browser->get('/community/search.json', array('apiKey' => $member1ApiKey, 'keyword' => 'dummy'));
+$t->is($browser->getResponse()->getStatusCode(), 200, '[community/search.json] keyword => dummy parameter is valid.');
+
+$browser->get('/community/member.json', array('apiKey' => $member1ApiKey,));
+$t->is($browser->getResponse()->getStatusCode(), 400, '[community/member.json] community_id parameter is required.');
+
+$browser->get('/community/member.json', array('apiKey' => $member1ApiKey, 'community_id' => '1'));
+$t->is($browser->getResponse()->getStatusCode(), 200, '[community/member.json] community_id => 1 parameter is valid.');
+
+$browser->get('/community/join.json', array('apiKey' => $member1ApiKey,));
+$t->is($browser->getResponse()->getStatusCode(), 400, '[community/join.json] community_id parameter is required.');
+
+$browser->get('/community/join.json', array('apiKey' => $member1ApiKey, 'community_id' => 10000));
+$t->is($browser->getResponse()->getStatusCode(), 404, '[community/join.json] community_id => 10000 does not exist.');
+
+$browser->get('/community/join.json', array('apiKey' => $member1ApiKey, 'community_id' => 1));
+$t->is($browser->getResponse()->getStatusCode(), 400, '[community/join.json] community_id => 1 is already joined.');
+
+$browser->get('/community/join.json', array('apiKey' => $member1ApiKey, 'community_id' => 2));
+$t->is($browser->getResponse()->getStatusCode(), 200, '[community/join.json] community_id => 2 parameter is valid.');
+
+$browser->get('/community/join.json', array('apiKey' => $member1ApiKey, 'community_id' => 2, 'leave' => 'true'));
+$t->is($browser->getResponse()->getStatusCode(), 200, '[community/join.json] community_id => 2 and leave => true parameter is valid.');
+
+$browser->get('/community/join.json', array('apiKey' => $member1ApiKey, 'community_id' => 1, 'leave' => 'true'));
+$t->is($browser->getResponse()->getStatusCode(), 400, '[community/join.json] This member cannot leave this community (community_id => 1)');
+
+
+/*******************************
+ * test push/count.json (1)
+ ******************************/
+
+$browser->get('/push/count.json', array('apiKey' => $member1ApiKey));
+$t->is($browser->getResponse()->getStatusCode(), 200, '[push/count.json] valid.');
+
+/*******************************
+ * test push/search.json (1)
+ ******************************/
+
+$browser->get('/push/search.json', array('apiKey' => $member1ApiKey));
+$t->is($browser->getResponse()->getStatusCode(), 200, '[push/search.json] valid.');
+

From 4ad01d6ca9ed72bc3d4fe304ed77d18a527a710c Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 6 Apr 2012 22:16:04 +0900
Subject: [PATCH 172/630] (fixes #2916) modified to get array access.

---
 lib/event/opDoctrineEvent.class.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/event/opDoctrineEvent.class.php b/lib/event/opDoctrineEvent.class.php
index 912c28eec..1fc78a923 100644
--- a/lib/event/opDoctrineEvent.class.php
+++ b/lib/event/opDoctrineEvent.class.php
@@ -21,7 +21,10 @@ class opDoctrineEvent extends sfEvent
 
   public function __construct(Doctrine_Event $event, $when, $action, $parameters = array())
   {
-    parent::__construct($event->getInvoker(), sprintf('op_doctrine.%s_%s_%s', $when, $action, get_class($event->getInvoker())), $parameters);
+    $invoker = $event->getInvoker();
+    $parameters['record'] = $invoker;
+
+    parent::__construct($invoker, sprintf('op_doctrine.%s_%s_%s', $when, $action, get_class($invoker)), $parameters);
     $this->doctrineEvent = $event;
   }
 
@@ -29,4 +32,9 @@ public function getDoctrineEvent()
   {
     return $this->doctrineEvent;
   }
+
+  public function getSubject()
+  {
+    return $this['record'];
+  }
 }

From 76eedd0fb8801f8fac128d8761d999ddd8b1d331 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 6 Apr 2012 22:34:34 +0900
Subject: [PATCH 173/630] version 3.8beta1

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index f92c3fb10..ee7416832 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8beta1-dev');
+  define('OPENPNE_VERSION', '3.8beta1');
 }

From 3996585b873dff5c46a1d5ea475022e6ac792839 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 6 Apr 2012 22:37:03 +0900
Subject: [PATCH 174/630] started developing OpenPNE 3.8RC1

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index ee7416832..58badd16a 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8beta1');
+  define('OPENPNE_VERSION', '3.8RC1-dev');
 }

From 0bf48d2f59843155d4e8879f9b08898032f7be21 Mon Sep 17 00:00:00 2001
From: kashiwasan <kashiwagi@tejimaya.com>
Date: Fri, 25 Nov 2011 16:57:31 +0900
Subject: [PATCH 175/630] (refs #2621) added member's default community.

---
 data/fixtures/011_import_first_community.yml | 45 ++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 data/fixtures/011_import_first_community.yml

diff --git a/data/fixtures/011_import_first_community.yml b/data/fixtures/011_import_first_community.yml
new file mode 100644
index 000000000..0f632f403
--- /dev/null
+++ b/data/fixtures/011_import_first_community.yml
@@ -0,0 +1,45 @@
+Community:
+  first_community:
+    name: "all"
+
+CommunityConfig:
+  public_flag:
+    community_id: 1
+    name: "public_flag"
+    value: "public"
+  topic_authority:
+    community_id: 1
+    name: "topic_authority"
+    value: "public"
+  register_policy:
+    community_id: 1
+    name: "register_policy"
+    value: "open"
+  description:
+    community_id: 1
+    name: "description"
+    value: "This community includes all member."
+  is_send_pc_joinCommunity_mail:
+    community_id: 1
+    name: "is_send_pc_joinCommunity_mail"
+    value: "1"
+  is_default:
+    community_id: 1
+    name: "is_default"
+    value: 1
+
+CommunityMember:
+  first_member:
+    community_id: 1
+    member_id: 1
+    is_pre: 0
+    is_receive_mail_pc: 0
+
+CommunityMemberPosition:
+  first_member:
+    community_id: 1
+    member_id: 1
+    community_member_id: 1
+    name: "admin"
+
+

From 9014ef690d14b3fd6301b36d0eb6509d32461c3d Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Mon, 9 Apr 2012 14:30:26 +0900
Subject: [PATCH 176/630] (refs #2623) fixed task to be able to install openpne
 without internet connection

---
 lib/task/opPluginSyncTask.class.php   | 4 ++--
 lib/task/openpneInstallTask.class.php | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/task/opPluginSyncTask.class.php b/lib/task/opPluginSyncTask.class.php
index 60b6731c5..ab64780dd 100644
--- a/lib/task/opPluginSyncTask.class.php
+++ b/lib/task/opPluginSyncTask.class.php
@@ -125,8 +125,8 @@ protected function getPluginList()
     }
     catch (Zend_Http_Client_Adapter_Exception $e)
     {
-      $str = "Failed to download plugins list.";
-      $this->logBlock($str, 'ERROR');
+      $str = "No Internet Connection.";
+      $this->logBlock($str, 'COMMENT');
     }
 
     return $list;
diff --git a/lib/task/openpneInstallTask.class.php b/lib/task/openpneInstallTask.class.php
index 4e64c7e31..33ca2bf6a 100644
--- a/lib/task/openpneInstallTask.class.php
+++ b/lib/task/openpneInstallTask.class.php
@@ -20,6 +20,7 @@ protected function configure()
       new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'prod'),
       new sfCommandOption('redo', null, sfCommandOption::PARAMETER_NONE, 'Executes a reinstall'),
       new sfCommandOption('non-recreate-db', null, sfCommandOption::PARAMETER_NONE, 'Non recreate DB'),
+      new sfCommandOption('internet', null, sfCommandOption::PARAMETER_NONE, 'Connect Internet Option to download plugins list.'),
     ));
 
     $this->briefDescription = 'Install OpenPNE';
@@ -136,7 +137,10 @@ protected function doInstall($dbms, $username, $password, $hostname, $port, $dbn
     {
       $this->logSection('installer', 'start clean install');
     }
-    $this->installPlugins();
+    if ($options['internet'])
+    {
+      $this->installPlugins();
+    }
     @$this->fixPerms();
     @$this->clearCache();
     if (!$options['redo'])

From 4a774d70f854959ec6f8a780432a1e8b7dacd09c Mon Sep 17 00:00:00 2001
From: kashiwasan <kashiwagi@tejimaya.com>
Date: Fri, 25 Nov 2011 18:05:36 +0900
Subject: [PATCH 177/630] (refs #2622) added openpne:fast-install task.

---
 lib/task/openpneFastInstallTask.class.php | 245 ++++++++++++++++++++++
 1 file changed, 245 insertions(+)
 create mode 100644 lib/task/openpneFastInstallTask.class.php

diff --git a/lib/task/openpneFastInstallTask.class.php b/lib/task/openpneFastInstallTask.class.php
new file mode 100644
index 000000000..3daf0378f
--- /dev/null
+++ b/lib/task/openpneFastInstallTask.class.php
@@ -0,0 +1,245 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * openpne:fast-install task. enables one-liner install.
+ *
+ * @auther Hiromi Hishida <info@77-web.com>
+ */
+
+class openpneFastInstallTask extends sfDoctrineBaseTask
+{
+  protected function configure()
+  {
+    $this->namespace        = 'openpne';
+    $this->name             = 'fast-install';
+
+    $this->addOptions(array(
+      new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', null),
+      new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'prod'),
+      new sfCommandOption('dbms', 'mysql', sfCommandOption::PARAMETER_OPTIONAL, 'The dbms for database connection. mysql or sqlite'),
+      new sfCommandOption('dbuser', null, sfCommandOption::PARAMETER_OPTIONAL, 'A username for database connection.'),
+      new sfCommandOption('dbpassword', null, sfCommandOption::PARAMETER_OPTIONAL, 'A password for database connection.'),
+      new sfCommandOption('dbhost', null, sfCommandOption::PARAMETER_OPTIONAL, 'A hostname for database connection.'),
+      new sfCommandOption('dbport', null, sfCommandOption::PARAMETER_OPTIONAL, 'A port number for database conection.'),
+      new sfCommandOption('dbname', null, sfCommandOption::PARAMETER_REQUIRED, 'A database name for database connection.'),
+      new sfCommandOption('dbsock', null, sfCommandOption::PARAMETER_OPTIONAL, 'A database socket path for database connection.'),
+    ));
+
+    $this->briefDescription = 'Install OpenPNE';
+    $this->detailedDescription = <<<EOF
+The [openpne:fast-install] task installs and configures OpenPNE.
+Call it with:
+
+  [./symfony openpne:fast-install --dbms=mysql --dbuser=your-username --dbpassword=your-password --dbname=your-dbname --dbhost=localhost]
+
+EOF;
+  }
+
+  protected function execute($arguments = array(), $options = array())
+  {
+    $dbms = $options['dbms'];
+    $username = $options['dbuser'];
+    $password = $options['dbpassword'];
+    $hostname = $options['dbhost'];
+    $dbname = $options['dbname'];
+    $port = $options['dbport'];
+    $sock = $options['dbsock'];
+    
+    if (empty($dbms))
+    {
+      $this->logSection('installer', 'task aborted: empty dbms');
+      return 1;
+    }
+
+    if ($dbms !== 'sqlite')
+    {
+      if(empty($username))
+      {
+        $this->logSection('installer', 'task aborted: dbuser is empty');
+        return 1;
+      }
+      
+      if(empty($hostname))
+      {
+        $hostname = '127.0.0.1';
+      }
+    }
+    else
+    {
+      $dbname = realpath(dirname($dbname)).DIRECTORY_SEPARATOR.basename($dbname);
+    }
+    
+    unset($options['dbms'], $options['dbuser'], $options['dbpassword'], $options['dbname'], $options['dbhost'], $options['dbport'], $options['dbsock']);
+    $this->doInstall($dbms, $username, $password, $hostname, $port, $dbname, $sock, $options);
+
+    if ($dbms === 'sqlite')
+    {
+      $this->getFilesystem()->chmod($dbname, 0666);
+    }
+
+    $this->publishAssets();
+
+    // _PEAR_call_destructors() causes an E_STRICT error
+    error_reporting(error_reporting() & ~E_STRICT);
+
+    $this->logSection('installer', 'installation is completed!');
+  }
+
+  protected function doInstall($dbms, $username, $password, $hostname, $port, $dbname, $sock, $options)
+  {
+    $this->installPlugins();
+    @$this->fixPerms();
+    @$this->clearCache();
+    $this->configureDatabase($dbms, $username, $password, $hostname, $port, $dbname, $sock, $options);
+    $this->buildDb($options);
+  }
+
+  protected function createDSN($dbms, $hostname, $port, $dbname, $sock)
+  {
+    $result = $dbms.':';
+
+    $data = array();
+
+    if ($dbname)
+    {
+      if ($dbms === 'sqlite')
+      {
+        $data[] = $dbname;
+      }
+      else
+      {
+        $data[] = 'dbname='.$dbname;
+      }
+    }
+
+    if ($hostname)
+    {
+      $data[] = 'host='.$hostname;
+    }
+
+    if ($port)
+    {
+      $data[] = 'port='.$port;
+    }
+
+    if ($sock)
+    {
+      $data[] = 'unix_socket='.$sock;
+    }
+
+    $result .= implode(';', $data);
+    return $result;
+  }
+
+  protected function configureDatabase($dbms, $username, $password, $hostname, $port, $dbname, $sock, $options)
+  {
+    $dsn = $this->createDSN($dbms, $hostname, $port, $dbname, $sock);
+
+    $file = sfConfig::get('sf_config_dir').'/databases.yml';
+    $config = array();
+
+    if (file_exists($file))
+    {
+      $config = sfYaml::load($file);
+    }
+
+    $env = 'all';
+    if ('prod' !== $options['env'])
+    {
+      $env = $options['env'];
+    }
+
+    $config[$env]['doctrine'] = array(
+      'class' => 'sfDoctrineDatabase',
+      'param' => array(
+        'dsn'        => $dsn,
+        'username'   => $username,
+        'encoding'   => 'utf8',
+        'attributes' => array(
+           Doctrine::ATTR_USE_DQL_CALLBACKS => true,
+        ),
+      ),
+    );
+
+    if ($password)
+    {
+      $config[$env]['doctrine']['param']['password'] = $password;
+    }
+
+    file_put_contents($file, sfYaml::dump($config, 4));
+  }
+
+  protected function clearCache()
+  {
+    $cc = new sfCacheClearTask($this->dispatcher, $this->formatter);
+    $cc->run();
+  }
+
+  protected function publishAssets()
+  {
+    $publishAssets = new sfPluginPublishAssetsTask($this->dispatcher, $this->formatter);
+    $publishAssets->run();
+  }
+
+  protected function buildDb($options)
+  {
+    $tmpdir = sfConfig::get('sf_data_dir').'/fixtures_tmp';
+    $this->getFilesystem()->mkdirs($tmpdir);
+    $this->getFilesystem()->remove(sfFinder::type('file')->in(array($tmpdir)));
+
+    $pluginDirs = sfFinder::type('dir')->name('data')->in(sfFinder::type('dir')->name('op*Plugin')->maxdepth(1)->in(sfConfig::get('sf_plugins_dir')));
+    $fixturesDirs = sfFinder::type('dir')->name('fixtures')
+      ->prune('migrations', 'upgrade')
+      ->in(array_merge(array(sfConfig::get('sf_data_dir')), $this->configuration->getPluginSubPaths('/data'), $pluginDirs));
+    $i = 0;
+    foreach ($fixturesDirs as $fixturesDir)
+    {
+      $files = sfFinder::type('file')->name('*.yml')->sort_by_name()->in(array($fixturesDir));
+      
+      foreach ($files as $file)
+      {
+        $this->getFilesystem()->copy($file, $tmpdir.'/'.sprintf('%03d_%s_%s.yml', $i, basename($file, '.yml'), md5(uniqid(rand(), true))));
+      }
+      $i++;
+    }
+
+    $task = new sfDoctrineBuildTask($this->dispatcher, $this->formatter);
+    $task->setCommandApplication($this->commandApplication);
+    $task->setConfiguration($this->configuration);
+    $task->run(array(), array(
+      'no-confirmation' => true,
+      'db'              => true,
+      'model'           => true,
+      'forms'           => true,
+      'filters'         => true,
+      'sql'             => true,
+      'and-load'        => $tmpdir,
+      'application'     => $options['application'],
+      'env'             => $options['env'],
+    ));
+
+    $this->getFilesystem()->remove(sfFinder::type('file')->in(array($tmpdir)));
+    $this->getFilesystem()->remove($tmpdir);
+  }
+
+  protected function installPlugins()
+  {
+    $task = new opPluginSyncTask($this->dispatcher, $this->formatter);
+    $task->run();
+  }
+
+  protected function fixPerms()
+  {
+    $permissions = new openpnePermissionTask($this->dispatcher, $this->formatter);
+    $permissions->run();
+  }
+
+}

From a5968849d1458603cbc99b024f11e0abaf0c7422 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Mon, 9 Apr 2012 14:35:53 +0900
Subject: [PATCH 178/630] added no internt connection options in
 openpne:fast-install

---
 lib/task/openpneFastInstallTask.class.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/task/openpneFastInstallTask.class.php b/lib/task/openpneFastInstallTask.class.php
index 3daf0378f..ac0527ec0 100644
--- a/lib/task/openpneFastInstallTask.class.php
+++ b/lib/task/openpneFastInstallTask.class.php
@@ -31,6 +31,7 @@ protected function configure()
       new sfCommandOption('dbport', null, sfCommandOption::PARAMETER_OPTIONAL, 'A port number for database conection.'),
       new sfCommandOption('dbname', null, sfCommandOption::PARAMETER_REQUIRED, 'A database name for database connection.'),
       new sfCommandOption('dbsock', null, sfCommandOption::PARAMETER_OPTIONAL, 'A database socket path for database connection.'),
+      new sfCommandOption('internet', null, sfCommandOption::PARAMETER_NONE, 'Connect Internet Option to download plugins list.'),
     ));
 
     $this->briefDescription = 'Install OpenPNE';
@@ -38,7 +39,7 @@ protected function configure()
 The [openpne:fast-install] task installs and configures OpenPNE.
 Call it with:
 
-  [./symfony openpne:fast-install --dbms=mysql --dbuser=your-username --dbpassword=your-password --dbname=your-dbname --dbhost=localhost]
+  [./symfony openpne:fast-install --dbms=mysql --dbuser=your-username --dbpassword=your-password --dbname=your-dbname --dbhost=localhost --internet]
 
 EOF;
   }
@@ -95,7 +96,10 @@ protected function execute($arguments = array(), $options = array())
 
   protected function doInstall($dbms, $username, $password, $hostname, $port, $dbname, $sock, $options)
   {
-    $this->installPlugins();
+    if ($options['internet'])
+    {
+      $this->installPlugins();
+    }
     @$this->fixPerms();
     @$this->clearCache();
     $this->configureDatabase($dbms, $username, $password, $hostname, $port, $dbname, $sock, $options);

From fe8c8c797b9e4646efd3df34768ec0431421e8c6 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Mon, 9 Apr 2012 14:38:05 +0900
Subject: [PATCH 179/630] Revert "added no internt connection options in
 openpne:fast-install"

This reverts commit a5968849d1458603cbc99b024f11e0abaf0c7422.
---
 lib/task/openpneFastInstallTask.class.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/task/openpneFastInstallTask.class.php b/lib/task/openpneFastInstallTask.class.php
index ac0527ec0..3daf0378f 100644
--- a/lib/task/openpneFastInstallTask.class.php
+++ b/lib/task/openpneFastInstallTask.class.php
@@ -31,7 +31,6 @@ protected function configure()
       new sfCommandOption('dbport', null, sfCommandOption::PARAMETER_OPTIONAL, 'A port number for database conection.'),
       new sfCommandOption('dbname', null, sfCommandOption::PARAMETER_REQUIRED, 'A database name for database connection.'),
       new sfCommandOption('dbsock', null, sfCommandOption::PARAMETER_OPTIONAL, 'A database socket path for database connection.'),
-      new sfCommandOption('internet', null, sfCommandOption::PARAMETER_NONE, 'Connect Internet Option to download plugins list.'),
     ));
 
     $this->briefDescription = 'Install OpenPNE';
@@ -39,7 +38,7 @@ protected function configure()
 The [openpne:fast-install] task installs and configures OpenPNE.
 Call it with:
 
-  [./symfony openpne:fast-install --dbms=mysql --dbuser=your-username --dbpassword=your-password --dbname=your-dbname --dbhost=localhost --internet]
+  [./symfony openpne:fast-install --dbms=mysql --dbuser=your-username --dbpassword=your-password --dbname=your-dbname --dbhost=localhost]
 
 EOF;
   }
@@ -96,10 +95,7 @@ protected function execute($arguments = array(), $options = array())
 
   protected function doInstall($dbms, $username, $password, $hostname, $port, $dbname, $sock, $options)
   {
-    if ($options['internet'])
-    {
-      $this->installPlugins();
-    }
+    $this->installPlugins();
     @$this->fixPerms();
     @$this->clearCache();
     $this->configureDatabase($dbms, $username, $password, $hostname, $port, $dbname, $sock, $options);

From a135a3aec250cfb327028a27c3a0487ec5190891 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Mon, 9 Apr 2012 14:35:53 +0900
Subject: [PATCH 180/630] added no internt connection options in
 openpne:fast-install (fixes #2625)

---
 lib/task/openpneFastInstallTask.class.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/task/openpneFastInstallTask.class.php b/lib/task/openpneFastInstallTask.class.php
index 3daf0378f..ac0527ec0 100644
--- a/lib/task/openpneFastInstallTask.class.php
+++ b/lib/task/openpneFastInstallTask.class.php
@@ -31,6 +31,7 @@ protected function configure()
       new sfCommandOption('dbport', null, sfCommandOption::PARAMETER_OPTIONAL, 'A port number for database conection.'),
       new sfCommandOption('dbname', null, sfCommandOption::PARAMETER_REQUIRED, 'A database name for database connection.'),
       new sfCommandOption('dbsock', null, sfCommandOption::PARAMETER_OPTIONAL, 'A database socket path for database connection.'),
+      new sfCommandOption('internet', null, sfCommandOption::PARAMETER_NONE, 'Connect Internet Option to download plugins list.'),
     ));
 
     $this->briefDescription = 'Install OpenPNE';
@@ -38,7 +39,7 @@ protected function configure()
 The [openpne:fast-install] task installs and configures OpenPNE.
 Call it with:
 
-  [./symfony openpne:fast-install --dbms=mysql --dbuser=your-username --dbpassword=your-password --dbname=your-dbname --dbhost=localhost]
+  [./symfony openpne:fast-install --dbms=mysql --dbuser=your-username --dbpassword=your-password --dbname=your-dbname --dbhost=localhost --internet]
 
 EOF;
   }
@@ -95,7 +96,10 @@ protected function execute($arguments = array(), $options = array())
 
   protected function doInstall($dbms, $username, $password, $hostname, $port, $dbname, $sock, $options)
   {
-    $this->installPlugins();
+    if ($options['internet'])
+    {
+      $this->installPlugins();
+    }
     @$this->fixPerms();
     @$this->clearCache();
     $this->configureDatabase($dbms, $username, $password, $hostname, $port, $dbname, $sock, $options);

From b5d6f83a9946e227b52804426d5990e89df12a6b Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 12 Apr 2012 18:23:54 +0900
Subject: [PATCH 181/630] added 'Reset' catalogue. (fixes #2960, BP from #2939)

---
 apps/pc_frontend/i18n/messages.ja.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/pc_frontend/i18n/messages.ja.xml b/apps/pc_frontend/i18n/messages.ja.xml
index 498a6c06e..f3409b4ef 100644
--- a/apps/pc_frontend/i18n/messages.ja.xml
+++ b/apps/pc_frontend/i18n/messages.ja.xml
@@ -1391,6 +1391,10 @@
         <source>There is no new notification.</source>
         <target>新しい通知はありません</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>Reset</source>
+        <target>リセット</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>

From 7d03e96151f753694fdbdfbcd5fce84727880039 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Mon, 16 Apr 2012 16:03:20 +0900
Subject: [PATCH 182/630] (fixes #2622) fixed for coding standards.

---
 lib/task/openpneFastInstallTask.class.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/task/openpneFastInstallTask.class.php b/lib/task/openpneFastInstallTask.class.php
index ac0527ec0..3b18f2f53 100644
--- a/lib/task/openpneFastInstallTask.class.php
+++ b/lib/task/openpneFastInstallTask.class.php
@@ -57,14 +57,16 @@ protected function execute($arguments = array(), $options = array())
     if (empty($dbms))
     {
       $this->logSection('installer', 'task aborted: empty dbms');
+
       return 1;
     }
 
-    if ($dbms !== 'sqlite')
+    if ('sqlite' !== $dbms)
     {
       if(empty($username))
       {
         $this->logSection('installer', 'task aborted: dbuser is empty');
+
         return 1;
       }
       
@@ -81,7 +83,7 @@ protected function execute($arguments = array(), $options = array())
     unset($options['dbms'], $options['dbuser'], $options['dbpassword'], $options['dbname'], $options['dbhost'], $options['dbport'], $options['dbsock']);
     $this->doInstall($dbms, $username, $password, $hostname, $port, $dbname, $sock, $options);
 
-    if ($dbms === 'sqlite')
+    if ('sqlite' === $dbms)
     {
       $this->getFilesystem()->chmod($dbname, 0666);
     }
@@ -114,7 +116,7 @@ protected function createDSN($dbms, $hostname, $port, $dbname, $sock)
 
     if ($dbname)
     {
-      if ($dbms === 'sqlite')
+      if ('sqlite' === $dbms)
       {
         $data[] = $dbname;
       }
@@ -140,6 +142,7 @@ protected function createDSN($dbms, $hostname, $port, $dbname, $sock)
     }
 
     $result .= implode(';', $data);
+
     return $result;
   }
 

From 9d43aff9fc99d5b9e66c6f2771eefab9d159c15c Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Mon, 16 Apr 2012 16:05:29 +0900
Subject: [PATCH 183/630] (fixes #2622) fixed to check dbname parameter in
 openpne:fast-install task.

---
 lib/task/openpneFastInstallTask.class.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/task/openpneFastInstallTask.class.php b/lib/task/openpneFastInstallTask.class.php
index 3b18f2f53..94a75aba1 100644
--- a/lib/task/openpneFastInstallTask.class.php
+++ b/lib/task/openpneFastInstallTask.class.php
@@ -61,6 +61,13 @@ protected function execute($arguments = array(), $options = array())
       return 1;
     }
 
+    if (empty($dbname))
+    {
+      $this->logSection('installer', 'task aborted: empty dbname');
+
+      return 1;
+    }
+
     if ('sqlite' !== $dbms)
     {
       if(empty($username))

From 18e34836739fcc447b942cf2c353c78084a57949 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Tue, 17 Apr 2012 15:41:47 +0900
Subject: [PATCH 184/630] modified first community description (fixes #2969, BP
 from #2621)

---
 data/fixtures/011_import_first_community.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/fixtures/011_import_first_community.yml b/data/fixtures/011_import_first_community.yml
index 0f632f403..b11623c6b 100644
--- a/data/fixtures/011_import_first_community.yml
+++ b/data/fixtures/011_import_first_community.yml
@@ -18,7 +18,7 @@ CommunityConfig:
   description:
     community_id: 1
     name: "description"
-    value: "This community includes all member."
+    value: "このコミュニティはSNSメンバー全員を含んでいます。"
   is_send_pc_joinCommunity_mail:
     community_id: 1
     name: "is_send_pc_joinCommunity_mail"

From 212b5907223d7f43345524d2420a80cca3c5f79a Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 12 Apr 2012 15:19:18 +0900
Subject: [PATCH 185/630] add link for back to previous page for smartphone
 (fixes #2965, #2966, BP from #2931, #2932)

---
 .../modules/default/templates/smtPrivacyPolicySuccess.php    | 5 +++++
 .../modules/default/templates/smtUserAgreementSuccess.php    | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/apps/pc_frontend/modules/default/templates/smtPrivacyPolicySuccess.php b/apps/pc_frontend/modules/default/templates/smtPrivacyPolicySuccess.php
index 2e6acb7fb..405090fad 100644
--- a/apps/pc_frontend/modules/default/templates/smtPrivacyPolicySuccess.php
+++ b/apps/pc_frontend/modules/default/templates/smtPrivacyPolicySuccess.php
@@ -5,3 +5,8 @@
 <div class="row">
 <?php echo nl2br($op_config['privacy_policy']); ?>
 </div>
+
+<?php use_helper('Javascript') ?>
+<div class="row">
+<p><?php echo link_to_function(__('Back to previous page'), 'history.back()', array('class' => 'btn')) ?></p>
+</div>
diff --git a/apps/pc_frontend/modules/default/templates/smtUserAgreementSuccess.php b/apps/pc_frontend/modules/default/templates/smtUserAgreementSuccess.php
index 1ed0b64f6..e5050f6df 100644
--- a/apps/pc_frontend/modules/default/templates/smtUserAgreementSuccess.php
+++ b/apps/pc_frontend/modules/default/templates/smtUserAgreementSuccess.php
@@ -5,3 +5,8 @@
 <div class="row">
 <?php echo nl2br($op_config['user_agreement']) ?>
 </div>
+
+<?php use_helper('Javascript') ?>
+<div class="row">
+<p><?php echo link_to_function(__('Back to previous page'), 'history.back()', array('class' => 'btn')) ?></p>
+</div>

From 3db5383f5816285ceecfd435de1dfebd32b9e1cf Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 12 Apr 2012 17:40:23 +0900
Subject: [PATCH 186/630] fix menu style in configuration page for smartphone
 (fixes #2953, BP from #2935)

---
 .../modules/member/templates/smtConfigSuccess.php           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/pc_frontend/modules/member/templates/smtConfigSuccess.php b/apps/pc_frontend/modules/member/templates/smtConfigSuccess.php
index 2fd4c47ea..b13bb19ed 100644
--- a/apps/pc_frontend/modules/member/templates/smtConfigSuccess.php
+++ b/apps/pc_frontend/modules/member/templates/smtConfigSuccess.php
@@ -57,8 +57,10 @@
 <?php echo __('Please select the item that wants to be set from the menu.'); ?>
 <?php endif; ?>
 
-<div class="row span12" style="margin-left: 5px;">
+<div class="row">
+<ul class="nav nav-tabs nav-stacked">
 <?php foreach ($lists as $list): ?>
-<div class="span6" style="margin: 0px;"><?php echo $list; ?></div>
+<li><?php echo $list ?></li>
 <?php endforeach; ?>
+</ul>
 </div>

From 811992554c1ea2f840e2b17a479a8e73018fe88a Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Tue, 17 Apr 2012 15:55:18 +0900
Subject: [PATCH 187/630] Revert "enable json API by default (refs #2889)"

This reverts commit 1e500295d1f1a9c50ef2f1b981e6b46097b7221a.
---
 data/fixtures/013_enable_jsonapi.yml | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 data/fixtures/013_enable_jsonapi.yml

diff --git a/data/fixtures/013_enable_jsonapi.yml b/data/fixtures/013_enable_jsonapi.yml
deleted file mode 100644
index be002c88b..000000000
--- a/data/fixtures/013_enable_jsonapi.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-SnsConfig:
-  json_api:
-    name: "enable_jsonapi"
-    value: 1

From c8ce6d3c5fad03a6abb8d70c664bffedc58adfd8 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Tue, 17 Apr 2012 15:56:02 +0900
Subject: [PATCH 188/630] enable json API by default. (sns_config.yml) (fixes
 #2954,BP from #2889)

---
 lib/config/config/sns_config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/config/config/sns_config.yml b/lib/config/config/sns_config.yml
index abd47dd33..7eac45952 100644
--- a/lib/config/config/sns_config.yml
+++ b/lib/config/config/sns_config.yml
@@ -176,7 +176,7 @@ general:
     FormType:  "radio"
     ValueType: "text"
     IsRequired: true
-    Default:    0
+    Default:   1 
     Choices:
       - "使用しない"
       - "使用する"

From ae862d142079b8ac9921d987631c5dfae9ff78f0 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 12 Apr 2012 18:18:49 +0900
Subject: [PATCH 189/630] added Privacy Policy page link in smartphone
 navigation (fixes #2961, BP from #2940)

---
 data/fixtures/012_import_smartphone_navi_menu.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/data/fixtures/012_import_smartphone_navi_menu.yml b/data/fixtures/012_import_smartphone_navi_menu.yml
index 87ecd5b98..3f439d54d 100644
--- a/data/fixtures/012_import_smartphone_navi_menu.yml
+++ b/data/fixtures/012_import_smartphone_navi_menu.yml
@@ -48,3 +48,14 @@ Navigation:
         caption: "ログアウト"
       en:
         caption: "Logout"
+
+  smartphone_insecure_navigation_privacy_policy:
+    type: "smartphone_insecure"
+    uri: "@global_privacy_policy"
+    sort_order: 30
+    Translation:
+      ja_JP:
+        caption: "プライバシーポリシー"
+      en:
+        caption: "Privacy Policy"
+

From f516e1be45de89e72f93d28c928fbce896cc4f5e Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 12 Apr 2012 18:20:37 +0900
Subject: [PATCH 190/630] added User Agreement page link in smartphone
 navigation (fixes #2962, BP from #2941)

---
 data/fixtures/012_import_smartphone_navi_menu.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/data/fixtures/012_import_smartphone_navi_menu.yml b/data/fixtures/012_import_smartphone_navi_menu.yml
index 3f439d54d..e76799420 100644
--- a/data/fixtures/012_import_smartphone_navi_menu.yml
+++ b/data/fixtures/012_import_smartphone_navi_menu.yml
@@ -59,3 +59,13 @@ Navigation:
       en:
         caption: "Privacy Policy"
 
+  smartphone_insecure_navigation_user_agreement:
+    type: "smartphone_insecure"
+    uri: "@global_user_agreement"
+    sort_order: 40
+    Translation:
+      ja_JP:
+        caption: "利用規約"
+      en:
+        caption: "User Agreement"
+

From a63c3fe96b2f4e826f459963b17cdb1bd7e7fcdf Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Tue, 17 Apr 2012 16:16:29 +0900
Subject: [PATCH 191/630] fixed default parameter on openpne:fast-install task
 (fixes #2970, BP from #2622)

---
 lib/task/openpneFastInstallTask.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/task/openpneFastInstallTask.class.php b/lib/task/openpneFastInstallTask.class.php
index 94a75aba1..c9c6142ee 100644
--- a/lib/task/openpneFastInstallTask.class.php
+++ b/lib/task/openpneFastInstallTask.class.php
@@ -24,7 +24,7 @@ protected function configure()
     $this->addOptions(array(
       new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', null),
       new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'prod'),
-      new sfCommandOption('dbms', 'mysql', sfCommandOption::PARAMETER_OPTIONAL, 'The dbms for database connection. mysql or sqlite'),
+      new sfCommandOption('dbms', null, sfCommandOption::PARAMETER_OPTIONAL, 'The dbms for database connection. mysql or sqlite', 'mysql'),
       new sfCommandOption('dbuser', null, sfCommandOption::PARAMETER_OPTIONAL, 'A username for database connection.'),
       new sfCommandOption('dbpassword', null, sfCommandOption::PARAMETER_OPTIONAL, 'A password for database connection.'),
       new sfCommandOption('dbhost', null, sfCommandOption::PARAMETER_OPTIONAL, 'A hostname for database connection.'),

From 1e0808808cd6b28df95f5f7f558edcb05faa3b4e Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 12 Apr 2012 15:53:33 +0900
Subject: [PATCH 192/630] show error message in community/search when query
 result is empty (fixes #2963, #2964, BP from #2933, #2934)

---
 apps/pc_frontend/i18n/messages.ja.xml         |  4 +++
 .../community/templates/smtSearchSuccess.php  | 29 ++++++++++++++-----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/apps/pc_frontend/i18n/messages.ja.xml b/apps/pc_frontend/i18n/messages.ja.xml
index f3409b4ef..cfaded45a 100644
--- a/apps/pc_frontend/i18n/messages.ja.xml
+++ b/apps/pc_frontend/i18n/messages.ja.xml
@@ -1395,6 +1395,10 @@
         <source>Reset</source>
         <target>リセット</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>%Community% does not exist.</source>
+        <target>%Community%がありません。</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/apps/pc_frontend/modules/community/templates/smtSearchSuccess.php b/apps/pc_frontend/modules/community/templates/smtSearchSuccess.php
index cdb200007..7615c00b5 100644
--- a/apps/pc_frontend/modules/community/templates/smtSearchSuccess.php
+++ b/apps/pc_frontend/modules/community/templates/smtSearchSuccess.php
@@ -8,22 +8,31 @@
 <script type="text/javascript">
 $(function(){
   $.getJSON( openpne.apiBase + 'community/search.json?apiKey=' + openpne.apiKey, function(json) {
-    $('#joinCommunityListTemplate').tmpl(json.data).appendTo('#memberJoinCommunityList');
-    $('#memberJoinCommunityList').show();
+    if (json.data.length > 0) {
+      $('#joinCommunityListTemplate').tmpl(json.data).appendTo('#memberJoinCommunityList');
+      $('#memberJoinCommunityList').show();
+      $('#joinCommunitySearch').removeAttr('disabled');
+    } else {
+      $('#memberJoinCommunityNotExist').show();
+    }
     $('#memberJoinCommunityListLoading').hide();
   });
   $('#joinCommunitySearch').keypress(function(){
     $('#memberJoinCommunityListLoading').show();
-    $('#memberJoinCommunityList').hide();
+    $('#memberJoinCommunityList, #memberJoinCommunityNotMatch').hide();
     $('#memberJoinCommunityList').empty();
   });
   $('#joinCommunitySearch').blur(function(){
     var keyword = $('#joinCommunitySearch').val();
     var requestData = { keyword: keyword, apiKey: openpne.apiKey };
     $.getJSON( openpne.apiBase + 'community/search.json', requestData, function(json) {
-      $result = $('#joinCommunityListTemplate').tmpl(json.data);
-      $('#memberJoinCommunityList').html($result);
-      $('#memberJoinCommunityList').show();
+      if (json.data.length > 0) {
+        $result = $('#joinCommunityListTemplate').tmpl(json.data);
+        $('#memberJoinCommunityList').html($result);
+        $('#memberJoinCommunityList').show();
+      } else {
+        $('#memberJoinCommunityNotMatch').show();
+      }
       $('#memberJoinCommunityListLoading').hide();
     });
   });
@@ -38,11 +47,17 @@
 <div class="row" id="joinCommunitySearchBox">
 <div class="input-prepend span12">
 <span class="add-on"><i class="icon-search"></i></span>
-<input type="text" id="joinCommunitySearch" class="realtime-searchbox" value="" />
+<input type="text" id="joinCommunitySearch" class="realtime-searchbox" value="" disabled="disabled" />
 </div>
 </div>
 <div class="row hide" id="memberJoinCommunityList">
 </div>
+<div class="row hide" id="memberJoinCommunityNotMatch">
+<?php echo __('Your search queries did not match any %community%.') ?>
+</div>
+<div class="row hide" id="memberJoinCommunityNotExist">
+<?php echo __('%Community% does not exist.') ?>
+</div>
 <div class="row" id="memberJoinCommunityListLoading" style="margin-left: 0; text-align: center;">
 <?php echo op_image_tag('ajax-loader.gif') ?>
 </div>

From 2ac02fada1b173f00e42769d6b7a981289197aa2 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 18 Apr 2012 13:30:28 +0900
Subject: [PATCH 193/630] removed version up script (fixes #2988, BP from
 #2987)

---
 lib/task/openpneUpgradeFrom2Task.class.php    |  88 ----------
 lib/upgrade/opUpgrader.class.php              | 154 ------------------
 .../opUpgradeAbstractStrategy.class.php       |  63 -------
 .../opUpgradeBuildModelStrategy.class.php     |  40 -----
 .../opUpgradeCreateTableStrategy.class.php    |  62 -------
 .../opUpgradeDataLoadStrategy.class.php       |  30 ----
 .../opUpgradeSQLImportStrategy.class.php      |  89 ----------
 .../opUpgradeSyncPluginStrategy.class.php     |  26 ---
 8 files changed, 552 deletions(-)
 delete mode 100644 lib/task/openpneUpgradeFrom2Task.class.php
 delete mode 100644 lib/upgrade/opUpgrader.class.php
 delete mode 100644 lib/upgrade/strategy/opUpgradeAbstractStrategy.class.php
 delete mode 100644 lib/upgrade/strategy/opUpgradeBuildModelStrategy.class.php
 delete mode 100644 lib/upgrade/strategy/opUpgradeCreateTableStrategy.class.php
 delete mode 100644 lib/upgrade/strategy/opUpgradeDataLoadStrategy.class.php
 delete mode 100644 lib/upgrade/strategy/opUpgradeSQLImportStrategy.class.php
 delete mode 100644 lib/upgrade/strategy/opUpgradeSyncPluginStrategy.class.php

diff --git a/lib/task/openpneUpgradeFrom2Task.class.php b/lib/task/openpneUpgradeFrom2Task.class.php
deleted file mode 100644
index 052ec3e80..000000000
--- a/lib/task/openpneUpgradeFrom2Task.class.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * openpneUpgradeFrom2Task
- *
- * @package    OpenPNE
- * @subpackage task
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class openpneUpgradeFrom2Task extends sfBaseTask
-{
-  protected function configure()
-  {
-    $this->namespace        = 'openpne';
-    $this->name             = 'upgrade-from-2';
-
-    $this->addOptions(array(
-      new sfCommandOption('origin', null, sfCommandOption::PARAMETER_REQUIRED, 'The base 2.x version (2.12 or 2.14)'),
-      new sfCommandOption('rules', null, sfCommandOption::PARAMETER_REQUIRED | sfCommandOption::IS_ARRAY, 'The rules that you want to do'),
-      new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', null),
-      new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'prod'),
-    ));
-
-    $this->briefDescription = 'Upgrading from 2.12.x or 2.14.x to current version';
-    $this->detailedDescription = <<<EOF
-The [openpne:upgrade-from-30x|INFO] task upgrades from 2.12.x or 2.14.x to current version.
-Call it with:
-
-  [./symfony openpne:upgrade-from-2|INFO]
-EOF;
-  }
-
-  protected function execute($arguments = array(), $options = array())
-  {
-    if (!isset($options['origin']))
-    {
-      $options['origin'] = '2.12';
-    }
-
-    if (!in_array($options['origin'], array('2.12', '2.14', '3.4')))
-    {
-      throw new RuntimeException('You must specify "2.12", "2.14" or "3.4" to the --origin option. (--origin オプションには 2.12、 2.14 または 3.4 を指定してください。)');
-    }
-    sfConfig::set('op_upgrade2_version', $options['origin']);
-
-    $op2config = sfConfig::get('sf_config_dir').DIRECTORY_SEPARATOR.'config.OpenPNE2.php';
-    if (!is_readable($op2config))
-    {
-      throw new RuntimeException('You must copy the config.php in your OpenPNE2 as config/config.OpenPNE2.php. (お使いの OpenPNE2 の config.php を config/config.OpenPNE2.php としてコピーしてください。)');
-    }
-    if (!defined('OPENPNE_DIR'))
-    {
-      define('OPENPNE_DIR', sfConfig::get('sf_root_dir'));
-    }
-    require_once $op2config;
-
-    $this->runTask('configure:database', array(
-      opToolkit::createStringDsnFromArray($GLOBALS['_OPENPNE_DSN_LIST']['main']['dsn']),
-      $GLOBALS['_OPENPNE_DSN_LIST']['main']['dsn']['username'],
-      empty($GLOBALS['_OPENPNE_DSN_LIST']['main']['dsn']['password']) ? null: $GLOBALS['_OPENPNE_DSN_LIST']['main']['dsn']['password']
-    ));
-
-    $path = sfConfig::get('sf_data_dir').DIRECTORY_SEPARATOR.'upgrade'.DIRECTORY_SEPARATOR.'2';
-    $upgrader = new opUpgrader($this->dispatcher, $this->formatter, $path, $this->configuration);
-    if ($options['rules'])
-    {
-      $upgrader->setOption('targets', $options['rules']);
-    }
-    if ('3.4' === $options['origin'])
-    {
-      $upgrader->setDefinitionName('definition-34to36.yml');
-    }
-
-    $this->logSection('upgrade', 'Begin upgrading from 2.x');
-    $upgrader->execute();
-
-    $task = new sfPluginPublishAssetsTask($this->dispatcher, $this->formatter);
-    $task->run(array(), array());
-  }
-}
diff --git a/lib/upgrade/opUpgrader.class.php b/lib/upgrade/opUpgrader.class.php
deleted file mode 100644
index 1c021cb46..000000000
--- a/lib/upgrade/opUpgrader.class.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * The opUpgrader handles upgrading to current OpenPNE3 from other.
- *
- * @package    OpenPNE
- * @subpackage upgrade
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class opUpgrader extends sfBaseTask
-{
-  protected
-    $basePath = '',
-    $options = array(),
-    $definitionName = 'definition.yml';
-
-  public function __construct(sfEventDispatcher $dispatcher, sfFormatter $formatter, $basePath, $configuration)
-  {
-    parent::__construct($dispatcher, $formatter);
-
-    if (!is_dir($basePath) || !is_readable($basePath))
-    {
-      throw new RuntimeException('The specified basepath for the opUpgrader must be directory and readable.');
-    }
-
-    $this->basePath = $basePath;
-    $this->configuration = $configuration;
-  }
-
-  public function setDefinitionName($definitionName)
-  {
-    $this->definitionName = $definitionName;
-  }
-
-  public function getDefinitionName()
-  {
-    return $this->definitionName;
-  }
-
-  public function getDefinition()
-  {
-    $path = $this->basePath.DIRECTORY_SEPARATOR.$this->definitionName;
-    if (!is_file($path) || !is_readable($path))
-    {
-      throw new RuntimeException('The upgrade base path doesn\'t have a definition file for upgrading ('.$path.')');
-    }
-
-    return sfSimpleYamlConfigHandler::replaceConstants(sfSimpleYamlConfigHandler::getConfiguration(array($path)));
-  }
-
-  public function setOption($name, $value)
-  {
-    $this->options[$name] = $value;
-  }
-
-  public function getOption($name, $default = null)
-  {
-    if (!isset($this->options[$name]))
-    {
-      return $default;
-    }
-
-    return $this->options[$name];
-  }
-
-  protected function execute($arguments = array(), $options = array())
-  {
-    $definitions = $this->getDefinition();
-
-    $timer = new sfTimer();
-    $succeeded = array();
-
-    $targets = $this->getOption('targets', array_keys($definitions));
-
-    foreach ((array)$definitions as $k => $v)
-    {
-      if (!in_array($k, $targets))
-      {
-        continue;
-      }
-
-      $timer->startTimer();
-
-      $defaultOptions = array_merge($this->options, array(
-        'name'           => $k,
-        'dir'            => $this->basePath,
-        'required_rules' => array(),
-        'configuration'  => $this->configuration,
-        'dispatcher'     => new sfEventDispatcher(),
-        'formatter'      => $this->formatter,
-      ));
-
-      $v = array_merge(array('options' => $defaultOptions), $v);
-      if (!isset($v['options']['required_rules']))
-      {
-        $v['options']['required_rules'] = array();
-      }
-
-      $requiredRules = (array)$v['options']['required_rules'];
-      if (!empty($requiredRules) && array_diff($requiredRules, $succeeded))
-      {
-        $this->logSection('upgrade', 'Passed '.$k, null, 'ERROR');
-        continue;
-      }
-
-      $this->logSection('upgrade', 'Processing '.$k);
-
-      if (isset($v['file']) && is_file($v['file']))
-      {
-        require_once $v['file'];
-      }
-
-      if (class_exists($v['strategy']))
-      {
-        $className = $v['strategy'];
-      }
-      else
-      {
-        $className = 'opUpgrade'.$v['strategy'].'Strategy';
-      }
-
-      opApplicationConfiguration::registerZend();
-      try
-      {
-        // disable Doctrine profiling
-        sfConfig::set('sf_debug', false);
-
-        $strategy = new $className($v['options']);
-        $strategy->run();
-
-        $succeeded[] = $k;
-      }
-      catch (Exception $e)
-      {
-        $this->logBlock($e->getMessage(), 'ERROR');
-      }
-      opApplicationConfiguration::unregisterZend();
-
-      $this->logSection('upgrade', sprintf('Processed %s (%.2f sec)', $k, $timer->addTime()));
-    }
-
-    $this->logSection('upgrade', sprintf('Completed Upgrading (%.2f sec)', $timer->getElapsedTime()));
-    $this->logSection('upgrade', sprintf('The %.2f MB memory allocated', round(memory_get_peak_usage(true) / 1048576, 2)));
-  }
-}
-
diff --git a/lib/upgrade/strategy/opUpgradeAbstractStrategy.class.php b/lib/upgrade/strategy/opUpgradeAbstractStrategy.class.php
deleted file mode 100644
index e5d637f4c..000000000
--- a/lib/upgrade/strategy/opUpgradeAbstractStrategy.class.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * opUpgradeAbstractStrategy
- *
- * @package    OpenPNE
- * @subpackage upgrade
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-abstract class opUpgradeAbstractStrategy
-{
-  protected $options;
-
-  protected static $dbManager = null;
-
-  public function __construct($options)
-  {
-    $this->options = $options;
-  }
-
-  abstract public function run();
-
-  protected function getDatabaseManager()
-  {
-    if (!self::$dbManager)
-    {
-      self::$dbManager = new sfDatabaseManager($this->options['configuration']);
-    }
-
-    return self::$dbManager;
-  }
-
-  public function setOption($name, $value)
-  {
-    $this->options[$name] = $value;
-  }
-
-  public function getOption($name, $default = null)
-  {
-    if (!isset($this->options[$name]))
-    {
-      return $default;
-    }
-
-    return $this->options[$name];
-  }
-
-  protected function dataLoad($path)
-  {
-    opApplicationConfiguration::unregisterZend();
-    Doctrine::loadData($path, true);
-    opApplicationConfiguration::registerZend();
-  }
-}
-
diff --git a/lib/upgrade/strategy/opUpgradeBuildModelStrategy.class.php b/lib/upgrade/strategy/opUpgradeBuildModelStrategy.class.php
deleted file mode 100644
index 70d128429..000000000
--- a/lib/upgrade/strategy/opUpgradeBuildModelStrategy.class.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * This strategy builds models.
- *
- * @package    OpenPNE
- * @subpackage upgrade
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class opUpgradeBuildModelStrategy extends opUpgradeAbstractStrategy
-{
-  public function run()
-  {
-    opApplicationConfiguration::unregisterZend();
-
-    $task = new sfDoctrineBuildTask(clone $this->options['dispatcher'], clone $this->options['formatter']);
-    $task->run(array(), array(
-      'no-confirmation' => true,
-      'model'           => true,
-      'forms'           => true,
-      'filters'         => true,
-      'application'     => 'pc_frontend',
-      'env'             => sfConfig::get('sf_environment', 'prod'),
-    ));
-
-    $task = new sfCacheClearTask(clone $this->options['dispatcher'], clone $this->options['formatter']);
-    $task->run(array(), array('application' => null, 'env' => sfConfig::get('sf_environment', 'prod')));
-
-    opApplicationConfiguration::registerZend();
-  }
-}
-
diff --git a/lib/upgrade/strategy/opUpgradeCreateTableStrategy.class.php b/lib/upgrade/strategy/opUpgradeCreateTableStrategy.class.php
deleted file mode 100644
index 92385ce81..000000000
--- a/lib/upgrade/strategy/opUpgradeCreateTableStrategy.class.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * This strategy creates the specified tables.
- *
- * @package    OpenPNE
- * @subpackage upgrade
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class opUpgradeCreateTableStrategy extends opUpgradeAbstractStrategy
-{
-  public function run()
-  {
-    $this->getDatabaseManager();
-
-    // build all tables for models
-    if (!$this->getOption('models'))
-    {
-      opApplicationConfiguration::unregisterZend();
-
-      $path = sfConfig::get('sf_lib_dir').'/model/doctrine';
-      Doctrine_Core::loadModels($path, Doctrine_Core::MODEL_LOADING_CONSERVATIVE);
-      Doctrine_Core::createTablesFromArray(Doctrine_Core::getLoadedModels());
-
-      opApplicationConfiguration::registerZend();
-
-      return true;
-    }
-
-    foreach ($this->getQueries() as $query)
-    {
-      $db = $this->getDatabaseManager()->getDatabase('doctrine');
-      $db->getDoctrineConnection()->execute($query);
-    }
-  }
-
-  public function getQueries()
-  {
-    $result = array();
-
-    $models = $this->getOption('models');
-    if (!empty($models))
-    {
-      $queries = Doctrine_Manager::connection()->export->exportSortedClassesSql($models);
-      if (isset($queries['doctrine']))
-      {
-        $result = $queries['doctrine'];
-      }
-    }
-
-    return $result;
-  }
-}
-
diff --git a/lib/upgrade/strategy/opUpgradeDataLoadStrategy.class.php b/lib/upgrade/strategy/opUpgradeDataLoadStrategy.class.php
deleted file mode 100644
index 61bc053b1..000000000
--- a/lib/upgrade/strategy/opUpgradeDataLoadStrategy.class.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * The upgrating strategy by importing yml.
- *
- * @package    OpenPNE
- * @subpackage task
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class opUpgradeDataLoadStrategy extends opUpgradeAbstractStrategy
-{
-  public function run()
-  {
-    $path = $this->options['dir'].DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.$this->options['name'].'.yml';
-    if (!file_exists($path))
-    {
-      throw new RuntimeException('The specified yml doesn\'t exist.');
-    }
-
-    Doctrine::loadData($path, true);
-  }
-}
diff --git a/lib/upgrade/strategy/opUpgradeSQLImportStrategy.class.php b/lib/upgrade/strategy/opUpgradeSQLImportStrategy.class.php
deleted file mode 100644
index c65ce7066..000000000
--- a/lib/upgrade/strategy/opUpgradeSQLImportStrategy.class.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * The upgrating strategy by importing sql.
- *
- * The specified sql is parsed as PHP script. Items in the "params" option are usable
- * as assigned variables from the sql (PHP script).
- *
- * @package    OpenPNE
- * @subpackage task
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class opUpgradeSQLImportStrategy extends opUpgradeAbstractStrategy
-{
-  public function run()
-  {
-    $path = $this->options['dir'].DIRECTORY_SEPARATOR.'sql'.DIRECTORY_SEPARATOR.$this->options['name'].'.sql';
-    if (!file_exists($path))
-    {
-      throw new RuntimeException('The specified sql doesn\'t exist.');
-    }
-
-    $db = $this->getDatabaseManager()->getDatabase('doctrine');
-    $this->conn = $db->getDoctrineConnection();
-
-    $this->conn->beginTransaction();
-    $this->conn->execute('SET FOREIGN_KEY_CHECKS = 0');  // for mysql
-
-    $sql = opToolkit::unifyEOLCharacter($this->parseSql($path));
-    $queries = explode("\n", $sql);
-
-    try
-    {
-      $this->executeQueries($queries);
-      $this->conn->commit();
-    }
-    catch (Exception $e)
-    {
-      $this->conn->rollback();
-      $this->conn->execute('SET FOREIGN_KEY_CHECKS = 0');  // for mysql
-
-      throw $e;
-    }
-
-    $this->conn->execute('SET FOREIGN_KEY_CHECKS = 0');  // for mysql
-  }
-
-  protected function executeQueries($queries)
-  {
-    foreach ($queries as $query)
-    {
-      $query = trim($query);
-      if (!$query)
-      {
-        continue;
-      }
-
-      $this->conn->execute($query);
-    }
-  }
-
-  protected function parseSql($file)
-  {
-    // The "params" option is settled, its items are imported as variables.
-    if (!empty($this->options['params']))
-    {
-      extract($this->options['params']);
-    }
-
-    ob_start();
-    include $file;
-    $result = ob_get_clean();
-
-    return $result;
-  }
-
-  protected function getSQLForFileId($name)
-  {
-    return '(SELECT id FROM file WHERE name = '.$name.' LIMIT 1)';
-  }
-}
diff --git a/lib/upgrade/strategy/opUpgradeSyncPluginStrategy.class.php b/lib/upgrade/strategy/opUpgradeSyncPluginStrategy.class.php
deleted file mode 100644
index 568778cb3..000000000
--- a/lib/upgrade/strategy/opUpgradeSyncPluginStrategy.class.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * This strategy sync plugins.
- *
- * @package    OpenPNE
- * @subpackage upgrade
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class opUpgradeSyncPluginStrategy extends opUpgradeAbstractStrategy
-{
-  public function run()
-  {
-    $task = new opPluginSyncTask($this->options['dispatcher'], $this->options['formatter']);
-    $task->run();
-  }
-}
-

From 368ecd3a310231ded4e8c472481e293527693590 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 18 Apr 2012 13:33:03 +0900
Subject: [PATCH 194/630] Revert "removed version up script (fixes #2988, BP
 from #2987)"

This reverts commit 2ac02fada1b173f00e42769d6b7a981289197aa2.
---
 lib/task/openpneUpgradeFrom2Task.class.php    |  88 ++++++++++
 lib/upgrade/opUpgrader.class.php              | 154 ++++++++++++++++++
 .../opUpgradeAbstractStrategy.class.php       |  63 +++++++
 .../opUpgradeBuildModelStrategy.class.php     |  40 +++++
 .../opUpgradeCreateTableStrategy.class.php    |  62 +++++++
 .../opUpgradeDataLoadStrategy.class.php       |  30 ++++
 .../opUpgradeSQLImportStrategy.class.php      |  89 ++++++++++
 .../opUpgradeSyncPluginStrategy.class.php     |  26 +++
 8 files changed, 552 insertions(+)
 create mode 100644 lib/task/openpneUpgradeFrom2Task.class.php
 create mode 100644 lib/upgrade/opUpgrader.class.php
 create mode 100644 lib/upgrade/strategy/opUpgradeAbstractStrategy.class.php
 create mode 100644 lib/upgrade/strategy/opUpgradeBuildModelStrategy.class.php
 create mode 100644 lib/upgrade/strategy/opUpgradeCreateTableStrategy.class.php
 create mode 100644 lib/upgrade/strategy/opUpgradeDataLoadStrategy.class.php
 create mode 100644 lib/upgrade/strategy/opUpgradeSQLImportStrategy.class.php
 create mode 100644 lib/upgrade/strategy/opUpgradeSyncPluginStrategy.class.php

diff --git a/lib/task/openpneUpgradeFrom2Task.class.php b/lib/task/openpneUpgradeFrom2Task.class.php
new file mode 100644
index 000000000..052ec3e80
--- /dev/null
+++ b/lib/task/openpneUpgradeFrom2Task.class.php
@@ -0,0 +1,88 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * openpneUpgradeFrom2Task
+ *
+ * @package    OpenPNE
+ * @subpackage task
+ * @author     Kousuke Ebihara <ebihara@tejimaya.com>
+ */
+class openpneUpgradeFrom2Task extends sfBaseTask
+{
+  protected function configure()
+  {
+    $this->namespace        = 'openpne';
+    $this->name             = 'upgrade-from-2';
+
+    $this->addOptions(array(
+      new sfCommandOption('origin', null, sfCommandOption::PARAMETER_REQUIRED, 'The base 2.x version (2.12 or 2.14)'),
+      new sfCommandOption('rules', null, sfCommandOption::PARAMETER_REQUIRED | sfCommandOption::IS_ARRAY, 'The rules that you want to do'),
+      new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', null),
+      new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'prod'),
+    ));
+
+    $this->briefDescription = 'Upgrading from 2.12.x or 2.14.x to current version';
+    $this->detailedDescription = <<<EOF
+The [openpne:upgrade-from-30x|INFO] task upgrades from 2.12.x or 2.14.x to current version.
+Call it with:
+
+  [./symfony openpne:upgrade-from-2|INFO]
+EOF;
+  }
+
+  protected function execute($arguments = array(), $options = array())
+  {
+    if (!isset($options['origin']))
+    {
+      $options['origin'] = '2.12';
+    }
+
+    if (!in_array($options['origin'], array('2.12', '2.14', '3.4')))
+    {
+      throw new RuntimeException('You must specify "2.12", "2.14" or "3.4" to the --origin option. (--origin オプションには 2.12、 2.14 または 3.4 を指定してください。)');
+    }
+    sfConfig::set('op_upgrade2_version', $options['origin']);
+
+    $op2config = sfConfig::get('sf_config_dir').DIRECTORY_SEPARATOR.'config.OpenPNE2.php';
+    if (!is_readable($op2config))
+    {
+      throw new RuntimeException('You must copy the config.php in your OpenPNE2 as config/config.OpenPNE2.php. (お使いの OpenPNE2 の config.php を config/config.OpenPNE2.php としてコピーしてください。)');
+    }
+    if (!defined('OPENPNE_DIR'))
+    {
+      define('OPENPNE_DIR', sfConfig::get('sf_root_dir'));
+    }
+    require_once $op2config;
+
+    $this->runTask('configure:database', array(
+      opToolkit::createStringDsnFromArray($GLOBALS['_OPENPNE_DSN_LIST']['main']['dsn']),
+      $GLOBALS['_OPENPNE_DSN_LIST']['main']['dsn']['username'],
+      empty($GLOBALS['_OPENPNE_DSN_LIST']['main']['dsn']['password']) ? null: $GLOBALS['_OPENPNE_DSN_LIST']['main']['dsn']['password']
+    ));
+
+    $path = sfConfig::get('sf_data_dir').DIRECTORY_SEPARATOR.'upgrade'.DIRECTORY_SEPARATOR.'2';
+    $upgrader = new opUpgrader($this->dispatcher, $this->formatter, $path, $this->configuration);
+    if ($options['rules'])
+    {
+      $upgrader->setOption('targets', $options['rules']);
+    }
+    if ('3.4' === $options['origin'])
+    {
+      $upgrader->setDefinitionName('definition-34to36.yml');
+    }
+
+    $this->logSection('upgrade', 'Begin upgrading from 2.x');
+    $upgrader->execute();
+
+    $task = new sfPluginPublishAssetsTask($this->dispatcher, $this->formatter);
+    $task->run(array(), array());
+  }
+}
diff --git a/lib/upgrade/opUpgrader.class.php b/lib/upgrade/opUpgrader.class.php
new file mode 100644
index 000000000..1c021cb46
--- /dev/null
+++ b/lib/upgrade/opUpgrader.class.php
@@ -0,0 +1,154 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * The opUpgrader handles upgrading to current OpenPNE3 from other.
+ *
+ * @package    OpenPNE
+ * @subpackage upgrade
+ * @author     Kousuke Ebihara <ebihara@tejimaya.com>
+ */
+class opUpgrader extends sfBaseTask
+{
+  protected
+    $basePath = '',
+    $options = array(),
+    $definitionName = 'definition.yml';
+
+  public function __construct(sfEventDispatcher $dispatcher, sfFormatter $formatter, $basePath, $configuration)
+  {
+    parent::__construct($dispatcher, $formatter);
+
+    if (!is_dir($basePath) || !is_readable($basePath))
+    {
+      throw new RuntimeException('The specified basepath for the opUpgrader must be directory and readable.');
+    }
+
+    $this->basePath = $basePath;
+    $this->configuration = $configuration;
+  }
+
+  public function setDefinitionName($definitionName)
+  {
+    $this->definitionName = $definitionName;
+  }
+
+  public function getDefinitionName()
+  {
+    return $this->definitionName;
+  }
+
+  public function getDefinition()
+  {
+    $path = $this->basePath.DIRECTORY_SEPARATOR.$this->definitionName;
+    if (!is_file($path) || !is_readable($path))
+    {
+      throw new RuntimeException('The upgrade base path doesn\'t have a definition file for upgrading ('.$path.')');
+    }
+
+    return sfSimpleYamlConfigHandler::replaceConstants(sfSimpleYamlConfigHandler::getConfiguration(array($path)));
+  }
+
+  public function setOption($name, $value)
+  {
+    $this->options[$name] = $value;
+  }
+
+  public function getOption($name, $default = null)
+  {
+    if (!isset($this->options[$name]))
+    {
+      return $default;
+    }
+
+    return $this->options[$name];
+  }
+
+  protected function execute($arguments = array(), $options = array())
+  {
+    $definitions = $this->getDefinition();
+
+    $timer = new sfTimer();
+    $succeeded = array();
+
+    $targets = $this->getOption('targets', array_keys($definitions));
+
+    foreach ((array)$definitions as $k => $v)
+    {
+      if (!in_array($k, $targets))
+      {
+        continue;
+      }
+
+      $timer->startTimer();
+
+      $defaultOptions = array_merge($this->options, array(
+        'name'           => $k,
+        'dir'            => $this->basePath,
+        'required_rules' => array(),
+        'configuration'  => $this->configuration,
+        'dispatcher'     => new sfEventDispatcher(),
+        'formatter'      => $this->formatter,
+      ));
+
+      $v = array_merge(array('options' => $defaultOptions), $v);
+      if (!isset($v['options']['required_rules']))
+      {
+        $v['options']['required_rules'] = array();
+      }
+
+      $requiredRules = (array)$v['options']['required_rules'];
+      if (!empty($requiredRules) && array_diff($requiredRules, $succeeded))
+      {
+        $this->logSection('upgrade', 'Passed '.$k, null, 'ERROR');
+        continue;
+      }
+
+      $this->logSection('upgrade', 'Processing '.$k);
+
+      if (isset($v['file']) && is_file($v['file']))
+      {
+        require_once $v['file'];
+      }
+
+      if (class_exists($v['strategy']))
+      {
+        $className = $v['strategy'];
+      }
+      else
+      {
+        $className = 'opUpgrade'.$v['strategy'].'Strategy';
+      }
+
+      opApplicationConfiguration::registerZend();
+      try
+      {
+        // disable Doctrine profiling
+        sfConfig::set('sf_debug', false);
+
+        $strategy = new $className($v['options']);
+        $strategy->run();
+
+        $succeeded[] = $k;
+      }
+      catch (Exception $e)
+      {
+        $this->logBlock($e->getMessage(), 'ERROR');
+      }
+      opApplicationConfiguration::unregisterZend();
+
+      $this->logSection('upgrade', sprintf('Processed %s (%.2f sec)', $k, $timer->addTime()));
+    }
+
+    $this->logSection('upgrade', sprintf('Completed Upgrading (%.2f sec)', $timer->getElapsedTime()));
+    $this->logSection('upgrade', sprintf('The %.2f MB memory allocated', round(memory_get_peak_usage(true) / 1048576, 2)));
+  }
+}
+
diff --git a/lib/upgrade/strategy/opUpgradeAbstractStrategy.class.php b/lib/upgrade/strategy/opUpgradeAbstractStrategy.class.php
new file mode 100644
index 000000000..e5d637f4c
--- /dev/null
+++ b/lib/upgrade/strategy/opUpgradeAbstractStrategy.class.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * opUpgradeAbstractStrategy
+ *
+ * @package    OpenPNE
+ * @subpackage upgrade
+ * @author     Kousuke Ebihara <ebihara@tejimaya.com>
+ */
+abstract class opUpgradeAbstractStrategy
+{
+  protected $options;
+
+  protected static $dbManager = null;
+
+  public function __construct($options)
+  {
+    $this->options = $options;
+  }
+
+  abstract public function run();
+
+  protected function getDatabaseManager()
+  {
+    if (!self::$dbManager)
+    {
+      self::$dbManager = new sfDatabaseManager($this->options['configuration']);
+    }
+
+    return self::$dbManager;
+  }
+
+  public function setOption($name, $value)
+  {
+    $this->options[$name] = $value;
+  }
+
+  public function getOption($name, $default = null)
+  {
+    if (!isset($this->options[$name]))
+    {
+      return $default;
+    }
+
+    return $this->options[$name];
+  }
+
+  protected function dataLoad($path)
+  {
+    opApplicationConfiguration::unregisterZend();
+    Doctrine::loadData($path, true);
+    opApplicationConfiguration::registerZend();
+  }
+}
+
diff --git a/lib/upgrade/strategy/opUpgradeBuildModelStrategy.class.php b/lib/upgrade/strategy/opUpgradeBuildModelStrategy.class.php
new file mode 100644
index 000000000..70d128429
--- /dev/null
+++ b/lib/upgrade/strategy/opUpgradeBuildModelStrategy.class.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * This strategy builds models.
+ *
+ * @package    OpenPNE
+ * @subpackage upgrade
+ * @author     Kousuke Ebihara <ebihara@tejimaya.com>
+ */
+class opUpgradeBuildModelStrategy extends opUpgradeAbstractStrategy
+{
+  public function run()
+  {
+    opApplicationConfiguration::unregisterZend();
+
+    $task = new sfDoctrineBuildTask(clone $this->options['dispatcher'], clone $this->options['formatter']);
+    $task->run(array(), array(
+      'no-confirmation' => true,
+      'model'           => true,
+      'forms'           => true,
+      'filters'         => true,
+      'application'     => 'pc_frontend',
+      'env'             => sfConfig::get('sf_environment', 'prod'),
+    ));
+
+    $task = new sfCacheClearTask(clone $this->options['dispatcher'], clone $this->options['formatter']);
+    $task->run(array(), array('application' => null, 'env' => sfConfig::get('sf_environment', 'prod')));
+
+    opApplicationConfiguration::registerZend();
+  }
+}
+
diff --git a/lib/upgrade/strategy/opUpgradeCreateTableStrategy.class.php b/lib/upgrade/strategy/opUpgradeCreateTableStrategy.class.php
new file mode 100644
index 000000000..92385ce81
--- /dev/null
+++ b/lib/upgrade/strategy/opUpgradeCreateTableStrategy.class.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * This strategy creates the specified tables.
+ *
+ * @package    OpenPNE
+ * @subpackage upgrade
+ * @author     Kousuke Ebihara <ebihara@tejimaya.com>
+ */
+class opUpgradeCreateTableStrategy extends opUpgradeAbstractStrategy
+{
+  public function run()
+  {
+    $this->getDatabaseManager();
+
+    // build all tables for models
+    if (!$this->getOption('models'))
+    {
+      opApplicationConfiguration::unregisterZend();
+
+      $path = sfConfig::get('sf_lib_dir').'/model/doctrine';
+      Doctrine_Core::loadModels($path, Doctrine_Core::MODEL_LOADING_CONSERVATIVE);
+      Doctrine_Core::createTablesFromArray(Doctrine_Core::getLoadedModels());
+
+      opApplicationConfiguration::registerZend();
+
+      return true;
+    }
+
+    foreach ($this->getQueries() as $query)
+    {
+      $db = $this->getDatabaseManager()->getDatabase('doctrine');
+      $db->getDoctrineConnection()->execute($query);
+    }
+  }
+
+  public function getQueries()
+  {
+    $result = array();
+
+    $models = $this->getOption('models');
+    if (!empty($models))
+    {
+      $queries = Doctrine_Manager::connection()->export->exportSortedClassesSql($models);
+      if (isset($queries['doctrine']))
+      {
+        $result = $queries['doctrine'];
+      }
+    }
+
+    return $result;
+  }
+}
+
diff --git a/lib/upgrade/strategy/opUpgradeDataLoadStrategy.class.php b/lib/upgrade/strategy/opUpgradeDataLoadStrategy.class.php
new file mode 100644
index 000000000..61bc053b1
--- /dev/null
+++ b/lib/upgrade/strategy/opUpgradeDataLoadStrategy.class.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * The upgrating strategy by importing yml.
+ *
+ * @package    OpenPNE
+ * @subpackage task
+ * @author     Kousuke Ebihara <ebihara@tejimaya.com>
+ */
+class opUpgradeDataLoadStrategy extends opUpgradeAbstractStrategy
+{
+  public function run()
+  {
+    $path = $this->options['dir'].DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.$this->options['name'].'.yml';
+    if (!file_exists($path))
+    {
+      throw new RuntimeException('The specified yml doesn\'t exist.');
+    }
+
+    Doctrine::loadData($path, true);
+  }
+}
diff --git a/lib/upgrade/strategy/opUpgradeSQLImportStrategy.class.php b/lib/upgrade/strategy/opUpgradeSQLImportStrategy.class.php
new file mode 100644
index 000000000..c65ce7066
--- /dev/null
+++ b/lib/upgrade/strategy/opUpgradeSQLImportStrategy.class.php
@@ -0,0 +1,89 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * The upgrating strategy by importing sql.
+ *
+ * The specified sql is parsed as PHP script. Items in the "params" option are usable
+ * as assigned variables from the sql (PHP script).
+ *
+ * @package    OpenPNE
+ * @subpackage task
+ * @author     Kousuke Ebihara <ebihara@tejimaya.com>
+ */
+class opUpgradeSQLImportStrategy extends opUpgradeAbstractStrategy
+{
+  public function run()
+  {
+    $path = $this->options['dir'].DIRECTORY_SEPARATOR.'sql'.DIRECTORY_SEPARATOR.$this->options['name'].'.sql';
+    if (!file_exists($path))
+    {
+      throw new RuntimeException('The specified sql doesn\'t exist.');
+    }
+
+    $db = $this->getDatabaseManager()->getDatabase('doctrine');
+    $this->conn = $db->getDoctrineConnection();
+
+    $this->conn->beginTransaction();
+    $this->conn->execute('SET FOREIGN_KEY_CHECKS = 0');  // for mysql
+
+    $sql = opToolkit::unifyEOLCharacter($this->parseSql($path));
+    $queries = explode("\n", $sql);
+
+    try
+    {
+      $this->executeQueries($queries);
+      $this->conn->commit();
+    }
+    catch (Exception $e)
+    {
+      $this->conn->rollback();
+      $this->conn->execute('SET FOREIGN_KEY_CHECKS = 0');  // for mysql
+
+      throw $e;
+    }
+
+    $this->conn->execute('SET FOREIGN_KEY_CHECKS = 0');  // for mysql
+  }
+
+  protected function executeQueries($queries)
+  {
+    foreach ($queries as $query)
+    {
+      $query = trim($query);
+      if (!$query)
+      {
+        continue;
+      }
+
+      $this->conn->execute($query);
+    }
+  }
+
+  protected function parseSql($file)
+  {
+    // The "params" option is settled, its items are imported as variables.
+    if (!empty($this->options['params']))
+    {
+      extract($this->options['params']);
+    }
+
+    ob_start();
+    include $file;
+    $result = ob_get_clean();
+
+    return $result;
+  }
+
+  protected function getSQLForFileId($name)
+  {
+    return '(SELECT id FROM file WHERE name = '.$name.' LIMIT 1)';
+  }
+}
diff --git a/lib/upgrade/strategy/opUpgradeSyncPluginStrategy.class.php b/lib/upgrade/strategy/opUpgradeSyncPluginStrategy.class.php
new file mode 100644
index 000000000..568778cb3
--- /dev/null
+++ b/lib/upgrade/strategy/opUpgradeSyncPluginStrategy.class.php
@@ -0,0 +1,26 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * This strategy sync plugins.
+ *
+ * @package    OpenPNE
+ * @subpackage upgrade
+ * @author     Kousuke Ebihara <ebihara@tejimaya.com>
+ */
+class opUpgradeSyncPluginStrategy extends opUpgradeAbstractStrategy
+{
+  public function run()
+  {
+    $task = new opPluginSyncTask($this->options['dispatcher'], $this->options['formatter']);
+    $task->run();
+  }
+}
+

From 1f9127771d77a7b27ed782c180677ff340e3f029 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 18 Apr 2012 15:29:23 +0900
Subject: [PATCH 195/630] added migration script for smartphone navigation
 data. (fixes #2991, BP from #2990)

---
 .../047_insert_smartphone_navigation.php      | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 data/migrations/3.8RC1/047_insert_smartphone_navigation.php

diff --git a/data/migrations/3.8RC1/047_insert_smartphone_navigation.php b/data/migrations/3.8RC1/047_insert_smartphone_navigation.php
new file mode 100644
index 000000000..818a98cec
--- /dev/null
+++ b/data/migrations/3.8RC1/047_insert_smartphone_navigation.php
@@ -0,0 +1,78 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+class Revision47_InsertSmaertphoneNavigation extends Doctrine_Migration_Base
+{
+  public function up()
+  {
+    $navigation = new Navigation();
+    $navigation->setType('smartphone_default');
+    $navigation->setUri('@homepage');
+    $navigation->setSortOrder(0);
+    $navigation->Translation['ja_JP']->caption = 'マイホーム';
+    $navigation->Translation['en']->caption = 'My Home';
+    $navigation->save();
+    $navigation->free();
+
+    $navigation = new Navigation();
+    $navigation->setType('smartphone_default');
+    $navigation->setUri('@member_profile_mine');
+    $navigation->setSortOrder(10);
+    $navigation->Translation['ja_JP']->caption = 'プロフィール確認';
+    $navigation->Translation['en']->caption = 'Profile';
+    $navigation->save();
+    $navigation->free();
+
+    $navigation = new Navigation();
+    $navigation->setType('smartphone_default');
+    $navigation->setUri('@member_search');
+    $navigation->setSortOrder(20);
+    $navigation->Translation['ja_JP']->caption = 'メンバー検索';
+    $navigation->Translation['en']->caption = 'Member Search';
+    $navigation->save();
+    $navigation->free();
+
+    $navigation = new Navigation();
+    $navigation->setType('smartphone_default');
+    $navigation->setUri('@community_search');
+    $navigation->setSortOrder(30);
+    $navigation->Translation['ja_JP']->caption = 'コミュニティ検索';
+    $navigation->Translation['en']->caption = 'Community Search';
+    $navigation->save();
+    $navigation->free();
+
+    $navigation = new Navigation();
+    $navigation->setType('smartphone_default');
+    $navigation->setUri('@member_logout');
+    $navigation->setSortOrder(40);
+    $navigation->Translation['ja_JP']->caption = 'ログアウト';
+    $navigation->Translation['en']->caption = 'Logout';
+    $navigation->save();
+    $navigation->free();
+
+    $navigation = new Navigation();
+    $navigation->setType('smartphone_insecure');
+    $navigation->setUri('@global_privacy_policy');
+    $navigation->setSortOrder(30);
+    $navigation->Translation['ja_JP']->caption = 'プライバシーポリシー';
+    $navigation->Translation['en']->caption = 'Privacy Policy';
+    $navigation->save();
+    $navigation->free();
+
+    $navigation = new Navigation();
+    $navigation->setType('smartphone_insecure');
+    $navigation->setUri('@globsl_user_agreement');
+    $navigation->setSortOrder(40);
+    $navigation->Translation['ja_JP']->caption = '利用規約';
+    $navigation->Translation['en']->caption = 'User Agreement';
+    $navigation->save();
+    $navigation->free();
+  }
+}

From 69ad816a3904bf5b2ab4a647ff66e47744b1e522 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 19 Apr 2012 14:28:15 +0900
Subject: [PATCH 196/630] fixed indent of yaml config file. (fixes #2954,BP
 from #2889)

---
 lib/config/config/sns_config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/config/config/sns_config.yml b/lib/config/config/sns_config.yml
index 7eac45952..b84138546 100644
--- a/lib/config/config/sns_config.yml
+++ b/lib/config/config/sns_config.yml
@@ -176,7 +176,7 @@ general:
     FormType:  "radio"
     ValueType: "text"
     IsRequired: true
-    Default:   1 
+    Default:    1
     Choices:
       - "使用しない"
       - "使用する"

From c24cc66b1c8ef82ab0e3778c2a113931ff660a70 Mon Sep 17 00:00:00 2001
From: kashiwasan <kashiwagi@tejimaya.com>
Date: Fri, 25 Nov 2011 10:51:48 +0900
Subject: [PATCH 197/630] (fixes #2971, BP from #2619) remove default gadgets

---
 data/fixtures/005_import_gadgets.yml | 30 ----------------------------
 1 file changed, 30 deletions(-)

diff --git a/data/fixtures/005_import_gadgets.yml b/data/fixtures/005_import_gadgets.yml
index f3c1ed9f0..a365f836d 100644
--- a/data/fixtures/005_import_gadgets.yml
+++ b/data/fixtures/005_import_gadgets.yml
@@ -1,14 +1,4 @@
 Gadget:
-  gadget_birthday:
-    type: "top"
-    name: "birthdayBox"
-    sort_order: 0
-
-  gadget_search:
-    type: "top"
-    name: "searchBox"
-    sort_order: 10
-
   gadget_information:
     type: "top"
     name: "informationBox"
@@ -34,16 +24,6 @@ Gadget:
     name: "languageSelecterBox"
     sort_order: 10
 
-  gadget_sidebanner:
-    type: "sideBannerContents"
-    name: "sideBanner"
-    sort_order: 20
-
-  mobile_gadget_birthday:
-    type: "mobileTop"
-    name: "birthdayBox"
-    sort_order: 0
-
   mobile_gadget_information:
     type: "mobileTop"
     name: "informationBox"
@@ -59,11 +39,6 @@ Gadget:
     name: "loginForm"
     sort_order: 10
 
-  profile_gadget_birthday:
-    type: "profileTop"
-    name: "birthdayBox"
-    sort_order: 0
-
   profile_gadget_member_image:
     type: "profileSideMenu"
     name: "memberImageBox"
@@ -84,11 +59,6 @@ Gadget:
     name: "profileListBox"
     sort_order: 10
 
-  mobile_profile_gadget_birthday:
-    type: "mobileProfileTop"
-    name: "birthdayBox"
-    sort_order: 0
-
   mobile_profile_gadget_friend_table:
     type: "mobileProfileBottom"
     name: "friendListBox"

From aeeb09ead598b09df37f0d681d7392bf0d2fa5b9 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 19 Apr 2012 14:35:20 +0900
Subject: [PATCH 198/630] fixed all community default description (fixes #2969,
 BP from #2621)

---
 data/fixtures/011_import_first_community.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/fixtures/011_import_first_community.yml b/data/fixtures/011_import_first_community.yml
index b11623c6b..339e8dc1f 100644
--- a/data/fixtures/011_import_first_community.yml
+++ b/data/fixtures/011_import_first_community.yml
@@ -18,7 +18,7 @@ CommunityConfig:
   description:
     community_id: 1
     name: "description"
-    value: "このコミュニティはSNSメンバー全員を含んでいます。"
+    value: "全員参加のコミュニティです。"
   is_send_pc_joinCommunity_mail:
     community_id: 1
     name: "is_send_pc_joinCommunity_mail"

From 1cc92e0c25b278fbdbc80bb4248638a5096a5278 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 19 Apr 2012 14:38:12 +0900
Subject: [PATCH 199/630] updated OpenPNE_revision (fixes #2991, BP from #2990)

---
 data/fixtures/000_revision.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/fixtures/000_revision.yml b/data/fixtures/000_revision.yml
index b4dd1ec0d..8e23eda1e 100644
--- a/data/fixtures/000_revision.yml
+++ b/data/fixtures/000_revision.yml
@@ -1,4 +1,4 @@
 SnsConfig:
   current_revision:
     name:  "OpenPNE_revision"
-    value: 46
+    value: 47

From ce527d8a58c9bd46280328d3f81a7d5c6f562d4d Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 19 Apr 2012 14:43:04 +0900
Subject: [PATCH 200/630] public profile pages are viewable by anonymous users
 via smartphone (fixes #2979, BP from #2978)

---
 apps/pc_frontend/modules/member/config/security.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/pc_frontend/modules/member/config/security.yml b/apps/pc_frontend/modules/member/config/security.yml
index cef7fb037..519074fcb 100644
--- a/apps/pc_frontend/modules/member/config/security.yml
+++ b/apps/pc_frontend/modules/member/config/security.yml
@@ -22,3 +22,6 @@ registerMobileToRegisterEndFinish:
 
 profile:
   is_secure: both
+
+smtProfile:
+  is_secure: both

From 625cced5aeec359148269e2fe4c8232b37c4202f Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Thu, 19 Apr 2012 16:51:39 +0900
Subject: [PATCH 201/630] changed to show error on smartphone form (fixes
 #2999, BP from #3000)

---
 .../modules/community/templates/smtEditSuccess.php          | 6 +++---
 .../modules/community/templates/smtJoinInput.php            | 2 +-
 .../modules/community/templates/smtQuitSuccess.php          | 2 +-
 .../modules/default/templates/_smtLoginFormBox.php          | 4 ++--
 apps/pc_frontend/modules/friend/templates/smtLinkInput.php  | 2 +-
 .../modules/member/templates/smtConfigSuccess.php           | 2 +-
 .../modules/member/templates/smtEditProfileSuccess.php      | 4 ++--
 .../pc_frontend/modules/member/templates/smtInviteInput.php | 2 +-
 .../modules/member/templates/smtInviteSuccess.php           | 2 +-
 web/css/smt_main.css                                        | 5 +++++
 10 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/apps/pc_frontend/modules/community/templates/smtEditSuccess.php b/apps/pc_frontend/modules/community/templates/smtEditSuccess.php
index aa22f4ef1..34fb026d2 100644
--- a/apps/pc_frontend/modules/community/templates/smtEditSuccess.php
+++ b/apps/pc_frontend/modules/community/templates/smtEditSuccess.php
@@ -39,7 +39,7 @@
   <label class="control-label"><?php echo $cf->renderLabel() ?></label>
   <div class="controls">
     <?php if ($cf->hasError()): ?>
-    <span class="label label-important label-block"><?php echo __($cf->getError()); ?></span>
+    <span class="label label-important label-block"><?php echo __($cf->renderError()); ?></span>
     <?php endif ?>
     <?php echo $cf->render(array('class' => 'span12')) ?>
     <span class="help-block"><?php echo $cf->renderHelp(); ?></span>    
@@ -56,7 +56,7 @@
   <label class="control-label"><?php echo $ccf->renderLabel() ?></label>
   <div class="controls">
     <?php if ($ccf->hasError()): ?>
-    <span class="label label-important label-block"><?php echo __($ccf->getError()); ?></span>
+    <span class="label label-important label-block"><?php echo __($ccf->renderError()); ?></span>
     <?php endif ?>
     <?php echo $ccf->render(array('class' => 'span12')) ?>
     <span class="help-block"><?php echo $ccf->renderHelp(); ?></span>    
@@ -73,7 +73,7 @@
   <label class="control-label"><?php echo $cff->renderLabel() ?></label>
   <div class="controls">
     <?php if ($cff->hasError()): ?>
-    <span class="label label-important label-block"><?php echo __($cff->getError()); ?></span>
+    <span class="label label-important label-block"><?php echo __($cff->renderError()); ?></span>
     <?php endif ?>
     <?php echo $cff->render(array('class' => 'span12')) ?>
     <span class="help-block"><?php echo $cff->renderHelp(); ?></span>    
diff --git a/apps/pc_frontend/modules/community/templates/smtJoinInput.php b/apps/pc_frontend/modules/community/templates/smtJoinInput.php
index caf8de05d..f87f579fd 100644
--- a/apps/pc_frontend/modules/community/templates/smtJoinInput.php
+++ b/apps/pc_frontend/modules/community/templates/smtJoinInput.php
@@ -14,7 +14,7 @@
         <label class="control-label"><?php echo $field->renderLabel() ?></label>
         <div class="controls">
         <?php if ($field->hasError()): ?>
-        <span class="label label-important label-block"><?php echo __($field->getError()); ?></span>
+        <span class="label label-important label-block"><?php echo __($field->renderError()); ?></span>
         <?php endif ?>
         <?php echo $field->render(array('class' => 'span12')) ?>
         <span class="help-block"><?php echo $field->renderHelp(); ?></span>    
diff --git a/apps/pc_frontend/modules/community/templates/smtQuitSuccess.php b/apps/pc_frontend/modules/community/templates/smtQuitSuccess.php
index 3f18c9153..84e669046 100644
--- a/apps/pc_frontend/modules/community/templates/smtQuitSuccess.php
+++ b/apps/pc_frontend/modules/community/templates/smtQuitSuccess.php
@@ -15,7 +15,7 @@
         <label class="control-label"><?php echo $field->renderLabel() ?></label>
         <div class="controls">
         <?php if ($field->hasError()): ?>
-        <span class="label label-important label-block"><?php echo __($field->getError()); ?></span>
+        <span class="label label-important label-block"><?php echo __($field->renderError()); ?></span>
         <?php endif ?>
         <?php echo $field->render(array('class' => 'span12')) ?>
         <span class="help-block"><?php echo $field->renderHelp(); ?></span>    
diff --git a/apps/pc_frontend/modules/default/templates/_smtLoginFormBox.php b/apps/pc_frontend/modules/default/templates/_smtLoginFormBox.php
index c2c688c7f..022848227 100644
--- a/apps/pc_frontend/modules/default/templates/_smtLoginFormBox.php
+++ b/apps/pc_frontend/modules/default/templates/_smtLoginFormBox.php
@@ -27,7 +27,7 @@
   </div>
   <div class="span3 <?php echo $field->hasError() ? 'clearfix error' : '' ?>">
     <?php if ($field->hasError()): ?>
-    <span class="label label-important"><?php echo __($field->getError()); ?>
+    <span class="label label-important"><?php echo __($field->renderError()); ?>
     <?php endif; ?>
     <?php echo $field->render(); ?>
     <span class="help-block"><?php echo $field->renderHelp(); ?></span>
@@ -41,7 +41,7 @@
   </div>
   <div class="span12 <?php echo $field->hasError() ? 'clearfix error' : '' ?>">
     <?php if ($field->hasError()): ?>
-    <span class="label label-important"><?php echo __($field->getError()) ?></span>
+    <span class="label label-important"><?php echo __($field->renderError()) ?></span>
     <?php endif ?>
     <?php if (in_array($field->getWidget()->getOption('type'), array('text', 'password'))): ?>
     <?php echo $field->render(array('class' => 'span12')); ?>
diff --git a/apps/pc_frontend/modules/friend/templates/smtLinkInput.php b/apps/pc_frontend/modules/friend/templates/smtLinkInput.php
index 47e120508..0ac503a2a 100644
--- a/apps/pc_frontend/modules/friend/templates/smtLinkInput.php
+++ b/apps/pc_frontend/modules/friend/templates/smtLinkInput.php
@@ -13,7 +13,7 @@
         <label class="control-label"><?php echo $field->renderLabel() ?></label>
         <div class="controls">
         <?php if ($field->hasError()): ?>
-        <span class="label label-important label-block"><?php echo __($field->getError()); ?></span>
+        <span class="label label-important label-block"><?php echo __($field->renderError()); ?></span>
         <?php endif ?>
         <?php echo $field->render(array('class' => 'span12')) ?>
         <span class="help-block"><?php echo $field->renderHelp(); ?></span>    
diff --git a/apps/pc_frontend/modules/member/templates/smtConfigSuccess.php b/apps/pc_frontend/modules/member/templates/smtConfigSuccess.php
index b13bb19ed..1efb09edf 100644
--- a/apps/pc_frontend/modules/member/templates/smtConfigSuccess.php
+++ b/apps/pc_frontend/modules/member/templates/smtConfigSuccess.php
@@ -41,7 +41,7 @@
   <label class="control-label"><?php echo $f->renderLabel() ?></label>
   <div class="controls">
     <?php if ($f->hasError()): ?>
-    <span class="label label-important label-block"><?php echo __($f->getError()); ?></span>
+    <span class="label label-important label-block"><?php echo __($f->renderError()); ?></span>
     <?php endif ?>
     <?php echo $f->render(array('class' => 'span12')) ?>
     <span class="help-block"><?php echo $f->renderHelp(); ?></span>    
diff --git a/apps/pc_frontend/modules/member/templates/smtEditProfileSuccess.php b/apps/pc_frontend/modules/member/templates/smtEditProfileSuccess.php
index 36767e68d..7c9b97ca7 100644
--- a/apps/pc_frontend/modules/member/templates/smtEditProfileSuccess.php
+++ b/apps/pc_frontend/modules/member/templates/smtEditProfileSuccess.php
@@ -32,7 +32,7 @@
       <label class="control-label"><?php echo $mf->renderLabel() ?></label>
       <div class="controls">
         <?php if ($mf->hasError()): ?>
-        <span class="label label-important label-block"><?php echo __($mf->getError()); ?></span>
+        <span class="label label-important label-block"><?php echo __($mf->renderError()); ?></span>
         <?php endif ?>
         <?php echo $mf->render(array('class' => 'span12')) ?>
         <span class="help-block"><?php echo $mf->renderHelp(); ?></span>    
@@ -50,7 +50,7 @@
       <label class="control-label"><?php echo $pf->renderLabel() ?></label>
       <div class="controls">
         <?php if ($pf->hasError()): ?>
-        <span class="label label-important label-block"><?php echo __($pf->getError()); ?></span>
+        <span class="label label-important label-block"><?php echo __($pf->renderError()); ?></span>
         <?php endif ?>
         <?php if ($pf->getWidget()->getOption('widget') instanceof sfWidgetFormDate): ?>
         <?php echo $pf->render(array('class' => 'span4')) ?>
diff --git a/apps/pc_frontend/modules/member/templates/smtInviteInput.php b/apps/pc_frontend/modules/member/templates/smtInviteInput.php
index d0da5abf6..98adb9fdd 100644
--- a/apps/pc_frontend/modules/member/templates/smtInviteInput.php
+++ b/apps/pc_frontend/modules/member/templates/smtInviteInput.php
@@ -25,7 +25,7 @@
 </div>
 <div class="span12 <?php echo $f->hasError() ? 'clearfix error' : '' ?>">
   <?php if ($f->hasError()): ?>
-  <span class="label label-important"><?php echo __($f->getError()) ?></span><br />
+  <span class="label label-important"><?php echo __($f->renderError()) ?></span><br />
   <?php endif ?>
   <?php echo $f->render(array('class' => 'span12')) ?>
   <span class="help-block"><?php echo $f->renderHelp() ?></span>
diff --git a/apps/pc_frontend/modules/member/templates/smtInviteSuccess.php b/apps/pc_frontend/modules/member/templates/smtInviteSuccess.php
index 3c3cf9bca..16e1b9fe6 100644
--- a/apps/pc_frontend/modules/member/templates/smtInviteSuccess.php
+++ b/apps/pc_frontend/modules/member/templates/smtInviteSuccess.php
@@ -14,7 +14,7 @@
   <label class="control-label"><?php echo $f->renderLabel() ?></label>
   <div class="controls">
     <?php if ($f->hasError()): ?>
-    <span class="label label-important label-block"><?php echo __($f->getError()); ?></span>
+    <span class="label label-important label-block"><?php echo __($f->renderError()); ?></span>
     <?php endif ?>
     <?php echo $f->render(array('class' => 'span12')) ?>
     <span class="help-block"><?php echo $f->renderHelp(); ?></span>    
diff --git a/web/css/smt_main.css b/web/css/smt_main.css
index e114d49aa..19ba275df 100644
--- a/web/css/smt_main.css
+++ b/web/css/smt_main.css
@@ -19,6 +19,11 @@ label {
   margin-bottom: 5px;
 }
 
+ul.error_list {
+  list-style: none;
+  margin: 0px;
+}
+
 .input-prepend input[class*="span"], .input-append input[class*="span"] {
   width: auto;
 }

From 99fc6820a58fbda8e9e4b32b731849857a2dca4c Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 20 Apr 2012 12:11:46 +0900
Subject: [PATCH 202/630] moved migration script of smartphone navigation
 (fixes #2991, BP from #2990)

---
 .../047_insert_smartphone_navigation.php      | 62 ----------------
 .../047_insert_smartphone_navigation.yml      | 71 +++++++++++++++++++
 2 files changed, 71 insertions(+), 62 deletions(-)
 create mode 100644 data/migrations/3.8RC1/fixtures/047_insert_smartphone_navigation.yml

diff --git a/data/migrations/3.8RC1/047_insert_smartphone_navigation.php b/data/migrations/3.8RC1/047_insert_smartphone_navigation.php
index 818a98cec..cac4ab9bc 100644
--- a/data/migrations/3.8RC1/047_insert_smartphone_navigation.php
+++ b/data/migrations/3.8RC1/047_insert_smartphone_navigation.php
@@ -12,67 +12,5 @@ class Revision47_InsertSmaertphoneNavigation extends Doctrine_Migration_Base
 {
   public function up()
   {
-    $navigation = new Navigation();
-    $navigation->setType('smartphone_default');
-    $navigation->setUri('@homepage');
-    $navigation->setSortOrder(0);
-    $navigation->Translation['ja_JP']->caption = 'マイホーム';
-    $navigation->Translation['en']->caption = 'My Home';
-    $navigation->save();
-    $navigation->free();
-
-    $navigation = new Navigation();
-    $navigation->setType('smartphone_default');
-    $navigation->setUri('@member_profile_mine');
-    $navigation->setSortOrder(10);
-    $navigation->Translation['ja_JP']->caption = 'プロフィール確認';
-    $navigation->Translation['en']->caption = 'Profile';
-    $navigation->save();
-    $navigation->free();
-
-    $navigation = new Navigation();
-    $navigation->setType('smartphone_default');
-    $navigation->setUri('@member_search');
-    $navigation->setSortOrder(20);
-    $navigation->Translation['ja_JP']->caption = 'メンバー検索';
-    $navigation->Translation['en']->caption = 'Member Search';
-    $navigation->save();
-    $navigation->free();
-
-    $navigation = new Navigation();
-    $navigation->setType('smartphone_default');
-    $navigation->setUri('@community_search');
-    $navigation->setSortOrder(30);
-    $navigation->Translation['ja_JP']->caption = 'コミュニティ検索';
-    $navigation->Translation['en']->caption = 'Community Search';
-    $navigation->save();
-    $navigation->free();
-
-    $navigation = new Navigation();
-    $navigation->setType('smartphone_default');
-    $navigation->setUri('@member_logout');
-    $navigation->setSortOrder(40);
-    $navigation->Translation['ja_JP']->caption = 'ログアウト';
-    $navigation->Translation['en']->caption = 'Logout';
-    $navigation->save();
-    $navigation->free();
-
-    $navigation = new Navigation();
-    $navigation->setType('smartphone_insecure');
-    $navigation->setUri('@global_privacy_policy');
-    $navigation->setSortOrder(30);
-    $navigation->Translation['ja_JP']->caption = 'プライバシーポリシー';
-    $navigation->Translation['en']->caption = 'Privacy Policy';
-    $navigation->save();
-    $navigation->free();
-
-    $navigation = new Navigation();
-    $navigation->setType('smartphone_insecure');
-    $navigation->setUri('@globsl_user_agreement');
-    $navigation->setSortOrder(40);
-    $navigation->Translation['ja_JP']->caption = '利用規約';
-    $navigation->Translation['en']->caption = 'User Agreement';
-    $navigation->save();
-    $navigation->free();
   }
 }
diff --git a/data/migrations/3.8RC1/fixtures/047_insert_smartphone_navigation.yml b/data/migrations/3.8RC1/fixtures/047_insert_smartphone_navigation.yml
new file mode 100644
index 000000000..e76799420
--- /dev/null
+++ b/data/migrations/3.8RC1/fixtures/047_insert_smartphone_navigation.yml
@@ -0,0 +1,71 @@
+Navigation:
+  smartphone_default_navigation_home:
+    type: "smartphone_default"
+    uri: "@homepage"
+    sort_order: 0
+    Translation:
+      ja_JP:
+        caption: "マイホーム"
+      en:
+        caption: "My Home"
+
+  smartphone_default_navigation_profile_confirm:
+    type: "smartphone_default"
+    uri: "@member_profile_mine"
+    sort_order: 10
+    Translation:
+      ja_JP:
+        caption: "プロフィール確認"
+      en:
+        caption: "Profile"
+
+  smartphone_default_navigation_member_search:
+    type: "smartphone_default"
+    uri: "@member_search"
+    sort_order: 20
+    Translation:
+      ja_JP:
+        caption: "メンバー検索"
+      en:
+        caption: "Member Search"
+
+  smartphone_default_navigation_community_search:
+    type: "smartphone_default"
+    uri: "@community_search"
+    sort_order: 30
+    Translation:
+      ja_JP:
+        caption: "コミュニティ検索"
+      en:
+        caption: "Community Search"
+
+  smartphone_default_navigation_logout:
+    type: "smartphone_default"
+    uri: "@member_logout"
+    sort_order: 40
+    Translation:
+      ja_JP:
+        caption: "ログアウト"
+      en:
+        caption: "Logout"
+
+  smartphone_insecure_navigation_privacy_policy:
+    type: "smartphone_insecure"
+    uri: "@global_privacy_policy"
+    sort_order: 30
+    Translation:
+      ja_JP:
+        caption: "プライバシーポリシー"
+      en:
+        caption: "Privacy Policy"
+
+  smartphone_insecure_navigation_user_agreement:
+    type: "smartphone_insecure"
+    uri: "@global_user_agreement"
+    sort_order: 40
+    Translation:
+      ja_JP:
+        caption: "利用規約"
+      en:
+        caption: "User Agreement"
+

From 79cc2c7400fbc05bf9f7f00c70c1e71d48b6707e Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 20 Apr 2012 15:58:36 +0900
Subject: [PATCH 203/630] (fixes #3007, BP from #3006) fixed not to show apiKey
 when user is not logged in and to show apiKey when OpenPNE3 installed.

---
 apps/pc_frontend/templates/_layout.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/pc_frontend/templates/_layout.php b/apps/pc_frontend/templates/_layout.php
index e9dc90848..951a918c5 100644
--- a/apps/pc_frontend/templates/_layout.php
+++ b/apps/pc_frontend/templates/_layout.php
@@ -8,7 +8,7 @@
 <?php if (Doctrine::getTable('SnsConfig')->get('customizing_css')): ?>
 <link rel="stylesheet" type="text/css" href="<?php echo url_for('@customizing_css') ?>" />
 <?php endif; ?>
-<?php if (Doctrine::getTable('SnsConfig')->get('enable_jsonapi')): ?>
+<?php if (opConfig::get('enable_jsonapi') && opToolkit::isSecurePage()): ?>
 <?php
 use_helper('Javascript');
 

From 99058c7eeb0554632799c607cf203db25e23972d Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 20 Apr 2012 16:31:46 +0900
Subject: [PATCH 204/630] added smartphone default gadgets into migration
 script. (fixes #2991, BP from #2990)

---
 ...ert_smartphone_navigation_and_gadgets.php} |  2 +-
 ...ert_smartphone_navigation_and_gadgets.yml} | 31 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 rename data/migrations/3.8RC1/{047_insert_smartphone_navigation.php => 047_insert_smartphone_navigation_and_gadgets.php} (77%)
 rename data/migrations/3.8RC1/fixtures/{047_insert_smartphone_navigation.yml => 047_insert_smartphone_navigation_and_gadgets.yml} (67%)

diff --git a/data/migrations/3.8RC1/047_insert_smartphone_navigation.php b/data/migrations/3.8RC1/047_insert_smartphone_navigation_and_gadgets.php
similarity index 77%
rename from data/migrations/3.8RC1/047_insert_smartphone_navigation.php
rename to data/migrations/3.8RC1/047_insert_smartphone_navigation_and_gadgets.php
index cac4ab9bc..3e35c518d 100644
--- a/data/migrations/3.8RC1/047_insert_smartphone_navigation.php
+++ b/data/migrations/3.8RC1/047_insert_smartphone_navigation_and_gadgets.php
@@ -8,7 +8,7 @@
  * file and the NOTICE file that were distributed with this source code.
  */
 
-class Revision47_InsertSmaertphoneNavigation extends Doctrine_Migration_Base
+class Revision47_InsertSmaertphoneNavigationAndGadgets extends Doctrine_Migration_Base
 {
   public function up()
   {
diff --git a/data/migrations/3.8RC1/fixtures/047_insert_smartphone_navigation.yml b/data/migrations/3.8RC1/fixtures/047_insert_smartphone_navigation_and_gadgets.yml
similarity index 67%
rename from data/migrations/3.8RC1/fixtures/047_insert_smartphone_navigation.yml
rename to data/migrations/3.8RC1/fixtures/047_insert_smartphone_navigation_and_gadgets.yml
index e76799420..dfe53c294 100644
--- a/data/migrations/3.8RC1/fixtures/047_insert_smartphone_navigation.yml
+++ b/data/migrations/3.8RC1/fixtures/047_insert_smartphone_navigation_and_gadgets.yml
@@ -69,3 +69,34 @@ Navigation:
       en:
         caption: "User Agreement"
 
+Gadget:
+  smartphone_profile_gadget_profile:
+    type: "smartphoneProfileContents"
+    name: "profileListBox"
+    sort_order: 10
+
+  smartphone_profile_member_list:
+    type: "smartphoneProfileContents"
+    name: "memberFriendListBox"
+    sort_order: 100
+
+  smartphone_profile_join_community_list:
+    type: "smartphoneProfileContents"
+    name: "memberJoinCommunityListBox"
+    sort_order: 110
+
+  smartphone_community_gadget_community:
+    type: "smartphoneCommunityContents"
+    name: "communityListBox"
+    sort_order: 10
+
+  smartphone_community_gadget_join_member_list:
+    type: "smartphoneCommunityContents"
+    name: "communityMemberJoinListBox"
+    sort_order: 100
+
+  smartphone_login_gadget_login_form_box:
+    type: "smartphoneLoginContents"
+    name: "loginForm"
+    sort_order: 10
+

From 20b2c3679f40c1165211e51d738db8a954ac0fc2 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 20 Apr 2012 17:45:04 +0900
Subject: [PATCH 205/630] (fixes #3007, BP from #3006) fixed not to show apiKey
 when user is not logged in and to show apiKey when OpenPNE3 installed on
 smartphone layouts.

---
 apps/pc_frontend/templates/smtLayoutGroup.php  | 2 ++
 apps/pc_frontend/templates/smtLayoutHome.php   | 2 ++
 apps/pc_frontend/templates/smtLayoutMember.php | 2 ++
 apps/pc_frontend/templates/smtLayoutSns.php    | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/apps/pc_frontend/templates/smtLayoutGroup.php b/apps/pc_frontend/templates/smtLayoutGroup.php
index ed246043e..be8402810 100644
--- a/apps/pc_frontend/templates/smtLayoutGroup.php
+++ b/apps/pc_frontend/templates/smtLayoutGroup.php
@@ -14,6 +14,7 @@
 <link rel="stylesheet" type="text/css" href="<?php echo url_for('@customizing_css') ?>" />
 <?php endif ?>
 <meta name="viewport" content="width=320px,user-scalable=no" />
+<?php if (opConfig::get('enable_jsonapi') && opToolkit::isSecurePage()): ?>
 <?php
 $json = array(
   'apiKey' => $sf_user->getMemberApiKey(),
@@ -24,6 +25,7 @@
 var openpne = '.json_encode($json, defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0).';
 ')
 ?>
+<?php endif ?>
 <?php use_javascript('jquery.min.js') ?>
 <?php use_javascript('jquery.tmpl.min.js') ?>
 <?php use_javascript('smt_main') ?>
diff --git a/apps/pc_frontend/templates/smtLayoutHome.php b/apps/pc_frontend/templates/smtLayoutHome.php
index 76bfdd73b..9ada871fe 100644
--- a/apps/pc_frontend/templates/smtLayoutHome.php
+++ b/apps/pc_frontend/templates/smtLayoutHome.php
@@ -14,6 +14,7 @@
 <link rel="stylesheet" type="text/css" href="<?php echo url_for('@customizing_css') ?>" />
 <?php endif ?>
 <meta name="viewport" content="width=320px,user-scalable=no" />
+<?php if (opConfig::get('enable_jsonapi') && opToolkit::isSecurePage()): ?>
 <?php
 $json = array(
   'apiKey' => $sf_user->getMemberApiKey(),
@@ -24,6 +25,7 @@
 var openpne = '.json_encode($json, defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0).';
 ')
 ?>
+<?php endif ?>
 <?php use_javascript('jquery.min.js') ?>
 <?php use_javascript('jquery.tmpl.min.js') ?>
 <?php use_javascript('smt_main') ?>
diff --git a/apps/pc_frontend/templates/smtLayoutMember.php b/apps/pc_frontend/templates/smtLayoutMember.php
index b904fdeb2..a2605618c 100644
--- a/apps/pc_frontend/templates/smtLayoutMember.php
+++ b/apps/pc_frontend/templates/smtLayoutMember.php
@@ -14,6 +14,7 @@
 <link rel="stylesheet" type="text/css" href="<?php echo url_for('@customizing_css') ?>" />
 <?php endif ?>
 <meta name="viewport" content="width=320px,user-scalable=no" />
+<?php if (opConfig::get('enable_jsonapi') && opToolkit::isSecurePage()): ?>
 <?php
 $json = array(
   'apiKey' => $sf_user->getMemberApiKey(),
@@ -24,6 +25,7 @@
 var openpne = '.json_encode($json, defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0).';
 ')
 ?>
+<?php endif ?>
 <?php use_javascript('jquery.min.js') ?>
 <?php use_javascript('jquery.tmpl.min.js') ?>
 <?php use_javascript('smt_main') ?>
diff --git a/apps/pc_frontend/templates/smtLayoutSns.php b/apps/pc_frontend/templates/smtLayoutSns.php
index 2eb3785f0..3b6553eae 100644
--- a/apps/pc_frontend/templates/smtLayoutSns.php
+++ b/apps/pc_frontend/templates/smtLayoutSns.php
@@ -14,6 +14,7 @@
 <link rel="stylesheet" type="text/css" href="<?php echo url_for('@customizing_css') ?>" />
 <?php endif ?>
 <meta name="viewport" content="width=320px,user-scalable=no" />
+<?php if (opConfig::get('enable_jsonapi') && opToolkit::isSecurePage()): ?>
 <?php
 $json = array(
   'apiKey' => opToolkit::isSecurePage() ? $sf_user->getMemberApiKey() : '',
@@ -24,6 +25,7 @@
 var openpne = '.json_encode($json, defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0).';
 ')
 ?>
+<?php endif ?>
 <?php use_javascript('jquery.min.js') ?>
 <?php use_javascript('jquery.tmpl.min.js') ?>
 <?php use_javascript('smt_main') ?>

From 973407ed3e217b8f6c3e687d8d6f371b31c05cfa Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 19 Jan 2012 03:13:33 +0900
Subject: [PATCH 206/630] (fixes #2234) add translation which display when
 admin invite form was invalid input

---
 apps/pc_backend/i18n/messages.ja.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/pc_backend/i18n/messages.ja.xml b/apps/pc_backend/i18n/messages.ja.xml
index 6791ca150..664c46e0d 100644
--- a/apps/pc_backend/i18n/messages.ja.xml
+++ b/apps/pc_backend/i18n/messages.ja.xml
@@ -1461,6 +1461,10 @@
         <source>This setting is applied only for Input type "Text" or "Paragraph text".</source>
         <target>この設定はフォームタイプが「テキスト」または「テキスト（複数行）」の場合のみ適用されます。</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>All of the inputted E-mail addresses are invalid.</source>
+        <target>入力されたEメールアドレスはすべて無効です。</target>
+      </trans-unit>
       <trans-unit id="">
         <source>Full Size</source>
         <target>フルサイズ</target>

From d249cd6ed20518cddc6ce2673a84751fe17ef724 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 19 Jan 2012 03:00:34 +0900
Subject: [PATCH 207/630] (fixes #2534) fixed admin invite form to add correct
 member pre

---
 .../member/lib/AdminInviteForm.class.php      | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/apps/pc_backend/modules/member/lib/AdminInviteForm.class.php b/apps/pc_backend/modules/member/lib/AdminInviteForm.class.php
index 4eda478dd..9e69235e7 100644
--- a/apps/pc_backend/modules/member/lib/AdminInviteForm.class.php
+++ b/apps/pc_backend/modules/member/lib/AdminInviteForm.class.php
@@ -71,26 +71,33 @@ public function save()
     $authMode = $authModes[$this->getValue('auth_mode')];
     $this->setOption('authMode', $authMode);
 
+    $memberConfigTable = Doctrine::getTable('MemberConfig');
     foreach ($this->getValue('pc') as $value)
     {
-      if (!$this->validateAddress('pc_address', $value))
+      if ($this->validateAddress('pc_address', $value))
       {
-        $this->member = Doctrine::getTable('Member')->createPre();
+        if (!$memberConfigTable->retrieveByNameAndValue('pc_address_pre', $value))
+        {
+          $this->member = Doctrine::getTable('Member')->createPre();
+        }
+        $this->saveConfig('pc_address', $value);
+        $this->member->setConfig('register_auth_mode', $authMode);
+        $this->member->setConfig('is_admin_invited', true);
       }
-      $this->saveConfig('pc_address', $value);
-      $this->member->setConfig('register_auth_mode', $authMode);
-      $this->member->setConfig('is_admin_invited', true);
     }
 
     foreach ($this->getValue('mobile') as $value)
     {
-      if (!$this->validateAddress('mobile_address', $value))
+      if ($this->validateAddress('mobile_address', $value))
       {
-        $this->member = Doctrine::getTable('Member')->createPre();
+        if (!$memberConfigTable->retrieveByNameAndValue('mobile_address_pre', $value))
+        {
+          $this->member = Doctrine::getTable('Member')->createPre();
+        }
+        $this->saveConfig('mobile_address', $value);
+        $this->member->setConfig('register_auth_mode', $authMode);
+        $this->member->setConfig('is_admin_invited', true);
       }
-      $this->saveConfig('mobile_address', $value);
-      $this->member->setConfig('register_auth_mode', $authMode);
-      $this->member->setConfig('is_admin_invited', true);
     }
 
     return true;

From 12533166c3e7b2546c73137dee4d9b026886be66 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@tejimaya.com>
Date: Mon, 3 Oct 2011 20:38:56 +0900
Subject: [PATCH 208/630] (fixes #2442) fixed cp command options to execute in
 various systems

---
 doc/en/OpenPNE3_Version_Up_Guide.txt | 8 ++++++++
 doc/ja/OpenPNE3_Version_Up_Guide.txt | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/doc/en/OpenPNE3_Version_Up_Guide.txt b/doc/en/OpenPNE3_Version_Up_Guide.txt
index 5af0cdbdd..6aeec7839 100644
--- a/doc/en/OpenPNE3_Version_Up_Guide.txt
+++ b/doc/en/OpenPNE3_Version_Up_Guide.txt
@@ -53,8 +53,16 @@ Copy the old directory plugins to new.
 
 ::
 
+Case of the system like CentOS or Ubuntu which has '-u' option
+
+  $ cp -au /path/to/old/OpenPNE3/plugins/. /path/to/new/OpenPNE3/plugins
+
+Case of the system like MacOSX or FreeBSD which has '-n' option
+
   $ cp -an /path/to/old/OpenPNE3/plugins/. /path/to/new/OpenPNE3/plugins
 
+NOTE: check your system using 'man cp' to execute above commands.
+
 Re-build Models
 ~~~~~~~~~~~~~~~
 
diff --git a/doc/ja/OpenPNE3_Version_Up_Guide.txt b/doc/ja/OpenPNE3_Version_Up_Guide.txt
index 701b82089..ab3d31de6 100644
--- a/doc/ja/OpenPNE3_Version_Up_Guide.txt
+++ b/doc/ja/OpenPNE3_Version_Up_Guide.txt
@@ -55,8 +55,16 @@ OpenPNE.yml の設定値を環境に合わせて変更してください。特
 
 ::
 
+CentOS や Ubuntu など、-uオプションがある場合。
+
+  $ cp -au /path/to/old/OpenPNE3/plugins/. /path/to/new/OpenPNE3/plugins
+
+MacOSX や FreeBSD など、-nオプションがある場合。
+
   $ cp -an /path/to/old/OpenPNE3/plugins/. /path/to/new/OpenPNE3/plugins
 
+* どちらのコマンドを実行可能かについては「man cp」コマンドを実行してチェックしてください。
+
 モデルの再構築
 ~~~~~~~~~~~~~~
 

From ecae789904aee19ea63ec2c086c037b58f656cc6 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@tejimaya.com>
Date: Thu, 6 Oct 2011 20:26:10 +0900
Subject: [PATCH 209/630] (fixes #2442) modified documents

---
 doc/en/OpenPNE3_Version_Up_Guide.txt | 4 ++--
 doc/ja/OpenPNE3_Version_Up_Guide.txt | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/en/OpenPNE3_Version_Up_Guide.txt b/doc/en/OpenPNE3_Version_Up_Guide.txt
index 6aeec7839..49c737648 100644
--- a/doc/en/OpenPNE3_Version_Up_Guide.txt
+++ b/doc/en/OpenPNE3_Version_Up_Guide.txt
@@ -49,7 +49,7 @@ And copy the old config/database.yml to new config/database.yml. Then you should
 Copy the Plugin Directory
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Copy the old directory plugins to new.
+Copy the old directory plugins to new one, so that to use the plugins which you install or newer version than bundled.
 
 ::
 
@@ -57,7 +57,7 @@ Case of the system like CentOS or Ubuntu which has '-u' option
 
   $ cp -au /path/to/old/OpenPNE3/plugins/. /path/to/new/OpenPNE3/plugins
 
-Case of the system like MacOSX or FreeBSD which has '-n' option
+Case of the system like MacOSX or FreeBSD which doesn't have '-u' but has '-n' option
 
   $ cp -an /path/to/old/OpenPNE3/plugins/. /path/to/new/OpenPNE3/plugins
 
diff --git a/doc/ja/OpenPNE3_Version_Up_Guide.txt b/doc/ja/OpenPNE3_Version_Up_Guide.txt
index ab3d31de6..f12208332 100644
--- a/doc/ja/OpenPNE3_Version_Up_Guide.txt
+++ b/doc/ja/OpenPNE3_Version_Up_Guide.txt
@@ -51,15 +51,15 @@ OpenPNE.yml の設定値を環境に合わせて変更してください。特
 プラグインディレクトリのコピー
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-古いバージョンの plugins ディレクトリの中身をコピーします。
+独自で入れたプラグインや同梱されているプラグインのバージョンよりも新しいバージョンなどを新しい環境で用いるために、古いバージョンの plugins ディレクトリの中身をコピーします。
 
 ::
 
-CentOS や Ubuntu など、-uオプションがある場合。
+CentOS や Ubuntu など、 cp コマンドに -u オプションがある場合。
 
   $ cp -au /path/to/old/OpenPNE3/plugins/. /path/to/new/OpenPNE3/plugins
 
-MacOSX や FreeBSD など、-nオプションがある場合。
+MacOSX や FreeBSD など、 cp コマンドに -u オプションがなく -n オプションがある場合。
 
   $ cp -an /path/to/old/OpenPNE3/plugins/. /path/to/new/OpenPNE3/plugins
 

From 013554b49958af160eb9fd21e2956c737cb0d0e8 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Wed, 1 Feb 2012 02:02:49 +0900
Subject: [PATCH 210/630] (fixes #2008) add port to generated url

---
 lib/config/opApplicationConfiguration.class.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/config/opApplicationConfiguration.class.php b/lib/config/opApplicationConfiguration.class.php
index 5730ea76f..f67e8c9ed 100644
--- a/lib/config/opApplicationConfiguration.class.php
+++ b/lib/config/opApplicationConfiguration.class.php
@@ -594,6 +594,10 @@ protected function getAppRouting($application)
       if (isset($parts['host']))
       {
         $options['context']['host'] = $parts['host'];
+        if (isset($parts['port']))
+        {
+          $options['context']['host'] .= ':'.$parts['port'];
+        }
       }
     }
     else

From 238d4c948e6cf2fa68bb2d7f2b1be663713178f9 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Mon, 6 Feb 2012 20:53:26 +0900
Subject: [PATCH 211/630] (fixes #2008) fixed to generate url considering SSL
 and the port

---
 .../opApplicationConfiguration.class.php      | 28 +-----
 lib/routing/opPatternRouting.class.php        | 98 +++++++++++++++++++
 2 files changed, 99 insertions(+), 27 deletions(-)
 create mode 100644 lib/routing/opPatternRouting.class.php

diff --git a/lib/config/opApplicationConfiguration.class.php b/lib/config/opApplicationConfiguration.class.php
index f67e8c9ed..011e94ace 100644
--- a/lib/config/opApplicationConfiguration.class.php
+++ b/lib/config/opApplicationConfiguration.class.php
@@ -578,35 +578,9 @@ protected function getAppRouting($application)
     sfConfig::set('sf_app', $application);
     $configuration->setAppDir(sfConfig::get('sf_apps_dir').DIRECTORY_SEPARATOR.$application);
 
-    $settings = sfDefineEnvironmentConfigHandler::getConfiguration($configuration->getConfigPaths('config/settings.yml'));
-    $isNoScriptName = !empty($settings['.settings']['no_script_name']);
-
     $options = $context->getRouting()->getOptions();
-    $url = sfConfig::get('op_base_url');
-    if ('http://example.com' !== $url)
-    {
-      $parts = parse_url($url);
-
-      $parts['path'] = isset($parts['path']) ? $parts['path'] : '';
-      $options['context']['prefix'] =
-        $this->getAppScriptName($application, sfConfig::get('sf_environment'), $parts['path'], $isNoScriptName);
-
-      if (isset($parts['host']))
-      {
-        $options['context']['host'] = $parts['host'];
-        if (isset($parts['port']))
-        {
-          $options['context']['host'] .= ':'.$parts['port'];
-        }
-      }
-    }
-    else
-    {
-      $path = preg_replace('#/[^/]+\.php$#', '', $options['context']['prefix']);
-      $options['context']['prefix'] = $this->getAppScriptName($application, sfConfig::get('sf_environment'), $path, $isNoScriptName);
-    }
 
-    $routing = new sfPatternRouting($context->getEventDispatcher(), null, $options);
+    $routing = new opPatternRouting($context->getEventDispatcher(), null, $options);
     $routing->setRoutes($config->evaluate($configuration->getConfigPaths('config/routing.yml')));
     $context->getEventDispatcher()->notify(new sfEvent($routing, 'routing.load_configuration'));
 
diff --git a/lib/routing/opPatternRouting.class.php b/lib/routing/opPatternRouting.class.php
new file mode 100644
index 000000000..ea48f7162
--- /dev/null
+++ b/lib/routing/opPatternRouting.class.php
@@ -0,0 +1,98 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * opPatternRouting class controls the generation and parsing of URLs in OpenPNE.
+ *
+ * @package    OpenPNE
+ * @subpackage routing
+ * @author     Yuya Watanabe <watanabe@openpne.jp>
+ */
+class opPatternRouting extends sfPatternRouting
+{
+
+  public function generate($name, $params = array(), $absolute = false)
+  {
+    $app = sfConfig::get('sf_app');
+    $sslAppRequiredList = sfConfig::get('op_ssl_required_applications', array());
+    $sslActionRequiredList = sfConfig::get('op_ssl_required_actions', array($app => array()));
+
+    if (sfConfig::get('op_use_ssl', false)
+      && in_array($app, $sslAppRequiredList)
+      && isset($params['module']) && isset($params['action'])
+      && in_array($params['module'].'/'.$params['action'], $sslActionRequiredList[$app])
+    )
+    {
+      $this->options['context']['is_secure'] = true;
+      $sslBaseUrls = sfConfig::get('op_ssl_base_url');
+      $url = $sslBaseUrls[$app];
+      $isDefault = 'https://example.com' === $url;
+    }
+    else
+    {
+      $this->options['context']['is_secure'] = false;
+      $url = sfConfig::get('op_base_url');
+      $isDefault = 'http://example.com' === $url;
+    }
+
+    $parts = parse_url($url);
+
+    $configuration = sfContext::getInstance()->getConfiguration();
+    $settings = sfDefineEnvironmentConfigHandler::getConfiguration($configuration->getConfigPaths('config/settings.yml'));
+    $isNoScriptName = !empty($settings['.settings']['no_script_name']);
+
+    if (!$isDefault)
+    {
+      $parts['path'] = isset($parts['path']) ? $parts['path'] : '';
+      $this->options['context']['prefix'] =
+        $this->getAppScriptName($app, sfConfig::get('sf_environment'), $parts['path'], $isNoScriptName);
+
+      if (isset($parts['host']))
+      {
+        $this->options['context']['host'] = $parts['host'];
+        if (isset($parts['port']))
+        {
+          $this->options['context']['host'] .= ':'.$parts['port'];
+        }
+      }
+    }
+    else
+    {
+      $path = preg_replace('#/[^/]+\.php$#', '', $this->options['context']['prefix']);
+      $this->options['context']['prefix'] = $this->getAppScriptName($app, sfConfig::get('sf_environment'), $path, $isNoScriptName);
+    }
+
+    return parent::generate($name, $params, $absolute);
+  }
+
+  // equals opApplicationConfiguration#getAppScriptName
+  private function getAppScriptName($application, $env, $prefix, $isNoScriptName = false)
+  {
+    if ($isNoScriptName)
+    {
+      return $prefix;
+    }
+
+    if ('/' === $prefix)
+    {
+      $prefix = '';
+    }
+
+    $name = $prefix.'/'.$application;
+    if ($env !== 'prod')
+    {
+      $name .= '_'.$env;
+    }
+    $name .= '.php';
+
+    return $name;
+  }
+
+}

From 2a84526704952075774923b68327482c6b874ae8 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Tue, 7 Feb 2012 20:08:40 +0900
Subject: [PATCH 212/630] Revert "(fixes #2008) fixed to generate url
 considering SSL and the port"

This reverts commit 9be543bd53d57c94a545968057441e5ff13c6d43.
---
 .../opApplicationConfiguration.class.php      | 28 +++++-
 lib/routing/opPatternRouting.class.php        | 98 -------------------
 2 files changed, 27 insertions(+), 99 deletions(-)
 delete mode 100644 lib/routing/opPatternRouting.class.php

diff --git a/lib/config/opApplicationConfiguration.class.php b/lib/config/opApplicationConfiguration.class.php
index 011e94ace..f67e8c9ed 100644
--- a/lib/config/opApplicationConfiguration.class.php
+++ b/lib/config/opApplicationConfiguration.class.php
@@ -578,9 +578,35 @@ protected function getAppRouting($application)
     sfConfig::set('sf_app', $application);
     $configuration->setAppDir(sfConfig::get('sf_apps_dir').DIRECTORY_SEPARATOR.$application);
 
+    $settings = sfDefineEnvironmentConfigHandler::getConfiguration($configuration->getConfigPaths('config/settings.yml'));
+    $isNoScriptName = !empty($settings['.settings']['no_script_name']);
+
     $options = $context->getRouting()->getOptions();
+    $url = sfConfig::get('op_base_url');
+    if ('http://example.com' !== $url)
+    {
+      $parts = parse_url($url);
+
+      $parts['path'] = isset($parts['path']) ? $parts['path'] : '';
+      $options['context']['prefix'] =
+        $this->getAppScriptName($application, sfConfig::get('sf_environment'), $parts['path'], $isNoScriptName);
+
+      if (isset($parts['host']))
+      {
+        $options['context']['host'] = $parts['host'];
+        if (isset($parts['port']))
+        {
+          $options['context']['host'] .= ':'.$parts['port'];
+        }
+      }
+    }
+    else
+    {
+      $path = preg_replace('#/[^/]+\.php$#', '', $options['context']['prefix']);
+      $options['context']['prefix'] = $this->getAppScriptName($application, sfConfig::get('sf_environment'), $path, $isNoScriptName);
+    }
 
-    $routing = new opPatternRouting($context->getEventDispatcher(), null, $options);
+    $routing = new sfPatternRouting($context->getEventDispatcher(), null, $options);
     $routing->setRoutes($config->evaluate($configuration->getConfigPaths('config/routing.yml')));
     $context->getEventDispatcher()->notify(new sfEvent($routing, 'routing.load_configuration'));
 
diff --git a/lib/routing/opPatternRouting.class.php b/lib/routing/opPatternRouting.class.php
deleted file mode 100644
index ea48f7162..000000000
--- a/lib/routing/opPatternRouting.class.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * opPatternRouting class controls the generation and parsing of URLs in OpenPNE.
- *
- * @package    OpenPNE
- * @subpackage routing
- * @author     Yuya Watanabe <watanabe@openpne.jp>
- */
-class opPatternRouting extends sfPatternRouting
-{
-
-  public function generate($name, $params = array(), $absolute = false)
-  {
-    $app = sfConfig::get('sf_app');
-    $sslAppRequiredList = sfConfig::get('op_ssl_required_applications', array());
-    $sslActionRequiredList = sfConfig::get('op_ssl_required_actions', array($app => array()));
-
-    if (sfConfig::get('op_use_ssl', false)
-      && in_array($app, $sslAppRequiredList)
-      && isset($params['module']) && isset($params['action'])
-      && in_array($params['module'].'/'.$params['action'], $sslActionRequiredList[$app])
-    )
-    {
-      $this->options['context']['is_secure'] = true;
-      $sslBaseUrls = sfConfig::get('op_ssl_base_url');
-      $url = $sslBaseUrls[$app];
-      $isDefault = 'https://example.com' === $url;
-    }
-    else
-    {
-      $this->options['context']['is_secure'] = false;
-      $url = sfConfig::get('op_base_url');
-      $isDefault = 'http://example.com' === $url;
-    }
-
-    $parts = parse_url($url);
-
-    $configuration = sfContext::getInstance()->getConfiguration();
-    $settings = sfDefineEnvironmentConfigHandler::getConfiguration($configuration->getConfigPaths('config/settings.yml'));
-    $isNoScriptName = !empty($settings['.settings']['no_script_name']);
-
-    if (!$isDefault)
-    {
-      $parts['path'] = isset($parts['path']) ? $parts['path'] : '';
-      $this->options['context']['prefix'] =
-        $this->getAppScriptName($app, sfConfig::get('sf_environment'), $parts['path'], $isNoScriptName);
-
-      if (isset($parts['host']))
-      {
-        $this->options['context']['host'] = $parts['host'];
-        if (isset($parts['port']))
-        {
-          $this->options['context']['host'] .= ':'.$parts['port'];
-        }
-      }
-    }
-    else
-    {
-      $path = preg_replace('#/[^/]+\.php$#', '', $this->options['context']['prefix']);
-      $this->options['context']['prefix'] = $this->getAppScriptName($app, sfConfig::get('sf_environment'), $path, $isNoScriptName);
-    }
-
-    return parent::generate($name, $params, $absolute);
-  }
-
-  // equals opApplicationConfiguration#getAppScriptName
-  private function getAppScriptName($application, $env, $prefix, $isNoScriptName = false)
-  {
-    if ($isNoScriptName)
-    {
-      return $prefix;
-    }
-
-    if ('/' === $prefix)
-    {
-      $prefix = '';
-    }
-
-    $name = $prefix.'/'.$application;
-    if ($env !== 'prod')
-    {
-      $name .= '_'.$env;
-    }
-    $name .= '.php';
-
-    return $name;
-  }
-
-}

From f7cc71d882c7f876c729d595c5f9cb190947140e Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Tue, 7 Feb 2012 20:23:43 +0900
Subject: [PATCH 213/630] (fixes #2008) fixed to generate url considering SSL
 and the port

---
 .../opApplicationConfiguration.class.php      | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/lib/config/opApplicationConfiguration.class.php b/lib/config/opApplicationConfiguration.class.php
index f67e8c9ed..10c7f9cef 100644
--- a/lib/config/opApplicationConfiguration.class.php
+++ b/lib/config/opApplicationConfiguration.class.php
@@ -502,7 +502,7 @@ static public function registerZend()
 
     require_once 'Zend/Loader/Autoloader.php';
     Zend_Loader_Autoloader::getInstance()->setFallbackAutoloader(true);
-    
+
     self::$zendLoaded = true;
   }
 
@@ -515,7 +515,7 @@ static public function unregisterZend()
 
     Zend_Loader_Autoloader::resetInstance();
     spl_autoload_unregister(array('Zend_Loader_Autoloader', 'autoload'));
-    
+
     self::$zendLoaded = false;
   }
 
@@ -582,8 +582,19 @@ protected function getAppRouting($application)
     $isNoScriptName = !empty($settings['.settings']['no_script_name']);
 
     $options = $context->getRouting()->getOptions();
-    $url = sfConfig::get('op_base_url');
-    if ('http://example.com' !== $url)
+    if ($options['context']['is_secure'])
+    {
+      $sslBaseUrls = sfConfig::get('op_ssl_base_url');
+      $url = $sslBaseUrls[$application];
+      $isDefault = 'https://example.com' === $url;
+    }
+    else
+    {
+      $url = sfConfig::get('op_base_url');
+      $isDefault = 'http://example.com' === $url;
+    }
+
+    if ($isDefault)
     {
       $parts = parse_url($url);
 

From b41289b8db5101473cc2f7e428e3add12aeb4dad Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 9 Feb 2012 13:26:15 +0900
Subject: [PATCH 214/630] (fixes #2008) fixed to flip default flag to evaluate
 correct boolean

---
 lib/config/opApplicationConfiguration.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/config/opApplicationConfiguration.class.php b/lib/config/opApplicationConfiguration.class.php
index 10c7f9cef..d73865c2a 100644
--- a/lib/config/opApplicationConfiguration.class.php
+++ b/lib/config/opApplicationConfiguration.class.php
@@ -594,7 +594,7 @@ protected function getAppRouting($application)
       $isDefault = 'http://example.com' === $url;
     }
 
-    if ($isDefault)
+    if (!$isDefault)
     {
       $parts = parse_url($url);
 

From fa8a81fbc563dfae9c8c34085a3bc6becb20f541 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Mon, 6 Feb 2012 15:00:41 +0900
Subject: [PATCH 215/630] (fixes #1594) fixed not to ocurr an error in send
 daily news mail

---
 lib/model/doctrine/Gadget.class.php         | 7 +++++--
 lib/task/openpneSendDailyNewsTask.class.php | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/model/doctrine/Gadget.class.php b/lib/model/doctrine/Gadget.class.php
index 4cb50533d..80ab1cd98 100644
--- a/lib/model/doctrine/Gadget.class.php
+++ b/lib/model/doctrine/Gadget.class.php
@@ -63,7 +63,7 @@ public function getComponentAction()
     return $list[$this->name]['component'][1];
   }
 
-  public function isEnabled()
+  public function isEnabled($member = null)
   {
     $list = $this->getGadgetConfigList();
     if (empty($list[$this->name]))
@@ -77,7 +77,10 @@ public function isEnabled()
       return false;
     }
 
-    $member = sfContext::getInstance()->getUser()->getMember();
+    if (is_null($member))
+    {
+      $member = sfContext::getInstance()->getUser()->getMember();
+    }
     $isEnabled = $this->isAllowed($member, 'view');
 
     return $isEnabled;
diff --git a/lib/task/openpneSendDailyNewsTask.class.php b/lib/task/openpneSendDailyNewsTask.class.php
index f70f08216..3a7d9a9bc 100644
--- a/lib/task/openpneSendDailyNewsTask.class.php
+++ b/lib/task/openpneSendDailyNewsTask.class.php
@@ -58,7 +58,7 @@ protected function execute($arguments = array(), $options = array())
       {
         foreach ($gadgets as $gadget)
         {
-          if ($gadget->isEnabled())
+          if ($gadget->isEnabled($member))
           {
             $filteredGadgets[] = array(
               'component' => array('module' => $gadget->getComponentModule(), 'action' => $gadget->getComponentAction()),

From f82ef776751d00c517b19edee5fd9861549cb486 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Wed, 8 Feb 2012 07:38:04 +0900
Subject: [PATCH 216/630] (fixes #1594) fixed to enable to send mobile daily
 news using gadget

---
 lib/task/openpneSendDailyNewsTask.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/task/openpneSendDailyNewsTask.class.php b/lib/task/openpneSendDailyNewsTask.class.php
index 3a7d9a9bc..e1c511fb4 100644
--- a/lib/task/openpneSendDailyNewsTask.class.php
+++ b/lib/task/openpneSendDailyNewsTask.class.php
@@ -48,6 +48,7 @@ protected function execute($arguments = array(), $options = array())
       }
       $address = $member->getEmailAddress();
       $gadgets = $pcGadgets['dailyNewsContents'];
+      $context = $this->getContextByEmailAddress($address);
       if (opToolkit::isMobileEmailAddress($address))
       {
         $gadgets = $mobileGadgets['mobileDailyNewsContents'];
@@ -69,7 +70,6 @@ protected function execute($arguments = array(), $options = array())
         }
       }
 
-      $context = $this->getContextByEmailAddress($address);
       $params = array(
         'member'  => $member,
         'gadgets' => $filteredGadgets,

From 4f6c769c16782f74aef9b27f60d8d47125f4e28f Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 9 Feb 2012 19:52:37 +0900
Subject: [PATCH 217/630] (fixes #1594) fixed not to occur the error when the
 first member 's address is pc

---
 lib/task/openpneSendDailyNewsTask.class.php | 73 ++++++++++++++++++---
 1 file changed, 63 insertions(+), 10 deletions(-)

diff --git a/lib/task/openpneSendDailyNewsTask.class.php b/lib/task/openpneSendDailyNewsTask.class.php
index e1c511fb4..9de9d5cd3 100644
--- a/lib/task/openpneSendDailyNewsTask.class.php
+++ b/lib/task/openpneSendDailyNewsTask.class.php
@@ -22,20 +22,48 @@ protected function configure()
 
   [php symfony openpne:send-birthday-mail|INFO]
 EOF;
+
+    $this->addOptions(
+      array(
+        new sfCommandOption('app', null, sfCommandOption::PARAMETER_OPTIONAL, 'send to pc or mobile', null),
+      )
+    );
   }
 
   protected function execute($arguments = array(), $options = array())
   {
     parent::execute($arguments, $options);
+    if (isset($options['app']))
+    {
+      $this->sendDailyNews($options['app']);
+    }
+    else{
+      $php = $this->findPhpBinary();
+      foreach (array('pc_frontend', 'mobile_frontend') as $app)
+      {
+        exec($php.' '.sfConfig::get('sf_root_dir').'/symfony openpne:send-daily-news --app='.$app);
+      }
+    }
+  }
 
-    sfContext::createInstance($this->createConfiguration('pc_frontend', 'prod'), 'pc_frontend');
+  private function sendDailyNews($app)
+  {
+    $isPc = 'pc_frontend' === $app;
+    $dailyNewsName = $isPc ? 'dailyNews' : 'mobileDailyNews';
+    $context = sfContext::createInstance($this->createConfiguration($app, 'prod'), $app);
 
-    $pcGadgets = Doctrine::getTable('Gadget')->retrieveGadgetsByTypesName('dailyNews');
-    $mobileGadgets = Doctrine::getTable('Gadget')->retrieveGadgetsByTypesName('mobileDailyNews');
+    $gadgets = Doctrine::getTable('Gadget')->retrieveGadgetsByTypesName($dailyNewsName);
+    $gadgets = $gadgets[$dailyNewsName.'Contents'];
 
     $targetMembers = Doctrine::getTable('Member')->findAll();
     foreach ($targetMembers as $member)
     {
+      $address = $member->getEmailAddress();
+      if (!($isPc ^ opToolkit::isMobileEmailAddress($address)))
+      {
+        continue;
+      }
+
       $dailyNewsConfig = $member->getConfig('daily_news');
       if (null !== $dailyNewsConfig && 0 === (int)$dailyNewsConfig)
       {
@@ -46,13 +74,6 @@ protected function execute($arguments = array(), $options = array())
       {
         continue;
       }
-      $address = $member->getEmailAddress();
-      $gadgets = $pcGadgets['dailyNewsContents'];
-      $context = $this->getContextByEmailAddress($address);
-      if (opToolkit::isMobileEmailAddress($address))
-      {
-        $gadgets = $mobileGadgets['mobileDailyNewsContents'];
-      }
 
       $filteredGadgets = array();
       if ($gadgets)
@@ -91,4 +112,36 @@ protected function isDailyNewsDay()
 
     return in_array($day, opConfig::get('daily_news_day'));
   }
+
+  private function findPhpBinary()
+  {
+    if (defined('PHP_BINARY') && PHP_BINARY)
+    {
+      return PHP_BINARY;
+    }
+
+    if (false !== strpos(basename($php = $_SERVER['_']), 'php'))
+    {
+      return $php;
+    }
+
+    // from https://github.com/symfony/Process/blob/379b35a41a2749cf7361dda0f03e04410daaca4c/PhpExecutableFinder.php
+    $suffixes = DIRECTORY_SEPARATOR == '\\' ? (getenv('PATHEXT') ? explode(PATH_SEPARATOR, getenv('PATHEXT')) : array('.exe', '.bat', '.cmd', '.com')) : array('');
+    foreach ($suffixes as $suffix)
+    {
+      if (is_executable($php = PHP_BINDIR.DIRECTORY_SEPARATOR.'php'.$suffix))
+      {
+        return $php;
+      }
+    }
+
+    if ($php = getenv('PHP_PEAR_PHP_BIN')) {
+      if (is_executable($php)) {
+        return $php;
+      }
+    }
+
+    return sfToolkit::getPhpCli();
+  }
+
 }

From 27e5de8fa9423502f4b5c0ab0d8a14cee77ac148 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 9 Feb 2012 20:54:18 +0900
Subject: [PATCH 218/630] (fixes #1594) improved code readability

---
 lib/task/openpneSendDailyNewsTask.class.php | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/lib/task/openpneSendDailyNewsTask.class.php b/lib/task/openpneSendDailyNewsTask.class.php
index 9de9d5cd3..a5bb7103d 100644
--- a/lib/task/openpneSendDailyNewsTask.class.php
+++ b/lib/task/openpneSendDailyNewsTask.class.php
@@ -30,16 +30,27 @@ protected function configure()
     );
   }
 
+
   protected function execute($arguments = array(), $options = array())
   {
     parent::execute($arguments, $options);
+
+    $expectedOptions = array('pc_frontend', 'mobile_frontend');
+
     if (isset($options['app']))
     {
-      $this->sendDailyNews($options['app']);
+      if (in_array($options['app'], $expectedOptions))
+      {
+        $this->sendDailyNews($options['app']);
+      }
+      else
+      {
+        throw new Exception('invalid option');
+      }
     }
     else{
       $php = $this->findPhpBinary();
-      foreach (array('pc_frontend', 'mobile_frontend') as $app)
+      foreach ($expectedOptions as $app)
       {
         exec($php.' '.sfConfig::get('sf_root_dir').'/symfony openpne:send-daily-news --app='.$app);
       }
@@ -48,8 +59,8 @@ protected function execute($arguments = array(), $options = array())
 
   private function sendDailyNews($app)
   {
-    $isPc = 'pc_frontend' === $app;
-    $dailyNewsName = $isPc ? 'dailyNews' : 'mobileDailyNews';
+    $isAppMobile = 'pc_frontend' !== $app;
+    $dailyNewsName = $isAppMobile ? 'dailyNews' : 'mobileDailyNews';
     $context = sfContext::createInstance($this->createConfiguration($app, 'prod'), $app);
 
     $gadgets = Doctrine::getTable('Gadget')->retrieveGadgetsByTypesName($dailyNewsName);
@@ -59,7 +70,7 @@ private function sendDailyNews($app)
     foreach ($targetMembers as $member)
     {
       $address = $member->getEmailAddress();
-      if (!($isPc ^ opToolkit::isMobileEmailAddress($address)))
+      if ($isAppMobile !== opToolkit::isMobileEmailAddress($address))
       {
         continue;
       }

From ebef203fd68c9017408f6525a7a45e5dec15c078 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 9 Feb 2012 20:56:35 +0900
Subject: [PATCH 219/630] (refs #1594) removed unnesesary line

---
 lib/task/openpneSendDailyNewsTask.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/task/openpneSendDailyNewsTask.class.php b/lib/task/openpneSendDailyNewsTask.class.php
index a5bb7103d..2f4f06939 100644
--- a/lib/task/openpneSendDailyNewsTask.class.php
+++ b/lib/task/openpneSendDailyNewsTask.class.php
@@ -30,7 +30,6 @@ protected function configure()
     );
   }
 
-
   protected function execute($arguments = array(), $options = array())
   {
     parent::execute($arguments, $options);

From c39bf35f0597a9ba062e2e9c2e83271387dcc3e8 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 9 Feb 2012 20:59:23 +0900
Subject: [PATCH 220/630] (fixes #1594) fixed to flip Gadget content

---
 lib/task/openpneSendDailyNewsTask.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/task/openpneSendDailyNewsTask.class.php b/lib/task/openpneSendDailyNewsTask.class.php
index 2f4f06939..303e9d6aa 100644
--- a/lib/task/openpneSendDailyNewsTask.class.php
+++ b/lib/task/openpneSendDailyNewsTask.class.php
@@ -58,8 +58,8 @@ protected function execute($arguments = array(), $options = array())
 
   private function sendDailyNews($app)
   {
-    $isAppMobile = 'pc_frontend' !== $app;
-    $dailyNewsName = $isAppMobile ? 'dailyNews' : 'mobileDailyNews';
+    $isAppMobile = 'mobile_frontend' === $app;
+    $dailyNewsName = $isAppMobile ?  'mobileDailyNews' : 'dailyNews';
     $context = sfContext::createInstance($this->createConfiguration($app, 'prod'), $app);
 
     $gadgets = Doctrine::getTable('Gadget')->retrieveGadgetsByTypesName($dailyNewsName);

From 8a569da6928e4bae39ce19dbf7638b313ef42a51 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 9 Feb 2012 21:52:26 +0900
Subject: [PATCH 221/630] (fixes #1594) fixed coding standard

---
 lib/task/openpneSendDailyNewsTask.class.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/task/openpneSendDailyNewsTask.class.php b/lib/task/openpneSendDailyNewsTask.class.php
index 303e9d6aa..34af0892e 100644
--- a/lib/task/openpneSendDailyNewsTask.class.php
+++ b/lib/task/openpneSendDailyNewsTask.class.php
@@ -47,7 +47,8 @@ protected function execute($arguments = array(), $options = array())
         throw new Exception('invalid option');
       }
     }
-    else{
+    else
+    {
       $php = $this->findPhpBinary();
       foreach ($expectedOptions as $app)
       {
@@ -145,8 +146,10 @@ private function findPhpBinary()
       }
     }
 
-    if ($php = getenv('PHP_PEAR_PHP_BIN')) {
-      if (is_executable($php)) {
+    if ($php = getenv('PHP_PEAR_PHP_BIN'))
+    {
+      if (is_executable($php))
+      {
         return $php;
       }
     }

From 4a8b54c24d4e9abf69b6e0d3fcae244c1794e58f Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Fri, 2 Dec 2011 16:22:57 +0900
Subject: [PATCH 222/630] (fixes #2588) fixed to validate token when auth
 plugin is mail address

---
 lib/model/doctrine/MemberTable.class.php |  8 +++-----
 lib/user/opSecurityUser.class.php        | 10 +++++++++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/model/doctrine/MemberTable.class.php b/lib/model/doctrine/MemberTable.class.php
index 4ec3816eb..8ad8a28b3 100644
--- a/lib/model/doctrine/MemberTable.class.php
+++ b/lib/model/doctrine/MemberTable.class.php
@@ -153,21 +153,19 @@ public function findByRegisterToken($token)
     return $this->findInactive($config->getMemberId());
   }
 
-  public function findByValidRegisterToken($token)
+  public function findByValidRegisterToken($token, $configNames)
   {
     $member = $this->findByRegisterToken($token);
     if (!$member)
     {
       return false;
     }
-
     $configTable = Doctrine::getTable('MemberConfig');
 
-    $mailTypes = array("pc_address", "pc_address_pre", "mobile_address", "mobile_address_pre");
     $query = $configTable->createQuery('m');
-    foreach ($mailTypes as $mailType)
+    foreach ($configNames as $configName)
     {
-      $hash = $configTable->generateNameValueHash($mailType, $member->getConfig($mailType));
+      $hash = $configTable->generateNameValueHash($configName, $member->getConfig($configName));
       $query->orWhere('m.name_value_hash = ?', $hash);
     }
     $configs = $query->fetchArray();
diff --git a/lib/user/opSecurityUser.class.php b/lib/user/opSecurityUser.class.php
index 778e7cbb6..37dfefee1 100644
--- a/lib/user/opSecurityUser.class.php
+++ b/lib/user/opSecurityUser.class.php
@@ -400,7 +400,15 @@ public function setIsSNSRegisterFinish($isSNSRegisterFinish)
 
   public function setRegisterToken($token)
   {
-    $member = Doctrine::getTable('Member')->findByValidRegisterToken($token);
+    if ('MailAddress' === $this->getAuthAdapter()->getAuthModeName())
+    {
+      $mailTypes = array("pc_address", "pc_address_pre", "mobile_address", "mobile_address_pre");
+      $member = Doctrine::getTable('Member')->findByValidRegisterToken($token, $mailTypes);
+    }
+    else
+    {
+      $member = Doctrine::getTable('Member')->findByRegisterToken($token);
+    }
     if (!$member)
     {
       return false;

From d7f6acb8b98af45f0a0d6fe61d73c3d76f30c7b9 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 20 Apr 2012 20:58:58 +0900
Subject: [PATCH 223/630] version 3.8RC1

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 58badd16a..c89fd863d 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8RC1-dev');
+  define('OPENPNE_VERSION', '3.8RC1');
 }

From 7fe6519b3c99dd23b8f99d05329613164594f3c9 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 20 Apr 2012 21:00:33 +0900
Subject: [PATCH 224/630] started developing OpenPNE 3.8.0

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index c89fd863d..1ff34744c 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8RC1');
+  define('OPENPNE_VERSION', '3.8.0-dev');
 }

From 4f46b3e55e1f77a42303975f727b92de47aaf6a3 Mon Sep 17 00:00:00 2001
From: Fumie Toyooka <dymojet@google.com>
Date: Wed, 25 Apr 2012 00:39:36 +0900
Subject: [PATCH 225/630] (fixes #3024)remove Japanese
 Upgrade_From_2_Guide.txt.

---
 doc/ja/Upgrade_From_2_Guide.txt | 156 --------------------------------
 1 file changed, 156 deletions(-)
 delete mode 100644 doc/ja/Upgrade_From_2_Guide.txt

diff --git a/doc/ja/Upgrade_From_2_Guide.txt b/doc/ja/Upgrade_From_2_Guide.txt
deleted file mode 100644
index df2a0e68c..000000000
--- a/doc/ja/Upgrade_From_2_Guide.txt
+++ /dev/null
@@ -1,156 +0,0 @@
-==================================
-OpenPNE 2 からのアップグレード手順
-==================================
-
-はじめに
-========
-
-このドキュメントは、 OpenPNE 2.12.x もしくは OpenPNE 2.14.x から OpenPNE 3.6.x へのバージョンアップ作業の手順を示したものです。
-
-※アップグレードをおこなう前に、データベースのバックアップを取っておくことを強くお勧めします。
-
-作業方法
-========
-
-動作環境の確認
---------------
-
-アップグレードをおこなう前に、以下の動作環境を満たしているか確認してください。
-
-Webサーバ
-  Apache 
-    * mod_rewrite を使用可能
-PHP
-  PHP5.2.3 以降
-    * PHP の mbstring 拡張モジュールを使用可能
-    * PHP の XML 拡張モジュールを使用可能
-    * PHP の PCRE 拡張モジュールを使用可能 (UTF-8 サポート)
-    * PHP の PDO 拡張モジュールを使用可能 (利用する DBMS のドライバも含む)
-    * PHP の JSON 拡張モジュールを使用可能
-    * PHP から GD ライブラリを使用可能 (JPEG/GIF/PNG サポート)
-    * PHP の mcrypt 拡張モジュールの使用を推奨
-    * PHP の APC 拡張モジュールの使用を推奨
-データベースサーバ
-  MySQL4.1以降（5.1 以降を推奨）
-  
-  PostgreSQL, SQLite は現時点で未サポート（将来的にサポート予定）
-
-OpenPNE 3 の設置
-----------------
-
-まず OpenPNE を入手してください。
-
-ZIP アーカイブを入手する場合、以下の URL にアクセスし、 OpenPNE 3.6.x の最新バージョンのパッケージをダウンロードしてください。
-
-http://github.com/openpne/OpenPNE3/downloads
-
-Git リポジトリを利用する場合、以下のコマンドを実行してください (バージョン番号は適切なものに変更してください)::
-
-  $ git clone git://github.com/openpne/OpenPNE3.git
-  $ git checkout OpenPNE-3.6.x
-
-その後、 OpenPNE3 のソースコード内にある web ディレクトリが、ウェブサーバの公開領域となるように設置してください (セットアップガイドも参照してください)。
-
-初期設定
---------
-
-設定が終わったら、いくつかコマンドを実行します。
-
-まず、設定ファイルのコピーをおこないます。
-
-config/ProjectConfiguration.class.php.sample を config/ProjectConfiguration.class.php としてコピーします::
-
-  $ cp /path/to/OpenPNE3/config/ProjectConfiguration.class.php.sample /path/to/OpenPNE3/config/ProjectConfiguration.class.php
-
-次に、config/OpenPNE.yml.sample を config/OpenPNE.yml としてコピーします。
-
-  $ cp /path/to/OpenPNE3/config/OpenPNE.yml.sample /path/to/OpenPNE3/config/OpenPNE.yml
-
-その際、 OpenPNE.yml の設定値は OpenPNE2 の config.php に合わせて変更してください。特に base_url と mail_domain はメール投稿、メール配信の際に利用されるので必ず設定をおこなってください。
-
-OpenPNE2 の config.php を config/config.OpenPNE2.php としてコピーします::
-
-  $ cp /path/to/OpenPNE2/config.php /path/to/OpenPNE3/config/config.OpenPNE2.php
-
-以下のコマンドを実行し、プラグインをインストールします::
-
-  $ ./symfony opPlugin:sync
-
-各ディレクトリのパーミッションを適切なものに設定します::
-
-  $ ./symfony openpne:permission
-
-アップグレードコマンドの実行
-----------------------------
-
-2.12 からのアップグレードをおこなう場合、以下のコマンドを実行してください::
-
-  $ ./symfony openpne:upgrade-from-2 --origin=2.12
-
-2.14 からのアップグレードをおこなう場合、以下のコマンドを実行してください::
-
-  $ ./symfony openpne:upgrade-from-2 --origin=2.14
-
-コマンドを実行すると、アップグレードが開始され、アップグレードの過程が出力されていきます。
-
-アップグレードはいくつかの手順に分けておこなわれます。たとえば diary という手順を実行する場合、「>> upgrade Processing diary」と表示され、 diary という手順の実行が完了した場合、「>> upgrade Processed diary (x.xx sec)」と表示されます。エラーが発生した場合は（端末が対応していれば）赤背景でエラーメッセージが表示されます。その場合、その手順でおこなった操作を取り消して、次の手順を実行します。
-
-エラーの原因となるデータを修復するなどして、アップグレードが正常におこなえるようになった場合、以下のように --rules オプションを指定してコマンドを実行することで失敗した手順のみを再度実行することができます::
-
-  $ ./symfony openpne:upgrade-from-2 --origin=2.14 --rules=diary
-
-この --rules オプションは以下のように複数指定することができます::
-
-  $ ./symfony openpne:upgrade-from-2 --rules=diary --rules=skin_config
-
-注意事項
-========
-
-アップグレードに際していくつか注意事項があります。
-
-* fix_old_image_data のコンバートで「Allowed memory size of xxxx bytes exhausted ... 」というようなエラーメッセージとともに失敗する場合、 php.ini の memory_limit ディレクティブの設定を見直すか、それが難しい場合は config/config.OpenPNE2.php の IMAGE_MAX_FILESIZE の設定値を大きな値に設定してください
-
-* OpenPNE2 に Google のAPIキーを設定している場合、 OpenPNE3 の管理画面で再設定する必要があります。
-
-   1. OpenPNE2 の config.php に記述してある Google Maps API key と Google AJAX Search API key をコピーします。
-
-   2. OpenPNE3 の管理画面( /pc_backend.php )を開いて、 「SNS設定」 -> 「APIキーの設定」( /pc_backend.php/sns/config/category/api_keys ) を開きます。
-
-   3. Google Maps API key と Google AJAX Search API key のテキストボックス内に、先程コピーしたAPIキーを貼り付けます。
-
-   4. 「設定変更」ボタンを押します。
-
-* 2.12, 2.14 の以下の機能に関するデータの変換は OpenPNE3 側で未実装なため対応していません
-
-  * BIZ 関連機能
-
-  * ポイント 関連機能
-
-  * アクセスログ関連機能
-
-  * お気に入り関連機能
-
-  * レビュー関連機能
-
-  * 日記カテゴリ関連機能
-
-  * ファイル関連機能
-
-  * スケジュール関連機能
-
-  * フリーページ関連機能
-
-  * テンプレート設定関連機能
-
-* ポータルクリエイターは「最新コミュニティ書き込み」「最新レビュー」「メンバーアクセスランキング」「コミュニティ盛り上がりランキング」「イベント予定」などのコンテンツが利用できません
-
-* ポータルクリエイターの配色設定やカスタム CSS 設定などが利用できません
-
-* ポータルクリエイターのレイアウト設定は「レイアウト2（4:6）」と同等のもの固定になります
-
-* 管理ユーザ(admin_user)は「全権限」が与えられているアカウントのみコンバートします
-
-* ナビメニューの設定はコンバートしません
-
-* OpenPNE2 のナビメニューにないメニュー項目、 OpenPNE3 にない機能のメニュー項目はナビメニューからクリックできないようになっています。対応するにはナビメニューの設定を調節し、 CSS に記述を加えるか、 OpenPNE2 互換スキンを使わないように管理画面から opSkinClassicPlugin を無効にしてください
-

From 16688ee954fa460088554859975f01347020bf0b Mon Sep 17 00:00:00 2001
From: Fumie Toyooka <dymojet@google.com>
Date: Wed, 25 Apr 2012 11:13:36 +0900
Subject: [PATCH 226/630] (fixes #3027)changed version description from 3.6 to
 3.8 in version up guide.

---
 doc/en/OpenPNE3_Version_Up_Guide.txt | 8 ++++----
 doc/ja/OpenPNE3_Version_Up_Guide.txt | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/doc/en/OpenPNE3_Version_Up_Guide.txt b/doc/en/OpenPNE3_Version_Up_Guide.txt
index 49c737648..ce2cf18ea 100644
--- a/doc/en/OpenPNE3_Version_Up_Guide.txt
+++ b/doc/en/OpenPNE3_Version_Up_Guide.txt
@@ -1,10 +1,10 @@
-OpenPNE3.6 Update Process
+OpenPNE3.8 Update Process
 =========================
 
 Introduction
 ------------
 
-This document is for all of the version OpenPNE 3.2.0 or later to OpenPNE 3.6.x.
+This document is for all of the version OpenPNE 3.2.0 or later to OpenPNE 3.8.x.
 
 ※You should backup database before updating.
 
@@ -23,14 +23,14 @@ Update process
 Setting Files
 ~~~~~~~~~~~~~
 
-Set the OpenPNE 3.6 files to your web server.
+Set the OpenPNE 3.8 files to your web server.
 
 Avoiding problems with mixing the old and new files, you have to change all of the files instead of overwriting.
 
 Update the Configuration File
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Copy config files in OpenPNE 3.6 as follows:
+Copy config files in OpenPNE 3.8 as follows:
 
 ::
 
diff --git a/doc/ja/OpenPNE3_Version_Up_Guide.txt b/doc/ja/OpenPNE3_Version_Up_Guide.txt
index f12208332..49ae43b96 100644
--- a/doc/ja/OpenPNE3_Version_Up_Guide.txt
+++ b/doc/ja/OpenPNE3_Version_Up_Guide.txt
@@ -1,10 +1,10 @@
-OpenPNE 3.6 バージョンアップ手順
+OpenPNE 3.8 バージョンアップ手順
 ================================
 
 はじめに
 --------
 
-このドキュメントは、 OpenPNE 3.2.0 以上の全てのバージョンから OpenPNE 3.6.x へのバージョンアップ作業（メジャーバージョンアップ、およびマイナーバージョンアップ）の手順を示したものです。
+このドキュメントは、 OpenPNE 3.2.0 以上の全てのバージョンから OpenPNE 3.8.x へのバージョンアップ作業（メジャーバージョンアップ、およびマイナーバージョンアップ）の手順を示したものです。
 
 ※バージョンアップをおこなう前に、データベースのバックアップを取っておくことを強くお勧めします。
 
@@ -23,14 +23,14 @@ OpenPNE 3.6 バージョンアップ手順
 ファイルの設置
 ~~~~~~~~~~~~~~
 
-Web サーバ上の任意のディレクトリに OpenPNE 3.6 のソースファイルを設置します。（※新旧ソースファイル混在によるトラブルを防ぐため、上書きではなくファイルすべてを交換してください。）
+Web サーバ上の任意のディレクトリに OpenPNE 3.8 のソースファイルを設置します。（※新旧ソースファイル混在によるトラブルを防ぐため、上書きではなくファイルすべてを交換してください。）
 
 * OpenPNE3_Setup_Guide.txt の「OpenPNE3 のソースコードを入手する」を参照。
 
 設定ファイルの上書き
 ~~~~~~~~~~~~~~~~~~~~
 
-OpenPNE 3.6 付属の設定ファイルをコピーしてください。
+OpenPNE 3.8 付属の設定ファイルをコピーしてください。
 
 ::
 

From 4a4a369580a4e6c67615f64bd956da1ae3d611df Mon Sep 17 00:00:00 2001
From: Fumie Toyooka <dymojet@google.com>
Date: Wed, 25 Apr 2012 16:37:57 +0900
Subject: [PATCH 227/630] (fixes #3009)change description of install commands
 in setup guide.

---
 doc/ja/OpenPNE3_Setup_Guide.txt | 64 ++++++++++++++++++++++++++-------
 1 file changed, 52 insertions(+), 12 deletions(-)

diff --git a/doc/ja/OpenPNE3_Setup_Guide.txt b/doc/ja/OpenPNE3_Setup_Guide.txt
index 7733a4194..ff8429a5e 100644
--- a/doc/ja/OpenPNE3_Setup_Guide.txt
+++ b/doc/ja/OpenPNE3_Setup_Guide.txt
@@ -87,32 +87,72 @@ http://www.openpne.jp/pne-downloads/
 
   $ ./symfony openpne:install
 
-このコマンドはデータベースを削除し、作り直します。他のシステムとデータベースを共有する場合などで、データベース自体の削除がおこなわれては都合が悪い場合、以下のオプションを付けてコマンドを実行してください。
+このコマンドはデータベースを削除し、作り直します。
+※但し、以上のコマンドはバンドルプラグインがダウンロード・インストールされないため、バンドルプラグインを\
+ダウンロード・インストールする場合は、以下の --internet
+オプションを付けてコマンドを実行してください。
+
+::
+
+  $ ./symfony openpne:install --internet
+
+他のシステムとデータベースを共有する場合などで、データベース自体の削除がおこなわれては都合が悪い場合、\
+以下のオプションを付けてコマンドを実行してください。
 
 ::
 
   $ ./symfony openpne:install --non-recreate-db
 
---non-recrete-db オプションを付けて実行する場合、 OpenPNE はこれから作成しようとしているテーブル名と同名のテーブルを外部キーなどを考慮して適切な順序で削除しようとします。他システムのテーブルが予期せず削除されてしまったり、 OpenPNE の想定の外で外部キー制約などによりテーブルの削除に失敗したりといった危険を避けるため、 OpenPNE.yml の設定で OpenPNE が使用するテーブルにプレフィックスを付けておくことを強く推奨します。
+--non-recreate-db オプションを付けて実行する場合、 OpenPNE
+はこれから作成しようとしているテーブル名と同名の\
+テーブルを外部キーなどを考慮して適切な順序で削除しようとします。他システムのテーブルが予期せず削除されてし\
+まったり、 OpenPNE
+の想定の外で外部キー制約などによりテーブルの削除に失敗したりといった危険を避けるため、
+\
+OpenPNE.yml の設定で OpenPNE
+が使用するテーブルにプレフィックスを付けておくことを強く推奨します。
+
+※このプレフィックスは同一 DB に対して複数の OpenPNE
+をインストールするためのものではなく、\
+DB
+を共有している他システムとテーブル名がバッティングするのを避けるためのものであることに注意してください。
+
+::
 
-※このプレフィックスは同一 DB に対して複数の OpenPNE をインストールするためのものではなく、 DB を共有している他システムとテーブル名がバッティングするのを避けるためのものであることに注意してください。
+  table_prefix: "op_" 
 
 ::
 
-  table_prefix: "op_"
+  $ ./symfony openpne:install --internet
 
-openpne:install コマンドを実行すると、はじめに、以下の事項の入力を求められます。
+openpne:install
+コマンドを実行すると、はじめに、以下の事項の入力を求められます。
 
-*  使用する DBMS （mysql, pgsql, sqlite から選択。ただし mysql 以外は未サポート）
-*  データベース名
-*  データベースへの接続用ユーザ名
-*  データベースへの接続用パスワード（未入力可）
-*  データベースサーバのホスト名（localhost など）
-*  データベースサーバのポート番号（未入力可）
-* （DBMS に MySQL を選択し、サーバホスト名に localhost を指定した場合）使用するソケットへのパス（未入力可）
+* 使用する DBMS （mysql, pgsql, sqlite から選択。ただし mysql
+* 以外は未サポート）
+* データベース名
+* データベースへの接続用ユーザ名
+* データベースへの接続用パスワード（未入力可）
+* データベースサーバのホスト名（localhost など）
+* データベースサーバのポート番号（未入力可）
+* （DBMS に MySQL を選択し、サーバホスト名に localhost
+* を指定した場合）使用するソケットへのパス（未入力可）
 
 以上の事項について入力をおこなうと、インストール作業が自動でおこなわれます。
 
+また、これらの入力事項をコマンドの引数としてデータベースの設定値を指定してインストールすることも可能です。
+以下は使用例ですので、設定値は適宜変更してください。
+
+::
+
+ $ ./symfony openpne:fast-install --dbms=mysql --dbuser=username
+--dbpassword=password --dbhost=localhost\
+ --dbport=10 --dbname=databasename --dbsock=/tmp/mysql.sock
+
+※但し、以上のコマンドはバンドルプラグインがダウンロード・インストールされないため、バンドルプラグインを\
+ダウンロード・インストールする場合は、--internet
+オプションを付けてコマンドを実行してください。
+
 開発環境用ファイルを削除
 ------------------------
 

From d3fef77aa9dd2139f7f155cbcf449bf9cc04bc40 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 25 Apr 2012 17:05:23 +0900
Subject: [PATCH 228/630] fixed smartphone gadget title. (refs #3021, BP from
 #3020)

---
 lib/config/config/smartphone_community_gadget.yml | 2 +-
 lib/config/config/smartphone_profile_gadget.yml   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/config/config/smartphone_community_gadget.yml b/lib/config/config/smartphone_community_gadget.yml
index 44b802679..48d4dab98 100644
--- a/lib/config/config/smartphone_community_gadget.yml
+++ b/lib/config/config/smartphone_community_gadget.yml
@@ -21,7 +21,7 @@ freeArea:
 
 communityListBox:
   caption:
-    ja_JP: "コミュニティ"
+    ja_JP: "プロフィール"
   description:
     ja_JP: "コミュニティ情報のリストを表示します"
   viewable_privilege: 4
diff --git a/lib/config/config/smartphone_profile_gadget.yml b/lib/config/config/smartphone_profile_gadget.yml
index 6469b2606..7c8355971 100644
--- a/lib/config/config/smartphone_profile_gadget.yml
+++ b/lib/config/config/smartphone_profile_gadget.yml
@@ -29,14 +29,14 @@ profileListBox:
 
 memberFriendListBox:
   caption:
-    ja_JP: "メンバーフレンド一覧"
+    ja_JP: "フレンド一覧"
   description:
     ja_JP: "メンバーのフレンド一覧を表示します"
   component: [member, smtMemberFriendListBox]
 
 memberJoinCommunityListBox:
   caption:
-    ja_JP: "メンバーコミュニティ参加者一覧"
+    ja_JP: "コミュニティ一覧"
   description:
     ja_JP: "メンバーが参加しているコミュニティの一覧を表示します"
   component: [member, smtMemberJoinCommunityListBox]

From 506cf79295e977e6c9f70a346c843fe4d83d9baa Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 25 Apr 2012 17:09:23 +0900
Subject: [PATCH 229/630] modified profile gadget placement (fixes #3021, BP
 from #3020)

---
 data/fixtures/005_import_gadgets.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/fixtures/005_import_gadgets.yml b/data/fixtures/005_import_gadgets.yml
index a365f836d..f6ebb1f22 100644
--- a/data/fixtures/005_import_gadgets.yml
+++ b/data/fixtures/005_import_gadgets.yml
@@ -55,9 +55,9 @@ Gadget:
     sort_order: 30
 
   profile_gadget_profile:
-    type: "profileContents"
+    type: "profileSideMenu"
     name: "profileListBox"
-    sort_order: 10
+    sort_order: 15
 
   mobile_profile_gadget_friend_table:
     type: "mobileProfileBottom"

From 94bb50479d37eb9428751883a3b6903ddb8dcbff Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Mon, 23 Apr 2012 21:02:23 +0900
Subject: [PATCH 230/630] fix compatibility with PHP 5.2.x (fixes #3028, BP
 from #3026)

---
 apps/pc_frontend/templates/_layout.php         | 6 ++++--
 apps/pc_frontend/templates/smtLayoutGroup.php  | 8 +++++---
 apps/pc_frontend/templates/smtLayoutHome.php   | 8 +++++---
 apps/pc_frontend/templates/smtLayoutMember.php | 8 +++++---
 apps/pc_frontend/templates/smtLayoutSns.php    | 8 +++++---
 5 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/apps/pc_frontend/templates/_layout.php b/apps/pc_frontend/templates/_layout.php
index 951a918c5..b42cb1a8c 100644
--- a/apps/pc_frontend/templates/_layout.php
+++ b/apps/pc_frontend/templates/_layout.php
@@ -16,13 +16,15 @@
 use_javascript('jquery.tmpl.min.js');
 use_javascript('jquery.notify.js');
 use_javascript('op_notify.js');
-$json = array(
+$jsonData = array(
   'apiKey' => $sf_user->getMemberApiKey(),
   'apiBase' => app_url_for('api', 'homepage'),
 );
 
+$json = defined('JSON_PRETTY_PRINT') ? json_encode($jsonData, JSON_PRETTY_PRINT) : json_encode($jsonData);
+
 echo javascript_tag('
-var openpne = '.json_encode($json, defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0).';
+var openpne = '.$json.';
 ');
 ?>
 <?php endif ?>
diff --git a/apps/pc_frontend/templates/smtLayoutGroup.php b/apps/pc_frontend/templates/smtLayoutGroup.php
index be8402810..57ebc7428 100644
--- a/apps/pc_frontend/templates/smtLayoutGroup.php
+++ b/apps/pc_frontend/templates/smtLayoutGroup.php
@@ -16,14 +16,16 @@
 <meta name="viewport" content="width=320px,user-scalable=no" />
 <?php if (opConfig::get('enable_jsonapi') && opToolkit::isSecurePage()): ?>
 <?php
-$json = array(
+$jsonData = array(
   'apiKey' => $sf_user->getMemberApiKey(),
   'apiBase' => app_url_for('api', 'homepage'),
 );
 
+$json = defined('JSON_PRETTY_PRINT') ? json_encode($jsonData, JSON_PRETTY_PRINT) : json_encode($jsonData);
+
 echo javascript_tag('
-var openpne = '.json_encode($json, defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0).';
-')
+var openpne = '.$json.';
+');
 ?>
 <?php endif ?>
 <?php use_javascript('jquery.min.js') ?>
diff --git a/apps/pc_frontend/templates/smtLayoutHome.php b/apps/pc_frontend/templates/smtLayoutHome.php
index 9ada871fe..e6056e613 100644
--- a/apps/pc_frontend/templates/smtLayoutHome.php
+++ b/apps/pc_frontend/templates/smtLayoutHome.php
@@ -16,14 +16,16 @@
 <meta name="viewport" content="width=320px,user-scalable=no" />
 <?php if (opConfig::get('enable_jsonapi') && opToolkit::isSecurePage()): ?>
 <?php
-$json = array(
+$jsonData = array(
   'apiKey' => $sf_user->getMemberApiKey(),
   'apiBase' => app_url_for('api', 'homepage'),
 );
 
+$json = defined('JSON_PRETTY_PRINT') ? json_encode($jsonData, JSON_PRETTY_PRINT) : json_encode($jsonData);
+
 echo javascript_tag('
-var openpne = '.json_encode($json, defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0).';
-')
+var openpne = '.$json.';
+');
 ?>
 <?php endif ?>
 <?php use_javascript('jquery.min.js') ?>
diff --git a/apps/pc_frontend/templates/smtLayoutMember.php b/apps/pc_frontend/templates/smtLayoutMember.php
index a2605618c..c2b5d5342 100644
--- a/apps/pc_frontend/templates/smtLayoutMember.php
+++ b/apps/pc_frontend/templates/smtLayoutMember.php
@@ -16,14 +16,16 @@
 <meta name="viewport" content="width=320px,user-scalable=no" />
 <?php if (opConfig::get('enable_jsonapi') && opToolkit::isSecurePage()): ?>
 <?php
-$json = array(
+$jsonData = array(
   'apiKey' => $sf_user->getMemberApiKey(),
   'apiBase' => app_url_for('api', 'homepage'),
 );
 
+$json = defined('JSON_PRETTY_PRINT') ? json_encode($jsonData, JSON_PRETTY_PRINT) : json_encode($jsonData);
+
 echo javascript_tag('
-var openpne = '.json_encode($json, defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0).';
-')
+var openpne = '.$json.';
+');
 ?>
 <?php endif ?>
 <?php use_javascript('jquery.min.js') ?>
diff --git a/apps/pc_frontend/templates/smtLayoutSns.php b/apps/pc_frontend/templates/smtLayoutSns.php
index 3b6553eae..95af00709 100644
--- a/apps/pc_frontend/templates/smtLayoutSns.php
+++ b/apps/pc_frontend/templates/smtLayoutSns.php
@@ -16,14 +16,16 @@
 <meta name="viewport" content="width=320px,user-scalable=no" />
 <?php if (opConfig::get('enable_jsonapi') && opToolkit::isSecurePage()): ?>
 <?php
-$json = array(
+$jsonData = array(
   'apiKey' => opToolkit::isSecurePage() ? $sf_user->getMemberApiKey() : '',
   'apiBase' => app_url_for('api', 'homepage'),
 );
 
+$json = defined('JSON_PRETTY_PRINT') ? json_encode($jsonData, JSON_PRETTY_PRINT) : json_encode($jsonData);
+
 echo javascript_tag('
-var openpne = '.json_encode($json, defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0).';
-')
+var openpne = '.$json.';
+');
 ?>
 <?php endif ?>
 <?php use_javascript('jquery.min.js') ?>

From b9feded285167d29380e10fc85bb4fb7b52876ba Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 18 Apr 2012 13:30:28 +0900
Subject: [PATCH 231/630] removed version up script (fixes #2988, BP from
 #2987)

---
 lib/task/openpneUpgradeFrom2Task.class.php    |  88 ----------
 lib/upgrade/opUpgrader.class.php              | 154 ------------------
 .../opUpgradeAbstractStrategy.class.php       |  63 -------
 .../opUpgradeBuildModelStrategy.class.php     |  40 -----
 .../opUpgradeCreateTableStrategy.class.php    |  62 -------
 .../opUpgradeDataLoadStrategy.class.php       |  30 ----
 .../opUpgradeSQLImportStrategy.class.php      |  89 ----------
 .../opUpgradeSyncPluginStrategy.class.php     |  26 ---
 8 files changed, 552 deletions(-)
 delete mode 100644 lib/task/openpneUpgradeFrom2Task.class.php
 delete mode 100644 lib/upgrade/opUpgrader.class.php
 delete mode 100644 lib/upgrade/strategy/opUpgradeAbstractStrategy.class.php
 delete mode 100644 lib/upgrade/strategy/opUpgradeBuildModelStrategy.class.php
 delete mode 100644 lib/upgrade/strategy/opUpgradeCreateTableStrategy.class.php
 delete mode 100644 lib/upgrade/strategy/opUpgradeDataLoadStrategy.class.php
 delete mode 100644 lib/upgrade/strategy/opUpgradeSQLImportStrategy.class.php
 delete mode 100644 lib/upgrade/strategy/opUpgradeSyncPluginStrategy.class.php

diff --git a/lib/task/openpneUpgradeFrom2Task.class.php b/lib/task/openpneUpgradeFrom2Task.class.php
deleted file mode 100644
index 052ec3e80..000000000
--- a/lib/task/openpneUpgradeFrom2Task.class.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * openpneUpgradeFrom2Task
- *
- * @package    OpenPNE
- * @subpackage task
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class openpneUpgradeFrom2Task extends sfBaseTask
-{
-  protected function configure()
-  {
-    $this->namespace        = 'openpne';
-    $this->name             = 'upgrade-from-2';
-
-    $this->addOptions(array(
-      new sfCommandOption('origin', null, sfCommandOption::PARAMETER_REQUIRED, 'The base 2.x version (2.12 or 2.14)'),
-      new sfCommandOption('rules', null, sfCommandOption::PARAMETER_REQUIRED | sfCommandOption::IS_ARRAY, 'The rules that you want to do'),
-      new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', null),
-      new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'prod'),
-    ));
-
-    $this->briefDescription = 'Upgrading from 2.12.x or 2.14.x to current version';
-    $this->detailedDescription = <<<EOF
-The [openpne:upgrade-from-30x|INFO] task upgrades from 2.12.x or 2.14.x to current version.
-Call it with:
-
-  [./symfony openpne:upgrade-from-2|INFO]
-EOF;
-  }
-
-  protected function execute($arguments = array(), $options = array())
-  {
-    if (!isset($options['origin']))
-    {
-      $options['origin'] = '2.12';
-    }
-
-    if (!in_array($options['origin'], array('2.12', '2.14', '3.4')))
-    {
-      throw new RuntimeException('You must specify "2.12", "2.14" or "3.4" to the --origin option. (--origin オプションには 2.12、 2.14 または 3.4 を指定してください。)');
-    }
-    sfConfig::set('op_upgrade2_version', $options['origin']);
-
-    $op2config = sfConfig::get('sf_config_dir').DIRECTORY_SEPARATOR.'config.OpenPNE2.php';
-    if (!is_readable($op2config))
-    {
-      throw new RuntimeException('You must copy the config.php in your OpenPNE2 as config/config.OpenPNE2.php. (お使いの OpenPNE2 の config.php を config/config.OpenPNE2.php としてコピーしてください。)');
-    }
-    if (!defined('OPENPNE_DIR'))
-    {
-      define('OPENPNE_DIR', sfConfig::get('sf_root_dir'));
-    }
-    require_once $op2config;
-
-    $this->runTask('configure:database', array(
-      opToolkit::createStringDsnFromArray($GLOBALS['_OPENPNE_DSN_LIST']['main']['dsn']),
-      $GLOBALS['_OPENPNE_DSN_LIST']['main']['dsn']['username'],
-      empty($GLOBALS['_OPENPNE_DSN_LIST']['main']['dsn']['password']) ? null: $GLOBALS['_OPENPNE_DSN_LIST']['main']['dsn']['password']
-    ));
-
-    $path = sfConfig::get('sf_data_dir').DIRECTORY_SEPARATOR.'upgrade'.DIRECTORY_SEPARATOR.'2';
-    $upgrader = new opUpgrader($this->dispatcher, $this->formatter, $path, $this->configuration);
-    if ($options['rules'])
-    {
-      $upgrader->setOption('targets', $options['rules']);
-    }
-    if ('3.4' === $options['origin'])
-    {
-      $upgrader->setDefinitionName('definition-34to36.yml');
-    }
-
-    $this->logSection('upgrade', 'Begin upgrading from 2.x');
-    $upgrader->execute();
-
-    $task = new sfPluginPublishAssetsTask($this->dispatcher, $this->formatter);
-    $task->run(array(), array());
-  }
-}
diff --git a/lib/upgrade/opUpgrader.class.php b/lib/upgrade/opUpgrader.class.php
deleted file mode 100644
index 1c021cb46..000000000
--- a/lib/upgrade/opUpgrader.class.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * The opUpgrader handles upgrading to current OpenPNE3 from other.
- *
- * @package    OpenPNE
- * @subpackage upgrade
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class opUpgrader extends sfBaseTask
-{
-  protected
-    $basePath = '',
-    $options = array(),
-    $definitionName = 'definition.yml';
-
-  public function __construct(sfEventDispatcher $dispatcher, sfFormatter $formatter, $basePath, $configuration)
-  {
-    parent::__construct($dispatcher, $formatter);
-
-    if (!is_dir($basePath) || !is_readable($basePath))
-    {
-      throw new RuntimeException('The specified basepath for the opUpgrader must be directory and readable.');
-    }
-
-    $this->basePath = $basePath;
-    $this->configuration = $configuration;
-  }
-
-  public function setDefinitionName($definitionName)
-  {
-    $this->definitionName = $definitionName;
-  }
-
-  public function getDefinitionName()
-  {
-    return $this->definitionName;
-  }
-
-  public function getDefinition()
-  {
-    $path = $this->basePath.DIRECTORY_SEPARATOR.$this->definitionName;
-    if (!is_file($path) || !is_readable($path))
-    {
-      throw new RuntimeException('The upgrade base path doesn\'t have a definition file for upgrading ('.$path.')');
-    }
-
-    return sfSimpleYamlConfigHandler::replaceConstants(sfSimpleYamlConfigHandler::getConfiguration(array($path)));
-  }
-
-  public function setOption($name, $value)
-  {
-    $this->options[$name] = $value;
-  }
-
-  public function getOption($name, $default = null)
-  {
-    if (!isset($this->options[$name]))
-    {
-      return $default;
-    }
-
-    return $this->options[$name];
-  }
-
-  protected function execute($arguments = array(), $options = array())
-  {
-    $definitions = $this->getDefinition();
-
-    $timer = new sfTimer();
-    $succeeded = array();
-
-    $targets = $this->getOption('targets', array_keys($definitions));
-
-    foreach ((array)$definitions as $k => $v)
-    {
-      if (!in_array($k, $targets))
-      {
-        continue;
-      }
-
-      $timer->startTimer();
-
-      $defaultOptions = array_merge($this->options, array(
-        'name'           => $k,
-        'dir'            => $this->basePath,
-        'required_rules' => array(),
-        'configuration'  => $this->configuration,
-        'dispatcher'     => new sfEventDispatcher(),
-        'formatter'      => $this->formatter,
-      ));
-
-      $v = array_merge(array('options' => $defaultOptions), $v);
-      if (!isset($v['options']['required_rules']))
-      {
-        $v['options']['required_rules'] = array();
-      }
-
-      $requiredRules = (array)$v['options']['required_rules'];
-      if (!empty($requiredRules) && array_diff($requiredRules, $succeeded))
-      {
-        $this->logSection('upgrade', 'Passed '.$k, null, 'ERROR');
-        continue;
-      }
-
-      $this->logSection('upgrade', 'Processing '.$k);
-
-      if (isset($v['file']) && is_file($v['file']))
-      {
-        require_once $v['file'];
-      }
-
-      if (class_exists($v['strategy']))
-      {
-        $className = $v['strategy'];
-      }
-      else
-      {
-        $className = 'opUpgrade'.$v['strategy'].'Strategy';
-      }
-
-      opApplicationConfiguration::registerZend();
-      try
-      {
-        // disable Doctrine profiling
-        sfConfig::set('sf_debug', false);
-
-        $strategy = new $className($v['options']);
-        $strategy->run();
-
-        $succeeded[] = $k;
-      }
-      catch (Exception $e)
-      {
-        $this->logBlock($e->getMessage(), 'ERROR');
-      }
-      opApplicationConfiguration::unregisterZend();
-
-      $this->logSection('upgrade', sprintf('Processed %s (%.2f sec)', $k, $timer->addTime()));
-    }
-
-    $this->logSection('upgrade', sprintf('Completed Upgrading (%.2f sec)', $timer->getElapsedTime()));
-    $this->logSection('upgrade', sprintf('The %.2f MB memory allocated', round(memory_get_peak_usage(true) / 1048576, 2)));
-  }
-}
-
diff --git a/lib/upgrade/strategy/opUpgradeAbstractStrategy.class.php b/lib/upgrade/strategy/opUpgradeAbstractStrategy.class.php
deleted file mode 100644
index e5d637f4c..000000000
--- a/lib/upgrade/strategy/opUpgradeAbstractStrategy.class.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * opUpgradeAbstractStrategy
- *
- * @package    OpenPNE
- * @subpackage upgrade
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-abstract class opUpgradeAbstractStrategy
-{
-  protected $options;
-
-  protected static $dbManager = null;
-
-  public function __construct($options)
-  {
-    $this->options = $options;
-  }
-
-  abstract public function run();
-
-  protected function getDatabaseManager()
-  {
-    if (!self::$dbManager)
-    {
-      self::$dbManager = new sfDatabaseManager($this->options['configuration']);
-    }
-
-    return self::$dbManager;
-  }
-
-  public function setOption($name, $value)
-  {
-    $this->options[$name] = $value;
-  }
-
-  public function getOption($name, $default = null)
-  {
-    if (!isset($this->options[$name]))
-    {
-      return $default;
-    }
-
-    return $this->options[$name];
-  }
-
-  protected function dataLoad($path)
-  {
-    opApplicationConfiguration::unregisterZend();
-    Doctrine::loadData($path, true);
-    opApplicationConfiguration::registerZend();
-  }
-}
-
diff --git a/lib/upgrade/strategy/opUpgradeBuildModelStrategy.class.php b/lib/upgrade/strategy/opUpgradeBuildModelStrategy.class.php
deleted file mode 100644
index 70d128429..000000000
--- a/lib/upgrade/strategy/opUpgradeBuildModelStrategy.class.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * This strategy builds models.
- *
- * @package    OpenPNE
- * @subpackage upgrade
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class opUpgradeBuildModelStrategy extends opUpgradeAbstractStrategy
-{
-  public function run()
-  {
-    opApplicationConfiguration::unregisterZend();
-
-    $task = new sfDoctrineBuildTask(clone $this->options['dispatcher'], clone $this->options['formatter']);
-    $task->run(array(), array(
-      'no-confirmation' => true,
-      'model'           => true,
-      'forms'           => true,
-      'filters'         => true,
-      'application'     => 'pc_frontend',
-      'env'             => sfConfig::get('sf_environment', 'prod'),
-    ));
-
-    $task = new sfCacheClearTask(clone $this->options['dispatcher'], clone $this->options['formatter']);
-    $task->run(array(), array('application' => null, 'env' => sfConfig::get('sf_environment', 'prod')));
-
-    opApplicationConfiguration::registerZend();
-  }
-}
-
diff --git a/lib/upgrade/strategy/opUpgradeCreateTableStrategy.class.php b/lib/upgrade/strategy/opUpgradeCreateTableStrategy.class.php
deleted file mode 100644
index 92385ce81..000000000
--- a/lib/upgrade/strategy/opUpgradeCreateTableStrategy.class.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * This strategy creates the specified tables.
- *
- * @package    OpenPNE
- * @subpackage upgrade
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class opUpgradeCreateTableStrategy extends opUpgradeAbstractStrategy
-{
-  public function run()
-  {
-    $this->getDatabaseManager();
-
-    // build all tables for models
-    if (!$this->getOption('models'))
-    {
-      opApplicationConfiguration::unregisterZend();
-
-      $path = sfConfig::get('sf_lib_dir').'/model/doctrine';
-      Doctrine_Core::loadModels($path, Doctrine_Core::MODEL_LOADING_CONSERVATIVE);
-      Doctrine_Core::createTablesFromArray(Doctrine_Core::getLoadedModels());
-
-      opApplicationConfiguration::registerZend();
-
-      return true;
-    }
-
-    foreach ($this->getQueries() as $query)
-    {
-      $db = $this->getDatabaseManager()->getDatabase('doctrine');
-      $db->getDoctrineConnection()->execute($query);
-    }
-  }
-
-  public function getQueries()
-  {
-    $result = array();
-
-    $models = $this->getOption('models');
-    if (!empty($models))
-    {
-      $queries = Doctrine_Manager::connection()->export->exportSortedClassesSql($models);
-      if (isset($queries['doctrine']))
-      {
-        $result = $queries['doctrine'];
-      }
-    }
-
-    return $result;
-  }
-}
-
diff --git a/lib/upgrade/strategy/opUpgradeDataLoadStrategy.class.php b/lib/upgrade/strategy/opUpgradeDataLoadStrategy.class.php
deleted file mode 100644
index 61bc053b1..000000000
--- a/lib/upgrade/strategy/opUpgradeDataLoadStrategy.class.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * The upgrating strategy by importing yml.
- *
- * @package    OpenPNE
- * @subpackage task
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class opUpgradeDataLoadStrategy extends opUpgradeAbstractStrategy
-{
-  public function run()
-  {
-    $path = $this->options['dir'].DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.$this->options['name'].'.yml';
-    if (!file_exists($path))
-    {
-      throw new RuntimeException('The specified yml doesn\'t exist.');
-    }
-
-    Doctrine::loadData($path, true);
-  }
-}
diff --git a/lib/upgrade/strategy/opUpgradeSQLImportStrategy.class.php b/lib/upgrade/strategy/opUpgradeSQLImportStrategy.class.php
deleted file mode 100644
index c65ce7066..000000000
--- a/lib/upgrade/strategy/opUpgradeSQLImportStrategy.class.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * The upgrating strategy by importing sql.
- *
- * The specified sql is parsed as PHP script. Items in the "params" option are usable
- * as assigned variables from the sql (PHP script).
- *
- * @package    OpenPNE
- * @subpackage task
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class opUpgradeSQLImportStrategy extends opUpgradeAbstractStrategy
-{
-  public function run()
-  {
-    $path = $this->options['dir'].DIRECTORY_SEPARATOR.'sql'.DIRECTORY_SEPARATOR.$this->options['name'].'.sql';
-    if (!file_exists($path))
-    {
-      throw new RuntimeException('The specified sql doesn\'t exist.');
-    }
-
-    $db = $this->getDatabaseManager()->getDatabase('doctrine');
-    $this->conn = $db->getDoctrineConnection();
-
-    $this->conn->beginTransaction();
-    $this->conn->execute('SET FOREIGN_KEY_CHECKS = 0');  // for mysql
-
-    $sql = opToolkit::unifyEOLCharacter($this->parseSql($path));
-    $queries = explode("\n", $sql);
-
-    try
-    {
-      $this->executeQueries($queries);
-      $this->conn->commit();
-    }
-    catch (Exception $e)
-    {
-      $this->conn->rollback();
-      $this->conn->execute('SET FOREIGN_KEY_CHECKS = 0');  // for mysql
-
-      throw $e;
-    }
-
-    $this->conn->execute('SET FOREIGN_KEY_CHECKS = 0');  // for mysql
-  }
-
-  protected function executeQueries($queries)
-  {
-    foreach ($queries as $query)
-    {
-      $query = trim($query);
-      if (!$query)
-      {
-        continue;
-      }
-
-      $this->conn->execute($query);
-    }
-  }
-
-  protected function parseSql($file)
-  {
-    // The "params" option is settled, its items are imported as variables.
-    if (!empty($this->options['params']))
-    {
-      extract($this->options['params']);
-    }
-
-    ob_start();
-    include $file;
-    $result = ob_get_clean();
-
-    return $result;
-  }
-
-  protected function getSQLForFileId($name)
-  {
-    return '(SELECT id FROM file WHERE name = '.$name.' LIMIT 1)';
-  }
-}
diff --git a/lib/upgrade/strategy/opUpgradeSyncPluginStrategy.class.php b/lib/upgrade/strategy/opUpgradeSyncPluginStrategy.class.php
deleted file mode 100644
index 568778cb3..000000000
--- a/lib/upgrade/strategy/opUpgradeSyncPluginStrategy.class.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * This strategy sync plugins.
- *
- * @package    OpenPNE
- * @subpackage upgrade
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class opUpgradeSyncPluginStrategy extends opUpgradeAbstractStrategy
-{
-  public function run()
-  {
-    $task = new opPluginSyncTask($this->options['dispatcher'], $this->options['formatter']);
-    $task->run();
-  }
-}
-

From 57925e03ae94ba76b38885a8d7c8449fd72fef69 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 25 Apr 2012 17:39:40 +0900
Subject: [PATCH 232/630] removed upgrade data and script (from OpenPNE2.x)
 (fixes #2988, BP from #2987)

---
 data/upgrade/2/definition-34to36.yml          |   4 -
 data/upgrade/2/definition.yml                 | 114 ------
 data/upgrade/2/lib/Crypt/Blowfish.php         | 323 -----------------
 data/upgrade/2/lib/Crypt/Blowfish/CBC.php     | 159 ---------
 .../2/lib/Crypt/Blowfish/DefaultKey.php       | 327 ------------------
 data/upgrade/2/lib/Crypt/Blowfish/ECB.php     | 149 --------
 data/upgrade/2/lib/Crypt/Blowfish/MCrypt.php  | 186 ----------
 data/upgrade/2/lib/Crypt/Blowfish/PHP.php     | 278 ---------------
 data/upgrade/2/lib/Crypt/BlowfishOld.php      | 317 -----------------
 .../2/lib/Crypt/BlowfishOld/DefaultKey.php    | 327 ------------------
 data/upgrade/2/lib/OpenPNE2Util.class.php     |  61 ----
 ...pUpgradeFrom2AdminConfigStrategy.class.php | 102 ------
 .../opUpgradeFrom2DataLoadStrategy.class.php  |  47 ---
 ...UpgradeFrom2FixOldImagesStrategy.class.php | 113 ------
 ...2ImportCommunityCategoryStrategy.class.php | 132 -------
 ...eFrom2ImportEmailAddressStrategy.class.php |  61 ----
 ...pUpgradeFrom2LoginLayoutStrategy.class.php | 158 ---------
 ...pgradeFrom2MemberProfileStrategy.class.php | 133 -------
 ...eFrom2MemberRelationshipStrategy.class.php |  80 -----
 ...opUpgradeFrom2SkinConfigStrategy.class.php |  78 -----
 .../2/opUpgradeFrom2SnsTermStrategy.class.php |  71 ----
 data/upgrade/2/sql/admin_user.sql             |   1 -
 data/upgrade/2/sql/album.sql                  |  11 -
 data/upgrade/2/sql/ashiato.sql                |   4 -
 data/upgrade/2/sql/banner.sql                 |  31 --
 data/upgrade/2/sql/blacklist.sql              |   3 -
 data/upgrade/2/sql/community_config.sql       |  26 --
 data/upgrade/2/sql/community_member.sql       |   4 -
 data/upgrade/2/sql/community_topic.sql        |  25 --
 data/upgrade/2/sql/confirmation.sql           |   7 -
 data/upgrade/2/sql/decoration.sql             |  10 -
 data/upgrade/2/sql/diary.sql                  |  21 --
 data/upgrade/2/sql/favorite.sql               |   1 -
 data/upgrade/2/sql/files.sql                  |   4 -
 .../sql/fix_community_topic_comment_image.sql |  79 -----
 data/upgrade/2/sql/gadget.sql                 |   3 -
 data/upgrade/2/sql/intro_friend.sql           |   1 -
 data/upgrade/2/sql/member_basic.sql           |   3 -
 data/upgrade/2/sql/member_config.sql          |   6 -
 data/upgrade/2/sql/member_image.sql           |   8 -
 data/upgrade/2/sql/member_secure.sql          |  22 --
 data/upgrade/2/sql/message.sql                |  16 -
 data/upgrade/2/sql/mobile_color_config.sql    |  12 -
 data/upgrade/2/sql/mobile_uid_bc_config.sql   |   2 -
 44 files changed, 3520 deletions(-)
 delete mode 100644 data/upgrade/2/definition-34to36.yml
 delete mode 100644 data/upgrade/2/definition.yml
 delete mode 100644 data/upgrade/2/lib/Crypt/Blowfish.php
 delete mode 100644 data/upgrade/2/lib/Crypt/Blowfish/CBC.php
 delete mode 100644 data/upgrade/2/lib/Crypt/Blowfish/DefaultKey.php
 delete mode 100644 data/upgrade/2/lib/Crypt/Blowfish/ECB.php
 delete mode 100644 data/upgrade/2/lib/Crypt/Blowfish/MCrypt.php
 delete mode 100644 data/upgrade/2/lib/Crypt/Blowfish/PHP.php
 delete mode 100644 data/upgrade/2/lib/Crypt/BlowfishOld.php
 delete mode 100644 data/upgrade/2/lib/Crypt/BlowfishOld/DefaultKey.php
 delete mode 100644 data/upgrade/2/lib/OpenPNE2Util.class.php
 delete mode 100644 data/upgrade/2/opUpgradeFrom2AdminConfigStrategy.class.php
 delete mode 100644 data/upgrade/2/opUpgradeFrom2DataLoadStrategy.class.php
 delete mode 100644 data/upgrade/2/opUpgradeFrom2FixOldImagesStrategy.class.php
 delete mode 100644 data/upgrade/2/opUpgradeFrom2ImportCommunityCategoryStrategy.class.php
 delete mode 100644 data/upgrade/2/opUpgradeFrom2ImportEmailAddressStrategy.class.php
 delete mode 100644 data/upgrade/2/opUpgradeFrom2LoginLayoutStrategy.class.php
 delete mode 100644 data/upgrade/2/opUpgradeFrom2MemberProfileStrategy.class.php
 delete mode 100644 data/upgrade/2/opUpgradeFrom2MemberRelationshipStrategy.class.php
 delete mode 100644 data/upgrade/2/opUpgradeFrom2SkinConfigStrategy.class.php
 delete mode 100644 data/upgrade/2/opUpgradeFrom2SnsTermStrategy.class.php
 delete mode 100644 data/upgrade/2/sql/admin_user.sql
 delete mode 100644 data/upgrade/2/sql/album.sql
 delete mode 100644 data/upgrade/2/sql/ashiato.sql
 delete mode 100644 data/upgrade/2/sql/banner.sql
 delete mode 100644 data/upgrade/2/sql/blacklist.sql
 delete mode 100644 data/upgrade/2/sql/community_config.sql
 delete mode 100644 data/upgrade/2/sql/community_member.sql
 delete mode 100644 data/upgrade/2/sql/community_topic.sql
 delete mode 100644 data/upgrade/2/sql/confirmation.sql
 delete mode 100644 data/upgrade/2/sql/decoration.sql
 delete mode 100644 data/upgrade/2/sql/diary.sql
 delete mode 100644 data/upgrade/2/sql/favorite.sql
 delete mode 100644 data/upgrade/2/sql/files.sql
 delete mode 100644 data/upgrade/2/sql/fix_community_topic_comment_image.sql
 delete mode 100644 data/upgrade/2/sql/gadget.sql
 delete mode 100644 data/upgrade/2/sql/intro_friend.sql
 delete mode 100644 data/upgrade/2/sql/member_basic.sql
 delete mode 100644 data/upgrade/2/sql/member_config.sql
 delete mode 100644 data/upgrade/2/sql/member_image.sql
 delete mode 100644 data/upgrade/2/sql/member_secure.sql
 delete mode 100644 data/upgrade/2/sql/message.sql
 delete mode 100644 data/upgrade/2/sql/mobile_color_config.sql
 delete mode 100644 data/upgrade/2/sql/mobile_uid_bc_config.sql

diff --git a/data/upgrade/2/definition-34to36.yml b/data/upgrade/2/definition-34to36.yml
deleted file mode 100644
index 8444862a9..000000000
--- a/data/upgrade/2/definition-34to36.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-favorite:
-  strategy: SQLImport
-fix_community_topic_comment_image:
-  strategy: SQLImport
diff --git a/data/upgrade/2/definition.yml b/data/upgrade/2/definition.yml
deleted file mode 100644
index 7b50febd3..000000000
--- a/data/upgrade/2/definition.yml
+++ /dev/null
@@ -1,114 +0,0 @@
-#sync_plugin:
-#  strategy: SyncPlugin
-
-build_model:
-  strategy: BuildModel
-
-create_tables:
-  strategy: CreateTable
-
-member_basic:
-  strategy: SQLImport
-
-files:
-  strategy: SQLImport
-
-admin_user:
-  strategy: SQLImport
-
-member_secure:
-  strategy: SQLImport
-
-member_email:
-  strategy: opUpgradeFrom2ImportEmailAddressStrategy
-  file: %SF_DATA_DIR%/upgrade/2/opUpgradeFrom2ImportEmailAddressStrategy.class.php
-
-intro_friend:
-  strategy: SQLImport
-
-member_relationship:
-  strategy: opUpgradeFrom2MemberRelationshipStrategy
-  file: %SF_DATA_DIR%/upgrade/2/opUpgradeFrom2MemberRelationshipStrategy.class.php
-
-profile:
-  strategy: opUpgradeFrom2MemberProfileStrategy
-  file: %SF_DATA_DIR%/upgrade/2/opUpgradeFrom2MemberProfileStrategy.class.php
-
-member_image:
-  strategy: SQLImport
-
-member_config:
-  strategy: SQLImport
-
-album:
-  strategy: SQLImport
-
-diary:
-  strategy: SQLImport
-
-community:
-  strategy: opUpgradeFrom2ImportCommunityCategoryStrategy
-  file: %SF_DATA_DIR%/upgrade/2/opUpgradeFrom2ImportCommunityCategoryStrategy.class.php
-
-community_member:
-  strategy: SQLImport
-
-community_config:
-  strategy: SQLImport
-
-community_topic:
-  strategy: SQLImport
-
-ashiato:
-  strategy: SQLImport
-
-blacklist:
-  strategy: SQLImport
-
-favorite:
-  strategy: SQLImport
-
-admin_config:
-  strategy: opUpgradeFrom2AdminConfigStrategy
-  file: %SF_DATA_DIR%/upgrade/2/opUpgradeFrom2AdminConfigStrategy.class.php
-
-sns_term:
-  strategy: opUpgradeFrom2SnsTermStrategy
-  file: %SF_DATA_DIR%/upgrade/2/opUpgradeFrom2SnsTermStrategy.class.php
-
-skin_config:
-  strategy: opUpgradeFrom2SkinConfigStrategy
-  file: %SF_DATA_DIR%/upgrade/2/opUpgradeFrom2SkinConfigStrategy.class.php
-
-decoration:
-  strategy: SQLImport
-
-mobile_color_config:
-  strategy: SQLImport
-
-load_data:
-  strategy: opUpgradeFrom2DataLoadStrategy
-  file: %SF_DATA_DIR%/upgrade/2/opUpgradeFrom2DataLoadStrategy.class.php
-
-gadget:
-  strategy: SQLImport
-
-message:
-  strategy: SQLImport
-
-banner:
-  strategy: SQLImport
-
-confirmation:
-  strategy: SQLImport
-
-mobile_uid_bc_config:
-  strategy: SQLImport
-
-login_layout:
-  strategy: opUpgradeFrom2LoginLayoutStrategy
-  file: %SF_DATA_DIR%/upgrade/2/opUpgradeFrom2LoginLayoutStrategy.class.php
-
-fix_old_image_data:
-  strategy: opUpgradeFrom2FixOldImagesStrategy
-  file: %SF_DATA_DIR%/upgrade/2/opUpgradeFrom2FixOldImagesStrategy.class.php
diff --git a/data/upgrade/2/lib/Crypt/Blowfish.php b/data/upgrade/2/lib/Crypt/Blowfish.php
deleted file mode 100644
index 371e05ce3..000000000
--- a/data/upgrade/2/lib/Crypt/Blowfish.php
+++ /dev/null
@@ -1,323 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Crypt_Blowfish allows for encryption and decryption on the fly using
- * the Blowfish algorithm. Crypt_Blowfish does not require the MCrypt
- * PHP extension, but uses it if available, otherwise it uses only PHP.
- * Crypt_Blowfish supports encryption/decryption with or without a secret key.
- *
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Encryption
- * @package    Crypt_Blowfish
- * @author     Matthew Fonda <mfonda@php.net>
- * @copyright  2005 Matthew Fonda
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Blowfish.php,v 1.85 2006/05/29 17:16:43 jausions Exp $
- * @link       http://pear.php.net/package/Crypt_Blowfish
- */
-
-/**
- * Required PEAR package(s)
- */
-require_once 'PEAR.php';
-
-/**
- * Engine choice constants
- */
-/**
- * To let the Crypt_Blowfish package decide which engine to use
- * @since 1.1.0
- */
-define('CRYPT_BLOWFISH_AUTO',   1);
-/**
- * To use the MCrypt PHP extension.
- * @since 1.1.0
- */
-define('CRYPT_BLOWFISH_MCRYPT', 2);
-/**
- * To use the PHP-only engine.
- * @since 1.1.0
- */
-define('CRYPT_BLOWFISH_PHP',    3);
-
-
-/**
- * Example using the factory method in CBC mode
- * <code>
- * $bf =& Crypt_Blowfish::factory('cbc');
- * if (PEAR::isError($bf)) {
- *     echo $bf->getMessage();
- *     exit;
- * }
- * $iv = 'abc123+=';
- * $key = 'My secret key';
- * $bf->setKey($key, $iv);
- * $encrypted = $bf->encrypt('this is some example plain text');
- * $bf->setKey($key, $iv);
- * $plaintext = $bf->decrypt($encrypted);
- * if (PEAR::isError($plaintext)) {
- *     echo $plaintext->getMessage();
- *     exit;
- * }
- * // Encrypted text is padded prior to encryption
- * // so you may need to trim the decrypted result.
- * echo 'plain text: ' . trim($plaintext);
- * </code>
- *
- * To disable using the mcrypt library, define the CRYPT_BLOWFISH_NOMCRYPT
- * constant. This is useful for instance on Windows platform with a buggy
- * mdecrypt_generic() function.
- * <code>
- * define('CRYPT_BLOWFISH_NOMCRYPT', true);
- * </code>
- *
- * @category   Encryption
- * @package    Crypt_Blowfish
- * @author     Matthew Fonda <mfonda@php.net>
- * @author     Philippe Jausions <jausions@php.net>
- * @copyright  2005-2006 Matthew Fonda
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @link       http://pear.php.net/package/Crypt_Blowfish
- * @version    1.1.0RC1
- * @access     public
- */
-class Crypt_Blowfish
-{
-    /**
-     * Implementation-specific Crypt_Blowfish object
-     *
-     * @var object
-     * @access private
-     */
-    var $_crypt = null;
-
-    /**
-     * Initialization vector
-     *
-     * @var string
-     * @access protected
-     */
-    var $_iv = null;
-
-    /**
-     * Holds block size
-     *
-     * @var integer
-     * @access protected
-     */
-    var $_block_size = 8;
-
-    /**
-     * Holds IV size
-     *
-     * @var integer
-     * @access protected
-     */
-    var $_iv_size = 8;
-
-    /**
-     * Holds max key size
-     *
-     * @var integer
-     * @access protected
-     */
-    var $_key_size = 56;
-
-    /**
-     * Crypt_Blowfish Constructor
-     * Initializes the Crypt_Blowfish object (in EBC mode), and sets
-     * the secret key
-     *
-     * @param string $key
-     * @access public
-     * @deprecated Since 1.1.0
-     * @see Crypt_Blowfish::factory()
-     */
-    function Crypt_Blowfish($key)
-    {
-        $this->_crypt =& Crypt_Blowfish::factory('ecb', $key);
-        if (!PEAR::isError($this->_crypt)) {
-            $this->_crypt->setKey($key);
-        }
-    }
-
-    /**
-     * Crypt_Blowfish object factory
-     *
-     * This is the recommended method to create a Crypt_Blowfish instance.
-     *
-     * When using CRYPT_BLOWFISH_AUTO, you can force the package to ignore
-     * the MCrypt extension, by defining CRYPT_BLOWFISH_NOMCRYPT.
-     *
-     * @param string $mode operating mode 'ecb' or 'cbc' (case insensitive)
-     * @param string $key
-     * @param string $iv initialization vector (must be provided for CBC mode)
-     * @param integer $engine one of CRYPT_BLOWFISH_AUTO, CRYPT_BLOWFISH_PHP
-     *                or CRYPT_BLOWFISH_MCRYPT
-     * @return object Crypt_Blowfish object or PEAR_Error object on error
-     * @access public
-     * @static
-     * @since 1.1.0
-     */
-    function &factory($mode = 'ecb', $key = null, $iv = null, $engine = CRYPT_BLOWFISH_AUTO)
-    {
-        switch ($engine) {
-            case CRYPT_BLOWFISH_AUTO:
-                if (!defined('CRYPT_BLOWFISH_NOMCRYPT')
-                    && extension_loaded('mcrypt')) {
-                    $engine = CRYPT_BLOWFISH_MCRYPT;
-                } else {
-                    $engine = CRYPT_BLOWFISH_PHP;
-                }
-                break;
-            case CRYPT_BLOWFISH_MCRYPT:
-                if (!PEAR::loadExtension('mcrypt')) {
-                    return PEAR::raiseError('MCrypt extension is not available.');
-                }
-                break;
-        }
-
-        switch ($engine) {
-            case CRYPT_BLOWFISH_PHP:
-                $mode = strtoupper($mode);
-                $class = 'Crypt_Blowfish_' . $mode;
-                include_once 'Crypt/Blowfish/' . $mode . '.php';
-                $crypt = new $class(null);
-                break;
-
-            case CRYPT_BLOWFISH_MCRYPT:
-                include_once 'Crypt/Blowfish/MCrypt.php';
-                $crypt = new Crypt_Blowfish_MCrypt(null, $mode);
-                break;
-        }
-
-        if (!is_null($key) || !is_null($iv)) {
-            $result = $crypt->setKey($key, $iv);
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-        }
-
-        return $crypt;
-    }
-
-    /**
-     * Returns the algorithm's block size
-     *
-     * @return integer
-     * @access public
-     * @since 1.1.0
-     */
-    function getBlockSize()
-    {
-        return $this->_block_size;
-    }
-
-    /**
-     * Returns the algorithm's IV size
-     *
-     * @return integer
-     * @access public
-     * @since 1.1.0
-     */
-    function getIVSize()
-    {
-        return $this->_iv_size;
-    }
-
-    /**
-     * Returns the algorithm's maximum key size
-     *
-     * @return integer
-     * @access public
-     * @since 1.1.0
-     */
-    function getMaxKeySize()
-    {
-        return $this->_key_size;
-    }
-
-    /**
-     * Deprecated isReady method
-     *
-     * @return bool
-     * @access public
-     * @deprecated
-     */
-    function isReady()
-    {
-        return true;
-    }
-
-    /**
-     * Deprecated init method - init is now a private
-     * method and has been replaced with _init
-     *
-     * @return bool
-     * @access public
-     * @deprecated
-     */
-    function init()
-    {
-        return $this->_crypt->init();
-    }
-
-    /**
-     * Encrypts a string
-     *
-     * Value is padded with NUL characters prior to encryption. You may
-     * need to trim or cast the type when you decrypt.
-     *
-     * @param string $plainText the string of characters/bytes to encrypt
-     * @return string|PEAR_Error Returns cipher text on success, PEAR_Error on failure
-     * @access public
-     */
-    function encrypt($plainText)
-    {
-        return $this->_crypt->encrypt($plainText);
-    }
-
-
-    /**
-     * Decrypts an encrypted string
-     *
-     * The value was padded with NUL characters when encrypted. You may
-     * need to trim the result or cast its type.
-     *
-     * @param string $cipherText the binary string to decrypt
-     * @return string|PEAR_Error Returns plain text on success, PEAR_Error on failure
-     * @access public
-     */
-    function decrypt($cipherText)
-    {
-        return $this->_crypt->decrypt($cipherText);
-    }
-
-    /**
-     * Sets the secret key
-     * The key must be non-zero, and less than or equal to
-     * 56 characters (bytes) in length.
-     *
-     * If you are making use of the PHP MCrypt extension, you must call this
-     * method before each encrypt() and decrypt() call.
-     *
-     * @param string $key
-     * @return boolean|PEAR_Error  Returns TRUE on success, PEAR_Error on failure
-     * @access public
-     */
-    function setKey($key)
-    {
-        return $this->_crypt->setKey($key);
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/data/upgrade/2/lib/Crypt/Blowfish/CBC.php b/data/upgrade/2/lib/Crypt/Blowfish/CBC.php
deleted file mode 100644
index 35cbf8a52..000000000
--- a/data/upgrade/2/lib/Crypt/Blowfish/CBC.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * PHP implementation of the Blowfish algorithm in CBC mode
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Encryption
- * @package    Crypt_Blowfish
- * @author     Matthew Fonda <mfonda@php.net>
- * @author     Philippe Jausions <jausions@php.net>
- * @copyright  2005-2006 Matthew Fonda
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: CBC.php,v 1.7 2006/05/29 17:16:43 jausions Exp $
- * @link       http://pear.php.net/package/Crypt_Blowfish
- * @since      1.1.0
- */
-
-/**
- * Required parent class
- */
-require_once 'Crypt/Blowfish/PHP.php';
-
-/**
- * Example
- * <code>
- * $bf =& Crypt_Blowfish::factory('cbc');
- * if (PEAR::isError($bf)) {
- *     echo $bf->getMessage();
- *     exit;
- * }
- * $iv = 'abc123@%';
- * $bf->setKey('My secret key', $iv);
- * $encrypted = $bf->encrypt('this is some example plain text');
- * $bf->setKey('My secret key', $iv);
- * $plaintext = $bf->decrypt($encrypted);
- * echo "plain text: $plaintext";
- * <code>
- *
- * @category   Encryption
- * @package    Crypt_Blowfish
- * @author     Matthew Fonda <mfonda@php.net>
- * @author     Philippe Jausions <jausions@php.net>
- * @copyright  2005-2006 Matthew Fonda
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @link       http://pear.php.net/package/Crypt_Blowfish
- * @version    1.1.0RC1
- * @access     public
- * @since      1.1.0
- */
-class Crypt_Blowfish_CBC extends Crypt_Blowfish_PHP
-{
-    /**
-     * Crypt_Blowfish Constructor
-     * Initializes the Crypt_Blowfish object, and sets
-     * the secret key
-     *
-     * @param string $key
-     * @param string $iv initialization vector
-     * @access public
-     */
-    function Crypt_Blowfish_CBC($key = null, $iv = null)
-    {
-        $this->__construct($key, $iv);
-    }
-
-    /**
-     * Class constructor
-     *
-     * @param string $key
-     * @param string $iv initialization vector
-     * @access public
-     */
-    function __construct($key = null, $iv = null)
-    {
-        $this->_iv_required = true;
-        parent::__construct($key, $iv);
-    }
-
-    /**
-     * Encrypts a string
-     *
-     * Value is padded with NUL characters prior to encryption. You may
-     * need to trim or cast the type when you decrypt.
-     *
-     * @param string $plainText string of characters/bytes to encrypt
-     * @return string|PEAR_Error Returns cipher text on success, PEAR_Error on failure
-     * @access public
-     */
-    function encrypt($plainText)
-    {
-        if (!is_string($plainText)) {
-            return PEAR::raiseError('Input must be a string', 0);
-        } elseif (empty($this->_P)) {
-            return PEAR::raiseError('The key is not initialized.', 8);
-        }
-
-        $cipherText = '';
-        $len = strlen($plainText);
-        $plainText .= str_repeat(chr(0), (8 - ($len % 8)) % 8);
-
-        list(, $Xl, $Xr) = unpack('N2', substr($plainText, 0, 8) ^ $this->_iv);
-        $this->_encipher($Xl, $Xr);
-        $cipherText .= pack('N2', $Xl, $Xr);
-
-        for ($i = 8; $i < $len; $i += 8) {
-            list(, $Xl, $Xr) = unpack('N2', substr($plainText, $i, 8) ^ substr($cipherText, $i - 8, 8));
-            $this->_encipher($Xl, $Xr);
-            $cipherText .= pack('N2', $Xl, $Xr);
-        }
-
-        return $cipherText;
-    }
-
-    /**
-     * Decrypts an encrypted string
-     *
-     * The value was padded with NUL characters when encrypted. You may
-     * need to trim the result or cast its type.
-     *
-     * @param string $cipherText
-     * @return string|PEAR_Error Returns plain text on success, PEAR_Error on failure
-     * @access public
-     */
-    function decrypt($cipherText)
-    {
-        if (!is_string($cipherText)) {
-            return PEAR::raiseError('Cipher text must be a string', 1);
-        }
-        if (empty($this->_P)) {
-            return PEAR::raiseError('The key is not initialized.', 8);
-        }
-
-        $plainText = '';
-        $len = strlen($cipherText);
-        $cipherText .= str_repeat(chr(0), (8 - ($len % 8)) % 8);
-
-        list(, $Xl, $Xr) = unpack('N2', substr($cipherText, 0, 8));
-        $this->_decipher($Xl, $Xr);
-        $plainText .= (pack('N2', $Xl, $Xr) ^ $this->_iv);
-
-        for ($i = 8; $i < $len; $i += 8) {
-            list(, $Xl, $Xr) = unpack('N2', substr($cipherText, $i, 8));
-            $this->_decipher($Xl, $Xr);
-            $plainText .= (pack('N2', $Xl, $Xr) ^ substr($cipherText, $i - 8, 8));
-        }
-
-        return $plainText;
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/data/upgrade/2/lib/Crypt/Blowfish/DefaultKey.php b/data/upgrade/2/lib/Crypt/Blowfish/DefaultKey.php
deleted file mode 100644
index 9388a47a1..000000000
--- a/data/upgrade/2/lib/Crypt/Blowfish/DefaultKey.php
+++ /dev/null
@@ -1,327 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Crypt_Blowfish allows for encryption and decryption on the fly using
- * the Blowfish algorithm. Crypt_Blowfish does not require the mcrypt
- * PHP extension, it uses only PHP.
- * Crypt_Blowfish support encryption/decryption with or without a secret key.
- *
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Encryption
- * @package    Crypt_Blowfish
- * @author     Matthew Fonda <mfonda@php.net>
- * @copyright  2005 Matthew Fonda
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: DefaultKey.php,v 1.81 2005/05/30 18:40:37 mfonda Exp $
- * @link       http://pear.php.net/package/Crypt_Blowfish
- */
-
-
-/**
- * Class containing default key
- *
- * @category   Encryption
- * @package    Crypt_Blowfish
- * @author     Matthew Fonda <mfonda@php.net>
- * @copyright  2005 Matthew Fonda
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @link       http://pear.php.net/package/Crypt_Blowfish
- * @version    1.1.0RC1
- * @access     public
- */
-class Crypt_Blowfish_DefaultKey
-{
-    var $P = array();
-    
-    var $S = array();
-    
-    function Crypt_Blowfish_DefaultKey()
-    {
-        $this->P = array(
-            0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344,
-            0xA4093822, 0x299F31D0, 0x082EFA98, 0xEC4E6C89,
-            0x452821E6, 0x38D01377, 0xBE5466CF, 0x34E90C6C,
-            0xC0AC29B7, 0xC97C50DD, 0x3F84D5B5, 0xB5470917,
-            0x9216D5D9, 0x8979FB1B
-        );
-        
-        $this->S = array(
-            array(
-                0xD1310BA6, 0x98DFB5AC, 0x2FFD72DB, 0xD01ADFB7,
-                0xB8E1AFED, 0x6A267E96, 0xBA7C9045, 0xF12C7F99,
-                0x24A19947, 0xB3916CF7, 0x0801F2E2, 0x858EFC16,
-                0x636920D8, 0x71574E69, 0xA458FEA3, 0xF4933D7E,
-                0x0D95748F, 0x728EB658, 0x718BCD58, 0x82154AEE,
-                0x7B54A41D, 0xC25A59B5, 0x9C30D539, 0x2AF26013,
-                0xC5D1B023, 0x286085F0, 0xCA417918, 0xB8DB38EF,
-                0x8E79DCB0, 0x603A180E, 0x6C9E0E8B, 0xB01E8A3E,
-                0xD71577C1, 0xBD314B27, 0x78AF2FDA, 0x55605C60,
-                0xE65525F3, 0xAA55AB94, 0x57489862, 0x63E81440,
-                0x55CA396A, 0x2AAB10B6, 0xB4CC5C34, 0x1141E8CE,
-                0xA15486AF, 0x7C72E993, 0xB3EE1411, 0x636FBC2A,
-                0x2BA9C55D, 0x741831F6, 0xCE5C3E16, 0x9B87931E,
-                0xAFD6BA33, 0x6C24CF5C, 0x7A325381, 0x28958677,
-                0x3B8F4898, 0x6B4BB9AF, 0xC4BFE81B, 0x66282193,
-                0x61D809CC, 0xFB21A991, 0x487CAC60, 0x5DEC8032,
-                0xEF845D5D, 0xE98575B1, 0xDC262302, 0xEB651B88,
-                0x23893E81, 0xD396ACC5, 0x0F6D6FF3, 0x83F44239,
-                0x2E0B4482, 0xA4842004, 0x69C8F04A, 0x9E1F9B5E,
-                0x21C66842, 0xF6E96C9A, 0x670C9C61, 0xABD388F0,
-                0x6A51A0D2, 0xD8542F68, 0x960FA728, 0xAB5133A3,
-                0x6EEF0B6C, 0x137A3BE4, 0xBA3BF050, 0x7EFB2A98,
-                0xA1F1651D, 0x39AF0176, 0x66CA593E, 0x82430E88,
-                0x8CEE8619, 0x456F9FB4, 0x7D84A5C3, 0x3B8B5EBE,
-                0xE06F75D8, 0x85C12073, 0x401A449F, 0x56C16AA6,
-                0x4ED3AA62, 0x363F7706, 0x1BFEDF72, 0x429B023D,
-                0x37D0D724, 0xD00A1248, 0xDB0FEAD3, 0x49F1C09B,
-                0x075372C9, 0x80991B7B, 0x25D479D8, 0xF6E8DEF7,
-                0xE3FE501A, 0xB6794C3B, 0x976CE0BD, 0x04C006BA,
-                0xC1A94FB6, 0x409F60C4, 0x5E5C9EC2, 0x196A2463,
-                0x68FB6FAF, 0x3E6C53B5, 0x1339B2EB, 0x3B52EC6F,
-                0x6DFC511F, 0x9B30952C, 0xCC814544, 0xAF5EBD09,
-                0xBEE3D004, 0xDE334AFD, 0x660F2807, 0x192E4BB3,
-                0xC0CBA857, 0x45C8740F, 0xD20B5F39, 0xB9D3FBDB,
-                0x5579C0BD, 0x1A60320A, 0xD6A100C6, 0x402C7279,
-                0x679F25FE, 0xFB1FA3CC, 0x8EA5E9F8, 0xDB3222F8,
-                0x3C7516DF, 0xFD616B15, 0x2F501EC8, 0xAD0552AB,
-                0x323DB5FA, 0xFD238760, 0x53317B48, 0x3E00DF82,
-                0x9E5C57BB, 0xCA6F8CA0, 0x1A87562E, 0xDF1769DB,
-                0xD542A8F6, 0x287EFFC3, 0xAC6732C6, 0x8C4F5573,
-                0x695B27B0, 0xBBCA58C8, 0xE1FFA35D, 0xB8F011A0,
-                0x10FA3D98, 0xFD2183B8, 0x4AFCB56C, 0x2DD1D35B,
-                0x9A53E479, 0xB6F84565, 0xD28E49BC, 0x4BFB9790,
-                0xE1DDF2DA, 0xA4CB7E33, 0x62FB1341, 0xCEE4C6E8,
-                0xEF20CADA, 0x36774C01, 0xD07E9EFE, 0x2BF11FB4,
-                0x95DBDA4D, 0xAE909198, 0xEAAD8E71, 0x6B93D5A0,
-                0xD08ED1D0, 0xAFC725E0, 0x8E3C5B2F, 0x8E7594B7,
-                0x8FF6E2FB, 0xF2122B64, 0x8888B812, 0x900DF01C,
-                0x4FAD5EA0, 0x688FC31C, 0xD1CFF191, 0xB3A8C1AD,
-                0x2F2F2218, 0xBE0E1777, 0xEA752DFE, 0x8B021FA1,
-                0xE5A0CC0F, 0xB56F74E8, 0x18ACF3D6, 0xCE89E299,
-                0xB4A84FE0, 0xFD13E0B7, 0x7CC43B81, 0xD2ADA8D9,
-                0x165FA266, 0x80957705, 0x93CC7314, 0x211A1477,
-                0xE6AD2065, 0x77B5FA86, 0xC75442F5, 0xFB9D35CF,
-                0xEBCDAF0C, 0x7B3E89A0, 0xD6411BD3, 0xAE1E7E49,
-                0x00250E2D, 0x2071B35E, 0x226800BB, 0x57B8E0AF,
-                0x2464369B, 0xF009B91E, 0x5563911D, 0x59DFA6AA,
-                0x78C14389, 0xD95A537F, 0x207D5BA2, 0x02E5B9C5,
-                0x83260376, 0x6295CFA9, 0x11C81968, 0x4E734A41,
-                0xB3472DCA, 0x7B14A94A, 0x1B510052, 0x9A532915,
-                0xD60F573F, 0xBC9BC6E4, 0x2B60A476, 0x81E67400,
-                0x08BA6FB5, 0x571BE91F, 0xF296EC6B, 0x2A0DD915,
-                0xB6636521, 0xE7B9F9B6, 0xFF34052E, 0xC5855664,
-                0x53B02D5D, 0xA99F8FA1, 0x08BA4799, 0x6E85076A
-            ),
-            array(
-                0x4B7A70E9, 0xB5B32944, 0xDB75092E, 0xC4192623,
-                0xAD6EA6B0, 0x49A7DF7D, 0x9CEE60B8, 0x8FEDB266,
-                0xECAA8C71, 0x699A17FF, 0x5664526C, 0xC2B19EE1,
-                0x193602A5, 0x75094C29, 0xA0591340, 0xE4183A3E,
-                0x3F54989A, 0x5B429D65, 0x6B8FE4D6, 0x99F73FD6,
-                0xA1D29C07, 0xEFE830F5, 0x4D2D38E6, 0xF0255DC1,
-                0x4CDD2086, 0x8470EB26, 0x6382E9C6, 0x021ECC5E,
-                0x09686B3F, 0x3EBAEFC9, 0x3C971814, 0x6B6A70A1,
-                0x687F3584, 0x52A0E286, 0xB79C5305, 0xAA500737,
-                0x3E07841C, 0x7FDEAE5C, 0x8E7D44EC, 0x5716F2B8,
-                0xB03ADA37, 0xF0500C0D, 0xF01C1F04, 0x0200B3FF,
-                0xAE0CF51A, 0x3CB574B2, 0x25837A58, 0xDC0921BD,
-                0xD19113F9, 0x7CA92FF6, 0x94324773, 0x22F54701,
-                0x3AE5E581, 0x37C2DADC, 0xC8B57634, 0x9AF3DDA7,
-                0xA9446146, 0x0FD0030E, 0xECC8C73E, 0xA4751E41,
-                0xE238CD99, 0x3BEA0E2F, 0x3280BBA1, 0x183EB331,
-                0x4E548B38, 0x4F6DB908, 0x6F420D03, 0xF60A04BF,
-                0x2CB81290, 0x24977C79, 0x5679B072, 0xBCAF89AF,
-                0xDE9A771F, 0xD9930810, 0xB38BAE12, 0xDCCF3F2E,
-                0x5512721F, 0x2E6B7124, 0x501ADDE6, 0x9F84CD87,
-                0x7A584718, 0x7408DA17, 0xBC9F9ABC, 0xE94B7D8C,
-                0xEC7AEC3A, 0xDB851DFA, 0x63094366, 0xC464C3D2,
-                0xEF1C1847, 0x3215D908, 0xDD433B37, 0x24C2BA16,
-                0x12A14D43, 0x2A65C451, 0x50940002, 0x133AE4DD,
-                0x71DFF89E, 0x10314E55, 0x81AC77D6, 0x5F11199B,
-                0x043556F1, 0xD7A3C76B, 0x3C11183B, 0x5924A509,
-                0xF28FE6ED, 0x97F1FBFA, 0x9EBABF2C, 0x1E153C6E,
-                0x86E34570, 0xEAE96FB1, 0x860E5E0A, 0x5A3E2AB3,
-                0x771FE71C, 0x4E3D06FA, 0x2965DCB9, 0x99E71D0F,
-                0x803E89D6, 0x5266C825, 0x2E4CC978, 0x9C10B36A,
-                0xC6150EBA, 0x94E2EA78, 0xA5FC3C53, 0x1E0A2DF4,
-                0xF2F74EA7, 0x361D2B3D, 0x1939260F, 0x19C27960,
-                0x5223A708, 0xF71312B6, 0xEBADFE6E, 0xEAC31F66,
-                0xE3BC4595, 0xA67BC883, 0xB17F37D1, 0x018CFF28,
-                0xC332DDEF, 0xBE6C5AA5, 0x65582185, 0x68AB9802,
-                0xEECEA50F, 0xDB2F953B, 0x2AEF7DAD, 0x5B6E2F84,
-                0x1521B628, 0x29076170, 0xECDD4775, 0x619F1510,
-                0x13CCA830, 0xEB61BD96, 0x0334FE1E, 0xAA0363CF,
-                0xB5735C90, 0x4C70A239, 0xD59E9E0B, 0xCBAADE14,
-                0xEECC86BC, 0x60622CA7, 0x9CAB5CAB, 0xB2F3846E,
-                0x648B1EAF, 0x19BDF0CA, 0xA02369B9, 0x655ABB50,
-                0x40685A32, 0x3C2AB4B3, 0x319EE9D5, 0xC021B8F7,
-                0x9B540B19, 0x875FA099, 0x95F7997E, 0x623D7DA8,
-                0xF837889A, 0x97E32D77, 0x11ED935F, 0x16681281,
-                0x0E358829, 0xC7E61FD6, 0x96DEDFA1, 0x7858BA99,
-                0x57F584A5, 0x1B227263, 0x9B83C3FF, 0x1AC24696,
-                0xCDB30AEB, 0x532E3054, 0x8FD948E4, 0x6DBC3128,
-                0x58EBF2EF, 0x34C6FFEA, 0xFE28ED61, 0xEE7C3C73,
-                0x5D4A14D9, 0xE864B7E3, 0x42105D14, 0x203E13E0,
-                0x45EEE2B6, 0xA3AAABEA, 0xDB6C4F15, 0xFACB4FD0,
-                0xC742F442, 0xEF6ABBB5, 0x654F3B1D, 0x41CD2105,
-                0xD81E799E, 0x86854DC7, 0xE44B476A, 0x3D816250,
-                0xCF62A1F2, 0x5B8D2646, 0xFC8883A0, 0xC1C7B6A3,
-                0x7F1524C3, 0x69CB7492, 0x47848A0B, 0x5692B285,
-                0x095BBF00, 0xAD19489D, 0x1462B174, 0x23820E00,
-                0x58428D2A, 0x0C55F5EA, 0x1DADF43E, 0x233F7061,
-                0x3372F092, 0x8D937E41, 0xD65FECF1, 0x6C223BDB,
-                0x7CDE3759, 0xCBEE7460, 0x4085F2A7, 0xCE77326E,
-                0xA6078084, 0x19F8509E, 0xE8EFD855, 0x61D99735,
-                0xA969A7AA, 0xC50C06C2, 0x5A04ABFC, 0x800BCADC,
-                0x9E447A2E, 0xC3453484, 0xFDD56705, 0x0E1E9EC9,
-                0xDB73DBD3, 0x105588CD, 0x675FDA79, 0xE3674340,
-                0xC5C43465, 0x713E38D8, 0x3D28F89E, 0xF16DFF20,
-                0x153E21E7, 0x8FB03D4A, 0xE6E39F2B, 0xDB83ADF7
-            ),
-            array(
-                0xE93D5A68, 0x948140F7, 0xF64C261C, 0x94692934,
-                0x411520F7, 0x7602D4F7, 0xBCF46B2E, 0xD4A20068,
-                0xD4082471, 0x3320F46A, 0x43B7D4B7, 0x500061AF,
-                0x1E39F62E, 0x97244546, 0x14214F74, 0xBF8B8840,
-                0x4D95FC1D, 0x96B591AF, 0x70F4DDD3, 0x66A02F45,
-                0xBFBC09EC, 0x03BD9785, 0x7FAC6DD0, 0x31CB8504,
-                0x96EB27B3, 0x55FD3941, 0xDA2547E6, 0xABCA0A9A,
-                0x28507825, 0x530429F4, 0x0A2C86DA, 0xE9B66DFB,
-                0x68DC1462, 0xD7486900, 0x680EC0A4, 0x27A18DEE,
-                0x4F3FFEA2, 0xE887AD8C, 0xB58CE006, 0x7AF4D6B6,
-                0xAACE1E7C, 0xD3375FEC, 0xCE78A399, 0x406B2A42,
-                0x20FE9E35, 0xD9F385B9, 0xEE39D7AB, 0x3B124E8B,
-                0x1DC9FAF7, 0x4B6D1856, 0x26A36631, 0xEAE397B2,
-                0x3A6EFA74, 0xDD5B4332, 0x6841E7F7, 0xCA7820FB,
-                0xFB0AF54E, 0xD8FEB397, 0x454056AC, 0xBA489527,
-                0x55533A3A, 0x20838D87, 0xFE6BA9B7, 0xD096954B,
-                0x55A867BC, 0xA1159A58, 0xCCA92963, 0x99E1DB33,
-                0xA62A4A56, 0x3F3125F9, 0x5EF47E1C, 0x9029317C,
-                0xFDF8E802, 0x04272F70, 0x80BB155C, 0x05282CE3,
-                0x95C11548, 0xE4C66D22, 0x48C1133F, 0xC70F86DC,
-                0x07F9C9EE, 0x41041F0F, 0x404779A4, 0x5D886E17,
-                0x325F51EB, 0xD59BC0D1, 0xF2BCC18F, 0x41113564,
-                0x257B7834, 0x602A9C60, 0xDFF8E8A3, 0x1F636C1B,
-                0x0E12B4C2, 0x02E1329E, 0xAF664FD1, 0xCAD18115,
-                0x6B2395E0, 0x333E92E1, 0x3B240B62, 0xEEBEB922,
-                0x85B2A20E, 0xE6BA0D99, 0xDE720C8C, 0x2DA2F728,
-                0xD0127845, 0x95B794FD, 0x647D0862, 0xE7CCF5F0,
-                0x5449A36F, 0x877D48FA, 0xC39DFD27, 0xF33E8D1E,
-                0x0A476341, 0x992EFF74, 0x3A6F6EAB, 0xF4F8FD37,
-                0xA812DC60, 0xA1EBDDF8, 0x991BE14C, 0xDB6E6B0D,
-                0xC67B5510, 0x6D672C37, 0x2765D43B, 0xDCD0E804,
-                0xF1290DC7, 0xCC00FFA3, 0xB5390F92, 0x690FED0B,
-                0x667B9FFB, 0xCEDB7D9C, 0xA091CF0B, 0xD9155EA3,
-                0xBB132F88, 0x515BAD24, 0x7B9479BF, 0x763BD6EB,
-                0x37392EB3, 0xCC115979, 0x8026E297, 0xF42E312D,
-                0x6842ADA7, 0xC66A2B3B, 0x12754CCC, 0x782EF11C,
-                0x6A124237, 0xB79251E7, 0x06A1BBE6, 0x4BFB6350,
-                0x1A6B1018, 0x11CAEDFA, 0x3D25BDD8, 0xE2E1C3C9,
-                0x44421659, 0x0A121386, 0xD90CEC6E, 0xD5ABEA2A,
-                0x64AF674E, 0xDA86A85F, 0xBEBFE988, 0x64E4C3FE,
-                0x9DBC8057, 0xF0F7C086, 0x60787BF8, 0x6003604D,
-                0xD1FD8346, 0xF6381FB0, 0x7745AE04, 0xD736FCCC,
-                0x83426B33, 0xF01EAB71, 0xB0804187, 0x3C005E5F,
-                0x77A057BE, 0xBDE8AE24, 0x55464299, 0xBF582E61,
-                0x4E58F48F, 0xF2DDFDA2, 0xF474EF38, 0x8789BDC2,
-                0x5366F9C3, 0xC8B38E74, 0xB475F255, 0x46FCD9B9,
-                0x7AEB2661, 0x8B1DDF84, 0x846A0E79, 0x915F95E2,
-                0x466E598E, 0x20B45770, 0x8CD55591, 0xC902DE4C,
-                0xB90BACE1, 0xBB8205D0, 0x11A86248, 0x7574A99E,
-                0xB77F19B6, 0xE0A9DC09, 0x662D09A1, 0xC4324633,
-                0xE85A1F02, 0x09F0BE8C, 0x4A99A025, 0x1D6EFE10,
-                0x1AB93D1D, 0x0BA5A4DF, 0xA186F20F, 0x2868F169,
-                0xDCB7DA83, 0x573906FE, 0xA1E2CE9B, 0x4FCD7F52,
-                0x50115E01, 0xA70683FA, 0xA002B5C4, 0x0DE6D027,
-                0x9AF88C27, 0x773F8641, 0xC3604C06, 0x61A806B5,
-                0xF0177A28, 0xC0F586E0, 0x006058AA, 0x30DC7D62,
-                0x11E69ED7, 0x2338EA63, 0x53C2DD94, 0xC2C21634,
-                0xBBCBEE56, 0x90BCB6DE, 0xEBFC7DA1, 0xCE591D76,
-                0x6F05E409, 0x4B7C0188, 0x39720A3D, 0x7C927C24,
-                0x86E3725F, 0x724D9DB9, 0x1AC15BB4, 0xD39EB8FC,
-                0xED545578, 0x08FCA5B5, 0xD83D7CD3, 0x4DAD0FC4,
-                0x1E50EF5E, 0xB161E6F8, 0xA28514D9, 0x6C51133C,
-                0x6FD5C7E7, 0x56E14EC4, 0x362ABFCE, 0xDDC6C837,
-                0xD79A3234, 0x92638212, 0x670EFA8E, 0x406000E0
-            ),
-            array(
-                0x3A39CE37, 0xD3FAF5CF, 0xABC27737, 0x5AC52D1B,
-                0x5CB0679E, 0x4FA33742, 0xD3822740, 0x99BC9BBE,
-                0xD5118E9D, 0xBF0F7315, 0xD62D1C7E, 0xC700C47B,
-                0xB78C1B6B, 0x21A19045, 0xB26EB1BE, 0x6A366EB4,
-                0x5748AB2F, 0xBC946E79, 0xC6A376D2, 0x6549C2C8,
-                0x530FF8EE, 0x468DDE7D, 0xD5730A1D, 0x4CD04DC6,
-                0x2939BBDB, 0xA9BA4650, 0xAC9526E8, 0xBE5EE304,
-                0xA1FAD5F0, 0x6A2D519A, 0x63EF8CE2, 0x9A86EE22,
-                0xC089C2B8, 0x43242EF6, 0xA51E03AA, 0x9CF2D0A4,
-                0x83C061BA, 0x9BE96A4D, 0x8FE51550, 0xBA645BD6,
-                0x2826A2F9, 0xA73A3AE1, 0x4BA99586, 0xEF5562E9,
-                0xC72FEFD3, 0xF752F7DA, 0x3F046F69, 0x77FA0A59,
-                0x80E4A915, 0x87B08601, 0x9B09E6AD, 0x3B3EE593,
-                0xE990FD5A, 0x9E34D797, 0x2CF0B7D9, 0x022B8B51,
-                0x96D5AC3A, 0x017DA67D, 0xD1CF3ED6, 0x7C7D2D28,
-                0x1F9F25CF, 0xADF2B89B, 0x5AD6B472, 0x5A88F54C,
-                0xE029AC71, 0xE019A5E6, 0x47B0ACFD, 0xED93FA9B,
-                0xE8D3C48D, 0x283B57CC, 0xF8D56629, 0x79132E28,
-                0x785F0191, 0xED756055, 0xF7960E44, 0xE3D35E8C,
-                0x15056DD4, 0x88F46DBA, 0x03A16125, 0x0564F0BD,
-                0xC3EB9E15, 0x3C9057A2, 0x97271AEC, 0xA93A072A,
-                0x1B3F6D9B, 0x1E6321F5, 0xF59C66FB, 0x26DCF319,
-                0x7533D928, 0xB155FDF5, 0x03563482, 0x8ABA3CBB,
-                0x28517711, 0xC20AD9F8, 0xABCC5167, 0xCCAD925F,
-                0x4DE81751, 0x3830DC8E, 0x379D5862, 0x9320F991,
-                0xEA7A90C2, 0xFB3E7BCE, 0x5121CE64, 0x774FBE32,
-                0xA8B6E37E, 0xC3293D46, 0x48DE5369, 0x6413E680,
-                0xA2AE0810, 0xDD6DB224, 0x69852DFD, 0x09072166,
-                0xB39A460A, 0x6445C0DD, 0x586CDECF, 0x1C20C8AE,
-                0x5BBEF7DD, 0x1B588D40, 0xCCD2017F, 0x6BB4E3BB,
-                0xDDA26A7E, 0x3A59FF45, 0x3E350A44, 0xBCB4CDD5,
-                0x72EACEA8, 0xFA6484BB, 0x8D6612AE, 0xBF3C6F47,
-                0xD29BE463, 0x542F5D9E, 0xAEC2771B, 0xF64E6370,
-                0x740E0D8D, 0xE75B1357, 0xF8721671, 0xAF537D5D,
-                0x4040CB08, 0x4EB4E2CC, 0x34D2466A, 0x0115AF84,
-                0xE1B00428, 0x95983A1D, 0x06B89FB4, 0xCE6EA048,
-                0x6F3F3B82, 0x3520AB82, 0x011A1D4B, 0x277227F8,
-                0x611560B1, 0xE7933FDC, 0xBB3A792B, 0x344525BD,
-                0xA08839E1, 0x51CE794B, 0x2F32C9B7, 0xA01FBAC9,
-                0xE01CC87E, 0xBCC7D1F6, 0xCF0111C3, 0xA1E8AAC7,
-                0x1A908749, 0xD44FBD9A, 0xD0DADECB, 0xD50ADA38,
-                0x0339C32A, 0xC6913667, 0x8DF9317C, 0xE0B12B4F,
-                0xF79E59B7, 0x43F5BB3A, 0xF2D519FF, 0x27D9459C,
-                0xBF97222C, 0x15E6FC2A, 0x0F91FC71, 0x9B941525,
-                0xFAE59361, 0xCEB69CEB, 0xC2A86459, 0x12BAA8D1,
-                0xB6C1075E, 0xE3056A0C, 0x10D25065, 0xCB03A442,
-                0xE0EC6E0E, 0x1698DB3B, 0x4C98A0BE, 0x3278E964,
-                0x9F1F9532, 0xE0D392DF, 0xD3A0342B, 0x8971F21E,
-                0x1B0A7441, 0x4BA3348C, 0xC5BE7120, 0xC37632D8,
-                0xDF359F8D, 0x9B992F2E, 0xE60B6F47, 0x0FE3F11D,
-                0xE54CDA54, 0x1EDAD891, 0xCE6279CF, 0xCD3E7E6F,
-                0x1618B166, 0xFD2C1D05, 0x848FD2C5, 0xF6FB2299,
-                0xF523F357, 0xA6327623, 0x93A83531, 0x56CCCD02,
-                0xACF08162, 0x5A75EBB5, 0x6E163697, 0x88D273CC,
-                0xDE966292, 0x81B949D0, 0x4C50901B, 0x71C65614,
-                0xE6C6C7BD, 0x327A140A, 0x45E1D006, 0xC3F27B9A,
-                0xC9AA53FD, 0x62A80F00, 0xBB25BFE2, 0x35BDD2F6,
-                0x71126905, 0xB2040222, 0xB6CBCF7C, 0xCD769C2B,
-                0x53113EC0, 0x1640E3D3, 0x38ABBD60, 0x2547ADF0,
-                0xBA38209C, 0xF746CE76, 0x77AFA1C5, 0x20756060,
-                0x85CBFE4E, 0x8AE88DD8, 0x7AAAF9B0, 0x4CF9AA7E,
-                0x1948C25C, 0x02FB8A8C, 0x01C36AE4, 0xD6EBE1F9,
-                0x90D4F869, 0xA65CDEA0, 0x3F09252D, 0xC208E69F,
-                0xB74E6132, 0xCE77E25B, 0x578FDFE3, 0x3AC372E6
-            )
-        );
-    }
-    
-}
-
-?>
diff --git a/data/upgrade/2/lib/Crypt/Blowfish/ECB.php b/data/upgrade/2/lib/Crypt/Blowfish/ECB.php
deleted file mode 100644
index 2013d1005..000000000
--- a/data/upgrade/2/lib/Crypt/Blowfish/ECB.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * PHP implementation of the Blowfish algorithm in ECB mode
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Encryption
- * @package    Crypt_Blowfish
- * @author     Matthew Fonda <mfonda@php.net>
- * @author     Philippe Jausions <jausions@php.net>
- * @copyright  2005-2006 Matthew Fonda
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: ECB.php,v 1.6 2006/05/29 17:16:43 jausions Exp $
- * @link       http://pear.php.net/package/Crypt_Blowfish
- * @since      1.1.0
- */
-
-/**
- * Required parent class
- */
-require_once 'Crypt/Blowfish/PHP.php';
-
-/**
- * Example
- * <code>
- * $bf =& Crypt_Blowfish::factory('ecb');
- * if (PEAR::isError($bf)) {
- *     echo $bf->getMessage();
- *     exit;
- * }
- * $bf->setKey('My secret key');
- * $encrypted = $bf->encrypt('this is some example plain text');
- * $plaintext = $bf->decrypt($encrypted);
- * echo "plain text: $plaintext";
- * </code>
- *
- * @category   Encryption
- * @package    Crypt_Blowfish
- * @author     Matthew Fonda <mfonda@php.net>
- * @author     Philippe Jausions <jausions@php.net>
- * @copyright  2005-2006 Matthew Fonda
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @link       http://pear.php.net/package/Crypt_Blowfish
- * @version    1.1.0RC1
- * @access     public
- * @since      1.1.0
- */
-class Crypt_Blowfish_ECB extends Crypt_Blowfish_PHP
-{
-    /**
-     * Crypt_Blowfish Constructor
-     * Initializes the Crypt_Blowfish object, and sets
-     * the secret key
-     *
-     * @param string $key
-     * @param string $iv initialization vector
-     * @access public
-     */
-    function Crypt_Blowfish_ECB($key = null, $iv = null)
-    {
-        $this->__construct($key, $iv);
-    }
-
-    /**
-     * Class constructor
-     *
-     * @param string $key
-     * @param string $iv initialization vector
-     * @access public
-     */
-    function __construct($key = null, $iv = null)
-    {
-        $this->_iv_required = false;
-        parent::__construct($key, $iv);
-    }
-
-    /**
-     * Encrypts a string
-     *
-     * Value is padded with NUL characters prior to encryption. You may
-     * need to trim or cast the type when you decrypt.
-     *
-     * @param string $plainText string of characters/bytes to encrypt
-     * @return string|PEAR_Error Returns cipher text on success, PEAR_Error on failure
-     * @access public
-     */
-    function encrypt($plainText)
-    {
-        if (!is_string($plainText)) {
-            return PEAR::raiseError('Input must be a string', 0);
-        } elseif (empty($this->_P)) {
-            return PEAR::raiseError('The key is not initialized.', 8);
-        }
-
-        $cipherText = '';
-        $len = strlen($plainText);
-        $plainText .= str_repeat(chr(0), (8 - ($len % 8)) % 8);
-
-        for ($i = 0; $i < $len; $i += 8) {
-            list(, $Xl, $Xr) = unpack('N2', substr($plainText, $i, 8));
-            $this->_encipher($Xl, $Xr);
-            $cipherText .= pack('N2', $Xl, $Xr);
-        }
-
-        return $cipherText;
-    }
-
-    /**
-     * Decrypts an encrypted string
-     *
-     * The value was padded with NUL characters when encrypted. You may
-     * need to trim the result or cast its type.
-     *
-     * @param string $cipherText
-     * @return string|PEAR_Error Returns plain text on success, PEAR_Error on failure
-     * @access public
-     */
-    function decrypt($cipherText)
-    {
-        if (!is_string($cipherText)) {
-            return PEAR::raiseError('Cipher text must be a string', 1);
-        }
-        if (empty($this->_P)) {
-            return PEAR::raiseError('The key is not initialized.', 8);
-        }
-
-        $plainText = '';
-        $len = strlen($cipherText);
-        $cipherText .= str_repeat(chr(0), (8 - ($len % 8)) % 8);
-
-        for ($i = 0; $i < $len; $i += 8) {
-            list(, $Xl, $Xr) = unpack('N2', substr($cipherText, $i, 8));
-            $this->_decipher($Xl, $Xr);
-            $plainText .= pack('N2', $Xl, $Xr);
-        }
-
-        return $plainText;
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/data/upgrade/2/lib/Crypt/Blowfish/MCrypt.php b/data/upgrade/2/lib/Crypt/Blowfish/MCrypt.php
deleted file mode 100644
index 886e2af08..000000000
--- a/data/upgrade/2/lib/Crypt/Blowfish/MCrypt.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * MCrypt PHP extension wrapper for Crypt_Blowfish package
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Encryption
- * @package    Crypt_Blowfish
- * @author     Matthew Fonda <mfonda@php.net>
- * @author     Philippe Jausions <jausions@php.net>
- * @copyright  2005-2006 Matthew Fonda
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: MCrypt.php,v 1.3 2006/05/29 17:16:43 jausions Exp $
- * @link       http://pear.php.net/package/Crypt_Blowfish
- * @since      1.1.0
- */
-
-/**
- * Include base class
- */
-require_once 'Crypt/Blowfish.php';
-
-/**
- * Example using the factory method in CBC mode and forcing using
- * the MCrypt library.
- * <code>
- * $bf =& Crypt_Blowfish::factory('cbc', null, null, CRYPT_BLOWFISH_MCRYPT);
- * if (PEAR::isError($bf)) {
- *     echo $bf->getMessage();
- *     exit;
- * }
- * $iv = 'abc123+=';
- * $key = 'My secret key';
- * $bf->setKey($key, $iv);
- * $encrypted = $bf->encrypt('this is some example plain text');
- * $bf->setKey($key, $iv);
- * $plaintext = $bf->decrypt($encrypted);
- * echo "plain text: $plaintext";
- * </code>
- *
- * @category   Encryption
- * @package    Crypt_Blowfish
- * @author     Matthew Fonda <mfonda@php.net>
- * @author     Philippe Jausions <jausions@php.net>
- * @copyright  2005-2006 Matthew Fonda
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @link       http://pear.php.net/package/Crypt_Blowfish
- * @version    1.1.0RC1
- * @access     public
- * @since      1.1.0
- */
-class Crypt_Blowfish_MCrypt extends Crypt_Blowfish
-{
-    /**
-     * Mcrypt td resource
-     *
-     * @var resource
-     * @access private
-     */
-    var $_td = null;
-
-    /**
-     * Crypt_Blowfish Constructor
-     * Initializes the Crypt_Blowfish object, and sets the secret key
-     *
-     * @param string $key
-     * @param string $mode operating mode 'ecb', 'cbc'...
-     * @param string $iv initialization vector
-     * @access public
-     */
-    function Crypt_Blowfish_MCrypt($key = null, $mode = 'ecb', $iv = null)
-    {
-        $this->_iv = $iv . ((strlen($iv) < 8)
-                            ? str_repeat(chr(0), 8 - strlen($iv)) : '');
-
-        $this->_td = mcrypt_module_open(MCRYPT_BLOWFISH, '', $mode, '');
-        if (is_null($iv)) {
-            $this->_iv = mcrypt_create_iv(8, MCRYPT_RAND);
-        }
-
-        switch (strtolower($mode)) {
-            case 'ecb':
-                $this->_iv_required = false;
-                break;
-
-            case 'cbc':
-            default:
-                $this->_iv_required = true;
-                break;
-        }
-
-        $this->setKey($key, $this->_iv);
-    }
-
-    /**
-     * Encrypts a string
-     *
-     * Value is padded with NUL characters prior to encryption. You may
-     * need to trim or cast the type when you decrypt.
-     *
-     * @param string $plainText string of characters/bytes to encrypt
-     * @return string|PEAR_Error Returns cipher text on success,
-     *                           or PEAR_Error on failure
-     * @access public
-     */
-    function encrypt($plainText)
-    {
-        if (!is_string($plainText)) {
-            return PEAR::raiseError('Input must be a string', 0);
-        }
-
-        return mcrypt_generic($this->_td, $plainText);
-    }
-
-
-    /**
-     * Decrypts an encrypted string
-     *
-     * The value was padded with NUL characters when encrypted. You may
-     * need to trim the result or cast its type.
-     *
-     * @param string $cipherText
-     * @return string|PEAR_Error Returns plain text on success,
-     *                           or PEAR_Error on failure
-     * @access public
-     */
-    function decrypt($cipherText)
-    {
-        if (!is_string($cipherText)) {
-            return PEAR::raiseError('Cipher text must be a string', 1);
-        }
-
-        return mdecrypt_generic($this->_td, $cipherText);
-    }
-
-    /**
-     * Sets the secret key
-     * The key must be non-zero, and less than or equal to
-     * 56 characters (bytes) in length.
-     *
-     * If you are making use of the PHP mcrypt extension, you must call this
-     * method before each encrypt() and decrypt() call.
-     *
-     * @param string $key
-     * @param string $iv 8-char initialization vector (required for CBC mode)
-     * @return boolean|PEAR_Error  Returns TRUE on success, PEAR_Error on failure
-     * @access public
-     */
-    function setKey($key, $iv = null)
-    {
-        static $keyHash = null;
-
-        if (!is_string($key)) {
-            return PEAR::raiseError('Key must be a string', 2);
-        }
-
-        $len = strlen($key);
-
-        if ($len > 56 || $len == 0) {
-            return PEAR::raiseError('Key must be less than 56 characters (bytes) and non-zero. Supplied key length: ' . $len, 3);
-        }
-
-        if ($this->_iv_required) {
-            if (strlen($iv) != 8) {
-                return PEAR::raiseError('IV must be 8-character (byte) long. Supplied IV length: ' . strlen($iv), 7);
-            }
-            $this->_iv = $iv;
-        }
-
-        $return = mcrypt_generic_init($this->_td, $key, $this->_iv);
-        if ($return < 0) {
-            return PEAR::raiseError('Unknown PHP MCrypt library error', 4);
-        }
-        return true;
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/data/upgrade/2/lib/Crypt/Blowfish/PHP.php b/data/upgrade/2/lib/Crypt/Blowfish/PHP.php
deleted file mode 100644
index e88f2a53a..000000000
--- a/data/upgrade/2/lib/Crypt/Blowfish/PHP.php
+++ /dev/null
@@ -1,278 +0,0 @@
-<?php
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Crypt_Blowfish allows for encryption and decryption on the fly using
- * the Blowfish algorithm. Crypt_Blowfish does not require the mcrypt
- * PHP extension, but uses it if available, otherwise it uses only PHP.
- * Crypt_Blowfish support encryption/decryption with or without a secret key.
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Encryption
- * @package    Crypt_Blowfish
- * @author     Matthew Fonda <mfonda@php.net>
- * @author     Philippe Jausions <jausions@php.net>
- * @copyright  2005-2006 Matthew Fonda
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: PHP.php,v 1.5 2006/05/29 17:16:43 jausions Exp $
- * @link       http://pear.php.net/package/Crypt_Blowfish
- * @since      1.1.0
- */
-
-/**
- * Include base class
- */
-require_once 'Crypt/Blowfish.php';
-
-/**
- * Common class for PHP-only implementations
- *
- * @category   Encryption
- * @package    Crypt_Blowfish
- * @author     Matthew Fonda <mfonda@php.net>
- * @author     Philippe Jausions <jausions@php.net>
- * @copyright  2005-2006 Matthew Fonda
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @link       http://pear.php.net/package/Crypt_Blowfish
- * @version    1.1.0RC1
- * @access     public
- * @since      1.1.0
- */
-class Crypt_Blowfish_PHP extends Crypt_Blowfish
-{
-    /**
-     * P-Array contains 18 32-bit subkeys
-     *
-     * @var array
-     * @access protected
-     */
-    var $_P = array();
-
-    /**
-     * Array of four S-Blocks each containing 256 32-bit entries
-     *
-     * @var array
-     * @access protected
-     */
-    var $_S = array();
-
-    /**
-     * Whether the IV is required
-     *
-     * @var boolean
-     * @access protected
-     */
-    var $_iv_required = false;
-
-    /**
-     * Crypt_Blowfish_PHP Constructor
-     * Initializes the Crypt_Blowfish object, and sets
-     * the secret key
-     *
-     * @param string $key
-     * @param string $mode operating mode 'ecb' or 'cbc'
-     * @param string $iv initialization vector
-     * @access protected
-     */
-    function __construct($key = null, $iv = null)
-    {
-        $this->_iv = $iv . ((strlen($iv) < $this->_iv_size)
-                            ? str_repeat(chr(0), $this->_iv_size - strlen($iv))
-                            : '');
-        if (!is_null($key)) {
-            $this->setKey($key, $this->_iv);
-        }
-    }
-
-    /**
-     * Initializes the Crypt_Blowfish object
-     *
-     * @access private
-     */
-    function _init()
-    {
-        require_once 'Crypt/Blowfish/DefaultKey.php';
-        $defaults = new Crypt_Blowfish_DefaultKey();
-        $this->_P = $defaults->P;
-        $this->_S = $defaults->S;
-    }
-
-    /**
-     * Workaround for XOR on certain systems
-     *
-     * @param integer|float $l
-     * @param integer|float $r
-     * @return float
-     * @access protected
-     */
-    function _binxor($l, $r)
-    {
-        $x = (($l < 0) ? (float)($l + 4294967296) : (float)$l)
-             ^ (($r < 0) ? (float)($r + 4294967296) : (float)$r);
-
-        return (float)(($x < 0) ? $x + 4294967296 : $x);
-    }
-
-    /**
-     * Enciphers a single 64-bit block
-     *
-     * @param int &$Xl
-     * @param int &$Xr
-     * @access protected
-     */
-    function _encipher(&$Xl, &$Xr)
-    {
-        if ($Xl < 0) {
-            $Xl += 4294967296;
-        }
-        if ($Xr < 0) {
-            $Xr += 4294967296;
-        }
-
-        for ($i = 0; $i < 16; $i++) {
-            $temp = $Xl ^ $this->_P[$i];
-            if ($temp < 0) {
-                $temp += 4294967296;
-            }
-
-            $Xl = ((($this->_S[0][($temp >> 24) & 255]
-                     + $this->_S[1][($temp >> 16) & 255]
-                    ) ^ $this->_S[2][($temp >> 8) & 255]
-                   ) + $this->_S[3][$temp & 255]
-                  ) ^ $Xr;
-            $Xr = $temp;
-        }
-        $Xr = $this->_binxor($Xl, $this->_P[16]);
-        $Xl = $this->_binxor($temp, $this->_P[17]);
-    }
-
-    /**
-     * Deciphers a single 64-bit block
-     *
-     * @param int &$Xl
-     * @param int &$Xr
-     * @access protected
-     */
-    function _decipher(&$Xl, &$Xr)
-    {
-        if ($Xl < 0) {
-            $Xl += 4294967296;
-        }
-        if ($Xr < 0) {
-            $Xr += 4294967296;
-        }
-
-        for ($i = 17; $i > 1; $i--) {
-            $temp = $Xl ^ $this->_P[$i];
-            if ($temp < 0) {
-                $temp += 4294967296;
-            }
-
-            $Xl = ((($this->_S[0][($temp >> 24) & 255]
-                     + $this->_S[1][($temp >> 16) & 255]
-                    ) ^ $this->_S[2][($temp >> 8) & 255]
-                   ) + $this->_S[3][$temp & 255]
-                  ) ^ $Xr;
-            $Xr = $temp;
-        }
-        $Xr = $this->_binxor($Xl, $this->_P[1]);
-        $Xl = $this->_binxor($temp, $this->_P[0]);
-    }
-
-    /**
-     * Sets the secret key
-     * The key must be non-zero, and less than or equal to
-     * 56 characters (bytes) in length.
-     *
-     * If you are making use of the PHP mcrypt extension, you must call this
-     * method before each encrypt() and decrypt() call.
-     *
-     * @param string $key
-     * @param string $iv 8-char initialization vector (required for CBC mode)
-     * @return boolean|PEAR_Error  Returns TRUE on success, PEAR_Error on failure
-     * @access public
-     * @todo Fix the caching of the key
-     */
-    function setKey($key, $iv = null)
-    {
-        static $keyHash = null;
-
-        if (!is_string($key)) {
-            return PEAR::raiseError('Key must be a string', 2);
-        }
-
-        $len = strlen($key);
-
-        if ($len > $this->_key_size || $len == 0) {
-            return PEAR::raiseError('Key must be less than ' . $this->_key_size . ' characters (bytes) and non-zero. Supplied key length: ' . $len, 3);
-        }
-
-        if ($this->_iv_required) {
-            if (strlen($iv) != $this->_iv_size) {
-                return PEAR::raiseError('IV must be ' . $this->_iv_size . '-character (byte) long. Supplied IV length: ' . strlen($iv), 7);
-            }
-            $this->_iv = $iv;
-        }
-
-        // If same key passed, no need to re-initialize internal arrays.
-        // @todo This needs to be worked out better...
-        if ($keyHash == md5($key)) {
-            return true;
-        }
-
-        $this->_init();
-
-        $k = 0;
-        $data = 0;
-        $datal = 0;
-        $datar = 0;
-
-        for ($i = 0; $i < 18; $i++) {
-            $data = 0;
-            for ($j = 4; $j > 0; $j--) {
-                    $data = $data << 8 | ord($key{$k});
-                    $k = ($k+1) % $len;
-            }
-            $this->_P[$i] ^= $data;
-        }
-
-        for ($i = 0; $i <= 16; $i += 2) {
-            $this->_encipher($datal, $datar);
-            $this->_P[$i] = $datal;
-            $this->_P[$i+1] = $datar;
-        }
-        for ($i = 0; $i < 256; $i += 2) {
-            $this->_encipher($datal, $datar);
-            $this->_S[0][$i] = $datal;
-            $this->_S[0][$i+1] = $datar;
-        }
-        for ($i = 0; $i < 256; $i += 2) {
-            $this->_encipher($datal, $datar);
-            $this->_S[1][$i] = $datal;
-            $this->_S[1][$i+1] = $datar;
-        }
-        for ($i = 0; $i < 256; $i += 2) {
-            $this->_encipher($datal, $datar);
-            $this->_S[2][$i] = $datal;
-            $this->_S[2][$i+1] = $datar;
-        }
-        for ($i = 0; $i < 256; $i += 2) {
-            $this->_encipher($datal, $datar);
-            $this->_S[3][$i] = $datal;
-            $this->_S[3][$i+1] = $datar;
-        }
-
-        $keyHash = md5($key);
-        return true;
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/data/upgrade/2/lib/Crypt/BlowfishOld.php b/data/upgrade/2/lib/Crypt/BlowfishOld.php
deleted file mode 100644
index 988ef4aa6..000000000
--- a/data/upgrade/2/lib/Crypt/BlowfishOld.php
+++ /dev/null
@@ -1,317 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Crypt_Blowfish allows for encryption and decryption on the fly using
- * the Blowfish algorithm. Crypt_Blowfish does not require the mcrypt
- * PHP extension, it uses only PHP.
- * Crypt_Blowfish support encryption/decryption with or without a secret key.
- *
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Encryption
- * @package    Crypt_Blowfish
- * @author     Matthew Fonda <mfonda@php.net>
- * @copyright  2005 Matthew Fonda
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Blowfish.php,v 1.81 2005/05/30 18:40:36 mfonda Exp $
- * @link       http://pear.php.net/package/Crypt_Blowfish
- */
-
-
-require_once 'PEAR.php';
-
-
-/**
- *
- * Example usage:
- * $bf = new Crypt_Blowfish('some secret key!');
- * $encrypted = $bf->encrypt('this is some example plain text');
- * $plaintext = $bf->decrypt($encrypted);
- * echo "plain text: $plaintext";
- *
- *
- * @category   Encryption
- * @package    Crypt_Blowfish
- * @author     Matthew Fonda <mfonda@php.net>
- * @copyright  2005 Matthew Fonda
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @link       http://pear.php.net/package/Crypt_Blowfish
- * @version    1.0.1
- * @access     public
- */
-class Crypt_BlowfishOld
-{
-    /**
-     * P-Array contains 18 32-bit subkeys
-     *
-     * @var array
-     * @access private
-     */
-    var $_P = array();
-    
-    
-    /**
-     * Array of four S-Blocks each containing 256 32-bit entries
-     *
-     * @var array
-     * @access private
-     */
-    var $_S = array();
-
-    /**
-     * Mcrypt td resource
-     *
-     * @var resource
-     * @access private
-     */
-    var $_td = null;
-
-    /**
-     * Initialization vector
-     *
-     * @var string
-     * @access private
-     */
-    var $_iv = null;
-
-    
-    /**
-     * Crypt_Blowfish Constructor
-     * Initializes the Crypt_Blowfish object, and gives a sets
-     * the secret key
-     *
-     * @param string $key
-     * @access public
-     */
-    function Crypt_BlowfishOld($key)
-    {
-        if (extension_loaded('mcrypt')) {
-            $this->_td = mcrypt_module_open(MCRYPT_BLOWFISH, '', 'ecb', '');
-            $this->_iv = mcrypt_create_iv(8, MCRYPT_RAND);
-        }
-        $this->setKey($key);
-    }
-    
-    /**
-     * Deprecated isReady method
-     *
-     * @return bool
-     * @access public
-     * @deprecated
-     */
-    function isReady()
-    {
-        return true;
-    }
-    
-    /**
-     * Deprecated init method - init is now a private
-     * method and has been replaced with _init
-     *
-     * @return bool
-     * @access public
-     * @deprecated
-     * @see Crypt_Blowfish::_init()
-     */
-    function init()
-    {
-        $this->_init();
-    }
-    
-    /**
-     * Initializes the Crypt_Blowfish object
-     *
-     * @access private
-     */
-    function _init()
-    {
-        $defaults = new Crypt_BlowfishOld_DefaultKey();
-        $this->_P = $defaults->P;
-        $this->_S = $defaults->S;
-    }
-            
-    /**
-     * Enciphers a single 64 bit block
-     *
-     * @param int &$Xl
-     * @param int &$Xr
-     * @access private
-     */
-    function _encipher(&$Xl, &$Xr)
-    {
-        for ($i = 0; $i < 16; $i++) {
-            $temp = $Xl ^ $this->_P[$i];
-            $Xl = ((($this->_S[0][($temp>>24) & 255] +
-                            $this->_S[1][($temp>>16) & 255]) ^
-                            $this->_S[2][($temp>>8) & 255]) +
-                            $this->_S[3][$temp & 255]) ^ $Xr;
-            $Xr = $temp;
-        }
-        $Xr = $Xl ^ $this->_P[16];
-        $Xl = $temp ^ $this->_P[17];
-    }
-    
-    
-    /**
-     * Deciphers a single 64 bit block
-     *
-     * @param int &$Xl
-     * @param int &$Xr
-     * @access private
-     */
-    function _decipher(&$Xl, &$Xr)
-    {
-        for ($i = 17; $i > 1; $i--) {
-            $temp = $Xl ^ $this->_P[$i];
-            $Xl = ((($this->_S[0][($temp>>24) & 255] +
-                            $this->_S[1][($temp>>16) & 255]) ^
-                            $this->_S[2][($temp>>8) & 255]) +
-                            $this->_S[3][$temp & 255]) ^ $Xr;
-            $Xr = $temp;
-        }
-        $Xr = $Xl ^ $this->_P[1];
-        $Xl = $temp ^ $this->_P[0];
-    }
-    
-    
-    /**
-     * Encrypts a string
-     *
-     * @param string $plainText
-     * @return string Returns cipher text on success, PEAR_Error on failure
-     * @access public
-     */
-    function encrypt($plainText)
-    {
-        if (!is_string($plainText)) {
-            PEAR::raiseError('Plain text must be a string', 0, PEAR_ERROR_DIE);
-        }
-
-        if (extension_loaded('mcrypt')) {
-            return mcrypt_generic($this->_td, $plainText);
-        }
-
-        $cipherText = '';
-        $len = strlen($plainText);
-        $plainText .= str_repeat(chr(0),(8 - ($len%8))%8);
-        for ($i = 0; $i < $len; $i += 8) {
-            list(,$Xl,$Xr) = unpack("N2",substr($plainText,$i,8));
-            $this->_encipher($Xl, $Xr);
-            $cipherText .= pack("N2", $Xl, $Xr);
-        }
-        return $cipherText;
-    }
-    
-    
-    /**
-     * Decrypts an encrypted string
-     *
-     * @param string $cipherText
-     * @return string Returns plain text on success, PEAR_Error on failure
-     * @access public
-     */
-    function decrypt($cipherText)
-    {
-        if (!is_string($cipherText)) {
-            PEAR::raiseError('Chiper text must be a string', 1, PEAR_ERROR_DIE);
-        }
-
-        if (extension_loaded('mcrypt')) {
-            return mdecrypt_generic($this->_td, $cipherText);
-        }
-
-        $plainText = '';
-        $len = strlen($cipherText);
-        $cipherText .= str_repeat(chr(0),(8 - ($len%8))%8);
-        for ($i = 0; $i < $len; $i += 8) {
-            list(,$Xl,$Xr) = unpack("N2",substr($cipherText,$i,8));
-            $this->_decipher($Xl, $Xr);
-            $plainText .= pack("N2", $Xl, $Xr);
-        }
-        return $plainText;
-    }
-    
-    
-    /**
-     * Sets the secret key
-     * The key must be non-zero, and less than or equal to
-     * 56 characters in length.
-     *
-     * @param string $key
-     * @return bool  Returns true on success, PEAR_Error on failure
-     * @access public
-     */
-    function setKey($key)
-    {
-        if (!is_string($key)) {
-            PEAR::raiseError('Key must be a string', 2, PEAR_ERROR_DIE);
-        }
-
-        $len = strlen($key);
-
-        if ($len > 56 || $len == 0) {
-            PEAR::raiseError('Key must be less than 56 characters and non-zero. Supplied key length: ' . $len, 3, PEAR_ERROR_DIE);
-        }
-
-        if (extension_loaded('mcrypt')) {
-            mcrypt_generic_init($this->_td, $key, $this->_iv);
-            return true;
-        }
-
-        require_once 'Crypt/BlowfishOld/DefaultKey.php';
-        $this->_init();
-        
-        $k = 0;
-        $data = 0;
-        $datal = 0;
-        $datar = 0;
-        
-        for ($i = 0; $i < 18; $i++) {
-            $data = 0;
-            for ($j = 4; $j > 0; $j--) {
-                    $data = $data << 8 | ord($key{$k});
-                    $k = ($k+1) % $len;
-            }
-            $this->_P[$i] ^= $data;
-        }
-        
-        for ($i = 0; $i <= 16; $i += 2) {
-            $this->_encipher($datal, $datar);
-            $this->_P[$i] = $datal;
-            $this->_P[$i+1] = $datar;
-        }
-        for ($i = 0; $i < 256; $i += 2) {
-            $this->_encipher($datal, $datar);
-            $this->_S[0][$i] = $datal;
-            $this->_S[0][$i+1] = $datar;
-        }
-        for ($i = 0; $i < 256; $i += 2) {
-            $this->_encipher($datal, $datar);
-            $this->_S[1][$i] = $datal;
-            $this->_S[1][$i+1] = $datar;
-        }
-        for ($i = 0; $i < 256; $i += 2) {
-            $this->_encipher($datal, $datar);
-            $this->_S[2][$i] = $datal;
-            $this->_S[2][$i+1] = $datar;
-        }
-        for ($i = 0; $i < 256; $i += 2) {
-            $this->_encipher($datal, $datar);
-            $this->_S[3][$i] = $datal;
-            $this->_S[3][$i+1] = $datar;
-        }
-        
-        return true;
-    }
-    
-}
-
-?>
diff --git a/data/upgrade/2/lib/Crypt/BlowfishOld/DefaultKey.php b/data/upgrade/2/lib/Crypt/BlowfishOld/DefaultKey.php
deleted file mode 100644
index 6f4518db3..000000000
--- a/data/upgrade/2/lib/Crypt/BlowfishOld/DefaultKey.php
+++ /dev/null
@@ -1,327 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * Crypt_Blowfish allows for encryption and decryption on the fly using
- * the Blowfish algorithm. Crypt_Blowfish does not require the mcrypt
- * PHP extension, it uses only PHP.
- * Crypt_Blowfish support encryption/decryption with or without a secret key.
- *
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   Encryption
- * @package    Crypt_Blowfish
- * @author     Matthew Fonda <mfonda@php.net>
- * @copyright  2005 Matthew Fonda
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: DefaultKey.php,v 1.81 2005/05/30 18:40:37 mfonda Exp $
- * @link       http://pear.php.net/package/Crypt_Blowfish
- */
-
-
-/**
- * Class containing default key
- *
- * @category   Encryption
- * @package    Crypt_Blowfish
- * @author     Matthew Fonda <mfonda@php.net>
- * @copyright  2005 Matthew Fonda
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @link       http://pear.php.net/package/Crypt_Blowfish
- * @version    1.0.1
- * @access     public
- */
-class Crypt_BlowfishOld_DefaultKey
-{
-    var $P = array();
-    
-    var $S = array();
-    
-    function Crypt_BlowfishOld_DefaultKey()
-    {
-        $this->P = array(
-            0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344,
-            0xA4093822, 0x299F31D0, 0x082EFA98, 0xEC4E6C89,
-            0x452821E6, 0x38D01377, 0xBE5466CF, 0x34E90C6C,
-            0xC0AC29B7, 0xC97C50DD, 0x3F84D5B5, 0xB5470917,
-            0x9216D5D9, 0x8979FB1B
-        );
-        
-        $this->S = array(
-            array(
-                0xD1310BA6, 0x98DFB5AC, 0x2FFD72DB, 0xD01ADFB7,
-                0xB8E1AFED, 0x6A267E96, 0xBA7C9045, 0xF12C7F99,
-                0x24A19947, 0xB3916CF7, 0x0801F2E2, 0x858EFC16,
-                0x636920D8, 0x71574E69, 0xA458FEA3, 0xF4933D7E,
-                0x0D95748F, 0x728EB658, 0x718BCD58, 0x82154AEE,
-                0x7B54A41D, 0xC25A59B5, 0x9C30D539, 0x2AF26013,
-                0xC5D1B023, 0x286085F0, 0xCA417918, 0xB8DB38EF,
-                0x8E79DCB0, 0x603A180E, 0x6C9E0E8B, 0xB01E8A3E,
-                0xD71577C1, 0xBD314B27, 0x78AF2FDA, 0x55605C60,
-                0xE65525F3, 0xAA55AB94, 0x57489862, 0x63E81440,
-                0x55CA396A, 0x2AAB10B6, 0xB4CC5C34, 0x1141E8CE,
-                0xA15486AF, 0x7C72E993, 0xB3EE1411, 0x636FBC2A,
-                0x2BA9C55D, 0x741831F6, 0xCE5C3E16, 0x9B87931E,
-                0xAFD6BA33, 0x6C24CF5C, 0x7A325381, 0x28958677,
-                0x3B8F4898, 0x6B4BB9AF, 0xC4BFE81B, 0x66282193,
-                0x61D809CC, 0xFB21A991, 0x487CAC60, 0x5DEC8032,
-                0xEF845D5D, 0xE98575B1, 0xDC262302, 0xEB651B88,
-                0x23893E81, 0xD396ACC5, 0x0F6D6FF3, 0x83F44239,
-                0x2E0B4482, 0xA4842004, 0x69C8F04A, 0x9E1F9B5E,
-                0x21C66842, 0xF6E96C9A, 0x670C9C61, 0xABD388F0,
-                0x6A51A0D2, 0xD8542F68, 0x960FA728, 0xAB5133A3,
-                0x6EEF0B6C, 0x137A3BE4, 0xBA3BF050, 0x7EFB2A98,
-                0xA1F1651D, 0x39AF0176, 0x66CA593E, 0x82430E88,
-                0x8CEE8619, 0x456F9FB4, 0x7D84A5C3, 0x3B8B5EBE,
-                0xE06F75D8, 0x85C12073, 0x401A449F, 0x56C16AA6,
-                0x4ED3AA62, 0x363F7706, 0x1BFEDF72, 0x429B023D,
-                0x37D0D724, 0xD00A1248, 0xDB0FEAD3, 0x49F1C09B,
-                0x075372C9, 0x80991B7B, 0x25D479D8, 0xF6E8DEF7,
-                0xE3FE501A, 0xB6794C3B, 0x976CE0BD, 0x04C006BA,
-                0xC1A94FB6, 0x409F60C4, 0x5E5C9EC2, 0x196A2463,
-                0x68FB6FAF, 0x3E6C53B5, 0x1339B2EB, 0x3B52EC6F,
-                0x6DFC511F, 0x9B30952C, 0xCC814544, 0xAF5EBD09,
-                0xBEE3D004, 0xDE334AFD, 0x660F2807, 0x192E4BB3,
-                0xC0CBA857, 0x45C8740F, 0xD20B5F39, 0xB9D3FBDB,
-                0x5579C0BD, 0x1A60320A, 0xD6A100C6, 0x402C7279,
-                0x679F25FE, 0xFB1FA3CC, 0x8EA5E9F8, 0xDB3222F8,
-                0x3C7516DF, 0xFD616B15, 0x2F501EC8, 0xAD0552AB,
-                0x323DB5FA, 0xFD238760, 0x53317B48, 0x3E00DF82,
-                0x9E5C57BB, 0xCA6F8CA0, 0x1A87562E, 0xDF1769DB,
-                0xD542A8F6, 0x287EFFC3, 0xAC6732C6, 0x8C4F5573,
-                0x695B27B0, 0xBBCA58C8, 0xE1FFA35D, 0xB8F011A0,
-                0x10FA3D98, 0xFD2183B8, 0x4AFCB56C, 0x2DD1D35B,
-                0x9A53E479, 0xB6F84565, 0xD28E49BC, 0x4BFB9790,
-                0xE1DDF2DA, 0xA4CB7E33, 0x62FB1341, 0xCEE4C6E8,
-                0xEF20CADA, 0x36774C01, 0xD07E9EFE, 0x2BF11FB4,
-                0x95DBDA4D, 0xAE909198, 0xEAAD8E71, 0x6B93D5A0,
-                0xD08ED1D0, 0xAFC725E0, 0x8E3C5B2F, 0x8E7594B7,
-                0x8FF6E2FB, 0xF2122B64, 0x8888B812, 0x900DF01C,
-                0x4FAD5EA0, 0x688FC31C, 0xD1CFF191, 0xB3A8C1AD,
-                0x2F2F2218, 0xBE0E1777, 0xEA752DFE, 0x8B021FA1,
-                0xE5A0CC0F, 0xB56F74E8, 0x18ACF3D6, 0xCE89E299,
-                0xB4A84FE0, 0xFD13E0B7, 0x7CC43B81, 0xD2ADA8D9,
-                0x165FA266, 0x80957705, 0x93CC7314, 0x211A1477,
-                0xE6AD2065, 0x77B5FA86, 0xC75442F5, 0xFB9D35CF,
-                0xEBCDAF0C, 0x7B3E89A0, 0xD6411BD3, 0xAE1E7E49,
-                0x00250E2D, 0x2071B35E, 0x226800BB, 0x57B8E0AF,
-                0x2464369B, 0xF009B91E, 0x5563911D, 0x59DFA6AA,
-                0x78C14389, 0xD95A537F, 0x207D5BA2, 0x02E5B9C5,
-                0x83260376, 0x6295CFA9, 0x11C81968, 0x4E734A41,
-                0xB3472DCA, 0x7B14A94A, 0x1B510052, 0x9A532915,
-                0xD60F573F, 0xBC9BC6E4, 0x2B60A476, 0x81E67400,
-                0x08BA6FB5, 0x571BE91F, 0xF296EC6B, 0x2A0DD915,
-                0xB6636521, 0xE7B9F9B6, 0xFF34052E, 0xC5855664,
-                0x53B02D5D, 0xA99F8FA1, 0x08BA4799, 0x6E85076A
-            ),
-            array(
-                0x4B7A70E9, 0xB5B32944, 0xDB75092E, 0xC4192623,
-                0xAD6EA6B0, 0x49A7DF7D, 0x9CEE60B8, 0x8FEDB266,
-                0xECAA8C71, 0x699A17FF, 0x5664526C, 0xC2B19EE1,
-                0x193602A5, 0x75094C29, 0xA0591340, 0xE4183A3E,
-                0x3F54989A, 0x5B429D65, 0x6B8FE4D6, 0x99F73FD6,
-                0xA1D29C07, 0xEFE830F5, 0x4D2D38E6, 0xF0255DC1,
-                0x4CDD2086, 0x8470EB26, 0x6382E9C6, 0x021ECC5E,
-                0x09686B3F, 0x3EBAEFC9, 0x3C971814, 0x6B6A70A1,
-                0x687F3584, 0x52A0E286, 0xB79C5305, 0xAA500737,
-                0x3E07841C, 0x7FDEAE5C, 0x8E7D44EC, 0x5716F2B8,
-                0xB03ADA37, 0xF0500C0D, 0xF01C1F04, 0x0200B3FF,
-                0xAE0CF51A, 0x3CB574B2, 0x25837A58, 0xDC0921BD,
-                0xD19113F9, 0x7CA92FF6, 0x94324773, 0x22F54701,
-                0x3AE5E581, 0x37C2DADC, 0xC8B57634, 0x9AF3DDA7,
-                0xA9446146, 0x0FD0030E, 0xECC8C73E, 0xA4751E41,
-                0xE238CD99, 0x3BEA0E2F, 0x3280BBA1, 0x183EB331,
-                0x4E548B38, 0x4F6DB908, 0x6F420D03, 0xF60A04BF,
-                0x2CB81290, 0x24977C79, 0x5679B072, 0xBCAF89AF,
-                0xDE9A771F, 0xD9930810, 0xB38BAE12, 0xDCCF3F2E,
-                0x5512721F, 0x2E6B7124, 0x501ADDE6, 0x9F84CD87,
-                0x7A584718, 0x7408DA17, 0xBC9F9ABC, 0xE94B7D8C,
-                0xEC7AEC3A, 0xDB851DFA, 0x63094366, 0xC464C3D2,
-                0xEF1C1847, 0x3215D908, 0xDD433B37, 0x24C2BA16,
-                0x12A14D43, 0x2A65C451, 0x50940002, 0x133AE4DD,
-                0x71DFF89E, 0x10314E55, 0x81AC77D6, 0x5F11199B,
-                0x043556F1, 0xD7A3C76B, 0x3C11183B, 0x5924A509,
-                0xF28FE6ED, 0x97F1FBFA, 0x9EBABF2C, 0x1E153C6E,
-                0x86E34570, 0xEAE96FB1, 0x860E5E0A, 0x5A3E2AB3,
-                0x771FE71C, 0x4E3D06FA, 0x2965DCB9, 0x99E71D0F,
-                0x803E89D6, 0x5266C825, 0x2E4CC978, 0x9C10B36A,
-                0xC6150EBA, 0x94E2EA78, 0xA5FC3C53, 0x1E0A2DF4,
-                0xF2F74EA7, 0x361D2B3D, 0x1939260F, 0x19C27960,
-                0x5223A708, 0xF71312B6, 0xEBADFE6E, 0xEAC31F66,
-                0xE3BC4595, 0xA67BC883, 0xB17F37D1, 0x018CFF28,
-                0xC332DDEF, 0xBE6C5AA5, 0x65582185, 0x68AB9802,
-                0xEECEA50F, 0xDB2F953B, 0x2AEF7DAD, 0x5B6E2F84,
-                0x1521B628, 0x29076170, 0xECDD4775, 0x619F1510,
-                0x13CCA830, 0xEB61BD96, 0x0334FE1E, 0xAA0363CF,
-                0xB5735C90, 0x4C70A239, 0xD59E9E0B, 0xCBAADE14,
-                0xEECC86BC, 0x60622CA7, 0x9CAB5CAB, 0xB2F3846E,
-                0x648B1EAF, 0x19BDF0CA, 0xA02369B9, 0x655ABB50,
-                0x40685A32, 0x3C2AB4B3, 0x319EE9D5, 0xC021B8F7,
-                0x9B540B19, 0x875FA099, 0x95F7997E, 0x623D7DA8,
-                0xF837889A, 0x97E32D77, 0x11ED935F, 0x16681281,
-                0x0E358829, 0xC7E61FD6, 0x96DEDFA1, 0x7858BA99,
-                0x57F584A5, 0x1B227263, 0x9B83C3FF, 0x1AC24696,
-                0xCDB30AEB, 0x532E3054, 0x8FD948E4, 0x6DBC3128,
-                0x58EBF2EF, 0x34C6FFEA, 0xFE28ED61, 0xEE7C3C73,
-                0x5D4A14D9, 0xE864B7E3, 0x42105D14, 0x203E13E0,
-                0x45EEE2B6, 0xA3AAABEA, 0xDB6C4F15, 0xFACB4FD0,
-                0xC742F442, 0xEF6ABBB5, 0x654F3B1D, 0x41CD2105,
-                0xD81E799E, 0x86854DC7, 0xE44B476A, 0x3D816250,
-                0xCF62A1F2, 0x5B8D2646, 0xFC8883A0, 0xC1C7B6A3,
-                0x7F1524C3, 0x69CB7492, 0x47848A0B, 0x5692B285,
-                0x095BBF00, 0xAD19489D, 0x1462B174, 0x23820E00,
-                0x58428D2A, 0x0C55F5EA, 0x1DADF43E, 0x233F7061,
-                0x3372F092, 0x8D937E41, 0xD65FECF1, 0x6C223BDB,
-                0x7CDE3759, 0xCBEE7460, 0x4085F2A7, 0xCE77326E,
-                0xA6078084, 0x19F8509E, 0xE8EFD855, 0x61D99735,
-                0xA969A7AA, 0xC50C06C2, 0x5A04ABFC, 0x800BCADC,
-                0x9E447A2E, 0xC3453484, 0xFDD56705, 0x0E1E9EC9,
-                0xDB73DBD3, 0x105588CD, 0x675FDA79, 0xE3674340,
-                0xC5C43465, 0x713E38D8, 0x3D28F89E, 0xF16DFF20,
-                0x153E21E7, 0x8FB03D4A, 0xE6E39F2B, 0xDB83ADF7
-            ),
-            array(
-                0xE93D5A68, 0x948140F7, 0xF64C261C, 0x94692934,
-                0x411520F7, 0x7602D4F7, 0xBCF46B2E, 0xD4A20068,
-                0xD4082471, 0x3320F46A, 0x43B7D4B7, 0x500061AF,
-                0x1E39F62E, 0x97244546, 0x14214F74, 0xBF8B8840,
-                0x4D95FC1D, 0x96B591AF, 0x70F4DDD3, 0x66A02F45,
-                0xBFBC09EC, 0x03BD9785, 0x7FAC6DD0, 0x31CB8504,
-                0x96EB27B3, 0x55FD3941, 0xDA2547E6, 0xABCA0A9A,
-                0x28507825, 0x530429F4, 0x0A2C86DA, 0xE9B66DFB,
-                0x68DC1462, 0xD7486900, 0x680EC0A4, 0x27A18DEE,
-                0x4F3FFEA2, 0xE887AD8C, 0xB58CE006, 0x7AF4D6B6,
-                0xAACE1E7C, 0xD3375FEC, 0xCE78A399, 0x406B2A42,
-                0x20FE9E35, 0xD9F385B9, 0xEE39D7AB, 0x3B124E8B,
-                0x1DC9FAF7, 0x4B6D1856, 0x26A36631, 0xEAE397B2,
-                0x3A6EFA74, 0xDD5B4332, 0x6841E7F7, 0xCA7820FB,
-                0xFB0AF54E, 0xD8FEB397, 0x454056AC, 0xBA489527,
-                0x55533A3A, 0x20838D87, 0xFE6BA9B7, 0xD096954B,
-                0x55A867BC, 0xA1159A58, 0xCCA92963, 0x99E1DB33,
-                0xA62A4A56, 0x3F3125F9, 0x5EF47E1C, 0x9029317C,
-                0xFDF8E802, 0x04272F70, 0x80BB155C, 0x05282CE3,
-                0x95C11548, 0xE4C66D22, 0x48C1133F, 0xC70F86DC,
-                0x07F9C9EE, 0x41041F0F, 0x404779A4, 0x5D886E17,
-                0x325F51EB, 0xD59BC0D1, 0xF2BCC18F, 0x41113564,
-                0x257B7834, 0x602A9C60, 0xDFF8E8A3, 0x1F636C1B,
-                0x0E12B4C2, 0x02E1329E, 0xAF664FD1, 0xCAD18115,
-                0x6B2395E0, 0x333E92E1, 0x3B240B62, 0xEEBEB922,
-                0x85B2A20E, 0xE6BA0D99, 0xDE720C8C, 0x2DA2F728,
-                0xD0127845, 0x95B794FD, 0x647D0862, 0xE7CCF5F0,
-                0x5449A36F, 0x877D48FA, 0xC39DFD27, 0xF33E8D1E,
-                0x0A476341, 0x992EFF74, 0x3A6F6EAB, 0xF4F8FD37,
-                0xA812DC60, 0xA1EBDDF8, 0x991BE14C, 0xDB6E6B0D,
-                0xC67B5510, 0x6D672C37, 0x2765D43B, 0xDCD0E804,
-                0xF1290DC7, 0xCC00FFA3, 0xB5390F92, 0x690FED0B,
-                0x667B9FFB, 0xCEDB7D9C, 0xA091CF0B, 0xD9155EA3,
-                0xBB132F88, 0x515BAD24, 0x7B9479BF, 0x763BD6EB,
-                0x37392EB3, 0xCC115979, 0x8026E297, 0xF42E312D,
-                0x6842ADA7, 0xC66A2B3B, 0x12754CCC, 0x782EF11C,
-                0x6A124237, 0xB79251E7, 0x06A1BBE6, 0x4BFB6350,
-                0x1A6B1018, 0x11CAEDFA, 0x3D25BDD8, 0xE2E1C3C9,
-                0x44421659, 0x0A121386, 0xD90CEC6E, 0xD5ABEA2A,
-                0x64AF674E, 0xDA86A85F, 0xBEBFE988, 0x64E4C3FE,
-                0x9DBC8057, 0xF0F7C086, 0x60787BF8, 0x6003604D,
-                0xD1FD8346, 0xF6381FB0, 0x7745AE04, 0xD736FCCC,
-                0x83426B33, 0xF01EAB71, 0xB0804187, 0x3C005E5F,
-                0x77A057BE, 0xBDE8AE24, 0x55464299, 0xBF582E61,
-                0x4E58F48F, 0xF2DDFDA2, 0xF474EF38, 0x8789BDC2,
-                0x5366F9C3, 0xC8B38E74, 0xB475F255, 0x46FCD9B9,
-                0x7AEB2661, 0x8B1DDF84, 0x846A0E79, 0x915F95E2,
-                0x466E598E, 0x20B45770, 0x8CD55591, 0xC902DE4C,
-                0xB90BACE1, 0xBB8205D0, 0x11A86248, 0x7574A99E,
-                0xB77F19B6, 0xE0A9DC09, 0x662D09A1, 0xC4324633,
-                0xE85A1F02, 0x09F0BE8C, 0x4A99A025, 0x1D6EFE10,
-                0x1AB93D1D, 0x0BA5A4DF, 0xA186F20F, 0x2868F169,
-                0xDCB7DA83, 0x573906FE, 0xA1E2CE9B, 0x4FCD7F52,
-                0x50115E01, 0xA70683FA, 0xA002B5C4, 0x0DE6D027,
-                0x9AF88C27, 0x773F8641, 0xC3604C06, 0x61A806B5,
-                0xF0177A28, 0xC0F586E0, 0x006058AA, 0x30DC7D62,
-                0x11E69ED7, 0x2338EA63, 0x53C2DD94, 0xC2C21634,
-                0xBBCBEE56, 0x90BCB6DE, 0xEBFC7DA1, 0xCE591D76,
-                0x6F05E409, 0x4B7C0188, 0x39720A3D, 0x7C927C24,
-                0x86E3725F, 0x724D9DB9, 0x1AC15BB4, 0xD39EB8FC,
-                0xED545578, 0x08FCA5B5, 0xD83D7CD3, 0x4DAD0FC4,
-                0x1E50EF5E, 0xB161E6F8, 0xA28514D9, 0x6C51133C,
-                0x6FD5C7E7, 0x56E14EC4, 0x362ABFCE, 0xDDC6C837,
-                0xD79A3234, 0x92638212, 0x670EFA8E, 0x406000E0
-            ),
-            array(
-                0x3A39CE37, 0xD3FAF5CF, 0xABC27737, 0x5AC52D1B,
-                0x5CB0679E, 0x4FA33742, 0xD3822740, 0x99BC9BBE,
-                0xD5118E9D, 0xBF0F7315, 0xD62D1C7E, 0xC700C47B,
-                0xB78C1B6B, 0x21A19045, 0xB26EB1BE, 0x6A366EB4,
-                0x5748AB2F, 0xBC946E79, 0xC6A376D2, 0x6549C2C8,
-                0x530FF8EE, 0x468DDE7D, 0xD5730A1D, 0x4CD04DC6,
-                0x2939BBDB, 0xA9BA4650, 0xAC9526E8, 0xBE5EE304,
-                0xA1FAD5F0, 0x6A2D519A, 0x63EF8CE2, 0x9A86EE22,
-                0xC089C2B8, 0x43242EF6, 0xA51E03AA, 0x9CF2D0A4,
-                0x83C061BA, 0x9BE96A4D, 0x8FE51550, 0xBA645BD6,
-                0x2826A2F9, 0xA73A3AE1, 0x4BA99586, 0xEF5562E9,
-                0xC72FEFD3, 0xF752F7DA, 0x3F046F69, 0x77FA0A59,
-                0x80E4A915, 0x87B08601, 0x9B09E6AD, 0x3B3EE593,
-                0xE990FD5A, 0x9E34D797, 0x2CF0B7D9, 0x022B8B51,
-                0x96D5AC3A, 0x017DA67D, 0xD1CF3ED6, 0x7C7D2D28,
-                0x1F9F25CF, 0xADF2B89B, 0x5AD6B472, 0x5A88F54C,
-                0xE029AC71, 0xE019A5E6, 0x47B0ACFD, 0xED93FA9B,
-                0xE8D3C48D, 0x283B57CC, 0xF8D56629, 0x79132E28,
-                0x785F0191, 0xED756055, 0xF7960E44, 0xE3D35E8C,
-                0x15056DD4, 0x88F46DBA, 0x03A16125, 0x0564F0BD,
-                0xC3EB9E15, 0x3C9057A2, 0x97271AEC, 0xA93A072A,
-                0x1B3F6D9B, 0x1E6321F5, 0xF59C66FB, 0x26DCF319,
-                0x7533D928, 0xB155FDF5, 0x03563482, 0x8ABA3CBB,
-                0x28517711, 0xC20AD9F8, 0xABCC5167, 0xCCAD925F,
-                0x4DE81751, 0x3830DC8E, 0x379D5862, 0x9320F991,
-                0xEA7A90C2, 0xFB3E7BCE, 0x5121CE64, 0x774FBE32,
-                0xA8B6E37E, 0xC3293D46, 0x48DE5369, 0x6413E680,
-                0xA2AE0810, 0xDD6DB224, 0x69852DFD, 0x09072166,
-                0xB39A460A, 0x6445C0DD, 0x586CDECF, 0x1C20C8AE,
-                0x5BBEF7DD, 0x1B588D40, 0xCCD2017F, 0x6BB4E3BB,
-                0xDDA26A7E, 0x3A59FF45, 0x3E350A44, 0xBCB4CDD5,
-                0x72EACEA8, 0xFA6484BB, 0x8D6612AE, 0xBF3C6F47,
-                0xD29BE463, 0x542F5D9E, 0xAEC2771B, 0xF64E6370,
-                0x740E0D8D, 0xE75B1357, 0xF8721671, 0xAF537D5D,
-                0x4040CB08, 0x4EB4E2CC, 0x34D2466A, 0x0115AF84,
-                0xE1B00428, 0x95983A1D, 0x06B89FB4, 0xCE6EA048,
-                0x6F3F3B82, 0x3520AB82, 0x011A1D4B, 0x277227F8,
-                0x611560B1, 0xE7933FDC, 0xBB3A792B, 0x344525BD,
-                0xA08839E1, 0x51CE794B, 0x2F32C9B7, 0xA01FBAC9,
-                0xE01CC87E, 0xBCC7D1F6, 0xCF0111C3, 0xA1E8AAC7,
-                0x1A908749, 0xD44FBD9A, 0xD0DADECB, 0xD50ADA38,
-                0x0339C32A, 0xC6913667, 0x8DF9317C, 0xE0B12B4F,
-                0xF79E59B7, 0x43F5BB3A, 0xF2D519FF, 0x27D9459C,
-                0xBF97222C, 0x15E6FC2A, 0x0F91FC71, 0x9B941525,
-                0xFAE59361, 0xCEB69CEB, 0xC2A86459, 0x12BAA8D1,
-                0xB6C1075E, 0xE3056A0C, 0x10D25065, 0xCB03A442,
-                0xE0EC6E0E, 0x1698DB3B, 0x4C98A0BE, 0x3278E964,
-                0x9F1F9532, 0xE0D392DF, 0xD3A0342B, 0x8971F21E,
-                0x1B0A7441, 0x4BA3348C, 0xC5BE7120, 0xC37632D8,
-                0xDF359F8D, 0x9B992F2E, 0xE60B6F47, 0x0FE3F11D,
-                0xE54CDA54, 0x1EDAD891, 0xCE6279CF, 0xCD3E7E6F,
-                0x1618B166, 0xFD2C1D05, 0x848FD2C5, 0xF6FB2299,
-                0xF523F357, 0xA6327623, 0x93A83531, 0x56CCCD02,
-                0xACF08162, 0x5A75EBB5, 0x6E163697, 0x88D273CC,
-                0xDE966292, 0x81B949D0, 0x4C50901B, 0x71C65614,
-                0xE6C6C7BD, 0x327A140A, 0x45E1D006, 0xC3F27B9A,
-                0xC9AA53FD, 0x62A80F00, 0xBB25BFE2, 0x35BDD2F6,
-                0x71126905, 0xB2040222, 0xB6CBCF7C, 0xCD769C2B,
-                0x53113EC0, 0x1640E3D3, 0x38ABBD60, 0x2547ADF0,
-                0xBA38209C, 0xF746CE76, 0x77AFA1C5, 0x20756060,
-                0x85CBFE4E, 0x8AE88DD8, 0x7AAAF9B0, 0x4CF9AA7E,
-                0x1948C25C, 0x02FB8A8C, 0x01C36AE4, 0xD6EBE1F9,
-                0x90D4F869, 0xA65CDEA0, 0x3F09252D, 0xC208E69F,
-                0xB74E6132, 0xCE77E25B, 0x578FDFE3, 0x3AC372E6
-            )
-        );
-    }
-    
-}
-
-?>
diff --git a/data/upgrade/2/lib/OpenPNE2Util.class.php b/data/upgrade/2/lib/OpenPNE2Util.class.php
deleted file mode 100644
index fd5e44dd2..000000000
--- a/data/upgrade/2/lib/OpenPNE2Util.class.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * This utility class is just for using utility functions of OpenPNE2 to upgrade.
- *
- * Some methods in this class is just ported from OpenPNE2.
- * You may be irritated by K&R Coding Style and old-style PHP coding, me too :)
- *
- * @package    OpenPNE
- * @subpackage task
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class OpenPNE2Util
-{
-  static public function &get_crypt_blowfish()
-  {
-      static $singleton;
-      if (empty($singleton)) {
-          if (OPENPNE_USE_OLD_CRYPT_BLOWFISH) {
-              include_once 'Crypt/BlowfishOld.php';
-              $singleton = new Crypt_BlowfishOld(ENCRYPT_KEY);
-          } else {
-              include_once 'Crypt/Blowfish.php';
-              $singleton = new Crypt_Blowfish(ENCRYPT_KEY);
-          }
-      }
-      return $singleton;
-  }
-
-  static public function t_encrypt($str)
-  {
-      if (!$str) return '';
-
-      $bf =& self::get_crypt_blowfish();
-      $str = $bf->encrypt($str);
-
-      //base64
-      $str = base64_encode($str);
-
-      return $str;
-  }
-
-  static public function t_decrypt($str)
-  {
-      if (!$str) return '';
-
-      //base64
-      $str = base64_decode($str);
-
-      $bf =& self::get_crypt_blowfish();
-      return rtrim($bf->decrypt($str));
-  }
-}
diff --git a/data/upgrade/2/opUpgradeFrom2AdminConfigStrategy.class.php b/data/upgrade/2/opUpgradeFrom2AdminConfigStrategy.class.php
deleted file mode 100644
index 3dea040a3..000000000
--- a/data/upgrade/2/opUpgradeFrom2AdminConfigStrategy.class.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * The upgrating strategy by importing admin config.
- *
- * @package    OpenPNE
- * @subpackage task
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class opUpgradeFrom2AdminConfigStrategy extends opUpgradeAbstractStrategy
-{
-  public function run()
-  {
-    $this->getDatabaseManager();
-    $this->conn = Doctrine_Manager::connection();
-
-    $this->conn->beginTransaction();
-
-    try
-    {
-      $this->importSnsConfig();
-      $this->importSiteAdmin();
-
-      $this->conn->commit();
-    }
-    catch (Exception $e)
-    {
-      $this->conn->rollback();
-
-      throw $e;
-    }
-  }
-
-  protected function importSnsConfig()
-  {
-    $list = array(
-      'sns_name' => 'SNS_NAME',
-      'sns_title' => 'SNS_TITLE',
-      'admin_mail_address' => 'ADMIN_EMAIL',
-      'enable_pc' => 'OPENPNE_ENABLE_PC',
-      'enable_mobile' => 'OPENPNE_ENABLE_KTAI',
-      'external_pc_login_url' => 'LOGIN_URL_PC',
-      'external_mobile_login_url' => 'LOGIN_URL_KTAI',
-      'enable_registration' => 'OPENPNE_REGIST_FROM',
-      'retrieve_uid' => 'IS_GET_EASY_ACCESS_ID',
-      'font_size' => 'OPENPNE_IS_SET_KTAI_FONT_SIZE',
-    );
-
-    foreach ($list as $k => $v)
-    {
-      if ('external_pc_login_url' === $k)
-      {
-        if ((bool)$this->conn->fetchOne('SELECT value FROM portal_config WHERE name = ?', array('USE_PORTAL')))
-        {
-          continue;
-        }
-      }
-
-      if ('external_mobile_login_url' === $k)
-      {
-        if ((bool)$this->conn->fetchOne('SELECT value FROM portal_config WHERE name = ?', array('USE_PORTAL_KTAI')))
-        {
-          continue;
-        }
-      }
-
-      $this->conn->execute('INSERT INTO sns_config (id, name, value) (SELECT NULL, ?, value FROM c_admin_config WHERE name = ? LIMIT 1)', array($k, $v));
-    }
-  }
-
-  protected function importSiteAdmin()
-  {
-    $list = array(
-      'customizing_css'  => 'inc_custom_css',
-      'footer_after'     => 'inc_page_footer_after',
-      'footer_before'    => 'inc_page_footer_before',
-      'pc_html_head'     => 'inc_html_head',
-      'pc_html_top'      => 'inc_page_top',
-      'pc_html_top2'     => 'inc_page_top2',
-      'pc_html_bottom'   => 'inc_page_bottom',
-      'pc_html_bottom2'  => 'inc_page_bottom2',
-      'mobile_html_head' => 'inc_ktai_html_head',
-      'mobile_header'    => 'inc_ktai_header',
-      'mobile_footer'    => 'inc_ktai_footer',
-      'user_agreement'   => 'sns_kiyaku',
-      'privacy_policy'   => 'sns_privacy',
-    );
-
-    foreach ($list as $k => $v)
-    {
-      $this->conn->execute('INSERT INTO sns_config (id, name, value) (SELECT NULL, ?, body FROM c_siteadmin WHERE target = ? LIMIT 1)', array($k, $v));
-    }
-  }
-}
diff --git a/data/upgrade/2/opUpgradeFrom2DataLoadStrategy.class.php b/data/upgrade/2/opUpgradeFrom2DataLoadStrategy.class.php
deleted file mode 100644
index 1d15d48b0..000000000
--- a/data/upgrade/2/opUpgradeFrom2DataLoadStrategy.class.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * The upgrating strategy by importing yml.
- *
- * @package    OpenPNE
- * @subpackage task
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class opUpgradeFrom2DataLoadStrategy extends opUpgradeDataLoadStrategy
-{
-  public function run()
-  {
-    $this->getDatabaseManager();
-
-    $coreFixtureDir = sfConfig::get('sf_data_dir').DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR;
-
-    $paths = array(
-      $coreFixtureDir.'000_revision.yml',
-      $coreFixtureDir.'004_import_navi_menu.yml',
-      $coreFixtureDir.'005_import_gadgets.yml',
-      $coreFixtureDir.'006_import_mobile_navi_menu.yml',
-      $coreFixtureDir.'008_import_backend_navi_menu.yml',
-      $coreFixtureDir.'009_import_banner.yml',
-    );
-
-    $pluginDirs = sfFinder::type('dir')->name('data')->in(sfFinder::type('dir')->name('op*Plugin')->maxdepth(1)->in(sfConfig::get('sf_plugins_dir')));
-    $fixtureDirs = sfFinder::type('dir')->name('fixtures')
-      ->prune('migrations', 'upgrade')
-      ->in($pluginDirs);
-    $pluginFixtures = sfFinder::type('file')->name('*.yml')->in($fixtureDirs);
-
-    $paths = array_merge($paths, $pluginFixtures);
-    foreach ($paths as $path)
-    {
-      $this->dataLoad($path);
-    }
-  }
-}
diff --git a/data/upgrade/2/opUpgradeFrom2FixOldImagesStrategy.class.php b/data/upgrade/2/opUpgradeFrom2FixOldImagesStrategy.class.php
deleted file mode 100644
index d3f3ee47e..000000000
--- a/data/upgrade/2/opUpgradeFrom2FixOldImagesStrategy.class.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * The upgrating strategy by fixing converted file and file_bin for images.
- *
- * @package    OpenPNE
- * @subpackage task
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class opUpgradeFrom2FixOldImagesStrategy extends opUpgradeAbstractStrategy
-{
-  protected $tmpConn = null;
-
-  protected function resetTmpConnection()
-  {
-    if ($this->tmpConn)
-    {
-      $this->tmpConn->close();
-    }
-
-    $dsn = $this->conn->getOption('dsn');
-    $info = $this->conn->getManager()->parsePdoDsn($dsn);
-    $this->conn->export->tmpConnectionDatabase = $info['dbname'];
-
-    $this->tmpConn = $this->conn->getTmpConnection($info);
-  }
-
-  public function run()
-  {
-    $this->getDatabaseManager();
-    $this->conn = Doctrine_Manager::connection();
-
-    $convertingCount = 100;
-    $imageSize = IMAGE_MAX_FILESIZE * 2 * 1024;
-    if (opToolkit::calculateUsableMemorySize())
-    {
-      $convertingCount = (int)(opToolkit::calculateUsableMemorySize() / $imageSize);
-    }
-
-    $this->conn->beginTransaction();
-    try
-    {
-      $this->fixMimeType();
-      $this->fixBinary($convertingCount);
-
-      $this->conn->commit();
-    }
-    catch (Exception $e)
-    {
-      $this->conn->rollback();
-
-      throw $e;
-    }
-  }
-
-  protected function fixMimeType()
-  {
-    $result = $this->conn->fetchAll('SELECT * FROM file');
-    foreach ($result as $k => $v)
-    {
-      $ext = $v['type'];
-      if (!$ext)
-      {
-        $pieces = explode('.', $v['name'], 2);
-        if (is_array($pieces))
-        {
-          $ext = array_pop($pieces);
-        }
-      }
-
-      if ($ext)
-      {
-        if (!in_array($ext, array('jpeg', 'png', 'gif')))
-        {
-          $ext = 'jpeg';
-        }
-
-        $type = 'image/'.$ext;
-        $this->conn->execute('UPDATE file SET type = ? WHERE id = ?', array($type, $v['id']));
-      }
-    }
-  }
-
-  protected function fixBinary($size)
-  {
-    $count = $this->conn->fetchOne('SELECT COUNT(id) FROM file');
-
-    for ($i = 0; $i < ($count / $size); $i++)
-    {
-      $this->doFixBinary(($i * $size), $size);
-    }
-  }
-
-  protected function doFixBinary($offset, $limit)
-  {
-    $result = $this->conn->fetchColumn('SELECT id FROM file LIMIT '.$limit.' OFFSET '.$offset);
-    foreach ($result as $id)
-    {
-      $fileBin = $this->conn->fetchOne('SELECT bin FROM file_bin WHERE file_id = ?', array($id));
-      $fileBin = base64_decode($fileBin);
-      $this->conn->execute('UPDATE file_bin SET bin = ? WHERE file_id = ?', array($fileBin, $id));
-      $this->conn->execute('UPDATE file SET filesize = ? WHERE id = ?', array(strlen($fileBin), $id));
-    }
-  }
-}
diff --git a/data/upgrade/2/opUpgradeFrom2ImportCommunityCategoryStrategy.class.php b/data/upgrade/2/opUpgradeFrom2ImportCommunityCategoryStrategy.class.php
deleted file mode 100644
index 6a96c2d14..000000000
--- a/data/upgrade/2/opUpgradeFrom2ImportCommunityCategoryStrategy.class.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * The upgrating strategy by importing community category.
- *
- * @package    OpenPNE
- * @subpackage task
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class opUpgradeFrom2ImportCommunityCategoryStrategy extends opUpgradeSQLImportStrategy
-{
-  public function run()
-  {
-    $this->getDatabaseManager();
-    $this->conn = Doctrine_Manager::connection();
-
-    $this->conn->beginTransaction();
-    try
-    {
-      $this->doRun();
-
-      $this->conn->commit();
-    }
-    catch (Exception $e)
-    {
-      $this->conn->rollback();
-
-      throw $e;
-    }
-  }
-
-  public function doRun()
-  {
-    $this->conn->execute('ALTER TABLE c_commu CHANGE image_filename image_filename text CHARACTER SET utf8 COLLATE utf8_unicode_ci');
-    $this->conn->execute('ALTER TABLE c_commu CHANGE name name text CHARACTER SET utf8 COLLATE utf8_unicode_ci');
-
-    // c_commu.name must be unique but it was restricted by application-level-check
-    // so, on importing that, we should consider of duplicated names
-    $duplicatedCommunityIds = (array)$this->conn->fetchColumn('SELECT a.c_commu_id FROM c_commu AS a WHERE a.name IN (SELECT b.name FROM c_commu AS b WHERE b.c_commu_id <> a.c_commu_id)');
-    if ($duplicatedCommunityIds)
-    {
-      $duplicatedReplacements = implode(',', array_fill(0, count($duplicatedCommunityIds), '?'));
-    }
-
-    $parents = $this->conn->fetchAssoc('SELECT * FROM c_commu_category_parent');
-    foreach ($parents as $parent)
-    {
-      $childs = $this->conn->fetchAssoc('SELECT * FROM c_commu_category WHERE c_commu_category_parent_id = ?', array($parent['c_commu_category_parent_id']));
-
-      $newParentSQL = 'INSERT INTO community_category (name, is_allow_member_community, sort_order, lft, rgt, level)';
-      $oldParentSQL = '(SELECT name, 1, sort_order, 1, '.((count($childs) + 1) * 2).', 0 FROM c_commu_category_parent WHERE c_commu_category_parent_id = ?)';
-
-      $this->conn->execute($newParentSQL.' '.$oldParentSQL, array($parent['c_commu_category_parent_id']));
-
-      $treeKey = $this->conn->lastInsertId();
-
-      $this->conn->execute('UPDATE community_category SET tree_key = ? WHERE id = ?', array($treeKey, $treeKey));
-
-      foreach ($childs as $i => $child)
-      {
-        $lft = ($i + 1) * 2;
-        $rgt = $lft + 1;
-
-        if ('2.12' == sfConfig::get('op_upgrade2_version'))
-        {
-          $isAllowMemberCommunityValue = 1;
-        }
-        else
-        {
-          $isAllowMemberCommunityValue = 'is_create_commu';
-        }
-
-        $newChildSQL = 'INSERT INTO community_category (name, is_allow_member_community, sort_order, lft, rgt, level, tree_key)';
-        $oldChildSQL = '(SELECT name, '.$isAllowMemberCommunityValue.', sort_order, '.$lft.','.$rgt.', 1, '.$treeKey.' FROM c_commu_category WHERE c_commu_category_id = ?)';
-
-        $this->conn->execute($newChildSQL.' '.$oldChildSQL, array($child['c_commu_category_id']));
-        $categoryId = $this->conn->lastInsertId();
-
-        $baseInsert = 'INSERT INTO community (id, name, file_id, community_category_id, created_at, updated_at)';
-        $baseSelect = '(SELECT c_commu_id, name, '.$this->getSQLForFileId('image_filename').', '.$categoryId.', r_datetime, u_datetime FROM c_commu WHERE c_commu_category_id = ? AND c_commu_id';
-        if ($duplicatedCommunityIds)
-        {
-          $uniqueSelect = $baseSelect.' NOT IN ('.$duplicatedReplacements.'))';
-          $duplicateSelect = '(SELECT c_commu_id, c_commu_id, '.$this->getSQLForFileId('image_filename').', '.$categoryId.', r_datetime, u_datetime FROM c_commu WHERE c_commu_category_id = ? AND c_commu_id IN ('.$duplicatedReplacements.'))';
-
-          $params = array_merge(array($child['c_commu_category_id']), $duplicatedCommunityIds);
-          $this->conn->execute($baseInsert.' '.$uniqueSelect, $params);
-          $this->conn->execute($baseInsert.' '.$duplicateSelect, $params);
-        }
-        else
-        {
-          $this->conn->execute($baseInsert.' '.$baseSelect.')', array($child['c_commu_category_id']));
-        }
-      }
-    }
-
-    foreach ($duplicatedCommunityIds as $id)
-    {
-      $name = $this->conn->fetchOne('SELECT name FROM c_commu WHERE c_commu_id = ?', array($id));
-      $this->updateToUniqueCommunityName($id, $name);
-    }
-
-    $this->conn->execute('INSERT INTO community_config (id, community_id, name, value, created_at, updated_at) (SELECT NULL, c_commu_id, ?, 1, NOW(), NOW() FROM c_commu WHERE is_regist_join = 1)', array('is_default'));
-  }
-
-  protected function updateToUniqueCommunityName($id, $baseName, $candidate = 1)
-  {
-    $name = $baseName;
-    if (2 <= $candidate)
-    {
-      $name = sprintf('%s (%d)', $name, $candidate);
-    }
-
-    $isExists = (bool)$this->conn->fetchOne('SELECT id FROM community WHERE name = ?', array($name));
-    if (!$isExists)
-    {
-      $this->conn->execute('UPDATE community SET name = ? WHERE id = ?', array($name, $id));
-
-      return true;
-    }
-
-    $this->updateToUniqueCommunityName($id, $baseName, ($candidate + 1));
-  }
-}
diff --git a/data/upgrade/2/opUpgradeFrom2ImportEmailAddressStrategy.class.php b/data/upgrade/2/opUpgradeFrom2ImportEmailAddressStrategy.class.php
deleted file mode 100644
index 0894deecf..000000000
--- a/data/upgrade/2/opUpgradeFrom2ImportEmailAddressStrategy.class.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * The upgrating strategy by importing member's email address.
- *
- * @package    OpenPNE
- * @subpackage task
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class opUpgradeFrom2ImportEmailAddressStrategy extends opUpgradeAbstractStrategy
-{
-  public function run()
-  {
-    $this->getDatabaseManager();
-    $this->conn = Doctrine_Manager::connection();
-
-    $this->conn->beginTransaction();
-    try
-    {
-      $this->doRun();
-
-      $this->conn->commit();
-    }
-    catch (Exception $e)
-    {
-      $this->conn->rollback();
-
-      throw $e;
-    }
-  }
-
-  public function doRun()
-  {
-    set_include_path(dirname(__FILE__).'/lib'.PATH_SEPARATOR.get_include_path());
-    require_once 'OpenPNE2Util.class.php';
-
-    $results = $this->conn->fetchAssoc('SELECT c_member_id, pc_address, ktai_address FROM c_member_secure');
-    foreach ($results as $result)
-    {
-      if ($result['pc_address'])
-      {
-        $address = OpenPNE2Util::t_decrypt($result['pc_address']);
-        $this->conn->execute('INSERT INTO member_config (name, value, name_value_hash, member_id) VALUES ("pc_address", ?, ?, ?)', array($address, md5('pc_address,'.$address), $result['c_member_id']));
-      }
-
-      if ($result['ktai_address'])
-      {
-        $address = OpenPNE2Util::t_decrypt($result['ktai_address']);
-        $this->conn->execute('INSERT INTO member_config (name, value, name_value_hash, member_id) VALUES ("mobile_address", ?, ?, ?)', array($address, md5('mobile_address,'.$address), $result['c_member_id']));
-      }
-    }
-  }
-}
diff --git a/data/upgrade/2/opUpgradeFrom2LoginLayoutStrategy.class.php b/data/upgrade/2/opUpgradeFrom2LoginLayoutStrategy.class.php
deleted file mode 100644
index 3ebb7ede4..000000000
--- a/data/upgrade/2/opUpgradeFrom2LoginLayoutStrategy.class.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * The upgrating strategy for fixing login layout.
- *
- * @package    OpenPNE
- * @subpackage task
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class opUpgradeFrom2LoginLayoutStrategy extends opUpgradeAbstractStrategy
-{
-  protected $portalPositions = array(
-    'loginTop'      => array(10, 14),
-    'loginSideMenu' => array(20, 29),
-    'loginContents' => array(30, 39),
-    'loginBottom'   => array(40, 44),
-  );
-
-  protected $portalContents = array(
-    'rss'  => array(
-      1 => 'RSS1',
-      2 => 'RSS2',
-      3 => 'RSS3',
-      4 => 'RSS4',
-      5 => 'RSS5',
-    ),
-    'free' => array(
-      1 => 'FREE1',
-      2 => 'FREE2',
-      3 => 'FREE3',
-      4 => 'FREE4',
-      5 => 'FREE5'
-    ),
-    'link' => array('LINK'),
-  );
-
-  public function run()
-  {
-    $this->getDatabaseManager();
-    $this->conn = Doctrine_Manager::connection();
-
-    $this->conn->beginTransaction();
-    try
-    {
-      $this->doRun();
-
-      $this->conn->commit();
-    }
-    catch (Exception $e)
-    {
-      $this->conn->rollback();
-
-      throw $e;
-    }
-  }
-
-  public function doRun()
-  {
-    if (!(bool)$this->conn->fetchOne('SELECT value FROM portal_config WHERE name = ?', array('USE_PORTAL')))
-    {
-      $this->convertOldTypeLoginPage();
-    }
-
-    $this->convertPortalLoginPage();
-  }
-
-  public function convertOldTypeLoginPage()
-  {
-    $this->conn->execute('INSERT INTO sns_config (id, name, value) VALUES(NULL, ?, ?)', array('external_pc_login_url', '@opSkinClassicPlugin_login'));
-  }
-
-  public function convertPortalLoginPage()
-  {
-    $portlets = $this->conn->fetchAssoc('SELECT content_name, position FROM portal_layout');
-
-    foreach ($portlets as $portlet)
-    {
-      $type = $this->findContentType($portlet['content_name']);
-      if (is_null($type))
-      {
-        continue;
-      }
-
-      $target = $this->getGadgetTarget($portlet['position']);
-      if (is_null($target))
-      {
-        continue;
-      }
-
-      if ('free' === $type)
-      {
-        $freeAreaId = array_search($portlet['content_name'], $this->portalContents['free']);
-        $this->conn->execute('INSERT INTO gadget (id, type, name, sort_order, created_at, updated_at) VALUES(NULL, ?, ?, ?, NOW(), NOW())', array($target, 'freeArea', $portlet['position']));
-
-        $gadgetId = $this->conn->lastInsertId();
-        $this->conn->execute('INSERT INTO gadget_config (id, name, gadget_id, value, created_at, updated_at) (SELECT NULL, ?, ?, html, NOW(), NOW() FROM portal_free_area WHERE portal_free_area_id = ?)', array('value', $gadgetId, $freeAreaId));
-      }
-      elseif ('rss' === $type)
-      {
-        $rssId = array_search($portlet['content_name'], $this->portalContents['rss']);
-        $this->conn->execute('INSERT INTO gadget (id, type, name, sort_order, created_at, updated_at) VALUES(NULL, ?, ?, ?, NOW(), NOW())', array($target, 'rssBox', $portlet['position']));
-
-        $gadgetId = $this->conn->lastInsertId();
-        $this->conn->execute('INSERT INTO gadget_config (id, name, gadget_id, value, created_at, updated_at) (SELECT NULL, ?, ?, name, NOW(), NOW() FROM portal_rss WHERE portal_rss_id = ?)', array('title', $gadgetId, $rssId));
-        $this->conn->execute('INSERT INTO gadget_config (id, name, gadget_id, value, created_at, updated_at) (SELECT NULL, ?, ?, url, NOW(), NOW() FROM portal_rss WHERE portal_rss_id = ?)', array('url', $gadgetId, $rssId));
-      }
-      elseif ('link' === $type)
-      {
-        $this->conn->execute('INSERT INTO gadget (id, type, name, sort_order, created_at, updated_at) VALUES(NULL, ?, ?, ?, NOW(), NOW())', array($target, 'linkListBox', $portlet['position']));
-        $gadgetId = $this->conn->lastInsertId();
-        for ($i = 1; $i <= 10; $i++)
-        {
-          $this->conn->execute('INSERT INTO gadget_config (id, name, gadget_id, value, created_at, updated_at) (SELECT NULL, ?, ?, url, NOW(), NOW() FROM portal_link WHERE portal_link_id = ?)', array('url'.$i, $gadgetId, $i));
-          $this->conn->execute('INSERT INTO gadget_config (id, name, gadget_id, value, created_at, updated_at) (SELECT NULL, ?, ?, title, NOW(), NOW() FROM portal_link WHERE portal_link_id = ?)', array('text'.$i, $gadgetId, $i));
-        }
-        $this->conn->execute('INSERT INTO gadget_config (id, name, gadget_id, value, created_at, updated_at) VALUES(NULL, ?, ?, ?, NOW(), NOW())', array('title', $gadgetId, 'リンク集'));
-      }
-    }
-  }
-
-  protected function findContentType($contentName)
-  {
-    $type = null;
-    foreach ($this->portalContents as $typeName => $contents)
-    {
-      if (in_array($contentName, $contents))
-      {
-        $type = $typeName;
-        break;
-      }
-    }
-
-    return $type;
-  }
-
-  protected function getGadgetTarget($position)
-  {
-    $target = null;
-    foreach ($this->portalPositions as $k => $v)
-    {
-      if ($position >= $v[0] && $position <= $v[1])
-      {
-        $target = $k;
-        break;
-      }
-    }
-
-    return $target;
-  }
-}
diff --git a/data/upgrade/2/opUpgradeFrom2MemberProfileStrategy.class.php b/data/upgrade/2/opUpgradeFrom2MemberProfileStrategy.class.php
deleted file mode 100644
index 0543df523..000000000
--- a/data/upgrade/2/opUpgradeFrom2MemberProfileStrategy.class.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * The upgrating strategy by importing member's profile.
- *
- * @package    OpenPNE
- * @subpackage task
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class opUpgradeFrom2MemberProfileStrategy extends opUpgradeAbstractStrategy
-{
-  public function run()
-  {
-    $this->getDatabaseManager();
-    $this->conn = Doctrine_Manager::connection();
-
-    $this->conn->beginTransaction();
-    try
-    {
-      $this->doRun();
-
-      $this->conn->commit();
-    }
-    catch (Exception $e)
-    {
-      $this->conn->rollback();
-
-      throw $e;
-    }
-  }
-
-  public function doRun()
-  {
-    $ids = $this->conn->fetchColumn('SELECT c_profile_id FROM c_profile WHERE name NOT IN (?, ?, ?, ?)', array('self_intro', 'PNE_POINT', 'PNE_MY_NEWS', 'PNE_MY_NEWS_DATETIME'));
-    if (0 < count($ids))
-    {
-      $this->setMemberProfiles($ids);
-    }
-    $this->setPresetMemberProfiles();
-
-    $this->conn->execute('DROP TABLE c_member_profile');
-    $this->conn->execute('DROP TABLE c_profile');
-    $this->conn->execute('DROP TABLE c_profile_option');
-  }
-
-  protected function importProfile($ids, $idStr)
-  {
-    $list = $this->conn->fetchAll('SELECT c_profile_id, name, is_required, public_flag_edit, public_flag_default, form_type, val_type, disp_regist, disp_config, disp_search, val_regexp, val_min, val_max, sort_order FROM c_profile WHERE c_profile_id IN ('.$idStr.') LIMIT 16', $ids);
-    foreach ($list as $profile)
-    {
-      $valMin = (0 == $profile['val_min']) ? null : $profile['val_min'];
-      $valMax = (0 == $profile['val_max']) ? null : $profile['val_max'];
-
-      $this->conn->execute('INSERT INTO profile (id, name, is_required, is_unique, is_edit_public_flag, default_public_flag, form_type, value_type, is_disp_regist, is_disp_config, is_disp_search, value_regexp, value_min, value_max, sort_order, created_at, updated_at) VALUES (?, ?, ?, 0, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NOW(), NOW())', array(
-        $profile['c_profile_id'] , $profile['name']     , $profile['is_required'] , $profile['public_flag_edit'] , $profile['public_flag_default'] ,
-        $profile['form_type']    , $profile['val_type'] , $profile['disp_regist'] , $profile['disp_config']      , $profile['disp_search']         ,
-        $profile['val_regexp']   , $valMin              , $valMax                 , $profile['sort_order']
-      ));
-    }
-  }
-
-  protected function importTreeMemberProfile($ids, $idStr)
-  {
-    $list = $this->conn->fetchColumn('SELECT c_profile_id FROM c_member_profile WHERE c_profile_id IN ('.$idStr.') AND c_profile_option_id <> 0', $ids);
-    $list = array_unique($list);
-
-    $baseSql = 'INSERT IGNORE INTO member_profile (id, member_id, profile_id, profile_option_id, value, value_datetime, public_flag, tree_key, lft, rgt, level, created_at, updated_at)';
-    $rootId = $this->conn->fetchOne('SELECT MAX(c_member_profile_id) FROM c_member_profile') + 1;
-
-    foreach ($list as $id)
-    {
-      $profileType = $this->conn->fetchOne('SELECT form_type FROM c_profile WHERE c_profile_id = ?', array($id));
-      if ('checkbox' !== $profileType)
-      {
-        $this->conn->execute($baseSql.' (SELECT c_member_profile_id, c_member_id, c_profile_id, c_profile_option_id, NULL, NULL, public_flag, c_member_profile_id, 1, 2, 0, NOW(), NOW() FROM c_member_profile WHERE c_profile_id = ?)', array($id));
-        continue;
-      }
-
-      $members = $this->conn->fetchColumn('SELECT c_member_id FROM c_member_profile WHERE c_profile_id = ?', array($id));
-      $members = array_unique($members);
-      foreach ($members as $i => $memberId)
-      {
-        $rootId++;
-        $childs = $this->conn->fetchColumn('SELECT c_member_profile_id FROM c_member_profile WHERE c_profile_id = ? AND c_member_id = ?', array($id, $memberId));
-        $this->conn->execute($baseSql.' (SELECT ?, c_member_id, c_profile_id, NULL, NULL, NULL, public_flag, ?, 1, ?, 0, NOW(), NOW() FROM c_member_profile WHERE c_profile_id = ? AND c_member_id = ? LIMIT 1)', array($rootId, $rootId, count($childs) * 2 + 2, $id, $memberId));
-
-        foreach ($childs as $i => $child)
-        {
-          $num = $i + 1;
-
-          $this->conn->execute($baseSql.' (SELECT c_member_profile_id, c_member_id, c_profile_id, c_profile_option_id, NULL, NULL, public_flag, ?, ?, ?, 1, NOW(), NOW() FROM c_member_profile WHERE c_member_profile_id = ? LIMIT 1)', array($rootId, $num * 2, $num * 2 + 1, $child));
-        }
-      }
-    }
-  }
-
-  protected function setPresetMemberProfiles()
-  {
-    $this->conn->execute('INSERT INTO profile (id, name, is_required, is_unique, is_edit_public_flag, default_public_flag, form_type, value_type, is_disp_regist, is_disp_config, is_disp_search, value_regexp, value_min, value_max, sort_order, created_at, updated_at) (SELECT c_profile_id, ?, is_required, 0, public_flag_edit, public_flag_default, "textarea", "string", disp_regist, disp_config, disp_search, NULL, NULL, NULL, sort_order, NOW(), NOW() FROM c_profile WHERE name = ?)', array('op_preset_self_introduction', 'self_intro'));
-    $introId = $this->conn->lastInsertId();
-    $this->conn->execute('INSERT INTO member_profile (id, member_id, profile_id, profile_option_id, value, value_datetime, public_flag, tree_key, lft, rgt, level, created_at, updated_at) (SELECT c_member_profile_id, c_member_id, c_profile_id, NULL, value, NULL, public_flag, c_member_profile_id, 1, 2, 0, NOW(), NOW() FROM c_member_profile WHERE c_profile_id = ?)', array($introId));
-
-    $this->conn->execute('INSERT INTO profile (id, name, is_required, is_unique, is_edit_public_flag, default_public_flag, form_type, value_type, is_disp_regist, is_disp_config, is_disp_search, value_regexp, value_min, value_max, sort_order, created_at, updated_at) VALUES (NULL, "op_preset_birthday", 1, 0, 0, 1, "date", "string", 1, 1, 1, NULL, NULL, NULL, 1, NOW(), NOW())');
-    $birthdayId = $this->conn->lastInsertId();
-
-    $date = $this->conn->expression->concat('birth_year', '"-"', 'birth_month', '"-"' , 'birth_day');
-    $this->conn->execute('INSERT INTO member_profile (id, member_id, profile_id, profile_option_id, value, value_datetime, public_flag, tree_key, lft, rgt, level, created_at, updated_at) (SELECT NULL, c_member_id, ?, NULL, '.$date.', '.$date.', public_flag_birth_month_day, NULL, 1, 2, 0, NOW(), NOW() FROM c_member WHERE birth_year <> 0 AND birth_month <> 0 AND birth_day <> 0)', array($birthdayId));
-    $this->conn->execute('UPDATE member_profile SET tree_key = id WHERE profile_id = ?', array($birthdayId));
-  }
-
-  protected function setMemberProfiles($ids)
-  {
-    $idStr = implode(',', array_fill(0, count($ids), '?'));
-
-    $this->importProfile($ids, $idStr);
-    $this->conn->execute('INSERT INTO profile_translation (id, caption, info, lang) (SELECT c_profile_id, caption, info, "ja_JP" FROM c_profile WHERE c_profile_id IN ('.$idStr.')) LIMIT 16', $ids);
-
-    $this->conn->execute('INSERT INTO profile_option (id, profile_id, sort_order, created_at, updated_at) (SELECT c_profile_option_id, c_profile_id, sort_order, NOW(), NOW() FROM c_profile_option WHERE c_profile_id IN ('.implode(',', array_fill(0, count($ids), '?')).'))', $ids);
-    $this->conn->execute('INSERT INTO profile_option_translation (id, value, lang) (SELECT c_profile_option_id, value, "ja_JP" FROM c_profile_option WHERE c_profile_id IN ('.implode(',', array_fill(0, count($ids), '?')).'))', $ids);
-
-    $this->conn->execute('INSERT INTO member_profile (id, member_id, profile_id, profile_option_id, value, value_datetime, public_flag, tree_key, lft, rgt, level, created_at, updated_at) (SELECT c_member_profile_id, c_member_id, c_profile_id, NULL, value, NULL, public_flag, c_member_profile_id, 1, 2, 0, NOW(), NOW() FROM c_member_profile WHERE c_profile_id IN ('.$idStr.') AND c_profile_option_id = 0)', $ids);
-
-    $this->importTreeMemberProfile($ids, $idStr);
-  }
-}
diff --git a/data/upgrade/2/opUpgradeFrom2MemberRelationshipStrategy.class.php b/data/upgrade/2/opUpgradeFrom2MemberRelationshipStrategy.class.php
deleted file mode 100644
index 8bce9ca09..000000000
--- a/data/upgrade/2/opUpgradeFrom2MemberRelationshipStrategy.class.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * The upgrating strategy by importing member_relationship.
- *
- * @package    OpenPNE
- * @subpackage task
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class opUpgradeFrom2MemberRelationshipStrategy extends opUpgradeAbstractStrategy
-{
-  public function run()
-  {
-    $this->getDatabaseManager();
-    $this->conn = Doctrine_Manager::connection();
-
-    $this->conn->beginTransaction();
-    try
-    {
-      $this->doRun();
-
-      $this->conn->commit();
-    }
-    catch (Exception $e)
-    {
-      $this->conn->rollback();
-
-      throw $e;
-    }
-  }
-
-  public function doRun()
-  {
-    $friends = $this->conn->fetchAssoc('SELECT c_member_id_from, c_member_id_to FROM c_friend');
-    $friendConfirms = $this->conn->fetchAssoc('SELECT c_member_id_from, c_member_id_to FROM c_friend_confirm');
-    $accessBlocks = $this->conn->fetchAssoc('SELECT c_member_id, c_member_id_block FROM c_access_block');
-
-    $relations = array();
-
-    foreach ($friends as $friend)
-    {
-      $relations[$friend['c_member_id_from']][$friend['c_member_id_to']]['friend'] = true;
-    }
-    unset($friends);
-
-    foreach ($friendConfirms as $friendConfirm)
-    {
-      $relations[$friendConfirm['c_member_id_from']][$friendConfirm['c_member_id_to']]['friend_pre'] = true;
-    }
-    unset($friendConfirmss);
-
-    foreach ($accessBlocks as $accessBlock)
-    {
-      $relations[$accessBlock['c_member_id']][$accessBlock['c_member_id_block']]['access_block'] = true;
-    }
-    unset($accessBlocks);
-
-    foreach ($relations as $idFrom => $relation)
-    {
-      foreach ($relation as $idTo => $types)
-      {
-        $this->conn->execute('INSERT INTO member_relationship (member_id_from, member_id_to, is_friend, is_friend_pre, is_access_block, created_at, updated_at) VALUES(?, ?, ?, ?, ?, NOW(), NOW())', array(
-          $idFrom, $idTo, (int)!empty($types['friend']), (int)!empty($types['friend_pre']), (int)!empty($types['access_block']),
-        ));
-      }
-    }
-
-    $this->conn->execute('DROP TABLE c_access_block');
-    $this->conn->execute('DROP TABLE c_friend');
-    $this->conn->execute('DROP TABLE c_friend_confirm');
-  }
-}
diff --git a/data/upgrade/2/opUpgradeFrom2SkinConfigStrategy.class.php b/data/upgrade/2/opUpgradeFrom2SkinConfigStrategy.class.php
deleted file mode 100644
index 170ac5952..000000000
--- a/data/upgrade/2/opUpgradeFrom2SkinConfigStrategy.class.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * The upgrating strategy by importing admin config.
- *
- * @package    OpenPNE
- * @subpackage task
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class opUpgradeFrom2SkinConfigStrategy extends opUpgradeSQLImportStrategy
-{
-  public function run()
-  {
-    $this->getDatabaseManager();
-    $this->conn = Doctrine_Manager::connection();
-
-    $this->conn->beginTransaction();
-    try
-    {
-      $this->doRun();
-
-      $this->conn->commit();
-    }
-    catch (Exception $e)
-    {
-      $this->conn->rollback();
-
-      throw $e;
-    }
-  }
-
-  public function doRun()
-  {
-    opPlugin::getInstance('opSkinBasicPlugin', $this->options['dispatcher'])->setIsActive(false);
-    opPlugin::getInstance('opSkinClassicPlugin', $this->options['dispatcher'])->setIsActive(true);
-
-    $colorTable = array(
-      'line_color' => 'color_5',
-      'page_background_color' => 'color_16',
-      'contents_background_color' => 'color_17',
-      'frame_color' => 'color_4',
-      'header_background_color' => 'color_10',
-      'information_background_color' => 'color_13',
-      'box_background_color' => 'color_6',
-      'left_menu_background_color' => 'color_14',
-    );
-
-    foreach ($colorTable as $key => $value)
-    {
-      $this->conn->execute('INSERT INTO skin_config (plugin, name, value, created_at, updated_at) (SELECT "opSkinClassicPlugin", "'.$key.'", '.$value.', NOW(), NOW() FROM c_config_color WHERE c_config_color_id = ?)', array(1));
-    }
-
-    $this->conn->execute('INSERT INTO skin_config (plugin, name, value, created_at, updated_at) (SELECT "opSkinClassicPlugin", "theme", value, NOW(), NOW() FROM c_admin_config WHERE name = "OPENPNE_SKIN_THEME")');
-
-    $images = array(
-      'skin_after_header', 'skin_after_header_2', 'skin_before_header', 'skin_footer',
-      'skin_login', 'skin_login_open', 'skin_before_header_2', 'skin_navi_c', 'skin_navi_c_2',
-      'skin_navi_f', 'skin_navi_f_2', 'skin_navi_h', 'skin_navi_h_2',
-      'icon_arrow_1', 'bg_button', 'content_header_1', 'icon_title_1', 'icon_arrow_2',
-      'colon', 'icon_information', 'marker', 'articleList_marker', 'icon_3', 'icon_1', 'icon_2',
-    );
-
-    foreach ($images as $image)
-    {
-      $this->conn->execute('INSERT INTO skin_config (plugin, name, value, created_at, updated_at) (SELECT "opSkinClassicPlugin", "'.$image.'_image", filename, NOW(), NOW() FROM c_skin_filename WHERE skinname = ?)', array($image));
-    }
-
-    $this->conn->execute('DROP TABLE c_config_color');
-  }
-}
diff --git a/data/upgrade/2/opUpgradeFrom2SnsTermStrategy.class.php b/data/upgrade/2/opUpgradeFrom2SnsTermStrategy.class.php
deleted file mode 100644
index e14a995d1..000000000
--- a/data/upgrade/2/opUpgradeFrom2SnsTermStrategy.class.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * The upgrating strategy by importing sns term.
- *
- * @package    OpenPNE
- * @subpackage task
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class opUpgradeFrom2SnsTermStrategy extends opUpgradeAbstractStrategy
-{
-  public function run()
-  {
-    $this->getDatabaseManager();
-    $this->conn = Doctrine_Manager::connection();
-
-    $this->conn->beginTransaction();
-
-    try
-    {
-      $this->doRun();
-
-      $this->conn->commit();
-    }
-    catch (Exception $e)
-    {
-      $this->conn->rollback();
-
-      throw $e;
-    }
-  }
-
-  protected function doRun()
-  {
-    // insert initial data
-    $this->dataLoad(sfConfig::get('sf_data_dir').DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'010_import_sns_terms.yml');
-
-    $list = array(
-      'friend'    => 'WORD_FRIEND',
-      'my_friend' => 'WORD_MY_FRIEND',
-      'community' => 'WORD_COMMUNITY',
-      'nickname'  => 'WORD_NICKNAME',
-    );
-
-    $sql = 'UPDATE sns_term_translation, c_admin_config SET sns_term_translation.value = c_admin_config.value'
-         . ' WHERE sns_term_translation.id = ? AND c_admin_config.name = ? AND sns_term_translation.lang = ?';
-    foreach ($list as $key => $value)
-    {
-      $pcId = $this->conn->fetchOne('SELECT id FROM sns_term WHERE name = ? AND application = ?', array($key, 'pc_frontend'));
-      $mobileId = $this->conn->fetchOne('SELECT id FROM sns_term WHERE name = ? AND application = ?', array($key, 'mobile_frontend'));
-
-      if ($pcId)
-      {
-        $this->conn->execute($sql, array($pcId, $value, 'ja_JP'));
-      }
-
-      if ($mobileId)
-      {
-        $this->conn->execute($sql, array($mobileId, $value.'_HALF', 'ja_JP'));
-      }
-    }
-  }
-}
diff --git a/data/upgrade/2/sql/admin_user.sql b/data/upgrade/2/sql/admin_user.sql
deleted file mode 100644
index f57797f6d..000000000
--- a/data/upgrade/2/sql/admin_user.sql
+++ /dev/null
@@ -1 +0,0 @@
-INSERT INTO admin_user (id, username, password, created_at, updated_at) (SELECT c_admin_user_id, username, password, NOW(), NOW() FROM c_admin_user WHERE auth_type = "all");
diff --git a/data/upgrade/2/sql/album.sql b/data/upgrade/2/sql/album.sql
deleted file mode 100644
index c0ddb7d72..000000000
--- a/data/upgrade/2/sql/album.sql
+++ /dev/null
@@ -1,11 +0,0 @@
-ALTER TABLE c_album CHANGE album_cover_image album_cover_image text CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-ALTER TABLE c_album_image CHANGE image_filename image_filename text CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-
-INSERT INTO album (id, member_id, title, body, public_flag, created_at, updated_at, file_id) (SELECT c_album_id, c_member_id, subject, description, public_flag, r_datetime, u_datetime, <?php echo $this->getSQLForFileId('album_cover_image') ?> FROM c_album);
-
-INSERT INTO album_image (id, album_id, member_id, file_id, description, filesize, created_at, updated_at) (SELECT c_album_image_id, c_album_id, c_member_id, <?php echo $this->getSQLForFileId('image_filename') ?>, image_description, filesize, r_datetime, r_datetime FROM c_album_image);
-
-DROP TABLE c_album;
-
-DROP TABLE c_album_image;
-
diff --git a/data/upgrade/2/sql/ashiato.sql b/data/upgrade/2/sql/ashiato.sql
deleted file mode 100644
index 003594392..000000000
--- a/data/upgrade/2/sql/ashiato.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-INSERT INTO ashiato (id, member_id_from , member_id_to, r_date, created_at, updated_at) (SELECT c_ashiato_id, c_member_id_from, c_member_id_to, r_date, r_datetime, r_datetime FROM c_ashiato);
-
-DROP TABLE c_ashiato;
-
diff --git a/data/upgrade/2/sql/banner.sql b/data/upgrade/2/sql/banner.sql
deleted file mode 100644
index 4595ca791..000000000
--- a/data/upgrade/2/sql/banner.sql
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-$list = array(
-  'top_before' => array(
-    'c_siteadmin' => 'top_banner_html_before',
-    'c_banner' => array('TOP', 'is_hidden_before'),
-  ),
-  'top_after' => array(
-    'c_siteadmin' => 'top_banner_html_after',
-    'c_banner' => array('TOP', 'is_hidden_after'),
-  ),
-  'side_before' => array(
-    'c_siteadmin' => 'side_banner_html_before',
-    'c_banner' => array('SIDE', 'is_hidden_before'),
-  ),
-  'side_after' => array(
-    'c_siteadmin' => 'side_banner_html_after',
-    'c_banner' => array('SIDE', 'is_hidden_after'),
-  ),
-);
-?>
-
-ALTER TABLE c_banner CHANGE image_filename image_filename text CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-INSERT INTO banner_image (id, file_id, url, name, created_at, updated_at) (SELECT c_banner_id, <?php echo $this->getSQLForFileId('image_filename') ?>, a_href, nickname, NOW(), NOW() FROM c_banner);
-<?php foreach ($list as $k => $v): ?>
-UPDATE banner, c_siteadmin SET banner.html = c_siteadmin.body, banner.is_use_html = 1 WHERE c_siteadmin.target = "<?php echo $v['c_siteadmin'] ?>" AND banner.name = "<?php echo $k ?>";
-INSERT INTO banner_use_image (id, banner_id, banner_image_id, created_at, updated_at) (SELECT NULL, (SELECT id FROM banner WHERE name = "<?php echo $k ?>" LIMIT 1), c_banner_id, NOW(), NOW() FROM c_banner WHERE type = "<?php echo $v['c_banner'][0] ?>" AND <?php echo $v['c_banner'][1] ?> = 0 AND (SELECT id FROM banner WHERE name = "<?php echo $k ?>" AND (html = "" OR html IS NULL) LIMIT 1) IS NOT NULL);
-<?php endforeach; ?>
-UPDATE banner SET is_use_html = 0 WHERE html = "";
-
-DROP TABLE c_banner;
-
diff --git a/data/upgrade/2/sql/blacklist.sql b/data/upgrade/2/sql/blacklist.sql
deleted file mode 100644
index 65057c82e..000000000
--- a/data/upgrade/2/sql/blacklist.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO blacklist (id, uid, memo, created_at, updated_at) (SELECT c_blacklist_id, easy_access_id, info, NOW(), NOW() FROM c_blacklist);
-
-DROP TABLE c_blacklist;
diff --git a/data/upgrade/2/sql/community_config.sql b/data/upgrade/2/sql/community_config.sql
deleted file mode 100644
index 215062116..000000000
--- a/data/upgrade/2/sql/community_config.sql
+++ /dev/null
@@ -1,26 +0,0 @@
-INSERT INTO community_config (community_id, name, value, created_at, updated_at) (SELECT c_commu_id, "description", info, r_datetime, u_datetime FROM c_commu);
-
-<?php if ('2.12' == sfConfig::get('op_upgrade2_version')): ?>
-INSERT INTO community_config (community_id, name, value, created_at, updated_at) (SELECT c_commu_id, "topic_authority", topic_authority, r_datetime, u_datetime FROM c_commu);
-
-INSERT INTO community_config (community_id, name, value, created_at, updated_at) (SELECT c_commu_id, "register_poricy", "open", r_datetime, u_datetime FROM c_commu WHERE public_flag = "public");
-INSERT INTO community_config (community_id, name, value, created_at, updated_at) (SELECT c_commu_id, "public_flag", "public", r_datetime, u_datetime FROM c_commu WHERE public_flag = "public");
-
-INSERT INTO community_config (community_id, name, value, created_at, updated_at) (SELECT c_commu_id, "register_poricy", "close", r_datetime, u_datetime FROM c_commu WHERE public_flag = "auth_public");
-INSERT INTO community_config (community_id, name, value, created_at, updated_at) (SELECT c_commu_id, "public_flag", "public", r_datetime, u_datetime FROM c_commu WHERE public_flag = "auth_public");
-
-INSERT INTO community_config (community_id, name, value, created_at, updated_at) (SELECT c_commu_id, "register_poricy", "close", r_datetime, u_datetime FROM c_commu WHERE public_flag = "auth_sns");
-INSERT INTO community_config (community_id, name, value, created_at, updated_at) (SELECT c_commu_id, "public_flag", "public", r_datetime, u_datetime FROM c_commu WHERE public_flag = "auth_sns");
-
-INSERT INTO community_config (community_id, name, value, created_at, updated_at) (SELECT c_commu_id, "register_poricy", "close", r_datetime, u_datetime FROM c_commu WHERE public_flag = "auth_commu_member");
-INSERT INTO community_config (community_id, name, value, created_at, updated_at) (SELECT c_commu_id, "public_flag", "auth_commu_member", r_datetime, u_datetime FROM c_commu WHERE public_flag = "auth_commu_member");
-<?php else: ?>
-INSERT INTO community_config (community_id, name, value, created_at, updated_at) (SELECT c_commu_id, "register_poricy", "open", r_datetime, u_datetime FROM c_commu WHERE is_admit = "public");
-INSERT INTO community_config (community_id, name, value, created_at, updated_at) (SELECT c_commu_id, "register_poricy", "close", r_datetime, u_datetime FROM c_commu WHERE is_admit = "auth");
-INSERT INTO community_config (community_id, name, value, created_at, updated_at) (SELECT c_commu_id, "public_flag", "public", r_datetime, u_datetime FROM c_commu WHERE is_open = "public");
-INSERT INTO community_config (community_id, name, value, created_at, updated_at) (SELECT c_commu_id, "public_flag", "auth_commu_member", r_datetime, u_datetime FROM c_commu WHERE is_open = "member");
-
-INSERT INTO community_config (community_id, name, value, created_at, updated_at) (SELECT c_commu_id, "topic_authority", "public", r_datetime, u_datetime FROM c_commu WHERE is_topic = "member");
-INSERT INTO community_config (community_id, name, value, created_at, updated_at) (SELECT c_commu_id, "topic_authority", "public", r_datetime, u_datetime FROM c_commu WHERE is_topic = "public");
-INSERT INTO community_config (community_id, name, value, created_at, updated_at) (SELECT c_commu_id, "topic_authority", "admin_only", r_datetime, u_datetime FROM c_commu WHERE is_topic = "admin_only");
-<?php endif; ?>
diff --git a/data/upgrade/2/sql/community_member.sql b/data/upgrade/2/sql/community_member.sql
deleted file mode 100644
index 5763a01c3..000000000
--- a/data/upgrade/2/sql/community_member.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-INSERT INTO community_member (id, community_id, member_id, is_receive_mail_pc, is_receive_mail_mobile, created_at, updated_at) (SELECT c_commu_member_id, c_commu_id, c_member_id, is_receive_mail_pc, is_receive_mail, r_datetime, r_datetime FROM c_commu_member);
-
-INSERT INTO community_member_position (id, community_id, member_id, community_member_id, name, created_at, updated_at) (SELECT c_commu_member_id, c_commu.c_commu_id, c_member_id, c_commu_member_id, "admin", NOW(), NOW() FROM c_commu_member, c_commu WHERE c_member_id = c_commu.c_member_id_admin AND c_commu_member.c_commu_id = c_commu.c_commu_id);
-INSERT INTO community_member_position (id, community_id, member_id, community_member_id, name, created_at, updated_at) (SELECT c_commu_member_id, c_commu.c_commu_id, c_member_id, c_commu_member_id, "sub_admin", NOW(), NOW() FROM c_commu_member, c_commu WHERE c_member_id = c_commu.c_member_id_sub_admin AND c_commu_member.c_commu_id = c_commu.c_commu_id);
diff --git a/data/upgrade/2/sql/community_topic.sql b/data/upgrade/2/sql/community_topic.sql
deleted file mode 100644
index 05de4a6cb..000000000
--- a/data/upgrade/2/sql/community_topic.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-INSERT INTO community_topic (id, community_id, member_id, name, body, topic_updated_at, created_at, updated_at) (SELECT c_commu_topic_id, c_commu_id, c_member_id, name, "", u_datetime, r_datetime, r_datetime FROM c_commu_topic WHERE event_flag = 0);
-UPDATE community_topic,c_commu_topic_comment SET community_topic.body = c_commu_topic_comment.body WHERE community_topic.id = c_commu_topic_comment.c_commu_topic_id AND c_commu_topic_comment.number = 0;
-INSERT INTO community_topic_comment (id, community_topic_id, member_id, number, body, created_at, updated_at) (SELECT c_commu_topic_comment_id, c_commu_topic_id, c_member_id, number, body, r_datetime, r_datetime FROM c_commu_topic_comment WHERE c_commu_topic_comment.number <> 0 AND c_commu_topic_id IN (SELECT c_commu_topic_id FROM c_commu_topic WHERE event_flag = 0));
-
-<?php
-$area = $this->conn->expression->concat('(SELECT c_profile_pref.pref FROM c_profile_pref WHERE c_profile_pref.c_profile_pref_id = open_pref_id)', '" "' , 'open_pref_comment');
-?>
-
-INSERT INTO community_event (id, community_id, member_id, name, body, event_updated_at, created_at, updated_at, open_date, open_date_comment, area, application_deadline, capacity) (SELECT c_commu_topic_id, c_commu_id, c_member_id, name, "", u_datetime, r_datetime, r_datetime, open_date, open_date_comment, <?php echo $area ?>, invite_period, capacity FROM c_commu_topic WHERE event_flag = 1);
-UPDATE community_event,c_commu_topic_comment SET community_event.body = c_commu_topic_comment.body WHERE community_event.id = c_commu_topic_comment.c_commu_topic_id AND c_commu_topic_comment.number = 0;
-INSERT INTO community_event_comment (id, community_event_id, member_id, number, body, created_at, updated_at) (SELECT c_commu_topic_comment_id, c_commu_topic_id, c_member_id, number, body, r_datetime, r_datetime FROM c_commu_topic_comment WHERE c_commu_topic_comment.number <> 0 AND c_commu_topic_id IN (SELECT c_commu_topic_id FROM c_commu_topic WHERE event_flag = 1));
-
-INSERT INTO community_event_member (id, community_event_id, member_id, created_at, updated_at) (SELECT c_event_member_id, c_commu_topic_id, c_member_id, r_datetime, r_datetime FROM c_event_member);
-
-<?php for ($i = 1; $i <= 3; $i++): ?>
-ALTER TABLE c_commu_topic_comment CHANGE image_filename<?php echo $i ?> image_filename<?php echo $i ?> text CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-INSERT INTO community_topic_image (post_id, file_id, number) (SELECT c_commu_topic_id, <?php echo $this->getSQLForFileId('image_filename'.$i) ?>, <?php echo $i ?> FROM c_commu_topic_comment WHERE image_filename<?php echo $i ?> <> "" AND number = 0 AND c_commu_topic_id IN (SELECT c_commu_topic_id FROM c_commu_topic WHERE event_flag = 0));
-INSERT INTO community_topic_comment_image (post_id, file_id, number) (SELECT c_commu_topic_comment_id, <?php echo $this->getSQLForFileId('image_filename'.$i) ?>, <?php echo $i ?> FROM c_commu_topic_comment WHERE image_filename<?php echo $i ?> <> "" AND number <> 0 AND c_commu_topic_id IN (SELECT c_commu_topic_id FROM c_commu_topic WHERE event_flag = 0));
-INSERT INTO community_event_image (post_id, file_id, number) (SELECT c_commu_topic_id, <?php echo $this->getSQLForFileId('image_filename'.$i) ?>, <?php echo $i ?> FROM c_commu_topic_comment WHERE image_filename<?php echo $i ?> <> "" AND number = 0 AND c_commu_topic_id IN (SELECT c_commu_topic_id FROM c_commu_topic WHERE event_flag = 1));
-INSERT INTO community_event_comment_image (post_id, file_id, number) (SELECT c_commu_topic_comment_id, <?php echo $this->getSQLForFileId('image_filename'.$i) ?>, <?php echo $i ?> FROM c_commu_topic_comment WHERE image_filename<?php echo $i ?> <> "" AND number <> 0 AND c_commu_topic_id IN (SELECT c_commu_topic_id FROM c_commu_topic WHERE event_flag = 1));
-<?php endfor; ?>
-
-DROP TABLE c_commu_topic;
-DROP TABLE c_commu_topic_comment;
-DROP TABLE c_profile_pref;
diff --git a/data/upgrade/2/sql/confirmation.sql b/data/upgrade/2/sql/confirmation.sql
deleted file mode 100644
index 60e9fe79b..000000000
--- a/data/upgrade/2/sql/confirmation.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-INSERT INTO community_member_position (id, community_id, member_id, community_member_id, name, created_at, updated_at) (SELECT NULL, c_commu_id, c_member_id_to, (SELECT cm.id FROM community_member AS cm WHERE cm.community_id = c_commu_id AND cm.member_id = c_member_id_to LIMIT 1), "admin_confirm", r_datetime, r_datetime FROM c_commu_admin_confirm);
-INSERT INTO community_member_position (id, community_id, member_id, community_member_id, name, created_at, updated_at) (SELECT NULL, c_commu_id, c_member_id_to, (SELECT cm.id FROM community_member AS cm WHERE cm.community_id = c_commu_id AND cm.member_id = c_member_id_to LIMIT 1), "sub_admin_confirm", r_datetime, r_datetime FROM c_commu_sub_admin_confirm);
-
-INSERT INTO community_member (id, community_id, member_id, is_pre, is_receive_mail_pc, is_receive_mail_mobile, created_at, updated_at) (SELECT NULL, c_commu_id, c_member_id, 1, 0, 0, r_datetime, r_datetime FROM c_commu_member_confirm);
-
-DROP TABLE c_commu_admin_confirm;
-DROP TABLE c_commu_member_confirm;
diff --git a/data/upgrade/2/sql/decoration.sql b/data/upgrade/2/sql/decoration.sql
deleted file mode 100644
index 37a7cf90d..000000000
--- a/data/upgrade/2/sql/decoration.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$result = array();
-
-foreach ($this->conn->fetchColumn('SELECT tagname FROM c_config_decoration WHERE is_enabled = 0') as $item)
-{
-  $result[] = str_replace(':', '_', $item);
-}
-?>
-
-INSERT INTO sns_config (id, name, value) VALUES (NULL, "richtextarea_unenable_buttons", <?php echo $this->conn->quote(serialize($result)) ?>);
diff --git a/data/upgrade/2/sql/diary.sql b/data/upgrade/2/sql/diary.sql
deleted file mode 100644
index 84b760de3..000000000
--- a/data/upgrade/2/sql/diary.sql
+++ /dev/null
@@ -1,21 +0,0 @@
-INSERT INTO diary (id, member_id, title, body, public_flag, has_images, created_at, updated_at) (SELECT c_diary_id, c_member_id, subject, body, public_flag, 1, r_datetime, u_datetime FROM c_diary WHERE image_filename_1 <> "" OR image_filename_2 <> "" OR image_filename_3 <> "");
-INSERT INTO diary (id, member_id, title, body, public_flag, has_images, created_at, updated_at) (SELECT c_diary_id, c_member_id, subject, body, public_flag, 0, r_datetime, u_datetime FROM c_diary WHERE image_filename_1 = "" AND image_filename_2 = "" AND image_filename_3 = "");
-<?php for ($i = 1; $i <= 3; $i++): ?>
-ALTER TABLE c_diary CHANGE image_filename_<?php echo $i ?> image_filename_<?php echo $i ?> text CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-INSERT INTO diary_image (diary_id, file_id, number) (SELECT c_diary_id, <?php echo $this->getSQLForFileId('image_filename_'.$i) ?>, <?php echo $i ?> FROM c_diary WHERE image_filename_<?php echo $i ?> <> "");
-<?php endfor; ?>
-
-INSERT INTO diary_comment_unread (diary_id, member_id) (SELECT c_diary_id, c_member_id FROM c_diary WHERE is_checked = 0);
-
-INSERT INTO diary_comment (id, diary_id, member_id, number, body, created_at, updated_at) (SELECT c_diary_comment_id, c_diary_id, c_member_id, number, body, r_datetime, r_datetime FROM c_diary_comment);
-<?php for ($i = 1; $i <= 3; $i++): ?>
-ALTER TABLE c_diary_comment CHANGE image_filename_<?php echo $i ?> image_filename_<?php echo $i ?> text CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-INSERT INTO diary_comment_image (diary_comment_id, file_id) (SELECT c_diary_comment_id, <?php echo $this->getSQLForFileId('image_filename_'.$i) ?> FROM c_diary_comment WHERE image_filename_<?php echo $i ?> <> "");
-<?php endfor; ?>
-
-INSERT INTO diary_comment_update (member_id, diary_id, last_comment_time, my_last_comment_time) (SELECT c_member_id, c_diary_id, MAX(r_datetime), MAX(r_datetime) FROM c_diary_comment_log WHERE c_diary_id IN (SELECT diary.id FROM diary WHERE diary.id = c_diary_id) GROUP BY c_member_id, c_diary_id);
-
-DROP TABLE c_diary;
-DROP TABLE c_diary_comment;
-DROP TABLE c_diary_comment_log;
-
diff --git a/data/upgrade/2/sql/favorite.sql b/data/upgrade/2/sql/favorite.sql
deleted file mode 100644
index 74c662776..000000000
--- a/data/upgrade/2/sql/favorite.sql
+++ /dev/null
@@ -1 +0,0 @@
-INSERT INTO favorite (id, member_id_to, member_id_from, created_at, updated_at) (SELECT c_bookmark_id, c_member_id_to, c_member_id_from, r_datetime, r_datetime FROM c_bookmark);
diff --git a/data/upgrade/2/sql/files.sql b/data/upgrade/2/sql/files.sql
deleted file mode 100644
index 4f1956055..000000000
--- a/data/upgrade/2/sql/files.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-INSERT IGNORE INTO file (id, name, type, original_filename, created_at, updated_at) (SELECT c_image_id, filename, type, filename, r_datetime, r_datetime FROM c_image);
-INSERT IGNORE INTO file_bin (file_id, bin, created_at, updated_at) (SELECT c_image_id, bin, r_datetime, r_datetime FROM c_image);
-
-DROP TABLE c_image;
diff --git a/data/upgrade/2/sql/fix_community_topic_comment_image.sql b/data/upgrade/2/sql/fix_community_topic_comment_image.sql
deleted file mode 100644
index 9ea107544..000000000
--- a/data/upgrade/2/sql/fix_community_topic_comment_image.sql
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-$topic_or_event_images = $this->conn->fetchAll('SELECT id, name FROM file WHERE name LIKE "t_%";');
-$comment_images = $this->conn->fetchAll('SELECT id, name FROM file WHERE name LIKE "tc_%";');
-
-$images = array(
-  'topic' => array(),
-  'event' => array(),
-  'topic_comment' => array(),
-  'event_comment' => array(),
-);
-
-foreach ($topic_or_event_images as $v)
-{
-  if (!preg_match('/t_([0-9]+)_([0-9]+)_/', $v['name'], $matches))
-  {
-    continue;
-  }
-
-  $id = $matches[1];
-  $number = $matches[2];
-
-  if ($this->conn->fetchOne('SELECT id FROM community_topic WHERE id = ?', array($id)))
-  {
-    $images['topic'][] = array($id, $v['id'], $number);
-  }
-  elseif ($this->conn->fetchOne('SELECT id FROM community_event WHERE id = ?', array($id)))
-  {
-    $images['event'][] = array($id, $v['id'], $number);
-  }
-}
-
-unset($topic_or_event_images);
-
-foreach ($comment_images as $v)
-{
-  if (!preg_match('/tc_([0-9]+)_([0-9]+)_/', $v['name'], $matches))
-  {
-    continue;
-  }
-
-  $id = $matches[1];
-  $number = $matches[2];
-
-  if ($this->conn->fetchOne('SELECT id FROM community_topic_comment WHERE id = ?', array($id)))
-  {
-    $images['topic_comment'][] = array($id, $v['id'], $number);
-  }
-  elseif ($this->conn->fetchOne('SELECT id FROM community_event_comment WHERE id = ?', array($id)))
-  {
-    $images['event_comment'][] = array($id, $v['id'], $number);
-  }
-}
-
-unset($comment_images);
-
-$targets = array_keys($images);
-
-foreach ($targets as $target)
-{
-  if (!count($images[$target]))
-  {
-    continue;
-  }
-
-  echo 'INSERT INTO community_'.$target.'_image VALUES';
-  foreach ($images[$target] as $k => $v)
-  {
-    if ($k > 0)
-    {
-      echo ', ';
-    }
-    echo sprintf('(NULL, %d, %d, %d)', $v[0], $v[1], $v[2]);
-  }
-  echo ";\n";
-
-  unset($images[$target]);
-}
-
-?>
diff --git a/data/upgrade/2/sql/gadget.sql b/data/upgrade/2/sql/gadget.sql
deleted file mode 100644
index df5d7a8f9..000000000
--- a/data/upgrade/2/sql/gadget.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO gadget_config (id, name, gadget_id, value, created_at, updated_at) VALUES(NULL, "value", (SELECT id FROM gadget WHERE name = "informationBox" AND type = "top"), (SELECT body FROM c_siteadmin WHERE target = "h_home"), NOW(), NOW());
-INSERT INTO gadget_config (id, name, gadget_id, value, created_at, updated_at) VALUES(NULL, "value", (SELECT id FROM gadget WHERE name = "informationBox" AND type = "mobileTop"), (SELECT body FROM c_siteadmin WHERE target = "k_h_home"), NOW(), NOW());
-
diff --git a/data/upgrade/2/sql/intro_friend.sql b/data/upgrade/2/sql/intro_friend.sql
deleted file mode 100644
index ea798a453..000000000
--- a/data/upgrade/2/sql/intro_friend.sql
+++ /dev/null
@@ -1 +0,0 @@
-INSERT INTO intro_friend (id, member_id_to, member_id_from, content, created_at, updated_at) (SELECT NULL, c_member_id_to, c_member_id_from, intro, r_datetime_intro, r_datetime_intro FROM c_friend WHERE intro <> "");
diff --git a/data/upgrade/2/sql/member_basic.sql b/data/upgrade/2/sql/member_basic.sql
deleted file mode 100644
index 4766c8129..000000000
--- a/data/upgrade/2/sql/member_basic.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-INSERT INTO member (id, name, is_active, is_login_rejected, created_at, updated_at) (SELECT c_member_id, nickname, 1, is_login_rejected, r_date, u_datetime FROM c_member);
-UPDATE member, c_member SET invite_member_id = c_member_id_invite WHERE id = c_member_id AND c_member_id_invite <> 0;
-
diff --git a/data/upgrade/2/sql/member_config.sql b/data/upgrade/2/sql/member_config.sql
deleted file mode 100644
index b9364eb1c..000000000
--- a/data/upgrade/2/sql/member_config.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-INSERT INTO member_config (id, member_id, name, value, name_value_hash, created_at, updated_at) (SELECT NULL, c_member_id, "blog_url", rss, MD5(<?php echo $this->conn->expression->concat($this->conn->quote('blog_url'), $this->conn->quote(','), 'rss') ?>), NOW(), NOW() FROM c_member WHERE rss <> "");
-INSERT INTO member_config (id, member_id, name, value, name_value_hash, created_at, updated_at) (SELECT NULL, c_member_id, "age_public_flag", 1, MD5(<?php echo $this->conn->expression->concat($this->conn->quote('age_public_flag'), $this->conn->quote(','), 1) ?>), NOW(), NOW() FROM c_member WHERE public_flag_birth_year = "public");
-INSERT INTO member_config (id, member_id, name, value, name_value_hash, created_at, updated_at) (SELECT NULL, c_member_id, "age_public_flag", 2, MD5(<?php echo $this->conn->expression->concat($this->conn->quote('age_public_flag'), $this->conn->quote(','), 2) ?>), NOW(), NOW() FROM c_member WHERE public_flag_birth_year = "friend");
-INSERT INTO member_config (id, member_id, name, value, name_value_hash, created_at, updated_at) (SELECT NULL, c_member_id, "age_public_flag", 3, MD5(<?php echo $this->conn->expression->concat($this->conn->quote('age_public_flag'), $this->conn->quote(','), 3) ?>), NOW(), NOW() FROM c_member WHERE public_flag_birth_year = "private");
-INSERT INTO member_config (id, member_id, name, value_datetime, name_value_hash, created_at, updated_at) (SELECT NULL, c_member_id, "lastLogin", access_date, MD5(<?php echo $this->conn->expression->concat($this->conn->quote('lastLogin'), $this->conn->quote(',')) ?>), NOW(), NOW() FROM c_member);
-INSERT INTO member_config (id, member_id, name, value, name_value_hash, created_at, updated_at) (SELECT NULL, c_member_id, "op_ashiato_count", ashiato_count_log, MD5(<?php echo $this->conn->expression->concat($this->conn->quote('op_ashiato_count'), $this->conn->quote(','), 'ashiato_count_log') ?>), NOW(), NOW() FROM c_member);
diff --git a/data/upgrade/2/sql/member_image.sql b/data/upgrade/2/sql/member_image.sql
deleted file mode 100644
index 1b2c5c2c4..000000000
--- a/data/upgrade/2/sql/member_image.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php for ($i = 1; $i <= 3; $i++): ?>
-ALTER TABLE c_member CHANGE image_filename_<?php echo $i ?> image_filename_<?php echo $i ?> text CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-INSERT INTO member_image (id, member_id, file_id, is_primary, created_at, updated_at) (SELECT NULL, c_member_id, <?php echo $this->getSQLForFileId('image_filename_'.$i) ?>, 0, NOW(), NOW() FROM c_member WHERE image_filename_<?php echo $i ?> <> "");
-<?php endfor; ?>
-
-ALTER TABLE c_member CHANGE image_filename image_filename text CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-UPDATE member_image SET is_primary = 1 WHERE file_id = (SELECT <?php echo $this->getSQLForFileId('image_filename') ?> FROM c_member WHERE c_member_id = member_id);
-
diff --git a/data/upgrade/2/sql/member_secure.sql b/data/upgrade/2/sql/member_secure.sql
deleted file mode 100644
index 5d544b259..000000000
--- a/data/upgrade/2/sql/member_secure.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-INSERT INTO member_config (member_id, name, value, name_value_hash) (SELECT c_member_id, "password", hashed_password, MD5(<?php echo $this->conn->expression->concat($this->conn->quote('password'), $this->conn->quote(','), 'hashed_password') ?>) FROM c_member_secure);
-INSERT INTO member_config (member_id, name, value, name_value_hash) (SELECT c_member_id, "mobile_uid", easy_access_id, MD5(<?php echo $this->conn->expression->concat($this->conn->quote('mobile_uid'), $this->conn->quote(','), 'easy_access_id') ?>) FROM c_member_secure WHERE easy_access_id <> "");
-
-<?php
-$questions = array(
-  '母または父の旧姓は?' => '1',
-  '母または父の旧姓は？' => '1',
-  '運転免許証番号の下 5 桁は?' => '2',
-  '運転免許証番号の下 5 桁は？' => '2',
-  '初恋の人の名前は?' => '3',
-  '初恋の人の名前は？' => '3',
-  '卒業した小学校の名前は?' => '4',
-  '卒業した小学校の名前は？' => '4',
-  '本籍地の県名は?' => '5',
-  '本籍地の県名は？' => '5',
-);
-?>
-
-<?php foreach ($questions as $question => $id): ?>
-INSERT INTO member_config (member_id, name, value, name_value_hash) (SELECT c_member_id, "secret_question", <?php echo $id ?>, MD5(<?php echo $this->conn->expression->concat($this->conn->quote('secret_question'), $this->conn->quote(','), $id) ?>) FROM c_member_secure WHERE c_member_id IN (SELECT c_member_id FROM c_member WHERE c_password_query_id = (SELECT c_password_query_id FROM c_password_query WHERE c_password_query_question = "<?php echo $question ?>")) AND c_member_id NOT IN (SELECT member_id FROM member_config WHERE name = "secret_question"));
-<?php endforeach; ?>
-INSERT INTO member_config (member_id, name, value, name_value_hash) (SELECT c_member_id, "secret_answer", hashed_password_query_answer, MD5(<?php echo $this->conn->expression->concat($this->conn->quote('secret_answer'), $this->conn->quote(','), 'hashed_password_query_answer') ?>) FROM c_member_secure WHERE c_member_id IN (SELECT member_id FROM member_config WHERE name = "secret_question"));
diff --git a/data/upgrade/2/sql/message.sql b/data/upgrade/2/sql/message.sql
deleted file mode 100644
index 3328aa3d4..000000000
--- a/data/upgrade/2/sql/message.sql
+++ /dev/null
@@ -1,16 +0,0 @@
-INSERT INTO message (id, member_id, subject, body, is_deleted, is_send, thread_message_id, return_message_id, message_type_id, foreign_id, created_at, updated_at) (SELECT c_message_id, c_member_id_from, subject, body, is_deleted_from, is_send, NULL, hensinmoto_c_message_id, 1, NULL, r_datetime, r_datetime FROM c_message);
-UPDATE message SET is_deleted = 1 WHERE id IN (SELECT c_message_id FROM c_message WHERE is_kanzen_sakujo_from = 1);
-
-INSERT INTO message_send_list (id, member_id, message_id, is_read, is_deleted, created_at, updated_at) (SELECT c_message_id, c_member_id_to, c_message_id, is_read, is_deleted_to, r_datetime, r_datetime FROM c_message);
-UPDATE message_send_list SET is_deleted = 1 WHERE id IN (SELECT c_message_id FROM c_message WHERE is_kanzen_sakujo_to = 1);
-
-INSERT INTO deleted_message (id, member_id, message_id, message_send_list_id, is_deleted, created_at, updated_at) (SELECT NULL, c_member_id_from, c_message_id, NULL, is_kanzen_sakujo_from, NOW(), NOW() FROM c_message WHERE is_deleted_from = 1 OR is_kanzen_sakujo_from = 1);
-INSERT INTO deleted_message (id, member_id, message_id, message_send_list_id, is_deleted, created_at, updated_at) (SELECT NULL, c_member_id_to, NULL, c_message_id, is_kanzen_sakujo_to, NOW(), NOW() FROM c_message WHERE is_deleted_to = 1 OR is_kanzen_sakujo_to = 1);
-
-<?php foreach (array('image_filename_1', 'image_filename_2', 'image_filename_3') as $v): ?>
-ALTER TABLE c_message CHANGE <?php echo $v ?> <?php echo $v ?> text CHARACTER SET utf8 COLLATE utf8_unicode_ci;
-INSERT INTO message_file (id, message_id, file_id, created_at, updated_at) (SELECT NULL, c_message_id, <?php echo $this->getSQLForFileId($v) ?>, NOW(), NOW() FROM c_message WHERE <?php echo $v ?> <> '');
-<?php endforeach; ?>
-
-DROP TABLE c_message;
-
diff --git a/data/upgrade/2/sql/mobile_color_config.sql b/data/upgrade/2/sql/mobile_color_config.sql
deleted file mode 100644
index 137e6e3ca..000000000
--- a/data/upgrade/2/sql/mobile_color_config.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-$nums = array(
-  1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-  17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
-);
-?>
-
-<?php foreach ($nums as $num): ?>
-INSERT INTO sns_config (id, name, value) (SELECT NULL, "mobile_frontend_core_color_<?php echo $num ?>", CONCAT("#", color_<?php echo $num ?>) FROM c_config_color_ktai LIMIT 1);
-<?php endforeach; ?>
-
-DROP TABLE c_config_color_ktai;
diff --git a/data/upgrade/2/sql/mobile_uid_bc_config.sql b/data/upgrade/2/sql/mobile_uid_bc_config.sql
deleted file mode 100644
index c0982df2d..000000000
--- a/data/upgrade/2/sql/mobile_uid_bc_config.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-INSERT INTO sns_config (name, value) VALUES ("op_auth_MobileUID_plugin_uid_type", "0");
-INSERT INTO sns_config (name, value) VALUES ("op_auth_MobileUID_plugin_allow_fallback_uid", "1");

From d75128485ea4791183f5bf9dda84aae80b17d59e Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 12 Apr 2012 19:58:46 +0900
Subject: [PATCH 233/630] replace javascript code using prototype.js in
 opWidgetFormRichTextarea (fixes #2949,BP from #2948)

---
 lib/widget/opWidgetFormRichTextarea.class.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/widget/opWidgetFormRichTextarea.class.php b/lib/widget/opWidgetFormRichTextarea.class.php
index b0dced416..e3ad8fc55 100644
--- a/lib/widget/opWidgetFormRichTextarea.class.php
+++ b/lib/widget/opWidgetFormRichTextarea.class.php
@@ -80,28 +80,28 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
     $onId  = $id.'_changer_2';
     if (self::$isFirstRender)
     {
-      sfContext::getInstance()->getResponse()->addJavascript('/sfProtoculousPlugin/js/prototype');
+      sfContext::getInstance()->getResponse()->addJavascript('jquery.min.js');
       sfContext::getInstance()->getResponse()->addJavascript('tiny_mce/tiny_mce');
       $js .= <<<EOF
   function op_toggle_mce_editor(id)
   {
-    var textmode_checked    = $(id + "_changer_1").checked;
-    var previewmode_checked = $(id + "_changer_2").checked;
-    var relational_objects  = $$("." + id);
+    var textmode_checked    = $("#" + id + "_changer_1").is(":checked");
+    var previewmode_checked = $("#" + id + "_changer_2").is(":checked");
+    var relational_objects  = $("." + id);
     var editor = tinyMCE.get(id);
     if (!editor) {
       if (previewmode_checked) {
         tinyMCE.execCommand('mceAddControl', false, id);
-        relational_objects.each(function(object){ object.style.display = "none"; });
+        relational_objects.each(function(object){ object.hide(); });
       }
       return true;
     }
     if (editor.isHidden() && previewmode_checked) {
       editor.show();
-      relational_objects.each(function(object){ object.style.display = "none"; });
+      relational_objects.each(function(object){ object.hide(); });
     } else if (!editor.isHidden() && textmode_checked) {
       editor.hide();
-      relational_objects.each(function(object){ object.style.display = "block"; });
+      relational_objects.each(function(object){ object.show(); });
     }
   }
 

From aa8b5ec221711128aebd7bf93625e52c169a0194 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 19 Apr 2012 19:48:08 +0900
Subject: [PATCH 234/630] rewrite javascript code using prototype.js (fixes
 #2949, BP from #2948)

---
 .../templates/_richTextareaOpenPNEButton.php  |   2 +-
 lib/widget/opWidgetFormRichTextarea.class.php |   6 +-
 .../opWidgetFormRichTextareaOpenPNE.class.php |   5 +-
 web/js/decoration.js                          |  17 ++-
 web/js/decoration.js.src                      | 127 ++++++++++--------
 web/js/op_emoji.js                            |  28 ++--
 web/js/op_emoji.js.src                        |  91 +++++--------
 .../tiny_mce/plugins/openpne/editor_plugin.js |   9 +-
 .../plugins/openpne/editor_plugin.js.src      |  12 +-
 9 files changed, 139 insertions(+), 158 deletions(-)

diff --git a/apps/pc_frontend/templates/_richTextareaOpenPNEButton.php b/apps/pc_frontend/templates/_richTextareaOpenPNEButton.php
index 41048d299..e46042801 100644
--- a/apps/pc_frontend/templates/_richTextareaOpenPNEButton.php
+++ b/apps/pc_frontend/templates/_richTextareaOpenPNEButton.php
@@ -7,4 +7,4 @@
 ?> return false;">
 <?php echo op_image_tag($config['imageURL'], array('alt' => '')) ?></a>
 <?php endforeach; ?>
-<?php echo javascript_tag('opEmoji.getInstance("'.$id.'").createEmojiPallet();'); ?>
+<?php echo javascript_tag('$(function(){ $("#'.$id.'").opEmoji(); });'); ?>
diff --git a/lib/widget/opWidgetFormRichTextarea.class.php b/lib/widget/opWidgetFormRichTextarea.class.php
index e3ad8fc55..fd8a2c072 100644
--- a/lib/widget/opWidgetFormRichTextarea.class.php
+++ b/lib/widget/opWidgetFormRichTextarea.class.php
@@ -92,16 +92,16 @@ function op_toggle_mce_editor(id)
     if (!editor) {
       if (previewmode_checked) {
         tinyMCE.execCommand('mceAddControl', false, id);
-        relational_objects.each(function(object){ object.hide(); });
+        relational_objects.hide();
       }
       return true;
     }
     if (editor.isHidden() && previewmode_checked) {
       editor.show();
-      relational_objects.each(function(object){ object.hide(); });
+      relational_objects.hide();
     } else if (!editor.isHidden() && textmode_checked) {
       editor.hide();
-      relational_objects.each(function(object){ object.show(); });
+      relational_objects.show();
     }
   }
 
diff --git a/lib/widget/opWidgetFormRichTextareaOpenPNE.class.php b/lib/widget/opWidgetFormRichTextareaOpenPNE.class.php
index edecc8fa8..682730761 100644
--- a/lib/widget/opWidgetFormRichTextareaOpenPNE.class.php
+++ b/lib/widget/opWidgetFormRichTextareaOpenPNE.class.php
@@ -36,7 +36,7 @@ class opWidgetFormRichTextareaOpenPNE extends opWidgetFormRichTextarea
   static protected $useButtons = null;
 
   static protected $buttonOnclickActions = array(
-    'op_emoji_docomo' => 'opEmoji.getInstance("%id%").togglePallet("epDocomo");',
+    'op_emoji_docomo' => '$("#%id%").opEmoji("togglePallet", "epDocomo");',
     'op_large' => 'op_mce_insert_tagname("%id%", "op:font", \' size="5"\');',
     'op_small' => 'op_mce_insert_tagname("%id%", "op:font", \' size="1"\');',
     'op_color' => 'op_mce_show_color_table("%id%", "op:font");'
@@ -227,7 +227,8 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
     if (self::$isFirstRenderOpenPNE)
     {
       sfProjectConfiguration::getActive()->loadHelpers('Partial');
-      sfContext::getInstance()->getResponse()->addJavascript('/sfProtoculousPlugin/js/prototype');
+      sfContext::getInstance()->getResponse()->addJavascript('jquery.min.js');
+      sfContext::getInstance()->getResponse()->addJavascript('jquery-ui.min.js');
       sfContext::getInstance()->getResponse()->addJavascript('op_emoji');
       sfContext::getInstance()->getResponse()->addJavascript('Selection');
       sfContext::getInstance()->getResponse()->addJavascript('decoration');
diff --git a/web/js/decoration.js b/web/js/decoration.js
index 8ed400c28..19d87a647 100644
--- a/web/js/decoration.js
+++ b/web/js/decoration.js
@@ -1,14 +1,13 @@
-
 function op_mce_insert_tagname(id,tagname,opt,start,end)
 {opt=opt||"";var elm=document.getElementById(id);var selection=new Selection(elm);var pos=selection.create();elm.focus();start=(start==null||start==undefined)?pos.start:start;end=(end==null||end==undefined)?pos.end:end;var replace="<"+tagname+opt+">"+elm.value.substring(start,end)+"</"+tagname+">";var head=elm.value.substring(0,start);var tail=elm.value.substring(end,elm.value.length);elm.value=head+replace+tail;}
 function op_mce_show_color_table(id,tagname)
-{var table=document.getElementById(id+"_color_table");var button=document.getElementById(id+"_button_op_color");var button_container=document.getElementById(id+"_buttonmenu");function close_color_table(e)
-{if(e&&Element.hasClassName(e.element(),'disabledHideColorTable')){return;}
-table.hide();Event.stopObserving(document,'mousedown',close_color_table);}
-if(table){if(!table.visible()){table.style.display='block';Event.observe(document,'mousedown',close_color_table);}
+{var table=$("#"+id+"_color_table");var button=$("#"+id+"_button_op_color");var button_container=$("#"+id+"_buttonmenu");function close_color_table(e)
+{if(e&&$(this).hasClass('disabledHideColorTable')){return;}
+table.hide();$(document).unbind('mousedown',close_color_table);}
+if(table.length>0){if(table.is(':hidden')){table.show();$(document).bind('mousedown',close_color_table);}
 return;}
-Event.observe(document,'mousedown',close_color_table);var color=null;var settings={colors:["000000","993300","333300","003300","003366","000080","333399","333333","800000","FF6600","808000","008000","008080","0000FF","666699","808080","FF0000","FF9900","99CC00","339966","33CCCC","3366FF","800080","999999","FF00FF","FFCC00","FFFF00","00FF00","00FFFF","00CCFF","993366","C0C0C0","FF99CC","FFCC99","FFFF99","CCFFCC","CCFFFF","99CCFF","CC99FF","FFFFFF"],grid_width:8,default_color:"#888888"};var tbody=document.createElement("tbody");Element.addClassName(tbody,'disabledHideColorTable');var tr;for(var i=0;i<settings.colors.length;i++){var code="#"+settings.colors[i];if(i===0||i%settings.grid_width===0){tr=document.createElement("tr");Element.addClassName(tr,'disabledHideColorTable');tbody.appendChild(tr);}
-var td=document.createElement("td");td.style.border="0 none";td.style.width="12px";td.style.padding="2px";td.style.margin="0";Element.addClassName(td,'disabledHideColorTable');var a=document.createElement("a");a.setAttribute("href","#");a.colorCode=code;a.style.width="9px";a.style.height="9px";a.style.display="block";a.style.overflow="hidden";a.style.border="1px solid #808080";a.style.backgroundColor="#"+settings.colors[i];Element.addClassName(a,'disabledHideColorTable');a.onmousedown=function(){op_mce_insert_tagname(id,tagname,' color="'+this.colorCode+'"');close_color_table();return false;};var span=document.createElement("span");span.style.display="none";span.appendChild(document.createTextNode(code));a.appendChild(span);td.appendChild(a);tr.appendChild(td);}
-table=document.createElement("table");table.id=id+"_color_table";table.style.width="auto";table.style.position="absolute";table.style.zIndex=150;table.style.border="1px solid gray";table.style.backgroundColor="#fff";table.appendChild(tbody);Element.addClassName(table,'disabledHideColorTable');button_container.appendChild(table);button_container.style.position="relative";button.style.display="inline-block";var buttonContainerPosition=Position.cumulativeOffset(button_container);var buttonPosition=Position.cumulativeOffset(button);table.style.left=buttonPosition[0]-buttonContainerPosition[0]+"px";table.style.top=buttonPosition[1]-buttonContainerPosition[1]+button.offsetHeight+"px";}
+$(document).bind('mousedown',close_color_table);var color=null;var settings={colors:["000000","993300","333300","003300","003366","000080","333399","333333","800000","FF6600","808000","008000","008080","0000FF","666699","808080","FF0000","FF9900","99CC00","339966","33CCCC","3366FF","800080","999999","FF00FF","FFCC00","FFFF00","00FF00","00FFFF","00CCFF","993366","C0C0C0","FF99CC","FFCC99","FFFF99","CCFFCC","CCFFFF","99CCFF","CC99FF","FFFFFF"],grid_width:8,default_color:"#888888"};var tbody=$("<tbody>",{"class":"disabledHideColorTable"});var tr;for(var i=0;i<settings.colors.length;i++){var code="#"+settings.colors[i];if(i===0||i%settings.grid_width===0){tr=$("<tr>",{"class":"disabledHideColorTable"});tbody.append(tr);}
+var td=$("<td>",{"class":"disabledHideColorTable",css:{border:"0 none",width:"12px",padding:"2px",margin:"0"}});var a=$("<a>",{href:"#",data:{colorCode:code},"class":"disabledHideColorTable",css:{width:"9px",height:"9px",display:"block",overflow:"hidden",border:"1px solid #808080",backgroundColor:"#"+settings.colors[i]}});a.mousedown(function(){op_mce_insert_tagname(id,tagname,' color="'+$(this).data('colorCode')+'"');close_color_table();return false;});var span=$("<span>",{css:{display:"none"}});span.append(document.createTextNode(code));a.append(span);td.append(a);tr.append(td);}
+table=$("<table>",{id:id+"_color_table","class":"disabledHideColorTable",css:{width:"auto",position:"absolute",zIndex:150,border:"1px solid gray",backgroundColor:"#fff"}});table.append(tbody);button_container.append(table);button_container.css("position","relative");button.css("display","inline-block");var buttonContainerPosition=button_container.offset();var buttonPosition=button.offset();table.css("left",buttonPosition.left-buttonContainerPosition.left+"px");table.css("top",buttonPosition.top-buttonContainerPosition.top+button.offsetHeight+"px");}
 function op_insert_str_to_selection(elm,str,start,end)
-{var selection=new Selection(elm);var pos=selection.create();elm.focus();start=(start==null||start==undefined)?pos.start:start;end=(end==null||end==undefined)?pos.end:end;var head=elm.value.substring(0,pos.start);var tail=elm.value.substring(pos.end,elm.value.length);elm.value=head+str+tail;}
\ No newline at end of file
+{var selection=new Selection(elm);var pos=selection.create();elm.focus();start=(start==null||start==undefined)?pos.start:start;end=(end==null||end==undefined)?pos.end:end;var head=elm.value.substring(0,pos.start);var tail=elm.value.substring(pos.end,elm.value.length);elm.value=head+str+tail;}
diff --git a/web/js/decoration.js.src b/web/js/decoration.js.src
index 2c7003090..b765dd512 100644
--- a/web/js/decoration.js.src
+++ b/web/js/decoration.js.src
@@ -10,6 +10,7 @@
  * decoration.js
  * 
  * @author Shogo Kawahara <kawahara@tejimaya.net>
+ * @author Kimura Youichi <kim.upsilon@bucyou.net>
  */
 
 function op_mce_insert_tagname(id, tagname, opt, start, end)
@@ -34,29 +35,29 @@ function op_mce_insert_tagname(id, tagname, opt, start, end)
 
 function op_mce_show_color_table(id, tagname)
 {
-  var table = document.getElementById(id + "_color_table");
-  var button = document.getElementById(id + "_button_op_color");
-  var button_container = document.getElementById(id + "_buttonmenu");
+  var table = $("#" + id + "_color_table");
+  var button = $("#" + id + "_button_op_color");
+  var button_container = $("#" + id + "_buttonmenu");
 
   function close_color_table(e)
   {
-    if (e && Element.hasClassName(e.element(), 'disabledHideColorTable')) {
+    if (e && $(this).hasClass('disabledHideColorTable')) {
       return;
     }
 
     table.hide();
-    Event.stopObserving(document, 'mousedown', close_color_table);
+    $(document).unbind('mousedown', close_color_table);
   }
 
-  if (table) {
-    if (!table.visible()) {
-      table.style.display = 'block';
-      Event.observe(document, 'mousedown', close_color_table);
+  if (table.length > 0) {
+    if (table.is(':hidden')) {
+      table.show();
+      $(document).bind('mousedown', close_color_table);
     }
     return;
   }
 
-  Event.observe(document, 'mousedown', close_color_table);
+  $(document).bind('mousedown', close_color_table);
 
   var color = null;
   var settings = {
@@ -65,8 +66,7 @@ function op_mce_show_color_table(id, tagname)
     default_color : "#888888"
   };
 
-  var tbody = document.createElement("tbody");
-  Element.addClassName(tbody, 'disabledHideColorTable');
+  var tbody = $("<tbody>", { "class": "disabledHideColorTable" });
 
   var tr;
 
@@ -74,61 +74,70 @@ function op_mce_show_color_table(id, tagname)
     var code = "#" + settings.colors[i];
 
     if (i === 0 || i % settings.grid_width === 0) {
-      tr = document.createElement("tr");
-      Element.addClassName(tr, 'disabledHideColorTable');
-      tbody.appendChild(tr);
+      tr = $("<tr>", { "class": "disabledHideColorTable" });
+      tbody.append(tr);
     }
 
-    var td = document.createElement("td");
-    td.style.border = "0 none";
-    td.style.width = "12px";
-    td.style.padding = "2px";
-    td.style.margin = "0";
-    Element.addClassName(td, 'disabledHideColorTable');
-
-    var a = document.createElement("a");
-    a.setAttribute("href", "#");
-    a.colorCode = code;
-    a.style.width = "9px";
-    a.style.height = "9px";
-    a.style.display = "block";
-    a.style.overflow = "hidden";
-    a.style.border = "1px solid #808080";
-    a.style.backgroundColor = "#" + settings.colors[i];
-    Element.addClassName(a, 'disabledHideColorTable');
-    a.onmousedown = function() {
-      op_mce_insert_tagname(id, tagname, ' color="' + this.colorCode + '"');
+    var td = $("<td>", {
+      "class": "disabledHideColorTable",
+      css: {
+        border: "0 none",
+        width: "12px",
+        padding: "2px",
+        margin: "0"
+      }
+    });
+
+    var a = $("<a>", {
+      href: "#",
+      data: { colorCode: code },
+      "class": "disabledHideColorTable",
+      css: {
+        width: "9px",
+        height: "9px",
+        display: "block",
+        overflow: "hidden",
+        border: "1px solid #808080",
+        backgroundColor: "#" + settings.colors[i]
+      }
+    });
+    a.mousedown(function() {
+      op_mce_insert_tagname(id, tagname, ' color="' + $(this).data('colorCode') + '"');
       close_color_table();
       return false;
-    };
+    });
 
-    var span = document.createElement("span");
-    span.style.display = "none";
-    span.appendChild(document.createTextNode(code));
+    var span = $("<span>", {
+      css: { display: "none" }
+    });
+    span.append(document.createTextNode(code));
 
-    a.appendChild(span);
-    td.appendChild(a);
-    tr.appendChild(td);
+    a.append(span);
+    td.append(a);
+    tr.append(td);
   }
 
-  table = document.createElement("table");
-  table.id = id + "_color_table";
-  table.style.width = "auto";
-  table.style.position = "absolute";
-  table.style.zIndex = 150;
-  table.style.border = "1px solid gray";
-  table.style.backgroundColor = "#fff";
-  table.appendChild(tbody);
-  Element.addClassName(table, 'disabledHideColorTable');
-
-  button_container.appendChild(table);
-  button_container.style.position = "relative";
-  button.style.display = "inline-block";
-
-  var buttonContainerPosition = Position.cumulativeOffset(button_container);
-  var buttonPosition = Position.cumulativeOffset(button);
-  table.style.left = buttonPosition[0] - buttonContainerPosition[0] + "px";
-  table.style.top  = buttonPosition[1] - buttonContainerPosition[1] + button.offsetHeight + "px";
+  table = $("<table>", {
+    id: id + "_color_table",
+    "class": "disabledHideColorTable",
+    css: {
+      width: "auto",
+      position: "absolute",
+      zIndex: 150,
+      border: "1px solid gray",
+      backgroundColor: "#fff"
+    }
+  });
+  table.append(tbody);
+
+  button_container.append(table);
+  button_container.css("position", "relative");
+  button.css("display", "inline-block");
+
+  var buttonContainerPosition = button_container.offset();
+  var buttonPosition = button.offset();
+  table.css("left", buttonPosition.left - buttonContainerPosition.left + "px");
+  table.css("top",  buttonPosition.top - buttonContainerPosition.top + button.offsetHeight + "px");
 }
 
 function op_insert_str_to_selection(elm, str, start, end)
diff --git a/web/js/op_emoji.js b/web/js/op_emoji.js
index dfc7c3699..69cd9fb5b 100644
--- a/web/js/op_emoji.js
+++ b/web/js/op_emoji.js
@@ -1,18 +1,12 @@
-
-var opEmoji=Class.create();opEmoji.prototype={id:null,useAu:false,useSb:false,palletList:{docomo:{id:"epDocomo",emoji:[{start:1,end:252}],shortname:"i"},au:{id:"epAu",emoji:[{start:1,end:518},{start:700,end:822}],shortname:"e"},softbank:{id:"epSb",emoji:[{start:1,end:485}],shortname:"s"}},initialize:function(id)
-{this.id=id;},createEmojiPallet:function()
-{document.write('<div id="'+this.id+'_epDocomo" style="display:none;"></div>');if(this.useAu){document.write('<div id="'+this.id+'_epAu" style="display:none"></div>');}
-if(this.useSb){document.write('<div id="'+this.id+'_epSb" style="display:none"></div>');}},renderEmojiPallet:function(carrier)
-{var pl=this.palletList[carrier];var emoji_set=pl.emoji;var textareaId=this.id;var palletId=this.id+'_'+pl.id;var div=$(palletId);Element.addClassName(palletId,"isLoadEmojiImage");for(var num in emoji_set){var emoji=emoji_set[num];var emoji_end=emoji.end;for(var i=emoji.start;i<=emoji_end;i++){var src=op_get_relative_uri_root()+"/images/emoji/"+pl.shortname+"/"+pl.shortname+i+".gif";var alt="["+pl.shortname+":"+i+"]";var img=document.createElement("img");img.setAttribute("src",src);img.setAttribute("alt",alt);img.onclick=function(){var emoji_code=this.getAttribute("alt");op_insert_str_to_selection($(textareaId),emoji_code);};div.appendChild(img);}}
-Element.removeClassName(palletId,"processLoadEmojiImage");},togglePallet:function(pallet)
-{var id=this.id+'_'+pallet;if($(id).style.display=="none"){if(!Element.hasClassName(id,'isLoadEmojiImage')){Element.addClassName(id,"processLoadEmojiImage");var carrier='';if(pallet=='epDocomo'){carrier='docomo';}
-if(pallet=='epAu'){carrier='au';}
-if(pallet=='epSb'){carrier='softbank';}
+(function($){$.widget("openpne.opEmoji",{options:{useAu:false,useSb:false},palletList:{docomo:{id:"epDocomo",emoji:[{start:1,end:252}],shortname:"i"},au:{id:"epAu",emoji:[{start:1,end:518},{start:700,end:822}],shortname:"e"},softbank:{id:"epSb",emoji:[{start:1,end:485}],shortname:"s"}},_create:function()
+{this.element.before('<div id="'+this.element.attr('id')+'_epDocomo" style="display:none;"></div>');if(this.options.useAu){this.element.before('<div id="'+this.element.attr('id')+'_epAu" style="display:none"></div>');}
+if(this.options.useSb){this.element.before('<div id="'+this.element.attr('id')+'_epSb" style="display:none"></div>');}},renderEmojiPallet:function(carrier)
+{var pl=this.palletList[carrier];var emoji_set=pl.emoji;var textarea=$('#'+this.element.attr('id'));var pallet=$('#'+this.element.attr('id')+'_'+pl.id);pallet.addClass('isLoadEmojiImage');for(var num in emoji_set){var emoji=emoji_set[num];var emoji_end=emoji.end;for(var i=emoji.start;i<=emoji_end;i++){var src=op_get_relative_uri_root()+"/images/emoji/"+pl.shortname+"/"+pl.shortname+i+".gif";var alt="["+pl.shortname+":"+i+"]";var img=document.createElement("img");img.setAttribute("src",src);img.setAttribute("alt",alt);img.onclick=function(){var emoji_code=this.getAttribute("alt");op_insert_str_to_selection(textarea,emoji_code);};pallet.append(img);}}
+pallet.removeClass('processLoadEmojiImage');},togglePallet:function(pallet_name)
+{var pallet=$('#'+this.element.attr('id')+'_'+pallet_name);if(pallet.is(':hidden')){if(pallet.is(':not(.isLoadEmojiImage)')){pallet.addClass('processLoadEmojiImage');var carrier='';if(pallet_name==='epDocomo'){carrier='docomo';}
+if(pallet_name==='epAu'){carrier='au';}
+if(pallet_name==='epSb'){carrier='softbank';}
 this.renderEmojiPallet(carrier);}
-if(Element.hasClassName(id,'processLoadEmojiImage')){return this.togglePallet(pallet);}
-this.closeAllEmojiPallet();Element.show(id);}else{Element.hide(id);}},closeAllEmojiPallet:function()
-{if($(this.id+"_epDocomo")){Element.hide($(this.id+"_epDocomo"));}
-if($(this.id+"_epAu")){Element.hide($(this.id+"_epAu"));}
-if($(this.id+"epSb")){Element.hide($(this.id+"_epSb"));}}}
-Object.extend(opEmoji,{instances:{},getInstance:function(id){if(!this.instances[id]){this.instances[id]=new opEmoji(id);}
-return this.instances[id];}});
\ No newline at end of file
+if(pallet.is('.processLoadEmojiImage')){return this.togglePallet(pallet_name);}
+this.closeAllEmojiPallet();pallet.show();}else{pallet.hide();}},closeAllEmojiPallet:function()
+{var id=this.element.attr('id');$('#'+id+'_epDocomo,'+'#'+id+'_epAu,'+'#'+id+'_epSb').hide();}});})(jQuery);
diff --git a/web/js/op_emoji.js.src b/web/js/op_emoji.js.src
index d73f2375e..8fa1497ed 100644
--- a/web/js/op_emoji.js.src
+++ b/web/js/op_emoji.js.src
@@ -1,8 +1,10 @@
-var opEmoji = Class.create();
-opEmoji.prototype = {
-  id : null,
-  useAu : false,
-  useSb : false,
+(function($) {
+
+$.widget("openpne.opEmoji", {
+  options: {
+    useAu: false,
+    useSb: false
+  },
   
   palletList : {
     docomo : {
@@ -22,19 +24,14 @@ opEmoji.prototype = {
     }
   },
 
-  initialize: function(id)
-  {
-    this.id = id;
-  },
-
-  createEmojiPallet: function()
+  _create: function()
   {
-    document.write('<div id="' + this.id + '_epDocomo" style="display:none;"></div>');
-    if (this.useAu) {
-      document.write('<div id="' + this.id + '_epAu" style="display:none"></div>');
+    this.element.before('<div id="' + this.element.attr('id') + '_epDocomo" style="display:none;"></div>');
+    if (this.options.useAu) {
+      this.element.before('<div id="' + this.element.attr('id') + '_epAu" style="display:none"></div>');
     }
-    if (this.useSb) {
-      document.write('<div id="' + this.id + '_epSb" style="display:none"></div>');
+    if (this.options.useSb) {
+      this.element.before('<div id="' + this.element.attr('id') + '_epSb" style="display:none"></div>');
     }
   },
 
@@ -42,11 +39,10 @@ opEmoji.prototype = {
   {
     var pl = this.palletList[carrier];
     var emoji_set = pl.emoji;
-    var textareaId = this.id;
-    var palletId   = this.id + '_' + pl.id;
-    var div = $(palletId);
+    var textarea = $('#' + this.element.attr('id'));
+    var pallet = $('#' + this.element.attr('id') + '_' + pl.id);
 
-    Element.addClassName(palletId, "isLoadEmojiImage");
+    pallet.addClass('isLoadEmojiImage');
 
     for (var num in emoji_set) {
       var emoji = emoji_set[num];
@@ -60,64 +56,51 @@ opEmoji.prototype = {
         img.setAttribute("alt", alt);
         img.onclick = function () {
             var emoji_code = this.getAttribute("alt");
-            op_insert_str_to_selection($(textareaId), emoji_code);
+            op_insert_str_to_selection(textarea, emoji_code);
         };
 
-        div.appendChild(img);
+        pallet.append(img);
       }
     }
 
-    Element.removeClassName(palletId, "processLoadEmojiImage");
+    pallet.removeClass('processLoadEmojiImage');
   },
 
-  togglePallet: function(pallet)
+  togglePallet: function(pallet_name)
   {
-    var id = this.id + '_' + pallet;
-    if ($(id).style.display == "none") {
-      if (!Element.hasClassName(id, 'isLoadEmojiImage')) {
-        Element.addClassName(id, "processLoadEmojiImage");
+    var pallet = $('#' + this.element.attr('id') + '_' + pallet_name);
+    if (pallet.is(':hidden')) {
+      if (pallet.is(':not(.isLoadEmojiImage)')) {
+        pallet.addClass('processLoadEmojiImage');
         var carrier = '';
-        if (pallet == 'epDocomo') {
+        if (pallet_name === 'epDocomo') {
             carrier = 'docomo';
         }
-        if (pallet == 'epAu') {
+        if (pallet_name === 'epAu') {
             carrier = 'au';
         }
-        if (pallet == 'epSb') {
+        if (pallet_name === 'epSb') {
             carrier = 'softbank';
         }
         this.renderEmojiPallet(carrier);
       }
-      if (Element.hasClassName(id, 'processLoadEmojiImage')) {
-        return this.togglePallet(pallet);
+      if (pallet.is('.processLoadEmojiImage')) {
+        return this.togglePallet(pallet_name);
       }
       this.closeAllEmojiPallet();
-      Element.show(id);
+      pallet.show();
     } else {
-      Element.hide(id);
+      pallet.hide();
     }
   },
 
   closeAllEmojiPallet: function()
   {
-    if ($(this.id + "_epDocomo")) {
-      Element.hide($(this.id + "_epDocomo"));
-    }
-    if ($(this.id + "_epAu")) {
-      Element.hide($(this.id + "_epAu"));
-    }
-    if ($(this.id + "epSb")) {
-      Element.hide($(this.id + "_epSb"));
-    }
+    var id = this.element.attr('id');
+    $('#' + id + '_epDocomo,' +
+      '#' + id + '_epAu,' +
+      '#' + id + '_epSb').hide();
   }
-}
-
-Object.extend(opEmoji, {
-    instances : {},
-    getInstance : function(id) {
-        if (!this.instances[id]) {
-            this.instances[id] = new opEmoji(id);
-        }
-        return this.instances[id];
-    }
 });
+
+})(jQuery);
diff --git a/web/js/tiny_mce/plugins/openpne/editor_plugin.js b/web/js/tiny_mce/plugins/openpne/editor_plugin.js
index 68cdb5fb5..7a543a342 100644
--- a/web/js/tiny_mce/plugins/openpne/editor_plugin.js
+++ b/web/js/tiny_mce/plugins/openpne/editor_plugin.js
@@ -1,11 +1,10 @@
-
 (function(){var DOM=tinymce.DOM,Event=tinymce.dom.Event,is=tinymce.is,each=tinymce.each;tinymce.create('tinymce.ui.OpenPNEColorButton:tinymce.ui.ColorSplitButton',{renderHTML:function(){var s=this.settings,h='<a id="'+this.id+'" href="javascript:;" class="mceButton mceButtonEnabled '+s['class']
 +'" onmousedown="return false;" onclick="return false;" title="'+tinymce.DOM.encode(s.title)+'">';if(s.image){h+='<img class="mceIcon" src="'+s.image+'" /></a>';}else{h+='<span class="mceIcon '+s['class']+'"></span></a>';}
 return h;},renderMenu:function(){var t=this,m,i=0,s=t.settings,n,tb,tr,w,context;w=DOM.add(s.menu_container,'div',{role:'listbox',id:t.id+'_menu','class':s['menu_class']+' '+s['class'],style:'position:absolute;left:0;top:-1000px;'});m=DOM.add(w,'div',{'class':s['class']+' mceSplitButtonMenu'});DOM.add(m,'span',{'class':'mceMenuLine'});n=DOM.add(m,'table',{role:'presentation','class':'mceColorSplitMenu'});tb=DOM.add(n,'tbody');i=0;each(is(s.colors,'array')?s.colors:s.colors.split(','),function(c){c=c.replace(/^#/,'');if(!i--){tr=DOM.add(tb,'tr');i=s.grid_width-1;}
 n=DOM.add(tr,'td');n=DOM.add(n,'a',{role:'option',href:'javascript:;',style:{backgroundColor:'#'+c},'data-mce-color':'#'+c});});if(s.more_colors_func){n=DOM.add(tb,'tr');n=DOM.add(n,'td',{colspan:s.grid_width,'class':'mceMoreColors'});n=DOM.add(n,'a',{role:'option',id:t.id+'_more',href:'javascript:;',onclick:'return false;','class':'mceMoreColors'},s.more_colors_title);Event.add(n,'click',function(e){s.more_colors_func.call(s.more_colors_scope||this);return Event.cancel(e);});}
 DOM.addClass(m,'mceColorSplitMenu');new tinymce.ui.KeyboardNavigation({root:t.id+'_menu',items:DOM.select('a',t.id+'_menu'),onCancel:function(){t.hideMenu();t.focus();}});Event.add(t.id+'_menu','mousedown',function(e){return Event.cancel(e);});Event.add(t.id+'_menu','click',function(e){var c;e=DOM.getParent(e.target,'a',tb);if(e&&e.nodeName.toLowerCase()=='a'&&(c=e.getAttribute('data-mce-color')))
 t.setColor(c);return Event.cancel(e);});return w;},postRender:function(){tinymce.dom.Event.add(this.id,'click',this.showMenu,this);},setColor:function(c){this.value=c;this.hideMenu();this.settings.onselect(c);}});tinymce.create('tinymce.ui.OpenPNEEmojiButton:tinymce.ui.ColorSplitButton',{OpenPNEEmojiButton:function(id,s){var t=this;t.parent(id,s);t.settings=s;},renderMenu:function(){var t=this,m,i=0,s=t.settings,n,tb,tr,w;w=DOM.add(s.menu_container,'div',{id:t.id+'_menu',dir:'ltr','class':s['menu_class']+' '+s['class'],style:'position:absolute;left:0;top:-1000px;width:402px;'});m=DOM.add(w,'div',{'class':s['class']+' mceSplitButtonMenu'});DOM.add(m,'span',{'class':'mceMenuLine'});n=DOM.add(m,'table',{'class':'mceEmojiSplitMenu'});tb=DOM.add(n,'tbody');for(var num in s.emoji){var emoji=s.emoji[num];for(var i=emoji.start;i<=emoji.end;i++){if((i-emoji.start)%25==0){tr=DOM.add(tb,'tr');}
-n=DOM.add(tr,'td');n=DOM.add(n,'img',{src:op_get_relative_uri_root()+"/images/emoji/"+s.carrier+"/"+s.carrier+i+".gif",alt:"["+s.carrier+":"+i+"]",width:12,height:12});Event.add(n,'mousedown',function(e){if(Prototype.Browser.IE){tinyMCE.execCommand("mceInsertContent",false,e.srcElement.getAttribute("alt"));}else{tinyMCE.execCommand("mceInsertContent",false,e.element().getAttribute("alt"));}});}}
+n=DOM.add(tr,'td');n=DOM.add(n,'img',{src:op_get_relative_uri_root()+"/images/emoji/"+s.carrier+"/"+s.carrier+i+".gif",alt:"["+s.carrier+":"+i+"]",width:12,height:12});$(n).bind('mousedown',function(e){tinyMCE.execCommand("mceInsertContent",false,$(this).attr("alt"));});}}
 DOM.addClass(m,'mceColorSplitMenu');return w;},renderHTML:function(){var s=this.settings,h='<a id="'+this.id+'" href="javascript:;" class="mceButton mceButtonEnabled '+s['class']
 +'" onmousedown="return false;" onclick="return false;" title="'+tinymce.DOM.encode(s.title)+'">';if(s.image){h+='<img class="mceIcon" src="'+s.image+'" /></a>';}else{h+='<span class="mceIcon '+s['class']+'"></span></a>';}
 return h;},showMenu:function(){var t=this,r,p,e,p2;if(t.isDisabled())
@@ -21,7 +20,7 @@ cm.setActive(this.id+'_op_'+tagname,true);elm=elm.parentNode;}});tinyMCE.onBefor
 if(n=="op_emoji_docomo"||n=="op_emoji_au"&&config["op_emoji_au"]||n=="op_emoji_softbank"&&config["op_emoji_softbank"]){var emoji_config={op_emoji_docomo:{carrier:"i",emoji:[{start:1,end:252}],title:"{#openpne."+n+"}",image:config[n].imageURL},op_emoji_au:{carrier:"e",emoji:[{start:1,end:518},{start:700,end:822}],title:"{#openpne."+n+"}",image:config[n].imageURL},op_emoji_softbank:{carrier:"s",emoji:[{start:1,end:485}],title:"{#openpne."+n+"}",image:config[n].imageURL}}
 c=this._createOpenPNEEmojiButton(n,emoji_config[n],cm);}
 if(n=="op_cmd"&&config["op_cmd"]){c=this._createOpenPNECmdButton(n,{title:"{#openpne.op_cmd}",image:config["op_cmd"].imageURL,cmd:"mceOpenPNE_op_cmd"},cm);}
-return c;},getInfo:function(){return{longname:'OpenPNE plugin',author:'Kousuke Ebihara, Shogo Kawahara',version:"2.0"}},_getTagName:function(elm){var tagname=elm.nodeName.toLowerCase();if(Prototype.Browser.WebKit&&tagname=="span"){if(elm.style.fontWeight=='bold'){return'b';}
+return c;},getInfo:function(){return{longname:'OpenPNE plugin',author:'Kousuke Ebihara, Shogo Kawahara',version:"2.0"}},_getTagName:function(elm){var tagname=elm.nodeName.toLowerCase();if($.browser.webkit&&tagname=="span"){if(elm.style.fontWeight=='bold'){return'b';}
 if(elm.style.textDecoration=='underline'){return'u';}
 if(elm.style.textDecoration=='line-through'){return's';}
 if(elm.style.fontStyle=='italic'){return'i';}
@@ -50,7 +49,7 @@ if(tinymce.isIE){tagname=tagname.replace("op:","op");}
 var newObj=editor.dom.create(tagname);editor.dom.setAttribs(newObj,args);editor.dom.replace(newObj,targetObj,true);tagList=doc.getElementsByTagName(org_tagname);}
 s=editorDoc.innerHTML;}
 var convertList=new Array('span','font','b','u','s','i');for(var i=0;i<convertList.length;i++){convertHtmlTagToDecoTag(editor.getBody(),convertList[i]);}
-rep(/<\/?div>/gi,"");if(Prototype.Browser.IE){rep(/<(\/?):?op(b|u|s|i|font|large|small|color)/gi,'<$1op:$2');}
+rep(/<\/?div>/gi,"");if($.browser.msie){rep(/<(\/?):?op(b|u|s|i|font|large|small|color)/gi,'<$1op:$2');}
 rep(/<br\s?\/?[^>]*>/gi,"\n");rep(/&nbsp;/gi," ");rep(/&quot;/gi,"\"");rep(/&lt;/gi,"<");rep(/&gt;/gi,">");rep(/&amp;/gi,"&");return s;},_textToPreview:function(s){s=tinymce.trim(s);var rule=/&lt;op:(b|u|s|i|font|large|small|color)(\s+(.*?)|)&gt;(.*?)&lt;\/op:\1&gt;/i;function rep(re,str){s=s.replace(re,str);};function getAttributes(str){var result={};if(!str){return result;}
 var reg=new RegExp(/([^\s]*?)=(?:&quot;|")(.*?)(?:&quote;|")/gi);while((att=reg.exec(str))!=null){result[att[1]]=att[2];}
 return result;};rep(/</gi,"&lt;");rep(/>/gi,"&gt;");rep(/\n/gi,"<br />");rep(/&lt;(\/|)op:(b|u|s|i|font|large|small|color)(?:\s+(.*?)|)&gt;/gi,function(str,isEndTag,org_tagname,attributes_str){var opt="";var style="";var tagname=org_tagname;var attributes=getAttributes(attributes_str);var fontSizeMap=["xx-small","x-small","small","medium","large","x-large","xx-large"];var fontsize=fontSizeMap[3];if(tagname=="font"||tagname=="color"||tagname=="large"||tagname=="small"){tagname="span";}
@@ -62,4 +61,4 @@ opt=' style="'+style+'"';}
 if(org_tagname=="color"&&attributes["code"]&&attributes["code"].match(/^#[0-9a-fA-F]{6}$/)){opt=' style="color:'+attributes["code"]+';"';}
 if(org_tagname=="large"){opt=' style="font-size:large"';}
 if(org_tagname=="small"){opt=' style="font-size:xx-small"';}
-return"<"+tagname+opt+">";});return s;}});tinymce.PluginManager.add('openpne',tinymce.plugins.OpenPNEPlugin);})();
\ No newline at end of file
+return"<"+tagname+opt+">";});return s;}});tinymce.PluginManager.add('openpne',tinymce.plugins.OpenPNEPlugin);})();
diff --git a/web/js/tiny_mce/plugins/openpne/editor_plugin.js.src b/web/js/tiny_mce/plugins/openpne/editor_plugin.js.src
index 55f700ef7..4a34049cb 100644
--- a/web/js/tiny_mce/plugins/openpne/editor_plugin.js.src
+++ b/web/js/tiny_mce/plugins/openpne/editor_plugin.js.src
@@ -154,12 +154,8 @@
                     });
 
                     // Emoji input action.
-                    Event.add(n, 'mousedown', function(e) {
-                        if (Prototype.Browser.IE) {
-                            tinyMCE.execCommand("mceInsertContent", false, e.srcElement.getAttribute("alt"));
-                        } else {
-                            tinyMCE.execCommand("mceInsertContent", false, e.element().getAttribute("alt"));
-                        }
+                    $(n).bind('mousedown', function(e) {
+                      tinyMCE.execCommand("mceInsertContent", false, $(this).attr("alt"));
                     });
                 }
             }
@@ -397,7 +393,7 @@
 
         _getTagName : function(elm) {
             var tagname = elm.nodeName.toLowerCase();
-            if (Prototype.Browser.WebKit && tagname == "span") {
+            if ($.browser.webkit && tagname == "span") {
                 if (elm.style.fontWeight == 'bold') { return 'b'; }
                 if (elm.style.textDecoration == 'underline') { return 'u'; }
                 if (elm.style.textDecoration == 'line-through') { return 's'; }
@@ -643,7 +639,7 @@
 
             rep(/<\/?div>/gi,"");  // for Safari
 
-            if (Prototype.Browser.IE) {
+            if ($.browser.msie) {
                 rep(/<(\/?):?op(b|u|s|i|font|large|small|color)/gi, '<$1op:$2');
             }
 

From ff57a2b8d552e0de7664fe6e79a62ba452915440 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 25 Apr 2012 18:12:16 +0900
Subject: [PATCH 235/630] removed opSkinClassicPlugin (fixes #3038, BP from
 #3037)

---
 .../apps/pc_backend/config/routing.yml        |   28 -
 .../actions/actions.class.php                 |  120 -
 .../templates/_formEditImage.php              |    8 -
 .../templates/indexSuccess.php                |   47 -
 .../templates/skinListSuccess.php             |   25 -
 .../apps/pc_frontend/config/routing.yml       |    7 -
 .../actions/actions.class.php                 |   35 -
 .../opSkinClassicPlugin/config/view.yml       |    2 -
 .../templates/cssSuccess.css.php              | 2593 -----------------
 .../templates/indexSuccess.php                |    0
 .../templates/loginSuccess.php                |   27 -
 plugins/opSkinClassicPlugin/config/config.php |    4 -
 plugins/opSkinClassicPlugin/config/preset.yml |   86 -
 .../opSkinClassicPlugin/i18n/messages.ja.xml  |  331 ---
 .../lib/opSkinClassicColorForm.class.php      |   51 -
 .../lib/opSkinClassicConfig.class.php         |  132 -
 .../lib/opSkinClassicImageForm.class.php      |   55 -
 .../lib/opSkinClassicLoginForm.class.php      |   46 -
 .../lib/opSkinClassicObserver.class.php       |   40 -
 .../lib/opSkinClassicPresetForm.class.php     |   58 -
 .../test/bootstrap/database.php               |   17 -
 .../test/bootstrap/functional.php             |   29 -
 .../test/bootstrap/unit.php                   |   18 -
 .../test/fixtures/test_data.yml               |   19 -
 .../mobile_frontend/skeletonActionsTest.php   |   15 -
 .../test/unit/model/SkeletonTest.php          |    7 -
 plugins/opSkinClassicPlugin/web/css/main.css  | 2423 ---------------
 .../001_openpne_red/skin_after_header.jpg     |  Bin 26293 -> 0 bytes
 .../001_openpne_red/skin_after_header_2.jpg   |  Bin 33221 -> 0 bytes
 .../001_openpne_red/skin_before_header.jpg    |  Bin 18367 -> 0 bytes
 .../web/images/001_openpne_red/skin_login.jpg |  Bin 52913 -> 0 bytes
 .../001_openpne_red/skin_login_open.jpg       |  Bin 54332 -> 0 bytes
 .../images/001_openpne_red/skin_navi_c.jpg    |  Bin 12037 -> 0 bytes
 .../images/001_openpne_red/skin_navi_c_2.jpg  |  Bin 12833 -> 0 bytes
 .../images/001_openpne_red/skin_navi_f.jpg    |  Bin 13180 -> 0 bytes
 .../images/001_openpne_red/skin_navi_f_2.jpg  |  Bin 13732 -> 0 bytes
 .../images/001_openpne_red/skin_navi_h.jpg    |  Bin 12921 -> 0 bytes
 .../images/001_openpne_red/skin_navi_h_2.jpg  |  Bin 13943 -> 0 bytes
 .../002_openpne_beige/skin_after_header.jpg   |  Bin 19735 -> 0 bytes
 .../002_openpne_beige/skin_after_header_2.jpg |  Bin 23113 -> 0 bytes
 .../002_openpne_beige/skin_before_header.jpg  |  Bin 10462 -> 0 bytes
 .../images/002_openpne_beige/skin_login.jpg   |  Bin 34871 -> 0 bytes
 .../002_openpne_beige/skin_login_open.jpg     |  Bin 36303 -> 0 bytes
 .../images/002_openpne_beige/skin_navi_c.jpg  |  Bin 12037 -> 0 bytes
 .../002_openpne_beige/skin_navi_c_2.jpg       |  Bin 12833 -> 0 bytes
 .../images/002_openpne_beige/skin_navi_f.jpg  |  Bin 13066 -> 0 bytes
 .../002_openpne_beige/skin_navi_f_2.jpg       |  Bin 13506 -> 0 bytes
 .../images/002_openpne_beige/skin_navi_h.jpg  |  Bin 12273 -> 0 bytes
 .../002_openpne_beige/skin_navi_h_2.jpg       |  Bin 12557 -> 0 bytes
 .../003_openpne_yellow/skin_after_header.jpg  |  Bin 22989 -> 0 bytes
 .../skin_after_header_2.jpg                   |  Bin 27663 -> 0 bytes
 .../003_openpne_yellow/skin_before_header.jpg |  Bin 14208 -> 0 bytes
 .../images/003_openpne_yellow/skin_login.jpg  |  Bin 42849 -> 0 bytes
 .../003_openpne_yellow/skin_login_open.jpg    |  Bin 44283 -> 0 bytes
 .../images/003_openpne_yellow/skin_navi_c.jpg |  Bin 12037 -> 0 bytes
 .../003_openpne_yellow/skin_navi_c_2.jpg      |  Bin 12833 -> 0 bytes
 .../images/003_openpne_yellow/skin_navi_f.jpg |  Bin 13195 -> 0 bytes
 .../003_openpne_yellow/skin_navi_f_2.jpg      |  Bin 14030 -> 0 bytes
 .../images/003_openpne_yellow/skin_navi_h.jpg |  Bin 12273 -> 0 bytes
 .../003_openpne_yellow/skin_navi_h_2.jpg      |  Bin 12557 -> 0 bytes
 .../004_openpne_green/skin_after_header.jpg   |  Bin 23538 -> 0 bytes
 .../004_openpne_green/skin_after_header_2.jpg |  Bin 28872 -> 0 bytes
 .../004_openpne_green/skin_before_header.jpg  |  Bin 15176 -> 0 bytes
 .../images/004_openpne_green/skin_login.jpg   |  Bin 44990 -> 0 bytes
 .../004_openpne_green/skin_login_open.jpg     |  Bin 46386 -> 0 bytes
 .../images/004_openpne_green/skin_navi_c.jpg  |  Bin 12188 -> 0 bytes
 .../004_openpne_green/skin_navi_c_2.jpg       |  Bin 12809 -> 0 bytes
 .../images/004_openpne_green/skin_navi_f.jpg  |  Bin 13180 -> 0 bytes
 .../004_openpne_green/skin_navi_f_2.jpg       |  Bin 13732 -> 0 bytes
 .../images/004_openpne_green/skin_navi_h.jpg  |  Bin 12201 -> 0 bytes
 .../004_openpne_green/skin_navi_h_2.jpg       |  Bin 12915 -> 0 bytes
 .../005_openpne_blue/skin_after_header.jpg    |  Bin 23366 -> 0 bytes
 .../005_openpne_blue/skin_after_header_2.jpg  |  Bin 27883 -> 0 bytes
 .../005_openpne_blue/skin_before_header.jpg   |  Bin 14915 -> 0 bytes
 .../images/005_openpne_blue/skin_login.jpg    |  Bin 45723 -> 0 bytes
 .../005_openpne_blue/skin_login_open.jpg      |  Bin 47083 -> 0 bytes
 .../images/005_openpne_blue/skin_navi_c.jpg   |  Bin 12118 -> 0 bytes
 .../images/005_openpne_blue/skin_navi_c_2.jpg |  Bin 12530 -> 0 bytes
 .../images/005_openpne_blue/skin_navi_f.jpg   |  Bin 12916 -> 0 bytes
 .../images/005_openpne_blue/skin_navi_f_2.jpg |  Bin 14103 -> 0 bytes
 .../images/005_openpne_blue/skin_navi_h.jpg   |  Bin 12600 -> 0 bytes
 .../images/005_openpne_blue/skin_navi_h_2.jpg |  Bin 13831 -> 0 bytes
 .../006_openpne_navy/skin_after_header.jpg    |  Bin 24313 -> 0 bytes
 .../006_openpne_navy/skin_after_header_2.jpg  |  Bin 30430 -> 0 bytes
 .../006_openpne_navy/skin_before_header.jpg   |  Bin 16669 -> 0 bytes
 .../images/006_openpne_navy/skin_login.jpg    |  Bin 51034 -> 0 bytes
 .../006_openpne_navy/skin_login_open.jpg      |  Bin 52428 -> 0 bytes
 .../images/006_openpne_navy/skin_navi_c.jpg   |  Bin 12118 -> 0 bytes
 .../images/006_openpne_navy/skin_navi_c_2.jpg |  Bin 12530 -> 0 bytes
 .../images/006_openpne_navy/skin_navi_f.jpg   |  Bin 12916 -> 0 bytes
 .../images/006_openpne_navy/skin_navi_f_2.jpg |  Bin 14103 -> 0 bytes
 .../images/006_openpne_navy/skin_navi_h.jpg   |  Bin 11948 -> 0 bytes
 .../images/006_openpne_navy/skin_navi_h_2.jpg |  Bin 12345 -> 0 bytes
 .../007_openpne_purple/skin_after_header.jpg  |  Bin 19904 -> 0 bytes
 .../skin_after_header_2.jpg                   |  Bin 22035 -> 0 bytes
 .../007_openpne_purple/skin_before_header.jpg |  Bin 10887 -> 0 bytes
 .../images/007_openpne_purple/skin_login.jpg  |  Bin 35893 -> 0 bytes
 .../007_openpne_purple/skin_login_open.jpg    |  Bin 37305 -> 0 bytes
 .../images/007_openpne_purple/skin_navi_c.jpg |  Bin 12118 -> 0 bytes
 .../007_openpne_purple/skin_navi_c_2.jpg      |  Bin 12530 -> 0 bytes
 .../images/007_openpne_purple/skin_navi_f.jpg |  Bin 13350 -> 0 bytes
 .../007_openpne_purple/skin_navi_f_2.jpg      |  Bin 15195 -> 0 bytes
 .../images/007_openpne_purple/skin_navi_h.jpg |  Bin 12210 -> 0 bytes
 .../007_openpne_purple/skin_navi_h_2.jpg      |  Bin 12549 -> 0 bytes
 .../web/images/articleList_marker.gif         |  Bin 829 -> 0 bytes
 .../web/images/bg_button.gif                  |  Bin 396 -> 0 bytes
 .../web/images/bg_button_a.gif                |  Bin 269 -> 0 bytes
 .../web/images/birthday_f.gif                 |  Bin 17678 -> 0 bytes
 .../web/images/birthday_f_2.gif               |  Bin 18223 -> 0 bytes
 .../web/images/birthday_h.gif                 |  Bin 17674 -> 0 bytes
 .../web/images/button_comment.gif             |  Bin 1370 -> 0 bytes
 .../web/images/button_edit_photo.gif          |  Bin 1106 -> 0 bytes
 .../web/images/button_kyohi.gif               |  Bin 768 -> 0 bytes
 .../web/images/button_prof_conf.gif           |  Bin 1107 -> 0 bytes
 .../web/images/button_sakujo.gif              |  Bin 871 -> 0 bytes
 .../web/images/button_search_1.gif            |  Bin 544 -> 0 bytes
 .../web/images/button_search_2.gif            |  Bin 572 -> 0 bytes
 .../web/images/button_search_3.gif            |  Bin 589 -> 0 bytes
 .../web/images/button_search_4.gif            |  Bin 815 -> 0 bytes
 .../web/images/button_search_5.gif            |  Bin 574 -> 0 bytes
 .../web/images/button_shonin.gif              |  Bin 1029 -> 0 bytes
 .../web/images/button_shosai.gif              |  Bin 841 -> 0 bytes
 .../web/images/button_show_photo.gif          |  Bin 1217 -> 0 bytes
 .../opSkinClassicPlugin/web/images/colon.gif  |  Bin 53 -> 0 bytes
 .../web/images/content_header_1.gif           |  Bin 404 -> 0 bytes
 .../web/images/deco_op_b.gif                  |  Bin 397 -> 0 bytes
 .../web/images/deco_op_cmd.gif                |  Bin 505 -> 0 bytes
 .../web/images/deco_op_color.gif              |  Bin 398 -> 0 bytes
 .../web/images/deco_op_emoji_au.gif           |  Bin 449 -> 0 bytes
 .../web/images/deco_op_emoji_docomo.gif       |  Bin 450 -> 0 bytes
 .../web/images/deco_op_emoji_softbank.gif     |  Bin 451 -> 0 bytes
 .../web/images/deco_op_i.gif                  |  Bin 385 -> 0 bytes
 .../web/images/deco_op_image.gif              |  Bin 680 -> 0 bytes
 .../web/images/deco_op_large.gif              |  Bin 417 -> 0 bytes
 .../web/images/deco_op_s.gif                  |  Bin 426 -> 0 bytes
 .../web/images/deco_op_small.gif              |  Bin 382 -> 0 bytes
 .../web/images/deco_op_u.gif                  |  Bin 296 -> 0 bytes
 .../opSkinClassicPlugin/web/images/icon_1.gif |  Bin 50 -> 0 bytes
 .../opSkinClassicPlugin/web/images/icon_2.gif |  Bin 50 -> 0 bytes
 .../opSkinClassicPlugin/web/images/icon_3.gif |  Bin 50 -> 0 bytes
 .../web/images/icon_alert_l.gif               |  Bin 1551 -> 0 bytes
 .../web/images/icon_arrow_1.gif               |  Bin 90 -> 0 bytes
 .../web/images/icon_arrow_2.gif               |  Bin 176 -> 0 bytes
 .../web/images/icon_birthday.gif              |  Bin 250 -> 0 bytes
 .../web/images/icon_camera.gif                |  Bin 214 -> 0 bytes
 .../web/images/icon_crown.gif                 |  Bin 159 -> 0 bytes
 .../web/images/icon_event_B.gif               |  Bin 232 -> 0 bytes
 .../web/images/icon_event_R.gif               |  Bin 247 -> 0 bytes
 .../web/images/icon_information.gif           |  Bin 1117 -> 0 bytes
 .../web/images/icon_mail_1.gif                |  Bin 218 -> 0 bytes
 .../web/images/icon_mail_2.gif                |  Bin 239 -> 0 bytes
 .../web/images/icon_mail_3.gif                |  Bin 237 -> 0 bytes
 .../web/images/icon_mail_4.gif                |  Bin 360 -> 0 bytes
 .../web/images/icon_pen.gif                   |  Bin 214 -> 0 bytes
 .../web/images/icon_schedule.gif              |  Bin 318 -> 0 bytes
 .../web/images/icon_search.gif                |  Bin 994 -> 0 bytes
 .../web/images/icon_title_1.gif               |  Bin 280 -> 0 bytes
 .../web/images/icon_weather_FC.gif            |  Bin 400 -> 0 bytes
 .../web/images/no_image.gif                   |  Bin 4780 -> 0 bytes
 .../web/images/no_logo.gif                    |  Bin 4331 -> 0 bytes
 .../web/images/no_logo_small.gif              |  Bin 1837 -> 0 bytes
 .../web/images/satisfaction_level_1.gif       |  Bin 410 -> 0 bytes
 .../web/images/satisfaction_level_2.gif       |  Bin 441 -> 0 bytes
 .../web/images/satisfaction_level_3.gif       |  Bin 451 -> 0 bytes
 .../web/images/satisfaction_level_4.gif       |  Bin 437 -> 0 bytes
 .../web/images/satisfaction_level_5.gif       |  Bin 352 -> 0 bytes
 .../web/images/skin_after_header.jpg          |  Bin 23366 -> 0 bytes
 .../web/images/skin_after_header_2.jpg        |  Bin 27883 -> 0 bytes
 .../web/images/skin_before_header.jpg         |  Bin 14915 -> 0 bytes
 .../web/images/skin_footer.jpg                |  Bin 2297 -> 0 bytes
 .../web/images/skin_ktai_header.jpg           |  Bin 3845 -> 0 bytes
 .../web/images/skin_login.jpg                 |  Bin 45723 -> 0 bytes
 .../web/images/skin_login_open.jpg            |  Bin 47083 -> 0 bytes
 .../web/images/skin_navi_c.jpg                |  Bin 12118 -> 0 bytes
 .../web/images/skin_navi_c_2.jpg              |  Bin 12530 -> 0 bytes
 .../web/images/skin_navi_f.jpg                |  Bin 12916 -> 0 bytes
 .../web/images/skin_navi_f_2.jpg              |  Bin 14103 -> 0 bytes
 .../web/images/skin_navi_h.jpg                |  Bin 12600 -> 0 bytes
 .../web/images/skin_navi_h_2.jpg              |  Bin 13831 -> 0 bytes
 179 files changed, 6223 deletions(-)
 delete mode 100644 plugins/opSkinClassicPlugin/apps/pc_backend/config/routing.yml
 delete mode 100644 plugins/opSkinClassicPlugin/apps/pc_backend/modules/opSkinClassicPlugin/actions/actions.class.php
 delete mode 100644 plugins/opSkinClassicPlugin/apps/pc_backend/modules/opSkinClassicPlugin/templates/_formEditImage.php
 delete mode 100644 plugins/opSkinClassicPlugin/apps/pc_backend/modules/opSkinClassicPlugin/templates/indexSuccess.php
 delete mode 100644 plugins/opSkinClassicPlugin/apps/pc_backend/modules/opSkinClassicPlugin/templates/skinListSuccess.php
 delete mode 100644 plugins/opSkinClassicPlugin/apps/pc_frontend/config/routing.yml
 delete mode 100644 plugins/opSkinClassicPlugin/apps/pc_frontend/modules/opSkinClassicPlugin/actions/actions.class.php
 delete mode 100644 plugins/opSkinClassicPlugin/apps/pc_frontend/modules/opSkinClassicPlugin/config/view.yml
 delete mode 100644 plugins/opSkinClassicPlugin/apps/pc_frontend/modules/opSkinClassicPlugin/templates/cssSuccess.css.php
 delete mode 100644 plugins/opSkinClassicPlugin/apps/pc_frontend/modules/opSkinClassicPlugin/templates/indexSuccess.php
 delete mode 100644 plugins/opSkinClassicPlugin/apps/pc_frontend/modules/opSkinClassicPlugin/templates/loginSuccess.php
 delete mode 100644 plugins/opSkinClassicPlugin/config/config.php
 delete mode 100644 plugins/opSkinClassicPlugin/config/preset.yml
 delete mode 100644 plugins/opSkinClassicPlugin/i18n/messages.ja.xml
 delete mode 100644 plugins/opSkinClassicPlugin/lib/opSkinClassicColorForm.class.php
 delete mode 100644 plugins/opSkinClassicPlugin/lib/opSkinClassicConfig.class.php
 delete mode 100644 plugins/opSkinClassicPlugin/lib/opSkinClassicImageForm.class.php
 delete mode 100644 plugins/opSkinClassicPlugin/lib/opSkinClassicLoginForm.class.php
 delete mode 100644 plugins/opSkinClassicPlugin/lib/opSkinClassicObserver.class.php
 delete mode 100644 plugins/opSkinClassicPlugin/lib/opSkinClassicPresetForm.class.php
 delete mode 100644 plugins/opSkinClassicPlugin/test/bootstrap/database.php
 delete mode 100644 plugins/opSkinClassicPlugin/test/bootstrap/functional.php
 delete mode 100644 plugins/opSkinClassicPlugin/test/bootstrap/unit.php
 delete mode 100644 plugins/opSkinClassicPlugin/test/fixtures/test_data.yml
 delete mode 100644 plugins/opSkinClassicPlugin/test/functional/mobile_frontend/skeletonActionsTest.php
 delete mode 100644 plugins/opSkinClassicPlugin/test/unit/model/SkeletonTest.php
 delete mode 100644 plugins/opSkinClassicPlugin/web/css/main.css
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_after_header.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_after_header_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_before_header.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_login.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_login_open.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_navi_c.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_navi_c_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_navi_f.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_navi_f_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_navi_h.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_navi_h_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_after_header.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_after_header_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_before_header.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_login.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_login_open.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_navi_c.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_navi_c_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_navi_f.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_navi_f_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_navi_h.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_navi_h_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_after_header.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_after_header_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_before_header.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_login.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_login_open.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_navi_c.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_navi_c_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_navi_f.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_navi_f_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_navi_h.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_navi_h_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_after_header.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_after_header_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_before_header.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_login.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_login_open.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_navi_c.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_navi_c_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_navi_f.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_navi_f_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_navi_h.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_navi_h_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_after_header.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_after_header_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_before_header.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_login.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_login_open.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_navi_c.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_navi_c_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_navi_f.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_navi_f_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_navi_h.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_navi_h_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_after_header.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_after_header_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_before_header.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_login.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_login_open.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_navi_c.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_navi_c_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_navi_f.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_navi_f_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_navi_h.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_navi_h_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_after_header.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_after_header_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_before_header.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_login.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_login_open.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_navi_c.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_navi_c_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_navi_f.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_navi_f_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_navi_h.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_navi_h_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/articleList_marker.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/bg_button.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/bg_button_a.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/birthday_f.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/birthday_f_2.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/birthday_h.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/button_comment.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/button_edit_photo.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/button_kyohi.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/button_prof_conf.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/button_sakujo.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/button_search_1.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/button_search_2.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/button_search_3.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/button_search_4.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/button_search_5.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/button_shonin.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/button_shosai.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/button_show_photo.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/colon.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/content_header_1.gif
 delete mode 100755 plugins/opSkinClassicPlugin/web/images/deco_op_b.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/deco_op_cmd.gif
 delete mode 100755 plugins/opSkinClassicPlugin/web/images/deco_op_color.gif
 delete mode 100755 plugins/opSkinClassicPlugin/web/images/deco_op_emoji_au.gif
 delete mode 100755 plugins/opSkinClassicPlugin/web/images/deco_op_emoji_docomo.gif
 delete mode 100755 plugins/opSkinClassicPlugin/web/images/deco_op_emoji_softbank.gif
 delete mode 100755 plugins/opSkinClassicPlugin/web/images/deco_op_i.gif
 delete mode 100755 plugins/opSkinClassicPlugin/web/images/deco_op_image.gif
 delete mode 100755 plugins/opSkinClassicPlugin/web/images/deco_op_large.gif
 delete mode 100755 plugins/opSkinClassicPlugin/web/images/deco_op_s.gif
 delete mode 100755 plugins/opSkinClassicPlugin/web/images/deco_op_small.gif
 delete mode 100755 plugins/opSkinClassicPlugin/web/images/deco_op_u.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/icon_1.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/icon_2.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/icon_3.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/icon_alert_l.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/icon_arrow_1.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/icon_arrow_2.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/icon_birthday.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/icon_camera.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/icon_crown.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/icon_event_B.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/icon_event_R.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/icon_information.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/icon_mail_1.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/icon_mail_2.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/icon_mail_3.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/icon_mail_4.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/icon_pen.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/icon_schedule.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/icon_search.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/icon_title_1.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/icon_weather_FC.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/no_image.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/no_logo.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/no_logo_small.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/satisfaction_level_1.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/satisfaction_level_2.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/satisfaction_level_3.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/satisfaction_level_4.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/satisfaction_level_5.gif
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/skin_after_header.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/skin_after_header_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/skin_before_header.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/skin_footer.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/skin_ktai_header.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/skin_login.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/skin_login_open.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/skin_navi_c.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/skin_navi_c_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/skin_navi_f.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/skin_navi_f_2.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/skin_navi_h.jpg
 delete mode 100644 plugins/opSkinClassicPlugin/web/images/skin_navi_h_2.jpg

diff --git a/plugins/opSkinClassicPlugin/apps/pc_backend/config/routing.yml b/plugins/opSkinClassicPlugin/apps/pc_backend/config/routing.yml
deleted file mode 100644
index 2e59663b5..000000000
--- a/plugins/opSkinClassicPlugin/apps/pc_backend/config/routing.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-#opSkinClassicPlugin_skin_index:
-#  url: /opSkinClassicPlugin
-#  param: { module: opSkinClassicPlugin, action: index }
-#
-#opSkinClassicPlugin_skin_list:
-#  url: /opSkinClassicPlugin/skin
-#  class: sfRequestRoute
-#  param: { module: opSkinClassicPlugin, action: skinList }
-#  requirements:
-#    sf_method: [get]
-#
-#opSkinClassicPlugin_preset:
-#  url: /opSkinClassicPlugin/preset
-#  class: sfRequestRoute
-#  param: { module: opSkinClassicPlugin, action: preset }
-#  requirements:
-#    sf_method: [post]
-#
-#opSkinClassicPlugin_color:
-#  url: /opSkinClassicPlugin/color
-#  class: sfRequestRoute
-#  param: { module: opSkinClassicPlugin, action: color }
-#  requirements:
-#    sf_method: [post]
-#
-#opSkinClassicPlugin_nodefaults:
-#  url: /opSkinClassicPlugin
-#
diff --git a/plugins/opSkinClassicPlugin/apps/pc_backend/modules/opSkinClassicPlugin/actions/actions.class.php b/plugins/opSkinClassicPlugin/apps/pc_backend/modules/opSkinClassicPlugin/actions/actions.class.php
deleted file mode 100644
index bb2eabe72..000000000
--- a/plugins/opSkinClassicPlugin/apps/pc_backend/modules/opSkinClassicPlugin/actions/actions.class.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * opSkinClassicPlugin actions.
- *
- * @package    OpenPNE
- * @subpackage opSkinClassicPlugin
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class opSkinClassicPluginActions extends sfActions
-{
-  public function executeIndex(sfWebRequest $request)
-  {
-    $this->presetForm = new opSkinClassicPresetForm();
-    $this->colorForm = new opSkinClassicColorForm();
-    $this->loginForm = new opSkinClassicLoginForm();
-  }
-
-  public function executeSkinList(sfWebRequest $request)
-  {
-    $this->forms = array();
-    $images = array_merge(opSkinClassicConfig::getImages(), opSkinClassicConfig::getThemeImages());
-
-    foreach ($images as $v)
-    {
-      $this->forms[$v] = new opSkinClassicImageForm(array(), array('target' => $v));
-    }
-  }
-
-  public function executeSkin(sfWebRequest $request)
-  {
-    $this->forward404Unless($request->isMethod(sfWebRequest::POST));
-
-    $target = $request->getParameter('target');
-    $image = $request->getParameter('image');
-    $imageFiles = $request->getFiles('image');
-    if (!isset($image[$target]))
-    {
-      $image[$target] = array();
-    }
-    if (!isset($imageFiles[$target]))
-    {
-      $imageFiles[$target] = array();
-    }
-
-    $form = new opSkinClassicImageForm(array(), array('target' => $target));
-    $form->bind($image[$target], $imageFiles[$target]);
-    if ($form->isValid())
-    {
-      $form->save();
-      $this->getUser()->setFlash('notice', 'Saved.');
-      $this->redirect('opSkinClassicPlugin/skinList');
-    }
-
-    $this->getUser()->setFlash('error', $form->getErrorSchema()->getMessage());
-    $this->redirect('opSkinClassicPlugin/skinList');
-  }
-
-  public function executePreset(sfWebRequest $request)
-  {
-    $this->forward404Unless($request->isMethod(sfWebRequest::POST));
-
-    $this->presetForm = new opSkinClassicPresetForm();
-    $this->presetForm->bind($request->getParameter('preset'));
-    if ($this->presetForm->isValid())
-    {
-      $this->presetForm->save();
-      $this->getUser()->setFlash('notice', 'Saved.');
-      $this->redirect('opSkinClassicPlugin/index');
-    }
-
-    $this->colorForm = new opSkinClassicColorForm();
-    $this->loginForm = new opSkinClassicLoginForm();
-    $this->setTemplate('index');
-  }
-
-  public function executeColor(sfWebRequest $request)
-  {
-    $this->forward404Unless($request->isMethod(sfWebRequest::POST));
-
-    $this->colorForm = new opSkinClassicColorForm();
-    $this->colorForm->bind($request->getParameter('color'));
-    if ($this->colorForm->isValid())
-    {
-      $this->colorForm->save();
-      $this->getUser()->setFlash('notice', 'Saved.');
-      $this->redirect('opSkinClassicPlugin/index');
-    }
-
-    $this->presetForm = new opSkinClassicPresetForm();
-    $this->loginForm = new opSkinClassicLoginForm();
-    $this->setTemplate('index');
-  }
-
-  public function executeLogin(sfWebRequest $request)
-  {
-    $this->forward404Unless($request->isMethod(sfWebRequest::POST));
-
-    $this->loginForm = new opSkinClassicLoginForm();
-    $this->loginForm->bind($request->getParameter('login'));
-    if ($this->loginForm->isValid())
-    {
-      $this->loginForm->save();
-      $this->getUser()->setFlash('notice', 'Saved.');
-      $this->redirect('opSkinClassicPlugin/index');
-    }
-
-    $this->presetForm = new opSkinClassicPresetForm();
-    $this->colorForm = new opSkinClassicColorForm();
-    $this->setTemplate('index');
-  }
-}
diff --git a/plugins/opSkinClassicPlugin/apps/pc_backend/modules/opSkinClassicPlugin/templates/_formEditImage.php b/plugins/opSkinClassicPlugin/apps/pc_backend/modules/opSkinClassicPlugin/templates/_formEditImage.php
deleted file mode 100644
index a918d9a74..000000000
--- a/plugins/opSkinClassicPlugin/apps/pc_backend/modules/opSkinClassicPlugin/templates/_formEditImage.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php if (0 === strpos($target, 'skin_')): ?>
-<?php echo image_tag(opSkinClassicConfig::get($target.'_image'), array('width' => '180')) ?><br />
-<?php else: ?>
-<?php echo image_tag(opSkinClassicConfig::get($target.'_image')) ?><br />
-<?php endif; ?>
-<br />
-%input%<br />
-%delete% %delete_label%
diff --git a/plugins/opSkinClassicPlugin/apps/pc_backend/modules/opSkinClassicPlugin/templates/indexSuccess.php b/plugins/opSkinClassicPlugin/apps/pc_backend/modules/opSkinClassicPlugin/templates/indexSuccess.php
deleted file mode 100644
index 51ef763af..000000000
--- a/plugins/opSkinClassicPlugin/apps/pc_backend/modules/opSkinClassicPlugin/templates/indexSuccess.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<h2>プラグイン設定</h2>
-
-<h3>ログイン画面設定</h3>
-<p>標準のログイン画面を使用するか、旧式のログイン画面（ログイン画面用画像を使用したもの）を使用するかを設定します。</p>
-
-<form action="<?php echo url_for('opSkinClassicPlugin/login') ?>" method="post">
-<table>
-<?php echo $loginForm ?>
-<tr>
-<td colspan="2">
-<input type="submit" value="<?php echo __('Save') ?>" />
-</td>
-</tr>
-</table>
-</form>
-
-<h3>プリセット設定変更</h3>
-<p>あらかじめ用意されているスキン画像、配色設定を設定します。</p>
-<p>※この設定をおこなうと、既に設定済みのスキン画像、配色がリセットされます。</p>
-
-<form action="<?php echo url_for('opSkinClassicPlugin/preset') ?>" method="post">
-<table>
-<?php echo $presetForm ?>
-<tr>
-<td colspan="2">
-<input type="submit" value="<?php echo __('Save') ?>" />
-</td>
-</tr>
-</table>
-</form>
-
-<h3>配色設定変更</h3>
-
-<form action="<?php echo url_for('opSkinClassicPlugin/color') ?>" method="post">
-<table>
-<?php echo $colorForm ?>
-<tr>
-<td colspan="2">
-<input type="submit" value="<?php echo __('Save') ?>" />
-</td>
-</tr>
-</table>
-</form>
-
-<h3>スキン画像設定</h3>
-<p><?php echo link_to('スキン画像設定', 'opSkinClassicPlugin/skinList') ?></p>
-
diff --git a/plugins/opSkinClassicPlugin/apps/pc_backend/modules/opSkinClassicPlugin/templates/skinListSuccess.php b/plugins/opSkinClassicPlugin/apps/pc_backend/modules/opSkinClassicPlugin/templates/skinListSuccess.php
deleted file mode 100644
index a1a7c2bbb..000000000
--- a/plugins/opSkinClassicPlugin/apps/pc_backend/modules/opSkinClassicPlugin/templates/skinListSuccess.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<h2>プラグイン設定</h2>
-<h3>スキン画像設定</h3>
-
-<?php foreach ($forms as $image => $form): ?>
-<form action="<?php echo url_for('opSkinClassicPlugin/skin?target='.$image) ?>" method="post" enctype="multipart/form-data">
-<table class="skin">
-<?php foreach ($form as $field): ?>
-<?php if (!$field->isHidden()): ?>
-<tr><th><?php echo $field->renderLabel() ?></th></tr>
-<tr>
-<td><?php echo $field->render() ?></td>
-</tr>
-<?php endif; ?>
-<?php endforeach; ?>
-<tr>
-<td colspan="2" class="submit">
-<?php echo $form->renderHiddenFields(); ?>
-<input type="submit" value="<?php echo __('Save') ?>" />
-</td>
-</tr>
-</table>
-</form>
-<?php endforeach; ?>
-<br class="clear" />
-
diff --git a/plugins/opSkinClassicPlugin/apps/pc_frontend/config/routing.yml b/plugins/opSkinClassicPlugin/apps/pc_frontend/config/routing.yml
deleted file mode 100644
index ecbf7c356..000000000
--- a/plugins/opSkinClassicPlugin/apps/pc_frontend/config/routing.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-opSkinClassicPlugin_css:
-  url: /cache/css/:theme.:sf_format
-  param: { module: opSkinClassicPlugin, action: css, sf_format: css }
-
-opSkinClassicPlugin_login:
-  url: /opSkinClassicPlugin/login
-  param: { module: opSkinClassicPlugin, action: login }
diff --git a/plugins/opSkinClassicPlugin/apps/pc_frontend/modules/opSkinClassicPlugin/actions/actions.class.php b/plugins/opSkinClassicPlugin/apps/pc_frontend/modules/opSkinClassicPlugin/actions/actions.class.php
deleted file mode 100644
index 096c6bc2e..000000000
--- a/plugins/opSkinClassicPlugin/apps/pc_frontend/modules/opSkinClassicPlugin/actions/actions.class.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * opSkinClassicPlugin actions.
- *
- * @package    OpenPNE
- * @subpackage skin
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class opSkinClassicPluginActions extends sfActions
-{
-  public function executeCss(sfWebRequest $request)
-  {
-    opSkinClassicConfig::setCurrentTheme($request->getParameter('theme'));
-  }
-
-  public function executeLogin(sfWebRequest $request)
-  {
-    if ('@opSkinClassicPlugin_login' !== opConfig::get('external_pc_login_url'))
-    {
-      $this->redirect('member/login');
-    }
-
-    $this->form = $this->getUser()->getAuthForm();
-    unset($this->form['next_uri']);
-  }
-}
diff --git a/plugins/opSkinClassicPlugin/apps/pc_frontend/modules/opSkinClassicPlugin/config/view.yml b/plugins/opSkinClassicPlugin/apps/pc_frontend/modules/opSkinClassicPlugin/config/view.yml
deleted file mode 100644
index 5d2021ce5..000000000
--- a/plugins/opSkinClassicPlugin/apps/pc_frontend/modules/opSkinClassicPlugin/config/view.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-loginSuccess:
-  layout: plain
diff --git a/plugins/opSkinClassicPlugin/apps/pc_frontend/modules/opSkinClassicPlugin/templates/cssSuccess.css.php b/plugins/opSkinClassicPlugin/apps/pc_frontend/modules/opSkinClassicPlugin/templates/cssSuccess.css.php
deleted file mode 100644
index dd4dd1ce6..000000000
--- a/plugins/opSkinClassicPlugin/apps/pc_frontend/modules/opSkinClassicPlugin/templates/cssSuccess.css.php
+++ /dev/null
@@ -1,2593 +0,0 @@
-@charset "UTF-8";
-
-/*==============================================================================
- * デフォルトスタイルシートの上書き
- *----------------------------------------------------------------------------*/
-body, div, p, pre, blockquote, th, td,
-dl, dt, dd, ul, ol, li,
-h1, h2, h3, h4, h5, h6,
-iframe, object, embed {
-	margin: 0;
-	padding: 0;
-	border: none;
-	text-align: left;
-}
-ul, ol {
-	list-style-position: outside;
-	list-style-type: none;
-}
-table {
-	border-collapse: separate;
-	border-spacing: 0;
-	empty-cells: show;
-	margin: 0;
-	font-size: 1em;
-}
-* {
-	word-break: break-all;
-}
-*:first-child+html table {
-	border-collapse: collapse;
-}
-* html table {
-	border-collapse: collapse;
-}
-th, td {
-	vertical-align: middle;
-}
-address, cite, caption, th, del, ins,
-abbr, acronym, dfn, em, strong,
-code, kbd, samp, var {
-	border: none;
-	font-style: normal;
-	font-variant: normal;
-	font-weight: normal;
-	text-align: left;
-	text-decoration: none;
-}
-img {
-	border: none;
-	vertical-align: baseline;
-}
-a img {
-	vertical-align: text-bottom;
-}
-* html a img {
-	vertical-align: baseline;
-}
-br {
-	letter-spacing: 0;
-}
-h1, h2, h3, h4, h5, h6 {
-	font-size: 100%;
-	font-weight: normal;
-}
-q:before, q:after {
-	content: "";
-}
-form, fieldset, input, textarea {
-	margin: 0;
-}
-form, fieldset {
-	padding: 0;
-}
-fieldset {
-	border: none;
-}
-form p {
-	margin: 0;
-	padding: 0;
-}
-
-/*==============================================================================
- * OpenPNE全共通指定
- *----------------------------------------------------------------------------*/
-body {
-	font: normal normal normal 10pt/1.2 "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "ＭＳ Ｐゴシック", "MS PGothic", Osaka, sans-serif;
-}
-input,
-textarea,
-select {
-	color: #333333;
-	font-size: inherit;
-	font-family: "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "ＭＳ Ｐゴシック", "MS PGothic", Osaka, sans-serif;
-}
-a:link {
-	color: #026cd1;
-}
-a:visited {
-	color: #004a95;
-}
-a:hover, a:active {
-	color: #76afe6;
-}
-.input_text,
-.input_password,
-textarea {
-	background-color: #f8f8f8;
-}
-.input_text,
-.input_password,
-textarea,
-select {
-	border: 1px solid #888888;
-}
-.input_image {
-	border: none;
-}
-strong {
-	font-weight: bold;
-}
-/*----------------------------------------------
- * テーブル
- *--------------------------------------------*/
-div.parts table {
-	table-layout: fixed;
-	width: 100%;
-}
-div.parts th,
-div.parts td {
-	border-width: 1px 0 0 1px;
-	border-style: solid;
-	border-color: #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-div.parts tr th:first-child,
-div.parts tr td:first-child,
-div.parts tr th.first-child,
-div.parts tr td.first-child {
-	border-left-width: 0;
-}
-/*----------------------------------------------
- * マーカー付きリンク、ボタンリンク
- *--------------------------------------------*/
-ul.moreInfo li {
-	padding: 2px 0 2px 20px;
-	background: url(<?php echo image_path(opSkinClassicConfig::get('icon_arrow_1_image')) ?>) no-repeat 0 0.4em;
-}
-ul.moreInfo.button li {
-	padding: 0;
-	background: none;
-}
-ul.moreInfo.button li form {
-	display: inline;
-}
-ul.moreInfo.button li form .input_submit {
-	margin: 0 5px;
-}
-/*----------------------------------------------
- * サブミットボタン
- *--------------------------------------------*/
-.input_submit {
-	border: 1px solid #888888;
-	background: #dadce6 url(<?php echo image_path(opSkinClassicConfig::get('bg_button_image')) ?>) repeat-x scroll 50% 0;
-	letter-spacing: 0;
-}
-.input_file {
-	background: none;
-}
-/*----------------------------------------------
- * ラジオボタン、セレクトボタン
- *--------------------------------------------*/
-.input_checkbox,
-.input_radio {
-	width: 16px;
-}
-ul.check {
-	line-height: 1.4;
-}
-ul.check .input_radio,
-ul.check .input_checkbox {
-	margin: 0 4px;
-}
-/*----------------------------------------------
- * 画像置換指定
- *--------------------------------------------*/
-#HeaderContainer a,
-#localNav a {
-	display: block;
-	width: 100%;
-	height: 100%;
-	margin: 0;
-	padding: 0;
-	border: none;
-	text-indent: -9999px;
-	text-decoration: none;
-}
-#HeaderContainer a:focus,
-#localNav a:focus {
-	overflow: hidden;
-}
-/*----------------------------------------------
- * clearfix, overflow: hidden
- *--------------------------------------------*/
-div#LayoutA,
-div#LayoutB,
-div#LayoutC,
-div.pagerRelativeMulti,
-.diaryDetailBox .partsHeading,
-.diaryDetailBox dl,
-.topicDetailBox dl,
-.eventDetailBox dl,
-.messageDetailBox div.operation,
-.prevNextLinkLine,
-.commentList dl,
-#pc_page_fh_diary_list .commentList dd div.title,
-.reviewList dl,
-.recentList dl,
-.searchCategoryList dl dd ul,
-.bizSideScheduleList dl,
-.albumImageList .partsHeading,
-.homeMainTable .partsHeading,
-.formTable .partsHeading,
-.formTable div.checkList ul,
-.monthlyCalendarTable div.block {
-	zoom: 1;
-	overflow: visible;
-}
-div#LayoutA:after,
-div#LayoutB:after,
-div#LayoutC:after,
-div.pagerRelativeMulti:after,
-.diaryDetailBox .partsHeading:after,
-.diaryDetailBox dl:after,
-.topicDetailBox dl:after,
-.eventDetailBox dl:after,
-.messageDetailBox div.operation:after,
-.prevNextLinkLine:after,
-.commentList dl:after,
-#pc_page_fh_diary_list .commentList dd div.title:after,
-.reviewList dl:after,
-.recentList dl:after,
-.searchCategoryList dl dd ul:after,
-.bizSideScheduleList dl:after,
-.albumImageList .partsHeading:after,
-.homeMainTable .partsHeading:after,
-.formTable .partsHeading:after,
-.formTable div.checkList ul:after,
-.monthlyCalendarTable div.block:after {
-	content: ".";
-	display: block;
-	clear: both;
-	height: 0;
-	visibility: hidden;
-}
-#Top {
-	overflow: hidden;
-}
-dd div, dt, ul, ol, td, th, p,
-h1, h2, h3, h4, h5, h6, .partsHeading,
-fieldset, label {
-	overflow: hidden;
-}
-dd div div {
-	overflow: visible;
-}
-pre {
-	overflow: auto;
-}
-/*----------------------------------------------
- * ベースレイアウト
- *--------------------------------------------*/
-#Container {
-	position: relative;
-	width: 720px;
-}
-#Header {
-	position: relative;
-}
-#topBanner {
-	position: absolute;
-	top: 5px;
-	left: 247px;
-	width: 468px;
-	height: 60px;
-}
-#Top {
-	padding-left: 5px;
-}
-#Top .infoBox,
-#Top .descriptionBox {
-	margin-right: 20px;
-	margin-left: 20px;
-}
-#LayoutA #Left {
-	float: left;
-	width: 270px;
-	padding: 0 5px;
-}
-#LayoutA #Center {
-	float: right;
-	width: 440px;
-}
-#LayoutB #Left {
-	float: left;
-	width: 170px;
-  margin: 5px;
-}
-#LayoutB #Center {
-	float: right;
-	width: 540px;
-}
-#LayoutC #Center {
-	width: 650px;
-	margin: 0 auto;
-}
-#Footer {
-	width: 720px;
-	height: 21px;
-	background: url(<?php echo image_path(opSkinClassicConfig::get('skin_footer_image')) ?>) 0 0 no-repeat;
-}
-#Footer p {
-	padding-right: 12px;
-	line-height: 21px;
-	text-align: right;
-}
-#sideBanner {
-	position: absolute;
-	top: 0px;
-	left: 720px;
-	width: 230px;
-}
-*:first-child+html #pc_page_h_diary_add #Footer,
-*:first-child+html #pc_page_h_diary_edit #Footer {
-	margin-top: 10px;
-}
-* html #pc_page_h_diary_add #Footer,
-* html #pc_page_h_diary_edit #Footer {
-	margin-top: 10px;
-}
-/*----------------------------------------------
- * パーツ枠
- *--------------------------------------------*/
-div.dparts,
-div.dparts div.parts,
-div.ditem,
-#LayoutA #Left div.parts {
-	border: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-div.ditem div.item {
-	border-width: 0 1px 1px;
-	border-style: solid;
-	border-color: #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-div.dparts {
-	margin: 0 auto 10px;
-	padding: 7px;
-}
-div.dparts div.parts {
-	margin: 0;
-}
-div.parts {
-	zoom: 1;
-	margin: 0 auto 10px;
-}
-div.ditem {
-	padding: 5px 6px;
-}
-/*----------------------------------------------
- * パーツ見出し
- *--------------------------------------------*/
-.partsHeading {
-	padding: 2px 8px 2px 36px;
-	background: #<?php echo opSkinClassicConfig::get('header_background_color') ?> url(<?php echo image_path(opSkinClassicConfig::get('content_header_1_image')) ?>) no-repeat 0 0;
-	text-align: left;
-	font-size: 100%;
-}
-#LayoutA #Left .partsHeading {
-	padding-left: 24px;
-	background-image: url(<?php echo image_path(opSkinClassicConfig::get('icon_title_1_image')) ?>);
-}
-.partsHeading h3 {
-	display: inline;
-	font-weight: bold;
-}
-.partsHeading p {
-	display: inline;
-	margin-left: 0.5em;
-}
-/*----------------------------------------------
- * パーツ内上下の部分（1件～20件を表示など）
- *--------------------------------------------*/
-div.block,
-div.partsInfo,
-div.pagerAbsolute,
-div.pagerRelative,
-div.pagerRelativeMulti,
-div.operation {
-	border-top: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-div.partsInfo {
-	padding: 10px 40px;
-}
-div.pagerAbsolute {
-	padding: 4px;
-	text-align: center;
-}
-div.pagerAbsolute p {
-	display: inline;
-}
-div.pagerRelative {
-	padding: 4px;
-	text-align: right;
-}
-div.pagerRelativeMulti {
-	padding: 4px;
-}
-div.pagerRelative p,
-div.pagerRelativeMulti div.pager p {
-	display: inline;
-	margin-left: 10px;
-}
-div.pagerRelative p:first-child,
-div.pagerRelativeMulti div.pager p:first-child,
-div.pagerRelative p.first-child,
-div.pagerRelativeMulti div.pager p.first-child {
-	margin-left: 0;
-}
-div.pagerRelativeMulti div.text {
-	float: left;
-	width: 55%;
-}
-div.pagerRelativeMulti div.pager {
-	float: right;
-	width: 45%;
-	margin-top: 0.5em;
-	text-align: right;
-}
-div.operation {
-	padding: 4px;
-}
-div.operation ul.moreInfo {
-	text-align: center;
-}
-div.operation ul.moreInfo li {
-	display: inline;
-	background-position: 0 50%;
-}
-/*----------------------------------------------
- * カレンダー
- *--------------------------------------------*/
-.sideNav .calendar td,
-.sideNav .calendar td * {
-	word-break: normal;
-	letter-spacing: -1px;
-}
-#Body .calendar .holiday,
-.calendar .sun {
-	color: #d92c49;
-}
-.calendar .sat {
-	color: #2c65d9;
-}
-
-/*==============================================================================
- * h系、f系、c系ナビメニュー（localNav）
- *----------------------------------------------------------------------------*/
-body.secure_page #HeaderContainer {
-	zoom: 1;
-	position: relative;
-	width: 720px;
-	height: 96px;
-	background: url(<?php echo image_path(image_path(opSkinClassicConfig::get('skin_after_header_image'))) ?>) 0 0 no-repeat;
-}
-body.insecure_page #HeaderContainer {
-	height: 125px;
-	margin-bottom: 10px;
-	background: url(<?php echo image_path(opSkinClassicConfig::get('skin_before_header_image')) ?>) 0 0 no-repeat;
-}
-#localNav {
-	zoom: 1;
-	position: relative;
-	width: 720px;
-	height: 29px;
-  margin-bottom: 10px;
-}
-#localNav .default {
-	zoom: 1;
-	width: 720px;
-	height: 29px;
-	background: url(<?php echo image_path(opSkinClassicConfig::get('skin_navi_h_image')) ?>) 0 0 no-repeat;
-}
-#localNav .friend {
-	zoom: 1;
-	width: 720px;
-	height: 29px;
-	background: url(<?php echo image_path(opSkinClassicConfig::get('skin_navi_f_image')) ?>) 0 0 no-repeat;
-}
-#localNav .community {
-	zoom: 1;
-	width: 720px;
-	height: 29px;
-	background: url(<?php echo image_path(opSkinClassicConfig::get('skin_navi_c_image')) ?>) 0 0 no-repeat;
-}
-#HeaderContainer li a:hover, #HeaderContainer li a:active {
-	background-image: url(<?php echo image_path(opSkinClassicConfig::get('skin_after_header_2_image')) ?>);
-}
-#localNav .default li a:hover, #localNav .default li a:active {
-	background-image: url(<?php echo image_path(opSkinClassicConfig::get('skin_navi_h_2_image')) ?>);
-}
-#localNav .friend li a:hover, #localNav .friend li a:active {
-	background-image: url(<?php echo image_path(opSkinClassicConfig::get('skin_navi_f_2_image')) ?>);
-}
-#localNav .community li a:hover, #localNav .community li a:active {
-	background-image: url(<?php echo image_path(opSkinClassicConfig::get('skin_navi_c_2_image')) ?>);
-}
-body.insecure_page #localNav {
-  display: none;
-}
-
-#HeaderContainer h1 {
-	position: absolute;
-	top: 5px;
-	left: 0;
-	width: 240px;
-	height: 60px;
-}
-#HeaderContainer li, #localNav li {
-	position: absolute;
-}
-
-li#globalNav_member_search,
-li#globalNav_community_search,
-li#globalNav_3 {
-	top: 70px;
-	height: 18px;
-}
-li#globalNav__homepage,
-li#globalNav_member_invite,
-li#globalNav_diary_index,
-li#globalNav_7,
-li#globalNav_member_config,
-li#globalNav_member_logout {
-	top: 68px;
-	height: 20px;
-}
-li#globalNav_member_search { left:   2px; width: 88px; }
-li#globalNav_community_search { left:  90px; width: 90px; }
-li#globalNav_3 { left: 180px; width: 88px; }
-li#globalNav__homepage { left: 290px; width: 70px; }
-li#globalNav_member_invite { left: 360px; width: 72px; }
-li#globalNav_diary_index { left: 432px; width: 72px; }
-li#globalNav_7 { left: 504px; width: 72px; }
-li#globalNav_member_config { left: 576px; width: 72px; }
-li#globalNav_member_logout { left: 648px; width: 70px; }
-li#globalNav_member_search a:hover, li#globalNav_member_search a:active { background-position:   -2px -70px; }
-li#globalNav_community_search a:hover, li#globalNav_community_search a:active { background-position:  -90px -70px; }
-li#globalNav_3 a:hover, li#globalNav_3 a:active { background-position: -180px -70px; }
-li#globalNav__homepage a:hover, li#globalNav__homepage a:active { background-position: -290px -68px; }
-li#globalNav_member_invite a:hover, li#globalNav_member_invite a:active { background-position: -360px -68px; }
-li#globalNav_diary_index a:hover, li#globalNav_diary_index a:active { background-position: -432px -68px; }
-li#globalNav_7 a:hover, li#globalNav_7 a:active { background-position: -504px -68px; }
-li#globalNav_member_config a:hover, li#globalNav_member_config a:active { background-position: -576px -68px; }
-li#globalNav_member_logout a:hover, li#globalNav_member_logout a:active { background-position: -648px -68px; }
-
-#localNav .default li {
-	top: 0;
-	width: 80px;
-	height: 29px;
-	left: -9999px;
-}
-#localNav .default li#default__homepage { left:   0px; }
-#localNav .default li#default_friend_list { left:  80px; }
-#localNav .default li#default_diary_listMember { left: 160px; }
-#localNav .default li#default_message_index { left: 240px; }
-#localNav .default li#default_ashiato_list { left: 320px; }
-#localNav .default #hLocalNav_6 { left: 400px; }
-#localNav .default #hLocalNav_7 { left: 480px; }
-#localNav .default li#default_member_profile { left: 560px; }
-#localNav .default li#default_member_editProfile { left: 640px; }
-#localNav .default li#default__homepage a:hover, #localNav .default li#default__homepage a:active { background-position:   -0px -29px; }
-#localNav .default li#default_friend_list a:hover, #localNav .default li#default_friend_list a:active { background-position:  -80px -29px; }
-#localNav .default li#default_diary_listMember a:hover, #localNav .default li#default_diary_listMember a:active { background-position: -160px -29px; }
-#localNav .default li#default_message_index a:hover, #localNav .default li#default_message_index a:active { background-position: -240px -29px; }
-#localNav .default li#default_ashiato_list a:hover, #localNav .default li#default_ashiato_list a:active { background-position: -320px -29px; }
-#localNav .default #hLocalNav_6 a:hover, #localNav .default #hLocalNav_6 a:active { background-position: -400px -29px; }
-#localNav .default #hLocalNav_7 a:hover, #localNav .default #hLocalNav_7 a:active { background-position: -480px -29px; }
-#localNav .default li#default_member_profile a:hover, #localNav .default li#default_member_profile a:active { background-position: -560px -29px; }
-#localNav .default li#default_member_editProfile a:hover, #localNav .default li#default_member_editProfile a:active { background-position: -640px -29px; }
-
-#localNav .friend li {
-	top: 0;
-	width: 80px;
-	height: 29px;
-	left: -9999px;
-}
-#localNav .friend li#friend_member_profile { left:   0px; }
-#localNav .friend li#friend_friend_list { left:  80px; }
-#localNav .friend li#friend_diary_listMember { left: 160px; }
-#localNav .friend li#friend_message_sendToFriend { left: 240px; }
-#fLocalNav_5 { left: 320px; }
-#fLocalNav_6 { left: 400px; }
-#fLocalNav_7 { left: 480px; }
-#fLocalNav_8 { left: 560px; }
-#fLocalNav_9 { left: 640px; }
-#localNav .friend li#friend_member_profile a:hover, #localNav .friend li#friend_member_profile a:active { background-position:   -0px -29px; }
-#localNav .friend li#friend_friend_list a:hover, #localNav .friend li#friend_friend_list a:active { background-position:  -80px -29px; }
-#localNav .friend li#friend_diary_listMember a:hover, #localNav .friend li#friend_diary_listMember a:active { background-position: -160px -29px; }
-#localNav .friend li#friend_message_sendToFriend a:hover, #localNav .friend li#friend_message_sendToFriend a:active { background-position: -240px -29px; }
-#fLocalNav_5 a:hover, li#fLocalNav_5 a:active { background-position: -320px -29px; }
-#fLocalNav_6 a:hover, li#fLocalNav_6 a:active { background-position: -400px -29px; }
-#fLocalNav_7 a:hover, li#fLocalNav_7 a:active { background-position: -480px -29px; }
-#fLocalNav_8 a:hover, li#fLocalNav_8 a:active { background-position: -560px -29px; }
-#fLocalNav_9 a:hover, li#fLocalNav_9 a:active { background-position: -640px -29px; }
-
-#localNav .community li {
-	top: 0;
-	width: 120px;
-	height: 29px;
-	left: -9999px;
-}
-#localNav .community li#community_community_home { left:   0px; }
-#localNav .community li#community_communityTopic_listCommunity { left: 120px; }
-#localNav .community li#cLocalNav_3 { left: 240px; }
-#localNav .community li#community_community_join { left: 360px; }
-#localNav .community li#cLocalNav_5 { left: 480px; }
-#localNav .community li#community_community_quit { left: 600px; }
-#localNav .community li#community_community_home a:hover, #localNav .community li#community_community_home a:active { background-position:   -0px -29px; }
-#localNav .community li#community_communityTopic_listCommunity a:hover, #localNav .community li#community_communityTopic_listCommunity a:active { background-position: -120px -29px; }
-#localNav .community li#cLocalNav_3 a:hover, #localNav .community li#cLocalNav_3 a:active { background-position: -240px -29px; }
-#localNav .community li#community_community_join a:hover, #localNav .community li#community_community_join a:active { background-position: -360px -29px; }
-#localNav .community li#cLocalNav_5 a:hover, #localNav .community li#cLocalNav_5 a:active { background-position: -480px -29px; }
-#localNav .community li#community_community_quit a:hover, #localNav .community li#community_community_quit a:active { background-position: -600px -29px; }
-
-/*==============================================================================
- * memberImageBox
- *----------------------------------------------------------------------------*/
-.memberImageBox * {
-  text-align: center;
-}
-
-.memberImageBox {
-  padding: 7px;
-  border: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-  background: transparent url(<?php echo image_path(opSkinClassicConfig::get('bg_parts_photo_box_image')) ?>) repeat-x 0 0;
-}
-
-.memberImageBox p.photo {
-  padding: 7px;
-  border: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-  background-color: #<?php echo opSkinClassicConfig::get('box_background_color') ?>;
-}
-
-.memberImageBox p.friendLink {
-  margin-bottom: 3px;
-}
-
-.memberImageBox ul.moreInfo {
-  margin: 2px 0 -5px;
-}
-
-.memberImageBox ul.moreInfo li {
-  padding: 1px 0;
-  background: none;
-}
-
-.memberImageBox ul.moreInfo li img {
-  vertical-align: bottom;
-}
-
-.memberImageBox p.rank {
-  margin-top: 6px;
-}
-
-.memberImageBox p.point {
-  margin-top: 2px;
-}
-
-.memberImageBox p.text {
-  margin-top: 4px;
-}
-
-.memberImageBox p.loginTime {
-  margin-top: 0px;
-}
-
-/*==============================================================================
- * 1. box（シンプルボックス）
- *----------------------------------------------------------------------------*/
-.box .body {
-	padding: 10px 0;
-}
-.box .body p {
-	text-align: center;
-}
-
-/*==============================================================================
- * 2. descriptionBox（説明ボックス）
- *----------------------------------------------------------------------------*/
-.descriptionBox p {
-	margin: 12px;
-}
-
-/*==============================================================================
- * 3. alertBox（アラートボックス）
- *----------------------------------------------------------------------------*/
-.alertBox {
-	width: 564px;
-}
-#Body .alertBox th {
-	width: 148px;
-	padding: 8px 0;
-	border: none;
-	text-align: center;
-}
-#Body .alertBox td {
-	padding: 6px;
-	border-width: 0 0 0 1px;
-	color: #ff0000;
-}
-
-/*==============================================================================
- * 4. infoBox（案内ボックス）
- *----------------------------------------------------------------------------*/
-.parts .infoBox {
-	zoom: 1;
-	position: relative;
-}
-.infoBox p {
-	margin-right: 16em;
-	padding: 5px;
-	border-right: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-	background: #<?php echo opSkinClassicConfig::get('information_background_color') ?>;
-}
-.infoBox ul.moreInfo {
-	position: absolute;
-	bottom: 3px;
-	right: 0;
-	width: 15.5em;
-}
-
-/*==============================================================================
- * 5. infoButtonBox（ボタン付き案内ボックス）
- *----------------------------------------------------------------------------*/
-.infoButtonBox .block {
-	padding: 30px 10px;
-}
-.infoButtonBox p,
-.infoButtonBox ul {
-	margin-top: 6px;
-	text-align: center;
-}
-.infoButtonBox ul.check li {
-	text-align: center;
-}
-.infoButtonBox ul.check li .input_submit {
-	margin-top: 6px;
-}
-.infoButtonBox ul.moreInfo {
-	margin-left: 230px;
-}
-.infoButtonBox ul.moreInfo.button {
-	margin-left: 0;
-}
-.infoButtonBox ul.moreInfo.button li {
-	text-align: center;
-}
-
-/*==============================================================================
- * 6. yesNoButtonBox（はい、いいえボタン付きボックス）
- *----------------------------------------------------------------------------*/
-.yesNoButtonBox .block {
-	padding: 10px 0;
-}
-.yesNoButtonBox .block p,
-.yesNoButtonBox ul.moreInfo.button {
-	text-align: center;
-}
-.yesNoButtonBox ul.moreInfo.button {
-	margin-top: 4px;
-}
-.yesNoButtonBox ul.moreInfo.button li {
-	display: inline;
-}
-
-/*==============================================================================
- * 7. searchFormBox（検索フォームボックス）
- *----------------------------------------------------------------------------*/
-.searchFormBox .partsHeading {
-	border-bottom: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-.searchFormBox .parts {
-	zoom: 1;
-}
-.searchFormBox .item {
-	margin: 10px 40px;
-	padding-top: 8px;
-	border: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-.searchFormBox label,
-.searchFormBox span.label {
-	margin: 0 4px 0 8px;
-	padding: 1px 16px 0 0;
-	background: url(<?php echo image_path(opSkinClassicConfig::get('icon_arrow_2_image')) ?>) no-repeat 100% 0;
-}
-.searchFormBox .input_submit {
-	margin-right: 8px;
-}
-.searchFormBox p.desc {
-	margin: 0 4px 16px 8px;
-}
-.searchFormBox p.form {
-	margin: 0 4px 8px 0;
-}
-.searchFormBox p.note {
-	margin: -4px 4px 8px 8px;
-}
-.searchFormBox ul.moreInfo {
-	margin: 0 4px 8px 150px;
-}
-.searchFormBox div.block {
-	padding: 8px 0;
-}
-.searchFormBox dl.category {
-	zoom: 1;
-}
-.searchFormBox dl.category dt {
-	float: left;
-	width: 6em;
-}
-.searchFormBox dl.category dd {
-	zoom: 1;
-	margin-left: 6em;
-}
-.searchFormBox dl.category dd p {
-	margin: 0 16px;
-}
-.searchFormBox dl.categories dt {
-	margin-bottom: 4px;
-}
-.searchFormBox table.category th {
-	width: 74px;
-	padding: 3px 7px 3px 5px;
-	border: none;
-	background: url(<?php echo image_path(opSkinClassicConfig::get('colon_image')) ?>) no-repeat 100% 4px;
-	font-weight: bold;
-	vertical-align: top;
-}
-.searchFormBox table.category td {
-	padding: 3px 8px;
-	border: none;
-	vertical-align: top;
-}
-
-/*==============================================================================
- * 8. diaryDetailBox（日記詳細ボックス）
- *----------------------------------------------------------------------------*/
-.diaryDetailBox h3 {
-	float: left;
-	width: 66%;
-}
-.diaryDetailBox h3 {
-	float: left;
-	width: 66%;
-}
-.diaryDetailBox .partsHeading p.public {
-	float: right;
-	width: 33%;
-	margin: 0;
-	text-align: right;
-}
-.diaryDetailBox dl {
-	border-top: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-.diaryDetailBox dt {
-	float: left;
-	width: 70px;
-	padding-top: 5px;
-	text-align: center;
-}
-.diaryDetailBox dd {
-	zoom: 1;
-	min-height: 4.5em;
-	margin-left: 70px;
-	border-left: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-* html .diaryDetailBox dd {
-	height: 4.5em;
-}
-.diaryDetailBox dd div {
-	border-top: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-.diaryDetailBox dd div p {
-	padding: 4px 3px;
-}
-.diaryDetailBox dd div.title {
-	border-top: none;
-}
-.diaryDetailBox dd div.body {
-	padding: 4px 3px;
-}
-.diaryDetailBox dd ul.photo {
-	padding: 4px 5px;
-}
-.diaryDetailBox dd ul.photo li {
-	display: inline;
-	margin-left: 6px;
-}
-.diaryDetailBox div.category ul {
-	padding: 4px;
-	text-align: right;
-}
-.diaryDetailBox div.category ul li {
-	display: inline;
-	font-size: 80%;
-}
-
-/*==============================================================================
- * 9. topicDetailBox（トピック詳細ボックス）
- *----------------------------------------------------------------------------*/
-.topicDetailBox dl {
-	border-top: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-.topicDetailBox dt {
-	float: left;
-	width: 100px;
-	padding: 5px;
-	text-align: center;
-}
-.topicDetailBox dd {
-	zoom: 1;
-	margin-left: 110px;
-	border-left: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-.topicDetailBox dd div {
-	border-top: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-.topicDetailBox dd div p {
-	padding: 5px;
-}
-.topicDetailBox dd div.title {
-	border-top: none;
-}
-.topicDetailBox dd ul.photo {
-	padding: 5px;
-}
-.topicDetailBox dd ul.photo li {
-	display: inline;
-	margin-left: 6px;
-}
-.topicDetailBox dd div.attachFile {
-	padding: 16px 5px;
-}
-.topicDetailBox div.operation {
-	padding: 10px 0;
-}
-
-/*==============================================================================
- * 10. eventDetailBox（イベント詳細ボックス）
- *----------------------------------------------------------------------------*/
-.eventDetailBox dl {
-	border-top: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-.eventDetailBox dt {
-	float: left;
-	width: 100px;
-	padding: 5px;
-	text-align: center;
-}
-.eventDetailBox dd {
-	zoom: 1;
-	margin-left: 110px;
-	border-left: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-.eventDetailBox dd ul.photo {
-	padding: 5px;
-	border-bottom: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-.eventDetailBox dd ul.photo li {
-	display: inline;
-	margin-left: 6px;
-}
-.eventDetailBox dd table th {
-	width: 112px;
-	text-align: center;
-	border-left: none;
-}
-.eventDetailBox dd table th,
-.eventDetailBox dd table td {
-	padding: 5px;
-}
-.eventDetailBox dd table tr:first-child th,
-.eventDetailBox dd table tr:first-child td,
-.eventDetailBox dd table tr.first-child th,
-.eventDetailBox dd table tr.first-child td {
-	border-top: none;
-}
-.eventDetailBox dd table ul.moreInfo {
-	margin-top: -1.2em;
-	text-align: right;
-}
-.eventDetailBox dd table ul.moreInfo li {
-	display: inline;
-	background-position: 0 50%;
-}
-
-/*==============================================================================
- * 11. homePhotoBox（ホーム写真ボックス）
- *----------------------------------------------------------------------------*/
-.homePhotoBox * {
-	text-align: center;
-}
-.homePhotoBox p.friendLink {
-	margin-bottom: 3px;
-}
-.homePhotoBox .parts {
-	padding: 7px;
-}
-.homePhotoBox ul.moreInfo {
-	margin: 2px 0 -5px;
-}
-.homePhotoBox ul.moreInfo li {
-	padding: 1px 0;
-	background: none;
-}
-.homePhotoBox ul.moreInfo li img {
-	vertical-align: bottom;
-}
-.homePhotoBox p.rank {
-	margin-top: 6px;
-}
-.homePhotoBox p.point {
-	margin-top: 2px;
-}
-.homePhotoBox p.text {
-	margin-top: 4px;
-}
-.homePhotoBox p.loginTime {
-	margin-top: 0px;
-}
-
-/*==============================================================================
- * 12. homeInfoBox（ホームインフォメーションボックス）
- *----------------------------------------------------------------------------*/
-.informationBox {
-	padding-left: 102px;
-	border: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-	background: #<?php echo opSkinClassicConfig::get('information_background_color') ?> url(<?php echo image_path(opSkinClassicConfig::get('icon_information_image')) ?>) no-repeat 5px 50%;
-}
-.informationBox div.body {
-	min-height: 1.2em;
-	padding: 5px;
-	border-left: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-	background: #<?php echo opSkinClassicConfig::get('box_background_color') ?>;
-}
-* html .informationBox div.body {
-	height: 1.2em;
-}
-.informationBox .caution {
-	color: #ff0000;
-}
-
-/*==============================================================================
- * 13. photoUploadFormBox（プロフィール写真アップロードフォームボックス）
- *----------------------------------------------------------------------------*/
-.photoUploadFormBox table {
-	border-top: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-#Body .photoUploadFormBox td {
-	padding: 8px 0;
-	border: none;
-	text-align: center;
-}
-.photoUploadFormBox form {
-	float: left;
-	width: 230px;
-}
-.photoUploadFormBox form p {
-	margin: 8px 0;
-	text-align: center;
-}
-.photoUploadFormBox ul {
-	zoom: 1;
-	margin: 8px 0 8px 230px;
-}
-.photoUploadFormBox li {
-	padding-left: 12px;
-	background: url(<?php echo image_path(opSkinClassicConfig::get('marker_image')) ?>) no-repeat 3px 3px;
-}
-
-/*==============================================================================
- * 14. messageDetailBox（メッセージ詳細ボックス）
- *----------------------------------------------------------------------------*/
-#Body .messageDetailBox th:first-child,
-#Body .messageDetailBox th.first-child {
-	border-left-width: 1px;
-}
-.messageDetailBox th,
-.messageDetailBox td {
-	padding: 5px;
-}
-.messageDetailBox td.photo {
-	width: 120px;
-	text-align: center;
-}
-.messageDetailBox th {
-	width: 54px;
-	padding-left: 0;
-	padding-right: 16px;
-	background: url(<?php echo image_path(opSkinClassicConfig::get('colon_image')) ?>) no-repeat 96% 50%;
-	text-align: right;
-}
-#Body .messageDetailBox td {
-	border-left: none;
-}
-.messageDetailBox ul.photo {
-	margin: 10px;
-	text-align: center;
-}
-.messageDetailBox p.text {
-	margin: 10px 60px;;
-}
-.messageDetailBox ul.photo li {
-	display: inline;
-	margin-left: 6px;
-}
-.messageDetailBox form.delete {
-	float: left;
-	width: 50%;
-	text-align: left;
-}
-.messageDetailBox form.send {
-	float: right;
-	width: 50%;
-	text-align: right;
-}
-.messageDetailBox form ul.moreInfo {
-	display: inline;
-}
-.messageDetailBox div.attachFile {
-	padding: 16px 5px;
-}
-
-/*==============================================================================
- * 15. albumDetailBox（アルバム詳細ボックス）
- *----------------------------------------------------------------------------*/
-.albumDetailBox th,
-.albumDetailBox td {
-	padding: 5px;
-}
-.albumDetailBox th {
-	width: 75px;
-}
-.albumDetailBox td.photo {
-	width: 190px;
-	padding: 5px 0;
-	text-align: center;
-}
-#Body .albumDetailBox th:first-child,
-#Body .albumDetailBox th.first-child,
-#Body .albumDetailBox td.operation {
-	border-left-width: 1px;
-}
-.albumDetailBox td.operation {
-	text-align: right;
-}
-
-/*==============================================================================
- * 16. albumImageBox（アルバム画像ボックス）
- *----------------------------------------------------------------------------*/
-.albumImageBox p.photo {
-	padding: 10px;
-	border-top: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-	text-align: center;
-}
-.albumImageBox th, .albumImageBox td {
-	padding: 5px;
-}
-#Body .albumImageBox th {
-	width: 140px;
-	border-left: none;
-}
-
-/*==============================================================================
- * 17. searchFormLine（検索フォームライン）
- *----------------------------------------------------------------------------*/
-.searchFormLine ul {
-	text-align: center;
-	padding: 1px 0;
-}
-.searchFormLine ul li {
-	display: inline;
-}
-.searchFormLine ul li * {
-	vertical-align: middle;
-}
-.searchFormLine ul li label {
-	margin-right: 2px;
-	padding: 1px 13px 0 0;
-	background: url(<?php echo image_path(opSkinClassicConfig::get('icon_arrow_2_image')) ?>) no-repeat 100% 0;
-}
-
-/*==============================================================================
- * 18. linkLine（リンクライン）
- *----------------------------------------------------------------------------*/
-.linkLine ul.moreInfo {
-	text-align: center;
-}
-.linkLine ul.moreInfo li {
-	display: inline;
-	background-position: 0 50%;
-}
-
-/*==============================================================================
- * 19. prevNextLinkLine（前次リンクライン）
- *----------------------------------------------------------------------------*/
-.prevNextLinkLine p.prev {
-	float: left;
-	width: 50%;
-	text-align: left;
-}
-.prevNextLinkLine p.next {
-	float: right;
-	width: 50%;
-	text-align: right;
-}
-.block.prevNextLinkLine {
-	padding: 4px 10px;
-}
-
-/*==============================================================================
- * 20. buttonLine（ボタンライン）
- *----------------------------------------------------------------------------*/
-.buttonLine form {
-	text-align: center;
-}
-
-/*==============================================================================
- * 21. alertLine（アラートライン）
- *----------------------------------------------------------------------------*/
-.alertLine p {
-	text-align: center;
-	color: #ff0000;
-}
-
-/*==============================================================================
- * 22. commentList（コメントリスト）
- *----------------------------------------------------------------------------*/
-.commentList dl {
-	border-top: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-.commentList dt {
-	float: left;
-	width: 70px;
-	padding-top: 5px;
-	text-align: center;
-}
-.commentList dd {
-	zoom: 1;
-	min-height: 5.5em;
-	margin-left: 70px;
-	border-left: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-* html .commentList dd {
-	height: 5.5em;
-}
-#LayoutC .commentList dt {
-	width: 110px;
-}
-#LayoutC .commentList dd {
-	margin-left: 110px;
-}
-.commentList dd div {
-	border-top: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-.commentList dd div p {
-	padding: 4px 3px;
-}
-.commentList dd div.title {
-	padding: 4px 3px;
-	border-top: none;
-}
-.commentList dd div.title p {
-	padding: 0;
-}
-#pc_page_fh_diary_list .commentList dd div.title p.heading {
-	float: left;
-	width: 66%;
-}
-#pc_page_fh_diary_list .commentList dd div.title p.public {
-	float: right;
-	width: 33%;
-	text-align: right;
-}
-.commentList dd ul.photo {
-	padding: 5px 5px 0;
-}
-.commentList dd ul.photo li {
-	display: inline;
-	margin-left: 6px;
-}
-.commentList dd div.footer p {
-	text-align: right;
-}
-.commentList div.operation {
-	padding: 8px 0;
-}
-.commentList dd div.attachFile {
-	padding: 16px 5px;
-}
-
-/*==============================================================================
- * 23. searchResultList（検索結果リスト）
- *----------------------------------------------------------------------------*/
-.searchResultList .partsInfo {
-	background: #<?php echo opSkinClassicConfig::get('information_background_color') ?>;
-}
-.searchResultList .ditem {
-	margin: 8px 34px;
-}
-.searchResultList td.photo {
-	width: 90px;
-	padding: 0;
-	border-left: none;
-	text-align: center;
-}
-.searchResultList th, .searchResultList td {
-	padding: 5px;
-}
-.searchResultList th {
-	width: 75px;
-}
-#Body .searchResultList th:first-child,
-#Body .searchResultList th.first-child {
-	border-left-width: 1px;
-}
-.searchResultList tr.operation th {
-	padding-top: 0;
-	padding-bottom: 0;
-}
-.searchResultList tr.operation td {
-	padding: 0;
-}
-.searchResultList tr.operation span.text {
-	float: left;
-	display: block;
-	width: 110px;
-	padding: 5px;
-	border-right: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-.searchResultList tr.operation span.moreInfo{
-	zoom: 1;
-	display: block;
-	margin-left: 121px;
-	padding: 4px 0 3px;
-	text-align: center;
-}
-.searchResultList div.operation {
-	text-align: center;
-}
-.searchResultList tr.operation span.moreInfo img,
-.searchResultList div.operation form,
-.searchResultList div.operation fieldset {
-	display: inline;
-	vertical-align: top;
-}
-
-/*==============================================================================
- * 24. reviewList（レビューリスト）
- *----------------------------------------------------------------------------*/
-.reviewList dl {
-	border-top: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-.reviewList dl dt {
-	float:left;
-	width: 170px;
-	padding: 5px;
-	text-align: center;
-}
-.reviewList dl dt span {
-	display: block;
-	margin: 3px 0;
-}
-.reviewList dl dd {
-	zoom: 1;
-	margin-left: 180px;
-	border-left: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-.reviewList dl dd table {
-	height: 216px;
-}
-.reviewList dl dd th,
-.reviewList dl dd td {
-	padding: 5px;
-}
-.reviewList dl tr.title th,
-.reviewList dl dd tr.title td {
-	border-top: none;
-}
-.reviewList dl dd th {
-	width: 100px;
-	border-left: none;
-	text-align: center;
-}
-.reviewList dl dd tr.title td {
-	font-weight: bold;
-}
-.reviewList dl dd td p.operation {
-	text-align: right;
-}
-.reviewList dl dd tr.footer td {
-	border-left: none;
-	text-align: right;
-}
-.reviewList div.operation {
-	padding: 10px 0;
-}
-
-/*==============================================================================
- * 25. recentList（最新書き込みリスト）
- *----------------------------------------------------------------------------*/
-.recentList dl {
-	border-top: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-.recentList dt {
-	float: left;
-	width: 170px;
-	padding: 5px;
-	text-align: center;
-}
-.recentList dd {
-	zoom: 1;
-	margin-left: 180px;
-	padding: 5px;
-	border-left: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-* html #Body .recentList dd {
-	height: 1.2em;
-}
-#LayoutB #Center .recentList dt {
-	width: 110px;
-}
-#LayoutB #Center .recentList dd {
-	margin-left: 120px;
-}
-
-/*==============================================================================
- * 26. friendIntroList（フレンド紹介文リスト）
- *----------------------------------------------------------------------------*/
-.friendIntroList th,
-.friendIntroList td {
-	padding: 14px;
-}
-#Body .friendIntroList th {
-	width: 120px;
-	border-left: none;
-	text-align: center;
-}
-.friendIntroList p.text {
-	margin-bottom: 1em;
-}
-.friendIntroList div.moreInfo ul.moreInfo {
-	width: 10em;
-	margin-left: auto;
-	padding: 6px 2px;
-}
-
-/*==============================================================================
- * 27. manageList（管理リスト）
- *----------------------------------------------------------------------------*/
-.manageList td {
-	padding: 5px;
-}
-.manageList td.photo {
-	width: 140px;
-	border-left: none;
-	text-align: center;
-}
-.manageList td.delete {
-	width: 120px;
-}
-.manageList col.date {
-	width: 160px;
-}
-* html .manageList col.date {
-	width: 150px;
-}
-*:first-child+html .manageList col.date {
-	width: 150px;
-}
-.manageList col.name {
-	width: auto;
-}
-.manageList colgroup.operation col {
-	width: 86px;
-}
-* html .manageList colgroup.operation col {
-	width: 76px;
-}
-*:first-child+html .manageList colgroup.operation col {
-	width: 76px;
-}
-
-/*==============================================================================
- * 28. searchCategoryList（検索項目リスト）
- *----------------------------------------------------------------------------*/
-.searchCategoryList .partsInfo {
-	padding: 5px;
-	border-bottom: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-	background: #<?php echo opSkinClassicConfig::get('information_background_color') ?>;
-	text-align: center;
-}
-.searchCategoryList .item {
-	margin: 10px 40px;
-	border: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-	border-top: none;
-}
-.searchCategoryList span.label {
-	margin: 0 4px 0 8px;
-	padding: 1px 16px 0 0;
-	background: url(<?php echo image_path(opSkinClassicConfig::get('icon_arrow_2_image')) ?>) no-repeat 100% 0;
-}
-.searchCategoryList dl {
-	border-top: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-.searchCategoryList dl dt {
-	margin: 8px 0 0;
-}
-.searchCategoryList dl dd {
-	margin: 8px 10px 8px 70px;
-}
-.searchCategoryList dl dd ul {
-	margin: 4px 0;
-}
-.searchCategoryList dl dd ul li {
-	overflow: hidden;
-	float: left;
-	width: 19%;
-	margin: 0 2px;
-}
-
-/*==============================================================================
- * 29. messageList（メッセージリスト）
- *----------------------------------------------------------------------------*/
-.messageList .partsHeading p.date {
-	font-weight: bold;
-}
-.messageList .pagerRelativeMulti .text {
-	width: 160px;
-}
-.messageList .pagerRelativeMulti .pager {
-	width: 350px;
-	margin-top: 1px;
-}
-.messageList p.icons img {
-	padding-right: 16px;
-	background: url(<?php echo image_path(opSkinClassicConfig::get('articleList_marker_image')) ?>) no-repeat 96% 6px;
-	vertical-align: text-bottom;
-}
-.messageList tr {
-	height: 20px;
-}
-.messageList tr.unread {
-	background: #<?php echo opSkinClassicConfig::get('information_background_color') ?>;
-}
-#Body .messageList th.delete {
-	font-weight: normal;
-}
-#Body .messageList th {
-	padding: 0 2px;
-	border-width: 1px 0 0;
-	font-weight: bold;
-}
-#Body .messageList td {
-	padding: 0 2px;
-	border-width: 1px 0 0;
-}
-#Body .messageList td .input_checkbox {
-	margin-left: 4px;
-}
-.messageList td.status {
-	text-align: center;
-}
-.messageList col.status {
-	width: 35px;
-}
-.messageList col.delete {
-	width: 35px;
-}
-.messageList col.target {
-	width: 130px;
-}
-.messageList col.title {
-	width: auto;
-}
-.messageList col.date {
-	width: 80px;
-}
-.messageList table span {
-	width: 100%;
-	display: block;
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-}
-.messageList div.operation p {
-	margin-top: 8px;
-	margin-bottom: 5px;
-}
-.messageList div.operation ul.moreInfo {
-	text-align: left;
-}
-
-/*==============================================================================
- * 30. ashiatoList（あしあとリスト）
- *----------------------------------------------------------------------------*/
-.ashiatoList div.partsInfo {
-	border-bottom: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-.ashiatoList div.item {
-	margin: 8px 40px;
-	padding: 8px 0;
-	border: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-.ashiatoList div.item p,
-.ashiatoList div.item ul.list {
-	padding-left: 160px;
-}
-.ashiatoList div.item p strong {
-	margin: 0 2px;
-}
-.ashiatoList div.item ul.list {
-	margin-top: 16px;
-}
-
-/*==============================================================================
- * 31. rankingList（ランキングリスト）
- *----------------------------------------------------------------------------*/
-.rankingList .partsHeading p {
-	margin: 0;
-}
-#Body .rankingList th:first-child,
-#Body .rankingList th.first-child {
-	border-left-width: 1px;
-}
-.rankingList td.photo {
-	width: 130px;
-	padding: 5px 0;
-	text-align: center;
-}
-.rankingList th {
-	width: 75px;
-	padding: 5px;
-}
-.rankingList td {
-	padding: 5px;
-}
-.rankingList td.name {
-	background: #<?php echo opSkinClassicConfig::get('information_background_color') ?>;
-}
-.rankingList td.name a {
-	font-weight: bold;
-}
-.rankingList .ditem {
-	margin: 8px 15px;
-	background: #<?php echo opSkinClassicConfig::get('information_background_color') ?>;
-}
-.rankingList .item {
-	background: #<?php echo opSkinClassicConfig::get('box_background_color') ?>;
-}
-.rankingList .item td.photo {
-	width: 90px;
-}
-
-/*==============================================================================
- * 32. bizSideTodoList（BIZ用Todoリスト）
- *----------------------------------------------------------------------------*/
-#Body .bizSideTodoList {
-	width: 220px;
-	margin: 10px 5px;
-	border: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-#Body .bizSideTodoList td {
-	border-width: 1px 0 0;
-}
-.bizSideTodoList .block {
-	padding: 5px;
-}
-.bizSideTodoList textarea {
-	width: 98%;
-}
-.bizSideTodoList tr.someone {
-	background: #<?php echo opSkinClassicConfig::get('information_background_color') ?>;
-}
-.bizSideTodoList tr.checked {
-	color: #999999;
-}
-.bizSideTodoList td.state {
-	width: 38px;
-	vertical-align: top;
-}
-.bizSideTodoList tr.priLow td.state p {
-	padding-left: 4px;
-	border-left: 0;
-}
-.bizSideTodoList tr.priMiddle td.state p {
-	padding-left: 0;
-	border-left: 4px solid #ff8080;
-}
-.bizSideTodoList tr.priHigh td.state p {
-	padding-left: 0;
-	border-left: 4px solid #ff0000;
-}
-.bizSideTodoList tr.checked td.state p {
-	padding-left: 4px;
-	border-left: 0;
-}
-.bizSideTodoList td.operation {
-	width: 16px;
-	vertical-align: top;
-}
-.bizSideTodoList td.operation a {
-	display: block;
-	width: 14px;
-	margin-top: 2px;
-}
-
-/*==============================================================================
- * 33. bizSideScheduleList（BIZ用スケジュールリスト） 
- *----------------------------------------------------------------------------*/
-#Body .bizSideScheduleList {
-	width: 220px;
-	margin: 10px 5px;
-	border: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-.bizSideScheduleList dl {
-	border-top: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-.bizSideScheduleList dt {
-	float: left;
-	width: 60px;
-	padding: 5px;
-	text-align: center;
-}
-.bizSideScheduleList dd {
-	zoom: 1;
-	margin-left: 70px;
-	padding: 5px;
-	border-left: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-
-/*==============================================================================
- * 34. albumList（アルバムリスト）
- *----------------------------------------------------------------------------*/
-.albumList th,
-.albumList td {
-	padding: 5px;
-}
-.albumList th {
-	width: 75px;
-}
-.albumList td.photo {
-	width: 190px;
-	padding: 5px 0;
-	text-align: center;
-}
-.albumList td.photo p {
-	text-align: center;
-	padding: 5px;
-}
-#Body .albumList th:first-child,
-#Body .albumList th.first-child {
-	border-left-width: 1px;
-}
-.albumList td.operation {
-	text-align: center;
-}
-
-/*==============================================================================
- * 35. albumImageList（アルバム画像リスト）
- *----------------------------------------------------------------------------*/
-.albumImageList td {
-	padding: 5px;
-	text-align: center;
-}
-.albumImageList td p {
-	text-align: center;
-}
-
-/*==============================================================================
- * 36. nineTable（ホーム9面テーブル）
- *----------------------------------------------------------------------------*/
-.nineTable tr.photo td {
-	height: 80px;
-	padding: 2px 0;
-	text-align: center;
-}
-.nineTable tr.photo td p.crown {
-	text-align: center;
-}
-.nineTable tr.text td {
-	padding: 2px;
-	text-align: center;
-}
-.nineTable div.moreInfo {
-  border-top: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-.nineTable div.moreInfo ul.moreInfo {
-	width: 11em;
-	margin-left: auto;
-	padding: 6px 0;
-}
-
-/*==============================================================================
- * 37. photoTable（写真テーブル）
- *----------------------------------------------------------------------------*/
-.photoTable {
-	width: 561px;
-}
-.photoTable tr.photo td {
-	height: 90px;
-	padding: 8px 0;
-	text-align: center;
-}
-.photoTable tr.photo td p.crown {
-	text-align: center;
-}
-.photoTable tr.text td {
-	padding: 5px 2px;
-	text-align: center;
-}
-
-/*==============================================================================
- * 38. homeMainTable（ホームメインテーブル）
- *----------------------------------------------------------------------------*/
-#page_member_home #Center h3 .partsHeading,
-#page_member_profile #Center h3 .partsHeading,
-.listBox .partsHeading h3,
-.albumImageList .partsHeading h3,
-.homeMainTable .partsHeading h3 {
-	float: left;
-	width: 66%;
-}
-#page_member_home #Center h3 p.link,
-#page_member_profile #Center h3 p.link,
-.listBox .partsHeading p.link, 
-.albumImageList .partsHeading p.link, 
-.homeMainTable .partsHeading p.link {
-	float: right;
-	width: 33%;
-	margin: 0;
-	text-align: right;
-}
-#page_member_home #Center th,
-#page_member_profile #Center th,
-.listBox th, 
-.homeMainTable th {
-	width: 83px;
-	background-color: #<?php echo opSkinClassicConfig::get('information_background_color') ?>;
-}
-#page_member_home #Center div.block,
-#page_member_profile #Center div.block,
-.listBox th, .listBox td,
-.homeMainTable th, .homeMainTable td {
-	padding: 5px;
-}
-#page_member_home #Center ul.articleList,
-#page_member_profile #Center ul.articleList,
-.listBox ul.articleList,
-.homeMainTable ul.articleList {
-	line-height: 1.3;
-}
-#page_member_home #Center ul.articleList li,
-#page_member_profile #Center ul.articleList li,
-.homeMainTable ul.articleList li {
-    padding-left: 85px;
-    text-indent: -72px;
-}
-#page_member_home #Center ul.articleList li,
-#page_member_profile #Center ul.articleList li,
-.listBox tr ul.articleList li,
-.homeMainTable tr ul.articleList li {
-    background: url(<?php echo image_path(opSkinClassicConfig::get('icon_3_image')) ?>) 3px 0.4em no-repeat scroll;
-}
-.homeMainTable tr.myFriendRecentDiary ul.articleList li,
-.homeMainTable tr.myFriendRecentBlog ul.articleList li,
-.homeMainTable tr.allRecentDiary ul.articleList li,
-.homeMainTable tr.bookmarkRecentDiary ul.articleList li,
-.homeMainTable tr.bookmarkRecentBlog ul.articleList li,
-.homeMainTable tr.myRecentDiary ul.articleList li,
-.homeMainTable tr.myRecentBlog ul.articleList li,
-.homeMainTable tr.friendRecentDiary ul.articleList li,
-.homeMainTable tr.friendRecentBlog ul.articleList li
-{
-    background-image: url(<?php echo image_path(opSkinClassicConfig::get('icon_1_image')) ?>);
-}
-.homeMainTable tr.diaryCommentHistory ul.articleList li,
-.homeMainTable tr.recentCommunityTopicComment ul.articleList li,
-.homeMainTable tr.allRecentCommunityTopicComment ul.articleList li,
-.homeMainTable tr.communityTopic ul.articleList li,
-.homeMainTable tr.communityEvent ul.articleList li
-{
-    background-image: url(<?php echo image_path(opSkinClassicConfig::get('icon_2_image')) ?>);
-}
-#page_member_home #Center ul.articleList li span.date,
-#page_member_profile #Center ul.articleList li span.date,
-.listBox ul.articleList li span.date,
-.homeMainTable ul.articleList li span.date {
-	padding-right: 18px;
-	background: url(<?php echo image_path(opSkinClassicConfig::get('articleList_marker_image')) ?>) 92% 0.3em no-repeat scroll;
-}
-#page_member_home #Center div.moreInfo ul.moreInfo,
-#page_member_profile #Center div.moreInfo ul.moreInfo,
-.listBox div.moreInfo ul.moreInfo,
-.homeMainTable div.moreInfo ul.moreInfo {
-	width: 10em;
-	margin: 0 2px 0 auto;
-}
-#page_member_home #Center td.halfway ul.moreInfo,
-#page_member_profile #Center td.halfway ul.moreInfo,
-.listBox td.halfway ul.moreInfo,
-.homeMainTable td.halfway ul.moreInfo {
-	width: 12em;
-	margin: 0 0 20px auto;
-}
-
-/*==============================================================================
- * 39. form（入力フォームテーブル）
- *----------------------------------------------------------------------------*/
-.form .partsHeading div.text {
-	float: left;
-	width: 66%;
-}
-.form .partsHeading p.link {
-	float: right;
-	width: 33%;
-	margin: 0;
-	text-align: right;
-}
-.form strong {
-	font-weight: normal;
-	color: #ff0000;
-}
-.form p.caution {
-	color: #ff0000;
-}
-.form div.block {
-	background-color: #<?php echo opSkinClassicConfig::get('information_background_color') ?>;
-	padding: 10px 40px;
-}
-.form th, .form td {
-	padding: 5px;
-}
-#Body .form th {
-	width: 140px;
-	border-left: none;
-}
-#LayoutB #Center .form th {
-	width: 80px;
-}
-.form table table td {
-	padding: 0;
-	border: none;
-}
-.form textarea {
-	width: 98%;
-}
-.form input.input_text_long {
-	width: 98%;
-}
-.form table table td.publicSelector {
-	width: 150px;
-	text-align: right;
-}
-.form table table td.publicSelector select {
-	width: 150px;
-}
-.form div.checkList li {
-	overflow: hidden;
-	float: left;
-	width: 33%;
-	line-height: 1.6;
-}
-.form div.checkList li div.item {
-	padding-left: 18px;
-	text-indent: -18px;
-}
-.form div.operation {
-	padding: 10px 0;
-}
-
-/*==============================================================================
- * 40. weeklyCalendarTable（週間カレンダーテーブル）
- *----------------------------------------------------------------------------*/
-#Body .weeklyCalendarTable .parts {
-	border-top: none;
-}
-.weeklyCalendarTable div.block {
-	padding: 5px;
-}
-.weeklyCalendarTable .input_text {
-	width: 120px;
-}
-.weeklyCalendarTable .input_submit {
-	margin-right: 8px;
-}
-.weeklyCalendarTable .calendar td {
-	padding: 5px;
-	vertical-align: top;
-}
-.weeklyCalendarTable .calendar .today {
-	background: #<?php echo opSkinClassicConfig::get('information_background_color') ?>;
-}
-.weeklyCalendarTable .calendar .today p.day {
-	font-weight: bold;
-}
-.weeklyCalendarTable ul.moreInfo {
-	margin: 0 2px 0 auto;
-	width: 9em;
-}
-
-/*==============================================================================
- * 41. monthlyCalendarTable（月間カレンダーテーブル）
- *----------------------------------------------------------------------------*/
-.monthlyCalendarTable div.block {
-	padding: 2px 5px;
-}
-.monthlyCalendarTable div.block p.moreInfo {
-	float: left;
-	width: 70%;
-	text-align: left;
-}
-.monthlyCalendarTable div.block p.moreInfo a {
-	margin-right: 4px;
-}
-.monthlyCalendarTable div.block p.pager {
-	float: right;
-	width: 30%;
-	margin-top: 2px;
-	text-align: right;
-}
-.monthlyCalendarTable .calendar th {
-	padding: 2px;
-}
-.monthlyCalendarTable .calendar td {
-	height: 65px;
-	padding: 2px;
-	vertical-align: top;
-}
-.monthlyCalendarTable .calendar td.today {
-	background: #<?php echo opSkinClassicConfig::get('information_background_color') ?>;
-	font-weight: bold;
-}
-.monthlyCalendarTable .calendar td p {
-	font-weight: normal;
-}
-.monthlyCalendarTable .partsInfo {
-	padding: 5px;
-	background: #<?php echo opSkinClassicConfig::get('information_background_color') ?>;
-}
-.monthlyCalendarTable .partsInfo img {
-	margin: 0 1px;
-}
-
-/*==============================================================================
- * 42. bizWeeklyCalendarTable（BIZ用週間カレンダーテーブル）
- *----------------------------------------------------------------------------*/
-#Body .bizWeeklyCalendarTable .parts {
-	border-top: none;
-}
-.bizWeeklyCalendarTable div.block {
-	padding: 5px;
-}
-.bizWeeklyCalendarTable .calendar td {
-	padding: 5px 0;
-	vertical-align: top;
-}
-.bizWeeklyCalendarTable .calendar td p {
-	padding: 0 5px;
-}
-.bizWeeklyCalendarTable .calendar td .time {
-	padding: 0;
-}
-.bizWeeklyCalendarTable .calendar .today {
-	background: #<?php echo opSkinClassicConfig::get('information_background_color') ?>;
-}
-.bizWeeklyCalendarTable .calendar .today p.day {
-	font-weight: bold;
-}
-.bizWeeklyCalendarTable .calendar th {
-	width: 130px;
-	padding: 5px 0;
-	text-align: center;
-}
-.bizWeeklyCalendarTable .calendar th * {
-	text-align: center;
-}
-.bizWeeklyCalendarTable .calendar th .input_text {
-	width: 118px;
-}
-.bizWeeklyCalendarTable .calendar th .input_submit {
-	width: 120px;
-}
-.bizWeeklyCalendarTable .calendar th .nickname {
-	margin: 5px 0;
-}
-.bizWeeklyCalendarTable .calendar th .member_image {
-	margin-bottom: 5px;
-}
-.bizWeeklyCalendarTable .calendar td.sub {
-	border-width: 0 0 0 1px;
-}
-.bizWeeklyCalendarTable div.moreInfo {
-	padding-left: 135px;
-}
-.bizWeeklyCalendarTable div.moreInfo .input_submit {
-	margin-right: 8px;
-}
-
-/*==============================================================================
- * 43. pageNav（サイドナビ）
- *----------------------------------------------------------------------------*/
-.pageNav .item {
-	width: 150px;
-	margin: 0 auto 10px;
-	border: 8px solid #<?php echo opSkinClassicConfig::get('left_menu_background_color') ?>;
-}
-.pageNav .partsHeading {
-	border-bottom: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-}
-.pageNav ul {
-	margin: 1px;
-}
-.pageNav li {
-	padding: 4px 0 4px 18px;
-	background: url(<?php echo image_path(opSkinClassicConfig::get('icon_1_image')) ?>) 8px 50% no-repeat scroll;
-}
-.pageNav li.looking {
-	background-color: #<?php echo opSkinClassicConfig::get('information_background_color') ?>;
-}
-.pageNav .calendar .partsHeading {
-	padding: 4px 0;
-	border: none;
-	background: none;
-	text-align: center;
-}
-.pageNav .calendar th {
-	background-color: #<?php echo opSkinClassicConfig::get('information_background_color') ?>;
-	text-align: center;
-}
-.pageNav .calendar td {
-	padding: 1px 2px;
-	text-align: right;
-}
-.pageNav .list {
-	padding: 4px 0;
-}
-.pageNav .list li {
-	padding-left: 16px;
-	background: no-repeat 6px 4px;
-}
-.pageNav .monthlyMessage li  { background-image: url(<?php echo image_path(opSkinClassicConfig::get('icon_1_image')) ?>); }
-.pageNav .recentlyDiary li   { background-image: url(<?php echo image_path(opSkinClassicConfig::get('icon_3_image')) ?>); }
-.pageNav .recentlyComment li { background-image: url(<?php echo image_path(opSkinClassicConfig::get('icon_1_image')) ?>); }
-.pageNav .monthlyDiary li    { background-image: url(<?php echo image_path(opSkinClassicConfig::get('icon_2_image')) ?>); }
-.pageNav .listCategory li    { background-image: url(<?php echo image_path(opSkinClassicConfig::get('icon_2_image')) ?>); }
-
-/*==============================================================================
- * 44. rankingSideNav（ランキングサイドナビ）
- *----------------------------------------------------------------------------*/
-.rankingSideNav {
-	width: 150px;
-	margin: 0 auto;
-	border: 8px solid #<?php echo opSkinClassicConfig::get('left_menu_background_color') ?>;
-}
-.rankingSideNav .partsHeading {
-	padding: 2px 4px;
-	border-bottom: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-	background-image: none;
-	text-align: center;
-}
-.rankingSideNav p {
-	margin: 3px;
-}
-.rankingSideNav p.link {
-	padding: 3px;
-	border: 1px solid #<?php echo opSkinClassicConfig::get('line_color') ?>;
-	text-align: right;
-}
-
-/**=============================================================================
- * 配色設定
- *----------------------------------------------------------------------------*/
-#Body {
-	background: #<?php echo opSkinClassicConfig::get('page_background_color') ?>;
-}
-#Container {
-	background: #<?php echo opSkinClassicConfig::get('contents_background_color') ?>;
-}
-div.dparts {
-	background: #<?php echo opSkinClassicConfig::get('frame_color') ?>;
-}
-div.parts {
-	background-color: #<?php echo opSkinClassicConfig::get('box_background_color') ?>;
-}
-.sideNav .item {
-	background-color: #<?php echo opSkinClassicConfig::get('box_background_color') ?>;
-}
-#Body .sideNav {
-	background-color: transparent;
-}
-#Body .linkLine,
-#Body .searchFormLine,
-#Body .buttonLine,
-#Body .prevNextLinkLine,
-#Body .homeBirthdayBox {
-	background-color: transparent;
-}
-
-/**=============================================================================
- * ログインページ
- *----------------------------------------------------------------------------*/
-div#container_login {
-	position: relative;
-	display: block;
-	margin: 0px auto 0px 0px;
-	width: 720px;
-	height: 563px;
-	padding: 0px;
-}
-
-div#container_login img.bg {
-	display: block;
-	position: absolute;
-	left: 0px;
-	top: 0px;
-	width: 720px;
-	height: 563px;
-	z-index: 0;
-}
-
-div#container_login a img {
-	width: 100%;
-	height: 100%;
-}
-
-div#container_login div.banner,
-div#container_login a.banner {
-	display: block;
-	position: absolute;
-	left: 247px;
-	top: 5px;
-	width: 468px;
-	height: 60px;
-	z-index: 200;
-}
-
-div#container_login div.header a.main_menu {
-	display: block;
-	display: none;
-	position: absolute;
-	height: 22px;
-	top: 0px;
-}
-
-div#container_login input#authMailAddress_mail_address {
-	display: block;
-	position: absolute;
-	left: 504px;
-	top: 246px;
-	width: 185px;
-	height: 23px;
-	font-size: 10pt;
-	z-index: 100;
-}
-
-div#container_login input#authMailAddress_password {
-	display: block;
-	position: absolute;
-	left: 504px;
-	top: 299px;
-	width: 185px;
-	height: 23px;
-	font-size: 10pt;
-	z-index: 110;
-}
-
-div#container_login input#button_login {
-	display: block;
-	position: absolute;
-	left: 536px;
-	top: 384px;
-	width: 120px;
-	height: 24px;
-	border: none 0px;
-	background-color: transparent;
-	z-index: 120;
-}
-
-div#container_login a#button_new_regist {
-	display: block;
-	position: absolute;
-	left: 536px;
-	top: 414px;
-	width: 120px;
-	height: 24px;
-	border: none 0px;
-	z-index: 130;
-}
-
-div#container_login div.msg {
-	display: block;
-	position: absolute;
-	border: none 0px;
-	padding: 3px 0px;
-	left: 504px;
-	top: 327px;
-	width: 185px;
-	height: 42px;
-	font-size: 9pt;
-	text-align: center;
-	z-index: 140;
-}
-
-div#container_login div.msg * {
-	font-size: 8pt;
-}
-
-div#container_login .footer {
-	display: block;
-	position: absolute;
-	left: 0px;
-	top: 542px;
-	width: 720px;
-	height: 21px;
-	z-index: 300;
-}
-div#container_login .footer p {
-	margin-right: 12px;
-	text-align: right;
-	line-height: 21px;
-}
-
-/*==============================================================================
- * 文字装飾
- *----------------------------------------------------------------------------*/
-span.op_b {
-	text-decoration: inherit;
-	font-style: inherit;
-	font-weight: bold;
-	color: inherit;
-	font-size: inherit;
-}
-
-span.op_u {
-	text-decoration: underline;
-	font-style: inherit;
-	font-weight: inherit;
-	color: inherit;
-	font-size: inherit;
-}
-
-span.op_s {
-	text-decoration: line-through;
-	font-style: inherit;
-	font-weight: inherit;
-	color: inherit;
-	font-size: inherit;
-}
-
-span.op_i {
-	text-decoration: inherit;
-	font-style: italic;
-	font-weight: inherit;
-	color: inherit;
-	font-size: inherit;
-}
-
-span.op_large {
-	text-decoration: inherit;
-	font-style: inherit;
-	font-weight: inherit;
-	color: inherit;
-	font-size: 20px;
-}
-
-span.op_small {
-	text-decoration: inherit;
-	font-style: inherit;
-	font-weight: inherit;
-	color: inherit;
-	font-size: 8px;
-}
-
-span.op_color {
-	text-decoration: inherit;
-	font-style: inherit;
-	font-weight: inherit;
-	color: inherit;
-	font-size: inherit;
-}
-
-/*==============================================================================
- * Activity
- *----------------------------------------------------------------------------*/
-div.activityBox div.moreInfo {
-  padding-bottom: 5px;
-}
-
-#delete_activity,
-div.activityBox {
-  zoom: 1;
-  word-wrap: break-word;
-}
-
-/*======================================
- * box_form
- *------------------------------------*/
-div.activityBox div.box_form div.box_public_flag {
-  float: left;
-  width: 75%;
-  margin-bottom: 8px;
-}
-
-div.activityBox div.box_form div.box_public_flag label {
-  margin-left: 8px;
-}
-
-div.activityBox div.box_form div.box_count {
-  margin-left: 75%;
-  text-align: right;
-}
-
-div.activityBox div.box_form div.box_count span.note {
-  display: none;
-}
-
-div.activityBox div.box_form div.box_count span.count {
-  margin-right: 10px;
-  color: #888888;
-  font-size: 24px;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-
-div.activityBox div.box_form div.box_body {
-  clear: both;
-}
-
-div.activityBox div.box_form div.box_body span.inputForm {
-  zoom: 1;
-  display: block;
-  padding: 0 4px;
-}
-
-div.activityBox div.box_form div.box_body span.inputForm textarea {
-  display: block;
-  width: 98%;
-  height: 3.5em;
-  margin: auto;
-}
-
-div.activityBox div.box_form div.box_body span.submit {
-  display: block;
-  width: 98%;
-  margin: 5px 0 5px 2px;
-  text-align: right;
-}
-
-div.activityBox div.box_form div.box_body span.submit input.submit {
-  min-height: 30px;
-  margin: 0;
-  padding: 0 8px;
-  -moz-border-radius: 3px;
-  -webkit-border-radius: 3px;
-  border-radius: 3px;
-  border: 1px solid #888888;
-  background: url(<?php echo image_path(opSkinClassicConfig::get('bg_button_a_image')) ?>);
-  font-weight: bold;
-  font-size: 14px;
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-
-div.activityBox div.box_form div.box_body span.submit input.submit:active {
-  color: #888888;
-}
-
-*:first-child+html div.activityBox div.box_form div.box_body span.submit input.submit {
-  padding: 0;
-  line-height: 24px;
-}
-
-* html div.activityBox div.box_form div.box_body span.submit input.submit {
-  padding: 0;
-  line-height: 24px;
-}
-
-/*======================================
- * box_list
- *------------------------------------*/
-#delete_activity div.box_list li.activity,
-div.activityBox div.box_list li.activity {
-  clear: both;
-  padding: 10px 6px 8px;
-  border-bottom: 1px solid #cccccc;
-}
-
-#delete_activity div.box_list div.box_memberImage,
-div.activityBox div.box_list div.box_memberImage {
-  overflow: hidden;
-  z-index: 256;
-  position: relative;
-  float: left;
-  width: 48px;
-  max-height: 48px;
-  margin-right: 8px;
-}
-
-#delete_activity div.box_list div.box_memberImage p,
-div.activityBox div.box_list div.box_memberImage p {
-  text-align: center;
-}
-
-#delete_activity div.box_list div.box_body,
-div.activityBox div.box_list div.box_body {
-  z-index: 128;
-  position: relative;
-  min-height: 48px;
-}
-
-* html #delete_activity div.box_list div.box_body,
-* html div.activityBox div.box_list div.box_body {
-  height: 48px;
-}
-
-#delete_activity div.box_list div.box_body p,
-div.activityBox div.box_list div.box_body p {
-  overflow: hidden;
-  text-align: left;
-}
-
-#delete_activity div.box_list div.box_body p span.content .name,
-div.activityBox div.box_list div.box_body p span.content .name {
-  margin-right: 0.5em;
-  font-weight: bold;
-}
-
-#delete_activity div.box_list div.box_body p span.info,
-div.activityBox div.box_list div.box_body p span.info {
-  display: block;
-  padding-top: 2px;
-  padding-bottom: 1.3em;
-  color: #888888;
-}
-
-#delete_activity div.box_list div.box_body ul.operation,
-div.activityBox div.box_list div.box_body ul.operation {
-  position: absolute;
-  right: 10px;
-  bottom: 0;
-  margin: 0;
-  padding: 0;
-}
-
-#delete_activity div.box_list div.box_body ul.operation li,
-div.activityBox div.box_list div.box_body ul.operation li {
-  display: inline;
-  margin-left: 0.5em;
-}
-
-/*==============================================================================
- * カスタムCSS
- *----------------------------------------------------------------------------*/
-/**フォント色変更**/
-
-/*リンク関連*/
-a:link    { color: #026CD1; }
-a:visited { color: #004A95; }
-a:hover   { color: #76AFE6; }
-a:active  { color: #76AFE6; }
-
-/*コンテンツ見出しlv1*/
-td.bg_06 span.b_b,
-.c_00 { color: #222222; }
-
-/*コンテンツ見出しlv2*/
-.c_01 { color: #444444; }
-
-/*強調文字暖色*/
-.c_02 { color: #D92C49; }
-
-/*強調文字寒色*/
-.c_03 { color: #2C65D9; }
-
-/*その他文字色*/
-body { color: #000000; }
diff --git a/plugins/opSkinClassicPlugin/apps/pc_frontend/modules/opSkinClassicPlugin/templates/indexSuccess.php b/plugins/opSkinClassicPlugin/apps/pc_frontend/modules/opSkinClassicPlugin/templates/indexSuccess.php
deleted file mode 100644
index e69de29bb..000000000
diff --git a/plugins/opSkinClassicPlugin/apps/pc_frontend/modules/opSkinClassicPlugin/templates/loginSuccess.php b/plugins/opSkinClassicPlugin/apps/pc_frontend/modules/opSkinClassicPlugin/templates/loginSuccess.php
deleted file mode 100644
index 4eabea51c..000000000
--- a/plugins/opSkinClassicPlugin/apps/pc_frontend/modules/opSkinClassicPlugin/templates/loginSuccess.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<div id="container_login"><div class="w_screen">
-<?php if ($form->getAuthAdapter()->getAuthConfig('invite_mode') == 2 && opToolkit::isEnabledRegistration('pc')) : ?>
-<img src="<?php echo image_path(opSkinClassicConfig::get('skin_login_open_image')) ?>" class="bg" alt="" />
-<?php else: ?>
-<img src="<?php echo image_path(opSkinClassicConfig::get('skin_login_image')) ?>" class="bg" alt="" />
-<?php endif; ?>
-
-<form action="<?php echo url_for(sprintf('member/login?%s=%s', sfOpenPNEAuthForm::AUTH_MODE_FIELD_NAME, $form->getAuthMode())) ?>" method="post">
-<?php foreach ($form as $name => $field): ?>
-<?php echo $field->render() ?>
-<?php endforeach; ?>
-<input type="image" name="submit" src="<?php echo image_path('dummy.gif') ?>" id="button_login" alt="ログイン" />
-<?php if ($form->getAuthAdapter()->getAuthConfig('invite_mode') == 2 && opToolkit::isEnabledRegistration('pc')) : ?>
-<?php echo link_to('<img src="'.image_path('dummy.gif').'" alt="新規登録" />', $form->getAuthAdapter()->getAuthConfig('self_invite_action'), array('id' => 'button_new_regist')) ?>
-<?php endif; ?>
-<div class="msg lh_130">
-<?php if ($form->getAuthAdapter()->getAuthConfig('help_login_error_action')) : ?>
-<br />
-<span class="password_query"><?php echo link_to(__('Can not access your account?'), $form->getAuthAdapter()->getAuthConfig('help_login_error_action')); ?></span>
-<?php endif; ?>
-</div>
-</form>
-
-<div class="footer">
-<?php include_partial('global/footer') ?>
-</div>
-</div></div>
diff --git a/plugins/opSkinClassicPlugin/config/config.php b/plugins/opSkinClassicPlugin/config/config.php
deleted file mode 100644
index 605b76ff1..000000000
--- a/plugins/opSkinClassicPlugin/config/config.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$this->dispatcher->connect('op_action.post_execute', array('opSkinClassicObserver', 'appendCss'));
-$this->dispatcher->connect('response.filter_content', array('opSkinClassicObserver', 'cacheCss'));
diff --git a/plugins/opSkinClassicPlugin/config/preset.yml b/plugins/opSkinClassicPlugin/config/preset.yml
deleted file mode 100644
index 17753bd1f..000000000
--- a/plugins/opSkinClassicPlugin/config/preset.yml
+++ /dev/null
@@ -1,86 +0,0 @@
-#  line_color:                     # OpenPNE2: color_5
-#  page_background_color:          # OpenPNE2: color_16
-#  contents_background_color:      # OpenPNE2: color_17
-#  frame_color:                    # OpenPNE2: color_4
-#  header_background_color:        # OpenPNE2: color_10
-#  information_background_color:   # OpenPNE2: color_13
-#  box_background_color:           # OpenPNE2: color_6
-#  left_menu_background_color:     # OpenPNE2: color_14
-
-001_openpne_red:
-  caption: "OpenPNE Red"
-  line_color: "BF7C7C"
-  page_background_color: "FFFFFF"
-  contents_background_color: "FFFFFF"
-  frame_color: "F9BBA4"
-  header_background_color: "E85050"
-  information_background_color: "FFE9E5"
-  box_background_color: "FFFFFF"
-  left_menu_background_color: "CCCCCC"
-
-002_openpne_beige:
-  caption: "OpenPNE Beige"
-  line_color: "B3A18B"
-  page_background_color: "FFFFFF"
-  contents_background_color: "FFFFFF"
-  frame_color: "F4E6B9"
-  header_background_color: "DBB964"
-  information_background_color: "FFF8D8"
-  box_background_color: "FFFFFF"
-  left_menu_background_color: "F4E6B9"
-
-003_openpne_yellow:
-  caption: "OpenPNE Yellow"
-  line_color: "BAB17A"
-  page_background_color: "FFFFFF"
-  contents_background_color: "FFFFFF"
-  frame_color: "FCEFA1"
-  header_background_color: "FDD43E"
-  information_background_color: "FFFFD8"
-  box_background_color: "FFFFFF"
-  left_menu_background_color: "FCEFA1"
-
-004_openpne_green:
-  caption: "OpenPNE Green"
-  line_color: "8AB08E"
-  page_background_color: "FFFFFF"
-  contents_background_color: "FFFFFF"
-  frame_color: "C9F3A1"
-  header_background_color: "62C14D"
-  information_background_color: "E7F9CA"
-  box_background_color: "FFFFFF"
-  left_menu_background_color: "C9F3A1"
-
-005_openpne_blue:
-  caption: "OpenPNE Blue"
-  line_color: "96B3BB"
-  page_background_color: "FFFFFF"
-  contents_background_color: "FFFFFF"
-  frame_color: "C0EBF3"
-  header_background_color: "36B3D1"
-  information_background_color: "EBFFF6"
-  box_background_color: "FFFFFF"
-  left_menu_background_color: "C0EBF3"
-
-006_openpne_navy:
-  caption: "OpenPNE Navy"
-  line_color: "999BC0"
-  page_background_color: "FFFFFF"
-  contents_background_color: "FFFFFF"
-  frame_color: "A4BAEC"
-  header_background_color: "6F7DE0"
-  information_background_color: "D3E9F7"
-  box_background_color: "FFFFFF"
-  left_menu_background_color: "A4BAEC"
-
-007_openpne_purple:
-  caption: "OpenPNE Purple"
-  line_color: "A499C0"
-  page_background_color: "FFFFFF"
-  contents_background_color: "FFFFFF"
-  frame_color: "F2DAFA"
-  header_background_color: "C4AAE7"
-  information_background_color: "FFE5ED"
-  box_background_color: "FFFFFF"
-  left_menu_background_color: "F2DAFA"
-
diff --git a/plugins/opSkinClassicPlugin/i18n/messages.ja.xml b/plugins/opSkinClassicPlugin/i18n/messages.ja.xml
deleted file mode 100644
index 1b6182f60..000000000
--- a/plugins/opSkinClassicPlugin/i18n/messages.ja.xml
+++ /dev/null
@@ -1,331 +0,0 @@
-<?xml version="1.0" ?>
-<xliff version="1.0">
-  <file orginal="global" source-language="en" datatype="plaintext">
-    <body>
-      <trans-unit id="">
-        <source>Theme</source>
-        <target>テーマ</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Line color</source>
-        <target>罫線の色</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Page background color</source>
-        <target>ページの背景色</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Contents background color</source>
-        <target>コンテンツ領域の背景色</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Frame color</source>
-        <target>枠線色</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Header background color</source>
-        <target>ヘッダー背景色</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Information background color</source>
-        <target>説明領域の背景色</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Box background color</source>
-        <target>ボックスの背景色</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Left menu background color</source>
-        <target>左側メニューの背景色</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Skin login</source>
-        <target>ログイン画面</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Skin after header</source>
-        <target>ログイン後ヘッダ</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Skin after header 2</source>
-        <target>ログイン後ヘッダ(ロールオーバー)</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Skin navi h</source>
-        <target>自分ページメニュー</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Skin navi f</source>
-        <target>他人ページメニュー</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Skin navi c</source>
-        <target>コミュニティメニュー</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Skin navi h 2</source>
-        <target>自分ページメニュー(ロールオーバー)</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Skin navi f 2</source>
-        <target>他人ページメニュー(ロールオーバー)</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Skin navi c 2</source>
-        <target>コミュニティメニュー(ロールオーバー)</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Icon search</source>
-        <target>サーチアイコン</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Button search 1</source>
-        <target>サーチボタン１</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Button search 2</source>
-        <target>サーチボタン２</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Button search 3</source>
-        <target>サーチボタン３</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Button search 4</source>
-        <target>サーチボタン４</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Button search 5</source>
-        <target>サーチボタン５</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Birthday f</source>
-        <target>誕生日画像</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Birthday f 2</source>
-        <target>もうすぐ誕生日画像</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Birthday h</source>
-        <target>自分の誕生日画像</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Icon information</source>
-        <target>インフォメーション欄アイコン</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Skin before header</source>
-        <target>ログイン前ヘッダ</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Skin footer</source>
-        <target>共通フッタ</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>No image</source>
-        <target>no_image</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>No logo</source>
-        <target>no_logo</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>No logo small</source>
-        <target>no_logo_small</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Button edit photo</source>
-        <target>「写真を編集」</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Button prof conf</source>
-        <target>「プロフィール確認」</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Button show photo</source>
-        <target>「もっと写真を見る」</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Button kyohi</source>
-        <target>「拒否」</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Button sakujo</source>
-        <target>「削除する」</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Button shonin</source>
-        <target>「承認」</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Button shosai</source>
-        <target>「詳細を見る」</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Button comment</source>
-        <target>「コメントする」</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Bg button</source>
-        <target>それ以外のボタン背景画像</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Satisfaction level 1</source>
-        <target>レビュー満足度１</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Satisfaction level 2</source>
-        <target>レビュー満足度２</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Satisfaction level 3</source>
-        <target>レビュー満足度３</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Satisfaction level 4</source>
-        <target>レビュー満足度４</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Satisfaction level 5</source>
-        <target>レビュー満足度５</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Icon title 1</source>
-        <target>見出し１</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Content header 1</source>
-        <target>見出し２</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Icon arrow 1</source>
-        <target>矢印アイコン１</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Icon arrow 2</source>
-        <target>矢印アイコン２</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Icon 1</source>
-        <target>リストアイコン１</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Icon 2</source>
-        <target>リストアイコン２</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Icon 3</source>
-        <target>リストアイコン３</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Icon alert l</source>
-        <target>アラートアイコン</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Icon crown</source>
-        <target>管理者アイコン</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Icon camera</source>
-        <target>画像有りアイコン</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Icon birthday</source>
-        <target>バースデイアイコン</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Icon event B</source>
-        <target>イベントアイコン１</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Icon event R</source>
-        <target>イベントアイコン２</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Icon pen</source>
-        <target>スケジュール有りアイコン</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Icon weather FC</source>
-        <target>お天気アイコン</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Icon schedule</source>
-        <target>スケジュールタイトル</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Icon mail 1</source>
-        <target>未読メールアイコン</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Icon mail 2</source>
-        <target>既読メールアイコン</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Icon mail 3</source>
-        <target>送信済みメールアイコン</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Icon mail 4</source>
-        <target>返信済みメールアイコン</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Deco op b</source>
-        <target>太字</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Deco op u</source>
-        <target>下線</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Deco op s</source>
-        <target>取り消し線</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Deco op i</source>
-        <target>斜体</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Deco op large</source>
-        <target>大きめの文字</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Deco op small</source>
-        <target>小さめの文字</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Deco op color</source>
-        <target>文字色指定</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Deco op image</source>
-        <target>アルバム挿入</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Deco op emoji docomo</source>
-        <target>絵文字挿入（DoCoMo）</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Skin ktai header</source>
-        <target>ロゴ画像</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Marker</source>
-        <target>マーカー</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>ArticleList marker</source>
-        <target>記事リストマーカー</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Colon</source>
-        <target>コロンマーカー</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Skin login open</source>
-        <target>ログイン画面 (オープン制)</target>
-      </trans-unit>
-    </body>
-  </file>
-</xliff>
diff --git a/plugins/opSkinClassicPlugin/lib/opSkinClassicColorForm.class.php b/plugins/opSkinClassicPlugin/lib/opSkinClassicColorForm.class.php
deleted file mode 100644
index 4501ad453..000000000
--- a/plugins/opSkinClassicPlugin/lib/opSkinClassicColorForm.class.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-class opSkinClassicColorForm extends sfForm
-{
-  public function configure()
-  {
-    foreach (opSkinClassicConfig::getAllowdColors() as $color)
-    {
-      $this->setWidget($color, new sfWidgetFormInputText());
-      $this->widgetSchema->setLabel($color, sfInflector::humanize($color));
-      $this->setValidator($color, new sfValidatorCallback(array('callback' => array('opSkinClassicColorForm', 'validateHex'))));
-      $this->setDefault($color, opSkinClassicConfig::get($color));
-    }
-
-    $this->widgetSchema->setNameFormat('color[%s]');
-  }
-
-  static public function validateHex($validator, $value, $arguments)
-  {
-    if (!in_array(strlen($value), array(3, 6)))
-    {
-      throw new sfValidatorError($validator, 'invalid');
-    }
-
-    $zfValidator = new Zend_Validate_Hex();
-    if (!$zfValidator->isValid($value))
-    {
-      throw new sfValidatorError($validator, 'invalid');
-    }
-
-    return $value;
-  }
-
-  public function save()
-  {
-    foreach ($this->getValues() as $k => $v)
-    {
-      opSkinClassicConfig::set($k, $v);
-    }
-
-    opToolkit::clearCache();
-  }
-}
diff --git a/plugins/opSkinClassicPlugin/lib/opSkinClassicConfig.class.php b/plugins/opSkinClassicPlugin/lib/opSkinClassicConfig.class.php
deleted file mode 100644
index f0e78c559..000000000
--- a/plugins/opSkinClassicPlugin/lib/opSkinClassicConfig.class.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-class opSkinClassicConfig
-{
-  const PLUGIN_NAME = 'opSkinClassicPlugin';
-  const DEFAULT_THEME = '005_openpne_blue';
-
-  static protected
-    $currentTheme = '',
-    $defaults = array(),
-
-    $allowedColors = array(
-      'line_color', 'page_background_color', 'contents_background_color',
-      'frame_color', 'header_background_color', 'information_background_color',
-      'box_background_color', 'left_menu_background_color',
-    ),
-
-    $themeImages = array(
-      'skin_after_header', 'skin_after_header_2', 'skin_before_header', 'skin_footer',
-      'skin_login', 'skin_login_open', 'skin_before_header', 'skin_navi_c', 'skin_navi_c_2',
-      'skin_navi_f', 'skin_navi_f_2', 'skin_navi_h', 'skin_navi_h_2',
-    ),
-
-    $images = array(
-      'icon_arrow_1', 'bg_button', 'bg_button_a', 'content_header_1', 'icon_title_1', 'icon_arrow_2',
-      'colon', 'icon_information', 'marker', 'articleList_marker', 'icon_3', 'icon_1', 'icon_2',
-    );
-
-  static public function get($name)
-  {
-    $result = Doctrine::getTable('SkinConfig')->get(self::PLUGIN_NAME, $name, self::getDefault($name));
-
-    if ($result !== self::getDefault($name) && (strlen($name) - strlen('_image')) === strrpos($name, '_image'))
-    {
-      $result = '../cache/img/gif/w_h/'.$result.'.gif';
-    }
-
-    return $result;
-  }
-
-  static public function set($name, $value)
-  {
-    return Doctrine::getTable('SkinConfig')->set(self::PLUGIN_NAME, $name, $value);
-  }
-
-  static public function delete($name)
-  {
-    $config = Doctrine::getTable('SkinConfig')->retrieveByPluginAndName(self::PLUGIN_NAME, $name);
-    if ($config)
-    {
-      $config->delete();
-    }
-  }
-
-  static public function setCurrentTheme($theme)
-  {
-    self::$currentTheme = $theme;
-  }
-
-  static public function getCurrentTheme()
-  {
-    if (empty(self::$currentTheme))
-    {
-      self::$currentTheme = Doctrine::getTable('SkinConfig')->get(self::PLUGIN_NAME, 'theme', self::DEFAULT_THEME);
-    }
-
-    return self::$currentTheme;
-  }
-
-  static public function getAllowdColors()
-  {
-    return self::$allowedColors;
-  }
-
-  static public function getImages()
-  {
-    return self::$images;
-  }
-
-  static public function getThemeImages()
-  {
-    return self::$themeImages;
-  }
-
-  static public function getDefault($name)
-  {
-    $theme = self::getCurrentTheme();
-
-    if (empty(self::$defaults[$theme]))
-    {
-      self::$defaults = self::getDefaults();
-
-      foreach (self::$themeImages as $v)
-      {
-        self::$defaults[$theme][$v.'_image'] = '../../opSkinClassicPlugin/images/'.$theme.'/'.$v.'.jpg';
-      }
-
-      foreach (self::$images as $v)
-      {
-        self::$defaults[$theme][$v.'_image'] = '../../opSkinClassicPlugin/images/'.$v.'.gif';
-      }
-
-      self::$defaults[$theme]['skin_footer_image'] = '../../opSkinClassicPlugin/images/skin_footer.jpg';
-    }
-
-    if (!empty(self::$defaults[$theme][$name]))
-    {
-      return self::$defaults[$theme][$name];
-    }
-
-    return null;
-  }
-
-  static public function getDefaults()
-  {
-    if (empty(self::$defaults))
-    {
-      $configPath = realpath(dirname(__FILE__).'/../config/preset.yml');
-      self::$defaults = sfYaml::load($configPath);
-    }
-
-    return self::$defaults;
-  }
-}
diff --git a/plugins/opSkinClassicPlugin/lib/opSkinClassicImageForm.class.php b/plugins/opSkinClassicPlugin/lib/opSkinClassicImageForm.class.php
deleted file mode 100644
index 195a9e473..000000000
--- a/plugins/opSkinClassicPlugin/lib/opSkinClassicImageForm.class.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-class opSkinClassicImageForm extends sfForm
-{
-  public function configure()
-  {
-    $target = $this->getOption('target');
-
-    $options = array(
-      'file_src'    => '',
-      'is_image'    => true,
-      'with_delete' => false,
-      'label'       => sfInflector::humanize($target),
-    );
-
-    sfContext::getInstance()->getConfiguration()->loadHelpers('Partial');
-    $options['template'] = get_partial('opSkinClassicPlugin/formEditImage', array('target' => $target));
-
-    $this->setWidget('image', new sfWidgetFormInputFileEditable($options, array('size' => 10)));
-    $this->setValidator('image', new opValidatorImageFile(array('required' => true)));
-
-    $this->widgetSchema->setNameFormat('image['.$target.'][%s]');
-  }
-
-  public function save()
-  {
-    $target = $this->getOption('target');
-
-    $rawConfig = Doctrine::getTable('SkinConfig')->retrieveByPluginAndName('opSkinClassicPlugin', $target.'_image');
-    if ($rawConfig)
-    {
-      $file = Doctrine::getTable('File')->findOneByName($rawConfig->value);
-      if ($file)
-      {
-        $file->delete();
-      }
-    }
-
-    $file = new File();
-    $file->setFromValidatedFile($this->getValue('image'));
-    $file->save();
-
-    opSkinClassicConfig::set($target.'_image', $file->name);
-
-    opToolkit::clearCache();
-  }
-}
diff --git a/plugins/opSkinClassicPlugin/lib/opSkinClassicLoginForm.class.php b/plugins/opSkinClassicPlugin/lib/opSkinClassicLoginForm.class.php
deleted file mode 100644
index 7fa054310..000000000
--- a/plugins/opSkinClassicPlugin/lib/opSkinClassicLoginForm.class.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-class opSkinClassicLoginForm extends sfForm
-{
-  public function configure()
-  {
-    $list = array(
-      'default' => '標準のログイン画面を使用する',
-      'classic' => '旧式のログイン画面を使用する',
-    );
-    $default = 'default';
-    if ('@opSkinClassicPlugin_login' === opConfig::get('external_pc_login_url'))
-    {
-      $default = 'classic';
-    }
-
-    $this->setWidget('login', new sfWidgetFormSelect(array('choices' => $list)));
-    $this->setValidator('login', new sfValidatorChoice(array('choices' => array_keys($list))));
-    $this->setDefault('login', $default);
-
-    $this->widgetSchema->setNameFormat('login[%s]');
-  }
-
-  public function save()
-  {
-    if ('classic' === $this->getValue('login'))
-    {
-      Doctrine::getTable('SnsConfig')->set('external_pc_login_url', '@opSkinClassicPlugin_login');
-    }
-    else
-    {
-      if ('@opSkinClassicPlugin_login' === opConfig::get('external_pc_login_url'))
-      {
-        Doctrine::getTable('SnsConfig')->set('external_pc_login_url', '');
-      }
-    }
-  }
-}
diff --git a/plugins/opSkinClassicPlugin/lib/opSkinClassicObserver.class.php b/plugins/opSkinClassicPlugin/lib/opSkinClassicObserver.class.php
deleted file mode 100644
index e59f3bbf6..000000000
--- a/plugins/opSkinClassicPlugin/lib/opSkinClassicObserver.class.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-class opSkinClassicObserver
-{
-  static public function appendCss($event)
-  {
-    $context = sfContext::getInstance();
-    if ($context->getConfiguration() instanceof pc_frontendConfiguration)
-    {
-      $context->getResponse()->addStylesheet('/cache/css/'.opSkinClassicConfig::getCurrentTheme().'.css', sfWebResponse::LAST);
-    }
-  }
-
-  static public function cacheCss($event, $content)
-  {
-    $lastEntry = sfContext::getInstance()->getActionStack()->getLastEntry();
-    if (!$lastEntry)
-    {
-      return $content;
-    }
-
-    if ('opSkinClassicPlugin' === $lastEntry->getModuleName() && 'css' === $lastEntry->getActionName())
-    {
-      $filesystem = new sfFilesystem();
-      $dir = sfConfig::get('sf_web_dir').DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR.'css';
-      @$filesystem->mkdirs($dir);
-      file_put_contents($dir.DIRECTORY_SEPARATOR.opSkinClassicConfig::getCurrentTheme().'.css', $content);
-    }
-
-    return $content;
-  }
-}
diff --git a/plugins/opSkinClassicPlugin/lib/opSkinClassicPresetForm.class.php b/plugins/opSkinClassicPlugin/lib/opSkinClassicPresetForm.class.php
deleted file mode 100644
index e33f779bc..000000000
--- a/plugins/opSkinClassicPlugin/lib/opSkinClassicPresetForm.class.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-class opSkinClassicPresetForm extends sfForm
-{
-  public function configure()
-  {
-    $defaults = opSkinClassicConfig::getDefaults();
-    $list = array();
-
-    foreach ($defaults as $k => $v)
-    {
-      $list[$k] = $v['caption'];
-    }
-
-    $this->setWidget('theme', new sfWidgetFormSelect(array('choices' => $list)));
-    $this->setValidator('theme', new sfValidatorChoice(array('choices' => array_keys($list))));
-    $this->setDefault('theme', opSkinClassicConfig::getCurrentTheme());
-
-    $this->widgetSchema->setNameFormat('preset[%s]');
-  }
-
-  public function save()
-  {
-    opSkinClassicConfig::set('theme', $this->getValue('theme'));
-
-    foreach (opSkinClassicConfig::getAllowdColors() as $k)
-    {
-      opSkinClassicConfig::delete($k);
-    }
-
-    $configs = array_merge(opSkinClassicConfig::getImages(), opSkinClassicConfig::getThemeImages());
-    foreach ($configs as $k)
-    {
-      $key = $k.'_image';
-      $rawConfig = Doctrine::getTable('SkinConfig')->retrieveByPluginAndName('opSkinClassicPlugin', $key);
-      if ($rawConfig)
-      {
-        $file = Doctrine::getTable('File')->findOneByName($rawConfig->value);
-        if ($file)
-        {
-          $file->delete();
-        }
-      }
-
-      opSkinClassicConfig::delete($key);
-    }
-
-    opToolkit::clearCache();
-  }
-}
diff --git a/plugins/opSkinClassicPlugin/test/bootstrap/database.php b/plugins/opSkinClassicPlugin/test/bootstrap/database.php
deleted file mode 100644
index 9405ee147..000000000
--- a/plugins/opSkinClassicPlugin/test/bootstrap/database.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-$configuration = ProjectConfiguration::getApplicationConfiguration('pc_frontend', 'test', true);
-
-new sfDatabaseManager($configuration);
-
-$task = new sfDoctrineLoadDataTask($configuration->getEventDispatcher(), new sfFormatter());
-$task->run();
-$task->run(array('--dir='.dirname(__FILE__).'/../fixtures'));
diff --git a/plugins/opSkinClassicPlugin/test/bootstrap/functional.php b/plugins/opSkinClassicPlugin/test/bootstrap/functional.php
deleted file mode 100644
index 9bbd83371..000000000
--- a/plugins/opSkinClassicPlugin/test/bootstrap/functional.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-// guess current application
-if (!isset($app))
-{
-  $traces = debug_backtrace();
-  $caller = $traces[0];
-
-  $dirPieces = explode(DIRECTORY_SEPARATOR, dirname($caller['file']));
-  $app = array_pop($dirPieces);
-}
-
-// chdir to the symfony(OpenPNE) project directory
-chdir(dirname(__FILE__).'/../../../..');
-
-require_once 'config/ProjectConfiguration.class.php';
-$configuration = ProjectConfiguration::getApplicationConfiguration($app, 'test', isset($debug) ? $debug : true);
-sfContext::createInstance($configuration);
-
-// remove all cache
-sfToolkit::clearDirectory(sfConfig::get('sf_app_cache_dir'));
diff --git a/plugins/opSkinClassicPlugin/test/bootstrap/unit.php b/plugins/opSkinClassicPlugin/test/bootstrap/unit.php
deleted file mode 100644
index 122f5e01a..000000000
--- a/plugins/opSkinClassicPlugin/test/bootstrap/unit.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-$_test_dir = realpath(dirname(__FILE__).'/..');
-
-// chdir to the symfony(OpenPNE) project directory
-chdir(dirname(__FILE__).'/../../../..');
-
-require_once 'config/ProjectConfiguration.class.php';
-$configuration = new ProjectConfiguration(realpath($_test_dir.'/../../../'));
-include($configuration->getSymfonyLibDir().'/vendor/lime/lime.php');
diff --git a/plugins/opSkinClassicPlugin/test/fixtures/test_data.yml b/plugins/opSkinClassicPlugin/test/fixtures/test_data.yml
deleted file mode 100644
index 220a2d336..000000000
--- a/plugins/opSkinClassicPlugin/test/fixtures/test_data.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-Member:
-  member_1:
-    id: ~
-    name: "OpenPNE君"
-    is_active: 1
-
-MemberConfig:
-  member_address_1:
-    name: "pc_address"
-    value: "sns@example.com"
-    Member: member_1
-  member_mobile_address_1:
-    name: "mobile_address"
-    value: "sns@example.com"
-    Member: member_1
-  member_password_1:
-    name: "password"
-    value: "<?php echo md5('password') ?>"
-    Member: member_1
diff --git a/plugins/opSkinClassicPlugin/test/functional/mobile_frontend/skeletonActionsTest.php b/plugins/opSkinClassicPlugin/test/functional/mobile_frontend/skeletonActionsTest.php
deleted file mode 100644
index 24bb90025..000000000
--- a/plugins/opSkinClassicPlugin/test/functional/mobile_frontend/skeletonActionsTest.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-include dirname(__FILE__).'/../../bootstrap/functional.php';
-
-$browser = new opTestFunctional(new sfBrowser(), new lime_test(null, new lime_output_color()));
-$browser->setMobile();
-
-include dirname(__FILE__).'/../../bootstrap/database.php';
-
-$browser->login('sns@example.com', 'password');
-$browser->setCulture('en');
-
-$browser->get('/')
-  ->with('user')->isAuthenticated()
-;
diff --git a/plugins/opSkinClassicPlugin/test/unit/model/SkeletonTest.php b/plugins/opSkinClassicPlugin/test/unit/model/SkeletonTest.php
deleted file mode 100644
index fa8b9ef1c..000000000
--- a/plugins/opSkinClassicPlugin/test/unit/model/SkeletonTest.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-include(dirname(__FILE__).'/../../bootstrap/unit.php');
-include(dirname(__FILE__).'/../../bootstrap/database.php');
-
-$t = new lime_test(1, new lime_output_color());
-$t->pass('This test always passes.');
diff --git a/plugins/opSkinClassicPlugin/web/css/main.css b/plugins/opSkinClassicPlugin/web/css/main.css
deleted file mode 100644
index 276088660..000000000
--- a/plugins/opSkinClassicPlugin/web/css/main.css
+++ /dev/null
@@ -1,2423 +0,0 @@
-@charset "UTF-8";
-
-/*==============================================================================
- * デフォルトスタイルシートの上書き
- *----------------------------------------------------------------------------*/
-body, div, p, pre, blockquote, th, td,
-dl, dt, dd, ul, ol, li,
-h1, h2, h3, h4, h5, h6,
-iframe, object, embed {
-	margin: 0;
-	padding: 0;
-	border: none;
-	text-align: left;
-}
-ul, ol {
-	list-style-position: outside;
-	list-style-type: none;
-}
-table {
-	border-collapse: separate;
-	border-spacing: 0;
-	empty-cells: show;
-	margin: 0;
-	font-size: 1em;
-}
-* {
-	word-break: break-all;
-}
-*:first-child+html table {
-	border-collapse: collapse;
-}
-* html table {
-	border-collapse: collapse;
-}
-th, td {
-	vertical-align: middle;
-}
-address, cite, caption, th, del, ins,
-abbr, acronym, dfn, em, strong,
-code, kbd, samp, var {
-	border: none;
-	font-style: normal;
-	font-variant: normal;
-	font-weight: normal;
-	text-align: left;
-	text-decoration: none;
-}
-img {
-	border: none;
-	vertical-align: baseline;
-}
-a img {
-	vertical-align: text-bottom;
-}
-* html a img {
-	vertical-align: baseline;
-}
-br {
-	letter-spacing: 0;
-}
-h1, h2, h3, h4, h5, h6 {
-	font-size: 100%;
-	font-weight: normal;
-}
-q:before, q:after {
-	content: "";
-}
-form, fieldset, input, textarea {
-	margin: 0;
-}
-form, fieldset {
-	padding: 0;
-}
-fieldset {
-	border: none;
-}
-form p {
-	margin: 0;
-	padding: 0;
-}
-
-/*==============================================================================
- * OpenPNE全共通指定
- *----------------------------------------------------------------------------*/
-body {
-	font: normal normal normal 10pt/1.2 "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "ＭＳ Ｐゴシック", "MS PGothic", Osaka, sans-serif;
-}
-input,
-textarea,
-select {
-	color: #333333;
-	font-size: inherit;
-	font-family: "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "ＭＳ Ｐゴシック", "MS PGothic", Osaka, sans-serif;
-}
-a:link {
-	color: #026cd1;
-}
-a:visited {
-	color: #004a95;
-}
-a:hover, a:active {
-	color: #76afe6;
-}
-.input_text,
-.input_password,
-textarea {
-	background-color: #f8f8f8;
-}
-.input_text,
-.input_password,
-textarea,
-select {
-	border: 1px solid #888888;
-}
-.input_image {
-	border: none;
-}
-strong {
-	font-weight: bold;
-}
-/*----------------------------------------------
- * テーブル
- *--------------------------------------------*/
-div.parts table {
-	table-layout: fixed;
-	width: 100%;
-}
-div.parts th,
-div.parts td {
-	border-width: 1px 0 0 1px;
-	border-style: solid;
-	border-color: #CCCCCC;
-}
-div.parts tr th:first-child,
-div.parts tr td:first-child,
-div.parts tr th.first-child,
-div.parts tr td.first-child {
-	border-left-width: 0;
-}
-/*----------------------------------------------
- * マーカー付きリンク、ボタンリンク
- *--------------------------------------------*/
-ul.moreInfo li {
-	padding: 2px 0 2px 20px;
-	background: url(../images/icon_arrow_1.gif) no-repeat 0 0.4em;
-}
-ul.moreInfo.button li {
-	padding: 0;
-	background: none;
-}
-ul.moreInfo.button li form {
-	display: inline;
-}
-ul.moreInfo.button li form .input_submit {
-	margin: 0 5px;
-}
-/*----------------------------------------------
- * サブミットボタン
- *--------------------------------------------*/
-.input_submit {
-	border: 1px solid #888888;
-	background: #dadce6 url(../images/bg_button.gif) repeat-x scroll 50% 0;
-	letter-spacing: 0;
-}
-.input_file {
-	background: none;
-}
-/*----------------------------------------------
- * ラジオボタン、セレクトボタン
- *--------------------------------------------*/
-.input_checkbox,
-.input_radio {
-	width: 16px;
-}
-ul.check {
-	line-height: 1.4;
-}
-ul.check .input_radio,
-ul.check .input_checkbox {
-	margin: 0 4px;
-}
-/*----------------------------------------------
- * 画像置換指定
- *--------------------------------------------*/
-#HeaderContainer a,
-#localNav a {
-	display: block;
-	width: 100%;
-	height: 100%;
-	margin: 0;
-	padding: 0;
-	border: none;
-	text-indent: -9999px;
-	text-decoration: none;
-}
-#HeaderContainer a:focus,
-#localNav a:focus {
-	overflow: hidden;
-}
-/*----------------------------------------------
- * clearfix, overflow: hidden
- *--------------------------------------------*/
-div#LayoutA,
-div#LayoutB,
-div#LayoutC,
-div.pagerRelativeMulti,
-.diaryDetailBox .partsHeading,
-.diaryDetailBox dl,
-.topicDetailBox dl,
-.eventDetailBox dl,
-.messageDetailBox div.operation,
-.prevNextLinkLine,
-.commentList dl,
-#pc_page_fh_diary_list .commentList dd div.title,
-.reviewList dl,
-.recentList dl,
-.searchCategoryList dl dd ul,
-.bizSideScheduleList dl,
-.albumImageList .partsHeading,
-.homeMainTable .partsHeading,
-.formTable .partsHeading,
-.formTable div.checkList ul,
-.monthlyCalendarTable div.block {
-	zoom: 1;
-	overflow: visible;
-}
-div#LayoutA:after,
-div#LayoutB:after,
-div#LayoutC:after,
-div.pagerRelativeMulti:after,
-.diaryDetailBox .partsHeading:after,
-.diaryDetailBox dl:after,
-.topicDetailBox dl:after,
-.eventDetailBox dl:after,
-.messageDetailBox div.operation:after,
-.prevNextLinkLine:after,
-.commentList dl:after,
-#pc_page_fh_diary_list .commentList dd div.title:after,
-.reviewList dl:after,
-.recentList dl:after,
-.searchCategoryList dl dd ul:after,
-.bizSideScheduleList dl:after,
-.albumImageList .partsHeading:after,
-.homeMainTable .partsHeading:after,
-.formTable .partsHeading:after,
-.formTable div.checkList ul:after,
-.monthlyCalendarTable div.block:after {
-	content: ".";
-	display: block;
-	clear: both;
-	height: 0;
-	visibility: hidden;
-}
-#Top {
-	overflow: hidden;
-}
-dd div, dt, ul, ol, td, th, p,
-h1, h2, h3, h4, h5, h6, .partsHeading,
-fieldset, label {
-	overflow: hidden;
-}
-dd div div {
-	overflow: visible;
-}
-pre {
-	overflow: auto;
-}
-/*----------------------------------------------
- * ベースレイアウト
- *--------------------------------------------*/
-#Container {
-	position: relative;
-	width: 720px;
-}
-#Header {
-	position: relative;
-}
-#topBanner {
-	position: absolute;
-	top: 5px;
-	left: 247px;
-	width: 468px;
-	height: 60px;
-}
-#Top {
-	padding-left: 5px;
-}
-#Top .infoBox,
-#Top .descriptionBox {
-	margin-right: 20px;
-	margin-left: 20px;
-}
-#LayoutA #Left {
-	float: left;
-	width: 270px;
-	padding: 0 5px;
-}
-#LayoutA #Center {
-	float: right;
-	width: 440px;
-}
-#LayoutB #Left {
-	float: left;
-	width: 170px;
-  margin: 5px;
-}
-#LayoutB #Center {
-	float: right;
-	width: 540px;
-}
-#LayoutC #Center {
-	width: 650px;
-	margin: 0 auto;
-}
-#Footer {
-	width: 720px;
-	height: 21px;
-	background: url(../images/skin_footer.jpg) 0 0 no-repeat;
-}
-#Footer p {
-	padding-right: 12px;
-	line-height: 21px;
-	text-align: right;
-}
-#sideBanner {
-	position: absolute;
-	top: 0px;
-	left: 720px;
-	width: 230px;
-}
-*:first-child+html #pc_page_h_diary_add #Footer,
-*:first-child+html #pc_page_h_diary_edit #Footer {
-	margin-top: 10px;
-}
-* html #pc_page_h_diary_add #Footer,
-* html #pc_page_h_diary_edit #Footer {
-	margin-top: 10px;
-}
-/*----------------------------------------------
- * パーツ枠
- *--------------------------------------------*/
-div.dparts,
-div.dparts div.parts,
-div.ditem,
-#LayoutA #Left div.parts {
-	border: 1px solid #CCCCCC;
-}
-div.ditem div.item {
-	border-width: 0 1px 1px;
-	border-style: solid;
-	border-color: #CCCCCC;
-}
-div.dparts {
-	margin: 0 auto 10px;
-	padding: 7px;
-}
-div.dparts div.parts {
-	margin: 0;
-}
-div.parts {
-	margin: 0 auto 10px;
-}
-div.ditem {
-	padding: 5px 6px;
-}
-/*----------------------------------------------
- * パーツ見出し
- *--------------------------------------------*/
-.partsHeading {
-	padding: 2px 8px 2px 36px;
-	background: #36B3D1 url(../images/content_header_1.gif) no-repeat 0 0;
-	text-align: left;
-	font-size: 100%;
-}
-#LayoutA #Left .partsHeading {
-	padding-left: 24px;
-	background-image: url(../images/icon_title_1.gif);
-}
-.partsHeading h3 {
-	display: inline;
-	font-weight: bold;
-}
-.partsHeading p {
-	display: inline;
-	margin-left: 0.5em;
-}
-/*----------------------------------------------
- * パーツ内上下の部分（1件～20件を表示など）
- *--------------------------------------------*/
-div.block,
-div.partsInfo,
-div.pagerAbsolute,
-div.pagerRelative,
-div.pagerRelativeMulti,
-div.operation {
-	border-top: 1px solid #CCCCCC;
-}
-div.partsInfo {
-	padding: 10px 40px;
-}
-div.pagerAbsolute {
-	padding: 4px;
-	text-align: center;
-}
-div.pagerAbsolute p {
-	display: inline;
-}
-div.pagerRelative {
-	padding: 4px;
-	text-align: right;
-}
-div.pagerRelativeMulti {
-	padding: 4px;
-}
-div.pagerRelative p,
-div.pagerRelativeMulti div.pager p {
-	display: inline;
-	margin-left: 10px;
-}
-div.pagerRelative p:first-child,
-div.pagerRelativeMulti div.pager p:first-child,
-div.pagerRelative p.first-child,
-div.pagerRelativeMulti div.pager p.first-child {
-	margin-left: 0;
-}
-div.pagerRelativeMulti div.text {
-	float: left;
-	width: 55%;
-}
-div.pagerRelativeMulti div.pager {
-	float: right;
-	width: 45%;
-	margin-top: 0.5em;
-	text-align: right;
-}
-div.operation {
-	padding: 4px;
-}
-div.operation ul.moreInfo {
-	text-align: center;
-}
-div.operation ul.moreInfo li {
-	display: inline;
-	background-position: 0 50%;
-}
-/*----------------------------------------------
- * カレンダー
- *--------------------------------------------*/
-.sideNav .calendar td,
-.sideNav .calendar td * {
-	word-break: normal;
-	letter-spacing: -1px;
-}
-#Body .calendar .holiday,
-.calendar .sun {
-	color: #d92c49;
-}
-.calendar .sat {
-	color: #2c65d9;
-}
-
-/*==============================================================================
- * h系、f系、c系ナビメニュー（localNav）
- *----------------------------------------------------------------------------*/
-#HeaderContainer {
-	zoom: 1;
-	position: relative;
-	width: 720px;
-	height: 96px;
-	background: url(../images/skin_after_header.jpg) 0 0 no-repeat;
-}
-#globalNavBefore {
-	height: 125px;
-	margin-bottom: 10px;
-	background: url(../images/skin_before_header.jpg) 0 0 no-repeat;
-}
-#localNav {
-	zoom: 1;
-	position: relative;
-	width: 720px;
-	height: 29px;
-  margin-bottom: 10px;
-}
-#localNav .default {
-	zoom: 1;
-	width: 720px;
-	height: 29px;
-	background: url(../images/skin_navi_h.jpg) 0 0 no-repeat;
-}
-#localNav .friend {
-	zoom: 1;
-	width: 720px;
-	height: 29px;
-	background: url(../images/skin_navi_f.jpg) 0 0 no-repeat;
-}
-#localNav .community {
-	zoom: 1;
-	width: 720px;
-	height: 29px;
-	background: url(../images/skin_navi_c.jpg) 0 0 no-repeat;
-}
-#HeaderContainer li a:hover, #HeaderContainer li a:active {
-	background-image: url(../images/skin_after_header_2.jpg);
-}
-#localNav .default li a:hover, #localNav .default li a:active {
-	background-image: url(../images/skin_navi_h_2.jpg);
-}
-#localNav .friend li a:hover, #localNav .friend li a:active {
-	background-image: url(../images/skin_navi_f_2.jpg);
-}
-#localNav .community li a:hover, #localNav .community li a:active {
-	background-image: url(../images/skin_navi_c_2.jpg);
-}
-
-#HeaderContainer h1 {
-	position: absolute;
-	top: 5px;
-	left: 0;
-	width: 240px;
-	height: 60px;
-}
-#HeaderContainer li, #localNav li {
-	position: absolute;
-}
-
-li#globalNav_member_search,
-li#globalNav_community_search,
-li#globalNav_3 {
-	top: 70px;
-	height: 18px;
-}
-li#globalNav__homepage,
-li#globalNav_member_invite,
-li#globalNav_diary_index,
-li#globalNav_7,
-li#globalNav_member_config,
-li#globalNav_member_logout {
-	top: 68px;
-	height: 20px;
-}
-li#globalNav_member_search { left:   2px; width: 88px; }
-li#globalNav_community_search { left:  90px; width: 90px; }
-li#globalNav_3 { left: 180px; width: 88px; }
-li#globalNav__homepage { left: 290px; width: 70px; }
-li#globalNav_member_invite { left: 360px; width: 72px; }
-li#globalNav_diary_index { left: 432px; width: 72px; }
-li#globalNav_7 { left: 504px; width: 72px; }
-li#globalNav_member_config { left: 576px; width: 72px; }
-li#globalNav_member_logout { left: 648px; width: 70px; }
-li#globalNav_member_search a:hover, li#globalNav_member_search a:active { background-position:   -2px -70px; }
-li#globalNav_community_search a:hover, li#globalNav_community_search a:active { background-position:  -90px -70px; }
-li#globalNav_3 a:hover, li#globalNav_3 a:active { background-position: -180px -70px; }
-li#globalNav__homepage a:hover, li#globalNav__homepage a:active { background-position: -290px -68px; }
-li#globalNav_member_invite a:hover, li#globalNav_member_invite a:active { background-position: -360px -68px; }
-li#globalNav_diary_index a:hover, li#globalNav_diary_index a:active { background-position: -432px -68px; }
-li#globalNav_7 a:hover, li#globalNav_7 a:active { background-position: -504px -68px; }
-li#globalNav_member_config a:hover, li#globalNav_member_config a:active { background-position: -576px -68px; }
-li#globalNav_member_logout a:hover, li#globalNav_member_logout a:active { background-position: -648px -68px; }
-
-#localNav .default li {
-	top: 0;
-	width: 80px;
-	height: 29px;
-	left: -9999px;
-}
-#localNav .default li#default__homepage { left:   0px; }
-#localNav .default li#default_friend_list { left:  80px; }
-#localNav .default li#default_diary_listMember { left: 160px; }
-#localNav .default li#default_message_index { left: 240px; }
-#localNav .default li#default_ashiato_list { left: 320px; }
-#localNav .default #hLocalNav_6 { left: 400px; }
-#localNav .default #hLocalNav_7 { left: 480px; }
-#localNav .default li#default_member_profile { left: 560px; }
-#localNav .default li#default_member_editProfile { left: 640px; }
-#localNav .default li#default__homepage a:hover, #localNav .default li#default__homepage a:active { background-position:   -0px -29px; }
-#localNav .default li#default_friend_list a:hover, #localNav .default li#default_friend_list a:active { background-position:  -80px -29px; }
-#localNav .default li#default_diary_listMember a:hover, #localNav .default li#default_diary_listMember a:active { background-position: -160px -29px; }
-#localNav .default li#default_message_index a:hover, #localNav .default li#default_message_index a:active { background-position: -240px -29px; }
-#localNav .default li#default_ashiato_list a:hover, #localNav .default li#default_ashiato_list a:active { background-position: -320px -29px; }
-#localNav .default #hLocalNav_6 a:hover, #localNav .default #hLocalNav_6 a:active { background-position: -400px -29px; }
-#localNav .default #hLocalNav_7 a:hover, #localNav .default #hLocalNav_7 a:active { background-position: -480px -29px; }
-#localNav .default li#default_member_profile a:hover, #localNav .default li#default_member_profile a:active { background-position: -560px -29px; }
-#localNav .default li#default_member_editProfile a:hover, #localNav .default li#default_member_editProfile a:active { background-position: -640px -29px; }
-
-#localNav .friend li {
-	top: 0;
-	width: 80px;
-	height: 29px;
-	left: -9999px;
-}
-#localNav .friend li#friend_member_profile { left:   0px; }
-#localNav .friend li#friend_friend_list { left:  80px; }
-#localNav .friend li#friend_diary_listMember { left: 160px; }
-#localNav .friend li#friend_message_sendToFriend { left: 240px; }
-#fLocalNav_5 { left: 320px; }
-#fLocalNav_6 { left: 400px; }
-#fLocalNav_7 { left: 480px; }
-#fLocalNav_8 { left: 560px; }
-#fLocalNav_9 { left: 640px; }
-#localNav .friend li#friend_member_profile a:hover, #localNav .friend li#friend_member_profile a:active { background-position:   -0px -29px; }
-#localNav .friend li#friend_friend_list a:hover, #localNav .friend li#friend_friend_list a:active { background-position:  -80px -29px; }
-#localNav .friend li#friend_diary_listMember a:hover, #localNav .friend li#friend_diary_listMember a:active { background-position: -160px -29px; }
-#localNav .friend li#friend_message_sendToFriend a:hover, #localNav .friend li#friend_message_sendToFriend a:active { background-position: -240px -29px; }
-#fLocalNav_5 a:hover, li#fLocalNav_5 a:active { background-position: -320px -29px; }
-#fLocalNav_6 a:hover, li#fLocalNav_6 a:active { background-position: -400px -29px; }
-#fLocalNav_7 a:hover, li#fLocalNav_7 a:active { background-position: -480px -29px; }
-#fLocalNav_8 a:hover, li#fLocalNav_8 a:active { background-position: -560px -29px; }
-#fLocalNav_9 a:hover, li#fLocalNav_9 a:active { background-position: -640px -29px; }
-
-#localNav .community li {
-	top: 0;
-	width: 120px;
-	height: 29px;
-	left: -9999px;
-}
-#localNav .community li#community_community_home { left:   0px; }
-#localNav .community li#community_communityTopic_listCommunity { left: 120px; }
-#localNav .community li#cLocalNav_3 { left: 240px; }
-#localNav .community li#community_community_join { left: 360px; }
-#localNav .community li#cLocalNav_5 { left: 480px; }
-#localNav .community li#community_community_quit { left: 600px; }
-#localNav .community li#community_community_home a:hover, #localNav .community li#community_community_home a:active { background-position:   -0px -29px; }
-#localNav .community li#community_communityTopic_listCommunity a:hover, #localNav .community li#community_communityTopic_listCommunity a:active { background-position: -120px -29px; }
-#localNav .community li#cLocalNav_3 a:hover, #localNav .community li#cLocalNav_3 a:active { background-position: -240px -29px; }
-#localNav .community li#community_community_join a:hover, #localNav .community li#community_community_join a:active { background-position: -360px -29px; }
-#localNav .community li#cLocalNav_5 a:hover, #localNav .community li#cLocalNav_5 a:active { background-position: -480px -29px; }
-#localNav .community li#community_community_quit a:hover, #localNav .community li#community_community_quit a:active { background-position: -600px -29px; }
-
-/*==============================================================================
- * memberImageBox
- *----------------------------------------------------------------------------*/
-.memberImageBox * {
-  text-align: center;
-}
-
-.memberImageBox {
-  padding: 7px;
-  border: 1px solid #CCCCCC;
-  background: transparent url(../images/bg_parts_photo_box.gif) repeat-x 0 0;
-}
-
-.memberImageBox p.photo {
-  padding: 7px;
-  border: 1px solid #CCCCCC;
-  background-color: #FFFFFF;
-}
-
-.memberImageBox p.friendLink {
-  margin-bottom: 3px;
-}
-
-.memberImageBox ul.moreInfo {
-  margin: 2px 0 -5px;
-}
-
-.memberImageBox ul.moreInfo li {
-  padding: 1px 0;
-  background: none;
-}
-
-.memberImageBox ul.moreInfo li img {
-  vertical-align: bottom;
-}
-
-.memberImageBox p.rank {
-  margin-top: 6px;
-}
-
-.memberImageBox p.point {
-  margin-top: 2px;
-}
-
-.memberImageBox p.text {
-  margin-top: 4px;
-}
-
-.memberImageBox p.loginTime {
-  margin-top: 0px;
-}
-
-/*==============================================================================
- * 1. box（シンプルボックス）
- *----------------------------------------------------------------------------*/
-.box .body {
-	padding: 10px 0;
-}
-.box .body p {
-	text-align: center;
-}
-
-/*==============================================================================
- * 2. descriptionBox（説明ボックス）
- *----------------------------------------------------------------------------*/
-.descriptionBox p {
-	margin: 12px;
-}
-
-/*==============================================================================
- * 3. alertBox（アラートボックス）
- *----------------------------------------------------------------------------*/
-.alertBox {
-	width: 564px;
-}
-#Body .alertBox th {
-	width: 148px;
-	padding: 8px 0;
-	border: none;
-	text-align: center;
-}
-#Body .alertBox td {
-	padding: 6px;
-	border-width: 0 0 0 1px;
-	color: #ff0000;
-}
-
-/*==============================================================================
- * 4. infoBox（案内ボックス）
- *----------------------------------------------------------------------------*/
-.infoBox .parts {
-	zoom: 1;
-	position: relative;
-}
-.infoBox p {
-	margin-right: 16em;
-	padding: 5px;
-	border-right: 1px solid #CCCCCC;
-	background: #FFFFFF;
-}
-.infoBox ul.moreInfo {
-	position: absolute;
-	bottom: 3px;
-	right: 0;
-	width: 15.5em;
-}
-
-/*==============================================================================
- * 5. infoButtonBox（ボタン付き案内ボックス）
- *----------------------------------------------------------------------------*/
-.infoButtonBox .block {
-	padding: 30px 10px;
-}
-.infoButtonBox p,
-.infoButtonBox ul {
-	margin-top: 6px;
-	text-align: center;
-}
-.infoButtonBox ul.check li {
-	text-align: center;
-}
-.infoButtonBox ul.check li .input_submit {
-	margin-top: 6px;
-}
-.infoButtonBox ul.moreInfo {
-	margin-left: 230px;
-}
-.infoButtonBox ul.moreInfo.button {
-	margin-left: 0;
-}
-.infoButtonBox ul.moreInfo.button li {
-	text-align: center;
-}
-
-/*==============================================================================
- * 6. yesNoButtonBox（はい、いいえボタン付きボックス）
- *----------------------------------------------------------------------------*/
-.yesNoButtonBox .block {
-	padding: 10px 0;
-}
-.yesNoButtonBox .block p,
-.yesNoButtonBox ul.moreInfo.button {
-	text-align: center;
-}
-.yesNoButtonBox ul.moreInfo.button {
-	margin-top: 4px;
-}
-.yesNoButtonBox ul.moreInfo.button li {
-	display: inline;
-}
-
-/*==============================================================================
- * 7. searchFormBox（検索フォームボックス）
- *----------------------------------------------------------------------------*/
-.searchFormBox .partsHeading {
-	border-bottom: 1px solid #CCCCCC;
-}
-.searchFormBox .parts {
-	zoom: 1;
-}
-.searchFormBox .item {
-	margin: 10px 40px;
-	padding-top: 8px;
-	border: 1px solid #CCCCCC;
-}
-.searchFormBox label,
-.searchFormBox span.label {
-	margin: 0 4px 0 8px;
-	padding: 1px 16px 0 0;
-	background: url(../images/icon_arrow_2.gif) no-repeat 100% 0;
-}
-.searchFormBox .input_submit {
-	margin-right: 8px;
-}
-.searchFormBox p.desc {
-	margin: 0 4px 16px 8px;
-}
-.searchFormBox p.form {
-	margin: 0 4px 8px 0;
-}
-.searchFormBox p.note {
-	margin: -4px 4px 8px 8px;
-}
-.searchFormBox ul.moreInfo {
-	margin: 0 4px 8px 150px;
-}
-.searchFormBox div.block {
-	padding: 8px 0;
-}
-.searchFormBox dl.category {
-	zoom: 1;
-}
-.searchFormBox dl.category dt {
-	float: left;
-	width: 6em;
-}
-.searchFormBox dl.category dd {
-	zoom: 1;
-	margin-left: 6em;
-}
-.searchFormBox dl.category dd p {
-	margin: 0 16px;
-}
-.searchFormBox dl.categories dt {
-	margin-bottom: 4px;
-}
-.searchFormBox table.category th {
-	width: 74px;
-	padding: 3px 7px 3px 5px;
-	border: none;
-	background: url(../images/colon.gif) no-repeat 100% 4px;
-	font-weight: bold;
-	vertical-align: top;
-}
-.searchFormBox table.category td {
-	padding: 3px 8px;
-	border: none;
-	vertical-align: top;
-}
-
-/*==============================================================================
- * 8. diaryDetailBox（日記詳細ボックス）
- *----------------------------------------------------------------------------*/
-.diaryDetailBox h3 {
-	float: left;
-	width: 66%;
-}
-.diaryDetailBox h3 {
-	float: left;
-	width: 66%;
-}
-.diaryDetailBox .partsHeading p.public {
-	float: right;
-	width: 33%;
-	margin: 0;
-	text-align: right;
-}
-.diaryDetailBox dl {
-	border-top: 1px solid #CCCCCC;
-}
-.diaryDetailBox dt {
-	float: left;
-	width: 70px;
-	padding-top: 5px;
-	text-align: center;
-}
-.diaryDetailBox dd {
-	zoom: 1;
-	min-height: 4.5em;
-	margin-left: 70px;
-	border-left: 1px solid #CCCCCC;
-}
-* html .diaryDetailBox dd {
-	height: 4.5em;
-}
-.diaryDetailBox dd div {
-	border-top: 1px solid #CCCCCC;
-}
-.diaryDetailBox dd div p {
-	padding: 4px 3px;
-}
-.diaryDetailBox dd div.title {
-	border-top: none;
-}
-.diaryDetailBox dd div.body {
-	padding: 4px 3px;
-}
-.diaryDetailBox dd ul.photo {
-	padding: 4px 5px;
-}
-.diaryDetailBox dd ul.photo li {
-	display: inline;
-	margin-left: 6px;
-}
-.diaryDetailBox div.category ul {
-	padding: 4px;
-	text-align: right;
-}
-.diaryDetailBox div.category ul li {
-	display: inline;
-	font-size: 80%;
-}
-
-/*==============================================================================
- * 9. topicDetailBox（トピック詳細ボックス）
- *----------------------------------------------------------------------------*/
-.topicDetailBox dl {
-	border-top: 1px solid #CCCCCC;
-}
-.topicDetailBox dt {
-	float: left;
-	width: 100px;
-	padding: 5px;
-	text-align: center;
-}
-.topicDetailBox dd {
-	zoom: 1;
-	margin-left: 110px;
-	border-left: 1px solid #CCCCCC;
-}
-.topicDetailBox dd div {
-	border-top: 1px solid #CCCCCC;
-}
-.topicDetailBox dd div p {
-	padding: 5px;
-}
-.topicDetailBox dd div.title {
-	border-top: none;
-}
-.topicDetailBox dd ul.photo {
-	padding: 5px;
-}
-.topicDetailBox dd ul.photo li {
-	display: inline;
-	margin-left: 6px;
-}
-.topicDetailBox dd div.attachFile {
-	padding: 16px 5px;
-}
-.topicDetailBox div.operation {
-	padding: 10px 0;
-}
-
-/*==============================================================================
- * 10. eventDetailBox（イベント詳細ボックス）
- *----------------------------------------------------------------------------*/
-.eventDetailBox dl {
-	border-top: 1px solid #CCCCCC;
-}
-.eventDetailBox dt {
-	float: left;
-	width: 100px;
-	padding: 5px;
-	text-align: center;
-}
-.eventDetailBox dd {
-	zoom: 1;
-	margin-left: 110px;
-	border-left: 1px solid #CCCCCC;
-}
-.eventDetailBox dd ul.photo {
-	padding: 5px;
-	border-bottom: 1px solid #CCCCCC;
-}
-.eventDetailBox dd ul.photo li {
-	display: inline;
-	margin-left: 6px;
-}
-.eventDetailBox dd table th {
-	width: 112px;
-	text-align: center;
-	border-left: none;
-}
-.eventDetailBox dd table th,
-.eventDetailBox dd table td {
-	padding: 5px;
-}
-.eventDetailBox dd table tr:first-child th,
-.eventDetailBox dd table tr:first-child td,
-.eventDetailBox dd table tr.first-child th,
-.eventDetailBox dd table tr.first-child td {
-	border-top: none;
-}
-.eventDetailBox dd table ul.moreInfo {
-	margin-top: -1.2em;
-	text-align: right;
-}
-.eventDetailBox dd table ul.moreInfo li {
-	display: inline;
-	background-position: 0 50%;
-}
-
-/*==============================================================================
- * 11. homePhotoBox（ホーム写真ボックス）
- *----------------------------------------------------------------------------*/
-.homePhotoBox * {
-	text-align: center;
-}
-.homePhotoBox p.friendLink {
-	margin-bottom: 3px;
-}
-.homePhotoBox .parts {
-	padding: 7px;
-}
-.homePhotoBox ul.moreInfo {
-	margin: 2px 0 -5px;
-}
-.homePhotoBox ul.moreInfo li {
-	padding: 1px 0;
-	background: none;
-}
-.homePhotoBox ul.moreInfo li img {
-	vertical-align: bottom;
-}
-.homePhotoBox p.rank {
-	margin-top: 6px;
-}
-.homePhotoBox p.point {
-	margin-top: 2px;
-}
-.homePhotoBox p.text {
-	margin-top: 4px;
-}
-.homePhotoBox p.loginTime {
-	margin-top: 0px;
-}
-
-/*==============================================================================
- * 12. homeInfoBox（ホームインフォメーションボックス）
- *----------------------------------------------------------------------------*/
-#Body .homeInfoBox {
-	padding-left: 102px;
-	border: 1px solid #CCCCCC;
-	background: #FFFFFF url(../images/icon_information.gif) no-repeat 5px 50%;
-}
-.homeInfoBox div.body {
-	min-height: 1.2em;
-	padding: 5px;
-	border-left: 1px solid #CCCCCC;
-	background: #FFFFFF;
-}
-* html .homeInfoBox div.body {
-	height: 1.2em;
-}
-.homeInfoBox .caution {
-	color: #ff0000;
-}
-
-/*==============================================================================
- * 13. photoUploadFormBox（プロフィール写真アップロードフォームボックス）
- *----------------------------------------------------------------------------*/
-.photoUploadFormBox table {
-	border-top: 1px solid #CCCCCC;
-}
-#Body .photoUploadFormBox td {
-	padding: 8px 0;
-	border: none;
-	text-align: center;
-}
-.photoUploadFormBox form {
-	float: left;
-	width: 230px;
-}
-.photoUploadFormBox form p {
-	margin: 8px 0;
-	text-align: center;
-}
-.photoUploadFormBox ul {
-	zoom: 1;
-	margin: 8px 0 8px 230px;
-}
-.photoUploadFormBox li {
-	padding-left: 12px;
-	background: url(../images/marker.gif) no-repeat 3px 3px;
-}
-
-/*==============================================================================
- * 14. messageDetailBox（メッセージ詳細ボックス）
- *----------------------------------------------------------------------------*/
-#Body .messageDetailBox th:first-child,
-#Body .messageDetailBox th.first-child {
-	border-left-width: 1px;
-}
-.messageDetailBox th,
-.messageDetailBox td {
-	padding: 5px;
-}
-.messageDetailBox td.photo {
-	width: 120px;
-	text-align: center;
-}
-.messageDetailBox th {
-	width: 54px;
-	padding-left: 0;
-	padding-right: 16px;
-	background: url(../images/colon.gif) no-repeat 96% 50%;
-	text-align: right;
-}
-#Body .messageDetailBox td {
-	border-left: none;
-}
-.messageDetailBox ul.photo {
-	margin: 10px;
-	text-align: center;
-}
-.messageDetailBox p.text {
-	margin: 10px 60px;;
-}
-.messageDetailBox ul.photo li {
-	display: inline;
-	margin-left: 6px;
-}
-.messageDetailBox form.delete {
-	float: left;
-	width: 50%;
-	text-align: left;
-}
-.messageDetailBox form.send {
-	float: right;
-	width: 50%;
-	text-align: right;
-}
-.messageDetailBox form ul.moreInfo {
-	display: inline;
-}
-.messageDetailBox div.attachFile {
-	padding: 16px 5px;
-}
-
-/*==============================================================================
- * 15. albumDetailBox（アルバム詳細ボックス）
- *----------------------------------------------------------------------------*/
-.albumDetailBox th,
-.albumDetailBox td {
-	padding: 5px;
-}
-.albumDetailBox th {
-	width: 75px;
-}
-.albumDetailBox td.photo {
-	width: 190px;
-	padding: 5px 0;
-	text-align: center;
-}
-#Body .albumDetailBox th:first-child,
-#Body .albumDetailBox th.first-child,
-#Body .albumDetailBox td.operation {
-	border-left-width: 1px;
-}
-.albumDetailBox td.operation {
-	text-align: right;
-}
-
-/*==============================================================================
- * 16. albumImageBox（アルバム画像ボックス）
- *----------------------------------------------------------------------------*/
-.albumImageBox p.photo {
-	padding: 10px;
-	border-top: 1px solid #CCCCCC;
-	text-align: center;
-}
-.albumImageBox th, .albumImageBox td {
-	padding: 5px;
-}
-#Body .albumImageBox th {
-	width: 140px;
-	border-left: none;
-}
-
-/*==============================================================================
- * 17. searchFormLine（検索フォームライン）
- *----------------------------------------------------------------------------*/
-.searchFormLine ul {
-	text-align: center;
-	padding: 1px 0;
-}
-.searchFormLine ul li {
-	display: inline;
-}
-.searchFormLine ul li * {
-	vertical-align: middle;
-}
-.searchFormLine ul li label {
-	margin-right: 2px;
-	padding: 1px 13px 0 0;
-	background: url(../images/icon_arrow_2.gif) no-repeat 100% 0;
-}
-
-/*==============================================================================
- * 18. linkLine（リンクライン）
- *----------------------------------------------------------------------------*/
-.linkLine ul.moreInfo {
-	text-align: center;
-}
-.linkLine ul.moreInfo li {
-	display: inline;
-	background-position: 0 50%;
-}
-
-/*==============================================================================
- * 19. prevNextLinkLine（前次リンクライン）
- *----------------------------------------------------------------------------*/
-.prevNextLinkLine p.prev {
-	float: left;
-	width: 50%;
-	text-align: left;
-}
-.prevNextLinkLine p.next {
-	float: right;
-	width: 50%;
-	text-align: right;
-}
-.block.prevNextLinkLine {
-	padding: 4px 10px;
-}
-
-/*==============================================================================
- * 20. buttonLine（ボタンライン）
- *----------------------------------------------------------------------------*/
-.buttonLine form {
-	text-align: center;
-}
-
-/*==============================================================================
- * 21. alertLine（アラートライン）
- *----------------------------------------------------------------------------*/
-.alertLine p {
-	text-align: center;
-	color: #ff0000;
-}
-
-/*==============================================================================
- * 22. commentList（コメントリスト）
- *----------------------------------------------------------------------------*/
-.commentList dl {
-	border-top: 1px solid #CCCCCC;
-}
-.commentList dt {
-	float: left;
-	width: 70px;
-	padding-top: 5px;
-	text-align: center;
-}
-.commentList dd {
-	zoom: 1;
-	min-height: 5.5em;
-	margin-left: 70px;
-	border-left: 1px solid #CCCCCC;
-}
-* html .commentList dd {
-	height: 5.5em;
-}
-#LayoutC .commentList dt {
-	width: 110px;
-}
-#LayoutC .commentList dd {
-	margin-left: 110px;
-}
-.commentList dd div {
-	border-top: 1px solid #CCCCCC;
-}
-.commentList dd div p {
-	padding: 4px 3px;
-}
-.commentList dd div.title {
-	padding: 4px 3px;
-	border-top: none;
-}
-.commentList dd div.title p {
-	padding: 0;
-}
-#pc_page_fh_diary_list .commentList dd div.title p.heading {
-	float: left;
-	width: 66%;
-}
-#pc_page_fh_diary_list .commentList dd div.title p.public {
-	float: right;
-	width: 33%;
-	text-align: right;
-}
-.commentList dd ul.photo {
-	padding: 5px 5px 0;
-}
-.commentList dd ul.photo li {
-	display: inline;
-	margin-left: 6px;
-}
-.commentList dd div.footer p {
-	text-align: right;
-}
-.commentList div.operation {
-	padding: 8px 0;
-}
-.commentList dd div.attachFile {
-	padding: 16px 5px;
-}
-
-/*==============================================================================
- * 23. searchResultList（検索結果リスト）
- *----------------------------------------------------------------------------*/
-.searchResultList .partsInfo {
-	background: #FFFFFF;
-}
-.searchResultList .ditem {
-	margin: 8px 34px;
-}
-.searchResultList td.photo {
-	width: 90px;
-	padding: 0;
-	border-left: none;
-	text-align: center;
-}
-.searchResultList th, .searchResultList td {
-	padding: 5px;
-}
-.searchResultList th {
-	width: 75px;
-}
-#Body .searchResultList th:first-child,
-#Body .searchResultList th.first-child {
-	border-left-width: 1px;
-}
-.searchResultList tr.operation th {
-	padding-top: 0;
-	padding-bottom: 0;
-}
-.searchResultList tr.operation td {
-	padding: 0;
-}
-.searchResultList tr.operation span.text {
-	float: left;
-	display: block;
-	width: 110px;
-	padding: 5px;
-	border-right: 1px solid #CCCCCC;
-}
-.searchResultList tr.operation span.moreInfo{
-	zoom: 1;
-	display: block;
-	margin-left: 121px;
-	padding: 4px 0 3px;
-	text-align: center;
-}
-.searchResultList div.operation {
-	text-align: center;
-}
-.searchResultList tr.operation span.moreInfo img,
-.searchResultList div.operation form,
-.searchResultList div.operation fieldset {
-	display: inline;
-	vertical-align: top;
-}
-
-/*==============================================================================
- * 24. reviewList（レビューリスト）
- *----------------------------------------------------------------------------*/
-.reviewList dl {
-	border-top: 1px solid #CCCCCC;
-}
-.reviewList dl dt {
-	float:left;
-	width: 170px;
-	padding: 5px;
-	text-align: center;
-}
-.reviewList dl dt span {
-	display: block;
-	margin: 3px 0;
-}
-.reviewList dl dd {
-	zoom: 1;
-	margin-left: 180px;
-	border-left: 1px solid #CCCCCC;
-}
-.reviewList dl dd table {
-	height: 216px;
-}
-.reviewList dl dd th,
-.reviewList dl dd td {
-	padding: 5px;
-}
-.reviewList dl tr.title th,
-.reviewList dl dd tr.title td {
-	border-top: none;
-}
-.reviewList dl dd th {
-	width: 100px;
-	border-left: none;
-	text-align: center;
-}
-.reviewList dl dd tr.title td {
-	font-weight: bold;
-}
-.reviewList dl dd td p.operation {
-	text-align: right;
-}
-.reviewList dl dd tr.footer td {
-	border-left: none;
-	text-align: right;
-}
-.reviewList div.operation {
-	padding: 10px 0;
-}
-
-/*==============================================================================
- * 25. recentList（最新書き込みリスト）
- *----------------------------------------------------------------------------*/
-.recentList dl {
-	border-top: 1px solid #CCCCCC;
-}
-.recentList dt {
-	float: left;
-	width: 170px;
-	padding: 5px;
-	text-align: center;
-}
-.recentList dd {
-	zoom: 1;
-	margin-left: 180px;
-	padding: 5px;
-	border-left: 1px solid #CCCCCC;
-}
-* html #Body .recentList dd {
-	height: 1.2em;
-}
-#LayoutB #Center .recentList dt {
-	width: 110px;
-}
-#LayoutB #Center .recentList dd {
-	margin-left: 120px;
-}
-
-/*==============================================================================
- * 26. friendIntroList（フレンド紹介文リスト）
- *----------------------------------------------------------------------------*/
-.friendIntroList th,
-.friendIntroList td {
-	padding: 14px;
-}
-#Body .friendIntroList th {
-	width: 120px;
-	border-left: none;
-	text-align: center;
-}
-.friendIntroList p.text {
-	margin-bottom: 1em;
-}
-.friendIntroList div.moreInfo ul.moreInfo {
-	width: 10em;
-	margin-left: auto;
-	padding: 6px 2px;
-}
-
-/*==============================================================================
- * 27. manageList（管理リスト）
- *----------------------------------------------------------------------------*/
-.manageList td {
-	padding: 5px;
-}
-.manageList td.photo {
-	width: 140px;
-	border-left: none;
-	text-align: center;
-}
-.manageList td.delete {
-	width: 120px;
-}
-.manageList col.date {
-	width: 160px;
-}
-* html .manageList col.date {
-	width: 150px;
-}
-*:first-child+html .manageList col.date {
-	width: 150px;
-}
-.manageList col.name {
-	width: auto;
-}
-.manageList colgroup.operation col {
-	width: 86px;
-}
-* html .manageList colgroup.operation col {
-	width: 76px;
-}
-*:first-child+html .manageList colgroup.operation col {
-	width: 76px;
-}
-
-/*==============================================================================
- * 28. searchCategoryList（検索項目リスト）
- *----------------------------------------------------------------------------*/
-.searchCategoryList .partsInfo {
-	padding: 5px;
-	border-bottom: 1px solid #CCCCCC;
-	background: #FFFFFF;
-	text-align: center;
-}
-.searchCategoryList .item {
-	margin: 10px 40px;
-	border: 1px solid #CCCCCC;
-	border-top: none;
-}
-.searchCategoryList span.label {
-	margin: 0 4px 0 8px;
-	padding: 1px 16px 0 0;
-	background: url(../images/icon_arrow_2.gif) no-repeat 100% 0;
-}
-.searchCategoryList dl {
-	border-top: 1px solid #CCCCCC;
-}
-.searchCategoryList dl dt {
-	margin: 8px 0 0;
-}
-.searchCategoryList dl dd {
-	margin: 8px 10px 8px 70px;
-}
-.searchCategoryList dl dd ul {
-	margin: 4px 0;
-}
-.searchCategoryList dl dd ul li {
-	overflow: hidden;
-	float: left;
-	width: 19%;
-	margin: 0 2px;
-}
-
-/*==============================================================================
- * 29. messageList（メッセージリスト）
- *----------------------------------------------------------------------------*/
-.messageList .partsHeading p.date {
-	font-weight: bold;
-}
-.messageList .pagerRelativeMulti .text {
-	width: 160px;
-}
-.messageList .pagerRelativeMulti .pager {
-	width: 350px;
-	margin-top: 1px;
-}
-.messageList p.icons img {
-	padding-right: 16px;
-	background: url(../images/articleList_marker.gif) no-repeat 96% 6px;
-	vertical-align: text-bottom;
-}
-.messageList tr {
-	height: 20px;
-}
-.messageList tr.unread {
-	background: #FFFFFF;
-}
-#Body .messageList th.delete {
-	font-weight: normal;
-}
-#Body .messageList th {
-	padding: 0 2px;
-	border-width: 1px 0 0;
-	font-weight: bold;
-}
-#Body .messageList td {
-	padding: 0 2px;
-	border-width: 1px 0 0;
-}
-#Body .messageList td .input_checkbox {
-	margin-left: 4px;
-}
-.messageList td.status {
-	text-align: center;
-}
-.messageList col.status {
-	width: 35px;
-}
-.messageList col.delete {
-	width: 35px;
-}
-.messageList col.target {
-	width: 130px;
-}
-.messageList col.title {
-	width: auto;
-}
-.messageList col.date {
-	width: 80px;
-}
-.messageList table span {
-	width: 100%;
-	display: block;
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-}
-.messageList div.operation p {
-	margin-top: 8px;
-	margin-bottom: 5px;
-}
-.messageList div.operation ul.moreInfo {
-	text-align: left;
-}
-
-/*==============================================================================
- * 30. ashiatoList（あしあとリスト）
- *----------------------------------------------------------------------------*/
-.ashiatoList div.partsInfo {
-	border-bottom: 1px solid #CCCCCC;
-}
-.ashiatoList div.item {
-	margin: 8px 40px;
-	padding: 8px 0;
-	border: 1px solid #CCCCCC;
-}
-.ashiatoList div.item p,
-.ashiatoList div.item ul.list {
-	padding-left: 160px;
-}
-.ashiatoList div.item p strong {
-	margin: 0 2px;
-}
-.ashiatoList div.item ul.list {
-	margin-top: 16px;
-}
-
-/*==============================================================================
- * 31. rankingList（ランキングリスト）
- *----------------------------------------------------------------------------*/
-.rankingList .partsHeading p {
-	margin: 0;
-}
-#Body .rankingList th:first-child,
-#Body .rankingList th.first-child {
-	border-left-width: 1px;
-}
-.rankingList td.photo {
-	width: 130px;
-	padding: 5px 0;
-	text-align: center;
-}
-.rankingList th {
-	width: 75px;
-	padding: 5px;
-}
-.rankingList td {
-	padding: 5px;
-}
-.rankingList td.name {
-	background: #FFFFFF;
-}
-.rankingList td.name a {
-	font-weight: bold;
-}
-.rankingList .ditem {
-	margin: 8px 15px;
-	background: #FFFFFF;
-}
-.rankingList .item {
-	background: #FFFFFF;
-}
-.rankingList .item td.photo {
-	width: 90px;
-}
-
-/*==============================================================================
- * 32. bizSideTodoList（BIZ用Todoリスト）
- *----------------------------------------------------------------------------*/
-#Body .bizSideTodoList {
-	width: 220px;
-	margin: 10px 5px;
-	border: 1px solid #CCCCCC;
-}
-#Body .bizSideTodoList td {
-	border-width: 1px 0 0;
-}
-.bizSideTodoList .block {
-	padding: 5px;
-}
-.bizSideTodoList textarea {
-	width: 98%;
-}
-.bizSideTodoList tr.someone {
-	background: #FFFFFF;
-}
-.bizSideTodoList tr.checked {
-	color: #999999;
-}
-.bizSideTodoList td.state {
-	width: 38px;
-	vertical-align: top;
-}
-.bizSideTodoList tr.priLow td.state p {
-	padding-left: 4px;
-	border-left: 0;
-}
-.bizSideTodoList tr.priMiddle td.state p {
-	padding-left: 0;
-	border-left: 4px solid #ff8080;
-}
-.bizSideTodoList tr.priHigh td.state p {
-	padding-left: 0;
-	border-left: 4px solid #ff0000;
-}
-.bizSideTodoList tr.checked td.state p {
-	padding-left: 4px;
-	border-left: 0;
-}
-.bizSideTodoList td.operation {
-	width: 16px;
-	vertical-align: top;
-}
-.bizSideTodoList td.operation a {
-	display: block;
-	width: 14px;
-	margin-top: 2px;
-}
-
-/*==============================================================================
- * 33. bizSideScheduleList（BIZ用スケジュールリスト） 
- *----------------------------------------------------------------------------*/
-#Body .bizSideScheduleList {
-	width: 220px;
-	margin: 10px 5px;
-	border: 1px solid #CCCCCC;
-}
-.bizSideScheduleList dl {
-	border-top: 1px solid #CCCCCC;
-}
-.bizSideScheduleList dt {
-	float: left;
-	width: 60px;
-	padding: 5px;
-	text-align: center;
-}
-.bizSideScheduleList dd {
-	zoom: 1;
-	margin-left: 70px;
-	padding: 5px;
-	border-left: 1px solid #CCCCCC;
-}
-
-/*==============================================================================
- * 34. albumList（アルバムリスト）
- *----------------------------------------------------------------------------*/
-.albumList th,
-.albumList td {
-	padding: 5px;
-}
-.albumList th {
-	width: 75px;
-}
-.albumList td.photo {
-	width: 190px;
-	padding: 5px 0;
-	text-align: center;
-}
-.albumList td.photo p {
-	text-align: center;
-	padding: 5px;
-}
-#Body .albumList th:first-child,
-#Body .albumList th.first-child {
-	border-left-width: 1px;
-}
-.albumList td.operation {
-	text-align: center;
-}
-
-/*==============================================================================
- * 35. albumImageList（アルバム画像リスト）
- *----------------------------------------------------------------------------*/
-.albumImageList td {
-	padding: 5px;
-	text-align: center;
-}
-.albumImageList td p {
-	text-align: center;
-}
-
-/*==============================================================================
- * 36. nineTable（ホーム9面テーブル）
- *----------------------------------------------------------------------------*/
-.nineTable tr.photo td {
-	height: 80px;
-	padding: 2px 0;
-	text-align: center;
-}
-.nineTable tr.photo td p.crown {
-	text-align: center;
-}
-.nineTable tr.text td {
-	padding: 2px;
-	text-align: center;
-}
-.nineTable div.moreInfo {
-  border-top: 1px solid #CCCCCC;
-}
-.nineTable div.moreInfo ul.moreInfo {
-	width: 11em;
-	margin-left: auto;
-	padding: 6px 0;
-}
-
-/*==============================================================================
- * 37. photoTable（写真テーブル）
- *----------------------------------------------------------------------------*/
-.photoTable {
-	width: 561px;
-}
-.photoTable tr.photo td {
-	height: 90px;
-	padding: 8px 0;
-	text-align: center;
-}
-.photoTable tr.photo td p.crown {
-	text-align: center;
-}
-.photoTable tr.text td {
-	padding: 5px 2px;
-	text-align: center;
-}
-
-/*==============================================================================
- * 38. homeMainTable（ホームメインテーブル）
- *----------------------------------------------------------------------------*/
-#page_member_home #Center h3 .partsHeading,
-#page_member_profile #Center h3 .partsHeading,
-.listBox .partsHeading h3,
-.albumImageList .partsHeading h3,
-.homeMainTable .partsHeading h3 {
-	float: left;
-	width: 66%;
-}
-#page_member_home #Center h3 p.link,
-#page_member_profile #Center h3 p.link,
-.listBox .partsHeading p.link, 
-.albumImageList .partsHeading p.link, 
-.homeMainTable .partsHeading p.link {
-	float: right;
-	width: 33%;
-	margin: 0;
-	text-align: right;
-}
-#page_member_home #Center th,
-#page_member_profile #Center th,
-.listBox th, 
-.homeMainTable th {
-	width: 83px;
-	background-color: #FFFFFF;
-}
-#page_member_home #Center div.block,
-#page_member_profile #Center div.block,
-.listBox th, .listBox td,
-.homeMainTable th, .homeMainTable td {
-	padding: 5px;
-}
-#page_member_home #Center ul.articleList,
-#page_member_profile #Center ul.articleList,
-.listBox ul.articleList,
-.homeMainTable ul.articleList {
-	line-height: 1.3;
-}
-#page_member_home #Center ul.articleList li,
-#page_member_profile #Center ul.articleList li,
-.homeMainTable ul.articleList li {
-    padding-left: 85px;
-    text-indent: -72px;
-}
-#page_member_home #Center ul.articleList li,
-#page_member_profile #Center ul.articleList li,
-.listBox tr ul.articleList li,
-.homeMainTable tr ul.articleList li {
-    background: url(../images/icon_3.gif) 3px 0.4em no-repeat scroll;
-}
-.homeMainTable tr.myFriendRecentDiary ul.articleList li,
-.homeMainTable tr.myFriendRecentBlog ul.articleList li,
-.homeMainTable tr.allRecentDiary ul.articleList li,
-.homeMainTable tr.bookmarkRecentDiary ul.articleList li,
-.homeMainTable tr.bookmarkRecentBlog ul.articleList li,
-.homeMainTable tr.myRecentDiary ul.articleList li,
-.homeMainTable tr.myRecentBlog ul.articleList li,
-.homeMainTable tr.friendRecentDiary ul.articleList li,
-.homeMainTable tr.friendRecentBlog ul.articleList li
-{
-    background-image: url(../images/icon_1.gif);
-}
-.homeMainTable tr.diaryCommentHistory ul.articleList li,
-.homeMainTable tr.recentCommunityTopicComment ul.articleList li,
-.homeMainTable tr.allRecentCommunityTopicComment ul.articleList li,
-.homeMainTable tr.communityTopic ul.articleList li,
-.homeMainTable tr.communityEvent ul.articleList li
-{
-    background-image: url(../images/icon_2.gif);
-}
-#page_member_home #Center ul.articleList li span.date,
-#page_member_profile #Center ul.articleList li span.date,
-.listBox ul.articleList li span.date,
-.homeMainTable ul.articleList li span.date {
-	padding-right: 18px;
-	background: url(../images/articleList_marker.gif) 92% 0.3em no-repeat scroll;
-}
-#page_member_home #Center div.moreInfo ul.moreInfo,
-#page_member_profile #Center div.moreInfo ul.moreInfo,
-.listBox div.moreInfo ul.moreInfo,
-.homeMainTable div.moreInfo ul.moreInfo {
-	width: 10em;
-	margin: 0 2px 0 auto;
-}
-#page_member_home #Center td.halfway ul.moreInfo,
-#page_member_profile #Center td.halfway ul.moreInfo,
-.listBox td.halfway ul.moreInfo,
-.homeMainTable td.halfway ul.moreInfo {
-	width: 12em;
-	margin: 0 0 20px auto;
-}
-
-/*==============================================================================
- * 39. form（入力フォームテーブル）
- *----------------------------------------------------------------------------*/
-.form .partsHeading div.text {
-	float: left;
-	width: 66%;
-}
-.form .partsHeading p.link {
-	float: right;
-	width: 33%;
-	margin: 0;
-	text-align: right;
-}
-.form strong {
-	font-weight: normal;
-	color: #ff0000;
-}
-.form p.caution {
-	color: #ff0000;
-}
-.form div.block {
-	background-color: #FFFFFF;
-	padding: 10px 40px;
-}
-.form th, .form td {
-	padding: 5px;
-}
-#Body .form th {
-	width: 140px;
-	border-left: none;
-}
-#LayoutB #Center .form th {
-	width: 80px;
-}
-.form table table td {
-	padding: 0;
-	border: none;
-}
-.form textarea {
-	width: 98%;
-}
-.form input.input_text_long {
-	width: 98%;
-}
-.form table table td.publicSelector {
-	width: 150px;
-	text-align: right;
-}
-.form table table td.publicSelector select {
-	width: 150px;
-}
-.form div.checkList li {
-	overflow: hidden;
-	float: left;
-	width: 33%;
-	line-height: 1.6;
-}
-.form div.checkList li div.item {
-	padding-left: 18px;
-	text-indent: -18px;
-}
-.form div.operation {
-	padding: 10px 0;
-}
-
-/*==============================================================================
- * 40. weeklyCalendarTable（週間カレンダーテーブル）
- *----------------------------------------------------------------------------*/
-#Body .weeklyCalendarTable .parts {
-	border-top: none;
-}
-.weeklyCalendarTable div.block {
-	padding: 5px;
-}
-.weeklyCalendarTable .input_text {
-	width: 120px;
-}
-.weeklyCalendarTable .input_submit {
-	margin-right: 8px;
-}
-.weeklyCalendarTable .calendar td {
-	padding: 5px;
-	vertical-align: top;
-}
-.weeklyCalendarTable .calendar .today {
-	background: #FFFFFF;
-}
-.weeklyCalendarTable .calendar .today p.day {
-	font-weight: bold;
-}
-.weeklyCalendarTable ul.moreInfo {
-	margin: 0 2px 0 auto;
-	width: 9em;
-}
-
-/*==============================================================================
- * 41. monthlyCalendarTable（月間カレンダーテーブル）
- *----------------------------------------------------------------------------*/
-.monthlyCalendarTable div.block {
-	padding: 2px 5px;
-}
-.monthlyCalendarTable div.block p.moreInfo {
-	float: left;
-	width: 70%;
-	text-align: left;
-}
-.monthlyCalendarTable div.block p.moreInfo a {
-	margin-right: 4px;
-}
-.monthlyCalendarTable div.block p.pager {
-	float: right;
-	width: 30%;
-	margin-top: 2px;
-	text-align: right;
-}
-.monthlyCalendarTable .calendar th {
-	padding: 2px;
-}
-.monthlyCalendarTable .calendar td {
-	height: 65px;
-	padding: 2px;
-	vertical-align: top;
-}
-.monthlyCalendarTable .calendar td.today {
-	background: #FFFFFF;
-	font-weight: bold;
-}
-.monthlyCalendarTable .calendar td p {
-	font-weight: normal;
-}
-.monthlyCalendarTable .partsInfo {
-	padding: 5px;
-	background: #FFFFFF;
-}
-.monthlyCalendarTable .partsInfo img {
-	margin: 0 1px;
-}
-
-/*==============================================================================
- * 42. bizWeeklyCalendarTable（BIZ用週間カレンダーテーブル）
- *----------------------------------------------------------------------------*/
-#Body .bizWeeklyCalendarTable .parts {
-	border-top: none;
-}
-.bizWeeklyCalendarTable div.block {
-	padding: 5px;
-}
-.bizWeeklyCalendarTable .calendar td {
-	padding: 5px 0;
-	vertical-align: top;
-}
-.bizWeeklyCalendarTable .calendar td p {
-	padding: 0 5px;
-}
-.bizWeeklyCalendarTable .calendar td .time {
-	padding: 0;
-}
-.bizWeeklyCalendarTable .calendar .today {
-	background: #FFFFFF;
-}
-.bizWeeklyCalendarTable .calendar .today p.day {
-	font-weight: bold;
-}
-.bizWeeklyCalendarTable .calendar th {
-	width: 130px;
-	padding: 5px 0;
-	text-align: center;
-}
-.bizWeeklyCalendarTable .calendar th * {
-	text-align: center;
-}
-.bizWeeklyCalendarTable .calendar th .input_text {
-	width: 118px;
-}
-.bizWeeklyCalendarTable .calendar th .input_submit {
-	width: 120px;
-}
-.bizWeeklyCalendarTable .calendar th .nickname {
-	margin: 5px 0;
-}
-.bizWeeklyCalendarTable .calendar th .member_image {
-	margin-bottom: 5px;
-}
-.bizWeeklyCalendarTable .calendar td.sub {
-	border-width: 0 0 0 1px;
-}
-.bizWeeklyCalendarTable div.moreInfo {
-	padding-left: 135px;
-}
-.bizWeeklyCalendarTable div.moreInfo .input_submit {
-	margin-right: 8px;
-}
-
-/*==============================================================================
- * 43. pageNav（サイドナビ）
- *----------------------------------------------------------------------------*/
-.pageNav .item {
-	width: 150px;
-	margin: 0 auto 10px;
-	border: 8px solid #CCCCCC;
-}
-.pageNav .partsHeading {
-	border-bottom: 1px solid #CCCCCC;
-}
-.pageNav ul {
-	margin: 1px;
-}
-.pageNav li {
-	padding: 4px 0 4px 18px;
-	background: url(../images/icon_1.gif) 8px 50% no-repeat scroll;
-}
-.pageNav li.looking {
-	background-color: #FFFFFF;
-}
-.pageNav .calendar .partsHeading {
-	padding: 4px 0;
-	border: none;
-	background: none;
-	text-align: center;
-}
-.pageNav .calendar th {
-	background-color: #FFFFFF;
-	text-align: center;
-}
-.pageNav .calendar td {
-	padding: 1px 2px;
-	text-align: right;
-}
-.pageNav .list {
-	padding: 4px 0;
-}
-.pageNav .list li {
-	padding-left: 16px;
-	background: no-repeat 6px 4px;
-}
-.pageNav .monthlyMessage li  { background-image: url(../images/icon_1.gif); }
-.pageNav .recentlyDiary li   { background-image: url(../images/icon_3.gif); }
-.pageNav .recentlyComment li { background-image: url(../images/icon_1.gif); }
-.pageNav .monthlyDiary li    { background-image: url(../images/icon_2.gif); }
-.pageNav .listCategory li    { background-image: url(../images/icon_2.gif); }
-
-/*==============================================================================
- * 44. rankingSideNav（ランキングサイドナビ）
- *----------------------------------------------------------------------------*/
-.rankingSideNav {
-	width: 150px;
-	margin: 0 auto;
-	border: 8px solid #CCCCCC;
-}
-.rankingSideNav .partsHeading {
-	padding: 2px 4px;
-	border-bottom: 1px solid #CCCCCC;
-	background-image: none;
-	text-align: center;
-}
-.rankingSideNav p {
-	margin: 3px;
-}
-.rankingSideNav p.link {
-	padding: 3px;
-	border: 1px solid #CCCCCC;
-	text-align: right;
-}
-
-/**=============================================================================
- * 配色設定
- *----------------------------------------------------------------------------*/
-#Body {
-	background: #FFFFFF;
-}
-#Container {
-	background: #FFFFFF;
-}
-div.dparts {
-	background-color: #FFFFFF;
-}
-div.parts {
-	background-color: #FFFFFF;
-}
-.sideNav .item {
-	background-color: #FFFFFF;
-}
-#Body .sideNav {
-	background-color: transparent;
-}
-#Body .linkLine,
-#Body .searchFormLine,
-#Body .buttonLine,
-#Body .prevNextLinkLine,
-#Body .homeBirthdayBox {
-	background-color: transparent;
-}
-
-/**=============================================================================
- * ログインページ
- *----------------------------------------------------------------------------*/
-div#container_login {
-	position: relative;
-	display: block;
-	margin: 0px auto 0px 0px;
-	width: 720px;
-	height: 563px;
-	padding: 0px;
-}
-
-div#container_login img.bg {
-	display: block;
-	position: absolute;
-	left: 0px;
-	top: 0px;
-	width: 720px;
-	height: 563px;
-	z-index: 0;
-}
-
-div#container_login a img {
-	width: 100%;
-	height: 100%;
-}
-
-div#container_login div.banner,
-div#container_login a.banner {
-	display: block;
-	position: absolute;
-	left: 247px;
-	top: 5px;
-	width: 468px;
-	height: 60px;
-	z-index: 200;
-}
-
-div#container_login div.header a.main_menu {
-	display: block;
-	display: none;
-	position: absolute;
-	height: 22px;
-	top: 0px;
-}
-
-div#container_login input#username {
-	display: block;
-	position: absolute;
-	left: 504px;
-	top: 246px;
-	width: 185px;
-	height: 23px;
-	font-size: 10pt;
-	z-index: 100;
-}
-
-div#container_login input#password {
-	display: block;
-	position: absolute;
-	left: 504px;
-	top: 299px;
-	width: 185px;
-	height: 23px;
-	font-size: 10pt;
-	z-index: 110;
-}
-
-div#container_login input#button_login {
-	display: block;
-	position: absolute;
-	left: 536px;
-	top: 384px;
-	width: 120px;
-	height: 24px;
-	border: none 0px;
-	background-color: transparent;
-	z-index: 120;
-}
-
-div#container_login a#button_new_regist {
-	display: block;
-	position: absolute;
-	left: 536px;
-	top: 414px;
-	width: 120px;
-	height: 24px;
-	border: none 0px;
-	z-index: 130;
-}
-
-div#container_login div.msg {
-	display: block;
-	position: absolute;
-	border: none 0px;
-	padding: 3px 0px;
-	left: 504px;
-	top: 327px;
-	width: 185px;
-	height: 42px;
-	font-size: 9pt;
-	text-align: center;
-	z-index: 140;
-}
-
-div#container_login div.msg * {
-	font-size: 8pt;
-}
-
-div#container_login .footer {
-	display: block;
-	position: absolute;
-	left: 0px;
-	top: 542px;
-	width: 720px;
-	height: 21px;
-	z-index: 300;
-}
-div#container_login .footer p {
-	margin-right: 12px;
-	text-align: right;
-	line-height: 21px;
-}
-
-/*==============================================================================
- * 文字装飾
- *----------------------------------------------------------------------------*/
-span.op_b {
-	text-decoration: inherit;
-	font-style: inherit;
-	font-weight: bold;
-	color: inherit;
-	font-size: inherit;
-}
-
-span.op_u {
-	text-decoration: underline;
-	font-style: inherit;
-	font-weight: inherit;
-	color: inherit;
-	font-size: inherit;
-}
-
-span.op_s {
-	text-decoration: line-through;
-	font-style: inherit;
-	font-weight: inherit;
-	color: inherit;
-	font-size: inherit;
-}
-
-span.op_i {
-	text-decoration: inherit;
-	font-style: italic;
-	font-weight: inherit;
-	color: inherit;
-	font-size: inherit;
-}
-
-span.op_large {
-	text-decoration: inherit;
-	font-style: inherit;
-	font-weight: inherit;
-	color: inherit;
-	font-size: 20px;
-}
-
-span.op_small {
-	text-decoration: inherit;
-	font-style: inherit;
-	font-weight: inherit;
-	color: inherit;
-	font-size: 8px;
-}
-
-span.op_color {
-	text-decoration: inherit;
-	font-style: inherit;
-	font-weight: inherit;
-	color: inherit;
-	font-size: inherit;
-}
-
-
-/*==============================================================================
- * カスタムCSS
- *----------------------------------------------------------------------------*/
-/**フォント色変更**/
-
-/*リンク関連*/
-a:link    { color: #026CD1; }
-a:visited { color: #004A95; }
-a:hover   { color: #76AFE6; }
-a:active  { color: #76AFE6; }
-
-/*コンテンツ見出しlv1*/
-td.bg_06 span.b_b,
-.c_00 { color: #222222; }
-
-/*コンテンツ見出しlv2*/
-.c_01 { color: #444444; }
-
-/*強調文字暖色*/
-.c_02 { color: #D92C49; }
-
-/*強調文字寒色*/
-.c_03 { color: #2C65D9; }
-
-/*その他文字色*/
-body { color: #000000; }
diff --git a/plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_after_header.jpg b/plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_after_header.jpg
deleted file mode 100644
index 6295cf1aefede29047c87f67a40f6b95e6d4b8c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26293
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
VRm?LSCcdwz)E{FL5<~w?{}27KQM&*D

diff --git a/plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_after_header_2.jpg b/plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_after_header_2.jpg
deleted file mode 100644
index b7c622df303f17c6b5d393af573b3b8a819c3cca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 33221
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
T;?zui&S~IwMD`Z%-@^X@>J4o=

diff --git a/plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_before_header.jpg b/plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_before_header.jpg
deleted file mode 100644
index 52858631c25d117f0945ea33efa5411ceaab434a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18367
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

diff --git a/plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_login.jpg b/plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_login.jpg
deleted file mode 100644
index be3842de5251f9b38a1d2dccf0e2fa8a2fdb6a2a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 52913
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
Z%#mqH>&dQbI1#a>TSpBxVpx7n{0HcFcmMzZ

diff --git a/plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_login_open.jpg b/plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_login_open.jpg
deleted file mode 100644
index 3a9fc6bf0dd737397dfbf32324c373af2287d0ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 54332
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
B)u;df

diff --git a/plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_navi_c.jpg b/plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_navi_c.jpg
deleted file mode 100644
index 45dfa9b0fb36545f509c40fbaa24b8bae5b6b848..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12037
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
I&i%^&0D*D8iU0rr

diff --git a/plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_navi_c_2.jpg b/plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_navi_c_2.jpg
deleted file mode 100644
index 370be75fbf5c5c526204395dad38430c612b5c29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12833
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
I+s*9%0H<Xz$p8QV

diff --git a/plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_navi_f.jpg b/plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_navi_f.jpg
deleted file mode 100644
index 48a419162ad050024c92db135d2290d0b0595b3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13180
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
UguW#YoYb5iQm&~@9p5ed2Vp{tM*si-

diff --git a/plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_navi_f_2.jpg b/plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_navi_f_2.jpg
deleted file mode 100644
index 958b036310a24653d18f4b7cdad711e282e8113c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13732
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
F{0H+|uX6wZ

diff --git a/plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_navi_h.jpg b/plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_navi_h.jpg
deleted file mode 100644
index 2961e76a6fc2c87204a2a93f232b1639d2c3890d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12921
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
QR{D24V=wt@QD+PP27z_I%K!iX

diff --git a/plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_navi_h_2.jpg b/plugins/opSkinClassicPlugin/web/images/001_openpne_red/skin_navi_h_2.jpg
deleted file mode 100644
index 7f23101930b535ddc79b51b55e9b43af0d347125..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13943
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%0Ae@YtM9*WbZ^K=LOgPIBDoA|
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

diff --git a/plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_after_header.jpg b/plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_after_header.jpg
deleted file mode 100644
index 20e78337c52c1b072522bff39da82b23c183f68b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19735
zcmeFZby!<Xv@e`MaEiMXC%Aio0KuiWySqyZ#XY!ti#xQqOK~qw(c%<u(Ndt?^nK4g
z=iKwp_x*dH=MKr1HEY(anf+U`XJ_;L^?3_`qbRE&3jiVj09Non!1E~p7wT>4_!a;J
zfB*o18k}?vz>>6bwXg<Q^}#8?=QTh$0O3CiBK!yu1m7ZpkU)P65;D?11sNFy1r-Ga
z84V2`9Ssfh|13a6L_{PI5*jix+6xRcj2GBg@Pdu~57U3_F#kRKKimE1*>fKN7ZqTJ
zFoOuh1t8!85pjXfgMeND01<$I2n50v{f`1fKtw@8Mg^e(;RWzNt3b#|C^!HB5&|M3
zDk=~K1q}_}4BiBU1VF~cLz%-*qmeY%Bp}pA<yKFoP0=FK332D4lWuJCE}Ye%4`*Qf
zEM?K33Y8Hc{!t$~Z{=kziw0K*0RW!|L}Vlo5b3WbKwN}mJPkw|b$k%FBmt7Sdws}f
zS{@JNABD40yxTu5=t3L%E%^vho>u{wh(P#g5ODz#fTxzGGg1AiT4y15XBm#|H)ReS
z9dR?<)1K6l+;QgA(b3U6wEV+sDfwaF*QC$n1Ce@$6wJiqo5UBQwhT`-^stMav72dr
z5j_xE2mcnBdC+(n;#&XTIUoV#b^(>xeXU<BssFQ`RtD0wbKz}?1j09ql)nGs$o?-G
zn!E^q<>~yDr$2cQZ{S^cTl2R;neC*cgq*=khk+mLx2(e7c=~!0n#33X>Z9fR?lYq8
zs)VET-zsd6^{=7GGfja@(eOGQle6|lH4Adtxd#)vP-%;{&9nA~&vDM8ug{_r&|bg>
zHhTqQJc<wbD;)wF@juhl>-jG){N$@@Cwbv$u)egQiyS%R-u*Q78egB74t4dmcg@|1
zjGQoP-NoTe!=6zbos;297nvV+PCBNZ?Ug%IRz@+uEmj^pIK$*D8jl6}U+McfCPjX2
z3EYU?n*CaN?92a3Z_ET5-{=(e3^0y^(`tGSJvE2o()S>10?TXld9<R0Q5!DDZyNPk
zM@Oy~n{TgeQ4@x&?+iQ6VmTBqp)Z=9pL)sr>FPBXT^(E4x<&qyTmt@*8uf1sSI=TO
zRlAZAoekdu$@`1pB!4)G63!Lh>hcTZi=Hs`TDQCIYs2-)7>>Y3=N9)mizxqxzobSb
zm#z$C?pF3^05D-&W2N%=u6d2fBwd&dmE7ao5AYvC_8h<NGoPUZI0@-`4<$tIN2Sxk
zKOJzY=4BxK_CW00{iW4ne|&edMkM03_lbD^6BWwK0fxrcy1jq<tQ<4rEO&keASQ07
ztdv)OTXxbr(oE?S&u@Lil898YdEXdhTyI&bsss!W1#Y=N@)+`q+5G9W7*Wj206mHQ
zOX9o9{S6-yi-#Vbz%@$9$d56n`6bsA_*}qA7)QTeg8q?S^RINpKJgDBKV&KXx2TD^
zvh)y%*L}a}ut?c+dj9FKScMhvI}qhFiQ5=_Jb$Hg%I4@GoTI)3ng3N@AFh1;EW8~e
z5OFI`$g0KuMDXtj`Q|<`wNZBwMqy@5{lnC7ZC`38=l1y*D-|VtvZkJVhBE&OKPQnu
zvi$Fof_*VxhSvX`gn!ihes-jX@=r6kPX9DZNZ3sOpG@<LeWH=rpY{H8z+Uj)C<jos
zYTo>Jm9VzMe(1d7G5n8tBD4RWqT~5$5ZlZi2@~OJ|2w_#(E``G0?|kQ^BVmB()#}?
z^#65T|8Jckp|J`*tHRQBMTQiIvN6xHLL6mGO#~Yp92^d6YW^>)zWz&_MZQfoCa&2d
zoy{^zfrML+@mDs_fN`SoA3hSDDcz~!%quL2QVuRnG>#ligdI5=_%S=W30ika4zAy~
zUcPrb#B{?7G*O&`zG`HBx5+z!o<fYVKWR>ZtD?!6WjU!eKdyGGQ$UCtu&IWTF8>g5
zNh^t|rY+5qbxq3eNqo-?xDn5FR1z)Nk7^r_)0)ANL7^5V7e<I=9N>D0?Bni}10LMy
zQtni?Zo%4q2sw`E<yUk}vKx`NC_~FKgdyY1leF0?qiQ#(krFAroOivOof(a5r@yp=
zf^wf;WsZ#O`Eh(%Wyx^f<jlO`+l?7p9?#b0`Dj!n{v&GwEIw_b_*1m|8Q|IJw7lLJ
zBoN?t>bxjbWokav|Lx8QFPvzuS_oQv!RKYJ&yB5vOd<UPr|!=3A*$zeecru!{98<r
z1a<=!<@tcExBJJ{HmaNk&aV$c_2U|d!Zt&QqGoi_=HI8Yt}<T^3g3qZY2I?KlbamL
zJ$1$o_xc_5MCD%illxrcn}&&Q^4}$-VUWd#LLFa(LKm}{5gaD!&4w9k1T=9Ijhr(u
z8O6*SJ_nD~2-wpda-YOE+P@Ual5JaKjvlUQv8O|gH%|-Uw^2b=(KnM4uNq}+(2y-u
zAe&&Jc4RBjG7G6m3qg-8NoJQCqcsTDLjv*x!olk1lJqaoSt6(d_z=ht?9>YA9SCwF
z7$fNIq}<2|cxL23^@mCYv;3_=2mHqe6FK<J3s5AYB;7c_0!>B|J<l8{(f|#!36Ip_
zpRFHD3}!b09;qLg{w@5gZ$}RoWL=QdA1V_eHCllX3`PVNV1obd(Gg+qf#=L0pTa(@
zkadcExIg-xxv;zWm~qeRvC?}PQTa%jc)s`1?eTS}drqv!`}xKLMqC_}aAlmtk<9B8
zEGcrVcWnoc;I>b1Y$lpFzv+tFg|b=Prjib(?)nd_;3cqtg?>Y!ZkTTeS(DqKVrMQZ
zOB+=)@iZ2*u4w=QFN=_6wE$Z+X|CPV8zi?*0ZqyYYeQX28L~-P+R8X}(EFqUIW%nU
z=mKP#sOs4hbXLeKNp4%=CYNk*d2ugWpk}>iB%sRSvaF1%i+fNwitJ}lPxtKUZS&XS
zsE+kNu={{I@xg#Zo3q6`%5S&7-mNt7ZH}_9Q8!$K4@M>6-PVMKqzktzW?>65ffK7Q
zmtjx!r%LOs#;p<~uV2OnV*GvvRNi!tbYI`V{@6Y$93Q|F%xK&ue-LQ_qz_*{g0snO
zP_D%BX8K#>%GpV(3#@u8kv(8-V=C9_C^O;xz<SNHsLvQz7Bh6}eTf>QXB3!F4SO1R
zZFz*f_c7|iv{f|l8Q|QpsOvdC5#FP7(3>NgUmg^Y%j{`lI&(S6mwTcU&^ZT8_9oks
zKLS#4BP3{R3hrY{^)j7y)_!w6&)C^^5NEyD4;U%mT&w%D_A%A;)IS6TtzD8BHJ3-J
zOdC(IrW}Ct(ro#B%|F(oYT|RHsr^o^P9D$Tq9Kla&ZiZ#5Ps{1tndx~$O&XRD)@Q7
z<&q&AN%-RMN`<&5IqqMu<91u{M{1el)({MulTFwpCw$V7Z5XG51q)Yksn{sW$15-+
z>ZK&nsg;<k74<iuNTo=m6i_=5gzQylI1orfAiEGqgj57N8$xh0CK#2BASVvhPF)N9
zsUWEjj0h+oB0#_?U_u9)OGQhC%0$Whg)@~242{YFFagmqz<Dbb%rk?mR=~<B1Ayar
zpeR%t3x@W;G5*F&ErrBOP2T!@p%u^dzsKgYk~9(OG*L2Aqn`@sr57P=X?Uavp>j!J
zdY%YC!?hX)11OOJU{ye6fEe?E=??SjGvGVLpV7sY(`Ue!*9$%6R9BBg_q?w9|78S@
zwu8TH>aUPxUYi$L^+78YTY0{E68lt2zkHM;wEGq5@P$K3kYP$Fd9Yw#Z-!_~JegUW
z(GA;9r}Y(rSWLWIn%)8%mBG@YVWlUx3OBe-_Eqp9w!B4ADCA|I`^O21K*8gd<wx;b
zzt`5LH*1G?ln>BFh;!x<{)^upC_LL=LQ-FYp8?d%YfrI$zeP)T>JE`mlr}Yw%lBWt
zZRh^z$TUi=q5-91>>-qK?ATUs3ohZ*0&oW)m{DL#;JgSVy~wQXJUcYSym$)AK7F8H
zn!?}nJ71kt^7uxZb%91UgPmB818rMA6<=X(T6sOf5OiHU?kln1I`yP#q+;AMO-GW`
z@HLF&eZxuxH^~hgE;MlDe2!MpXO14wbE+hX6Vf3Uh?C-v#I)2m8y3%*;8U@JqhST&
z$UyJNo|H3T6OCJ;;YJogL<lg~fPAVLr(u_*?Js7gC0Rh`=9EE~Pjetr80QP29p?*X
zV<AXJM<iJQM@CR9{hGl5F90(l;5g|Ih0;LS;C>TAh|U7&10zL%64BvaFN7wuC{!*2
zjjlgbnq8f4LQ4K}2L8bY&mbG%N&j=Pt*cNng7v}wZc^Zg!e9V=f@6;@mYw>qdmJbV
z*3$w;{Nqc(^jsyt{gIqdS+w8BeJKswQVN4c41c!rz9)J<(CJz>J_E!gG=As#_a;AP
zH?z$?15gcmKY#smu6V2S({=>9DR8N4+{}(pkrw$bI?P*{B3v&NMSfrg88A{*YQ&8a
zTx>e6rz_<Wot-@?CB#kaRDgv%fS1o3?5AjvC@2WlwT(zl{d#-Qq|Y0VFFJ+?=^dvm
zOr6C`d+{aNh=)YXs6dQxxtT3qA>m-Dn&(APWMZJgJrH<$x)Plg>S8X^W(^KhmMbb+
zYs7o2Y)j7}H`l1)aA6|hnXfFtSC|GU0ecb@0Dz{MK~G3>zD>Qqo&k5fbN)=fYJd0a
zcIf+tO-Lyl(@VOIjRNUOcOyLjmuPZXLkBMh-gg}~_)k4G`ip4l_D|&esUE%X%`f$b
zN&hs#ydHQV-}s>b12m_CNfR^U4U+@^{v=5K2Z8^0;K+I4fM0tDtQW&AXk_#%^Y-kw
z(1ZkCnF(1l*-Fu5ZK=%34UGP5OPxhNIFb~`2*4*_3^xBVYl^=a<a;`okY7FJ`?RS&
zGV~0fYhU%(&M)^2-JhKEiRe1`p6@gX7<SPNol_MP#sd!a)13$wh{$$HG(LDg4Yb$3
z>T<g0lxY6N8FTC3v+d;EdbsD$#gkM@13}ja1}aho1Fm(?;CaSd1n5o1=jhk^PM<9C
zbqx978+~O9hZIz}57hdLYiB(El&s-m8d|~(RI&k^7<g!h!ef5Um;zZG26~dZxf;G&
z(S8MzTA@Bd0TCfO8yG2A3v3RNzf>a$cTiA|b0A|ZM8heR$%sfcha*2&8(lsEodrh=
zp&w3wkicD7LDGaI-2{Zx4vx~dV9C7#RwlSNRE3qKH2e+W$@>M#d({YXDM^qCd0+}W
z^lN|;nPjNttxC`^^9e#|Qj3z1QbM5&1<BThR{FAVTL8s!!X=o%AVfxQEB+<|=Ce|f
zgaE5T`kD}(zgP#O(#g}Or(&y6D-5hlMs$ll3NN3=8^51_TzFDCc0d0kcWE=$81+c!
z@C-n)d}wD~GX7~hE@wI1NWCQZCrk1h6orMv(q@hkYOMh#=Rzr{#>bfkPEADn-B)|9
zd(%_drp-*;hnBI*s_f4K`(j&+A_m1Qv?I9D4-FTsLWb<De?4iW@5=u8Zh29&??C|(
zL5<FnyJr#mU6`I1ziq`^PZ$^Hbf!BY;=D@Lt_CQu=8XyHM;4X_9O8Z)dj<ra+n(Qk
z`|CGdt<{@dKdk$RTB<5}uhB8WE3H#h<|<%{k>I>iW@uL_<`9+XYtFs8sOG@+XTY_;
zT&I%EV$SZ?0%!A^M^%%<brJG*gY=j7L+x`9vmK!j7;ESi3v3KcZiicLm2h$6srH<}
zef~qL>B9cUb|?P(;!|60+!8_jW>k9_+!*J?BW^C1x|iS6LK$vzI=erd{<-je2COa;
zaUu=e=ZW^5HEaKR(-^q6bZXo%NHR>9hAEsUB*6m9UGnts6Aqgp{Egk}@AAdGb$-=U
z@Zj6vuYeKvfCroUDYTQWmCqow`kFB~AmcMo@pTj-@v=zz%*a@N6D-_I`bAK;nl#vi
znY5l04%`j%saS`g>L{|Yz@bt=ZO;HtMcr#!G@uTIG?p3=EnqyrQcaSUj}3>hk|7jy
zL;neqQ)re<Mqt#0P=FpBLI$*yN{xrG5J<<Ps}dmghhsJ&{>7yv0~|JQMOb2}3?RvS
zC1@l}vvBBiR)hYYP@OvTC7+Kh%HxU6EQTsT(y8U|v_j}M=Fn(5(ILs9-e&SH&j9$*
z9y%mxlput5OdgMhS_70qUuc!rOfBCqhw(R=g&!gt0If@asA}lJT*GiTT@3HPh%Z<T
ze_0++M-9Csc>$Of#Gr@gwoDo{(75{y7!i4jsjgq;e5m}Jylw<VJjRFFCjOFL`hzoa
z=b>BGdtf^$TX4l$hi=D_i}yXYHS)a6MZaxLN%c(SJGBDZQMxbNthV{%-~b}U?$Nk9
zpiho0T|Zm@z&_vn%6)%FYP9olDDwU0s>)kcuGaHq0Yl$OQv;WMEs#MS!kKjXu11v^
zZ74O$HLBM!t1C91yIer~<1@gHztVkkY4<j>@$<aGP(d@9kHAXcB?lT*6)iUEi#kmz
zEu#RnIuIXAoubW*F1=;Nn({&Y-KxFG2gN~1tE1<!@?I0IE_aa=iJUH8&DJ_Hc&zI*
zm_Y#v0FtM58U_rO;?z_L=!=x@ABs*~lLzp<lgwT~bU0-l%NKHWgtX^)(}&>$I701c
zCADBl{nQo|rK1eu?i}iMl+)9>b*=_2?WK1)b-N$KY$C2q58gIqrlj3WObng=o^oXO
zkm06(@CjbIq9(-}eL`Aek+xO~l_vNc#X<Ew8Wr`@=c!xZELodj%#Gpvw6yVyNYH_t
zK9xOjzV=zXOXgB6qO#L9{dJ@1dr4pNer1-JxT73vb)Jh>DUuyCTn@miV2=ooRhT0S
z`6W;8j@y@4C&$<2DURJGi-W(%uDDAR&TzA`lyT^?<<Sn~F^7%u_IYesBPT)#@iH;L
zlBd1_s-_&jqljC_nm-sZIXBdtN{fgPJ8-#}F&346ZBe=_yBc;eYocw7&gel2npN9F
zERPA_5wcLj@|#}7FWJvzXxs^GJo3LTx&ESBlH5+Y2_7}X#ZvDqA-|RLDAiAqLzyOz
zQR-0d!}_r|PO5B<iHLsmZ78qe0)an<nU){OkIoXTx2>N9$z9ZQnv><msSzaz5fCGc
zvPjNy#2O0GF$6871V015va*MQ+~B4Mdg7;-L~w}D2?Z@?v*BjRmSiB3rBG|rm+TM%
zejXK2s}jPkuu?zeGiiM#Lx@d5sC%JVP)4xc461B!vS3vNV=xQQ9G>~ma}^|SOVS~{
z0HuMd=nELAQ`GQk@Dvf?fx!14Yy4h~pa?qtOkbdyL|^+&Mvu`v)GH*bKsi89J5>J8
z5^kOwdh~yJ@x<V@c;p?B<ntp?(#B#4-IzSW*sMHTECV%uMgdMnM2cG_f=ot|J`p^8
zBwKy2M382H+v(ptz68Nz4g}|GcoiZ~A87zdf*bRzU;;c6B!G1ZU_u@V7$6CcE&!?=
zh>%hm+)RI={0%EA#tHw16-&>{-c-@W_Y&KzhQFj=Zj71aJOi>HzvRTr9K42xnOv_O
z$?BqKM69?@ju;#G`!XhRZlul}Ut|l3Fz%^k#YDUPi3yiZLrCw@(J8r7E{nZyT3*4R
zUAkgoFBjNM)90<>AdioTwkO6uA4yh3n8Gz|#R<3jstpDgD$<%$K@RZNZ$9q-q!)O*
zGg1F)>KmSkU(E}4u|z_12cJ4)99_2NuW=#tyD9HxJFvcSsSw1)Hn6NH$E58T!H5ND
zktz7jw9|Ve8GVhRmuRBI-hJzS&KPzMaehRUomS#uz1D|?1UAi0Gc^VZEuNrv+AI}m
zoqGg;yD&ToZnE*s?U4|V+~I-CN>+0R*NoWrFY>EhS98Q{H*f{TdeLq7<+|&5%Q~uL
z>942L*R!3sqx^czMv{cxutZ(PgYc?y0(UQMt3GxWj((R`V09nbxzfz+lK(!PM;PT>
zEASSFx`Ms&0!U}Zu(6$+DnQY!bNMBAi|0q!DwPG_lCGu~hBjZvluG!!sePAjSOjY_
z(d1}n=$5+L7|xEy?hy|7kK$J8<%)oPrCjLa<TK#@#={Xg)lR|b2pr9BJI`u@FxQz^
zw{2ByW3f9U{boZZ6*?ke>ydB+<at*>mw=ebDe%p$+EyGhAtgS(%8&P;j&6!#xcfV~
zvtX*Nu$kP-N0QCy5>$rM^G=N_##H(+;G`4)^}}o;gGFbqOSZGPxQzW|@i(9Pb6!KD
z?T?@=I$umf?hbVrAyNo^E9lJHj^$w|nl%f5Y9bT!tz)fCc}P=&FWF>>rM?d{?cXJv
z5Ha)hPmm8w{8652miWJ`<G+5g#2tp;+v+V@A)8fZNeWkU426QWHIzVT$MT_|0ez<h
z96J4!6k0x~LU@D;QA3q2pd(As04<^?^TYEv_%aP$e=rzrxB#6XubU5;5zKSF2+Sye
z$Hg(N2%rcvf^zT&89n+mG<f7QgH(f3g7XRBG4L-f11+(tPCe_BBHT(rRdBmh%!a0S
zz*$<gJz`kBb(!h?dtmL*L|^5S<nsY|_~d$BRHsgj=A{WvKL5?KkH?lz$P<H;#GED{
z9x^45rz%-Oq=2^&tZD!^Oan<PeFwO0!qdM(csK>Cm2sm-5E&#PWh5cO?`j$r;3?s<
zJX@q%AwAcP8U{EXZn0@0bQ34lAS_4$waPCo=4e%*h7t<U;{&;$?=R1fD`f2tudg(3
zI4kpqe!U#aKb{lDus67mL;CaG`iMe8P4T)j@ux)gm2Suv^ds+*U!k8gWV|}&-bw1G
zB(at*rS71o=yAt}|3h)Y;lMjl_=#i<pMPT1o4?Gb|5WzF*(ddg?m3!1;Ao}9zDqQC
z9nB)o6qsmWYNuly3&Kc~{)hV<&Rx<m_b937%SJLZZfq}3T_@=AInIbtqLy=zFv@0J
z^`7PlPOWKC`^K<@5AS@OeDB}B@&46jG6M}>levQ)pO&mI-qbTwfwoz`M7&B!!sPcs
z&(ux}?23PaafXieVkf{npioVLw#XR1ml}1|_)88>*5>&1ex^c0Ml0+l;x+<EzR=PC
zAQfyl_;&}-vFBg@6-F)J2=8Q-Aav{vfiw<<^b!G{Jbc9ixKyXqvC-ro?Lvxm{yW3C
z29uGQrS7-nfpfn^5zVE|sQAwxV9zX8j<Gj6wZ>hq5){QPSo9Iw6W+xRq86s`#N^^2
z5<i9_AcKEnsv{EPMWY@%`s7yG?FYR)Z?A9+<8N<uZY5HC1|;qt_C2)5c*8aHAW7O}
zfa^pMLN}cWAD{*r-Smg+i8FLaO7Pg<A;2Mt@V7!c)P@a-3O=~1WcriTWf2_5daG4h
zshx}zmGLtRi|Cm2)6-GSHlt%<eUK&%Z&F)6WN;Wv0Fq6x!E?Se;p#FS^9(}Tne(ff
z`eF3gLvs1>4&U*ko=7oDkXSp-Y;1aq3%T-?tixum0%)1lcSvoDlD=Ady;YyEl_jlA
zMbpe`S~^5o9bLV8ndb+2S~CT&4KU^9)z}&Ore=Z?P^p%wiDe(I>p$RtA0W$ROZiJR
zrzs?1X6nK5vd^1Uz+-GL_Y?cDI?V=*#PO*YM|)g($O2w#r#-G9Qak_7P{3U;!+K(9
zQxSb*<pnOqZyT9Wf!BWRv*sjW<xDKr1KhBzv?7b(1ST-%c23h(V|e@hlTeTRhQn#D
z3C7?lZb~w~`s@|XWjuogLoWR#i+avc-O7aZC^~%uOBo~0XdxytGmI7iG1^0CgL*gh
zV)F0IYJ!u7I6n2vR3|Cul|J!2NYzQw!3pr0u28^)UxQzvb&|BxnFg=noXO}h-X*sY
z%B88V2TtHi2JXVaCX5ES9Ud2E`s)pV(fa8U(pT!y1=&eH4PzHN@<Z|yCE2P@CBRK^
zHul0t-&W_5)~!dZ#ZILv+smH<-}9;9Hl=IJyp+OQx`e+<m<4VuUrJpi2xdF-4*wMj
z_ZeOtaPyPLV;lSDoIY6{=gC~GPy@Jdj&V8NTvFTSAG%|W&*aldr1K#2B_vY|6uyrG
z1dX!PzyO{x@~kzX0O!l^NvE~xWPWQ`(xsa9b9i$fml}$5?lev*rddW%eqLF5RHHF&
zeO~*_YK?2P{duyD(MnB0dznSP%ri60;YnXX9G7?Bne&fQ_{V#&i>mWfW-C6H4c!#y
z`MpH@*mq~REy7J*xtt(Y#29{5iInV$ccSzYiCP{Ga=0H!q8E(53BQeiySASkaHB3k
zV|w!e4hm)j)pF6GuL6xtyXTHO-&##;qJ?DA@^W<?N%2Vrk<ew*Xu^vuNB|J7L6k+k
z<`Yw*<c_(eA1e78uMPR0kf#Y+N=DS*H@g%!@6?>FcT@^O<<V>Qt<sRE<TXAB*s?Mr
z1Gw<H!`R)<efdfae}=C`WbdnUMy0&x{7lgq(0o1@ok{V=JrE-?SM;pWUCvlwqt{C=
zG@7fO&Onhza$2eeYC<bB&r(X0pvFb81s4|iYS-xIZHnXMR>Sz}o+oXC(KwC-PAwv7
zCRF0DGn5RU#y?PldoB3FtSy>%>95cRdpfkdzXnc7&X0oPR-xIaYRyId(EX*r{Ykw#
zx9Q)NsqBr%#J%a|@;zrd$3bDg7>aX!K9^9%V3KfVa(Y^7^}Ru;<LcQWa}e>3IIr!p
z&$>>2+G11M9$6t);iTLZ+pf$iCc4HBdM60g8(%3)Ym}a;RFWp(c%NqWY@)^Epg|?T
z@RovoblgPWx>nwTO@3L)uvFlP*l;MigGJbsx-Q3-2eeTkMX@KW%!t@k?PhScS4$%2
z2AT8usbIY-mEC}1T&0qGu@1iQvP=q>?}sW|WDRXnL;xwi&X65%FVOb{XLQ!CS@3r_
z*Vzgj<Gl`!bbzjoQ_){yphLN%L-H7@nGimBW!;9*hEpf?`S5@27HpV_4_{c@83^w}
zonoL*b~{Vc<DiT2mr^mVW5I!;K_Q^wfizxnOuHA}l_D4ANiAz=&f>nVrW0fbtwsA<
zAwi%s0XumGS{eB*-FG3Hype-O(OGiLs-)BO%H_h4??g=5pz|qR49HR(+RnZ%olU*7
zO|ABZTsbT_HA%l|e3#nW*OoW(J3We%M&^riGyIUb4{s|LbW_=ITHkd@w<TJg;g6;s
zXBBGC@t{@3`OBdD4Dk{xRd_A4pl1fs(}ekEa*v}lc+I&RF3sADdK^9Ylf5&M=gw$O
zsNx)|nxtZz>BEYKLA73VOd`{GY>9u*65B@XxqBxU$@dJf_;986l0KI4i2F^67J=m$
z54EQpuWy(Zp%FT5Hla~8ht;U18G=QLJ76CncZS-56r<?Al_1jF+uk{22~X95gLI-T
zH)j6O?!ERgn}%Baa_dUcmNpSM3(4Z4Z9DoBm4Y39Z{6$H9%kujpADL5aT%U!Px1!*
zIIe<5`Q-IgoDrjFDVx)1+D3ceZ{l#xQ2zP3z%Ke}^5obqM&K-qm-u3z)SwYh8OKG9
zJE7>K9+%sCHXxJ{5saX=F93`HP8y@FtB7LH`l!@ObZy>c1}N0xb__6{c&-##wYJv_
zIIZw(k=RTMLv}KfGU6M{8Q=*d(Ppl5zR+Op!JJ@<^=1gZOZzH+Lc*IC?F8B)1^g?F
zTt78@G{C~GPw__vuNGKZj-}8B3e=hxYe4?|R}`3SpPFc^bJ=Bsc9L5ShL)+sagm7^
zd<YOUx|y*1tR%g*F_+gpCgKr`;V0aI-htfbM*Bq@F`K7kgTh?|MpBpnVzgG4BEhCH
zd2bu|LA-n<W6lz_wA+h}IlL(~*VLbCsL7BpAKe|M(rO~p*Tyrf!Z(P>Jc?kh&RYoa
zXzZ~qrDZ!2*o~hhaZEq!$5R*;aQ2oAGd}f;Pf<>u&W;OxP3Yl^ptXkcRLqU3QRaqu
zjUrY|HdLYeuCx~z_}vnf$VJy1n=XhqD>2E%K2mw|%t{m=iph)&;+EqnLd!#<Bhd!3
z15e&xME9X|ta>DBsN?{B{|hgaJR|AW-m;St-Y8THdPbT_qx2~Z6dEzfZhcW)S;EQ%
zG<j})h!n#0I3iXFHAkmn2mXPOSr*x@7K_8P2+Q0Yh11qI?S4sNL~*J5y7V;Uj85t_
zKQ~bdxCSwQ5K|PfowK&wG)@sau<V65n;U!<dHV_~7z)vzK;047MS=|V6_7?F;a7k*
zU6K&r$1jMnC5Pp;6MD>ji)b+=64>_l7^!u=Ws+0q7*z34Dwx@umQz53DupygBG5tJ
zsqp(kK6E$@C6wr4n{;bM^V)<D8o;WmA`z1LMzzC-x#Oq-0Fvk#DvRz{(@)|7uM^oz
zhH;hrzVm6K*)s|B+=|88wXlj1>=NX<bj60aS;ytrM<Z({f%=PVrGocu-+fVp>MuEu
zkQZ?+v#y2HrzSbA9)}@!e!U^5&!)@gB?Y}_**gbSw$MDtT9A|~Z;^h-@|We0Rja#K
z3PgCC8OC8-uREra{bS4hl6rj}Gdp{A)Q2&eL<1AmBEcGpFN7}3RfS-HxJ>yCciUOw
zYx&~>ibA>qGOxA6LU69HbL&=gpgkrsUV^C_7U4m_g+)`dv-XS0rzGD_!<HN?b5qQ-
zQB*Z5`DM9ALGp_d%Nk-|x|6`QHhzwEkLa@cJ>q73I+>#4T>Pdg&bYS%LrQ)#M`)QW
zrJLF9xvbw>n@zh`OW&{vH-ESjO3&=)+0E`zs5X9o-bvKlcJRX}Gwj2MIpH3%PL<}@
zYQ<xorbCyr9!F^mZI|=G;vc5jo;26LxWwQO7Q8tmrf_0bY&XuvTCgVI_T*fZk*Zw9
zf4f$0-r3mJ+G()&j@3c`N5_55%)JD``Y%ydn~f<>-PW!v4tD)Fi%<1YIll%>_Ve57
zvhFL}esv0}<TXY*;bAZ{`EXL*fUj&3I(%j_9tt3#%oKqB%GmS7?olDXuwB@f1(K0l
z-rNhd+AMZ)*jZI6-WC<c@I^KtEk3`<7gLY*$!<q9ZHVHKLz<X!3ke9@>|SoGy=R9e
zd`b<l<XA+i84bs?3181aR`X3^;tMNtCa1QVL{Z^aMRyrz;z~OJL9oaM7EyGKzqt2}
z*&}|>IAv6x4G&3cg~n&6h={FB|EN^1t14sO1jMYC6#`)Nh!=-_Sd$`O_P0O~Z#mUI
z=_H8FPS8~ac8BU|n1QVd9lL;A<J8CIjV>K+gtGm1bCO1piC2<PIp!-N^(qDdTGP4R
ziAV(Gey2^OofjK?R-fl}p|rJmMLBXR&}o20UL+Wm1QRhD)z1!_{cUhd)`qTjJcg5C
ztgqMFnbGuw<f{}uO`f5Go7jVD79YF1EsD4_OHY18e2*&oS2RCy03Ss!nsvQvoyn7J
z%IG*TCl0q?GL8OzzrJDJ%%9e?$^EC7*Yxe{sPNVsY~5`auN=Ax-m|YN0#TBIi)411
z@`@tDD;1}e9s2zqJT6#2Ai*$&HY+Khr~mrP=2n*5R+ckC9nGyaYsF8Qp%D}|1}>_m
zZ>x2yqifuL9vsFrd)sOpHr-w{(h)??+mU-XKP=*9wsT0!ARfehefb9VFsd!T(6{fU
zs>xW@@0862P=mfN`8Dh-Qc>k|YQ11_#H{}+(5qNab^|;HItC~0dxbmRsaO~$uQH8W
zB=r>%^l6I3|J+P_!CpdTx5qi9<Z7>Mz{L>z!B}dLuqYYHZ6SXA#RAemx0V2-hq^Gj
z2E{SmZz#;dBbahd!niahVB?dnvUsk6+b8U#SW*;?i^=7{SsqSWokXorr;XKLLM(<M
z+6<^(UqY}*vLL@M&it}lUE8DW<PG0W^-R+=#W`Aj7S@p&Gb&3dQ76XwCexsGz|wP~
zrbfi|P&ygp5xjq$XoU9GzG-9ZO>11!xt9E(A?ae5RI7r$z>ZIFoRYq61BbeRq%dYd
z0V^Q7d=xS1MQa&xs%ZUW7sVCH<vMO~ZrR>%ADa#J2|{J7@iwk}hm<VfC<9kX)etxa
zG7OIK1Wq0EpV`~*Ng4~sSkv%5R)H|l6mw)ftQsx|wN+N`*k|!G{pvKWCpB=Y*oqXG
zue!gi-v;zrpSwt;96ko&t-fwv^~pSUP5E#dXqD~%FiBMwAZT7QrEeMhs*4jP`Fndr
ze2h<61}!Ju(q=)mOfJVhvU@)xZ`W~!x1e$9&gRS2O#kzZ!;0p7N7Mah073hek%mTX
z&QksN&XKiSLrVJ6-ou~w9#?@ZcygcktBxJ_%azZD1w@t_Pu|;Xd+kVWTsDXvAu4bj
zD>`T$QCCwOgYQSd9<4MQ%G%>O3gt<qPc-0H#U75eFRpmqzxk>Rq4_q=3ywCnydO7=
zXD@1FJ#0|n(ydSa#7=wUq{b43<FX>XWdtdE>9r6p_4a-H9(plrWMASZO*aMG6XP%J
zCkf^xgCrG+b`I4bny=_EInq7>w*n#1XRT>Vk_aA10eR@|!Zlr8Uu(t!yWqTyyupko
z`}#L781=1!J#RNlzib^NE!H|7a>-=!sAbZ~xH~wK0J*EPtIr50<3+XmU_>H)Q`g22
zN$vD1f~qR}G0q%%lZ;P%v2l$TtihTkJ7Hfcffi|G9^wqHm8CvbskLQ&XCJ@w_FjSH
z$Y1uG8JaQ_Ljao!Esyydwx>&)6Do6d!<($H4`JssRH>-HLU6E7?8n6v1njUUv0qgx
zN^W45S{)dRwHW9Ns?6FLB%!mq#%Xq%)mt<UnFy+DQ;HcYV9yBQCDr0HYRz&l=xe`9
zJkMO$+2~a~t~_51)Zcjqbl6U0VrSop<va6tzHeA0|CvD1CGp`>q&I8tgJJZ<Q5@S9
zsfrXw_C{EhN1XYDJp(7pBUykb@5+J@KTkEIZ;8jxoZM6n>2%|zBLdu`Kl|5DEeAt2
zz2x1V{JKOne>l)JJ@<!4B${q~tJ_i^S?U-nUr+2_%e69kYY=TkHM>yq`B+ic5iup(
zGoC29OvDq{YN=_uG@vA&0%BA;geN`--0(711r-TnmA92H9@lieT)BC5R&~6c_tg5P
zC#TtpN)jULK>5XGf-qu=ge!$eBqr&5*@;gWbAN|W9V$oixVDZ8Z%E(T-~gtVbm!=X
zK$FJpy8oKH#<bBCrI@2j(G=lkQ7mK8{^v|uMqvo5Q?!L936eHG4b;;T;wb8>#bE1=
zu+uCj%b*@(md9F_f@LW4Nj;aDPFO+ib@YLppNA`1btedi`x6b!Yy=asnqMZ#+StBs
ze<H)~s{kxMzjYyJ?bND_NmIGv*OY|1b6G2o!nRzm?z~W-9XA5N?q0ELhL+9aZUmK$
zc58?WE;EDmYKb%lGsQ8zrhuI#2?dymMv)n;+~?FDeD7pfwB7ab;l1!wo|3_4<Gj_J
z1+8(KT_^A1S*I$RP+U^7ybLXZBAT*Af*df~LMo>3XKzka1N`}JF@4QalG=E_qu)2Y
zwU5NIzbx!HE>E#-hFne{l_Kf~M+~|79-$cL(@<j}+8*pXm-F4y)bj1(V#64b?pD^R
z-jS>FsIZ-q>-S@dtl(C1Rux81w;=3+XFz6RVi;e*9fqA@yxF&}zLsyZ8O#f5iQ9_L
zMl5dGwdr%H<7-x$By$y9*3nwgT3zZXnsE^kf(ui)-z_Uvw|_O%@jw3-f7Z!Y`{tdY
z3xix@L?+TffYaHTi)d*}=C+Q4P)!|9`{m_N37N0PygJL7nj3X|m&jvn&I=R`u`R>6
z<Cx?l4Jqp39(&Ppzvq~%Mq@a13d}^z%;e?pmX9|g&+dF2orj1#Stu=Iw~2NKK1B5L
zY|ZY9=IG?c>%#8KAD4f0y~J0Rx=(4Nf>io+$WHi^y1a_EmT;0Y{4ycT=Iep1@@tsS
zlR9Pe)&@pv5i+BP`R-R%DYkEm8#&eO5^D#-zCC6}7Id&kf8<4W*-`iC&ENnuWE+=O
zHl}IMkk<QiuRVbFI1i5|Sdk<q8s(c{tsn(q)!cSKagy?S-P1T@LJ$KT6(Uub&xCIb
z(qdcAo^qMd7)6~Lbge&`@3UrAHWcfnB7eep&l&?E93QyHu}m-U7Gx8(vJyRcHienS
zi&7aU$x6(jx&U>2apiy^#T*#A92c-K@t|5GTK3$(YK#breW=d(88BA|)M%0Oa?1T!
z@dF=Cd*o^Wh{;9a4v<jT`P!%<BJ?F&PUM}>XzU34N_vMP3q9tc3O=PLqb4~n0xSwI
ziqX;!iajR5W1v#LX?D@Mq;uEfe89;T9h2)qMn=iE#!3*&Y_2Yh(w^TYoX%*xGKjBS
zgfc+whjR7N<1YWE*B@M6n*Z(@fLB_R5>)lB>vCjd;Wj_=n`-66Wcl7{s{3W4MBJlL
z5EHXN=w&W5&bT*P+ktQXI+_CCCSl_znPP-wi)5*^0Avb~be<b7aPUpQRp9cOQMs<I
z&GF+0)%V=v`n@h|+M8<g(eP)+>4|Ub<HsbfO)?CK0>Yfvv39SA=W{cY^D}h7TuDyF
zUeQT{F)4&EVtKQ6%o$1G4;tK_5Z9gozt@6_dZBOY4j)^eULX7V<fP1otNds_vKky*
zC-UmYai*rBy!+@c=J&byKqafHljJH}J7Pt1oEbm>QDz)PFgwdbQ4Q<n7x6oYYF?bT
zdobCLX-;|HMQfv(z~-6BQpK(z+4+6s@<dR<Thfxzn>^-|i>ud4oJL5FtCp*tK4HN#
z;7B`))xG3WTujtEVv5#Ru`Pvp0a^*msIn(PPm$BtbmdaviCMslBneq5=e+mk5Oix1
zh#%chK2zA+b+r!#q049E%i$iSn(3yTrt|dKs{G`M3E{cmnluC8h@%->H5;tvI0mqy
zE-kdUVifA>4{;z*O;$6G7Sc0nDGzxkb9iUtBMC-PGddkS1E5%ILCm0?34`s{MZ5jf
zrK)t48Y~&|HW{neX?r44^jsbusJcpBUuzpSg{pOrlc$<}O5gJR3HwCFC$%1z;B{SN
z6ee3;g8tG69p`L*9~>Qwg+TbF*=zr8*`IRCWY|e_;#&z<a(15vhF~qlx3SI)h(T;U
zo><$fJ7s_w06L?5>5%zg6}fjdzi?c3o}oQtNKs&3fz@XzB`4|Z3!#@L+hA2~S{+50
zz&UwH8n+@c4)Z9A1alNFzS>I)?W8zX(TFR@t1ixmkmTIjKt)m%7WzW@z)7uDMk@_E
zF9M;w3Z^uaG-XSQVKvB}-U?AHD{7AGrh;&bEXfa-WaC+^;>ZbFaGiBxVwX2$n0u0D
z+#L6?K)Ca5VUd}+B?HH`tu@_O0cR#5Z~5fSHW}Ko>QtsKadoXBd{i3>?g88a{@dE4
zLD|xwwX-}0*->_vF9Q?J2`N65;rsTCv%ZnS=-QrO8-=>iH<_GA%9>`#lWP28ANC)Y
zN*95?<-$}A&P#SNr*!M{tTO$)7Sd&tmO93ox5X_iC;N1fd-A?n^g3TjR8a`I_Z>Jc
z(%A>RO+IYS!8&YtavdYhzY2!y$Ck{S#YSD|s0W?E${IqcV=y)LSgbJD`o!4HrQ4d%
z<f{WszB|&N(-T4xNAImew1Ap0#MtHxy*5S$%yMl>4pLv3c^>4Pd?}FcTMWk{@KTXd
zCaaTPY>Z-9`8%4PsE=4>hr@nfxi)Co$r>H;2n?2ddE_}m7HRTj!9S|q@bz(N);Xhq
z50&|vEDpztkQVK?f@@Sc^e<gBp#B6B7~`WDHHt8+lZn~S(}?z3Gs;rSn)qI~`uL<c
zXc<=)?(2FY;jaX3`#{muTuko40BZNlrw{Ko<7}u69U@8zohEPzCdb|ga#DsUbc#fX
zhE5k`j~9*#MecD??+-$Gqbb&gMe;njQJ>Tr3@UOhQk19J@2W$mJ@b@{sFh+UXF;KA
z2qdc1)O2}}K8=vE{z88NM>b-@XMm$}w>Azc-H2>^oB~pC`Jhp{z3+iukvS6$5;p+2
zPazE^wlP$3w!s5jp2>Rn1^iA~=G#uA1)LqnlqFcu!ZDvCUzEd)&mCTwRKUm`tW51~
zC&t<0?0+nN8j@la3?j&Lx?1MMI?#}rAK@M^>MW1Vm(d-Swc%i)fEF+?2h8*V<~083
z7VhnF+}0jg7V2%{V^MbZe4TnFyLEn-JS*SpPz6Q+3-KPt6YER56~*9lk>Cm^P-jtw
z|0XCoYbUf?Z$)HWx_oW?(Yq(HqmD2$PsLk9YuLEsqb3-<Hze@Gh~>nK>e#4!GK(TI
z^}G9Ziw%)+{Q1Thl_Y;+k3O0DafJS^KxIK_Ev!0BkRT=rQbK_00eFCg@Y0)!v9UIc
zYTV7ggFvDFlEOcZMsk-Ssy83v1$UI1A$Ao{+<AIT1&7}3DMS=`*MpU{qo&6fFKO6r
zY|CB#Ku@x^-dl$k$&Qtn1Nz3Z%J60=b4;evT;0mu^@yjs9qUSX^_XVo+=o-_*y$FH
zZOk?V8q|xT%Q&>ak(LCC)TGj!V2UWq1($u0#Ibem4YBhkX1ROksd21t<YE2YpDX{a
zyVmYv4pU$6#BPZDYLLAVQDbhhQlgskT1@v4ZB2hkV!RHwhM1ub0&P*lN0`+p6sAE;
zO~Qq#Dx^j(?e}Fk_b0<@!7FdheLpHysSAfq8xg|zZLaOLwX?YSK^Lrxx0D32w^c>K
zv|(Z5Z)UyIh|$5xyuc9rtR1wFudfRgRo9YrR3_YboL%W}R__eIKU8h&za3oGW>B_X
ztGeL{O;FZ!Me46>l{_yUe>WB~YA+u3Qpv{L`s?P|dh#B=-ot)!DOH8`dtQeeRF<z*
zZM^RC*&uXDNE9`8TLnIkEaF`5L7>1tHo0Kb?abh2W7Q@KUta95g9%47afkN<T;8!x
zJuKZgJ1mN`*q()Tt}d3Wj9PyT_Za}sP&qDEBOLeY8Q~BWcRGj1?I-)|&2exDCK$Mo
zZGz&lmKMlcj0g!LqPnEfxcBxy_O2TGJa`#$^hW6G8@ywi-$r`|P{|ozAD_K{Gob$C
z11X<N_*=PNFL(bUA^PiWLyx=MdisM<amhK1W(*!@1vhmN>@(k@y7Lwe;DCcvdUJoT
zyWDc~wA9d`)<&h}^bD;WBkJ?+o@-Fs+4-76`3nwohA)ZuYrkX4T1-ktT4k-T2=;fT
zwa*@cF*mGNIHZ#`9;$6<E79huD`3G^U($Gqallc9;^r%|2%CPF=nn3auWBa{LguZ7
z7?jIoWMFDWXTirTR*)T22n7^zV^S!A+N<J8)Qn68SjH=;$U!zTP#=?v>=F&rKoy`t
z-L4$$^CU!J0GE{+y-4Z@&_LXE&huHSrt4UXJb2KLP0rb;`&u3o?G<ulET;K&C`<ca
z#C50|Hh)$lK&AR&jd_%;i0GAeDzA~0$`1ScQ&cQe0091T)G3GqX*KOhKm``3U9EO_
z45S{2K}b@g>!@GsSs{m|tjm}}qwKvz1KRCC*rT<c$SNufKJXfz@ivni?eFPX`7-!k
zQf|gREr$0L>S3<!Q=$x`<bqa3XVV7z2RnVpK>{EuoBS4hQ(ZlMBQo7-#<cQU20U)D
z(au0*Rn4EuO23+(I(%koV<*+BFV(^$vr)G{*H`!eNtTefpqg^Iyy+%OD~|hdFBK>r
zL?0kN(rZZQ-LQ2Z@C@MO%pS6D2{%#i7;dRC6&xh6a6kRrMA+>-TC+ECk?Iv2PSt7L
z`O1KVP(f1=G?ni~&c?*Jg<6hM?@x4S-X1VD!FVQ)kKNB8#yxQGi1ph2j_i)V)}fFi
z$oI>ay@Zp%qvl=T%_F1aJL6u|OR&1?Xjk0nIn`Q4YWhkp7Xd6a!U}Mx;I8gbrUlD}
zL{apM=iQ_9U#MKPv%bj4y=yK+n5Mk4=jzB+=<sXGEvtJN)K)JVV`N|QI_(@v<2mP=
zv;=@H{R<q=_%3(OhkMC4LNIKG38<2_-Vd)=Vq~yS&eR&=A}~4fafffQpoS33;RqlI
z?N|aoEzIfu5bTl}aB65~vaI!m)F$!hl8+7*uCY?F<@19SUee0}8mg+kA0Mh{6LPsK
zzbnN-taAtqHS&w_GxAV0!9ibLW`>Q~eBAp`Rc*I#5t0&`3KY&luib#Z+zRQ>BKOmX
zt}@~(5J<?hzx?f1RzTY?MHvpN$*HTU)~>1ZiBG|=tD{TLwP-?8u7s#7@GE8!h}|eN
za)qp%$)lOKWprQUCXn0#SA30>*_2Yj!`#V>EGK2USOA!?x;MVEmYRlg5n7o>iBTDM
z-$G7fVJ209aqFu`<eJqVYIpI)gib1JjV<@(JVKEH^gr`bb>)?ZDf!VhVP(u&SjnS|
zEG24@<CIv>fVGx~)xGtdp2YF7U)3C3%Yr;U{w~LB*!=GT&sE-*Id5>!JHAw4*J2k{
zghoJgL|3w-T;_G8bY#rHLP<$RJg&OBG!Q5{60@S#JTo2*s>v7EwX@p?M^|SV-B6)c
zU*}F+M`5QUk&_aPlUL5YIBOa!tICB`tkgvj4svxmMrY{`@I@b=6#FE6V`YdYSM)v(
zw?{O2)-Jzz##<L(^KRBdoB09Kr>=udzZE>#Q8S^Qpi6bLvK9GzwL~H(Wc7w&C@u>u
z)FGEEIAml^Tr0+&djVQ>F6!C5?lU!lhT0Bnv}9>I+1OS-J<FkGE{XMt501$cmiMMW
zu%-dD2Vb+*R{Ie>zVA3=mu@yERh5Pgw>ffB>}XpulQrJ(5*Ut;AXtCiLg8?KdF^%=
zyr63nv8j3c2$kf=!!f13yhut*a{8@7i4)+~a~8MJDw#S!p}e3RG+WaUzTfBh+wMiO
zjbY|Z$2l$1V0u-0F`?VkWXF3&b6pMBq*NW5et91T%Q=<$&$cD_6}oa1CERZ%CHr3N
z$*d6UaZL&00D(Bfpl1L$I*0*Sc_X1}@iA?eF>7*!?yVter{d<Dvpx)O@*W-(pCNb5
z0~JAJhv*AbbrD<TsPRI;_v*`l-PP)Ia$)kwwmQw9ra`dFtJj@heLpt$*rh!N%`7eT
zW=`lhY_jPz53dp1NvT%+9)Xd{;hkAnYFP~-j?fo3<wWzV>l9fwZrqw<M&Oa4s&T$-
z^*3(0)%oUj)v@Y0)E1tyzdh0S&3lv8Mbw$Cvf>>vRnWzbYiAY*3fru!y|G&|$C57V
z7&F`SXArbFW>%7a7O^sc1UQX^Eq^coekwl9!|*p=taq%&w=%8|Z+rQQcg!&3UH|p8
zQM<UUE3r(&lrIeXzJxiI8bHXiN23Tp`ux=`xnhcw`He`Mi)i*Iz7L(mNvDYk!NA~X
zK2f>?wmD^0bL9$aye#OBB@3fa$c)C!3+~_BkJoWx&2FE&!fi%t4&(5#Q16Q~SuV!y
zf$qVif}~K$uLR&2#J4(fvyFpzmn@^GxrNOQ5^kKw9Ksw$7aTHocA%xW!p4QEE>F0B
zN2m+|K_0&K$MN^R#4mTL9ko>-%@ASm9Y<|VuyX1gpoh^S>q+~lZ@A(kMgy`T18G>Y
zv#o{fsQn|&ZK(I&>lMFk^ykwi_pg?br#sUJxxiVwqX49FjSzXM5cqozWM4F|HP#j$
zLJ_>5ejI~q$eHn9O;yhf?I~6z&&B7kcO%iIYg=iuOtj$TL#3H}Ra2SR{saY_<%*qa
zca>^SDn<Ry3^V0zT=VtM@7mj1jkz*q+I!pc^)ig*CUuW<L)LC~LNCkTMCjC7cFUH5
zWK0mO(4Cx+YPC`!maO7I0X=HlV1rqBQwZ`#RzGsg-?l6o`Zw1c)XtYIE=>$q_CHb(
znZ~-{haI^-Os%sB;v8SOr|*4B+&R2;x2^g3AZ$Oy?{2x;YT-;t2wtk$RG91$sS>c-
zZ(mZG4AB+c&9=hh#;T}d$x^1ZJiz7mo8O@daNPfMDkHDUVe2&V*_otZhkfEOA+S^u
zje#EiUj&}U9ffRUk+n3H6|s~nrI8wO`m-UYg7BBc1sTQ<&P{e&Y{q|YJJTNw`LZ30
zbvV<0?MzH$!GA%X{~6QFr#J#;bAWlUk<_P=H4gl;?&s~XNkqp=c<eLPiDPZtnhcXV
zPfNA2fhCnG$V7b_Y4<YII>y?YV1$etsTPnk13s6L>AM{PIf#;Czv>Ee(8k7~g+p6%
zs_QmzRjOD%CD{Ee)Wp)rIwA<WAlb>Dq(wmPhFwm+5k?~&Qu}m4V67&qvl@8+@b!TE
zMY`HJI82|1@uwV!D+>|H02zr{UO5~SjBP8^hBZX-mK62&^&M*LE&EHv$nUjjf-xlx
zF-0smWrOIJ^y*w5F&OtvDABJb-ts9;#_uT=-nKmvEt250%){a=a>@-}O{4$R+Tf_(
z+O%;q+B`xfg_Oc$p5?o`leOC3?u986T(reDhc|z$M}A6h!WTsROIwvc{hAzz$@(QO
zzs>d<?5h)Zl$$T~$y<D>+akZyr`~XVY8j?o_@Oj;BHZ|s+llaqPZELyHN)Oi78e)u
z&!>so^E;1R-D=mdvXt!?6^*<7Jv?oen`dJGt7$8bhdS@$^enBIlB`H_tVj$E))k4#
zvNTx4<488=I7T9ATu+aXGeX0pS+|TNjUz`RF=8EKjB^Il4o#GC)EH;l?~L7^=g;4J
zKA-pdbN?~F*KhbCG*0UN92KY2?Lyi(k=$6H^s{1O2_8-4j$o4N*xS~Z)gvhC`W`Fg
z9v1cvt_cK@3rmn3wIjz35t#}?oav`j+GM$WM&N@3hq7PZh^F-oG)6wQQF~W5wi5T6
zYrfTj648A(VKvpK6V!6eio04qa{`9H@TyA5;6Q-nh5ZWmPT`sdbsja;l+{!aBo1o&
zVIZ^Dj?0k|Pnz8-7G8t5E|NWt8c@2jeNVx^402(xJ0GN321mTz6GHV0vI?93ZQAm5
z@`#PcAgwm9*;(>FD$Vb0xZkusDitYdDQJ-EB$4|@TmW`CTjx_r?xmW@E?Tyu?Cj+x
z32PQc%o^(>EF^f^!f8$rvQ?qCtaiO3{+IKwcYE$4Otdnae7#E)I4tm&f9dTvimt^H
zTZYQNuBRL1dSr#2*%G)FR%Ae*R=<9FB&&%%mtUlrNL`zJb68u&F+cSb{>|z0LjA=9
zckh0>`za%0`{jpms5_H=1@EspDvRkgE$%C`xmD&9b8^_PZkZ{Lz@`ulC1y|uME+Y<
zU?yN_E7ZU51kuyOoEWz|#+<tL5NCN(&TErI#75oGmrNSH7O`I6CevK29eoZPv%^Dd
zaa>G-Om)9G0}&S|n+gvsrB73XWx`#ss)U7Fo%uL52)?g^`_QXvoQE`#;bB%G&gkf^
zkOU1Lf@~*uu3CjSErc#KiZxdch&~54d?eZ(*vM259QuavZTxC=<uC{$S{`Us+QcKC
zdH-~)Xpt83d1%K$_L9-rJtsa5oJSmeb_>d*`5!XBJpYeWJDG38M|i|Je-jgimUP{P
zbzHFW-qhc~cS%XiELtTz-hwYC>=rV(%aeZu`6AVkzQ#&jL<fCdnF8{$=XTS)y3wD_
zCUxoW|J*3k!*ldGfM^_hu(yI?3Lz;rI2N~;Ou%q$lzn6bG4B6q5+^wH_r<`eYKTDr
zB^<|!6R7dHWT0KOu)arg)cbE_FB%iWqD6ElKXs@1P+nRK1EO^c?Sq}Gr$Y7+|4Ln;
zv>Pd(0s=lb3sNvKEQvl*7_(?9ku+*&Hx<D5+7E~elbQBFYC8jD#bG5*)HB{IZsh8H
zLlWwc?SpW@>_}Zd28znl0tip*8zLrye05NPD_^?xhpZFlOE<3^;g-f@SBHJ_m1roa
zWap4W%LUW1$J>baUmkQ|syqX>h-Hn$x9Lm@y|Q$M5-k0}1$#=<CTK}|5GvP#HepM3
z<WzeG%rcChEB{B3(`CJZ{%&wcey!T3VdlzYu#8b2D^pi`p_beUCd);Mz0RQvUtDAP
z2)iMf;=HDm(?gMsVq}LlidP@P*!*Z3Jg~ksmaW&3V{)tHHm+dfjusf?D|Rm{CSce$
zN|p=~W1Ooc#RzN|ni*d4A$$5pBF?a~5}9=NrTI`~l(t{3cB@MMy&dbLX(;)RmpI!r
zPci>m?T(84<Q;2q(?)%IjV9x!O-GKA#xZ1as(Dxl_v2;AwAMbqpU(%C&#3P2)~D4#
zGp4nKFZL9L>;ZIqqrPsNNP!fjzKNvJx$PZ`XTZaAUKM1YAGa}l=k=m{`-U@V(^$Gc
zRk+2K`OL#Rwq<ytUG=t(QmbCx#*?Gc3{(T9UFBlWQ*wEnx=^=1y&62~918pAX}DeG
z7f3hH^cVwGYrT`7y`)=B;uE8t=em++t=pVM(?gqV^O|8wQ^+f+9bp;V4-w0~DXQV+
zI5i&Q6HaaKTUYZbq<^Xz|Hmdn<Nbn>u^OvZnlR$Dk$WL-pMBFYcV-qZyhrMvqD0Il
zIUpZi^hPdoD;mY$j6L%<jlV0gkb|;v66Dz#+>ctJAYGO8=nSn@gL6>gs4p9JJxa$R
z@x?HBlaK(4KZbU1@f5RGc3+53;nfr$aWkS#CR{1{9A+a|74(ZRJUzVPt<AFYr^-v*
z0Ul2COAArjERS9(nm6-In|mz&o<Had2AKF!wGQ(->Wn@My4PIYe><eY^G8uq6RnB@
zx(<%YeP~2q*KbkvdVIil!1L-N)*rCA$vVw1Bcs3ylO`j`U5Zg)%Oh@rvl#A@->M0w
ziFX!_c&uPfEE>U`Jo8l`5FSXN%us`+2RsA1p!MSg98+LrNdPma&8pSCD%FBAUFKgf
z457VZLdUggK$`TlFlNr+s{j%n_>8L$rrKkKm2OV8jl2FM*k%3!@FO^4VQD5tn=dj?
z%Hj9!5r>t2wa<1JrJ7>7XXHz^4U(|Pe6%xSC!RTKBnNh~4_7#*90@tQ`4|WMaKFC*
zYe%*Xh-Fm9EHR^UBlqr&Q7$V*$}RFlG7L_o9i~<BkD>>MRR=40@O#XN3t+QN4l4oC
zayOsYm8JiQYq$Xk{-JgJd5T=s_d_K6??r{peuW<qSF;lCS2A56_a?CQacl0?_Ecu+
PtL`QC565-mzfS%IMF7oN

diff --git a/plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_after_header_2.jpg b/plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_after_header_2.jpg
deleted file mode 100644
index 0bc5cbfd1e4741a499eba463067e384f4dce5af3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 23113
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
U<W;0*OuCSsq}a?h^6&ir0JynCMgRZ+

diff --git a/plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_before_header.jpg b/plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_before_header.jpg
deleted file mode 100644
index fbe29ffe08c2a060afb0aea897745d1dbb88707b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10462
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
MbNGMo!13^Z0m6K(j{pDw

diff --git a/plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_login.jpg b/plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_login.jpg
deleted file mode 100644
index 536b39465b7f1af3a485bec02070e4ee66c9df26..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 34871
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

diff --git a/plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_login_open.jpg b/plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_login_open.jpg
deleted file mode 100644
index d5c1158d650c5620b2a9a131c57377403366a0fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 36303
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

diff --git a/plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_navi_c.jpg b/plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_navi_c.jpg
deleted file mode 100644
index 45dfa9b0fb36545f509c40fbaa24b8bae5b6b848..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12037
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
I&i%^&0D*D8iU0rr

diff --git a/plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_navi_c_2.jpg b/plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_navi_c_2.jpg
deleted file mode 100644
index 370be75fbf5c5c526204395dad38430c612b5c29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12833
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
I+s*9%0H<Xz$p8QV

diff --git a/plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_navi_f.jpg b/plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_navi_f.jpg
deleted file mode 100644
index 089405b174ddc0ae07be0bd3a99b936f1d07235c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13066
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
Y<@0aLW0T*oyO8So#{G+t_WSw&0iMFcg#Z8m

diff --git a/plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_navi_f_2.jpg b/plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_navi_f_2.jpg
deleted file mode 100644
index 7d00f0122c75150d1500c3b427f972dc8bc5e4b0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13506
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
E0}Z>Ff&c&j

diff --git a/plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_navi_h.jpg b/plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_navi_h.jpg
deleted file mode 100644
index 4af8e0443e220d117e03991eed54567413cb6942..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12273
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
BqObq}

diff --git a/plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_navi_h_2.jpg b/plugins/opSkinClassicPlugin/web/images/002_openpne_beige/skin_navi_h_2.jpg
deleted file mode 100644
index b13b928701b20d5a06eb755ce6710cf136755b50..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12557
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

diff --git a/plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_after_header.jpg b/plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_after_header.jpg
deleted file mode 100644
index d9c23f5e6f111d3df59bc5660545deba8c0dead8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 22989
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
G*#7|Ik^Z6p

diff --git a/plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_after_header_2.jpg b/plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_after_header_2.jpg
deleted file mode 100644
index 6c4990619359e3b225cf56982b6146fc005ae75a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 27663
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%0DS~sTo%gd
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
F{{hq;duRXv

diff --git a/plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_before_header.jpg b/plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_before_header.jpg
deleted file mode 100644
index 89d9a66ea41dcb68853fee1d2f9852b3153729ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14208
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
ab{`Y;iWD962p0|X|9|}d`Z$o>&i-E?Pk(*@

diff --git a/plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_login.jpg b/plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_login.jpg
deleted file mode 100644
index ba15049095dad28b2fd5b94a8898a6bc902d8bb5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 42849
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
K=0=VGZvp@%ud!JG

diff --git a/plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_login_open.jpg b/plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_login_open.jpg
deleted file mode 100644
index a58d38d6aa581a2e65e20040a4b87ab9ffa8ddce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 44283
zcmdqJcU)6X*Ds2KD2jz9)j|sbf`mv3sQi=;0fZ#<sDuz8K#-22s3;{gr4s_Ep@jgU
zh7Kydgebj(lz?<WMG?ib@p+#2eBOKC^Y8tf&)o`p@0mR_Yi6%m<-6AA&&Z#TY^RL$
z4E5L!9Asm|0RPzjtg`Xw_&K`WV>`gc!N$gR6DV3|J8>Q3iFRVcyah@Q{26C^#&+<(
z4tC&*odfvI&T)ui|2V{X=<mVFdHC>=!-qM!xQ-s>;^O}A#{qVB_Cp+pxHvhvjvwPX
zcKqZC;5d2m??eASasTV?zqk9ZyFYK)c#a%|9Q?q3fQRiM&jEIx1AkiBmH@KZ+1L*p
zH~>)kuj9ZzVTX@!ash=vF;MrP8erD!9GpiE9X<tIaU3|rF2Hr<1Q!Q8@W6qCJU}Z>
zadTe2!{F-<UQgmmd*k8#{D{Pg0Rg|H(;!Q1u7ppyuQXCM`G_*QPjX&GckuPh=8ZDP
zgk~unOiQT01w{MlWhXsBwa@RoL$aQQaq%43AMhY2_ff8coPWtUz;lq7orCWX*xakv
zf?quDb*XneJOLrVdHTA;I|*{1WV!U=C(1V<KK)XcL1oRKXF{|cb<j<!7?nR`Y}^2y
z0F^v!T5Nk$GtuBMs?yNems%(7WZu7Y&n9a4b{Q%LO)Xutf-)`TsMJCvf(22r3Yt$A
z_=+7IvCv{mda-4E^d|(jDtqp+y!ihvr~e<ylj6=AI^5RtxEd<?nN#+p)aT+XRa#Tr
z4~|yx`ON=xnwqU2A86G}vT`u^br7AYawVauF?y`-sQyP@&rI-H!<pN9MW}Ge&)jpF
z%8@jIrn(W_;E1;t8xuNb9eO3HX)4CH?u7nF;q=ZqT;z^?XoD!-U+no?DAQxY+u~HU
z)v=#yxK-%6$3Ar$>rmSpQK2QZkNW*-&2c{ti_!(Z=2ccZM3uA&O*JPsHYfZze2i|B
zA-mRX4HOOufAt?8iGRelSv-W*Uo*qoMoALdf<>EMYr@wu2r{2f@<C7;=c)qmD247S
zLYx1YW<t%K%I%9U-(8Xa9`-1)u1c{q$&+85+5F?4)^)ptKWu{uKV)Kpw+8MR*SjwI
zMw0@wD&`uS!@n2$|9Uy<6wEb;YVf;e`G-y9-lU`i^THa~PT=W+(TTRCA2PC2wZ-y}
zVy>*|>1GJ6U8s~l$*4FJBmWs@`fc!@-7nWgHwR}uO;~cf!%p(k(wtzfwt&jwuIV{5
zP4m3+tTPn!u5_#xkz&pl@bgOXJN3ziZ<)5hK<fbp{j9H!bnY`wWxw9*j%@v5<CxQ&
zvtyNCajO}RQN69Fd9&4hC~(h(9Nx;>1A1+%>s|=_?o%b=PK)+`9aXsfa0Myys5<3`
zjPSI^#wFt1By+;Gtd?giOy0TT*RcMtXK&s?CmZQ|w;}Cy8MK0g4^?#TNtcSePqk+A
z(qB$M8o%wu?YA0m^}c_4`*q})$8FWVyxnA<6IPx*GfTpaS0~om5@cR`;)IHFN5A-8
z+Pb(PhM%r$?t?rC0%!!8-IyAH*rBQxmObZf7*OW#scQ)&pu=H!$0xh7FgIM4BI}Ua
z7HmN%W4FFRMhzf?(ucXH8FVxDo88YQ(hkUnYh{wP1a0(Q_gf~OHJuuepDK9N^L1%&
zDZTkx!_=(=(xT#`My@_EkdIttcYrng51SOzfjB+h-RJXwHL)_VbtR*LvY;QN@Y})c
zR|53ex4o^e>C@0h8sDxwm+{0wlQulw6w3Z#i+5H^c=J6adts-0hnW{QzqY2YtU2zv
zBJyaS$bek?;Cacg=S#|$VvCL~|LrUyvdV7e4;wqs<-IWHu``SNH17GuoYqgMqKh$x
zrmr_>?++LDaAqnvA!G5<qFcV}uZ+fvKJrsP&z8mgBK@b?6wqwh_K}Qdlvr0$V|Zcq
zBhZw?^T4W?InMXGcZMlT|7tbBf7MBHNA(NW#_2C#3pe)ZKckgU)f(%h5f)xJuRS#m
z5ZSw-WyIVk(!761^MUn(xeKM1slVm1AhtMWvb1CajOCwoJ#WkZM=9gofbT<BX|2hs
zRPVYm)XKjq=dS1et;{p;^DE5ss&7u;HEwu#Nt1b-IefGKp5_(n1&!E*BFvYV1>x_c
z`#*05q`%3ydK+jISjzA_BV*gSD9X50UpL-YUeEfqSnzeq^!;gQY*zM)&6T-(Pp438
zf5-6|{OKv<93|HN?_u6;D1Q4|4@?TW{97%dyfxO5vZOI&rat9xbz!P8Wq<kppM#wJ
z;(6P6f3BIu|DCRr_o|9>7J;REZ?#mPk$KVQjK1Me*}b+ehwI0O`@Z~-WO=MC-2>L<
z|4o+a|4i1M|I9u8TQI3}bhaHl;G5wllkTY$)bsD<y8p&xes$9^by>rdp1@Q~{r_en
zz<d0kC-Q$--~VeT^8cGR@_*Gt9FWFFW40-(X>j{dGs_yG0R#f~`CRGh_X^GTYWJ23
z-@r+JRajO_%ff9iSgi#HgKeXOg#v5WPGnAA!?dAF!5-7)V(`stw5Hp-ci)G&G#&^a
zfHds|{yuOx#6!(}OQ~XK=%S_~vS~+Ap)jAgo^4V0TS#WIL9I{8<X6pcUHZ9;lU_{l
z8&jJUZf(?6Ch{542c>AMf3J-7i4Nub6lDvZQZ6xb?+!jsi!Ve(6Uxu1+J4rsp9Jl_
z%|4mG?N%9i1rAPj*BMo<n~E%qOs2(LHI3AD$ZnkZZ1B$VSVQU@37q0S?b|mJ$#{>J
zP-jsH#B9};ag%(asuSq!Ga@(AjdlqqKizOz#ajg;$C^C{*>&CNen}+yzw~9;Vf<xO
z(N(CAI@=0Wkywy(m{P-=fL$$j9n{Ow%;$pgjJ!$OH&2^{brtwj4HBiY@`tTa`$t<|
z@WvU`mtcIb)38_1ceAc-(aWQ%x(byNQ1P*`%~*+ws|6Bs%D$DwwYd~zTI<KB$+B$-
zEg$dTJDx@T4@@n|D@C7ftFOK64ZvzGrKZGCChtG^u`|?SCgv}_{=-VheAe{@4w8>o
z78QxqwI=5-kOUt}c3gY4Ejd1^R#5}t5rV8ff9VvQRQ`E<vMMB)>m_W;j`sV^g#UYv
zU-7?j)!(UaR3i(bd%ATcd`N>l(4J*#e%H!S^u$-~nBgKJ=weK;qd7OS9XNS$pMwN$
zUSi-C?k>Qz-}UtPR}Krjzaqck7vXj5Q_JRhO|_SOUW^|zjytJcxTZP`H<vhR`8qA1
zkUW!?o|7wIQ;oI@Gk$rO<#V(31EFbQCNiDokq{RUt2_YqLHeZUiW1Ci(eBCA9&5C_
z8*k*mG+4C=fnZ=AaG?h4^I+9NquL9=O(*cCU+Y4<Z<14!klv}ONP%3JL4<`7g%#pu
z8er5cZJoYg7ltcn+ka#WX4HK35UQt{?>JI~E;S106?h?JNqPJ#f;TdsfFK?`&-UuV
ztL#_y%AjMZ)l&K7)z-I&Uaz|Xp>(_=M=NJhVAg?%LCRaS3QkEVuHf!l^ku<kcjPh-
zA1A^sYr+^U8Mbe$`FJl2UgkUmT*nY225AmYz>=0(2WO3p&C9`(*KejC%|8TDrQA8h
zcJo-+KMpUX`S}x%h3TIy70j0_)84$acl2e=>R`eO>e6P}AGYC>e7Cjwv4MgCIo}j{
zf69kF5YYY1eT`0BeM8j9AkSLOTsaq5Z-_8zGd4W^gZ1kH>x1L#H(6&Cm8!}mXVL{j
zSG<N~ax0X9_o?Wo+f_5Q)W=eBR7SV^AuYMieACY9H_)G|4mj*kFK^IgtUxol7AXOv
z`j~%NPz+!o`mDDg;!Sv>WnjvonL;Z=<>XEG1QjMOn>wT-Y%Uv+-Wd^RfSq7Ii=q_A
z46_e7*rWWahWD-}7YW)eJ8-0p_S*P}XNW}cPr-k@Uks?I`t%)tD;(tNPj)_|?r&*P
z`iBkK&!fc;dvM8N+s9Ct*iQ^NlrC1z_{QJ~<>MJLAz9L#DhY6^K*8awD@j684H;Hx
zkIw$0Z=aoZ`DS&SQs}ysADKaDT>4lh^D(v+pSs!?C#LdzYHGKeYQy8XGWl-vf#>Tb
zmkTbKO5HP3X|4(el0q$}roqr}vEjZh6~g98d0l1Qjvp%}G#@-DAH9DK8;tcBDXzud
zPHy?3I{GjteM#A=ccNFIPcDZpnmym01?KY;ytaHcX)T2{wJ}W;M5Q>@+>dxpdRQ7(
z-uh6>R_1w_x?|)c{eTVoNtIqci0T8dmgM3t>LDs*Ln5D2w)lZ*`9A5)fNpPU>umPT
z9V?%Wt7hf9OvbL8Fwv@SC2;9-V<#)Jd6F)yiYvp8uD14$>_~sJ&u6@pL+rTaDEf%(
z;F-fxH+K^x;n-kQO|pqct%PGdx@6DOFTtH*#;r)TD>jm&K}}Zla9@CpD-2x}EyjsQ
zz2s|u1Ez$@&9&75C&l2+IaE-#cI5X3cr&As7RN1CGq8zIG4Q&z+Wy?P>V)P5CGh*i
zgmx_JN>EOpFjP>s%YkyU=RzM9Ya51#Cw7~2r{_VFXN9P*o0jlGP{+4kM7;3ZMX-WA
zJLDMRpB@2H`9BOgx7A~o4{TVR>5yxj-ck{+sLfkKZ4*|58I@Y*Gaagvkkn_XwiJr<
zQED#eLgA#4SPlhKmn)rP9}cy4J~T(nLh2P+1*Qt}6of5vb4uM1ZRSE;hX^-OEQur|
zN)fCLG(;s=Ug2~pmAgp)U1m}cF_^C;^eiPqkDb@g#U3QJ{D<vsHJsPN)>HhhP|9Fh
zbVW;Lh{$LT{PkN@8d9V2;3~s#kcR&FtOYj=zAKdQswRw`r@+4X06~M!Py$I>y$yYf
zHZ6`&5{fyb2-JXppIL5B$$zT3^$PERMH<fo0>LdcmD{L*N9|?;dJu_s<U_ZV59<3e
zd%W^2CYmvhrun54ie20mxL&oeBVb8wWxfLhk>cOts%|kFi40Uc@PK;G=sN;H%}1E2
zihGWcNc)XbagZNJgNMtB@D-Dbf7lkf|FGF#F?l%MzYwSvkn^>T@4w_hUTu)_-rcR~
z3Q^FT1D(DVNcVyw%{=XUwKYWsf7rGWDk)dvZ`o{nXP7cf9wdIlA$lsw{p9rmJC!t-
z^h6cXTkTbY%&WHKQi#R#mz8;{nb`BW7&>mikc>vk;j?dj2Mb1*Uc3G4YpwIWrMZtI
z+gE}LrowA>Rn9p+3f<CjEbA;wZnaS;8CEW3rjb7T2$SEG<kbZmU|Gyh%(Cg>=q2Jj
z$)kBHWid$KeQk~Sv3aYzZ_sSD+~@O!h*VN|w>k}zUmgEN*@)b2n@5(z%jN1{lIH&r
zHSRu9Kl#0&?$S5^D*qM3^}*kw{^P1kWwU{<C$kFgo0Qp%{b8%~IIf`?89&aqQjA^j
zn6x#h3sd%9nYI0D;_Q6w58Kh8^>?>|E2cI-^}JV~3_@UN>ZsIGKrcP_2lQCd;xS-z
z#8=Pw_2_`_&tGxdz>Bx}ByQqs`eHRF>cWrZRENp)#q?;$erlI(S~S4s$>R9o>2z-U
zdPhEm8<BaMIn{R-@#(oJ31K<fPTN9a2o2CV0!Y_%1*EmJR1=i~sHq-XACjdsQfC^h
zG-y+Bj}tUVz!ZLj_QbT5Tgo!slgTU<ob$oi8{JYP)rlcafUZL_!$1O0U$B%Wj8(J&
zeWmNl^uSRIBpcY(0k$Klw77_a#stjmPKaNiBX2UsC?Qx#D2`mxb6Q##_xb|el7l?(
z;UkEb@<GTl|HDTiK3+e!RDfFnmKI7j#JL?r+gXM-rN+niUpBb|GtPd~pmG`{9dG+t
z5SyC(caz|{%fTY0<zN|06p^4&wwl0Gpfe>3;q_HNR&JD5!BBN0Xo#_6Q)6zkjsELb
zs59GJwAFR4C%71X2G&C^)R`+?o*+_o$6l`p*o^||!koO+f<UfNoQvGX{tjq7@VF)8
z_JO-XF=r1v%P&AqMZAOaF3D(}AHd|Q^w~<_^`A}HoMKGOPS_UUi&67=q+f@$97k8Q
zc>5m-Uiy7^)31D6IFtMPOKk_0FIL9`<)S_cJ-qZ_+vyVzw^!`Bq{z>MW6dh&v9$Pn
zGnLM`gjC9o=`9X#sX#7|5p03}TmP}$g@Y|y%S45NfGBBg;<YsN#WP3fTT_JEVU>WY
zve&F0#W3}A=$W31I|ZzZRYUeRXj-o+g<OPmGavuS=kRL2CrR+}reas^HPu;%OwhO~
zcWEEYudyLzH-!A{>KQ3y<QnV2hzngk?$$xO1m9oA)(<wE8|}ejD}&36YIZg#yF4&_
z-8SvGUTJ>)5LrU}i{N5UDgIl(&b^a+-><fhzMQx{^Weo-ZZJXa?qmSM7+;(0E$Jp3
zaCwXr8C9QOpZ8@0-B9v=+tY?#33i$uVU*{b<7gKc`XyF=?%210u#m}Hw}e+=cg=o1
zIO(6&_5)jHVPc$J>l9v_Wd5TnkJCP?4S6l)!=4lV%q{!dB2n%y!^T%UddFAIenT#q
z_DqVT*W_|#ns#rEq_|WlyXIPq<SHQT2P_rP67=}EfN_2k>7M%g&h$TQr2DXRQdxl0
zIBcApx&(H5DQ21AH-U=QI_~`Br^fNthr_y~y~d6oe>f9a)!scCyZ&*o2v&ToVN&^<
z-sGtDBrA<|@n2@6mz>K3wl~W`@~T#+ohB@;%5CQALasqsL8sqX;Zx-BKLRDLsr7^P
z=pqApbV|ff?w0tr4$O{+XCz`(>*ZYv4LX@xf!*Ka1KMipGk$A2%2s0d8cG;0Po9R0
zp7<o*v@#aqHAT$>)Esvr%e&Ou6R<bKa6UB@^tbMlqw4k(V0dB`_e;_PmX8;=Rk$xp
zdE&x663Q^X`(F2vOG`7-9N2Mmq^URcVqh5dG{1cqR>T72gg`>OngrCjdyxqH>?XRU
z80Xz016~h)<g-V2S|`I^w|l260t!=ciHQ=|W%{Hdkph9HKDd^G*KMFfEioKjFnOc^
zmu@IOqlxO1iV)5|N(F5%0ru?;b6g?!jBTE--of06w@8hns;-FTfjS7UA2v$?*r1`K
zxl+qNj+KKI3O=d`8xnjI-nFZg!Q7-8+0Bzv6AJdXHr;6yxKiu^D^P(d!@*qiYCo^v
zgG0dHwPG6;`unS&`cbi?B?GtzNh06va_rX~UOi4EAd`uNCtl(<Zw*Uv<ZiI4qSQrT
zR~rn*yMyIl)x3fMyZmTf1dLN^c|sKn*t=M?UPKd81o|S?vOucp(g8;~C-BAiI5qEN
zWip?LIWfioW-OI-%azhiG;AOn>U7m7WMi5f@6uv)D(wT_kePc2UzS#TL`;c1njPJv
z1lD%$ivAMbxH^1PZbu=kUO*o(f}b+#7R}`Q$eJg14NU`+pDVYIE0sAWOT*d~D!<F7
z@#4$UV*7A-RUe5o7t$!2_&tWT*pp6B9sFX_?@+xR;zlyoHw#D*Qhs=OTU9p04(dcb
zi@+5oD|LC;9dA$iVmsDl6m%tGx8@sU<eSb%_oVy9tHO0wDPm{hFQ%-nk4QW}s2VnE
zVx?N^hoDi4@>3%Qe0!ultI_(p=Sj<X-CCLV#!*XoX?HPy*uK}SH};IfNcETE&*hcg
z$!<BVSe#S1e1E}=sNlpf==QOVL39yqYXZ%hw{LH4U41nP$?xoWmw|U0>f0Eol~73i
zxH^6{^Xz-cjv-Hc!OM^pHxG#*F-4Bm!-V+;>*TNLgc@c0QQY8sjbMEE0`Aepsy*Ei
zM@hkUk0C|?R;KF2kY|QMuRVfA@K;?+pTgZ5EPhb%Aa(bRZvsgBNl~OX;&)8{j$wm}
zV9Rpu1nJsY#_fPlQP_;S*UehN^ET&{tITkk_3!P=M=2K(4aVA+bj3<Dprg0JqZ9R_
z9ghMh&c6Tj{p?GJ+{z63yl=&snt2UkJfF1(zuDIJnEWWtH25JtCjWe-4m{VJRz0Ui
zKSi!yR8!Fd+`@?pbHt)@U!G<XY3rSj7|r?))vJbrEnrXVzS-L4U27MCrIMES&v#h5
z69!`V<XPeTE<0y3kr`-PpeDo3-AggQ6DE!DDZ@e;^i%H;iweDIHK$l=D!?EuT`d=A
zrm|^tU39@)EY+(+o_{vJq{7^uP>aUfLVP~3pfS3I$<8N*SpJUYZZcOE)sWR;Msor<
zaa5l_lH-*gC&rvPIRyrK>qNDKl?QG_mUdyCvV|#6`H(u?AI>W!T{eD9wYYtN(hY1s
zII!PR4E3@U(v79E?0^mGf=WZ%NPQNG&TgwU+#OUAmQ^c^4?NyxtUhcghf{`&_{q6B
zf>h#fEGV{u3*-6gINHh#Oj=chxneN!ZkW{me8o<n+_((pYIwzaHQIGx9rMKB5HK63
zua|+-vH^`OqGDi@Hj8x1-6WQA8(pMBR8<H_{8lRIv^47W0Z?m8DB7t5>kfuk3X^PG
zVr&<l0H&;slF*ByC;zq+kRXvH(?a(j3`4!UUfp2?xMe}TJp?4(XX#^}m^!RSS39+I
zS_fhSQw!zD67=&H<nBVgt1UZSkk<S&d-cuwz;9HmlUmrzAC-@&XRpyVO5eQ8{4%DL
z*ZV;2BUS6M!|yrOVBf8VYwBmA+bQGEdO}u5Q^~{ODT0n-#zB=c3K=sdI0L7q-}gxQ
zSqZA%zgsGvW`3LO#gVUDN_AI>eIRBn1TjZ~hyJiRM}-|}opz}hT~{4dRc^fL@XO9T
zWNC%sR+51lLL25}Mp=Q^3Ul0tB|&mzEiZUDqU>iYz4)Ofxas%0%<dz1(WB@q9^vv!
z;3CIL*9RHsF_rD{Ft-&Ce`x%z_#tv_neiEgc>7OT_K`G{07~e(RXXN2m~UkDms{ky
zhOtXy@126QYR4{K{#s3PRqLk5TY~)Z*hb|_`NuTR+|V;&mgn=>$?3G{TFTWb>O|S*
zvnSP9p#)a-FF8<Kv=pMRjoBS6fx8b?!n&ufqG+RTm+YW<O_g#5Jtkcy$KuN8jpL-F
zR1#9Dl!dEBA1vRP*pc%>U)Fm2S-}=qqrT%KMZJ7x{ouEgHN!UVAY#uscCCL?q$Yz~
zy|)*)gW3gt+{j!bC?GDjD9c)8))E>%FB|RfE#-m7E+rTG*uUsL=}nD{Z1^f7R&)*9
zHLg&p2{A@X$eW&Rh7uEeEwRO!N{7d^-IGWXyEwCEQGDH67Taq3;f|WsDo=Xywap>r
zO;zIzq`pGAbQOw<h_;W+=dh31em%e7WFyEL8iT#Z%HL`RLkxWfUwU}ZCa<;pXpH|B
zQBYzw=IE3ZsOu?6a1~EdGd}*aEN(#Uo<gs0RV6v?zA}zp()YB?jfZQ{eY{mu)g;L4
zv(Vznw%=xB?Vf=tM;{jA)j4;!Nv*q_qm$R(dsqeGW(v+dvV1t?r_<@_IB%Q)Ue)i8
zN?I<7GFM}2*r(P>^4kcSIET58;C6Bbip~vrq)bRpsydg~B}VI8MPnwETFJSViq-IM
z(x}05mz=BeRN1d~RN~F3!l3hMir(40hi9ElF4fAKGPcz-bxTKrClNDhD!NEC+6f7k
z3!N1rA_dHIv6j&&2)GR}C+;kgJ<}Cys_9R2okPSF8>;CcJ*YLn{jSw59PFw=n);~V
z!~ws+7PBa`CPc)ElU~*nPc8bb=@wc#b9JqZN7-oL^1D273g~i3e%ET->=5o7JaKBk
zmR#Rz89msBU7$n|^L6B3zp2G~+Cpq7;ZR1FxtpNr3>1|<Vcm+QrswV?lLwK@xxk}<
z!JAfe>ZY`g9Fg=)J{nfUKM7H$LInf6&E-DP9535u=~@LQ%DG%<LTb=e9=BBH8w<M<
zd=t~**-j8O75AbJ@jhi6Qi`EGNw&HZFeH)yvm)l9*#SzYv&fRTk7#rvX)HUIJsSg2
zqs8-qt2=;V$)^$f0&Ogl-Hsm+VjlsuVzMIj)Q+RAG6%|;B@NCqe~XHA1f-#kJ6xDz
z-#U^yG@u<g^bVY7p$dXny+y@E*tn%8B%*J0KOuILX8{Dz!<JeUyDSWdG81;b<mwjy
zCid;1sVyMwh@&(qz+oqLf#nN6f;zp#tqBdSQmm#~q&2AnXh$iVMY{tg3ShlxWY5MB
z2_nKT8~|G>3xhT?(wTwVX@I0Y%_{;95^~~(Lp~zAQR|=}7LAg|8i+(!kP==Ebk!iL
z(drguE1oAzzfSV-{S|c+!O5(;pTDnODSEjaejM>IW{>-OW<w}yp;7cR>fBqUz0r(-
z_jSp)^4<N<UfoU@iTBvR?irb*g;TXpJM6aB3Ale3G)_#|9Stt;88$~;0|Yw;$+-WB
z%tCZU!0IRXZa=}w?U0vBpVKp^@j{Zv9%j?(pv^%S-dT-tUyt~tBu`Tj7%3|o1j|?$
zW(+bMWo47yEHG_!WLFK}J-edHTPSQ75b@>6et&E+UGPb8f8Z=@d+DvFLhxbw9fdp(
zAAajnh4Isd)yj+b6qKQv1g$p2o@kn2*;&zlS(?5)fN5LOHSaz?O-ymOQL`-Nc^k*4
zlC@o@vwLvbBaqe_QR(K?q<OQd<85jH$I!^;+SG3hQD5`8g=$zl%LMND09)yvT!oTA
z%hVc_E(t*GiXttR+p*52X5mTs-9cgOyK<<zr~89@)H6HvL+|eKk8Gc8J)LfLr>wT2
zOmi*brQ(Cp<W3}wO3e3Nb4;<*GL(!{es{&a#~$U;J6gyH5Q&mi+TzyThKv;jjGmY)
zi8M|YqqGT-Of#Zw5X;oC4*`uHYv1|N3|o(@Xd_>N+G<x!UzoYbilpW_Y+~NsQKrbX
z_q#goV@nl1PdwmGBdVxFhZcn$#>SCJ^rIC6?k{hSs9-hVXN%kekRtWkU$!8#jB$Kj
zh;-kI8~+30ZQ>ucU%M@&JEN*iq^IkaQKv^MokCaDjRg@*N(N~19({b?U<l60P&Cfm
z%gawFdO=G`5^y}!+xzA6ICG+~d(+Z`NPHe?QwL~`nfr<Z+mP*oiieb9(V&qts!T=S
z00z6~J9?t^81-YTCw$NkF&fV@H!@I65Q?Dw?wD71!c}~U6TX*P?KYAHkY8}Jv7~%c
zw4_bU-cc?@Pr;8C;{_vGF#OmR<;62B$8<^SLq;ZjhWBlJ9mMijSQK8i`Q2x4O&!gV
z*G#<ag<_qL5Va!VTAVo3M<mL+aGk%yJAH^ebn<1>-8z-((sti<p>)L_-zcGi!SS6F
zg140?Y~LI5UO5a+CJWdQ5*gFS9WYBDpiD<|$E!GPU%;Yrz?7>m$^y}WJ4=!EGO~a)
zOvtQ@s`jc~!inp8=QFWR)C)BOj6ylu@2AQYNJI-Y@{=$T7b%~(sCH3Xz&jlen0sgz
za{5V6btsoEjO&?roN@~H5x(<2#6#K=CFZ)6BI%=9Iyb485e~L_`p@nd<p{sy^GZgN
zjgV7MsynfGT)g0e6}&MdNaqDHHZGnqH7J$qxG&sj@l_|{;+d)hna4}Q7w25!1;KsF
z(!>U;frefN5pYH{^t9E73^hNi0VWvPaJS#<1#{m#>%b}ViTsRZ_sWC0Wrxm+Qvi|Y
zcW6|oFaD;Uk)x3T@*+lP$WRP!{sOSsbf%v8%f_ILytvBju{n@<?`Rhrn?weSCVkp2
z;XX)4!An~O=gn<uhqU^qjcG|;?gz)j&#FACHtYtAI|--f0A`wJ0v3&Az}m1Q*2%a*
zs7cv?v2@Ct#5T@Sk!%nHFzO_@PnCMt(oroP0CZ$ptaaYKpZD^ykkjPc?IlpJ$gwnz
zcYxdHwwtq$c+x}**zGR2gz9DAiIeIRAZ4^^XAG;HnrlQmg)PlZ6OXsjGB?1M!(KBv
z8NUu)nd~G&>V5yPwU+<Bxk#;A_5AEyzkNk<Lse-p<kQ}v@bBEajeYAj8x49RtD1DL
zxt=w1q!*#Vg$(F0+Y2-(DhPpH%>9{;X8;;)DZ&eYoawr$bpU5|(L+t7r>#>-$q`l(
zp2U_4Y`F!e3>Ym`>kZoJS{+k4UA<0$)tCx8R|(@amjwd&XZ-z8k_zoMG}M>q1z4?a
z^x*QoLRHWax38N>fXJVs)&vYN06aPwi-?_J;&BS*w`!PhA9L;`AF+i6N)IwH915u1
zOw^}h{$_*j^d5nugQzVBIV$-zk#7EiL5+o{7b@RkPp=?v=&%&z^3VNdz~mxZtv~Y}
z92BXTp5wz-zbFdZUQ&986ng<tDxs3|(^Pn41R&4;GGLk{m&LJam@KkF5PVm_w8#fg
zAT7O8`PE%mPu!^3VV4f9kEm24!><Y?1gK3Kdm*M=t-?^>pvzfQC!yxWim=N5gQCO}
zmGfXVx*=D*oL_Xrevxc_xUshlX-p~;P_^YTzVUcvo3>g&wN`fkezQT?@)=1}fR&|v
z&Pa-<yWs-cDrI9l%>A`^0fvm-Di*3^7wHraxcunO0Oo;VjPHvYHTBb+S>oWLd|#gw
zbZXLIAyVxFvx6$|Vp1EDqDze&0IMq46xO#xODQ!bhX{nyLW4ot4xu}rAX2WW(n2eK
z%w$^es$3Dx9_@_LO&*B!B$CjAd@>*mbn<w!3dR(U9z>mB=L1l1=L5u2ocyU&OKM^D
zXJHbz!3UELoz&CR0`-<Ax?Tuv)~hotSJLXNz(-Jzm$bB3%pKSbdVb1-RP@n7U4Qp5
ztflzVDMC};v5g4dDEojOM&K~ERyS61VeuAt?sn>m2Tgu4clNBp4y|%zX+1$;=;sgG
z+Lh^#vWs}Ju8pf|o8CbD?8N<U*Er(G_xEp2h6(l*YJTi8d*bkW8vbZ(vis`y9J_ZX
z*6hQh)T;E{l;-vwKtYqabbQY~&r(afJJcuB_Dw4>?Dl6$IYfw*9O-6tk$cwm!cr*%
z?P-58LqoKn9f~6Ak=xJompfevDo05GS7LRa)qB1u#<@d~_IXfTq^?i<<H(q1IT~EK
z;zrG>eO68CwJ-Uoo!Da=VGc8T)hcibKx%tIho}Pe93)Gs++E>RYeY+dG<2d*yc60*
zp`abm$X<d{k%_%wIau80gv(px(YQ__ECj4uprUIsWk?94QePA3$lfWPaIW-Y=I~gU
zwD}<hOdhWPos%~=?3c2$im)rP@3z>069`0*wR#%qTLmhd#l=@k1XM{AYsw56=?N8>
zQngA$ed|uNr%QbGdEe+<>^4CPkdr-YB*_plIK773WX(=m8H3c-v;&0dXqh)zJKC>G
zoX|iu{0K-+K;FjJ#FoAQm{Qy!1=@FcwP%eNCeE2Zq%0xaHYi11-^~QrA3`7-;_xgL
zVI=^8=CM42SH>lHujLxB=0##OOx7%JU^<A$+xF$KiMDwH7eNDnn?X{z4~+SD5tb65
z85sp!k4+oYBuWr$<63j1g$2DkiSW(J7<J?Aagy`YVL{ypDBA@H)D4cP3F~MHO{|eH
z?6QXq0%mjNX{!9a!}3Me$wn<uQ#*6H!g5j7Qn|9ua(g3}+-*~KKHQ*gO6`8wx%P-N
z7g7KsBgPmTG$&)-<y;ie?p<lnokMSt$PnSQ8|6N6YD_Ep0qy9Wi13(Tw`|+FYv_$k
zm7Um9x5%CR)+=^j#QPMy&Z*rKj13%K&}gN}PuCs){iUsTxwb_K!SqQnxQmzFdKhfB
z{N>T(yyYORKWsm3J!e^e*l1@}tG@4p+c|4Oc%0htnXj>k%04NriITm^!k%2eJ^t@g
z87WR4;kc!p=bWpH)_|fOoW8{uGa4J`CY|O@8fzlgSUq5LQEALvtkH#HlV-mAGuWkc
z8O?G)&0l0pB!muEoi0Nnp~%_`R411RuTTz*#bs(UA(c^hBXa(IVhg~igWdH$fM(Wz
z)>092^Slz_ansRfBwZ_UVyNW>v}N?LEYtE-eg|0B++6YxTPcx_M)b}Jza2CHc{_wq
z<B?);Ubzy~7v7TGSSN@swN~kOnS(9)Ty1s}CB!pdiRvqO_l{9v{9u6hzRWB$`lu!>
z8&i(C`_CFagV0cpIaAaRaHM<m5_<&(42>a)^Ia5-1o(~EP-YOjy)>jO)Ye<3-tOkh
z=vlLX!|$1v=3zaPW0Hs^GaBPB0IgqU73*JR+5)J5R<wG%bqChdJw78rMrcKtd)8(2
zSiDxHUzI6iVz5kkK2q+CBhWDwzBr#DY08-Dl_Gnch<m}joSnLn7X1_u)hUvuaX_cN
z(jw8xUU`U`7(ENLX+AvQ1u16~NC*gVGPs+s>I)XP4#T!mBU_<8Q3w|RhM^Ytye4#0
z2X&nfba`7+Y#wmRfB+%tn(7WSu#~{Zd(Wy{7EZo>p+0$BTfiMLqpHG7E`PkJN=FJr
zpuL9*2Z=9QM(Efg)UR;aQYxkBZz=>>X}@G10Hu*u`j451@?XDIbuuRtqkBr|SXLN}
zz^7dDj;W)5`+;`0cI*zR<cjf^GZH|S#$;rs%J*6w^<v_Yx10EeAqB5=)-Cb5X`gIe
zA&o2Ui^r%-+z6IZU*rg}X;3G=AZ1&}iIF-XPd0L@{1_Kio952<hmHKQxEehkkW6~+
zmIC0jW1Yl~eaxp{>FbEYF0b}iKe<Og(jHk3Pyg0)4h;ytMNjf%#2WZVsaQSuyzm_`
zI+=5P_j{3PKwbwl>U6g>WlB4JQAOB2`95ul(34yOu_?%uk!83Yjr@lCB9!(z*C_D@
z!(?mlZb9J`NV<vIAX$rbqR>rTqdo4J-xiphOC_ZorOqo?s2M*qI^P81ERnVV_3|i7
zKCeYPAW*;Bp`oF7&>j{?pEV(^WtHS=)Z1LBvIJ|SdEf#TctJ3e0=TZ>GwOMmJi>*x
zedCUtB!BhM!uWwYsg}lk!~`Z+x(^00R{<ml+woCj9N;p1m*4HF*He?4=?iKeP~gm$
zI$9>)z)r9AmjP#Ca$WX1`zAFZL70T&1Db6BH$Sw55o*#`gt-X5@ihBi+SwRb_OxD4
zE&|0=gwt!W0M>6>x^N~7)-p9(vH5%1i&?oeN*YszdCOaJ)%#UR&H~Ik7Wj_m{60r7
zs2I86|FEt5R>2qxmpzm*2-X>eeh4%Q$0xH&in#&;%z~ObzA;xIYF$gxS}p^a8;&+k
zpoMwk5}51Y>!N6oxKlQ|{wXBs7~yEk1T0MEA~muD6Ad%99Ym&xh55S?kcl;9w08<`
zEuG<vseYDpd{)m8c-Car)c(ex{tX@-AZaHeH0*?~`lNs_0h|BUi-e<_+oZDm?aVJG
zotgs!VM~(<qFSuaF{HpLmR|)<IzAT(?adLW7p=<$4UugMfJ~#)l)-#rw;Y*%YCoo8
z!Fhp>VVTOdErpTAoMB-L@b=oD8oD&ij5s7>bEBb8ye;T^z<b`^Nwk>rRqxEJ`>ecv
z%P3Q2SOd72xdrZWss@6zt|mgXdDB4Lpi8KmxdbbOt5Wh=F`ta7qc^y82Fk?fvwLCQ
zAB$4<Nm<X}V1z#pc7M-ZYlqP&i0=4cC2676yU_aRr|i$O@263Vxp~R^v3IDO$KFfG
zySj!;#wAeRW=!{yoA3vGW-FpipH`rmXC`;<55XRE-xD7#9O!0$n?CG9Psnq&7Nhmx
zE~3i=P2s5%wzN{KU`{ZM#_#Gh8F9gNGZZGb!lOn&Hj#U-Tb2|Q!n#0KN29>#n$w)1
z1@hqKx%yn(prEdO7fyi+I)b~XJ2tX7`_F_^cDIfv$EgXYa%69Q>VQ*@36H9P9)VCo
z^$VH@B++YjO=XIu95J0rllHUuK;i=uohGy)$-v8b$DYnAx>+`?x|9(=Yh^{u^*07U
zm+DecNuC1Ke3&1oqb0_OIMNxTk;HJj<A{>d_B*bZ0j9;Py>8PO&)Mfdr`uEWns(V}
zA5qnm#~b)KLXWqoQHcRLW33MiEg~5ak`KH2mb5I;Jv3-r#XKj5maNm;I$>1O%iS|s
zhRV!dGF%StWS!w?!0h$S^+(NRyGpCR7?cg(f|C7WWLlWL<+A2=lvpO!ugZY2pk}Cb
zKf*r-k_ng;e1R(>n6_Ri8Z6wp;|H;=%*f<-zgK)}nyT&IwtNe)rOJV*g4R93M8I?b
zIrt{BCVkb9w;7>B>4xb;onTs_?(b!NjkLE(mqk<S)WOp5m?kA@gMU(uUUb*INYzE=
zVh8id&IjN+cjR1h9YT(#$)={Br&41~<^=6dm9+MvKApYV(|i~NkNGfR6q$Zlm`*LX
zOwS!8U>6p&Gd@fhOKXP?RrJ`U&Z+kPtr?<H=`fRcI?}17g{3I%r!y*)WO-MJBtpO}
zknuo%olEJ(Gx3`3$Lfv)sW$MoT9kyC^Lh~N`kejJ3FZ7blw!%d<-lR%yK~T!XBQ37
zpRmul+8nAe`Mcq=VKd0&f(8!A6EBGW(?F}oi+<vi!s?Ct>rx`&$2ML*sq?rywYs-t
zc6!M_!nq*z58D(~JX+9x=t3yTP>j}vyFB3vt%u<eW2$xWS>}|)@{|{?S^=ZKubr96
zd--c0%RgPET%+~_G8Ihigv=XjU|;8%{b3U|3z`Z5QnyGmlhY|I*R@^Edy@650xJ!j
zTG#La5mrW;R8s-6M1JFiipxKa^Iy(li0dK)Z<@PM8>Ohd$XIWG%ZP5Vr`%l?dUET9
z>L-#}NRXADQwQMc#N%<JW+;}XU4nAU<ng{6xht`yaeAQbe1!m!0h8uzr%gyyOm5c0
zdz_UQ9Zho}UYs3m85WPoCNV%D#qi9#Qm}mf90=_$C`|nbYH1;t!tWpTNw1{lK22<4
zb<IAzNR#-?>kZQ@2obYzhq(;OoaXeGkFWu__wzsQFuhlPJ|dH5wJ%geFk=@JCphN}
zH$lAxu1Nv0L!b6Q&fr>$;F+mO(e#Cy<5|cFPq8h9-Ul#KH%wO8=Gf)ie2}!!3Tir6
z1A9>|6zwCDBX|93=h&nexWc^)q1##OU!{Kv5Y>i9B3@`0)w(<b0zxJ~wob&wardl=
zir0Or%bk-DCb7zlbxhU)_|>{4gI}dgE)f$TLd7WuOY-TwU`-mxNUaE;<5M5YPMq%E
z<(vZ?$|0KzCEXk*b3sA?PMe$iH83|zQ5>{%i?bxhK=8;v4oA4p8yx^~2p{<8NxJxf
zQ1b)Nxc-4ia37`Wv<?j-EXCIMO$t*W3&lFw6zdo>q{7>2>qWAoMgqnL5bV{3GEufs
ziGxDvX#n6_JwKwTVrj1i<&=?&BIsiHE}d^-6&lM($neiR&`|-h#sX_n06|<#n4MIf
zP+z~|mLdLhV6!-RrsaO7%GQdz61=UZPpC!^-1Z4C9bXAO0e3XNI7lG^4!yhnG4qQ^
z`1hi@bXw*GoOpXs6}t2mdwcD=nz2I&xz6hZgzw6U^n>sk?;3q8;*9Ex-ijUr%yX_f
z-(GGe2Jo93{i4IL+eLA2$PvVW6}&cIP;osyrUIq)pute<(r(qc{2KR4m7Q}Z$87c}
zcLx|uB!J$gcT4<=aru#SZLy(Z8^!uP<rxkbEZ1Isx7^adH}>}P?67TKwA+ygZV6>C
zV_h8qJz>7AcRa$l+I^_0Z{KlQ5?9{^OiO1`Y=`%{n)uWN;pG!zLmdXRGd8Iux^EWn
z1c(&y(Q5-|0ipQ~^17C=d)T_aW=)(7Cxd=|CPhbt`A22vgkZuC3OdTh$jj=r08#h@
z4Uy>6mIh?meb*=Bc*o~_RSWb}#G49dCm`OQ!+18*NjN6!Bb@$}SH*~wJpu&fv!|vf
zA*En0Nn<YwNi(>}B#gA%8Y5d_1kat7dh{)Q!WHgP=Q<d`7sH-YYnVuy2<v5i*N?+S
z#SnV%U8;axR}b%~(ia1m`o)+Y*(q{SQ!gIC1#PpFAzqZI^c9i7*dxwj-8#uNaD5;$
z;LN)u8<-A=T_cmuK?%H+Nt@0M07BOj?E)eJyg!pVYUMo9sl)D}h>3YpbTZ&fny$Vq
z!zl}=ceo^eA{Fp?#c?yye#fUe0f&dr?g9|$v?fg?n5S^XTIrE7Dxqn4Iu3F!ukR+E
zf69e;>%hYyWR!a_M1V`;{0&M-d}IXg9WLGL7Y;tg>YTbxyxGIS`xtxY29OGTv!yBj
z$cEU$AeGvYItpk(drp62f=I>G4R;C}=>&L&9%yr$<6km{dePQ3cfybD9&e8Rl&SE|
zH%w8xrEzH1-nlt&)6+NnOlSHgK5W7&Q)T_doYv#NMLp^$w`^l+12Gz%l5C1F`IN4h
zt;Q`@`cWO=dF{jAfo5kv;f0r{*4afha|+G5jC`lNtoup2eLCXtM|`8hyebUA6S{Cf
zZ}pY+URw(6@O0v7mW?8azVse2YqYp~_n%g#$u}Trr50)z;b#@<J%)c_AY)<nd<%bN
ztvk|h=UfW_%dzrv+y1a|1~DJTF*a0k1O)evW@=^}ua}{F3dhp_3g?(S!l+&6nMIH6
z$$5Bdp+=vH6eFjQUx&vhSwh-YC2j)8n$WOIx%~uWCzZQF&Yw~iCp6lrT6n6MZqNUM
zne@cN?u7^Wt~%mJkB|uL4K@5fgh=DdeBd!<hiDHw>HI@saId6OjA;ei$$3CLTeozL
z9ovhl;jDbbi^L>T<0kCK7qS!q2QR%eQajSRE54-6FzjbOr3*+vX;QL&r^fI8DM|0?
z>ofcaCXAOJiY%QBTUg3Sdo2`6d7(3dYSOb&mRDXs9*69^QOpz2T?%tGLPR6Y)t?rC
zdVS**YVM@Nz2Z)#E?C-_N2=5W44SwHzG{)yC=|G7t|EdX0oL`$=lmOZB7xyPDkjVq
z@fWHn$6yR(IM=m{YQTCjV83`EKYbfEhmyMJEu|iC96)p3@^N_bXYqcgQ%tCxRnnd5
zQ2;w3U=qHUTy&C}sx`#j{VW<y0UXVU0h1OTwbM6{N{amF?Zpo~JFoPNlSfJM6#s#L
z_)i(J9X!Bsic5k!|Hu>M69JA>hBsRQ4rOCRC{tS)`K=w;$1n+HZgGBTcF@OHp-+gR
zVK}c^Tfm^6J*%>*&@6ae%~ViF?F3}_MPOBT4o!1dd}dnl#cYik?~ZS{@Fu(!NVA^^
z9M;f2EDog5M`bm10=Y{{mb9g=6+42{tAgrq+3w^O9jWN~5yY6Z6lnRf-t`y_il@j(
z?&ak&yo9(v0xVaA!%G>ewmfh`_`?0}5MQ+RXiGoexH$*bV#h6?gJ|(^2@BdgMtIx&
zQ}Es9)K=Md_wJ0*)l0r6DGm+S&iP!oD7AmNnjXCOX|fkvAh#~Rw$a=?;0zn}eE^^G
za<`ass=!Q=^Sbxe@;<q373BAPUf<{ju;%ircunS{RLhL8fN$Gq#izQuJiv=*I$CxB
z%5?H7z-N`(DffA%G{^G*p_!wB)ojZY0_;dhACNYH1*laSJ^aJw>mQvArW-<)F-%Vk
z6GTuz)+lerwAnKtgj_Pz#}lNT+X~pORTf++vejK-UKh)Tj*v#900^yYqVB^*Ym*O^
z`3^ilI@E`-<?I0Em<)BJK@r6%&ohtQQ>6-zPOL{RTz^c7_6BX;rM#1N&?sCH01~7c
zpYa}v2pug)NUF1<%K;IHR1<swKv=1i!HUf;N=#4sk}x;Z5!<g~wT`Z9H|PkH0hhsP
zFhWA$n(#$aM{K9gGjnxPp0T$zY1q)jAX_bPVcV4;t0=kyInoW5xn7fXydy2T+NkJ+
zs*klrZY1b)6#8g(#Xl9iwrsDC{{7E(@Ce62IW}Q7jsw>@Uh(P(BkyD*t{eWte^8E_
zaWp=X_l`b)&q1!#Y8^~xVj@C5jZ{zeKYF1!cJ?CQLs&QB^s#EJ1D_B^n^yt^Lh5>p
zx2?>c7H{|YZg%=ty8*p5=!e-!2>35JFa-$2r4)nkGu>zT+5zQV3pG2tTrpQG7x-QK
zW~Uur(vX^^DFAJ(=8_SE`AqM$7FrQk8St?KSD9^|_Tzn!<9vE`2$hQMz<Su0`2<q)
zWW#_*YrJppK%hPf=+JS4MSQL<6W=2?!B}X4Ud+PXfSRdY3h=67`qpsCM$ay2_mmrY
z(0qKm#z_%`=Gwf#GRY90{@HU3wQAO_SNW6Od!6k`uOn83g9RFXII4Y9oKIH2k8rm{
zzQ1nr+2qQkrHRiMnLlia-&uvEJ?50bhUP+t|14;R<SmWeUdu)8UH|LA&sS!idK$PG
z*qN0+HCc9Al+erp;GFyZ`10hZtrMjQdVmU(_L0DL;FXC0ET89Dc)ZOX$W=A=0nq+1
zudXGzQ$6)K<$m5VVKwz-Aj?)S(lc5K(QEA~!v-Y8DNT1N6~W0hZM+miT#b1_D~|&~
z<7laFXKRO&5fYPF_rd=26GsKm{BpI4JHyb>Xsu-~S$V+%pQYEYxKrRQoZhyUhuyQ!
zbMtl}Fp@i^)jNEnDUKpb3i<VT<yk)dVs_sf2P5J?0H2o}Vte)PPv8Gx;}AZ00k}E;
z7;~NN@rCn|r;z4+kK?JHThW6C)B{Hi5xQzf1G!=y2oQ~9#(oV%#FrkGPjYC;<g|>`
zKr62Dw@eJ!KJy~fxVS0?3X$TU!Ts!O0!)3pDaF=eij6=vXfYG`+-I$|P>f~$cE-2r
zRHrH5aR_Qe3?KG7D$S>MXx2s^X$nv7i);q`PlTm7q1%>H$N<nS>L(p$mlH1L*52%K
z0zu>msm)mdN3CcXE0vQMtBXLp6F*v~-Z1oDkH7pyK86ej{oIV*b|I#><x3Y$xU1(S
zVdKS#jRh{7%*~`zJvZw%Cm3Or!td(s(A2O*tAFN#okSvh1D_z>t%@TMzxZN4DG~=*
zf&SlTqBkZdI~7;B;aMf$LPysI3R0$QgYf<)KKPfhK^wf?dl+vmy|G(LRpK(>4i8QE
z{lkHs5&O7!xp?({;3g5U%2~u3-^6erjspk*tzN*y$!=>b_L0D-l*9BQ*S(L00v`uq
zf5*?nmqf^U`RF9tzCiuR<9Cp|9$0_<86_Gu|16-4?*I@t3W4?j;g4<<i*Ogn(hLv-
zJ|nWQ*z|ers0cF=y`-q~q`Es9%jzZe=-H{K^upRcHzCoz2Ot0Y1^@eW5P0V|*+KxV
zBfxRspYx~w5wMaFCfdqp*XuB`1-h2PvxcF1I^9CNFR1eUS71Y@BMY|hPGIFyT$;TY
z(gI1<5=TYLvMk?MjjbU^BFo~rY!shJ(c_T;B0Gb8m@fT?%bLa-PTHSU_Ifd{J~E2q
zct)c-y6eG|P2-9}ackroLH5R5X)EM%Fwf>6wyv^SMTPo}JEGGV+o1Z-SJ$d~%j@oG
z_4qEA_E#-EMDhttWu+XrwJXs-x$to1-<56!cKelx9jklKKZs6T1G}z&fvnlzR}Ju#
z*~uTw%Jb~|nU|FE@}El&O!F(g-y?44UKLfVO8V7bpl>>z^Ua)vT71MdRkz>i)y3y}
zJ!`B-D)%dV*M8nc*dy<K<@`2!I&%YZt*_+|+X{Aj>rI-U%hLGQ#sZaAK_H3wRk1yo
z0(8rKNG{%M^z@Y9De?=t@BjM}l|1X#_lNC+T4u-J>Q{f*cD@ANyWL~mQI&VjcsZ-f
zZu*tg-%7%C|EHaX`r-vz+f@3)OVr}TfZ~5Vug2}q<c&=4-&U%YU*~`&u;RHjc<srp
zAP_*U%tIJJ(!xGTz#kqky_N!`x83?)a%Qp2<LZ?2Fy!BTGJ!r7oq#_x@bLD}6JJJE
zX&VsDsSSO`{yhEt|MqJ68>l<F`LDXMf7ji$>wliZD1LOQ@yV1XXb@O(*MO`Ae_*sb
z`x79Z*==NnvDf?S7Sy#DDSmyxoU#H^>KoL5+P4R9O#Q3P+)&E>YtF!;<ci++`dX8;
zF}eFe^9^RKu9~r-`THCMcnz)1e@SoHd2|18z$(cqfcPzDPkX<nFWGl)$>+?@8~smb
zrpr7~6IUJoML=rBUji`o(|mhR>*ao70pjNF!5*#rr7rPrCI0vHL-u-^g9zKY`X$jJ
z$3JYh_xl|9I~sVpZq@sad@abALf5bA`8oTa>i)m<cl>WM?=SpoH7@^)O3m-Vz#?t{
z3$+f>oc+W0cNLZXRTp*d4Q+wFF7FRpIc|L}eZ&3z-&!ywN@IWOc8%vz6I_31D3*5*
zYxX;Of5A>G`DQKofOL0wX_+Bwu0<tCBsGW6%}+4}3im6@Fj4hwxYS@JSuQ>-X@_;%
zblRSD>VGE)FYi?C85*7~3YJb?wFH5#UE1kov?$NqX_PDe^fOf=sQ>xI2Ufp%%8cD~
zIQMv?(?tC5Tl^^tZDOc%y}oXp@y%0;-8=nVzdGtlPkzXzsj&eGOv!_v(?$W*+Uj6F
zrQ5LPp~d>At(cFAEs2TsT)>A<XwxD+uKmwJ>f=ISdQYno;*|^|dc85I-Y}!Q>!Yvi
zd6S+k4?nJh0!ghiK-RbjS9%?U=XH}RRx0aMwYXemBv!>hF8<Yjmq7oyd(3g_2-^_~
zQs)rA)fUX8TNk;~0#;Mtx00YO>$LRPlBr)!d66!msiaXoNdV)&#jXy(_XTeflU#XB
zwh-9jum!{vkZh~{<Zk8;LIrMJ;v-$tfu-A;FN|PIlk2&{R&2zb2PZzc%AurR=nq&<
zh>XS}k-xuomMc>iwUY2xqP|sP#?KWI-BA!g68&g@*#8sjw75)*x>Oel%AmDqIVcZ4
zN>V5<01MD2o=+zKRBI@*A8SV%^)24q3->Iub$Oog@QW7tnqjc}GHo_oG{2xht<3)%
ztM$8?Vc(mobBGnI2l{ZU`<|Fpt?uyJ`=&|1tAFO%*3D|9{V(?31FWfSTNI9>Vxxm7
zRgoHy-Vv}+q)Q1sAiWnU0qGVHLX+N!bO=odMTmejkuJT1l+b(c{44Ce-RJ&y-*eA-
zZ@=&V-}|2HlO!`MbFMMx7-Nnx<|ybMcP4{VUD2Lyr^1z{KH<IzqTasogdq`v&B@i|
zhzxIAv7G*b{gBLp?eXS8?-&B7?IhNtmph83E)C9nF2EUN{qbk_tn>x_kx-;_ZuR{?
z#;zX|Ws*G|^;FG=Zcr;g7pfvYoq^bC78ZmxcBdDUEZ6)OE!Py5linZL|KF$lUow}9
z@@UAZb-7|%gE|_{<DkPl{;k5%iV`9qoumR?j*d5)o$yeaM}%MPgEkU08M;-t=;8)g
z&Z_3Yb8YaTPh>pEws%VKoW9kn?sd<$e$R<Lb*XV0u;AXxL+|93*#_*d1gVcvXU8m9
z*fx5iXm9qE55`zHIkeZ2%j8CNma2izKy=fiCDE#4Elz3G({bY5uV_El$ty9~x2)wO
zf$%5y>Z@L+O!HyczNrv~)QdjM^d%P_VP(I6_AiPM^oC4X;Cr@)DSZpzJU`MTRH;sP
zrvi#MTJfO`>#wk#l-R1~3(@d=(sc<!_vH#Bgh>B{B@E*5QogNTO+(3zkdY4F^oG&0
z<QAQ@4(xbDr<P&JwLv3#XrLW0`X%Syp5wtl5zp3kO?@c(l}^1MHZE_?I>X3xV05lc
zK`5NDSRzWd@}>;;?Bj~mxjdz%!X}u{Up}+5v%EF($oRk_g*(-1VGeBEZP*;geIps)
z@DTyY7mj#J)hR>THQY@Oo2<FTn)l+cli-PZGhgbx#R5EuT7d^^VT<>U--g=tV0wfn
zu8XXaceW=>uh_?Q>GJ%H=kPIDDeUli2l`0*mxKR9<Auw-0gx1`gfA~u{6leX2THJ}
zeU<r~TExYTL`o_fReUj#936Xq^<#TWz!7HpPIT%W@M%|E^gQyk_7ZqK93lxg68nQ!
zH)S}p-&3_;&%BD`f7waHBT~C^sn{b9y2g$ne5H`&(KV!PZ?LvHw`FI@w8DEneeS<c
zpKXe!+PIkDc>f3Q7hWPoaG!tkdOe`QW@&u}qH?iP!fCL(F&olH@|N%n<SHI|WG8Nc
zJf%7r*%k1{OD1)hDE(ZT^LjO5Y1|Uw^XdeLiTytJxaQgyxlH@komjc~f;;O9<X<^=
zao?R>{f9aFFWz2-wht0RlAnSB)x%ff<|Npk*bsi_ju_X3-v))B{Z9r8iEEs6*G<E-
zyMB^tr&3+|_?U<Ig#?``aGt)=cs-sqHWD0be;vPUIbeKv8L<p)VZaR=st#B#40vCI
zMzneQBT4~b4PR_!&W>ONlYBHX?>%KlOJ!&EOuR_^&Y;g<J=cW+4ey4bQ^D2#WL$qe
zuYeWR0Dtc<v`wDnh|)f9d@tafqh?pgsQP53Jv)|S>F4=GFtLkyIMjcwbSFL$JCDyN
z0pjz;O{Qud{nZfvvF#!fo@rtTnQnmlWHH~p^r)>a^@`~wB8WO&o;rPMLvF78RG|Nl
zC(j#@MWf1+4Z)Y&WN(M1RzxaW246k{0jJeDX?U2&z?t>Cy7bFL1JH<>mbF(d%my?<
zruuyRT4$iGiLuU^)B4Vl1@HH?uoKbABM;PsyYuzB)QydAyCrXrSU0Gn!+pA+Q^?}T
zJhEWMW4Mt1kvH<nzu5G;e}K&r2u%JReOPBRd(S|p?~iJatwsWlJT=zmRwv5QXCR|!
zku|AGfi}4^h1LfeUmu?4n(B9iXkglQX+Qp%BV=As{9l+e(51&b*RQHKIuZw}O23N)
z7r<vpwa@Y4vEv0o-MZKK7oT%q2j6{HfBD&6;Qvidwbz_c5`YI(=+&=kK6Pqcx35<&
zRsKd_HyQM(P4xN7G!cNm&Fb97ghAF}u)zBCD&|O}>CLHr)G8?}MPO4C<#0E_3PC;W
z?tfgr-#<C`wO$VtZ=xRV`MQ48eUM+udj{h4b`=jiaun~i^nNeyLNGcudduOsPz5c}
zCQ_~RBMMrubwsKq<HZLp`-L<joc{{t{Noc`xYWi>cP;k$-8f&s(DU4Rz)5je0|+)V
zTz&p=-3okASPbYm9A_XG@qi;d@!o}+_p~k?W8)9WH;)VLQqDmBUp$<v^6#Dw9y7i8
z$9{jk$JK|Pfr!lZm(bd-H22)}`F1lAvjl6n8{)QRhe=An`c599(Qi8Rqm~4Wx2|mb
z6fPKebyBpi*m}*AtX}L|>i(4rhrfFJ*WWk~c(+H5Z>~P4!8O+BhyAfU1O{e@`M)jC
z$REqIf7H~ZgI%7rTF33rAPaj?_s<I%UvcDouEc=w*g+J!Al`qs`KJcQ^zs>q8p{>y
z*Q{ncdV7v*Pkx@>TLJJJk^^wXQE_({d#%>ZD%+LqKftcqXaC#4z5sx|tC`48FiS9*
zT&J`XZ-;YI;dQ!kqI2M-@%cxdnci<)-_Z*v`7fsx_hN;CaOXx7tYrP6@GjsFuOMi5
z2I@rAi=q)rd}6pq_9rJ}hh+dx>Y+U^d~wCkEgkm;dMo}#k3L>Lf7$atZKQUd*fMeX
zf{w)PEaTg9GzqAGar)wvWSQy=q?5TWJ`(e3jiaw72IC$@emGKdzHqCZdXA6&veQXG
z$IUPCa30HlNPt((k&vLOND1(?xpjmc)8UxX>(f!u_psCa#2VH?+lfbZG&sl=7sOcd
zm*r1?Y~?R#KmKLU|FjVo>T*1U-F+`?^#yy34;k7IipPq-Il3%9u<(Uo7qhI>y2F7v
z(3^gOjIg7n#%?K9qRt)g*T*YIGKR+nGP}N?CRuHcEH*ipmoGEU3D=|UctY%*^*wSK
zoS!Zv&Z3?^&K{_7xlc&&vCJgMIu_SByh!l}mlSWQ4!FQEY-dCzGO|1l-@RMDf`>t_
zyDJ(KT@aH*O}#E=exz%YKt5t8a;rh--ZzMC5!7bDeR)BBI4(SgU9G<~LhZy+2algV
z$C1b|Aq)qayb?pcLa<^dr(w|;b8UqFORt^{?8XhVDrVE_cJmJlJ*Ceo@w=0RXaW=Q
z3+?pHb&U*1oIUHW8xA=MQX29sm+ZG*FDoiWxF@_soNyKA^nFM5%a_xazG2UA*SN6e
z4r_9$r2cpkP5Ex)0hHk_rC~5-8nc<OZeTEJN19VvyHqVrqjjU2WC!l6qGMJ6HOf~<
zN}9GY$X4H&o9YIB1|zx$1s-t5KIJ|!w`YcVck&#Sp?HHAwvW{={Wljro&&NSb$pH+
z_yBH<{DB+#c4mhs=eQ9FJIw%aV~G71Zj2{a{(ZPn72x#<iyPjt;yy<>;{F!rxZ&Qq
z=K^q7hZOy9dSq@pSnhhf(<CAT+8?3)iRSOxSV361s+tQPU54KAOCOxiT^3YX5ratH
zKr;5ze{1)|32To<ML5!>(tV_P`;K|#Rvw3z-^-Jx+csWMNMm1HUc)~3l8{Nc#)F{n
zaP)AVdQqEW7vw%UGi_{>yXeq2p@!SSYy9s?hipCzw|W<;Ot##lc8!tYP9S{V_AxP@
z#ZJOBKLXM&l}?8{TV_?Xf>`cAn>z1SwpnS3n{KY<8@AU8WbU}H<>Iy_r9EC%S0&1~
z4OwJ-&RMifZm?Z;Q`xRj(}>6@NG34X7P6=7=vZ4Ga=`D|OfIuY6TN5IuU(LE@AEv`
z`O%!JHR^it$fs6M8-SDQLO<ocU1E!JwD-l(YH?^i*tD3d^TV^wl(R0&^>*{ey|`1{
zuV!>?7y2o=7Z&HU#I?LAGl2HYy$V&=iH0j?%Ccta^l3<vwIGfo3DWa4tH&&gwelg=
z8WXHGk-XbcF33DqPnn$v;}$DgWj@Nsmpu9;9aF-=xK@~xh}kd7JK86spocZZ9s_W(
zTz#|;Zp^My{DyR&)t)_Q^R#(OkNGg)YZXMJKO|<=NDC<(`-;<g#MJJZwpe=f8T88A
z_@I!~Q@zFoM8L6(;F}6X4y^vX@Hcl&n^`)>Y{x(1JT)SMv>DL0;EN=qU^gw6*rji_
z>vH33zEyGSx_`yjc+9a$l4>CoD{qV}9=|T-oviT|^S-cq=uOzWPrFh-xM#Pz3~;DU
z*ddPVI<<z?7c3H*ysL&!A})1#;DAp4DFgiLFNK$CX3xb-f+TC!&0DSB2b$ioVxGHK
zyoq~UX;)f@To9{kz@V5XIeF;gS5>)p53emLTB{1uB8JRPxrUm6=NVRcbn^2*caPIj
zW|(sZvVpnBoW_;xCVmvx(#^>$@pv_s3vm7#j_*1uXCRE%smH<I$ilIl>QC=-0+TTW
z8U<`53M2D)(_ftdfoh&9UxbZeTjS<FBcKN3&j06e{=1e71Aw^0ui@TW@yG-7LO+aO
z8{uhi`r=?|@Y=DG!cV2K)}eC5Y9SU#$vqeEP=Qj5&J?}k*$Z9Es58**<>})>vlW)R
zUhDsPpbIlcTxXzfBcf-Z2ioq6&uR1WkI>RhNyDWeSDO<riQ#b1ouh-Txk9_S4N;}n
zv@QguV~9#DfF^$esF8>M`v9B(04&1-h<PRkJFY=AI*ngC8LdLRI$gvHzG|$v(9?%W
zxr&~|JMX!{xJi>*2{QG9M)(Fb4C{S%5xbQlcIqyt#d_!*`eH@Y(=VM}-CaSv(RX_B
zk6Q5352^jCi~7CNFJP{8d*avYYc7eafHvP+h`l!`%yUNMfL=W=K|K95&@bHC>+|sA
zuu{sP)e^PY;v<^pHcUU3`F283J9i0~`6K3G6o*Y(haYewDP^`r@H~z3PM+cXZ!-XS
z?QVRY_`6S~Z;Fj`N~1+2@u~}qqcmilS}b9*ZbiEN$Wln|)l@bCpOvL(b^znu)jt9l
zU-*4QMX9>RAqyem^+IW?5^+&%m8KId?rg@<vU^nigR;qI5e=Q|;?RU?{!+aOe*9;&
z`|nzC3ecz41$!|LJ_jg*!e&Z#rJ5p#bXp-VeWj^kyNh0{b0v1-qZ5Fj+YvCnxVEvq
zqU|_8kXsS|3`YiJaTkyNLb?y{hb!Tr?ne~=ViPWY>G)#T#?Fei&qE$Uj%G?_rJCx^
zEQFBPi_WQGETjV^ww<Fxz?dz+gzIgqzOm?Eni9_Te+SoJe7{rxWT;`S!i;_tv#ej*
zRBVk{Th`5CYCi+Tp!UBd)FRLoD>^-U0>JL=n0l03(=;+%GS^K2arnAP^|CxaY<YNl
zR5W-agYV7ep@nmBN&+3yC|Y7bD9<Z0j>8sWxVCoTaPgt{TXsRdqbDg1PR_3E5YnZf
z(Wfkn3wT*s(rk0W*V5tbWYT=9GGx4v`ycSt3BL)N(F`&dNfDx3sx@tI@Rh{eVcsq6
zh~VnZq$@Mhp3T+mdj@8@OTbrll3qsZ+PKNdfHH?2jw(S^d!0%gFuj(hy%y&5InGur
zEXi{s_mxrPGA?wuFH00EtkX=$oYZa~-BH!FCBLS9DCd=#icINtiVEQB&M{GR*DR2f
za10}Q@oDtAhy_}GXePny23nl7`vJ<_IozDn#+}#*qXAK4W00{LY?Kme4JYV&(?||x
zCQ>R5PU_R&FeMLz=g@k6Es0>=FsUXXGS5j*gK`^<=1GCMsN%K3pC)jE^~*%#v_FZ~
znD4RaOFw?I`a=%7=%x@I#qOBcYaPdKsOTQ^xHYvOTuV0L5OxvfQbrxWVkl{Sf|zR2
zeLB8EQ;=!Jq}nSh4NlWNbc=JyOoJ#ZQ>R@Xe=dF<VY!AHP-nm?OR|enEm(A+A0l%Y
z9E#VbSv8uuPvMU)fJi9xX<j(8b}93WU2gC9n+}317_4pQL@cj*RBR<Ev#a|h#4Zre
z(vv8lD>g5T{|rufk)N&&_4qm%5=yMY(5^)?*InV1p<uhj*y_e_T>cb%KR)ak*jNo`
z_t7u(!U@pXQx6SAms*0>+aA@>uSklW9<?NTOdR-%2U&XDK0@pDRi1$y0lM9j`$e|^
zR{ec+iy+`=cK?lT5qzh5ozueJR{**#T~iv>$I@*eY~`G67o?Fwk324iF7Iz1>{eI&
zu--%wJcmvcAFx6p0W7pS^22-;MW|cynYJC$74R_*M?8Ay4{_>JT{4#;_6AOlq1>Bl
zYDU&prIZ*+g^uLcc^O*0PHVC)-&Bh_)SHb}bX4U=k@QV$+@&}>-X<d}1E6VzoMm_7
z7nRF*l<bX{?R?fB9tJ=nFkOlc&DrT;LWMu#_Sj@B(h&|jFen4gtcNH(PtzopLa%c}
zK}@KA?OU5CdU+3?7wo*+1L4kDmWk|BDg6=KpQpUyt^yuotoWXfGtW^X=|zz;lB8h5
z*o7?P3tss2u7bo)0Ii$rM^p2o+A1a|tSEkkzFQqFD;MU(t6cQ#v#@(!Ycl5%(O^+9
z&F$2>0nemydP7#S2W3gUy(p0hy#>4ctjHSsP~(LN>YMNxhjgOn1W6kYgS7lUK?`lw
zRI<btc0;|mQHHYS$f|G-k}&4<@>j~kSykByKX4XT3J0yx%ncL9Ep5(HQ6r2)7(7S}
zp^_)hVvfZs>tl9^sKkMd^n!(gktx$>$R7UKC=U9o%kljZj?#uUXt9iSZe71M3IAJa
zLokJls&emud=4bMQG+XhZ@sVf$KJCxc=lH@sW7Xi&FaoRa;?&mQcB8#Z)B0KyCD<S
zVcdI?@=@J=mL_T)(vrw+iD%~X$W%7vR?s2Z@^+|MtiE-Pao%GMx3m}({HBPPEbEv~
zw2esitabup@Tx;8WY}`S9G+A8(JNvZqioZlV|yfF6m;zYW%1GI$OFFAVu|;v-Rin5
zIR+ZsPazb6*8;gZ)NG-=&~>qaUo-)t(jFU8Y8p7Fi6=D-f6&ALmL?V-VrgOkpoy1Q
znsEP<CPLNzKAMQYFKkA$D^0U`01TcsCSt!Ian9cpdiDU@*QY&ghU4Ff!X>9d`x$P6
zft;9NL$tL>aQEK3d0S0*tF+oefZw92QWPUn6)c=&DYD)qny+Ch0eMynS~Gp|#ZI_5
zd0K$jK&bq>R7GUeT0I$i5=)_^^nJz$b28c4xulYyW3u4c0hx-n23J{=mbgH0^3P>1
z6%?kZD^QEePWV|M8JzBQLk#MRDkFw}hjHZ%Mvuuj31&)?JRGxn(mV6TqF`|~o4oSH
zO&xdZXuU#B{?!&2)|??7U$fr(RG%Q~>8-6FD@g3|jYsc=GIfi+ficygvQ6cBs{{5;
zbGnn*34f?RSd!Ga`N4-u=JO45rS$ZV2>05aY;&rnA6??tdxh0v<Rqnpb#85?_E~~c
z!HkcDoL!}9G<w?83L0;#mxa5TcV-~`EHmZYq&OX^-PCk*s(lQszYeyv$_`Tkg6vgo
z^Y}`Iw6wZDVg|ZeV&-O-=<=6D0-(G++#ver9c41rKM(kagT=DTQ8(21CECr#7UbkQ
z;0tz*+^_4ihcfTwM#v~Y?7!~tZsVyx|DN#9v?^R1125Box~f^S2@v9sBd$#!3UM#w
zaH-$Q$cp?BMW;xCG@=L#qUawFBg8vS92U>iv|C&;Tlz$!XhYk>Ca?oT?F<qy@rN!%
zQy!wV4wrEw5~R0V@lK$5Cor7m_OwG2zte(#FZ6|(*{&1rdT$LYaj4Ixqxor^K}~Kc
zqTuT*p%QQTPZNE^odYi({tE+KH@ML#c?P;R>AquJ;gHJ#gM$w%9F%n)puoo5R$cyc
zLdw|%nvxKMYTTFFHSu0zRk_b`eGM571T0yOO}3&057M^qy(xNKx%OaHDCg6u4*h7o
zonMOEA#~C9@3Jb=avAg;h?tBY7-3|@OpeirCf-xL2^Yta^1|J{bF$#*o}g9i%My!s
z3k=64FhT4$nbBh0#VurT_I&=N??2uV+!@L`75qwzL2FpF;Ovyvr2Yw=h^5$p2SyPX
zrUB8!M}t@6Vl`5(vAgSVT)fx%i|Bill>a`W_r~}BYK@-2(tMkDjN|?)q87cn>h863
zI)17jO|v3V!QOgOC8C~q_;L|nG5mGof2)=@?po%afo$z@4{ZB}9ehq~EN4mzch4nP
zCZaRYR~zXGj>Md%Ht*Po{nfPE^3@f0uf@}G><XTN{#-&}xW8=)?-^LVTZrH{c=o9;
z9SFPWjlx&nRKgUL9aUxZU^*{zteWWU1+PUBrB$vf9*e=#vK4L=rx|U&VO-nQc3d(`
zD_cZ-IYA8LZ18@jtA8q|@boFfe||n2!!1co6{O%116Iqikt)_L<1eM?2XZU=2V8n2
zuqivRmCStD<GK2iMn?P8v5{8Wu4)vgnN`2THEl^@5AE}c!Rnxs)YGDR&z^uj-&<%Z
zG+$tR^}<Y4;oL*zoy?=LuMfjZkLTcGB@^zSal_SX5;vs#6V_Zn|3B~A3qGVIZC0+c
z!oO&nRX)6sq4HdHq2jQD`*t{{TxM~OjiUD%5;=$C*7EL039^iq84Ltunq=e5>8jc%
zv77cR5L1*QT<so47`2MY9JlmO*p(axeg2t|G@47ZQOTX^1RHCei0O&3`zR24p$~@c
z%uf#a+bonDnIuXJBV76`w-7&D#YB&bfy_y9R52%gYaSD{gJXvx>xW{2Cy<dk7C_M%
zRC;Q2x$WYO*h}P`SJ__>>VCaj;q%xL^k(+LzuSC;uVyh{4Df3M=HaF$qNgmeW|)1V
zHrB)aAOY}i<2hhE%B4A|0D{HKxA!nRkYDzVWu}zB(Y|5xuIJFUP2)&1ZJ)a{w1%zb
zL{FOG4CL%SA<(p|;T3W$_968QqybwG-P3klCQm8*gRT9CR~(9o9T?&&@VjiB*<%12
z7#5l{5CD!R7M#VcU*Hs<gCqGTIOKmPIF7y~hkAd2^Ff?#`Z)J~_!+3OYE5V2h_y!A
zi&k2hX=-(x=yXZZ(`#G(@Znuv*GJ~-K3$U+(&})e-(3m4ibq38@$WVpXd?nk_N9;V
zAJGa<m7K<uU{1SSPH)!F5VU<i1A#kdP^)?FKyX~kM9)M_Z}~4wE*yvdeV9B;s<a@2
z#pDn*)C@<f;2DUeXH$PqqiW6_$Oz~%zg9oLNFT^PPKe#Ss@!;7nXmqv*KPImI~MD2
zc7F#m;v7tjyx5cDw$RNaX$FL|(YTBBF6=b<xH|RMiJ7O{w%OliR{g+<^b#?>aqNkR
zVm=_>>=tj~J;qY2>-ZUH=$u^n14J8#X$6@qdk|1j>hJ#pwE0&AjuWb#Jk>*+NDc_>
z2d!jG(`CsuP2)nUN@3pI)5mGb&1Peod%;~NNi|tD99adwPE&wK7&72U{cKjts}K76
zFP+{02hsw8@GI92iqYfH7MvM*Hbl_Sn==rt8Aev@*>Oqerl<HhwT_jSoPlJ#u}j=S
zx+h@Hw1c%lExDvuaQ;v5sDGS?m$?z6!-j|ftil59Vp-Gtzr!Cc4#1E24St&*@oud{
z_sv7gUpA>7bT{<xvq?RxTZjP`-#GzTe2&e2@#d2A#djK?7@okgYHnX{Xv)9>z^eO0
z<s4r8$(%1;P_VA{AD0F7x6B96e8jUZ_**|<yS`u#l*9P7F#z+$kSXegm18?xQ@B?|
zy+giiW+E6)O{5R_)51F|i&hh|j&#J8y!7Ru)js17aUsKNVkK@mf7{t|^JjzV=|3h*
zd~;a5`8P^&1SV^&m3rTk><J?2_sJrVclh}6?)hbJYwLmbG#adAH_l?!ct^lir)h_)
zSm&zktVoJdQ|mzeXv@w{c&vC3!6=*rpA+pcL?R0y5HaI!Xj-tCI$K^v;;nwuRx6%o
zd7VbSE3eS<E-DL?2tU_}kDK~9ht!4}&Kz<gE4+Hr91Z1hohxn{u$e!<pj03aYu$J-
zD>jhfVynckE}qiQL9Vi0RMPc|s)l&n2zxu`fbwM8z*VIff+p?w>S{SDEN5x_V+?AQ
zmUzJK7&{akBmTIh&ymVM`vV+oM*~ZEY??W$CH$;<xVsD^*`)_={K5uJaE_2eF^U6K
z58}&MXY05mEk`)p6)!euFt#{h%13Cea+AXcvqQWJWUGdm3!dfOi>wTuu#F#mH7r;>
zetj&;kF}LQqoN$jTh48ET6j=gtp^i-|5A^%R^y?7nJL}3q~~Q6*KWOXzP_CyRcVyT
zmc!A<e}kH-wt_llG`nZs!Euv^XZd?eZH&CC-}lL%lOdh-Fjv7=lwH|;nO!Anqb1gG
z31tm|LLN(_U?USU>_$n-4)vQk>6OOt_dQDCp-!KH^DaOmt(Pf~=8@rz%2yAS%PM0>
zbI@5SUM)65-A;8CWE4>)jfdUf;bD(A1Pb--5w#BK5fzVe-J<_A*(w=7#L|<?n)O2^
zO&f^MQ_$7Lj9O{KkrhN_iWIs@V!7Ph#U%$W(1%2~blS%(kG9z0?OQ~x9GyBZ#p-NJ
z233#}K}`3!8hMbP^5B)ivRZw`gZa|*IjR{&Ei)Q)=5<2l1WW=jofx4oVI8p!3s3Hq
z*z#z@J3&jC2r>7E)Nx*0%^n2v&Vh}+RcyyAnStLi`_Ws%o`tfjqsekVy`Sdkv1cq8
zS)^_Xc`<xx8s08gX`ZRZ-4<?~TGWf?kLS1_Go{n^&u(ws+AqiZxge-S+L2ioZRr-r
z@3s)RL!8Yr#I5_Sr%HQPC{I#SvIYJg4>~N=GdtPR8c^%Z$W~Uw8!rzNgmRa~uH^UB
z)85>uQXHIXEAOgWN}p@71hP+Oj%Uw3e)QWlHNZ3*yK{)$6NRT>N5NTz8w1H|Ju_#Z
zHXxM%eXoPop1NqK(;3Lhj%^RK9sEo3S;Ecy8&Bdg{B-t{VhT6P^wiQY;;pV{p!+?W
z&^-;&dbiH)0f#0pT8ST-Iwis<Sk<m*VO0<A)AgJJj3fDIsi0kNcK~~w=gLl1Q!PbV
zAFdL&Dx;2MObb(Gqvs;<L+$MxsNRx94f==BFndds%aFq?S0ARw^%u@X#J=1MKYh15
zy!i6lD;b`A{Z1xM_h#=W?q;eXJS{RwmZz_T-j2&1l8gu^zO1Gn9%mow%UWSELa!)}
zJ=O4wFl)~=;p=`|t>Tt30M3$wWzcuF;xUUzGkRq0(waE#6>RJpal6=*+oVBcbv#Tu
zsFR`&diWbzxdwCBOQVfVtmt@5Ie$(SnxfWWn$}CVtvj}MV^h)A$s=}Y_1&LH7qy4o
zAyqcv(WR`3dllX462VNCV-LuNg;cIl#R<DVPN>>*Dc*yASwY+M8-_V=#0fHXG<B3M
zP2DGj4i+{kwpiqUZ||2dZZoJ|mlWYU!DsAS|Atql)EK*E%VFEKQGGwIS46NbQWZI`
z#VB9J*sc0KOhJ?p$(kGzk1UXYwlh_-&n*|0x~*VfilI&zMTAn!ZPb=sy^EROQ9<RB
z{V{1VU4%H^gU|%$N~$lhmB&j(P|-je_-W|-vfZ(u!6KUPFfKWxloFSv+w^gJLj7?&
z+5znO*?ShU5fBtbgW=;`0*3;4BX6o(OiA*HMS1m6LZ)duKQoF-ilx@hh=!)2-PKLg
zf;3Ng&celch{F4gU53TR24qt6%|vLC;t2m^+Y#uukRyv41+*^1^6B^hf1h+Osa*m?
zU}jM=#*Hz)ikw~>p07H_Tis*sAaJWjxw3ezY&j_kt+P<lHmrZEtx;TsPLQRQi-e%F
zMmi3b1#VjiXw*u#m!zx7*e>e_^9$*ig(;UNNFuTy%!ibB7CM^raxoM{7sQ#=Ifl7l
zikVk-bB_0h3eC%BZN2b@ViKJ9>>H~R+{N+w4vHp${E#)O8fiT`HjburV&V~#uac=6
zT+40TpVWUo%3;5)W4w=VJv8{_y{yRtg;k^xpQkDpW!nBb+bLVHWSkR%z-+>OKw-JV
z?}T)+W57(p#)8Ya;@0}lLM1e9{$NJw`u4DUX<S&`VFhgc<=DoicN67e4GW`l?!n9~
zZClk$O^Rsw(vINt9~du+Z9(NU-NDdzlzKl*tX*R`xwev|C^#l|zoy!YvcW+;ZbhaH
z*`FJwN^dNRKSX(WJe0sVwA|1{K*a+Kf3V!QrXF4BZtjWslD4X`Rc@5}kyq^smLLVA
znxlJYYR<JnYx#+WmB-$}RSua5mQ!Qt1Ddq(iOSMdN~CvYc{CtoasMe~8TI^69sFH*
z&hSX>mpfthfj(Z=whfk<D5^zZLR<aMK=*p~1w6+(ZO2h3qQ^CCV((LwoL%-0VfjKk
zPkVLS|5TY?4~!*j+Sr{tw+-4(zDw|1pSFA{nk@PBftpQr7=L9_s8RP*qIO5fe0FvP
z8R>rV$w*Y3T+zso|4H@~#=UKBf`rS@)$C`C^90qM1(VQkq+^^-NbX9QYgb2-5l@<E
zj>z;|QMRJ}x`a#uH4~@hjWi%xRMMRlnLqD$OJmJ43#OXWY@6@2)Frd+NV2yX8))NQ
z%B6SaVYkwdD!q1J28xua)HZKtfOG}XxdfAbQ*W}O6rQRN;hg%}=vR_2LN=+8-`D78
z)$~{gm8DDR;=F|?yx2@F-x}Z7mH*^fw}xf7ZFD@348+Oks(+Wfi8ZVURlp`Vjn95l
z(@M6dNDl~TdT9{9(RDB|Ngb@vxDd+NKN<JAv}8FW=2e{jy`J06=GlEl>Xt=?Z%drI
zcuPFn3_hIPaHhz05`Dr)bcZaimRyq2EOauq&<xK)uN{n$oweaqWEYm(rQWDbj@CRj
zQ0O7}z9Xff*hwKYR{70L%3bBSudcQ@p@6=Azq0zk2;py!0-FrlQtuk^;pIgaXJzI@
zbn9%#B9m8g@#a|$wLJ?EatZ0J?Pc63`}W=b&ZIXlb%qd0q{%GsV|ERwfIfM91bn!s
zNc=j-zPqs?5=fjKz{;7w=^Sn~r=6q&krAS=n)k;@RV)VHrmIzUNM&EV`vaQ&L&vky
zMyi8{j&50?vDAMCv7gs;DK4TUHeop~>$0JKhMeDZ%lkU;Wd$o0JWGupIy%NpFV5qk
zF(Jnz*nU^XQa_I{&v4{k(-k)@qYYmHd7A8&g`sI_q4V~LYC)dvR@xwz$``)_-%%9T
zmE4>3YgTZ7#~0_Ij-cI)?kPDxVi;wEO=iRHs~v(;b^c@t<f2Q}nihdnX}&ZPiJXym
z3bP%}s~ig%Z%|s1CI^4>+~T@z<|lT|6UV}?xkPVsTzR*?E6ML4tOJt+OqC@bo>*6e
zWG*^ysbN4bqjU$1xf;h!p_|mwZ|%m0cUStvdw?_g*7-k=aQX=Thpo8)kpf|>+1Gup
z`bs=g9)J$~=E+X#QT3kk<c7)8u}wr2{ek=DtoZleY}Uhj=_kHea`j75a&ZaO$Lho?
zq6%$Yk0_XNBthmM?{rw_tF_x5es=#ni_=N@^eu9*B?orHR{|NGKID9}w6CJjDx7(?
zg1%N+*%0odQza<fm5YE|2|vQ$o}`s3@M6hZ0EzUx^Q5TQ&qSqz))a}hE$61<J3iq2
zufCPc86Q90XfachopduN9%ZT~HlW^Ll>aO@5fgDqLIRF_J@25y3gLj97SK%H@#(>W
zi${7P)yIA*Vr=-{Kr7%><gw*Ha&p7+#<9&BaKvD@MIrwEcPqSr?ul<=4O{h_Kdl(g
zb_D)?E5^0wWEY-;E)iaS1iA>OyCk8OdRgrsc&##6%(OlqIBsY?HVFmRE@E?0oaQ%H
zYd#*ai*>U|VOAX*n;vLi(ZcN|fH=PJxqE&&?-?uZ_8$RKo0%`N#QqzV-64M^?~Kd~
z>NSYZ;wN#|5UvP&J;DafqHWI&TiTQao$(V7q)BpdILiZ+8JMfUVdmLtfkX>#y{6Sl
zmshS_dO}Bs%?@9whV~T$^)7wpoSbg>VZM%9{K9I2T2Nv?IREL-{?<{C3ahZE^A!1|
zhIyhzN2fwH!#093q$8C%^uz0vbNWD%2NN+H@Br&Ao#EzZ0eu8kCCZ{b5F!WM*ZrQT
zjp1(VQwYk;+NKjY6eJ&MUF{`@zp_g%Fk-BpP?Dspc3hyDOKnM9bC@~VHXz)VTN@4}
z1ayaeCL0I)6QraqJ<<uCR9Upsk(L$Rn`h-@+TGI`8yd%-tXpPLdM6#obTOOx{2>yv
zJ6|=F@l$xX)%ND+Zo?5P%QaH<z%MO}BMS049dX>@PDrPCOq^K4<Ki&wUhBEXt6fGu
z+nz|zLd#F=59?f2y52=+fb*SPtd-0v7rMvH_%YmSm6oh3d>s+|IsSX1^94?&>Um{V
zG;klMVlN<%{CkUARMY{S(C7(M^i-THEOoO9no*`|s^HGomV-=-km2LiL<X`uhD|t)
zF&=#sTV4D_t&W5II$xxq9(}t3@cxt?&`gZuz>$+>ayPHSeEBGH_3m#M6?kS3=I^|P
zR(GWponkyrDkVGRJ^<V&Y7PQvLoFXtdaVwW+EyG<3VCT%|7lA2=$8BMnGzTtVKX0q
z)Ibt&|2OX*OGv1tkTF0megxl*x~N7c>mR@c<_+*qD?k@EW1|j~xgO987|b5W6l0E#
z$iXsOW|&bgk*sywBXn}}7r+$k&Czm*?<-E}I&m5g#9ny{@3;tGi@ij`d6n@6q5N0p
z0RVvqev8APjjs>QmKQa6LoYHWcQau)dj0j7MenTQldVU;zihSVHOp2d7|HNOs<O^7
z6nONdhgpTW#qY@~81calGvy;hzt5(YqA2o1Afq@3w8d<={zd$Pb^98`KNpQnTFs+)
z3VD@^hK3Zwt?d>A+vyMC7Q}Nc##!_gP<eP{OT^uNy0qs6>1={e@jH)hw}dJ9%o*Om
z?5@G0j8jo^*%4x%izdU9*5$nr`81CVr;3|y0vjED^QE_Is&Hl#4T_H+zc(-FW?mm7
zg`WgzE?VpcXdk}X3xvq;<Ybyq9dJ~z^|v5Y@3qG+sB}?22-Ya2h#(6lNGp<q=^>2K
z3YV{dql9ZNL7*1=kYIM31S?OIZxfma5m_VM5<|`VLv9M;1+Zl@C#vKbG5fTtpGQCt
zzDbEokdkGTZxLBt{B($gnPI|M9YnM^LCWdyMk2hKIHSzC@2z(DC~(R))@zyOvwiZV
zXWV<WA18fqdsIiq_tWm}G%uR0x&`+*_JKYpf(V9QR(Yg<b8qXtPN$grnHHibYBEjS
zD4lgob&Zue+BlI+RpH$N!;h8*0S?BD2Q89h(8;ZND}-efHw<Ya5%WE(+o=Sq+66Fy
zwr+yeD@lsRGaS7C@dZDIs5-@d=aBisnzNdNoh7smcfp1^X(grkv=Ko1+vm7(H_qoV
z&xP6orEf!fHJRwrtk+w!_w1V8mG!YsaI{=rhSJlOp;so*r7M)EJ#`>H!{tvtEx6<I
zC!fCl-&tHQVv!yUx=P1P>d)-|#y<f3F`GCQVB1$yz}fKYkrJ*AIT993q*2=U^vsAP
zEONLWkio-kwV47xw2g+8t<T7vM{*cC8kiqU6J#}0KF~jR4t(eZZJKsFcQX29Cv?OL
zM5O#sW4Try8d6@GPAgw!(gB!xsVEbuxhFKgF-9b@eD77*!D(L+Y=IA1mX26{+F9u1
zKa?Tu!;ev7Y13$l?ibRooPkSn8{+`M%%5-7NZVBfGiCYw7w=!cOSCb_(h3Rl<shc!
zTZ`lCo}b~<J%Gda*qG=cEdgW`7cDj#L&8;!RVJ<4dHp1{7$Nk2T)a`bpRCO2=phg_
zJlaqjlG_W8oP8Uc<M4r^-eL$DIbCXMM+^K4OEBl5Y|K5*s4;q(X0Vd-_a8vm%&n!5
zKB}!$Li4^OpK=cEsY;r5(<LP8V|pdN`$u-Wxl+9XYM6jiJ$3V#Tw@?=!LrEcuJ1At
zL;+Xsk4L1gkdB7@qzXNHZM6+M8U$`9_{+D{o+EdZbyqaxY}je4_%kPE#Nv~BSTKD4
z2gRe`a$|HqJuA@lag!_xiLpyF>XB@Z>~&z@e0@IG6f;31;!Rk8@Pj=<re;c&b7VsB
zV3El!^a|iniLz}zVg<P9=dqYJ*58~*yZhXFP`{#m{JQ>moYo~QE)g+6h%OTm($OQs
z$S$f~mLUEJ@J?{Lj572dB$YQn#lM@8Ar*<?2{8AMAe4xGC(&__OM*urQrYwo2Ills
z*%H2^3S>=U_3ej_RxM-QPJ@h=^J(x5l)_-zHCRt%aX&9T>1pkA<XW*~ITFDl7b(lN
zfzS{E0J&tVY&x-L2t0kV^YU}guViXGF%$OT<E|tT>b;N?^&_t1Bc6Q0yAEfNrHK=x
zV>XT|YYI=&BZ@fawZuhGZ_B^-BgpxWc(DTsk~QDy_YM)k(&@>8nB;Ky$<9&K!-L!{
zeDU9XHX>l1Ls)0k%;jnW=<zkItvfUj%>jiC{_@OSZvAHts~16pj~FB*02zuHiKS0K
zh<Xgp4v3F@@;OQyTrhn-pD3dV2(E6F33wLQz)EbWO~fNWO7||o*C|M0>8UK`tm!74
ztpTV4^jS@#VG?GeU6&cwNzp|iWx50GX(GRg(qS&fX${sgoA|BdYkA^rwBNirj5dPB
z--^39?zqG(VqFCf-_!pdOqZ@#xr_z>KmS`=D(?I}?B+ss)^`zA{c0fgz+>#dmo~`q
z+_$R{?X3a?1TG6ew(!?}$^rp_+YIF%^BAw2=)_;%`L7D>{%db#?1YdJ5kDXc0H=WI
z=(8oF)QCTtreZg0a0x_LUQW^pz_rk8zz4Mmhad3Mp}5adF{^PvcK+Nppm;fCsI9$`
ztf&2m(R3#zBgwT%s4cY%Dn^nt)aonws&080NN&C@q-fZ{nnhiId$C00S!}d_H-mae
z<?>nt)<ZbOKds4HW_Gt#!>{(Z_BdkmP@KHSm1NIF{OK#DHf;FX%Ec!@2yH(QLOVZK
zC_?z3=Lu*LUfd3rL`)Z~Sp0M)+j%%X9KJqr211CvJgyCG+!4FvIaX*ehT38S!U@Wq
z^*L969E9ior1ADB_HuHl!8iJ}y8cHPo57)?(tj~sSjFkWC4jG!$v{$zt^@d^e8n<_
zQ9`0^lr`Nn_X!wCo1Mc2hG$w9T}OV61!f3k5)fBmp66Jwx)6`7e3sz%@&REXgns-p
zM8iy#<dr03)F^2vP!iH4)UJI`A18PySIY8~Bx)#^F!c+zvI|5nOQ=m3Y!UaZL`Uvj
zKb^nEorD%}A&~FVe2IPSH+!oTEGa6jCC_4Zww2tk_GI+b<iL{_zVPK5AVI1B7Q|Tf
zBWpXb!EFPGkUD&@kKc0j;=g&}>gXc6+18iNLmY|slWlDjTmfD^PLL$dX|w^w#!y)8
z?YS&sX;X22jf;K!GIAdmF}k^Su+d7;6uT^P{0kku>finah06K>s|aYNpu7Izxsrxt
zS1d1OzvTe~Tn(ZEWHd3%1eZw22wV-iImL`bbAkJSWJ`A88DzkG#HYfSXH7Awm2zK9
zfdV_Zb%wTTtREUCBvX;o*vTauWnx7E$(K3=O!G-KR<T7=?#0)<!w3Ze2pUj<WKB<R
zD3Q<*N|d~s`h>m#KQ1=L^m(9GUI$6!Y^elYT;O|sXCT8u%t>H{RDQe+2VXH$f(V=b
zCQxV6@n8>g?8TC~&a{dda9zjJ^`h^6RoDG#ckRd9PuG)zNH6`H7k*{MJyo;)X>1Vi
z4R<AeSY{122)N@66ic+9ne{ak{eE?I^#-uLq>YZv@(q0L69;V_@k7oJ23#iMoL~%x
z9>3<=ouu*q9a(w-40;Sm=b*bFGBt@PB0^<gqXBT*_;Eav&d`=DATBDEOuoGpTgwd2
zO2We`Np=v_XO8?F1r!Vl5O_eQVa5ae4P60JU4fBtZP;uxN8b&X8~sfSThZ7W9>CIY
z5aDZ>vOPiWQ`xoy+2@6zv7fbaJ5*!)$;et96NXd6xB{N%9{HJWP)NP}0nsycR1eyD
z&(f}aUq*vozP<4loDrg|#^?VAkcO7n3n66#OdIT&J7ouPj5N-6i7gMwP`U3`*t5!2
z2N#ivy&7P-$Yuh!TJAg|(rr6~t>y3I!d7eXQn%sz>Iy|;F$x~?)Be-RN8=f3qk99x
zS<iCAbc5Y7m4<0lGnRZb%|TXs+Wznl<6=QxH*9Ps^30FGW{y7nV~5{Di!)sW@&1o(
zdL7i@uGeyuH$)oF9M)-E)&?=sot@8};94=AhA0zLF5<o!W#UF%wz)OQB$u<wyVru$
z5F$es&lbB6e$ve$RTFdEofd05na-(h&NGNDd~2*DI_S0ghLKZZqseo=oQdhfp2Qg_
zLhTr*b6JS|q_i4HZIR^UG2~VFD`cIfe;twXCrbw;ok!Rm33$aCI3y$`B%+ulAm;wz
zsh1x`5t<_3^4R;Y1G|quP!!{HDtwy60oZ$A=99sJ+D1?E1k|F`Emykb^Pa>@0Xzc2
zBfygJA>x%J??=ak`94w&syQxmB=U4PadrpzZPWn35S}_R5l+LbfO<xTbApOi%2o_<
zvC~4q%90L9>|MMm5zg|{MCrL#?<DkHpI`eLVV_z>;xPv^Y~ayACYo{Ofg2&N@(O**
zWQ1x@+WZcf`0v(b#()0SZDQZWa%oI6<U&(^OksL<c%NUfb}2dBl08-aVGsV49CdZ4
zf-jdOL^Qsj^<IgBv*QS(q(lHqZWOofz<d!zv$xyY5biC|H^15i^;<~S84S$Yu`Lr6
zc}SLZ)4t(YEhfwv702UT75|yX<_H|WC&~p$)(dZvi~&0-K2dm>S7YJ)3f5S*m`NwT
z>D~U#$x*yWG}Ci=NF$>Rap(I&=E-9Jq3%KRVRLU*ifCF@0(iTuXIhAw*S#-)yJ9P1
zCnQ7k+6wir`_snr?J_zO5qZum^GfDxrY%(uO7=UX6=-&>JlQ>FPK<Jtp14c9^FtPF
zvc5S8oA2f7EI7_FEm6z5kqnCr6&K3ci1CE=NLOi3$RUKpH5XNXBzKLsN4e=(Y$S%n
zi~jyJO)AOnc0+cpbGt{Bf@Yk$*3`?p=Q@=7g(J6_N?cGTdeOrkX7@8g-Ab!t#2mbe
z{_n&8e>wA+;rU14$la=!kYrPMljI)QS@B6bSKJDFA@@+(idvh}snS87`K-91yJE+Q
zck$Q*p7rEgIay!&^wNdlM)P_@-7GnCj0M)s5he><WVbP0)`q#Ykr;Hj^U=5CTORYt
zjRVrABR0ttotG_Y?QV89YB|9%imYhTpP_zcr()zO<C?{szEe*yTCn)&LJGOi6=AE>
z@y_caYwguy)|=uwzrt_{9K9U3={|xlV|mRVHmb{yd`JOpKn*a16Om~H(l4N7Apxa8
zLL$N*5bD4MPkG$BB!Nn6NN@p{K%`W-El_&N9GMePnfvIGM4v1VWD+P<EM>|#`ym&H
z$N4guyuu1Nx6ZM0Cl$FBIbLFl-THd9n@x?!0_v7$Q~MPYA}3*v%2s5txnEx<_Gbs>
zRyrmi={R`=u6B>VCv6)ofv8_Gor1G&0m*kip)?w%VJ6!C5MA^)#)YVl$bf2AMPfK>
zo1)1rc%z2TH=(GM53q|24fmipByp0d@OhvrX;d1rpm>B`Hc3mWc`;#CBEY7tQt;Y)
z=!`AZL9xa?{GtRGN<jms+Ru(|1FRq3YqnQ#)=T~TB3zTk;6S)!v)5VI*1#`M=GU`r
zT=2vZe|OBugH7SqCJ){*aC>5XX8$U0I*pV;)sk+3v(UTYv2QB3HaYOtMi?AOVl6q)
zLFo@>OevJQ9AeHuNJl&y#_Pb%jVI)+Nl#YT!#{L=X2LrjVog#s=pI4`$EBW18Kh&s
zR5a+ZQ1WGdMd^2H74=>5#c;Fljklk=y#j#`225gzYrabN*C*OlDz3E&b);fyuj=0O
ztG0^FZBR7ma3=ZoS#47s9|`=l;f>=>zzSb~gYjm)H($#P6KAg}l;xTJ_fcL%Du&|@
z-ij&7HDD_AyBxv<1KQa84>)UQV8HW+#{?zTmdA2teIFIr!a{zdtkR3*CXKW~$;lny
z`CbGqrA^9nM%E76cuTg-sm5w{qJ!$MVdrHCn8s(-3zLyp&?yfJl!O!OU&b-sei&Tu
z%`Xc)0$S&D8z<uar-^olSH0~0Gxhi#eyx^edFJz&@471zPs#NK?DHgV8$z}m&Okqh
zYhJ$`kvUp=$h?M%J4Agyk@^*jDLQ!&`UAxL0V^qAcuoeo1iFYM##&afVjP*;oor&{
z8#OxlCv>v!Wc*Wkg8==E?7N|zHn<R|`y&ZyaZGGXtpt*AV^O$Gn`rtrpiIy~gr$l|
zrJ|j0w=fs{1n!ey4Zz+!$|TgL>1PR`)NbmX+?2{Jp(-Sgmj6pMKLt=d*P`wiK<67g
zT+?Imy-yjuZz>9y@<}?OVjD_`lm!zRUy?%fWPtp&bd1aL?LU;`Yq)>`S<<sus`HgK
zWAh<YK;CtD?&OE|p-4?%I;2BFrgrKJ=70y1knetshd}B=GcEy$AyJgZy(lfp#9r+v
zD9J0lhL_x3c@Pn;$OuPRtHjvD1fZ0Y?(A&Bd%Y{l#D-I9wQ9XOJavH^cy$?c86hof
z!5y{_Wb;V@uX_m#+co<LGW9nVB)&2N5~QjMKxG)loz!^y(H4iq@4kQ`MfLWqECZ3+
zSlRb#sTqN<0WDvyDqo*bB;j$oz5rg$;ZjqKHojdiqw(?v+!#va(mVR7@~PWH)r=Yv
z?n*|l$NdkcB@!N~J<Fy8uim0dZ$&nQPx=*IKLfRbPcP3Uq!q`NxhhY*Y(vksZVR3p
zD<D7yuRSK8ldIX6K-Yb;uV<gD-)gCJ*NGU^0qy&_f6f!S6e49nILEH486h$U&?WuD
zZJAlm7xtJD000nxVoM;<I)}u*RQOinY(81f<oR09VpqBHVLgvS7Z-ypg=B;B^(lo$
zGL2dKS+*yYfW$;tI0+OYCDlj)7KRxmsHhs>f6H<!YN!NTj_(6dTrb|=7<IoIC`yXt
z(wG$l>Wy9p5~cv+77-5wtBGk4+XA_6u^5HS68e&Q4e}(1@tLw-K((PGbMI48256iA
z`Kl6MeQd*QS9^s%HIR?Q5j@8wR78ab6oEI)`Q~V<9rzrM{3Jo-)OkUw-PAF^jEB3A
z1jvIuWtdO-KyA%bK`SAlO#9x<NEBhiXtji}%00q@HdEUvW;*u$KvP%Aj<9DEQ7ZnH
z{w2zIhJfJ}8EzZL?4J@Be;t^t&&qlULqH**5@iVV!<>M8sVu`C>K^qWwOo0B=Vk4H
z)`lm$&*6+yH`NG{xs|4-#*fK3*(4=P3@UAb#mu@$=|4rm7g+h_ZGMI0I*Pl8j@pXw
zos7U&i4N|7XYu}V6nyYcA*UO|BX{C#`=7euhS`KTvZs+`B?t!AMtNV{>gXQYjoxhX
z>^Qv!8&tw3ZNo14u2ynugO?w$vMTQ+Wr@g`C9!`AWqq=N9Va^=@iDO>5s^O~*R_C`
zR|B|6rNS67SW3nar5l}_nKt3MLG4RelL4@9g_A;n!gVLFp#wmGx^~mVEWYg0_;&eq
zp$;oet-Lk>x%;#4N6C=)rW$H~P94??3}CjHQ?a=TUWiL<tV4e3;7hIapih`IN47mB
ziM!z&53pCuNmG=#F$M<oAZ%+QsGnS9#U!sgM~Tu7)XLoi_(66-%<T>azz7+Xl5R%a
z1t3;0bGzPq5!5|w+0iU)A+c<Xs$iz<gY<wJnu}A+scl?BxwlXnU~JXwY-HgoG16D>
z_C3Z$Qf0u@G>=hDoK<~okJ1VogZ2uwZ#|eKf*4%1Pm?MZ$y_PU;U3FZn64_TXe&1^
zg^WH-;I?8@=y+<9ro=vq6l(9Yi11h%d?yvXc`vTUUxLh`@NTSC9Yl!4zKDzJqMVv6
z#cM9U=K<h*y8bei_aNQVx0{q9ZcNt#+H~2rqh0~EN~2Q0H$unim5rO#{r%rRE4vq8
zcv%l8gYo$uOGT6nX~+eL{wV$TH`m69$RH(-34zKiU;U;ocU81YCR#wkl<$5Jmh7Us
z_EbhN({$6nd*)6<iRLIw+4yNj*~>Io`P-1J2q2gGgRpz;A|pmTtc`+MvJKqxFQ2CQ
z72)e9E$8l&C-LsJ%??dUdvb&(uuoqrj32bBRr3bb580wo9K^IA1Gp~90T^*f>aKqS
z5&bB*@M+>~T^Hn4K)W_;MxB{?iBwop%9HzdBpN=q5K%ty?|#kiOO*a@m=wU9B?$|X
zI}#SeK%Lk^`8fb*fMVu}fI-B(SG%$2Gf?-n^j4A97p7|+b~pH9EB5d;%-G3z`&>F4
z<4ZK;go0ClND?tnq<u`hvhgF8w@Xm!M_sUCAywNfP*khlBO=xSVrq}Yq||m`g{7<n
z-ZjkT-^m*XOjzvzjoaZboQpkH0)D`dG1mh*F+%y0NUNJG<kvE)xgvSXn}Ka=vQpkj
z8;p`yG@LXoga|3DC~G3)kp7>@NVT%ZP9JwH5BdgLrdG9neJ@mPf_$8TPi)BS>p=nz
zw_|QLV_I{NXqavK+N;^zLpE}R-C!C^o`8`v3f&TI;eB@yEZz5jG>~y2WsR=4<7}IC
z;6M&@wbsN@OtH3Yfody?{a%Z$O;}FsrpT?Lx?r}^a78oXA5(ePT8I=T0|Tyxmy(e3
zkz7dk{iaOB1DCzN%{KdFQduwes~_V*R4Vd#NZv@B4k)K~O9~nNAWkOQ-yf*zF7cF4
z??z1+ei+GmYL~=lOGchF2yky+yBk4w^-@UZ#r&JIQ{!AVWA!gDejh!+ll)=<NsGGy
zPrN2+lqBEY;-5<VF_4hmADL}CVya?-(uv*7FAkC~vm)Zo8E?HE2h|PuHvTkyj4%?S
zi+Lw>1$dHlM#2_Mi?*t-5H$^x!z%%QA~72*W^I?BlmZDQhp^HxtDoJrgZ(&d_@Y%p
z5_sfUlQ6Wn(uholA>dY3I9Y*wOW@^k(fDQbtm%jKDTDD>GEe(s>_|sN5)&SF(0%&z
zBU)r1UW;KM&>s7uYQOptRpXyWqw?H2f22`>W{wj0vW}d%%T5J~{nnAk)QsFUz|YEm
zf&4HDxC4JqNKw)Hn0nB%EEhvYt99OoqsYy1_GNZfCFUIAj+Lo|_l_Zj35{cK$+9>7
zBJ$bCSw6c630K>Z!)~f4KkwSfIPZsAM<5V=MMR0&;`iS~<j!umylAxaNJ(FkD~H=s
zcj*1m3p~Ot<h<YWdyEnrEgyb7zo~$_Loq+8am=^L0(1HIr+L|jazz()7?lTYzKO_N
z#f~nxIP?WNIL9^e4LNlkx+rqqyQ$OA7|pU{p1x(SKTBoH%2e)q$JiuxZ)r5uQph;J
zoY#k%-hy#(;i_Zsu&DfLCroI-!i<uyT4sq72oLks*nS&1&nF7>P<p5AB}%6^<1_`f
z0r7q&1Vxvs9#Id@S@Kv<o0bQ78o>0|D^EW-Bn{-wyBH<qm+4bf?MB!1{y*(q{a0G|
z8BdO<_Uz=P>)M#6Sz@-<(Hv%6HAsYrH93tWuAy711SxfGf~LMPm6w1ZS+drirb-r%
zqeiKX(FCc$qS32dfu>z_hDb6s5JG?@z968W0`ewiUm)jf|G<7)e!Ay8&%K}Lc|OnQ
z``jPC-*fLCGg5Ag=jBDM%mDY(+#BM9;yngd?Gd@{h589e<nHv9N|CQgnay0H@T&!R
zB?<rxY}ZuFoFC@ZkMqL2RFeC2>~(ER&Atgsb8h&+d|SlIkrVGZM>3#Zfr|Bnc$^|!
z-J|Z<=FOL1HZ?GehGB_0Y1I+|#Umtryv++kvt}(S-<2{OiWH~!oJ&(MB4!7qnR1Dt
zqGvb1jlDv?=QL_zt_p>nv$QxhYg;Mf8;@Fb9&Eq6PnYTs*^}?CQ2;UvpP`-AvvB}J
zmpTx-*#4-Af5<dMq>OK_9`L%KuA|w=+R2itsB6oAT#PjWa41WWg2A`!-a!AtliSV<
zg!fBV+r}XgM@LMoI(Gl*x@8CSr9+X;%a$$kkC^EW_J_RD93o#MGb3fTxXIUD2#?f?
zF%uKHc2|I5yu~o>`sQ0bJFAnHp<5mZ*`*v8xkA%64X}$?@#@hqlC77{RQeFj@5=aN
zLRtcme(sg|wZ#ZJ^9r$X+(}3kk<(^1(0L>$Tfkz~H3swD@()LCtfX2gJu96uAexui
z;*}<S00hA>hGe*Dao+?>N-Rvs_W-PwC4Z`_NloII3Auy&@91PTP&ounK5UfQUfjJx
zV-v#aPMWR+)%@}z$YRH_v{^VBE7M@c<=V(zp={a%H{NOJx&-%YZltk#pbh~O5?l=C
zhfl;@^1P#j!5gN=)pV$%xvj`2yxHXG4r=sO7|Q7E$zD4#g(EX3OKphVD<{~26cDXc
zev%F_OC`8cxbkNP^7vtAzk9jx$lY!w|BcQ^-%u}>E!^*qlqR*sUolXo7H7i9+Mc6o
z1aKDJ5r6%cdYR+qGL?nL=Jam=A!`A6dtZ?OQV`AUAHcOnCZ4ZBDzahT*ZS3r2$jX;
zrjbX&q^A0c1%=~@!g+z6UxSuHYZj)Nm7$~F{n1h;jOUu7`oRuA)&+om<{8~8T(D-g
zMfa@fIkIJ*kv-8(t@QoVk`R?93y%;plo7$|di)`qtC1zu)3)g8XM^X-)1iL%H4@OV
zXo=9`j0vQ`T*ow5ch4;OCM*fu$Vy=0ceY1WEGkYBsFKIjXi7w^8|<01Mxb~`E64#m
z-4?U{#GXt$2m>uu`9oH2i#w(;PApawpuvA_ESAADt2~l{1bWrnA6*0+wNLciZGaMx
zM5Qlj$6~{RVj)6E5jtLRx(cK$FStGB>O>mVH2Aa(?$};`Q#!{gw;sMvUGhCl8ZM|6
zz$t#PfYICQNQu`?kO-qIOyr#$?5(vh36Y6Yf==k+pMZfFTU997nw*sbA{UNt;xv+e
zzAZ-J5+LwUw0u7PP3L>Dn!qBSbG6`TFd_n<W{;XN-mg@+fF&KUU3b<Ie8;;Jx@>~L
zp<6D`(|Nma%m>)^ocrBCAAgf5(wmtjspT*q9g7$gf@$=O!{1wxwP!)4YZs0`x}=JB
z0TeW00sp3sPB}cvUS4<*2IqD)QwK~`7a4R6%*o>FQp^q`TYFtNV#(oc(`}8$!*%ND
zVDN}efR;4`Gyzo<I5W39!W3p0@UgqPNgc!eb;WxC7xXOE|1jP53-qZyLmzp;7?;Ar
zJTNOUN87dOqs*%WJGyWS(U&nzR-j%EWj?Te!bqr;2_;3&_f5h&WnNfIuQ!MV51b=d
zY$@XL0rRxnyFtSL3_Q|oQgnqIz&oXwH2miwyrmsJEm05ty+TO<FBLFg_xkLIye}AU
z0gOyi7Z~rYM$&M@>OUMCpfA4*W@nP3BcG|ORFu8TY)X5{Lhal#c0See!6a8xUe^C6
zHRG37)d5tODDMv~*79`cq@ktEMEm4dxYwp;idMk~R65ije|B~5F?a6+XTd3$QrEYC
zD^LF0f1zxx@yfI_`m29@-J^~BsQLTSiG7<m#p|ED{)>&c%eT_#e^VuuvC2_O*&+t}
z>ZQ8lzi~Iey-@P-)UGdPz*flT;AgF3$y{&7%=+h-=M?-eRS+jpjf%_9{dCa1bGGxU
z>MdCw!T;$Q`d>GLee2Ihx|ZvXnS+%4?}jkS9l0N0maP_jh29&UL|6UE$R2T|^nSa4
z$}2S7+gTaZ%+I~FFHBvbzt~#a6T-x4vq(JAdTV00N_)mF&=nTH^ZbGT7nba_@Y8j!
jO>WA}=4(oCfr)mS!NCY~2*><muT{*|h%2aZPYwSDwm-x9

diff --git a/plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_navi_c.jpg b/plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_navi_c.jpg
deleted file mode 100644
index 45dfa9b0fb36545f509c40fbaa24b8bae5b6b848..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12037
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
I&i%^&0D*D8iU0rr

diff --git a/plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_navi_c_2.jpg b/plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_navi_c_2.jpg
deleted file mode 100644
index 370be75fbf5c5c526204395dad38430c612b5c29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12833
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
I+s*9%0H<Xz$p8QV

diff --git a/plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_navi_f.jpg b/plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_navi_f.jpg
deleted file mode 100644
index 03aa210af492c94758f37e3b97fb4d7bc083265f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13195
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
ACjbBd

diff --git a/plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_navi_f_2.jpg b/plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_navi_f_2.jpg
deleted file mode 100644
index a97faac17484148ff1fd686602f98c03998002a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14030
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

diff --git a/plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_navi_h.jpg b/plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_navi_h.jpg
deleted file mode 100644
index 4af8e0443e220d117e03991eed54567413cb6942..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12273
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
BqObq}

diff --git a/plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_navi_h_2.jpg b/plugins/opSkinClassicPlugin/web/images/003_openpne_yellow/skin_navi_h_2.jpg
deleted file mode 100644
index b13b928701b20d5a06eb755ce6710cf136755b50..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12557
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

diff --git a/plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_after_header.jpg b/plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_after_header.jpg
deleted file mode 100644
index 526460637f24573cd50cbc5073d74be91a664d44..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 23538
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
I_s_)t0R9ou=>Px#

diff --git a/plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_after_header_2.jpg b/plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_after_header_2.jpg
deleted file mode 100644
index db964143b3a45730221ffb36320dc8fcdac2ff7e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 28872
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
Nwj8A9r~h~9e*gjrU!(v4

diff --git a/plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_before_header.jpg b/plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_before_header.jpg
deleted file mode 100644
index f47a7c4bfb9162f237711597614ea4e795a1aaa8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15176
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
T=mQZd=>Km2U$+Cz-SmF}I@DBg

diff --git a/plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_login.jpg b/plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_login.jpg
deleted file mode 100644
index 9ed6a128e738b9bcea1baef52438247d6878f654..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 44990
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

diff --git a/plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_login_open.jpg b/plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_login_open.jpg
deleted file mode 100644
index e6988046759f6e3432c9d325c978794b64d025fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 46386
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
CCoD?<

diff --git a/plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_navi_c.jpg b/plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_navi_c.jpg
deleted file mode 100644
index ff35db0a69948ec8332538ada1aedff99bbed6ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12188
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

diff --git a/plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_navi_c_2.jpg b/plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_navi_c_2.jpg
deleted file mode 100644
index 6da63201e99cbe9e45b51fd046c232239b295538..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12809
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
W;uL1)b7@#f1+AknOmP{X=Kcq`;1^r~

diff --git a/plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_navi_f.jpg b/plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_navi_f.jpg
deleted file mode 100644
index 48a419162ad050024c92db135d2290d0b0595b3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13180
zcmeHtbx>T*w(sB;WYEFgEjT0uf_u=xVS)#@;Fci4WpGPKfFJ`50fGmI!Aa180Ko=G
zupmK#-uce?zEgGU-SfwL@6^5TRh>0evuF42?%myMt>160?zx-4TLqA5s%oeLFfaiC
zd-Mlzw+8?!``Nh$0WbjA002M_U335-QLy*4bpY6Rqf0RE76H)!%zp?L`WF^9`Wp)y
z2m24f!NvKT;Ns%p;p5@q5)cp)5)j<`&w_!4g@uESLx77*KuknHL`+J87E;o`Rr>RC
z@9%g2x!phR?z#a$d;lZn7c2}Q027FT1;n`P2h^a4jUEXG26~`>3JxwN9u_t}1_8!j
z^4AmetkGk}#Ule?U}Ion<DiFxje&&&0AT%bhYJ9bQ%q;F8c`eLiLg=X+fXTZv%eEn
z#7}<-HK?;yGNb{bJHW&u!NJ1B1>pVhM)bRZSmYGgtRm2Nw&_!bCDR=CI9v+)Hr_^u
zbyP1Wd)Pz`d??qB6eAmO@!0Ra0`6h`tqBky54cJA*xWhnW7Y^h6RNDP4!9SU47A+5
z?Yi+-MxKPXA}^y4Dh`Tly)qY`(q<4TrJevDKYOmSE-O6PZFQBc#gM(w|Dzb{-NH`v
z&BaD!%dOB%aHRIsNP1HKY*VPC*a1f4p5bfnVZtYRs?&SJc|P5DE{OCJ%C2!J-_jX}
zwi+Z#pvyUa9o~%kEfKwc|7WqLz^oL}uZ+KHXJr@VNlB`1@-!GN2~X+jk}fq{b+?%t
zn}^#kEzoBcj~jY*X*`mZ_gN0W{NZfo{QHl0{-1PhCdOd5G{>do*PaEGpOCn`9ip;w
zPHB{WA(-KT8eV!w-kogd)vjUpW9=$?w}nQ_toq~iaBIC3uS$N|T6lVJVEAU+0nXG^
z{qzaf*3i;>YL|kTOO3y3YmVxU6%?@hWSYS|Xnt^)#~xU~SFHs31?5FO+>%H19V=TP
zrElIaw|ca{eE#vjt?S|34W_L+QHz?TiuhaaTIAVd*siu;Wj}^nK>*j2P5f+Z^enz=
zG5@vf<Nw1-`d8>bTYC_6E)k!;?6Ik=dy*X9RgYt0Zddb!g~)!fRWyJ{`2)MrlF*dt
z<)0dzbNwGy(!avA>K&yATdTFRcLVs?A_`qkZ_@bMrWswl0Tx`#!x^oLoG<Ch*8I~4
z|8l#A{|it0S19RU;s2Z&B8W%hw)V{yt@;$#8<5()m*BbFUBfuc1<3>L*CRjyd^FU2
z%$EDp?Hcp{-*nRdE&U7RrHCB3QgF5{kHi&i)7?ba6T&|ZnioE%9&YxrKhTSRs#@7%
zRa*BK>{ieH%aQcIU;p-F-l@K(d4h8XM#^^pY2@w|3)rvh!OS|KNvA!7+b3EJ6U{aI
zoT-1|uH*k#DE(g>fEJfsQb>OPut&2`G52po7i0mmszzk4oD8SleJSr@CYvb`%{9&f
zVSkdNtHgg7mHsOXAZK7Oul^9#%+ob#v|)4ySj^0Sg$^kM|DbnpiSQr6fZnP9`TU#~
zA*^>`ZZ_LvEyah8J-=)E#?V2RF|dspvO^yH_Qx5LpeC0f=f1f39e{@;7Ps3PulHK^
zz^`#0)i&XzNvWkX30gT$NQe<+h1fGdTpct6R<7zy?C$_p;Y#pR)%mV7dJD^^%q9Ud
zTAl|TO=jS1jd18ymi?_l1mqM684Ip7D0<TcFUmdD%-Uwo^VRN^;Wn_738iZukdzWq
z)(4M1Z&`mGKuu59gwa3*ym#<uU|1zE|IC}~I(SnI*3rAs`JqNq-DD{OMc=pKQ7@pl
z-Bi=`$PKm^4siZVu&Sa+ViaOw(g?SkZ*MO;XJ6<Ya5)khG-0ulH#OEyD|_k`ggsnW
zJajS21;ZFh5=^S3e1dP@Wddbi1i|8O0zsQMjS=^=2n&+0<03P19FTLOH)6ioQj7@Z
zh802<8wr+^r7ndJC;7&el55LmZTsuc4x>n0u&ClP1U;|D->G0e!xQA`^a)d?LF<N&
zFAC$0&^kLsto!-0VV?)h&pSZE9l!w@A`C8<N$#S-*xuO0Q<GR(_Y~01!p-<`x_M3%
zg>H`|9Sg3RDc`Q$E#G=%@ZR;hSmMRpXBMfEoQq^}y<6qnx){|D>v8N)>?TiKPz4Ta
zCc;3P0TcHO`zKDYbPwqy=K5m2WAmQhPkfkT)>f7vrVn;j*vchB`;vf;DP`dbWcq!q
zY`70)QeP=6?nz#>4mXu=T3QgA*j-0BxF{Qc&v;{u#RKohjQ!A-Pp+8_su*m-c9Z~@
z=Wd1sxwD@=odjBL3r7X&Pk2H`FRN#Gcw0H)_wsPgtg;aG{pUe2+iG#*v=qgN1hPV!
z5{@Ib66_grpjACzhe?=2huLHoWhG(J8%Nq)Ihp>0Vawo8#r_&80)_tAa0P~8>dEPg
z^Vbu0`sz|FiT$4lVJJwmS%9%`%vGI{2H|4lyl!1V8j8ZvesWkycO%&2_MvSPy>i^y
zM?q#XqTX6xy~*X?v%ORUV8Ut5&IgVu9{ZTOJHVp|E6)=qm=Qd1+VVHRDX}H4e{C`B
z+~{yI=IRcx-nHQOZFJUo!p?J`JLuxK!sK|sMZqWqr$XsvSWsB+>h<Z3U*8E+l^?&(
z^?<Vs?a_>MNk=ZdY#sajtlgY0tl&O@zN3eMhFi-+34BSQzV?hY^G-Y4N!~1P?~krk
zn=^3z+X`U0R?V2B0?IL0(5M=VBSRohRr`vSRe`OsB$p;a%>K)RhnhDlEwjLHgq;tc
z`ti_5e~USeNNBVkH4U}P9_fIG>6DxZtoPbD4ZWq7D$o>-`7lV_z{uw8wsVmY#Ij1>
zQYi16KX=rXD7b@-FWoMEyOU=(jrnFm)bgyI>Z0kbOp_8g!b(L$3}ssNfKu}1dP*GP
zjrUXS>>nA95}+s*J|IY^7X=2xcXR~-(igTjY>|5LEj5O6${o!Yx~xO<p(#!G=I?WZ
z9cgi1`x#|C(1?_ZQ?3McF+3|^*BG^X1Gma>P_cSbu|74QyV3t%J>kU9!{)fK-JJhH
zyLRyw6=;byQler{L!tqpL6|nm_Dol7?}dNeI7ODFsMx@`mDe30Y&A-K>D0W6Xv)~E
zd}twHVhkZtoeTOVm89^&#xiZhHti0OYGfyAAE5OtzPo<@1%K|0$EJ(KNMZ2aZN>4b
z(pzffG|XSP%-PHwWe)AB)JA4F{H$6D(>T^&puNF#GShJ!cJo^@3FmGVoxH!ElvEXw
zHyBX$iX-J7)2<(|iAejegw4uIu7%$LE^5!Lf(1H^3%4Y%E%Ay{GZ`6>5%HhuM2+Zl
z%aJ)tf=<WAK_SsIN*xu|v7ua}3}(+&($r5JI<?aD2dt}s`6s+o@`$Z+a?f)q_n^<F
zayV}4gvp7U3m1nEXpJVBGgszur;PPnW9h`+S#rE8Ortcg<OHe0#l80`<__carK$YJ
zJIuz(k~GWI6H-6l>W*@U%IBeSHyMgCdpW;;L4i+jh;8On?FN~~KeL)Uc<aNSzBPx{
ztSy_idqQRl6#&Z$94ZzSV!~Mk@&ZD-3H`4vw4v-X#v9|l_M@5ZMeG@TbK0yR7W#!&
zY21_mdW*JX{b#!*M`)k1!wtyP=2LY-$l%xzBHuchX_cx+MG#g|?vhXFLlgF);K<<e
zI{?*Om+1S)=HYwB1}-*F(??xGKXZO!OtN%QS#wt~v?ll29DTl3FaAD$#Kh;zgraX@
zKVed`YhKT?s^CkmJ3!H-Ir#yM#Nn7r!{RtIJxY9xYkg{~nHE-Am1RJ{Rp@Lfx=0AD
zqEx~5Z2^)ijBwXoyJ?Vuef@L|f}T5r!i$=(!@%Ux!u&bIK?n!hEe5?!>9GE!AR#w8
z(V5S10IxkF%~{F!fWL4sS^LZDu01j9%29rc&Z^6j*MZQ}(}TC^RKc;EvK?L2I>SEn
zg|C<t!XBv9Jg&kr#cSPnowBFoj4pUP5JT`iDM%YMK_>y*s<iwS=%>~_fRHy48sJkl
z-o6kM`q)rKEUDq_?w5(Lx4)%Ze|tX)N<G=Hj*8Tb)J%Eot;TM#4qv7MSERW5?R+?u
zqOEr3NMDt`_I!-@wD{+dRE|u240)K`r_MD)IkSoSou6rP@^2BxDfaQ%_M+?JvoH&8
zwOdgaz7g31vfjXNXH~g<_e1!DDr!;f5n`8B!`Kg2FHfwn(<*|_!j3IrbfSrZc?pEI
zT)DJ4ldE%s^~nO5uIqCPgGJ8N9p+n<iDR@wVs3)D3Hv$1JH8A6lGub|JtiVPh7A<O
zbwD19ri;g(+%ZK*P?=}$W9Bc?$Q-rW5U$!aYOO3IG5TJ(7_cb#QK5RmmmOagg&=86
zF#b2|xY{94AK9}0k3p}UMa*e|QIgeE*g**!eb^su&Dva}mAxjW*y0EpEN8%A9c1Os
zMDkUl1gq<rgZBI1o2;q@E_*&<L40r>zOSJb_lEYsO+dSP@r*R!(md3vH`0#cdfYam
zmBN%!J9Y}Ym&s`_%Y;T(a;V|HUBsEfAk;>KiGD*2@abLy{)p{NpE9;&b8L1Zuc1@&
ziZ|gId}LhBPfc1{^=7v-AzpF4Fg(C3v_R%<<v8n{b;kWDEe+h~m==<<P8;2Y74vVi
zfW2G5bdB+l*#eRAHSne9F}zK|pp-9mOy-qt`~c;%99sVR-+uQIM0}e`gza3CXHBx1
z_jI<YWy|U#1Z(a6)?KfSV3HCo0Y=_547L@SR8Puw#Uci&bE^bV28)J{EpaxFI~f+X
zlfjaHZh<{PLv%h=j2tTLv#OsIO$bclmk_IdG<qe>z+Eq;1@m{HDw9EG?(GF@v#5oy
z_SnSXDgh8HDPS@+_tAG=Qww3swT{VgvBcx$Hje;q(#77k(}f3_gP)&riFlDkhsif0
z?f@lS{ogFNG%?B-cl#r7c8WejkY?9|utwhByO%$Hry5n7kCby3+yQ>w0if?D>O-7i
zBG>-frkmXN0uN*ajTQ8%^lMC5^7^|<41dk38H>j!54b2(xyt;$KNkTSAE~2kAj?ZL
z=&#D=1QFOVBK1nLju?&`Wen)fli_T23<b4OR19@Drci*#+jO=vHAwy@^5eOgW&>&E
zyO2_2y_xxZ<%ZYR60YS`p!*UPb26}=#+`~yPpOxm?dpTyd1L1)&GNmlT4+6R0%zJ8
zWe3(g0B=gx^S?FiYfB4K0<jI}eHJhPM?WiUx#HK`Z77UO_z7?R9reqog0L?rZ*gYa
z{=qff6*v8hX}K^Pmshwl6Cpubzt4b7wNDt4F|Y!@z@KYX=yj;D%rx`sXdR=!$Mus2
z6pI)(c7(AE?N3UB(zr*_jDS3F;r`kAM*th+^hZn(A+nRj|K^`@M?n3lxo_^`krz|A
zoZfR^t6Q$){$V|5xgu+b*Qdz>`#f#g1V>(_*IRYIL{qS}tih<qnOipW<Gitgvs}TE
zMBt!mR+*h-WtWG^wE@Y?`Uno$^_v`ho*;f)o8y>oQq;}lr3}@Hd>Y~(a~7&|lc}B)
zP?x0w(<l1%@4xp=nJV=Xjuc+1_E_9I4NwFu8<YyvUz`Ve@Y;CEXNzvN!HKXeETc-&
zG%{M~$Ovk)jO=9VQz{Dh&(_1o*F1&_?*LriErSNG_>E*E(*}+O5=hJ*)CzZKkd$<b
zpfhCal6#&g{18=BEhCrvZi?X#!T!oF?4go6?j2^`%W_zRuhb3dj(_;G*8C=vRL=|~
z?0dMs<FS5E=eb_X2tVi;xW^JSload>-q$;<1q@YH{kGG*1AKq4Zhm<OKxre4bd!9@
z49tj|^K|l65d2Bda;>skw#mst?~%Y)W%_mXdb&o+!4jRMI;S~)P9UpK5vvvHl$Nqz
z!)4q8?I+3*frs<ilM3m*GWOKH-^NNpvMY(`l)j~;R6omCR;ZM=_;6uS@vUqvXywFc
z1V`a|I>%}L;jMIrP5PTPT6a<K$`K?=nH@pt$BNB0oUeFv|DKp(xFp&^<hB?A`wq)G
z2eBvC$1Rb1mh$wQd3@w^;Zn{I1@lN^>_>4rP<?av&rULr@MjCvs1zU|U5bRBM#LIe
z*{9t<Z>DgxPQH?R2j2k`-bG=KYFuCxmnL^|0Mot}d}5N_Hvc{S>E|}XgFv@6HXiG`
z3kWTR%}s*Pqi@T>0*@4Wed)=arGuBbyA|en+9%77`xk8E|7KGy4Q?5{u~6*+9^X%M
zLN>u*OVO6YXXJ%r>_PAEZ?=_w)>Ck)m5Ankq+gM&=G}O(eo(PN&g30FYO8l_e6Mel
z=#z(_2dBD>8MRTmv$Jr6nFt-<cXB};CU(x(am6;8+l=qkS0UJtR@3F?g`I<FjJEgc
zW)4ROhf4;%s}TYY<9?RZxJ|8iYAhMtUg9hi5WWgTkOQN>q{)8&O+oK6ROVLaOUp^(
znQ=uB4r?OHjFO?=&l(b(&Zzdn4!w2Up$b|VB0Ed^kX<qJbUympAGQ}aqk7?%zZl%`
zvMm&s>R#G=yUnRRC5vN9Hz>~`)vJKTndN>^{`Ys@nZ_b0_W8#rP|&Zfs;}?XtTCV_
zCdY`ZJHVu7TI1;*U??xCq6mayDXpjX6fF=>OfsQmf0Cnftx{4Vy^(oDtX*Pf|MpEq
z+%MNqrh;9eor(MHfp>r&eGVb+Er)*Hc#gfVy$sIM{$QvEmkL8NuM^@{cBrh@H!|SZ
z^f#yJ9y^#K9=C?xqK|%Ni4~8Tfz$kL-ES?<F>mISG87H1;KwSjtmDd`-Ywoc8{NDr
z!^upcybbo!J*<Su0bkW5!hfmC)c7#YGOXR0gpp|i&23Xz$9rN!OH|lK4)Wb^NRK6e
zqWVwr4Kk1M=_vrH+7gA9)I7$D<SnnTK(Mq0TxW-b*z0}7>G`p7wX$H{QP(i-nMVFx
z_BO{>50|GrwWK`ZJueeFfd{^$4DUX^%aEw$RYvaBGcD)D#u!>JG8^Rn-or)+VUpbl
zD{TEQj6sTK4AVatgTJSU?K&gFBsAk#hqAp&+OMHlxu#O;<OR&(d7gY&5W%(gs2~U#
zJ)j!rE{0H6lGqDuI%%)y=+Dh%HVy0iG}r$Q$F+D|^xBU4x9T}@mU9+zqYek;pQqBg
zbxdH0eY|Z}9i+;e|HF+Z(|fUd)~cmdXL;0Yrf}$mMrt0X5)V~40+MY@8$HIA5SF5)
zVrK~Ph3Yosa+?{CHwjdritfFlc;(o7#ANVtU)i-Vfx{RUe{aVj2csqYy8~uL5W~_j
zu63w88rwE;e{&vN(XX$EQwblHSJdmZX}7vL7>G>7Tzua4sPP~7<c}@ttA0~_;-44S
z5i<A-ZMD3lxj%g_741GgFXBR_bC^hr9slrz>Kh{l6|*KmzeQk{XhX{m$GFE%|0RkZ
z+7o`@^W#S20FzX@%K`fxs?|+SYs5{Cx_!7RLm1%LooZv4VI~-`J-jU;Q$n^g_0SGm
z$CE~8pXm<Za|bY5pWI0iWP_$6(~aV4AE4RiXJ$id5noTNbGChh>wyzvI)94e!o4L$
zLJ`er4HJ=)XE{E^@HO298V}K$6VUe@kl+J7w&OE|Oc1~L_<`f%*U_?Y0`W<{Lm&wH
zEjfZL&*^FM+I4hVKN!m#PGs7C)4vkcx>K63yu@r`%;&*>z2Gc)#k_V^Ky8R7zvZ2R
z@=KTJLKTaiw|(}m+DiOFmw6sH>9c(BVX--8uLh1M4~f7=SLtSf8NZfCDsS_zx9<Rt
zvHcd+Zi+7E8>bx=CnkTM^Z#58|9b6nZd{JOa=MhRTs!NA8-IHB=$Wn^`P8uhwJM!C
z6IQo+SGLK^E#vsfg=T>yt4~y5iEozYVsmSlBCQ|<6B9q@k#X+)O(-wLW`8tj%3X7M
zL7g60D+7{@hqIL@W`X)$JZ~s0wc-KHIIc9}`7cM4*;tK|D50{-Uh0p5bia&YABugg
z2i-bJT%r1*`ufjtad}M}6FYG))=pOj$g_>&@G({GovHmr=_a9;o6628sQl8YPhg;M
zN(bcUlO(%<`S4Nk$OSKFHB3rrwje^D#~@s#N9t<g?yAKd2S>hH6aywZZO1MB>5ZoC
zke633{O0XI7PgV3LI#VhB2Q9kw2}kedvERl&4lP(p-b0=X*11P9z~H54@HqSA;qMj
zD{!a${Lde<TjRG%d*QXIE$2kF7tBqcT;IEd<Lwt4!`^QX&IEBL5g?PGwuC6xk||2m
ztqj8MV&13U<?YB>?Uhj+O80xg#cp-$L^i(r(8a}?nQ+2^{e_jIm3A<F#E?3<4(R7|
zLvj)55s3_&F{LK5Q7_WvU{>Wuf>T>`S)=(55R#Awg?L|cMNucHKc}*R16Rf}jgMrf
z2<`xTX+Hc3PIrKF-~?nvBg5)GIw>+u(~e9^J?a4b9L*TBFDQ89ItpPMQQ#!Ol;0Ur
z2tIyMH0>|JP`L^>noBy@e=9_)%N!xWdr_$!MHZE=8buv4CW2h(Zo+!8)i@ITgFTZY
zfWoRByrJw929{dT5A}=pB_d$&2SzIxit+^<%DdZ`&s>u(D%V)Wr2!pOpO6TSd~S|S
zjA;FP2EP~+QGX+`_oMo~OC~F*qnQ=7Ov9>b9|l`t-V6Bk#@F!<z<MTcGPo2HgG6^@
zEiu(-EE-BuCB!IQqa`g+`r%fSes_xrBWRf6sL2o!I5xAI_Vesf`-R7+hsCE^GE*D)
zR%C7L>!it_afsHd)Gq9(AAGIaw5CE*N=omQYqu2H*2FrEY*%!piNCS91N1IuwR7JA
zI09ZR<J7Fv;Peu&3Z*{dRToN=qpW@@K;1}dtO5?^9`>%y53EPMu761)gA4hb$l>x0
zA7jyxt(-LSVpny3oyB}g7M?gMhaHr~%j*oGoE>_LsHF9DrB>zSY;g7gQu52BLu2U2
zZl7A?Reg0jl2GZ}Se-eX!+GB`@f`2OlD(HX)MXmNd}OHsiuYRhP5g1>AXKa;Q_`eI
zR{Vw65MU#MnS>{IE{zzyolIAYbkHR(+JlPbK1*H^11+_ahfcj7;v2dH>~0A&<(}%n
zkMRw3?6o+C@B}<Q(8m$zx3cppo;4;@PP6+vk@II=TSoY|6@-iyKkmR++<tkBb*pJW
zi1a*4GCSWM-l^U9=5PI?X5}pT{)1)x3mTbq#nSoojQE68<q&=NqCMD1c`-u}Tk<7F
zuSh$6F23>W`6?2rSQFb>cUX;Kre+X1Y9v!d<TIC<rEhL6q$*CWb+n!>@Pdu|RjW>}
z;{)y;!uT}fXaC$he*6>jDAXyqj-9`OFnb?R*{afj#aN=!$AFykvxCor%P3R4*ea=(
z`tTnfir2cfP!@Q5l@s!@wMR(juTD({u3R2lRJXPM6nQX~LO5p;o$flM+NmrFdS^4)
zbt}eFIPr8DZF=qgt+EUWZ|Ksus6kDav{0+~`DOPkqc)8X(ZP9>5JDpoCSaQksKo2c
zW09@V|8T~2)Jh%FnUx@!N>Dvm#CphKp>C!=mnE>jS3L=Ahj~ecW|Ytj4p=my$>K+i
zc0MGO^b5ur2KEp?4H|5>YFyA;<6QEIk}gxow;X0UMXt6c>B_ARM^`8fu{Q>Mo@@P^
zi{A^l+O!LQr<HnIA2anlzTkOy2S~D8{wAbA&-!t2kBC}8BO>y_N!(auz;N6)A%YUo
zxW;R_B@;KR0$Gs!A@s%cD+i{~N@{XnVB!u<MN-k4re)Iz<9N+J@_4qAwy}O*y%t2z
zXnv|3_iP~H*4cEbL!DcgTq?$VuEfx%CMBEbF`3*QAaHQ%GG@~9=$5g{J=_Gd_iSo;
zA*e*NF5d>Jb|2O6BdbQI5Cd|#<!T%$wVPbxZR7JuB(9uv1`x{K%Au-so`eP+`3d1W
zM+`DKlrFZeKppI!76)k{d|qSs0PX=0Q|j#bA~AFc=V4Wy9mZx8AI(cYz9e)f!<1vO
zE)j2&!kN=f-XXcoi0w>d{5$v(vaPJsxrV-aqS<sV(SYKA($k&Rog}8lXe;^*nYsPW
z97o@)DpPaTniY=5ebJe%`XmgdPW`0&%O|H6!fkbs*k>H7l>E+T0cl#&XE}$Cl$MF{
zWvi<B-8N+T%H+fqJrZ=33sQ7d<`s7U_wIhcJr+^5@}Cj2ygcy`z}ksHzbMyIe%sel
zKZ>1U2~G0*+yv21(n;Qy#*)(gDJC#4uBC@JU+0^($zA|)MPg@1>&^|*OxUhnQy$Fc
zcn>^)_fHUTJZM5ZXQ4fspCmveGHj$cxPs>H0BIh}70Fi9eU{4Slf_TfD)4B5gwvKv
z7hNC^p-}Y?qkL^<)Y?BB#g@fS7=H1Mhn5;~qkMr((JCq~#a?@HahYG4pA@C=1SyS9
z^2RCnYFr$Yg}r)Y<IL5&FhBGv>%*pINQnT{y+^#;lZc45-2>S{6BE8w{BTfD*9#kf
z9VQaODKVXMB*!inwprSO8y0gDZ6RYA#W875s4N|iFO(8k3smV9;<$ozeM6^+`;97P
zPXSn7n6f`}mlF&L+cQIn<2T=?GR^h=Dv87xgexvkJ8>pMe{-yBtfa?o1959L@RjH7
zlvPU%tsE>M0{s{PQ%q!s(emmLJ{rst7x~?}N6MvsjtcI;{sOulGGOHfaXRa($0bk<
z>W{2GbyG6&h{3Qu$6Na1A7|&C7c}qg047Q7p@Y5n44Cz{D|qXs`?n800Zjurs)4Tf
zxcLUEkbz1EcIkC?OFS97MyUv1YxwOaX2%Xmdc$pV&JQn~9~D#Dfj&K8p1xnu_3KNZ
z{QT}91p}7GuUn>#gGap!MK7;hQ9`qoXu6L#uP|OAUpq%`55cQ6ocYvkUmS9%i@gQ1
zO2e@diIM>(BHH_zN&YKG3*dl*QEh}|qPFnW@@dy<y)|LOl5LjBsR6H`O_PpgS>5|2
zq^yO{5;EEJh~IipWL!;R+{nmCMMVY4^=QnGH4IIvbhR7#=0U4<@uJsL>_<L>QY@{7
zI2$f?fg7W_`tm*B7__Z&9CRsFkZPZOqw$$b%tc<j4UQG=3rva^;VNvUec$c7f~z4K
zvMnpb4o=l?b%Hg=SJm&I>Jqz|Z()#bwx_Qw@ZzA4WU$VVc`l9eSZ9;`hG-%uZ}ew-
ztdd15E#1s7_l-&L7WMbD84s%4(O<}hvidBTUbOAmQncN3%NSbdSygC6-O5zZ_&+e3
zlCew>{CuAHWAtzYLI)=~WVzjvR{u3ZROF92LU4{2#=)-5E->M&R9|*dAWnlQf5Hi6
zOqxm}i4U|m-Uf3_lT)?*wH1#+Zvrgwtg1f_bz9jry;~)?`HFogi4EUT#qa&<uj!v}
zQNG<8O;mQPFyNRPB0;x3ZaoFQDL&!a5>zOwzJhI};{Qv>*W6r~{<f<&r`VV$q${D$
zGL@A{Er9Y2&;Gt*m>CBZ|JYC&Z}$%%9g23wQ|uzBVyo<ypev<mRBL`jur=Vc9Th6C
zLeyh*m74mjo=9`?;X9^*EFR?Ja*?6NaWMwCeQdvq0$I(<zVGCc{Lw<FU-lDUIwcRa
z!NIRQ5Grnmgx-%usq@2I97!(DP9|P5K$t<ltQ7mS!?KJI<J#Ir{jOlpGnT+OJG={i
z(|7K-VhCZly|o4M_W3ZFxhJpIr$nCOnB0Ip(BIcO#zlq!$yQv<7g%<=C`fAe>|?j8
zd^O9vKt3+dK52(U*8&@+kzqdcDO;U!?_5|^tG~Aa$2*y65<g?vX9ZFbjRD5{{kMWm
zNRhf|Y@0xgz<z5CUL0E8!z>3CaE%(Qo*!Ug)Kkn``i75E;)|t<o0qJJYPB<+Q{Ct-
z%H<|u&~4xOY*40q^4Uvn#P6fd_ndV*-h>xs^d5F1d*X3=d=bPz817)SU7C8&@wfJ$
ztV5k7I#9V4WUa1u-m}bJb~I+lvV+oC3B}lhPc1fXQf@Qy8d#>#JML;rA<-WPVDJKr
zrnEfai{ZC*wIR)}QG8-82vr$aLPFwd=R+A-jsHGa<*@F+-e#SpjTUNYl3OYeDPZcG
znM|pLPi?EuC$Y5iLou5YYy@ev=1}84)wwOQGV>G=VN$jsQxfH`5ymSk3d3W6gQ@eO
ziWx^Q#a2$-AZ$sE(l3Cw%-5=KY;9fjf~}apx!5)TkKp0-CbWaRPHFiXoPY|#KYrL!
z{^22OBpUTuDy<z=M4sTO$01oJN`i{|&>k#xsB`VtWNwYncOUJlSz%wh<gq6FxfB|r
zl4fqau#A5uP^sF6Ba@;6ch24P<&b0J!;kT}1Gv6PS-S(IjBZrd`{qv3`^d@3O)6eg
zJ`^yfD!mRz=!$UI8EQRfe>s$Fkj=W*%2XiqV>In2DJf%)nd_(mR=*NRzQ=rkHsoka
zCVc^EZf(-k-IyleS~4g!LWNU>EyHuRzYc%eVmSDHJG^bC^=CG|bF{j&Fxogx+AowS
zI?MbYiFznp%P^FN(pb%_yFfwJ6i^4yfeTSMR~;-0ykI%#R^aDQx97)#9Tt0d2gr}<
zhBXG<xDD)Rm)CZFe0BQtRV5uGrI8P&I%m9k9W1(ZP29WPmLKZBFtpV=)L}Jay}N4T
zeaJrWO+`J%yI&4Ca8&R$F)sap+f4CI2Jm?6(@T+I;L}ghuMpv)9eX~oR*ZqRy&|WD
zT9t&E-*b6xg4i_Tib)YWxM-9va-m?qN%`a}vMOGrbasx838_cX83TmXzs9_T{X&d*
zXlvO#tHBlS$vJDP-WunQ!nKlN`aT6Hcg`OyVJe0+dyrx)U+yA>7DZkVMFW%{F@{Dk
z`$evr*c6c%wGqF6es$Fz*gV(WG(>xUa&~%7)@#t-u*Dkz!+8dRyMn0}y;?^GjH}U+
z!6Y_-g++MjDEaCfTncAOiM`&3D^3sF?*>;ilG6>An0EIGln`$$RBUxv30~Dwe<NO?
za9ByUDW+c~khZzvH-(K~K(L?70Jmo3zPb%2P1W;Gk+?d6ERKgpaUxIzW6Oa-o-R^;
zs>N(D*V-#zJFo5_qIqE(gEXsl<|Gy~!;MqV_BP5-)=t|~C`jf4H5Rm6|L9ZwD}S0j
zv4T1fYSGO7ZDW786&V|i2&cqR7p-bIjc?SGj=H+a=17+<+8%g<Iy8w%mrsnPH;KB$
zaNv`YRnFN0`fn#s=LlW^6jI|;KWXqjK~Zs2-T~l&6P)SO4rIqf!za%8wknBY7r(Fy
z0|ycg<Pnj0@G-G0bg&5j`s>LKX>M;XHfdL3sD>WdJ>$<!JuWqHUQtZnHOon$u|$&8
zvAW*FaOqehl`V|jhO9(%8m7iITFcJWS|fNUuYYbXMwR9*Ex?yWabRY<ri*l9tG#qR
z?Yh3EK)RuG+&jQV@R1)cw4o&=thWKB1G9*_C2%0|jNSH89gI!%BoX3n3|K@TpdcZW
zU6**PuC%xN4xvI|#n;S)MqTN^BzFI6Az|p#+L!ML<(f0q1UlVbw+CO|x-T*u41_Up
zv(x#EZVfL=)t0;Ywo|VAh?M_PqapaxfAC@5lYc+{_p<!k9RBSF|3-)Z3Kg6Gu`HFL
zevKMlq!R+gI!D(`Uh~~Y?i+o*=R#NEU6-zxx_1EiYhpX}nNW3Y%-4CtcN?my$BOrp
UguW#YoYb5iQm&~@9p5ed2Vp{tM*si-

diff --git a/plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_navi_f_2.jpg b/plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_navi_f_2.jpg
deleted file mode 100644
index 958b036310a24653d18f4b7cdad711e282e8113c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13732
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
F{0H+|uX6wZ

diff --git a/plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_navi_h.jpg b/plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_navi_h.jpg
deleted file mode 100644
index dcda22f00be5badc2b0f8f37d00d08148512d1d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12201
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

diff --git a/plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_navi_h_2.jpg b/plugins/opSkinClassicPlugin/web/images/004_openpne_green/skin_navi_h_2.jpg
deleted file mode 100644
index e55cf64d505e01c1d3bdf0cd18f82a1f7570a059..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12915
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

diff --git a/plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_after_header.jpg b/plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_after_header.jpg
deleted file mode 100644
index 931004b581099ec01d1fe226faa3230ed567384d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 23366
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%0Al
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

diff --git a/plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_after_header_2.jpg b/plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_after_header_2.jpg
deleted file mode 100644
index 10e0519fbb6a519c53648027907df0bd0f308c30..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 27883
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
BD>eWC

diff --git a/plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_before_header.jpg b/plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_before_header.jpg
deleted file mode 100644
index 7f8504a070eb7f78328ef53e06dcf7166ae395b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14915
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
Cr6(T%

diff --git a/plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_login.jpg b/plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_login.jpg
deleted file mode 100644
index 16e1cae6d3c61980d9d747399f96912b1b9a45bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 45723
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
Gk$(dsdTyZr

diff --git a/plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_login_open.jpg b/plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_login_open.jpg
deleted file mode 100644
index 7e83a6fe15bdb3d1a3d3714d5bf1b42feb1456a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 47083
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

diff --git a/plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_navi_c.jpg b/plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_navi_c.jpg
deleted file mode 100644
index e211d3c3df294d3abb86109bfe6520637baa8de6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12118
zcmeHsWmFtdwr=ARtZ@%CPU9LpK+`~INRY-QcyPBsh>_sdxF<M`1!<ts1eXB8r5m>p
zEF^(Iu*b}unf31dch{Ty*1hk|u3B}fcAazTt9|y~->FkK^Eayiss~VQC;$f+0C2e7
z05|&pASA%vEd+oAzy|;Tk8V|m018zHFFQwo!^c|<&J6|-0l@u-;N70#;olzd@Coq$
zA_Rm4e-%PPA|hfUB0>@pQc@BUvVSi)czAdO_yi<`ge2s5NbZnRQrrq9<zFlPtswii
ztAF3_A6GXY0YG8^8}1i893TJ}h=T{jx#<Pe-om~`f`fAl^lw5yh);xzM~p*qtHitA
z|E|9+asGmtkcbL^gAc&RBf5ozhf8$Z6b}a%p8x=)CZw54<pj|h(Hj$q>)WdO&`GFq
zCBH|!l&rJkhR>uk5Cd=P;t^2b6XM)j;IAFy-~#bzIFsK~<BO}>+94(li>A1Z90+*z
zed_4Gzx*@-k}&Y4B|27n)v#7ic(Vu~yM=Vy1PD+8T*WjtcVgSpJ>bt`k#1nNQq}&b
z8sF=#v(4zloRhJx>AL|M{uk8IlUB(r18))f*AOTKVfbJzZLhlB;CzH9e%O8UeAif-
zHDcECn1-Y|3*m}w7VJX4?~lID<r#2ML`hiKV>4KQX(ms($J*C^Pxbs3o_i!>%*#_2
z7mC=h10kif^FluDu3e<>l{0{e)APj-b>gGo&}hlpdrFEbzDohPTej3w{YpbVb)@AJ
zya78zWs!##HSa8|K<2>%Xb~AsIP-1StG~WqjRZ{JNsG{V$oQM5zgMsbk~Npho_`nZ
z+4|D=L$u2V`)14h8>1&F@;_hy9R^TX@h|YGknz;c*4|Hp!?#+$5e#?#4IG_*A#87q
z@*yR*+3G&p6w-K{=xgb&_RoU6Hk9L&=x3Ufz9%aPdY<cca>)VraS)s?0)g!pd@T3x
z4=vEx@&-6lDF5vx>P-KCGS5F_L^nrU2GCWyBLO*SK$S7+Ki5=(E%kJ+`pI;4`z<wr
z91i=@A5!ESBJcivjH~{~c+Wq>JpTlT_jSVBV`q7{T1SVY3U-*Uo)gnqnvtUT2V>?>
zElm`tBmyDx+IeO@iGPn;<NrIs_20xi|AZ7KC+R7E=tkqa<g^8O_%lAdD}uB}=#6=*
zgNA#k2skf_Nde@}Jyx|g@b{z!{(m!F{@0BtYgRMkZ|P{XXM=Ac-+6zRO*erFy;}7H
z2~d+#2HjXMSzfXXwX?DJ#@}g*?!O_M{MVW1KSh9HR_&iN^tR9%S9E&P4}Y!kax9x?
z@zni=)U#`T-Ew_5d(HBNho>prm|mo*sv$6Q2LzI<{PVokp#qa25;^zhb$+>(@?zoB
zj0mTLHEzW7Xr?TFM0bnk(>+Cp**SaPO1VydxGtZ7baNOp=)I1X3Ffs)Kz)fq*STGd
z_Vw8bMcWLG-3{QYhl~D)3<^u`0~H^PV*vHw5#BSHnM#sP*TsfSa5sn;X=7}O8KI52
zx(G$R66aXKt&+y4!6x_~TQ=;K(ijvL1}d>2_<|H?p41?neV~TVw6x_#ajIQ}gW#nr
z=jLw%O8S4~G&f7k7!1<3G&boauDUsbWGr#iX)FhF6Er5XQ(E>HTWVYL47v34*yD&H
zyfWN*3#1~eE<|m2dByP4q(T?1EPDEl(JO29l@1MZu?Vhdq=wg5>`xeQMpxxf@+Y1z
zl=rm%4|X=Rz}w?lU$YyMTi;}EUf$91eHG*eut~!2PJO(p>Ss9}vm>IlIb?y!mlF99
z)O(+EeyObmBT&z<6+e9}Rj%>s>qTfpwWf0q{DA{+n%>yJw~>?aW~PhxHvq|^eO_QN
zsm<rv3_6tWZ^23V;Y3e0AMA(bv~6srUGm^Ep4|-8`|}Q(aiZc*ewjnm3Nk<7!S69Y
z(ffQbrbbNN3Y$T0=p@)>Mfw_){!SqQ6SN2uiP#|aC}4`zW0uaF0QYC1$G&8tXM<*3
z(-vV@_py!lJ*_U<Ji|#>LieIZTQJW$KvNF&IK)H8ob<BPat_+I5*r<KcaxIK6(?GA
zD=Mivt4g?ss>JxXp`y0uG~Tcp#2JQqyYsNrD!AH3D05m(6X6uM^+rroD1?>QHC&hX
zSyUnvoWk(?^)V0-@r?f05+<hKc<KZ3SD`&HcbC8AY<bLA-*JKNYIg_O7*fULx4R-P
zz;C_Y69-3jorgsNFc>v$-Z8v|7vrHDF`n8iyw=RU4eP8-yX(c@r;9V_mpe*+f2m~a
zN%ypGrFHG(Ho7$@E@N63(qq=JbxN%_SWBs9f<}Gdn8WWEd#6cj%dARU5(??HyO$W`
zmRp{Mtex>e2L#eEgYmVY**k-H3RdNDx^m9>u6bE5;m?n47JMcgzoAw*Wz7pkS+2<p
zec@Mp-ufG*+~Y(8krfn)>|J5DM~oV)k%=~)?8gxt|FKNSl5u6+kp&WUvlR6D!M`r?
zS7xJ-G5ei^9W9~#RIgOP!pb_>W|j&8OuG;tYkJUU2V&}j(|)I9e``D}FSV^!$$Ak!
zpLi{eMNi;U;NdzP<t%L9<^8#~(N%9S)H5TPtpEVG_?&Z@vb)>PzSB^LsxKErR9n%9
zQ2T4`WJjpud|l#NR|-|2^BvF*Q0Jz$04s(!L!CCW`DZd@l4{{^3x!B%FJd}VAs@~q
zL)hi2czOs@eOd@#s8+J~NXIM)yIDRw78EHhY7i;xaYsL(xw94_Y;yyEdhO*^o7BB|
z_++r8X^AcxM7%d{EA~2CLNS$po+KF#nX4<}_~Dxo(=XivAN3EJF)B<t%D}2wCe7WY
zJ!-qNv_c`ABIH@^a2T6soL|!wj|5;t-sR^6d_8*|F{`MbIY1YBE^R0kXjWF9#R3~U
zivD9sFRSrgeKB7t{Os%RI8c)MK<x@;a5vR|EH%SiYQkPfq86iir_w{VD;Cl-c5VQ4
zR~ak|Ppg9lb!W?C`)>fRX|ZX~wXw9pyU~)Lj@Q1a7u|Np7}^gE=G>S&ifp$f=KB0x
z+AD9ys<la&eQBAWgu2!~4P%|&Qr5g$#Z-yZwo>$op$29(LRch?_og>#8isa^%rhNI
zX~IQgd4}#-iL5T?l;rehVVVY97pCbsBXFlb>XZwKG=tfr&ObOrj55EAk{VZff<$5;
zww8~a{sQ8^tv)l@@jmic`azJ?3F(R?>3QEM<;48fW!MEbiRe{$cA$(nBcq+$M{d{n
z;Vr-19jC0a@(MvoY1U2~TYG<43)gR+&I6TU7M6|O0{#_Pj#<kqGkVHvLZL_jL8n3Y
zsDPph6Gbk!BrgH2<DwJU$V#0o(r;ixin_sI<&S!?AFZzq&uM(zLxt0<3|kV#Fd?G_
zow7U_(<DtRr?T1@H^5xIpo#$7Hpl#I8D)D#e(>}kWU=jKSOg7%?ptk=vMTay<9YW|
znUKd^K>cruON=asTv8qMS7;91eP^IuD=1S@Mk)c~x;4M8AYX<QsYuQ(UA&J?(R>%*
zwYMADC|KO8k$1YKwf5SKLE8Zx(_gWb#(ug>Y$yx-))g^*;$~v-?S~cJD`{ga_Bo$t
zOvj!koKZF5U;@3D5^6D@T!Zhkpbap?mEzez-<NW;sCqY9eTY02+&V<srg%1*laM1S
z(Wh2y0oF5-cYM2Rfd%s68)!wYI%yvu(^{pI^eDsxBn^z}g`z4lCWpTDzp`Zs`>cxQ
zVuKg(U>7`e^Uz%TEV1f`t#xMU^+?^&$vZG{x;TL<9+RT9LF-Ze%K7~XiN34V+w?E_
zu)}kIhk|=0v6*l=;S_D<^7yIq%b4j==ITgiZgkt%EONu6boTF51YNhTM{~reMtl@6
zJ)T4u*rv~z?K`eGqaZPPc>`GQs^16|h1Z;uw9Wv7SH9cjAZm9NUL~@L^9Cy`Drxx#
zpImI*27)NQ{RqNEoJW(a$0YlHzWBq0*FN`mQ2L}&lEl(}bbh+-etv&Yh7DBDY=~8v
zO@dT{_t!iswO05&!Ec9`r07!I-0dcU{WLz*<J+S~n2~b&Mh=!~#Tpt1{o!9LN92{e
zzr=nFI5Juy$NqG8UH3Y>Z;bP<1tWt(ysu2Iaz&re_xUj)YV_8k0~~7h;c!zEBbUZh
z$De;#U+BdGP)AEY+hyR=s7vxT!xjOVD>J@_$s()YozhnAbB`15xo(le2d5{I#)W8K
zBUj$wFMmEQ)4fm|_hVl_6uNt-)g#dVWhq+QU~!`oyItxYTE(g3TEw837Vr7IhSSP)
z{Hp(UazHXfJfMmVxCq~-Y9_lnc2vr}HxwkHBvBVJ=<sBF(uDY>k!xl4Y5cgRV@l46
z)^9_QM3uAVdy)wChx@M&4G${=dobLOPaQKWtKFT#Qd))972hOCGU3rXXcDSLI75un
zn6oc{hQivA6T#BieEov*lz{Ku4AFN*d9HV>7P{CwrK=Xmgf4VPxgB}5IMn$y1h|qs
znRR4}>Y^r8bl?jeOEY%+H8nwT#yF(aqJuK^sx6$V%RYskI<?8dE@04Tlto5=BGXQS
zI0Z*Z|08K8^6l9jFc3IgWo4Brf-K}pKg;CiSCO~5OfkbPa{aV4wZG5Ze=K8Ik*yVB
zpKh2>VhB<%t>Xg4M#LF8G$~$fbFm?Ia>j~LDd1<y1^N!HpmwqFd*?Kp(RW(!DEOf?
zWb&;tovc6Wv>YlL$3J**IyYzZGLFSum62V5bznC<;^74%q4ZeTwdQQ(l*%&-VsaV%
zBaS>@9)GD)o9pquj@idN6H>_nu^ENuUZxP%@y!J#%c_86Mor4M#ruJ<Kimw4!P?x2
z%<db2PIWggP-gYFlm&=d%2#PI|5$w7rWFaQonpHsPXpr7|1<B`uu6Adtf*Tx8!Jyg
z<$9@%0?Avz6Et_J^?*g&zjReL?Mih{G=_#qza4<9aDCOs;Fyfy!;#F?P`=IT?S+{#
zk|4A!ffX@<5$)5xD1C`{qTDH5bd0aVBV3OID*cOoD3_xd8;bUYiQ5T^e8VcAJ@;v9
zN*{`rNhdtae>xWyFC!6OXga~IBl#GDhz}_!l+1n;dQWRh!;7XFTw7Vb$>jvZ-+cS2
zK>f+;N4B6rOp0eu)!V`G$MiMkSsK|@uk$B6U2-)+zcZrZ_pft*!e4)j4Ef8Hw;LEt
zF3b|_#pO}bX0_w!r{VHLd8v9)2BArzm_@tmOu=1-{>}xlAK=gRP#T+XIWP(YAI73h
z4^vk-#bQ5tDUcr!H(y8Arh%uaSJ`1%-kG41M~%C*(TZ?ml=TUO23}(#=v4hB!D#+Z
zdxpm27*zhRB?aYow6iqtyp%2i#O?OK>T|Wy6i4f44QA2`_)92z`V96#U7(xse#tEr
z0Rcd(Cz;%WEF&R@t}BS&!j`~80XSrVPQy$}h;`2RfpB~*y@7F3)P@hU4C)*Gy=?QS
ztU$R&Wn_`0Ob+8mKJHJy+CBw_9~4-qgboq}E}k8o-*f8VBr8$OGFTaqf^+EbO!QF-
zr43rKB|PmI3+GYNh4}Ixig6@WUv{;0s$mKk^sp&G4P!2ol@7Ry%wK<1$FjxjO5ht0
ze>kR??k{>|ufjAAjaOhlc_3O*4H@p%o{(9cmBP#h9GnomZ#LenX{m2rJP|5k|C+)}
z=7(!~$5GHcqUeRg2fP+l+CaGk4f`{X^_rNASJ{gLPtTXzUg?Vsx>s+tG&@!uCCT#i
z4z<bmth05p^)$GE9Vzag3?0YRHb8f6myK2RTlf#ifF?Sr39}=j6%|gibs6|Hg`B(O
z%>gYXGx3;0q>|EL{`X-rIb~jPe-SNjCG&wIk`ri0`SumVVH<;~!ZsNHO}f;a@_nYo
z1Bji=h~iJ9{Slp?H-MPyk%ZX)F3jL>CL2H*!ft8W#bMZ&X4g+RTt8bgnH$H|=q7as
zL^aW0vA9W`qUTy(J;Xru?9raoEj1vLB4F*pZEfL4O0~S=3n-WUa$XB#I3zX0fI#W6
zK9w=*B>K{#H=7;qTNZVlzLPELB=!4s$2TzGP5rfS-p37zwjc`+O`I_w9V7YmdxM*>
z?1!72FbH&O;XQL#*mo0S$(AC4&f>><S`c}Pjatlau{SNwN3jC?YyCRt<lVG5UUe=_
z8AJ<&v<PlF*Xa3FK`3_xX|e>18m`M@kKhH8tJG7XAGTIwDBY7^FQnVmpz5-I=zVR7
z`ays1vjdq~GAk1)Fb`;M<m$Gs0YmZ7Oe1s5L!jY>x^q3m*4$z385gAuPM1&5W*Z#D
z8V+Qol2g+-UXs11ElyBvaS>Wf=;wl537a_m4uZ$lx1yKDP4T7J_s;qJ;g^}a$<3Wd
z9~L%K7ny_8N=w|MB^`9uhO{1$7@ukZ$UntRF_~_6S(pcb(<-A+cxFB9oktFC0Li|$
z^FUFS8$gKlry^{`z2@-G*#5I`*DxTWAGii|yXWCDGr<k~lqpI*P}$uN+8ePr^B9KD
zkVD)h-I#*b_3^*H5nYe}`GZclYov}3(%hNX1TulL`S&d8MzV);=M@iWi~P~ay`SlL
z1DN7MiRV?>*PFoS3=LSo77^E_c1B<0)IGWo&7<LKfg3Rn?O0=k<Li)5tDYM@A57&?
zoZWAB(~B8;eBVtxN;EFY8*s5M-{h+h7OYy(+wUU7^M}IN57=HBxf^nsYPbrR&VjQN
zMo_@vcsRsnj{B;vtKF9N6?n?A7<157);?dKvvS#CD0KsHcmC2^=+SjWo-81P0O>?5
zRqpdne`8DDrhl5Wt(Cnm3^!~?j8rHupy4VQcJ%dqE|In;H-N~iC-l3uOwQUNe=;vt
zRTzJ*Ez!bj0tqyJHI3$p>=Qm&<aP|$s`mCr!S#*AN?y1gF3-7)K8NqaTqB27#iBYL
zG`~Rw-JZm~Ip!UXwQ@ETOv`!Ix;TCw;&Zfo@y0Bl)u*Lh`%sSVksU<CM6k?LC&Njo
z(y&KDLWYTk`_iE;<fY{+qCN#{q~aO;`G~Q}0(qQtm_jTEvFkw5#PJtj^ExbYT0<Wk
zAlte>MPP1R#3jR&j$5i7ZfhAye3#n8d|^sxUHQCWA5gdRfOoxBGNzBEcPUJ}X4G_2
z;qB2kyWg4BzMyrut9ew^e0SeN%#|9N=mwDDF@7}=@cgu+=LRsib~SuSgDCi5Ler$c
zp1!O>8_SXJRYn|H6=%lheeYnZM=qjv(vDKk-3K^41NRMT^U1cZ;C3*%R<_|3$N!xD
z_<=2>eyIZqP9H?qgGpby$ST7rgzpb8Khyz8@aP7>VmLTYezvxqaY^Gsq=wMnKelGP
z?;hA?9nbs=#h}FG{3kqfx}ZG2uXA?w7-$W><DQ+G#td=f1R(H_1zv42F;&yGX8t;G
zOHrIK{Ms@Y|8_zg|Cz`X67xkRp(1vzs3lQ6f2X}vJPMuEFV4D7m1sSubZ8>FLT}M0
zwD|ZTBiHF+cQHmJI~Z3g7Az}$nqe5H?dMSW{5`Rs-1y|@iz*GM?1gz|!@zKGKNcKe
zKt(+-bd7f$7tzNA<NyuFWlK952l;;+Z~yDUKvUXP#%{t`cFb%Uq#xyy9PeJjCD`tj
zD&2erK2comxTGAs7RjgxNgDWmH_j&>6#3%vF;M+uxES&KTMxs3bgRYXpZ4t}#n8AC
z*oX{orrQc9=d=<D)RoE2PSN`}g1O@KNe9xNA0$z*TV?yq8qXlIAut3~n^UZ2<foek
zm<ly_>D9b?FzoT+ar$Iy(t0`(jJGWNQA|Cv-@7mFp)Di5Ll$Mm58`1dLaA3y4OTrW
zI{B~M20umKSzin^@qDm1loDhg<gjLHrQP^_pKFv=yqlaIA84w~Vi#{-?JCEb-7roM
zf3K@u94)OK(Z6==6=gzwQDirJ*y6LH7gET~omu~Wp?9t6kqz}DUg;`MMp*WGKQmh5
zV6p%SDq&NSb(%bLVR{D1>5q9s)NSGCK0kw*F~cUz7VAck6sIT7nUC+*aHNLu;V^XM
zC-9<7Dx{I<zz}zfZmBF93X6=(u&?c(4D_iMJMoSaRD=IF!v$0J<Ip-lUc?GYJekQd
zTbim={t@U{a(=yNa%xkmAnyt`&!b_UDTPYcr^X?VJ0H!itkzEdeER#l3fEbyb;-8+
z-H+ko{ZcXPc*id^n3pl@q%85D_`LJG7looV+?#tN1pvHbtg;_zXO-gArK)bpU!SDt
zA}!_+>t8rsTv|!$HtMFxIALg-i%}ruT@+3o->ed?KD<X>-`2>n!ci1ACxtu6MVviR
zw1kk3&PK!i;NwgkVP1?d5UBmW&f^gbMzGl<#@@CSQW2<WCX?RqV3&F`h1<=jB*?Xh
zIcgRq;ifMEfvFFa9>;fh$E+fPKU$@kU-jnX>lDN40Y-F1a+YV`lMg0Mpp^EeKMFxg
z=ioF2pgx_xzFvtMdT$%Z^W-B|g~|PDPK@R^IY-qdK;SM&u^I@Ot6-FTllbKGtP=dQ
zn)D(ZZh=6qj~!65rBJ({y;H4<gT}5~wI(%lo0ZnJB)9I3!adxS4M)Hqvua)Y@3b)k
zo6V6@9*}XApQY&m*cFxu*Db#NB=COYBi_`hh*8ik4d8JlwJe5?q7Z62d7Lc2)OC{9
znZ6bj!58?xM#m_HHy6|mt$CLU0Ma2`509a<Qs^m2GrXieN!w4|?3s@>QEp|{owaos
zaq_tJoS?L%^~^zE%w#=CfIMG->x835U2tyW0ZTFz|D2%)-xT&@0{41dQi~o`cK(Hi
zs6RB>M4zPM@OnptlX5yIu61R)b29A3>;$+u(8GGBnoUDq#~pz5#*=VIAF`PD*Htm`
zGLG9b&w{v^%crksP(GT8wBHv?Wd~!wXe&O>yA9Mwuzw5J!Dt+MBZrAfiH5c^<7b<H
znSfn2*6w$~0{y3rQS!Xfm9RKBM*$}IM%er6u1_`<+b2h>;hM+(9Xg-is=T<gk8`25
z*DWDCL)fzQGdhxYgEtuK;^KWBkdio`IhIcSSYrwb*A3idqN4a6&z`$6qPC^-dU$41
z*3BTS9eqAxiosCZ?izgbTbg9{-s{rZ4W0p2^K{*$5-!mho}j@96V4UqV~U=}OgCAN
zFUFQyTw`v-k%$_<&nMIC$}ql&+Q1qtcI)73jw;7+I)!=iyW9hN(q3ik<-;b~J1~Vp
zYhAKrVu?bYs}}p@LVMFC{ZC@HqyB|x|De2OODwVlG}#zlH6&^*MebnVegk0qGDs_i
z2;6kzh*qPc-)g7Ho#7hFvX&e5vC5f|R<b;hlT{LS<)(YD5h5pWLEw{R@j(!&sp!4E
ztZ+^xFIOP(W702k4pjQCY6!ZfB)RV=5wt^RxFrw|O2J`xPvFC&-iQnweJrqRTYL{V
zbL2)h&b6#2XRSt6?3b_EF<j%9yXA}Au8e69E{ilXfu!`4J%<{XuGe6T)Ce7|jIy63
zYnIeaN)>5Jwnbr2r0vC75QQM;`Hn1@dbvxx(~3<CgznR&QoSk5d-;lSi@okc0pCmm
zT&;bwEP<E23K6z~ftyuN1zm%@TsIyb=4%UgJC6)%*s<0s3zW5E-eU;r8tERFG}*6k
z>^CK8%1T39=D0qD>eKmY*r7&8S~p=o6&fq<)O5SA{P{rc!Alu?%s%glZN)rx|8U1g
z!vTy5(hAw<fx13<)M=Ceo`{k51I7<kx#jghZLcQx5XA@s@Kl&B=_Yup6Awc_`oSVL
z_JTylqs{>xmpv~U>RzN41(ids$H<buti59{D-K1AG<E%&kl89p(~6F3$GmlZ);#UI
z^c`sWc9qQy+D~4w#G+q4z8{USk2B{V`OkXu#NNus%f$8Frx{sf&vDKM7$^Dvnupa=
zoF@@~ly^+YJbpbXju_#reEVAygc=4F(J?~{QFP_MtiajLLURmJNE8dt1W+`AK1Yol
zRl3-W_$i?`n;C){Wyy~7p``k<{6@nSS^64n$fJjC^W8UKXErDVZw_1hB7V){yZ<0>
zkw4ipPiUrYc}J^)3^5Qd%o?4-Bc|s?7gdoTDUx=jZ`eTZf1<ag!?He-f8XtiCtIWr
z+NJ2r7_e}*H<<zkHOWlMXZQprr2qn|ynmsi)8A-3JTS7%Ao5B*fXD1NJGK%wB`kWx
zt2PUc>o@O3KBR{>vnDsFCndsi?U;twsS3`Qw}N)4nvrHG=oh{?#vHGWVd0u{iPfl|
z!aJzy2CNKk*w7FCylNM2I{2b~c$_E9>l7s}YE!Wp>0L|vM(mXZVQ^Cf(9;D|Q7bV&
zUKML#3(om;A0qWS-h4?O1ukxrHgQDo*#+(x20OjdSeKMrIHjRBjvAqi5A0~#;N5Mg
zV!e<wNb$-lbJJo_6)>u`s~hY<))<Ye6e7c0T5YQN%c0$F;dbB@a}MWAu6iL?2ZIrU
zs+bM3*JNf4^ag!*qgf|V0EyyEb>p}r=;r5av>>mCr#bKZv0xR<E1B+eSqK+QmB8>x
zAyD|`<{Z{?W_GYE8hxj!Fq5p-|EpI5R51Rd-%L%IliX14snP!MfQMNMS=8v;^x;_+
z?={k1A<eU<Y`Dxxd4@z-q1W~x`zo5NZ-dr}`sHitcS-I~2wS1k?Aj-RWpZPI8c*~E
zcp*0N-5uY9dgmBcaL)R1C!i25;`$=qc(b&;CHaOUJ|}aVf`gLhj(_YMN()gH6XMn8
z4)zuTTEn$0TjU<sq*o7RYoFu&P>C)1X6+z;NwmRguT{kC!SCFgLVPIJ!|w^SVeE@@
za7*FQ&!n&=JZi|?G`eD-PO)u-sH%(hT$uLNiWeU;iBuI(4|8lCf}>w<bW2judGmZ0
z%Z)naJCT0QBqC2bUGM%zfGNBJ+zA1pDeIM)=OO7$RQzVmLNoA{p+~ecgeG!u__#mA
z8}`ZyzuDM=2|t*s`EuP`4<U&^Z|vC8yMPB4XweL(i(P#G#$55z^;Sj=&RUbkm&DtR
zcE)m{<^6@S7rvk9OWtL|TE=Ho9!n=jgDDd#sxBF#v%*DjXuUtJ$rAMHs?$HUv>_J@
zGZ1;UPGh)qHD(DHolgG{V`)@S@rZ7~(eop+g7vs3C-`Xd{@3lWkrC}Nd&`*YR}DNY
z5x>UkJ`b(rsuc*pTxc_iJBY#2f@~#*O>Q_3b;vnCCe((S)`YPC01p44dc&3bL+KEH
z`-cIXW+H6~-{@16A8zH&7qkB(fs&;Q++wDZ6#P~^1&L7-PDn0cmdnFJcPc8GqOfT|
z8s)zIVLLW;-3^&PSKS;nhj(K+mY1JKF$5YJCnnNMW%RI;;DI0K{jgK&u8S0p4}S1l
zF40bUu&Z{8S)q}c1|H!k8h=i)mNr3H2W(fSz_cB_w;J~fQieTw5zYSK0b}+wO}1Kx
zJ(+IY3F1_|Pczya+3(_}U!K{PV~4$t(D?CZ3Gu6t91;YTSveCa^MLWZ(c47Dio1<i
z&>pW%^gSZ(wS|AyN>kMYTaJBGVx1mc!p>3uSS*X^(H5_6EjoEbohiQ_hSOvxQBu{l
zM8HG4voM|6)E9(ntMwyklwFI*Z#r=%hmJMDS1@p058L1#oto)uP1-9fd&~1t*8FGp
zvV{cGXxi)hN|ev#=$>QPH?CE<l-rzd00mcWtV-G&?%za34d|csE|#>YycBvrx_^uX
z)~(HCI8{G%-O0dQxBQVk$D6m~x|mO1;N~@{e2Vh=6z|3&JgcRs@k)WBNN}wMbkFgp
z!!BlgV6@FXZ#t2yecgan;=JB}bY~62dRQ!*`#}Azjf`Ga`=!F|{kK1(wY*2Rho)o;
zBHjI3la_r1D44<)<eh$gKS&5NU>W1#>=Di3gDr=%)s1~q59uxbYxg<hJxy{;T3+{3
zBgs15^CUyg0tXZ-$akod)-py@O1)Gl=63=(|Mlp98T?;v_OIajAC^)S{*ld+MVl>*
zG62VYsoEW#L~$}=^7RK(C5M(jE^e1N?`q!w?p}~-+yLyU6?kHXPef-b&%~?Tcv=>S
Q5}F5WO&l#5h;A1C7j|<&asU7T

diff --git a/plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_navi_c_2.jpg b/plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_navi_c_2.jpg
deleted file mode 100644
index a534c9f3b62d7558faa9341e596404fd72f88b62..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12530
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
A&Hw-a

diff --git a/plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_navi_f.jpg b/plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_navi_f.jpg
deleted file mode 100644
index 8054dbc5cfd65ee6fa6416792e93205180ea0eae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12916
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

diff --git a/plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_navi_f_2.jpg b/plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_navi_f_2.jpg
deleted file mode 100644
index 38718d90e450ba8d6925cf61e37c8d62af32e54e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14103
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%0A5(-6pUXs%DgYFJ?
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

diff --git a/plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_navi_h.jpg b/plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_navi_h.jpg
deleted file mode 100644
index dfd901b0201c7fa1df94e59caf21c7cf65db7156..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12600
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

diff --git a/plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_navi_h_2.jpg b/plugins/opSkinClassicPlugin/web/images/005_openpne_blue/skin_navi_h_2.jpg
deleted file mode 100644
index 08eb4410a50b46b02194241709b411975bf1b341..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13831
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

diff --git a/plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_after_header.jpg b/plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_after_header.jpg
deleted file mode 100644
index 1f9cdbf3bc92cfc7049d914e4cd38f7eb1d0a70e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 24313
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
O4mvEERjBxP=6?Wwqu}rW

diff --git a/plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_after_header_2.jpg b/plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_after_header_2.jpg
deleted file mode 100644
index b62f5b379948c6a62a0daae5632ebb74de94a638..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 30430
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

diff --git a/plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_before_header.jpg b/plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_before_header.jpg
deleted file mode 100644
index a47efc6c76c42133444c39f49e7f4db7bb27b794..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16669
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%0Dyp;vCYthXU`>$?ezwu<IVftQ=?XE$#oH-6)T
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

diff --git a/plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_login.jpg b/plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_login.jpg
deleted file mode 100644
index 7166c4c75e8885034c2d1b9ed905474c4d4327a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 51034
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
J!7u(9{}0^q&IkYi

diff --git a/plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_login_open.jpg b/plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_login_open.jpg
deleted file mode 100644
index 15e8c44dfdf723c4d4e39ee18d580150c6961d4d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 52428
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
TB4Ikxn|7He<O1b?zh?digJbG!

diff --git a/plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_navi_c.jpg b/plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_navi_c.jpg
deleted file mode 100644
index e211d3c3df294d3abb86109bfe6520637baa8de6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12118
zcmeHsWmFtdwr=ARtZ@%CPU9LpK+`~INRY-QcyPBsh>_sdxF<M`1!<ts1eXB8r5m>p
zEF^(Iu*b}unf31dch{Ty*1hk|u3B}fcAazTt9|y~->FkK^Eayiss~VQC;$f+0C2e7
z05|&pASA%vEd+oAzy|;Tk8V|m018zHFFQwo!^c|<&J6|-0l@u-;N70#;olzd@Coq$
zA_Rm4e-%PPA|hfUB0>@pQc@BUvVSi)czAdO_yi<`ge2s5NbZnRQrrq9<zFlPtswii
ztAF3_A6GXY0YG8^8}1i893TJ}h=T{jx#<Pe-om~`f`fAl^lw5yh);xzM~p*qtHitA
z|E|9+asGmtkcbL^gAc&RBf5ozhf8$Z6b}a%p8x=)CZw54<pj|h(Hj$q>)WdO&`GFq
zCBH|!l&rJkhR>uk5Cd=P;t^2b6XM)j;IAFy-~#bzIFsK~<BO}>+94(li>A1Z90+*z
zed_4Gzx*@-k}&Y4B|27n)v#7ic(Vu~yM=Vy1PD+8T*WjtcVgSpJ>bt`k#1nNQq}&b
z8sF=#v(4zloRhJx>AL|M{uk8IlUB(r18))f*AOTKVfbJzZLhlB;CzH9e%O8UeAif-
zHDcECn1-Y|3*m}w7VJX4?~lID<r#2ML`hiKV>4KQX(ms($J*C^Pxbs3o_i!>%*#_2
z7mC=h10kif^FluDu3e<>l{0{e)APj-b>gGo&}hlpdrFEbzDohPTej3w{YpbVb)@AJ
zya78zWs!##HSa8|K<2>%Xb~AsIP-1StG~WqjRZ{JNsG{V$oQM5zgMsbk~Npho_`nZ
z+4|D=L$u2V`)14h8>1&F@;_hy9R^TX@h|YGknz;c*4|Hp!?#+$5e#?#4IG_*A#87q
z@*yR*+3G&p6w-K{=xgb&_RoU6Hk9L&=x3Ufz9%aPdY<cca>)VraS)s?0)g!pd@T3x
z4=vEx@&-6lDF5vx>P-KCGS5F_L^nrU2GCWyBLO*SK$S7+Ki5=(E%kJ+`pI;4`z<wr
z91i=@A5!ESBJcivjH~{~c+Wq>JpTlT_jSVBV`q7{T1SVY3U-*Uo)gnqnvtUT2V>?>
zElm`tBmyDx+IeO@iGPn;<NrIs_20xi|AZ7KC+R7E=tkqa<g^8O_%lAdD}uB}=#6=*
zgNA#k2skf_Nde@}Jyx|g@b{z!{(m!F{@0BtYgRMkZ|P{XXM=Ac-+6zRO*erFy;}7H
z2~d+#2HjXMSzfXXwX?DJ#@}g*?!O_M{MVW1KSh9HR_&iN^tR9%S9E&P4}Y!kax9x?
z@zni=)U#`T-Ew_5d(HBNho>prm|mo*sv$6Q2LzI<{PVokp#qa25;^zhb$+>(@?zoB
zj0mTLHEzW7Xr?TFM0bnk(>+Cp**SaPO1VydxGtZ7baNOp=)I1X3Ffs)Kz)fq*STGd
z_Vw8bMcWLG-3{QYhl~D)3<^u`0~H^PV*vHw5#BSHnM#sP*TsfSa5sn;X=7}O8KI52
zx(G$R66aXKt&+y4!6x_~TQ=;K(ijvL1}d>2_<|H?p41?neV~TVw6x_#ajIQ}gW#nr
z=jLw%O8S4~G&f7k7!1<3G&boauDUsbWGr#iX)FhF6Er5XQ(E>HTWVYL47v34*yD&H
zyfWN*3#1~eE<|m2dByP4q(T?1EPDEl(JO29l@1MZu?Vhdq=wg5>`xeQMpxxf@+Y1z
zl=rm%4|X=Rz}w?lU$YyMTi;}EUf$91eHG*eut~!2PJO(p>Ss9}vm>IlIb?y!mlF99
z)O(+EeyObmBT&z<6+e9}Rj%>s>qTfpwWf0q{DA{+n%>yJw~>?aW~PhxHvq|^eO_QN
zsm<rv3_6tWZ^23V;Y3e0AMA(bv~6srUGm^Ep4|-8`|}Q(aiZc*ewjnm3Nk<7!S69Y
z(ffQbrbbNN3Y$T0=p@)>Mfw_){!SqQ6SN2uiP#|aC}4`zW0uaF0QYC1$G&8tXM<*3
z(-vV@_py!lJ*_U<Ji|#>LieIZTQJW$KvNF&IK)H8ob<BPat_+I5*r<KcaxIK6(?GA
zD=Mivt4g?ss>JxXp`y0uG~Tcp#2JQqyYsNrD!AH3D05m(6X6uM^+rroD1?>QHC&hX
zSyUnvoWk(?^)V0-@r?f05+<hKc<KZ3SD`&HcbC8AY<bLA-*JKNYIg_O7*fULx4R-P
zz;C_Y69-3jorgsNFc>v$-Z8v|7vrHDF`n8iyw=RU4eP8-yX(c@r;9V_mpe*+f2m~a
zN%ypGrFHG(Ho7$@E@N63(qq=JbxN%_SWBs9f<}Gdn8WWEd#6cj%dARU5(??HyO$W`
zmRp{Mtex>e2L#eEgYmVY**k-H3RdNDx^m9>u6bE5;m?n47JMcgzoAw*Wz7pkS+2<p
zec@Mp-ufG*+~Y(8krfn)>|J5DM~oV)k%=~)?8gxt|FKNSl5u6+kp&WUvlR6D!M`r?
zS7xJ-G5ei^9W9~#RIgOP!pb_>W|j&8OuG;tYkJUU2V&}j(|)I9e``D}FSV^!$$Ak!
zpLi{eMNi;U;NdzP<t%L9<^8#~(N%9S)H5TPtpEVG_?&Z@vb)>PzSB^LsxKErR9n%9
zQ2T4`WJjpud|l#NR|-|2^BvF*Q0Jz$04s(!L!CCW`DZd@l4{{^3x!B%FJd}VAs@~q
zL)hi2czOs@eOd@#s8+J~NXIM)yIDRw78EHhY7i;xaYsL(xw94_Y;yyEdhO*^o7BB|
z_++r8X^AcxM7%d{EA~2CLNS$po+KF#nX4<}_~Dxo(=XivAN3EJF)B<t%D}2wCe7WY
zJ!-qNv_c`ABIH@^a2T6soL|!wj|5;t-sR^6d_8*|F{`MbIY1YBE^R0kXjWF9#R3~U
zivD9sFRSrgeKB7t{Os%RI8c)MK<x@;a5vR|EH%SiYQkPfq86iir_w{VD;Cl-c5VQ4
zR~ak|Ppg9lb!W?C`)>fRX|ZX~wXw9pyU~)Lj@Q1a7u|Np7}^gE=G>S&ifp$f=KB0x
z+AD9ys<la&eQBAWgu2!~4P%|&Qr5g$#Z-yZwo>$op$29(LRch?_og>#8isa^%rhNI
zX~IQgd4}#-iL5T?l;rehVVVY97pCbsBXFlb>XZwKG=tfr&ObOrj55EAk{VZff<$5;
zww8~a{sQ8^tv)l@@jmic`azJ?3F(R?>3QEM<;48fW!MEbiRe{$cA$(nBcq+$M{d{n
z;Vr-19jC0a@(MvoY1U2~TYG<43)gR+&I6TU7M6|O0{#_Pj#<kqGkVHvLZL_jL8n3Y
zsDPph6Gbk!BrgH2<DwJU$V#0o(r;ixin_sI<&S!?AFZzq&uM(zLxt0<3|kV#Fd?G_
zow7U_(<DtRr?T1@H^5xIpo#$7Hpl#I8D)D#e(>}kWU=jKSOg7%?ptk=vMTay<9YW|
znUKd^K>cruON=asTv8qMS7;91eP^IuD=1S@Mk)c~x;4M8AYX<QsYuQ(UA&J?(R>%*
zwYMADC|KO8k$1YKwf5SKLE8Zx(_gWb#(ug>Y$yx-))g^*;$~v-?S~cJD`{ga_Bo$t
zOvj!koKZF5U;@3D5^6D@T!Zhkpbap?mEzez-<NW;sCqY9eTY02+&V<srg%1*laM1S
z(Wh2y0oF5-cYM2Rfd%s68)!wYI%yvu(^{pI^eDsxBn^z}g`z4lCWpTDzp`Zs`>cxQ
zVuKg(U>7`e^Uz%TEV1f`t#xMU^+?^&$vZG{x;TL<9+RT9LF-Ze%K7~XiN34V+w?E_
zu)}kIhk|=0v6*l=;S_D<^7yIq%b4j==ITgiZgkt%EONu6boTF51YNhTM{~reMtl@6
zJ)T4u*rv~z?K`eGqaZPPc>`GQs^16|h1Z;uw9Wv7SH9cjAZm9NUL~@L^9Cy`Drxx#
zpImI*27)NQ{RqNEoJW(a$0YlHzWBq0*FN`mQ2L}&lEl(}bbh+-etv&Yh7DBDY=~8v
zO@dT{_t!iswO05&!Ec9`r07!I-0dcU{WLz*<J+S~n2~b&Mh=!~#Tpt1{o!9LN92{e
zzr=nFI5Juy$NqG8UH3Y>Z;bP<1tWt(ysu2Iaz&re_xUj)YV_8k0~~7h;c!zEBbUZh
z$De;#U+BdGP)AEY+hyR=s7vxT!xjOVD>J@_$s()YozhnAbB`15xo(le2d5{I#)W8K
zBUj$wFMmEQ)4fm|_hVl_6uNt-)g#dVWhq+QU~!`oyItxYTE(g3TEw837Vr7IhSSP)
z{Hp(UazHXfJfMmVxCq~-Y9_lnc2vr}HxwkHBvBVJ=<sBF(uDY>k!xl4Y5cgRV@l46
z)^9_QM3uAVdy)wChx@M&4G${=dobLOPaQKWtKFT#Qd))972hOCGU3rXXcDSLI75un
zn6oc{hQivA6T#BieEov*lz{Ku4AFN*d9HV>7P{CwrK=Xmgf4VPxgB}5IMn$y1h|qs
znRR4}>Y^r8bl?jeOEY%+H8nwT#yF(aqJuK^sx6$V%RYskI<?8dE@04Tlto5=BGXQS
zI0Z*Z|08K8^6l9jFc3IgWo4Brf-K}pKg;CiSCO~5OfkbPa{aV4wZG5Ze=K8Ik*yVB
zpKh2>VhB<%t>Xg4M#LF8G$~$fbFm?Ia>j~LDd1<y1^N!HpmwqFd*?Kp(RW(!DEOf?
zWb&;tovc6Wv>YlL$3J**IyYzZGLFSum62V5bznC<;^74%q4ZeTwdQQ(l*%&-VsaV%
zBaS>@9)GD)o9pquj@idN6H>_nu^ENuUZxP%@y!J#%c_86Mor4M#ruJ<Kimw4!P?x2
z%<db2PIWggP-gYFlm&=d%2#PI|5$w7rWFaQonpHsPXpr7|1<B`uu6Adtf*Tx8!Jyg
z<$9@%0?Avz6Et_J^?*g&zjReL?Mih{G=_#qza4<9aDCOs;Fyfy!;#F?P`=IT?S+{#
zk|4A!ffX@<5$)5xD1C`{qTDH5bd0aVBV3OID*cOoD3_xd8;bUYiQ5T^e8VcAJ@;v9
zN*{`rNhdtae>xWyFC!6OXga~IBl#GDhz}_!l+1n;dQWRh!;7XFTw7Vb$>jvZ-+cS2
zK>f+;N4B6rOp0eu)!V`G$MiMkSsK|@uk$B6U2-)+zcZrZ_pft*!e4)j4Ef8Hw;LEt
zF3b|_#pO}bX0_w!r{VHLd8v9)2BArzm_@tmOu=1-{>}xlAK=gRP#T+XIWP(YAI73h
z4^vk-#bQ5tDUcr!H(y8Arh%uaSJ`1%-kG41M~%C*(TZ?ml=TUO23}(#=v4hB!D#+Z
zdxpm27*zhRB?aYow6iqtyp%2i#O?OK>T|Wy6i4f44QA2`_)92z`V96#U7(xse#tEr
z0Rcd(Cz;%WEF&R@t}BS&!j`~80XSrVPQy$}h;`2RfpB~*y@7F3)P@hU4C)*Gy=?QS
ztU$R&Wn_`0Ob+8mKJHJy+CBw_9~4-qgboq}E}k8o-*f8VBr8$OGFTaqf^+EbO!QF-
zr43rKB|PmI3+GYNh4}Ixig6@WUv{;0s$mKk^sp&G4P!2ol@7Ry%wK<1$FjxjO5ht0
ze>kR??k{>|ufjAAjaOhlc_3O*4H@p%o{(9cmBP#h9GnomZ#LenX{m2rJP|5k|C+)}
z=7(!~$5GHcqUeRg2fP+l+CaGk4f`{X^_rNASJ{gLPtTXzUg?Vsx>s+tG&@!uCCT#i
z4z<bmth05p^)$GE9Vzag3?0YRHb8f6myK2RTlf#ifF?Sr39}=j6%|gibs6|Hg`B(O
z%>gYXGx3;0q>|EL{`X-rIb~jPe-SNjCG&wIk`ri0`SumVVH<;~!ZsNHO}f;a@_nYo
z1Bji=h~iJ9{Slp?H-MPyk%ZX)F3jL>CL2H*!ft8W#bMZ&X4g+RTt8bgnH$H|=q7as
zL^aW0vA9W`qUTy(J;Xru?9raoEj1vLB4F*pZEfL4O0~S=3n-WUa$XB#I3zX0fI#W6
zK9w=*B>K{#H=7;qTNZVlzLPELB=!4s$2TzGP5rfS-p37zwjc`+O`I_w9V7YmdxM*>
z?1!72FbH&O;XQL#*mo0S$(AC4&f>><S`c}Pjatlau{SNwN3jC?YyCRt<lVG5UUe=_
z8AJ<&v<PlF*Xa3FK`3_xX|e>18m`M@kKhH8tJG7XAGTIwDBY7^FQnVmpz5-I=zVR7
z`ays1vjdq~GAk1)Fb`;M<m$Gs0YmZ7Oe1s5L!jY>x^q3m*4$z385gAuPM1&5W*Z#D
z8V+Qol2g+-UXs11ElyBvaS>Wf=;wl537a_m4uZ$lx1yKDP4T7J_s;qJ;g^}a$<3Wd
z9~L%K7ny_8N=w|MB^`9uhO{1$7@ukZ$UntRF_~_6S(pcb(<-A+cxFB9oktFC0Li|$
z^FUFS8$gKlry^{`z2@-G*#5I`*DxTWAGii|yXWCDGr<k~lqpI*P}$uN+8ePr^B9KD
zkVD)h-I#*b_3^*H5nYe}`GZclYov}3(%hNX1TulL`S&d8MzV);=M@iWi~P~ay`SlL
z1DN7MiRV?>*PFoS3=LSo77^E_c1B<0)IGWo&7<LKfg3Rn?O0=k<Li)5tDYM@A57&?
zoZWAB(~B8;eBVtxN;EFY8*s5M-{h+h7OYy(+wUU7^M}IN57=HBxf^nsYPbrR&VjQN
zMo_@vcsRsnj{B;vtKF9N6?n?A7<157);?dKvvS#CD0KsHcmC2^=+SjWo-81P0O>?5
zRqpdne`8DDrhl5Wt(Cnm3^!~?j8rHupy4VQcJ%dqE|In;H-N~iC-l3uOwQUNe=;vt
zRTzJ*Ez!bj0tqyJHI3$p>=Qm&<aP|$s`mCr!S#*AN?y1gF3-7)K8NqaTqB27#iBYL
zG`~Rw-JZm~Ip!UXwQ@ETOv`!Ix;TCw;&Zfo@y0Bl)u*Lh`%sSVksU<CM6k?LC&Njo
z(y&KDLWYTk`_iE;<fY{+qCN#{q~aO;`G~Q}0(qQtm_jTEvFkw5#PJtj^ExbYT0<Wk
zAlte>MPP1R#3jR&j$5i7ZfhAye3#n8d|^sxUHQCWA5gdRfOoxBGNzBEcPUJ}X4G_2
z;qB2kyWg4BzMyrut9ew^e0SeN%#|9N=mwDDF@7}=@cgu+=LRsib~SuSgDCi5Ler$c
zp1!O>8_SXJRYn|H6=%lheeYnZM=qjv(vDKk-3K^41NRMT^U1cZ;C3*%R<_|3$N!xD
z_<=2>eyIZqP9H?qgGpby$ST7rgzpb8Khyz8@aP7>VmLTYezvxqaY^Gsq=wMnKelGP
z?;hA?9nbs=#h}FG{3kqfx}ZG2uXA?w7-$W><DQ+G#td=f1R(H_1zv42F;&yGX8t;G
zOHrIK{Ms@Y|8_zg|Cz`X67xkRp(1vzs3lQ6f2X}vJPMuEFV4D7m1sSubZ8>FLT}M0
zwD|ZTBiHF+cQHmJI~Z3g7Az}$nqe5H?dMSW{5`Rs-1y|@iz*GM?1gz|!@zKGKNcKe
zKt(+-bd7f$7tzNA<NyuFWlK952l;;+Z~yDUKvUXP#%{t`cFb%Uq#xyy9PeJjCD`tj
zD&2erK2comxTGAs7RjgxNgDWmH_j&>6#3%vF;M+uxES&KTMxs3bgRYXpZ4t}#n8AC
z*oX{orrQc9=d=<D)RoE2PSN`}g1O@KNe9xNA0$z*TV?yq8qXlIAut3~n^UZ2<foek
zm<ly_>D9b?FzoT+ar$Iy(t0`(jJGWNQA|Cv-@7mFp)Di5Ll$Mm58`1dLaA3y4OTrW
zI{B~M20umKSzin^@qDm1loDhg<gjLHrQP^_pKFv=yqlaIA84w~Vi#{-?JCEb-7roM
zf3K@u94)OK(Z6==6=gzwQDirJ*y6LH7gET~omu~Wp?9t6kqz}DUg;`MMp*WGKQmh5
zV6p%SDq&NSb(%bLVR{D1>5q9s)NSGCK0kw*F~cUz7VAck6sIT7nUC+*aHNLu;V^XM
zC-9<7Dx{I<zz}zfZmBF93X6=(u&?c(4D_iMJMoSaRD=IF!v$0J<Ip-lUc?GYJekQd
zTbim={t@U{a(=yNa%xkmAnyt`&!b_UDTPYcr^X?VJ0H!itkzEdeER#l3fEbyb;-8+
z-H+ko{ZcXPc*id^n3pl@q%85D_`LJG7looV+?#tN1pvHbtg;_zXO-gArK)bpU!SDt
zA}!_+>t8rsTv|!$HtMFxIALg-i%}ruT@+3o->ed?KD<X>-`2>n!ci1ACxtu6MVviR
zw1kk3&PK!i;NwgkVP1?d5UBmW&f^gbMzGl<#@@CSQW2<WCX?RqV3&F`h1<=jB*?Xh
zIcgRq;ifMEfvFFa9>;fh$E+fPKU$@kU-jnX>lDN40Y-F1a+YV`lMg0Mpp^EeKMFxg
z=ioF2pgx_xzFvtMdT$%Z^W-B|g~|PDPK@R^IY-qdK;SM&u^I@Ot6-FTllbKGtP=dQ
zn)D(ZZh=6qj~!65rBJ({y;H4<gT}5~wI(%lo0ZnJB)9I3!adxS4M)Hqvua)Y@3b)k
zo6V6@9*}XApQY&m*cFxu*Db#NB=COYBi_`hh*8ik4d8JlwJe5?q7Z62d7Lc2)OC{9
znZ6bj!58?xM#m_HHy6|mt$CLU0Ma2`509a<Qs^m2GrXieN!w4|?3s@>QEp|{owaos
zaq_tJoS?L%^~^zE%w#=CfIMG->x835U2tyW0ZTFz|D2%)-xT&@0{41dQi~o`cK(Hi
zs6RB>M4zPM@OnptlX5yIu61R)b29A3>;$+u(8GGBnoUDq#~pz5#*=VIAF`PD*Htm`
zGLG9b&w{v^%crksP(GT8wBHv?Wd~!wXe&O>yA9Mwuzw5J!Dt+MBZrAfiH5c^<7b<H
znSfn2*6w$~0{y3rQS!Xfm9RKBM*$}IM%er6u1_`<+b2h>;hM+(9Xg-is=T<gk8`25
z*DWDCL)fzQGdhxYgEtuK;^KWBkdio`IhIcSSYrwb*A3idqN4a6&z`$6qPC^-dU$41
z*3BTS9eqAxiosCZ?izgbTbg9{-s{rZ4W0p2^K{*$5-!mho}j@96V4UqV~U=}OgCAN
zFUFQyTw`v-k%$_<&nMIC$}ql&+Q1qtcI)73jw;7+I)!=iyW9hN(q3ik<-;b~J1~Vp
zYhAKrVu?bYs}}p@LVMFC{ZC@HqyB|x|De2OODwVlG}#zlH6&^*MebnVegk0qGDs_i
z2;6kzh*qPc-)g7Ho#7hFvX&e5vC5f|R<b;hlT{LS<)(YD5h5pWLEw{R@j(!&sp!4E
ztZ+^xFIOP(W702k4pjQCY6!ZfB)RV=5wt^RxFrw|O2J`xPvFC&-iQnweJrqRTYL{V
zbL2)h&b6#2XRSt6?3b_EF<j%9yXA}Au8e69E{ilXfu!`4J%<{XuGe6T)Ce7|jIy63
zYnIeaN)>5Jwnbr2r0vC75QQM;`Hn1@dbvxx(~3<CgznR&QoSk5d-;lSi@okc0pCmm
zT&;bwEP<E23K6z~ftyuN1zm%@TsIyb=4%UgJC6)%*s<0s3zW5E-eU;r8tERFG}*6k
z>^CK8%1T39=D0qD>eKmY*r7&8S~p=o6&fq<)O5SA{P{rc!Alu?%s%glZN)rx|8U1g
z!vTy5(hAw<fx13<)M=Ceo`{k51I7<kx#jghZLcQx5XA@s@Kl&B=_Yup6Awc_`oSVL
z_JTylqs{>xmpv~U>RzN41(ids$H<buti59{D-K1AG<E%&kl89p(~6F3$GmlZ);#UI
z^c`sWc9qQy+D~4w#G+q4z8{USk2B{V`OkXu#NNus%f$8Frx{sf&vDKM7$^Dvnupa=
zoF@@~ly^+YJbpbXju_#reEVAygc=4F(J?~{QFP_MtiajLLURmJNE8dt1W+`AK1Yol
zRl3-W_$i?`n;C){Wyy~7p``k<{6@nSS^64n$fJjC^W8UKXErDVZw_1hB7V){yZ<0>
zkw4ipPiUrYc}J^)3^5Qd%o?4-Bc|s?7gdoTDUx=jZ`eTZf1<ag!?He-f8XtiCtIWr
z+NJ2r7_e}*H<<zkHOWlMXZQprr2qn|ynmsi)8A-3JTS7%Ao5B*fXD1NJGK%wB`kWx
zt2PUc>o@O3KBR{>vnDsFCndsi?U;twsS3`Qw}N)4nvrHG=oh{?#vHGWVd0u{iPfl|
z!aJzy2CNKk*w7FCylNM2I{2b~c$_E9>l7s}YE!Wp>0L|vM(mXZVQ^Cf(9;D|Q7bV&
zUKML#3(om;A0qWS-h4?O1ukxrHgQDo*#+(x20OjdSeKMrIHjRBjvAqi5A0~#;N5Mg
zV!e<wNb$-lbJJo_6)>u`s~hY<))<Ye6e7c0T5YQN%c0$F;dbB@a}MWAu6iL?2ZIrU
zs+bM3*JNf4^ag!*qgf|V0EyyEb>p}r=;r5av>>mCr#bKZv0xR<E1B+eSqK+QmB8>x
zAyD|`<{Z{?W_GYE8hxj!Fq5p-|EpI5R51Rd-%L%IliX14snP!MfQMNMS=8v;^x;_+
z?={k1A<eU<Y`Dxxd4@z-q1W~x`zo5NZ-dr}`sHitcS-I~2wS1k?Aj-RWpZPI8c*~E
zcp*0N-5uY9dgmBcaL)R1C!i25;`$=qc(b&;CHaOUJ|}aVf`gLhj(_YMN()gH6XMn8
z4)zuTTEn$0TjU<sq*o7RYoFu&P>C)1X6+z;NwmRguT{kC!SCFgLVPIJ!|w^SVeE@@
za7*FQ&!n&=JZi|?G`eD-PO)u-sH%(hT$uLNiWeU;iBuI(4|8lCf}>w<bW2judGmZ0
z%Z)naJCT0QBqC2bUGM%zfGNBJ+zA1pDeIM)=OO7$RQzVmLNoA{p+~ecgeG!u__#mA
z8}`ZyzuDM=2|t*s`EuP`4<U&^Z|vC8yMPB4XweL(i(P#G#$55z^;Sj=&RUbkm&DtR
zcE)m{<^6@S7rvk9OWtL|TE=Ho9!n=jgDDd#sxBF#v%*DjXuUtJ$rAMHs?$HUv>_J@
zGZ1;UPGh)qHD(DHolgG{V`)@S@rZ7~(eop+g7vs3C-`Xd{@3lWkrC}Nd&`*YR}DNY
z5x>UkJ`b(rsuc*pTxc_iJBY#2f@~#*O>Q_3b;vnCCe((S)`YPC01p44dc&3bL+KEH
z`-cIXW+H6~-{@16A8zH&7qkB(fs&;Q++wDZ6#P~^1&L7-PDn0cmdnFJcPc8GqOfT|
z8s)zIVLLW;-3^&PSKS;nhj(K+mY1JKF$5YJCnnNMW%RI;;DI0K{jgK&u8S0p4}S1l
zF40bUu&Z{8S)q}c1|H!k8h=i)mNr3H2W(fSz_cB_w;J~fQieTw5zYSK0b}+wO}1Kx
zJ(+IY3F1_|Pczya+3(_}U!K{PV~4$t(D?CZ3Gu6t91;YTSveCa^MLWZ(c47Dio1<i
z&>pW%^gSZ(wS|AyN>kMYTaJBGVx1mc!p>3uSS*X^(H5_6EjoEbohiQ_hSOvxQBu{l
zM8HG4voM|6)E9(ntMwyklwFI*Z#r=%hmJMDS1@p058L1#oto)uP1-9fd&~1t*8FGp
zvV{cGXxi)hN|ev#=$>QPH?CE<l-rzd00mcWtV-G&?%za34d|csE|#>YycBvrx_^uX
z)~(HCI8{G%-O0dQxBQVk$D6m~x|mO1;N~@{e2Vh=6z|3&JgcRs@k)WBNN}wMbkFgp
z!!BlgV6@FXZ#t2yecgan;=JB}bY~62dRQ!*`#}Azjf`Ga`=!F|{kK1(wY*2Rho)o;
zBHjI3la_r1D44<)<eh$gKS&5NU>W1#>=Di3gDr=%)s1~q59uxbYxg<hJxy{;T3+{3
zBgs15^CUyg0tXZ-$akod)-py@O1)Gl=63=(|Mlp98T?;v_OIajAC^)S{*ld+MVl>*
zG62VYsoEW#L~$}=^7RK(C5M(jE^e1N?`q!w?p}~-+yLyU6?kHXPef-b&%~?Tcv=>S
Q5}F5WO&l#5h;A1C7j|<&asU7T

diff --git a/plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_navi_c_2.jpg b/plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_navi_c_2.jpg
deleted file mode 100644
index a534c9f3b62d7558faa9341e596404fd72f88b62..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12530
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
A&Hw-a

diff --git a/plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_navi_f.jpg b/plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_navi_f.jpg
deleted file mode 100644
index 8054dbc5cfd65ee6fa6416792e93205180ea0eae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12916
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

diff --git a/plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_navi_f_2.jpg b/plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_navi_f_2.jpg
deleted file mode 100644
index 38718d90e450ba8d6925cf61e37c8d62af32e54e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14103
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%0A5(-6pUXs%DgYFJ?
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

diff --git a/plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_navi_h.jpg b/plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_navi_h.jpg
deleted file mode 100644
index 3de3d0508a89ce4b801f40f9c9c9dba83164b689..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11948
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
Vous#7us_B+<JXOKmng@t{s%Gu>Zkw!

diff --git a/plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_navi_h_2.jpg b/plugins/opSkinClassicPlugin/web/images/006_openpne_navy/skin_navi_h_2.jpg
deleted file mode 100644
index 4f16ba1cabe70f5456b79db8aff2a21b69c18067..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12345
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
Z*-KW|@<Z}(*xwm$>|BUVN@zV>{1<S9bTa?|

diff --git a/plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_after_header.jpg b/plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_after_header.jpg
deleted file mode 100644
index 577f4cea9eac3b6e5c0e83e3c65b7f207e2b3e3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19904
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

diff --git a/plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_after_header_2.jpg b/plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_after_header_2.jpg
deleted file mode 100644
index fae1a2a66491bb34d4f65af4cef21aea208ab0a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 22035
zcmd3Nbx<5%yXN2lf=hx7Zi5C-aAz2Na1R=s;4Z<P0R{*mxDO74TS9P2a3_KV4-h2y
zPJZA0Zq===-P+ySKkk8Ux=$Z@&*|rRt(u3$hwlJlh?0sD01X`gutEI*9u5E`3f|UE
z{s1%pCIA4?LRB3B2xV>DtZV@`A5b-D4=aF30Q!Fx4Ad0{ChClViG}&MU}0nZQ?Rjd
za30~{VB_NA;o;&w{;vfM0|NsK6AKp`8<zkd7oUKL5LJkX{%Q0de;)tq?!Wf?&%1{Y
z0Fp<5m*|riXe0o15;P1Fw1<Ac0N}4=7-%Rt|D&K|0MM|oF>xN@qW!!4`w?o@D4DTw
zhyf^R(9yAQaIo<3v2jpKMAZYZut`W6$@pcp$#E>Fn9^r5^xfY~>%u7>2{3QyQKlCD
zkb_z^d6%+zgr^Bcu&_pnC_QQTSmYUrJZV($5>~_|L5+%r+6WxXzY?M5L<5kZV=(et
zl48ngrxudAGeOC*j^9lE5U^ry_$Y_%k#<5EPSGgH@~{kej9LLY2?hy38gOG0zy7u>
z(SjzGnWnkt=AzA2>ISw5oo{{?UJ6pgOjDUnH!(qTrf*nG>1#=;AG#)2(zy^P{bM|J
z@$>;87iZPGc%b~lNqN!w4llO+z=!#`x%hzpK8gf>m(m|Xfeen8o-Af&d>-=e2l`5Q
zz1Ao6Q8o0IDQBFG)m0bL|2bM>V%3HGKX;T;QB?Ym2pQvo`0Q`U=;f-g3>lv%vmbXC
zAE*W6Rg-bZxzlR?NYGq-drjdHRb7bI-=G=IBW-29qc=)H@`#W<-rJfozk&aZa|>_l
z@9nLi<KJ;=wcAaLJuu>}3PL~W*EKYtp3`Iy)1)PHB?O5&-q4_0$hMnCpjxay00@?Q
z28SlAV6Fx%zAW!ep8oMzxDb(wvX>Lj7y*tz2Kn=2TtaPL?dV56Kf>Eg{tkD4@APB;
z)e_Y;MWKdxxJ~l+v}z}sKLJY@N+D79(B$vg%x$b(G(%GKEqAH;#m2kJufNxVkMNVL
zJ%M-fuJqUXAxZYo=pP@=-}_=lSubAd#ecid?@6-PM%6i$13&T@UP$3Q03urNvg?YC
z$t{1-QtS@B{tl}S`E;H3?ZWPF)AAp*=w2IbtehXM?o<JxyYH@rYonweeW%#{^xD+c
zusT=YUiy{O&U^>?EpwR0dr?AM&W5E>oxU6KP^A_Qo#SLQG56KytU0V%=L&pHt!IvB
zpg+ohIt`i_%w{9!ZwSla+}>hi>Hu?+59|<BWrmUS0{~H&az=1RJvlRt>TeE54azp*
zaA!aqTHv-b-_^{A>4&*1|N48T^L*W$yQFG}V~=rGxCDAGhbt{{j&R+%jRiDC*n&s(
zBORKU*6MRc5hshi#hy|+M}J52N5{C+sP*GEEe|~aY7+Lex2v`){xJV*c6u)pY5jq7
zj^BExvq2=^$w~=6h1Yes<X2f;!~HA&)ea>(megMJ{Xc!nGfKaw0P6lq-fVmrVR7O0
zcWQeFd(?=a>FDnfN1d<scK%M?qo0Bj(W|iSwXTcLx4EfqsKo3k@}Eh7pTaSmTJGzT
z_EJ&8{L^&?C8EJv=C`>MRJ*yL8hT7Wtbo^lH_`<edPahL0E{ZXtAiJ#CNKYIFHH_V
znK3AxgMaHsC;y$Oo5K}9v4S|Hls2?j^Bq#iOXBZxfFD`47=zVQ^z()7?RWf8GR`D_
zk7(<=&Y`Q3a_rHF`77c^8`lx>ec6{P&3AeKt^utw-l^xKx=G{`{oVbc*E;|1<u68u
z+EdgxRsT~>xqH;Ph@^4Q?CC$#qadfTfxqV*fV`^Q{5v~43f8%UPi7a-9e(SKOdczv
z5af#`p2%0(us5?^o?eJrUM`9ZzE3T5tmn!nG}-0<zEby9@}p-xWkdf}K+Auv>whEQ
z|C>0${|5qg{`V63zu6A{e-g*kAGXfMQp&~!f*Kh?!bu-7vda->{G8k67)%_Fv;ZxN
za_g3pkiBdV_(}Kxh;(<`i<Q3dGFV^uf^UsTD7;lY$w)N2boTr0V#?>Tmz`#M_BOt5
zb4QxTy4tB=|DXaAS;uE47}R%t;_(Bf5e#8hGVxY#5#CdEIRxL0j#YPbYIwdiG*`{M
z4R>P2bo^8cn*Rc8+1|WA2O5|c9{(J)Hxh`dVt%|_hbyZC4R29`5epk^(aXvZc(KdR
z22{PqR*c#Uzu@iu5)}CUAm;F`ikhJdY1B7buuk&shfJ*+Ih{rD>=oDLea4+WI#WQ7
zX3WdOZ`VF`<;qG_KR<f0bfvSjOO$V$ACZ35UM;PakDuA3X$zXWMg)kFe^MgBsOPhf
zRQ$jbLw_PJGPvfV&F40n9I-3=u9&fuaDq}r^G^x&$=)5AN+oay;G00ix8|AqNY(26
z0T7eNx*|B7%*a7`Gpm55(L&*R7Vsj8tZZ|CW}XORR`d5SgEQlIxNdLS?uY2-g7#(!
z1j7$JoHlA@7}*dNxQNk4bVo$kyDGIz&2e!jNGVwjg`6V-Uc@C!N{(2>E2)?dujCXi
zh{F?ZhLSrX+V;if`=(WDI7#P>@k*(uSrAAHQ`_U68cb7fqHi^r5aCkja19o86t@OF
z7EfsRYOjM4v_D-{gf1=>P!U#a0iW|yoq<$D9v89HX^c*4^CBvAa|1ZT;{vFs<11oS
z5OJI}m@2|05J@2Q6&Dz;rRkbsM$UsVr>tn&EmpBpr7l(x3qC{?8PP!|6)3dzNFYod
zOz*VGC-V?Y-H3yVorKJuQ86Y0&N3SvxTZ{*jpB%85Gb3(L*|gJ%vR4sldyK#PVt3A
zfN+_O-iVZ?+9-#yWOR0_hRT7^ID+Bh!NQo@aCM_ND4W8=dv7{B)q;JbRFLWYJ3B?w
zykvSF)MYYi0L5If%52h6iFbNf3LVp+!h<4Ep`@;2AjOjQlzMq%ay(L4+kEDqn+okI
z_i{$L$9+oqZ(lzEeh6>R(|?pckuDn0EV<y*|MBytI3ZM5_5rX`)Qk6I9G_~P4$`GV
z(z&+8peAqmmipxOX2^;#e`3LRLN3ZLf?&|@Cl$97gbo@w3cnlm=w@Xs$u)hwKdmB0
z5HMUFw$C7TX)YOS{kBU%p~-|Q1qs;9U;$kcIj%ChKLDEQ^_RTR_?SO6j3by+T`vaB
zplR}+#ITrUNr-%yqtL<5A^9sgpr4@dV5#NhZVMIHb~M=3pTQnz8)TyY?s%cvCyDDk
zbQXzT<F5~Ed=i?vazu|f+o_ZoPyRCJl1Jv}leoUiq}X3WNu&Sus{T;tGgrJZq$4^)
zkEEXnG#gU9&~3Wo@P???;HBv8lTK}uGVZQAr<LmY1O*%U<`rhy#5V;FnbWYKa@k5L
z9gB%7N5}b0hvD=%i)X{b%LW!ddngw@b_8gXNOEkiK%6n|wrDi-&m+4?0Z_fE%5||$
zqPep=)0*P9q-<KtM2DScW|jJILi|B}{O&RQk)l=Nj0S-zj#dGFF;|GL)^Es_Qc-WQ
zBl7IL!xO_ER(~HA4C>e5=?<nyVy$#vg!i>Jup&D~Z=m($={M26u+P|}{Gtg@h8ffG
z5CWK(bGBtNdU~1J-1&J31|bE^IXzgqo^Dj01ec{2%n1xHHpVOAnD1k$m@`%}utX6<
zR|s`Va<FHuNaBoCVQWc*HO&~~)e59c7(Yr=YA!$+;nY?kBI7H<j(?QnRYacYr}9B6
z!s08U5tWW~kV1tt0taI9{TXEiEQ)f4Mj=ETWFhYE`Y(|<nGg&sOL|i{eCF@kQ#G_`
zy-*Z*iBXgs3*qcw;J89`u)=*(@~VoAl)6!Uv6`lC&b;(Sf0UsJws|olz(l~_SX{&~
zDQO`LB*6~&aJ6TrV3`-6ol4I&rX#?$<<DuS7?i3uoB|g|UA-_@cgUtVy@ij*dvu{r
zSMp5|6pIYfP$#Vea#TeKM2vH5MgTMl3`enuZ?m}QeS_L?Id68V0pEzS0&9cb6c6}-
zUQ$b&52mT^Bmi2QS*j5%;+0c=S7xJyOr293j%;0gR~z3B?0t?J@DoOpCZEb*LIZ=;
z)rRXb7D3rh2-in$Is%Y0;LrKD*j>x*Ayf~5xI0SDJDi396Jmo))hG8A5qIcZCk2K*
z_LRKHlXKoWYzHuolL2@y@D`X{;&jhXk!@O1Yi9AsKR`@Cbww3KYSxPWL6Q~ZE&kzd
z3W_Hiu=8$btO)2>bke#G+&Qwn7+hf(wwql{FW3K>%Yn1KVKLcTLG%ES`10)r>kJvH
za%h(Icd!Qh9D>xZ#vMFRvV~?B;re{WW#tJA<{M|*?IQIh=XEppx#Z&mv&)(gJ%2qt
z#ot5y2F1glJ+iD|WqR&@SnLIr?2f}%x&)ynXR)JVVsZvs`1@1WI98WROq5^Q6AIVl
zW08HTVP{8=8Gs=H_m*|ml@-d#7L^tv)?I=6ez{JgMWix_SlopPJza7|<*}O#ZQP<t
zE(tCfPMErjZZq|yLdO1Y{qSj7;SyYyIb(=6O7&{jU=^fk9?xf{!JTAD{~o&HC?M<n
zepef(pyv%es}W-W6>t_XA>#t{6is9iJ7Fd7COKj(4~h{LMJPothA6^9o6_Y-D><%V
zl2zG2A(Fe?yv9i**55+dbhw;rOl_2tC%IT{v~W>5v#J7x^%zZ75^XSQq_V0aAZm>F
zJ>48TRhb++by=Gz3}>JevMB08ajase&Q@7LwwDzJ&@WI&JB6So9RYzJy}xMK`m5c$
zkSO3OH)f|kVf(B9(PmH}CEp4a`A=lts|#|Jb6p|F5%23*1(}K#4~i?QGQ~MNI2So~
zVr&f*6?@Z?6U#oK&`O#shUnm&8Bx$G9w{g;DtLohiTM}y36z4zu?3Q^)XB^z$9^)i
zE3;7`PMs8HDlYnArd90J?(?V)i1P=#%`s&?|4;suRo!GD-WerBXop`fDv;VCu}FWy
z_nuci%aD4Mf2<~{kGOI?6*%X`xJleHcZ!8pmli2T{KHRbP3$s!vmz~ej`Ywr7#t!P
zw&OL&B^R~}NelIitu>$+UGMf!@f(UZFKTJeB47OJLi@)P7b4ejAzn5|_?h8~s{&@G
z&}Xi)!3MO6T`$m7y#6kGbi(AQr8ld8lp}K`ECrzot9*+;a7D2fBJZE;-!49p{XD8o
zd9%c^0M6pg$^hWHesZ>cZS(-hzGLdXMn944tv4ZxxmrCSJ+`Zl;QYpoeUy3UwaoyO
zOACPKYQ$^-y)S}Irhn9x!j~A`*G{=+jA0d20ryMmpD{cWvvG%?h8GE&I&{>pYg*!c
z4;^6Z&7VI5x`0I0-YXWbGza}If4kU$;?YUp6zSsxAEv9e)lF9QyKT~vCVK5cC|($s
z*50JULgkLM!Sn;5dhUJyIR>}VMEUm@wX?{Qtc<ZQhHPAXf+LnI(-{aRQ=+vkck!nx
zb2fQ%A>h+@cfJTG)N6dzvXdC1x}fjRw7)|Ng|l+V$!Ud=Mka^h0I)*YSr56kIW%&G
z^k8IlX$Zz5&YdEZqr_S<hjN8ZYNDVMdQf!-(u_eQW%x!#{PZM>F95_w#eCl+gk?T8
zEu%&YfzDZk`ZbzH#wi;kN>deNQ2vw?7zOi+vgBBw_}ch*8N^POo-P}bTvhsFPLDgu
z37iRa(kQAmIw&rpGo+UU62s>d@PI;(GRkcoC>#`Ilwa0hsxl$sk;O$h_B&;L0a!qa
z=n0_SU--vH=#C?JwGJw?DWXw|IJTXs%tndoRCgSO&1Mu&Qf!qKgAgc>NP8+38$}t@
z!oO@eoe@AKL{Ms+38kA^bjRb{g*};SwNRwV6#p0ZP`a11gEce7%s_z^A;!pae{P^?
z!m-D>m996ZHztJQS*WleQxrgZif~zsi-6<Y0c9G}a5U+rP{smx4;{q~PDu$V<Lp#n
zZuWBZuR2BoihW&-pr*CZ8_{d&(>YUN_7m0m`vi)Rh(!bMb(Z^4Yx=ooy#<OPu1o{J
zH#`=Fh4r&cUWHICHF@Fka;((xFk6c%O%r|>Bi-|J!>CFwZbdY4gg0@Zcm41@))Wih
zOQ)oHV&^?Yq!f%h>jUr5QuKVrmHNiO=~(qe-kuIGcc8r3wHw$UpTVDW%1F9fRt*74
zs}Etf)H?RRaPo3+RS(dm3tHj@z)FAX=gVT470b@6hbrFZ(WvuZhI|ZGC->;TsQyax
zL(J1z)*vBxtlezs-I>SOh9@B-u3VZhcr{{|P9g+y9*|P!57g9f_j?*)yM8Z`1<5#7
zNg5;J`<PF>-eIDiDlk(U=O6bNPJf!2CgpA(AG(MXAj<8O{li0`KscA*;763H>5YAQ
z5J;;YDvtQ{%i(rb1QO~k*Y&RMP|VT#Btr0mXKUJcGyfCgZu$6ieP^*{o)#ZGxmevw
z4SVxo>p!2lWT$3v(B>@S7M%9>IbT%-Vt-uh^32ZmXfbmdY(&IXOc7Hvk?B!TGeJ9@
zWVQbKDWx2{#%Q`xoJjO)SgAdMGgkc*AfyI>9Kq9XE}%d;_F8)!vA8H4Y9Aot6z1?s
zDfCl85Ja5KoF1C6Hi533Itea=*PN|ZM#!BO33nCpcCLT~S294)mY8f|#aK^2a!S#}
zu>%o{Q5Kt7`esTOQ<dF#no$Cag!_uKA}rjos0Qh!gHo&n`;#0yvBJN#r=B{EXwNB8
zNoELg47XEz<Jl?c{|nd*XR|0@edxENoi;u5NU7RRtPqaY4-~GmbOb<SWi|$*e-B`W
zU=hzdZxpzl*%5zTkP%di%s?qe6zuJi<DC!5|ISC@a#&ncQ;a~Fo*sx8BL{^Ug)?F&
zvV@37OB;K+HonCl#fMjE$?-1aUUE90Q09p=*Rg|hi?9a;@rx2djGw|l^5x>6DA#Gh
zjh>-0n+zTB;{)29_LK$Mr10q!`IK_p4{b`ZGZ^=!Ywx+}1E5&XeU^TJ_tQ1E-Zhb>
z*+gv0Q5pZ84*oT!!B54ppMzVo^l=t6rpGj&Y-}#N{I-^&RRUYqL+Gr!Ci{4w?0@Qd
z>)f$>8$B3r{6!;<!CnK&3d=ON@A}jGr}<V=vrphxzt-`M$Z<Y@kIc~N(sLXC`d3zI
zN43~iJ&&7f1lCLEFrS0*cbLa$6K0X-t*bdF=ijBcQtjFf{$y7V_&Edx46O59tR;TQ
zc4}xF{bZ-Gn^>q`n8Br$fv)S5-l{I#9zOq?@@}1deW>pX(NRmnW50IMxF=)H8P(bP
z)p%oEj6T4md+yb3Um55OAprzeA3-Yzp3V-_9mcA(3r!6Dw3eMh!0z1nC$g9Fpove4
zmOs&u#eB=uFuZ`?vW42YBSx!84u&kZgj~W8h3Bc`J_y;!AF-Mjn|83D82!nPlRnn{
zmP{WL^x2Mz^e}C?km-(^$!a3<@%^r3)`nP=i#rw`B>KJAcQC_yy(&;*f110|`w_yf
zn;#E=b?Lzuc_bl1-v%XII{$nL`(qu`;Cb9Sw3I2`w#{_B&#7DCQaU*Ed5feLfmtr&
zhgD+mOqBwrN)eO&XYRyj_YeEnx_KjLQFGm*Z^<vN%beyhllt_>kZcky*MoA$9H@;_
z5aTpFwJqxPHk#T`UeNok0T+t|db&naofBL44{qP$x_Upj5pMhmcI;fy5VpQK>-7$h
zTQR2m<lKhDYDL74%;>&Z(1*61+j6<to>%qlPMF>b9`9`qD)aH%{YW%sY05HXzEttm
z?Zz#Qn`S=L1dRZGQzjKV!j&Q*d%R|fWB#bf-fKR#VuyeP#Z2y8&M*Wd!vsx>RJTA(
zlX?>02ul9F2GGLPHs;yb@|W#oGkOkbx`;&?(s)FT0D7SwF@?Wlqky(y4ImM2U~CJ8
zcT^V{>FKJnAq4)W3lLRI=!h96^p18t`A+kW8781I(6N#6sv>@ZL?5ZBFlQs9R}K_L
z48v8}lk7PnAQfeBJ#CF{FKxmvJV27u+sLUYVw=1giCkep&bL%3%3v_Z;C;4Hq6SKO
z3o`K<qHNhID*BLZSke(-+PdOIS*;Effl;A@1@AxXwxu|&%+^IYf~bH36-;RV!|ih3
zWJHfeS~lFEX+-(2t^uLq@Rr@V8k9Y~;_P7L5b~1K-n??`U|d8IcnKAPU{@8@z`gY9
zgEGvB$*-gW3jX0XXpAj6-eYJ?Sy3dpP+9SX4JtO;dh@d~n|v8%cXu=uNz`+@?04#3
z8B*(d85GcJQj2lx9m*dC)&pPX-zVvfX-SiJ6796l{bl!1>;s_h?a;Z}U(YY^3EyMI
zgo+0Msnnwsx-QW>coeKX*7oh)`ZxHWz|5A((4(>Q!mnN+d|OjmrBblrJtU4+rjRh2
zw`<Pp*y6-?W9!qSfnHKk3&Mt8yw_Emk0Y4hgd;YXe2jQ!zXxz>`ff6kFh7A(B1<yJ
zK6sN4vYlDEnFsV8Yxd8(d)#_{m!ho0X?|(W_NNtY*l5yXIPvj`xTmL;vX$u$LF06G
zW{mZV23#YJA+k;=xmTi#p_Q5IJ>xx^TT2&WAl1*swqHWKwISTPO>KoP(6`r!Hu^%C
z<e8Oeu}VXo0dyav`632z7F}UDJNHcYqi;0MADxcx=4|)W9tkWG2J{0#^q)=xHPlm<
z3?#Yl4pVtr*E|+y=ODgm=Gz><EmnoUKi}a<5SUCL?nq#|efp<H{5Zz_n2B|aHubIA
z$&1?o(hN>HhTyM<hrYy7&#m3Iu`>!a`P5fM9R{;i1#Dgz1uCDA{3xC2{{jfoJ?<oM
z#l-(?n>^8Mq{H%da`HBECvE+m+^9~S3a&J(a|}L|kjhW+MDPLd`zOmuM4tt^PK;^w
z1s_!x|G>fXOf%LiB0-m~<--I1am%3`TU86+v@gQpWq-oGCl6QRWc$V|+h`W7|CE0p
zT5tUFr=-j8>N~9)!O`nqZ?Sp_vT;N*Udw9wW_-<cZz&WK5{HH1S}64-LGjyk`#Yn4
zt?C&uH3T_t^T=59inP4~+0B~jVwxs!{BnpjI~!wM``Eqevs*{KLpkrO#epF0s7}l@
z*g}lSffPTk7^B%My3g($qHHr$+g@NJlBqev9e(JH1%-@Uaj8|YQoPZ{G6HGnhv}uo
z@1yQB^lXi|s~VB$tRRK?Foj0PB6M|f8OLG<lyZ1iz?rG;Kuj7Mj(VJ{?x1L_r>Bne
z(n3QyjaUk*oDYBvV;gw|9Y{r$I?D5076T!DPytXxV{&Z7tBQX)nSx9&oqhB@nVzMv
zz7k-1gi68v4bnPLF6Uq7TB1xZu_G#a8!ay4)l*h5&1Xe9uQ6sQ*R(4GNO9T)_tK|E
z<pvO9Tw8em9E@9696Ng+6?>dZdUJBx%G%uJKM^|>C37hHDl3RPb_mo&C&$Oz?^LAZ
zAy_#`gL3r>Vtq)}4HQM_M#VT+P_bK0$rMV+Kd1=O9yL~##wb&cCQ2uW#EWsQpd5?I
zV|pH48C@I|1Uj$S8c?r++|X$za@p0oh4}$6g=pWy`6qPqtU9CX>ue>JUQ@HaE_-tJ
zsBS`O>qlIJGv<6IY+pg|^caCCQlujOyTNE?`g*VovMEKa{jK@fDl^VvMy_I>N2Q=i
zF11?SQgL0Z2J$Fz6B1(*Q*SZ9`A9ty73fHfzzj>Jo)PKDVGSn}yi`BT*rrik*QU`4
z!kVt9FXLE5rbk7H(oLxfs=`{O>AFlt!lk51x^jvJ3gUm4o5Bjz6Piwr*TZ9EHm*&e
zdfj1MBRTZTq(t@ASC8d4uD{$0^G<jU{k50BDqTJ)T#nq+c#q{(j;nqeZur9THI2s8
zqHUqFd=(R3#!Xfy7gbq2G?$7(hgt7ZnQ*b#=|*RTiD*>F!Ljo<Ym<tJhdM=~(m<$}
z``K1Ide2VV>S!UsJM}Tb<Eu^@WQLL!{AE0C*9B|fw0O{E!Jq+`Q-3xWhpeypQFbQ5
zF9sriZtQ)Z`mX9xInj)if!~ka_+7tuVr~ulO#eypZXHQtA|I};MC)h$leS`eaaky9
z&nbhaf~QfOWQ^PbBio6U+hTB5t8ECzoC)$q*Z0Anlu;S0m#7F_i5mUyskpcZWi7;#
z>oQR30<WOj<!rcj<gkaDHF0Y~i&3fxe}a)GoY%lVu`gwOv0TK{!kDaf7G&%+iMv+|
z-<?H(BUN5*Mbv+@8`qu>%`(j;UqWFCWm1xpQJDzTM&O`gDG@zyp#EQ&DJvEkcPV}P
z<vVn;5<Do|!Ov+!ei=(<H5j0aL+h$aQaWte_N#5lwhuZJFRs;$){Muzq9bqoUT_%u
zr85JJWn4{`1$})Q>$|yJiWATGvMyHyDQ9s3XrZ>MxBz9L5H7-IiYDqP<MrlrPVqyQ
z6sBm+N$Erisp7I+k@2E`zeu|P=~yHA3`iSmAlk^i55DKa2-#5)mQgIRzGwfwBrj;Q
z{Of(&F^gQ{#^uxLnpkfG(atWcA>E6&q%@hA+l%hG!`>kYj@m!W_I44_>j-1z9?=xf
z<pLO25U7?HS>*zxAVDQPv{g`q>W)Y;15!Bro>P1zY081}iv6ah9G8?F5-d{}Ls`0n
zU3I(H`iLRlvbi#~Xpg3zs-|?0ZL`#6M!9H~)Q}B!QwQ^y$vV3Gbgkkzh~O-4ufUBG
z)Tgm7W}JJBOME-cwwVQM8e3{;hfir#llYw8aB6H;0LjsSR_$};oSx5MR=7Awrk`Ye
z^>Gj_pmza<sdwj+35nv6NrzMARn<$Tb)K)Ii}Bo&OMNa`B()ubfe!%Kf+YABrQgY}
zdA(6FrVd{Z!|;&1g#9z}athbj6%{-XfHe}mxR5%{X<#QL1L)3X_n~VR<V~66b|Np(
ziEH5_AK+2g`WZHcS@U6W*U%X_io45#QLyf3u!DF2m`y>QxAMkRULE@UsZ*Je6U}oH
zW|rzz>JYRIIj1D(?{ih?pD<o@sN`k$i#5|Yi;4t^WgI~C+Buos=p`hH)H&@6A`?A{
zpQeE+?OsueuWm*&oxhP|k*qm%{1`eXQJ?S*Hsam+9DDt@YgEf3Zz;^T)RuG35#YjZ
zp86>%Aawto)M0tIcjM}%kDJNqWaEsR<L3{bPaU4<^EBDE5@oxnFU^%g+`)-0m@o(#
zB94G~JzSQN8b+=(vt70G4m=|m%if)N$`jOitB)VC2=0D48B0iaVZ8b6X|2l`ELMOv
zgMdqNSw0Ne%v@1PGl$%rMw15BnMv=RJ(h(r98$$?cMxzmh3e%Fc;04l<OnbmHPOny
z5wK2{24y}UO5UiT&-bpEH3n$Yr{O}8V79L1Uvkq9FIf~4Mw!M3Ptn>h%(@nN3@hcH
z(YOsbKaogbY_;C)!oMq$-+^S_`W(H^T<Mg7F2^HPpt;_#0#l8tD;efcf*^RXpenRg
zlT}6(c`&GNL={SUgWuTi&_D9__jZe4!)dG4Xn=-8!k~X+CbgvjMfhsB+<br11bP%}
zeWT8RadMKd@J251DU768H{nQRC@63~#>v(6vz9aI#bs^H@U8L)e^t{(9O=5L{+M$|
z+$5b&L$1pO?38>a{?RI){`1{(+u$1Z0tauQ0T~wHCooK&l9%?#Jl>1>*+un}JDZ+R
z_RBAM-4^G;A`+SdZlg&*<BU|yL2GZ@6r!8U@S#s5_tR{CkJ6ADx=gRfu=0{8U0?H5
z#cV#oPB3^BYC1EDt)KR|8vBApboPtgG*6e(B*RR!uei_cyu*v;K6#IcPOio^mj3wL
zCag$P*!oK1a-Oeae&kF*BugGA^=<P{sRTKeSEWz}80{$cX8pCD`X6qucPEU$u1e%j
zC`KrEPRq<JnxvUS7VK8OKGT(h0~9hTPv@>ALIs2*p6}K;mKV$<j$6}yaLo_=M)i#T
zpt5KnB0sq2>-nda?W?=(7g_cLM+Sy(Y@0Y~mA|<Kc(IDFK%$Ga`#SW`EHsO`n>iol
z4m$g1RO&=J3%G?&xF3eFjkS5+tZlDZZys)4ZmL;``g9x|rEWU3YKS9ushx(@4eq;@
za%>~FmKa~%KqPWmWn1$@`)i>=GM(TqS>y@}Gn>E}bipP8bSWpR{hBe3K*@MMlBG_z
z$m{;uMj26|!v=Wv?K3yp#h2RxFhGvz_i~kpG-ZdYj7BrQtH)eHBkl)A#_wal2?t*S
zbq#mr{MyRRN!J!hlk{poP0c<}VI@+Z{%pnOb+~3Y{QYCZN_@W+uJfn6_^I!I(o<JE
zr()0ui^w=r`M1amTi$7&WUkM`%XNyNxN{IjW<6rAUETZM(z2xz7jB;P^rh<~%A6-U
z3iu=I2G%k;A!+Vg;9MtL(YL_keubNWQnB@tt}$mt2PljdI=!q>5*e<W>s#&;6yG5!
z6p+Z~F_Me0MSH`hm>~GxRrHA|%g6gFLW#*0^AXoes$(Xbr}YZT)`FCtS(u<~SJiEg
z99uQk@20oY&9YNwVadWy4qos=DhNdlCT!Yo>lN#8<CMz?TP)`Gb_{op{}7`_$G|ZE
z{^lbDB$fJctyf=P-qDXOB-{lepBJBeh~5oUDT`4qpB;S$=NwdaaDU=F{;Ol9w%OQ4
zVC~1yddK+}a$a!rr`*-SMq8Da)ukqnEFW_KR4u8K-GH>(JF9Sl(on-tvjWGb?e!Sv
zz>>Q!O|NO<TKQa~s(;4)sSdp}Zokv3TcudIZ<Y^g%a32k>ObKE`JB)lI)n)M(%5c+
zqexvVHNtS68PCe&*5&lkP8aa#-jpM7v1Ln?XG7zdL-6^FSdk}O88o6J>?;MITUXQv
zZX%b6i&u)Dm78-WuJD3Pv~U?>K2Q@D8|D}7I(*iCAB)b=o{B!L^Z;m<2c!4rvD&cP
z`nK4Z9O~~xpQQFIdHk@79`f^fvC`>U{RB-5a0J*(EjuLFg?p6liaFqF*bKfE0S|}y
zr5=5AGVI^f!6a3|2+VlX{wE@R$wI+o;?2HVISpYewX=8qdJanoH|vKqSrD@YW1Swo
z+_XMb<(Fse{c(4AtM-Ei;QWBW2f$ol%<R$wfW^S=dX3=p0bqS%Fox0-W|ioQ+bTmD
zOnRm8uP=Q+QIOS)!uR9Te)BX?l&Z+MtExJPrIF%7y}#x*AMfo7o$Ni!9%Bm~fn#H4
zQ*wWHZ(B9<-vk66JpV24`~quvLkd%Mn}dX8aeUzY=Gp%OE@#O92`=0XfcL9&wrQ?y
zo1g{5)^U$3bk4LAr3m)iXZ7WsZT>E--IZX^DebiagW^h|$z7rAY$eht!{I|-ro-%f
zk$u;W*)q&A-x&J%eN4YPA&~g@#*+Ph7y3(sW$F2y19<P^twHhFx?jecPhgXQ;bf^m
z_==|y7x$jVKtWgm?!uc{gKbA>23}){Y7_qlR0KUBAj>aK>FEOW(SeBZ@%#PoN1DD6
zsU$wqSe1}$)jZK#dW_tA>bR7M{0*gZnV4FE?Gs8wtgXOS;@#b+ONGX2r52iInnTQW
zQboXCD<O8`u|%FQ8L9-bOo3BfghK2kZ{5dG;zh;zsdrm>G{qdKjOmPJN;W%d3cBfF
z`8S{sImLkM7@LE?K#B6wm<zHpi`E6nsI8m4v0JI2;a-jyWwYSZPza~nCz_*G8Rub9
zpD=f4AtquzJp3|wB3M>3XnWacg4Ml1hWIgTwO(!_8PEOEo%#U~UTlU4;AUpR5{q;r
zO`sD-+w5kG!`^kjD(v0%4I~&9uDi?k$pA%L$h~a2s1$hKGQAR<X{s6}1}v4t0|s&K
z2GeVrV+a2U1Gkve@v_KU-H?(;MzqsC0N!n?j`0zf$Tx%4umz}C9WxwZEzC?z=%OVm
zX*Ws87;@p;C9z}xtf{3zbK2`Sw)KlLUWVcA2f))97VB2q%nDG1Q|2L8mVfW2h*J=L
zM0}&vYDMtj_Pe%~%ymu4c^_o-W{n%sL_~YNGHD+C-C+KVS93WBVS&|x?kYh^7<2GY
zt3C8tVuD0_4c~p$s#MvRE2f^5JJ;x|(1t&?J%(-)kg=6px%STyfo+tAR+5>5ZrpH;
zarcEB+m`fxck$641w_|*FkU44BZ;_Fw~9poOU|+DG^MQqI!2B=h%%qdmFy^U5gU&(
zyD|G^A+n-6hLWsEUcIZ^?|6Cni<Pb)5M@^6a$l%SgymNpJRN0@!yvA%c*gpL?8Ml)
zI!AP@aW%+l(oJA<rC==N7X~n$^l{G*I`2l$<jUPTf$3$P`sMiFG~w?Z<#RM*^@Po{
z%BHnmlmOrnRCX{Q7{(QeCF}CBxH9KiB(uZ%miG}_`lexBEFH^mPXjN{-ag%GS#_3Z
zb`EQfRryytMQ^BejdNs{oiwlvT4dr7eaZ2Q+B>Dx;oO}-lw|efuDJ8Et4axm`Uqic
zCeyk17nkJdK07ngq%)l-oofCSNL^xoR}OmO$~031qg3XBi0#%!K&4!Zr$IASPw~9*
z(_Jm?(GL8RY64w8va5yT1g1>5n|y|C!u#CVkRu`THhtciC9U-D$zjy~OU{E^ZkUJq
zQPlUwuzawWR2&-ZV6F_-FD?^55_oP)0#PJ*u@2mH*>;O-k__4UMc2T2%<HqOp$L&W
zj{6*+7A1Z)n3l`JQBjji3kI_!$6sAbisWmXlxJEV@kwR^b672XY)5k->TaYBS@^3f
z!O=^>de@I*FQ1(jKkw&Cb(zipwd6QB#YX;ut{5`fN?;d|40b}#_Jp}0nJN*KzVA(4
zSQ58CJZe9&Eqsznxs)>DQ9bj^z=WHoIHjH9>U55z4G|qFJdOu_A*Y*7vb>$a5*Dsh
z9wv5N8<0eqmtiD>E<<>=dDzRXkZh{^mL&bfx&aYq_c#8aG}bpR(&Bj<TZ49j)9}bD
zxsBJ0nR_3Y<K^RJ4d{}^yeF@Ha`a^8+FM7hB%>A3R^XKS?-e$(zmQ$mQjCFyc|;R1
zsYI@JQ-Xq9vej0+DoAm88S!Og9ZpLLHf|@qPHxk@a7yVRGkT>jaB*Tqb;o(RErfhS
zxw{J;h5Fy{`S9J`J~1CX$@@vgvrE<mhV|$^cX8R4*hYnDt0g7&@C*=ykpm2!FDc~I
zx@Nzgf5(sp#-Iucv03CXW0g^O!5(MsI&o_;&Ti+Uxs?5=>lMeZL`B=It%1mK(M6xf
z+s5f6!;M9Q4t!|`gYz*9j65Dg!UX(JmgJ}H@kmRoJU)NF`-uq#r@wV=NVFz(6A0*1
z5L`MuJY3n!$ND+qBj^{H^>#jXe&@F<LC2~YQ`2X-IWf=V)p7&n^U!pPu=Oi$krk7S
zChs6kowImjV>uU4n#^^gPq1=STLuEz;f_7?%d9X%HTz|PL%<5GIWXP3z1hW;$lbl1
z)EpA~ni1cBAW4Rr5p&Pa(F^Be;k5QFM9yoA<Y~5)hhh%TC{9<c*PxZzC!B7ZBmINE
z`6v~?UNM&7Bo(_Q=Uh&0FIUyBvQ>vj5SmMs<JCLzLj!`{g^Z^=dyCv`2XmNKE3|Ro
zPU0VR?)BA!+TxmBxAWnipSREi>l$k*Tj|;+TAR>1J>4WC9tjwHAskC-Fz&*hB#fjJ
zK6?P1!QP)vqpLq1xlY6AIv8hJA6syZV~uJdD0f_{ZpF_y`YA?hboxGlnjE)Ul5W0|
zsFG|^b%#)3Ws7HrqEKSMonm9wzCyc<#o9rDa+bkY)ezhoX1Xa5b9k?8HJcKv4sKrC
zHsOWZj5gNK#<_3Gx@78R(L27_l8AGy*eRE#ZV?8?L<J5NDhV@F4MfHP;)Zh)YaWXb
zY<cg%WW?RMupCby`%=3uVHGPgB0AjUB9!{_3Aj^?Wnay^{9IgKHE>E0mGz!4lkbjd
zIAebGd2CD4|0dQX^F2T{Pg;1J?@5>C3GP_u1K?}>qFD^xP_4ft+*-w9DQ&GOc2ItS
z@C@EkB4Sg@qd@b{cgAG@0U#3Ti_%a?|0ZRTmx?8slrIw2q#ySt^Su&-?cSUi&nxEI
zx)?R?1H0cMMr<~yfGAIf^uujcg3oPxtMz!xaCp|GB*9WbT08jVezQH~?RpliZ%Z-6
z!Ny5V$-rrY7?9XPcX+fJ-ajmmVVTid=Va-Bdpo^+xV=EQAAt1Cpc7u8ZNcxi?HGl}
ztmq8Grb)|Y0Su(x3uZzar^0!uWrd8iCph-GIvAZ^Ej{}gxzC5L+|zkYS9^Yw9`k4x
zjy>{E_G0${J2iv02x-uLrQmzsXsU+FL@Fw!(%_lV%-6r0Q#9;cQcl?G(S6awVT`MJ
zef!u$u|`5!uY{?WSEEeea5WQ%i@l1;h$Z#&4Du?^gnviiwmZh)Ftyl;zahBAYZD<W
zkvvxCOPa5G&Q0>2qauSZcHuViAvPkbvPsB87i?LRQ7x@Atz4x7x>R#9soat(-I-*M
z@%~p#YZpRFEVb^5YS~|eYeHvDifZTsh1r%bc>-Bi<U3iL5G|#O<>)Wo81Gjp287bM
z1fZZQB$g|{Ci>)sW*6zVE5QTrnF3(Vy1v}R+s!PeTm=49c8gMb(>DW;^oGYxxLi=$
zv~_q%WGO4&j5~EM;I`28oGzubR0E0)<>&q|GM?S9By!+$Nx=@`$84AS9WcSil8;-3
zme&Hz3dvt99Ed#dukc2St+<kRqIrU~x04D)iYv5mwU;Tj>9UpV{5^%3Hq)OsSShBD
zbox;yDApt<AE-z8-!1ty^{;Nda5ev!$sm{NoWi!eRir*BFFF=MlAYq`s3D4#*_XBf
zjj-6~QE}31EI>X#u&?Dm+r73GqriF|-rpc_?MkEGB3XlC=cev^kC7T<I*XT4@x~jY
zj&>4RCWD79E8cxUbIrC%w(%iHwykO(MYuZG)nVhHIwcF~z#S8b9&6WYPKVvi*HqQW
z6_@f`8)>-9uv*~2!ALB|3d#jnJV<#Qq?DUh^vTLfuzm^ht+|2KDdcE>xV2_@7d9S~
z_2q3GTAsD$^O`S=D(=d9)K|-O%7q$<Rle1WHkQpb&BZso(QilIedTH|<@`P|LdjOz
zbAJDQwbj|Dl_$<pvyA2S@%C?)@CAO8$z0Ngojvg0)$18;xLAo01}<Gmf*p@Fz9GLz
z!osuh8<AxLyvZX)&#>%~0P!L<rM&pJJ}cF;r3=uNH?4UIXxnd8oy5b*iztdTjeuOc
zUP#n`F<3Hmg9ktS_>dvvM){o5xH?kS$*=XO%|083*gmiHrIGMmjE{3N88@Xt<MMa*
zn2*4JyL?%~!rISLQ7JC!S{tKWO5T4u%aGY9|C;Z-fdEN5ZkDZ|AdPY#=w!XJt=)d1
z`M0b(?`KlUMvlkWo+cdekMq=IW~*>IOcZLea5*d&&*-QY7MpI4@QVc6O!;8F2annN
z#4#SCG1AT(-}Oo_xuVapM7{CxeYe{GK{vG1>etUYpE#Uf1l=I!vYtTb@#0eN4ZH7k
ztx>06e)w*zIjd?`P@J<XyJVbBPU6xQxdf7D^39GwHYXm#86z(+0R5V12N7yfil<})
zQ?S_M@nIA3dAmL~YcFIrvGQfaUvMx5%Tts7$n6!;w;z@#hlZOuuFq#dDZc{L{71dZ
z%Lr8o3b7jZ!1(6VvTM^$a~j>iN2h07TD}P|^-~h0Z=QPQIuGWm0Tozbi?9*(MLO7n
zn?8EA;mRp-8{Cz^j{JK1Xv|R|PTR6CT>I%~H;+|IPH!90Ue|K7j)kn*C>6&_x$4As
z{32;et|gxu?$rQDyT=2yre#-QQu7(#@+h{TsXtutne?V-Y$NDqu$M?Yb26Jd+Ul({
zc9;fJ3vk^f^vXJp_iOV?cfCrhDllJxNNqfZ0fJ=fa9^4%gzjO(=M|!Ho@oueK(!lM
z8vj-cX?yDJ72AH*O8XLt4ScR&JkOArpi&CbTy&*FuR3l?E;Y*+ni3wA45KS=nz&2w
z+nme}v~(V;u!u+t=i~;MwXp1_yJps|=ft*}@HVU_2#A+N@$h!UYO44n4`f-KIjPIv
z%)Z$!-#y!d@F&_`c@nFwD`7|(=4f2hS3i33^3wXIQB53~6T{W9`Sf(fzje)3u4v7~
zrj<(kn}M*;W&!pP1*u=qIpQ6j?tO*c((U@i+RKWI1Kp2xq#M6Y@m)^OrO?_&)YBGc
zE8^2%x!UY|5~@NiHV+AUS(^(2xWwT?XOF1UxN6)qW@hqaXH&6C*5sJ2zoOyTMg%lQ
z%DzfnZ`&E>i_3t0$aaihJqTIONpC1F%ziV=<BS>E);F6ZB1Nf-JBeW|l~XpRp$%{R
zY-BpB?Q}uomLSmmyq+PGwGPzK_<Z5kd|#Mfn^0F|HfH)8=JOadrB3hfvdl$2zEuva
zMSgK)R7!Hw2ZkA+k?Nv^-y^Phv8|KM+ze~QI;|bOhqa1vmcVl|AUKF~rheb(zM;BY
zVN`(o;?!t*T&WMK7V^orzT|5nF7%Y6_5sjfnHiSYH;txNo-y5+7L5I2vcj<m>1?s*
zEf%|Q>mT+8xPiPY_F?y)UzYTIn~`Gm#Mz%$#mi1#i!P>^MWf?WWR}ecR7FcCDM}!!
zqsAvAP58U6%Ivi8?(Xi}DTbAotYHTtuxH=H<<N@SNe_Ju`e|6Wg!VN!R?EJ&A1vQq
zDF6|{bL1_{nQ#j1Nr0U9KC7y}r9R^x#7d7UdN>hlD}PTk4}jT{w#6y`qUiKTrZN&C
zo~Z7s_MDnRWQCi&w4xurSHg;n{@e}Pts;|gxW;yU#PDAI^e`|`%XTDV3e-zn1Fa=#
z;7Yn4duckf*7Ctob(|bonrGzB!{uQ90ajeOvs?K9*s6N^Zk;p-hnt|&XyA*7FY7q~
zvfRM65c}Gdti;03lvktMv0b5cl~+Sjw4-JxIdgi(6$ijOERP16IhDnkV(SW66Ulsy
z{x+7X2pmh|1M7<JVAFRS@T`19Vt3-(^3x<!Gws{2wz=sKaLm<QhdH&jU2k1n+c{QM
zM;gMO9{sOSdE5CGcm3IhTQ}@<WsNBNxqIHHzJiJ^!(nv4bGY+<3NC%l<)^|p4h?N3
zcNchdSWnZ^p3oF{(;~86`h4}2&VQFXj$}okRO%<A8di;pet%oHuru0jdGVg6v<_EJ
zXA6MPh_(Sk#10U{Pe1m0#^Y#J>Pc<-$Vo!~*lN4JA7Rn*vHgIJ$U25~Cd}lKw?-u+
zyB68Fp{5Kp47*phWNwf=?0vM8`Myif2m0oSL$m-(Ei{Mbm(td!y%nAJn#Ts^U!W&g
zJtg{f`po{R9&zKA7d+cSY+JpgVnAa&W}&Qj<E>8+I5}a#Zso4~r>g<~A2o?D4a3dV
zev;02Erxs>lm-u104}a-5K9StO`IE?+^gYU<%hmc-L1h*L&;Mfrpku0CKYW`C1LtR
znA9ipbF(#YunZbU+6>F34Z#xj;r@FBmGDARFN=Px@6(Gj6CLJfgJX#vcD;Dk9_t<Y
zxwH=e=+-BYTyjZCM_pd2f1IZDdTuS<3mZ}2&WjB=OF~xtjaxG_+2GqI&E~JQMBh4Z
zadeNP=w^U}Y3q=7F4eL3%W;}Ty}zwfh<@sycT~<tRt~X2sm5cUFTpM>j`d5%-=MYK
zW`Yt)IWw5MRvWRQS>RaX#-Z0WHI-9Ncx}a2t&Sq$g#|diKpcmFB-N*K`+=y8#~I(s
zE2}BQ>y1-Wl|O<N0i-U_+S4WX08?PLvm?lXx?E8tb8C1Th&xM~_hu-CVCEcM_6r=C
z#AMODLAhN~)!lZRF2Kce|9z_iSi8cLBbmk!<3dXM;xqdCSMQ&4zAT_2S|}3pkVdC+
zrAD2{Plpt~DF|+Nss*5h0eqGX#b7W(6=e1JMWc8$NMtyH*$1A0e4)SZ%(2B&nz;mz
zQBC0sOs?{bU0<IKhz_%tIGcFxh^2PbSwgC@knpSxpWuVL(PNgQi=ZdYMonDjwQN$&
zCPQl%flg}e$w~@?tl1=6<0LC;WvU!HK~Vzcycwm+DImyN`9K{?p^pY1ot0=<!v_+r
zeu6x%nrz45Da4QO{h^q-o8Rp42`&fLDK37eB4`Yn*l73<Th5t|Xx%|BF41LA>@c|j
zvc7N2FJC{JB-PnDJ<jEr4ysmRZ?`SzGUk<<Cw6Ju=in#ljNy{PC(0#Dm(82&_~6o1
zFs38Y?jp#Dm*uvdAreDbuA55()|iJ+;sTtFWw!F}-?Ns(1aiV@V}MJ-HFhiJa{7lj
zd&Z@!BKcQlrbq0lISQ2NxMsVgTRh*1MNel}Uw_?Ln+DHu&KP8hdC3Rq{#>LU4VLpX
z{B+LO+Vm%R$&Bt!W*>M%pK+)7?KCvJ<7&^Gp?Nm`Ap0T{a@cC^*k-|dg31L~A|;0H
zzRn!4w*n!-f$)v*nU~HG6CibsytV~fh6A!Nk3SBc5Pr&}kRzgW^VRIlYf_Pzmp_|1
z$*3OR(B4Si2Vc*(w;DZBNpopPWhK+&X_;QP5vb%R+sV9S*{d7Xn$)Xs=&N>w5~nLD
z*zsg>wdiD;9Cm!Kv}BMs{W?z(b{FN;dwO$sbJX*zvnTiqeV1?2wZ|3k0pL2(<@?)v
zA^LO2dFa8b)Mcu?gRPvv&ECg7cL~AJ75diACf`o)r6}v^<EyNlri0gt-L0n4t5}TG
z9j!o@dDfl+Q=L&(F#_S+V)I~0@R)>C?9<`xUXg9grwL*7Sg|lum72@@G2*lQrz}DT
z{#0~wH$;W%U1RAbmH2Ye@sKoKSxn#~;boyS5{6hE%;1JUJZNBN+9%%sS8)6Azk!>>
ze^a>0e5J~0Ll(&T>H($M|8N}vgBj?bndepe)~T;&E>X74S2-6~52t3ftDhHi=rps}
z@8o*beR8ZC>?!k1nkOVWF?W0=RN}+4;o|ANrVjTq_c{@fawGm)_naX4r{{3VpWt^t
zGFNKKoQQ3fjtqYC)P2Yuci%RHXtm|EHX+h<DmF@ernQPINXwz_iBaHTJFHUTN3eQY
zK67f=1QX%0KcDc+i~N3!=UK6f7O_);+@n&q()d})8r_?mUBZr@^xd2rFDBU4gZpt{
znMz6My4t&h=)IaIGj~#A9o`iXl1R+=0COlq%S2R5Z8%(^KjN9$P5k3tdhfR1&U@`k
zSMgp-?wRuk2AR3Jd(>+#maS<3W-Ta~=FM_iP7S$JOyaWI=L@i(O}~VHg7N9yo^9qz
zaGl{G!_StVwTKp9*w(-t#aCKe^Z-~<&9Y?C{L*W#8C(mxaPWfpbl$syWDo9pzO^4O
zc^dkro^d|_ShMr7kGn1o(_3wQHV9S{E9d7~SV|k$=Szo7b{30}tcsja=|t=`zXd#R
zCZW_KyCDv&_J&2{jmC4BlI)Yk_65Hub{mRKk75|(*V5ZZ^2S^R$X=^eLf@wK<=GP2
zC!aLPf;BcXlB8MXbMaCIgavJ0tR>JL8TR)#Fs;_|aGMa9fP41+4eQq)0E2FEr~I2_
zTWG%lh{GvV5Q-&zp7PO&hv!rH*if@L7flGki9gw8XX&_Uokvdm*vIv0Q<q53wbU*c
z(0H~enbpMW%$E*|ur`F`$vzt5mWO@rUu0SVyjr|5vKcA)@fI80xwzV9(<0v8vBJy6
zD^6vEuVZ8{QvS|ZzEPwwj%Vjo>AW0PPtiFE1uGg;Oo)+{gD@;d`&Sji|K#xEJZq@I
zo=uF6!@LL#TF|$ePa%2jMtp?&xU4Eq_Eq=tTI_yHxpgxLw%|>?{=C1uSfp$PTGlxM
z8J)NBn1^MWu<cuF>OR_2I$p{f^tHpjdCu#-@&0S`el-2MzQMX@`};&Y{TD6~PZh)L
zcw%h2sWv-U`nQzbFQzlvVpE<#`qGRRVbJ}^01j#~zYln+EaFYehuy8N`mkX)^PIk?
z`3Z}gO1f9a1m8hMj4g%RwXf{DCo1?bSzE3kSgt%yQ?h{~6)gLwcM3`BTE^^rGueq!
z8~px(MSzCfPo?I!oxFh!-e0VLWqRzFsf#ja^RD>CZZf*Y&VFRi8a|qetUtz;2$LKA
zl$=&rv04P)V#Fv<dinuZp);MbSE#YMdq2B~dJKKUxro7RX>5_FSa{fj=APp`SCqp;
z_rSKy#%G2f&%eLNRL(@&>zNP;7w30UL_gik#@QV!C-oa05anWEi{bpeiglwZc>y!K
z+su0N^HUFhN-CaD?aG5ktxp}2gk6OtTZ=MTvFhi#-K~cqPu0AzFC4>lOF@nn80Jee
zrPKwZZ0=YC4Ge9_FZ>B(!gVfT0Q4ONPh;A^_Vs<{XcbC{fMs@(z1k_&v|6<n)H+8h
zuO~SD!%J(lTY8Bz2WuQNa&JCTe6i5bt5O9~sRGOyJ6mX)d|$a-gpD`pQh}Sl@ru^S
z^HV9FJROhK?4;altGX-jq4#qXFi#)du2hevg6KE1s(J~8r+<=b6qZ^8lqy%S4Dzk{
zutqf3I-?J7^DTMoYjT?%{f{QDGpdQLYhy*E2}qMJAW}k8(9l(CXcC2B0!R@AVt|0u
z2zXKHozR;~7ekYT8bAY~E4`OX5d{eWR02}&H_>~)_5PS2`#HPL-p`q}X3d<5>ar>`
zf{Jrh`--jO>&=dyJ-;BZhdl1+kt)g4Ao2AC1Z!2)Df#4>^9=^s>XDx;Ylfe}CXUCb
z2vi~8)OwrQCq9h4zt1yF=qKXiU=r&VT;qVKIs=^yAv~B^mkqA5>3!RKcVCYzSf+rR
z_~v-BT}Go&ZAyZm3i^nE7~?=`V`^)%Ory`26bDt?^Hz!Lo^RG`CS8>hCFDk_UFR$p
zj@a*`uP0#1ehWbj+v87&Wr;(D(uEW^!nC1S8o!aWGd8!>d>dPYvm3+}Zaff~o{o|?
zlB$*DtJDuLmH!gf)7;%eZn-|%5uWLO3NH;gU#ON2t^k>d-%Lz?swx{c+U|Q`4lfaU
zWH0LAAo+QsPmVSx&m8~Km%)XG`=-_H*&vDk_5jltu@qCFTv&se&h!@W&Ow+~4ZkhO
zs(oczHew|GDDChRTJ&Jvbnwn_pGo@(>|b-WhEJChjTzBgjOjrG^@GKtwgk_e<s=`X
zimIJlsox7kRzg5^cLUGD)k$~F8YSZw9ZKA(a;aLkIdi)WU9pl(){Kv9hn~B;WH-Ao
z2Bcq67uIV@zx2TeZgiG>^7t2rFVr31mlOQ0h-zz|!sS3M1(g`=sxqQRUtV%$-a`f<
zpQ6k+Dp};VXDd}ux#}L|E1Q{dCqpTcnw`---K4qXO;J_$JKf)MaCQd8Iqm)r!{f#o
zORdFB7HcP_x-;ADnV|N#o}8MC-2!&d<g<6{cvQwqiknr+x`txKuu7Tsj%{7dTBV2T
zZ6{_L3<Y1Z_+tp5`;sq`Z74qH#w@|paEfXdp-<`E^&(F3i{c(WiQkW_LBSphR%1q1
zbFbh0T$O_4>IB&vUyaK5TgnI*UBT$o+U&|FiVEO-P#OE<@X0NWxNIVB(hHk`Gj{Mc
zE<LM*l9wp=x*I4Or{?SY{-EQ?=-1Dm*naSto-q)KpnXs<rC?ihTM1q}&qg(yS)6<5
zBvN}h!86x2-#M5GDv79o#FwEY<x#FUeOb({ys)Rx^HAPCeP3=@SPVadpGZ8T$6&w=
z8Yb7VgHwGNR%h}WMMm}XCc+VrQBOkIs_8qgpgzJq=-<5|Cn|j4?CGl9^(8tZ)U)s&
zqBsH~>Vh@NjAHxvIkF*=m!~QvHSwH5(9fw|;FtZO0<nxc;$1b9ls>U~FUr8syI$9m
zV&RC<;^|}JH_8S@9}7o+w;U%c9na>9vIh$vdo;pe{cig$FM=|3QA#h}zLNrc5bC2e
z!6l3e@5x~rNaL&%Lc7DUkUK=(uh>mNhtfDcE`BC6z22OcDK2uri9l`+wQr+7^S~`X
z{uRvHPPn&K$Je=NsGF(ijPp?U^1bl1A^u&r8cI^y*jbDrmu;~qRV~p6JQA4L7Ver*
z%S%h9637f^nzKXAI;u1kF7vhX-A4D?Fh55WmNb>j%0WDn#4=XrSjGxnaeZG6)gy=P
z{<5<$OSkE<l(-Sep3`10^})%R7{hV}e2D@)L*GtqsdOaJ;^t<xsOS~h6nnSo3(~_k
z&mUlO_szEjbR<HB1ZBq&2x-A8tdj`$mstVg@_zKH%<~Cm)>Yh;kHE;@e28fZk}wl!
zT>tv2H?hCtf|5`;z?O5@#bltjuU^PIUgJJcaBTQEl<lKm&mLF&u-l!hj&elASabMN
zXmx!#^rbb5O+W55^GmgGM^&nl^HAv!CmsYr#B=t%ho<h;<Z>8}mY8A5{y8}*KHXWp
zj{WvR3-&^Pqi%>^MAhzN;Eh>(3wi$NdcAa3rbk7o`fhu2-)-<X_tEYF0qFUmLJ+Rc
zecQ6?vh-P2TI6>%7|!hNYo96s?U1?gvv=K+P%&msAM!cB)FOiV#P#(W=h<kk4SESe
zF{xXL1?plB-;BwSv-!pfRp7VauOMReSn;w7sXR|}EiLT*fr3K|soq8aIr%{m)ANHd
zVz*<hH@K!X)T9h;ue^3YZyzG-yG(||eMfF_{G8bss+xO0bb8QM<yXeYOD86c7>_yO
z&5xg|gJet>+oqZtExT!m`kK*>Wp&U=r(dMx`l_^b-D*+OFN}7e?>Bs(6Kp5Ui<&Gi
zwy<2TjuO516E18j#eeS^K1E7)eFBzYz&4*w^&Va4DYg10hWAGBzJTXB+U!5SHcRLZ
zv8mrytxOyb6q>DHI5BV=+AXddXSqHyRtBx`-&i@xpp(H76&LSKi_P041vV8f8wDp&
zcjei%UGw9Y6YOmLrp1bznllC|TN^Hy(dyGs3+}N3ULKChy-v=*T6gD?4NNT^N?%LU
zUi`hH*f%Cp%C8vQmaS@Sne$E$x7-jo&1*BH*YZe!G!W}D$odZh5qA((K`6QTA>Vsa
z=uzXe?s4q85rdZz%v{?{X)sFP;uK}0dy!cs?3I_<v^i4RsBFUE#1<lUJ^uS8IV%ts
zf1TYF7Wl2Mb|1Mie-XmT;H~JapcQ8XjYQZOE#Ng|N#+J;x-!G;`xp}YPOqx#uJag2
z*}PC>t@E2|JkBPbNNy$FO&gXG#5{A}%X!y@E>yb)#(%98iaue>D`caFfGv-&x+C3s
zq8!`Fl#20tVxA8=_n614Mow!{Js;WuCuVK#FYXuw*7tvq=TPiQk1-}>Pr4~cPWE>t
zj+EGVDGwdDvYIfX+=T>@8`&*wQ8G!9Yf9|ZlM~0)KMV-P_jP1UHH^3koSl1eu}#Bb
z)Bgi9JzTk3EK@&Sc}aN|UE6<d-eEtRwPr2f#Yv2fkVpzT+4urkX=qitH#EFjq~^n|
zqr|`)_ne9Uw4*gGertd0>WdfS-VOl=)BX|GEegqt=~361jlRg;$ZFRm*hF!>P%V;|
zXsbE@eleFZ6~4LprZW4EOzj)p;|zpLFn*Eqh_w!XW&C?y42t<du1C{H%jnq$ap(?8
z5-xsf!@SR@<vKhFF_bfkUaGN5Wn>so&0o&Dkn$ndkfgE3_fh}mjc|mnuEB`0Z8Mdq
zqvMT||HctiJzrcr>s;HG#7ROz_nT@g3Mw`B41*A>j}-Le#Khfwr=AySC7ps$Z#IiM
zL%mOX6A8y2-@<=H$t|ZilhE|HG5gBFN5jcw^{NN~pHo@mXKtb?Z;-7ZbAAPlrO<Bq
zq$=6n(i@_(aB>#@nu-iZp5Bfi!I?q0cT37KF|m0r)vcq#GrVwl<x%9A)j)q^JINqZ
z@>Hh~$ma)>GjUB4@*{OMNLmw)E9XG#K6Q3Ws<%E-w+-^Dy60we*R#Z9G^OrnsyM_M
z6RiBw&a(<4s?8*e#QrMoz#yFk5fFsi4UGVXQ|LFB`JlyT6r=DHlW8|+KY!YI)iWr-
z*oI4%Lww_#-S#u7rlo$CMm<H`GE;*Kj4VELGh2EcEXh%(DUo$R!&w$xDuH~B5~9qC
z)2h7e+?NH!t3(F<o6zVLQ3NIMBw-zf(ePW)5_zHz-(zBp5U_yyzj9DdzM;VyVkW`i
zzQo0KZq@eFnca^3AgQTQ*S~8A-oqY$&{9IqMeWpX{2j-_%~x+g24M!Z#&T!4d(BUt
zmggSLP@(GX!>@Y5KpN+0HVP#>?<<4Yk#JZ03V49`ty#rSu?X7B9Xy;*HZ4ssl`rEV
z`SKrG97;+SUJXBROaSyPUxnd}*&wkd*Ot!j4`ARb8r;3cY=$f*+U1JoL`M9Zkxdv#
z5G=M)A4(RV%P;y@mduz)x3be*{RPLFvq3%=>}=nfMQg`0619!t?$+KWwIOqcEH-zR
z*eT{iqW}N{iPR-mtVSO=9hUuqtH^=HE%pOtHZm&7+Ea9=Rm*V(Y!H7F*pdifF<9o%
zeIa4Gn<*ydiNkLLL9lch0Kj}Zj+C^19D=M0A|!eZD9g{=$y)ycJKOp|8aj?n+I;1|
z69rNj37La56<^tkKKvStqkE)Z>^|fcWf+kis7>pSioXVONpgQ+AFje)m#p$T)3_&&
ztwAD4{a1h70@Zzr<)z-DxZ?p8XCROz9f1Le>wjLFiq*Gb@_uNImEYbE{I@<TSswGB
zUqLWXFdZ1Q8;iR|`L|-s60asbxd<S+ctPw&293-tUNy^(FZk_+l-$>r8jHxjoDlHr
zO?){Tnk{2Nktn}os|R;{FV+r<#&)!$?;XQb9X0*6lh%@I*Q{|XdfZB&^SmR?{#y&;
zXlQ(>Y&;?oZT1#eX#aSK&G{M(`wDzDT%s9O>K5eZ0eN5HQwD)0b-O@IWV>v{nEAi;
zjZ*JWkl8?s<WUA}hV61rODdS*ANb#QFkUd}jCCjZ;aqD`*{;`efdwg9jG1S*Z-4v;
zUYkuY3Fw{T&5oe&+LZf4BL~*r762gP-F~Dj{PPfG-Vq@IjDy}xwRUU-(EwkvNJ>@_
z1dE?Ti^L97Ehz3Ga$u<iQnLI~<P(?tpakTdEql6-(h2t6!4rpTnmF^$usC2q+gYwv
zUNrzbl<jWPo!XL^cl(8Z3XkO{oYLk2Qslc&j@uu>!0ECuU4{Yjs1~q(@*qH#=Rj&n
z|8OlIX|WKNV1Ck;bY{1|HK=52xFHNM2<`;LN<bXhu+Qx~zj57wjKTo6xqVy>VY!`*
ze-;7VIF|Dp)&^wLKZ_i%!nl~3{w$8tEjjz-WXrF3&J|3J0x@?t?>ac-^IxNvd8EO8
z5Foa3{UO<qR=R@^6=vGqw4AA$kIe?e+JgXZ*cNc0+(IjV0bo45wa^Weo!iU0+f6Sq
z4xrqT23Yj2#`VW8(%OJOqz=I8W9Do|`j^DFqJzI`;;f1yB#Vn8B!q^!cH8N_gQxv&
z4O2w)<JhkM0Tdb?TY<AD-9ysKfldO<6jM_2(4Oa_(uu3>DGAsm(oF6z(SgCz!)AJa
zVUPcpbwHF$mz1`miT{l;-9qEx5;uMFar8k4HkhWoD_hCGSx6srU_<gZ`ImG5Y0v@g
z|0kgwSX2q!`iF9#0TNmQVL=vKgM;Y})GHMC&%=k!SYVJKcQL1PlxZQzEF#X;!2FNi
z<<4sMy@sWu?=XCMI)Lc|85Rilgs#v!6KzH*$a|0HJtcu0l4CL2R`<o{+;{M=gj9Eb
z$B^r+eR5xF4!MK(UJdzZ2y9GgPE(CFt9IY-<8jVI)ZgQ4IZFxU?V)8I;*?kYf8R9e
zSzK`7^UA==sbTr_b$Z1{?jB>>QnDEZ)3lVlvC{DLCt&)<dowF6bY=2cm%JGUJ`tYs
z1bi6?k<U5QKlm9zF;~Yl&YW|q#jBN_)$tjWg?C$xNC+88y?$p`k(VodhQk#p;OUrx
N73b{Vxc|@O{{d)jVR`@n

diff --git a/plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_before_header.jpg b/plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_before_header.jpg
deleted file mode 100644
index 2b0e9c78301af40bafe398f784d847863085a73d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10887
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
Ro@oC6hyPoQ5OzHNzW^7{)Z_pF

diff --git a/plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_login.jpg b/plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_login.jpg
deleted file mode 100644
index dd99edd5a75a9422e0f7a9f20b4163e757f9747e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 35893
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
A?*IS*

diff --git a/plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_login_open.jpg b/plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_login_open.jpg
deleted file mode 100644
index db9f20275dd5f4e47f3704abad08a17084c2377e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 37305
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

diff --git a/plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_navi_c.jpg b/plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_navi_c.jpg
deleted file mode 100644
index e211d3c3df294d3abb86109bfe6520637baa8de6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12118
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
Q5}F5WO&l#5h;A1C7j|<&asU7T

diff --git a/plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_navi_c_2.jpg b/plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_navi_c_2.jpg
deleted file mode 100644
index a534c9f3b62d7558faa9341e596404fd72f88b62..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12530
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
A&Hw-a

diff --git a/plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_navi_f.jpg b/plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_navi_f.jpg
deleted file mode 100644
index a2bc13630c7cd5a828975a59adc5e6e793b7aaab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13350
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
N1Osax^V5gL{{d9a2WbER

diff --git a/plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_navi_f_2.jpg b/plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_navi_f_2.jpg
deleted file mode 100644
index c0433e8fa2c7f03256c2906253778d9f4b76a431..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15195
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

diff --git a/plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_navi_h.jpg b/plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_navi_h.jpg
deleted file mode 100644
index 4db7addf94507787d33253496dcebf85f31721dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12210
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
Y#EqYQTgQ1bev9%;g}Zkzi=DmuAEy`s-~a#s

diff --git a/plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_navi_h_2.jpg b/plugins/opSkinClassicPlugin/web/images/007_openpne_purple/skin_navi_h_2.jpg
deleted file mode 100644
index 27539baeccb88932616bc0771f49a6caf1176b4e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12549
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

diff --git a/plugins/opSkinClassicPlugin/web/images/articleList_marker.gif b/plugins/opSkinClassicPlugin/web/images/articleList_marker.gif
deleted file mode 100644
index fe61ee83daf178c89558df63a977bb1a353f7f8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 829
zcmXAozl&2r5XVOd5+NYhq>xzLbpg9+3<_!rJ;6Yl)Ip2+7t&Y+i`0s6FkK22ECfkq
zd6k7X^`*HKlH%YHyi}f8jGuY8#d|xuJKtaX-m~XV?+;#f<fi<Q>oJ$P$b4Rp=5@?C
zJHGt!snu$=+wD%Lv$wa`?RI;;-oe2^zu%usCZo}4I2;ZJgZb+mkMq5p=CAmE`up_!
z{O#v2A}V4cE)q3W6*W;8rOetf6*Dmx3$d(&uHq){;vt^&NvMQLxI{>#q)ECYt3ZMX
z1U-~l@HI@;RYNt4jmk{T)j}<coJ}`%R}b|pEu0P0aE;JN`ZP_`6_$h#r63^`Wk_KU
zR)E0;h|Vk%RWsZy$`FK1-OVYp{J|e?5f+J8v{<?&t`eW+7)|9ItISaf26GNUjB4<J
zLuHosDi}0oMOENXu@D|fayV<4*$>Yo$R>A$a2yaK!#AR6#dcQ4<)?uup|sVxl3X<4
zmexuL2URnY3n8%bhYI$KsIC_N>nkajP0GYtS66viHi?8~-DLS8iL!xi`YUzz8a@b;
zD<ZIFuUZM4wPwa^Up`K!)7fmcSS*f?j!sTaR;$%|z20m#+wJz^;$pYkU0q#W{>u-`
zW%G6O2?>$cqj@pi|J%Az<-Ph7>YtGI9m!k0!>`LHZzx`T8~=Q?xP5o{@bKNM$MWDm
D%<+v!

diff --git a/plugins/opSkinClassicPlugin/web/images/bg_button.gif b/plugins/opSkinClassicPlugin/web/images/bg_button.gif
deleted file mode 100644
index 0e6a59e50cc807393cc657062a10824f4f64f0c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 396
zcmV;70dxLGNk%w1Va5Oy0J8u9{{H^>`1tzz`uqF){QUg?|Nryz^YQWV_4W1n`T70*
z{qOJZ?(XgY0000000000A^8LV00000EC2ui0LB0m06+x)u*gZPy*TU5yZ>M)j+kJc
zXsWJk>%MR-&vb3yY@qLa@BhG{a7Zi~kI1BQ2~;?r(5Q4uty-_xtai)odcV|#cuX#v
z&*-#z&2GEj@VI=A2H5ZTynfH``~QG}f`f#GhKGCuii?bmj*pO$l9QB`mY0~BnwyYJ
zo}ZwhqNAij2B)a0s;jK6uCK7Mva__cwzs&g1iQSwzQ4f1!o$SH#>dFX%FE2bB+t;%
z($mz{8i?50+S}aS-hR#D;^XAy=I6tl>g(+7?(guD3G?*z_V@Vt`uqI-{{H|23LHo<
zAA^Gk6DnNDu%W|;5F<*QNU@^Dix?Xo*vPS?$B!U6Ly8<pvZTqAC{wCj$ucB@moQ_>
qoJq5$&6_xL>fFh*r_Y~2YvLG6w5ZXeNRztw#<Z!^r%(q)0027$Pw7_x

diff --git a/plugins/opSkinClassicPlugin/web/images/bg_button_a.gif b/plugins/opSkinClassicPlugin/web/images/bg_button_a.gif
deleted file mode 100644
index 7c355568c6273030a8b0dd54277be3cd7e149ed8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 269
zcmV+o0rLJwNk%w1Va5O+0HOc@|NsB{`}_Cz_w)1f@9*yb0000000000A^8LV2LS&7
zEC2ui0LB0w000Bh2)f+<Fv>}*y*TU5yZ>M)j$~<`XsWJk>%MR-&vb3yc&_g}6#T%T
za7Zi~kI1BQ$!t2G(5Q4uty-_xtai)odcWYXcuX#v&*-#z&2GEj@VI<VuiNkV<Y3S5
z`~QG}f`f#GhKGoWii?ba1douBl9QB`mY0~Bnwy-Ro}ZwhqNAjxrl+W>s;jK6uC9%-
zva__cwzs&sy1Tr+zQ4f1!oz(6#>dFX%FE2n&d<=%($mz{*4NnC+S}aS-rv@F;^XAy
T=I7|?Pd)7I?(gvN3<&@`lAfL9

diff --git a/plugins/opSkinClassicPlugin/web/images/birthday_f.gif b/plugins/opSkinClassicPlugin/web/images/birthday_f.gif
deleted file mode 100644
index bc75f701de54ac08b729946ede438ea86790bc54..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17678
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

diff --git a/plugins/opSkinClassicPlugin/web/images/birthday_f_2.gif b/plugins/opSkinClassicPlugin/web/images/birthday_f_2.gif
deleted file mode 100644
index c3e68d9b86cf708777010dfb0b8ac0a10d9e3c68..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18223
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

diff --git a/plugins/opSkinClassicPlugin/web/images/birthday_h.gif b/plugins/opSkinClassicPlugin/web/images/birthday_h.gif
deleted file mode 100644
index 044f1d16e4c0ab99c377687bcd6af4b4dc302755..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17674
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
Bn_d6_

diff --git a/plugins/opSkinClassicPlugin/web/images/button_comment.gif b/plugins/opSkinClassicPlugin/web/images/button_comment.gif
deleted file mode 100644
index d4e19036500990a0fa3d8f0bc71a7ddea52cecb3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1370
zcmZ?wbhEHb3}X;r_|Cxa9|S)B|9AJtj~`#Ze*N<0)5nkRf#BV{cW>UjdHo6qUOapD
zY~j!UGk*Pl^5n_02ag{<yblET9z1UT_W#bEJ0)NK-@JMA`t|DtAOByydL{Gi|6`Z_
zT)cQO>*fEW=bs-s_x<$g(-%(d-goNbzT?kMoH!Q#=-<(!NB17NcjU;C<lEmo9{k<6
zZ(sb?udDa{+_d-Mo;`c^?bx(+>((_}_b%S_%<IhK1sfi(S+i#K>ec=SZ!BN6!T#`-
z6)Tqe?z^&d`I?eVr%E;+UAlDXk|j$vE}C4n_TYp?kC!Z-zjAKh=Go1ib8kCuI@LP=
zbjPflvw&dcv>7v|w@p7kb?Q{7#d~w6uZ*9zwy@`5XJ=>P#HGPgR<*ac*S9a7(p=Ko
z+FI1IuerH7r|Do=_u{y=ISutS)z#JUjngbTmsV6%_%zP)tDjd|S{hl|mr^({sG{Ge
zVun{~Z&cPa&;0g`jEv}v(zLWR_2P-P*{$)38KDVnN%1jB(V<b%iLp@;QBhHmk&zJ*
z5h0-wx=|H@fk7St*}lHMK0ZE<zM0O>&Q4BFR#sM~rlt&|fW{%9_>+Z!o#8)&4#*x*
zo?zhk&k#9B!ehgNgUuYmS}`X!Jala2V(^&bv2oGSZVBV8J0~VCYHAcT729EW>|{fq
zM)0a5KR&v6^swjER3sihacVXTN6Hk1hiRuLFgJ0@E;zv6C8)RHg`wq^m6sQAJmTPO
ze4Kef&36sofm>gkWbA4L1T(Zgsy8g>=~=+w*z7soy1q^6fS38|;B^7)A0?}=uM3bU
zVV7jeW_`uVQln?Xns7~%Sus0PC6n1hfNf{#Y!#_f$9b5XIcEK;J>Z@pY{%brXh*?9
zPnrEroC~&{l6Z1+q2YDCm7mypCus|8;k&Ws)&+%qe)1AtwNuY8a5QK$+t|eMt%1Gc
z3!hQ5O-AnYbncG-`d&@Vy~Yk5e>QATKEty1NNb(h<~uK2e=XY__d;jOmZ>kC?uLg3
zq=|@4skraDq=AWDM!|(AYDWNz1aE+YBe&$02X4(WWive5IR%ssGaB`rNMs6B2y$#^
zcM&|=DZ^&SuB2ad!j)Ci<>Em`*&hcVHgPf)Ff_AU2p$m3u5oN-)}FDTiQV$R!9>=&
zkjSU)yr&8}Iu+OoJ)}4{+(_z8k~28orz3QUQIY42;E{f=Th|tfD{*XaRV+<#beEL=
z;&6=Rk!V5#TZ_=G_6or-8yyz(*j;RA>oNP~vgFan3+`f5#3s1Pw<|PdF5qQ5`9h+a
zr_n{O=*$9U=^&qj4$C$iGuL{})EyM%w02XP)RTZ@mQU<*Niqfwj9CW`HWZvtTm5EJ
d%FNQsn=iOoUvy`(OnJNYM%ruvZbn81YXJNw^{W5?

diff --git a/plugins/opSkinClassicPlugin/web/images/button_edit_photo.gif b/plugins/opSkinClassicPlugin/web/images/button_edit_photo.gif
deleted file mode 100644
index 1cb548424e8b46d707d7d679904bd14b4eb74670..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1106
zcmd6k`%}^f0KmV1eDQ@L!emPqDl&X*k~!zBE1KoBy3WmO^Qi62$JTD9+_gG#ZR5)$
z!N;%^P&X&}Duq*$B&X@f6wO(Ja>hV~Q_(I|AhQ#Euxo$CK0kbZ{@i^&O;1hw_&gK9
z0ZRZdFficpcy@Pp-EQ~h=H}Mc7M)Jt+1c6H*l;?X>+9<-muq`_du?saZnyJzJh52Z
z+1XiCR8&`2*Vfi16bhG?mJ|v_UteEGM~6rxDlRV0%gf8p&$roZGMTKfu&}qccX4r1
zsZ`F+&JGU`*VfiT5Tw;=B@)TV$cV{gDlad0I2>}hyt%o#rKLru(;1CME|)tsH8nXo
zIW{&{QBh$wo261|Yilcq!(lR+%gf6X6B8DT#cH(<4GpcXt{MymjYiYZ(4bPO7z~D5
zt!A^?)6>%n3k%)d-7_;Ym6erxy&m|V5$5vxuPFA7-#nqAJS>3C;qtDR@CBu1<rTjQ
z0T`mHS|pa#REJ^1>ciqiU}F<VtBwS*p^=FAAjBRJkLU^v#0Ju+-FQ$HSo?6W2F8YY
zjXoaxd;H1M39W8&O0OHff%?a2nwgz5Taqp24;N6Ut;yD<m6d0(0O!l~R~xSbqA~6*
zFcuRXk><n26!9R!{-jY(<s;T%2p5te1<vD21QBcB&1Bi@Swdn;X-Ilk^W!Q?X8Sq8
z%da2_HFxaybR`Rk_$V&RaCPbvm_L<VK&9TIfPNsdu*Y#p1j7+NNb6S&e$$S^`X4gT
z8(W`s9x$KTd-mb6>&no0O4a4pawu}tbE*InPm<B$<l_FC8<+L7x8Ud+!pY5g_9K2!
z%-7>tPV{F{7?UMijm#k(jE+cz4~FL;e3Nf8&$$E;E(u3SyO@jOYZSS0KL<-ytEQey
zwz(&L_w8mi$CF5Y(BoVft=c0T>iTniS=)3!K_l(muo;x!e_Kg(-0|{J9ZqUIb12ZZ
z-=AceYj*R{{_rD=A^-s*f>+KOp8oaA6-hRdlIgeiUdG%P!9QpRPkt#V$vhRBO$-7<
z3xE_D9Ulpu{s~F8lqB>k)qIlp!n}ZTGYj%Mj<===y0>#!-VupJ$m{3>MpJAMfy#l!
zZ5rmw{2cRT??;i_NS&qj1j}MoMrxF`8ZD*jL^uKij-(`AWz$0VT9z-7Plcn76C8`)
zhxp+f*gF@1_mJU3Z{HSQ`J86`<Jt*V0FwnqKbLafI>9Ms-PB_INQ!J4mh=jE*9W{t
zq<EK*9Z(AXXm%7De{t;CZ~M~d&)e?!x&z>H)r%K0g~r{EI>L0cWAE+~ZF0HM7$YB8
hi(XME1`dqh9VN?Fy2cZKM3c0sF{}6V;aG3r;J=LY<bVJG

diff --git a/plugins/opSkinClassicPlugin/web/images/button_kyohi.gif b/plugins/opSkinClassicPlugin/web/images/button_kyohi.gif
deleted file mode 100644
index f6b1c259cda6f3d9ec0ec4138889cff3897f2897..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 768
zcmV+b1ONO-Nk%w1VQ2so0M!5hzP`Ty|Nr{>`u+X=`T6-;T3Y`8{_^tj?d|RR`}^?l
z@b&fe{QUg)_xJAZ?##^0;NalZ)z#9{(%akH#>U3KzrWVj*0Hg%&(F`fxw+KT)V8*^
zySuxjq@>8m$fu{LtgNiT!NIb!vdhcM*x1<J-QCK{%HH1I;^N};^z`NB<-EMS=jZ3^
z>+7wpt;NN~y}iBf@9)FI!}j*}(b3Vsz`(e;xXsPYx3{<P@$u;B=<4d~wY9a=)6)O|
z00000A^8LV00000EC2ui0B8Uc06+%+K!9*aEE<o<q;kn@Is=5LbV{vO3(<mhYrPgU
z8UhxK?V78Aje1QBxDTAQS{M-6@A$la&+q&HfO!BEgoTEOgmeRojE#<uj|GsEkz1Bq
zl$nhH7@ac#2%VxN3;`#dbPB4gtgWuD1*!!Pw6w3Uv$eIcx4o_aAi*mF0SXtvBW@7E
zAan-L(9zP<)YaD4*xAwm6W!k5;N5fy<mKk)=;oFQ1s3k^>G9-R^7ZlnA^9OBZaN`1
z2?C^ep^pxNg9sBUT$pf+2?PZiGMtF;VMU4<69VYKks}XcDcqFk$dS&1lPFWFT&Ysa
z$x8)TvV^%srcIUrGU!xs0EW*0pBZ|n`01pm(W6L{9&y98sne%Wqe`7hwJKBq5VC6B
z$~CJZO<=={9ZPlqfCy+wut3WeZ3z@?=`ff}x31m0cMHsgiTCb1ckTZ69efvnhr=b@
zv^eZRLa7BK4$}z)2yKA~0t!&pqa}i7Et~xS;6R#m1UEYZ9;i^71D!Lly@&xrCN=>u
zQp()cZQBZf3&4ZdAQk{c@ZfYDC|}OJxpU?tMifvE^Z9d{TC8h-4&a0L4>pL!aN)tt
ziSHli99Yl3z5Dm?3#^w9zdn2V?(y5-zaD@H5yJ$K0}lWFhk+Xy{6|Lv3^wTCgAhI_
yfdmXrXd#6WLU`eZ8Fm;QApjMGSb+>8mS`d!R;8%oiY!J2fG#k`NDBZ#0028{JeH9F

diff --git a/plugins/opSkinClassicPlugin/web/images/button_prof_conf.gif b/plugins/opSkinClassicPlugin/web/images/button_prof_conf.gif
deleted file mode 100644
index 7c7390e521351a6f680864f7f3530197e5add71a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1107
zcmd6k{ZpC+0D#|D@KsUHFG5Go={${`d8o}}=WeIYZIIJx?Yy1m6_$3?E!|e<IBOjs
zZaOF_#)q2uuCV+{nGUA`hKV02A_^6X`zStiA_97ph#%ehD|&u-etzzr3*_^}Q{^-O
z1K0pybaeFa@bKW^U}tA%cX!w4^OcsCdOV)}{r$bYz3uI7x7+P>IyW~ry<TrcMTJhM
ztE#H1tgM`$pKobtkw_%<_4WPz{k65VQ&Uq+CQ~Mp4Gs<(3<itEVltVeQYn|q?d|Pd
zU0u~`wS9ek%gf6w7E2%y==FL&pI=v3S6y8_F)_hlFw|;wPfrhxMzdP29UUDU4##XZ
zv)SyXrly631((Y;GBPqWG^9`{#A5OI_;^=WmrA8tSy@pkmF?~AMx)Vgx69@7*4Ea=
z#YLOVwzRY)6bfM&o|&1MoSbZKZU+8m#Cwtd6{WoJiznFuhjf5h$Ev@5r=jsKoAbq&
zO#q1G-Qx>{$ml3uBqV4PAzy<+_(>5N_k~a-vX>W?)Sn&&MMIc~Hc0$^6c+C82ALpY
zYFa%rtC`cz>lPOEI@MQ!#-(M`it#))=kZ@=i`7a>u&qD-9Sm{0+*_{n*F%Z!BXXZ_
zD<%~G>^kko>TkzxhC}IuF!PhFH=#4G3~teQE*eL=)!;J2Q#T#Rh8XgISk1$~)m^3@
z=$Pd@P}AR#2Y*mC$_ZD8PZcvS1`*MhJIN2%G+|+=Xi{>dAJi6qtpv`No@+osH!xiI
zx6VIm41zWqlfwcl-*5I3ip<gB*px$UYy$X^BMtG%rxfD#%(X^bqTjI-@i`Z+R5~#D
zw>85L-VHw*lV2l0tE%un8e3Mi62D~$WWU-Mt;i!G!;jbCY093nyg8xCUsNC)a+roc
zwm+GZJ#s!(u)$-6@?p1mEJ0DGm5*$%64;5NLdDM>yFM*NLRZNCaXw8X-v3<1^rH0W
ztD;fLJHAG;^1Y_#(oqcx+k)#1D*vU}lSwAryY)t*6jOi=Im!1g_B_h*56hK+MH%>W
zlwt=F{_}QB&06^@u~Z}ZPD1UPG6-|+%B(-m?<E8JI8H}L^b&R1<vt*O44p!~!HBqA
ztV5*6y1xFdkyK?Ylpro<KDY2Lb-U;R1?$^l{-s=(G89dFmWw=139^ckjY=_iWDmgz
zPRGUNL#ajzGvM?Ff`Q6MhmVOqJF}$qqeIDSa4?6?1aTY!6&0GYjE4z%E+CMV>SBWY
z65I!HD3zNF`#2OJGK~uS8XO0xf&)d1VL8a=Nfb3J!0@5{r(s*Sy-)u4y1ieD1vezJ
ep#;r?>7<^G0Zr!1cTaNjPB<PKO4y`0AnRWpj_iv7

diff --git a/plugins/opSkinClassicPlugin/web/images/button_sakujo.gif b/plugins/opSkinClassicPlugin/web/images/button_sakujo.gif
deleted file mode 100644
index 616ae63a9216da3beaaab2a60ee68a02c303dec0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 871
zcmV-t1DO0rNk%w1VQ2so0M!5hzP`Ty|NmNATK)a~`uh6$`T73-{`dFy^78Wh{QULx
z_3rNO@bK{M?d|*f`_<Le%*@Q-;NaWa+rPiR#>U3f)YQ__(y_6z*4Ea~&(FEJxwf{p
zq@<*~ySvKD%E-vbr>Cc~va-(3&cVUKtgNii(9p}v%h=f1-QC^Z-rnNk;`H?N<>lqP
zyu9e>=(o4Gy}iBD)6>Jl!>z5Y&CSi~>gw_F@zK%IwY9alxVXT;!0YSl@9*!$#l`ma
z_UGs4A^8LV00000EC2ui0B8Uc06+%+K!9*aEE<o<q;kn@Is=8MbV{8HDp)~OThLy$
zl|tnzrV7s0?HQeJPXU{_{1&JqI`X(MK<NAbfPsR8goTEOfB+PWjE#<qdjpb_l$DeM
z1DKeXnQN1qmXe^Mq@|Vs8L2)24XLgt2>~godknU>xVg9j5WNDn5VpT-!NUx{xxTu$
zXUxmbw*Vy5Ed&7!7t<zn5z{1l2I1o4<mKk)=;`X~<Ny-y@bU8Rdk*&Z`1$x44gwDR
z{p|T0$WH)24F3A9S-9pNhKC0ANt_5^gvAjj>bMv|!$E)*JudEPK(eIClO_dtSSf&H
z%LXl9wq&`|LrRw@Ri5<l5~a`ok^nde6^g^!iaIEU3f-fisne%Wp9*MtM(Wh5O-m@K
zsz9sLGhU;1T^LrZSp@(zsAYiwhT69pVz7AYq^{k&c=H~q!?&;BzkmY^9!$6}U;q&k
zD_+bvaU@faBTJr4ITU~gm{0t`%o#HZ6`c1Z7)`pg>Cyrcq)x4R^lFH%5uPT^+BC!2
zxK9K4z#B!K9lSqSh^4>;?>&eDG3+CNIe{||o<CSKoj_;I0y+cAo_r914&cE*s8hou
zf(hX}>~X`M;g<JcyttQgWlWm-SnRWJ1K@)H|2kL`fC~Tpx5okqCaB<o3NnPC01qwz
zp@bAdIAMY&tihlO3{u#H;fDwU0K$kM<X{aCGkj1-3M7KC2Ldq0DC3MW3J{}>H6kE@
z2qNg%qm3fqSYwYg`WU2-MJ5>|03n1>O#n8$&}5St)R94xdmNzUmRxqpr3G4A0Opor
x9xx`EXMUNcmu8B&CYx{qFu|M?$Ux_vc<y1?o_zM{XJ7#IBIuxm3JO3F06TM(&UOF*

diff --git a/plugins/opSkinClassicPlugin/web/images/button_search_1.gif b/plugins/opSkinClassicPlugin/web/images/button_search_1.gif
deleted file mode 100644
index 083a2b3df724700218432fff780bf3ef049ff274..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 544
zcmZ?wbhEHbv||uqxXQq=Z{NQE|NsB{_wU!QUq62Q`2G8LR8-X0uV4TE{rm3SyZ7(k
zfByXW<HwJG{`~p*^XIc?&t}b<b?erx+qZ9T*s$U8<Ht{*K7IM}<+^q2mM&eoX3d)O
z=g;50dw2c%_0y+MKY8-x)~#E6dwZu%n^sX#apT5~)YR0Jl$6TK%C~Rd-n@Bp$&w{c
zo;=yMZCg)I4+FVC@h1yds}6_+`N@Ipze7WThmKVLi6ugk5*G6VRxD&%E3xQC<FNxz
zJyzb#aF9@#asI`Ys<U~!&nG)DIIh3_{>PrW^Xrc@b2T<KH?s*f3$e9yb9HjHwKa<B
z^mNxV&6qiB_MEx%<}a98&$?vkvSn=i%lO%ruVa-E*d(!H)%xZ2`RQyT86s@EM8pp(
z?@7~C-^EhTefHe>^J-$}#S|`F=N40yl;oC;iP64sy`J&e^A|5)y?*od-HVj>pFV$i
zo3il7&tLQEdH?-qU~H1kP*~tt|3E^Zrr^SZ717Is)@HFzywcJwo*k<5^?2j)eg#J%
z7V%9>m_;@zWGEO0w4R()FLYv#=j3IL945*VD^40W`q}DP6@HVM^?<*5vBzXJ*^{m-
zgW05cS_}lP9=^!0G|%d9@q*RY*C!nAlJ(xU=DL02rB$(~&3xvl7Cb%`E5yQJ4FH7k
B0E7Sl

diff --git a/plugins/opSkinClassicPlugin/web/images/button_search_2.gif b/plugins/opSkinClassicPlugin/web/images/button_search_2.gif
deleted file mode 100644
index 59161fdc8704a511e175f94c98438bb5d2cf91d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 572
zcmV-C0>k}BNk%w1VLkv90M!5hzP`Ty|Ns8}{`&g*`1tty`}<m2TJ`ny{QUg={r&Uv
z^X~5M@9*#V`T6nj@nvOY@bK{4+uLt%Z+d!q=jZ3EtE<}D+T`Tq&d$!gy}iT3!<w3!
zkB^VAu&}SMue-aujEsz+prE9rq|ngNgoK2Gf`V>tZh?V;si~>IzrV-F$KT)Ip`oFy
ztgPnd=B1^j#Kgqq<>h2#WYpBugM)+V>FM3w-L9^#<KyGg)6>t-&$hO<kdTmgczDId
z#Q*>RA^8LV00000EC2ui06qW|06+%+K!9*aEE<o<q!JkzIG@j$0ZJWs3|Paf%I!jZ
z58X2$3=q!fw0g~MyWeOsAdslr@A$la&+psi0StnJgAoP{ASNXt8H9v~j*){Ikb)77
z3<eR7fC8SMprN9pq@|{xfCZ|ntg8<O6FeUft+lqQBUxFrx2k|{I0k4KHyjTdYZJ(D
zXd)zP7_S&=fC|>v*gM$PGcDWS;MXiG;R-Z0+kgS<?CtLF@bU8V?Pc`$`1$f>r~Ur_
zqyQlpNU)&6g9sBUTu3mLst&raOjrfs!v+ZwdKG{W(Le`{wMMvD1*n0^lP512F!|sC
z2@x<*p5)*`rp*N%u`D=w@d8R&KnsEj6>7o2(4$8UTtLb+Xb%)bPnb|)z`{{L4zgCr
z>3~9t3Ls<{DA6@1g`5T|WDQ{;N7lD*4cLI|0MLQEc=PJr%eSxJzjy(88BDma;W0}R
KD_*QP2mm|esx8F;

diff --git a/plugins/opSkinClassicPlugin/web/images/button_search_3.gif b/plugins/opSkinClassicPlugin/web/images/button_search_3.gif
deleted file mode 100644
index 994ae49b4444799e975fb7468fe8ed2e5b1fba77..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 589
zcmV-T0<!%_Nk%w1VLkv90M!5hzP`Ty|Ns8}{`&g*`1tty`}_U<{rvp=_4V~yT3YY#
z@A>)p@$vEV^YiZR?qy|VySuxuudk4hkc^Cs$H&L3tE;uOwPa*u#l^*?rKN?1g{i5j
z(9qC?goJKxZhCrpwzjsz!^4)AmWzvv@bK`Jm6h4q*~-ew<mBY-?d^DYc*)7hZ*On2
zv$KznkFKt+=H}+l&(GiA->|T->FMdAp`p&s&Hw-a0000000000000000000000000
z00000A^8LV00000EC2ui06qW|06+%+K!9*aEE<o<q!JkzIG@mGBr(V&J_C&gnutWD
zRHyYzb_Rq2f_lwvyWjA*e0>H44EVf$&+q&HfO&NR3WbJ;hZ7en3W|(}2^)xp8wrLJ
zmXn$ag94tPprN9pq@|{xg9WOqtg8<a1tbX&1sDl1s|mWgEUXX@y00Xy#H@pJYAFdJ
z4<XA5Hf+1P9c(YtEGfuzXbs-q;NT|-APwW?;M2M?-ypjlH8kP#;DZ78`1$(#{Qds_
z`Op9yNU)$kG^Y|OTu5rrfrk(yN}NcsqQ#34Qx$6^;X|ziurfSg1rmZu46J4(;K1RR
zhK<DrEtpBOCe0WLOmygwz`=uR2sOLdq&a1#i4QJ@DxEpVfzzi@p?VmR0L9d*P!p7(
zz?B2kN?co9C=s<R)Iki=s$ILbLIM#C+`?U(V1k9a7TP9Qv7*9-32Xze9fY8;;lqd%
bD_+dFvEe~wB1@i3xlElUm@{i$5(EG{f0!ZC

diff --git a/plugins/opSkinClassicPlugin/web/images/button_search_4.gif b/plugins/opSkinClassicPlugin/web/images/button_search_4.gif
deleted file mode 100644
index 9769a573f644eb73640c1f482b40ea5d9f7101ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 815
zcmZ?wbhEHbv||uqc*el6Z{NQE|NsB{_wU!QU%!9<{_*3--@kvqe*OCA&!5kqKfizf
z{@uHGA3uJKii-OA^XJl~OH)%*&!0cPWXY2J{QSJUyvL6p@7%fb>C>nE{r%6LJ$w81
z?d{vQj~qEtRaN!;`SXg3ik6m^Teogam@wh!(WBF*P209@+upr<j~_pN?%cVlQ>U(9
zzrMA#^~Q}G^XJc>HEY&|3m10n+O=-ox|J(e9y@mI;>C+su3Sk;N!h%4^YrP{XV0E}
z^XARnyLWHcuwnJ;)lE%JA3l6IdGh3`Q>QLpzI^!bVTK_H6o0aSU9AHmL2=^1{=b2t
zskx=Kt-YhOtAmlbufLC%pV>g5f3ltyv*6@Dab7)P-boXdGHV$u)t)<nv5Ap&<EG79
zwr<<LW9O!I42*314;(yn_{h;?#}Djb<T`Wqj0&&#8R>IeMj}_|U%h=>UEWOn&Y4q8
zPoF)1@$%K{H*cSvV)^*#^G9oeFF#l$d4K+8(H4+PQMizJgr(+GQE7%jqw5+82@?;E
z3l7eV+|F7i8Uc(<T}%>gog$eNlXb*+?XCq)Td?%Bf<?@!oXAB-&djzbymrDeII>~B
zLo=7G*OnC*7dyr)#-7@;@?!YAMP74v`AIgdj@X=a_te(a*VmX7ow>nvK7J3I&6#7j
z)$@<AZDr|+>!@&i(B85A%M{BSr_0y#2`skw@K)d;69>D5ip2zlRgElsf>K}R?zvvj
z%u#LWv20CF<MZ?LqXQx?EMm+!uNl<9msr)vd0x@)^tYPD2VdVjCGq0k+k@<^{JWdE
ze|})BC}6wb!en`Fj#IPTnSO0+hrPSLzP_<J`~JDTyNrS#9PXC)m$O;#`r`8Hco7Z;
FYXIuOR>1%O

diff --git a/plugins/opSkinClassicPlugin/web/images/button_search_5.gif b/plugins/opSkinClassicPlugin/web/images/button_search_5.gif
deleted file mode 100644
index 044026c73682486353bd666d26b9b2fe60870417..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 574
zcmV-E0>S-9Nk%w1VLkv90M!5hzP`Ty|Ns8}{`&g*`1tty`}_6v_5J<*^Yiok{QU3l
z@A>)p@$vEQ?(SMzT6%hVkB^UKWo3ebf`x^J=H}+b#l?(_jM352czAf^<m8Z$kmu*;
z<>lqd%F1qTZo|XFnwpx_)YRkS<FBu;+S=OB&(DN}gzfF^>FMdPu&|bvmZqkrxw*OB
z-QCX4&hYT?o12@ZrKQ~5+?AD;mzS5jyStyCpWEBpi;Ih^tE;`ey`Z3=uCA_ufq?)3
z00000A^8LV00000EC2ui06qW|06+%+K!9*aEE<o<q!JkzIG@nL1oCv0oF#|T!HIgm
z1BF8Yb_Rq2f_lwvyWjA*e0>H44*0x&kKgeBfPsQ_0SbnPh=w;97KsiQh7J;siIs>J
z9vqg5gaV$QprN9pq@|{xgaxXrtg00esx=@Qtq~QixVfqz6%#MIgmNEiCk`%aJSJ)m
zA_Nc+A`a5i(hzPA!*YZO+}+*?AtB!g9Vp}H=QJJY=Y#?8@bU8V^!4`l@o4z_{QdT5
zrveHbNQzK`g9sBMgdu~%1Pv<`N}NbB!G#D9DyGu4Dgw0_swg;6<$wamR@A7a;7DkJ
z%a<@sJa{=`rb`wMTsp|GAVW@Dm_UQp3<{J`gQG~3CdDu#X%8Dm9gxr=wLu1@SdZes
zkX0!m24KUAWst*xim?_Xg!Ley#n`uDcSza*_bnj<c=PJr%eSxJzku@+Dnq!i;loer
MELqIB@sc0_J2BHOuK)l5

diff --git a/plugins/opSkinClassicPlugin/web/images/button_shonin.gif b/plugins/opSkinClassicPlugin/web/images/button_shonin.gif
deleted file mode 100644
index cac13644fb5d06e80895f57881a7873c28612be6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1029
zcmdUs{ZrC+0DwPVUKWa)B`Ph~>58VNcV6wb+PWQUTAH_-=jM^eTGn3LYA<)SuJc+$
zFjI6p&6jb)OoffJqzN;=fv6CQ$h#=MfrtzYP!UMxz!!Gyzu5D`^Ye4}oGLhZ^jO(t
zkN_3|7#J9cL?YpEcx!7b6bhA=mTqrvZ)|L=udfG#!IhO2uh;AI`8GE<1A&0eX47ai
zX0utLP)trvnoOpNi3vWR&*5-{LSbKDAD7GR?(QBO95fn@GMP-NR0;$Fy<V?Yt3@J_
zPN#D^oij5t27^JRQq9fHc|4x+@$sdlC6~)JJUr}nyVus%rl+U<em@Mua=E;}zkhyy
z-eR#VFE8_WJgru1x7)2&t3)Ch8XB6Nopm@I;Qvfo2=!ln)(gLQLfjFd04lBWPSxG&
z8hUNrPd`JbhI@@o&5enPXcU^oL?^a1vs#&q22Mv;Bf#Ucp*=i-;13=ZLWsnDlKz1~
zsqCp-0(OrmM^z&*Ql~eJ8I5ey_!Jvynwgp#18ECs$73PLxtM8BgJZm_K7YWEjxqoJ
z{5g9S9q$c>5DH{Z8L|q*WZ}q97T%>qp}*b3$me$s*W!<SWl{3kd0^KGdP>1z2M?KE
z{D3?vAe=svKo+M21;o?L!`FUC*<>_q(_7`y-$VO}ciLcF`p2r?u3|14S9dSm>-i8@
zSagA>GG$P($>&j^P<WNjPyU8LQVV%z`0L2o9w#o@Yc7h4cKmi|>d_}KIEmR;^wd(j
zmk@{g?t@D`?2-EYg>AQ#ET@`r<cd`z`tzB-6*`W8U)<{+(@MI|YsHV3z69yYmRH!7
zw8xpZH7!3ptXQ3w(y+<zblmhK5~>cpX|+A^BUEhc4qu13<{B}VbT*!n7u*R~$L?)@
z2+$DPkih)47QqeJD<Eb4LV0xfANK~Pow}X<5ul$S9&Eq0`@#VR4nuzpyAK}?l1LO9
z*i~}5EC$NGsYaySa4p<Ty-lKEu+=#iYtWVWPE1xgqm!QV07H4{<?eV8`}$)3r8tC?
z_*ZruD#KBqn{@0`=)h4T;$l?(!BI{_-mB**$l{U$LK7(|3Sh`>g!gumsX6jENSTBD
z1x{^WY`rRUFETOL4G`<PBI66z4c)nCZC4Od+5I0MNvWS<risY*6boXuv+fO#>vKR%
Pb#t0ZGBZF00B`>b2GX}+

diff --git a/plugins/opSkinClassicPlugin/web/images/button_shosai.gif b/plugins/opSkinClassicPlugin/web/images/button_shosai.gif
deleted file mode 100644
index 6e02c492e918934579bc55b87f916b82956dd165..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 841
zcmZ?wbhEHb%wP~^xXQq=Z{NQE|NlotMg9Hz_t&pqKY#xG_wV0_4<FvWd-whO_fMZb
z{rU6f>({Su-@g6*`}ftWS1(<<bnV);D_5?ZIdf+J{{6Ra-#&Ki*n<ZTPMkP#{`~o!
zJ9lo{wCU8TQwI+oJbn7~xpU_}e*Cz1@7@a+F05IzX8H2vyLazivSi7&ZQBkXKK$dy
zkBu8Qe);m{+qZ8A4jeds{5S*YK=CIFSd$Kj1o_E<?Y~1qfrpM%|A{3<Cv&WrTUV55
ziAJ!7u5t)EP__H=YH?}N?v;0qt9UKuGJV(~b8gX`7RIK!^Y4HEZ)j|4ZmDGu>*(z2
z?x<kypD=Mk5;N1}iPI*{>Yq6&EqwOEMa&G6%a*T@6j)iozHa@7^-1jWw`^nDzHO86
zx;-0r?byFAY}28Q49d!ir_Y?>WY##TT)}qr+VvYZZ{5Cg_ul;*45E*pJbm`Kg74Mq
zH?NcU=6?|U@QO+B8`IbMf}ekVeDmks*KGFy*#<riVXZe4lvvwZDx^H-coZ(0!6swD
zapDBy;$uC$W?fTuOk8rTYyO%59nX&`N2fFR%$VV9%%CY;A@SnQ$>QY_|L5Dd8VDS4
zSTS?K{E{faRbQU_2`0_>Hiyfh`ReKj(;X*XEm?hieZpb6m7d$y+}xaTc@=BH!nL=z
z7u>dza^1e}?(Pb6#)<>m*Wce?^HE2_XNSSV20^hq(Fy$pj}NBt7`N#hFifhO%I!Yw
zOeG@&&jRP}V+@a)Gi+M_2tCkV@IFhM{|kqLLG`z+YwLb)`Io)h|Fu&!!xRn1MLP-~
zGc&0;7|NWNG7(x-{Bz1PuTt&MCDEPpVyjAw?rybT&g9VAwME<Pf#ZRFdw+kEdsLmF
zf1vj7Z;lVw-3{#j|M~l&Qo*5y`P=b%jo<bzS72h8;BY9CdCLO@Ij)e5hpl2<9}coJ
zX>3Sa*e0!Y;bDi;v>S<S5=ko(Th*t{c-XE~HzBEuAt&K+uSMPlCN_&l6A$z|uyLxe
zxHuUsnZPOWGkKy5*U6O0o?1IqCi{tXKAFnN;BatSOxeq)(<)Y|KAVv;O_H5Kc*)9V
NvvQVkItVaW0{}>>pxgie

diff --git a/plugins/opSkinClassicPlugin/web/images/button_show_photo.gif b/plugins/opSkinClassicPlugin/web/images/button_show_photo.gif
deleted file mode 100644
index 59f6c5ddfaca5a479688dae4209b4df645a2cc4b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1217
zcmd6k`!m}I0KmT?i9|dirBv%x=8<KV>26a!E(y~qop@Y_?Nlwg&MDdLajDb0uOvp1
zN}HgpyClRjDN&CbhOY>6x)PI_XMNSXUO^Gh?7F{VpC3Lyf9^h4LxO!T-(msQz#;&2
zc6J&JhSSqiy<UHKco-KKcXV`ga&oe}ySufub$oohxw*Nqv9YtWb8v8wm6cUmTAG%Y
zmXwrKS68>VxX55IQd3h43JPj!YKn@A+S=OE)6+E?O@DuXeSJNP#hRR)oS&bco}L~b
zA75En;c~f|nVI?d`49x@bh?U)ipIvqj*gDu;bDbBQBqPOlgUO#M%Zk2ad9yW!&0eq
zYHDg}X{o)veSLj>Vq#)-b+xOjYiMXlBog)Y^|iLP_V)IUj*iOZ@_~T?u~<AdHrCS8
zGB-C@SXekXILPDinwy&?5{XKs;&3>Xm6c2;b75ft_<!JXfc!6n^v>^|P)rOUz~*qX
ze#y>xkeip!dsqM<kOE<05fblcYgLRRo<~W}<AgYrKc4VZU~gq#Z|_$qX_7<=sVFM~
z73qf;poj{4BC61jKrH_Ar2xT37>{WG9{p!*d}4BH`qj*o=8?(#!s62M%A3`-CHlH<
zYkTQ60=KU}IMky^dI!|rt!lWQl6@cN$B0oYpa*6SH?*ZsW*u{kK8TAR`%<N3=j|Wg
zS9vz{V$Wfs7G)mdiWkM?Zw8)*G*-U+)%S-9`M2V#ArZx#Vi)IJJuJGAdn%=aH8@jx
zNhBEzL?P*cF0h#S{cE&s0FIe+&E>lxX_@KgFth2|P&#ZtYx$H=+CvOQ;pIiXyMaux
zjSsUU&3@QyWQ(@+1{o81=9lw>JQG;<iM?mMbq+cjjdwvCFU$#j7S9=}j*<mmPYlj7
zI(wT>;U)f@Ot?<cJ_j%EKBixypSkDH-4ht~hC2;A)Y6PEqKI!(DP?ExPTMf*Uv+lG
zgPU+qo>O?|9|t?jBeI*K0Q;kT-P{Y&Ou*y8BmK_mOxLASwgEtUI)hkiT@Q#cx)X@N
zB4gm7CO1B0Y#kf{WLZ1vZ{o~|e9#>D3pERV@;gjpd!p5XuPB*7H$wtKW#P9^gi5s6
z*Etd#L8=jW+XZN};RHCrnkxZ*nll&&46>sAErPrjgwcC+2t#1O5XOvo&L}Z1_#PD-
znHUQoUBg;KZs6aN-+SVyilty8eDGA{7h0xAqM5Ha6blxSON5j#Yien<d+i;6vya~_
zm-GFS`Q>&QcrWAkV<6DdiHr9#vEvex5$*{PwcI@{I<v|l2Cp==(bEB`oiv$N8={8*
z+;7Tc1kMcjaYa!u>N?w?cF#*eJE{19rIVVuhHZ<5I9#6$pr_$e2u^wa5t${&eCF$>
z#G=&BN^?Rk9cmfyiGZ3nuEhZD8>vTBlud?gtxG-1fgq%9imn^uAt!fV(I`0GH0Q7$
prSa7ivZJ|0lzgju*LQBK-#MGKt#%WTEZjV+<l6%zR{{pO@-Nl|8dU%Q

diff --git a/plugins/opSkinClassicPlugin/web/images/colon.gif b/plugins/opSkinClassicPlugin/web/images/colon.gif
deleted file mode 100644
index 7cfb188b258b3ee2df2c032b5d573d8c84d58e39..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 53
zcmZ?wbhEHbWMklGXkY+=|Ns9h{$ycfU|?j>0r5dH3`{&d{VO>e_C9KAKQ)_+!5RQO
C5)DZJ

diff --git a/plugins/opSkinClassicPlugin/web/images/content_header_1.gif b/plugins/opSkinClassicPlugin/web/images/content_header_1.gif
deleted file mode 100644
index 46805866cde2558c2e435a114fa93620dcd3c03a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 404
zcmZ?wbhEHblw%NKxT?XhZ{NQE|NsB_^XKQ!pa1^-`}_Crw{PD*fByXY_wV=b-+%o0
z@z<|kZ{NP1KY#wsn>SajT2)?NK5g2x_V)IzTen`ibm`u`d()>+pFMl_-Me?cfB$~w
z%$euUpLcb2ZP~Kr!Gi}kZroV2X3gcxmrtEKHE-U$4<9~Em@wh-<HzUEp9fmXKn<Yy
zlZBCiL4!dDWEjX#4s078rWAPSNcFooBpggJo5$;0EXbfRxv!z@^i!)f;R`o8s8yeO
z;bf}Ar*ZE+cZXBc{_8mo+fHAvyQ$&D)Z8pAEZ@>nk?6(K*C#MhRY|(PJKT$H)-2K4
z^Vp_0ELzO4blLJ136+d2YuBw`ztFv@lR=`hYt;-!j=g*N4~XpByUERq`NRpq(_+es
zCy%;%abCG1BqXDL^~yz0M)n5}WYr!%z3c47agtf`^+}HBFIIkDy7*gzBZD;n3h1`(

diff --git a/plugins/opSkinClassicPlugin/web/images/deco_op_b.gif b/plugins/opSkinClassicPlugin/web/images/deco_op_b.gif
deleted file mode 100755
index 620667789b86b237edab08bcdc166475f96fea25..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 397
zcmZ?wbhEHb6k!lyxT?;uZ{NQE|NlotMg9Bt@7J$iKYsl9`}gnf-@pI-`Sbq$`>$WW
z{`~nfH8u6~=g%KMeth@t-J(T{Qc_ZG-n_YV>C&S|kG8h9PMtb+{`~pp&YfGZV8P0j
zEA#X73knL(pFiKz)3bj4`j;<X9y@ldqN3u%hYxGluFcEKYiw);+Q>j9p!k!8k%2*-
zK?h_W$WIPzs}2Y!c<4xV9%4xJOyICP-RIzt$kx`_RCfBU*t&*>L?6A`ybm0b=5}zH
z<V-wp*pL6+k3Dr0?0)e31vl|1*Js8wHU&#WXY%&*=5;ZtDojWaVw^R5&Rj+z=b7^s
z&svaJy`mzMV+}`Vu#Dnbj@o)ZQDI@xV3D>6?gQNGgQX90XY!xq&r=f@7Yi0UmC1LN
kZ_;GRYnfbkxl{xmKDu{zwa@bx-dh-)+~2vXJ2F@U07yll00000

diff --git a/plugins/opSkinClassicPlugin/web/images/deco_op_cmd.gif b/plugins/opSkinClassicPlugin/web/images/deco_op_cmd.gif
deleted file mode 100644
index 75244d3df43324afbe3e520cd7f0b43a7d6543c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 505
zcmZ?wbhEHb)L;-{xT?+Y|NsAe`}RdeMg9Bt@7J$izkmP!@#BYo?YyRS=l=Zp^Y`!H
z9XodX{Q2|a$B$pXetq}u-TU|NKY#u_<I=y)5C5;Z`+xC`e+@_fmhS)CbNX-2u0IPG
zF5IwT!_AvFXV0F!V#SK$1^d&dY{{RqyKeQV>=`@C7ay)(ek{0gQGCzZ@Ybct6E;M5
zuDtQ<KLZ6o@h1x-1A{h$4#*6UpBUKw9|%qG(2?pt@g(2`qs9CSD@wec@-Q~9DLehP
zYJY=vl8@f()Avg(7z6_EE49}6tv`Le;nM6VuOI&#8tW=l7=+t97`VH+rRAh#8B|!O
zOr17;N`*Xw$lQ6=@-r4qt59SRU9qyOr*8s-BFn~2o40JNP-YO?wYyrGXFt>aLx&C?
zs!(8%ICZ*Of$cog`3p=}u3o9oWDvW3XLa}5iGKY2OphNwee&{2g*t=y`w!I&OacO5
zzJ0y&?W#b97K0=c*OzNA0xcMMr4)R21SlSEsR%eRS&6}+g@Z{i=}1Oz6pM|TnqT1q
z2ZocARfCruDPFMj^mK!GuWqx;48F6?KB}xZI$3?ISR@liiOPfoU*U-!t62mVEm;|?
KqTR&6U=0AowBG0d

diff --git a/plugins/opSkinClassicPlugin/web/images/deco_op_color.gif b/plugins/opSkinClassicPlugin/web/images/deco_op_color.gif
deleted file mode 100755
index 263ef7e4564c86ee27089c66e1501def51f5fe11..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 398
zcmZ?wbhEHb6k!lyxT?djZ{NQE|Nr}Ud#bh0e{X4-u`c1=UY6TwGL|b(|NHmvzn|a#
ziz5G<&Huma_&;Y-+qt^`r*b1szj`?>_W!9V_Zz%_?r!{lW5b_IOFkc%^l5e8&6_uW
z|Ni~s$B#dM{(SuS@prw^cNdqxfB$~{`t`fB^S2Xx_p=n=y?gib=g;@=-~YcP{`vFg
zU%!3<9l$^?Q2fcl$iScjgg^lDlLOmo2eAYX9jVSk2fQ9C7$~&69uBDB5SZwgAo0Lp
zZh+?1uB%1PqTMQc!#3ZHc3}8g>$d!AwwauVibx$#9d{jT9S3KPbZKHmN_9+}Z&^}h
zYK>M;d2&@6gB0V!MT?g(N;xlBx@zI_B2IB-331g;Dw~)#F-z3QN(zhYJFx%Y!LC_T
z`{yyLAMcx6qjq-A^ccBI(<T%tT|c>pMS+D~o}EpTjfs_snIp}~{k^M>BZD;nCOW4<

diff --git a/plugins/opSkinClassicPlugin/web/images/deco_op_emoji_au.gif b/plugins/opSkinClassicPlugin/web/images/deco_op_emoji_au.gif
deleted file mode 100755
index e87d8681ceded4acb633f9620cb042b919ca9615..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 449
zcmV;y0Y3gmNk%w1VH5xq0M$MKzP`Ty|Ns8}{`&g*zMByE`1t$#`~3X;{r&y*_4WVs
zrt|aj`T6<o?(XsN@tSV{@9*#MbrJvfzt6T)+1c6jt8ejsA^69i_T4|!wkPD+r|Z!^
z^O;cn=TZOt@9E7f?A(m(;jZM^sM*JW|NGg^v{BXV?%~v=(6?0P*{S;T$<wqV)xB2v
z;5Pc{-1C@E@`o|~_3rn+kNWcK*SJ~ldl}oxgVnuW`PjYr;LP{Np7+<h^}LPqkU;<c
z{{R30A^8LW002G!EC2ui02BZe06+%bKp$X8EE<Wz0Pi(u?rOA<#}m5Qnt@@U!0i?^
z69QqP>1F`|1fqB0T-5M5;v9h3?S$4tEPk{I5Oe|pF%~j|h>3%A1{D#H5jh5vl$3N{
z1rs0=4-%XbAQJ_23#FweD;NY1dl)Mx3uhDow6(Uk0Te^CxV^NxXoD9p7K+An2RIf7
zIvfYj(9v`=5iXMz6)7lUC@Gd&4B_D-EGh&fBm^ofA`Em5@bCl*^!4-v4Rj9s`z0R)
rCTN);@S%hQItdag9Fbu|hYlMuj7W&AiN%W;4`dN?q+<~uK>z?dOn>K-

diff --git a/plugins/opSkinClassicPlugin/web/images/deco_op_emoji_docomo.gif b/plugins/opSkinClassicPlugin/web/images/deco_op_emoji_docomo.gif
deleted file mode 100755
index fdec50d5c8e9de3f299a2be3bee9a6a7d84e46fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 450
zcmV;z0X_alNk%w1VH5xq0M$GIzP`Ty|Ns8}{=S<K`}_O)`uh0z`276*{r&y*_4WVs
zrtk0X`T6<r@$v5N?wW4^6|3Sjw&nBl^V!+i&$d%Ew&wr$zxm)c*~fs*v{BTyCnT`s
z>CG(b(LU_quK)e-)$Q)py;l13$>!Oq_T4}I=TXzNBH`4e<k+X|+>F(|UgX%Q|NGg#
z=JdYi_0YFea?I_|?fA{>_Q2@(am(z#=k~$IknHyP-}CxJyy!!_=iADI|Ns9000000
z00000A^8LW002AyEC2ui02BZe06+%cKptR7EE<WzKp_HY>TD{{=i^cB3WdNhVCZ@c
zD9T_!L3y=+0HRVuxHmDkT#gPb?)SmvF&;lI0}FKm6-^L1I0A}`i**DMEd&HN8#0oY
zmvvtT6e$)D7M~U=6b5w?sHi6<Bm)n8Bqk>kXcGaqxVgFk6GOJUz_-0=gfogT6^zPt
z2N5m@(9Y1)(~gjmG!Y{&V=p6_TMXjjD<L8SEGz>eAu9}Z4)O5=3ibB&0}gc!{QMal
s13=sYF@Qsc26YlBT!=wKhY}?^XuzP58J3F}Gak?)<cP;2Jc0lKJAqB+X#fBK

diff --git a/plugins/opSkinClassicPlugin/web/images/deco_op_emoji_softbank.gif b/plugins/opSkinClassicPlugin/web/images/deco_op_emoji_softbank.gif
deleted file mode 100755
index 915620652adb6dc2c4dc2714cb2a263c028e709a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 451
zcmV;!0X+UkNk%w1VH5xq0M$DHzP`Ty|Ns8}{`>p;zMByG`uh0z`2GF;{QUg&_4WVs
zrt$Id^Yioh`T6ed?(gsKnr{GBR#w^B+5h*y&$d&Tn3&D9QT^vp*~ftT^U3MWEU>V!
z_T4}1+>GSdr}^MEczAgK{qNQ7?v0I&)3hRNY;2B>j^^2^>(M^dy<Y6$uF$ts|NGh1
zy;gU3cj45e)V3$&*r>_7eS?F8(b3V{%7gIm@VL0R^78Vzxw)gGqyPW^0000000000
z00000A^8LW0027xEC2ui02BZe06+%dz#U*nEE<WzK;c%3L|n3zDil(sYK1~z7%+Ih
z1`mZmpm@GpK;SSl;STV)9G(t5?svimLMB5#1P^rrG))mE0*Q)?bpwu$6(f(6j&)!L
z6de-~6Pptq6b5w+q@*t-90U-293(FcX%Ydmw6(SY5<{}LytBD#0w5a#48n`YbqEU;
zE)gRO2+`8gbv6+>jye@5D`YDtk97^><1sB61S~8B87(mlbq@0K1Pb=|_5==f3;q2T
t8VHD(C4ztk3k&KbSjZ3q3=|hGpn!p4VX`b3GipSzMaYqlMRo)M06R8R*~S0>

diff --git a/plugins/opSkinClassicPlugin/web/images/deco_op_i.gif b/plugins/opSkinClassicPlugin/web/images/deco_op_i.gif
deleted file mode 100755
index 33f553bdbe3f3747403bb6b4c72a62e8421419f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 385
zcmZ?wbhEHb6k!lyxT?UgZ{NQE|NsB{_wUD#AHRP6`u+R&*RNmy{{0&j74`1jyPrRQ
zzJLGz<HwJG{`~p;`SZ=2H!CVCE?&HtpP#>X@7@g?Hf-IxwY9Z%{rdH{Z{OawZQJwb
z&#S7c?%%)P-`{`u@Zt04&jSr-pe0cJ$->CMpunI5vIOKO2ex?*0tp^EQk{nw5>Kkc
z2+VzEWWd9-?#7xj2UZro2OBDCUa*N}d|_eq+%2BgSmU>z`%LQ|JAcQBZ>(w2avajp
zF`;~2k{rDpGF=n9V)+@TO`kE7k>7dhtohUC#FZ^6PUBs%l2@>gLvUq9L!}UhL_-?a
z&Rtwv<ah5(<2-a&fJ6B3i8P+mJW@wR&s^k5W4n6o`VF?_L3ez3L!8_nxhgm^SOWls
CvypfJ

diff --git a/plugins/opSkinClassicPlugin/web/images/deco_op_image.gif b/plugins/opSkinClassicPlugin/web/images/deco_op_image.gif
deleted file mode 100755
index 8e17c04b7385894c746dbc46fd2d206687daf502..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 680
zcmZ?wbhEHb6k!lyc;?0M|NsAe`}Y0&_wU!QUw7aA-+lLg=<d++yXBj&{nu%BTXy#U
zpFe+o{P^Lx+|hWZ@ys-aw3+`qxBkC*^X80$|1-~LR<Hb@x8VQp-@o%0U2R!+^U;U@
z@87@Io~X@`#&GP>|GoGAuekF6>8Jm4EpihMf2-Z_xP8}Ktp<n9H~;6(JOAd}|D5@k
zK7al^Vf($3<+r~4{4ZQ7{PX9}uV26Z{rA6O^}USQ=jNaPuh6FO;rstH&;Eb^{r}^~
zk7s5Y-+%vq(UE5_zWlFPc4hLhpTGY8fA{WP)7BTW_C4y}_i@wB|9}7f?cR8O`l-J_
z-!Tksp!k!8k%7UBK?meaP@Fih|8MYOY;I|7YiVL&R@D;})aRYZtKX-m%FNKrz~iA|
zFR9~VYwMyTX|LhIGn0|Q-IHPCrp+5Y-PbTk>ngJDWwqwt$Ev6+y@Tn*$y2A9c8DuG
ziiydHTosYI<ftsZgGWV^>!F&gtlC2^O_kNNw6$#5I6r*)$Z4acy+&xu?=3>jzy2`&
z%2qw#!7HF{S8<^6@Zol0g)E88Wtofuk^%}A76(2yH1`-a=oEyhxVLhd@vJaOc%0Iw
zbjReNL{ajg78WHL3xSCTp7kmk6mZUb$lMsna-dJ?gP}8ro~(q4h=sw|gN&<#O%pCO
kYP0b&B^>Tz^;TwE$I5(ZRqXDv6b8q3)<<GNLL3a%09aH7I{*Lx

diff --git a/plugins/opSkinClassicPlugin/web/images/deco_op_large.gif b/plugins/opSkinClassicPlugin/web/images/deco_op_large.gif
deleted file mode 100755
index b07e680859e7dd90466c9d5d48999433b717991f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 417
zcmZ?wbhEHb6k!lyxT?#rZ{NQE|NlotMg9Bt@5hfHzkmP!_3PK4KY#xI{rmaz=dWMC
z{`~p#-Me@1-@l(VYgTG%>c@{CZ{ECFP*9McpMT-Pg}l7HbLY-gR#vWGzkcJ!jWcG<
zICbjO%9SgRA3uKU)~#K;c0GUoe94j}6DCaP?d|R9=~=U8&DynVTUuI<9zFWv#fy}b
zl$|?w9z1vu=mrL|fZ|UUMg|651|5)Yke?jb_8kyQ@X(R!Jk*f5v&LrHWcTJw4jyKf
zCgamj{aD1BL<JmXoR@4=D7Nco?zM3DT|W6y@AriB?|-xBvo<w}F!Av*i8MFm$Eqhp
ziZKbt=5umNGl@^1!>P=qIz3sCap|(<D;Ncxm#kd3bahI-CKEqreLnlH-9meXcJFTN
z?$Bse>SoR7KFzJ&c3P21;tY2_&viK_(d*YmnPl(e3p~D8TB4=!IG>A4ib?IwM=qUN
YZ+6PJg@j17v4=UiGl^vivM^W!0O>%l+W-In

diff --git a/plugins/opSkinClassicPlugin/web/images/deco_op_s.gif b/plugins/opSkinClassicPlugin/web/images/deco_op_s.gif
deleted file mode 100755
index f9d77769bb85ec282424c5024bb17f7bd64f4e43..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 426
zcmZ?wbhEHb6k!lyxN6R@Z{NQE|NlotMg9Bt@7J$ifByXW`}gmUA3wf+{rda&@1H+^
zrlzL8d-v}B`}a$hEJ;a8xq0*E=g*&4u3Wi!^XA>VcUM$YEM2<v=+UDeK75!pYu2-8
z&pv+qxO(;Kty{M)Sg@d~swzJ}fBpLPt*xyuU%veE<;#;NPkMTK?%usSb?VgV)2H9M
zb!*zRX}!I@+qP}nuwg@gfB(gc7oR_WURhbWbLY-er%oL>aA4Q2T|gHy-~ft0Sr{1@
z%o%h*@*qDsupK`jo#3G()p>~F;U<9?4kl?u<*G=I8wU&uUR3RW&@3ikFys7-Er~J{
zIPNjcNVqhELu+2!Jlhw)|2Ht_aB|Aaw-j(oaZ2Wk<P=PtG%<(YR8Y`JXQGLqX1;E+
z0OOLS%a$_=I4@qYcFC%g#!YoOtlPHl*vZ-~kuSl?B*Lj6Ceo$Hq!P`=$H&db#bnH-
za88lyMvfMfst`X<F^`5QzYx#!95p#<Lnav}S!r!iS$_5R%F!IZ|NQ;Ov2_E7j7Nbu
OgQB~T*iJzf25SIoo5R-t

diff --git a/plugins/opSkinClassicPlugin/web/images/deco_op_small.gif b/plugins/opSkinClassicPlugin/web/images/deco_op_small.gif
deleted file mode 100755
index d03bb616581f397b8943254bb6d4626cbc5cc668..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 382
zcmZ?wbhEHb6k!lyxT?aiZ{NQE|NsB{_wV=b-#>o*`1R}8pFe*-fByXS>({@3|Ni{>
z^ZonxA3uJ4_wHR(R8)R`{>_^=Z{NPXZr!@n)YO!elym3Kb$554KYzZZrKPE<Y4z&W
z)22;3a^%R#lP4D}Sg?Nm`sdG|-@0{c!-fqXK70UL#6WGJ_>+Z^fkA~q2V^kFPY!Ie
z9fT4*bfh{DIV7Icv5}kq%*cR8VBL*1(;Qe?gdS|DnDc^7EMrT0bDxFM%hpJT^|#+M
zeNH(4{x^GCw1f}~zi3n%dslZ)FMF&2<D|(`rZNgRPn<S;(u}x@1*K_hOO`HM&Q?{g
zB&=MY#<g*i48J)4rcG(QyLT({?dKEQvpbFF7>|O8>~Tq{<2-2`mo8tq%CR`;rq4<S
MC-?iVDvk`+0E)4h*#H0l

diff --git a/plugins/opSkinClassicPlugin/web/images/deco_op_u.gif b/plugins/opSkinClassicPlugin/web/images/deco_op_u.gif
deleted file mode 100755
index 89cf1de920635b7754edf6b8770156f749d23221..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 296
zcmZ?wbhEHb6k!lyI3mTcZ{NQE|NlotMg9Bt@7J$izkmP!`}gnHuU~)s`0?)DyZ7(k
zfBg9I&!0b^KY#xD^Ji*m>W2>>Zr;3^l9KZF?b|0$o~&83X7%dTd3kx$rcGP0U;)r5
z22`N<lZBCiL5e{KBn-0CfpzHuww{#CNl6ZCx<0IN(bgz1VDr#>Q!`)L%;A88j#PhJ
zg2Ta(7#4{%w}MQqDa~ujPRnX=Cv<Sf2yiQ;Jk5U;^<K?BHQ8>xN7*E<TDcyUe+`XI
zjDpH_%^mfvPO-gFUOW@I^(OL6X5yY2pO`!+J=2_T5vSfFz9meY%e*+(a+Zs%6=4!u
n$LYnrlUvNzT5K1$7yIEOM~|^jFgSHuo5xH^{i3RrB7-#mU(|vc

diff --git a/plugins/opSkinClassicPlugin/web/images/icon_1.gif b/plugins/opSkinClassicPlugin/web/images/icon_1.gif
deleted file mode 100644
index 19a7077f9b2aad2d62e60e30c49054e2589363c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 50
zcmZ?wbhEHbWMg1sXkcXE%Rl@7|9{1wEQ|~cj0`#qKmd|)VB+k_XIODv;vP3EgEas;
CuM67%

diff --git a/plugins/opSkinClassicPlugin/web/images/icon_2.gif b/plugins/opSkinClassicPlugin/web/images/icon_2.gif
deleted file mode 100644
index 176d8b462e60f2f8fe52bba9af2b190a177fdb69..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 50
zcmZ?wbhEHbWMg1sXkcWxq?Y~v|9{1wEQ|~cj0`#qKmd|)VB+k_XIODv;vP3EgEas@
CSqt<4

diff --git a/plugins/opSkinClassicPlugin/web/images/icon_3.gif b/plugins/opSkinClassicPlugin/web/images/icon_3.gif
deleted file mode 100644
index 77c5ef1b10409b8ecaafa865ef4da02aea6f144d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 50
zcmZ?wbhEHbWMg1sXkcVuSSk7c|9{1wEI=kBgAM}_fMgt)ID7ILR$Q03$IZ%M4FD)L
B3sV39

diff --git a/plugins/opSkinClassicPlugin/web/images/icon_alert_l.gif b/plugins/opSkinClassicPlugin/web/images/icon_alert_l.gif
deleted file mode 100644
index bd68afe6494240b97e45845ece2f7f5657e027cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1551
zcmdUs{W}wQ0KmVSVWzbmVaw7=(OEC<ay@$AB9iM)xz>v%)MedOPf2>Yo}O(oDl+M1
zX=PF-Y9X<r88c=WV`ko8hU|q+ObP9t?!UOt51*eu&+`ck3h><+82|#n2mnH%&|<NC
z`}S>qe*Wv%uXA&AQ&Ur4zI>USoc#3Z)6C4w?Ck94&!4BKr;SGA*w~oaY#tvUpO~27
z^Z81p(quCA_4QR$ROocNmX?;Do}Sv;T8&0iRaG@SJS-NA+uPe!DphlHb4^W6Z*Ol?
zQ<Gk=udJ*TiA2@a)uW@M3WcJsuCA@Et+lmPtyb69*Gr|+fq{X+!9lrP-qqD5lgSzy
z8Vm+QXJ_Zo(9p=pNOyO4V`HO4BGGEKB_$;t9UVnQMP+4WrKP3d|HiTz*ni2Zzx(?W
zqOFAn81dH=n2AX@Zr)0OSf#Sk?xf#M#kjIvG50u+Sr7&Umi_E`4(~a_9bj`|Yk@n0
zU(DwM2=aYd`3K=T;OQiElt{4UPM%<$P~KDufwwB#RB#U$u()02SL3*_r*$!K!Duv!
z9}HvThSk6oWi%Uo9KrM~$`!1h?cNzoEQnylxcq^kNY6&Xu;{Hm9BN3y1|%|jiCS8i
zU7L#cyNL_>IfIwJDl`v=-b1T@;C)QS33`*$_(<VA+FkdC*OZ9|u@T&Kk}ber^Ex66
zbq~6OfoU)0`JtJ-m3~;Y>}~!5K0FH0Chidgb_7`!KwFVIN-37?t?b~^Gd*0FICanF
z_V_}lt7GHMHp@-DR3`@l`4rT;MZ$6?Y}4;38b*jh*a94q5#3~Sn1YYYD%Q5<hUSMi
zcKY0~U$fxqH15^?u`a>+%$v^KQe&Se-hSzC<$`m)wdsVT*S08SADj0F5Qrb%oAv59
zF6_uN85^*j;#<7%u+lMC%ZapoXe0A-mtv7L^Y;qj{0#j5uweW4KyTQb^`)ae3l>rP
z>2MDzuw}4m{iwD6QZd~ZUPWhMywn}1aB;q2c7;;az#;5es>sXdQtt9Zg~&{{4&2*6
zc&PB+PI`!w;Gl}QXiYU9;HGx5;58KdP$~&=h-INL6>p(nDZBaE5wK`deE0lA69mvA
zu_;y&%pXUr!tUco9#V5&<YeHlnM4^2{oN}$v2raP@2q_B@yUfJE1{V*`AIt74Rk&|
zKzfX(-%j43dumlrGwt^g646j=_K7@g4ku2h<vn5o`nm}_s_sQ@&f&gT&0C!=zn~<x
z^<}Z@FG5Via9(~)mRhHOEs`M&1=aH7`(mF&a19>PxGJxguh#ab!k0_mfMWi(Td(45
zac1ZR68wUwWN^4z`EKieZsUS2=Pr`0M{Dv!FB`Lp;_<$meanEG^6%hPd59zyY%b{R
zUJ+zd!o6Ksz=FcuNh~PAKGi?M!o;{z#Rsvj0%!Xr(Z6cfuP`!1)zYaLGQ8Y}1BI@v
z-4fFv_va!}a+ca2HR4ZP@00a%RWV}Ui(OHP7ol86Gr>(aN?yT^hft!Qo1JVrS*BP@
z*0c5UlqE^&@<Z#BHN@obi;jCbRn6#N=t*8gGCJI|AB8-1K%9NY;R_(5cDo&KK<=If
zG?WAE2}lpk>&I9hZ22?UCao`tfk=Dph~Df*O&5=tlf5BmZdqvjMz_1)R&w@Q*?rU(
zB+j_oy?)I<0S8<f$q;ooq{@gjE%dOtod9?o8hMs(MYqvKPyVy1U^tV>Y+=EoI=H@m
z{<L_-H0(6a@6_OeSEo~8j-jm2UkwM&Yiu1Tnkh287!Z+RA1zbbHG;ObhW7=^6bwlO
z^<qGu>LijKH6oi$-Xugm8|HcNrz<mh24+RVyCF&C!YgOPv+xh#fk}^#{i46#=s+$c
S?|K=AF(r5>58$B?u=!u4IlrC&

diff --git a/plugins/opSkinClassicPlugin/web/images/icon_arrow_1.gif b/plugins/opSkinClassicPlugin/web/images/icon_arrow_1.gif
deleted file mode 100644
index 80182a71d9583d2d160194ab7b867843b6d23cc4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 90
zcmZ?wbhEHb6lCCLSj5I)XJ@CSr4=0=U0q#0W5$d%Yu5b#|DS<@LGdRGBLf2)gAS0*
s08;C~ET6IK&Od`wo~vsa#GKC<G)-hZcdhne#)R&djgPWYeVG`n0q15Oy#N3J

diff --git a/plugins/opSkinClassicPlugin/web/images/icon_arrow_2.gif b/plugins/opSkinClassicPlugin/web/images/icon_arrow_2.gif
deleted file mode 100644
index 609fa3a7084f979810618966ac9b329dd873dda0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 176
zcmZ?wbhEHb<YVAtI3mfQuC5*v6Jup%rJ$e?9UUz#EnQk#nv;`LUtb><7G`E<CMzo&
z6cnVXsVN~Lp{%T|udi=oV-pe*;^5%m>FKGWqLPr1pr)o~WMuUJ|9=Jyp!k!8k%2*y
zK?fuQveSW8H$km0#Z&D1;~7g@RdRIFFWUIAC?*;)+&B=Zz>p%rHzm?pA%G`E^hEJC
Jj#Ewy)&MUEDzg9p

diff --git a/plugins/opSkinClassicPlugin/web/images/icon_birthday.gif b/plugins/opSkinClassicPlugin/web/images/icon_birthday.gif
deleted file mode 100644
index 3635a174ddea8526a1502bd131198efd0b7a8dd0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 250
zcmZ?wbhEHb6l4%&I3mJumqF$K|NmiOVU3NAHyM;~Fesm8P+ZC&{r>&?KY#vw`}XbA
zr%(U>{rmm<_jv}TOAJa^8I*4^sN7;uz5~|CKnN)QWMO1r5Mj^(DFoT+z*?^0%D5z>
zOGSat@$s&pKf4+e?tfeO`1^zZ%y$`I2yYPZSdu)`<(ivTh!)q<4H6M=Qf42$#@EnP
z;UmY~#@HIgo4Nk#`AjY?`;+h0!V>oTfBfmj$l2U1*w)e<&%n~t+t-_(z&3fx)G6sY
V+_Pr!&z(KXw5q<Y-c*sn8UQ6)UI_pI

diff --git a/plugins/opSkinClassicPlugin/web/images/icon_camera.gif b/plugins/opSkinClassicPlugin/web/images/icon_camera.gif
deleted file mode 100644
index dcbcc5671cbd4e6112cd8bfa137818222880d8ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 214
zcmZ?wbhEHb<YnMxI3mWNtE;Q5tSliRv1Q8^4-b!~rl#@>pOcc3N=izcoSdwztZZ#<
zgM))xTU*=O+QPOy`v3obP*9MUm)HNVG5>$9JNoqtP=o<DQ2fcl$iN`RpaW6@veSVz
zc!6r)6Am3mMVn*FBBz-cgqm2K<!%TC{IfsM!t`;b#Ez+qN)iSV#!e2mR`_wUEY3Kl
pTd3Suu!P$}W>Qny0h?eIUQy@Zg)>x{I74?8@E81VFji!+1^_hUL;e5&

diff --git a/plugins/opSkinClassicPlugin/web/images/icon_crown.gif b/plugins/opSkinClassicPlugin/web/images/icon_crown.gif
deleted file mode 100644
index 0e6a15ae1e90ae9b69efc703885f13ec731cb306..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 159
zcmZ?wbhEHblwsgu*v!kYZ??di9^U_-X8wI3JENNO=L3WPU)TS7pz;6j$8A&i_s$Yn
z*v$R^$Fcwa|1*Gr;!hSv1_oXR9S{#>h69VwhLblL)?UBo+x$P_K=0H<hK9;z>N_)q
zbxy8ZB2vNlq&29xWkJA?#S8))l7%AIEJ)+w?Rv(<vF^s2hF4xP`!2s%yf{aP?L|pd
KU|zlwgEauFTSVIc

diff --git a/plugins/opSkinClassicPlugin/web/images/icon_event_B.gif b/plugins/opSkinClassicPlugin/web/images/icon_event_B.gif
deleted file mode 100644
index b79a3ec9ff26945224d5afc84de677c6dd61ddfe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 232
zcmZ?wbhEHb6l4%&I3mIj78cgn*!cD9*Eet8{Qv*|)~#EQA3y%{=g-B97bhKjaqir?
zo}Kq5?td}k#K)^wudZ0J;^W7UFJ8R(`Sa(!d-s6q83+NzpDc_F3?d9VAcY`19avKp
zRQpmq*#Z}>%VwETAmibad;5|#o8SBI{R{j=6eRjR4owhhFqs#iks>)mXI;dbmQ^pR
zb~CazNNLPI&-g0wY@YmzrX4kU3;5ps_|uT};`e{H5Z30FR@M-X&aO_zPVeLi6DKGu
HGFSru%YbB`

diff --git a/plugins/opSkinClassicPlugin/web/images/icon_event_R.gif b/plugins/opSkinClassicPlugin/web/images/icon_event_R.gif
deleted file mode 100644
index 3a73ac8a9094727df52146ea14324c827ea657f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 247
zcmZ?wbhEHb6l4%&I3mdq78aIt`<s$?Mq^{+ty{NTD<@sNc(G^ay~mFqpF4N%>eZ{x
z+b+y|_W#YBH<J#&`19w_|NsBLe*HS*#K#pYR!rRg;@-V`FJ8R(`0?Y<pFe?83>ZN1
zCkrD3gCv6vNCsr518YgbG*K1Jjtnh6rwtr_I?)YT_mxkwta}jb;KOSgAklxUvq(eh
zP1S@IQ*J)`7&mFnlS5~CwAwdB#JuDadSUX5=Y^GI!NCN-a{KuHJ#`UV<5&e71!HUV
mdD}bEIP5rj`+Cz@CQY8glEyY;<_zW;vAOdX%-2w4um%7|d2!1C

diff --git a/plugins/opSkinClassicPlugin/web/images/icon_information.gif b/plugins/opSkinClassicPlugin/web/images/icon_information.gif
deleted file mode 100644
index 12c19635070f510620504c9c0b0701114a086a96..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1117
zcmdUs{WF^f0D#}u8yXS>tI}r8n^cVoO?B<Du3fMht8MPwbkc66q*rIfxOS1dZLchu
z6cstd%Rc%>lVRChipwU1RAfF%q`02=sH{W`@o|}(#MiF-FZTTK{QTTK?<U4aMQ2<E
zUI7*Xpu4;K;NW0?f1kx-Ii1e!?d`3tt-Zay-QC@togKT~zP`S`wzlSQI5syo`}_Mx
zM@P%b%CfSurl+TkM&rc9gu!4C2n1|4yREHFE|(7u4)S=sjg1Wq!?;|oNF=gatsD-g
zsHi9}FE2MYm(S<RWU_^Yg^rF6old7xsgz1(d3pKx`1s=DVqIO`?Cfk`UtfKFeM?IV
zilS3fQ$0OBCX-34)lN=Mc6N5o&(EvXYMafb(P)~Rn`>%nBofKc(9p=ph*T=ISS)(I
zUZGF`{|BfJ+<%$$mwx$#dFTKEc;D~^-<AmPm6ny?2SA+I$H!kRAwf8la<sk<mEhnb
z(jzj6B!<r8An2l)5&(+{(9r;ClNfs_ZwzYxwHXKUK-a;cC&MF#QRCCGapNDNLzAYd
z>6zK*bLKx^%sm4M)~a*X6>o@OvmU3dZLE;VD+F@5%9{{)@_FLNa2_J2KosINMuwJO
z2<>VLzc@YD{S^VJ7IIp?M?`R3DLJuKHdqysQcthN<N^uf>iHz&hHw~s{gaLcrk$to
ze$#I$$fvr`6+NB%c;*b!==MWP#PF))>=NM5cvVGj{A^6-K13&mz$(O@#MUp<8BBfT
z;miZ+atM|Qh`>v?P;8SLDD=AtzIH5~nr2ev&9jiFwfU_D9yFaWDY`%adPJmrTAWsB
z@i=kqeiNw($aeKD_$9z6t+#X-O-YI9Wff;XLC=;PXQ==Fi~8H)Y67$C_s#i%s<7*Z
zu8zXR{vR(t_(0>dXP#=ynKN8uN8`-8GRlYDT@L%wxZ<tR){}BHJk(q*lE%3>{`s7y
z$E0y3jedB&AHkWyK)!S*ML|iI!qJbCw>8=aUjrU@(l5V%`%V%>=Dvd~A>SASf>8`^
z5W+VqU4))8BnE0?<h!_&z4CePo>=;c3eN$i3j~<~+9|4+5h<ms@ekF+m|i?sVqw7Y
zE9VkI*%yfE**YMQSShbfeXp{(hL{C|mEIT}OS&GJ9P38Q0vfB6Ytq?oU*U!Z*WGNm
z$3r=h$rTVk9)P66H<XWo(#T~d-j|`i)ew<jj=@to3?|Wws4Rxg5J|nBzES30fE>mA
z8H#O3n(zsv<xpu=DmVM5@9sLAp<^~y1*mlkTUGY?=d3;&2v)2<vhZK5wi)BYZ0!@N
TIk$tJMK#z|Gj|mUFmT~t06)+j

diff --git a/plugins/opSkinClassicPlugin/web/images/icon_mail_1.gif b/plugins/opSkinClassicPlugin/web/images/icon_mail_1.gif
deleted file mode 100644
index d2e8374a0537b4683948370ef55ad8722e00567a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 218
zcmZ?wbhEHb6krfwI3mW-*w`2r7WVx4^OrAQe);m{!-o&Qe*Jp$=FR{A|Ns8|`~Ca(
z_V)I!uCC6`&i?-X88c=qSg@eGyL-io6{}aTZf<UFYik3lWWWs+f3h$#Fo-eefRupj
zbYKl%pxT#`$>`!`p%u85(Lk{z_i~`lo0|LV%N}qf7&vr!q%4-OwwTXw;4`O4)cPeW
w%1&QZQ|a7LamM3_$P4zWwGnHQTPtb=m!EjNv9a#_bM}7?jZO6ts)`KO05sBF%K!iX

diff --git a/plugins/opSkinClassicPlugin/web/images/icon_mail_2.gif b/plugins/opSkinClassicPlugin/web/images/icon_mail_2.gif
deleted file mode 100644
index 04f20ff29ddf36da0a59fa1b75f2465b0347ac36..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 239
zcmV<L01*F2Nk%w1VGsZi0K^{vR#sMlfr07i>Hq)#=jZ46`1tJX?Be3$md5U()c^4C
z@bvWbhOyQ6_xH)k$$6i@`uh5ZhllR&?zp(P{r&xkiHV?~po)r$sHmumi;JtPtB;S5
zgM)*HhK87!nE(I(A^8LW0018VEC2ui01yBW06+z7;1`T!S&B=#Y)|`i>H-9sgxq*8
zWi#RbKp;RgNEnaE!7u=USQyYKw9=dzuGkS4JN$UR;4pDOE}NC2Kw-^puK_a(=0LC8
pFO*qh?{WD55qk|Y3WbFc6B8VUg);(=kdcval$Dm0Vwqnd06V<cd|dzl

diff --git a/plugins/opSkinClassicPlugin/web/images/icon_mail_3.gif b/plugins/opSkinClassicPlugin/web/images/icon_mail_3.gif
deleted file mode 100644
index 31f850b4fde506c4cd1d191da7253dcd2d51256a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 237
zcmZ?wbhEHb6krfwI3mH&*w~nK`<s$?Mp#(b-@kwV|Nrk=IqCcN@4tTin)mF#^R^3L
zzI=J}=FQ8OFP}eu{^7%iuCA{B{{9s!R&;lFFIcc(#*7)OSFi5u>;!6Lzy=h5vM@3*
zNHFMtBtdpMux2T!^`&$&dhc>^yUo_Pfu|w#PDP#nmdC%_T9P<|IoOsx;b?FOm=)0C
zSde*1A|glNSS#lgrA9#?wi)MNY?-N`xZ{2SM`PKF@K+ViYy7Hz{B`7Pig9P)ZEuf`
WWprci>t~ucvB%vbVWNs6gEataVP?1h

diff --git a/plugins/opSkinClassicPlugin/web/images/icon_mail_4.gif b/plugins/opSkinClassicPlugin/web/images/icon_mail_4.gif
deleted file mode 100644
index 5ea01fdda62bfa1829443257157cb2556cb9775e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 360
zcmZ?wbhEHb6krfwxT?s|*w~n%Wb`emH7qRb|Ns9#e*Ad!=+U%e?-pM9f5AEB|Gaf=
z8?S!<{{8v$=krW`KYaM`^5x4nZ{D0ddGgn<Uthj_shq$6-Me>x|NdRDU_pO>e|vlT
ziWMumy1G`cUOi*RjPCC4&dyGtu?#c=ia%Kx85k59bU-$M{N%vadO#q-Lr1K2ii&FR
zN(+&uh7hh75qvk+T>B)+AoZZY!NG5aFry;l!Mxp^%nwtVB5%CsW6yZk`{S>FN)uCt
zVq1GVV`~QkOJDzlzCvf#sne!UWsVb<W}7#EfsA+@&r&&|6+-@uOL^k>H*An<Wa8S!
d#mFGAdv|hkD&wp}hmtdbGdoTObvQCu0{}FUfw=$x

diff --git a/plugins/opSkinClassicPlugin/web/images/icon_pen.gif b/plugins/opSkinClassicPlugin/web/images/icon_pen.gif
deleted file mode 100644
index 2ede043eb2842c00e27a8ef288ae37620ab494cd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 214
zcmZ?wbhEHb6l4%&I3mIj78cgn*f@9X!(->)I(cWt=S<&o{8iW7+kTNX>vlgYZr<_#
z)vf;zPi~mg{r}me{~w=T+q3fjy9X2M3#)Px{{R2aKnN)QWMO1r5Mj^(DFoT+z#6Qe
z+Lsc^);y7;JxGBi;oO$aRcn||glw?jIiMXj`)=8m+pA2Uu*x+o<vym&TE=^FNz|6u
n-FvTaWr{qHyJOJjxpme}m+TbAhUKo|Y)cqBq{|yz6&b7n`VUg>

diff --git a/plugins/opSkinClassicPlugin/web/images/icon_schedule.gif b/plugins/opSkinClassicPlugin/web/images/icon_schedule.gif
deleted file mode 100644
index 72f444fe25bd7fc2e67b610d67d88fca118c1fe5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 318
zcmV-E0m1%9Nk%w1VLJd20J8u9zP`Ty|Nlx#O8EHr{{H^`{r&v>{Pp$q?(XjS`T6?#
z`tb1Z`}_Oy^75~*uK)l5A^8LV00000EC2ui06PE>06+xm5XecZy*TR{hIif|grw+=
zp`eZ{dzvPCu3jJoMy?x<u>ZiIa2T`!0*BRM$!t2G(5Uoj3=po^tai)odcReLSnL=J
z#)@-#y;h&qVmJGZhKs8U$3n1Q`2T)<eS&<1eSe0DfP#Nj0gsT8l9QB`mY0s0nwy-G
zHwB=fqNAjxrl+V?46CdTs{*XAu(GeUEetEQxVx;k3{?ri2@b*n!o|qR#>UDC%*)5j
z!c_<e4%G+(*xT6J+TGRO+u!2Z=HS~^4Gs+r0`2he?(gj?_4h6F^!obm`3+S{2pmYT
Qph1I1HYi-k5JLn2J1+dGPXGV_

diff --git a/plugins/opSkinClassicPlugin/web/images/icon_search.gif b/plugins/opSkinClassicPlugin/web/images/icon_search.gif
deleted file mode 100644
index 5dc1f6c52d7dbc7201f5455f022ce74c46833c5b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 994
zcmZ?wbhEHbv||uqc*el6Z{NP_*RP*GeY&Qm=Kufyot>R=adB;JZ4)L;*sx(kM@L6|
ze0*|pa&2vGadGjYMT<&GN~TPil9iRUe*OBbTer@eH}B4!JKw&2d-Ukhty{Ocy1MS(
zz5D(9_d|ycJ$?H0*RNmGr%&IrXV3ik^S5o=*5BXX-rl}!*)m^W-xn`l96562?c28t
z7cM+{^ytQo8+Y#9+1uN@V#SIZH*UOq`SRVncTb)?iHwZQ$;t8X@c8-j=j_?D4<9}}
zb?VfM7cU+=cI^1^<C&S6At536@87?C`EqM(tF^UtN=iy}bhMqF-TU|No12@1gM+_(
z`Qq;G?&Rb&apJ^v>((_iG`xB9X6DS93l=Q6ckkZEj~{>h__1r(t}9or<mTq?-o1O;
zv}xzhpJ$*KQ2faPwn_&?g5t!1{eJ^PQ*%peTYE=mSBC>vU!SB=zosUa#MJ(NCkdxX
zTxu+8{gPo^q4Oq)ESM=FF_X)o$%}o<)@|E&?A*0`&sMJ{f$l?xk8~VlaOXL7ibeNy
zlsJ#!xzjuWECy0if-Is^EK;X*9`Hy6o{kjPxqsEr@G6gclPBZXZ{L6X{Pp|K-*28x
zT{aRP7Y?yAc~|hbI4($ZZe^Zc(_na^)tO1&AfV>JBZWpuJ-G;#9}KKqllZ$hb}=qo
z>Mg)zA@JY=!=bir76*q6#|3Kai~<fZe<CLz5SgyenG><A@i5yGfjo|+M+>s9GRme2
ze3+2X(99=xsO@coYGWw7lFpLa#M17lEpq?uxDtLJI&_my_MBCM(us!q`x}_K<$QK*
zczB?ROC#>gj*X9xPf+&G)5&OPI6cES``($Io1dSb!OpR1;({$NFNyfAjyt=nv`Kqq
z?D}nrCp=niZ+8}uFm(Lh!Xd}xBVm_#^sOLELCX%?#)iI!yH>h5$R!-@Vz4MOInH~B
z`8$Uj%iIiyd4KqrJgP!8<XgO3zl*k+NH{&<Tp`P=^``EBi*o}T%a?$-%3p#_E&|ME
z1x*SrIu8~!tNwYgKv?|6hK2%uyN-jd;(r2|7*#DU#PIP689282nS4lW`<k+YL9oe0
z@nDbfFNX$x{(u5TR-u#$jI0hp9~c<KFK96GYE5upu;(<kTF}JBr?GRfh)K+ahDmO}
zGM2FTc9<WSp3tWGY(~no%x5zb^f(-NIkvofHoM@M=JPov*IuUa9(}Sh-LR2?!5RST
CIH>3V

diff --git a/plugins/opSkinClassicPlugin/web/images/icon_title_1.gif b/plugins/opSkinClassicPlugin/web/images/icon_title_1.gif
deleted file mode 100644
index ec72fa05eccdc8e7be6585680827abbc920307d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 280
zcmZ?wbhEHblw=TQI3mTcZ{NQE|NsB_^XKQ!pTB?q{`>du+qZ8&e*F0F-@k9)zP*3{
z{`2S0^XAQ)Hf`F?n>T;``qkLjc;v{D($doP>(}q!zklMyiOZHPTexuHjvYHTY}f!a
ziUAcU{$ycfV31<a0SSZbbYPvjK&>w&bC$yg1D)S%bU(8k;IwdD_kMTq;>M-|kA*z#
zCeaTL<b-LRO%rN;99e9)G~x7IpB;BHHB&Was|sz7^zl-?_rZsaFMa;IABG9%-~WEE
z$<fp-DA?Rwrlgq=Eg{jv)G4LOGIg4m*tBVrG?{tl&u5;ufR}j=BiG7R0s^a6E$802
aNnCu>rsXV)cJ1E9GHG(%!CEy%25SHZdxm-d

diff --git a/plugins/opSkinClassicPlugin/web/images/icon_weather_FC.gif b/plugins/opSkinClassicPlugin/web/images/icon_weather_FC.gif
deleted file mode 100644
index 631bfbde2d6cff8d057c9791c948f3530b9860cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 400
zcmZ?wbhEHb6lV}*xXQq=Z{NQE|NsB|`SZ`8KmY#y`}XbI-@kv~zI_`O7WV%A`(M9)
zeg6FU_wU~yKYmP4PcJMioH1iYb#?X5ojVsSSn%M%gDY3AT)K4W`}glJU%veG>C^G!
z#}6MqTvJnX>eQ)g*RJ*V_pe*GuD7@M>eZ`@7A<ONY01mWD=jVEwr$(y&6{`a+BJRp
z^c_2PoH=u5_3G6dH*TCXY0}oMTf4iv7cN}b*4D;A1W^3R0#>C1B0+v~U|Z|ZP~f2>
z)y~++&?qoP<J1eUtvOsw$JdAnNK~+M=pSXBn6l@g{<Pg0yT#QfX&$NCeVwtXZom77
z{}nt<O>%<b%@TZ^%}o`Y{rv{=6FAxVMW=991cuEC^qO12xOmADj-@Lq*j96_UblYD
zx{COC4Sr!E0Y0TIaTQz#4j9WGJYb}7l&gaM%o#zcvuBirFS1wg-neO~FD<4iqkHpa
a1?y8*j%P2QzIe81<>KY<7c)3ASOWmWNxeY;

diff --git a/plugins/opSkinClassicPlugin/web/images/no_image.gif b/plugins/opSkinClassicPlugin/web/images/no_image.gif
deleted file mode 100644
index e2c931621e41a5af68ddcbb697f230a6295a0f91..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4780
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
KT16yK0Pa5!GES`k

diff --git a/plugins/opSkinClassicPlugin/web/images/no_logo.gif b/plugins/opSkinClassicPlugin/web/images/no_logo.gif
deleted file mode 100644
index 20c700bc51506b68e255d01ea397d2fe1f0e4a04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4331
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
ZuKT*M8@uMFE3{j?wtKs{s|bMr06WYbK79ZH

diff --git a/plugins/opSkinClassicPlugin/web/images/no_logo_small.gif b/plugins/opSkinClassicPlugin/web/images/no_logo_small.gif
deleted file mode 100644
index 292816ae071af8a7f81f686d199ff3961b512a73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1837
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
Sa-Ou@HLuUHn1Db4`0~Hh|9jK`

diff --git a/plugins/opSkinClassicPlugin/web/images/satisfaction_level_1.gif b/plugins/opSkinClassicPlugin/web/images/satisfaction_level_1.gif
deleted file mode 100644
index a0bd70ad5561f49e4d9ee970afd2dd7be7a24b7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 410
zcmZ?wbhEHb^kNWTI3mt4W5$e^FJJDPE%5sF>wo|L{rU6f>({T(pFjWg>sL-r&fB+d
zzkmNeE1%)-i?E*$%>F#}`v3dk|9_wVf7|}^q51!xXa0X#`0J6~|Ns9PZ~(=hEQ|~c
z;tV<<d61nBtp6XV_N8Rb%UHGUjjBa~4!5|#oeI7ymGW=Q<oPsYR<TT2Qsl`jGVg+h
zftRk&>I>S}s&Xp!KUkLJqsM$Y<EW)?+~%w9jWvGxOz(c!1e{<0@oQaug}aatPit$t
zkS{l9A9ruR!$i&reN!h-pEk*K%Iq2LVq!c?mM-$On9k|u$hd0F%IO=-*PC1G?%26&
z_ny7`_Ny=n9zJr^m*vFCQx2!jvYa`0^1{XQ?jj;Q*RS6c@#VPx;Gx6ACmfHTK6w7(
znY*Yc&%1XYM19%5egEO`<2T!{Ki~iT`)X~J$kg1#%I}v^v|!=kb_Y2x8-c<_hr7fy
y<th(sTzp)O*{Ms0GiAw1Mpb|DE}xY`sdKDKnK*A5Pk!bzv#H_bos~)~4Aua<dBN)d

diff --git a/plugins/opSkinClassicPlugin/web/images/satisfaction_level_2.gif b/plugins/opSkinClassicPlugin/web/images/satisfaction_level_2.gif
deleted file mode 100644
index adf360dc79cf70ec3af956e3f4f6ed21ebd92c74..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 441
zcmZ?wbhEHb^kNWTI3mt4W5$eqvjtwhe3_Gz^ZNDcKY#vw{rdIazkko4KmYaX*W0&m
zXXP{eeG&Hm_rsqL%>F#}`v33q|1S&wf7|~5=b4`m&A)&D{_Bz5|Ns9PZ~(=hEQ|~c
z;tV<<d61nBtp6XV_N8Rb%UHGUji^O|4*R+sYZHYxHT*HV=6w(s`Bb;kA^Bv^r734K
z);X+=>b#c2xO%NpAY)sFPu-;RJ#&)I<_X^}IBI?F-#n%td*t5V`rXLT*wpOO($>({
zti>oK#NFH5FXTUQLSL_?DD!O5S#w<GG0&a7Xu*=j^Si~wxYw>*?Z0~6dNE6zCCu&)
z+n4Ne-LXse(BUITj~zd8QiW0A?78#)=PwCZvR}J?!{x?p_FH$Zm#Hxd3v)kt@=VzO
z#q+06EIB`Z`t0)g8|T;WpB}0*3JP-n`^zoy@T5Z{!~drS2R1BpR^n5ZYS7rIxIa}y
zL+8YdLgiL<S<9?5GngAsPS)r&TM*Ofpn7_;xI0UQ!{%jY)y<0SPB<=Dety179ha&=
f$%^wcl>Yn)+{GTa$iZ*Eo9~h}t3pK;85pbqj6u?J

diff --git a/plugins/opSkinClassicPlugin/web/images/satisfaction_level_3.gif b/plugins/opSkinClassicPlugin/web/images/satisfaction_level_3.gif
deleted file mode 100644
index 99b4e0c484ea150859ca93bcd89c2f6a218dace7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 451
zcmZ?wbhEHb^kNWTI3mulZ??dU88c?(GrWBH^6!hVpAXFb|9<%Y-{(J1y?#D4|NryM
z|8Lv>e_8nJ*RMZ+{`~v*@A>oRIXO9R-@g6&_3P``uYWzV`~Lm=|Ns9PZ~(=hEQ|~c
z;tV<<d61nBtp6XV_N8Rb%UHGU4Xa3j4)eMk@h{cKOAP)TNO<swTdG~NA@O9+vsnR$
zjZeL?TzBJ*!GyO~6EqkSee|B6$~a`{`_A*;haYBs(;NI7_SDTU|M<VIzS@PcwXHq6
zqf3i{o13YxZvwaFq>24~Q)f(^Y%3<XKy3cP=*5DI7A!AUV-OW(+OTn*<+_cVM7ONp
z#<bbRVWpr$^!}BHbdR4ndFu3;v*%P9*e_kaVtM5{`?VXFZTaure-QoPG5_idTwF{q
zUcBP6eDnI{i}#;izqRH4`RjM|?|;0{JQxxVI50Riu}MC0sMw%zu$7Nr?Tz8WMMt}%
z^|Iy&6tFa~a00QWkt5$EWoL&bo0UZ=C*=f^PR-ewy3ChD)|J8Gz~<%WW$c=j7__#e
o^K*Gj*1EfBi)QPbMwYJ=tvXi8Id$<Ro{f4j^ZI%%Ck6&<01qP8ivR!s

diff --git a/plugins/opSkinClassicPlugin/web/images/satisfaction_level_4.gif b/plugins/opSkinClassicPlugin/web/images/satisfaction_level_4.gif
deleted file mode 100644
index 15528f40f367e43eb9528b4b20fb82d9a8e8a770..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 437
zcmZ?wbhEHb^kNWTI3mulZ??d!e1;h_X8e3$_V-2D|KAV)|NH#ssn`E++kZYZ|Nmv-
z|DR`GzI^%Xk=@s?Uthm|os*OE=g*&Czka=a`}X<s=l}lw`~Lm=|Ns9PZ~(=hEQ|~c
z;tV<<d61nBtp6XV_N8Rb%UHGU4J%K94)eMk{x8+Xf1ZnHYAf&%S;5e{q-bWe75CZY
zMp~^*$~V?ro53Wo??Hi{k6O>^2gbK}=Ipp%pvUE~{`SjtyY1F*|NOgxsj0c8$(@6P
zv7@7l!?LHlv!j1fckh(m34IP?0`tV?&M#7D;N@jpv2vN^vX!fN*DPPhxLR-R=B<uS
z^X54();)0W(BUITj~&-zJ9YYu<(czr=PsPSboru#=*?TV_p35+b2C18@QB;;$>WC)
zp1*qh^v%;3&m4rle*1n`g@KEU@z0-sB2O58te4;4$o8MrMPkAN2L(PQuQ@aFSsGY4
znG%kyFm&YWlQvHJqfwOXK1tTmsEWmD;nLI7MO_&z95ydID`QqHcVOjawe$0=8*L=K
bwq%^KZ<z2ca2NZ8`Az}-O0&I8Ss1JV8miBN

diff --git a/plugins/opSkinClassicPlugin/web/images/satisfaction_level_5.gif b/plugins/opSkinClassicPlugin/web/images/satisfaction_level_5.gif
deleted file mode 100644
index 76aa4ce9b5e48ae3142ed117ed675dde7e5c7b8a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 352
zcmV-m0iXUyNk%w1VM+iH0J97LzMBx5Zvgq=HvQ;U{N+mj{`3F);rZb=|Ms{4`ON?H
zq59%J|Ns900000000000A^8LW000aCEC2ui07?K506+x)kjY7_y*TU584zG70-k6J
z<adVY%9bvw0Y+`#>8%_2ZudT(Cs-q80E47*nOZsr&8IRdg?g$<BL=|jdbysjI4t&(
z%V4zmh(H9|?KdJ7hr8SKJ6xWZ*XJI8e_9s+3kv~>iiatOii-=4h>rn`9*&fjhLew$
z9iO0~qNAjxrW61Ls;jIitgi*Gu&c7Ou^zUngcbk^2?4&ozzHeB!N0!6$ic(P!^XrO
z(9pXT0165L*x1?%DcsxH*x%yY-Q?Zi-X7}e)u;yt0rBzk2PyUR^6~il^!EMi<-6x$
y;J|ki01#NnuwjaZ5D7et$Z#S>i5@O4L?}T`mosP$K$a0X#v_<hC{t#L0029`Rj9B4

diff --git a/plugins/opSkinClassicPlugin/web/images/skin_after_header.jpg b/plugins/opSkinClassicPlugin/web/images/skin_after_header.jpg
deleted file mode 100644
index 931004b581099ec01d1fe226faa3230ed567384d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 23366
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%0Al
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

diff --git a/plugins/opSkinClassicPlugin/web/images/skin_after_header_2.jpg b/plugins/opSkinClassicPlugin/web/images/skin_after_header_2.jpg
deleted file mode 100644
index 10e0519fbb6a519c53648027907df0bd0f308c30..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 27883
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
BD>eWC

diff --git a/plugins/opSkinClassicPlugin/web/images/skin_before_header.jpg b/plugins/opSkinClassicPlugin/web/images/skin_before_header.jpg
deleted file mode 100644
index 7f8504a070eb7f78328ef53e06dcf7166ae395b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14915
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
Cr6(T%

diff --git a/plugins/opSkinClassicPlugin/web/images/skin_footer.jpg b/plugins/opSkinClassicPlugin/web/images/skin_footer.jpg
deleted file mode 100644
index 09e2a6050ac9cc0af8153aa4d88b835665bfd5c9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2297
zcmex=<NpH&0WUXCHwH#V1_nkTWcYuZ!I^=Xi3x;&fCY$HIapa)SXjB(+1WUFxOjND
zxwyG``Gf>``2_j6xdp@o1cgOJMMZh|#U;c<B!omnML>oyG6VInuyV4pa*FVB^NNrR
z{vTiv<X{kGy1>k+#K0uT$SlbC{|JL5(5WE6fB--jvT*{XGzAzKSXkH@m>HO1(u~Zk
zOe~>OM8w1cCtiHaCMd+NXc!DsDuQAF*eH;wAWR?J@c*|Mcz~uc2{H>Z*fad{|G2)-
zSoh<$siK(^10$Xac3C{0*6^s~9FwuJvHqLm?%EpzXTJ@8Q5=yL=KuJu!GVB(UY`8x
zH`)I@WcE1Ctht#nX5CS@{H^{APQ3|9`yKL2=-8QDb~cHdy$c>32#0Dm+AS)%@2XwP
z#?8`>2iwe&Gb{{5p~`t6x)<u?9J^4E*gNAE9}jC0M0qn*x3{$678!};QOibyaWsL9
z<}(sXkap`Q`(@JHALpG?xvVs6gO{#|;6YtRSI#MHDJd!O7kg)bN~vS&FQ-oV@q3Hm
z6#L1O;@`jM|5wQHVeS0W7tFVLo{~0PRrJE4|GntfUw;k-{QX<U|N4(q=}IffyFVKk
zvV%&DcYo&1@@p%vOJI<?GMDGwpTkj;7tXyugMn?Uy0i6ugKJA(q?bQqU|j2Y;oSQ(
wrlT511Ba}XlUDpMuJPceqJWvb$}^ly>MPdoKmSU&{r&3?@%1kl`2XJo0N|SGumAu6

diff --git a/plugins/opSkinClassicPlugin/web/images/skin_ktai_header.jpg b/plugins/opSkinClassicPlugin/web/images/skin_ktai_header.jpg
deleted file mode 100644
index 63f9858926b33ad65493a11a0561ff3778092397..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3845
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

diff --git a/plugins/opSkinClassicPlugin/web/images/skin_login.jpg b/plugins/opSkinClassicPlugin/web/images/skin_login.jpg
deleted file mode 100644
index 16e1cae6d3c61980d9d747399f96912b1b9a45bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 45723
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
Gk$(dsdTyZr

diff --git a/plugins/opSkinClassicPlugin/web/images/skin_login_open.jpg b/plugins/opSkinClassicPlugin/web/images/skin_login_open.jpg
deleted file mode 100644
index 7e83a6fe15bdb3d1a3d3714d5bf1b42feb1456a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 47083
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

diff --git a/plugins/opSkinClassicPlugin/web/images/skin_navi_c.jpg b/plugins/opSkinClassicPlugin/web/images/skin_navi_c.jpg
deleted file mode 100644
index e211d3c3df294d3abb86109bfe6520637baa8de6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12118
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
Q5}F5WO&l#5h;A1C7j|<&asU7T

diff --git a/plugins/opSkinClassicPlugin/web/images/skin_navi_c_2.jpg b/plugins/opSkinClassicPlugin/web/images/skin_navi_c_2.jpg
deleted file mode 100644
index a534c9f3b62d7558faa9341e596404fd72f88b62..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12530
zcmeHsWl&t(wr=AZTpD+Gmk_iYcMa|YYg{)@aM#8qxC97|OK^9B2MF#GBq2bM%RcYy
z^Xj}`=T_Z%@7`Butg5xv)b-6V$N0vab3HFVZvt=>Wff!raPR<t)yoBVJ_X={JS`o3
z0dN3B005x=l64NilCpBPum)K5yyU<=uL8mV@c$5mmp25&mpcL?65^kNgpBkzK}JSF
zK}A79MngkKM?=H>XMsaNKtMu7LPJJIdxe39@d_L3MX<5|R_X5#%>R}8=XU={J@)``
zQ2`Y2GYD|F0C-$D1YEf10YKFYY&ax1IJg&}e-~spctj)=1XQ$_OoV?bc^UN!W@H=y
z9OBCx%1gBuOfN0r;r`49;Nsz@(ai2>>ky&P67Wcw6Kc5D^Geh4qkhoz;M1aCAco?;
z^Z<{D`7-X8(f|2LxECY{G#~J2d8CqOH7&kq6(iDHX_&j>Uxd^XAoXtX!Y-v#=!*LI
z`JTT5FkhOyRL2EK03PdISIJ|hETu$71ZLKB!}LuE#VPxAw9g*=aPdurrrg&izS&+~
z8Jlrqs0K6A%fj=Uu{9f&Asf2Hxgf!A=GCUA#)BSGmLwg|eqSjqYj+f}P33=$KK3%!
z@V2vYdc0#eWmv~G@p!4J1v`%IP~!9cKFVdzc^GqD-dyxYUWT^uSN)vsKm|WEZ;)Qz
zn<o7E)ApkCFB9v3cBj-%+j(?Wkza1TK<ovz`M!~2(q}wNc%TLW{d~<?(b3o-6!?&G
zgLfWPC+cU<RJq~_UN6n+__dqyDZ>NoJGZLwMs>W3^Nf9RqnrM7*nd5^<I1=J9gxy%
zj-`gjS#Nt8##HQpzYp2-FOW?{{|$lvztL({86U0=F8gVV$@DMqdL?GI@|(ZrYT>V`
zpZ_0h4*$hkt;(DLYl9kK>wXgJ#9k%5cHF=I@&N6>97^N=e<%A_wOVD#L#Tl_HST%(
z4Dc}inlxI{zwsBbX#GV6;QyQS@UJ5OH+TK_iwI+X3v4sZUVp_f&l<=oxz`k#oXF_H
z9Jy?ii3tN1XRo%-OQ<9yHhL&{GcmRw$tAMb-wQhgSRk62%L3|nwJ<murGe6=7`er;
zje2tEGr;-E<L7}pc~ANs+U5?&Q;7Z0*R+j-1qG3f+Lqs?N~|<VmcR7)NK=ikh@_%<
zSD9y*=IfPrIPq}t+LbH~1*RClpnDY*E4A`~1>gM%zX{N=(1`vsV5L^i5g7-|=ma`5
zH4eF)&g8jU%+Mcra9}m~Lxg=iTFzFZ+qoJV#mBZ1HbeG~rVqRcqQA#*HEtT^%Ff(Z
zF?V&v3N8_td9O+o5%=z}(Or^*AN`HL?#a$~@4o2d*tmTZPCCp|afy7TN<oobM$<zB
z?XaaNVk;RYoj$4&?{$Gdz0Ay+?+3e-hL1V;P*z5MpxK?=q3$*QBrM0VfqnpHWCMfh
zzR@?da<{K3Xt4S+x&mqba(z;WlUX9ou!1H?bGBhH`Vcm(>`pmD4Of^NAx_hUUYiC$
zq>3x`i=ax0t550Xww~hUqKgF-TlyCfaNH?Y$|tx~d3jM0ZR~YBC1(MD*NseuMZGK$
z)J=13*0twV#-PD9t`8P)T@EOMT|@80ufyKoY~dBL2;PxUV<_%)ToR3h=2Trj$z{1f
zT0#64nKxAO{91c>bqs}>vZ=e+3pQV@sh+IC)O@WWvb#IKV@TiL2@Kgei+nS1|7z=K
z(L(pgk8^K82N9xUKwOKtYTIaj_n0OJXg*31ml%<wmn#xAZty-tnU&+sJ>l+n1|$|x
zKZFkfM~rqfIW7cGay{71d;VY*Avxj=Ss+NVmEWJFF7_+DBrPYZFStW%5RsdR&uoPD
zqv8}X4bQ<t$80mnBC_?QEqBRdJgtgjFVFTMKl#5dLJm2|2;}IL{0)<SkW7%xmRuR`
zxSP8NmEz10q#Daysd0P=!vRTMFlORPMb>>Jd{c-;O4LC)eodbJ#e~AD-{-7GMY(v~
znROu}hG2LvRmYr=@^>@Ndd!L<jVHOfv>hgXqE7nsWTqo2Dl)wVPY3FN*=J=}5Q|51
zBS`B~G4$Q?lZ@aA_U&0W)GhXo1ay&;G(Q#}U#&d5geO5OvpvZN?sLXaM#rllp+ZB$
z#yQEzc3;~c`(*?HCdo)dm25i4p@hVAP{Vm9%hi%sACWFkF6v3vSRWMFbn$6q2g<~p
z46%p8<0lZ?;T1Vmb;sPCEL#2Mc!dIgK+DKxwpvw&c6%<L6DUz|WqMR&ea+)S8AK@|
zb6904-H>;GT;NeQ=H6{Ae#Bn>`sdtv%HI=pXqs)fC1SO7^5e4hNATI$s8#2MtTBc`
zh{j9mz7<F`u~(!^yQkSFoQjf@?2hyz4oS`H0UqPITHYllpKtb65K{A9jrR-rM*%ss
zVh!7yGF*{acW8-OHY@xcaPHi#{bY%SeMrEf&r-~AKp!7+rSGEbO`Fev1RdhkcY*ub
zjRn?F0|UdAFYUGS$^G@7O#Sh+e+Vba@na#+_8X^u%76sWcljj9<5|MNE9GwNNOi(_
zScuW;;g>!GR<R{epT-dM-Z`L9Gj0s$)ut+>>dwISGRAxxqo!9>-cx>Iv+7@%5-fyt
zaa4=}@Z296z?uY{Htw7b7q}>J$}3@@;4LZ2ptFSV54Lnz97Oj%mEI4z)105~bK$BC
z)uVn+>1*?v2^i9jIn)f~kt&MLxgLOYY{>z3i#H73*{`Ans|PxsOs}w^i^#d0z-WFP
zS6o?Io*@EOx2yNjiJ|*c*ax~IM0Uu8Il6kyS6AZ$hR(iL8a~xuMevK4%Xn>FRzo>*
zG$hgXo&j2B^xM*_iOC0RcSZ9GjmMBq4F#0dCqWl})GY%QD1z+;FmeggwXWlZDZ3KS
zGYHcT0^0+==&O34l&>@VJ)zfpTp1epI)!l~@!%oj-u~(?vlUw+k?O+__5afj>e2!|
zCt+hByLTRfNG8Lxw0KdcpbTK$)7X6JrD<&z)x20&W9wnEHGR*r+cclsXi|;`(^2<p
z(2zjlGr(Mu_!GHMp<FV;Fy3)0OKC}R?A{M8bh3{-oS5I@8ZgA9zosv%HIW?K|M(n?
z?V24@BqH9Wg&hlu7yjZrIK*02yxQ62<~Vb+%0UYZ|L~YCH6UG_x!BVu!H0R0;*V{Y
ze6W%+vgr7bp41myv(r2chMfN4cizoX$xiM^iLQ=X+dRQ2xdRJTNl8ggh933bp4(U*
zHBg)jW0XH)N4>ArkR-sQ<T04Cb&w1m-pO--`H}ZN1E4P0@izYTNh+VJN8fts#6~BA
z((KRp@8}p`8G7uhaxdfYJBuDQC%9sBC5GjEJh!pSAC+~8#_D$osw@$l!qlLT+P;7`
zHDi2?qYM=1F-F<jNP>yM&mn!R7^PPUBGag!zKY$1Pz&hU!`Lh&tR`(iGTNy>;RTn`
z-JVLp#y=OPo@A{uxCLe#l%ji4z(q5TJhw9NQ`&`_7TlYW=fyfCzeavi0Uu&9_<Wb!
z0`@Ud9-?E`>uG*?vB@&Z;97R65=ckX)sMls%p!T6QggDGK1usoDdWG|9u@;;ixs-)
zM}<p(-C0Vvfwb`VQV&<K_)gY*&C#Y2x01NY0A+p@YaC|uk<4R~NDNG@-JO{3!b=j=
zx~d>rAnBY^9P{vg05acwZIEqdu9O?O$*(=5_Hxk=<q_k!860EBb7E~U4@EJX8f!T#
zw(VY>B*lJPS}~{LEsc8}KSCdC_uPTS&oy6s8dc$J`$h<6j~A*lhmzESi}x<K+mmI-
zF6>FiKFVT}mmxW*<%K7x_|hVrl@s&eh%eT<WEQc|qEl0&qeh+GdZAs@a|;@gBd12)
z^FJl&_XrQn9!hv_X<ex-lu?CQ^8^Zav;^@~+N>N`MGKUrZ~j&h1zg`~o+PCu&u?uK
zn)I#XJIzTj9w=F!;@ipsVkCAABIL1Xh2I2uc9u+VK^(~<U+);DlEztpbQjfT+sFyD
zJn(>mu>7@d#FZws9hiecP?BF92D#W|!R)|%m32rQd0X02-u+2XyEd#2vY>_d;7za6
zO*MVT^<!c0A8cFL9RBY0&js-#mGpRS<8&+|8^+H@KO&6ma!?Ov#d?7iu{Fg#C-#!n
z?XDqM&ww@7yzEGK`cSyYf;&ypR$bd6yD+|()xkSchIW!Huh&|lwPTDDH{Zdq#zZ_x
zyupfuW7g&^$D(akE~n0w>-|yKmcY<82-S*O9tA<F#<6D!qz}YSjI6qz+TJrypK7QK
zx#DLYTXRkHj#-@_4=V|U2ki;;55U3d(A=^(ISDxj85k05Jf>aRx;C#JLZ~ji4+%b@
zO7<U6RcL-sb~l<sC~g~NtIu{!cu!X8)i<QPT1j~QO?Xpw2O?`zW(X<?&1J2PVc{GL
zjqYj}sT)yA`La19iCa2A4wbLbG%9QD$)r+SSK>TAcP`R<EYo)m8?_VOD;3t2*Fzl?
zavU4N?A1ovu!f^}2E2jrx|hMBK<{Oq0cLx;!8~%T3wfL>hVkE|-qC%UhOi@K5OS5t
zmgx3Q=6D$9f#1%3tb$KQiv`)r=h928rTwB@#I@}#z#}sxMI9yN$72o;(rnE~6j9FY
zIyAS4c(u7WscWP^aVNvp7~#}GQobQes}klo%1D+JRdkF_mlsvpg6I3t`0IDXt0zXp
ztOjy!Eh!xC1TlwqA@8s#)XQPwrkIJGRlQvT!Y%l_%|GLtby&)c$}PGuCImR>L{|h;
zskW0=Z8@j_xK8g{E4Z|}Ih@QgSP{4Ap8-HrSxUxSQwgNZWH{o$V>)ob*RjOp-jJMu
z$TSoG3|A>FJP)DTwRlpRk+@Zrej7&}Gj-~mhdu^Gkbt@g=LEwOcvl$Z8y_kz(hNKu
zB8XeAf7JL(IDrP-ZrjE~Nc)|55fUejY38z_{#fiUT_{2DsSp_h)QN}FQJ5d<6ejCS
zOC}`H5Oj<PzudC>P#`dY9BsavYo(D8D(MiPjH!yWOkGD4$H;v<CLU{g895TfIA+we
zidjLJ)tCx-o0FuXbT~{)-Kg4OAkdU{+1nguWPSJy@CsYGXzO|3E!bJGD-t^!h@-M&
z3$k5tK#8JVK+g1;7*#HcOS3L{B!af=N<i5@6%K#i`i)tT&?VklZxNsjEOE~-AG)k&
zhD<&#bRY@9H@Z+Twkht97^2*iIX*=4uIO^~^`jM{JJyHEF4WKgrNtG8v@nV>>2=k@
z#E1_O6&QElPLa5h#lw+!F&-DibVqb$buM6pHCYS(Qy6qm@SiY3DHu+ixo3sWe0+(U
z<?Af4CgO?7JPlESfYNaOIYj0gLQBjt^bnd081$6{nLFrZk)lp0XgZ*0p{TNtku6D2
zg^T(O*uzcNuL&{b(X}Eev-ZV$4}T{kOom>G`KCZ5MceXnrQDp{MA!*NFwuHiK0`<*
zyS6E1;!K)|PL=S@&2b5NJo`3r&zARl#w9_nI`=RYW#~{Nc#=|`Ni=<riq&*iFSC{`
zq%RL_oc(sB+BEgupl(P?G?wzxP&+{h3Z*z|3G-zre^^EF<k_n4Mw<VypixEe4u;$a
zp5yySWOB-?niK%Tay@5;WsCtn;o0ItR+^=HRbdNBPvURo!2pAGUFB$^rn!73G~#0u
z3v8PQ=8meLZ>EA9cqRe%1zDU9ae)rpvfNmvGqt$*?31R0K|#NoO84J5Uj+*2gs&>v
z6WD3m1$l;J8HRaYn!`15eDg-R52$gusUo_+j(p8O-sG5M!_PnSDo2uPn@p;l2&o>r
z+(*zeyohm#!9Lb@nz&2|E9F$;ZM$<TlZ0fXe8|TlvKl*J4X%!;h=&iUta2*u39CGo
zC_s8zW}F3fFHJmULE$yRKPu8eGOc}7`2Tp#vam8ek};>thzn0{5vsYO{c3m0n!*pd
z1{vA#AVdg92?LFyyp<@(Vt^`O`3jlQQ1L1B#%=21^~bqj+LPqkkf`X5`Ko}B-R#oN
z&2+Foe)MfFr_gS3{Mc(<YFJD2d6H=0)mwP)Fb#aCKFUDL{LGbe_<45h9hFpKt#{<E
zed#tzNWrsVTR(ua5B1z1$HuCL#gZu-h;FBU*{bbgiQae6YLC_i^v@D5Ql@BRzwhrW
zNx1OBkFk;~|CYsv%Ej&2`mHQQg<f45@H0aAOa6M<5Kxr?cvtmn*WYwo39~HF!;P|l
zvsMYWP*=7Hm>i<24b3Bgnz|W5V$k{L9=3Ui<~~hoQ3mDYPZ@P~qX7Yq$oS#2cL>1Q
zxav_$r7i5GA4Wxq{5eThz`g1_CpCRfJHKeHa57(`EEl@2fsymCN}0-{>+VNZy;qs`
z+&Fm5BIA^97p_VNM!%W{&k>=hhV<&-A~VMv>0l(_mI^6}3!<c%FwA$R9qR0tv8r~*
z#N3hb8m<1;l+2Q$&(?lVh@nfw^pC2&D)?A8av!z@m^GRqvat!io>JUvk$fkIwO_5!
zEJ))Frpxf1&(H)-Fv5=fWSlJk9Rj3U36P0h-fdtt6l=~G;Mn0L<6RDCI^XUXH%`7i
zXAUWL3Z&&k2R<PdWdFwVZGmp!h|AK=bH3x2jYF6J=Uq>2^#68qqJOw~eHjMq!+6}l
zQgwdPcs!pu1u0V|9U-n~qYni{p3qyBn`Yy8xK@MuxmA)R_w_S?RYnhe5;(~n;cDp9
z&9>Vj!^b&n|4wHGH2k!F*sPnpEf4>;33nZ=yT*}b1O}fi<%s*Q2pTcAezOh13_}BK
z+6vTUk{-s=!ChYbe0!73yWilwHyC~;z^>p0X`U=q`3!Dii*Gd|cV1d)-<kcYeMWCx
zvbC;*>II$`_n7vgTO-)Qa>#iG5Q9Pv34+<TYXw*$-sSG!rd7ZYa7r46nT!^+`k@&x
z{d&Ge=m3vE<ZlI7ZiBCahSh1|>+{$jCq+TKHe)<63=5Pio|2Hz35hFhtFjJ~#Pahp
zUqY3<Rafa2p4I_$5nR!qGCH-Xhw@RO2j}WGG1O=6F4T3GI*W5<Z5Qvy18ANBpWKQi
zfgrc1SY?kk0Vg3}q}+u5H;tdLjI_J5NRtgw1R=9do`jaFunKe#BM0sWT9>3}fScBu
z-&=6emA^d1(Uy*0r-EJs{i)Pd4Am`5Bw(g*5R<I8Ci`P+L)KM<o*m}87oS>J94H5M
zB}G|?1{XX}Aom(q%ZdK_&hGm!OtJ@MG(H<)v$9ZXb8?@>Y4|B}(GO}?{#_)L#yao)
z?OmOiMj<C;j#XN!ZK{L*#F_R6vYs#qqr@Oh^NfKwfOc)#Ro$dK&|s~XQyZ;M;fWh3
zPE19(D-eT+7M}BQX=){MR76E?EL@P&Gi$|Mb)4KQg~ITM46D%{pNLxul6yMiTIS`q
z-9h4S)HLpKvQjL}b?FjUe1;PsW#4y~I1LJnnSztlKtaaLp{qlyLj7PlEU{+*C3?`6
zxM`5FRGJ7w+%(Eq{_Qwj23(8drhMqZnb;>1boJeKWfh0>905Tx2u7llWp4e}(SF-O
z#Ou4JZ>#lD8VT=Z!d#-v`^*|L*g<BrbUU+BfmD-E@+IweMTB7(xe@*Nk@|$~qje^#
z;gmfL^28d1qgj|mO!@&W%`uS!%K?%|unY;B>1pUu;Xo1+Vr$gEZB|5*R7aE<`n7dq
z#CBr&X`@f~sQyncd3}DNh-UypQ#!A>vq^G;0?w&ox9e|aZel`$;9Xj62qC!u0qyS)
zj|Eis)H{-iEJtAL(9$!Y1d|8uY`x(<+G4b>M_DrF+fVPxw=sUuwB+fo>V+A4f(d8f
zwFo#mG|<#_G>ETPB%oad=bd`5(kZ*#vpqY!irtpao}3~+?cIe4UEu)+j33b(R&BJp
zOmz&Pvzk72zv6~(Bd=A~7}V}LTO~N20qd_9x@W7b3hsxekDDLzTxvL&J#XNYk|#-S
z@ZC_q$4ZY0=_Rc#)c3Jg#e9^^p(y35ZcOvZXz)B$vAL7lXOy6oo2f<%3kq(+38d<w
z)mhb?_<#wmJzo7aTJI)D-l>y!GYL9ycZ`vVk)M-~Dp9Olg%x?(zlTEM5JC8)cIC+Y
ze0kxzE!)b{*#c?kLEr4zI1G_@b)`C+;>HzML$}Gb?bSb8=nzQjY70jmam?xnaO^G5
zNJgPd92D<H*s)D@Y(0pU4S6;)@p8i&5;PncU#FRNIt$hak6d0mV!JsSaq4r;e|?lJ
zl8;IHrXSCPn^@gY$rt?$fYW;hjMN8dPXs+pGd%-NfBg2k?RZk1%0Idq;bS2z!<F%7
zqeyogh<;l1q@M@>p&gp|3$A}G={M^E!nr_yhs`lwG;2zLaeGIpz<?ZHMW*z(v5)aQ
zEr!00nx2uC?#cL>9Gy`Sw2Cp6-RP{(0Qx7=He3xm87qG~Fw>64ZO!ohZx7d-`hm0r
z!Bp|tiXEU@*7)YWOAKor^6JZJ&U*I9h+W3nb{OI3Ir}f!<H0H0qfxaT6b$?jwo}sP
zL)Vx@e4D%?g|5TOTh3-$TJ&aU?R&zqA+~OZ(#V@+g<+~BtDQvg-{-aGFSq3OlZekH
zHi}AjwN*pNs7MUETLx>U@Pz|0{@IJBsSZxk-o!V&6glDs5r?R!86%0oxO&03>Ie^D
zp#|$P2X1rW%i=P;(zQI>qA#DD@iRAUo&lO(knV#A!I!f!E7S?wYbsN@Agx0e*0y=V
zcTD<h2CAyjb|Rt-CA){v)YKvaBSq65V0bv4Kq|yJui5-WZ<x#8Z159bdu}s6cz?Tb
zLMX@e<;>=b7mrZOJCvPTt<g`-h?#S$qRMLN>IQ!Mtnc(MYxzuL)wj7m{T$SlV92Up
zbdOP$;K+c=k0iy@L0T2>uXPB7g>SS8Rs<Jdq@-kFNLu`<gdr%~+0@lz$5&``*Doh-
z`VHObPW3sS!`t<QQ4fuEiI`-2n1X2pNN8xntu1E@a-7RJ#}*crR~M0?sr<9()Gb+o
zue7py<MDcjw<OSw6p|nx+(Hdeu&jK0I9hj{9O-}Prp-BhBY2o4<PucRqz+_BJgiy?
zufmP@Cycf5O8b?zxHM^`2_w8L?+_s0sdE0!x^9)To94k)7l`N`uQTYLS*4WLrSXwE
z)IvO;GX1VPYhb2>iOHDlwZiBu2NM&hF*gtIKcjWGoVtkm@d>D|8tv3Ed6qNc5{(oz
zIg5;_u+3opX7ZC<@BWT(Av0%j&~9PrYOVLxq<anM=_1UHEqVZzg@_?UdXTcY;CE9#
z*xUDJ$05nEeJ&;6o;qpR!G_fQ19H-|715k0t)`C7hF%6UFC%?wT!qKT$2CjLszH)m
zZgl0*W*Cvq=gIejj8-jPl7zlHXW9S|4#6@=%N(>&I*!>JFH?pW8=)hThGooLGS!sO
zH(X_}G~il@mWVJ&n9$?+4Fuv_QP4U9OX-09EEb9*j}G&<!iXA}Zo6L`e;77;c~i4H
zY)<ERl8B+k%UFxx21Fp*z!A_y^iT>;*Y?se*0qXI=5dLEPIB}##XU&HmS9#<yua~I
zac5mRs;zY_Bm465-^3r2h~4d8Dq@hFLCO(H=*)OYhrGi~Dmp48F|@#EcDKc+eE4lX
z0arSbCZC{L)Uwf-=L!^0J*bH)i+(+zm!bnPF)U~hUoV3p<rxq)oi0;GY;I6Vg=hX<
z<x~FHhRz!YmeGdg%8~DEbRrCU+n(Q>--|@3$NMR$<461Hwdja-(5ldiBPM=O^LPNj
z&c%6$zGp>~j_HClwtCQKZNwFP35*j^D_?j@{yIl)A}RgVuurbU6~lbHjB$iGQ1uUW
z6}ktc_Q8vLf6>ZzMfzOAkF4xoOm9`{8N(zEiN3nIPiG3!qK3lDv)s`-wKuj|ybbO>
zR$F+{zJ+#dYIVhb#<1SHpOC=9SrOj{G&Axmckb$Ag98xftaUdMAnhwb@bJ=Vqn?N$
zDTKnd@eRza@1ON)?tH}>D(b@>&??)&r#E=YD1AzZuKTJ1sUX4Gz(UhG>$61^s5Q`*
zr%x4Iv+g@pFcG+=-;{iHDsZjd=ciDLu?Y4qf5aI$HnG(RbTnQkNWrIhwifLdlznVG
zuH+g=?GHv_mJ;bFt@$<ZHbIrE#s5aeY@p1*!iav93m9_<gGU%965C&1_rX<A7cW|i
zb<;7X8n3^#OgoU`kE4==S@|0$DB9z5zTJ~1JgvsW*SC=#O=62Ut}a`TN-Z7OE+>lt
z_xF)qL=`C{&BZ+fMpx$j$~TenbS@tS*mPB-3X%%WlgIeZRY#oI73%4=x6R)v2c_6`
zo453t)_z=(st>cfW;#}%V0z%F6^Z$>?TLGMNJCG0IItCKZ*vl{Q&uZ_Qrj-OlOSwW
zB5PHm*ilvc@r9g);6tyJ6^D!jD|!FutZDR&p8xUX@B_$B(vn`^dC>nEFekYYrASSE
zDj$_oHons6XEEa)968797lET;^F-VO7ki_a83z*!KP__X30S_$ZU_)$+EI*C?iwp{
zhJ_TB<9a<ReSG?A%x}(fSM4{YXC;9*YbD(24?a=ys?yKq%N5atKUOLstAdm7vLEdQ
z>8xoJDC>x)5UdkC8P`HGGp(OyrTE`d#iSE&oq}8)PIZMR6Q;Cq*sj=MDQ@h01Gsys
zSW2mr{18J;2*8VIAevP2p}=vRp-Wg*teaBdJ8)2zJ!of$&O^|_*EdCftQkXgf6B>c
zN!T2M*M%RSq$_}13~6Qq0&IH?wZZ!cF`u(KQZ0+|lr0m0lE4p}1kt-@#)GXzbC5=~
zAA-zu-4~!0fyIW#&#UGl@i)#tnQT^{g8HqWvKJ-eh7x&x{_y@O9tmHaC#CD=nbP!U
zM1qD)$cC&Xa2hogl90<MNIEUR1lNRXlahI_;85F{rDK@4iP6uCVO8JNAk8(>>Ec^q
zgwWgcfQ2CzZ;s(U6Dm>A{U_USG9miDK(ykDBE{nIB*h$7E<7fu)uKFh;ZRqbP?R3r
z?Rwr$yc_`=^4Hh7kJ^@e>52m_#o+9)sHnA}73u>))|?Bxi@H17a+@Nn54@3P7neU}
zCpdbt1W}~YXTd|K`hg7EB;3}0PW8X2g?pF8u;q3;fH{J#XpO5O8d?uJgt!{KS|+PZ
zNI>SE_)MvopC5WJI}M7!oC3P*1R_S(49hW<G{Z)ecmYeJ3d0npkNvb<+wD+A2Sifp
z2y;dT^X+bmoy_+s`%4Y9o_k4AhE|Iy<T=(H2#w$sE*4@y-A%I?wZt|{)p*LHCiiW&
zVumt<W7a_R$~Ze8jqA@QSVg4rZ$+6A`HO;78W`@@wv1+)zhX%x3~MB>V_Au4yuOcw
zE)U#J-9!{bvQ4b7)fWC)Nmus^GsTc88Z9Tc=d@^@@QR>xM<olMbN5YE`9W2?4EYI2
z3)Md@x&)PZJ+W7U%0Nq@Fo$wq#qdmc4rkBg>!ghkFW;qbF%PfSX>;NHd&#X=;XXR}
zu7t|#V@fU|ac|VhcuUk=cpizG3W9lTy)+pXO-!}5$41Sqoh@885(vZ15qCt<Ytk%S
zLAg<g3KJW*tc<IYyI(P-s6jxBsK|_z0{{L!B*x@R6@oGH`xM9DEC~-Ocm|_&#;)nv
zD&k|qkY)uE*&Ng}E(GcL(}Fd55D4r(-q_SLbc3I`$^1)M>cW^QwPt~X?O!s;(n#_8
z9A?czd7)JcOVIcfIO&JpjEbNR<aU3xCgXydp8g?29R$J=#mN19F-7@%A%!X<bzC$S
zsQW29C(UHqoW94O{*xS~)xiqC421X?=~2*R-OSfUBjP<d{pL^Br^{P7W2P;M__ge2
z&(>v&#jz^W_8m0|`THyu)~s~DIJ%flrEXGU;!VSHo02Qo4i2?{#XVE!-jVyo4MmcY
zNb{7HTOLcL#i~r2X=6Wc*g}tM1nDQ_EOmx8+<F4+%T+nI3D@YvhrB$*ZHXR3Lx}`i
z$W#A$`EGpRDsBbO(>P;i_`sauMe2rwNUeKp_xwq&D)AlOX?8<N(>D?MM{Tr{py1E;
zT@q!b_M;ViSNM-#L}UX-S6&T93)08rDzhIYUa1J33f?OHoNrclG$-{Ry-(vqdj?=Q
zBv>@I=7IhYMO8p<=MlE}n$^D5dQ_dzeo~v<x|2Y{f}6#HS9@Gt%@Y#(s;96s6|X+y
zRh4pn9UFwg!t)J(JF^C<I&hT8@X}P`$BfW6UKHwUJX*#h*bRhoxshU%=Eua#%7eg^
z@wTjkb|heyin?hSvKEiU-a_4C$WR{9E;SZmHCaM385<|I1thbekG;ELY{(jqY@e5x
zVAqbLt`>AeBuW*&B__Tj02;NQKaCl^b^QQ_rmWgZ>hrknyp4zPys{>Pr1m)`u?D+D
z6&Bg2`pQl|fgXI#$|=wd#aiG8hq~ZO2M%6aE2SGr=QbtkfRahE-n_Ep{atvRYKN5<
zLW_r8N-jgN%~kHXp~01g$%D8Vf&3IgA(l&blIPR^vYE(CV>|-!8ht)+UBz!H30N(U
zJv$IRYCjEeu(DI=^PGCqtDZDUC|)|_ri@cM4~%iG<eLsQK1i)?N-wQwhTu}82l*;n
zh6M?%^y)kViX1vFB_6*77(bFX<OZEca8-2;=o|V<G<49ky)NIl5JaI$beiI%Bivqn
z+L#L(H<><o8eXG3>vp3$!qD|UGyW0JmJM#zK=rNm_0D(vBZ$fbMP|)q3H)d<m*KlV
zTz2{6&@X}1bfHG%&thjP)yUSZ(tj8JTM7TRgnzrk|9DO){|CJp8?l#mI)9@`+Ra-!
z6<!4-4!1aCqorIzo&nw`EeCZ$7gUz#RQ4Nf*uTQ7#dV$T`_iYy*I2^DGM-od1C^3{
A&Hw-a

diff --git a/plugins/opSkinClassicPlugin/web/images/skin_navi_f.jpg b/plugins/opSkinClassicPlugin/web/images/skin_navi_f.jpg
deleted file mode 100644
index 8054dbc5cfd65ee6fa6416792e93205180ea0eae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12916
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

diff --git a/plugins/opSkinClassicPlugin/web/images/skin_navi_f_2.jpg b/plugins/opSkinClassicPlugin/web/images/skin_navi_f_2.jpg
deleted file mode 100644
index 38718d90e450ba8d6925cf61e37c8d62af32e54e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14103
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%0A5(-6pUXs%DgYFJ?
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

diff --git a/plugins/opSkinClassicPlugin/web/images/skin_navi_h.jpg b/plugins/opSkinClassicPlugin/web/images/skin_navi_h.jpg
deleted file mode 100644
index dfd901b0201c7fa1df94e59caf21c7cf65db7156..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12600
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

diff --git a/plugins/opSkinClassicPlugin/web/images/skin_navi_h_2.jpg b/plugins/opSkinClassicPlugin/web/images/skin_navi_h_2.jpg
deleted file mode 100644
index 08eb4410a50b46b02194241709b411975bf1b341..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13831
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


From 5bd956b384c171d523bd77f8a3ee9559e66abe5b Mon Sep 17 00:00:00 2001
From: Fumie Toyooka <dymojet@google.com>
Date: Wed, 25 Apr 2012 18:13:05 +0900
Subject: [PATCH 236/630] (fixes #3009)change description of install commands
 in setup guide in English and Japanese.

---
 doc/en/OpenPNE3_Setup_Guide.txt | 22 +++++++++++++++++---
 doc/ja/OpenPNE3_Setup_Guide.txt | 37 +++++++++------------------------
 2 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/doc/en/OpenPNE3_Setup_Guide.txt b/doc/en/OpenPNE3_Setup_Guide.txt
index ad0cf2e87..76f1c7e5b 100644
--- a/doc/en/OpenPNE3_Setup_Guide.txt
+++ b/doc/en/OpenPNE3_Setup_Guide.txt
@@ -1,11 +1,11 @@
 ========================
-OpenPNE3.6 Setup Process
+OpenPNE3.8 Setup Process
 ========================
 
 Introduction
 ============
 
-This document is for OpenPNE 3.6.
+This document is for OpenPNE 3.8.
 
 OpenPNE 3 should work under the following server environment.
 
@@ -89,6 +89,12 @@ Execute the following command to begin installing process.
   $ ./symfony openpne:install
   
 This command deletes the database and rebuild it. 
+NOTE: The above command does not download and install bundled plugins. If you download and install these plugins, you should add --internet option as follows.
+
+::
+
+  $ ./symfony openpne:install --internet
+
 If you don't want to delete your specified database -- for example, OpenPNE will share the database with other systems, execute that command with the following option.
 
 ::
@@ -114,7 +120,17 @@ After Running "openpne:install", you will be required inputting the following:
 * The Database Port Number(optional)
 * (If you inputted "MySQL" for the DBMS and "localhost" for the hostname)The Database Socket Path(optional)
 
-After that OpenPNE automatically is installed.
+After that OpenPNE is installed automatically.
+
+You can also specify the above items of the database as the arguments and
+install OpenPNE.
+The following command is an usage example. So you should change to suitable items.
+
+::
+
+ $ ./symfony openpne:fast-install --dbms=mysql --dbuser=username --dbpassword=password --dbhost=localhost --dbport=10 --dbname=databasename --dbsock=/tmp/mysql.sock
+
+NOTE: The above command does not download and install bundled plugins. If you download and install these plugins, you should add '--internet' option.
 
 Delete the Development Files
 ----------------------------
diff --git a/doc/ja/OpenPNE3_Setup_Guide.txt b/doc/ja/OpenPNE3_Setup_Guide.txt
index ff8429a5e..aa8fd222e 100644
--- a/doc/ja/OpenPNE3_Setup_Guide.txt
+++ b/doc/ja/OpenPNE3_Setup_Guide.txt
@@ -1,11 +1,11 @@
 ===========================
-OpenPNE3.6 セットアップ手順
+OpenPNE3.8 セットアップ手順
 ===========================
 
 はじめに
 ========
 
-このドキュメントは、 OpenPNE バージョン 3.6 を基にして書かれています。
+このドキュメントは、 OpenPNE バージョン 3.8 を基にして書かれています。
 
 OpenPNE3 は以下のようなサーバ環境で動作させることを想定しています。
 
@@ -88,34 +88,22 @@ http://www.openpne.jp/pne-downloads/
   $ ./symfony openpne:install
 
 このコマンドはデータベースを削除し、作り直します。
-※但し、以上のコマンドはバンドルプラグインがダウンロード・インストールされないため、バンドルプラグインを\
-ダウンロード・インストールする場合は、以下の --internet
-オプションを付けてコマンドを実行してください。
+※但し、以上のコマンドはバンドルプラグインがダウンロード・インストールされないため、バンドルプラグインをダウンロード・インストールする場合は、以下の --internet オプションを付けてコマンドを実行してください。
 
 ::
 
   $ ./symfony openpne:install --internet
 
-他のシステムとデータベースを共有する場合などで、データベース自体の削除がおこなわれては都合が悪い場合、\
-以下のオプションを付けてコマンドを実行してください。
+他のシステムとデータベースを共有する場合などで、データベース自体の削除がおこなわれては都合が悪い場合、以下のオプションを付けてコマンドを実行してください。
 
 ::
 
   $ ./symfony openpne:install --non-recreate-db
 
---non-recreate-db オプションを付けて実行する場合、 OpenPNE
-はこれから作成しようとしているテーブル名と同名の\
-テーブルを外部キーなどを考慮して適切な順序で削除しようとします。他システムのテーブルが予期せず削除されてし\
-まったり、 OpenPNE
-の想定の外で外部キー制約などによりテーブルの削除に失敗したりといった危険を避けるため、
-\
-OpenPNE.yml の設定で OpenPNE
-が使用するテーブルにプレフィックスを付けておくことを強く推奨します。
+--non-recreate-db オプションを付けて実行する場合、 OpenPNE はこれから作成しようとしているテーブル名と同名のテーブルを外部キーなどを考慮して適切な順序で削除しようとします。
+他システムのテーブルが予期せず削除されてしまったり、 OpenPNE の想定の外で外部キー制約などによりテーブルの削除に失敗したりといった危険を避けるため、OpenPNE.yml の設定で OpenPNEが使用するテーブルにプレフィックスを付けておくことを強く推奨します。
 
-※このプレフィックスは同一 DB に対して複数の OpenPNE
-をインストールするためのものではなく、\
-DB
-を共有している他システムとテーブル名がバッティングするのを避けるためのものであることに注意してください。
+※このプレフィックスは同一 DB に対して複数の OpenPNE をインストールするためのものではなく、DB を共有している他システムとテーブル名がバッティングするのを避けるためのものであることに注意してください。
 
 ::
 
@@ -125,8 +113,7 @@ DB
 
   $ ./symfony openpne:install --internet
 
-openpne:install
-コマンドを実行すると、はじめに、以下の事項の入力を求められます。
+openpne:install コマンドを実行すると、はじめに、以下の事項の入力を求められます。
 
 * 使用する DBMS （mysql, pgsql, sqlite から選択。ただし mysql
 * 以外は未サポート）
@@ -145,13 +132,9 @@ openpne:install
 
 ::
 
- $ ./symfony openpne:fast-install --dbms=mysql --dbuser=username
---dbpassword=password --dbhost=localhost\
- --dbport=10 --dbname=databasename --dbsock=/tmp/mysql.sock
+ $ ./symfony openpne:fast-install --dbms=mysql --dbuser=username --dbpassword=password --dbhost=localhost --dbport=10 --dbname=databasename --dbsock=/tmp/mysql.sock
 
-※但し、以上のコマンドはバンドルプラグインがダウンロード・インストールされないため、バンドルプラグインを\
-ダウンロード・インストールする場合は、--internet
-オプションを付けてコマンドを実行してください。
+※但し、以上のコマンドはバンドルプラグインがダウンロード・インストールされないため、バンドルプラグインをダウンロード・インストールする場合は、--internet オプションを付けてコマンドを実行してください。
 
 開発環境用ファイルを削除
 ------------------------

From ac8d0d7bca6754271a60570fc0de285200373e55 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 26 Apr 2012 17:08:48 +0900
Subject: [PATCH 237/630] add advenced settings in pc_backend (fixes #2895, BP
 from #3010)

---
 .../advanced/actions/actions.class.php        | 86 +++++++++++++++++
 ...hTextareaOpenPNEButtonConfigForm.class.php |  0
 .../opRichTextareaOpenPNEConfigForm.class.php |  0
 .../modules/advanced/templates/_submenu.php   | 12 +++
 .../advanced/templates/configSuccess.php      | 25 +++++
 .../templates/richTextareaSuccess.php         |  0
 .../modules/sns/actions/actions.class.php     | 30 ------
 .../modules/sns/templates/_submenu.php        |  3 +-
 .../fixtures/008_import_backend_navi_menu.yml | 12 ++-
 lib/config/config/sns_config.yml              | 93 ++++++++++---------
 10 files changed, 185 insertions(+), 76 deletions(-)
 create mode 100644 apps/pc_backend/modules/advanced/actions/actions.class.php
 rename apps/pc_backend/modules/{sns => advanced}/lib/opRichTextareaOpenPNEButtonConfigForm.class.php (100%)
 rename apps/pc_backend/modules/{sns => advanced}/lib/opRichTextareaOpenPNEConfigForm.class.php (100%)
 create mode 100644 apps/pc_backend/modules/advanced/templates/_submenu.php
 create mode 100644 apps/pc_backend/modules/advanced/templates/configSuccess.php
 rename apps/pc_backend/modules/{sns => advanced}/templates/richTextareaSuccess.php (100%)

diff --git a/apps/pc_backend/modules/advanced/actions/actions.class.php b/apps/pc_backend/modules/advanced/actions/actions.class.php
new file mode 100644
index 000000000..d18b3f96a
--- /dev/null
+++ b/apps/pc_backend/modules/advanced/actions/actions.class.php
@@ -0,0 +1,86 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * advanced actions.
+ *
+ * @package    OpenPNE
+ * @subpackage advanced
+ * @author     Kousuke Ebihara <ebihara@tejimaya.com>
+ * @author     Kimura Youichi <kim.upsilon@bucyou.net>
+ */
+class advancedActions extends sfActions
+{
+ /**
+  * Executes config action
+  *
+  * @param sfRequest $request A request object
+  */
+  public function executeConfig(sfWebRequest $request)
+  {
+    $this->category = $request->getParameter('category', 'advanced');
+    $this->categoryAttributes = sfConfig::get('openpne_sns_category_attribute');
+
+    $this->forward404If(!empty($this->categoryAttributes[$this->category]['Hidden']));
+
+    $formName = 'op'.sfInflector::camelize($this->category).'SnsConfigForm';
+    if (class_exists($formName, true))
+    {
+      $this->form = new $formName();
+    }
+    else
+    {
+      $this->form = new SnsConfigForm(array(), array('category' => $this->category));
+    }
+
+    if ($request->isMethod('post'))
+    {
+      $this->form->bind($request->getParameter('sns_config'));
+      if ($this->form->isValid())
+      {
+        $this->form->save();
+        $this->getUser()->setFlash('notice', 'Saved.');
+        $this->redirect('advanced/config?category='.$this->category);
+      }
+
+      $this->getUser()->setFlash('error', 'Failed to save.', false);
+    }
+  }
+
+  public function executeRichTextarea(sfWebRequest $request)
+  {
+    $this->sortForm = new BaseForm();
+    $this->configForm = new opRichTextareaOpenPNEConfigForm();
+    $this->buttonConfigForm = new opRichTextareaOpenPNEButtonConfigForm();
+    $this->buttonConfig = opWidgetFormRichTextareaOpenPNE::getAllButtons();
+    if ($request->isMethod(sfWebRequest::POST))
+    {
+      $this->configForm->bind($request->getParameter('config'));
+      $this->buttonConfigForm->bind($request->getParameter('button'));
+      if ($this->configForm->isValid() && $this->buttonConfigForm->isValid())
+      {
+        $this->configForm->save();
+        $this->buttonConfigForm->save();
+      }
+    }
+  }
+
+  public function executeChangeRichTextareaButtonOrder(sfWebRequest $request)
+  {
+    if ($request->isXmlHttpRequest())
+    {
+      $request->checkCSRFProtection();
+
+      $buttons = $request->getParameter('button');
+      Doctrine::getTable('SnsConfig')->set('richtextarea_buttons_sort_order', serialize($buttons));
+    }
+    return sfView::NONE;
+  }
+}
diff --git a/apps/pc_backend/modules/sns/lib/opRichTextareaOpenPNEButtonConfigForm.class.php b/apps/pc_backend/modules/advanced/lib/opRichTextareaOpenPNEButtonConfigForm.class.php
similarity index 100%
rename from apps/pc_backend/modules/sns/lib/opRichTextareaOpenPNEButtonConfigForm.class.php
rename to apps/pc_backend/modules/advanced/lib/opRichTextareaOpenPNEButtonConfigForm.class.php
diff --git a/apps/pc_backend/modules/sns/lib/opRichTextareaOpenPNEConfigForm.class.php b/apps/pc_backend/modules/advanced/lib/opRichTextareaOpenPNEConfigForm.class.php
similarity index 100%
rename from apps/pc_backend/modules/sns/lib/opRichTextareaOpenPNEConfigForm.class.php
rename to apps/pc_backend/modules/advanced/lib/opRichTextareaOpenPNEConfigForm.class.php
diff --git a/apps/pc_backend/modules/advanced/templates/_submenu.php b/apps/pc_backend/modules/advanced/templates/_submenu.php
new file mode 100644
index 000000000..181982e5a
--- /dev/null
+++ b/apps/pc_backend/modules/advanced/templates/_submenu.php
@@ -0,0 +1,12 @@
+<?php $categoryAttributes = sfConfig::get('openpne_sns_category_attribute'); ?>
+<?php foreach (sfConfig::get('openpne_sns_category') as $category => $configs) :?>
+<?php
+if (!empty($categoryAttributes[$category]['Hidden']) || empty($categoryAttributes[$category]['Advanced']))
+{
+  continue;
+}
+$caption = !empty($categoryAttributes[$category]['Caption']) ? $categoryAttributes[$category]['Caption'] : $category;
+?>
+<li><?php echo link_to(__($caption), 'advanced/config?category='.$category) ?></li>
+<?php endforeach; ?>
+<li><?php echo link_to(__('RichTextarea Configuration'), 'advanced/richTextarea') ?></li>
diff --git a/apps/pc_backend/modules/advanced/templates/configSuccess.php b/apps/pc_backend/modules/advanced/templates/configSuccess.php
new file mode 100644
index 000000000..ba447ba0a
--- /dev/null
+++ b/apps/pc_backend/modules/advanced/templates/configSuccess.php
@@ -0,0 +1,25 @@
+<?php slot('submenu') ?>
+<?php include_partial('submenu'); ?>
+<?php end_slot() ?>
+
+<?php
+$categoryAttributes = sfConfig::get('openpne_sns_category_attribute'); 
+$caption = !empty($categoryAttributes[$category]['Caption']) ? $categoryAttributes[$category]['Caption'] : $category;
+?>
+
+<h2><?php echo __('SNS設定') ?> (<?php echo __($caption) ?>)</h2>
+
+<p><?php echo __('※「設定変更」ボタンを押すと設定が反映されます。') ?></p>
+
+<?php if ($category === 'authentication') : ?>
+<p><?php echo __('※認証に関する個別の設定は、「プラグイン設定」からおこなってください。') ?></p>
+<?php endif; ?>
+
+<form action="<?php echo url_for('sns/config?category='.$category) ?>" method="post">
+<table>
+<?php echo $form ?>
+<tr>
+<td colspan="2"><input type="submit" value="<?php echo __('設定変更') ?>" /></td>
+</tr>
+</table>
+</form>
diff --git a/apps/pc_backend/modules/sns/templates/richTextareaSuccess.php b/apps/pc_backend/modules/advanced/templates/richTextareaSuccess.php
similarity index 100%
rename from apps/pc_backend/modules/sns/templates/richTextareaSuccess.php
rename to apps/pc_backend/modules/advanced/templates/richTextareaSuccess.php
diff --git a/apps/pc_backend/modules/sns/actions/actions.class.php b/apps/pc_backend/modules/sns/actions/actions.class.php
index 13562c774..e4c6bafde 100644
--- a/apps/pc_backend/modules/sns/actions/actions.class.php
+++ b/apps/pc_backend/modules/sns/actions/actions.class.php
@@ -112,34 +112,4 @@ public function executeCache(sfWebRequest $request)
       $this->redirect('sns/cache');
     }
   }
-
-  public function executeRichTextarea(sfWebRequest $request)
-  {
-    $this->sortForm = new BaseForm();
-    $this->configForm = new opRichTextareaOpenPNEConfigForm();
-    $this->buttonConfigForm = new opRichTextareaOpenPNEButtonConfigForm();
-    $this->buttonConfig = opWidgetFormRichTextareaOpenPNE::getAllButtons();
-    if ($request->isMethod(sfWebRequest::POST))
-    {
-      $this->configForm->bind($request->getParameter('config'));
-      $this->buttonConfigForm->bind($request->getParameter('button'));
-      if ($this->configForm->isValid() && $this->buttonConfigForm->isValid())
-      {
-        $this->configForm->save();
-        $this->buttonConfigForm->save();
-      }
-    }
-  }
-
-  public function executeChangeRichTextareaButtonOrder(sfWebRequest $request)
-  {
-    if ($request->isXmlHttpRequest())
-    {
-      $request->checkCSRFProtection();
-
-      $buttons = $request->getParameter('button');
-      Doctrine::getTable('SnsConfig')->set('richtextarea_buttons_sort_order', serialize($buttons));
-    }
-    return sfView::NONE;
-  }
 }
diff --git a/apps/pc_backend/modules/sns/templates/_submenu.php b/apps/pc_backend/modules/sns/templates/_submenu.php
index 42d9164f0..c3e2594c3 100644
--- a/apps/pc_backend/modules/sns/templates/_submenu.php
+++ b/apps/pc_backend/modules/sns/templates/_submenu.php
@@ -1,7 +1,7 @@
 <?php $categoryAttributes = sfConfig::get('openpne_sns_category_attribute'); ?>
 <?php foreach (sfConfig::get('openpne_sns_category') as $category => $configs) :?>
 <?php
-if (!empty($categoryAttributes[$category]['Hidden']))
+if (!empty($categoryAttributes[$category]['Hidden']) || !empty($categoryAttributes[$category]['Advanced']))
 {
   continue;
 }
@@ -11,4 +11,3 @@
 <?php endforeach; ?>
 <li><?php echo link_to(__('Term Configuration in this SNS'), 'sns/term') ?></li>
 <li><?php echo link_to(__('Cache Clear'), 'sns/cache') ?></li>
-<li><?php echo link_to(__('RichTextarea Configuration'), 'sns/richTextarea') ?></li>
diff --git a/data/fixtures/008_import_backend_navi_menu.yml b/data/fixtures/008_import_backend_navi_menu.yml
index d31d5d49f..ecacd077e 100644
--- a/data/fixtures/008_import_backend_navi_menu.yml
+++ b/data/fixtures/008_import_backend_navi_menu.yml
@@ -89,10 +89,20 @@ Navigation:
       en:
         caption: "Plugins"
 
+  backend_side_advanced_config:
+    type: "backend_side"
+    uri:  "advanced/config"
+    sort_order: 90
+    Translation:
+      ja_JP:
+        caption: "上級者向け設定"
+      en:
+        caption: "Advanced Settings"
+
   backend_side_admin:
     type: "backend_side"
     uri:  "admin/index"
-    sort_order: 90
+    sort_order: 100
     Translation:
       ja_JP:
         caption: "管理画面設定"
diff --git a/lib/config/config/sns_config.yml b/lib/config/config/sns_config.yml
index b84138546..ef3b4f9a6 100644
--- a/lib/config/config/sns_config.yml
+++ b/lib/config/config/sns_config.yml
@@ -73,6 +73,54 @@ general:
     IsTrim:      true
     Default:     "300K"
 
+  is_use_captcha:
+    Name:       "is_use_captcha"
+    Caption:    "CAPTCHA 使用設定"
+    Help:       "CAPTCHA (画像のなかの文字列をメンバーに入力させる認証方式) を使用するかどうかを設定します"
+    FormType:   "radio"
+    ValueType:  "text"
+    IsRequired: true
+    Default:    1
+    Choices:
+      - "使用しない"
+      - "使用する"
+
+  nickname_of_member_who_does_not_have_credentials:
+    Name:       "nickname_of_member_who_does_not_have_credentials"
+    Caption:    "非SNSユーザー表示名設定"
+    Help:       "非SNSユーザー（退会したユーザーなど）の表示名を設定します"
+    FormType:   "text"
+    ValueType:  "string"
+    IsRequired: false
+    Default:    "-"
+
+  enable_language:
+    Name:      "enable_language"
+    Caption:   "言語とタイムゾーンの設定の使用設定"
+    FormType:  "radio"
+    ValueType: "text"
+    IsRequired: true
+    Default:    0
+    Choices:
+      - "使用しない"
+      - "使用する"
+
+  enable_connection:
+    Name:      "enable_connection"
+    Caption:   "外部サービスとの接続設定の使用設定"
+    FormType:  "radio"
+    ValueType: "text"
+    IsRequired: true
+    Default:    0
+    Choices:
+      - "使用しない"
+      - "使用する"
+
+advanced:
+  _attributes:
+    Caption: "Advanced Settings"
+    Advanced: true
+
   daily_news_day:
     Name:       "daily_news_day"
     Caption:    "デイリーニュース受信頻度の設定"
@@ -90,18 +138,6 @@ general:
       - "Sat"
       - "Sun"
 
-  is_use_captcha:
-    Name:       "is_use_captcha"
-    Caption:    "CAPTCHA 使用設定"
-    Help:       "CAPTCHA (画像のなかの文字列をメンバーに入力させる認証方式) を使用するかどうかを設定します"
-    FormType:   "radio"
-    ValueType:  "text"
-    IsRequired: true
-    Default:    1
-    Choices:
-      - "使用しない"
-      - "使用する"
-
   is_allow_post_activity:
     Name:       "is_allow_post_activity"
     Caption:    "アクティビティ投稿設定"
@@ -139,37 +175,6 @@ general:
       0: "メンバーの設定を許可しない"
       1: "メンバーの設定を許可する"
 
-  nickname_of_member_who_does_not_have_credentials:
-    Name:       "nickname_of_member_who_does_not_have_credentials"
-    Caption:    "非SNSユーザー表示名設定"
-    Help:       "非SNSユーザー（退会したユーザーなど）の表示名を設定します"
-    FormType:   "text"
-    ValueType:  "string"
-    IsRequired: false
-    Default:    "-"
-
-  enable_language:
-    Name:      "enable_language"
-    Caption:   "言語とタイムゾーンの設定の使用設定"
-    FormType:  "radio"
-    ValueType: "text"
-    IsRequired: true
-    Default:    0
-    Choices:
-      - "使用しない"
-      - "使用する"
-
-  enable_connection:
-    Name:      "enable_connection"
-    Caption:   "外部サービスとの接続設定の使用設定"
-    FormType:  "radio"
-    ValueType: "text"
-    IsRequired: true
-    Default:    0
-    Choices:
-      - "使用しない"
-      - "使用する"
-
   enable_jsonapi:
     Name:      "enable_jsonapi"
     Caption:   "JSON API 使用設定"
@@ -236,6 +241,7 @@ authentication:
 mobile:
   _attributes:
     Caption: "Mobile Configuration"
+    Advanced: true
 
   retrieve_uid:
     Name:      "retrieve_uid"
@@ -321,6 +327,7 @@ permit_member_config:
 api_keys:
   _attributes:
     Caption: "API キーの設定"
+    Advanced: true
 
   google_maps_api_key:
     Name:       "google maps api key"

From 97ce1b0c5195908e34c8a106b3af2483a6adecd5 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 26 Apr 2012 20:13:02 +0900
Subject: [PATCH 238/630] (fixes #2985, BP from #2984) add smartphone asset
 helper

---
 apps/pc_frontend/templates/smtLayoutGroup.php |  22 +--
 apps/pc_frontend/templates/smtLayoutHome.php  |  22 +--
 .../pc_frontend/templates/smtLayoutMember.php |  22 +--
 apps/pc_frontend/templates/smtLayoutSns.php   |  22 +--
 lib/helper/opAssetHelper.php                  | 114 ++++++++++++++++
 lib/response/opWebResponse.class.php          | 129 +++++++++++++++++-
 6 files changed, 286 insertions(+), 45 deletions(-)
 create mode 100644 lib/helper/opAssetHelper.php

diff --git a/apps/pc_frontend/templates/smtLayoutGroup.php b/apps/pc_frontend/templates/smtLayoutGroup.php
index 57ebc7428..f6db09761 100644
--- a/apps/pc_frontend/templates/smtLayoutGroup.php
+++ b/apps/pc_frontend/templates/smtLayoutGroup.php
@@ -1,5 +1,5 @@
 <?php use_helper('Javascript') ?>
-<?php $sf_response->removeStylesheet('/opSkinBasicPlugin/css/main.css') ?>
+<?php use_helper('opAsset') ?>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
@@ -7,9 +7,9 @@
 <?php include_http_metas() ?>
 <?php include_metas() ?>
 <?php include_title() ?>
-<?php use_stylesheet('bootstrap') ?>
-<?php use_stylesheet('smt_main') ?>
-<?php include_stylesheets() ?>
+<?php op_smt_use_stylesheet('bootstrap') ?>
+<?php op_smt_use_stylesheet('smt_main') ?>
+<?php op_smt_include_stylesheets() ?>
 <?php if (Doctrine::getTable('SnsConfig')->get('customizing_css')): ?>
 <link rel="stylesheet" type="text/css" href="<?php echo url_for('@customizing_css') ?>" />
 <?php endif ?>
@@ -28,13 +28,13 @@
 ');
 ?>
 <?php endif ?>
-<?php use_javascript('jquery.min.js') ?>
-<?php use_javascript('jquery.tmpl.min.js') ?>
-<?php use_javascript('smt_main') ?>
-<?php use_javascript('smt_notify') ?>
-<?php use_javascript('smt_tosaka') ?>
-<?php use_javascript('smt_menu') ?>
-<?php include_javascripts() ?>
+<?php op_smt_use_javascript('jquery.min.js') ?>
+<?php op_smt_use_javascript('jquery.tmpl.min.js') ?>
+<?php op_smt_use_javascript('smt_main') ?>
+<?php op_smt_use_javascript('smt_notify') ?>
+<?php op_smt_use_javascript('smt_tosaka') ?>
+<?php op_smt_use_javascript('smt_menu') ?>
+<?php op_smt_include_javascripts() ?>
 </head>
 <body id="<?php printf('page_%s_%s', $this->getModuleName(), $this->getActionName()) ?>" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
 <?php if (isset($op_layout['community'])): ?>
diff --git a/apps/pc_frontend/templates/smtLayoutHome.php b/apps/pc_frontend/templates/smtLayoutHome.php
index e6056e613..2957bfd3a 100644
--- a/apps/pc_frontend/templates/smtLayoutHome.php
+++ b/apps/pc_frontend/templates/smtLayoutHome.php
@@ -1,5 +1,5 @@
 <?php use_helper('Javascript') ?>
-<?php $sf_response->removeStylesheet('/opSkinBasicPlugin/css/main.css') ?>
+<?php use_helper('opAsset') ?>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
@@ -7,9 +7,9 @@
 <?php include_http_metas() ?>
 <?php include_metas() ?>
 <?php include_title() ?>
-<?php use_stylesheet('bootstrap') ?>
-<?php use_stylesheet('smt_main') ?>
-<?php include_stylesheets() ?>
+<?php op_smt_use_stylesheet('bootstrap') ?>
+<?php op_smt_use_stylesheet('smt_main') ?>
+<?php op_smt_include_stylesheets() ?>
 <?php if (Doctrine::getTable('SnsConfig')->get('customizing_css')): ?>
 <link rel="stylesheet" type="text/css" href="<?php echo url_for('@customizing_css') ?>" />
 <?php endif ?>
@@ -28,13 +28,13 @@
 ');
 ?>
 <?php endif ?>
-<?php use_javascript('jquery.min.js') ?>
-<?php use_javascript('jquery.tmpl.min.js') ?>
-<?php use_javascript('smt_main') ?>
-<?php use_javascript('smt_notify') ?>
-<?php use_javascript('smt_tosaka') ?>
-<?php use_javascript('smt_menu') ?>
-<?php include_javascripts() ?>
+<?php op_smt_use_javascript('jquery.min.js') ?>
+<?php op_smt_use_javascript('jquery.tmpl.min.js') ?>
+<?php op_smt_use_javascript('smt_main') ?>
+<?php op_smt_use_javascript('smt_notify') ?>
+<?php op_smt_use_javascript('smt_tosaka') ?>
+<?php op_smt_use_javascript('smt_menu') ?>
+<?php op_smt_include_javascripts() ?>
 </head>
 <body id="<?php printf('page_%s_%s', $this->getModuleName(), $this->getActionName()) ?>" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
 <?php include_partial('global/tosaka') ?>
diff --git a/apps/pc_frontend/templates/smtLayoutMember.php b/apps/pc_frontend/templates/smtLayoutMember.php
index c2b5d5342..64856bade 100644
--- a/apps/pc_frontend/templates/smtLayoutMember.php
+++ b/apps/pc_frontend/templates/smtLayoutMember.php
@@ -1,5 +1,5 @@
 <?php use_helper('Javascript') ?>
-<?php $sf_response->removeStylesheet('/opSkinBasicPlugin/css/main.css') ?>
+<?php use_helper('opAsset') ?>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
@@ -7,9 +7,9 @@
 <?php include_http_metas() ?>
 <?php include_metas() ?>
 <?php include_title() ?>
-<?php use_stylesheet('bootstrap') ?>
-<?php use_stylesheet('smt_main') ?>
-<?php include_stylesheets() ?>
+<?php op_smt_use_stylesheet('bootstrap') ?>
+<?php op_smt_use_stylesheet('smt_main') ?>
+<?php op_smt_include_stylesheets() ?>
 <?php if (Doctrine::getTable('SnsConfig')->get('customizing_css')): ?>
 <link rel="stylesheet" type="text/css" href="<?php echo url_for('@customizing_css') ?>" />
 <?php endif ?>
@@ -28,13 +28,13 @@
 ');
 ?>
 <?php endif ?>
-<?php use_javascript('jquery.min.js') ?>
-<?php use_javascript('jquery.tmpl.min.js') ?>
-<?php use_javascript('smt_main') ?>
-<?php use_javascript('smt_notify') ?>
-<?php use_javascript('smt_tosaka') ?>
-<?php use_javascript('smt_menu') ?>
-<?php include_javascripts() ?>
+<?php op_smt_use_javascript('jquery.min.js') ?>
+<?php op_smt_use_javascript('jquery.tmpl.min.js') ?>
+<?php op_smt_use_javascript('smt_main') ?>
+<?php op_smt_use_javascript('smt_notify') ?>
+<?php op_smt_use_javascript('smt_tosaka') ?>
+<?php op_smt_use_javascript('smt_menu') ?>
+<?php op_smt_include_javascripts() ?>
 </head>
 <body id="<?php printf('page_%s_%s', $this->getModuleName(), $this->getActionName()) ?>" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
 <?php include_partial('global/tosaka') ?>
diff --git a/apps/pc_frontend/templates/smtLayoutSns.php b/apps/pc_frontend/templates/smtLayoutSns.php
index 95af00709..2e9eb6a1d 100644
--- a/apps/pc_frontend/templates/smtLayoutSns.php
+++ b/apps/pc_frontend/templates/smtLayoutSns.php
@@ -1,5 +1,5 @@
 <?php use_helper('Javascript') ?>
-<?php $sf_response->removeStylesheet('/opSkinBasicPlugin/css/main.css') ?>
+<?php use_helper('opAsset') ?>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
@@ -7,9 +7,9 @@
 <?php include_http_metas() ?>
 <?php include_metas() ?>
 <?php include_title() ?>
-<?php use_stylesheet('bootstrap') ?>
-<?php use_stylesheet('smt_main') ?>
-<?php include_stylesheets() ?>
+<?php op_smt_use_stylesheet('bootstrap') ?>
+<?php op_smt_use_stylesheet('smt_main') ?>
+<?php op_smt_include_stylesheets() ?>
 <?php if (Doctrine::getTable('SnsConfig')->get('customizing_css')): ?>
 <link rel="stylesheet" type="text/css" href="<?php echo url_for('@customizing_css') ?>" />
 <?php endif ?>
@@ -28,13 +28,13 @@
 ');
 ?>
 <?php endif ?>
-<?php use_javascript('jquery.min.js') ?>
-<?php use_javascript('jquery.tmpl.min.js') ?>
-<?php use_javascript('smt_main') ?>
-<?php use_javascript('smt_notify') ?>
-<?php use_javascript('smt_tosaka') ?>
-<?php use_javascript('smt_menu') ?>
-<?php include_javascripts() ?>
+<?php op_smt_use_javascript('jquery.min.js') ?>
+<?php op_smt_use_javascript('jquery.tmpl.min.js') ?>
+<?php op_smt_use_javascript('smt_main') ?>
+<?php op_smt_use_javascript('smt_notify') ?>
+<?php op_smt_use_javascript('smt_tosaka') ?>
+<?php op_smt_use_javascript('smt_menu') ?>
+<?php op_smt_include_javascripts() ?>
 </head>
 <body id="<?php printf('page_%s_%s', $this->getModuleName(), $this->getActionName()) ?>" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
 
diff --git a/lib/helper/opAssetHelper.php b/lib/helper/opAssetHelper.php
new file mode 100644
index 000000000..9c534fcbe
--- /dev/null
+++ b/lib/helper/opAssetHelper.php
@@ -0,0 +1,114 @@
+<?php
+
+require_once sfConfig::get('sf_symfony_lib_dir').'/helper/AssetHelper.php';
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * opAssetHelper provides helper function for Assets like css or javascript
+ * this helpler refered to symfony's AssetHelper
+ *
+ * @package    OpenPNE
+ * @subpackage helper
+ * @author     Yuya Watanabe <watanabe@openpne.jp>
+ */
+
+
+/**
+ * Returns <script> tags for all javascripts for smartphone pages added to the response object.
+ *
+ * you can use this helper to decide the location of javascripts in pages.
+ * by default, if you don't call this helper, openpne will automatically include javascripts before </head>.
+ * calling this helper disables this behavior.
+ *
+ * @return string <script> tags
+ *
+ * @see get_javascripts()
+ */
+function op_smt_get_javascripts()
+{
+  $response = sfContext::getInstance()->getResponse();
+  sfConfig::set('symfony.asset.javascripts_included', true);
+
+  $html = '';
+  foreach ($response->getSmtJavascripts() as $file => $options)
+  {
+    $html .= javascript_include_tag($file, $options);
+  }
+
+  return $html;
+}
+
+/**
+ * Prints <script> tags for all javascripts for smartphone pages added to the response object.
+ *
+ * @see get_javascripts()
+ * @see op_smt_get_javascripts()
+ */
+function op_smt_include_javascripts()
+{
+  echo op_smt_get_javascripts();
+}
+
+/**
+ * Returns <link> tags for all stylesheets smartphone pages added to the response object.
+ *
+ * You can use this helper to decide the location of stylesheets in pages.
+ * By default, if you don't call this helper, openpne will automatically include stylesheets before </head>.
+ * Calling this helper disables this behavior.
+ *
+ * @return string <link> tags
+ *
+ * @see get_stylesheets()
+ */
+function op_smt_get_stylesheets()
+{
+  $response = sfContext::getInstance()->getResponse();
+  sfConfig::set('symfony.asset.stylesheets_included', true);
+
+  $html = '';
+  foreach ($response->getSmtStylesheets() as $file => $options)
+  {
+    $html .= stylesheet_tag($file, $options);
+  }
+
+  return $html;
+}
+
+/**
+ * Prints <link> tags for all stylesheets for smartphone pages added to the response object.
+ *
+ * @see get_stylesheets()
+ * @see op_smt_get_stylesheets()
+ */
+function op_smt_include_stylesheets()
+{
+  echo op_smt_get_stylesheets();
+}
+
+
+/**
+ * Adds a stylesheet for smartphone pages to the response object.
+ *
+ * @see opWebResponse->addSmtStylesheet()
+ */
+function op_smt_use_stylesheet($css, $position = '', $options = array())
+{
+  sfContext::getInstance()->getResponse()->addSmtStylesheet($css, $position, $options);
+}
+
+/**
+ * Adds a javascript for smartphone pages to the response object.
+ *
+ * @see opWebResponse->addSmtJavascript()
+ */
+function op_smt_use_javascript($js, $position = '', $options = array())
+{
+  sfContext::getInstance()->getResponse()->addSmtJavascript($js, $position, $options);
+}
diff --git a/lib/response/opWebResponse.class.php b/lib/response/opWebResponse.class.php
index b293d5dcf..3795a6374 100644
--- a/lib/response/opWebResponse.class.php
+++ b/lib/response/opWebResponse.class.php
@@ -18,7 +18,9 @@ class opWebResponse extends sfWebResponse
 {
   protected
     $displayMember = null,
-    $displayCommunity = null;
+    $displayCommunity = null,
+    $smtStylesheets = array(),
+    $smtJavascripts = array();
 
   public function getTitle()
   {
@@ -55,4 +57,129 @@ public function deleteMobileUidCookie()
 
     $this->setCookie(opWebRequest::MOBILE_UID_COOKIE_NAME, '', time() - 3600);
   }
+
+  /**
+   * Adds a stylesheet to the current smartphone web response.
+   *
+   * @param string $file      The stylesheet file
+   * @param string $position  Position
+   * @param string $options   Stylesheet options
+   */
+  public function addSmtStylesheet($file, $position = '', $options = array())
+  {
+    $this->validatePosition($position);
+
+    $this->smtStylesheets[$position][$file] = $options;
+  }
+
+  /**
+   * Removes a stylesheet from the current smartphone web response.
+   *
+   * @param string $file The stylesheet file to remove
+   */
+  public function removeSmtStylesheet($file)
+  {
+    foreach ($this->getPositions() as $position)
+    {
+      unset($this->smtStylesheets[$position][$file]);
+    }
+  }
+
+  /**
+   * Adds javascript code to the current smartphone web response.
+   *
+   * @param string $file      The JavaScript file
+   * @param string $position  Position
+   * @param string $options   Javascript options
+   */
+  public function addSmtJavascript($file, $position = '', $options = array())
+  {
+    $this->validatePosition($position);
+
+    $this->smtJavascripts[$position][$file] = $options;
+  }
+
+  /**
+   * Removes a JavaScript file from the current web response.
+   *
+   * @param string $file The Javascript file to remove
+   */
+  public function removeSmtJavascript($file)
+  {
+    foreach ($this->getPositions() as $position)
+    {
+      unset($this->smtJavascripts[$position][$file]);
+    }
+  }
+
+  /**
+   * Retrieves stylesheets for the current smartphone web response.
+   *
+   * By default, the position is sfWebResponse::ALL,
+   * and the method returns all stylesheets ordered by position.
+   *
+   * @param  string  $position The position
+   *
+   * @return array   An associative array of stylesheet files as keys and options as values
+   */
+  public function getSmtStylesheets($position = self::ALL)
+  {
+    if (self::ALL === $position)
+    {
+      $stylesheets = array();
+      foreach ($this->getPositions() as $position)
+      {
+        foreach ($this->smtStylesheets[$position] as $file => $options)
+        {
+          $stylesheets[$file] = $options;
+        }
+      }
+
+      return $stylesheets;
+    }
+    else if (self::RAW === $position)
+    {
+      return $this->smtStylesheets;
+    }
+
+    $this->validatePosition($position);
+
+    return $this->smtStylesheets[$position];
+  }
+
+  /**
+   * Retrieves javascript files from the current smartphone web response.
+   *
+   * By default, the position is sfWebResponse::ALL,
+   * and the method returns all javascripts ordered by position.
+   *
+   * @param  string $position  The position
+   *
+   * @return array An associative array of javascript files as keys and options as values
+   */
+  public function getSmtJavascripts($position = self::ALL)
+  {
+    if (self::ALL === $position)
+    {
+      $javascripts = array();
+      foreach ($this->getPositions() as $position)
+      {
+        foreach ($this->smtJavascripts[$position] as $file => $options)
+        {
+          $javascripts[$file] = $options;
+        }
+      }
+
+      return $javascripts;
+    }
+    else if (self::RAW === $position)
+    {
+      return $this->smtJavascripts;
+    }
+
+    $this->validatePosition($position);
+
+    return $this->smtJavascripts[$position];
+  }
+
 }

From c015aaa0ed86cbca957250ccf907c58ea42fd64a Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 26 Apr 2012 21:32:09 +0900
Subject: [PATCH 239/630] (fixes #3042, BP from #3040) removed pc custom css
 from smartphone pages

---
 apps/pc_frontend/templates/smtLayoutGroup.php  | 3 ---
 apps/pc_frontend/templates/smtLayoutHome.php   | 3 ---
 apps/pc_frontend/templates/smtLayoutMember.php | 3 ---
 apps/pc_frontend/templates/smtLayoutSns.php    | 3 ---
 4 files changed, 12 deletions(-)

diff --git a/apps/pc_frontend/templates/smtLayoutGroup.php b/apps/pc_frontend/templates/smtLayoutGroup.php
index f6db09761..467e43191 100644
--- a/apps/pc_frontend/templates/smtLayoutGroup.php
+++ b/apps/pc_frontend/templates/smtLayoutGroup.php
@@ -10,9 +10,6 @@
 <?php op_smt_use_stylesheet('bootstrap') ?>
 <?php op_smt_use_stylesheet('smt_main') ?>
 <?php op_smt_include_stylesheets() ?>
-<?php if (Doctrine::getTable('SnsConfig')->get('customizing_css')): ?>
-<link rel="stylesheet" type="text/css" href="<?php echo url_for('@customizing_css') ?>" />
-<?php endif ?>
 <meta name="viewport" content="width=320px,user-scalable=no" />
 <?php if (opConfig::get('enable_jsonapi') && opToolkit::isSecurePage()): ?>
 <?php
diff --git a/apps/pc_frontend/templates/smtLayoutHome.php b/apps/pc_frontend/templates/smtLayoutHome.php
index 2957bfd3a..bf9201a28 100644
--- a/apps/pc_frontend/templates/smtLayoutHome.php
+++ b/apps/pc_frontend/templates/smtLayoutHome.php
@@ -10,9 +10,6 @@
 <?php op_smt_use_stylesheet('bootstrap') ?>
 <?php op_smt_use_stylesheet('smt_main') ?>
 <?php op_smt_include_stylesheets() ?>
-<?php if (Doctrine::getTable('SnsConfig')->get('customizing_css')): ?>
-<link rel="stylesheet" type="text/css" href="<?php echo url_for('@customizing_css') ?>" />
-<?php endif ?>
 <meta name="viewport" content="width=320px,user-scalable=no" />
 <?php if (opConfig::get('enable_jsonapi') && opToolkit::isSecurePage()): ?>
 <?php
diff --git a/apps/pc_frontend/templates/smtLayoutMember.php b/apps/pc_frontend/templates/smtLayoutMember.php
index 64856bade..edd858850 100644
--- a/apps/pc_frontend/templates/smtLayoutMember.php
+++ b/apps/pc_frontend/templates/smtLayoutMember.php
@@ -10,9 +10,6 @@
 <?php op_smt_use_stylesheet('bootstrap') ?>
 <?php op_smt_use_stylesheet('smt_main') ?>
 <?php op_smt_include_stylesheets() ?>
-<?php if (Doctrine::getTable('SnsConfig')->get('customizing_css')): ?>
-<link rel="stylesheet" type="text/css" href="<?php echo url_for('@customizing_css') ?>" />
-<?php endif ?>
 <meta name="viewport" content="width=320px,user-scalable=no" />
 <?php if (opConfig::get('enable_jsonapi') && opToolkit::isSecurePage()): ?>
 <?php
diff --git a/apps/pc_frontend/templates/smtLayoutSns.php b/apps/pc_frontend/templates/smtLayoutSns.php
index 2e9eb6a1d..15dba17c3 100644
--- a/apps/pc_frontend/templates/smtLayoutSns.php
+++ b/apps/pc_frontend/templates/smtLayoutSns.php
@@ -10,9 +10,6 @@
 <?php op_smt_use_stylesheet('bootstrap') ?>
 <?php op_smt_use_stylesheet('smt_main') ?>
 <?php op_smt_include_stylesheets() ?>
-<?php if (Doctrine::getTable('SnsConfig')->get('customizing_css')): ?>
-<link rel="stylesheet" type="text/css" href="<?php echo url_for('@customizing_css') ?>" />
-<?php endif ?>
 <meta name="viewport" content="width=320px,user-scalable=no" />
 <?php if (opConfig::get('enable_jsonapi') && opToolkit::isSecurePage()): ?>
 <?php

From 1e96006334ae33e8a7dfce98581eed6636a3c0e9 Mon Sep 17 00:00:00 2001
From: Fumie Toyooka <dymojet@google.com>
Date: Fri, 27 Apr 2012 14:04:25 +0900
Subject: [PATCH 240/630] (fixes #3027)fixed support version in Japanese
 document.

---
 doc/ja/OpenPNE3_Version_Up_Guide.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ja/OpenPNE3_Version_Up_Guide.txt b/doc/ja/OpenPNE3_Version_Up_Guide.txt
index 49ae43b96..2adcd79f0 100644
--- a/doc/ja/OpenPNE3_Version_Up_Guide.txt
+++ b/doc/ja/OpenPNE3_Version_Up_Guide.txt
@@ -4,7 +4,7 @@ OpenPNE 3.8 バージョンアップ手順
 はじめに
 --------
 
-このドキュメントは、 OpenPNE 3.2.0 以上の全てのバージョンから OpenPNE 3.8.x へのバージョンアップ作業（メジャーバージョンアップ、およびマイナーバージョンアップ）の手順を示したものです。
+このドキュメントは、 OpenPNE 3.4.0 以上の全てのバージョンから OpenPNE 3.8.x へのバージョンアップ作業（メジャーバージョンアップ、およびマイナーバージョンアップ）の手順を示したものです。
 
 ※バージョンアップをおこなう前に、データベースのバックアップを取っておくことを強くお勧めします。
 

From bedf5a46d5b35b7736038cbe06177f16dab4b9c3 Mon Sep 17 00:00:00 2001
From: Fumie Toyooka <dymojet@google.com>
Date: Fri, 27 Apr 2012 14:06:27 +0900
Subject: [PATCH 241/630] (fixes #3027)fixed support version in English
 document.

---
 doc/en/OpenPNE3_Version_Up_Guide.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/en/OpenPNE3_Version_Up_Guide.txt b/doc/en/OpenPNE3_Version_Up_Guide.txt
index ce2cf18ea..64c22b8e1 100644
--- a/doc/en/OpenPNE3_Version_Up_Guide.txt
+++ b/doc/en/OpenPNE3_Version_Up_Guide.txt
@@ -4,7 +4,7 @@ OpenPNE3.8 Update Process
 Introduction
 ------------
 
-This document is for all of the version OpenPNE 3.2.0 or later to OpenPNE 3.8.x.
+This document is for all of the version OpenPNE 3.4.0 or later to OpenPNE 3.8.x.
 
 ※You should backup database before updating.
 

From 907f2da2d583950ee507f8dc9f74fa69c6e6dacd Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 27 Apr 2012 17:33:10 +0900
Subject: [PATCH 242/630] fixed internetless install option. (fixes #3012, BP
 from #3011)

---
 lib/task/openpneFastInstallTask.class.php | 4 ++++
 lib/task/openpneInstallTask.class.php     | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/lib/task/openpneFastInstallTask.class.php b/lib/task/openpneFastInstallTask.class.php
index c9c6142ee..71392cc40 100644
--- a/lib/task/openpneFastInstallTask.class.php
+++ b/lib/task/openpneFastInstallTask.class.php
@@ -109,6 +109,10 @@ protected function doInstall($dbms, $username, $password, $hostname, $port, $dbn
     {
       $this->installPlugins();
     }
+    else
+    {
+      $pluginManager = new opPluginManager($this->dispatcher, null, null);
+    }
     @$this->fixPerms();
     @$this->clearCache();
     $this->configureDatabase($dbms, $username, $password, $hostname, $port, $dbname, $sock, $options);
diff --git a/lib/task/openpneInstallTask.class.php b/lib/task/openpneInstallTask.class.php
index 33ca2bf6a..cd385baa5 100644
--- a/lib/task/openpneInstallTask.class.php
+++ b/lib/task/openpneInstallTask.class.php
@@ -141,6 +141,10 @@ protected function doInstall($dbms, $username, $password, $hostname, $port, $dbn
     {
       $this->installPlugins();
     }
+    else
+    {
+      $pluginManager = new opPluginManager($this->dispatcher, null, null);
+    }
     @$this->fixPerms();
     @$this->clearCache();
     if (!$options['redo'])

From 6b17ec52525c9ae6659ae388226a4b4fe91c655b Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 27 Apr 2012 17:36:34 +0900
Subject: [PATCH 243/630] added description of JSON API setting on pc_backend
 (fixes #3014, BP from #3013)

---
 lib/config/config/sns_config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/config/config/sns_config.yml b/lib/config/config/sns_config.yml
index ef3b4f9a6..4ea8da87b 100644
--- a/lib/config/config/sns_config.yml
+++ b/lib/config/config/sns_config.yml
@@ -178,6 +178,7 @@ advanced:
   enable_jsonapi:
     Name:      "enable_jsonapi"
     Caption:   "JSON API 使用設定"
+    Help:      "JSON API を有効にするかを設定します。<br /><span style=\"color: #FF0000;\">【警告】この設定をOFFにするとPC版やスマートフォン版の一部機能が利用できなくなります。設定には十分注意してください。</span>"
     FormType:  "radio"
     ValueType: "text"
     IsRequired: true

From aa32d958cfc13ba2f057279c30ee37c9d7c4a155 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Fri, 27 Apr 2012 18:00:25 +0900
Subject: [PATCH 244/630] (fixes #2985, BP from #2984) add smartphone
 properties operation in opWebResponse

---
 lib/response/opWebResponse.class.php | 80 ++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/lib/response/opWebResponse.class.php b/lib/response/opWebResponse.class.php
index 3795a6374..2b308f8d5 100644
--- a/lib/response/opWebResponse.class.php
+++ b/lib/response/opWebResponse.class.php
@@ -22,6 +22,86 @@ class opWebResponse extends sfWebResponse
     $smtStylesheets = array(),
     $smtJavascripts = array();
 
+  /**
+   * Initializes this opWebResponse.
+   *
+   *  * charset:           The charset to use (utf-8 by default)
+   *  * content_type:      The content type (text/html by default)
+   *  * send_http_headers: Whether to send HTTP headers or not (true by default)
+   *  * http_protocol:     The HTTP protocol to use for the response (HTTP/1.0 by default)
+   *
+   * @param  sfEventDispatcher $dispatcher  An sfEventDispatcher instance
+   * @param  array             $options     An array of options
+   *
+   * @return bool true, if initialization completes successfully, otherwise false
+   *
+   * @throws <b>sfInitializationException</b> If an error occurs while initializing this sfResponse
+   *
+   * @see sfWebResponse->initialize()
+   */
+  public function initialize(sfEventDispatcher $dispatcher, $options = array())
+  {
+    parent::initialize($dispatcher, $options);
+
+    $this->smtJavascripts = array_combine($this->positions, array_fill(0, count($this->positions), array()));
+    $this->smtStylesheets = array_combine($this->positions, array_fill(0, count($this->positions), array()));
+  }
+
+  /**
+   * Copies all properties from a given opWebResponse object to the current one.
+   *
+   * @param sfWebResponse $response  An sfWebResponse instance
+   *
+   * @see sfWebResponse->copyProperties()
+   */
+  public function copyProperties(sfWebResponse $response)
+  {
+    parent::copyProperties($response);
+
+    if ($response instanceof opWebResponse)
+    {
+      $this->smtStylesheets = $response->getSmtStylesheets(self::RAW);
+      $this->smtJavascripts = $response->getSmtJavascripts(self::RAW);
+    }
+  }
+
+  /**
+   * Merges all properties from a given opWebResponse object to the current one.
+   *
+   * @param sfWebResponse $response  An sfWebResponse instance
+   *
+   * @see sfWebResponse->merge()
+   */
+  public function merge(sfWebResponse $response)
+  {
+    parent::merge($response);
+
+    if ($response instanceof opWebResponse)
+    {
+      foreach ($this->getPositions() as $position)
+      {
+        $this->smtJavascripts[$position] = array_merge($this->getSmtJavascripts($position), $response->getSmtJavascripts($position));
+        $this->smtStylesheets[$position] = array_merge($this->getSmtStylesheets($position), $response->getSmtStylesheets($position));
+      }
+    }
+  }
+
+  /**
+   * @see sfWebResponse
+   */
+  public function serialize()
+  {
+    return serialize(array($this->content, $this->statusCode, $this->statusText, $this->options, $this->headerOnly, $this->headers, $this->metas, $this->httpMetas, $this->stylesheets, $this->javascripts, $this->slots, $this->smtStylesheets, $this->smtJavascript));
+  }
+
+  /**
+   * @see sfWebResponse
+   */
+  public function unserialize($serialized)
+  {
+    list($this->content, $this->statusCode, $this->statusText, $this->options, $this->headerOnly, $this->headers, $this->metas, $this->httpMetas, $this->stylesheets, $this->javascripts, $this->slots, $this->smtStylesheets, $this->smtJavascript) = unserialize($serialized);
+  }
+
   public function getTitle()
   {
     $result = parent::getTitle();

From 84df1603ecd4b6928539c28b1f230bc8a640dd8c Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Fri, 27 Apr 2012 18:01:45 +0900
Subject: [PATCH 245/630] (fixes #2985, BP from #2984) removed unnessessary
 properties

---
 lib/response/opWebResponse.class.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/response/opWebResponse.class.php b/lib/response/opWebResponse.class.php
index 2b308f8d5..c9a466657 100644
--- a/lib/response/opWebResponse.class.php
+++ b/lib/response/opWebResponse.class.php
@@ -17,8 +17,6 @@
 class opWebResponse extends sfWebResponse
 {
   protected
-    $displayMember = null,
-    $displayCommunity = null,
     $smtStylesheets = array(),
     $smtJavascripts = array();
 

From ff864c9cda2aaa56def947494c49c45537a5d8c2 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 27 Apr 2012 18:30:47 +0900
Subject: [PATCH 246/630] added catalogue of advanced settings. (fixes #2895,
 BP from #3010)

---
 apps/pc_backend/i18n/messages.ja.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/pc_backend/i18n/messages.ja.xml b/apps/pc_backend/i18n/messages.ja.xml
index 664c46e0d..1ef26bdd7 100644
--- a/apps/pc_backend/i18n/messages.ja.xml
+++ b/apps/pc_backend/i18n/messages.ja.xml
@@ -1469,6 +1469,10 @@
         <source>Full Size</source>
         <target>フルサイズ</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>Advanced Settings</source>
+        <target>上級者向け設定</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>

From 8c2fc8d1f19cad01ce2460ea302e3ade5b55a03f Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 27 Apr 2012 18:33:43 +0900
Subject: [PATCH 247/630] fixed for coding standards (fixes #2895, BP from
 #3010)

---
 apps/pc_backend/modules/advanced/templates/configSuccess.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/pc_backend/modules/advanced/templates/configSuccess.php b/apps/pc_backend/modules/advanced/templates/configSuccess.php
index ba447ba0a..80af5d6a2 100644
--- a/apps/pc_backend/modules/advanced/templates/configSuccess.php
+++ b/apps/pc_backend/modules/advanced/templates/configSuccess.php
@@ -11,7 +11,7 @@
 
 <p><?php echo __('※「設定変更」ボタンを押すと設定が反映されます。') ?></p>
 
-<?php if ($category === 'authentication') : ?>
+<?php if ('authentication' === $category) : ?>
 <p><?php echo __('※認証に関する個別の設定は、「プラグイン設定」からおこなってください。') ?></p>
 <?php endif; ?>
 

From 16efcc8734ee3544367217bf3b2a4cf7847804dc Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 27 Apr 2012 18:50:53 +0900
Subject: [PATCH 248/630] added opAuthMailAddressPlugin (refs #3044, BP from
 #2976)

---
 .gitignore                                    |   1 +
 plugins/opAuthMailAddressPlugin/LICENSE       | 202 ++++++++++++++++++
 .../apps/mobile_frontend/i18n/messages.ja.xml |  23 ++
 .../actions/actions.class.php                 |  63 ++++++
 .../actions/components.class.php              |  21 ++
 .../opAuthMailAddress/config/security.yml     |   2 +
 .../templates/_registerBox.php                |  11 +
 .../templates/helpLoginErrorSuccess.php       |   5 +
 .../passwordRecoveryCompleteSuccess.php       |   3 +
 .../templates/passwordRecoverySuccess.php     |   3 +
 .../templates/registerError.php               |   1 +
 .../templates/requestRegisterURLInput.php     |   8 +
 .../mobile_mail_frontend/config/routing.yml   |   5 +
 .../mobile_mail_frontend/i18n/messages.ja.xml |  16 ++
 .../actions/actions.class.php                 |  63 ++++++
 .../templates/loginSuccess.php                |   5 +
 .../actions/actions.class.php                 |  39 ++++
 .../templates/indexSuccess.php                |   9 +
 .../apps/pc_frontend/i18n/messages.ja.xml     |  19 ++
 .../actions/actions.class.php                 |  75 +++++++
 .../actions/components.class.php              |  21 ++
 .../opAuthMailAddress/config/security.yml     |   2 +
 .../templates/_registerBox.php                |  16 ++
 .../templates/helpLoginErrorSuccess.php       |   9 +
 .../passwordRecoveryCompleteSuccess.php       |   4 +
 .../templates/passwordRecoverySuccess.php     |   1 +
 .../templates/registerError.php               |   6 +
 .../templates/requestRegisterURLInput.php     |   8 +
 .../templates/requestRegisterURLSuccess.php   |   5 +
 .../opAuthMailAddressPlugin/config/auth.yml   |  36 ++++
 .../config/member_config.yml                  |  32 +++
 .../opAuthMailAddressPlugin/dependencies.yml  |  22 ++
 .../i18n/messages.ja.xml                      | 115 ++++++++++
 .../opAuthMailAddressPluginAction.class.php   |  62 ++++++
 .../MemberConfigSecretQuestionForm.class.php  |  75 +++++++
 .../opAuthConfigFormMailAddress.class.php     |  20 ++
 .../form/opAuthLoginFormMailAddress.class.php |  56 +++++
 ...uthMailAddressPasswordChangeForm.class.php |  48 +++++
 ...hMailAddressPasswordRecoveryForm.class.php | 104 +++++++++
 .../opAuthRegisterFormMailAddress.class.php   |  90 ++++++++
 .../form/opRequestRegisterURLForm.class.php   | 144 +++++++++++++
 .../user/opAuthAdapterMailAddress.class.php   | 103 +++++++++
 .../mail/mobile/_notifyRegisterURL.php        |  16 ++
 .../mail/mobile/_passwordRecovery.php         |   5 +
 .../templates/mail/pc/_notifyRegisterURL.php  |  18 ++
 .../templates/mail/pc/_passwordRecovery.php   |   5 +
 46 files changed, 1597 insertions(+)
 create mode 100644 plugins/opAuthMailAddressPlugin/LICENSE
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/mobile_frontend/i18n/messages.ja.xml
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/actions/actions.class.php
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/actions/components.class.php
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/config/security.yml
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/templates/_registerBox.php
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/templates/helpLoginErrorSuccess.php
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/templates/passwordRecoveryCompleteSuccess.php
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/templates/passwordRecoverySuccess.php
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/templates/registerError.php
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/templates/requestRegisterURLInput.php
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/mobile_mail_frontend/config/routing.yml
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/mobile_mail_frontend/i18n/messages.ja.xml
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/mobile_mail_frontend/modules/opAuthMailAddress/actions/actions.class.php
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/mobile_mail_frontend/modules/opAuthMailAddress/templates/loginSuccess.php
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/pc_backend/modules/opAuthMailAddressPlugin/actions/actions.class.php
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/pc_backend/modules/opAuthMailAddressPlugin/templates/indexSuccess.php
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/pc_frontend/i18n/messages.ja.xml
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/actions/actions.class.php
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/actions/components.class.php
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/config/security.yml
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/_registerBox.php
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/helpLoginErrorSuccess.php
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/passwordRecoveryCompleteSuccess.php
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/passwordRecoverySuccess.php
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/registerError.php
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/requestRegisterURLInput.php
 create mode 100644 plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/requestRegisterURLSuccess.php
 create mode 100644 plugins/opAuthMailAddressPlugin/config/auth.yml
 create mode 100644 plugins/opAuthMailAddressPlugin/config/member_config.yml
 create mode 100644 plugins/opAuthMailAddressPlugin/dependencies.yml
 create mode 100644 plugins/opAuthMailAddressPlugin/i18n/messages.ja.xml
 create mode 100644 plugins/opAuthMailAddressPlugin/lib/action/opAuthMailAddressPluginAction.class.php
 create mode 100644 plugins/opAuthMailAddressPlugin/lib/form/MemberConfigSecretQuestionForm.class.php
 create mode 100644 plugins/opAuthMailAddressPlugin/lib/form/opAuthConfigFormMailAddress.class.php
 create mode 100644 plugins/opAuthMailAddressPlugin/lib/form/opAuthLoginFormMailAddress.class.php
 create mode 100644 plugins/opAuthMailAddressPlugin/lib/form/opAuthMailAddressPasswordChangeForm.class.php
 create mode 100644 plugins/opAuthMailAddressPlugin/lib/form/opAuthMailAddressPasswordRecoveryForm.class.php
 create mode 100644 plugins/opAuthMailAddressPlugin/lib/form/opAuthRegisterFormMailAddress.class.php
 create mode 100644 plugins/opAuthMailAddressPlugin/lib/form/opRequestRegisterURLForm.class.php
 create mode 100644 plugins/opAuthMailAddressPlugin/lib/user/opAuthAdapterMailAddress.class.php
 create mode 100644 plugins/opAuthMailAddressPlugin/templates/mail/mobile/_notifyRegisterURL.php
 create mode 100644 plugins/opAuthMailAddressPlugin/templates/mail/mobile/_passwordRecovery.php
 create mode 100644 plugins/opAuthMailAddressPlugin/templates/mail/pc/_notifyRegisterURL.php
 create mode 100644 plugins/opAuthMailAddressPlugin/templates/mail/pc/_passwordRecovery.php

diff --git a/.gitignore b/.gitignore
index 81b46483f..72525e785 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ lib/form/doctrine/op*Plugin
 web/cache/*
 log/*
 plugins/op*
+!plugins/opAuthMailAddressPlugin
 !plugins/opSkinBasicPlugin
 !plugins/opSkinClassicPlugin
 plugins/.*
diff --git a/plugins/opAuthMailAddressPlugin/LICENSE b/plugins/opAuthMailAddressPlugin/LICENSE
new file mode 100644
index 000000000..d64569567
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
diff --git a/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/i18n/messages.ja.xml b/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/i18n/messages.ja.xml
new file mode 100644
index 000000000..aaa8031a7
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/i18n/messages.ja.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" ?>
+<xliff version="1.0">
+  <file orginal="global" source-language="en" datatype="plaintext">
+    <body>
+      <trans-unit id="">
+        <source>E-mail Address Login</source>
+        <target>ﾒｰﾙｱﾄﾞﾚｽﾛｸﾞｲﾝ</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Registration with your e-mail address</source>
+        <target>ﾒｰﾙｱﾄﾞﾚｽで登録する</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>You can go to the registration page by clicking the button below.</source>
+        <target>以下のﾎﾞﾀﾝをｸﾘｯｸすると、招待されたﾒｰﾙｱﾄﾞﾚｽで登録をおこないます。</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Go to the registration page</source>
+        <target>ﾌﾟﾛﾌｨｰﾙ入力ﾍﾟｰｼﾞへ</target>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/actions/actions.class.php b/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/actions/actions.class.php
new file mode 100644
index 000000000..6e3ce7c8e
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/actions/actions.class.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * opAuthMailAddress actions.
+ *
+ * @package    OpenPNE
+ * @subpackage opAuthMailAddressPlugin
+ * @author     Kousuke Ebihara <ebihara@tejimaya.com>
+ */
+class opAuthMailAddressActions extends opAuthMailAddressPluginAction
+{
+  public function executeRequestRegisterURL($request)
+  {
+    $adapter = new opAuthAdapterMailAddress('MailAddress');
+    if ($adapter->getAuthConfig('invite_mode') < 2)
+    {
+      $this->forward404();
+    }
+
+    $this->forward404Unless(opToolkit::isEnabledRegistration());
+
+    return sfView::INPUT;
+  }
+
+  public function executeRegister($request)
+  {
+    $this->getUser()->setCurrentAuthMode('MailAddress');
+
+    $token = $request->getParameter('token');
+    $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndValue('register_token', $token);
+    $this->forward404Unless($memberConfig, 'This URL is invalid.');
+
+    opActivateBehavior::disable();
+    $authMode = $memberConfig->getMember()->getConfig('register_auth_mode');
+    $mobileAddressPre = $memberConfig->getMember()->getConfig('mobile_address_pre');
+    opActivateBehavior::enable();
+
+    if ('MobileUID' === $authMode)
+    {
+      $authMode = 'MailAddress';
+    }
+    $this->forward404Unless($authMode === $this->getUser()->getCurrentAuthMode());
+
+    if (!$mobileAddressPre)
+    {
+      
+      return sfView::ERROR;
+    }
+
+    $this->getUser()->setMemberId($memberConfig->getMemberId());
+    $this->getUser()->setIsSNSRegisterBegin(true);
+
+    $this->redirect('member/registerInput?token='.$token);
+  }
+}
diff --git a/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/actions/components.class.php b/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/actions/components.class.php
new file mode 100644
index 000000000..05ca643ec
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/actions/components.class.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+class opAuthMailAddressComponents extends sfComponents
+{
+  public function executeRegisterBox($request)
+  {
+    $token = $request->getParameter('token');
+    $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndValue('register_token', $token);
+    opActivateBehavior::disable();
+    $this->mobileAddressPre = $memberConfig->getMember()->getConfig('mobile_address_pre');
+    opActivateBehavior::enable();
+  }
+}
diff --git a/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/config/security.yml b/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/config/security.yml
new file mode 100644
index 000000000..dd636cd03
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/config/security.yml
@@ -0,0 +1,2 @@
+registerEnd:
+  is_secure: false
diff --git a/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/templates/_registerBox.php b/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/templates/_registerBox.php
new file mode 100644
index 000000000..2fe78b8d6
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/templates/_registerBox.php
@@ -0,0 +1,11 @@
+<?php if (!$mobileAddressPre): ?>
+<?php echo __('Can access this registration URL with pc only.') ?>
+<?php else: ?>
+<?php op_include_parts('ButtonBox', 'opAuthMailAddressPluginRegisterBox', array(
+  'title'  => __('Registration with your e-mail address'),
+  'body'   => __('You can go to the registration page by clicking the button below.'),
+  'button' => __('Go to the registration page'),
+  'url'    => url_for($sf_user->getRegisterInputAction()),
+  'method' => 'get',
+)) ?>
+<?php endif; ?>
diff --git a/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/templates/helpLoginErrorSuccess.php b/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/templates/helpLoginErrorSuccess.php
new file mode 100644
index 000000000..ec9a14206
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/templates/helpLoginErrorSuccess.php
@@ -0,0 +1,5 @@
+<?php op_mobile_page_title(__('Do you forget your password?')) ?>
+<?php echo __('Please click the following button to start the password recovery process.'); ?><br>
+<center>
+<?php echo link_to(__('Go to Password Recovery Page'), 'opAuthMailAddress/passwordRecovery') ?>
+</center>
diff --git a/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/templates/passwordRecoveryCompleteSuccess.php b/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/templates/passwordRecoveryCompleteSuccess.php
new file mode 100644
index 000000000..e157b8c67
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/templates/passwordRecoveryCompleteSuccess.php
@@ -0,0 +1,3 @@
+<?php op_mobile_page_title(__('Password Recovery')) ?>
+<center><?php echo __('Please input your new password.') ?><br></center>
+<?php echo op_include_form('passowrdResetForm', $form) ?>
diff --git a/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/templates/passwordRecoverySuccess.php b/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/templates/passwordRecoverySuccess.php
new file mode 100644
index 000000000..520a3cb27
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/templates/passwordRecoverySuccess.php
@@ -0,0 +1,3 @@
+<?php op_mobile_page_title(__('Password Recovery')) ?>
+
+<?php echo op_include_form('passwordRecovery', $form) ?>
diff --git a/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/templates/registerError.php b/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/templates/registerError.php
new file mode 100644
index 000000000..8422d1adc
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/templates/registerError.php
@@ -0,0 +1 @@
+<?php echo __('Can access this registration URL with pc only.') ?>
diff --git a/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/templates/requestRegisterURLInput.php b/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/templates/requestRegisterURLInput.php
new file mode 100644
index 000000000..c97d61410
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/templates/requestRegisterURLInput.php
@@ -0,0 +1,8 @@
+<?php include_customizes('inputForm', 'top') ?>
+<p>新規登録をするには以下のﾘﾝｸから、本文を入力せずにﾒｰﾙを送信してください。</p>
+<?php include_customizes('inputForm', 'formTop') ?>
+<br>
+[i:106]<?php echo op_mail_to('register_sns', array(), 'ﾒｰﾙで登録') ?>
+<br>
+<?php include_customizes('inputForm', 'formBottom') ?>
+<?php include_customizes('inputForm', 'bottom') ?>
diff --git a/plugins/opAuthMailAddressPlugin/apps/mobile_mail_frontend/config/routing.yml b/plugins/opAuthMailAddressPlugin/apps/mobile_mail_frontend/config/routing.yml
new file mode 100644
index 000000000..0dffce63d
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/mobile_mail_frontend/config/routing.yml
@@ -0,0 +1,5 @@
+register_sns:
+  url: get
+  class: opMailRoute
+  options: { non_auth: true } 
+  param:   { module: opAuthMailAddress, action: register }
diff --git a/plugins/opAuthMailAddressPlugin/apps/mobile_mail_frontend/i18n/messages.ja.xml b/plugins/opAuthMailAddressPlugin/apps/mobile_mail_frontend/i18n/messages.ja.xml
new file mode 100644
index 000000000..7366c5357
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/mobile_mail_frontend/i18n/messages.ja.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<xliff version="1.0">
+  <file orginal="global" source-language="en" datatype="plaintext">
+    <body>
+      <trans-unit id=""> 
+        <source>[%1%]Information of login page</source> 
+        <target>[%1%]ログインページのお知らせ</target> 
+      </trans-unit>
+      <trans-unit id=""> 
+        <source>Please access the following URL to login.</source> 
+        <target>以下のURLにアクセスしてログインしてください。</target> 
+      </trans-unit> 
+    </body>
+  </file>
+</xliff>
+
diff --git a/plugins/opAuthMailAddressPlugin/apps/mobile_mail_frontend/modules/opAuthMailAddress/actions/actions.class.php b/plugins/opAuthMailAddressPlugin/apps/mobile_mail_frontend/modules/opAuthMailAddress/actions/actions.class.php
new file mode 100644
index 000000000..29345ebbb
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/mobile_mail_frontend/modules/opAuthMailAddress/actions/actions.class.php
@@ -0,0 +1,63 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * opAuthMailAddress actions.
+ *
+ * @package    OpenPNE
+ * @subpackage opAuthMailAddressPlugin
+ * @author     Kousuke Ebihara <ebihara@tejimaya.com>
+ * @author     Shogo Kawahara <kawahara@tejimaya.net>
+ */
+class opAuthMailAddressActions extends sfActions
+{
+ /**
+  * Executes register
+  *
+  * @param sfWebRequest A request object
+  */
+  public function executeRegister(sfWebRequest $request)
+  {
+    if ($this->getRoute()->getMember())
+    {
+      $this->forward('opAuthMailAddress', 'login');
+    }
+
+    $adapter = new opAuthAdapterMailAddress('MailAddress');
+    if ($adapter->getAuthConfig('invite_mode') < 2)
+    {
+      return sfView::NONE;
+    }
+
+    $message = $request->getMailMessage();
+
+    $this->form = new opRequestRegisterURLForm(null, array('authMode' => 'MailAddress'));
+    $this->form->bind(array('mail_address' => $message->from));
+    if ($this->form->isValid())
+    {
+      $this->form->sendMail();
+    }
+
+    return sfView::NONE;
+  }
+
+ /**
+  * Executes login
+  *
+  * @param sfWebRequest A request object
+  */
+  public function executeLogin(sfWebRequest $request)
+  {
+    if (!$this->getRoute()->getMember())
+    {
+      $this->forward('opAuthMailAddress', 'register');
+    }
+  }
+}
diff --git a/plugins/opAuthMailAddressPlugin/apps/mobile_mail_frontend/modules/opAuthMailAddress/templates/loginSuccess.php b/plugins/opAuthMailAddressPlugin/apps/mobile_mail_frontend/modules/opAuthMailAddress/templates/loginSuccess.php
new file mode 100644
index 000000000..070b2cf21
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/mobile_mail_frontend/modules/opAuthMailAddress/templates/loginSuccess.php
@@ -0,0 +1,5 @@
+<?php $sf_context->getResponse()->setTitle(__('[%1%]Information of login page', array('%1%' => $op_config['sns_name']))); ?>
+<?php echo __('Please access the following URL to login.') ?>
+
+<?php $_SERVER['SCRIPT_NAME'] = '/index.php' ?>
+<?php echo sfConfig::get('op_base_url').app_url_for('mobile_frontend', '@homepage', false) ?>
diff --git a/plugins/opAuthMailAddressPlugin/apps/pc_backend/modules/opAuthMailAddressPlugin/actions/actions.class.php b/plugins/opAuthMailAddressPlugin/apps/pc_backend/modules/opAuthMailAddressPlugin/actions/actions.class.php
new file mode 100644
index 000000000..43d9f9768
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/pc_backend/modules/opAuthMailAddressPlugin/actions/actions.class.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * opAuthMailAddressPlugin actions.
+ *
+ * @package    OpenPNE
+ * @subpackage opAuthMailAddressPlugin
+ * @author     Kousuke Ebihara <ebihara@tejimaya.com>
+ */
+class opAuthMailAddressPluginActions extends sfActions
+{
+ /**
+  * Executes index action
+  *
+  * @param sfRequest $request A request object
+  */
+  public function executeIndex(sfWebRequest $request)
+  {
+    $adapter = new opAuthAdapterMailAddress('MailAddress');
+    $this->form = $adapter->getAuthConfigForm();
+    if ($request->isMethod(sfWebRequest::POST))
+    {
+      $this->form->bind($request->getParameter('auth'.$adapter->getAuthModeName()));
+      if ($this->form->isValid())
+      {
+        $this->form->save();
+        $this->redirect('opAuthMailAddressPlugin/index');
+      }
+    }
+  }
+}
diff --git a/plugins/opAuthMailAddressPlugin/apps/pc_backend/modules/opAuthMailAddressPlugin/templates/indexSuccess.php b/plugins/opAuthMailAddressPlugin/apps/pc_backend/modules/opAuthMailAddressPlugin/templates/indexSuccess.php
new file mode 100644
index 000000000..003cb1d31
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/pc_backend/modules/opAuthMailAddressPlugin/templates/indexSuccess.php
@@ -0,0 +1,9 @@
+<h2>プラグイン設定</h2>
+<form action="<?php echo url_for('opAuthMailAddressPlugin/index') ?>" method="post">
+<table>
+<?php echo $form ?>
+<tr>
+<td colspan="2"><input type="submit" value="<?php echo __('設定変更') ?>" /></td>
+</tr>
+</table>
+</form>
diff --git a/plugins/opAuthMailAddressPlugin/apps/pc_frontend/i18n/messages.ja.xml b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/i18n/messages.ja.xml
new file mode 100644
index 000000000..8bf63a3b2
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/i18n/messages.ja.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" ?>
+<xliff version="1.0">
+  <file orginal="global" source-language="en" datatype="plaintext">
+    <body>
+      <trans-unit id="">
+        <source>Registration with your e-mail address</source>
+        <target>メールアドレスで登録する</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>You can go to the registration page by clicking the button below.</source>
+        <target>以下のボタンをクリックすると、招待されたメールアドレスで登録をおこないます。</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Go to the registration page</source>
+        <target>プロフィール入力ページへ</target>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/actions/actions.class.php b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/actions/actions.class.php
new file mode 100644
index 000000000..f33d3d90a
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/actions/actions.class.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * opAuthMailAddress actions.
+ *
+ * @package    OpenPNE
+ * @subpackage action
+ * @author     Kousuke Ebihara <ebihara@tejimaya.com>
+ */
+class opAuthMailAddressActions extends opAuthMailAddressPluginAction
+{
+  public function executeRequestRegisterURL($request)
+  {
+    $adapter = new opAuthAdapterMailAddress('MailAddress');
+    if ($adapter->getAuthConfig('invite_mode') < 2)
+    {
+      $this->forward404();
+    }
+
+    $this->forward404Unless(opToolkit::isEnabledRegistration());
+
+    $this->form = new opRequestRegisterURLForm(null, array('authMode' => 'MailAddress'));
+    if ($request->isMethod('post'))
+    {
+      $this->form->bind($request->getParameter('request_register_url'));
+      if ($this->form->isValid())
+      {
+        $this->form->sendMail();
+
+        return sfView::SUCCESS;
+      }
+    }
+
+    return sfView::INPUT;
+  }
+
+  public function executeRegister($request)
+  {
+    $this->getUser()->setCurrentAuthMode('MailAddress');
+
+    $token = $request->getParameter('token');
+    $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndValue('register_token', $token);
+    $this->forward404Unless($memberConfig, 'This URL is invalid.');
+
+    opActivateBehavior::disable();
+    $authMode = $memberConfig->getMember()->getConfig('register_auth_mode');
+    $pcAddressPre = $memberConfig->getMember()->getConfig('pc_address_pre');
+    opActivateBehavior::enable();
+
+    if ('MobileUID' === $authMode)
+    {
+      $authMode = 'MailAddress';
+    }
+    $this->forward404Unless($authMode === $this->getUser()->getCurrentAuthMode());
+
+    if (!$pcAddressPre)
+    {
+      
+      return sfView::ERROR;
+    }
+
+    $this->getUser()->setMemberId($memberConfig->getMemberId());
+    $this->getUser()->setIsSNSRegisterBegin(true);
+
+    $this->redirect('member/registerInput?token='.$token);
+  }
+}
diff --git a/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/actions/components.class.php b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/actions/components.class.php
new file mode 100644
index 000000000..48c15dd6f
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/actions/components.class.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+class opAuthMailAddressComponents extends sfComponents
+{
+  public function executeRegisterBox($request)
+  {
+    $token = $request->getParameter('token');
+    $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndValue('register_token', $token);
+    opActivateBehavior::disable();
+    $this->pcAddressPre = $memberConfig->getMember()->getConfig('pc_address_pre');
+    opActivateBehavior::enable();
+  }
+}
diff --git a/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/config/security.yml b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/config/security.yml
new file mode 100644
index 000000000..dd636cd03
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/config/security.yml
@@ -0,0 +1,2 @@
+registerEnd:
+  is_secure: false
diff --git a/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/_registerBox.php b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/_registerBox.php
new file mode 100644
index 000000000..957e84c73
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/_registerBox.php
@@ -0,0 +1,16 @@
+<?php if (!$pcAddressPre): ?>
+<?php
+$options = array(
+  'title' => __('Errors'),
+);
+op_include_box('registerError', __('Can access this registration URL with mobile only.'), $options);
+?>
+<?php else: ?>
+<?php op_include_parts('ButtonBox', 'opAuthMailAddressPluginRegisterBox', array(
+  'title'  => __('Registration with your e-mail address'),
+  'body'   => __('You can go to the registration page by clicking the button below.'),
+  'button' => __('Go to the registration page'),
+  'url'    => url_for($sf_user->getRegisterInputAction()),
+  'method' => 'get',
+)) ?>
+<?php endif; ?>
diff --git a/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/helpLoginErrorSuccess.php b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/helpLoginErrorSuccess.php
new file mode 100644
index 000000000..9d0c4e88d
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/helpLoginErrorSuccess.php
@@ -0,0 +1,9 @@
+<?php slot('_nav_to_password_recovery'); ?>
+<p><?php echo __('Please click the following button to start the password recovery process.'); ?></p>
+<form action="<?php echo url_for('opAuthMailAddress/passwordRecovery') ?>">
+<input type="submit" class="input_submit" value="<?php echo __('Go to Password Recovery Page') ?>" />
+</form>
+<?php end_slot(); ?>
+
+<?php op_include_box('NavToPasswordRecoveryBox', get_slot('_nav_to_password_recovery'), array('title' => __('Do you forget your password?'))); ?>
+
diff --git a/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/passwordRecoveryCompleteSuccess.php b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/passwordRecoveryCompleteSuccess.php
new file mode 100644
index 000000000..279df99ab
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/passwordRecoveryCompleteSuccess.php
@@ -0,0 +1,4 @@
+<?php echo op_include_form('passowrdResetForm', $form, array(
+  'title' => __('Password Recovery'),
+  'body' => __('Please input your new password.'),
+)) ?>
diff --git a/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/passwordRecoverySuccess.php b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/passwordRecoverySuccess.php
new file mode 100644
index 000000000..ff99e6912
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/passwordRecoverySuccess.php
@@ -0,0 +1 @@
+<?php echo op_include_form('passwordRecovery', $form, array('title' => __('Password Recovery'))) ?>
diff --git a/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/registerError.php b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/registerError.php
new file mode 100644
index 000000000..e356c63a7
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/registerError.php
@@ -0,0 +1,6 @@
+<?php
+$options = array(
+  'title' => __('Errors'),
+);
+op_include_box('registerError', __('Can access this registration URL with mobile only.'), $options);
+?>
diff --git a/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/requestRegisterURLInput.php b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/requestRegisterURLInput.php
new file mode 100644
index 000000000..4af40e84c
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/requestRegisterURLInput.php
@@ -0,0 +1,8 @@
+<?php slot('_request_register_url_body') ?>
+<?php echo __('Please input your e-mail address. Invitation for %1% will be sent to your e-mail address.', array('%1%' => $op_config['sns_name'])) ?>
+<?php end_slot(); ?>
+
+<?php echo op_include_form('requestRegisterURL', $form, array(
+  'title' => __('Register'),
+  'body' => get_slot('_request_register_url_body'),
+)); ?>
diff --git a/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/requestRegisterURLSuccess.php b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/requestRegisterURLSuccess.php
new file mode 100644
index 000000000..3cd2e8eb4
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/requestRegisterURLSuccess.php
@@ -0,0 +1,5 @@
+<?php slot('_register_success_box'); ?>
+<p><?php echo __('Sent you an invitation for %1%.', array('%1%' => $op_config['sns_name'])) ?></p>
+<p><?php echo __('Begin your registration from a URL in the mail.') ?></p>
+<?php end_slot(); ?>
+<?php op_include_box('requestSuccess', get_slot('_register_success_box'), array('title' => __('Register'))) ?>
diff --git a/plugins/opAuthMailAddressPlugin/config/auth.yml b/plugins/opAuthMailAddressPlugin/config/auth.yml
new file mode 100644
index 000000000..1625ecd93
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/config/auth.yml
@@ -0,0 +1,36 @@
+invite_mode:
+  Default: 1
+
+enable_mobile:
+  Default: 1
+
+enable_pc:
+  Default: 1
+
+self_invite_action:
+  Default: "opAuthMailAddress/requestRegisterURL"
+
+help_login_error_action:
+  Name: "self_invite_action"
+  Caption:   ""
+  FormType:  ""
+  ValueType: ""
+  IsConfig:   false
+  IsRequired: false
+  Default: "opAuthMailAddress/helpLoginError"
+
+is_check_multiple_address:
+  Name:      "is_check_multiple_address"
+  Caption:   "ログイン用メールアドレス設定"
+  FormType:  "radio"
+  ValueType: "text"
+  IsConfig:   true
+  IsRequired: true
+  Default:    0
+  Choices:
+    1: "PCメールアドレスと携帯メールアドレスの両方を受け付ける"
+    0: "PCメールアドレスと携帯メールアドレスのどちらか一方を受け付ける"
+
+auth_mode_caption:
+  IsConfig: 0
+  Default: "E-mail Address Login"
diff --git a/plugins/opAuthMailAddressPlugin/config/member_config.yml b/plugins/opAuthMailAddressPlugin/config/member_config.yml
new file mode 100644
index 000000000..1debde99f
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/config/member_config.yml
@@ -0,0 +1,32 @@
+secretQuestion:
+  _attributes:
+    caption:       "Secret Question Configuration"
+    enable_pc:     true
+    enable_mobile: true
+  secret_question:
+    Name:       "secret_question"
+    Caption:    "Secret Question"
+    FormType:   "select"
+    ValueType:  "integer"
+    IsRegist:   false
+    IsConfig:   true
+    IsUnique:   false
+    IsRequired: true
+    IsConfirm:  false
+    Choices:
+      1 : "What is your father's / mother's former name?"
+      2 : "What is last 5 digits of your driving license number?"
+      3 : "What is your first crush's name?"
+      4 : "What is your finished elementary school?"
+      5 : "What is region name of your domicile of origin?"
+
+  secret_answer:
+    Name:       "secret_answer"
+    Caption:    "Answer for Secret Question"
+    FormType:   "password"
+    ValueType:  "text"
+    IsRegist:   false
+    IsConfig:   true
+    IsUnique:   false
+    IsRequired: true
+    IsConfirm:  false
diff --git a/plugins/opAuthMailAddressPlugin/dependencies.yml b/plugins/opAuthMailAddressPlugin/dependencies.yml
new file mode 100644
index 000000000..789ac8bef
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/dependencies.yml
@@ -0,0 +1,22 @@
+# dependencies.yml
+#
+# Definition of the dependency on this plugin (プラグインの依存性を定義します)
+#
+# Note: Dependency with OpenPNE is supported from OpenPNE 3.5.1. Before 3.5.1, OpenPNE can't install a plugin that defines such a dependency.
+# (注意: OpenPNE との依存性は 3.5.1 からサポートされました。 3.5.1 以前のバージョンでは、 OpenPNE はそのような依存性が定義されたプラグインをインストールできません)
+#
+# See:  http://pear.php.net/manual/en/guide.developers.package2.dependencies.php
+
+# PEAR installer dependency (PEAR インストーラの依存性)
+pearinstaller:
+  min: 1.4.0
+
+# PHP dependency (PHP の依存性)
+php:
+  min: 5.2.3
+
+# Package dependency (パッケージの依存性)
+package:
+  openpne: # The dependency with OpenPNE. (OpenPNE との依存性)
+    channel: plugins.openpne.jp
+    min: "3.5.2dev"
diff --git a/plugins/opAuthMailAddressPlugin/i18n/messages.ja.xml b/plugins/opAuthMailAddressPlugin/i18n/messages.ja.xml
new file mode 100644
index 000000000..e2ba41348
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/i18n/messages.ja.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" ?>
+<xliff version="1.0">
+  <file orginal="global" source-language="en" datatype="plaintext">
+    <body>
+      <trans-unit id="">
+        <source>Do you forget your password?</source>
+        <target>パスワードを忘れた方</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Please click the following button to start the password recovery process.</source>
+        <target>以下のボタンをクリックして、パスワード再発行手続きをおこなってください。</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Go to Password Recovery Page</source>
+        <target>パスワード再発行ページへ</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Password Recovery</source>
+        <target>パスワード再発行</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>What is your father's / mother's former name?</source>
+        <target>母または父の旧姓は？</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>What is last 5 digits of your driving license number?</source>
+        <target>運転免許証番号の下 5 桁は？</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>What is your first crush's name?</source>
+        <target>初恋の人の名前は？</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>What is your finished elementary school?</source>
+        <target>卒業した小学校の名前は？</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>What is region name of your domicile of origin?</source>
+        <target>本籍地の都道府県名は？</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Your Secret Question</source>
+        <target>秘密の質問</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Your Answer for the Question</source>
+        <target>秘密の質問への答え</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Sent you a mail for completing your password recovery. If you cannot receive the mail, please retry a password recovery process.</source>
+        <target>パスワード再発行メールを送信しました。もしメールが受け取れない場合は、パスワード再発行手続きをもう一度やりなおしてください。</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Secret Question Configuration</source>
+        <target>秘密の質問の設定</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Secret Question</source>
+        <target>秘密の質問</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Answer for Secret Question</source>
+        <target>秘密の質問への答え</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Please input your e-mail address. Invitation for %1% will be sent to your e-mail address.</source>
+        <target>メールアドレスを入力してください。入力されたメールアドレス宛に %1% の招待状が送信されます。</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Sent you an invitation for %1%.</source>
+        <target>入力されたメールアドレス宛に %1% の招待状を送信しました。</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Begin your registration from a URL in the mail.</source>
+        <target>招待状に記載されたURLから登録をおこなってください。</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>We accepted your recovering password request.</source>
+        <target>パスワード再設定の要求を受け付けました。</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Please click the following URL and complete password recovery process.</source>
+        <target>下記の URL にアクセスし、パスワードの再設定をおこなってください。</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Please input your new password.</source>
+        <target>新しいパスワードを入力してください。</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Your password is now changed.</source>
+        <target>パスワードを変更しました。</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Hello! This is information from %1%.</source>
+        <target>こんにちは！ %1% からのお知らせです。</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>If you register(free) of member by the following URL,%br%you can participate in %1%.</source>
+        <target>下記のURLから、会員登録(無料)をおこなうと、%br%%1%に参加できます。</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>* Participate in %1%</source>
+        <target>■ %1% に参加する</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Can access this registration URL with pc only.</source>
+        <target>この登録用URLはPC専用です。</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Can access this registration URL with mobile only.</source>
+        <target>この登録用URLは携帯電話専用です。</target>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/plugins/opAuthMailAddressPlugin/lib/action/opAuthMailAddressPluginAction.class.php b/plugins/opAuthMailAddressPlugin/lib/action/opAuthMailAddressPluginAction.class.php
new file mode 100644
index 000000000..4f32d00e5
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/lib/action/opAuthMailAddressPluginAction.class.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * opAuthMailAddress actions.
+ *
+ * @package    OpenPNE
+ * @subpackage action
+ * @author     Kousuke Ebihara <ebihara@tejimaya.com>
+ */
+class opAuthMailAddressPluginAction extends opAuthAction
+{
+  public function executeHelpLoginError($request)
+  {
+  }
+
+  public function executePasswordRecovery($request)
+  {
+    $this->form = new opAuthMailAddressPasswordRecoveryForm();
+    if ($request->isMethod(sfWebRequest::POST))
+    {
+      $this->form->bind($request['password_recovery']);
+      if ($this->form->isValid())
+      {
+        $this->form->sendMail();
+
+        $this->getUser()->setFlash('notice', 'Sent you a mail for completing your password recovery. If you cannot receive the mail, please retry a password recovery process.');
+        $this->redirect('member/login');
+      }
+    }
+  }
+
+  public function executePasswordRecoveryComplete($request)
+  {
+    $this->forward404Unless(isset($request['id']) && isset($request['token']));
+    $this->member = Doctrine::getTable('Member')->find($request['id']);
+    $this->forward404Unless($this->member && $this->member->getConfig('password_recovery_token') === $request['token']);
+
+    $this->form = new opAuthMailAddressPasswordChangeForm();
+    $this->form->member = $this->member;
+    if ($request->isMethod(sfWebRequest::POST))
+    {
+      $this->form->bind($request['password_change']);
+      if ($this->form->isValid())
+      {
+        $this->form->save();
+
+        Doctrine::getTable('MemberConfig')->findOneByMemberIdAndName($this->member->id, 'password_recovery_token')->delete();
+
+        $this->getUser()->setFlash('notice', 'Your password is now changed.');
+        $this->redirect('member/login');
+      }
+    }
+  }
+}
diff --git a/plugins/opAuthMailAddressPlugin/lib/form/MemberConfigSecretQuestionForm.class.php b/plugins/opAuthMailAddressPlugin/lib/form/MemberConfigSecretQuestionForm.class.php
new file mode 100644
index 000000000..f73c32958
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/lib/form/MemberConfigSecretQuestionForm.class.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * MemberConfigSecretQuestionForm
+ *
+ * @package    OpenPNE
+ * @subpackage form
+ * @author     Kousuke Ebihara <ebihara@tejimaya.com>
+ */
+class MemberConfigSecretQuestionForm extends MemberConfigForm
+{
+  protected $category = 'secretQuestion';
+
+  public function configure()
+  {
+    $this->setWidget('now_password', new sfWidgetFormInputPassword());
+    $this->setValidator('now_password', new sfValidatorCallback(array('required' => true, 'callback' => array($this, 'isValidPassword'))));
+    $this->widgetSchema->setLabel('now_password', 'Your current password');
+
+    $this->validatorSchema->setPostValidator(
+      new sfValidatorCallback(array('callback' => array($this, 'filterAnswer')))
+    );
+  }
+
+  public function __construct(Member $member = null, $options = array(), $CSRFSecret = null)
+  {
+    parent::__construct($member, $options, $CSRFSecret);
+
+    // Hack for non-rendering secret answer
+    $this->widgetSchema['secret_answer']->setOption('type', 'text');
+  }
+
+  public function setDefault($name, $default)
+  {
+    if ('secret_answer' === $name)
+    {
+      return $this;
+    }
+
+    return parent::setDefault($name, $default);
+  }
+
+  public function filterAnswer($validator, $value)
+  {
+    $value['secret_answer'] = md5($value['secret_answer']);
+
+    return $value;
+  }
+
+  public function isValidPassword($validator, $value)
+  {
+    $member = sfContext::getInstance()->getUser()->getMember();
+    if (md5($value) !== Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId('password', $member->getId())->getValue())
+    {
+      throw new sfValidatorError(new sfValidatorPass(), 'invalid', array('value' => $value));
+    }
+
+    return $value;
+  }
+
+  public function save()
+  {
+    unset($this->values['now_password']);
+
+    parent::save();
+  }
+}
diff --git a/plugins/opAuthMailAddressPlugin/lib/form/opAuthConfigFormMailAddress.class.php b/plugins/opAuthMailAddressPlugin/lib/form/opAuthConfigFormMailAddress.class.php
new file mode 100644
index 000000000..1865a3c5a
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/lib/form/opAuthConfigFormMailAddress.class.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * opAuthConfigFormMailAddress represents a form to configuration.
+ *
+ * @package    OpenPNE
+ * @subpackage form
+ * @author     Kousuke Ebihara <ebihara@tejimaya.com>
+ */
+class opAuthConfigFormMailAddress extends opAuthConfigForm
+{
+}
diff --git a/plugins/opAuthMailAddressPlugin/lib/form/opAuthLoginFormMailAddress.class.php b/plugins/opAuthMailAddressPlugin/lib/form/opAuthLoginFormMailAddress.class.php
new file mode 100644
index 000000000..f1fbed24a
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/lib/form/opAuthLoginFormMailAddress.class.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * opAuthLoginFormMailAddress represents a form to login by one's E-mail address.
+ *
+ * @package    OpenPNE
+ * @subpackage form
+ * @author     Kousuke Ebihara <ebihara@tejimaya.com>
+ */
+class opAuthLoginFormMailAddress extends opAuthLoginForm
+{
+  public function configure()
+  {
+    $this->setWidgets(array(
+      'mail_address' => new sfWidgetFormInput(),
+      'password' => new sfWidgetFormInputPassword(),
+    ));
+
+    $this->setValidatorSchema(new sfValidatorSchema(array(
+      'mail_address' => new sfValidatorEmail(),
+      'password' => new sfValidatorString(),
+    )));
+
+    if ($this->getAuthAdapter()->getAuthConfig('is_check_multiple_address'))
+    {
+      $this->mergePostValidator(new sfValidatorOr(array(
+        new opAuthValidatorMemberConfigAndPassword(array('config_name' => 'mobile_address', 'field_name' => 'mail_address')),
+        new opAuthValidatorMemberConfigAndPassword(array('config_name' => 'pc_address', 'field_name' => 'mail_address')),
+      )));
+    }
+    else
+    {
+      if (sfConfig::get('app_is_mobile', false))
+      {
+        $configName = 'mobile_address';
+      }
+      else
+      {
+        $configName = 'pc_address';
+      }
+      $this->mergePostValidator(
+        new opAuthValidatorMemberConfigAndPassword(array('config_name' => $configName, 'field_name' => 'mail_address'))
+      );
+    }
+
+    parent::configure();
+  }
+}
diff --git a/plugins/opAuthMailAddressPlugin/lib/form/opAuthMailAddressPasswordChangeForm.class.php b/plugins/opAuthMailAddressPlugin/lib/form/opAuthMailAddressPasswordChangeForm.class.php
new file mode 100644
index 000000000..87ea8b5eb
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/lib/form/opAuthMailAddressPasswordChangeForm.class.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * opAuthMailAddressPasswordRecoveryForm
+ *
+ * @package    OpenPNE
+ * @subpackage form
+ * @author     Kousuke Ebihara <ebihara@tejimaya.com>
+ */
+class opAuthMailAddressPasswordChangeForm extends BaseForm
+{
+  public $member = null;
+
+  public function configure()
+  {
+    $this->setWidgets(array(
+      'password' => new sfWidgetFormInputPassword(),
+      'password_confirm' => new sfWidgetFormInputPassword(),
+    ));
+
+    $this->setValidators(array(
+      'password' => new opValidatorString(),
+      'password_confirm' => new opValidatorString(),
+    ));
+
+    $this->widgetSchema->setLabel('password_confirm', 'Password (Confirm)');
+    $this->widgetSchema->setNameFormat('password_change[%s]');
+
+    $this->validatorSchema->setPostValidator(
+      new sfValidatorSchemaCompare('password', '===', 'password_confirm')
+    );
+  }
+
+  public function save()
+  {
+    $this->member->setConfig('password', md5($this->getValue('password')));
+  }
+}
+
+
diff --git a/plugins/opAuthMailAddressPlugin/lib/form/opAuthMailAddressPasswordRecoveryForm.class.php b/plugins/opAuthMailAddressPlugin/lib/form/opAuthMailAddressPasswordRecoveryForm.class.php
new file mode 100644
index 000000000..b7b58e200
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/lib/form/opAuthMailAddressPasswordRecoveryForm.class.php
@@ -0,0 +1,104 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * opAuthMailAddressPasswordRecoveryForm
+ *
+ * @package    OpenPNE
+ * @subpackage form
+ * @author     Kousuke Ebihara <ebihara@tejimaya.com>
+ */
+class opAuthMailAddressPasswordRecoveryForm extends BaseForm
+{
+  protected $member = null;
+
+  public function configure()
+  {
+    $config = sfConfig::get('openpne_member_config');
+    $choices = $config['secret_question']['Choices'];
+
+    $this->setWidgets(array(
+      'mail_address' => new sfWidgetFormInput(),
+      'secret_question' => new sfWidgetFormChoice(array('choices' => $choices)),
+      'secret_answer' => new sfWidgetFormInput(),
+    ));
+
+    $this->setValidators(array(
+      'mail_address' => new sfValidatorEmail(),
+      'secret_question' => new sfValidatorChoice(array('choices' => array_keys($choices))),
+      'secret_answer' => new opValidatorString(),
+    ));
+
+    $this->widgetSchema->setLabels(array(
+      'secret_question' => 'Your Secret Question',
+      'secret_answer' => 'Your Answer for the Question',
+    ));
+
+    $this->validatorSchema->setPostValidator(
+      new sfValidatorCallback(array(
+        'callback' => array($this, 'checkSecretQuestion'),
+      ))
+    );
+
+    $this->widgetSchema->setNameFormat('password_recovery[%s]');
+  }
+
+  public function checkSecretQuestion($validator, $values, $arguments = array())
+  {
+    $configName = (opToolkit::isMobileEmailAddress($values['mail_address'])) ? 'mobile_address' : 'pc_address';
+    $memberConfig = Doctrine::getTable('MemberConfig')->findOneByNameAndValue($configName, $values['mail_address']);
+    if (!$memberConfig)
+    {
+      throw new sfValidatorError($validator, 'invalid');
+    }
+
+    $this->member = $memberConfig->Member;
+
+    if ($values['secret_question'] != $this->member->getConfig('secret_question'))
+    {
+      throw new sfValidatorError($validator, 'invalid');
+    }
+
+    // To keep backward compatibility with OpenPNE 1.x, your answer is checked as Shift-JIS too.
+    if (!in_array($this->member->getConfig('secret_answer'), array(md5($values['secret_answer']), md5(mb_convert_encoding($values['secret_answer'], 'SJIS-win', 'UTF-8')))))
+    {
+      throw new sfValidatorError($validator, 'invalid');
+    }
+
+    return $values;
+  }
+
+  public function saveConfig($name, $value)
+  {
+    if ('pc_address' === $name || 'mobile_address' === $name)
+    {
+      $this->savePreConfig($name, $value);
+      $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId($name.'_token', $this->member->getId(), true);
+      $token = $memberConfig->getValue();
+      $this->sendConfirmMail($token, $value, array(
+        'id'   => $this->member->getId(),
+        'type' => $name,
+      ));
+    }
+  }
+
+  public function sendMail()
+  {
+    $token = md5(opToolkit::generatePasswordString());
+    $this->member->setConfig('password_recovery_token', $token);
+    $params = array(
+      'token' => $token,
+      'id' => $this->member->id,
+      'subject' => '【'.opConfig::get('sns_name').'】パスワード再設定用URL発行のお知らせ',
+    );
+
+    sfOpenPNEMailSend::sendTemplateMail('passwordRecovery', $this->member->getEMailAddress(), opConfig::get('admin_mail_address'), $params);
+  }
+}
diff --git a/plugins/opAuthMailAddressPlugin/lib/form/opAuthRegisterFormMailAddress.class.php b/plugins/opAuthMailAddressPlugin/lib/form/opAuthRegisterFormMailAddress.class.php
new file mode 100644
index 000000000..1a1ddd5e6
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/lib/form/opAuthRegisterFormMailAddress.class.php
@@ -0,0 +1,90 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * opAuthRegisterFormMailAddress represents a form to register by E-mail Address.
+ *
+ * @package    OpenPNE
+ * @subpackage form
+ * @author     Kousuke Ebihara <ebihara@tejimaya.com>
+ */
+class opAuthRegisterFormMailAddress extends opAuthRegisterForm
+{
+  public function configure()
+  {
+    parent::configure();
+    $this->configForm->setMemberConfigWidget('secret_question');
+    $this->configForm->setMemberConfigWidget('secret_answer');
+
+    // Hack for non-rendering secret answer
+    $this->configForm->getWidget('secret_answer')->setOption('type', 'text');
+    
+    $this->mergePostValidator(new sfValidatorCallback(array('callback' => array($this, 'validateMemberConfig'))));
+  }
+
+  public function bindAll($request)
+  {
+    // this is just hack for limitation of MemberConfigForm
+    if (isset($request['member_config']['secret_answer']))
+    {
+      $memberConfig = $request['member_config'];
+      $memberConfig['secret_answer'] = md5($memberConfig['secret_answer']);
+      $request['member_config'] = $memberConfig;
+    }
+
+    parent::bindAll($request);
+  }
+
+  public function doSave()
+  {
+    if ($this->getMember()->getConfig('mobile_address') || $this->getMember()->getConfig('pc_address'))
+    {
+      return true;
+    }
+
+    if (sfConfig::get('app_is_mobile', false))
+    {
+      $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId('mobile_address_pre', $this->getMember()->getId());
+      $memberConfig->setName('mobile_address');
+    }
+    else
+    {
+      $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId('pc_address_pre', $this->getMember()->getId());
+      $memberConfig->setName('pc_address');
+    }
+
+    $memberConfig->save();
+
+    return $memberConfig;
+  }
+  
+  public function validateMemberConfig($validator, $values, $arguments = array())
+  {
+    if (sfConfig::get('app_is_mobile', false))
+    {
+      $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId('mobile_address_pre', $this->getMember()->getId());
+      if (!$memberConfig)
+      {
+        throw new sfValidatorError($validator, 'Can access this registration URL with pc only.');
+      }
+    }
+    else
+    {
+      $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId('pc_address_pre', $this->getMember()->getId());
+      if (!$memberConfig)
+      {
+        throw new sfValidatorError($validator, 'Can access this registration URL with mobile only.');
+      }
+    }
+
+    return $values;
+  }
+
+}
diff --git a/plugins/opAuthMailAddressPlugin/lib/form/opRequestRegisterURLForm.class.php b/plugins/opAuthMailAddressPlugin/lib/form/opRequestRegisterURLForm.class.php
new file mode 100644
index 000000000..4ee787f49
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/lib/form/opRequestRegisterURLForm.class.php
@@ -0,0 +1,144 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ *
+ *
+ * @package    opAuthMailAddressPlugin
+ * @subpackage form
+ * @author     Kousuke Ebihara <ebihara@tejimaya.com>
+ */
+class opRequestRegisterURLForm extends BaseForm
+{
+  protected
+    $doNotSend = false,
+    $member = null;
+
+  public function configure()
+  {
+    $this->disableLocalCSRFProtection();
+
+    $this->setWidget('mail_address', new sfWidgetFormInputText());
+    $this->setValidator('mail_address', new sfValidatorPass());
+
+    $callback = new sfValidatorCallback(array(
+        'callback' => array($this, 'validate'),
+    ));
+    $callback->setMessage('invalid', 'invalid e-mail address');
+    $this->validatorSchema->setPostValidator($callback);
+
+    if (sfConfig::get('op_is_use_captcha', false))
+    {
+      $this->embedForm('captcha', new opCaptchaForm());
+    }
+
+    $this->widgetSchema->setNameFormat('request_register_url[%s]');
+  }
+
+  public function validate($validator, $values, $arguments = array())
+  {
+    if (opToolkit::isMobileEmailAddress($values['mail_address']))
+    {
+      $mailValidator = new sfValidatorMobileEmail();
+      $values['mobile_address'] = $mailValidator->clean($values['mail_address']);
+      $mode = 'mobile';
+    }
+    else
+    {
+      $mailValidator = new opValidatorPCEmail();
+      $values['pc_address'] = $mailValidator->clean($values['mail_address']);
+      $mode = 'pc';
+    }
+
+    if (!opToolkit::isEnabledRegistration($mode))
+    {
+      throw new sfValidatorError($validator, 'invalid');
+    }
+
+    if (!empty($values['mobile_address']) && !$this->validateAddress('mobile_address', $values['mobile_address']))
+    {
+      $this->doNotSend = true;
+    }
+    if (!empty($values['pc_address']) && !$this->validateAddress('pc_address', $values['pc_address']))
+    {
+      $this->doNotSend = true;
+    }
+
+    return $values;
+  }
+
+  protected function validateAddress($configName, $configValue)
+  {
+    if ($config = Doctrine::getTable('MemberConfig')->retrieveByNameAndValue($configName, $configValue))
+    {
+      return false;
+    }
+    elseif ($config = Doctrine::getTable('MemberConfig')->retrieveByNameAndValue($configName.'_pre', $configValue))
+    {
+      $activation = opActivateBehavior::getEnabled();
+      opActivateBehavior::disable();
+
+      $this->member = $config->getMember();
+
+      if ($activation)
+      {
+        opActivateBehavior::enable();
+      }
+    }
+
+    return true;
+  }
+
+  public function sendMail()
+  {
+    if ($this->doNotSend)
+    {
+      return null;
+    }
+
+    $address = '';
+
+    $member = $this->member;
+    if (!$member)
+    {
+      $member = Doctrine::getTable('Member')->createPre();
+    }
+
+    if ($this->getValue('pc_address'))
+    {
+      $address = $this->getValue('pc_address');
+
+      $member->setConfig('pc_address_pre', $address);
+    }
+    elseif ($this->getValue('mobile_address'))
+    {
+      $address = $this->getValue('mobile_address');
+
+      $member->setConfig('mobile_address_pre', $address);
+    }
+
+    $token = $member->generateRegisterToken();
+
+    $authMode = $this->getOption('authMode', null);
+    if (!$authMode)
+    {
+      $authMode = sfContext::getInstance()->getUser()->getCurrentAuthMode();
+    }
+    $member->setConfig('register_auth_mode', $authMode);
+
+    $params = array(
+      'token'    => $token,
+      'authMode' => 'MailAddress',
+      'isMobile' => opToolkit::isMobileEmailAddress($address),
+      'subject' => opConfig::get('sns_name').'招待状',
+    );
+    opMailSend::sendTemplateMail('notifyRegisterURL', $address, opConfig::get('admin_mail_address'), $params);
+  }
+}
diff --git a/plugins/opAuthMailAddressPlugin/lib/user/opAuthAdapterMailAddress.class.php b/plugins/opAuthMailAddressPlugin/lib/user/opAuthAdapterMailAddress.class.php
new file mode 100644
index 000000000..5a3f19841
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/lib/user/opAuthAdapterMailAddress.class.php
@@ -0,0 +1,103 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * opAuthAdapterMailAddress will handle credential for E-mail address.
+ *
+ * @package    OpenPNE
+ * @subpackage user
+ * @author     Kousuke Ebihara <ebihara@tejimaya.com>
+ */
+class opAuthAdapterMailAddress extends opAuthAdapter
+{
+  protected $authModuleName = 'opAuthMailAddress';
+
+ /**
+  * @see opAuthAdapter::activate()
+  */
+  public function activate()
+  {
+    parent::activate();
+
+    $member = sfContext::getInstance()->getUser()->getMember();
+    if ($member)
+    {
+      if ($token = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId('mobile_address_token', $member->getId()))
+      {
+        $token->delete();
+      }
+
+      if ($token = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId('pc_address_token', $member->getId()))
+      {
+        $token->delete();
+      }
+    }
+
+    return $member;
+  }
+
+  /**
+   * Returns true if the current state is a beginning of register.
+   *
+   * @return bool returns true if the current state is a beginning of register, false otherwise
+   */
+  public function isRegisterBegin($member_id = null)
+  {
+    opActivateBehavior::disable();
+    $member = Doctrine::getTable('Member')->find((int)$member_id);
+    opActivateBehavior::enable();
+
+    if (!$member)
+    {
+      return false;
+    }
+
+    if (!Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId('pc_address_pre', $member->getId())
+      && !Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId('mobile_address_pre', $member->getId()))
+    {
+      return false;
+    }
+
+    if (!$member->getIsActive())
+    {
+      return true;
+    }
+    else
+    {
+      return false;
+    }
+  }
+
+  /**
+   * Returns true if the current state is a end of register.
+   *
+   * @return bool returns true if the current state is a end of register, false otherwise
+   */
+  public function isRegisterFinish($member_id = null)
+  {
+    opActivateBehavior::disable();
+    $data = Doctrine::getTable('Member')->find((int)$member_id);
+    opActivateBehavior::enable();
+
+    if (!$data || !$data->getName() || !$data->getProfiles())
+    {
+      return false;
+    }
+
+    if ($data->getIsActive())
+    {
+      return false;
+    }
+    else
+    {
+      return true;
+    }
+  }
+}
diff --git a/plugins/opAuthMailAddressPlugin/templates/mail/mobile/_notifyRegisterURL.php b/plugins/opAuthMailAddressPlugin/templates/mail/mobile/_notifyRegisterURL.php
new file mode 100644
index 000000000..eb1394f9e
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/templates/mail/mobile/_notifyRegisterURL.php
@@ -0,0 +1,16 @@
+<?php $snsName = $op_config['sns_name'] ?>
+<?php echo __('Hello! This is information from %1%.', array('%1%' => $snsName)) ?>
+
+<?php echo __('If you register(free) of member by the following URL,%br%you can participate in %1%.', array('%1%' => $snsName, '%br%' => "\n")) ?>
+
+<?php echo __('* Participate in %1%', array('%1%' => $snsName)) ?>
+
+<?php if ($isMobile) : ?>
+<?php echo app_url_for('mobile_frontend', sprintf('opAuthMailAddress/register?token=%s&authMode=%s', $token, $authMode), true) ?>
+
+<?php echo __('Can access this registration URL with mobile only.') ?>
+<?php else: ?>
+<?php echo app_url_for('pc_frontend', sprintf('opAuthMailAddress/register?token=%s&authMode=%s', $token, $authMode), true) ?>
+
+<?php echo __('Can access this registration URL with pc only.') ?>
+<?php endif; ?>
diff --git a/plugins/opAuthMailAddressPlugin/templates/mail/mobile/_passwordRecovery.php b/plugins/opAuthMailAddressPlugin/templates/mail/mobile/_passwordRecovery.php
new file mode 100644
index 000000000..83a10b78b
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/templates/mail/mobile/_passwordRecovery.php
@@ -0,0 +1,5 @@
+<?php echo __('We accepted your recovering password request.') ?>
+
+<?php echo __('Please click the following URL and complete password recovery process.') ?>
+
+<?php echo app_url_for('mobile_frontend', 'opAuthMailAddress/passwordRecoveryComplete?token='.$token.'&id='.$id, true) ?>
diff --git a/plugins/opAuthMailAddressPlugin/templates/mail/pc/_notifyRegisterURL.php b/plugins/opAuthMailAddressPlugin/templates/mail/pc/_notifyRegisterURL.php
new file mode 100644
index 000000000..482b78ff5
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/templates/mail/pc/_notifyRegisterURL.php
@@ -0,0 +1,18 @@
+<?php $snsName = $op_config['sns_name'] ?>
+<?php echo __('Hello! This is information from %1%.', array('%1%' => $snsName)) ?>
+
+<?php echo __('If you register(free) of member by the following URL,%br%you can participate in %1%.', array('%1%' => $snsName, '%br%' => "\n")) ?>
+
+<?php echo __('* Participate in %1%', array('%1%' => $snsName)) ?>
+
+
+
+<?php if ($isMobile) : ?>
+<?php echo app_url_for('mobile_frontend', sprintf('opAuthMailAddress/register?token=%s&authMode=%s', $token, $authMode), true) ?>
+
+<?php echo __('Can access this registration URL with mobile only.') ?>
+<?php else: ?>
+<?php echo app_url_for('pc_frontend', sprintf('opAuthMailAddress/register?token=%s&authMode=%s', $token, $authMode), true) ?>
+
+<?php echo __('Can access this registration URL with pc only.') ?>
+<?php endif; ?>
diff --git a/plugins/opAuthMailAddressPlugin/templates/mail/pc/_passwordRecovery.php b/plugins/opAuthMailAddressPlugin/templates/mail/pc/_passwordRecovery.php
new file mode 100644
index 000000000..a5e10f477
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/templates/mail/pc/_passwordRecovery.php
@@ -0,0 +1,5 @@
+<?php echo __('We accepted your recovering password request.') ?>
+
+<?php echo __('Please click the following URL and complete password recovery process.') ?>
+
+<?php echo app_url_for('pc_frontend', 'opAuthMailAddress/passwordRecoveryComplete?token='.$token.'&id='.$id, true) ?>

From 972b49ec2d158046e0d7c3fb2de04b58e7dd6b2b Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 27 Apr 2012 19:22:48 +0900
Subject: [PATCH 249/630] fixed method of using opPluginManager classes (fixes
 #3012, BP from #3011)

---
 lib/task/openpneFastInstallTask.class.php | 2 +-
 lib/task/openpneInstallTask.class.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/task/openpneFastInstallTask.class.php b/lib/task/openpneFastInstallTask.class.php
index 71392cc40..c29e319fe 100644
--- a/lib/task/openpneFastInstallTask.class.php
+++ b/lib/task/openpneFastInstallTask.class.php
@@ -111,7 +111,7 @@ protected function doInstall($dbms, $username, $password, $hostname, $port, $dbn
     }
     else
     {
-      $pluginManager = new opPluginManager($this->dispatcher, null, null);
+      new opPluginManager($this->dispatcher, null, null);
     }
     @$this->fixPerms();
     @$this->clearCache();
diff --git a/lib/task/openpneInstallTask.class.php b/lib/task/openpneInstallTask.class.php
index cd385baa5..c7de90436 100644
--- a/lib/task/openpneInstallTask.class.php
+++ b/lib/task/openpneInstallTask.class.php
@@ -143,7 +143,7 @@ protected function doInstall($dbms, $username, $password, $hostname, $port, $dbn
     }
     else
     {
-      $pluginManager = new opPluginManager($this->dispatcher, null, null);
+      new opPluginManager($this->dispatcher, null, null);
     }
     @$this->fixPerms();
     @$this->clearCache();

From 895d750da335fa27ba259b555ebf1f7f0187f91e Mon Sep 17 00:00:00 2001
From: Fumie Toyooka <dymojet@google.com>
Date: Fri, 27 Apr 2012 19:38:53 +0900
Subject: [PATCH 250/630] (fixes #3027)add description of the Advanced Setting
 in Japanese version up document.

---
 doc/ja/OpenPNE3_Version_Up_Guide.txt | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/doc/ja/OpenPNE3_Version_Up_Guide.txt b/doc/ja/OpenPNE3_Version_Up_Guide.txt
index 2adcd79f0..cd3a5a41e 100644
--- a/doc/ja/OpenPNE3_Version_Up_Guide.txt
+++ b/doc/ja/OpenPNE3_Version_Up_Guide.txt
@@ -114,4 +114,15 @@ http://www.openpne.jp/archives/5689/
   * 外部サービスとの接続設定
   * OpenID の設定
 
-
+* OpenPNE3.8.0 から管理画面の一部の機能が「上級者設定」に移動しています。移動した機能は以下の通りです。
+  * SNS設定＞一般的な設定
+    ・アクティビティ投稿設定
+    ・JSON API 使用設定
+    ・OpenID Provider 使用設定
+    ・デイリーニュース受信頻度の設定
+    ・Web 全体への年齢公開許可設定
+    ・メンバーのプロフィールページ公開範囲設定
+    ・リッチテキストエリア設定
+
+  * SNS設定＞携帯関連設定
+  * SNS設定＞APIキーの設定

From 0f4c0bb083612213ebbd6fb76d9c5d4275604c67 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 27 Apr 2012 19:58:30 +0900
Subject: [PATCH 251/630] added opAuthMailAddressPlugin version file (refs
 #3044, BP from #2976)

---
 plugins/opAuthMailAddressPlugin/package.xml | 332 ++++++++++++++++++++
 1 file changed, 332 insertions(+)
 create mode 100644 plugins/opAuthMailAddressPlugin/package.xml

diff --git a/plugins/opAuthMailAddressPlugin/package.xml b/plugins/opAuthMailAddressPlugin/package.xml
new file mode 100644
index 000000000..022c1cc11
--- /dev/null
+++ b/plugins/opAuthMailAddressPlugin/package.xml
@@ -0,0 +1,332 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package packagerversion="1.9.0" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0
+    http://pear.php.net/dtd/tasks-1.0.xsd
+    http://pear.php.net/dtd/package-2.0
+    http://pear.php.net/dtd/package-2.0.xsd">
+ <name>opAuthMailAddressPlugin</name>
+ <channel>plugins.openpne.jp</channel>
+ <summary>opAuthMailAddressPlugin</summary>
+ <description>opAuthMailAddressPlugin</description>
+ <lead>
+  <name>Kousuke Ebihara</name>
+  <user>ebihara</user>
+  <email />
+  <active>yes</active>
+ </lead>
+ <developer>
+  <name>Yuya Watanabe</name>
+  <user>watanabe</user>
+  <email />
+  <active>yes</active>
+ </developer>
+ <date>2011-12-08</date>
+ <time>13:51:21</time>
+ <version>
+  <release>1.3.5</release>
+  <api>1.3.5</api>
+ </version>
+ <stability>
+  <release>stable</release>
+  <api>stable</api>
+ </stability>
+ <license>apache</license>
+ <notes>
+Bug（バグ） #2598: 他の認証プラグインで「秘密の質問」の項目が表示されてしまう
+ </notes>
+ <contents>
+  <dir baseinstalldir="/" name="/">
+   <file baseinstalldir="/" md5sum="28614b57c6f574e9ad84b195a901bff6" name="apps/mobile_frontend/i18n/messages.ja.xml" role="data" />
+   <file baseinstalldir="/" md5sum="27f9bd42b07b28f02bbbbd2b37a78251" name="apps/mobile_frontend/modules/opAuthMailAddress/actions/actions.class.php" role="data" />
+   <file baseinstalldir="/" md5sum="d8f9de3f5394cfe6802ce9207b872887" name="apps/mobile_frontend/modules/opAuthMailAddress/actions/components.class.php" role="data" />
+   <file baseinstalldir="/" md5sum="be9459b5247c2198cf6999310104b1ad" name="apps/mobile_frontend/modules/opAuthMailAddress/config/security.yml" role="data" />
+   <file baseinstalldir="/" md5sum="07cd4e6f65cfb5eabd5d0ca76f1da409" name="apps/mobile_frontend/modules/opAuthMailAddress/templates/helpLoginErrorSuccess.php" role="data" />
+   <file baseinstalldir="/" md5sum="4aef3f11ce9ad46ee31119e53d4efcd0" name="apps/mobile_frontend/modules/opAuthMailAddress/templates/passwordRecoveryCompleteSuccess.php" role="data" />
+   <file baseinstalldir="/" md5sum="b2cebe2d71ca89d87e299083310d809e" name="apps/mobile_frontend/modules/opAuthMailAddress/templates/passwordRecoverySuccess.php" role="data" />
+   <file baseinstalldir="/" md5sum="c207acec8ca13c703aa382583907e9c4" name="apps/mobile_frontend/modules/opAuthMailAddress/templates/registerError.php" role="data" />
+   <file baseinstalldir="/" md5sum="6d04f808bc0c9d6be33d3411fd47d018" name="apps/mobile_frontend/modules/opAuthMailAddress/templates/requestRegisterURLInput.php" role="data" />
+   <file baseinstalldir="/" md5sum="0f42c41046081437a1ec11ab2046c26e" name="apps/mobile_frontend/modules/opAuthMailAddress/templates/_registerBox.php" role="data" />
+   <file baseinstalldir="/" md5sum="1c04df321f82cd1ad3f02419d5688ca7" name="apps/mobile_mail_frontend/config/routing.yml" role="data" />
+   <file baseinstalldir="/" md5sum="61df8c4b07cc8c7fd8fbdbb0158afea9" name="apps/mobile_mail_frontend/i18n/messages.ja.xml" role="data" />
+   <file baseinstalldir="/" md5sum="8a6c758b48bf0da9298406812fda156f" name="apps/mobile_mail_frontend/modules/opAuthMailAddress/actions/actions.class.php" role="data" />
+   <file baseinstalldir="/" md5sum="ba4e4467b2f18070418aa0545aecc61d" name="apps/mobile_mail_frontend/modules/opAuthMailAddress/templates/loginSuccess.php" role="data" />
+   <file baseinstalldir="/" md5sum="8fca375711ed1f3706677bad063df53b" name="apps/pc_backend/modules/opAuthMailAddressPlugin/actions/actions.class.php" role="data" />
+   <file baseinstalldir="/" md5sum="2ac41c31d3188b575063f1b8656ee8be" name="apps/pc_backend/modules/opAuthMailAddressPlugin/templates/indexSuccess.php" role="data" />
+   <file baseinstalldir="/" md5sum="f4f62049540cc9ce555a36aa4e3f7c85" name="apps/pc_frontend/i18n/messages.ja.xml" role="data" />
+   <file baseinstalldir="/" md5sum="de668a0ee1d9dfb6c7409343aa7bc9ed" name="apps/pc_frontend/modules/opAuthMailAddress/actions/actions.class.php" role="data" />
+   <file baseinstalldir="/" md5sum="f2569d820aff5771a3380200453c1998" name="apps/pc_frontend/modules/opAuthMailAddress/actions/components.class.php" role="data" />
+   <file baseinstalldir="/" md5sum="be9459b5247c2198cf6999310104b1ad" name="apps/pc_frontend/modules/opAuthMailAddress/config/security.yml" role="data" />
+   <file baseinstalldir="/" md5sum="92a2b6f5d38f6e80ac24ea8bc56a4e47" name="apps/pc_frontend/modules/opAuthMailAddress/templates/helpLoginErrorSuccess.php" role="data" />
+   <file baseinstalldir="/" md5sum="af0907dac7d2ed4f8892186d39b18748" name="apps/pc_frontend/modules/opAuthMailAddress/templates/passwordRecoveryCompleteSuccess.php" role="data" />
+   <file baseinstalldir="/" md5sum="35e0d3d11d26b5aec3acc8a51b42db2a" name="apps/pc_frontend/modules/opAuthMailAddress/templates/passwordRecoverySuccess.php" role="data" />
+   <file baseinstalldir="/" md5sum="5742972211cb50b796a6d396a2e278e5" name="apps/pc_frontend/modules/opAuthMailAddress/templates/registerError.php" role="data" />
+   <file baseinstalldir="/" md5sum="e49d7c12db9276d87304290de530d6c6" name="apps/pc_frontend/modules/opAuthMailAddress/templates/requestRegisterURLInput.php" role="data" />
+   <file baseinstalldir="/" md5sum="196f36a01c614f22624dd70e32e265d0" name="apps/pc_frontend/modules/opAuthMailAddress/templates/requestRegisterURLSuccess.php" role="data" />
+   <file baseinstalldir="/" md5sum="0ceb1e36b7f7abce95b62c1e75b3a171" name="apps/pc_frontend/modules/opAuthMailAddress/templates/_registerBox.php" role="data" />
+   <file baseinstalldir="/" md5sum="5bc77abb042c3677ec2b4de5ab3e0fcc" name="config/auth.yml" role="data" />
+   <file baseinstalldir="/" md5sum="45d80291351e70c84059dfded231113a" name="config/member_config.yml" role="data" />
+   <file baseinstalldir="/" md5sum="4a346fb2eee31c886424e87213eec513" name="i18n/messages.ja.xml" role="data" />
+   <file baseinstalldir="/" md5sum="e90b3efcd765381905294fef34f1e595" name="lib/action/opAuthMailAddressPluginAction.class.php" role="data" />
+   <file baseinstalldir="/" md5sum="9794178d4d88119d3a48492d56ee40b7" name="lib/form/MemberConfigSecretQuestionForm.class.php" role="data" />
+   <file baseinstalldir="/" md5sum="835c2843d1f0dda62d1a38b63868fcc0" name="lib/form/opAuthConfigFormMailAddress.class.php" role="data" />
+   <file baseinstalldir="/" md5sum="fe2fdd818abd083ce92d6876812bc3ac" name="lib/form/opAuthLoginFormMailAddress.class.php" role="data" />
+   <file baseinstalldir="/" md5sum="77722edcb64f64cbf33a19d2cd895819" name="lib/form/opAuthMailAddressPasswordChangeForm.class.php" role="data" />
+   <file baseinstalldir="/" md5sum="043b3b3c3ec0aad8a8abe0349737399b" name="lib/form/opAuthMailAddressPasswordRecoveryForm.class.php" role="data" />
+   <file baseinstalldir="/" md5sum="0fddd05d2595841ab09497a5947084ac" name="lib/form/opAuthRegisterFormMailAddress.class.php" role="data" />
+   <file baseinstalldir="/" md5sum="18e15d1b860c28bdac71b3a9a0c29dbf" name="lib/form/opRequestRegisterURLForm.class.php" role="data" />
+   <file baseinstalldir="/" md5sum="32ed66664df89cccfe4f69c5e0c9e97f" name="lib/user/opAuthAdapterMailAddress.class.php" role="data" />
+   <file baseinstalldir="/" md5sum="6afa9caa9ed0bcbb444b97fbbd227f64" name="templates/mail/mobile/_notifyRegisterURL.php" role="data" />
+   <file baseinstalldir="/" md5sum="e050c4557ad4c523e3af179f70f0026a" name="templates/mail/mobile/_passwordRecovery.php" role="data" />
+   <file baseinstalldir="/" md5sum="03a7b3ef3b4d3ef080c02a388fa4b0bb" name="templates/mail/pc/_notifyRegisterURL.php" role="data" />
+   <file baseinstalldir="/" md5sum="364f6792aca3c5f51964ee06e44397bc" name="templates/mail/pc/_passwordRecovery.php" role="data" />
+   <file baseinstalldir="/" md5sum="d1eb6b6723ed178f297879c60342192a" name="dependencies.yml" role="data" />
+   <file baseinstalldir="/" md5sum="3b83ef96387f14655fc854ddc3c6bd57" name="LICENSE" role="data" />
+  </dir>
+ </contents>
+ <dependencies>
+  <required>
+   <php>
+    <min>5.2.3</min>
+   </php>
+   <pearinstaller>
+    <min>1.4.0</min>
+   </pearinstaller>
+   <package>
+    <name>openpne</name>
+    <channel>plugins.openpne.jp</channel>
+    <min>3.5.2dev</min>
+   </package>
+  </required>
+ </dependencies>
+ <phprelease />
+ <changelog>
+  <release>
+   <version>
+    <release>1.0.0</release>
+    <api>1.0.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2009-02-05</date>
+   <license>Apache</license>
+   <notes>
+First release
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.1.0</release>
+    <api>1.1.0</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2009-05-17</date>
+   <license>apache</license>
+   <notes>
+This plugin is now compatible with Doctrine
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.1.1</release>
+    <api>1.1.1</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2009-07-18</date>
+   <license>apache</license>
+   <notes>
+added an improved for mobile
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.1.2</release>
+    <api>1.1.2</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2009-07-27</date>
+   <license>apache</license>
+   <notes>
+added support for some customizes (experimental)
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.1.3</release>
+    <api>1.1.3</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2009-08-03</date>
+   <license>apache</license>
+   <notes>
+[opAuthMailAddress] temporal cope for #4219
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.1.4</release>
+    <api>1.1.4</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2009-08-06</date>
+   <license>apache</license>
+   <notes>
+fixed requestRegisterURL doesn&apos;t render errors
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.1.4.1</release>
+    <api>1.1.4.1</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2009-08-20</date>
+   <license>apache</license>
+   <notes>
+This is a development release. Added support for registering via empty email experimentaly.
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.2.0</release>
+    <api>1.2.0</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2009-12-12</date>
+   <license>apache</license>
+   <notes>
+Add password reminder support.
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.2.1</release>
+    <api>1.2.1</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2010-01-14</date>
+   <license>apache</license>
+   <notes>
+fixed issues that is configuring answer of secret question is broken
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.3.0</release>
+    <api>1.3.0</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2010-05-10</date>
+   <license>apache</license>
+   <notes>
+added supports for new authentication interfaces
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.3.1</release>
+    <api>1.3.1</api>
+   </version>
+   <stability>
+    <release>devel</release>
+    <api>devel</api>
+   </stability>
+   <date>2010-06-11</date>
+   <license>apache</license>
+   <notes>
+* Fixed re-sending registration e-mail that doesn&apos;t work (空メールを複数回送った場合にメールが一通しか返送されない問題の修正
+* Added value of &apos;auth_mode_caption&apos; for this authentication plugin
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.3.2</release>
+    <api>1.3.2</api>
+   </version>
+   <stability>
+    <release>devel</release>
+    <api>devel</api>
+   </stability>
+   <date>2010-10-13</date>
+   <license>apache</license>
+   <notes>
+* Fixed #433: fixed the secret_answer form field filled in to hashed user inputed value when the last request was failed (「秘密の質問の答え」に、エラー遷移時にハッシュ化された値が挿入されてしまう)
+* Fixed #1576: added missing translations (翻訳の漏れを修正)
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.3.3</release>
+    <api>1.3.3</api>
+   </version>
+   <stability>
+    <release>devel</release>
+    <api>devel</api>
+   </stability>
+   <date>2011-07-21</date>
+   <license>apache</license>
+   <notes>
+Fixed the following issues: 
+* Bug（バグ） #1770: 招待メールからの登録画面の英語化
+* Bug（バグ） #1815: 既に新規登録申請を行ったアドレスで２度目に新規登録申請を行うとInternal Server Errorになる
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.3.4</release>
+    <api>1.3.4</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2011-09-18</date>
+   <license>apache</license>
+   <notes>
+Bug（バグ） #1668: opAuthRegisterFormMailAddress::doSave()の-&gt;setName()の処理で、レコードの存在チェックがない
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.3.5</release>
+    <api>1.3.5</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2011-12-08</date>
+   <license>apache</license>
+   <notes>
+Bug（バグ） #2598: 他の認証プラグインで「秘密の質問」の項目が表示されてしまう
+   </notes>
+  </release>
+ </changelog>
+</package>

From 424160ff2b8ba1ca1fcf304f00de42a2527d50e7 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 27 Apr 2012 20:25:16 +0900
Subject: [PATCH 252/630] fixed openpne setup guide document (fixes #3009)

---
 doc/ja/OpenPNE3_Setup_Guide.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/doc/ja/OpenPNE3_Setup_Guide.txt b/doc/ja/OpenPNE3_Setup_Guide.txt
index aa8fd222e..7ef58b3a2 100644
--- a/doc/ja/OpenPNE3_Setup_Guide.txt
+++ b/doc/ja/OpenPNE3_Setup_Guide.txt
@@ -109,10 +109,6 @@ http://www.openpne.jp/pne-downloads/
 
   table_prefix: "op_" 
 
-::
-
-  $ ./symfony openpne:install --internet
-
 openpne:install コマンドを実行すると、はじめに、以下の事項の入力を求められます。
 
 * 使用する DBMS （mysql, pgsql, sqlite から選択。ただし mysql

From 2792f195ec0f96f6682bf343c69572a2d443e3bc Mon Sep 17 00:00:00 2001
From: Kousuke Ebihara <ebihara@php.net>
Date: Fri, 7 Oct 2011 22:04:02 +0900
Subject: [PATCH 253/630] changed escaping method for single quotation to avoid
 error in migrating to revision 34 with latest Doctrine (fixes #3046, BP from
 #2479)

---
 data/migrations/3.3.1/034_add_is_pre_column.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/migrations/3.3.1/034_add_is_pre_column.php b/data/migrations/3.3.1/034_add_is_pre_column.php
index 88b8c3590..a50ab4279 100644
--- a/data/migrations/3.3.1/034_add_is_pre_column.php
+++ b/data/migrations/3.3.1/034_add_is_pre_column.php
@@ -15,7 +15,7 @@ public function migrate($direction)
     $this->column($direction, 'community_member', 'is_pre', 'boolean', null, array(
       'default' => 0,
       'notnull' => true,
-      'comment' => 'Member\\\'s position in this community',
+      'comment' => 'Member\'\'s position in this community',
     ));
   }
 

From b41538bd192362d98c905717aa768a90c0a980df Mon Sep 17 00:00:00 2001
From: Fumie Toyooka <dymojet@google.com>
Date: Fri, 27 Apr 2012 20:38:15 +0900
Subject: [PATCH 254/630] (fixes #3027)add description of the Advanced Setting
 in English version up document.

---
 doc/en/OpenPNE3_Version_Up_Guide.txt | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/doc/en/OpenPNE3_Version_Up_Guide.txt b/doc/en/OpenPNE3_Version_Up_Guide.txt
index 64c22b8e1..b67111a26 100644
--- a/doc/en/OpenPNE3_Version_Up_Guide.txt
+++ b/doc/en/OpenPNE3_Version_Up_Guide.txt
@@ -109,3 +109,16 @@ Here are some notes in updating.
   * Language and Time Zone Configuration
   * Connecting with External Application
   * OpenID Configuration
+
+* Some features of the admin screen go to 'Advanced Settings' since OpenPNE 3.8.0. These features are:
+  * SNS > General Configuration
+    - Activity Post
+    - JSON API
+    - OpenID Provider
+    - Daily News Incoming Frequency
+    - Public Flag for Age to Entire Web settings
+    - Public Flag for Member's Profile settings
+    - Rich Text Area settings
+
+  * SNS > Mobile-related
+  * SNS > API Key

From 34c9fbf16cb6da1164662bdacaa9bc3d4889e527 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Mon, 5 Dec 2011 21:53:53 +0900
Subject: [PATCH 255/630] (fixes #3045, BP from #2647) fixed not to register
 already set MobileUID

---
 apps/mobile_frontend/i18n/messages.ja.xml | 4 ++++
 lib/form/opAuthRegisterForm.class.php     | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/apps/mobile_frontend/i18n/messages.ja.xml b/apps/mobile_frontend/i18n/messages.ja.xml
index 2a8f0c631..0f725c80d 100644
--- a/apps/mobile_frontend/i18n/messages.ja.xml
+++ b/apps/mobile_frontend/i18n/messages.ja.xml
@@ -1227,6 +1227,10 @@
         <source>Block access from the selected member with input MemberID.&lt;br /&gt; MemberID is written at the end of member top page URL.&lt;br /&gt; ex. The MemberID is 1 when the URL "http://sns.example.com/member/1"</source>
         <target>ﾒﾝﾊﾞｰIDを入力して特定のﾒﾝﾊﾞｰからのｱｸｾｽをﾌﾞﾛｯｸします。&lt;br /&gt;ﾒﾝﾊﾞｰIDは相手ﾄｯﾌﾟﾍﾟｰｼﾞのURL末尾に表示されています。&lt;br /&gt;例："http://sns.example.com/member/1" というURLである場合にはﾒﾝﾊﾞｰIDは1になります。</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>A mobile UID was already registered.</source>
+        <target>その携帯電話の個体識別番号はすでに登録されています。</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/lib/form/opAuthRegisterForm.class.php b/lib/form/opAuthRegisterForm.class.php
index eea17135a..57686f39a 100644
--- a/lib/form/opAuthRegisterForm.class.php
+++ b/lib/form/opAuthRegisterForm.class.php
@@ -145,6 +145,10 @@ public function validateMobileUID($validator, $values, $arguments = array())
       {
         throw new sfValidatorError($validator, 'A mobile UID is invalid.');
       }
+      elseif (Doctrine::getTable('MemberConfig')->retrieveByNameAndValue('mobile_uid', $uid))
+      {
+        throw new sfValidatorError($validator, 'A mobile UID was already registered.');
+      }
 
       $cookieUid = sfContext::getInstance()->getResponse()->generateMobileUidCookie();
       if ($cookieUid)

From b0d150a4676c5191f68e909261013216573974de Mon Sep 17 00:00:00 2001
From: Fumie Toyooka <dymojet@google.com>
Date: Fri, 27 Apr 2012 20:57:02 +0900
Subject: [PATCH 256/630] (fixes #3027)change a word in English version up
 document.

---
 doc/en/OpenPNE3_Version_Up_Guide.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/en/OpenPNE3_Version_Up_Guide.txt b/doc/en/OpenPNE3_Version_Up_Guide.txt
index b67111a26..f59c2f220 100644
--- a/doc/en/OpenPNE3_Version_Up_Guide.txt
+++ b/doc/en/OpenPNE3_Version_Up_Guide.txt
@@ -115,7 +115,7 @@ Here are some notes in updating.
     - Activity Post
     - JSON API
     - OpenID Provider
-    - Daily News Incoming Frequency
+    - Daily News Receiving Frequency
     - Public Flag for Age to Entire Web settings
     - Public Flag for Member's Profile settings
     - Rich Text Area settings

From 8fcd05bcc6f56bd9f0c64026a66fc3acf45d4d67 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 27 Apr 2012 21:14:30 +0900
Subject: [PATCH 257/630] removed opSkinClassicPlugin from .gitignore (fixes
 #3038, BP from #3037)

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 72525e785..5bcf737bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@ log/*
 plugins/op*
 !plugins/opAuthMailAddressPlugin
 !plugins/opSkinBasicPlugin
-!plugins/opSkinClassicPlugin
 plugins/.*
 lib/filter/doctrine/*
 cache/*

From 8c3a8086798bcc672701bfd913c482f9ce7fde25 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Fri, 27 Apr 2012 21:39:21 +0900
Subject: [PATCH 258/630] version 3.8.0

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 1ff34744c..e707beb6c 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.0-dev');
+  define('OPENPNE_VERSION', '3.8.0');
 }

From 6138554af6200edc11d05195c27bd2d1ba07ecac Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 13 Jun 2012 23:44:56 +0900
Subject: [PATCH 259/630] add an implement of image post onto
 activity/post.json (fixes #3075, BP from #3064)

---
 apps/api/lib/helper/opJsonApiHelper.php       |  7 +++++++
 .../activity/actions/actions.class.php        | 19 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/apps/api/lib/helper/opJsonApiHelper.php b/apps/api/lib/helper/opJsonApiHelper.php
index 502ff901d..e5fd560a2 100644
--- a/apps/api/lib/helper/opJsonApiHelper.php
+++ b/apps/api/lib/helper/opJsonApiHelper.php
@@ -60,6 +60,11 @@ function op_api_activity($activity)
 {
   $viewMemberId = sfContext::getInstance()->getUser()->getMemberId();
   $member = $activity->getMember();
+  $images = null;
+  if ($activity->getImages()->count())
+  {
+    $images = $activity->getImages();
+  }
 
   return array(
     'id' => $activity->getId(),
@@ -69,6 +74,8 @@ function op_api_activity($activity)
     'uri' => $activity->getUri(),
     'source' => $activity->getSource(),
     'source_uri' => $activity->getSourceUri(),
+    'image_url' => !is_null($images) ? sf_image_path($images[0]->getFile(), array('size' => '48x48'), true) : null, 
+    'image_large_url' => !is_null($images) ? sf_image_path($images[0]->getFile(), array(), true) : null,
     'created_at' => date('r', strtotime($activity->getCreatedAt())),
   );
 }
diff --git a/apps/api/modules/activity/actions/actions.class.php b/apps/api/modules/activity/actions/actions.class.php
index 9cf307f07..4d38d8bd0 100644
--- a/apps/api/modules/activity/actions/actions.class.php
+++ b/apps/api/modules/activity/actions/actions.class.php
@@ -188,6 +188,25 @@ public function executePost(sfWebRequest $request)
 
     $options['source'] = 'API';
 
+    $imageFile = $request->getFiles('images');
+    if (!empty($imageFile))
+    {   
+      $validator = new opValidatorImageFile(array('required' => false));
+      try 
+      {   
+        $obj = $validator->clean($imageFile);
+      }   
+      catch (sfValidatorError $e) 
+      {   
+        $this->forward400('This image file is invalid.');
+      }   
+      $file = new File();
+      $file->setFromValidatedFile($obj);
+      $file->setName('ac_'.$this->getUser()->getMemberId().'_'.$file->getName());
+      $file->save();
+      $options['images'][] = array('file_id' => $file->getId());
+    }   
+
     $this->activity = Doctrine::getTable('ActivityData')->updateActivity($memberId, $body, $options);
 
     $this->setTemplate('object');

From c2104678d167beab63f85b467974a2328a7b3f65 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Mon, 2 Jul 2012 13:09:20 +0900
Subject: [PATCH 260/630] Revert "add an implement of image post onto
 activity/post.json (fixes #3075, BP from #3064)"

This reverts commit 6138554af6200edc11d05195c27bd2d1ba07ecac.
---
 apps/api/lib/helper/opJsonApiHelper.php       |  7 -------
 .../activity/actions/actions.class.php        | 19 -------------------
 2 files changed, 26 deletions(-)

diff --git a/apps/api/lib/helper/opJsonApiHelper.php b/apps/api/lib/helper/opJsonApiHelper.php
index e5fd560a2..502ff901d 100644
--- a/apps/api/lib/helper/opJsonApiHelper.php
+++ b/apps/api/lib/helper/opJsonApiHelper.php
@@ -60,11 +60,6 @@ function op_api_activity($activity)
 {
   $viewMemberId = sfContext::getInstance()->getUser()->getMemberId();
   $member = $activity->getMember();
-  $images = null;
-  if ($activity->getImages()->count())
-  {
-    $images = $activity->getImages();
-  }
 
   return array(
     'id' => $activity->getId(),
@@ -74,8 +69,6 @@ function op_api_activity($activity)
     'uri' => $activity->getUri(),
     'source' => $activity->getSource(),
     'source_uri' => $activity->getSourceUri(),
-    'image_url' => !is_null($images) ? sf_image_path($images[0]->getFile(), array('size' => '48x48'), true) : null, 
-    'image_large_url' => !is_null($images) ? sf_image_path($images[0]->getFile(), array(), true) : null,
     'created_at' => date('r', strtotime($activity->getCreatedAt())),
   );
 }
diff --git a/apps/api/modules/activity/actions/actions.class.php b/apps/api/modules/activity/actions/actions.class.php
index 4d38d8bd0..9cf307f07 100644
--- a/apps/api/modules/activity/actions/actions.class.php
+++ b/apps/api/modules/activity/actions/actions.class.php
@@ -188,25 +188,6 @@ public function executePost(sfWebRequest $request)
 
     $options['source'] = 'API';
 
-    $imageFile = $request->getFiles('images');
-    if (!empty($imageFile))
-    {   
-      $validator = new opValidatorImageFile(array('required' => false));
-      try 
-      {   
-        $obj = $validator->clean($imageFile);
-      }   
-      catch (sfValidatorError $e) 
-      {   
-        $this->forward400('This image file is invalid.');
-      }   
-      $file = new File();
-      $file->setFromValidatedFile($obj);
-      $file->setName('ac_'.$this->getUser()->getMemberId().'_'.$file->getName());
-      $file->save();
-      $options['images'][] = array('file_id' => $file->getId());
-    }   
-
     $this->activity = Doctrine::getTable('ActivityData')->updateActivity($memberId, $body, $options);
 
     $this->setTemplate('object');

From 02aa2eda05f97776e2389b1a5d1149e61a14823c Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Mon, 2 Jul 2012 13:10:38 +0900
Subject: [PATCH 261/630] started to development of OpenPNE 3.8.1

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index e707beb6c..40261232c 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.0');
+  define('OPENPNE_VERSION', '3.8.1-dev');
 }

From a1e1a104cbef3a56ffa23493cba86276badf87f1 Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 13 Jun 2012 23:44:56 +0900
Subject: [PATCH 262/630] add an implement of image post onto
 activity/post.json (fixes #3075, BP from #3064)

---
 apps/api/lib/helper/opJsonApiHelper.php       |  7 +++++++
 .../activity/actions/actions.class.php        | 19 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/apps/api/lib/helper/opJsonApiHelper.php b/apps/api/lib/helper/opJsonApiHelper.php
index 502ff901d..e5fd560a2 100644
--- a/apps/api/lib/helper/opJsonApiHelper.php
+++ b/apps/api/lib/helper/opJsonApiHelper.php
@@ -60,6 +60,11 @@ function op_api_activity($activity)
 {
   $viewMemberId = sfContext::getInstance()->getUser()->getMemberId();
   $member = $activity->getMember();
+  $images = null;
+  if ($activity->getImages()->count())
+  {
+    $images = $activity->getImages();
+  }
 
   return array(
     'id' => $activity->getId(),
@@ -69,6 +74,8 @@ function op_api_activity($activity)
     'uri' => $activity->getUri(),
     'source' => $activity->getSource(),
     'source_uri' => $activity->getSourceUri(),
+    'image_url' => !is_null($images) ? sf_image_path($images[0]->getFile(), array('size' => '48x48'), true) : null, 
+    'image_large_url' => !is_null($images) ? sf_image_path($images[0]->getFile(), array(), true) : null,
     'created_at' => date('r', strtotime($activity->getCreatedAt())),
   );
 }
diff --git a/apps/api/modules/activity/actions/actions.class.php b/apps/api/modules/activity/actions/actions.class.php
index 9cf307f07..4d38d8bd0 100644
--- a/apps/api/modules/activity/actions/actions.class.php
+++ b/apps/api/modules/activity/actions/actions.class.php
@@ -188,6 +188,25 @@ public function executePost(sfWebRequest $request)
 
     $options['source'] = 'API';
 
+    $imageFile = $request->getFiles('images');
+    if (!empty($imageFile))
+    {   
+      $validator = new opValidatorImageFile(array('required' => false));
+      try 
+      {   
+        $obj = $validator->clean($imageFile);
+      }   
+      catch (sfValidatorError $e) 
+      {   
+        $this->forward400('This image file is invalid.');
+      }   
+      $file = new File();
+      $file->setFromValidatedFile($obj);
+      $file->setName('ac_'.$this->getUser()->getMemberId().'_'.$file->getName());
+      $file->save();
+      $options['images'][] = array('file_id' => $file->getId());
+    }   
+
     $this->activity = Doctrine::getTable('ActivityData')->updateActivity($memberId, $body, $options);
 
     $this->setTemplate('object');

From 41db124efa99201060a2d17cecac966045b8c611 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Wed, 18 Jul 2012 17:06:07 +0900
Subject: [PATCH 263/630] (fixes #3083) fixed not to occur Exception when
 channel server was not registered

---
 lib/plugin/opPlugin.class.php | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/lib/plugin/opPlugin.class.php b/lib/plugin/opPlugin.class.php
index 12e0b2d6a..242e3f9a2 100644
--- a/lib/plugin/opPlugin.class.php
+++ b/lib/plugin/opPlugin.class.php
@@ -46,12 +46,26 @@ private function __construct($pluginName, sfEventDispatcher $dispatcher)
     }
     else
     {
-      $manager = new opPluginManager($dispatcher);
-      $package = $manager->getEnvironment()->getRegistry()->getPackage($pluginName, opPluginManager::getDefaultPluginChannelServerName());
-      if ($package)
+      try
       {
-        $this->version = $package->getVersion();
-        $this->summary = $package->getSummary();
+        $manager = new opPluginManager($dispatcher);
+        $package = $manager->getEnvironment()->getRegistry()->getPackage($pluginName, opPluginManager::getDefaultPluginChannelServerName());
+        if ($package)
+        {
+          $this->version = $package->getVersion();
+          $this->summary = $package->getSummary();
+        }
+      }
+      catch (Exception $e)
+      {
+        $message = array(
+          'fail to get plugin package information cause: '.get_class($e).' : '.$e->getMessage(),
+          'priority' => sfLogger::NOTICE
+        );
+        $dispatcher->notify(new sfEvent($this, 'application.log', $message));
+
+        $this->version = '';
+        $this->summary = '';
       }
     }
   }

From 939d70cb9fe6284795685f3fb806d6132b7ae159 Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Fri, 27 Jul 2012 14:17:39 +0900
Subject: [PATCH 264/630] added an inactive member to test fixture (refs #3081,
 BP from #3052)

opActivityQueryBuilder::includeFriends() throws an error exception if any inactive members exist
---
 test/fixtures/common/test_data.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/fixtures/common/test_data.yml b/test/fixtures/common/test_data.yml
index 9ab4805bb..7f36b331a 100644
--- a/test/fixtures/common/test_data.yml
+++ b/test/fixtures/common/test_data.yml
@@ -192,6 +192,10 @@ Member:
     id: 8
     name: "H"
     is_active: 1
+  inactive_member:
+    id: 9
+    name: "Inacive"
+    is_active: 0
 
 File:
   dummy_file1:

From 9e16f3e18af59095f2fc2dcd2be4a9c757439d2f Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Fri, 27 Jul 2012 14:28:57 +0900
Subject: [PATCH 265/630] fixed getting 500 error responce from
 activity/community.json if any inactive members exist (fixes #3081, BP from
 #3052)

For the opActivityQueryBuilder's query joins the Member model,
opActivateListener removes inactive members automatically.
So opActivityQueryBuilder::buildFriendQuery() doesn't need to add inactive members condition.
---
 lib/util/opActivityQueryBuilder.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/util/opActivityQueryBuilder.class.php b/lib/util/opActivityQueryBuilder.class.php
index f77b087d9..6841e9087 100644
--- a/lib/util/opActivityQueryBuilder.class.php
+++ b/lib/util/opActivityQueryBuilder.class.php
@@ -155,8 +155,7 @@ protected function buildFriendQuery($query, $member_id)
       ->select('r.member_id_to')
       ->from('MemberRelationship r')
       ->addWhere('r.member_id_from = ?', $member_id)
-      ->addWhere('r.is_friend = true')
-      ->andWhereNotIn('r.member_id_to', $this->inactiveIds);
+      ->addWhere('r.is_friend = true');
 
     return $this->buildMemberQuery($query, $friendsQuery, ActivityDataTable::PUBLIC_FLAG_FRIEND);
   }

From 763e986ccfd9c41c762f6d739e496934688795d9 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Fri, 21 Oct 2011 20:38:59 +0900
Subject: [PATCH 266/630] (fixes #3108, BP from #2547) fixed japanese in
 pc_backend community settings page

---
 apps/pc_backend/i18n/messages.ja.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/pc_backend/i18n/messages.ja.xml b/apps/pc_backend/i18n/messages.ja.xml
index 1ef26bdd7..9cc33cb7c 100644
--- a/apps/pc_backend/i18n/messages.ja.xml
+++ b/apps/pc_backend/i18n/messages.ja.xml
@@ -34,7 +34,7 @@
       </trans-unit>
       <trans-unit id="">
         <source>%Community%'s admin authorization needed</source>
-        <target>%Community%参加者の承認が必要</target>
+        <target>%Community%管理者の承認が必要</target>
       </trans-unit>
       <trans-unit id="">
         <source>Public Flag for Profile Page</source>

From 296461e2a26e974e61d52ec51d78c82c87621b6b Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Mon, 27 Feb 2012 00:37:43 +0900
Subject: [PATCH 267/630] (fixes #3106, BP from #2470) fixed for sns term in
 mobile page

---
 apps/mobile_frontend/i18n/messages.ja.xml                 | 8 ++++----
 .../modules/community/templates/searchSuccess.php         | 4 ++--
 .../modules/member/templates/homeSuccess.php              | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/mobile_frontend/i18n/messages.ja.xml b/apps/mobile_frontend/i18n/messages.ja.xml
index 0f725c80d..46c9cd925 100644
--- a/apps/mobile_frontend/i18n/messages.ja.xml
+++ b/apps/mobile_frontend/i18n/messages.ja.xml
@@ -503,16 +503,16 @@
         <target>%community%作成</target>
       </trans-unit>
       <trans-unit id="">
-        <source>Search Communities</source>
-        <target>ｺﾐｭﾆﾃｨ検索</target>
+        <source>Search %Community%</source>
+        <target>%Community%検索</target>
       </trans-unit>
       <trans-unit id="">
         <source>Categories</source>
         <target>ｶﾃｺﾞﾘ</target>
       </trans-unit>
       <trans-unit id="">
-        <source>Your search queries did not match any communities.</source>
-        <target>該当するｺﾐｭﾆﾃｨはありませんでした。</target>
+        <source>Your search queries did not match any %community%.</source>
+        <target>該当する%community%はありませんでした。</target>
       </trans-unit>
       <trans-unit id="">
         <source>All categories</source>
diff --git a/apps/mobile_frontend/modules/community/templates/searchSuccess.php b/apps/mobile_frontend/modules/community/templates/searchSuccess.php
index 89407a218..f68a9a2cc 100644
--- a/apps/mobile_frontend/modules/community/templates/searchSuccess.php
+++ b/apps/mobile_frontend/modules/community/templates/searchSuccess.php
@@ -1,4 +1,4 @@
-<?php op_mobile_page_title(__('Search Communities')) ?>
+<?php op_mobile_page_title(__('Search %Community%', array('%Community%' => $op_term['community']->pluralize()))) ?>
 
 <?php if ($isResult): ?>
 <?php if ($pager->getNbResults()): ?>
@@ -18,7 +18,7 @@
 ?>
 <?php op_include_pager_navigation($pager, 'community/search?page=%d', array('is_total' => false, 'use_current_query_string' => true)) ?>
 <?php else: ?>
-<?php echo __('Your search queries did not match any communities.') ?>
+<?php echo __('Your search queries did not match any %community%.', array('%community%' => $op_term['community']->pluralize())) ?>
 <?php endif ?>
 <?php endif ?>
 
diff --git a/apps/mobile_frontend/modules/member/templates/homeSuccess.php b/apps/mobile_frontend/modules/member/templates/homeSuccess.php
index 74ebb4629..0265111c4 100644
--- a/apps/mobile_frontend/modules/member/templates/homeSuccess.php
+++ b/apps/mobile_frontend/modules/member/templates/homeSuccess.php
@@ -57,7 +57,7 @@
 <?php
 $list = array(
   link_to(__('Search Members'), '@member_search'),
-  link_to(__('Search Communities'), 'community/search'),
+  link_to(__('Search %Community%', array('%Community%' => $op_term['community']->pluralize())), 'community/search'),
 );
 op_include_list('search', $list, array('title' => __('Search')))
 ?>

From d64de8aab4a18aa36dd2f14f836f48ab92840722 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 8 Mar 2012 08:46:12 +0900
Subject: [PATCH 268/630] (fixes #3107, BP from #2665) add translate catalogs
 for mobile UID erros

---
 apps/mobile_frontend/i18n/messages.ja.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/mobile_frontend/i18n/messages.ja.xml b/apps/mobile_frontend/i18n/messages.ja.xml
index 46c9cd925..ee695ea15 100644
--- a/apps/mobile_frontend/i18n/messages.ja.xml
+++ b/apps/mobile_frontend/i18n/messages.ja.xml
@@ -1231,6 +1231,14 @@
         <source>A mobile UID was already registered.</source>
         <target>その携帯電話の個体識別番号はすでに登録されています。</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>A mobile UID is required. Please check settings of your mobile phone and retry.</source>
+        <target>携帯電話の個体識別番号は必須です。携帯電話の個体識別番号設定を確認してもう一度お試しください。</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>A mobile UID is invalid.</source>
+        <target>その携帯電話の個体識別番号は無効です。</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>

From 031c8d1324d494281e62d7d50a95d73b8ef43db0 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@tejimaya.com>
Date: Mon, 3 Oct 2011 21:51:52 +0900
Subject: [PATCH 269/630] (fixes #3099, BP from #2461) fixed to display self
 introduction item

---
 .../modules/member/templates/profileSuccess.php       | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/mobile_frontend/modules/member/templates/profileSuccess.php b/apps/mobile_frontend/modules/member/templates/profileSuccess.php
index 5f0d9c66b..b018ffb99 100644
--- a/apps/mobile_frontend/modules/member/templates/profileSuccess.php
+++ b/apps/mobile_frontend/modules/member/templates/profileSuccess.php
@@ -56,11 +56,7 @@
     continue;
   }
 
-  if ('textarea' === $profile->getFormType())
-  {
-    $value = op_auto_link_text_for_mobile((string)$profile);
-  }
-  elseif ($profile->getProfile()->isPreset())
+  if ($profile->getProfile()->isPreset())
   {
     $presetConfig = $profile->getProfile()->getPresetConfig();
     $caption = __($presetConfig['Caption']);
@@ -78,6 +74,11 @@
     }
   }
 
+  if ('textarea' === $profile->getFormType())
+  {
+    $value = op_auto_link_text_for_mobile($value);
+  }
+
   if ($member->getId() == $sf_user->getMemberId())
   {
     if ($profile->getPublicFlag() == ProfileTable::PUBLIC_FLAG_FRIEND)

From 6ec46b38e85dbad10ff568390a57d16a86d6cec3 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@tejimaya.com>
Date: Tue, 11 Oct 2011 09:37:13 +0900
Subject: [PATCH 270/630] (fixes #3098, BP from #2481) fixed not to display
 delete buttom in mobile page

---
 .../mobile_frontend/modules/community/templates/editSuccess.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/mobile_frontend/modules/community/templates/editSuccess.php b/apps/mobile_frontend/modules/community/templates/editSuccess.php
index f568b4cb4..6859e9dc0 100644
--- a/apps/mobile_frontend/modules/community/templates/editSuccess.php
+++ b/apps/mobile_frontend/modules/community/templates/editSuccess.php
@@ -21,7 +21,7 @@
   'align' => 'center',
 )) ?>
 
-<?php if (!$communityForm->isNew()): ?>
+<?php if (!$communityForm->isNew() && $isDeleteCommunity): ?>
 <?php
   op_include_parts('buttonBox', 'deleteForm', array(
     'title' => __('Delete this %community%'),

From b5239c250edad636a8346f9f5245aae152999129 Mon Sep 17 00:00:00 2001
From: mtakai <main.coeurl@gmail.com>
Date: Wed, 7 Mar 2012 12:03:48 +0900
Subject: [PATCH 271/630] (refs #3148, BP from #2847) use renderError() and
 render() instead of renderRow() ONLY captcha field.

---
 apps/pc_frontend/templates/_partsForm.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apps/pc_frontend/templates/_partsForm.php b/apps/pc_frontend/templates/_partsForm.php
index dbac13715..ac12ed652 100644
--- a/apps/pc_frontend/templates/_partsForm.php
+++ b/apps/pc_frontend/templates/_partsForm.php
@@ -94,7 +94,14 @@
   $hasRequiredField = true;
 }
 ?>
+<?php if ('captcha' === $field->getName()): ?>
+<tr>
+<th><?php echo $field->renderLabel($field->renderLabelName().$labelSuffix); ?></th>
+<td><?php echo $field->renderError(), $field->render($attributes); ?></td>
+</tr>
+<?php else: ?>
 <?php echo $field->renderRow($attributes, $field->renderLabelName().$labelSuffix) ?>
+<?php endif; ?>
 <?php endforeach; ?>
 <?php endforeach; ?>
 <?php echo $options->getRaw('lastRow') ?>

From 4e6cc2c6f8f59293d82c7d7e0b170691532108e4 Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Mon, 6 Aug 2012 22:22:18 +0900
Subject: [PATCH 272/630] fixed mail address token validation (fixes #3149, BP
 from #3112)

---
 lib/action/opMemberAction.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/action/opMemberAction.class.php b/lib/action/opMemberAction.class.php
index 4bfc42cf0..a90dbe9f1 100644
--- a/lib/action/opMemberAction.class.php
+++ b/lib/action/opMemberAction.class.php
@@ -238,7 +238,7 @@ public function executeConfigComplete($request)
 
     $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId($type.'_token', $memberId);
     $this->forward404Unless($memberConfig);
-    $this->forward404Unless((bool)$request->getParameter('token') !== $memberConfig->getValue());
+    $this->forward404Unless($request->getParameter('token') === $memberConfig->getValue());
 
     $option = array('member' => $memberConfig->getMember());
     $this->form = new opPasswordForm(array(), $option);

From 581aae1bb61b5ad2aa81ce095c21d079dc6f9909 Mon Sep 17 00:00:00 2001
From: mtakai <m.takai@tejimaya.com>
Date: Mon, 5 Dec 2011 21:06:53 +0900
Subject: [PATCH 273/630] (fixes #3116, BP from #2512) always display "Mail
 Setting" on frontend. revert #990

---
 lib/action/opMemberAction.class.php | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/lib/action/opMemberAction.class.php b/lib/action/opMemberAction.class.php
index 4bfc42cf0..ce3a5e255 100644
--- a/lib/action/opMemberAction.class.php
+++ b/lib/action/opMemberAction.class.php
@@ -439,22 +439,6 @@ protected function filterConfigCategory()
       }
     }
 
-    if (isset($categories['mail']))
-    {
-      if (sfConfig::get('sf_app') == 'pc_frontend')
-      {
-        $dailyNewsNotification = Doctrine::getTable('NotificationMail')->findOneByName('pc_dailyNews');
-      }
-      elseif (sfConfig::get('sf_app') == 'mobile_frontend')
-      {
-        $dailyNewsNotification = Doctrine::getTable('NotificationMail')->findOneByName('mobile_dailyNews');
-      }
-      if ($dailyNewsNotification && !$dailyNewsNotification->is_enabled)
-      {
-        unset($categories['mail']);
-      }
-    }
-
     foreach ($categories as $key => $value)
     {
       $title = $key;

From c60487cbedc18563c5fb51d3122d77acd421bd53 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Mon, 6 Feb 2012 12:59:37 +0900
Subject: [PATCH 274/630] (fixes #3117, BP from #2668) fixed not to show daily
 news settings if pc_backend settings selected 'Don't Notify'

---
 apps/mobile_frontend/i18n/messages.ja.xml     |  4 ++
 .../member/templates/configSuccess.php        |  4 +-
 apps/pc_frontend/i18n/messages.ja.xml         |  4 ++
 .../member/templates/configSuccess.php        |  4 +-
 lib/config/config/mail_template.yml           |  2 +
 lib/config/config/member_config.yml           | 14 ------
 .../MemberConfigMailForm.class.php            | 48 ++++++++++---------
 7 files changed, 42 insertions(+), 38 deletions(-)

diff --git a/apps/mobile_frontend/i18n/messages.ja.xml b/apps/mobile_frontend/i18n/messages.ja.xml
index ee695ea15..e4b78a3c7 100644
--- a/apps/mobile_frontend/i18n/messages.ja.xml
+++ b/apps/mobile_frontend/i18n/messages.ja.xml
@@ -226,6 +226,10 @@
         <source>Please select the item from the menu.</source>
         <target>ﾒﾆｭｰから設定したい項目を選択してください。</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>There is no available settings.</source>
+        <target>利用可能な設定はありません。</target>
+      </trans-unit>
       <trans-unit id="">
         <source>Successful in invite.</source>
         <target>送信が完了しました。</target>
diff --git a/apps/mobile_frontend/modules/member/templates/configSuccess.php b/apps/mobile_frontend/modules/member/templates/configSuccess.php
index f27a9ee2b..3a20ffaa9 100644
--- a/apps/mobile_frontend/modules/member/templates/configSuccess.php
+++ b/apps/mobile_frontend/modules/member/templates/configSuccess.php
@@ -4,12 +4,14 @@
 <?php op_mobile_page_title(__('Settings')) ?>
 <?php endif; ?>
 
-<?php if ($categoryName): ?>
+<?php if ($categoryName && $form->count() > 1): // except CSRF token field ?>
 <?php op_include_form('configForm', $form, array(
   'url'    => url_for('member/config?category='.$categoryName),
   'align'  => 'center',
   'button' => __('Save')
 )) ?>
+<?php elseif ($categoryName && 1 === $form->count()) : ?>
+<?php echo __('There is no available settings.'); ?>
 <?php else: ?>
 <?php echo __('Please select the item from the menu.'); ?>
 <?php endif; ?>
diff --git a/apps/pc_frontend/i18n/messages.ja.xml b/apps/pc_frontend/i18n/messages.ja.xml
index cfaded45a..d3221262f 100644
--- a/apps/pc_frontend/i18n/messages.ja.xml
+++ b/apps/pc_frontend/i18n/messages.ja.xml
@@ -258,6 +258,10 @@
         <source>Please select the item that wants to be set from the menu.</source>
         <target>メニューから設定したい項目を選択してください。</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>There is no available settings.</source>
+        <target>利用可能な設定はありません。</target>
+      </trans-unit>
       <trans-unit id="">
         <source>Edit profile</source>
         <target>プロフィール変更</target>
diff --git a/apps/pc_frontend/modules/member/templates/configSuccess.php b/apps/pc_frontend/modules/member/templates/configSuccess.php
index f6f08a623..c5fd3e567 100644
--- a/apps/pc_frontend/modules/member/templates/configSuccess.php
+++ b/apps/pc_frontend/modules/member/templates/configSuccess.php
@@ -41,8 +41,10 @@
 ?>
 <?php end_slot(); ?>
 
-<?php if ($categoryName): ?>
+<?php if ($categoryName && $form->count() > 1): // except CSRF token field ?>
 <?php op_include_form($categoryName.'Form', $form, array('title' => __($categoryCaptions[$categoryName]), 'url' => url_for('@member_config?category='.$categoryName))) ?>
+<?php elseif ($categoryName && 1 === $form->count()) : ?>
+<?php op_include_box('configInformation', __('There is no available settings.'), array('title' => __($categoryCaptions[$categoryName]))); ?>
 <?php else: ?>
 <?php op_include_box('configInformation', __('Please select the item that wants to be set from the menu.'), array('title' => __('Change Settings'))); ?>
 <?php endif; ?>
diff --git a/lib/config/config/mail_template.yml b/lib/config/config/mail_template.yml
index 32a6a85ba..a4ea1358c 100644
--- a/lib/config/config/mail_template.yml
+++ b/lib/config/config/mail_template.yml
@@ -248,6 +248,7 @@ pc:
   dailyNews:
     caption: "Daily News"
     configurable: true
+    member_configurable: true
     sample:
       en:
         - "Daily News"
@@ -577,6 +578,7 @@ mobile:
   dailyNews:
     caption: "Daily News"
     configurable: true
+    member_configurable: true
     sample:
       en:
         - "Daily News"
diff --git a/lib/config/config/member_config.yml b/lib/config/config/member_config.yml
index 3af30f976..20d88805e 100644
--- a/lib/config/config/member_config.yml
+++ b/lib/config/config/member_config.yml
@@ -123,20 +123,6 @@ mail:
     enable_pc:     true
     enable_mobile: true 
   daily_news:
-    Name:       "daily_news"
-    Caption:    "Daily News"
-    FormType:   "radio"
-    ValueType:  "string"
-    IsRegist:   false
-    IsConfig:   true
-    IsUnique:   false
-    IsRequired: true
-    IsConfirm:  false
-    Default: 2
-    Choices:
-      - "Don't Send"
-      - "Send At Intervals"
-      - "Send Everyday"
 
 language:
   _attributes:
diff --git a/lib/form/MemberConfigForm/MemberConfigMailForm.class.php b/lib/form/MemberConfigForm/MemberConfigMailForm.class.php
index 9bff3b714..2cf270650 100644
--- a/lib/form/MemberConfigForm/MemberConfigMailForm.class.php
+++ b/lib/form/MemberConfigForm/MemberConfigMailForm.class.php
@@ -22,21 +22,6 @@ class MemberConfigMailForm extends MemberConfigForm
   public function __construct(Member $member = null, $options = array(), $CSRFSecret = null)
   {
     parent::__construct($member, $options, $CSRFSecret);
-
-    $count = count(opConfig::get('daily_news_day'));
-
-    $i18n = sfContext::getInstance()->getI18N();
-    $translated = $i18n->__('[1]Send once a week (%2%)|[2]Send twice a week (%2%)|(2,+Inf]Send %1% times a week (%2%)', array(
-      '%1%' => $count,
-      '%2%' => implode(',', $this->generateDayList()))
-    );
-
-    $choice = new sfChoiceFormat();
-    $retval = $choice->format($translated, $count);
-
-    $options = $this->widgetSchema['daily_news']->getOptions();
-    $options['choices'][1] = $retval;
-    $this->widgetSchema['daily_news']->setOptions($options);
   }
 
   public function configure()
@@ -59,15 +44,34 @@ public function configure()
       if (isset($value['member_configurable']) && $value['member_configurable'])
       {
         $notification = Doctrine::getTable('NotificationMail')->findOneByName($app.'_'.$key);
+        $name  = 'is_send_'.$app.'_'.$key.'_mail';
         if (!$notification || $notification->getIsEnabled())
         {
-          $name  = 'is_send_'.$app.'_'.$key.'_mail';
-
-          $this->setWidget($name, new sfWidgetFormChoice(array('choices' => $choices, 'expanded' => true)));
-          $this->setValidator($name, new sfValidatorChoice(array('choices' => array_keys($choices), 'required' => true)));
-          $this->widgetSchema->setLabel($name, $value['caption']);
-
-          $this->setDefault($name, $this->member->getConfig($name, 1));
+          if ('dailyNews' !== $key)
+          {
+            $this->setWidget($name, new sfWidgetFormChoice(array('choices' => $choices, 'expanded' => true)));
+            $this->setValidator($name, new sfValidatorChoice(array('choices' => array_keys($choices), 'required' => true)));
+            $this->widgetSchema->setLabel($name, $value['caption']);
+
+            $this->setDefault($name, $this->member->getConfig($name, 1));
+          }
+          else
+          {
+            $name = 'daily_news';
+            $i18n = sfContext::getInstance()->getI18N();
+            $choice = new sfChoiceFormat();
+            $count = count(opConfig::get('daily_news_day'));
+            $translated = $choice->format($i18n->__('[1]Send once a week (%2%)|[2]Send twice a week (%2%)|(2,+Inf]Send %1% times a week (%2%)', array(
+              '%1%' => $count,
+              '%2%' => implode(',', $this->generateDayList()))
+            ), $count);
+            $dailyNewsChoices = array("Don't Send", $translated, "Send Everyday");
+            $this->setWidget($name, new sfWidgetFormChoice(array('choices' => $dailyNewsChoices, 'expanded' => true)));
+            $this->setValidator($name, new sfValidatorChoice(array('choices' => array_keys($dailyNewsChoices), 'required' => true)));
+            $this->widgetSchema->setLabel($name, $value['caption']);
+
+            $this->setDefault($name, $this->member->getConfig($name, 2));
+          }
         }
       }
     }

From 79fa66747fa4804773a29a652491257017ec63cb Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 9 Feb 2012 21:48:22 +0900
Subject: [PATCH 275/630] (fixes #3117, BP from #2668) revert daily_new Default
 value to send default 'Send Everyday' setting

---
 lib/config/config/member_config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/config/config/member_config.yml b/lib/config/config/member_config.yml
index 20d88805e..91d8bc3d0 100644
--- a/lib/config/config/member_config.yml
+++ b/lib/config/config/member_config.yml
@@ -123,6 +123,7 @@ mail:
     enable_pc:     true
     enable_mobile: true 
   daily_news:
+    Default: 2
 
 language:
   _attributes:

From 527cdf3a3e2057cb059d457238af36993be59ae6 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@tejimaya.com>
Date: Thu, 6 Oct 2011 14:47:19 +0900
Subject: [PATCH 276/630] (fixes #3157, BP from #2453) fixed automatic log-in
 not to eliminate cookie in correct pattern

---
 apps/pc_frontend/config/filters.yml        |  3 --
 lib/filter/opRememberLoginFilter.class.php | 36 ----------------------
 lib/user/opSecurityUser.class.php          | 12 +++++++-
 3 files changed, 11 insertions(+), 40 deletions(-)
 delete mode 100644 lib/filter/opRememberLoginFilter.class.php

diff --git a/apps/pc_frontend/config/filters.yml b/apps/pc_frontend/config/filters.yml
index b202269a3..c44ddcea1 100644
--- a/apps/pc_frontend/config/filters.yml
+++ b/apps/pc_frontend/config/filters.yml
@@ -9,9 +9,6 @@ enable_app:
 xrds_header:
   class: opAppendXRDSHeaderFilter
 
-remember_login:
-  class: opRememberLoginFilter
-
 security:  ~
 
 emoji:
diff --git a/lib/filter/opRememberLoginFilter.class.php b/lib/filter/opRememberLoginFilter.class.php
deleted file mode 100644
index b41e372bc..000000000
--- a/lib/filter/opRememberLoginFilter.class.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * opRememberLoginFilter
- *
- * @package    OpenPNE
- * @subpackage filter
- * @author     Shogo Kawahara <kawahara@tejimaya.net>
- */
-class opRememberLoginFilter extends sfFilter
-{
-  /**
-   * Executes this filter.
-   *
-   * @param sfFilterChain $filterChain A sfFilterChain instance
-   */
-  public function execute($filterChain)
-  {
-    if ($this->isFirstCall() && !$this->context->getUser()->isAuthenticated())
-    {
-      if ($memberId = $this->context->getUser()->getRememberedMemberId())
-      {
-        $this->context->getUser()->login($memberId);
-      }
-    }
-    $filterChain->execute();
-  }
-}
diff --git a/lib/user/opSecurityUser.class.php b/lib/user/opSecurityUser.class.php
index 37dfefee1..c280ce57b 100644
--- a/lib/user/opSecurityUser.class.php
+++ b/lib/user/opSecurityUser.class.php
@@ -327,7 +327,17 @@ public function initializeUserStatus()
     $member = $this->getMember();
     opActivateBehavior::enable();
 
-    if ($member instanceof opAnonymousMember || $member->getIsLoginRejected())
+    if ($member->getIsLoginRejected())
+    {
+      $this->logout();
+      $isSNSMember = false;
+    }
+    elseif ($memberId = $this->getRememberedMemberId())
+    {
+      $this->setMemberId($memberId);
+      $isSNSMember = true;
+    }
+    elseif ($member instanceof opAnonymousMember)
     {
       $this->logout();
       $isSNSMember = false;

From 45f5254d36cde00695be7bebc84424152a4e3e2c Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Mon, 7 Nov 2011 18:01:35 +0900
Subject: [PATCH 277/630] (fixes #3118, BP from #2585) fixed not to login
 rejected member using automatic login cookie

---
 lib/user/opSecurityUser.class.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/lib/user/opSecurityUser.class.php b/lib/user/opSecurityUser.class.php
index c280ce57b..21c7788b4 100644
--- a/lib/user/opSecurityUser.class.php
+++ b/lib/user/opSecurityUser.class.php
@@ -327,19 +327,13 @@ public function initializeUserStatus()
     $member = $this->getMember();
     opActivateBehavior::enable();
 
-    if ($member->getIsLoginRejected())
-    {
-      $this->logout();
-      $isSNSMember = false;
-    }
-    elseif ($memberId = $this->getRememberedMemberId())
+    if ($memberId = $this->getRememberedMemberId())
     {
       $this->setMemberId($memberId);
       $isSNSMember = true;
     }
     elseif ($member instanceof opAnonymousMember)
     {
-      $this->logout();
       $isSNSMember = false;
     }
     else
@@ -347,11 +341,20 @@ public function initializeUserStatus()
       $isSNSMember = (bool)$member->getIsActive();
     }
 
+    if ($this->getMember()->getIsLoginRejected())
+    {
+      $isSNSMember = false;
+    }
+
     $this->setIsSNSMember($isSNSMember);
     if ($isSNSMember)
     {
       $member->updateLastLoginTime();
     }
+    else
+    {
+      $this->logout();
+    }
   }
 
   public function isMember()

From 3230ddf07040a078e387d06eaed3fafd1dea560a Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Fri, 2 Dec 2011 20:06:33 +0900
Subject: [PATCH 278/630] (fixes #3118, BP from #2585) fixed not to login
 rejected member using automatic login cookie (from patch)

---
 lib/user/opSecurityUser.class.php | 33 ++++++++++++++++---------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/lib/user/opSecurityUser.class.php b/lib/user/opSecurityUser.class.php
index 21c7788b4..f36149928 100644
--- a/lib/user/opSecurityUser.class.php
+++ b/lib/user/opSecurityUser.class.php
@@ -320,41 +320,42 @@ public function register($form = null)
 
  /**
   * Initializes all credentials associated and status with this user.
+  * The user is one of the following:
+  *  - (U1) a user as a logged in member
+  *  - (U2) a user as a registering as a new member
+  *  - (U3) a user as a logged out member
   */
   public function initializeUserStatus()
   {
-    opActivateBehavior::disable();
-    $member = $this->getMember();
-    opActivateBehavior::enable();
-
+    // Automatic Login
     if ($memberId = $this->getRememberedMemberId())
     {
       $this->setMemberId($memberId);
-      $isSNSMember = true;
     }
-    elseif ($member instanceof opAnonymousMember)
+
+    // get a instance of Member or opAnonymousMember as the user
+    opActivateBehavior::disable();
+    $member = $this->getMember();
+    opActivateBehavior::enable();
+
+    // if user is (U3), or (U1) but rejected login
+    if ($member instanceof opAnonymousMember || $member->getIsLoginRejected())
     {
+      $this->logout();
       $isSNSMember = false;
     }
     else
     {
+      // this value is true only if user is (U1)
       $isSNSMember = (bool)$member->getIsActive();
     }
 
-    if ($this->getMember()->getIsLoginRejected())
-    {
-      $isSNSMember = false;
-    }
-
-    $this->setIsSNSMember($isSNSMember);
     if ($isSNSMember)
     {
       $member->updateLastLoginTime();
     }
-    else
-    {
-      $this->logout();
-    }
+
+    $this->setIsSNSMember($isSNSMember);
   }
 
   public function isMember()

From db4d4496c6b32478dc246ca11fdc3319e8479cf6 Mon Sep 17 00:00:00 2001
From: Maki Takahashi <takahashi@tejimaya.com>
Date: Mon, 24 Oct 2011 17:03:04 +0900
Subject: [PATCH 279/630] (fixes #3119, BP from #2490) fixed merge order in
 i18n

---
 lib/i18n/opI18N.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/i18n/opI18N.class.php b/lib/i18n/opI18N.class.php
index 5865c148a..db77362e3 100644
--- a/lib/i18n/opI18N.class.php
+++ b/lib/i18n/opI18N.class.php
@@ -55,7 +55,7 @@ public function generateApplicationMessages($dirs)
       $messageSource = sfMessageSource::factory('OpenPNE', array());
       $data = $messageSource->loadData($file);
 
-      $catalogues[$name] = array_merge($catalogues[$name], $data);
+      $catalogues[$name] = array_merge($data, $catalogues[$name]);
     }
 
     $cacheDir = sfConfig::get('sf_app_cache_dir').DIRECTORY_SEPARATOR.'i18n';

From b65b6de9af4e66f7c6d19559230f572bd67fde1a Mon Sep 17 00:00:00 2001
From: Maki Takahashi <takahashi@tejimaya.com>
Date: Tue, 17 Jan 2012 20:21:10 +0900
Subject: [PATCH 280/630] (fixes #3119, BP from #2490) fixed to get correct
 order i18n dirs

---
 lib/config/opApplicationConfiguration.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/config/opApplicationConfiguration.class.php b/lib/config/opApplicationConfiguration.class.php
index d73865c2a..c29aa8832 100644
--- a/lib/config/opApplicationConfiguration.class.php
+++ b/lib/config/opApplicationConfiguration.class.php
@@ -321,10 +321,10 @@ public function getI18NDirs($moduleName)
   {
     $dirs = array();
 
-    $dirs = array_merge($dirs, array(sfConfig::get('sf_root_dir').'/i18n'));
     $dirs = array_merge($dirs, $this->globEnablePlugin('/apps/'.sfConfig::get('sf_app').'/i18n'));
     $dirs = array_merge($dirs, $this->globEnablePlugin('/apps/'.sfConfig::get('sf_app').'/modules/'.$moduleName.'/i18n'));
     $dirs = array_merge($dirs, parent::getI18NDirs($moduleName));
+    $dirs = array_merge($dirs, array(sfConfig::get('sf_root_dir').'/i18n'));
 
     return $dirs;
   }

From 0686c34fbfb4039ea56c811a534aafe7ecb7c6e1 Mon Sep 17 00:00:00 2001
From: Maki Takahashi <takahashi@tejimaya.com>
Date: Fri, 3 Feb 2012 20:05:52 +0900
Subject: [PATCH 281/630] (fixes #3119, BP from #2490) fixed to get correct
 order i18n dirs

---
 lib/config/opApplicationConfiguration.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/config/opApplicationConfiguration.class.php b/lib/config/opApplicationConfiguration.class.php
index c29aa8832..f4647b7ed 100644
--- a/lib/config/opApplicationConfiguration.class.php
+++ b/lib/config/opApplicationConfiguration.class.php
@@ -321,8 +321,8 @@ public function getI18NDirs($moduleName)
   {
     $dirs = array();
 
-    $dirs = array_merge($dirs, $this->globEnablePlugin('/apps/'.sfConfig::get('sf_app').'/i18n'));
     $dirs = array_merge($dirs, $this->globEnablePlugin('/apps/'.sfConfig::get('sf_app').'/modules/'.$moduleName.'/i18n'));
+    $dirs = array_merge($dirs, $this->globEnablePlugin('/apps/'.sfConfig::get('sf_app').'/i18n'));
     $dirs = array_merge($dirs, parent::getI18NDirs($moduleName));
     $dirs = array_merge($dirs, array(sfConfig::get('sf_root_dir').'/i18n'));
 

From c2266bd812ba8f2bfe9310d792c7a39a02891dc0 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 9 Aug 2012 21:52:27 +0900
Subject: [PATCH 282/630] (fixes #3126) updated the mobile_ip_address list for
 release 2012/07/16

---
 lib/config/config/mobile_ip_address.yml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/config/config/mobile_ip_address.yml b/lib/config/config/mobile_ip_address.yml
index b34b2b5ca..22e10b958 100644
--- a/lib/config/config/mobile_ip_address.yml
+++ b/lib/config/config/mobile_ip_address.yml
@@ -15,8 +15,9 @@
 ######################################
 
 ######################################
-#  2012/03/23 リリース版
-#  ・au (2012年4月予定)IPアドレス帯域削除対応
+#  2012/07/16 リリース版
+#  ・20120702 SoftBank (2012年7月下旬)IPアドレス帯域削除対応 を取り消し
+#  ・au (2012年6月)IPアドレス帯域削除対応
 ######################################
 
 # DoCoMo (2010/06/24更新)
@@ -73,15 +74,21 @@ ezweb:
   - 111.86.147.192/27
   - 111.86.147.224/27
 
-# au 2011年秋冬モデル以降 (2011/10/17更新)
+# au 2011年秋冬モデル以降 (2012/07/16更新)
 # http://www.au.kddi.com/ezfactory/tec/spec/ezsava_ip.html
-  - 111.107.116.0/26
   - 111.107.116.64/26
   - 111.107.116.192/28
 
-# SoftBank (2011/2/10更新)
+# SoftBank (2012/07/16更新)
 # http://creation.mb.softbank.jp/mc/tech/tech_web/web_ipaddress.html
 softbank:
+# softbank 2012年5月中旬以降
+  - 123.108.237.112/28
+  - 123.108.239.224/28
+  - 202.253.96.144/28
+  - 202.253.99.144/28
+  - 210.228.189.188/30
+# softbank 2012年7月下旬まで
   - 123.108.237.0/27
   - 202.253.96.224/27
   - 210.146.7.192/26

From 09e53cafccb469eb4090820603a87500ff016be8 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 9 Aug 2012 21:53:03 +0900
Subject: [PATCH 283/630] (fixes #3142) updated the mobile_ip_address list for
 release 2012/07/30

---
 lib/config/config/mobile_ip_address.yml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/lib/config/config/mobile_ip_address.yml b/lib/config/config/mobile_ip_address.yml
index 22e10b958..546bb6598 100644
--- a/lib/config/config/mobile_ip_address.yml
+++ b/lib/config/config/mobile_ip_address.yml
@@ -15,9 +15,8 @@
 ######################################
 
 ######################################
-#  2012/07/16 リリース版
-#  ・20120702 SoftBank (2012年7月下旬)IPアドレス帯域削除対応 を取り消し
-#  ・au (2012年6月)IPアドレス帯域削除対応
+#  2012/07/30 リリース版
+#  ・SoftBank (2012年7月下旬)IPアドレス帯域削除対応
 ######################################
 
 # DoCoMo (2010/06/24更新)
@@ -79,7 +78,7 @@ ezweb:
   - 111.107.116.64/26
   - 111.107.116.192/28
 
-# SoftBank (2012/07/16更新)
+# SoftBank (2012/07/30更新)
 # http://creation.mb.softbank.jp/mc/tech/tech_web/web_ipaddress.html
 softbank:
 # softbank 2012年5月中旬以降
@@ -88,10 +87,6 @@ softbank:
   - 202.253.96.144/28
   - 202.253.99.144/28
   - 210.228.189.188/30
-# softbank 2012年7月下旬まで
-  - 123.108.237.0/27
-  - 202.253.96.224/27
-  - 210.146.7.192/26
 
 # WILLCOM (2012/01/12更新)
 # http://www.willcom-inc.com/ja/service/contents_service/create/center_info/

From e4812f72b9fd7177df5047773bba8d8b4dfffe22 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 9 Aug 2012 21:54:43 +0900
Subject: [PATCH 284/630] Revert "add an implement of image post onto
 activity/post.json (fixes #3075, BP from #3064)"

This reverts commit a1e1a104cbef3a56ffa23493cba86276badf87f1.
---
 apps/api/lib/helper/opJsonApiHelper.php       |  7 -------
 .../activity/actions/actions.class.php        | 19 -------------------
 2 files changed, 26 deletions(-)

diff --git a/apps/api/lib/helper/opJsonApiHelper.php b/apps/api/lib/helper/opJsonApiHelper.php
index e5fd560a2..502ff901d 100644
--- a/apps/api/lib/helper/opJsonApiHelper.php
+++ b/apps/api/lib/helper/opJsonApiHelper.php
@@ -60,11 +60,6 @@ function op_api_activity($activity)
 {
   $viewMemberId = sfContext::getInstance()->getUser()->getMemberId();
   $member = $activity->getMember();
-  $images = null;
-  if ($activity->getImages()->count())
-  {
-    $images = $activity->getImages();
-  }
 
   return array(
     'id' => $activity->getId(),
@@ -74,8 +69,6 @@ function op_api_activity($activity)
     'uri' => $activity->getUri(),
     'source' => $activity->getSource(),
     'source_uri' => $activity->getSourceUri(),
-    'image_url' => !is_null($images) ? sf_image_path($images[0]->getFile(), array('size' => '48x48'), true) : null, 
-    'image_large_url' => !is_null($images) ? sf_image_path($images[0]->getFile(), array(), true) : null,
     'created_at' => date('r', strtotime($activity->getCreatedAt())),
   );
 }
diff --git a/apps/api/modules/activity/actions/actions.class.php b/apps/api/modules/activity/actions/actions.class.php
index 4d38d8bd0..9cf307f07 100644
--- a/apps/api/modules/activity/actions/actions.class.php
+++ b/apps/api/modules/activity/actions/actions.class.php
@@ -188,25 +188,6 @@ public function executePost(sfWebRequest $request)
 
     $options['source'] = 'API';
 
-    $imageFile = $request->getFiles('images');
-    if (!empty($imageFile))
-    {   
-      $validator = new opValidatorImageFile(array('required' => false));
-      try 
-      {   
-        $obj = $validator->clean($imageFile);
-      }   
-      catch (sfValidatorError $e) 
-      {   
-        $this->forward400('This image file is invalid.');
-      }   
-      $file = new File();
-      $file->setFromValidatedFile($obj);
-      $file->setName('ac_'.$this->getUser()->getMemberId().'_'.$file->getName());
-      $file->save();
-      $options['images'][] = array('file_id' => $file->getId());
-    }   
-
     $this->activity = Doctrine::getTable('ActivityData')->updateActivity($memberId, $body, $options);
 
     $this->setTemplate('object');

From ba0cd77167429e65a57a7ac39cd3ed350cd927e9 Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 9 Aug 2012 21:58:08 +0900
Subject: [PATCH 285/630] redirect from mobile_frontend.php to index.php for
 smartphone users who have a mobile mail address (refs #3159, BP from #3155)

---
 .../sfDenyFromNonMobileFilter.class.php       | 38 ++++++++++++++++---
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/lib/filter/sfDenyFromNonMobileFilter.class.php b/lib/filter/sfDenyFromNonMobileFilter.class.php
index c3585e5b8..1b7c881c5 100644
--- a/lib/filter/sfDenyFromNonMobileFilter.class.php
+++ b/lib/filter/sfDenyFromNonMobileFilter.class.php
@@ -28,15 +28,21 @@ class sfDenyFromNonMobileFilter extends sfFilter
    */
   public function execute($filterChain)
   {
-      $request = $this->context->getRequest();
+    $request = $this->context->getRequest();
 
-      if (!$request->isMobile()) {
-        if (!$this->isErrorAction()) {
-          $this->forwardToErrorAction();
-        }
+    if (!$request->isMobile() && !$this->isErrorAction())
+    {
+      if ($url = $this->generatePcFrontendUrl())
+      {
+        $this->redirect($url);
       }
+      else
+      {
+        $this->forwardToErrorAction();
+      }
+    }
 
-      $filterChain->execute();
+    $filterChain->execute();
   }
 
   private function isErrorAction()
@@ -50,4 +56,24 @@ private function forwardToErrorAction()
 
     throw new sfStopException();
   }
+
+  private function generatePcFrontendUrl()
+  {
+    $parameters = $this->context->getRequest()->getParameterHolder()->getAll();
+    $parameters['sf_route'] = $this->context->getRouting()->getCurrentRouteName();
+
+    try
+    {
+      return $this->context->getConfiguration()->generateAppUrl('pc_frontend', $parameters, true);
+    }
+    catch (sfConfigurationException $e)
+    {
+      return false;
+    }
+  }
+
+  private function redirect($url)
+  {
+    $this->context->getController()->redirect($url);
+  }
 }

From 5689f175449e70a71e14d41f1a942889055c3d3b Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 9 Aug 2012 23:20:41 +0900
Subject: [PATCH 286/630] [opAuthMailAddressPlugin] registration with mobile
 address in the pc_frontend application for smartphone users (refs #3159, BP
 from #3155)

---
 .../actions/actions.class.php                 |  4 +-
 .../actions/components.class.php              |  3 +-
 .../templates/_registerBox.php                |  4 +-
 .../templates/registerError.php               |  2 +-
 .../i18n/messages.ja.xml                      |  4 +-
 .../opAuthRegisterFormMailAddress.class.php   | 41 +++++++------------
 .../form/opRequestRegisterURLForm.class.php   |  1 -
 .../mail/mobile/_notifyRegisterURL.php        |  8 ----
 .../templates/mail/pc/_notifyRegisterURL.php  | 10 -----
 9 files changed, 23 insertions(+), 54 deletions(-)

diff --git a/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/actions/actions.class.php b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/actions/actions.class.php
index f33d3d90a..d2e86fb96 100644
--- a/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/actions/actions.class.php
+++ b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/actions/actions.class.php
@@ -53,6 +53,7 @@ public function executeRegister($request)
     opActivateBehavior::disable();
     $authMode = $memberConfig->getMember()->getConfig('register_auth_mode');
     $pcAddressPre = $memberConfig->getMember()->getConfig('pc_address_pre');
+    $mobileAddressPre = $memberConfig->getMember()->getConfig('mobile_address_pre');
     opActivateBehavior::enable();
 
     if ('MobileUID' === $authMode)
@@ -61,9 +62,8 @@ public function executeRegister($request)
     }
     $this->forward404Unless($authMode === $this->getUser()->getCurrentAuthMode());
 
-    if (!$pcAddressPre)
+    if (!$pcAddressPre && !$mobileAddressPre)
     {
-      
       return sfView::ERROR;
     }
 
diff --git a/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/actions/components.class.php b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/actions/components.class.php
index 48c15dd6f..ce314a3f2 100644
--- a/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/actions/components.class.php
+++ b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/actions/components.class.php
@@ -15,7 +15,8 @@ public function executeRegisterBox($request)
     $token = $request->getParameter('token');
     $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndValue('register_token', $token);
     opActivateBehavior::disable();
-    $this->pcAddressPre = $memberConfig->getMember()->getConfig('pc_address_pre');
+    $member = $memberConfig->getMember();
+    $this->addressPre = $member->getConfig('pc_address_pre') || $member->getConfig('mobile_address_pre');
     opActivateBehavior::enable();
   }
 }
diff --git a/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/_registerBox.php b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/_registerBox.php
index 957e84c73..1f63eeb7d 100644
--- a/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/_registerBox.php
+++ b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/_registerBox.php
@@ -1,9 +1,9 @@
-<?php if (!$pcAddressPre): ?>
+<?php if (!$addressPre): ?>
 <?php
 $options = array(
   'title' => __('Errors'),
 );
-op_include_box('registerError', __('Can access this registration URL with mobile only.'), $options);
+op_include_box('registerError', __('Your e-mail address is not registered.'), $options);
 ?>
 <?php else: ?>
 <?php op_include_parts('ButtonBox', 'opAuthMailAddressPluginRegisterBox', array(
diff --git a/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/registerError.php b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/registerError.php
index e356c63a7..26a0f575f 100644
--- a/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/registerError.php
+++ b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/templates/registerError.php
@@ -2,5 +2,5 @@
 $options = array(
   'title' => __('Errors'),
 );
-op_include_box('registerError', __('Can access this registration URL with mobile only.'), $options);
+op_include_box('registerError', __('Your e-mail address is not registered.'), $options);
 ?>
diff --git a/plugins/opAuthMailAddressPlugin/i18n/messages.ja.xml b/plugins/opAuthMailAddressPlugin/i18n/messages.ja.xml
index e2ba41348..0ded1f2a1 100644
--- a/plugins/opAuthMailAddressPlugin/i18n/messages.ja.xml
+++ b/plugins/opAuthMailAddressPlugin/i18n/messages.ja.xml
@@ -107,8 +107,8 @@
         <target>この登録用URLはPC専用です。</target>
       </trans-unit>
       <trans-unit id="">
-        <source>Can access this registration URL with mobile only.</source>
-        <target>この登録用URLは携帯電話専用です。</target>
+        <source>Your e-mail address is not registered.</source>
+        <target>メールアドレスが登録されていません。</target>
       </trans-unit>
     </body>
   </file>
diff --git a/plugins/opAuthMailAddressPlugin/lib/form/opAuthRegisterFormMailAddress.class.php b/plugins/opAuthMailAddressPlugin/lib/form/opAuthRegisterFormMailAddress.class.php
index 1a1ddd5e6..daa6cc443 100644
--- a/plugins/opAuthMailAddressPlugin/lib/form/opAuthRegisterFormMailAddress.class.php
+++ b/plugins/opAuthMailAddressPlugin/lib/form/opAuthRegisterFormMailAddress.class.php
@@ -49,42 +49,29 @@ public function doSave()
       return true;
     }
 
-    if (sfConfig::get('app_is_mobile', false))
+    foreach (array('mobile_address', 'pc_address') as $name)
     {
-      $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId('mobile_address_pre', $this->getMember()->getId());
-      $memberConfig->setName('mobile_address');
-    }
-    else
-    {
-      $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId('pc_address_pre', $this->getMember()->getId());
-      $memberConfig->setName('pc_address');
+      $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId($name.'_pre', $this->getMember()->getId());
+      if ($memberConfig)
+      {
+        $memberConfig->setName($name);
+        $memberConfig->save();
+      }
     }
 
-    $memberConfig->save();
-
-    return $memberConfig;
+    return true;
   }
-  
+
   public function validateMemberConfig($validator, $values, $arguments = array())
   {
-    if (sfConfig::get('app_is_mobile', false))
-    {
-      $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId('mobile_address_pre', $this->getMember()->getId());
-      if (!$memberConfig)
-      {
-        throw new sfValidatorError($validator, 'Can access this registration URL with pc only.');
-      }
-    }
-    else
+    $memberConfigMobile = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId('mobile_address_pre', $this->getMember()->getId());
+    $memberConfigPc     = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId('pc_address_pre', $this->getMember()->getId());
+
+    if (!$memberConfigMobile && !$memberConfigPc)
     {
-      $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId('pc_address_pre', $this->getMember()->getId());
-      if (!$memberConfig)
-      {
-        throw new sfValidatorError($validator, 'Can access this registration URL with mobile only.');
-      }
+      throw new sfValidatorError($validator, 'Your e-mail address is not registered.');
     }
 
     return $values;
   }
-
 }
diff --git a/plugins/opAuthMailAddressPlugin/lib/form/opRequestRegisterURLForm.class.php b/plugins/opAuthMailAddressPlugin/lib/form/opRequestRegisterURLForm.class.php
index 4ee787f49..201092b9e 100644
--- a/plugins/opAuthMailAddressPlugin/lib/form/opRequestRegisterURLForm.class.php
+++ b/plugins/opAuthMailAddressPlugin/lib/form/opRequestRegisterURLForm.class.php
@@ -136,7 +136,6 @@ public function sendMail()
     $params = array(
       'token'    => $token,
       'authMode' => 'MailAddress',
-      'isMobile' => opToolkit::isMobileEmailAddress($address),
       'subject' => opConfig::get('sns_name').'招待状',
     );
     opMailSend::sendTemplateMail('notifyRegisterURL', $address, opConfig::get('admin_mail_address'), $params);
diff --git a/plugins/opAuthMailAddressPlugin/templates/mail/mobile/_notifyRegisterURL.php b/plugins/opAuthMailAddressPlugin/templates/mail/mobile/_notifyRegisterURL.php
index eb1394f9e..966de107a 100644
--- a/plugins/opAuthMailAddressPlugin/templates/mail/mobile/_notifyRegisterURL.php
+++ b/plugins/opAuthMailAddressPlugin/templates/mail/mobile/_notifyRegisterURL.php
@@ -5,12 +5,4 @@
 
 <?php echo __('* Participate in %1%', array('%1%' => $snsName)) ?>
 
-<?php if ($isMobile) : ?>
 <?php echo app_url_for('mobile_frontend', sprintf('opAuthMailAddress/register?token=%s&authMode=%s', $token, $authMode), true) ?>
-
-<?php echo __('Can access this registration URL with mobile only.') ?>
-<?php else: ?>
-<?php echo app_url_for('pc_frontend', sprintf('opAuthMailAddress/register?token=%s&authMode=%s', $token, $authMode), true) ?>
-
-<?php echo __('Can access this registration URL with pc only.') ?>
-<?php endif; ?>
diff --git a/plugins/opAuthMailAddressPlugin/templates/mail/pc/_notifyRegisterURL.php b/plugins/opAuthMailAddressPlugin/templates/mail/pc/_notifyRegisterURL.php
index 482b78ff5..640f3a170 100644
--- a/plugins/opAuthMailAddressPlugin/templates/mail/pc/_notifyRegisterURL.php
+++ b/plugins/opAuthMailAddressPlugin/templates/mail/pc/_notifyRegisterURL.php
@@ -5,14 +5,4 @@
 
 <?php echo __('* Participate in %1%', array('%1%' => $snsName)) ?>
 
-
-
-<?php if ($isMobile) : ?>
-<?php echo app_url_for('mobile_frontend', sprintf('opAuthMailAddress/register?token=%s&authMode=%s', $token, $authMode), true) ?>
-
-<?php echo __('Can access this registration URL with mobile only.') ?>
-<?php else: ?>
 <?php echo app_url_for('pc_frontend', sprintf('opAuthMailAddress/register?token=%s&authMode=%s', $token, $authMode), true) ?>
-
-<?php echo __('Can access this registration URL with pc only.') ?>
-<?php endif; ?>

From 72c6bef0c7e2dfed7b7ca0b64eb19e13f574e3bc Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 9 Aug 2012 23:31:44 +0900
Subject: [PATCH 287/630] [opAuthMailAddressPlugin] change the default value of
 `is_check_multiple_address' from 0 to 1 for smartphone users (refs #3159, BP
 from #3155)

---
 plugins/opAuthMailAddressPlugin/config/auth.yml          | 2 +-
 .../lib/form/opAuthConfigFormMailAddress.class.php       | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/plugins/opAuthMailAddressPlugin/config/auth.yml b/plugins/opAuthMailAddressPlugin/config/auth.yml
index 1625ecd93..bccfd1333 100644
--- a/plugins/opAuthMailAddressPlugin/config/auth.yml
+++ b/plugins/opAuthMailAddressPlugin/config/auth.yml
@@ -26,7 +26,7 @@ is_check_multiple_address:
   ValueType: "text"
   IsConfig:   true
   IsRequired: true
-  Default:    0
+  Default:    1
   Choices:
     1: "PCメールアドレスと携帯メールアドレスの両方を受け付ける"
     0: "PCメールアドレスと携帯メールアドレスのどちらか一方を受け付ける"
diff --git a/plugins/opAuthMailAddressPlugin/lib/form/opAuthConfigFormMailAddress.class.php b/plugins/opAuthMailAddressPlugin/lib/form/opAuthConfigFormMailAddress.class.php
index 1865a3c5a..1c77fc12f 100644
--- a/plugins/opAuthMailAddressPlugin/lib/form/opAuthConfigFormMailAddress.class.php
+++ b/plugins/opAuthMailAddressPlugin/lib/form/opAuthConfigFormMailAddress.class.php
@@ -17,4 +17,13 @@
  */
 class opAuthConfigFormMailAddress extends opAuthConfigForm
 {
+  public function setup()
+  {
+    parent::setup();
+
+    $this->widgetSchema->setHelp(
+      'is_check_multiple_address',
+      'どちらか一方を受け付ける設定とした場合、携帯メールアドレスを利用しているスマートフォンユーザーがログインできなくなります。'
+    );
+  }
 }

From 4dd17dbb7d424f11e608a5ae91e82fceeb5ee05a Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Fri, 10 Aug 2012 16:42:09 +0900
Subject: [PATCH 288/630] Revert "[opAuthMailAddressPlugin] change the default
 value of `is_check_multiple_address' from 0 to 1 for smartphone users (refs
 #3159, BP from #3155)"

This reverts commit 72c6bef0c7e2dfed7b7ca0b64eb19e13f574e3bc.
---
 plugins/opAuthMailAddressPlugin/config/auth.yml          | 2 +-
 .../lib/form/opAuthConfigFormMailAddress.class.php       | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/plugins/opAuthMailAddressPlugin/config/auth.yml b/plugins/opAuthMailAddressPlugin/config/auth.yml
index bccfd1333..1625ecd93 100644
--- a/plugins/opAuthMailAddressPlugin/config/auth.yml
+++ b/plugins/opAuthMailAddressPlugin/config/auth.yml
@@ -26,7 +26,7 @@ is_check_multiple_address:
   ValueType: "text"
   IsConfig:   true
   IsRequired: true
-  Default:    1
+  Default:    0
   Choices:
     1: "PCメールアドレスと携帯メールアドレスの両方を受け付ける"
     0: "PCメールアドレスと携帯メールアドレスのどちらか一方を受け付ける"
diff --git a/plugins/opAuthMailAddressPlugin/lib/form/opAuthConfigFormMailAddress.class.php b/plugins/opAuthMailAddressPlugin/lib/form/opAuthConfigFormMailAddress.class.php
index 1c77fc12f..1865a3c5a 100644
--- a/plugins/opAuthMailAddressPlugin/lib/form/opAuthConfigFormMailAddress.class.php
+++ b/plugins/opAuthMailAddressPlugin/lib/form/opAuthConfigFormMailAddress.class.php
@@ -17,13 +17,4 @@
  */
 class opAuthConfigFormMailAddress extends opAuthConfigForm
 {
-  public function setup()
-  {
-    parent::setup();
-
-    $this->widgetSchema->setHelp(
-      'is_check_multiple_address',
-      'どちらか一方を受け付ける設定とした場合、携帯メールアドレスを利用しているスマートフォンユーザーがログインできなくなります。'
-    );
-  }
 }

From 8b264a8b66e355e58b28da220ee8902d6ab795c8 Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Fri, 10 Aug 2012 16:43:55 +0900
Subject: [PATCH 289/630] [opAuthMailAddressPlugin] remove
 `is_check_multiple_address' and always allowed to login with either pc or
 mobile address (refs #3159, BP from #3155)

---
 .../opAuthMailAddressPlugin/config/auth.yml   | 12 ---------
 .../form/opAuthLoginFormMailAddress.class.php | 25 +++----------------
 2 files changed, 4 insertions(+), 33 deletions(-)

diff --git a/plugins/opAuthMailAddressPlugin/config/auth.yml b/plugins/opAuthMailAddressPlugin/config/auth.yml
index 1625ecd93..fa748f10d 100644
--- a/plugins/opAuthMailAddressPlugin/config/auth.yml
+++ b/plugins/opAuthMailAddressPlugin/config/auth.yml
@@ -19,18 +19,6 @@ help_login_error_action:
   IsRequired: false
   Default: "opAuthMailAddress/helpLoginError"
 
-is_check_multiple_address:
-  Name:      "is_check_multiple_address"
-  Caption:   "ログイン用メールアドレス設定"
-  FormType:  "radio"
-  ValueType: "text"
-  IsConfig:   true
-  IsRequired: true
-  Default:    0
-  Choices:
-    1: "PCメールアドレスと携帯メールアドレスの両方を受け付ける"
-    0: "PCメールアドレスと携帯メールアドレスのどちらか一方を受け付ける"
-
 auth_mode_caption:
   IsConfig: 0
   Default: "E-mail Address Login"
diff --git a/plugins/opAuthMailAddressPlugin/lib/form/opAuthLoginFormMailAddress.class.php b/plugins/opAuthMailAddressPlugin/lib/form/opAuthLoginFormMailAddress.class.php
index f1fbed24a..33d786fba 100644
--- a/plugins/opAuthMailAddressPlugin/lib/form/opAuthLoginFormMailAddress.class.php
+++ b/plugins/opAuthMailAddressPlugin/lib/form/opAuthLoginFormMailAddress.class.php
@@ -29,27 +29,10 @@ public function configure()
       'password' => new sfValidatorString(),
     )));
 
-    if ($this->getAuthAdapter()->getAuthConfig('is_check_multiple_address'))
-    {
-      $this->mergePostValidator(new sfValidatorOr(array(
-        new opAuthValidatorMemberConfigAndPassword(array('config_name' => 'mobile_address', 'field_name' => 'mail_address')),
-        new opAuthValidatorMemberConfigAndPassword(array('config_name' => 'pc_address', 'field_name' => 'mail_address')),
-      )));
-    }
-    else
-    {
-      if (sfConfig::get('app_is_mobile', false))
-      {
-        $configName = 'mobile_address';
-      }
-      else
-      {
-        $configName = 'pc_address';
-      }
-      $this->mergePostValidator(
-        new opAuthValidatorMemberConfigAndPassword(array('config_name' => $configName, 'field_name' => 'mail_address'))
-      );
-    }
+    $this->mergePostValidator(new sfValidatorOr(array(
+      new opAuthValidatorMemberConfigAndPassword(array('config_name' => 'mobile_address', 'field_name' => 'mail_address')),
+      new opAuthValidatorMemberConfigAndPassword(array('config_name' => 'pc_address', 'field_name' => 'mail_address')),
+    )));
 
     parent::configure();
   }

From d3f338796a8f6d3db99a1c8c218a38b3f8521e47 Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Fri, 10 Aug 2012 20:35:29 +0900
Subject: [PATCH 290/630] added a note for smartphone users to the mobile
 registration page (refs #3159, BP from #3155)

---
 apps/pc_frontend/i18n/messages.ja.xml                         | 4 ++++
 .../member/templates/registerMobileToRegisterEndSuccess.php   | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/pc_frontend/i18n/messages.ja.xml b/apps/pc_frontend/i18n/messages.ja.xml
index d3221262f..bc4b1f676 100644
--- a/apps/pc_frontend/i18n/messages.ja.xml
+++ b/apps/pc_frontend/i18n/messages.ja.xml
@@ -342,6 +342,10 @@
         <source>It is necessary to register the mobile-phone information to entry in %1%.</source>
         <target>%1%に参加するには、携帯電話の登録が必要です。</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>Please note that you cannot use smartphones.</source>
+        <target>スマートフォンからは登録することができませんのでご注意ください。</target>
+      </trans-unit>
       <trans-unit id="">
         <source>Register the mobile-phone</source>
         <target>携帯電話の登録</target>
diff --git a/apps/pc_frontend/modules/member/templates/registerMobileToRegisterEndSuccess.php b/apps/pc_frontend/modules/member/templates/registerMobileToRegisterEndSuccess.php
index 1fd51c140..220d1b212 100644
--- a/apps/pc_frontend/modules/member/templates/registerMobileToRegisterEndSuccess.php
+++ b/apps/pc_frontend/modules/member/templates/registerMobileToRegisterEndSuccess.php
@@ -1,5 +1,6 @@
 <?php ob_start() ?>
-<p><?php echo __('It is necessary to register the mobile-phone information to entry in %1%.', array('%1%' => $op_config['sns_name'])) ?></p>
+<p><?php echo __('It is necessary to register the mobile-phone information to entry in %1%.', array('%1%' => $op_config['sns_name'])) ?><br />
+<strong><?php echo __('Please note that you cannot use smartphones.') ?></strong></p>
 <p><?php echo __('URL for mobile registration is send to the mobile mail address appropriating input here.') ?></p>
 <ul>
 <li><?php echo __('Other member can not view the mail address that was input here.') ?></li>

From 375db67eb18373c7b710ab6a7ab4255d0f1cba23 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 16 Aug 2012 20:08:11 +0900
Subject: [PATCH 291/630] version 3.8.1

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 40261232c..54b72defd 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.1-dev');
+  define('OPENPNE_VERSION', '3.8.1');
 }

From 001a7ae082b425abefbea327bec81009dcc203bb Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 16 Aug 2012 20:11:04 +0900
Subject: [PATCH 292/630] started to development of OpenPNE 3.8.2

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 54b72defd..a40f859b1 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.1');
+  define('OPENPNE_VERSION', '3.8.2-dev');
 }

From e4cd5003fd7712d5dcc6a00a5c4497512890050b Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 8 Mar 2012 07:21:21 +0900
Subject: [PATCH 293/630] (fixes #3110, BP from #2632) fixed to use file object
 in sfImageHandlar's method argument for displaying correct format

(cherry picked from commit 965265e07da4d1c714231dfa068b7f7759b0fa7f)
---
 apps/pc_backend/modules/monitoring/templates/_imageInfo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/pc_backend/modules/monitoring/templates/_imageInfo.php b/apps/pc_backend/modules/monitoring/templates/_imageInfo.php
index 2e4af7740..37d1913ad 100644
--- a/apps/pc_backend/modules/monitoring/templates/_imageInfo.php
+++ b/apps/pc_backend/modules/monitoring/templates/_imageInfo.php
@@ -2,7 +2,7 @@
 <div class="cell">
 <dl>
 <dt class="day"><?php echo $image->getCreatedAt() ?></dt>
-<dd class="upImage"><a href="<?php echo sf_image_path($image->getName()) ?>"><?php echo image_tag_sf_image($image->getName(), $options = array('size' => '120x120')) ?></a></dd>
+<dd class="upImage"><a href="<?php echo sf_image_path($image) ?>"><?php echo image_tag_sf_image($image, $options = array('size' => '120x120')) ?></a></dd>
 <dd class="fileName"><?php echo $image->getName() ?></dd>
 <?php if ($deleteBtn): ?>
 <dd class="delete"> 

From 58a1e5562e846f4c251e97fb763c1e4045466c62 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Mon, 27 Feb 2012 01:36:11 +0900
Subject: [PATCH 294/630] (fixes #3111, BP from #2629) fixed for sns term

(cherry picked from commit 0969f25c9e0da3fa20357cc5e8b3cf1048fafbdc)
---
 .../mobile_frontend/modules/community/templates/quitError.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/mobile_frontend/modules/community/templates/quitError.php b/apps/mobile_frontend/modules/community/templates/quitError.php
index a76185966..d71c4295c 100644
--- a/apps/mobile_frontend/modules/community/templates/quitError.php
+++ b/apps/mobile_frontend/modules/community/templates/quitError.php
@@ -1,6 +1,6 @@
 <?php op_mobile_page_title(__('Error')) ?>
 <?php if ($isAdmin): ?>
-<font color="<?php echo $op_color['core_color_22'] ?>"><?php echo __('The administrator doesn\'t leave the community.') ?></font>
+<font color="<?php echo $op_color['core_color_22'] ?>"><?php echo __('The administrator doesn\'t leave the %community%.') ?></font>
 <?php else: ?>
-<font color="<?php echo $op_color['core_color_22'] ?>"><?php echo __('You don\'t join this community yet.') ?></font>
+<font color="<?php echo $op_color['core_color_22'] ?>"><?php echo __('You don\'t join this %community% yet.') ?></font>
 <?php endif; ?>

From 142fbe8e4471b362c9766dc32edf984a7adc72f8 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 1 Mar 2012 15:52:12 +0900
Subject: [PATCH 295/630] (fixes #3111, BP from #2629) fixed tranlation catalog
 in pc page

(cherry picked from commit 2a22f454d2a6655e1bd3257f855532f5aa720f6c)
---
 apps/pc_frontend/i18n/messages.ja.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/pc_frontend/i18n/messages.ja.xml b/apps/pc_frontend/i18n/messages.ja.xml
index bc4b1f676..7cfc62254 100644
--- a/apps/pc_frontend/i18n/messages.ja.xml
+++ b/apps/pc_frontend/i18n/messages.ja.xml
@@ -96,7 +96,7 @@
       </trans-unit>
       <trans-unit id="">
         <source>The administrator doesn't leave the %community%.</source>
-        <target>管理者は退会できません。</target>
+        <target>%community%管理者は退会できません。</target>
       </trans-unit>
       <trans-unit id="">
         <source>You haven't joined this %community% yet.</source>

From f3019cbda7a8a9919d759c1057859d8df622887c Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Sun, 26 Feb 2012 23:29:31 +0900
Subject: [PATCH 296/630] (fixes #3171, BP from #2428) add catalog to translate
 max-min validation error

(cherry picked from commit a938ea4169556f7b806ad36524b4d2c197df9ed6)
---
 i18n/messages.ja.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/i18n/messages.ja.xml b/i18n/messages.ja.xml
index 9ac02c3a0..3617cfb55 100644
--- a/i18n/messages.ja.xml
+++ b/i18n/messages.ja.xml
@@ -142,6 +142,14 @@
         <source>Public flag</source>
         <target>公開範囲</target>
       </trans-unit> 
+      <trans-unit id="">
+        <source>"%value%" must be at most %max%.</source>
+        <target>"%value%" は %max% よりも小さくなければなりません。</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>"%value%" must be at least %min%.</source>
+        <target>"%value%" は %min% よりも大きくなければなりません。</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>

From f7339c7b29ce43f38edbf56b0652a7de61ff3a52 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 1 Mar 2012 15:42:37 +0900
Subject: [PATCH 297/630] (fixes #3171, BP from #2428) fixed translation
 catalog where not considering boundary value

(cherry picked from commit 56eff752d74f0563a28391959623322abc26dafa)
---
 i18n/messages.ja.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i18n/messages.ja.xml b/i18n/messages.ja.xml
index 3617cfb55..4343f4c17 100644
--- a/i18n/messages.ja.xml
+++ b/i18n/messages.ja.xml
@@ -144,11 +144,11 @@
       </trans-unit> 
       <trans-unit id="">
         <source>"%value%" must be at most %max%.</source>
-        <target>"%value%" は %max% よりも小さくなければなりません。</target>
+        <target>"%value%" は %max% 以下でなければなりません。</target>
       </trans-unit>
       <trans-unit id="">
         <source>"%value%" must be at least %min%.</source>
-        <target>"%value%" は %min% よりも大きくなければなりません。</target>
+        <target>"%value%" は %min% 以上でなければなりません。</target>
       </trans-unit>
     </body>
   </file>

From 4870fa00461ea8e13d00b1bde5f9e418cc2d8fbc Mon Sep 17 00:00:00 2001
From: Maki Takahashi <takahashi@tejimaya.com>
Date: Thu, 20 Oct 2011 20:29:37 +0900
Subject: [PATCH 298/630] (fixes #3173, BP from #2486) fixed the confirm of
 member delete in pc_backend that considers presetting profiles

(cherry picked from commit f2ac317f875b1ab13dd2d7eb830c7533cfffd326)
---
 .../pc_backend/modules/member/templates/deleteSuccess.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/pc_backend/modules/member/templates/deleteSuccess.php b/apps/pc_backend/modules/member/templates/deleteSuccess.php
index e62013793..bec3623fd 100644
--- a/apps/pc_backend/modules/member/templates/deleteSuccess.php
+++ b/apps/pc_backend/modules/member/templates/deleteSuccess.php
@@ -16,9 +16,15 @@
 <th><?php echo __('Nickname') ?></th><td><?php echo $member->getName() ?></td>
 </tr>
 <?php foreach ($member->getProfiles() as $profile): ?>
+<?php $profileObj = $profile->getProfile(); ?>
 <tr>
+<?php if ($profileObj->isPreset()): ?>
+<?php $config = $profileObj->getPresetConfig(); ?>
+<th><?php echo __($config['Caption']) ?></th>
+<?php else: ?>
 <th><?php echo $profile->getCaption() ?></th>
-<td><?php echo $member->getProfile($profile->getName()) ?></td>
+<?php endif; ?>
+<td><?php echo __($member->getProfile($profile->getName())) ?></td>
 </tr>
 <?php endforeach ?>
 <tr>

From 4fbf02ce5f4c020faa75a5ba3dda381ab33c2df4 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Wed, 22 Aug 2012 14:29:06 +0900
Subject: [PATCH 299/630] add ssl_base_url for `api' application in
 OpenPNE.yml.sample (fixes #3169, BP from #3168)

(cherry picked from commit 32f97ddada57aa848d7570abf1ccc71d93777469)
---
 config/OpenPNE.yml.sample | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/OpenPNE.yml.sample b/config/OpenPNE.yml.sample
index 1086a404c..088367614 100644
--- a/config/OpenPNE.yml.sample
+++ b/config/OpenPNE.yml.sample
@@ -112,6 +112,7 @@ ssl_base_url:
   pc_frontend: "https://example.com"
   mobile_frontend: "https://example.com"
   pc_backend: "https://example.com"
+  api: "https://example.com"
 
 # SSL が必須なアプリケーション
 # Applications that are SSL required

From 6cd125058afe4045b00273c5c88a32cdc450318d Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Wed, 15 Aug 2012 14:53:11 +0900
Subject: [PATCH 300/630] fix javascript error in decoration.js (fixes #3180,
 BP from #3144)

(cherry picked from commit 21220ea2c0bf4ee7cbcd0381b38d4d894c605f26)
---
 web/js/decoration.js     |  4 ++--
 web/js/decoration.js.src | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/web/js/decoration.js b/web/js/decoration.js
index 19d87a647..53222b1bf 100644
--- a/web/js/decoration.js
+++ b/web/js/decoration.js
@@ -1,5 +1,5 @@
 function op_mce_insert_tagname(id,tagname,opt,start,end)
-{opt=opt||"";var elm=document.getElementById(id);var selection=new Selection(elm);var pos=selection.create();elm.focus();start=(start==null||start==undefined)?pos.start:start;end=(end==null||end==undefined)?pos.end:end;var replace="<"+tagname+opt+">"+elm.value.substring(start,end)+"</"+tagname+">";var head=elm.value.substring(0,start);var tail=elm.value.substring(end,elm.value.length);elm.value=head+replace+tail;}
+{opt=opt||"";var elm=$('#'+id);var selection=new Selection(elm[0]);var pos=selection.create();elm.focus();start=(start==null||start==undefined)?pos.start:start;end=(end==null||end==undefined)?pos.end:end;var replace="<"+tagname+opt+">"+elm.val().substring(start,end)+"</"+tagname+">";var head=elm.val().substring(0,start);var tail=elm.val().substring(end,elm.val().length);elm.val(head+replace+tail);}
 function op_mce_show_color_table(id,tagname)
 {var table=$("#"+id+"_color_table");var button=$("#"+id+"_button_op_color");var button_container=$("#"+id+"_buttonmenu");function close_color_table(e)
 {if(e&&$(this).hasClass('disabledHideColorTable')){return;}
@@ -10,4 +10,4 @@ $(document).bind('mousedown',close_color_table);var color=null;var settings={col
 var td=$("<td>",{"class":"disabledHideColorTable",css:{border:"0 none",width:"12px",padding:"2px",margin:"0"}});var a=$("<a>",{href:"#",data:{colorCode:code},"class":"disabledHideColorTable",css:{width:"9px",height:"9px",display:"block",overflow:"hidden",border:"1px solid #808080",backgroundColor:"#"+settings.colors[i]}});a.mousedown(function(){op_mce_insert_tagname(id,tagname,' color="'+$(this).data('colorCode')+'"');close_color_table();return false;});var span=$("<span>",{css:{display:"none"}});span.append(document.createTextNode(code));a.append(span);td.append(a);tr.append(td);}
 table=$("<table>",{id:id+"_color_table","class":"disabledHideColorTable",css:{width:"auto",position:"absolute",zIndex:150,border:"1px solid gray",backgroundColor:"#fff"}});table.append(tbody);button_container.append(table);button_container.css("position","relative");button.css("display","inline-block");var buttonContainerPosition=button_container.offset();var buttonPosition=button.offset();table.css("left",buttonPosition.left-buttonContainerPosition.left+"px");table.css("top",buttonPosition.top-buttonContainerPosition.top+button.offsetHeight+"px");}
 function op_insert_str_to_selection(elm,str,start,end)
-{var selection=new Selection(elm);var pos=selection.create();elm.focus();start=(start==null||start==undefined)?pos.start:start;end=(end==null||end==undefined)?pos.end:end;var head=elm.value.substring(0,pos.start);var tail=elm.value.substring(pos.end,elm.value.length);elm.value=head+str+tail;}
+{var selection=new Selection(elm[0]);var pos=selection.create();elm.focus();start=(start==null||start==undefined)?pos.start:start;end=(end==null||end==undefined)?pos.end:end;var head=elm.val().substring(0,pos.start);var tail=elm.val().substring(pos.end,elm.val().length);elm.val(head+str+tail);}
diff --git a/web/js/decoration.js.src b/web/js/decoration.js.src
index b765dd512..4f92d38b8 100644
--- a/web/js/decoration.js.src
+++ b/web/js/decoration.js.src
@@ -17,20 +17,20 @@ function op_mce_insert_tagname(id, tagname, opt, start, end)
 {
   opt = opt || "";
 
-  var elm = document.getElementById(id);
+  var elm = $('#' + id);
 
-  var selection = new Selection(elm);
+  var selection = new Selection(elm[0]);
   var pos = selection.create();
   elm.focus();
 
   start = (start == null || start == undefined) ? pos.start : start;
   end   = (end == null || end == undefined)     ? pos.end   : end;
 
-  var replace = "<" + tagname + opt + ">" + elm.value.substring(start, end) + "</" + tagname + ">";
+  var replace = "<" + tagname + opt + ">" + elm.val().substring(start, end) + "</" + tagname + ">";
 
-  var head = elm.value.substring(0, start);
-  var tail = elm.value.substring(end, elm.value.length);
-  elm.value =  head + replace + tail;
+  var head = elm.val().substring(0, start);
+  var tail = elm.val().substring(end, elm.val().length);
+  elm.val(head + replace + tail);
 }
 
 function op_mce_show_color_table(id, tagname)
@@ -142,14 +142,14 @@ function op_mce_show_color_table(id, tagname)
 
 function op_insert_str_to_selection(elm, str, start, end)
 {
-  var selection = new Selection(elm);
+  var selection = new Selection(elm[0]);
   var pos = selection.create();
   elm.focus();
   
   start = (start == null || start == undefined) ? pos.start : start;
   end   = (end == null || end == undefined)     ? pos.end   : end;
 
-  var head = elm.value.substring(0, pos.start);
-  var tail = elm.value.substring(pos.end, elm.value.length);
-  elm.value = head + str + tail;
+  var head = elm.val().substring(0, pos.start);
+  var tail = elm.val().substring(pos.end, elm.val().length);
+  elm.val(head + str + tail);
 }

From c8a4f4499fe0066e64b8b72a04825690d5730e89 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Wed, 29 Aug 2012 17:15:49 +0900
Subject: [PATCH 301/630] fix compatibility with PHP 5.2.x (fixes #3178, BP
 from #3121)

---
 apps/api/lib/helper/opJsonApiHelper.php   | 2 +-
 lib/util/opActivityQueryBuilder.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/api/lib/helper/opJsonApiHelper.php b/apps/api/lib/helper/opJsonApiHelper.php
index 502ff901d..9709b835d 100644
--- a/apps/api/lib/helper/opJsonApiHelper.php
+++ b/apps/api/lib/helper/opJsonApiHelper.php
@@ -132,7 +132,7 @@ function op_api_community($community)
   return array(
     'id' => $community->getId(),
     'name' => $community->getName(),
-    'category' => (string)$community->getCommunityCategory() ?: null,
+    'category' => $community->getCommunityCategory() ? $community->getCommunityCategory()->getName() : null,
     'community_url' => $communityUrl,
     'community_image_url' => $communityImage,
     'joining' => $communityMember ? !$communityMember->getIsPre() : false,
diff --git a/lib/util/opActivityQueryBuilder.class.php b/lib/util/opActivityQueryBuilder.class.php
index 6841e9087..661dec582 100644
--- a/lib/util/opActivityQueryBuilder.class.php
+++ b/lib/util/opActivityQueryBuilder.class.php
@@ -71,7 +71,7 @@ public function includeSelf()
 
   public function includeFriends($target_member_id = null)
   {
-    $this->include['friend'] = $target_member_id ?: $this->viewerId;
+    $this->include['friend'] = $target_member_id ? $target_member_id : $this->viewerId;
     return $this;
   }
 

From cdee0a0c945af835ca40b800f7474aff5bbba026 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Fri, 21 Oct 2011 20:51:24 +0900
Subject: [PATCH 302/630] (fixes #3100, BP from #2536) add translation in
 pc_backend community settings page

---
 apps/pc_backend/i18n/messages.ja.xml                        | 4 ++++
 apps/pc_backend/modules/community/templates/listSuccess.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/pc_backend/i18n/messages.ja.xml b/apps/pc_backend/i18n/messages.ja.xml
index 9cc33cb7c..67c027bcf 100644
--- a/apps/pc_backend/i18n/messages.ja.xml
+++ b/apps/pc_backend/i18n/messages.ja.xml
@@ -108,6 +108,10 @@
         <source>%community% Description</source>
         <target>%community%説明文</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>There are no %community% matches search condition.</source>
+        <target>該当する%community%は存在しません。</target>
+      </trans-unit>
 
       <trans-unit id="">
         <source>Text Mode</source>
diff --git a/apps/pc_backend/modules/community/templates/listSuccess.php b/apps/pc_backend/modules/community/templates/listSuccess.php
index 87b258c25..0312ad610 100644
--- a/apps/pc_backend/modules/community/templates/listSuccess.php
+++ b/apps/pc_backend/modules/community/templates/listSuccess.php
@@ -15,7 +15,7 @@
 </form>
 
 <?php if (!$pager->getNbResults()): ?>
-<?php echo __('該当する%community%は存在しません。') ?></p>
+<?php echo __('There are no %community% matches search condition.') ?></p>
 <?php else: ?>
 <?php slot('pager') ?>
 <p><?php op_include_pager_navigation($pager, 'community/list?page=%d', array('use_current_query_string' => true)) ?></p>

From ca1ca47111f7a5b3be9c1e8145d8609ecd8e7d16 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@tejimaya.com>
Date: Thu, 20 Oct 2011 15:56:01 +0900
Subject: [PATCH 303/630] (fixes #3101, BP from #2532) replace comment symbol

---
 apps/pc_backend/modules/profile/templates/deleteSuccess.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/pc_backend/modules/profile/templates/deleteSuccess.php b/apps/pc_backend/modules/profile/templates/deleteSuccess.php
index 529a26d2d..7e1a5d41c 100644
--- a/apps/pc_backend/modules/profile/templates/deleteSuccess.php
+++ b/apps/pc_backend/modules/profile/templates/deleteSuccess.php
@@ -1,6 +1,6 @@
 <h2><?php echo __('Delete profile entry') ?></h2>
 <p><?php echo __('Do you want to delete this anyway?') ?></p>
-<p><?php echo __('※All the member\'s data in this entry will be lost.') ?></p>
+<p><?php echo __('NOTE: All the member\'s data in this entry will be lost.') ?></p>
 <form action="<?php echo url_for('profile/delete?id='.$profile->getId()) ?>" method="post">
 <?php $formCSRF = new sfForm(); ?><input type="hidden" name="<?php echo $formCSRF->getCSRFFieldName() ?>" value="<?php echo $formCSRF->getCSRFToken() ?>" />
 <input type="submit" value="<?php echo __('Delete') ?>" />

From 8247c8be0b8af318b5f4c408c63707ed0ce0652b Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Tue, 25 Oct 2011 16:01:33 +0900
Subject: [PATCH 304/630] (fixes #3102, BP from #2528) deleted translations
 that should be in plugins catalog

---
 apps/pc_backend/i18n/messages.ja.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/apps/pc_backend/i18n/messages.ja.xml b/apps/pc_backend/i18n/messages.ja.xml
index 67c027bcf..dd50e4646 100644
--- a/apps/pc_backend/i18n/messages.ja.xml
+++ b/apps/pc_backend/i18n/messages.ja.xml
@@ -1425,14 +1425,6 @@
         <source>Input the %community% ID you want new members to join and click "Add" button.</source>
         <target>参加させたい%community%のIDを入力して「追加」ボタンを押してください。</target>
       </trans-unit>
-      <trans-unit id="">
-        <source>Authority to Read Topic</source>
-        <target>トピック閲覧権限</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Authority to Create Topic</source>
-        <target>トピック作成権限</target>
-      </trans-unit>
       <trans-unit id="">
         <source>Register policy</source>
         <target>参加方針</target>

From 6cbe04c8d8a9368668754108cdd1f6e759269275 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@tejimaya.com>
Date: Thu, 20 Oct 2011 15:52:28 +0900
Subject: [PATCH 305/630] (fixes #3109, BP from #2533) replaced term ja to en
 in community delete page

---
 apps/pc_backend/modules/community/templates/deleteSuccess.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/pc_backend/modules/community/templates/deleteSuccess.php b/apps/pc_backend/modules/community/templates/deleteSuccess.php
index 00a4f5cca..3f4ecfe35 100644
--- a/apps/pc_backend/modules/community/templates/deleteSuccess.php
+++ b/apps/pc_backend/modules/community/templates/deleteSuccess.php
@@ -14,7 +14,7 @@
 <form action="<?php url_for('community/delete?id='.$community->getId()) ?>" method="post">
 <?php include_partial('community/communityInfo', array(
   'community' => $community,
-  'moreInfo' => array($csrfToken.'<input type="submit" value="削除" />')
+  'moreInfo' => array($csrfToken.'<input type="submit" value="'.__('Delete').'" />')
 )); ?>
 </form>
 

From f83094a27ae154a5be4f4a5012ebb76100c16981 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@tejimaya.com>
Date: Mon, 3 Oct 2011 21:20:54 +0900
Subject: [PATCH 306/630] (fixes #3103, BP from #2458) add br tag to display
 different row with image and name

---
 apps/pc_frontend/templates/_partsManageList.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/pc_frontend/templates/_partsManageList.php b/apps/pc_frontend/templates/_partsManageList.php
index 25f7fb6d1..55d153adb 100644
--- a/apps/pc_frontend/templates/_partsManageList.php
+++ b/apps/pc_frontend/templates/_partsManageList.php
@@ -23,7 +23,7 @@
 <?php include_customizes('id_photo', 'before', $customizeOption) ?>
 <td class="photo">
 <?php if ($options->use_op_link_to_member): ?>
-<?php echo op_link_to_member($item, array('link_target' => op_image_tag_sf_image($item->$getImageFilename(), array('size' => '76x76'))), '@'.$options->item_url) ?>
+<?php echo op_link_to_member($item, array('link_target' => op_image_tag_sf_image($item->$getImageFilename(), array('size' => '76x76'))), '@'.$options->item_url) ?><br />
 <?php echo op_link_to_member($item, array('link_target' => (string)$item), '@'.$options->item_url) ?>
 <?php else: ?>
 <?php echo link_to(op_image_tag_sf_image($item->$getImageFilename(), array('size' => '76x76')), $options->item_url, $item); ?><br />

From 6149adda225f0ce14ea986034fc4e1d146559cbc Mon Sep 17 00:00:00 2001
From: Maki Takahashi <takahashi@tejimaya.com>
Date: Wed, 2 Nov 2011 16:37:27 +0900
Subject: [PATCH 307/630] (fixes #3104, BP from #1167) added "istyle" attribute
 to form widgets for mobile

---
 .../MemberConfigAccessBlock.class.php         | 15 ++++++++
 lib/form/doctrine/InviteForm.class.php        |  5 +++
 lib/form/doctrine/MemberConfigForm.class.php  | 36 +++++++++++++++++++
 3 files changed, 56 insertions(+)

diff --git a/lib/form/MemberConfigForm/MemberConfigAccessBlock.class.php b/lib/form/MemberConfigForm/MemberConfigAccessBlock.class.php
index 50a2e898d..fb061d3db 100644
--- a/lib/form/MemberConfigForm/MemberConfigAccessBlock.class.php
+++ b/lib/form/MemberConfigForm/MemberConfigAccessBlock.class.php
@@ -35,7 +35,22 @@ public function configure()
       $this->blockedRelationshipId[] = $relation['id'];
     }
   }
+  
+  protected function appendMobileInputMode()
+  {
+    parent::appendMobileInputMode();
+
+    foreach ($this as $k => $v)
+    {
+      $widget = $this->widgetSchema[$k];
+      $validator = $this->validatorSchema[$k];
 
+      if ($widget instanceof opWidgetFormInputIncreased)
+      {
+        opToolkit::appendMobileInputModeAttributesForFormWidget($widget, 'numeric');
+      }
+    }
+  }
   public function saveConfig($name, $value)
   {
     if ('access_block' !== $name)
diff --git a/lib/form/doctrine/InviteForm.class.php b/lib/form/doctrine/InviteForm.class.php
index 3cdddc543..e49fb8871 100644
--- a/lib/form/doctrine/InviteForm.class.php
+++ b/lib/form/doctrine/InviteForm.class.php
@@ -39,6 +39,11 @@ public function configure()
     {
       $this->embedForm('captcha', new opCaptchaForm());
     }
+
+    if ('mobile_frontend' === sfConfig::get('sf_app'))
+    {
+      opToolkit::appendMobileInputModeAttributesForFormWidget($this->getWidget('mail_address'), 'alphabet');
+    }
   }
 
   public function validate($validator, $values, $arguments = array())
diff --git a/lib/form/doctrine/MemberConfigForm.class.php b/lib/form/doctrine/MemberConfigForm.class.php
index bd999abb7..04a77a670 100644
--- a/lib/form/doctrine/MemberConfigForm.class.php
+++ b/lib/form/doctrine/MemberConfigForm.class.php
@@ -52,6 +52,42 @@ public function generateConfigWidgets()
         $this->setMemberConfigWidget($key);
       }
     }
+
+    if ('mobile_frontend' === sfConfig::get('sf_app'))
+    {
+      $this->appendMobileInputMode();
+    }
+  }
+
+  protected function appendMobileInputMode()
+  {
+    parent::appendMobileInputMode();
+
+    foreach ($this as $k => $v)
+    {
+      $widget = $this->widgetSchema[$k];
+      $validator = $this->validatorSchema[$k];
+
+      if (!($widget instanceof sfWidgetFormInput))
+      {
+        continue;
+      }
+
+      if ($validator instanceof sfValidatorAnd)
+      {
+        foreach ($validator->getValidators() as $childValidator)
+        {
+          if ($childValidator instanceof sfValidatorEmail)
+          {
+            opToolkit::appendMobileInputModeAttributesForFormWidget($widget, 'alphabet');
+          }
+          elseif ($childValidator instanceof sfValidatorNumber)
+          {
+            opToolkit::appendMobileInputModeAttributesForFormWidget($widget, 'numeric');
+          }
+        }
+      }
+    }
   }
 
   public function setMemberConfigSettings()

From d8b6597b1a90df2b35378264034fbb20f93a66ac Mon Sep 17 00:00:00 2001
From: Maki Takahashi <takahashi@tejimaya.com>
Date: Wed, 11 Jan 2012 19:45:05 +0900
Subject: [PATCH 308/630] (fixes #3104, BP from #1167) fixed for coding
 standard

---
 lib/form/MemberConfigForm/MemberConfigAccessBlock.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/form/MemberConfigForm/MemberConfigAccessBlock.class.php b/lib/form/MemberConfigForm/MemberConfigAccessBlock.class.php
index fb061d3db..480809415 100644
--- a/lib/form/MemberConfigForm/MemberConfigAccessBlock.class.php
+++ b/lib/form/MemberConfigForm/MemberConfigAccessBlock.class.php
@@ -35,7 +35,7 @@ public function configure()
       $this->blockedRelationshipId[] = $relation['id'];
     }
   }
-  
+
   protected function appendMobileInputMode()
   {
     parent::appendMobileInputMode();
@@ -51,6 +51,7 @@ protected function appendMobileInputMode()
       }
     }
   }
+
   public function saveConfig($name, $value)
   {
     if ('access_block' !== $name)

From 7e7a550addc72caffa526d5a62833f8ebbe8d2f0 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Mon, 27 Feb 2012 11:55:01 +0900
Subject: [PATCH 309/630] (fixes #3105 BP from #2770) fixed to generate correct
 link having 'www.' cmd domain

---
 lib/helper/opUtilHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/helper/opUtilHelper.php b/lib/helper/opUtilHelper.php
index 315112ae0..eecc76299 100644
--- a/lib/helper/opUtilHelper.php
+++ b/lib/helper/opUtilHelper.php
@@ -345,7 +345,7 @@ function _op_url_cmd($matches)
   if ('www.' == $matches[2])
   {
     $cmd .= 'www.';
-    $url = 'http://www.'.$url;
+    $url = 'http://'.$url;
   }
 
   if (preg_match('/([a-zA-Z0-9\-.]+)\/?(?:[a-zA-Z0-9_\-\/.,:;\~\?@&=+$%#!()])*/', $matches[3], $pmatch))

From 7ce84bb02c5a37904e93af14284b2ff4ffc483bd Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@tejimaya.com>
Date: Wed, 5 Oct 2011 21:19:57 +0900
Subject: [PATCH 310/630] (fixes #3113, BP from #2469) fixed not to occur
 internal server error

---
 lib/user/opSecurityUser.class.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/user/opSecurityUser.class.php b/lib/user/opSecurityUser.class.php
index f36149928..4a7e4d5db 100644
--- a/lib/user/opSecurityUser.class.php
+++ b/lib/user/opSecurityUser.class.php
@@ -248,13 +248,13 @@ public function login($memberId = null)
 
     $this->initializeUserStatus();
 
-    if ($this->getAuthAdapter()->getAuthForm()->getValue('is_remember_me'))
-    {
-      $this->setRememberLoginCookie();
-    }
-
     if ($this->isAuthenticated())
     {
+      if ($this->getAuthAdapter()->getAuthForm()->getValue('is_remember_me'))
+      {
+        $this->setRememberLoginCookie();
+      }
+
       $this->setCurrentAuthMode($this->getAuthAdapter()->getAuthModeName());
       $uri = $this->getAuthAdapter()->getAuthForm()->getValue('next_uri');
 

From 0f0d2069b1c8fbf84c3a201935fdde576daa8424 Mon Sep 17 00:00:00 2001
From: mtakai <m.takai@tejimaya.com>
Date: Thu, 6 Oct 2011 22:20:04 +0900
Subject: [PATCH 311/630] (fixes #3113, BP from #2414) set mobile_cookie_uid
 after login.

---
 lib/user/opSecurityUser.class.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/user/opSecurityUser.class.php b/lib/user/opSecurityUser.class.php
index 4a7e4d5db..367edcd75 100644
--- a/lib/user/opSecurityUser.class.php
+++ b/lib/user/opSecurityUser.class.php
@@ -255,6 +255,13 @@ public function login($memberId = null)
         $this->setRememberLoginCookie();
       }
 
+      // set mobile_cookie_uid for easy login
+      $cookieUid = sfContext::getInstance()->getResponse()->generateMobileUidCookie();
+      if ($cookieUid)
+      {
+        $this->getMember()->setConfig('mobile_cookie_uid', $cookieUid);
+      }
+
       $this->setCurrentAuthMode($this->getAuthAdapter()->getAuthModeName());
       $uri = $this->getAuthAdapter()->getAuthForm()->getValue('next_uri');
 

From 8e28d9343b3f18eab8ab6a1e2cab9e43175f0082 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Tue, 11 Sep 2012 16:45:40 +0900
Subject: [PATCH 312/630] fix coding style issue (refs #3178, BP from #3121)

(cherry picked from commit 28c087935d5eb411ded3b902333c30608ef2a845)
---
 lib/util/opActivityQueryBuilder.class.php | 43 +++++++++++++----------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/lib/util/opActivityQueryBuilder.class.php b/lib/util/opActivityQueryBuilder.class.php
index 661dec582..692004db5 100644
--- a/lib/util/opActivityQueryBuilder.class.php
+++ b/lib/util/opActivityQueryBuilder.class.php
@@ -40,12 +40,14 @@ public function __construct()
   public function setViewerId($viewerId)
   {
     $this->viewerId = $viewerId;
+
     return $this;
   }
 
-  public function setCommunityId($community_id)
+  public function setCommunityId($communityId)
   {
-    $this->communityId = $community_id;
+    $this->communityId = $communityId;
+
     return $this;
   }
 
@@ -66,30 +68,35 @@ public function resetInclude()
   public function includeSelf()
   {
     $this->include['self'] = true;
+
     return $this;
   }
 
-  public function includeFriends($target_member_id = null)
+  public function includeFriends($targetMemberId = null)
   {
-    $this->include['friend'] = $target_member_id ? $target_member_id : $this->viewerId;
+    $this->include['friend'] = $targetMemberId ? $targetMemberId : $this->viewerId;
+
     return $this;
   }
 
   public function includeSns()
   {
     $this->include['sns'] = true;
+
     return $this;
   }
 
   public function includeMentions()
   {
     $this->include['mention'] = true;
+
     return $this;
   }
 
-  public function includeMember($member_id)
+  public function includeMember($memberId)
   {
-    $this->include['member'] = $member_id;
+    $this->include['member'] = $memberId;
+
     return $this;
   }
 
@@ -149,12 +156,12 @@ protected function buildSelfQuery($query)
     return $this->buildMemberQuery($query, $this->viewerId, ActivityDataTable::PUBLIC_FLAG_PRIVATE);
   }
 
-  protected function buildFriendQuery($query, $member_id)
+  protected function buildFriendQuery($query, $memberId)
   {
     $friendsQuery = $query->createSubquery()
       ->select('r.member_id_to')
       ->from('MemberRelationship r')
-      ->addWhere('r.member_id_from = ?', $member_id)
+      ->addWhere('r.member_id_from = ?', $memberId)
       ->addWhere('r.is_friend = true');
 
     return $this->buildMemberQuery($query, $friendsQuery, ActivityDataTable::PUBLIC_FLAG_FRIEND);
@@ -165,31 +172,31 @@ protected function buildAllMemberQuery($query)
     return $this->buildMemberQuery($query, null, ActivityDataTable::PUBLIC_FLAG_SNS);
   }
 
-  protected function buildMemberQuery($query, $member_id = null, $public_flag = ActivityDataTable::PUBLIC_FLAG_SNS)
+  protected function buildMemberQuery($query, $memberId = null, $publicFlag = ActivityDataTable::PUBLIC_FLAG_SNS)
   {
-    if (is_array($member_id))
+    if (is_array($memberId))
     {
-      $query->andWhereIn('a.member_id', $member_id);
+      $query->andWhereIn('a.member_id', $memberId);
     }
-    elseif ($member_id instanceof Doctrine_Query)
+    elseif ($memberId instanceof Doctrine_Query)
     {
-      $query->andWhere('a.member_id IN ('.$member_id->getDql().')');
+      $query->andWhere('a.member_id IN ('.$memberId->getDql().')');
     }
-    elseif (is_scalar($member_id))
+    elseif (is_scalar($memberId))
     {
-      $query->andWhere('a.member_id = ?', $member_id);
+      $query->andWhere('a.member_id = ?', $memberId);
     }
 
-    $query->andWhereIn('a.public_flag', $this->table->getViewablePublicFlags($public_flag));
+    $query->andWhereIn('a.public_flag', $this->table->getViewablePublicFlags($publicFlag));
 
     return $query;
   }
 
-  protected function buildMemberQueryWithCheckRel($query, $member_id = null)
+  protected function buildMemberQueryWithCheckRel($query, $memberId = null)
   {
     $subQuery = array();
 
-    foreach ((array)$member_id as $id)
+    foreach ((array)$memberId as $id)
     {
       if ($this->viewerId === $id)
       {

From 277a06db0a2fc90ae33ebc93db7082bcb5d2f6a3 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Wed, 12 Sep 2012 15:33:38 +0900
Subject: [PATCH 313/630] (fixes #3175, BP from #2649) fixed i18n

---
 apps/pc_backend/i18n/messages.ja.xml          | 48 +++++++++++++++++++
 .../lib/AdminUserEditPasswordForm.class.php   |  5 ++
 .../modules/admin/templates/_submenu.php      |  6 +--
 .../admin/templates/addUserSuccess.php        |  4 +-
 .../admin/templates/changeLanguageSuccess.php |  2 +-
 .../admin/templates/deleteUserSuccess.php     |  8 ++--
 .../admin/templates/editPasswordSuccess.php   |  4 +-
 .../admin/templates/manageUserSuccess.php     | 12 ++---
 lib/form/doctrine/AdminUserForm.class.php     |  4 +-
 9 files changed, 73 insertions(+), 20 deletions(-)

diff --git a/apps/pc_backend/i18n/messages.ja.xml b/apps/pc_backend/i18n/messages.ja.xml
index dd50e4646..0fefafc40 100644
--- a/apps/pc_backend/i18n/messages.ja.xml
+++ b/apps/pc_backend/i18n/messages.ja.xml
@@ -1469,6 +1469,54 @@
         <source>Advanced Settings</source>
         <target>上級者向け設定</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>Old password</source>
+        <target>古いパスワード</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>New password</source>
+        <target>新しいパスワード</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Account management</source>
+        <target>アカウント管理</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Set administrator account.</source>
+        <target>管理用アカウントを設定します。</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Registering a new administrator account</source>
+        <target>アカウント追加</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Add</source>
+        <target>追加</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>User name</source>
+        <target>ユーザ名</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Delete account</source>
+        <target>アカウント削除</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Are you sure you want to delete this account?</source>
+        <target>このアカウントを本当に削除しますか？</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Delete account</source>
+        <target>アカウント削除</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Change language</source>
+        <target>言語変更</target>
+      </trans-unit>
+      <trans-unit id="">
+        <source>Languages</source>
+        <target>言語</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/apps/pc_backend/modules/admin/lib/AdminUserEditPasswordForm.class.php b/apps/pc_backend/modules/admin/lib/AdminUserEditPasswordForm.class.php
index 86c08ee23..c534bb64b 100644
--- a/apps/pc_backend/modules/admin/lib/AdminUserEditPasswordForm.class.php
+++ b/apps/pc_backend/modules/admin/lib/AdminUserEditPasswordForm.class.php
@@ -29,6 +29,11 @@ public function configure()
       'callback'  => array('AdminUserEditPasswordForm', 'validate'),
       'arguments' => array('object' => $this->getObject()),
     )));
+
+    $this->widgetSchema->setLabels(array(
+      'old_password' => 'Old password',
+      'new_password' => 'New password',
+    ));
   }
 
   public static function validate($validator, $values, $arguments = array())
diff --git a/apps/pc_backend/modules/admin/templates/_submenu.php b/apps/pc_backend/modules/admin/templates/_submenu.php
index 90c1a5469..c9c73564a 100644
--- a/apps/pc_backend/modules/admin/templates/_submenu.php
+++ b/apps/pc_backend/modules/admin/templates/_submenu.php
@@ -1,3 +1,3 @@
-<li><?php echo link_to(__('Account Management'), 'admin/manageUser') ?></li>
-<li><?php echo link_to(__('Change Password'), 'admin/editPassword') ?></li>
-<li><?php echo link_to(__('Change Language'), 'admin/changeLanguage') ?></li>
+<li><?php echo link_to(__('Account management'), 'admin/manageUser') ?></li>
+<li><?php echo link_to(__('Change password'), 'admin/editPassword') ?></li>
+<li><?php echo link_to(__('Change language'), 'admin/changeLanguage') ?></li>
diff --git a/apps/pc_backend/modules/admin/templates/addUserSuccess.php b/apps/pc_backend/modules/admin/templates/addUserSuccess.php
index efb8fa59c..0d101f638 100644
--- a/apps/pc_backend/modules/admin/templates/addUserSuccess.php
+++ b/apps/pc_backend/modules/admin/templates/addUserSuccess.php
@@ -2,13 +2,13 @@
 <?php include_partial('submenu') ?>
 <?php end_slot(); ?>
 
-<h2><?php echo __('アカウント追加') ?></h2>
+<h2><?php echo __('Registering a new administrator account') ?></h2>
 
 <form action="<?php url_for('admin/addUser') ?>" method="post">
 <table>
 <?php echo $form ?>
 <tr>
-<td colspan="2"><input type="submit" value="<?php echo __('追加') ?>" /></td>
+<td colspan="2"><input type="submit" value="<?php echo __('Add') ?>" /></td>
 </tr>
 </table>
 </form>
diff --git a/apps/pc_backend/modules/admin/templates/changeLanguageSuccess.php b/apps/pc_backend/modules/admin/templates/changeLanguageSuccess.php
index 979825592..b278a133b 100644
--- a/apps/pc_backend/modules/admin/templates/changeLanguageSuccess.php
+++ b/apps/pc_backend/modules/admin/templates/changeLanguageSuccess.php
@@ -2,7 +2,7 @@
 <?php include_partial('submenu') ?>
 <?php end_slot(); ?>
 
-<?php slot('title', __('Change Language')) ?>
+<?php slot('title', __('Change language')) ?>
 
 <form action="<?php echo url_for('admin/changeLanguage') ?>" method="post">
 <?php echo $form ?>
diff --git a/apps/pc_backend/modules/admin/templates/deleteUserSuccess.php b/apps/pc_backend/modules/admin/templates/deleteUserSuccess.php
index 02628074e..39e83e8f4 100644
--- a/apps/pc_backend/modules/admin/templates/deleteUserSuccess.php
+++ b/apps/pc_backend/modules/admin/templates/deleteUserSuccess.php
@@ -2,9 +2,9 @@
 <?php include_partial('submenu') ?>
 <?php end_slot(); ?>
 
-<h2><?php echo __('アカウント削除') ?></h2>
+<h2><?php echo __('Delete account') ?></h2>
 
-<p><?php echo __('このアカウントを本当に削除しますか？') ?></p>
+<p><?php echo __('Are you sure you want to delete this account?') ?></p>
 
 <form action="<?php url_for('admin/deleteUser') ?>" method="post">
 <table>
@@ -12,12 +12,12 @@
 <th><?php echo __('ID') ?></th><td><?php echo $user->getId() ?></td>
 </tr>
 <tr>
-<th><?php echo __('ユーザ名') ?></th><td><?php echo $user->getUsername() ?></td>
+<th><?php echo __('User name') ?></th><td><?php echo $user->getUsername() ?></td>
 </tr>
 <tr>
 <td colspan="2">
 <?php echo $form ?>
-<input type="submit" value="<?php echo __('削除') ?>" />
+<input type="submit" value="<?php echo __('Delete') ?>" />
 </td>
 </tr>
 </table>
diff --git a/apps/pc_backend/modules/admin/templates/editPasswordSuccess.php b/apps/pc_backend/modules/admin/templates/editPasswordSuccess.php
index e33187cff..0dc9d50b9 100644
--- a/apps/pc_backend/modules/admin/templates/editPasswordSuccess.php
+++ b/apps/pc_backend/modules/admin/templates/editPasswordSuccess.php
@@ -2,13 +2,13 @@
 <?php include_partial('submenu') ?>
 <?php end_slot(); ?>
 
-<h2><?php echo __('パスワード変更') ?></h2>
+<h2><?php echo __('Change password') ?></h2>
 
 <form action="<?php url_for('admin/editPassword') ?>" method="post">
 <table>
 <?php echo $form ?>
 <tr>
-<td colspan="2"><input type="submit" value="<?php echo __('変更') ?>" /></td>
+<td colspan="2"><input type="submit" value="<?php echo __('Setting') ?>" /></td>
 </tr>
 </table>
 </form>
diff --git a/apps/pc_backend/modules/admin/templates/manageUserSuccess.php b/apps/pc_backend/modules/admin/templates/manageUserSuccess.php
index 6c158295c..1345882d0 100644
--- a/apps/pc_backend/modules/admin/templates/manageUserSuccess.php
+++ b/apps/pc_backend/modules/admin/templates/manageUserSuccess.php
@@ -2,23 +2,23 @@
 <?php include_partial('submenu') ?>
 <?php end_slot(); ?>
 
-<h2><?php echo __('アカウント管理') ?></h2>
+<h2><?php echo __('Account management') ?></h2>
 
-<p><?php echo __('管理用アカウントを設定します。') ?></p>
-<p><?php echo link_to(__('アカウントを追加する'), 'admin/addUser') ?></p>
+<p><?php echo __('Set administrator account.') ?></p>
+<p><?php echo link_to(__('Registering a new administrator account'), 'admin/addUser') ?></p>
 
 <table>
 <tr>
 <th><?php echo __('ID') ?></th>
-<th><?php echo __('ユーザ名') ?></th>
-<th><?php echo __('操作') ?></th>
+<th><?php echo __('User name') ?></th>
+<th><?php echo __('Operation') ?></th>
 </tr>
 <?php foreach ($users as $user) : ?>
 <tr>
 <th><?php echo $user->getId() ?></th>
 <td><?php echo $user->getUsername() ?></td>
 <td><?php if ($user->getId() != 1 && $user->getId() != $sf_user->getId()) : ?>
-<?php echo link_to(__('削除'), 'admin/deleteUser?id='.$user->getId()) ?>
+<?php echo link_to(__('Delete'), 'admin/deleteUser?id='.$user->getId()) ?>
 <?php endif; ?></td>
 </tr>
 <?php endforeach; ?>
diff --git a/lib/form/doctrine/AdminUserForm.class.php b/lib/form/doctrine/AdminUserForm.class.php
index 1a2fba094..74e162f15 100644
--- a/lib/form/doctrine/AdminUserForm.class.php
+++ b/lib/form/doctrine/AdminUserForm.class.php
@@ -34,8 +34,8 @@ public function configure()
     $this->errorSchema = new sfValidatorErrorSchema($this->validatorSchema);
 
     $this->widgetSchema->setLabels(array(
-      'username' => 'アカウント名',
-      'password' => 'パスワード',
+      'username' => 'User name',
+      'password' => 'Password',
     ));
 
     $this->mergePostValidator(new sfValidatorDoctrineUnique(array(

From 4430647e692c460d99f198c2ca02400668543fd1 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Wed, 12 Sep 2012 15:36:06 +0900
Subject: [PATCH 314/630] (refs #3175, BP from #2649) removed trailing
 whitespaces

---
 apps/pc_backend/i18n/messages.ja.xml | 48 ++++++++++++++--------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/apps/pc_backend/i18n/messages.ja.xml b/apps/pc_backend/i18n/messages.ja.xml
index 0fefafc40..c7368ab8c 100644
--- a/apps/pc_backend/i18n/messages.ja.xml
+++ b/apps/pc_backend/i18n/messages.ja.xml
@@ -1232,43 +1232,43 @@
       <trans-unit id="">
         <source>No members matching</source>
         <target>該当するメンバーは存在しません。</target>
-      </trans-unit>  
+      </trans-unit>
       <trans-unit id="">
         <source>Unsubscribe</source>
         <target>強制退会</target>
-      </trans-unit>  
+      </trans-unit>
       <trans-unit id="">
         <source>Ban</source>
         <target>ログイン停止</target>
-      </trans-unit>  
+      </trans-unit>
       <trans-unit id="">
         <source>Unban</source>
         <target>ログイン停止解除</target>
-      </trans-unit>  
+      </trans-unit>
       <trans-unit id="">
         <source>Reissue password</source>
         <target>パスワード再発行</target>
-      </trans-unit>  
+      </trans-unit>
       <trans-unit id="">
         <source>Add mobile UID to blacklist</source>
         <target>携帯電話個体識別番号をブラックリストに登録</target>
-      </trans-unit>  
+      </trans-unit>
       <trans-unit id="">
         <source>Invited by</source>
         <target>招待者</target>
-      </trans-unit>  
+      </trans-unit>
       <trans-unit id="">
         <source>Last login</source>
         <target>最終ログイン</target>
-      </trans-unit>  
+      </trans-unit>
       <trans-unit id="">
         <source>PC email</source>
         <target>PCメールアドレス</target>
-      </trans-unit>  
+      </trans-unit>
       <trans-unit id="">
         <source>Mobile email</source>
         <target>携帯メールアドレス</target>
-      </trans-unit>  
+      </trans-unit>
       <trans-unit id="">
         <source>Mobile UID</source>
         <target>携帯電話個体識別番号（暗号化済）</target>
@@ -1276,31 +1276,31 @@
       <trans-unit id="">
         <source>Ban Setting</source>
         <target>ログイン停止設定</target>
-      </trans-unit> 
+      </trans-unit>
       <trans-unit id="">
         <source>[0]Do you want to ban this member?[1]Do you want to unban this member?</source>
         <target>[0]ログイン停止設定を有効にします。|[1]ログイン停止設定を解除します。</target>
-      </trans-unit> 
+      </trans-unit>
       <trans-unit id="">
         <source>[0]Ban|[1]Unban</source>
         <target>[0]有効にする|[1]解除する</target>
-      </trans-unit> 
+      </trans-unit>
       <trans-unit id="">
         <source>Return to previous page</source>
         <target>前のページに戻る</target>
-      </trans-unit> 
+      </trans-unit>
       <trans-unit id="">
         <source>Change %1%'s password</source>
         <target>%1%さんのパスワードを変更します。</target>
-      </trans-unit> 
+      </trans-unit>
       <trans-unit id="">
         <source>Change password</source>
         <target>パスワード変更</target>
-      </trans-unit> 
+      </trans-unit>
       <trans-unit id="">
         <source>Blacklist Management</source>
         <target>ブラックリスト管理</target>
-      </trans-unit> 
+      </trans-unit>
       <trans-unit id="">
         <source>Add to blacklist</source>
         <target>ブラックリストに追加</target>
@@ -1340,27 +1340,27 @@
       <trans-unit id="">
         <source>Can't unsubscribe the member has ID = 1</source>
         <target>IDが1のメンバーは退会することができません。</target>
-      </trans-unit> 
+      </trans-unit>
       <trans-unit id="">
         <source>Do you want to delete this member anyway?</source>
         <target>本当にこのメンバーを強制退会させてもよろしいですか？</target>
-      </trans-unit> 
+      </trans-unit>
       <trans-unit id="">
         <source>The data of this member will be lost forever.</source>
         <target>強制退会させると、このメンバーに関する情報は削除され元に戻すことはできません。</target>
-      </trans-unit> 
+      </trans-unit>
       <trans-unit id="">
         <source>Delete Blacklist</source>
         <target>ブラックリスト削除</target>
-      </trans-unit> 
+      </trans-unit>
       <trans-unit id="">
         <source>Do you want to delete the following?</source>
         <target>以下の内容を本当に削除しますか？</target>
-      </trans-unit> 
+      </trans-unit>
       <trans-unit id="">
         <source>Authentication plugin is not available.</source>
         <target>招待可能な認証プラグインがありません。</target>
-      </trans-unit> 
+      </trans-unit>
       <trans-unit id="">
         <source>Please try this again after changing "Authentication plugin" settings in "Plugins" menu.</source>
         <target>「プラグイン設定」から認証プラグインの設定を変更してからやりなおしてください。</target>
@@ -1380,7 +1380,7 @@
       <trans-unit id="">
         <source>The member has been unsubscribed</source>
         <target>退会が完了しました</target>
-      </trans-unit>    
+      </trans-unit>
       <trans-unit id="">
         <source>%Community% Name</source>
         <target>%Community%名</target>

From 186dd73845c8bf7e4f70d8a8ffaf6f611ecbb4ca Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Wed, 12 Sep 2012 15:39:58 +0900
Subject: [PATCH 315/630] (refs #3175, BP from #2649) fixed for coding
 standards

---
 .../modules/admin/lib/AdminUserEditPasswordForm.class.php       | 1 +
 apps/pc_backend/modules/admin/templates/manageUserSuccess.php   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/pc_backend/modules/admin/lib/AdminUserEditPasswordForm.class.php b/apps/pc_backend/modules/admin/lib/AdminUserEditPasswordForm.class.php
index c534bb64b..c14c80e12 100644
--- a/apps/pc_backend/modules/admin/lib/AdminUserEditPasswordForm.class.php
+++ b/apps/pc_backend/modules/admin/lib/AdminUserEditPasswordForm.class.php
@@ -42,6 +42,7 @@ public static function validate($validator, $values, $arguments = array())
     {
       $values['username'] = $arguments['object']->getUsername();
       $values['password'] = $values['new_password'];
+
       return $values;
     }
 
diff --git a/apps/pc_backend/modules/admin/templates/manageUserSuccess.php b/apps/pc_backend/modules/admin/templates/manageUserSuccess.php
index 1345882d0..0d2e6edbf 100644
--- a/apps/pc_backend/modules/admin/templates/manageUserSuccess.php
+++ b/apps/pc_backend/modules/admin/templates/manageUserSuccess.php
@@ -17,7 +17,7 @@
 <tr>
 <th><?php echo $user->getId() ?></th>
 <td><?php echo $user->getUsername() ?></td>
-<td><?php if ($user->getId() != 1 && $user->getId() != $sf_user->getId()) : ?>
+<td><?php if (1 != $user->getId() && $user->getId() != $sf_user->getId()) : ?>
 <?php echo link_to(__('Delete'), 'admin/deleteUser?id='.$user->getId()) ?>
 <?php endif; ?></td>
 </tr>

From 966d5461a67b1a63042763d5dac3bb587de54a05 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Wed, 12 Sep 2012 15:40:17 +0900
Subject: [PATCH 316/630] (refs #3175, BP from #2649) add license

---
 .../modules/admin/lib/AdminUserEditPasswordForm.class.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/pc_backend/modules/admin/lib/AdminUserEditPasswordForm.class.php b/apps/pc_backend/modules/admin/lib/AdminUserEditPasswordForm.class.php
index c14c80e12..5effae891 100644
--- a/apps/pc_backend/modules/admin/lib/AdminUserEditPasswordForm.class.php
+++ b/apps/pc_backend/modules/admin/lib/AdminUserEditPasswordForm.class.php
@@ -1,5 +1,13 @@
 <?php
 
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
 /**
  * AdminUserEditPasswordForm
  *

From c98d346e5bd5e022dc8509c2af581db5397b5b2a Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@tejimaya.com>
Date: Thu, 20 Oct 2011 15:58:04 +0900
Subject: [PATCH 317/630] (fixes #3101, BP from #2532) replace comment symbol

---
 apps/pc_backend/i18n/messages.ja.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/pc_backend/i18n/messages.ja.xml b/apps/pc_backend/i18n/messages.ja.xml
index c7368ab8c..3d6c69425 100644
--- a/apps/pc_backend/i18n/messages.ja.xml
+++ b/apps/pc_backend/i18n/messages.ja.xml
@@ -1182,7 +1182,7 @@
         <target>本当に削除してもよろしいですか？</target>
       </trans-unit>
       <trans-unit id="">
-        <source>※All the member's data in this entry will be lost.</source>
+        <source>NOTE: All the member's data in this entry will be lost.</source>
         <target>※この項目に対するメンバーの入力値も失われます。</target>
       </trans-unit>
       <trans-unit id="">

From a322bfa2bddce30e57cbba45a39d471a09203dee Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 13 Sep 2012 14:21:20 +0900
Subject: [PATCH 318/630] (refs #3175, BP from #2649) removed duplicated
 tranlatinos

modified from commit:e1a2ed8ac206c56ec36a656c57a54193b2e6958b
---
 apps/pc_backend/i18n/messages.ja.xml | 56 ----------------------------
 1 file changed, 56 deletions(-)

diff --git a/apps/pc_backend/i18n/messages.ja.xml b/apps/pc_backend/i18n/messages.ja.xml
index 3d6c69425..cfd46fda4 100644
--- a/apps/pc_backend/i18n/messages.ja.xml
+++ b/apps/pc_backend/i18n/messages.ja.xml
@@ -335,10 +335,6 @@
         <source>Remove Admin Token</source>
         <target>アクセス権限の剥奪</target>
       </trans-unit>
-      <trans-unit id="">
-        <source>Image</source>
-        <target>画像</target>
-      </trans-unit>
       <trans-unit id="">
         <source>Application Name</source>
         <target>アプリケーション名</target>
@@ -560,38 +556,6 @@
         <source>Okinawa</source>
         <target>沖縄県</target>
       </trans-unit>
-      <trans-unit id="">
-        <source>Sex</source>
-        <target>性別</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Birthday</source>
-        <target>誕生日</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Country</source>
-        <target>国または地域</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Region</source>
-        <target>都市（都道府県や州など）</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Region in Japan</source>
-        <target>都道府県</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Postal Code</source>
-        <target>郵便番号</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Telephone Number</source>
-        <target>電話番号</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Self Introduction</source>
-        <target>自己紹介</target>
-      </trans-unit>
       <trans-unit id="">
         <source>Term Configuration in this SNS</source>
         <target>SNS内名称設定</target>
@@ -965,10 +929,6 @@
         <source>Create new entry</source>
         <target>プロフィール項目登録</target>
       </trans-unit>
-      <trans-unit id="">
-        <source>Operation</source>
-        <target>操作</target>
-      </trans-unit>
       <trans-unit id="">
         <source>Entry name</source>
         <target>項目名</target>
@@ -1009,18 +969,10 @@
         <source>Change</source>
         <target>変更</target>
       </trans-unit>
-      <trans-unit id="">
-        <source>Edit</source>
-        <target>変更</target>
-      </trans-unit>
       <trans-unit id="">
         <source>Search</source>
         <target>検索</target>
       </trans-unit>
-      <trans-unit id="">
-        <source>Delete</source>
-        <target>削除</target>
-      </trans-unit>
       <trans-unit id="">
         <source>List</source>
         <target>一覧</target>
@@ -1489,18 +1441,10 @@
         <source>Registering a new administrator account</source>
         <target>アカウント追加</target>
       </trans-unit>
-      <trans-unit id="">
-        <source>Add</source>
-        <target>追加</target>
-      </trans-unit>
       <trans-unit id="">
         <source>User name</source>
         <target>ユーザ名</target>
       </trans-unit>
-      <trans-unit id="">
-        <source>Delete account</source>
-        <target>アカウント削除</target>
-      </trans-unit>
       <trans-unit id="">
         <source>Are you sure you want to delete this account?</source>
         <target>このアカウントを本当に削除しますか？</target>

From e2548d0dd8e19dab149e9d737f39f39dbf57a5af Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 13 Sep 2012 14:21:47 +0900
Subject: [PATCH 319/630] (refs #3175, BP from #2649) removed unnesessary
 setLabel

---
 .../modules/admin/lib/AdminUserEditPasswordForm.class.php    | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/apps/pc_backend/modules/admin/lib/AdminUserEditPasswordForm.class.php b/apps/pc_backend/modules/admin/lib/AdminUserEditPasswordForm.class.php
index 5effae891..cb0a1b09c 100644
--- a/apps/pc_backend/modules/admin/lib/AdminUserEditPasswordForm.class.php
+++ b/apps/pc_backend/modules/admin/lib/AdminUserEditPasswordForm.class.php
@@ -37,11 +37,6 @@ public function configure()
       'callback'  => array('AdminUserEditPasswordForm', 'validate'),
       'arguments' => array('object' => $this->getObject()),
     )));
-
-    $this->widgetSchema->setLabels(array(
-      'old_password' => 'Old password',
-      'new_password' => 'New password',
-    ));
   }
 
   public static function validate($validator, $values, $arguments = array())

From 9b15a8681d01fe81b8e591bc7ea0f7d033aae843 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 13 Sep 2012 14:25:16 +0900
Subject: [PATCH 320/630] (refs #3175, BP from #2649) fixed to capitalize
 second word

---
 apps/pc_backend/i18n/messages.ja.xml                        | 6 +++---
 apps/pc_backend/modules/admin/templates/_submenu.php        | 6 +++---
 .../modules/admin/templates/changeLanguageSuccess.php       | 2 +-
 .../modules/admin/templates/editPasswordSuccess.php         | 2 +-
 .../modules/admin/templates/manageUserSuccess.php           | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/apps/pc_backend/i18n/messages.ja.xml b/apps/pc_backend/i18n/messages.ja.xml
index cfd46fda4..e0386db4e 100644
--- a/apps/pc_backend/i18n/messages.ja.xml
+++ b/apps/pc_backend/i18n/messages.ja.xml
@@ -1246,7 +1246,7 @@
         <target>%1%さんのパスワードを変更します。</target>
       </trans-unit>
       <trans-unit id="">
-        <source>Change password</source>
+        <source>Change Password</source>
         <target>パスワード変更</target>
       </trans-unit>
       <trans-unit id="">
@@ -1430,7 +1430,7 @@
         <target>新しいパスワード</target>
       </trans-unit>
       <trans-unit id="">
-        <source>Account management</source>
+        <source>Account Management</source>
         <target>アカウント管理</target>
       </trans-unit>
       <trans-unit id="">
@@ -1454,7 +1454,7 @@
         <target>アカウント削除</target>
       </trans-unit>
       <trans-unit id="">
-        <source>Change language</source>
+        <source>Change Language</source>
         <target>言語変更</target>
       </trans-unit>
       <trans-unit id="">
diff --git a/apps/pc_backend/modules/admin/templates/_submenu.php b/apps/pc_backend/modules/admin/templates/_submenu.php
index c9c73564a..90c1a5469 100644
--- a/apps/pc_backend/modules/admin/templates/_submenu.php
+++ b/apps/pc_backend/modules/admin/templates/_submenu.php
@@ -1,3 +1,3 @@
-<li><?php echo link_to(__('Account management'), 'admin/manageUser') ?></li>
-<li><?php echo link_to(__('Change password'), 'admin/editPassword') ?></li>
-<li><?php echo link_to(__('Change language'), 'admin/changeLanguage') ?></li>
+<li><?php echo link_to(__('Account Management'), 'admin/manageUser') ?></li>
+<li><?php echo link_to(__('Change Password'), 'admin/editPassword') ?></li>
+<li><?php echo link_to(__('Change Language'), 'admin/changeLanguage') ?></li>
diff --git a/apps/pc_backend/modules/admin/templates/changeLanguageSuccess.php b/apps/pc_backend/modules/admin/templates/changeLanguageSuccess.php
index b278a133b..979825592 100644
--- a/apps/pc_backend/modules/admin/templates/changeLanguageSuccess.php
+++ b/apps/pc_backend/modules/admin/templates/changeLanguageSuccess.php
@@ -2,7 +2,7 @@
 <?php include_partial('submenu') ?>
 <?php end_slot(); ?>
 
-<?php slot('title', __('Change language')) ?>
+<?php slot('title', __('Change Language')) ?>
 
 <form action="<?php echo url_for('admin/changeLanguage') ?>" method="post">
 <?php echo $form ?>
diff --git a/apps/pc_backend/modules/admin/templates/editPasswordSuccess.php b/apps/pc_backend/modules/admin/templates/editPasswordSuccess.php
index 0dc9d50b9..e924ceb98 100644
--- a/apps/pc_backend/modules/admin/templates/editPasswordSuccess.php
+++ b/apps/pc_backend/modules/admin/templates/editPasswordSuccess.php
@@ -2,7 +2,7 @@
 <?php include_partial('submenu') ?>
 <?php end_slot(); ?>
 
-<h2><?php echo __('Change password') ?></h2>
+<h2><?php echo __('Change Password') ?></h2>
 
 <form action="<?php url_for('admin/editPassword') ?>" method="post">
 <table>
diff --git a/apps/pc_backend/modules/admin/templates/manageUserSuccess.php b/apps/pc_backend/modules/admin/templates/manageUserSuccess.php
index 0d2e6edbf..536d6773b 100644
--- a/apps/pc_backend/modules/admin/templates/manageUserSuccess.php
+++ b/apps/pc_backend/modules/admin/templates/manageUserSuccess.php
@@ -2,7 +2,7 @@
 <?php include_partial('submenu') ?>
 <?php end_slot(); ?>
 
-<h2><?php echo __('Account management') ?></h2>
+<h2><?php echo __('Account Management') ?></h2>
 
 <p><?php echo __('Set administrator account.') ?></p>
 <p><?php echo link_to(__('Registering a new administrator account'), 'admin/addUser') ?></p>

From 98b0d65e7bb2b32af84a5e67aa189984b4ee0bff Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 13 Sep 2012 14:32:39 +0900
Subject: [PATCH 321/630] (refs #3175, BP from #2649) fixed english

---
 apps/pc_backend/i18n/messages.ja.xml                          | 2 +-
 apps/pc_backend/modules/admin/templates/manageUserSuccess.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/pc_backend/i18n/messages.ja.xml b/apps/pc_backend/i18n/messages.ja.xml
index e0386db4e..cc29580b4 100644
--- a/apps/pc_backend/i18n/messages.ja.xml
+++ b/apps/pc_backend/i18n/messages.ja.xml
@@ -1438,7 +1438,7 @@
         <target>管理用アカウントを設定します。</target>
       </trans-unit>
       <trans-unit id="">
-        <source>Registering a new administrator account</source>
+        <source>Register new account</source>
         <target>アカウント追加</target>
       </trans-unit>
       <trans-unit id="">
diff --git a/apps/pc_backend/modules/admin/templates/manageUserSuccess.php b/apps/pc_backend/modules/admin/templates/manageUserSuccess.php
index 536d6773b..f5729f508 100644
--- a/apps/pc_backend/modules/admin/templates/manageUserSuccess.php
+++ b/apps/pc_backend/modules/admin/templates/manageUserSuccess.php
@@ -5,7 +5,7 @@
 <h2><?php echo __('Account Management') ?></h2>
 
 <p><?php echo __('Set administrator account.') ?></p>
-<p><?php echo link_to(__('Registering a new administrator account'), 'admin/addUser') ?></p>
+<p><?php echo link_to(__('Register new account'), 'admin/addUser') ?></p>
 
 <table>
 <tr>

From 56f4f66f8476b6c1ea55adeb96507c4239cac778 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 13 Sep 2012 14:36:56 +0900
Subject: [PATCH 322/630] (refs #3175, BP from #2649) add transtaion for when
 the culture setting was changed

---
 apps/pc_backend/i18n/messages.ja.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/pc_backend/i18n/messages.ja.xml b/apps/pc_backend/i18n/messages.ja.xml
index cc29580b4..7e77c6641 100644
--- a/apps/pc_backend/i18n/messages.ja.xml
+++ b/apps/pc_backend/i18n/messages.ja.xml
@@ -1461,6 +1461,10 @@
         <source>Languages</source>
         <target>言語</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>Changed configuration for your culture.</source>
+        <target>言語環境を変更しました。</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>

From 24bb71862654dc51a62c39ea2d9e2c08c1a8a82f Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 13 Sep 2012 16:29:15 +0900
Subject: [PATCH 323/630] (fixes #3175, BP from #2649) add translation to
 community sub administorator

---
 apps/pc_backend/i18n/messages.ja.xml                          | 4 ++++
 .../pc_backend/modules/community/templates/_communityInfo.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/pc_backend/i18n/messages.ja.xml b/apps/pc_backend/i18n/messages.ja.xml
index 7e77c6641..cbea5e553 100644
--- a/apps/pc_backend/i18n/messages.ja.xml
+++ b/apps/pc_backend/i18n/messages.ja.xml
@@ -1465,6 +1465,10 @@
         <source>Changed configuration for your culture.</source>
         <target>言語環境を変更しました。</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>%Community% Sub Administrator</source>
+        <target>%Community%副管理者</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/apps/pc_backend/modules/community/templates/_communityInfo.php b/apps/pc_backend/modules/community/templates/_communityInfo.php
index 1a76f671b..3042aab79 100644
--- a/apps/pc_backend/modules/community/templates/_communityInfo.php
+++ b/apps/pc_backend/modules/community/templates/_communityInfo.php
@@ -10,7 +10,7 @@
   $subAdminCaption .= "<li>".$m->getName()."</li>\n";
 }?>
 <?php if ($subAdminCaption): ?>
-<tr><th><?php echo __('Sub Administrator') ?></th><td><ul><?php echo $subAdminCaption ?></ul></td></tr>
+<tr><th><?php echo __('%Community% Sub Administrator') ?></th><td><ul><?php echo $subAdminCaption ?></ul></td></tr>
 <?php endif; ?>
 <tr><th><?php echo __('%Community% Members') ?></th><td><?php echo $community->countCommunityMembers() ?></td></tr>
 <tr><th><?php echo __('Date Created') ?></th><td><?php echo $community->getCreatedAt() ?></td></tr>

From 9714b3b0e400931f13d45a7946f76eedd4d9d432 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 13 Sep 2012 17:33:45 +0900
Subject: [PATCH 324/630] (fixes #3175, BP from #2649) fixed english followed
 to translation file

---
 apps/pc_backend/modules/admin/templates/addUserSuccess.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/pc_backend/modules/admin/templates/addUserSuccess.php b/apps/pc_backend/modules/admin/templates/addUserSuccess.php
index 0d101f638..5e3395370 100644
--- a/apps/pc_backend/modules/admin/templates/addUserSuccess.php
+++ b/apps/pc_backend/modules/admin/templates/addUserSuccess.php
@@ -2,7 +2,7 @@
 <?php include_partial('submenu') ?>
 <?php end_slot(); ?>
 
-<h2><?php echo __('Registering a new administrator account') ?></h2>
+<h2><?php echo __('Register new account') ?></h2>
 
 <form action="<?php url_for('admin/addUser') ?>" method="post">
 <table>

From 67cf01200cd8606b49499cfca2cc7a7967fcc66e Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 13 Sep 2012 19:12:30 +0900
Subject: [PATCH 325/630] version 3.8.2

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index a40f859b1..f81190268 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.2-dev');
+  define('OPENPNE_VERSION', '3.8.2');
 }

From 48968690f545a633b2fa6bc46cc29dd71c1c865b Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 13 Sep 2012 19:13:42 +0900
Subject: [PATCH 326/630] started to development of OpenPNE 3.8.3

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index f81190268..a9727e208 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.2');
+  define('OPENPNE_VERSION', '3.8.3-dev');
 }

From c528e203c7db312ce574706b176d8762ea5ade5a Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 27 Sep 2012 16:58:24 +0900
Subject: [PATCH 327/630] (fixes #3217, BP from #3093) add tabelog.com's cmd

---
 web/cmd/tabelog.com.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 web/cmd/tabelog.com.js

diff --git a/web/cmd/tabelog.com.js b/web/cmd/tabelog.com.js
new file mode 100644
index 000000000..e13a4a104
--- /dev/null
+++ b/web/cmd/tabelog.com.js
@@ -0,0 +1,18 @@
+function url2cmd(url) {
+    if (url.match(/^http:\/\/tabelog\.com\/[a-z]+\/A[0-9]+\/A[0-9]+\/([0-9]+)\/?$/) || url.match(/^http:\/\/tabelog\.com\/[a-z]+\/rstdtl\/([0-9]+)\/?$/)) {
+        var rcd = RegExp.$1;
+        main(rcd);
+        return;
+    }
+    pne_url2a(url);
+    return;
+}
+
+function main(rcd) {
+    if (!rcd.match(/^[0-9]+$/)) {
+        return;
+    }
+    document.write('<iframe WIDTH="420" HEIGHT="280" MARGINWIDTH="0" MARGINHEIGHT="0" HSPACE="0" VSPACE="0" FRAMEBORDER="0" SCROLLING="no" BORDERCOLOR="#000000" src="http://api.tabelog.com/RstPNEParts/?RestaurantCD=' + rcd + '">');
+    document.write('</iframe>');
+}
+

From 9fc07bc4a9ff7446e451927de991ceb2d3bfdee8 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@tejimaya.com>
Date: Mon, 3 Oct 2011 22:07:40 +0900
Subject: [PATCH 328/630] (fixes #3222, BP from 2462) fixed to reflect inputted
 new line

---
 .../mobile_frontend/modules/member/templates/profileSuccess.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/mobile_frontend/modules/member/templates/profileSuccess.php b/apps/mobile_frontend/modules/member/templates/profileSuccess.php
index b018ffb99..8a4b71cf9 100644
--- a/apps/mobile_frontend/modules/member/templates/profileSuccess.php
+++ b/apps/mobile_frontend/modules/member/templates/profileSuccess.php
@@ -76,7 +76,7 @@
 
   if ('textarea' === $profile->getFormType())
   {
-    $value = op_auto_link_text_for_mobile($value);
+    $value = nl2br(op_auto_link_text_for_mobile($value));
   }
 
   if ($member->getId() == $sf_user->getMemberId())

From 3d6146cad60554c419cb37751a7b8ab826343353 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Wed, 15 Aug 2012 15:14:13 +0900
Subject: [PATCH 329/630] fix an error in commit `94515d98' (fixes #3230, BP
 from #3165)

---
 lib/i18n/opI18N.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/i18n/opI18N.class.php b/lib/i18n/opI18N.class.php
index db77362e3..e9e670384 100644
--- a/lib/i18n/opI18N.class.php
+++ b/lib/i18n/opI18N.class.php
@@ -78,7 +78,7 @@ public function setMessageSource($dirs, $culture = null)
     {
       $this->generateApplicationMessages($dirs);
 
-      if (!is_null($dirs))
+      if (is_null($dirs))
       {
         $this->messageSource = $this->createMessageSource();
       }

From 3f1c8348f21461af8621b34de9eda98a6884ab46 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@tejimaya.com>
Date: Wed, 5 Oct 2011 23:32:52 +0900
Subject: [PATCH 330/630] (fixes #3228, BP from #2467) modified member object
 comparison

---
 .../mobile_frontend/modules/member/templates/profileSuccess.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/mobile_frontend/modules/member/templates/profileSuccess.php b/apps/mobile_frontend/modules/member/templates/profileSuccess.php
index 8a4b71cf9..fdd270346 100644
--- a/apps/mobile_frontend/modules/member/templates/profileSuccess.php
+++ b/apps/mobile_frontend/modules/member/templates/profileSuccess.php
@@ -1,7 +1,7 @@
 <?php op_mobile_page_title($member->getName()) ?>
 <?php $culture = sfCultureInfo::getInstance($sf_user->getCulture()); ?>
 
-<?php if ($member == $sf_user->getMember()) : ?>
+<?php if ($member->id == $sf_user->getMember()->id) : ?>
 <font color="<?php echo $op_color["core_color_22"] ?>">
 <?php echo __('This is your page other member see.') ?><br>
 <?php echo __('If you edit profile, access %1%.', array('%1%' => link_to('「'. __('Edit profile') .'」', '@member_editProfile'))) ?>

From bb28c9ba0da7e069e2c928289fba5b8871b9e206 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@tejimaya.com>
Date: Tue, 18 Oct 2011 18:50:39 +0900
Subject: [PATCH 331/630] (fixes #3228, BP from #2467) fixed to use
 MemberRelationship method for member object comparison

---
 .../mobile_frontend/modules/member/templates/profileSuccess.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/mobile_frontend/modules/member/templates/profileSuccess.php b/apps/mobile_frontend/modules/member/templates/profileSuccess.php
index fdd270346..efe767c69 100644
--- a/apps/mobile_frontend/modules/member/templates/profileSuccess.php
+++ b/apps/mobile_frontend/modules/member/templates/profileSuccess.php
@@ -1,7 +1,7 @@
 <?php op_mobile_page_title($member->getName()) ?>
 <?php $culture = sfCultureInfo::getInstance($sf_user->getCulture()); ?>
 
-<?php if ($member->id == $sf_user->getMember()->id) : ?>
+<?php if ($relation->isSelf()) : ?>
 <font color="<?php echo $op_color["core_color_22"] ?>">
 <?php echo __('This is your page other member see.') ?><br>
 <?php echo __('If you edit profile, access %1%.', array('%1%' => link_to('「'. __('Edit profile') .'」', '@member_editProfile'))) ?>

From 2c6e94980d1e791a3318dc220de887ad497fa2df Mon Sep 17 00:00:00 2001
From: imamura623 <imamura623mutsumi@gmail.com>
Date: Tue, 6 Nov 2012 10:54:32 +0900
Subject: [PATCH 332/630] (fixes #3239) updated the mobile_ip_address list

---
 lib/config/config/mobile_ip_address.yml | 32 ++++++++++---------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/lib/config/config/mobile_ip_address.yml b/lib/config/config/mobile_ip_address.yml
index 546bb6598..5cfba70f9 100644
--- a/lib/config/config/mobile_ip_address.yml
+++ b/lib/config/config/mobile_ip_address.yml
@@ -15,8 +15,8 @@
 ######################################
 
 ######################################
-#  2012/07/30 リリース版
-#  ・SoftBank (2012年7月下旬)IPアドレス帯域削除対応
+# 2012/11/05 リリース版
+# WILLCOMの「削除IPアドレス帯域（2012年3月8日削除分）」の対応
 ######################################
 
 # DoCoMo (2010/06/24更新)
@@ -88,13 +88,11 @@ softbank:
   - 202.253.99.144/28
   - 210.228.189.188/30
 
-# WILLCOM (2012/01/12更新)
+# WILLCOM (2012/11/05更新)
 # http://www.willcom-inc.com/ja/service/contents_service/create/center_info/
 willcom:
-  - 61.198.128.0/24
   - 61.198.129.0/24
   - 61.198.130.0/24
-  - 61.198.131.0/24
   - 61.198.132.0/24
   - 61.198.133.0/24
   - 61.198.134.0/24
@@ -104,17 +102,12 @@ willcom:
   - 61.198.139.0/29
   - 61.198.139.128/27
   - 61.198.139.160/28
-  - 61.198.140.0/24
-  - 61.198.141.0/24
   - 61.198.142.0/24
-  - 61.198.143.0/24
   - 61.198.160.0/24
   - 61.198.161.0/24
   - 61.198.162.0/24
   - 61.198.163.0/24
   - 61.198.164.0/24
-  - 61.198.165.0/24
-  - 61.198.166.0/24
   - 61.198.168.0/24
   - 61.198.169.0/24
   - 61.198.170.0/24
@@ -129,15 +122,12 @@ willcom:
   - 61.198.251.0/24
   - 61.198.252.0/24
   - 61.198.253.0/24
-  - 61.198.254.0/24
   - 61.198.255.0/24
   - 61.204.0.0/24
   - 61.204.2.0/24
-  - 61.204.3.0/25
   - 61.204.3.128/25
   - 61.204.4.0/24
   - 61.204.5.0/24
-  - 61.204.6.0/25
   - 61.204.6.128/25
   - 61.204.7.0/25
   - 61.204.92.0/24
@@ -189,8 +179,6 @@ willcom:
   - 125.28.1.0/24
   - 125.28.2.0/24
   - 125.28.3.0/24
-  - 125.28.4.0/24
-  - 125.28.5.0/24
   - 125.28.6.0/24
   - 125.28.7.0/24
   - 125.28.8.0/24
@@ -205,14 +193,12 @@ willcom:
   - 210.168.247.0/24
   - 210.169.92.0/24
   - 210.169.93.0/24
-  - 210.169.94.0/24
   - 210.169.95.0/24
   - 210.169.96.0/24
   - 210.169.97.0/24
   - 210.169.98.0/24
   - 210.169.99.0/24
   - 210.255.190.0/24
-  - 211.126.192.128/25
   - 211.18.232.0/24
   - 211.18.233.0/24
   - 211.18.234.0/24
@@ -221,14 +207,13 @@ willcom:
   - 211.18.237.0/24
   - 211.18.238.0/24
   - 211.18.239.0/24
+  - 211.126.192.128/25
   - 219.108.2.0/24
   - 219.108.3.0/24
   - 219.108.4.0/24
   - 219.108.5.0/24
   - 219.108.6.0/24
   - 219.108.7.0/24
-  - 219.108.8.0/24
-  - 219.108.9.0/24
   - 219.108.10.0/24
   - 219.108.11.0/24
   - 219.108.12.0/24
@@ -245,3 +230,12 @@ willcom:
   - 221.119.7.0/24
   - 221.119.8.0/24
   - 221.119.9.0/24
+
+# WILLCOM (2012/11/01更新)
+# 通信設備の設備更改に伴う一時的な増設による追加。問題なく完了すれば近日中に終了する予定。
+  - 61.198.131.0/24
+  - 61.198.140.0/24
+  - 61.198.141.0/24
+  - 61.198.143.0/24
+  - 61.198.165.0/24
+  - 61.198.166.0/24

From 84b47c2f7858c2ea2d0a8758033863d78799c56c Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Tue, 17 Jan 2012 00:30:51 +0900
Subject: [PATCH 333/630] (fixes #3242, BP from #2604) fixed to translate
 'Community Top' in Community detail page

---
 apps/mobile_frontend/i18n/messages.ja.xml                     | 4 ++++
 .../modules/community/templates/detailSuccess.php             | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/mobile_frontend/i18n/messages.ja.xml b/apps/mobile_frontend/i18n/messages.ja.xml
index e4b78a3c7..23df85c7a 100644
--- a/apps/mobile_frontend/i18n/messages.ja.xml
+++ b/apps/mobile_frontend/i18n/messages.ja.xml
@@ -510,6 +510,10 @@
         <source>Search %Community%</source>
         <target>%Community%検索</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>%Community% Top</source>
+        <target>%Community% ﾄｯﾌﾟ</target>
+      </trans-unit>
       <trans-unit id="">
         <source>Categories</source>
         <target>ｶﾃｺﾞﾘ</target>
diff --git a/apps/mobile_frontend/modules/community/templates/detailSuccess.php b/apps/mobile_frontend/modules/community/templates/detailSuccess.php
index 257d7f695..d5492a795 100644
--- a/apps/mobile_frontend/modules/community/templates/detailSuccess.php
+++ b/apps/mobile_frontend/modules/community/templates/detailSuccess.php
@@ -37,4 +37,4 @@
 
 <hr color="<?php echo $op_color['core_color_11'] ?>">
 
-<?php echo link_to(__('Community Top'), '@community_home?id='.$community->getId()) ?>
+<?php echo link_to(__('%Community% Top'), '@community_home?id='.$community->getId()) ?>

From ec4e964f53a3d9237290239d7e0d8253f94ce434 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Mon, 6 Feb 2012 23:59:41 +0900
Subject: [PATCH 334/630] (fixes #3242, BP from #2604) fixed to translate
 'Community Top' in edit, memberList, and search page

---
 .../mobile_frontend/modules/community/templates/editSuccess.php | 2 +-
 .../modules/community/templates/memberListError.php             | 2 +-
 .../modules/community/templates/memberListSuccess.php           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/mobile_frontend/modules/community/templates/editSuccess.php b/apps/mobile_frontend/modules/community/templates/editSuccess.php
index 6859e9dc0..0d61b6b13 100644
--- a/apps/mobile_frontend/modules/community/templates/editSuccess.php
+++ b/apps/mobile_frontend/modules/community/templates/editSuccess.php
@@ -32,5 +32,5 @@
   ));
 ?>
 <hr color="<?php echo $op_color['core_color_11'] ?>">
-<?php echo link_to(__('Community Top'), '@community_home?id='.$community->getId()) ?>
+<?php echo link_to(__('%Community% Top'), '@community_home?id='.$community->getId()) ?>
 <?php endif; ?>
diff --git a/apps/mobile_frontend/modules/community/templates/memberListError.php b/apps/mobile_frontend/modules/community/templates/memberListError.php
index 4412cd7e6..abba9d293 100644
--- a/apps/mobile_frontend/modules/community/templates/memberListError.php
+++ b/apps/mobile_frontend/modules/community/templates/memberListError.php
@@ -3,4 +3,4 @@
 
 <hr color="<?php echo $op_color['core_color_11'] ?>">
 
-<?php echo link_to(__('Community Top'), '@community_home?id='.$community->getId()) ?>
+<?php echo link_to(__('%Community% Top'), '@community_home?id='.$community->getId()) ?>
diff --git a/apps/mobile_frontend/modules/community/templates/memberListSuccess.php b/apps/mobile_frontend/modules/community/templates/memberListSuccess.php
index 8c132a430..f65ee5389 100644
--- a/apps/mobile_frontend/modules/community/templates/memberListSuccess.php
+++ b/apps/mobile_frontend/modules/community/templates/memberListSuccess.php
@@ -19,4 +19,4 @@
 
 <hr color="<?php echo $op_color['core_color_11'] ?>">
 
-<?php echo link_to(__('Community Top'), '@community_home?id='.$community->getId()) ?>
+<?php echo link_to(__('%Community% Top'), '@community_home?id='.$community->getId()) ?>

From 11d7318965dd88aa616c2894921c487039ab2a80 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 8 Nov 2012 19:24:42 +0900
Subject: [PATCH 335/630] (fixes #3231, BP from #3209) fixed to reset form
 fields when the widget added

---
 lib/form/doctrine/MemberConfigForm.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/form/doctrine/MemberConfigForm.class.php b/lib/form/doctrine/MemberConfigForm.class.php
index 04a77a670..baac1fd90 100644
--- a/lib/form/doctrine/MemberConfigForm.class.php
+++ b/lib/form/doctrine/MemberConfigForm.class.php
@@ -109,7 +109,7 @@ public function setMemberConfigSettings()
   public function setMemberConfigWidget($name)
   {
     $config = $this->memberConfigSettings[$name];
-    $this->widgetSchema[$name] = opFormItemGenerator::generateWidget($config);
+    $this->setWidget($name, opFormItemGenerator::generateWidget($config));
     $this->widgetSchema->setLabel($name, $config['Caption']);
     $memberConfig = Doctrine::getTable('MemberConfig')->retrieveByNameAndMemberId($name, $this->member->getId());
     if ($memberConfig) {

From d0aeeb4b4059db33064d2e100d1397d0ae1ea26c Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 8 Nov 2012 21:13:44 +0900
Subject: [PATCH 336/630] version 3.8.3

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index a9727e208..5d5d75b13 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.3-dev');
+  define('OPENPNE_VERSION', '3.8.3');
 }

From ab73d819d27d4f7e4fab462f2acaf7198b16c195 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 8 Nov 2012 21:14:44 +0900
Subject: [PATCH 337/630] started to development of OpenPNE 3.8.4

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 5d5d75b13..2801e97d5 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.3');
+  define('OPENPNE_VERSION', '3.8.4-dev');
 }

From 9f7dbf237b4880864be2bc8d6dfd127e28daa21e Mon Sep 17 00:00:00 2001
From: kaoru nishizoe <nishizoe@tejimaya.com>
Date: Thu, 15 Nov 2012 20:12:13 +0900
Subject: [PATCH 338/630] (refs #3147)fixed to permission of css cache
 directory and file.

---
 .../modules/default/actions/customizingCssAction.class.php   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/pc_frontend/modules/default/actions/customizingCssAction.class.php b/apps/pc_frontend/modules/default/actions/customizingCssAction.class.php
index 9d609612e..6ff64f1e6 100644
--- a/apps/pc_frontend/modules/default/actions/customizingCssAction.class.php
+++ b/apps/pc_frontend/modules/default/actions/customizingCssAction.class.php
@@ -27,7 +27,10 @@ public function execute($request)
     $filesystem = new sfFilesystem();
     $dir = sfConfig::get('sf_web_dir').DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR.'css';
     @$filesystem->mkdirs($dir);
-    file_put_contents($dir.DIRECTORY_SEPARATOR.'customizing.css', $css);
+    $filesystem->chmod($dir, 0777);
+    $csspath = $dir.DIRECTORY_SEPARATOR.'customizing.css';
+    file_put_contents($csspath, $css);
+    $filesystem->chmod($csspath, 0666);
 
     return sfView::NONE;
   }

From ef743df4f0404dee450bc4435ec75af93e6ec660 Mon Sep 17 00:00:00 2001
From: kaoru nishizoe <nishizoe@tejimaya.com>
Date: Fri, 7 Dec 2012 16:58:09 +0900
Subject: [PATCH 339/630] (refs #3266) fixed the possibility to fake a file
 upload by symfony 1.4.

---
 lib/vendor/symfony/lib/form/sfForm.class.php  | 22 +++++++++
 .../symfony/test/unit/form/sfFormTest.php     | 45 ++++++++++++++++++-
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/lib/vendor/symfony/lib/form/sfForm.class.php b/lib/vendor/symfony/lib/form/sfForm.class.php
index 8067b7b49..8d750d4a3 100644
--- a/lib/vendor/symfony/lib/form/sfForm.class.php
+++ b/lib/vendor/symfony/lib/form/sfForm.class.php
@@ -222,6 +222,8 @@ public function bind(array $taintedValues = null, array $taintedFiles = null)
       $this->taintedFiles = array();
     }
 
+    $this->checkTaintedValues($this->taintedValues);
+
     try
     {
       $this->doBind(self::deepArrayUnion($this->taintedValues, self::convertFileInformation($this->taintedFiles)));
@@ -1336,4 +1338,24 @@ static protected function deepArrayUnion($array1, $array2)
 
     return $array1;
   }
+
+  /**
+   * Checks that the $_POST values do not contain something that
+   * looks like a file upload (coming from $_FILE).
+   */
+  protected function checkTaintedValues($values)
+  {
+    foreach ($values as $name => $value)
+    {
+      if (!is_array($value)) {
+        continue;
+      }
+
+      if (isset($value['tmp_name'])) {
+        throw new InvalidArgumentException('Do not try to fake a file upload.');
+      }
+
+      $this->checkTaintedValues($value);
+    }
+  }
 }
diff --git a/lib/vendor/symfony/test/unit/form/sfFormTest.php b/lib/vendor/symfony/test/unit/form/sfFormTest.php
index 75ee2823e..5f72954c5 100644
--- a/lib/vendor/symfony/test/unit/form/sfFormTest.php
+++ b/lib/vendor/symfony/test/unit/form/sfFormTest.php
@@ -10,7 +10,7 @@
 
 require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
 
-$t = new lime_test(163);
+$t = new lime_test(165);
 
 class FormTest extends sfForm
 {
@@ -979,3 +979,46 @@ public function getStylesheets()
 $t->is_deeply($f->getFormFieldSchema()->getValue(), array('5' => 'default'), '->getFormFieldSchema() includes default numeric fields');
 $f->bind(array('5' => 'bound'));
 $t->is_deeply($f->getFormFieldSchema()->getValue(), array('5' => 'bound'), '->getFormFieldSchema() includes bound numeric fields');
+
+// bind with a simulated file upload in the POST array
+$f = new FormTest();
+try
+{
+  $f->bind(array(
+    'file' => array(
+      'name' => 'foo.txt',
+      'type' => 'text/plain',
+      'tmp_name' => 'somefile',
+      'error' => 0,
+      'size' => 10,
+     ),
+  ));
+  $t->fail('Cannot fake a file upload with a POST');
+}
+catch (InvalidArgumentException $e)
+{
+  $t->pass('Cannot fake a file upload with a POST');
+}
+
+$f = new FormTest();
+try
+{
+  $f->bind(array(
+      'foo' => array(
+        'bar' => array(
+          'file' => array(
+            'name' => 'foo.txt',
+            'type' => 'text/plain',
+            'tmp_name' => 'somefile',
+            'error' => 0,
+            'size' => 10,
+          ),
+        ),
+      ),
+  ));
+  $t->fail('Cannot fake a file upload with a POST');
+}
+catch (InvalidArgumentException $e)
+{
+  $t->pass('Cannot fake a file upload with a POST');
+}

From 0c5ee4033365b788ac75c12f57903464e5466a16 Mon Sep 17 00:00:00 2001
From: kaoru nishizoe <nishizoe@tejimaya.com>
Date: Tue, 11 Dec 2012 16:21:29 +0900
Subject: [PATCH 340/630] (refs #3257 BR from #2495)changed tiny_mce settings
 for convert_urls from 1 to 0.

---
 lib/widget/opWidgetFormRichTextarea.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/widget/opWidgetFormRichTextarea.class.php b/lib/widget/opWidgetFormRichTextarea.class.php
index fd8a2c072..35eca8a9a 100644
--- a/lib/widget/opWidgetFormRichTextarea.class.php
+++ b/lib/widget/opWidgetFormRichTextarea.class.php
@@ -28,6 +28,7 @@ class opWidgetFormRichTextarea extends sfWidgetFormTextarea
     'theme_advanced_buttons1' => 'bold, italic, undefined, forecolor, hr',
     'theme_advanced_buttons2' => '',
     'theme_advanced_buttons3' => '',
+    'convert_urls' => 0,
   );
 
   public function __construct($options = array(), $attributes = array())

From 1b44d401eec97dc6ea056cf18852bfe93d325bd6 Mon Sep 17 00:00:00 2001
From: kaoru nishizoe <nishizoe@tejimaya.com>
Date: Tue, 11 Dec 2012 18:23:31 +0900
Subject: [PATCH 341/630] (refs #3277 BP from #3147) changed variable name
 csspath to cssPath.

---
 .../modules/default/actions/customizingCssAction.class.php  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/pc_frontend/modules/default/actions/customizingCssAction.class.php b/apps/pc_frontend/modules/default/actions/customizingCssAction.class.php
index 6ff64f1e6..0ec33a81b 100644
--- a/apps/pc_frontend/modules/default/actions/customizingCssAction.class.php
+++ b/apps/pc_frontend/modules/default/actions/customizingCssAction.class.php
@@ -28,9 +28,9 @@ public function execute($request)
     $dir = sfConfig::get('sf_web_dir').DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR.'css';
     @$filesystem->mkdirs($dir);
     $filesystem->chmod($dir, 0777);
-    $csspath = $dir.DIRECTORY_SEPARATOR.'customizing.css';
-    file_put_contents($csspath, $css);
-    $filesystem->chmod($csspath, 0666);
+    $cssPath = $dir.DIRECTORY_SEPARATOR.'customizing.css';
+    file_put_contents($cssPath, $css);
+    $filesystem->chmod($cssPath, 0666);
 
     return sfView::NONE;
   }

From 55571d651e4195e3c22594a4ec7ef5e87fe494a4 Mon Sep 17 00:00:00 2001
From: Kousuke Ebihara <ebihara@php.net>
Date: Tue, 11 Dec 2012 20:41:34 +0900
Subject: [PATCH 342/630] changed opDoctrineRecord::_set() to replace 4 bytes
 UTF-8 characters to U+FFFD in MySQL non binary string column (refs #3179, BP
 from #3134) (cherry picked from commit
 61b427a88dcbc3070b5e9c52c998b9e745f2d5d2)

---
 lib/util/opDoctrineRecord.class.php     | 62 +++++++++++++++++++++++++
 test/unit/util/opDoctrineRecordTest.php | 54 +++++++++++++++++++++
 2 files changed, 116 insertions(+)
 create mode 100644 test/unit/util/opDoctrineRecordTest.php

diff --git a/lib/util/opDoctrineRecord.class.php b/lib/util/opDoctrineRecord.class.php
index 0c10952ad..3e46364df 100644
--- a/lib/util/opDoctrineRecord.class.php
+++ b/lib/util/opDoctrineRecord.class.php
@@ -41,6 +41,9 @@ abstract class opDoctrineRecord extends sfDoctrineRecord implements Zend_Acl_Res
 
   const MAX_NESTING_LEVEL = 50;
 
+  // TODO: Move it to good place (e.g. create new "opDoctrine" class? read like: opDoctrine::ATTR_4BYTES_UTF8_READY)
+  const ATTR_4BYTES_UTF8_READY = 999;
+
   protected
     $roleList = array(),
 
@@ -81,6 +84,53 @@ protected function checkIsDatetimeField($fieldName)
     return 'datetime' === $definition['type'];
   }
 
+  protected function checkIsNonBinaryStringField($fieldName)
+  {
+    $definition = $this->_table->getColumnDefinition($fieldName);
+
+    return in_array($definition['type'], array(
+      'string', 'array', 'object', 'clob', 'char', 'varchar',
+    ), true);
+  }
+
+  protected function replace4BytesUtf8Characters($value)
+  {
+    if (is_array($value))
+    {
+      $result = array();
+      foreach ($value as $k => $v)
+      {
+        $result[$this->replace4BytesUtf8Characters($k)] = $this->replace4BytesUtf8Characters($v);
+      }
+
+      return $result;
+    }
+
+    if (!is_string($value))
+    {
+      return $value;
+    }
+
+    // See: RFC 3629 (section 4, Syntax of UTF-8 Byte Sequences)
+    // http://tools.ietf.org/html/rfc3629#section-4
+    return preg_replace('/(
+      \xF0[\x90-\xBF][\x80-\xBF]{2}| # %xF0 %x90-BF 2( UTF8-tail )
+      [\xF1-\xF3][\x80-\xBF]{3}|     # %xF1-F3 3( UTF8-tail )
+      \xF4[\x80-\x8F][\x80-\xBF]{2}  # %xF4 %x80-8F 2( UTF8-tail )
+    )/x', "\xEF\xBF\xBD", $value);
+  }
+
+  protected function isReadyFor4BytesUtf8()
+  {
+    $conn = $this->_table->getConnection();
+    if ($conn->getAttribute(self::ATTR_4BYTES_UTF8_READY))
+    {
+      return true;
+    }
+
+    return !($conn instanceof Doctrine_Connection_MySQL);
+  }
+
   protected function _set($fieldName, $value, $load = true)
   {
     // In setter, empty value must be handled as opDoctrineRecord::UNDEFINED_DATETIME
@@ -89,6 +139,18 @@ protected function _set($fieldName, $value, $load = true)
       $value = self::UNDEFINED_DATETIME;
     }
 
+    $definition = $this->_table->getColumnDefinition($fieldName);
+
+    // "utf8", a type of character set in MySQL, can't handle 4 bytes utf8 characters
+    // so we replace such a character to "U+FFFD" (A unicode "REPLACEMENT CHARACTER").
+    if (!$this->isReadyFor4BytesUtf8())
+    {
+      if ($this->checkIsNonBinaryStringField($fieldName))
+      {
+        $value = $this->replace4BytesUtf8Characters($value);
+      }
+    }
+
     return parent::_set($fieldName, $value, $load);
   }
 
diff --git a/test/unit/util/opDoctrineRecordTest.php b/test/unit/util/opDoctrineRecordTest.php
new file mode 100644
index 000000000..b5ef50132
--- /dev/null
+++ b/test/unit/util/opDoctrineRecordTest.php
@@ -0,0 +1,54 @@
+<?php
+
+include_once dirname(__FILE__).'/../../bootstrap/unit.php';
+
+$_app = 'pc_frontend';
+$_env = 'test';
+
+$configuration = ProjectConfiguration::getApplicationConfiguration($_app, $_env, true);
+new sfDatabaseManager($configuration);
+
+$t = new lime_test(null, new lime_output_color());
+
+// --
+
+class MyRecord extends opDoctrineRecord
+{
+  public function __construct()
+  {
+    parent::__construct();
+
+    $types = array(
+      'string', 'array', 'object', 'blob', 'clob', 'gzip', 'char', 'varchar',
+    );
+
+    foreach ($types as $type)
+    {
+      $this->hasColumn('column_'.$type, $type);
+    }
+  }
+}
+
+$strRaw = 'testⓉⒺⓈⓉテスト🅃🄴🅂🅃てすと'; // 1 byte characters + 2 bytes characters + 3 bytes characters + 4 bytes characters + 3 bytes characters
+$strConverted = 'testⓉⒺⓈⓉテスト����てすと';
+
+$r = new MyRecord();
+$r->setColumnString($strRaw);
+$r->setColumnArray(array($strRaw => $strRaw, $strRaw => array($strRaw)));
+$r->setColumnBlob($strRaw);
+$r->setColumnClob($strRaw);
+$r->setColumnGzip($strRaw);
+$r->setColumnChar($strRaw);
+$r->setColumnVarchar($strRaw);
+
+$result = $r->getPrepared();
+
+// --
+
+$t->is($result['column_string'], $strConverted, '4 bytes UTF-8 characters in a string are replaced');
+$t->is($result['column_array'], serialize(array($strConverted => $strConverted, $strConverted => array($strConverted))), '4 bytes UTF-8 characters in an array are replaced');
+$t->is($result['column_blob'], $strRaw, '4 bytes UTF-8 characters in a blob are NOT replaced');
+$t->is($result['column_clob'], $strConverted, '4 bytes UTF-8 characters in a clob are replaced');
+$t->is($result['column_gzip'], gzcompress($strRaw, 5), '4 bytes UTF-8 characters in a gzip are NOT replaced');
+$t->is($result['column_char'], $strConverted, '4 bytes UTF-8 characters in a char are replaced');
+$t->is($result['column_varchar'], $strConverted, '4 bytes UTF-8 characters in a varchar are replaced');

From 4f6678f3cad2ce6458c32c4435d47c675e516e5b Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 13 Dec 2012 14:42:26 +0900
Subject: [PATCH 343/630] (fixes #3177, BP from #2911) added pc_backend notice
 of disabling plugins and new doc plugin installation/uninstallation guide
 (Japanese only)

---
 .../modules/plugin/templates/listSuccess.php  |  23 +++-
 doc/ja/OpenPNE3_Plugin_Installation_Guide.txt | 129 ++++++++++++++++++
 web/css/backend.css                           |   6 +
 3 files changed, 153 insertions(+), 5 deletions(-)
 create mode 100644 doc/ja/OpenPNE3_Plugin_Installation_Guide.txt

diff --git a/apps/pc_backend/modules/plugin/templates/listSuccess.php b/apps/pc_backend/modules/plugin/templates/listSuccess.php
index c5dd0ec63..729d63f5e 100644
--- a/apps/pc_backend/modules/plugin/templates/listSuccess.php
+++ b/apps/pc_backend/modules/plugin/templates/listSuccess.php
@@ -37,8 +37,21 @@
 </form>
 <?php endif; ?>
 
-<h2><?php echo __('プラグインの追加') ?></h2>
-
-<p><?php echo __('プラグインはプラグイン配布ページからダウンロードすることができます。') ?></p>
-<p><?php echo __('ダウンロードしたファイルを解凍し、サーバ上の plugins ディレクトリにアップロードすることでプラグインがインストールできます。') ?></p>
-<p><?php echo __('また、 opPlugin:install コマンドを実行することでもインストール可能です。') ?></p>
+<div class="description parts">
+<h3><?php echo __('注意') ?></h3>
+<p><?php echo __('プラグインを無効にした際に以下のような問題が発生する場合がありますのでご注意ください。') ?></p>
+<p><?php echo __('例') ?></p>
+<ul>
+<li><?php echo __('退会処理がエラーとなり退会できない') ?></li>
+<li><?php echo __('%Community%削除処理がエラーとなり削除できない') ?></li>
+<li><?php echo __('プロフィール画像削除がエラーとなり削除できない') ?></li>
+<li><?php echo __('%friend%に関連するデータを持つプラグインが無効な時に%friend%を削除すると、再有効化後に不要なデータが削除されずに残ってしまう') ?></li>
+</ul>
+<p><?php echo __('問題がある場合はプラグインを有効にしておくか、無効にするのではなく削除してください。') ?></p>
+</div>
+
+<div class="description parts">
+<h2><?php echo __('プラグインの追加・削除') ?></h2>
+<p><?php echo __('プラグインは管理画面上から追加・削除することはできません。') ?></p>
+<p><?php echo __('プラグインインストール手順書に従ってサーバー上から操作をおこなってください。') ?></p>
+</div>
diff --git a/doc/ja/OpenPNE3_Plugin_Installation_Guide.txt b/doc/ja/OpenPNE3_Plugin_Installation_Guide.txt
new file mode 100644
index 000000000..905231970
--- /dev/null
+++ b/doc/ja/OpenPNE3_Plugin_Installation_Guide.txt
@@ -0,0 +1,129 @@
+==================================
+OpenPNE プラグインインストール手順
+==================================
+
+はじめに
+========
+
+OpenPNE 3 のプラグインをインストールおよびアンインストールするための手順を説明するものです。
+
+以下ではインストール・アンインストールの対象となるプラグイン名の例として opExamplePlugin を使用します。
+
+インストール
+============
+
+インストール方法には2つの方法があります。プラグインチャンネルサーバーへ登録されているプラグインのインストールは opPlugin:install によるインストールが推奨されます。
+
+opPlugin:install によるインストール
+-----------------------------------
+
+インストールコマンドの実行
+++++++++++++++++++++++++++
+
+::
+  $ ./symfony opPlugin:install opExamplePlugin
+
+データベースへの変更を反映
+++++++++++++++++++++++++++
+
+Doctrine を利用している場合のみ
+
+::
+  $ ./symfony openpne:migrate --target=opExamplePlugin --no-update-plugin
+
+手動インストール
+----------------
+
+プラグインのソースコードを設置
+++++++++++++++++++++++++++++++
+
+サーバー上の plugins ディレクトリにプラグインのソースコードを設置します。
+
+データベースへの変更を反映するための準備
+++++++++++++++++++++++++++++++++++++++++
+
+Doctrine を利用している場合のみ
+
+以下の SQL を実行します。
+
+::
+  INSERT INTO sns_config (name, value) VALUES ('opExamplePlugin_needs_data_load', '1');
+
+データベースへの変更を反映
+++++++++++++++++++++++++++
+
+Doctrine を利用している場合のみ
+
+::
+  $ ./symfony openpne:migrate --target=opExamplePlugin --no-update-plugin
+
+アンインストール
+================
+
+opPlugin:uninstall によるアンインストール
+-----------------------------------------
+
+openpne:install コマンドで自動的にインストールされたプラグインや opPlugin:install コマンドでインストールされたプラグインは、opPlugin:uninstall コマンドを利用してアンインストールすることができます。
+
+アンインストールコマンドの実行
+++++++++++++++++++++++++++++++
+
+::
+  $ ./symfony opPlugin:uninstall opExamplePlugin
+
+Doctrine の自動生成ファイルの再生成
++++++++++++++++++++++++++++++++++++
+
+Doctrine を利用している場合のみ
+
+::
+  $ ./symfony doctrine:build --all-classes
+
+キャッシュの削除
+++++++++++++++++
+
+::
+  $ ./symfony cc
+
+データベース上のテーブル削除
+++++++++++++++++++++++++++++
+
+データベース上のテーブルは削除されませんので、不要であれば手動で削除してください。
+
+手動アンインストール
+--------------------
+
+opPlugin:uninstall が利用できない場合は、手動でのファイル削除によりプラグインを削除することになります。
+
+プラグインのソースコードを削除
+++++++++++++++++++++++++++++++
+
+::
+  $ rm -r plugins/opExamplePlugin
+
+Doctrine の自動生成ファイルを削除
++++++++++++++++++++++++++++++++++
+
+Doctrine を利用している場合のみ
+
+::
+  $ rm -r lib/{model,form,filter}/doctrine/opExamplePlugin
+
+Doctrine の自動生成ファイルの再生成
++++++++++++++++++++++++++++++++++++
+
+Doctrine を利用している場合のみ
+
+::
+  $ ./symfony doctrine:build --all-classes
+
+キャッシュの削除
+++++++++++++++++
+
+::
+  $ ./symfony cc
+
+データベース上のテーブル削除
+++++++++++++++++++++++++++++
+
+データベース上のテーブルは削除されませんので、不要であれば手動で削除してください。
diff --git a/web/css/backend.css b/web/css/backend.css
index f528df991..75c809288 100644
--- a/web/css/backend.css
+++ b/web/css/backend.css
@@ -335,6 +335,12 @@ table.skin td.submit {
   color: #ff0000;
 }
 
+.description ul {
+  padding-left: 2em;
+  margin-bottom: 1em;
+  list-style-type: disc;
+}
+
 /* CLEAR FIX*/
 .clearfix:after {
   content: ".";

From fce157f2d649043b186aa3cd88fb5246b29fbd10 Mon Sep 17 00:00:00 2001
From: Mutsumi Imamura <imamura@openpne.jp>
Date: Tue, 8 Jan 2013 10:22:27 +0900
Subject: [PATCH 344/630] (fixes #3280) updated the mobile_ip_address list

---
 lib/config/config/mobile_ip_address.yml | 50 +++++++++++--------------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/lib/config/config/mobile_ip_address.yml b/lib/config/config/mobile_ip_address.yml
index 5cfba70f9..b36265aa1 100644
--- a/lib/config/config/mobile_ip_address.yml
+++ b/lib/config/config/mobile_ip_address.yml
@@ -15,56 +15,40 @@
 ######################################
 
 ######################################
-# 2012/11/05 リリース版
-# WILLCOMの「削除IPアドレス帯域（2012年3月8日削除分）」の対応
+# 2012/12/07 リリース版
+# 2012/12/05 のWILLCOM IPアドレス帯域削除対応の取り消し
 ######################################
 
 # DoCoMo (2010/06/24更新)
 # http://www.nttdocomo.co.jp/service/developer/make/content/ip/index.html
 docomo:
-  - 210.153.84.0/24
-  - 210.136.161.0/24
-  - 210.153.86.0/24
   - 124.146.174.0/24
   - 124.146.175.0/24
   - 202.229.176.0/24
   - 202.229.177.0/24
   - 202.229.178.0/24
+  - 210.136.161.0/24
+  - 210.153.84.0/24
+  - 210.153.86.0/24
 
-# au 2011年夏モデル以前 (2012/03/23更新)
+# au 2011年夏モデル以前 (2012/12/06更新)
 # http://www.au.kddi.com/ezfactory/tec/spec/ezsava_ip.html
 ezweb:
-  - 210.230.128.224/28
-  - 121.111.227.160/27
-  - 219.108.158.0/27
-  - 219.125.146.0/28
   - 61.117.2.32/29
   - 61.117.2.40/29
-  - 219.108.158.40/29
-  - 222.5.62.128/25
-  - 59.135.38.128/25
-  - 219.108.157.0/25
-  - 219.125.145.0/25
-  - 121.111.231.0/25
-  - 121.111.227.0/25
-  - 118.152.214.192/26
-  - 118.159.131.0/25
-  - 118.159.133.0/25
-  - 118.159.132.160/27
-  - 111.86.142.0/26
   - 111.86.141.64/26
   - 111.86.141.128/26
   - 111.86.141.192/26
-  - 118.159.133.192/26
-  - 111.86.143.192/27
-  - 111.86.143.224/27
-  - 111.86.147.0/27
+  - 111.86.142.0/26
   - 111.86.142.128/27
   - 111.86.142.160/27
   - 111.86.142.192/27
   - 111.86.142.224/27
   - 111.86.143.0/27
   - 111.86.143.32/27
+  - 111.86.143.192/27
+  - 111.86.143.224/27
+  - 111.86.147.0/27
   - 111.86.147.32/27
   - 111.86.147.64/27
   - 111.86.147.96/27
@@ -72,6 +56,16 @@ ezweb:
   - 111.86.147.160/27
   - 111.86.147.192/27
   - 111.86.147.224/27
+  - 118.152.214.192/26
+  - 118.159.132.160/27
+  - 118.159.133.0/25
+  - 118.159.133.192/26
+  - 121.111.227.0/25
+  - 121.111.231.0/25
+  - 210.230.128.224/28
+  - 219.108.158.0/27
+  - 219.108.158.40/29
+  - 219.125.146.0/28
 
 # au 2011年秋冬モデル以降 (2012/07/16更新)
 # http://www.au.kddi.com/ezfactory/tec/spec/ezsava_ip.html
@@ -88,7 +82,7 @@ softbank:
   - 202.253.99.144/28
   - 210.228.189.188/30
 
-# WILLCOM (2012/11/05更新)
+# WILLCOM (2012/12/07更新)
 # http://www.willcom-inc.com/ja/service/contents_service/create/center_info/
 willcom:
   - 61.198.129.0/24
@@ -231,7 +225,7 @@ willcom:
   - 221.119.8.0/24
   - 221.119.9.0/24
 
-# WILLCOM (2012/11/01更新)
+# WILLCOM (2012/12/07更新)
 # 通信設備の設備更改に伴う一時的な増設による追加。問題なく完了すれば近日中に終了する予定。
   - 61.198.131.0/24
   - 61.198.140.0/24

From 12939dc0b4531d3f9ad26a41308ccedda7f6263e Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Tue, 8 Jan 2013 14:39:23 +0900
Subject: [PATCH 345/630] (refs #3288, BP from #2882) add sfValidatorDateTest
 +38 case

about test case
  empty values:     ('', false, array(), new SimpleXmlElement('<hoge />'))
  not empty values: (0, '0', 0.0)

  required:         (true, false)
  date array:       (Yms, YmsH)
---
 test/unit/validator/opValidatorDateTest.php | 137 +++++++++++++++++++-
 1 file changed, 135 insertions(+), 2 deletions(-)

diff --git a/test/unit/validator/opValidatorDateTest.php b/test/unit/validator/opValidatorDateTest.php
index 7ab9502f9..50e400ca6 100644
--- a/test/unit/validator/opValidatorDateTest.php
+++ b/test/unit/validator/opValidatorDateTest.php
@@ -2,7 +2,7 @@
 
 include_once dirname(__FILE__) . '/../../bootstrap/unit.php';
 
-$t = new lime_test(42, new lime_output_color());
+$t = new lime_test(84, new lime_output_color());
 
 $v = new opValidatorDate();
 
@@ -47,7 +47,7 @@
 $t->is($v->clean(array('year' => 2008, 'month' => 02, 'day' => 29)), '2008-02-29', '->clean() recognises a leapyear');
 
 $v->setOption('required', false);
-$v->setOption('empty_value', new DateTime('1989-01-08')); 
+$v->setOption('empty_value', new DateTime('1989-01-08'));
 $t->is($v->clean(array('year' => '', 'month' => '', 'day' => '', 'hour' => '10')), '1989-01-08', '->clean() accepts an array as empty');
 $v->setOption('required', true);
 
@@ -211,3 +211,136 @@
 {
   $t->pass('->clean() throws an exception if the date is not within the range provided by the min/max options');
 }
+
+// required = true, isEmpty() = true
+$t->diag('required = true, isEmpty() = true');
+$v = new opValidatorDate();
+
+foreach (array(
+  array('year' => '', 'month' => '', 'day' => ''),
+  array('year' => null, 'month' => null, 'day' => null),
+  array('year' => false, 'month' => false, 'day' => false),
+  array('year' => array(), 'month' => array(), 'day' => array()),
+  array('year' => new SimpleXMLElement('<hoge />'), 'month' => new SimpleXMLElement('<hoge />'), 'day' => new SimpleXMLElement('<hoge />')),
+  '',
+  null,
+) as $input)
+{
+  try
+  {
+    $v->clean($input);
+    $t->fail('->clean() throws an exception if the date is empty and required is true');
+  }
+  catch (sfValidatorError $e)
+  {
+    $t->pass('->clean() throws an exception if the date is empty and required is true');
+    $t->is($e->getCode(), 'required', '->clean() throws a sfValidatorError');
+  }
+}
+
+// required = true, isEmpty() = false
+$t->diag('required = true, isEmpty() = false');
+foreach (array(
+  array('year' => 0, 'month' => 0, 'day' => 0),
+  array('year' => '0', 'month' => '0', 'day' => '0'),
+) as $input)
+{
+  try
+  {
+    $v->clean($input);
+    $t->fail('->clean() throws an exception if the date is not empty and required is true');
+  }
+  catch (sfValidatorError $e)
+  {
+    $t->pass('->clean() throws an exception if the date is not empty and required is true');
+    $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
+  }
+}
+
+// required = false, isEmpty() = true
+$t->diag('required = false, isEmpty() = true');
+$v = new opValidatorDate();
+$v->setOption('required', false);
+
+foreach (array(
+  array('year' => '', 'month' => '', 'day' => ''),
+  array('year' => null, 'month' => null, 'day' => null),
+  array('year' => false, 'month' => false, 'day' => false),
+  array('year' => array(), 'month' => array(), 'day' => array()),
+  array('year' => new SimpleXMLElement('<hoge />'), 'month' => new SimpleXMLElement('<hoge />'), 'day' => new SimpleXMLElement('<hoge />')),
+  '',
+  null,
+) as $input)
+{
+  try
+  {
+    $t->is($v->clean($input), null, '->clean() accepts an array as an input');
+  }
+  catch(sfValidatorError $e)
+  {
+    $t->fail('->clean() accepts an array as an input for \''.$e->getCode().'\'');
+  }
+}
+
+// required = false, isEmpty() = false
+$t->diag('required = false, isEmpty() = false');
+foreach (array(
+  array('year' => 0, 'month' => 0, 'day' => 0),
+  array('year' => '0', 'month' => '0', 'day' => '0'),
+  array('year' => 0.0, 'month' => 0.0, 'day' => 0.0),
+) as $input)
+{
+  try
+  {
+    $v->clean($input);
+    $t->fail('->clean() throws an exception if the date is not empty and required is false');
+  }
+  catch (sfValidatorError $e)
+  {
+    $t->pass('->clean() throws an exception if the date is not empty and required is false');
+    $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
+  }
+}
+
+// required = true, isEmpty() = false
+$t->diag('required = true, isEmpty() = false');
+$v = new opValidatorDate();
+$v->setOption('empty_value', new DateTime('1989-01-08'));
+
+foreach (array(
+  array('year' => '', 'month' => '', 'day' => '', 'hour' => 10),
+  array('year' => null, 'month' => null, 'day' => null, 'hour' => 10),
+  array('year' => false, 'month' => false, 'day' => false, 'hour' => 10),
+  array('year' => array(), 'month' => array(), 'day' => array(), 'hour' => 10),
+  array('year' => new SimpleXMLElement('<hoge />'), 'month' => new SimpleXMLElement('<hoge />'), 'day' => new SimpleXMLElement('<hoge />'), 'hour' => 10),
+) as $input)
+{
+  try
+  {
+    $t->is($v->clean($input), '1989-01-08', '->clean() accepts empty valus "Yms" and required is true');
+  }
+  catch(sfValidatorError $e)
+  {
+    $t->fail('->clean() accepts empty valus "Yms" and required is true');
+  }
+}
+
+// required = false, isEmpty() = false
+$t->diag('required = false, isEmpty() = false');
+foreach (array(
+  array('year' => 0, 'month' => 0, 'day' => 0, 'hour' => 10),
+  array('year' => '0', 'month' => '0', 'day' => '0', 'hour' => 10),
+  array('year' => 0.0, 'month' => 0.0, 'day' => 0.0, 'hour' => 10),
+) as $input)
+{
+  try
+  {
+    $v->clean($input);
+    $t->fail('->clean() accepts not empty valus "Yms" and required is true');
+  }
+  catch (sfValidatorError $e)
+  {
+    $t->pass('->clean() accepts not empty valus "Yms" and required is true');
+    $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
+  }
+}

From 2ce507a4b5ed3876eaab933d833fce98dbee5ca9 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Tue, 8 Jan 2013 17:38:56 +0900
Subject: [PATCH 346/630] (refs #3288, BP from #2882) fixed not to evaluate
 empty array in preg_match

---
 lib/validator/opValidatorDate.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/validator/opValidatorDate.class.php b/lib/validator/opValidatorDate.class.php
index cc82bf438..2fa358462 100644
--- a/lib/validator/opValidatorDate.class.php
+++ b/lib/validator/opValidatorDate.class.php
@@ -91,7 +91,7 @@ protected function convertDateArrayToDateTime($value)
     // all elements must be empty or a number
     foreach (array('year', 'month', 'day', 'hour', 'minute', 'second') as $key)
     {
-      if (isset($value[$key]) && !preg_match('#^\d+$#', $value[$key]) && !empty($value[$key]))
+      if (isset($value[$key]) && !empty($value[$key]) && !preg_match('#^\d+$#', $value[$key]))
       {
         throw new sfValidatorError($this, 'invalid', array('value' => $value));
       }

From 37a5e15f45ae2a1b6169b8755974bf8a96848417 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Tue, 8 Jan 2013 17:39:42 +0900
Subject: [PATCH 347/630] (refs #3288, BP from #2882) fixed not to be empty for
 zero number or string

---
 lib/validator/opValidatorDate.class.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/lib/validator/opValidatorDate.class.php b/lib/validator/opValidatorDate.class.php
index 2fa358462..c35505ad6 100644
--- a/lib/validator/opValidatorDate.class.php
+++ b/lib/validator/opValidatorDate.class.php
@@ -152,4 +152,23 @@ protected function convertDateArrayToDateTime($value)
 
     return $clean;
   }
+
+  protected function isEmpty($value)
+  {
+    if (!is_array($value))
+    {
+      return parent::isEmpty($value);
+    }
+
+    foreach ($value as $v)
+    {
+      if ($v || is_numeric($v))
+      {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
 }

From 803c1653c87b420e09e1f2ccafc904154e3f7184 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Tue, 8 Jan 2013 17:40:53 +0900
Subject: [PATCH 348/630] (refs #3288, BP from #2882) fixed not to be empty day
 values for zero number or string

---
 lib/validator/opValidatorDate.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/validator/opValidatorDate.class.php b/lib/validator/opValidatorDate.class.php
index c35505ad6..6b4a02fc4 100644
--- a/lib/validator/opValidatorDate.class.php
+++ b/lib/validator/opValidatorDate.class.php
@@ -99,9 +99,9 @@ protected function convertDateArrayToDateTime($value)
 
     // if one date value is empty, all others must be empty too
     $empties =
-      (!isset($value['year']) || !$value['year'] ? 1 : 0) +
-      (!isset($value['month']) || !$value['month'] ? 1 : 0) +
-      (!isset($value['day']) || !$value['day'] ? 1 : 0);
+      (!isset($value['year']) || !is_numeric($value['year']) ? 1 : 0) +
+      (!isset($value['month']) || !is_numeric($value['month']) ? 1 : 0) +
+      (!isset($value['day']) || !is_numeric($value['day']) ? 1 : 0);
 
     if ($empties > 0 && $empties < 3)
     {

From fea2e56bead8b634aa39ab2fccf29ddb559696d1 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Wed, 9 Jan 2013 21:03:39 +0900
Subject: [PATCH 349/630] (refs #3156, BP from #3073) fixed

make redirect to login action when tha page is following condition

1. login action is required ssl setting.
2. access doesn't use ssl then the member is not login.
3. the accessed page is that  'is_secure' is 'false' or 'both'.
---
 lib/action/opMemberAction.class.php | 39 ++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/lib/action/opMemberAction.class.php b/lib/action/opMemberAction.class.php
index 6226a9495..083b63dce 100644
--- a/lib/action/opMemberAction.class.php
+++ b/lib/action/opMemberAction.class.php
@@ -78,6 +78,44 @@ public function executeLogin($request)
   {
     $this->getUser()->logout();
 
+    $routing = sfContext::getInstance()->getRouting();
+    if (!$request->isSecure())
+    {
+      $app = sfConfig::get('sf_app');
+      $sslRequiredList = sfConfig::get('op_ssl_required_actions', array(
+        $app => array(),
+      ));
+
+      $moduleName = sfConfig::get('sf_login_module');
+      $actionName = sfConfig::get('sf_login_action');
+      if (in_array($moduleName.'/'.$actionName, $sslRequiredList[$app]))
+      {
+        $nextUri = $routing->getCurrentInternalUri();
+        if ($_SERVER['QUERY_STRING'])
+        {
+          if (false !== strpos($nextUri, '?'))
+          {
+            $nextUri .= '&';
+          }
+          else
+          {
+            $nextUri .= '?';
+          }
+
+          $nextUri .= $_SERVER['QUERY_STRING'];
+        }
+
+        $nextUriParam = array(
+          'next_uri' => $nextUri
+        );
+
+        $loginUrl = $this->generateUrl('login', array(), true);
+        $loginUrl .= '?'.http_build_query($nextUriParam, '', '&');
+
+        $this->redirect($loginUrl);
+      }
+    }
+
     $this->forms = $this->getUser()->getAuthForms();
 
     if ($request->hasParameter('authMode'))
@@ -95,7 +133,6 @@ public function executeLogin($request)
       return sfView::ERROR;
     }
 
-    $routing = sfContext::getInstance()->getRouting();
     if ('homepage' !== $routing->getCurrentRouteName()
       && 'login' !== $routing->getCurrentRouteName()
     )

From 8ac0f6a320773f18ec78553ef3ca22813712bc7b Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Wed, 9 Jan 2013 21:28:33 +0900
Subject: [PATCH 350/630] (refs #3156, BP from #3073) add feature to set
 next_uri value when the GET parameter was given

---
 .../opWidgetFormInputHiddenNextUri.class.php  | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/lib/widget/opWidgetFormInputHiddenNextUri.class.php b/lib/widget/opWidgetFormInputHiddenNextUri.class.php
index 8fb1d3eab..a5187f63c 100644
--- a/lib/widget/opWidgetFormInputHiddenNextUri.class.php
+++ b/lib/widget/opWidgetFormInputHiddenNextUri.class.php
@@ -24,19 +24,23 @@ protected function configure($options = array(), $attributes = array())
     $routing = sfContext::getInstance()->getRouting();
     $request = sfContext::getInstance()->getRequest();
 
-    $value = $routing->getCurrentInternalUri();
-    if ($_SERVER['QUERY_STRING'])
+    $value = $request->getGetParameter('next_uri', null);
+    if (is_null($value))
     {
-      if (false !== strpos($value, '?'))
+      $value = $routing->getCurrentInternalUri();
+      if ($_SERVER['QUERY_STRING'])
       {
-        $value .= '&';
+        if (false !== strpos($value, '?'))
+        {
+          $value .= '&';
+        }
+        else
+        {
+          $value .= '?';
+        }
+
+        $value .= $_SERVER['QUERY_STRING'];
       }
-      else
-      {
-        $value .= '?';
-      }
-
-      $value .= $_SERVER['QUERY_STRING'];
     }
 
     if ($request->isMethod(sfWebRequest::POST))

From 71c6232b9da270945c01944dd39327712f726064 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 10 Jan 2013 11:40:02 +0900
Subject: [PATCH 351/630] (refs #3156, BP from #3073) fixed not to occur
 redirect loop when access to login page

---
 lib/action/opMemberAction.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/action/opMemberAction.class.php b/lib/action/opMemberAction.class.php
index 083b63dce..ff3882f54 100644
--- a/lib/action/opMemberAction.class.php
+++ b/lib/action/opMemberAction.class.php
@@ -79,7 +79,7 @@ public function executeLogin($request)
     $this->getUser()->logout();
 
     $routing = sfContext::getInstance()->getRouting();
-    if (!$request->isSecure())
+    if (sfConfig::get('op_use_ssl', false) && !$request->isSecure())
     {
       $app = sfConfig::get('sf_app');
       $sslRequiredList = sfConfig::get('op_ssl_required_actions', array(

From 5409ba48a809879a0059d0f93220af4bbcd09be6 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 10 Jan 2013 13:19:28 +0900
Subject: [PATCH 352/630] (fixes #3156, BP from #3073) fixed to make login url
 using ssl_base_url setting for not to redirect twice

---
 lib/action/opMemberAction.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/action/opMemberAction.class.php b/lib/action/opMemberAction.class.php
index ff3882f54..ad51bac1b 100644
--- a/lib/action/opMemberAction.class.php
+++ b/lib/action/opMemberAction.class.php
@@ -109,7 +109,8 @@ public function executeLogin($request)
           'next_uri' => $nextUri
         );
 
-        $loginUrl = $this->generateUrl('login', array(), true);
+        $baseUrl = sfConfig::get('op_ssl_base_url');
+        $loginUrl = $baseUrl[$app].$this->generateUrl('login');
         $loginUrl .= '?'.http_build_query($nextUriParam, '', '&');
 
         $this->redirect($loginUrl);

From d16ac85022fc675f9cb29334132a37022dcdeaba Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 10 Jan 2013 15:26:52 +0900
Subject: [PATCH 353/630] (fixes #3156, BP from #3073) fixed to redirect
 considering include path

---
 lib/action/opMemberAction.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/action/opMemberAction.class.php b/lib/action/opMemberAction.class.php
index ad51bac1b..582c36bc9 100644
--- a/lib/action/opMemberAction.class.php
+++ b/lib/action/opMemberAction.class.php
@@ -110,7 +110,10 @@ public function executeLogin($request)
         );
 
         $baseUrl = sfConfig::get('op_ssl_base_url');
-        $loginUrl = $baseUrl[$app].$this->generateUrl('login');
+        $scriptName = basename($request->getScriptName());
+        $replacement = (false !== strpos($request->getPathInfoPrefix(), $scriptName)) ? '/'.$scriptName : '';
+        $loginPath = str_replace($request->getPathInfoPrefix(), $replacement, $this->generateUrl('login'));
+        $loginUrl = $baseUrl[$app].$loginPath;
         $loginUrl .= '?'.http_build_query($nextUriParam, '', '&');
 
         $this->redirect($loginUrl);

From 0148af5601c4a0db7b2996d5de6693d7cd00bd5f Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 10 Jan 2013 15:44:51 +0900
Subject: [PATCH 354/630] (refs #3156, BP from #3073) extract redirect logic to
 private method

---
 lib/action/opMemberAction.class.php | 58 ++++++++++++++++-------------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/lib/action/opMemberAction.class.php b/lib/action/opMemberAction.class.php
index 582c36bc9..9058bc77c 100644
--- a/lib/action/opMemberAction.class.php
+++ b/lib/action/opMemberAction.class.php
@@ -78,6 +78,38 @@ public function executeLogin($request)
   {
     $this->getUser()->logout();
 
+    $this->redirectToLoginIfSslRequired($request);
+
+    $this->forms = $this->getUser()->getAuthForms();
+
+    if ($request->hasParameter('authMode'))
+    {
+      $uri = $this->getUser()->login();
+
+      $this->redirectIf($this->getUser()->isRegisterBegin(), $this->getUser()->getRegisterInputAction());
+      $this->redirectIf($this->getUser()->isRegisterFinish(), $this->getUser()->getRegisterEndAction());
+
+      if ($uri)
+      {
+        $this->redirectIf($this->getUser()->isMember(), $uri);
+      }
+
+      return sfView::ERROR;
+    }
+
+    $routing = sfContext::getInstance()->getRouting();
+    if ('homepage' !== $routing->getCurrentRouteName()
+      && 'login' !== $routing->getCurrentRouteName()
+    )
+    {
+      $this->getUser()->setFlash('notice', 'Please login to visit this page', false);
+    }
+
+    return sfView::SUCCESS;
+  }
+
+  private function redirectToLoginIfSslRequired($request)
+  {
     $routing = sfContext::getInstance()->getRouting();
     if (sfConfig::get('op_use_ssl', false) && !$request->isSecure())
     {
@@ -119,32 +151,6 @@ public function executeLogin($request)
         $this->redirect($loginUrl);
       }
     }
-
-    $this->forms = $this->getUser()->getAuthForms();
-
-    if ($request->hasParameter('authMode'))
-    {
-      $uri = $this->getUser()->login();
-
-      $this->redirectIf($this->getUser()->isRegisterBegin(), $this->getUser()->getRegisterInputAction());
-      $this->redirectIf($this->getUser()->isRegisterFinish(), $this->getUser()->getRegisterEndAction());
-
-      if ($uri)
-      {
-        $this->redirectIf($this->getUser()->isMember(), $uri);
-      }
-
-      return sfView::ERROR;
-    }
-
-    if ('homepage' !== $routing->getCurrentRouteName()
-      && 'login' !== $routing->getCurrentRouteName()
-    )
-    {
-      $this->getUser()->setFlash('notice', 'Please login to visit this page', false);
-    }
-
-    return sfView::SUCCESS;
   }
 
   public function executeLogout($request)

From d9ff9bdf563859564641a9447dfadbf5129d94d5 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 10 Jan 2013 20:47:01 +0900
Subject: [PATCH 355/630] version 3.8.4

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 2801e97d5..d2fdb2ff0 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.4-dev');
+  define('OPENPNE_VERSION', '3.8.4');
 }

From 72198794a83ef9a1f1480c6c05098c98f874a2c9 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 10 Jan 2013 20:48:09 +0900
Subject: [PATCH 356/630] started to development of OpenPNE 3.8.5

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index d2fdb2ff0..b4d20f18b 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.4');
+  define('OPENPNE_VERSION', '3.8.5-dev');
 }

From aad7b956d542b98e6a6be003f8597b4cb17f5936 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Fri, 25 Jan 2013 16:22:20 +0900
Subject: [PATCH 357/630] (fixes #3308 BP from #3305) fix issue of cmd feature
 with some youtube.com urls

---
 web/cmd/www.youtube.com.js | 2 +-
 web/cmd/youtube.com.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/cmd/www.youtube.com.js b/web/cmd/www.youtube.com.js
index 847d5d9ea..af5fe6e76 100644
--- a/web/cmd/www.youtube.com.js
+++ b/web/cmd/www.youtube.com.js
@@ -1,5 +1,5 @@
 function url2cmd(url) {
-    if (!url.match(/^http:\/\/(?:www\.|)youtube\.com\/watch\?v=([a-zA-Z0-9_\-]+)/)) {
+    if (!url.match(/^http:\/\/(?:www\.|)youtube\.com\/watch\?(?:.+&amp;)?v=([a-zA-Z0-9_\-]+)/)) {
         pne_url2a(url);
         return;
     }
diff --git a/web/cmd/youtube.com.js b/web/cmd/youtube.com.js
index 847d5d9ea..af5fe6e76 100644
--- a/web/cmd/youtube.com.js
+++ b/web/cmd/youtube.com.js
@@ -1,5 +1,5 @@
 function url2cmd(url) {
-    if (!url.match(/^http:\/\/(?:www\.|)youtube\.com\/watch\?v=([a-zA-Z0-9_\-]+)/)) {
+    if (!url.match(/^http:\/\/(?:www\.|)youtube\.com\/watch\?(?:.+&amp;)?v=([a-zA-Z0-9_\-]+)/)) {
         pne_url2a(url);
         return;
     }

From be0415e9fcb012153e4ca402908748c31484c40c Mon Sep 17 00:00:00 2001
From: Mutsumi Imamura <imamura@openpne.jp>
Date: Mon, 11 Mar 2013 20:42:10 +0900
Subject: [PATCH 358/630] (fixes #3320) updated the mobile_ip_address list

---
 lib/config/config/mobile_ip_address.yml | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/lib/config/config/mobile_ip_address.yml b/lib/config/config/mobile_ip_address.yml
index b36265aa1..8a256f6fa 100644
--- a/lib/config/config/mobile_ip_address.yml
+++ b/lib/config/config/mobile_ip_address.yml
@@ -1,5 +1,5 @@
 ######################################
-# Copyright 2005-2012 OpenPNE Project (http://www.openpne.jp/)
+# Copyright 2005-2013 OpenPNE Project (http://www.openpne.jp/)
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
 ######################################
 
 ######################################
-# 2012/12/07 リリース版
-# 2012/12/05 のWILLCOM IPアドレス帯域削除対応の取り消し
+# 2013/01/30 リリース版
+# 2013/01/30 のWILLCOM IPアドレス帯域追加対応
 ######################################
 
 # DoCoMo (2010/06/24更新)
@@ -82,7 +82,7 @@ softbank:
   - 202.253.99.144/28
   - 210.228.189.188/30
 
-# WILLCOM (2012/12/07更新)
+# WILLCOM (2013/01/30更新)
 # http://www.willcom-inc.com/ja/service/contents_service/create/center_info/
 willcom:
   - 61.198.129.0/24
@@ -147,6 +147,7 @@ willcom:
   - 114.20.65.0/24
   - 114.20.66.0/24
   - 114.20.67.0/24
+  - 114.20.128.0/17
   - 114.21.128.0/24
   - 114.21.129.0/24
   - 114.21.130.0/24
@@ -224,12 +225,3 @@ willcom:
   - 221.119.7.0/24
   - 221.119.8.0/24
   - 221.119.9.0/24
-
-# WILLCOM (2012/12/07更新)
-# 通信設備の設備更改に伴う一時的な増設による追加。問題なく完了すれば近日中に終了する予定。
-  - 61.198.131.0/24
-  - 61.198.140.0/24
-  - 61.198.141.0/24
-  - 61.198.143.0/24
-  - 61.198.165.0/24
-  - 61.198.166.0/24

From c4f4f50d3d73cbf1ec66a11e8a522325ed3945b2 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Tue, 12 Mar 2013 10:53:51 +0900
Subject: [PATCH 359/630] fixed to become correct way to delete NestedSet in
 MemberProfile (fixes #3312, BP from 3294)

---
 lib/model/doctrine/MemberProfile.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/model/doctrine/MemberProfile.class.php b/lib/model/doctrine/MemberProfile.class.php
index a08561357..04389395c 100644
--- a/lib/model/doctrine/MemberProfile.class.php
+++ b/lib/model/doctrine/MemberProfile.class.php
@@ -204,7 +204,11 @@ public function clearChildren()
     if ($this->getTreeKey() && $this->getNode()->hasChildren())
     {
       $children = $this->getNode()->getChildren();
-      $children->delete();
+      for ($i = $children->count(); $i-- > 0;)
+      {
+        $children[$i]->getNode()->delete();
+      }
+      $this->refresh();
     }
   }
 

From 424ff472775c9fd7cfe850f00db5ae9873387255 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 14 Mar 2013 17:27:54 +0900
Subject: [PATCH 360/630] version 3.8.5

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index b4d20f18b..9ac48599f 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.5-dev');
+  define('OPENPNE_VERSION', '3.8.5');
 }

From b4774429f185cd95e2ba4ec93497de7b3df00327 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 14 Mar 2013 17:30:25 +0900
Subject: [PATCH 361/630] started to development of OpenPNE 3.8.6

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 9ac48599f..b17386a39 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.5');
+  define('OPENPNE_VERSION', '3.8.6-dev');
 }

From 597bf77c95e2c76d5fdcce4d3b91d53a7be7354c Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 27 Sep 2012 16:54:54 +0900
Subject: [PATCH 362/630] (fixes #3215, BP from #3130) fixed to use config file
 setting for is_allow_web_public_flag_age

---
 lib/model/doctrine/Member.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/model/doctrine/Member.class.php b/lib/model/doctrine/Member.class.php
index 5dd0d1ade..b1a7d5f9d 100644
--- a/lib/model/doctrine/Member.class.php
+++ b/lib/model/doctrine/Member.class.php
@@ -79,7 +79,7 @@ public function getAge($viewableCheck = false, $myMemberId = null)
       return $age;
     }
 
-    if (ProfileTable::PUBLIC_FLAG_WEB == $publicFlag && Doctrine::getTable('SnsConfig')->get('is_allow_web_public_flag_age'))
+    if (ProfileTable::PUBLIC_FLAG_WEB == $publicFlag && opConfig::get('is_allow_web_public_flag_age'))
     {
       return $age;
     }

From d3872746251ef2cf8e5eb6b44d8a3174c1214216 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Wed, 10 Apr 2013 12:40:58 +0900
Subject: [PATCH 363/630] fixed i18n catalog to translate tooltip message
 (fixes #3247, BP from #3246)

---
 apps/pc_frontend/modules/default/templates/_activityRecord.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/pc_frontend/modules/default/templates/_activityRecord.php b/apps/pc_frontend/modules/default/templates/_activityRecord.php
index 3ed1a07f4..303db33bf 100644
--- a/apps/pc_frontend/modules/default/templates/_activityRecord.php
+++ b/apps/pc_frontend/modules/default/templates/_activityRecord.php
@@ -40,7 +40,7 @@
   {
     $operationItems[] = array(
       'class' => 'delete',
-      'body'  => link_to(__('Delete'), 'member/deleteActivity?id='.$activity->getId(), array('title' => __('Delete this activity of %time%', array('%time%' => $time)))),
+      'body'  => link_to(__('Delete'), 'member/deleteActivity?id='.$activity->getId(), array('title' => __('Delete this %activity% of %time%', array('%time%' => $time)))),
     );
   }
 }

From fea818ef467119157f414711f3f72c51f249d4f7 Mon Sep 17 00:00:00 2001
From: nakajima <nakajima@www1124uc.sakura.ne.jp>
Date: Thu, 28 Mar 2013 16:27:02 +0900
Subject: [PATCH 364/630] (fixes #3327, BP from #3323) Search for members in
 the member ID

---
 apps/pc_backend/modules/member/actions/actions.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/pc_backend/modules/member/actions/actions.class.php b/apps/pc_backend/modules/member/actions/actions.class.php
index aacd98209..cb5d47af4 100644
--- a/apps/pc_backend/modules/member/actions/actions.class.php
+++ b/apps/pc_backend/modules/member/actions/actions.class.php
@@ -36,7 +36,7 @@ public function executeList(sfWebRequest $request)
   {
     $params = $request->getParameter('member', array());
 
-    $this->form = new opMemberProfileSearchForm(array(), array('use_id' => true, 'is_check_public_flag' => false));
+    $this->form = new opMemberProfileSearchForm(array(), array('is_use_id' => true, 'is_check_public_flag' => false));
     $this->form->getWidgetSchema()->setLabel('name', 'Nickname');
     $this->form->bind($params);
 

From 193c1ba166ec04172ce10046a0ce5ab752d7f6a5 Mon Sep 17 00:00:00 2001
From: amashigeseiji <amashige@tejimaya.com>
Date: Tue, 26 Mar 2013 12:40:13 +0900
Subject: [PATCH 365/630] (refs #3318, BP from #3317) fixed Typo "Prease" which
 should be "Please"

---
 apps/mobile_frontend/i18n/messages.ja.xml                       | 2 +-
 .../modules/member/templates/configUIDSuccess.php               | 2 +-
 .../member/templates/registerMobileToRegisterEndSuccess.php     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/mobile_frontend/i18n/messages.ja.xml b/apps/mobile_frontend/i18n/messages.ja.xml
index 23df85c7a..af37c3c9b 100644
--- a/apps/mobile_frontend/i18n/messages.ja.xml
+++ b/apps/mobile_frontend/i18n/messages.ja.xml
@@ -303,7 +303,7 @@
         <target>携帯電話を登録します。</target>
       </trans-unit>
       <trans-unit id="">
-        <source>Prease input your password, press "%1%" button.</source>
+        <source>Please input your password, press "%1%" button.</source>
         <target>ﾊﾟｽﾜｰﾄﾞを入力して、「%1%」ﾎﾞﾀﾝを押してください。</target>
       </trans-unit>
       <trans-unit id="">
diff --git a/apps/mobile_frontend/modules/member/templates/configUIDSuccess.php b/apps/mobile_frontend/modules/member/templates/configUIDSuccess.php
index 84e7e9b26..96726dcf0 100644
--- a/apps/mobile_frontend/modules/member/templates/configUIDSuccess.php
+++ b/apps/mobile_frontend/modules/member/templates/configUIDSuccess.php
@@ -3,7 +3,7 @@
 <?php echo __('Mobile UID is already setting.') ?>
 <hr color="<?php echo $op_color["core_color_11"] ?>">
 <?php endif; ?>
-<?php echo __('Setting mobile UID.'); echo __('Prease input your password, press "%1%" button.', array('%1%' => __('Save'))) ?>
+<?php echo __('Setting mobile UID.'); echo __('Please input your password, press "%1%" button.', array('%1%' => __('Save'))) ?>
 <form action="<?php echo url_for('member/configUID').'?guid=on' ?>" method="post" utn>
 <?php echo $passwordForm ?>
 <center>
diff --git a/apps/mobile_frontend/modules/member/templates/registerMobileToRegisterEndSuccess.php b/apps/mobile_frontend/modules/member/templates/registerMobileToRegisterEndSuccess.php
index 04439e372..1696f47b1 100644
--- a/apps/mobile_frontend/modules/member/templates/registerMobileToRegisterEndSuccess.php
+++ b/apps/mobile_frontend/modules/member/templates/registerMobileToRegisterEndSuccess.php
@@ -1,7 +1,7 @@
 <?php op_mobile_page_title(__('Register mobile')) ?>
 
 <?php echo __('You register mobile UID.') ?><br>
-<?php echo __('Prease input your password, press "%1%" button.', array('%1%' => __('Register'))) ?><br>
+<?php echo __('Please input your password, press "%1%" button.', array('%1%' => __('Register'))) ?><br>
 
 <form action="<?php echo url_for('member/registerMobileToRegisterEnd?token='.$sf_params->get('token').'&id='.$sf_params->get('id')).'?guid=on' ?>" method="post" utn>
 <?php echo $form ?>

From dfdc5df438921013dd844845a911895722296429 Mon Sep 17 00:00:00 2001
From: amashigeseiji <amashige@tejimaya.com>
Date: Mon, 8 Apr 2013 19:20:02 +0900
Subject: [PATCH 366/630] (refs #3318, BP from #3317) fixed Typo "Prease" which
 should be "Please"

---
 apps/mobile_frontend/i18n/messages.ja.xml                       | 2 +-
 .../modules/member/templates/configUIDSuccess.php               | 2 +-
 .../member/templates/registerMobileToRegisterEndSuccess.php     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/mobile_frontend/i18n/messages.ja.xml b/apps/mobile_frontend/i18n/messages.ja.xml
index af37c3c9b..8eec95a62 100644
--- a/apps/mobile_frontend/i18n/messages.ja.xml
+++ b/apps/mobile_frontend/i18n/messages.ja.xml
@@ -303,7 +303,7 @@
         <target>携帯電話を登録します。</target>
       </trans-unit>
       <trans-unit id="">
-        <source>Please input your password, press "%1%" button.</source>
+        <source>Please input your password, and press "%1%" button.</source>
         <target>ﾊﾟｽﾜｰﾄﾞを入力して、「%1%」ﾎﾞﾀﾝを押してください。</target>
       </trans-unit>
       <trans-unit id="">
diff --git a/apps/mobile_frontend/modules/member/templates/configUIDSuccess.php b/apps/mobile_frontend/modules/member/templates/configUIDSuccess.php
index 96726dcf0..c84ab13f9 100644
--- a/apps/mobile_frontend/modules/member/templates/configUIDSuccess.php
+++ b/apps/mobile_frontend/modules/member/templates/configUIDSuccess.php
@@ -3,7 +3,7 @@
 <?php echo __('Mobile UID is already setting.') ?>
 <hr color="<?php echo $op_color["core_color_11"] ?>">
 <?php endif; ?>
-<?php echo __('Setting mobile UID.'); echo __('Please input your password, press "%1%" button.', array('%1%' => __('Save'))) ?>
+<?php echo __('Setting mobile UID.&nbsp'); echo __('Please input your password, and press "%1%" button.', array('%1%' => __('Save'))) ?>
 <form action="<?php echo url_for('member/configUID').'?guid=on' ?>" method="post" utn>
 <?php echo $passwordForm ?>
 <center>
diff --git a/apps/mobile_frontend/modules/member/templates/registerMobileToRegisterEndSuccess.php b/apps/mobile_frontend/modules/member/templates/registerMobileToRegisterEndSuccess.php
index 1696f47b1..8c9d7b69a 100644
--- a/apps/mobile_frontend/modules/member/templates/registerMobileToRegisterEndSuccess.php
+++ b/apps/mobile_frontend/modules/member/templates/registerMobileToRegisterEndSuccess.php
@@ -1,7 +1,7 @@
 <?php op_mobile_page_title(__('Register mobile')) ?>
 
 <?php echo __('You register mobile UID.') ?><br>
-<?php echo __('Please input your password, press "%1%" button.', array('%1%' => __('Register'))) ?><br>
+<?php echo __('Please input your password, and press "%1%" button.', array('%1%' => __('Register'))) ?><br>
 
 <form action="<?php echo url_for('member/registerMobileToRegisterEnd?token='.$sf_params->get('token').'&id='.$sf_params->get('id')).'?guid=on' ?>" method="post" utn>
 <?php echo $form ?>

From dce5cbb3dd3a3bbea40eaee88d4a6bd9ea6e6b1d Mon Sep 17 00:00:00 2001
From: amashigeseiji <amashige@tejimaya.com>
Date: Tue, 9 Apr 2013 18:07:50 +0900
Subject: [PATCH 367/630] (fixes #3318, BP from #3317) Add a break tag for text
 appearance is unreadable.

---
 .../modules/member/templates/configUIDSuccess.php              | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/mobile_frontend/modules/member/templates/configUIDSuccess.php b/apps/mobile_frontend/modules/member/templates/configUIDSuccess.php
index c84ab13f9..b40dc6252 100644
--- a/apps/mobile_frontend/modules/member/templates/configUIDSuccess.php
+++ b/apps/mobile_frontend/modules/member/templates/configUIDSuccess.php
@@ -3,7 +3,8 @@
 <?php echo __('Mobile UID is already setting.') ?>
 <hr color="<?php echo $op_color["core_color_11"] ?>">
 <?php endif; ?>
-<?php echo __('Setting mobile UID.&nbsp'); echo __('Please input your password, and press "%1%" button.', array('%1%' => __('Save'))) ?>
+<?php echo __('Setting mobile UID.'); ?><br>
+<?php echo __('Please input your password, and press "%1%" button.', array('%1%' => __('Save'))) ?>
 <form action="<?php echo url_for('member/configUID').'?guid=on' ?>" method="post" utn>
 <?php echo $passwordForm ?>
 <center>

From e32f43b25f2badc7e67c1d6d5bdd46c41f80de61 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Wed, 10 Apr 2013 13:41:55 +0900
Subject: [PATCH 368/630] fixed to use config file setting for sns_config.yml
 setings (fixes #3215, BP from #3130)

---
 .../MemberConfigForm/MemberConfigPublicFlagForm.class.php     | 4 ++--
 lib/model/doctrine/MemberTable.class.php                      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/form/MemberConfigForm/MemberConfigPublicFlagForm.class.php b/lib/form/MemberConfigForm/MemberConfigPublicFlagForm.class.php
index 69fd9d985..9047bae36 100644
--- a/lib/form/MemberConfigForm/MemberConfigPublicFlagForm.class.php
+++ b/lib/form/MemberConfigForm/MemberConfigPublicFlagForm.class.php
@@ -23,12 +23,12 @@ public function __construct(Member $member = null, $options = array(), $CSRFSecr
   {
     parent::__construct($member, $options, $CSRFSecret);
 
-    if (Doctrine::getTable('SnsConfig')->get('is_allow_config_public_flag_profile_page'))
+    if (opConfig::get('is_allow_config_public_flag_profile_page'))
     {
       unset($this['profile_page_public_flag']);
     }
 
-    if (!Doctrine::getTable('SnsConfig')->get('is_allow_web_public_flag_age'))
+    if (!opConfig::get('is_allow_web_public_flag_age'))
     {
       $widget = $this->widgetSchema['age_public_flag'];
 
diff --git a/lib/model/doctrine/MemberTable.class.php b/lib/model/doctrine/MemberTable.class.php
index 8ad8a28b3..0c995a994 100644
--- a/lib/model/doctrine/MemberTable.class.php
+++ b/lib/model/doctrine/MemberTable.class.php
@@ -116,9 +116,9 @@ public function appendRules(Zend_Acl $acl, $resource = null)
       ->allow('self', $resource, 'edit')
       ->deny('blocked');
 
-    if (Doctrine::getTable('SnsConfig')->get('is_allow_config_public_flag_profile_page'))
+    if (opConfig::get('is_allow_config_public_flag_profile_page'))
     {
-      $config = Doctrine::getTable('SnsConfig')->get('is_allow_config_public_flag_profile_page');
+      $config = opConfig::get('is_allow_config_public_flag_profile_page');
     }
     elseif ($resource)
     {

From 0a95a9cf1393f0bc00854fa5e345f32f5d489280 Mon Sep 17 00:00:00 2001
From: kaoru nishizoe <nishizoe@tejimaya.com>
Date: Mon, 22 Apr 2013 11:49:34 +0900
Subject: [PATCH 369/630] (refs #3330 BP from #3198) remove unnecessary calling
 sfWebResponce::setContentType() twice in opJsonApiActions

---
 lib/action/opJsonApiActions.class.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/action/opJsonApiActions.class.php b/lib/action/opJsonApiActions.class.php
index 7d1645374..5e38cf2fb 100644
--- a/lib/action/opJsonApiActions.class.php
+++ b/lib/action/opJsonApiActions.class.php
@@ -42,7 +42,6 @@ public function execute($request)
   public function renderJSON(array $data)
   {
     $json = json_encode($data, $this->doEscape);
-    $this->getResponse()->setContentType('application/json');
 
     return $this->renderText($json);
   }

From a3055163061e7661a0d4edaea24cda4688499390 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Mon, 22 Apr 2013 21:00:57 +0900
Subject: [PATCH 370/630] fixed not to display when the input value was not
 correct css (fixes #3335)

---
 lib/widget/opWidgetFormInputColor.class.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/widget/opWidgetFormInputColor.class.php b/lib/widget/opWidgetFormInputColor.class.php
index fb428f0a0..924acb75f 100644
--- a/lib/widget/opWidgetFormInputColor.class.php
+++ b/lib/widget/opWidgetFormInputColor.class.php
@@ -28,6 +28,11 @@ protected function configure($options = array(), $attributes = array())
 
   public function render($name, $value = null, $attributes = array(), $errors = array())
   {
+    if ($errors)
+    {
+      $value = '';
+    }
+
     $colorAttributes = array('style' => 'background-color:'.$value, 'id' => 'preview_'.$name, 'class' => 'color');
 
     $result = $this->renderContentTag('dd', parent::render($name, $value, $attributes, $errors));

From d19d0018320040249348fb4aa4f81c016f4fba4d Mon Sep 17 00:00:00 2001
From: Kousuke Ebihara <ebihara@php.net>
Date: Tue, 7 May 2013 15:14:00 +0900
Subject: [PATCH 371/630] version 3.8.5.1

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 9ac48599f..7ddc60ff6 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.5');
+  define('OPENPNE_VERSION', '3.8.5.1');
 }

From 055e197acde629a437c4241d41dd930cf5590d18 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 9 May 2013 17:08:15 +0900
Subject: [PATCH 372/630] version 3.8.6

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index b17386a39..1eaaa95f2 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.6-dev');
+  define('OPENPNE_VERSION', '3.8.6');
 }

From 9847da66af29f7f8235265503101d9fa516cfa8c Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 9 May 2013 17:09:22 +0900
Subject: [PATCH 373/630] started to development of OpenPNE 3.8.7

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 1eaaa95f2..888ba4014 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.6');
+  define('OPENPNE_VERSION', '3.8.7-dev');
 }

From b1f4c70bd7e678e2d82a10fe5d34e58cbfa8a11d Mon Sep 17 00:00:00 2001
From: 77web <info@77-web.com>
Date: Sat, 2 Mar 2013 09:32:45 +0900
Subject: [PATCH 374/630] =?UTF-8?q?added=20a=20test=20for=20making=20sure?=
 =?UTF-8?q?=20that=20a=20friend=20list=20on=20the=20smartphone=20interface?=
 =?UTF-8?q?=20contains=20access-block=20or=20frined-confirmation=20status?=
 =?UTF-8?q?=20(=E3=82=B9=E3=83=9E=E3=83=BC=E3=83=88=E3=83=95=E3=82=A9?=
 =?UTF-8?q?=E3=83=B3=E7=94=A8=E5=8F=8B=E9=81=94=E3=83=AA=E3=82=B9=E3=83=88?=
 =?UTF-8?q?=E3=81=AB=E3=83=96=E3=83=AD=E3=83=83=E3=82=AF=E3=83=BB=E5=8F=8B?=
 =?UTF-8?q?=E9=81=94=E7=94=B3=E8=AB=8B=E4=B8=AD=E3=81=8C=E5=90=AB=E3=81=BE?=
 =?UTF-8?q?=E3=82=8C=E3=81=A6=E3=81=97=E3=81=BE=E3=81=86=E3=81=93=E3=81=A8?=
 =?UTF-8?q?=E3=81=AE=E7=A2=BA=E8=AA=8D=E3=83=86=E3=82=B9=E3=83=88)=20(refs?=
 =?UTF-8?q?=20#3362,=20BP=20from=20#3316)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../functional/api/fixtures/member_search.yml | 27 ++++++++++++++
 .../functional/api/memberSearchActionTest.php | 37 +++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 test/functional/api/fixtures/member_search.yml
 create mode 100644 test/functional/api/memberSearchActionTest.php

diff --git a/test/functional/api/fixtures/member_search.yml b/test/functional/api/fixtures/member_search.yml
new file mode 100644
index 000000000..b7354fedf
--- /dev/null
+++ b/test/functional/api/fixtures/member_search.yml
@@ -0,0 +1,27 @@
+Member:
+  first_member:
+    name: "First member"
+    is_active: 1
+  blocking_member:
+    name: "Blocked-by-me"
+    is_active: 1
+  prefriend_member:
+    name: "Want-to-be-friend"
+    is_active: 1
+  friend_member:
+    name: "Already-friend"
+    is_active: 1
+
+MemberRelationship:
+  block_blocking_member:
+    MemberRelatedByMemberIdFrom: first_member
+    Member: blocking_member
+    is_access_block: true
+  friend_request_prefriend_member:
+    MemberRelatedByMemberIdFrom: first_member
+    Member: prefriend_member
+    is_friend_pre: true
+  friend_with_friend_member:
+    MemberRelatedByMemberIdFrom: first_member
+    Member: friend_member
+    is_friend: true
\ No newline at end of file
diff --git a/test/functional/api/memberSearchActionTest.php b/test/functional/api/memberSearchActionTest.php
new file mode 100644
index 000000000..657bd98da
--- /dev/null
+++ b/test/functional/api/memberSearchActionTest.php
@@ -0,0 +1,37 @@
+<?php
+
+$executeLoader = false;
+$app = 'api';
+include dirname(__FILE__).'/../../bootstrap/functional.php';
+
+$task = new sfDoctrineBuildTask($configuration->getEventDispatcher(), new sfFormatter());
+$task->setConfiguration($configuration);
+/*$task->run(array(), array(
+  'no-confirmation' => true,
+  'db'              => true,
+  'and-load'        => dirname(__FILE__).'/fixtures/member_search.yml',
+  'application'     => $app,
+  'env'             => 'test',
+));*/
+
+$browser = new opTestFunctional(new opBrowser(), new lime_test(null, new lime_output_color()));
+
+Doctrine::getTable('SnsConfig')->set('enable_jsonapi', true);
+$key = Doctrine::getTable('Member')->find(1)->getApiKey();
+
+$browser
+  ->get('member/search.json', array('apiKey' => $key, 'target' => 'friend', 'target_id' => 1))
+  ->with('request')->begin()
+    ->isParameter('module', 'member')
+    ->isParameter('action', 'search')
+  ->end()
+  ->with('response')->isStatusCode(200)
+;
+$json = $browser->getResponse()->getContent();
+$data = json_decode($json, true);
+$t = $browser->test();
+$t->is($data['status'], 'success', 'status is "success".');
+$t->is(count($data['data']), 3, 'returned member count is 3(including blocking_member and prefriend_member).');
+$t->is($data['data'][0]['name'], 'Blocked-by-me', 'including blocking member');
+$t->is($data['data'][1]['name'], 'Want-to-be-friend', 'including pre-friend member');
+$t->is($data['data'][2]['name'], 'Already-friend', 'also including friend member');
\ No newline at end of file

From 46b06e9c2f5dc396f8bcffb2919f04d2d13996d6 Mon Sep 17 00:00:00 2001
From: 77web <info@77-web.com>
Date: Thu, 28 Feb 2013 23:25:47 +0900
Subject: [PATCH 375/630] =?UTF-8?q?fixed=20a=20friend=20list=20on=20the=20?=
 =?UTF-8?q?smartphone=20interface=20not=20to=20display=20MemberRelationshi?=
 =?UTF-8?q?p=20data=20except=20is=5Ffriend=3Dtrue=20(=E3=82=B9=E3=83=9E?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=E3=83=95=E3=82=A9=E3=83=B3=E7=94=A8=E5=8F=8B?=
 =?UTF-8?q?=E9=81=94=E3=83=AA=E3=82=B9=E3=83=88=E3=81=ABis=5Ffriend=3Dtrue?=
 =?UTF-8?q?=E4=BB=A5=E5=A4=96=E3=81=AEMemberRelationship=E3=83=87=E3=83=BC?=
 =?UTF-8?q?=E3=82=BF=E3=81=8C=E5=87=BA=E3=81=AA=E3=81=84=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB)=20(refs=20#3362,=20BP=20from=20#3316)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/api/modules/member/actions/actions.class.php | 2 +-
 test/functional/api/memberSearchActionTest.php    | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/apps/api/modules/member/actions/actions.class.php b/apps/api/modules/member/actions/actions.class.php
index a105aa95f..8f8df37b4 100644
--- a/apps/api/modules/member/actions/actions.class.php
+++ b/apps/api/modules/member/actions/actions.class.php
@@ -61,7 +61,7 @@ public function executeSearch(sfWebRequest $request)
 
       if ('friend' === $request['target'])
       {
-        $query->andWhere('EXISTS (FROM MemberRelationship mr WHERE m.id = mr.member_id_to AND mr.member_id_from = ?)', $targetId);
+        $query->andWhere('EXISTS (FROM MemberRelationship mr WHERE m.id = mr.member_id_to AND mr.member_id_from = ? AND mr.is_friend = true)', $targetId);
       }
       if ('community' === $request['target'])
       {
diff --git a/test/functional/api/memberSearchActionTest.php b/test/functional/api/memberSearchActionTest.php
index 657bd98da..9d5d83e62 100644
--- a/test/functional/api/memberSearchActionTest.php
+++ b/test/functional/api/memberSearchActionTest.php
@@ -31,7 +31,5 @@
 $data = json_decode($json, true);
 $t = $browser->test();
 $t->is($data['status'], 'success', 'status is "success".');
-$t->is(count($data['data']), 3, 'returned member count is 3(including blocking_member and prefriend_member).');
-$t->is($data['data'][0]['name'], 'Blocked-by-me', 'including blocking member');
-$t->is($data['data'][1]['name'], 'Want-to-be-friend', 'including pre-friend member');
-$t->is($data['data'][2]['name'], 'Already-friend', 'also including friend member');
\ No newline at end of file
+$t->is(count($data['data']), 1, 'returned member count is 1(NOT including blocking_member and prefriend_member).');
+$t->is($data['data'][0]['name'], 'Already-friend', 'only including friend member');
\ No newline at end of file

From 5f6ef3c568f7bfb41731b718aa9b46ad114b5ff3 Mon Sep 17 00:00:00 2001
From: Kousuke Ebihara <ebihara@php.net>
Date: Mon, 8 Jul 2013 21:21:57 +0900
Subject: [PATCH 376/630] fixed test doesn't load the member_search.yml fixture
 (refs #3362, BP from #3316)

---
 test/functional/api/memberSearchActionTest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/functional/api/memberSearchActionTest.php b/test/functional/api/memberSearchActionTest.php
index 9d5d83e62..add46058e 100644
--- a/test/functional/api/memberSearchActionTest.php
+++ b/test/functional/api/memberSearchActionTest.php
@@ -6,13 +6,13 @@
 
 $task = new sfDoctrineBuildTask($configuration->getEventDispatcher(), new sfFormatter());
 $task->setConfiguration($configuration);
-/*$task->run(array(), array(
+$task->run(array(), array(
   'no-confirmation' => true,
   'db'              => true,
   'and-load'        => dirname(__FILE__).'/fixtures/member_search.yml',
   'application'     => $app,
   'env'             => 'test',
-));*/
+));
 
 $browser = new opTestFunctional(new opBrowser(), new lime_test(null, new lime_output_color()));
 
@@ -32,4 +32,4 @@
 $t = $browser->test();
 $t->is($data['status'], 'success', 'status is "success".');
 $t->is(count($data['data']), 1, 'returned member count is 1(NOT including blocking_member and prefriend_member).');
-$t->is($data['data'][0]['name'], 'Already-friend', 'only including friend member');
\ No newline at end of file
+$t->is($data['data'][0]['name'], 'Already-friend', 'only including friend member');

From 25c8164c7eff503ab70358a9435efae41cc17262 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 6 Jun 2013 17:25:13 +0900
Subject: [PATCH 377/630] [sfImageHandlerPlugin] add `square' option for
 sf_image_path (fixes #3356)

(cherry picked from commit f0be644f44ef7d51fb8d310f5789557dc49e60c8)
---
 .../lib/helper/sfImageHelper.php              | 31 ++++++-------
 .../generator/sfImageGenerator.class.php      | 18 +++++---
 .../sfImageGeneratorImageTransform.php        | 43 +++++++++++--------
 .../lib/image/sfImageHandler.class.php        | 11 +++--
 .../storage/sfImageStorageDefault.class.php   |  6 ++-
 .../lib/sfImageHandlerRouting.class.php       | 23 ++++++++++
 .../modules/image/actions/actions.class.php   |  1 +
 7 files changed, 88 insertions(+), 45 deletions(-)

diff --git a/lib/plugins/sfImageHandlerPlugin/lib/helper/sfImageHelper.php b/lib/plugins/sfImageHandlerPlugin/lib/helper/sfImageHelper.php
index e6bf01411..9c8d3748b 100644
--- a/lib/plugins/sfImageHandlerPlugin/lib/helper/sfImageHelper.php
+++ b/lib/plugins/sfImageHandlerPlugin/lib/helper/sfImageHelper.php
@@ -46,21 +46,14 @@ function image_tag_sf_image($filename, $options = array())
   }
 
   $filepath = sf_image_path($filename, $options);
-  if (isset($options['size']))
-  {
-    unset($options['size']);
-  }
-  if (isset($options['no_image']))
-  {
-    unset($options['no_image']);
-  }
-  if (isset($options['f']))
-  {
-    unset($options['f']);
-  }
-  if (isset($options['format']))
+
+  // strip options for sf_image_path()
+  foreach (array('size', 'no_image', 'f', 'format', 'square') as $optionName)
   {
-    unset($options['format']);
+    if (isset($options[$optionName]))
+    {
+      unset($options[$optionName]);
+    }
   }
 
   return image_tag($filepath, $options);
@@ -97,7 +90,15 @@ function sf_image_path($filename, $options = array(), $absolute = false)
     $size = $options['size'];
   }
 
+  if (!isset($options['square']) && (0 === strpos($filename, 'm_') || 0 === strpos($filename, 'c_')))
+  {
+    // member image / community image
+    $options['square'] = true;
+  }
+
+  $square = isset($options['square']) ? (bool)$options['square'] : false;
+
   $class = sfImageHandler::getStorageClassName();
 
-  return  call_user_func(array($class, 'getUrlToImage'), $filename, $size, $f, $absolute);
+  return  call_user_func(array($class, 'getUrlToImage'), $filename, $size, $f, $absolute, $square);
 }
diff --git a/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGenerator.class.php b/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGenerator.class.php
index 65625a9ad..b59d2a0a0 100644
--- a/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGenerator.class.php
+++ b/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGenerator.class.php
@@ -20,12 +20,13 @@ abstract class sfImageGenerator
   const ERROR_NOT_ALLOWED_SIZE = 101;
 
   protected
-    $quality     = 75,
-    $width       = 0,
-    $height      = 0,
-    $format      = 'jpg',
-    $allowedSize = null,
-    $tmpfilename = null;
+    $quality      = 75,
+    $width        = 0,
+    $height       = 0,
+    $format       = 'jpg',
+    $allowedSize  = null,
+    $tmpfilename  = null,
+    $cropToSquare = false;
 
   public function __construct(array $options = array())
   {
@@ -49,6 +50,11 @@ public function initialize($options)
     {
       $this->format = $options['format'];
     }
+
+    if (isset($options['square']))
+    {
+      $this->cropToSquare = $options['square'];
+    }
   }
 
   public function configure()
diff --git a/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php b/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php
index 630c972c0..4ad7bcf11 100644
--- a/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php
+++ b/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php
@@ -56,32 +56,33 @@ protected function doResize($tmpfilename)
       throw new sfException($result->getMessage());
     }
 
-    $srcWidth = $this->transform->getImageWidth();
-    $srcHeight = $this->transform->getImageHeight();
-    if ($srcWidth > $srcHeight)
-    {
-      $srcX = (int)ceil(($srcWidth - $srcHeight) / 2);
-      $srcY = 0;
-      $srcW = $srcHeight;
-      $srcH = $srcHeight;
-    }
-    else
-    {
-      $srcX = 0;
-      $srcY = (int)ceil(($srcHeight - $srcWidth) / 2);
-      $srcW = $srcWidth;
-      $srcH = $srcWidth;
-    }
- 
     // for mobile phone
     if ('jpg' === $this->format)
     {
       $this->disableInterlace();
     }
 
-    if ($this->width && $this->height)
+    if ($this->cropToSquare)
     {
+      $srcWidth = $this->transform->getImageWidth();
+      $srcHeight = $this->transform->getImageHeight();
+      if ($srcWidth > $srcHeight)
+      {
+        $srcX = (int)ceil(($srcWidth - $srcHeight) / 2);
+        $srcY = 0;
+        $srcW = $srcHeight;
+        $srcH = $srcHeight;
+      }
+      else
+      {
+        $srcX = 0;
+        $srcY = (int)ceil(($srcHeight - $srcWidth) / 2);
+        $srcW = $srcWidth;
+        $srcH = $srcWidth;
+      }
+
       $this->transform->crop($srcW, $srcH, $srcX, $srcY);
+
       $tmpoutputfilename = tempnam(sys_get_temp_dir(), 'IGITF');
       $result = $this->transform->save($tmpoutputfilename);
       if (PEAR::isError($result))
@@ -89,9 +90,13 @@ protected function doResize($tmpfilename)
         throw new sfException($result->getMessage());
       }
       $this->transform->load($tmpoutputfilename);
-      $this->transform->fit($this->width, $this->height);
       unlink($tmpoutputfilename);     
     }
+
+    if ($this->width && $this->height)
+    {
+      $this->transform->fit($this->width, $this->height);
+    }
   }
 
   abstract protected function creaateTransform();
diff --git a/lib/plugins/sfImageHandlerPlugin/lib/image/sfImageHandler.class.php b/lib/plugins/sfImageHandlerPlugin/lib/image/sfImageHandler.class.php
index c52377422..b37f6156a 100644
--- a/lib/plugins/sfImageHandlerPlugin/lib/image/sfImageHandler.class.php
+++ b/lib/plugins/sfImageHandlerPlugin/lib/image/sfImageHandler.class.php
@@ -78,6 +78,11 @@ public function initialize($options)
       throw new RuntimeException(sprintf('The specified image handler, %s is not found', $className));
     }
 
+    if ('sq' === $options['suffix'])
+    {
+      $options['square'] = true;
+    }
+
     $this->generator = new $className($options);
     $this->options = $options;
 
@@ -94,7 +99,7 @@ public function createImage()
 
     $info = $this->generator->resize($contents, $this->storage->getFormat());
 
-    $filename = self::getPathToFileCache($info['f'], $info['w'], $info['h'], $this->options['filename']);
+    $filename = self::getPathToFileCache($info['f'], $info['w'], $info['h'], $this->options['filename'], $this->options['square']);
 
     return $this->generator->output($filename);
   }
@@ -130,9 +135,9 @@ static public function getStorageClassName()
     return 'sfImageStorage'.sfConfig::get('op_image_storage', 'Default');
   }
 
-  static public function getPathToFileCache($format, $width, $height, $filename)
+  static public function getPathToFileCache($format, $width, $height, $filename, $square = false)
   {
-    return sprintf('%s/cache/img/%s/w%s_h%s/%s.%2$s', sfConfig::get('sf_web_dir'), $format, $width, $height, $filename);
+    return sprintf('%s/cache/img/%s/w%s_h%s%s/%s.%2$s', sfConfig::get('sf_web_dir'), $format, $width, $height, $square ? '_sq' : '', $filename);
   }
 
   static public function clearFileCache($filename)
diff --git a/lib/plugins/sfImageHandlerPlugin/lib/image/storage/sfImageStorageDefault.class.php b/lib/plugins/sfImageHandlerPlugin/lib/image/storage/sfImageStorageDefault.class.php
index 731141440..40b790833 100644
--- a/lib/plugins/sfImageHandlerPlugin/lib/image/storage/sfImageStorageDefault.class.php
+++ b/lib/plugins/sfImageHandlerPlugin/lib/image/storage/sfImageStorageDefault.class.php
@@ -35,7 +35,7 @@ static public function createInstance($className = null)
     return $instance;
   }
 
-  static public function getUrlToImage($filename, $size, $format, $absolute = false)
+  static public function getUrlToImage($filename, $size, $format, $absolute = false, $square = false)
   {
     sfContext::getInstance()->getConfiguration()->loadHelpers('Asset');
 
@@ -46,7 +46,9 @@ static public function getUrlToImage($filename, $size, $format, $absolute = fals
       $sizeDirName = 'w'.$width.'_h'.$height;
     }
 
-    $filepath = 'img/'.$format.'/'.$sizeDirName.'/'.$filename.'.'.$format;
+    $squareSuffix = $square ? '_sq' : '';
+
+    $filepath = 'img/'.$format.'/'.$sizeDirName.$squareSuffix.'/'.$filename.'.'.$format;
 
     return _compute_public_path($filepath, 'cache', $format, $absolute);
   }
diff --git a/lib/plugins/sfImageHandlerPlugin/lib/sfImageHandlerRouting.class.php b/lib/plugins/sfImageHandlerPlugin/lib/sfImageHandlerRouting.class.php
index db6724cc4..3a380c230 100644
--- a/lib/plugins/sfImageHandlerPlugin/lib/sfImageHandlerRouting.class.php
+++ b/lib/plugins/sfImageHandlerPlugin/lib/sfImageHandlerRouting.class.php
@@ -33,5 +33,28 @@ static public function listenToRoutingLoadConfigurationEvent(sfEvent $event)
           'variable_regex' => '[a-zA-Z0-9]+',
         )
     ));
+
+    $routing->prependRoute('image_with_suffix',
+      new sfRoute(
+        '/cache/img/:format/:width_:height_:suffix/:filename.:noice',
+        array(
+          'module' => 'image',
+          'action' => 'index',
+          'width'  => 'w',
+          'height' => 'h',
+        ),
+        array(
+          'filename' => '^[\w\d_\.\-]+$',
+          'format'   => '^(jpg|png|gif)$',
+          'width'    => '^w[0-9]*$',
+          'height'   => '^h[0-9]*$',
+          'suffix'   => 'sq',
+          'noice'   => '^(jpg|png|gif)$',
+        ),
+        array(
+          'segment_separators' => array('_', '/', '.'),
+          'variable_regex' => '[a-zA-Z0-9]+',
+        )
+    ));
   }
 }
diff --git a/lib/plugins/sfImageHandlerPlugin/modules/image/actions/actions.class.php b/lib/plugins/sfImageHandlerPlugin/modules/image/actions/actions.class.php
index 74b1989e5..80093fded 100644
--- a/lib/plugins/sfImageHandlerPlugin/modules/image/actions/actions.class.php
+++ b/lib/plugins/sfImageHandlerPlugin/modules/image/actions/actions.class.php
@@ -27,6 +27,7 @@ public function executeIndex(sfRequest $request)
       'format'   => $request->getParameter('format', null),
       'width'    => str_replace('w', '', $request->getParameter('width', null)),
       'height'   => str_replace('h', '', $request->getParameter('height', null)),
+      'suffix'   => $request->getParameter('suffix', null),
     );
 
     try

From 02be18693056e685ab4f142cc457f74f8100dece Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 11 Jul 2013 15:33:25 +0900
Subject: [PATCH 378/630] version 3.8.7

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 888ba4014..bc478cfee 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.7-dev');
+  define('OPENPNE_VERSION', '3.8.7');
 }

From 06944260c0781da3e8f36ec8a0af1141c06b6de4 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 11 Jul 2013 15:34:39 +0900
Subject: [PATCH 379/630] started to development of OpenPNE 3.8.8

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index bc478cfee..e757c4971 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.7');
+  define('OPENPNE_VERSION', '3.8.8-dev');
 }

From 9ede347b512c3cdd019132908d3a1cc3b9374b7c Mon Sep 17 00:00:00 2001
From: 77web <info@77-web.com>
Date: Fri, 18 May 2012 16:49:46 +0900
Subject: [PATCH 380/630] fixed Member::delete() to delete not only MemberImage
 but File and FileBin (fixes #3387, BP from #3375)

---
 lib/model/doctrine/Member.class.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/model/doctrine/Member.class.php b/lib/model/doctrine/Member.class.php
index b1a7d5f9d..b699d1b8e 100644
--- a/lib/model/doctrine/Member.class.php
+++ b/lib/model/doctrine/Member.class.php
@@ -313,6 +313,12 @@ public function delete(Doctrine_Connection $conn = null)
       $adminCommunityMember = $communityMemberTable->retrieveByMemberIdAndCommunityId($this->getId(), $communityId);
       $adminCommunityMember->delete();
     }
+
+    foreach ($this->getMemberImage() as $memberImage)
+    {
+      $memberImage->delete();
+    }
+
     return parent::delete($conn);
   }
 

From 07c2a8a0fab10f361dbdfaf7c6dafd3980fc6a44 Mon Sep 17 00:00:00 2001
From: Kousuke Ebihara <kousuke@co3k.org>
Date: Tue, 27 Aug 2013 21:18:36 +0900
Subject: [PATCH 381/630] patched
 https://github.com/openid/php-openid/commit/625c16bb28bb120d262b3f19f89c2c06cb9b0da9
 changes (CVE-2013-4701) to bundled PHP OpenID Library (OPSA-2013-003) (refs
 #3384)

---
 data/patches/OPSA-2013-003.diff          | 20 ++++++++++++++++++++
 lib/vendor/php-openid/Auth/Yadis/XML.php |  9 ++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 data/patches/OPSA-2013-003.diff

diff --git a/data/patches/OPSA-2013-003.diff b/data/patches/OPSA-2013-003.diff
new file mode 100644
index 000000000..8352544e2
--- /dev/null
+++ b/data/patches/OPSA-2013-003.diff
@@ -0,0 +1,20 @@
+diff --git a/lib/vendor/php-openid/Auth/Yadis/XML.php b/lib/vendor/php-openid/Auth/Yadis/XML.php
+index 2704c78..f5e80a5 100644
+--- a/lib/vendor/php-openid/Auth/Yadis/XML.php
++++ b/lib/vendor/php-openid/Auth/Yadis/XML.php
+@@ -234,7 +234,14 @@ function setXML($xml_string)
+             return false;
+         }
+ 
+-        if (!@$this->doc->loadXML($xml_string)) {
++        // disable external entities and libxml errors
++        $loader = libxml_disable_entity_loader(true);
++        $errors = libxml_use_internal_errors(true);
++        $parse_result = @$this->doc->loadXML($xml_string);
++        libxml_disable_entity_loader($loader);
++        libxml_use_internal_errors($errors);
++
++        if (!$parse_result) {
+             return false;
+         }
+ 
diff --git a/lib/vendor/php-openid/Auth/Yadis/XML.php b/lib/vendor/php-openid/Auth/Yadis/XML.php
index 2704c7818..f5e80a583 100644
--- a/lib/vendor/php-openid/Auth/Yadis/XML.php
+++ b/lib/vendor/php-openid/Auth/Yadis/XML.php
@@ -234,7 +234,14 @@ function setXML($xml_string)
             return false;
         }
 
-        if (!@$this->doc->loadXML($xml_string)) {
+        // disable external entities and libxml errors
+        $loader = libxml_disable_entity_loader(true);
+        $errors = libxml_use_internal_errors(true);
+        $parse_result = @$this->doc->loadXML($xml_string);
+        libxml_disable_entity_loader($loader);
+        libxml_use_internal_errors($errors);
+
+        if (!$parse_result) {
             return false;
         }
 

From 2d0f1e6e1f684f7ccfc397be0add11c0e0ff7f60 Mon Sep 17 00:00:00 2001
From: Kousuke Ebihara <kousuke@co3k.org>
Date: Tue, 27 Aug 2013 21:27:48 +0900
Subject: [PATCH 382/630] disable XML external entities in loading arbitrary
 XMLs (OPSA-2013-003) (refs #3384)

---
 lib/plugin/opPearRest.class.php        |  5 ++-
 lib/plugin/opPlugin.class.php          |  6 +++-
 lib/task/opPluginArchiveTask.class.php |  6 +++-
 lib/util/opToolkit.class.php           | 43 ++++++++++++++++++++++++++
 4 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/lib/plugin/opPearRest.class.php b/lib/plugin/opPearRest.class.php
index 38aa2dff9..514e00eb0 100644
--- a/lib/plugin/opPearRest.class.php
+++ b/lib/plugin/opPearRest.class.php
@@ -27,7 +27,10 @@ public function retrieveData($url, $accept = false, $forcestring = false, $chann
   public function retrieveXml($url)
   {
     $content = $this->downloadHttp($url);
-    $result = @simplexml_load_string($content);
+    $result = @opToolkit::loadXmlString($content, array(
+      'return' => 'SimpleXMLElement',
+    ));
+
     return $result;
   }
 
diff --git a/lib/plugin/opPlugin.class.php b/lib/plugin/opPlugin.class.php
index 242e3f9a2..cc3acdbd2 100644
--- a/lib/plugin/opPlugin.class.php
+++ b/lib/plugin/opPlugin.class.php
@@ -125,7 +125,11 @@ protected function getPackageInfo()
     {
       return false;
     }
-    return simplexml_load_file($xmlPath);
+    $content = file_get_contents($xmlPath);
+
+    return opToolkit::loadXmlString($content, array(
+      'return' => 'SimpleXMLElement',
+    ));
   }
 
   public function setIsActive($isActive)
diff --git a/lib/task/opPluginArchiveTask.class.php b/lib/task/opPluginArchiveTask.class.php
index 484d5d84a..84edaab47 100644
--- a/lib/task/opPluginArchiveTask.class.php
+++ b/lib/task/opPluginArchiveTask.class.php
@@ -47,7 +47,11 @@ protected function execute($arguments = array(), $options = array())
       throw new sfException(sprintf('Plugin "%s" dosen\'t have a definition file.', $pluginName));
     }
 
-    $infoXml = simplexml_load_file($packagePath.'/package.xml');
+    $content = file_get_contents($packagePath.'/package.xml');
+    $infoXml = opToolkit::loadXmlString($content, array(
+      'return' => 'SimpleXMLElement',
+    ));
+
     $filename = sprintf('%s-%s.tgz', (string)$infoXml->name, (string)$infoXml->version->release);
     $dirPath = sfConfig::get('sf_plugins_dir').'/'.$pluginName;
 
diff --git a/lib/util/opToolkit.class.php b/lib/util/opToolkit.class.php
index 61fb77134..3538a1917 100644
--- a/lib/util/opToolkit.class.php
+++ b/lib/util/opToolkit.class.php
@@ -582,4 +582,47 @@ static public function writeCacheFile($pathToCacheFile, $content)
     $filesystem->chmod($pathToCacheFile, 0666);
     umask($currentUmask);
   }
+
+  /**
+   * Parse the input data and create either a SimpleXmlElement object or a DOMDocument (from CakePHP 2.3.9)
+   *
+   * This method is based Xml::_loadXmlString() in CakePHP 2.3.9 with many our arranged
+   *
+   * @copyright Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+   * @link http://cakephp.org CakePHP(tm) Project
+   * @license http://www.opensource.org/licenses/mit-license.php MIT License
+   *
+   * @param string $input The input to load.
+   * @param array $options The options to use.
+   * @return SimpleXmlElement|DOMDocument
+   */
+  static public function loadXmlString($input, $options = array())
+  {
+    $hasDisable = function_exists('libxml_disable_entity_loader');
+    $internalErrors = libxml_use_internal_errors(true);
+    if ($hasDisable && empty($options['loadEntities']))
+    {
+      $entityLoaderConfig = libxml_disable_entity_loader(true);
+    }
+
+    $returnClass = isset($options['return']) ? strtolower($options['return']) : '';
+
+    if ('simplexml' === $returnClass || 'simplexmlelement' === $returnClass)
+    {
+      $xml = simplexml_load_string($input);
+    }
+    else
+    {
+      $xml = new DOMDocument();
+      $xml->loadXML($input);
+    }
+
+    if ($hasDisable && empty($options['loadEntities']))
+    {
+      libxml_disable_entity_loader($entityLoaderConfig);
+    }
+    libxml_use_internal_errors($internalErrors);
+
+    return $xml;
+  }
 }

From cd24654012b422021a4d4980243172dd7ccefa45 Mon Sep 17 00:00:00 2001
From: Kousuke Ebihara <kousuke@co3k.org>
Date: Tue, 27 Aug 2013 21:30:56 +0900
Subject: [PATCH 383/630] added test for opToolkit::loadXmlString()
 (OPSA-2013-003) (refs #3384)

---
 test/unit/util/opToolkitLoadXmlStringTest.php | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 test/unit/util/opToolkitLoadXmlStringTest.php

diff --git a/test/unit/util/opToolkitLoadXmlStringTest.php b/test/unit/util/opToolkitLoadXmlStringTest.php
new file mode 100644
index 000000000..8d15160dd
--- /dev/null
+++ b/test/unit/util/opToolkitLoadXmlStringTest.php
@@ -0,0 +1,25 @@
+<?php
+
+include_once dirname(__FILE__) . '/../../bootstrap/unit.php';
+
+$t = new lime_test(null, new lime_output_color());
+
+$t->diag('opToolkit::loadXmlString()');
+
+$path_to_feed = realpath(dirname(__FILE__).'/../../fixtures/feeds/www.xss.feed.rss');
+$xml = '<a id="root">ok</a>';
+$xml_with_xxe = '<!DOCTYPE a [<!ENTITY xxe SYSTEM "file://'.$path_to_feed.'">]><a id="root">ok&xxe;</a>';
+
+$t->comment('with no external entities');
+
+$t->isa_ok(opToolkit::loadXmlString($xml), 'DOMDocument', 'returns an instance of "DOMDocument"');
+$t->isa_ok(opToolkit::loadXmlString($xml, array('return' => 'SimpleXMLElement')), 'SimpleXMLElement', 'returns an instanceof "SimpleXMLElement"');
+
+$t->comment('with external entities');
+
+$t->isa_ok(opToolkit::loadXmlString($xml_with_xxe), 'DOMDocument', 'returns an instance of "DOMDocument"');
+$t->isa_ok(opToolkit::loadXmlString($xml_with_xxe, array('return' => 'SimpleXMLElement')), 'SimpleXMLElement', 'returns an instanceof "SimpleXMLElement"');
+$t->is(opToolkit::loadXmlString($xml_with_xxe)->textContent, 'ok', 'generated XML string by "DOMDocument" does not have entitied value');
+$t->is((string)opToolkit::loadXmlString($xml_with_xxe, array('return' => 'SimpleXMLElement')), 'ok', 'generated XML string by "SimpleXMLElement" does not have entitied value');
+$t->isnt(opToolkit::loadXmlString($xml_with_xxe, array('loadEntities' => true))->textContent, 'ok', 'generated XML string by "DOMDocument" has entitied value if "loadEntities" option is specified');
+$t->isnt((string)opToolkit::loadXmlString($xml_with_xxe, array('return' => 'SimpleXMLElement', 'loadEntities' => true)), 'ok', 'generated XML string by "SimpleXMLElement" has entitied value if "loadEntities" option is specified');

From 2baa965e22fd0976269bdeffc53034b4b399df44 Mon Sep 17 00:00:00 2001
From: Kousuke Ebihara <kousuke@co3k.org>
Date: Tue, 27 Aug 2013 21:31:20 +0900
Subject: [PATCH 384/630] raised supported PHP version to 5.2.11 since
 libxml_disable_entity_loader() is availble in PHP 5.2.11+ so we cannot
 support earlier versions of PHP anymore (OPSA-2013-003) (refs #3384)

---
 doc/en/OpenPNE3_Setup_Guide.txt | 2 +-
 doc/ja/OpenPNE3_Setup_Guide.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/en/OpenPNE3_Setup_Guide.txt b/doc/en/OpenPNE3_Setup_Guide.txt
index 76f1c7e5b..b9a6e1022 100644
--- a/doc/en/OpenPNE3_Setup_Guide.txt
+++ b/doc/en/OpenPNE3_Setup_Guide.txt
@@ -13,7 +13,7 @@ Web Server
   Apache
     * The "mod_rewrite" module is available
 PHP
-  PHP version 5.2.3 or later
+  PHP version 5.2.11 or later (if you want to use with earlier than PHP 5.2.11, you should build PHP with libxml 2.9+)
     * The "mbstring" module is available
     * The "xml" module is available
     * The "PCRE" module is available (That must be support UTF-8)
diff --git a/doc/ja/OpenPNE3_Setup_Guide.txt b/doc/ja/OpenPNE3_Setup_Guide.txt
index 7ef58b3a2..36caaf0c0 100644
--- a/doc/ja/OpenPNE3_Setup_Guide.txt
+++ b/doc/ja/OpenPNE3_Setup_Guide.txt
@@ -13,7 +13,7 @@ Webサーバ
   Apache 
     * mod_rewrite を使用可能
 PHP
-  PHP5.2.3 以降
+  PHP 5.2.11 以降 (PHP 5.2.11 未満で動作させる場合は libxml 2.9 以降と一緒に PHP をビルドしてください)
     * PHP の mbstring 拡張モジュールを使用可能
     * PHP の XML 拡張モジュールを使用可能
     * PHP の PCRE 拡張モジュールを使用可能 (UTF-8 サポート)

From 9b15e09e1173430261dec37da82edff11bbadfc6 Mon Sep 17 00:00:00 2001
From: Kousuke Ebihara <kousuke@co3k.org>
Date: Thu, 5 Sep 2013 21:10:40 +0900
Subject: [PATCH 385/630] changed opToolkit::loadXmlString() to decrease code
 duplications and to follow a part of PSR-2 (4.5. abstract, final, and static)
 (OPSA-2013-003) (refs #3384)

---
 lib/util/opToolkit.class.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/util/opToolkit.class.php b/lib/util/opToolkit.class.php
index 3538a1917..41c733fd3 100644
--- a/lib/util/opToolkit.class.php
+++ b/lib/util/opToolkit.class.php
@@ -596,11 +596,12 @@ static public function writeCacheFile($pathToCacheFile, $content)
    * @param array $options The options to use.
    * @return SimpleXmlElement|DOMDocument
    */
-  static public function loadXmlString($input, $options = array())
+  public static function loadXmlString($input, $options = array())
   {
     $hasDisable = function_exists('libxml_disable_entity_loader');
     $internalErrors = libxml_use_internal_errors(true);
-    if ($hasDisable && empty($options['loadEntities']))
+    $isDisableEntityLoader = ($hasDisable && empty($options['loadEntities']));
+    if ($isDisableEntityLoader)
     {
       $entityLoaderConfig = libxml_disable_entity_loader(true);
     }
@@ -617,7 +618,7 @@ static public function loadXmlString($input, $options = array())
       $xml->loadXML($input);
     }
 
-    if ($hasDisable && empty($options['loadEntities']))
+    if ($isDisableEntityLoader)
     {
       libxml_disable_entity_loader($entityLoaderConfig);
     }

From 48045abd0323efa1b40c6645a6b92cbb46335fba Mon Sep 17 00:00:00 2001
From: Maki Takahashi <takahashi@tejimaya.com>
Date: Mon, 24 Oct 2011 20:08:54 +0900
Subject: [PATCH 386/630] (fixes #3389, BP from #2491) added static keyword to
 opToolkit::getRandom()

---
 lib/util/opToolkit.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util/opToolkit.class.php b/lib/util/opToolkit.class.php
index 61fb77134..c06abcbd1 100644
--- a/lib/util/opToolkit.class.php
+++ b/lib/util/opToolkit.class.php
@@ -490,7 +490,7 @@ public static function calculateUsableMemorySize()
    * @param  int    $length  Length of a hash
    * @return string
    */
-  public function getRandom($length = 64)
+  public static function getRandom($length = 64)
   {
     static $srand = false;
 

From edf903c0a7240b3f535bfab951ca9fa5da458dd7 Mon Sep 17 00:00:00 2001
From: Kousuke Ebihara <kousuke@co3k.org>
Date: Mon, 9 Sep 2013 19:12:05 +0900
Subject: [PATCH 387/630] version 3.8.7.1

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index bc478cfee..ea8237a71 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.7');
+  define('OPENPNE_VERSION', '3.8.7.1');
 }

From d2c52de97c577e9eaff0cd3ddf680cc42a6b4457 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Tue, 10 Sep 2013 17:46:13 +0900
Subject: [PATCH 388/630] add opBrowser::postWithFiles() method handles file
 upload (fixes #3397, BP from #3396)

(cherry picked from commit 73e78eaf55411865863b8140bcbc867e74c4273c)
---
 lib/util/opBrowser.class.php | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/lib/util/opBrowser.class.php b/lib/util/opBrowser.class.php
index f37a7ee15..69b674a43 100644
--- a/lib/util/opBrowser.class.php
+++ b/lib/util/opBrowser.class.php
@@ -12,6 +12,7 @@
  * @package    OpenPNE
  * @subpackage util
  * @author     Kousuke Ebihara <ebihara@tejimaya.com>
+ * @author     Kimura Youichi <kim.upsilon@bucyou.net>
  */
 class opBrowser extends sfBrowser
 {
@@ -203,4 +204,35 @@ public function doClick($name, $arguments = array(), $options = array())
       return array($url.($queryString ? $sep.$queryString : ''), 'get', array());
     }
   }
+
+  /**
+   * Posts a uri with file upload.
+   *
+   * @param string    $uri          The URI to fetch
+   * @param string[]  $parameters   The Request parameters
+   * @param string[]  $filenames    The Request files
+   * @param bool      $changeStack  Change the browser history stack?
+   *
+   * @return sfBrowserBase
+   */
+  public function postWithFiles($uri, array $parameters, array $filenames, $changeStack = true)
+  {
+    foreach ($filenames as $key => $filename)
+    {
+      $this->setUploadFile($key, $filename);
+    }
+
+    return $this->call($uri, 'post', $parameters, $changeStack);
+  }
+
+  protected function setUploadFile($fieldname, $filename)
+  {
+    $this->parseArgumentAsArray($fieldname, array(
+      'name' => basename($filename),
+      'type' => '',
+      'tmp_name' => $filename,
+      'error' => UPLOAD_ERR_OK,
+      'size' => filesize($filename),
+    ), $this->files);
+  }
 }

From 6652dbb1a7b6f647e9d749f21b65cc1ca2fbcd3f Mon Sep 17 00:00:00 2001
From: kashiwasan <pc.kashiwasan@gmail.com>
Date: Wed, 13 Jun 2012 23:44:56 +0900
Subject: [PATCH 389/630] add an implement of image post onto
 activity/post.json (fixes #3075, BP from #3064)

(cherry picked from commit 91745b9e8bb9c56460b04d561e5be926920ad083)
---
 apps/api/lib/helper/opJsonApiHelper.php       |  7 +++++++
 .../activity/actions/actions.class.php        | 19 +++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/apps/api/lib/helper/opJsonApiHelper.php b/apps/api/lib/helper/opJsonApiHelper.php
index 9709b835d..c46077811 100644
--- a/apps/api/lib/helper/opJsonApiHelper.php
+++ b/apps/api/lib/helper/opJsonApiHelper.php
@@ -60,6 +60,11 @@ function op_api_activity($activity)
 {
   $viewMemberId = sfContext::getInstance()->getUser()->getMemberId();
   $member = $activity->getMember();
+  $images = null;
+  if ($activity->getImages()->count())
+  {
+    $images = $activity->getImages();
+  }
 
   return array(
     'id' => $activity->getId(),
@@ -69,6 +74,8 @@ function op_api_activity($activity)
     'uri' => $activity->getUri(),
     'source' => $activity->getSource(),
     'source_uri' => $activity->getSourceUri(),
+    'image_url' => !is_null($images) ? sf_image_path($images[0]->getFile(), array('size' => '48x48'), true) : null, 
+    'image_large_url' => !is_null($images) ? sf_image_path($images[0]->getFile(), array(), true) : null,
     'created_at' => date('r', strtotime($activity->getCreatedAt())),
   );
 }
diff --git a/apps/api/modules/activity/actions/actions.class.php b/apps/api/modules/activity/actions/actions.class.php
index 9cf307f07..4d38d8bd0 100644
--- a/apps/api/modules/activity/actions/actions.class.php
+++ b/apps/api/modules/activity/actions/actions.class.php
@@ -188,6 +188,25 @@ public function executePost(sfWebRequest $request)
 
     $options['source'] = 'API';
 
+    $imageFile = $request->getFiles('images');
+    if (!empty($imageFile))
+    {   
+      $validator = new opValidatorImageFile(array('required' => false));
+      try 
+      {   
+        $obj = $validator->clean($imageFile);
+      }   
+      catch (sfValidatorError $e) 
+      {   
+        $this->forward400('This image file is invalid.');
+      }   
+      $file = new File();
+      $file->setFromValidatedFile($obj);
+      $file->setName('ac_'.$this->getUser()->getMemberId().'_'.$file->getName());
+      $file->save();
+      $options['images'][] = array('file_id' => $file->getId());
+    }   
+
     $this->activity = Doctrine::getTable('ActivityData')->updateActivity($memberId, $body, $options);
 
     $this->setTemplate('object');

From fbffaba3ddcd0e9e1c311e624d8df29c91c20e13 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Wed, 11 Sep 2013 14:49:58 +0900
Subject: [PATCH 390/630] some cleanup in activity/post.json (fixes #3075, BP
 from #3064)

(cherry picked from commit 96df88d12b0e15f418b3a6a6da4aaae6240b40cc)
---
 apps/api/lib/helper/opJsonApiHelper.php        | 10 +++-------
 .../modules/activity/actions/actions.class.php | 18 +++++++++---------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/apps/api/lib/helper/opJsonApiHelper.php b/apps/api/lib/helper/opJsonApiHelper.php
index c46077811..b5374539d 100644
--- a/apps/api/lib/helper/opJsonApiHelper.php
+++ b/apps/api/lib/helper/opJsonApiHelper.php
@@ -60,11 +60,7 @@ function op_api_activity($activity)
 {
   $viewMemberId = sfContext::getInstance()->getUser()->getMemberId();
   $member = $activity->getMember();
-  $images = null;
-  if ($activity->getImages()->count())
-  {
-    $images = $activity->getImages();
-  }
+  $images = $activity->getImages();
 
   return array(
     'id' => $activity->getId(),
@@ -74,8 +70,8 @@ function op_api_activity($activity)
     'uri' => $activity->getUri(),
     'source' => $activity->getSource(),
     'source_uri' => $activity->getSourceUri(),
-    'image_url' => !is_null($images) ? sf_image_path($images[0]->getFile(), array('size' => '48x48'), true) : null, 
-    'image_large_url' => !is_null($images) ? sf_image_path($images[0]->getFile(), array(), true) : null,
+    'image_url' => count($images) ? sf_image_path($images[0]->getFile(), array('size' => '48x48'), true) : null,
+    'image_large_url' => count($images) ? sf_image_path($images[0]->getFile(), array(), true) : null,
     'created_at' => date('r', strtotime($activity->getCreatedAt())),
   );
 }
diff --git a/apps/api/modules/activity/actions/actions.class.php b/apps/api/modules/activity/actions/actions.class.php
index 4d38d8bd0..0a6cb0cd2 100644
--- a/apps/api/modules/activity/actions/actions.class.php
+++ b/apps/api/modules/activity/actions/actions.class.php
@@ -190,22 +190,22 @@ public function executePost(sfWebRequest $request)
 
     $imageFile = $request->getFiles('images');
     if (!empty($imageFile))
-    {   
+    {
       $validator = new opValidatorImageFile(array('required' => false));
-      try 
-      {   
+      try
+      {
         $obj = $validator->clean($imageFile);
-      }   
-      catch (sfValidatorError $e) 
-      {   
+      }
+      catch (sfValidatorError $e)
+      {
         $this->forward400('This image file is invalid.');
-      }   
+      }
       $file = new File();
       $file->setFromValidatedFile($obj);
       $file->setName('ac_'.$this->getUser()->getMemberId().'_'.$file->getName());
       $file->save();
-      $options['images'][] = array('file_id' => $file->getId());
-    }   
+      $options['images'][]['file_id'] = $file->getId();
+    }
 
     $this->activity = Doctrine::getTable('ActivityData')->updateActivity($memberId, $body, $options);
 

From 248c28981210de8d91379f46a26a876d9911a16d Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Wed, 11 Sep 2013 17:17:32 +0900
Subject: [PATCH 391/630] add testcases for activity/post.json (refs #3075, BP
 from #3064)

(cherry picked from commit bbf9839510c25ad9da71c5a1a464f46745d2a370)
---
 apps/api/config/settings.yml                  |   2 +-
 .../api/activityPostWithImageTest.php         |  47 ++++++++++++++++++
 test/functional/api/uploads/dot.gif           | Bin 0 -> 35 bytes
 test/functional/api/uploads/plaintext.txt     |   1 +
 4 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 test/functional/api/activityPostWithImageTest.php
 create mode 100644 test/functional/api/uploads/dot.gif
 create mode 100644 test/functional/api/uploads/plaintext.txt

diff --git a/apps/api/config/settings.yml b/apps/api/config/settings.yml
index 14be3b804..394548b69 100644
--- a/apps/api/config/settings.yml
+++ b/apps/api/config/settings.yml
@@ -13,7 +13,7 @@ dev:
 
 test:
   .settings:
-    error_reporting:        <?php echo ((E_ALL | E_STRICT) ^ E_NOTICE)."\n" ?>
+    error_reporting:        <?php echo (E_ERROR | E_WARNING | E_PARSE)."\n" ?>
     cache:                  false
     web_debug:              false
     no_script_name:         false
diff --git a/test/functional/api/activityPostWithImageTest.php b/test/functional/api/activityPostWithImageTest.php
new file mode 100644
index 000000000..d7dc3f375
--- /dev/null
+++ b/test/functional/api/activityPostWithImageTest.php
@@ -0,0 +1,47 @@
+<?php
+
+$executeLoader = false;
+include dirname(__FILE__).'/../../bootstrap/functional.php';
+include dirname(__FILE__).'/../../bootstrap/database.php';
+
+$numOfTests = 6;
+$tester = new opTestFunctional(
+  new opBrowser(),
+  new lime_test($numOfTests, new lime_output_color())
+);
+
+$t = $tester->test();
+
+Doctrine_Core::getTable('SnsConfig')->set('enable_jsonapi', true);
+$apiKeyMember1 = Doctrine_Core::getTable('Member')->find(1)->getApiKey();
+
+if (in_array('opTimelinePlugin', ProjectConfiguration::getActive()->getPlugins()))
+{
+  // opTimelinePlugin breaks standard JSON APIs (activity/*.json)
+  $tester->test()->fail('unable to run tests if opTimelinePlugin is installed');
+  return;
+}
+
+$tester
+  ->postWithFiles(
+    '/activity/post.json',
+    array('apiKey' => $apiKeyMember1, 'body' => 'hogehoge'),
+    array('images' => dirname(__FILE__).'/uploads/dot.gif')
+  )
+  ->with('response')->isStatusCode(200);
+
+$response = json_decode($tester->getResponse()->getContent(), true);
+$t->is($response['status'], 'success');
+
+$activityImage = Doctrine_Core::getTable('ActivityImage')->findByActivityDataId($response['data']['id']);
+$t->is(count($activityImage), 1);
+$t->is($response['data']['image_url'], 'http://localhost/cache/img/gif/w48_h48/'.$activityImage[0]->File->name.'.gif');
+$t->is($response['data']['image_large_url'], 'http://localhost/cache/img/gif/w_h/'.$activityImage[0]->File->name.'.gif');
+
+$tester
+  ->postWithFiles(
+    '/activity/post.json',
+    array('apiKey' => $apiKeyMember1, 'body' => 'hogehoge'),
+    array('images' => dirname(__FILE__).'/uploads/plaintext.txt')
+  )
+  ->with('response')->isStatusCode(400);
diff --git a/test/functional/api/uploads/dot.gif b/test/functional/api/uploads/dot.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e232d4a6f866435dacad936a0eb21386066feb41
GIT binary patch
literal 35
ncmZ?wbhEHbWMp7uXkcJqWnp1pV9)_#AfJ(efr-h5k--`ON7n-C

literal 0
HcmV?d00001

diff --git a/test/functional/api/uploads/plaintext.txt b/test/functional/api/uploads/plaintext.txt
new file mode 100644
index 000000000..e9bc11025
--- /dev/null
+++ b/test/functional/api/uploads/plaintext.txt
@@ -0,0 +1 @@
+hogehoge

From 9463889459c77ed74b29c5784007e914810ff378 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Fri, 14 Sep 2012 17:47:40 +0900
Subject: [PATCH 392/630] fix not-null constraint violation in
 ActivityDataTable::updateActivity() (fixes #3399, BP from #3202)

(cherry picked from commit ae0f61b485afabdeac7a17c4c174c67eb93be789)
---
 lib/model/doctrine/ActivityDataTable.class.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/model/doctrine/ActivityDataTable.class.php b/lib/model/doctrine/ActivityDataTable.class.php
index 9a08c1097..2436a20c2 100644
--- a/lib/model/doctrine/ActivityDataTable.class.php
+++ b/lib/model/doctrine/ActivityDataTable.class.php
@@ -106,7 +106,13 @@ public function updateActivity($memberId, $body, $options = array())
         $activityImage = new ActivityImage();
         if (isset($image['file_id']))
         {
-          $activityImage->setFileId($image['file_id']);
+          $file = Doctrine_Core::getTable('File')->find($image['file_id']);
+          if (!$file)
+          {
+            throw new LogicException('Invalid file_id.');
+          }
+          $activityImage->setFileId($file->getId());
+          $activityImage->setMimeType($file->getType());
         }
         elseif (isset($image['uri']) && isset($image['mime_type']))
         {

From f9ebdfc5cbb16c252edcab5da44324aa33a8da51 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Fri, 14 Sep 2012 18:10:09 +0900
Subject: [PATCH 393/630] accept multiple images in activity/post.json (fixes
 #3400, BP from #3203)

(cherry picked from commit 8064b916465136cfdd8056cb23a012e60021145d)
---
 .../activity/actions/actions.class.php        | 35 +++++++++++--------
 .../api/activityPostWithImageTest.php         |  4 +--
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/apps/api/modules/activity/actions/actions.class.php b/apps/api/modules/activity/actions/actions.class.php
index 0a6cb0cd2..5b0306f98 100644
--- a/apps/api/modules/activity/actions/actions.class.php
+++ b/apps/api/modules/activity/actions/actions.class.php
@@ -188,23 +188,30 @@ public function executePost(sfWebRequest $request)
 
     $options['source'] = 'API';
 
-    $imageFile = $request->getFiles('images');
-    if (!empty($imageFile))
+    $imageFiles = $request->getFiles('images');
+    if (!empty($imageFiles))
     {
-      $validator = new opValidatorImageFile(array('required' => false));
-      try
+      foreach ((array)$imageFiles as $imageFile)
       {
-        $obj = $validator->clean($imageFile);
+        $validator = new opValidatorImageFile(array('required' => false));
+        try
+        {
+          $obj = $validator->clean($imageFile);
+        }
+        catch (sfValidatorError $e)
+        {
+          $this->forward400('This image file is invalid.');
+        }
+        if (is_null($obj))
+        {
+          continue; // empty value
+        }
+        $file = new File();
+        $file->setFromValidatedFile($obj);
+        $file->setName('ac_'.$this->getUser()->getMemberId().'_'.$file->getName());
+        $file->save();
+        $options['images'][]['file_id'] = $file->getId();
       }
-      catch (sfValidatorError $e)
-      {
-        $this->forward400('This image file is invalid.');
-      }
-      $file = new File();
-      $file->setFromValidatedFile($obj);
-      $file->setName('ac_'.$this->getUser()->getMemberId().'_'.$file->getName());
-      $file->save();
-      $options['images'][]['file_id'] = $file->getId();
     }
 
     $this->activity = Doctrine::getTable('ActivityData')->updateActivity($memberId, $body, $options);
diff --git a/test/functional/api/activityPostWithImageTest.php b/test/functional/api/activityPostWithImageTest.php
index d7dc3f375..f44191d36 100644
--- a/test/functional/api/activityPostWithImageTest.php
+++ b/test/functional/api/activityPostWithImageTest.php
@@ -26,7 +26,7 @@
   ->postWithFiles(
     '/activity/post.json',
     array('apiKey' => $apiKeyMember1, 'body' => 'hogehoge'),
-    array('images' => dirname(__FILE__).'/uploads/dot.gif')
+    array('images[0]' => dirname(__FILE__).'/uploads/dot.gif')
   )
   ->with('response')->isStatusCode(200);
 
@@ -42,6 +42,6 @@
   ->postWithFiles(
     '/activity/post.json',
     array('apiKey' => $apiKeyMember1, 'body' => 'hogehoge'),
-    array('images' => dirname(__FILE__).'/uploads/plaintext.txt')
+    array('images[0]' => dirname(__FILE__).'/uploads/plaintext.txt')
   )
   ->with('response')->isStatusCode(400);

From 11d21fc61da6dc458bb23812fa917b4c5bcbc4bd Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Wed, 11 Sep 2013 17:43:03 +0900
Subject: [PATCH 394/630] add testcases for activity/post.json with multiple
 images (refs #3400, BP from #3203)

(cherry picked from commit 502a85ad9abae0416c8e574e6e1c1bc7cb10c6c9)
---
 .../api/activityPostWithImageTest.php         |  20 +++++++++++++++++-
 test/functional/api/uploads/white.jpg         | Bin 0 -> 1639 bytes
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 test/functional/api/uploads/white.jpg

diff --git a/test/functional/api/activityPostWithImageTest.php b/test/functional/api/activityPostWithImageTest.php
index f44191d36..7a8f85118 100644
--- a/test/functional/api/activityPostWithImageTest.php
+++ b/test/functional/api/activityPostWithImageTest.php
@@ -4,7 +4,7 @@
 include dirname(__FILE__).'/../../bootstrap/functional.php';
 include dirname(__FILE__).'/../../bootstrap/database.php';
 
-$numOfTests = 6;
+$numOfTests = 9;
 $tester = new opTestFunctional(
   new opBrowser(),
   new lime_test($numOfTests, new lime_output_color())
@@ -23,6 +23,7 @@
 }
 
 $tester
+  ->info('/activity/post.json - single image upload')
   ->postWithFiles(
     '/activity/post.json',
     array('apiKey' => $apiKeyMember1, 'body' => 'hogehoge'),
@@ -39,9 +40,26 @@
 $t->is($response['data']['image_large_url'], 'http://localhost/cache/img/gif/w_h/'.$activityImage[0]->File->name.'.gif');
 
 $tester
+  ->info('/activity/post.json - invalid image')
   ->postWithFiles(
     '/activity/post.json',
     array('apiKey' => $apiKeyMember1, 'body' => 'hogehoge'),
     array('images[0]' => dirname(__FILE__).'/uploads/plaintext.txt')
   )
   ->with('response')->isStatusCode(400);
+
+$tester
+  ->info('/activity/post.json - multiple image upload')
+  ->postWithFiles(
+    '/activity/post.json',
+    array('apiKey' => $apiKeyMember1, 'body' => 'hogehoge'),
+    array('images[0]' => dirname(__FILE__).'/uploads/dot.gif', 'images[1]' => dirname(__FILE__).'/uploads/white.jpg')
+  )
+  ->with('response')->isStatusCode(200);
+
+$response = json_decode($tester->getResponse()->getContent(), true);
+$t->is($response['status'], 'success');
+
+$activityImage = Doctrine_Core::getTable('ActivityImage')->findByActivityDataId($response['data']['id']);
+$t->is(count($activityImage), 2);
+// retrieving multiple image_url via JSON API is not available yet
diff --git a/test/functional/api/uploads/white.jpg b/test/functional/api/uploads/white.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..eb32730677292be43045e2cc3db169a758cd73e4
GIT binary patch
literal 1639
zcmeH_%}N6?5XWbdO*h?S*Q6%32M-ZE_UL_uLUo0rudrxAFA7rdJ$wN@`xxRw_;Klz
z7!z11)qdc8Cv(a0pPA&(&%gUQsIzf321JC@aKL}V{^)*M&!$)I;bwO2PO8a;ySsI@
zo79*73r0W*i5VgZ$v9(4!m>2&aG6OdG9mJ!r}9D<La4sdyT)28clHK-Gw2y>;t-^v
zCt+R2x+WL7`FHqN&>V+2q^N;tq#FGj*zgfp4j#(pPZj(pNQyudRRH*Myxi2@S_c*m
zq!A(Y8?5Jm5D#D>BS%kBp;s#?Vu>3SWT9BQrBgOr)+(?(2wNJgfrjU+$Lg@n)`8Uy
SoNr-PZDqDmY#=f!K7IgehY0cj

literal 0
HcmV?d00001


From df6447cef0c65d141d3813f35197ed039f11185f Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 12 Sep 2013 17:11:20 +0900
Subject: [PATCH 395/630] add support for multiple activity images in
 activity/*.json template (fixes #3400, BP from #3203)

(cherry picked from commit b1c33881a08af31718adabe54c97713c23d99084)
---
 apps/api/lib/helper/opJsonApiHelper.php       | 23 ++++++++++++++++---
 .../api/activityPostWithImageTest.php         | 13 +++++++----
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/apps/api/lib/helper/opJsonApiHelper.php b/apps/api/lib/helper/opJsonApiHelper.php
index b5374539d..87da11193 100644
--- a/apps/api/lib/helper/opJsonApiHelper.php
+++ b/apps/api/lib/helper/opJsonApiHelper.php
@@ -60,7 +60,25 @@ function op_api_activity($activity)
 {
   $viewMemberId = sfContext::getInstance()->getUser()->getMemberId();
   $member = $activity->getMember();
-  $images = $activity->getImages();
+
+  $images = array();
+  foreach ($activity->getImages() as $activityImage)
+  {
+    if (!is_null($activityImage->file_id))
+    {
+      $images[] = array(
+        'small_uri' => sf_image_path($activityImage->getFile(), array('size' => '48x48'), true),
+        'full_uri' => sf_image_path($activityImage->getFile(), array(), true),
+      );
+    }
+    else
+    {
+      $images[] = array(
+        'small_uri' => $activityImage->uri,
+        'full_uri' => $activityImage->uri,
+      );
+    }
+  }
 
   return array(
     'id' => $activity->getId(),
@@ -70,8 +88,7 @@ function op_api_activity($activity)
     'uri' => $activity->getUri(),
     'source' => $activity->getSource(),
     'source_uri' => $activity->getSourceUri(),
-    'image_url' => count($images) ? sf_image_path($images[0]->getFile(), array('size' => '48x48'), true) : null,
-    'image_large_url' => count($images) ? sf_image_path($images[0]->getFile(), array(), true) : null,
+    'images' => $images,
     'created_at' => date('r', strtotime($activity->getCreatedAt())),
   );
 }
diff --git a/test/functional/api/activityPostWithImageTest.php b/test/functional/api/activityPostWithImageTest.php
index 7a8f85118..9f1491064 100644
--- a/test/functional/api/activityPostWithImageTest.php
+++ b/test/functional/api/activityPostWithImageTest.php
@@ -4,7 +4,7 @@
 include dirname(__FILE__).'/../../bootstrap/functional.php';
 include dirname(__FILE__).'/../../bootstrap/database.php';
 
-$numOfTests = 9;
+$numOfTests = 15;
 $tester = new opTestFunctional(
   new opBrowser(),
   new lime_test($numOfTests, new lime_output_color())
@@ -36,8 +36,9 @@
 
 $activityImage = Doctrine_Core::getTable('ActivityImage')->findByActivityDataId($response['data']['id']);
 $t->is(count($activityImage), 1);
-$t->is($response['data']['image_url'], 'http://localhost/cache/img/gif/w48_h48/'.$activityImage[0]->File->name.'.gif');
-$t->is($response['data']['image_large_url'], 'http://localhost/cache/img/gif/w_h/'.$activityImage[0]->File->name.'.gif');
+$t->is(count($response['data']['images']), 1);
+$t->is($response['data']['images'][0]['small_uri'], 'http://localhost/cache/img/gif/w48_h48/'.$activityImage[0]->File->name.'.gif');
+$t->is($response['data']['images'][0]['full_uri'], 'http://localhost/cache/img/gif/w_h/'.$activityImage[0]->File->name.'.gif');
 
 $tester
   ->info('/activity/post.json - invalid image')
@@ -62,4 +63,8 @@
 
 $activityImage = Doctrine_Core::getTable('ActivityImage')->findByActivityDataId($response['data']['id']);
 $t->is(count($activityImage), 2);
-// retrieving multiple image_url via JSON API is not available yet
+$t->is(count($response['data']['images']), 2);
+$t->is($response['data']['images'][0]['small_uri'], 'http://localhost/cache/img/gif/w48_h48/'.$activityImage[0]->File->name.'.gif');
+$t->is($response['data']['images'][0]['full_uri'], 'http://localhost/cache/img/gif/w_h/'.$activityImage[0]->File->name.'.gif');
+$t->is($response['data']['images'][1]['small_uri'], 'http://localhost/cache/img/jpg/w48_h48/'.$activityImage[1]->File->name.'.jpg');
+$t->is($response['data']['images'][1]['full_uri'], 'http://localhost/cache/img/jpg/w_h/'.$activityImage[1]->File->name.'.jpg');

From 0d6cc658c15d88fa31e8ad771fa23c67e6cc93c0 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Tue, 17 Sep 2013 13:42:50 +0900
Subject: [PATCH 396/630] add helper function for ActivityImage (refs #3203)

(cherry picked from commit 914b96596d77b72d9b1a981d33159d1b4cd82b17)
---
 apps/api/lib/helper/opJsonApiHelper.php       | 20 +++------
 .../default/templates/_activityRecord.php     |  6 +--
 lib/helper/opActivityHelper.php               | 44 +++++++++++++++++++
 test/unit/helper/opActivityHelperTest.php     | 44 ++++++++++++++++++-
 4 files changed, 94 insertions(+), 20 deletions(-)

diff --git a/apps/api/lib/helper/opJsonApiHelper.php b/apps/api/lib/helper/opJsonApiHelper.php
index 87da11193..f452fdade 100644
--- a/apps/api/lib/helper/opJsonApiHelper.php
+++ b/apps/api/lib/helper/opJsonApiHelper.php
@@ -58,26 +58,18 @@ function op_api_member_profile_url($memberId)
 
 function op_api_activity($activity)
 {
+  use_helper('opActivity');
+
   $viewMemberId = sfContext::getInstance()->getUser()->getMemberId();
   $member = $activity->getMember();
 
   $images = array();
   foreach ($activity->getImages() as $activityImage)
   {
-    if (!is_null($activityImage->file_id))
-    {
-      $images[] = array(
-        'small_uri' => sf_image_path($activityImage->getFile(), array('size' => '48x48'), true),
-        'full_uri' => sf_image_path($activityImage->getFile(), array(), true),
-      );
-    }
-    else
-    {
-      $images[] = array(
-        'small_uri' => $activityImage->uri,
-        'full_uri' => $activityImage->uri,
-      );
-    }
+    $images[] = array(
+      'small_uri' => op_activity_image_uri($activityImage, array('size' => '48x48'), true),
+      'full_uri' => op_activity_image_uri($activityImage, array(), true),
+    );
   }
 
   return array(
diff --git a/apps/pc_frontend/modules/default/templates/_activityRecord.php b/apps/pc_frontend/modules/default/templates/_activityRecord.php
index 303db33bf..6974a487a 100644
--- a/apps/pc_frontend/modules/default/templates/_activityRecord.php
+++ b/apps/pc_frontend/modules/default/templates/_activityRecord.php
@@ -10,11 +10,7 @@
 <?php if ($activity->getImages()->count()): ?>
 <?php $images = $activity->getImages() ?>
 <?php for ($i = 0; $i < $images->count() && $i < 3;$i++): ?>
-<?php if ($images[$i]->getFileId()): ?>
-<?php echo op_image_tag_sf_image($images[$i]->getFile(), array('size' => '48x48')) ?>
-<?php else: ?>
-<?php echo op_image_tag($images[$i]->getUri(), array('width' => 48, 'height' => 48)) ?>
-<?php endif; ?>
+<?php echo op_activity_image_tag($images[$i], array('size' => '48x48')) ?>
 <?php endfor; ?>
 <br />
 <?php endif; ?>
diff --git a/lib/helper/opActivityHelper.php b/lib/helper/opActivityHelper.php
index 57e540f82..86d3b11eb 100644
--- a/lib/helper/opActivityHelper.php
+++ b/lib/helper/opActivityHelper.php
@@ -14,6 +14,7 @@
  * @package    OpenPNE
  * @subpackage helper
  * @author     Shogo Kawahara <kawahara@bucyou.net>
+ * @author     Kimura Youichi <kim.upsilon@bucyou.net>
  */
 
 
@@ -65,3 +66,46 @@ function op_activity_body_filter($activity, $is_auto_link = true)
 
   return $body;
 }
+
+/**
+ * Returns a url for the activity image
+ *
+ * @param   ActivityImage $activityImage
+ * @param   mixed[]       $options
+ * @param   bool          $absolute
+ * @return  string
+ */
+function op_activity_image_uri($activityImage, $options = array(), $absolute = false)
+{
+  use_helper('sfImage');
+
+  if ($activityImage->relatedExists('File'))
+  {
+    return sf_image_path($activityImage->File, $options, $absolute);
+  }
+  else
+  {
+    return $activityImage->uri;
+  }
+}
+
+/**
+ * Returns an <img> tag for the activity image
+ *
+ * @param   ActivityImage $activityImage
+ * @param   mixed[]       $options
+ * @return  string
+ */
+function op_activity_image_tag($activityImage, $options = array())
+{
+  use_helper('sfImage');
+
+  if ($activityImage->relatedExists('File'))
+  {
+    return op_image_tag_sf_image($activityImage->File, $options);
+  }
+  else
+  {
+    return op_image_tag($activityImage->uri, $options);
+  }
+}
diff --git a/test/unit/helper/opActivityHelperTest.php b/test/unit/helper/opActivityHelperTest.php
index f71017693..60ad0bcbd 100644
--- a/test/unit/helper/opActivityHelperTest.php
+++ b/test/unit/helper/opActivityHelperTest.php
@@ -13,7 +13,7 @@
 include_once sfConfig::get('sf_lib_dir').'/vendor/symfony/lib/helper/HelperHelper.php';
 use_helper('I18N', 'Tag', 'Url', 'opUtil', 'opActivity');
 
-$t = new lime_test(8, new lime_output_color());
+$t = new lime_test(18, new lime_output_color());
 
 $t->diag('op_activity_body_filter()');
 $activity1 = new ActivityData();
@@ -51,3 +51,45 @@ function test_filter(sfEvent $event, $value)
 
 sfContext::getInstance()->getEventDispatcher()->connect('op_activity.filter_body', 'test_filter');
 $t->is(op_activity_body_filter($activity1),  '', 'op_activity_body_filter() returns ""');
+
+$t->diag('op_activity_image_uri() [file_id]');
+
+$activityImage = new ActivityImage();
+$activityImage->File->fromArray(array(
+  'name' => 'ac_hogehoge_png',
+  'type' => 'image/png',
+));
+$t->is(op_activity_image_uri($activityImage), '/cache/img/png/w_h/ac_hogehoge_png.png');
+$t->is(op_activity_image_uri($activityImage, array('size' => '48x48')), '/cache/img/png/w48_h48/ac_hogehoge_png.png');
+$t->is(op_activity_image_uri($activityImage, array(), true), 'http://sns.example.com/cache/img/png/w_h/ac_hogehoge_png.png');
+
+$t->diag('op_activity_image_uri() [uri]');
+
+$activityImage = new ActivityImage();
+$activityImage->fromArray(array(
+  'uri' => 'http://example.com/images/hogehoge.png',
+  'mimetype' => 'image/png',
+));
+$t->is(op_activity_image_uri($activityImage), 'http://example.com/images/hogehoge.png');
+$t->is(op_activity_image_uri($activityImage, array('size' => '48x48')), 'http://example.com/images/hogehoge.png');
+$t->is(op_activity_image_uri($activityImage, array(), true), 'http://example.com/images/hogehoge.png');
+
+$t->diag('op_activity_image_tag() [file_id]');
+
+$activityImage = new ActivityImage();
+$activityImage->File->fromArray(array(
+  'name' => 'ac_hogehoge_png',
+  'type' => 'image/png',
+));
+$t->is(op_activity_image_tag($activityImage), '<img alt="" src="/cache/img/png/w_h/ac_hogehoge_png.png" />');
+$t->is(op_activity_image_tag($activityImage, array('size' => '48x48')), '<img alt="" src="/cache/img/png/w48_h48/ac_hogehoge_png.png" />');
+
+$t->diag('op_activity_image_tag() [uri]');
+
+$activityImage = new ActivityImage();
+$activityImage->fromArray(array(
+  'uri' => 'http://example.com/images/hogehoge.png',
+  'mimetype' => 'image/png',
+));
+$t->is(op_activity_image_tag($activityImage), '<img src="http://example.com/images/hogehoge.png" />');
+$t->is(op_activity_image_tag($activityImage, array('size' => '48x48')), '<img src="http://example.com/images/hogehoge.png" height="48" width="48" />');

From 8f1bae7204cc09f9bd9bd75f6b423199f6ce5e1d Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Tue, 17 Sep 2013 13:46:48 +0900
Subject: [PATCH 397/630] small change of the name in activity/*.json response
 (fixes #3203)

(cherry picked from commit c7ce43f00f8e5b1c613673b59038692cdb26c317)
---
 apps/api/lib/helper/opJsonApiHelper.php          |  6 +++---
 .../functional/api/activityPostWithImageTest.php | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/apps/api/lib/helper/opJsonApiHelper.php b/apps/api/lib/helper/opJsonApiHelper.php
index f452fdade..073cfb2de 100644
--- a/apps/api/lib/helper/opJsonApiHelper.php
+++ b/apps/api/lib/helper/opJsonApiHelper.php
@@ -67,8 +67,8 @@ function op_api_activity($activity)
   foreach ($activity->getImages() as $activityImage)
   {
     $images[] = array(
-      'small_uri' => op_activity_image_uri($activityImage, array('size' => '48x48'), true),
-      'full_uri' => op_activity_image_uri($activityImage, array(), true),
+      'small_size' => op_activity_image_uri($activityImage, array('size' => '48x48'), true),
+      'full_size' => op_activity_image_uri($activityImage, array(), true),
     );
   }
 
@@ -80,7 +80,7 @@ function op_api_activity($activity)
     'uri' => $activity->getUri(),
     'source' => $activity->getSource(),
     'source_uri' => $activity->getSourceUri(),
-    'images' => $images,
+    'image_uris' => $images,
     'created_at' => date('r', strtotime($activity->getCreatedAt())),
   );
 }
diff --git a/test/functional/api/activityPostWithImageTest.php b/test/functional/api/activityPostWithImageTest.php
index 9f1491064..2aaaf0112 100644
--- a/test/functional/api/activityPostWithImageTest.php
+++ b/test/functional/api/activityPostWithImageTest.php
@@ -36,9 +36,9 @@
 
 $activityImage = Doctrine_Core::getTable('ActivityImage')->findByActivityDataId($response['data']['id']);
 $t->is(count($activityImage), 1);
-$t->is(count($response['data']['images']), 1);
-$t->is($response['data']['images'][0]['small_uri'], 'http://localhost/cache/img/gif/w48_h48/'.$activityImage[0]->File->name.'.gif');
-$t->is($response['data']['images'][0]['full_uri'], 'http://localhost/cache/img/gif/w_h/'.$activityImage[0]->File->name.'.gif');
+$t->is(count($response['data']['image_uris']), 1);
+$t->is($response['data']['image_uris'][0]['small_size'], 'http://localhost/cache/img/gif/w48_h48/'.$activityImage[0]->File->name.'.gif');
+$t->is($response['data']['image_uris'][0]['full_size'], 'http://localhost/cache/img/gif/w_h/'.$activityImage[0]->File->name.'.gif');
 
 $tester
   ->info('/activity/post.json - invalid image')
@@ -63,8 +63,8 @@
 
 $activityImage = Doctrine_Core::getTable('ActivityImage')->findByActivityDataId($response['data']['id']);
 $t->is(count($activityImage), 2);
-$t->is(count($response['data']['images']), 2);
-$t->is($response['data']['images'][0]['small_uri'], 'http://localhost/cache/img/gif/w48_h48/'.$activityImage[0]->File->name.'.gif');
-$t->is($response['data']['images'][0]['full_uri'], 'http://localhost/cache/img/gif/w_h/'.$activityImage[0]->File->name.'.gif');
-$t->is($response['data']['images'][1]['small_uri'], 'http://localhost/cache/img/jpg/w48_h48/'.$activityImage[1]->File->name.'.jpg');
-$t->is($response['data']['images'][1]['full_uri'], 'http://localhost/cache/img/jpg/w_h/'.$activityImage[1]->File->name.'.jpg');
+$t->is(count($response['data']['image_uris']), 2);
+$t->is($response['data']['image_uris'][0]['small_size'], 'http://localhost/cache/img/gif/w48_h48/'.$activityImage[0]->File->name.'.gif');
+$t->is($response['data']['image_uris'][0]['full_size'], 'http://localhost/cache/img/gif/w_h/'.$activityImage[0]->File->name.'.gif');
+$t->is($response['data']['image_uris'][1]['small_size'], 'http://localhost/cache/img/jpg/w48_h48/'.$activityImage[1]->File->name.'.jpg');
+$t->is($response['data']['image_uris'][1]['full_size'], 'http://localhost/cache/img/jpg/w_h/'.$activityImage[1]->File->name.'.jpg');

From c40cb4f000b84a8987e32423f3a0ee55608ebbdc Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 19 Sep 2013 18:00:24 +0900
Subject: [PATCH 398/630] version 3.8.8

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index e757c4971..b340e1736 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.8-dev');
+  define('OPENPNE_VERSION', '3.8.8');
 }

From b2ef48b6554f5cb8b754469d9ce26f11c160eb4d Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 19 Sep 2013 18:08:15 +0900
Subject: [PATCH 399/630] started to development of OpenPNE 3.8.9

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index b340e1736..17608d8a6 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.8');
+  define('OPENPNE_VERSION', '3.8.9-dev');
 }

From 3e28e4076b6cd0c9f33ff8b94309183442aab3c2 Mon Sep 17 00:00:00 2001
From: Mutsumi Imamura <imamura@tejimaya.com>
Date: Wed, 23 Oct 2013 11:27:43 +0900
Subject: [PATCH 400/630] (fixes #3441) updated the mobile_ip_address list for
 release 2013/09/02

---
 lib/config/config/mobile_ip_address.yml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/lib/config/config/mobile_ip_address.yml b/lib/config/config/mobile_ip_address.yml
index 8a256f6fa..c778fbca9 100644
--- a/lib/config/config/mobile_ip_address.yml
+++ b/lib/config/config/mobile_ip_address.yml
@@ -15,8 +15,9 @@
 ######################################
 
 ######################################
-# 2013/01/30 リリース版
-# 2013/01/30 のWILLCOM IPアドレス帯域追加対応
+# 2013/09/02 リリース版
+# 2013/08 のau IPアドレス帯域削除対応
+# 2013/09 のau IPアドレス帯域追加対応
 ######################################
 
 # DoCoMo (2010/06/24更新)
@@ -31,7 +32,7 @@ docomo:
   - 210.153.84.0/24
   - 210.153.86.0/24
 
-# au 2011年夏モデル以前 (2012/12/06更新)
+# au 2011年夏モデル以前 (2013/09/02更新)
 # http://www.au.kddi.com/ezfactory/tec/spec/ezsava_ip.html
 ezweb:
   - 61.117.2.32/29
@@ -56,19 +57,14 @@ ezweb:
   - 111.86.147.160/27
   - 111.86.147.192/27
   - 111.86.147.224/27
-  - 118.152.214.192/26
-  - 118.159.132.160/27
-  - 118.159.133.0/25
-  - 118.159.133.192/26
-  - 121.111.227.0/25
-  - 121.111.231.0/25
   - 210.230.128.224/28
   - 219.108.158.0/27
   - 219.108.158.40/29
   - 219.125.146.0/28
 
-# au 2011年秋冬モデル以降 (2012/07/16更新)
+# au 2011年秋冬モデル以降 (2013/09/02更新)
 # http://www.au.kddi.com/ezfactory/tec/spec/ezsava_ip.html
+  - 106.162.214.160/29
   - 111.107.116.64/26
   - 111.107.116.192/28
 

From 1b365046497ef7b889a05cb07ea97a3d647dcb12 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Tue, 24 Sep 2013 15:33:22 +0900
Subject: [PATCH 401/630] ignore E_STRICT error for
 Net_UserAgent_Mobile::factory() (fixes #3418, BP from #3406) (cherry picked
 from commit 5749159540e18f2af0e3bc5373f72a3ddeefe5c8)

---
 lib/util/opMobileUserAgent.class.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/util/opMobileUserAgent.class.php b/lib/util/opMobileUserAgent.class.php
index dead77cbd..e77479988 100644
--- a/lib/util/opMobileUserAgent.class.php
+++ b/lib/util/opMobileUserAgent.class.php
@@ -26,7 +26,13 @@ protected function __construct()
     require_once 'Net/UserAgent/Mobile.php';
     require_once 'Net/UserAgent/Mobile/NonMobile.php';
 
+    // ignore `Non-static method Net_UserAgent_Mobile::factory()' error
+    $oldErrorLevel = error_reporting(error_reporting() & ~E_STRICT);
+
     self::$mobile = Net_UserAgent_Mobile::factory();
+
+    error_reporting($oldErrorLevel);
+
     if (self::$mobile instanceof Net_UserAgent_Mobile_Error)
     {
       self::$mobile = new Net_UserAgent_Mobile_NonMobile('');

From fb318d6f79fa3858b0ee53b9f2db1b609c45c29a Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Fri, 20 Sep 2013 17:16:13 +0900
Subject: [PATCH 402/630] fix method declaration error in action classes (fixes
 #3420, BP from #3405) (cherry picked from commit
 0e5c3ff1759e6a35048b3eb4367dd38057c53a44)

---
 .../community/actions/actions.class.php       | 28 ++++++-------
 .../community/actions/components.class.php    |  2 +-
 .../modules/friend/actions/actions.class.php  |  8 ++--
 .../friend/actions/components.class.php       |  2 +-
 .../modules/member/actions/actions.class.php  | 22 +++++-----
 .../community/actions/actions.class.php       |  2 +-
 .../community/actions/components.class.php    |  6 +--
 .../friend/actions/components.class.php       |  2 +-
 .../member/actions/components.class.php       |  8 ++--
 lib/action/opCommunityAction.class.php        | 26 ++++++------
 lib/action/opCommunityComponents.class.php    |  6 +--
 lib/action/opConfirmationAction.class.php     |  4 +-
 lib/action/opFriendAction.class.php           | 14 +++----
 lib/action/opFriendComponents.class.php       |  2 +-
 lib/action/opMemberAction.class.php           | 40 +++++++++----------
 lib/action/opMemberComponents.class.php       |  6 +--
 16 files changed, 89 insertions(+), 89 deletions(-)

diff --git a/apps/mobile_frontend/modules/community/actions/actions.class.php b/apps/mobile_frontend/modules/community/actions/actions.class.php
index 64a0c6910..dd5177d05 100644
--- a/apps/mobile_frontend/modules/community/actions/actions.class.php
+++ b/apps/mobile_frontend/modules/community/actions/actions.class.php
@@ -21,9 +21,9 @@ class communityActions extends opCommunityAction
   /**
    * Executes home action
    *
-   * @param sfWebRequest $request a request object
+   * @param opWebRequest $request a request object
    */
-  public function executeHome(sfWebRequest $request)
+  public function executeHome(opWebRequest $request)
   {
     $this->membersSize = 5;
 
@@ -33,9 +33,9 @@ public function executeHome(sfWebRequest $request)
   /**
    * Executes joinlist action
    *
-   * @param sfWebRequest $request a request object
+   * @param opWebRequest $request a request object
    */
-  public function executeJoinlist(sfWebRequest $request)
+  public function executeJoinlist(opWebRequest $request)
   {
     $this->size = 10;
 
@@ -45,9 +45,9 @@ public function executeJoinlist(sfWebRequest $request)
   /**
    * Executes memberList action
    *
-   * @param sfWebRequest $request a request object
+   * @param opWebRequest $request a request object
    */
-  public function executeMemberList(sfWebRequest $request)
+  public function executeMemberList(opWebRequest $request)
   {
     $this->size = 10;
 
@@ -57,9 +57,9 @@ public function executeMemberList(sfWebRequest $request)
   /**
    * Executes search action
    *
-   * @param sfWebRequest $request a request object
+   * @param opWebRequest $request a request object
    */
-  public function executeSearch(sfWebRequest $request)
+  public function executeSearch(opWebRequest $request)
   {
     sfConfig::set('sf_nav_type', 'default');
 
@@ -98,9 +98,9 @@ public function executeSearch(sfWebRequest $request)
   /**
    * Executes detail action
    *
-   * @param sfWebRequest $request a request object
+   * @param opWebRequest $request a request object
    */
-  public function executeDetail(sfWebRequest $request)
+  public function executeDetail(opWebRequest $request)
   {
     $this->community = Doctrine::getTable('Community')->find($this->id);
     $this->forward404Unless($this->community, 'Undefined community.');
@@ -114,9 +114,9 @@ public function executeDetail(sfWebRequest $request)
   /**
    * Executes configImage action
    *
-   * @param sfWebRequest $request a request object
+   * @param opWebRequest $request a request object
    */
-  public function executeConfigImage(sfWebRequest $request)
+  public function executeConfigImage(opWebRequest $request)
   {
     $this->forward404Unless($this->id && $this->isEditCommunity);
     $this->community = Doctrine::getTable('Community')->find($this->id);
@@ -125,9 +125,9 @@ public function executeConfigImage(sfWebRequest $request)
   /**
    * Executes deleteImage action
    *
-   * @param sfWebRequest $request a request object
+   * @param opWebRequest $request a request object
    */
-  public function executeDeleteImage($request)
+  public function executeDeleteImage(opWebRequest $request)
   {
     $this->forward404Unless($this->id && $this->isEditCommunity);
 
diff --git a/apps/mobile_frontend/modules/community/actions/components.class.php b/apps/mobile_frontend/modules/community/actions/components.class.php
index 25ebf6f8a..cca235373 100644
--- a/apps/mobile_frontend/modules/community/actions/components.class.php
+++ b/apps/mobile_frontend/modules/community/actions/components.class.php
@@ -10,7 +10,7 @@
 
 class communityComponents extends opCommunityComponents
 {
-  public function executeJoinListBox($request)
+  public function executeJoinListBox(opWebRequest $request)
   {
     $memberId = $this->getUser()->getMemberId();
     if ($request->hasParameter('id'))
diff --git a/apps/mobile_frontend/modules/friend/actions/actions.class.php b/apps/mobile_frontend/modules/friend/actions/actions.class.php
index f33732bbd..3dd65d61a 100644
--- a/apps/mobile_frontend/modules/friend/actions/actions.class.php
+++ b/apps/mobile_frontend/modules/friend/actions/actions.class.php
@@ -20,9 +20,9 @@ class friendActions extends opFriendAction
   /**
    * Executes list action
    *
-   * @param sfWebRequest $request a request object
+   * @param opWebRequest $request a request object
    */
-  public function executeList(sfWebRequest $request)
+  public function executeList(opWebRequest $request)
   {
     $this->size = 10;
 
@@ -32,9 +32,9 @@ public function executeList(sfWebRequest $request)
  /**
   * Execute show activities action
   *
-  * @param sfWebRequest $request a request object
+  * @param opWebRequest $request a request object
   */
-  public function executeShowActivity(sfWebRequest $request)
+  public function executeShowActivity(opWebRequest $request)
   {
     $this->size = 10;
 
diff --git a/apps/mobile_frontend/modules/friend/actions/components.class.php b/apps/mobile_frontend/modules/friend/actions/components.class.php
index 35b9acb71..7d950e094 100644
--- a/apps/mobile_frontend/modules/friend/actions/components.class.php
+++ b/apps/mobile_frontend/modules/friend/actions/components.class.php
@@ -10,7 +10,7 @@
 
 class friendComponents extends opFriendComponents
 {
-  public function executeFriendListBox($request)
+  public function executeFriendListBox(opWebRequest $request)
   {
     $memberId = $this->getUser()->getMemberId();
     if ($request->hasParameter('id'))
diff --git a/apps/mobile_frontend/modules/member/actions/actions.class.php b/apps/mobile_frontend/modules/member/actions/actions.class.php
index afa97b606..aca6be110 100644
--- a/apps/mobile_frontend/modules/member/actions/actions.class.php
+++ b/apps/mobile_frontend/modules/member/actions/actions.class.php
@@ -17,7 +17,7 @@
  */
 class memberActions extends opMemberAction
 {
-  public function executeHome($request)
+  public function executeHome(opWebRequest $request)
   {
     $this->gadgetConfig = sfConfig::get('op_mobile_gadget_list');
 
@@ -33,7 +33,7 @@ public function executeHome($request)
     return parent::executeHome($request);
   }
 
-  public function executeLogin($request)
+  public function executeLogin(opWebRequest $request)
   {
     if (opConfig::get('external_mobile_login_url') && $request->isMethod(sfWebRequest::GET))
     {
@@ -46,14 +46,14 @@ public function executeLogin($request)
     return parent::executeLogin($request);
   }
 
-  public function executeSearch($request)
+  public function executeSearch(opWebRequest $request)
   {
     $this->size = 10;
 
     return parent::executeSearch($request);
   }
 
-  public function executeProfile($request)
+  public function executeProfile(opWebRequest $request)
   {
     $this->friendsSize = 5;
     $this->communitiesSize = 5;
@@ -66,7 +66,7 @@ public function executeProfile($request)
     return parent::executeProfile($request);
   }
 
-  public function executeConfigUID($request)
+  public function executeConfigUID(opWebRequest $request)
   {
     $option = array('member' => $this->getUser()->getMember());
     $this->passwordForm = new opPasswordForm(array(), $option);
@@ -112,7 +112,7 @@ public function executeConfigUID($request)
     return sfView::SUCCESS;
   }
 
-  public function executeRegisterMobileToRegisterEnd(sfWebRequest $request)
+  public function executeRegisterMobileToRegisterEnd(opWebRequest $request)
   {
 
     $id = $request->getParameter('id');
@@ -149,7 +149,7 @@ public function executeRegisterMobileToRegisterEnd(sfWebRequest $request)
     return sfView::SUCCESS;
   }
 
-  public function executeDeleteImage($request)
+  public function executeDeleteImage(opWebRequest $request)
   {
     $this->image = Doctrine::getTable('MemberImage')->find($request->getParameter('member_image_id'));
     $this->forward404Unless($this->image);
@@ -165,14 +165,14 @@ public function executeDeleteImage($request)
     }
   }
 
-  public function executeShowActivity($request)
+  public function executeShowActivity(opWebRequest $request)
   {
     $this->size = 10;
 
     parent::executeShowActivity($request);
   }
 
-  public function executeSetSid($request)
+  public function executeSetSid(opWebRequest $request)
   {
     $this->forward404Unless(isset($request['sid']));
     $this->forward404Unless(isset($request['ts']) && abs(time() - $request['ts']) <= strtotime('30 minutes'));
@@ -199,9 +199,9 @@ public function executeSetSid($request)
  /**
   * Execute show all member activities action
   *
-  * @param sfWebRequest $request a request object
+  * @param opWebRequest $request a request object
   */
-  public function executeShowAllMemberActivity(sfWebRequest $request)
+  public function executeShowAllMemberActivity(opWebRequest $request)
   {
     $this->size = 10;
 
diff --git a/apps/pc_frontend/modules/community/actions/actions.class.php b/apps/pc_frontend/modules/community/actions/actions.class.php
index 63c5db55e..2af12609f 100644
--- a/apps/pc_frontend/modules/community/actions/actions.class.php
+++ b/apps/pc_frontend/modules/community/actions/actions.class.php
@@ -93,7 +93,7 @@ public function executeSmtEdit(opWebRequest $request)
   *
   * @param opWebRequest $request A request object
   */
-  public function executeMemberList($request)
+  public function executeMemberList(opWebRequest $request)
   {
     $this->forwardIf($request->isSmartphone(), 'community', 'smtMemberList');
 
diff --git a/apps/pc_frontend/modules/community/actions/components.class.php b/apps/pc_frontend/modules/community/actions/components.class.php
index 85299f69b..65e138078 100644
--- a/apps/pc_frontend/modules/community/actions/components.class.php
+++ b/apps/pc_frontend/modules/community/actions/components.class.php
@@ -10,7 +10,7 @@
 
 class communityComponents extends opCommunityComponents
 {
-  public function executeJoinListBox($request)
+  public function executeJoinListBox(opWebRequest $request)
   {
     if ($request->hasParameter('id') && $request->getParameter('module') == 'member' && $request->getParameter('action') == 'profile')
     {
@@ -26,7 +26,7 @@ public function executeJoinListBox($request)
     $this->communities = Doctrine::getTable('Community')->retrievesByMemberId($this->member->getId(), $this->row * $this->col, true);
   }
 
-  public function executeSmtCommunityListBox($request)
+  public function executeSmtCommunityListBox(opWebRequest $request)
   {
     $this->id = $request->getParameter('id');
 
@@ -57,7 +57,7 @@ public function executeSmtCommunityListBox($request)
     $this->communitySubAdmins = $this->community->getSubAdminMembers();
   }
 
-  public function executeSmtCommunityMemberJoinListBox($request)
+  public function executeSmtCommunityMemberJoinListBox(opWebRequest $request)
   {
     $this->id = $request->getParameter('id');
     $this->community = Doctrine::getTable('Community')->find($this->id);
diff --git a/apps/pc_frontend/modules/friend/actions/components.class.php b/apps/pc_frontend/modules/friend/actions/components.class.php
index 4f172b0d8..aa3147484 100644
--- a/apps/pc_frontend/modules/friend/actions/components.class.php
+++ b/apps/pc_frontend/modules/friend/actions/components.class.php
@@ -10,7 +10,7 @@
 
 class friendComponents extends opFriendComponents
 {
-  public function executeFriendListBox($request)
+  public function executeFriendListBox(opWebRequest $request)
   {
     if ($request->hasParameter('id') && $request->getParameter('module') == 'member' && $request->getParameter('action') == 'profile')
     {
diff --git a/apps/pc_frontend/modules/member/actions/components.class.php b/apps/pc_frontend/modules/member/actions/components.class.php
index b626226dc..456d1d548 100644
--- a/apps/pc_frontend/modules/member/actions/components.class.php
+++ b/apps/pc_frontend/modules/member/actions/components.class.php
@@ -10,7 +10,7 @@
 
 class memberComponents extends opMemberComponents
 {
-  public function executeProfileListBox($request)
+  public function executeProfileListBox(opWebRequest $request)
   {
     if ($request->hasParameter('id'))
     {
@@ -22,7 +22,7 @@ public function executeProfileListBox($request)
     }
   }
 
-  public function executeSmtProfileListBox($request)
+  public function executeSmtProfileListBox(opWebRequest $request)
   {
     if ($request->hasParameter('id'))
     {
@@ -34,7 +34,7 @@ public function executeSmtProfileListBox($request)
     }
   }
 
-  public function executeSmtMemberFriendListBox($request)
+  public function executeSmtMemberFriendListBox(opWebRequest $request)
   {
     if ($request->hasParameter('id') && 'profile' !== sfContext::getInstance()->getActionName())
     {
@@ -46,7 +46,7 @@ public function executeSmtMemberFriendListBox($request)
     }
   }
 
-  public function executeSmtMemberJoinCommunityListBox($request)
+  public function executeSmtMemberJoinCommunityListBox(opWebRequest $request)
   {
     if ($request->hasParameter('id') && 'profile' !== sfContext::getInstance()->getActionName())
     {
diff --git a/lib/action/opCommunityAction.class.php b/lib/action/opCommunityAction.class.php
index c71e49d30..33b732b0d 100644
--- a/lib/action/opCommunityAction.class.php
+++ b/lib/action/opCommunityAction.class.php
@@ -35,7 +35,7 @@ public function preExecute()
   *
   * @param sfRequest $request A request object
   */
-  public function executeHome($request)
+  public function executeHome(opWebRequest $request)
   {
     $this->community = Doctrine::getTable('Community')->find($this->id);
     $this->forward404Unless($this->community, 'Undefined community.');
@@ -54,7 +54,7 @@ public function executeHome($request)
   *
   * @param sfRequest $request A request object
   */
-  public function executeEdit($request)
+  public function executeEdit(opWebRequest $request)
   {
     $this->forward404If($this->id && !$this->isEditCommunity);
 
@@ -100,7 +100,7 @@ public function executeEdit($request)
   *
   * @param sfRequest $request A request object
   */
-  public function executeSearch($request)
+  public function executeSearch(opWebRequest $request)
   {
     sfConfig::set('sf_nav_type', 'default');
 
@@ -130,7 +130,7 @@ public function executeSearch($request)
   *
   * @param sfRequest $request A request object
   */
-  public function executeDelete($request)
+  public function executeDelete(opWebRequest $request)
   {
     $this->forward404If($this->id && !$this->isDeleteCommunity);
 
@@ -159,7 +159,7 @@ public function executeDelete($request)
   *
   * @param sfRequest $request A request object
   */
-  public function executeJoinlist($request)
+  public function executeJoinlist(opWebRequest $request)
   {
     $memberId = $request->getParameter('id', $this->getUser()->getMemberId());
 
@@ -188,7 +188,7 @@ public function executeJoinlist($request)
   *
   * @param sfRequest $request A request object
   */
-  public function executeMemberList($request)
+  public function executeMemberList(opWebRequest $request)
   {
     $this->community = Doctrine::getTable('Community')->find($this->id);
     $this->forward404Unless($this->community);
@@ -213,7 +213,7 @@ public function executeMemberList($request)
   *
   * @param sfRequest $request A request object
   */
-  public function executeJoin($request)
+  public function executeJoin(opWebRequest $request)
   {
     $this->community = Doctrine::getTable('Community')->find($this->id);
     $this->forward404Unless($this->community);
@@ -249,7 +249,7 @@ public function executeJoin($request)
   *
   * @param sfRequest $request A request object
   */
-  public function executeQuit($request)
+  public function executeQuit(opWebRequest $request)
   {
     if (!$this->isCommunityMember || $this->isAdmin)
     {
@@ -275,7 +275,7 @@ public function executeQuit($request)
   *
   * @param sfRequest $request A request object
   */
-  public function executeMemberManage($request)
+  public function executeMemberManage(opWebRequest $request)
   {
     $this->redirectUnless($this->isAdmin || $this->isSubAdmin, '@error');
 
@@ -293,7 +293,7 @@ public function executeMemberManage($request)
   *
   * @param sfRequest $request A request object
   */
-  public function executeChangeAdminRequest($request)
+  public function executeChangeAdminRequest(opWebRequest $request)
   {
     $this->forward404Unless($this->isAdmin);
 
@@ -325,7 +325,7 @@ public function executeChangeAdminRequest($request)
   *
   * @param sfRequest $request A request object
   */
-  public function executeSubAdminRequest($request)
+  public function executeSubAdminRequest(opWebRequest $request)
   {
     $this->forward404Unless($this->isAdmin);
 
@@ -352,7 +352,7 @@ public function executeSubAdminRequest($request)
     return sfView::INPUT;
   }
 
-  public function executeRemoveSubAdmin($request)
+  public function executeRemoveSubAdmin(opWebRequest $request)
   {
     $this->forward404Unless($this->isAdmin);
 
@@ -381,7 +381,7 @@ public function executeRemoveSubAdmin($request)
   *
   * @param sfRequest $request A request object
   */
-  public function executeDropMember($request)
+  public function executeDropMember(opWebRequest $request)
   {
     $this->redirectUnless($this->isAdmin || $this->isSubAdmin, '@error');
     $member = Doctrine::getTable('Member')->find($request->getParameter('member_id'));
diff --git a/lib/action/opCommunityComponents.class.php b/lib/action/opCommunityComponents.class.php
index 40cd8f286..745eb80f0 100644
--- a/lib/action/opCommunityComponents.class.php
+++ b/lib/action/opCommunityComponents.class.php
@@ -18,19 +18,19 @@
  */
 abstract class opCommunityComponents extends sfComponents
 {
-  public function executeCautionAboutCommunityMemberPre()
+  public function executeCautionAboutCommunityMemberPre(opWebRequest $request)
   {
     $memberId = sfContext::getInstance()->getUser()->getMemberId();
 
     $this->communityMembersCount = Doctrine::getTable('CommunityMember')->countCommunityMembersPre($memberId);
   }
 
-  public function executeCautionAboutChangeAdminRequest()
+  public function executeCautionAboutChangeAdminRequest(opWebRequest $request)
   {
     $this->communityCount = Doctrine::getTable('Community')->countPositionRequestCommunities('admin');
   }
 
-  public function executeCautionAboutSubAdminRequest()
+  public function executeCautionAboutSubAdminRequest(opWebRequest $request)
   {
     $this->communityCount = Doctrine::getTable('Community')->countPositionRequestCommunities('sub_admin');
   }
diff --git a/lib/action/opConfirmationAction.class.php b/lib/action/opConfirmationAction.class.php
index fb93efe96..b3df3949e 100644
--- a/lib/action/opConfirmationAction.class.php
+++ b/lib/action/opConfirmationAction.class.php
@@ -23,7 +23,7 @@ public function preExecute()
     $this->config = include(sfContext::getInstance()->getConfigCache()->checkConfig('config/confirmation.yml'));
   }
 
-  public function executeList(sfWebRequest $request)
+  public function executeList(opWebRequest $request)
   {
     $this->checkCategory();
 
@@ -46,7 +46,7 @@ public function executeList(sfWebRequest $request)
     $this->form = new sfForm();
   }
 
-  public function executeDecision(sfWebRequest $request)
+  public function executeDecision(opWebRequest $request)
   {
     $request->checkCSRFProtection();
     $this->checkCategory();
diff --git a/lib/action/opFriendAction.class.php b/lib/action/opFriendAction.class.php
index f1a210cf6..a5ee09f4d 100644
--- a/lib/action/opFriendAction.class.php
+++ b/lib/action/opFriendAction.class.php
@@ -35,7 +35,7 @@ public function preExecute()
   *
   * @param sfRequest $request A request object
   */
-  public function executeList($request)
+  public function executeList(opWebRequest $request)
   {
     $this->redirectIf($this->relation->isAccessBlocked(), '@error');
 
@@ -58,7 +58,7 @@ public function executeList($request)
   *
   * @param sfRequest $request A request object
   */
-  public function executeLink($request)
+  public function executeLink(opWebRequest $request)
   {
     $this->redirectUnless(opConfig::get('enable_friend_link'), '@error');
     $this->redirectIf($this->relation->isAccessBlocked(), '@error');
@@ -101,7 +101,7 @@ public function executeLink($request)
   *
   * @param sfRequest $request A request object
   */
-  public function executeUnlink($request)
+  public function executeUnlink(opWebRequest $request)
   {
     $this->redirectToHomeIfIdIsNotValid();
     if (!$this->relation->isFriend())
@@ -134,7 +134,7 @@ protected function redirectToHomeIfIdIsNotValid()
  /**
   * Executes manage action
   */
-  public function executeManage($request)
+  public function executeManage(opWebRequest $request)
   {
     $this->pager = Doctrine::getTable('MemberRelationship')->getFriendListPager($this->getUser()->getMemberId(), $request->getParameter('page', 1));
 
@@ -150,7 +150,7 @@ public function executeManage($request)
    * 
    * @param sfRequest $request A request object
    */
-  public function executeShowImage($request)
+  public function executeShowImage(opWebRequest $request)
   {
     $this->forward404Unless($this->id);
 
@@ -163,9 +163,9 @@ public function executeShowImage($request)
  /**
   * Executes show friend activities action
   * 
-  * @param sfWebRequest $request A request object
+  * @param opWebRequest $request A request object
   */
-  public function executeShowActivity($request)
+  public function executeShowActivity(opWebRequest $request)
   {
     if (!isset($this->size))
     {
diff --git a/lib/action/opFriendComponents.class.php b/lib/action/opFriendComponents.class.php
index bbc41a843..94ad85de2 100644
--- a/lib/action/opFriendComponents.class.php
+++ b/lib/action/opFriendComponents.class.php
@@ -17,7 +17,7 @@
  */
 abstract class opFriendComponents extends sfComponents
 {
-  public function executeActivityBox()
+  public function executeActivityBox(opWebRequest $request)
   {
     $this->activities = Doctrine::getTable('ActivityData')->getFriendActivityList(null, $this->gadget->getConfig('row'));
     if (opConfig::get('is_allow_post_activity'))
diff --git a/lib/action/opMemberAction.class.php b/lib/action/opMemberAction.class.php
index 9058bc77c..e0aa5b32f 100644
--- a/lib/action/opMemberAction.class.php
+++ b/lib/action/opMemberAction.class.php
@@ -74,7 +74,7 @@ protected function handleOpenPNE2FormatUrl()
     }
   }
 
-  public function executeLogin($request)
+  public function executeLogin(opWebRequest $request)
   {
     $this->getUser()->logout();
 
@@ -108,7 +108,7 @@ public function executeLogin($request)
     return sfView::SUCCESS;
   }
 
-  private function redirectToLoginIfSslRequired($request)
+  private function redirectToLoginIfSslRequired(opWebRequest $request)
   {
     $routing = sfContext::getInstance()->getRouting();
     if (sfConfig::get('op_use_ssl', false) && !$request->isSecure())
@@ -153,13 +153,13 @@ private function redirectToLoginIfSslRequired($request)
     }
   }
 
-  public function executeLogout($request)
+  public function executeLogout(opWebRequest $request)
   {
     $this->getUser()->logout();
     $this->redirect('member/login');
   }
 
-  public function executeRegister($request)
+  public function executeRegister(opWebRequest $request)
   {
     $this->getUser()->clearSessionData();
     $member = $this->getUser()->setRegisterToken($request['token']);
@@ -167,7 +167,7 @@ public function executeRegister($request)
     $this->forward404Unless($member && !$this->getUser()->isSNSMember() && $this->getUser()->isInvited());
   }
 
-  public function executeRegisterInput($request)
+  public function executeRegisterInput(opWebRequest $request)
   {
     $this->forward404Unless(opToolkit::isEnabledRegistration((sfConfig::get('app_is_mobile') ? 'mobile' : 'pc')));
 
@@ -194,12 +194,12 @@ public function executeRegisterInput($request)
     return sfView::SUCCESS;
   }
 
-  public function executeHome($request)
+  public function executeHome(opWebRequest $request)
   {
     return sfView::SUCCESS;
   }
 
-  public function executeSearch($request)
+  public function executeSearch(opWebRequest $request)
   {
     $params = $request->getParameter('member', array());
     if ($request->hasParameter('search_query'))
@@ -224,7 +224,7 @@ public function executeSearch($request)
     return sfView::SUCCESS;
   }
 
-  public function executeProfile($request)
+  public function executeProfile(opWebRequest $request)
   {
     $id = $this->getRequestParameter('id', $this->getUser()->getMemberId());
     if ('member_profile_mine' === sfContext::getInstance()->getRouting()->getCurrentRouteName())
@@ -253,7 +253,7 @@ public function executeProfile($request)
     return sfView::SUCCESS;
   }
 
-  public function executeEditProfile($request)
+  public function executeEditProfile(opWebRequest $request)
   {
     $this->memberForm = new MemberForm($this->getUser()->getMember());
 
@@ -276,7 +276,7 @@ public function executeEditProfile($request)
     return sfView::SUCCESS;
   }
 
-  public function executeConfigComplete($request)
+  public function executeConfigComplete(opWebRequest $request)
   {
     $type = $request->getParameter('type');
     $this->forward404Unless($type);
@@ -320,7 +320,7 @@ public function executeConfigComplete($request)
     return sfView::SUCCESS;
   }
 
-  public function executeConfig($request)
+  public function executeConfig(opWebRequest $request)
   {
     $filteredCategory = $this->filterConfigCategory();
     $this->categories = $filteredCategory['category'];
@@ -348,7 +348,7 @@ public function executeConfig($request)
     return sfView::SUCCESS;
   }
 
-  public function executeInvite($request)
+  public function executeInvite(opWebRequest $request)
   {
     if (
       !$this->getUser()->getAuthAdapter()->getAuthConfig('invite_mode')
@@ -391,7 +391,7 @@ public function executeInvite($request)
     return sfView::INPUT;
   }
 
-  public function executeDelete($request)
+  public function executeDelete(opWebRequest $request)
   {
     if (1 == $this->getUser()->getMemberId())
     {
@@ -416,12 +416,12 @@ public function executeDelete($request)
     return sfView::INPUT;
   }
 
-  public function executeConfigImage($request)
+  public function executeConfigImage(opWebRequest $request)
   {
     return sfView::SUCCESS;
   }
 
-  public function executeDeleteImage($request)
+  public function executeDeleteImage(opWebRequest $request)
   {
     $request->checkCSRFProtection();
     $image = Doctrine::getTable('MemberImage')->find($request->getParameter('member_image_id'));
@@ -433,7 +433,7 @@ public function executeDeleteImage($request)
     $this->redirect('member/configImage');
   }
 
-  public function executeChangeMainImage($request)
+  public function executeChangeMainImage(opWebRequest $request)
   {
     $request->checkCSRFProtection();
     $image = Doctrine::getTable('MemberImage')->find($request->getParameter('member_image_id'));
@@ -532,7 +532,7 @@ protected function filterConfigCategory()
     return array('category' => $categories, 'captions' => $categoryCaptions);
   }
 
-  public function executeShowActivity($request)
+  public function executeShowActivity(opWebRequest $request)
   {
     $this->forward404Unless($this->id);
     $this->forward404If($this->relation->isAccessBlocked());
@@ -546,7 +546,7 @@ public function executeShowActivity($request)
     $this->pager = Doctrine::getTable('ActivityData')->getActivityListPager($this->id, null, $request->getParameter('page', 1), $this->size);
   }
 
-  public function executeDeleteActivity($request)
+  public function executeDeleteActivity(opWebRequest $request)
   {
     $this->forward404Unless($request->hasParameter('id'));
 
@@ -565,7 +565,7 @@ public function executeDeleteActivity($request)
     return sfView::INPUT;
   }
 
-  public function executeUpdateActivity($request)
+  public function executeUpdateActivity(opWebRequest $request)
   {
     if ($request->isMethod(sfWebRequest::POST))
     {
@@ -609,7 +609,7 @@ public function executeUpdateActivity($request)
     return sfView::NONE;
   }
 
-  public function executeShowAllMemberActivity(sfWebRequest $request)
+  public function executeShowAllMemberActivity(opWebRequest $request)
   {
     if (!isset($this->size))
     {
diff --git a/lib/action/opMemberComponents.class.php b/lib/action/opMemberComponents.class.php
index 96ffe7df3..c94d0ea9e 100644
--- a/lib/action/opMemberComponents.class.php
+++ b/lib/action/opMemberComponents.class.php
@@ -17,7 +17,7 @@
  */
 abstract class opMemberComponents extends sfComponents
 {
-  public function executeActivityBox(sfWebRequest $request)
+  public function executeActivityBox(opWebRequest $request)
   {
     $id = $request->getParameter('id', $this->getUser()->getMemberId());
     $this->activities = Doctrine::getTable('ActivityData')->getActivityList($id, null, $this->gadget->getConfig('row'));
@@ -25,7 +25,7 @@ public function executeActivityBox(sfWebRequest $request)
     $this->isMine = ($id == $this->getUser()->getMemberId());
   }
 
-  public function executeAllMemberActivityBox(sfWebRequest $request)
+  public function executeAllMemberActivityBox(opWebRequest $request)
   {
     $this->activities = Doctrine::getTable('ActivityData')->getAllMemberActivityList($this->gadget->getConfig('row'));
     if ($this->gadget->getConfig('is_viewable_activity_form') && opConfig::get('is_allow_post_activity'))
@@ -34,7 +34,7 @@ public function executeAllMemberActivityBox(sfWebRequest $request)
     }
   }
 
-  public function executeBirthdayBox(sfWebRequest $request)
+  public function executeBirthdayBox(opWebRequest $request)
   {
     $id = $request->getParameter('id', $this->getUser()->getMemberId());
     $birthday = Doctrine::getTable('MemberProfile')->getViewableProfileByMemberIdAndProfileName($id, 'op_preset_birthday');

From 9b8a9a12344e17cfbbf9c5f23f6f2e251cee7c59 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Fri, 20 Sep 2013 15:05:02 +0900
Subject: [PATCH 403/630] add ability to categorize test data for functional
 tests (fixes #3422, BP from #3404) (cherry picked from commit
 a3beff99b303105c04cbf40dd3918ed3f1828504)

---
 test/bootstrap/database.php   | 16 +++++++++++-----
 test/bootstrap/functional.php | 10 +---------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/test/bootstrap/database.php b/test/bootstrap/database.php
index 472c720e7..7d50f7533 100644
--- a/test/bootstrap/database.php
+++ b/test/bootstrap/database.php
@@ -1,14 +1,20 @@
 <?php
 
-$_app = 'pc_frontend';
-$_env = 'test';
+if (!isset($configuration) || !($configuration instanceof sfApplicationConfiguration))
+{
+  if (!isset($app))
+  {
+    $app = 'pc_frontend';
+  }
+
+  $configuration = ProjectConfiguration::getApplicationConfiguration($app, 'test', true);
+}
 
 if (!isset($fixture))
 {
   $fixture = 'common';
 }
 
-$configuration = ProjectConfiguration::getApplicationConfiguration($_app, $_env, true);
 new sfDatabaseManager($configuration);
 
 $conn = opDoctrineQuery::getMasterConnectionDirect();
@@ -20,8 +26,8 @@
   'no-confirmation' => true,
   'db'              => true,
   'and-load'        => dirname(__FILE__).'/../fixtures/'.$fixture,
-  'application'     => $_app,
-  'env'             => $_env,
+  'application'     => $configuration->getApplication(),
+  'env'             => $configuration->getEnvironment(),
 ));
 
 $conn = Doctrine_Manager::getInstance()->getCurrentConnection();
diff --git a/test/bootstrap/functional.php b/test/bootstrap/functional.php
index 197d39eaf..3602ed32c 100644
--- a/test/bootstrap/functional.php
+++ b/test/bootstrap/functional.php
@@ -26,15 +26,7 @@
 
 if (!isset($executeLoader) || $executeLoader)
 {
-  $task = new sfDoctrineBuildTask($configuration->getEventDispatcher(), new sfFormatter());
-  $task->setConfiguration($configuration);
-  $task->run(array(), array(
-    'no-confirmation' => true,
-    'db'              => true,
-    'and-load'        => dirname(__FILE__).'/../fixtures',
-    'application'     => $app,
-    'env'             => 'test',
-  ));
+  require_once dirname(__FILE__).'/database.php';
 }
 
 // remove all cache

From ebf080f0d20e8a5a5376650639f98716e88cc2eb Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Mon, 7 Oct 2013 15:51:25 +0900
Subject: [PATCH 404/630] fix `Array to string conversion' error in opI18N
 (fixes #3459, BP from #3424) (cherry picked from commit
 015897d36b9272059c74a27e74c6d2639e9c3243)

---
 lib/i18n/opI18N.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/i18n/opI18N.class.php b/lib/i18n/opI18N.class.php
index e9e670384..192b2a7d9 100644
--- a/lib/i18n/opI18N.class.php
+++ b/lib/i18n/opI18N.class.php
@@ -52,7 +52,7 @@ public function generateApplicationMessages($dirs)
         $catalogues[$name] = array();
       }
 
-      $messageSource = sfMessageSource::factory('OpenPNE', array());
+      $messageSource = sfMessageSource::factory('OpenPNE');
       $data = $messageSource->loadData($file);
 
       $catalogues[$name] = array_merge($data, $catalogues[$name]);

From 3751ff4533dad77055bab88e927a72f360e12525 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Mon, 7 Oct 2013 16:10:58 +0900
Subject: [PATCH 405/630] remove useless include in designActionsTest.php
 (fixes #3460, BP from #3425) (cherry picked from commit
 74943a28fb7cb3da51dd3bae47283708a266540f)

---
 test/functional/pc_backend/designActionsTest.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/functional/pc_backend/designActionsTest.php b/test/functional/pc_backend/designActionsTest.php
index 1aafc039d..13b60d399 100644
--- a/test/functional/pc_backend/designActionsTest.php
+++ b/test/functional/pc_backend/designActionsTest.php
@@ -1,6 +1,5 @@
 <?php
 
-include(dirname(__FILE__).'/../../bootstrap/database.php');
 include(dirname(__FILE__).'/../../bootstrap/functional.php');
 
 $browser = new opTestFunctional(new opBrowser(), new lime_test(null, new lime_output_color()));

From 7f03538217a32f8e75835d6281ee48047e8a77e6 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Mon, 7 Oct 2013 16:28:45 +0900
Subject: [PATCH 406/630] remove useless tests in pc_backend (fixes #3461, BP
 from #3426) (cherry picked from commit
 66829df2516fd50053d2c94a7425d0fc7041b952)

---
 .../functional/pc_backend/mailActionsTest.php | 19 -------------------
 .../pc_backend/securityActionsTest.php        | 13 -------------
 2 files changed, 32 deletions(-)
 delete mode 100644 test/functional/pc_backend/mailActionsTest.php
 delete mode 100644 test/functional/pc_backend/securityActionsTest.php

diff --git a/test/functional/pc_backend/mailActionsTest.php b/test/functional/pc_backend/mailActionsTest.php
deleted file mode 100644
index e324b66bb..000000000
--- a/test/functional/pc_backend/mailActionsTest.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-include(dirname(__FILE__).'/../../bootstrap/functional.php');
-
-$browser = new sfTestFunctional(new sfBrowser());
-
-$browser->
-  get('/mail/index')->
-
-  with('request')->begin()->
-    isParameter('module', 'mail')->
-    isParameter('action', 'index')->
-  end()->
-
-  with('response')->begin()->
-    isStatusCode(200)->
-    checkElement('body', '!/This is a temporary page/')->
-  end()
-;
diff --git a/test/functional/pc_backend/securityActionsTest.php b/test/functional/pc_backend/securityActionsTest.php
deleted file mode 100644
index 1249d5dd0..000000000
--- a/test/functional/pc_backend/securityActionsTest.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-include(dirname(__FILE__).'/../../bootstrap/functional.php');
-
-// create a new test browser
-$browser = new sfTestBrowser();
-
-$browser->
-  get('/security/index')->
-  isStatusCode(200)->
-  isRequestParameter('module', 'security')->
-  isRequestParameter('action', 'index')->
-  checkResponseElement('body', '!/This is a temporary page/');

From 5d1904a5efbe5d67095fd7b09879f80e6ff93416 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Mon, 7 Oct 2013 16:57:28 +0900
Subject: [PATCH 407/630] change the tester class in snsActionsTest.php (fixes
 #3462, BP from #3427) (cherry picked from commit
 82d117e45945bb1b86350e135a839ba803ac0fb7)

---
 test/functional/pc_backend/snsActionsTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/functional/pc_backend/snsActionsTest.php b/test/functional/pc_backend/snsActionsTest.php
index d8a00024f..21e98d04a 100644
--- a/test/functional/pc_backend/snsActionsTest.php
+++ b/test/functional/pc_backend/snsActionsTest.php
@@ -2,7 +2,7 @@
 
 include(dirname(__FILE__).'/../../bootstrap/functional.php');
 
-$browser = new sfTestFunctional(new sfBrowser(), new lime_test(null, new lime_output_color()));
+$browser = new opTestFunctional(new sfBrowser(), new lime_test(null, new lime_output_color()));
 $params = array('admin_user' => array(
 ));
 $browser

From 8b19cda75f6a95be9200525710f742c293797d85 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Mon, 7 Oct 2013 17:27:23 +0900
Subject: [PATCH 408/630] make IsRequired and IsTrim optional in
 opFormItemGenerator (fixes #3463, BP from #3428) (cherry picked from commit
 0962d48b8fbfa2da9be0d65764a569bf9ccfd1e7)

---
 lib/util/opFormItemGenerator.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/util/opFormItemGenerator.class.php b/lib/util/opFormItemGenerator.class.php
index 2618c4bfe..8d3a29662 100644
--- a/lib/util/opFormItemGenerator.class.php
+++ b/lib/util/opFormItemGenerator.class.php
@@ -168,7 +168,10 @@ public static function generateWidget($field, $choices = array())
   public static function generateValidator($field, $choices = array())
   {
     $field = self::arrayKeyCamelize($field);
-    $option = array('required' => $field['IsRequired'], 'trim' => $field['IsTrim']);
+    $option = array(
+      'required' => isset($field['IsRequired']) && $field['IsRequired'],
+      'trim' => isset($field['IsTrim']) && $field['IsTrim'],
+    );
 
     if (!$choices && !empty($field['Choices']))
     {

From d829f01661d70598bf32d69aa0458515791fb36a Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Tue, 8 Oct 2013 12:14:26 +0900
Subject: [PATCH 409/630] remove skeleton tests for mobile_frontend and
 mobile_mail_frontend (fixes #3464, BP from #3431) (cherry picked from commit
 5542d6174689fe6951093e37f493f8aaa5c892f4)

---
 .../mobile_frontend/communityActionsTest.php  | 13 -------------
 .../confirmationActionsTest.php               | 19 -------------------
 .../mobile_frontend/defaultActionsTest.php    | 13 -------------
 .../mobile_frontend/friendActionsTest.php     | 13 -------------
 .../mobile_frontend/memberActionsTest.php     | 13 -------------
 .../memberActionsTest.php                     | 19 -------------------
 6 files changed, 90 deletions(-)
 delete mode 100644 test/functional/mobile_frontend/communityActionsTest.php
 delete mode 100644 test/functional/mobile_frontend/confirmationActionsTest.php
 delete mode 100644 test/functional/mobile_frontend/defaultActionsTest.php
 delete mode 100644 test/functional/mobile_frontend/friendActionsTest.php
 delete mode 100644 test/functional/mobile_frontend/memberActionsTest.php
 delete mode 100644 test/functional/mobile_mail_frontend/memberActionsTest.php

diff --git a/test/functional/mobile_frontend/communityActionsTest.php b/test/functional/mobile_frontend/communityActionsTest.php
deleted file mode 100644
index 8559fe1b6..000000000
--- a/test/functional/mobile_frontend/communityActionsTest.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-include(dirname(__FILE__).'/../../bootstrap/functional.php');
-
-// create a new test browser
-$browser = new sfTestBrowser();
-
-$browser->
-  get('/community/index')->
-  isStatusCode(200)->
-  isRequestParameter('module', 'community')->
-  isRequestParameter('action', 'index')->
-  checkResponseElement('body', '!/This is a temporary page/');
diff --git a/test/functional/mobile_frontend/confirmationActionsTest.php b/test/functional/mobile_frontend/confirmationActionsTest.php
deleted file mode 100644
index 1818fd32e..000000000
--- a/test/functional/mobile_frontend/confirmationActionsTest.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-include(dirname(__FILE__).'/../../bootstrap/functional.php');
-
-$browser = new sfTestFunctional(new sfBrowser());
-
-$browser->
-  get('/confirmation/index')->
-
-  with('request')->begin()->
-    isParameter('module', 'confirmation')->
-    isParameter('action', 'index')->
-  end()->
-
-  with('response')->begin()->
-    isStatusCode(200)->
-    checkElement('body', '!/This is a temporary page/')->
-  end()
-;
diff --git a/test/functional/mobile_frontend/defaultActionsTest.php b/test/functional/mobile_frontend/defaultActionsTest.php
deleted file mode 100644
index d15f588ee..000000000
--- a/test/functional/mobile_frontend/defaultActionsTest.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-include(dirname(__FILE__).'/../../bootstrap/functional.php');
-
-// create a new test browser
-$browser = new sfTestBrowser();
-
-$browser->
-  get('/default/index')->
-  isStatusCode(200)->
-  isRequestParameter('module', 'default')->
-  isRequestParameter('action', 'index')->
-  checkResponseElement('body', '!/This is a temporary page/');
diff --git a/test/functional/mobile_frontend/friendActionsTest.php b/test/functional/mobile_frontend/friendActionsTest.php
deleted file mode 100644
index 292b4ef6f..000000000
--- a/test/functional/mobile_frontend/friendActionsTest.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-include(dirname(__FILE__).'/../../bootstrap/functional.php');
-
-// create a new test browser
-$browser = new sfTestBrowser();
-
-$browser->
-  get('/friend/index')->
-  isStatusCode(200)->
-  isRequestParameter('module', 'friend')->
-  isRequestParameter('action', 'index')->
-  checkResponseElement('body', '!/This is a temporary page/');
diff --git a/test/functional/mobile_frontend/memberActionsTest.php b/test/functional/mobile_frontend/memberActionsTest.php
deleted file mode 100644
index 57065af62..000000000
--- a/test/functional/mobile_frontend/memberActionsTest.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-include(dirname(__FILE__).'/../../bootstrap/functional.php');
-
-// create a new test browser
-$browser = new sfTestBrowser();
-
-$browser->
-  get('/member/index')->
-  isStatusCode(200)->
-  isRequestParameter('module', 'member')->
-  isRequestParameter('action', 'index')->
-  checkResponseElement('body', '!/This is a temporary page/');
diff --git a/test/functional/mobile_mail_frontend/memberActionsTest.php b/test/functional/mobile_mail_frontend/memberActionsTest.php
deleted file mode 100644
index 86222732c..000000000
--- a/test/functional/mobile_mail_frontend/memberActionsTest.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-include(dirname(__FILE__).'/../../bootstrap/functional.php');
-
-$browser = new sfTestFunctional(new sfBrowser());
-
-$browser->
-  get('/member/index')->
-
-  with('request')->begin()->
-    isParameter('module', 'member')->
-    isParameter('action', 'index')->
-  end()->
-
-  with('response')->begin()->
-    isStatusCode(200)->
-    checkElement('body', '!/This is a temporary page/')->
-  end()
-;

From 71b7c85d6fa477da66c35776a0af9c2aabe170a2 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Tue, 8 Oct 2013 14:31:14 +0900
Subject: [PATCH 410/630] fix fallback error when activity_templates.yml
 doesn't exist (fixes #3465, BP from #2773) (cherry picked from commit
 6864bf36d7df3b7acb25d6fc9a5c45de519140a9)

---
 lib/config/config/activity_template.yml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 lib/config/config/activity_template.yml

diff --git a/lib/config/config/activity_template.yml b/lib/config/config/activity_template.yml
new file mode 100644
index 000000000..e69de29bb

From 9b2761e76aeb8a70792d6500ca7d34102cb2217f Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Tue, 8 Oct 2013 17:02:57 +0900
Subject: [PATCH 411/630] mock out the Zend_Mail_Transport object in unit tests
 (fixes #3466, BP from #3443) (cherry picked from commit
 2d73654a5ed2755c2cfe52a8be9e10e49e95eb1a)

---
 lib/util/opZendMailTransportMock.class.php    | 25 +++++++++++++++++++
 test/unit/form/MemberConfigFormTest.php       |  2 ++
 .../doctrine/MemberRelationshipTableTest.php  |  3 +++
 3 files changed, 30 insertions(+)
 create mode 100644 lib/util/opZendMailTransportMock.class.php

diff --git a/lib/util/opZendMailTransportMock.class.php b/lib/util/opZendMailTransportMock.class.php
new file mode 100644
index 000000000..4c251f84b
--- /dev/null
+++ b/lib/util/opZendMailTransportMock.class.php
@@ -0,0 +1,25 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * opZendMailTransportMock
+ *
+ * @package    OpenPNE
+ * @subpackage util
+ * @author     Kimura Youichi <kim.upsilon@bucyou.net>
+ */
+class opZendMailTransportMock extends Zend_Mail_Transport_Abstract
+{
+  public $EOL = "\n";
+
+  public function _sendMail()
+  {
+  }
+}
diff --git a/test/unit/form/MemberConfigFormTest.php b/test/unit/form/MemberConfigFormTest.php
index cb6f7d273..22098d364 100644
--- a/test/unit/form/MemberConfigFormTest.php
+++ b/test/unit/form/MemberConfigFormTest.php
@@ -11,6 +11,8 @@ class dummyActions extends sfActions
 {
 }
 
+opMailSend::initialize();
+Zend_Mail::setDefaultTransport(new opZendMailTransportMock());
 
 $configuration = ProjectConfiguration::getApplicationConfiguration('pc_frontend', 'test', true);
 sfContext::createInstance($configuration);
diff --git a/test/unit/model/doctrine/MemberRelationshipTableTest.php b/test/unit/model/doctrine/MemberRelationshipTableTest.php
index f6954fe69..2ea5dc88a 100644
--- a/test/unit/model/doctrine/MemberRelationshipTableTest.php
+++ b/test/unit/model/doctrine/MemberRelationshipTableTest.php
@@ -4,6 +4,9 @@
 include_once dirname(__FILE__) . '/../../../bootstrap/database.php';
 sfContext::createInstance($configuration);
 
+opMailSend::initialize();
+Zend_Mail::setDefaultTransport(new opZendMailTransportMock());
+
 $t = new lime_test(16, new lime_output_color());
 $table = Doctrine::getTable('MemberRelationship');
 

From 9e083bd246a346218c3d23d4c5dd58e5c649e931 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Wed, 9 Oct 2013 17:48:53 +0900
Subject: [PATCH 412/630] skip the test for gzip type column if zlib extensions
 is missing (fixes (cherry picked from commit
 3743686e4c0cae0afa4d9d130fa3639f9aaf9488)

---
 test/unit/util/opDoctrineRecordTest.php | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/test/unit/util/opDoctrineRecordTest.php b/test/unit/util/opDoctrineRecordTest.php
index b5ef50132..b7ff061e4 100644
--- a/test/unit/util/opDoctrineRecordTest.php
+++ b/test/unit/util/opDoctrineRecordTest.php
@@ -12,6 +12,8 @@
 
 // --
 
+$zlibEnabled = extension_loaded('zlib');
+
 class MyRecord extends opDoctrineRecord
 {
   public function __construct()
@@ -19,9 +21,15 @@ public function __construct()
     parent::__construct();
 
     $types = array(
-      'string', 'array', 'object', 'blob', 'clob', 'gzip', 'char', 'varchar',
+      'string', 'array', 'object', 'blob', 'clob', 'char', 'varchar',
     );
 
+    global $zlibEnabled;
+    if ($zlibEnabled)
+    {
+      $types[] = 'gzip';
+    }
+
     foreach ($types as $type)
     {
       $this->hasColumn('column_'.$type, $type);
@@ -37,9 +45,12 @@ public function __construct()
 $r->setColumnArray(array($strRaw => $strRaw, $strRaw => array($strRaw)));
 $r->setColumnBlob($strRaw);
 $r->setColumnClob($strRaw);
-$r->setColumnGzip($strRaw);
 $r->setColumnChar($strRaw);
 $r->setColumnVarchar($strRaw);
+if ($zlibEnabled)
+{
+  $r->setColumnGzip($strRaw);
+}
 
 $result = $r->getPrepared();
 
@@ -49,6 +60,13 @@ public function __construct()
 $t->is($result['column_array'], serialize(array($strConverted => $strConverted, $strConverted => array($strConverted))), '4 bytes UTF-8 characters in an array are replaced');
 $t->is($result['column_blob'], $strRaw, '4 bytes UTF-8 characters in a blob are NOT replaced');
 $t->is($result['column_clob'], $strConverted, '4 bytes UTF-8 characters in a clob are replaced');
-$t->is($result['column_gzip'], gzcompress($strRaw, 5), '4 bytes UTF-8 characters in a gzip are NOT replaced');
 $t->is($result['column_char'], $strConverted, '4 bytes UTF-8 characters in a char are replaced');
 $t->is($result['column_varchar'], $strConverted, '4 bytes UTF-8 characters in a varchar are replaced');
+if ($zlibEnabled)
+{
+  $t->is($result['column_gzip'], gzcompress($strRaw, 5), '4 bytes UTF-8 characters in a gzip are NOT replaced');
+}
+else
+{
+  $t->skip('the test for gzip type column (missing zlib extention)');
+}

From 0fa7d5ad000819de927e135c71e1be7548a487a2 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Wed, 9 Oct 2013 17:14:57 +0900
Subject: [PATCH 413/630] use opZendMailTransportMock for
 CommunityMemberTable::processJoinConfirm() tests (fixes #3466, BP from #3443)
 (cherry picked from commit b9a0894299d19644281bf3eca2a37ec572371b41)

---
 test/unit/model/doctrine/CommunityMemberTableTest.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/unit/model/doctrine/CommunityMemberTableTest.php b/test/unit/model/doctrine/CommunityMemberTableTest.php
index 7f474e09f..11b3a306a 100644
--- a/test/unit/model/doctrine/CommunityMemberTableTest.php
+++ b/test/unit/model/doctrine/CommunityMemberTableTest.php
@@ -4,6 +4,9 @@
 include_once dirname(__FILE__) . '/../../../bootstrap/database.php';
 sfContext::createInstance($configuration);
 
+opMailSend::initialize();
+Zend_Mail::setDefaultTransport(new opZendMailTransportMock());
+
 $t = new lime_test(82, new lime_output_color());
 $table = Doctrine::getTable('CommunityMember');
 $member1 = Doctrine::getTable('Member')->findOneByName('A');

From 5b6a1f84c1b8c6cdf521ab2aa61a0bc1a1b38570 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Wed, 9 Oct 2013 17:12:44 +0900
Subject: [PATCH 414/630] remove skeleton tests for pc_frontend (fixes #3464,
 BP from #3431) (cherry picked from commit
 52010fe24dd57de0c5265689f96986677452c5e7)

---
 .../pc_frontend/OpenIDActionsTest.php         | 19 -------------------
 .../pc_frontend/googlemapsActionsTest.php     | 19 -------------------
 2 files changed, 38 deletions(-)
 delete mode 100644 test/functional/pc_frontend/OpenIDActionsTest.php
 delete mode 100644 test/functional/pc_frontend/googlemapsActionsTest.php

diff --git a/test/functional/pc_frontend/OpenIDActionsTest.php b/test/functional/pc_frontend/OpenIDActionsTest.php
deleted file mode 100644
index 6251be560..000000000
--- a/test/functional/pc_frontend/OpenIDActionsTest.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-include(dirname(__FILE__).'/../../bootstrap/functional.php');
-
-$browser = new sfTestFunctional(new sfBrowser());
-
-$browser->
-  get('/OpenID/index')->
-
-  with('request')->begin()->
-    isParameter('module', 'OpenID')->
-    isParameter('action', 'index')->
-  end()->
-
-  with('response')->begin()->
-    isStatusCode(200)->
-    checkElement('body', '!/This is a temporary page/')->
-  end()
-;
diff --git a/test/functional/pc_frontend/googlemapsActionsTest.php b/test/functional/pc_frontend/googlemapsActionsTest.php
deleted file mode 100644
index 1644dc1eb..000000000
--- a/test/functional/pc_frontend/googlemapsActionsTest.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-include(dirname(__FILE__).'/../../bootstrap/functional.php');
-
-$browser = new sfTestFunctional(new sfBrowser());
-
-$browser->
-  get('/googlemaps/index')->
-
-  with('request')->begin()->
-    isParameter('module', 'googlemaps')->
-    isParameter('action', 'index')->
-  end()->
-
-  with('response')->begin()->
-    isStatusCode(200)->
-    checkElement('body', '!/This is a temporary page/')->
-  end()
-;

From 6ebadaeed2850bc4f3e646d7e71be91ecf000ca1 Mon Sep 17 00:00:00 2001
From: Akihiro KOBAYASHI <a.kobayashi@tejimaya.com>
Date: Wed, 13 Nov 2013 15:54:30 +0900
Subject: [PATCH 415/630] remove skeleton tests for mobile_frontend and
 mobile_mail_frontend (fixes #3464, BP from #3431)

---
 test/functional/pc_frontend/communityActionsTest.php | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 test/functional/pc_frontend/communityActionsTest.php

diff --git a/test/functional/pc_frontend/communityActionsTest.php b/test/functional/pc_frontend/communityActionsTest.php
deleted file mode 100644
index d6aab41e4..000000000
--- a/test/functional/pc_frontend/communityActionsTest.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php 
-include(dirname(__FILE__).'/../../bootstrap/functional.php');
-
-// create a new test browser
-$browser = new sfTestBrowser();
-
-$browser->
-  get('/community/index')->
-  isStatusCode(200)->
-  isRequestParameter('module', 'community')->
-  isRequestParameter('action', 'index')->
-  checkResponseElement('body', '!/This is a temporary page/');

From ab7ea6ad0b2ba08263ea4a53d50bb791343142bf Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 14 Nov 2013 18:20:46 +0900
Subject: [PATCH 416/630] version 3.8.9

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 17608d8a6..7b7a345ef 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.9-dev');
+  define('OPENPNE_VERSION', '3.8.9');
 }

From d90e262bdc9ee56611df50dfb55881a0f7e1ce85 Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 14 Nov 2013 18:26:50 +0900
Subject: [PATCH 417/630] started to development of OpenPNE 3.8.10

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 7b7a345ef..80a77e42f 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.9');
+  define('OPENPNE_VERSION', '3.8.10-dev');
 }

From 5a288f29efcd3acdbee8b986656ec6c6fc27b2c5 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Fri, 27 Dec 2013 14:40:18 +0900
Subject: [PATCH 418/630] fixed not to use serialize/unserialize (fixes #3526)

---
 lib/user/opSecurityUser.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/user/opSecurityUser.class.php b/lib/user/opSecurityUser.class.php
index 367edcd75..73236b93b 100644
--- a/lib/user/opSecurityUser.class.php
+++ b/lib/user/opSecurityUser.class.php
@@ -145,7 +145,7 @@ protected function getRememberLoginCookie()
     $key = md5(sfContext::getInstance()->getRequest()->getHost());
     if ($value = sfContext::getInstance()->getRequest()->getCookie($key))
     {
-      $value = unserialize(base64_decode($value));
+      $value = json_decode(base64_decode($value));
 
       return $value;
     }
@@ -187,7 +187,7 @@ protected function setRememberLoginCookie($isDeleteCookie = false)
       }
       $this->getMember()->setConfig('remember_key', $rememberKey);
 
-      $value = base64_encode(serialize(array($this->getMemberId(), $rememberKey)));
+      $value = base64_encode(json_encode(array($this->getMemberId(), $rememberKey)));
       $expire = time() + sfConfig::get('op_remember_login_limit', 60*60*24*30);
     }
 

From 3482fae317cd21a7fd20f7fef17e8bfab0bff6b1 Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Mon, 20 Jan 2014 11:37:27 +0900
Subject: [PATCH 419/630] version 3.8.9.1

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 7b7a345ef..823672ddb 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.9');
+  define('OPENPNE_VERSION', '3.8.9.1');
 }

From f60912975ecd4bbd9f6b03c45394ac0449564cf3 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Fri, 24 Jan 2014 13:40:09 +0900
Subject: [PATCH 420/630] update to use Google Maps API v3 (fixes #3495, BP
 from #1755) (cherry picked from commit
 8a7d3300b22252c38e25181f9a1936f284c57afe)

---
 .../googlemaps/actions/actions.class.php      |  10 --
 .../googlemaps/templates/indexSuccess.php     | 110 +++++++++---------
 2 files changed, 55 insertions(+), 65 deletions(-)

diff --git a/apps/pc_frontend/modules/googlemaps/actions/actions.class.php b/apps/pc_frontend/modules/googlemaps/actions/actions.class.php
index 86378c768..e7341efc1 100644
--- a/apps/pc_frontend/modules/googlemaps/actions/actions.class.php
+++ b/apps/pc_frontend/modules/googlemaps/actions/actions.class.php
@@ -17,15 +17,5 @@ class googlemapsActions extends sfActions
   */
   public function executeIndex(sfWebRequest $request)
   {
-    $this->mapType = 'G_NORMAL_MAP';
-    switch ($request->getParameter('t'))
-    {
-      case 'k':
-        $this->mapType = 'G_SATELLITE_MAP';
-        break;
-      case 'h':
-        $this->mapType = 'G_HYBRID_MAP';
-        break;
-    }
   }
 }
diff --git a/apps/pc_frontend/modules/googlemaps/templates/indexSuccess.php b/apps/pc_frontend/modules/googlemaps/templates/indexSuccess.php
index 558334bcb..d833dca61 100644
--- a/apps/pc_frontend/modules/googlemaps/templates/indexSuccess.php
+++ b/apps/pc_frontend/modules/googlemaps/templates/indexSuccess.php
@@ -4,13 +4,12 @@
 <head>
 <?php include_http_metas() ?>
 <?php include_metas() ?>
-<title><?php echo ($op_config['sns_title']) ? $op_config['sns_title'] : $op_config['sns_name'] ?></title>
-<?php echo $op_config->get('pc_html_head') ?>
-<?php if (isset($op_config['google_AJAX_search_api_key']) && isset($op_config['google_maps_api_key'])): ?>
-<?php use_javascript('http://www.google.co.jp/uds/api?file=uds.js&v=1.0&key='.$op_config['google_AJAX_search_api_key']) ?>
-<?php use_javascript('http://maps.google.co.jp/maps?file=api&v=2.x&key='.$op_config['google_maps_api_key']) ?>
-<?php
-$googlemaps_script = <<<EOM
+<?php include_title() ?>
+<?php $apiKey = !empty($op_config['google_maps_api_key']) ? '&amp;'.$op_config['google_maps_api_key'] : '' ?>
+<script type="text/javascript" src="//maps.googleapis.com/maps/api/js?v=3.exp&amp;sensor=false<?php echo $apiKey ?>"></script>
+<script type="text/javascript">
+//<![CDATA[
+
 // parse request parameters
 var request = {
   x: "", y: "", z: "", q: ""
@@ -27,56 +26,57 @@
   }
   request[n] = v;
 }
-var MapType = %s;  // It is not user-inputed values
 
-var gls;
-var gMap;
-function OnLocalSearch() {
-    if (!gls.results) return;
-    var first = gls.results[0];
-    var point = new GLatLng(parseFloat(first.lat), parseFloat(first.lng));
-    var zoom = request.z;
-    gMap.addControl(new GSmallMapControl());
-    gMap.addControl(new GMapTypeControl());
-    gMap.setMapType(MapType);
-    gMap.setCenter(point, zoom);
-    var marker = new GMarker(point);
-    gMap.addOverlay(marker);
-    geocoder = new GClientGeocoder();
-}
-function load() {
-    if (GBrowserIsCompatible()) {
-        if ((request.x == 0) && (request.y == 0)){
-            gMap = new GMap2(document.getElementById('map'));
-            gMap.addControl(new GSmallMapControl());
-            gMap.addControl(new GMapTypeControl());
-            gMap.setCenter(new GLatLng(0, 0));
-            gls = new GlocalSearch();
-            gls.setCenterPoint(gMap);
-            gls.setSearchCompleteCallback(null, OnLocalSearch);
-            var q = request.q;
-            gls.execute(q);
-        } else {
-            var point = new GLatLng(request.x, request.y);
-            var zoom = request.z;
-            gMap = new GMap2(document.getElementById('map'));
-            gMap.addControl(new GSmallMapControl());
-            gMap.addControl(new GMapTypeControl());
-            gMap.setCenter(point, zoom);
-            gMap.setMapType(MapType);
-            var marker = new GMarker(point);
-            gMap.addOverlay(marker);
-            geocoder = new GClientGeocoder();
-        }
-    }
-}
-EOM;
-echo javascript_tag(sprintf($googlemaps_script, $mapType)); ?>
-<?php endif; ?>
-<?php include_stylesheets() ?>
-<?php include_javascripts() ?>
+google.maps.event.addDomListener(window, 'load', function() {
+  'use strict';
+
+  var mapCenter = new google.maps.LatLng(request.x, request.y)
+  var mapType = google.maps.MapTypeId.ROADMAP
+
+  switch (request.t) {
+    case 'k':
+      mapType = google.maps.MapTypeId.SATELLITE
+      break
+    case 'h':
+      mapType = google.maps.MapTypeId.HYBRID
+      break
+  }
+
+  var map = new google.maps.Map(document.getElementById('map'), {
+    zoom: request.z,
+    center: mapCenter,
+    mapTypeId: mapType
+  })
+
+  if ('' === request.q) {
+    var marker = new google.maps.Marker({
+      map: map,
+      position: mapCenter
+    })
+  }
+  else {
+    // Geocoding
+    var geocoder = new google.maps.Geocoder()
+    geocoder.geocode({'address': request.q}, function(results, status) {
+      if (status !== google.maps.GeocoderStatus.OK) {
+        alert('ジオコーディングに失敗しました: ' + status)
+        return
+      }
+
+      var resultPos = results[0].geometry.location
+      map.setCenter(resultPos)
+      var marker = new google.maps.Marker({
+        map: map,
+        position: resultPos
+      })
+    })
+  }
+})
+
+//]]>
+</script>
 </head>
-<body onload="load()" onunload="GUnload()" id="page_googlemaps_index" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
+<body id="page_googlemaps_index" class="<?php echo opToolkit::isSecurePage() ? 'secure_page' : 'insecure_page' ?>">
 <div id="map" style="width: 300px; height: 320px"></div>
 </body>
 </html>

From 273d4013113611a20fb5b41086c7bfaaa00c2da0 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 12 Dec 2013 14:46:43 +0900
Subject: [PATCH 421/630] fix pattern for Google Maps url in cmd scripts (fixes
 #3523 BP from #3521) (cherry picked from commit
 c588f6f2a338cd4bbe4a058f7c4d392cc0fdf521)

patch from https://redmine.openpne.jp/issues/1755#note-4
---
 web/cmd/maps.google.co.jp.js | 4 ++--
 web/cmd/maps.google.com.js   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/cmd/maps.google.co.jp.js b/web/cmd/maps.google.co.jp.js
index a38b2c142..99ede7838 100644
--- a/web/cmd/maps.google.co.jp.js
+++ b/web/cmd/maps.google.co.jp.js
@@ -1,6 +1,6 @@
 function url2cmd(url, googlemapsUrl) {
-  var maps_google_co_jp_maps = url.match(/^http:\/\/maps\.google\.co\.jp\/maps\?(.+)/);
-  var maps_google_co_jp = url.match(/^http:\/\/maps\.google\.co\.jp\/\?(.+)/);
+  var maps_google_co_jp_maps = url.match(/^https?:\/\/maps\.google\.co\.jp\/maps\?(.+)/);
+  var maps_google_co_jp = url.match(/^https?:\/\/maps\.google\.co\.jp\/\?(.+)/);
 
   if (maps_google_co_jp_maps || maps_google_co_jp) {
      var id = RegExp.$1;
diff --git a/web/cmd/maps.google.com.js b/web/cmd/maps.google.com.js
index 9de34e3d1..e727c3cf2 100644
--- a/web/cmd/maps.google.com.js
+++ b/web/cmd/maps.google.com.js
@@ -1,6 +1,6 @@
 function url2cmd(url, googlemapsUrl) {
-  var maps_google_com_maps = url.match(/^http:\/\/maps\.google\.com\/maps\?(.+)/);
-  var maps_google_com = url.match(/^http:\/\/maps\.google\.com\/\?(.+)/);
+  var maps_google_com_maps = url.match(/^https?:\/\/maps\.google\.com\/maps\?(.+)/);
+  var maps_google_com = url.match(/^https?:\/\/maps\.google\.com\/\?(.+)/);
 
   if (maps_google_com_maps || maps_google_com) {
      var id = RegExp.$1;

From d17d3d6e8cecdc1f305f126c0613b9eab149903a Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Fri, 24 Jan 2014 14:42:39 +0900
Subject: [PATCH 422/630] add default/customizingCss action to
 op_ssl_selectable_actions (fixes #3499 BP from #3475) (cherry picked from
 commit 21d2d6d43741c72b82d4ffca86a96525c15d9ed7)

---
 config/OpenPNE.yml.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/OpenPNE.yml.sample b/config/OpenPNE.yml.sample
index 088367614..99ffb9500 100644
--- a/config/OpenPNE.yml.sample
+++ b/config/OpenPNE.yml.sample
@@ -140,7 +140,7 @@ ssl_selectable_actions:
 
   # PC 版設定
   # for pc_frontend
-  pc_frontend: []
+  pc_frontend: ["default/customizingCss"]
 
   # 携帯版設定
   # for mobile_frontend

From 724004b499cdc658b5d9975abbc6f6b1988e2688 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Fri, 24 Jan 2014 14:48:15 +0900
Subject: [PATCH 423/630] revoke automatic login cookie before registration
 (fixes #3497 BP from #3416) (cherry picked from commit
 2cac338f0edd68b57d534413e54d4b4380237a83)

---
 lib/action/opMemberAction.class.php | 2 +-
 lib/user/opSecurityUser.class.php   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/action/opMemberAction.class.php b/lib/action/opMemberAction.class.php
index e0aa5b32f..56f2957f6 100644
--- a/lib/action/opMemberAction.class.php
+++ b/lib/action/opMemberAction.class.php
@@ -161,7 +161,7 @@ public function executeLogout(opWebRequest $request)
 
   public function executeRegister(opWebRequest $request)
   {
-    $this->getUser()->clearSessionData();
+    $this->getUser()->logout();
     $member = $this->getUser()->setRegisterToken($request['token']);
 
     $this->forward404Unless($member && !$this->getUser()->isSNSMember() && $this->getUser()->isInvited());
diff --git a/lib/user/opSecurityUser.class.php b/lib/user/opSecurityUser.class.php
index 73236b93b..b5a0e1b86 100644
--- a/lib/user/opSecurityUser.class.php
+++ b/lib/user/opSecurityUser.class.php
@@ -49,6 +49,8 @@ public function getMemberId($inactive = false)
 
   public function setMemberId($memberId)
   {
+    $this->serializedMember = null;
+
     return $this->setAttribute('member_id', $memberId, 'opSecurityUser');
   }
 

From 158ea21c3c333d0c6d8d096f8fa5f85b4bed00d7 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Fri, 24 Jan 2014 14:48:50 +0900
Subject: [PATCH 424/630] use empty string to clear member cache (fixes #3497
 BP from #3416) (cherry picked from commit
 eb5fe39f5619e7bcac973ca61bd32a94bfa28090)

---
 lib/user/opSecurityUser.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/user/opSecurityUser.class.php b/lib/user/opSecurityUser.class.php
index b5a0e1b86..a5939f02c 100644
--- a/lib/user/opSecurityUser.class.php
+++ b/lib/user/opSecurityUser.class.php
@@ -49,7 +49,7 @@ public function getMemberId($inactive = false)
 
   public function setMemberId($memberId)
   {
-    $this->serializedMember = null;
+    $this->serializedMember = '';
 
     return $this->setAttribute('member_id', $memberId, 'opSecurityUser');
   }

From 329244194d86c7eb7be8010670bfa66ecaa1264f Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Fri, 24 Jan 2014 14:49:20 +0900
Subject: [PATCH 425/630] revoke automatic login cookie on registration pages
 using register_token (fixes #3497 BP from #3416) (cherry picked from commit
 8fbdf778cd6133103bbf08a261928893a8c2eb0d)

---
 lib/action/opMemberAction.class.php | 1 -
 lib/user/opSecurityUser.class.php   | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/action/opMemberAction.class.php b/lib/action/opMemberAction.class.php
index 56f2957f6..fc1542aed 100644
--- a/lib/action/opMemberAction.class.php
+++ b/lib/action/opMemberAction.class.php
@@ -161,7 +161,6 @@ public function executeLogout(opWebRequest $request)
 
   public function executeRegister(opWebRequest $request)
   {
-    $this->getUser()->logout();
     $member = $this->getUser()->setRegisterToken($request['token']);
 
     $this->forward404Unless($member && !$this->getUser()->isSNSMember() && $this->getUser()->isInvited());
diff --git a/lib/user/opSecurityUser.class.php b/lib/user/opSecurityUser.class.php
index a5939f02c..c10aa2e1f 100644
--- a/lib/user/opSecurityUser.class.php
+++ b/lib/user/opSecurityUser.class.php
@@ -423,6 +423,8 @@ public function setIsSNSRegisterFinish($isSNSRegisterFinish)
 
   public function setRegisterToken($token)
   {
+    $this->logout();
+
     if ('MailAddress' === $this->getAuthAdapter()->getAuthModeName())
     {
       $mailTypes = array("pc_address", "pc_address_pre", "mobile_address", "mobile_address_pre");

From 7902757a9ef97259a8558a91291dc555d969fcfb Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 13 Feb 2014 20:14:34 +0900
Subject: [PATCH 426/630] version 3.8.10

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 80a77e42f..f242b82ff 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.10-dev');
+  define('OPENPNE_VERSION', '3.8.10');
 }

From 77cb254bfc49e3f8bba941eabb79ddd371442701 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 13 Feb 2014 20:17:14 +0900
Subject: [PATCH 427/630] started to development of OpenPNE 3.8.11

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index f242b82ff..74838c4f0 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.10');
+  define('OPENPNE_VERSION', '3.8.11-dev');
 }

From 2c4e357eec06de37454b53433211dd9febfcc352 Mon Sep 17 00:00:00 2001
From: AkihiroKOBAYASHI <sun.moon.bow.reverse7@gmail.com>
Date: Mon, 7 Apr 2014 17:58:55 +0900
Subject: [PATCH 428/630] able to read exif data and orient the direction to
 repair of the uploaded image(fixed #3564)

---
 lib/model/doctrine/File.class.php | 57 ++++++++++++++++++++++++++++---
 1 file changed, 53 insertions(+), 4 deletions(-)

diff --git a/lib/model/doctrine/File.class.php b/lib/model/doctrine/File.class.php
index ec0c3f672..213a205e4 100644
--- a/lib/model/doctrine/File.class.php
+++ b/lib/model/doctrine/File.class.php
@@ -57,18 +57,68 @@ public function setFromValidatedFile(sfValidatedFile $obj)
     $this->setFileBin($bin);
   }
 
-  public function save(Doctrine_Connection $conn = null)
+  private function readOrientation()
   {
-    $this->setFilesize(strlen($this->FileBin->bin));
+    $cls = exif_read_data("data://image/jpeg;base64,".base64_encode($this->FileBin->bin));
+    return $cls['Orientation'];
+  }
+
+  private function createOrientedImage($exif)
+  {
+    $image = imagecreatefromstring($this->FileBin->bin);
+    switch ($exif)
+    {
+      // rotate 180 degrees
+      case 3:
+        $image = imagerotate($image, 180, 0);
+        break;
+      // rotate 90 degrees
+      case 6:
+        $imagewidth = imagesy($image);
+        $imageheight = imagesx($image);
+        $image = imagerotate($image, -90, 0);
+        imagecopyresampled ($image, $image, 0, 0, (imagesx($image) - $imagewidth)/2, (imagesy($image) - $imageheight)/2, $imagewidth, $imageheight, $imagewidth, $imageheight);
+        break;
+      // rotate 270 degrees
+      case 8:
+        $imagewidth = imagesy($image);
+        $imageheight = imagesx($image);
+        $image = imagerotate($image, 90, 0);
+        imagecopyresampled ($image, $image, 0, 0, (imagesx($image) - $imagewidth)/2, (imagesy($image) - $imageheight)/2, $imagewidth, $imageheight, $imagewidth, $imageheight);
+        break;
+      default:
+        break;
+    }
+    ob_start();
+    imagejpeg($image);
+    $ei = ob_get_contents();
+    ob_end_clean();
+
+    return $ei;
+  }
 
+  private function setOrient()
+  {
+      $type = $this->getType();
+      if ('image/jpeg' === $type)
+      {
+        $exif = $this->readOrientation();
+        $ei = $this->createOrientedImage($exif);
+        $this->getFileBin()->setBin($ei);
+      }
+  }
+
+  public function save(Doctrine_Connection $conn = null)
+  {
     if ($this->isImage())
     {
       $class = sfImageHandler::getStorageClassName();
       $this->setName(call_user_func(array($class, 'getFilenameToSave'), $this->getName()), $class);
-
       $storage = call_user_func(array($class, 'create'), $this, $class);
+      $this->setOrient();
       $storage->saveBinary($this->getFileBin());
     }
+    $this->setFilesize(strlen($this->FileBin->bin));
 
     return parent::save($conn);
   }
@@ -81,7 +131,6 @@ public function delete(Doctrine_Connection $conn = null)
       $storage = call_user_func(array($class, 'create'), $this, $class);
       $storage->deleteBinary();
     }
-
     return parent::delete($conn);
   }
 }

From 2f5df30b538ae77983bafc14a3e092393441b28c Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Mon, 7 Apr 2014 18:57:10 +0900
Subject: [PATCH 429/630] fixed to apply 'op_mail_envelope_from' config for
 sendmail transport (refs #3582, BP from #3358)

---
 lib/util/opMailSend.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util/opMailSend.class.php b/lib/util/opMailSend.class.php
index c7db8212b..f0fbcb96b 100644
--- a/lib/util/opMailSend.class.php
+++ b/lib/util/opMailSend.class.php
@@ -32,7 +32,7 @@ public static function initialize()
         $tr = new Zend_Mail_Transport_Smtp($host, sfConfig::get('op_mail_smtp_config', array()));
         Zend_Mail::setDefaultTransport($tr);
       }
-      elseif ($envelopeFrom = sfConfig::get('op_mail_envelope_from') && !ini_get('safe_mode'))
+      elseif (($envelopeFrom = sfConfig::get('op_mail_envelope_from')) && !ini_get('safe_mode'))
       {
         $tr = new Zend_Mail_Transport_Sendmail('-f'.$envelopeFrom);
         Zend_Mail::setDefaultTransport($tr);

From 049b5f1c94e7955b3fbcb5cd76d1799ecab23f6f Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Mon, 7 Apr 2014 19:01:29 +0900
Subject: [PATCH 430/630] removed useless setReturnPath() method call (refs
 #3582, BP from #3358)

---
 lib/util/opMailSend.class.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/lib/util/opMailSend.class.php b/lib/util/opMailSend.class.php
index f0fbcb96b..8b9324b76 100644
--- a/lib/util/opMailSend.class.php
+++ b/lib/util/opMailSend.class.php
@@ -215,11 +215,6 @@ public static function execute($subject, $to, $from, $body)
       ->setSubject(mb_encode_mimeheader($subject, 'iso-2022-jp'))
       ->setBodyText(mb_convert_encoding($body, 'JIS', 'UTF-8'), 'iso-2022-jp', Zend_Mime::ENCODING_7BIT);
 
-    if ($envelopeFrom = sfConfig::get('op_mail_envelope_from'))
-    {
-      $mailer->setReturnPath($envelopeFrom);
-    }
-
     $result = $mailer->send();
 
     opApplicationConfiguration::unregisterZend();

From 52facf66cb6f778e109584285938a3c1ebd3172b Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 10 Apr 2014 17:14:26 +0900
Subject: [PATCH 431/630] version 3.8.11

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 74838c4f0..a806b51fd 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.11-dev');
+  define('OPENPNE_VERSION', '3.8.11');
 }

From 8a1038ca2315a30c5199c60b7a699e1ec54a490b Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Thu, 10 Apr 2014 17:15:47 +0900
Subject: [PATCH 432/630] started to development of OpenPNE 3.8.12

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index a806b51fd..640d73060 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.11');
+  define('OPENPNE_VERSION', '3.8.12-dev');
 }

From 63ead5f0b5e0f96cdad5efdb5c8a80b34cb84c55 Mon Sep 17 00:00:00 2001
From: amashige <amashige@tejimaya.com>
Date: Mon, 23 Jun 2014 20:24:12 +0900
Subject: [PATCH 433/630] Fixed slave can't get i18n behavior fields if
 replication is active. (refs #3629, BP from #1599)

---
 .../vendor/doctrine/Doctrine/Record/Generator.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/Generator.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/Generator.php
index 728207ee0..a06f136ac 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/Generator.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/Generator.php
@@ -32,6 +32,8 @@
  */
 abstract class Doctrine_Record_Generator extends Doctrine_Record_Abstract
 {
+    protected static $initializedTables = array();
+
     /**
      * _options
      *
@@ -160,12 +162,13 @@ public function initialize(Doctrine_Table $table)
             $this->_options['tableName'] = str_replace('%TABLE%', $ownerTableName, $tableName);
         }
 
-        // check that class doesn't exist (otherwise we cannot create it)
-        if ($this->_options['generateFiles'] === false && class_exists($this->_options['className'])) {
-            $this->_table = Doctrine_Core::getTable($this->_options['className']);
-            return false;
+        $currentTableHash = spl_object_hash($table);
+        if (!empty(self::$initializedTables[$currentTableHash])) {
+            return null;
         }
 
+        self::$initializedTables[$currentTableHash] = true;
+
         $this->buildTable();
 
         $fk = $this->buildForeignKeys($this->_options['table']);
@@ -177,7 +180,9 @@ public function initialize(Doctrine_Table $table)
         $this->setTableDefinition();
         $this->setUp();
 
-        $this->generateClassFromTable($this->_table);
+        if ($this->_options['generateFiles'] === true || !class_exists($this->_options['className'])) {
+            $this->generateClassFromTable($this->_table);
+        }
 
         $this->buildChildDefinitions();
 

From 733605a956e735fb1d31ff92fdb42caff52d5253 Mon Sep 17 00:00:00 2001
From: amashige <amashige@tejimaya.com>
Date: Mon, 23 Jun 2014 18:53:55 +0900
Subject: [PATCH 434/630] fix imperfections of existence check of the model
 class in opPluginInstallTask::execute() (refs #3631, BP from #1606)

---
 lib/task/opPluginInstallTask.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/task/opPluginInstallTask.class.php b/lib/task/opPluginInstallTask.class.php
index e4426bebe..ccdebdcc3 100644
--- a/lib/task/opPluginInstallTask.class.php
+++ b/lib/task/opPluginInstallTask.class.php
@@ -60,7 +60,7 @@ protected function isSnsConfigTableExists()
   {
     try
     {
-      if (class_exists('SnsConfigTable'))
+      if (class_exists('SnsConfigTable') && class_exists('BaseSnsConfigTable'))
       {
         return Doctrine_Manager::connection()
           ->import

From b7886fa204e0f034a64a62fd0def32527f51faec Mon Sep 17 00:00:00 2001
From: amashige <amashige@tejimaya.com>
Date: Mon, 23 Jun 2014 20:04:41 +0900
Subject: [PATCH 435/630] fixed removal of trailing slash is not enough. (refs
 3633, BP from #1632)

---
 lib/config/opApplicationConfiguration.class.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/config/opApplicationConfiguration.class.php b/lib/config/opApplicationConfiguration.class.php
index f4647b7ed..527fe5da1 100644
--- a/lib/config/opApplicationConfiguration.class.php
+++ b/lib/config/opApplicationConfiguration.class.php
@@ -631,16 +631,13 @@ protected function getAppRouting($application)
 
   protected function getAppScriptName($application, $env, $prefix, $isNoScriptName = false)
   {
+    $prefix = preg_replace('/(\/)$/', '', $prefix);
+
     if ($isNoScriptName)
     {
       return $prefix;
     }
 
-    if ('/' === $prefix)
-    {
-      $prefix = '';
-    }
-
     $name = $prefix.'/'.$application;
     if ($env !== 'prod')
     {

From f4b70b11b0660797cd51449216684da69d65f1bb Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Thu, 3 Jul 2014 15:54:19 +0900
Subject: [PATCH 436/630] fixed sortable of the community categories (fixes
 #3635, BP from #1859)

---
 .../community/actions/actions.class.php       |  5 +--
 .../doctrine/CommunityFormFilter.class.php    | 18 +++++++----
 lib/form/doctrine/CommunityForm.class.php     |  8 ++---
 .../doctrine/CommunityCategoryTable.class.php | 31 +++++++++++++++++++
 test/fixtures/common/test_data.yml            |  5 +++
 .../doctrine/CommunityCategoryTableTest.php   | 16 +++++++++-
 6 files changed, 66 insertions(+), 17 deletions(-)

diff --git a/apps/mobile_frontend/modules/community/actions/actions.class.php b/apps/mobile_frontend/modules/community/actions/actions.class.php
index dd5177d05..5fb35d0a0 100644
--- a/apps/mobile_frontend/modules/community/actions/actions.class.php
+++ b/apps/mobile_frontend/modules/community/actions/actions.class.php
@@ -87,10 +87,7 @@ public function executeSearch(opWebRequest $request)
     $this->pager->setPage($request->getParameter('page', 1));
     $this->pager->init();
 
-    $this->categorys = Doctrine::getTable('CommunityCategory')
-      ->createQuery()
-      ->where('lft > 1')
-      ->execute();
+    $this->categorys = Doctrine::getTable('CommunityCategory')->getAllChildren();
 
     return sfView::SUCCESS;
   }
diff --git a/lib/filter/doctrine/CommunityFormFilter.class.php b/lib/filter/doctrine/CommunityFormFilter.class.php
index aa260038d..748495a9c 100644
--- a/lib/filter/doctrine/CommunityFormFilter.class.php
+++ b/lib/filter/doctrine/CommunityFormFilter.class.php
@@ -24,14 +24,20 @@ public function __construct($defaults = array(), $options = array(), $CSRFSecret
 
   public function configure()
   {
-    $q = Doctrine::getTable('CommunityCategory')->getAllChildrenQuery();
+    $choices = array();
+    $choices[''] = sfContext::getInstance()->getI18N()->__('All categories', array(), 'form_community');
+
+    $categories = Doctrine::getTable('CommunityCategory')->getAllChildren();
+    foreach ($categories as $category)
+    {
+      $choices[$category->getId()] = $category->getName();
+    }
+
     $widgets = array(
       'name'                  => new sfWidgetFormInput(),
-      'community_category_id' => new sfWidgetFormDoctrineChoice(array(
-        'model'       => 'CommunityCategory',
-        'add_empty'   => sfContext::getInstance()->getI18N()->__('All categories', array(), 'form_community'),
-        'query'    => $q,
-        'default' => 0)),
+      'community_category_id' => new sfWidgetFormChoice(array(
+        'choices'     => $choices,
+        'default'     => '')),
     );
 
     $validators = array(
diff --git a/lib/form/doctrine/CommunityForm.class.php b/lib/form/doctrine/CommunityForm.class.php
index a834c0b0f..6c012d780 100644
--- a/lib/form/doctrine/CommunityForm.class.php
+++ b/lib/form/doctrine/CommunityForm.class.php
@@ -27,12 +27,8 @@ public function configure()
     $this->widgetSchema->setLabel('name', '%community% Name');
     $this->setValidator('name', new opValidatorString(array('max_length' => 64, 'trim' => true)));
 
-    $q = Doctrine::getTable('CommunityCategory')->getAllChildrenQuery();
-    if (1 != sfContext::getInstance()->getUser()->getMemberId())
-    {
-      $q->andWhere('is_allow_member_community = 1');
-    }
-    $communityCategories = $q->execute();
+    $isAllowMemberCommunity = 1 != sfContext::getInstance()->getUser()->getMemberId();
+    $communityCategories = Doctrine::getTable('CommunityCategory')->getAllChildren($isAllowMemberCommunity);
     if (0 < count($communityCategories))
     {
       $choices = array();
diff --git a/lib/model/doctrine/CommunityCategoryTable.class.php b/lib/model/doctrine/CommunityCategoryTable.class.php
index dd3add399..739bbe9f4 100644
--- a/lib/model/doctrine/CommunityCategoryTable.class.php
+++ b/lib/model/doctrine/CommunityCategoryTable.class.php
@@ -48,4 +48,35 @@ public function getAllChildrenQuery($sort = true)
 
     return $q;
   }
+
+  public function getAllChildren($checkIsAllowMemberCommunity = false)
+  {
+    $roots = $this->retrieveAllRoots();
+    $children = $this->retrieveAllChildren();
+
+    // sort by root category
+    $temp = array();
+    foreach ($children as $child)
+    {
+      if ($checkIsAllowMemberCommunity && !$child->getIsAllowMemberCommunity())
+      {
+        continue;
+      }
+      $temp[$child->getTreeKey()][] = $child;
+    }
+
+    $data = array();
+    foreach ($roots as $root)
+    {
+      if (isset($temp[$root->getId()]))
+      {
+        $data = array_merge($data, $temp[$root->getId()]);
+      }
+    }
+
+    $collection = new Doctrine_Collection($this);
+    $collection->setData($data);
+
+    return $collection;
+  }
 }
diff --git a/test/fixtures/common/test_data.yml b/test/fixtures/common/test_data.yml
index 7f36b331a..be5a0d97e 100644
--- a/test/fixtures/common/test_data.yml
+++ b/test/fixtures/common/test_data.yml
@@ -491,6 +491,11 @@ CommunityCategory:
     tree_key: 1
     is_allow_member_community: 1
     sort_order: 1
+  community_category_5:
+    name: "CategoryC"
+    tree_key: 2
+    is_allow_member_community: 0
+    sort_order: 3
 
 CommunityConfig:
   community_1_description:
diff --git a/test/unit/model/doctrine/CommunityCategoryTableTest.php b/test/unit/model/doctrine/CommunityCategoryTableTest.php
index 095efe2c1..5bb6ee076 100644
--- a/test/unit/model/doctrine/CommunityCategoryTableTest.php
+++ b/test/unit/model/doctrine/CommunityCategoryTableTest.php
@@ -3,7 +3,7 @@
 include_once dirname(__FILE__) . '/../../../bootstrap/unit.php';
 include_once dirname(__FILE__) . '/../../../bootstrap/database.php';
 
-$t = new lime_test(13, new lime_output_color());
+$t = new lime_test(19, new lime_output_color());
 
 $table = Doctrine::getTable('CommunityCategory');
 
@@ -39,3 +39,17 @@
 $t->isa_ok($table->getAllChildrenQuery(), 'opDoctrineQuery');
 $t->is($table->getAllChildrenQuery(false)->getDql(), ' FROM CommunityCategory WHERE lft > 1');
 $t->is($table->getAllChildrenQuery(true)->getDql(), ' FROM CommunityCategory WHERE lft > 1 ORDER BY sort_order');
+
+//------------------------------------------------------------
+$t->diag('CommunityCategoryTable::getAllChildren()');
+$categories = $table->getAllChildren();
+$t->isa_ok($categories, 'Doctrine_Collection');
+$t->is(count($categories), 3);
+
+$categories = $table->getAllChildren(false);
+$t->isa_ok($categories, 'Doctrine_Collection');
+$t->is(count($categories), 3);
+
+$categories = $table->getAllChildren(true);
+$t->isa_ok($categories, 'Doctrine_Collection');
+$t->is(count($categories), 2);

From 267bc856188e92f953abd21f61df64331946749b Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Thu, 3 Jul 2014 16:31:36 +0900
Subject: [PATCH 437/630] avoid incompatible query when not using MySQL (fixes
 #3637, BP from #1984)

---
 test/bootstrap/database.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/bootstrap/database.php b/test/bootstrap/database.php
index 7d50f7533..d6ef5f5a5 100644
--- a/test/bootstrap/database.php
+++ b/test/bootstrap/database.php
@@ -18,7 +18,10 @@
 new sfDatabaseManager($configuration);
 
 $conn = opDoctrineQuery::getMasterConnectionDirect();
-$conn->exec('SET FOREIGN_KEY_CHECKS = 0');
+if ($conn instanceof Doctrine_Connection_Mysql)
+{
+  $conn->exec('SET FOREIGN_KEY_CHECKS = 0');
+}
 
 $task = new sfDoctrineBuildTask($configuration->getEventDispatcher(), new sfFormatter());
 $task->setConfiguration($configuration);

From da9033d9f009851fbc0d51fb7f4a92ae73085236 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Fri, 4 Jul 2014 14:49:39 +0900
Subject: [PATCH 438/630] fix the permissions of file that are marked
 unnecessarily as executable (fixes #3634, BP from #1839)

---
 .../modules/community/templates/_submenu.php        |   0
 .../3.1.3/021_add_is_login_rejected_column.php      |   0
 .../sfValidatorDoctrineNestedSetLevel.class.php     |   0
 lib/plugins/sfFormExtraPlugin/web/images/next.png   | Bin
 .../sfFormExtraPlugin/web/images/previous.png       | Bin
 lib/vendor/PEAR/Amazon/Amazon.php                   |   0
 lib/vendor/PEAR/Amazon/HTTP/Request.php             |   0
 lib/vendor/PEAR/Amazon/Net/Socket.php               |   0
 lib/vendor/PEAR/Amazon/Net/URL.php                  |   0
 lib/vendor/PEAR/Amazon/Services/AmazonECS4.php      |   0
 lib/vendor/PEAR/Amazon/XML/Parser.php               |   0
 lib/vendor/PEAR/Amazon/XML/Unserializer.php         |   0
 lib/vendor/Zend/Http/Client/Adapter/Stream.php      |   0
 lib/vendor/Zend/Http/Response/Stream.php            |   0
 .../symfony/data/web/sf/sf_admin/images/add.png     | Bin
 .../symfony/data/web/sf/sf_admin/images/cancel.png  | Bin
 .../data/web/sf/sf_admin/images/default_icon.png    | Bin
 .../symfony/data/web/sf/sf_admin/images/delete.png  | Bin
 .../symfony/data/web/sf/sf_admin/images/edit.png    | Bin
 .../symfony/data/web/sf/sf_admin/images/error.png   | Bin
 .../symfony/data/web/sf/sf_admin/images/filter.png  | Bin
 .../symfony/data/web/sf/sf_admin/images/first.png   | Bin
 .../symfony/data/web/sf/sf_admin/images/last.png    | Bin
 .../symfony/data/web/sf/sf_admin/images/list.png    | Bin
 .../symfony/data/web/sf/sf_admin/images/next.png    | Bin
 .../symfony/data/web/sf/sf_admin/images/ok.png      | Bin
 .../data/web/sf/sf_admin/images/previous.png        | Bin
 .../symfony/data/web/sf/sf_admin/images/reset.png   | Bin
 .../symfony/data/web/sf/sf_admin/images/save.png    | Bin
 .../symfony/data/web/sf/sf_admin/images/tick.png    | Bin
 .../data/web/sf/sf_web_debug/images/config.png      | Bin
 .../data/web/sf/sf_web_debug/images/database.png    | Bin
 .../symfony/data/web/sf/sf_web_debug/images/log.png | Bin
 .../data/web/sf/sf_web_debug/images/memory.png      | Bin
 .../data/web/sf/sf_web_debug/images/time.png        | Bin
 .../vendor/doctrine/Doctrine/Validator/Readonly.php |   0
 .../test/functional/fixtures/data/linked_schema.yml |   0
 .../lib/plugins/sfDoctrinePlugin/web/images/asc.png | Bin
 .../plugins/sfDoctrinePlugin/web/images/default.png | Bin
 .../plugins/sfDoctrinePlugin/web/images/delete.png  | Bin
 .../plugins/sfDoctrinePlugin/web/images/desc.png    | Bin
 .../plugins/sfDoctrinePlugin/web/images/edit.png    | Bin
 .../plugins/sfDoctrinePlugin/web/images/error.png   | Bin
 .../plugins/sfDoctrinePlugin/web/images/first.png   | Bin
 .../plugins/sfDoctrinePlugin/web/images/last.png    | Bin
 .../plugins/sfDoctrinePlugin/web/images/list.png    | Bin
 .../lib/plugins/sfDoctrinePlugin/web/images/new.png | Bin
 .../plugins/sfDoctrinePlugin/web/images/next.png    | Bin
 .../sfDoctrinePlugin/web/images/previous.png        | Bin
 .../plugins/sfDoctrinePlugin/web/images/tick.png    | Bin
 .../lib/task/generator/skeleton/project/symfony     |   0
 .../symfony/test/unit/request/sfRequestTest.php     |   0
 .../web/images/articleList_marker.gif               | Bin
 web/images/deco_op_b.gif                            | Bin
 web/images/deco_op_color.gif                        | Bin
 web/images/deco_op_emoji_au.gif                     | Bin
 web/images/deco_op_emoji_docomo.gif                 | Bin
 web/images/deco_op_emoji_softbank.gif               | Bin
 web/images/deco_op_i.gif                            | Bin
 web/images/deco_op_image.gif                        | Bin
 web/images/deco_op_large.gif                        | Bin
 web/images/deco_op_s.gif                            | Bin
 web/images/deco_op_small.gif                        | Bin
 web/images/deco_op_u.gif                            | Bin
 64 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 apps/pc_backend/modules/community/templates/_submenu.php
 mode change 100755 => 100644 data/migrations/3.1.3/021_add_is_login_rejected_column.php
 mode change 100755 => 100644 lib/plugins/sfFormExtraPlugin/lib/validator/doctrine/sfValidatorDoctrineNestedSetLevel.class.php
 mode change 100755 => 100644 lib/plugins/sfFormExtraPlugin/web/images/next.png
 mode change 100755 => 100644 lib/plugins/sfFormExtraPlugin/web/images/previous.png
 mode change 100755 => 100644 lib/vendor/PEAR/Amazon/Amazon.php
 mode change 100755 => 100644 lib/vendor/PEAR/Amazon/HTTP/Request.php
 mode change 100755 => 100644 lib/vendor/PEAR/Amazon/Net/Socket.php
 mode change 100755 => 100644 lib/vendor/PEAR/Amazon/Net/URL.php
 mode change 100755 => 100644 lib/vendor/PEAR/Amazon/Services/AmazonECS4.php
 mode change 100755 => 100644 lib/vendor/PEAR/Amazon/XML/Parser.php
 mode change 100755 => 100644 lib/vendor/PEAR/Amazon/XML/Unserializer.php
 mode change 100755 => 100644 lib/vendor/Zend/Http/Client/Adapter/Stream.php
 mode change 100755 => 100644 lib/vendor/Zend/Http/Response/Stream.php
 mode change 100755 => 100644 lib/vendor/symfony/data/web/sf/sf_admin/images/add.png
 mode change 100755 => 100644 lib/vendor/symfony/data/web/sf/sf_admin/images/cancel.png
 mode change 100755 => 100644 lib/vendor/symfony/data/web/sf/sf_admin/images/default_icon.png
 mode change 100755 => 100644 lib/vendor/symfony/data/web/sf/sf_admin/images/delete.png
 mode change 100755 => 100644 lib/vendor/symfony/data/web/sf/sf_admin/images/edit.png
 mode change 100755 => 100644 lib/vendor/symfony/data/web/sf/sf_admin/images/error.png
 mode change 100755 => 100644 lib/vendor/symfony/data/web/sf/sf_admin/images/filter.png
 mode change 100755 => 100644 lib/vendor/symfony/data/web/sf/sf_admin/images/first.png
 mode change 100755 => 100644 lib/vendor/symfony/data/web/sf/sf_admin/images/last.png
 mode change 100755 => 100644 lib/vendor/symfony/data/web/sf/sf_admin/images/list.png
 mode change 100755 => 100644 lib/vendor/symfony/data/web/sf/sf_admin/images/next.png
 mode change 100755 => 100644 lib/vendor/symfony/data/web/sf/sf_admin/images/ok.png
 mode change 100755 => 100644 lib/vendor/symfony/data/web/sf/sf_admin/images/previous.png
 mode change 100755 => 100644 lib/vendor/symfony/data/web/sf/sf_admin/images/reset.png
 mode change 100755 => 100644 lib/vendor/symfony/data/web/sf/sf_admin/images/save.png
 mode change 100755 => 100644 lib/vendor/symfony/data/web/sf/sf_admin/images/tick.png
 mode change 100755 => 100644 lib/vendor/symfony/data/web/sf/sf_web_debug/images/config.png
 mode change 100755 => 100644 lib/vendor/symfony/data/web/sf/sf_web_debug/images/database.png
 mode change 100755 => 100644 lib/vendor/symfony/data/web/sf/sf_web_debug/images/log.png
 mode change 100755 => 100644 lib/vendor/symfony/data/web/sf/sf_web_debug/images/memory.png
 mode change 100755 => 100644 lib/vendor/symfony/data/web/sf/sf_web_debug/images/time.png
 mode change 100755 => 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Readonly.php
 mode change 100755 => 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/data/linked_schema.yml
 mode change 100755 => 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/asc.png
 mode change 100755 => 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/default.png
 mode change 100755 => 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/delete.png
 mode change 100755 => 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/desc.png
 mode change 100755 => 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/edit.png
 mode change 100755 => 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/error.png
 mode change 100755 => 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/first.png
 mode change 100755 => 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/last.png
 mode change 100755 => 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/list.png
 mode change 100755 => 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/new.png
 mode change 100755 => 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/next.png
 mode change 100755 => 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/previous.png
 mode change 100755 => 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/tick.png
 mode change 100644 => 100755 lib/vendor/symfony/lib/task/generator/skeleton/project/symfony
 mode change 100755 => 100644 lib/vendor/symfony/test/unit/request/sfRequestTest.php
 mode change 100755 => 100644 plugins/opSkinBasicPlugin/web/images/articleList_marker.gif
 mode change 100755 => 100644 web/images/deco_op_b.gif
 mode change 100755 => 100644 web/images/deco_op_color.gif
 mode change 100755 => 100644 web/images/deco_op_emoji_au.gif
 mode change 100755 => 100644 web/images/deco_op_emoji_docomo.gif
 mode change 100755 => 100644 web/images/deco_op_emoji_softbank.gif
 mode change 100755 => 100644 web/images/deco_op_i.gif
 mode change 100755 => 100644 web/images/deco_op_image.gif
 mode change 100755 => 100644 web/images/deco_op_large.gif
 mode change 100755 => 100644 web/images/deco_op_s.gif
 mode change 100755 => 100644 web/images/deco_op_small.gif
 mode change 100755 => 100644 web/images/deco_op_u.gif

diff --git a/apps/pc_backend/modules/community/templates/_submenu.php b/apps/pc_backend/modules/community/templates/_submenu.php
old mode 100755
new mode 100644
diff --git a/data/migrations/3.1.3/021_add_is_login_rejected_column.php b/data/migrations/3.1.3/021_add_is_login_rejected_column.php
old mode 100755
new mode 100644
diff --git a/lib/plugins/sfFormExtraPlugin/lib/validator/doctrine/sfValidatorDoctrineNestedSetLevel.class.php b/lib/plugins/sfFormExtraPlugin/lib/validator/doctrine/sfValidatorDoctrineNestedSetLevel.class.php
old mode 100755
new mode 100644
diff --git a/lib/plugins/sfFormExtraPlugin/web/images/next.png b/lib/plugins/sfFormExtraPlugin/web/images/next.png
old mode 100755
new mode 100644
diff --git a/lib/plugins/sfFormExtraPlugin/web/images/previous.png b/lib/plugins/sfFormExtraPlugin/web/images/previous.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/PEAR/Amazon/Amazon.php b/lib/vendor/PEAR/Amazon/Amazon.php
old mode 100755
new mode 100644
diff --git a/lib/vendor/PEAR/Amazon/HTTP/Request.php b/lib/vendor/PEAR/Amazon/HTTP/Request.php
old mode 100755
new mode 100644
diff --git a/lib/vendor/PEAR/Amazon/Net/Socket.php b/lib/vendor/PEAR/Amazon/Net/Socket.php
old mode 100755
new mode 100644
diff --git a/lib/vendor/PEAR/Amazon/Net/URL.php b/lib/vendor/PEAR/Amazon/Net/URL.php
old mode 100755
new mode 100644
diff --git a/lib/vendor/PEAR/Amazon/Services/AmazonECS4.php b/lib/vendor/PEAR/Amazon/Services/AmazonECS4.php
old mode 100755
new mode 100644
diff --git a/lib/vendor/PEAR/Amazon/XML/Parser.php b/lib/vendor/PEAR/Amazon/XML/Parser.php
old mode 100755
new mode 100644
diff --git a/lib/vendor/PEAR/Amazon/XML/Unserializer.php b/lib/vendor/PEAR/Amazon/XML/Unserializer.php
old mode 100755
new mode 100644
diff --git a/lib/vendor/Zend/Http/Client/Adapter/Stream.php b/lib/vendor/Zend/Http/Client/Adapter/Stream.php
old mode 100755
new mode 100644
diff --git a/lib/vendor/Zend/Http/Response/Stream.php b/lib/vendor/Zend/Http/Response/Stream.php
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/add.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/add.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/cancel.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/cancel.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/default_icon.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/default_icon.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/delete.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/delete.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/edit.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/edit.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/error.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/error.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/filter.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/filter.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/first.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/first.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/last.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/last.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/list.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/list.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/next.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/next.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/ok.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/ok.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/previous.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/previous.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/reset.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/reset.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/save.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/save.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/tick.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/tick.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/data/web/sf/sf_web_debug/images/config.png b/lib/vendor/symfony/data/web/sf/sf_web_debug/images/config.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/data/web/sf/sf_web_debug/images/database.png b/lib/vendor/symfony/data/web/sf/sf_web_debug/images/database.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/data/web/sf/sf_web_debug/images/log.png b/lib/vendor/symfony/data/web/sf/sf_web_debug/images/log.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/data/web/sf/sf_web_debug/images/memory.png b/lib/vendor/symfony/data/web/sf/sf_web_debug/images/memory.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/data/web/sf/sf_web_debug/images/time.png b/lib/vendor/symfony/data/web/sf/sf_web_debug/images/time.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Readonly.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Readonly.php
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/data/linked_schema.yml b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/data/linked_schema.yml
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/asc.png b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/asc.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/default.png b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/default.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/delete.png b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/delete.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/desc.png b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/desc.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/edit.png b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/edit.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/error.png b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/error.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/first.png b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/first.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/last.png b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/last.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/list.png b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/list.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/new.png b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/new.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/next.png b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/next.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/previous.png b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/previous.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/tick.png b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/tick.png
old mode 100755
new mode 100644
diff --git a/lib/vendor/symfony/lib/task/generator/skeleton/project/symfony b/lib/vendor/symfony/lib/task/generator/skeleton/project/symfony
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/test/unit/request/sfRequestTest.php b/lib/vendor/symfony/test/unit/request/sfRequestTest.php
old mode 100755
new mode 100644
diff --git a/plugins/opSkinBasicPlugin/web/images/articleList_marker.gif b/plugins/opSkinBasicPlugin/web/images/articleList_marker.gif
old mode 100755
new mode 100644
diff --git a/web/images/deco_op_b.gif b/web/images/deco_op_b.gif
old mode 100755
new mode 100644
diff --git a/web/images/deco_op_color.gif b/web/images/deco_op_color.gif
old mode 100755
new mode 100644
diff --git a/web/images/deco_op_emoji_au.gif b/web/images/deco_op_emoji_au.gif
old mode 100755
new mode 100644
diff --git a/web/images/deco_op_emoji_docomo.gif b/web/images/deco_op_emoji_docomo.gif
old mode 100755
new mode 100644
diff --git a/web/images/deco_op_emoji_softbank.gif b/web/images/deco_op_emoji_softbank.gif
old mode 100755
new mode 100644
diff --git a/web/images/deco_op_i.gif b/web/images/deco_op_i.gif
old mode 100755
new mode 100644
diff --git a/web/images/deco_op_image.gif b/web/images/deco_op_image.gif
old mode 100755
new mode 100644
diff --git a/web/images/deco_op_large.gif b/web/images/deco_op_large.gif
old mode 100755
new mode 100644
diff --git a/web/images/deco_op_s.gif b/web/images/deco_op_s.gif
old mode 100755
new mode 100644
diff --git a/web/images/deco_op_small.gif b/web/images/deco_op_small.gif
old mode 100755
new mode 100644
diff --git a/web/images/deco_op_u.gif b/web/images/deco_op_u.gif
old mode 100755
new mode 100644

From 7af834f8ac4e4bde470d8b98bc934e13b7ea5eb7 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Mon, 7 Jul 2014 14:35:28 +0900
Subject: [PATCH 439/630] remove unnecessary executable permission(refs #3634,
 BP from #1839)

---
 web/js/jquery.notify.js | 0
 web/js/op_notify.js     | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 web/js/jquery.notify.js
 mode change 100755 => 100644 web/js/op_notify.js

diff --git a/web/js/jquery.notify.js b/web/js/jquery.notify.js
old mode 100755
new mode 100644
diff --git a/web/js/op_notify.js b/web/js/op_notify.js
old mode 100755
new mode 100644

From df4648528d4d9ef9e072a0cfe7c377dc57ac0ed1 Mon Sep 17 00:00:00 2001
From: amashige <amashige@tejimaya.com>
Date: Mon, 7 Jul 2014 14:43:20 +0900
Subject: [PATCH 440/630] Revert "fix imperfections of existence check of the
 model class in opPluginInstallTask::execute() (refs #3631, BP from #1606)"

This reverts commit 733605a956e735fb1d31ff92fdb42caff52d5253.
---
 lib/task/opPluginInstallTask.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/task/opPluginInstallTask.class.php b/lib/task/opPluginInstallTask.class.php
index ccdebdcc3..e4426bebe 100644
--- a/lib/task/opPluginInstallTask.class.php
+++ b/lib/task/opPluginInstallTask.class.php
@@ -60,7 +60,7 @@ protected function isSnsConfigTableExists()
   {
     try
     {
-      if (class_exists('SnsConfigTable') && class_exists('BaseSnsConfigTable'))
+      if (class_exists('SnsConfigTable'))
       {
         return Doctrine_Manager::connection()
           ->import

From af740041742aeb864ed95ca5ef2f9430c2474af9 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Tue, 8 Jul 2014 16:19:09 +0900
Subject: [PATCH 441/630] updated the mobile_ip_address list for release
 2014/05/09 (fixes #3607, BP from #3606)

---
 lib/config/config/mobile_ip_address.yml | 27 +++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/lib/config/config/mobile_ip_address.yml b/lib/config/config/mobile_ip_address.yml
index c778fbca9..4f763c890 100644
--- a/lib/config/config/mobile_ip_address.yml
+++ b/lib/config/config/mobile_ip_address.yml
@@ -1,5 +1,5 @@
 ######################################
-# Copyright 2005-2013 OpenPNE Project (http://www.openpne.jp/)
+# Copyright 2005-2014 OpenPNE Project (http://www.openpne.jp/)
 # 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,9 +15,8 @@
 ######################################
 
 ######################################
-# 2013/09/02 リリース版
-# 2013/08 のau IPアドレス帯域削除対応
-# 2013/09 のau IPアドレス帯域追加対応
+# 2014/05/09 リリース版
+# 2014/05 のau IPアドレス帯域追加対応
 ######################################
 
 # DoCoMo (2010/06/24更新)
@@ -32,9 +31,25 @@ docomo:
   - 210.153.84.0/24
   - 210.153.86.0/24
 
-# au 2011年夏モデル以前 (2013/09/02更新)
+# au 2011年夏モデル以前(2014/05/09更新)
 # http://www.au.kddi.com/ezfactory/tec/spec/ezsava_ip.html
 ezweb:
+  - 27.90.136.0/27
+  - 27.90.136.32/27
+  - 27.90.136.64/27
+  - 27.90.136.96/27
+  - 27.90.136.128/27
+  - 27.90.136.160/27
+  - 27.90.136.192/27
+  - 27.90.136.224/27
+  - 27.90.137.0/27
+  - 27.90.137.32/27
+  - 27.90.137.64/27
+  - 27.90.137.96/27
+  - 27.90.137.128/27
+  - 27.90.137.160/27
+  - 27.90.137.192/27
+  - 27.90.137.224/27
   - 61.117.2.32/29
   - 61.117.2.40/29
   - 111.86.141.64/26
@@ -220,4 +235,4 @@ willcom:
   - 221.119.6.0/24
   - 221.119.7.0/24
   - 221.119.8.0/24
-  - 221.119.9.0/24
+  - 221.119.9.0/24
\ No newline at end of file

From 8c026d43017ae7e330fa7443b42affe179254ad2 Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 10 Jul 2014 15:28:21 +0900
Subject: [PATCH 442/630] version 3.8.12

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 640d73060..1cb96b40a 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.12-dev');
+  define('OPENPNE_VERSION', '3.8.12');
 }

From f78413622bf710fc6b7b07424b00b0be5ef8d1e9 Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 10 Jul 2014 15:34:45 +0900
Subject: [PATCH 443/630] started to development of OpenPNE 3.8.13

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 1cb96b40a..2cead1cf6 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.12');
+  define('OPENPNE_VERSION', '3.8.13-dev');
 }

From 1e334378c8b435be474e33e92cd146edae589ffa Mon Sep 17 00:00:00 2001
From: Kousuke Ebihara <ebihara@php.net>
Date: Thu, 23 Aug 2012 14:02:22 +0900
Subject: [PATCH 444/630] changed to set scaleMethod option only for
 non-truecolor image (e.g. well-used gif images) (refs #3677, BP from #3062)

Conflicts:
	lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php
---
 .../image/generator/sfImageGeneratorGD.class.php    | 13 +++++++++++--
 .../generator/sfImageGeneratorImageTransform.php    |  6 ++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorGD.class.php b/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorGD.class.php
index 2e9f02c6e..a911ed1c6 100644
--- a/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorGD.class.php
+++ b/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorGD.class.php
@@ -20,7 +20,6 @@ class sfImageGeneratorGD extends sfImageGeneratorImageTransform
   protected function creaateTransform()
   {
     $transform = Image_Transform::factory('GD');
-    $transform->setOption('scaleMethod', 'pixel');
     
     return $transform;
   }
@@ -29,9 +28,19 @@ protected function disableInterlace()
   {
     imageinterlace($this->transform->getHandle(), 0);
   }
-  
+
+  protected function configureImageHandle()
+  {
+    if (!imageistruecolor($this->transform->getHandle()))
+    {
+      $this->transform->setOption('scaleMethod', 'pixel');
+    }
+  }
+
   protected function doSave($outputFilename, $type, $quality)
   {
+    $this->configureImageHandle();
+
     $result = $this->transform->crop($this->transform->new_x, $this->transform->new_y);
     if (PEAR::isError($result))
     {
diff --git a/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php b/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php
index 4ad7bcf11..eba3c4cef 100644
--- a/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php
+++ b/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php
@@ -62,6 +62,8 @@ protected function doResize($tmpfilename)
       $this->disableInterlace();
     }
 
+    $this->configureImageHandle();
+
     if ($this->cropToSquare)
     {
       $srcWidth = $this->transform->getImageWidth();
@@ -102,4 +104,8 @@ protected function doResize($tmpfilename)
   abstract protected function creaateTransform();
 
   abstract protected function disableInterlace();
+
+  protected function configureImageHandle()
+  {
+  }
 }

From 0b6c92db2aee5c3881f53d5a19b6242f76409935 Mon Sep 17 00:00:00 2001
From: Kousuke Ebihara <ebihara@php.net>
Date: Thu, 23 Aug 2012 14:05:16 +0900
Subject: [PATCH 445/630] changed not to call crop() method twice (refs #3677,
 BP from #3062)

---
 .../lib/image/generator/sfImageGeneratorGD.class.php     | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorGD.class.php b/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorGD.class.php
index a911ed1c6..c1be74b3d 100644
--- a/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorGD.class.php
+++ b/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorGD.class.php
@@ -41,10 +41,13 @@ protected function doSave($outputFilename, $type, $quality)
   {
     $this->configureImageHandle();
 
-    $result = $this->transform->crop($this->transform->new_x, $this->transform->new_y);
-    if (PEAR::isError($result))
+    if (!$this->transform->resized)
     {
-      throw new sfException($result->getMessage());
+      $result = $this->transform->crop($this->transform->new_x, $this->transform->new_y);
+      if (PEAR::isError($result))
+      {
+        throw new sfException($result->getMessage());
+      }
     }
 
     $result = $this->transform->save($outputFilename, $type, $quality);

From d1e153baf5d1659a47b9634917c611d490eac49c Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 14 Jun 2012 19:45:31 +0900
Subject: [PATCH 446/630] allow sub-admin not to change the category (refs
 #3682, BP from #3072)

---
 lib/form/doctrine/CommunityForm.class.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/form/doctrine/CommunityForm.class.php b/lib/form/doctrine/CommunityForm.class.php
index 6c012d780..02f6d84d2 100644
--- a/lib/form/doctrine/CommunityForm.class.php
+++ b/lib/form/doctrine/CommunityForm.class.php
@@ -36,6 +36,11 @@ public function configure()
       {
         $choices[$category->id] = $category->name;
       }
+      $currentCategory = $this->object->CommunityCategory;
+      if (!is_null($currentCategory) && !isset($choices[$currentCategory->id]))
+      {
+        $choices[$currentCategory->id] = $currentCategory->name;
+      }
       $this->setWidget('community_category_id', new sfWidgetFormChoice(array('choices' => array('' => '') + $choices)));
       $this->widgetSchema->setLabel('community_category_id', '%community% Category');
     }
@@ -97,6 +102,11 @@ public function checkCreatable($validator, $value)
       return $value;
     }
 
+    if ($this->object->community_category_id === $category->id)
+    {
+      return $value;
+    }
+
     throw new sfValidatorError($validator, 'invalid');
   }
 }

From a7c060cbaa026f53fd681d834deea247ecccffe2 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Fri, 22 Jun 2012 00:29:51 +0900
Subject: [PATCH 447/630] fix a regression caused by the CommunityForm changes
 (refs #3682, BP from #3072)

---
 lib/form/doctrine/CommunityForm.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/form/doctrine/CommunityForm.class.php b/lib/form/doctrine/CommunityForm.class.php
index 02f6d84d2..7b9473e08 100644
--- a/lib/form/doctrine/CommunityForm.class.php
+++ b/lib/form/doctrine/CommunityForm.class.php
@@ -36,10 +36,10 @@ public function configure()
       {
         $choices[$category->id] = $category->name;
       }
-      $currentCategory = $this->object->CommunityCategory;
-      if (!is_null($currentCategory) && !isset($choices[$currentCategory->id]))
+      $currentCategoryId = $this->object->community_category_id;
+      if (!is_null($currentCategoryId) && !isset($choices[$currentCategoryId]))
       {
-        $choices[$currentCategory->id] = $currentCategory->name;
+        $choices[$currentCategoryId] = $this->object->CommunityCategory->name;
       }
       $this->setWidget('community_category_id', new sfWidgetFormChoice(array('choices' => array('' => '') + $choices)));
       $this->widgetSchema->setLabel('community_category_id', '%community% Category');

From 72ea4658d2c9022b6cdb09ce8f254c6d0378159d Mon Sep 17 00:00:00 2001
From: amashige <amashige@tejimaya.com>
Date: Tue, 29 Jul 2014 20:50:48 +0900
Subject: [PATCH 448/630] modify unsuitable translation when over post-max-size
 (refs #3683, BP from #3204)

---
 apps/mobile_frontend/i18n/messages.ja.xml      | 2 +-
 apps/mobile_mail_frontend/i18n/messages.ja.xml | 2 +-
 apps/pc_backend/i18n/messages.ja.xml           | 2 +-
 apps/pc_frontend/i18n/api.ja.xml               | 2 +-
 apps/pc_frontend/i18n/messages.ja.xml          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/mobile_frontend/i18n/messages.ja.xml b/apps/mobile_frontend/i18n/messages.ja.xml
index 8eec95a62..94b39c785 100644
--- a/apps/mobile_frontend/i18n/messages.ja.xml
+++ b/apps/mobile_frontend/i18n/messages.ja.xml
@@ -629,7 +629,7 @@
       </trans-unit>
       <trans-unit id="">
         <source>The form submission cannot be processed. It probably means that you have uploaded a file that is too big.</source>
-        <target>送信に失敗しました。</target>
+        <target>フォームの送信に失敗しました。アップロードしたファイルが大きすぎる可能性があります。</target>
       </trans-unit>
       <trans-unit id="">
         <source>"%value%" is not an integer.</source>
diff --git a/apps/mobile_mail_frontend/i18n/messages.ja.xml b/apps/mobile_mail_frontend/i18n/messages.ja.xml
index 01b95c189..7247dc899 100644
--- a/apps/mobile_mail_frontend/i18n/messages.ja.xml
+++ b/apps/mobile_mail_frontend/i18n/messages.ja.xml
@@ -72,7 +72,7 @@
       </trans-unit>
       <trans-unit id="">
         <source>The form submission cannot be processed. It probably means that you have uploaded a file that is too big.</source>
-        <target>送信に失敗しました。</target>
+        <target>フォームの送信に失敗しました。アップロードしたファイルが大きすぎる可能性があります。</target>
       </trans-unit>
       <trans-unit id="">
         <source>"%value%" is not an integer.</source>
diff --git a/apps/pc_backend/i18n/messages.ja.xml b/apps/pc_backend/i18n/messages.ja.xml
index cbea5e553..473c7c6bd 100644
--- a/apps/pc_backend/i18n/messages.ja.xml
+++ b/apps/pc_backend/i18n/messages.ja.xml
@@ -189,7 +189,7 @@
       </trans-unit>
       <trans-unit id="">
         <source>The form submission cannot be processed. It probably means that you have uploaded a file that is too big.</source>
-        <target>送信に失敗しました。</target>
+        <target>フォームの送信に失敗しました。アップロードしたファイルが大きすぎる可能性があります。</target>
       </trans-unit>
       <trans-unit id="">
         <source>"%value%" is not an integer.</source>
diff --git a/apps/pc_frontend/i18n/api.ja.xml b/apps/pc_frontend/i18n/api.ja.xml
index cc250bf45..baa491225 100644
--- a/apps/pc_frontend/i18n/api.ja.xml
+++ b/apps/pc_frontend/i18n/api.ja.xml
@@ -60,7 +60,7 @@
       </trans-unit>
       <trans-unit id="">
         <source>The form submission cannot be processed. It probably means that you have uploaded a file that is too big.</source>
-        <target>送信に失敗しました。</target>
+        <target>フォームの送信に失敗しました。アップロードしたファイルが大きすぎる可能性があります。</target>
       </trans-unit>
       <trans-unit id="">
         <source>"%value%" is not an integer.</source>
diff --git a/apps/pc_frontend/i18n/messages.ja.xml b/apps/pc_frontend/i18n/messages.ja.xml
index 7cfc62254..12b86ed0a 100644
--- a/apps/pc_frontend/i18n/messages.ja.xml
+++ b/apps/pc_frontend/i18n/messages.ja.xml
@@ -725,7 +725,7 @@
       </trans-unit>
       <trans-unit id="">
         <source>The form submission cannot be processed. It probably means that you have uploaded a file that is too big.</source>
-        <target>送信に失敗しました。</target>
+        <target>フォームの送信に失敗しました。アップロードしたファイルが大きすぎる可能性があります。</target>
       </trans-unit>
       <trans-unit id="">
         <source>"%value%" is not an integer.</source>

From db102c15d40f4dd5c904837aa2ceec856294b44a Mon Sep 17 00:00:00 2001
From: kaoru nishizoe <nishizoe@tejimaya.com>
Date: Thu, 6 Dec 2012 20:04:31 +0900
Subject: [PATCH 449/630] (refs #3684, BP from #3220)fixed to parameter is not
 encoded.

---
 lib/user/opSecurityUser.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/user/opSecurityUser.class.php b/lib/user/opSecurityUser.class.php
index c10aa2e1f..dca3cff23 100644
--- a/lib/user/opSecurityUser.class.php
+++ b/lib/user/opSecurityUser.class.php
@@ -279,8 +279,8 @@ public function login($memberId = null)
 
         $uri = '@member_setSid?next_uri='.$uri
              .'&is_remember_login='.(int)$this->getAuthAdapter()->getAuthForm()->getValue('is_remember_me')
-             .'&sid='.$item[0]
-             .'&ts='.$item[1];
+             .'&sid='.urlencode($item[0])
+             .'&ts='.urlencode($item[1]);
       }
 
       $this->setCulture($this->getMember()->getConfig('language', sfConfig::get('sf_default_culture')));

From 40d6c579a8d8a2424c39e4c33829fa7b8a993a27 Mon Sep 17 00:00:00 2001
From: kaoru nishizoe <nishizoe@tejimaya.com>
Date: Mon, 18 Aug 2014 19:19:05 +0900
Subject: [PATCH 450/630] (refs #3684, BP from #3220) modified to use the
 rawurlencode.

---
 lib/user/opSecurityUser.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/user/opSecurityUser.class.php b/lib/user/opSecurityUser.class.php
index dca3cff23..7f54d3d38 100644
--- a/lib/user/opSecurityUser.class.php
+++ b/lib/user/opSecurityUser.class.php
@@ -279,8 +279,8 @@ public function login($memberId = null)
 
         $uri = '@member_setSid?next_uri='.$uri
              .'&is_remember_login='.(int)$this->getAuthAdapter()->getAuthForm()->getValue('is_remember_me')
-             .'&sid='.urlencode($item[0])
-             .'&ts='.urlencode($item[1]);
+             .'&sid='.rawurlencode($item[0])
+             .'&ts='.rawurlencode($item[1]);
       }
 
       $this->setCulture($this->getMember()->getConfig('language', sfConfig::get('sf_default_culture')));

From 648bbb037ea6847980e0b5b1878ec59fe05b0c84 Mon Sep 17 00:00:00 2001
From: mtakai <m.takai@tejimaya.com>
Date: Fri, 2 Dec 2011 22:22:32 +0900
Subject: [PATCH 451/630] (refs #3685, BP from #1089) changed to disappear many
 options profile of preset item

---
 lib/form/doctrine/MemberProfileForm.class.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/form/doctrine/MemberProfileForm.class.php b/lib/form/doctrine/MemberProfileForm.class.php
index 83bb56f62..358483105 100644
--- a/lib/form/doctrine/MemberProfileForm.class.php
+++ b/lib/form/doctrine/MemberProfileForm.class.php
@@ -141,6 +141,14 @@ protected function setProfileWidgets($profiles)
 
     foreach ($profiles as $profile)
     {
+      if ('mobile_frontend' === sfConfig::get('sf_app'))
+      {
+        if ('op_preset_country' === $profile->getName() || 'op_preset_region' === $profile->getName())
+        {
+          continue;
+        }
+      }
+
       $profileI18n = $profile->Translation[sfContext::getInstance()->getUser()->getCulture()]->toArray();
       $profileWithI18n = $profile->toArray() + $profileI18n;
 

From 1184e26070164db33651d6c66527ba8e5fb33e4b Mon Sep 17 00:00:00 2001
From: Maki Takahashi <takahashi@tejimaya.com>
Date: Tue, 25 Oct 2011 22:51:53 +0900
Subject: [PATCH 452/630] (refs #3639, BP from #2493) modified CSS of
 Email-address setting form in opSkinBasicPlugin

---
 plugins/opSkinBasicPlugin/web/css/main.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugins/opSkinBasicPlugin/web/css/main.css b/plugins/opSkinBasicPlugin/web/css/main.css
index ca56894fa..736f4b63c 100644
--- a/plugins/opSkinBasicPlugin/web/css/main.css
+++ b/plugins/opSkinBasicPlugin/web/css/main.css
@@ -982,6 +982,11 @@ div.operation ul.moreInfo li {
   width: 140px;
 }
 
+#pcAddressForm th, 
+#mobileAddressForm th {
+  width: 175px;
+}
+
 .form textarea {
   width: 98%;
 }

From b80f1953c67b89fae57b7b60b8af651ccc630f44 Mon Sep 17 00:00:00 2001
From: Maki Takahashi <takahashi@tejimaya.com>
Date: Tue, 19 Aug 2014 10:40:53 +0900
Subject: [PATCH 453/630] (refs #3639, BP from #2493) fixed cording standard

---
 plugins/opSkinBasicPlugin/web/css/main.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/opSkinBasicPlugin/web/css/main.css b/plugins/opSkinBasicPlugin/web/css/main.css
index 736f4b63c..105ecfb3e 100644
--- a/plugins/opSkinBasicPlugin/web/css/main.css
+++ b/plugins/opSkinBasicPlugin/web/css/main.css
@@ -982,7 +982,7 @@ div.operation ul.moreInfo li {
   width: 140px;
 }
 
-#pcAddressForm th, 
+#pcAddressForm th,
 #mobileAddressForm th {
   width: 175px;
 }

From b26cbb192f9799d470a819b08a319ffe9f775421 Mon Sep 17 00:00:00 2001
From: mtakai <m.takai@tejimaya.com>
Date: Fri, 30 Sep 2011 21:55:34 +0900
Subject: [PATCH 454/630] (refs ##3688, BP from #2441) fixed regex of
 convertAddFont4Docomo() for a config of setting font-size on the
 mobile_frontend.

---
 lib/filter/sfMobileIOFilter.class.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/filter/sfMobileIOFilter.class.php b/lib/filter/sfMobileIOFilter.class.php
index 6bf6ed183..ce11de877 100644
--- a/lib/filter/sfMobileIOFilter.class.php
+++ b/lib/filter/sfMobileIOFilter.class.php
@@ -144,13 +144,16 @@ private function convertAddFont4Docomo()
   {
     $response = $this->getContext()->getResponse();
     $content = $response->getContent();
-    $pattern_start_tag = array('/(<body.*?>)/', '/(<td.*?>)/');
-    $replacement_start_tag = '$1<font size="2">';
-    $pattern_end_tag = array('</body>', '</td>');
-    $replacement_end_tag = array('</font></body>', '</font></td>');
 
-    $content = preg_replace($pattern_start_tag, $replacement_start_tag, $content);
-    $content = str_replace($pattern_end_tag, $replacement_end_tag, $content);
+    $elements = array('body', 'td');
+    $elementsExpr = implode('|', $elements);
+    $pattern = array(
+      '#(<(?:'.$elementsExpr.')(?:\s[^>]*)?>)#i',
+      '#(</(?:'.$elementsExpr.')(?:\s[^>]*)?>)#i'
+    );
+    $replacement = array('$1<font size="2">', '</font>$1');
+
+    $content = preg_replace($pattern, $replacement, $content);
     $response->setContent($content);
   }
 }

From d1706cd2816c8f9e82b82cd684cd0ccfdf1179bf Mon Sep 17 00:00:00 2001
From: kaoru nishizoe <nishizoe@tejimaya.com>
Date: Thu, 11 Sep 2014 13:10:50 +0900
Subject: [PATCH 455/630] updated the mobile_ip_address list for release
 2014/07/10 (refs #3654, BP from #3653)

---
 lib/config/config/mobile_ip_address.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/config/config/mobile_ip_address.yml b/lib/config/config/mobile_ip_address.yml
index 4f763c890..da46363e3 100644
--- a/lib/config/config/mobile_ip_address.yml
+++ b/lib/config/config/mobile_ip_address.yml
@@ -15,8 +15,8 @@
 ######################################
 
 ######################################
-# 2014/05/09 リリース版
-# 2014/05 のau IPアドレス帯域追加対応
+# 2014/07/10 リリース版
+# 2014/07 のau IPアドレス帯域廃止対応
 ######################################
 
 # DoCoMo (2010/06/24更新)
@@ -52,8 +52,6 @@ ezweb:
   - 27.90.137.224/27
   - 61.117.2.32/29
   - 61.117.2.40/29
-  - 111.86.141.64/26
-  - 111.86.141.128/26
   - 111.86.141.192/26
   - 111.86.142.0/26
   - 111.86.142.128/27

From 2b1a7c96f92ddca539b49b4890e58f2c17b1e94f Mon Sep 17 00:00:00 2001
From: kaoru nishizoe <nishizoe@tejimaya.com>
Date: Thu, 11 Sep 2014 13:25:53 +0900
Subject: [PATCH 456/630] updated the update date (refs #3654, BP from #3653)

---
 lib/config/config/mobile_ip_address.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/config/config/mobile_ip_address.yml b/lib/config/config/mobile_ip_address.yml
index da46363e3..b34f55b03 100644
--- a/lib/config/config/mobile_ip_address.yml
+++ b/lib/config/config/mobile_ip_address.yml
@@ -31,7 +31,7 @@ docomo:
   - 210.153.84.0/24
   - 210.153.86.0/24
 
-# au 2011年夏モデル以前(2014/05/09更新)
+# au 2011年夏モデル以前(2014/07/10更新)
 # http://www.au.kddi.com/ezfactory/tec/spec/ezsava_ip.html
 ezweb:
   - 27.90.136.0/27

From 4e77e270281bdb61832a3b78e3c5652dd2d61488 Mon Sep 17 00:00:00 2001
From: kaoru nishizoe <nishizoe@tejimaya.com>
Date: Thu, 11 Sep 2014 13:34:06 +0900
Subject: [PATCH 457/630] added a trailing newline (refs #3654, BP from #3653)

---
 lib/config/config/mobile_ip_address.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/config/config/mobile_ip_address.yml b/lib/config/config/mobile_ip_address.yml
index b34f55b03..4b364a77f 100644
--- a/lib/config/config/mobile_ip_address.yml
+++ b/lib/config/config/mobile_ip_address.yml
@@ -233,4 +233,4 @@ willcom:
   - 221.119.6.0/24
   - 221.119.7.0/24
   - 221.119.8.0/24
-  - 221.119.9.0/24
\ No newline at end of file
+  - 221.119.9.0/24

From 5f49ada8ea649ee6226bd08fb570960eebe453dd Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 11 Sep 2014 14:10:51 +0900
Subject: [PATCH 458/630] version 3.8.13

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 2cead1cf6..e8bb4da20 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.13-dev');
+  define('OPENPNE_VERSION', '3.8.13');
 }

From 3700b900692e490c0f5d21802811029b4a365f5d Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 11 Sep 2014 14:22:20 +0900
Subject: [PATCH 459/630] started to development of OpenPNE 3.8.14

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index e8bb4da20..2bf88bee3 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.13');
+  define('OPENPNE_VERSION', '3.8.14-dev');
 }

From 87310218df4d51418ba9bdcee10f56cb95edf7bc Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Thu, 16 Oct 2014 17:44:28 +0900
Subject: [PATCH 460/630] (fixes #3706,BP from #3232) fixed to get secret key
 when request token was looked up in datastore

---
 lib/util/opOAuthDataStore.class.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lib/util/opOAuthDataStore.class.php b/lib/util/opOAuthDataStore.class.php
index 8920cf458..d5958400f 100644
--- a/lib/util/opOAuthDataStore.class.php
+++ b/lib/util/opOAuthDataStore.class.php
@@ -107,12 +107,7 @@ public function lookup_token($consumer, $token_type, $token)
     $tokenRecord = $this->getTokenTable()->findByKeyString($token, $token_type, $this->queryTemplate);
     if ($tokenRecord)
     {
-      $token = new OAuthToken($tokenRecord->getKeyString(), '');
-      if ('request' !== $token_type)
-      {
-        $token->secret = $tokenRecord->getSecret();
-      }
-      return $token;
+      return new OAuthToken($tokenRecord->getKeyString(), $tokenRecord->getSecret());
     }
 
     return null;

From bc97a85acc2e97f739f6e2e64ad3044ec25b2d01 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Thu, 16 Oct 2014 17:52:09 +0900
Subject: [PATCH 461/630] reject when the activity body is over 140 characters
 in activity/post.json (fixes #3728, BP from #3235)

---
 apps/api/modules/activity/actions/actions.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/api/modules/activity/actions/actions.class.php b/apps/api/modules/activity/actions/actions.class.php
index 5b0306f98..6cf9a2fe7 100644
--- a/apps/api/modules/activity/actions/actions.class.php
+++ b/apps/api/modules/activity/actions/actions.class.php
@@ -152,6 +152,7 @@ public function executePost(sfWebRequest $request)
   {
     $body = (string)$request['body'];
     $this->forward400If('' === $body, 'body parameter not specified.');
+    $this->forward400If(mb_strlen($body) > 140, 'The body text is too long.');
 
     $memberId = $this->getUser()->getMemberId();
     $options = array();

From a02531b33a4103cc7675c7d645d69db0be5d3852 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Thu, 16 Oct 2014 17:59:05 +0900
Subject: [PATCH 462/630] include friend's and my activities in
 activity/search.json (fixes #3727, BP from #3260)

---
 apps/api/modules/activity/actions/actions.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/api/modules/activity/actions/actions.class.php b/apps/api/modules/activity/actions/actions.class.php
index 5b0306f98..0b18e8084 100644
--- a/apps/api/modules/activity/actions/actions.class.php
+++ b/apps/api/modules/activity/actions/actions.class.php
@@ -50,7 +50,10 @@ public function executeSearch(sfWebRequest $request)
       }
       else
       {
-        $builder->includeSns();
+        $builder
+          ->includeSns()
+          ->includeFriends()
+          ->includeSelf();
       }
     }
 

From 97c86446ec82c6b3533f10f7e9cf820fcfce0038 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Thu, 16 Oct 2014 18:09:33 +0900
Subject: [PATCH 463/630] fix using result of void function in
 opToolkit::writeCacheFile() (fixes #3710, BP from #3302)

---
 lib/util/opToolkit.class.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/util/opToolkit.class.php b/lib/util/opToolkit.class.php
index dfc404cfb..7935cbb3e 100644
--- a/lib/util/opToolkit.class.php
+++ b/lib/util/opToolkit.class.php
@@ -573,10 +573,8 @@ static public function writeCacheFile($pathToCacheFile, $content)
     @fclose($fp);
     if (!@rename($tmpFile, $pathToCacheFile))
     {
-      if ($filesystem->copy($tmpFile, $pathToCacheFile, array('override' => true)))
-      {
-        $filesystem->remove($tmpFile);
-      }
+      $filesystem->copy($tmpFile, $pathToCacheFile, array('override' => true));
+      $filesystem->remove($tmpFile);
     }
 
     $filesystem->chmod($pathToCacheFile, 0666);

From e570f5a73df90fe3aa6add9c9da6da4da15f0e4a Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Thu, 16 Oct 2014 18:15:46 +0900
Subject: [PATCH 464/630] fix bug in switching smartphone/PC layout (fix #3714,
 BP from #3364)

---
 apps/pc_frontend/templates/_layout.php | 2 +-
 web/js/smt_main.js                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/pc_frontend/templates/_layout.php b/apps/pc_frontend/templates/_layout.php
index b42cb1a8c..7297f4aee 100644
--- a/apps/pc_frontend/templates/_layout.php
+++ b/apps/pc_frontend/templates/_layout.php
@@ -108,7 +108,7 @@
 <a href="javascript:void(0)" id="SmtSwitchLink"><?php echo __('View this page on smartphone style') ?></a>
 <?php echo javascript_tag('
 document.getElementById("SmtSwitchLink").addEventListener("click", function() {
-  opCookie.set("disable_smt", "0");
+  opCookie.set("disable_smt", "0", undefined, openpne.baseUrl);
   location.reload();
 }, false);
 ') ?>
diff --git a/web/js/smt_main.js b/web/js/smt_main.js
index aaa86c626..cea63ecd6 100644
--- a/web/js/smt_main.js
+++ b/web/js/smt_main.js
@@ -2,7 +2,7 @@ $(function(){
   $('#smt-switch')
     .show()
     .click(function() {
-      document.cookie = "disable_smt=1";
+      document.cookie = "disable_smt=1; path=" + openpne.baseUrl;
       location.href = $(this).attr('href');
     });
   $('a.close').click(function() {

From 02a6afcb862ad3213ce4302838ba26d4ce3aa59b Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Thu, 16 Oct 2014 18:48:29 +0900
Subject: [PATCH 465/630] (fixes #3185, BP from #2489) changed
 MemberConfigForm::setMemberConfigWidget()

confirm fields must be used only for comparison check
IsUnique validation must be performed only valid data
---
 lib/form/doctrine/MemberConfigForm.class.php | 95 ++++++++++++++++++--
 1 file changed, 87 insertions(+), 8 deletions(-)

diff --git a/lib/form/doctrine/MemberConfigForm.class.php b/lib/form/doctrine/MemberConfigForm.class.php
index baac1fd90..a3546a585 100644
--- a/lib/form/doctrine/MemberConfigForm.class.php
+++ b/lib/form/doctrine/MemberConfigForm.class.php
@@ -117,19 +117,38 @@ public function setMemberConfigWidget($name)
     }
     $this->validatorSchema[$name] = opFormItemGenerator::generateValidator($config);
 
-    if (!empty($config['IsConfirm'])) {
+    if (!empty($config['IsUnique']))
+    {
+      $uniqueValidator = new sfValidatorCallback(array(
+        'callback'    => array($this, 'isUnique'),
+        'arguments'   => array('name' => $name),
+        'empty_value' => $this->validatorSchema[$name]->getOption('empty_value'),
+      ));
+
+      $this->validatorSchema[$name] = new sfValidatorAnd(array(
+        $this->validatorSchema[$name],
+        $uniqueValidator,
+      ), array(
+        'required'      => $this->validatorSchema[$name]->getOption('required'),
+        'empty_value'   => $this->validatorSchema[$name]->getOption('empty_value'),
+        'halt_on_error' => true,
+      ));
+    }
+
+    if (!empty($config['IsConfirm']))
+    {
       $this->validatorSchema[$name.'_confirm'] = $this->validatorSchema[$name];
       $this->widgetSchema[$name.'_confirm'] = $this->widgetSchema[$name];
       $this->widgetSchema->setLabel($name.'_confirm', $config['Caption'].' (Confirm)');
 
-      $this->mergePostValidator(new sfValidatorSchemaCompare($name, '==', $name.'_confirm'));
-    }
-
-    if (!empty($config['IsUnique'])) {
-      $this->mergePostValidator(new sfValidatorCallback(array(
-        'callback' => array($this, 'isUnique'),
+      $this->mergePreValidator(new sfValidatorCallback(array(
+        'callback'  => array($this, 'preValidateConfirmField'),
         'arguments' => array('name' => $name),
       )));
+      $this->mergePostValidator(new sfValidatorCallback(array(
+        'callback'  => array($this, 'postValidateConfirmField'),
+        'arguments' => array('name' => $name, 'validator' => $this->validatorSchema[$name]),
+      )));
     }
 
     if (!empty($config['Info']))
@@ -138,6 +157,66 @@ public function setMemberConfigWidget($name)
     }
   }
 
+  /**
+   * IsConfirm: true のフィールド用の Pre Validator
+   *
+   * 個別フィールドのバリデーターを一旦 sfValidatorPass に置き換え、
+   * バリデーションは Post Validator でまとめておこなう
+   */
+  public function preValidateConfirmField($validator, $values, $arguments = array())
+  {
+    $name = $arguments['name'];
+
+    // 入力フォーム画面に「必須項目マーク(*)」を表示するためバリデーション直前で変更する
+    $this->validatorSchema[$name] = $this->validatorSchema[$name.'_confirm'] = new sfValidatorPass();
+
+    return $values;
+  }
+
+  /**
+   * IsConfirm: true のフィールド用の Post Validator
+   *
+   * 元フィールドと _confirm フィールドの個別バリデーションもこの中でおこない、
+   * エラーにならなかった場合のみ両者を比較することで、エラーが重複して表示されるのを防ぐ
+   */
+  public function postValidateConfirmField($validator, $values, $arguments = array())
+  {
+    $name = $arguments['name'];
+    $fieldValidator = $arguments['validator'];
+
+    // バリデーションエラー時のフォーム画面に「必須項目マーク(*)」を表示するためバリデーターを元に戻す
+    $this->validatorSchema[$name] = $this->validatorSchema[$name.'_confirm'] = $fieldValidator;
+
+    // 元フィールドのバリデーション
+    try
+    {
+      $values[$name] = $fieldValidator->clean($values[$name]);
+    }
+    catch (sfValidatorError $e)
+    {
+      throw new sfValidatorErrorSchema($validator, array($name => $e));
+    }
+
+    // _confirm フィールドのバリデーション
+    try
+    {
+      $values[$name.'_confirm'] = $fieldValidator->clean($values[$name.'_confirm']);
+    }
+    catch (sfValidatorError $e)
+    {
+      // _confirm だけエラーになる場合、2つのフィールドの値は一致していないので、
+      // sfValidatorSchemaCompare と同じ invalid エラーの例外を投げる
+      throw new sfValidatorErrorSchema($validator, array($name.'_confirm' => new sfValidatorError($validator, 'invalid')));
+    }
+
+    // 2つのフィールドが共にエラーでない場合のみ値を比較する
+    // validator の clean() は値を変更することがあるため、clean() 後の値を比較する
+    $compareValidator = new sfValidatorSchemaCompare($name.'_confirm', '===', $name);
+    $values = $compareValidator->clean($values);
+
+    return $values;
+  }
+
   public function isUnique($validator, $value, $arguments = array())
   {
     if (empty($arguments['name'])) {
@@ -145,7 +224,7 @@ public function isUnique($validator, $value, $arguments = array())
     }
 
     $name = $arguments['name'];
-    $data = Doctrine::getTable('MemberConfig')->retrieveByNameAndValue($name, $value[$name]);
+    $data = Doctrine::getTable('MemberConfig')->retrieveByNameAndValue($name, $value);
     if (!$data || !$data->getMember()->getIsActive() || $data->getMember()->getId() == $this->member->getId()) {
       return $value;
     }

From 1c6450b5a06ebb784c37dac035972ee50d29d496 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Fri, 17 Oct 2014 13:47:24 +0900
Subject: [PATCH 466/630] (refs #3249, BP form #3245) fixed to reflect the
 activity/post settings.

---
 apps/api/modules/activity/actions/actions.class.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/api/modules/activity/actions/actions.class.php b/apps/api/modules/activity/actions/actions.class.php
index 5b0306f98..4e98ef4de 100644
--- a/apps/api/modules/activity/actions/actions.class.php
+++ b/apps/api/modules/activity/actions/actions.class.php
@@ -150,6 +150,11 @@ public function executeCommunity(sfWebRequest $request)
 
   public function executePost(sfWebRequest $request)
   {
+    if (!opConfig::get('is_allow_post_activity'))
+    {
+      return $this->renderJSON(array('status' => 'error', 'message' => "you are not allowed this action."));
+    }
+
     $body = (string)$request['body'];
     $this->forward400If('' === $body, 'body parameter not specified.');
 

From 27421698d6dbfe20c704e491bcc22a9f469b9b56 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Fri, 17 Oct 2014 13:52:10 +0900
Subject: [PATCH 467/630] repair the function that changes space into symbol
 +(fixes #3716, BP from #3383)

---
 lib/vendor/symfony/lib/helper/UrlHelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/vendor/symfony/lib/helper/UrlHelper.php b/lib/vendor/symfony/lib/helper/UrlHelper.php
index d0bc4c1aa..4995c498f 100644
--- a/lib/vendor/symfony/lib/helper/UrlHelper.php
+++ b/lib/vendor/symfony/lib/helper/UrlHelper.php
@@ -498,7 +498,7 @@ function mail_to($email, $name = '', $options = array(), $default_value = array(
   $default = array();
   foreach ($default_tmp as $key => $value)
   {
-    $default[] = urlencode($key).'='.urlencode($value);
+    $default[] = rawurlencode($key).'='.rawurlencode($value);
   }
   $options = count($default) ? '?'.implode('&', $default) : '';
 

From af39421f6d3a306b319c5c464a582d9556f591d2 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Fri, 17 Oct 2014 13:56:55 +0900
Subject: [PATCH 468/630] change the word ja into ja_JP for the integrity of
 yml in OpenPNE (fixes #3718, BP form #3502)

---
 apps/api/config/settings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/api/config/settings.yml b/apps/api/config/settings.yml
index 394548b69..0d4848319 100644
--- a/apps/api/config/settings.yml
+++ b/apps/api/config/settings.yml
@@ -99,4 +99,4 @@ all:
 #    logging_enabled:        true
 #
 #    # i18n
-    default_culture:        ja        # Default user culture
+    default_culture:        ja_JP        # Default user culture

From 594dc40d0d53881fa2f0b5510506570a6ee41d8d Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Fri, 17 Oct 2014 16:01:50 +0900
Subject: [PATCH 469/630] fix MemberProfile::preSave() set empty string to
 value_datetime if value is empty (fixes #3724, BP from #3543)

---
 lib/model/doctrine/MemberProfile.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/model/doctrine/MemberProfile.class.php b/lib/model/doctrine/MemberProfile.class.php
index 04389395c..11b33a810 100644
--- a/lib/model/doctrine/MemberProfile.class.php
+++ b/lib/model/doctrine/MemberProfile.class.php
@@ -147,7 +147,8 @@ public function preSave($event)
     {
       $this->_set('value', $this->_get('value_datetime'));
     }
-    elseif ('date' === $this->getFormType() && isset($modified['value']) && $this->getProfile()->isPreset())
+    elseif ('date' === $this->getFormType() && $this->getProfile()->isPreset() &&
+            isset($modified['value']) && '' !== $modified['value'])
     {
       $this->_set('value_datetime', $this->_get('value'));
     }

From 01e5d60012ea6c2b139a873fa89ac140ff636ee2 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Tue, 18 Nov 2014 15:46:58 +0900
Subject: [PATCH 470/630] isaosano fix opDynamicAclRoute throws fatal error
 when using allow_empty option (fixes #3722, BP form #3507)

---
 lib/routing/opDynamicAclRoute.class.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/routing/opDynamicAclRoute.class.php b/lib/routing/opDynamicAclRoute.class.php
index 366a36742..e1eac2e11 100644
--- a/lib/routing/opDynamicAclRoute.class.php
+++ b/lib/routing/opDynamicAclRoute.class.php
@@ -29,6 +29,11 @@ public function getObject()
   {
     $result = parent::getObject();
 
+    if (is_null($result))
+    {
+      return $result;
+    }
+
     if ($result instanceof opAccessControlRecordInterface)
     {
       if (!$result->isAllowed($this->getCurrentMember(), $this->options['privilege']))

From d32ea17cbf4784cfd7d1e703d9eebeca75232505 Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 11 Dec 2014 14:32:26 +0900
Subject: [PATCH 471/630] version 3.8.14

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 2bf88bee3..5fffc40c8 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.14-dev');
+  define('OPENPNE_VERSION', '3.8.14');
 }

From 821db72c8bbb9d64a29378e8bb4588b18d5ddeec Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 11 Dec 2014 14:40:16 +0900
Subject: [PATCH 472/630] started to development of OpenPNE 3.8.15

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 5fffc40c8..be649d78d 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.14');
+  define('OPENPNE_VERSION', '3.8.15-dev');
 }

From 6042aed749d574483ed1b665ec803d56f4ebe358 Mon Sep 17 00:00:00 2001
From: C-nakajima <nakajima@tejimaya.com>
Date: Mon, 9 Feb 2015 15:26:10 +0900
Subject: [PATCH 473/630] (refs #3760, BP from #3411) Bug fixes the display of
 all of the notification is changed when it was approved for Friends request

---
 web/js/jquery.notify.js | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/web/js/jquery.notify.js b/web/js/jquery.notify.js
index b6b27babb..ccc5cca80 100644
--- a/web/js/jquery.notify.js
+++ b/web/js/jquery.notify.js
@@ -38,17 +38,17 @@
           dataType: 'json',
           success: function(data) {
             if(data.status=='success'){
-              $('.ncfriendloading').hide();
-              $('.push_yesno .ncfriendresultmessage').text('リクエストを承認しました');
-              $('.push_yesno .ncfriendresultmessage').show();
+              pushElement.find('.ncfriendloading').hide();
+              pushElement.find('.push_yesno .ncfriendresultmessage').text('リクエストを承認しました');
+              pushElement.find('.push_yesno .ncfriendresultmessage').show();
             }else{
               alert(data.message);
             }
           },
           error: function(r, s, e){
-            $('.ncfriendloading').hide();
-            $('.push_yesno .ncfriendresultmessage').text('既に承認済みです');
-            $('.push_yesno .ncfriendresultmessage').show(); 
+            pushElement.find('.ncfriendloading').hide();
+            pushElement.find('.push_yesno .ncfriendresultmessage').text('既に承認済みです');
+            pushElement.find('.push_yesno .ncfriendresultmessage').show(); 
           }
         });
       });
@@ -71,17 +71,17 @@
           dataType: 'json',
           success: function(data) {
             if(data.status=='success'){
-              $('.ncfriendloading').hide();
-              $('.push_yesno .ncfriendresultmessage').text('リクエストを拒否しました');
-              $('.push_yesno .ncfriendresultmessage').show();
+              pushElement.find('.ncfriendloading').hide();
+              pushElement.find('.push_yesno .ncfriendresultmessage').text('リクエストを拒否しました');
+              pushElement.find('.push_yesno .ncfriendresultmessage').show();
             }else{
               alert(data.message);
             }   
           },
           error: function(r, s, e) {
-            $('.ncfriendloading').hide();
-            $('.push_yesno .ncfriendresultmessage').text('既に拒否済みです');
-            $('.push_yesno .ncfriendresultmessage').show(); 
+            pushElement.find('.ncfriendloading').hide();
+            pushElement.find('.push_yesno .ncfriendresultmessage').text('既に拒否済みです');
+            pushElement.find('.push_yesno .ncfriendresultmessage').show(); 
           }
         });
       });

From b3d972ff2ab84c0aeb9311496e8a7ea7e8dc1e72 Mon Sep 17 00:00:00 2001
From: C-nakajima <nakajima@tejimaya.com>
Date: Mon, 9 Feb 2015 16:17:04 +0900
Subject: [PATCH 474/630] (refs #3761, BP from #3595) output util.js once

---
 apps/pc_frontend/modules/member/config/view.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/pc_frontend/modules/member/config/view.yml b/apps/pc_frontend/modules/member/config/view.yml
index 17054a177..4a1fe3872 100644
--- a/apps/pc_frontend/modules/member/config/view.yml
+++ b/apps/pc_frontend/modules/member/config/view.yml
@@ -1,5 +1,5 @@
 homeSuccess:
-  javascripts: [jquery.min.js, jquery-ui.min.js, util]
+  javascripts: [jquery.min.js, jquery-ui.min.js]
   layout: layoutA
   customize:
     cautionAboutFriendPre:
@@ -23,7 +23,6 @@ homeSuccess:
       is_component: true
 
 profileSuccess:
-  javascripts: [util]
   layout: layoutA
 
 configSuccess:

From 1a018f9b2d9368274041e8c267426ff48a2d05be Mon Sep 17 00:00:00 2001
From: C-nakajima <nakajima@tejimaya.com>
Date: Mon, 9 Feb 2015 17:15:34 +0900
Subject: [PATCH 475/630] (refs #3763, BP from #3756) fix
 OAuthConsumerInformation::delete() doesn't delete related File

---
 .../doctrine/OAuthConsumerInformation.class.php |  8 ++++++++
 test/fixtures/common/test_data.yml              |  7 +++++++
 .../doctrine/OAuthConsumerInformationTest.php   | 17 ++++++++++++++++-
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/lib/model/doctrine/OAuthConsumerInformation.class.php b/lib/model/doctrine/OAuthConsumerInformation.class.php
index 3121b46f5..395e11e05 100644
--- a/lib/model/doctrine/OAuthConsumerInformation.class.php
+++ b/lib/model/doctrine/OAuthConsumerInformation.class.php
@@ -19,6 +19,14 @@ public function preSave($event)
     }
   }
 
+  public function preDelete($event)
+  {
+    if ($this->relatedExists('Image'))
+    {
+      $this->Image->delete();
+    }
+  }
+
   public function getAPICaptions()
   {
     $apiList = array();
diff --git a/test/fixtures/common/test_data.yml b/test/fixtures/common/test_data.yml
index be5a0d97e..c6193b98f 100644
--- a/test/fixtures/common/test_data.yml
+++ b/test/fixtures/common/test_data.yml
@@ -706,6 +706,13 @@ OAuthConsumerInformation:
     Image: dummy_file1
     using_apis: ["webapi_member_get"]
     Member: first_member
+  consumer_information3:
+    name: test3
+    using_apis: [webapi_member_get]
+    Image:
+      name: dummy_consumer_information3_image
+      type: text/plain
+      FileBin: { bin: ~ }
 
 OAuthAdminToken:
   dummy_admin_token1:
diff --git a/test/unit/model/doctrine/OAuthConsumerInformationTest.php b/test/unit/model/doctrine/OAuthConsumerInformationTest.php
index 2d7751477..983196a32 100644
--- a/test/unit/model/doctrine/OAuthConsumerInformationTest.php
+++ b/test/unit/model/doctrine/OAuthConsumerInformationTest.php
@@ -4,7 +4,7 @@
 include_once dirname(__FILE__) . '/../../../bootstrap/database.php';
 sfContext::createInstance($configuration);
 
-$t = new lime_test(8, new lime_output_color());
+$t = new lime_test(11);
 
 $table = Doctrine::getTable('OAuthConsumerInformation');
 $oauthConsumer1 = $table->findOneByName('test1');
@@ -40,3 +40,18 @@
 //------------------------------------------------------------
 $t->diag('OAuthConsumerInformation::getImageFileName()');
 $t->is($oauthConsumer1->getImageFileName(), 'dummy_file');
+
+//------------------------------------------------------------
+$t->diag('OAuthConsumerInformation: Cascading Delete');
+$conn->beginTransaction();
+
+$oauthConsumer3 = $table->findOneByName('test3');
+$fileId = $oauthConsumer3->file_id;
+
+$oauthConsumer3->delete($conn);
+
+$t->ok(!Doctrine_Core::getTable('OAuthConsumerInformation')->find($oauthConsumer3->id), 'oauth_consumer is deleted.');
+$t->ok(!Doctrine_Core::getTable('File')->find($fileId), 'file is deleted.');
+$t->ok(!Doctrine_Core::getTable('FileBin')->find($fileId), 'file_bin is deleted.');
+
+$conn->rollback();

From c8a69310641a8259b67ff45671163c97667d30c1 Mon Sep 17 00:00:00 2001
From: C-nakajima <nakajima@tejimaya.com>
Date: Mon, 9 Feb 2015 17:25:02 +0900
Subject: [PATCH 476/630] (refs #3764, BP from #3755) fix BannerImage::delete()
 doesn't delete related File

---
 lib/model/doctrine/BannerImage.class.php     |  7 +++---
 test/unit/model/doctrine/BannerImageTest.php | 24 +++++++++++++-------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/lib/model/doctrine/BannerImage.class.php b/lib/model/doctrine/BannerImage.class.php
index 72809282b..e6a0d6d8d 100644
--- a/lib/model/doctrine/BannerImage.class.php
+++ b/lib/model/doctrine/BannerImage.class.php
@@ -9,14 +9,13 @@
  */
 class BannerImage extends BaseBannerImage
 {
-  public function delete(Doctrine_Connection $conn = null)
+  public function preDelete($event)
   {
-    $bannerUseImageList = Doctrine::getTable('BannerUseImage')->findByBannerImageId($this->getId());
-    foreach ($bannerUseImageList as $bannerUseImage)
+    foreach ($this->BannerUseImage as $bannerUseImage)
     {
       $bannerUseImage->delete();
     }
 
-    return parent::delete($conn);
+    $this->File->delete();
   }
 }
diff --git a/test/unit/model/doctrine/BannerImageTest.php b/test/unit/model/doctrine/BannerImageTest.php
index 9e0757737..fd9a35c2e 100644
--- a/test/unit/model/doctrine/BannerImageTest.php
+++ b/test/unit/model/doctrine/BannerImageTest.php
@@ -3,13 +3,21 @@
 include_once dirname(__FILE__) . '/../../../bootstrap/unit.php';
 include_once dirname(__FILE__) . '/../../../bootstrap/database.php';
 
-$t = new lime_test(null, new lime_output_color());
-
-$bannerImage = Doctrine::getTable('BannerImage')->find(1);
+$t = new lime_test(4);
 
 //------------------------------------------------------------
-$t->diag('BannerImage');
-$t->diag('BannerImage::delete()');
-$t->is(Doctrine::getTable('BannerUseImage')->findAll()->count(), 1);
-$bannerImage->delete();
-$t->is(Doctrine::getTable('BannerUseImage')->findAll()->count(), 0);
+$t->diag('BannerImage: Cascading Delete');
+$conn->beginTransaction();
+
+$bannerImage = Doctrine_Core::getTable('BannerImage')->find(1);
+$bannerUseImage = $bannerImage->BannerUseImage[0];
+$file = $bannerImage->File;
+
+$bannerImage->delete($conn);
+
+$t->ok(!Doctrine_Core::getTable('BannerImage')->find($bannerImage->id), 'banner_image is deleted.');
+$t->ok(!Doctrine_Core::getTable('BannerUseImage')->find($bannerUseImage->id), 'banner_use_image is deleted.');
+$t->ok(!Doctrine_Core::getTable('File')->find($file->id), 'file is deleted.');
+$t->ok(!Doctrine_Core::getTable('FileBin')->find($file->id), 'file_bin is deleted.');
+
+$conn->rollback();

From fbd47fdc70fe5b0f6e41e1b00299f4efc43e86e6 Mon Sep 17 00:00:00 2001
From: C-nakajima <nakajima@tejimaya.com>
Date: Mon, 9 Feb 2015 17:40:58 +0900
Subject: [PATCH 477/630] (refs #3765, BP from #3753) fix Community::delete()
 doesn't delete related File

---
 lib/model/doctrine/Community.class.php     |  8 ++++++++
 test/fixtures/common/test_data.yml         |  4 ++++
 test/unit/model/doctrine/CommunityTest.php | 16 +++++++++++++++-
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/lib/model/doctrine/Community.class.php b/lib/model/doctrine/Community.class.php
index daba5864e..0c886838f 100644
--- a/lib/model/doctrine/Community.class.php
+++ b/lib/model/doctrine/Community.class.php
@@ -202,4 +202,12 @@ public function generateRoleId(Member $member)
 
     return 'everyone';
   }
+
+  public function preDelete($event)
+  {
+    if ($this->relatedExists('File'))
+    {
+      $this->File->delete();
+    }
+  }
 }
diff --git a/test/fixtures/common/test_data.yml b/test/fixtures/common/test_data.yml
index c6193b98f..dc5738943 100644
--- a/test/fixtures/common/test_data.yml
+++ b/test/fixtures/common/test_data.yml
@@ -465,6 +465,10 @@ Community:
     name: "CommunityB"
   community_3:
     name: "CommunityC"
+    File:
+      name: dummy_image_community3
+      type: text/plain
+      FileBin: { bin: hogehoge }
   community_4:
     name: "CommunityD"
   community_5:
diff --git a/test/unit/model/doctrine/CommunityTest.php b/test/unit/model/doctrine/CommunityTest.php
index 9a1e1ca6d..cb7a11d0d 100644
--- a/test/unit/model/doctrine/CommunityTest.php
+++ b/test/unit/model/doctrine/CommunityTest.php
@@ -4,10 +4,11 @@
 include_once dirname(__FILE__) . '/../../../bootstrap/database.php';
 sfContext::createInstance($configuration);
 
-$t = new lime_test(36, new lime_output_color());
+$t = new lime_test(39);
 
 $community1 = Doctrine::getTable('Community')->findOneByName('CommunityA');
 $community2 = Doctrine::getTable('Community')->findOneByName('CommunityB');
+$community3 = Doctrine::getTable('Community')->findOneByName('CommunityC');
 $community4 = Doctrine::getTable('Community')->findOneByName('CommunityD');
 $community5 = Doctrine::getTable('Community')->findOneByName('CommunityE');
 
@@ -109,3 +110,16 @@ function checkPrivilegeBelong($object, $memberId)
 $t->is($community1->generateRoleId(Doctrine::getTable('Member')->find(2)), 'member', 'generateRoleId() returns "member"');
 $t->is($community1->generateRoleId(Doctrine::getTable('Member')->find(3)), 'everyone', 'generateRoleId() returns "everyone"');
 $t->is($community5->generateRoleId(Doctrine::getTable('Member')->find(2)), 'sub_admin', 'generateRoleId() returns "sub_admin"');
+
+//------------------------------------------------------------
+$t->diag('Community: Cascading Delete');
+$conn->beginTransaction();
+
+$fileId = $community3->file_id;
+$community3->delete($conn);
+
+$t->ok(!Doctrine_Core::getTable('Community')->find($community3->id), 'community is deleted.');
+$t->ok(!Doctrine_Core::getTable('File')->find($fileId), 'file is deleted.');
+$t->ok(!Doctrine_Core::getTable('FileBin')->find($fileId), 'file_bin is deleted.');
+
+$conn->rollback();

From 85075fe3fede25f30b078ff19021ee515c6d8fec Mon Sep 17 00:00:00 2001
From: C-nakajima <nakajima@tejimaya.com>
Date: Mon, 9 Feb 2015 18:19:18 +0900
Subject: [PATCH 478/630] (refs #3766, BP from #3752) fix
 ActivityData::delete() doesn't delete related File

---
 lib/model/doctrine/ActivityData.class.php     |  8 +++++++
 lib/model/doctrine/ActivityImage.class.php    |  4 ++++
 test/bootstrap/database.php                   |  2 +-
 test/fixtures/common/test_data.yml            |  8 +++++++
 test/unit/model/doctrine/ActivityDataTest.php | 22 ++++++++++++++++++-
 5 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/lib/model/doctrine/ActivityData.class.php b/lib/model/doctrine/ActivityData.class.php
index b3b775a3c..b049348f4 100644
--- a/lib/model/doctrine/ActivityData.class.php
+++ b/lib/model/doctrine/ActivityData.class.php
@@ -44,4 +44,12 @@ public function getReplies($publicFlag = ActivityDataTable::PUBLIC_FLAG_SNS, $li
 
     return $query->execute();
   }
+
+  public function preDelete($event)
+  {
+    foreach ($this->Images as $activityImage)
+    {
+      $activityImage->delete();
+    }
+  }
 }
diff --git a/lib/model/doctrine/ActivityImage.class.php b/lib/model/doctrine/ActivityImage.class.php
index 807c48b2d..9eadf9f93 100644
--- a/lib/model/doctrine/ActivityImage.class.php
+++ b/lib/model/doctrine/ActivityImage.class.php
@@ -20,4 +20,8 @@
  */
 class ActivityImage extends BaseActivityImage
 {
+  public function preDelete($event)
+  {
+    $this->File->delete();
+  }
 }
diff --git a/test/bootstrap/database.php b/test/bootstrap/database.php
index d6ef5f5a5..5708c0ead 100644
--- a/test/bootstrap/database.php
+++ b/test/bootstrap/database.php
@@ -18,7 +18,7 @@
 new sfDatabaseManager($configuration);
 
 $conn = opDoctrineQuery::getMasterConnectionDirect();
-if ($conn instanceof Doctrine_Connection_Mysql)
+if ('fix_wrong_categorized_community' === $fixture && $conn instanceof Doctrine_Connection_Mysql)
 {
   $conn->exec('SET FOREIGN_KEY_CHECKS = 0');
 }
diff --git a/test/fixtures/common/test_data.yml b/test/fixtures/common/test_data.yml
index dc5738943..10d968e6a 100644
--- a/test/fixtures/common/test_data.yml
+++ b/test/fixtures/common/test_data.yml
@@ -923,6 +923,14 @@ ActivityData:
     body: "dummy8"
     template: "xxxx_template"
 
+ActivityImage:
+  activity1_image:
+    ActivityData: dummy_activity1
+    File:
+      name: dummy_image
+      type: text/plain
+      FileBin: { bin: dummy }
+
 SnsTerm:
   term_friend_pc_frontend:
     name: "friend"
diff --git a/test/unit/model/doctrine/ActivityDataTest.php b/test/unit/model/doctrine/ActivityDataTest.php
index af6bcbbd6..efeb95e80 100644
--- a/test/unit/model/doctrine/ActivityDataTest.php
+++ b/test/unit/model/doctrine/ActivityDataTest.php
@@ -4,10 +4,30 @@
 include_once dirname(__FILE__) . '/../../../bootstrap/database.php';
 sfContext::createInstance($configuration);
 
-$t = new lime_test(1, new lime_output_color());
+$conn = Doctrine_Core::getTable('ActivityData')->getConnection();
+
+$t = new lime_test(5);
 $activityData1 = Doctrine::getTable('ActivityData')->find(1);
+$activityImage = $activityData1->Images[0];
 
 //------------------------------------------------------------
 $t->diag('ActivityData');
 $t->diag('ActivityData::getPublicFlagCaption()');
 $t->is($activityData1->getPublicFlagCaption(), '全員に公開', '->getPublicFlagCaption() returns caption of public flag');
+
+//------------------------------------------------------------
+$t->diag('ActivityData: Cascading Delete');
+$conn->beginTransaction();
+
+$activityDataId = $activityData1->id;
+$activityImageId = $activityImage->id;
+$fileId = $activityImage->file_id;
+
+$activityData1->delete($conn);
+
+$t->ok(!Doctrine_Core::getTable('ActivityData')->find($activityDataId), 'activity_data is deleted.');
+$t->ok(!Doctrine_Core::getTable('ActivityImage')->find($activityImageId), 'activity_image is deleted.');
+$t->ok(!Doctrine_Core::getTable('File')->find($fileId), 'file is deleted.');
+$t->ok(!Doctrine_Core::getTable('FileBin')->find($fileId), 'file_bin is deleted.');
+
+$conn->rollback();

From f9c9e3b1507067b24f2339e604c13cb94886814f Mon Sep 17 00:00:00 2001
From: C-nakajima <nakajima@tejimaya.com>
Date: Fri, 13 Feb 2015 16:21:36 +0900
Subject: [PATCH 479/630] (refs #3779, BP from #3414) To use the videos
 embedded in an iframe element of on YouTube small window

---
 web/cmd/jp.youtube.com.js  | 12 +++---------
 web/cmd/www.youtube.com.js | 12 +++---------
 web/cmd/youtube.js         | 12 +++---------
 3 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/web/cmd/jp.youtube.com.js b/web/cmd/jp.youtube.com.js
index a46a04247..552c19077 100644
--- a/web/cmd/jp.youtube.com.js
+++ b/web/cmd/jp.youtube.com.js
@@ -21,18 +21,12 @@ function main(id, width, height) {
     if (height <= 0 || height > 350) {
         height = 350;
     }
-    var html = '<object width="'
+    var html = '<iframe width="'
             + width
             + '" height="'
             + height
-            + '"><param name="movie" value="http://www.youtube.com/v/'
+            + '" src="//www.youtube.com/embed/'
             + id
-            + '"></param><embed src="http://www.youtube.com/v/'
-            + id
-            + '" type="application/x-shockwave-flash" width="'
-            + width
-            + '" height="'
-            + height
-            + '"></embed></object>';
+            + '" frameborder="0" allowfullscreen="allowfullscreen"></iframe>';
     document.write(html);
 }
diff --git a/web/cmd/www.youtube.com.js b/web/cmd/www.youtube.com.js
index af5fe6e76..8beac45fa 100644
--- a/web/cmd/www.youtube.com.js
+++ b/web/cmd/www.youtube.com.js
@@ -21,18 +21,12 @@ function main(id, width, height) {
     if (height <= 0 || height > 350) {
         height = 350;
     }
-    var html = '<object width="'
+    var html = '<iframe width="'
             + width
             + '" height="'
             + height
-            + '"><param name="movie" value="http://www.youtube.com/v/'
+            + '" src="//www.youtube.com/embed/'
             + id
-            + '"></param><embed src="http://www.youtube.com/v/'
-            + id
-            + '" type="application/x-shockwave-flash" width="'
-            + width
-            + '" height="'
-            + height
-            + '"></embed></object>';
+            + '" frameborder="0" allowfullscreen="allowfullscreen"></iframe>';
     document.write(html);
 }
diff --git a/web/cmd/youtube.js b/web/cmd/youtube.js
index e053688f0..363de9c6d 100644
--- a/web/cmd/youtube.js
+++ b/web/cmd/youtube.js
@@ -10,18 +10,12 @@ function main(id, width, height) {
     if (height <= 0 || height > 350) {
         height = 350;
     }
-    var html = '<object width="'
+    var html = '<iframe width="'
             + width
             + '" height="'
             + height
-            + '"><param name="movie" value="http://www.youtube.com/v/'
+            + '" src="//www.youtube.com/embed/'
             + id
-            + '"></param><embed src="http://www.youtube.com/v/'
-            + id
-            + '" type="application/x-shockwave-flash" width="'
-            + width
-            + '" height="'
-            + height
-            + '"></embed></object>';
+            + '" frameborder="0" allowfullscreen="allowfullscreen"></iframe>';
     document.write(html);
 }

From 90e78834cef8ee8394391a7f1a25d0da4d0892ad Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 12 Mar 2015 15:16:34 +0900
Subject: [PATCH 480/630] version 3.8.15

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index be649d78d..a9077ba85 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.15-dev');
+  define('OPENPNE_VERSION', '3.8.15');
 }

From 1f14c57bc9837be7c482a5649fb71bd9a68cb980 Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 12 Mar 2015 15:23:35 +0900
Subject: [PATCH 481/630] started to development of OpenPNE 3.8.16

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index a9077ba85..f650de802 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.15');
+  define('OPENPNE_VERSION', '3.8.16-dev');
 }

From 19ece344cbf705f0f27b56aeef8b8b56351e5411 Mon Sep 17 00:00:00 2001
From: C-nakajima <nakajima@tejimaya.com>
Date: Wed, 28 Jan 2015 16:55:51 +0900
Subject: [PATCH 482/630] Fixed a bug that birthday Send Mail task of members
 of the private is executed(#3430)

---
 lib/task/openpneSendBirthDayMailTask.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/task/openpneSendBirthDayMailTask.class.php b/lib/task/openpneSendBirthDayMailTask.class.php
index e28df68c6..09f0d6571 100644
--- a/lib/task/openpneSendBirthDayMailTask.class.php
+++ b/lib/task/openpneSendBirthDayMailTask.class.php
@@ -38,6 +38,7 @@ protected function execute($arguments = array(), $options = array())
     $profiles = Doctrine::getTable('MemberProfile')->createQuery()
       ->where('profile_id = ?', $birthday->id)
       ->andWhere('DATE_FORMAT(value_datetime, ?) = ?', array('%m-%d', date('m-d', strtotime('+ 1 week'))))
+      ->andWhereNotIn('public_flag', ProfileTable::PUBLIC_FLAG_PRIVATE)
       ->execute();
     opApplicationConfiguration::registerZend();
 

From c82e8790fb1ed9d31c1051b7c9dba84c084511ba Mon Sep 17 00:00:00 2001
From: C-nakajima <nakajima@tejimaya.com>
Date: Tue, 27 Jan 2015 16:09:33 +0900
Subject: [PATCH 483/630] Fixed a bug that profile pages can be viewed
 regardless of the designation of the public range in a specific URL(#3342)

---
 lib/action/opMemberAction.class.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/action/opMemberAction.class.php b/lib/action/opMemberAction.class.php
index fc1542aed..a82d42471 100644
--- a/lib/action/opMemberAction.class.php
+++ b/lib/action/opMemberAction.class.php
@@ -228,6 +228,10 @@ public function executeProfile(opWebRequest $request)
     $id = $this->getRequestParameter('id', $this->getUser()->getMemberId());
     if ('member_profile_mine' === sfContext::getInstance()->getRouting()->getCurrentRouteName())
     {
+      if ($id !== $this->getUser()->getMemberId())
+      {
+        $this->redirect('member/profile?id='.$id);
+      }
       $this->forward404Unless($id);
       $this->member = $this->getUser()->getMember();
     }

From 5b197c868c1895dc8ad3d3725589680931aaa27d Mon Sep 17 00:00:00 2001
From: C-nakajima <nakajima@tejimaya.com>
Date: Tue, 24 Mar 2015 17:25:52 +0900
Subject: [PATCH 484/630] (refs #2128) If the viewer is not logged in, you do
 not want to display the information in the profile private members

---
 apps/pc_frontend/i18n/messages.ja.xml                |  4 ++++
 .../modules/friend/templates/_friendListBox.php      |  1 +
 apps/pc_frontend/templates/_partsNineTable.php       |  5 +++--
 lib/helper/opUtilHelper.php                          | 12 +++++++++++-
 test/unit/helper/opUtilHelperTest.php                |  4 ++++
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/apps/pc_frontend/i18n/messages.ja.xml b/apps/pc_frontend/i18n/messages.ja.xml
index 12b86ed0a..008de66ae 100644
--- a/apps/pc_frontend/i18n/messages.ja.xml
+++ b/apps/pc_frontend/i18n/messages.ja.xml
@@ -1407,6 +1407,10 @@
         <source>%Community% does not exist.</source>
         <target>%Community%がありません。</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>Private&lt;br /&gt;Member</source>
+        <target>非公開&lt;br /&gt;メンバー</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/apps/pc_frontend/modules/friend/templates/_friendListBox.php b/apps/pc_frontend/modules/friend/templates/_friendListBox.php
index b183eb31e..c0c7b497c 100644
--- a/apps/pc_frontend/modules/friend/templates/_friendListBox.php
+++ b/apps/pc_frontend/modules/friend/templates/_friendListBox.php
@@ -3,6 +3,7 @@
   'title' => __('%friend% List', array('%friend%' => $op_term['friend']->titleize())),
   'list' => $friends,
   'link_to' => '@obj_member_profile?id=',
+  'use_op_link_to_member_private' => true,
   'use_op_link_to_member' => true,
   'moreInfo' => array(link_to(sprintf('%s(%d)', __('Show all'), $member->countFriends()), 'friend/list?id='.$member->getId())),
   'type' => $sf_data->getRaw('gadget')->getConfig('type'),
diff --git a/apps/pc_frontend/templates/_partsNineTable.php b/apps/pc_frontend/templates/_partsNineTable.php
index 731323857..435d02280 100644
--- a/apps/pc_frontend/templates/_partsNineTable.php
+++ b/apps/pc_frontend/templates/_partsNineTable.php
@@ -6,6 +6,7 @@
 $options->setDefault('type', 'full');
 $options->setDefault('crownIds', array());
 $options->setDefault('use_op_link_to_member', false);
+$options->setDefault('use_op_link_to_member_private', false);
 ?>
 <table>
 <?php $row = min($options->row, ceil(count($options->list) / $options->col)) ?>
@@ -18,7 +19,7 @@
 <p class="crown"><?php echo op_image_tag('icon_crown.gif', array('alt' => 'admin')) ?></p>
 <?php endif; ?>
 <?php if ($options->use_op_link_to_member): ?>
-<?php echo op_link_to_member($options->list[$j], array('link_target' => op_image_tag_sf_image($options->list[$j]->getImageFileName(), array('size' => '76x76')))) ?>
+<?php echo op_link_to_member($options->list[$j], array('link_target'  => op_image_tag_sf_image($options->list[$j]->getImageFileName(), array('size' => '76x76')), 'private_text' => op_image_tag_sf_image(NULL, array('size' => '76x76'))), '@obj_member_profile', $options->use_op_link_to_member_private) ?>
 <?php else: ?>
 <?php echo link_to(op_image_tag_sf_image($options->list[$j]->getImageFileName(), array('size' => '76x76')), $options->link_to.$options->list[$j]->getId()) ?>
 <?php endif; ?>
@@ -31,7 +32,7 @@
 <?php for ($j = ($i * $options->col) - $options->col; ($i * $options->col) > $j; $j++): ?>
 <td><?php if (!empty($options->list[$j])): ?>
 <?php if ($options->use_op_link_to_member): ?>
-<?php echo op_link_to_member($options->list[$j], array('link_target' => $options->list[$j]->getNameAndCount())) ?>
+<?php echo op_link_to_member($options->list[$j], array('link_target' => $options->list[$j]->getNameAndCount()), '@obj_member_profile', $options->use_op_link_to_member_private) ?>
 <?php else: ?>
 <?php echo link_to($options->list[$j]->getNameAndCount(), $options->link_to.$options->list[$j]->getId()) ?>
 <?php endif; ?>
diff --git a/lib/helper/opUtilHelper.php b/lib/helper/opUtilHelper.php
index eecc76299..200fbc0b6 100644
--- a/lib/helper/opUtilHelper.php
+++ b/lib/helper/opUtilHelper.php
@@ -1011,9 +1011,10 @@ function op_replace_sns_term($string)
  * @value  mixed   $value (string or Member object)
  * @param  string  $options
  * @param  string  $routeName
+ * @param  bool    $isCheckPrivate
  * @return string
  */
-function op_link_to_member($value, $options = array(), $routeName = '@obj_member_profile')
+function op_link_to_member($value, $options = array(), $routeName = '@obj_member_profile', $isCheckPrivate = false)
 {
   $member = null;
   if ($value instanceof sfOutputEscaper || $value instanceof Member)
@@ -1027,6 +1028,15 @@ function op_link_to_member($value, $options = array(), $routeName = '@obj_member
 
   if ($member && $member->id)
   {
+    if ($isCheckPrivate && sfContext::hasInstance())
+    {
+      $user = sfContext::getInstance()->getUser();
+      if (!$user->isSNSMember() && ProfileTable::PUBLIC_FLAG_WEB !== (int)$member->getConfig('profile_page_public_flag'))
+      {
+        return isset($options['private_text']) ? $options['private_text'] : __('Private<br />Member');
+      }
+    }
+
     if (!($member instanceof sfOutputEscaper))
     {
       $member = sfOutputEscaper::escape(sfConfig::get('sf_escaping_method'), $member);
diff --git a/test/unit/helper/opUtilHelperTest.php b/test/unit/helper/opUtilHelperTest.php
index ab5aa5a7e..52c9fa524 100644
--- a/test/unit/helper/opUtilHelperTest.php
+++ b/test/unit/helper/opUtilHelperTest.php
@@ -75,3 +75,7 @@
 
 Doctrine::getTable('SnsConfig')->set('nickname_of_member_who_does_not_have_credentials', 'I am a pen.');
 $t->is(op_link_to_member(null), 'I am a pen.', 'set nickname_of_member_who_does_not_have_credentials original setting');
+
+$t->is(op_link_to_member(1, array(), '@obj_member_profile', true), '非公開<br />メンバー', 'Displayed as Private Member');
+$t->is(op_link_to_member(1, array(), '@obj_member_profile', false), link_to('A', '@obj_member_profile?id=1'), 'link to member 1(Not Private)');
+$t->is(op_link_to_member(1, array('private_text' => 'private_text'), '@obj_member_profile', true), 'private_text', 'display of "private_text"');

From 4b61fde21ce62ecedb15e9eff141649f93e97266 Mon Sep 17 00:00:00 2001
From: C-nakajima <nakajima@tejimaya.com>
Date: Mon, 25 May 2015 14:20:07 +0900
Subject: [PATCH 485/630] (refs #3794, BP from #3602) Fixed a bug that if
 profile input value is empty, there are items that visibility is not changed.

---
 lib/form/doctrine/MemberProfileForm.class.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/lib/form/doctrine/MemberProfileForm.class.php b/lib/form/doctrine/MemberProfileForm.class.php
index 358483105..31b8c452e 100644
--- a/lib/form/doctrine/MemberProfileForm.class.php
+++ b/lib/form/doctrine/MemberProfileForm.class.php
@@ -54,18 +54,6 @@ public function save($memberId)
 
       $memberProfile = Doctrine::getTable('MemberProfile')->retrieveByMemberIdAndProfileId($memberId, $profile->getId());
 
-      if (is_null($value['value']))
-      {
-        if ($memberProfile)
-        {
-          if ($profile->isMultipleSelect())
-          {
-            $memberProfile->clearChildren();
-          }
-          $memberProfile->delete();
-        }
-        continue;
-      }
       if (!$memberProfile)
       {
         $memberProfile = new MemberProfile();

From 32588ac63a89a1a2061472e028a40923d631f1bc Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Wed, 10 Jun 2015 14:45:13 +0900
Subject: [PATCH 486/630] fix not to create empty Community( except image) if a
 Community created by smartphone(refs #3729, BP from #3588)

---
 apps/pc_frontend/modules/community/actions/actions.class.php | 1 -
 lib/action/opCommunityAction.class.php                       | 4 +---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/apps/pc_frontend/modules/community/actions/actions.class.php b/apps/pc_frontend/modules/community/actions/actions.class.php
index 2af12609f..47ef61222 100644
--- a/apps/pc_frontend/modules/community/actions/actions.class.php
+++ b/apps/pc_frontend/modules/community/actions/actions.class.php
@@ -56,7 +56,6 @@ public function executeEdit(opWebRequest $request)
   {
     $this->forwardIf($request->isSmartphone(), 'community', 'smtEdit');
 
-    $this->enableImage = true;
     $result = parent::executeEdit($request);
 
     if ($this->community->isNew()) {
diff --git a/lib/action/opCommunityAction.class.php b/lib/action/opCommunityAction.class.php
index 33b732b0d..2d785616c 100644
--- a/lib/action/opCommunityAction.class.php
+++ b/lib/action/opCommunityAction.class.php
@@ -73,9 +73,7 @@ public function executeEdit(opWebRequest $request)
 
     $this->communityForm       = new CommunityForm($this->community);
     $this->communityConfigForm = new CommunityConfigForm(array(), array('community' => $this->community));
-    $this->communityFileForm = isset($this->enableImage) && $this->enableImage ?
-      new CommunityFileForm(array(), array('community' => $this->community)) :
-      new CommunityFileForm();
+    $this->communityFileForm =  new CommunityFileForm(array(), array('community' => $this->community));
 
     if ($request->isMethod('post'))
     {

From 866ad999b5c3fbd9886b3e244e4707803bd93458 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Wed, 10 Jun 2015 14:45:49 +0900
Subject: [PATCH 487/630] Modified so as not to create a communityFileForm
 class if do not use file upload(refs #3729, BP from #3588)

---
 .../community/actions/actions.class.php       | 11 ++++++++
 lib/action/opCommunityAction.class.php        | 26 +++++++++++++------
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/apps/mobile_frontend/modules/community/actions/actions.class.php b/apps/mobile_frontend/modules/community/actions/actions.class.php
index 5fb35d0a0..3b4624c1c 100644
--- a/apps/mobile_frontend/modules/community/actions/actions.class.php
+++ b/apps/mobile_frontend/modules/community/actions/actions.class.php
@@ -140,4 +140,15 @@ public function executeDeleteImage(opWebRequest $request)
       $this->redirect('community/configImage?id='.$this->id);
     }
   }
+  /**
+   * Executes edit action
+   *
+   * @param sfRequest $request A request object
+   */
+  public function executeEdit(opWebRequest $request)
+  {
+    $this->unusedFileForm = true;
+
+    return parent::executeEdit($request);
+  }
 }
diff --git a/lib/action/opCommunityAction.class.php b/lib/action/opCommunityAction.class.php
index 2d785616c..c96fa69ae 100644
--- a/lib/action/opCommunityAction.class.php
+++ b/lib/action/opCommunityAction.class.php
@@ -73,22 +73,32 @@ public function executeEdit(opWebRequest $request)
 
     $this->communityForm       = new CommunityForm($this->community);
     $this->communityConfigForm = new CommunityConfigForm(array(), array('community' => $this->community));
-    $this->communityFileForm =  new CommunityFileForm(array(), array('community' => $this->community));
-
+    if (!$this->unusedFileForm){$this->communityFileForm = new CommunityFileForm(array(), array('community' => $this->community));}
+    
     if ($request->isMethod('post'))
     {
       $params = $request->getParameter('community');
       $params['id'] = $this->id;
       $this->communityForm->bind($params);
       $this->communityConfigForm->bind($request->getParameter('community_config'));
-      $this->communityFileForm->bind($request->getParameter('community_file'), $request->getFiles('community_file'));
-      if ($this->communityForm->isValid() && $this->communityConfigForm->isValid() && $this->communityFileForm->isValid())
+      if($this->communityFileForm)
+      {
+        $this->communityFileForm->bind($request->getParameter('community_file'), $request->getFiles('community_file'));
+        if ($this->communityForm->isValid() && $this->communityConfigForm->isValid() && $this->communityFileForm->isValid())
+        {
+         $this->communityForm->save();
+         $this->communityConfigForm->save();
+         $this->communityFileForm->save();
+       
+         $this->redirect('@community_home?id='.$this->community->getId());
+        }
+      }
+      elseif ($this->communityForm->isValid() && $this->communityConfigForm->isValid())
       {
-        $this->communityForm->save();
-        $this->communityConfigForm->save();
-        $this->communityFileForm->save();
+         $this->communityForm->save();
+         $this->communityConfigForm->save();
 
-        $this->redirect('@community_home?id='.$this->community->getId());
+         $this->redirect('@community_home?id='.$this->community->getId());
       }
     }
   }

From 6cd6fc2565564ca68af499926d2dfe655d94a6bf Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Wed, 10 Jun 2015 14:46:19 +0900
Subject: [PATCH 488/630] It aligned the indentation (refs #3729, BP from
 #3588)

---
 lib/action/opCommunityAction.class.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/action/opCommunityAction.class.php b/lib/action/opCommunityAction.class.php
index c96fa69ae..074da9aa1 100644
--- a/lib/action/opCommunityAction.class.php
+++ b/lib/action/opCommunityAction.class.php
@@ -86,19 +86,19 @@ public function executeEdit(opWebRequest $request)
         $this->communityFileForm->bind($request->getParameter('community_file'), $request->getFiles('community_file'));
         if ($this->communityForm->isValid() && $this->communityConfigForm->isValid() && $this->communityFileForm->isValid())
         {
-         $this->communityForm->save();
-         $this->communityConfigForm->save();
-         $this->communityFileForm->save();
-       
-         $this->redirect('@community_home?id='.$this->community->getId());
+          $this->communityForm->save();
+          $this->communityConfigForm->save();
+          $this->communityFileForm->save();
+
+          $this->redirect('@community_home?id='.$this->community->getId());
         }
       }
       elseif ($this->communityForm->isValid() && $this->communityConfigForm->isValid())
       {
-         $this->communityForm->save();
-         $this->communityConfigForm->save();
+        $this->communityForm->save();
+        $this->communityConfigForm->save();
 
-         $this->redirect('@community_home?id='.$this->community->getId());
+        $this->redirect('@community_home?id='.$this->community->getId());
       }
     }
   }

From 8792c5bfcb3fa955c0404600769ee888c564aece Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Wed, 10 Jun 2015 14:46:47 +0900
Subject: [PATCH 489/630] Modified to branch on whether non- mobile or mobile
 (refs #3729, BP from #3588)

---
 .../modules/community/actions/actions.class.php       | 11 -----------
 lib/action/opCommunityAction.class.php                |  7 +++++--
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/apps/mobile_frontend/modules/community/actions/actions.class.php b/apps/mobile_frontend/modules/community/actions/actions.class.php
index 3b4624c1c..5fb35d0a0 100644
--- a/apps/mobile_frontend/modules/community/actions/actions.class.php
+++ b/apps/mobile_frontend/modules/community/actions/actions.class.php
@@ -140,15 +140,4 @@ public function executeDeleteImage(opWebRequest $request)
       $this->redirect('community/configImage?id='.$this->id);
     }
   }
-  /**
-   * Executes edit action
-   *
-   * @param sfRequest $request A request object
-   */
-  public function executeEdit(opWebRequest $request)
-  {
-    $this->unusedFileForm = true;
-
-    return parent::executeEdit($request);
-  }
 }
diff --git a/lib/action/opCommunityAction.class.php b/lib/action/opCommunityAction.class.php
index 074da9aa1..65a855707 100644
--- a/lib/action/opCommunityAction.class.php
+++ b/lib/action/opCommunityAction.class.php
@@ -73,8 +73,11 @@ public function executeEdit(opWebRequest $request)
 
     $this->communityForm       = new CommunityForm($this->community);
     $this->communityConfigForm = new CommunityConfigForm(array(), array('community' => $this->community));
-    if (!$this->unusedFileForm){$this->communityFileForm = new CommunityFileForm(array(), array('community' => $this->community));}
-    
+    if (!sfConfig::get('app_is_mobile', false))
+    {
+      $this->communityFileForm = new CommunityFileForm(array(), array('community' => $this->community));
+    }
+
     if ($request->isMethod('post'))
     {
       $params = $request->getParameter('community');

From b06f4edf18c57176048f352fb7f22538d88ead40 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Wed, 10 Jun 2015 14:47:15 +0900
Subject: [PATCH 490/630] Processing of communityConfigForm has been changed to
 the common ones (refs #3729, BP from #3588)

---
 lib/action/opCommunityAction.class.php | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/lib/action/opCommunityAction.class.php b/lib/action/opCommunityAction.class.php
index 65a855707..703c0f444 100644
--- a/lib/action/opCommunityAction.class.php
+++ b/lib/action/opCommunityAction.class.php
@@ -87,19 +87,15 @@ public function executeEdit(opWebRequest $request)
       if($this->communityFileForm)
       {
         $this->communityFileForm->bind($request->getParameter('community_file'), $request->getFiles('community_file'));
-        if ($this->communityForm->isValid() && $this->communityConfigForm->isValid() && $this->communityFileForm->isValid())
-        {
-          $this->communityForm->save();
-          $this->communityConfigForm->save();
-          $this->communityFileForm->save();
-
-          $this->redirect('@community_home?id='.$this->community->getId());
-        }
       }
-      elseif ($this->communityForm->isValid() && $this->communityConfigForm->isValid())
+      if ($this->communityForm->isValid() && $this->communityConfigForm->isValid() && (!$this->communityFileForm || $this->communityFileForm->isValid()))
       {
         $this->communityForm->save();
         $this->communityConfigForm->save();
+        if ($this->communityFileForm)
+        {
+          $this->communityFileForm->save();
+        }
 
         $this->redirect('@community_home?id='.$this->community->getId());
       }

From 3f69572bf7cb5c4b19f40020a11d36e38c723e23 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Wed, 10 Jun 2015 14:47:40 +0900
Subject: [PATCH 491/630] Change to get the Parameters from the Form (refs
 #3729, BP from #3588)

---
 lib/action/opCommunityAction.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/action/opCommunityAction.class.php b/lib/action/opCommunityAction.class.php
index 703c0f444..9a262efc6 100644
--- a/lib/action/opCommunityAction.class.php
+++ b/lib/action/opCommunityAction.class.php
@@ -80,13 +80,13 @@ public function executeEdit(opWebRequest $request)
 
     if ($request->isMethod('post'))
     {
-      $params = $request->getParameter('community');
+      $params = $request->getParameter($this->communityForm->getName());
       $params['id'] = $this->id;
       $this->communityForm->bind($params);
-      $this->communityConfigForm->bind($request->getParameter('community_config'));
+      $this->communityConfigForm->bind($request->getParameter($this->communityConfigForm->getName()));
       if($this->communityFileForm)
       {
-        $this->communityFileForm->bind($request->getParameter('community_file'), $request->getFiles('community_file'));
+        $this->communityFileForm->bind($request->getParameter($this->communityFileForm->getName()), $request->getFiles('community_file'));
       }
       if ($this->communityForm->isValid() && $this->communityConfigForm->isValid() && (!$this->communityFileForm || $this->communityFileForm->isValid()))
       {

From d8591063889eb9c42e60eab055727840fa833f4f Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Wed, 10 Jun 2015 15:32:11 +0900
Subject: [PATCH 492/630] Fixed  a getFiles() to get the parameters from the
 Form (refs #3729, BP from #3588)

---
 lib/action/opCommunityAction.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/action/opCommunityAction.class.php b/lib/action/opCommunityAction.class.php
index 9a262efc6..61970754f 100644
--- a/lib/action/opCommunityAction.class.php
+++ b/lib/action/opCommunityAction.class.php
@@ -86,7 +86,7 @@ public function executeEdit(opWebRequest $request)
       $this->communityConfigForm->bind($request->getParameter($this->communityConfigForm->getName()));
       if($this->communityFileForm)
       {
-        $this->communityFileForm->bind($request->getParameter($this->communityFileForm->getName()), $request->getFiles('community_file'));
+        $this->communityFileForm->bind($request->getParameter($this->communityFileForm->getName()), $request->getFiles($this->communityFileForm->getName()));
       }
       if ($this->communityForm->isValid() && $this->communityConfigForm->isValid() && (!$this->communityFileForm || $this->communityFileForm->isValid()))
       {

From f7cacb3d1ec7b1408fafdc13c5eaaa36a5c258a3 Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 11 Jun 2015 16:32:54 +0900
Subject: [PATCH 493/630] version 3.8.16

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index f650de802..60c8a0a45 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.16-dev');
+  define('OPENPNE_VERSION', '3.8.16');
 }

From 3093a190ae01ed6c9e83c11ec4d8a817091f10bf Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 11 Jun 2015 16:36:57 +0900
Subject: [PATCH 494/630] started to development of OpenPNE 3.8.17

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 60c8a0a45..51fe6e5a5 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.16');
+  define('OPENPNE_VERSION', '3.8.17-dev');
 }

From 53a6c46aca0be34673c8ad08f62b943394670aa8 Mon Sep 17 00:00:00 2001
From: C-nakajima <nakajima@tejimaya.com>
Date: Thu, 20 Aug 2015 16:11:52 +0900
Subject: [PATCH 495/630] (refs #3811, BP from #3401) Bug Fixed a validation of
 sfValidatorChoice

---
 .../opRichTextareaOpenPNEConfigForm.class.php |  2 +-
 .../design/lib/PickHomeLayoutForm.class.php   |  2 +-
 .../mail/lib/opMailNotificationForm.class.php |  2 +-
 .../member/lib/AdminInviteForm.class.php      |  2 +-
 .../plugin/lib/PluginActivationForm.class.php |  2 +-
 .../MemberConfigMailForm.class.php            |  4 +-
 lib/form/doctrine/ActivityDataForm.class.php  |  2 +-
 lib/form/doctrine/BannerForm.class.php        |  4 +-
 .../doctrine/CommunityConfigForm.class.php    |  2 +-
 .../OAuthConsumerInformationForm.class.php    |  2 +-
 lib/form/doctrine/ProfileForm.class.php       |  2 +-
 ...pPermitMemberConfigSnsConfigForm.class.php |  2 +-
 lib/form/opLanguageSelecterForm.class.php     |  2 +-
 lib/form/opPresetProfileForm.class.php        |  2 +-
 lib/validator/opValidatorChoice.class.php     | 84 +++++++++++++++++++
 lib/validator/opValidatorProfile.class.php    |  2 +-
 ...hMailAddressPasswordRecoveryForm.class.php |  2 +-
 test/unit/validator/opValidatorChoiceTest.php | 49 +++++++++++
 18 files changed, 151 insertions(+), 18 deletions(-)
 create mode 100644 lib/validator/opValidatorChoice.class.php
 create mode 100644 test/unit/validator/opValidatorChoiceTest.php

diff --git a/apps/pc_backend/modules/advanced/lib/opRichTextareaOpenPNEConfigForm.class.php b/apps/pc_backend/modules/advanced/lib/opRichTextareaOpenPNEConfigForm.class.php
index 62ee842be..00f9f4335 100644
--- a/apps/pc_backend/modules/advanced/lib/opRichTextareaOpenPNEConfigForm.class.php
+++ b/apps/pc_backend/modules/advanced/lib/opRichTextareaOpenPNEConfigForm.class.php
@@ -28,7 +28,7 @@ public function configure()
       array_map(array(sfContext::getInstance()->getI18n(), '__') , self::$defaultModeChoice),
       'expanded' => true
     )));
-    $this->setValidator('default_mode', new sfValidatorChoice(array('choices' => array_keys(self::$defaultModeChoice))));
+    $this->setValidator('default_mode', new opValidatorChoice(array('choices' => array_keys(self::$defaultModeChoice))));
     $this->setDefault('default_mode', Doctrine::getTable('SnsConfig')->get('richtextarea_default_mode', 'text'));
     $this->widgetSchema->setLabel('default_mode', 'Default edit mode');
     $this->widgetSchema->setNameFormat('config[%s]');
diff --git a/apps/pc_backend/modules/design/lib/PickHomeLayoutForm.class.php b/apps/pc_backend/modules/design/lib/PickHomeLayoutForm.class.php
index b9feb6530..9cd907346 100644
--- a/apps/pc_backend/modules/design/lib/PickHomeLayoutForm.class.php
+++ b/apps/pc_backend/modules/design/lib/PickHomeLayoutForm.class.php
@@ -48,7 +48,7 @@ public function configure()
       'image_prefix' => 'layout_selection_',
     )));
 
-    $this->setValidator('layout', new sfValidatorChoice(array(
+    $this->setValidator('layout', new opValidatorChoice(array(
       'choices' => array_keys($this->choices),
     )));
     $this->widgetSchema->setNameFormat('pick_home_layout[%s]');
diff --git a/apps/pc_backend/modules/mail/lib/opMailNotificationForm.class.php b/apps/pc_backend/modules/mail/lib/opMailNotificationForm.class.php
index 08e6eac2d..7d1709b95 100644
--- a/apps/pc_backend/modules/mail/lib/opMailNotificationForm.class.php
+++ b/apps/pc_backend/modules/mail/lib/opMailNotificationForm.class.php
@@ -32,7 +32,7 @@ public function configure()
         }
 
         $this->setWidget($fieldName, new sfWidgetFormChoice(array('choices' => $choices, 'expanded' => true)));
-        $this->setValidator($fieldName, new sfValidatorChoice(array('choices' => array_keys($choices))));
+        $this->setValidator($fieldName, new opValidatorChoice(array('choices' => array_keys($choices))));
         $this->setDefault($fieldName, !in_array($fieldName, $disabledList));
         $this->widgetSchema->setLabel($fieldName, $v['caption']);
       }
diff --git a/apps/pc_backend/modules/member/lib/AdminInviteForm.class.php b/apps/pc_backend/modules/member/lib/AdminInviteForm.class.php
index 9e69235e7..d097d1b03 100644
--- a/apps/pc_backend/modules/member/lib/AdminInviteForm.class.php
+++ b/apps/pc_backend/modules/member/lib/AdminInviteForm.class.php
@@ -21,7 +21,7 @@ public function configure()
   {
     $choice = $this->getOption('authModes', array());
     $this->setWidget('auth_mode', new sfWidgetFormChoice(array('choices' => $choice)));
-    $this->setValidator('auth_mode', new sfValidatorChoice(array('choices' => array_keys($choice))));
+    $this->setValidator('auth_mode', new opValidatorChoice(array('choices' => array_keys($choice))));
 
     $this->setWidget('mail_address', new sfWidgetFormTextarea());
     $this->setValidator('mail_address', new sfValidatorPass());
diff --git a/apps/pc_backend/modules/plugin/lib/PluginActivationForm.class.php b/apps/pc_backend/modules/plugin/lib/PluginActivationForm.class.php
index c651c9347..b09035990 100644
--- a/apps/pc_backend/modules/plugin/lib/PluginActivationForm.class.php
+++ b/apps/pc_backend/modules/plugin/lib/PluginActivationForm.class.php
@@ -63,7 +63,7 @@ public function configure()
     }
 
     $this->setWidget($this->pluginFieldKey, new sfWidgetFormChoice($widgetOptions));
-    $this->setValidator($this->pluginFieldKey, new sfValidatorChoice($validatorOptions, $validatorMessages));
+    $this->setValidator($this->pluginFieldKey, new opValidatorChoice($validatorOptions, $validatorMessages));
     $this->setDefault($this->pluginFieldKey, $pluginDefault);
 
     $this->widgetSchema->setNameFormat('plugin_activation[%s]');
diff --git a/lib/form/MemberConfigForm/MemberConfigMailForm.class.php b/lib/form/MemberConfigForm/MemberConfigMailForm.class.php
index 2cf270650..b706b3723 100644
--- a/lib/form/MemberConfigForm/MemberConfigMailForm.class.php
+++ b/lib/form/MemberConfigForm/MemberConfigMailForm.class.php
@@ -50,7 +50,7 @@ public function configure()
           if ('dailyNews' !== $key)
           {
             $this->setWidget($name, new sfWidgetFormChoice(array('choices' => $choices, 'expanded' => true)));
-            $this->setValidator($name, new sfValidatorChoice(array('choices' => array_keys($choices), 'required' => true)));
+            $this->setValidator($name, new opValidatorChoice(array('choices' => array_keys($choices), 'required' => true)));
             $this->widgetSchema->setLabel($name, $value['caption']);
 
             $this->setDefault($name, $this->member->getConfig($name, 1));
@@ -67,7 +67,7 @@ public function configure()
             ), $count);
             $dailyNewsChoices = array("Don't Send", $translated, "Send Everyday");
             $this->setWidget($name, new sfWidgetFormChoice(array('choices' => $dailyNewsChoices, 'expanded' => true)));
-            $this->setValidator($name, new sfValidatorChoice(array('choices' => array_keys($dailyNewsChoices), 'required' => true)));
+            $this->setValidator($name, new opValidatorChoice(array('choices' => array_keys($dailyNewsChoices), 'required' => true)));
             $this->widgetSchema->setLabel($name, $value['caption']);
 
             $this->setDefault($name, $this->member->getConfig($name, 2));
diff --git a/lib/form/doctrine/ActivityDataForm.class.php b/lib/form/doctrine/ActivityDataForm.class.php
index ba64e3d3e..07d3c0c38 100644
--- a/lib/form/doctrine/ActivityDataForm.class.php
+++ b/lib/form/doctrine/ActivityDataForm.class.php
@@ -29,7 +29,7 @@ public function configure()
 
     $choices = $this->getObject()->getTable()->getPublicFlags();
     $this->setWidget('public_flag', new sfWidgetFormChoice(array('choices' => $choices)));
-    $this->setValidator('public_flag', new sfValidatorChoice(array('choices' => array_keys($choices))));
+    $this->setValidator('public_flag', new opValidatorChoice(array('choices' => array_keys($choices))));
 
     $this->setWidget('next_uri', new opWidgetFormInputHiddenNextUri());
     $this->setValidator('next_uri', new opValidatorNextUri());
diff --git a/lib/form/doctrine/BannerForm.class.php b/lib/form/doctrine/BannerForm.class.php
index 66a10d5db..b7763758b 100644
--- a/lib/form/doctrine/BannerForm.class.php
+++ b/lib/form/doctrine/BannerForm.class.php
@@ -40,7 +40,7 @@ public function setup()
       );
       $this->setValidator(
         $name,
-        new sfValidatorChoice(array('choices' => array('1', '0')))
+        new opValidatorChoice(array('choices' => array('1', '0')))
       );
     }
     // html
@@ -60,7 +60,7 @@ public function setup()
     );
     $this->setValidator(
       'is_use_html',
-      new sfValidatorChoice(array('choices' => array('1', '0')))
+      new opValidatorChoice(array('choices' => array('1', '0')))
     );
 
     $this->widgetSchema->setNameFormat('banner[%s]');
diff --git a/lib/form/doctrine/CommunityConfigForm.class.php b/lib/form/doctrine/CommunityConfigForm.class.php
index 41a039f24..84e396c76 100644
--- a/lib/form/doctrine/CommunityConfigForm.class.php
+++ b/lib/form/doctrine/CommunityConfigForm.class.php
@@ -75,7 +75,7 @@ public function generateConfigWidgets()
       );
       $name = 'is_send_'.$app.'_'.$template.'_mail';
       $this->setWidget($name, new sfWidgetFormChoice(array('choices' => $choices, 'expanded' => true)));
-      $this->setValidator($name, new sfValidatorChoice(array('choices' => array_keys($choices))));
+      $this->setValidator($name, new opValidatorChoice(array('choices' => array_keys($choices))));
       $this->widgetSchema->setLabel($name, $i18n->__('Receive a notice mail when member joined'));
       $this->widgetSchema->setHelp($name, $i18n->__('Send a notice mail to administrator when new member joined the %community%.'));
 
diff --git a/lib/form/doctrine/OAuthConsumerInformationForm.class.php b/lib/form/doctrine/OAuthConsumerInformationForm.class.php
index 842c719b9..fd6699514 100644
--- a/lib/form/doctrine/OAuthConsumerInformationForm.class.php
+++ b/lib/form/doctrine/OAuthConsumerInformationForm.class.php
@@ -26,7 +26,7 @@ public function configure()
 
     $apis = opToolkit::retrieveAPIList();
     $this->setWidget('using_apis', new sfWidgetFormSelectMany(array('choices' => $apis), array('size' => 10)));
-    $this->setValidator('using_apis', new sfValidatorChoice(array('multiple' => true, 'choices' => array_keys($apis))));
+    $this->setValidator('using_apis', new opValidatorChoice(array('multiple' => true, 'choices' => array_keys($apis))));
     $this->getWidgetSchema()->setHelp('using_apis', 'Select apis that your application needs.');
 
     $this->widgetSchema->getFormFormatter()->setTranslationCatalogue('api');
diff --git a/lib/form/doctrine/ProfileForm.class.php b/lib/form/doctrine/ProfileForm.class.php
index 4c22f4421..77d029332 100644
--- a/lib/form/doctrine/ProfileForm.class.php
+++ b/lib/form/doctrine/ProfileForm.class.php
@@ -64,7 +64,7 @@ public function configure()
     $this->mergePostValidator(new sfValidatorCallback(array('callback' => array('ProfileForm', 'validateValueMin'))));
     $this->mergePostValidator(new sfValidatorCallback(array('callback' => array('ProfileForm', 'validateValueMax'))));
 
-    $this->setValidator('default_public_flag', new sfValidatorChoice(array('choices' => array_keys(Doctrine::getTable('Profile')->getPublicFlags(false)))));
+    $this->setValidator('default_public_flag', new opValidatorChoice(array('choices' => array_keys(Doctrine::getTable('Profile')->getPublicFlags(false)))));
     $this->setValidator('value_min', new sfValidatorPass());
     $this->setValidator('value_max', new sfValidatorPass());
     $this->setValidator('value_type', new sfValidatorString(array('required' => false, 'empty_value' => 'string')));
diff --git a/lib/form/doctrine/opPermitMemberConfigSnsConfigForm.class.php b/lib/form/doctrine/opPermitMemberConfigSnsConfigForm.class.php
index fe3189d34..535393507 100644
--- a/lib/form/doctrine/opPermitMemberConfigSnsConfigForm.class.php
+++ b/lib/form/doctrine/opPermitMemberConfigSnsConfigForm.class.php
@@ -40,7 +40,7 @@ public function configure()
     ));
 
     $this->setValidators(array(
-      'ignored_sns_config' => new sfValidatorChoice(array('multiple' => true, 'choices' => array_keys($choices), 'required' => false)),
+      'ignored_sns_config' => new opValidatorChoice(array('multiple' => true, 'choices' => array_keys($choices), 'required' => false)),
     ));
 
     $default = Doctrine::getTable('SnsConfig')->get('ignored_sns_config', array());
diff --git a/lib/form/opLanguageSelecterForm.class.php b/lib/form/opLanguageSelecterForm.class.php
index 67d131b68..dc2f4c16a 100644
--- a/lib/form/opLanguageSelecterForm.class.php
+++ b/lib/form/opLanguageSelecterForm.class.php
@@ -25,7 +25,7 @@ public function configure()
       'next_uri' => new opWidgetFormInputHiddenNextUri(),
     ));   
     $this->setValidators(array(
-      'culture' => new sfValidatorChoice(array('choices' => array_keys($choices))),
+      'culture' => new opValidatorChoice(array('choices' => array_keys($choices))),
       'next_uri' => new opValidatorNextUri(),
     ));
 
diff --git a/lib/form/opPresetProfileForm.class.php b/lib/form/opPresetProfileForm.class.php
index d47b7b2ad..d3b902bb5 100644
--- a/lib/form/opPresetProfileForm.class.php
+++ b/lib/form/opPresetProfileForm.class.php
@@ -26,7 +26,7 @@ public function configure()
     if ($this->isNew())
     {
       $this->setWidget('preset', new sfWidgetFormSelect(array('choices' => $this->getPresetChoiceList())));
-      $this->setValidator('preset', new sfValidatorChoice(array('choices' => array_keys($this->getPresetChoiceList()))));
+      $this->setValidator('preset', new opValidatorChoice(array('choices' => array_keys($this->getPresetChoiceList()))));
       $this->widgetSchema->setLabel('preset', 'Preset');
       $this->widgetSchema->moveField('preset', sfWidgetFormSchema::FIRST);
     }
diff --git a/lib/validator/opValidatorChoice.class.php b/lib/validator/opValidatorChoice.class.php
new file mode 100644
index 000000000..a4ab992ef
--- /dev/null
+++ b/lib/validator/opValidatorChoice.class.php
@@ -0,0 +1,84 @@
+<?php
+
+class opValidatorChoice extends sfValidatorChoice
+{
+  /**
+   * @see sfValidatorBase
+   */
+  protected function doClean($value)
+  {
+    $choices = $this->getChoices();
+
+    if ($this->getOption('multiple'))
+    {
+      $value = $this->cleanMultiple($value, $choices);
+    }
+    else
+    {
+      if (!self::inChoices($value, $choices))
+      {
+        throw new sfValidatorError($this, 'invalid', array('value' => $value));
+      }
+    }
+
+    return $value;
+  }
+
+  /**
+   * Cleans a value when multiple is true.
+   *
+   * @param  mixed $value The submitted value
+   *
+   * @return array The cleaned value
+   */
+  protected function cleanMultiple($value, $choices)
+  {
+    if (!is_array($value))
+    {
+      $value = array($value);
+    }
+
+    foreach ($value as $v)
+    {
+      if (!self::inChoices($v, $choices))
+      {
+        throw new sfValidatorError($this, 'invalid', array('value' => $v));
+      }
+    }
+
+    $count = count($value);
+
+    if ($this->hasOption('min') && $count < $this->getOption('min'))
+    {
+      throw new sfValidatorError($this, 'min', array('count' => $count, 'min' => $this->getOption('min')));
+    }
+
+    if ($this->hasOption('max') && $count > $this->getOption('max'))
+    {
+      throw new sfValidatorError($this, 'max', array('count' => $count, 'max' => $this->getOption('max')));
+    }
+
+    return $value;
+  }
+
+  /**
+   * Checks if a value is part of given choices (see bug #4212)
+   *
+   * @param  mixed $value   The value to check
+   * @param  array $choices The array of available choices
+   *
+   * @return Boolean
+   */
+  static protected function inChoices($value, array $choices = array())
+  {
+    foreach ($choices as $choice)
+    {
+      if ((string) $choice === (string) $value)
+      {
+        return true;
+      }
+    }
+
+    return false;
+  }
+}
diff --git a/lib/validator/opValidatorProfile.class.php b/lib/validator/opValidatorProfile.class.php
index 5c408c2e5..0b42dde1e 100644
--- a/lib/validator/opValidatorProfile.class.php
+++ b/lib/validator/opValidatorProfile.class.php
@@ -43,7 +43,7 @@ protected function doClean($value)
       {
         throw new sfValidatorError($this, 'invalid');
       }
-      $validator = new sfValidatorChoice(array('choices' => array_keys($this->profile->getPublicFlags())));
+      $validator = new opValidatorChoice(array('choices' => array_keys($this->profile->getPublicFlags())));
       $clean['public_flag'] = $validator->clean($value['public_flag']);
     }
 
diff --git a/plugins/opAuthMailAddressPlugin/lib/form/opAuthMailAddressPasswordRecoveryForm.class.php b/plugins/opAuthMailAddressPlugin/lib/form/opAuthMailAddressPasswordRecoveryForm.class.php
index b7b58e200..364caca3d 100644
--- a/plugins/opAuthMailAddressPlugin/lib/form/opAuthMailAddressPasswordRecoveryForm.class.php
+++ b/plugins/opAuthMailAddressPlugin/lib/form/opAuthMailAddressPasswordRecoveryForm.class.php
@@ -32,7 +32,7 @@ public function configure()
 
     $this->setValidators(array(
       'mail_address' => new sfValidatorEmail(),
-      'secret_question' => new sfValidatorChoice(array('choices' => array_keys($choices))),
+      'secret_question' => new opValidatorChoice(array('choices' => array_keys($choices))),
       'secret_answer' => new opValidatorString(),
     ));
 
diff --git a/test/unit/validator/opValidatorChoiceTest.php b/test/unit/validator/opValidatorChoiceTest.php
new file mode 100644
index 000000000..2a5e1192b
--- /dev/null
+++ b/test/unit/validator/opValidatorChoiceTest.php
@@ -0,0 +1,49 @@
+<?php
+
+include_once dirname(__FILE__) . '/../../bootstrap/unit.php';
+
+$t = new lime_test(9, new lime_output_color());
+
+$t->diag('opValidatorChoice');
+
+$t->diag('->clean()');
+
+$v = new opValidatorChoice(array(
+  'choices' => array('00', '000', '0.0'),
+));
+
+try
+{
+  $v->clean('0');
+  $t->fail('->clean() throws a sfValidatorError if not in choices');
+  $t->skip('', 1);
+}
+catch (Exception $e)
+{
+  $t->pass('->clean() throws a sfValidatorError if not in choices');
+  $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
+}
+
+$t->is($v->clean('00'), '00', '->clean() accepts in choices');
+$t->is($v->clean('000'), '000', '->clean() accepts in choices');
+$t->is($v->clean('0.0'), '0.0', '->clean() accepts in choices');
+
+
+$v = new opValidatorChoice(array(
+  'choices' => array('011', '11.0'),
+));
+
+try
+{
+  $v->clean('11');
+  $t->fail('->clean() throws a sfValidatorError if not in choices');
+  $t->skip('', 1);
+}
+catch (Exception $e)
+{
+  $t->pass('->clean() throws a sfValidatorError if not in choices');
+  $t->is($e->getCode(), 'invalid', '->clean() throws a sfValidatorError');
+}
+
+$t->is($v->clean('011'), '011', '->clean() accepts in choices');
+$t->is($v->clean('11.0'), '11.0', '->clean() accepts in choices');

From 45ed0013aa3bdeecbf0f38b421a4f1e5218fb511 Mon Sep 17 00:00:00 2001
From: Kousuke Ebihara <ebihara@php.net>
Date: Thu, 10 Jan 2013 17:27:54 +0900
Subject: [PATCH 496/630] (refs #3814, BP from #3391) In the test environment
 it was not allowed to override the session storage settings that are defined
 in the factories.yml

---
 lib/config/opProjectConfiguration.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/config/opProjectConfiguration.class.php b/lib/config/opProjectConfiguration.class.php
index 5f0c4254d..5c93186b1 100644
--- a/lib/config/opProjectConfiguration.class.php
+++ b/lib/config/opProjectConfiguration.class.php
@@ -160,7 +160,11 @@ protected function setOpenPNEConfiguration()
 
       opToolkit::writeCacheFile($opConfigCachePath, '<?php return '.var_export($config, true).';');
     }
-    $this->configureSessionStorage($config['session_storage']['name'], (array)$config['session_storage']['options']);
+
+    if ('test' !== sfConfig::get('sf_environment'))
+    {
+      $this->configureSessionStorage($config['session_storage']['name'], (array)$config['session_storage']['options']);
+    }
     unset($config['session_storage']);
 
     foreach ($config as $key => $value)

From 350682ea27df7c6595bd8772f632903e04560ed5 Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@tejimaya.com>
Date: Thu, 13 Jun 2013 10:20:58 +0900
Subject: [PATCH 497/630] (refs #3817, BP from #3388) changed
 opPDODatabaseSessionStorage::write() to replace 4 bytes UTF-8 characters to
 U+FFFD in MySQL non binary string column

---
 .../opPDODatabaseSessionStorage.class.php     | 51 +++++++++++++++++++
 .../opPDODatabaseSessionStrageTest.class.php  | 37 ++++++++++++++
 2 files changed, 88 insertions(+)
 create mode 100644 test/unit/user/opPDODatabaseSessionStrageTest.class.php

diff --git a/lib/user/opPDODatabaseSessionStorage.class.php b/lib/user/opPDODatabaseSessionStorage.class.php
index 138638966..4b415ff54 100644
--- a/lib/user/opPDODatabaseSessionStorage.class.php
+++ b/lib/user/opPDODatabaseSessionStorage.class.php
@@ -26,4 +26,55 @@ public function sessionOpen($path = null, $name = null)
 
     return parent::sessionOpen($path, $name);
   }
+
+  /**
+   * Writes data to this storage replacing 4 byte utf8 characters.
+   *
+   * @param string $key   A unique key identifying your data
+   * @param mixed  $data  Data associated with your key
+   *
+   * @see sfSessionStorage
+   */
+  public function write($key, $data)
+  {
+    // "utf8", a type of character set in MySQL, can't handle 4 bytes utf8 characters
+    // so we replace such a character to "U+FFFD" (A unicode "REPLACEMENT CHARACTER").
+    if (!$this->isReadyFor4BytesUtf8())
+    {
+      $data = $this->replace4BytesUtf8Characters($data);
+    }
+
+    parent::write($key, $data);
+  }
+
+  protected function replace4BytesUtf8Characters($value)
+  {
+    if (is_array($value))
+    {
+      $result = array();
+      foreach ($value as $k => $v)
+      {
+        $result[$this->replace4BytesUtf8Characters($k)] = $this->replace4BytesUtf8Characters($v);
+      }
+
+      return $result;
+    }
+    elseif (!is_string($value))
+    {
+      return $value;
+    }
+
+    // See: RFC 3629 (section 4, Syntax of UTF-8 Byte Sequences)
+    // http://tools.ietf.org/html/rfc3629#section-4
+    return preg_replace('/(
+      \xF0[\x90-\xBF][\x80-\xBF]{2}| # %xF0 %x90-BF 2( UTF8-tail )
+      [\xF1-\xF3][\x80-\xBF]{3}|     # %xF1-F3 3( UTF8-tail )
+      \xF4[\x80-\x8F][\x80-\xBF]{2}  # %xF4 %x80-8F 2( UTF8-tail )
+    )/x', "\xEF\xBF\xBD", $value);
+  }
+
+  protected function isReadyFor4BytesUtf8()
+  {
+    return 'mysql' !== $this->db->getAttribute(PDO::ATTR_DRIVER_NAME);
+  }
 }
diff --git a/test/unit/user/opPDODatabaseSessionStrageTest.class.php b/test/unit/user/opPDODatabaseSessionStrageTest.class.php
new file mode 100644
index 000000000..7285e5ed2
--- /dev/null
+++ b/test/unit/user/opPDODatabaseSessionStrageTest.class.php
@@ -0,0 +1,37 @@
+<?php
+
+require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+
+$_app = 'pc_frontend';
+$_end = 'test';
+$configuration = ProjectConfiguration::getApplicationConfiguration($_app, $_env, true);
+sfContext::createInstance($configuration);
+new sfDatabaseManager($configuration);
+
+$t = new lime_test(2 + 2, new lime_output_color());
+
+$storage = new opPDODatabaseSessionStorage(array(
+  'db_table'    => 'session',
+  'database'    => 'doctrine',
+  'db_id_col'   => 'id',
+  'db_data_col' => 'session_data',
+  'db_time_col' => 'time',
+));
+
+$t->ok($storage instanceof sfStorage, 'sfPDOSessionStorage is an instance of sfStorage');
+$t->ok($storage instanceof sfDatabaseSessionStorage, 'sfPDOSessionStorage is an instance of sfDatabaseSessionStorage');
+
+$storage->sessionOpen();
+
+// main test
+
+$sessionId = '1';
+$newSessionData = 'foo:bar:baz';
+$storage->write($sessionId, $newSessionData);
+$t->is($storage->read($sessionId), $newSessionData, 'session data can get data correctly');
+
+$sessionId = '1';
+$newSessionData = 'testⓉⒺⓈⓉテスト🅃🄴🅂🅃てすと';
+$strConverted = 'testⓉⒺⓈⓉテスト����てすと';
+$storage->write($sessionId, $newSessionData);
+$t->is($storage->read($sessionId), $strConverted, 'session data using 4 byte utf characters can get data correctly');

From eb71b19985d8dad80f6652118b935aa028196299 Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 10 Sep 2015 15:07:47 +0900
Subject: [PATCH 498/630] version 3.8.17

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 51fe6e5a5..6b76ea82d 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.17-dev');
+  define('OPENPNE_VERSION', '3.8.17');
 }

From e67b62a8468ffadaea5306e95267a2b5001e934b Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 10 Sep 2015 15:22:16 +0900
Subject: [PATCH 499/630] started to development of OpenPNE 3.8.18

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 6b76ea82d..0a937a422 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.17');
+  define('OPENPNE_VERSION', '3.8.18-dev');
 }

From a16db1a97b4405ac08dcdeac1c392cfd854be5f8 Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Wed, 16 Sep 2015 15:08:32 +0900
Subject: [PATCH 500/630] (fixed #3066) fixed authentication problem when using
 a register_token.

---
 .../modules/opAuthMailAddress/actions/actions.class.php          | 1 -
 .../modules/opAuthMailAddress/actions/actions.class.php          | 1 -
 2 files changed, 2 deletions(-)

diff --git a/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/actions/actions.class.php b/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/actions/actions.class.php
index 6e3ce7c8e..12bc1a4f8 100644
--- a/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/actions/actions.class.php
+++ b/plugins/opAuthMailAddressPlugin/apps/mobile_frontend/modules/opAuthMailAddress/actions/actions.class.php
@@ -55,7 +55,6 @@ public function executeRegister($request)
       return sfView::ERROR;
     }
 
-    $this->getUser()->setMemberId($memberConfig->getMemberId());
     $this->getUser()->setIsSNSRegisterBegin(true);
 
     $this->redirect('member/registerInput?token='.$token);
diff --git a/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/actions/actions.class.php b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/actions/actions.class.php
index d2e86fb96..3f44f15f1 100644
--- a/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/actions/actions.class.php
+++ b/plugins/opAuthMailAddressPlugin/apps/pc_frontend/modules/opAuthMailAddress/actions/actions.class.php
@@ -67,7 +67,6 @@ public function executeRegister($request)
       return sfView::ERROR;
     }
 
-    $this->getUser()->setMemberId($memberConfig->getMemberId());
     $this->getUser()->setIsSNSRegisterBegin(true);
 
     $this->redirect('member/registerInput?token='.$token);

From 022aac5433d5162557deb263a21216118011b023 Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Fri, 18 Sep 2015 16:02:19 +0900
Subject: [PATCH 501/630] (fixed #3392) applied the [33466] fixed a possible DB
 session fixation attack(patch from Dmitri Groutso)

http://trac.symfony-project.org/changeset/33466
---
 lib/vendor/symfony/lib/user/sfBasicSecurityUser.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/vendor/symfony/lib/user/sfBasicSecurityUser.class.php b/lib/vendor/symfony/lib/user/sfBasicSecurityUser.class.php
index 23ed4352c..7d394ccaa 100644
--- a/lib/vendor/symfony/lib/user/sfBasicSecurityUser.class.php
+++ b/lib/vendor/symfony/lib/user/sfBasicSecurityUser.class.php
@@ -70,7 +70,7 @@ public function removeCredential($credential)
 
           unset($this->credentials[$key]);
 
-          $this->storage->regenerate(false);
+          $this->storage->regenerate(true);
 
           return;
         }
@@ -117,7 +117,7 @@ public function addCredentials()
 
     if ($added)
     {
-      $this->storage->regenerate(false);
+      $this->storage->regenerate(true);
     }
   }
 
@@ -205,7 +205,7 @@ public function setAuthenticated($authenticated)
 
       $this->dispatcher->notify(new sfEvent($this, 'user.change_authentication', array('authenticated' => $this->authenticated)));
 
-      $this->storage->regenerate(false);
+      $this->storage->regenerate(true);
     }
   }
 

From e3a049ff53a3ef6d29144dd79c339c9d99e58d9f Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Wed, 7 Oct 2015 13:29:18 +0900
Subject: [PATCH 502/630] version 3.8.17.1

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 6b76ea82d..e24267dca 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.17');
+  define('OPENPNE_VERSION', '3.8.17.1');
 }

From 5ceedaad89f47cab670726451fa93140b4231a43 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Fri, 6 Nov 2015 19:49:30 +0900
Subject: [PATCH 503/630] [sfImageHandlerPlugin]
 sfImageGeneratorImageTransform::doResize() causes an error when using
 ImageMagick (fixes #3859, BP from #3195)

---
 .../lib/image/generator/sfImageGeneratorImageTransform.php   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php b/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php
index eba3c4cef..431799b89 100644
--- a/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php
+++ b/lib/plugins/sfImageHandlerPlugin/lib/image/generator/sfImageGeneratorImageTransform.php
@@ -91,8 +91,9 @@ protected function doResize($tmpfilename)
       {
         throw new sfException($result->getMessage());
       }
-      $this->transform->load($tmpoutputfilename);
-      unlink($tmpoutputfilename);     
+      rename($tmpoutputfilename, $tmpfilename);
+      $this->transform->load($tmpfilename);
+      $this->transform->fit($this->width, $this->height);
     }
 
     if ($this->width && $this->height)

From ad44939275a640b41bd3d74078b91245b3a19780 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Mon, 9 Nov 2015 18:32:16 +0900
Subject: [PATCH 504/630] (refs #3868, BP from #3734) added style 'overflow:
 hidden;' for 'row_membername' class in smt_main.css

---
 web/css/smt_main.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web/css/smt_main.css b/web/css/smt_main.css
index 19ba275df..a50562902 100644
--- a/web/css/smt_main.css
+++ b/web/css/smt_main.css
@@ -312,6 +312,7 @@ hr.white2 {
 .row_membername {
   height: 30px;
   line-height: 12px;
+  overflow: hidden;
 }
 
 .marginl0 {

From 4854ac79163ef99c8cbeed97d15083fb405810df Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Tue, 8 Dec 2015 23:16:15 +0900
Subject: [PATCH 505/630] show the age at the profile page correctly(fixes
 #3858, BP from #2661)

---
 apps/pc_frontend/modules/member/templates/_profileListBox.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/pc_frontend/modules/member/templates/_profileListBox.php b/apps/pc_frontend/modules/member/templates/_profileListBox.php
index bf17aee76..e3c7623f2 100644
--- a/apps/pc_frontend/modules/member/templates/_profileListBox.php
+++ b/apps/pc_frontend/modules/member/templates/_profileListBox.php
@@ -3,7 +3,7 @@
 $culture = sfCultureInfo::getInstance($sf_user->getCulture());
 
 $list = array();
-if ($member->getAge(true))
+if ($member->getAge(true) !== false)
 {
   $ageValue = __('%1% years old', array('%1%' => $member->getAge()));
   if ($member->getConfig('age_public_flag') == ProfileTable::PUBLIC_FLAG_FRIEND)

From 6dd66f12af1f4e15b254d6d7c1943db21ef85f55 Mon Sep 17 00:00:00 2001
From: C-nakajima <nakajima@tejimaya.com>
Date: Wed, 9 Dec 2015 14:36:07 +0900
Subject: [PATCH 506/630] (refs #3866, BP from #3492) repair the return value
 exactly

---
 .../pc_backend/modules/design/lib/PickHomeLayoutForm.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/pc_backend/modules/design/lib/PickHomeLayoutForm.class.php b/apps/pc_backend/modules/design/lib/PickHomeLayoutForm.class.php
index b9feb6530..74daaa60e 100644
--- a/apps/pc_backend/modules/design/lib/PickHomeLayoutForm.class.php
+++ b/apps/pc_backend/modules/design/lib/PickHomeLayoutForm.class.php
@@ -70,6 +70,7 @@ public function save()
     $value = $this->choices[$this->values['layout']];
     $snsConfig->setValue($value);
 
-    return (bool)$snsConfig->save();
+    $snsConfig->save();
+    return true;
   }
 }

From ef7c8a7f054d3efa0a36061412850aecf8e695ba Mon Sep 17 00:00:00 2001
From: C-nakajima <nakajima@tejimaya.com>
Date: Wed, 9 Dec 2015 15:22:59 +0900
Subject: [PATCH 507/630] (refs #3866, BP from #3492) repair the return value
 exactly

---
 apps/pc_backend/modules/design/lib/PickHomeLayoutForm.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/pc_backend/modules/design/lib/PickHomeLayoutForm.class.php b/apps/pc_backend/modules/design/lib/PickHomeLayoutForm.class.php
index 74daaa60e..291e7f050 100644
--- a/apps/pc_backend/modules/design/lib/PickHomeLayoutForm.class.php
+++ b/apps/pc_backend/modules/design/lib/PickHomeLayoutForm.class.php
@@ -71,6 +71,7 @@ public function save()
     $snsConfig->setValue($value);
 
     $snsConfig->save();
+
     return true;
   }
 }

From 1de1484f58cf5e571a35894cebbba85d6480a838 Mon Sep 17 00:00:00 2001
From: C-nakajima <nakajima@tejimaya.com>
Date: Wed, 9 Dec 2015 20:57:07 +0900
Subject: [PATCH 508/630] (refs #3850, BP from #3848) updated the
 mobile_ip_address list for release 2014/07/10

---
 lib/config/config/mobile_ip_address.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/config/config/mobile_ip_address.yml b/lib/config/config/mobile_ip_address.yml
index 4b364a77f..51391ede7 100644
--- a/lib/config/config/mobile_ip_address.yml
+++ b/lib/config/config/mobile_ip_address.yml
@@ -15,8 +15,8 @@
 ######################################
 
 ######################################
-# 2014/07/10 リリース版
-# 2014/07 のau IPアドレス帯域廃止対応
+# 2015/12/10 リリース版
+# 2016/01 のau IPアドレス帯域追加対応
 ######################################
 
 # DoCoMo (2010/06/24更新)
@@ -31,9 +31,10 @@ docomo:
   - 210.153.84.0/24
   - 210.153.86.0/24
 
-# au 2011年夏モデル以前(2014/07/10更新)
+# au 2011年夏モデル以前(2015/12/10更新)
 # http://www.au.kddi.com/ezfactory/tec/spec/ezsava_ip.html
 ezweb:
+  - 27.80.181.240/28
   - 27.90.136.0/27
   - 27.90.136.32/27
   - 27.90.136.64/27
@@ -50,6 +51,7 @@ ezweb:
   - 27.90.137.160/27
   - 27.90.137.192/27
   - 27.90.137.224/27
+  - 27.90.220.112/28
   - 61.117.2.32/29
   - 61.117.2.40/29
   - 111.86.141.192/26
@@ -75,8 +77,10 @@ ezweb:
   - 219.108.158.40/29
   - 219.125.146.0/28
 
-# au 2011年秋冬モデル以降 (2013/09/02更新)
+# au 2011年秋冬モデル以降 (2015/12/10更新)
 # http://www.au.kddi.com/ezfactory/tec/spec/ezsava_ip.html
+  - 27.90.220.224/28
+  - 27.90.220.240/28
   - 106.162.214.160/29
   - 111.107.116.64/26
   - 111.107.116.192/28

From 2a0eb313d37573951b20326871d8bf10c07e947c Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 10 Dec 2015 16:27:14 +0900
Subject: [PATCH 509/630] version 3.8.18

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 0a937a422..ad0d2b697 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.18-dev');
+  define('OPENPNE_VERSION', '3.8.18');
 }

From dcec3318e7b3173ff2e84ff39ce19d946eaa3f78 Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 10 Dec 2015 16:34:54 +0900
Subject: [PATCH 510/630] started to development of OpenPNE 3.8.19

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index ad0d2b697..c140dbe09 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.18');
+  define('OPENPNE_VERSION', '3.8.19-dev');
 }

From 35db9b3d58d1e9cba2b039bc478a8b1d39d6997c Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Tue, 5 Jan 2016 17:44:40 +0900
Subject: [PATCH 511/630] Modified Activity gadget take the setting of Access
 block (refs #3275)

---
 lib/model/doctrine/ActivityDataTable.class.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/model/doctrine/ActivityDataTable.class.php b/lib/model/doctrine/ActivityDataTable.class.php
index 2436a20c2..7201a80f8 100644
--- a/lib/model/doctrine/ActivityDataTable.class.php
+++ b/lib/model/doctrine/ActivityDataTable.class.php
@@ -253,6 +253,10 @@ public function addFriendActivityQuery(Doctrine_Query $q, $memberId, $isCheckApp
     $q->andWhere('('.$dql.')', $dqlParams);
     $q->andWhere('in_reply_to_activity_id IS NULL');
 
+    $viewerMemberId = sfContext::getInstance()->getUser()->getMemberId();
+    $blockedBy = Doctrine_Core::getTable('MemberRelationship')->getBlockedMemberIdsByTo($viewerMemberId);
+    $q->whereNotIn('member_id', $blockedBy);
+
     if ($isCheckApp)
     {
       if ('mobile_frontend' == sfConfig::get('sf_app'))
@@ -382,6 +386,10 @@ public function addAllMemberActivityQuery($q, $isCheckApp = true)
       }
     }
 
+    $viewerMemberId = sfContext::getInstance()->getUser()->getMemberId();
+    $blockedBy = Doctrine_Core::getTable('MemberRelationship')->getBlockedMemberIdsByTo($viewerMemberId);
+    $q->whereNotIn('member_id', $blockedBy);
+
     return $q;
   }
 

From a69478a5e5552e4844b7dd085fd2b1dab3641b23 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Tue, 5 Jan 2016 18:54:13 +0900
Subject: [PATCH 512/630] Modified Activity API take the setting of Access
 block (refs #3276)

---
 lib/util/opActivityQueryBuilder.class.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/util/opActivityQueryBuilder.class.php b/lib/util/opActivityQueryBuilder.class.php
index 692004db5..f623692e2 100644
--- a/lib/util/opActivityQueryBuilder.class.php
+++ b/lib/util/opActivityQueryBuilder.class.php
@@ -148,6 +148,9 @@ public function buildQuery()
         ->addWhere('EXISTS (FROM CommunityMember cm WHERE cm.member_id = a.member_id AND cm.community_id = ?)', $this->communityId);
     }
 
+    $blockedBy = Doctrine_Core::getTable('MemberRelationship')->getBlockedMemberIdsByTo($this->viewerId);
+    $query->whereNotIn('member_id', $blockedBy);
+
     return $query->orderBy('id DESC');
   }
 

From edcf44f2a5d07878cbd69d849b7f0663ac823e9a Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Thu, 21 Jan 2016 14:37:40 +0900
Subject: [PATCH 513/630] Modified to get a getMyMemberId from the same class
 (refs #3275)

---
 lib/model/doctrine/ActivityDataTable.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/model/doctrine/ActivityDataTable.class.php b/lib/model/doctrine/ActivityDataTable.class.php
index 7201a80f8..81c0da660 100644
--- a/lib/model/doctrine/ActivityDataTable.class.php
+++ b/lib/model/doctrine/ActivityDataTable.class.php
@@ -253,7 +253,7 @@ public function addFriendActivityQuery(Doctrine_Query $q, $memberId, $isCheckApp
     $q->andWhere('('.$dql.')', $dqlParams);
     $q->andWhere('in_reply_to_activity_id IS NULL');
 
-    $viewerMemberId = sfContext::getInstance()->getUser()->getMemberId();
+    $viewerMemberId = $this->getMyMemberId();
     $blockedBy = Doctrine_Core::getTable('MemberRelationship')->getBlockedMemberIdsByTo($viewerMemberId);
     $q->whereNotIn('member_id', $blockedBy);
 
@@ -386,7 +386,7 @@ public function addAllMemberActivityQuery($q, $isCheckApp = true)
       }
     }
 
-    $viewerMemberId = sfContext::getInstance()->getUser()->getMemberId();
+    $viewerMemberId = $this->getMyMemberId();
     $blockedBy = Doctrine_Core::getTable('MemberRelationship')->getBlockedMemberIdsByTo($viewerMemberId);
     $q->whereNotIn('member_id', $blockedBy);
 

From 621a70b890f16d7310d3a490827083aa215b267b Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Thu, 21 Jan 2016 15:36:54 +0900
Subject: [PATCH 514/630] Modified to explicitly represent the table name (refs
 #3276)

---
 lib/util/opActivityQueryBuilder.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/util/opActivityQueryBuilder.class.php b/lib/util/opActivityQueryBuilder.class.php
index f623692e2..40a4b8e67 100644
--- a/lib/util/opActivityQueryBuilder.class.php
+++ b/lib/util/opActivityQueryBuilder.class.php
@@ -149,7 +149,7 @@ public function buildQuery()
     }
 
     $blockedBy = Doctrine_Core::getTable('MemberRelationship')->getBlockedMemberIdsByTo($this->viewerId);
-    $query->whereNotIn('member_id', $blockedBy);
+    $query->whereNotIn('a.member_id', $blockedBy);
 
     return $query->orderBy('id DESC');
   }

From 67b65adac373d7389de7e17406709fffb472fbe3 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Thu, 10 Mar 2016 03:20:21 +0900
Subject: [PATCH 515/630] Modified to be able to display the URL of the new
 format of the Googlemap (refs #3891, BP from #3775)

---
 web/cmd/maps.google.co.jp.js | 22 +++++++++++++++++-----
 web/cmd/maps.google.com.js   | 22 +++++++++++++++++-----
 web/cmd/www.google.co.jp.js  | 22 +++++++++++++++++-----
 web/cmd/www.google.com.js    | 22 +++++++++++++++++-----
 4 files changed, 68 insertions(+), 20 deletions(-)

diff --git a/web/cmd/maps.google.co.jp.js b/web/cmd/maps.google.co.jp.js
index 99ede7838..ecd90fbfa 100644
--- a/web/cmd/maps.google.co.jp.js
+++ b/web/cmd/maps.google.co.jp.js
@@ -11,15 +11,27 @@ function url2cmd(url, googlemapsUrl) {
 }
 
 function main(id, googlemapsUrl) {
+  if (id.match(/@/)){
+    var cmd = id.match(/@(.+)z/);
+    var param = cmd[1].split(",");
+    var lon = param[0];
+    var lat = param[1];
+    var z = param[2];
+
+    var html = ''
+    + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+lon+'&y='+lat+'&z='+z+'" name="sample" height="350">'
+    + 'この部分はインラインフレームを使用しています。'
+    + '</iframe>';
+  } else {
     var cmd = id.split("&amp;");
     var param = new Array();
     param["z"] = "15";
     param["ll"] = "0,0";
     for(i=0; i<cmd.length; i++) {
-       var work = cmd[i].split("=");
-       if( work.length == 2 ) {
-         param[work[0]] = work[1];
-       }
+      var work = cmd[i].split("=");
+      if( work.length == 2 ) {
+        param[work[0]] = work[1];
+      }
     }
     var ll = param["ll"].split(",");
     var z = param["z"];
@@ -30,6 +42,6 @@ function main(id, googlemapsUrl) {
     + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+ll[0]+'&y='+ll[1]+'&z='+z+'&t='+t+'&q='+q+'" name="sample" height="350">'
     + 'この部分はインラインフレームを使用しています。'
     + '</iframe>';
-
+  }
     document.write(html);
 }
diff --git a/web/cmd/maps.google.com.js b/web/cmd/maps.google.com.js
index e727c3cf2..fee1bbf9f 100644
--- a/web/cmd/maps.google.com.js
+++ b/web/cmd/maps.google.com.js
@@ -11,15 +11,27 @@ function url2cmd(url, googlemapsUrl) {
 }
 
 function main(id, googlemapsUrl) {
+  if (id.match(/@/)){
+    var cmd = id.match(/@(.+)z/);
+    var param = cmd[1].split(",");
+    var lon = param[0];
+    var lat = param[1];
+    var z = param[2];
+
+    var html = ''
+    + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+lon+'&y='+lat+'&z='+z+'" name="sample" height="350">'
+    + 'この部分はインラインフレームを使用しています。'
+    + '</iframe>';
+  } else {
     var cmd = id.split("&amp;");
     var param = new Array();
     param["z"] = "15";
     param["ll"] = "0,0";
     for(i=0; i<cmd.length; i++) {
-       var work = cmd[i].split("=");
-       if( work.length == 2 ) {
-         param[work[0]] = work[1];
-       }
+      var work = cmd[i].split("=");
+      if( work.length == 2 ) {
+        param[work[0]] = work[1];
+      }
     }
     var ll = param["ll"].split(",");
     var z = param["z"];
@@ -30,6 +42,6 @@ function main(id, googlemapsUrl) {
     + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+ll[0]+'&y='+ll[1]+'&z='+z+'&t='+t+'&q='+q+'" name="sample" height="350">'
     + 'この部分はインラインフレームを使用しています。'
     + '</iframe>';
-
+  }
     document.write(html);
 }
diff --git a/web/cmd/www.google.co.jp.js b/web/cmd/www.google.co.jp.js
index c21252905..ad6a6e593 100644
--- a/web/cmd/www.google.co.jp.js
+++ b/web/cmd/www.google.co.jp.js
@@ -10,15 +10,27 @@ function url2cmd(url, googlemapsUrl) {
 }
 
 function main(id, googlemapsUrl) {
+  if (id.match(/@/)){
+    var cmd = id.match(/@(.+)z/);
+    var param = cmd[1].split(",");
+    var lon = param[0];
+    var lat = param[1];
+    var z = param[2];
+
+    var html = ''
+    + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+lon+'&y='+lat+'&z='+z+'" name="sample" height="350">'
+    + 'この部分はインラインフレームを使用しています。'
+    + '</iframe>';
+  } else {
     var cmd = id.split("&amp;");
     var param = new Array();
     param["z"] = "15";
     param["ll"] = "0,0";
     for(i=0; i<cmd.length; i++) {
-       var work = cmd[i].split("=");
-       if( work.length == 2 ) {
-         param[work[0]] = work[1];
-       }
+      var work = cmd[i].split("=");
+      if( work.length == 2 ) {
+        param[work[0]] = work[1];
+      }
     }
     var ll = param["ll"].split(",");
     var z = param["z"];
@@ -29,6 +41,6 @@ function main(id, googlemapsUrl) {
     + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+ll[0]+'&y='+ll[1]+'&z='+z+'&t='+t+'&q='+q+'" name="sample" height="350">'
     + 'この部分はインラインフレームを使用しています。'
     + '</iframe>';
-
+  }
     document.write(html);
 }
diff --git a/web/cmd/www.google.com.js b/web/cmd/www.google.com.js
index edb2a063f..3e7fc5a18 100644
--- a/web/cmd/www.google.com.js
+++ b/web/cmd/www.google.com.js
@@ -10,15 +10,27 @@ function url2cmd(url, googlemapsUrl) {
 }
 
 function main(id, googlemapsUrl) {
+  if (id.match(/@/)){
+    var cmd = id.match(/@(.+)z/);
+    var param = cmd[1].split(",");
+    var lon = param[0];
+    var lat = param[1];
+    var z = param[2];
+
+    var html = ''
+    + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+lon+'&y='+lat+'&z='+z+'" name="sample" height="350">'
+    + 'この部分はインラインフレームを使用しています。'
+    + '</iframe>';
+  } else {
     var cmd = id.split("&amp;");
     var param = new Array();
     param["z"] = "15";
     param["ll"] = "0,0";
     for(i=0; i<cmd.length; i++) {
-       var work = cmd[i].split("=");
-       if( work.length == 2 ) {
-         param[work[0]] = work[1];
-       }
+      var work = cmd[i].split("=");
+      if( work.length == 2 ) {
+        param[work[0]] = work[1];
+      }
     }
     var ll = param["ll"].split(",");
     var z = param["z"];
@@ -29,6 +41,6 @@ function main(id, googlemapsUrl) {
     + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+ll[0]+'&y='+ll[1]+'&z='+z+'&t='+t+'&q='+q+'" name="sample" height="350">'
     + 'この部分はインラインフレームを使用しています。'
     + '</iframe>';
-
+  }
     document.write(html);
 }

From 9f9f6d3d9d2bafb92cd707a62541ade9de08d812 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Thu, 10 Mar 2016 03:21:08 +0900
Subject: [PATCH 516/630]  Modify to unified indentation (refs #3891, BP from
 #3775)

---
 web/cmd/maps.google.co.jp.js | 31 ++++++++++++++++---------------
 web/cmd/maps.google.com.js   | 31 ++++++++++++++++---------------
 web/cmd/www.google.co.jp.js  | 21 +++++++++++----------
 web/cmd/www.google.com.js    | 31 ++++++++++++++++---------------
 4 files changed, 59 insertions(+), 55 deletions(-)

diff --git a/web/cmd/maps.google.co.jp.js b/web/cmd/maps.google.co.jp.js
index ecd90fbfa..fc256756e 100644
--- a/web/cmd/maps.google.co.jp.js
+++ b/web/cmd/maps.google.co.jp.js
@@ -3,15 +3,15 @@ function url2cmd(url, googlemapsUrl) {
   var maps_google_co_jp = url.match(/^https?:\/\/maps\.google\.co\.jp\/\?(.+)/);
 
   if (maps_google_co_jp_maps || maps_google_co_jp) {
-     var id = RegExp.$1;
-     main(id, googlemapsUrl);
-    } else {
-       pne_url2a(url);
-    }
+    var id = RegExp.$1;
+    main(id, googlemapsUrl);
+  } else {
+    pne_url2a(url);
+  }
 }
 
 function main(id, googlemapsUrl) {
-  if (id.match(/@/)){
+  if (id.match(/@/)) {
     var cmd = id.match(/@(.+)z/);
     var param = cmd[1].split(",");
     var lon = param[0];
@@ -19,17 +19,17 @@ function main(id, googlemapsUrl) {
     var z = param[2];
 
     var html = ''
-    + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+lon+'&y='+lat+'&z='+z+'" name="sample" height="350">'
-    + 'この部分はインラインフレームを使用しています。'
-    + '</iframe>';
+      + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+lon+'&y='+lat+'&z='+z+'" name="sample" height="350">'
+      + 'この部分はインラインフレームを使用しています。'
+      + '</iframe>';
   } else {
     var cmd = id.split("&amp;");
     var param = new Array();
     param["z"] = "15";
     param["ll"] = "0,0";
-    for(i=0; i<cmd.length; i++) {
+    for (i=0; i<cmd.length; i++) {
       var work = cmd[i].split("=");
-      if( work.length == 2 ) {
+      if ( work.length == 2 ) {
         param[work[0]] = work[1];
       }
     }
@@ -39,9 +39,10 @@ function main(id, googlemapsUrl) {
     var q = param["q"];
 
     var html = ''
-    + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+ll[0]+'&y='+ll[1]+'&z='+z+'&t='+t+'&q='+q+'" name="sample" height="350">'
-    + 'この部分はインラインフレームを使用しています。'
-    + '</iframe>';
+      + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+ll[0]+'&y='+ll[1]+'&z='+z+'&t='+t+'&q='+q+'" name="sample" height="350">'
+      + 'この部分はインラインフレームを使用しています。'
+      + '</iframe>';
   }
-    document.write(html);
+
+  document.write(html);
 }
diff --git a/web/cmd/maps.google.com.js b/web/cmd/maps.google.com.js
index fee1bbf9f..e6e965ec8 100644
--- a/web/cmd/maps.google.com.js
+++ b/web/cmd/maps.google.com.js
@@ -3,15 +3,15 @@ function url2cmd(url, googlemapsUrl) {
   var maps_google_com = url.match(/^https?:\/\/maps\.google\.com\/\?(.+)/);
 
   if (maps_google_com_maps || maps_google_com) {
-     var id = RegExp.$1;
-     main(id, googlemapsUrl);
-    } else {
-       pne_url2a(url);
-    }
+    var id = RegExp.$1;
+    main(id, googlemapsUrl);
+  } else {
+    pne_url2a(url);
+  }
 }
 
 function main(id, googlemapsUrl) {
-  if (id.match(/@/)){
+  if (id.match(/@/)) {
     var cmd = id.match(/@(.+)z/);
     var param = cmd[1].split(",");
     var lon = param[0];
@@ -19,17 +19,17 @@ function main(id, googlemapsUrl) {
     var z = param[2];
 
     var html = ''
-    + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+lon+'&y='+lat+'&z='+z+'" name="sample" height="350">'
-    + 'この部分はインラインフレームを使用しています。'
-    + '</iframe>';
+      + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+lon+'&y='+lat+'&z='+z+'" name="sample" height="350">'
+      + 'この部分はインラインフレームを使用しています。'
+      + '</iframe>';
   } else {
     var cmd = id.split("&amp;");
     var param = new Array();
     param["z"] = "15";
     param["ll"] = "0,0";
-    for(i=0; i<cmd.length; i++) {
+    for (i=0; i<cmd.length; i++) {
       var work = cmd[i].split("=");
-      if( work.length == 2 ) {
+      if ( work.length == 2 ) {
         param[work[0]] = work[1];
       }
     }
@@ -39,9 +39,10 @@ function main(id, googlemapsUrl) {
     var q = param["q"];
 
     var html = ''
-    + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+ll[0]+'&y='+ll[1]+'&z='+z+'&t='+t+'&q='+q+'" name="sample" height="350">'
-    + 'この部分はインラインフレームを使用しています。'
-    + '</iframe>';
+      + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+ll[0]+'&y='+ll[1]+'&z='+z+'&t='+t+'&q='+q+'" name="sample" height="350">'
+      + 'この部分はインラインフレームを使用しています。'
+      + '</iframe>';
   }
-    document.write(html);
+
+  document.write(html);
 }
diff --git a/web/cmd/www.google.co.jp.js b/web/cmd/www.google.co.jp.js
index ad6a6e593..36f63e9e0 100644
--- a/web/cmd/www.google.co.jp.js
+++ b/web/cmd/www.google.co.jp.js
@@ -10,7 +10,7 @@ function url2cmd(url, googlemapsUrl) {
 }
 
 function main(id, googlemapsUrl) {
-  if (id.match(/@/)){
+  if (id.match(/@/)) {
     var cmd = id.match(/@(.+)z/);
     var param = cmd[1].split(",");
     var lon = param[0];
@@ -18,17 +18,17 @@ function main(id, googlemapsUrl) {
     var z = param[2];
 
     var html = ''
-    + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+lon+'&y='+lat+'&z='+z+'" name="sample" height="350">'
-    + 'この部分はインラインフレームを使用しています。'
-    + '</iframe>';
+      + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+lon+'&y='+lat+'&z='+z+'" name="sample" height="350">'
+      + 'この部分はインラインフレームを使用しています。'
+      + '</iframe>';
   } else {
     var cmd = id.split("&amp;");
     var param = new Array();
     param["z"] = "15";
     param["ll"] = "0,0";
-    for(i=0; i<cmd.length; i++) {
+    for (i=0; i<cmd.length; i++) {
       var work = cmd[i].split("=");
-      if( work.length == 2 ) {
+      if ( work.length == 2 ) {
         param[work[0]] = work[1];
       }
     }
@@ -38,9 +38,10 @@ function main(id, googlemapsUrl) {
     var q = param["q"];
 
     var html = ''
-    + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+ll[0]+'&y='+ll[1]+'&z='+z+'&t='+t+'&q='+q+'" name="sample" height="350">'
-    + 'この部分はインラインフレームを使用しています。'
-    + '</iframe>';
+      + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+ll[0]+'&y='+ll[1]+'&z='+z+'&t='+t+'&q='+q+'" name="sample" height="350">'
+      + 'この部分はインラインフレームを使用しています。'
+      + '</iframe>';
   }
-    document.write(html);
+
+  document.write(html);
 }
diff --git a/web/cmd/www.google.com.js b/web/cmd/www.google.com.js
index 3e7fc5a18..37dff869b 100644
--- a/web/cmd/www.google.com.js
+++ b/web/cmd/www.google.com.js
@@ -2,15 +2,15 @@ function url2cmd(url, googlemapsUrl) {
   var www_google_com_maps = url.match(/^http:\/\/www\.google\.com\/maps\?(.+)/);
 
   if (www_google_com_maps) {
-     var id = RegExp.$1;
-     main(id, googlemapsUrl);
-    } else {
-       pne_url2a(url);
-    }
+    var id = RegExp.$1;
+    main(id, googlemapsUrl);
+  } else {
+    pne_url2a(url);
+  }
 }
 
 function main(id, googlemapsUrl) {
-  if (id.match(/@/)){
+  if (id.match(/@/)) {
     var cmd = id.match(/@(.+)z/);
     var param = cmd[1].split(",");
     var lon = param[0];
@@ -18,17 +18,17 @@ function main(id, googlemapsUrl) {
     var z = param[2];
 
     var html = ''
-    + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+lon+'&y='+lat+'&z='+z+'" name="sample" height="350">'
-    + 'この部分はインラインフレームを使用しています。'
-    + '</iframe>';
+      + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+lon+'&y='+lat+'&z='+z+'" name="sample" height="350">'
+      + 'この部分はインラインフレームを使用しています。'
+      + '</iframe>';
   } else {
     var cmd = id.split("&amp;");
     var param = new Array();
     param["z"] = "15";
     param["ll"] = "0,0";
-    for(i=0; i<cmd.length; i++) {
+    for (i=0; i<cmd.length; i++) {
       var work = cmd[i].split("=");
-      if( work.length == 2 ) {
+      if ( work.length == 2 ) {
         param[work[0]] = work[1];
       }
     }
@@ -38,9 +38,10 @@ function main(id, googlemapsUrl) {
     var q = param["q"];
 
     var html = ''
-    + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+ll[0]+'&y='+ll[1]+'&z='+z+'&t='+t+'&q='+q+'" name="sample" height="350">'
-    + 'この部分はインラインフレームを使用しています。'
-    + '</iframe>';
+      + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+ll[0]+'&y='+ll[1]+'&z='+z+'&t='+t+'&q='+q+'" name="sample" height="350">'
+      + 'この部分はインラインフレームを使用しています。'
+      + '</iframe>';
   }
-    document.write(html);
+
+  document.write(html);
 }

From f04931f2973a3a4fecb2765a2824d15b28513ff7 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Thu, 10 Mar 2016 03:21:38 +0900
Subject: [PATCH 517/630] Corresponding to a different pattern of URL (refs
 #3891, BP from #3775)

---
 web/cmd/maps.google.co.jp.js | 2 +-
 web/cmd/maps.google.com.js   | 2 +-
 web/cmd/www.google.co.jp.js  | 2 +-
 web/cmd/www.google.com.js    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/cmd/maps.google.co.jp.js b/web/cmd/maps.google.co.jp.js
index fc256756e..6711bd20f 100644
--- a/web/cmd/maps.google.co.jp.js
+++ b/web/cmd/maps.google.co.jp.js
@@ -1,5 +1,5 @@
 function url2cmd(url, googlemapsUrl) {
-  var maps_google_co_jp_maps = url.match(/^https?:\/\/maps\.google\.co\.jp\/maps\?(.+)/);
+  var maps_google_co_jp_maps = url.match(/^https?:\/\/maps\.google\.co\.jp\/maps[\?\/](.+)/);
   var maps_google_co_jp = url.match(/^https?:\/\/maps\.google\.co\.jp\/\?(.+)/);
 
   if (maps_google_co_jp_maps || maps_google_co_jp) {
diff --git a/web/cmd/maps.google.com.js b/web/cmd/maps.google.com.js
index e6e965ec8..ec929dfe7 100644
--- a/web/cmd/maps.google.com.js
+++ b/web/cmd/maps.google.com.js
@@ -1,5 +1,5 @@
 function url2cmd(url, googlemapsUrl) {
-  var maps_google_com_maps = url.match(/^https?:\/\/maps\.google\.com\/maps\?(.+)/);
+  var maps_google_com_maps = url.match(/^https?:\/\/maps\.google\.com\/maps[\?\/](.+)/);
   var maps_google_com = url.match(/^https?:\/\/maps\.google\.com\/\?(.+)/);
 
   if (maps_google_com_maps || maps_google_com) {
diff --git a/web/cmd/www.google.co.jp.js b/web/cmd/www.google.co.jp.js
index 36f63e9e0..d01f347eb 100644
--- a/web/cmd/www.google.co.jp.js
+++ b/web/cmd/www.google.co.jp.js
@@ -1,5 +1,5 @@
 function url2cmd(url, googlemapsUrl) {
-  var www_google_co_jp_maps = url.match(/^http:\/\/www\.google\.co\.jp\/maps\?(.+)/);
+  var www_google_co_jp_maps = url.match(/^https?:\/\/www\.google\.co\.jp\/maps[\?\/](.+)/);
 
   if (www_google_co_jp_maps) {
      var id = RegExp.$1;
diff --git a/web/cmd/www.google.com.js b/web/cmd/www.google.com.js
index 37dff869b..c187a66d7 100644
--- a/web/cmd/www.google.com.js
+++ b/web/cmd/www.google.com.js
@@ -1,5 +1,5 @@
 function url2cmd(url, googlemapsUrl) {
-  var www_google_com_maps = url.match(/^http:\/\/www\.google\.com\/maps\?(.+)/);
+  var www_google_com_maps = url.match(/^https?:\/\/www\.google\.com\/maps[\?\/](.+)/);
 
   if (www_google_com_maps) {
     var id = RegExp.$1;

From 4e75c1b475696652375e7ba57766fd1587d1d621 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Thu, 10 Mar 2016 03:22:01 +0900
Subject: [PATCH 518/630] Change the way you get a unique value (refs #3891, BP
 from #3775)

---
 web/cmd/maps.google.co.jp.js | 56 +++++++++++++++++++-----------------
 web/cmd/maps.google.com.js   | 56 +++++++++++++++++++-----------------
 web/cmd/www.google.co.jp.js  | 56 +++++++++++++++++++-----------------
 web/cmd/www.google.com.js    | 56 +++++++++++++++++++-----------------
 4 files changed, 116 insertions(+), 108 deletions(-)

diff --git a/web/cmd/maps.google.co.jp.js b/web/cmd/maps.google.co.jp.js
index 6711bd20f..be6464dc2 100644
--- a/web/cmd/maps.google.co.jp.js
+++ b/web/cmd/maps.google.co.jp.js
@@ -11,38 +11,40 @@ function url2cmd(url, googlemapsUrl) {
 }
 
 function main(id, googlemapsUrl) {
-  if (id.match(/@/)) {
-    var cmd = id.match(/@(.+)z/);
-    var param = cmd[1].split(",");
-    var lon = param[0];
-    var lat = param[1];
-    var z = param[2];
+  var param = { lon: 0, lat: 0, z: 15, t: '', q: '' };
+  var result = id.match(/@([0-9\.]*),([0-9\.]*),([0-9]*z)/);
 
-    var html = ''
-      + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+lon+'&y='+lat+'&z='+z+'" name="sample" height="350">'
-      + 'この部分はインラインフレームを使用しています。'
-      + '</iframe>';
+  if (result) {
+    param.lon = result[1];
+    param.lat = result[2];
+    param.z   = result[3];
   } else {
-    var cmd = id.split("&amp;");
-    var param = new Array();
-    param["z"] = "15";
-    param["ll"] = "0,0";
-    for (i=0; i<cmd.length; i++) {
-      var work = cmd[i].split("=");
-      if ( work.length == 2 ) {
-        param[work[0]] = work[1];
+    var query = id.split('&amp;');
+    for(i = 0; i < query.length; i++) {
+      var pair = query[i].split('=');
+      if (pair.length !== 2) {
+        continue;
       }
-    }
-    var ll = param["ll"].split(",");
-    var z = param["z"];
-    var t = param["t"];
-    var q = param["q"];
+      var key = pair[0];
+      var value = pair[1];
 
-    var html = ''
-      + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+ll[0]+'&y='+ll[1]+'&z='+z+'&t='+t+'&q='+q+'" name="sample" height="350">'
-      + 'この部分はインラインフレームを使用しています。'
-      + '</iframe>';
+      if (param[key] !== undefined) {
+        param[key] = value;
+      } else if ('ll' === key) {
+        param.lon = value.split(',')[0];
+        param.lat = value.split(',')[1];
+      }
+    }
   }
 
+  var html = '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000"'
+           + 'src="' + googlemapsUrl
+           + '?x=' + param.lon
+           + '&y=' + param.lat
+           + '&z=' + param.z
+           + '&t=' + param.t
+           + '&q=' + param.q
+           + '" name="sample" height="350">この部分はインラインフレームを使用しています。</iframe>';
+
   document.write(html);
 }
diff --git a/web/cmd/maps.google.com.js b/web/cmd/maps.google.com.js
index ec929dfe7..03692a553 100644
--- a/web/cmd/maps.google.com.js
+++ b/web/cmd/maps.google.com.js
@@ -11,38 +11,40 @@ function url2cmd(url, googlemapsUrl) {
 }
 
 function main(id, googlemapsUrl) {
-  if (id.match(/@/)) {
-    var cmd = id.match(/@(.+)z/);
-    var param = cmd[1].split(",");
-    var lon = param[0];
-    var lat = param[1];
-    var z = param[2];
+  var param = { lon: 0, lat: 0, z: 15, t: '', q: '' };
+  var result = id.match(/@([0-9\.]*),([0-9\.]*),([0-9]*z)/);
 
-    var html = ''
-      + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+lon+'&y='+lat+'&z='+z+'" name="sample" height="350">'
-      + 'この部分はインラインフレームを使用しています。'
-      + '</iframe>';
+  if (result) {
+    param.lon = result[1];
+    param.lat = result[2];
+    param.z   = result[3];
   } else {
-    var cmd = id.split("&amp;");
-    var param = new Array();
-    param["z"] = "15";
-    param["ll"] = "0,0";
-    for (i=0; i<cmd.length; i++) {
-      var work = cmd[i].split("=");
-      if ( work.length == 2 ) {
-        param[work[0]] = work[1];
+    var query = id.split('&amp;');
+    for(i = 0; i < query.length; i++) {
+      var pair = query[i].split('=');
+      if (pair.length !== 2) {
+        continue;
       }
-    }
-    var ll = param["ll"].split(",");
-    var z = param["z"];
-    var t = param["t"];
-    var q = param["q"];
+      var key = pair[0];
+      var value = pair[1];
 
-    var html = ''
-      + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+ll[0]+'&y='+ll[1]+'&z='+z+'&t='+t+'&q='+q+'" name="sample" height="350">'
-      + 'この部分はインラインフレームを使用しています。'
-      + '</iframe>';
+      if (param[key] !== undefined) {
+        param[key] = value;
+      } else if ('ll' === key) {
+        param.lon = value.split(',')[0];
+        param.lat = value.split(',')[1];
+      }
+    }
   }
 
+  var html = '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000"'
+           + 'src="' + googlemapsUrl
+           + '?x=' + param.lon
+           + '&y=' + param.lat
+           + '&z=' + param.z
+           + '&t=' + param.t
+           + '&q=' + param.q
+           + '" name="sample" height="350">この部分はインラインフレームを使用しています。</iframe>';
+
   document.write(html);
 }
diff --git a/web/cmd/www.google.co.jp.js b/web/cmd/www.google.co.jp.js
index d01f347eb..29184de01 100644
--- a/web/cmd/www.google.co.jp.js
+++ b/web/cmd/www.google.co.jp.js
@@ -10,38 +10,40 @@ function url2cmd(url, googlemapsUrl) {
 }
 
 function main(id, googlemapsUrl) {
-  if (id.match(/@/)) {
-    var cmd = id.match(/@(.+)z/);
-    var param = cmd[1].split(",");
-    var lon = param[0];
-    var lat = param[1];
-    var z = param[2];
+  var param = { lon: 0, lat: 0, z: 15, t: '', q: '' };
+  var result = id.match(/@([0-9\.]*),([0-9\.]*),([0-9]*z)/);
 
-    var html = ''
-      + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+lon+'&y='+lat+'&z='+z+'" name="sample" height="350">'
-      + 'この部分はインラインフレームを使用しています。'
-      + '</iframe>';
+  if (result) {
+    param.lon = result[1];
+    param.lat = result[2];
+    param.z   = result[3];
   } else {
-    var cmd = id.split("&amp;");
-    var param = new Array();
-    param["z"] = "15";
-    param["ll"] = "0,0";
-    for (i=0; i<cmd.length; i++) {
-      var work = cmd[i].split("=");
-      if ( work.length == 2 ) {
-        param[work[0]] = work[1];
+    var query = id.split('&amp;');
+    for(i = 0; i < query.length; i++) {
+      var pair = query[i].split('=');
+      if (pair.length !== 2) {
+        continue;
       }
-    }
-    var ll = param["ll"].split(",");
-    var z = param["z"];
-    var t = param["t"];
-    var q = param["q"];
+      var key = pair[0];
+      var value = pair[1];
 
-    var html = ''
-      + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+ll[0]+'&y='+ll[1]+'&z='+z+'&t='+t+'&q='+q+'" name="sample" height="350">'
-      + 'この部分はインラインフレームを使用しています。'
-      + '</iframe>';
+      if (param[key] !== undefined) {
+        param[key] = value;
+      } else if ('ll' === key) {
+        param.lon = value.split(',')[0];
+        param.lat = value.split(',')[1];
+      }
+    }
   }
 
+  var html = '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000"'
+           + 'src="' + googlemapsUrl
+           + '?x=' + param.lon
+           + '&y=' + param.lat
+           + '&z=' + param.z
+           + '&t=' + param.t
+           + '&q=' + param.q
+           + '" name="sample" height="350">この部分はインラインフレームを使用しています。</iframe>';
+
   document.write(html);
 }
diff --git a/web/cmd/www.google.com.js b/web/cmd/www.google.com.js
index c187a66d7..87afe45c6 100644
--- a/web/cmd/www.google.com.js
+++ b/web/cmd/www.google.com.js
@@ -10,38 +10,40 @@ function url2cmd(url, googlemapsUrl) {
 }
 
 function main(id, googlemapsUrl) {
-  if (id.match(/@/)) {
-    var cmd = id.match(/@(.+)z/);
-    var param = cmd[1].split(",");
-    var lon = param[0];
-    var lat = param[1];
-    var z = param[2];
+  var param = { lon: 0, lat: 0, z: 15, t: '', q: '' };
+  var result = id.match(/@([0-9\.]*),([0-9\.]*),([0-9]*z)/);
 
-    var html = ''
-      + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+lon+'&y='+lat+'&z='+z+'" name="sample" height="350">'
-      + 'この部分はインラインフレームを使用しています。'
-      + '</iframe>';
+  if (result) {
+    param.lon = result[1];
+    param.lat = result[2];
+    param.z   = result[3];
   } else {
-    var cmd = id.split("&amp;");
-    var param = new Array();
-    param["z"] = "15";
-    param["ll"] = "0,0";
-    for (i=0; i<cmd.length; i++) {
-      var work = cmd[i].split("=");
-      if ( work.length == 2 ) {
-        param[work[0]] = work[1];
+    var query = id.split('&amp;');
+    for(i = 0; i < query.length; i++) {
+      var pair = query[i].split('=');
+      if (pair.length !== 2) {
+        continue;
       }
-    }
-    var ll = param["ll"].split(",");
-    var z = param["z"];
-    var t = param["t"];
-    var q = param["q"];
+      var key = pair[0];
+      var value = pair[1];
 
-    var html = ''
-      + '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000" src="'+googlemapsUrl+'?x='+ll[0]+'&y='+ll[1]+'&z='+z+'&t='+t+'&q='+q+'" name="sample" height="350">'
-      + 'この部分はインラインフレームを使用しています。'
-      + '</iframe>';
+      if (param[key] !== undefined) {
+        param[key] = value;
+      } else if ('ll' === key) {
+        param.lon = value.split(',')[0];
+        param.lat = value.split(',')[1];
+      }
+    }
   }
 
+  var html = '<iframe marginwidth="0" marginheight="0" hspace="0" vspace="0" frameborder="0" scrolling="no" bordercolor="#000000"'
+           + 'src="' + googlemapsUrl
+           + '?x=' + param.lon
+           + '&y=' + param.lat
+           + '&z=' + param.z
+           + '&t=' + param.t
+           + '&q=' + param.q
+           + '" name="sample" height="350">この部分はインラインフレームを使用しています。</iframe>';
+
   document.write(html);
 }

From 8a154b4bf3b39c8a36b9376260c83bdcc29e7658 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Thu, 10 Mar 2016 03:22:28 +0900
Subject: [PATCH 519/630] Change the id matching pattern (refs #3891, BP from
 #3775)

---
 web/cmd/maps.google.co.jp.js | 6 +++++-
 web/cmd/maps.google.com.js   | 6 +++++-
 web/cmd/www.google.co.jp.js  | 6 +++++-
 web/cmd/www.google.com.js    | 6 +++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/web/cmd/maps.google.co.jp.js b/web/cmd/maps.google.co.jp.js
index be6464dc2..ce0759746 100644
--- a/web/cmd/maps.google.co.jp.js
+++ b/web/cmd/maps.google.co.jp.js
@@ -12,12 +12,16 @@ function url2cmd(url, googlemapsUrl) {
 
 function main(id, googlemapsUrl) {
   var param = { lon: 0, lat: 0, z: 15, t: '', q: '' };
-  var result = id.match(/@([0-9\.]*),([0-9\.]*),([0-9]*z)/);
+  var result = id.match(/@([-]?[0-9\.]+),([-]?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
 
   if (result) {
     param.lon = result[1];
     param.lat = result[2];
     param.z   = result[3];
+
+    if (result[4]) {
+      param.t = 'k';
+    }
   } else {
     var query = id.split('&amp;');
     for(i = 0; i < query.length; i++) {
diff --git a/web/cmd/maps.google.com.js b/web/cmd/maps.google.com.js
index 03692a553..269d7f305 100644
--- a/web/cmd/maps.google.com.js
+++ b/web/cmd/maps.google.com.js
@@ -12,12 +12,16 @@ function url2cmd(url, googlemapsUrl) {
 
 function main(id, googlemapsUrl) {
   var param = { lon: 0, lat: 0, z: 15, t: '', q: '' };
-  var result = id.match(/@([0-9\.]*),([0-9\.]*),([0-9]*z)/);
+  var result = id.match(/@([-]?[0-9\.]+),([-]?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
 
   if (result) {
     param.lon = result[1];
     param.lat = result[2];
     param.z   = result[3];
+
+    if (result[4]) {
+      param.t = 'k';
+    }
   } else {
     var query = id.split('&amp;');
     for(i = 0; i < query.length; i++) {
diff --git a/web/cmd/www.google.co.jp.js b/web/cmd/www.google.co.jp.js
index 29184de01..85b6ff3d1 100644
--- a/web/cmd/www.google.co.jp.js
+++ b/web/cmd/www.google.co.jp.js
@@ -11,12 +11,16 @@ function url2cmd(url, googlemapsUrl) {
 
 function main(id, googlemapsUrl) {
   var param = { lon: 0, lat: 0, z: 15, t: '', q: '' };
-  var result = id.match(/@([0-9\.]*),([0-9\.]*),([0-9]*z)/);
+  var result = id.match(/@([-]?[0-9\.]+),([-]?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
 
   if (result) {
     param.lon = result[1];
     param.lat = result[2];
     param.z   = result[3];
+
+    if (result[4]) {
+      param.t = 'k';
+    }
   } else {
     var query = id.split('&amp;');
     for(i = 0; i < query.length; i++) {
diff --git a/web/cmd/www.google.com.js b/web/cmd/www.google.com.js
index 87afe45c6..6e8efac74 100644
--- a/web/cmd/www.google.com.js
+++ b/web/cmd/www.google.com.js
@@ -11,12 +11,16 @@ function url2cmd(url, googlemapsUrl) {
 
 function main(id, googlemapsUrl) {
   var param = { lon: 0, lat: 0, z: 15, t: '', q: '' };
-  var result = id.match(/@([0-9\.]*),([0-9\.]*),([0-9]*z)/);
+  var result = id.match(/@([-]?[0-9\.]+),([-]?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
 
   if (result) {
     param.lon = result[1];
     param.lat = result[2];
     param.z   = result[3];
+
+    if (result[4]) {
+      param.t = 'k';
+    }
   } else {
     var query = id.split('&amp;');
     for(i = 0; i < query.length; i++) {

From 09dbb6fce98f3dbd7ccb26d09fef0bed6ee8bc56 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Thu, 10 Mar 2016 10:34:57 +0900
Subject: [PATCH 520/630] Delete the character of unnecessary regular
 expression (refs #3891, BP from #3775)

---
 web/cmd/maps.google.co.jp.js | 2 +-
 web/cmd/maps.google.com.js   | 2 +-
 web/cmd/www.google.co.jp.js  | 2 +-
 web/cmd/www.google.com.js    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/cmd/maps.google.co.jp.js b/web/cmd/maps.google.co.jp.js
index ce0759746..7e43d5667 100644
--- a/web/cmd/maps.google.co.jp.js
+++ b/web/cmd/maps.google.co.jp.js
@@ -12,7 +12,7 @@ function url2cmd(url, googlemapsUrl) {
 
 function main(id, googlemapsUrl) {
   var param = { lon: 0, lat: 0, z: 15, t: '', q: '' };
-  var result = id.match(/@([-]?[0-9\.]+),([-]?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
+  var result = id.match(/@(-?[0-9\.]+),(-?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
 
   if (result) {
     param.lon = result[1];
diff --git a/web/cmd/maps.google.com.js b/web/cmd/maps.google.com.js
index 269d7f305..06b271b33 100644
--- a/web/cmd/maps.google.com.js
+++ b/web/cmd/maps.google.com.js
@@ -12,7 +12,7 @@ function url2cmd(url, googlemapsUrl) {
 
 function main(id, googlemapsUrl) {
   var param = { lon: 0, lat: 0, z: 15, t: '', q: '' };
-  var result = id.match(/@([-]?[0-9\.]+),([-]?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
+  var result = id.match(/@(-?[0-9\.]+),(-?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
 
   if (result) {
     param.lon = result[1];
diff --git a/web/cmd/www.google.co.jp.js b/web/cmd/www.google.co.jp.js
index 85b6ff3d1..480aec8cf 100644
--- a/web/cmd/www.google.co.jp.js
+++ b/web/cmd/www.google.co.jp.js
@@ -11,7 +11,7 @@ function url2cmd(url, googlemapsUrl) {
 
 function main(id, googlemapsUrl) {
   var param = { lon: 0, lat: 0, z: 15, t: '', q: '' };
-  var result = id.match(/@([-]?[0-9\.]+),([-]?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
+  var result = id.match(/@(-?[0-9\.]+),(-?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
 
   if (result) {
     param.lon = result[1];
diff --git a/web/cmd/www.google.com.js b/web/cmd/www.google.com.js
index 6e8efac74..baa64f11f 100644
--- a/web/cmd/www.google.com.js
+++ b/web/cmd/www.google.com.js
@@ -11,7 +11,7 @@ function url2cmd(url, googlemapsUrl) {
 
 function main(id, googlemapsUrl) {
   var param = { lon: 0, lat: 0, z: 15, t: '', q: '' };
-  var result = id.match(/@([-]?[0-9\.]+),([-]?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
+  var result = id.match(/@(-?[0-9\.]+),(-?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
 
   if (result) {
     param.lon = result[1];

From 632d821656a5b2f3dc181ed89a0d6ab0e87b9ec3 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Thu, 10 Mar 2016 13:07:14 +0900
Subject: [PATCH 521/630] Modify as quoted part does not match (refs #3891, BP
 from #3775)

---
 web/cmd/maps.google.co.jp.js | 2 +-
 web/cmd/maps.google.com.js   | 2 +-
 web/cmd/www.google.co.jp.js  | 2 +-
 web/cmd/www.google.com.js    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/cmd/maps.google.co.jp.js b/web/cmd/maps.google.co.jp.js
index 7e43d5667..8465b57c0 100644
--- a/web/cmd/maps.google.co.jp.js
+++ b/web/cmd/maps.google.co.jp.js
@@ -12,7 +12,7 @@ function url2cmd(url, googlemapsUrl) {
 
 function main(id, googlemapsUrl) {
   var param = { lon: 0, lat: 0, z: 15, t: '', q: '' };
-  var result = id.match(/@(-?[0-9\.]+),(-?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
+  var result = id.match(/(^|\/)@(-?[0-9\.]+),(-?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
 
   if (result) {
     param.lon = result[1];
diff --git a/web/cmd/maps.google.com.js b/web/cmd/maps.google.com.js
index 06b271b33..9c52538e6 100644
--- a/web/cmd/maps.google.com.js
+++ b/web/cmd/maps.google.com.js
@@ -12,7 +12,7 @@ function url2cmd(url, googlemapsUrl) {
 
 function main(id, googlemapsUrl) {
   var param = { lon: 0, lat: 0, z: 15, t: '', q: '' };
-  var result = id.match(/@(-?[0-9\.]+),(-?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
+  var result = id.match(/(^|\/)@(-?[0-9\.]+),(-?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
 
   if (result) {
     param.lon = result[1];
diff --git a/web/cmd/www.google.co.jp.js b/web/cmd/www.google.co.jp.js
index 480aec8cf..d212d546f 100644
--- a/web/cmd/www.google.co.jp.js
+++ b/web/cmd/www.google.co.jp.js
@@ -11,7 +11,7 @@ function url2cmd(url, googlemapsUrl) {
 
 function main(id, googlemapsUrl) {
   var param = { lon: 0, lat: 0, z: 15, t: '', q: '' };
-  var result = id.match(/@(-?[0-9\.]+),(-?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
+  var result = id.match(/(^|\/)@(-?[0-9\.]+),(-?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
 
   if (result) {
     param.lon = result[1];
diff --git a/web/cmd/www.google.com.js b/web/cmd/www.google.com.js
index baa64f11f..b046e1014 100644
--- a/web/cmd/www.google.com.js
+++ b/web/cmd/www.google.com.js
@@ -11,7 +11,7 @@ function url2cmd(url, googlemapsUrl) {
 
 function main(id, googlemapsUrl) {
   var param = { lon: 0, lat: 0, z: 15, t: '', q: '' };
-  var result = id.match(/@(-?[0-9\.]+),(-?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
+  var result = id.match(/(^|\/)@(-?[0-9\.]+),(-?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
 
   if (result) {
     param.lon = result[1];

From efdd58d4c095b8e8c06ded0ad8fc583419c47767 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Wed, 9 Mar 2016 15:16:05 +0900
Subject: [PATCH 522/630] Delete the relevant files of 'Livly Island ' (refs
 #3908, #3890, BP from #3902)

---
 web/cmd/livlyisland.js | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 web/cmd/livlyisland.js

diff --git a/web/cmd/livlyisland.js b/web/cmd/livlyisland.js
deleted file mode 100644
index 537638d82..000000000
--- a/web/cmd/livlyisland.js
+++ /dev/null
@@ -1,16 +0,0 @@
-function main(id, sv) {
-    if (!id.match(/^[a-zA-Z0-9]+$/)) {
-        pne_url2a(url);
-        return;
-    }
-    if (!sv.match(/^[0-9]+$/)) {
-        pne_url2a(url);
-        return;
-    }
-    var html = '<script language="JavaScript" src="http://www.livly.com/b.php?uid='
-        + id
-        + '&s='
-        + sv
-        + '"></script>';
-    document.write(html);
-}

From c4b40cb73250992d630987ce5803f1b84ef43fcb Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Wed, 9 Mar 2016 15:29:31 +0900
Subject: [PATCH 523/630] Delete the relevant files of 'postpet ' (refs #3911,
 #3894, BP from #3903)

---
 web/cmd/postpet.js | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 web/cmd/postpet.js

diff --git a/web/cmd/postpet.js b/web/cmd/postpet.js
deleted file mode 100644
index 177a2a0fb..000000000
--- a/web/cmd/postpet.js
+++ /dev/null
@@ -1,13 +0,0 @@
-function main(id) {
-    if (!id.match(/^[a-z0-9]+$/)) {
-        return;
-    }
-
-    var html = '<script language="javascript" '
-                +
-'src="http://ppwin.so-net.ne.jp/webmail/petwindow/script.do?'
-                + 'window_id='
-                + id
-                + '"></script>';
-    document.write(html);
-}

From 4a29d249892347dbf2939ab95c41d01df4ee158f Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Wed, 9 Mar 2016 15:32:18 +0900
Subject: [PATCH 524/630] Delete the relevant files of 'r.gnavi.co.jp ' (refs
 #3913, #3896, BP from #3904)

---
 web/cmd/r.gnavi.co.jp.js | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 web/cmd/r.gnavi.co.jp.js

diff --git a/web/cmd/r.gnavi.co.jp.js b/web/cmd/r.gnavi.co.jp.js
deleted file mode 100644
index 11dd8c581..000000000
--- a/web/cmd/r.gnavi.co.jp.js
+++ /dev/null
@@ -1,21 +0,0 @@
-function url2cmd(url) {
-    if (!url.match(/^http:\/\/r[.]gnavi[.]co[.]jp\/([a-z][0-9]+)\/?$/)) {
-//        pne_url2a(url);
-        document.write('<a href="' + url + '">' + url + '</a>');
-        return;
-    }
-    var id = RegExp.$1;
-    main(id);
-}
-
-function main(id) {
-//    var url = 'http://cmd.encafe.jp/gnavi/?id=';
-    var url = 'http://cmd.encafe.jp/g-plaza/?id=';
-    
-    if (!id.match(/^[a-z][0-9]+$/)) {
-    document.write(url + id);
-        return;
-    }
-    document.write('<iframe WIDTH="420" HEIGHT="177" MARGINWIDTH="0" MARGINHEIGHT="0" HSPACE="0" VSPACE="0" FRAMEBORDER="0" SCROLLING="no" BORDERCOLOR="#ffffff" src="' + url + id + '">');
-    document.write('</iframe>');
-}
\ No newline at end of file

From 366d000c84bc2d8e016d30d6ba6dd9157270fd88 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Wed, 9 Mar 2016 15:41:29 +0900
Subject: [PATCH 525/630] Delete the relevant files of 'tagfriends ' (refs
 #3915, #3898, BP from #3905)

---
 web/cmd/tagfriends.js | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 web/cmd/tagfriends.js

diff --git a/web/cmd/tagfriends.js b/web/cmd/tagfriends.js
deleted file mode 100644
index 771c069df..000000000
--- a/web/cmd/tagfriends.js
+++ /dev/null
@@ -1,11 +0,0 @@
-function main(id) {
-     if (!id.match(/^ID[0-9]+$/)) {
-         return;
-     }
-
-     var html = '<script type="text/javascript"; language="javascript"'
-                 + 'src="http://tagfriends.com/'
-                 + id
-                 + '"></script>';
-     document.write(html);
-}

From e9ca54f7e378be2eac97fad052d8ed2c5439f2ca Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Thu, 10 Mar 2016 14:43:15 +0900
Subject: [PATCH 526/630] Modified to correctly match (refs #3891, BP from
 #3775)

---
 web/cmd/maps.google.co.jp.js | 2 +-
 web/cmd/maps.google.com.js   | 2 +-
 web/cmd/www.google.co.jp.js  | 2 +-
 web/cmd/www.google.com.js    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/cmd/maps.google.co.jp.js b/web/cmd/maps.google.co.jp.js
index 8465b57c0..5024993ea 100644
--- a/web/cmd/maps.google.co.jp.js
+++ b/web/cmd/maps.google.co.jp.js
@@ -12,7 +12,7 @@ function url2cmd(url, googlemapsUrl) {
 
 function main(id, googlemapsUrl) {
   var param = { lon: 0, lat: 0, z: 15, t: '', q: '' };
-  var result = id.match(/(^|\/)@(-?[0-9\.]+),(-?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
+  var result = id.match(/(?:^|\/)@(-?[0-9\.]+),(-?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
 
   if (result) {
     param.lon = result[1];
diff --git a/web/cmd/maps.google.com.js b/web/cmd/maps.google.com.js
index 9c52538e6..9a78f14af 100644
--- a/web/cmd/maps.google.com.js
+++ b/web/cmd/maps.google.com.js
@@ -12,7 +12,7 @@ function url2cmd(url, googlemapsUrl) {
 
 function main(id, googlemapsUrl) {
   var param = { lon: 0, lat: 0, z: 15, t: '', q: '' };
-  var result = id.match(/(^|\/)@(-?[0-9\.]+),(-?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
+  var result = id.match(/(?:^|\/)@(-?[0-9\.]+),(-?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
 
   if (result) {
     param.lon = result[1];
diff --git a/web/cmd/www.google.co.jp.js b/web/cmd/www.google.co.jp.js
index d212d546f..8149b0ab3 100644
--- a/web/cmd/www.google.co.jp.js
+++ b/web/cmd/www.google.co.jp.js
@@ -11,7 +11,7 @@ function url2cmd(url, googlemapsUrl) {
 
 function main(id, googlemapsUrl) {
   var param = { lon: 0, lat: 0, z: 15, t: '', q: '' };
-  var result = id.match(/(^|\/)@(-?[0-9\.]+),(-?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
+  var result = id.match(/(?:^|\/)@(-?[0-9\.]+),(-?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
 
   if (result) {
     param.lon = result[1];
diff --git a/web/cmd/www.google.com.js b/web/cmd/www.google.com.js
index b046e1014..03ef58b7e 100644
--- a/web/cmd/www.google.com.js
+++ b/web/cmd/www.google.com.js
@@ -11,7 +11,7 @@ function url2cmd(url, googlemapsUrl) {
 
 function main(id, googlemapsUrl) {
   var param = { lon: 0, lat: 0, z: 15, t: '', q: '' };
-  var result = id.match(/(^|\/)@(-?[0-9\.]+),(-?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
+  var result = id.match(/(?:^|\/)@(-?[0-9\.]+),(-?[0-9\.]+),([0-9]+z)(\/data=!3m1!1e3)?/);
 
   if (result) {
     param.lon = result[1];

From d3ed39e26945f27f05cf0bf468737f9e24a36e7c Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 10 Mar 2016 17:03:28 +0900
Subject: [PATCH 527/630] version 3.8.19

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index c140dbe09..96fad0280 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.19-dev');
+  define('OPENPNE_VERSION', '3.8.19');
 }

From c2a0084b8e2bf1fb9ee7f3214e89f46f3ba5eb14 Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 10 Mar 2016 17:06:26 +0900
Subject: [PATCH 528/630] started to development of OpenPNE 3.8.20

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 96fad0280..bcc8c4aff 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.19');
+  define('OPENPNE_VERSION', '3.8.20-dev');
 }

From 18d2a02f092bbce0cd154c5d95e8f12dd310a469 Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Thu, 7 Apr 2016 11:56:48 +0900
Subject: [PATCH 529/630] updated PEAR::Archive_Tar to 1.4.2 for avoiding error
 on extracting file with PHP 5.5+ (fixes #3928, refs #3918)

---
 lib/vendor/PEAR/Archive/Tar.php | 2774 ++++++++++++++++++-------------
 1 file changed, 1643 insertions(+), 1131 deletions(-)

diff --git a/lib/vendor/PEAR/Archive/Tar.php b/lib/vendor/PEAR/Archive/Tar.php
index 31a974a3d..202fffb23 100644
--- a/lib/vendor/PEAR/Archive/Tar.php
+++ b/lib/vendor/PEAR/Archive/Tar.php
@@ -30,85 +30,120 @@
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *
- * @category    File_Formats
- * @package     Archive_Tar
- * @author      Vincent Blavet <vincent@phpconcept.net>
- * @copyright   1997-2008 The Authors
- * @license     http://www.opensource.org/licenses/bsd-license.php New BSD License
- * @version     CVS: $Id$
- * @link        http://pear.php.net/package/Archive_Tar
+ * @category  File_Formats
+ * @package   Archive_Tar
+ * @author    Vincent Blavet <vincent@phpconcept.net>
+ * @copyright 1997-2010 The Authors
+ * @license   http://www.opensource.org/licenses/bsd-license.php New BSD License
+ * @version   CVS: $Id$
+ * @link      http://pear.php.net/package/Archive_Tar
  */
 
-require_once 'PEAR.php';
+// If the PEAR class cannot be loaded via the autoloader,
+// then try to require_once it from the PHP include path.
+if (!class_exists('PEAR')) {
+    require_once 'PEAR.php';
+}
+
+define('ARCHIVE_TAR_ATT_SEPARATOR', 90001);
+define('ARCHIVE_TAR_END_BLOCK', pack("a512", ''));
+
+if (!function_exists('gzopen') && function_exists('gzopen64')) {
+    function gzopen($filename, $mode, $use_include_path = 0)
+    {
+        return gzopen64($filename, $mode, $use_include_path);
+    }
+}
 
+if (!function_exists('gztell') && function_exists('gztell64')) {
+    function gztell($zp)
+    {
+        return gztell64($zp);
+    }
+}
 
-define ('ARCHIVE_TAR_ATT_SEPARATOR', 90001);
-define ('ARCHIVE_TAR_END_BLOCK', pack("a512", ''));
+if (!function_exists('gzseek') && function_exists('gzseek64')) {
+    function gzseek($zp, $offset, $whence = SEEK_SET)
+    {
+        return gzseek64($zp, $offset, $whence);
+    }
+}
 
 /**
-* Creates a (compressed) Tar archive
-*
-* @author   Vincent Blavet <vincent@phpconcept.net>
-* @version  $Revision$
-* @license  http://www.opensource.org/licenses/bsd-license.php New BSD License
-* @package  Archive_Tar
-*/
+ * Creates a (compressed) Tar archive
+ *
+ * @package Archive_Tar
+ * @author  Vincent Blavet <vincent@phpconcept.net>
+ * @license http://www.opensource.org/licenses/bsd-license.php New BSD License
+ * @version $Revision$
+ */
 class Archive_Tar extends PEAR
 {
     /**
-    * @var string Name of the Tar
-    */
-    var $_tarname='';
+     * @var string Name of the Tar
+     */
+    public $_tarname = '';
+
+    /**
+     * @var boolean if true, the Tar file will be gzipped
+     */
+    public $_compress = false;
 
     /**
-    * @var boolean if true, the Tar file will be gzipped
-    */
-    var $_compress=false;
+     * @var string Type of compression : 'none', 'gz', 'bz2' or 'lzma2'
+     */
+    public $_compress_type = 'none';
 
     /**
-    * @var string Type of compression : 'none', 'gz' or 'bz2'
-    */
-    var $_compress_type='none';
+     * @var string Explode separator
+     */
+    public $_separator = ' ';
 
     /**
-    * @var string Explode separator
-    */
-    var $_separator=' ';
+     * @var file descriptor
+     */
+    public $_file = 0;
 
     /**
-    * @var file descriptor
-    */
-    var $_file=0;
+     * @var string Local Tar name of a remote Tar (http:// or ftp://)
+     */
+    public $_temp_tarname = '';
 
     /**
-    * @var string Local Tar name of a remote Tar (http:// or ftp://)
-    */
-    var $_temp_tarname='';
+     * @var string regular expression for ignoring files or directories
+     */
+    public $_ignore_regexp = '';
 
     /**
-    * @var string regular expression for ignoring files or directories
-    */
-    var $_ignore_regexp='';
+     * @var object PEAR_Error object
+     */
+    public $error_object = null;
 
-    // {{{ constructor
     /**
-    * Archive_Tar Class constructor. This flavour of the constructor only
-    * declare a new Archive_Tar object, identifying it by the name of the
-    * tar file.
-    * If the compress argument is set the tar will be read or created as a
-    * gzip or bz2 compressed TAR file.
-    *
-    * @param    string  $p_tarname  The name of the tar archive to create
-    * @param    string  $p_compress can be null, 'gz' or 'bz2'. This
-    *                   parameter indicates if gzip or bz2 compression
-    *                   is required.  For compatibility reason the
-    *                   boolean value 'true' means 'gz'.
-    * @access public
-    */
-    function Archive_Tar($p_tarname, $p_compress = null)
+     * Format for data extraction
+     *
+     * @var string
+     */
+    public $_fmt ='';
+    /**
+     * Archive_Tar Class constructor. This flavour of the constructor only
+     * declare a new Archive_Tar object, identifying it by the name of the
+     * tar file.
+     * If the compress argument is set the tar will be read or created as a
+     * gzip or bz2 compressed TAR file.
+     *
+     * @param string $p_tarname The name of the tar archive to create
+     * @param string $p_compress can be null, 'gz', 'bz2' or 'lzma2'. This
+     *               parameter indicates if gzip, bz2 or lzma2 compression
+     *               is required.  For compatibility reason the
+     *               boolean value 'true' means 'gz'.
+     *
+     * @return bool
+     */
+    public function __construct($p_tarname, $p_compress = null)
     {
-        $this->PEAR();
+        parent::__construct();
+
         $this->_compress = false;
         $this->_compress_type = 'none';
         if (($p_compress === null) || ($p_compress == '')) {
@@ -120,10 +155,13 @@ function Archive_Tar($p_tarname, $p_compress = null)
                     if ($data == "\37\213") {
                         $this->_compress = true;
                         $this->_compress_type = 'gz';
-                    // No sure it's enought for a magic code ....
+                        // No sure it's enought for a magic code ....
                     } elseif ($data == "BZ") {
                         $this->_compress = true;
                         $this->_compress_type = 'bz2';
+                    } elseif (file_get_contents($p_tarname, false, null, 1, 4) == '7zXZ') {
+                        $this->_compress = true;
+                        $this->_compress_type = 'lzma2';
                     }
                 }
             } else {
@@ -133,114 +171,150 @@ function Archive_Tar($p_tarname, $p_compress = null)
                     $this->_compress = true;
                     $this->_compress_type = 'gz';
                 } elseif ((substr($p_tarname, -3) == 'bz2') ||
-                          (substr($p_tarname, -2) == 'bz')) {
+                    (substr($p_tarname, -2) == 'bz')
+                ) {
                     $this->_compress = true;
                     $this->_compress_type = 'bz2';
+                } else {
+                    if (substr($p_tarname, -2) == 'xz') {
+                        $this->_compress = true;
+                        $this->_compress_type = 'lzma2';
+                    }
                 }
             }
         } else {
             if (($p_compress === true) || ($p_compress == 'gz')) {
                 $this->_compress = true;
                 $this->_compress_type = 'gz';
-            } else if ($p_compress == 'bz2') {
-                $this->_compress = true;
-                $this->_compress_type = 'bz2';
             } else {
-                $this->_error("Unsupported compression type '$p_compress'\n".
-                    "Supported types are 'gz' and 'bz2'.\n");
-                return false;
+                if ($p_compress == 'bz2') {
+                    $this->_compress = true;
+                    $this->_compress_type = 'bz2';
+                } else {
+                    if ($p_compress == 'lzma2') {
+                        $this->_compress = true;
+                        $this->_compress_type = 'lzma2';
+                    } else {
+                        $this->_error(
+                            "Unsupported compression type '$p_compress'\n" .
+                            "Supported types are 'gz', 'bz2' and 'lzma2'.\n"
+                        );
+                        return false;
+                    }
+                }
             }
         }
         $this->_tarname = $p_tarname;
-        if ($this->_compress) { // assert zlib or bz2 extension support
-            if ($this->_compress_type == 'gz')
+        if ($this->_compress) { // assert zlib or bz2 or xz extension support
+            if ($this->_compress_type == 'gz') {
                 $extname = 'zlib';
-            else if ($this->_compress_type == 'bz2')
-                $extname = 'bz2';
+            } else {
+                if ($this->_compress_type == 'bz2') {
+                    $extname = 'bz2';
+                } else {
+                    if ($this->_compress_type == 'lzma2') {
+                        $extname = 'xz';
+                    }
+                }
+            }
 
             if (!extension_loaded($extname)) {
                 PEAR::loadExtension($extname);
             }
             if (!extension_loaded($extname)) {
-                $this->_error("The extension '$extname' couldn't be found.\n".
-                    "Please make sure your version of PHP was built ".
-                    "with '$extname' support.\n");
+                $this->_error(
+                    "The extension '$extname' couldn't be found.\n" .
+                    "Please make sure your version of PHP was built " .
+                    "with '$extname' support.\n"
+                );
                 return false;
             }
         }
+
+
+        if (version_compare(PHP_VERSION, "5.5.0-dev") < 0) {
+            $this->_fmt = "a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/" .
+                   "a8checksum/a1typeflag/a100link/a6magic/a2version/" .
+                   "a32uname/a32gname/a8devmajor/a8devminor/a131prefix";
+        } else {
+            $this->_fmt = "Z100filename/Z8mode/Z8uid/Z8gid/Z12size/Z12mtime/" .
+                   "Z8checksum/Z1typeflag/Z100link/Z6magic/Z2version/" .
+                   "Z32uname/Z32gname/Z8devmajor/Z8devminor/Z131prefix";
+        }
+
+
     }
-    // }}}
 
-    // {{{ destructor
-    function _Archive_Tar()
+    public function __destruct()
     {
         $this->_close();
         // ----- Look for a local copy to delete
-        if ($this->_temp_tarname != '')
+        if ($this->_temp_tarname != '') {
             @unlink($this->_temp_tarname);
-        $this->_PEAR();
+        }
     }
-    // }}}
 
-    // {{{ create()
     /**
-    * This method creates the archive file and add the files / directories
-    * that are listed in $p_filelist.
-    * If a file with the same name exist and is writable, it is replaced
-    * by the new tar.
-    * The method return false and a PEAR error text.
-    * The $p_filelist parameter can be an array of string, each string
-    * representing a filename or a directory name with their path if
-    * needed. It can also be a single string with names separated by a
-    * single blank.
-    * For each directory added in the archive, the files and
-    * sub-directories are also added.
-    * See also createModify() method for more details.
-    *
-    * @param array  $p_filelist An array of filenames and directory names, or a
-	*                           single string with names separated by a single
-	*                           blank space.
-    * @return                   true on success, false on error.
-    * @see createModify()
-    * @access public
-    */
-    function create($p_filelist)
+     * This method creates the archive file and add the files / directories
+     * that are listed in $p_filelist.
+     * If a file with the same name exist and is writable, it is replaced
+     * by the new tar.
+     * The method return false and a PEAR error text.
+     * The $p_filelist parameter can be an array of string, each string
+     * representing a filename or a directory name with their path if
+     * needed. It can also be a single string with names separated by a
+     * single blank.
+     * For each directory added in the archive, the files and
+     * sub-directories are also added.
+     * See also createModify() method for more details.
+     *
+     * @param array $p_filelist An array of filenames and directory names, or a
+     *              single string with names separated by a single
+     *              blank space.
+     *
+     * @return true on success, false on error.
+     * @see    createModify()
+     */
+    public function create($p_filelist)
     {
         return $this->createModify($p_filelist, '', '');
     }
-    // }}}
 
-    // {{{ add()
     /**
-    * This method add the files / directories that are listed in $p_filelist in
-    * the archive. If the archive does not exist it is created.
-    * The method return false and a PEAR error text.
-    * The files and directories listed are only added at the end of the archive,
-    * even if a file with the same name is already archived.
-    * See also createModify() method for more details.
-    *
-    * @param array  $p_filelist An array of filenames and directory names, or a
-	*                           single string with names separated by a single
-	*                           blank space.
-    * @return                   true on success, false on error.
-    * @see createModify()
-    * @access public
-    */
-    function add($p_filelist)
+     * This method add the files / directories that are listed in $p_filelist in
+     * the archive. If the archive does not exist it is created.
+     * The method return false and a PEAR error text.
+     * The files and directories listed are only added at the end of the archive,
+     * even if a file with the same name is already archived.
+     * See also createModify() method for more details.
+     *
+     * @param array $p_filelist An array of filenames and directory names, or a
+     *              single string with names separated by a single
+     *              blank space.
+     *
+     * @return true on success, false on error.
+     * @see    createModify()
+     * @access public
+     */
+    public function add($p_filelist)
     {
         return $this->addModify($p_filelist, '', '');
     }
-    // }}}
 
-    // {{{ extract()
-    function extract($p_path='')
+    /**
+     * @param string $p_path
+     * @param bool $p_preserve
+     * @return bool
+     */
+    public function extract($p_path = '', $p_preserve = false)
     {
-        return $this->extractModify($p_path, '');
+        return $this->extractModify($p_path, '', $p_preserve);
     }
-    // }}}
 
-    // {{{ listContent()
-    function listContent()
+    /**
+     * @return array|int
+     */
+    public function listContent()
     {
         $v_list_detail = array();
 
@@ -254,57 +328,56 @@ function listContent()
 
         return $v_list_detail;
     }
-    // }}}
 
-    // {{{ createModify()
     /**
-    * This method creates the archive file and add the files / directories
-    * that are listed in $p_filelist.
-    * If the file already exists and is writable, it is replaced by the
-    * new tar. It is a create and not an add. If the file exists and is
-    * read-only or is a directory it is not replaced. The method return
-    * false and a PEAR error text.
-    * The $p_filelist parameter can be an array of string, each string
-    * representing a filename or a directory name with their path if
-    * needed. It can also be a single string with names separated by a
-    * single blank.
-    * The path indicated in $p_remove_dir will be removed from the
-    * memorized path of each file / directory listed when this path
-    * exists. By default nothing is removed (empty path '')
-    * The path indicated in $p_add_dir will be added at the beginning of
-    * the memorized path of each file / directory listed. However it can
-    * be set to empty ''. The adding of a path is done after the removing
-    * of path.
-    * The path add/remove ability enables the user to prepare an archive
-    * for extraction in a different path than the origin files are.
-    * See also addModify() method for file adding properties.
-    *
-    * @param array  $p_filelist     An array of filenames and directory names,
-	*                               or a single string with names separated by
-	*                               a single blank space.
-    * @param string $p_add_dir      A string which contains a path to be added
-	*                               to the memorized path of each element in
-	*                               the list.
-    * @param string $p_remove_dir   A string which contains a path to be
-	*                               removed from the memorized path of each
-	*                               element in the list, when relevant.
-    * @return boolean               true on success, false on error.
-    * @access public
-    * @see addModify()
-    */
-    function createModify($p_filelist, $p_add_dir, $p_remove_dir='')
+     * This method creates the archive file and add the files / directories
+     * that are listed in $p_filelist.
+     * If the file already exists and is writable, it is replaced by the
+     * new tar. It is a create and not an add. If the file exists and is
+     * read-only or is a directory it is not replaced. The method return
+     * false and a PEAR error text.
+     * The $p_filelist parameter can be an array of string, each string
+     * representing a filename or a directory name with their path if
+     * needed. It can also be a single string with names separated by a
+     * single blank.
+     * The path indicated in $p_remove_dir will be removed from the
+     * memorized path of each file / directory listed when this path
+     * exists. By default nothing is removed (empty path '')
+     * The path indicated in $p_add_dir will be added at the beginning of
+     * the memorized path of each file / directory listed. However it can
+     * be set to empty ''. The adding of a path is done after the removing
+     * of path.
+     * The path add/remove ability enables the user to prepare an archive
+     * for extraction in a different path than the origin files are.
+     * See also addModify() method for file adding properties.
+     *
+     * @param array $p_filelist An array of filenames and directory names,
+     *                             or a single string with names separated by
+     *                             a single blank space.
+     * @param string $p_add_dir A string which contains a path to be added
+     *                             to the memorized path of each element in
+     *                             the list.
+     * @param string $p_remove_dir A string which contains a path to be
+     *                             removed from the memorized path of each
+     *                             element in the list, when relevant.
+     *
+     * @return boolean true on success, false on error.
+     * @see addModify()
+     */
+    public function createModify($p_filelist, $p_add_dir, $p_remove_dir = '')
     {
         $v_result = true;
 
-        if (!$this->_openWrite())
+        if (!$this->_openWrite()) {
             return false;
+        }
 
         if ($p_filelist != '') {
-            if (is_array($p_filelist))
+            if (is_array($p_filelist)) {
                 $v_list = $p_filelist;
-            elseif (is_string($p_filelist))
+            } elseif (is_string($p_filelist)) {
                 $v_list = explode($this->_separator, $p_filelist);
-            else {
+            } else {
                 $this->_cleanFile();
                 $this->_error('Invalid file list');
                 return false;
@@ -316,67 +389,69 @@ function createModify($p_filelist, $p_add_dir, $p_remove_dir='')
         if ($v_result) {
             $this->_writeFooter();
             $this->_close();
-        } else
+        } else {
             $this->_cleanFile();
+        }
 
         return $v_result;
     }
-    // }}}
 
-    // {{{ addModify()
     /**
-    * This method add the files / directories listed in $p_filelist at the
-    * end of the existing archive. If the archive does not yet exists it
-    * is created.
-    * The $p_filelist parameter can be an array of string, each string
-    * representing a filename or a directory name with their path if
-    * needed. It can also be a single string with names separated by a
-    * single blank.
-    * The path indicated in $p_remove_dir will be removed from the
-    * memorized path of each file / directory listed when this path
-    * exists. By default nothing is removed (empty path '')
-    * The path indicated in $p_add_dir will be added at the beginning of
-    * the memorized path of each file / directory listed. However it can
-    * be set to empty ''. The adding of a path is done after the removing
-    * of path.
-    * The path add/remove ability enables the user to prepare an archive
-    * for extraction in a different path than the origin files are.
-    * If a file/dir is already in the archive it will only be added at the
-    * end of the archive. There is no update of the existing archived
-    * file/dir. However while extracting the archive, the last file will
-    * replace the first one. This results in a none optimization of the
-    * archive size.
-    * If a file/dir does not exist the file/dir is ignored. However an
-    * error text is send to PEAR error.
-    * If a file/dir is not readable the file/dir is ignored. However an
-    * error text is send to PEAR error.
-    *
-    * @param array      $p_filelist     An array of filenames and directory
-	*                                   names, or a single string with names
-	*                                   separated by a single blank space.
-    * @param string     $p_add_dir      A string which contains a path to be
-	*                                   added to the memorized path of each
-	*                                   element in the list.
-    * @param string     $p_remove_dir   A string which contains a path to be
-	*                                   removed from the memorized path of
-	*                                   each element in the list, when
-    *                                   relevant.
-    * @return                           true on success, false on error.
-    * @access public
-    */
-    function addModify($p_filelist, $p_add_dir, $p_remove_dir='')
+     * This method add the files / directories listed in $p_filelist at the
+     * end of the existing archive. If the archive does not yet exists it
+     * is created.
+     * The $p_filelist parameter can be an array of string, each string
+     * representing a filename or a directory name with their path if
+     * needed. It can also be a single string with names separated by a
+     * single blank.
+     * The path indicated in $p_remove_dir will be removed from the
+     * memorized path of each file / directory listed when this path
+     * exists. By default nothing is removed (empty path '')
+     * The path indicated in $p_add_dir will be added at the beginning of
+     * the memorized path of each file / directory listed. However it can
+     * be set to empty ''. The adding of a path is done after the removing
+     * of path.
+     * The path add/remove ability enables the user to prepare an archive
+     * for extraction in a different path than the origin files are.
+     * If a file/dir is already in the archive it will only be added at the
+     * end of the archive. There is no update of the existing archived
+     * file/dir. However while extracting the archive, the last file will
+     * replace the first one. This results in a none optimization of the
+     * archive size.
+     * If a file/dir does not exist the file/dir is ignored. However an
+     * error text is send to PEAR error.
+     * If a file/dir is not readable the file/dir is ignored. However an
+     * error text is send to PEAR error.
+     *
+     * @param array $p_filelist An array of filenames and directory
+     *                             names, or a single string with names
+     *                             separated by a single blank space.
+     * @param string $p_add_dir A string which contains a path to be
+     *                             added to the memorized path of each
+     *                             element in the list.
+     * @param string $p_remove_dir A string which contains a path to be
+     *                             removed from the memorized path of
+     *                             each element in the list, when
+     *                             relevant.
+     *
+     * @return true on success, false on error.
+     */
+    public function addModify($p_filelist, $p_add_dir, $p_remove_dir = '')
     {
         $v_result = true;
 
-        if (!$this->_isArchive())
-            $v_result = $this->createModify($p_filelist, $p_add_dir,
-			                                $p_remove_dir);
-        else {
-            if (is_array($p_filelist))
+        if (!$this->_isArchive()) {
+            $v_result = $this->createModify(
+                $p_filelist,
+                $p_add_dir,
+                $p_remove_dir
+            );
+        } else {
+            if (is_array($p_filelist)) {
                 $v_list = $p_filelist;
-            elseif (is_string($p_filelist))
+            } elseif (is_string($p_filelist)) {
                 $v_list = explode($this->_separator, $p_filelist);
-            else {
+            } else {
                 $this->_error('Invalid file list');
                 return false;
             }
@@ -386,24 +461,41 @@ function addModify($p_filelist, $p_add_dir, $p_remove_dir='')
 
         return $v_result;
     }
-    // }}}
 
-    // {{{ addString()
     /**
-    * This method add a single string as a file at the
-    * end of the existing archive. If the archive does not yet exists it
-    * is created.
-    *
-    * @param string     $p_filename     A string which contains the full
-	*                                   filename path that will be associated
-	*                                   with the string.
-    * @param string     $p_string       The content of the file added in
-	*                                   the archive.
-    * @return                           true on success, false on error.
-    * @access public
-    */
-    function addString($p_filename, $p_string)
+     * This method add a single string as a file at the
+     * end of the existing archive. If the archive does not yet exists it
+     * is created.
+     *
+     * @param string $p_filename A string which contains the full
+     *                           filename path that will be associated
+     *                           with the string.
+     * @param string $p_string The content of the file added in
+     *                           the archive.
+     * @param bool|int $p_datetime A custom date/time (unix timestamp)
+     *                           for the file (optional).
+     * @param array $p_params An array of optional params:
+     *                               stamp => the datetime (replaces
+     *                                   datetime above if it exists)
+     *                               mode => the permissions on the
+     *                                   file (600 by default)
+     *                               type => is this a link?  See the
+     *                                   tar specification for details.
+     *                                   (default = regular file)
+     *                               uid => the user ID of the file
+     *                                   (default = 0 = root)
+     *                               gid => the group ID of the file
+     *                                   (default = 0 = root)
+     *
+     * @return true on success, false on error.
+     */
+    public function addString($p_filename, $p_string, $p_datetime = false, $p_params = array())
     {
+        $p_stamp = @$p_params["stamp"] ? $p_params["stamp"] : ($p_datetime ? $p_datetime : time());
+        $p_mode = @$p_params["mode"] ? $p_params["mode"] : 0600;
+        $p_type = @$p_params["type"] ? $p_params["type"] : "";
+        $p_uid = @$p_params["uid"] ? $p_params["uid"] : "";
+        $p_gid = @$p_params["gid"] ? $p_params["gid"] : "";
         $v_result = true;
 
         if (!$this->_isArchive()) {
@@ -413,11 +505,12 @@ function addString($p_filename, $p_string)
             $this->_close();
         }
 
-        if (!$this->_openAppend())
+        if (!$this->_openAppend()) {
             return false;
+        }
 
         // Need to check the get back to the temporary file ? ....
-        $v_result = $this->_addString($p_filename, $p_string);
+        $v_result = $this->_addString($p_filename, $p_string, $p_datetime, $p_params);
 
         $this->_writeFooter();
 
@@ -425,131 +518,138 @@ function addString($p_filename, $p_string)
 
         return $v_result;
     }
-    // }}}
 
-    // {{{ extractModify()
     /**
-    * This method extract all the content of the archive in the directory
-    * indicated by $p_path. When relevant the memorized path of the
-    * files/dir can be modified by removing the $p_remove_path path at the
-    * beginning of the file/dir path.
-    * While extracting a file, if the directory path does not exists it is
-    * created.
-    * While extracting a file, if the file already exists it is replaced
-    * without looking for last modification date.
-    * While extracting a file, if the file already exists and is write
-    * protected, the extraction is aborted.
-    * While extracting a file, if a directory with the same name already
-    * exists, the extraction is aborted.
-    * While extracting a directory, if a file with the same name already
-    * exists, the extraction is aborted.
-    * While extracting a file/directory if the destination directory exist
-    * and is write protected, or does not exist but can not be created,
-    * the extraction is aborted.
-    * If after extraction an extracted file does not show the correct
-    * stored file size, the extraction is aborted.
-    * When the extraction is aborted, a PEAR error text is set and false
-    * is returned. However the result can be a partial extraction that may
-    * need to be manually cleaned.
-    *
-    * @param string $p_path         The path of the directory where the
-	*                               files/dir need to by extracted.
-    * @param string $p_remove_path  Part of the memorized path that can be
-	*                               removed if present at the beginning of
-	*                               the file/dir path.
-    * @return boolean               true on success, false on error.
-    * @access public
-    * @see extractList()
-    */
-    function extractModify($p_path, $p_remove_path)
+     * This method extract all the content of the archive in the directory
+     * indicated by $p_path. When relevant the memorized path of the
+     * files/dir can be modified by removing the $p_remove_path path at the
+     * beginning of the file/dir path.
+     * While extracting a file, if the directory path does not exists it is
+     * created.
+     * While extracting a file, if the file already exists it is replaced
+     * without looking for last modification date.
+     * While extracting a file, if the file already exists and is write
+     * protected, the extraction is aborted.
+     * While extracting a file, if a directory with the same name already
+     * exists, the extraction is aborted.
+     * While extracting a directory, if a file with the same name already
+     * exists, the extraction is aborted.
+     * While extracting a file/directory if the destination directory exist
+     * and is write protected, or does not exist but can not be created,
+     * the extraction is aborted.
+     * If after extraction an extracted file does not show the correct
+     * stored file size, the extraction is aborted.
+     * When the extraction is aborted, a PEAR error text is set and false
+     * is returned. However the result can be a partial extraction that may
+     * need to be manually cleaned.
+     *
+     * @param string $p_path The path of the directory where the
+     *                               files/dir need to by extracted.
+     * @param string $p_remove_path Part of the memorized path that can be
+     *                               removed if present at the beginning of
+     *                               the file/dir path.
+     * @param boolean $p_preserve Preserve user/group ownership of files
+     *
+     * @return boolean true on success, false on error.
+     * @see    extractList()
+     */
+    public function extractModify($p_path, $p_remove_path, $p_preserve = false)
     {
         $v_result = true;
         $v_list_detail = array();
 
         if ($v_result = $this->_openRead()) {
-            $v_result = $this->_extractList($p_path, $v_list_detail,
-			                                "complete", 0, $p_remove_path);
+            $v_result = $this->_extractList(
+                $p_path,
+                $v_list_detail,
+                "complete",
+                0,
+                $p_remove_path,
+                $p_preserve
+            );
             $this->_close();
         }
 
         return $v_result;
     }
-    // }}}
 
-    // {{{ extractInString()
     /**
-    * This method extract from the archive one file identified by $p_filename.
-    * The return value is a string with the file content, or NULL on error.
-    * @param string $p_filename     The path of the file to extract in a string.
-    * @return                       a string with the file content or NULL.
-    * @access public
-    */
-    function extractInString($p_filename)
+     * This method extract from the archive one file identified by $p_filename.
+     * The return value is a string with the file content, or NULL on error.
+     *
+     * @param string $p_filename The path of the file to extract in a string.
+     *
+     * @return a string with the file content or NULL.
+     */
+    public function extractInString($p_filename)
     {
         if ($this->_openRead()) {
             $v_result = $this->_extractInString($p_filename);
             $this->_close();
         } else {
-            $v_result = NULL;
+            $v_result = null;
         }
 
         return $v_result;
     }
-    // }}}
 
-    // {{{ extractList()
     /**
-    * This method extract from the archive only the files indicated in the
-    * $p_filelist. These files are extracted in the current directory or
-    * in the directory indicated by the optional $p_path parameter.
-    * If indicated the $p_remove_path can be used in the same way as it is
-    * used in extractModify() method.
-    * @param array  $p_filelist     An array of filenames and directory names,
-	*                               or a single string with names separated
-	*                               by a single blank space.
-    * @param string $p_path         The path of the directory where the
-	*                               files/dir need to by extracted.
-    * @param string $p_remove_path  Part of the memorized path that can be
-	*                               removed if present at the beginning of
-	*                               the file/dir path.
-    * @return                       true on success, false on error.
-    * @access public
-    * @see extractModify()
-    */
-    function extractList($p_filelist, $p_path='', $p_remove_path='')
+     * This method extract from the archive only the files indicated in the
+     * $p_filelist. These files are extracted in the current directory or
+     * in the directory indicated by the optional $p_path parameter.
+     * If indicated the $p_remove_path can be used in the same way as it is
+     * used in extractModify() method.
+     *
+     * @param array $p_filelist An array of filenames and directory names,
+     *                               or a single string with names separated
+     *                               by a single blank space.
+     * @param string $p_path The path of the directory where the
+     *                               files/dir need to by extracted.
+     * @param string $p_remove_path Part of the memorized path that can be
+     *                               removed if present at the beginning of
+     *                               the file/dir path.
+     * @param boolean $p_preserve Preserve user/group ownership of files
+     *
+     * @return true on success, false on error.
+     * @see    extractModify()
+     */
+    public function extractList($p_filelist, $p_path = '', $p_remove_path = '', $p_preserve = false)
     {
         $v_result = true;
         $v_list_detail = array();
 
-        if (is_array($p_filelist))
+        if (is_array($p_filelist)) {
             $v_list = $p_filelist;
-        elseif (is_string($p_filelist))
+        } elseif (is_string($p_filelist)) {
             $v_list = explode($this->_separator, $p_filelist);
-        else {
+        } else {
             $this->_error('Invalid string list');
             return false;
         }
 
         if ($v_result = $this->_openRead()) {
-            $v_result = $this->_extractList($p_path, $v_list_detail, "partial",
-			                                $v_list, $p_remove_path);
+            $v_result = $this->_extractList(
+                $p_path,
+                $v_list_detail,
+                "partial",
+                $v_list,
+                $p_remove_path,
+                $p_preserve
+            );
             $this->_close();
         }
 
         return $v_result;
     }
-    // }}}
 
-    // {{{ setAttribute()
     /**
-    * This method set specific attributes of the archive. It uses a variable
-    * list of parameters, in the format attribute code + attribute values :
-    * $arch->setAttribute(ARCHIVE_TAR_ATT_SEPARATOR, ',');
-    * @param mixed $argv            variable list of attributes and values
-    * @return                       true on success, false on error.
-    * @access public
-    */
-    function setAttribute()
+     * This method set specific attributes of the archive. It uses a variable
+     * list of parameters, in the format attribute code + attribute values :
+     * $arch->setAttribute(ARCHIVE_TAR_ATT_SEPARATOR, ',');
+     *
+     * @return true on success, false on error.
+     */
+    public function setAttribute()
     {
         $v_result = true;
 
@@ -559,30 +659,32 @@ function setAttribute()
         }
 
         // ----- Get the arguments
-        $v_att_list = &func_get_args();
+        $v_att_list = & func_get_args();
 
         // ----- Read the attributes
-        $i=0;
-        while ($i<$v_size) {
+        $i = 0;
+        while ($i < $v_size) {
 
             // ----- Look for next option
             switch ($v_att_list[$i]) {
                 // ----- Look for options that request a string value
                 case ARCHIVE_TAR_ATT_SEPARATOR :
                     // ----- Check the number of parameters
-                    if (($i+1) >= $v_size) {
-                        $this->_error('Invalid number of parameters for '
-						              .'attribute ARCHIVE_TAR_ATT_SEPARATOR');
+                    if (($i + 1) >= $v_size) {
+                        $this->_error(
+                            'Invalid number of parameters for '
+                            . 'attribute ARCHIVE_TAR_ATT_SEPARATOR'
+                        );
                         return false;
                     }
 
                     // ----- Get the value
-                    $this->_separator = $v_att_list[$i+1];
+                    $this->_separator = $v_att_list[$i + 1];
                     $i++;
-                break;
+                    break;
 
                 default :
-                    $this->_error('Unknow attribute code '.$v_att_list[$i].'');
+                    $this->_error('Unknown attribute code ' . $v_att_list[$i] . '');
                     return false;
             }
 
@@ -592,179 +694,246 @@ function setAttribute()
 
         return $v_result;
     }
-    // }}}
 
-    // {{{ setIgnoreRegexp()
     /**
-    * This method sets the regular expression for ignoring files and directories
-    * at import, for example:
-    * $arch->setIgnoreRegexp("#CVS|\.svn#");
-    * @param string $regexp         regular expression defining which files or directories to ignore
-    * @access public
-    */
-    function setIgnoreRegexp($regexp)
+     * This method sets the regular expression for ignoring files and directories
+     * at import, for example:
+     * $arch->setIgnoreRegexp("#CVS|\.svn#");
+     *
+     * @param string $regexp regular expression defining which files or directories to ignore
+     */
+    public function setIgnoreRegexp($regexp)
     {
-    	$this->_ignore_regexp = $regexp;
+        $this->_ignore_regexp = $regexp;
     }
-    // }}}
 
-    // {{{ setIgnoreList()
     /**
-    * This method sets the regular expression for ignoring all files and directories
-    * matching the filenames in the array list at import, for example:
-    * $arch->setIgnoreList(array('CVS', '.svn', 'bin/tool'));
-    * @param array $list         a list of file or directory names to ignore
-    * @access public
-    */
-    function setIgnoreList($list)
+     * This method sets the regular expression for ignoring all files and directories
+     * matching the filenames in the array list at import, for example:
+     * $arch->setIgnoreList(array('CVS', '.svn', 'bin/tool'));
+     *
+     * @param array $list a list of file or directory names to ignore
+     *
+     * @access public
+     */
+    public function setIgnoreList($list)
     {
-    	$regexp = str_replace(array('#', '.', '^', '$'), array('\#', '\.', '\^', '\$'), $list);
-    	$regexp = '#/'.join('$|/', $list).'#';
-    	$this->setIgnoreRegexp($regexp);
+        $regexp = str_replace(array('#', '.', '^', '$'), array('\#', '\.', '\^', '\$'), $list);
+        $regexp = '#/' . join('$|/', $list) . '#';
+        $this->setIgnoreRegexp($regexp);
     }
-    // }}}
 
-    // {{{ _error()
-    function _error($p_message)
+    /**
+     * @param string $p_message
+     */
+    public function _error($p_message)
     {
-        // ----- To be completed
-        $this->raiseError($p_message);
+        $this->error_object = $this->raiseError($p_message);
     }
-    // }}}
 
-    // {{{ _warning()
-    function _warning($p_message)
+    /**
+     * @param string $p_message
+     */
+    public function _warning($p_message)
     {
-        // ----- To be completed
-        $this->raiseError($p_message);
+        $this->error_object = $this->raiseError($p_message);
     }
-    // }}}
 
-    // {{{ _isArchive()
-    function _isArchive($p_filename=NULL)
+    /**
+     * @param string $p_filename
+     * @return bool
+     */
+    public function _isArchive($p_filename = null)
     {
-        if ($p_filename == NULL) {
+        if ($p_filename == null) {
             $p_filename = $this->_tarname;
         }
         clearstatcache();
         return @is_file($p_filename) && !@is_link($p_filename);
     }
-    // }}}
 
-    // {{{ _openWrite()
-    function _openWrite()
+    /**
+     * @return bool
+     */
+    public function _openWrite()
     {
-        if ($this->_compress_type == 'gz')
+        if ($this->_compress_type == 'gz' && function_exists('gzopen')) {
             $this->_file = @gzopen($this->_tarname, "wb9");
-        else if ($this->_compress_type == 'bz2')
-            $this->_file = @bzopen($this->_tarname, "w");
-        else if ($this->_compress_type == 'none')
-            $this->_file = @fopen($this->_tarname, "wb");
-        else
-            $this->_error('Unknown or missing compression type ('
-			              .$this->_compress_type.')');
+        } else {
+            if ($this->_compress_type == 'bz2' && function_exists('bzopen')) {
+                $this->_file = @bzopen($this->_tarname, "w");
+            } else {
+                if ($this->_compress_type == 'lzma2' && function_exists('xzopen')) {
+                    $this->_file = @xzopen($this->_tarname, 'w');
+                } else {
+                    if ($this->_compress_type == 'none') {
+                        $this->_file = @fopen($this->_tarname, "wb");
+                    } else {
+                        $this->_error(
+                            'Unknown or missing compression type ('
+                            . $this->_compress_type . ')'
+                        );
+                        return false;
+                    }
+                }
+            }
+        }
 
         if ($this->_file == 0) {
-            $this->_error('Unable to open in write mode \''
-			              .$this->_tarname.'\'');
+            $this->_error(
+                'Unable to open in write mode \''
+                . $this->_tarname . '\''
+            );
             return false;
         }
 
         return true;
     }
-    // }}}
 
-    // {{{ _openRead()
-    function _openRead()
+    /**
+     * @return bool
+     */
+    public function _openRead()
     {
         if (strtolower(substr($this->_tarname, 0, 7)) == 'http://') {
 
-          // ----- Look if a local copy need to be done
-          if ($this->_temp_tarname == '') {
-              $this->_temp_tarname = uniqid('tar').'.tmp';
-              if (!$v_file_from = @fopen($this->_tarname, 'rb')) {
-                $this->_error('Unable to open in read mode \''
-				              .$this->_tarname.'\'');
-                $this->_temp_tarname = '';
-                return false;
-              }
-              if (!$v_file_to = @fopen($this->_temp_tarname, 'wb')) {
-                $this->_error('Unable to open in write mode \''
-				              .$this->_temp_tarname.'\'');
-                $this->_temp_tarname = '';
-                return false;
-              }
-              while ($v_data = @fread($v_file_from, 1024))
-                  @fwrite($v_file_to, $v_data);
-              @fclose($v_file_from);
-              @fclose($v_file_to);
-          }
+            // ----- Look if a local copy need to be done
+            if ($this->_temp_tarname == '') {
+                $this->_temp_tarname = uniqid('tar') . '.tmp';
+                if (!$v_file_from = @fopen($this->_tarname, 'rb')) {
+                    $this->_error(
+                        'Unable to open in read mode \''
+                        . $this->_tarname . '\''
+                    );
+                    $this->_temp_tarname = '';
+                    return false;
+                }
+                if (!$v_file_to = @fopen($this->_temp_tarname, 'wb')) {
+                    $this->_error(
+                        'Unable to open in write mode \''
+                        . $this->_temp_tarname . '\''
+                    );
+                    $this->_temp_tarname = '';
+                    return false;
+                }
+                while ($v_data = @fread($v_file_from, 1024)) {
+                    @fwrite($v_file_to, $v_data);
+                }
+                @fclose($v_file_from);
+                @fclose($v_file_to);
+            }
 
-          // ----- File to open if the local copy
-          $v_filename = $this->_temp_tarname;
+            // ----- File to open if the local copy
+            $v_filename = $this->_temp_tarname;
+        } else {
+            // ----- File to open if the normal Tar file
 
-        } else
-          // ----- File to open if the normal Tar file
-          $v_filename = $this->_tarname;
+            $v_filename = $this->_tarname;
+        }
 
-        if ($this->_compress_type == 'gz')
+        if ($this->_compress_type == 'gz' && function_exists('gzopen')) {
             $this->_file = @gzopen($v_filename, "rb");
-        else if ($this->_compress_type == 'bz2')
-            $this->_file = @bzopen($v_filename, "r");
-        else if ($this->_compress_type == 'none')
-            $this->_file = @fopen($v_filename, "rb");
-        else
-            $this->_error('Unknown or missing compression type ('
-			              .$this->_compress_type.')');
+        } else {
+            if ($this->_compress_type == 'bz2' && function_exists('bzopen')) {
+                $this->_file = @bzopen($v_filename, "r");
+            } else {
+                if ($this->_compress_type == 'lzma2' && function_exists('xzopen')) {
+                    $this->_file = @xzopen($v_filename, "r");
+                } else {
+                    if ($this->_compress_type == 'none') {
+                        $this->_file = @fopen($v_filename, "rb");
+                    } else {
+                        $this->_error(
+                            'Unknown or missing compression type ('
+                            . $this->_compress_type . ')'
+                        );
+                        return false;
+                    }
+                }
+            }
+        }
 
         if ($this->_file == 0) {
-            $this->_error('Unable to open in read mode \''.$v_filename.'\'');
+            $this->_error('Unable to open in read mode \'' . $v_filename . '\'');
             return false;
         }
 
         return true;
     }
-    // }}}
 
-    // {{{ _openReadWrite()
-    function _openReadWrite()
+    /**
+     * @return bool
+     */
+    public function _openReadWrite()
     {
-        if ($this->_compress_type == 'gz')
+        if ($this->_compress_type == 'gz') {
             $this->_file = @gzopen($this->_tarname, "r+b");
-        else if ($this->_compress_type == 'bz2') {
-            $this->_error('Unable to open bz2 in read/write mode \''
-			              .$this->_tarname.'\' (limitation of bz2 extension)');
-            return false;
-        } else if ($this->_compress_type == 'none')
-            $this->_file = @fopen($this->_tarname, "r+b");
-        else
-            $this->_error('Unknown or missing compression type ('
-			              .$this->_compress_type.')');
+        } else {
+            if ($this->_compress_type == 'bz2') {
+                $this->_error(
+                    'Unable to open bz2 in read/write mode \''
+                    . $this->_tarname . '\' (limitation of bz2 extension)'
+                );
+                return false;
+            } else {
+                if ($this->_compress_type == 'lzma2') {
+                    $this->_error(
+                        'Unable to open lzma2 in read/write mode \''
+                        . $this->_tarname . '\' (limitation of lzma2 extension)'
+                    );
+                    return false;
+                } else {
+                    if ($this->_compress_type == 'none') {
+                        $this->_file = @fopen($this->_tarname, "r+b");
+                    } else {
+                        $this->_error(
+                            'Unknown or missing compression type ('
+                            . $this->_compress_type . ')'
+                        );
+                        return false;
+                    }
+                }
+            }
+        }
 
         if ($this->_file == 0) {
-            $this->_error('Unable to open in read/write mode \''
-			              .$this->_tarname.'\'');
+            $this->_error(
+                'Unable to open in read/write mode \''
+                . $this->_tarname . '\''
+            );
             return false;
         }
 
         return true;
     }
-    // }}}
 
-    // {{{ _close()
-    function _close()
+    /**
+     * @return bool
+     */
+    public function _close()
     {
         //if (isset($this->_file)) {
         if (is_resource($this->_file)) {
-            if ($this->_compress_type == 'gz')
+            if ($this->_compress_type == 'gz') {
                 @gzclose($this->_file);
-            else if ($this->_compress_type == 'bz2')
-                @bzclose($this->_file);
-            else if ($this->_compress_type == 'none')
-                @fclose($this->_file);
-            else
-                $this->_error('Unknown or missing compression type ('
-				              .$this->_compress_type.')');
+            } else {
+                if ($this->_compress_type == 'bz2') {
+                    @bzclose($this->_file);
+                } else {
+                    if ($this->_compress_type == 'lzma2') {
+                        @xzclose($this->_file);
+                    } else {
+                        if ($this->_compress_type == 'none') {
+                            @fclose($this->_file);
+                        } else {
+                            $this->_error(
+                                'Unknown or missing compression type ('
+                                . $this->_compress_type . ')'
+                            );
+                        }
+                    }
+                }
+            }
 
             $this->_file = 0;
         }
@@ -778,10 +947,11 @@ function _close()
 
         return true;
     }
-    // }}}
 
-    // {{{ _cleanFile()
-    function _cleanFile()
+    /**
+     * @return bool
+     */
+    public function _cleanFile()
     {
         $this->_close();
 
@@ -798,271 +968,381 @@ function _cleanFile()
 
         return true;
     }
-    // }}}
 
-    // {{{ _writeBlock()
-    function _writeBlock($p_binary_data, $p_len=null)
+    /**
+     * @param mixed $p_binary_data
+     * @param integer $p_len
+     * @return bool
+     */
+    public function _writeBlock($p_binary_data, $p_len = null)
     {
-      if (is_resource($this->_file)) {
-          if ($p_len === null) {
-              if ($this->_compress_type == 'gz')
-                  @gzputs($this->_file, $p_binary_data);
-              else if ($this->_compress_type == 'bz2')
-                  @bzwrite($this->_file, $p_binary_data);
-              else if ($this->_compress_type == 'none')
-                  @fputs($this->_file, $p_binary_data);
-              else
-                  $this->_error('Unknown or missing compression type ('
-				                .$this->_compress_type.')');
-          } else {
-              if ($this->_compress_type == 'gz')
-                  @gzputs($this->_file, $p_binary_data, $p_len);
-              else if ($this->_compress_type == 'bz2')
-                  @bzwrite($this->_file, $p_binary_data, $p_len);
-              else if ($this->_compress_type == 'none')
-                  @fputs($this->_file, $p_binary_data, $p_len);
-              else
-                  $this->_error('Unknown or missing compression type ('
-				                .$this->_compress_type.')');
-
-          }
-      }
-      return true;
+        if (is_resource($this->_file)) {
+            if ($p_len === null) {
+                if ($this->_compress_type == 'gz') {
+                    @gzputs($this->_file, $p_binary_data);
+                } else {
+                    if ($this->_compress_type == 'bz2') {
+                        @bzwrite($this->_file, $p_binary_data);
+                    } else {
+                        if ($this->_compress_type == 'lzma2') {
+                            @xzwrite($this->_file, $p_binary_data);
+                        } else {
+                            if ($this->_compress_type == 'none') {
+                                @fputs($this->_file, $p_binary_data);
+                            } else {
+                                $this->_error(
+                                    'Unknown or missing compression type ('
+                                    . $this->_compress_type . ')'
+                                );
+                            }
+                        }
+                    }
+                }
+            } else {
+                if ($this->_compress_type == 'gz') {
+                    @gzputs($this->_file, $p_binary_data, $p_len);
+                } else {
+                    if ($this->_compress_type == 'bz2') {
+                        @bzwrite($this->_file, $p_binary_data, $p_len);
+                    } else {
+                        if ($this->_compress_type == 'lzma2') {
+                            @xzwrite($this->_file, $p_binary_data, $p_len);
+                        } else {
+                            if ($this->_compress_type == 'none') {
+                                @fputs($this->_file, $p_binary_data, $p_len);
+                            } else {
+                                $this->_error(
+                                    'Unknown or missing compression type ('
+                                    . $this->_compress_type . ')'
+                                );
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return true;
     }
-    // }}}
 
-    // {{{ _readBlock()
-    function _readBlock()
+    /**
+     * @return null|string
+     */
+    public function _readBlock()
     {
-      $v_block = null;
-      if (is_resource($this->_file)) {
-          if ($this->_compress_type == 'gz')
-              $v_block = @gzread($this->_file, 512);
-          else if ($this->_compress_type == 'bz2')
-              $v_block = @bzread($this->_file, 512);
-          else if ($this->_compress_type == 'none')
-              $v_block = @fread($this->_file, 512);
-          else
-              $this->_error('Unknown or missing compression type ('
-			                .$this->_compress_type.')');
-      }
-      return $v_block;
+        $v_block = null;
+        if (is_resource($this->_file)) {
+            if ($this->_compress_type == 'gz') {
+                $v_block = @gzread($this->_file, 512);
+            } else {
+                if ($this->_compress_type == 'bz2') {
+                    $v_block = @bzread($this->_file, 512);
+                } else {
+                    if ($this->_compress_type == 'lzma2') {
+                        $v_block = @xzread($this->_file, 512);
+                    } else {
+                        if ($this->_compress_type == 'none') {
+                            $v_block = @fread($this->_file, 512);
+                        } else {
+                            $this->_error(
+                                'Unknown or missing compression type ('
+                                . $this->_compress_type . ')'
+                            );
+                        }
+                    }
+                }
+            }
+        }
+        return $v_block;
     }
-    // }}}
 
-    // {{{ _jumpBlock()
-    function _jumpBlock($p_len=null)
+    /**
+     * @param null $p_len
+     * @return bool
+     */
+    public function _jumpBlock($p_len = null)
     {
-      if (is_resource($this->_file)) {
-          if ($p_len === null)
-              $p_len = 1;
-
-          if ($this->_compress_type == 'gz') {
-              @gzseek($this->_file, gztell($this->_file)+($p_len*512));
-          }
-          else if ($this->_compress_type == 'bz2') {
-              // ----- Replace missing bztell() and bzseek()
-              for ($i=0; $i<$p_len; $i++)
-                  $this->_readBlock();
-          } else if ($this->_compress_type == 'none')
-              @fseek($this->_file, $p_len*512, SEEK_CUR);
-          else
-              $this->_error('Unknown or missing compression type ('
-			                .$this->_compress_type.')');
-
-      }
-      return true;
+        if (is_resource($this->_file)) {
+            if ($p_len === null) {
+                $p_len = 1;
+            }
+
+            if ($this->_compress_type == 'gz') {
+                @gzseek($this->_file, gztell($this->_file) + ($p_len * 512));
+            } else {
+                if ($this->_compress_type == 'bz2') {
+                    // ----- Replace missing bztell() and bzseek()
+                    for ($i = 0; $i < $p_len; $i++) {
+                        $this->_readBlock();
+                    }
+                } else {
+                    if ($this->_compress_type == 'lzma2') {
+                        // ----- Replace missing xztell() and xzseek()
+                        for ($i = 0; $i < $p_len; $i++) {
+                            $this->_readBlock();
+                        }
+                    } else {
+                        if ($this->_compress_type == 'none') {
+                            @fseek($this->_file, $p_len * 512, SEEK_CUR);
+                        } else {
+                            $this->_error(
+                                'Unknown or missing compression type ('
+                                . $this->_compress_type . ')'
+                            );
+                        }
+                    }
+                }
+            }
+        }
+        return true;
     }
-    // }}}
 
-    // {{{ _writeFooter()
-    function _writeFooter()
+    /**
+     * @return bool
+     */
+    public function _writeFooter()
     {
-      if (is_resource($this->_file)) {
-          // ----- Write the last 0 filled block for end of archive
-          $v_binary_data = pack('a1024', '');
-          $this->_writeBlock($v_binary_data);
-      }
-      return true;
+        if (is_resource($this->_file)) {
+            // ----- Write the last 0 filled block for end of archive
+            $v_binary_data = pack('a1024', '');
+            $this->_writeBlock($v_binary_data);
+        }
+        return true;
     }
-    // }}}
 
-    // {{{ _addList()
-    function _addList($p_list, $p_add_dir, $p_remove_dir)
+    /**
+     * @param array $p_list
+     * @param string $p_add_dir
+     * @param string $p_remove_dir
+     * @return bool
+     */
+    public function _addList($p_list, $p_add_dir, $p_remove_dir)
     {
-      $v_result=true;
-      $v_header = array();
+        $v_result = true;
+        $v_header = array();
 
-      // ----- Remove potential windows directory separator
-      $p_add_dir = $this->_translateWinPath($p_add_dir);
-      $p_remove_dir = $this->_translateWinPath($p_remove_dir, false);
+        // ----- Remove potential windows directory separator
+        $p_add_dir = $this->_translateWinPath($p_add_dir);
+        $p_remove_dir = $this->_translateWinPath($p_remove_dir, false);
 
-      if (!$this->_file) {
-          $this->_error('Invalid file descriptor');
-          return false;
-      }
+        if (!$this->_file) {
+            $this->_error('Invalid file descriptor');
+            return false;
+        }
+
+        if (sizeof($p_list) == 0) {
+            return true;
+        }
 
-      if (sizeof($p_list) == 0)
-          return true;
+        foreach ($p_list as $v_filename) {
+            if (!$v_result) {
+                break;
+            }
 
-      foreach ($p_list as $v_filename) {
-          if (!$v_result) {
-              break;
-          }
+            // ----- Skip the current tar name
+            if ($v_filename == $this->_tarname) {
+                continue;
+            }
 
-        // ----- Skip the current tar name
-        if ($v_filename == $this->_tarname)
-            continue;
+            if ($v_filename == '') {
+                continue;
+            }
 
-        if ($v_filename == '')
-            continue;
+            // ----- ignore files and directories matching the ignore regular expression
+            if ($this->_ignore_regexp && preg_match($this->_ignore_regexp, '/' . $v_filename)) {
+                $this->_warning("File '$v_filename' ignored");
+                continue;
+            }
 
-       	// ----- ignore files and directories matching the ignore regular expression
-       	if ($this->_ignore_regexp && preg_match($this->_ignore_regexp, '/'.$v_filename)) {
-            $this->_warning("File '$v_filename' ignored");
-       	    continue;
-       	}
+            if (!file_exists($v_filename) && !is_link($v_filename)) {
+                $this->_warning("File '$v_filename' does not exist");
+                continue;
+            }
 
-        if (!file_exists($v_filename)) {
-            $this->_warning("File '$v_filename' does not exist");
-            continue;
+            // ----- Add the file or directory header
+            if (!$this->_addFile($v_filename, $v_header, $p_add_dir, $p_remove_dir)) {
+                return false;
+            }
+
+            if (@is_dir($v_filename) && !@is_link($v_filename)) {
+                if (!($p_hdir = opendir($v_filename))) {
+                    $this->_warning("Directory '$v_filename' can not be read");
+                    continue;
+                }
+                while (false !== ($p_hitem = readdir($p_hdir))) {
+                    if (($p_hitem != '.') && ($p_hitem != '..')) {
+                        if ($v_filename != ".") {
+                            $p_temp_list[0] = $v_filename . '/' . $p_hitem;
+                        } else {
+                            $p_temp_list[0] = $p_hitem;
+                        }
+
+                        $v_result = $this->_addList(
+                            $p_temp_list,
+                            $p_add_dir,
+                            $p_remove_dir
+                        );
+                    }
+                }
+
+                unset($p_temp_list);
+                unset($p_hdir);
+                unset($p_hitem);
+            }
+        }
+
+        return $v_result;
+    }
+
+    /**
+     * @param string $p_filename
+     * @param mixed $p_header
+     * @param string $p_add_dir
+     * @param string $p_remove_dir
+     * @param null $v_stored_filename
+     * @return bool
+     */
+    public function _addFile($p_filename, &$p_header, $p_add_dir, $p_remove_dir, $v_stored_filename = null)
+    {
+        if (!$this->_file) {
+            $this->_error('Invalid file descriptor');
+            return false;
         }
 
-        // ----- Add the file or directory header
-        if (!$this->_addFile($v_filename, $v_header, $p_add_dir, $p_remove_dir))
+        if ($p_filename == '') {
+            $this->_error('Invalid file name');
             return false;
+        }
 
-        if (@is_dir($v_filename) && !@is_link($v_filename)) {
-            if (!($p_hdir = opendir($v_filename))) {
-                $this->_warning("Directory '$v_filename' can not be read");
-                continue;
+        if (is_null($v_stored_filename)) {
+            // ----- Calculate the stored filename
+            $p_filename = $this->_translateWinPath($p_filename, false);
+            $v_stored_filename = $p_filename;
+
+            if (strcmp($p_filename, $p_remove_dir) == 0) {
+                return true;
+            }
+
+            if ($p_remove_dir != '') {
+                if (substr($p_remove_dir, -1) != '/') {
+                    $p_remove_dir .= '/';
+                }
+
+                if (substr($p_filename, 0, strlen($p_remove_dir)) == $p_remove_dir) {
+                    $v_stored_filename = substr($p_filename, strlen($p_remove_dir));
+                }
             }
-            while (false !== ($p_hitem = readdir($p_hdir))) {
-                if (($p_hitem != '.') && ($p_hitem != '..')) {
-                    if ($v_filename != ".")
-                        $p_temp_list[0] = $v_filename.'/'.$p_hitem;
-                    else
-                        $p_temp_list[0] = $p_hitem;
-
-                    $v_result = $this->_addList($p_temp_list,
-					                            $p_add_dir,
-												$p_remove_dir);
+
+            $v_stored_filename = $this->_translateWinPath($v_stored_filename);
+            if ($p_add_dir != '') {
+                if (substr($p_add_dir, -1) == '/') {
+                    $v_stored_filename = $p_add_dir . $v_stored_filename;
+                } else {
+                    $v_stored_filename = $p_add_dir . '/' . $v_stored_filename;
                 }
             }
 
-            unset($p_temp_list);
-            unset($p_hdir);
-            unset($p_hitem);
+            $v_stored_filename = $this->_pathReduction($v_stored_filename);
         }
-      }
 
-      return $v_result;
-    }
-    // }}}
+        if ($this->_isArchive($p_filename)) {
+            if (($v_file = @fopen($p_filename, "rb")) == 0) {
+                $this->_warning(
+                    "Unable to open file '" . $p_filename
+                    . "' in binary read mode"
+                );
+                return true;
+            }
 
-    // {{{ _addFile()
-    function _addFile($p_filename, &$p_header, $p_add_dir, $p_remove_dir)
-    {
-      if (!$this->_file) {
-          $this->_error('Invalid file descriptor');
-          return false;
-      }
-
-      if ($p_filename == '') {
-          $this->_error('Invalid file name');
-          return false;
-      }
-
-      // ----- Calculate the stored filename
-      $p_filename = $this->_translateWinPath($p_filename, false);;
-      $v_stored_filename = $p_filename;
-      if (strcmp($p_filename, $p_remove_dir) == 0) {
-          return true;
-      }
-      if ($p_remove_dir != '') {
-          if (substr($p_remove_dir, -1) != '/')
-              $p_remove_dir .= '/';
-
-          if (substr($p_filename, 0, strlen($p_remove_dir)) == $p_remove_dir)
-              $v_stored_filename = substr($p_filename, strlen($p_remove_dir));
-      }
-      $v_stored_filename = $this->_translateWinPath($v_stored_filename);
-      if ($p_add_dir != '') {
-          if (substr($p_add_dir, -1) == '/')
-              $v_stored_filename = $p_add_dir.$v_stored_filename;
-          else
-              $v_stored_filename = $p_add_dir.'/'.$v_stored_filename;
-      }
-
-      $v_stored_filename = $this->_pathReduction($v_stored_filename);
-
-      if ($this->_isArchive($p_filename)) {
-          if (($v_file = @fopen($p_filename, "rb")) == 0) {
-              $this->_warning("Unable to open file '".$p_filename
-			                  ."' in binary read mode");
-              return true;
-          }
-
-          if (!$this->_writeHeader($p_filename, $v_stored_filename))
-              return false;
-
-          while (($v_buffer = fread($v_file, 512)) != '') {
-              $v_binary_data = pack("a512", "$v_buffer");
-              $this->_writeBlock($v_binary_data);
-          }
-
-          fclose($v_file);
-
-      } else {
-          // ----- Only header for dir
-          if (!$this->_writeHeader($p_filename, $v_stored_filename))
-              return false;
-      }
-
-      return true;
+            if (!$this->_writeHeader($p_filename, $v_stored_filename)) {
+                return false;
+            }
+
+            while (($v_buffer = fread($v_file, 512)) != '') {
+                $v_binary_data = pack("a512", "$v_buffer");
+                $this->_writeBlock($v_binary_data);
+            }
+
+            fclose($v_file);
+        } else {
+            // ----- Only header for dir
+            if (!$this->_writeHeader($p_filename, $v_stored_filename)) {
+                return false;
+            }
+        }
+
+        return true;
     }
-    // }}}
 
-    // {{{ _addString()
-    function _addString($p_filename, $p_string)
+    /**
+     * @param string $p_filename
+     * @param string $p_string
+     * @param bool $p_datetime
+     * @param array $p_params
+     * @return bool
+     */
+    public function _addString($p_filename, $p_string, $p_datetime = false, $p_params = array())
     {
-      if (!$this->_file) {
-          $this->_error('Invalid file descriptor');
-          return false;
-      }
-
-      if ($p_filename == '') {
-          $this->_error('Invalid file name');
-          return false;
-      }
-
-      // ----- Calculate the stored filename
-      $p_filename = $this->_translateWinPath($p_filename, false);;
-
-      if (!$this->_writeHeaderBlock($p_filename, strlen($p_string),
-	                                  time(), 384, "", 0, 0))
-          return false;
-
-      $i=0;
-      while (($v_buffer = substr($p_string, (($i++)*512), 512)) != '') {
-          $v_binary_data = pack("a512", $v_buffer);
-          $this->_writeBlock($v_binary_data);
-      }
-
-      return true;
+        $p_stamp = @$p_params["stamp"] ? $p_params["stamp"] : ($p_datetime ? $p_datetime : time());
+        $p_mode = @$p_params["mode"] ? $p_params["mode"] : 0600;
+        $p_type = @$p_params["type"] ? $p_params["type"] : "";
+        $p_uid = @$p_params["uid"] ? $p_params["uid"] : 0;
+        $p_gid = @$p_params["gid"] ? $p_params["gid"] : 0;
+        if (!$this->_file) {
+            $this->_error('Invalid file descriptor');
+            return false;
+        }
+
+        if ($p_filename == '') {
+            $this->_error('Invalid file name');
+            return false;
+        }
+
+        // ----- Calculate the stored filename
+        $p_filename = $this->_translateWinPath($p_filename, false);
+
+        // ----- If datetime is not specified, set current time
+        if ($p_datetime === false) {
+            $p_datetime = time();
+        }
+
+        if (!$this->_writeHeaderBlock(
+            $p_filename,
+            strlen($p_string),
+            $p_stamp,
+            $p_mode,
+            $p_type,
+            $p_uid,
+            $p_gid
+        )
+        ) {
+            return false;
+        }
+
+        $i = 0;
+        while (($v_buffer = substr($p_string, (($i++) * 512), 512)) != '') {
+            $v_binary_data = pack("a512", $v_buffer);
+            $this->_writeBlock($v_binary_data);
+        }
+
+        return true;
     }
-    // }}}
 
-    // {{{ _writeHeader()
-    function _writeHeader($p_filename, $p_stored_filename)
+    /**
+     * @param string $p_filename
+     * @param string $p_stored_filename
+     * @return bool
+     */
+    public function _writeHeader($p_filename, $p_stored_filename)
     {
-        if ($p_stored_filename == '')
+        if ($p_stored_filename == '') {
             $p_stored_filename = $p_filename;
+        }
         $v_reduce_filename = $this->_pathReduction($p_stored_filename);
 
         if (strlen($v_reduce_filename) > 99) {
-          if (!$this->_writeLongHeader($v_reduce_filename))
-            return false;
+            if (!$this->_writeLongHeader($v_reduce_filename)) {
+                return false;
+            }
         }
 
         $v_info = lstat($p_filename);
@@ -1075,34 +1355,31 @@ function _writeHeader($p_filename, $p_stored_filename)
         $v_linkname = '';
 
         if (@is_link($p_filename)) {
-          $v_typeflag = '2';
-          $v_linkname = readlink($p_filename);
-          $v_size = sprintf("%011s", DecOct(0));
+            $v_typeflag = '2';
+            $v_linkname = readlink($p_filename);
+            $v_size = sprintf("%011s", DecOct(0));
         } elseif (@is_dir($p_filename)) {
-          $v_typeflag = "5";
-          $v_size = sprintf("%011s", DecOct(0));
+            $v_typeflag = "5";
+            $v_size = sprintf("%011s", DecOct(0));
         } else {
-          $v_typeflag = '0';
-          clearstatcache();
-          $v_size = sprintf("%011s", DecOct($v_info['size']));
+            $v_typeflag = '0';
+            clearstatcache();
+            $v_size = sprintf("%011s", DecOct($v_info['size']));
         }
 
         $v_magic = 'ustar ';
 
         $v_version = ' ';
-        
-        if (function_exists('posix_getpwuid'))
-        {
-          $userinfo = posix_getpwuid($v_info[4]);
-          $groupinfo = posix_getgrgid($v_info[5]);
-          
-          $v_uname = $userinfo['name'];
-          $v_gname = $groupinfo['name'];
-        }
-        else
-        {
-          $v_uname = '';
-          $v_gname = '';
+
+        if (function_exists('posix_getpwuid')) {
+            $userinfo = posix_getpwuid($v_info[4]);
+            $groupinfo = posix_getgrgid($v_info[5]);
+
+            $v_uname = $userinfo['name'];
+            $v_gname = $groupinfo['name'];
+        } else {
+            $v_uname = '';
+            $v_gname = '';
         }
 
         $v_devmajor = '';
@@ -1111,25 +1388,43 @@ function _writeHeader($p_filename, $p_stored_filename)
 
         $v_prefix = '';
 
-        $v_binary_data_first = pack("a100a8a8a8a12a12",
-		                            $v_reduce_filename, $v_perms, $v_uid,
-									$v_gid, $v_size, $v_mtime);
-        $v_binary_data_last = pack("a1a100a6a2a32a32a8a8a155a12",
-		                           $v_typeflag, $v_linkname, $v_magic,
-								   $v_version, $v_uname, $v_gname,
-								   $v_devmajor, $v_devminor, $v_prefix, '');
+        $v_binary_data_first = pack(
+            "a100a8a8a8a12a12",
+            $v_reduce_filename,
+            $v_perms,
+            $v_uid,
+            $v_gid,
+            $v_size,
+            $v_mtime
+        );
+        $v_binary_data_last = pack(
+            "a1a100a6a2a32a32a8a8a155a12",
+            $v_typeflag,
+            $v_linkname,
+            $v_magic,
+            $v_version,
+            $v_uname,
+            $v_gname,
+            $v_devmajor,
+            $v_devminor,
+            $v_prefix,
+            ''
+        );
 
         // ----- Calculate the checksum
         $v_checksum = 0;
         // ..... First part of the header
-        for ($i=0; $i<148; $i++)
-            $v_checksum += ord(substr($v_binary_data_first,$i,1));
+        for ($i = 0; $i < 148; $i++) {
+            $v_checksum += ord(substr($v_binary_data_first, $i, 1));
+        }
         // ..... Ignore the checksum value and replace it by ' ' (space)
-        for ($i=148; $i<156; $i++)
+        for ($i = 148; $i < 156; $i++) {
             $v_checksum += ord(' ');
+        }
         // ..... Last part of the header
-        for ($i=156, $j=0; $i<512; $i++, $j++)
-            $v_checksum += ord(substr($v_binary_data_last,$j,1));
+        for ($i = 156, $j = 0; $i < 512; $i++, $j++) {
+            $v_checksum += ord(substr($v_binary_data_last, $j, 1));
+        }
 
         // ----- Write the first 148 bytes of the header in the archive
         $this->_writeBlock($v_binary_data_first, 148);
@@ -1144,23 +1439,38 @@ function _writeHeader($p_filename, $p_stored_filename)
 
         return true;
     }
-    // }}}
 
-    // {{{ _writeHeaderBlock()
-    function _writeHeaderBlock($p_filename, $p_size, $p_mtime=0, $p_perms=0,
-	                           $p_type='', $p_uid=0, $p_gid=0)
-    {
+    /**
+     * @param string $p_filename
+     * @param int $p_size
+     * @param int $p_mtime
+     * @param int $p_perms
+     * @param string $p_type
+     * @param int $p_uid
+     * @param int $p_gid
+     * @return bool
+     */
+    public function _writeHeaderBlock(
+        $p_filename,
+        $p_size,
+        $p_mtime = 0,
+        $p_perms = 0,
+        $p_type = '',
+        $p_uid = 0,
+        $p_gid = 0
+    ) {
         $p_filename = $this->_pathReduction($p_filename);
 
         if (strlen($p_filename) > 99) {
-          if (!$this->_writeLongHeader($p_filename))
-            return false;
+            if (!$this->_writeLongHeader($p_filename)) {
+                return false;
+            }
         }
 
         if ($p_type == "5") {
-          $v_size = sprintf("%011s", DecOct(0));
+            $v_size = sprintf("%011s", DecOct(0));
         } else {
-          $v_size = sprintf("%011s", DecOct($p_size));
+            $v_size = sprintf("%011s", DecOct($p_size));
         }
 
         $v_uid = sprintf("%07s", DecOct($p_uid));
@@ -1175,45 +1485,60 @@ function _writeHeaderBlock($p_filename, $p_size, $p_mtime=0, $p_perms=0,
 
         $v_version = ' ';
 
-        if (function_exists('posix_getpwuid'))
-        {
-          $userinfo = posix_getpwuid($p_uid);
-          $groupinfo = posix_getgrgid($p_gid);
-          
-          $v_uname = $userinfo['name'];
-          $v_gname = $groupinfo['name'];
-        }
-        else
-        {
-          $v_uname = '';
-          $v_gname = '';
+        if (function_exists('posix_getpwuid')) {
+            $userinfo = posix_getpwuid($p_uid);
+            $groupinfo = posix_getgrgid($p_gid);
+
+            $v_uname = $userinfo['name'];
+            $v_gname = $groupinfo['name'];
+        } else {
+            $v_uname = '';
+            $v_gname = '';
         }
-        
+
         $v_devmajor = '';
 
         $v_devminor = '';
 
         $v_prefix = '';
 
-        $v_binary_data_first = pack("a100a8a8a8a12A12",
-		                            $p_filename, $v_perms, $v_uid, $v_gid,
-									$v_size, $v_mtime);
-        $v_binary_data_last = pack("a1a100a6a2a32a32a8a8a155a12",
-		                           $p_type, $v_linkname, $v_magic,
-								   $v_version, $v_uname, $v_gname,
-								   $v_devmajor, $v_devminor, $v_prefix, '');
+        $v_binary_data_first = pack(
+            "a100a8a8a8a12A12",
+            $p_filename,
+            $v_perms,
+            $v_uid,
+            $v_gid,
+            $v_size,
+            $v_mtime
+        );
+        $v_binary_data_last = pack(
+            "a1a100a6a2a32a32a8a8a155a12",
+            $p_type,
+            $v_linkname,
+            $v_magic,
+            $v_version,
+            $v_uname,
+            $v_gname,
+            $v_devmajor,
+            $v_devminor,
+            $v_prefix,
+            ''
+        );
 
         // ----- Calculate the checksum
         $v_checksum = 0;
         // ..... First part of the header
-        for ($i=0; $i<148; $i++)
-            $v_checksum += ord(substr($v_binary_data_first,$i,1));
+        for ($i = 0; $i < 148; $i++) {
+            $v_checksum += ord(substr($v_binary_data_first, $i, 1));
+        }
         // ..... Ignore the checksum value and replace it by ' ' (space)
-        for ($i=148; $i<156; $i++)
+        for ($i = 148; $i < 156; $i++) {
             $v_checksum += ord(' ');
+        }
         // ..... Last part of the header
-        for ($i=156, $j=0; $i<512; $i++, $j++)
-            $v_checksum += ord(substr($v_binary_data_last,$j,1));
+        for ($i = 156, $j = 0; $i < 512; $i++, $j++) {
+            $v_checksum += ord(substr($v_binary_data_last, $j, 1));
+        }
 
         // ----- Write the first 148 bytes of the header in the archive
         $this->_writeBlock($v_binary_data_first, 148);
@@ -1228,10 +1553,12 @@ function _writeHeaderBlock($p_filename, $p_size, $p_mtime=0, $p_perms=0,
 
         return true;
     }
-    // }}}
 
-    // {{{ _writeLongHeader()
-    function _writeLongHeader($p_filename)
+    /**
+     * @param string $p_filename
+     * @return bool
+     */
+    public function _writeLongHeader($p_filename)
     {
         $v_size = sprintf("%11s ", DecOct(strlen($p_filename)));
 
@@ -1253,24 +1580,43 @@ function _writeLongHeader($p_filename)
 
         $v_prefix = '';
 
-        $v_binary_data_first = pack("a100a8a8a8a12a12",
-		                            '././@LongLink', 0, 0, 0, $v_size, 0);
-        $v_binary_data_last = pack("a1a100a6a2a32a32a8a8a155a12",
-		                           $v_typeflag, $v_linkname, $v_magic,
-								   $v_version, $v_uname, $v_gname,
-								   $v_devmajor, $v_devminor, $v_prefix, '');
+        $v_binary_data_first = pack(
+            "a100a8a8a8a12a12",
+            '././@LongLink',
+            0,
+            0,
+            0,
+            $v_size,
+            0
+        );
+        $v_binary_data_last = pack(
+            "a1a100a6a2a32a32a8a8a155a12",
+            $v_typeflag,
+            $v_linkname,
+            $v_magic,
+            $v_version,
+            $v_uname,
+            $v_gname,
+            $v_devmajor,
+            $v_devminor,
+            $v_prefix,
+            ''
+        );
 
         // ----- Calculate the checksum
         $v_checksum = 0;
         // ..... First part of the header
-        for ($i=0; $i<148; $i++)
-            $v_checksum += ord(substr($v_binary_data_first,$i,1));
+        for ($i = 0; $i < 148; $i++) {
+            $v_checksum += ord(substr($v_binary_data_first, $i, 1));
+        }
         // ..... Ignore the checksum value and replace it by ' ' (space)
-        for ($i=148; $i<156; $i++)
+        for ($i = 148; $i < 156; $i++) {
             $v_checksum += ord(' ');
+        }
         // ..... Last part of the header
-        for ($i=156, $j=0; $i<512; $i++, $j++)
-            $v_checksum += ord(substr($v_binary_data_last,$j,1));
+        for ($i = 156, $j = 0; $i < 512; $i++, $j++) {
+            $v_checksum += ord(substr($v_binary_data_last, $j, 1));
+        }
 
         // ----- Write the first 148 bytes of the header in the archive
         $this->_writeBlock($v_binary_data_first, 148);
@@ -1284,27 +1630,30 @@ function _writeLongHeader($p_filename)
         $this->_writeBlock($v_binary_data_last, 356);
 
         // ----- Write the filename as content of the block
-        $i=0;
-        while (($v_buffer = substr($p_filename, (($i++)*512), 512)) != '') {
+        $i = 0;
+        while (($v_buffer = substr($p_filename, (($i++) * 512), 512)) != '') {
             $v_binary_data = pack("a512", "$v_buffer");
             $this->_writeBlock($v_binary_data);
         }
 
         return true;
     }
-    // }}}
 
-    // {{{ _readHeader()
-    function _readHeader($v_binary_data, &$v_header)
+    /**
+     * @param mixed $v_binary_data
+     * @param mixed $v_header
+     * @return bool
+     */
+    public function _readHeader($v_binary_data, &$v_header)
     {
-        if (strlen($v_binary_data)==0) {
+        if (strlen($v_binary_data) == 0) {
             $v_header['filename'] = '';
             return true;
         }
 
         if (strlen($v_binary_data) != 512) {
             $v_header['filename'] = '';
-            $this->_error('Invalid block size : '.strlen($v_binary_data));
+            $this->_error('Invalid block size : ' . strlen($v_binary_data));
             return false;
         }
 
@@ -1314,19 +1663,17 @@ function _readHeader($v_binary_data, &$v_header)
         // ----- Calculate the checksum
         $v_checksum = 0;
         // ..... First part of the header
-        for ($i=0; $i<148; $i++)
-            $v_checksum+=ord(substr($v_binary_data,$i,1));
-        // ..... Ignore the checksum value and replace it by ' ' (space)
-        for ($i=148; $i<156; $i++)
-            $v_checksum += ord(' ');
-        // ..... Last part of the header
-        for ($i=156; $i<512; $i++)
-           $v_checksum+=ord(substr($v_binary_data,$i,1));
+        $v_binary_split = str_split($v_binary_data);
+        $v_checksum += array_sum(array_map('ord', array_slice($v_binary_split, 0, 148)));
+        $v_checksum += array_sum(array_map('ord', array(' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',)));
+        $v_checksum += array_sum(array_map('ord', array_slice($v_binary_split, 156, 512)));
 
-        $v_data = unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/"
-		                 ."a8checksum/a1typeflag/a100link/a6magic/a2version/"
-						 ."a32uname/a32gname/a8devmajor/a8devminor",
-						 $v_binary_data);
+
+        $v_data = unpack($this->_fmt, $v_binary_data);
+
+        if (strlen($v_data["prefix"]) > 0) {
+            $v_data["filename"] = "$v_data[prefix]/$v_data[filename]";
+        }
 
         // ----- Extract the checksum
         $v_header['checksum'] = OctDec(trim($v_data['checksum']));
@@ -1334,33 +1681,38 @@ function _readHeader($v_binary_data, &$v_header)
             $v_header['filename'] = '';
 
             // ----- Look for last block (empty block)
-            if (($v_checksum == 256) && ($v_header['checksum'] == 0))
+            if (($v_checksum == 256) && ($v_header['checksum'] == 0)) {
                 return true;
+            }
 
-            $this->_error('Invalid checksum for file "'.$v_data['filename']
-			              .'" : '.$v_checksum.' calculated, '
-						  .$v_header['checksum'].' expected');
+            $this->_error(
+                'Invalid checksum for file "' . $v_data['filename']
+                . '" : ' . $v_checksum . ' calculated, '
+                . $v_header['checksum'] . ' expected'
+            );
             return false;
         }
 
         // ----- Extract the properties
-        $v_header['filename'] = $v_data['filename'];
+        $v_header['filename'] = rtrim($v_data['filename'], "\0");
         if ($this->_maliciousFilename($v_header['filename'])) {
-            $this->_error('Malicious .tar detected, file "' . $v_header['filename'] .
-                '" will not install in desired directory tree');
+            $this->_error(
+                'Malicious .tar detected, file "' . $v_header['filename'] .
+                '" will not install in desired directory tree'
+            );
             return false;
         }
         $v_header['mode'] = OctDec(trim($v_data['mode']));
         $v_header['uid'] = OctDec(trim($v_data['uid']));
         $v_header['gid'] = OctDec(trim($v_data['gid']));
-        $v_header['size'] = OctDec(trim($v_data['size']));
+        $v_header['size'] = $this->_tarRecToSize($v_data['size']);
         $v_header['mtime'] = OctDec(trim($v_data['mtime']));
         if (($v_header['typeflag'] = $v_data['typeflag']) == "5") {
-          $v_header['size'] = 0;
+            $v_header['size'] = 0;
         }
         $v_header['link'] = trim($v_data['link']);
         /* ----- All these fields are removed form the header because
-		they do not carry interesting info
+        they do not carry interesting info
         $v_header[magic] = trim($v_data[magic]);
         $v_header[version] = trim($v_data[version]);
         $v_header[uname] = trim($v_data[uname]);
@@ -1371,17 +1723,49 @@ function _readHeader($v_binary_data, &$v_header)
 
         return true;
     }
-    // }}}
 
-    // {{{ _maliciousFilename()
+    /**
+     * Convert Tar record size to actual size
+     *
+     * @param string $tar_size
+     * @return size of tar record in bytes
+     */
+    private function _tarRecToSize($tar_size)
+    {
+        /*
+         * First byte of size has a special meaning if bit 7 is set.
+         *
+         * Bit 7 indicates base-256 encoding if set.
+         * Bit 6 is the sign bit.
+         * Bits 5:0 are most significant value bits.
+         */
+        $ch = ord($tar_size[0]);
+        if ($ch & 0x80) {
+            // Full 12-bytes record is required.
+            $rec_str = $tar_size . "\x00";
+
+            $size = ($ch & 0x40) ? -1 : 0;
+            $size = ($size << 6) | ($ch & 0x3f);
+
+            for ($num_ch = 1; $num_ch < 12; ++$num_ch) {
+                $size = ($size * 256) + ord($rec_str[$num_ch]);
+            }
+
+            return $size;
+
+        } else {
+            return OctDec(trim($tar_size));
+        }
+    }
+
     /**
      * Detect and report a malicious file name
      *
      * @param string $file
+     *
      * @return bool
-     * @access private
      */
-    function _maliciousFilename($file)
+    private function _maliciousFilename($file)
     {
         if (strpos($file, '/../') !== false) {
             return true;
@@ -1391,384 +1775,507 @@ function _maliciousFilename($file)
         }
         return false;
     }
-    // }}}
 
-    // {{{ _readLongHeader()
-    function _readLongHeader(&$v_header)
+    /**
+     * @param $v_header
+     * @return bool
+     */
+    public function _readLongHeader(&$v_header)
     {
-      $v_filename = '';
-      $n = floor($v_header['size']/512);
-      for ($i=0; $i<$n; $i++) {
-        $v_content = $this->_readBlock();
-        $v_filename .= $v_content;
-      }
-      if (($v_header['size'] % 512) != 0) {
-        $v_content = $this->_readBlock();
-        $v_filename .= trim($v_content);
-      }
-
-      // ----- Read the next header
-      $v_binary_data = $this->_readBlock();
-
-      if (!$this->_readHeader($v_binary_data, $v_header))
-        return false;
+        $v_filename = '';
+        $v_filesize = $v_header['size'];
+        $n = floor($v_header['size'] / 512);
+        for ($i = 0; $i < $n; $i++) {
+            $v_content = $this->_readBlock();
+            $v_filename .= $v_content;
+        }
+        if (($v_header['size'] % 512) != 0) {
+            $v_content = $this->_readBlock();
+            $v_filename .= $v_content;
+        }
 
-      $v_filename = trim($v_filename);
-      $v_header['filename'] = $v_filename;
+        // ----- Read the next header
+        $v_binary_data = $this->_readBlock();
+
+        if (!$this->_readHeader($v_binary_data, $v_header)) {
+            return false;
+        }
+
+        $v_filename = rtrim(substr($v_filename, 0, $v_filesize), "\0");
+        $v_header['filename'] = $v_filename;
         if ($this->_maliciousFilename($v_filename)) {
-            $this->_error('Malicious .tar detected, file "' . $v_filename .
-                '" will not install in desired directory tree');
+            $this->_error(
+                'Malicious .tar detected, file "' . $v_filename .
+                '" will not install in desired directory tree'
+            );
             return false;
-      }
+        }
 
-      return true;
+        return true;
     }
-    // }}}
 
-    // {{{ _extractInString()
     /**
-    * This method extract from the archive one file identified by $p_filename.
-    * The return value is a string with the file content, or NULL on error.
-    * @param string $p_filename     The path of the file to extract in a string.
-    * @return                       a string with the file content or NULL.
-    * @access private
-    */
-    function _extractInString($p_filename)
+     * This method extract from the archive one file identified by $p_filename.
+     * The return value is a string with the file content, or null on error.
+     *
+     * @param string $p_filename The path of the file to extract in a string.
+     *
+     * @return a string with the file content or null.
+     */
+    private function _extractInString($p_filename)
     {
         $v_result_str = "";
 
-        While (strlen($v_binary_data = $this->_readBlock()) != 0)
-        {
-          if (!$this->_readHeader($v_binary_data, $v_header))
-            return NULL;
-
-          if ($v_header['filename'] == '')
-            continue;
-
-          // ----- Look for long filename
-          if ($v_header['typeflag'] == 'L') {
-            if (!$this->_readLongHeader($v_header))
-              return NULL;
-          }
-
-          if ($v_header['filename'] == $p_filename) {
-              if ($v_header['typeflag'] == "5") {
-                  $this->_error('Unable to extract in string a directory '
-				                .'entry {'.$v_header['filename'].'}');
-                  return NULL;
-              } else {
-                  $n = floor($v_header['size']/512);
-                  for ($i=0; $i<$n; $i++) {
-                      $v_result_str .= $this->_readBlock();
-                  }
-                  if (($v_header['size'] % 512) != 0) {
-                      $v_content = $this->_readBlock();
-                      $v_result_str .= substr($v_content, 0,
-					                          ($v_header['size'] % 512));
-                  }
-                  return $v_result_str;
-              }
-          } else {
-              $this->_jumpBlock(ceil(($v_header['size']/512)));
-          }
-        }
-
-        return NULL;
-    }
-    // }}}
+        while (strlen($v_binary_data = $this->_readBlock()) != 0) {
+            if (!$this->_readHeader($v_binary_data, $v_header)) {
+                return null;
+            }
 
-    // {{{ _extractList()
-    function _extractList($p_path, &$p_list_detail, $p_mode,
-	                      $p_file_list, $p_remove_path)
-    {
-    $v_result=true;
-    $v_nb = 0;
-    $v_extract_all = true;
-    $v_listing = false;
-
-    $p_path = $this->_translateWinPath($p_path, false);
-    if ($p_path == '' || (substr($p_path, 0, 1) != '/'
-	    && substr($p_path, 0, 3) != "../" && !strpos($p_path, ':'))) {
-      $p_path = "./".$p_path;
-    }
-    $p_remove_path = $this->_translateWinPath($p_remove_path);
-
-    // ----- Look for path to remove format (should end by /)
-    if (($p_remove_path != '') && (substr($p_remove_path, -1) != '/'))
-      $p_remove_path .= '/';
-    $p_remove_path_size = strlen($p_remove_path);
-
-    switch ($p_mode) {
-      case "complete" :
-        $v_extract_all = TRUE;
-        $v_listing = FALSE;
-      break;
-      case "partial" :
-          $v_extract_all = FALSE;
-          $v_listing = FALSE;
-      break;
-      case "list" :
-          $v_extract_all = FALSE;
-          $v_listing = TRUE;
-      break;
-      default :
-        $this->_error('Invalid extract mode ('.$p_mode.')');
-        return false;
+            if ($v_header['filename'] == '') {
+                continue;
+            }
+
+            // ----- Look for long filename
+            if ($v_header['typeflag'] == 'L') {
+                if (!$this->_readLongHeader($v_header)) {
+                    return null;
+                }
+            }
+
+            if ($v_header['filename'] == $p_filename) {
+                if ($v_header['typeflag'] == "5") {
+                    $this->_error(
+                        'Unable to extract in string a directory '
+                        . 'entry {' . $v_header['filename'] . '}'
+                    );
+                    return null;
+                } else {
+                    $n = floor($v_header['size'] / 512);
+                    for ($i = 0; $i < $n; $i++) {
+                        $v_result_str .= $this->_readBlock();
+                    }
+                    if (($v_header['size'] % 512) != 0) {
+                        $v_content = $this->_readBlock();
+                        $v_result_str .= substr(
+                            $v_content,
+                            0,
+                            ($v_header['size'] % 512)
+                        );
+                    }
+                    return $v_result_str;
+                }
+            } else {
+                $this->_jumpBlock(ceil(($v_header['size'] / 512)));
+            }
+        }
+
+        return null;
     }
 
-    clearstatcache();
+    /**
+     * @param string $p_path
+     * @param string $p_list_detail
+     * @param string $p_mode
+     * @param string $p_file_list
+     * @param string $p_remove_path
+     * @param bool $p_preserve
+     * @return bool
+     */
+    public function _extractList(
+        $p_path,
+        &$p_list_detail,
+        $p_mode,
+        $p_file_list,
+        $p_remove_path,
+        $p_preserve = false
+    ) {
+        $v_result = true;
+        $v_nb = 0;
+        $v_extract_all = true;
+        $v_listing = false;
+
+        $p_path = $this->_translateWinPath($p_path, false);
+        if ($p_path == '' || (substr($p_path, 0, 1) != '/'
+                && substr($p_path, 0, 3) != "../" && !strpos($p_path, ':'))
+        ) {
+            $p_path = "./" . $p_path;
+        }
+        $p_remove_path = $this->_translateWinPath($p_remove_path);
+
+        // ----- Look for path to remove format (should end by /)
+        if (($p_remove_path != '') && (substr($p_remove_path, -1) != '/')) {
+            $p_remove_path .= '/';
+        }
+        $p_remove_path_size = strlen($p_remove_path);
 
-    while (strlen($v_binary_data = $this->_readBlock()) != 0)
-    {
-      $v_extract_file = FALSE;
-      $v_extraction_stopped = 0;
+        switch ($p_mode) {
+            case "complete" :
+                $v_extract_all = true;
+                $v_listing = false;
+                break;
+            case "partial" :
+                $v_extract_all = false;
+                $v_listing = false;
+                break;
+            case "list" :
+                $v_extract_all = false;
+                $v_listing = true;
+                break;
+            default :
+                $this->_error('Invalid extract mode (' . $p_mode . ')');
+                return false;
+        }
 
-      if (!$this->_readHeader($v_binary_data, $v_header))
-        return false;
+        clearstatcache();
 
-      if ($v_header['filename'] == '') {
-        continue;
-      }
-
-      // ----- Look for long filename
-      if ($v_header['typeflag'] == 'L') {
-        if (!$this->_readLongHeader($v_header))
-          return false;
-      }
-
-      if ((!$v_extract_all) && (is_array($p_file_list))) {
-        // ----- By default no unzip if the file is not found
-        $v_extract_file = false;
-
-        for ($i=0; $i<sizeof($p_file_list); $i++) {
-          // ----- Look if it is a directory
-          if (substr($p_file_list[$i], -1) == '/') {
-            // ----- Look if the directory is in the filename path
-            if ((strlen($v_header['filename']) > strlen($p_file_list[$i]))
-			    && (substr($v_header['filename'], 0, strlen($p_file_list[$i]))
-				    == $p_file_list[$i])) {
-              $v_extract_file = TRUE;
-              break;
+        while (strlen($v_binary_data = $this->_readBlock()) != 0) {
+            $v_extract_file = false;
+            $v_extraction_stopped = 0;
+
+            if (!$this->_readHeader($v_binary_data, $v_header)) {
+                return false;
+            }
+
+            if ($v_header['filename'] == '') {
+                continue;
             }
-          }
-
-          // ----- It is a file, so compare the file names
-          elseif ($p_file_list[$i] == $v_header['filename']) {
-            $v_extract_file = TRUE;
-            break;
-          }
-        }
-      } else {
-        $v_extract_file = TRUE;
-      }
-
-      // ----- Look if this file need to be extracted
-      if (($v_extract_file) && (!$v_listing))
-      {
-        if (($p_remove_path != '')
-            && (substr($v_header['filename'], 0, $p_remove_path_size)
-			    == $p_remove_path))
-          $v_header['filename'] = substr($v_header['filename'],
-		                                 $p_remove_path_size);
-        if (($p_path != './') && ($p_path != '/')) {
-          while (substr($p_path, -1) == '/')
-            $p_path = substr($p_path, 0, strlen($p_path)-1);
-
-          if (substr($v_header['filename'], 0, 1) == '/')
-              $v_header['filename'] = $p_path.$v_header['filename'];
-          else
-            $v_header['filename'] = $p_path.'/'.$v_header['filename'];
-        }
-        if (file_exists($v_header['filename'])) {
-          if (   (@is_dir($v_header['filename']))
-		      && ($v_header['typeflag'] == '')) {
-            $this->_error('File '.$v_header['filename']
-			              .' already exists as a directory');
-            return false;
-          }
-          if (   ($this->_isArchive($v_header['filename']))
-		      && ($v_header['typeflag'] == "5")) {
-            $this->_error('Directory '.$v_header['filename']
-			              .' already exists as a file');
-            return false;
-          }
-          if (!is_writeable($v_header['filename'])) {
-            $this->_error('File '.$v_header['filename']
-			              .' already exists and is write protected');
-            return false;
-          }
-          if (filemtime($v_header['filename']) > $v_header['mtime']) {
-            // To be completed : An error or silent no replace ?
-          }
-        }
-
-        // ----- Check the directory availability and create it if necessary
-        elseif (($v_result
-		         = $this->_dirCheck(($v_header['typeflag'] == "5"
-				                    ?$v_header['filename']
-									:dirname($v_header['filename'])))) != 1) {
-            $this->_error('Unable to create path for '.$v_header['filename']);
-            return false;
-        }
 
-        if ($v_extract_file) {
-          if ($v_header['typeflag'] == "5") {
-            if (!@file_exists($v_header['filename'])) {
-                if (!@mkdir($v_header['filename'], 0777)) {
-                    $this->_error('Unable to create directory {'
-					              .$v_header['filename'].'}');
+            // ----- Look for long filename
+            if ($v_header['typeflag'] == 'L') {
+                if (!$this->_readLongHeader($v_header)) {
                     return false;
                 }
             }
-          } elseif ($v_header['typeflag'] == "2") {
-              if (@file_exists($v_header['filename'])) {
-                  @unlink($v_header['filename']);
-              }
-              if (!@symlink($v_header['link'], $v_header['filename'])) {
-                  $this->_error('Unable to extract symbolic link {'
-                                .$v_header['filename'].'}');
-                  return false;
-              }
-          } else {
-              if (($v_dest_file = @fopen($v_header['filename'], "wb")) == 0) {
-                  $this->_error('Error while opening {'.$v_header['filename']
-				                .'} in write binary mode');
-                  return false;
-              } else {
-                  $n = floor($v_header['size']/512);
-                  for ($i=0; $i<$n; $i++) {
-                      $v_content = $this->_readBlock();
-                      fwrite($v_dest_file, $v_content, 512);
-                  }
-            if (($v_header['size'] % 512) != 0) {
-              $v_content = $this->_readBlock();
-              fwrite($v_dest_file, $v_content, ($v_header['size'] % 512));
-            }
 
-            @fclose($v_dest_file);
+            // ignore extended / pax headers
+            if ($v_header['typeflag'] == 'x' || $v_header['typeflag'] == 'g') {
+                $this->_jumpBlock(ceil(($v_header['size'] / 512)));
+                continue;
+            }
 
-            // ----- Change the file mode, mtime
-            @touch($v_header['filename'], $v_header['mtime']);
-            if ($v_header['mode'] & 0111) {
-                // make file executable, obey umask
-                $mode = fileperms($v_header['filename']) | (~umask() & 0111);
-                @chmod($v_header['filename'], $mode);
+            if ((!$v_extract_all) && (is_array($p_file_list))) {
+                // ----- By default no unzip if the file is not found
+                $v_extract_file = false;
+
+                for ($i = 0; $i < sizeof($p_file_list); $i++) {
+                    // ----- Look if it is a directory
+                    if (substr($p_file_list[$i], -1) == '/') {
+                        // ----- Look if the directory is in the filename path
+                        if ((strlen($v_header['filename']) > strlen($p_file_list[$i]))
+                            && (substr($v_header['filename'], 0, strlen($p_file_list[$i]))
+                                == $p_file_list[$i])
+                        ) {
+                            $v_extract_file = true;
+                            break;
+                        }
+                    } // ----- It is a file, so compare the file names
+                    elseif ($p_file_list[$i] == $v_header['filename']) {
+                        $v_extract_file = true;
+                        break;
+                    }
+                }
+            } else {
+                $v_extract_file = true;
             }
-          }
-
-          // ----- Check the file size
-          clearstatcache();
-          if (filesize($v_header['filename']) != $v_header['size']) {
-              $this->_error('Extracted file '.$v_header['filename']
-			                .' does not have the correct file size \''
-							.filesize($v_header['filename'])
-							.'\' ('.$v_header['size']
-							.' expected). Archive may be corrupted.');
-              return false;
-          }
-          }
-        } else {
-          $this->_jumpBlock(ceil(($v_header['size']/512)));
-        }
-      } else {
-          $this->_jumpBlock(ceil(($v_header['size']/512)));
-      }
 
-      /* TBC : Seems to be unused ...
-      if ($this->_compress)
-        $v_end_of_file = @gzeof($this->_file);
-      else
-        $v_end_of_file = @feof($this->_file);
-        */
+            // ----- Look if this file need to be extracted
+            if (($v_extract_file) && (!$v_listing)) {
+                if (($p_remove_path != '')
+                    && (substr($v_header['filename'] . '/', 0, $p_remove_path_size)
+                        == $p_remove_path)
+                ) {
+                    $v_header['filename'] = substr(
+                        $v_header['filename'],
+                        $p_remove_path_size
+                    );
+                    if ($v_header['filename'] == '') {
+                        continue;
+                    }
+                }
+                if (($p_path != './') && ($p_path != '/')) {
+                    while (substr($p_path, -1) == '/') {
+                        $p_path = substr($p_path, 0, strlen($p_path) - 1);
+                    }
 
-      if ($v_listing || $v_extract_file || $v_extraction_stopped) {
-        // ----- Log extracted files
-        if (($v_file_dir = dirname($v_header['filename']))
-		    == $v_header['filename'])
-          $v_file_dir = '';
-        if ((substr($v_header['filename'], 0, 1) == '/') && ($v_file_dir == ''))
-          $v_file_dir = '/';
+                    if (substr($v_header['filename'], 0, 1) == '/') {
+                        $v_header['filename'] = $p_path . $v_header['filename'];
+                    } else {
+                        $v_header['filename'] = $p_path . '/' . $v_header['filename'];
+                    }
+                }
+                if (file_exists($v_header['filename'])) {
+                    if ((@is_dir($v_header['filename']))
+                        && ($v_header['typeflag'] == '')
+                    ) {
+                        $this->_error(
+                            'File ' . $v_header['filename']
+                            . ' already exists as a directory'
+                        );
+                        return false;
+                    }
+                    if (($this->_isArchive($v_header['filename']))
+                        && ($v_header['typeflag'] == "5")
+                    ) {
+                        $this->_error(
+                            'Directory ' . $v_header['filename']
+                            . ' already exists as a file'
+                        );
+                        return false;
+                    }
+                    if (!is_writeable($v_header['filename'])) {
+                        $this->_error(
+                            'File ' . $v_header['filename']
+                            . ' already exists and is write protected'
+                        );
+                        return false;
+                    }
+                    if (filemtime($v_header['filename']) > $v_header['mtime']) {
+                        // To be completed : An error or silent no replace ?
+                    }
+                } // ----- Check the directory availability and create it if necessary
+                elseif (($v_result
+                        = $this->_dirCheck(
+                        ($v_header['typeflag'] == "5"
+                            ? $v_header['filename']
+                            : dirname($v_header['filename']))
+                    )) != 1
+                ) {
+                    $this->_error('Unable to create path for ' . $v_header['filename']);
+                    return false;
+                }
 
-        $p_list_detail[$v_nb++] = $v_header;
-        if (is_array($p_file_list) && (count($p_list_detail) == count($p_file_list))) {
-            return true;
+                if ($v_extract_file) {
+                    if ($v_header['typeflag'] == "5") {
+                        if (!@file_exists($v_header['filename'])) {
+                            if (!@mkdir($v_header['filename'], 0777)) {
+                                $this->_error(
+                                    'Unable to create directory {'
+                                    . $v_header['filename'] . '}'
+                                );
+                                return false;
+                            }
+                        }
+                    } elseif ($v_header['typeflag'] == "2") {
+                        if (@file_exists($v_header['filename'])) {
+                            @unlink($v_header['filename']);
+                        }
+                        if (!@symlink($v_header['link'], $v_header['filename'])) {
+                            $this->_error(
+                                'Unable to extract symbolic link {'
+                                . $v_header['filename'] . '}'
+                            );
+                            return false;
+                        }
+                    } else {
+                        if (($v_dest_file = @fopen($v_header['filename'], "wb")) == 0) {
+                            $this->_error(
+                                'Error while opening {' . $v_header['filename']
+                                . '} in write binary mode'
+                            );
+                            return false;
+                        } else {
+                            $n = floor($v_header['size'] / 512);
+                            for ($i = 0; $i < $n; $i++) {
+                                $v_content = $this->_readBlock();
+                                fwrite($v_dest_file, $v_content, 512);
+                            }
+                            if (($v_header['size'] % 512) != 0) {
+                                $v_content = $this->_readBlock();
+                                fwrite($v_dest_file, $v_content, ($v_header['size'] % 512));
+                            }
+
+                            @fclose($v_dest_file);
+
+                            if ($p_preserve) {
+                                @chown($v_header['filename'], $v_header['uid']);
+                                @chgrp($v_header['filename'], $v_header['gid']);
+                            }
+
+                            // ----- Change the file mode, mtime
+                            @touch($v_header['filename'], $v_header['mtime']);
+                            if ($v_header['mode'] & 0111) {
+                                // make file executable, obey umask
+                                $mode = fileperms($v_header['filename']) | (~umask() & 0111);
+                                @chmod($v_header['filename'], $mode);
+                            }
+                        }
+
+                        // ----- Check the file size
+                        clearstatcache();
+                        if (!is_file($v_header['filename'])) {
+                            $this->_error(
+                                'Extracted file ' . $v_header['filename']
+                                . 'does not exist. Archive may be corrupted.'
+                            );
+                            return false;
+                        }
+
+                        $filesize = filesize($v_header['filename']);
+                        if ($filesize != $v_header['size']) {
+                            $this->_error(
+                                'Extracted file ' . $v_header['filename']
+                                . ' does not have the correct file size \''
+                                . $filesize
+                                . '\' (' . $v_header['size']
+                                . ' expected). Archive may be corrupted.'
+                            );
+                            return false;
+                        }
+                    }
+                } else {
+                    $this->_jumpBlock(ceil(($v_header['size'] / 512)));
+                }
+            } else {
+                $this->_jumpBlock(ceil(($v_header['size'] / 512)));
+            }
+
+            /* TBC : Seems to be unused ...
+            if ($this->_compress)
+              $v_end_of_file = @gzeof($this->_file);
+            else
+              $v_end_of_file = @feof($this->_file);
+              */
+
+            if ($v_listing || $v_extract_file || $v_extraction_stopped) {
+                // ----- Log extracted files
+                if (($v_file_dir = dirname($v_header['filename']))
+                    == $v_header['filename']
+                ) {
+                    $v_file_dir = '';
+                }
+                if ((substr($v_header['filename'], 0, 1) == '/') && ($v_file_dir == '')) {
+                    $v_file_dir = '/';
+                }
+
+                $p_list_detail[$v_nb++] = $v_header;
+                if (is_array($p_file_list) && (count($p_list_detail) == count($p_file_list))) {
+                    return true;
+                }
+            }
         }
-      }
-    }
 
         return true;
     }
-    // }}}
 
-    // {{{ _openAppend()
-    function _openAppend()
+    /**
+     * @return bool
+     */
+    public function _openAppend()
     {
-        if (filesize($this->_tarname) == 0)
-          return $this->_openWrite();
+        if (filesize($this->_tarname) == 0) {
+            return $this->_openWrite();
+        }
 
         if ($this->_compress) {
             $this->_close();
 
-            if (!@rename($this->_tarname, $this->_tarname.".tmp")) {
-                $this->_error('Error while renaming \''.$this->_tarname
-				              .'\' to temporary file \''.$this->_tarname
-							  .'.tmp\'');
+            if (!@rename($this->_tarname, $this->_tarname . ".tmp")) {
+                $this->_error(
+                    'Error while renaming \'' . $this->_tarname
+                    . '\' to temporary file \'' . $this->_tarname
+                    . '.tmp\''
+                );
                 return false;
             }
 
-            if ($this->_compress_type == 'gz')
-                $v_temp_tar = @gzopen($this->_tarname.".tmp", "rb");
-            elseif ($this->_compress_type == 'bz2')
-                $v_temp_tar = @bzopen($this->_tarname.".tmp", "r");
+            if ($this->_compress_type == 'gz') {
+                $v_temp_tar = @gzopen($this->_tarname . ".tmp", "rb");
+            } elseif ($this->_compress_type == 'bz2') {
+                $v_temp_tar = @bzopen($this->_tarname . ".tmp", "r");
+            } elseif ($this->_compress_type == 'lzma2') {
+                $v_temp_tar = @xzopen($this->_tarname . ".tmp", "r");
+            }
+
 
             if ($v_temp_tar == 0) {
-                $this->_error('Unable to open file \''.$this->_tarname
-				              .'.tmp\' in binary read mode');
-                @rename($this->_tarname.".tmp", $this->_tarname);
+                $this->_error(
+                    'Unable to open file \'' . $this->_tarname
+                    . '.tmp\' in binary read mode'
+                );
+                @rename($this->_tarname . ".tmp", $this->_tarname);
                 return false;
             }
 
             if (!$this->_openWrite()) {
-                @rename($this->_tarname.".tmp", $this->_tarname);
+                @rename($this->_tarname . ".tmp", $this->_tarname);
                 return false;
             }
 
             if ($this->_compress_type == 'gz') {
+                $end_blocks = 0;
+
                 while (!@gzeof($v_temp_tar)) {
                     $v_buffer = @gzread($v_temp_tar, 512);
-                    if ($v_buffer == ARCHIVE_TAR_END_BLOCK) {
+                    if ($v_buffer == ARCHIVE_TAR_END_BLOCK || strlen($v_buffer) == 0) {
+                        $end_blocks++;
                         // do not copy end blocks, we will re-make them
                         // after appending
                         continue;
+                    } elseif ($end_blocks > 0) {
+                        for ($i = 0; $i < $end_blocks; $i++) {
+                            $this->_writeBlock(ARCHIVE_TAR_END_BLOCK);
+                        }
+                        $end_blocks = 0;
                     }
                     $v_binary_data = pack("a512", $v_buffer);
                     $this->_writeBlock($v_binary_data);
                 }
 
                 @gzclose($v_temp_tar);
-            }
-            elseif ($this->_compress_type == 'bz2') {
+            } elseif ($this->_compress_type == 'bz2') {
+                $end_blocks = 0;
+
                 while (strlen($v_buffer = @bzread($v_temp_tar, 512)) > 0) {
-                    if ($v_buffer == ARCHIVE_TAR_END_BLOCK) {
+                    if ($v_buffer == ARCHIVE_TAR_END_BLOCK || strlen($v_buffer) == 0) {
+                        $end_blocks++;
+                        // do not copy end blocks, we will re-make them
+                        // after appending
                         continue;
+                    } elseif ($end_blocks > 0) {
+                        for ($i = 0; $i < $end_blocks; $i++) {
+                            $this->_writeBlock(ARCHIVE_TAR_END_BLOCK);
+                        }
+                        $end_blocks = 0;
                     }
                     $v_binary_data = pack("a512", $v_buffer);
                     $this->_writeBlock($v_binary_data);
                 }
 
                 @bzclose($v_temp_tar);
-            }
+            } elseif ($this->_compress_type == 'lzma2') {
+                $end_blocks = 0;
+
+                while (strlen($v_buffer = @xzread($v_temp_tar, 512)) > 0) {
+                    if ($v_buffer == ARCHIVE_TAR_END_BLOCK || strlen($v_buffer) == 0) {
+                        $end_blocks++;
+                        // do not copy end blocks, we will re-make them
+                        // after appending
+                        continue;
+                    } elseif ($end_blocks > 0) {
+                        for ($i = 0; $i < $end_blocks; $i++) {
+                            $this->_writeBlock(ARCHIVE_TAR_END_BLOCK);
+                        }
+                        $end_blocks = 0;
+                    }
+                    $v_binary_data = pack("a512", $v_buffer);
+                    $this->_writeBlock($v_binary_data);
+                }
 
-            if (!@unlink($this->_tarname.".tmp")) {
-                $this->_error('Error while deleting temporary file \''
-				              .$this->_tarname.'.tmp\'');
+                @xzclose($v_temp_tar);
             }
 
+            if (!@unlink($this->_tarname . ".tmp")) {
+                $this->_error(
+                    'Error while deleting temporary file \''
+                    . $this->_tarname . '.tmp\''
+                );
+            }
         } else {
             // ----- For not compressed tar, just add files before the last
-			//       one or two 512 bytes block
-            if (!$this->_openReadWrite())
-               return false;
+            //       one or two 512 bytes block
+            if (!$this->_openReadWrite()) {
+                return false;
+            }
 
             clearstatcache();
             $v_size = filesize($this->_tarname);
@@ -1779,32 +2286,34 @@ function _openAppend()
             fseek($this->_file, $v_size - 1024);
             if (fread($this->_file, 512) == ARCHIVE_TAR_END_BLOCK) {
                 fseek($this->_file, $v_size - 1024);
-            }
-            elseif (fread($this->_file, 512) == ARCHIVE_TAR_END_BLOCK) {
+            } elseif (fread($this->_file, 512) == ARCHIVE_TAR_END_BLOCK) {
                 fseek($this->_file, $v_size - 512);
             }
         }
 
         return true;
     }
-    // }}}
 
-    // {{{ _append()
-    function _append($p_filelist, $p_add_dir='', $p_remove_dir='')
+    /**
+     * @param $p_filelist
+     * @param string $p_add_dir
+     * @param string $p_remove_dir
+     * @return bool
+     */
+    public function _append($p_filelist, $p_add_dir = '', $p_remove_dir = '')
     {
-        if (!$this->_openAppend())
+        if (!$this->_openAppend()) {
             return false;
+        }
 
-        if ($this->_addList($p_filelist, $p_add_dir, $p_remove_dir))
-           $this->_writeFooter();
+        if ($this->_addList($p_filelist, $p_add_dir, $p_remove_dir)) {
+            $this->_writeFooter();
+        }
 
         $this->_close();
 
         return true;
     }
-    // }}}
-
-    // {{{ _dirCheck()
 
     /**
      * Check if a directory exists and create it (including parent
@@ -1812,20 +2321,23 @@ function _append($p_filelist, $p_add_dir='', $p_remove_dir='')
      *
      * @param string $p_dir directory to check
      *
-     * @return bool TRUE if the directory exists or was created
+     * @return bool true if the directory exists or was created
      */
-    function _dirCheck($p_dir)
+    public function _dirCheck($p_dir)
     {
         clearstatcache();
-        if ((@is_dir($p_dir)) || ($p_dir == ''))
+        if ((@is_dir($p_dir)) || ($p_dir == '')) {
             return true;
+        }
 
         $p_parent_dir = dirname($p_dir);
 
         if (($p_parent_dir != $p_dir) &&
             ($p_parent_dir != '') &&
-            (!$this->_dirCheck($p_parent_dir)))
-             return false;
+            (!$this->_dirCheck($p_parent_dir))
+        ) {
+            return false;
+        }
 
         if (!@mkdir($p_dir, 0777)) {
             $this->_error("Unable to create directory '$p_dir'");
@@ -1835,10 +2347,6 @@ function _dirCheck($p_dir)
         return true;
     }
 
-    // }}}
-
-    // {{{ _pathReduction()
-
     /**
      * Compress path by changing for example "/dir/foo/../bar" to "/dir/bar",
      * rand emove double slashes.
@@ -1846,11 +2354,8 @@ function _dirCheck($p_dir)
      * @param string $p_dir path to reduce
      *
      * @return string reduced path
-     *
-     * @access private
-     *
      */
-    function _pathReduction($p_dir)
+    private function _pathReduction($p_dir)
     {
         $v_result = '';
 
@@ -1860,50 +2365,57 @@ function _pathReduction($p_dir)
             $v_list = explode('/', $p_dir);
 
             // ----- Study directories from last to first
-            for ($i=sizeof($v_list)-1; $i>=0; $i--) {
+            for ($i = sizeof($v_list) - 1; $i >= 0; $i--) {
                 // ----- Look for current path
                 if ($v_list[$i] == ".") {
                     // ----- Ignore this directory
                     // Should be the first $i=0, but no check is done
-                }
-                else if ($v_list[$i] == "..") {
-                    // ----- Ignore it and ignore the $i-1
-                    $i--;
-                }
-                else if (   ($v_list[$i] == '')
-				         && ($i!=(sizeof($v_list)-1))
-						 && ($i!=0)) {
-                    // ----- Ignore only the double '//' in path,
-                    // but not the first and last /
                 } else {
-                    $v_result = $v_list[$i].($i!=(sizeof($v_list)-1)?'/'
-					            .$v_result:'');
+                    if ($v_list[$i] == "..") {
+                        // ----- Ignore it and ignore the $i-1
+                        $i--;
+                    } else {
+                        if (($v_list[$i] == '')
+                            && ($i != (sizeof($v_list) - 1))
+                            && ($i != 0)
+                        ) {
+                            // ----- Ignore only the double '//' in path,
+                            // but not the first and last /
+                        } else {
+                            $v_result = $v_list[$i] . ($i != (sizeof($v_list) - 1) ? '/'
+                                    . $v_result : '');
+                        }
+                    }
                 }
             }
         }
-        $v_result = strtr($v_result, '\\', '/');
+
+        if (defined('OS_WINDOWS') && OS_WINDOWS) {
+            $v_result = strtr($v_result, '\\', '/');
+        }
+
         return $v_result;
     }
 
-    // }}}
-
-    // {{{ _translateWinPath()
-    function _translateWinPath($p_path, $p_remove_disk_letter=true)
+    /**
+     * @param $p_path
+     * @param bool $p_remove_disk_letter
+     * @return string
+     */
+    public function _translateWinPath($p_path, $p_remove_disk_letter = true)
     {
-      if (defined('OS_WINDOWS') && OS_WINDOWS) {
-          // ----- Look for potential disk letter
-          if (   ($p_remove_disk_letter)
-		      && (($v_position = strpos($p_path, ':')) != false)) {
-              $p_path = substr($p_path, $v_position+1);
-          }
-          // ----- Change potential windows directory separator
-          if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0,1) == '\\')) {
-              $p_path = strtr($p_path, '\\', '/');
-          }
-      }
-      return $p_path;
+        if (defined('OS_WINDOWS') && OS_WINDOWS) {
+            // ----- Look for potential disk letter
+            if (($p_remove_disk_letter)
+                && (($v_position = strpos($p_path, ':')) != false)
+            ) {
+                $p_path = substr($p_path, $v_position + 1);
+            }
+            // ----- Change potential windows directory separator
+            if ((strpos($p_path, '\\') > 0) || (substr($p_path, 0, 1) == '\\')) {
+                $p_path = strtr($p_path, '\\', '/');
+            }
+        }
+        return $p_path;
     }
-    // }}}
-
 }
-?>

From f4f72563e26d1b1e1006a352c2379a4273dfbead Mon Sep 17 00:00:00 2001
From: sano <sano@tejimaya-no-MacBook-Air.local>
Date: Wed, 18 May 2016 17:29:28 +0900
Subject: [PATCH 530/630] Add a description of exif module in the Setup Guide
 (refs #3941, BP from #3939)

---
 doc/en/OpenPNE3_Setup_Guide.txt | 1 +
 doc/ja/OpenPNE3_Setup_Guide.txt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/doc/en/OpenPNE3_Setup_Guide.txt b/doc/en/OpenPNE3_Setup_Guide.txt
index b9a6e1022..d2b243636 100644
--- a/doc/en/OpenPNE3_Setup_Guide.txt
+++ b/doc/en/OpenPNE3_Setup_Guide.txt
@@ -20,6 +20,7 @@ PHP
     * The "PDO" module is available (containing DBMS drivers that you want to use)
     * The "JSON" module is available
     * The GD library is available from PHP (That must be support JPEG, GIF and PNG)
+    * The "exif" module is available
     * The "mcrypt" module recommendation
     * The "APC" module recommendation
 Database Server
diff --git a/doc/ja/OpenPNE3_Setup_Guide.txt b/doc/ja/OpenPNE3_Setup_Guide.txt
index 36caaf0c0..d7f6bd26e 100644
--- a/doc/ja/OpenPNE3_Setup_Guide.txt
+++ b/doc/ja/OpenPNE3_Setup_Guide.txt
@@ -20,6 +20,7 @@ PHP
     * PHP の PDO 拡張モジュールを使用可能 (利用する DBMS のドライバも含む)
     * PHP の JSON 拡張モジュールを使用可能
     * PHP から GD ライブラリを使用可能 (JPEG/GIF/PNG サポート)
+    * PHP の exif 拡張モジュールを使用可能
     * PHP の mcrypt 拡張モジュールの使用を推奨
     * PHP の APC 拡張モジュールの使用を推奨
 データベースサーバ

From 08d77442fefe75f1915ad081664ec8df6f05cf7c Mon Sep 17 00:00:00 2001
From: sano <sano@tejimaya-no-MacBook-Air.local>
Date: Mon, 23 May 2016 15:55:44 +0900
Subject: [PATCH 531/630] updated the mobile_ip_address list for release
 2016/04/14, WILLCOM, 2016/07/01 (refs #3929, #3943, #3344 BP from #3888,
 #3935, #3938)

---
 lib/config/config/mobile_ip_address.yml | 160 ++----------------------
 1 file changed, 12 insertions(+), 148 deletions(-)

diff --git a/lib/config/config/mobile_ip_address.yml b/lib/config/config/mobile_ip_address.yml
index 51391ede7..222f0a11f 100644
--- a/lib/config/config/mobile_ip_address.yml
+++ b/lib/config/config/mobile_ip_address.yml
@@ -15,8 +15,8 @@
 ######################################
 
 ######################################
-# 2015/12/10 リリース版
-# 2016/01 のau IPアドレス帯域追加対応
+# 2016/06/09 リリース版
+# 2016年7月1日 au IPアドレス追加対応
 ######################################
 
 # DoCoMo (2010/06/24更新)
@@ -31,7 +31,7 @@ docomo:
   - 210.153.84.0/24
   - 210.153.86.0/24
 
-# au 2011年夏モデル以前(2015/12/10更新)
+# au 2011年夏モデル以前(2016/06/09更新)
 # http://www.au.kddi.com/ezfactory/tec/spec/ezsava_ip.html
 ezweb:
   - 27.80.181.240/28
@@ -51,6 +51,12 @@ ezweb:
   - 27.90.137.160/27
   - 27.90.137.192/27
   - 27.90.137.224/27
+  - 27.90.206.0/26
+  - 27.90.206.64/26
+  - 27.90.206.128/26
+  - 27.90.207.0/26
+  - 27.90.207.64/26
+  - 27.90.207.128/26
   - 27.90.220.112/28
   - 61.117.2.32/29
   - 61.117.2.40/29
@@ -77,8 +83,10 @@ ezweb:
   - 219.108.158.40/29
   - 219.125.146.0/28
 
-# au 2011年秋冬モデル以降 (2015/12/10更新)
+# au 2011年秋冬モデル以降 (2016/04/14更新)
 # http://www.au.kddi.com/ezfactory/tec/spec/ezsava_ip.html
+  - 27.90.207.224/28
+  - 27.90.207.240/28
   - 27.90.220.224/28
   - 27.90.220.240/28
   - 106.162.214.160/29
@@ -94,147 +102,3 @@ softbank:
   - 202.253.96.144/28
   - 202.253.99.144/28
   - 210.228.189.188/30
-
-# WILLCOM (2013/01/30更新)
-# http://www.willcom-inc.com/ja/service/contents_service/create/center_info/
-willcom:
-  - 61.198.129.0/24
-  - 61.198.130.0/24
-  - 61.198.132.0/24
-  - 61.198.133.0/24
-  - 61.198.134.0/24
-  - 61.198.135.0/24
-  - 61.198.136.0/24
-  - 61.198.137.0/24
-  - 61.198.139.0/29
-  - 61.198.139.128/27
-  - 61.198.139.160/28
-  - 61.198.142.0/24
-  - 61.198.160.0/24
-  - 61.198.161.0/24
-  - 61.198.162.0/24
-  - 61.198.163.0/24
-  - 61.198.164.0/24
-  - 61.198.168.0/24
-  - 61.198.169.0/24
-  - 61.198.170.0/24
-  - 61.198.171.0/24
-  - 61.198.172.0/24
-  - 61.198.173.0/24
-  - 61.198.174.0/24
-  - 61.198.175.0/24
-  - 61.198.248.0/24
-  - 61.198.249.0/24
-  - 61.198.250.0/24
-  - 61.198.251.0/24
-  - 61.198.252.0/24
-  - 61.198.253.0/24
-  - 61.198.255.0/24
-  - 61.204.0.0/24
-  - 61.204.2.0/24
-  - 61.204.3.128/25
-  - 61.204.4.0/24
-  - 61.204.5.0/24
-  - 61.204.6.128/25
-  - 61.204.7.0/25
-  - 61.204.92.0/24
-  - 61.204.93.0/24
-  - 61.204.94.0/24
-  - 61.204.95.0/24
-  - 114.20.49.0/24
-  - 114.20.50.0/24
-  - 114.20.51.0/24
-  - 114.20.52.0/24
-  - 114.20.53.0/24
-  - 114.20.54.0/24
-  - 114.20.55.0/24
-  - 114.20.56.0/24
-  - 114.20.57.0/24
-  - 114.20.58.0/24
-  - 114.20.59.0/24
-  - 114.20.60.0/24
-  - 114.20.61.0/24
-  - 114.20.62.0/24
-  - 114.20.63.0/24
-  - 114.20.64.0/24
-  - 114.20.65.0/24
-  - 114.20.66.0/24
-  - 114.20.67.0/24
-  - 114.20.128.0/17
-  - 114.21.128.0/24
-  - 114.21.129.0/24
-  - 114.21.130.0/24
-  - 114.21.131.0/24
-  - 114.21.132.0/24
-  - 114.21.133.0/24
-  - 114.21.134.0/24
-  - 114.21.135.0/24
-  - 114.21.136.0/24
-  - 114.21.137.0/24
-  - 114.21.138.0/24
-  - 114.21.139.0/24
-  - 114.21.140.0/24
-  - 114.21.141.0/24
-  - 114.21.142.0/24
-  - 114.21.143.0/24
-  - 114.21.144.0/24
-  - 114.21.145.0/24
-  - 114.21.146.0/24
-  - 114.21.147.0/24
-  - 114.21.148.0/24
-  - 114.21.149.0/24
-  - 125.28.0.0/24
-  - 125.28.1.0/24
-  - 125.28.2.0/24
-  - 125.28.3.0/24
-  - 125.28.6.0/24
-  - 125.28.7.0/24
-  - 125.28.8.0/24
-  - 125.28.11.0/24
-  - 125.28.12.0/24
-  - 125.28.13.0/24
-  - 125.28.14.0/24
-  - 125.28.15.0/24
-  - 125.28.16.0/24
-  - 125.28.17.0/24
-  - 210.168.246.0/24
-  - 210.168.247.0/24
-  - 210.169.92.0/24
-  - 210.169.93.0/24
-  - 210.169.95.0/24
-  - 210.169.96.0/24
-  - 210.169.97.0/24
-  - 210.169.98.0/24
-  - 210.169.99.0/24
-  - 210.255.190.0/24
-  - 211.18.232.0/24
-  - 211.18.233.0/24
-  - 211.18.234.0/24
-  - 211.18.235.0/24
-  - 211.18.236.0/24
-  - 211.18.237.0/24
-  - 211.18.238.0/24
-  - 211.18.239.0/24
-  - 211.126.192.128/25
-  - 219.108.2.0/24
-  - 219.108.3.0/24
-  - 219.108.4.0/24
-  - 219.108.5.0/24
-  - 219.108.6.0/24
-  - 219.108.7.0/24
-  - 219.108.10.0/24
-  - 219.108.11.0/24
-  - 219.108.12.0/24
-  - 219.108.13.0/24
-  - 219.108.14.0/24
-  - 219.108.15.0/24
-  - 221.119.0.0/24
-  - 221.119.1.0/24
-  - 221.119.2.0/24
-  - 221.119.3.0/24
-  - 221.119.4.0/24
-  - 221.119.5.0/24
-  - 221.119.6.0/24
-  - 221.119.7.0/24
-  - 221.119.8.0/24
-  - 221.119.9.0/24

From ac9a15cda624492c339640ea0045af865eeb290d Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 9 Jun 2016 15:20:55 +0900
Subject: [PATCH 532/630] version 3.8.20

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index bcc8c4aff..dcb653518 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.20-dev');
+  define('OPENPNE_VERSION', '3.8.20');
 }

From ee3032a76ace70f02890649a088b8ae193729cc4 Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 9 Jun 2016 15:23:59 +0900
Subject: [PATCH 533/630] started to development of OpenPNE 3.8.21

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index dcb653518..43dd3f643 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.20');
+  define('OPENPNE_VERSION', '3.8.21-dev');
 }

From d0c6c1f55df326e2d96db1499a28fbab03a0ef2f Mon Sep 17 00:00:00 2001
From: watanabe <watanabe@openpne.jp>
Date: Wed, 8 Feb 2012 08:33:49 +0900
Subject: [PATCH 534/630] (fixes #3973, BP from #2780) add patch to
 symfony-1.4.13 and repatch #1565 to symfony for avoding
 http://trac.symfony-project.org/ticket/9061 problem

(cherry picked from commit 732ca6fe5c6cebc36d0e7bc82d236d1f7ce209f7)
---
 data/patches/t1565.patch                      | 32 +++++++++++++++++++
 .../lib/request/sfWebRequest.class.php        |  6 ++--
 2 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 data/patches/t1565.patch

diff --git a/data/patches/t1565.patch b/data/patches/t1565.patch
new file mode 100644
index 000000000..6eb50284e
--- /dev/null
+++ b/data/patches/t1565.patch
@@ -0,0 +1,32 @@
+diff --git a/lib/vendor/symfony/lib/request/sfWebRequest.class.php b/lib/vendor/symfony/lib/request/sfWebRequest.class.php
+index c2205f6..0c817fd 100644
+--- a/lib/vendor/symfony/lib/request/sfWebRequest.class.php
++++ b/lib/vendor/symfony/lib/request/sfWebRequest.class.php
+@@ -239,8 +239,8 @@ class sfWebRequest extends sfRequest
+   public function getPathInfo()
+   {
+     $pathInfo = '';
+-
+     $pathArray = $this->getPathInfoArray();
++    $isIis = (isset($pathArray['SERVER_SOFTWARE']) && false !== stripos($pathArray['SERVER_SOFTWARE'], 'iis'));
+
+     // simulate PATH_INFO if needed
+     $sf_path_info_key = $this->options['path_info_key'];
+@@ -261,14 +261,14 @@ class sfWebRequest extends sfRequest
+     else
+     {
+       $pathInfo = $pathArray[$sf_path_info_key];
+-      if ($relativeUrlRoot = $this->getRelativeUrlRoot())
++      if ($isIis && $relativeUrlRoot = $this->getRelativeUrlRoot())
+       {
+         $pathInfo = preg_replace('/^'.str_replace('/', '\\/', $relativeUrlRoot).'\//', '', $pathInfo);
+       }
+     }
+
+     // for IIS
+-    if (isset($_SERVER['SERVER_SOFTWARE']) && false !== stripos($_SERVER['SERVER_SOFTWARE'], 'iis') && $pos = stripos($pathInfo, '.php'))
++    if ($isIis && $pos = stripos($pathInfo, '.php'))
+     {
+       $pathInfo = substr($pathInfo, $pos + 4);
+     }
+
diff --git a/lib/vendor/symfony/lib/request/sfWebRequest.class.php b/lib/vendor/symfony/lib/request/sfWebRequest.class.php
index 250117955..a9b255455 100644
--- a/lib/vendor/symfony/lib/request/sfWebRequest.class.php
+++ b/lib/vendor/symfony/lib/request/sfWebRequest.class.php
@@ -256,8 +256,8 @@ public function getUriPrefix()
   public function getPathInfo()
   {
     $pathInfo = '';
-
     $pathArray = $this->getPathInfoArray();
+    $isIis = (isset($pathArray['SERVER_SOFTWARE']) && false !== stripos($pathArray['SERVER_SOFTWARE'], 'iis'));
 
     // simulate PATH_INFO if needed
     $sf_path_info_key = $this->options['path_info_key'];
@@ -278,14 +278,14 @@ public function getPathInfo()
     else
     {
       $pathInfo = $pathArray[$sf_path_info_key];
-      if ($relativeUrlRoot = $this->getRelativeUrlRoot())
+      if ($isIis && $relativeUrlRoot = $this->getRelativeUrlRoot())
       {
         $pathInfo = preg_replace('/^'.str_replace('/', '\\/', $relativeUrlRoot).'\//', '', $pathInfo);
       }
     }
 
     // for IIS
-    if (isset($_SERVER['SERVER_SOFTWARE']) && false !== stripos($_SERVER['SERVER_SOFTWARE'], 'iis') && $pos = stripos($pathInfo, '.php'))
+    if ($isIis && $pos = stripos($pathInfo, '.php'))
     {
       $pathInfo = substr($pathInfo, $pos + 4);
     }

From 8dd6497811765a0a93aa2e1365bf4da0d624f96d Mon Sep 17 00:00:00 2001
From: Maki Takahashi <takahashi@tejimaya.com>
Date: Fri, 28 Oct 2011 15:35:55 +0900
Subject: [PATCH 535/630] (fixes #3640, BP from #2494) added nickname to
 profile page

(cherry picked from commit f6a75664d56e78ab34b6b07c91a7eb0ce9480263)
---
 .../modules/member/templates/profileSuccess.php               | 3 +++
 apps/pc_frontend/modules/member/templates/_profileListBox.php | 3 +++
 plugins/opSkinBasicPlugin/web/css/main.css                    | 4 +++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/mobile_frontend/modules/member/templates/profileSuccess.php b/apps/mobile_frontend/modules/member/templates/profileSuccess.php
index efe767c69..74b90f97e 100644
--- a/apps/mobile_frontend/modules/member/templates/profileSuccess.php
+++ b/apps/mobile_frontend/modules/member/templates/profileSuccess.php
@@ -33,6 +33,9 @@
 <td valign="top">
 <?php
 $list = array();
+
+$list[__('%Nickname%')] = $member->getName();
+
 if ($member->getAge(true))
 {
   $ageValue = __('%1% years old', array('%1%' => $member->getAge()));
diff --git a/apps/pc_frontend/modules/member/templates/_profileListBox.php b/apps/pc_frontend/modules/member/templates/_profileListBox.php
index e3c7623f2..bea0e8f5f 100644
--- a/apps/pc_frontend/modules/member/templates/_profileListBox.php
+++ b/apps/pc_frontend/modules/member/templates/_profileListBox.php
@@ -3,6 +3,9 @@
 $culture = sfCultureInfo::getInstance($sf_user->getCulture());
 
 $list = array();
+
+$list[__('%Nickname%')] = $member->getName();
+
 if ($member->getAge(true) !== false)
 {
   $ageValue = __('%1% years old', array('%1%' => $member->getAge()));
diff --git a/plugins/opSkinBasicPlugin/web/css/main.css b/plugins/opSkinBasicPlugin/web/css/main.css
index 105ecfb3e..6a031e1d7 100644
--- a/plugins/opSkinBasicPlugin/web/css/main.css
+++ b/plugins/opSkinBasicPlugin/web/css/main.css
@@ -1053,7 +1053,9 @@ div.operation ul.moreInfo li {
   width: 83px;
   background-color: #FFFFFF;
 }
-
+#profile th {
+  width: 89px;
+}
 .listBox th, .listBox td {
   padding: 5px;
 }

From ea7f2db02e30476450409928d14a961b58671740 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Mon, 17 Jun 2013 17:17:27 +0900
Subject: [PATCH 536/630] add openpne.baseUrl for client-side rendering (fixes
 #3989, BP from #3365)

(cherry picked from commit 7977e6467f1553eadd986e657601b600827c837e)
---
 apps/pc_frontend/templates/_layout.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/pc_frontend/templates/_layout.php b/apps/pc_frontend/templates/_layout.php
index b42cb1a8c..1f50305f2 100644
--- a/apps/pc_frontend/templates/_layout.php
+++ b/apps/pc_frontend/templates/_layout.php
@@ -19,6 +19,7 @@
 $jsonData = array(
   'apiKey' => $sf_user->getMemberApiKey(),
   'apiBase' => app_url_for('api', 'homepage'),
+  'baseUrl' => $sf_request->getRelativeUrlRoot().'/',
 );
 
 $json = defined('JSON_PRETTY_PRINT') ? json_encode($jsonData, JSON_PRETTY_PRINT) : json_encode($jsonData);

From 2fd30b22a5388062930341540d9579c30f89db7b Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Mon, 17 Jun 2013 17:28:45 +0900
Subject: [PATCH 537/630] add openpne.baseUrl in smartphone layout for
 client-side rendering (fixes #3989, BP from #3365)

(cherry picked from commit 625d3853c4f45d411daafea876ec0b938e22d7a7)
---
 apps/pc_frontend/templates/smtLayoutGroup.php  | 1 +
 apps/pc_frontend/templates/smtLayoutHome.php   | 1 +
 apps/pc_frontend/templates/smtLayoutMember.php | 1 +
 apps/pc_frontend/templates/smtLayoutSns.php    | 1 +
 4 files changed, 4 insertions(+)

diff --git a/apps/pc_frontend/templates/smtLayoutGroup.php b/apps/pc_frontend/templates/smtLayoutGroup.php
index 467e43191..e02b94a00 100644
--- a/apps/pc_frontend/templates/smtLayoutGroup.php
+++ b/apps/pc_frontend/templates/smtLayoutGroup.php
@@ -16,6 +16,7 @@
 $jsonData = array(
   'apiKey' => $sf_user->getMemberApiKey(),
   'apiBase' => app_url_for('api', 'homepage'),
+  'baseUrl' => $sf_request->getRelativeUrlRoot().'/',
 );
 
 $json = defined('JSON_PRETTY_PRINT') ? json_encode($jsonData, JSON_PRETTY_PRINT) : json_encode($jsonData);
diff --git a/apps/pc_frontend/templates/smtLayoutHome.php b/apps/pc_frontend/templates/smtLayoutHome.php
index bf9201a28..becdb3ade 100644
--- a/apps/pc_frontend/templates/smtLayoutHome.php
+++ b/apps/pc_frontend/templates/smtLayoutHome.php
@@ -16,6 +16,7 @@
 $jsonData = array(
   'apiKey' => $sf_user->getMemberApiKey(),
   'apiBase' => app_url_for('api', 'homepage'),
+  'baseUrl' => $sf_request->getRelativeUrlRoot().'/',
 );
 
 $json = defined('JSON_PRETTY_PRINT') ? json_encode($jsonData, JSON_PRETTY_PRINT) : json_encode($jsonData);
diff --git a/apps/pc_frontend/templates/smtLayoutMember.php b/apps/pc_frontend/templates/smtLayoutMember.php
index edd858850..414fe3ca0 100644
--- a/apps/pc_frontend/templates/smtLayoutMember.php
+++ b/apps/pc_frontend/templates/smtLayoutMember.php
@@ -16,6 +16,7 @@
 $jsonData = array(
   'apiKey' => $sf_user->getMemberApiKey(),
   'apiBase' => app_url_for('api', 'homepage'),
+  'baseUrl' => $sf_request->getRelativeUrlRoot().'/',
 );
 
 $json = defined('JSON_PRETTY_PRINT') ? json_encode($jsonData, JSON_PRETTY_PRINT) : json_encode($jsonData);
diff --git a/apps/pc_frontend/templates/smtLayoutSns.php b/apps/pc_frontend/templates/smtLayoutSns.php
index 15dba17c3..9326511ae 100644
--- a/apps/pc_frontend/templates/smtLayoutSns.php
+++ b/apps/pc_frontend/templates/smtLayoutSns.php
@@ -16,6 +16,7 @@
 $jsonData = array(
   'apiKey' => opToolkit::isSecurePage() ? $sf_user->getMemberApiKey() : '',
   'apiBase' => app_url_for('api', 'homepage'),
+  'baseUrl' => $sf_request->getRelativeUrlRoot().'/',
 );
 
 $json = defined('JSON_PRETTY_PRINT') ? json_encode($jsonData, JSON_PRETTY_PRINT) : json_encode($jsonData);

From c6375ac7920eeafbd8490c155566fd7af83e93ec Mon Sep 17 00:00:00 2001
From: C-nakajima <nakajima@tejimaya.com>
Date: Mon, 8 Aug 2016 13:25:28 +0900
Subject: [PATCH 538/630] (refs #3981, BP from #3852) clear MemberConfig caches
 on every request by opBrowser

---
 lib/util/opBrowser.class.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/util/opBrowser.class.php b/lib/util/opBrowser.class.php
index 69b674a43..c5cd37936 100644
--- a/lib/util/opBrowser.class.php
+++ b/lib/util/opBrowser.class.php
@@ -16,6 +16,14 @@
  */
 class opBrowser extends sfBrowser
 {
+  protected function doCall()
+  {
+    // Clear internal MemberConfig cache
+    Doctrine_Core::getTable('MemberConfig')->results = array();
+
+    parent::doCall();
+  }
+
   /**
    * @see sfBrowserBase::doClick()
    * @see http://trac.symfony-project.org/ticket/5748

From e318a5fb8bfd9672c46d680c0c12dc3007c64f2e Mon Sep 17 00:00:00 2001
From: C-nakajima <nakajima@tejimaya.com>
Date: Mon, 8 Aug 2016 15:16:08 +0900
Subject: [PATCH 539/630] (refs #3979, BP from #3873) rename
 opPearDownloader.class.php to make the filename exactly the same as the
 classname

---
 .../{opPearDownloader.class.php => opPluginDownloader.class.php}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename lib/plugin/{opPearDownloader.class.php => opPluginDownloader.class.php} (100%)

diff --git a/lib/plugin/opPearDownloader.class.php b/lib/plugin/opPluginDownloader.class.php
similarity index 100%
rename from lib/plugin/opPearDownloader.class.php
rename to lib/plugin/opPluginDownloader.class.php

From 8e74807976a55f065c4559e5e54b557ba22b74bb Mon Sep 17 00:00:00 2001
From: C-nakajima <nakajima@tejimaya.com>
Date: Mon, 8 Aug 2016 16:05:07 +0900
Subject: [PATCH 540/630] (refs #3977, BP from #3955) added culture to template
 for smartphone.

---
 .../modules/member/templates/_smtProfileListBox.php            | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/pc_frontend/modules/member/templates/_smtProfileListBox.php b/apps/pc_frontend/modules/member/templates/_smtProfileListBox.php
index 8cd21bf5b..89b99480c 100644
--- a/apps/pc_frontend/modules/member/templates/_smtProfileListBox.php
+++ b/apps/pc_frontend/modules/member/templates/_smtProfileListBox.php
@@ -1,6 +1,9 @@
 <?php use_helper('Javascript') ?>
 <?php
 op_include_parts('descriptionBox', 'smtProfileTop', array());
+
+$culture = sfCultureInfo::getInstance($sf_user->getCulture());
+
 foreach ($member->getProfiles(true) as $profile)
 {
   $caption = $profile->getProfile()->getCaption();

From 4671fc3f14c12f83c3259b95eff446f2a91f68da Mon Sep 17 00:00:00 2001
From: C-nakajima <nakajima@tejimaya.com>
Date: Mon, 8 Aug 2016 17:01:54 +0900
Subject: [PATCH 541/630] (refs #3975, BP from #3957) add APCu extension to
 recommendations in install guide

---
 doc/en/OpenPNE3_Setup_Guide.txt | 2 +-
 doc/ja/OpenPNE3_Setup_Guide.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/en/OpenPNE3_Setup_Guide.txt b/doc/en/OpenPNE3_Setup_Guide.txt
index d2b243636..7153749be 100644
--- a/doc/en/OpenPNE3_Setup_Guide.txt
+++ b/doc/en/OpenPNE3_Setup_Guide.txt
@@ -22,7 +22,7 @@ PHP
     * The GD library is available from PHP (That must be support JPEG, GIF and PNG)
     * The "exif" module is available
     * The "mcrypt" module recommendation
-    * The "APC" module recommendation
+    * The "APC" (or "APCu") module recommendation
 Database Server
   MySQL4.1 or later (5.1 or greater recommended)
   
diff --git a/doc/ja/OpenPNE3_Setup_Guide.txt b/doc/ja/OpenPNE3_Setup_Guide.txt
index d7f6bd26e..1af2e09d8 100644
--- a/doc/ja/OpenPNE3_Setup_Guide.txt
+++ b/doc/ja/OpenPNE3_Setup_Guide.txt
@@ -22,7 +22,7 @@ PHP
     * PHP から GD ライブラリを使用可能 (JPEG/GIF/PNG サポート)
     * PHP の exif 拡張モジュールを使用可能
     * PHP の mcrypt 拡張モジュールの使用を推奨
-    * PHP の APC 拡張モジュールの使用を推奨
+    * PHP の APC (または APCu) 拡張モジュールの使用を推奨
 データベースサーバ
   MySQL4.1以降（5.1 以降を推奨）
   

From 7581358fc046785343e728d2d7f2b2023a030134 Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Mon, 22 Aug 2016 16:20:48 +0900
Subject: [PATCH 542/630] (refs #3994, BP from  #3993) changed url of
 cmd-amazon from http://amazon.openpne.jp/ to https://amazon.openpne.jp/

---
 web/cmd/amazon.co.jp.js     | 2 +-
 web/cmd/www.amazon.co.jp.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/cmd/amazon.co.jp.js b/web/cmd/amazon.co.jp.js
index 1d33d28b6..d26475246 100644
--- a/web/cmd/amazon.co.jp.js
+++ b/web/cmd/amazon.co.jp.js
@@ -33,7 +33,7 @@ function url2cmd(url)
 
 function main(id, tag)
 {
-    var url = 'http://amazon.openpne.jp/?id=' + id;
+    var url = 'https://amazon.openpne.jp/?id=' + id;
     if (tag) {
         url += '&tag=' + tag;
     }
diff --git a/web/cmd/www.amazon.co.jp.js b/web/cmd/www.amazon.co.jp.js
index 1d33d28b6..d26475246 100644
--- a/web/cmd/www.amazon.co.jp.js
+++ b/web/cmd/www.amazon.co.jp.js
@@ -33,7 +33,7 @@ function url2cmd(url)
 
 function main(id, tag)
 {
-    var url = 'http://amazon.openpne.jp/?id=' + id;
+    var url = 'https://amazon.openpne.jp/?id=' + id;
     if (tag) {
         url += '&tag=' + tag;
     }

From 1ccd2ec239fb5533dd008a74ded3ebc80be2f37a Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Tue, 23 Aug 2016 17:58:33 +0900
Subject: [PATCH 543/630] (refs #3854, BP from #2430) added Validator for
 Postal Code.

---
 apps/pc_frontend/i18n/messages.ja.xml      | 4 ++++
 lib/validator/opValidatorProfile.class.php | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/apps/pc_frontend/i18n/messages.ja.xml b/apps/pc_frontend/i18n/messages.ja.xml
index 008de66ae..c11a40a29 100644
--- a/apps/pc_frontend/i18n/messages.ja.xml
+++ b/apps/pc_frontend/i18n/messages.ja.xml
@@ -1411,6 +1411,10 @@
         <source>Private&lt;br /&gt;Member</source>
         <target>非公開&lt;br /&gt;メンバー</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>Does not match the Postal Code format (000-0000).</source>
+        <target>「000-0000」の形式で入力してください。</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/lib/validator/opValidatorProfile.class.php b/lib/validator/opValidatorProfile.class.php
index 0b42dde1e..18c4d6d31 100644
--- a/lib/validator/opValidatorProfile.class.php
+++ b/lib/validator/opValidatorProfile.class.php
@@ -59,6 +59,12 @@ protected function doClean($value)
       }
     }
 
+    if ('op_preset_postal_code' === $this->profile->getName())
+    {
+      $validator = new sfValidatorRegex(array('pattern' => '/^\d{3}-\d{4}$/'), array('invalid' => 'Does not match the Postal Code format (000-0000).'));
+      $clean['value'] = $validator->clean($value['value']);
+    }
+
     return $clean;
   }
 }

From 71cd6f0ea6ad25f0e0be163d9bc3b07ab6457cb6 Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Fri, 26 Aug 2016 15:08:38 +0900
Subject: [PATCH 544/630] (refs #3854, BP from #2430) changed validator of
 postal code in the preset profile format.

---
 apps/pc_frontend/i18n/messages.ja.xml      | 4 ----
 lib/config/config/preset_profile.yml       | 3 ++-
 lib/validator/opValidatorProfile.class.php | 6 ------
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/apps/pc_frontend/i18n/messages.ja.xml b/apps/pc_frontend/i18n/messages.ja.xml
index c11a40a29..008de66ae 100644
--- a/apps/pc_frontend/i18n/messages.ja.xml
+++ b/apps/pc_frontend/i18n/messages.ja.xml
@@ -1411,10 +1411,6 @@
         <source>Private&lt;br /&gt;Member</source>
         <target>非公開&lt;br /&gt;メンバー</target>
       </trans-unit>
-      <trans-unit id="">
-        <source>Does not match the Postal Code format (000-0000).</source>
-        <target>「000-0000」の形式で入力してください。</target>
-      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/lib/config/config/preset_profile.yml b/lib/config/config/preset_profile.yml
index 8b2459f63..254be5cb2 100644
--- a/lib/config/config/preset_profile.yml
+++ b/lib/config/config/preset_profile.yml
@@ -162,7 +162,8 @@ postal_code:
   Name: "postal_code"
   Caption: "Postal Code"
   FormType: "text"
-  ValueType: "string"
+  ValueType: "regexp"
+  ValueRegexp: "/^\d{3}-\d{4}$/"
   IsRegist: true
   IsConfig: true
   IsSearch: true
diff --git a/lib/validator/opValidatorProfile.class.php b/lib/validator/opValidatorProfile.class.php
index 18c4d6d31..0b42dde1e 100644
--- a/lib/validator/opValidatorProfile.class.php
+++ b/lib/validator/opValidatorProfile.class.php
@@ -59,12 +59,6 @@ protected function doClean($value)
       }
     }
 
-    if ('op_preset_postal_code' === $this->profile->getName())
-    {
-      $validator = new sfValidatorRegex(array('pattern' => '/^\d{3}-\d{4}$/'), array('invalid' => 'Does not match the Postal Code format (000-0000).'));
-      $clean['value'] = $validator->clean($value['value']);
-    }
-
     return $clean;
   }
 }

From 8f2a903df324dd739c190a05869023bdbbc2d742 Mon Sep 17 00:00:00 2001
From: Kousuke Ebihara <ebihara@tejimaya.com>
Date: Wed, 27 Oct 2010 19:06:23 +0900
Subject: [PATCH 545/630] added the some consideration of wrong-checking in
 CodingStandard (refs #4003, BP from #1744)

(cherry picked from commit 6ca5dcd853b3594685a5274bf7d526d48bc9eaf8)
---
 .../OpenPNE3/OpenPNE3CodingStandard.php       |   4 +
 .../Sniffs/Arrays/ArrayDeclarationSniff.php   |   3 +
 .../Sniffs/Commenting/ClassCommentSniff.php   | 168 ++++++++++++++++++
 .../Functions/FunctionCallSignatureSniff.php  |  23 +++
 .../NamingConventions/ValidClassNameSniff.php |  19 +-
 .../WhiteSpace/ControlSignatureSniff.php      |  32 ----
 6 files changed, 214 insertions(+), 35 deletions(-)
 create mode 100644 data/CodingStandard/OpenPNE3/Sniffs/Functions/FunctionCallSignatureSniff.php
 delete mode 100644 data/CodingStandard/OpenPNE3/Sniffs/WhiteSpace/ControlSignatureSniff.php

diff --git a/data/CodingStandard/OpenPNE3/OpenPNE3CodingStandard.php b/data/CodingStandard/OpenPNE3/OpenPNE3CodingStandard.php
index 6cb9caaee..7b68afe69 100644
--- a/data/CodingStandard/OpenPNE3/OpenPNE3CodingStandard.php
+++ b/data/CodingStandard/OpenPNE3/OpenPNE3CodingStandard.php
@@ -30,6 +30,9 @@ public function getIncludedSniffs()
       'Squiz/Sniffs/Scope/MemberVarScopeSniff.php',
       'Squiz/Sniffs/Scope/MethodScopeSniff.php',
       'Squiz/Sniffs/Strings/DoubleQuoteUsageSniff.php',
+
+      'Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php',
+      'Generic/Sniffs/Functions/OpeningFunctionBraceBsdAllmanSniff.php'
     );
   }
 
@@ -38,6 +41,7 @@ public function getExcludedSniffs()
     return array(
       'PEAR/Sniffs/ControlStructures/ControlSignatureSniff.php',
       'PEAR/Sniffs/WhiteSpace/ScopeClosingBraceSniff.php',
+      'PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php',
       'Zend/Sniffs/NamingConventions/ValidVariableNameSniff.php',
       'Squiz/Sniffs/Functions/GlobalFunctionSniff.php',
     );
diff --git a/data/CodingStandard/OpenPNE3/Sniffs/Arrays/ArrayDeclarationSniff.php b/data/CodingStandard/OpenPNE3/Sniffs/Arrays/ArrayDeclarationSniff.php
index 9ac3068c2..9e18551a7 100644
--- a/data/CodingStandard/OpenPNE3/Sniffs/Arrays/ArrayDeclarationSniff.php
+++ b/data/CodingStandard/OpenPNE3/Sniffs/Arrays/ArrayDeclarationSniff.php
@@ -23,6 +23,9 @@ public function register()
 
   public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
   {
+    // this class is not stable yet...
+    return null;
+
     $tokens = $phpcsFile->getTokens();
 
     $arrayStart = $tokens[$stackPtr]['parenthesis_opener'];
diff --git a/data/CodingStandard/OpenPNE3/Sniffs/Commenting/ClassCommentSniff.php b/data/CodingStandard/OpenPNE3/Sniffs/Commenting/ClassCommentSniff.php
index a126e4117..0eadc52d8 100644
--- a/data/CodingStandard/OpenPNE3/Sniffs/Commenting/ClassCommentSniff.php
+++ b/data/CodingStandard/OpenPNE3/Sniffs/Commenting/ClassCommentSniff.php
@@ -16,6 +16,174 @@
  */
 class OpenPNE3_Sniffs_Commenting_ClassCommentSniff extends Squiz_Sniffs_Commenting_ClassCommentSniff
 {
+  public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
+  {
+    if (
+      // myUser.class.php should be excluded
+      false !== strpos($phpcsFile->getFilename(), 'myUser.class.php')
+    )
+    {
+      return null;
+    }
+
+    $this->currentFile = $phpcsFile;
+
+    $tokens = $phpcsFile->getTokens();
+    $find   = array (T_ABSTRACT, T_WHITESPACE, T_FINAL);
+
+    // Extract the class comment docblock.
+    $commentEnd = $phpcsFile->findPrevious($find, ($stackPtr - 1), null, true);
+
+    if ($commentEnd !== false && $tokens[$commentEnd]['code'] === T_COMMENT)
+    {
+      $phpcsFile->addError('You must use "/**" style comments for a class comment', $stackPtr);
+
+      return;
+    } else if ($commentEnd === false || $tokens[$commentEnd]['code'] !== T_DOC_COMMENT)
+    {
+      $phpcsFile->addError('Missing class doc comment', $stackPtr);
+
+      return;
+    }
+
+    $commentStart = ($phpcsFile->findPrevious(T_DOC_COMMENT, ($commentEnd - 1), null, true) + 1);
+    $commentNext  = $phpcsFile->findPrevious(T_WHITESPACE, ($commentEnd + 1), $stackPtr, false, $phpcsFile->eolChar);
+
+    // Distinguish file and class comment.
+    $prevClassToken = $phpcsFile->findPrevious(T_CLASS, ($stackPtr - 1));
+    if ($prevClassToken === false)
+    {
+      // This is the first class token in this file, need extra checks.
+      $prevNonComment = $phpcsFile->findPrevious(T_DOC_COMMENT, ($commentStart - 1), null, true);
+      if ($prevNonComment !== false)
+      {
+        $prevComment = $phpcsFile->findPrevious(T_DOC_COMMENT, ($prevNonComment - 1));
+        if ($prevComment === false)
+        {
+          // There is only 1 doc comment between open tag and class token.
+          $newlineToken = $phpcsFile->findNext(T_WHITESPACE, ($commentEnd + 1), $stackPtr, false, $phpcsFile->eolChar);
+          if ($newlineToken !== false)
+          {
+            $newlineToken = $phpcsFile->findNext(T_WHITESPACE, ($newlineToken + 1), $stackPtr, false, $phpcsFile->eolChar);
+            if ($newlineToken !== false)
+            {
+              // Blank line between the class and the doc block.
+              // The doc block is most likely a file comment.
+              $phpcsFile->addError('Missing class doc comment', ($stackPtr + 1));
+
+              return;
+            }
+          }//end if
+        }//end if
+
+        // Exactly one blank line before the class comment.
+        $prevTokenEnd = $phpcsFile->findPrevious(T_WHITESPACE, ($commentStart - 1), null, true);
+        if ($prevTokenEnd !== false)
+        {
+          $blankLineBefore = 0;
+          for ($i = ($prevTokenEnd + 1); $i < $commentStart; $i++)
+          {
+            if ($tokens[$i]['code'] === T_WHITESPACE && $tokens[$i]['content'] === $phpcsFile->eolChar)
+            {
+              $blankLineBefore++;
+            }
+          }
+
+          if ($blankLineBefore !== 2)
+          {
+            $error = 'There must be exactly one blank line before the class comment';
+            $phpcsFile->addError($error, ($commentStart - 1));
+          }
+        }
+      }//end if
+    }//end if
+
+    $commentString = $phpcsFile->getTokensAsString($commentStart, ($commentEnd - $commentStart + 1));
+
+    // Parse the class comment docblock.
+    try
+    {
+      $this->commentParser = new PHP_CodeSniffer_CommentParser_ClassCommentParser($commentString, $phpcsFile);
+      $this->commentParser->parse();
+    }
+    catch (PHP_CodeSniffer_CommentParser_ParserException $e)
+    {
+      $line = ($e->getLineWithinComment() + $commentStart);
+      $phpcsFile->addError($e->getMessage(), $line);
+
+      return;
+    }
+
+    $comment = $this->commentParser->getComment();
+    if (is_null($comment) === true)
+    {
+      $error = 'Class doc comment is empty';
+      $phpcsFile->addError($error, $commentStart);
+
+      return;
+    }
+
+    // The first line of the comment should just be the /** code.
+    $eolPos    = strpos($commentString, $phpcsFile->eolChar);
+    $firstLine = substr($commentString, 0, $eolPos);
+    if ($firstLine !== '/**')
+    {
+      $error = 'The open comment tag must be the only content on the line';
+      $phpcsFile->addError($error, $commentStart);
+    }
+
+    // Check for a comment description.
+    $short = rtrim($comment->getShortComment(), $phpcsFile->eolChar);
+    if (trim($short) === '')
+    {
+      $error = 'Missing short description in class doc comment';
+      $phpcsFile->addError($error, $commentStart);
+
+      return;
+    }
+
+    // No extra newline before short description.
+    $newlineCount = 0;
+    $newlineSpan  = strspn($short, $phpcsFile->eolChar);
+    if ($short !== '' && $newlineSpan > 0)
+    {
+      $line  = ($newlineSpan > 1) ? 'newlines' : 'newline';
+      $error = "Extra $line found before class comment short description";
+      $phpcsFile->addError($error, ($commentStart + 1));
+    }
+
+    // Exactly one blank line before tags.
+    $tags = $this->commentParser->getTagOrders();
+    if (count($tags) > 1)
+    {
+      $newlineSpan = $comment->getNewlineAfter();
+      if ($newlineSpan !== 2)
+      {
+        $error = 'There must be exactly one blank line before the tags in class comment';
+        if ($long !== '')
+        {
+          $newlineCount += (substr_count($long, $phpcsFile->eolChar) - $newlineSpan + 1);
+        }
+
+        $phpcsFile->addError($error, ($commentStart + $newlineCount));
+        $short = rtrim($short, $phpcsFile->eolChar.' ');
+      }
+    }
+
+    // Check for unknown/deprecated tags.
+    $unknownTags = $this->commentParser->getUnknown();
+    foreach ($unknownTags as $errorTag)
+    {
+      $error = "@$errorTag[tag] tag is not allowed in class comment";
+      $phpcsFile->addWarning($error, ($commentStart + $errorTag['line']));
+
+      return;
+    }
+
+    // Check each tag.
+    $this->processTags($commentStart, $commentEnd);
+  }
+
   protected function processTags($commentStart, $commentEnd)
   {
     $foundTags = $this->commentParser->getTagOrders();
diff --git a/data/CodingStandard/OpenPNE3/Sniffs/Functions/FunctionCallSignatureSniff.php b/data/CodingStandard/OpenPNE3/Sniffs/Functions/FunctionCallSignatureSniff.php
new file mode 100644
index 000000000..b59f0c6b3
--- /dev/null
+++ b/data/CodingStandard/OpenPNE3/Sniffs/Functions/FunctionCallSignatureSniff.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * This file is part of the OpenPNE package.
+ * (c) OpenPNE Project (http://www.openpne.jp/)
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file and the NOTICE file that were distributed with this source code.
+ */
+
+/**
+ * OpenPNE3_Sniffs_Functions_FunctionCallSignatureSniff
+ *
+ * @package    OpenPNE
+ * @author     Kousuke Ebihara <ebihara@php.net>
+ */
+class OpenPNE3_Sniffs_Functions_FunctionCallSignatureSniff extends PEAR_Sniffs_Functions_FunctionCallSignatureSniff
+{
+  public function processMultiLineCall(PHP_CodeSniffer_File $phpcsFile, $stackPtr, $openBracket, $tokens)
+  {
+    return null;
+  }
+}
diff --git a/data/CodingStandard/OpenPNE3/Sniffs/NamingConventions/ValidClassNameSniff.php b/data/CodingStandard/OpenPNE3/Sniffs/NamingConventions/ValidClassNameSniff.php
index 0b3a420d9..6043ea735 100644
--- a/data/CodingStandard/OpenPNE3/Sniffs/NamingConventions/ValidClassNameSniff.php
+++ b/data/CodingStandard/OpenPNE3/Sniffs/NamingConventions/ValidClassNameSniff.php
@@ -18,9 +18,22 @@ class OpenPNE3_Sniffs_NamingConventions_ValidClassNameSniff extends Squiz_Sniffs
 {
   public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
   {
-    if (false !== strpos($phpcsFile->getFilename(), 'model')
-       || false !== strpos($phpcsFile->getFilename(), 'form') 
-       || false !== strpos($phpcsFile->getFilename(), 'filter') 
+    if (
+      // sfOpenPNE... classes are already replaced to op... classes
+      // But these are still in the source code for BC reason.
+      false !== strpos($phpcsFile->getFilename(), 'sfOpenPNE')
+
+      // don't check auto-generated files
+      || false !== strpos($phpcsFile->getFilename(), 'model')
+      || false !== strpos($phpcsFile->getFilename(), 'form')
+      || false !== strpos($phpcsFile->getFilename(), 'filter')
+
+      // myUser.class.php should be excluded
+      || false !== strpos($phpcsFile->getFilename(), 'myUser.class.php')
+      // actioon classes should be excluded
+      || false !== strpos($phpcsFile->getFilename(), 'actions.class.php')
+      || false !== strpos($phpcsFile->getFilename(), 'components.class.php')
+      || false !== strpos($phpcsFile->getFilename(), 'Action.class.php')
     )
     {
       return null;
diff --git a/data/CodingStandard/OpenPNE3/Sniffs/WhiteSpace/ControlSignatureSniff.php b/data/CodingStandard/OpenPNE3/Sniffs/WhiteSpace/ControlSignatureSniff.php
deleted file mode 100644
index d89fd6268..000000000
--- a/data/CodingStandard/OpenPNE3/Sniffs/WhiteSpace/ControlSignatureSniff.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * This file is part of the OpenPNE package.
- * (c) OpenPNE Project (http://www.openpne.jp/)
- *
- * For the full copyright and license information, please view the LICENSE
- * file and the NOTICE file that were distributed with this source code.
- */
-
-/**
- * OpenPNE3_Sniffs_WhiteSpace_ControlSignatureSniff
- *
- * @package    OpenPNE
- * @author     Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class OpenPNE3_Sniffs_WhiteSpace_ControlSignatureSniff extends PHP_CodeSniffer_Standards_AbstractPatternSniff
-{
-  protected function getPatterns()
-  {
-    return array(
-       'tryEOL{EOL...}EOLcatch (...)EOL{EOL',
-       'doEOL{EOL...}EOLwhile (...);EOL',
-       'while (...)EOL{EOL',
-       'for (...)EOL{EOL',
-       'if (...)EOL{EOL',
-       'foreach (...)EOL{EOL',
-       '}EOLelseif (...)EOL{EOL',
-       '}EOLelseEOL{EOL',
-    );
-  }
-}

From 360be965397e585dbfe558ead71bb83bc5d64221 Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 8 Sep 2016 14:13:18 +0900
Subject: [PATCH 546/630] version 3.8.21

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 43dd3f643..fe2025588 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.21-dev');
+  define('OPENPNE_VERSION', '3.8.21');
 }

From 9b6a7ca2b610a1812972844953d7d4e363c4d0bc Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 8 Sep 2016 14:16:33 +0900
Subject: [PATCH 547/630] started to development of OpenPNE 3.8.22

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index fe2025588..ab0d1e9a1 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.21');
+  define('OPENPNE_VERSION', '3.8.22-dev');
 }

From 6aec779bab2df02854a12387320f3f61c97880ba Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Mon, 22 Aug 2016 19:00:46 +0900
Subject: [PATCH 548/630] fix leakage of authenticated session id when
 obtaining an OAuth access token (fixes #2974)

---
 .../modules/oauth/actions/actions.class.php      | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/apps/pc_frontend/modules/oauth/actions/actions.class.php b/apps/pc_frontend/modules/oauth/actions/actions.class.php
index 4a656e040..5c8d9fb88 100644
--- a/apps/pc_frontend/modules/oauth/actions/actions.class.php
+++ b/apps/pc_frontend/modules/oauth/actions/actions.class.php
@@ -17,6 +17,8 @@
  */
 class oauthActions extends opOAuthTokenAction
 {
+  protected $authorizedMemberId = null;
+
   protected function getTokenModelName()
   {
     return 'OAuthMemberToken';
@@ -27,15 +29,21 @@ public function setRecordTemplate(Doctrine_Record $record = null)
     $class = $this->getTokenModelName();
     $record = new $class();
 
-    $record->setMemberId($this->getUser()->getMemberId());
+    if ($this->authorizedMemberId !== null)
+    {
+      $record->setMemberId($this->authorizedMemberId);
+    }
 
     parent::setRecordTemplate($record);
   }
 
   public function setQueryTemplate(Doctrine_Query $q = null)
   {
-    $q = $this->getTokenTable()->createQuery()
-      ->andWhere('member_id = ?', $this->getUser()->getMemberId());
+    if ($this->authorizedMemberId !== null)
+    {
+      $q = $this->getTokenTable()->createQuery()
+        ->andWhere('member_id = ?', $this->authorizedMemberId);
+    }
 
     parent::setQueryTemplate($q);
   }
@@ -84,7 +92,7 @@ public function executeAccessToken(sfWebRequest $request)
     $this->forward404Unless($this->information->getIsActive());
     $this->forward404Unless($this->information->getVerifier() === $authRequest->get_parameter('oauth_verifier'));
 
-    $this->getUser()->setMemberId($this->information->getMemberId());
+    $this->authorizedMemberId = $this->information->getMemberId();
 
     $token = $this->getServer()->fetch_access_token($authRequest);
 

From 9012a234b2a9090e74fe4f2924b3d1a6077e5c6d Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Thu, 1 Sep 2016 12:31:23 +0900
Subject: [PATCH 549/630] strictly null check for o_auth_member_token.member_id
 (refs #2974)

---
 apps/pc_frontend/modules/oauth/actions/actions.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/pc_frontend/modules/oauth/actions/actions.class.php b/apps/pc_frontend/modules/oauth/actions/actions.class.php
index 5c8d9fb88..33ee1d819 100644
--- a/apps/pc_frontend/modules/oauth/actions/actions.class.php
+++ b/apps/pc_frontend/modules/oauth/actions/actions.class.php
@@ -93,6 +93,7 @@ public function executeAccessToken(sfWebRequest $request)
     $this->forward404Unless($this->information->getVerifier() === $authRequest->get_parameter('oauth_verifier'));
 
     $this->authorizedMemberId = $this->information->getMemberId();
+    $this->forward404Unless($this->authorizedMemberId !== null); // o_auth_member_token.member_id is nullable
 
     $token = $this->getServer()->fetch_access_token($authRequest);
 

From 69bae47b62cedc3f5fb97dcfd06c892af09e0f3f Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 24 Mar 2016 15:51:17 +0900
Subject: [PATCH 550/630] fixes that /activity/post.json doesn't check
 community member role when post activity to community (fixes #3920)

---
 .../activity/actions/actions.class.php        | 10 ++++
 .../api/activityPostToCommunityTest.php       | 54 +++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 test/functional/api/activityPostToCommunityTest.php

diff --git a/apps/api/modules/activity/actions/actions.class.php b/apps/api/modules/activity/actions/actions.class.php
index bdade2afe..ed1310be6 100644
--- a/apps/api/modules/activity/actions/actions.class.php
+++ b/apps/api/modules/activity/actions/actions.class.php
@@ -191,6 +191,8 @@ public function executePost(sfWebRequest $request)
         $this->forward400('target_id parameter not specified.');
       }
 
+      $this->checkCommunityMember($request['target_id']);
+
       $options['foreign_table'] = 'community';
       $options['foreign_id'] = $request['target_id'];
     }
@@ -270,4 +272,12 @@ public function executeMentions(sfWebRequest $request)
 
     $this->setTemplate('array');
   }
+
+  protected function checkCommunityMember($communityId)
+  {
+    $memberId = $this->getUser()->getMemberId();
+    $isCommunityMember = Doctrine_Core::getTable('CommunityMember')->isMember($memberId, $communityId);
+
+    $this->forward403Unless($isCommunityMember, 'You\'re not participate in this community.');
+  }
 }
diff --git a/test/functional/api/activityPostToCommunityTest.php b/test/functional/api/activityPostToCommunityTest.php
new file mode 100644
index 000000000..ec3893b36
--- /dev/null
+++ b/test/functional/api/activityPostToCommunityTest.php
@@ -0,0 +1,54 @@
+<?php
+
+$executeLoader = false;
+require_once __DIR__.'/../../bootstrap/functional.php';
+require_once __DIR__.'/../../bootstrap/database.php';
+
+$numberOfTests = 4;
+$tester = new opTestFunctional(new opBrowser(), new lime_test($numberOfTests), array(
+  'doctrine' => 'sfTesterDoctrine',
+));
+
+$t = $tester->test();
+
+Doctrine_Core::getTable('SnsConfig')->set('enable_jsonapi', true);
+$apiKeyMember1 = Doctrine_Core::getTable('Member')->find(1)->getApiKey();
+
+if (in_array('opTimelinePlugin', ProjectConfiguration::getActive()->getPlugins()))
+{
+  // opTimelinePlugin breaks standard JSON APIs (activity/*.json)
+  $tester->test()->fail('unable to run tests if opTimelinePlugin is installed');
+  return;
+}
+
+$tester
+  ->info('/activity/post.json - community_id: 1')
+  ->post('/activity/post.json', array(
+    'apiKey' => $apiKeyMember1,
+    'target' => 'community',
+    'target_id' => '1',
+    'body' => 'hogehoge',
+  ))
+  ->isStatusCode(200)
+  ->with('doctrine')->check('ActivityData', array(
+    'member_id' => '1',
+    'foreign_table' => 'community',
+    'foreign_id' => '1',
+    'body' => 'hogehoge',
+  ), 1)
+
+  ->info('/activity/post.json - community_id: 2 (not participated)')
+  ->post('/activity/post.json', array(
+    'apiKey' => $apiKeyMember1,
+    'target' => 'community',
+    'target_id' => '2',
+    'body' => 'hogehoge',
+  ))
+  ->isStatusCode(403)
+  ->with('doctrine')->check('ActivityData', array(
+    'member_id' => '1',
+    'foreign_table' => 'community',
+    'foreign_id' => '2',
+    'body' => 'hogehoge',
+  ), 0)
+;

From f6509a90742c6c0f4100b373b176456b8b2840d8 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Thu, 14 Jul 2016 20:23:41 +0900
Subject: [PATCH 551/630] fix an error message in activity/post.json (refs
 #3920)

---
 apps/api/modules/activity/actions/actions.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/api/modules/activity/actions/actions.class.php b/apps/api/modules/activity/actions/actions.class.php
index ed1310be6..15f6804e9 100644
--- a/apps/api/modules/activity/actions/actions.class.php
+++ b/apps/api/modules/activity/actions/actions.class.php
@@ -278,6 +278,6 @@ protected function checkCommunityMember($communityId)
     $memberId = $this->getUser()->getMemberId();
     $isCommunityMember = Doctrine_Core::getTable('CommunityMember')->isMember($memberId, $communityId);
 
-    $this->forward403Unless($isCommunityMember, 'You\'re not participate in this community.');
+    $this->forward403Unless($isCommunityMember, 'You don\'t participate in this community.');
   }
 }

From 8763f26750c020193483b9200c6af23ae8e1493d Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Tue, 6 Sep 2016 18:36:45 +0900
Subject: [PATCH 552/630] fix HTTP header injection vulerability via
 SERVER_VERSION envirionment (fixes #3956)

---
 data/patches/t3956.patch                            | 13 +++++++++++++
 .../lib/config/sfFactoryConfigHandler.class.php     |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 data/patches/t3956.patch

diff --git a/data/patches/t3956.patch b/data/patches/t3956.patch
new file mode 100644
index 000000000..7fed8547a
--- /dev/null
+++ b/data/patches/t3956.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/vendor/symfony/lib/config/sfFactoryConfigHandler.class.php b/lib/vendor/symfony/lib/config/sfFactoryConfigHandler.class.php
+index 35e54459..b1615adf 100644
+--- a/lib/vendor/symfony/lib/config/sfFactoryConfigHandler.class.php
++++ b/lib/vendor/symfony/lib/config/sfFactoryConfigHandler.class.php
+@@ -95,7 +95,7 @@ class sfFactoryConfigHandler extends sfYamlConfigHandler
+           break;
+ 
+         case 'response':
+-          $instances[] = sprintf("  \$class = sfConfig::get('sf_factory_response', '%s');\n  \$this->factories['response'] = new \$class(\$this->dispatcher, sfConfig::get('sf_factory_response_parameters', array_merge(array('http_protocol' => isset(\$_SERVER['SERVER_PROTOCOL']) ? \$_SERVER['SERVER_PROTOCOL'] : null), %s)));", $class, var_export($parameters, true));
++          $instances[] = sprintf("  \$class = sfConfig::get('sf_factory_response', '%s');\n  \$this->factories['response'] = new \$class(\$this->dispatcher, sfConfig::get('sf_factory_response_parameters', array_merge(array('http_protocol' => 'HTTP/1.1'), %s)));", $class, var_export($parameters, true));
+           // TODO: this is a bit ugly, as it only works for sfWebRequest & sfWebResponse combination. see #3397
+           $instances[] = sprintf("  if (\$this->factories['request'] instanceof sfWebRequest \n      && \$this->factories['response'] instanceof sfWebResponse \n      && 'HEAD' == \$this->factories['request']->getMethod())\n  {  \n    \$this->factories['response']->setHeaderOnly(true);\n  }\n");
+           break;
diff --git a/lib/vendor/symfony/lib/config/sfFactoryConfigHandler.class.php b/lib/vendor/symfony/lib/config/sfFactoryConfigHandler.class.php
index 35e544597..b1615adf0 100644
--- a/lib/vendor/symfony/lib/config/sfFactoryConfigHandler.class.php
+++ b/lib/vendor/symfony/lib/config/sfFactoryConfigHandler.class.php
@@ -95,7 +95,7 @@ public function execute($configFiles)
           break;
 
         case 'response':
-          $instances[] = sprintf("  \$class = sfConfig::get('sf_factory_response', '%s');\n  \$this->factories['response'] = new \$class(\$this->dispatcher, sfConfig::get('sf_factory_response_parameters', array_merge(array('http_protocol' => isset(\$_SERVER['SERVER_PROTOCOL']) ? \$_SERVER['SERVER_PROTOCOL'] : null), %s)));", $class, var_export($parameters, true));
+          $instances[] = sprintf("  \$class = sfConfig::get('sf_factory_response', '%s');\n  \$this->factories['response'] = new \$class(\$this->dispatcher, sfConfig::get('sf_factory_response_parameters', array_merge(array('http_protocol' => 'HTTP/1.1'), %s)));", $class, var_export($parameters, true));
           // TODO: this is a bit ugly, as it only works for sfWebRequest & sfWebResponse combination. see #3397
           $instances[] = sprintf("  if (\$this->factories['request'] instanceof sfWebRequest \n      && \$this->factories['response'] instanceof sfWebResponse \n      && 'HEAD' == \$this->factories['request']->getMethod())\n  {  \n    \$this->factories['response']->setHeaderOnly(true);\n  }\n");
           break;

From 8d14c89878eea2ca31aa704070c32746dab86e59 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Fri, 16 Sep 2016 16:56:12 +0900
Subject: [PATCH 553/630] sfWebResponse::copyProperties() always use 'HTTP/1.1'
 as http_protocol option (refs #3956)

---
 data/patches/t3956.patch                          | 15 +++++++++++++++
 .../symfony/lib/response/sfWebResponse.class.php  |  4 +---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/data/patches/t3956.patch b/data/patches/t3956.patch
index 7fed8547a..1a1432081 100644
--- a/data/patches/t3956.patch
+++ b/data/patches/t3956.patch
@@ -11,3 +11,18 @@ index 35e54459..b1615adf 100644
            // TODO: this is a bit ugly, as it only works for sfWebRequest & sfWebResponse combination. see #3397
            $instances[] = sprintf("  if (\$this->factories['request'] instanceof sfWebRequest \n      && \$this->factories['response'] instanceof sfWebResponse \n      && 'HEAD' == \$this->factories['request']->getMethod())\n  {  \n    \$this->factories['response']->setHeaderOnly(true);\n  }\n");
            break;
+diff --git a/lib/vendor/symfony/lib/response/sfWebResponse.class.php b/lib/vendor/symfony/lib/response/sfWebResponse.class.php
+index 3aa15ea2..627b7223 100644
+--- a/lib/vendor/symfony/lib/response/sfWebResponse.class.php
++++ b/lib/vendor/symfony/lib/response/sfWebResponse.class.php
+@@ -796,9 +796,7 @@ class sfWebResponse extends sfResponse
+     $this->javascripts = $response->getJavascripts(self::RAW);
+     $this->slots       = $response->getSlots();
+ 
+-    // HTTP protocol must be from the current request
+-    // this fix is not nice but that's the only way to fix it and keep BC (see #9254)
+-    $this->options['http_protocol'] = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0';
++    $this->options['http_protocol'] = 'HTTP/1.1';
+   }
+ 
+   /**
diff --git a/lib/vendor/symfony/lib/response/sfWebResponse.class.php b/lib/vendor/symfony/lib/response/sfWebResponse.class.php
index 3aa15ea2d..627b72236 100644
--- a/lib/vendor/symfony/lib/response/sfWebResponse.class.php
+++ b/lib/vendor/symfony/lib/response/sfWebResponse.class.php
@@ -796,9 +796,7 @@ public function copyProperties(sfWebResponse $response)
     $this->javascripts = $response->getJavascripts(self::RAW);
     $this->slots       = $response->getSlots();
 
-    // HTTP protocol must be from the current request
-    // this fix is not nice but that's the only way to fix it and keep BC (see #9254)
-    $this->options['http_protocol'] = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0';
+    $this->options['http_protocol'] = 'HTTP/1.1';
   }
 
   /**

From b35b71aac1a6d45bf14f2e567a5c0e737ab0d765 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Mon, 25 Jul 2016 15:55:53 +0900
Subject: [PATCH 554/630] don't persist session data in api application (fixes
 #3972)

---
 apps/api/config/factories.yml               | 10 ++++------
 lib/config/opProjectConfiguration.class.php |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/apps/api/config/factories.yml b/apps/api/config/factories.yml
index 9a46337b2..1e872a86e 100644
--- a/apps/api/config/factories.yml
+++ b/apps/api/config/factories.yml
@@ -83,12 +83,10 @@ all:
 #      logging:         %SF_LOGGING_ENABLED%
 #      use_flash:       true
 #      default_culture: %SF_DEFAULT_CULTURE%
-#
-#  storage:
-#    class: sfSessionStorage
-#    param:
-#      session_name: symfony
-#
+
+  storage:
+    class: sfNoStorage
+
 #  view_cache:
 #    class: sfFileCache
 #    param:
diff --git a/lib/config/opProjectConfiguration.class.php b/lib/config/opProjectConfiguration.class.php
index 5c93186b1..c591c0712 100644
--- a/lib/config/opProjectConfiguration.class.php
+++ b/lib/config/opProjectConfiguration.class.php
@@ -161,7 +161,7 @@ protected function setOpenPNEConfiguration()
       opToolkit::writeCacheFile($opConfigCachePath, '<?php return '.var_export($config, true).';');
     }
 
-    if ('test' !== sfConfig::get('sf_environment'))
+    if ('test' !== sfConfig::get('sf_environment') && 'api' !== sfConfig::get('sf_app'))
     {
       $this->configureSessionStorage($config['session_storage']['name'], (array)$config['session_storage']['options']);
     }

From 0a6602fa814ac26d2e8530412ef812874504d76e Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Mon, 5 Sep 2016 18:46:28 +0900
Subject: [PATCH 555/630] =?UTF-8?q?(fixed=20#4030,=20BP=20from=20#3966)=20?=
 =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=83=80=E3=82=A6=E3=83=B3?=
 =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=83=89=E6=99=82=E3=81=AE=E6=97=A5=E6=9C=AC?=
 =?UTF-8?q?=E8=AA=9E=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E5=90=8D=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E5=8C=96=E3=81=91=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/util/opToolkit.class.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/util/opToolkit.class.php b/lib/util/opToolkit.class.php
index 61fb77134..119e2961a 100644
--- a/lib/util/opToolkit.class.php
+++ b/lib/util/opToolkit.class.php
@@ -343,7 +343,9 @@ static public function fileDownload($original_filename, $bin)
     }
     $original_filename = str_replace(array("\r", "\n"), '', $original_filename);
 
-    header('Content-Disposition: attachment; filename="'.$original_filename.'"');
+    $encoded_filename = rawurlencode($original_filename);
+    header('Content-Disposition: attachment; filename="' . $encoded_filename . '"; filename*=utf-8\'\'' . $encoded_filename);
+
     header('Content-Length: '.strlen($bin));
     header('Content-Type: application/octet-stream');
 

From 7ed80ecddb659347776cdbb4f48480da488a7c83 Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Wed, 5 Oct 2016 16:03:53 +0900
Subject: [PATCH 556/630] =?UTF-8?q?(fixed=20#4030,=20BP=20from=20#3966)=20?=
 =?UTF-8?q?filename=3D"..."=20=E3=81=ABURL=20=E3=82=A8=E3=83=B3=E3=82=B3?=
 =?UTF-8?q?=E3=83=BC=E3=83=89=E3=82=92=E6=96=BD=E3=81=95=E3=81=AA=E3=81=84?=
 =?UTF-8?q?=E7=8A=B6=E6=85=8B=E3=81=AE=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?=
 =?UTF-8?q?=E5=90=8D=E3=82=92=E3=80=81filename*=3Dutf-8...=20=E3=81=ABURL?=
 =?UTF-8?q?=20=E3=82=A8=E3=83=B3=E3=82=B3=E3=83=BC=E3=83=89=E3=81=95?=
 =?UTF-8?q?=E3=82=8C=E3=81=9F=20UTF-8=20=E3=81=AE=E3=83=95=E3=82=A1?=
 =?UTF-8?q?=E3=82=A4=E3=83=AB=E5=90=8D=20=E3=82=92=E8=A8=AD=E5=AE=9A?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/util/opToolkit.class.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/util/opToolkit.class.php b/lib/util/opToolkit.class.php
index 119e2961a..6f0850324 100644
--- a/lib/util/opToolkit.class.php
+++ b/lib/util/opToolkit.class.php
@@ -338,13 +338,14 @@ public static function arrayMapRecursive($callback, $array)
  */
   static public function fileDownload($original_filename, $bin)
   {
+    $filename = $original_filename;
     if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false) {
-      $original_filename = mb_convert_encoding($original_filename, 'SJIS', 'UTF-8');
+      $filename = mb_convert_encoding($filename, 'SJIS', 'UTF-8');
     }
-    $original_filename = str_replace(array("\r", "\n"), '', $original_filename);
+    $filename = str_replace(array("\r", "\n"), '', $filename);
 
     $encoded_filename = rawurlencode($original_filename);
-    header('Content-Disposition: attachment; filename="' . $encoded_filename . '"; filename*=utf-8\'\'' . $encoded_filename);
+    header('Content-Disposition: attachment; filename="' . $filename . '"; filename*=utf-8\'\'' . $encoded_filename);
 
     header('Content-Length: '.strlen($bin));
     header('Content-Type: application/octet-stream');

From 819bb89821898825ab8c9826cf3070119b38dec5 Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Wed, 5 Oct 2016 16:34:13 +0900
Subject: [PATCH 557/630] =?UTF-8?q?(fixed=20#4030,=20BP=20from=20#3966)=20?=
 =?UTF-8?q?=E6=9C=80=E5=88=9D=E3=81=AB=E6=94=B9=E8=A1=8C=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E3=82=92=E9=99=A4=E5=8E=BB=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/util/opToolkit.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/util/opToolkit.class.php b/lib/util/opToolkit.class.php
index 6f0850324..ca64dacd8 100644
--- a/lib/util/opToolkit.class.php
+++ b/lib/util/opToolkit.class.php
@@ -338,11 +338,12 @@ public static function arrayMapRecursive($callback, $array)
  */
   static public function fileDownload($original_filename, $bin)
   {
+    $original_filename = str_replace(array("\r", "\n"), '', $original_filename);
+
     $filename = $original_filename;
     if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false) {
       $filename = mb_convert_encoding($filename, 'SJIS', 'UTF-8');
     }
-    $filename = str_replace(array("\r", "\n"), '', $filename);
 
     $encoded_filename = rawurlencode($original_filename);
     header('Content-Disposition: attachment; filename="' . $filename . '"; filename*=utf-8\'\'' . $encoded_filename);

From 8240347c6012cde0ccf9f164c0c949c3b4ea8787 Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Fri, 7 Oct 2016 17:19:46 +0900
Subject: [PATCH 558/630] =?UTF-8?q?(fixed=20#4030,=20BP=20from=20#3966)=20?=
 =?UTF-8?q?filename=20=E3=81=AB=E3=82=82URL=E3=82=A8=E3=83=B3=E3=82=B3?=
 =?UTF-8?q?=E3=83=BC=E3=83=89=E3=81=97=E3=81=9FUTF-8=E3=81=AE=E3=83=95?=
 =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E5=90=8D=E3=82=92=E8=A8=AD=E5=AE=9A?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/util/opToolkit.class.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/lib/util/opToolkit.class.php b/lib/util/opToolkit.class.php
index ca64dacd8..e696a162f 100644
--- a/lib/util/opToolkit.class.php
+++ b/lib/util/opToolkit.class.php
@@ -339,15 +339,9 @@ public static function arrayMapRecursive($callback, $array)
   static public function fileDownload($original_filename, $bin)
   {
     $original_filename = str_replace(array("\r", "\n"), '', $original_filename);
-
-    $filename = $original_filename;
-    if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false) {
-      $filename = mb_convert_encoding($filename, 'SJIS', 'UTF-8');
-    }
-
     $encoded_filename = rawurlencode($original_filename);
-    header('Content-Disposition: attachment; filename="' . $filename . '"; filename*=utf-8\'\'' . $encoded_filename);
 
+    header('Content-Disposition: attachment; filename="' . $encoded_filename . '"; filename*=utf-8\'\'' . $encoded_filename);
     header('Content-Length: '.strlen($bin));
     header('Content-Type: application/octet-stream');
 

From 77a7b7d8a622b9680ae2491dd59799fbf8bb650e Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Tue, 26 Jul 2016 13:20:22 +0900
Subject: [PATCH 559/630] add opPluginManager::createPearEnvironment() method
 extracted from __construct() (refs #4039, BP from #3352)

(cherry picked from commit f971b5d49b85281faac06f2004a23206b2a14bbd)
---
 lib/plugin/opPluginManager.class.php | 29 +++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/lib/plugin/opPluginManager.class.php b/lib/plugin/opPluginManager.class.php
index cd63db593..9bbbe78a4 100644
--- a/lib/plugin/opPluginManager.class.php
+++ b/lib/plugin/opPluginManager.class.php
@@ -29,17 +29,7 @@ public function __construct(sfEventDispatcher $dispatcher, sfPearEnvironment $en
   {
     if (!$environment)
     {
-      $tz = @date_default_timezone_get();
-
-      $environment = new sfPearEnvironment($dispatcher, array(
-        'plugin_dir'            => sfConfig::get('sf_plugins_dir'),
-        'cache_dir'             => sfConfig::get('sf_cache_dir').'/.pear',
-        'web_dir'               => sfConfig::get('sf_web_dir'),
-        'rest_base_class'       => 'opPearRest',
-        'downloader_base_class' => 'opPluginDownloader',
-      ));
-
-      date_default_timezone_set($tz);
+      $environment = self::createPearEnvironment($dispatcher);
 
       $this->channel = $channel;
       if (!$this->channel)
@@ -138,6 +128,23 @@ public function uninstallModelFiles($plugin)
     }
   }
 
+  public static function createPearEnvironment(sfEventDispatcher $dispatcher)
+  {
+    $tz = @date_default_timezone_get();
+
+    $environment = new sfPearEnvironment($dispatcher, array(
+      'plugin_dir'            => sfConfig::get('sf_plugins_dir'),
+      'cache_dir'             => sfConfig::get('sf_cache_dir').'/.pear',
+      'web_dir'               => sfConfig::get('sf_web_dir'),
+      'rest_base_class'       => 'opPearRest',
+      'downloader_base_class' => 'opPluginDownloader',
+    ));
+
+    date_default_timezone_set($tz);
+
+    return $environment;
+  }
+
   public static function getPluginActivationList()
   {
     return array_merge(sfConfig::get('op_plugin_activation', array()), self::getPluginListForDatabase());

From 07842c48b515fa2edb6159f5358abbd17aac8446 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Tue, 26 Jul 2016 14:07:41 +0900
Subject: [PATCH 560/630] retrieve only cached package info for
 opPlugin::__construct() (fixes #4039, BP from #3352)

(cherry picked from commit 90f81ae9b8c6205431771bab5ab0e12ee097006e)
---
 lib/plugin/opPlugin.class.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/plugin/opPlugin.class.php b/lib/plugin/opPlugin.class.php
index cc3acdbd2..935ef6b44 100644
--- a/lib/plugin/opPlugin.class.php
+++ b/lib/plugin/opPlugin.class.php
@@ -48,8 +48,10 @@ private function __construct($pluginName, sfEventDispatcher $dispatcher)
     {
       try
       {
-        $manager = new opPluginManager($dispatcher);
-        $package = $manager->getEnvironment()->getRegistry()->getPackage($pluginName, opPluginManager::getDefaultPluginChannelServerName());
+        $environment = opPluginManager::createPearEnvironment($dispatcher);
+        $channel = opPluginManager::getDefaultPluginChannelServerName();
+
+        $package = $environment->getRegistry()->getPackage($pluginName, $channel);
         if ($package)
         {
           $this->version = $package->getVersion();

From fff968e8bbf514cad64bb3d3da1e7e3ca05fb59c Mon Sep 17 00:00:00 2001
From: sano <sano@tejimaya-no-MacBook-Air.local>
Date: Mon, 14 Nov 2016 17:14:02 +0900
Subject: [PATCH 561/630] delete the duplicate line 'web/cache/*' (fixes
 #4042,BP from #3354)

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 5bcf737bd..762924975 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 lib/form/doctrine/op*Plugin
-web/cache/*
 log/*
 plugins/op*
 !plugins/opAuthMailAddressPlugin

From 141d053ec09a7c35d9af64a523c011bdb77378f2 Mon Sep 17 00:00:00 2001
From: sano <sano@tejimaya-no-MacBook-Air.local>
Date: Wed, 16 Nov 2016 19:13:39 +0900
Subject: [PATCH 562/630] improved performance while join all members to
 community (fixes #4052, BP from #927)

---
 .../modules/community/actions/actions.class.php     | 12 +-----------
 lib/model/doctrine/Community.class.php              | 13 +++++++++++++
 lib/model/doctrine/CommunityMemberTable.class.php   |  1 +
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/apps/pc_backend/modules/community/actions/actions.class.php b/apps/pc_backend/modules/community/actions/actions.class.php
index 65ea8b76b..1bab63cc9 100644
--- a/apps/pc_backend/modules/community/actions/actions.class.php
+++ b/apps/pc_backend/modules/community/actions/actions.class.php
@@ -147,17 +147,7 @@ public function executeAddAllMember(sfWebRequest $request)
     if ($request->isMethod(sfWebRequest::POST))
     {
       $request->checkCSRFProtection();
-      $conn = Doctrine::getTable('Member')->getConnection();
-      $insertIds = $conn->fetchColumn('SELECT id FROM '.Doctrine::getTable('Member')->getTableName());
-      $ids = Doctrine::getTable('CommunityMember')->getMemberIdsByCommunityId($this->community->getId());
-      if (count($ids))
-      {
-        $insertIds = array_diff($insertIds, $ids);
-      }
-      foreach ($insertIds as $id)
-      {
-        Doctrine::getTable('CommunityMember')->join($id, $this->community->getId());
-      }
+      $this->community->joinAllMembers();
       $this->getUser()->setFlash('notice', 'All member joined.');
       $this->redirect('community/list');
     }
diff --git a/lib/model/doctrine/Community.class.php b/lib/model/doctrine/Community.class.php
index 0c886838f..5bc75b209 100644
--- a/lib/model/doctrine/Community.class.php
+++ b/lib/model/doctrine/Community.class.php
@@ -209,5 +209,18 @@ public function preDelete($event)
     {
       $this->File->delete();
     }
+  }
+
+	public function joinAllMembers()
+  {
+    $conn = Doctrine::getTable('Member')->getConnection();
+    $query = 'SELECT id FROM '.Doctrine::getTable('Member')->getTableName().' m'
+           . '  WHERE NOT EXISTS (SELECT * FROM '.Doctrine::getTable('CommunityMember')->getTableName().' cm WHERE m.id = cm.member_id AND cm.community_id = ?)'
+           . '        AND m.is_active = 1';
+    $insertIds = $conn->fetchColumn($query, array($this->getId()));
+    foreach ($insertIds as $memberId)
+    {
+      Doctrine::getTable('CommunityMember')->join($memberId, $this->community->getId());
+    }
   }
 }
diff --git a/lib/model/doctrine/CommunityMemberTable.class.php b/lib/model/doctrine/CommunityMemberTable.class.php
index 28e378bfc..d036ff9df 100644
--- a/lib/model/doctrine/CommunityMemberTable.class.php
+++ b/lib/model/doctrine/CommunityMemberTable.class.php
@@ -77,6 +77,7 @@ public function join($memberId, $communityId, $isRegisterPolicy = 'open')
       $communityMember->setIsPre(true);
     }
     $communityMember->save();
+    $communityMember->free(true);
   }
 
   public function quit($memberId, $communityId)

From 7ca2c8564322751099f5f4ccc66575044c35fc88 Mon Sep 17 00:00:00 2001
From: sano <sano@tejimaya-no-MacBook-Air.local>
Date: Wed, 16 Nov 2016 19:14:16 +0900
Subject: [PATCH 563/630] fix syntax error (fixes #4052, BP from #927)

---
 lib/model/doctrine/Community.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/model/doctrine/Community.class.php b/lib/model/doctrine/Community.class.php
index 5bc75b209..4b0e38f2d 100644
--- a/lib/model/doctrine/Community.class.php
+++ b/lib/model/doctrine/Community.class.php
@@ -220,7 +220,7 @@ public function joinAllMembers()
     $insertIds = $conn->fetchColumn($query, array($this->getId()));
     foreach ($insertIds as $memberId)
     {
-      Doctrine::getTable('CommunityMember')->join($memberId, $this->community->getId());
+      Doctrine::getTable('CommunityMember')->join($memberId, $this->getId());
     }
   }
 }

From 6dcf8aee4d89874f0488ab90a892f3cd67ad8efd Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 8 Dec 2016 14:14:06 +0900
Subject: [PATCH 564/630] version 3.8.22

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index ab0d1e9a1..70328c470 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.22-dev');
+  define('OPENPNE_VERSION', '3.8.22');
 }

From a0e6576ed41932fa039796f491889128fdc0742b Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 8 Dec 2016 14:17:35 +0900
Subject: [PATCH 565/630] started to development of OpenPNE 3.8.23

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 70328c470..1b3e52a98 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.22');
+  define('OPENPNE_VERSION', '3.8.23-dev');
 }

From 9b8fe2e4f7c685cbd35bfef07956e58fa1793e92 Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Thu, 5 Jan 2017 19:02:36 +0900
Subject: [PATCH 566/630] =?UTF-8?q?(fixed=20#4116,=20BP=20from=20#4106)=20?=
 =?UTF-8?q?=E3=83=A1=E3=83=BC=E3=83=AB=E9=80=9A=E7=9F=A5=E9=80=81=E4=BF=A1?=
 =?UTF-8?q?=E8=A8=AD=E5=AE=9A=20=E3=81=AE=E3=82=A8=E3=83=A9=E3=83=BC?=
 =?UTF-8?q?=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E3=82=92=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/pc_backend/modules/mail/actions/actions.class.php   | 1 -
 apps/pc_backend/modules/mail/templates/configSuccess.php | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/pc_backend/modules/mail/actions/actions.class.php b/apps/pc_backend/modules/mail/actions/actions.class.php
index 0f733f91b..f989b058f 100644
--- a/apps/pc_backend/modules/mail/actions/actions.class.php
+++ b/apps/pc_backend/modules/mail/actions/actions.class.php
@@ -28,7 +28,6 @@ public function executeConfig(sfWebRequest $request)
 
         $this->redirect('@mail_config');
       }
-      $this->getUser()->setFlash('error', (string)$this->form->getErrorSchema(), false);
     }
   }
 
diff --git a/apps/pc_backend/modules/mail/templates/configSuccess.php b/apps/pc_backend/modules/mail/templates/configSuccess.php
index 87205b99b..a0b44ce26 100644
--- a/apps/pc_backend/modules/mail/templates/configSuccess.php
+++ b/apps/pc_backend/modules/mail/templates/configSuccess.php
@@ -5,6 +5,7 @@
 <h2><?php echo __('Configuration of E-mail Notifications') ?></h2>
 
 <?php echo $form->renderFormTag(url_for('@mail_config')); ?>
+<?php echo $form->renderGlobalErrors() ?>
 <?php echo $form->renderHiddenFields(); ?>
 <?php foreach ($config as $target => $mails): ?>
 

From d08569e791cda40a44a58e3cde660e63364f80d3 Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Thu, 5 Jan 2017 20:00:51 +0900
Subject: [PATCH 567/630] =?UTF-8?q?(fixed=20#4118,=20BP=20from=20#4107)=20?=
 =?UTF-8?q?max=5Flength=20=E3=81=AE=E3=82=A8=E3=83=A9=E3=83=BC=E3=83=A1?=
 =?UTF-8?q?=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E3=82=92=E7=BF=BB=E8=A8=B3?=
 =?UTF-8?q?=E3=82=AB=E3=82=BF=E3=83=AD=E3=82=B0=E3=81=AB=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/pc_backend/i18n/form_community.ja.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/pc_backend/i18n/form_community.ja.xml b/apps/pc_backend/i18n/form_community.ja.xml
index 630285956..db4b94760 100644
--- a/apps/pc_backend/i18n/form_community.ja.xml
+++ b/apps/pc_backend/i18n/form_community.ja.xml
@@ -42,6 +42,10 @@
         <source>Required.</source>
         <target>必須項目です。</target>
       </trans-unit>
+      <trans-unit id="">
+        <source>"%value%" is too long (%max_length% characters max).</source>
+        <target>%max_length%文字以内で入力してください。</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>

From 8d3dbe2000a7248b16f14b19c8286a8c98a5751f Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Wed, 11 Jan 2017 14:11:45 +0900
Subject: [PATCH 568/630] =?UTF-8?q?(fixed=20#4052,=20BP=20from=20#3544-8)?=
 =?UTF-8?q?=20is=5Factive=20=E3=81=AE=E6=9D=A1=E4=BB=B6=E3=81=AB=20NULL=20?=
 =?UTF-8?q?=E3=81=AE=E5=A0=B4=E5=90=88=E3=82=92=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/model/doctrine/Community.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/model/doctrine/Community.class.php b/lib/model/doctrine/Community.class.php
index 4b0e38f2d..ce7a7a710 100644
--- a/lib/model/doctrine/Community.class.php
+++ b/lib/model/doctrine/Community.class.php
@@ -216,7 +216,7 @@ public function joinAllMembers()
     $conn = Doctrine::getTable('Member')->getConnection();
     $query = 'SELECT id FROM '.Doctrine::getTable('Member')->getTableName().' m'
            . '  WHERE NOT EXISTS (SELECT * FROM '.Doctrine::getTable('CommunityMember')->getTableName().' cm WHERE m.id = cm.member_id AND cm.community_id = ?)'
-           . '        AND m.is_active = 1';
+           . '        AND (m.is_active = 1 OR m.is_active IS NULL)';
     $insertIds = $conn->fetchColumn($query, array($this->getId()));
     foreach ($insertIds as $memberId)
     {

From 0077761013c8cdc54c2b9a57453c2ad852803797 Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Mon, 16 Jan 2017 19:03:06 +0900
Subject: [PATCH 569/630] =?UTF-8?q?(fixed=20#4130,=20BP=20from=20#4128)=20?=
 =?UTF-8?q?=E3=83=8B=E3=83=83=E3=82=AF=E3=83=8D=E3=83=BC=E3=83=A0=E3=82=92?=
 =?UTF-8?q?SNS=E5=86=85=E5=90=8D=E7=A7=B0=E8=A8=AD=E5=AE=9A=E3=81=AB?=
 =?UTF-8?q?=E5=AF=BE=E5=BF=9C=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/pc_backend/i18n/messages.ja.xml                       | 4 ++--
 apps/pc_backend/modules/member/actions/actions.class.php   | 2 +-
 apps/pc_backend/modules/member/templates/deleteSuccess.php | 2 +-
 apps/pc_backend/modules/member/templates/listSuccess.php   | 2 +-
 apps/pc_backend/modules/member/templates/rejectSuccess.php | 2 +-
 templates/_deleteAccountMail.php                           | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/pc_backend/i18n/messages.ja.xml b/apps/pc_backend/i18n/messages.ja.xml
index 473c7c6bd..0a36003e3 100644
--- a/apps/pc_backend/i18n/messages.ja.xml
+++ b/apps/pc_backend/i18n/messages.ja.xml
@@ -3,8 +3,8 @@
   <file orginal="global" source-language="en" datatype="plaintext">
     <body>
       <trans-unit id="">
-        <source>Nickname</source>
-        <target>ニックネーム</target>
+        <source>%nickname%</source>
+        <target>%nickname%</target>
       </trans-unit>
       <trans-unit id="">
         <source>Password</source>
diff --git a/apps/pc_backend/modules/member/actions/actions.class.php b/apps/pc_backend/modules/member/actions/actions.class.php
index cb5d47af4..d1fb40711 100644
--- a/apps/pc_backend/modules/member/actions/actions.class.php
+++ b/apps/pc_backend/modules/member/actions/actions.class.php
@@ -37,7 +37,7 @@ public function executeList(sfWebRequest $request)
     $params = $request->getParameter('member', array());
 
     $this->form = new opMemberProfileSearchForm(array(), array('is_use_id' => true, 'is_check_public_flag' => false));
-    $this->form->getWidgetSchema()->setLabel('name', 'Nickname');
+    $this->form->getWidgetSchema()->setLabel('name', '%nickname%');
     $this->form->bind($params);
 
     $this->pager = new sfDoctrinePager('Member', 20);
diff --git a/apps/pc_backend/modules/member/templates/deleteSuccess.php b/apps/pc_backend/modules/member/templates/deleteSuccess.php
index bec3623fd..48679dcac 100644
--- a/apps/pc_backend/modules/member/templates/deleteSuccess.php
+++ b/apps/pc_backend/modules/member/templates/deleteSuccess.php
@@ -13,7 +13,7 @@
 <th><?php echo __('ID') ?></th><td><?php echo $member->getId() ?></td>
 </tr>
 <tr>
-<th><?php echo __('Nickname') ?></th><td><?php echo $member->getName() ?></td>
+<th><?php echo __('%nickname%') ?></th><td><?php echo $member->getName() ?></td>
 </tr>
 <?php foreach ($member->getProfiles() as $profile): ?>
 <?php $profileObj = $profile->getProfile(); ?>
diff --git a/apps/pc_backend/modules/member/templates/listSuccess.php b/apps/pc_backend/modules/member/templates/listSuccess.php
index d310df1fd..b9a5d8c40 100644
--- a/apps/pc_backend/modules/member/templates/listSuccess.php
+++ b/apps/pc_backend/modules/member/templates/listSuccess.php
@@ -40,7 +40,7 @@
 <tr>
 <th colspan="4"><?php echo __('Operation') ?></th>
 <th><?php echo __('ID') ?></th>
-<th><?php echo __('Nickname') ?></th>
+<th><?php echo __('%nickname%') ?></th>
 <th><?php echo __('Invited by') ?></th>
 <th><?php echo __('Last login') ?></th>
 <?php foreach ($profiles as $profile) : ?>
diff --git a/apps/pc_backend/modules/member/templates/rejectSuccess.php b/apps/pc_backend/modules/member/templates/rejectSuccess.php
index d50ce617e..2b3fcf8f8 100644
--- a/apps/pc_backend/modules/member/templates/rejectSuccess.php
+++ b/apps/pc_backend/modules/member/templates/rejectSuccess.php
@@ -15,7 +15,7 @@
 <th><?php echo __('ID') ?></th><td><?php echo $member->getId() ?></td>
 </tr>
 <tr>
-<th><?php echo __('Nickname') ?></th><td><?php echo $member->getName() ?></td>
+<th><?php echo __('%nickname%') ?></th><td><?php echo $member->getName() ?></td>
 </tr>
 <?php echo $form ?>
 <tr>
diff --git a/templates/_deleteAccountMail.php b/templates/_deleteAccountMail.php
index 21d41fa0e..2228b27d9 100644
--- a/templates/_deleteAccountMail.php
+++ b/templates/_deleteAccountMail.php
@@ -1,7 +1,7 @@
 <?php echo __('Information About the Withdrawal Member') ?> 
 
 <?php echo __('ID') ?> : <?php echo $member->getId() ?> 
-<?php echo __('Nickname') ?> : <?php echo $member->getName() ?> 
+<?php echo __('%nickname%') ?> : <?php echo $member->getName() ?>
 
 <?php echo __('Last Login') ?> : <?php if ($member->getLastLoginTime()) : ?><?php echo date('y-m-d H:i:s', $member->getLastLoginTime()) ?><?php endif; ?> 
 <?php foreach ($member->getProfiles() as $profile) : ?> 

From 62c98d6992b5cea2a5011407f892f7ba0a0d2214 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Tue, 1 Mar 2016 18:22:03 +0900
Subject: [PATCH 570/630] fixes /community/joinList?id=* that access block is
 not considered (fixes #2636)

---
 lib/action/opCommunityAction.class.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/action/opCommunityAction.class.php b/lib/action/opCommunityAction.class.php
index 61970754f..54fd1258d 100644
--- a/lib/action/opCommunityAction.class.php
+++ b/lib/action/opCommunityAction.class.php
@@ -172,6 +172,7 @@ public function executeJoinlist(opWebRequest $request)
 
     $this->member = Doctrine::getTable('Member')->find($memberId);
     $this->forward404Unless($this->member);
+    $this->forward404Unless($this->member->isAllowed($this->getUser()->getMember(), 'view'));
 
     if (!$this->size)
     {

From a6e55077b39f823b82450d860802d18f66c307b9 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Tue, 1 Mar 2016 18:48:59 +0900
Subject: [PATCH 571/630] fixes /friend/showImage?id=* that access block is not
 considered (fixes #2208)

---
 lib/action/opFriendAction.class.php             |  1 +
 test/fixtures/common/test_data.yml              | 10 ++++++++++
 .../pc_frontend/friendActionsTest.php           | 17 +++++++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/lib/action/opFriendAction.class.php b/lib/action/opFriendAction.class.php
index a5ee09f4d..b7dcf20dc 100644
--- a/lib/action/opFriendAction.class.php
+++ b/lib/action/opFriendAction.class.php
@@ -153,6 +153,7 @@ public function executeManage(opWebRequest $request)
   public function executeShowImage(opWebRequest $request)
   {
     $this->forward404Unless($this->id);
+    $this->redirectIf($this->relation->isAccessBlocked(), '@error');
 
     $this->member = Doctrine::getTable('Member')->find($this->id);
     $this->forward404Unless($this->member, 'Undefined member.');
diff --git a/test/fixtures/common/test_data.yml b/test/fixtures/common/test_data.yml
index 10d968e6a..f72ca4a40 100644
--- a/test/fixtures/common/test_data.yml
+++ b/test/fixtures/common/test_data.yml
@@ -373,6 +373,16 @@ MemberConfig:
     value: "sns2@example.com"
     Member: third_member
 
+  fifth_member_pc_address:
+    name: "pc_address"
+    value: "sns5@example.com"
+    Member: fifth_member
+
+  fifth_member_password:
+    name: "password"
+    value: <?php echo md5('password') . "\n"; ?>
+    Member: fifth_member
+
 AdminUser:
   first_admin:
     id: ~
diff --git a/test/functional/pc_frontend/friendActionsTest.php b/test/functional/pc_frontend/friendActionsTest.php
index b8995db9d..4d0cf2e09 100644
--- a/test/functional/pc_frontend/friendActionsTest.php
+++ b/test/functional/pc_frontend/friendActionsTest.php
@@ -3,6 +3,23 @@
 include(dirname(__FILE__).'/../../bootstrap/functional.php');
 
 $browser = new opTestFunctional(new opBrowser(), new lime_test(null, new lime_output_color()));
+
+$browser->login('sns5@example.com', 'password');
+$browser
+  ->info('/friend/showImage?id=*')
+  ->get('/friend/showImage?id=1')
+    ->info('4-1. Member E cannot view the profile image page of Member A (Access blocked)')
+    ->checkDispatch('friend', 'showImage')
+    ->followRedirect()
+    ->checkDispatch('default', 'error')
+  ->get('/friend/showImage?id=2')
+    ->info('4-2. Member E can view the profile image page of Member B (Normal behavior)')
+    ->checkDispatch('friend', 'showImage')
+    ->isStatusCode(200)
+    ->with('response')
+      ->checkElement('#memberImagesBox img', 3)
+;
+
 $browser
   ->info('Login')
   ->login('sns@example.com', 'password')

From 50c6cf2393e977a8de53c5aace1a4cc116342833 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Mon, 20 Feb 2017 16:38:05 +0900
Subject: [PATCH 572/630] apply is_allow_web_public_flag_age setting to
 register-input form (fixes #3493, BP from #3453)

(cherry picked from commit 800aaf209659f237a19338689f45762c989a80e8)
---
 .../MemberConfigPublicFlagForm.class.php              | 11 -----------
 lib/form/doctrine/MemberConfigForm.class.php          |  6 ++++++
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/lib/form/MemberConfigForm/MemberConfigPublicFlagForm.class.php b/lib/form/MemberConfigForm/MemberConfigPublicFlagForm.class.php
index 9047bae36..60066187a 100644
--- a/lib/form/MemberConfigForm/MemberConfigPublicFlagForm.class.php
+++ b/lib/form/MemberConfigForm/MemberConfigPublicFlagForm.class.php
@@ -27,16 +27,5 @@ public function __construct(Member $member = null, $options = array(), $CSRFSecr
     {
       unset($this['profile_page_public_flag']);
     }
-
-    if (!opConfig::get('is_allow_web_public_flag_age'))
-    {
-      $widget = $this->widgetSchema['age_public_flag'];
-
-      $choices = $widget->getOption('choices');
-      unset($choices[4]);
-      $widget->setOption('choices', $choices);
-
-      $this->validatorSchema['age_public_flag']->setOption('choices', array_keys($choices));
-    }
   }
 }
diff --git a/lib/form/doctrine/MemberConfigForm.class.php b/lib/form/doctrine/MemberConfigForm.class.php
index a3546a585..011006208 100644
--- a/lib/form/doctrine/MemberConfigForm.class.php
+++ b/lib/form/doctrine/MemberConfigForm.class.php
@@ -95,6 +95,12 @@ public function setMemberConfigSettings()
     $categories = sfConfig::get('openpne_member_category');
     $configs = sfConfig::get('openpne_member_config');
 
+    if (!opConfig::get('is_allow_web_public_flag_age') && isset($configs['age_public_flag']['Choices'][4]))
+    {
+      // Remove `All Users on the Web` choice from age_public_flag setting
+      unset($configs['age_public_flag']['Choices'][4]);
+    }
+
     if (!$this->category) {
       $this->memberConfigSettings = $configs;
       return true;

From bba33cd7f6a4a14f3c56938c87d0da85cddd086e Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Wed, 22 Feb 2017 14:06:18 +0900
Subject: [PATCH 573/630] =?UTF-8?q?(fixed=20#4130-3,=20BP=20from=20#4128-5?=
 =?UTF-8?q?)=20%nickname%=20=E3=82=92=20%Nickname%=20=E3=81=AB=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/pc_backend/modules/member/actions/actions.class.php   | 2 +-
 apps/pc_backend/modules/member/templates/deleteSuccess.php | 2 +-
 apps/pc_backend/modules/member/templates/listSuccess.php   | 2 +-
 apps/pc_backend/modules/member/templates/rejectSuccess.php | 2 +-
 templates/_deleteAccountMail.php                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/pc_backend/modules/member/actions/actions.class.php b/apps/pc_backend/modules/member/actions/actions.class.php
index d1fb40711..805f24a58 100644
--- a/apps/pc_backend/modules/member/actions/actions.class.php
+++ b/apps/pc_backend/modules/member/actions/actions.class.php
@@ -37,7 +37,7 @@ public function executeList(sfWebRequest $request)
     $params = $request->getParameter('member', array());
 
     $this->form = new opMemberProfileSearchForm(array(), array('is_use_id' => true, 'is_check_public_flag' => false));
-    $this->form->getWidgetSchema()->setLabel('name', '%nickname%');
+    $this->form->getWidgetSchema()->setLabel('name', '%Nickname%');
     $this->form->bind($params);
 
     $this->pager = new sfDoctrinePager('Member', 20);
diff --git a/apps/pc_backend/modules/member/templates/deleteSuccess.php b/apps/pc_backend/modules/member/templates/deleteSuccess.php
index 48679dcac..e5844ec3b 100644
--- a/apps/pc_backend/modules/member/templates/deleteSuccess.php
+++ b/apps/pc_backend/modules/member/templates/deleteSuccess.php
@@ -13,7 +13,7 @@
 <th><?php echo __('ID') ?></th><td><?php echo $member->getId() ?></td>
 </tr>
 <tr>
-<th><?php echo __('%nickname%') ?></th><td><?php echo $member->getName() ?></td>
+<th><?php echo __('%Nickname%') ?></th><td><?php echo $member->getName() ?></td>
 </tr>
 <?php foreach ($member->getProfiles() as $profile): ?>
 <?php $profileObj = $profile->getProfile(); ?>
diff --git a/apps/pc_backend/modules/member/templates/listSuccess.php b/apps/pc_backend/modules/member/templates/listSuccess.php
index b9a5d8c40..67f48fabf 100644
--- a/apps/pc_backend/modules/member/templates/listSuccess.php
+++ b/apps/pc_backend/modules/member/templates/listSuccess.php
@@ -40,7 +40,7 @@
 <tr>
 <th colspan="4"><?php echo __('Operation') ?></th>
 <th><?php echo __('ID') ?></th>
-<th><?php echo __('%nickname%') ?></th>
+<th><?php echo __('%Nickname%') ?></th>
 <th><?php echo __('Invited by') ?></th>
 <th><?php echo __('Last login') ?></th>
 <?php foreach ($profiles as $profile) : ?>
diff --git a/apps/pc_backend/modules/member/templates/rejectSuccess.php b/apps/pc_backend/modules/member/templates/rejectSuccess.php
index 2b3fcf8f8..68254df8f 100644
--- a/apps/pc_backend/modules/member/templates/rejectSuccess.php
+++ b/apps/pc_backend/modules/member/templates/rejectSuccess.php
@@ -15,7 +15,7 @@
 <th><?php echo __('ID') ?></th><td><?php echo $member->getId() ?></td>
 </tr>
 <tr>
-<th><?php echo __('%nickname%') ?></th><td><?php echo $member->getName() ?></td>
+<th><?php echo __('%Nickname%') ?></th><td><?php echo $member->getName() ?></td>
 </tr>
 <?php echo $form ?>
 <tr>
diff --git a/templates/_deleteAccountMail.php b/templates/_deleteAccountMail.php
index 2228b27d9..6f041883f 100644
--- a/templates/_deleteAccountMail.php
+++ b/templates/_deleteAccountMail.php
@@ -1,7 +1,7 @@
 <?php echo __('Information About the Withdrawal Member') ?> 
 
 <?php echo __('ID') ?> : <?php echo $member->getId() ?> 
-<?php echo __('%nickname%') ?> : <?php echo $member->getName() ?>
+<?php echo __('%Nickname%') ?> : <?php echo $member->getName() ?>
 
 <?php echo __('Last Login') ?> : <?php if ($member->getLastLoginTime()) : ?><?php echo date('y-m-d H:i:s', $member->getLastLoginTime()) ?><?php endif; ?> 
 <?php foreach ($member->getProfiles() as $profile) : ?> 

From af8196548e0768022644b8167334bc8fe6460b5a Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Wed, 22 Feb 2017 13:34:05 +0900
Subject: [PATCH 574/630] =?UTF-8?q?(fixed=20#4130-3,=20BP=20from=20#4128-5?=
 =?UTF-8?q?)=20=E4=B8=8D=E8=A6=81=E3=81=AA=E7=BF=BB=E8=A8=B3=E3=82=92?=
 =?UTF-8?q?=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/pc_backend/i18n/messages.ja.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/pc_backend/i18n/messages.ja.xml b/apps/pc_backend/i18n/messages.ja.xml
index 0a36003e3..ae78ab867 100644
--- a/apps/pc_backend/i18n/messages.ja.xml
+++ b/apps/pc_backend/i18n/messages.ja.xml
@@ -2,10 +2,6 @@
 <xliff version="1.0">
   <file orginal="global" source-language="en" datatype="plaintext">
     <body>
-      <trans-unit id="">
-        <source>%nickname%</source>
-        <target>%nickname%</target>
-      </trans-unit>
       <trans-unit id="">
         <source>Password</source>
         <target>パスワード</target>

From 82056234b52bf334f5e850bce9f88b54461a1700 Mon Sep 17 00:00:00 2001
From: Rimpei Ogawa <ogawa@tejimaya.com>
Date: Thu, 9 Mar 2017 14:25:50 +0900
Subject: [PATCH 575/630] version 3.8.23

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 1b3e52a98..d22995217 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.23-dev');
+  define('OPENPNE_VERSION', '3.8.23');
 }

From 183289af2e9e2221b1197160853becf135a175fa Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Tue, 28 Mar 2017 12:18:59 +0900
Subject: [PATCH 576/630] started to development of OpenPNE 3.9.0

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index d22995217..5f524b8f2 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.8.23');
+  define('OPENPNE_VERSION', '3.9.0-dev');
 }

From 94beff59c3f6ee3dc3d1b637fe7c14e08c685992 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Wed, 15 Mar 2017 17:55:31 +0900
Subject: [PATCH 577/630] update PEAR 1.10.3 (refs #4176)

---
 lib/vendor/PEAR/OS/Guess.php                  |   7 +-
 lib/vendor/PEAR/PEAR.php                      | 376 +++++++------
 lib/vendor/PEAR/PEAR/Autoloader.php           | 218 --------
 lib/vendor/PEAR/PEAR/Builder.php              |  65 ++-
 lib/vendor/PEAR/PEAR/ChannelFile.php          |  33 +-
 lib/vendor/PEAR/PEAR/ChannelFile/Parser.php   |   3 +-
 lib/vendor/PEAR/PEAR/Command.php              |  53 +-
 lib/vendor/PEAR/PEAR/Command/Auth.php         |   9 +-
 lib/vendor/PEAR/PEAR/Command/Build.php        |  11 +-
 lib/vendor/PEAR/PEAR/Command/Channels.php     |  11 +-
 lib/vendor/PEAR/PEAR/Command/Common.php       |   9 +-
 lib/vendor/PEAR/PEAR/Command/Config.php       |  15 +-
 lib/vendor/PEAR/PEAR/Command/Install.php      |  51 +-
 lib/vendor/PEAR/PEAR/Command/Mirror.php       |  11 +-
 lib/vendor/PEAR/PEAR/Command/Package.php      |  57 +-
 lib/vendor/PEAR/PEAR/Command/Package.xml      |   2 +-
 lib/vendor/PEAR/PEAR/Command/Pickle.php       |  15 +-
 lib/vendor/PEAR/PEAR/Command/Registry.php     |  17 +-
 lib/vendor/PEAR/PEAR/Command/Remote.php       |  22 +-
 lib/vendor/PEAR/PEAR/Command/Test.php         |  18 +-
 lib/vendor/PEAR/PEAR/Common.php               |  87 +--
 lib/vendor/PEAR/PEAR/Config.php               |  90 +++-
 lib/vendor/PEAR/PEAR/Dependency.php           | 498 ------------------
 lib/vendor/PEAR/PEAR/Dependency2.php          |  19 +-
 lib/vendor/PEAR/PEAR/DependencyDB.php         |  21 +-
 lib/vendor/PEAR/PEAR/Downloader.php           | 221 ++++----
 lib/vendor/PEAR/PEAR/Downloader/Package.php   |  73 +--
 lib/vendor/PEAR/PEAR/ErrorStack.php           |  70 ++-
 lib/vendor/PEAR/PEAR/Exception.php            |  25 +-
 lib/vendor/PEAR/PEAR/FixPHP5PEARWarnings.php  |   7 -
 lib/vendor/PEAR/PEAR/Frontend.php             |  17 +-
 lib/vendor/PEAR/PEAR/Frontend/CLI.php         |  48 +-
 lib/vendor/PEAR/PEAR/Installer.php            | 201 +++----
 lib/vendor/PEAR/PEAR/Installer/Role.php       |  26 +-
 lib/vendor/PEAR/PEAR/Installer/Role/Cfg.php   |   3 +-
 .../PEAR/PEAR/Installer/Role/Common.php       |   7 +-
 lib/vendor/PEAR/PEAR/Installer/Role/Data.php  |   3 +-
 lib/vendor/PEAR/PEAR/Installer/Role/Doc.php   |   3 +-
 lib/vendor/PEAR/PEAR/Installer/Role/Ext.php   |   3 +-
 lib/vendor/PEAR/PEAR/Installer/Role/Man.php   |  28 +
 lib/vendor/PEAR/PEAR/Installer/Role/Man.xml   |  15 +
 lib/vendor/PEAR/PEAR/Installer/Role/Php.php   |   3 +-
 .../PEAR/PEAR/Installer/Role/Script.php       |   3 +-
 lib/vendor/PEAR/PEAR/Installer/Role/Src.php   |   3 +-
 lib/vendor/PEAR/PEAR/Installer/Role/Test.php  |   3 +-
 lib/vendor/PEAR/PEAR/Installer/Role/Www.php   |   3 +-
 lib/vendor/PEAR/PEAR/PackageFile.php          |  52 +-
 .../PEAR/PEAR/PackageFile/Generator/v1.php    |  28 +-
 .../PEAR/PEAR/PackageFile/Generator/v2.php    |  23 +-
 .../PEAR/PEAR/PackageFile/Parser/v1.php       |   3 +-
 .../PEAR/PEAR/PackageFile/Parser/v2.php       |   5 +-
 lib/vendor/PEAR/PEAR/PackageFile/v1.php       |  20 +-
 lib/vendor/PEAR/PEAR/PackageFile/v2.php       |  38 +-
 .../PEAR/PEAR/PackageFile/v2/Validator.php    |  45 +-
 lib/vendor/PEAR/PEAR/PackageFile/v2/rw.php    |   5 +-
 lib/vendor/PEAR/PEAR/Packager.php             |   5 +-
 lib/vendor/PEAR/PEAR/Proxy.php                | 187 +++++++
 lib/vendor/PEAR/PEAR/REST.php                 | 181 ++++---
 lib/vendor/PEAR/PEAR/REST/10.php              |  13 +-
 lib/vendor/PEAR/PEAR/REST/11.php              |   9 +-
 lib/vendor/PEAR/PEAR/REST/13.php              | 101 +++-
 lib/vendor/PEAR/PEAR/Registry.php             |  55 +-
 lib/vendor/PEAR/PEAR/Remote.php               | 498 ------------------
 lib/vendor/PEAR/PEAR/RunTest.php              | 113 ++--
 lib/vendor/PEAR/PEAR/Task/Common.php          | 143 ++---
 .../PEAR/PEAR/Task/Postinstallscript.php      | 333 ++++++------
 .../PEAR/PEAR/Task/Postinstallscript/rw.php   | 125 +++--
 lib/vendor/PEAR/PEAR/Task/Replace.php         |  74 +--
 lib/vendor/PEAR/PEAR/Task/Replace/rw.php      |  30 +-
 lib/vendor/PEAR/PEAR/Task/Unixeol.php         |  50 +-
 lib/vendor/PEAR/PEAR/Task/Unixeol/rw.php      |  29 +-
 lib/vendor/PEAR/PEAR/Task/Windowseol.php      |  65 +--
 lib/vendor/PEAR/PEAR/Task/Windowseol/rw.php   |  44 +-
 lib/vendor/PEAR/PEAR/Validate.php             |  18 +-
 lib/vendor/PEAR/PEAR/Validator/PECL.php       |   3 +-
 lib/vendor/PEAR/PEAR/XMLParser.php            |   8 +-
 lib/vendor/PEAR/PEAR5.php                     |  33 --
 lib/vendor/PEAR/System.php                    |  95 ++--
 78 files changed, 1999 insertions(+), 2915 deletions(-)
 delete mode 100644 lib/vendor/PEAR/PEAR/Autoloader.php
 delete mode 100644 lib/vendor/PEAR/PEAR/Dependency.php
 delete mode 100644 lib/vendor/PEAR/PEAR/FixPHP5PEARWarnings.php
 create mode 100644 lib/vendor/PEAR/PEAR/Installer/Role/Man.php
 create mode 100644 lib/vendor/PEAR/PEAR/Installer/Role/Man.xml
 create mode 100644 lib/vendor/PEAR/PEAR/Proxy.php
 delete mode 100644 lib/vendor/PEAR/PEAR/Remote.php
 delete mode 100644 lib/vendor/PEAR/PEAR5.php

diff --git a/lib/vendor/PEAR/OS/Guess.php b/lib/vendor/PEAR/OS/Guess.php
index 98948e3f1..7e8e8d3f8 100644
--- a/lib/vendor/PEAR/OS/Guess.php
+++ b/lib/vendor/PEAR/OS/Guess.php
@@ -10,7 +10,6 @@
  * @author     Gregory Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Guess.php 278521 2009-04-09 22:24:12Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since PEAR 0.1
  */
@@ -87,7 +86,7 @@
  * @author     Gregory Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 0.1
  */
@@ -99,7 +98,7 @@ class OS_Guess
     var $release;
     var $extra;
 
-    function OS_Guess($uname = null)
+    function __construct($uname = null)
     {
         list($this->sysname,
              $this->release,
@@ -335,4 +334,4 @@ function _matchFragment($fragment, $value)
  * indent-tabs-mode: nil
  * c-basic-offset: 4
  * End:
- */
\ No newline at end of file
+ */
diff --git a/lib/vendor/PEAR/PEAR.php b/lib/vendor/PEAR/PEAR.php
index d48ee8282..7aa3c4ce5 100644
--- a/lib/vendor/PEAR/PEAR.php
+++ b/lib/vendor/PEAR/PEAR.php
@@ -12,9 +12,8 @@
  * @author     Stig Bakken <ssb@php.net>
  * @author     Tomas V.V.Cox <cox@idecnet.com>
  * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
+ * @copyright  1997-2010 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: PEAR.php 286670 2009-08-02 14:16:06Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  */
@@ -33,8 +32,6 @@
  */
 define('PEAR_ERROR_EXCEPTION', 32);
 /**#@-*/
-define('PEAR_ZE2', (function_exists('version_compare') &&
-                    version_compare(zend_version(), "2-dev", "ge")));
 
 if (substr(PHP_OS, 0, 3) == 'WIN') {
     define('OS_WINDOWS', true);
@@ -78,7 +75,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2006 The PHP Group
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @see        PEAR_Error
  * @since      Class available since PHP 4.0.2
@@ -86,8 +83,6 @@
  */
 class PEAR
 {
-    // {{{ properties
-
     /**
      * Whether to enable internal debug messages.
      *
@@ -138,9 +133,17 @@ class PEAR
      */
     var $_expected_errors = array();
 
-    // }}}
-
-    // {{{ constructor
+    /**
+     * List of methods that can be called both statically and non-statically.
+     * @var array
+     */
+    protected static $bivalentMethods = array(
+        'setErrorHandling' => true,
+        'raiseError' => true,
+        'throwError' => true,
+        'pushErrorHandling' => true,
+        'popErrorHandling' => true,
+    );
 
     /**
      * Constructor.  Registers this object in
@@ -152,15 +155,17 @@ class PEAR
      * @access public
      * @return void
      */
-    function PEAR($error_class = null)
+    function __construct($error_class = null)
     {
         $classname = strtolower(get_class($this));
         if ($this->_debug) {
             print "PEAR constructor called, class=$classname\n";
         }
+
         if ($error_class !== null) {
             $this->_error_class = $error_class;
         }
+
         while ($classname && strcasecmp($classname, "pear")) {
             $destructor = "_$classname";
             if (method_exists($this, $destructor)) {
@@ -177,8 +182,17 @@ function PEAR($error_class = null)
         }
     }
 
-    // }}}
-    // {{{ destructor
+    /**
+     * Only here for backwards compatibility.
+     * E.g. Archive_Tar calls $this->PEAR() in its constructor.
+     *
+     * @param string $error_class Which class to use for error objects,
+     *                            defaults to PEAR_Error.
+     */
+    public function PEAR($error_class = null)
+    {
+        self::__construct($error_class);
+    }
 
     /**
      * Destructor (the emulated type of...).  Does nothing right now,
@@ -197,8 +211,31 @@ function _PEAR() {
         }
     }
 
-    // }}}
-    // {{{ getStaticProperty()
+    public function __call($method, $arguments)
+    {
+        if (!isset(self::$bivalentMethods[$method])) {
+            trigger_error(
+                'Call to undefined method PEAR::' . $method . '()', E_USER_ERROR
+            );
+        }
+        return call_user_func_array(
+            array(get_class(), '_' . $method),
+            array_merge(array($this), $arguments)
+        );
+    }
+
+    public static function __callStatic($method, $arguments)
+    {
+        if (!isset(self::$bivalentMethods[$method])) {
+            trigger_error(
+                'Call to undefined method PEAR::' . $method . '()', E_USER_ERROR
+            );
+        }
+        return call_user_func_array(
+            array(get_class(), '_' . $method),
+            array_merge(array(null), $arguments)
+        );
+    }
 
     /**
     * If you have a class that's mostly/entirely static, and you need static
@@ -206,13 +243,12 @@ function _PEAR() {
     * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
     * You MUST use a reference, or they will not persist!
     *
-    * @access public
     * @param  string $class  The calling classname, to prevent clashes
     * @param  string $var    The variable to retrieve.
     * @return mixed   A reference to the variable. If not set it will be
     *                 auto initialised to NULL.
     */
-    function &getStaticProperty($class, $var)
+    public static function &getStaticProperty($class, $var)
     {
         static $properties;
         if (!isset($properties[$class])) {
@@ -226,19 +262,16 @@ function &getStaticProperty($class, $var)
         return $properties[$class][$var];
     }
 
-    // }}}
-    // {{{ registerShutdownFunc()
-
     /**
     * Use this function to register a shutdown method for static
     * classes.
     *
-    * @access public
     * @param  mixed $func  The function name (or array of class/method) to call
     * @param  mixed $args  The arguments to pass to the function
+    *
     * @return void
     */
-    function registerShutdownFunc($func, $args = array())
+    public static function registerShutdownFunc($func, $args = array())
     {
         // if we are called statically, there is a potential
         // that no shutdown func is registered.  Bug #6445
@@ -249,9 +282,6 @@ function registerShutdownFunc($func, $args = array())
         $GLOBALS['_PEAR_shutdown_funcs'][] = array($func, $args);
     }
 
-    // }}}
-    // {{{ isError()
-
     /**
      * Tell whether a value is a PEAR error.
      *
@@ -260,10 +290,10 @@ function registerShutdownFunc($func, $args = array())
      *                        only if $code is a string and
      *                        $obj->getMessage() == $code or
      *                        $code is an integer and $obj->getCode() == $code
-     * @access  public
+     *
      * @return  bool    true if parameter is an error
      */
-    function isError($data, $code = null)
+    public static function isError($data, $code = null)
     {
         if (!is_a($data, 'PEAR_Error')) {
             return false;
@@ -278,9 +308,6 @@ function isError($data, $code = null)
         return $data->getCode() == $code;
     }
 
-    // }}}
-    // {{{ setErrorHandling()
-
     /**
      * Sets how errors generated by this object should be handled.
      * Can be invoked both in objects and statically.  If called
@@ -288,6 +315,9 @@ function isError($data, $code = null)
      * PEAR objects.  If called in an object, setErrorHandling sets
      * the default behaviour for that object.
      *
+     * @param object $object
+     *        Object the method was called on (non-static mode)
+     *
      * @param int $mode
      *        One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
      *        PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
@@ -319,12 +349,12 @@ function isError($data, $code = null)
      *
      * @since PHP 4.0.5
      */
-
-    function setErrorHandling($mode = null, $options = null)
-    {
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $setmode     = &$this->_default_error_mode;
-            $setoptions  = &$this->_default_error_options;
+    protected static function _setErrorHandling(
+        $object, $mode = null, $options = null
+    ) {
+        if ($object !== null) {
+            $setmode     = &$object->_default_error_mode;
+            $setoptions  = &$object->_default_error_options;
         } else {
             $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
             $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
@@ -357,9 +387,6 @@ function setErrorHandling($mode = null, $options = null)
         }
     }
 
-    // }}}
-    // {{{ expectError()
-
     /**
      * This method is used to tell which errors you expect to get.
      * Expected errors are always returned with error mode
@@ -382,12 +409,9 @@ function expectError($code = '*')
         } else {
             array_push($this->_expected_errors, array($code));
         }
-        return sizeof($this->_expected_errors);
+        return count($this->_expected_errors);
     }
 
-    // }}}
-    // {{{ popExpect()
-
     /**
      * This method pops one element off the expected error codes
      * stack.
@@ -399,9 +423,6 @@ function popExpect()
         return array_pop($this->_expected_errors);
     }
 
-    // }}}
-    // {{{ _checkDelExpect()
-
     /**
      * This method checks unsets an error code if available
      *
@@ -413,8 +434,7 @@ function popExpect()
     function _checkDelExpect($error_code)
     {
         $deleted = false;
-
-        foreach ($this->_expected_errors AS $key => $error_array) {
+        foreach ($this->_expected_errors as $key => $error_array) {
             if (in_array($error_code, $error_array)) {
                 unset($this->_expected_errors[$key][array_search($error_code, $error_array)]);
                 $deleted = true;
@@ -425,14 +445,12 @@ function _checkDelExpect($error_code)
                 unset($this->_expected_errors[$key]);
             }
         }
+
         return $deleted;
     }
 
-    // }}}
-    // {{{ delExpect()
-
     /**
-     * This method deletes all occurences of the specified element from
+     * This method deletes all occurrences of the specified element from
      * the expected error codes stack.
      *
      * @param  mixed $error_code error code that should be deleted
@@ -444,33 +462,26 @@ function delExpect($error_code)
     {
         $deleted = false;
         if ((is_array($error_code) && (0 != count($error_code)))) {
-            // $error_code is a non-empty array here;
-            // we walk through it trying to unset all
-            // values
-            foreach($error_code as $key => $error) {
-                if ($this->_checkDelExpect($error)) {
-                    $deleted =  true;
-                } else {
-                    $deleted = false;
-                }
+            // $error_code is a non-empty array here; we walk through it trying
+            // to unset all values
+            foreach ($error_code as $key => $error) {
+                $deleted =  $this->_checkDelExpect($error) ? true : false;
             }
+
             return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
         } elseif (!empty($error_code)) {
             // $error_code comes alone, trying to unset it
             if ($this->_checkDelExpect($error_code)) {
                 return true;
-            } else {
-                return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
             }
+
+            return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
         }
 
         // $error_code is empty
         return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME
     }
 
-    // }}}
-    // {{{ raiseError()
-
     /**
      * This method is a wrapper that returns an instance of the
      * configured error class with this object's default error
@@ -503,12 +514,12 @@ function delExpect($error_code)
      * @param bool $skipmsg If true, raiseError will only pass error codes,
      *                  the error message parameter will be dropped.
      *
-     * @access public
      * @return object   a PEAR error object
      * @see PEAR::setErrorHandling
      * @since PHP 4.0.5
      */
-    function &raiseError($message = null,
+    protected static function _raiseError($object,
+                         $message = null,
                          $code = null,
                          $mode = null,
                          $options = null,
@@ -525,10 +536,16 @@ function &raiseError($message = null,
             $message     = $message->getMessage();
         }
 
-        if (isset($this) && isset($this->_expected_errors) && sizeof($this->_expected_errors) > 0 && sizeof($exp = end($this->_expected_errors))) {
+        if (
+            $object !== null &&
+            isset($object->_expected_errors) &&
+            count($object->_expected_errors) > 0 &&
+            count($exp = end($object->_expected_errors))
+        ) {
             if ($exp[0] == "*" ||
                 (is_int(reset($exp)) && in_array($code, $exp)) ||
-                (is_string(reset($exp)) && in_array($message, $exp))) {
+                (is_string(reset($exp)) && in_array($message, $exp))
+            ) {
                 $mode = PEAR_ERROR_RETURN;
             }
         }
@@ -536,9 +553,9 @@ function &raiseError($message = null,
         // No mode given, try global ones
         if ($mode === null) {
             // Class error handler
-            if (isset($this) && isset($this->_default_error_mode)) {
-                $mode    = $this->_default_error_mode;
-                $options = $this->_default_error_options;
+            if ($object !== null && isset($object->_default_error_mode)) {
+                $mode    = $object->_default_error_mode;
+                $options = $object->_default_error_options;
             // Global error handler
             } elseif (isset($GLOBALS['_PEAR_default_error_mode'])) {
                 $mode    = $GLOBALS['_PEAR_default_error_mode'];
@@ -548,18 +565,12 @@ function &raiseError($message = null,
 
         if ($error_class !== null) {
             $ec = $error_class;
-        } elseif (isset($this) && isset($this->_error_class)) {
-            $ec = $this->_error_class;
+        } elseif ($object !== null && isset($object->_error_class)) {
+            $ec = $object->_error_class;
         } else {
             $ec = 'PEAR_Error';
         }
 
-        if (intval(PHP_VERSION) < 5) {
-            // little non-eval hack to fix bug #12147
-            include 'PEAR/FixPHP5PEARWarnings.php';
-            return $a;
-        }
-
         if ($skipmsg) {
             $a = new $ec($code, $mode, $options, $userinfo);
         } else {
@@ -569,22 +580,25 @@ function &raiseError($message = null,
         return $a;
     }
 
-    // }}}
-    // {{{ throwError()
-
     /**
      * Simpler form of raiseError with fewer options.  In most cases
      * message, code and userinfo are enough.
      *
-     * @param string $message
+     * @param mixed $message a text error message or a PEAR error object
+     *
+     * @param int $code      a numeric error code (it is up to your class
+     *                  to define these if you want to use codes)
      *
+     * @param string $userinfo If you need to pass along for example debug
+     *                  information, this parameter is meant for that.
+     *
+     * @return object   a PEAR error object
+     * @see PEAR::raiseError
      */
-    function &throwError($message = null,
-                         $code = null,
-                         $userinfo = null)
+    protected static function _throwError($object, $message = null, $code = null, $userinfo = null)
     {
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $a = &$this->raiseError($message, $code, null, null, $userinfo);
+        if ($object !== null) {
+            $a = &$object->raiseError($message, $code, null, null, $userinfo);
             return $a;
         }
 
@@ -592,10 +606,9 @@ function &throwError($message = null,
         return $a;
     }
 
-    // }}}
-    function staticPushErrorHandling($mode, $options = null)
+    public static function staticPushErrorHandling($mode, $options = null)
     {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
+        $stack       = &$GLOBALS['_PEAR_error_handler_stack'];
         $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
         $def_options = &$GLOBALS['_PEAR_default_error_options'];
         $stack[] = array($def_mode, $def_options);
@@ -628,7 +641,7 @@ function staticPushErrorHandling($mode, $options = null)
         return true;
     }
 
-    function staticPopErrorHandling()
+    public static function staticPopErrorHandling()
     {
         $stack = &$GLOBALS['_PEAR_error_handler_stack'];
         $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
@@ -664,8 +677,6 @@ function staticPopErrorHandling()
         return true;
     }
 
-    // {{{ pushErrorHandling()
-
     /**
      * Push a new error handler on top of the error handler options stack. With this
      * you can easily override the actual error handler for some code and restore
@@ -678,20 +689,20 @@ function staticPopErrorHandling()
      *
      * @see PEAR::setErrorHandling
      */
-    function pushErrorHandling($mode, $options = null)
+    protected static function _pushErrorHandling($object, $mode, $options = null)
     {
         $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $def_mode    = &$this->_default_error_mode;
-            $def_options = &$this->_default_error_options;
+        if ($object !== null) {
+            $def_mode    = &$object->_default_error_mode;
+            $def_options = &$object->_default_error_options;
         } else {
             $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
             $def_options = &$GLOBALS['_PEAR_default_error_options'];
         }
         $stack[] = array($def_mode, $def_options);
 
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $this->setErrorHandling($mode, $options);
+        if ($object !== null) {
+            $object->setErrorHandling($mode, $options);
         } else {
             PEAR::setErrorHandling($mode, $options);
         }
@@ -699,9 +710,6 @@ function pushErrorHandling($mode, $options = null)
         return true;
     }
 
-    // }}}
-    // {{{ popErrorHandling()
-
     /**
     * Pop the last error handler used
     *
@@ -709,65 +717,57 @@ function pushErrorHandling($mode, $options = null)
     *
     * @see PEAR::pushErrorHandling
     */
-    function popErrorHandling()
+    protected static function _popErrorHandling($object)
     {
         $stack = &$GLOBALS['_PEAR_error_handler_stack'];
         array_pop($stack);
         list($mode, $options) = $stack[sizeof($stack) - 1];
         array_pop($stack);
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $this->setErrorHandling($mode, $options);
+        if ($object !== null) {
+            $object->setErrorHandling($mode, $options);
         } else {
             PEAR::setErrorHandling($mode, $options);
         }
         return true;
     }
 
-    // }}}
-    // {{{ loadExtension()
-
     /**
-    * OS independant PHP extension load. Remember to take care
+    * OS independent PHP extension load. Remember to take care
     * on the correct extension name for case sensitive OSes.
     *
     * @param string $ext The extension name
     * @return bool Success or not on the dl() call
     */
-    function loadExtension($ext)
+    public static function loadExtension($ext)
     {
-        if (!extension_loaded($ext)) {
-            // if either returns true dl() will produce a FATAL error, stop that
-            if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {
-                return false;
-            }
+        if (extension_loaded($ext)) {
+            return true;
+        }
 
-            if (OS_WINDOWS) {
-                $suffix = '.dll';
-            } elseif (PHP_OS == 'HP-UX') {
-                $suffix = '.sl';
-            } elseif (PHP_OS == 'AIX') {
-                $suffix = '.a';
-            } elseif (PHP_OS == 'OSX') {
-                $suffix = '.bundle';
-            } else {
-                $suffix = '.so';
-            }
+        // if either returns true dl() will produce a FATAL error, stop that
+        if (
+            function_exists('dl') === false ||
+            ini_get('enable_dl') != 1
+        ) {
+            return false;
+        }
 
-            return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
+        if (OS_WINDOWS) {
+            $suffix = '.dll';
+        } elseif (PHP_OS == 'HP-UX') {
+            $suffix = '.sl';
+        } elseif (PHP_OS == 'AIX') {
+            $suffix = '.a';
+        } elseif (PHP_OS == 'OSX') {
+            $suffix = '.bundle';
+        } else {
+            $suffix = '.so';
         }
 
-        return true;
+        return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
     }
-
-    // }}}
-}
-
-if (PEAR_ZE2) {
-    include_once 'PEAR5.php';
 }
 
-// {{{ _PEAR_call_destructors()
-
 function _PEAR_call_destructors()
 {
     global $_PEAR_destructor_object_list;
@@ -775,11 +775,8 @@ function _PEAR_call_destructors()
         sizeof($_PEAR_destructor_object_list))
     {
         reset($_PEAR_destructor_object_list);
-        if (PEAR_ZE2) {
-            $destructLifoExists = PEAR5::getStaticProperty('PEAR', 'destructlifo');
-        } else {
-            $destructLifoExists = PEAR::getStaticProperty('PEAR', 'destructlifo');
-        }
+
+        $destructLifoExists = PEAR::getStaticProperty('PEAR', 'destructlifo');
 
         if ($destructLifoExists) {
             $_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
@@ -803,14 +800,17 @@ function _PEAR_call_destructors()
     }
 
     // Now call the shutdown functions
-    if (isset($GLOBALS['_PEAR_shutdown_funcs']) AND is_array($GLOBALS['_PEAR_shutdown_funcs']) AND !empty($GLOBALS['_PEAR_shutdown_funcs'])) {
+    if (
+        isset($GLOBALS['_PEAR_shutdown_funcs']) &&
+        is_array($GLOBALS['_PEAR_shutdown_funcs']) &&
+        !empty($GLOBALS['_PEAR_shutdown_funcs'])
+    ) {
         foreach ($GLOBALS['_PEAR_shutdown_funcs'] as $value) {
             call_user_func_array($value[0], $value[1]);
         }
     }
 }
 
-// }}}
 /**
  * Standard PEAR error class for PHP 4
  *
@@ -823,15 +823,13 @@ function _PEAR_call_destructors()
  * @author     Gregory Beaver <cellog@php.net>
  * @copyright  1997-2006 The PHP Group
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/manual/en/core.pear.pear-error.php
  * @see        PEAR::raiseError(), PEAR::throwError()
  * @since      Class available since PHP 4.0.2
  */
 class PEAR_Error
 {
-    // {{{ properties
-
     var $error_message_prefix = '';
     var $mode                 = PEAR_ERROR_RETURN;
     var $level                = E_USER_NOTICE;
@@ -840,9 +838,6 @@ class PEAR_Error
     var $userinfo             = '';
     var $backtrace            = null;
 
-    // }}}
-    // {{{ constructor
-
     /**
      * PEAR_Error constructor
      *
@@ -863,7 +858,7 @@ class PEAR_Error
      * @access public
      *
      */
-    function PEAR_Error($message = 'unknown error', $code = null,
+    function __construct($message = 'unknown error', $code = null,
                         $mode = null, $options = null, $userinfo = null)
     {
         if ($mode === null) {
@@ -874,11 +869,7 @@ function PEAR_Error($message = 'unknown error', $code = null,
         $this->mode      = $mode;
         $this->userinfo  = $userinfo;
 
-        if (PEAR_ZE2) {
-            $skiptrace = PEAR5::getStaticProperty('PEAR_Error', 'skiptrace');
-        } else {
-            $skiptrace = PEAR::getStaticProperty('PEAR_Error', 'skiptrace');
-        }
+        $skiptrace = PEAR::getStaticProperty('PEAR_Error', 'skiptrace');
 
         if (!$skiptrace) {
             $this->backtrace = debug_backtrace();
@@ -923,13 +914,12 @@ function PEAR_Error($message = 'unknown error', $code = null,
             } else {
                 $format = $options;
             }
-            die(sprintf($format, $msg));
+            printf($format, $msg);
+            exit($code);
         }
 
-        if ($this->mode & PEAR_ERROR_CALLBACK) {
-            if (is_callable($this->callback)) {
-                call_user_func($this->callback, $this);
-            }
+        if ($this->mode & PEAR_ERROR_CALLBACK && is_callable($this->callback)) {
+            call_user_func($this->callback, $this);
         }
 
         if ($this->mode & PEAR_ERROR_EXCEPTION) {
@@ -938,8 +928,23 @@ function PEAR_Error($message = 'unknown error', $code = null,
         }
     }
 
-    // }}}
-    // {{{ getMode()
+    /**
+     * Only here for backwards compatibility.
+     *
+     * Class "Cache_Error" still uses it, among others.
+     *
+     * @param string $message  Message
+     * @param int    $code     Error code
+     * @param int    $mode     Error mode
+     * @param mixed  $options  See __construct()
+     * @param string $userinfo Additional user/debug info
+     */
+    public function PEAR_Error(
+        $message = 'unknown error', $code = null, $mode = null,
+        $options = null, $userinfo = null
+    ) {
+        self::__construct($message, $code, $mode, $options, $userinfo);
+    }
 
     /**
      * Get the error mode from an error object.
@@ -947,27 +952,22 @@ function PEAR_Error($message = 'unknown error', $code = null,
      * @return int error mode
      * @access public
      */
-    function getMode() {
+    function getMode()
+    {
         return $this->mode;
     }
 
-    // }}}
-    // {{{ getCallback()
-
     /**
      * Get the callback function/method from an error object.
      *
      * @return mixed callback function or object/method array
      * @access public
      */
-    function getCallback() {
+    function getCallback()
+    {
         return $this->callback;
     }
 
-    // }}}
-    // {{{ getMessage()
-
-
     /**
      * Get the error message from an error object.
      *
@@ -979,10 +979,6 @@ function getMessage()
         return ($this->error_message_prefix . $this->message);
     }
 
-
-    // }}}
-    // {{{ getCode()
-
     /**
      * Get error code from an error object
      *
@@ -994,9 +990,6 @@ function getCode()
         return $this->code;
      }
 
-    // }}}
-    // {{{ getType()
-
     /**
      * Get the name of this error/exception.
      *
@@ -1008,9 +1001,6 @@ function getType()
         return get_class($this);
     }
 
-    // }}}
-    // {{{ getUserInfo()
-
     /**
      * Get additional user-supplied information.
      *
@@ -1022,9 +1012,6 @@ function getUserInfo()
         return $this->userinfo;
     }
 
-    // }}}
-    // {{{ getDebugInfo()
-
     /**
      * Get additional debug information supplied by the application.
      *
@@ -1036,9 +1023,6 @@ function getDebugInfo()
         return $this->getUserInfo();
     }
 
-    // }}}
-    // {{{ getBacktrace()
-
     /**
      * Get the call backtrace from where the error was generated.
      * Supported with PHP 4.3.0 or newer.
@@ -1058,9 +1042,6 @@ function getBacktrace($frame = null)
         return $this->backtrace[$frame];
     }
 
-    // }}}
-    // {{{ addUserInfo()
-
     function addUserInfo($info)
     {
         if (empty($this->userinfo)) {
@@ -1070,14 +1051,10 @@ function addUserInfo($info)
         }
     }
 
-    // }}}
-    // {{{ toString()
     function __toString()
     {
         return $this->getMessage();
     }
-    // }}}
-    // {{{ toString()
 
     /**
      * Make a string representation of this object.
@@ -1085,7 +1062,8 @@ function __toString()
      * @return string a string with an object summary
      * @access public
      */
-    function toString() {
+    function toString()
+    {
         $modes = array();
         $levels = array(E_USER_NOTICE  => 'notice',
                         E_USER_WARNING => 'warning',
@@ -1124,8 +1102,6 @@ function toString() {
                        $this->error_message_prefix,
                        $this->userinfo);
     }
-
-    // }}}
 }
 
 /*
diff --git a/lib/vendor/PEAR/PEAR/Autoloader.php b/lib/vendor/PEAR/PEAR/Autoloader.php
deleted file mode 100644
index 69d933a06..000000000
--- a/lib/vendor/PEAR/PEAR/Autoloader.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-/**
- * Class auto-loader
- *
- * PHP versions 4
-
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Autoloader.php 276383 2009-02-24 23:39:37Z dufuz $
- * @link       http://pear.php.net/manual/en/core.ppm.php#core.ppm.pear-autoloader
- * @since      File available since Release 0.1
- * @deprecated File deprecated in Release 1.4.0a1
- */
-
-// /* vim: set expandtab tabstop=4 shiftwidth=4: */
-
-if (!extension_loaded("overload")) {
-    // die hard without ext/overload
-    die("Rebuild PHP with the `overload' extension to use PEAR_Autoloader");
-}
-
-/**
- * Include for PEAR_Error and PEAR classes
- */
-require_once "PEAR.php";
-
-/**
- * This class is for objects where you want to separate the code for
- * some methods into separate classes.  This is useful if you have a
- * class with not-frequently-used methods that contain lots of code
- * that you would like to avoid always parsing.
- *
- * The PEAR_Autoloader class provides autoloading and aggregation.
- * The autoloading lets you set up in which classes the separated
- * methods are found.  Aggregation is the technique used to import new
- * methods, an instance of each class providing separated methods is
- * stored and called every time the aggregated method is called.
- *
- * @category   pear
- * @package    PEAR
- * @author Stig Bakken <ssb@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
- * @link       http://pear.php.net/manual/en/core.ppm.php#core.ppm.pear-autoloader
- * @since      File available since Release 0.1
- * @deprecated File deprecated in Release 1.4.0a1
- */
-class PEAR_Autoloader extends PEAR
-{
-    // {{{ properties
-
-    /**
-     * Map of methods and classes where they are defined
-     *
-     * @var array
-     *
-     * @access private
-     */
-    var $_autoload_map = array();
-
-    /**
-     * Map of methods and aggregate objects
-     *
-     * @var array
-     *
-     * @access private
-     */
-    var $_method_map = array();
-
-    // }}}
-    // {{{ addAutoload()
-
-    /**
-     * Add one or more autoload entries.
-     *
-     * @param string $method     which method to autoload
-     *
-     * @param string $classname  (optional) which class to find the method in.
-     *                           If the $method parameter is an array, this
-     *                           parameter may be omitted (and will be ignored
-     *                           if not), and the $method parameter will be
-     *                           treated as an associative array with method
-     *                           names as keys and class names as values.
-     *
-     * @return void
-     *
-     * @access public
-     */
-    function addAutoload($method, $classname = null)
-    {
-        if (is_array($method)) {
-            array_walk($method, create_function('$a,&$b', '$b = strtolower($b);'));
-            $this->_autoload_map = array_merge($this->_autoload_map, $method);
-        } else {
-            $this->_autoload_map[strtolower($method)] = $classname;
-        }
-    }
-
-    // }}}
-    // {{{ removeAutoload()
-
-    /**
-     * Remove an autoload entry.
-     *
-     * @param string $method  which method to remove the autoload entry for
-     *
-     * @return bool TRUE if an entry was removed, FALSE if not
-     *
-     * @access public
-     */
-    function removeAutoload($method)
-    {
-        $method = strtolower($method);
-        $ok = isset($this->_autoload_map[$method]);
-        unset($this->_autoload_map[$method]);
-        return $ok;
-    }
-
-    // }}}
-    // {{{ addAggregateObject()
-
-    /**
-     * Add an aggregate object to this object.  If the specified class
-     * is not defined, loading it will be attempted following PEAR's
-     * file naming scheme.  All the methods in the class will be
-     * aggregated, except private ones (name starting with an
-     * underscore) and constructors.
-     *
-     * @param string $classname  what class to instantiate for the object.
-     *
-     * @return void
-     *
-     * @access public
-     */
-    function addAggregateObject($classname)
-    {
-        $classname = strtolower($classname);
-        if (!class_exists($classname)) {
-            $include_file = preg_replace('/[^a-z0-9]/i', '_', $classname);
-            include_once $include_file;
-        }
-        $obj =& new $classname;
-        $methods = get_class_methods($classname);
-        foreach ($methods as $method) {
-            // don't import priviate methods and constructors
-            if ($method{0} != '_' && $method != $classname) {
-                $this->_method_map[$method] = $obj;
-            }
-        }
-    }
-
-    // }}}
-    // {{{ removeAggregateObject()
-
-    /**
-     * Remove an aggregate object.
-     *
-     * @param string $classname  the class of the object to remove
-     *
-     * @return bool  TRUE if an object was removed, FALSE if not
-     *
-     * @access public
-     */
-    function removeAggregateObject($classname)
-    {
-        $ok = false;
-        $classname = strtolower($classname);
-        reset($this->_method_map);
-        while (list($method, $obj) = each($this->_method_map)) {
-            if (is_a($obj, $classname)) {
-                unset($this->_method_map[$method]);
-                $ok = true;
-            }
-        }
-        return $ok;
-    }
-
-    // }}}
-    // {{{ __call()
-
-    /**
-     * Overloaded object call handler, called each time an
-     * undefined/aggregated method is invoked.  This method repeats
-     * the call in the right aggregate object and passes on the return
-     * value.
-     *
-     * @param string $method  which method that was called
-     *
-     * @param string $args    An array of the parameters passed in the
-     *                        original call
-     *
-     * @return mixed  The return value from the aggregated method, or a PEAR
-     *                error if the called method was unknown.
-     */
-    function __call($method, $args, &$retval)
-    {
-        $method = strtolower($method);
-        if (empty($this->_method_map[$method]) && isset($this->_autoload_map[$method])) {
-            $this->addAggregateObject($this->_autoload_map[$method]);
-        }
-        if (isset($this->_method_map[$method])) {
-            $retval = call_user_func_array(array($this->_method_map[$method], $method), $args);
-            return true;
-        }
-        return false;
-    }
-
-    // }}}
-}
-
-overload("PEAR_Autoloader");
-
-?>
diff --git a/lib/vendor/PEAR/PEAR/Builder.php b/lib/vendor/PEAR/PEAR/Builder.php
index 49352cba9..9df3b9eac 100644
--- a/lib/vendor/PEAR/PEAR/Builder.php
+++ b/lib/vendor/PEAR/PEAR/Builder.php
@@ -10,7 +10,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Builder.php 276383 2009-02-24 23:39:37Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  *
@@ -23,6 +22,7 @@
  */
 require_once 'PEAR/Common.php';
 require_once 'PEAR/PackageFile.php';
+require_once 'System.php';
 
 /**
  * Class to handle building (compiling) extensions.
@@ -33,7 +33,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since PHP 4.0.2
  * @see        http://pear.php.net/manual/en/core.ppm.pear-builder.php
@@ -63,9 +63,9 @@ class PEAR_Builder extends PEAR_Common
      *
      * @access public
      */
-    function PEAR_Builder(&$ui)
+    function __construct(&$ui)
     {
-        parent::PEAR_Common();
+        parent::__construct();
         $this->setFrontendObject($ui);
     }
 
@@ -79,7 +79,7 @@ function _build_win32($descfile, $callback = null)
             $pkg = $descfile;
             $descfile = $pkg->getPackageFile();
         } else {
-            $pf = &new PEAR_PackageFile($this->config, $this->debug);
+            $pf = new PEAR_PackageFile($this->config, $this->debug);
             $pkg = &$pf->fromPackageFile($descfile, PEAR_VALIDATE_NORMAL);
             if (PEAR::isError($pkg)) {
                 return $pkg;
@@ -220,7 +220,7 @@ function _harvestInstDir($dest_prefix, $dirname, &$built_files)
     /**
      * Build an extension from source.  Runs "phpize" in the source
      * directory, but compiles in a temporary directory
-     * (/var/tmp/pear-build-USER/PACKAGE-VERSION).
+     * (TMPDIR/pear-build-USER/PACKAGE-VERSION).
      *
      * @param string|PEAR_PackageFile_v* $descfile path to XML package description file, or
      *               a PEAR_PackageFile object
@@ -242,7 +242,7 @@ function _harvestInstDir($dest_prefix, $dirname, &$built_files)
      */
     function build($descfile, $callback = null)
     {
-        if (preg_match('/(\\/|\\\\|^)([^\\/\\\\]+)?php(.+)?$/',
+        if (preg_match('/(\\/|\\\\|^)([^\\/\\\\]+)?php([^\\/\\\\]+)?$/',
                        $this->config->get('php_bin'), $matches)) {
             if (isset($matches[2]) && strlen($matches[2]) &&
                 trim($matches[2]) != trim($this->config->get('php_prefix'))) {
@@ -250,6 +250,7 @@ function build($descfile, $callback = null)
                            ' appears to have a prefix ' . $matches[2] . ', but' .
                            ' config variable php_prefix does not match');
             }
+
             if (isset($matches[3]) && strlen($matches[3]) &&
                 trim($matches[3]) != trim($this->config->get('php_suffix'))) {
                 $this->log(0, 'WARNING: php_bin ' . $this->config->get('php_bin') .
@@ -258,14 +259,15 @@ function build($descfile, $callback = null)
             }
         }
 
-
         $this->current_callback = $callback;
         if (PEAR_OS == "Windows") {
             return $this->_build_win32($descfile, $callback);
         }
+
         if (PEAR_OS != 'Unix') {
             return $this->raiseError("building extensions not supported on this platform");
         }
+
         if (is_object($descfile)) {
             $pkg = $descfile;
             $descfile = $pkg->getPackageFile();
@@ -277,21 +279,32 @@ function build($descfile, $callback = null)
                 $this->addTempFile($dir);
             }
         } else {
-            $pf = &new PEAR_PackageFile($this->config);
+            $pf = new PEAR_PackageFile($this->config);
             $pkg = &$pf->fromPackageFile($descfile, PEAR_VALIDATE_NORMAL);
             if (PEAR::isError($pkg)) {
                 return $pkg;
             }
             $dir = dirname($descfile);
         }
+
+        // Find config. outside of normal path - e.g. config.m4
+        foreach (array_keys($pkg->getInstallationFileList()) as $item) {
+          if (stristr(basename($item), 'config.m4') && dirname($item) != '.') {
+            $dir .= DIRECTORY_SEPARATOR . dirname($item);
+            break;
+          }
+        }
+
         $old_cwd = getcwd();
         if (!file_exists($dir) || !is_dir($dir) || !chdir($dir)) {
             return $this->raiseError("could not chdir to $dir");
         }
+
         $vdir = $pkg->getPackage() . '-' . $pkg->getVersion();
         if (is_dir($vdir)) {
             chdir($vdir);
         }
+
         $dir = getcwd();
         $this->log(2, "building in $dir");
         putenv('PATH=' . $this->config->get('bin_dir') . ':' . getenv('PATH'));
@@ -302,12 +315,23 @@ function build($descfile, $callback = null)
         if (PEAR::isError($err)) {
             return $err;
         }
+
         if (!$err) {
             return $this->raiseError("`phpize' failed");
         }
 
         // {{{ start of interactive part
         $configure_command = "$dir/configure";
+
+        $phpConfigName = $this->config->get('php_prefix')
+            . 'php-config'
+            . $this->config->get('php_suffix');
+        $phpConfigPath = System::which($phpConfigName);
+        if ($phpConfigPath !== false) {
+            $configure_command .= ' --with-php-config='
+                . $phpConfigPath;
+        }
+
         $configure_options = $pkg->getConfigureOptions();
         if ($configure_options) {
             foreach ($configure_options as $o) {
@@ -327,30 +351,31 @@ function build($descfile, $callback = null)
         // }}} end of interactive part
 
         // FIXME make configurable
-        if(!$user=getenv('USER')){
+        if (!$user=getenv('USER')) {
             $user='defaultuser';
         }
-        $build_basedir = "/var/tmp/pear-build-$user";
+
+        $tmpdir = $this->config->get('temp_dir');
+        $build_basedir = System::mktemp(' -t "' . $tmpdir . '" -d "pear-build-' . $user . '"');
         $build_dir = "$build_basedir/$vdir";
         $inst_dir = "$build_basedir/install-$vdir";
         $this->log(1, "building in $build_dir");
         if (is_dir($build_dir)) {
             System::rm(array('-rf', $build_dir));
         }
+
         if (!System::mkDir(array('-p', $build_dir))) {
             return $this->raiseError("could not create build dir: $build_dir");
         }
+
         $this->addTempFile($build_dir);
         if (!System::mkDir(array('-p', $inst_dir))) {
             return $this->raiseError("could not create temporary install dir: $inst_dir");
         }
         $this->addTempFile($inst_dir);
 
-        if (getenv('MAKE')) {
-            $make_command = getenv('MAKE');
-        } else {
-            $make_command = 'make';
-        }
+        $make_command = getenv('MAKE') ? getenv('MAKE') : 'make';
+
         $to_run = array(
             $configure_command,
             $make_command,
@@ -360,7 +385,7 @@ function build($descfile, $callback = null)
         if (!file_exists($build_dir) || !is_dir($build_dir) || !chdir($build_dir)) {
             return $this->raiseError("could not chdir to $build_dir");
         }
-        putenv('PHP_PEAR_VERSION=1.9.0');
+        putenv('PHP_PEAR_VERSION=1.10.3');
         foreach ($to_run as $cmd) {
             $err = $this->_runCommand($cmd, $callback);
             if (PEAR::isError($err)) {
@@ -461,7 +486,7 @@ function _runCommand($command, $callback = null)
         return ($exitcode == 0);
     }
 
-    function log($level, $msg)
+    function log($level, $msg, $append_crlf = true)
     {
         if ($this->current_callback) {
             if ($this->debug >= $level) {
@@ -469,6 +494,6 @@ function log($level, $msg)
             }
             return;
         }
-        return PEAR_Common::log($level, $msg);
+        return parent::log($level, $msg, $append_crlf);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/PEAR/PEAR/ChannelFile.php b/lib/vendor/PEAR/PEAR/ChannelFile.php
index 6c864d1a3..9e990d134 100644
--- a/lib/vendor/PEAR/PEAR/ChannelFile.php
+++ b/lib/vendor/PEAR/PEAR/ChannelFile.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: ChannelFile.php 286951 2009-08-09 14:41:22Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -146,7 +145,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
@@ -194,9 +193,9 @@ class PEAR_ChannelFile
      */
     var $_isValid = false;
 
-    function PEAR_ChannelFile()
+    function __construct()
     {
-        $this->_stack = &new PEAR_ErrorStack('PEAR_ChannelFile');
+        $this->_stack = new PEAR_ErrorStack('PEAR_ChannelFile');
         $this->_stack->setErrorMessageTemplate($this->_getErrorMessage());
         $this->_isValid = false;
     }
@@ -306,11 +305,12 @@ function toArray()
 
     /**
      * @param array
-     * @static
+     *
      * @return PEAR_ChannelFile|false false if invalid
      */
-    function &fromArray($data, $compatibility = false, $stackClass = 'PEAR_ErrorStack')
-    {
+    public static function &fromArray(
+        $data, $compatibility = false, $stackClass = 'PEAR_ErrorStack'
+    ) {
         $a = new PEAR_ChannelFile($compatibility, $stackClass);
         $a->_fromArray($data);
         if (!$a->validate()) {
@@ -322,13 +322,14 @@ function &fromArray($data, $compatibility = false, $stackClass = 'PEAR_ErrorStac
 
     /**
      * Unlike {@link fromArray()} this does not do any validation
+     *
      * @param array
-     * @static
+     *
      * @return PEAR_ChannelFile
      */
-    function &fromArrayWithErrors($data, $compatibility = false,
-                                  $stackClass = 'PEAR_ErrorStack')
-    {
+    public static function &fromArrayWithErrors(
+        $data, $compatibility = false, $stackClass = 'PEAR_ErrorStack'
+    ) {
         $a = new PEAR_ChannelFile($compatibility, $stackClass);
         $a->_fromArray($data);
         return $a;
@@ -1501,7 +1502,7 @@ function &getValidationObject($package = false)
         if (isset($this->_channelInfo['validatepackage'])) {
             if ($package == $this->_channelInfo['validatepackage']) {
                 // channel validation packages are always validated by PEAR_Validate
-                $val = &new PEAR_Validate;
+                $val = new PEAR_Validate;
                 return $val;
             }
 
@@ -1513,7 +1514,7 @@ function &getValidationObject($package = false)
                         $this->_channelInfo['validatepackage']['_content']) . '.php';
                     $vclass = str_replace('.', '_',
                         $this->_channelInfo['validatepackage']['_content']);
-                    $val = &new $vclass;
+                    $val = new $vclass;
                 } else {
                     $a = false;
                     return $a;
@@ -1521,10 +1522,10 @@ function &getValidationObject($package = false)
             } else {
                 $vclass = str_replace('.', '_',
                     $this->_channelInfo['validatepackage']['_content']);
-                $val = &new $vclass;
+                $val = new $vclass;
             }
         } else {
-            $val = &new PEAR_Validate;
+            $val = new PEAR_Validate;
         }
 
         return $val;
@@ -1556,4 +1557,4 @@ function lastModified()
 
         return time();
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/PEAR/PEAR/ChannelFile/Parser.php b/lib/vendor/PEAR/PEAR/ChannelFile/Parser.php
index a97493d41..56376add6 100644
--- a/lib/vendor/PEAR/PEAR/ChannelFile/Parser.php
+++ b/lib/vendor/PEAR/PEAR/ChannelFile/Parser.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Parser.php 276383 2009-02-24 23:39:37Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -26,7 +25,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
diff --git a/lib/vendor/PEAR/PEAR/Command.php b/lib/vendor/PEAR/PEAR/Command.php
index 2bd6cb6f1..39823c674 100644
--- a/lib/vendor/PEAR/PEAR/Command.php
+++ b/lib/vendor/PEAR/PEAR/Command.php
@@ -10,7 +10,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Command.php 286494 2009-07-29 06:57:11Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  */
@@ -94,7 +93,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 0.1
  */
@@ -109,11 +108,8 @@ class PEAR_Command
      * @param object $config  Instance of PEAR_Config object
      *
      * @return object the command object or a PEAR error
-     *
-     * @access public
-     * @static
      */
-    function &factory($command, &$config)
+    public static function &factory($command, &$config)
     {
         if (empty($GLOBALS['_PEAR_Command_commandlist'])) {
             PEAR_Command::registerCommands();
@@ -134,13 +130,13 @@ function &factory($command, &$config)
             return $a;
         }
         $ui =& PEAR_Command::getFrontendObject();
-        $obj = &new $class($ui, $config);
+        $obj = new $class($ui, $config);
         return $obj;
     }
 
     // }}}
     // {{{ & getObject()
-    function &getObject($command)
+    public static function &getObject($command)
     {
         $class = $GLOBALS['_PEAR_Command_commandlist'][$command];
         if (!class_exists($class)) {
@@ -151,7 +147,7 @@ function &getObject($command)
         }
         $ui =& PEAR_Command::getFrontendObject();
         $config = &PEAR_Config::singleton();
-        $obj = &new $class($ui, $config);
+        $obj = new $class($ui, $config);
         return $obj;
     }
 
@@ -162,9 +158,8 @@ function &getObject($command)
      * Get instance of frontend object.
      *
      * @return object|PEAR_Error
-     * @static
      */
-    function &getFrontendObject()
+    public static function &getFrontendObject()
     {
         $a = &PEAR_Frontend::singleton();
         return $a;
@@ -179,9 +174,8 @@ function &getFrontendObject()
      * @param string $uiclass Name of class implementing the frontend
      *
      * @return object the frontend object, or a PEAR error
-     * @static
      */
-    function &setFrontendClass($uiclass)
+    public static function &setFrontendClass($uiclass)
     {
         $a = &PEAR_Frontend::setFrontendClass($uiclass);
         return $a;
@@ -196,9 +190,8 @@ function &setFrontendClass($uiclass)
      * @param string $uitype Name of the frontend type (for example "CLI")
      *
      * @return object the frontend object, or a PEAR error
-     * @static
      */
-    function setFrontendType($uitype)
+    public static function setFrontendType($uitype)
     {
         $uiclass = 'PEAR_Frontend_' . $uitype;
         return PEAR_Command::setFrontendClass($uiclass);
@@ -221,11 +214,8 @@ function setFrontendType($uitype)
      *               included.
      *
      * @return bool TRUE on success, a PEAR error on failure
-     *
-     * @access public
-     * @static
      */
-    function registerCommands($merge = false, $dir = null)
+    public static function registerCommands($merge = false, $dir = null)
     {
         $parser = new PEAR_XMLParser;
         if ($dir === null) {
@@ -305,11 +295,8 @@ function registerCommands($merge = false, $dir = null)
      * classes implement them.
      *
      * @return array command => implementing class
-     *
-     * @access public
-     * @static
      */
-    function getCommands()
+    public static function getCommands()
     {
         if (empty($GLOBALS['_PEAR_Command_commandlist'])) {
             PEAR_Command::registerCommands();
@@ -324,11 +311,8 @@ function getCommands()
      * Get the list of command shortcuts.
      *
      * @return array shortcut => command
-     *
-     * @access public
-     * @static
      */
-    function getShortcuts()
+    public static function getShortcuts()
     {
         if (empty($GLOBALS['_PEAR_Command_shortcuts'])) {
             PEAR_Command::registerCommands();
@@ -347,11 +331,8 @@ function getShortcuts()
      * @param array  $long_args   (reference) long getopt format
      *
      * @return void
-     *
-     * @access public
-     * @static
      */
-    function getGetoptArgs($command, &$short_args, &$long_args)
+    public static function getGetoptArgs($command, &$short_args, &$long_args)
     {
         if (empty($GLOBALS['_PEAR_Command_commandlist'])) {
             PEAR_Command::registerCommands();
@@ -375,11 +356,8 @@ function getGetoptArgs($command, &$short_args, &$long_args)
      * @param  string $command Name of the command
      *
      * @return string command description
-     *
-     * @access public
-     * @static
      */
-    function getDescription($command)
+    public static function getDescription($command)
     {
         if (!isset($GLOBALS['_PEAR_Command_commanddesc'][$command])) {
             return null;
@@ -394,11 +372,8 @@ function getDescription($command)
      * Get help for command.
      *
      * @param string $command Name of the command to return help for
-     *
-     * @access public
-     * @static
      */
-    function getHelp($command)
+    public static function getHelp($command)
     {
         $cmds = PEAR_Command::getCommands();
         if (isset($GLOBALS['_PEAR_Command_shortcuts'][$command])) {
diff --git a/lib/vendor/PEAR/PEAR/Command/Auth.php b/lib/vendor/PEAR/PEAR/Command/Auth.php
index 9eaeeab57..fa2b22bf5 100644
--- a/lib/vendor/PEAR/PEAR/Command/Auth.php
+++ b/lib/vendor/PEAR/PEAR/Command/Auth.php
@@ -10,7 +10,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Auth.php 276383 2009-02-24 23:39:37Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  * @deprecated since 1.8.0alpha1
@@ -30,7 +29,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 0.1
  * @deprecated since 1.8.0alpha1
@@ -74,8 +73,8 @@ class PEAR_Command_Auth extends PEAR_Command_Channels
      *
      * @access public
      */
-    function PEAR_Command_Auth(&$ui, &$config)
+    function __construct(&$ui, &$config)
     {
-        parent::PEAR_Command_Channels($ui, $config);
+        parent::__construct($ui, $config);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/PEAR/PEAR/Command/Build.php b/lib/vendor/PEAR/PEAR/Command/Build.php
index e4821eee7..3bb99454d 100644
--- a/lib/vendor/PEAR/PEAR/Command/Build.php
+++ b/lib/vendor/PEAR/PEAR/Command/Build.php
@@ -11,7 +11,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Build.php 276383 2009-02-24 23:39:37Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  */
@@ -31,7 +30,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 0.1
  */
@@ -53,9 +52,9 @@ class PEAR_Command_Build extends PEAR_Command_Common
      *
      * @access public
      */
-    function PEAR_Command_Build(&$ui, &$config)
+    function __construct(&$ui, &$config)
     {
-        parent::PEAR_Command_Common($ui, $config);
+        parent::__construct($ui, $config);
     }
 
     function doBuild($command, $options, $params)
@@ -65,7 +64,7 @@ function doBuild($command, $options, $params)
             $params[0] = 'package.xml';
         }
 
-        $builder = &new PEAR_Builder($this->ui);
+        $builder = new PEAR_Builder($this->ui);
         $this->debug = $this->config->get('verbose');
         $err = $builder->build($params[0], array(&$this, 'buildCallback'));
         if (PEAR::isError($err)) {
@@ -82,4 +81,4 @@ function buildCallback($what, $data)
             $this->ui->outputData(rtrim($data), 'build');
         }
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/PEAR/PEAR/Command/Channels.php b/lib/vendor/PEAR/PEAR/Command/Channels.php
index f267d1836..b9286370a 100644
--- a/lib/vendor/PEAR/PEAR/Command/Channels.php
+++ b/lib/vendor/PEAR/PEAR/Command/Channels.php
@@ -12,7 +12,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Channels.php 287561 2009-08-21 22:42:58Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -32,7 +31,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
@@ -167,9 +166,9 @@ class PEAR_Command_Channels extends PEAR_Command_Common
      *
      * @access public
      */
-    function PEAR_Command_Channels(&$ui, &$config)
+    function __construct(&$ui, &$config)
     {
-        parent::PEAR_Command_Common($ui, $config);
+        parent::__construct($ui, $config);
     }
 
     function _sortChannels($a, $b)
@@ -695,7 +694,7 @@ function doAlias($command, $options, $params)
                 'already aliased to "' . strtolower($params[1]) . '", cannot re-alias');
         }
 
-        $chan = &$reg->getChannel($params[0]);
+        $chan = $reg->getChannel($params[0]);
         if (PEAR::isError($chan)) {
             return $this->raiseError('Corrupt registry?  Error retrieving channel "' . $params[0] .
                 '" information (' . $chan->getMessage() . ')');
@@ -880,4 +879,4 @@ function doLogout($command, $options, $params)
         $this->config->store();
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/PEAR/PEAR/Command/Common.php b/lib/vendor/PEAR/PEAR/Command/Common.php
index 9427bccc3..41384ef0b 100644
--- a/lib/vendor/PEAR/PEAR/Command/Common.php
+++ b/lib/vendor/PEAR/PEAR/Command/Common.php
@@ -10,7 +10,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Common.php 276383 2009-02-24 23:39:37Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  */
@@ -29,7 +28,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 0.1
  */
@@ -81,9 +80,9 @@ class PEAR_Command_Common extends PEAR
      *
      * @access public
      */
-    function PEAR_Command_Common(&$ui, &$config)
+    function __construct(&$ui, &$config)
     {
-        parent::PEAR();
+        parent::__construct();
         $this->config = &$config;
         $this->ui = &$ui;
     }
@@ -270,4 +269,4 @@ function run($command, $options, $params)
 
         return $this->$func($command, $options, $params);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/PEAR/PEAR/Command/Config.php b/lib/vendor/PEAR/PEAR/Command/Config.php
index 7fd863b4b..63efb07be 100644
--- a/lib/vendor/PEAR/PEAR/Command/Config.php
+++ b/lib/vendor/PEAR/PEAR/Command/Config.php
@@ -10,7 +10,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Config.php 287554 2009-08-21 21:16:25Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  */
@@ -29,7 +28,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 0.1
  */
@@ -133,9 +132,9 @@ class PEAR_Command_Config extends PEAR_Command_Common
      *
      * @access public
      */
-    function PEAR_Command_Config(&$ui, &$config)
+    function __construct(&$ui, &$config)
     {
-        parent::PEAR_Command_Common($ui, $config);
+        parent::__construct($ui, $config);
     }
 
     function doConfigShow($command, $options, $params)
@@ -205,12 +204,13 @@ function doConfigGet($command, $options, $params)
                 return $this->raiseError("config-get expects 1 or 2 parameters");
         }
 
-        $channel = isset($options['channel']) ? $options['channel'] : $this->config->get('default_channel');
         $reg = &$this->config->getRegistry();
+        $channel = isset($options['channel']) ? $options['channel'] : $this->config->get('default_channel');
         if (!$reg->channelExists($channel)) {
             return $this->raiseError('Channel "' . $channel . '" does not exist');
         }
 
+        $channel = $reg->channelName($channel);
         $this->ui->outputData($this->config->get($config_key, $layer, $channel), $command);
         return true;
     }
@@ -337,7 +337,7 @@ function doConfigCreate($command, $options, $params)
         }
 
         $params[1] = realpath($params[1]);
-        $config = &new PEAR_Config($params[1], '#no#system#config#', false, false);
+        $config = new PEAR_Config($params[1], '#no#system#config#', false, false);
         if ($root{strlen($root) - 1} == '/') {
             $root = substr($root, 0, strlen($root) - 1);
         }
@@ -354,6 +354,7 @@ function doConfigCreate($command, $options, $params)
         $config->set('download_dir', $windows ? "$root\\pear\\download" : "$root/pear/download");
         $config->set('temp_dir', $windows ? "$root\\pear\\temp" : "$root/pear/temp");
         $config->set('bin_dir', $windows ? "$root\\pear" : "$root/pear");
+        $config->set('man_dir', $windows ? "$root\\pear\\man" : "$root/pear/man");
         $config->writeConfigFile();
         $this->_showConfig($config);
         $this->ui->outputData('Successfully created default configuration file "' . $params[1] . '"',
@@ -410,4 +411,4 @@ function _checkLayer($layer = null)
 
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/PEAR/PEAR/Command/Install.php b/lib/vendor/PEAR/PEAR/Command/Install.php
index d5a8dd475..a1d3a7023 100644
--- a/lib/vendor/PEAR/PEAR/Command/Install.php
+++ b/lib/vendor/PEAR/PEAR/Command/Install.php
@@ -10,7 +10,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Install.php 287477 2009-08-19 14:19:43Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  */
@@ -30,7 +29,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 0.1
  */
@@ -313,9 +312,9 @@ class PEAR_Command_Install extends PEAR_Command_Common
      *
      * @access public
      */
-    function PEAR_Command_Install(&$ui, &$config)
+    function __construct(&$ui, &$config)
     {
-        parent::PEAR_Command_Common($ui, $config);
+        parent::__construct($ui, $config);
     }
 
     // }}}
@@ -328,7 +327,7 @@ function &getDownloader(&$ui, $options, &$config)
         if (!class_exists('PEAR_Downloader')) {
             require_once 'PEAR/Downloader.php';
         }
-        $a = &new PEAR_Downloader($ui, $options, $config);
+        $a = new PEAR_Downloader($ui, $options, $config);
         return $a;
     }
 
@@ -340,7 +339,7 @@ function &getInstaller(&$ui)
         if (!class_exists('PEAR_Installer')) {
             require_once 'PEAR/Installer.php';
         }
-        $a = &new PEAR_Installer($ui);
+        $a = new PEAR_Installer($ui);
         return $a;
     }
 
@@ -364,7 +363,7 @@ function enableExtension($binaries, $type)
             $info = ob_get_contents();
             ob_end_clean();
             $debug = function_exists('leak') ? '_debug' : '';
-            $ts = preg_match('Thread Safety.+enabled', $info) ? '_ts' : '';
+            $ts = preg_match('/Thread Safety.+enabled/', $info) ? '_ts' : '';
             $enable = 'zend_extension' . $debug . $ts;
         }
         foreach ($ini[$search] as $line => $extension) {
@@ -417,7 +416,7 @@ function disableExtension($binaries, $type)
             $info = ob_get_contents();
             ob_end_clean();
             $debug = function_exists('leak') ? '_debug' : '';
-            $ts = preg_match('Thread Safety.+enabled', $info) ? '_ts' : '';
+            $ts = preg_match('/Thread Safety.+enabled/', $info) ? '_ts' : '';
             $enable = 'zend_extension' . $debug . $ts;
         }
         $found = false;
@@ -468,7 +467,7 @@ function _parseIni($filename)
         $ts = preg_match('/Thread Safety.+enabled/', $info) ? '_ts' : '';
         $zend_extension_line = 'zend_extension' . $debug . $ts;
         $all = @file($filename);
-        if (!$all) {
+        if ($all === false) {
             return PEAR::raiseError('php.ini "' . $filename .'" could not be read');
         }
         $zend_extensions = $extensions = array();
@@ -556,7 +555,13 @@ function doInstall($command, $options, $params)
             $packrootphp_dir = $this->installer->_prependPath(
                 $this->config->get('php_dir', null, 'pear.php.net'),
                 $options['packagingroot']);
-            $instreg = new PEAR_Registry($packrootphp_dir); // other instreg!
+            $metadata_dir = $this->config->get('metadata_dir', null, 'pear.php.net');
+            if ($metadata_dir) {
+                $metadata_dir = $this->installer->_prependPath(
+                    $metadata_dir,
+                    $options['packagingroot']);
+            }
+            $instreg = new PEAR_Registry($packrootphp_dir, false, false, $metadata_dir); // other instreg!
 
             if ($this->config->get('verbose') > 2) {
                 $this->ui->outputData('using package root: ' . $options['packagingroot']);
@@ -730,7 +735,8 @@ function doInstall($command, $options, $params)
             if ($param->getPackageType() == 'extsrc' ||
                   $param->getPackageType() == 'extbin' ||
                   $param->getPackageType() == 'zendextsrc' ||
-                  $param->getPackageType() == 'zendextbin') {
+                  $param->getPackageType() == 'zendextbin'
+            ) {
                 $pkg = &$param->getPackageFile();
                 if ($instbin = $pkg->getInstalledBinary()) {
                     $instpkg = &$instreg->getPackage($instbin, $pkg->getChannel());
@@ -741,7 +747,8 @@ function doInstall($command, $options, $params)
                 foreach ($instpkg->getFilelist() as $name => $atts) {
                     $pinfo = pathinfo($atts['installed_as']);
                     if (!isset($pinfo['extension']) ||
-                          in_array($pinfo['extension'], array('c', 'h'))) {
+                          in_array($pinfo['extension'], array('c', 'h'))
+                    ) {
                         continue; // make sure we don't match php_blah.h
                     }
 
@@ -766,17 +773,13 @@ function doInstall($command, $options, $params)
                             if ($param->getPackageType() == 'extsrc' ||
                                   $param->getPackageType() == 'extbin') {
                                 $exttype = 'extension';
+                                $extpath = $pinfo[1]['basename'];
                             } else {
-                                ob_start();
-                                phpinfo(INFO_GENERAL);
-                                $info = ob_get_contents();
-                                ob_end_clean();
-                                $debug = function_exists('leak') ? '_debug' : '';
-                                $ts = preg_match('Thread Safety.+enabled', $info) ? '_ts' : '';
-                                $exttype = 'zend_extension' . $debug . $ts;
+                                $exttype = 'zend_extension';
+                                $extpath = $atts['installed_as'];
                             }
                             $extrainfo[] = 'You should add "' . $exttype . '=' .
-                                $pinfo[1]['basename'] . '" to php.ini';
+                                $extpath . '" to php.ini';
                         } else {
                             $extrainfo[] = 'Extension ' . $instpkg->getProvidesExtension() .
                                 ' enabled in php.ini';
@@ -1033,7 +1036,7 @@ function doUninstall($command, $options, $params)
                                     $info = ob_get_contents();
                                     ob_end_clean();
                                     $debug = function_exists('leak') ? '_debug' : '';
-                                    $ts = preg_match('Thread Safety.+enabled', $info) ? '_ts' : '';
+                                    $ts = preg_match('/Thread Safety.+enabled/', $info) ? '_ts' : '';
                                     $exttype = 'zend_extension' . $debug . $ts;
                                 }
                                 $this->ui->outputData('Unable to remove "' . $exttype . '=' .
@@ -1134,7 +1137,7 @@ function doBundle($command, $options, $params)
         $dest .= DIRECTORY_SEPARATOR . $pkgname;
         $orig = $pkgname . '-' . $pkgversion;
 
-        $tar = &new Archive_Tar($pkgfile->getArchiveFile());
+        $tar = new Archive_Tar($pkgfile->getArchiveFile());
         if (!$tar->extractModify($dest, $orig)) {
             return $this->raiseError('unable to unpack ' . $pkgfile->getArchiveFile());
         }
@@ -1196,7 +1199,7 @@ function _filterUptodatePackages($packages, $command)
 
             if (!isset($latestReleases[$channel])) {
                 // fill in cache for this channel
-                $chan = &$reg->getChannel($channel);
+                $chan = $reg->getChannel($channel);
                 if (PEAR::isError($chan)) {
                     return $this->raiseError($chan);
                 }
@@ -1263,4 +1266,4 @@ function _filterUptodatePackages($packages, $command)
 
         return $ret;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/PEAR/PEAR/Command/Mirror.php b/lib/vendor/PEAR/PEAR/Command/Mirror.php
index 10140b885..473c62867 100644
--- a/lib/vendor/PEAR/PEAR/Command/Mirror.php
+++ b/lib/vendor/PEAR/PEAR/Command/Mirror.php
@@ -9,7 +9,6 @@
  * @author     Alexander Merz <alexmerz@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Mirror.php 276383 2009-02-24 23:39:37Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.2.0
  */
@@ -27,7 +26,7 @@
  * @author     Alexander Merz <alexmerz@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.2.0
  */
@@ -60,9 +59,9 @@ class PEAR_Command_Mirror extends PEAR_Command_Common
      * @param object PEAR_Frontend a reference to an frontend
      * @param object PEAR_Config a reference to the configuration data
      */
-    function PEAR_Command_Mirror(&$ui, &$config)
+    function __construct(&$ui, &$config)
     {
-        parent::PEAR_Command_Common($ui, $config);
+        parent::__construct($ui, $config);
     }
 
     /**
@@ -82,7 +81,7 @@ function &factory($a)
     * @param string $command the command
     * @param array $options the command options before the command
     * @param array $params the stuff after the command name
-    * @return bool true if succesful
+    * @return bool true if successful
     * @throw PEAR_Error
     */
     function doDownloadAll($command, $options, $params)
@@ -136,4 +135,4 @@ function doDownloadAll($command, $options, $params)
 
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/PEAR/PEAR/Command/Package.php b/lib/vendor/PEAR/PEAR/Command/Package.php
index 6873d59be..c62948f1e 100644
--- a/lib/vendor/PEAR/PEAR/Command/Package.php
+++ b/lib/vendor/PEAR/PEAR/Command/Package.php
@@ -12,7 +12,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Package.php 287559 2009-08-21 22:33:10Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  */
@@ -160,7 +159,7 @@ class PEAR_Command_Package extends PEAR_Command_Common
  Sets a SVN tag on all files in a package.  Use this command after you have
  packaged a distribution tarball with the "package" command to tag what
  revisions of what files were in that release.  If need to fix something
- after running cvstag once, but before the tarball is released to the public,
+ after running svntag once, but before the tarball is released to the public,
  use the "slide" option to move the release tag.
 
  to include files (such as a second package.xml, or tests not included in the
@@ -283,9 +282,9 @@ class PEAR_Command_Package extends PEAR_Command_Common
      *
      * @access public
      */
-    function PEAR_Command_Package(&$ui, &$config)
+    function __construct(&$ui, &$config)
     {
-        parent::PEAR_Command_Common($ui, $config);
+        parent::__construct($ui, $config);
     }
 
     function _displayValidationResults($err, $warn, $strict = false)
@@ -310,11 +309,11 @@ function &getPackager()
         if (!class_exists('PEAR_Packager')) {
             require_once 'PEAR/Packager.php';
         }
-        $a = &new PEAR_Packager;
+        $a = new PEAR_Packager;
         return $a;
     }
 
-    function &getPackageFile($config, $debug = false, $tmpdir = null)
+    function &getPackageFile($config, $debug = false)
     {
         if (!class_exists('PEAR_Common')) {
             require_once 'PEAR/Common.php';
@@ -322,7 +321,7 @@ function &getPackageFile($config, $debug = false, $tmpdir = null)
         if (!class_exists('PEAR_PackageFile')) {
             require_once 'PEAR/PackageFile.php';
         }
-        $a = &new PEAR_PackageFile($config, $debug, $tmpdir);
+        $a = new PEAR_PackageFile($config, $debug);
         $common = new PEAR_Common;
         $common->ui = $this->ui;
         $a->setLogger($common);
@@ -372,7 +371,7 @@ function doPackageValidate($command, $options, $params)
             $info = $obj->fromPackageFile($params[0], PEAR_VALIDATE_NORMAL);
         } else {
             $archive = $info->getArchiveFile();
-            $tar = &new Archive_Tar($archive);
+            $tar = new Archive_Tar($archive);
             $tar->extract(dirname($info->getPackageFile()));
             $info->setPackageFile(dirname($info->getPackageFile()) . DIRECTORY_SEPARATOR .
                 $info->getPackage() . '-' . $info->getVersion() . DIRECTORY_SEPARATOR .
@@ -421,7 +420,7 @@ function doSvnTag($command, $options, $params)
 
         $packageFile = realpath($params[0]);
         $dir = dirname($packageFile);
-        $dir = substr($dir, strrpos($dir, '/') + 1);
+        $dir = substr($dir, strrpos($dir, DIRECTORY_SEPARATOR) + 1);
         $obj  = &$this->getPackageFile($this->config, $this->_debug);
         $info = $obj->fromAnyFile($packageFile, PEAR_VALIDATE_NORMAL);
         if (PEAR::isError($info)) {
@@ -467,7 +466,7 @@ function doSvnTag($command, $options, $params)
                 'name' => 'modified',
                 'type' => 'yesno',
                 'default' => 'no',
-                'prompt' => 'You have files in your SVN checkout (' . $path['from']  . ') that have been modified but not commited, do you still want to tag ' . $version . '?',
+                'prompt' => 'You have files in your SVN checkout (' . $path['from']  . ') that have been modified but not committed, do you still want to tag ' . $version . '?',
             ));
             $answers = $this->ui->confirmDialog($params);
 
@@ -481,7 +480,7 @@ function doSvnTag($command, $options, $params)
         }
 
         // Check if tag already exists
-        $releaseTag = $path['local']['base'] . 'tags/' . $svntag;
+        $releaseTag = $path['local']['base'] . 'tags' . DIRECTORY_SEPARATOR . $svntag;
         $existsCommand = 'svn ls ' . $path['base'] . 'tags/';
 
         $fp = popen($existsCommand, "r");
@@ -491,9 +490,13 @@ function doSvnTag($command, $options, $params)
         }
         pclose($fp);
 
-        if (in_array($svntag . '/', explode("\n", $out))) {
+        if (in_array($svntag . DIRECTORY_SEPARATOR, explode("\n", $out))) {
             $this->ui->outputData($this->output, $command);
             return $this->raiseError('SVN tag ' . $svntag . ' for ' . $package . ' already exists.');
+        } elseif (file_exists($path['local']['base'] . 'tags') === false) {
+            return $this->raiseError('Can not locate the tags directory at ' . $path['local']['base'] . 'tags');
+        } elseif (is_writeable($path['local']['base'] . 'tags') === false) {
+            return $this->raiseError('Can not write to the tag directory at ' . $path['local']['base'] . 'tags');
         } else {
             $makeCommand = 'svn mkdir ' . $releaseTag;
             $this->output .= "+ $makeCommand\n";
@@ -517,8 +520,18 @@ function doSvnTag($command, $options, $params)
         $command .= ' copy --parents ';
 
         $dir   = dirname($packageFile);
-        $dir   = substr($dir, strrpos($dir, '/') + 1);
+        $dir   = substr($dir, strrpos($dir, DIRECTORY_SEPARATOR) + 1);
         $files = array_keys($info->getFilelist());
+        if (!in_array(basename($packageFile), $files)) {
+            $files[] = basename($packageFile);
+        }
+
+        array_shift($params);
+        if (count($params)) {
+            // add in additional files to be tagged (package files and such)
+            $files = array_merge($files, $params);
+        }
+
         $commands = array();
         foreach ($files as $file) {
             if (!file_exists($file)) {
@@ -569,10 +582,10 @@ function _svnFindPath($file)
         $path['from'] = substr($url, 0, strrpos($url, '/'));
         $path['base'] = substr($path['from'], 0, strrpos($path['from'], '/') + 1);
 
-        // Figure out the local paths
-        $pos = strpos($file, '/trunk/');
+        // Figure out the local paths - see http://pear.php.net/bugs/17463
+        $pos = strpos($file, DIRECTORY_SEPARATOR . 'trunk' . DIRECTORY_SEPARATOR);
         if ($pos === false) {
-            $pos = strpos($file, '/branches/');
+            $pos = strpos($file, DIRECTORY_SEPARATOR . 'branches' . DIRECTORY_SEPARATOR);
         }
         $path['local']['base'] = substr($file, 0, $pos + 1);
 
@@ -867,7 +880,7 @@ function doPackageDependencies($command, $options, $params)
                         );
                     foreach ($deps as $type => $subd) {
                         $req = ($type == 'required') ? 'Yes' : 'No';
-                        if ($type == 'group') {
+                        if ($type == 'group' && isset($subd['attribs']['name'])) {
                             $group = $subd['attribs']['name'];
                         } else {
                             $group = '';
@@ -958,7 +971,9 @@ function doSign($command, $options, $params)
         }
 
         $tar = new Archive_Tar($params[0]);
-        $tmpdir = System::mktemp('-d pearsign');
+
+        $tmpdir = $this->config->get('temp_dir');
+        $tmpdir = System::mktemp(' -t "' . $tmpdir . '" -d pearsign');
         if (!$tar->extractList('package2.xml package.xml package.sig', $tmpdir)) {
             return $this->raiseError("failed to extract tar file");
         }
@@ -1015,7 +1030,7 @@ function &getInstaller(&$ui)
         if (!class_exists('PEAR_Installer')) {
             require_once 'PEAR/Installer.php';
         }
-        $a = &new PEAR_Installer($ui);
+        $a = new PEAR_Installer($ui);
         return $a;
     }
 
@@ -1032,7 +1047,7 @@ function &getCommandPackaging(&$ui, &$config)
         }
 
         if (class_exists('PEAR_Command_Packaging')) {
-            $a = &new PEAR_Command_Packaging($ui, $config);
+            $a = new PEAR_Command_Packaging($ui, $config);
         } else {
             $a = null;
         }
@@ -1105,4 +1120,4 @@ function doConvert($command, $options, $params)
         $this->ui->outputData('Wrote new version 2.0 package.xml to "' . $saved . '"');
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/PEAR/PEAR/Command/Package.xml b/lib/vendor/PEAR/PEAR/Command/Package.xml
index 9f093ef62..d1aff9d48 100644
--- a/lib/vendor/PEAR/PEAR/Command/Package.xml
+++ b/lib/vendor/PEAR/PEAR/Command/Package.xml
@@ -120,7 +120,7 @@ of a specific release.
  Sets a SVN tag on all files in a package.  Use this command after you have
  packaged a distribution tarball with the &quot;package&quot; command to tag what
  revisions of what files were in that release.  If need to fix something
- after running cvstag once, but before the tarball is released to the public,
+ after running svntag once, but before the tarball is released to the public,
  use the &quot;slide&quot; option to move the release tag.
 
  to include files (such as a second package.xml, or tests not included in the
diff --git a/lib/vendor/PEAR/PEAR/Command/Pickle.php b/lib/vendor/PEAR/PEAR/Command/Pickle.php
index 9cdb77b2c..8ac3fcb6b 100644
--- a/lib/vendor/PEAR/PEAR/Command/Pickle.php
+++ b/lib/vendor/PEAR/PEAR/Command/Pickle.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  2005-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Pickle.php 276383 2009-02-24 23:39:37Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.1
  */
@@ -27,7 +26,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  2005-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.1
  */
@@ -76,9 +75,9 @@ class PEAR_Command_Pickle extends PEAR_Command_Common
      *
      * @access public
      */
-    function PEAR_Command_Pickle(&$ui, &$config)
+    function __construct(&$ui, &$config)
     {
-        parent::PEAR_Command_Common($ui, $config);
+        parent::__construct($ui, $config);
     }
 
     /**
@@ -92,7 +91,7 @@ function &getPackager()
             require_once 'PEAR/Packager.php';
         }
 
-        $a = &new PEAR_Packager;
+        $a = new PEAR_Packager;
         return $a;
     }
 
@@ -104,7 +103,7 @@ function &getPackager()
      * @param string|null $tmpdir
      * @return PEAR_PackageFile
      */
-    function &getPackageFile($config, $debug = false, $tmpdir = null)
+    function &getPackageFile($config, $debug = false)
     {
         if (!class_exists('PEAR_Common')) {
             require_once 'PEAR/Common.php';
@@ -114,7 +113,7 @@ function &getPackageFile($config, $debug = false, $tmpdir = null)
             require_once 'PEAR/PackageFile.php';
         }
 
-        $a = &new PEAR_PackageFile($config, $debug, $tmpdir);
+        $a = new PEAR_PackageFile($config, $debug);
         $common = new PEAR_Common;
         $common->ui = $this->ui;
         $a->setLogger($common);
@@ -418,4 +417,4 @@ function _convertPackage($packagexml)
         $gen = &$pf->getDefaultGenerator();
         $gen->toPackageFile('.');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/PEAR/PEAR/Command/Registry.php b/lib/vendor/PEAR/PEAR/Command/Registry.php
index 7ebc5efb4..3a78b0330 100644
--- a/lib/vendor/PEAR/PEAR/Command/Registry.php
+++ b/lib/vendor/PEAR/PEAR/Command/Registry.php
@@ -10,7 +10,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Registry.php 276383 2009-02-24 23:39:37Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  */
@@ -29,7 +28,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 0.1
  */
@@ -98,9 +97,9 @@ class PEAR_Command_Registry extends PEAR_Command_Common
      *
      * @access public
      */
-    function PEAR_Command_Registry(&$ui, &$config)
+    function __construct(&$ui, &$config)
     {
-        parent::PEAR_Command_Common($ui, $config);
+        parent::__construct($ui, $config);
     }
 
     function _sortinfo($a, $b)
@@ -261,7 +260,7 @@ function doFileList($command, $options, $params)
                 require_once 'PEAR/PackageFile.php';
             }
 
-            $pkg = &new PEAR_PackageFile($this->config, $this->_debug);
+            $pkg = new PEAR_PackageFile($this->config, $this->_debug);
             PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
             $info = &$pkg->fromAnyFile($params[0], PEAR_VALIDATE_NORMAL);
             PEAR::staticPopErrorHandling();
@@ -424,7 +423,9 @@ function doInfo($command, $options, $params)
 
         $info = $fp = false;
         $reg = &$this->config->getRegistry();
-        if ((file_exists($params[0]) && is_file($params[0]) && !is_dir($params[0])) || $fp = @fopen($params[0], 'r')) {
+        if (is_file($params[0]) && !is_dir($params[0]) &&
+            (file_exists($params[0]) || $fp = @fopen($params[0], 'r'))
+        ) {
             if ($fp) {
                 fclose($fp);
             }
@@ -433,7 +434,7 @@ function doInfo($command, $options, $params)
                 require_once 'PEAR/PackageFile.php';
             }
 
-            $pkg = &new PEAR_PackageFile($this->config, $this->_debug);
+            $pkg = new PEAR_PackageFile($this->config, $this->_debug);
             PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
             $obj = &$pkg->fromAnyFile($params[0], PEAR_VALIDATE_NORMAL);
             PEAR::staticPopErrorHandling();
@@ -1140,4 +1141,4 @@ function _doInfo2($command, $options, $params, &$obj, $installed)
         $data['raw'] = $obj->getArray(); // no validation needed
         $this->ui->outputData($data, 'package-info');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/PEAR/PEAR/Command/Remote.php b/lib/vendor/PEAR/PEAR/Command/Remote.php
index 6f87e31de..c0a8e92a8 100644
--- a/lib/vendor/PEAR/PEAR/Command/Remote.php
+++ b/lib/vendor/PEAR/PEAR/Command/Remote.php
@@ -11,7 +11,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Remote.php 287477 2009-08-19 14:19:43Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  */
@@ -31,7 +30,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 0.1
  */
@@ -144,7 +143,7 @@ class PEAR_Command_Remote extends PEAR_Command_Common
             'shortcut' => 'cc',
             'options' => array(),
             'doc' => '
-Clear the XML-RPC/REST cache.  See also the cache_ttl configuration
+Clear the REST cache. See also the cache_ttl configuration
 parameter.
 ',
             ),
@@ -155,9 +154,9 @@ class PEAR_Command_Remote extends PEAR_Command_Common
      *
      * @access public
      */
-    function PEAR_Command_Remote(&$ui, &$config)
+    function __construct(&$ui, &$config)
     {
-        parent::PEAR_Command_Common($ui, $config);
+        parent::__construct($ui, $config);
     }
 
     function _checkChannelForStatus($channel, $chan)
@@ -579,7 +578,7 @@ function &getDownloader($options)
         if (!class_exists('PEAR_Downloader')) {
             require_once 'PEAR/Downloader.php';
         }
-        $a = &new PEAR_Downloader($this->ui, $options, $this->config);
+        $a = new PEAR_Downloader($this->ui, $options, $this->config);
         return $a;
     }
 
@@ -590,7 +589,7 @@ function doDownload($command, $options, $params)
 
         // eliminate error messages for preferred_state-related errors
         /* TODO: Should be an option, but until now download does respect
-           prefered state */
+           preferred state */
         /* $options['ignorepreferred_state'] = 1; */
         // eliminate error messages for preferred_state-related errors
 
@@ -668,13 +667,13 @@ function doListUpgrades($command, $options, $params)
             $preferred_mirror = $this->config->get('preferred_mirror');
             if ($chan->supportsREST($preferred_mirror) &&
                 (
-                   //($base2 = $chan->getBaseURL('REST1.4', $preferred_mirror)) ||
-                   ($base  = $chan->getBaseURL('REST1.0', $preferred_mirror))
+                   ($base2 = $chan->getBaseURL('REST1.3', $preferred_mirror))
+                   || ($base  = $chan->getBaseURL('REST1.0', $preferred_mirror))
                 )
 
             ) {
                 if ($base2) {
-                    $rest = &$this->config->getREST('1.4', array());
+                    $rest = &$this->config->getREST('1.3', array());
                     $base = $base2;
                 } else {
                     $rest = &$this->config->getREST('1.0', array());
@@ -776,6 +775,7 @@ function doClearCache($command, $options, $params)
         if ($verbose >= 1) {
             $output .= "reading directory $cache_dir\n";
         }
+
         $num = 0;
         while ($ent = readdir($dp)) {
             if (preg_match('/rest.cache(file|id)\\z/', $ent)) {
@@ -806,4 +806,4 @@ function doClearCache($command, $options, $params)
         $this->ui->outputData(rtrim($output), $command);
         return $num;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/PEAR/PEAR/Command/Test.php b/lib/vendor/PEAR/PEAR/Command/Test.php
index 3715859ff..69c72c4aa 100644
--- a/lib/vendor/PEAR/PEAR/Command/Test.php
+++ b/lib/vendor/PEAR/PEAR/Command/Test.php
@@ -11,7 +11,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Test.php 279072 2009-04-20 19:57:41Z cellog $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  */
@@ -31,7 +30,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 0.1
  */
@@ -87,6 +86,10 @@ class PEAR_Command_Test extends PEAR_Command_Common
                     'shortopt' => 'x',
                     'doc'      => 'Generate a code coverage report (requires Xdebug 2.0.0+)',
                 ),
+                'showdiff' => array(
+                    'shortopt' => 'd',
+                    'doc' => 'Output diff on test failure',
+                ),
             ),
             'doc' => '[testfile|dir ...]
 Run regression tests with PHP\'s regression testing script (run-tests.php).',
@@ -100,9 +103,9 @@ class PEAR_Command_Test extends PEAR_Command_Common
      *
      * @access public
      */
-    function PEAR_Command_Test(&$ui, &$config)
+    function __construct(&$ui, &$config)
     {
-        parent::PEAR_Command_Common($ui, $config);
+        parent::__construct($ui, $config);
     }
 
     function doRunTests($command, $options, $params)
@@ -332,6 +335,9 @@ function doRunTests($command, $options, $params)
             }
         }
 
-        return true;
+        if (count($failed) == 0) {
+            return true;
+        }
+        return $this->raiseError('Some tests failed');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/PEAR/PEAR/Common.php b/lib/vendor/PEAR/PEAR/Common.php
index 527644167..1c4f79ceb 100644
--- a/lib/vendor/PEAR/PEAR/Common.php
+++ b/lib/vendor/PEAR/PEAR/Common.php
@@ -11,7 +11,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Common.php 282969 2009-06-28 23:09:27Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1.0
  * @deprecated File deprecated since Release 1.4.0a1
@@ -118,7 +117,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  * @deprecated This class will disappear, and its components will be spread
@@ -165,9 +164,9 @@ class PEAR_Common extends PEAR
      *
      * @access public
      */
-    function PEAR_Common()
+    function __construct()
     {
-        parent::PEAR();
+        parent::__construct();
         $this->config = &PEAR_Config::singleton();
         $this->debug = $this->config->get('verbose');
     }
@@ -241,11 +240,8 @@ function mkDirHier($dir)
      * @param string $msg    message to write to the log
      *
      * @return void
-     *
-     * @access public
-     * @static
      */
-    function log($level, $msg, $append_crlf = true)
+    public function log($level, $msg, $append_crlf = true)
     {
         if ($this->debug >= $level) {
             if (!class_exists('PEAR_Frontend')) {
@@ -325,9 +321,8 @@ function betterStates($state, $include = false)
      * Get the valid roles for a PEAR package maintainer
      *
      * @return array
-     * @static
      */
-    function getUserRoles()
+    public static function getUserRoles()
     {
         return $GLOBALS['_PEAR_Common_maintainer_roles'];
     }
@@ -336,9 +331,8 @@ function getUserRoles()
      * Get the valid package release states of packages
      *
      * @return array
-     * @static
      */
-    function getReleaseStates()
+    public static function getReleaseStates()
     {
         return $GLOBALS['_PEAR_Common_release_states'];
     }
@@ -347,9 +341,8 @@ function getReleaseStates()
      * Get the implemented dependency types (php, ext, pkg etc.)
      *
      * @return array
-     * @static
      */
-    function getDependencyTypes()
+    public static function getDependencyTypes()
     {
         return $GLOBALS['_PEAR_Common_dependency_types'];
     }
@@ -358,9 +351,8 @@ function getDependencyTypes()
      * Get the implemented dependency relations (has, lt, ge etc.)
      *
      * @return array
-     * @static
      */
-    function getDependencyRelations()
+    public static function getDependencyRelations()
     {
         return $GLOBALS['_PEAR_Common_dependency_relations'];
     }
@@ -369,9 +361,8 @@ function getDependencyRelations()
      * Get the implemented file roles
      *
      * @return array
-     * @static
      */
-    function getFileRoles()
+    public static function getFileRoles()
     {
         return $GLOBALS['_PEAR_Common_file_roles'];
     }
@@ -380,9 +371,8 @@ function getFileRoles()
      * Get the implemented file replacement types in
      *
      * @return array
-     * @static
      */
-    function getReplacementTypes()
+    public static function getReplacementTypes()
     {
         return $GLOBALS['_PEAR_Common_replacement_types'];
     }
@@ -391,9 +381,8 @@ function getReplacementTypes()
      * Get the implemented file replacement types in
      *
      * @return array
-     * @static
      */
-    function getProvideTypes()
+    public static function getProvideTypes()
     {
         return $GLOBALS['_PEAR_Common_provide_types'];
     }
@@ -402,9 +391,8 @@ function getProvideTypes()
      * Get the implemented file replacement types in
      *
      * @return array
-     * @static
      */
-    function getScriptPhases()
+    public static function getScriptPhases()
     {
         return $GLOBALS['_PEAR_Common_script_phases'];
     }
@@ -440,9 +428,8 @@ function validPackageVersion($ver)
     /**
      * @param string $path relative or absolute include path
      * @return boolean
-     * @static
      */
-    function isIncludeable($path)
+    public static function isIncludeable($path)
     {
         if (file_exists($path) && is_readable($path)) {
             return true;
@@ -489,7 +476,7 @@ function _postProcessChecks($pf)
      */
     function infoFromTgzFile($file)
     {
-        $packagefile = &new PEAR_PackageFile($this->config);
+        $packagefile = new PEAR_PackageFile($this->config);
         $pf = &$packagefile->fromTgzFile($file, PEAR_VALIDATE_NORMAL);
         return $this->_postProcessChecks($pf);
     }
@@ -508,7 +495,7 @@ function infoFromTgzFile($file)
      */
     function infoFromDescriptionFile($descfile)
     {
-        $packagefile = &new PEAR_PackageFile($this->config);
+        $packagefile = new PEAR_PackageFile($this->config);
         $pf = &$packagefile->fromPackageFile($descfile, PEAR_VALIDATE_NORMAL);
         return $this->_postProcessChecks($pf);
     }
@@ -527,7 +514,7 @@ function infoFromDescriptionFile($descfile)
      */
     function infoFromString($data)
     {
-        $packagefile = &new PEAR_PackageFile($this->config);
+        $packagefile = new PEAR_PackageFile($this->config);
         $pf = &$packagefile->fromXmlString($data, PEAR_VALIDATE_NORMAL, false);
         return $this->_postProcessChecks($pf);
     }
@@ -571,7 +558,7 @@ function _postProcessValidPackagexml(&$pf)
     function infoFromAny($info)
     {
         if (is_string($info) && file_exists($info)) {
-            $packagefile = &new PEAR_PackageFile($this->config);
+            $packagefile = new PEAR_PackageFile($this->config);
             $pf = &$packagefile->fromAnyFile($info, PEAR_VALIDATE_NORMAL);
             if (PEAR::isError($pf)) {
                 $errs = $pf->getUserinfo();
@@ -604,7 +591,7 @@ function infoFromAny($info)
     function xmlFromInfo($pkginfo)
     {
         $config      = &PEAR_Config::singleton();
-        $packagefile = &new PEAR_PackageFile($config);
+        $packagefile = new PEAR_PackageFile($config);
         $pf = &$packagefile->fromArray($pkginfo);
         $gen = &$pf->getDefaultGenerator();
         return $gen->toXml(PEAR_VALIDATE_PACKAGING);
@@ -626,7 +613,7 @@ function xmlFromInfo($pkginfo)
     function validatePackageInfo($info, &$errors, &$warnings, $dir_prefix = '')
     {
         $config      = &PEAR_Config::singleton();
-        $packagefile = &new PEAR_PackageFile($config);
+        $packagefile = new PEAR_PackageFile($config);
         PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
         if (strpos($info, '<?xml') !== false) {
             $pf = &$packagefile->fromXmlString($info, PEAR_VALIDATE_NORMAL, '');
@@ -814,24 +801,38 @@ function detectDependencies($any, $status_callback = null)
      * @param string  $save_dir  (optional) directory to save file in
      * @param mixed   $callback  (optional) function/method to call for status
      *                           updates
-     *
-     * @return string  Returns the full path of the downloaded file or a PEAR
-     *                 error on failure.  If the error is caused by
-     *                 socket-related errors, the error object will
-     *                 have the fsockopen error code available through
-     *                 getCode().
+     * @param false|string|array $lastmodified header values to check against
+     *                                         for caching
+     *                                         use false to return the header
+     *                                         values from this download
+     * @param false|array        $accept       Accept headers to send
+     * @param false|string       $channel      Channel to use for retrieving
+     *                                         authentication
+     *
+     * @return mixed  Returns the full path of the downloaded file or a PEAR
+     *                error on failure.  If the error is caused by
+     *                socket-related errors, the error object will
+     *                have the fsockopen error code available through
+     *                getCode().  If caching is requested, then return the header
+     *                values.
+     *                If $lastmodified was given and the there are no changes,
+     *                boolean false is returned.
      *
      * @access public
-     * @deprecated in favor of PEAR_Downloader::downloadHttp()
      */
-    function downloadHttp($url, &$ui, $save_dir = '.', $callback = null)
-    {
+    function downloadHttp(
+        $url, &$ui, $save_dir = '.', $callback = null, $lastmodified = null,
+        $accept = false, $channel = false
+    ) {
         if (!class_exists('PEAR_Downloader')) {
             require_once 'PEAR/Downloader.php';
         }
-        return PEAR_Downloader::downloadHttp($url, $ui, $save_dir, $callback);
+        return PEAR_Downloader::_downloadHttp(
+            $this, $url, $ui, $save_dir, $callback, $lastmodified,
+            $accept, $channel
+        );
     }
 }
 
 require_once 'PEAR/Config.php';
-require_once 'PEAR/PackageFile.php';
\ No newline at end of file
+require_once 'PEAR/PackageFile.php';
diff --git a/lib/vendor/PEAR/PEAR/Config.php b/lib/vendor/PEAR/PEAR/Config.php
index f47f3c08e..d9b4d273c 100644
--- a/lib/vendor/PEAR/PEAR/Config.php
+++ b/lib/vendor/PEAR/PEAR/Config.php
@@ -10,7 +10,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Config.php 286480 2009-07-29 02:50:02Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  */
@@ -87,6 +86,13 @@
     }
 }
 
+// Default for metadata_dir
+if (getenv('PHP_PEAR_METADATA_DIR')) {
+    define('PEAR_CONFIG_DEFAULT_METADATA_DIR', getenv('PHP_PEAR_METADATA_DIR'));
+} else {
+    define('PEAR_CONFIG_DEFAULT_METADATA_DIR', '');
+}
+
 // Default for ext_dir
 if (getenv('PHP_PEAR_EXTENSION_DIR')) {
     define('PEAR_CONFIG_DEFAULT_EXT_DIR', getenv('PHP_PEAR_EXTENSION_DIR'));
@@ -142,6 +148,18 @@
            $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'www');
 }
 
+// Default for man_dir
+if (getenv('PHP_PEAR_MAN_DIR')) {
+    define('PEAR_CONFIG_DEFAULT_MAN_DIR', getenv('PHP_PEAR_MAN_DIR'));
+} else {
+    if (defined('PHP_MANDIR')) { // Added in PHP5.3.7
+        define('PEAR_CONFIG_DEFAULT_MAN_DIR', PHP_MANDIR);
+    } else {
+        define('PEAR_CONFIG_DEFAULT_MAN_DIR', PHP_PREFIX . DIRECTORY_SEPARATOR .
+           'local' . DIRECTORY_SEPARATOR .'man');
+    }
+}
+
 // Default for test_dir
 if (getenv('PHP_PEAR_TEST_DIR')) {
     define('PEAR_CONFIG_DEFAULT_TEST_DIR', getenv('PHP_PEAR_TEST_DIR'));
@@ -246,7 +264,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 0.1
  */
@@ -440,6 +458,13 @@ class PEAR_Config extends PEAR
             'prompt' => 'PEAR www files directory',
             'group' => 'File Locations (Advanced)',
             ),
+        'man_dir' => array(
+            'type' => 'directory',
+            'default' => PEAR_CONFIG_DEFAULT_MAN_DIR,
+            'doc' => 'directory where unix manual pages are installed',
+            'prompt' => 'Systems manpage files directory',
+            'group' => 'File Locations (Advanced)',
+            ),
         'test_dir' => array(
             'type' => 'directory',
             'default' => PEAR_CONFIG_DEFAULT_TEST_DIR,
@@ -496,6 +521,13 @@ class PEAR_Config extends PEAR
             'prompt' => 'php.ini location',
             'group' => 'File Locations (Advanced)',
             ),
+        'metadata_dir' => array(
+            'type' => 'directory',
+            'default' => PEAR_CONFIG_DEFAULT_METADATA_DIR,
+            'doc' => 'directory where metadata files are installed (registry, filemap, channels, ...)',
+            'prompt' => 'PEAR metadata directory',
+            'group' => 'File Locations (Advanced)',
+            ),
         // Maintainers
         'username' => array(
             'type' => 'string',
@@ -592,10 +624,10 @@ class PEAR_Config extends PEAR
      *
      * @see PEAR_Config::singleton
      */
-    function PEAR_Config($user_file = '', $system_file = '', $ftp_file = false,
+    function __construct($user_file = '', $system_file = '', $ftp_file = false,
                          $strict = true)
     {
-        $this->PEAR();
+        parent::__construct();
         PEAR_Installer_Role::initializeConfig($this);
         $sl = DIRECTORY_SEPARATOR;
         if (empty($user_file)) {
@@ -647,7 +679,9 @@ function PEAR_Config($user_file = '', $system_file = '', $ftp_file = false,
             $this->configuration['default'][$key] = $info['default'];
         }
 
-        $this->_registry['default'] = &new PEAR_Registry($this->configuration['default']['php_dir']);
+        $this->_registry['default'] = new PEAR_Registry(
+            $this->configuration['default']['php_dir'], false, false,
+            $this->configuration['default']['metadata_dir']);
         $this->_registry['default']->setConfig($this, false);
         $this->_regInitialized['default'] = false;
         //$GLOBALS['_PEAR_Config_instance'] = &$this;
@@ -655,9 +689,8 @@ function PEAR_Config($user_file = '', $system_file = '', $ftp_file = false,
 
     /**
      * Return the default locations of user and system configuration files
-     * @static
      */
-    function getDefaultConfigFiles()
+    public static function getDefaultConfigFiles()
     {
         $sl = DIRECTORY_SEPARATOR;
         if (OS_WINDOWS) {
@@ -684,17 +717,15 @@ function getDefaultConfigFiles()
      *
      * @return object an existing or new PEAR_Config instance
      *
-     * @access public
-     *
      * @see PEAR_Config::PEAR_Config
      */
-    function &singleton($user_file = '', $system_file = '', $strict = true)
+    public static function &singleton($user_file = '', $system_file = '', $strict = true)
     {
         if (is_object($GLOBALS['_PEAR_Config_instance'])) {
             return $GLOBALS['_PEAR_Config_instance'];
         }
 
-        $t_conf = &new PEAR_Config($user_file, $system_file, false, $strict);
+        $t_conf = new PEAR_Config($user_file, $system_file, false, $strict);
         if ($t_conf->_errorsFound > 0) {
              return $t_conf->lastError;
         }
@@ -754,7 +785,9 @@ function readConfigFile($file = null, $layer = 'user', $strict = true)
         $this->configuration[$layer] = $data;
         $this->_setupChannels();
         if (!$this->_noRegistry && ($phpdir = $this->get('php_dir', $layer, 'pear.php.net'))) {
-            $this->_registry[$layer] = &new PEAR_Registry($phpdir);
+            $this->_registry[$layer] = new PEAR_Registry(
+                $phpdir, false, false,
+                $this->get('metadata_dir', $layer, 'pear.php.net'));
             $this->_registry[$layer]->setConfig($this, false);
             $this->_regInitialized[$layer] = false;
         } else {
@@ -783,7 +816,7 @@ function readFTPConfigFile($path)
                 return PEAR::raiseError('PEAR_RemoteInstaller must be installed to use remote config');
             }
 
-            $this->_ftp = &new PEAR_FTP;
+            $this->_ftp = new PEAR_FTP;
             $this->_ftp->pushErrorHandling(PEAR_ERROR_RETURN);
             $e = $this->_ftp->init($path);
             if (PEAR::isError($e)) {
@@ -911,7 +944,9 @@ function mergeConfigFile($file, $override = true, $layer = 'user', $strict = tru
 
         $this->_setupChannels();
         if (!$this->_noRegistry && ($phpdir = $this->get('php_dir', $layer, 'pear.php.net'))) {
-            $this->_registry[$layer] = &new PEAR_Registry($phpdir);
+            $this->_registry[$layer] = new PEAR_Registry(
+                $phpdir, false, false,
+                $this->get('metadata_dir', $layer, 'pear.php.net'));
             $this->_registry[$layer]->setConfig($this, false);
             $this->_regInitialized[$layer] = false;
         } else {
@@ -924,9 +959,8 @@ function mergeConfigFile($file, $override = true, $layer = 'user', $strict = tru
      * @param array
      * @param array
      * @return array
-     * @static
      */
-    function arrayMergeRecursive($arr2, $arr1)
+    public static function arrayMergeRecursive($arr2, $arr1)
     {
         $ret = array();
         foreach ($arr2 as $key => $data) {
@@ -1022,16 +1056,12 @@ function _readConfigDataFrom($file)
         }
 
         $size = filesize($file);
-        $rt = get_magic_quotes_runtime();
-        set_magic_quotes_runtime(0);
         fclose($fp);
         $contents = file_get_contents($file);
         if (empty($contents)) {
             return $this->raiseError('Configuration file "' . $file . '" is empty');
         }
 
-        set_magic_quotes_runtime($rt);
-
         $version = false;
         if (preg_match('/^#PEAR_Config\s+(\S+)\s+/si', $contents, $matches)) {
             $version = $matches[1];
@@ -1357,7 +1387,7 @@ function get($key, $layer = null, $channel = false)
                     if ($key == 'preferred_mirror') {
                         $reg = &$this->getRegistry();
                         if (is_object($reg)) {
-                            $chan = &$reg->getChannel($channel);
+                            $chan = $reg->getChannel($channel);
                             if (PEAR::isError($chan)) {
                                 return $channel;
                             }
@@ -1383,7 +1413,7 @@ function get($key, $layer = null, $channel = false)
             if ($key == 'preferred_mirror') {
                 $reg = &$this->getRegistry();
                 if (is_object($reg)) {
-                    $chan = &$reg->getChannel($channel);
+                    $chan = $reg->getChannel($channel);
                     if (PEAR::isError($chan)) {
                         return $channel;
                     }
@@ -1434,7 +1464,7 @@ function _getChannelValue($key, $layer, $channel)
         if ($ret !== null) {
             $reg = &$this->getRegistry($layer);
             if (is_object($reg)) {
-                $chan = &$reg->getChannel($channel);
+                $chan = $reg->getChannel($channel);
                 if (PEAR::isError($chan)) {
                     return $channel;
                 }
@@ -1492,7 +1522,7 @@ function set($key, $value, $layer = 'user', $channel = false)
 
             $reg = &$this->getRegistry($layer);
             if (is_object($reg)) {
-                $chan = &$reg->getChannel($channel ? $channel : 'pear.php.net');
+                $chan = $reg->getChannel($channel ? $channel : 'pear.php.net');
                 if (PEAR::isError($chan)) {
                     return false;
                 }
@@ -1574,7 +1604,7 @@ function set($key, $value, $layer = 'user', $channel = false)
         if ($key == 'php_dir' && !$this->_noRegistry) {
             if (!isset($this->_registry[$layer]) ||
                   $value != $this->_registry[$layer]->install_dir) {
-                $this->_registry[$layer] = &new PEAR_Registry($value);
+                $this->_registry[$layer] = new PEAR_Registry($value);
                 $this->_regInitialized[$layer] = false;
                 $this->_registry[$layer]->setConfig($this, false);
             }
@@ -1604,7 +1634,9 @@ function _lazyChannelSetup($uselayer = false)
 
                 if (!is_object($this->_registry[$layer])) {
                     if ($phpdir = $this->get('php_dir', $layer, 'pear.php.net')) {
-                        $this->_registry[$layer] = &new PEAR_Registry($phpdir);
+                        $this->_registry[$layer] = new PEAR_Registry(
+                            $phpdir, false, false,
+                            $this->get('metadata_dir', $layer, 'pear.php.net'));
                         $this->_registry[$layer]->setConfig($this, false);
                         $this->_regInitialized[$layer] = false;
                     } else {
@@ -2035,7 +2067,7 @@ function &getREST($version, $options = array())
             require_once 'PEAR/REST/' . $version . '.php';
         }
 
-        $remote = &new $class($this, $options);
+        $remote = new $class($this, $options);
         return $remote;
     }
 
@@ -2088,7 +2120,9 @@ function setInstallRoot($root)
                     continue;
                 }
                 $this->_registry[$layer] =
-                    &new PEAR_Registry($this->get('php_dir', $layer, 'pear.php.net'));
+                    new PEAR_Registry(
+                        $this->get('php_dir', $layer, 'pear.php.net'), false, false,
+                        $this->get('metadata_dir', $layer, 'pear.php.net'));
                 $this->_registry[$layer]->setConfig($this, false);
                 $this->_regInitialized[$layer] = false;
             }
diff --git a/lib/vendor/PEAR/PEAR/Dependency.php b/lib/vendor/PEAR/PEAR/Dependency.php
deleted file mode 100644
index 0265f6f75..000000000
--- a/lib/vendor/PEAR/PEAR/Dependency.php
+++ /dev/null
@@ -1,498 +0,0 @@
-<?php
-/**
- * PEAR_Dependency
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * THIS FILE IS DEPRECATED IN FAVOR OF DEPENDENCY2.PHP, AND IS NOT USED IN THE INSTALLER
- * 
- * @category   pear
- * @package    PEAR
- * @author     Tomas V.V.Cox <cox@idecnet.com>
- * @author     Stig Bakken <ssb@php.net>
- * @copyright  1997-2008 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Dependency.php,v 1.43 2008/01/03 20:26:34 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
- */
-
-require_once "PEAR.php";
-require_once "OS/Guess.php";
-
-define('PEAR_DEPENDENCY_MISSING',        -1);
-define('PEAR_DEPENDENCY_CONFLICT',       -2);
-define('PEAR_DEPENDENCY_UPGRADE_MINOR',  -3);
-define('PEAR_DEPENDENCY_UPGRADE_MAJOR',  -4);
-define('PEAR_DEPENDENCY_BAD_DEPENDENCY', -5);
-define('PEAR_DEPENDENCY_MISSING_OPTIONAL', -6);
-define('PEAR_DEPENDENCY_CONFLICT_OPTIONAL',       -7);
-define('PEAR_DEPENDENCY_UPGRADE_MINOR_OPTIONAL',  -8);
-define('PEAR_DEPENDENCY_UPGRADE_MAJOR_OPTIONAL',  -9);
-
-/**
- * Dependency check for PEAR packages
- *
- * The class is based on the dependency RFC that can be found at
- * http://cvs.php.net/cvs.php/pearweb/rfc. It requires PHP >= 4.1
- *
- * @author Tomas V.V.Vox <cox@idecnet.com>
- * @author Stig Bakken <ssb@php.net>
- */
-class PEAR_Dependency
-{
-    // {{{ constructor
-    /**
-     * Constructor
-     *
-     * @access public
-     * @param  object Registry object
-     * @return void
-     */
-    function PEAR_Dependency(&$registry)
-    {
-        $this->registry = &$registry;
-    }
-
-    // }}}
-    // {{{ callCheckMethod()
-
-    /**
-    * This method maps the XML dependency definition to the
-    * corresponding one from PEAR_Dependency
-    *
-    * <pre>
-    * $opts => Array
-    *    (
-    *        [type] => pkg
-    *        [rel] => ge
-    *        [version] => 3.4
-    *        [name] => HTML_Common
-    *        [optional] => false
-    *    )
-    * </pre>
-    *
-    * @param  string Error message
-    * @param  array  Options
-    * @return boolean
-    */
-    function callCheckMethod(&$errmsg, $opts)
-    {
-        $rel = isset($opts['rel']) ? $opts['rel'] : 'has';
-        $req = isset($opts['version']) ? $opts['version'] : null;
-        $name = isset($opts['name']) ? $opts['name'] : null;
-        $channel = isset($opts['channel']) ? $opts['channel'] : 'pear.php.net';
-        $opt = (isset($opts['optional']) && $opts['optional'] == 'yes') ?
-            $opts['optional'] : null;
-        $errmsg = '';
-        switch ($opts['type']) {
-            case 'pkg':
-                return $this->checkPackage($errmsg, $name, $req, $rel, $opt, $channel);
-                break;
-            case 'ext':
-                return $this->checkExtension($errmsg, $name, $req, $rel, $opt);
-                break;
-            case 'php':
-                return $this->checkPHP($errmsg, $req, $rel);
-                break;
-            case 'prog':
-                return $this->checkProgram($errmsg, $name);
-                break;
-            case 'os':
-                return $this->checkOS($errmsg, $name);
-                break;
-            case 'sapi':
-                return $this->checkSAPI($errmsg, $name);
-                break;
-            case 'zend':
-                return $this->checkZend($errmsg, $name);
-                break;
-            default:
-                return "'{$opts['type']}' dependency type not supported";
-        }
-    }
-
-    // }}}
-    // {{{ checkPackage()
-
-    /**
-     * Package dependencies check method
-     *
-     * @param string $errmsg    Empty string, it will be populated with an error message, if any
-     * @param string $name      Name of the package to test
-     * @param string $req       The package version required
-     * @param string $relation  How to compare versions with each other
-     * @param bool   $opt       Whether the relationship is optional
-     * @param string $channel   Channel name
-     *
-     * @return mixed bool false if no error or the error string
-     */
-    function checkPackage(&$errmsg, $name, $req = null, $relation = 'has',
-                          $opt = false, $channel = 'pear.php.net')
-    {
-        if (is_string($req) && substr($req, 0, 2) == 'v.') {
-            $req = substr($req, 2);
-        }
-        switch ($relation) {
-            case 'has':
-                if (!$this->registry->packageExists($name, $channel)) {
-                    if ($opt) {
-                        $errmsg = "package `$channel/$name' is recommended to utilize some features.";
-                        return PEAR_DEPENDENCY_MISSING_OPTIONAL;
-                    }
-                    $errmsg = "requires package `$channel/$name'";
-                    return PEAR_DEPENDENCY_MISSING;
-                }
-                return false;
-            case 'not':
-                if ($this->registry->packageExists($name, $channel)) {
-                    $errmsg = "conflicts with package `$channel/$name'";
-                    return PEAR_DEPENDENCY_CONFLICT;
-                }
-                return false;
-            case 'lt':
-            case 'le':
-            case 'eq':
-            case 'ne':
-            case 'ge':
-            case 'gt':
-                $version = $this->registry->packageInfo($name, 'version', $channel);
-                if (!$this->registry->packageExists($name, $channel)
-                    || !version_compare("$version", "$req", $relation))
-                {
-                    $code = $this->codeFromRelation($relation, $version, $req, $opt);
-                    if ($opt) {
-                        $errmsg = "package `$channel/$name' version " . $this->signOperator($relation) .
-                            " $req is recommended to utilize some features.";
-                        if ($version) {
-                            $errmsg .= "  Installed version is $version";
-                        }
-                        return $code;
-                    }
-                    $errmsg = "requires package `$channel/$name' " .
-                        $this->signOperator($relation) . " $req";
-                    return $code;
-                }
-                return false;
-        }
-        $errmsg = "relation '$relation' with requirement '$req' is not supported (name=$channel/$name)";
-        return PEAR_DEPENDENCY_BAD_DEPENDENCY;
-    }
-
-    // }}}
-    // {{{ checkPackageUninstall()
-
-    /**
-     * Check package dependencies on uninstall
-     *
-     * @param string $error     The resultant error string
-     * @param string $warning   The resultant warning string
-     * @param string $name      Name of the package to test
-     * @param string $channel   Channel name of the package
-     *
-     * @return bool true if there were errors
-     */
-    function checkPackageUninstall(&$error, &$warning, $package, $channel = 'pear.php.net')
-    {
-        $channel = strtolower($channel);
-        $error = null;
-        $channels = $this->registry->listAllPackages();
-        foreach ($channels as $channelname => $packages) {
-            foreach ($packages as $pkg) {
-                if ($pkg == $package && $channel == $channelname) {
-                    continue;
-                }
-                $deps = $this->registry->packageInfo($pkg, 'release_deps', $channel);
-                if (empty($deps)) {
-                    continue;
-                }
-                foreach ($deps as $dep) {
-                    $depchannel = isset($dep['channel']) ? $dep['channel'] : 'pear.php.net';
-                    if ($dep['type'] == 'pkg' && (strcasecmp($dep['name'], $package) == 0) &&
-                          ($depchannel == $channel)) {
-                        if ($dep['rel'] == 'ne') {
-                            continue;
-                        }
-                        if (isset($dep['optional']) && $dep['optional'] == 'yes') {
-                            $warning .= "\nWarning: Package '$depchannel/$pkg' optionally depends on '$channel:/package'";
-                        } else {
-                            $error .= "Package '$depchannel/$pkg' depends on '$channel/$package'\n";
-                        }
-                    }
-                }
-            }
-        }
-        return ($error) ? true : false;
-    }
-
-    // }}}
-    // {{{ checkExtension()
-
-    /**
-     * Extension dependencies check method
-     *
-     * @param string $name        Name of the extension to test
-     * @param string $req_ext_ver Required extension version to compare with
-     * @param string $relation    How to compare versions with eachother
-     * @param bool   $opt         Whether the relationship is optional
-     *
-     * @return mixed bool false if no error or the error string
-     */
-    function checkExtension(&$errmsg, $name, $req = null, $relation = 'has',
-        $opt = false)
-    {
-        if ($relation == 'not') {
-            if (extension_loaded($name)) {
-                $errmsg = "conflicts with  PHP extension '$name'";
-                return PEAR_DEPENDENCY_CONFLICT;
-            } else {
-                return false;
-            }
-        }
-
-        if (!extension_loaded($name)) {
-            if ($relation == 'ne') {
-                return false;
-            }
-            if ($opt) {
-                $errmsg = "'$name' PHP extension is recommended to utilize some features";
-                return PEAR_DEPENDENCY_MISSING_OPTIONAL;
-            }
-            $errmsg = "'$name' PHP extension is not installed";
-            return PEAR_DEPENDENCY_MISSING;
-        }
-        if ($relation == 'has') {
-            return false;
-        }
-        $code = false;
-        if (is_string($req) && substr($req, 0, 2) == 'v.') {
-            $req = substr($req, 2);
-        }
-        $ext_ver = phpversion($name);
-        $operator = $relation;
-        // Force params to be strings, otherwise the comparation will fail (ex. 0.9==0.90)
-        if (!version_compare("$ext_ver", "$req", $operator)) {
-            $errmsg = "'$name' PHP extension version " .
-                $this->signOperator($operator) . " $req is required";
-            $code = $this->codeFromRelation($relation, $ext_ver, $req, $opt);
-            if ($opt) {
-                $errmsg = "'$name' PHP extension version " . $this->signOperator($operator) .
-                    " $req is recommended to utilize some features";
-                return $code;
-            }
-        }
-        return $code;
-    }
-
-    // }}}
-    // {{{ checkOS()
-
-    /**
-     * Operating system  dependencies check method
-     *
-     * @param string $os  Name of the operating system
-     *
-     * @return mixed bool false if no error or the error string
-     */
-    function checkOS(&$errmsg, $os)
-    {
-        // XXX Fixme: Implement a more flexible way, like
-        // comma separated values or something similar to PEAR_OS
-        static $myos;
-        if (empty($myos)) {
-            $myos = new OS_Guess();
-        }
-        // only 'has' relation is currently supported
-        if ($myos->matchSignature($os)) {
-            return false;
-        }
-        $errmsg = "'$os' operating system not supported";
-        return PEAR_DEPENDENCY_CONFLICT;
-    }
-
-    // }}}
-    // {{{ checkPHP()
-
-    /**
-     * PHP version check method
-     *
-     * @param string $req   which version to compare
-     * @param string $relation  how to compare the version
-     *
-     * @return mixed bool false if no error or the error string
-     */
-    function checkPHP(&$errmsg, $req, $relation = 'ge')
-    {
-        // this would be a bit stupid, but oh well :)
-        if ($relation == 'has') {
-            return false;
-        }
-        if ($relation == 'not') {
-            $errmsg = "Invalid dependency - 'not' is allowed when specifying PHP, you must run PHP in PHP";
-            return PEAR_DEPENDENCY_BAD_DEPENDENCY;
-        }
-        if (substr($req, 0, 2) == 'v.') {
-            $req = substr($req,2, strlen($req) - 2);
-        }
-        $php_ver = phpversion();
-        $operator = $relation;
-        if (!version_compare("$php_ver", "$req", $operator)) {
-            $errmsg = "PHP version " . $this->signOperator($operator) .
-                " $req is required";
-            return PEAR_DEPENDENCY_CONFLICT;
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ checkProgram()
-
-    /**
-     * External program check method.  Looks for executable files in
-     * directories listed in the PATH environment variable.
-     *
-     * @param string $program   which program to look for
-     *
-     * @return mixed bool false if no error or the error string
-     */
-    function checkProgram(&$errmsg, $program)
-    {
-        // XXX FIXME honor safe mode
-        $exe_suffix = OS_WINDOWS ? '.exe' : '';
-        $path_elements = explode(PATH_SEPARATOR, getenv('PATH'));
-        foreach ($path_elements as $dir) {
-            $file = $dir . DIRECTORY_SEPARATOR . $program . $exe_suffix;
-            if (file_exists($file) && is_executable($file)) {
-                return false;
-            }
-        }
-        $errmsg = "'$program' program is not present in the PATH";
-        return PEAR_DEPENDENCY_MISSING;
-    }
-
-    // }}}
-    // {{{ checkSAPI()
-
-    /**
-     * SAPI backend check method.  Version comparison is not yet
-     * available here.
-     *
-     * @param string $name      name of SAPI backend
-     * @param string $req   which version to compare
-     * @param string $relation  how to compare versions (currently
-     *                          hardcoded to 'has')
-     * @return mixed bool false if no error or the error string
-     */
-    function checkSAPI(&$errmsg, $name, $req = null, $relation = 'has')
-    {
-        // XXX Fixme: There is no way to know if the user has or
-        // not other SAPI backends installed than the installer one
-
-        $sapi_backend = php_sapi_name();
-        // Version comparisons not supported, sapi backends don't have
-        // version information yet.
-        if ($sapi_backend == $name) {
-            return false;
-        }
-        $errmsg = "'$sapi_backend' SAPI backend not supported";
-        return PEAR_DEPENDENCY_CONFLICT;
-    }
-
-    // }}}
-    // {{{ checkZend()
-
-    /**
-     * Zend version check method
-     *
-     * @param string $req   which version to compare
-     * @param string $relation  how to compare the version
-     *
-     * @return mixed bool false if no error or the error string
-     */
-    function checkZend(&$errmsg, $req, $relation = 'ge')
-    {
-        if (substr($req, 0, 2) == 'v.') {
-            $req = substr($req,2, strlen($req) - 2);
-        }
-        $zend_ver = zend_version();
-        $operator = substr($relation,0,2);
-        if (!version_compare("$zend_ver", "$req", $operator)) {
-            $errmsg = "Zend version " . $this->signOperator($operator) .
-                " $req is required";
-            return PEAR_DEPENDENCY_CONFLICT;
-        }
-        return false;
-    }
-
-    // }}}
-    // {{{ signOperator()
-
-    /**
-     * Converts text comparing operators to them sign equivalents
-     *
-     * Example: 'ge' to '>='
-     *
-     * @access public
-     * @param  string Operator
-     * @return string Sign equivalent
-     */
-    function signOperator($operator)
-    {
-        switch($operator) {
-            case 'lt': return '<';
-            case 'le': return '<=';
-            case 'gt': return '>';
-            case 'ge': return '>=';
-            case 'eq': return '==';
-            case 'ne': return '!=';
-            default:
-                return $operator;
-        }
-    }
-
-    // }}}
-    // {{{ codeFromRelation()
-
-    /**
-     * Convert relation into corresponding code
-     *
-     * @access public
-     * @param  string Relation
-     * @param  string Version
-     * @param  string Requirement
-     * @param  bool   Optional dependency indicator
-     * @return integer
-     */
-    function codeFromRelation($relation, $version, $req, $opt = false)
-    {
-        $code = PEAR_DEPENDENCY_BAD_DEPENDENCY;
-        switch ($relation) {
-            case 'gt': case 'ge': case 'eq':
-                // upgrade
-                $have_major = preg_replace('/\D.*/', '', $version);
-                $need_major = preg_replace('/\D.*/', '', $req);
-                if ($need_major > $have_major) {
-                    $code = $opt ? PEAR_DEPENDENCY_UPGRADE_MAJOR_OPTIONAL :
-                                   PEAR_DEPENDENCY_UPGRADE_MAJOR;
-                } else {
-                    $code = $opt ? PEAR_DEPENDENCY_UPGRADE_MINOR_OPTIONAL :
-                                   PEAR_DEPENDENCY_UPGRADE_MINOR;
-                }
-                break;
-            case 'lt': case 'le': case 'ne':
-                $code = $opt ? PEAR_DEPENDENCY_CONFLICT_OPTIONAL :
-                               PEAR_DEPENDENCY_CONFLICT;
-                break;
-        }
-        return $code;
-    }
-
-    // }}}
-}
-?>
diff --git a/lib/vendor/PEAR/PEAR/Dependency2.php b/lib/vendor/PEAR/PEAR/Dependency2.php
index ce51ed190..77646f1f9 100644
--- a/lib/vendor/PEAR/PEAR/Dependency2.php
+++ b/lib/vendor/PEAR/PEAR/Dependency2.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Dependency2.php 286494 2009-07-29 06:57:11Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -31,7 +30,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
@@ -82,7 +81,7 @@ class PEAR_Dependency2
      * @param array format of PEAR_Registry::parsedPackageName()
      * @param int installation state (one of PEAR_VALIDATE_*)
      */
-    function PEAR_Dependency2(&$config, $installoptions, $package,
+    function __construct(&$config, $installoptions, $package,
                               $state = PEAR_VALIDATE_INSTALLING)
     {
         $this->_config = &$config;
@@ -541,7 +540,7 @@ function validatePhpDependency($dep)
      */
     function getPEARVersion()
     {
-        return '1.9.0';
+        return '1.10.3';
     }
 
     function validatePearinstallerDependency($dep)
@@ -607,7 +606,7 @@ function validateSubpackageDependency($dep, $required, $params)
      * @param boolean whether this is a required dependency
      * @param array a list of downloaded packages to be installed, if any
      * @param boolean if true, then deps on pear.php.net that fail will also check
-     *                against pecl.php.net packages to accomodate extensions that have
+     *                against pecl.php.net packages to accommodate extensions that have
      *                moved to pecl.php.net from pear.php.net
      */
     function validatePackageDependency($dep, $required, $params, $depv1 = false)
@@ -894,9 +893,9 @@ function validatePackageUninstall(&$dl)
             if (!class_exists('PEAR_Downloader_Package')) {
                 require_once 'PEAR/Downloader/Package.php';
             }
-            $dp = &new PEAR_Downloader_Package($dl);
+            $dp = new PEAR_Downloader_Package($dl);
             $dp->setPackageFile($downloaded[$i]);
-            $params[$i] = &$dp;
+            $params[$i] = $dp;
         }
 
         // check cache
@@ -1175,7 +1174,7 @@ function validatePackage($pkg, &$dl, $params = array())
                 require_once 'PEAR/Downloader/Package.php';
             }
 
-            $dp = &new PEAR_Downloader_Package($dl);
+            $dp = new PEAR_Downloader_Package($dl);
             if (is_object($pkg)) {
                 $dp->setPackageFile($pkg);
             } else {
@@ -1199,7 +1198,7 @@ function validatePackage($pkg, &$dl, $params = array())
                     }
 
                     foreach ($ds as $d) {
-                        $checker = &new PEAR_Dependency2($this->_config, $this->_options,
+                        $checker = new PEAR_Dependency2($this->_config, $this->_options,
                             array('channel' => $channel, 'package' => $package), $this->_state);
                         $dep = $d['dep'];
                         $required = $d['type'] == 'required';
@@ -1355,4 +1354,4 @@ function warning($msg)
         return array(sprintf($msg, $this->_registry->parsedPackageNameToString(
             $this->_currentPackage, true)));
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/PEAR/PEAR/DependencyDB.php b/lib/vendor/PEAR/PEAR/DependencyDB.php
index 4e2de4c6a..5421929a2 100644
--- a/lib/vendor/PEAR/PEAR/DependencyDB.php
+++ b/lib/vendor/PEAR/PEAR/DependencyDB.php
@@ -10,7 +10,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: DependencyDB.php 286686 2009-08-02 17:38:57Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -30,7 +29,7 @@
  * @author     Tomas V.V.Cox <cox@idec.net.com>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
@@ -89,9 +88,8 @@ class PEAR_DependencyDB
      * @param PEAR_Config
      * @param string|false full path to the dependency database, or false to use default
      * @return PEAR_DependencyDB|PEAR_Error
-     * @static
      */
-    function &singleton(&$config, $depdb = false)
+    public static function &singleton(&$config, $depdb = false)
     {
         $phpdir = $config->get('php_dir', null, 'pear.php.net');
         if (!isset($GLOBALS['_PEAR_DEPENDENCYDB_INSTANCE'][$phpdir])) {
@@ -122,8 +120,11 @@ function setConfig(&$config, $depdb = false)
 
         $this->_registry = &$this->_config->getRegistry();
         if (!$depdb) {
-            $this->_depdb = $this->_config->get('php_dir', null, 'pear.php.net') .
-                DIRECTORY_SEPARATOR . '.depdb';
+            $dir = $this->_config->get('metadata_dir', null, 'pear.php.net');
+            if (!$dir) {
+                $dir = $this->_config->get('php_dir', null, 'pear.php.net');
+            }
+            $this->_depdb =  $dir . DIRECTORY_SEPARATOR . '.depdb';
         } else {
             $this->_depdb = $depdb;
         }
@@ -550,12 +551,9 @@ function _getDepDB()
             return $err;
         }
 
-        $rt = get_magic_quotes_runtime();
-        set_magic_quotes_runtime(0);
         clearstatcache();
         fclose($fp);
         $data = unserialize(file_get_contents($this->_depdb));
-        set_magic_quotes_runtime($rt);
         $this->_cache = $data;
         return $data;
     }
@@ -577,10 +575,7 @@ function _writeDepDB(&$deps)
             return PEAR::raiseError("Could not open dependencies file `".$this->_depdb."' for writing");
         }
 
-        $rt = get_magic_quotes_runtime();
-        set_magic_quotes_runtime(0);
         fwrite($fp, serialize($deps));
-        set_magic_quotes_runtime($rt);
         fclose($fp);
         $this->_unlock();
         $this->_cache = $deps;
@@ -766,4 +761,4 @@ function _registerDep(&$data, &$pkg, $dep, $type, $group = false)
             );
         }
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/PEAR/PEAR/Downloader.php b/lib/vendor/PEAR/PEAR/Downloader.php
index 71df797be..15f26bcef 100644
--- a/lib/vendor/PEAR/PEAR/Downloader.php
+++ b/lib/vendor/PEAR/PEAR/Downloader.php
@@ -12,7 +12,6 @@
  * @author     Martin Jansen <mj@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Downloader.php 287109 2009-08-11 18:50:30Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.3.0
  */
@@ -21,6 +20,7 @@
  * Needed for constants, extending
  */
 require_once 'PEAR/Common.php';
+require_once 'PEAR/Proxy.php';
 
 define('PEAR_INSTALLER_OK',       1);
 define('PEAR_INSTALLER_FAILED',   0);
@@ -39,7 +39,7 @@
  * @author     Martin Jansen <mj@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.3.0
  */
@@ -140,27 +140,44 @@ class PEAR_Downloader extends PEAR_Common
      */
     var $_downloadDir;
 
+    /**
+     * List of methods that can be called both statically and non-statically.
+     * @var array
+     */
+    protected static $bivalentMethods = array(
+        'setErrorHandling' => true,
+        'raiseError' => true,
+        'throwError' => true,
+        'pushErrorHandling' => true,
+        'popErrorHandling' => true,
+        'downloadHttp' => true,
+    );
+
     /**
      * @param PEAR_Frontend_*
      * @param array
      * @param PEAR_Config
      */
-    function PEAR_Downloader(&$ui, $options, &$config)
+    function __construct($ui = null, $options = array(), $config = null)
     {
-        parent::PEAR_Common();
+        parent::__construct();
         $this->_options = $options;
-        $this->config = &$config;
-        $this->_preferredState = $this->config->get('preferred_state');
+        if ($config !== null) {
+            $this->config = &$config;
+            $this->_preferredState = $this->config->get('preferred_state');
+        }
         $this->ui = &$ui;
         if (!$this->_preferredState) {
-            // don't inadvertantly use a non-set preferred_state
+            // don't inadvertently use a non-set preferred_state
             $this->_preferredState = null;
         }
 
-        if (isset($this->_options['installroot'])) {
-            $this->config->setInstallRoot($this->_options['installroot']);
+        if ($config !== null) {
+            if (isset($this->_options['installroot'])) {
+                $this->config->setInstallRoot($this->_options['installroot']);
+            }
+            $this->_registry = &$config->getRegistry();
         }
-        $this->_registry = &$config->getRegistry();
 
         if (isset($this->_options['alldeps']) || isset($this->_options['onlyreqdeps'])) {
             $this->_installed = $this->_registry->listAllPackages();
@@ -189,7 +206,8 @@ function discover($channel)
             require_once 'System.php';
         }
 
-        $tmp = System::mktemp(array('-d'));
+        $tmpdir = $this->config->get('temp_dir');
+        $tmp = System::mktemp('-d -t "' . $tmpdir . '"');
         $a   = $this->downloadHttp('http://' . $channel . '/channel.xml', $this->ui, $tmp, $callback, false);
         PEAR::popErrorHandling();
         if (PEAR::isError($a)) {
@@ -234,12 +252,12 @@ function discover($channel)
      * @param PEAR_Downloader
      * @return PEAR_Downloader_Package
      */
-    function &newDownloaderPackage(&$t)
+    function newDownloaderPackage(&$t)
     {
         if (!class_exists('PEAR_Downloader_Package')) {
             require_once 'PEAR/Downloader/Package.php';
         }
-        $a = &new PEAR_Downloader_Package($t);
+        $a = new PEAR_Downloader_Package($t);
         return $a;
     }
 
@@ -255,7 +273,7 @@ function &getDependency2Object(&$c, $i, $p, $s)
         if (!class_exists('PEAR_Dependency2')) {
             require_once 'PEAR/Dependency2.php';
         }
-        $z = &new PEAR_Dependency2($c, $i, $p, $s);
+        $z = new PEAR_Dependency2($c, $i, $p, $s);
         return $z;
     }
 
@@ -273,7 +291,7 @@ function &download($params)
         $channelschecked = array();
         // convert all parameters into PEAR_Downloader_Package objects
         foreach ($params as $i => $param) {
-            $params[$i] = &$this->newDownloaderPackage($this);
+            $params[$i] = $this->newDownloaderPackage($this);
             PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
             $err = $params[$i]->initialize($param);
             PEAR::staticPopErrorHandling();
@@ -314,7 +332,7 @@ function &download($params)
                             require_once 'System.php';
                         }
 
-                        $curchannel = &$this->_registry->getChannel($params[$i]->getChannel());
+                        $curchannel = $this->_registry->getChannel($params[$i]->getChannel());
                         if (PEAR::isError($curchannel)) {
                             PEAR::staticPopErrorHandling();
                             return $this->raiseError($curchannel);
@@ -330,7 +348,10 @@ function &download($params)
                         $a = $this->downloadHttp($url, $this->ui, $dir, null, $curchannel->lastModified());
 
                         PEAR::staticPopErrorHandling();
-                        if (PEAR::isError($a) || !$a) {
+                        if ($a === false) {
+                            //channel.xml not modified
+                            break;
+                        } else if (PEAR::isError($a)) {
                             // Attempt fallback to https automatically
                             PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
                             $a = $this->downloadHttp('https://' . $mirror .
@@ -493,14 +514,13 @@ function &download($params)
      */
     function analyzeDependencies(&$params, $force = false)
     {
-        $hasfailed = $failed = false;
         if (isset($this->_options['downloadonly'])) {
             return;
         }
 
         PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
         $redo  = true;
-        $reset = false;
+        $reset = $hasfailed = $failed = false;
         while ($redo) {
             $redo = false;
             foreach ($params as $i => $param) {
@@ -553,7 +573,7 @@ function analyzeDependencies(&$params, $force = false)
                     }
 
                     $failed = false;
-                    if (isset($deps['required'])) {
+                    if (isset($deps['required']) && is_array($deps['required'])) {
                         foreach ($deps['required'] as $type => $dep) {
                             // note: Dependency2 will never return a PEAR_Error if ignore-errors
                             // is specified, so soft is needed to turn off logging
@@ -587,7 +607,7 @@ function analyzeDependencies(&$params, $force = false)
                             }
                         }
 
-                        if (isset($deps['optional'])) {
+                        if (isset($deps['optional']) && is_array($deps['optional'])) {
                             foreach ($deps['optional'] as $type => $dep) {
                                 if (!isset($dep[0])) {
                                     if (PEAR::isError($e =
@@ -698,6 +718,7 @@ function analyzeDependencies(&$params, $force = false)
                 }
             }
         }
+
         PEAR::staticPopErrorHandling();
         if ($hasfailed && (isset($this->_options['ignore-errors']) ||
               isset($this->_options['nodeps']))) {
@@ -718,6 +739,7 @@ function getDownloadDir()
         if (isset($this->_downloadDir)) {
             return $this->_downloadDir;
         }
+
         $downloaddir = $this->config->get('download_dir');
         if (empty($downloaddir) || (is_dir($downloaddir) && !is_writable($downloaddir))) {
             if  (is_dir($downloaddir) && !is_writable($downloaddir)) {
@@ -725,14 +747,17 @@ function getDownloadDir()
                     '" is not writeable.  Change download_dir config variable to ' .
                     'a writeable dir to avoid this warning');
             }
+
             if (!class_exists('System')) {
                 require_once 'System.php';
             }
+
             if (PEAR::isError($downloaddir = System::mktemp('-d'))) {
                 return $downloaddir;
             }
             $this->log(3, '+ tmp dir created at ' . $downloaddir);
         }
+
         if (!is_writable($downloaddir)) {
             if (PEAR::isError(System::mkdir(array('-p', $downloaddir))) ||
                   !is_writable($downloaddir)) {
@@ -741,6 +766,7 @@ function getDownloadDir()
                     'a writeable dir');
             }
         }
+
         return $this->_downloadDir = $downloaddir;
     }
 
@@ -761,7 +787,7 @@ function configSet($key, $value, $layer = 'user', $channel = false)
         $this->config->set($key, $value, $layer, $channel);
         $this->_preferredState = $this->config->get('preferred_state', null, $channel);
         if (!$this->_preferredState) {
-            // don't inadvertantly use a non-set preferred_state
+            // don't inadvertently use a non-set preferred_state
             $this->_preferredState = null;
         }
     }
@@ -771,27 +797,11 @@ function setOptions($options)
         $this->_options = $options;
     }
 
-    // }}}
-    // {{{ setOptions()
     function getOptions()
     {
         return $this->_options;
     }
 
-    /**
-     * For simpler unit-testing
-     * @param PEAR_Config
-     * @param int
-     * @param string
-     */
-    function &getPackagefileObject(&$c, $d, $t = false)
-    {
-        if (!class_exists('PEAR_PackageFile')) {
-            require_once 'PEAR/PackageFile.php';
-        }
-        $a = &new PEAR_PackageFile($c, $d, $t);
-        return $a;
-    }
 
     /**
      * @param array output of {@link parsePackageName()}
@@ -816,7 +826,7 @@ function _getPackageDownloadUrl($parr)
             } while (false);
         }
 
-        $chan = &$this->_registry->getChannel($parr['channel']);
+        $chan = $this->_registry->getChannel($parr['channel']);
         if (PEAR::isError($chan)) {
             return $chan;
         }
@@ -939,7 +949,7 @@ function _getDepPackageDownloadUrl($dep, $parr)
         $curchannel = $this->config->get('default_channel');
         if (isset($dep['uri'])) {
             $xsdversion = '2.0';
-            $chan = &$this->_registry->getChannel('__uri');
+            $chan = $this->_registry->getChannel('__uri');
             if (PEAR::isError($chan)) {
                 return $chan;
             }
@@ -964,7 +974,7 @@ function _getDepPackageDownloadUrl($dep, $parr)
                 } while (false);
             }
 
-            $chan = &$this->_registry->getChannel($remotechannel);
+            $chan = $this->_registry->getChannel($remotechannel);
             if (PEAR::isError($chan)) {
                 return $chan;
             }
@@ -979,7 +989,7 @@ function _getDepPackageDownloadUrl($dep, $parr)
         }
 
         if (isset($dep['uri'])) {
-            $info = &$this->newDownloaderPackage($this);
+            $info = $this->newDownloaderPackage($this);
             PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
             $err = $info->initialize($dep);
             PEAR::staticPopErrorHandling();
@@ -1000,9 +1010,20 @@ function _getDepPackageDownloadUrl($dep, $parr)
             }
             return $info;
         } elseif ($chan->supportsREST($this->config->get('preferred_mirror'))
-              && $base = $chan->getBaseURL('REST1.0', $this->config->get('preferred_mirror'))
+              &&
+                (
+                  ($base2 = $chan->getBaseURL('REST1.3', $this->config->get('preferred_mirror')))
+                    ||
+                  ($base = $chan->getBaseURL('REST1.0', $this->config->get('preferred_mirror')))
+                )
         ) {
-            $rest = &$this->config->getREST('1.0', $this->_options);
+            if ($base2) {
+                $base = $base2;
+                $rest = &$this->config->getREST('1.3', $this->_options);
+            } else {
+                $rest = &$this->config->getREST('1.0', $this->_options);
+            }
+
             $url = $rest->getDepDownloadURL($base, $xsdversion, $dep, $parr,
                     $state, $version, $chan->getName());
             if (PEAR::isError($url)) {
@@ -1522,18 +1543,21 @@ function _sortInstall($a, $b)
      *                           use false to return the header values from this download
      * @param false|array $accept Accept headers to send
      * @param false|string $channel Channel to use for retrieving authentication
-     * @return string|array  Returns the full path of the downloaded file or a PEAR
-     *                       error on failure.  If the error is caused by
-     *                       socket-related errors, the error object will
-     *                       have the fsockopen error code available through
-     *                       getCode().  If caching is requested, then return the header
-     *                       values.
+     * @return mixed  Returns the full path of the downloaded file or a PEAR
+     *                error on failure.  If the error is caused by
+     *                socket-related errors, the error object will
+     *                have the fsockopen error code available through
+     *                getCode().  If caching is requested, then return the header
+     *                values.
+     *                If $lastmodified was given and the there are no changes,
+     *                boolean false is returned.
      *
      * @access public
      */
-    function downloadHttp($url, &$ui, $save_dir = '.', $callback = null, $lastmodified = null,
-                          $accept = false, $channel = false)
-    {
+    public static function _downloadHttp(
+        $object, $url, &$ui, $save_dir = '.', $callback = null, $lastmodified = null,
+        $accept = false, $channel = false
+    ) {
         static $redirect = 0;
         // always reset , so we are clean case of error
         $wasredirect = $redirect;
@@ -1555,26 +1579,16 @@ function downloadHttp($url, &$ui, $save_dir = '.', $callback = null, $lastmodifi
         $port = isset($info['port']) ? $info['port'] : null;
         $path = isset($info['path']) ? $info['path'] : null;
 
-        if (isset($this)) {
-            $config = &$this->config;
+        if ($object !== null) {
+            $config = $object->config;
         } else {
             $config = &PEAR_Config::singleton();
         }
 
-        $proxy_host = $proxy_port = $proxy_user = $proxy_pass = '';
-        if ($config->get('http_proxy') &&
-              $proxy = parse_url($config->get('http_proxy'))) {
-            $proxy_host = isset($proxy['host']) ? $proxy['host'] : null;
-            if (isset($proxy['scheme']) && $proxy['scheme'] == 'https') {
-                $proxy_host = 'ssl://' . $proxy_host;
-            }
-            $proxy_port = isset($proxy['port']) ? $proxy['port'] : 8080;
-            $proxy_user = isset($proxy['user']) ? urldecode($proxy['user']) : null;
-            $proxy_pass = isset($proxy['pass']) ? urldecode($proxy['pass']) : null;
+        $proxy = new PEAR_Proxy($config);
 
-            if ($callback) {
-                call_user_func($callback, 'message', "Using HTTP proxy $host:$port");
-            }
+        if ($proxy->isProxyConfigured() && $callback) {
+            call_user_func($callback, 'message', "Using HTTP proxy $host:$port");
         }
 
         if (empty($port)) {
@@ -1582,47 +1596,30 @@ function downloadHttp($url, &$ui, $save_dir = '.', $callback = null, $lastmodifi
         }
 
         $scheme = (isset($info['scheme']) && $info['scheme'] == 'https') ? 'https' : 'http';
+        $secure = ($scheme == 'https');
 
-        if ($proxy_host != '') {
-            $fp = @fsockopen($proxy_host, $proxy_port, $errno, $errstr);
-            if (!$fp) {
-                if ($callback) {
-                    call_user_func($callback, 'connfailed', array($proxy_host, $proxy_port,
-                                                                  $errno, $errstr));
-                }
-                return PEAR::raiseError("Connection to `$proxy_host:$proxy_port' failed: $errstr", $errno);
-            }
-
-            if ($lastmodified === false || $lastmodified) {
-                $request  = "GET $url HTTP/1.1\r\n";
-                $request .= "Host: $host:$port\r\n";
-            } else {
-                $request  = "GET $url HTTP/1.0\r\n";
-                $request .= "Host: $host\r\n";
-            }
-        } else {
-            $network_host = $host;
-            if (isset($info['scheme']) && $info['scheme'] == 'https') {
-                $network_host = 'ssl://' . $host;
+        $fp = $proxy->openSocket($host, $port, $secure);
+        if (PEAR::isError($fp)) {
+            if ($callback) {
+                $errno = $fp->getCode();
+                $errstr = $fp->getMessage();
+                call_user_func($callback, 'connfailed', array($host, $port,
+                                                              $errno, $errstr));
             }
+            return $fp;
+        }
 
-            $fp = @fsockopen($network_host, $port, $errno, $errstr);
-            if (!$fp) {
-                if ($callback) {
-                    call_user_func($callback, 'connfailed', array($host, $port,
-                                                                  $errno, $errstr));
-                }
-                return PEAR::raiseError("Connection to `$host:$port' failed: $errstr", $errno);
-            }
+        $requestPath = $path;
+        if ($proxy->isProxyConfigured()) {
+            $requestPath = $url;
+        }
 
-            if ($lastmodified === false || $lastmodified) {
-                $request = "GET $path HTTP/1.1\r\n";
-                $request .= "Host: $host:$port\r\n";
-            } else {
-                $request = "GET $path HTTP/1.0\r\n";
-                $request .= "Host: $host\r\n";
-            }
+        if ($lastmodified === false || $lastmodified) {
+            $request  = "GET $requestPath HTTP/1.1\r\n";
+        } else {
+            $request  = "GET $requestPath HTTP/1.0\r\n";
         }
+        $request .= "Host: $host\r\n";
 
         $ifmodifiedsince = '';
         if (is_array($lastmodified)) {
@@ -1638,9 +1635,9 @@ function downloadHttp($url, &$ui, $save_dir = '.', $callback = null, $lastmodifi
         }
 
         $request .= $ifmodifiedsince .
-            "User-Agent: PEAR/1.9.0/PHP/" . PHP_VERSION . "\r\n";
+            "User-Agent: PEAR/1.10.3/PHP/" . PHP_VERSION . "\r\n";
 
-        if (isset($this)) { // only pass in authentication for non-static calls
+        if ($object !== null) { // only pass in authentication for non-static calls
             $username = $config->get('username', null, $channel);
             $password = $config->get('password', null, $channel);
             if ($username && $password) {
@@ -1649,9 +1646,10 @@ function downloadHttp($url, &$ui, $save_dir = '.', $callback = null, $lastmodifi
             }
         }
 
-        if ($proxy_host != '' && $proxy_user != '') {
+        $proxyAuth = $proxy->getProxyAuth();
+        if ($proxyAuth) {
             $request .= 'Proxy-Authorization: Basic ' .
-                base64_encode($proxy_user . ':' . $proxy_pass) . "\r\n";
+                $proxyAuth . "\r\n";
         }
 
         if ($accept) {
@@ -1688,7 +1686,7 @@ function downloadHttp($url, &$ui, $save_dir = '.', $callback = null, $lastmodifi
             }
 
             $redirect = $wasredirect + 1;
-            return $this->downloadHttp($headers['location'],
+            return static::_downloadHttp($object, $headers['location'],
                     $ui, $save_dir, $callback, $lastmodified, $accept);
         }
 
@@ -1707,6 +1705,10 @@ function downloadHttp($url, &$ui, $save_dir = '.', $callback = null, $lastmodifi
         }
 
         $dest_file = $save_dir . DIRECTORY_SEPARATOR . $save_as;
+        if (is_link($dest_file)) {
+            return PEAR::raiseError('SECURITY ERROR: Will not write to ' . $dest_file . ' as it is symlinked to ' . readlink($dest_file) . ' - Possible symlink attack');
+        }
+
         if (!$wp = @fopen($dest_file, 'wb')) {
             fclose($fp);
             if ($callback) {
@@ -1759,4 +1761,3 @@ function downloadHttp($url, &$ui, $save_dir = '.', $callback = null, $lastmodifi
         return $dest_file;
     }
 }
-// }}}
\ No newline at end of file
diff --git a/lib/vendor/PEAR/PEAR/Downloader/Package.php b/lib/vendor/PEAR/PEAR/Downloader/Package.php
index 36fc494d6..925c0ecd5 100644
--- a/lib/vendor/PEAR/PEAR/Downloader/Package.php
+++ b/lib/vendor/PEAR/PEAR/Downloader/Package.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Package.php 287560 2009-08-21 22:36:18Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -50,7 +49,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
@@ -130,7 +129,7 @@ class PEAR_Downloader_Package
     /**
      * @param PEAR_Downloader
      */
-    function PEAR_Downloader_Package(&$downloader)
+    function __construct(&$downloader)
     {
         $this->_downloader = &$downloader;
         $this->_config = &$this->_downloader->config;
@@ -397,9 +396,8 @@ function alreadyValidated()
     /**
      * Remove packages to be downloaded that are already installed
      * @param array of PEAR_Downloader_Package objects
-     * @static
      */
-    function removeInstalled(&$params)
+    public static function removeInstalled(&$params)
     {
         if (!isset($params[0])) {
             return;
@@ -415,7 +413,7 @@ function removeInstalled(&$params)
                 if ($param->_installRegistry->packageExists($package, $channel)) {
                     $packageVersion = $param->_installRegistry->packageInfo($package, 'version', $channel);
                     if (version_compare($packageVersion, $param->getVersion(), '==')) {
-                        if (!isset($options['force'])) {
+                        if (!isset($options['force']) && !isset($options['packagingroot'])) {
                             $info = $param->getParsedPackage();
                             unset($info['version']);
                             unset($info['state']);
@@ -427,7 +425,7 @@ function removeInstalled(&$params)
                             $params[$i] = false;
                         }
                     } elseif (!isset($options['force']) && !isset($options['upgrade']) &&
-                          !isset($options['soft'])) {
+                          !isset($options['soft']) && !isset($options['packagingroot'])) {
                         $info = $param->getParsedPackage();
                         $param->_downloader->log(1, 'Skipping package "' .
                             $param->getShortName() .
@@ -1243,7 +1241,7 @@ function isInstalled($dep, $oper = '==')
      * @param array $errorparams empty array
      * @return array array of stupid duplicated packages in PEAR_Downloader_Package obejcts
      */
-    function detectStupidDuplicates($params, &$errorparams)
+    public static function detectStupidDuplicates($params, &$errorparams)
     {
         $existing = array();
         foreach ($params as $i => $param) {
@@ -1281,9 +1279,8 @@ function detectStupidDuplicates($params, &$errorparams)
     /**
      * @param array
      * @param bool ignore install groups - for final removal of dupe packages
-     * @static
      */
-    function removeDuplicates(&$params, $ignoreGroups = false)
+    public static function removeDuplicates(&$params, $ignoreGroups = false)
     {
         $pnames = array();
         foreach ($params as $i => $param) {
@@ -1345,9 +1342,8 @@ function setExplicitState($s)
     }
 
     /**
-     * @static
      */
-    function mergeDependencies(&$params)
+    public static function mergeDependencies(&$params)
     {
         $bundles = $newparams = array();
         foreach ($params as $i => $param) {
@@ -1376,20 +1372,22 @@ function mergeDependencies(&$params)
                     continue;
                 }
 
+                // FIXME do symlink check
+
                 fwrite($fp, $filecontents, strlen($filecontents));
                 fclose($fp);
                 if ($s = $params[$i]->explicitState()) {
                     $obj->setExplicitState($s);
                 }
 
-                $obj = &new PEAR_Downloader_Package($params[$i]->getDownloader());
+                $obj = new PEAR_Downloader_Package($params[$i]->getDownloader());
                 PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
                 if (PEAR::isError($dir = $dl->getDownloadDir())) {
                     PEAR::popErrorHandling();
                     return $dir;
                 }
-
-                $e = $obj->_fromFile($a = $dir . DIRECTORY_SEPARATOR . $file);
+                $a = $dir . DIRECTORY_SEPARATOR . $file;
+                $e = $obj->_fromFile($a);
                 PEAR::popErrorHandling();
                 if (PEAR::isError($e)) {
                     if (!isset($options['soft'])) {
@@ -1398,10 +1396,9 @@ function mergeDependencies(&$params)
                     continue;
                 }
 
-                $j = &$obj;
-                if (!PEAR_Downloader_Package::willDownload($j,
-                      array_merge($params, $newparams)) && !$param->isInstalled($j)) {
-                    $newparams[] = &$j;
+                if (!PEAR_Downloader_Package::willDownload($obj,
+                      array_merge($params, $newparams)) && !$param->isInstalled($obj)) {
+                    $newparams[] = $obj;
                 }
             }
         }
@@ -1435,7 +1432,7 @@ function mergeDependencies(&$params)
             // convert the dependencies into PEAR_Downloader_Package objects for the next time around
             $params[$i]->_downloadDeps = array();
             foreach ($newdeps as $dep) {
-                $obj = &new PEAR_Downloader_Package($params[$i]->getDownloader());
+                $obj = new PEAR_Downloader_Package($params[$i]->getDownloader());
                 if ($s = $params[$i]->explicitState()) {
                     $obj->setExplicitState($s);
                 }
@@ -1457,8 +1454,7 @@ function mergeDependencies(&$params)
                     }
                 }
 
-                $j = &$obj;
-                $newparams[] = &$j;
+                $newparams[] = $obj;
             }
         }
 
@@ -1474,9 +1470,8 @@ function mergeDependencies(&$params)
 
 
     /**
-     * @static
      */
-    function willDownload($param, $params)
+    public static function willDownload($param, $params)
     {
         if (!is_array($params)) {
             return false;
@@ -1497,13 +1492,12 @@ function willDownload($param, $params)
      * @param int
      * @param string
      */
-    function &getPackagefileObject(&$c, $d, $t = false)
+    function &getPackagefileObject(&$c, $d)
     {
-        $a = &new PEAR_PackageFile($c, $d, $t);
+        $a = new PEAR_PackageFile($c, $d);
         return $a;
     }
 
-
     /**
      * This will retrieve from a local file if possible, and parse out
      * a group name as well.  The original parameter will be modified to reflect this.
@@ -1527,16 +1521,7 @@ function _fromFile(&$param)
             if (@is_file($param)) {
                 $this->_type = 'local';
                 $options = $this->_downloader->getOptions();
-                if (isset($options['downloadonly'])) {
-                    $pkg = &$this->getPackagefileObject($this->_config,
-                        $this->_downloader->_debug);
-                } else {
-                    if (PEAR::isError($dir = $this->_downloader->getDownloadDir())) {
-                        return $dir;
-                    }
-                    $pkg = &$this->getPackagefileObject($this->_config,
-                        $this->_downloader->_debug, $dir);
-                }
+                $pkg = &$this->getPackagefileObject($this->_config, $this->_downloader->_debug);
                 PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
                 $pf = &$pkg->fromAnyFile($param, PEAR_VALIDATE_INSTALLING);
                 PEAR::popErrorHandling();
@@ -1584,7 +1569,7 @@ function _fromUrl($param, $saveparam = '')
 
             if ($this->_rawpackagefile) {
                 require_once 'Archive/Tar.php';
-                $tar = &new Archive_Tar($file);
+                $tar = new Archive_Tar($file);
                 $packagexml = $tar->extractInString('package2.xml');
                 if (!$packagexml) {
                     $packagexml = $tar->extractInString('package.xml');
@@ -1608,15 +1593,7 @@ function _fromUrl($param, $saveparam = '')
             }
 
             // whew, download worked!
-            if (isset($options['downloadonly'])) {
-                $pkg = &$this->getPackagefileObject($this->_config, $this->_downloader->debug);
-            } else {
-                $dir = $this->_downloader->getDownloadDir();
-                if (PEAR::isError($dir)) {
-                    return $dir;
-                }
-                $pkg = &$this->getPackagefileObject($this->_config, $this->_downloader->debug, $dir);
-            }
+            $pkg = &$this->getPackagefileObject($this->_config, $this->_downloader->debug);
 
             PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
             $pf = &$pkg->fromAnyFile($file, PEAR_VALIDATE_INSTALLING);
@@ -2001,4 +1978,4 @@ function _analyzeDownloadURL($info, $param, $pname, $params = null, $optional =
 
         return $info;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/PEAR/PEAR/ErrorStack.php b/lib/vendor/PEAR/PEAR/ErrorStack.php
index 7072ac9fc..b4412744a 100644
--- a/lib/vendor/PEAR/PEAR/ErrorStack.php
+++ b/lib/vendor/PEAR/PEAR/ErrorStack.php
@@ -23,7 +23,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  2004-2008 Greg Beaver
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: ErrorStack.php 276383 2009-02-24 23:39:37Z dufuz $
  * @link       http://pear.php.net/package/PEAR_ErrorStack
  */
 
@@ -132,12 +131,11 @@
  * $local_stack = new PEAR_ErrorStack('MyPackage');
  * </code>
  * @author     Greg Beaver <cellog@php.net>
- * @version    1.9.0
+ * @version    1.10.3
  * @package    PEAR_ErrorStack
  * @category   Debugging
  * @copyright  2004-2008 Greg Beaver
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: ErrorStack.php 276383 2009-02-24 23:39:37Z dufuz $
  * @link       http://pear.php.net/package/PEAR_ErrorStack
  */
 class PEAR_ErrorStack {
@@ -194,43 +192,43 @@ class PEAR_ErrorStack {
      * @access protected
      */
     var $_contextCallback = false;
-    
+
     /**
      * If set to a valid callback, this will be called every time an error
      * is pushed onto the stack.  The return value will be used to determine
      * whether to allow an error to be pushed or logged.
-     * 
+     *
      * The return value must be one an PEAR_ERRORSTACK_* constant
      * @see PEAR_ERRORSTACK_PUSHANDLOG, PEAR_ERRORSTACK_PUSH, PEAR_ERRORSTACK_LOG
      * @var false|string|array
      * @access protected
      */
     var $_errorCallback = array();
-    
+
     /**
      * PEAR::Log object for logging errors
      * @var false|Log
      * @access protected
      */
     var $_logger = false;
-    
+
     /**
      * Error messages - designed to be overridden
      * @var array
      * @abstract
      */
     var $_errorMsgs = array();
-    
+
     /**
      * Set up a new error stack
-     * 
+     *
      * @param string   $package name of the package this error stack represents
      * @param callback $msgCallback callback used for error message generation
      * @param callback $contextCallback callback used for context generation,
      *                 defaults to {@link getFileLine()}
      * @param boolean  $throwPEAR_Error
      */
-    function PEAR_ErrorStack($package, $msgCallback = false, $contextCallback = false,
+    function __construct($package, $msgCallback = false, $contextCallback = false,
                          $throwPEAR_Error = false)
     {
         $this->_package = $package;
@@ -250,12 +248,13 @@ function PEAR_ErrorStack($package, $msgCallback = false, $contextCallback = fals
      *                 defaults to {@link getFileLine()}
      * @param boolean  $throwPEAR_Error
      * @param string   $stackClass class to instantiate
-     * @static
+     *
      * @return PEAR_ErrorStack
      */
-    function &singleton($package, $msgCallback = false, $contextCallback = false,
-                         $throwPEAR_Error = false, $stackClass = 'PEAR_ErrorStack')
-    {
+    public static function &singleton(
+        $package, $msgCallback = false, $contextCallback = false,
+        $throwPEAR_Error = false, $stackClass = 'PEAR_ErrorStack'
+    ) {
         if (isset($GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package])) {
             return $GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package];
         }
@@ -297,15 +296,14 @@ function _handleError($err)
     /**
      * Set up a PEAR::Log object for all error stacks that don't have one
      * @param Log $log 
-     * @static
      */
-    function setDefaultLogger(&$log)
+    public static function setDefaultLogger(&$log)
     {
         if (is_object($log) && method_exists($log, 'log') ) {
             $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER'] = &$log;
         } elseif (is_callable($log)) {
             $GLOBALS['_PEAR_ERRORSTACK_DEFAULT_LOGGER'] = &$log;
-	}
+        }
     }
     
     /**
@@ -358,9 +356,8 @@ function getMessageCallback()
      * messages for a singleton
      * @param array|string Callback function/method
      * @param string Package name, or false for all packages
-     * @static
      */
-    function setDefaultCallback($callback = false, $package = false)
+    public static function setDefaultCallback($callback = false, $package = false)
     {
         if (!is_callable($callback)) {
             $callback = false;
@@ -432,9 +429,8 @@ function popCallback()
      * @see PEAR_ERRORSTACK_PUSHANDLOG, PEAR_ERRORSTACK_PUSH, PEAR_ERRORSTACK_LOG
      * @see staticPopCallback(), pushCallback()
      * @param string|array $cb
-     * @static
      */
-    function staticPushCallback($cb)
+    public static function staticPushCallback($cb)
     {
         array_push($GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK'], $cb);
     }
@@ -443,9 +439,8 @@ function staticPushCallback($cb)
      * Remove a temporary overriding error callback
      * @see staticPushCallback()
      * @return array|string|false
-     * @static
      */
-    function staticPopCallback()
+    public static function staticPopCallback()
     {
         $ret = array_pop($GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK']);
         if (!is_array($GLOBALS['_PEAR_ERRORSTACK_OVERRIDE_CALLBACK'])) {
@@ -604,11 +599,11 @@ function push($code, $level = 'error', $params = array(), $msg = false,
      *                          to find error context
      * @return PEAR_Error|array if compatibility mode is on, a PEAR_Error is also
      *                          thrown.  see docs for {@link push()}
-     * @static
      */
-    function staticPush($package, $code, $level = 'error', $params = array(),
-                        $msg = false, $repackage = false, $backtrace = false)
-    {
+    public static function staticPush(
+        $package, $code, $level = 'error', $params = array(),
+        $msg = false, $repackage = false, $backtrace = false
+    ) {
         $s = &PEAR_ErrorStack::singleton($package);
         if ($s->_contextCallback) {
             if (!$backtrace) {
@@ -750,9 +745,8 @@ function getErrors($purge = false, $level = false)
      * @param string|false Package name to check for errors
      * @param string Level name to check for a particular severity
      * @return boolean
-     * @static
      */
-    function staticHasErrors($package = false, $level = false)
+    public static function staticHasErrors($package = false, $level = false)
     {
         if ($package) {
             if (!isset($GLOBALS['_PEAR_ERRORSTACK_SINGLETON'][$package])) {
@@ -776,12 +770,13 @@ function staticHasErrors($package = false, $level = false)
      * @param boolean $merge Set to return a flat array, not organized by package
      * @param array   $sortfunc Function used to sort a merged array - default
      *        sorts by time, and should be good for most cases
-     * @static
+     *
      * @return array 
      */
-    function staticGetErrors($purge = false, $level = false, $merge = false,
-                             $sortfunc = array('PEAR_ErrorStack', '_sortErrors'))
-    {
+    public static function staticGetErrors(
+        $purge = false, $level = false, $merge = false,
+        $sortfunc = array('PEAR_ErrorStack', '_sortErrors')
+    ) {
         $ret = array();
         if (!is_callable($sortfunc)) {
             $sortfunc = array('PEAR_ErrorStack', '_sortErrors');
@@ -806,7 +801,7 @@ function staticGetErrors($purge = false, $level = false, $merge = false,
      * Error sorting function, sorts by time
      * @access private
      */
-    function _sortErrors($a, $b)
+    public static function _sortErrors($a, $b)
     {
         if ($a['time'] == $b['time']) {
             return 0;
@@ -829,9 +824,8 @@ function _sortErrors($a, $b)
      * @param unused
      * @param integer backtrace frame.
      * @param array Results of debug_backtrace()
-     * @static
      */
-    function getFileLine($code, $params, $backtrace = null)
+    public static function getFileLine($code, $params, $backtrace = null)
     {
         if ($backtrace === null) {
             return false;
@@ -903,10 +897,10 @@ function getFileLine($code, $params, $backtrace = null)
      * @param PEAR_ErrorStack
      * @param array
      * @param string|false Pre-generated error message template
-     * @static
+     *
      * @return string
      */
-    function getErrorMessage(&$stack, $err, $template = false)
+    public static function getErrorMessage(&$stack, $err, $template = false)
     {
         if ($template) {
             $mainmsg = $template;
diff --git a/lib/vendor/PEAR/PEAR/Exception.php b/lib/vendor/PEAR/PEAR/Exception.php
index ba4dd2197..d83950b13 100644
--- a/lib/vendor/PEAR/PEAR/Exception.php
+++ b/lib/vendor/PEAR/PEAR/Exception.php
@@ -13,7 +13,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Exception.php 276383 2009-02-24 23:39:37Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.3.3
  */
@@ -89,7 +88,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.3.3
  *
@@ -289,7 +288,7 @@ public function getCauseMessage(&$causes)
     }
 
     public function getTraceSafe()
-    {   
+    {
         if (!isset($this->_trace)) {
             $this->_trace = $this->getTrace();
             if (empty($this->_trace)) {
@@ -325,21 +324,21 @@ public function toHtml()
         $trace = $this->getTraceSafe();
         $causes = array();
         $this->getCauseMessage($causes);
-        $html =  '<table border="1" cellspacing="0">' . "\n";
+        $html =  '<table style="border: 1px" cellspacing="0">' . "\n";
         foreach ($causes as $i => $cause) {
-            $html .= '<tr><td colspan="3" bgcolor="#ff9999">'
+            $html .= '<tr><td colspan="3" style="background: #ff9999">'
                . str_repeat('-', $i) . ' <b>' . $cause['class'] . '</b>: '
                . htmlspecialchars($cause['message']) . ' in <b>' . $cause['file'] . '</b> '
                . 'on line <b>' . $cause['line'] . '</b>'
                . "</td></tr>\n";
         }
-        $html .= '<tr><td colspan="3" bgcolor="#aaaaaa" align="center"><b>Exception trace</b></td></tr>' . "\n"
-               . '<tr><td align="center" bgcolor="#cccccc" width="20"><b>#</b></td>'
-               . '<td align="center" bgcolor="#cccccc"><b>Function</b></td>'
-               . '<td align="center" bgcolor="#cccccc"><b>Location</b></td></tr>' . "\n";
+        $html .= '<tr><td colspan="3" style="background-color: #aaaaaa; text-align: center; font-weight: bold;">Exception trace</td></tr>' . "\n"
+               . '<tr><td style="text-align: center; background: #cccccc; width:20px; font-weight: bold;">#</td>'
+               . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Function</td>'
+               . '<td style="text-align: center; background: #cccccc; font-weight: bold;">Location</td></tr>' . "\n";
 
         foreach ($trace as $k => $v) {
-            $html .= '<tr><td align="center">' . $k . '</td>'
+            $html .= '<tr><td style="text-align: center;">' . $k . '</td>'
                    . '<td>';
             if (!empty($v['class'])) {
                 $html .= $v['class'] . $v['type'];
@@ -367,7 +366,7 @@ public function toHtml()
                    . ':' . (isset($v['line']) ? $v['line'] : 'unknown')
                    . '</td></tr>' . "\n";
         }
-        $html .= '<tr><td align="center">' . ($k+1) . '</td>'
+        $html .= '<tr><td style="text-align: center;">' . ($k+1) . '</td>'
                . '<td>{main}</td>'
                . '<td>&nbsp;</td></tr>' . "\n"
                . '</table>';
@@ -386,6 +385,4 @@ public function toText()
         }
         return $causeMsg . $this->getTraceAsString();
     }
-}
-
-?>
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/lib/vendor/PEAR/PEAR/FixPHP5PEARWarnings.php b/lib/vendor/PEAR/PEAR/FixPHP5PEARWarnings.php
deleted file mode 100644
index be5dc3ce7..000000000
--- a/lib/vendor/PEAR/PEAR/FixPHP5PEARWarnings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-if ($skipmsg) {
-    $a = &new $ec($code, $mode, $options, $userinfo);
-} else {
-    $a = &new $ec($message, $code, $mode, $options, $userinfo);
-}
-?>
\ No newline at end of file
diff --git a/lib/vendor/PEAR/PEAR/Frontend.php b/lib/vendor/PEAR/PEAR/Frontend.php
index d355a7f59..bd002c374 100644
--- a/lib/vendor/PEAR/PEAR/Frontend.php
+++ b/lib/vendor/PEAR/PEAR/Frontend.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Frontend.php 276383 2009-02-24 23:39:37Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -39,7 +38,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
@@ -48,9 +47,8 @@ class PEAR_Frontend extends PEAR
     /**
      * Retrieve the frontend object
      * @return PEAR_Frontend_CLI|PEAR_Frontend_Web|PEAR_Frontend_Gtk
-     * @static
      */
-    function &singleton($type = null)
+    public static function &singleton($type = null)
     {
         if ($type === null) {
             if (!isset($GLOBALS['_PEAR_FRONTEND_SINGLETON'])) {
@@ -71,9 +69,8 @@ function &singleton($type = null)
      * _ => DIRECTORY_SEPARATOR (PEAR_Frontend_CLI is in PEAR/Frontend/CLI.php)
      * @param string $uiclass full class name
      * @return PEAR_Frontend
-     * @static
      */
-    function &setFrontendClass($uiclass)
+    public static function &setFrontendClass($uiclass)
     {
         if (is_object($GLOBALS['_PEAR_FRONTEND_SINGLETON']) &&
               is_a($GLOBALS['_PEAR_FRONTEND_SINGLETON'], $uiclass)) {
@@ -88,7 +85,7 @@ function &setFrontendClass($uiclass)
         }
 
         if (class_exists($uiclass)) {
-            $obj = &new $uiclass;
+            $obj = new $uiclass;
             // quick test to see if this class implements a few of the most
             // important frontend methods
             if (is_a($obj, 'PEAR_Frontend')) {
@@ -111,9 +108,8 @@ function &setFrontendClass($uiclass)
      * Frontends are expected to be a descendant of PEAR_Frontend
      * @param PEAR_Frontend
      * @return PEAR_Frontend
-     * @static
      */
-    function &setFrontendObject($uiobject)
+    public static function &setFrontendObject($uiobject)
     {
         if (is_object($GLOBALS['_PEAR_FRONTEND_SINGLETON']) &&
               is_a($GLOBALS['_PEAR_FRONTEND_SINGLETON'], get_class($uiobject))) {
@@ -134,9 +130,8 @@ function &setFrontendObject($uiobject)
     /**
      * @param string $path relative or absolute include path
      * @return boolean
-     * @static
      */
-    function isIncludeable($path)
+    public static function isIncludeable($path)
     {
         if (file_exists($path) && is_readable($path)) {
             return true;
diff --git a/lib/vendor/PEAR/PEAR/Frontend/CLI.php b/lib/vendor/PEAR/PEAR/Frontend/CLI.php
index 374f0872c..4e68c065a 100644
--- a/lib/vendor/PEAR/PEAR/Frontend/CLI.php
+++ b/lib/vendor/PEAR/PEAR/Frontend/CLI.php
@@ -10,7 +10,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: CLI.php 278236 2009-04-04 00:09:14Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  */
@@ -27,7 +26,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 0.1
  */
@@ -47,9 +46,9 @@ class PEAR_Frontend_CLI extends PEAR_Frontend
         'normal' => '',
     );
 
-    function PEAR_Frontend_CLI()
+    function __construct()
     {
-        parent::PEAR();
+        parent::__construct();
         $term = getenv('TERM'); //(cox) $_ENV is empty for me in 4.1.1
         if (function_exists('posix_isatty') && !posix_isatty(1)) {
             // output is being redirected to a file or through a pipe
@@ -396,7 +395,7 @@ function outputData($data, $command = '_default')
             case 'install':
             case 'upgrade':
             case 'upgrade-all':
-                if (isset($data['release_warnings'])) {
+                if (is_array($data) && isset($data['release_warnings'])) {
                     $this->_displayLine('');
                     $this->_startTable(array(
                         'border' => false,
@@ -407,7 +406,7 @@ function outputData($data, $command = '_default')
                     $this->_displayLine('');
                 }
 
-                $this->_displayLine($data['data']);
+                $this->_displayLine(is_array($data) ? $data['data'] : $data);
                 break;
             case 'search':
                 $this->_startTable($data);
@@ -415,12 +414,19 @@ function outputData($data, $command = '_default')
                     $this->_tableRow($data['headline'], array('bold' => true), array(1 => array('wrap' => 55)));
                 }
 
+                $packages = array();
                 foreach($data['data'] as $category) {
-                    foreach($category as $pkg) {
-                        $this->_tableRow($pkg, null, array(1 => array('wrap' => 55)));
+                    foreach($category as $name => $pkg) {
+                        $packages[$pkg[0]] = $pkg;
                     }
                 }
 
+                $p = array_keys($packages);
+                natcasesort($p);
+                foreach ($p as $name) {
+                    $this->_tableRow($packages[$name], null, array(1 => array('wrap' => 55)));
+                }
+
                 $this->_endTable();
                 break;
             case 'list-all':
@@ -434,13 +440,21 @@ function outputData($data, $command = '_default')
                     $this->_tableRow($data['headline'], array('bold' => true), array(1 => array('wrap' => 55)));
                 }
 
+                $packages = array();
                 foreach($data['data'] as $category) {
-                    foreach($category as $pkg) {
-                        unset($pkg[4], $pkg[5]);
-                        $this->_tableRow($pkg, null, array(1 => array('wrap' => 55)));
+                    foreach($category as $name => $pkg) {
+                        $packages[$pkg[0]] = $pkg;
                     }
                 }
 
+                $p = array_keys($packages);
+                natcasesort($p);
+                foreach ($p as $name) {
+                    $pkg = $packages[$name];
+                    unset($pkg[4], $pkg[5]);
+                    $this->_tableRow($pkg, null, array(1 => array('wrap' => 55)));
+                }
+
                 $this->_endTable();
                 break;
             case 'config-show':
@@ -512,9 +526,13 @@ function outputData($data, $command = '_default')
                                          $opts);
                     }
 
-                    foreach($data['data'] as $row) {
-                        $this->_tableRow($row, null, $opts);
-                    }
+                    if (is_array($data['data'])) {
+                        foreach($data['data'] as $row) {
+                            $this->_tableRow($row, null, $opts);
+                        }
+                    } else {
+                        $this->_tableRow(array($data['data']), null, $opts);
+                     }
                     $this->_endTable();
                 } else {
                     $this->_displayLine($data);
@@ -729,4 +747,4 @@ function _display($text)
     {
         print $text;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/PEAR/PEAR/Installer.php b/lib/vendor/PEAR/PEAR/Installer.php
index cdd4be88e..acaaa7fd0 100644
--- a/lib/vendor/PEAR/PEAR/Installer.php
+++ b/lib/vendor/PEAR/PEAR/Installer.php
@@ -12,7 +12,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Installer.php 287446 2009-08-18 11:45:05Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  */
@@ -36,7 +35,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 0.1
  */
@@ -116,9 +115,9 @@ class PEAR_Installer extends PEAR_Downloader
      *
      * @access public
      */
-    function PEAR_Installer(&$ui)
+    function __construct(&$ui)
     {
-        parent::PEAR_Common();
+        parent::__construct($ui, array(), null);
         $this->setFrontendObject($ui);
         $this->debug = $this->config->get('verbose');
     }
@@ -589,7 +588,7 @@ function _installFile2(&$pkg, $file, &$real_atts, $tmp_path, $options)
                 foreach ($atts as $tag => $raw) {
                     $tag = str_replace(array($pkg->getTasksNs() . ':', '-'), array('', '_'), $tag);
                     $task = "PEAR_Task_$tag";
-                    $task = &new $task($this->config, $this, PEAR_TASK_INSTALL);
+                    $task = new $task($this->config, $this, PEAR_TASK_INSTALL);
                     if (!$task->isScript()) { // scripts are only handled after installation
                         $task->init($raw, $attribs, $pkg->getLastInstalledVersion());
                         $res = $task->startSession($pkg, $contents, $final_dest_file);
@@ -754,11 +753,9 @@ function startFileTransaction($rollback_in_case = false)
 
     function commitFileTransaction()
     {
-        $n = count($this->file_operations);
-        $this->log(2, "about to commit $n file operations");
         // {{{ first, check permissions and such manually
         $errors = array();
-        foreach ($this->file_operations as $tr) {
+        foreach ($this->file_operations as $key => $tr) {
             list($type, $data) = $tr;
             switch ($type) {
                 case 'rename':
@@ -795,12 +792,37 @@ function commitFileTransaction()
                                 fclose($fp);
                             }
                         }
+
+                        /* Verify we are not deleting a file owned by another package
+                         * This can happen when a file moves from package A to B in
+                         * an upgrade ala http://pear.php.net/17986
+                         */
+                        $info = array(
+                            'package' => strtolower($this->pkginfo->getName()),
+                            'channel' => strtolower($this->pkginfo->getChannel()),
+                        );
+                        $result = $this->_registry->checkFileMap($data[0], $info, '1.1');
+                        if (is_array($result)) {
+                            $res = array_diff($result, $info);
+                            if (!empty($res)) {
+                                $new = $this->_registry->getPackage($result[1], $result[0]);
+                                $this->file_operations[$key] = false;
+                                $pkginfoName = $this->pkginfo->getName();
+                                $newChannel  = $new->getChannel();
+                                $newPackage  = $new->getName();
+                                $this->log(3, "file $data[0] was scheduled for removal from $pkginfoName but is owned by $newChannel/$newPackage, removal has been cancelled.");
+                            }
+                        }
                     }
                     break;
             }
 
         }
         // }}}
+
+        $n = count($this->file_operations);
+        $this->log(2, "about to commit $n file operations for " . $this->pkginfo->getName());
+
         $m = count($errors);
         if ($m > 0) {
             foreach ($errors as $error) {
@@ -997,64 +1019,13 @@ function mkDirHier($dir)
         return parent::mkDirHier($dir);
     }
 
-    // }}}
-    // {{{ download()
-
-    /**
-     * Download any files and their dependencies, if necessary
-     *
-     * @param array a mixed list of package names, local files, or package.xml
-     * @param PEAR_Config
-     * @param array options from the command line
-     * @param array this is the array that will be populated with packages to
-     *              install.  Format of each entry:
-     *
-     * <code>
-     * array('pkg' => 'package_name', 'file' => '/path/to/local/file',
-     *    'info' => array() // parsed package.xml
-     * );
-     * </code>
-     * @param array this will be populated with any error messages
-     * @param false private recursion variable
-     * @param false private recursion variable
-     * @param false private recursion variable
-     * @deprecated in favor of PEAR_Downloader
-     */
-    function download($packages, $options, &$config, &$installpackages,
-                      &$errors, $installed = false, $willinstall = false, $state = false)
-    {
-        // trickiness: initialize here
-        parent::PEAR_Downloader($this->ui, $options, $config);
-        $ret             = parent::download($packages);
-        $errors          = $this->getErrorMsgs();
-        $installpackages = $this->getDownloadedPackages();
-        trigger_error("PEAR Warning: PEAR_Installer::download() is deprecated " .
-                      "in favor of PEAR_Downloader class", E_USER_WARNING);
-        return $ret;
-    }
-
     // }}}
     // {{{ _parsePackageXml()
 
-    function _parsePackageXml(&$descfile, &$tmpdir)
+    function _parsePackageXml(&$descfile)
     {
-        if (substr($descfile, -4) == '.xml') {
-            $tmpdir = false;
-        } else {
-            // {{{ Decompress pack in tmp dir -------------------------------------
-
-            // To allow relative package file names
-            $descfile = realpath($descfile);
-
-            if (PEAR::isError($tmpdir = System::mktemp('-d'))) {
-                return $tmpdir;
-            }
-            $this->log(3, '+ tmp dir created at ' . $tmpdir);
-            // }}}
-        }
-
         // Parse xml file -----------------------------------------------
-        $pkg = new PEAR_PackageFile($this->config, $this->debug, $tmpdir);
+        $pkg = new PEAR_PackageFile($this->config, $this->debug);
         PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
         $p = &$pkg->fromAnyFile($descfile, PEAR_VALIDATE_INSTALLING);
         PEAR::staticPopErrorHandling();
@@ -1135,17 +1106,20 @@ function install($pkgfile, $options = array())
             $pkg      = $pkgfile->getPackageFile();
             $pkgfile  = $pkg->getArchiveFile();
             $descfile = $pkg->getPackageFile();
-            $tmpdir   = dirname($descfile);
         } else {
             $descfile = $pkgfile;
-            $tmpdir   = '';
-            $pkg      = $this->_parsePackageXml($descfile, $tmpdir);
+            $pkg      = $this->_parsePackageXml($descfile);
             if (PEAR::isError($pkg)) {
                 return $pkg;
             }
         }
 
+        $tmpdir = dirname($descfile);
         if (realpath($descfile) != realpath($pkgfile)) {
+            // Use the temp_dir since $descfile can contain the download dir path
+            $tmpdir = $this->config->get('temp_dir', null, 'pear.php.net');
+            $tmpdir = System::mktemp('-d -t "' . $tmpdir . '"');
+
             $tar = new Archive_Tar($pkgfile);
             if (!$tar->extract($tmpdir)) {
                 return $this->raiseError("unable to unpack $pkgfile");
@@ -1154,15 +1128,6 @@ function install($pkgfile, $options = array())
 
         $pkgname = $pkg->getName();
         $channel = $pkg->getChannel();
-        if (isset($this->_options['packagingroot'])) {
-            $regdir = $this->_prependPath(
-                $this->config->get('php_dir', null, 'pear.php.net'),
-                $this->_options['packagingroot']);
-
-            $packrootphp_dir = $this->_prependPath(
-                $this->config->get('php_dir', null, $channel),
-                $this->_options['packagingroot']);
-        }
 
         if (isset($options['installroot'])) {
             $this->config->setInstallRoot($options['installroot']);
@@ -1174,7 +1139,21 @@ function install($pkgfile, $options = array())
             $this->config->setInstallRoot(false);
             $this->_registry = &$this->config->getRegistry();
             if (isset($this->_options['packagingroot'])) {
-                $installregistry = &new PEAR_Registry($regdir);
+                $regdir = $this->_prependPath(
+                    $this->config->get('php_dir', null, 'pear.php.net'),
+                    $this->_options['packagingroot']);
+
+                $metadata_dir = $this->config->get('metadata_dir', null, 'pear.php.net');
+                if ($metadata_dir) {
+                    $metadata_dir = $this->_prependPath(
+                        $metadata_dir,
+                        $this->_options['packagingroot']);
+                }
+                $packrootphp_dir = $this->_prependPath(
+                    $this->config->get('php_dir', null, $channel),
+                    $this->_options['packagingroot']);
+
+                $installregistry = new PEAR_Registry($regdir, false, false, $metadata_dir);
                 if (!$installregistry->channelExists($channel, true)) {
                     // we need to fake a channel-discover of this channel
                     $chanobj = $this->_registry->getChannel($channel, true);
@@ -1263,7 +1242,7 @@ function install($pkgfile, $options = array())
                         }
                     }
 
-                    $pfk = &new PEAR_PackageFile($this->config);
+                    $pfk = new PEAR_PackageFile($this->config);
                     $parentpkg = &$pfk->fromArray($parentreg);
                     $installregistry->updatePackage2($parentpkg);
                 }
@@ -1307,32 +1286,24 @@ function install($pkgfile, $options = array())
 
         $this->startFileTransaction();
 
-        if (empty($options['upgrade']) && empty($options['soft'])) {
-            // checks to do only when installing new packages
-            if ($channel == 'pecl.php.net') {
-                $test = $installregistry->packageExists($pkgname, $channel);
-                if (!$test) {
-                    $test = $installregistry->packageExists($pkgname, 'pear.php.net');
-                }
-            } else {
-                $test = $installregistry->packageExists($pkgname, $channel);
+        $usechannel = $channel;
+        if ($channel == 'pecl.php.net') {
+            $test = $installregistry->packageExists($pkgname, $channel);
+            if (!$test) {
+                $test = $installregistry->packageExists($pkgname, 'pear.php.net');
+                $usechannel = 'pear.php.net';
             }
+        } else {
+            $test = $installregistry->packageExists($pkgname, $channel);
+        }
 
+        if (empty($options['upgrade']) && empty($options['soft'])) {
+            // checks to do only when installing new packages
             if (empty($options['force']) && $test) {
                 return $this->raiseError("$channel/$pkgname is already installed");
             }
         } else {
-            $usechannel = $channel;
-            if ($channel == 'pecl.php.net') {
-                $test = $installregistry->packageExists($pkgname, $channel);
-                if (!$test) {
-                    $test = $installregistry->packageExists($pkgname, 'pear.php.net');
-                    $usechannel = 'pear.php.net';
-                }
-            } else {
-                $test = $installregistry->packageExists($pkgname, $channel);
-            }
-
+            // Upgrade
             if ($test) {
                 $v1 = $installregistry->packageInfo($pkgname, 'version', $usechannel);
                 $v2 = $pkg->getVersion();
@@ -1340,22 +1311,23 @@ function install($pkgfile, $options = array())
                 if (empty($options['force']) && !version_compare("$v2", "$v1", 'gt')) {
                     return $this->raiseError("upgrade to a newer version ($v2 is not newer than $v1)");
                 }
+            }
+        }
 
-                if (empty($options['register-only'])) {
-                    // when upgrading, remove old release's files first:
-                    if (PEAR::isError($err = $this->_deletePackageFiles($pkgname, $usechannel,
-                          true))) {
-                        if (!isset($options['ignore-errors'])) {
-                            return $this->raiseError($err);
-                        }
+        // Do cleanups for upgrade and install, remove old release's files first
+        if ($test && empty($options['register-only'])) {
+            // when upgrading, remove old release's files first:
+            if (PEAR::isError($err = $this->_deletePackageFiles($pkgname, $usechannel,
+                  true))) {
+                if (!isset($options['ignore-errors'])) {
+                    return $this->raiseError($err);
+                }
 
-                        if (!isset($options['soft'])) {
-                            $this->log(0, 'WARNING: ' . $err->getMessage());
-                        }
-                    } else {
-                        $backedup = $err;
-                    }
+                if (!isset($options['soft'])) {
+                    $this->log(0, 'WARNING: ' . $err->getMessage());
                 }
+            } else {
+                $backedup = $err;
             }
         }
 
@@ -1373,9 +1345,8 @@ function install($pkgfile, $options = array())
             }
         }
 
-        $tmp_path = dirname($descfile);
         if (substr($pkgfile, -4) != '.xml') {
-            $tmp_path .= DIRECTORY_SEPARATOR . $pkgname . '-' . $pkg->getVersion();
+            $tmpdir .= DIRECTORY_SEPARATOR . $pkgname . '-' . $pkg->getVersion();
         }
 
         $this->configSet('default_channel', $channel);
@@ -1401,9 +1372,9 @@ function install($pkgfile, $options = array())
         foreach ($filelist as $file => $atts) {
             $this->expectError(PEAR_INSTALLER_FAILED);
             if ($pkg->getPackagexmlVersion() == '1.0') {
-                $res = $this->_installFile($file, $atts, $tmp_path, $options);
+                $res = $this->_installFile($file, $atts, $tmpdir, $options);
             } else {
-                $res = $this->_installFile2($pkg, $file, $atts, $tmp_path, $options);
+                $res = $this->_installFile2($pkg, $file, $atts, $tmpdir, $options);
             }
             $this->popExpect();
 
@@ -1535,7 +1506,7 @@ function _compileSourceFiles($savechannel, &$filelist)
     {
         require_once 'PEAR/Builder.php';
         $this->log(1, "$this->source_files source files, building");
-        $bob = &new PEAR_Builder($this->ui);
+        $bob = new PEAR_Builder($this->ui);
         $bob->debug = $this->debug;
         $built = $bob->build($filelist, array(&$this, '_buildCallback'));
         if (PEAR::isError($built)) {
@@ -1679,7 +1650,7 @@ function uninstall($package, $options = array())
             require_once 'PEAR/Dependency2.php';
         }
 
-        $depchecker = &new PEAR_Dependency2($this->config, $options,
+        $depchecker = new PEAR_Dependency2($this->config, $options,
             array('channel' => $channel, 'package' => $package),
             PEAR_VALIDATE_UNINSTALLING);
         $e = $depchecker->validatePackageUninstall($this);
@@ -1820,4 +1791,4 @@ function _buildCallback($what, $data)
     }
 
     // }}}
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/PEAR/PEAR/Installer/Role.php b/lib/vendor/PEAR/PEAR/Installer/Role.php
index 3d7e68d86..58b661bbf 100644
--- a/lib/vendor/PEAR/PEAR/Installer/Role.php
+++ b/lib/vendor/PEAR/PEAR/Installer/Role.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Role.php 278552 2009-04-10 19:42:49Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -25,7 +24,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
@@ -36,10 +35,8 @@ class PEAR_Installer_Role
      *
      * Never call this directly, it is called by the PEAR_Config constructor
      * @param PEAR_Config
-     * @access private
-     * @static
      */
-    function initializeConfig(&$config)
+    public static function initializeConfig(&$config)
     {
         if (!isset($GLOBALS['_PEAR_INSTALLER_ROLES'])) {
             PEAR_Installer_Role::registerRoles();
@@ -59,9 +56,8 @@ function initializeConfig(&$config)
      * @param string role name
      * @param PEAR_Config
      * @return PEAR_Installer_Role_Common
-     * @static
      */
-    function &factory($pkg, $role, &$config)
+    public static function &factory($pkg, $role, &$config)
     {
         if (!isset($GLOBALS['_PEAR_INSTALLER_ROLES'])) {
             PEAR_Installer_Role::registerRoles();
@@ -88,9 +84,8 @@ function &factory($pkg, $role, &$config)
      * @param string
      * @param bool clear cache
      * @return array
-     * @static
      */
-    function getValidRoles($release, $clear = false)
+    public static function getValidRoles($release, $clear = false)
     {
         if (!isset($GLOBALS['_PEAR_INSTALLER_ROLES'])) {
             PEAR_Installer_Role::registerRoles();
@@ -123,9 +118,8 @@ function getValidRoles($release, $clear = false)
      * roles are actually fully bundled releases of a package
      * @param bool clear cache
      * @return array
-     * @static
      */
-    function getInstallableRoles($clear = false)
+    public static function getInstallableRoles($clear = false)
     {
         if (!isset($GLOBALS['_PEAR_INSTALLER_ROLES'])) {
             PEAR_Installer_Role::registerRoles();
@@ -158,9 +152,8 @@ function getInstallableRoles($clear = false)
      * so a tests file tests/file.phpt is installed into PackageName/tests/filepath.php
      * @param bool clear cache
      * @return array
-     * @static
      */
-    function getBaseinstallRoles($clear = false)
+    public static function getBaseinstallRoles($clear = false)
     {
         if (!isset($GLOBALS['_PEAR_INSTALLER_ROLES'])) {
             PEAR_Installer_Role::registerRoles();
@@ -190,9 +183,8 @@ function getBaseinstallRoles($clear = false)
      * like the "php" role.
      * @param bool clear cache
      * @return array
-     * @static
      */
-    function getPhpRoles($clear = false)
+    public static function getPhpRoles($clear = false)
     {
         if (!isset($GLOBALS['_PEAR_INSTALLER_ROLES'])) {
             PEAR_Installer_Role::registerRoles();
@@ -226,10 +218,8 @@ function getPhpRoles($clear = false)
      *               included.
      *
      * @return bool TRUE on success, a PEAR error on failure
-     * @access public
-     * @static
      */
-    function registerRoles($dir = null)
+    public static function registerRoles($dir = null)
     {
         $GLOBALS['_PEAR_INSTALLER_ROLES'] = array();
         $parser = new PEAR_XMLParser;
diff --git a/lib/vendor/PEAR/PEAR/Installer/Role/Cfg.php b/lib/vendor/PEAR/PEAR/Installer/Role/Cfg.php
index e7ea6e932..5b75c44cc 100644
--- a/lib/vendor/PEAR/PEAR/Installer/Role/Cfg.php
+++ b/lib/vendor/PEAR/PEAR/Installer/Role/Cfg.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  2007-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Cfg.php 276383 2009-02-24 23:39:37Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.7.0
  */
@@ -20,7 +19,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  2007-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.7.0
  */
diff --git a/lib/vendor/PEAR/PEAR/Installer/Role/Common.php b/lib/vendor/PEAR/PEAR/Installer/Role/Common.php
index 751456011..3e15d8778 100644
--- a/lib/vendor/PEAR/PEAR/Installer/Role/Common.php
+++ b/lib/vendor/PEAR/PEAR/Installer/Role/Common.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2006 The PHP Group
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Common.php 276383 2009-02-24 23:39:37Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -24,7 +23,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2006 The PHP Group
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
@@ -39,7 +38,7 @@ class PEAR_Installer_Role_Common
     /**
      * @param PEAR_Config
      */
-    function PEAR_Installer_Role_Common(&$config)
+    function __construct(&$config)
     {
         $this->config = $config;
     }
@@ -171,4 +170,4 @@ function isExtension()
         return $roleInfo['phpextension'];
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/vendor/PEAR/PEAR/Installer/Role/Data.php b/lib/vendor/PEAR/PEAR/Installer/Role/Data.php
index 7a1d4cc75..75acfef80 100644
--- a/lib/vendor/PEAR/PEAR/Installer/Role/Data.php
+++ b/lib/vendor/PEAR/PEAR/Installer/Role/Data.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Data.php 276383 2009-02-24 23:39:37Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -20,7 +19,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
diff --git a/lib/vendor/PEAR/PEAR/Installer/Role/Doc.php b/lib/vendor/PEAR/PEAR/Installer/Role/Doc.php
index 64c200345..9374990c4 100644
--- a/lib/vendor/PEAR/PEAR/Installer/Role/Doc.php
+++ b/lib/vendor/PEAR/PEAR/Installer/Role/Doc.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Doc.php 276383 2009-02-24 23:39:37Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -20,7 +19,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
diff --git a/lib/vendor/PEAR/PEAR/Installer/Role/Ext.php b/lib/vendor/PEAR/PEAR/Installer/Role/Ext.php
index 5784e95e0..6cd4d2b0a 100644
--- a/lib/vendor/PEAR/PEAR/Installer/Role/Ext.php
+++ b/lib/vendor/PEAR/PEAR/Installer/Role/Ext.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Ext.php 276383 2009-02-24 23:39:37Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -20,7 +19,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
diff --git a/lib/vendor/PEAR/PEAR/Installer/Role/Man.php b/lib/vendor/PEAR/PEAR/Installer/Role/Man.php
new file mode 100644
index 000000000..68b79366a
--- /dev/null
+++ b/lib/vendor/PEAR/PEAR/Installer/Role/Man.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * PEAR_Installer_Role_Man
+ *
+ * PHP versions 4 and 5
+ *
+ * @category   pear
+ * @package    PEAR
+ * @author     Hannes Magnusson <bjori@php.net>
+ * @copyright  2011 The Authors
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    SVN: $Id: $
+ * @link       http://pear.php.net/package/PEAR
+ * @since      File available since Release 1.10.0
+ */
+
+/**
+ * @category   pear
+ * @package    PEAR
+ * @author     Hannes Magnusson <bjori@php.net>
+ * @copyright  2011 The Authors
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    Release: 1.10.3
+ * @link       http://pear.php.net/package/PEAR
+ * @since      Class available since Release 1.10.0
+ */
+class PEAR_Installer_Role_Man extends PEAR_Installer_Role_Common {}
+?>
diff --git a/lib/vendor/PEAR/PEAR/Installer/Role/Man.xml b/lib/vendor/PEAR/PEAR/Installer/Role/Man.xml
new file mode 100644
index 000000000..ec2bd76c3
--- /dev/null
+++ b/lib/vendor/PEAR/PEAR/Installer/Role/Man.xml
@@ -0,0 +1,15 @@
+<role version="1.0">
+ <releasetypes>php</releasetypes>
+ <releasetypes>extsrc</releasetypes>
+ <releasetypes>extbin</releasetypes>
+ <releasetypes>zendextsrc</releasetypes>
+ <releasetypes>zendextbin</releasetypes>
+ <installable>1</installable>
+ <locationconfig>man_dir</locationconfig>
+ <honorsbaseinstall>1</honorsbaseinstall>
+ <unusualbaseinstall />
+ <phpfile />
+ <executable />
+ <phpextension />
+ <config_vars />
+</role>
diff --git a/lib/vendor/PEAR/PEAR/Installer/Role/Php.php b/lib/vendor/PEAR/PEAR/Installer/Role/Php.php
index 15bd163ea..6a7a937de 100644
--- a/lib/vendor/PEAR/PEAR/Installer/Role/Php.php
+++ b/lib/vendor/PEAR/PEAR/Installer/Role/Php.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Php.php 276383 2009-02-24 23:39:37Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -20,7 +19,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
diff --git a/lib/vendor/PEAR/PEAR/Installer/Role/Script.php b/lib/vendor/PEAR/PEAR/Installer/Role/Script.php
index 6169899b2..387fdb3f5 100644
--- a/lib/vendor/PEAR/PEAR/Installer/Role/Script.php
+++ b/lib/vendor/PEAR/PEAR/Installer/Role/Script.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Script.php 276383 2009-02-24 23:39:37Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -20,7 +19,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
diff --git a/lib/vendor/PEAR/PEAR/Installer/Role/Src.php b/lib/vendor/PEAR/PEAR/Installer/Role/Src.php
index 918fff4a0..c92f2cf0b 100644
--- a/lib/vendor/PEAR/PEAR/Installer/Role/Src.php
+++ b/lib/vendor/PEAR/PEAR/Installer/Role/Src.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Src.php 276383 2009-02-24 23:39:37Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -20,7 +19,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
diff --git a/lib/vendor/PEAR/PEAR/Installer/Role/Test.php b/lib/vendor/PEAR/PEAR/Installer/Role/Test.php
index ad69def26..87133af46 100644
--- a/lib/vendor/PEAR/PEAR/Installer/Role/Test.php
+++ b/lib/vendor/PEAR/PEAR/Installer/Role/Test.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Test.php 276383 2009-02-24 23:39:37Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -20,7 +19,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
diff --git a/lib/vendor/PEAR/PEAR/Installer/Role/Www.php b/lib/vendor/PEAR/PEAR/Installer/Role/Www.php
index bcc55d357..e211c1e8f 100644
--- a/lib/vendor/PEAR/PEAR/Installer/Role/Www.php
+++ b/lib/vendor/PEAR/PEAR/Installer/Role/Www.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  2007-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Www.php 276383 2009-02-24 23:39:37Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.7.0
  */
@@ -20,7 +19,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  2007-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.7.0
  */
diff --git a/lib/vendor/PEAR/PEAR/PackageFile.php b/lib/vendor/PEAR/PEAR/PackageFile.php
index e6979bffa..21d26b6df 100644
--- a/lib/vendor/PEAR/PEAR/PackageFile.php
+++ b/lib/vendor/PEAR/PEAR/PackageFile.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: PackageFile.php 286670 2009-08-02 14:16:06Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -35,7 +34,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
@@ -46,17 +45,20 @@ class PEAR_PackageFile
      */
     var $_config;
     var $_debug;
-    /**
-     * Temp directory for uncompressing tgz files.
-     * @var string|false
-     */
-    var $_tmpdir;
+
     var $_logger = false;
     /**
      * @var boolean
      */
     var $_rawReturn = false;
 
+    /**
+     * helper for extracting Archive_Tar errors
+     * @var array
+     * @access private
+     */
+    var $_extractErrors = array();
+
     /**
      *
      * @param   PEAR_Config $config
@@ -64,11 +66,10 @@ class PEAR_PackageFile
      * @param   string @tmpdir Optional temporary directory for uncompressing
      *          files
      */
-    function PEAR_PackageFile(&$config, $debug = false, $tmpdir = false)
+    function __construct(&$config, $debug = false)
     {
         $this->_config = $config;
         $this->_debug = $debug;
-        $this->_tmpdir = $tmpdir;
     }
 
     /**
@@ -184,7 +185,7 @@ function &fromArray($arr)
      */
     function &fromXmlString($data, $state, $file, $archive = false)
     {
-        if (preg_match('/<package[^>]+version="([0-9]+\.[0-9]+)"/', $data, $packageversion)) {
+        if (preg_match('/<package[^>]+version=[\'"]([0-9]+\.[0-9]+)[\'"]/', $data, $packageversion)) {
             if (!in_array($packageversion[1], array('1.0', '2.0', '2.1'))) {
                 return PEAR::raiseError('package.xml version "' . $packageversion[1] .
                     '" is not supported, only 1.0, 2.0, and 2.1 are supported.');
@@ -230,7 +231,7 @@ function &fromXmlString($data, $state, $file, $archive = false)
             }
 
             return $pf;
-        } elseif (preg_match('/<package[^>]+version="([^"]+)"/', $data, $packageversion)) {
+        } elseif (preg_match('/<package[^>]+version=[\'"]([^"\']+)[\'"]/', $data, $packageversion)) {
             $a = PEAR::raiseError('package.xml file "' . $file .
                 '" has unsupported package.xml <package> version "' . $packageversion[1] . '"');
             return $a;
@@ -288,7 +289,7 @@ function addTempFile($file)
     }
 
     /**
-     * Create a PEAR_PackageFile_v* from a compresed Tar or Tgz file.
+     * Create a PEAR_PackageFile_v* from a compressed Tar or Tgz file.
      * @access  public
      * @param string contents of package.xml file
      * @param int package state (one of PEAR_VALIDATE_* constants)
@@ -349,20 +350,17 @@ function &fromTgzFile($file, $state)
             }
         }
 
-        if ($this->_tmpdir) {
-            $tmpdir = $this->_tmpdir;
-        } else {
-            $tmpdir = System::mkTemp(array('-t', $this->_config->get('temp_dir'), '-d', 'pear'));
-            if ($tmpdir === false) {
-                $ret = PEAR::raiseError("there was a problem with getting the configured temp directory");
-                return $ret;
-            }
-
-            PEAR_PackageFile::addTempFile($tmpdir);
+        $tmpdir = System::mktemp('-t "' . $this->_config->get('temp_dir') . '" -d pear');
+        if ($tmpdir === false) {
+            $ret = PEAR::raiseError("there was a problem with getting the configured temp directory");
+            return $ret;
         }
 
+        PEAR_PackageFile::addTempFile($tmpdir);
+
         $this->_extractErrors();
         PEAR::staticPushErrorHandling(PEAR_ERROR_CALLBACK, array($this, '_extractErrors'));
+
         if (!$xml || !$tar->extractList(array($xml), $tmpdir)) {
             $extra = implode("\n", $this->_extractErrors());
             if ($extra) {
@@ -380,13 +378,6 @@ function &fromTgzFile($file, $state)
         return $ret;
     }
 
-    /**
-     * helper for extracting Archive_Tar errors
-     * @var array
-     * @access private
-     */
-    var $_extractErrors = array();
-
     /**
      * helper callback for extracting Archive_Tar errors
      *
@@ -438,7 +429,6 @@ function &fromPackageFile($descfile, $state, $archive = false)
         return $ret;
     }
 
-
     /**
      * Create a PEAR_PackageFile_v* from a .tgz archive or package.xml file.
      *
@@ -498,4 +488,4 @@ function &fromAnyFile($info, $state)
         $info = PEAR::raiseError("Cannot open '$info' for parsing");
         return $info;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/PEAR/PEAR/PackageFile/Generator/v1.php b/lib/vendor/PEAR/PEAR/PackageFile/Generator/v1.php
index 559939275..707781c30 100644
--- a/lib/vendor/PEAR/PEAR/PackageFile/Generator/v1.php
+++ b/lib/vendor/PEAR/PEAR/PackageFile/Generator/v1.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: v1.php 286494 2009-07-29 06:57:11Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -29,7 +28,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
@@ -39,14 +38,14 @@ class PEAR_PackageFile_Generator_v1
      * @var PEAR_PackageFile_v1
      */
     var $_packagefile;
-    function PEAR_PackageFile_Generator_v1(&$packagefile)
+    function __construct(&$packagefile)
     {
         $this->_packagefile = &$packagefile;
     }
 
     function getPackagerVersion()
     {
-        return '1.9.0';
+        return '1.10.3';
     }
 
     /**
@@ -109,7 +108,7 @@ function toTgz(&$packager, $compress = true, $where = null)
         // }}}
         $packagexml = $this->toPackageFile($where, PEAR_VALIDATE_PACKAGING, 'package.xml', true);
         if ($packagexml) {
-            $tar =& new Archive_Tar($dest_package, $compress);
+            $tar = new Archive_Tar($dest_package, $compress);
             $tar->setErrorHandling(PEAR_ERROR_RETURN); // XXX Don't print errors
             // ----- Creates with the package.xml file
             $ok = $tar->createModify(array($packagexml), '', $where);
@@ -168,9 +167,6 @@ function toPackageFile($where = null, $state = PEAR_VALIDATE_NORMAL, $name = 'pa
      */
     function _fixXmlEncoding($string)
     {
-        if (version_compare(phpversion(), '5.0.0', 'lt')) {
-            $string = utf8_encode($string);
-        }
         return strtr($string, array(
                                           '&'  => '&amp;',
                                           '>'  => '&gt;',
@@ -200,7 +196,7 @@ function toXml($state = PEAR_VALIDATE_NORMAL, $nofilevalidation = false)
             );
         $ret = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n";
         $ret .= "<!DOCTYPE package SYSTEM \"http://pear.php.net/dtd/package-1.0\">\n";
-        $ret .= "<package version=\"1.0\" packagerversion=\"1.9.0\">\n" .
+        $ret .= "<package version=\"1.0\" packagerversion=\"1.10.3\">\n" .
 " <name>$pkginfo[package]</name>";
         if (isset($pkginfo['extends'])) {
             $ret .= "\n<extends>$pkginfo[extends]</extends>";
@@ -1178,13 +1174,15 @@ function _processPhpDeps($deps)
         }
         if (count($min)) {
             // get the highest minimum
-            $min = array_pop($a = array_flip($min));
+            $a = array_flip($min);
+            $min = array_pop($a);
         } else {
             $min = false;
         }
         if (count($max)) {
             // get the lowest maximum
-            $max = array_shift($a = array_flip($max));
+            $a = array_flip($max);
+            $max = array_shift($a);
         } else {
             $max = false;
         }
@@ -1250,13 +1248,15 @@ function _processMultipleDepsName($deps)
             }
             if (count($min)) {
                 // get the highest minimum
-                $min = array_pop($a = array_flip($min));
+                $a = array_flip($min);
+                $min = array_pop($a);
             } else {
                 $min = false;
             }
             if (count($max)) {
                 // get the lowest maximum
-                $max = array_shift($a = array_flip($max));
+                $a = array_flip($max);
+                $max = array_shift($a);
             } else {
                 $max = false;
             }
@@ -1281,4 +1281,4 @@ function _processMultipleDepsName($deps)
         return $ret;
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/vendor/PEAR/PEAR/PackageFile/Generator/v2.php b/lib/vendor/PEAR/PEAR/PackageFile/Generator/v2.php
index d0a2df943..1c97296b7 100644
--- a/lib/vendor/PEAR/PEAR/PackageFile/Generator/v2.php
+++ b/lib/vendor/PEAR/PEAR/PackageFile/Generator/v2.php
@@ -10,7 +10,6 @@
  * @author     Stephan Schmidt (original XML_Serializer code)
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: v2.php 278907 2009-04-17 21:10:04Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -31,7 +30,7 @@
  * @author     Stephan Schmidt (original XML_Serializer code)
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
@@ -70,7 +69,7 @@ class PEAR_PackageFile_Generator_v2
 http://pear.php.net/dtd/package-2.0.xsd',
         ),               // attributes of the root tag
         'attributesArray'    => 'attribs',                  // all values in this key will be treated as attributes
-        'contentName'        => '_content',                   // this value will be used directly as content, instead of creating a new tag, may only be used in conjuction with attributesArray
+        'contentName'        => '_content',                   // this value will be used directly as content, instead of creating a new tag, may only be used in conjunction with attributesArray
         'beautifyFilelist'   => false,
         'encoding' => 'UTF-8',
     );
@@ -100,7 +99,7 @@ class PEAR_PackageFile_Generator_v2
     /**
      * @param PEAR_PackageFile_v2
      */
-    function PEAR_PackageFile_Generator_v2(&$packagefile)
+    function __construct(&$packagefile)
     {
         $this->_packagefile = &$packagefile;
         if (isset($this->_packagefile->encoding)) {
@@ -113,7 +112,7 @@ function PEAR_PackageFile_Generator_v2(&$packagefile)
      */
     function getPackagerVersion()
     {
-        return '1.9.0';
+        return '1.10.3';
     }
 
     /**
@@ -232,7 +231,7 @@ function toTgz2(&$packager, &$pf1, $compress = true, $where = null)
                             array($this->_packagefile->getTasksNs() . ':', '-'),
                             array('', '_'), $tag);
                         $task = "PEAR_Task_$tag";
-                        $task = &new $task($this->_packagefile->_config,
+                        $task = new $task($this->_packagefile->_config,
                             $this->_packagefile->_logger,
                             PEAR_TASK_PACKAGE);
                         $task->init($raw, $atts, null);
@@ -269,7 +268,7 @@ function toTgz2(&$packager, &$pf1, $compress = true, $where = null)
         $name       = $pf1 !== null ? 'package2.xml' : 'package.xml';
         $packagexml = $this->toPackageFile($where, PEAR_VALIDATE_PACKAGING, $name);
         if ($packagexml) {
-            $tar =& new Archive_Tar($dest_package, $compress);
+            $tar = new Archive_Tar($dest_package, $compress);
             $tar->setErrorHandling(PEAR_ERROR_RETURN); // XXX Don't print errors
             // ----- Creates with the package.xml file
             $ok = $tar->createModify(array($packagexml), '', $where);
@@ -398,7 +397,7 @@ function toXml($state = PEAR_VALIDATE_NORMAL, $options = array())
             $this->options['beautifyFilelist'] = true;
         }
 
-        $arr['attribs']['packagerversion'] = '1.9.0';
+        $arr['attribs']['packagerversion'] = '1.10.3';
         if ($this->serialize($arr, $options)) {
             return $this->_serializedData . "\n";
         }
@@ -869,12 +868,6 @@ function _createXMLTag($tag, $replaceEntities = true)
         }
 
         if (is_scalar($tag['content']) || is_null($tag['content'])) {
-            if ($this->options['encoding'] == 'UTF-8' &&
-                  version_compare(phpversion(), '5.0.0', 'lt')
-            ) {
-                $tag['content'] = utf8_encode($tag['content']);
-            }
-
             if ($replaceEntities === true) {
                 $replaceEntities = XML_UTIL_ENTITIES_XML;
             }
@@ -890,4 +883,4 @@ function _createXMLTag($tag, $replaceEntities = true)
         }
         return  $tag;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/PEAR/PEAR/PackageFile/Parser/v1.php b/lib/vendor/PEAR/PEAR/PackageFile/Parser/v1.php
index 294d2a764..8e08e0b42 100644
--- a/lib/vendor/PEAR/PEAR/PackageFile/Parser/v1.php
+++ b/lib/vendor/PEAR/PEAR/PackageFile/Parser/v1.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: v1.php 276385 2009-02-24 23:46:03Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -91,7 +90,7 @@ function &parse($data, $file, $archive = false)
             $code = xml_get_error_code($xp);
             $line = xml_get_current_line_number($xp);
             xml_parser_free($xp);
-            $a = &PEAR::raiseError(sprintf("XML error: %s at line %d",
+            $a = PEAR::raiseError(sprintf("XML error: %s at line %d",
                            $str = xml_error_string($code), $line), 2);
             return $a;
         }
diff --git a/lib/vendor/PEAR/PEAR/PackageFile/Parser/v2.php b/lib/vendor/PEAR/PEAR/PackageFile/Parser/v2.php
index 989923402..49a29f1aa 100644
--- a/lib/vendor/PEAR/PEAR/PackageFile/Parser/v2.php
+++ b/lib/vendor/PEAR/PEAR/PackageFile/Parser/v2.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: v2.php 276385 2009-02-24 23:46:03Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -93,9 +92,9 @@ function postProcess($data, $element)
      *               a subclass
      * @return PEAR_PackageFile_v2
      */
-    function &parse($data, $file, $archive = false, $class = 'PEAR_PackageFile_v2')
+    function parse($data, $file = null, $archive = false, $class = 'PEAR_PackageFile_v2')
     {
-        if (PEAR::isError($err = parent::parse($data, $file))) {
+        if (PEAR::isError($err = parent::parse($data))) {
             return $err;
         }
 
diff --git a/lib/vendor/PEAR/PEAR/PackageFile/v1.php b/lib/vendor/PEAR/PEAR/PackageFile/v1.php
index 80f71faba..6bb3276ee 100644
--- a/lib/vendor/PEAR/PEAR/PackageFile/v1.php
+++ b/lib/vendor/PEAR/PEAR/PackageFile/v1.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: v1.php 276383 2009-02-24 23:39:37Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -275,7 +274,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
@@ -346,9 +345,9 @@ class PEAR_PackageFile_v1
      * @param bool determines whether to return a PEAR_Error object, or use the PEAR_ErrorStack
      * @param string Name of Error Stack class to use.
      */
-    function PEAR_PackageFile_v1()
+    function __construct()
     {
-        $this->_stack = &new PEAR_ErrorStack('PEAR_PackageFile_v1');
+        $this->_stack = new PEAR_ErrorStack('PEAR_PackageFile_v1');
         $this->_stack->setErrorMessageTemplate($this->_getErrorMessage());
         $this->_isValid = 0;
     }
@@ -1308,7 +1307,7 @@ function &getDefaultGenerator()
         if (!class_exists('PEAR_PackageFile_Generator_v1')) {
             require_once 'PEAR/PackageFile/Generator/v1.php';
         }
-        $a = &new PEAR_PackageFile_Generator_v1($this);
+        $a = new PEAR_PackageFile_Generator_v1($this);
         return $a;
     }
 
@@ -1331,7 +1330,7 @@ function getFileContents($file)
             if (!class_exists('Archive_Tar')) {
                 require_once 'Archive/Tar.php';
             }
-            $tar = &new Archive_Tar($this->_archiveFile);
+            $tar = new Archive_Tar($this->_archiveFile);
             $tar->pushErrorHandling(PEAR_ERROR_RETURN);
             if ($file != 'package.xml' && $file != 'package2.xml') {
                 $file = $this->getPackage() . '-' . $this->getVersion() . '/' . $file;
@@ -1466,15 +1465,6 @@ function _analyzeSourceCode($file)
                     $look_for = $token;
                     continue 2;
                 case T_STRING:
-                    if (version_compare(zend_version(), '2.0', '<')) {
-                        if (in_array(strtolower($data),
-                            array('public', 'private', 'protected', 'abstract',
-                                  'interface', 'implements', 'throw') 
-                                 )) {
-                            $this->_validateWarning(PEAR_PACKAGEFILE_ERROR_PHP5,
-                                array($file));
-                        }
-                    }
                     if ($look_for == T_CLASS) {
                         $current_class = $data;
                         $current_class_level = $brace_level;
diff --git a/lib/vendor/PEAR/PEAR/PackageFile/v2.php b/lib/vendor/PEAR/PEAR/PackageFile/v2.php
index 78932a57b..248997a6a 100644
--- a/lib/vendor/PEAR/PEAR/PackageFile/v2.php
+++ b/lib/vendor/PEAR/PEAR/PackageFile/v2.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: v2.php 276383 2009-02-24 23:39:37Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -23,7 +22,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
@@ -129,12 +128,21 @@ class PEAR_PackageFile_v2
     /**
      * The constructor merely sets up the private error stack
      */
-    function PEAR_PackageFile_v2()
+    function __construct()
     {
         $this->_stack = new PEAR_ErrorStack('PEAR_PackageFile_v2', false, null);
         $this->_isValid = false;
     }
 
+    /**
+     * PHP 4 style constructor for backwards compatibility.
+     * Used by PEAR_PackageFileManager2
+     */
+    public function PEAR_PackageFile_v2()
+    {
+        $this->__construct();
+    }
+
     /**
      * To make unit-testing easier
      * @param PEAR_Frontend_*
@@ -145,7 +153,7 @@ function PEAR_PackageFile_v2()
      */
     function &getPEARDownloader(&$i, $o, &$c)
     {
-        $z = &new PEAR_Downloader($i, $o, $c);
+        $z = new PEAR_Downloader($i, $o, $c);
         return $z;
     }
 
@@ -163,7 +171,7 @@ function &getPEARDependency2(&$c, $o, $p, $s = PEAR_VALIDATE_INSTALLING)
         if (!class_exists('PEAR_Dependency2')) {
             require_once 'PEAR/Dependency2.php';
         }
-        $z = &new PEAR_Dependency2($c, $o, $p, $s);
+        $z = new PEAR_Dependency2($c, $o, $p, $s);
         return $z;
     }
 
@@ -564,7 +572,7 @@ function listPostinstallScripts()
             $atts = $filelist[$name];
             foreach ($tasks as $tag => $raw) {
                 $task = $this->getTask($tag);
-                $task = &new $task($this->_config, $common, PEAR_TASK_INSTALL);
+                $task = new $task($this->_config, $common, PEAR_TASK_INSTALL);
                 if ($task->isScript()) {
                     $ret[] = $filelist[$name]['installed_as'];
                 }
@@ -610,22 +618,21 @@ function initPostinstallScripts()
             $atts = $filelist[$name];
             foreach ($tasks as $tag => $raw) {
                 $taskname = $this->getTask($tag);
-                $task = &new $taskname($this->_config, $common, PEAR_TASK_INSTALL);
+                $task = new $taskname($this->_config, $common, PEAR_TASK_INSTALL);
                 if (!$task->isScript()) {
                     continue; // scripts are only handled after installation
                 }
                 $lastversion = isset($this->_packageInfo['_lastversion']) ?
                     $this->_packageInfo['_lastversion'] : null;
                 $task->init($raw, $atts, $lastversion);
-                $res = $task->startSession($this, $atts['installed_as']);
+                $res = $task->startSession($this, $atts['installed_as'], null);
                 if (!$res) {
                     continue; // skip this file
                 }
                 if (PEAR::isError($res)) {
                     return $res;
                 }
-                $assign = &$task;
-                $this->_scripts[] = &$assign;
+                $this->_scripts[] = $task;
             }
         }
         if (count($this->_scripts)) {
@@ -799,6 +806,10 @@ function fromArray($pinfo)
     {
         unset($pinfo['old']);
         unset($pinfo['xsdversion']);
+        // If the changelog isn't an array then it was passed in as an empty tag
+        if (isset($pinfo['changelog']) && !is_array($pinfo['changelog'])) {
+          unset($pinfo['changelog']);
+        }
         $this->_incomplete = false;
         $this->_packageInfo = $pinfo;
     }
@@ -1173,6 +1184,9 @@ function getFilelist($preserve = false)
                 $contents['dir']['file'] = array($contents['dir']['file']);
             }
             foreach ($contents['dir']['file'] as $file) {
+                if (!isset($file['attribs']['name'])) {
+                    continue;
+                }
                 $name = $file['attribs']['name'];
                 if (!$preserve) {
                     $file = $file['attribs'];
@@ -1850,7 +1864,7 @@ function getFileContents($file)
                 return implode('', file($file));
             }
         } else { // tgz
-            $tar = &new Archive_Tar($this->_archiveFile);
+            $tar = new Archive_Tar($this->_archiveFile);
             $tar->pushErrorHandling(PEAR_ERROR_RETURN);
             if ($file != 'package.xml' && $file != 'package2.xml') {
                 $file = $this->getPackage() . '-' . $this->getVersion() . '/' . $file;
@@ -1889,7 +1903,7 @@ function &getDefaultGenerator()
         if (!class_exists('PEAR_PackageFile_Generator_v2')) {
             require_once 'PEAR/PackageFile/Generator/v2.php';
         }
-        $a = &new PEAR_PackageFile_Generator_v2($this);
+        $a = new PEAR_PackageFile_Generator_v2($this);
         return $a;
     }
 
diff --git a/lib/vendor/PEAR/PEAR/PackageFile/v2/Validator.php b/lib/vendor/PEAR/PEAR/PackageFile/v2/Validator.php
index 616b7e7ef..f7c8921e1 100644
--- a/lib/vendor/PEAR/PEAR/PackageFile/v2/Validator.php
+++ b/lib/vendor/PEAR/PEAR/PackageFile/v2/Validator.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Validator.php 277885 2009-03-27 19:29:31Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a8
  */
@@ -21,7 +20,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a8
  * @access private
@@ -112,7 +111,8 @@ function validate(&$pf, $state = PEAR_VALIDATE_NORMAL)
               isset($test['dependencies']['required']) &&
               isset($test['dependencies']['required']['pearinstaller']) &&
               isset($test['dependencies']['required']['pearinstaller']['min']) &&
-              version_compare('1.9.0',
+              '1.10.3' != '@package' . '_version@' &&
+              version_compare('1.10.3',
                 $test['dependencies']['required']['pearinstaller']['min'], '<')
         ) {
             $this->_pearVersionTooLow($test['dependencies']['required']['pearinstaller']['min']);
@@ -256,11 +256,10 @@ function validate(&$pf, $state = PEAR_VALIDATE_NORMAL)
                 $validator = $chan->getValidationObject($this->_pf->getPackage());
                 if (!$validator) {
                     $this->_stack->push(__FUNCTION__, 'error',
-                        array_merge(
-                            array('channel' => $chan->getName(),
-                                  'package' => $this->_pf->getPackage()),
-                              $valpack
-                            ),
+                        array('channel' => $chan->getName(),
+                              'package' => $this->_pf->getPackage(),
+                              'name'    => $valpack['_content'],
+                              'version' => $valpack['attribs']['version']),
                         'package "%channel%/%package%" cannot be properly validated without ' .
                         'validation package "%channel%/%name%-%version%"');
                     return $this->_isValid = 0;
@@ -1351,7 +1350,7 @@ function _pearVersionTooLow($version)
         $this->_stack->push(__FUNCTION__, 'error',
             array('version' => $version),
             'This package.xml requires PEAR version %version% to parse properly, we are ' .
-            'version 1.9.0');
+            'version 1.10.3');
     }
 
     function _invalidTagOrder($oktags, $actual, $root)
@@ -1738,7 +1737,7 @@ function _analyzeBundledPackages()
         if (!is_array($info)) {
             $info = array($info);
         }
-        $pkg = &new PEAR_PackageFile($this->_pf->_config);
+        $pkg = new PEAR_PackageFile($this->_pf->_config);
         foreach ($info as $package) {
             if (!file_exists($dir_prefix . DIRECTORY_SEPARATOR . $package)) {
                 $this->_fileNotFound($dir_prefix . DIRECTORY_SEPARATOR . $package);
@@ -1876,7 +1875,7 @@ function analyzeSourceCode($file, $string = false)
                 $pn = $this->_pf->getPackage();
                 $this->_stack->push(__FUNCTION__, 'warning',
                         array('file' => $file, 'package' => $pn),
-                        'in %file%: Could not process file for unkown reasons,' .
+                        'in %file%: Could not process file for unknown reasons,' .
                         ' possibly a PHP parse error in %file% from %package%');
             }
         }
@@ -1981,25 +1980,6 @@ function analyzeSourceCode($file, $string = false)
                     $look_for = $token;
                     continue 2;
                 case T_STRING:
-                    if (version_compare(zend_version(), '2.0', '<')) {
-                        if (in_array(strtolower($data),
-                            array('public', 'private', 'protected', 'abstract',
-                                  'interface', 'implements', 'throw')
-                                 )
-                        ) {
-                            if (isset($this->_stack)) {
-                                $this->_stack->push(__FUNCTION__, 'warning', array(
-                                    'file' => $file),
-                                    'Error, PHP5 token encountered in %file%,' .
-                                    ' analysis should be in PHP5');
-                            } else {
-                                PEAR::raiseError('Error: PHP5 token encountered in ' . $file .
-                                    'packaging should be done in PHP 5');
-                                return false;
-                            }
-                        }
-                    }
-
                     if ($look_for == T_CLASS) {
                         $current_class = $data;
                         $current_class_level = $brace_level;
@@ -2045,7 +2025,8 @@ function analyzeSourceCode($file, $string = false)
                     }
                     continue 2;
                 case T_DOUBLE_COLON:
-                    if (!($tokens[$i - 1][0] == T_WHITESPACE || $tokens[$i - 1][0] == T_STRING)) {
+                    $token = $tokens[$i - 1][0];
+                    if (!($token == T_WHITESPACE || $token == T_STRING || $token == T_STATIC || $token == T_VARIABLE)) {
                         if (isset($this->_stack)) {
                             $this->_stack->push(__FUNCTION__, 'warning', array('file' => $file),
                                 'Parser error: invalid PHP found in file "%file%"');
@@ -2151,4 +2132,4 @@ function _buildProvidesArray($srcinfo)
 
         return $providesret;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/PEAR/PEAR/PackageFile/v2/rw.php b/lib/vendor/PEAR/PEAR/PackageFile/v2/rw.php
index 5c9749217..c52ff4f3c 100644
--- a/lib/vendor/PEAR/PEAR/PackageFile/v2/rw.php
+++ b/lib/vendor/PEAR/PEAR/PackageFile/v2/rw.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: rw.php 276385 2009-02-24 23:46:03Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a8
  */
@@ -23,7 +22,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a8
  */
@@ -242,7 +241,7 @@ function updateMaintainer($newrole, $handle, $name, $email, $active = 'yes')
                 }
             }
             foreach ($info as $i => $maintainer) {
-                if ($maintainer['user'] == $handle) {
+                if (is_array($maintainer) && $maintainer['user'] == $handle) {
                     $found = $i;
                     break 2;
                 }
diff --git a/lib/vendor/PEAR/PEAR/Packager.php b/lib/vendor/PEAR/PEAR/Packager.php
index d71f6d126..713bc708c 100644
--- a/lib/vendor/PEAR/PEAR/Packager.php
+++ b/lib/vendor/PEAR/PEAR/Packager.php
@@ -11,7 +11,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Packager.php 286809 2009-08-04 15:10:26Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  */
@@ -31,7 +30,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 0.1
  */
@@ -50,7 +49,7 @@ function package($pkgfile = null, $compress = true, $pkg2 = null)
         }
 
         PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        $pkg  = &new PEAR_PackageFile($this->config, $this->debug);
+        $pkg  = new PEAR_PackageFile($this->config, $this->debug);
         $pf   = &$pkg->fromPackageFile($pkgfile, PEAR_VALIDATE_NORMAL);
         $main = &$pf;
         PEAR::staticPopErrorHandling();
diff --git a/lib/vendor/PEAR/PEAR/Proxy.php b/lib/vendor/PEAR/PEAR/Proxy.php
new file mode 100644
index 000000000..d350d5b9a
--- /dev/null
+++ b/lib/vendor/PEAR/PEAR/Proxy.php
@@ -0,0 +1,187 @@
+<?php
+/**
+ * PEAR_Proxy
+ *
+ * HTTP Proxy handling 
+ *
+ * @category   pear
+ * @package    PEAR
+ * @author     Nico Boehr 
+ * @copyright  1997-2009 The Authors
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @link       http://pear.php.net/package/PEAR
+ */
+
+class PEAR_Proxy
+{
+    var $config = null;
+
+    /**
+     * @access private
+     */
+    var $proxy_host;
+    /**
+     * @access private
+     */
+    var $proxy_port;
+    /**
+     * @access private
+     */
+    var $proxy_user;
+    /**
+     * @access private
+     */
+    var $proxy_pass;
+    /**
+     * @access private
+     */
+    var $proxy_schema;
+
+    function __construct($config = null)
+    {
+        $this->config = $config;
+        $this->_parseProxyInfo();
+    }
+
+    /**
+     * @access private
+     */
+    function _parseProxyInfo()
+    {
+        $this->proxy_host = $this->proxy_port = $this->proxy_user = $this->proxy_pass = '';
+        if ($this->config->get('http_proxy')&&
+              $proxy = parse_url($this->config->get('http_proxy'))
+        ) {
+            $this->proxy_host = isset($proxy['host']) ? $proxy['host'] : null;
+
+            $this->proxy_port   = isset($proxy['port']) ? $proxy['port'] : 8080;
+            $this->proxy_user   = isset($proxy['user']) ? urldecode($proxy['user']) : null;
+            $this->proxy_pass   = isset($proxy['pass']) ? urldecode($proxy['pass']) : null;
+            $this->proxy_schema = (isset($proxy['scheme']) && $proxy['scheme'] == 'https') ? 'https' : 'http';
+        }
+    }
+
+    /**
+     * @access private
+     */
+    function _httpConnect($fp, $host, $port)
+    {
+        fwrite($fp, "CONNECT $host:$port HTTP/1.1\r\n");
+        fwrite($fp, "Host: $host:$port\r\n\r\n");
+
+        while ($line = trim(fgets($fp, 1024))) {
+            if (preg_match('|^HTTP/1.[01] ([0-9]{3}) |', $line, $matches)) {
+                $code = (int)$matches[1];
+
+                /* as per RFC 2817 */
+                if ($code < 200 || $code >= 300) {
+                    return PEAR::raiseError("Establishing a CONNECT tunnel through proxy failed with response code $code");
+                }
+            }
+        }
+
+        // connection was successful -- establish SSL through
+        // the tunnel
+        $crypto_method = STREAM_CRYPTO_METHOD_TLS_CLIENT;
+
+        if (defined('STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT')) {
+            $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
+            $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
+        }
+
+        // set the correct hostname for working hostname
+        // verification
+        stream_context_set_option($fp, 'ssl', 'peer_name', $host);
+
+        // blocking socket needed for
+        // stream_socket_enable_crypto()
+        // see
+        // <http://php.net/manual/en/function.stream-socket-enable-crypto.php>
+        stream_set_blocking ($fp, true);
+        $crypto_res = stream_socket_enable_crypto($fp, true, $crypto_method);
+        if (!$crypto_res) {
+            return PEAR::raiseError("Could not establish SSL connection through proxy $proxy_host:$proxy_port: $crypto_res");
+        }
+
+        return true;
+    }
+
+    /**
+     * get the authorization information for the proxy, encoded to be
+     * passed in the Proxy-Authentication HTTP header.
+     * @return null|string the encoded authentication information if a
+     *                     proxy and authentication is configured, null 
+     *                     otherwise.
+     */
+    function getProxyAuth()
+    {
+        if ($this->isProxyConfigured() && $this->proxy_user != '') {
+            return base64_encode($this->proxy_user . ':' . $this->proxy_pass);
+        }
+        return null;
+    }
+
+    function getProxyUser()
+    {
+        return $this->proxy_user;
+    }
+
+    /**
+     * Check if we are configured to use a proxy.
+     *
+     * @return boolean true if we are configured to use a proxy, false
+     *                 otherwise.
+     * @access public
+     */
+    function isProxyConfigured()
+    {
+        return $this->proxy_host != '';
+    }
+
+    /**
+     * Open a socket to a remote server, possibly involving a HTTP
+     * proxy.
+     *
+     * If an HTTP proxy has been configured (http_proxy PEAR_Config
+     * setting), the proxy will be used.
+     *
+     * @param string $host    the host to connect to
+     * @param string $port    the port to connect to
+     * @param boolean $secure if true, establish a secure connection
+     *                        using TLS.
+     * @access public
+     */
+    function openSocket($host, $port, $secure = false)
+    {
+        if ($this->isProxyConfigured()) {
+            $fp = @fsockopen(
+                $this->proxy_host, $this->proxy_port, 
+                $errno, $errstr, 15
+            );
+
+            if (!$fp) {
+                return PEAR::raiseError("Connection to `$proxy_host:$proxy_port' failed: $errstr", -9276);
+            }
+
+            /* HTTPS is to be used and we have a proxy, use CONNECT verb */
+            if ($secure) {
+                $res = $this->_httpConnect($fp, $host, $port);
+
+                if (PEAR::isError($res)) {
+                    return $res;
+                }
+            }
+        } else {
+            if ($secure) {
+                $host = 'ssl://' . $host;
+            }
+
+            $fp = @fsockopen($host, $port, $errno, $errstr);
+            if (!$fp) {
+                return PEAR::raiseError("Connection to `$host:$port' failed: $errstr", $errno);
+            }
+        }
+
+        return $fp;
+    }
+}
diff --git a/lib/vendor/PEAR/PEAR/REST.php b/lib/vendor/PEAR/PEAR/REST.php
index d2ff32b65..aec7cf234 100644
--- a/lib/vendor/PEAR/PEAR/REST.php
+++ b/lib/vendor/PEAR/PEAR/REST.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: REST.php 286489 2009-07-29 05:59:08Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -19,6 +18,7 @@
  */
 require_once 'PEAR.php';
 require_once 'PEAR/XMLParser.php';
+require_once 'PEAR/Proxy.php';
 
 /**
  * Intelligently retrieve data, following hyperlinks if necessary, and re-directing
@@ -28,7 +28,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
@@ -37,7 +37,7 @@ class PEAR_REST
     var $config;
     var $_options;
 
-    function PEAR_REST(&$config, $options = array())
+    function __construct(&$config, $options = array())
     {
         $this->config   = &$config;
         $this->_options = $options;
@@ -100,7 +100,10 @@ function retrieveData($url, $accept = false, $forcestring = false, $channel = fa
             $ret = $this->getCache($url);
             if (!PEAR::isError($ret) && $trieddownload) {
                 // reset the age of the cache if the server says it was unmodified
-                $this->saveCache($url, $ret, null, true, $cacheId);
+                $result = $this->saveCache($url, $ret, null, true, $cacheId);
+                if (PEAR::isError($result)) {
+                    return PEAR::raiseError($result->getMessage());
+                }
             }
 
             return $ret;
@@ -117,16 +120,22 @@ function retrieveData($url, $accept = false, $forcestring = false, $channel = fa
         }
 
         if ($forcestring) {
-            $this->saveCache($url, $content, $lastmodified, false, $cacheId);
+            $result = $this->saveCache($url, $content, $lastmodified, false, $cacheId);
+            if (PEAR::isError($result)) {
+                return PEAR::raiseError($result->getMessage());
+            }
+
             return $content;
         }
 
         if (isset($headers['content-type'])) {
-            switch ($headers['content-type']) {
+            $content_type = explode(";", $headers['content-type']);
+            $content_type = $content_type[0];
+            switch ($content_type) {
                 case 'text/xml' :
                 case 'application/xml' :
                 case 'text/plain' :
-                    if ($headers['content-type'] === 'text/plain') {
+                    if ($content_type === 'text/plain') {
                         $check = substr($content, 0, 5);
                         if ($check !== '<?xml') {
                             break;
@@ -153,7 +162,11 @@ function retrieveData($url, $accept = false, $forcestring = false, $channel = fa
             $content = $parser->getData();
         }
 
-        $this->saveCache($url, $content, $lastmodified, false, $cacheId);
+        $result = $this->saveCache($url, $content, $lastmodified, false, $cacheId);
+        if (PEAR::isError($result)) {
+            return PEAR::raiseError($result->getMessage());
+        }
+
         return $content;
     }
 
@@ -212,57 +225,93 @@ function getCache($url)
      */
     function saveCache($url, $contents, $lastmodified, $nochange = false, $cacheid = null)
     {
-        $cachedir    = $this->config->get('cache_dir') . DIRECTORY_SEPARATOR . md5($url);
-        $cacheidfile = $cachedir . 'rest.cacheid';
-        $cachefile   = $cachedir . 'rest.cachefile';
+        $cache_dir   = $this->config->get('cache_dir');
+        $d           = $cache_dir . DIRECTORY_SEPARATOR . md5($url);
+        $cacheidfile = $d . 'rest.cacheid';
+        $cachefile   = $d . 'rest.cachefile';
+
+        if (!is_dir($cache_dir)) {
+            if (System::mkdir(array('-p', $cache_dir)) === false) {
+              return PEAR::raiseError("The value of config option cache_dir ($cache_dir) is not a directory and attempts to create the directory failed.");
+            }
+        }
+
+        if (!is_writeable($cache_dir)) {
+            // If writing to the cache dir is not going to work, silently do nothing.
+            // An ugly hack, but retains compat with PEAR 1.9.1 where many commands
+            // work fine as non-root user (w/out write access to default cache dir).
+            return true;
+        }
 
         if ($cacheid === null && $nochange) {
             $cacheid = unserialize(implode('', file($cacheidfile)));
         }
 
-        $fp = @fopen($cacheidfile, 'wb');
-        if (!$fp) {
-            $cache_dir = $this->config->get('cache_dir');
-            if (is_dir($cache_dir)) {
-                return false;
-            }
+        $idData = serialize(array(
+            'age'        => time(),
+            'lastChange' => ($nochange ? $cacheid['lastChange'] : $lastmodified),
+        ));
 
-            System::mkdir(array('-p', $cache_dir));
-            $fp = @fopen($cacheidfile, 'wb');
-            if (!$fp) {
-                return false;
-            }
+        $result = $this->saveCacheFile($cacheidfile, $idData);
+        if (PEAR::isError($result)) {
+            return $result;
+        } elseif ($nochange) {
+            return true;
         }
 
-        if ($nochange) {
-            fwrite($fp, serialize(array(
-                'age'        => time(),
-                'lastChange' => $cacheid['lastChange'],
-                ))
-            );
+        $result = $this->saveCacheFile($cachefile, serialize($contents));
+        if (PEAR::isError($result)) {
+            if (file_exists($cacheidfile)) {
+              @unlink($cacheidfile);
+            }
 
-            fclose($fp);
-            return true;
+            return $result;
         }
 
-        fwrite($fp, serialize(array(
-            'age'        => time(),
-            'lastChange' => $lastmodified,
-            ))
-        );
+        return true;
+    }
 
-        fclose($fp);
-        $fp = @fopen($cachefile, 'wb');
-        if (!$fp) {
-            if (file_exists($cacheidfile)) {
-                @unlink($cacheidfile);
+    function saveCacheFile($file, $contents)
+    {
+        $len = strlen($contents);
+
+        $cachefile_fp = @fopen($file, 'xb'); // x is the O_CREAT|O_EXCL mode
+        if ($cachefile_fp !== false) { // create file
+            if (fwrite($cachefile_fp, $contents, $len) < $len) {
+                fclose($cachefile_fp);
+                return PEAR::raiseError("Could not write $file.");
+            }
+        } else { // update file
+            $cachefile_fp = @fopen($file, 'r+b'); // do not truncate file
+            if (!$cachefile_fp) {
+                return PEAR::raiseError("Could not open $file for writing.");
             }
 
-            return false;
+            if (OS_WINDOWS) {
+                $not_symlink     = !is_link($file); // see bug #18834
+            } else {
+                $cachefile_lstat = lstat($file);
+                $cachefile_fstat = fstat($cachefile_fp);
+                $not_symlink     = $cachefile_lstat['mode'] == $cachefile_fstat['mode']
+                                   && $cachefile_lstat['ino']  == $cachefile_fstat['ino']
+                                   && $cachefile_lstat['dev']  == $cachefile_fstat['dev']
+                                   && $cachefile_fstat['nlink'] === 1;
+            }
+
+            if ($not_symlink) {
+                ftruncate($cachefile_fp, 0); // NOW truncate
+                if (fwrite($cachefile_fp, $contents, $len) < $len) {
+                    fclose($cachefile_fp);
+                    return PEAR::raiseError("Could not write $file.");
+                }
+            } else {
+                fclose($cachefile_fp);
+                $link = function_exists('readlink') ? readlink($file) : $file;
+                return PEAR::raiseError('SECURITY ERROR: Will not write to ' . $file . ' as it is symlinked to ' . $link . ' - Possible symlink attack');
+            }
         }
 
-        fwrite($fp, serialize($contents));
-        fclose($fp);
+        fclose($cachefile_fp);
         return true;
     }
 
@@ -308,32 +357,19 @@ function downloadHttp($url, $lastmodified = null, $accept = false, $channel = fa
         $path   = isset($info['path']) ? $info['path'] : null;
         $schema = (isset($info['scheme']) && $info['scheme'] == 'https') ? 'https' : 'http';
 
-        $proxy_host = $proxy_port = $proxy_user = $proxy_pass = '';
-        if ($this->config->get('http_proxy')&&
-              $proxy = parse_url($this->config->get('http_proxy'))
-        ) {
-            $proxy_host = isset($proxy['host']) ? $proxy['host'] : null;
-            if ($schema === 'https') {
-                $proxy_host = 'ssl://' . $proxy_host;
-            }
-
-            $proxy_port   = isset($proxy['port']) ? $proxy['port'] : 8080;
-            $proxy_user   = isset($proxy['user']) ? urldecode($proxy['user']) : null;
-            $proxy_pass   = isset($proxy['pass']) ? urldecode($proxy['pass']) : null;
-            $proxy_schema = (isset($proxy['scheme']) && $proxy['scheme'] == 'https') ? 'https' : 'http';
-        }
+        $proxy = new PEAR_Proxy($this->config);
 
         if (empty($port)) {
             $port = (isset($info['scheme']) && $info['scheme'] == 'https')  ? 443 : 80;
         }
 
-        if (isset($proxy['host'])) {
+        if ($proxy->isProxyConfigured() && $schema === 'http') {
             $request = "GET $url HTTP/1.1\r\n";
         } else {
             $request = "GET $path HTTP/1.1\r\n";
         }
 
-        $request .= "Host: $host:$port\r\n";
+        $request .= "Host: $host\r\n";
         $ifmodifiedsince = '';
         if (is_array($lastmodified)) {
             if (isset($lastmodified['Last-Modified'])) {
@@ -348,7 +384,7 @@ function downloadHttp($url, $lastmodified = null, $accept = false, $channel = fa
         }
 
         $request .= $ifmodifiedsince .
-            "User-Agent: PEAR/1.9.0/PHP/" . PHP_VERSION . "\r\n";
+            "User-Agent: PEAR/1.10.3/PHP/" . PHP_VERSION . "\r\n";
 
         $username = $this->config->get('username', null, $channel);
         $password = $this->config->get('password', null, $channel);
@@ -358,9 +394,10 @@ function downloadHttp($url, $lastmodified = null, $accept = false, $channel = fa
             $request .= "Authorization: Basic $tmp\r\n";
         }
 
-        if ($proxy_host != '' && $proxy_user != '') {
+        $proxyAuth = $proxy->getProxyAuth();
+        if ($proxyAuth) {
             $request .= 'Proxy-Authorization: Basic ' .
-                base64_encode($proxy_user . ':' . $proxy_pass) . "\r\n";
+                $proxyAuth . "\r\n";
         }
 
         if ($accept) {
@@ -371,20 +408,10 @@ function downloadHttp($url, $lastmodified = null, $accept = false, $channel = fa
         $request .= "Connection: close\r\n";
         $request .= "\r\n";
 
-        if ($proxy_host != '') {
-            $fp = @fsockopen($proxy_host, $proxy_port, $errno, $errstr, 15);
-            if (!$fp) {
-                return PEAR::raiseError("Connection to `$proxy_host:$proxy_port' failed: $errstr", -9276);
-            }
-        } else {
-            if ($schema === 'https') {
-                $host = 'ssl://' . $host;
-            }
-
-            $fp = @fsockopen($host, $port, $errno, $errstr);
-            if (!$fp) {
-                return PEAR::raiseError("Connection to `$host:$port' failed: $errstr", $errno);
-            }
+        $secure = ($schema == 'https');
+        $fp = $proxy->openSocket($host, $port, $secure);
+        if (PEAR::isError($fp)) {
+            return $fp;
         }
 
         fwrite($fp, $request);
@@ -445,4 +472,4 @@ function downloadHttp($url, $lastmodified = null, $accept = false, $channel = fa
 
         return $data;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/PEAR/PEAR/REST/10.php b/lib/vendor/PEAR/PEAR/REST/10.php
index 777610118..ac0aeab3a 100644
--- a/lib/vendor/PEAR/PEAR/REST/10.php
+++ b/lib/vendor/PEAR/PEAR/REST/10.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: 10.php 287558 2009-08-21 22:21:28Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a12
  */
@@ -27,7 +26,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a12
  */
@@ -37,9 +36,9 @@ class PEAR_REST_10
      * @var PEAR_REST
      */
     var $_rest;
-    function PEAR_REST_10($config, $options = array())
+    function __construct($config, $options = array())
     {
-        $this->_rest = &new PEAR_REST($config, $options);
+        $this->_rest = new PEAR_REST($config, $options);
     }
 
     /**
@@ -292,6 +291,10 @@ function _returnDownloadURL($base, $package, $release, $info, $found, $phpversio
 
         $allinfo = $this->_rest->retrieveData($base . 'r/' . $packageLower .
             '/allreleases.xml', false, false, $channel);
+        if (PEAR::isError($allinfo)) {
+            return $allinfo;
+        }
+
         if (!is_array($allinfo['r']) || !isset($allinfo['r'][0])) {
             $allinfo['r'] = array($allinfo['r']);
         }
@@ -864,4 +867,4 @@ function _sortReleasesByVersionNumber($a, $b)
             return 1;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/PEAR/PEAR/REST/11.php b/lib/vendor/PEAR/PEAR/REST/11.php
index 02a908373..a7e713ac4 100644
--- a/lib/vendor/PEAR/PEAR/REST/11.php
+++ b/lib/vendor/PEAR/PEAR/REST/11.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: 11.php 286670 2009-08-02 14:16:06Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.3
  */
@@ -27,7 +26,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.3
  */
@@ -38,9 +37,9 @@ class PEAR_REST_11
      */
     var $_rest;
 
-    function PEAR_REST_11($config, $options = array())
+    function __construct($config, $options = array())
     {
-        $this->_rest = &new PEAR_REST($config, $options);
+        $this->_rest = new PEAR_REST($config, $options);
     }
 
     function listAll($base, $dostable, $basic = true, $searchpackage = false, $searchsummary = false, $channel = false)
@@ -338,4 +337,4 @@ function betterStates($state, $include = false)
         return array_slice($states, $i + 1);
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/vendor/PEAR/PEAR/REST/13.php b/lib/vendor/PEAR/PEAR/REST/13.php
index 250adfe51..6469fd30d 100644
--- a/lib/vendor/PEAR/PEAR/REST/13.php
+++ b/lib/vendor/PEAR/PEAR/REST/13.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: 13.php 287110 2009-08-11 18:51:15Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a12
  */
@@ -28,7 +27,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a12
  */
@@ -296,4 +295,102 @@ function getDepDownloadURL($base, $xsdversion, $dependency, $deppackage,
 
         return $this->_returnDownloadURL($base, $package, $release, $info, $found, $skippedphp, $channel);
     }
+
+    /**
+     * List package upgrades but take the PHP version into account.
+     */
+    function listLatestUpgrades($base, $pref_state, $installed, $channel, &$reg)
+    {
+        $packagelist = $this->_rest->retrieveData($base . 'p/packages.xml', false, false, $channel);
+        if (PEAR::isError($packagelist)) {
+            return $packagelist;
+        }
+
+        $ret = array();
+        if (!is_array($packagelist) || !isset($packagelist['p'])) {
+            return $ret;
+        }
+
+        if (!is_array($packagelist['p'])) {
+            $packagelist['p'] = array($packagelist['p']);
+        }
+
+        foreach ($packagelist['p'] as $package) {
+            if (!isset($installed[strtolower($package)])) {
+                continue;
+            }
+
+            $inst_version = $reg->packageInfo($package, 'version', $channel);
+            $inst_state   = $reg->packageInfo($package, 'release_state', $channel);
+            PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
+            $info = $this->_rest->retrieveData($base . 'r/' . strtolower($package) .
+                '/allreleases2.xml', false, false, $channel);
+            PEAR::popErrorHandling();
+            if (PEAR::isError($info)) {
+                continue; // no remote releases
+            }
+
+            if (!isset($info['r'])) {
+                continue;
+            }
+
+            $release = $found = false;
+            if (!is_array($info['r']) || !isset($info['r'][0])) {
+                $info['r'] = array($info['r']);
+            }
+
+            // $info['r'] is sorted by version number
+            usort($info['r'], array($this, '_sortReleasesByVersionNumber'));
+            foreach ($info['r'] as $release) {
+                if ($inst_version && version_compare($release['v'], $inst_version, '<=')) {
+                    // not newer than the one installed
+                    break;
+                }
+                if (version_compare($release['m'], phpversion(), '>')) {
+                    // skip dependency releases that require a PHP version
+                    // newer than our PHP version
+                    continue;
+                }
+
+                // new version > installed version
+                if (!$pref_state) {
+                    // every state is a good state
+                    $found = true;
+                    break;
+                } else {
+                    $new_state = $release['s'];
+                    // if new state >= installed state: go
+                    if (in_array($new_state, $this->betterStates($inst_state, true))) {
+                        $found = true;
+                        break;
+                    } else {
+                        // only allow to lower the state of package,
+                        // if new state >= preferred state: go
+                        if (in_array($new_state, $this->betterStates($pref_state, true))) {
+                            $found = true;
+                            break;
+                        }
+                    }
+                }
+            }
+
+            if (!$found) {
+                continue;
+            }
+
+            $relinfo = $this->_rest->retrieveCacheFirst($base . 'r/' . strtolower($package) . '/' .
+                $release['v'] . '.xml', false, false, $channel);
+            if (PEAR::isError($relinfo)) {
+                return $relinfo;
+            }
+
+            $ret[$package] = array(
+                'version'  => $release['v'],
+                'state'    => $release['s'],
+                'filesize' => $relinfo['f'],
+            );
+        }
+
+        return $ret;
+    }
 }
\ No newline at end of file
diff --git a/lib/vendor/PEAR/PEAR/Registry.php b/lib/vendor/PEAR/PEAR/Registry.php
index ae110010d..c599c61ee 100644
--- a/lib/vendor/PEAR/PEAR/Registry.php
+++ b/lib/vendor/PEAR/PEAR/Registry.php
@@ -11,7 +11,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Registry.php 287555 2009-08-21 21:27:27Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  */
@@ -37,7 +36,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
@@ -131,24 +130,27 @@ class PEAR_Registry extends PEAR
      *
      * @access public
      */
-    function PEAR_Registry($pear_install_dir = PEAR_INSTALL_DIR, $pear_channel = false,
-                           $pecl_channel = false)
+    function __construct($pear_install_dir = PEAR_INSTALL_DIR, $pear_channel = false,
+                           $pecl_channel = false, $pear_metadata_dir = '')
     {
-        parent::PEAR();
-        $this->setInstallDir($pear_install_dir);
+        parent::__construct();
+        $this->setInstallDir($pear_install_dir, $pear_metadata_dir);
         $this->_pearChannel = $pear_channel;
         $this->_peclChannel = $pecl_channel;
         $this->_config      = false;
     }
 
-    function setInstallDir($pear_install_dir = PEAR_INSTALL_DIR)
+    function setInstallDir($pear_install_dir = PEAR_INSTALL_DIR, $pear_metadata_dir = '')
     {
         $ds = DIRECTORY_SEPARATOR;
         $this->install_dir = $pear_install_dir;
-        $this->channelsdir = $pear_install_dir.$ds.'.channels';
-        $this->statedir    = $pear_install_dir.$ds.'.registry';
-        $this->filemap     = $pear_install_dir.$ds.'.filemap';
-        $this->lockfile    = $pear_install_dir.$ds.'.lock';
+        if (!$pear_metadata_dir) {
+            $pear_metadata_dir = $pear_install_dir;
+        }
+        $this->channelsdir = $pear_metadata_dir.$ds.'.channels';
+        $this->statedir    = $pear_metadata_dir.$ds.'.registry';
+        $this->filemap     = $pear_metadata_dir.$ds.'.filemap';
+        $this->lockfile    = $pear_metadata_dir.$ds.'.lock';
     }
 
     function hasWriteAccess()
@@ -181,7 +183,7 @@ function setConfig(&$config, $resetInstallDir = true)
     {
         $this->_config = &$config;
         if ($resetInstallDir) {
-            $this->setInstallDir($config->get('php_dir'));
+            $this->setInstallDir($config->get('php_dir'), $config->get('metadata_dir'));
         }
     }
 
@@ -319,7 +321,7 @@ function _initializeDepDB()
                 $initializing = true;
                 if (!$this->_config) { // never used?
                     $file = OS_WINDOWS ? 'pear.ini' : '.pearrc';
-                    $this->_config = &new PEAR_Config($this->statedir . DIRECTORY_SEPARATOR .
+                    $this->_config = new PEAR_Config($this->statedir . DIRECTORY_SEPARATOR .
                         $file);
                     $this->_config->setRegistry($this);
                     $this->_config->set('php_dir', $this->install_dir);
@@ -328,9 +330,9 @@ function _initializeDepDB()
                 $this->_dependencyDB = &PEAR_DependencyDB::singleton($this->_config);
                 if (PEAR::isError($this->_dependencyDB)) {
                     // attempt to recover by removing the dep db
-                    if (file_exists($this->_config->get('php_dir', null, 'pear.php.net') .
+                    if (file_exists($this->_config->get('metadata_dir', null, 'pear.php.net') .
                         DIRECTORY_SEPARATOR . '.depdb')) {
-                        @unlink($this->_config->get('php_dir', null, 'pear.php.net') .
+                        @unlink($this->_config->get('metadata_dir', null, 'pear.php.net') .
                             DIRECTORY_SEPARATOR . '.depdb');
                     }
 
@@ -782,12 +784,9 @@ function _readFileMap()
         }
 
         clearstatcache();
-        $rt = get_magic_quotes_runtime();
-        set_magic_quotes_runtime(0);
         $fsize = filesize($this->filemap);
         fclose($fp);
         $data = file_get_contents($this->filemap);
-        set_magic_quotes_runtime($rt);
         $tmp = unserialize($data);
         if (!$tmp && $fsize > 7) {
             return $this->raiseError('PEAR_Registry: invalid filemap data', PEAR_REGISTRY_ERROR_FORMAT, null, null, $data);
@@ -907,7 +906,7 @@ function _channelExists($channel, $noaliases = false)
     }
 
     /**
-     * Determine whether a mirror exists within the deafult channel in the registry
+     * Determine whether a mirror exists within the default channel in the registry
      *
      * @param string Channel name
      * @param string Mirror name
@@ -1009,7 +1008,7 @@ function _addChannel($channel, $update = false, $lastmodified = false)
         if ($lastmodified) {
             $info['_lastmodified'] = $lastmodified;
         } else {
-            $info['_lastmodified'] = date('r');
+            $info['_lastmodified'] = time();
         }
 
         fwrite($fp, serialize($info));
@@ -1136,12 +1135,9 @@ function _packageInfo($package = null, $key = null, $channel = 'pear.php.net')
             return null;
         }
 
-        $rt = get_magic_quotes_runtime();
-        set_magic_quotes_runtime(0);
         clearstatcache();
         $this->_closePackageFile($fp);
         $data = file_get_contents($this->_packageFileName($package, $channel));
-        set_magic_quotes_runtime($rt);
         $data = unserialize($data);
         if ($key === null) {
             return $data;
@@ -1175,12 +1171,9 @@ function _channelInfo($channel, $noaliases = false)
             return null;
         }
 
-        $rt = get_magic_quotes_runtime();
-        set_magic_quotes_runtime(0);
         clearstatcache();
         $this->_closeChannelFile($fp);
         $data = file_get_contents($this->_channelFileName($channel));
-        set_magic_quotes_runtime($rt);
         $data = unserialize($data);
         return $data;
     }
@@ -1447,7 +1440,7 @@ function &_getPackage($package, $channel = 'pear.php.net')
 
         $a = $this->_config;
         if (!$a) {
-            $this->_config = &new PEAR_Config;
+            $this->_config = new PEAR_Config;
             $this->_config->set('php_dir', $this->statedir);
         }
 
@@ -1455,7 +1448,7 @@ function &_getPackage($package, $channel = 'pear.php.net')
             require_once 'PEAR/PackageFile.php';
         }
 
-        $pkg = &new PEAR_PackageFile($this->_config);
+        $pkg = new PEAR_PackageFile($this->_config);
         $pf = &$pkg->fromArray($info);
         return $pf;
     }
@@ -1934,12 +1927,12 @@ function updatePackage2($info)
      * @param bool whether to strictly return raw channels (no aliases)
      * @return PEAR_ChannelFile|PEAR_Error
      */
-    function &getChannel($channel, $noaliases = false)
+    function getChannel($channel, $noaliases = false)
     {
         if (PEAR::isError($e = $this->_lock(LOCK_SH))) {
             return $e;
         }
-        $ret = &$this->_getChannel($channel, $noaliases);
+        $ret = $this->_getChannel($channel, $noaliases);
         $this->_unlock();
         if (!$ret) {
             return PEAR::raiseError('Unknown channel: ' . $channel);
@@ -2392,4 +2385,4 @@ function parsedPackageNameToString($parsed, $brief = false)
         }
         return $ret;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/PEAR/PEAR/Remote.php b/lib/vendor/PEAR/PEAR/Remote.php
deleted file mode 100644
index 09ddb997a..000000000
--- a/lib/vendor/PEAR/PEAR/Remote.php
+++ /dev/null
@@ -1,498 +0,0 @@
-<?php
-/**
- * PEAR_Remote
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2008 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Remote.php,v 1.80 2008/01/03 20:26:36 cellog Exp $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**
- * needed for PEAR_Error
- */
-require_once 'PEAR.php';
-require_once 'PEAR/Config.php';
-
-/**
- * This is a class for doing remote operations against the central
- * PEAR database.
- *
- * @nodep XML_RPC_Value
- * @nodep XML_RPC_Message
- * @nodep XML_RPC_Client
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2008 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 1.7.2
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 0.1
- */
-class PEAR_Remote extends PEAR
-{
-    // {{{ properties
-
-    var $config = null;
-    var $cache  = null;
-    /**
-     * @var PEAR_Registry
-     * @access private
-     */
-    var $_registry;
-
-    // }}}
-
-    // {{{ PEAR_Remote(config_object)
-
-    function PEAR_Remote(&$config)
-    {
-        $this->PEAR();
-        $this->config = &$config;
-        $this->_registry = &$this->config->getRegistry();
-    }
-
-    // }}}
-    // {{{ setRegistry()
-    
-    function setRegistry(&$reg)
-    {
-        $this->_registry = &$reg;
-    }
-    // }}}
-    // {{{ getCache()
-
-
-    function getCache($args)
-    {
-        $id       = md5(serialize($args));
-        $cachedir = $this->config->get('cache_dir');
-        $filename = $cachedir . DIRECTORY_SEPARATOR . 'xmlrpc_cache_' . $id;
-        if (!file_exists($filename)) {
-            return null;
-        }
-
-        $fp = fopen($filename, 'rb');
-        if (!$fp) {
-            return null;
-        }
-        fclose($fp);
-        $content = file_get_contents($filename);
-        $result   = array(
-            'age'        => time() - filemtime($filename),
-            'lastChange' => filemtime($filename),
-            'content'    => unserialize($content),
-            );
-        return $result;
-    }
-
-    // }}}
-
-    // {{{ saveCache()
-
-    function saveCache($args, $data)
-    {
-        $id       = md5(serialize($args));
-        $cachedir = $this->config->get('cache_dir');
-        if (!file_exists($cachedir)) {
-            System::mkdir(array('-p', $cachedir));
-        }
-        $filename = $cachedir.'/xmlrpc_cache_'.$id;
-
-        $fp = @fopen($filename, "wb");
-        if ($fp) {
-            fwrite($fp, serialize($data));
-            fclose($fp);
-        }
-    }
-
-    // }}}
-
-    // {{{ clearCache()
-
-    function clearCache($method, $args)
-    {
-        array_unshift($args, $method);
-        array_unshift($args, $this->config->get('default_channel')); // cache by channel
-        $id       = md5(serialize($args));
-        $cachedir = $this->config->get('cache_dir');
-        $filename = $cachedir.'/xmlrpc_cache_'.$id;
-        if (file_exists($filename)) {
-            @unlink($filename);
-        }
-    }
-
-    // }}}
-    // {{{ call(method, [args...])
-
-    function call($method)
-    {
-        $_args = $args = func_get_args();
-
-        $server_channel = $this->config->get('default_channel');
-        $channel = $this->_registry->getChannel($server_channel);
-        if (!PEAR::isError($channel)) {
-            $mirror = $this->config->get('preferred_mirror');
-            if ($channel->getMirror($mirror)) {
-                if ($channel->supports('xmlrpc', $method, $mirror)) {
-                    $server_channel = $server_host = $mirror; // use the preferred mirror
-                    $server_port = $channel->getPort($mirror);
-                } elseif (!$channel->supports('xmlrpc', $method)) {
-                    return $this->raiseError("Channel $server_channel does not " .
-                        "support xml-rpc method $method");
-                }
-            }
-            if (!isset($server_host)) {
-                if (!$channel->supports('xmlrpc', $method)) {
-                    return $this->raiseError("Channel $server_channel does not support " .
-                        "xml-rpc method $method");
-                } else {
-                    $server_host = $server_channel;
-                    $server_port = $channel->getPort();
-                }
-            }
-        } else {
-            return $this->raiseError("Unknown channel '$server_channel'");
-        }
-
-        array_unshift($_args, $server_channel); // cache by channel
-        $this->cache = $this->getCache($_args);
-        $cachettl = $this->config->get('cache_ttl');
-        // If cache is newer than $cachettl seconds, we use the cache!
-        if ($this->cache !== null && $this->cache['age'] < $cachettl) {
-            return $this->cache['content'];
-        }
-        $fp = false;
-        if (extension_loaded("xmlrpc")) {
-            $result = call_user_func_array(array(&$this, 'call_epi'), $args);
-            if (!PEAR::isError($result)) {
-                $this->saveCache($_args, $result);
-            }
-            return $result;
-        } elseif (!($fp = fopen('XML/RPC.php', 'r', true))) {
-            return $this->raiseError("For this remote PEAR operation you need to load the xmlrpc extension or install XML_RPC");
-        }
-        include_once 'XML/RPC.php';
-        if ($fp) {
-            fclose($fp);
-        }
-
-        array_shift($args);
-        $username = $this->config->get('username');
-        $password = $this->config->get('password');
-        $eargs = array();
-        foreach($args as $arg) {
-            $eargs[] = $this->_encode($arg);
-        }
-        $f = new XML_RPC_Message($method, $eargs);
-        if ($this->cache !== null) {
-            $maxAge = '?maxAge='.$this->cache['lastChange'];
-        } else {
-            $maxAge = '';
-        }
-        $proxy_host = $proxy_port = $proxy_user = $proxy_pass = '';
-        if ($proxy = parse_url($this->config->get('http_proxy'))) {
-            $proxy_host = isset($proxy['host']) ? $proxy['host'] : null;
-            if (isset($proxy['scheme']) && $proxy['scheme'] == 'https') {
-                $proxy_host = 'https://' . $proxy_host;
-            }
-            $proxy_port = isset($proxy['port']) ? $proxy['port'] : 8080;
-            $proxy_user = isset($proxy['user']) ? urldecode($proxy['user']) : null;
-            $proxy_pass = isset($proxy['pass']) ? urldecode($proxy['pass']) : null;
-        }
-        $shost = $server_host;
-        if ($channel->getSSL()) {
-            $shost = "https://$shost";
-        }
-        $c = new XML_RPC_Client('/' . $channel->getPath('xmlrpc')
-            . $maxAge, $shost, $server_port, $proxy_host, $proxy_port,
-            $proxy_user, $proxy_pass);
-        if ($username && $password) {
-            $c->setCredentials($username, $password);
-        }
-        if ($this->config->get('verbose') >= 3) {
-            $c->setDebug(1);
-        }
-        $r = $c->send($f);
-        if (!$r) {
-            return $this->raiseError("XML_RPC send failed");
-        }
-        $v = $r->value();
-        if ($e = $r->faultCode()) {
-            if ($e == $GLOBALS['XML_RPC_err']['http_error'] && strstr($r->faultString(), '304 Not Modified') !== false) {
-                return $this->cache['content'];
-            }
-            return $this->raiseError($r->faultString(), $e);
-        }
-
-        $result = XML_RPC_decode($v);
-        $this->saveCache($_args, $result);
-        return $result;
-    }
-
-    // }}}
-
-    // {{{ call_epi(method, [args...])
-
-    function call_epi($method)
-    {
-        if (!extension_loaded("xmlrpc")) {
-            return $this->raiseError("xmlrpc extension is not loaded");
-        }
-        $server_channel = $this->config->get('default_channel');
-        $channel = $this->_registry->getChannel($server_channel);
-        if (!PEAR::isError($channel)) {
-            $mirror = $this->config->get('preferred_mirror');
-            if ($channel->getMirror($mirror)) {
-                if ($channel->supports('xmlrpc', $method, $mirror)) {
-                    $server_channel = $server_host = $mirror; // use the preferred mirror
-                    $server_port = $channel->getPort($mirror);
-                } elseif (!$channel->supports('xmlrpc', $method)) {
-                    return $this->raiseError("Channel $server_channel does not " .
-                        "support xml-rpc method $method");
-                }
-            }
-            if (!isset($server_host)) {
-                if (!$channel->supports('xmlrpc', $method)) {
-                    return $this->raiseError("Channel $server_channel does not support " .
-                        "xml-rpc method $method");
-                } else {
-                    $server_host = $server_channel;
-                    $server_port = $channel->getPort();
-                }
-            }
-        } else {
-            return $this->raiseError("Unknown channel '$server_channel'");
-        }
-        $params = func_get_args();
-        array_shift($params);
-        $method = str_replace("_", ".", $method);
-        $request = xmlrpc_encode_request($method, $params);
-        if ($http_proxy = $this->config->get('http_proxy')) {
-            $proxy = parse_url($http_proxy);
-            $proxy_host = $proxy_port = $proxy_user = $proxy_pass = '';
-            $proxy_host = isset($proxy['host']) ? $proxy['host'] : null;
-            if (isset($proxy['scheme']) && $proxy['scheme'] == 'https') {
-                $proxy_host = 'https://' . $proxy_host;
-            }
-            $proxy_port = isset($proxy['port']) ? $proxy['port'] : null;
-            $proxy_user = isset($proxy['user']) ? urldecode($proxy['user']) : null;
-            $proxy_pass = isset($proxy['pass']) ? urldecode($proxy['pass']) : null;
-            $fp = @fsockopen($proxy_host, $proxy_port);
-            $use_proxy = true;
-            if ($channel->getSSL()) {
-                $server_host = "https://$server_host";
-            }
-        } else {
-            $use_proxy = false;
-            $ssl = $channel->getSSL();
-            $fp = @fsockopen(($ssl ? 'ssl://' : '') . $server_host, $server_port);
-            if (!$fp) {
-                $server_host = "$ssl$server_host"; // for error-reporting
-            }
-        }
-        if (!$fp && $http_proxy) {
-            return $this->raiseError("PEAR_Remote::call: fsockopen(`$proxy_host', $proxy_port) failed");
-        } elseif (!$fp) {
-            return $this->raiseError("PEAR_Remote::call: fsockopen(`$server_host', $server_port) failed");
-        }
-        $len = strlen($request);
-        $req_headers = "Host: $server_host:$server_port\r\n" .
-             "Content-type: text/xml\r\n" .
-             "Content-length: $len\r\n";
-        $username = $this->config->get('username');
-        $password = $this->config->get('password');
-        if ($username && $password) {
-            $req_headers .= "Cookie: PEAR_USER=$username; PEAR_PW=$password\r\n";
-            $tmp = base64_encode("$username:$password");
-            $req_headers .= "Authorization: Basic $tmp\r\n";
-        }
-        if ($this->cache !== null) {
-            $maxAge = '?maxAge='.$this->cache['lastChange'];
-        } else {
-            $maxAge = '';
-        }
-
-        if ($use_proxy && $proxy_host != '' && $proxy_user != '') {
-            $req_headers .= 'Proxy-Authorization: Basic '
-                .base64_encode($proxy_user.':'.$proxy_pass)
-                ."\r\n";
-        }
-
-        if ($this->config->get('verbose') > 3) {
-            print "XMLRPC REQUEST HEADERS:\n";
-            var_dump($req_headers);
-            print "XMLRPC REQUEST BODY:\n";
-            var_dump($request);
-        }
-
-        if ($use_proxy && $proxy_host != '') {
-            $post_string = "POST http://".$server_host;
-            if ($proxy_port > '') {
-                $post_string .= ':'.$server_port;
-            }
-        } else {
-            $post_string = "POST ";
-        }
-
-        $path = '/' . $channel->getPath('xmlrpc');
-        fwrite($fp, ($post_string . $path . "$maxAge HTTP/1.0\r\n$req_headers\r\n$request"));
-        $response = '';
-        $line1 = fgets($fp, 2048);
-        if (!preg_match('!^HTTP/[0-9\.]+ (\d+) (.*)!', $line1, $matches)) {
-            return $this->raiseError("PEAR_Remote: invalid HTTP response from XML-RPC server");
-        }
-        switch ($matches[1]) {
-            case "200": // OK
-                break;
-            case "304": // Not Modified
-                return $this->cache['content'];
-            case "401": // Unauthorized
-                if ($username && $password) {
-                    return $this->raiseError("PEAR_Remote ($server_host:$server_port) " .
-                        ": authorization failed", 401);
-                } else {
-                    return $this->raiseError("PEAR_Remote ($server_host:$server_port) " .
-                        ": authorization required, please log in first", 401);
-                }
-            default:
-                return $this->raiseError("PEAR_Remote ($server_host:$server_port) : " .
-                    "unexpected HTTP response", (int)$matches[1], null, null,
-                    "$matches[1] $matches[2]");
-        }
-        while (trim(fgets($fp, 2048)) != ''); // skip rest of headers
-        while ($chunk = fread($fp, 10240)) {
-            $response .= $chunk;
-        }
-        fclose($fp);
-        if ($this->config->get('verbose') > 3) {
-            print "XMLRPC RESPONSE:\n";
-            var_dump($response);
-        }
-        $ret = xmlrpc_decode($response);
-        if (is_array($ret) && isset($ret['__PEAR_TYPE__'])) {
-            if ($ret['__PEAR_TYPE__'] == 'error') {
-                if (isset($ret['__PEAR_CLASS__'])) {
-                    $class = $ret['__PEAR_CLASS__'];
-                } else {
-                    $class = "PEAR_Error";
-                }
-                if ($ret['code']     === '') $ret['code']     = null;
-                if ($ret['message']  === '') $ret['message']  = null;
-                if ($ret['userinfo'] === '') $ret['userinfo'] = null;
-                if (strtolower($class) == 'db_error') {
-                    $ret = $this->raiseError(PEAR::errorMessage($ret['code']),
-                                             $ret['code'], null, null,
-                                             $ret['userinfo']);
-                } else {
-                    $ret = $this->raiseError($ret['message'], $ret['code'],
-                                             null, null, $ret['userinfo']);
-                }
-            }
-        } elseif (is_array($ret) && sizeof($ret) == 1 && isset($ret[0])
-                  && is_array($ret[0]) &&
-                  !empty($ret[0]['faultString']) &&
-                  !empty($ret[0]['faultCode'])) {
-            extract($ret[0]);
-            $faultString = "XML-RPC Server Fault: " .
-                 str_replace("\n", " ", $faultString);
-            return $this->raiseError($faultString, $faultCode);
-        } elseif (is_array($ret) && sizeof($ret) == 2 && !empty($ret['faultString']) &&
-              !empty($ret['faultCode'])) {
-            extract($ret);
-            $faultString = "XML-RPC Server Fault: " .
-                 str_replace("\n", " ", $faultString);
-            return $this->raiseError($faultString, $faultCode);
-        }
-        return $ret;
-    }
-
-    // }}}
-
-    // {{{ _encode
-
-    // a slightly extended version of XML_RPC_encode
-    function _encode($php_val)
-    {
-        global $XML_RPC_Boolean, $XML_RPC_Int, $XML_RPC_Double;
-        global $XML_RPC_String, $XML_RPC_Array, $XML_RPC_Struct;
-
-        $type = gettype($php_val);
-        $xmlrpcval = new XML_RPC_Value;
-
-        switch($type) {
-            case "array":
-                reset($php_val);
-                $firstkey = key($php_val);
-                end($php_val);
-                $lastkey = key($php_val);
-                reset($php_val);
-                if ($firstkey === 0 && is_int($lastkey) &&
-                    ($lastkey + 1) == count($php_val)) {
-                    $is_continuous = true;
-                    reset($php_val);
-                    $size = count($php_val);
-                    for ($expect = 0; $expect < $size; $expect++, next($php_val)) {
-                        if (key($php_val) !== $expect) {
-                            $is_continuous = false;
-                            break;
-                        }
-                    }
-                    if ($is_continuous) {
-                        reset($php_val);
-                        $arr = array();
-                        while (list($k, $v) = each($php_val)) {
-                            $arr[$k] = $this->_encode($v);
-                        }
-                        $xmlrpcval->addArray($arr);
-                        break;
-                    }
-                }
-                // fall though if not numerical and continuous
-            case "object":
-                $arr = array();
-                while (list($k, $v) = each($php_val)) {
-                    $arr[$k] = $this->_encode($v);
-                }
-                $xmlrpcval->addStruct($arr);
-                break;
-            case "integer":
-                $xmlrpcval->addScalar($php_val, $XML_RPC_Int);
-                break;
-            case "double":
-                $xmlrpcval->addScalar($php_val, $XML_RPC_Double);
-                break;
-            case "string":
-            case "NULL":
-                $xmlrpcval->addScalar($php_val, $XML_RPC_String);
-                break;
-            case "boolean":
-                $xmlrpcval->addScalar($php_val, $XML_RPC_Boolean);
-                break;
-            case "unknown type":
-            default:
-                return null;
-        }
-        return $xmlrpcval;
-    }
-
-    // }}}
-
-}
-
-?>
diff --git a/lib/vendor/PEAR/PEAR/RunTest.php b/lib/vendor/PEAR/PEAR/RunTest.php
index 9d338e850..271ef86bd 100644
--- a/lib/vendor/PEAR/PEAR/RunTest.php
+++ b/lib/vendor/PEAR/PEAR/RunTest.php
@@ -10,7 +10,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: RunTest.php 287447 2009-08-18 11:46:19Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.3.3
  */
@@ -38,7 +37,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.3.3
  */
@@ -60,7 +59,6 @@ class PEAR_RunTest
     var $ini_overwrites = array(
         'output_handler=',
         'open_basedir=',
-        'safe_mode=0',
         'disable_functions=',
         'output_buffering=Off',
         'display_errors=1',
@@ -75,7 +73,6 @@ class PEAR_RunTest
         'error_append_string=',
         'auto_prepend_file=',
         'auto_append_file=',
-        'magic_quotes_runtime=0',
         'xdebug.default_enable=0',
         'allow_url_fopen=1',
     );
@@ -84,7 +81,7 @@ class PEAR_RunTest
      * An object that supports the PEAR_Common->log() signature, or null
      * @param PEAR_Common|null
      */
-    function PEAR_RunTest($logger = null, $options = array())
+    function __construct($logger = null, $options = array())
     {
         if (!defined('E_DEPRECATED')) {
             define('E_DEPRECATED', 0);
@@ -115,19 +112,11 @@ function PEAR_RunTest($logger = null, $options = array())
     function system_with_timeout($commandline, $env = null, $stdin = null)
     {
         $data = '';
-        if (version_compare(phpversion(), '5.0.0', '<')) {
-            $proc = proc_open($commandline, array(
-                0 => array('pipe', 'r'),
-                1 => array('pipe', 'w'),
-                2 => array('pipe', 'w')
-                ), $pipes);
-        } else {
-            $proc = proc_open($commandline, array(
-                0 => array('pipe', 'r'),
-                1 => array('pipe', 'w'),
-                2 => array('pipe', 'w')
-                ), $pipes, null, $env, array('suppress_errors' => true));
-        }
+        $proc = proc_open($commandline, array(
+            0 => array('pipe', 'r'),
+            1 => array('pipe', 'w'),
+            2 => array('pipe', 'w')
+        ), $pipes, null, $env, array('suppress_errors' => true));
 
         if (!$proc) {
             return false;
@@ -231,12 +220,7 @@ function settings2params($ini_settings)
     function _preparePhpBin($php, $file, $ini_settings)
     {
         $file = escapeshellarg($file);
-        // This was fixed in php 5.3 and is not needed after that
-        if (OS_WINDOWS && version_compare(PHP_VERSION, '5.3', '<')) {
-            $cmd = '"'.escapeshellarg($php).' '.$ini_settings.' -f ' . $file .'"';
-        } else {
-            $cmd = $php . $ini_settings . ' -f ' . $file;
-        }
+        $cmd = $php . $ini_settings . ' -f ' . $file;
 
         return $cmd;
     }
@@ -275,14 +259,12 @@ function runPHPUnit($file, $ini_settings = '')
      */
     function run($file, $ini_settings = array(), $test_number = 1)
     {
-        if (isset($this->_savephp)) {
-            $this->_php = $this->_savephp;
-            unset($this->_savephp);
-        }
+        $this->_restorePHPBinary();
+
         if (empty($this->_options['cgi'])) {
             // try to see if php-cgi is in the path
             $res = $this->system_with_timeout('php-cgi -v');
-            if (false !== $res && !(is_array($res) && $res === array(127, ''))) {
+            if (false !== $res && !(is_array($res) && in_array($res[0], array(-1, 127)))) {
                 $this->_options['cgi'] = 'php-cgi';
             }
         }
@@ -340,7 +322,7 @@ function run($file, $ini_settings = array(), $test_number = 1)
                 }
                 return 'SKIPPED';
             }
-            $this->_savephp = $this->_php;
+            $this->_savePHPBinary();
             $this->_php = $this->_options['cgi'];
         }
 
@@ -370,9 +352,8 @@ function run($file, $ini_settings = array(), $test_number = 1)
         // We've satisfied the preconditions - run the test!
         if (isset($this->_options['coverage']) && $this->xdebug_loaded) {
             $xdebug_file = $temp_dir . DIRECTORY_SEPARATOR . $main_file_name . 'xdebug';
-            $text = '<?php';
-            $text .= "\n" . 'function coverage_shutdown() {' .
-                     "\n" . '    $xdebug = var_export(xdebug_get_code_coverage(), true);';
+            $text = "\n" . 'function coverage_shutdown() {' .
+                    "\n" . '    $xdebug = var_export(xdebug_get_code_coverage(), true);';
             if (!function_exists('file_put_contents')) {
                 $text .= "\n" . '    $fh = fopen(\'' . $xdebug_file . '\', "wb");' .
                         "\n" . '    if ($fh !== false) {' .
@@ -383,19 +364,37 @@ function run($file, $ini_settings = array(), $test_number = 1)
                 $text .= "\n" . '    file_put_contents(\'' . $xdebug_file . '\', $xdebug);';
             }
 
-            $text .= "\n" . 'xdebug_stop_code_coverage();' .
-                "\n" . '} // end coverage_shutdown()' .
-                "\n" . 'register_shutdown_function("coverage_shutdown");';
-            $text .= "\n" . 'xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);' . "\n?>";
+            // Workaround for http://pear.php.net/bugs/bug.php?id=17292
+            $lines             = explode("\n", $section_text['FILE']);
+            $numLines          = count($lines);
+            $namespace         = '';
+            $coverage_shutdown = 'coverage_shutdown';
+
+            if (
+                substr($lines[0], 0, 2) == '<?' ||
+                substr($lines[0], 0, 5) == '<?php'
+            ) {
+                unset($lines[0]);
+            }
+
+
+            for ($i = 0; $i < $numLines; $i++) {
+                if (isset($lines[$i]) && substr($lines[$i], 0, 9) == 'namespace') {
+                    $namespace         = substr($lines[$i], 10, -1);
+                    $coverage_shutdown = $namespace . '\\coverage_shutdown';
+                    $namespace         = "namespace " . $namespace . ";\n";
 
-            $len_f = 5;
-            if (substr($section_text['FILE'], 0, 5) != '<?php'
-                && substr($section_text['FILE'], 0, 2) == '<?') {
-                $len_f = 2;
+                    unset($lines[$i]);
+                    break;
+                }
             }
-            $text .= $section_text['FILE'];
 
-            $this->save_text($temp_file, $text);
+            $text .= "\n    xdebug_stop_code_coverage();" .
+                "\n" . '} // end coverage_shutdown()' .
+                "\n\n" . 'register_shutdown_function("' . $coverage_shutdown . '");';
+            $text .= "\n" . 'xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);' . "\n";
+
+            $this->save_text($temp_file, "<?php\n" . $namespace . $text  . "\n" . implode("\n", $lines));
         } else {
             $this->save_text($temp_file, $section_text['FILE']);
         }
@@ -477,8 +476,6 @@ function run($file, $ini_settings = array(), $test_number = 1)
         }
         chdir($cwd); // in case the test moves us around
 
-        $this->_testCleanup($section_text, $temp_clean);
-
         /* when using CGI, strip the headers from the output */
         $output = $this->_stripHeadersCGI($output);
 
@@ -499,6 +496,9 @@ function run($file, $ini_settings = array(), $test_number = 1)
                 $output .= "\n====EXPECTHEADERS FAILURE====:\n$changed";
             }
         }
+
+        $this->_testCleanup($section_text, $temp_clean);
+
         // Does the output match what is expected?
         do {
             if (isset($section_text['EXPECTF']) || isset($section_text['EXPECTREGEX'])) {
@@ -622,6 +622,11 @@ function run($file, $ini_settings = array(), $test_number = 1)
         $expectf = isset($section_text['EXPECTF']) ? $wanted_re : null;
         $data = $this->generate_diff($wanted, $output, $returns, $expectf);
         $res  = $this->_writeLog($diff_filename, $data);
+        if (isset($this->_options['showdiff'])) {
+            $this->_logger->log(0, "========DIFF========");
+            $this->_logger->log(0, $data);
+            $this->_logger->log(0, "========DONE========");
+        }
         if (PEAR::isError($res)) {
             return $res;
         }
@@ -937,6 +942,8 @@ function _processUpload($section_text, $file)
     function _testCleanup($section_text, $temp_clean)
     {
         if ($section_text['CLEAN']) {
+            $this->_restorePHPBinary();
+
             // perform test cleanup
             $this->save_text($temp_clean, $section_text['CLEAN']);
             $output = $this->system_with_timeout("$this->_php $temp_clean  2>&1");
@@ -948,4 +955,18 @@ function _testCleanup($section_text, $temp_clean)
             }
         }
     }
-}
\ No newline at end of file
+
+    function _savePHPBinary()
+    {
+        $this->_savephp = $this->_php;
+    }
+
+    function _restorePHPBinary()
+    {
+        if (isset($this->_savephp))
+        {
+            $this->_php = $this->_savephp;
+            unset($this->_savephp);
+        }
+    }
+}
diff --git a/lib/vendor/PEAR/PEAR/Task/Common.php b/lib/vendor/PEAR/PEAR/Task/Common.php
index e725355e9..e433c3e26 100644
--- a/lib/vendor/PEAR/PEAR/Task/Common.php
+++ b/lib/vendor/PEAR/PEAR/Task/Common.php
@@ -4,14 +4,13 @@
  *
  * PHP versions 4 and 5
  *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Common.php 276394 2009-02-25 00:15:49Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
+ * @category  pear
+ * @package   PEAR
+ * @author    Greg Beaver <cellog@php.net>
+ * @copyright 1997-2009 The Authors
+ * @license   http://opensource.org/licenses/bsd-license.php New BSD License
+ * @link      http://pear.php.net/package/PEAR
+ * @since     File available since Release 1.4.0a1
  */
 /**#@+
  * Error codes for task validation routines
@@ -42,14 +41,15 @@
  * This will first replace any instance of @data-dir@ in the test.php file
  * with the path to the current data directory.  Then, it will include the
  * test.php file and run the script it contains to configure the package post-installation.
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
+ *
+ * @category  pear
+ * @package   PEAR
+ * @author    Greg Beaver <cellog@php.net>
+ * @copyright 1997-2009 The Authors
+ * @license   http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version   Release: 1.10.3
+ * @link      http://pear.php.net/package/PEAR
+ * @since     Class available since Release 1.4.0a1
  * @abstract
  */
 class PEAR_Task_Common
@@ -62,34 +62,35 @@ class PEAR_Task_Common
      *   changes directly to disk
      *
      * Child task classes must override this property.
+     *
      * @access protected
      */
-    var $type = 'simple';
+    protected $type = 'simple';
     /**
      * Determines which install phase this task is executed under
      */
-    var $phase = PEAR_TASK_INSTALL;
+    public $phase = PEAR_TASK_INSTALL;
     /**
      * @access protected
      */
-    var $config;
+    protected $config;
     /**
      * @access protected
      */
-    var $registry;
+    protected $registry;
     /**
      * @access protected
      */
-    var $logger;
+    public $logger;
     /**
      * @access protected
      */
-    var $installphase;
+    protected $installphase;
     /**
      * @param PEAR_Config
      * @param PEAR_Common
      */
-    function PEAR_Task_Common(&$config, &$logger, $phase)
+    function __construct(&$config, &$logger, $phase)
     {
         $this->config = &$config;
         $this->registry = &$config->getRegistry();
@@ -102,101 +103,105 @@ function PEAR_Task_Common(&$config, &$logger, $phase)
 
     /**
      * Validate the basic contents of a task tag.
+     *
      * @param PEAR_PackageFile_v2
      * @param array
      * @param PEAR_Config
      * @param array the entire parsed <file> tag
+     *
      * @return true|array On error, return an array in format:
-     *    array(PEAR_TASK_ERROR_???[, param1][, param2][, ...])
+     *                    array(PEAR_TASK_ERROR_???[, param1][, param2][, ...])
+     *
+     * For PEAR_TASK_ERROR_MISSING_ATTRIB, pass the attribute name in
+     * For PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE, pass the attribute name and
+     * an array of legal values in
      *
-     *    For PEAR_TASK_ERROR_MISSING_ATTRIB, pass the attribute name in
-     *    For PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE, pass the attribute name and an array
-     *    of legal values in
-     * @static
      * @abstract
      */
-    function validateXml($pkg, $xml, $config, $fileXml)
+    public static function validateXml($pkg, $xml, $config, $fileXml)
     {
     }
 
     /**
      * Initialize a task instance with the parameters
-     * @param array raw, parsed xml
-     * @param array attributes from the <file> tag containing this task
-     * @param string|null last installed version of this package
+     *
+     * @param    array raw, parsed xml
+     * @param    array attributes from the <file> tag containing this task
+     * @param    string|null last installed version of this package
      * @abstract
      */
-    function init($xml, $fileAttributes, $lastVersion)
+    public function init($xml, $fileAttributes, $lastVersion)
     {
     }
 
     /**
-     * Begin a task processing session.  All multiple tasks will be processed after each file
-     * has been successfully installed, all simple tasks should perform their task here and
-     * return any errors using the custom throwError() method to allow forward compatibility
+     * Begin a task processing session.  All multiple tasks will be processed
+     * after each file has been successfully installed, all simple tasks should
+     * perform their task here and return any errors using the custom
+     * throwError() method to allow forward compatibility
      *
      * This method MUST NOT write out any changes to disk
-     * @param PEAR_PackageFile_v2
-     * @param string file contents
-     * @param string the eventual final file location (informational only)
-     * @return string|false|PEAR_Error false to skip this file, PEAR_Error to fail
-     *         (use $this->throwError), otherwise return the new contents
+     *
+     * @param    PEAR_PackageFile_v2
+     * @param    string file contents
+     * @param    string the eventual final file location (informational only)
+     * @return   string|false|PEAR_Error false to skip this file, PEAR_Error to fail
+     *           (use $this->throwError), otherwise return the new contents
      * @abstract
      */
-    function startSession($pkg, $contents, $dest)
+    public function startSession($pkg, $contents, $dest)
     {
     }
 
     /**
-     * This method is used to process each of the tasks for a particular multiple class
-     * type.  Simple tasks need not implement this method.
-     * @param array an array of tasks
-     * @access protected
-     * @static
-     * @abstract
+     * This method is used to process each of the tasks for a particular
+     * multiple class type.  Simple tasks need not implement this method.
+     *
+     * @param    array an array of tasks
+     * @access   protected
      */
-    function run($tasks)
+    public static function run($tasks)
     {
     }
 
     /**
-     * @static
      * @final
      */
-    function hasPostinstallTasks()
+    public static function hasPostinstallTasks()
     {
         return isset($GLOBALS['_PEAR_TASK_POSTINSTANCES']);
     }
 
-    /**
-     * @static
-     * @final
-     */
-     function runPostinstallTasks()
-     {
-         foreach ($GLOBALS['_PEAR_TASK_POSTINSTANCES'] as $class => $tasks) {
-             $err = call_user_func(array($class, 'run'),
-                  $GLOBALS['_PEAR_TASK_POSTINSTANCES'][$class]);
-             if ($err) {
-                 return PEAR_Task_Common::throwError($err);
-             }
-         }
-         unset($GLOBALS['_PEAR_TASK_POSTINSTANCES']);
+     /**
+      * @final
+      */
+    public static function runPostinstallTasks()
+    {
+        foreach ($GLOBALS['_PEAR_TASK_POSTINSTANCES'] as $class => $tasks) {
+            $err = call_user_func(
+                array($class, 'run'),
+                $GLOBALS['_PEAR_TASK_POSTINSTANCES'][$class]
+            );
+            if ($err) {
+                return PEAR_Task_Common::throwError($err);
+            }
+        }
+        unset($GLOBALS['_PEAR_TASK_POSTINSTANCES']);
     }
 
     /**
      * Determines whether a role is a script
      * @return bool
      */
-    function isScript()
+    public function isScript()
     {
-        return $this->type == 'script';
+            return $this->type == 'script';
     }
 
-    function throwError($msg, $code = -1)
+    public function throwError($msg, $code = -1)
     {
         include_once 'PEAR.php';
+
         return PEAR::raiseError($msg, $code);
     }
 }
-?>
\ No newline at end of file
diff --git a/lib/vendor/PEAR/PEAR/Task/Postinstallscript.php b/lib/vendor/PEAR/PEAR/Task/Postinstallscript.php
index cc9042469..457ac28f6 100644
--- a/lib/vendor/PEAR/PEAR/Task/Postinstallscript.php
+++ b/lib/vendor/PEAR/PEAR/Task/Postinstallscript.php
@@ -4,14 +4,13 @@
  *
  * PHP versions 4 and 5
  *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Postinstallscript.php 276385 2009-02-24 23:46:03Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
+ * @category  pear
+ * @package   PEAR
+ * @author    Greg Beaver <cellog@php.net>
+ * @copyright 1997-2009 The Authors
+ * @license   http://opensource.org/licenses/bsd-license.php New BSD License
+ * @link      http://pear.php.net/package/PEAR
+ * @since     File available since Release 1.4.0a1
  */
 /**
  * Base class
@@ -22,85 +21,95 @@
  *
  * Note that post-install scripts are handled separately from installation, by the
  * "pear run-scripts" command
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
+ *
+ * @category  pear
+ * @package   PEAR
+ * @author    Greg Beaver <cellog@php.net>
+ * @copyright 1997-2009 The Authors
+ * @license   http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version   Release: 1.10.3
+ * @link      http://pear.php.net/package/PEAR
+ * @since     Class available since Release 1.4.0a1
  */
 class PEAR_Task_Postinstallscript extends PEAR_Task_Common
 {
-    var $type = 'script';
-    var $_class;
-    var $_params;
-    var $_obj;
+    public $type = 'script';
+    public $_class;
+    public $_params;
+    public $_obj;
     /**
      *
      * @var PEAR_PackageFile_v2
      */
-    var $_pkg;
-    var $_contents;
-    var $phase = PEAR_TASK_INSTALL;
+    public $_pkg;
+    public $_contents;
+    public $phase = PEAR_TASK_INSTALL;
 
     /**
      * Validate the raw xml at parsing-time.
      *
      * This also attempts to validate the script to make sure it meets the criteria
      * for a post-install script
-     * @param PEAR_PackageFile_v2
-     * @param array The XML contents of the <postinstallscript> tag
-     * @param PEAR_Config
-     * @param array the entire parsed <file> tag
-     * @static
+     *
+     * @param  PEAR_PackageFile_v2
+     * @param  array The XML contents of the <postinstallscript> tag
+     * @param  PEAR_Config
+     * @param  array the entire parsed <file> tag
      */
-    function validateXml($pkg, $xml, $config, $fileXml)
+    public static function validateXml($pkg, $xml, $config, $fileXml)
     {
         if ($fileXml['role'] != 'php') {
-            return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-            $fileXml['name'] . '" must be role="php"');
+            return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+            $fileXml['name'].'" must be role="php"', );
         }
         PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
         $file = $pkg->getFileContents($fileXml['name']);
         if (PEAR::isError($file)) {
             PEAR::popErrorHandling();
-            return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                $fileXml['name'] . '" is not valid: ' .
-                $file->getMessage());
+
+            return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+                $fileXml['name'].'" is not valid: '.
+                $file->getMessage(), );
         } elseif ($file === null) {
-            return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                $fileXml['name'] . '" could not be retrieved for processing!');
+            return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+                $fileXml['name'].'" could not be retrieved for processing!', );
         } else {
             $analysis = $pkg->analyzeSourceCode($file, true);
             if (!$analysis) {
                 PEAR::popErrorHandling();
                 $warnings = '';
                 foreach ($pkg->getValidationWarnings() as $warn) {
-                    $warnings .= $warn['message'] . "\n";
+                    $warnings .= $warn['message']."\n";
                 }
-                return array(PEAR_TASK_ERROR_INVALID, 'Analysis of post-install script "' .
-                    $fileXml['name'] . '" failed: ' . $warnings);
+
+                return array(PEAR_TASK_ERROR_INVALID, 'Analysis of post-install script "'.
+                    $fileXml['name'].'" failed: '.$warnings, );
             }
             if (count($analysis['declared_classes']) != 1) {
                 PEAR::popErrorHandling();
-                return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                    $fileXml['name'] . '" must declare exactly 1 class');
+
+                return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+                    $fileXml['name'].'" must declare exactly 1 class', );
             }
             $class = $analysis['declared_classes'][0];
-            if ($class != str_replace(array('/', '.php'), array('_', ''),
-                  $fileXml['name']) . '_postinstall') {
+            if ($class != str_replace(
+                array('/', '.php'), array('_', ''),
+                $fileXml['name']
+            ).'_postinstall') {
                 PEAR::popErrorHandling();
-                return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                    $fileXml['name'] . '" class "' . $class . '" must be named "' .
-                    str_replace(array('/', '.php'), array('_', ''),
-                    $fileXml['name']) . '_postinstall"');
+
+                return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+                    $fileXml['name'].'" class "'.$class.'" must be named "'.
+                    str_replace(
+                        array('/', '.php'), array('_', ''),
+                        $fileXml['name']
+                    ).'_postinstall"', );
             }
             if (!isset($analysis['declared_methods'][$class])) {
                 PEAR::popErrorHandling();
-                return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                    $fileXml['name'] . '" must declare methods init() and run()');
+
+                return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+                    $fileXml['name'].'" must declare methods init() and run()', );
             }
             $methods = array('init' => 0, 'run' => 1);
             foreach ($analysis['declared_methods'][$class] as $method) {
@@ -110,129 +119,137 @@ function validateXml($pkg, $xml, $config, $fileXml)
             }
             if (count($methods)) {
                 PEAR::popErrorHandling();
-                return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                    $fileXml['name'] . '" must declare methods init() and run()');
+
+                return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+                    $fileXml['name'].'" must declare methods init() and run()', );
             }
         }
         PEAR::popErrorHandling();
         $definedparams = array();
-        $tasksNamespace = $pkg->getTasksNs() . ':';
-        if (!isset($xml[$tasksNamespace . 'paramgroup']) && isset($xml['paramgroup'])) {
+        $tasksNamespace = $pkg->getTasksNs().':';
+        if (!isset($xml[$tasksNamespace.'paramgroup']) && isset($xml['paramgroup'])) {
             // in order to support the older betas, which did not expect internal tags
             // to also use the namespace
             $tasksNamespace = '';
         }
-        if (isset($xml[$tasksNamespace . 'paramgroup'])) {
-            $params = $xml[$tasksNamespace . 'paramgroup'];
+        if (isset($xml[$tasksNamespace.'paramgroup'])) {
+            $params = $xml[$tasksNamespace.'paramgroup'];
             if (!is_array($params) || !isset($params[0])) {
                 $params = array($params);
             }
             foreach ($params as $param) {
-                if (!isset($param[$tasksNamespace . 'id'])) {
-                    return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                        $fileXml['name'] . '" <paramgroup> must have ' .
-                        'an ' . $tasksNamespace . 'id> tag');
+                if (!isset($param[$tasksNamespace.'id'])) {
+                    return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+                        $fileXml['name'].'" <paramgroup> must have '.
+                        'an '.$tasksNamespace.'id> tag', );
                 }
-                if (isset($param[$tasksNamespace . 'name'])) {
-                    if (!in_array($param[$tasksNamespace . 'name'], $definedparams)) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" ' . $tasksNamespace .
-                            'paramgroup> id "' . $param[$tasksNamespace . 'id'] .
-                            '" parameter "' . $param[$tasksNamespace . 'name'] .
-                            '" has not been previously defined');
+                if (isset($param[$tasksNamespace.'name'])) {
+                    if (!in_array($param[$tasksNamespace.'name'], $definedparams)) {
+                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+                            $fileXml['name'].'" '.$tasksNamespace.
+                            'paramgroup> id "'.$param[$tasksNamespace.'id'].
+                            '" parameter "'.$param[$tasksNamespace.'name'].
+                            '" has not been previously defined', );
                     }
-                    if (!isset($param[$tasksNamespace . 'conditiontype'])) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" ' . $tasksNamespace .
-                            'paramgroup> id "' . $param[$tasksNamespace . 'id'] .
-                            '" must have a ' . $tasksNamespace .
-                            'conditiontype> tag containing either "=", ' .
-                            '"!=", or "preg_match"');
+                    if (!isset($param[$tasksNamespace.'conditiontype'])) {
+                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+                            $fileXml['name'].'" '.$tasksNamespace.
+                            'paramgroup> id "'.$param[$tasksNamespace.'id'].
+                            '" must have a '.$tasksNamespace.
+                            'conditiontype> tag containing either "=", '.
+                            '"!=", or "preg_match"', );
                     }
-                    if (!in_array($param[$tasksNamespace . 'conditiontype'],
-                          array('=', '!=', 'preg_match'))) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" ' . $tasksNamespace .
-                            'paramgroup> id "' . $param[$tasksNamespace . 'id'] .
-                            '" must have a ' . $tasksNamespace .
-                            'conditiontype> tag containing either "=", ' .
-                            '"!=", or "preg_match"');
+                    if (!in_array(
+                        $param[$tasksNamespace.'conditiontype'],
+                        array('=', '!=', 'preg_match')
+                    )) {
+                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+                            $fileXml['name'].'" '.$tasksNamespace.
+                            'paramgroup> id "'.$param[$tasksNamespace.'id'].
+                            '" must have a '.$tasksNamespace.
+                            'conditiontype> tag containing either "=", '.
+                            '"!=", or "preg_match"', );
                     }
-                    if (!isset($param[$tasksNamespace . 'value'])) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" ' . $tasksNamespace .
-                            'paramgroup> id "' . $param[$tasksNamespace . 'id'] .
-                            '" must have a ' . $tasksNamespace .
-                            'value> tag containing expected parameter value');
+                    if (!isset($param[$tasksNamespace.'value'])) {
+                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+                            $fileXml['name'].'" '.$tasksNamespace.
+                            'paramgroup> id "'.$param[$tasksNamespace.'id'].
+                            '" must have a '.$tasksNamespace.
+                            'value> tag containing expected parameter value', );
                     }
                 }
-                if (isset($param[$tasksNamespace . 'instructions'])) {
-                    if (!is_string($param[$tasksNamespace . 'instructions'])) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" ' . $tasksNamespace .
-                            'paramgroup> id "' . $param[$tasksNamespace . 'id'] .
-                            '" ' . $tasksNamespace . 'instructions> must be simple text');
+                if (isset($param[$tasksNamespace.'instructions'])) {
+                    if (!is_string($param[$tasksNamespace.'instructions'])) {
+                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+                            $fileXml['name'].'" '.$tasksNamespace.
+                            'paramgroup> id "'.$param[$tasksNamespace.'id'].
+                            '" '.$tasksNamespace.'instructions> must be simple text', );
                     }
                 }
-                if (!isset($param[$tasksNamespace . 'param'])) {
+                if (!isset($param[$tasksNamespace.'param'])) {
                     continue; // <param> is no longer required
                 }
-                $subparams = $param[$tasksNamespace . 'param'];
+                $subparams = $param[$tasksNamespace.'param'];
                 if (!is_array($subparams) || !isset($subparams[0])) {
                     $subparams = array($subparams);
                 }
                 foreach ($subparams as $subparam) {
-                    if (!isset($subparam[$tasksNamespace . 'name'])) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" parameter for ' .
-                            $tasksNamespace . 'paramgroup> id "' .
-                            $param[$tasksNamespace . 'id'] . '" must have ' .
-                            'a ' . $tasksNamespace . 'name> tag');
+                    if (!isset($subparam[$tasksNamespace.'name'])) {
+                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+                            $fileXml['name'].'" parameter for '.
+                            $tasksNamespace.'paramgroup> id "'.
+                            $param[$tasksNamespace.'id'].'" must have '.
+                            'a '.$tasksNamespace.'name> tag', );
                     }
-                    if (!preg_match('/[a-zA-Z0-9]+/',
-                          $subparam[$tasksNamespace . 'name'])) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" parameter "' .
-                            $subparam[$tasksNamespace . 'name'] .
-                            '" for ' . $tasksNamespace . 'paramgroup> id "' .
-                            $param[$tasksNamespace . 'id'] .
-                            '" is not a valid name.  Must contain only alphanumeric characters');
+                    if (!preg_match(
+                        '/[a-zA-Z0-9]+/',
+                        $subparam[$tasksNamespace.'name']
+                    )) {
+                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+                            $fileXml['name'].'" parameter "'.
+                            $subparam[$tasksNamespace.'name'].
+                            '" for '.$tasksNamespace.'paramgroup> id "'.
+                            $param[$tasksNamespace.'id'].
+                            '" is not a valid name.  Must contain only alphanumeric characters', );
                     }
-                    if (!isset($subparam[$tasksNamespace . 'prompt'])) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" parameter "' .
-                            $subparam[$tasksNamespace . 'name'] .
-                            '" for ' . $tasksNamespace . 'paramgroup> id "' .
-                            $param[$tasksNamespace . 'id'] .
-                            '" must have a ' . $tasksNamespace . 'prompt> tag');
+                    if (!isset($subparam[$tasksNamespace.'prompt'])) {
+                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+                            $fileXml['name'].'" parameter "'.
+                            $subparam[$tasksNamespace.'name'].
+                            '" for '.$tasksNamespace.'paramgroup> id "'.
+                            $param[$tasksNamespace.'id'].
+                            '" must have a '.$tasksNamespace.'prompt> tag', );
                     }
-                    if (!isset($subparam[$tasksNamespace . 'type'])) {
-                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "' .
-                            $fileXml['name'] . '" parameter "' .
-                            $subparam[$tasksNamespace . 'name'] .
-                            '" for ' . $tasksNamespace . 'paramgroup> id "' .
-                            $param[$tasksNamespace . 'id'] .
-                            '" must have a ' . $tasksNamespace . 'type> tag');
+                    if (!isset($subparam[$tasksNamespace.'type'])) {
+                        return array(PEAR_TASK_ERROR_INVALID, 'Post-install script "'.
+                            $fileXml['name'].'" parameter "'.
+                            $subparam[$tasksNamespace.'name'].
+                            '" for '.$tasksNamespace.'paramgroup> id "'.
+                            $param[$tasksNamespace.'id'].
+                            '" must have a '.$tasksNamespace.'type> tag', );
                     }
-                    $definedparams[] = $param[$tasksNamespace . 'id'] . '::' .
-                    $subparam[$tasksNamespace . 'name'];
+                    $definedparams[] = $param[$tasksNamespace.'id'].'::'.
+                    $subparam[$tasksNamespace.'name'];
                 }
             }
         }
+
         return true;
     }
 
     /**
      * Initialize a task instance with the parameters
-     * @param array raw, parsed xml
-     * @param array attributes from the <file> tag containing this task
-     * @param string|null last installed version of this package, if any (useful for upgrades)
+     * @param array       $xml         raw, parsed xml
+     * @param array       $fileattribs attributes from the <file> tag containing
+     *                                 this task
+     * @param string|null $lastversion last installed version of this package,
+     *                                 if any (useful for upgrades)
      */
-    function init($xml, $fileattribs, $lastversion)
+    public function init($xml, $fileattribs, $lastversion)
     {
         $this->_class = str_replace('/', '_', $fileattribs['name']);
         $this->_filename = $fileattribs['name'];
-        $this->_class = str_replace ('.php', '', $this->_class) . '_postinstall';
+        $this->_class = str_replace('.php', '', $this->_class).'_postinstall';
         $this->_params = $xml;
         $this->_lastversion = $lastversion;
     }
@@ -242,7 +259,7 @@ function init($xml, $fileattribs, $lastversion)
      *
      * @access private
      */
-    function _stripNamespace($params = null)
+    public function _stripNamespace($params = null)
     {
         if ($params === null) {
             $params = array();
@@ -253,7 +270,7 @@ function _stripNamespace($params = null)
                 if (is_array($param)) {
                     $param = $this->_stripNamespace($param);
                 }
-                $params[str_replace($this->_pkg->getTasksNs() . ':', '', $i)] = $param;
+                $params[str_replace($this->_pkg->getTasksNs().':', '', $i)] = $param;
             }
             $this->_params = $params;
         } else {
@@ -262,21 +279,25 @@ function _stripNamespace($params = null)
                 if (is_array($param)) {
                     $param = $this->_stripNamespace($param);
                 }
-                $newparams[str_replace($this->_pkg->getTasksNs() . ':', '', $i)] = $param;
+                $newparams[str_replace($this->_pkg->getTasksNs().':', '', $i)] = $param;
             }
+
             return $newparams;
         }
     }
 
     /**
-     * Unlike other tasks, the installed file name is passed in instead of the file contents,
-     * because this task is handled post-installation
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @param string file name
+     * Unlike other tasks, the installed file name is passed in instead of the
+     * file contents, because this task is handled post-installation
+     *
+     * @param mixed  $pkg      PEAR_PackageFile_v1|PEAR_PackageFile_v2
+     * @param string $contents file name
+     * @param string $dest     the eventual final file location (informational only)
+     *
      * @return bool|PEAR_Error false to skip this file, PEAR_Error to fail
-     *         (use $this->throwError)
+     *                         (use $this->throwError)
      */
-    function startSession($pkg, $contents)
+    public function startSession($pkg, $contents, $dest)
     {
         if ($this->installphase != PEAR_TASK_INSTALL) {
             return false;
@@ -284,40 +305,46 @@ function startSession($pkg, $contents)
         // remove the tasks: namespace if present
         $this->_pkg = $pkg;
         $this->_stripNamespace();
-        $this->logger->log(0, 'Including external post-installation script "' .
-            $contents . '" - any errors are in this script');
+        $this->logger->log(
+            0, 'Including external post-installation script "'.
+            $contents.'" - any errors are in this script'
+        );
         include_once $contents;
         if (class_exists($this->_class)) {
             $this->logger->log(0, 'Inclusion succeeded');
         } else {
-            return $this->throwError('init of post-install script class "' . $this->_class
-                . '" failed');
+            return $this->throwError(
+                'init of post-install script class "'.$this->_class
+                .'" failed'
+            );
         }
-        $this->_obj = new $this->_class;
-        $this->logger->log(1, 'running post-install script "' . $this->_class . '->init()"');
+        $this->_obj = new $this->_class();
+        $this->logger->log(1, 'running post-install script "'.$this->_class.'->init()"');
         PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
         $res = $this->_obj->init($this->config, $pkg, $this->_lastversion);
         PEAR::popErrorHandling();
         if ($res) {
             $this->logger->log(0, 'init succeeded');
         } else {
-            return $this->throwError('init of post-install script "' . $this->_class .
-                '->init()" failed');
+            return $this->throwError(
+                'init of post-install script "'.$this->_class.
+                '->init()" failed'
+            );
         }
         $this->_contents = $contents;
+
         return true;
     }
 
     /**
      * No longer used
-     * @see PEAR_PackageFile_v2::runPostinstallScripts()
-     * @param array an array of tasks
-     * @param string install or upgrade
+     *
+     * @see    PEAR_PackageFile_v2::runPostinstallScripts()
+     * @param  array an array of tasks
+     * @param  string install or upgrade
      * @access protected
-     * @static
      */
-    function run()
+    public static function run($tasks)
     {
     }
 }
-?>
\ No newline at end of file
diff --git a/lib/vendor/PEAR/PEAR/Task/Postinstallscript/rw.php b/lib/vendor/PEAR/PEAR/Task/Postinstallscript/rw.php
index a89e75992..10f5e7b26 100644
--- a/lib/vendor/PEAR/PEAR/Task/Postinstallscript/rw.php
+++ b/lib/vendor/PEAR/PEAR/Task/Postinstallscript/rw.php
@@ -4,14 +4,13 @@
  *
  * PHP versions 4 and 5
  *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: rw.php 276385 2009-02-24 23:46:03Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a10
+ * @category  pear
+ * @package   PEAR
+ * @author    Greg Beaver <cellog@php.net>
+ * @copyright 1997-2009 The Authors
+ * @license   http://opensource.org/licenses/bsd-license.php New BSD License
+ * @link      http://pear.php.net/package/PEAR
+ * @since     File available since Release 1.4.0a10
  */
 /**
  * Base class
@@ -24,7 +23,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a10
  */
@@ -35,30 +34,31 @@ class PEAR_Task_Postinstallscript_rw extends PEAR_Task_Postinstallscript
      *
      * @var PEAR_PackageFile_v2_rw
      */
-    var $_pkg;
+    public $_pkg;
     /**
      * Enter description here...
      *
-     * @param PEAR_PackageFile_v2_rw $pkg
-     * @param PEAR_Config $config
-     * @param PEAR_Frontend $logger
-     * @param array $fileXml
+     * @param PEAR_PackageFile_v2_rw $pkg     Package
+     * @param PEAR_Config            $config  Config
+     * @param PEAR_Frontend          $logger  Logger
+     * @param array                  $fileXml XML
+     *
      * @return PEAR_Task_Postinstallscript_rw
      */
-    function PEAR_Task_Postinstallscript_rw(&$pkg, &$config, &$logger, $fileXml)
+    function __construct(&$pkg, &$config, &$logger, $fileXml)
     {
-        parent::PEAR_Task_Common($config, $logger, PEAR_TASK_PACKAGE);
+        parent::__construct($config, $logger, PEAR_TASK_PACKAGE);
         $this->_contents = $fileXml;
         $this->_pkg = &$pkg;
         $this->_params = array();
     }
 
-    function validate()
+    public function validate()
     {
         return $this->validateXml($this->_pkg, $this->_params, $this->config, $this->_contents);
     }
 
-    function getName()
+    public function getName()
     {
         return 'postinstallscript';
     }
@@ -73,30 +73,31 @@ function getName()
      *
      * Use {@link addConditionTypeGroup()} to add a <paramgroup> containing
      * a <conditiontype> tag
-     * @param string $id <paramgroup> id as seen by the script
-     * @param array|false $params array of getParam() calls, or false for no params
+     *
+     * @param string       $id           <paramgroup> id as seen by the script
+     * @param array|false  $params       array of getParam() calls, or false for no params
      * @param string|false $instructions
      */
-    function addParamGroup($id, $params = false, $instructions = false)
+    public function addParamGroup($id, $params = false, $instructions = false)
     {
         if ($params && isset($params[0]) && !isset($params[1])) {
             $params = $params[0];
         }
         $stuff =
             array(
-                $this->_pkg->getTasksNs() . ':id' => $id,
+                $this->_pkg->getTasksNs().':id' => $id,
             );
         if ($instructions) {
-            $stuff[$this->_pkg->getTasksNs() . ':instructions'] = $instructions;
+            $stuff[$this->_pkg->getTasksNs().':instructions'] = $instructions;
         }
         if ($params) {
-            $stuff[$this->_pkg->getTasksNs() . ':param'] = $params;
+            $stuff[$this->_pkg->getTasksNs().':param'] = $params;
         }
-        $this->_params[$this->_pkg->getTasksNs() . ':paramgroup'][] = $stuff;
+        $this->_params[$this->_pkg->getTasksNs().':paramgroup'][] = $stuff;
     }
 
     /**
-     * add a complex <paramgroup> to the post-install script with conditions
+     * Add a complex <paramgroup> to the post-install script with conditions
      *
      * This inserts a <paramgroup> with
      *
@@ -107,63 +108,75 @@ function addParamGroup($id, $params = false, $instructions = false)
      *
      * Use {@link addParamGroup()} to add a simple <paramgroup>
      *
-     * @param string $id <paramgroup> id as seen by the script
-     * @param string $oldgroup <paramgroup> id of the section referenced by
-     *                         <conditiontype>
-     * @param string $param name of the <param> from the older section referenced
-     *                      by <contitiontype>
-     * @param string $value value to match of the parameter
-     * @param string $conditiontype one of '=', '!=', 'preg_match'
-     * @param array|false $params array of getParam() calls, or false for no params
+     * @param string       $id            <paramgroup> id as seen by the script
+     * @param string       $oldgroup      <paramgroup> id of the section referenced by
+     *                                    <conditiontype>
+     * @param string       $param         name of the <param> from the older section referenced
+     *                                    by <contitiontype>
+     * @param string       $value         value to match of the parameter
+     * @param string       $conditiontype one of '=', '!=', 'preg_match'
+     * @param array|false  $params        array of getParam() calls, or false for no params
      * @param string|false $instructions
      */
-    function addConditionTypeGroup($id, $oldgroup, $param, $value, $conditiontype = '=',
-                                   $params = false, $instructions = false)
-    {
+    public function addConditionTypeGroup($id,
+        $oldgroup,
+        $param,
+        $value,
+        $conditiontype = '=',
+        $params = false,
+        $instructions = false
+    ) {
         if ($params && isset($params[0]) && !isset($params[1])) {
             $params = $params[0];
         }
         $stuff = array(
-            $this->_pkg->getTasksNs() . ':id' => $id,
+            $this->_pkg->getTasksNs().':id' => $id,
         );
         if ($instructions) {
-            $stuff[$this->_pkg->getTasksNs() . ':instructions'] = $instructions;
+            $stuff[$this->_pkg->getTasksNs().':instructions'] = $instructions;
         }
-        $stuff[$this->_pkg->getTasksNs() . ':name'] = $oldgroup . '::' . $param;
-        $stuff[$this->_pkg->getTasksNs() . ':conditiontype'] = $conditiontype;
-        $stuff[$this->_pkg->getTasksNs() . ':value'] = $value;
+        $stuff[$this->_pkg->getTasksNs().':name'] = $oldgroup.'::'.$param;
+        $stuff[$this->_pkg->getTasksNs().':conditiontype'] = $conditiontype;
+        $stuff[$this->_pkg->getTasksNs().':value'] = $value;
         if ($params) {
-            $stuff[$this->_pkg->getTasksNs() . ':param'] = $params;
+            $stuff[$this->_pkg->getTasksNs().':param'] = $params;
         }
-        $this->_params[$this->_pkg->getTasksNs() . ':paramgroup'][] = $stuff;
+        $this->_params[$this->_pkg->getTasksNs().':paramgroup'][] = $stuff;
     }
 
-    function getXml()
+    public function getXml()
     {
         return $this->_params;
     }
 
     /**
      * Use to set up a param tag for use in creating a paramgroup
-     * @static
+     *
+     * @param mixed  $name    Name of parameter
+     * @param mixed  $prompt  Prompt
+     * @param string $type    Type, defaults to 'string'
+     * @param mixed  $default Default value
+     *
+     * @return array
      */
-    function getParam($name, $prompt, $type = 'string', $default = null)
-    {
+    public function getParam(
+        $name, $prompt, $type = 'string', $default = null
+    ) {
         if ($default !== null) {
             return
             array(
-                $this->_pkg->getTasksNs() . ':name' => $name,
-                $this->_pkg->getTasksNs() . ':prompt' => $prompt,
-                $this->_pkg->getTasksNs() . ':type' => $type,
-                $this->_pkg->getTasksNs() . ':default' => $default
+                $this->_pkg->getTasksNs().':name' => $name,
+                $this->_pkg->getTasksNs().':prompt' => $prompt,
+                $this->_pkg->getTasksNs().':type' => $type,
+                $this->_pkg->getTasksNs().':default' => $default,
             );
         }
+
         return
             array(
-                $this->_pkg->getTasksNs() . ':name' => $name,
-                $this->_pkg->getTasksNs() . ':prompt' => $prompt,
-                $this->_pkg->getTasksNs() . ':type' => $type,
+                $this->_pkg->getTasksNs().':name' => $name,
+                $this->_pkg->getTasksNs().':prompt' => $prompt,
+                $this->_pkg->getTasksNs().':type' => $type,
             );
     }
 }
-?>
\ No newline at end of file
diff --git a/lib/vendor/PEAR/PEAR/Task/Replace.php b/lib/vendor/PEAR/PEAR/Task/Replace.php
index fec254f03..1ea71bfe5 100644
--- a/lib/vendor/PEAR/PEAR/Task/Replace.php
+++ b/lib/vendor/PEAR/PEAR/Task/Replace.php
@@ -4,14 +4,13 @@
  *
  * PHP versions 4 and 5
  *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Replace.php 276394 2009-02-25 00:15:49Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
+ * @category  pear
+ * @package   PEAR
+ * @author    Greg Beaver <cellog@php.net>
+ * @copyright 1997-2009 The Authors
+ * @license   http://opensource.org/licenses/bsd-license.php New BSD License
+ * @link      http://pear.php.net/package/PEAR
+ * @since     File available since Release 1.4.0a1
  */
 /**
  * Base class
@@ -24,24 +23,24 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
 class PEAR_Task_Replace extends PEAR_Task_Common
 {
-    var $type = 'simple';
-    var $phase = PEAR_TASK_PACKAGEANDINSTALL;
-    var $_replacements;
+    public $type = 'simple';
+    public $phase = PEAR_TASK_PACKAGEANDINSTALL;
+    public $_replacements;
 
     /**
      * Validate the raw xml at parsing-time.
-     * @param PEAR_PackageFile_v2
-     * @param array raw, parsed xml
-     * @param PEAR_Config
-     * @static
+     *
+     * @param  PEAR_PackageFile_v2
+     * @param  array raw, parsed xml
+     * @param  PEAR_Config
      */
-    function validateXml($pkg, $xml, $config, $fileXml)
+    public static function validateXml($pkg, $xml, $config, $fileXml)
     {
         if (!isset($xml['attribs'])) {
             return array(PEAR_TASK_ERROR_NOATTRIBS);
@@ -58,33 +57,36 @@ function validateXml($pkg, $xml, $config, $fileXml)
         if ($xml['attribs']['type'] == 'pear-config') {
             if (!in_array($xml['attribs']['to'], $config->getKeys())) {
                 return array(PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE, 'to', $xml['attribs']['to'],
-                    $config->getKeys());
+                    $config->getKeys(), );
             }
         } elseif ($xml['attribs']['type'] == 'php-const') {
             if (defined($xml['attribs']['to'])) {
                 return true;
             } else {
                 return array(PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE, 'to', $xml['attribs']['to'],
-                    array('valid PHP constant'));
+                    array('valid PHP constant'), );
             }
         } elseif ($xml['attribs']['type'] == 'package-info') {
-            if (in_array($xml['attribs']['to'],
+            if (in_array(
+                $xml['attribs']['to'],
                 array('name', 'summary', 'channel', 'notes', 'extends', 'description',
                     'release_notes', 'license', 'release-license', 'license-uri',
                     'version', 'api-version', 'state', 'api-state', 'release_date',
-                    'date', 'time'))) {
+                    'date', 'time', )
+            )) {
                 return true;
             } else {
                 return array(PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE, 'to', $xml['attribs']['to'],
                     array('name', 'summary', 'channel', 'notes', 'extends', 'description',
                     'release_notes', 'license', 'release-license', 'license-uri',
                     'version', 'api-version', 'state', 'api-state', 'release_date',
-                    'date', 'time'));
+                    'date', 'time', ), );
             }
         } else {
             return array(PEAR_TASK_ERROR_WRONG_ATTRIB_VALUE, 'type', $xml['attribs']['type'],
-                array('pear-config', 'package-info', 'php-const'));
+                array('pear-config', 'package-info', 'php-const'), );
         }
+
         return true;
     }
 
@@ -92,8 +94,9 @@ function validateXml($pkg, $xml, $config, $fileXml)
      * Initialize a task instance with the parameters
      * @param array raw, parsed xml
      * @param unused
+     * @param unused
      */
-    function init($xml, $attribs)
+    public function init($xml, $attribs, $lastVersion = null)
     {
         $this->_replacements = isset($xml['attribs']) ? array($xml) : $xml;
     }
@@ -102,13 +105,14 @@ function init($xml, $attribs)
      * Do a package.xml 1.0 replacement, with additional package-info fields available
      *
      * See validateXml() source for the complete list of allowed fields
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @param string file contents
-     * @param string the eventual final file location (informational only)
+     *
+     * @param  PEAR_PackageFile_v1|PEAR_PackageFile_v2
+     * @param  string file contents
+     * @param  string the eventual final file location (informational only)
      * @return string|false|PEAR_Error false to skip this file, PEAR_Error to fail
-     *         (use $this->throwError), otherwise return the new contents
+     *                                 (use $this->throwError), otherwise return the new contents
      */
-    function startSession($pkg, $contents, $dest)
+    public function startSession($pkg, $contents, $dest)
     {
         $subst_from = $subst_to = array();
         foreach ($this->_replacements as $a) {
@@ -124,6 +128,7 @@ function startSession($pkg, $contents, $dest)
                         $to = $chan->getServer();
                     } else {
                         $this->logger->log(0, "$dest: invalid pear-config replacement: $a[to]");
+
                         return false;
                     }
                 } else {
@@ -140,6 +145,7 @@ function startSession($pkg, $contents, $dest)
                 }
                 if (is_null($to)) {
                     $this->logger->log(0, "$dest: invalid pear-config replacement: $a[to]");
+
                     return false;
                 }
             } elseif ($a['type'] == 'php-const') {
@@ -150,6 +156,7 @@ function startSession($pkg, $contents, $dest)
                     $to = constant($a['to']);
                 } else {
                     $this->logger->log(0, "$dest: invalid php-const replacement: $a[to]");
+
                     return false;
                 }
             } else {
@@ -157,6 +164,7 @@ function startSession($pkg, $contents, $dest)
                     $to = $t;
                 } else {
                     $this->logger->log(0, "$dest: invalid package-info replacement: $a[to]");
+
                     return false;
                 }
             }
@@ -165,12 +173,14 @@ function startSession($pkg, $contents, $dest)
                 $subst_to[] = $to;
             }
         }
-        $this->logger->log(3, "doing " . sizeof($subst_from) .
-            " substitution(s) for $dest");
+        $this->logger->log(
+            3, "doing ".sizeof($subst_from).
+            " substitution(s) for $dest"
+        );
         if (sizeof($subst_from)) {
             $contents = str_replace($subst_from, $subst_to, $contents);
         }
+
         return $contents;
     }
 }
-?>
\ No newline at end of file
diff --git a/lib/vendor/PEAR/PEAR/Task/Replace/rw.php b/lib/vendor/PEAR/PEAR/Task/Replace/rw.php
index 9245db8bb..a2ffc24b1 100644
--- a/lib/vendor/PEAR/PEAR/Task/Replace/rw.php
+++ b/lib/vendor/PEAR/PEAR/Task/Replace/rw.php
@@ -4,14 +4,13 @@
  *
  * PHP versions 4 and 5
  *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: rw.php 276385 2009-02-24 23:46:03Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a10
+ * @category  pear
+ * @package   PEAR
+ * @author    Greg Beaver <cellog@php.net>
+ * @copyright 1997-2009 The Authors
+ * @license   http://opensource.org/licenses/bsd-license.php New BSD License
+ * @link      http://pear.php.net/package/PEAR
+ * @since     File available since Release 1.4.0a10
  */
 /**
  * Base class
@@ -24,38 +23,37 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a10
  */
 class PEAR_Task_Replace_rw extends PEAR_Task_Replace
 {
-    function PEAR_Task_Replace_rw(&$pkg, &$config, &$logger, $fileXml)
+    public function __construct(&$pkg, &$config, &$logger, $fileXml)
     {
-        parent::PEAR_Task_Common($config, $logger, PEAR_TASK_PACKAGE);
+        parent::__construct($config, $logger, PEAR_TASK_PACKAGE);
         $this->_contents = $fileXml;
         $this->_pkg = &$pkg;
         $this->_params = array();
     }
 
-    function validate()
+    public function validate()
     {
         return $this->validateXml($this->_pkg, $this->_params, $this->config, $this->_contents);
     }
 
-    function setInfo($from, $to, $type)
+    public function setInfo($from, $to, $type)
     {
         $this->_params = array('attribs' => array('from' => $from, 'to' => $to, 'type' => $type));
     }
 
-    function getName()
+    public function getName()
     {
         return 'replace';
     }
 
-    function getXml()
+    public function getXml()
     {
         return $this->_params;
     }
 }
-?>
\ No newline at end of file
diff --git a/lib/vendor/PEAR/PEAR/Task/Unixeol.php b/lib/vendor/PEAR/PEAR/Task/Unixeol.php
index 7775e980c..3b1d84c9a 100644
--- a/lib/vendor/PEAR/PEAR/Task/Unixeol.php
+++ b/lib/vendor/PEAR/PEAR/Task/Unixeol.php
@@ -4,14 +4,13 @@
  *
  * PHP versions 4 and 5
  *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Unixeol.php 276394 2009-02-25 00:15:49Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
+ * @category  pear
+ * @package   PEAR
+ * @author    Greg Beaver <cellog@php.net>
+ * @copyright 1997-2009 The Authors
+ * @license   http://opensource.org/licenses/bsd-license.php New BSD License
+ * @link      http://pear.php.net/package/PEAR
+ * @since     File available since Release 1.4.0a1
  */
 /**
  * Base class
@@ -24,28 +23,29 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
 class PEAR_Task_Unixeol extends PEAR_Task_Common
 {
-    var $type = 'simple';
-    var $phase = PEAR_TASK_PACKAGE;
-    var $_replacements;
+    public $type = 'simple';
+    public $phase = PEAR_TASK_PACKAGE;
+    public $_replacements;
 
     /**
      * Validate the raw xml at parsing-time.
-     * @param PEAR_PackageFile_v2
-     * @param array raw, parsed xml
-     * @param PEAR_Config
-     * @static
+     *
+     * @param  PEAR_PackageFile_v2
+     * @param  array raw, parsed xml
+     * @param  PEAR_Config
      */
-    function validateXml($pkg, $xml, $config, $fileXml)
+    public static function validateXml($pkg, $xml, $config, $fileXml)
     {
         if ($xml != '') {
             return array(PEAR_TASK_ERROR_INVALID, 'no attributes allowed');
         }
+
         return true;
     }
 
@@ -53,8 +53,9 @@ function validateXml($pkg, $xml, $config, $fileXml)
      * Initialize a task instance with the parameters
      * @param array raw, parsed xml
      * @param unused
+     * @param unused
      */
-    function init($xml, $attribs)
+    public function init($xml, $attribs, $lastVersion = null)
     {
     }
 
@@ -62,16 +63,17 @@ function init($xml, $attribs)
      * Replace all line endings with line endings customized for the current OS
      *
      * See validateXml() source for the complete list of allowed fields
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @param string file contents
-     * @param string the eventual final file location (informational only)
+     *
+     * @param  PEAR_PackageFile_v1|PEAR_PackageFile_v2
+     * @param  string file contents
+     * @param  string the eventual final file location (informational only)
      * @return string|false|PEAR_Error false to skip this file, PEAR_Error to fail
-     *         (use $this->throwError), otherwise return the new contents
+     *                                 (use $this->throwError), otherwise return the new contents
      */
-    function startSession($pkg, $contents, $dest)
+    public function startSession($pkg, $contents, $dest)
     {
         $this->logger->log(3, "replacing all line endings with \\n in $dest");
+
         return preg_replace("/\r\n|\n\r|\r|\n/", "\n", $contents);
     }
 }
-?>
\ No newline at end of file
diff --git a/lib/vendor/PEAR/PEAR/Task/Unixeol/rw.php b/lib/vendor/PEAR/PEAR/Task/Unixeol/rw.php
index 4335a33d8..7e98f2184 100644
--- a/lib/vendor/PEAR/PEAR/Task/Unixeol/rw.php
+++ b/lib/vendor/PEAR/PEAR/Task/Unixeol/rw.php
@@ -4,14 +4,13 @@
  *
  * PHP versions 4 and 5
  *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: rw.php 276385 2009-02-24 23:46:03Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a10
+ * @category  pear
+ * @package   PEAR
+ * @author    Greg Beaver <cellog@php.net>
+ * @copyright 1997-2009 The Authors
+ * @license   http://opensource.org/licenses/bsd-license.php New BSD License
+ * @link      http://pear.php.net/package/PEAR
+ * @since     File available since Release 1.4.0a10
  */
 /**
  * Base class
@@ -24,33 +23,33 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a10
  */
 class PEAR_Task_Unixeol_rw extends PEAR_Task_Unixeol
 {
-    function PEAR_Task_Unixeol_rw(&$pkg, &$config, &$logger, $fileXml)
+    function __construct(&$pkg, &$config, &$logger, $fileXml)
     {
-        parent::PEAR_Task_Common($config, $logger, PEAR_TASK_PACKAGE);
+        parent::__construct($config, $logger, PEAR_TASK_PACKAGE);
         $this->_contents = $fileXml;
         $this->_pkg = &$pkg;
         $this->_params = array();
     }
 
-    function validate()
+    public function validate()
     {
         return true;
     }
 
-    function getName()
+    public function getName()
     {
         return 'unixeol';
     }
 
-    function getXml()
+    public function getXml()
     {
         return '';
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/vendor/PEAR/PEAR/Task/Windowseol.php b/lib/vendor/PEAR/PEAR/Task/Windowseol.php
index a36f7bddb..e0f2f26d8 100644
--- a/lib/vendor/PEAR/PEAR/Task/Windowseol.php
+++ b/lib/vendor/PEAR/PEAR/Task/Windowseol.php
@@ -4,14 +4,13 @@
  *
  * PHP versions 4 and 5
  *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Windowseol.php 276394 2009-02-25 00:15:49Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a1
+ * @category  pear
+ * @package   PEAR
+ * @author    Greg Beaver <cellog@php.net>
+ * @copyright 1997-2009 The Authors
+ * @license   http://opensource.org/licenses/bsd-license.php New BSD License
+ * @link      http://pear.php.net/package/PEAR
+ * @since     File available since Release 1.4.0a1
  */
 /**
  * Base class
@@ -19,33 +18,35 @@
 require_once 'PEAR/Task/Common.php';
 /**
  * Implements the windows line endsings file task.
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a1
+ *
+ * @category  pear
+ * @package   PEAR
+ * @author    Greg Beaver <cellog@php.net>
+ * @copyright 1997-2009 The Authors
+ * @license   http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version   Release: 1.10.3
+ * @link      http://pear.php.net/package/PEAR
+ * @since     Class available since Release 1.4.0a1
  */
 class PEAR_Task_Windowseol extends PEAR_Task_Common
 {
-    var $type = 'simple';
-    var $phase = PEAR_TASK_PACKAGE;
-    var $_replacements;
+    public $type = 'simple';
+    public $phase = PEAR_TASK_PACKAGE;
+    public $_replacements;
 
     /**
      * Validate the raw xml at parsing-time.
-     * @param PEAR_PackageFile_v2
-     * @param array raw, parsed xml
-     * @param PEAR_Config
-     * @static
+     *
+     * @param  PEAR_PackageFile_v2
+     * @param  array raw, parsed xml
+     * @param  PEAR_Config
      */
-    function validateXml($pkg, $xml, $config, $fileXml)
+    public static function validateXml($pkg, $xml, $config, $fileXml)
     {
         if ($xml != '') {
             return array(PEAR_TASK_ERROR_INVALID, 'no attributes allowed');
         }
+
         return true;
     }
 
@@ -53,8 +54,9 @@ function validateXml($pkg, $xml, $config, $fileXml)
      * Initialize a task instance with the parameters
      * @param array raw, parsed xml
      * @param unused
+     * @param unused
      */
-    function init($xml, $attribs)
+    public function init($xml, $attribs, $lastVersion = null)
     {
     }
 
@@ -62,16 +64,17 @@ function init($xml, $attribs)
      * Replace all line endings with windows line endings
      *
      * See validateXml() source for the complete list of allowed fields
-     * @param PEAR_PackageFile_v1|PEAR_PackageFile_v2
-     * @param string file contents
-     * @param string the eventual final file location (informational only)
+     *
+     * @param  PEAR_PackageFile_v1|PEAR_PackageFile_v2
+     * @param  string file contents
+     * @param  string the eventual final file location (informational only)
      * @return string|false|PEAR_Error false to skip this file, PEAR_Error to fail
-     *         (use $this->throwError), otherwise return the new contents
+     *                                 (use $this->throwError), otherwise return the new contents
      */
-    function startSession($pkg, $contents, $dest)
+    public function startSession($pkg, $contents, $dest)
     {
         $this->logger->log(3, "replacing all line endings with \\r\\n in $dest");
+
         return preg_replace("/\r\n|\n\r|\r|\n/", "\r\n", $contents);
     }
 }
-?>
\ No newline at end of file
diff --git a/lib/vendor/PEAR/PEAR/Task/Windowseol/rw.php b/lib/vendor/PEAR/PEAR/Task/Windowseol/rw.php
index 191b3a2dc..2f10c5eb2 100644
--- a/lib/vendor/PEAR/PEAR/Task/Windowseol/rw.php
+++ b/lib/vendor/PEAR/PEAR/Task/Windowseol/rw.php
@@ -4,14 +4,13 @@
  *
  * PHP versions 4 and 5
  *
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: rw.php 276385 2009-02-24 23:46:03Z dufuz $
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 1.4.0a10
+ * @category  pear
+ * @package   PEAR
+ * @author    Greg Beaver <cellog@php.net>
+ * @copyright 1997-2009 The Authors
+ * @license   http://opensource.org/licenses/bsd-license.php New BSD License
+ * @link      http://pear.php.net/package/PEAR
+ * @since     File available since Release 1.4.0a10
  */
 /**
  * Base class
@@ -19,38 +18,39 @@
 require_once 'PEAR/Task/Windowseol.php';
 /**
  * Abstracts the windowseol task xml.
- * @category   pear
- * @package    PEAR
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
- * @link       http://pear.php.net/package/PEAR
- * @since      Class available since Release 1.4.0a10
+ *
+ * @category  pear
+ * @package   PEAR
+ * @author    Greg Beaver <cellog@php.net>
+ * @copyright 1997-2009 The Authors
+ * @license   http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version   Release: 1.10.3
+ * @link      http://pear.php.net/package/PEAR
+ * @since     Class available since Release 1.4.0a10
  */
 class PEAR_Task_Windowseol_rw extends PEAR_Task_Windowseol
 {
-    function PEAR_Task_Windowseol_rw(&$pkg, &$config, &$logger, $fileXml)
+    function __construct(&$pkg, &$config, &$logger, $fileXml)
     {
-        parent::PEAR_Task_Common($config, $logger, PEAR_TASK_PACKAGE);
+        parent::__construct($config, $logger, PEAR_TASK_PACKAGE);
         $this->_contents = $fileXml;
         $this->_pkg = &$pkg;
         $this->_params = array();
     }
 
-    function validate()
+    public function validate()
     {
         return true;
     }
 
-    function getName()
+    public function getName()
     {
         return 'windowseol';
     }
 
-    function getXml()
+    public function getXml()
     {
         return '';
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/lib/vendor/PEAR/PEAR/Validate.php b/lib/vendor/PEAR/PEAR/Validate.php
index 75343648f..0dc7433c1 100644
--- a/lib/vendor/PEAR/PEAR/Validate.php
+++ b/lib/vendor/PEAR/PEAR/Validate.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Validate.php 276383 2009-02-24 23:39:37Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -32,7 +31,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a1
  */
@@ -85,9 +84,8 @@ function validPackageName($name, $validatepackagename = false)
      * to the PEAR naming convention, so the method is final and static.
      * @param string
      * @final
-     * @static
      */
-    function validGroupName($name)
+    public static function validGroupName($name)
     {
         return (bool) preg_match('/^' . _PEAR_COMMON_PACKAGE_NAME_PREG . '\\z/', $name);
     }
@@ -96,10 +94,9 @@ function validGroupName($name)
      * Determine whether $state represents a valid stability level
      * @param string
      * @return bool
-     * @static
      * @final
      */
-    function validState($state)
+    public static function validState($state)
     {
         return in_array($state, array('snapshot', 'devel', 'alpha', 'beta', 'stable'));
     }
@@ -107,10 +104,9 @@ function validState($state)
     /**
      * Get a list of valid stability levels
      * @return array
-     * @static
      * @final
      */
-    function getValidStates()
+    public static function getValidStates()
     {
         return array('snapshot', 'devel', 'alpha', 'beta', 'stable');
     }
@@ -120,10 +116,9 @@ function getValidStates()
      * by version_compare
      * @param string
      * @return bool
-     * @static
      * @final
      */
-    function validVersion($ver)
+    public static function validVersion($ver)
     {
         return (bool) preg_match(PEAR_COMMON_PACKAGE_VERSION_PREG, $ver);
     }
@@ -207,7 +202,8 @@ function validatePackageName()
                   $this->_packagexml->getExtends()) {
                 $version = $this->_packagexml->getVersion() . '';
                 $name = $this->_packagexml->getPackage();
-                $test = array_shift($a = explode('.', $version));
+                $a = explode('.', $version);
+                $test = array_shift($a);
                 if ($test == '0') {
                     return true;
                 }
diff --git a/lib/vendor/PEAR/PEAR/Validator/PECL.php b/lib/vendor/PEAR/PEAR/Validator/PECL.php
index c0c60b858..157cda327 100644
--- a/lib/vendor/PEAR/PEAR/Validator/PECL.php
+++ b/lib/vendor/PEAR/PEAR/Validator/PECL.php
@@ -9,7 +9,6 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2006 The PHP Group
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: PECL.php 276383 2009-02-24 23:39:37Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a5
  */
@@ -24,7 +23,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
+ * @version    Release: 1.10.3
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 1.4.0a5
  */
diff --git a/lib/vendor/PEAR/PEAR/XMLParser.php b/lib/vendor/PEAR/PEAR/XMLParser.php
index a56d31064..85b10a72a 100644
--- a/lib/vendor/PEAR/PEAR/XMLParser.php
+++ b/lib/vendor/PEAR/PEAR/XMLParser.php
@@ -10,7 +10,6 @@
  * @author     Stephan Schmidt (original XML_Unserializer code)
  * @copyright  1997-2009 The Authors
  * @license   http://opensource.org/licenses/bsd-license New BSD License
- * @version    CVS: $Id: XMLParser.php 282970 2009-06-28 23:10:07Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -23,7 +22,7 @@
  * @author    Stephan Schmidt (original XML_Unserializer code)
  * @copyright 1997-2009 The Authors
  * @license   http://opensource.org/licenses/bsd-license New BSD License
- * @version   Release: 1.9.0
+ * @version   Release: 1.10.3
  * @link      http://pear.php.net/package/PEAR
  * @since     Class available since Release 1.4.0a1
  */
@@ -95,11 +94,6 @@ function parse($data)
             $this->encoding = 'UTF-8';
         }
 
-        if (version_compare(phpversion(), '5.0.0', 'lt') && $this->encoding == 'UTF-8') {
-            $data = utf8_decode($data);
-            $this->encoding = 'ISO-8859-1';
-        }
-
         $xp = xml_parser_create($this->encoding);
         xml_parser_set_option($xp, XML_OPTION_CASE_FOLDING, 0);
         xml_set_object($xp, $this);
diff --git a/lib/vendor/PEAR/PEAR5.php b/lib/vendor/PEAR/PEAR5.php
deleted file mode 100644
index 428606780..000000000
--- a/lib/vendor/PEAR/PEAR5.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * This is only meant for PHP 5 to get rid of certain strict warning
- * that doesn't get hidden since it's in the shutdown function
- */
-class PEAR5
-{
-    /**
-    * If you have a class that's mostly/entirely static, and you need static
-    * properties, you can use this method to simulate them. Eg. in your method(s)
-    * do this: $myVar = &PEAR5::getStaticProperty('myclass', 'myVar');
-    * You MUST use a reference, or they will not persist!
-    *
-    * @access public
-    * @param  string $class  The calling classname, to prevent clashes
-    * @param  string $var    The variable to retrieve.
-    * @return mixed   A reference to the variable. If not set it will be
-    *                 auto initialised to NULL.
-    */
-    static function &getStaticProperty($class, $var)
-    {
-        static $properties;
-        if (!isset($properties[$class])) {
-            $properties[$class] = array();
-        }
-
-        if (!array_key_exists($var, $properties[$class])) {
-            $properties[$class][$var] = null;
-        }
-
-        return $properties[$class][$var];
-    }
-}
\ No newline at end of file
diff --git a/lib/vendor/PEAR/System.php b/lib/vendor/PEAR/System.php
index 69cc7acb9..3184f4694 100644
--- a/lib/vendor/PEAR/System.php
+++ b/lib/vendor/PEAR/System.php
@@ -9,7 +9,6 @@
  * @author     Tomas V.V.Cox <cox@idecnet.com>
  * @copyright  1997-2009 The Authors
  * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: System.php 276386 2009-02-24 23:52:56Z dufuz $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  */
@@ -23,7 +22,7 @@
 $GLOBALS['_System_temp_files'] = array();
 
 /**
-* System offers cross plattform compatible system functions
+* System offers cross platform compatible system functions
 *
 * Static functions for different operations. Should work under
 * Unix and Windows. The names and usage has been taken from its respectively
@@ -51,7 +50,7 @@
 * @author     Tomas V.V. Cox <cox@idecnet.com>
 * @copyright  1997-2006 The PHP Group
 * @license    http://opensource.org/licenses/bsd-license.php New BSD License
-* @version    Release: 1.9.0
+* @version    Release: 1.10.3
 * @link       http://pear.php.net/package/PEAR
 * @since      Class available since Release 0.1
 * @static
@@ -65,15 +64,39 @@ class System
      * @param    string  $short_options  the allowed option short-tags
      * @param    string  $long_options   the allowed option long-tags
      * @return   array   the given options and there values
-     * @static
-     * @access private
      */
-    function _parseArgs($argv, $short_options, $long_options = null)
+    public static function _parseArgs($argv, $short_options, $long_options = null)
     {
         if (!is_array($argv) && $argv !== null) {
-            $argv = preg_split('/\s+/', $argv, -1, PREG_SPLIT_NO_EMPTY);
+            /*
+            // Quote all items that are a short option
+            $av = preg_split('/(\A| )--?[a-z0-9]+[ =]?((?<!\\\\)((,\s*)|((?<!,)\s+))?)/i', $argv, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_OFFSET_CAPTURE);
+            $offset = 0;
+            foreach ($av as $a) {
+                $b = trim($a[0]);
+                if ($b{0} == '"' || $b{0} == "'") {
+                    continue;
+                }
+
+                $escape = escapeshellarg($b);
+                $pos = $a[1] + $offset;
+                $argv = substr_replace($argv, $escape, $pos, strlen($b));
+                $offset += 2;
+            }
+            */
+
+            // Find all items, quoted or otherwise
+            preg_match_all("/(?:[\"'])(.*?)(?:['\"])|([^\s]+)/", $argv, $av);
+            $argv = $av[1];
+            foreach ($av[2] as $k => $a) {
+                if (empty($a)) {
+                    continue;
+                }
+                $argv[$k] = trim($a) ;
+            }
         }
-        return Console_Getopt::getopt2($argv, $short_options);
+
+        return Console_Getopt::getopt2($argv, $short_options, $long_options);
     }
 
     /**
@@ -82,10 +105,8 @@ function _parseArgs($argv, $short_options, $long_options = null)
      *
      * @param mixed $error a PEAR error or a string with the error message
      * @return bool false
-     * @static
-     * @access private
      */
-    function raiseError($error)
+    protected static function raiseError($error)
     {
         if (PEAR::isError($error)) {
             $error = $error->getMessage();
@@ -116,10 +137,8 @@ function raiseError($error)
      * @param    integer $aktinst    starting deep of the lookup
      * @param    bool    $silent     if true, do not emit errors.
      * @return   array   the structure of the dir
-     * @static
-     * @access   private
      */
-    function _dirToStruct($sPath, $maxinst, $aktinst = 0, $silent = false)
+    protected static function _dirToStruct($sPath, $maxinst, $aktinst = 0, $silent = false)
     {
         $struct = array('dirs' => array(), 'files' => array());
         if (($dir = @opendir($sPath)) === false) {
@@ -162,7 +181,7 @@ function _dirToStruct($sPath, $maxinst, $aktinst = 0, $silent = false)
      * @static
      * @see System::_dirToStruct()
      */
-    function _multipleToStruct($files)
+    protected static function _multipleToStruct($files)
     {
         $struct = array('dirs' => array(), 'files' => array());
         settype($files, 'array');
@@ -188,7 +207,7 @@ function _multipleToStruct($files)
      * @static
      * @access   public
      */
-    function rm($args)
+    public static function rm($args)
     {
         $opts = System::_parseArgs($args, 'rf'); // "f" does nothing but I like it :-)
         if (PEAR::isError($opts)) {
@@ -231,10 +250,8 @@ function rm($args)
      * The -p option will create parent directories
      * @param    string  $args    the name of the director(y|ies) to create
      * @return   bool    True for success
-     * @static
-     * @access   public
      */
-    function mkDir($args)
+    public static function mkDir($args)
     {
         $opts = System::_parseArgs($args, 'pm:');
         if (PEAR::isError($opts)) {
@@ -302,10 +319,8 @@ function mkDir($args)
      *
      * @param    string  $args   the arguments
      * @return   boolean true on success
-     * @static
-     * @access   public
      */
-    function &cat($args)
+    public static function &cat($args)
     {
         $ret = null;
         $files = array();
@@ -376,10 +391,8 @@ function &cat($args)
      * @param   string  $args  The arguments
      * @return  mixed   the full path of the created (file|dir) or false
      * @see System::tmpdir()
-     * @static
-     * @access  public
      */
-    function mktemp($args = null)
+    public static function mktemp($args = null)
     {
         static $first_time = true;
         $opts = System::_parseArgs($args, 't:d');
@@ -428,11 +441,8 @@ function mktemp($args = null)
     /**
      * Remove temporary files created my mkTemp. This function is executed
      * at script shutdown time
-     *
-     * @static
-     * @access private
      */
-    function _removeTmpFiles()
+    public static function _removeTmpFiles()
     {
         if (count($GLOBALS['_System_temp_files'])) {
             $delete = $GLOBALS['_System_temp_files'];
@@ -448,10 +458,9 @@ function _removeTmpFiles()
      * Note: php.ini-recommended removes the "E" from the variables_order setting,
      * making unavaible the $_ENV array, that s why we do tests with _ENV
      *
-     * @static
      * @return string The temporary directory on the system
      */
-    function tmpdir()
+    public static function tmpdir()
     {
         if (OS_WINDOWS) {
             if ($var = isset($_ENV['TMP']) ? $_ENV['TMP'] : getenv('TMP')) {
@@ -481,10 +490,9 @@ function tmpdir()
      * @param mixed  $fallback Value to return if $program is not found
      *
      * @return mixed A string with the full path or false if not found
-     * @static
      * @author Stig Bakken <ssb@php.net>
      */
-    function which($program, $fallback = false)
+    public static function which($program, $fallback = false)
     {
         // enforce API
         if (!is_string($program) || '' == $program) {
@@ -496,13 +504,11 @@ function which($program, $fallback = false)
             $path_elements[] = dirname($program);
             $program = basename($program);
         } else {
-            // Honor safe mode
-            if (!ini_get('safe_mode') || !$path = ini_get('safe_mode_exec_dir')) {
-                $path = getenv('PATH');
-                if (!$path) {
-                    $path = getenv('Path'); // some OSes are just stupid enough to do this
-                }
+            $path = getenv('PATH');
+            if (!$path) {
+                $path = getenv('Path'); // some OSes are just stupid enough to do this
             }
+
             $path_elements = explode(PATH_SEPARATOR, $path);
         }
 
@@ -514,17 +520,14 @@ function which($program, $fallback = false)
             if (strpos($program, '.') !== false) {
                 array_unshift($exe_suffixes, '');
             }
-            // is_executable() is not available on windows for PHP4
-            $pear_is_executable = (function_exists('is_executable')) ? 'is_executable' : 'is_file';
         } else {
             $exe_suffixes = array('');
-            $pear_is_executable = 'is_executable';
         }
 
         foreach ($exe_suffixes as $suff) {
             foreach ($path_elements as $dir) {
                 $file = $dir . DIRECTORY_SEPARATOR . $program . $suff;
-                if (@$pear_is_executable($file)) {
+                if (is_executable($file)) {
                     return $file;
                 }
             }
@@ -544,7 +547,7 @@ function which($program, $fallback = false)
      * System::find("$dir -name *.php -name *.htm*");
      * System::find("$dir -maxdepth 1");
      *
-     * Params implmented:
+     * Params implemented:
      * $dir            -> Start the search at this directory
      * -type d         -> return only directories
      * -type f         -> return only files
@@ -553,10 +556,8 @@ function which($program, $fallback = false)
      *
      * @param  mixed Either array or string with the command line
      * @return array Array of found files
-     * @static
-     *
      */
-    function find($args)
+    public static function find($args)
     {
         if (!is_array($args)) {
             $args = preg_split('/\s+/', $args, -1, PREG_SPLIT_NO_EMPTY);

From 5b257b672a8da451ab3d0790644e10cd687fa369 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Wed, 15 Mar 2017 18:24:05 +0900
Subject: [PATCH 578/630] update Structures_Graph 1.1.1 (refs #4176)

PEAR depends on this package.
---
 lib/vendor/PEAR/Structures/Graph.php          | 148 ++++++++++--------
 .../Graph/Manipulator/AcyclicTest.php         |  12 +-
 .../Graph/Manipulator/TopologicalSorter.php   | 133 +++++++++-------
 lib/vendor/PEAR/Structures/Graph/Node.php     |  12 +-
 4 files changed, 176 insertions(+), 129 deletions(-)

diff --git a/lib/vendor/PEAR/Structures/Graph.php b/lib/vendor/PEAR/Structures/Graph.php
index 3757f1584..5a64f6e0b 100644
--- a/lib/vendor/PEAR/Structures/Graph.php
+++ b/lib/vendor/PEAR/Structures/Graph.php
@@ -26,14 +26,11 @@
 /**
  * The Graph.php file contains the definition of the Structures_Graph class 
  *
- * @see Structures_Graph
  * @package Structures_Graph
  */
 
 /* dependencies {{{ */
-/** PEAR base classes */
 require_once 'PEAR.php';
-/** Graph Node */
 require_once 'Structures/Graph/Node.php';
 /* }}} */
 
@@ -48,65 +45,86 @@
  * directional, and can be traveled only one way. In an undirected graph, arcs
  * are bidirectional, and can be traveled both ways.
  *
- * @author		S�rgio Carvalho <sergio.carvalho@portugalmail.com> 
- * @copyright	(c) 2004 by S�rgio Carvalho
- * @package Structures_Graph
+ * @author    S�rgio Carvalho <sergio.carvalho@portugalmail.com> 
+ * @copyright (c) 2004 by S�rgio Carvalho
+ * @package   Structures_Graph
  */
 /* }}} */
-class Structures_Graph {
-    /* fields {{{ */
+class Structures_Graph
+{
     /**
+     * List of node objects in this graph
      * @access private
      */
     var $_nodes = array();
+
     /**
+     * If the graph is directed or not
      * @access private
      */
     var $_directed = false;
-    /* }}} */
 
-    /* Constructor {{{ */
+
     /**
-    *
-    * Constructor
-    *
-    * @param    boolean    Set to true if the graph is directed. Set to false if it is not directed. (Optional, defaults to true)
-    * @access	public
-    */
-    function Structures_Graph($directed = true) {
+     * Constructor
+     *
+     * @param boolean $directed Set to true if the graph is directed.
+     *                          Set to false if it is not directed.
+     */
+    public function __construct($directed = true)
+    {
         $this->_directed = $directed;
     }
-    /* }}} */
 
-    /* isDirected {{{ */
     /**
-    *
-    * Return true if a graph is directed
-    *
-    * @return	boolean	 true if the graph is directed
-    * @access	public
-    */
-    function isDirected() {
+     * Old constructor (PHP4-style; kept for BC with extending classes)
+     *
+     * @param boolean $directed Set to true if the graph is directed.
+     *                          Set to false if it is not directed.
+     *
+     * @return void
+     */
+    public function Structures_Graph($directed = true)
+    {
+        $this->__construct($directed);
+    }
+
+    /**
+     * Return true if a graph is directed
+     *
+     * @return boolean true if the graph is directed
+     */
+    public function isDirected()
+    {
         return (boolean) $this->_directed;
     }
-    /* }}} */
 
-    /* addNode {{{ */
     /**
-    *
-    * Add a Node to the Graph
-    *
-    * @param    Structures_Graph_Node   The node to be added.
-    * @access	public
-    */
-    function addNode(&$newNode) {
+     * Add a Node to the Graph
+     *
+     * @param Structures_Graph_Node $newNode The node to be added.
+     *
+     * @return void
+     */
+    public function addNode(&$newNode)
+    {
         // We only add nodes
-        if (!is_a($newNode, 'Structures_Graph_Node')) return Pear::raiseError('Structures_Graph::addNode received an object that is not a Structures_Graph_Node', STRUCTURES_GRAPH_ERROR_GENERIC);
-        // Graphs are node *sets*, so duplicates are forbidden. We allow nodes that are exactly equal, but disallow equal references.
-        foreach($this->_nodes as $key => $node) {
+        if (!is_a($newNode, 'Structures_Graph_Node')) {
+            return Pear::raiseError(
+                'Structures_Graph::addNode received an object that is not'
+                . ' a Structures_Graph_Node',
+                STRUCTURES_GRAPH_ERROR_GENERIC
+            );
+        }
+
+        //Graphs are node *sets*, so duplicates are forbidden.
+        // We allow nodes that are exactly equal, but disallow equal references.
+        foreach ($this->_nodes as $key => $node) {
             /*
-             ZE1 equality operators choke on the recursive cycle introduced by the _graph field in the Node object.
-             So, we'll check references the hard way (change $this->_nodes[$key] and check if the change reflects in 
+             ZE1 equality operators choke on the recursive cycle introduced
+             by the _graph field in the Node object.
+             So, we'll check references the hard way
+             (change $this->_nodes[$key] and check if the change reflects in
              $node)
             */
             $savedData = $this->_nodes[$key];
@@ -114,41 +132,45 @@ function addNode(&$newNode) {
             $this->_nodes[$key] = true;
             if ($node === true) {
                 $this->_nodes[$key] = false;
-                if ($node === false) $referenceIsEqualFlag = true;
+                if ($node === false) {
+                    $referenceIsEqualFlag = true;
+                }
             }
             $this->_nodes[$key] = $savedData;
-            if ($referenceIsEqualFlag) return Pear::raiseError('Structures_Graph::addNode received an object that is a duplicate for this dataset', STRUCTURES_GRAPH_ERROR_GENERIC);
+            if ($referenceIsEqualFlag) {
+                return Pear::raiseError(
+                    'Structures_Graph::addNode received an object that is'
+                    . ' a duplicate for this dataset',
+                    STRUCTURES_GRAPH_ERROR_GENERIC
+                );
+            }
         }
         $this->_nodes[] =& $newNode;
         $newNode->setGraph($this);
     }
-    /* }}} */
 
-    /* removeNode (unimplemented) {{{ */
     /**
-    *
-    * Remove a Node from the Graph
-    *
-    * @todo     This is unimplemented
-    * @param    Structures_Graph_Node   The node to be removed from the graph
-    * @access	public
-    */
-    function removeNode(&$node) {
+     * Remove a Node from the Graph
+     *
+     * @param Structures_Graph_Node $node The node to be removed from the graph
+     *
+     * @return void
+     * @todo   This is unimplemented
+     */
+    public function removeNode(&$node)
+    {
     }
-    /* }}} */
 
-    /* getNodes {{{ */
     /**
-    *
-    * Return the node set, in no particular order. For ordered node sets, use a Graph Manipulator insted.
-    *
-    * @access   public
-    * @see      Structures_Graph_Manipulator_TopologicalSorter
-    * @return   array The set of nodes in this graph
-    */
-    function &getNodes() {
+     * Return the node set, in no particular order.
+     * For ordered node sets, use a Graph Manipulator insted.
+     *
+     * @return array The set of nodes in this graph
+     * @see    Structures_Graph_Manipulator_TopologicalSorter
+     */
+    public function &getNodes()
+    {
         return $this->_nodes;
     }
-    /* }}} */
 }
 ?>
diff --git a/lib/vendor/PEAR/Structures/Graph/Manipulator/AcyclicTest.php b/lib/vendor/PEAR/Structures/Graph/Manipulator/AcyclicTest.php
index fc1ba92f6..7ecd7563c 100644
--- a/lib/vendor/PEAR/Structures/Graph/Manipulator/AcyclicTest.php
+++ b/lib/vendor/PEAR/Structures/Graph/Manipulator/AcyclicTest.php
@@ -59,10 +59,9 @@ class Structures_Graph_Manipulator_AcyclicTest {
     * This is a variant of Structures_Graph::inDegree which does 
     * not count nodes marked as visited.
     *
-    * @access   private
     * @return	integer	 Number of non-visited nodes that link to this one
     */
-    function _nonVisitedInDegree(&$node) {
+    protected static function _nonVisitedInDegree(&$node) {
         $result = 0;
         $graphNodes =& $node->_graph->getNodes();
         foreach (array_keys($graphNodes) as $key) {
@@ -75,9 +74,9 @@ function _nonVisitedInDegree(&$node) {
 
     /* _isAcyclic {{{ */
     /**
-    * @access   private
-    */
-    function _isAcyclic(&$graph) {
+     * Check if the graph is acyclic
+     */
+    protected static function _isAcyclic(&$graph) {
         // Mark every node as not visited
         $nodes =& $graph->getNodes();
         $nodeKeys = array_keys($nodes);
@@ -121,9 +120,8 @@ function _isAcyclic(&$graph) {
     * isAcyclic returns true if a graph contains no cycles, false otherwise.
     *
     * @return	boolean	 true iff graph is acyclic
-    * @access	public
     */
-    function isAcyclic(&$graph) {
+    public static function isAcyclic(&$graph) {
         // We only test graphs
         if (!is_a($graph, 'Structures_Graph')) return Pear::raiseError('Structures_Graph_Manipulator_AcyclicTest::isAcyclic received an object that is not a Structures_Graph', STRUCTURES_GRAPH_ERROR_GENERIC);
         if (!$graph->isDirected()) return false; // Only directed graphs may be acyclic
diff --git a/lib/vendor/PEAR/Structures/Graph/Manipulator/TopologicalSorter.php b/lib/vendor/PEAR/Structures/Graph/Manipulator/TopologicalSorter.php
index 98a9fa0b6..f57ee10c6 100644
--- a/lib/vendor/PEAR/Structures/Graph/Manipulator/TopologicalSorter.php
+++ b/lib/vendor/PEAR/Structures/Graph/Manipulator/TopologicalSorter.php
@@ -26,22 +26,14 @@
 /**
  * This file contains the definition of the Structures_Graph_Manipulator_TopologicalSorter class.
  * 
- * @see Structures_Graph_Manipulator_TopologicalSorter
  * @package Structures_Graph
  */
 
-/* dependencies {{{ */
-/** */
 require_once 'PEAR.php';
-/** */
 require_once 'Structures/Graph.php';
-/** */
 require_once 'Structures/Graph/Node.php';
-/** */
 require_once 'Structures/Graph/Manipulator/AcyclicTest.php';
-/* }}} */
 
-/* class Structures_Graph_Manipulator_TopologicalSorter {{{ */
 /**
  * The Structures_Graph_Manipulator_TopologicalSorter is a manipulator 
  * which is able to return the set of nodes in a graph, sorted by topological 
@@ -50,44 +42,55 @@
  * A graph may only be sorted topologically iff it's a DAG. You can test it
  * with the Structures_Graph_Manipulator_AcyclicTest.
  * 
- * @author		S�rgio Carvalho <sergio.carvalho@portugalmail.com> 
- * @copyright	(c) 2004 by S�rgio Carvalho
- * @see     Structures_Graph_Manipulator_AcyclicTest
- * @package Structures_Graph
+ * @author    S�rgio Carvalho <sergio.carvalho@portugalmail.com> 
+ * @copyright (c) 2004 by S�rgio Carvalho
+ * @see       Structures_Graph_Manipulator_AcyclicTest
+ * @package   Structures_Graph
  */
-class Structures_Graph_Manipulator_TopologicalSorter {
-    /* _nonVisitedInDegree {{{ */
+class Structures_Graph_Manipulator_TopologicalSorter
+{
     /**
-    *
-    * This is a variant of Structures_Graph::inDegree which does 
-    * not count nodes marked as visited.
-    *
-    * @access   private
-    * @return	integer	 Number of non-visited nodes that link to this one
-    */
-    function _nonVisitedInDegree(&$node) {
+     * This is a variant of Structures_Graph::inDegree which does 
+     * not count nodes marked as visited.
+     *
+     * @param object $node Node to check
+     *
+     * @return integer Number of non-visited nodes that link to this one
+     */
+    protected static function _nonVisitedInDegree(&$node)
+    {
         $result = 0;
         $graphNodes =& $node->_graph->getNodes();
         foreach (array_keys($graphNodes) as $key) {
-            if ((!$graphNodes[$key]->getMetadata('topological-sort-visited')) && $graphNodes[$key]->connectsTo($node)) $result++;
+            if ((!$graphNodes[$key]->getMetadata('topological-sort-visited'))
+                && $graphNodes[$key]->connectsTo($node)
+            ) {
+                $result++;
+            }
         }
         return $result;
         
     }
-    /* }}} */
 
-    /* _sort {{{ */
     /**
-    * @access   private
-    */
-    function _sort(&$graph) {
+     * Sort implementation
+     *
+     * @param object $graph Graph to sort
+     *
+     * @return void
+     */
+    protected static function _sort(&$graph)
+    {
         // Mark every node as not visited
         $nodes =& $graph->getNodes();
         $nodeKeys = array_keys($nodes);
         $refGenerator = array();
-        foreach($nodeKeys as $key) {
+        foreach ($nodeKeys as $key) {
             $refGenerator[] = false;
-            $nodes[$key]->setMetadata('topological-sort-visited', $refGenerator[sizeof($refGenerator) - 1]);
+            $nodes[$key]->setMetadata(
+                'topological-sort-visited',
+                $refGenerator[sizeof($refGenerator) - 1]
+            );
         }
 
         // Iteratively peel off leaf nodes
@@ -95,43 +98,61 @@ function _sort(&$graph) {
         do {
             // Find out which nodes are leafs (excluding visited nodes)
             $leafNodes = array();
-            foreach($nodeKeys as $key) {
-                if ((!$nodes[$key]->getMetadata('topological-sort-visited')) && Structures_Graph_Manipulator_TopologicalSorter::_nonVisitedInDegree($nodes[$key]) == 0) {
+            foreach ($nodeKeys as $key) {
+                if ((!$nodes[$key]->getMetadata('topological-sort-visited'))
+                    && static::_nonVisitedInDegree($nodes[$key]) == 0
+                ) {
                     $leafNodes[] =& $nodes[$key];
                 }
             }
             // Mark leafs as visited
             $refGenerator[] = $topologicalLevel;
-            for ($i=sizeof($leafNodes) - 1; $i>=0; $i--) {
+            for ($i = sizeof($leafNodes) - 1; $i>=0; $i--) {
                 $visited =& $leafNodes[$i]->getMetadata('topological-sort-visited');
                 $visited = true;
                 $leafNodes[$i]->setMetadata('topological-sort-visited', $visited);
-                $leafNodes[$i]->setMetadata('topological-sort-level', $refGenerator[sizeof($refGenerator) - 1]);
+                $leafNodes[$i]->setMetadata(
+                    'topological-sort-level',
+                    $refGenerator[sizeof($refGenerator) - 1]
+                );
             }
             $topologicalLevel++;
         } while (sizeof($leafNodes) > 0);
 
         // Cleanup visited marks
-        foreach($nodeKeys as $key) $nodes[$key]->unsetMetadata('topological-sort-visited');
+        foreach ($nodeKeys as $key) {
+            $nodes[$key]->unsetMetadata('topological-sort-visited');
+        }
     }
-    /* }}} */
 
-    /* sort {{{ */
     /**
-    *
-    * sort returns the graph's nodes, sorted by topological order. 
-    * 
-    * The result is an array with 
-    * as many entries as topological levels. Each entry in this array is an array of nodes within
-    * the given topological level.
-    *
-    * @return	array	 The graph's nodes, sorted by topological order.
-    * @access	public
-    */
-    function sort(&$graph) {
+     * Sort returns the graph's nodes, sorted by topological order. 
+     * 
+     * The result is an array with as many entries as topological levels.
+     * Each entry in this array is an array of nodes within
+     * the given topological level.
+     *
+     * @param object $graph Graph to sort
+     *
+     * @return array The graph's nodes, sorted by topological order.
+     */
+    public static function sort(&$graph)
+    {
         // We only sort graphs
-        if (!is_a($graph, 'Structures_Graph')) return Pear::raiseError('Structures_Graph_Manipulator_TopologicalSorter::sort received an object that is not a Structures_Graph', STRUCTURES_GRAPH_ERROR_GENERIC);
-        if (!Structures_Graph_Manipulator_AcyclicTest::isAcyclic($graph)) return Pear::raiseError('Structures_Graph_Manipulator_TopologicalSorter::sort received an graph that has cycles', STRUCTURES_GRAPH_ERROR_GENERIC);
+        if (!is_a($graph, 'Structures_Graph')) {
+            return Pear::raiseError(
+                'Structures_Graph_Manipulator_TopologicalSorter::sort received'
+                . ' an object that is not a Structures_Graph',
+                STRUCTURES_GRAPH_ERROR_GENERIC
+            );
+        }
+        if (!Structures_Graph_Manipulator_AcyclicTest::isAcyclic($graph)) {
+            return Pear::raiseError(
+                'Structures_Graph_Manipulator_TopologicalSorter::sort'
+                . ' received an graph that has cycles',
+                STRUCTURES_GRAPH_ERROR_GENERIC
+            );
+        }
 
         Structures_Graph_Manipulator_TopologicalSorter::_sort($graph);
         $result = array();
@@ -139,15 +160,17 @@ function sort(&$graph) {
         // Fill out result array
         $nodes =& $graph->getNodes();
         $nodeKeys = array_keys($nodes);
-        foreach($nodeKeys as $key) {
-            if (!array_key_exists($nodes[$key]->getMetadata('topological-sort-level'), $result)) $result[$nodes[$key]->getMetadata('topological-sort-level')] = array();
-            $result[$nodes[$key]->getMetadata('topological-sort-level')][] =& $nodes[$key];
+        foreach ($nodeKeys as $key) {
+            if (!array_key_exists($nodes[$key]->getMetadata('topological-sort-level'), $result)) {
+                $result[$nodes[$key]->getMetadata('topological-sort-level')]
+                    = array();
+            }
+            $result[$nodes[$key]->getMetadata('topological-sort-level')][]
+                =& $nodes[$key];
             $nodes[$key]->unsetMetadata('topological-sort-level');
         }
 
         return $result;
     }
-    /* }}} */
 }
-/* }}} */
 ?>
diff --git a/lib/vendor/PEAR/Structures/Graph/Node.php b/lib/vendor/PEAR/Structures/Graph/Node.php
index a2ea415e4..a4b917bb3 100644
--- a/lib/vendor/PEAR/Structures/Graph/Node.php
+++ b/lib/vendor/PEAR/Structures/Graph/Node.php
@@ -75,7 +75,7 @@ class Structures_Graph_Node {
     *
     * @access	public
     */
-    function Structures_Graph_Node() {
+    function __construct() {
     }
     /* }}} */
 
@@ -131,7 +131,7 @@ function &getData() {
     * @return	mixed	Data to store in node
     * @access	public
     */
-    function setData($data) {
+    function setData(&$data) {
         $this->_data =& $data;
     }
     /* }}} */
@@ -213,7 +213,7 @@ function unsetMetadata($key) {
     * @param    mixed   Data 
     * @access	public
     */
-    function setMetadata($key, $data) {
+    function setMetadata($key, &$data) {
         $this->_metadata[$key] =& $data;
     }
     /* }}} */
@@ -232,7 +232,7 @@ function _connectTo(&$destinationNode) {
     * 
     * If the graph is not directed, the reverse arc, connecting $destinationNode to $this is also created.
     *
-    * @param    Structures_Graph Node to connect to
+    * @param    Structures_Graph_Node Node to connect to
     * @access	public
     */
     function connectTo(&$destinationNode) {
@@ -272,6 +272,10 @@ function getNeighbours() {
     * @access	public
     */
     function connectsTo(&$target) {
+        if (version_compare(PHP_VERSION, '5.0.0') >= 0) {
+            return in_array($target, $this->getNeighbours(), true);
+        }
+
         $copy = $target;
         $arcKeys = array_keys($this->_arcs);
         foreach($arcKeys as $key) {

From 9e4d2b5b04273d75389f024a4c9ad6c6edd32062 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Wed, 15 Mar 2017 18:25:43 +0900
Subject: [PATCH 579/630] update Console_Getopt 1.4.1 (refs #4176)

PEAR depends on this package.
---
 lib/vendor/PEAR/Console/Getopt.php | 216 +++++++++++++++++++----------
 1 file changed, 143 insertions(+), 73 deletions(-)

diff --git a/lib/vendor/PEAR/Console/Getopt.php b/lib/vendor/PEAR/Console/Getopt.php
index bb9d69ca2..0da88585d 100644
--- a/lib/vendor/PEAR/Console/Getopt.php
+++ b/lib/vendor/PEAR/Console/Getopt.php
@@ -1,32 +1,40 @@
 <?php
 /* vim: set expandtab tabstop=4 shiftwidth=4: */
-// +----------------------------------------------------------------------+
-// | PHP Version 5                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available through the world-wide-web at the following url:           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Andrei Zmievski <andrei@php.net>                             |
-// +----------------------------------------------------------------------+
-//
-// $Id: Getopt.php,v 1.4 2007/06/12 14:58:56 cellog Exp $
+/**
+ * PHP Version 5
+ *
+ * Copyright (c) 1997-2004 The PHP Group
+ *
+ * This source file is subject to version 3.0 of the PHP license,
+ * that is bundled with this package in the file LICENSE, and is
+ * available through the world-wide-web at the following url:
+ * http://www.php.net/license/3_0.txt.
+ * If you did not receive a copy of the PHP license and are unable to
+ * obtain it through the world-wide-web, please send a note to
+ * license@php.net so we can mail you a copy immediately.
+ *
+ * @category Console
+ * @package  Console_Getopt
+ * @author   Andrei Zmievski <andrei@php.net>
+ * @license  http://www.php.net/license/3_0.txt PHP 3.0
+ * @version  CVS: $Id$
+ * @link     http://pear.php.net/package/Console_Getopt
+ */
 
 require_once 'PEAR.php';
 
 /**
  * Command-line options parsing class.
  *
- * @author Andrei Zmievski <andrei@php.net>
- *
+ * @category Console
+ * @package  Console_Getopt
+ * @author   Andrei Zmievski <andrei@php.net>
+ * @license  http://www.php.net/license/3_0.txt PHP 3.0
+ * @link     http://pear.php.net/package/Console_Getopt
  */
-class Console_Getopt {
+class Console_Getopt
+{
+
     /**
      * Parses the command-line options.
      *
@@ -53,45 +61,59 @@ class Console_Getopt {
      *
      * Most of the semantics of this function are based on GNU getopt_long().
      *
-     * @param array  $args           an array of command-line arguments
-     * @param string $short_options  specifies the list of allowed short options
-     * @param array  $long_options   specifies the list of allowed long options
+     * @param array  $args          an array of command-line arguments
+     * @param string $short_options specifies the list of allowed short options
+     * @param array  $long_options  specifies the list of allowed long options
+     * @param boolean $skip_unknown suppresses Console_Getopt: unrecognized option
      *
      * @return array two-element array containing the list of parsed options and
      * the non-option arguments
-     *
-     * @access public
-     *
      */
-    function getopt2($args, $short_options, $long_options = null)
+    public static function getopt2($args, $short_options, $long_options = null, $skip_unknown = false)
     {
-        return Console_Getopt::doGetopt(2, $args, $short_options, $long_options);
+        return Console_Getopt::doGetopt(2, $args, $short_options, $long_options, $skip_unknown);
     }
 
     /**
      * This function expects $args to start with the script name (POSIX-style).
      * Preserved for backwards compatibility.
+     *
+     * @param array  $args          an array of command-line arguments
+     * @param string $short_options specifies the list of allowed short options
+     * @param array  $long_options  specifies the list of allowed long options
+     *
      * @see getopt2()
-     */    
-    function getopt($args, $short_options, $long_options = null)
+     * @return array two-element array containing the list of parsed options and
+     * the non-option arguments
+     */
+    public static function getopt($args, $short_options, $long_options = null, $skip_unknown = false)
     {
-        return Console_Getopt::doGetopt(1, $args, $short_options, $long_options);
+        return Console_Getopt::doGetopt(1, $args, $short_options, $long_options, $skip_unknown);
     }
 
     /**
      * The actual implementation of the argument parsing code.
+     *
+     * @param int    $version       Version to use
+     * @param array  $args          an array of command-line arguments
+     * @param string $short_options specifies the list of allowed short options
+     * @param array  $long_options  specifies the list of allowed long options
+     * @param boolean $skip_unknown suppresses Console_Getopt: unrecognized option
+     *
+     * @return array
      */
-    function doGetopt($version, $args, $short_options, $long_options = null)
+    public static function doGetopt($version, $args, $short_options, $long_options = null, $skip_unknown = false)
     {
         // in case you pass directly readPHPArgv() as the first arg
         if (PEAR::isError($args)) {
             return $args;
         }
+
         if (empty($args)) {
             return array(array(), array());
         }
-        $opts     = array();
-        $non_opts = array();
+
+        $non_opts = $opts = array();
 
         settype($args, 'array');
 
@@ -111,7 +133,6 @@ function doGetopt($version, $args, $short_options, $long_options = null)
 
         reset($args);
         while (list($i, $arg) = each($args)) {
-
             /* The special element '--' means explicit end of
                options. Treat the rest of the arguments as non-options
                and end the loop. */
@@ -124,17 +145,27 @@ function doGetopt($version, $args, $short_options, $long_options = null)
                 $non_opts = array_merge($non_opts, array_slice($args, $i));
                 break;
             } elseif (strlen($arg) > 1 && $arg{1} == '-') {
-                $error = Console_Getopt::_parseLongOption(substr($arg, 2), $long_options, $opts, $args);
-                if (PEAR::isError($error))
+                $error = Console_Getopt::_parseLongOption(substr($arg, 2),
+                                                          $long_options,
+                                                          $opts,
+                                                          $args,
+                                                          $skip_unknown);
+                if (PEAR::isError($error)) {
                     return $error;
+                }
             } elseif ($arg == '-') {
                 // - is stdin
                 $non_opts = array_merge($non_opts, array_slice($args, $i));
                 break;
             } else {
-                $error = Console_Getopt::_parseShortOption(substr($arg, 1), $short_options, $opts, $args);
-                if (PEAR::isError($error))
+                $error = Console_Getopt::_parseShortOption(substr($arg, 1),
+                                                           $short_options,
+                                                           $opts,
+                                                           $args,
+                                                           $skip_unknown);
+                if (PEAR::isError($error)) {
                     return $error;
+                }
             }
         }
 
@@ -142,19 +173,30 @@ function doGetopt($version, $args, $short_options, $long_options = null)
     }
 
     /**
-     * @access private
+     * Parse short option
+     *
+     * @param string     $arg           Argument
+     * @param string[]   $short_options Available short options
+     * @param string[][] &$opts
+     * @param string[]   &$args
+     * @param boolean    $skip_unknown suppresses Console_Getopt: unrecognized option
      *
+     * @return void
      */
-    function _parseShortOption($arg, $short_options, &$opts, &$args)
+    protected static function _parseShortOption($arg, $short_options, &$opts, &$args, $skip_unknown)
     {
         for ($i = 0; $i < strlen($arg); $i++) {
-            $opt = $arg{$i};
+            $opt     = $arg{$i};
             $opt_arg = null;
 
             /* Try to find the short option in the specifier string. */
-            if (($spec = strstr($short_options, $opt)) === false || $arg{$i} == ':')
-            {
-                return PEAR::raiseError("Console_Getopt: unrecognized option -- $opt");
+            if (($spec = strstr($short_options, $opt)) === false || $arg{$i} == ':') {
+                if ($skip_unknown === true) {
+                    break;
+                }
+
+                $msg = "Console_Getopt: unrecognized option -- $opt";
+                return PEAR::raiseError($msg);
             }
 
             if (strlen($spec) > 1 && $spec{1} == ':') {
@@ -173,11 +215,14 @@ function _parseShortOption($arg, $short_options, &$opts, &$args)
                         break;
                     } else if (list(, $opt_arg) = each($args)) {
                         /* Else use the next argument. */;
-                        if (Console_Getopt::_isShortOpt($opt_arg) || Console_Getopt::_isLongOpt($opt_arg)) {
-                            return PEAR::raiseError("Console_Getopt: option requires an argument -- $opt");
+                        if (Console_Getopt::_isShortOpt($opt_arg)
+                            || Console_Getopt::_isLongOpt($opt_arg)) {
+                            $msg = "option requires an argument --$opt";
+                            return PEAR::raiseError("Console_Getopt: " . $msg);
                         }
                     } else {
-                        return PEAR::raiseError("Console_Getopt: option requires an argument -- $opt");
+                        $msg = "option requires an argument --$opt";
+                        return PEAR::raiseError("Console_Getopt: " . $msg);
                     }
                 }
             }
@@ -187,36 +232,51 @@ function _parseShortOption($arg, $short_options, &$opts, &$args)
     }
 
     /**
-     * @access private
+     * Checks if an argument is a short option
      *
+     * @param string $arg Argument to check
+     *
+     * @return bool
      */
-    function _isShortOpt($arg)
+    protected static function _isShortOpt($arg)
     {
-        return strlen($arg) == 2 && $arg[0] == '-' && preg_match('/[a-zA-Z]/', $arg[1]);
+        return strlen($arg) == 2 && $arg[0] == '-'
+               && preg_match('/[a-zA-Z]/', $arg[1]);
     }
 
     /**
-     * @access private
+     * Checks if an argument is a long option
+     *
+     * @param string $arg Argument to check
      *
+     * @return bool
      */
-    function _isLongOpt($arg)
+    protected static function _isLongOpt($arg)
     {
         return strlen($arg) > 2 && $arg[0] == '-' && $arg[1] == '-' &&
-            preg_match('/[a-zA-Z]+$/', substr($arg, 2));
+               preg_match('/[a-zA-Z]+$/', substr($arg, 2));
     }
 
     /**
-     * @access private
+     * Parse long option
+     *
+     * @param string     $arg          Argument
+     * @param string[]   $long_options Available long options
+     * @param string[][] &$opts
+     * @param string[]   &$args
      *
+     * @return void|PEAR_Error
      */
-    function _parseLongOption($arg, $long_options, &$opts, &$args)
+    protected static function _parseLongOption($arg, $long_options, &$opts, &$args, $skip_unknown)
     {
         @list($opt, $opt_arg) = explode('=', $arg, 2);
+
         $opt_len = strlen($opt);
 
         for ($i = 0; $i < count($long_options); $i++) {
             $long_opt  = $long_options[$i];
             $opt_start = substr($long_opt, 0, $opt_len);
+
             $long_opt_name = str_replace('=', '', $long_opt);
 
             /* Option doesn't match. Go on to the next one. */
@@ -224,7 +284,7 @@ function _parseLongOption($arg, $long_options, &$opts, &$args)
                 continue;
             }
 
-            $opt_rest  = substr($long_opt, $opt_len);
+            $opt_rest = substr($long_opt, $opt_len);
 
             /* Check that the options uniquely matches one of the allowed
                options. */
@@ -233,12 +293,15 @@ function _parseLongOption($arg, $long_options, &$opts, &$args)
             } else {
                 $next_option_rest = '';
             }
+
             if ($opt_rest != '' && $opt{0} != '=' &&
                 $i + 1 < count($long_options) &&
                 $opt == substr($long_options[$i+1], 0, $opt_len) &&
                 $next_option_rest != '' &&
                 $next_option_rest{0} != '=') {
-                return PEAR::raiseError("Console_Getopt: option --$opt is ambiguous");
+
+                $msg = "Console_Getopt: option --$opt is ambiguous";
+                return PEAR::raiseError($msg);
             }
 
             if (substr($long_opt, -1) == '=') {
@@ -246,37 +309,46 @@ function _parseLongOption($arg, $long_options, &$opts, &$args)
                     /* Long option requires an argument.
                        Take the next argument if one wasn't specified. */;
                     if (!strlen($opt_arg) && !(list(, $opt_arg) = each($args))) {
-                        return PEAR::raiseError("Console_Getopt: option --$opt requires an argument");
+                        $msg = "Console_Getopt: option requires an argument --$opt";
+                        return PEAR::raiseError($msg);
                     }
-                    if (Console_Getopt::_isShortOpt($opt_arg) || Console_Getopt::_isLongOpt($opt_arg)) {
-                        return PEAR::raiseError("Console_Getopt: option requires an argument --$opt");
+
+                    if (Console_Getopt::_isShortOpt($opt_arg)
+                        || Console_Getopt::_isLongOpt($opt_arg)) {
+                        $msg = "Console_Getopt: option requires an argument --$opt";
+                        return PEAR::raiseError($msg);
                     }
                 }
             } else if ($opt_arg) {
-                return PEAR::raiseError("Console_Getopt: option --$opt doesn't allow an argument");
+                $msg = "Console_Getopt: option --$opt doesn't allow an argument";
+                return PEAR::raiseError($msg);
             }
 
             $opts[] = array('--' . $opt, $opt_arg);
             return;
         }
 
+        if ($skip_unknown === true) {
+            return;
+        }
+
         return PEAR::raiseError("Console_Getopt: unrecognized option --$opt");
     }
 
     /**
-    * Safely read the $argv PHP array across different PHP configurations.
-    * Will take care on register_globals and register_argc_argv ini directives
-    *
-    * @access public
-    * @return mixed the $argv PHP array or PEAR error if not registered
-    */
-    function readPHPArgv()
+     * Safely read the $argv PHP array across different PHP configurations.
+     * Will take care on register_globals and register_argc_argv ini directives
+     *
+     * @return mixed the $argv PHP array or PEAR error if not registered
+     */
+    public static function readPHPArgv()
     {
         global $argv;
         if (!is_array($argv)) {
             if (!@is_array($_SERVER['argv'])) {
                 if (!@is_array($GLOBALS['HTTP_SERVER_VARS']['argv'])) {
-                    return PEAR::raiseError("Console_Getopt: Could not read cmd args (register_argc_argv=Off?)");
+                    $msg = "Could not read cmd args (register_argc_argv=Off?)";
+                    return PEAR::raiseError("Console_Getopt: " . $msg);
                 }
                 return $GLOBALS['HTTP_SERVER_VARS']['argv'];
             }
@@ -285,6 +357,4 @@ function readPHPArgv()
         return $argv;
     }
 
-}
-
-?>
+}
\ No newline at end of file

From c3b5048abbfe9dd509d17db58b4b44f691a8b8f5 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Wed, 15 Mar 2017 18:27:00 +0900
Subject: [PATCH 580/630] install XML_Util 1.4.2 (refs #4176)

PEAR depends on this package.
---
 lib/vendor/PEAR/XML/Util.php | 963 +++++++++++++++++++++++++++++++++++
 1 file changed, 963 insertions(+)
 create mode 100644 lib/vendor/PEAR/XML/Util.php

diff --git a/lib/vendor/PEAR/XML/Util.php b/lib/vendor/PEAR/XML/Util.php
new file mode 100644
index 000000000..4dedf74d0
--- /dev/null
+++ b/lib/vendor/PEAR/XML/Util.php
@@ -0,0 +1,963 @@
+<?php
+/**
+ * XML_Util
+ *
+ * XML Utilities package
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2003-2008 Stephan Schmidt <schst@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The name of the author may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category  XML
+ * @package   XML_Util
+ * @author    Stephan Schmidt <schst@php.net>
+ * @copyright 2003-2008 Stephan Schmidt <schst@php.net>
+ * @license   http://opensource.org/licenses/bsd-license New BSD License
+ * @version   CVS: $Id$
+ * @link      http://pear.php.net/package/XML_Util
+ */
+
+/**
+ * Error code for invalid chars in XML name
+ */
+define('XML_UTIL_ERROR_INVALID_CHARS', 51);
+
+/**
+ * Error code for invalid chars in XML name
+ */
+define('XML_UTIL_ERROR_INVALID_START', 52);
+
+/**
+ * Error code for non-scalar tag content
+ */
+define('XML_UTIL_ERROR_NON_SCALAR_CONTENT', 60);
+
+/**
+ * Error code for missing tag name
+ */
+define('XML_UTIL_ERROR_NO_TAG_NAME', 61);
+
+/**
+ * Replace XML entities
+ */
+define('XML_UTIL_REPLACE_ENTITIES', 1);
+
+/**
+ * Embedd content in a CData Section
+ */
+define('XML_UTIL_CDATA_SECTION', 5);
+
+/**
+ * Do not replace entitites
+ */
+define('XML_UTIL_ENTITIES_NONE', 0);
+
+/**
+ * Replace all XML entitites
+ * This setting will replace <, >, ", ' and &
+ */
+define('XML_UTIL_ENTITIES_XML', 1);
+
+/**
+ * Replace only required XML entitites
+ * This setting will replace <, " and &
+ */
+define('XML_UTIL_ENTITIES_XML_REQUIRED', 2);
+
+/**
+ * Replace HTML entitites
+ * @link http://www.php.net/htmlentities
+ */
+define('XML_UTIL_ENTITIES_HTML', 3);
+
+/**
+ * Do not collapse any empty tags.
+ */
+define('XML_UTIL_COLLAPSE_NONE', 0);
+
+/**
+ * Collapse all empty tags.
+ */
+define('XML_UTIL_COLLAPSE_ALL', 1);
+
+/**
+ * Collapse only empty XHTML tags that have no end tag.
+ */
+define('XML_UTIL_COLLAPSE_XHTML_ONLY', 2);
+
+/**
+ * Utility class for working with XML documents
+ *
+ * @category  XML
+ * @package   XML_Util
+ * @author    Stephan Schmidt <schst@php.net>
+ * @copyright 2003-2008 Stephan Schmidt <schst@php.net>
+ * @license   http://opensource.org/licenses/bsd-license New BSD License
+ * @version   Release: 1.4.2
+ * @link      http://pear.php.net/package/XML_Util
+ */
+class XML_Util
+{
+    /**
+     * Return API version
+     *
+     * @return string $version API version
+     */
+    public static function apiVersion()
+    {
+        return '1.4';
+    }
+
+    /**
+     * Replace XML entities
+     *
+     * With the optional second parameter, you may select, which
+     * entities should be replaced.
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // replace XML entites:
+     * $string = XML_Util::replaceEntities('This string contains < & >.');
+     * </code>
+     *
+     * With the optional third parameter, you may pass the character encoding
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // replace XML entites in UTF-8:
+     * $string = XML_Util::replaceEntities(
+     *     'This string contains < & > as well as ä, ö, ß, à and ê',
+     *     XML_UTIL_ENTITIES_HTML,
+     *     'UTF-8'
+     * );
+     * </code>
+     *
+     * @param string $string          string where XML special chars
+     *                                should be replaced
+     * @param int    $replaceEntities setting for entities in attribute values
+     *                                (one of XML_UTIL_ENTITIES_XML,
+     *                                XML_UTIL_ENTITIES_XML_REQUIRED,
+     *                                XML_UTIL_ENTITIES_HTML)
+     * @param string $encoding        encoding value (if any)...
+     *                                must be a valid encoding as determined
+     *                                by the htmlentities() function
+     *
+     * @return string string with replaced chars
+     * @see    reverseEntities()
+     */
+    public static function replaceEntities(
+        $string, $replaceEntities = XML_UTIL_ENTITIES_XML, $encoding = 'ISO-8859-1'
+    ) {
+        switch ($replaceEntities) {
+        case XML_UTIL_ENTITIES_XML:
+            return strtr(
+                $string,
+                array(
+                    '&'  => '&amp;',
+                    '>'  => '&gt;',
+                    '<'  => '&lt;',
+                    '"'  => '&quot;',
+                    '\'' => '&apos;'
+                )
+            );
+            break;
+        case XML_UTIL_ENTITIES_XML_REQUIRED:
+            return strtr(
+                $string,
+                array(
+                    '&' => '&amp;',
+                    '<' => '&lt;',
+                    '"' => '&quot;'
+                )
+            );
+            break;
+        case XML_UTIL_ENTITIES_HTML:
+            return htmlentities($string, ENT_COMPAT, $encoding);
+            break;
+        }
+        return $string;
+    }
+
+    /**
+     * Reverse XML entities
+     *
+     * With the optional second parameter, you may select, which
+     * entities should be reversed.
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // reverse XML entites:
+     * $string = XML_Util::reverseEntities('This string contains &lt; &amp; &gt;.');
+     * </code>
+     *
+     * With the optional third parameter, you may pass the character encoding
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // reverse XML entites in UTF-8:
+     * $string = XML_Util::reverseEntities(
+     *     'This string contains &lt; &amp; &gt; as well as'
+     *     . ' &auml;, &ouml;, &szlig;, &agrave; and &ecirc;',
+     *     XML_UTIL_ENTITIES_HTML,
+     *     'UTF-8'
+     * );
+     * </code>
+     *
+     * @param string $string          string where XML special chars
+     *                                should be replaced
+     * @param int    $replaceEntities setting for entities in attribute values
+     *                                (one of XML_UTIL_ENTITIES_XML,
+     *                                XML_UTIL_ENTITIES_XML_REQUIRED,
+     *                                XML_UTIL_ENTITIES_HTML)
+     * @param string $encoding        encoding value (if any)...
+     *                                must be a valid encoding as determined
+     *                                by the html_entity_decode() function
+     *
+     * @return string string with replaced chars
+     * @see    replaceEntities()
+     */
+    public static function reverseEntities(
+        $string, $replaceEntities = XML_UTIL_ENTITIES_XML, $encoding = 'ISO-8859-1'
+    ) {
+        switch ($replaceEntities) {
+        case XML_UTIL_ENTITIES_XML:
+            return strtr(
+                $string,
+                array(
+                    '&amp;'  => '&',
+                    '&gt;'   => '>',
+                    '&lt;'   => '<',
+                    '&quot;' => '"',
+                    '&apos;' => '\''
+                )
+            );
+            break;
+        case XML_UTIL_ENTITIES_XML_REQUIRED:
+            return strtr(
+                $string,
+                array(
+                    '&amp;'  => '&',
+                    '&lt;'   => '<',
+                    '&quot;' => '"'
+                )
+            );
+            break;
+        case XML_UTIL_ENTITIES_HTML:
+            return html_entity_decode($string, ENT_COMPAT, $encoding);
+            break;
+        }
+        return $string;
+    }
+
+    /**
+     * Build an xml declaration
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // get an XML declaration:
+     * $xmlDecl = XML_Util::getXMLDeclaration('1.0', 'UTF-8', true);
+     * </code>
+     *
+     * @param string $version    xml version
+     * @param string $encoding   character encoding
+     * @param bool   $standalone document is standalone (or not)
+     *
+     * @return string xml declaration
+     * @uses   attributesToString() to serialize the attributes of the
+     *         XML declaration
+     */
+    public static function getXMLDeclaration(
+        $version = '1.0', $encoding = null, $standalone = null
+    ) {
+        $attributes = array(
+            'version' => $version,
+        );
+        // add encoding
+        if ($encoding !== null) {
+            $attributes['encoding'] = $encoding;
+        }
+        // add standalone, if specified
+        if ($standalone !== null) {
+            $attributes['standalone'] = $standalone ? 'yes' : 'no';
+        }
+
+        return sprintf(
+            '<?xml%s?>',
+            XML_Util::attributesToString($attributes, false)
+        );
+    }
+
+    /**
+     * Build a document type declaration
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // get a doctype declaration:
+     * $xmlDecl = XML_Util::getDocTypeDeclaration('rootTag','myDocType.dtd');
+     * </code>
+     *
+     * @param string $root        name of the root tag
+     * @param string $uri         uri of the doctype definition
+     *                            (or array with uri and public id)
+     * @param string $internalDtd internal dtd entries
+     *
+     * @return string doctype declaration
+     * @since  0.2
+     */
+    public static function getDocTypeDeclaration(
+        $root, $uri = null, $internalDtd = null
+    ) {
+        if (is_array($uri)) {
+            $ref = sprintf(' PUBLIC "%s" "%s"', $uri['id'], $uri['uri']);
+        } elseif (!empty($uri)) {
+            $ref = sprintf(' SYSTEM "%s"', $uri);
+        } else {
+            $ref = '';
+        }
+
+        if (empty($internalDtd)) {
+            return sprintf('<!DOCTYPE %s%s>', $root, $ref);
+        } else {
+            return sprintf("<!DOCTYPE %s%s [\n%s\n]>", $root, $ref, $internalDtd);
+        }
+    }
+
+    /**
+     * Create string representation of an attribute list
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // build an attribute string
+     * $att = array(
+     *              'foo'   =>  'bar',
+     *              'argh'  =>  'tomato'
+     *            );
+     *
+     * $attList = XML_Util::attributesToString($att);
+     * </code>
+     *
+     * @param array      $attributes attribute array
+     * @param bool|array $sort       sort attribute list alphabetically,
+     *                               may also be an assoc array containing
+     *                               the keys 'sort', 'multiline', 'indent',
+     *                               'linebreak' and 'entities'
+     * @param bool       $multiline  use linebreaks, if more than
+     *                               one attribute is given
+     * @param string     $indent     string used for indentation of
+     *                               multiline attributes
+     * @param string     $linebreak  string used for linebreaks of
+     *                               multiline attributes
+     * @param int        $entities   setting for entities in attribute values
+     *                               (one of XML_UTIL_ENTITIES_NONE,
+     *                               XML_UTIL_ENTITIES_XML,
+     *                               XML_UTIL_ENTITIES_XML_REQUIRED,
+     *                               XML_UTIL_ENTITIES_HTML)
+     *
+     * @return string string representation of the attributes
+     * @uses   replaceEntities() to replace XML entities in attribute values
+     * @todo   allow sort also to be an options array
+     */
+    public static function attributesToString(
+        $attributes, $sort = true, $multiline = false,
+        $indent = '    ', $linebreak = "\n", $entities = XML_UTIL_ENTITIES_XML
+    ) {
+        /*
+         * second parameter may be an array
+         */
+        if (is_array($sort)) {
+            if (isset($sort['multiline'])) {
+                $multiline = $sort['multiline'];
+            }
+            if (isset($sort['indent'])) {
+                $indent = $sort['indent'];
+            }
+            if (isset($sort['linebreak'])) {
+                $multiline = $sort['linebreak'];
+            }
+            if (isset($sort['entities'])) {
+                $entities = $sort['entities'];
+            }
+            if (isset($sort['sort'])) {
+                $sort = $sort['sort'];
+            } else {
+                $sort = true;
+            }
+        }
+        $string = '';
+        if (is_array($attributes) && !empty($attributes)) {
+            if ($sort) {
+                ksort($attributes);
+            }
+            if (!$multiline || count($attributes) == 1) {
+                foreach ($attributes as $key => $value) {
+                    if ($entities != XML_UTIL_ENTITIES_NONE) {
+                        if ($entities === XML_UTIL_CDATA_SECTION) {
+                            $entities = XML_UTIL_ENTITIES_XML;
+                        }
+                        $value = XML_Util::replaceEntities($value, $entities);
+                    }
+                    $string .= ' ' . $key . '="' . $value . '"';
+                }
+            } else {
+                $first = true;
+                foreach ($attributes as $key => $value) {
+                    if ($entities != XML_UTIL_ENTITIES_NONE) {
+                        $value = XML_Util::replaceEntities($value, $entities);
+                    }
+                    if ($first) {
+                        $string .= ' ' . $key . '="' . $value . '"';
+                        $first   = false;
+                    } else {
+                        $string .= $linebreak . $indent . $key . '="' . $value . '"';
+                    }
+                }
+            }
+        }
+        return $string;
+    }
+
+    /**
+     * Collapses empty tags.
+     *
+     * @param string $xml  XML
+     * @param int    $mode Whether to collapse all empty tags (XML_UTIL_COLLAPSE_ALL)
+     *                      or only XHTML (XML_UTIL_COLLAPSE_XHTML_ONLY) ones.
+     *
+     * @return string XML
+     */
+    public static function collapseEmptyTags($xml, $mode = XML_UTIL_COLLAPSE_ALL)
+    {
+        if (preg_match('~<([^>])+/>~s', $xml, $matches)) {
+            // it's already an empty tag
+            return $xml;
+        }
+        switch ($mode) {
+            case XML_UTIL_COLLAPSE_ALL:
+                $preg1 =
+                    '~<' .
+                        '(?:' .
+                            '(https?://[^:\s]+:\w+)' .  // <http://foo.com:bar  ($1)
+                            '|(\w+:\w+)' .              // <foo:bar             ($2)
+                            '|(\w+)' .                  // <foo                 ($3)
+                        ')+' .
+                        '([^>]*)' .                     // attributes           ($4)
+                    '>' .
+                    '<\/(\1|\2|\3)>' .                  // 1, 2, or 3 again     ($5)
+                    '~s'
+                ;
+                $preg2 =
+                    '<' .
+                        '${1}${2}${3}' .    // tag (only one should have been populated)
+                        '${4}' .            // attributes
+                    ' />'
+                ;
+                return (preg_replace($preg1, $preg2, $xml)?:$xml);
+                break;
+            case XML_UTIL_COLLAPSE_XHTML_ONLY:
+                return (
+                    preg_replace(
+                        '/<(area|base(?:font)?|br|col|frame|hr|img|input|isindex|link|meta|'
+                        . 'param)([^>]*)><\/\\1>/s',
+                        '<\\1\\2 />',
+                        $xml
+                    ) ?: $xml
+                );
+                break;
+            case XML_UTIL_COLLAPSE_NONE:
+                // fall thru
+            default:
+                return $xml;
+        }
+    }
+
+    /**
+     * Create a tag
+     *
+     * This method will call XML_Util::createTagFromArray(), which
+     * is more flexible.
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // create an XML tag:
+     * $tag = XML_Util::createTag('myNs:myTag',
+     *     array('foo' => 'bar'),
+     *     'This is inside the tag',
+     *     'http://www.w3c.org/myNs#');
+     * </code>
+     *
+     * @param string $qname           qualified tagname (including namespace)
+     * @param array  $attributes      array containg attributes
+     * @param mixed  $content         the content
+     * @param string $namespaceUri    URI of the namespace
+     * @param int    $replaceEntities whether to replace XML special chars in
+     *                                content, embedd it in a CData section
+     *                                or none of both
+     * @param bool   $multiline       whether to create a multiline tag where
+     *                                each attribute gets written to a single line
+     * @param string $indent          string used to indent attributes
+     *                                (_auto indents attributes so they start
+     *                                at the same column)
+     * @param string $linebreak       string used for linebreaks
+     * @param bool   $sortAttributes  Whether to sort the attributes or not
+     * @param int    $collapseTagMode How to handle a content-less, and thus collapseable, tag
+     *
+     * @return string XML tag
+     * @see    createTagFromArray()
+     * @uses   createTagFromArray() to create the tag
+     */
+    public static function createTag(
+        $qname, $attributes = array(), $content = null,
+        $namespaceUri = null, $replaceEntities = XML_UTIL_REPLACE_ENTITIES,
+        $multiline = false, $indent = '_auto', $linebreak = "\n",
+        $sortAttributes = true, $collapseTagMode = XML_UTIL_COLLAPSE_ALL
+    ) {
+        $tag = array(
+            'qname'      => $qname,
+            'attributes' => $attributes
+        );
+
+        // add tag content
+        if ($content !== null) {
+            $tag['content'] = $content;
+        }
+
+        // add namespace Uri
+        if ($namespaceUri !== null) {
+            $tag['namespaceUri'] = $namespaceUri;
+        }
+
+        return XML_Util::createTagFromArray(
+            $tag, $replaceEntities, $multiline,
+            $indent, $linebreak, $sortAttributes,
+            $collapseTagMode
+        );
+    }
+
+    /**
+     * Create a tag from an array.
+     * This method awaits an array in the following format
+     * <pre>
+     * array(
+     *     // qualified name of the tag
+     *     'qname' => $qname
+     *
+     *     // namespace prefix (optional, if qname is specified or no namespace)
+     *     'namespace' => $namespace
+     *
+     *     // local part of the tagname (optional, if qname is specified)
+     *     'localpart' => $localpart,
+     *
+     *     // array containing all attributes (optional)
+     *     'attributes' => array(),
+     *
+     *     // tag content (optional)
+     *     'content' => $content,
+     *
+     *     // namespaceUri for the given namespace (optional)
+     *     'namespaceUri' => $namespaceUri
+     * )
+     * </pre>
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * $tag = array(
+     *     'qname'        => 'foo:bar',
+     *     'namespaceUri' => 'http://foo.com',
+     *     'attributes'   => array('key' => 'value', 'argh' => 'fruit&vegetable'),
+     *     'content'      => 'I\'m inside the tag',
+     * );
+     * // creating a tag with qualified name and namespaceUri
+     * $string = XML_Util::createTagFromArray($tag);
+     * </code>
+     *
+     * @param array  $tag             tag definition
+     * @param int    $replaceEntities whether to replace XML special chars in
+     *                                content, embedd it in a CData section
+     *                                or none of both
+     * @param bool   $multiline       whether to create a multiline tag where each
+     *                                attribute gets written to a single line
+     * @param string $indent          string used to indent attributes
+     *                                (_auto indents attributes so they start
+     *                                at the same column)
+     * @param string $linebreak       string used for linebreaks
+     * @param bool   $sortAttributes  Whether to sort the attributes or not
+     * @param int    $collapseTagMode How to handle a content-less, and thus collapseable, tag
+     *
+     * @return string XML tag
+     *
+     * @see  createTag()
+     * @uses attributesToString() to serialize the attributes of the tag
+     * @uses splitQualifiedName() to get local part and namespace of a qualified name
+     * @uses createCDataSection()
+     * @uses collapseEmptyTags()
+     * @uses raiseError()
+     */
+    public static function createTagFromArray(
+        $tag, $replaceEntities = XML_UTIL_REPLACE_ENTITIES,
+        $multiline = false, $indent = '_auto', $linebreak = "\n",
+        $sortAttributes = true, $collapseTagMode = XML_UTIL_COLLAPSE_ALL
+    ) {
+        if (isset($tag['content']) && !is_scalar($tag['content'])) {
+            return XML_Util::raiseError(
+                'Supplied non-scalar value as tag content',
+                XML_UTIL_ERROR_NON_SCALAR_CONTENT
+            );
+        }
+
+        if (!isset($tag['qname']) && !isset($tag['localPart'])) {
+            return XML_Util::raiseError(
+                'You must either supply a qualified name '
+                . '(qname) or local tag name (localPart).',
+                XML_UTIL_ERROR_NO_TAG_NAME
+            );
+        }
+
+        // if no attributes hav been set, use empty attributes
+        if (!isset($tag['attributes']) || !is_array($tag['attributes'])) {
+            $tag['attributes'] = array();
+        }
+
+        if (isset($tag['namespaces'])) {
+            foreach ($tag['namespaces'] as $ns => $uri) {
+                $tag['attributes']['xmlns:' . $ns] = $uri;
+            }
+        }
+
+        if (!isset($tag['qname'])) {
+            // qualified name is not given
+
+            // check for namespace
+            if (isset($tag['namespace']) && !empty($tag['namespace'])) {
+                $tag['qname'] = $tag['namespace'] . ':' . $tag['localPart'];
+            } else {
+                $tag['qname'] = $tag['localPart'];
+            }
+        } elseif (isset($tag['namespaceUri']) && !isset($tag['namespace'])) {
+            // namespace URI is set, but no namespace
+
+            $parts = XML_Util::splitQualifiedName($tag['qname']);
+
+            $tag['localPart'] = $parts['localPart'];
+            if (isset($parts['namespace'])) {
+                $tag['namespace'] = $parts['namespace'];
+            }
+        }
+
+        if (isset($tag['namespaceUri']) && !empty($tag['namespaceUri'])) {
+            // is a namespace given
+            if (isset($tag['namespace']) && !empty($tag['namespace'])) {
+                $tag['attributes']['xmlns:' . $tag['namespace']]
+                    = $tag['namespaceUri'];
+            } else {
+                // define this Uri as the default namespace
+                $tag['attributes']['xmlns'] = $tag['namespaceUri'];
+            }
+        }
+
+        if (!array_key_exists('content', $tag)) {
+            $tag['content'] = '';
+        }
+
+        // check for multiline attributes
+        if ($multiline === true) {
+            if ($indent === '_auto') {
+                $indent = str_repeat(' ', (strlen($tag['qname'])+2));
+            }
+        }
+
+        // create attribute list
+        $attList = XML_Util::attributesToString(
+            $tag['attributes'],
+            $sortAttributes, $multiline, $indent, $linebreak
+        );
+
+        switch ($replaceEntities) {
+        case XML_UTIL_ENTITIES_NONE:
+            break;
+        case XML_UTIL_CDATA_SECTION:
+            $tag['content'] = XML_Util::createCDataSection($tag['content']);
+            break;
+        default:
+            $tag['content'] = XML_Util::replaceEntities(
+                $tag['content'], $replaceEntities
+            );
+            break;
+        }
+        $tag = sprintf(
+            '<%s%s>%s</%s>', $tag['qname'], $attList, $tag['content'],
+            $tag['qname']
+        );
+
+        return self::collapseEmptyTags($tag, $collapseTagMode);
+    }
+
+    /**
+     * Create a start element
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // create an XML start element:
+     * $tag = XML_Util::createStartElement('myNs:myTag',
+     *     array('foo' => 'bar') ,'http://www.w3c.org/myNs#');
+     * </code>
+     *
+     * @param string $qname          qualified tagname (including namespace)
+     * @param array  $attributes     array containg attributes
+     * @param string $namespaceUri   URI of the namespace
+     * @param bool   $multiline      whether to create a multiline tag where each
+     *                               attribute gets written to a single line
+     * @param string $indent         string used to indent attributes (_auto indents
+     *                               attributes so they start at the same column)
+     * @param string $linebreak      string used for linebreaks
+     * @param bool   $sortAttributes Whether to sort the attributes or not
+     *
+     * @return string XML start element
+     * @see    createEndElement(), createTag()
+     */
+    public static function createStartElement(
+        $qname, $attributes = array(), $namespaceUri = null,
+        $multiline = false, $indent = '_auto', $linebreak = "\n",
+        $sortAttributes = true
+    ) {
+        // if no attributes hav been set, use empty attributes
+        if (!isset($attributes) || !is_array($attributes)) {
+            $attributes = array();
+        }
+
+        if ($namespaceUri != null) {
+            $parts = XML_Util::splitQualifiedName($qname);
+        }
+
+        // check for multiline attributes
+        if ($multiline === true) {
+            if ($indent === '_auto') {
+                $indent = str_repeat(' ', (strlen($qname)+2));
+            }
+        }
+
+        if ($namespaceUri != null) {
+            // is a namespace given
+            if (isset($parts['namespace']) && !empty($parts['namespace'])) {
+                $attributes['xmlns:' . $parts['namespace']] = $namespaceUri;
+            } else {
+                // define this Uri as the default namespace
+                $attributes['xmlns'] = $namespaceUri;
+            }
+        }
+
+        // create attribute list
+        $attList = XML_Util::attributesToString(
+            $attributes, $sortAttributes,
+            $multiline, $indent, $linebreak
+        );
+        $element = sprintf('<%s%s>', $qname, $attList);
+        return  $element;
+    }
+
+    /**
+     * Create an end element
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // create an XML start element:
+     * $tag = XML_Util::createEndElement('myNs:myTag');
+     * </code>
+     *
+     * @param string $qname qualified tagname (including namespace)
+     *
+     * @return string XML end element
+     * @see    createStartElement(), createTag()
+     */
+    public static function createEndElement($qname)
+    {
+        $element = sprintf('</%s>', $qname);
+        return $element;
+    }
+
+    /**
+     * Create an XML comment
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // create an XML start element:
+     * $tag = XML_Util::createComment('I am a comment');
+     * </code>
+     *
+     * @param string $content content of the comment
+     *
+     * @return string XML comment
+     */
+    public static function createComment($content)
+    {
+        $comment = sprintf('<!-- %s -->', $content);
+        return $comment;
+    }
+
+    /**
+     * Create a CData section
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // create a CData section
+     * $tag = XML_Util::createCDataSection('I am content.');
+     * </code>
+     *
+     * @param string $data data of the CData section
+     *
+     * @return string CData section with content
+     */
+    public static function createCDataSection($data)
+    {
+        return sprintf(
+            '<![CDATA[%s]]>',
+            preg_replace('/\]\]>/', ']]]]><![CDATA[>', strval($data))
+        );
+    }
+
+    /**
+     * Split qualified name and return namespace and local part
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // split qualified tag
+     * $parts = XML_Util::splitQualifiedName('xslt:stylesheet');
+     * </code>
+     * the returned array will contain two elements:
+     * <pre>
+     * array(
+     *     'namespace' => 'xslt',
+     *     'localPart' => 'stylesheet'
+     * );
+     * </pre>
+     *
+     * @param string $qname     qualified tag name
+     * @param string $defaultNs default namespace (optional)
+     *
+     * @return array array containing namespace and local part
+     */
+    public static function splitQualifiedName($qname, $defaultNs = null)
+    {
+        if (strstr($qname, ':')) {
+            $tmp = explode(':', $qname);
+            return array(
+                'namespace' => $tmp[0],
+                'localPart' => $tmp[1]
+            );
+        }
+        return array(
+            'namespace' => $defaultNs,
+            'localPart' => $qname
+        );
+    }
+
+    /**
+     * Check, whether string is valid XML name
+     *
+     * <p>XML names are used for tagname, attribute names and various
+     * other, lesser known entities.</p>
+     * <p>An XML name may only consist of alphanumeric characters,
+     * dashes, undescores and periods, and has to start with a letter
+     * or an underscore.</p>
+     *
+     * <code>
+     * require_once 'XML/Util.php';
+     *
+     * // verify tag name
+     * $result = XML_Util::isValidName('invalidTag?');
+     * if (is_a($result, 'PEAR_Error')) {
+     *    print 'Invalid XML name: ' . $result->getMessage();
+     * }
+     * </code>
+     *
+     * @param string $string string that should be checked
+     *
+     * @return mixed true, if string is a valid XML name, PEAR error otherwise
+     *
+     * @todo support for other charsets
+     * @todo PEAR CS - unable to avoid 85-char limit on second preg_match
+     */
+    public static function isValidName($string)
+    {
+        // check for invalid chars
+        if (!preg_match('/^[[:alpha:]_]\\z/', $string{0})) {
+            return XML_Util::raiseError(
+                'XML names may only start with letter or underscore',
+                XML_UTIL_ERROR_INVALID_START
+            );
+        }
+
+        // check for invalid chars
+        $match = preg_match(
+            '/^([[:alpha:]_]([[:alnum:]\-\.]*)?:)?'
+            . '[[:alpha:]_]([[:alnum:]\_\-\.]+)?\\z/',
+            $string
+        );
+        if (!$match) {
+            return XML_Util::raiseError(
+                'XML names may only contain alphanumeric '
+                . 'chars, period, hyphen, colon and underscores',
+                XML_UTIL_ERROR_INVALID_CHARS
+            );
+        }
+        // XML name is valid
+        return true;
+    }
+
+    /**
+     * Replacement for XML_Util::raiseError
+     *
+     * Avoids the necessity to always require
+     * PEAR.php
+     *
+     * @param string $msg  error message
+     * @param int    $code error code
+     *
+     * @return PEAR_Error
+     * @todo   PEAR CS - should this use include_once instead?
+     */
+    public static function raiseError($msg, $code)
+    {
+        include_once 'PEAR.php';
+        return PEAR::raiseError($msg, $code);
+    }
+}
+?>

From 236171e41b77e6593b614f2698ce7d167e99c7a1 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Wed, 15 Mar 2017 18:01:16 +0900
Subject: [PATCH 581/630] update PEAR_PackageFileManager2 1.0.4 (refs #4176)

---
 lib/vendor/PEAR/PEAR/PackageFileManager.php  | 1764 ------------------
 lib/vendor/PEAR/PEAR/PackageFileManager2.php | 1015 +++++-----
 2 files changed, 475 insertions(+), 2304 deletions(-)
 delete mode 100644 lib/vendor/PEAR/PEAR/PackageFileManager.php

diff --git a/lib/vendor/PEAR/PEAR/PackageFileManager.php b/lib/vendor/PEAR/PEAR/PackageFileManager.php
deleted file mode 100644
index 95c9534ae..000000000
--- a/lib/vendor/PEAR/PEAR/PackageFileManager.php
+++ /dev/null
@@ -1,1764 +0,0 @@
-<?php
-/**
- * PEAR_PackageFileManager is designed to create and manipulate
- * package.xml version 1.0 only.
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category  PEAR
- * @package   PEAR_PackageFileManager
- * @author    Greg Beaver <cellog@php.net>
- * @copyright 2003-2007 The PHP Group
- * @license   http://www.php.net/license/3_01.txt  PHP License 3.01
- * @version   CVS: $Id: PackageFileManager.php,v 1.59 2007/11/19 22:10:41 farell Exp $
- * @link      http://pear.php.net/package/PEAR_PackageFileManager
- * @since     File available since Release 0.1
- */
-
-/**
- * PEAR installer
- */
-require_once 'PEAR/Common.php';
-/**#@+
- * Error Codes
- */
-define('PEAR_PACKAGEFILEMANAGER_NOSTATE', 1);
-define('PEAR_PACKAGEFILEMANAGER_NOVERSION', 2);
-define('PEAR_PACKAGEFILEMANAGER_NOPKGDIR', 3);
-define('PEAR_PACKAGEFILEMANAGER_NOBASEDIR', 4);
-define('PEAR_PACKAGEFILEMANAGER_GENERATOR_NOTFOUND', 5);
-define('PEAR_PACKAGEFILEMANAGER_GENERATOR_NOTFOUND_ANYWHERE', 6);
-define('PEAR_PACKAGEFILEMANAGER_CANTWRITE_PKGFILE', 7);
-define('PEAR_PACKAGEFILEMANAGER_DEST_UNWRITABLE', 8);
-define('PEAR_PACKAGEFILEMANAGER_CANTCOPY_PKGFILE', 9);
-define('PEAR_PACKAGEFILEMANAGER_CANTOPEN_TMPPKGFILE', 10);
-define('PEAR_PACKAGEFILEMANAGER_PATH_DOESNT_EXIST', 11);
-define('PEAR_PACKAGEFILEMANAGER_NOCVSENTRIES', 12);
-define('PEAR_PACKAGEFILEMANAGER_DIR_DOESNT_EXIST', 13);
-define('PEAR_PACKAGEFILEMANAGER_RUN_SETOPTIONS', 14);
-define('PEAR_PACKAGEFILEMANAGER_NOPACKAGE', 15);
-define('PEAR_PACKAGEFILEMANAGER_WRONG_MROLE', 16);
-define('PEAR_PACKAGEFILEMANAGER_NOSUMMARY', 17);
-define('PEAR_PACKAGEFILEMANAGER_NODESC', 18);
-define('PEAR_PACKAGEFILEMANAGER_ADD_MAINTAINERS', 19);
-define('PEAR_PACKAGEFILEMANAGER_NO_FILES', 20);
-define('PEAR_PACKAGEFILEMANAGER_IGNORED_EVERYTHING', 21);
-define('PEAR_PACKAGEFILEMANAGER_INVALID_PACKAGE', 22);
-define('PEAR_PACKAGEFILEMANAGER_INVALID_REPLACETYPE', 23);
-define('PEAR_PACKAGEFILEMANAGER_INVALID_ROLE', 24);
-define('PEAR_PACKAGEFILEMANAGER_PHP_NOT_PACKAGE', 25);
-define('PEAR_PACKAGEFILEMANAGER_CVS_PACKAGED', 26);
-define('PEAR_PACKAGEFILEMANAGER_NO_PHPCOMPATINFO', 27);
-define('PEAR_PACKAGEFILEMANAGER_NONOTES', 28);
-define('PEAR_PACKAGEFILEMANAGER_NOLICENSE', 29);
-/**#@-*/
-/**
- * Error messages
- * @global array $GLOBALS['_PEAR_PACKAGEFILEMANAGER_ERRORS']
- */
-$GLOBALS['_PEAR_PACKAGEFILEMANAGER_ERRORS'] =
-array(
-    'en' =>
-    array(
-        PEAR_PACKAGEFILEMANAGER_NOSTATE =>
-            'Release State (option \'state\') must by specified in PEAR_PackageFileManager ' .
-            'setOptions (snapshot|devel|alpha|beta|stable)',
-        PEAR_PACKAGEFILEMANAGER_NOVERSION =>
-            'Release Version (option \'version\') must be specified in PEAR_PackageFileManager setOptions',
-        PEAR_PACKAGEFILEMANAGER_NOPKGDIR =>
-            'Package source base directory (option \'packagedirectory\') must be ' .
-            'specified in PEAR_PackageFileManager setOptions',
-        PEAR_PACKAGEFILEMANAGER_NOBASEDIR =>
-            'Package install base directory (option \'baseinstalldir\') must be ' .
-            'specified in PEAR_PackageFileManager setOptions',
-        PEAR_PACKAGEFILEMANAGER_GENERATOR_NOTFOUND =>
-            'Base class "%s" can\'t be located',
-        PEAR_PACKAGEFILEMANAGER_GENERATOR_NOTFOUND_ANYWHERE =>
-            'Base class "%s" can\'t be located in default or user-specified directories',
-        PEAR_PACKAGEFILEMANAGER_CANTWRITE_PKGFILE =>
-            'Failed to write package.xml file to destination directory',
-        PEAR_PACKAGEFILEMANAGER_DEST_UNWRITABLE =>
-            'Destination directory "%s" is unwritable',
-        PEAR_PACKAGEFILEMANAGER_CANTCOPY_PKGFILE =>
-            'Failed to copy package.xml.tmp file to package.xml',
-        PEAR_PACKAGEFILEMANAGER_CANTOPEN_TMPPKGFILE =>
-            'Failed to open temporary file "%s" for writing',
-        PEAR_PACKAGEFILEMANAGER_PATH_DOESNT_EXIST =>
-            'package.xml file path "%s" doesn\'t exist or isn\'t a directory',
-        PEAR_PACKAGEFILEMANAGER_NOCVSENTRIES =>
-            'Directory "%s" is not a CVS directory (it must have the CVS/Entries file)',
-        PEAR_PACKAGEFILEMANAGER_DIR_DOESNT_EXIST =>
-            'Package source base directory "%s" doesn\'t exist or isn\'t a directory',
-        PEAR_PACKAGEFILEMANAGER_RUN_SETOPTIONS =>
-            'Run $managerclass->setOptions() before any other methods',
-        PEAR_PACKAGEFILEMANAGER_NOPACKAGE =>
-            'Package Name (option \'package\') must by specified in PEAR_PackageFileManager '.
-            'setOptions to create a new package.xml',
-        PEAR_PACKAGEFILEMANAGER_NOSUMMARY =>
-            'Package Summary (option \'summary\') must by specified in PEAR_PackageFileManager' .
-            ' setOptions to create a new package.xml',
-        PEAR_PACKAGEFILEMANAGER_NODESC =>
-            'Detailed Package Description (option \'description\') must be' .
-            ' specified in PEAR_PackageFileManager setOptions to create a new package.xml',
-        PEAR_PACKAGEFILEMANAGER_WRONG_MROLE =>
-            'Maintainer role must be one of "%s", was "%s"',
-        PEAR_PACKAGEFILEMANAGER_ADD_MAINTAINERS =>
-            'Add maintainers to a package before generating the package.xml',
-        PEAR_PACKAGEFILEMANAGER_NO_FILES =>
-            'No files found, check the path "%s"',
-        PEAR_PACKAGEFILEMANAGER_IGNORED_EVERYTHING =>
-            'No files left, check the path "%s" and ignore option "%s"',
-        PEAR_PACKAGEFILEMANAGER_INVALID_PACKAGE =>
-            'Package validation failed:%s%s',
-        PEAR_PACKAGEFILEMANAGER_INVALID_REPLACETYPE =>
-            'Replacement Type must be one of "%s", was passed "%s"',
-        PEAR_PACKAGEFILEMANAGER_INVALID_ROLE =>
-            'Invalid file role passed to addRole, must be one of "%s", was passed "%s"',
-        PEAR_PACKAGEFILEMANAGER_PHP_NOT_PACKAGE =>
-            'addDependency had PHP as a package, use type="php"',
-        PEAR_PACKAGEFILEMANAGER_CVS_PACKAGED =>
-            'path "%path%" contains CVS directory',
-        PEAR_PACKAGEFILEMANAGER_NO_PHPCOMPATINFO =>
-            'PHP_Compat is not installed, cannot detect dependencies',
-        PEAR_PACKAGEFILEMANAGER_NONOTES =>
-            'Release Notes (option \'notes\') must be specified in PEAR_PackageFileManager setOptions',
-        PEAR_PACKAGEFILEMANAGER_NOLICENSE =>
-            'Release License (option \'license\') must be specified in PEAR_PackageFileManager setOptions',
-        ),
-        // other language translations go here
-     );
-/**
- * PEAR :: PackageFileManager updates the <filelist></filelist> section
- * of a PEAR package.xml file to reflect the current files in
- * preparation for a release.
- *
- * The PEAR_PackageFileManager class uses a plugin system to generate the
- * list of files in a package.  This allows both standard recursive
- * directory parsing (plugin type file) and more intelligent options
- * such as the CVS browser {@link PEAR_PackageFileManager_Cvs}, which
- * grabs all files in a local CVS checkout to create the list, ignoring
- * any other local files.
- *
- * Other options include specifying roles for file extensions (all .php
- * files are role="php", for example), roles for directories (all directories
- * named "tests" are given role="tests" by default), and exceptions.
- * Exceptions are specific pathnames with * and ? wildcards that match
- * a default role, but should have another.  For example, perhaps
- * a debug.tpl template would normally be data, but should be included
- * in the docs role.  Along these lines, to exclude files entirely,
- * use the ignore option.
- *
- * Required options for a release include version, baseinstalldir, state,
- * and packagedirectory (the full path to the local location of the
- * package to create a package.xml file for)
- *
- * Example usage:
- * <code>
- * <?php
- * require_once('PEAR/PackageFileManager.php');
- * $packagexml = new PEAR_PackageFileManager;
- * $e = $packagexml->setOptions(
- * array('baseinstalldir' => 'PhpDocumentor',
- *  'version' => '1.2.1',
- *  'packagedirectory' => 'C:/Web Pages/chiara/phpdoc2/',
- *  'state' => 'stable',
- *  'filelistgenerator' => 'cvs', // generate from cvs, use file for directory
- *  'notes' => 'We\'ve implemented many new and exciting features',
- *  'ignore' => array('TODO', 'tests/'), // ignore TODO, all files in tests/
- *  'installexceptions' => array('phpdoc' => '/*'), // baseinstalldir ="/" for phpdoc
- *  'dir_roles' => array('tutorials' => 'doc'),
- *  'exceptions' => array('README' => 'doc', // README would be data, now is doc
- *                        'PHPLICENSE.txt' => 'doc'))); // same for the license
- * if (PEAR::isError($e)) {
- *     echo $e->getMessage();
- *     die();
- * }
- * $e = $test->addPlatformException('pear-phpdoc.bat', 'windows');
- * if (PEAR::isError($e)) {
- *     echo $e->getMessage();
- *     exit;
- * }
- * $packagexml->addRole('pkg', 'doc'); // add a new role mapping
- * if (PEAR::isError($e)) {
- *     echo $e->getMessage();
- *     exit;
- * }
- * // replace @PHP-BIN@ in this file with the path to php executable!  pretty neat
- * $e = $test->addReplacement('pear-phpdoc', 'pear-config', '@PHP-BIN@', 'php_bin');
- * if (PEAR::isError($e)) {
- *     echo $e->getMessage();
- *     exit;
- * }
- * $e = $test->addReplacement('pear-phpdoc.bat', 'pear-config', '@PHP-BIN@', 'php_bin');
- * if (PEAR::isError($e)) {
- *     echo $e->getMessage();
- *     exit;
- * }
- * // note use of {@link debugPackageFile()} - this is VERY important
- * if (isset($_GET['make']) || (isset($_SERVER['argv'][2]) &&
- *       $_SERVER['argv'][2] == 'make')) {
- *     $e = $packagexml->writePackageFile();
- * } else {
- *     $e = $packagexml->debugPackageFile();
- * }
- * if (PEAR::isError($e)) {
- *     echo $e->getMessage();
- *     die();
- * }
- * ?>
- * </code>
- *
- * In addition, a package.xml file can now be generated from
- * scratch, with the usage of new options package, summary, description, and
- * the use of the {@link addMaintainer()} method
- *
- * @category  PEAR
- * @package   PEAR_PackageFileManager
- * @author    Greg Beaver <cellog@php.net>
- * @copyright 2003-2007 The PHP Group
- * @license   http://www.php.net/license/3_01.txt  PHP License 3.01
- * @version   Release: 1.6.3
- * @link      http://pear.php.net/package/PEAR_PackageFileManager
- * @since     Class available since Release 0.1
- */
-class PEAR_PackageFileManager
-{
-    /**
-     * Format: array(array(regexp-ready string to search for whole path,
-     * regexp-ready string to search for basename of ignore strings),...)
-     * @var false|array
-     * @access private
-     * @since  0.1
-     */
-    var $_ignore = false;
-
-    /**
-     * Contents of the package.xml file
-     * @var string
-     * @access private
-     * @since  0.1
-     */
-    var $_packageXml = false;
-
-    /**
-     * Contents of the original package.xml file, if any
-     * @var string
-     * @access private
-     * @since  0.9
-     */
-    var $_oldPackageXml = false;
-
-    /**
-     * @access private
-     * @var PEAR_Common
-     * @since  0.9
-     */
-    var $_pear;
-
-    /**
-     * List of warnings
-     * @var array
-     * @access private
-     * @since  1.1.0
-     */
-    var $_warningStack = array();
-
-    /**
-     * flag used to determine whether to use PHP_CompatInfo to detect deps
-     * @var boolean
-     * @access private
-     * @since  1.3.0
-     */
-    var $_detectDependencies = false;
-
-    /**
-     * @access private
-     * @var string
-     * @since  0.1
-     */
-    var $_options = array(
-                      'packagefile' => 'package.xml',
-                      'doctype' => 'http://pear.php.net/dtd/package-1.0',
-                      'filelistgenerator' => 'file',
-                      'license' => 'PHP License',
-                      'changelogoldtonew' => true,
-                      'roles' =>
-                        array(
-                            'h' => 'src',
-                            'c' => 'src',
-                            'm4' => 'src',
-                            'w32' => 'src',
-                            'dll' => 'ext',
-                            'php' => 'php',
-                            'html' => 'doc',
-                            '*' => 'data',
-                             ),
-                      'dir_roles' =>
-                        array(
-                            'docs' => 'doc',
-                            'examples' => 'doc',
-                            'tests' => 'test',
-                             ),
-                      'exceptions' => array(),
-                      'installexceptions' => array(),
-                      'installas' => array(),
-                      'platformexceptions' => array(),
-                      'scriptphaseexceptions' => array(),
-                      'ignore' => array(),
-                      'include' => false,
-                      'deps' => false,
-                      'maintainers' => false,
-                      'notes' => '',
-                      'changelognotes' => false,
-                      'outputdirectory' => false,
-                      'pathtopackagefile' => false,
-                      'lang' => 'en',
-                      'configure_options' => array(),
-                      'replacements' => array(),
-                      'pearcommonclass' => false,
-                      'simpleoutput' => false,
-                      'addhiddenfiles' => false,
-                      'cleardependencies' => false,
-                      );
-
-    /**
-     * Does nothing, use setOptions
-     *
-     * The constructor is not used in order to be able to
-     * return a PEAR_Error from setOptions
-     *
-     * @see    setOptions()
-     * @access public
-     * @since  0.1
-     */
-    function PEAR_PackageFileManager()
-    {
-    }
-
-    /**
-     * Set package.xml generation options
-     *
-     * The options array is indexed as follows:
-     * <code>
-     * $options = array('option_name' => <optionvalue>);
-     * </code>
-     *
-     * The documentation below simplifies this description through
-     * the use of option_name without quotes
-     *
-     * Configuration options:
-     * - lang: lang controls the language in which error messages are
-     *         displayed.  There are currently only English error messages,
-     *         but any contributed will be added over time.<br>
-     *         Possible values: en (default)
-     * - packagefile: the name of the packagefile, defaults to package.xml
-     * - pathtopackagefile: the path to an existing package file to read in,
-     *                      if different from the packagedirectory
-     * - packagedirectory: the path to the base directory of the package.  For
-     *                     package PEAR_PackageFileManager, this path is
-     *                     /path/to/pearcvs/pear/PEAR_PackageFileManager where
-     *                     /path/to/pearcvs is a local path on your hard drive
-     * - outputdirectory: the path in which to place the generated package.xml
-     *                    by default, this is ignored, and the package.xml is
-     *                    created in the packagedirectory
-     * - filelistgenerator: the <filelist> section plugin which will be used.
-     *                      In this release, there are two generator plugins,
-     *                      file and cvs.  For details, see the docs for these
-     *                      plugins
-     * - usergeneratordir: For advanced users.  If you write your own filelist
-     *                     generator plugin, use this option to tell
-     *                     PEAR_PackageFileManager where to find the file that
-     *                     contains it.  If the plugin is named foo, the class
-     *                     must be named PEAR_PackageFileManager_Foo
-     *                     no matter where it is located.  By default, the Foo
-     *                     plugin is located in PEAR/PackageFileManager/Foo.php.
-     *                     If you pass /path/to/foo in this option, setOptions
-     *                     will look for PEAR_PackageFileManager_Foo in
-     *                     /path/to/foo/Foo.php
-     * - doctype: Specifies the DTD of the package.xml file.  Default is
-     *            http://pear.php.net/dtd/package-1.0
-     * - pearcommonclass: Specifies the name of the class to instantiate, default
-     *                    is PEAR_PackageFileManager_ComplexGenerator or PEAR_Common, but users can
-     *                    override this with a custom class that implements
-     *                    PEAR_Common's method interface
-     * - changelogoldtonew: True if the ChangeLog should list from oldest entry to
-     *                      newest.  Set to false if you would like new entries first
-     * - simpleoutput: True if the package.xml should not contain md5sum or <provides />
-     *                 for readability
-     * - addhiddenfiles: True if you wish to add hidden files/directories that begin with .
-     *                   like .bashrc.  This is only used by the File generator.  The CVS
-     *                   generator will use all files in CVS regardless of format
-     *
-     * package.xml simple options:
-     * - baseinstalldir: The base directory to install this package in.  For
-     *                   package PEAR_PackageFileManager, this is "PEAR", for
-     *                   package PEAR, this is "/"
-     * - license: The license this release is released under.  Default is
-     *            PHP License if left unspecified
-     * - notes: Release notes, any text describing what makes this release unique
-     * - changelognotes: notes for the changelog, this should be more detailed than
-     *                   the release notes.  By default, PEAR_PackageFileManager uses
-     *                   the notes option for the changelog as well
-     * - version: The version number for this release.  Remember the convention for
-     *            numbering: initial alpha is between 0 and 1, add b<beta number> for
-     *            beta as in 1.0b1, the integer portion of the version should specify
-     *            backwards compatibility, as in 1.1 is backwards compatible with 1.0,
-     *            but 2.0 is not backwards compatible with 1.10.  Also note that 1.10
-     *            is a greater release version than 1.1 (think of it as "one point ten"
-     *            and "one point one").  Bugfix releases should be a third decimal as in
-     *            1.0.1, 1.0.2
-     * - package: [optional] Package name.  Use this to create a new package.xml, or
-     *            overwrite an existing one from another package used as a template
-     * - summary: [optional] Summary of package purpose
-     * - description: [optional] Description of package purpose.  Note that the above
-     *                three options are not optional when creating a new package.xml
-     *                from scratch
-     *
-     * <b>WARNING</b>: all complex options that require a file path are case-sensitive
-     *
-     * package.xml complex options:
-     * - cleardependencies: since version 1.3.0, this option will erase any existing
-     *                      dependencies in the package.xml if set to true
-     * - ignore: an array of filenames, directory names, or wildcard expressions specifying
-     *           files to exclude entirely from the package.xml.  Wildcards are operating system
-     *           wildcards * and ?.  file*foo.php will exclude filefoo.php, fileabrfoo.php and
-     *           filewho_is_thisfoo.php.  file?foo.php will exclude fileafoo.php and will not
-     *           exclude fileaafoo.php.  test/ will exclude all directories and subdirectories of
-     *           ANY directory named test encountered in directory parsing.  *test* will exclude
-     *           all files and directories that contain test in their name
-     * - include: an array of filenames, directory names, or wildcard expressions specifying
-     *            files to include in the listing.  All other files will be ignored.
-     *            Wildcards are in the same format as ignore
-     * - roles: this is an array mapping file extension to install role.  This
-     *          specifies default behavior that can be overridden by the exceptions
-     *          option and dir_roles option.  use {@link addRole()} to add a new
-     *          role to the pre-existing array
-     * - dir_roles: this is an array mapping directory name to install role.  All
-     *              files in a directory whose name matches the directory will be
-     *              given the install role specified.  Single files can be excluded
-     *              from this using the exceptions option.  The directory should be
-     *              a relative path from the baseinstalldir, or "/" for the baseinstalldir
-     * - exceptions: specify file role for specific files.  This array maps all files
-     *               matching the exact name of a file to a role as in "file.ext" => "role"
-     * - deps: dependency array.  Pass in an empty array to clear all dependencies, and use
-     *         {@link addDependency()} to add new ones/replace existing ones
-     * - maintainers: maintainers array.  Pass in an empty array to clear all maintainers, and
-     *                use {@link addMaintainer()} to add a new maintainer/replace existing maintainer
-     * - installexceptions: array mapping of specific filenames to baseinstalldir values.  Use
-     *                      this to force the installation of a file into another directory,
-     *                      such as forcing a script to be in the root scripts directory so that
-     *                      it will be in the path.  The filename must be a relative path to the
-     *                      packagedirectory
-     * - platformexceptions: array mapping of specific filenames to the platform they should be
-     *                       installed on.  Use this to specify unix-only files or windows-only
-     *                       files.  The format of the platform string must be
-     *                       OS-version-cpu-extra if any more specific information is needed,
-     *                       and the OS must be in lower case as in "windows."  The match is
-     *                       performed using a regular expression, but uses * and ? wildcards
-     *                       instead of .* and .?.  Note that hpux/aix/irix/linux are all
-     *                       exclusive.  To select non-windows, use (*ix|*ux)
-     * - scriptphaseexceptions: array mapping of scripts to their install phase.  This can be
-     *                          one of: pre-install, post-install, pre-uninstall, post-uninstall,
-     *                          pre-build, post-build, pre-setup, or post-setup
-     * - installas: array mapping of specific filenames to the filename they should be installed as.
-     *              Use this to specify new filenames for files that should be installed.  This will
-     *              often be used in conjunction with platformexceptions if there are two files for
-     *              different OSes that must have the same name when installed.
-     * - replacements: array mapping of specific filenames to complex text search-and-replace that
-     *                 should be performed upon install.  The format is:
-     *   <pre>
-     *   filename => array('type' => php-const|pear-config|package-info
-     *                     'from' => text in file
-     *                     'to' => name of variable)
-     *   </pre>
-     *                 if type is php-const, then 'to' must be the name of a PHP Constant.
-     *                 If type is pear-config, then 'to' must be the name of a PEAR config
-     *                 variable accessible through a PEAR_Config class->get() method.  If
-     *                 type is package-info, then 'to' must be the name of a section from
-     *                 the package.xml file used to install this file.
-     * - globalreplacements: a list of replacements that should be performed on every single file.
-     *                       The format is the same as replacements (since 1.4.0)
-     * - configure_options: array specifies build options for PECL packages (you should probably
-     *                      use PECL_Gen instead, but it's here for completeness)
-     *
-     * @param array   $options  (optional) list of generation options
-     * @param boolean $internal (optional) private function call
-     *
-     * @see    PEAR_PackageFileManager_File
-     * @see    PEAR_PackageFileManager_CVS
-     * @return void|PEAR_Error
-     * @throws PEAR_PACKAGEFILEMANAGER_NOSTATE
-     * @throws PEAR_PACKAGEFILEMANAGER_NOVERSION
-     * @throws PEAR_PACKAGEFILEMANAGER_NOPKGDIR
-     * @throws PEAR_PACKAGEFILEMANAGER_NOBASEDIR
-     * @throws PEAR_PACKAGEFILEMANAGER_GENERATOR_NOTFOUND_ANYWHERE
-     * @throws PEAR_PACKAGEFILEMANAGER_GENERATOR_NOTFOUND
-     * @access public
-     * @since  0.1
-     */
-    function setOptions($options = array(), $internal = false)
-    {
-        if (!$internal) {
-            if (!isset($options['state']) || empty($options['state'])) {
-                return $this->raiseError(PEAR_PACKAGEFILEMANAGER_NOSTATE);
-            }
-            if (!isset($options['version']) || empty($options['version'])) {
-                return $this->raiseError(PEAR_PACKAGEFILEMANAGER_NOVERSION);
-            }
-        }
-        if (!isset($options['packagedirectory']) && !$internal) {
-            return $this->raiseError(PEAR_PACKAGEFILEMANAGER_NOPKGDIR);
-        } elseif (isset($options['packagedirectory'])) {
-            $options['packagedirectory'] = str_replace(DIRECTORY_SEPARATOR,
-                                                     '/',
-                                                     realpath($options['packagedirectory']));
-            if ($options['packagedirectory']{strlen($options['packagedirectory']) - 1} != '/') {
-                $options['packagedirectory'] .= '/';
-            }
-        }
-        if (isset($options['pathtopackagefile'])) {
-            $options['pathtopackagefile'] = str_replace(DIRECTORY_SEPARATOR,
-                                                     '/',
-                                                     realpath($options['pathtopackagefile']));
-            if ($options['pathtopackagefile']{strlen($options['pathtopackagefile']) - 1} != '/') {
-                $options['pathtopackagefile'] .= '/';
-            }
-        }
-        if (!isset($options['baseinstalldir']) && !$internal) {
-            return $this->raiseError(PEAR_PACKAGEFILEMANAGER_NOBASEDIR);
-        }
-        $this->_options = array_merge($this->_options, $options);
-        if (!isset($this->_options['roles']['*'])) {
-            $this->_options['roles']['*'] = 'data';
-        }
-
-        if (!class_exists($this->_options['pearcommonclass'])) {
-            if ($this->_options['simpleoutput']) {
-                if ($this->isIncludeable('PEAR/PackageFile/Generator/v1.php')) {
-                    include_once 'PEAR/PackageFileManager/SimpleGenerator.php';
-                    $this->_options['pearcommonclass'] = 'PEAR_PackageFileManager_SimpleGenerator';
-                } else {
-                    include_once 'PEAR/PackageFileManager/XMLOutput.php';
-                    $this->_options['pearcommonclass'] = 'PEAR_PackageFileManager_XMLOutput';
-                }
-            } else {
-                if ($this->isIncludeable('PEAR/PackageFile/Generator/v1.php')) {
-                    include_once 'PEAR/PackageFileManager/ComplexGenerator.php';
-                    $this->_options['pearcommonclass'] = 'PEAR_PackageFileManager_ComplexGenerator';
-                } else {
-                    $this->_options['pearcommonclass'] = 'PEAR_Common';
-                }
-            }
-        }
-        $path = ($this->_options['pathtopackagefile'] ?
-                    $this->_options['pathtopackagefile'] : $this->_options['packagedirectory']);
-
-        $this->_options['filelistgenerator'] =
-            ucfirst(strtolower($this->_options['filelistgenerator']));
-        if (!$internal) {
-            if (PEAR::isError($res =
-                  $this->_getExistingPackageXML($path, $this->_options['packagefile']))) {
-                return $res;
-            }
-        }
-
-        // file generator resource to load
-        $resource = 'PEAR/PackageFileManager/' . $this->_options['filelistgenerator'] . '.php';
-        // file generator class name
-        $className = substr($resource, 0, -4);
-        $className = str_replace('/', '_', $className);
-
-        if (!class_exists($className)) {
-            // attempt to load the interface from the standard PEAR location
-            if ($this->isIncludeable($resource)) {
-                include_once $resource;
-            } elseif (isset($this->_options['usergeneratordir'])) {
-                // attempt to load from a user-specified directory
-                if (is_dir(realpath($this->_options['usergeneratordir']))) {
-                    $this->_options['usergeneratordir'] =
-                        str_replace(DIRECTORY_SEPARATOR,
-                                    '/',
-                                    realpath($this->_options['usergeneratordir']));
-                    if ($this->_options['usergeneratordir']{strlen($this->_options['usergeneratordir'])
-                          - 1} != '/') {
-                        $this->_options['usergeneratordir'] .= '/';
-                    }
-                } else {
-                    $this->_options['usergeneratordir'] = '////';
-                }
-                $usergenerator = $this->_options['usergeneratordir'] .
-                    $this->_options['filelistgenerator'] . '.php';
-                if (file_exists($usergenerator) && is_readable($usergenerator)) {
-                    include_once $usergenerator;
-                }
-                if (!class_exists($className)) {
-                    return $this->raiseError(PEAR_PACKAGEFILEMANAGER_GENERATOR_NOTFOUND_ANYWHERE,
-                        $className);
-                }
-            } else {
-                return $this->raiseError(PEAR_PACKAGEFILEMANAGER_GENERATOR_NOTFOUND,
-                    $className);
-            }
-        }
-    }
-
-    /**
-     * Import options from an existing package.xml
-     *
-     * @param string $packagefile name of package file
-     * @param array  $options     (optional) list of generation options
-     *
-     * @return true|PEAR_Error
-     * @access public
-     * @since  1.5.0
-     */
-    function importOptions($packagefile, $options = array())
-    {
-        $options['deps'] = $options['maintainers'] = false;
-        $this->setOptions($options, true);
-        if (PEAR::isError($res = $this->_getExistingPackageXML(dirname($packagefile) .
-              DIRECTORY_SEPARATOR, basename($packagefile)))) {
-            return $res;
-        }
-        $this->_options['package']     = $this->_oldPackageXml['package'];
-        $this->_options['summary']     = $this->_oldPackageXml['summary'];
-        $this->_options['description'] = $this->_oldPackageXml['description'];
-        $this->_options['date']        = $this->_oldPackageXml['release_date'];
-        $this->_options['version']     = $this->_oldPackageXml['version'];
-        $this->_options['license']     = $this->_oldPackageXml['release_license'];
-        $this->_options['state']       = $this->_oldPackageXml['release_state'];
-        $this->_options['notes']       = $this->_oldPackageXml['release_notes'];
-        $this->setOptions($options, true);
-        if (isset($this->_packageXml['release_deps'])) {
-            $this->_options['deps'] = $this->_packageXml['release_deps'];
-        }
-        $this->_options['maintainers'] = $this->_oldPackageXml['maintainers'];
-        return true;
-    }
-
-    /**
-     * Get the existing options
-     *
-     * @return array
-     * @access public
-     * @since  1.5.0
-     */
-    function getOptions()
-    {
-        return $this->_options;
-    }
-
-    /**
-     * Add an extension/role mapping to the role mapping option
-     *
-     * Roles influence both where a file is installed and how it is installed.
-     * Files with role="data" are in a completely different directory hierarchy
-     * from the program files of role="php"
-     *
-     * In PEAR 1.3b2, these roles are
-     * - php (most common)
-     * - data
-     * - doc
-     * - test
-     * - script (gives the file an executable attribute)
-     * - src
-     *
-     * @param string $extension file extension
-     * @param string $role      role
-     *
-     * @return void|PEAR_Error
-     * @throws PEAR_PACKAGEFILEMANAGER_INVALID_ROLE
-     * @access public
-     * @since  0.1
-     */
-    function addRole($extension, $role)
-    {
-        $roles = call_user_func(array($this->_options['pearcommonclass'], 'getfileroles'));
-        if (!in_array($role, $roles)) {
-            return $this->raiseError(PEAR_PACKAGEFILEMANAGER_INVALID_ROLE, implode($roles, ', '), $role);
-        }
-        $this->_options['roles'][$extension] = $role;
-    }
-
-    /**
-     * Add an install-time platform conditional install for a file
-     *
-     * The format of the platform string must be
-     * OS-version-cpu-extra if any more specific information is needed,
-     * and the OS must be in lower case as in "windows."  The match is
-     * performed using a regular expression, but uses * and ? wildcards
-     * instead of .* and .?.  Note that hpux/aix/irix/linux are all
-     * exclusive.  To select non-windows, use (*ix|*ux)
-     *
-     * This information is based on eyeing the source for OS/Guess.php, so
-     * if you are unsure of what to do, read that file.
-     *
-     * @param string $path     relative path of file (relative to packagedirectory option)
-     * @param string $platform platform descriptor string
-     *
-     * @return void
-     * @access public
-     * @since  0.10
-     */
-    function addPlatformException($path, $platform)
-    {
-        if (!isset($this->_options['platformexceptions'])) {
-            $this->_options['platformexceptions'] = array();
-        }
-        $this->_options['platformexceptions'][$path] = $platform;
-    }
-
-    /**
-     * Add a replacement option for all files
-     *
-     * This sets an install-time complex search-and-replace function
-     * allowing the setting of platform-specific variables in all
-     * installed files.
-     *
-     * if $type is php-const, then $to must be the name of a PHP Constant.
-     * If $type is pear-config, then $to must be the name of a PEAR config
-     * variable accessible through a {@link PEAR_Config::get()} method.  If
-     * type is package-info, then $to must be the name of a section from
-     * the package.xml file used to install this file.
-     *
-     * @param string $type variable type, either php-const, pear-config or package-info
-     * @param string $from text to replace in the source file
-     * @param string $to   variable name to use for replacement
-     *
-     * @return void|PEAR_Error
-     * @throws PEAR_PACKAGEFILEMANAGER_INVALID_REPLACETYPE
-     * @access public
-     * @since  1.4.0
-     */
-    function addGlobalReplacement($type, $from, $to)
-    {
-        if (!isset($this->_options['globalreplacements'])) {
-            $this->_options['globalreplacements'] = array();
-        }
-        $types = call_user_func(array($this->_options['pearcommonclass'], 'getreplacementtypes'));
-        if (!in_array($type, $types)) {
-            return $this->raiseError(PEAR_PACKAGEFILEMANAGER_INVALID_REPLACETYPE,
-                implode($types, ', '), $type);
-        }
-        $this->_options['globalreplacements'][] =
-            array('type' => $type, 'from' => $from, 'to' => $to);
-    }
-
-    /**
-     * Add a replacement option for a file
-     *
-     * This sets an install-time complex search-and-replace function
-     * allowing the setting of platform-specific variables in an
-     * installed file.
-     *
-     * if $type is php-const, then $to must be the name of a PHP Constant.
-     * If $type is pear-config, then $to must be the name of a PEAR config
-     * variable accessible through a {@link PEAR_Config::get()} method.  If
-     * type is package-info, then $to must be the name of a section from
-     * the package.xml file used to install this file.
-     *
-     * @param string $path relative path of file (relative to packagedirectory option)
-     * @param string $type variable type, either php-const, pear-config or package-info
-     * @param string $from text to replace in the source file
-     * @param string $to   variable name to use for replacement
-     *
-     * @return void|PEAR_Error
-     * @throws PEAR_PACKAGEFILEMANAGER_INVALID_REPLACETYPE
-     * @access public
-     * @since  0.10
-     */
-    function addReplacement($path, $type, $from, $to)
-    {
-        if (!isset($this->_options['replacements'])) {
-            $this->_options['replacements'] = array();
-        }
-        $types = call_user_func(array($this->_options['pearcommonclass'], 'getreplacementtypes'));
-        if (!in_array($type, $types)) {
-            return $this->raiseError(PEAR_PACKAGEFILEMANAGER_INVALID_REPLACETYPE,
-                implode($types, ', '), $type);
-        }
-        $this->_options['replacements'][$path][] = array('type' => $type, 'from' => $from, 'to' => $to);
-    }
-
-    /**
-     * Add a maintainer to the list of maintainers.
-     *
-     * Every maintainer must have a valid account at pear.php.net.  The
-     * first parameter is the account name (for instance, cellog is the
-     * handle for Greg Beaver at pear.php.net).  Every maintainer has
-     * one of four possible roles:
-     * - lead: the primary maintainer
-     * - developer: an important developer on the project
-     * - contributor: self-explanatory
-     * - helper: ditto
-     *
-     * Finally, specify the name and email of the maintainer
-     *
-     * @param string $handle username on pear.php.net of maintainer
-     * @param string $role   lead|developer|contributor|helper role of maintainer
-     * @param string $name   full name of maintainer
-     * @param string $email  email address of maintainer
-     *
-     * @return void|PEAR_Error
-     * @access public
-     * @since  0.9
-     */
-    function addMaintainer($handle, $role, $name, $email)
-    {
-        if (!$this->_packageXml) {
-            return $this->raiseError(PEAR_PACKAGEFILEMANAGER_RUN_SETOPTIONS);
-        }
-        if (!in_array($role, $GLOBALS['_PEAR_Common_maintainer_roles'])) {
-            return $this->raiseError(PEAR_PACKAGEFILEMANAGER_WRONG_MROLE,
-                implode(', ', call_user_func(array($this->_options['pearcommonclass'],
-                    'getUserRoles'))),
-                $role);
-        }
-        if (!isset($this->_packageXml['maintainers'])) {
-            $this->_packageXml['maintainers'] = array();
-        }
-        $found = false;
-        foreach ($this->_packageXml['maintainers'] as $index => $maintainer) {
-            if ($maintainer['handle'] == $handle) {
-                $found = $index;
-                break;
-            }
-        }
-        $maintainer =
-            array('handle' => $handle, 'role' => $role, 'name' => $name, 'email' => $email);
-        if ($found !== false) {
-            $this->_packageXml['maintainers'][$found] = $maintainer;
-        } else {
-            $this->_packageXml['maintainers'][] = $maintainer;
-        }
-    }
-
-    /**
-     * Add an install-time configuration option for building of source
-     *
-     * This option is only useful to PECL projects that are built upon
-     * installation
-     *
-     * @param string $name    name of the option
-     * @param string $prompt  prompt to display to the user
-     * @param string $default (optional) default value
-     *
-     * @throws PEAR_PACKAGEFILEMANAGER_RUN_SETOPTIONS
-     * @return void|PEAR_Error
-     * @access public
-     * @since  0.9
-     */
-    function addConfigureOption($name, $prompt, $default = null)
-    {
-        if (!$this->_packageXml) {
-            return $this->raiseError(PEAR_PACKAGEFILEMANAGER_RUN_SETOPTIONS);
-        }
-        if (!isset($this->_packageXml['configure_options'])) {
-            $this->_packageXml['configure_options'] = array();
-        }
-        $found = false;
-        foreach ($this->_packageXml['configure_options'] as $index => $option) {
-            if ($option['name'] == $name) {
-                $found = $index;
-                break;
-            }
-        }
-        $option = array('name' => $name, 'prompt' => $prompt);
-        if (isset($default)) {
-            $option['default'] = $default;
-        }
-        if ($found !== false) {
-            $this->_packageXml['configure_options'][$found] = $option;
-        } else {
-            $this->_packageXml['configure_options'][] = $option;
-        }
-    }
-
-    /**
-     * Uses PEAR::PHP_CompatInfo package to detect dependencies (extensions, php version)
-     *
-     * @return void|PEAR_Error
-     * @throws PEAR_PACKAGEFILEMANAGER_RUN_SETOPTIONS
-     * @throws PEAR_PACKAGEFILEMANAGER_NO_PHPCOMPATINFO
-     * @access public
-     * @since  1.3.0
-     */
-    function detectDependencies()
-    {
-        if (!$this->_packageXml) {
-            return $this->raiseError(PEAR_PACKAGEFILEMANAGER_RUN_SETOPTIONS);
-        }
-        if (!$this->isIncludeable('PHP/CompatInfo.php')) {
-            return $this->raiseError(PEAR_PACKAGEFILEMANAGER_NO_PHPCOMPATINFO);
-        } else {
-            include_once 'PHP/CompatInfo.php';
-            $this->_detectDependencies = true;
-        }
-    }
-
-    /**
-     * Returns whether or not a file is in the include path.
-     *
-     * @param string $file path to filename
-     *
-     * @return boolean true if the file is in the include path, false otherwise
-     * @access public
-     * @since  1.3.0
-     */
-    function isIncludeable($file)
-    {
-        if (!defined('PATH_SEPARATOR')) {
-            define('PATH_SEPARATOR', strtolower(substr(PHP_OS, 0, 3)) == 'win' ? ';' : ':');
-        }
-        foreach (explode(PATH_SEPARATOR, ini_get('include_path')) as $path) {
-            if (file_exists($path . DIRECTORY_SEPARATOR . $file) &&
-                  is_readable($path . DIRECTORY_SEPARATOR . $file)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Add a dependency on another package, or an extension/php
-     *
-     * This will overwrite an existing dependency if it is found.  In
-     * other words, if a dependency on PHP 4.1.0 exists, and
-     * addDependency('php', '4.3.0', 'ge', 'php') is called, the existing
-     * dependency on PHP 4.1.0 will be overwritten with the new one on PHP 4.3.0
-     *
-     * @param string  $name     Dependency element name
-     * @param string  $version  (optional) Dependency version
-     * @param string  $operator A specific operator for the version, this can be one of:
-     *   'has', 'not', 'lt', 'le', 'eq', 'ne', 'ge', or 'gt'
-     * @param string  $type     (optional) Dependency type.  This can be one of:
-     *   'pkg', 'ext', 'php', 'prog', 'os', 'sapi', or 'zend'
-     * @param boolean $optional (optional) true if dependency is optional
-     *
-     * @throws PEAR_PACKAGEFILEMANAGER_RUN_SETOPTIONS
-     * @throws PEAR_PACKAGEFILEMANAGER_PHP_NOT_PACKAGE
-     * @return void|PEAR_Error
-     * @access public
-     * @since  0.1
-     */
-    function addDependency($name, $version = false, $operator = 'ge', $type = 'pkg', $optional = false)
-    {
-        if (!$this->_packageXml) {
-            return $this->raiseError(PEAR_PACKAGEFILEMANAGER_RUN_SETOPTIONS);
-        }
-        if ((strtolower($name) == 'php') && (strtolower($type) == 'pkg')) {
-            return $this->raiseError(PEAR_PACKAGEFILEMANAGER_PHP_NOT_PACKAGE);
-        }
-        if (!isset($this->_packageXml['release_deps']) || !is_array($this->_packageXml['release_deps'])) {
-            $this->_packageXml['release_deps'] = array();
-        }
-        $found = false;
-        foreach ($this->_packageXml['release_deps'] as $index => $dep) {
-            if ($type == 'php') {
-                if ($dep['type'] == 'php') {
-                    $found = $index;
-                    break;
-                }
-            } else {
-                if (isset($dep['name']) && $dep['name'] == $name && $dep['type'] == $type) {
-                    $found = $index;
-                    break;
-                }
-            }
-        }
-        $dep =
-            array(
-                'name' => $name,
-                'type' => $type);
-        if ($type == 'php') {
-            unset($dep['name']);
-        }
-        if ($operator) {
-            $dep['rel'] = $operator;
-            if ($dep['rel'] != 'has' && $version) {
-                $dep['version'] = $version;
-            }
-        }
-
-        if ($optional) {
-            $dep['optional'] = 'yes';
-        } else {
-            $dep['optional'] = 'no';
-        }
-
-        if ($found !== false) {
-            $this->_packageXml['release_deps'][$found] = $dep; // overwrite existing dependency
-        } else {
-            $this->_packageXml['release_deps'][] = $dep; // add new dependency
-        }
-    }
-
-    /**
-     * Writes the package.xml file out with the newly created <release></release> tag
-     *
-     * ALWAYS use {@link debugPackageFile} to verify that output is correct before
-     * overwriting your package.xml
-     *
-     * @param boolean $debuginterface (optional) null if no debugging, true if web interface, false if command-line
-     *
-     * @throws PEAR_PACKAGEFILEMANAGER_RUN_SETOPTIONS
-     * @throws PEAR_PACKAGEFILEMANAGER_ADD_MAINTAINERS
-     * @throws PEAR_PACKAGEFILEMANAGER_NONOTES
-     * @throws PEAR_PACKAGEFILEMANAGER_NOLICENSE
-     * @throws PEAR_PACKAGEFILEMANAGER_INVALID_PACKAGE
-     * @throws PEAR_PACKAGEFILEMANAGER_CANTWRITE_PKGFILE
-     * @throws PEAR_PACKAGEFILEMANAGER_CANTCOPY_PKGFILE
-     * @throws PEAR_PACKAGEFILEMANAGER_CANTOPEN_TMPPKGFILE
-     * @throws PEAR_PACKAGEFILEMANAGER_DEST_UNWRITABLE
-     * @return true|PEAR_Error
-     * @access public
-     * @since  0.1
-     */
-    function writePackageFile($debuginterface = null)
-    {
-        if (!$this->_packageXml) {
-            return $this->raiseError(PEAR_PACKAGEFILEMANAGER_RUN_SETOPTIONS);
-        }
-        if (!isset($this->_packageXml['maintainers']) || empty($this->_packageXml['maintainers'])) {
-            return $this->raiseError(PEAR_PACKAGEFILEMANAGER_ADD_MAINTAINERS);
-        }
-        if (!isset($this->_options['notes']) || empty($this->_options['notes'])) {
-            return $this->raiseError(PEAR_PACKAGEFILEMANAGER_NONOTES);
-        }
-        if (!isset($this->_options['license']) || empty($this->_options['license'])) {
-            return $this->raiseError(PEAR_PACKAGEFILEMANAGER_NOLICENSE);
-        }
-        extract($this->_options);
-        $date = date('Y-m-d');
-        if (isset($package)) {
-            $this->_packageXml['package'] = $package;
-        }
-        if (isset($summary)) {
-            $this->_packageXml['summary'] = $summary;
-        }
-        if (isset($description)) {
-            $this->_packageXml['description'] = $description;
-        }
-        $this->_packageXml['release_date']    = $date;
-        $this->_packageXml['version']         = $version;
-        $this->_packageXml['release_license'] = $license;
-        $this->_packageXml['release_state']   = $state;
-        $this->_packageXml['release_notes']   = $notes;
-
-        $PEAR_Common = $this->_options['pearcommonclass'];
-        $this->_pear = new $PEAR_Common;
-        if (method_exists($this->_pear, 'setPackageFileManager')) {
-            $this->_pear->setPackageFileManager($this);
-        }
-        $this->_packageXml['filelist'] = $this->_getFileList();
-
-        $warnings = $this->getWarnings();
-        if (count($warnings)) {
-            $nl = (isset($debuginterface) && $debuginterface ? '<br />' : "\n");
-            foreach ($warnings as $errmsg) {
-                echo 'WARNING: ' . $errmsg['message'] . $nl;
-            }
-        }
-        if (PEAR::isError($this->_packageXml['filelist'])) {
-            return $this->_packageXml['filelist'];
-        }
-        if (isset($this->_pear->pkginfo['provides'])) {
-            $this->_packageXml['provides'] = $this->_pear->pkginfo['provides'];
-        }
-        if ($this->_options['simpleoutput']) {
-            unset($this->_packageXml['provides']);
-        }
-        $this->_packageXml['release_deps'] = $this->_getDependencies();
-        $this->_updateChangeLog();
-
-        $common   = &$this->_pear;
-        $warnings = $errors = array();
-        if (method_exists($common, 'setPackageFileManagerOptions')) {
-            $common->setPackageFileManagerOptions($this->_options);
-        }
-        $packagexml = $common->xmlFromInfo($this->_packageXml);
-        if (PEAR::isError($packagexml)) {
-            $errs = $packagexml->getUserinfo();
-            if (is_array($errs)) {
-                foreach ($errs as $error) {
-                    if ($error['level'] == 'error') {
-                        $errors[] = $error['message'];
-                    } else {
-                        $warnings[] = $error['message'];
-                    }
-                }
-            }
-        } else {
-            $common->validatePackageInfo($packagexml, $warnings, $errors,
-                $this->_options['packagedirectory']);
-        }
-        if (count($errors)) {
-            $ret = '';
-            $nl  = (isset($debuginterface) && $debuginterface ? '<br />' : "\n");
-            foreach ($errors as $errmsg) {
-                $ret .= $errmsg . $nl;
-            }
-            return $this->raiseError(PEAR_PACKAGEFILEMANAGER_INVALID_PACKAGE, $nl, $ret);
-        }
-        if (count($warnings)) {
-            $nl = (isset($debuginterface) && $debuginterface ? '<br />' : "\n");
-            foreach ($warnings as $errmsg) {
-                echo $errmsg . $nl;
-            }
-        }
-        if (!strpos($packagexml, '<!DOCTYPE')) {
-            // hack to fix pear
-            $packagexml = str_replace('<package version="1.0">',
-                '<!DOCTYPE package SYSTEM "' . $this->_options['doctype'] .
-                "\">\n<package version=\"1.0\">",
-                $packagexml);
-        }
-        if (isset($debuginterface)) {
-            if ($debuginterface) {
-                echo '<pre>' . htmlentities($packagexml) . '</pre>';
-            } else {
-                echo $packagexml;
-            }
-            return true;
-        }
-        $outputdir = ($this->_options['outputdirectory'] ?
-                        $this->_options['outputdirectory'] : $this->_options['packagedirectory']);
-        if ((file_exists($outputdir . $this->_options['packagefile']) &&
-                is_writable($outputdir . $this->_options['packagefile']))
-                ||
-                @touch($outputdir . $this->_options['packagefile'])) {
-            if ($fp = @fopen($outputdir . $this->_options['packagefile'] . '.tmp', "w")) {
-                $written = @fwrite($fp, $packagexml);
-                @fclose($fp);
-                if ($written === false) {
-                    return $this->raiseError(PEAR_PACKAGEFILEMANAGER_CANTWRITE_PKGFILE);
-                }
-                if (!@copy($outputdir . $this->_options['packagefile'] . '.tmp',
-                        $outputdir . $this->_options['packagefile'])) {
-                    return $this->raiseError(PEAR_PACKAGEFILEMANAGER_CANTCOPY_PKGFILE);
-                } else {
-                    @unlink($outputdir . $this->_options['packagefile'] . '.tmp');
-                    return true;
-                }
-            } else {
-                return $this->raiseError(PEAR_PACKAGEFILEMANAGER_CANTOPEN_TMPPKGFILE,
-                    $outputdir . $this->_options['packagefile'] . '.tmp');
-            }
-        } else {
-            return $this->raiseError(PEAR_PACKAGEFILEMANAGER_DEST_UNWRITABLE, $outputdir);
-        }
-    }
-
-    /**
-     * ALWAYS use this to test output before overwriting your package.xml!!
-     *
-     * This method instructs writePackageFile() to simply print the package.xml
-     * to output, either command-line or web-friendly (this is automatic
-     * based on the value of php_sapi_name())
-     *
-     * @uses writePackageFile() calls with the debug parameter set based on
-     *       whether it is called from the command-line or web interface
-     * @return true|PEAR_Error
-     * @access public
-     * @since  0.1
-     */
-    function debugPackageFile()
-    {
-        $webinterface = php_sapi_name() != 'cli';
-        return $this->writePackageFile($webinterface);
-    }
-
-    /**
-     * Store a warning on the warning stack
-     *
-     * @param integer $code error code
-     * @param array   $info additional specific error info
-     *
-     * @return void
-     * @access public
-     * @since  1.1.0
-     */
-    function pushWarning($code, $info)
-    {
-        $this->_warningStack[] = array('code' => $code,
-                                       'message' => $this->_getMessage($code, $info));
-    }
-
-    /**
-     * Retrieve the list of warnings
-     *
-     * @return array
-     * @access public
-     * @since  1.1.0
-     */
-    function getWarnings()
-    {
-        $a = $this->_warningStack;
-        $this->_warningStack = array();
-        return $a;
-    }
-
-    /**
-     * Retrieve an error message from a code
-     *
-     * @param integer $code error code
-     * @param array   $info additional specific error info
-     *
-     * @return string Error message
-     * @access private
-     * @since  1.1.0
-     */
-    function _getMessage($code, $info)
-    {
-        $msg = $GLOBALS['_PEAR_PACKAGEFILEMANAGER_ERRORS'][$this->_options['lang']][$code];
-        foreach ($info as $name => $value) {
-            $msg = str_replace('%' . $name . '%', $value, $msg);
-        }
-        return $msg;
-    }
-
-    /**
-     * Utility function to shorten error generation code
-     *
-     * {@source}
-     *
-     * @param integer $code error code
-     * @param string  $i1   (optional) additional specific error info #1
-     * @param string  $i2   (optional) additional specific error info #2
-     *
-     * @return PEAR_Error
-     * @static
-     * @access public
-     * @since  0.9
-     */
-    function raiseError($code, $i1 = '', $i2 = '')
-    {
-        return PEAR::raiseError('PEAR_PackageFileManager Error: ' .
-                    sprintf($GLOBALS['_PEAR_PACKAGEFILEMANAGER_ERRORS'][$this->_options['lang']][$code],
-                    $i1, $i2), $code);
-    }
-
-    /**
-     * Uses {@link PEAR_Common::analyzeSourceCode()} and {@link PEAR_Common::buildProvidesArray()}
-     * to create the <provides></provides> section of the package.xml
-     *
-     * @param object &$pear PEAR_Common
-     * @param string $file  path to source file
-     *
-     * @return void
-     * @access private
-     * @since  0.9
-     */
-    function _addProvides(&$pear, $file)
-    {
-        if (!($a = $pear->analyzeSourceCode($file))) {
-            return;
-        } else {
-            $pear->buildProvidesArray($a);
-        }
-    }
-
-    /**
-     * Generates the xml from the file list
-     *
-     * @uses   getDirTag() generate the xml from the array
-     * @return string
-     * @access private
-     * @since  0.1
-     */
-    function _getFileList()
-    {
-        $generatorclass = 'PEAR_PackageFileManager_' . $this->_options['filelistgenerator'];
-        $generator      = new $generatorclass($this, $this->_options);
-        if ($this->_options['simpleoutput'] && is_a($this->_pear, 'PEAR_Common')) {
-            return $this->_getSimpleDirTag($this->_struc = $generator->getFileList());
-        }
-        return $this->_getDirTag($this->_struc = $generator->getFileList());
-    }
-
-    /**
-     * Recursively generate the <filelist> section's <dir> and <file> tags, but with
-     * simple human-readable output
-     *
-     * @param array|PEAR_Error $struc   the sorted directory structure, or an error
-     *                        from filelist generation
-     * @param false|string     $role    whether the parent directory has a role this should
-     *                         inherit
-     * @param string           $_curdir indentation level
-     *
-     * @return array|PEAR_Error
-     * @access private
-     * @since  1.2.0
-     */
-    function _getSimpleDirTag($struc, $role = false, $_curdir = '')
-    {
-        if (PEAR::isError($struc)) {
-            return $struc;
-        }
-        extract($this->_options);
-        $ret = array();
-        foreach ($struc as $dir => $files) {
-            if (false && $dir === '/') {
-                // global directory role? overrides all exceptions except file exceptions
-                if (isset($dir_roles['/'])) {
-                    $role = $dir_roles['/'];
-                }
-                return array(
-                    'baseinstalldir' => $this->_options['baseinstalldir'],
-                    '##files' => $this->_getSimpleDirTag($struc[$dir], $role, ''),
-                    'name' => '/');
-            } else {
-                if (!isset($files['file']) || is_array($files['file'])) {
-                    if (isset($dir_roles[$_curdir . $dir])) {
-                        $myrole = $dir_roles[$_curdir . $dir];
-                    } else {
-                        $myrole = $role;
-                    }
-                    $ret[$dir] = array();
-                    if ($dir == '/') {
-                        $ret[$dir]['baseinstalldir'] = $this->_options['baseinstalldir'];
-                    }
-                    $ret[$dir]['name'] = $dir;
-
-                    $recurdir = ($_curdir == '') ? $dir . '/' : $_curdir . $dir . '/';
-                    if ($recurdir == '//') {
-                        $recurdir = '';
-                    }
-                    $ret[$dir]['##files'] = $this->_getSimpleDirTag($files, $myrole, $recurdir);
-                } else {
-                    $myrole = '';
-                    if (!$role) {
-                        $myrole = false;
-                        if (isset($exceptions[$files['path']])) {
-                            $myrole = $exceptions[$files['path']];
-                        } elseif (isset($roles[$files['ext']])) {
-                            $myrole = $roles[$files['ext']];
-                        } else {
-                            $myrole = $roles['*'];
-                        }
-                    } else {
-                        $myrole = $role;
-                        if (isset($exceptions[$files['path']])) {
-                            $myrole = $exceptions[$files['path']];
-                        }
-                    }
-                    $test = explode('/', $files['path']);
-                    foreach ($test as $subpath) {
-                        if ($subpath == 'CVS') {
-                            $this->pushWarning(PEAR_PACKAGEFILEMANAGER_CVS_PACKAGED,
-                                array('path' => $files['path']));
-                        }
-                    }
-                    $ret[$files['file']] = array('role' => $myrole);
-                    if (isset($installexceptions[$files['path']])) {
-                        $ret[$files['file']]['baseinstalldir'] =
-                            $installexceptions[$files['path']];
-                    }
-                    if (isset($platformexceptions[$files['path']])) {
-                        $ret[$files['file']]['platform'] = $platformexceptions[$files['path']];
-                    }
-                    if (isset($installas[$files['path']])) {
-                        $ret[$files['file']]['install-as'] = $installas[$files['path']];
-                    }
-                    if (isset($replacements[$files['path']])) {
-                        $ret[$files['file']]['replacements'] = $replacements[$files['path']];
-                    }
-                    if (isset($globalreplacements)) {
-                        if (!isset($ret[$files['file']]['replacements'])) {
-                            $ret[$files['file']]['replacements'] = array();
-                        }
-                        $ret[$files['file']]['replacements'] = array_merge(
-                            $ret[$files['file']]['replacements'], $globalreplacements);
-                    }
-                }
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Recursively generate the <filelist> section's <dir> and <file> tags
-     *
-     * @param array|PEAR_Error $struc   the sorted directory structure, or an error
-     *                         from filelist generation
-     * @param false|string     $role    whether the parent directory has a role this should
-     *                         inherit
-     * @param string           $_curdir indentation level
-     *
-     * @return array|PEAR_Error
-     * @access private
-     * @since  0.1
-     */
-    function _getDirTag($struc, $role = false, $_curdir = '')
-    {
-        if (PEAR::isError($struc)) {
-            return $struc;
-        }
-        extract($this->_options);
-        $ret = array();
-        foreach ($struc as $dir => $files) {
-            if ($dir === '/') {
-                // global directory role? overrides all exceptions except file exceptions
-                if (isset($dir_roles['/'])) {
-                    $role = $dir_roles['/'];
-                }
-                return $this->_getDirTag($struc[$dir], $role, '');
-            } else {
-                if (!isset($files['file']) || is_array($files['file'])) {
-                    $myrole = '';
-                    if (isset($dir_roles[$_curdir . $dir])) {
-                        $myrole = $dir_roles[$_curdir . $dir];
-                    } elseif ($role) {
-                        $myrole = $role;
-                    }
-                    $ret = array_merge($ret, $this->_getDirTag($files, $myrole, $_curdir . $dir . '/'));
-                } else {
-                    $myrole = '';
-                    if (!$role) {
-                        $myrole = false;
-                        if (isset($exceptions[$files['path']])) {
-                            $myrole = $exceptions[$files['path']];
-                        } elseif (isset($roles[$files['ext']])) {
-                            $myrole = $roles[$files['ext']];
-                        } else {
-                            $myrole = $roles['*'];
-                        }
-                    } else {
-                        $myrole = $role;
-                        if (isset($exceptions[$files['path']])) {
-                            $myrole = $exceptions[$files['path']];
-                        }
-                    }
-                    if (isset($installexceptions[$files['path']])) {
-                        $bi = $installexceptions[$files['path']];
-                    } else {
-                        $bi = $this->_options['baseinstalldir'];
-                    }
-                    $test = explode('/', $files['path']);
-                    foreach ($test as $subpath) {
-                        if ($subpath == 'CVS') {
-                            $this->pushWarning(PEAR_PACKAGEFILEMANAGER_CVS_PACKAGED, array('path' => $files['path']));
-                        }
-                    }
-                    $ret[$files['path']] =
-                        array('role' => $myrole,
-                              'baseinstalldir' => $bi,
-                              );
-                    if (!isset($this->_options['simpleoutput'])) {
-                        $md5sum = @md5_file($this->_options['packagedirectory'] . $files['path']);
-                        if (!empty($md5sum)) {
-                            $ret[$files['path']]['md5sum'] = $md5sum;
-                        }
-                    } elseif (isset($ret[$files['path']]['md5sum'])) {
-                        unset($ret[$files['path']]['md5sum']);
-                    }
-                    if (isset($platformexceptions[$files['path']])) {
-                        $ret[$files['path']]['platform'] = $platformexceptions[$files['path']];
-                    }
-                    if (isset($installas[$files['path']])) {
-                        $ret[$files['path']]['install-as'] = $installas[$files['path']];
-                    }
-                    if (isset($replacements[$files['path']])) {
-                        $ret[$files['path']]['replacements'] = $replacements[$files['path']];
-                    }
-                    if (isset($globalreplacements) && is_array($globalreplacements)) {
-                        if (!isset($ret[$files['path']]['replacements'])) {
-                            $ret[$files['path']]['replacements'] = array();
-                        }
-                        $ret[$files['path']]['replacements'] = array_merge(
-                            $ret[$files['path']]['replacements'], $globalreplacements);
-                    }
-                    if ($myrole == 'php' && !$this->_options['simpleoutput']) {
-                        $this->_addProvides($this->_pear, $files['fullpath']);
-                    }
-                }
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * @param array $files
-     * @param array &$ret
-     *
-     * @return array
-     * @access private
-     * @since  1.3.0
-     */
-    function _traverseFileArray($files, &$ret)
-    {
-        foreach ($files as $file) {
-            if (!isset($file['fullpath'])) {
-                $this->_traverseFileArray($file, $ret);
-            } else {
-                $ret[] = $file['fullpath'];
-            }
-        }
-    }
-
-    /**
-     * Retrieve the 'deps' option passed to the constructor
-     *
-     * @return array|PEAR_Error
-     * @access private
-     * @since  0.1
-     */
-    function _getDependencies()
-    {
-        if ($this->_detectDependencies) {
-            $this->_traverseFileArray($this->_struc, $ret);
-            $compatinfo = new PHP_CompatInfo();
-            $info       = $compatinfo->parseArray($ret);
-
-            $ret = $this->addDependency('php', $info['version'], 'ge', 'php', false);
-            if (is_a($ret, 'PEAR_Error')) {
-                return $ret;
-            }
-            foreach ($info['extensions'] as $ext) {
-                $this->addDependency($ext, '', 'has', 'ext', false);
-            }
-        }
-        if (isset($this->_packageXml['release_deps']) &&
-              is_array($this->_packageXml['release_deps'])) {
-            return $this->_packageXml['release_deps'];
-        } else {
-            return array();
-        }
-    }
-
-    /**
-     * Creates a changelog entry with the current release
-     * notes and dates, or overwrites a previous creation
-     *
-     * @return void
-     * @access private
-     * @since  0.1
-     */
-    function _updateChangeLog()
-    {
-        $curlog = $oldchangelog = false;
-        if (!isset($this->_packageXml['changelog'])) {
-            $changelog = array();
-            if (isset($this->_oldPackageXml['release_notes'])) {
-                $changelog['release_notes'] = $this->_oldPackageXml['release_notes'];
-            }
-            if (isset($this->_oldPackageXml['version'])) {
-                $changelog['version'] = $this->_oldPackageXml['version'];
-            }
-            if (isset($this->_oldPackageXml['release_date'])) {
-                $changelog['release_date'] = $this->_oldPackageXml['release_date'];
-            }
-            if (isset($this->_oldPackageXml['release_license'])) {
-                $changelog['release_license'] = $this->_oldPackageXml['release_license'];
-            }
-            if (isset($this->_oldPackageXml['release_state'])) {
-                $changelog['release_state'] = $this->_oldPackageXml['release_state'];
-            }
-            if (count($changelog)) {
-                $this->_packageXml['changelog'] = array($changelog);
-            } else {
-                $this->_packageXml['changelog'] = array();
-            }
-        } else {
-            if (isset($this->_oldPackageXml['release_notes'])) {
-                $oldchangelog['release_notes'] = $this->_oldPackageXml['release_notes'];
-            }
-            if (isset($this->_oldPackageXml['version'])) {
-                $oldchangelog['version'] = $this->_oldPackageXml['version'];
-            }
-            if (isset($this->_oldPackageXml['release_date'])) {
-                $oldchangelog['release_date'] = $this->_oldPackageXml['release_date'];
-            }
-            if (isset($this->_oldPackageXml['release_license'])) {
-                $oldchangelog['release_license'] = $this->_oldPackageXml['release_license'];
-            }
-            if (isset($this->_oldPackageXml['release_state'])) {
-                $oldchangelog['release_state'] = $this->_oldPackageXml['release_state'];
-            }
-        }
-        $hasoldversion = false;
-        foreach ($this->_packageXml['changelog'] as $index => $changelog) {
-            if ($oldchangelog && isset($oldchangelog['version'])
-                    && strnatcasecmp($oldchangelog['version'], $changelog['version']) == 0) {
-                $hasoldversion = true;
-            }
-            if (isset($changelog['version']) && strnatcasecmp($changelog['version'], $this->_options['version']) == 0) {
-                $curlog = $index;
-            }
-            if (isset($this->_packageXml['changelog'][$index]['release_notes'])) {
-                $this->_packageXml['changelog'][$index]['release_notes'] = trim($changelog['release_notes']);
-            }
-            // the parsing of the release notes adds a \n for some reason
-        }
-        if (!$hasoldversion && $oldchangelog && count($oldchangelog)
-              && $oldchangelog['version'] != $this->_options['version']) {
-            $this->_packageXml['changelog'][] = $oldchangelog;
-        }
-        $notes = ($this->_options['changelognotes'] ?
-                    $this->_options['changelognotes'] : $this->_options['notes']);
-        $changelog = array('version' => $this->_options['version'],
-                           'release_date' => date('Y-m-d'),
-                           'release_license' => $this->_options['license'],
-                           'release_state' => $this->_options['state'],
-                           'release_notes' => $notes,
-                           );
-        if ($curlog !== false) {
-            $this->_packageXml['changelog'][$curlog] = $changelog;
-        } else {
-            $this->_packageXml['changelog'][] = $changelog;
-        }
-        usort($this->_packageXml['changelog'], array($this, '_changelogsort'));
-    }
-
-    /**
-     * User-defined comparison function to sort changelog array
-     *
-     * @return integer sort comparaison result (-1, 0, +1) of two elements $a and $b
-     * @access private
-     * @since  0.12
-     */
-    function _changelogsort($a, $b)
-    {
-        if ($this->_options['changelogoldtonew']) {
-            $c  = strtotime($a['release_date']);
-            $d  = strtotime($b['release_date']);
-            $v1 = $a['version'];
-            $v2 = $b['version'];
-        } else {
-            $d  = strtotime($a['release_date']);
-            $c  = strtotime($b['release_date']);
-            $v2 = $a['version'];
-            $v1 = $b['version'];
-        }
-        if ($c - $d > 0) {
-            return 1;
-        } elseif ($c - $d < 0) {
-            return -1;
-        }
-        return version_compare($v1, $v2);
-    }
-
-    /**
-     * @param string $path        full path to package file
-     * @param string $packagefile (optional) name of package file
-     *
-     * @return true|PEAR_Error
-     * @uses   _generateNewPackageXML() if no package.xml is found, it
-     *          calls this to create a new one
-     * @throws PEAR_PACKAGEFILEMANAGER_RUN_SETOPTIONS
-     * @throws PEAR_PACKAGEFILEMANAGER_PATH_DOESNT_EXIST
-     * @access private
-     * @since  0.1
-     */
-    function _getExistingPackageXML($path, $packagefile = 'package.xml')
-    {
-        if (is_string($path) && is_dir($path)) {
-            $contents = false;
-            if (file_exists($path . $packagefile)) {
-                $contents = file_get_contents($path . $packagefile);
-            }
-            if (!$contents) {
-                return $this->_generateNewPackageXML();
-            } else {
-                $PEAR_Common = $this->_options['pearcommonclass'];
-                if (!class_exists($PEAR_Common)) {
-                    return $this->raiseError(PEAR_PACKAGEFILEMANAGER_RUN_SETOPTIONS);
-                }
-                $common = new $PEAR_Common;
-                if (is_a($common, 'PEAR_Common')) {
-                    $this->_oldPackageXml =
-                    $this->_packageXml = $common->infoFromString($contents);
-                } else { // new way
-                    include_once 'PEAR/PackageFile.php';
-                    $z = &PEAR_Config::singleton();
-                    $pkg = &new PEAR_PackageFile($z);
-                    $pf = &$pkg->fromXmlString($contents, PEAR_VALIDATE_DOWNLOADING, $path . $packagefile);
-                    if (PEAR::isError($pf)) {
-                        return $pf;
-                    }
-                    if ($pf->getPackagexmlVersion() != '1.0') {
-                        return PEAR::raiseError('PEAR_PackageFileManager can only manage ' .
-                            'package.xml version 1.0, use PEAR_PackageFileManager_v2 for newer' .
-                            ' package files');
-                    }
-                    $this->_oldPackageXml =
-                    $this->_packageXml = $pf->toArray();
-                }
-                if (PEAR::isError($this->_packageXml)) {
-                    return $this->_packageXml;
-                }
-                if ($this->_options['cleardependencies']) {
-                    $this->_packageXml['release_deps'] = $this->_options['deps'];
-                }
-                if ($this->_options['deps'] !== false) {
-                    $this->_packageXml['release_deps'] = $this->_options['deps'];
-                } else {
-                    if (isset($this->_packageXml['release_deps'])) {
-                        $this->_options['deps'] = $this->_packageXml['release_deps'];
-                    }
-                }
-                if ($this->_options['maintainers'] !== false) {
-                    $this->_packageXml['maintainers'] = $this->_options['maintainers'];
-                } else {
-                    $this->_options['maintainers'] = $this->_packageXml['maintainers'];
-                }
-                unset($this->_packageXml['filelist']);
-                unset($this->_packageXml['provides']);
-            }
-            return true;
-        } else {
-            if (!is_string($path)) {
-                $path = gettype($path);
-            }
-            return $this->raiseError(PEAR_PACKAGEFILEMANAGER_PATH_DOESNT_EXIST,
-                $path);
-        }
-    }
-
-    /**
-     * Create the structure for a new package.xml
-     *
-     * @uses   $_packageXml emulates reading in a package.xml
-     *           by using the package, summary and description
-     *           options
-     * @return true|PEAR_Error
-     * @access private
-     * @since  0.9
-     */
-    function _generateNewPackageXML()
-    {
-        $this->_oldPackageXml = false;
-        if (!isset($this->_options['package']) || empty($this->_options['package'])) {
-            return $this->raiseError(PEAR_PACKAGEFILEMANAGER_NOPACKAGE);
-        }
-        if (!isset($this->_options['summary']) || empty($this->_options['summary'])) {
-            return $this->raiseError(PEAR_PACKAGEFILEMANAGER_NOSUMMARY);
-        }
-        if (!isset($this->_options['description']) || empty($this->_options['description'])) {
-            return $this->raiseError(PEAR_PACKAGEFILEMANAGER_NODESC);
-        }
-        $this->_packageXml                = array();
-        $this->_packageXml['package']     = $this->_options['package'];
-        $this->_packageXml['summary']     = $this->_options['summary'];
-        $this->_packageXml['description'] = $this->_options['description'];
-        $this->_packageXml['changelog']   = array();
-        if ($this->_options['deps'] !== false) {
-            $this->_packageXml['release_deps'] = $this->_options['deps'];
-        } else {
-            $this->_packageXml['release_deps'] = $this->_options['deps'] = array();
-        }
-        if ($this->_options['maintainers'] !== false) {
-            $this->_packageXml['maintainers'] = $this->_options['maintainers'];
-        } else {
-            $this->_packageXml['maintainers'] = $this->_options['maintainers'] = array();
-        }
-        return true;
-    }
-}
-?>
\ No newline at end of file
diff --git a/lib/vendor/PEAR/PEAR/PackageFileManager2.php b/lib/vendor/PEAR/PEAR/PackageFileManager2.php
index 21b99b654..dfe52a8ef 100644
--- a/lib/vendor/PEAR/PEAR/PackageFileManager2.php
+++ b/lib/vendor/PEAR/PEAR/PackageFileManager2.php
@@ -3,31 +3,21 @@
  * PEAR_PackageFileManager2, like PEAR_PackageFileManager, is designed to
  * create and manipulate package.xml version 2.0.
  *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
+ * PHP versions 5 and 7
  *
  * @category  PEAR
- * @package   PEAR_PackageFileManager
+ * @package   PEAR_PackageFileManager2
  * @author    Greg Beaver <cellog@php.net>
- * @copyright 2005-2007 The PHP Group
- * @license   http://www.php.net/license/3_01.txt  PHP License 3.01
- * @version   CVS: $Id: PackageFileManager2.php,v 1.63 2007/11/19 22:27:39 farell Exp $
- * @link      http://pear.php.net/package/PEAR_PackageFileManager
- * @since     File available since Release 1.6.0
+ * @copyright 2003-2015 The PEAR Group
+ * @license   New BSD, Revised
+ * @link      http://pear.php.net/package/PEAR_PackageFileManager2
+ * @since     File available since Release 1.0.0alpha1
  */
 /**
  * PEAR Packagefile parser
  */
 require_once 'PEAR/PackageFile.php';
-/**
- * needed for error constants
- */
-require_once 'PEAR/PackageFileManager.php';
+
 /**
  * PEAR Packagefile version 2.0
  */
@@ -35,29 +25,28 @@
 /**#@+
  * Error Codes
  */
-define('PEAR_PACKAGEFILEMANAGER2_NOPKGDIR', 3);
-define('PEAR_PACKAGEFILEMANAGER2_NOBASEDIR', 4);
-define('PEAR_PACKAGEFILEMANAGER2_GENERATOR_NOTFOUND', 5);
-define('PEAR_PACKAGEFILEMANAGER2_GENERATOR_NOTFOUND_ANYWHERE', 6);
-define('PEAR_PACKAGEFILEMANAGER2_CANTWRITE_PKGFILE', 7);
-define('PEAR_PACKAGEFILEMANAGER2_DEST_UNWRITABLE', 8);
-define('PEAR_PACKAGEFILEMANAGER2_CANTCOPY_PKGFILE', 9);
-define('PEAR_PACKAGEFILEMANAGER2_CANTOPEN_TMPPKGFILE', 10);
-define('PEAR_PACKAGEFILEMANAGER2_PATH_DOESNT_EXIST', 11);
-define('PEAR_PACKAGEFILEMANAGER2_NOCVSENTRIES', 12);
-define('PEAR_PACKAGEFILEMANAGER2_DIR_DOESNT_EXIST', 13);
-define('PEAR_PACKAGEFILEMANAGER2_RUN_SETOPTIONS', 14);
-define('PEAR_PACKAGEFILEMANAGER2_NO_FILES', 20);
-define('PEAR_PACKAGEFILEMANAGER2_IGNORED_EVERYTHING', 21);
-define('PEAR_PACKAGEFILEMANAGER2_INVALID_PACKAGE', 22);
-define('PEAR_PACKAGEFILEMANAGER2_INVALID_REPLACETYPE', 23);
-define('PEAR_PACKAGEFILEMANAGER2_INVALID_ROLE', 24);
-define('PEAR_PACKAGEFILEMANAGER2_CVS_PACKAGED', 26);
-define('PEAR_PACKAGEFILEMANAGER2_NO_PHPCOMPATINFO', 27);
-define('PEAR_PACKAGEFILEMANAGER2_INVALID_POSTINSTALLSCRIPT', 28);
-define('PEAR_PACKAGEFILEMANAGER2_PKGDIR_NOTREAL', 29);
-define('PEAR_PACKAGEFILEMANAGER2_OUTPUTDIR_NOTREAL', 30);
-define('PEAR_PACKAGEFILEMANAGER2_PATHTOPKGDIR_NOTREAL', 31);
+define('PEAR_PACKAGEFILEMANAGER2_NOPKGDIR',                     3);
+define('PEAR_PACKAGEFILEMANAGER2_NOBASEDIR',                    4);
+define('PEAR_PACKAGEFILEMANAGER2_GENERATOR_NOTFOUND',           5);
+define('PEAR_PACKAGEFILEMANAGER2_GENERATOR_NOTFOUND_ANYWHERE',  6);
+define('PEAR_PACKAGEFILEMANAGER2_CANTWRITE_PKGFILE',            7);
+define('PEAR_PACKAGEFILEMANAGER2_DEST_UNWRITABLE',              8);
+define('PEAR_PACKAGEFILEMANAGER2_CANTCOPY_PKGFILE',             9);
+define('PEAR_PACKAGEFILEMANAGER2_CANTOPEN_TMPPKGFILE',         10);
+define('PEAR_PACKAGEFILEMANAGER2_PATH_DOESNT_EXIST',           11);
+define('PEAR_PACKAGEFILEMANAGER2_DIR_DOESNT_EXIST',            13);
+define('PEAR_PACKAGEFILEMANAGER2_RUN_SETOPTIONS',              14);
+define('PEAR_PACKAGEFILEMANAGER2_NO_FILES',                    20);
+define('PEAR_PACKAGEFILEMANAGER2_IGNORED_EVERYTHING',          21);
+define('PEAR_PACKAGEFILEMANAGER2_INVALID_PACKAGE',             22);
+define('PEAR_PACKAGEFILEMANAGER2_INVALID_REPLACETYPE',         23);
+define('PEAR_PACKAGEFILEMANAGER2_INVALID_ROLE',                24);
+define('PEAR_PACKAGEFILEMANAGER2_CVS_PACKAGED',                26);
+define('PEAR_PACKAGEFILEMANAGER2_NO_PHPCOMPATINFO',            27);
+define('PEAR_PACKAGEFILEMANAGER2_INVALID_POSTINSTALLSCRIPT',   28);
+define('PEAR_PACKAGEFILEMANAGER2_PKGDIR_NOTREAL',              29);
+define('PEAR_PACKAGEFILEMANAGER2_OUTPUTDIR_NOTREAL',           30);
+define('PEAR_PACKAGEFILEMANAGER2_PATHTOPKGDIR_NOTREAL',        31);
 /**#@-*/
 /**
  * Error messages
@@ -97,8 +86,6 @@
             'Failed to open temporary file "%s" for writing',
         PEAR_PACKAGEFILEMANAGER2_PATH_DOESNT_EXIST =>
             'package.xml file path "%s" doesn\'t exist or isn\'t a directory',
-        PEAR_PACKAGEFILEMANAGER2_NOCVSENTRIES =>
-            'Directory "%s" is not a CVS directory (it must have the CVS/Entries file)',
         PEAR_PACKAGEFILEMANAGER2_DIR_DOESNT_EXIST =>
             'Package source base directory "%s" doesn\'t exist or isn\'t a directory',
         PEAR_PACKAGEFILEMANAGER2_RUN_SETOPTIONS =>
@@ -118,7 +105,7 @@
         PEAR_PACKAGEFILEMANAGER2_CVS_PACKAGED =>
             'path "%path%" contains CVS directory',
         PEAR_PACKAGEFILEMANAGER2_NO_PHPCOMPATINFO =>
-            'PHP_Compat is not installed, cannot detect dependencies',
+            'pear/PHP_CompatInfo is not installed, cannot detect dependencies',
        ),
         // other language translations go here
      );
@@ -145,10 +132,10 @@
  * //require_once 'PEAR/Config.php';
  * //PEAR_Config::singleton('/path/to/unusualpearconfig.ini');
  * // use the above lines if the channel information is not validating
- * $packagexml = new PEAR_PackageFileManager2;
+ * $pfm = new PEAR_PackageFileManager2;
  * // for an existing package.xml use
- * // $packagexml = {@link importOptions()} instead
- * $e = $packagexml->setOptions(
+ * // $pfm = {@link importOptions()} instead
+ * $e = $pfm->setOptions(
  * array('baseinstalldir' => 'PhpDocumentor',
  *  'packagedirectory' => 'C:/Web Pages/chiara/phpdoc2/',
  *  'filelistgenerator' => 'cvs', // generate from cvs, use file for directory
@@ -157,40 +144,40 @@
  *  'dir_roles' => array('tutorials' => 'doc'),
  *  'exceptions' => array('README' => 'doc', // README would be data, now is doc
  *                        'PHPLICENSE.txt' => 'doc'))); // same for the license
- * $packagexml->setPackage('MyPackage');
- * $packagexml->setSummary('this is my package');
- * $packagexml->setDescription('this is my package description');
- * $packagexml->setChannel('mychannel.example.com');
- * $packagexml->setAPIVersion('1.0.0');
- * $packagexml->setReleaseVersion('1.2.1');
- * $packagexml->setReleaseStability('stable');
- * $packagexml->setAPIStability('stable');
- * $packagexml->setNotes("We've implemented many new and exciting features");
- * $packagexml->setPackageType('php'); // this is a PEAR-style php script package
- * $packagexml->addRelease(); // set up a release section
- * $packagexml->setOSInstallCondition('windows');
- * $packagexml->addInstallAs('pear-phpdoc.bat', 'phpdoc.bat');
- * $packagexml->addIgnoreToRelease('pear-phpdoc');
- * $packagexml->addRelease(); // add another release section for all other OSes
- * $packagexml->addInstallAs('pear-phpdoc', 'phpdoc');
- * $packagexml->addIgnoreToRelease('pear-phpdoc.bat');
- * $packagexml->addRole('pkg', 'doc'); // add a new role mapping
- * $packagexml->setPhpDep('4.2.0');
- * $packagexml->setPearinstallerDep('1.4.0a12');
- * $packagexml->addMaintainer('lead', 'cellog', 'Greg Beaver', 'cellog@php.net');
- * $packagexml->setLicense('PHP License', 'http://www.php.net/license');
- * $packagexml->generateContents(); // create the <contents> tag
+ * $pfm->setPackage('MyPackage');
+ * $pfm->setSummary('this is my package');
+ * $pfm->setDescription('this is my package description');
+ * $pfm->setChannel('mychannel.example.com');
+ * $pfm->setAPIVersion('1.0.0');
+ * $pfm->setReleaseVersion('1.2.1');
+ * $pfm->setReleaseStability('stable');
+ * $pfm->setAPIStability('stable');
+ * $pfm->setNotes("We've implemented many new and exciting features");
+ * $pfm->setPackageType('php'); // this is a PEAR-style php script package
+ * $pfm->addRelease(); // set up a release section
+ * $pfm->setOSInstallCondition('windows');
+ * $pfm->addInstallAs('pear-phpdoc.bat', 'phpdoc.bat');
+ * $pfm->addIgnoreToRelease('pear-phpdoc');
+ * $pfm->addRelease(); // add another release section for all other OSes
+ * $pfm->addInstallAs('pear-phpdoc', 'phpdoc');
+ * $pfm->addIgnoreToRelease('pear-phpdoc.bat');
+ * $pfm->addRole('pkg', 'doc'); // add a new role mapping
+ * $pfm->setPhpDep('4.2.0');
+ * $pfm->setPearinstallerDep('1.4.0a12');
+ * $pfm->addMaintainer('lead', 'cellog', 'Greg Beaver', 'cellog@php.net');
+ * $pfm->setLicense('PHP License', 'http://www.php.net/license');
+ * $pfm->generateContents(); // create the <contents> tag
  * // replace @PHP-BIN@ in this file with the path to php executable!  pretty neat
  * $test->addReplacement('pear-phpdoc', 'pear-config', '@PHP-BIN@', 'php_bin');
  * $test->addReplacement('pear-phpdoc.bat', 'pear-config', '@PHP-BIN@', 'php_bin');
- * $pkg = &$packagexml->exportCompatiblePackageFile1(); // get a PEAR_PackageFile object
+ * $pkg = &$pfm->exportCompatiblePackageFile1(); // get a PEAR_PackageFile object
  * // note use of {@link debugPackageFile()} - this is VERY important
  * if (isset($_GET['make']) || (isset($_SERVER['argv']) && @$_SERVER['argv'][1] == 'make')) {
  *     $pkg->writePackageFile();
- *     $packagexml->writePackageFile();
+ *     $pfm->writePackageFile();
  * } else {
  *     $pkg->debugPackageFile();
- *     $packagexml->debugPackageFile();
+ *     $pfm->debugPackageFile();
  * }
  * ?>
  * </code>
@@ -200,13 +187,13 @@
  * the use of the {@link addLead(), addDeveloper(), addContributor(), addHelper()} methods
  *
  * @category  PEAR
- * @package   PEAR_PackageFileManager
+ * @package   PEAR_PackageFileManager2
  * @author    Greg Beaver <cellog@php.net>
- * @copyright 2005-2007 The PHP Group
- * @license   http://www.php.net/license/3_01.txt  PHP License 3.01
- * @version   Release: 1.6.3
- * @link      http://pear.php.net/package/PEAR_PackageFileManager
- * @since     Class available since Release 1.6.0
+ * @copyright 2003-2015 The PEAR Group
+ * @license   New BSD, Revised
+ * @version   Release: 1.0.4
+ * @link      http://pear.php.net/package/PEAR_PackageFileManager2
+ * @since     Class available since Release 1.0.0alpha1
  */
 class PEAR_PackageFileManager2 extends PEAR_PackageFile_v2_rw
 {
@@ -215,7 +202,7 @@ class PEAR_PackageFileManager2 extends PEAR_PackageFile_v2_rw
      * regexp-ready string to search for basename of ignore strings),...)
      * @var false|array
      * @access private
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     var $_ignore = false;
 
@@ -223,7 +210,7 @@ class PEAR_PackageFileManager2 extends PEAR_PackageFile_v2_rw
      * Contents of the package.xml file
      * @var PEAR_PackageFile_v2
      * @access private
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     var $_packageXml = false;
 
@@ -231,7 +218,7 @@ class PEAR_PackageFileManager2 extends PEAR_PackageFile_v2_rw
      * List of warnings
      * @var array
      * @access private
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     var $_warningStack = array();
 
@@ -239,7 +226,7 @@ class PEAR_PackageFileManager2 extends PEAR_PackageFile_v2_rw
      * flag used to determine whether to use PHP_CompatInfo to detect deps
      * @var boolean
      * @access private
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     var $_detectDependencies = false;
 
@@ -247,7 +234,7 @@ class PEAR_PackageFileManager2 extends PEAR_PackageFile_v2_rw
      * The original contents of the old package.xml, if any
      * @var PEAR_PackageFile_v2|false
      * @access private
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     var $_oldPackageFile = false;
 
@@ -258,7 +245,7 @@ class PEAR_PackageFileManager2 extends PEAR_PackageFile_v2_rw
      * related packages whose files reside in the same development directory
      * @var array
      * @access private
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     var $_subpackages = array();
 
@@ -266,64 +253,62 @@ class PEAR_PackageFileManager2 extends PEAR_PackageFile_v2_rw
      * List of package.xml generation options
      * @var string
      * @access private
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     var $_options = array(
-                      'packagefile' => 'package.xml',
+                      'packagefile'       => 'package.xml',
                       'filelistgenerator' => 'file',
-                      'license' => 'PHP License',
-                      'baseinstalldir' => '',
+                      'license'           => 'New BSD License',
+                      'baseinstalldir'    => '',
                       'changelogoldtonew' => true,
                       'roles' =>
                         array(
-                            'h' => 'src',
-                            'c' => 'src',
-                            'm4' => 'src',
-                            'w32' => 'src',
-                            'dll' => 'ext',
-                            'php' => 'php',
+                            'h'    => 'src',
+                            'c'    => 'src',
+                            'cpp'  => 'src',
+                            'in'   => 'src',
+                            'm4'   => 'src',
+                            'w32'  => 'src',
+                            'dll'  => 'ext',
+                            'php'  => 'php',
                             'html' => 'doc',
-                            '*' => 'data',
+                            '*'    => 'data',
                              ),
                       'dir_roles' =>
                         array(
-                            'docs' => 'doc',
+                            'docs'     => 'doc',
                             'examples' => 'doc',
-                            'tests' => 'test',
+                            'tests'    => 'test',
+                            'scripts'  => 'script',
                              ),
-                      'exceptions' => array(),
+                      'exceptions'        => array(),
                       'installexceptions' => array(),
-                      'ignore' => array(),
+                      'ignore'  => array(),
                       'include' => false,
-                      'notes' => '',
-                      'changelognotes' => false,
-                      'outputdirectory' => false,
+                      'notes'   => '',
+                      'changelognotes'    => false,
+                      'outputdirectory'   => false,
                       'pathtopackagefile' => false,
                       'lang' => 'en',
-                      'configure_options' => array(),
-                      'replacements' => array(),
-                      'globalreplacements' => array(),
+                      'configure_options'       => array(),
+                      'replacements'            => array(),
+                      'globalreplacements'      => array(),
                       'globalreplaceexceptions' => array(),
-                      'simpleoutput' => false,
-                      'addhiddenfiles' => false,
+                      'simpleoutput'      => false,
+                      'addhiddenfiles'    => false,
                       'cleardependencies' => false,
-                      'clearcontents' => true,
-                      'clearchangelog' => false,
+                      'clearcontents'     => true,
+                      'clearchangelog'    => false,
                       );
 
     /**
-     * Does nothing, use factory
-     *
-     * The constructor is not used in order to be able to
-     * return a PEAR_Error from setOptions
-     *
      * @see    setOptions()
      * @access public
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
-    function PEAR_PackageFileManager2()
+    function __construct()
     {
-        parent::PEAR_PackageFile_v2();
+        parent::__construct();
         $config = &PEAR_Config::singleton();
         $this->setConfig($config);
     }
@@ -337,8 +322,8 @@ function PEAR_PackageFileManager2()
      * Note that to match partial path entries, you must start with a *,
      * so to match "data/README" you need to use "*data/README"
      *
-     * @param string $include file pattern to include
-     * @param bool   $clear   (optional) if true, the include array will be reset
+     * @param string|array $include file pattern to include
+     * @param bool         $clear   (optional) if true, the include array will be reset
      *                        (useful for cloned packagefiles)
      *
      * @return void
@@ -350,6 +335,7 @@ function addInclude($include, $clear = false)
         if ($clear) {
             $this->_options['include'] = array();
         }
+
         if (is_array($include)) {
             foreach ($include as $fn) {
                 if (is_string($fn)) {
@@ -446,6 +432,7 @@ function addIgnore($ignore, $clear = false)
      * - changelogoldtonew: True if the ChangeLog should list from oldest entry to
      *                      newest.  Set to false if you would like new entries first
      * - simpleoutput: True if the package.xml should be human-readable
+     * - clearchangelog: True if change log should not be generated/updated
      * - addhiddenfiles: True if you wish to add hidden files/directories that begin with .
      *                   like .bashrc.  This is only used by the File generator.  The CVS
      *                   generator will use all files in CVS regardless of format
@@ -502,24 +489,26 @@ function addIgnore($ignore, $clear = false)
      * @throws PEAR_PACKAGEFILEMANAGER2_GENERATOR_NOTFOUND_ANYWHERE
      * @throws PEAR_PACKAGEFILEMANAGER2_GENERATOR_NOTFOUND
      * @access public
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function setOptions($options = array(), $internal = false)
     {
         if (!isset($options['packagedirectory']) || !$options['packagedirectory']) {
             return $this->raiseError(PEAR_PACKAGEFILEMANAGER2_NOPKGDIR);
-        } else {
-            if (!file_exists($options['packagedirectory'])) {
-                return $this->raiseError(PEAR_PACKAGEFILEMANAGER2_PKGDIR_NOTREAL,
-                    $options['packagedirectory']);
-            }
-            $options['packagedirectory'] = str_replace(DIRECTORY_SEPARATOR,
-                                                     '/',
-                                                     realpath($options['packagedirectory']));
-            if ($options['packagedirectory']{strlen($options['packagedirectory']) - 1} != '/') {
-                $options['packagedirectory'] .= '/';
-            }
         }
+
+        if (!file_exists($options['packagedirectory'])) {
+            return $this->raiseError(PEAR_PACKAGEFILEMANAGER2_PKGDIR_NOTREAL,
+                $options['packagedirectory']);
+        }
+
+        $options['packagedirectory'] = str_replace(DIRECTORY_SEPARATOR,
+                                                 '/',
+                                                 realpath($options['packagedirectory']));
+        if ($options['packagedirectory']{strlen($options['packagedirectory']) - 1} != '/') {
+            $options['packagedirectory'] .= '/';
+        }
+
         if (isset($options['pathtopackagefile']) && $options['pathtopackagefile']) {
             if (!file_exists($options['pathtopackagefile'])) {
                 return $this->raiseError(PEAR_PACKAGEFILEMANAGER2_PATHTOPKGDIR_NOTREAL,
@@ -532,11 +521,13 @@ function setOptions($options = array(), $internal = false)
                 $options['pathtopackagefile'] .= '/';
             }
         }
+
         if (isset($options['outputdirectory']) && $options['outputdirectory']) {
             if (!file_exists($options['outputdirectory'])) {
                 return $this->raiseError(PEAR_PACKAGEFILEMANAGER2_OUTPUTDIR_NOTREAL,
                     $options['outputdirectory']);
             }
+
             $options['outputdirectory'] = str_replace(DIRECTORY_SEPARATOR,
                                                      '/',
                                                      realpath($options['outputdirectory']));
@@ -544,9 +535,11 @@ function setOptions($options = array(), $internal = false)
                 $options['outputdirectory'] .= '/';
             }
         }
+
         if (!isset($options['baseinstalldir']) || !$options['baseinstalldir']) {
             return $this->raiseError(PEAR_PACKAGEFILEMANAGER2_NOBASEDIR);
         }
+
         $this->_options = array_merge($this->_options, $options);
         if (!isset($this->_options['roles']['*'])) {
             $this->_options['roles']['*'] = 'data';
@@ -565,39 +558,40 @@ function setOptions($options = array(), $internal = false)
         }
 
         // file generator resource to load
-        $resource = 'PEAR/PackageFileManager/' . $this->_options['filelistgenerator'] . '.php';
+        $resource = 'PEAR/PackageFileManager/' . ucfirst(strtolower($this->_options['filelistgenerator'])) . '.php';
         // file generator class name
         $className = substr($resource, 0, -4);
         $className = str_replace('/', '_', $className);
 
-        if (!class_exists($className)) {
-            // attempt to load the interface from the standard PEAR location
-            if ($this->isIncludeable($resource)) {
-                include_once $resource;
-            } elseif (isset($this->_options['usergeneratordir'])) {
-                // attempt to load from a user-specified directory
-                if (is_dir(realpath($this->_options['usergeneratordir']))) {
-                    $this->_options['usergeneratordir'] =
-                        str_replace(DIRECTORY_SEPARATOR,
-                                    '/',
-                                    realpath($this->_options['usergeneratordir']));
-                    if ($this->_options['usergeneratordir']{strlen($this->_options['usergeneratordir']) - 1} != '/') {
-                        $this->_options['usergeneratordir'] .= '/';
-                    }
-                } else {
-                    $this->_options['usergeneratordir'] = '////';
-                }
-                $usergenerator = $this->_options['usergeneratordir'] .
-                    $this->_options['filelistgenerator'] . '.php';
-                if (file_exists($usergenerator) && is_readable($usergenerator)) {
-                    include_once $usergenerator;
-                }
-                if (!class_exists($className)) {
-                    return $this->raiseError(PEAR_PACKAGEFILEMANAGER2_GENERATOR_NOTFOUND_ANYWHERE,
-                        $className);
+        if (class_exists($className)) {
+            return;
+        }
+
+        // attempt to load the interface from the standard PEAR location
+        if ($this->isIncludeable($resource)) {
+            include_once $resource;
+        } elseif (isset($this->_options['usergeneratordir'])) {
+            // attempt to load from a user-specified directory
+            if (is_dir(realpath($this->_options['usergeneratordir']))) {
+                $this->_options['usergeneratordir'] =
+                    str_replace(DIRECTORY_SEPARATOR,
+                                '/',
+                                realpath($this->_options['usergeneratordir']));
+                if ($this->_options['usergeneratordir']{strlen($this->_options['usergeneratordir']) - 1} != '/') {
+                    $this->_options['usergeneratordir'] .= '/';
                 }
             } else {
-                return $this->raiseError(PEAR_PACKAGEFILEMANAGER2_GENERATOR_NOTFOUND,
+                $this->_options['usergeneratordir'] = '////';
+            }
+
+            $generator = $this->_options['usergeneratordir'] .
+                             ucfirst(strtolower($this->_options['filelistgenerator'])) . '.php';
+            if (file_exists($generator) && is_readable($generator)) {
+                include_once $generator;
+            }
+
+            if (!class_exists($className)) {
+                return $this->raiseError(PEAR_PACKAGEFILEMANAGER2_GENERATOR_NOTFOUND_ANYWHERE,
                     $className);
             }
         }
@@ -617,23 +611,21 @@ function setOptions($options = array(), $internal = false)
      *
      * @return void|false
      * @access public
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function specifySubpackage(&$pm, $dependency = null, $required = false)
     {
         if (!$pm->getDate()) {
             $pm->setDate(date('Y-m-d'));
         }
+
         if (!$pm->validate(PEAR_VALIDATE_NORMAL)) {
             return false;
         }
+
         $this->_subpackages[] = &$pm;
         if ($dependency !== null) {
-            if ($required) {
-                $type = 'required';
-            } else {
-                $type = 'optional';
-            }
+            $type = $required ? 'required' : 'optional';
             if ($pm->getChannel()) {
                 if ($dependency) {
                     $this->addPackageDepWithChannel($type, $pm->getPackage(), $pm->getChannel(),
@@ -654,112 +646,6 @@ function specifySubpackage(&$pm, $dependency = null, $required = false)
         }
     }
 
-    /**
-     * Return a PEAR_PackageFileManager object that can be used to generate a
-     * fully compatible package.xml version 1.0
-     *
-     * This simplifies the maintenance of both a package.xml version 1.0 and version 2.0,
-     * as a single script can be used to maintain both package.xml copies.  Use this
-     * after all settings have been applied to the version 2.0 class
-     *
-     * If the default packagefile used is package.xml, it will be automatically changed
-     * to package2.xml, and the package.xml version 1.0 will be output as package.xml.
-     * This simplifies the process of automatic packaging
-     *
-     * @param array $options (optional) array list of generation options
-     *
-     * @return PEAR_PackageFileManager
-     * @access public
-     * @since  1.6.0a1
-     * @deprecated  package xml 1.0 will not be needed for much longer and is deprecated
-     */
-    function &exportCompatiblePackageFile1($options = array())
-    {
-        if ($this->_options['packagefile'] == 'package.xml') {
-            $this->_options['packagefile'] = 'package2.xml';
-            if (!is_array($this->_options['ignore'])) {
-                $this->_options['ignore'] = array();
-            }
-            $this->_options['ignore'][] = 'package2.xml';
-        }
-        include_once 'PEAR/PackageFileManager.php';
-        $greplace = $replaces = false;
-        if (@$this->_options['globalreplacements']) {
-            $greplace = array();
-            foreach ($this->_options['globalreplacements'] as $replaceobj) {
-                $atts = $replaceobj->getXml();
-                $greplace[] = $atts['attribs'];
-            }
-        }
-        if (@$this->_options['replacements']) {
-            $replaces = array();
-            foreach ($this->_options['replacements'] as $path => $replaceobjs) {
-                foreach ($replaceobjs as $replaceobj) {
-                    if (!is_a($replaceobj, 'PEAR_Task_Replace')) {
-                        continue; // skip non-standard tasks
-                    }
-                    $atts = $replaceobj->getXml();
-                    $replaces[$path][] = $atts['attribs'];
-                }
-            }
-        }
-        $pf = &new PEAR_PackageFileManager();
-        $options = array_merge(array(
-                'packagefile' => 'package.xml',
-                'package' => $this->getPackage(),
-                'version' => $this->getVersion(),
-                'license' => $this->getLicense(),
-                'notes' => $this->getNotes(),
-                'changelognotes' => $this->_options['changelognotes'],
-                'summary' => $this->getSummary(),
-                'description' => $this->getDescription(),
-                'baseinstalldir' => $this->_options['baseinstalldir'],
-                'maintainers' => array(),
-                'cleardependencies' => true,
-                'state' => $this->getState(),
-                'globalreplacements' => $greplace,
-                'replacements' => $replaces,
-            ), $options);
-        $pf->setOptions(array_merge($this->_options, $options));
-        $this->setDate(date('Y-m-d')); // to avoid failed validation
-        $maintainers = $this->getMaintainers();
-        if ($maintainers) {
-            foreach ($maintainers as $maintainer) {
-                $pf->addMaintainer($maintainer['handle'], $maintainer['role'], $maintainer['name'],
-                    $maintainer['email']);
-            }
-        }
-        if (!isset($options['deps'])) {
-            $deps = $this->getDeps(false, true);
-            if ($deps) {
-                foreach ($deps as $dep) {
-                    $pf->addDependency(@$dep['name'], @$dep['version'], $dep['rel'], $dep['type'],
-                        $dep['optional'] == 'yes');
-                }
-            }
-        }
-        if ($this->_oldPackageFile) {
-            $pf->_packageXml['changelog'] = array();
-            $changelogV2 = $this->_oldPackageFile->getChangelog();
-            if ($changelogV2) {
-                if (!isset($changelogV2['release'][0])) {
-                    $changelogV2['release'] = array($changelogV2['release']);
-                }
-                foreach ($changelogV2['release'] as $index => $changelog) {
-                    $changelogV1 = array(
-                        'version' => $changelog['version']['release'],
-                        'release_date' => $changelog['date'],
-                        'release_license' => is_array($changelog['license']) ? $changelog['license']['_content'] : $changelog['license'],
-                        'release_state' => $changelog['stability']['release'],
-                        'release_notes' => $changelog['notes'],
-                        );
-                    $pf->_packageXml['changelog'][] = $changelogV1;
-                }
-            }
-        }
-        return $pf;
-    }
-
     /**
      * Convert a package xml 1.0 to 2.0 with user and default options
      *
@@ -769,19 +655,21 @@ function &exportCompatiblePackageFile1($options = array())
      * @return PEAR_PackageFileManager2|PEAR_Error
      * @static
      * @access public
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
-    function &importFromPackageFile1($packagefile, $options = array())
+    public static function &importFromPackageFile1($packagefile, $options = array())
     {
-        $z = &PEAR_Config::singleton();
+        $z   = &PEAR_Config::singleton();
         $pkg = new PEAR_PackageFile($z);
-        $pf = $pkg->fromPackageFile($packagefile, PEAR_VALIDATE_NORMAL);
+        $pf  = $pkg->fromPackageFile($packagefile, PEAR_VALIDATE_NORMAL);
         if (PEAR::isError($pf)) {
             return $pf;
         }
+
         if ($pf->getPackagexmlVersion() == '1.0') {
             $packagefile = &$pf;
         }
+
         $a = &PEAR_PackageFileManager2::importOptions($packagefile, $options);
         return $a;
     }
@@ -795,9 +683,9 @@ function &importFromPackageFile1($packagefile, $options = array())
      * @return PEAR_PackageFileManager2|PEAR_Error
      * @static
      * @access public
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
-    function &importOptions($packagefile, $options = array())
+    public static function &importOptions($packagefile, $options = array())
     {
         if (is_a($packagefile, 'PEAR_PackageFile_v1')) {
             $gen = &$packagefile->getDefaultGenerator();
@@ -805,10 +693,12 @@ function &importOptions($packagefile, $options = array())
             if (PEAR::isError($res)) {
                 return $res;
             }
+
             $res->setOld();
             if (isset($options['cleardependencies']) && $options['cleardependencies']) {
                 $res->clearDeps();
             }
+
             if (!isset($options['clearcontents']) || $options['clearcontents']) {
                 $res->clearContents();
             } else {
@@ -816,16 +706,19 @@ function &importOptions($packagefile, $options = array())
             }
             $packagefile = $packagefile->getPackageFile();
         }
+
         if (!isset($res)) {
-            if (PEAR::isError($res =
-                  &PEAR_PackageFileManager2::_getExistingPackageXML(dirname($packagefile) .
-                  DIRECTORY_SEPARATOR, basename($packagefile), $options))) {
+            $res = &PEAR_PackageFileManager2::_getExistingPackageXML(dirname($packagefile) .
+                    DIRECTORY_SEPARATOR, basename($packagefile), $options);
+            if (PEAR::isError($res)) {
                 return $res;
             }
         }
+
         if (PEAR::isError($ret = $res->_importOptions($packagefile, $options))) {
             return $ret;
         }
+
         return $res;
     }
 
@@ -837,13 +730,13 @@ function &importOptions($packagefile, $options = array())
      *
      * @return void|PEAR_Error
      * @access private
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function _importOptions($packagefile, $options)
     {
-        $this->_options['packagedirectory'] = dirname($packagefile);
+        $this->_options['packagedirectory']  = dirname($packagefile);
         $this->_options['pathtopackagefile'] = dirname($packagefile);
-        $this->_options['baseinstalldir'] = '';
+        $this->_options['baseinstalldir']    = '/';
         return $this->setOptions(array_merge($this->_options, $options), true);
     }
 
@@ -855,7 +748,7 @@ function _importOptions($packagefile, $options)
      *
      * @return array
      * @access public
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function getOptions($withTasks = false)
     {
@@ -888,7 +781,7 @@ function getOptions($withTasks = false)
      * @return void|PEAR_Error
      * @throws PEAR_PACKAGEFILEMANAGER2_INVALID_ROLE
      * @access public
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function addRole($extension, $role)
     {
@@ -920,7 +813,7 @@ function addRole($extension, $role)
      * @return void|PEAR_Error
      * @throws PEAR_PACKAGEFILEMANAGER2_INVALID_REPLACETYPE
      * @access public
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function addGlobalReplacement($type, $from, $to)
     {
@@ -928,6 +821,7 @@ function addGlobalReplacement($type, $from, $to)
         if (!isset($this->_options['globalreplacements'])) {
             $this->_options['globalreplacements'] = array();
         }
+
         $l = null;
         $task = new PEAR_Task_Replace_rw($this, $this->_config, $l, '');
         $task->setInfo($from, $to, $type);
@@ -935,11 +829,12 @@ function addGlobalReplacement($type, $from, $to)
             return $this->raiseError(PEAR_PACKAGEFILEMANAGER2_INVALID_REPLACETYPE,
                 implode(', ', $res[3]), $res[1] . ': ' . $res[2]);
         }
+
         $this->_options['globalreplacements'][] = $task;
     }
 
     /**
-     * Add a replacement option for a file
+     * Add a replacement option for a file, or files matching the glob pattern
      *
      * This sets an install-time complex search-and-replace function
      * allowing the setting of platform-specific variables in an
@@ -952,6 +847,7 @@ function addGlobalReplacement($type, $from, $to)
      * the package.xml file used to install this file.
      *
      * @param string $path relative path of file (relative to packagedirectory option)
+     *                     glob patterns are allowed (eg. {Dir1,Dir2}/*.php)
      * @param string $type variable type, either php-const, pear-config or package-info
      * @param string $from text to replace in the source file
      * @param string $to   variable name to use for replacement
@@ -959,13 +855,14 @@ function addGlobalReplacement($type, $from, $to)
      * @return void|PEAR_Error
      * @throws PEAR_PACKAGEFILEMANAGER2_INVALID_REPLACETYPE
      * @access public
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function addReplacement($path, $type, $from, $to)
     {
         if (!isset($this->_options['replacements'])) {
             $this->_options['replacements'] = array();
         }
+
         include_once 'PEAR/Task/Replace/rw.php';
         $l = null;
         $task = new PEAR_Task_Replace_rw($this, $this->_config, $l, '');
@@ -974,7 +871,17 @@ function addReplacement($path, $type, $from, $to)
             return $this->raiseError(PEAR_PACKAGEFILEMANAGER2_INVALID_REPLACETYPE,
                 implode(', ', $res[3]), $res[1] . ': ' . $res[2]);
         }
-        $this->_options['replacements'][$path][] = $task;
+
+        $current_dir = getcwd();
+        chdir($this->_options['packagedirectory']);
+        $glob = defined('GLOB_BRACE') ? glob($path, GLOB_BRACE) : glob($path);
+        chdir($current_dir);
+
+        if (false !== $glob) {
+            foreach ($glob as $pathItem) {
+                $this->_options['replacements'][$pathItem][] = $task;
+            }
+        }
     }
 
     /**
@@ -984,7 +891,7 @@ function addReplacement($path, $type, $from, $to)
      *
      * @return void
      * @access public
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function addWindowsEol($path)
     {
@@ -1005,7 +912,7 @@ function addWindowsEol($path)
      *
      * @return void
      * @access public
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function addUnixEol($path)
     {
@@ -1026,13 +933,13 @@ function addUnixEol($path)
      *
      * @return PEAR_Task_Postinstallscript_rw
      * @access public
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function &initPostinstallScript($path)
     {
         include_once 'PEAR/Task/Postinstallscript/rw.php';
-        $task = new PEAR_Task_Postinstallscript_rw($this, $this->_config, $l,
-            array('name' => $path, 'role' => 'php'));
+        $options = array('name' => $path, 'role' => 'php');
+        $task = new PEAR_Task_Postinstallscript_rw($this, $this->_config, $l, $options);
         return $task;
     }
 
@@ -1048,7 +955,7 @@ function &initPostinstallScript($path)
      * @return void|PEAR_Error
      * @throws PEAR_PACKAGEFILEMANAGER2_INVALID_POSTINSTALLSCRIPT
      * @access public
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function addPostinstallTask($task, $path)
     {
@@ -1056,6 +963,7 @@ function addPostinstallTask($task, $path)
             return $this->raiseError(PEAR_PACKAGEFILEMANAGER2_INVALID_POSTINSTALLSCRIPT,
                 'Task passed in is not a PEAR_Task_Postinstallscript task');
         }
+
         // necessary for validation
         $this->addFile('', $path, array('role' => 'php', 'name' => $path));
         $this->setPackagefile($this->_options['packagedirectory'] .
@@ -1064,6 +972,7 @@ function addPostinstallTask($task, $path)
             return $this->raiseError(PEAR_PACKAGEFILEMANAGER2_INVALID_POSTINSTALLSCRIPT,
                 $res[1]);
         }
+
         if (!isset($this->_options['replacements'])) {
             $this->_options['replacements'] = array();
         }
@@ -1079,19 +988,19 @@ function addPostinstallTask($task, $path)
      * @throws PEAR_PACKAGEFILEMANAGER2_RUN_SETOPTIONS
      * @throws PEAR_PACKAGEFILEMANAGER2_NO_PHPCOMPATINFO
      * @access public
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function detectDependencies($options = array())
     {
         if (!$this->isIncludeable('PHP/CompatInfo.php')) {
             return $this->raiseError(PEAR_PACKAGEFILEMANAGER2_NO_PHPCOMPATINFO);
-        } else {
-            include_once 'PHP/CompatInfo.php';
-            if (!is_array($options)) {
-                $options = array();
-            }
-            $this->_detectDependencies = $options;
         }
+
+        include_once 'PHP/CompatInfo.php';
+        if (!is_array($options)) {
+            $options = array();
+        }
+        $this->_detectDependencies = $options;
     }
 
     /**
@@ -1101,16 +1010,13 @@ function detectDependencies($options = array())
      *
      * @return boolean true if the file is in the include path, false otherwise
      * @access public
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function isIncludeable($file)
     {
-        if (!defined('PATH_SEPARATOR')) {
-            define('PATH_SEPARATOR', strtolower(substr(PHP_OS, 0, 3)) == 'win' ? ';' : ':');
-        }
         foreach (explode(PATH_SEPARATOR, ini_get('include_path')) as $path) {
-            if (file_exists($path . DIRECTORY_SEPARATOR . $file) &&
-                  is_readable($path . DIRECTORY_SEPARATOR . $file)) {
+            $p = $path . DIRECTORY_SEPARATOR . $file;
+            if (file_exists($p) && is_readable($p)) {
                 return true;
             }
         }
@@ -1132,7 +1038,7 @@ function isIncludeable($file)
      * @throws PEAR_PACKAGEFILEMANAGER2_DEST_UNWRITABLE
      * @return true|PEAR_Error
      * @access public
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function writePackageFile($debuginterface = null)
     {
@@ -1144,17 +1050,20 @@ function writePackageFile($debuginterface = null)
                 echo 'WARNING: ' . $errmsg['message'] . $nl;
             }
         }
+
         if ($this->_options['simpleoutput']) {
             $state = PEAR_VALIDATE_NORMAL;
         } else {
             $state = PEAR_VALIDATE_PACKAGING;
         }
+
         $this->_getDependencies();
         if ($this->_options['clearchangelog']) {
             $this->clearChangeLog();
         } else {
             $this->_updateChangeLog();
         }
+
         $outputdir = ($this->_options['outputdirectory'] ?
                         $this->_options['outputdirectory'] : $this->_options['packagedirectory']);
         $this->setPackagefile($this->_options['packagedirectory'] . $this->_options['packagefile']);
@@ -1178,40 +1087,40 @@ function writePackageFile($debuginterface = null)
                 return $this->raiseError(PEAR_PACKAGEFILEMANAGER2_INVALID_PACKAGE, $nl, $ret);
             }
         }
+
         $gen = &$this->getDefaultGenerator();
-        $packagexml = $gen->toXml($state);
+        $pfm = $gen->toXml($state);
         if (isset($debuginterface)) {
             if ($debuginterface) {
-                echo '<pre>' . htmlentities($packagexml) . '</pre>';
+                echo '<pre>' . htmlentities($pfm) . '</pre>';
             } else {
-                echo $packagexml;
+                echo $pfm;
             }
             return true;
         }
-        if ((file_exists($outputdir . $this->_options['packagefile']) &&
-                is_writable($outputdir . $this->_options['packagefile']))
-                ||
-                @touch($outputdir . $this->_options['packagefile'])) {
-            if ($fp = @fopen($outputdir . $this->_options['packagefile'] . '.tmp', "w")) {
-                $written = @fwrite($fp, $packagexml);
+
+        $file = $outputdir . $this->_options['packagefile'];
+        if ((file_exists($file) && is_writable($file)) || @touch($file)) {
+            if ($fp = @fopen($file . '.tmp', "w")) {
+                $written = @fwrite($fp, $pfm);
                 @fclose($fp);
                 if ($written === false) {
                     return $this->raiseError(PEAR_PACKAGEFILEMANAGER2_CANTWRITE_PKGFILE);
                 }
-                if (!@copy($outputdir . $this->_options['packagefile'] . '.tmp',
-                        $outputdir . $this->_options['packagefile'])) {
+
+                if (!@copy($file . '.tmp', $file)) {
                     return $this->raiseError(PEAR_PACKAGEFILEMANAGER2_CANTCOPY_PKGFILE);
-                } else {
-                    @unlink($outputdir . $this->_options['packagefile'] . '.tmp');
-                    return true;
                 }
-            } else {
-                return $this->raiseError(PEAR_PACKAGEFILEMANAGER2_CANTOPEN_TMPPKGFILE,
-                    $outputdir . $this->_options['packagefile'] . '.tmp');
+
+                @unlink($file . '.tmp');
+                return true;
             }
-        } else {
-            return $this->raiseError(PEAR_PACKAGEFILEMANAGER2_DEST_UNWRITABLE, $outputdir);
+
+            return $this->raiseError(PEAR_PACKAGEFILEMANAGER2_CANTOPEN_TMPPKGFILE,
+                    $outputdir . $this->_options['packagefile'] . '.tmp');
         }
+
+        return $this->raiseError(PEAR_PACKAGEFILEMANAGER2_DEST_UNWRITABLE, $outputdir);
     }
 
     /**
@@ -1225,7 +1134,7 @@ function writePackageFile($debuginterface = null)
      *           whether it is called from the command-line or web interface
      * @return true|PEAR_Error
      * @access public
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function debugPackageFile()
     {
@@ -1241,7 +1150,7 @@ function debugPackageFile()
      *
      * @return void
      * @access public
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function pushWarning($code, $info)
     {
@@ -1254,7 +1163,7 @@ function pushWarning($code, $info)
      *
      * @return array
      * @access public
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function getWarnings()
     {
@@ -1271,7 +1180,7 @@ function getWarnings()
      *
      * @return string Error message
      * @access private
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function _getMessage($code, $info)
     {
@@ -1292,9 +1201,8 @@ function _getMessage($code, $info)
      * @param string  $i2   (optional) additional specific error info #2
      *
      * @return PEAR_Error
-     * @static
      * @access public
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function raiseError($code, $i1 = '', $i2 = '')
     {
@@ -1310,7 +1218,7 @@ function raiseError($code, $i1 = '', $i2 = '')
      * @uses _getSimpleDirTag generate the xml from the array for human reading
      * @return void|PEAR_Error
      * @access private
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function generateContents()
     {
@@ -1320,8 +1228,10 @@ function generateContents()
             if (!is_array($options['ignore'])) {
                 $options['ignore'] = array();
             }
-            for ($i = 0; $i < count($this->_subpackages); $i++) {
-                $save = $this->_subpackages[$i]->getArray();
+
+            $subp = count($this->_subpackages);
+            for ($i = 0; $i < $subp; $i++) {
+                $save     = $this->_subpackages[$i]->getArray();
                 $filelist = $this->_subpackages[$i]->getFileList();
                 foreach ($filelist as $file => $atts) {
                     $options['ignore'][] = '*' . $file; // ignore all subpackage files
@@ -1329,13 +1239,16 @@ function generateContents()
                 $this->_subpackages[$i]->fromArray($save);
             }
         }
-        $generatorclass = 'PEAR_PackageFileManager_' . $this->_options['filelistgenerator'];
-        $generator = new $generatorclass($this, $options);
+
+        $generatorclass = 'PEAR_PackageFileManager_' . ucfirst(strtolower($this->_options['filelistgenerator']));
+        $generator      = new $generatorclass($options);
         $this->clearContents($this->_options['baseinstalldir']);
+        $this->_struc = $generator->getFileList();
         if ($this->_options['simpleoutput']) {
-            return $this->_getSimpleDirTag($this->_struc = $generator->getFileList());
+            return $this->_getSimpleDirTag($this->_struc);
         }
-        return $this->_getDirTag($this->_struc = $generator->getFileList());
+
+        return $this->_getDirTag($this->_struc);
     }
 
     /**
@@ -1350,13 +1263,14 @@ function generateContents()
      *
      * @return array|PEAR_Error
      * @access private
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function _getSimpleDirTag($struc, $role = false, $_curdir = '')
     {
         if (PEAR::isError($struc)) {
             return $struc;
         }
+
         extract($this->_options);
         $ret = array();
         foreach ($struc as $dir => $files) {
@@ -1366,65 +1280,70 @@ function _getSimpleDirTag($struc, $role = false, $_curdir = '')
                     $role = $dir_roles['/'];
                 }
                 return $this->_getSimpleDirTag($struc[$dir], $role, '');
+            }
+
+            // directory
+            if (!isset($files['file']) || is_array($files['file'])) {
+                // contains only directories
+                if (isset($dir_roles[$_curdir . $dir])) {
+                    $myrole = $dir_roles[$_curdir . $dir];
+                } else {
+                    $myrole = $role;
+                }
+                $recurdir = ($_curdir == '') ? $dir . '/' : $_curdir . $dir . '/';
+                if ($recurdir == '//') {
+                    $recurdir = '';
+                }
+                $this->_getSimpleDirTag($files, $myrole, $recurdir);
             } else {
-                // directory
-                if (!isset($files['file']) || is_array($files['file'])) {
-                    // contains only directories
-                    if (isset($dir_roles[$_curdir . $dir])) {
-                        $myrole = $dir_roles[$_curdir . $dir];
+                // contains files
+                $myrole = '';
+                if (!$role) {
+                    $myrole = false;
+                    if (isset($exceptions[$files['path']])) {
+                        $myrole = $exceptions[$files['path']];
+                    } elseif (isset($roles[$files['ext']])) {
+                        $myrole = $roles[$files['ext']];
                     } else {
-                        $myrole = $role;
-                    }
-                    $recurdir = ($_curdir == '') ? $dir . '/' : $_curdir . $dir . '/';
-                    if ($recurdir == '//') {
-                        $recurdir = '';
+                        $myrole = $roles['*'];
                     }
-                    $this->_getSimpleDirTag($files, $myrole, $recurdir);
                 } else {
-                    // contains files
-                    $myrole = '';
-                    if (!$role) {
-                        $myrole = false;
-                        if (isset($exceptions[$files['path']])) {
-                            $myrole = $exceptions[$files['path']];
-                        } elseif (isset($roles[$files['ext']])) {
-                            $myrole = $roles[$files['ext']];
-                        } else {
-                            $myrole = $roles['*'];
-                        }
-                    } else {
-                        $myrole = $role;
-                        if (isset($exceptions[$files['path']])) {
-                            $myrole = $exceptions[$files['path']];
-                        }
+                    $myrole = $role;
+                    if (isset($exceptions[$files['path']])) {
+                        $myrole = $exceptions[$files['path']];
                     }
-                    $test = explode('/', $files['path']);
-                    foreach ($test as $subpath) {
-                        if ($subpath == 'CVS') {
-                            $this->pushWarning(PEAR_PACKAGEFILEMANAGER2_CVS_PACKAGED,
-                                array('path' => $files['path']));
-                        }
-                    }
-                    $atts = array('role' => $myrole);
-                    if (isset($installexceptions[$files['path']])) {
-                        $atts['baseinstalldir'] = $installexceptions[$files['path']];
+                }
+
+                $test = explode('/', $files['path']);
+                foreach ($test as $subpath) {
+                    if ($subpath == 'CVS') {
+                        $this->pushWarning(PEAR_PACKAGEFILEMANAGER2_CVS_PACKAGED,
+                            array('path' => $files['path']));
                     }
-                    $diradd = dirname($files['path']);
-                    $this->addFile($diradd == '.' ? '/' : $diradd, $files['file'], $atts);
-                    if (isset($globalreplacements) &&
-                          !in_array($files['path'], $globalreplaceexceptions, true)) {
-                        foreach ($globalreplacements as $task) {
-                            $this->addTaskToFile($files['path'], $task);
-                        }
+                }
+
+                $atts = array('role' => $myrole);
+                if (isset($installexceptions[$files['path']])) {
+                    $atts['baseinstalldir'] = $installexceptions[$files['path']];
+                }
+
+                $diradd = dirname($files['path']);
+                $this->addFile($diradd == '.' ? '/' : $diradd, $files['file'], $atts);
+                if (isset($globalreplacements) &&
+                      !in_array($files['path'], $globalreplaceexceptions, true)) {
+                    foreach ($globalreplacements as $task) {
+                        $this->addTaskToFile($files['path'], $task);
                     }
-                    if (isset($replacements[$files['path']])) {
-                        foreach ($replacements[$files['path']] as $task) {
-                            $this->addTaskToFile($files['path'], $task);
-                        }
+                }
+
+                if (isset($replacements[$files['path']])) {
+                    foreach ($replacements[$files['path']] as $task) {
+                        $this->addTaskToFile($files['path'], $task);
                     }
                 }
             }
         }
+
         return;
     }
 
@@ -1439,13 +1358,14 @@ function _getSimpleDirTag($struc, $role = false, $_curdir = '')
      *
      * @return array|PEAR_Error
      * @access private
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function _getDirTag($struc, $role = false, $_curdir = '')
     {
         if (PEAR::isError($struc)) {
             return $struc;
         }
+
         extract($this->_options);
         foreach ($struc as $dir => $files) {
             if ($dir === '/') {
@@ -1454,73 +1374,74 @@ function _getDirTag($struc, $role = false, $_curdir = '')
                     $role = $dir_roles['/'];
                 }
                 return $this->_getDirTag($struc[$dir], $role, '');
+            }
+
+            // non-global directory
+            if (!isset($files['file']) || is_array($files['file'])) {
+                // contains only other directories
+                $myrole = '';
+                if (isset($dir_roles[$_curdir . $dir])) {
+                    $myrole = $dir_roles[$_curdir . $dir];
+                } elseif ($role) {
+                    $myrole = $role;
+                }
+                $this->_getDirTag($files, $myrole, $_curdir . $dir . '/');
             } else {
-                // non-global directory
-                if (!isset($files['file']) || is_array($files['file'])) {
-                    // contains only other directories
-                    $myrole = '';
-                    if (isset($dir_roles[$_curdir . $dir])) {
-                        $myrole = $dir_roles[$_curdir . $dir];
-                    } elseif ($role) {
-                        $myrole = $role;
-                    }
-                    $this->_getDirTag($files, $myrole, $_curdir . $dir . '/');
-                } else {
-                    // contains files
-                    $myrole = '';
-                    if (!$role) {
-                        $myrole = false;
-                        if (isset($exceptions[$files['path']])) {
-                            $myrole = $exceptions[$files['path']];
-                        } elseif (isset($roles[$files['ext']])) {
-                            $myrole = $roles[$files['ext']];
-                        } else {
-                            $myrole = $roles['*'];
-                        }
+                // contains files
+                $myrole = '';
+                if (!$role) {
+                    $myrole = false;
+                    if (isset($exceptions[$files['path']])) {
+                        $myrole = $exceptions[$files['path']];
+                    } elseif (isset($roles[$files['ext']])) {
+                        $myrole = $roles[$files['ext']];
                     } else {
-                        $myrole = $role;
-                        if (isset($exceptions[$files['path']])) {
-                            $myrole = $exceptions[$files['path']];
-                        }
+                        $myrole = $roles['*'];
                     }
-                    if (isset($installexceptions[$files['path']])) {
-                        $bi = $installexceptions[$files['path']];
-                    } else {
-                        $bi = $this->_options['baseinstalldir'];
+                } else {
+                    $myrole = $role;
+                    if (isset($exceptions[$files['path']])) {
+                        $myrole = $exceptions[$files['path']];
                     }
-                    $test = explode('/', $files['path']);
-                    foreach ($test as $subpath) {
-                        if ($subpath == 'CVS') {
-                            $this->pushWarning(PEAR_PACKAGEFILEMANAGER2_CVS_PACKAGED,
-                                array('path' => $files['path']));
-                        }
+                }
+                if (isset($installexceptions[$files['path']])) {
+                    $bi = $installexceptions[$files['path']];
+                } else {
+                    $bi = $this->_options['baseinstalldir'];
+                }
+                $test = explode('/', $files['path']);
+                foreach ($test as $subpath) {
+                    if ($subpath == 'CVS') {
+                        $this->pushWarning(PEAR_PACKAGEFILEMANAGER2_CVS_PACKAGED,
+                            array('path' => $files['path']));
                     }
-                    $atts =
-                        array('role' => $myrole,
-                              'baseinstalldir' => $bi,
-                              );
-                    if (!isset($this->_options['simpleoutput']) || !$this->_options['simpleoutput']) {
-                        $md5sum = @md5_file($this->_options['packagedirectory'] . $files['path']);
-                        if (!empty($md5sum)) {
-                            $atts['md5sum'] = $md5sum;
-                        }
+                }
+                $atts =
+                    array('role' => $myrole,
+                          'baseinstalldir' => $bi,
+                          );
+                if (!isset($this->_options['simpleoutput']) || !$this->_options['simpleoutput']) {
+                    $md5sum = @md5_file($this->_options['packagedirectory'] . $files['path']);
+                    if (!empty($md5sum)) {
+                        $atts['md5sum'] = $md5sum;
                     }
-                    $diradd = dirname($files['path']);
-                    $this->addFile($diradd == '.' ? '/' : $diradd, $files['file'], $atts);
-                    if (isset($globalreplacements) &&
-                          !in_array($files['path'], $globalreplaceexceptions, true)) {
-                        foreach ($globalreplacements as $task) {
-                            $this->addTaskToFile($files['path'], $task);
-                        }
+                }
+                $diradd = dirname($files['path']);
+                $this->addFile($diradd == '.' ? '/' : $diradd, $files['file'], $atts);
+                if (isset($globalreplacements) &&
+                      !in_array($files['path'], $globalreplaceexceptions, true)) {
+                    foreach ($globalreplacements as $task) {
+                        $this->addTaskToFile($files['path'], $task);
                     }
-                    if (isset($replacements[$files['path']])) {
-                        foreach ($replacements[$files['path']] as $task) {
-                            $this->addTaskToFile($files['path'], $task);
-                        }
+                }
+                if (isset($replacements[$files['path']])) {
+                    foreach ($replacements[$files['path']] as $task) {
+                        $this->addTaskToFile($files['path'], $task);
                     }
                 }
             }
         }
+
         return;
     }
 
@@ -1530,7 +1451,7 @@ function _getDirTag($struc, $role = false, $_curdir = '')
      *
      * @return array
      * @access private
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function _traverseFileArray($files, &$ret)
     {
@@ -1548,19 +1469,20 @@ function _traverseFileArray($files, &$ret)
      *
      * @access private
      * @return void|PEAR_Error
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function _getDependencies()
     {
         if ($this->_detectDependencies) {
             $this->_traverseFileArray($this->_struc, $ret);
-            $compatinfo = new PHP_CompatInfo();
-            $info = $compatinfo->parseArray($ret, $this->_detectDependencies);
+            $compatinfo  = new PHP_CompatInfo();
+            $info        = $compatinfo->parseArray($ret, $this->_detectDependencies);
             $max_version = (empty($info['max_version'])) ? false : $info['max_version'];
             $ret = $this->setPhpDep($info['version'], $max_version);
             if (is_a($ret, 'PEAR_Error')) {
                 return $ret;
             }
+
             foreach ($info['extensions'] as $ext) {
                 $this->addExtensionDep('required', $ext);
             }
@@ -1574,40 +1496,36 @@ function _getDependencies()
      *
      * @return void
      * @access private
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function _updateChangeLog()
     {
-        if ($this->_oldPackageFile) {
-            $changelog = $this->_oldPackageFile->getChangelog();
-        } else {
-            $changelog = false;
-        }
+        $changelog = $this->_oldPackageFile ? $this->_oldPackageFile->getChangelog() : false;
         $notes = $this->_options['changelognotes'];
         if (!$changelog) {
             $this->setChangelogEntry($this->getVersion(), $this->generateChangeLogEntry($notes));
             return;
-        } else {
-            if (!isset($changelog['release'][0])) {
-                $changelog['release'] = array($changelog['release']);
-            }
-            $found = false;
-            foreach ($changelog['release'] as $i => $centry) {
-                $changelog['release'][$i]['notes'] = trim($changelog['release'][$i]['notes']);
-                if ($centry['version']['release'] == $this->getVersion()) {
-                    $changelog['release'][$i] = $this->generateChangeLogEntry($notes);
-                    $found = true;
-                }
-            }
-            if (!$found) {
-                $changelog['release'][] = $this->generateChangeLogEntry($notes);
-            }
-            usort($changelog['release'], array($this, '_changelogsort'));
-            $this->clearChangeLog();
-            foreach ($changelog['release'] as $entry) {
-                $this->setChangelogEntry($entry['version']['release'], $entry);
+        }
+
+        if (!isset($changelog['release'][0])) {
+            $changelog['release'] = array($changelog['release']);
+        }
+        $found = false;
+        foreach ($changelog['release'] as $i => $centry) {
+            $changelog['release'][$i]['notes'] = trim($changelog['release'][$i]['notes']);
+            if ($centry['version']['release'] == $this->getVersion()) {
+                $changelog['release'][$i] = $this->generateChangeLogEntry($notes);
+                $found = true;
             }
         }
+        if (!$found) {
+            $changelog['release'][] = $this->generateChangeLogEntry($notes);
+        }
+        usort($changelog['release'], array($this, '_changelogsort'));
+        $this->clearChangeLog();
+        foreach ($changelog['release'] as $entry) {
+            $this->setChangelogEntry($entry['version']['release'], $entry);
+        }
     }
 
     /**
@@ -1618,32 +1536,44 @@ function _updateChangeLog()
      *
      * @return integer sort comparaison result (-1, 0, +1) of two elements $a and $b
      * @access private
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function _changelogsort($a, $b)
     {
-        if ($this->_options['changelogoldtonew']) {
-            $c = strtotime($a['date']);
-            $d = strtotime($b['date']);
-            $v1 = $a['version']['release'];
-            $v2 = $b['version']['release'];
-        } else {
-            $d = strtotime($a['date']);
-            $c = strtotime($b['date']);
-            $v2 = $a['version']['release'];
-            $v1 = $b['version']['release'];
+        if (isset($a['date']) && isset($b['date'])) {
+            if ($this->_options['changelogoldtonew']) {
+                $c = strtotime($a['date']);
+                $d = strtotime($b['date']);
+            } else {
+                $d = strtotime($a['date']);
+                $c = strtotime($b['date']);
+            }
+
+            if ($c - $d > 0) {
+                return 1;
+            } elseif ($c - $d < 0) {
+                return -1;
+            }
         }
-        if ($c - $d > 0) {
-            return 1;
-        } elseif ($c - $d < 0) {
-            return -1;
+
+        if (isset($a['version']['release']) && isset($b['version']['release'])) {
+            if ($this->_options['changelogoldtonew']) {
+                $v1 = $a['version']['release'];
+                $v2 = $b['version']['release'];
+            } else {
+                $v2 = $a['version']['release'];
+                $v1 = $b['version']['release'];
+            }
+
+            return version_compare($v1, $v2);
         }
-        return version_compare($v1, $v2);
+
+        return 0;
     }
 
     /**
      * @return void
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
     function setOld()
     {
@@ -1664,7 +1594,7 @@ function setOld()
     function _importTasks($options)
     {
         $filelist = $this->getFilelist(true);
-        $vroles = array_values($this->_options['roles']);
+        $vroles   = array_values($this->_options['roles']);
 
         foreach ($filelist as $file => $contents) {
             $atts = $contents['attribs'];
@@ -1744,7 +1674,8 @@ function _importTasks($options)
             // check for baseinstalldir attribute
             if (isset($options['baseinstalldir'])
                 && isset($atts['baseinstalldir'])
-                && $atts['baseinstalldir'] != $options['baseinstalldir']) {
+                && $atts['baseinstalldir'] != $options['baseinstalldir']
+            ) {
                 $this->_options['installexceptions'][$file] = $atts['baseinstalldir'];
             }
         }
@@ -1783,64 +1714,69 @@ function _stripNamespace($params)
      *          calls this to create a new one
      * @access private
      * @static
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
-    function &_getExistingPackageXML($path, $packagefile = 'package.xml', $options = array())
+    protected static function &_getExistingPackageXML($path, $packagefile = 'package.xml', $options = array())
     {
         if (is_string($path) && is_dir($path)) {
             $contents = false;
             if (file_exists($path . $packagefile)) {
                 $contents = file_get_contents($path . $packagefile);
             }
+
             if (!$contents) {
                 $a = PEAR_PackageFileManager2::_generateNewPackageXML();
                 return $a;
-            } else {
-                include_once 'PEAR/PackageFile/Parser/v2.php';
-                $pkg = &new PEAR_PackageFile_Parser_v2();
-                $z = &PEAR_Config::singleton();
-                $pkg->setConfig($z);
-                $pf = &$pkg->parse($contents, $path . $packagefile, false,
-                    'PEAR_PackageFileManager2');
-                if (PEAR::isError($pf)) {
-                    return $pf;
-                }
-                if (!$pf->validate(PEAR_VALIDATE_DOWNLOADING)) {
-                    $errors = '';
-                    foreach ($pf->getValidationWarnings() as $warning) {
-                        $errors .= "\n" . ucfirst($warning['level']) . ': ' .
-                            $warning['message'];
-                    }
-                    if (php_sapi_name() != 'cli') {
-                        $errors = nl2br(htmlspecialchars($errors));
-                    }
-                    $a = $pf->raiseError(PEAR_PACKAGEFILEMANAGER2_INVALID_PACKAGE,
-                        $errors);
-                    return $a;
+            }
+
+            include_once 'PEAR/PackageFile/Parser/v2.php';
+            $pkg = new PEAR_PackageFile_Parser_v2();
+            $z = &PEAR_Config::singleton();
+            $pkg->setConfig($z);
+            $pf = $pkg->parse($contents, $path . $packagefile, false,
+                'PEAR_PackageFileManager2');
+            if (PEAR::isError($pf)) {
+                return $pf;
+            }
+
+            if (!$pf->validate(PEAR_VALIDATE_DOWNLOADING)) {
+                $errors = '';
+                foreach ($pf->getValidationWarnings() as $warning) {
+                    $errors .= "\n" . ucfirst($warning['level']) . ': ' .
+                        $warning['message'];
                 }
-                $pf->setOld();
-                if (isset($options['cleardependencies']) && $options['cleardependencies']) {
-                    $pf->clearDeps();
+                if (php_sapi_name() != 'cli') {
+                    $errors = nl2br(htmlspecialchars($errors));
                 }
-                if (!isset($options['clearcontents']) || $options['clearcontents']) {
-                    $pf->clearContents();
-                } else {
-                    // merge options is required to use PEAR_PackageFileManager2::addPostinstallTask()
-                    if (PEAR::isError($ret = $pf->_importOptions($packagefile, $options))) {
-                        return $ret;
-                    }
-                    $pf->_importTasks($options);
+                $a = $pf->raiseError(PEAR_PACKAGEFILEMANAGER2_INVALID_PACKAGE, $errors);
+                return $a;
+            }
+
+            $pf->setOld();
+            if (isset($options['cleardependencies']) && $options['cleardependencies']) {
+                $pf->clearDeps();
+            }
+
+            if (!isset($options['clearcontents']) || $options['clearcontents']) {
+                $pf->clearContents();
+            } else {
+                // merge options is required to use PEAR_PackageFileManager2::addPostinstallTask()
+                $ret = $pf->_importOptions($packagefile, $options);
+                if (PEAR::isError($ret)) {
+                    return $ret;
                 }
+                $pf->_importTasks($options);
             }
+
             return $pf;
-        } else {
-            if (!is_string($path)) {
-                $path = gettype($path);
-            }
-            include_once 'PEAR.php';
-            $a = PEAR::raiseError('Path does not exist: ' . $path, PEAR_PACKAGEFILEMANAGER2_PATH_DOESNT_EXIST);
-            return $a;
         }
+
+        if (!is_string($path)) {
+            $path = gettype($path);
+        }
+        include_once 'PEAR.php';
+        $a = PEAR::raiseError('Path does not exist: ' . $path, PEAR_PACKAGEFILEMANAGER2_PATH_DOESNT_EXIST);
+        return $a;
     }
 
     /**
@@ -1852,13 +1788,12 @@ function &_getExistingPackageXML($path, $packagefile = 'package.xml', $options =
      * @return PEAR_PackageFileManager2
      * @access private
      * @static
-     * @since  1.6.0a1
+     * @since  1.0.0a1
      */
-    function &_generateNewPackageXML()
+    protected static function &_generateNewPackageXML()
     {
-        $pf = &new PEAR_PackageFileManager2();
+        $pf = new PEAR_PackageFileManager2();
         $pf->_oldPackageFile = false;
         return $pf;
     }
 }
-?>
\ No newline at end of file

From 5e0aa03618122bbc204346ce967d5a98d582c739 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Wed, 15 Mar 2017 18:07:02 +0900
Subject: [PATCH 582/630] update PEAR_PackageFileManager_Plugins 1.0.4 (refs
 #4176)

PEAR_PackageFileManager2 depends on this package.
---
 .../PackageFileManager/ComplexGenerator.php   | 133 -------
 .../PEAR/PEAR/PackageFileManager/Cvs.php      |  83 +++--
 .../PEAR/PEAR/PackageFileManager/File.php     | 270 ++++++++------
 .../PEAR/PEAR/PackageFileManager/Git.php      | 106 ++++++
 .../PEAR/PEAR/PackageFileManager/Perforce.php |  35 +-
 .../PEAR/PEAR/PackageFileManager/Plugins.php  | 101 +++++
 .../PackageFileManager/SimpleGenerator.php    | 351 ------------------
 .../PEAR/PEAR/PackageFileManager/Svn.php      | 183 +++++----
 .../PEAR/PackageFileManager/XMLOutput.php     | 188 ----------
 9 files changed, 506 insertions(+), 944 deletions(-)
 delete mode 100644 lib/vendor/PEAR/PEAR/PackageFileManager/ComplexGenerator.php
 create mode 100644 lib/vendor/PEAR/PEAR/PackageFileManager/Git.php
 create mode 100755 lib/vendor/PEAR/PEAR/PackageFileManager/Plugins.php
 delete mode 100644 lib/vendor/PEAR/PEAR/PackageFileManager/SimpleGenerator.php
 delete mode 100644 lib/vendor/PEAR/PEAR/PackageFileManager/XMLOutput.php

diff --git a/lib/vendor/PEAR/PEAR/PackageFileManager/ComplexGenerator.php b/lib/vendor/PEAR/PEAR/PackageFileManager/ComplexGenerator.php
deleted file mode 100644
index 0f7ebd86b..000000000
--- a/lib/vendor/PEAR/PEAR/PackageFileManager/ComplexGenerator.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/**
- * Class for XML output
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category  PEAR
- * @package   PEAR_PackageFileManager
- * @author    Greg Beaver <cellog@php.net>
- * @copyright 2006-2007 The PHP Group
- * @license   http://www.php.net/license/3_01.txt  PHP License 3.01
- * @version   CVS: $Id: ComplexGenerator.php,v 1.3 2007/11/19 22:44:00 farell Exp $
- * @link      http://pear.php.net/package/PEAR_PackageFileManager
- * @since     File available since Release 1.5.3
- */
-
-require_once 'PEAR/PackageFile/Generator/v1.php';
-
-/**
- * Class for XML output
- *
- * @category  PEAR
- * @package   PEAR_PackageFileManager
- * @author    Greg Beaver <cellog@php.net>
- * @copyright 2006-2007 The PHP Group
- * @license   http://www.php.net/license/3_01.txt  PHP License 3.01
- * @version   Release: 1.6.3
- * @link      http://pear.php.net/package/PEAR_PackageFileManager
- * @since     Class available since Release 1.5.3
- */
-
-class PEAR_PackageFileManager_ComplexGenerator extends PEAR_PackageFile_Generator_v1
-{
-    var $_options;
-    var $_provides;
-
-    /**
-     * remove a warning about missing parameters - don't delete this
-     */
-    function PEAR_PackageFileManager_ComplexGenerator()
-    {
-    }
-
-    /**
-     * @param array $opts list of generation options
-     *
-     * @return void
-     */
-    function setPackageFileManagerOptions($opts)
-    {
-        $this->_options = $opts;
-    }
-
-    /**
-     * Return an XML document based on the package info (as returned
-     * by the PEAR_Common::infoFrom* methods).
-     *
-     * @param array $pkginfo package info
-     *
-     * @return string XML data
-     * @access public
-     * @deprecated use a PEAR_PackageFile_v* object's generator instead
-     */
-    function xmlFromInfo($pkginfo)
-    {
-        include_once 'PEAR/PackageFile.php';
-        include_once 'PEAR/Config.php';
-        $config = &PEAR_Config::singleton();
-        $packagefile = &new PEAR_PackageFile($config);
-        $pf = &$packagefile->fromArray($pkginfo);
-        if (!$pf->validate(PEAR_VALIDATE_NORMAL)) {
-            $errors = $pf->getValidationWarnings();
-            return PEAR::raiseError('Invalid package.xml file', null, null, null, $errors);
-        }
-        if (isset($this->_provides)) {
-            $pf->_buildProvidesArray($this->_provides);
-        }
-        parent::PEAR_PackageFile_Generator_v1($pf);
-        $ret = $this->toXml();
-        if (!$ret) {
-            $errors = $pf->getValidationWarnings();
-            return PEAR::raiseError('Invalid package.xml file', null, null, null, $errors);
-        }
-        return $ret;
-    }
-
-    function getFileRoles()
-    {
-        return PEAR_Common::getFileRoles();
-    }
-
-    function getReplacementTypes()
-    {
-        return PEAR_Common::getReplacementTypes();
-    }
-
-    /**
-     * Validate XML package definition file.
-     *
-     * @param string $info       Filename of the package archive or of the
-     *                           package definition file
-     * @param array  &$errors    Array that will contain the errors
-     * @param array  &$warnings  Array that will contain the warnings
-     * @param string $dir_prefix (optional) directory where source files
-     *                           may be found, or empty if they are not available
-     *
-     * @access public
-     * @return boolean
-     * @deprecated use the validation of PEAR_PackageFile objects
-     */
-    function validatePackageInfo($info, &$errors, &$warnings, $dir_prefix = '')
-    {
-        // validation is done in xmlFromInfo()
-        return true;
-    }
-
-    function analyzeSourceCode($file)
-    {
-        return PEAR_Common::analyzeSourceCode($file);
-    }
-
-    function buildProvidesArray($a)
-    {
-        $this->_provides = $a;
-    }
-}
-?>
\ No newline at end of file
diff --git a/lib/vendor/PEAR/PEAR/PackageFileManager/Cvs.php b/lib/vendor/PEAR/PEAR/PackageFileManager/Cvs.php
index bd07c719c..3bac1f890 100644
--- a/lib/vendor/PEAR/PEAR/PackageFileManager/Cvs.php
+++ b/lib/vendor/PEAR/PEAR/PackageFileManager/Cvs.php
@@ -3,22 +3,15 @@
  * The CVS list plugin generator for both PEAR_PackageFileManager,
  * and PEAR_PackageFileManager2 classes.
  *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
+ * PHP versions 5 and 7
  *
  * @category  PEAR
- * @package   PEAR_PackageFileManager
+ * @package   PEAR_PackageFileManager_Plugins
  * @author    Greg Beaver <cellog@php.net>
- * @copyright 2003-2007 The PHP Group
- * @license   http://www.php.net/license/3_01.txt  PHP License 3.01
- * @version   CVS: $Id: Cvs.php,v 1.15 2007/11/19 22:44:00 farell Exp $
- * @link      http://pear.php.net/package/PEAR_PackageFileManager
- * @since     File available since Release 0.1
+ * @copyright 2003-2015 The PEAR Group
+ * @license   New BSD, Revised
+ * @link      http://pear.php.net/package/PEAR_PackageFileManager_Plugins
+ * @since     File available since Release 1.0.0alpha1
  */
 
 require_once 'PEAR/PackageFileManager/File.php';
@@ -30,15 +23,14 @@
  * repository, only on a checked out CVS module
  *
  * @category  PEAR
- * @package   PEAR_PackageFileManager
+ * @package   PEAR_PackageFileManager_Plugins
  * @author    Greg Beaver <cellog@php.net>
- * @copyright 2003-2007 The PHP Group
- * @license   http://www.php.net/license/3_01.txt  PHP License 3.01
- * @version   Release: 1.6.3
- * @link      http://pear.php.net/package/PEAR_PackageFileManager
- * @since     Class available since Release 0.1
+ * @copyright 2003-2015 The PEAR Group
+ * @license   New BSD, Revised
+ * @version   Release: 1.0.4
+ * @link      http://pear.php.net/package/PEAR_PackageFileManager_Plugins
+ * @since     Class available since Release 1.0.0alpha1
  */
-
 class PEAR_PackageFileManager_CVS extends PEAR_PackageFileManager_File
 {
     /**
@@ -49,6 +41,11 @@ class PEAR_PackageFileManager_CVS extends PEAR_PackageFileManager_File
      */
     var $_cvsIgnore = array('.cvsignore');
 
+    function __construct($options)
+    {
+        parent::__construct($options);
+    }
+
     /**
      * Return a list of all files in the CVS repository
      *
@@ -70,25 +67,22 @@ class PEAR_PackageFileManager_CVS extends PEAR_PackageFileManager_File
     function dirList($directory)
     {
         static $in_recursion = false;
-        if (!$in_recursion) {
-            // include only CVS/Entries files
-            $this->_setupIgnore(array('*/CVS/Entries'), 0);
-            $this->_setupIgnore(array(), 1);
-            $in_recursion = true;
-            $entries      = parent::dirList($directory);
-            $in_recursion = false;
-        } else {
+        if ($in_recursion) {
             return parent::dirList($directory);
         }
+
+        // include only CVS/Entries files
+        $this->_setupIgnore(array('*/CVS/Entries'), 0);
+        $this->_setupIgnore(array(), 1);
+        $in_recursion = true;
+        $entries      = parent::dirList($directory);
+        $in_recursion = false;
+
         if (!$entries || !is_array($entries)) {
-            if (strcasecmp(get_class($this->_parent),
-                'PEAR_PackageFileManager') == 0) {
-                $code = PEAR_PACKAGEFILEMANAGER_NOCVSENTRIES;
-            } else {
-                $code = PEAR_PACKAGEFILEMANAGER2_NOCVSENTRIES;
-            }
-            return $this->_parent->raiseError($code, $directory);
+            $code = PEAR_PACKAGEFILEMANAGER_PLUGINS_NOCVSENTRIES;
+            return parent::raiseError($code, $directory);
         }
+
         return $this->_readCVSEntries($entries);
     }
 
@@ -106,6 +100,9 @@ function dirList($directory)
     function _readCVSEntries($entries)
     {
         $ret    = array();
+        if (!isset($this->_options['ignore'])) {
+            $this->_options['ignore'] = false;
+        }
         $ignore = array_merge((array) $this->_options['ignore'], $this->_cvsIgnore);
         // implicitly ignore packagefile
         $ignore[] = $this->_options['packagefile'];
@@ -119,28 +116,33 @@ function _readCVSEntries($entries)
             if (!$directory) {
                 continue;
             }
+
             $d = $this->_getCVSEntries($cvsentry);
             if (!is_array($d)) {
                 continue;
             }
+
             foreach ($d as $entry) {
                 if ($ignore) {
                     if ($this->_checkIgnore($this->_getCVSFileName($entry),
-                          $directory . '/' . $this->_getCVSFileName($entry), 1)) {
+                          $directory . DIRECTORY_SEPARATOR . $this->_getCVSFileName($entry), 1)) {
                         continue;
                     }
                 }
+
                 if ($include) {
                     if ($this->_checkIgnore($this->_getCVSFileName($entry),
-                          $directory . '/' . $this->_getCVSFileName($entry), 0)) {
+                          $directory . DIRECTORY_SEPARATOR . $this->_getCVSFileName($entry), 0)) {
                         continue;
                     }
                 }
+
                 if ($this->_isCVSFile($entry)) {
-                    $ret[] = $directory . '/' . $this->_getCVSFileName($entry);
+                    $ret[] = $directory . DIRECTORY_SEPARATOR . $this->_getCVSFileName($entry);
                 }
             }
         }
+
         return $ret;
     }
 
@@ -176,9 +178,9 @@ function _getCVSEntries($cvsentryfilename)
         $cvsfile = @file($cvsentryfilename);
         if (is_array($cvsfile)) {
             return $cvsfile;
-        } else {
-            return false;
         }
+
+        return false;
     }
 
     /**
@@ -196,4 +198,3 @@ function _isCVSFile($cvsentry)
         return $cvsentry{0} == '/' && !strpos($cvsentry, 'dummy timestamp');
     }
 }
-?>
\ No newline at end of file
diff --git a/lib/vendor/PEAR/PEAR/PackageFileManager/File.php b/lib/vendor/PEAR/PEAR/PackageFileManager/File.php
index 8a74ccd3e..6d5190b13 100644
--- a/lib/vendor/PEAR/PEAR/PackageFileManager/File.php
+++ b/lib/vendor/PEAR/PEAR/PackageFileManager/File.php
@@ -3,24 +3,19 @@
  * The File list plugin generator for both PEAR_PackageFileManager,
  * and PEAR_PackageFileManager2 classes.
  *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
+ * PHP versions 5 and 7
  *
  * @category  PEAR
- * @package   PEAR_PackageFileManager
+ * @package   PEAR_PackageFileManager_Plugins
  * @author    Greg Beaver <cellog@php.net>
- * @copyright 2003-2007 The PHP Group
- * @license   http://www.php.net/license/3_01.txt  PHP License 3.01
- * @version   CVS: $Id: File.php,v 1.29 2007/11/20 08:49:20 farell Exp $
- * @link      http://pear.php.net/package/PEAR_PackageFileManager
- * @since     File available since Release 0.1
+ * @copyright 2003-2015 The PEAR Group
+ * @license   New BSD, Revised
+ * @link      http://pear.php.net/package/PEAR_PackageFileManager_Plugins
+ * @since     File available since Release 1.0.0alpha1
  */
 
+require_once 'PEAR/PackageFileManager/Plugins.php';
+
 /**
  * Retrieve the files from a directory listing
  *
@@ -30,36 +25,28 @@
  * repository when generating the package.xml
  *
  * @category  PEAR
- * @package   PEAR_PackageFileManager
+ * @package   PEAR_PackageFileManager_Plugins
  * @author    Greg Beaver <cellog@php.net>
- * @copyright 2003-2007 The PHP Group
- * @license   http://www.php.net/license/3_01.txt  PHP License 3.01
- * @version   Release: 1.6.3
- * @link      http://pear.php.net/package/PEAR_PackageFileManager
- * @since     Class available since Release 0.1
+ * @copyright 2003-2015 The PEAR Group
+ * @license   New BSD, Revised
+ * @version   Release: 1.0.4
+ * @link      http://pear.php.net/package/PEAR_PackageFileManager_Plugins
+ * @since     Class available since Release 1.0.0alpha1
  */
-
-class PEAR_PackageFileManager_File
+class PEAR_PackageFileManager_File extends PEAR_PackageFileManager_Plugins
 {
     /**
-     * @var array
      * @access private
+     * @var array|false
      */
-    var $_options =
-            array(
-                 );
-
-    /**
-     * @access private
-     * @var PEAR_PackageFileManager
-     */
-    var $_parent;
+    var $ignore = false;
 
     /**
+     * If we are on windows
      * @access private
-     * @var array|false
+     * @var boolean
      */
-    var $ignore = false;
+    var $windows = false;
 
     /**
      * Set up the File filelist generator
@@ -68,15 +55,14 @@ class PEAR_PackageFileManager_File
      * {@link PEAR_PackageFileManager::setOptions()} for
      * more information and formatting of this option
      *
-     * @param object &$parent PEAR_PackageFileManager
      * @param array  $options list of generation options
      *
      * @return void
      */
-    function PEAR_PackageFileManager_File(&$parent, $options)
+    function __construct($options)
     {
-        $this->_parent  = &$parent;
-        $this->_options = array_merge($this->_options, $options);
+        $this->windows = strtoupper(substr(PHP_OS, 0, 3)) == 'WIN';
+        $this->setOptions($options);
     }
 
     /**
@@ -98,45 +84,58 @@ function getFileList()
             // ignore auto-generated package2.xml from PEAR 1.4.0
             $ignore[] = 'package2.xml';
         }
+
+        $dir = $package_directory;
+        if ($dir{strlen($dir) - 1} === DIRECTORY_SEPARATOR) {
+            $dir = substr($package_directory, 0, strlen($package_directory) - 1);
+        }
+
         $include = $this->_options['include'];
         $this->ignore = array(false, false);
         $this->_setupIgnore($ignore, 1);
         $this->_setupIgnore($include, 0);
-        $allfiles = $this->dirList(substr($package_directory, 0, strlen($package_directory) - 1));
+        $allfiles = $this->dirList($dir);
         if (PEAR::isError($allfiles)) {
             return $allfiles;
         }
+
         if (!count($allfiles)) {
-            return $this->_parent->raiseError(PEAR_PACKAGEFILEMANAGER_NO_FILES,
-                substr($package_directory, 0, strlen($package_directory) - 1));
+            return parent::raiseError(PEAR_PACKAGEFILEMANAGER_PLUGINS_NO_FILES, $dir);
         }
+
         $struc = array();
         $package_directory_realpath = realpath($package_directory);
         if (DIRECTORY_SEPARATOR != substr($package_directory_realpath, -1, 1)) {
             $package_directory_realpath .= DIRECTORY_SEPARATOR;
         }
+
         foreach ($allfiles as $file) {
-            $path = substr(dirname($file), strlen(str_replace(DIRECTORY_SEPARATOR,
-                                                              '/',
-                                                              $package_directory_realpath)));
+            $ps   = str_replace(DIRECTORY_SEPARATOR, '/', $package_directory_realpath);
+            $path = substr(dirname($file), strlen($ps));
             if (!$path) {
                 $path = '/';
             }
+
             $stupidassphp5_1 = explode('.', $file);
             $ext = array_pop($stupidassphp5_1);
-            if (strlen($ext) == strlen($file)) {
+            if (strlen($ext) === strlen($file)) {
                 $ext = '';
             }
-            $struc[$path][] = array('file' => basename($file),
-                                    'ext' => $ext,
-                                    'path' => (($path == '/') ? basename($file) : $path . '/' . basename($file)),
-                                    'fullpath' => $file);
+
+            $struc[$path][] = array(
+                'file' => basename($file),
+                'ext' => $ext,
+                'path' => (($path == '/') ? basename($file) : $path . '/' . basename($file)),
+                'fullpath' => $file
+            );
         }
+
         if (!count($struc)) {
             $newig = implode($this->_options['ignore'], ', ');
-            return PEAR_PackageFileManager::raiseError(PEAR_PACKAGEFILEMANAGER_IGNORED_EVERYTHING,
+            return parent::raiseError(PEAR_PACKAGEFILEMANAGER_PLUGINS_IGNORED_EVERYTHING,
                 substr($package_directory, 0, strlen($package_directory) - 1), $newig);
         }
+
         uksort($struc, 'strnatcasecmp');
         foreach ($struc as $key => $ind) {
             usort($ind, array($this, 'sortfiles'));
@@ -147,6 +146,7 @@ function getFileList()
         if (!isset($tempstruc['/'])) {
             $tempstruc['/'] = array();
         }
+
         $struc = array('/' => $tempstruc['/']);
         $bv = 0;
         foreach ($tempstruc as $key => $ind) {
@@ -170,47 +170,47 @@ function getFileList()
      *
      * @access protected
      * @return array list of files in a directory
-     * @throws PEAR_PACKAGEFILEMANAGER_DIR_DOESNT_EXIST
+     * @throws PEAR_PACKAGEFILEMANAGER_PLUGINS_DIR_DOESNT_EXIST
      */
     function dirList($directory)
     {
-        $ret = false;
-        if (@is_dir($directory)) {
-            $ret = array();
-            $d = @dir($directory); // thanks to Jason E Sweat (jsweat@users.sourceforge.net) for fix
-            while ($d && false !== ($entry = $d->read())) {
-                if ($this->_testFile($directory, $entry)) {
-                    if (is_file($directory . '/' . $entry)) {
-                        // if include option was set, then only pass included files
-                        if ($this->ignore[0]) {
-                            if ($this->_checkIgnore($entry, $directory . '/' . $entry, 0)) {
-                                continue;
-                            }
-                        }
-                        // if ignore option was set, then only pass included files
-                        if ($this->ignore[1]) {
-                            if ($this->_checkIgnore($entry, $directory . '/' . $entry, 1)) {
-                                continue;
-                            }
-                        }
-                        $ret[] = $directory . '/' . $entry;
+        if (!@is_dir($directory)) {
+            return parent::raiseError(PEAR_PACKAGEFILEMANAGER_PLUGINS_DIR_DOESNT_EXIST, $directory);
+        }
+
+        $ret = array();
+        $d = @dir($directory); // thanks to Jason E Sweat (jsweat@users.sourceforge.net) for fix
+        while ($d && false !== ($entry = $d->read())) {
+            if ($this->_testFile($directory, $entry)) {
+                $de = $directory . '/' . $entry;
+                if (is_file($de)) {
+                    // if include option was set, then only pass included files
+                    if ($this->ignore[0] && $this->_checkIgnore($entry, $de, 0)) {
+                        continue;
+                    }
+                    // if ignore option was set, then only pass included files
+                    if ($this->ignore[1] && $this->_checkIgnore($entry, $de, 1)) {
+                        continue;
                     }
-                    if (is_dir($directory . '/' . $entry)) {
-                        $tmp = $this->dirList($directory . '/' . $entry);
-                        if (is_array($tmp)) {
-                            foreach ($tmp as $ent) {
-                                $ret[] = $ent;
-                            }
+                    $ret[] = $de;
+                }
+
+                if (is_dir($de)) {
+                    $tmp = $this->dirList($de);
+                    if (is_array($tmp)) {
+                        foreach ($tmp as $ent) {
+                            $ret[] = $ent;
                         }
                     }
                 }
             }
-            if ($d) {
-                $d->close();
-            }
-        } else {
-            return PEAR_PackageFileManager::raiseError(PEAR_PACKAGEFILEMANAGER_DIR_DOESNT_EXIST, $directory);
         }
+
+        if ($d) {
+            $d->close();
+        }
+
+        usort($ret, array($this, 'mystrucsort'));
         return $ret;
     }
 
@@ -230,9 +230,9 @@ function _testFile($directory, $entry)
     {
         if ($this->_options['addhiddenfiles']) {
             return is_file($directory . '/' . $entry) || (is_dir($directory . '/' . $entry) && !in_array($entry, array('.', '..')));
-        } else {
-            return $entry{0} != '.';
         }
+
+        return $entry{0} != '.';
     }
 
     /**
@@ -251,19 +251,27 @@ function _testFile($directory, $entry)
      */
     function _checkIgnore($file, $path, $return = 1)
     {
-        if (file_exists($path)) {
+        if ($this->windows && file_exists($path)) {
             $path = realpath($path);
         }
+
+        if (DIRECTORY_SEPARATOR == '\\') {
+          $path = strtr($path, '/', '\\');
+        } else {
+          $path = strtr($path, '\\', '/');
+        }
+
         if (is_array($this->ignore[$return])) {
             foreach ($this->ignore[$return] as $match) {
                 // match is an array if the ignore parameter was a /path/to/pattern
                 if (is_array($match)) {
                     // check to see if the path matches with a path delimiter appended
-                    preg_match('/^' . strtoupper($match[0]).'$/', strtoupper($path) . '/', $find);
+                    preg_match('/^' . strtoupper($match[0]).'$/', strtoupper($path) . DIRECTORY_SEPARATOR, $find);
                     if (!count($find)) {
                         // check to see if it matches without an appended path delimiter
                         preg_match('/^' . strtoupper($match[0]).'$/', strtoupper($path), $find);
                     }
+
                     if (count($find)) {
                         // check to see if the file matches the file portion of the regex string
                         preg_match('/^' . strtoupper($match[1]).'$/', strtoupper($file), $find);
@@ -271,12 +279,24 @@ function _checkIgnore($file, $path, $return = 1)
                             return $return;
                         }
                     }
+
                     // check to see if the full path matches the regex
                     preg_match('/^' . strtoupper($match[0]).'$/',
                                strtoupper($path . DIRECTORY_SEPARATOR . $file), $find);
                     if (count($find)) {
                         return $return;
                     }
+
+                    // user is trying a regex with no glob, lets give him the full path to match against
+                    if (!isset($this->_options['packagedirectory'])) {
+                        return !$return;
+                    }
+
+                    $t = $this->_getRegExpableSearchString($this->_options['packagedirectory']);
+                    preg_match('/^' . strtoupper($t . $match[0]).'$/', strtoupper($path), $find);
+                    if (count($find)) {
+                        return $return;
+                    }
                 } else {
                     // ignore parameter was just a pattern with no path delimiters
                     // check it against the path
@@ -284,6 +304,7 @@ function _checkIgnore($file, $path, $return = 1)
                     if (count($find)) {
                         return $return;
                     }
+
                     // check it against the file only
                     preg_match('/^' . strtoupper($match).'$/', strtoupper($file), $find);
                     if (count($find)) {
@@ -292,6 +313,7 @@ function _checkIgnore($file, $path, $return = 1)
                 }
             }
         }
+
         return !$return;
     }
 
@@ -306,33 +328,45 @@ function _checkIgnore($file, $path, $return = 1)
      */
     function _setupIgnore($ignore, $index)
     {
+        if (!is_array($ignore)) {
+            $this->ignore[$index] = false;
+            return;
+        }
+
         $ig = array();
-        if (is_array($ignore)) {
-            for ($i=0; $i<count($ignore);$i++) {
-                $ignore[$i] = strtr($ignore[$i], "\\", "/");
-                $ignore[$i] = str_replace('//', '/', $ignore[$i]);
+        for ($i = 0, $ic = count($ignore); $i < $ic; $i++) {
+            $ignore[$i] = strtr($ignore[$i], '\\', '/');
+            $ignore[$i] = str_replace('//', '/', $ignore[$i]);
 
-                if (!empty($ignore[$i])) {
-                    if (!is_numeric(strpos($ignore[$i], '/'))) {
+            if (!empty($ignore[$i])) {
+                if (!is_numeric(strpos($ignore[$i], '/'))) {
+                    $ig[] = $this->_getRegExpableSearchString($ignore[$i]);
+                } else {
+                    /*
+                     People tend to forgot to add * when they want to ignore
+                     a whole dir so we try to discover it for them
+                     Make sure the char before the last / is not * as adding *
+                     after a / as well is not optimal
+                    */
+                    $one = strrpos($ignore[$i], '/');
+                    $len = strlen($ignore[$i]);
+                    if ($one !== false && $len-1 == $one &&
+                        ($len > 1 && $ignore[$i][$len-2] != '*')
+                    ) {
+                        $ignore[$i] .= '*';
+                    }
+
+                    if (basename($ignore[$i]) . '/' == $ignore[$i]) {
                         $ig[] = $this->_getRegExpableSearchString($ignore[$i]);
                     } else {
-                        if (basename($ignore[$i]) . '/' == $ignore[$i]) {
-                            $ig[] = $this->_getRegExpableSearchString($ignore[$i]);
-                        } else {
-                            $ig[] = array($this->_getRegExpableSearchString($ignore[$i]),
-                                      $this->_getRegExpableSearchString(basename($ignore[$i])));
-                        }
+                        $ig[] = array($this->_getRegExpableSearchString($ignore[$i]),
+                                  $this->_getRegExpableSearchString(basename($ignore[$i])));
                     }
                 }
             }
-            if (count($ig)) {
-                $this->ignore[$index] = $ig;
-            } else {
-                $this->ignore[$index] = false;
-            }
-        } else {
-            $this->ignore[$index] = false;
         }
+
+        $this->ignore[$index] = count($ig) ? $ig : false;
     }
 
     /**
@@ -349,13 +383,16 @@ function _getRegExpableSearchString($s)
         if (DIRECTORY_SEPARATOR == '\\') {
             $y = '\\\\';
         }
+
         $s = str_replace('/', DIRECTORY_SEPARATOR, $s);
         $x = strtr($s, array('?' => '.', '*' => '.*', '.' => '\\.', '\\' => '\\\\', '/' => '\\/',
                              '[' => '\\[', ']' => '\\]', '-' => '\\-'));
+
         if (strpos($s, DIRECTORY_SEPARATOR) !== false &&
               strrpos($s, DIRECTORY_SEPARATOR) === strlen($s) - 1) {
             $x = "(?:.*$y$x?.*|$x.*)";
         }
+
         return $x;
     }
 
@@ -379,26 +416,26 @@ function _setupDirs($struc, $dir, $contents)
     {
         if (!count($dir)) {
             foreach ($contents as $dir => $files) {
-                if (is_string($dir)) {
-                    if (strpos($dir, '/')) {
-                        $test = true;
-                        $a = $contents[$dir];
-                        unset($contents[$dir]);
-                        $b = explode('/', $dir);
-                        $c = array_shift($b);
-                        if (isset($contents[$c])) {
-                            $contents[$c] = $this->_setDir($contents[$c], $this->_setupDirs(array(), $b, $a));
-                        } else {
-                            $contents[$c] = $this->_setupDirs(array(), $b, $a);
-                        }
+                if (is_string($dir) && strpos($dir, '/')) {
+                    $a = $contents[$dir];
+                    unset($contents[$dir]);
+                    $b = explode('/', $dir);
+                    $c = array_shift($b);
+                    if (isset($contents[$c])) {
+                        $contents[$c] = $this->_setDir($contents[$c], $this->_setupDirs(array(), $b, $a));
+                    } else {
+                        $contents[$c] = $this->_setupDirs(array(), $b, $a);
                     }
                 }
             }
+
             return $contents;
         }
+
         $me = array_shift($dir);
         if (!isset($struc[$me])) {
             $struc[$me] = array();
+
         }
         $struc[$me] = $this->_setupDirs($struc[$me], $dir, $contents);
         return $struc;
@@ -452,4 +489,3 @@ function mystrucsort($a, $b)
     }
     /**#@-*/
 }
-?>
\ No newline at end of file
diff --git a/lib/vendor/PEAR/PEAR/PackageFileManager/Git.php b/lib/vendor/PEAR/PEAR/PackageFileManager/Git.php
new file mode 100644
index 000000000..81636207f
--- /dev/null
+++ b/lib/vendor/PEAR/PEAR/PackageFileManager/Git.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * The git list plugin generator for both PEAR_PackageFileManager,
+ * and PEAR_PackageFileManager2 classes.
+ *
+ * PHP versions 5 and 7
+ *
+ * @category  PEAR
+ * @package   PEAR_PackageFileManager_Plugins
+ * @author    Armen Baghumian <armen@OpenSourceClub.org>
+ * @license   New BSD, Revised
+ * @link      http://pear.php.net/package/PEAR_PackageFileManager_Plugins
+ * @since     File available since Release 1.0.3
+ */
+
+require_once 'PEAR/PackageFileManager/File.php';
+
+/**
+ * Generate a file list from a Git workingcopy.
+ *
+ * Note that this will <b>NOT</b> work on a
+ * repository, only on a Git workingcopy
+ *
+ * @category  PEAR
+ * @package   PEAR_PackageFileManager_Plugins
+ * @author    Armen Baghumian <armen@OpenSourceClub.org>
+ * @license   New BSD, Revised
+ * @version   Release: 1.0.4
+ * @link      http://pear.php.net/package/PEAR_PackageFileManager_Plugins
+ * @since     Class available since Release 1.0.3
+ */
+class PEAR_PackageFileManager_Git extends PEAR_PackageFileManager_File
+{
+    function getFileList()
+    {
+        $directory = $this->_options['packagedirectory'];
+        $git       = $this->_findGitRootDir($directory);
+
+        if ($git) {
+            $content    = null;
+            $content   .= file_exists($git.'.gitignore') AND file_get_contents($git.'.gitignore');
+            $content   .= file_exists($git.'.git/info/exclude') AND file_get_contents($git.'.git/info/exclude');
+            $content    = trim($content, "\n");
+            $content    = explode("\n", $content);
+            $gitignore  = array('.git/*', '.gitignore');
+            $gitinclude = array();
+
+            foreach ($content as $pattern) {
+                if (preg_match('/^\s*#.*$/', $pattern) || preg_match('/^\s*$/', $pattern)) {
+                    continue;
+                }
+
+                if (preg_match('/^\s*!(.*)$/', $pattern, $match)) {
+                    $gitinclude[] = $match[1];
+
+                } else {
+                    $gitignore[] = $pattern;
+                }
+            }
+
+            $this->_options['ignore'] = is_array($this->_options['ignore']) ? array_merge($gitignore, $this->_options['ignore']) : $gitignore;
+        }
+
+        $fileslist = parent::getFileList();
+
+        if (is_array($fileslist) && isset($gitignore) && count($gitinclude)) {
+            // in gitignore you can ignore whole directory then include specified subdirectories
+            // or files with "!" modifier at the begining of patterns.
+            // we have to generate files list and merge it with the main result
+
+            $this->_options['ignore']  = array();
+            $this->_options['include'] = array();
+
+            foreach ($gitinclude as $entry) {
+                // make sure that entry exists in current include paths if not just ignore it.
+                if ($this->_checkIgnore($entry, $git.$entry, 0)) {
+                    continue;
+                }
+
+                $this->_options['include'][] = $entry;
+            }
+
+            if (count($this->_options['include'])) {
+                $fileslist = array_merge_recursive($fileslist, parent::getFileList());
+            }
+        }
+
+        return $fileslist;
+    }
+
+    function _findGitRootDir($directory)
+    {
+        $directory = realpath($directory);
+
+        if (!file_exists($directory.DIRECTORY_SEPARATOR.'.git') && $directory != DIRECTORY_SEPARATOR) {
+            $directory = realpath($directory.DIRECTORY_SEPARATOR.'..');
+            return $this->_findGitRootDir($directory);
+        }
+
+        if (file_exists($directory.DIRECTORY_SEPARATOR.'.git')) {
+            return $directory.DIRECTORY_SEPARATOR;
+        }
+
+        return False;
+    }
+}
diff --git a/lib/vendor/PEAR/PEAR/PackageFileManager/Perforce.php b/lib/vendor/PEAR/PEAR/PackageFileManager/Perforce.php
index 5830b0b59..4b091d670 100644
--- a/lib/vendor/PEAR/PEAR/PackageFileManager/Perforce.php
+++ b/lib/vendor/PEAR/PEAR/PackageFileManager/Perforce.php
@@ -3,22 +3,15 @@
  * The Perforce plugin generator for both PEAR_PackageFileManager,
  * and PEAR_PackageFileManager2 classes.
  *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
+ * PHP versions 5 and 7
  *
  * @category  PEAR
- * @package   PEAR_PackageFileManager
+ * @package   PEAR_PackageFileManager_Plugins
  * @author    Jon Parise <jon@php.net>
- * @copyright 2005-2007 The PHP Group
- * @license   http://www.php.net/license/3_01.txt  PHP License 3.01
- * @version   CVS: $Id: Perforce.php,v 1.6 2007/11/19 22:44:00 farell Exp $
- * @link      http://pear.php.net/package/PEAR_PackageFileManager
- * @since     File available since Release 1.3.0
+ * @copyright 2003-2015 The PEAR Group
+ * @license   New BSD, Revised
+ * @link      http://pear.php.net/package/PEAR_PackageFileManager_Plugins
+ * @since     File available since Release 1.0.0alpha1
  */
 
 require_once 'PEAR/PackageFileManager/File.php';
@@ -32,15 +25,14 @@
  * is used to determine which local files are under Perforce's control.
  *
  * @category  PEAR
- * @package   PEAR_PackageFileManager
+ * @package   PEAR_PackageFileManager_Plugins
  * @author    Jon Parise <jon@php.net>
- * @copyright 2003-2007 The PHP Group
- * @license   http://www.php.net/license/3_01.txt  PHP License 3.01
- * @version   Release: 1.6.3
- * @link      http://pear.php.net/package/PEAR_PackageFileManager
- * @since     Class available since Release 1.3.0
+ * @copyright 2003-2015 The PEAR Group
+ * @license   New BSD, Revised
+ * @version   Release: 1.0.4
+ * @link      http://pear.php.net/package/PEAR_PackageFileManager_Plugins
+ * @since     Class available since Release 1.0.0alpha1
  */
-
 class PEAR_PackageFileManager_Perforce extends PEAR_PackageFileManager_File
 {
     /**
@@ -55,8 +47,7 @@ function dirList($directory)
     {
         /* Return an error if the directory does not exist. */
         if (@is_dir($directory) === false) {
-            return $this->_parent->raiseError(PEAR_PACKAGEFILEMANAGER_DIR_DOESNT_EXIST,
-                            $directory);
+            return parent::raiseError(PEAR_PACKAGEFILEMANAGER_PLUGINS_DIR_DOESNT_EXIST, $directory);
         }
 
         /* List the files below $directory that are under Perforce control. */
diff --git a/lib/vendor/PEAR/PEAR/PackageFileManager/Plugins.php b/lib/vendor/PEAR/PEAR/PackageFileManager/Plugins.php
new file mode 100755
index 000000000..25a4244ca
--- /dev/null
+++ b/lib/vendor/PEAR/PEAR/PackageFileManager/Plugins.php
@@ -0,0 +1,101 @@
+<?php
+/**
+ * Base class for all the plugins
+ *
+ * PHP versions 5 and 7
+ *
+ * @category  PEAR
+ * @package   PEAR_PackageFileManager_Plugins
+ * @author    Helgi Þormar Þorbjörnsson <helgi@php.net>
+ * @copyright 2003-2015 The PEAR Group
+ * @license   New BSD, Revised
+ * @link      http://pear.php.net/package/PEAR_PackageFileManager_Plugins
+ * @since     File available since Release 1.0.0alpha1
+ */
+
+/**#@+
+ * Error Codes
+ */
+define('PEAR_PACKAGEFILEMANAGER_PLUGINS_NOCVSENTRIES', 12);
+define('PEAR_PACKAGEFILEMANAGER_PLUGINS_DIR_DOESNT_EXIST', 13);
+define('PEAR_PACKAGEFILEMANAGER_PLUGINS_NO_FILES', 20);
+define('PEAR_PACKAGEFILEMANAGER_PLUGINS_IGNORED_EVERYTHING', 21);
+define('PEAR_PACKAGEFILEMANAGER_PLUGINS_NOSVNENTRIES', 32);
+/**#@-*/
+/**
+ * Error messages
+ * @global array $GLOBALS['_PEAR_PACKAGEFILEMANAGER_PLUGINS_ERRORS']
+ */
+$GLOBALS['_PEAR_PACKAGEFILEMANAGER_PLUGINS_ERRORS'] =
+array(
+    PEAR_PACKAGEFILEMANAGER_PLUGINS_NOCVSENTRIES =>
+        'Directory "%s" is not a CVS directory (it must have the CVS/Entries file)',
+    PEAR_PACKAGEFILEMANAGER_PLUGINS_DIR_DOESNT_EXIST =>
+        'Package source base directory "%s" doesn\'t exist or isn\'t a directory',
+    PEAR_PACKAGEFILEMANAGER_PLUGINS_NO_FILES =>
+        'No files found, check the path "%s"',
+    PEAR_PACKAGEFILEMANAGER_PLUGINS_IGNORED_EVERYTHING =>
+        'No files left, check the path "%s" and ignore option "%s"',
+    PEAR_PACKAGEFILEMANAGER_PLUGINS_NOSVNENTRIES =>
+        'Directory "%s" is not a SVN directory (it must have the .svn/entries file)',
+);
+
+/**
+ * Generate a file list from a Subversion checkout
+ *
+ * Largely based on the CVS class, modified to suit
+ * subversion organization.
+ *
+ * Note that this will <b>NOT</b> work on a
+ * repository, only on a checked out Subversion module
+ *
+ * @category  PEAR
+ * @package   PEAR_PackageFileManager_Plugins
+ * @author    Helgi Þormar Þorbjörnsson <helgi@php.net>
+ * @copyright 2003-2015 The PEAR Group
+ * @license   New BSD, Revised
+ * @version   Release: 1.0.4
+ * @link      http://pear.php.net/package/PEAR_PackageFileManager_Plugins
+ * @since     Class available since Release 1.0.0alpha1
+ */
+class PEAR_PackageFileManager_Plugins
+{
+    /**
+     * @var array
+     * @access protected
+     */
+    var $_options = array();
+
+    /**
+     * Utility function to shorten error generation code
+     *
+     * {@source}
+     *
+     * @param integer $code error code
+     * @param string  $i1   (optional) additional specific error info #1
+     * @param string  $i2   (optional) additional specific error info #2
+     *
+     * @return PEAR_Error
+     * @static
+     * @access public
+     * @since 1.0.0alpha1
+     */
+    public static function raiseError($code, $i1 = '', $i2 = '')
+    {
+        return PEAR::raiseError('PEAR_PackageFileManager_Plugins Error: ' .
+                    sprintf($GLOBALS['_PEAR_PACKAGEFILEMANAGER_PLUGINS_ERRORS'][$code],
+                    $i1, $i2), $code);
+    }
+
+    /**
+     * Merge a new set of options (as an array) to the currently set
+     * options
+     *
+     * @param $options array Options to merge with the current options
+     * @return void
+     */
+    function setOptions($options)
+    {
+        $this->_options = array_merge($this->_options, $options);
+    }
+}
diff --git a/lib/vendor/PEAR/PEAR/PackageFileManager/SimpleGenerator.php b/lib/vendor/PEAR/PEAR/PackageFileManager/SimpleGenerator.php
deleted file mode 100644
index eeca3321c..000000000
--- a/lib/vendor/PEAR/PEAR/PackageFileManager/SimpleGenerator.php
+++ /dev/null
@@ -1,351 +0,0 @@
-<?php
-/**
- * Class for XML output
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category  PEAR
- * @package   PEAR_PackageFileManager
- * @author    Greg Beaver <cellog@php.net>
- * @copyright 2005-2007 The PHP Group
- * @license   http://www.php.net/license/3_01.txt  PHP License 3.01
- * @version   CVS: $Id: SimpleGenerator.php,v 1.9 2007/11/19 22:44:00 farell Exp $
- * @link      http://pear.php.net/package/PEAR_PackageFileManager
- * @since     File available since Release 1.3.0
- */
-
-require_once 'PEAR/PackageFile/Generator/v1.php';
-
-/**
- * Class for XML output
- *
- * @category  PEAR
- * @package   PEAR_PackageFileManager
- * @author    Greg Beaver <cellog@php.net>
- * @copyright 2005-2007 The PHP Group
- * @license   http://www.php.net/license/3_01.txt  PHP License 3.01
- * @version   Release: 1.6.3
- * @link      http://pear.php.net/package/PEAR_PackageFileManager
- * @since     Class available since Release 1.3.0
- */
-
-class PEAR_PackageFileManager_SimpleGenerator extends PEAR_PackageFile_Generator_v1
-{
-    var $_options;
-
-    /**
-     * remove a warning about missing parameters - don't delete this
-     */
-    function PEAR_PackageFileManager_SimpleGenerator()
-    {
-    }
-
-    /**
-     * @param array $opts list of generation options
-     *
-     * @return void
-     */
-    function setPackageFileManagerOptions($opts)
-    {
-        $this->_options = $opts;
-    }
-
-    /**
-     * Return an XML document based on the package info (as returned
-     * by the PEAR_Common::infoFrom* methods).
-     *
-     * @param array $pkginfo package info
-     *
-     * @return string XML data
-     * @access public
-     * @deprecated use a PEAR_PackageFile_v* object's generator instead
-     */
-    function xmlFromInfo($pkginfo)
-    {
-        include_once 'PEAR/PackageFile.php';
-        include_once 'PEAR/Config.php';
-        $config = &PEAR_Config::singleton();
-        $packagefile = &new PEAR_PackageFile($config);
-        $pf = &$packagefile->fromArray($pkginfo);
-        parent::PEAR_PackageFile_Generator_v1($pf);
-        $ret = $this->toXml();
-        if (!$ret) {
-            $errors = $pf->getValidationWarnings();
-            return PEAR::raiseError('Invalid package.xml file', null, null, null, $errors);
-        }
-        return $ret;
-    }
-
-    function getFileRoles()
-    {
-        return PEAR_Common::getFileRoles();
-    }
-
-    function getReplacementTypes()
-    {
-        return PEAR_Common::getReplacementTypes();
-    }
-
-    /**
-     * Validate XML package definition file.
-     *
-     * @param string $info        Filename of the package archive or of the
-     *                            package definition file
-     * @param array  &$errors     Array that will contain the errors
-     * @param array  &$warnings   Array that will contain the warnings
-     * @param string $dir_prefix  (optional) directory where source files
-     *                            may be found, or empty if they are not available
-     *
-     * @access public
-     * @return boolean
-     * @deprecated use the validation of PEAR_PackageFile objects
-     */
-    function validatePackageInfo($info, &$errors, &$warnings, $dir_prefix = '')
-    {
-        include_once 'PEAR/PackageFile.php';
-        include_once 'PEAR/Config.php';
-        $config = &PEAR_Config::singleton();
-        $packagefile = &new PEAR_PackageFile($config);
-        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-        if (is_array($info)) {
-            $pf = &$packagefile->fromArray($info);
-            if (!$pf->validate(PEAR_VALIDATE_NORMAL)) {
-                foreach ($pf->getValidationWarnings() as $err) {
-                    if ($error['level'] == 'error') {
-                        $errors[] = $error['message'];
-                    } else {
-                        $warnings[] = $error['message'];
-                    }
-                }
-                return false;
-            }
-        } else {
-            $pf = &$packagefile->fromAnyFile($info, PEAR_VALIDATE_NORMAL);
-        }
-        PEAR::staticPopErrorHandling();
-        if (PEAR::isError($pf)) {
-            $errs = $pf->getUserinfo();
-            if (is_array($errs)) {
-                foreach ($errs as $error) {
-                    if ($error['level'] == 'error') {
-                        $errors[] = $error['message'];
-                    } else {
-                        $warnings[] = $error['message'];
-                    }
-                }
-            }
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * @param array $list
-     *
-     * @return string
-     * @access protected
-     */
-    function recursiveXmlFilelist($list)
-    {
-        $this->_dirs = array();
-        foreach ($list as $file => $attributes) {
-            $this->_addDir($this->_dirs, explode('/', dirname($file)), $file, $attributes);
-        }
-        if (!isset($this->_dirs['dirs'])) {
-            $this->_dirs['dirs'] = array();
-        }
-        if (count($this->_dirs['dirs']) != 1 || isset($this->_dirs['files'])) {
-            $this->_dirs = array('dirs' => array('/' => $this->_dirs));
-        }
-        return $this->_formatDir($this->_dirs, '', '', true);
-    }
-
-    /**
-     * @param array       &$dirs
-     * @param array       $dir
-     * @param string|null $file
-     * @param array|null  $attributes
-     *
-     * @return void
-     * @access private
-     */
-    function _addDir(&$dirs, $dir, $file = null, $attributes = null)
-    {
-        if ($dir == array() || $dir == array('.')) {
-            $dirs['files'][basename($file)] = $attributes;
-            return;
-        }
-        $curdir = array_shift($dir);
-        if (!isset($dirs['dirs'][$curdir])) {
-            $dirs['dirs'][$curdir] = array();
-        }
-        $this->_addDir($dirs['dirs'][$curdir], $dir, $file, $attributes);
-    }
-
-    /**
-     * @param array  $dirs
-     * @param string $indent
-     * @param string $curdir
-     * @param bool   $toplevel
-     *
-     * @return string
-     * @access private
-     */
-    function _formatDir($dirs, $indent = '', $curdir = '', $toplevel = false)
-    {
-        $ret = '';
-        if (!count($dirs)) {
-            return '';
-        }
-        if (isset($dirs['dirs'])) {
-            uksort($dirs['dirs'], 'strnatcasecmp');
-            foreach ($dirs['dirs'] as $dir => $contents) {
-                if ($dir == '/') {
-                    $usedir = '/';
-                } else {
-                    if ($curdir == '/') {
-                        $curdir = '';
-                    }
-                    $usedir = "$curdir/$dir";
-                }
-                $ret .= "$indent   <dir name=\"$dir\"";
-                if ($toplevel) {
-                    $ret .= ' baseinstalldir="' . $this->_options['baseinstalldir'] . '"';
-                } else {
-                    if (isset($this->_options['installexceptions'][$dir])) {
-                        $ret .= ' baseinstalldir="' . $this->_options['installexceptions'][$dir] . '"';
-                    }
-                }
-                $ret .= ">\n";
-                $ret .= $this->_formatDir($contents, "$indent ", $usedir);
-                $ret .= "$indent   </dir> <!-- $usedir -->\n";
-            }
-        }
-        if (isset($dirs['files'])) {
-            uksort($dirs['files'], 'strnatcasecmp');
-            foreach ($dirs['files'] as $file => $attribs) {
-                $ret .= $this->_formatFile($file, $attribs, $indent);
-            }
-        }
-        return $ret;
-    }
-
-    /**
-     * Generate the <file> tag
-     *
-     * @param string $file       fullname to file
-     * @param array  $attributes file attributes
-     * @param string $indent     string to indent xml tag
-     *
-     * @return string
-     * @access private
-     */
-    function _formatFile($file, $attributes, $indent)
-    {
-        $ret = "$indent   <file role=\"$attributes[role]\"";
-        if (isset($this->_options['installexceptions'][$file])) {
-            $ret .= ' baseinstalldir="' . $this->_options['installexceptions'][$file] . '"';
-        }
-        if (isset($attributes['md5sum'])) {
-            $ret .= " md5sum=\"$attributes[md5sum]\"";
-        }
-        if (isset($attributes['platform'])) {
-            $ret .= " platform=\"$attributes[platform]\"";
-        }
-        if (!empty($attributes['install-as'])) {
-            $ret .= ' install-as="' .
-                htmlspecialchars($attributes['install-as']) . '"';
-        }
-        $ret .= ' name="' . htmlspecialchars($file) . '"';
-        if (empty($attributes['replacements'])) {
-            $ret .= "/>\n";
-        } else {
-            $ret .= ">\n";
-            foreach ($attributes['replacements'] as $r) {
-                $ret .= "$indent    <replace";
-                foreach ($r as $k => $v) {
-                    $ret .= " $k=\"" . htmlspecialchars($v) .'"';
-                }
-                $ret .= "/>\n";
-            }
-            $ret .= "$indent   </file>\n";
-        }
-        return $ret;
-    }
-
-    /**
-     * Generate the <filelist> tag
-     *
-     * @param string $indent   string to indent xml tag
-     * @param array  $filelist list of files included in release
-     * @param string $curdir
-     *
-     * @access private
-     * @return string XML data
-     */
-    function _doFileList($indent, $filelist, $curdir)
-    {
-        $ret = '';
-        foreach ($filelist as $file => $fa) {
-            if (isset($fa['##files'])) {
-                $ret .= "$indent      <dir";
-            } else {
-                $ret .= "$indent      <file";
-            }
-
-            if (isset($fa['role'])) {
-                $ret .= " role=\"$fa[role]\"";
-            }
-            if (isset($fa['baseinstalldir'])) {
-                $ret .= ' baseinstalldir="' .
-                    htmlspecialchars($fa['baseinstalldir']) . '"';
-            }
-            if (isset($fa['md5sum'])) {
-                $ret .= " md5sum=\"$fa[md5sum]\"";
-            }
-            if (isset($fa['platform'])) {
-                $ret .= " platform=\"$fa[platform]\"";
-            }
-            if (!empty($fa['install-as'])) {
-                $ret .= ' install-as="' .
-                    htmlspecialchars($fa['install-as']) . '"';
-            }
-            $ret .= ' name="' . htmlspecialchars($file) . '"';
-            if (isset($fa['##files'])) {
-                $ret .= ">\n";
-                $recurdir = $curdir;
-                if ($recurdir == '///') {
-                    $recurdir = '';
-                }
-                $ret .= $this->_doFileList("$indent ", $fa['##files'], $recurdir . $file . '/');
-                $displaydir = $curdir;
-                if ($displaydir == '///' || $displaydir == '/') {
-                    $displaydir = '';
-                }
-                $ret .= "$indent      </dir> <!-- $displaydir$file -->\n";
-            } else {
-                if (empty($fa['replacements'])) {
-                    $ret .= "/>\n";
-                } else {
-                    $ret .= ">\n";
-                    foreach ($fa['replacements'] as $r) {
-                        $ret .= "$indent        <replace";
-                        foreach ($r as $k => $v) {
-                            $ret .= " $k=\"" . htmlspecialchars($v) .'"';
-                        }
-                        $ret .= "/>\n";
-                    }
-                    $ret .= "$indent      </file>\n";
-                }
-            }
-        }
-        return $ret;
-    }
-}
-?>
\ No newline at end of file
diff --git a/lib/vendor/PEAR/PEAR/PackageFileManager/Svn.php b/lib/vendor/PEAR/PEAR/PackageFileManager/Svn.php
index 9455d6753..7b87b01fc 100644
--- a/lib/vendor/PEAR/PEAR/PackageFileManager/Svn.php
+++ b/lib/vendor/PEAR/PEAR/PackageFileManager/Svn.php
@@ -3,23 +3,16 @@
  * The SVN list plugin generator for both PEAR_PackageFileManager,
  * and PEAR_PackageFileManager2 classes.
  *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
+ * PHP versions 5 and 7
  *
  * @category  PEAR
- * @package   PEAR_PackageFileManager
+ * @package   PEAR_PackageFileManager_Plugins
  * @author    Arnaud Limbourg <arnaud@limbourg.com>
  * @author    Tim Jackson <tim@timj.co.uk>
- * @copyright 2005-2007 The PHP Group
- * @license   http://www.php.net/license/3_01.txt  PHP License 3.01
- * @version   CVS: $Id: Svn.php,v 1.11 2007/11/19 22:44:00 farell Exp $
- * @link      http://pear.php.net/package/PEAR_PackageFileManager
- * @since     File available since Release 1.3.0
+ * @copyright 2003-2015 The PEAR Group
+ * @license   New BSD, Revised
+ * @link      http://pear.php.net/package/PEAR_PackageFileManager_Plugins
+ * @since     File available since Release 1.0.0alpha1
  */
 
 require_once 'PEAR/PackageFileManager/File.php';
@@ -34,31 +27,24 @@
  * repository, only on a checked out Subversion module
  *
  * @category  PEAR
- * @package   PEAR_PackageFileManager
+ * @package   PEAR_PackageFileManager_Plugins
  * @author    Arnaud Limbourg <arnaud@limbourg.com>
  * @author    Tim Jackson <tim@timj.co.uk>
- * @copyright 2005-2007 The PHP Group
- * @license   http://www.php.net/license/3_01.txt  PHP License 3.01
- * @version   Release: 1.6.3
- * @link      http://pear.php.net/package/PEAR_PackageFileManager
- * @since     Class available since Release 1.3.0
+ * @copyright 2003-2015 The PEAR Group
+ * @license   New BSD, Revised
+ * @version   Release: 1.0.4
+ * @link      http://pear.php.net/package/PEAR_PackageFileManager_Plugins
+ * @since     Class available since Release 1.0.0alpha1
  */
-
 class PEAR_PackageFileManager_Svn extends PEAR_PackageFileManager_File
 {
-    function PEAR_PackageFileManager_Svn(&$parent, $options)
+    function __construct($options)
     {
-        if (version_compare(phpversion(), '5.0.0', '>=')) {
-            if (!function_exists('simplexml_load_string')) {
-                die('PEAR_PackageFileManager_SVN Error: simplexml extension is required' .
-                    ' in PHP 5+.  PHP 4 uses XML_Tree');
-            }
-        }
-        parent::PEAR_PackageFileManager_File($parent, $options);
+        parent::__construct($options);
     }
 
     /**
-     * Return a list of all files in the CVS repository
+     * Return a list of all files in the SVN repository
      *
      * This function is like {@link parent::dirList()} except
      * that instead of retrieving a regular filelist, it first
@@ -79,22 +65,24 @@ function PEAR_PackageFileManager_Svn(&$parent, $options)
     function dirList($directory)
     {
         static $in_recursion = false;
-        if (!$in_recursion) {
-            // include only .svn/entries files
-            // since subversion keeps its data in a hidden
-            // directory we must force PackageFileManager to
-            // consider hidden directories.
-            $this->_options['addhiddenfiles'] = true;
-            $this->_setupIgnore(array('*/.svn/entries'), 0);
-            $this->_setupIgnore(array(), 1);
-            $in_recursion = true;
-            $entries = parent::dirList($directory);
-            $in_recursion = false;
-        } else {
+        if ($in_recursion) {
             return parent::dirList($directory);
         }
+
+        // include only .svn/entries files
+        // since subversion keeps its data in a hidden
+        // directory we must force PackageFileManager to
+        // consider hidden directories.
+        $this->_options['addhiddenfiles'] = true;
+        $this->_setupIgnore(array('*/.svn/entries'), 0);
+        $this->_setupIgnore(array(), 1);
+        $in_recursion = true;
+        $entries = parent::dirList($directory);
+        $in_recursion = false;
+
         if (!$entries || !is_array($entries)) {
-            return $this->_parent->raiseError(PEAR_PACKAGEFILEMANAGER_NOSVNENTRIES, $directory);
+            $code = PEAR_PACKAGEFILEMANAGER_PLUGINS_NOSVNENTRIES;
+            return parent::raiseError($code, $directory);
         }
         return $this->_readSVNEntries($entries);
     }
@@ -115,33 +103,35 @@ function _readSVNEntries($entries)
         $ignore = $this->_options['ignore'];
         // implicitly ignore packagefile
         $ignore[] = $this->_options['packagefile'];
-        $include = $this->_options['include'];
+        $include  = $this->_options['include'];
         $this->ignore = array(false, false);
         $this->_setupIgnore($ignore, 1);
         $this->_setupIgnore($include, 0);
-        foreach ($entries as $cvsentry) {
-            $directory = @dirname(@dirname($cvsentry));
+        foreach ($entries as $entry) {
+            $directory = @dirname(@dirname($entry));
             if (!$directory) {
                 continue;
             }
-            $d = $this->_getSVNEntries($cvsentry);
+            $d = $this->_getSVNEntries($entry);
             if (!is_array($d)) {
                 continue;
             }
+
             foreach ($d as $entry) {
                 if ($ignore) {
                     if ($this->_checkIgnore($entry,
-                          $directory . '/' . $entry, 1)) {
+                          $directory . DIRECTORY_SEPARATOR . $entry, 1)) {
                         continue;
                     }
                 }
+
                 if ($include) {
                     if ($this->_checkIgnore($entry,
-                          $directory . '/' . $entry, 0)) {
+                          $directory . DIRECTORY_SEPARATOR . $entry, 0)) {
                         continue;
                     }
                 }
-                $ret[] = $directory . '/' . $entry;
+                $ret[] = $directory . DIRECTORY_SEPARATOR . $entry;
             }
         }
         return $ret;
@@ -161,82 +151,91 @@ function _readSVNEntries($entries)
      * @uses   PEAR::XML_Tree
      * @access private
      */
-    function _getSVNEntries($svnentriesfilename)
+    function _getSVNEntries($filename)
     {
-        $stuff = file_get_contents($svnentriesfilename);
-
-        if (substr($stuff, 0, 5) != '<?xml') {
+        $content = file_get_contents($filename);
+        if (substr($content, 0, 5) != '<?xml') {
             // Not XML; assume newer (>= SVN 1.4) SVN entries format
+            // http://svn.apache.org/repos/asf/subversion/trunk/subversion/libsvn_wc/README
 
             // The directory entries are seperated by #0c; look for the first #0c
             // The hex GUID (xxxx-xxxx-xxxx-xxxx-xxxx) may not always be set
             // The list of files follows this
-            if (preg_match('/\x0c\n(.*)$/ms', $stuff, $matches)) {
-                $file_list = $matches[1];
-
-                $files = explode("\x0c", trim($file_list));
-
-                // Each file entry seems to look something like this:
-                // [filename]
-                // [type of file e.g. "dir", "file"]
-                // [varying number of \n]
-                // [optional "deleted" string]
-                foreach ($files as $file) {
-                    $lines = explode("\n", trim($file));
-                    if (isset($lines[1]) && $lines[1] == 'file') {
-                        $deleted = false;
-                        foreach ($lines as $line) {
-                            // 'deleted' means it's already gone
-                            // 'delete' means it's marked as ready to delete
-                            if ($line == 'deleted' || $line == 'delete') {
-                                $deleted = true;
-                            }
-                        }
-                        if (!$deleted) {
-                            $entries[] = $lines[0];
+            if (!preg_match('/\x0c\n(.*)$/ms', $content, $matches)) {
+                return false;
+            }
+
+            // Each file entry seems to look something like this:
+            // [filename]
+            // [type of file e.g. "dir", "file"]
+            // [varying number of \n]
+            // [optional "deleted" string]
+            $files = explode("\x0c", trim($matches[1]));
+            foreach ($files as $file) {
+                $lines = explode("\n", trim($file));
+                if (isset($lines[1]) && $lines[1] == 'file') {
+                    $deleted = false;
+                    foreach ($lines as $line) {
+                        // 'deleted' means it's already gone
+                        // 'delete' means it's marked as ready to delete
+                        if ($line == 'deleted' || $line == 'delete') {
+                            $deleted = true;
                         }
                     }
+
+                    if (!$deleted) {
+                        $entries[] = $lines[0];
+                    }
                 }
             }
         } elseif (function_exists('simplexml_load_string')) {
             // this breaks simplexml because "svn:" is an invalid namespace, so strip it
-            $stuff = str_replace('xmlns="svn:"', '', file_get_contents($svnentriesfilename));
-            $all = simplexml_load_string($stuff);
+            $content = str_replace('xmlns="svn:"', '', $content);
+            $all     = simplexml_load_string($content);
             $entries = array();
             foreach ($all->entry as $entry) {
                 if ($entry['kind'] == 'file') {
-                    if (isset($entry['deleted'])) {
+                    // 'deleted' means it's already gone
+                    // 'delete' means it's marked as ready to delete
+                    if (isset($entry['deleted']) || isset($entry['delete'])) {
                         continue;
                     }
                     array_push($entries, $entry['name']);
                 }
             }
         } else {
-            unset($stuff);
-            include_once 'XML/Tree.php';
-            $parser  = &new XML_Tree($svnentriesfilename);
-            $tree    = &$parser->getTreeFromFile();
+            require_once 'XML/Unserializer.php';
+            $options = array(
+                XML_UNSERIALIZER_OPTION_ATTRIBUTES_PARSE    => true,
+                XML_UNSERIALIZER_OPTION_ATTRIBUTES_ARRAYKEY => false
+            );
+            $unserializer = new XML_Unserializer($options);
+            $status = $unserializer->unserialize($content);
+            if (PEAR::isError($status)) {
+                return false;
+            }
+            $tree = $unserializer->getUnserializedData();
 
             // loop through the xml tree and keep only valid entries being files
             $entries = array();
-            foreach ($tree->children as $entry) {
-                if ($entry->name == 'entry'
-                    && $entry->attributes['kind'] == 'file') {
-                    if (isset($entry->attributes['deleted'])) {
+            foreach ($tree['entry'] as $entry) {
+                if ($entry['kind'] == 'file') {
+                    // 'deleted' means it's already gone
+                    // 'delete' means it's marked as ready to delete
+                    if (isset($entry['deleted']) || isset($entry['delete'])) {
                         continue;
                     }
-                    array_push($entries, $entry->attributes['name']);
+                    array_push($entries, $entry['name']);
                 }
             }
 
-            unset($parser, $tree);
+            unset($unserializer, $tree);
         }
 
         if (isset($entries) && is_array($entries)) {
             return $entries;
-        } else {
-            return false;
         }
+
+        return false;
     }
 }
-?>
\ No newline at end of file
diff --git a/lib/vendor/PEAR/PEAR/PackageFileManager/XMLOutput.php b/lib/vendor/PEAR/PEAR/PackageFileManager/XMLOutput.php
deleted file mode 100644
index b0817b13c..000000000
--- a/lib/vendor/PEAR/PEAR/PackageFileManager/XMLOutput.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-/**
- * Class for XML output
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.01 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_01.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category  PEAR
- * @package   PEAR_PackageFileManager
- * @author    Greg Beaver <cellog@php.net>
- * @copyright 2004-2007 The PHP Group
- * @license   http://www.php.net/license/3_01.txt  PHP License 3.01
- * @version   CVS: $Id: XMLOutput.php,v 1.6 2007/11/19 22:44:00 farell Exp $
- * @link      http://pear.php.net/package/PEAR_PackageFileManager
- * @since     File available since Release 1.2.0
- */
-
-/**
- * Class for XML output
- *
- * @category  PEAR
- * @package   PEAR_PackageFileManager
- * @author    Greg Beaver <cellog@php.net>
- * @copyright 2004-2007 The PHP Group
- * @license   http://www.php.net/license/3_01.txt  PHP License 3.01
- * @version   Release: 1.6.3
- * @link      http://pear.php.net/package/PEAR_PackageFileManager
- * @since     Class available since Release 1.2.0
- */
-
-class PEAR_PackageFileManager_XMLOutput extends PEAR_Common
-{
-    /**
-     * Generate part of an XML description with release information.
-     *
-     * @param array $pkginfo   array with release information
-     * @param bool  $changelog whether the result will be in a changelog element
-     *
-     * @return string XML data
-     * @access private
-     */
-    function _makeReleaseXml($pkginfo, $changelog = false)
-    {
-        $indent = $changelog ? "  " : "";
-        $ret = "$indent  <release>\n";
-        if (!empty($pkginfo['version'])) {
-            $ret .= "$indent    <version>$pkginfo[version]</version>\n";
-        }
-        if (!empty($pkginfo['release_date'])) {
-            $ret .= "$indent    <date>$pkginfo[release_date]</date>\n";
-        }
-        if (!empty($pkginfo['release_license'])) {
-            $ret .= "$indent    <license>$pkginfo[release_license]</license>\n";
-        }
-        if (!empty($pkginfo['release_state'])) {
-            $ret .= "$indent    <state>$pkginfo[release_state]</state>\n";
-        }
-        if (!empty($pkginfo['release_notes'])) {
-            $ret .= "$indent    <notes>".htmlspecialchars($pkginfo['release_notes'])."</notes>\n";
-        }
-        if (!empty($pkginfo['release_warnings'])) {
-            $ret .= "$indent    <warnings>".htmlspecialchars($pkginfo['release_warnings'])."</warnings>\n";
-        }
-        if (isset($pkginfo['release_deps']) && sizeof($pkginfo['release_deps']) > 0) {
-            $ret .= "$indent    <deps>\n";
-            foreach ($pkginfo['release_deps'] as $dep) {
-                $ret .= "$indent      <dep type=\"$dep[type]\" rel=\"$dep[rel]\"";
-                if (isset($dep['version'])) {
-                    $ret .= " version=\"$dep[version]\"";
-                }
-                if (isset($dep['optional'])) {
-                    $ret .= " optional=\"$dep[optional]\"";
-                }
-                if (isset($dep['name'])) {
-                    $ret .= ">$dep[name]</dep>\n";
-                } else {
-                    $ret .= "/>\n";
-                }
-            }
-            $ret .= "$indent    </deps>\n";
-        }
-        if (isset($pkginfo['configure_options'])) {
-            $ret .= "$indent    <configureoptions>\n";
-            foreach ($pkginfo['configure_options'] as $c) {
-                $ret .= "$indent      <configureoption name=\"".
-                    htmlspecialchars($c['name']) . "\"";
-                if (isset($c['default'])) {
-                    $ret .= " default=\"" . htmlspecialchars($c['default']) . "\"";
-                }
-                $ret .= " prompt=\"" . htmlspecialchars($c['prompt']) . "\"";
-                $ret .= "/>\n";
-            }
-            $ret .= "$indent    </configureoptions>\n";
-        }
-        if (isset($pkginfo['provides'])) {
-            foreach ($pkginfo['provides'] as $key => $what) {
-                $ret .= "$indent    <provides type=\"$what[type]\" ";
-                $ret .= "name=\"$what[name]\" ";
-                if (isset($what['extends'])) {
-                    $ret .= "extends=\"$what[extends]\" ";
-                }
-                $ret .= "/>\n";
-            }
-        }
-        if (isset($pkginfo['filelist'])) {
-            $ret .= "$indent    <filelist>\n";
-            $ret .= $this->_doFileList($indent, $pkginfo['filelist'], '/');
-            $ret .= "$indent    </filelist>\n";
-        }
-        $ret .= "$indent  </release>\n";
-        return $ret;
-    }
-
-    /**
-     * Generate the <filelist> tag
-     *
-     * @param string $indent   string to indent xml tag
-     * @param array  $filelist list of files included in release
-     * @param string $curdir
-     *
-     * @access private
-     * @return string XML data
-     */
-    function _doFileList($indent, $filelist, $curdir)
-    {
-        $ret = '';
-        foreach ($filelist as $file => $fa) {
-            if (isset($fa['##files'])) {
-                $ret .= "$indent      <dir";
-            } else {
-                $ret .= "$indent      <file";
-            }
-
-            if (isset($fa['role'])) {
-                $ret .= " role=\"$fa[role]\"";
-            }
-            if (isset($fa['baseinstalldir'])) {
-                $ret .= ' baseinstalldir="' .
-                    htmlspecialchars($fa['baseinstalldir']) . '"';
-            }
-            if (isset($fa['md5sum'])) {
-                $ret .= " md5sum=\"$fa[md5sum]\"";
-            }
-            if (isset($fa['platform'])) {
-                $ret .= " platform=\"$fa[platform]\"";
-            }
-            if (!empty($fa['install-as'])) {
-                $ret .= ' install-as="' .
-                    htmlspecialchars($fa['install-as']) . '"';
-            }
-            $ret .= ' name="' . htmlspecialchars($file) . '"';
-            if (isset($fa['##files'])) {
-                $ret .= ">\n";
-                $recurdir = $curdir;
-                if ($recurdir == '///') {
-                    $recurdir = '';
-                }
-                $ret .= $this->_doFileList("$indent ", $fa['##files'], $recurdir . $file . '/');
-                $displaydir = $curdir;
-                if ($displaydir == '///' || $displaydir == '/') {
-                    $displaydir = '';
-                }
-                $ret .= "$indent      </dir> <!-- $displaydir$file -->\n";
-            } else {
-                if (empty($fa['replacements'])) {
-                    $ret .= "/>\n";
-                } else {
-                    $ret .= ">\n";
-                    foreach ($fa['replacements'] as $r) {
-                        $ret .= "$indent        <replace";
-                        foreach ($r as $k => $v) {
-                            $ret .= " $k=\"" . htmlspecialchars($v) .'"';
-                        }
-                        $ret .= "/>\n";
-                    }
-                    $ret .= "$indent      </file>\n";
-                }
-            }
-        }
-        return $ret;
-    }
-}
-?>
\ No newline at end of file

From b5acc2b4d9c532967a19015225831e1917db700f Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Wed, 15 Mar 2017 18:19:11 +0900
Subject: [PATCH 583/630] install XML_Serializer 0.21.0 (refs #4176)

PEAR_PackageFileManager_Plugins depends on this package.
---
 lib/vendor/PEAR/XML/Serializer.php   | 1256 ++++++++++++++++++++++++++
 lib/vendor/PEAR/XML/Unserializer.php |  993 ++++++++++++++++++++
 2 files changed, 2249 insertions(+)
 create mode 100644 lib/vendor/PEAR/XML/Serializer.php
 create mode 100644 lib/vendor/PEAR/XML/Unserializer.php

diff --git a/lib/vendor/PEAR/XML/Serializer.php b/lib/vendor/PEAR/XML/Serializer.php
new file mode 100644
index 000000000..af97d4c4e
--- /dev/null
+++ b/lib/vendor/PEAR/XML/Serializer.php
@@ -0,0 +1,1256 @@
+<?PHP
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * XML_Serializer
+ *
+ * Creates XML documents from PHP data structures like arrays, objects or scalars.
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2003-2008 Stephan Schmidt <schst@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The name of the author may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category  XML
+ * @package   XML_Serializer
+ * @author    Stephan Schmidt <schst@php.net>
+ * @copyright 2003-2008 Stephan Schmidt <schst@php.net>
+ * @license   http://opensource.org/licenses/bsd-license New BSD License
+ * @version   CVS: $Id$
+ * @link      http://pear.php.net/package/XML_Serializer
+ * @see       XML_Unserializer
+ */
+
+/**
+ * uses PEAR error management
+ */
+require_once 'PEAR.php';
+
+/**
+ * uses XML_Util to create XML tags
+ */
+require_once 'XML/Util.php';
+
+/**
+ * option: string used for indentation
+ *
+ * Possible values:
+ * - any string (default is any string)
+ */
+define('XML_SERIALIZER_OPTION_INDENT', 'indent');
+
+/**
+ * option: string used for linebreaks
+ *
+ * Possible values:
+ * - any string (default is \n)
+ */
+define('XML_SERIALIZER_OPTION_LINEBREAKS', 'linebreak');
+
+/**
+ * option: enable type hints
+ *
+ * Possible values:
+ * - true
+ * - false
+ */
+define('XML_SERIALIZER_OPTION_TYPEHINTS', 'typeHints');
+
+/**
+ * option: add an XML declaration
+ *
+ * Possible values:
+ * - true
+ * - false
+ */
+define('XML_SERIALIZER_OPTION_XML_DECL_ENABLED', 'addDecl');
+
+/**
+ * option: encoding of the document
+ *
+ * Possible values:
+ * - any valid encoding
+ * - null (default)
+ */
+define('XML_SERIALIZER_OPTION_XML_ENCODING', 'encoding');
+
+/**
+ * option: default name for tags
+ *
+ * Possible values:
+ * - any string (XML_Serializer_Tag is default)
+ */
+define('XML_SERIALIZER_OPTION_DEFAULT_TAG', 'defaultTagName');
+
+/**
+ * option: use classname for objects in indexed arrays
+ *
+ * Possible values:
+ * - true
+ * - false (default)
+ */
+define('XML_SERIALIZER_OPTION_CLASSNAME_AS_TAGNAME', 'classAsTagName');
+
+/**
+ * option: attribute where original key is stored
+ *
+ * Possible values:
+ * - any string (default is _originalKey)
+ */
+define('XML_SERIALIZER_OPTION_ATTRIBUTE_KEY', 'keyAttribute');
+
+/**
+ * option: attribute for type (only if typeHints => true)
+ *
+ * Possible values:
+ * - any string (default is _type)
+ */
+define('XML_SERIALIZER_OPTION_ATTRIBUTE_TYPE', 'typeAttribute');
+
+/**
+ * option: attribute for class (only if typeHints => true)
+ *
+ * Possible values:
+ * - any string (default is _class)
+ */
+define('XML_SERIALIZER_OPTION_ATTRIBUTE_CLASS', 'classAttribute');
+
+/**
+ * option: scalar values (strings, ints,..) will be serialized as attribute
+ *
+ * Possible values:
+ * - true
+ * - false (default)
+ * - array which sets this option on a per-tag basis
+ */
+define('XML_SERIALIZER_OPTION_SCALAR_AS_ATTRIBUTES', 'scalarAsAttributes');
+
+/**
+ * option: prepend string for attributes
+ *
+ * Possible values:
+ * - any string (default is any string)
+ */
+define('XML_SERIALIZER_OPTION_PREPEND_ATTRIBUTES', 'prependAttributes');
+
+/**
+ * option: indent the attributes, if set to '_auto',
+ * it will indent attributes so they all start at the same column
+ *
+ * Possible values:
+ * - true
+ * - false (default)
+ * - '_auto'
+ */
+define('XML_SERIALIZER_OPTION_INDENT_ATTRIBUTES', 'indentAttributes');
+
+/**
+ * option: use 'simplexml' to use parent name as tagname
+ * if transforming an indexed array
+ *
+ * Possible values:
+ * - XML_SERIALIZER_MODE_DEFAULT (default)
+ * - XML_SERIALIZER_MODE_SIMPLEXML
+ */
+define('XML_SERIALIZER_OPTION_MODE', 'mode');
+
+/**
+ * option: add a doctype declaration
+ *
+ * Possible values:
+ * - true
+ * - false (default)
+ */
+define('XML_SERIALIZER_OPTION_DOCTYPE_ENABLED', 'addDoctype');
+
+/**
+ * option: supply a string or an array with id and uri
+ * ({@see XML_Util::getDoctypeDeclaration()}
+ *
+ * Possible values:
+ * - string
+ * - array
+ */
+define('XML_SERIALIZER_OPTION_DOCTYPE', 'doctype');
+
+/**
+ * option: name of the root tag
+ *
+ * Possible values:
+ * - string
+ * - null (default)
+ */
+define('XML_SERIALIZER_OPTION_ROOT_NAME', 'rootName');
+
+/**
+ * option: attributes of the root tag
+ *
+ * Possible values:
+ * - array
+ */
+define('XML_SERIALIZER_OPTION_ROOT_ATTRIBS', 'rootAttributes');
+
+/**
+ * option: all values in this key will be treated as attributes
+ *
+ * Possible values:
+ * - string
+ */
+define('XML_SERIALIZER_OPTION_ATTRIBUTES_KEY', 'attributesArray');
+
+/**
+ * option: this value will be used directly as content,
+ * instead of creating a new tag, may only be used
+ * in conjuction with attributesArray
+ *
+ * Possible values:
+ * - string
+ * - null (default)
+ */
+define('XML_SERIALIZER_OPTION_CONTENT_KEY', 'contentName');
+
+/**
+ * option: this value will be used in a comment, instead of creating a new tag
+ *
+ * Possible values:
+ * - string
+ * - null (default)
+ */
+define('XML_SERIALIZER_OPTION_COMMENT_KEY', 'commentName');
+
+/**
+ * option: tag names that will be changed
+ *
+ * Possible values:
+ * - array
+ */
+define('XML_SERIALIZER_OPTION_TAGMAP', 'tagMap');
+
+/**
+ * option: function that will be applied before serializing
+ *
+ * Possible values:
+ * - any valid PHP callback
+ */
+define('XML_SERIALIZER_OPTION_ENCODE_FUNC', 'encodeFunction');
+
+/**
+ * option: namespace to use for the document
+ *
+ * Possible values:
+ * - string
+ * - null (default)
+ */
+define('XML_SERIALIZER_OPTION_NAMESPACE', 'namespace');
+
+/**
+ * option: type of entities to replace
+ *
+ * Possible values:
+ * - XML_SERIALIZER_ENTITIES_NONE
+ * - XML_SERIALIZER_ENTITIES_XML (default)
+ * - XML_SERIALIZER_ENTITIES_XML_REQUIRED
+ * - XML_SERIALIZER_ENTITIES_HTML
+ */
+define('XML_SERIALIZER_OPTION_ENTITIES', 'replaceEntities');
+
+/**
+ * option: whether to return the result of the serialization from serialize()
+ *
+ * Possible values:
+ * - true
+ * - false (default)
+ */
+define('XML_SERIALIZER_OPTION_RETURN_RESULT', 'returnResult');
+
+/**
+ * option: whether to ignore properties that are set to null
+ *
+ * Possible values:
+ * - true
+ * - false (default)
+ */
+define('XML_SERIALIZER_OPTION_IGNORE_NULL', 'ignoreNull');
+
+/**
+ * option: whether to use cdata sections for character data
+ *
+ * Possible values:
+ * - true
+ * - false (default)
+ */
+define('XML_SERIALIZER_OPTION_CDATA_SECTIONS', 'cdata');
+
+/**
+ * option: whether a boolean FALSE value should become a string
+ *
+ * Possible values:
+ * - true
+ * - false (default)
+ *
+ * @since 0.20.0
+ */
+define('XML_SERIALIZER_OPTION_FALSE_AS_STRING', 'falseAsString');
+
+/**
+ * default mode
+ */
+define('XML_SERIALIZER_MODE_DEFAULT', 'default');
+
+/**
+ * SimpleXML mode
+ *
+ * When serializing indexed arrays, the key of the parent value is used as a tagname.
+ */
+define('XML_SERIALIZER_MODE_SIMPLEXML', 'simplexml');
+
+/**
+ * error code for no serialization done
+ */
+define('XML_SERIALIZER_ERROR_NO_SERIALIZATION', 51);
+
+/**
+ * do not replace entitites
+ */
+define('XML_SERIALIZER_ENTITIES_NONE', XML_UTIL_ENTITIES_NONE);
+
+/**
+ * replace all XML entitites
+ * This setting will replace <, >, ", ' and &
+ */
+define('XML_SERIALIZER_ENTITIES_XML', XML_UTIL_ENTITIES_XML);
+
+/**
+ * replace only required XML entitites
+ * This setting will replace <, " and &
+ */
+define('XML_SERIALIZER_ENTITIES_XML_REQUIRED', XML_UTIL_ENTITIES_XML_REQUIRED);
+
+/**
+ * replace HTML entitites
+ * @link    http://www.php.net/htmlentities
+ */
+define('XML_SERIALIZER_ENTITIES_HTML', XML_UTIL_ENTITIES_HTML);
+
+/**
+ * Creates XML documents from PHP data structures like arrays, objects or scalars.
+ *
+ * This class can be used in two modes:
+ *
+ *  1. Create an XML document from an array or object that is processed by other
+ *    applications. That means you can create an RDF document from an array in the
+ *    following format:
+ *    <code>
+ *    $data = array(
+ *        'channel' => array(
+ *            'title' => 'Example RDF channel',
+ *            'link'  => 'http://www.php-tools.de',
+ *            'image' => array(
+ *                'title' => 'Example image',
+ *                'url'   => 'http://www.php-tools.de/image.gif',
+ *                'link'  => 'http://www.php-tools.de'
+ *            ),
+ *            array(
+ *                'title' => 'Example item',
+ *                'link'  => 'http://example.com'
+ *            ),
+ *            array(
+ *                'title' => 'Another Example item',
+ *                'link'  => 'http://example.org'
+ *            )
+ *        )
+ *    );
+ *    </code>
+ *
+ *    To create an RDF document from this array, do the following:
+ *
+ *    <code>
+ *    require_once 'XML/Serializer.php';
+ *    $options = array(
+ *       XML_SERIALIZER_OPTION_INDENT      => "\t",     // indent with tabs
+ *       XML_SERIALIZER_OPTION_LINEBREAKS  => "\n",     // use UNIX line breaks
+ *       XML_SERIALIZER_OPTION_ROOT_NAME   => 'rdf:RDF',// root tag
+ *       XML_SERIALIZER_OPTION_DEFAULT_TAG => 'item'    // tag for values
+ *                                                      // with numeric keys
+ *    );
+ *    $serializer = new XML_Serializer($options);
+ *    $rdf        = $serializer->serialize($data);
+ *    </code>
+ *
+ *    You will get a complete XML document that can be processed like any RDF document.
+ *
+ * 2. This class can be used to serialize any data structure in a way that it can
+ *    later be unserialized again.  XML_Serializer will store the type of the value
+ *    and additional meta information in attributes of the surrounding tag. This
+ *    meta information can later be used to restore the original data structure
+ *    in PHP. If you want XML_Serializer to add meta information to the tags, add
+ *    <code>
+ *      XML_SERIALIZER_OPTION_TYPEHINTS => true
+ *    </code>
+ *    to the options array in the constructor.
+ *
+ * @category  XML
+ * @package   XML_Serializer
+ * @author    Stephan Schmidt <schst@php.net>
+ * @copyright 2003-2008 Stephan Schmidt <schst@php.net>
+ * @license   http://opensource.org/licenses/bsd-license New BSD License
+ * @version   Release: @package_version@
+ * @link      http://pear.php.net/package/XML_Serializer
+ * @see       XML_Unserializer
+ * @todo      replace extending PEAR class with instead using a PEAR_Error object
+ */
+class XML_Serializer extends PEAR
+{
+    /**
+     * List of all available options
+     *
+     * @access private
+     * @var    array
+     */
+    var $_knownOptions = array(
+        XML_SERIALIZER_OPTION_INDENT,
+        XML_SERIALIZER_OPTION_LINEBREAKS,
+        XML_SERIALIZER_OPTION_TYPEHINTS,
+        XML_SERIALIZER_OPTION_XML_DECL_ENABLED,
+        XML_SERIALIZER_OPTION_XML_ENCODING,
+        XML_SERIALIZER_OPTION_DEFAULT_TAG,
+        XML_SERIALIZER_OPTION_CLASSNAME_AS_TAGNAME,
+        XML_SERIALIZER_OPTION_ATTRIBUTE_KEY,
+        XML_SERIALIZER_OPTION_ATTRIBUTE_TYPE,
+        XML_SERIALIZER_OPTION_ATTRIBUTE_CLASS,
+        XML_SERIALIZER_OPTION_SCALAR_AS_ATTRIBUTES,
+        XML_SERIALIZER_OPTION_PREPEND_ATTRIBUTES,
+        XML_SERIALIZER_OPTION_INDENT_ATTRIBUTES,
+        XML_SERIALIZER_OPTION_MODE,
+        XML_SERIALIZER_OPTION_DOCTYPE_ENABLED,
+        XML_SERIALIZER_OPTION_DOCTYPE,
+        XML_SERIALIZER_OPTION_ROOT_NAME,
+        XML_SERIALIZER_OPTION_ROOT_ATTRIBS,
+        XML_SERIALIZER_OPTION_ATTRIBUTES_KEY,
+        XML_SERIALIZER_OPTION_CONTENT_KEY,
+        XML_SERIALIZER_OPTION_COMMENT_KEY,
+        XML_SERIALIZER_OPTION_TAGMAP,
+        XML_SERIALIZER_OPTION_ENCODE_FUNC,
+        XML_SERIALIZER_OPTION_NAMESPACE,
+        XML_SERIALIZER_OPTION_ENTITIES,
+        XML_SERIALIZER_OPTION_RETURN_RESULT,
+        XML_SERIALIZER_OPTION_IGNORE_NULL,
+        XML_SERIALIZER_OPTION_CDATA_SECTIONS,
+    );
+
+    /**
+     * Default options for the serialization
+     *
+     * @access private
+     * @var    array
+     */
+    var $_defaultOptions = array(
+
+        // string used for indentation
+        XML_SERIALIZER_OPTION_INDENT => '',
+
+        // string used for newlines
+        XML_SERIALIZER_OPTION_LINEBREAKS => "\n",
+
+        // automatically add type hin attributes
+        XML_SERIALIZER_OPTION_TYPEHINTS => false,
+
+        // add an XML declaration
+        XML_SERIALIZER_OPTION_XML_DECL_ENABLED => false,
+
+        // encoding specified in the XML declaration
+        XML_SERIALIZER_OPTION_XML_ENCODING => null,
+
+        // tag used for indexed arrays or invalid names
+        XML_SERIALIZER_OPTION_DEFAULT_TAG => 'XML_Serializer_Tag',
+
+        // use classname for objects in indexed arrays
+        XML_SERIALIZER_OPTION_CLASSNAME_AS_TAGNAME => false,
+
+        // attribute where original key is stored
+        XML_SERIALIZER_OPTION_ATTRIBUTE_KEY => '_originalKey',
+
+        // attribute for type (only if typeHints => true)
+        XML_SERIALIZER_OPTION_ATTRIBUTE_TYPE => '_type',
+
+        // attribute for class of objects (only if typeHints => true)
+        XML_SERIALIZER_OPTION_ATTRIBUTE_CLASS => '_class',
+
+        // scalar values (strings, ints,..) will be serialized as attribute
+        XML_SERIALIZER_OPTION_SCALAR_AS_ATTRIBUTES => false,
+
+        // prepend string for attributes
+        XML_SERIALIZER_OPTION_PREPEND_ATTRIBUTES => '',
+
+        // indent the attributes, if set to '_auto',
+        // it will indent attributes so they all start at the same column
+        XML_SERIALIZER_OPTION_INDENT_ATTRIBUTES => false,
+
+        // use XML_SERIALIZER_MODE_SIMPLEXML to use parent name as tagname
+        // if transforming an indexed array
+        XML_SERIALIZER_OPTION_MODE => XML_SERIALIZER_MODE_DEFAULT,
+
+        // add a doctype declaration
+        XML_SERIALIZER_OPTION_DOCTYPE_ENABLED => false,
+
+        // supply a string or an array with id and uri
+        // ({@see XML_Util::getDoctypeDeclaration()}
+        XML_SERIALIZER_OPTION_DOCTYPE => null,
+
+        // name of the root tag
+        XML_SERIALIZER_OPTION_ROOT_NAME => null,
+
+        // attributes of the root tag
+        XML_SERIALIZER_OPTION_ROOT_ATTRIBS => array(),
+
+        // all values in this key will be treated as attributes
+        XML_SERIALIZER_OPTION_ATTRIBUTES_KEY => null,
+
+        // this value will be used directly as content,
+        // instead of creating a new tag, may only be used
+        // in conjuction with attributesArray
+        XML_SERIALIZER_OPTION_CONTENT_KEY => null,
+
+        // this value will be used directly as comment,
+        // instead of creating a new tag, may only be used
+        // in conjuction with attributesArray
+        XML_SERIALIZER_OPTION_COMMENT_KEY => null,
+
+        // tag names that will be changed
+        XML_SERIALIZER_OPTION_TAGMAP => array(),
+
+        // function that will be applied before serializing
+        XML_SERIALIZER_OPTION_ENCODE_FUNC => null,
+
+        // namespace to use
+        XML_SERIALIZER_OPTION_NAMESPACE => null,
+
+        // type of entities to replace,
+        XML_SERIALIZER_OPTION_ENTITIES => XML_SERIALIZER_ENTITIES_XML,
+
+        // serialize() returns the result of the serialization instead of true
+        XML_SERIALIZER_OPTION_RETURN_RESULT => false,
+
+        // ignore properties that are set to null
+        XML_SERIALIZER_OPTION_IGNORE_NULL => false,
+
+        // Whether to use cdata sections for plain character data
+        XML_SERIALIZER_OPTION_CDATA_SECTIONS => false,
+
+        // Whether to convert a boolean FALSE into a string
+        XML_SERIALIZER_OPTION_FALSE_AS_STRING => false,
+    );
+
+    /**
+     * Options for the serialization
+     *
+     * @access public
+     * @var    array
+     */
+    var $options = array();
+
+    /**
+     * Current tag depth
+     *
+     * @access private
+     * @var    integer
+     */
+    var $_tagDepth = 0;
+
+    /**
+     * Serialized representation of the data
+     *
+     * @access private
+     * @var    string
+     */
+    var $_serializedData = null;
+
+    /**
+     * Constructor
+     *
+     * @param mixed $options array containing options for the serialization
+     *
+     * @access public
+     */
+    function __construct($options = null)
+    {
+        $this->PEAR();
+        if (is_array($options)) {
+            $this->options = array_merge($this->_defaultOptions, $options);
+        } else {
+            $this->options = $this->_defaultOptions;
+        }
+    }
+
+    /**
+     * PHP4 constructor for backwards compatibility with older code
+     *
+     * @param mixed $options array containing options for the serialization
+     */
+    function XML_Serializer($options = null)
+    {
+        self::__construct($options);
+    }
+
+    /**
+     * Return the package version number
+     *
+     * @access public
+     * @static
+     * @return string the version number of XML_Serializer
+     */
+    function apiVersion()
+    {
+        return '@package_version@';
+    }
+
+    /**
+     * Reset all options to default options
+     *
+     * @return void
+     * @access public
+     */
+    function resetOptions()
+    {
+        $this->options = $this->_defaultOptions;
+    }
+
+    /**
+     * Set an option
+     *
+     * You can use this method if you do not want
+     * to set all options in the constructor.
+     *
+     * @param string $name  option name
+     * @param mixed  $value option value
+     *
+     * @return void
+     * @access public
+     */
+    function setOption($name, $value)
+    {
+        $this->options[$name] = $value;
+    }
+
+    /**
+     * Sets several options at once
+     *
+     * You can use this method if you do not want
+     * to set all options in the constructor.
+     *
+     * @param array $options options array
+     *
+     * @return void
+     * @access public
+     */
+    function setOptions($options)
+    {
+        $this->options = array_merge($this->options, $options);
+    }
+
+    /**
+     * serialize data
+     *
+     * @param mixed $data    data to serialize
+     * @param array $options options array
+     *
+     * @return boolean true on success, pear error on failure
+     * @access public
+     * @uses XML_Util::getDoctypeDeclaration()
+     * @uses XML_Util::getXMLDeclaration()
+     * @internal uses error suppression "@settype()"
+     */
+    function serialize($data, $options = null)
+    {
+        // if options have been specified, use them instead
+        // of the previously defined ones
+        if (is_array($options)) {
+            $optionsBak = $this->options;
+            if (isset($options['overrideOptions'])
+                && $options['overrideOptions'] == true
+            ) {
+                $this->options = array_merge($this->_defaultOptions, $options);
+            } else {
+                $this->options = array_merge($this->options, $options);
+            }
+        } else {
+            $optionsBak = null;
+        }
+
+        //  start depth is zero
+        $this->_tagDepth = 0;
+
+        $rootAttributes = $this->options[XML_SERIALIZER_OPTION_ROOT_ATTRIBS];
+        if (isset($this->options[XML_SERIALIZER_OPTION_NAMESPACE])
+            && is_array($this->options[XML_SERIALIZER_OPTION_NAMESPACE])
+        ) {
+            $rootAttributes['xmlns:'
+                . $this->options[XML_SERIALIZER_OPTION_NAMESPACE][0]] =
+                $this->options[XML_SERIALIZER_OPTION_NAMESPACE][1];
+        }
+
+        $this->_serializedData = '';
+        // serialize an array
+        if (is_array($data)) {
+            if (isset($this->options[XML_SERIALIZER_OPTION_ROOT_NAME])) {
+                $tagName = $this->options[XML_SERIALIZER_OPTION_ROOT_NAME];
+            } else {
+                $tagName = 'array';
+            }
+
+            $this->_serializedData .=
+                $this->_serializeArray($data, $tagName, $rootAttributes);
+        } elseif (is_object($data)) {
+            // serialize an object
+            if (isset($this->options[XML_SERIALIZER_OPTION_ROOT_NAME])) {
+                $tagName = $this->options[XML_SERIALIZER_OPTION_ROOT_NAME];
+            } else {
+                $tagName = get_class($data);
+            }
+            $this->_serializedData .=
+                $this->_serializeObject($data, $tagName, $rootAttributes);
+        } else {
+            $tag = array();
+            if (isset($this->options[XML_SERIALIZER_OPTION_ROOT_NAME])) {
+                $tag['qname'] = $this->options[XML_SERIALIZER_OPTION_ROOT_NAME];
+            } else {
+                $tag['qname'] = gettype($data);
+            }
+            $tagName = $tag['qname'];
+            if ($this->options[XML_SERIALIZER_OPTION_TYPEHINTS] === true) {
+                $rootAttributes[$this->
+                    options[XML_SERIALIZER_OPTION_ATTRIBUTE_TYPE]] = gettype($data);
+            }
+
+            if (!is_bool($data)) {
+                $tag['content'] = $data;
+            } elseif ($data === false) {
+                if ($this->options[XML_SERIALIZER_OPTION_FALSE_AS_STRING] === true) {
+                    $tag['content'] = '0';
+                } else {
+                    $tag['content'] = '';
+                }
+            } else {
+                $tag['content'] = $data;
+            }
+
+            @settype($data, 'string');
+            $tag['attributes']     = $rootAttributes;
+            $this->_serializedData = $this->_createXMLTag($tag);
+        }
+
+        // add doctype declaration
+        if ($this->options[XML_SERIALIZER_OPTION_DOCTYPE_ENABLED] === true) {
+            $this->_serializedData =
+                XML_Util::getDoctypeDeclaration($tagName,
+                $this->options[XML_SERIALIZER_OPTION_DOCTYPE])
+                . $this->options[XML_SERIALIZER_OPTION_LINEBREAKS]
+                . $this->_serializedData;
+        }
+
+        //  build xml declaration
+        if ($this->options[XML_SERIALIZER_OPTION_XML_DECL_ENABLED]) {
+            $atts                  = array();
+            $this->_serializedData = XML_Util::getXMLDeclaration('1.0',
+                $this->options[XML_SERIALIZER_OPTION_XML_ENCODING])
+                . $this->options[XML_SERIALIZER_OPTION_LINEBREAKS]
+                . $this->_serializedData;
+        }
+
+        if ($this->options[XML_SERIALIZER_OPTION_RETURN_RESULT] === true) {
+            $result = $this->_serializedData;
+        } else {
+            $result = true;
+        }
+
+        if ($optionsBak !== null) {
+            $this->options = $optionsBak;
+        }
+
+        return $result;
+    }
+
+    /**
+     * get the result of the serialization
+     *
+     * @access public
+     * @return string serialized XML
+     */
+    function getSerializedData()
+    {
+        if ($this->_serializedData == null) {
+            return $this->raiseError('No serialized data available. '
+                . 'Use XML_Serializer::serialize() first.',
+                XML_SERIALIZER_ERROR_NO_SERIALIZATION);
+        }
+        return $this->_serializedData;
+    }
+
+    /**
+     * serialize any value
+     *
+     * This method checks for the type of the value and calls the appropriate method
+     *
+     * @param mixed  $value      tag value
+     * @param string $tagName    tag name
+     * @param array  $attributes attributes
+     *
+     * @return string
+     * @access private
+     */
+    function _serializeValue($value, $tagName = null, $attributes = array())
+    {
+        if (is_array($value)) {
+            $xml = $this->_serializeArray($value, $tagName, $attributes);
+        } elseif (is_object($value)) {
+            $xml = $this->_serializeObject($value, $tagName);
+        } else {
+            $tag = array(
+                          'qname'      => $tagName,
+                          'attributes' => $attributes,
+                          'content'    => $value
+                        );
+            $xml = $this->_createXMLTag($tag);
+        }
+        return $xml;
+    }
+
+    /**
+     * serialize an array
+     *
+     * @param array  &$array     array to serialize
+     * @param string $tagName    name of the root tag
+     * @param array  $attributes attributes for the root tag
+     *
+     * @return string $string serialized data
+     * @access private
+     * @uses XML_Util::isValidName() to check, whether key has to be substituted
+     * @uses XML_Util::replaceEntities()
+     * @uses XML_Util::createComment()
+     * @uses PEAR::popExpect()
+     * @uses PEAR::expectError()
+     */
+    function _serializeArray(&$array, $tagName = null, $attributes = array())
+    {
+        $_content = null;
+        $_comment = null;
+
+        // check for comment
+        if ($this->options[XML_SERIALIZER_OPTION_COMMENT_KEY] !== null) {
+            if (isset($array[$this->options[XML_SERIALIZER_OPTION_COMMENT_KEY]])
+            ) {
+                $_comment =
+                    $array[$this->options[XML_SERIALIZER_OPTION_COMMENT_KEY]];
+                unset($array[$this->options[XML_SERIALIZER_OPTION_COMMENT_KEY]]);
+            }
+        }
+
+        /**
+         * check for special attributes
+         */
+        if ($this->options[XML_SERIALIZER_OPTION_ATTRIBUTES_KEY] !== null) {
+            if (isset($array[$this->options[XML_SERIALIZER_OPTION_ATTRIBUTES_KEY]])
+            ) {
+                $attributes =
+                    $array[$this->options[XML_SERIALIZER_OPTION_ATTRIBUTES_KEY]];
+                unset($array[$this->options[XML_SERIALIZER_OPTION_ATTRIBUTES_KEY]]);
+            }
+            /**
+             * check for special content
+             */
+            if ($this->options[XML_SERIALIZER_OPTION_CONTENT_KEY] !== null) {
+                if (isset($array[$this->options[XML_SERIALIZER_OPTION_CONTENT_KEY]])
+                ) {
+                    $_content =
+                        XML_Util::replaceEntities($array
+                        [$this->options[XML_SERIALIZER_OPTION_CONTENT_KEY]]);
+                    unset($array[$this->options[XML_SERIALIZER_OPTION_CONTENT_KEY]]);
+                }
+            }
+        }
+
+        if ($this->options[XML_SERIALIZER_OPTION_IGNORE_NULL] === true) {
+            foreach (array_keys($array) as $key) {
+                if (is_null($array[$key])) {
+                    unset($array[$key]);
+                }
+            }
+        }
+
+        /*
+        * if mode is set to simpleXML, check whether
+        * the array is associative or indexed
+        */
+        if (is_array($array) && !empty($array)
+            && $this->options[XML_SERIALIZER_OPTION_MODE]
+            == XML_SERIALIZER_MODE_SIMPLEXML
+        ) {
+            $indexed = true;
+            foreach ($array as $key => $val) {
+                if (!is_int($key)) {
+                    $indexed = false;
+                    break;
+                }
+            }
+
+            if ($indexed
+                && $this->options[XML_SERIALIZER_OPTION_MODE]
+                == XML_SERIALIZER_MODE_SIMPLEXML
+            ) {
+                $string = '';
+                foreach ($array as $key => $val) {
+                    $string .= $this->_serializeValue($val, $tagName, $attributes);
+
+                    $string .= $this->options[XML_SERIALIZER_OPTION_LINEBREAKS];
+                    // do indentation
+                    if ($this->options[XML_SERIALIZER_OPTION_INDENT]!==null
+                        && $this->_tagDepth>0
+                    ) {
+                        $string .=
+                            str_repeat($this->options[XML_SERIALIZER_OPTION_INDENT],
+                            $this->_tagDepth);
+                    }
+                }
+                return rtrim($string);
+            }
+        }
+
+        $scalarAsAttributes = false;
+        if (is_array($this->options[XML_SERIALIZER_OPTION_SCALAR_AS_ATTRIBUTES])
+            && isset($this->options[XML_SERIALIZER_OPTION_SCALAR_AS_ATTRIBUTES]
+            [$tagName])
+        ) {
+            $scalarAsAttributes =
+                $this->options[XML_SERIALIZER_OPTION_SCALAR_AS_ATTRIBUTES][$tagName];
+        } elseif ($this->options[XML_SERIALIZER_OPTION_SCALAR_AS_ATTRIBUTES] === true
+        ) {
+            $scalarAsAttributes = true;
+        }
+
+        if ($scalarAsAttributes === true) {
+            $this->expectError('*');
+            foreach ($array as $key => $value) {
+                if (is_scalar($value) && (XML_Util::isValidName($key) === true)) {
+                    unset($array[$key]);
+                    $attributes[$this->options
+                        [XML_SERIALIZER_OPTION_PREPEND_ATTRIBUTES].$key] = $value;
+                }
+            }
+            $this->popExpect();
+        } elseif (is_array($scalarAsAttributes)) {
+            $this->expectError('*');
+            foreach ($scalarAsAttributes as $key) {
+                if (!isset($array[$key])) {
+                    continue;
+                }
+                $value = $array[$key];
+                if (is_scalar($value) && (XML_Util::isValidName($key) === true)) {
+                    unset($array[$key]);
+                    $attributes[$this->options
+                        [XML_SERIALIZER_OPTION_PREPEND_ATTRIBUTES].$key] = $value;
+                }
+            }
+            $this->popExpect();
+        }
+
+        // check for empty array => create empty tag
+        if (empty($array)) {
+            $tag = array(
+                            'qname'      => $tagName,
+                            'content'    => $_content,
+                            'attributes' => $attributes
+                        );
+        } else {
+            $this->_tagDepth++;
+            $tmp = $_content . $this->options[XML_SERIALIZER_OPTION_LINEBREAKS];
+            foreach ($array as $key => $value) {
+                // do indentation
+                if ($this->options[XML_SERIALIZER_OPTION_INDENT]!==null
+                    && $this->_tagDepth>0
+                ) {
+                    $tmp .= str_repeat($this->options[XML_SERIALIZER_OPTION_INDENT],
+                        $this->_tagDepth);
+                }
+
+                // copy key
+                $origKey = $key;
+                $this->expectError('*');
+                // key cannot be used as tagname => use default tag
+                $valid = XML_Util::isValidName($key);
+                $this->popExpect();
+                if (PEAR::isError($valid)) {
+                    if ($this->options[XML_SERIALIZER_OPTION_CLASSNAME_AS_TAGNAME]
+                        && is_object($value)
+                    ) {
+                        $key = get_class($value);
+                    } else {
+                        $key = $this->_getDefaultTagname($tagName);
+                    }
+                }
+
+                // once we've established the true $key, is there a tagmap for it?
+                if (isset($this->options[XML_SERIALIZER_OPTION_TAGMAP][$key])) {
+                    $key = $this->options[XML_SERIALIZER_OPTION_TAGMAP][$key];
+                }
+
+                $atts = array();
+                if ($this->options[XML_SERIALIZER_OPTION_TYPEHINTS] === true) {
+                    $atts[$this->options[XML_SERIALIZER_OPTION_ATTRIBUTE_TYPE]] =
+                        gettype($value);
+                    if ($key !== $origKey) {
+                        $atts[$this->options[XML_SERIALIZER_OPTION_ATTRIBUTE_KEY]] =
+                            (string)$origKey;
+                    }
+                }
+
+                $tmp .= $this->_createXMLTag(array(
+                    'qname'      => $key,
+                    'attributes' => $atts,
+                    'content'    => $value
+                ));
+                $tmp .= $this->options[XML_SERIALIZER_OPTION_LINEBREAKS];
+            }
+
+            $this->_tagDepth--;
+            if ($this->options[XML_SERIALIZER_OPTION_INDENT]!==null
+                && $this->_tagDepth>0
+            ) {
+                $tmp .= str_repeat($this->options[XML_SERIALIZER_OPTION_INDENT],
+                    $this->_tagDepth);
+            }
+
+            if (trim($tmp) === '') {
+                $tmp = null;
+            }
+
+            $tag = array(
+                          'qname'      => $tagName,
+                          'content'    => $tmp,
+                          'attributes' => $attributes
+                        );
+        }
+        if ($this->options[XML_SERIALIZER_OPTION_TYPEHINTS] === true) {
+            if (!isset($tag['attributes']
+                [$this->options[XML_SERIALIZER_OPTION_ATTRIBUTE_TYPE]])
+            ) {
+                $tag['attributes']
+                    [$this->options[XML_SERIALIZER_OPTION_ATTRIBUTE_TYPE]] = 'array';
+            }
+        }
+
+        $string = '';
+        if (!is_null($_comment)) {
+            $string .= XML_Util::createComment($_comment);
+            $string .= $this->options[XML_SERIALIZER_OPTION_LINEBREAKS];
+            if ($this->options[XML_SERIALIZER_OPTION_INDENT]!==null
+                && $this->_tagDepth>0
+            ) {
+                $string .= str_repeat($this->options[XML_SERIALIZER_OPTION_INDENT],
+                    $this->_tagDepth);
+            }
+        }
+        $string .= $this->_createXMLTag($tag, false);
+        return $string;
+    }
+
+    /**
+     * get the name of the default tag.
+     *
+     * The name of the parent tag needs to be passed as the
+     * default name can depend on the context.
+     *
+     * @param string $parent name of the parent tag
+     *
+     * @return string default tag name
+     */
+    function _getDefaultTagname($parent)
+    {
+        if (is_string($this->options[XML_SERIALIZER_OPTION_DEFAULT_TAG])) {
+            return $this->options[XML_SERIALIZER_OPTION_DEFAULT_TAG];
+        }
+        if (isset($this->options[XML_SERIALIZER_OPTION_DEFAULT_TAG][$parent])) {
+            return $this->options[XML_SERIALIZER_OPTION_DEFAULT_TAG][$parent];
+        } elseif (isset($this->options[XML_SERIALIZER_OPTION_DEFAULT_TAG]
+            ['#default'])
+        ) {
+            return $this->options[XML_SERIALIZER_OPTION_DEFAULT_TAG]['#default'];
+        } elseif (isset($this->options[XML_SERIALIZER_OPTION_DEFAULT_TAG]
+            ['__default'])
+        ) {
+            // keep this for BC
+            return $this->options[XML_SERIALIZER_OPTION_DEFAULT_TAG]['__default'];
+        }
+        return 'XML_Serializer_Tag';
+    }
+
+    /**
+     * serialize an object
+     *
+     * @param object &$object    object to serialize
+     * @param string $tagName    tag name
+     * @param array  $attributes attributes
+     *
+     * @return string $string serialized data
+     * @access private
+     */
+    function _serializeObject(&$object, $tagName = null, $attributes = array())
+    {
+        // check for magic function
+        if (method_exists($object, '__sleep')) {
+            $propNames = $object->__sleep();
+            if (is_array($propNames)) {
+                $properties = array();
+                foreach ($propNames as $propName) {
+                    $properties[$propName] = $object->$propName;
+                }
+            } else {
+                $properties = get_object_vars($object);
+            }
+        } else {
+            $properties = get_object_vars($object);
+        }
+
+        if (empty($tagName)) {
+            $tagName = get_class($object);
+        }
+
+        // typehints activated?
+        if ($this->options[XML_SERIALIZER_OPTION_TYPEHINTS] === true) {
+            $attributes[$this->options[XML_SERIALIZER_OPTION_ATTRIBUTE_TYPE]]  =
+                'object';
+            $attributes[$this->options[XML_SERIALIZER_OPTION_ATTRIBUTE_CLASS]] =
+                get_class($object);
+        }
+        $string = $this->_serializeArray($properties, $tagName, $attributes);
+        return $string;
+    }
+
+    /**
+     * create a tag from an array
+     * this method awaits an array in the following format
+     * array(
+     *       'qname'        => $tagName,
+     *       'attributes'   => array(),
+     *       'content'      => $content,      // optional
+     *       'namespace'    => $namespace     // optional
+     *       'namespaceUri' => $namespaceUri  // optional
+     *   )
+     *
+     * @param array   $tag       tag definition
+     * @param boolean $firstCall whether or not this is the first call
+     *
+     * @return string $string XML tag
+     * @access private
+     */
+    function _createXMLTag($tag, $firstCall = true)
+    {
+        // build fully qualified tag name
+        if ($this->options[XML_SERIALIZER_OPTION_NAMESPACE] !== null) {
+            if (is_array($this->options[XML_SERIALIZER_OPTION_NAMESPACE])) {
+                $tag['qname'] = $this->options[XML_SERIALIZER_OPTION_NAMESPACE][0]
+                    . ':' . $tag['qname'];
+            } else {
+                $tag['qname'] = $this->options[XML_SERIALIZER_OPTION_NAMESPACE]
+                    . ':' . $tag['qname'];
+            }
+        }
+
+        // attribute indentation
+        if ($this->options[XML_SERIALIZER_OPTION_INDENT_ATTRIBUTES] !== false) {
+            $multiline = true;
+            $indent    = str_repeat($this->options[XML_SERIALIZER_OPTION_INDENT],
+                $this->_tagDepth);
+
+            if ($this->options[XML_SERIALIZER_OPTION_INDENT_ATTRIBUTES] == '_auto') {
+                $indent .= str_repeat(' ', (strlen($tag['qname'])+2));
+
+            } else {
+                $indent .= $this->options[XML_SERIALIZER_OPTION_INDENT_ATTRIBUTES];
+            }
+        } else {
+            $multiline = false;
+            $indent    = false;
+        }
+
+        if (is_array($tag['content'])) {
+            if (empty($tag['content'])) {
+                $tag['content'] =   '';
+            }
+        } elseif (XML_SERIALIZER_OPTION_FALSE_AS_STRING && $tag['content'] === false) {
+            $tag['content'] = '0';
+        } elseif (is_scalar($tag['content']) && (string)$tag['content'] == '') {
+            $tag['content'] =   '';
+        }
+
+        // replace XML entities
+        if ($firstCall === true) {
+            if ($this->options[XML_SERIALIZER_OPTION_CDATA_SECTIONS] === true) {
+                $replaceEntities = XML_UTIL_CDATA_SECTION;
+            } else {
+                $replaceEntities = $this->options[XML_SERIALIZER_OPTION_ENTITIES];
+            }
+        } else {
+            // this is a nested call, so value is already encoded
+            // and must not be encoded again
+            $replaceEntities = XML_SERIALIZER_ENTITIES_NONE;
+        }
+        if (is_scalar($tag['content']) || is_null($tag['content'])) {
+            if ($this->options[XML_SERIALIZER_OPTION_ENCODE_FUNC]) {
+                if ($firstCall === true) {
+                    $tag['content'] = call_user_func($this->
+                        options[XML_SERIALIZER_OPTION_ENCODE_FUNC], $tag['content']);
+                }
+                $tag['attributes'] = array_map($this->
+                    options[XML_SERIALIZER_OPTION_ENCODE_FUNC], $tag['attributes']);
+            }
+            $tag = XML_Util::createTagFromArray($tag, $replaceEntities, $multiline,
+                $indent, $this->options[XML_SERIALIZER_OPTION_LINEBREAKS]);
+        } elseif (is_array($tag['content'])) {
+            $tag = $this->_serializeArray($tag['content'], $tag['qname'],
+                $tag['attributes']);
+        } elseif (is_object($tag['content'])) {
+            $tag = $this->_serializeObject($tag['content'], $tag['qname'],
+                $tag['attributes']);
+        } elseif (is_resource($tag['content'])) {
+            settype($tag['content'], 'string');
+            if ($this->options[XML_SERIALIZER_OPTION_ENCODE_FUNC]) {
+                if ($replaceEntities === true) {
+                    $tag['content'] = call_user_func($this->
+                        options[XML_SERIALIZER_OPTION_ENCODE_FUNC], $tag['content']);
+                }
+                $tag['attributes'] = array_map($this->
+                    options[XML_SERIALIZER_OPTION_ENCODE_FUNC],
+                    $tag['attributes']);
+            }
+            $tag = XML_Util::createTagFromArray($tag, $replaceEntities);
+        }
+        return  $tag;
+    }
+}
+?>
diff --git a/lib/vendor/PEAR/XML/Unserializer.php b/lib/vendor/PEAR/XML/Unserializer.php
new file mode 100644
index 000000000..3eb15a571
--- /dev/null
+++ b/lib/vendor/PEAR/XML/Unserializer.php
@@ -0,0 +1,993 @@
+<?PHP
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * XML_Unserializer
+ *
+ * Parses any XML document into PHP data structures.
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2003-2008 Stephan Schmidt <schst@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The name of the author may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category  XML
+ * @package   XML_Serializer
+ * @author    Stephan Schmidt <schst@php.net>
+ * @copyright 2003-2008 Stephan Schmidt <schst@php.net>
+ * @license   http://opensource.org/licenses/bsd-license New BSD License
+ * @version   CVS: $Id$
+ * @link      http://pear.php.net/package/XML_Serializer
+ * @see       XML_Unserializer
+ */
+
+/**
+ * uses PEAR error managemt
+ */
+require_once 'PEAR.php';
+
+/**
+ * uses XML_Parser to unserialize document
+ */
+require_once 'XML/Parser.php';
+
+/**
+ * option: Convert nested tags to array or object
+ *
+ * Possible values:
+ * - array
+ * - object
+ * - associative array to define this option per tag name
+ */
+define('XML_UNSERIALIZER_OPTION_COMPLEXTYPE', 'complexType');
+
+/**
+ * option: Name of the attribute that stores the original key
+ *
+ * Possible values:
+ * - any string
+ */
+define('XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY', 'keyAttribute');
+
+/**
+ * option: Name of the attribute that stores the type
+ *
+ * Possible values:
+ * - any string
+ */
+define('XML_UNSERIALIZER_OPTION_ATTRIBUTE_TYPE', 'typeAttribute');
+
+/**
+ * option: Name of the attribute that stores the class name
+ *
+ * Possible values:
+ * - any string
+ */
+define('XML_UNSERIALIZER_OPTION_ATTRIBUTE_CLASS', 'classAttribute');
+
+/**
+ * option: Whether to use the tag name as a class name
+ *
+ * Possible values:
+ * - true or false
+ */
+define('XML_UNSERIALIZER_OPTION_TAG_AS_CLASSNAME', 'tagAsClass');
+
+/**
+ * option: Name of the default class
+ *
+ * Possible values:
+ * - any string
+ */
+define('XML_UNSERIALIZER_OPTION_DEFAULT_CLASS', 'defaultClass');
+
+/**
+ * option: Whether to parse attributes
+ *
+ * Possible values:
+ * - true or false
+ */
+define('XML_UNSERIALIZER_OPTION_ATTRIBUTES_PARSE', 'parseAttributes');
+
+/**
+ * option: Key of the array to store attributes (if any)
+ *
+ * Possible values:
+ * - any string
+ * - false (disabled)
+ */
+define('XML_UNSERIALIZER_OPTION_ATTRIBUTES_ARRAYKEY', 'attributesArray');
+
+/**
+ * option: string to prepend attribute name (if any)
+ *
+ * Possible values:
+ * - any string
+ * - false (disabled)
+ */
+define('XML_UNSERIALIZER_OPTION_ATTRIBUTES_PREPEND', 'prependAttributes');
+
+/**
+ * option: key to store the content,
+ * if XML_UNSERIALIZER_OPTION_ATTRIBUTES_PARSE is used
+ *
+ * Possible values:
+ * - any string
+ */
+define('XML_UNSERIALIZER_OPTION_CONTENT_KEY', 'contentName');
+
+/**
+ * option: map tag names
+ *
+ * Possible values:
+ * - associative array
+ */
+define('XML_UNSERIALIZER_OPTION_TAG_MAP', 'tagMap');
+
+/**
+ * option: list of tags that will always be enumerated
+ *
+ * Possible values:
+ * - indexed array
+ */
+define('XML_UNSERIALIZER_OPTION_FORCE_ENUM', 'forceEnum');
+
+/**
+ * option: Encoding of the XML document
+ *
+ * Possible values:
+ * - UTF-8
+ * - ISO-8859-1
+ */
+define('XML_UNSERIALIZER_OPTION_ENCODING_SOURCE', 'encoding');
+
+/**
+ * option: Desired target encoding of the data
+ *
+ * Possible values:
+ * - UTF-8
+ * - ISO-8859-1
+ */
+define('XML_UNSERIALIZER_OPTION_ENCODING_TARGET', 'targetEncoding');
+
+/**
+ * option: Callback that will be applied to textual data
+ *
+ * Possible values:
+ * - any valid PHP callback
+ */
+define('XML_UNSERIALIZER_OPTION_DECODE_FUNC', 'decodeFunction');
+
+/**
+ * option: whether to return the result of the unserialization from unserialize()
+ *
+ * Possible values:
+ * - true
+ * - false (default)
+ */
+define('XML_UNSERIALIZER_OPTION_RETURN_RESULT', 'returnResult');
+
+/**
+ * option: set the whitespace behaviour
+ *
+ * Possible values:
+ * - XML_UNSERIALIZER_WHITESPACE_KEEP
+ * - XML_UNSERIALIZER_WHITESPACE_TRIM
+ * - XML_UNSERIALIZER_WHITESPACE_NORMALIZE
+ */
+define('XML_UNSERIALIZER_OPTION_WHITESPACE', 'whitespace');
+
+/**
+ * Keep all whitespace
+ */
+define('XML_UNSERIALIZER_WHITESPACE_KEEP', 'keep');
+
+/**
+ * remove whitespace from start and end of the data
+ */
+define('XML_UNSERIALIZER_WHITESPACE_TRIM', 'trim');
+
+/**
+ * normalize whitespace
+ */
+define('XML_UNSERIALIZER_WHITESPACE_NORMALIZE', 'normalize');
+
+/**
+ * option: whether to ovverride all options that have been set before
+ *
+ * Possible values:
+ * - true
+ * - false (default)
+ */
+define('XML_UNSERIALIZER_OPTION_OVERRIDE_OPTIONS', 'overrideOptions');
+
+/**
+ * option: list of tags, that will not be used as keys
+ */
+define('XML_UNSERIALIZER_OPTION_IGNORE_KEYS', 'ignoreKeys');
+
+/**
+ * option: whether to use type guessing for scalar values
+ */
+define('XML_UNSERIALIZER_OPTION_GUESS_TYPES', 'guessTypes');
+
+/**
+ * error code for no serialization done
+ */
+define('XML_UNSERIALIZER_ERROR_NO_UNSERIALIZATION', 151);
+
+/**
+ * XML_Unserializer
+ *
+ * class to unserialize XML documents that have been created with
+ * XML_Serializer. To unserialize an XML document you have to add
+ * type hints to the XML_Serializer options.
+ *
+ * If no type hints are available, XML_Unserializer will guess how
+ * the tags should be treated, that means complex structures will be
+ * arrays and tags with only CData in them will be strings.
+ *
+ * <code>
+ * require_once 'XML/Unserializer.php';
+ *
+ * //  be careful to always use the ampersand in front of the new operator
+ * $unserializer = &new XML_Unserializer();
+ *
+ * $unserializer->unserialize($xml);
+ *
+ * $data = $unserializer->getUnserializedData();
+ * </code>
+ *
+ * @category  XML
+ * @package   XML_Serializer
+ * @author    Stephan Schmidt <schst@php.net>
+ * @copyright 2003-2008 Stephan Schmidt <schst@php.net>
+ * @license   http://opensource.org/licenses/bsd-license New BSD License
+ * @version   Release: @package_version@
+ * @link      http://pear.php.net/package/XML_Serializer
+ * @see       XML_Serializer
+ */
+class XML_Unserializer extends PEAR
+{
+    /**
+     * list of all available options
+     *
+     * @access private
+     * @var    array
+     */
+    var $_knownOptions = array(
+                                XML_UNSERIALIZER_OPTION_COMPLEXTYPE,
+                                XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY,
+                                XML_UNSERIALIZER_OPTION_ATTRIBUTE_TYPE,
+                                XML_UNSERIALIZER_OPTION_ATTRIBUTE_CLASS,
+                                XML_UNSERIALIZER_OPTION_TAG_AS_CLASSNAME,
+                                XML_UNSERIALIZER_OPTION_DEFAULT_CLASS,
+                                XML_UNSERIALIZER_OPTION_ATTRIBUTES_PARSE,
+                                XML_UNSERIALIZER_OPTION_ATTRIBUTES_ARRAYKEY,
+                                XML_UNSERIALIZER_OPTION_ATTRIBUTES_PREPEND,
+                                XML_UNSERIALIZER_OPTION_CONTENT_KEY,
+                                XML_UNSERIALIZER_OPTION_TAG_MAP,
+                                XML_UNSERIALIZER_OPTION_FORCE_ENUM,
+                                XML_UNSERIALIZER_OPTION_ENCODING_SOURCE,
+                                XML_UNSERIALIZER_OPTION_ENCODING_TARGET,
+                                XML_UNSERIALIZER_OPTION_DECODE_FUNC,
+                                XML_UNSERIALIZER_OPTION_RETURN_RESULT,
+                                XML_UNSERIALIZER_OPTION_WHITESPACE,
+                                XML_UNSERIALIZER_OPTION_IGNORE_KEYS,
+                                XML_UNSERIALIZER_OPTION_GUESS_TYPES
+                              );
+    /**
+     * default options for the serialization
+     *
+     * @access private
+     * @var    array
+     */
+    var $_defaultOptions = array(
+        // complex types will be converted to arrays, if no type hint is given
+        XML_UNSERIALIZER_OPTION_COMPLEXTYPE => 'array',
+
+        // get array key/property name from this attribute
+        XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY => '_originalKey',
+
+        // get type from this attribute
+        XML_UNSERIALIZER_OPTION_ATTRIBUTE_TYPE => '_type',
+
+        // get class from this attribute (if not given, use tag name)
+        XML_UNSERIALIZER_OPTION_ATTRIBUTE_CLASS => '_class',
+
+        // use the tagname as the classname
+        XML_UNSERIALIZER_OPTION_TAG_AS_CLASSNAME => true,
+
+        // name of the class that is used to create objects
+        XML_UNSERIALIZER_OPTION_DEFAULT_CLASS => 'stdClass',
+
+        // parse the attributes of the tag into an array
+        XML_UNSERIALIZER_OPTION_ATTRIBUTES_PARSE => false,
+
+        // parse them into sperate array (specify name of array here)
+        XML_UNSERIALIZER_OPTION_ATTRIBUTES_ARRAYKEY => false,
+
+        // prepend attribute names with this string
+        XML_UNSERIALIZER_OPTION_ATTRIBUTES_PREPEND => '',
+
+        // put cdata found in a tag that has been converted
+        // to a complex type in this key
+        XML_UNSERIALIZER_OPTION_CONTENT_KEY => '_content',
+
+        // use this to map tagnames
+        XML_UNSERIALIZER_OPTION_TAG_MAP => array(),
+
+        // these tags will always be an indexed array
+        XML_UNSERIALIZER_OPTION_FORCE_ENUM => array(),
+
+        // specify the encoding character of the document to parse
+        XML_UNSERIALIZER_OPTION_ENCODING_SOURCE => null,
+
+        // specify the target encoding
+        XML_UNSERIALIZER_OPTION_ENCODING_TARGET => null,
+
+        // function used to decode data
+        XML_UNSERIALIZER_OPTION_DECODE_FUNC => null,
+
+        // unserialize() returns the result of the unserialization instead of true
+        XML_UNSERIALIZER_OPTION_RETURN_RESULT => false,
+
+        // remove whitespace around data
+        XML_UNSERIALIZER_OPTION_WHITESPACE => XML_UNSERIALIZER_WHITESPACE_TRIM,
+
+        // List of tags that will automatically be added to the parent,
+        // instead of adding a new key
+        XML_UNSERIALIZER_OPTION_IGNORE_KEYS => array(),
+
+        // Whether to use type guessing
+        XML_UNSERIALIZER_OPTION_GUESS_TYPES => false
+    );
+
+    /**
+     * current options for the serialization
+     *
+     * @access public
+     * @var    array
+     */
+    var $options = array();
+
+    /**
+     * unserialized data
+     *
+     * @access private
+     * @var    string
+     */
+    var $_unserializedData = null;
+
+    /**
+     * name of the root tag
+     *
+     * @access private
+     * @var    string
+     */
+    var $_root = null;
+
+    /**
+     * stack for all data that is found
+     *
+     * @access private
+     * @var    array
+     */
+    var $_dataStack = array();
+
+    /**
+     * stack for all values that are generated
+     *
+     * @access private
+     * @var    array
+     */
+    var $_valStack = array();
+
+    /**
+     * current tag depth
+     *
+     * @access private
+     * @var    int
+     */
+    var $_depth = 0;
+
+    /**
+     * XML_Parser instance
+     *
+     * @access   private
+     * @var      object XML_Parser
+     */
+    var $_parser = null;
+
+    /**
+     * constructor
+     *
+     * @param mixed $options array containing options for the unserialization
+     *
+     * @access public
+     */
+    function __construct($options = null)
+    {
+        if (is_array($options)) {
+            $this->options = array_merge($this->_defaultOptions, $options);
+        } else {
+            $this->options = $this->_defaultOptions;
+        }
+    }
+
+    /**
+     * PHP4 constructor for backwards compatibility with older code
+     *
+     * @param mixed $options array containing options for the unserialization
+     */
+    function XML_Unserializer($options = null)
+    {
+        self::__construct($options);
+    }
+
+    /**
+     * return API version
+     *
+     * @access   public
+     * @return string  $version API version
+     * @static
+     */
+    function apiVersion()
+    {
+        return '@package_version@';
+    }
+
+    /**
+     * reset all options to default options
+     *
+     * @return void
+     * @access public
+     * @see setOption(), XML_Unserializer(), setOptions()
+     */
+    function resetOptions()
+    {
+        $this->options = $this->_defaultOptions;
+    }
+
+    /**
+     * set an option
+     *
+     * You can use this method if you do not want
+     * to set all options in the constructor
+     *
+     * @param string $name  name of option
+     * @param mixed  $value value of option
+     *
+     * @return void
+     * @access public
+     * @see resetOption(), XML_Unserializer(), setOptions()
+     */
+    function setOption($name, $value)
+    {
+        $this->options[$name] = $value;
+    }
+
+    /**
+     * sets several options at once
+     *
+     * You can use this method if you do not want
+     * to set all options in the constructor
+     *
+     * @param array $options options array
+     *
+     * @return void
+     * @access public
+     * @see resetOption(), XML_Unserializer(), setOption()
+     */
+    function setOptions($options)
+    {
+        $this->options = array_merge($this->options, $options);
+    }
+
+    /**
+     * unserialize data
+     *
+     * @param mixed   $data    data to unserialize (string, filename or resource)
+     * @param boolean $isFile  data should be treated as a file
+     * @param array   $options options that will override
+     *                         the global options for this call
+     *
+     * @return boolean $success
+     * @access public
+     */
+    function unserialize($data, $isFile = false, $options = null)
+    {
+        $this->_unserializedData = null;
+        $this->_root             = null;
+
+        // if options have been specified, use them instead
+        // of the previously defined ones
+        if (is_array($options)) {
+            $optionsBak = $this->options;
+            if (isset($options[XML_UNSERIALIZER_OPTION_OVERRIDE_OPTIONS])
+                && $options[XML_UNSERIALIZER_OPTION_OVERRIDE_OPTIONS] == true
+            ) {
+                $this->options = array_merge($this->_defaultOptions, $options);
+            } else {
+                $this->options = array_merge($this->options, $options);
+            }
+        } else {
+            $optionsBak = null;
+        }
+
+        $this->_valStack  = array();
+        $this->_dataStack = array();
+        $this->_depth     = 0;
+
+        $this->_createParser();
+
+        if (is_string($data)) {
+            if ($isFile) {
+                $result = $this->_parser->setInputFile($data);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+                $result = $this->_parser->parse();
+            } else {
+                $result = $this->_parser->parseString($data, true);
+            }
+        } else {
+            $this->_parser->setInput($data);
+            $result = $this->_parser->parse();
+        }
+
+        if ($this->options[XML_UNSERIALIZER_OPTION_RETURN_RESULT] === true) {
+            $return = $this->_unserializedData;
+        } else {
+            $return = true;
+        }
+
+        if ($optionsBak !== null) {
+            $this->options = $optionsBak;
+        }
+
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+
+        return $return;
+    }
+
+    /**
+     * get the result of the serialization
+     *
+     * @access public
+     * @return string  $serializedData
+     */
+    function getUnserializedData()
+    {
+        if ($this->_root === null) {
+            return $this->raiseError('No unserialized data available. '
+                . 'Use XML_Unserializer::unserialize() first.',
+                XML_UNSERIALIZER_ERROR_NO_UNSERIALIZATION);
+        }
+        return $this->_unserializedData;
+    }
+
+    /**
+     * get the name of the root tag
+     *
+     * @access public
+     * @return string  $rootName
+     */
+    function getRootName()
+    {
+        if ($this->_root === null) {
+            return $this->raiseError('No unserialized data available. '
+                . 'Use XML_Unserializer::unserialize() first.',
+                XML_UNSERIALIZER_ERROR_NO_UNSERIALIZATION);
+        }
+        return $this->_root;
+    }
+
+    /**
+     * Start element handler for XML parser
+     *
+     * @param object $parser  XML parser object
+     * @param string $element XML element
+     * @param array  $attribs attributes of XML tag
+     *
+     * @return void
+     * @access private
+     */
+    function startHandler($parser, $element, $attribs)
+    {
+        if (isset($attribs[$this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_TYPE]])
+        ) {
+            $type = $attribs[$this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_TYPE]];
+
+            $guessType = false;
+        } else {
+            $type = 'string';
+            if ($this->options[XML_UNSERIALIZER_OPTION_GUESS_TYPES] === true) {
+                $guessType = true;
+            } else {
+                $guessType = false;
+            }
+        }
+
+        if ($this->options[XML_UNSERIALIZER_OPTION_DECODE_FUNC] !== null) {
+            $attribs = array_map($this->options[XML_UNSERIALIZER_OPTION_DECODE_FUNC],
+                $attribs);
+        }
+
+        $this->_depth++;
+        $this->_dataStack[$this->_depth] = null;
+
+        if (is_array($this->options[XML_UNSERIALIZER_OPTION_TAG_MAP])
+            && isset($this->options[XML_UNSERIALIZER_OPTION_TAG_MAP][$element])
+        ) {
+            $element = $this->options[XML_UNSERIALIZER_OPTION_TAG_MAP][$element];
+        }
+
+        $val = array(
+                     'name'         => $element,
+                     'value'        => null,
+                     'type'         => $type,
+                     'guessType'    => $guessType,
+                     'childrenKeys' => array(),
+                     'aggregKeys'   => array()
+                    );
+
+        if ($this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTES_PARSE] == true
+            && (count($attribs) > 0)
+        ) {
+            $val['children'] = array();
+            $val['type']     = $this->_getComplexType($element);
+            $val['class']    = $element;
+
+            if ($this->options[XML_UNSERIALIZER_OPTION_GUESS_TYPES] === true) {
+                $attribs = $this->_guessAndSetTypes($attribs);
+            }
+            if ($this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTES_ARRAYKEY] != false
+            ) {
+                $val['children'][$this->
+                    options[XML_UNSERIALIZER_OPTION_ATTRIBUTES_ARRAYKEY]] = $attribs;
+            } else {
+                foreach ($attribs as $attrib => $value) {
+                    $val['children'][$this->
+                        options[XML_UNSERIALIZER_OPTION_ATTRIBUTES_PREPEND]
+                        . $attrib] = $value;
+                }
+            }
+        }
+
+        $keyAttr = false;
+
+        if (is_string($this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY])) {
+            $keyAttr = $this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY];
+        } elseif (is_array($this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY])) {
+            if (isset($this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY]
+                [$element])
+            ) {
+                $keyAttr =
+                    $this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY][$element];
+            } elseif (isset($this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY]
+                ['#default'])
+            ) {
+                $keyAttr = $this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY]
+                ['#default'];
+            } elseif (isset($this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY]
+                ['__default'])
+            ) {
+                // keep this for BC
+                $keyAttr =
+                    $this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY]
+                    ['__default'];
+            }
+        }
+
+        if ($keyAttr !== false && isset($attribs[$keyAttr])) {
+            $val['name'] = $attribs[$keyAttr];
+        }
+
+        if (isset($attribs[$this->
+            options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_CLASS]])
+        ) {
+            $val['class'] =
+                $attribs[$this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_CLASS]];
+        }
+
+        array_push($this->_valStack, $val);
+    }
+
+    /**
+     * Try to guess the type of several values and
+     * set them accordingly
+     *
+     * @param array $array array containing the values
+     *
+     * @return array array, containing the values with their correct types
+     * @access private
+     */
+    function _guessAndSetTypes($array)
+    {
+        foreach ($array as $key => $value) {
+            $array[$key] = $this->_guessAndSetType($value);
+        }
+        return $array;
+    }
+
+    /**
+     * Try to guess the type of a value and
+     * set it accordingly
+     *
+     * @param string $value character data
+     *
+     * @return mixed value with the best matching type
+     * @access private
+     */
+    function _guessAndSetType($value)
+    {
+        if ($value === 'true') {
+            return true;
+        }
+        if ($value === 'false') {
+            return false;
+        }
+        if ($value === 'NULL') {
+            return null;
+        }
+        if (preg_match('/^[-+]?[0-9]{1,}\\z/', $value)) {
+            return intval($value);
+        }
+        if (preg_match('/^[-+]?[0-9]{1,}\.[0-9]{1,}\\z/', $value)) {
+            return doubleval($value);
+        }
+        return (string)$value;
+    }
+
+    /**
+     * End element handler for XML parser
+     *
+     * @param object $parser  XML parser object
+     * @param string $element element
+     *
+     * @return void
+     * @access private
+     */
+    function endHandler($parser, $element)
+    {
+        $value = array_pop($this->_valStack);
+        switch ($this->options[XML_UNSERIALIZER_OPTION_WHITESPACE]) {
+        case XML_UNSERIALIZER_WHITESPACE_KEEP:
+            $data = $this->_dataStack[$this->_depth];
+            break;
+        case XML_UNSERIALIZER_WHITESPACE_NORMALIZE:
+            $data = trim(preg_replace('/\s\s+/m', ' ',
+                $this->_dataStack[$this->_depth]));
+            break;
+        case XML_UNSERIALIZER_WHITESPACE_TRIM:
+        default:
+            $data = trim($this->_dataStack[$this->_depth]);
+            break;
+        }
+
+        // adjust type of the value
+        switch(strtolower($value['type'])) {
+
+        // unserialize an object
+        case 'object':
+            if (isset($value['class'])) {
+                $classname = $value['class'];
+            } else {
+                $classname = '';
+            }
+            // instantiate the class
+            if ($this->options[XML_UNSERIALIZER_OPTION_TAG_AS_CLASSNAME] === true
+                && class_exists($classname)
+            ) {
+                $value['value'] = new $classname;
+            } else {
+                $value['value'] =
+                    new $this->options[XML_UNSERIALIZER_OPTION_DEFAULT_CLASS];
+            }
+            if (trim($data) !== '') {
+                if ($value['guessType'] === true) {
+                    $data = $this->_guessAndSetType($data);
+                }
+                $value['children'][$this->
+                    options[XML_UNSERIALIZER_OPTION_CONTENT_KEY]] = $data;
+            }
+
+            // set properties
+            foreach ($value['children'] as $prop => $propVal) {
+                // check whether there is a special method to set this property
+                $setMethod = 'set'.$prop;
+                if (method_exists($value['value'], $setMethod)) {
+                    call_user_func(array(&$value['value'], $setMethod), $propVal);
+                } else {
+                    $value['value']->$prop = $propVal;
+                }
+            }
+            //  check for magic function
+            if (method_exists($value['value'], '__wakeup')) {
+                $value['value']->__wakeup();
+            }
+            break;
+
+        // unserialize an array
+        case 'array':
+            if (trim($data) !== '') {
+                if ($value['guessType'] === true) {
+                    $data = $this->_guessAndSetType($data);
+                }
+                $value['children'][$this->
+                    options[XML_UNSERIALIZER_OPTION_CONTENT_KEY]] = $data;
+            }
+            if (isset($value['children'])) {
+                $value['value'] = $value['children'];
+            } else {
+                $value['value'] = array();
+            }
+            break;
+
+        // unserialize a null value
+        case 'null':
+            $data = null;
+            break;
+
+        // unserialize a resource => this is not possible :-(
+        case 'resource':
+            $value['value'] = $data;
+            break;
+
+        // unserialize any scalar value
+        default:
+            if ($value['guessType'] === true) {
+                $data = $this->_guessAndSetType($data);
+            } else {
+                settype($data, $value['type']);
+            }
+
+            $value['value'] = $data;
+            break;
+        }
+        $parent = array_pop($this->_valStack);
+        if ($parent === null) {
+            $this->_unserializedData = &$value['value'];
+            $this->_root             = &$value['name'];
+            return true;
+        } else {
+            // parent has to be an array
+            if (!isset($parent['children']) || !is_array($parent['children'])) {
+                $parent['children'] = array();
+                if (!in_array($parent['type'], array('array', 'object'))) {
+                    $parent['type'] = $this->_getComplexType($parent['name']);
+                    if ($parent['type'] == 'object') {
+                        $parent['class'] = $parent['name'];
+                    }
+                }
+            }
+
+            if (in_array($element,
+                $this->options[XML_UNSERIALIZER_OPTION_IGNORE_KEYS])
+            ) {
+                $ignoreKey = true;
+            } else {
+                $ignoreKey = false;
+            }
+
+            if (!empty($value['name']) && $ignoreKey === false) {
+                // there already has been a tag with this name
+                if (in_array($value['name'], $parent['childrenKeys'])
+                    || in_array($value['name'],
+                    $this->options[XML_UNSERIALIZER_OPTION_FORCE_ENUM])
+                ) {
+                    // no aggregate has been created for this tag
+                    if (!in_array($value['name'], $parent['aggregKeys'])) {
+                        if (isset($parent['children'][$value['name']])) {
+                            $parent['children'][$value['name']] =
+                                array($parent['children'][$value['name']]);
+                        } else {
+                            $parent['children'][$value['name']] = array();
+                        }
+                        array_push($parent['aggregKeys'], $value['name']);
+                    }
+                    array_push($parent['children'][$value['name']], $value['value']);
+                } else {
+                    $parent['children'][$value['name']] = &$value['value'];
+                    array_push($parent['childrenKeys'], $value['name']);
+                }
+            } else {
+                array_push($parent['children'], $value['value']);
+            }
+            array_push($this->_valStack, $parent);
+        }
+
+        $this->_depth--;
+    }
+
+    /**
+     * Handler for character data
+     *
+     * @param object $parser XML parser object
+     * @param string $cdata  CDATA
+     *
+     * @return void
+     * @access private
+     */
+    function cdataHandler($parser, $cdata)
+    {
+        if ($this->options[XML_UNSERIALIZER_OPTION_DECODE_FUNC] !== null) {
+            $cdata = call_user_func($this->
+                options[XML_UNSERIALIZER_OPTION_DECODE_FUNC], $cdata);
+        }
+        $this->_dataStack[$this->_depth] .= $cdata;
+    }
+
+    /**
+     * get the complex type, that should be used for a specified tag
+     *
+     * @param string $tagname name of the tag
+     *
+     * @return string complex type ('array' or 'object')
+     * @access private
+     */
+    function _getComplexType($tagname)
+    {
+        if (is_string($this->options[XML_UNSERIALIZER_OPTION_COMPLEXTYPE])) {
+            return $this->options[XML_UNSERIALIZER_OPTION_COMPLEXTYPE];
+        }
+        if (isset($this->options[XML_UNSERIALIZER_OPTION_COMPLEXTYPE][$tagname])) {
+            return $this->options[XML_UNSERIALIZER_OPTION_COMPLEXTYPE][$tagname];
+        }
+        if (isset($this->options[XML_UNSERIALIZER_OPTION_COMPLEXTYPE]['#default'])) {
+            return $this->options[XML_UNSERIALIZER_OPTION_COMPLEXTYPE]['#default'];
+        }
+        return 'array';
+    }
+
+    /**
+     * create the XML_Parser instance
+     *
+     * @return boolean
+     * @access private
+     */
+    function _createParser()
+    {
+        if (is_object($this->_parser)) {
+            $this->_parser->free();
+            unset($this->_parser);
+        }
+        $this->_parser = new XML_Parser($this->
+            options[XML_UNSERIALIZER_OPTION_ENCODING_SOURCE],
+            'event', $this->options[XML_UNSERIALIZER_OPTION_ENCODING_TARGET]);
+
+        $this->_parser->folding = false;
+        $this->_parser->setHandlerObj($this);
+        return true;
+    }
+}
+?>

From 2fb33495827ad48a3f22d9be332bb441c70ec464 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Wed, 15 Mar 2017 18:21:00 +0900
Subject: [PATCH 584/630] install XML_Parser 1.3.7 (refs #4176)

XML_Serializer depends on this package.
---
 lib/vendor/PEAR/XML/Parser.php        | 761 ++++++++++++++++++++++++++
 lib/vendor/PEAR/XML/Parser/Simple.php | 326 +++++++++++
 2 files changed, 1087 insertions(+)
 create mode 100644 lib/vendor/PEAR/XML/Parser.php
 create mode 100644 lib/vendor/PEAR/XML/Parser/Simple.php

diff --git a/lib/vendor/PEAR/XML/Parser.php b/lib/vendor/PEAR/XML/Parser.php
new file mode 100644
index 000000000..3ff60180c
--- /dev/null
+++ b/lib/vendor/PEAR/XML/Parser.php
@@ -0,0 +1,761 @@
+<?php
+
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * XML_Parser
+ *
+ * XML Parser package
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2002-2008 The PHP Group
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The name of the author may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category  XML
+ * @package   XML_Parser
+ * @author    Stig Bakken <ssb@fast.no>
+ * @author    Tomas V.V.Cox <cox@idecnet.com>
+ * @author    Stephan Schmidt <schst@php.net>
+ * @copyright 2002-2008 The PHP Group
+ * @license   http://opensource.org/licenses/bsd-license New BSD License
+ * @version   CVS: $Id$
+ * @link      http://pear.php.net/package/XML_Parser
+ */
+
+/**
+ * uses PEAR's error handling
+ */
+require_once 'PEAR.php';
+
+/**
+ * resource could not be created
+ */
+define('XML_PARSER_ERROR_NO_RESOURCE', 200);
+
+/**
+ * unsupported mode
+ */
+define('XML_PARSER_ERROR_UNSUPPORTED_MODE', 201);
+
+/**
+ * invalid encoding was given
+ */
+define('XML_PARSER_ERROR_INVALID_ENCODING', 202);
+
+/**
+ * specified file could not be read
+ */
+define('XML_PARSER_ERROR_FILE_NOT_READABLE', 203);
+
+/**
+ * invalid input
+ */
+define('XML_PARSER_ERROR_INVALID_INPUT', 204);
+
+/**
+ * remote file cannot be retrieved in safe mode
+ */
+define('XML_PARSER_ERROR_REMOTE', 205);
+
+/**
+ * XML Parser class.
+ *
+ * This is an XML parser based on PHP's "xml" extension,
+ * based on the bundled expat library.
+ *
+ * Notes:
+ * - It requires PHP 4.0.4pl1 or greater
+ * - From revision 1.17, the function names used by the 'func' mode
+ *   are in the format "xmltag_$elem", for example: use "xmltag_name"
+ *   to handle the <name></name> tags of your xml file.
+ *          - different parsing modes
+ *
+ * @category  XML
+ * @package   XML_Parser
+ * @author    Stig Bakken <ssb@fast.no>
+ * @author    Tomas V.V.Cox <cox@idecnet.com>
+ * @author    Stephan Schmidt <schst@php.net>
+ * @copyright 2002-2008 The PHP Group
+ * @license   http://opensource.org/licenses/bsd-license New BSD License
+ * @version   Release: @package_version@
+ * @link      http://pear.php.net/package/XML_Parser
+ * @todo      create XML_Parser_Namespace to parse documents with namespaces
+ * @todo      create XML_Parser_Pull
+ * @todo      Tests that need to be made:
+ *            - mixing character encodings
+ *            - a test using all expat handlers
+ *            - options (folding, output charset)
+ */
+class XML_Parser extends PEAR
+{
+    // {{{ properties
+
+    /**
+     * XML parser handle
+     *
+     * @var  resource
+     * @see  xml_parser_create()
+     */
+    var $parser;
+
+    /**
+     * File handle if parsing from a file
+     *
+     * @var  resource
+     */
+    var $fp;
+
+    /**
+     * Whether to do case folding
+     *
+     * If set to true, all tag and attribute names will
+     * be converted to UPPER CASE.
+     *
+     * @var  boolean
+     */
+    var $folding = true;
+
+    /**
+     * Mode of operation, one of "event" or "func"
+     *
+     * @var  string
+     */
+    var $mode;
+
+    /**
+     * Mapping from expat handler function to class method.
+     *
+     * @var  array
+     */
+    var $handler = array(
+        'character_data_handler'            => 'cdataHandler',
+        'default_handler'                   => 'defaultHandler',
+        'processing_instruction_handler'    => 'piHandler',
+        'unparsed_entity_decl_handler'      => 'unparsedHandler',
+        'notation_decl_handler'             => 'notationHandler',
+        'external_entity_ref_handler'       => 'entityrefHandler'
+    );
+
+    /**
+     * source encoding
+     *
+     * @var string
+     */
+    var $srcenc;
+
+    /**
+     * target encoding
+     *
+     * @var string
+     */
+    var $tgtenc;
+
+    /**
+     * handler object
+     *
+     * @var object
+     */
+    var $_handlerObj;
+
+    /**
+     * valid encodings
+     *
+     * @var array
+     */
+    var $_validEncodings = array('ISO-8859-1', 'UTF-8', 'US-ASCII');
+
+    // }}}
+    // {{{ php5 constructor
+
+    /**
+     * PHP5 constructor
+     *
+     * @param string $srcenc source charset encoding, use NULL (default) to use
+     *                       whatever the document specifies
+     * @param string $mode   how this parser object should work, "event" for
+     *                       startelement/endelement-type events, "func"
+     *                       to have it call functions named after elements
+     * @param string $tgtenc a valid target encoding
+     */
+    function __construct($srcenc = null, $mode = 'event', $tgtenc = null)
+    {
+        parent::__construct('XML_Parser_Error');
+
+        $this->mode   = $mode;
+        $this->srcenc = $srcenc;
+        $this->tgtenc = $tgtenc;
+    }
+    // }}}
+
+    /**
+     * Sets the mode of the parser.
+     *
+     * Possible modes are:
+     * - func
+     * - event
+     *
+     * You can set the mode using the second parameter
+     * in the constructor.
+     *
+     * This method is only needed, when switching to a new
+     * mode at a later point.
+     *
+     * @param string $mode mode, either 'func' or 'event'
+     *
+     * @return boolean|object  true on success, PEAR_Error otherwise
+     * @access public
+     */
+    function setMode($mode)
+    {
+        if ($mode != 'func' && $mode != 'event') {
+            $this->raiseError('Unsupported mode given',
+                XML_PARSER_ERROR_UNSUPPORTED_MODE);
+        }
+
+        $this->mode = $mode;
+        return true;
+    }
+
+    /**
+     * Sets the object, that will handle the XML events
+     *
+     * This allows you to create a handler object independent of the
+     * parser object that you are using and easily switch the underlying
+     * parser.
+     *
+     * If no object will be set, XML_Parser assumes that you
+     * extend this class and handle the events in $this.
+     *
+     * @param object &$obj object to handle the events
+     *
+     * @return boolean will always return true
+     * @access public
+     * @since v1.2.0beta3
+     */
+    function setHandlerObj($obj)
+    {
+        $this->_handlerObj = $obj;
+        return true;
+    }
+
+    /**
+     * Init the element handlers
+     *
+     * @return mixed
+     * @access private
+     */
+    function _initHandlers()
+    {
+        if (!is_resource($this->parser)) {
+            return false;
+        }
+
+        if (!is_object($this->_handlerObj)) {
+            $this->_handlerObj = $this;
+        }
+        switch ($this->mode) {
+
+        case 'func':
+            xml_set_object($this->parser, $this->_handlerObj);
+            xml_set_element_handler($this->parser,
+                array($this, 'funcStartHandler'), array($this, 'funcEndHandler'));
+            break;
+
+        case 'event':
+            xml_set_object($this->parser, $this->_handlerObj);
+            xml_set_element_handler($this->parser, 'startHandler', 'endHandler');
+            break;
+        default:
+            return $this->raiseError('Unsupported mode given',
+                XML_PARSER_ERROR_UNSUPPORTED_MODE);
+            break;
+        }
+
+        /**
+         * set additional handlers for character data, entities, etc.
+         */
+        foreach ($this->handler as $xml_func => $method) {
+            if (method_exists($this->_handlerObj, $method)) {
+                $xml_func = 'xml_set_' . $xml_func;
+                $xml_func($this->parser, $method);
+            }
+        }
+    }
+
+    // {{{ _create()
+
+    /**
+     * create the XML parser resource
+     *
+     * Has been moved from the constructor to avoid
+     * problems with object references.
+     *
+     * Furthermore it allows us returning an error
+     * if something fails.
+     *
+     * NOTE: uses '@' error suppresion in this method
+     *
+     * @return bool|PEAR_Error true on success, PEAR_Error otherwise
+     * @access private
+     * @see xml_parser_create
+     */
+    function _create()
+    {
+        if ($this->srcenc === null) {
+            $xp = @xml_parser_create();
+        } else {
+            $xp = @xml_parser_create($this->srcenc);
+        }
+        if (is_resource($xp)) {
+            if ($this->tgtenc !== null) {
+                if (!@xml_parser_set_option($xp, XML_OPTION_TARGET_ENCODING,
+                    $this->tgtenc)
+                ) {
+                    return $this->raiseError('invalid target encoding',
+                        XML_PARSER_ERROR_INVALID_ENCODING);
+                }
+            }
+            $this->parser = $xp;
+            $result       = $this->_initHandlers($this->mode);
+            if ($this->isError($result)) {
+                return $result;
+            }
+            xml_parser_set_option($xp, XML_OPTION_CASE_FOLDING, $this->folding);
+            return true;
+        }
+        if (!in_array(strtoupper($this->srcenc), $this->_validEncodings)) {
+            return $this->raiseError('invalid source encoding',
+                XML_PARSER_ERROR_INVALID_ENCODING);
+        }
+        return $this->raiseError('Unable to create XML parser resource.',
+            XML_PARSER_ERROR_NO_RESOURCE);
+    }
+
+    // }}}
+    // {{{ reset()
+
+    /**
+     * Reset the parser.
+     *
+     * This allows you to use one parser instance
+     * to parse multiple XML documents.
+     *
+     * @access   public
+     * @return   boolean|object     true on success, PEAR_Error otherwise
+     */
+    function reset()
+    {
+        $result = $this->_create();
+        if ($this->isError($result)) {
+            return $result;
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ setInputFile()
+
+    /**
+     * Sets the input xml file to be parsed
+     *
+     * @param string $file Filename (full path)
+     *
+     * @return resource fopen handle of the given file
+     * @access public
+     * @throws XML_Parser_Error
+     * @see setInput(), setInputString(), parse()
+     */
+    function setInputFile($file)
+    {
+        /**
+         * check, if file is a remote file
+         */
+        if (preg_match('/^(http|ftp):\/\//i', substr($file, 0, 10))) {
+            if (!ini_get('allow_url_fopen')) {
+                return $this->
+                raiseError('Remote files cannot be parsed, as safe mode is enabled.',
+                XML_PARSER_ERROR_REMOTE);
+            }
+        }
+
+        $fp = @fopen($file, 'rb');
+        if (is_resource($fp)) {
+            $this->fp = $fp;
+            return $fp;
+        }
+        return $this->raiseError('File could not be opened.',
+            XML_PARSER_ERROR_FILE_NOT_READABLE);
+    }
+
+    // }}}
+    // {{{ setInputString()
+
+    /**
+     * XML_Parser::setInputString()
+     *
+     * Sets the xml input from a string
+     *
+     * @param string $data a string containing the XML document
+     *
+     * @return null
+     */
+    function setInputString($data)
+    {
+        $this->fp = $data;
+        return null;
+    }
+
+    // }}}
+    // {{{ setInput()
+
+    /**
+     * Sets the file handle to use with parse().
+     *
+     * You should use setInputFile() or setInputString() if you
+     * pass a string
+     *
+     * @param mixed $fp Can be either a resource returned from fopen(),
+     *                  a URL, a local filename or a string.
+     *
+     * @return mixed
+     * @access public
+     * @see parse()
+     * @uses setInputString(), setInputFile()
+     */
+    function setInput($fp)
+    {
+        if (is_resource($fp)) {
+            $this->fp = $fp;
+            return true;
+        } elseif (preg_match('/^[a-z]+:\/\//i', substr($fp, 0, 10))) {
+            // see if it's an absolute URL (has a scheme at the beginning)
+            return $this->setInputFile($fp);
+        } elseif (file_exists($fp)) {
+            // see if it's a local file
+            return $this->setInputFile($fp);
+        } else {
+            // it must be a string
+            $this->fp = $fp;
+            return true;
+        }
+
+        return $this->raiseError('Illegal input format',
+            XML_PARSER_ERROR_INVALID_INPUT);
+    }
+
+    // }}}
+    // {{{ parse()
+
+    /**
+     * Central parsing function.
+     *
+     * @return bool|PEAR_Error returns true on success, or a PEAR_Error otherwise
+     * @access public
+     */
+    function parse()
+    {
+        /**
+         * reset the parser
+         */
+        $result = $this->reset();
+        if ($this->isError($result)) {
+            return $result;
+        }
+        // if $this->fp was fopened previously
+        if (is_resource($this->fp)) {
+
+            while ($data = fread($this->fp, 4096)) {
+                if (!$this->_parseString($data, feof($this->fp))) {
+                    $error = $this->raiseError();
+                    $this->free();
+                    return $error;
+                }
+            }
+        } else {
+            // otherwise, $this->fp must be a string
+            if (!$this->_parseString($this->fp, true)) {
+                $error = $this->raiseError();
+                $this->free();
+                return $error;
+            }
+        }
+        $this->free();
+
+        return true;
+    }
+
+    /**
+     * XML_Parser::_parseString()
+     *
+     * @param string $data data
+     * @param bool   $eof  end-of-file flag
+     *
+     * @return bool
+     * @access private
+     * @see parseString()
+     **/
+    function _parseString($data, $eof = false)
+    {
+        return xml_parse($this->parser, $data, $eof);
+    }
+
+    // }}}
+    // {{{ parseString()
+
+    /**
+     * XML_Parser::parseString()
+     *
+     * Parses a string.
+     *
+     * @param string  $data XML data
+     * @param boolean $eof  If set and TRUE, data is the last piece
+     *                      of data sent in this parser
+     *
+     * @return bool|PEAR_Error true on success or a PEAR Error
+     * @throws XML_Parser_Error
+     * @see _parseString()
+     */
+    function parseString($data, $eof = false)
+    {
+        if (!isset($this->parser) || !is_resource($this->parser)) {
+            $this->reset();
+        }
+
+        if (!$this->_parseString($data, $eof)) {
+            $error = $this->raiseError();
+            $this->free();
+            return $error;
+        }
+
+        if ($eof === true) {
+            $this->free();
+        }
+        return true;
+    }
+
+    /**
+     * XML_Parser::free()
+     *
+     * Free the internal resources associated with the parser
+     *
+     * @return null
+     **/
+    function free()
+    {
+        if (isset($this->parser) && is_resource($this->parser)) {
+            xml_parser_free($this->parser);
+            unset( $this->parser );
+        }
+        if (isset($this->fp) && is_resource($this->fp)) {
+            fclose($this->fp);
+        }
+        unset($this->fp);
+        return null;
+    }
+
+    /**
+     * XML_Parser::raiseError()
+     *
+     * Throws a XML_Parser_Error
+     *
+     * @param string  $msg   the error message
+     * @param integer $ecode the error message code
+     *
+     * @return XML_Parser_Error reference to the error object
+     **/
+    function raiseError($msg = null, $ecode = 0)
+    {
+        $msg = !is_null($msg) ? $msg : $this->parser;
+        $err = new XML_Parser_Error($msg, $ecode);
+        return parent::raiseError($err);
+    }
+
+    // }}}
+    // {{{ funcStartHandler()
+
+    /**
+     * derives and calls the Start Handler function
+     *
+     * @param mixed $xp      ??
+     * @param mixed $elem    ??
+     * @param mixed $attribs ??
+     *
+     * @return void
+     */
+    function funcStartHandler($xp, $elem, $attribs)
+    {
+        $func = 'xmltag_' . $elem;
+        $func = str_replace(array('.', '-', ':'), '_', $func);
+        if (method_exists($this->_handlerObj, $func)) {
+            call_user_func(array($this->_handlerObj, $func), $xp, $elem, $attribs);
+        } elseif (method_exists($this->_handlerObj, 'xmltag')) {
+            call_user_func(array($this->_handlerObj, 'xmltag'),
+                $xp, $elem, $attribs);
+        }
+    }
+
+    // }}}
+    // {{{ funcEndHandler()
+
+    /**
+     * derives and calls the End Handler function
+     *
+     * @param mixed $xp   ??
+     * @param mixed $elem ??
+     *
+     * @return void
+     */
+    function funcEndHandler($xp, $elem)
+    {
+        $func = 'xmltag_' . $elem . '_';
+        $func = str_replace(array('.', '-', ':'), '_', $func);
+        if (method_exists($this->_handlerObj, $func)) {
+            call_user_func(array($this->_handlerObj, $func), $xp, $elem);
+        } elseif (method_exists($this->_handlerObj, 'xmltag_')) {
+            call_user_func(array($this->_handlerObj, 'xmltag_'), $xp, $elem);
+        }
+    }
+
+    // }}}
+    // {{{ startHandler()
+
+    /**
+     * abstract method signature for Start Handler
+     *
+     * @param mixed $xp       ??
+     * @param mixed $elem     ??
+     * @param mixed &$attribs ??
+     *
+     * @return null
+     * @abstract
+     */
+    function startHandler($xp, $elem, &$attribs)
+    {
+        return null;
+    }
+
+    // }}}
+    // {{{ endHandler()
+
+    /**
+     * abstract method signature for End Handler
+     *
+     * @param mixed $xp   ??
+     * @param mixed $elem ??
+     *
+     * @return null
+     * @abstract
+     */
+    function endHandler($xp, $elem)
+    {
+        return null;
+    }
+
+
+    // }}}me
+}
+
+/**
+ * error class, replaces PEAR_Error
+ *
+ * An instance of this class will be returned
+ * if an error occurs inside XML_Parser.
+ *
+ * There are three advantages over using the standard PEAR_Error:
+ * - All messages will be prefixed
+ * - check for XML_Parser error, using is_a( $error, 'XML_Parser_Error' )
+ * - messages can be generated from the xml_parser resource
+ *
+ * @category  XML
+ * @package   XML_Parser
+ * @author    Stig Bakken <ssb@fast.no>
+ * @author    Tomas V.V.Cox <cox@idecnet.com>
+ * @author    Stephan Schmidt <schst@php.net>
+ * @copyright 2002-2008 The PHP Group
+ * @license   http://opensource.org/licenses/bsd-license New BSD License
+ * @version   Release: @package_version@
+ * @link      http://pear.php.net/package/XML_Parser
+ * @see       PEAR_Error
+ */
+class XML_Parser_Error extends PEAR_Error
+{
+    // {{{ properties
+
+    /**
+    * prefix for all messages
+    *
+    * @var      string
+    */
+    var $error_message_prefix = 'XML_Parser: ';
+
+    // }}}
+    // {{{ constructor()
+    /**
+    * construct a new error instance
+    *
+    * You may either pass a message or an xml_parser resource as first
+    * parameter. If a resource has been passed, the last error that
+    * happened will be retrieved and returned.
+    *
+    * @param string|resource $msgorparser message or parser resource
+    * @param integer         $code        error code
+    * @param integer         $mode        error handling
+    * @param integer         $level       error level
+    *
+    * @access   public
+    * @todo PEAR CS - can't meet 85char line limit without arg refactoring
+    */
+    function __construct($msgorparser = 'unknown error', $code = 0, $mode = PEAR_ERROR_RETURN, $level = E_USER_NOTICE)
+    {
+        if (is_resource($msgorparser)) {
+            $code        = xml_get_error_code($msgorparser);
+            $msgorparser = sprintf('%s at XML input line %d:%d',
+                xml_error_string($code),
+                xml_get_current_line_number($msgorparser),
+                xml_get_current_column_number($msgorparser));
+        }
+        parent::__construct($msgorparser, $code, $mode, $level);
+    }
+    // }}}
+
+    /**
+     * PHP4 constructor for backwards compatibility with older code
+     *
+     * @param string|resource $msgorparser message or parser resource
+     * @param integer         $code        error code
+     * @param integer         $mode        error handling
+     * @param integer         $level       error level
+     */
+    function XML_Parser_Error($msgorparser = 'unknown error', $code = 0, $mode = PEAR_ERROR_RETURN, $level = E_USER_NOTICE)
+    {
+        self::__construct($msgorparser, $code, $mode, $level);
+    }
+}
+?>
diff --git a/lib/vendor/PEAR/XML/Parser/Simple.php b/lib/vendor/PEAR/XML/Parser/Simple.php
new file mode 100644
index 000000000..cc3ebb82f
--- /dev/null
+++ b/lib/vendor/PEAR/XML/Parser/Simple.php
@@ -0,0 +1,326 @@
+<?php
+
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * XML_Parser
+ *
+ * XML Parser's Simple parser class
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2002-2008 The PHP Group
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The name of the author may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category  XML
+ * @package   XML_Parser
+ * @author    Stephan Schmidt <schst@php.net>
+ * @copyright 2004-2008 Stephan Schmidt <schst@php.net>
+ * @license   http://opensource.org/licenses/bsd-license New BSD License
+ * @version   CVS: $Id$
+ * @link      http://pear.php.net/package/XML_Parser
+ */
+
+/**
+ * built on XML_Parser
+ */
+require_once 'XML/Parser.php';
+
+/**
+ * Simple XML parser class.
+ *
+ * This class is a simplified version of XML_Parser.
+ * In most XML applications the real action is executed,
+ * when a closing tag is found.
+ *
+ * XML_Parser_Simple allows you to just implement one callback
+ * for each tag that will receive the tag with its attributes
+ * and CData.
+ *
+ * <code>
+ * require_once '../Parser/Simple.php';
+ *
+ * class myParser extends XML_Parser_Simple
+ * {
+ *     function myParser()
+ *     {
+ *        $this->XML_Parser_Simple();
+ *      }
+ *
+ *    function handleElement($name, $attribs, $data)
+ *     {
+ *         printf('handle %s<br>', $name);
+ *     }
+ * }
+ *
+ * $p = new myParser();
+ *
+ * $result = $p->setInputFile('myDoc.xml');
+ * $result = $p->parse();
+ * </code>
+ *
+ * @category  XML
+ * @package   XML_Parser
+ * @author    Stephan Schmidt <schst@php.net>
+ * @copyright 2004-2008 The PHP Group
+ * @license   http://opensource.org/licenses/bsd-license New BSD License
+ * @version   Release: @package_version@
+ * @link      http://pear.php.net/package/XML_Parser
+ */
+class XML_Parser_Simple extends XML_Parser
+{
+    /**
+     * element stack
+     *
+     * @access   private
+     * @var      array
+     */
+    var $_elStack = array();
+
+    /**
+     * all character data
+     *
+     * @access   private
+     * @var      array
+     */
+    var $_data = array();
+
+    /**
+     * element depth
+     *
+     * @access   private
+     * @var      integer
+     */
+    var $_depth = 0;
+
+    /**
+     * Mapping from expat handler function to class method.
+     *
+     * @var  array
+     */
+    var $handler = array(
+        'default_handler'                   => 'defaultHandler',
+        'processing_instruction_handler'    => 'piHandler',
+        'unparsed_entity_decl_handler'      => 'unparsedHandler',
+        'notation_decl_handler'             => 'notationHandler',
+        'external_entity_ref_handler'       => 'entityrefHandler'
+    );
+
+    /**
+     * Creates an XML parser.
+     *
+     * This is needed for PHP4 compatibility, it will
+     * call the constructor, when a new instance is created.
+     *
+     * @param string $srcenc source charset encoding, use NULL (default) to use
+     *                       whatever the document specifies
+     * @param string $mode   how this parser object should work, "event" for
+     *                       handleElement(), "func" to have it call functions
+     *                       named after elements (handleElement_$name())
+     * @param string $tgtenc a valid target encoding
+     */
+    function __construct($srcenc = null, $mode = 'event', $tgtenc = null)
+    {
+        parent::__construct($srcenc, $mode, $tgtenc);
+    }
+
+    /**
+     * inits the handlers
+     *
+     * @return mixed
+     * @access private
+     */
+    function _initHandlers()
+    {
+        if (!is_object($this->_handlerObj)) {
+            $this->_handlerObj = $this;
+        }
+
+        if ($this->mode != 'func' && $this->mode != 'event') {
+            return $this->raiseError('Unsupported mode given',
+                XML_PARSER_ERROR_UNSUPPORTED_MODE);
+        }
+        xml_set_object($this->parser, $this->_handlerObj);
+
+        xml_set_element_handler($this->parser, array($this, 'startHandler'),
+            array($this, 'endHandler'));
+        xml_set_character_data_handler($this->parser, array($this, 'cdataHandler'));
+
+        /**
+         * set additional handlers for character data, entities, etc.
+         */
+        foreach ($this->handler as $xml_func => $method) {
+            if (method_exists($this->_handlerObj, $method)) {
+                $xml_func = 'xml_set_' . $xml_func;
+                $xml_func($this->parser, $method);
+            }
+        }
+    }
+
+    /**
+     * Reset the parser.
+     *
+     * This allows you to use one parser instance
+     * to parse multiple XML documents.
+     *
+     * @access   public
+     * @return   boolean|object     true on success, PEAR_Error otherwise
+     */
+    function reset()
+    {
+        $this->_elStack = array();
+        $this->_data    = array();
+        $this->_depth   = 0;
+
+        $result = $this->_create();
+        if ($this->isError($result)) {
+            return $result;
+        }
+        return true;
+    }
+
+    /**
+     * start handler
+     *
+     * Pushes attributes and tagname onto a stack
+     *
+     * @param resource $xp       xml parser resource
+     * @param string   $elem     element name
+     * @param array    &$attribs attributes
+     *
+     * @return mixed
+     * @access private
+     * @final
+     */
+    function startHandler($xp, $elem, &$attribs)
+    {
+        array_push($this->_elStack, array(
+            'name'    => $elem,
+            'attribs' => $attribs
+        ));
+        $this->_depth++;
+        $this->_data[$this->_depth] = '';
+    }
+
+    /**
+     * end handler
+     *
+     * Pulls attributes and tagname from a stack
+     *
+     * @param resource $xp   xml parser resource
+     * @param string   $elem element name
+     *
+     * @return mixed
+     * @access private
+     * @final
+     */
+    function endHandler($xp, $elem)
+    {
+        $el   = array_pop($this->_elStack);
+        $data = $this->_data[$this->_depth];
+        $this->_depth--;
+
+        switch ($this->mode) {
+        case 'event':
+            $this->_handlerObj->handleElement($el['name'], $el['attribs'], $data);
+            break;
+        case 'func':
+            $func = 'handleElement_' . $elem;
+            if (strchr($func, '.')) {
+                $func = str_replace('.', '_', $func);
+            }
+            if (method_exists($this->_handlerObj, $func)) {
+                call_user_func(array($this->_handlerObj, $func),
+                    $el['name'], $el['attribs'], $data);
+            }
+            break;
+        }
+    }
+
+    /**
+     * handle character data
+     *
+     * @param resource $xp   xml parser resource
+     * @param string   $data data
+     *
+     * @return void
+     * @access private
+     * @final
+     */
+    function cdataHandler($xp, $data)
+    {
+        $this->_data[$this->_depth] .= $data;
+    }
+
+    /**
+     * handle a tag
+     *
+     * Implement this in your parser
+     *
+     * @param string $name    element name
+     * @param array  $attribs attributes
+     * @param string $data    character data
+     *
+     * @return void
+     * @access public
+     * @abstract
+     */
+    function handleElement($name, $attribs, $data)
+    {
+    }
+
+    /**
+     * get the current tag depth
+     *
+     * The root tag is in depth 0.
+     *
+     * @access   public
+     * @return   integer
+     */
+    function getCurrentDepth()
+    {
+        return $this->_depth;
+    }
+
+    /**
+     * add some string to the current ddata.
+     *
+     * This is commonly needed, when a document is parsed recursively.
+     *
+     * @param string $data data to add
+     *
+     * @return void
+     * @access public
+     */
+    function addToData($data)
+    {
+        $this->_data[$this->_depth] .= $data;
+    }
+}
+?>

From a3ad27a524eab2f56b6c8f1fe9e68b189493018e Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Wed, 22 Mar 2017 17:29:34 +0900
Subject: [PATCH 585/630] replace with LExpress/symfony1 v1.5.9 (refs #4178)

---
 lib/vendor/symfony/.editorconfig              |   12 +
 lib/vendor/symfony/.gitignore                 |    8 +
 lib/vendor/symfony/.gitmodules                |    7 +
 lib/vendor/symfony/.travis.yml                |   44 +
 .../symfony/{CHANGELOG => CHANGELOG.md}       |  198 +
 .../symfony/{COPYRIGHT => COPYRIGHT.md}       |    9 -
 lib/vendor/symfony/LICENSE.md                 |   19 +
 lib/vendor/symfony/README                     |   20 -
 lib/vendor/symfony/README.md                  |   65 +
 lib/vendor/symfony/UPGRADE.md                 |   57 +
 lib/vendor/symfony/WHATS_NEW.md               |  247 +
 lib/vendor/symfony/autoload.php               |    5 +
 lib/vendor/symfony/composer.json              |   26 +
 lib/vendor/symfony/data/bin/changelog.php     |    4 +-
 .../symfony/data/bin/check_configuration.php  |   12 +-
 lib/vendor/symfony/data/bin/release.php       |   10 +-
 .../symfony/data/bin/sandbox_installer.php    |    8 +-
 lib/vendor/symfony/data/bin/symfony           |    4 +-
 .../data/web/sf/sf_admin/images/add.png       |  Bin
 .../data/web/sf/sf_admin/images/cancel.png    |  Bin
 .../web/sf/sf_admin/images/default_icon.png   |  Bin
 .../data/web/sf/sf_admin/images/delete.png    |  Bin
 .../data/web/sf/sf_admin/images/edit.png      |  Bin
 .../data/web/sf/sf_admin/images/error.png     |  Bin
 .../data/web/sf/sf_admin/images/filter.png    |  Bin
 .../data/web/sf/sf_admin/images/first.png     |  Bin
 .../data/web/sf/sf_admin/images/last.png      |  Bin
 .../data/web/sf/sf_admin/images/list.png      |  Bin
 .../data/web/sf/sf_admin/images/next.png      |  Bin
 .../data/web/sf/sf_admin/images/ok.png        |  Bin
 .../data/web/sf/sf_admin/images/previous.png  |  Bin
 .../data/web/sf/sf_admin/images/reset.png     |  Bin
 .../data/web/sf/sf_admin/images/save.png      |  Bin
 .../data/web/sf/sf_admin/images/tick.png      |  Bin
 .../web/sf/sf_web_debug/images/config.png     |  Bin
 .../web/sf/sf_web_debug/images/database.png   |  Bin
 .../data/web/sf/sf_web_debug/images/log.png   |  Bin
 .../web/sf/sf_web_debug/images/memory.png     |  Bin
 .../data/web/sf/sf_web_debug/images/time.png  |  Bin
 .../symfony/lib/action/sfAction.class.php     |   22 +-
 .../lib/action/sfActionStack.class.php        |    2 +-
 .../lib/action/sfActionStackEntry.class.php   |    2 +-
 .../symfony/lib/action/sfActions.class.php    |    2 +-
 .../symfony/lib/action/sfComponent.class.php  |   40 +-
 .../symfony/lib/action/sfComponents.class.php |    2 +-
 lib/vendor/symfony/lib/addon/sfData.class.php |    4 +-
 .../symfony/lib/addon/sfPager.class.php       |    4 +-
 .../symfony/lib/autoload/sfAutoload.class.php |   19 +-
 .../lib/autoload/sfAutoloadAgain.class.php    |    4 +-
 .../lib/autoload/sfCoreAutoload.class.php     |   50 +-
 .../lib/autoload/sfSimpleAutoload.class.php   |    4 +-
 .../symfony/lib/cache/sfAPCCache.class.php    |   60 +-
 .../symfony/lib/cache/sfCache.class.php       |    4 +-
 .../lib/cache/sfEAcceleratorCache.class.php   |    2 +-
 .../symfony/lib/cache/sfFileCache.class.php   |   29 +-
 .../lib/cache/sfFunctionCache.class.php       |    2 +-
 .../lib/cache/sfMemcacheCache.class.php       |   16 +-
 .../symfony/lib/cache/sfNoCache.class.php     |    2 +-
 .../symfony/lib/cache/sfSQLiteCache.class.php |  132 +-
 .../symfony/lib/cache/sfXCacheCache.class.php |    2 +-
 lib/vendor/symfony/lib/command/cli.php        |   22 +-
 .../command/sfAnsiColorFormatter.class.php    |    4 +-
 .../command/sfCommandApplication.class.php    |   39 +-
 .../lib/command/sfCommandArgument.class.php   |    2 +-
 .../command/sfCommandArgumentSet.class.php    |    2 +-
 .../sfCommandArgumentsException.class.php     |    2 +-
 .../lib/command/sfCommandException.class.php  |    2 +-
 .../lib/command/sfCommandLogger.class.php     |    2 +-
 .../lib/command/sfCommandManager.class.php    |    8 +-
 .../lib/command/sfCommandOption.class.php     |    2 +-
 .../lib/command/sfCommandOptionSet.class.php  |    2 +-
 .../symfony/lib/command/sfFormatter.class.php |    2 +-
 .../sfSymfonyCommandApplication.class.php     |    2 +-
 .../lib/config/config/config_handlers.yml     |    5 +
 .../lib/config/config/core_compile.yml        |    6 +
 .../symfony/lib/config/config/factories.yml   |   10 +
 .../symfony/lib/config/config/services.yml    |   19 +
 .../symfony/lib/config/config/settings.yml    |    1 +
 .../sfApplicationConfiguration.class.php      |   19 +-
 .../config/sfAutoloadConfigHandler.class.php  |   12 +-
 .../lib/config/sfCacheConfigHandler.class.php |    6 +-
 .../config/sfCompileConfigHandler.class.php   |   39 +-
 .../symfony/lib/config/sfConfig.class.php     |    4 +-
 .../lib/config/sfConfigCache.class.php        |   12 +-
 .../lib/config/sfConfigHandler.class.php      |    2 +-
 .../config/sfDatabaseConfigHandler.class.php  |    8 +-
 ...sfDefineEnvironmentConfigHandler.class.php |    6 +-
 .../config/sfFactoryConfigHandler.class.php   |   28 +-
 .../config/sfFilterConfigHandler.class.php    |   12 +-
 .../config/sfGeneratorConfigHandler.class.php |    8 +-
 .../config/sfPluginConfiguration.class.php    |   42 +-
 .../sfPluginConfigurationGeneric.class.php    |    2 +-
 .../config/sfProjectConfiguration.class.php   |   39 +-
 .../lib/config/sfRootConfigHandler.class.php  |   10 +-
 .../config/sfRoutingConfigHandler.class.php   |   10 +-
 .../config/sfSecurityConfigHandler.class.php  |    6 +-
 .../config/sfServiceConfigHandler.class.php   |   68 +
 .../sfSimpleYamlConfigHandler.class.php       |    6 +-
 .../lib/config/sfViewConfigHandler.class.php  |    9 +-
 .../lib/config/sfYamlConfigHandler.class.php  |    6 +-
 .../default/actions/actions.class.php         |    2 +-
 .../default/templates/disabledSuccess.php     |    2 +-
 .../default/templates/error404Success.php     |    2 +-
 .../default/templates/indexSuccess.php        |    2 +-
 .../default/templates/loginSuccess.php        |    2 +-
 .../default/templates/moduleSuccess.php       |    2 +-
 .../default/templates/secureSuccess.php       |    2 +-
 .../lib/controller/sfController.class.php     |    4 +-
 .../controller/sfFrontWebController.class.php |    2 +-
 .../lib/controller/sfWebController.class.php  |    4 +-
 .../symfony/lib/database/sfDatabase.class.php |    2 +-
 .../lib/database/sfDatabaseManager.class.php  |    2 +-
 .../lib/database/sfMySQLDatabase.class.php    |    2 +-
 .../lib/database/sfPDODatabase.class.php      |    6 +-
 .../database/sfPostgreSQLDatabase.class.php   |    2 +-
 .../symfony/lib/debug/sfDebug.class.php       |    4 +-
 .../symfony/lib/debug/sfTimer.class.php       |    2 +-
 .../lib/debug/sfTimerManager.class.php        |    9 +-
 .../symfony/lib/debug/sfWebDebug.class.php    |    6 +-
 .../lib/debug/sfWebDebugPanel.class.php       |    2 +-
 .../lib/debug/sfWebDebugPanelCache.class.php  |    2 +-
 .../lib/debug/sfWebDebugPanelConfig.class.php |    2 +-
 .../lib/debug/sfWebDebugPanelLogs.class.php   |    2 +-
 .../lib/debug/sfWebDebugPanelMailer.class.php |    2 +-
 .../lib/debug/sfWebDebugPanelMemory.class.php |    4 +-
 .../sfWebDebugPanelSymfonyVersion.class.php   |    2 +-
 .../lib/debug/sfWebDebugPanelTimer.class.php  |    2 +-
 .../lib/debug/sfWebDebugPanelView.class.php   |   60 +-
 .../lib/escaper/sfOutputEscaper.class.php     |    2 +-
 .../sfOutputEscaperArrayDecorator.class.php   |    2 +-
 .../sfOutputEscaperGetterDecorator.class.php  |    2 +-
 ...sfOutputEscaperIteratorDecorator.class.php |    2 +-
 .../sfOutputEscaperObjectDecorator.class.php  |    2 +-
 .../lib/escaper/sfOutputEscaperSafe.class.php |    2 +-
 .../sfEvent.php => event/sfEvent.class.php}   |    6 +-
 .../sfEventDispatcher.class.php}              |    6 +-
 .../lib/exception/sfCacheException.class.php  |    2 +-
 .../sfConfigurationException.class.php        |    2 +-
 .../exception/sfControllerException.class.php |    2 +-
 .../exception/sfDatabaseException.class.php   |    2 +-
 .../exception/sfError404Exception.class.php   |    2 +-
 .../lib/exception/sfException.class.php       |   28 +-
 .../exception/sfFactoryException.class.php    |    2 +-
 .../lib/exception/sfFileException.class.php   |    2 +-
 .../lib/exception/sfFilterException.class.php |    2 +-
 .../exception/sfForwardException.class.php    |    2 +-
 .../sfInitializationException.class.php       |    2 +-
 .../lib/exception/sfParseException.class.php  |    2 +-
 .../lib/exception/sfRenderException.class.php |    2 +-
 .../exception/sfSecurityException.class.php   |    2 +-
 .../lib/exception/sfStopException.class.php   |    2 +-
 .../exception/sfStorageException.class.php    |    2 +-
 .../lib/exception/sfViewException.class.php   |    2 +-
 .../filter/sfBasicSecurityFilter.class.php    |    2 +-
 .../lib/filter/sfCacheFilter.class.php        |    2 +-
 .../lib/filter/sfExecutionFilter.class.php    |    2 +-
 .../symfony/lib/filter/sfFilter.class.php     |    2 +-
 .../lib/filter/sfFilterChain.class.php        |    2 +-
 .../lib/filter/sfRenderingFilter.class.php    |    2 +-
 .../lib/form/addon/sfFormFilter.class.php     |    2 +-
 .../lib/form/addon/sfFormObject.class.php     |   37 +-
 .../lib/form/addon/sfFormSymfony.class.php    |    2 +-
 lib/vendor/symfony/lib/form/sfForm.class.php  |  198 +-
 .../symfony/lib/form/sfFormField.class.php    |    2 +-
 .../lib/form/sfFormFieldSchema.class.php      |    8 +-
 .../lib/generator/sfGenerator.class.php       |    2 +-
 .../generator/sfGeneratorManager.class.php    |    9 +-
 .../lib/generator/sfModelGenerator.class.php  |    2 +-
 .../sfModelGeneratorConfiguration.class.php   |    6 +-
 ...ModelGeneratorConfigurationField.class.php |    2 +-
 .../sfModelGeneratorHelper.class.php          |    2 +-
 lib/vendor/symfony/lib/helper/AssetHelper.php |   31 +-
 lib/vendor/symfony/lib/helper/CacheHelper.php |    2 +-
 lib/vendor/symfony/lib/helper/DateHelper.php  |    6 +-
 .../symfony/lib/helper/EscapingHelper.php     |    2 +-
 .../symfony/lib/helper/HelperHelper.php       |    2 +-
 lib/vendor/symfony/lib/helper/I18NHelper.php  |    2 +-
 .../lib/helper/JavascriptBaseHelper.php       |    6 +-
 .../symfony/lib/helper/NumberHelper.php       |    4 +-
 .../symfony/lib/helper/PartialHelper.php      |    6 +-
 lib/vendor/symfony/lib/helper/TagHelper.php   |    6 +-
 lib/vendor/symfony/lib/helper/TextHelper.php  |   60 +-
 lib/vendor/symfony/lib/helper/UrlHelper.php   |   42 +-
 lib/vendor/symfony/lib/i18n/Gettext/MO.php    |   92 +-
 lib/vendor/symfony/lib/i18n/Gettext/PO.php    |   34 +-
 .../lib/i18n/Gettext/TGettext.class.php       |   72 +-
 .../sfI18nApplicationExtract.class.php        |    2 +-
 .../lib/i18n/extract/sfI18nExtract.class.php  |    2 +-
 .../sfI18nExtractorInterface.class.php        |    2 +-
 .../extract/sfI18nModuleExtract.class.php     |    2 +-
 .../i18n/extract/sfI18nPhpExtractor.class.php |    2 +-
 .../extract/sfI18nYamlExtractor.class.php     |    2 +-
 .../sfI18nYamlGeneratorExtractor.class.php    |    6 +-
 .../sfI18nYamlValidateExtractor.class.php     |    4 +-
 .../symfony/lib/i18n/sfChoiceFormat.class.php |   29 +-
 .../symfony/lib/i18n/sfCultureInfo.class.php  |   23 +-
 .../symfony/lib/i18n/sfDateFormat.class.php   |   48 +-
 .../lib/i18n/sfDateTimeFormatInfo.class.php   |    2 +-
 lib/vendor/symfony/lib/i18n/sfI18N.class.php  |    2 +-
 .../lib/i18n/sfIMessageSource.class.php       |    2 +-
 .../lib/i18n/sfMessageFormat.class.php        |    2 +-
 .../lib/i18n/sfMessageSource.class.php        |    7 +-
 .../i18n/sfMessageSource_Aggregate.class.php  |    7 +-
 .../i18n/sfMessageSource_Database.class.php   |    2 +-
 .../lib/i18n/sfMessageSource_File.class.php   |    4 +-
 .../lib/i18n/sfMessageSource_MySQL.class.php  |   40 +-
 .../lib/i18n/sfMessageSource_SQLite.class.php |   24 +-
 .../i18n/sfMessageSource_SQLite3.class.php    |  418 ++
 .../lib/i18n/sfMessageSource_XLIFF.class.php  |    8 +-
 .../i18n/sfMessageSource_gettext.class.php    |    2 +-
 .../symfony/lib/i18n/sfNumberFormat.class.php |   22 +-
 .../lib/i18n/sfNumberFormatInfo.class.php     |    2 +-
 .../lib/log/sfAggregateLogger.class.php       |   13 +-
 .../symfony/lib/log/sfConsoleLogger.class.php |    2 +-
 .../symfony/lib/log/sfEventLogger.class.php   |   34 +
 .../symfony/lib/log/sfFileLogger.class.php    |    9 +-
 lib/vendor/symfony/lib/log/sfLogger.class.php |    4 +-
 .../lib/log/sfLoggerInterface.class.php       |    2 +-
 .../symfony/lib/log/sfLoggerWrapper.class.php |    2 +-
 .../symfony/lib/log/sfNoLogger.class.php      |    2 +-
 .../lib/log/sfPsrLoggerAdapter.class.php      |  161 +
 .../symfony/lib/log/sfStreamLogger.class.php  |    2 +-
 .../symfony/lib/log/sfVarLogger.class.php     |    2 +-
 .../lib/log/sfWebDebugLogger.class.php        |    2 +-
 .../symfony/lib/mailer/sfMailer.class.php     |   20 +-
 .../sfMailerMessageLoggerPlugin.class.php     |    2 +-
 .../symfony/lib/mailer/sfNoMailer.class.php   |   73 +
 .../symfony/lib/plugin/sfPearConfig.class.php |    6 +-
 .../lib/plugin/sfPearDownloader.class.php     |    2 +-
 .../lib/plugin/sfPearEnvironment.class.php    |    6 +-
 .../lib/plugin/sfPearFrontendPlugin.class.php |    6 +-
 .../symfony/lib/plugin/sfPearRest.class.php   |    2 +-
 .../symfony/lib/plugin/sfPearRest10.class.php |    2 +-
 .../symfony/lib/plugin/sfPearRest11.class.php |    2 +-
 .../lib/plugin/sfPearRestPlugin.class.php     |    2 +-
 .../sfPluginDependencyException.class.php     |    2 +-
 .../lib/plugin/sfPluginException.class.php    |    2 +-
 .../lib/plugin/sfPluginManager.class.php      |    2 +-
 ...uginRecursiveDependencyException.class.php |    2 +-
 .../plugin/sfPluginRestException.class.php    |    2 +-
 .../plugin/sfSymfonyPluginManager.class.php   |    2 +-
 .../sfDoctrinePluginConfiguration.class.php   |   23 +-
 .../template/sfDoctrineFormBaseTemplate.php   |    2 +-
 ...ctrineFormGeneratedInheritanceTemplate.php |   22 +-
 .../sfDoctrineFormGeneratedTemplate.php       |   22 +-
 .../template/sfDoctrineFormPluginTemplate.php |    2 +-
 .../template/sfDoctrineFormTemplate.php       |    2 +-
 .../template/sfDoctrinePluginFormTemplate.php |    2 +-
 .../sfDoctrineFormFilterBaseTemplate.php      |    2 +-
 ...FormFilterGeneratedInheritanceTemplate.php |    2 +-
 .../sfDoctrineFormFilterGeneratedTemplate.php |    2 +-
 .../sfDoctrineFormFilterPluginTemplate.php    |    2 +-
 .../template/sfDoctrineFormFilterTemplate.php |    2 +-
 .../sfDoctrinePluginFormFilterTemplate.php    |    2 +-
 .../admin/parts/batchAction.php               |    2 +
 .../admin/parts/configuration.php             |    2 +-
 .../admin/skeleton/actions/actions.class.php  |    2 +-
 .../admin/skeleton/lib/configuration.php      |    2 +-
 .../admin/skeleton/lib/helper.php             |    2 +-
 .../admin/template/actions/actions.class.php  |    2 +-
 .../admin/template/lib/helper.php             |    2 +-
 .../skeleton/actions/actions.class.php        |    2 +-
 .../template/actions/actions.class.php        |    2 +-
 .../sfDoctrinePlugin/i18n/sf_admin.fr.xml     |   45 +-
 .../lib/cli/sfDoctrineCli.class.php           |    2 +-
 .../sfDoctrineConnectionListener.class.php    |    2 +-
 .../sfDoctrineConnectionProfiler.class.php    |   43 +-
 .../lib/database/sfDoctrineDatabase.class.php |   25 +-
 .../debug/sfWebDebugPanelDoctrine.class.php   |    2 +-
 .../lib/form/sfFormDoctrine.class.php         |   30 +-
 .../lib/form/sfFormFilterDoctrine.class.php   |   12 +-
 .../lib/generator/sfDoctrineColumn.class.php  |   58 +-
 .../sfDoctrineFormFilterGenerator.class.php   |    2 +-
 .../sfDoctrineFormGenerator.class.php         |   53 +-
 .../generator/sfDoctrineGenerator.class.php   |    2 +-
 .../lib/mailer/Swift_DoctrineSpool.class.php  |    2 +-
 .../lib/pager/sfDoctrinePager.class.php       |    2 +-
 .../lib/record/sfDoctrineRecord.class.php     |   26 +-
 .../sfDoctrineRecordI18nFilter.class.php      |   15 +-
 .../lib/routing/sfDoctrineRoute.class.php     |    2 +-
 .../sfDoctrineRouteCollection.class.php       |    2 +-
 .../lib/sfDoctrineException.class.php         |    2 +-
 .../lib/task/sfDoctrineBaseTask.class.php     |    2 +-
 .../lib/task/sfDoctrineBuildDbTask.class.php  |    2 +-
 .../task/sfDoctrineBuildFiltersTask.class.php |    2 +-
 .../task/sfDoctrineBuildFormsTask.class.php   |    2 +-
 .../task/sfDoctrineBuildModelTask.class.php   |    2 +-
 .../task/sfDoctrineBuildSchemaTask.class.php  |    2 +-
 .../lib/task/sfDoctrineBuildSqlTask.class.php |    2 +-
 .../lib/task/sfDoctrineBuildTask.class.php    |    2 +-
 .../sfDoctrineCleanModelFilesTask.class.php   |    2 +-
 .../lib/task/sfDoctrineCompileTask.class.php  |   79 +
 .../sfDoctrineConfigureDatabaseTask.class.php |    2 +-
 .../sfDoctrineCreateModelTablesTask.class.php |   16 +-
 .../lib/task/sfDoctrineDataDumpTask.class.php |    2 +-
 .../lib/task/sfDoctrineDataLoadTask.class.php |    4 +-
 .../sfDoctrineDeleteModelFilesTask.class.php  |    2 +-
 .../lib/task/sfDoctrineDqlTask.class.php      |    2 +-
 .../lib/task/sfDoctrineDropDbTask.class.php   |    2 +-
 .../sfDoctrineGenerateAdminTask.class.php     |    2 +-
 .../sfDoctrineGenerateMigrationTask.class.php |    2 +-
 ...DoctrineGenerateMigrationsDbTask.class.php |    2 +-
 ...ctrineGenerateMigrationsDiffTask.class.php |    2 +-
 ...rineGenerateMigrationsModelsTask.class.php |    2 +-
 ...ctrineGenerateModuleForRouteTask.class.php |    2 +-
 .../sfDoctrineGenerateModuleTask.class.php    |    2 +-
 .../task/sfDoctrineInsertSqlTask.class.php    |    2 +-
 .../lib/task/sfDoctrineMigrateTask.class.php  |   20 +-
 .../lib/test/sfTesterDoctrine.class.php       |    2 +-
 .../sfValidatorDoctrineChoice.class.php       |    4 +-
 .../sfValidatorDoctrineUnique.class.php       |    9 +-
 .../lib/vendor/doctrine/.gitignore            |    2 +
 .../lib/vendor/doctrine/.travis.yml           |   19 +
 .../lib/vendor/doctrine/CHANGELOG             |  341 ++
 .../lib/vendor/doctrine/COPYRIGHT             |   37 +
 .../lib/vendor/doctrine/LICENSE               |  504 ++
 .../lib/vendor/doctrine/UPGRADE_TO_1_2        |  983 +++
 .../lib/vendor/doctrine/build.properties.dev  |   11 +
 .../lib/vendor/doctrine/build.xml             |   94 +
 .../lib/vendor/doctrine/composer.json         |   19 +
 .../doctrine/{ => lib}/Doctrine/Access.php    |    6 +
 .../{ => lib}/Doctrine/Adapter/Exception.php  |    0
 .../{ => lib}/Doctrine/Adapter/Interface.php  |    0
 .../{ => lib}/Doctrine/Adapter/Mock.php       |    0
 .../{ => lib}/Doctrine/Adapter/Oracle.php     |    0
 .../{ => lib}/Doctrine/Adapter/Statement.php  |    0
 .../Doctrine/Adapter/Statement/Interface.php  |    0
 .../Doctrine/Adapter/Statement/Mock.php       |    0
 .../Doctrine/Adapter/Statement/Oracle.php     |    9 +-
 .../doctrine/{ => lib}/Doctrine/AuditLog.php  |    0
 .../{ => lib}/Doctrine/AuditLog/Listener.php  |    0
 .../Doctrine/AuditLog/Listener/Microtime.php  |    0
 .../doctrine/{ => lib}/Doctrine/Builder.php   |    0
 .../doctrine/{ => lib}/Doctrine/Cache/Apc.php |    0
 .../{ => lib}/Doctrine/Cache/Array.php        |    0
 .../doctrine/{ => lib}/Doctrine/Cache/Db.php  |    0
 .../{ => lib}/Doctrine/Cache/Driver.php       |    0
 .../{ => lib}/Doctrine/Cache/Exception.php    |    0
 .../{ => lib}/Doctrine/Cache/Interface.php    |    0
 .../{ => lib}/Doctrine/Cache/Memcache.php     |    0
 .../{ => lib}/Doctrine/Cache/Xcache.php       |    0
 .../doctrine/{ => lib}/Doctrine/Cli.php       |    0
 .../Doctrine/Cli/AnsiColorFormatter.php       |    0
 .../{ => lib}/Doctrine/Cli/Exception.php      |    0
 .../{ => lib}/Doctrine/Cli/Formatter.php      |    0
 .../{ => lib}/Doctrine/Collection.php         |  110 +-
 .../Doctrine/Collection/Exception.php         |    0
 .../Doctrine/Collection/Iterator.php          |    0
 .../Collection/Iterator/Expandable.php        |    0
 .../Doctrine/Collection/Iterator/Normal.php   |    0
 .../Doctrine/Collection/Iterator/Offset.php   |    0
 .../{ => lib}/Doctrine/Collection/Offset.php  |    0
 .../Doctrine/Collection/OnDemand.php          |    0
 .../doctrine/{ => lib}/Doctrine/Column.php    |    0
 .../doctrine/{ => lib}/Doctrine/Compiler.php  |    0
 .../{ => lib}/Doctrine/Compiler/Exception.php |    0
 .../{ => lib}/Doctrine/Configurable.php       |   33 +-
 .../{ => lib}/Doctrine/Connection.php         |   64 +-
 .../{ => lib}/Doctrine/Connection/Common.php  |    0
 .../{ => lib}/Doctrine/Connection/Db2.php     |    0
 .../Doctrine/Connection/Exception.php         |    0
 .../{ => lib}/Doctrine/Connection/Mock.php    |    0
 .../{ => lib}/Doctrine/Connection/Module.php  |    0
 .../{ => lib}/Doctrine/Connection/Mssql.php   |  188 +-
 .../Doctrine/Connection/Mssql/Exception.php   |    0
 .../{ => lib}/Doctrine/Connection/Mysql.php   |    0
 .../Doctrine/Connection/Mysql/Exception.php   |    0
 .../{ => lib}/Doctrine/Connection/Oracle.php  |    0
 .../Doctrine/Connection/Oracle/Exception.php  |    0
 .../{ => lib}/Doctrine/Connection/Pgsql.php   |    0
 .../Doctrine/Connection/Pgsql/Exception.php   |    0
 .../Doctrine/Connection/Profiler.php          |    0
 .../Connection/Profiler/Exception.php         |    0
 .../{ => lib}/Doctrine/Connection/Sqlite.php  |    0
 .../Doctrine/Connection/Sqlite/Exception.php  |    0
 .../Doctrine/Connection/Statement.php         |   17 +-
 .../Doctrine/Connection/UnitOfWork.php        |    0
 .../doctrine/{ => lib}/Doctrine/Core.php      |   71 +-
 .../doctrine/{ => lib}/Doctrine/Data.php      |   89 +-
 .../{ => lib}/Doctrine/Data/Exception.php     |    0
 .../{ => lib}/Doctrine/Data/Export.php        |    0
 .../{ => lib}/Doctrine/Data/Import.php        |   17 +-
 .../doctrine/{ => lib}/Doctrine/DataDict.php  |    0
 .../{ => lib}/Doctrine/DataDict/Exception.php |    0
 .../{ => lib}/Doctrine/DataDict/Mssql.php     |    0
 .../{ => lib}/Doctrine/DataDict/Mysql.php     |    0
 .../{ => lib}/Doctrine/DataDict/Oracle.php    |    0
 .../{ => lib}/Doctrine/DataDict/Pgsql.php     |    0
 .../{ => lib}/Doctrine/DataDict/Sqlite.php    |    0
 .../doctrine/{ => lib}/Doctrine/Event.php     |    0
 .../{ => lib}/Doctrine/EventListener.php      |    0
 .../Doctrine/EventListener/Chain.php          |    0
 .../Doctrine/EventListener/Exception.php      |    0
 .../Doctrine/EventListener/Interface.php      |    0
 .../doctrine/{ => lib}/Doctrine/Exception.php |    0
 .../doctrine/{ => lib}/Doctrine/Export.php    |    0
 .../{ => lib}/Doctrine/Export/Exception.php   |    0
 .../{ => lib}/Doctrine/Export/Mssql.php       |    0
 .../{ => lib}/Doctrine/Export/Mysql.php       |    0
 .../{ => lib}/Doctrine/Export/Oracle.php      |    0
 .../{ => lib}/Doctrine/Export/Pgsql.php       |    0
 .../{ => lib}/Doctrine/Export/Reporter.php    |    0
 .../{ => lib}/Doctrine/Export/Schema.php      |    0
 .../{ => lib}/Doctrine/Export/Sqlite.php      |    0
 .../{ => lib}/Doctrine/Expression.php         |    0
 .../{ => lib}/Doctrine/Expression/Driver.php  |    0
 .../Doctrine/Expression/Exception.php         |    0
 .../{ => lib}/Doctrine/Expression/Mock.php    |    0
 .../{ => lib}/Doctrine/Expression/Mssql.php   |   33 +-
 .../{ => lib}/Doctrine/Expression/Mysql.php   |    0
 .../{ => lib}/Doctrine/Expression/Oracle.php  |    0
 .../{ => lib}/Doctrine/Expression/Pgsql.php   |    0
 .../{ => lib}/Doctrine/Expression/Sqlite.php  |    0
 .../doctrine/{ => lib}/Doctrine/File.php      |    0
 .../{ => lib}/Doctrine/File/Index.php         |    0
 .../doctrine/{ => lib}/Doctrine/Formatter.php |    0
 .../doctrine/{ => lib}/Doctrine/Hook.php      |    0
 .../{ => lib}/Doctrine/Hook/Equal.php         |    0
 .../{ => lib}/Doctrine/Hook/Integer.php       |    0
 .../{ => lib}/Doctrine/Hook/Parser.php        |    0
 .../Doctrine/Hook/Parser/Complex.php          |    0
 .../{ => lib}/Doctrine/Hook/WordLike.php      |    0
 .../doctrine/{ => lib}/Doctrine/Hydrator.php  |    0
 .../{ => lib}/Doctrine/Hydrator/Abstract.php  |    0
 .../Doctrine/Hydrator/ArrayDriver.php         |    0
 .../Hydrator/ArrayHierarchyDriver.php         |    0
 .../Doctrine/Hydrator/ArrayShallowDriver.php  |    0
 .../{ => lib}/Doctrine/Hydrator/Exception.php |    0
 .../{ => lib}/Doctrine/Hydrator/Graph.php     |   75 +-
 .../Doctrine/Hydrator/NoneDriver.php          |    0
 .../Doctrine/Hydrator/RecordDriver.php        |    0
 .../Hydrator/RecordHierarchyDriver.php        |    0
 .../Doctrine/Hydrator/ScalarDriver.php        |    0
 .../Doctrine/Hydrator/SingleScalarDriver.php  |    0
 .../doctrine/{ => lib}/Doctrine/I18n.php      |    0
 .../{ => lib}/Doctrine/I18n/Exception.php     |    0
 .../doctrine/{ => lib}/Doctrine/Import.php    |    0
 .../{ => lib}/Doctrine/Import/Builder.php     |   48 +-
 .../Doctrine/Import/Builder/Exception.php     |    0
 .../{ => lib}/Doctrine/Import/Exception.php   |    0
 .../{ => lib}/Doctrine/Import/Mssql.php       |    0
 .../{ => lib}/Doctrine/Import/Mysql.php       |    0
 .../{ => lib}/Doctrine/Import/Oracle.php      |    0
 .../{ => lib}/Doctrine/Import/Pgsql.php       |    2 +-
 .../{ => lib}/Doctrine/Import/Schema.php      |    0
 .../{ => lib}/Doctrine/Import/Sqlite.php      |    0
 .../doctrine/{ => lib}/Doctrine/Inflector.php |    0
 .../{ => lib}/Doctrine/IntegrityMapper.php    |    0
 .../doctrine/{ => lib}/Doctrine/Lib.php       |   62 +-
 .../doctrine/{ => lib}/Doctrine/Locator.php   |   21 +-
 .../{ => lib}/Doctrine/Locator/Exception.php  |    0
 .../{ => lib}/Doctrine/Locator/Injectable.php |    0
 .../{ => lib}/Doctrine/Locking/Exception.php  |    0
 .../Doctrine/Locking/Manager/Pessimistic.php  |    0
 .../doctrine/{ => lib}/Doctrine/Manager.php   |   84 +-
 .../{ => lib}/Doctrine/Manager/Exception.php  |    0
 .../doctrine/{ => lib}/Doctrine/Migration.php |    0
 .../{ => lib}/Doctrine/Migration/Base.php     |    0
 .../{ => lib}/Doctrine/Migration/Builder.php  |    0
 .../{ => lib}/Doctrine/Migration/Diff.php     |    7 +-
 .../Doctrine/Migration/Exception.php          |    0
 .../IrreversibleMigrationException.php        |    0
 .../{ => lib}/Doctrine/Migration/Process.php  |    0
 .../doctrine/{ => lib}/Doctrine/Node.php      |    0
 .../{ => lib}/Doctrine/Node/AdjacencyList.php |    0
 .../Node/AdjacencyList/LevelOrderIterator.php |    0
 .../Node/AdjacencyList/PostOrderIterator.php  |    0
 .../Node/AdjacencyList/PreOrderIterator.php   |    0
 .../{ => lib}/Doctrine/Node/Exception.php     |    0
 .../{ => lib}/Doctrine/Node/Interface.php     |    0
 .../Doctrine/Node/MaterializedPath.php        |    0
 .../MaterializedPath/LevelOrderIterator.php   |    0
 .../MaterializedPath/PostOrderIterator.php    |    0
 .../MaterializedPath/PreOrderIterator.php     |    0
 .../{ => lib}/Doctrine/Node/NestedSet.php     |    0
 .../Node/NestedSet/LevelOrderIterator.php     |    0
 .../Node/NestedSet/PostOrderIterator.php      |    0
 .../Node/NestedSet/PreOrderIterator.php       |    0
 .../doctrine/{ => lib}/Doctrine/Null.php      |    0
 .../{ => lib}/Doctrine/Overloadable.php       |    0
 .../doctrine/{ => lib}/Doctrine/Pager.php     |    0
 .../{ => lib}/Doctrine/Pager/Exception.php    |    0
 .../{ => lib}/Doctrine/Pager/Layout.php       |    0
 .../{ => lib}/Doctrine/Pager/Range.php        |    0
 .../Doctrine/Pager/Range/Jumping.php          |    0
 .../Doctrine/Pager/Range/Sliding.php          |    0
 .../doctrine/{ => lib}/Doctrine/Parser.php    |   32 +-
 .../{ => lib}/Doctrine/Parser/Exception.php   |    0
 .../{ => lib}/Doctrine/Parser/Json.php        |   12 +-
 .../{ => lib}/Doctrine/Parser/Serialize.php   |   18 +-
 .../{ => lib}/Doctrine/Parser/Xml.php         |   16 +-
 .../{ => lib}/Doctrine/Parser/Yml.php         |    4 +-
 .../Doctrine/Parser/sfYaml/sfYaml.php         |    0
 .../Doctrine/Parser/sfYaml/sfYamlDumper.php   |    0
 .../Doctrine/Parser/sfYaml/sfYamlInline.php   |    0
 .../Doctrine/Parser/sfYaml/sfYamlParser.php   |    0
 .../doctrine/{ => lib}/Doctrine/Query.php     |   28 +-
 .../{ => lib}/Doctrine/Query/Abstract.php     |   75 +-
 .../{ => lib}/Doctrine/Query/Check.php        |    0
 .../{ => lib}/Doctrine/Query/Condition.php    |    0
 .../{ => lib}/Doctrine/Query/Exception.php    |    0
 .../{ => lib}/Doctrine/Query/Filter.php       |    0
 .../{ => lib}/Doctrine/Query/Filter/Chain.php |    0
 .../Doctrine/Query/Filter/Interface.php       |    0
 .../{ => lib}/Doctrine/Query/Forupdate.php    |    0
 .../{ => lib}/Doctrine/Query/From.php         |    0
 .../{ => lib}/Doctrine/Query/Groupby.php      |    0
 .../{ => lib}/Doctrine/Query/Having.php       |    0
 .../Doctrine/Query/JoinCondition.php          |    0
 .../{ => lib}/Doctrine/Query/Limit.php        |    0
 .../{ => lib}/Doctrine/Query/Offset.php       |    0
 .../{ => lib}/Doctrine/Query/Orderby.php      |    0
 .../{ => lib}/Doctrine/Query/Parser.php       |    0
 .../{ => lib}/Doctrine/Query/Part.php         |    0
 .../{ => lib}/Doctrine/Query/Registry.php     |    0
 .../Doctrine/Query/Registry/Exception.php     |    0
 .../{ => lib}/Doctrine/Query/Select.php       |    0
 .../doctrine/{ => lib}/Doctrine/Query/Set.php |    0
 .../{ => lib}/Doctrine/Query/Tokenizer.php    |   19 +-
 .../Doctrine/Query/Tokenizer/Exception.php    |    0
 .../{ => lib}/Doctrine/Query/Where.php        |   12 +-
 .../doctrine/{ => lib}/Doctrine/RawSql.php    |    0
 .../{ => lib}/Doctrine/RawSql/Exception.php   |    0
 .../doctrine/{ => lib}/Doctrine/Record.php    |    4 +-
 .../{ => lib}/Doctrine/Record/Abstract.php    |    0
 .../{ => lib}/Doctrine/Record/Exception.php   |    0
 .../{ => lib}/Doctrine/Record/Filter.php      |    0
 .../Doctrine/Record/Filter/Compound.php       |    0
 .../Doctrine/Record/Filter/Standard.php       |    2 +-
 .../{ => lib}/Doctrine/Record/Generator.php   |   15 +-
 .../{ => lib}/Doctrine/Record/Iterator.php    |    0
 .../{ => lib}/Doctrine/Record/Listener.php    |    0
 .../Doctrine/Record/Listener/Chain.php        |    0
 .../Doctrine/Record/Listener/Interface.php    |    0
 .../Doctrine/Record/State/Exception.php       |    0
 .../Record/UnknownPropertyException.php       |    0
 .../doctrine/{ => lib}/Doctrine/Relation.php  |    2 +-
 .../Doctrine/Relation/Association.php         |    0
 .../Doctrine/Relation/Association/Self.php    |    0
 .../{ => lib}/Doctrine/Relation/Exception.php |    0
 .../Doctrine/Relation/ForeignKey.php          |    0
 .../{ => lib}/Doctrine/Relation/LocalKey.php  |    0
 .../{ => lib}/Doctrine/Relation/Nest.php      |    0
 .../{ => lib}/Doctrine/Relation/Parser.php    |   28 +-
 .../Doctrine/Relation/Parser/Exception.php    |    0
 .../doctrine/{ => lib}/Doctrine/Search.php    |    0
 .../{ => lib}/Doctrine/Search/Analyzer.php    |    0
 .../Doctrine/Search/Analyzer/Exception.php    |    0
 .../Doctrine/Search/Analyzer/Interface.php    |    0
 .../Doctrine/Search/Analyzer/Standard.php     |    0
 .../Doctrine/Search/Analyzer/Utf8.php         |    0
 .../{ => lib}/Doctrine/Search/Exception.php   |    0
 .../{ => lib}/Doctrine/Search/File.php        |    0
 .../{ => lib}/Doctrine/Search/Indexer.php     |    0
 .../{ => lib}/Doctrine/Search/Indexer/Dir.php |    0
 .../Doctrine/Search/Indexer/Exception.php     |    0
 .../{ => lib}/Doctrine/Search/Listener.php    |    0
 .../{ => lib}/Doctrine/Search/Parser.php      |    0
 .../{ => lib}/Doctrine/Search/Query.php       |    0
 .../{ => lib}/Doctrine/Search/Record.php      |    0
 .../doctrine/{ => lib}/Doctrine/Sequence.php  |    0
 .../{ => lib}/Doctrine/Sequence/Db2.php       |    0
 .../{ => lib}/Doctrine/Sequence/Exception.php |    0
 .../{ => lib}/Doctrine/Sequence/Mssql.php     |    0
 .../{ => lib}/Doctrine/Sequence/Mysql.php     |    0
 .../{ => lib}/Doctrine/Sequence/Oracle.php    |    0
 .../{ => lib}/Doctrine/Sequence/Pgsql.php     |    0
 .../{ => lib}/Doctrine/Sequence/Sqlite.php    |    0
 .../doctrine/{ => lib}/Doctrine/Table.php     |  245 +-
 .../{ => lib}/Doctrine/Table/Exception.php    |    0
 .../{ => lib}/Doctrine/Table/Repository.php   |    0
 .../Doctrine/Table/Repository/Exception.php   |    0
 .../lib/Doctrine/Table/Repository/None.php    |   90 +
 .../doctrine/{ => lib}/Doctrine/Task.php      |    0
 .../{ => lib}/Doctrine/Task/BuildAll.php      |    0
 .../{ => lib}/Doctrine/Task/BuildAllLoad.php  |    0
 .../Doctrine/Task/BuildAllReload.php          |    0
 .../{ => lib}/Doctrine/Task/Compile.php       |    0
 .../{ => lib}/Doctrine/Task/CreateDb.php      |    0
 .../{ => lib}/Doctrine/Task/CreateTables.php  |    0
 .../doctrine/{ => lib}/Doctrine/Task/Dql.php  |    0
 .../{ => lib}/Doctrine/Task/DropDb.php        |    0
 .../{ => lib}/Doctrine/Task/DumpData.php      |    0
 .../{ => lib}/Doctrine/Task/Exception.php     |    0
 .../Doctrine/Task/GenerateMigration.php       |    0
 .../Doctrine/Task/GenerateMigrationsDb.php    |    0
 .../Doctrine/Task/GenerateMigrationsDiff.php  |    0
 .../Task/GenerateMigrationsModels.php         |    0
 .../Doctrine/Task/GenerateModelsDb.php        |    0
 .../Doctrine/Task/GenerateModelsYaml.php      |    0
 .../{ => lib}/Doctrine/Task/GenerateSql.php   |    0
 .../Doctrine/Task/GenerateYamlDb.php          |    0
 .../Doctrine/Task/GenerateYamlModels.php      |    0
 .../{ => lib}/Doctrine/Task/LoadData.php      |   11 +-
 .../{ => lib}/Doctrine/Task/Migrate.php       |    0
 .../{ => lib}/Doctrine/Task/RebuildDb.php     |    0
 .../doctrine/{ => lib}/Doctrine/Template.php  |    0
 .../Doctrine/Template/Geographical.php        |    0
 .../{ => lib}/Doctrine/Template/I18n.php      |    0
 .../Doctrine/Template/Listener/Sluggable.php  |    0
 .../Doctrine/Template/Listener/SoftDelete.php |    0
 .../Template/Listener/Timestampable.php       |    0
 .../{ => lib}/Doctrine/Template/NestedSet.php |    0
 .../Doctrine/Template/Searchable.php          |    0
 .../{ => lib}/Doctrine/Template/Sluggable.php |    0
 .../Doctrine/Template/SoftDelete.php          |    0
 .../Doctrine/Template/Timestampable.php       |    0
 .../Doctrine/Template/Versionable.php         |    0
 .../{ => lib}/Doctrine/Transaction.php        |    0
 .../Doctrine/Transaction/Exception.php        |    0
 .../{ => lib}/Doctrine/Transaction/Mock.php   |    0
 .../{ => lib}/Doctrine/Transaction/Mssql.php  |    0
 .../{ => lib}/Doctrine/Transaction/Mysql.php  |    0
 .../{ => lib}/Doctrine/Transaction/Oracle.php |    0
 .../{ => lib}/Doctrine/Transaction/Pgsql.php  |    0
 .../{ => lib}/Doctrine/Transaction/Sqlite.php |    0
 .../doctrine/{ => lib}/Doctrine/Tree.php      |    0
 .../{ => lib}/Doctrine/Tree/AdjacencyList.php |    0
 .../{ => lib}/Doctrine/Tree/Exception.php     |    0
 .../{ => lib}/Doctrine/Tree/Interface.php     |    0
 .../Doctrine/Tree/MaterializedPath.php        |    0
 .../{ => lib}/Doctrine/Tree/NestedSet.php     |    0
 .../doctrine/{ => lib}/Doctrine/Util.php      |    0
 .../doctrine/{ => lib}/Doctrine/Validator.php |    0
 .../{ => lib}/Doctrine/Validator/Country.php  |    0
 .../Doctrine/Validator/Creditcard.php         |    0
 .../{ => lib}/Doctrine/Validator/Date.php     |    0
 .../{ => lib}/Doctrine/Validator/Driver.php   |    0
 .../{ => lib}/Doctrine/Validator/Email.php    |    0
 .../Doctrine/Validator/ErrorStack.php         |    0
 .../Doctrine/Validator/Exception.php          |    0
 .../{ => lib}/Doctrine/Validator/Future.php   |    0
 .../Doctrine/Validator/Htmlcolor.php          |    0
 .../{ => lib}/Doctrine/Validator/Ip.php       |    0
 .../Doctrine/Validator/Minlength.php          |    0
 .../{ => lib}/Doctrine/Validator/Nospace.php  |    0
 .../{ => lib}/Doctrine/Validator/Notblank.php |    0
 .../{ => lib}/Doctrine/Validator/Notnull.php  |    0
 .../{ => lib}/Doctrine/Validator/Past.php     |    0
 .../{ => lib}/Doctrine/Validator/Range.php    |    0
 .../{ => lib}/Doctrine/Validator/Readonly.php |    0
 .../{ => lib}/Doctrine/Validator/Regexp.php   |    0
 .../{ => lib}/Doctrine/Validator/Time.php     |    0
 .../Doctrine/Validator/Timestamp.php          |    0
 .../{ => lib}/Doctrine/Validator/Unique.php   |    0
 .../{ => lib}/Doctrine/Validator/Unsigned.php |    0
 .../{ => lib}/Doctrine/Validator/Usstate.php  |    0
 .../doctrine/{ => lib}/Doctrine/View.php      |    0
 .../{ => lib}/Doctrine/View/Exception.php     |    0
 .../lib/vendor/doctrine/package.xml           | 1625 +++++
 .../vendor/doctrine/tests/AccessTestCase.php  |  128 +
 .../doctrine/tests/AuditLogTestCase.php       |  121 +
 .../vendor/doctrine/tests/BaseTestCase.php    |  112 +
 .../doctrine/tests/BatchIteratorTestCase.php  |   86 +
 .../doctrine/tests/Cache/AbstractTestCase.php |  154 +
 .../doctrine/tests/Cache/ApcTestCase.php      |   50 +
 .../doctrine/tests/Cache/ArrayTestCase.php    |   50 +
 .../doctrine/tests/Cache/DbTestCase.php       |   86 +
 .../doctrine/tests/Cache/MemcacheTestCase.php |   51 +
 .../tests/Cache/Query/SqliteTestCase.php      |   35 +
 .../tests/Cache/QuerySqliteTestCase.php       |   41 +
 .../doctrine/tests/Cache/SqliteTestCase.php   |   40 +
 .../doctrine/tests/Cache/XcacheTestCase.php   |   57 +
 .../doctrine/tests/CacheSqliteTestCase.php    |  125 +
 .../tests/ClassTableInheritanceTestCase.php   |  321 +
 .../lib/vendor/doctrine/tests/CliTestCase.php |  449 ++
 .../CliTestCase/CustomDoctrineStyleTask.php   |    0
 .../TaskDeclaredInAnIncFile.inc.php           |    0
 .../doctrine/tests/CliTestCase/TestTask02.php |   11 +
 .../vendor/doctrine/tests/CliTestCase/baz.php |    0
 .../vendor/doctrine/tests/CliTestCase/bip.php |    0
 .../tests/CliTestCase/cli-default.php         |   14 +
 .../CliTestCase/cli-with-custom-tasks.php     |   20 +
 ...li-without-autoregistered-custom-tasks.php |   14 +
 .../doctrine/tests/CliTestCase/doctrine.php   |    0
 .../vendor/doctrine/tests/CliTestCase/foo.php |    0
 .../DoctrineStyleTask.php                     |   11 +
 .../EmptyFile.php                             |    8 +
 .../InvalidClassNameForATask.php              |   11 +
 .../TaskDeclaredInAnIncFile.inc.php           |   11 +
 .../should-be-ignored.php                     |    9 +
 .../tests/Collection/SnapshotTestCase.php     |  143 +
 .../tests/CollectionOffsetTestCase.php        |   76 +
 .../doctrine/tests/CollectionTestCase.php     |  341 ++
 .../ColumnAggregationInheritanceTestCase.php  |   83 +
 .../doctrine/tests/ColumnAliasTestCase.php    |  155 +
 .../tests/CompositePrimaryKeyTestCase.php     |   13 +
 .../tests/ConcreteInheritanceTestCase.php     |   64 +
 .../doctrine/tests/ConfigurableTestCase.php   |  222 +
 .../tests/Connection/CustomTestCase.php       |  112 +
 .../tests/Connection/MssqlTestCase.php        |  124 +
 .../tests/Connection/MysqlTestCase.php        |  201 +
 .../tests/Connection/OracleTestCase.php       |  160 +
 .../tests/Connection/PgsqlTestCase.php        |  217 +
 .../tests/Connection/ProfilerTestCase.php     |  183 +
 .../tests/Connection/SqliteTestCase.php       |  111 +
 .../doctrine/tests/Connection/UnitOfWork.php  |  213 +
 .../doctrine/tests/ConnectionTestCase.php     |  252 +
 .../tests/ConnectionTransactionTestCase.php   |  205 +
 ...tiColumnAggregationInheritanceTestCase.php |  100 +
 .../tests/CustomPrimaryKeyTestCase.php        |   63 +
 .../tests/CustomResultSetOrderTestCase.php    |  179 +
 .../lib/vendor/doctrine/tests/DBTestCase.php  |  420 ++
 .../doctrine/tests/Data/ExportTestCase.php    |   96 +
 .../doctrine/tests/Data/ImportTestCase.php    |  612 ++
 .../doctrine/tests/DataDict/MssqlTestCase.php |  259 +
 .../doctrine/tests/DataDict/MysqlTestCase.php |  364 ++
 .../tests/DataDict/OracleTestCase.php         |  348 ++
 .../doctrine/tests/DataDict/PgsqlTestCase.php |  373 ++
 .../tests/DataDict/SqliteTestCase.php         |  183 +
 .../doctrine/tests/DataDictSqliteTestCase.php |   63 +
 .../doctrine/tests/DataDictTestCase.php       |   34 +
 .../tests/DataType/BooleanTestCase.php        |  118 +
 .../doctrine/tests/DataType/EnumTestCase.php  |  258 +
 .../doctrine/tests/Db/ProfilerTestCase.php    |  176 +
 .../doctrine/tests/DbProfilerTestCase.php     |  137 +
 .../vendor/doctrine/tests/DoctrineTest.php    |  289 +
 .../doctrine/tests/DoctrineTest/Coverage.php  |  346 ++
 .../DoctrineTest/Doctrine_UnitTestCase.php    |  292 +
 .../doctrine/tests/DoctrineTest/GroupTest.php |  110 +
 .../doctrine/tests/DoctrineTest/Reporter.php  |   56 +
 .../tests/DoctrineTest/Reporter/Cli.php       |   20 +
 .../tests/DoctrineTest/Reporter/Html.php      |   82 +
 .../tests/DoctrineTest/UnitTestCase.php       |  252 +
 .../vendor/doctrine/tests/DriverTestCase.php  |  253 +
 .../tests/EventListener/ChainTestCase.php     |   50 +
 .../doctrine/tests/EventListenerTestCase.php  |  199 +
 .../tests/Export/CheckConstraintTestCase.php  |   56 +
 .../doctrine/tests/Export/MssqlTestCase.php   |  228 +
 .../doctrine/tests/Export/MysqlTestCase.php   |  383 ++
 .../doctrine/tests/Export/OracleTestCase.php  |  235 +
 .../doctrine/tests/Export/PgsqlTestCase.php   |  178 +
 .../doctrine/tests/Export/RecordTestCase.php  |  108 +
 .../doctrine/tests/Export/SchemaTestCase.php  |   62 +
 .../doctrine/tests/Export/SqliteTestCase.php  |  188 +
 .../vendor/doctrine/tests/ExportTestCase.php  |   96 +
 .../tests/Expression/DriverTestCase.php       |  171 +
 .../tests/Expression/MssqlTestCase.php        |   34 +
 .../tests/Expression/MysqlTestCase.php        |   34 +
 .../tests/Expression/OracleTestCase.php       |   34 +
 .../tests/Expression/PgsqlTestCase.php        |   34 +
 .../tests/Expression/SqliteTestCase.php       |   34 +
 .../doctrine/tests/ExpressionTestCase.php     |   69 +
 .../lib/Doctrine/Template/TestBehavior.php    |    9 +
 .../TestExtension/lib/Doctrine/Test.php       |    5 +
 .../doctrine/tests/ExtensionTestCase.php      |   76 +
 .../doctrine/tests/ForeignKeyTestCase.php     |   56 +
 .../vendor/doctrine/tests/HookTestCase.php    |  172 +
 .../CollectionInitializationTestCase.php      |   91 +
 .../doctrine/tests/Hydrate/DriverTestCase.php |  100 +
 .../tests/Hydrate/FetchModeTestCase.php       |  176 +
 .../tests/Hydrate/PerformanceTestCase.php     |   81 +
 .../doctrine/tests/Hydrate/ScalarTestCase.php |  245 +
 .../vendor/doctrine/tests/HydrateTestCase.php |  107 +
 .../vendor/doctrine/tests/I18nTestCase.php    |  144 +
 .../doctrine/tests/Import/BuilderTestCase.php |  125 +
 .../doctrine/tests/Import/MssqlTestCase.php   |   72 +
 .../doctrine/tests/Import/MysqlTestCase.php   |   34 +
 .../doctrine/tests/Import/OracleTestCase.php  |  114 +
 .../doctrine/tests/Import/PgsqlTestCase.php   |  165 +
 .../tests/Import/PluginHierarchyTestCase.php  |   86 +
 .../doctrine/tests/Import/SchemaTestCase.php  |  113 +
 .../doctrine/tests/Import/SqliteTestCase.php  |   61 +
 .../vendor/doctrine/tests/ImportTestCase.php  |   54 +
 .../tests/IntegrityActionTestCase.php         |   71 +
 .../vendor/doctrine/tests/ManagerTestCase.php |  178 +
 .../doctrine/tests/Migration/BaseTestCase.php |   99 +
 .../tests/Migration/Diff/schema/from.yml      |   27 +
 .../tests/Migration/Diff/schema/to.yml        |   31 +
 .../doctrine/tests/Migration/DiffTestCase.php |   79 +
 .../doctrine/tests/MigrationTestCase.php      |  156 +
 .../ModelLoadingTest/Aggressive/Models.php    |   16 +
 .../Aggressive/MoreModels.php                 |   16 +
 .../BaseConservativeModelLoadingUser.php      |    8 +
 .../ConservativeModelLoadingContact.php       |    8 +
 .../ConservativeModelLoadingProfile.php       |    8 +
 .../ConservativeModelLoadingUser.php          |   10 +
 .../tests/NestedSet/HydrationTestCase.php     |  112 +
 .../tests/NestedSet/MultiRootTestCase.php     |  165 +
 .../tests/NestedSet/SingleRootTestCase.php    |  103 +
 .../TimestampableMultiRootTestCase.php        |   82 +
 .../vendor/doctrine/tests/NewCoreTestCase.php |   48 +
 .../OneTableOneClassInheritanceTestCase.php   |   46 +
 .../vendor/doctrine/tests/ParserTestCase.php  |  101 +
 .../tests/PessimisticLockingTestCase.php      |  122 +
 .../vendor/doctrine/tests/PluginTestCase.php  |  152 +
 .../tests/Query/AggregateValueTestCase.php    |  229 +
 .../tests/Query/ApplyInheritanceTestCase.php  |   57 +
 .../doctrine/tests/Query/CacheTestCase.php    |  258 +
 .../doctrine/tests/Query/CheckTestCase.php    |   69 +
 .../tests/Query/ComponentAliasTestCase.php    |  123 +
 .../tests/Query/ConditionTestCase.php         |  119 +
 .../doctrine/tests/Query/CopyTestCase.php     |   47 +
 .../doctrine/tests/Query/DeleteTestCase.php   |  137 +
 .../doctrine/tests/Query/DriverTestCase.php   |  173 +
 .../tests/Query/ExpressionTestCase.php        |  139 +
 .../doctrine/tests/Query/FromTestCase.php     |  119 +
 .../doctrine/tests/Query/GroupbyTestCase.php  |   43 +
 .../doctrine/tests/Query/HavingTestCase.php   |   67 +
 .../tests/Query/HydrateNoneTestCase.php       |   43 +
 .../tests/Query/IdentifierQuotingTestCase.php |  184 +
 .../tests/Query/JoinConditionTestCase.php     |   95 +
 .../doctrine/tests/Query/JoinTestCase.php     |  291 +
 .../doctrine/tests/Query/LimitTestCase.php    |  329 +
 .../tests/Query/MultiJoin2TestCase.php        |  115 +
 .../tests/Query/MultiJoinTestCase.php         |  192 +
 .../Query/MultipleAggregateValueTestCase.php  |   96 +
 .../Query/MysqlSubqueryHavingTestCase.php     |   73 +
 .../tests/Query/MysqlSubqueryTestCase.php     |  117 +
 .../tests/Query/OneToOneFetchingTestCase.php  |  263 +
 .../doctrine/tests/Query/OrderbyTestCase.php  |  105 +
 .../tests/Query/PgsqlSubqueryTestCase.php     |   73 +
 .../tests/Query/ReferenceModelTestCase.php    |  204 +
 .../doctrine/tests/Query/RegistryTestCase.php |   67 +
 .../tests/Query/RemoveQueryPartTestCase.php   |   85 +
 .../tests/Query/SelectExpressionTestCase.php  |  113 +
 .../doctrine/tests/Query/SelectTestCase.php   |  267 +
 .../tests/Query/ShortAliasesTestCase.php      |   31 +
 .../doctrine/tests/Query/SubqueryTestCase.php |  151 +
 .../doctrine/tests/Query/UpdateTestCase.php   |  150 +
 .../doctrine/tests/Query/WhereTestCase.php    |  306 +
 .../vendor/doctrine/tests/QueryTestCase.php   |  394 ++
 .../vendor/doctrine/tests/RawSqlTestCase.php  |  298 +
 .../tests/Record/CascadingDeleteTestCase.php  |  314 +
 .../doctrine/tests/Record/FilterTestCase.php  |  107 +
 .../tests/Record/FromArrayTestCase.php        |   88 +
 .../tests/Record/GeneratorTestCase.php        |   72 +
 .../doctrine/tests/Record/HookTestCase.php    |  103 +
 .../tests/Record/InheritanceTestCase.php      |   59 +
 .../doctrine/tests/Record/LockTestCase.php    |   23 +
 .../tests/Record/SaveBlankRecordTestCase.php  |   63 +
 .../Record/SerializeUnserializeTestCase.php   |  117 +
 .../doctrine/tests/Record/StateTestCase.php   |   63 +
 .../tests/Record/SynchronizeTestCase.php      |  148 +
 .../tests/Record/ZeroValuesTestCase.php       |   79 +
 .../doctrine/tests/RecordFilterTestCase.php   |   45 +
 .../vendor/doctrine/tests/RecordTestCase.php  | 1025 ++++
 .../tests/Relation/AccessTestCase.php         |  210 +
 .../tests/Relation/CircularSavingTestCase.php |  108 +
 .../tests/Relation/ColumnAliasesTestCase.php  |   66 +
 .../tests/Relation/ManyToMany2TestCase.php    |  134 +
 .../tests/Relation/ManyToManyTestCase.php     |  201 +
 .../doctrine/tests/Relation/NestTestCase.php  |  254 +
 .../tests/Relation/OneToManyTestCase.php      |  118 +
 .../tests/Relation/OneToOneTestCase.php       |  101 +
 .../tests/Relation/OrderByTestCase.php        |  290 +
 .../tests/Relation/ParserTestCase.php         |  200 +
 .../doctrine/tests/RelationTestCase.php       |  166 +
 .../doctrine/tests/RepositoryTestCase.php     |    5 +
 .../doctrine/tests/Search/FileTestCase.php    |   55 +
 .../doctrine/tests/Search/IndexerTestCase.php |   68 +
 .../doctrine/tests/Search/QueryTestCase.php   |  328 +
 .../tests/Search/QueryWeightTestCase.php      |  129 +
 .../doctrine/tests/Search/_files/content.html |    7 +
 .../doctrine/tests/Search/_files/content.txt  |   12 +
 .../vendor/doctrine/tests/SearchTestCase.php  |  239 +
 .../doctrine/tests/Sequence/MssqlTestCase.php |   63 +
 .../doctrine/tests/Sequence/MysqlTestCase.php |   59 +
 .../tests/Sequence/OracleTestCase.php         |   55 +
 .../doctrine/tests/Sequence/PgsqlTestCase.php |   55 +
 .../tests/Sequence/SqliteTestCase.php         |   61 +
 .../doctrine/tests/SequenceTestCase.php       |   67 +
 .../doctrine/tests/SluggableTestCase.php      |  570 ++
 .../doctrine/tests/SoftDeleteBCTestCase.php   |  118 +
 .../doctrine/tests/SoftDeleteTestCase.php     |  111 +
 .../tests/Table/NamedQueryTestCase.php        |  105 +
 .../tests/Table/RemoveColumnTestCase.php      |   86 +
 .../vendor/doctrine/tests/TableTestCase.php   |  263 +
 .../vendor/doctrine/tests/TaskTestCase.php    |  157 +
 .../tests/TaskTestCase/TestTask004.php        |   13 +
 .../tests/TaskTestCase/TestTask005.php        |   13 +
 .../tests/TaskTestCase/TestTask006.php        |   16 +
 .../doctrine/tests/TemplateTestCase.php       |  136 +
 .../doctrine/tests/Ticket/1015TestCase.php    |  115 +
 .../doctrine/tests/Ticket/1028TestCase.php    |   73 +
 .../doctrine/tests/Ticket/1044TestCase.php    |   73 +
 .../doctrine/tests/Ticket/1071TestCase.php    |   60 +
 .../doctrine/tests/Ticket/1072TestCase.php    |  137 +
 .../doctrine/tests/Ticket/1077TestCase.php    |  149 +
 .../doctrine/tests/Ticket/1099TestCase.php    |   57 +
 .../doctrine/tests/Ticket/1106TestCase.php    |   83 +
 .../doctrine/tests/Ticket/1113TestCase.php    |  203 +
 .../doctrine/tests/Ticket/1116TestCase.php    |   90 +
 .../doctrine/tests/Ticket/1118TestCase.php    |   73 +
 .../doctrine/tests/Ticket/1121TestCase.php    |   90 +
 .../doctrine/tests/Ticket/1123TestCase.php    |   81 +
 .../doctrine/tests/Ticket/1124TestCase.php    |  171 +
 .../doctrine/tests/Ticket/1125TestCase.php    |   51 +
 .../doctrine/tests/Ticket/1131TestCase.php    |  188 +
 .../doctrine/tests/Ticket/1133TestCase.php    |   97 +
 .../doctrine/tests/Ticket/1134TestCase.php    |   76 +
 .../doctrine/tests/Ticket/1160TestCase.php    |   53 +
 .../doctrine/tests/Ticket/1175TestCase.php    |  169 +
 .../doctrine/tests/Ticket/1192TestCase.php    |   80 +
 .../doctrine/tests/Ticket/1195TestCase.php    |  127 +
 .../doctrine/tests/Ticket/1205TestCase.php    |   80 +
 .../doctrine/tests/Ticket/1206TestCase.php    |   63 +
 .../doctrine/tests/Ticket/1208TestCase.php    |   81 +
 .../doctrine/tests/Ticket/1211TestCase.php    |   48 +
 .../doctrine/tests/Ticket/1213TestCase.php    |   83 +
 .../doctrine/tests/Ticket/1225TestCase.php    |   60 +
 .../doctrine/tests/Ticket/1228TestCase.php    |  240 +
 .../doctrine/tests/Ticket/1230TestCase.php    |   74 +
 .../doctrine/tests/Ticket/1236TestCase.php    |   68 +
 .../doctrine/tests/Ticket/1244TestCase.php    |   65 +
 .../doctrine/tests/Ticket/1250TestCase.php    |   73 +
 .../doctrine/tests/Ticket/1251TestCase.php    |   59 +
 .../doctrine/tests/Ticket/1253TestCase.php    |   93 +
 .../doctrine/tests/Ticket/1254TestCase.php    |  116 +
 .../doctrine/tests/Ticket/1257TestCase.php    |   88 +
 .../doctrine/tests/Ticket/1276TestCase.php    |   44 +
 .../doctrine/tests/Ticket/1277TestCase.php    |  231 +
 .../doctrine/tests/Ticket/1280TestCase.php    |  103 +
 .../doctrine/tests/Ticket/1281TestCase.php    |   47 +
 .../doctrine/tests/Ticket/1289TestCase.php    |   66 +
 .../doctrine/tests/Ticket/1296TestCase.php    |  162 +
 .../doctrine/tests/Ticket/1304TestCase.php    |   90 +
 .../doctrine/tests/Ticket/1305TestCase.php    |   69 +
 .../doctrine/tests/Ticket/1307TestCase.php    |   56 +
 .../doctrine/tests/Ticket/1315TestCase.php    |   73 +
 .../doctrine/tests/Ticket/1323TestCase.php    |  225 +
 .../doctrine/tests/Ticket/1323b2TestCase.php  |  216 +
 .../doctrine/tests/Ticket/1325TestCase.php    |   97 +
 .../doctrine/tests/Ticket/1326TestCase.php    |   64 +
 .../doctrine/tests/Ticket/1335TestCase.php    |   45 +
 .../doctrine/tests/Ticket/1338TestCase.php    |   53 +
 .../doctrine/tests/Ticket/1341TestCase.php    |   98 +
 .../doctrine/tests/Ticket/1351TestCase.php    |   79 +
 .../doctrine/tests/Ticket/1365TestCase.php    |  141 +
 .../doctrine/tests/Ticket/1372TestCase.php    |  128 +
 .../doctrine/tests/Ticket/1380TestCase.php    |   44 +
 .../doctrine/tests/Ticket/1381TestCase.php    |  160 +
 .../doctrine/tests/Ticket/1383TestCase.php    |   96 +
 .../doctrine/tests/Ticket/1385TestCase.php    |   97 +
 .../doctrine/tests/Ticket/1390TestCase.php    |   44 +
 .../doctrine/tests/Ticket/1395TestCase.php    |   97 +
 .../doctrine/tests/Ticket/1400TestCase.php    |   45 +
 .../doctrine/tests/Ticket/1417TestCase.php    |   55 +
 .../doctrine/tests/Ticket/1419TestCase.php    |   54 +
 .../doctrine/tests/Ticket/1436TestCase.php    |  132 +
 .../doctrine/tests/Ticket/1441TestCase.php    |   77 +
 .../doctrine/tests/Ticket/1449TestCase.php    |   96 +
 .../doctrine/tests/Ticket/1452TestCase.php    |   77 +
 .../doctrine/tests/Ticket/1454TestCase.php    |   45 +
 .../doctrine/tests/Ticket/1461TestCase.php    |   86 +
 .../doctrine/tests/Ticket/1464TestCase.php    |   66 +
 .../doctrine/tests/Ticket/1465TestCase.php    |   46 +
 .../doctrine/tests/Ticket/1467TestCase.php    |  127 +
 .../doctrine/tests/Ticket/1480TestCase.php    |   77 +
 .../doctrine/tests/Ticket/1483TestCase.php    |  110 +
 .../doctrine/tests/Ticket/1488TestCase.php    |   83 +
 .../doctrine/tests/Ticket/1494TestCase.php    |   44 +
 .../doctrine/tests/Ticket/1500TestCase.php    |   98 +
 .../doctrine/tests/Ticket/1507TestCase.php    |   95 +
 .../doctrine/tests/Ticket/1513TestCase.php    |   83 +
 .../doctrine/tests/Ticket/1520TestCase.php    |   66 +
 .../doctrine/tests/Ticket/1522TestCase.php    |   57 +
 .../doctrine/tests/Ticket/1523TestCase.php    |   79 +
 .../doctrine/tests/Ticket/1524TestCase.php    |   49 +
 .../doctrine/tests/Ticket/1527TestCase.php    |   61 +
 .../doctrine/tests/Ticket/1537TestCase.php    |   76 +
 .../doctrine/tests/Ticket/1540TestCase.php    |   69 +
 .../doctrine/tests/Ticket/1543TestCase.php    |   69 +
 .../doctrine/tests/Ticket/1545TestCase.php    |   91 +
 .../doctrine/tests/Ticket/1558TestCase.php    |   53 +
 .../doctrine/tests/Ticket/1562TestCase.php    |  103 +
 .../doctrine/tests/Ticket/1567TestCase.php    |   72 +
 .../doctrine/tests/Ticket/1604TestCase.php    |   82 +
 .../doctrine/tests/Ticket/1617TestCase.php    |   41 +
 .../doctrine/tests/Ticket/1617_schema.yml     |   32 +
 .../doctrine/tests/Ticket/1619TestCase.php    |   77 +
 .../doctrine/tests/Ticket/1621TestCase.php    |  213 +
 .../doctrine/tests/Ticket/1621bTestCase.php   |  283 +
 .../doctrine/tests/Ticket/1622TestCase.php    |  106 +
 .../doctrine/tests/Ticket/1623TestCase.php    |  166 +
 .../doctrine/tests/Ticket/1628TestCase.php    |   55 +
 .../doctrine/tests/Ticket/1629TestCase.php    |   95 +
 .../doctrine/tests/Ticket/1630TestCase.php    |   93 +
 .../doctrine/tests/Ticket/1636TestCase.php    |  176 +
 .../doctrine/tests/Ticket/1641TestCase.php    |   82 +
 .../doctrine/tests/Ticket/1652TestCase.php    |   95 +
 .../doctrine/tests/Ticket/1653TestCase.php    |  121 +
 .../doctrine/tests/Ticket/1658TestCase.php    |   77 +
 .../doctrine/tests/Ticket/1674TestCase.php    |   50 +
 .../doctrine/tests/Ticket/1703TestCase.php    |   87 +
 .../doctrine/tests/Ticket/1706TestCase.php    |   92 +
 .../doctrine/tests/Ticket/1713TestCase.php    |   59 +
 .../doctrine/tests/Ticket/1716TestCase.php    |   72 +
 .../doctrine/tests/Ticket/1725TestCase.php    |   74 +
 .../1727/models1/Ticket_1727_Model1.php       |    8 +
 .../1727/models1/Ticket_1727_Model2.php       |    8 +
 .../1727/models2/Ticket_1727_Model3.php       |    8 +
 .../1727/models2/Ticket_1727_Model4.php       |    8 +
 .../doctrine/tests/Ticket/1727TestCase.php    |   69 +
 .../doctrine/tests/Ticket/1729TestCase.php    |   80 +
 .../doctrine/tests/Ticket/1745TestCase.php    |   95 +
 .../doctrine/tests/Ticket/1762TestCase.php    |   94 +
 .../doctrine/tests/Ticket/1763TestCase.php    |   83 +
 .../doctrine/tests/Ticket/1764TestCase.php    |   66 +
 .../doctrine/tests/Ticket/1768TestCase.php    |   17 +
 .../doctrine/tests/Ticket/1783TestCase.php    |   29 +
 .../doctrine/tests/Ticket/1793TestCase.php    |  138 +
 .../doctrine/tests/Ticket/1795TestCase.php    |   77 +
 .../doctrine/tests/Ticket/1799TestCase.php    |   69 +
 .../doctrine/tests/Ticket/1808TestCase.php    |   56 +
 .../doctrine/tests/Ticket/1818TestCase.php    |   98 +
 .../doctrine/tests/Ticket/1821TestCase.php    |  148 +
 .../doctrine/tests/Ticket/1824TestCase.php    |   62 +
 .../doctrine/tests/Ticket/1830TestCase.php    |   95 +
 .../doctrine/tests/Ticket/1841TestCase.php    |   61 +
 .../doctrine/tests/Ticket/1843TestCase.php    |  129 +
 .../doctrine/tests/Ticket/1858TestCase.php    |   66 +
 .../doctrine/tests/Ticket/1860TestCase.php    |   96 +
 .../doctrine/tests/Ticket/1865TestCase.php    |  104 +
 .../doctrine/tests/Ticket/1875TestCase.php    |   61 +
 .../doctrine/tests/Ticket/1876TestCase.php    |  137 +
 .../doctrine/tests/Ticket/1876bTestCase.php   |  131 +
 .../doctrine/tests/Ticket/1923TestCase.php    |   73 +
 .../doctrine/tests/Ticket/1935TestCase.php    |   60 +
 .../doctrine/tests/Ticket/1940TestCase.php    |   88 +
 .../doctrine/tests/Ticket/1958TestCase.php    |   62 +
 .../doctrine/tests/Ticket/1986TestCase.php    |  111 +
 .../doctrine/tests/Ticket/1991TestCase.php    |   73 +
 .../doctrine/tests/Ticket/1992TestCase.php    |  143 +
 .../doctrine/tests/Ticket/2007TestCase.php    |   86 +
 .../doctrine/tests/Ticket/2015TestCase.php    |  103 +
 .../doctrine/tests/Ticket/2032TestCase.php    |   51 +
 .../doctrine/tests/Ticket/2105TestCase.php    |   92 +
 .../doctrine/tests/Ticket/2123TestCase.php    |   61 +
 .../doctrine/tests/Ticket/2158TestCase.php    |   56 +
 .../doctrine/tests/Ticket/2159TestCase.php    |   58 +
 .../doctrine/tests/Ticket/2160TestCase.php    |   45 +
 .../Ticket/2184TestCase.php}                  |   17 +-
 .../doctrine/tests/Ticket/2190TestCase.php    |   84 +
 .../doctrine/tests/Ticket/2204TestCase.php    |   62 +
 .../doctrine/tests/Ticket/2229TestCase.php    |   76 +
 .../doctrine/tests/Ticket/2251TestCase.php    |   87 +
 .../doctrine/tests/Ticket/2292TestCase.php    |   88 +
 .../doctrine/tests/Ticket/2295TestCase.php    |   56 +
 .../doctrine/tests/Ticket/2298TestCase.php    |   64 +
 .../doctrine/tests/Ticket/2334TestCase.php    |   67 +
 .../doctrine/tests/Ticket/2355TestCase.php    |  297 +
 .../doctrine/tests/Ticket/2367TestCase.php    |   77 +
 .../2375/models1/Ticket_2375_Model1.php       |    8 +
 .../2375/models1/Ticket_2375_Model2.php       |    9 +
 .../2375/models2/Ticket_2375_Model3.php       |    8 +
 .../2375/models2/Ticket_2375_Model4.php       |    9 +
 .../2375/models2/Ticket_2375_Model5.php       |   17 +
 .../doctrine/tests/Ticket/2375TestCase.php    |   99 +
 .../doctrine/tests/Ticket/2377TestCase.php    |   97 +
 .../doctrine/tests/Ticket/2398TestCase.php    |   49 +
 .../doctrine/tests/Ticket/255TestCase.php     |   84 +
 .../doctrine/tests/Ticket/381TestCase.php     |   59 +
 .../doctrine/tests/Ticket/384TestCase.php     |  206 +
 .../doctrine/tests/Ticket/424BTestCase.php    |   99 +
 .../doctrine/tests/Ticket/424CTestCase.php    |   96 +
 .../doctrine/tests/Ticket/428TestCase.php     |   56 +
 .../doctrine/tests/Ticket/438TestCase.php     |  159 +
 .../doctrine/tests/Ticket/480TestCase.php     |   65 +
 .../doctrine/tests/Ticket/486TestCase.php     |  173 +
 .../doctrine/tests/Ticket/565TestCase.php     |   35 +
 .../doctrine/tests/Ticket/574TestCase.php     |   85 +
 .../doctrine/tests/Ticket/576TestCase.php     |   52 +
 .../doctrine/tests/Ticket/583TestCase.php     |   39 +
 .../doctrine/tests/Ticket/587TestCase.php     |  106 +
 .../doctrine/tests/Ticket/626BTestCase.php    |  159 +
 .../doctrine/tests/Ticket/626CTestCase.php    |   85 +
 .../doctrine/tests/Ticket/626DTestCase.php    |   58 +
 .../doctrine/tests/Ticket/632TestCase.php     |  119 +
 .../doctrine/tests/Ticket/638TestCase.php     |  161 +
 .../doctrine/tests/Ticket/642TestCase.php     |   65 +
 .../doctrine/tests/Ticket/668TestCase.php     |   65 +
 .../doctrine/tests/Ticket/673TestCase.php     |   71 +
 .../doctrine/tests/Ticket/697TestCase.php     |   53 +
 .../doctrine/tests/Ticket/736TestCase.php     |   98 +
 .../doctrine/tests/Ticket/741TestCase.php     |   86 +
 .../doctrine/tests/Ticket/749TestCase.php     |  143 +
 .../doctrine/tests/Ticket/753TestCase.php     |   63 +
 .../doctrine/tests/Ticket/7745TestCase.php    |  116 +
 .../doctrine/tests/Ticket/786TestCase.php     |   58 +
 .../doctrine/tests/Ticket/832TestCase.php     |  100 +
 .../doctrine/tests/Ticket/838TestCase.php     |   73 +
 .../doctrine/tests/Ticket/867TestCase.php     |   85 +
 .../doctrine/tests/Ticket/876TestCase.php     |  141 +
 .../doctrine/tests/Ticket/889TestCase.php     |  203 +
 .../doctrine/tests/Ticket/894TestCase.php     |   66 +
 .../doctrine/tests/Ticket/904TestCase.php     |   74 +
 .../doctrine/tests/Ticket/912TestCase.php     |  283 +
 .../doctrine/tests/Ticket/915TestCase.php     |   75 +
 .../doctrine/tests/Ticket/923TestCase.php     |  102 +
 .../doctrine/tests/Ticket/927TestCase.php     |   63 +
 .../doctrine/tests/Ticket/929TestCase.php     |  175 +
 .../doctrine/tests/Ticket/930TestCase.php     |  171 +
 .../doctrine/tests/Ticket/932TestCase.php     |   40 +
 .../doctrine/tests/Ticket/935TestCase.php     |   83 +
 .../doctrine/tests/Ticket/941TestCase.php     |  194 +
 .../doctrine/tests/Ticket/950TestCase.php     |   88 +
 .../doctrine/tests/Ticket/952TestCase.php     |   88 +
 .../doctrine/tests/Ticket/963TestCase.php     |   82 +
 .../doctrine/tests/Ticket/966TestCase.php     |  194 +
 .../doctrine/tests/Ticket/969TestCase.php     |  156 +
 .../doctrine/tests/Ticket/973TestCase.php     |   63 +
 .../doctrine/tests/Ticket/982TestCase.php     |   79 +
 .../doctrine/tests/Ticket/987TestCase.php     |   81 +
 .../doctrine/tests/Ticket/990TestCase.php     |  111 +
 .../doctrine/tests/Ticket/AyoubTestCase.php   |  111 +
 .../doctrine/tests/Ticket/DC101TestCase.php   |   78 +
 .../doctrine/tests/Ticket/DC112TestCase.php   |  165 +
 .../doctrine/tests/Ticket/DC136TestCase.php   |   66 +
 .../doctrine/tests/Ticket/DC141TestCase.php   |   43 +
 .../doctrine/tests/Ticket/DC147TestCase.php   |  174 +
 .../doctrine/tests/Ticket/DC14TestCase.php    |   59 +
 .../doctrine/tests/Ticket/DC169TestCase.php   |  100 +
 .../doctrine/tests/Ticket/DC171TestCase.php   |   69 +
 .../doctrine/tests/Ticket/DC187TestCase.php   |   97 +
 .../doctrine/tests/Ticket/DC198TestCase.php   |  109 +
 .../doctrine/tests/Ticket/DC217TestCase.php   |   84 +
 .../tests/Ticket/DC221/TestMigration.php      |    8 +
 .../doctrine/tests/Ticket/DC221TestCase.php   |   41 +
 .../doctrine/tests/Ticket/DC236TestCase.php   |   85 +
 .../doctrine/tests/Ticket/DC238TestCase.php   |   74 +
 .../doctrine/tests/Ticket/DC23TestCase.php    |  199 +
 .../doctrine/tests/Ticket/DC23bTestCase.php   |  226 +
 .../doctrine/tests/Ticket/DC240TestCase.php   |  115 +
 .../doctrine/tests/Ticket/DC241TestCase.php   |   96 +
 .../doctrine/tests/Ticket/DC242TestCase.php   |  134 +
 .../doctrine/tests/Ticket/DC24TestCase.php    |  139 +
 .../doctrine/tests/Ticket/DC25TestCase.php    |   95 +
 .../doctrine/tests/Ticket/DC266TestCase.php   |   61 +
 .../doctrine/tests/Ticket/DC267TestCase.php   |   57 +
 .../doctrine/tests/Ticket/DC276TestCase.php   |   94 +
 .../doctrine/tests/Ticket/DC28TestCase.php    |   94 +
 .../doctrine/tests/Ticket/DC292/from.yml      |    4 +
 .../vendor/doctrine/tests/Ticket/DC292/to.yml |    5 +
 .../doctrine/tests/Ticket/DC292TestCase.php   |   48 +
 .../doctrine/tests/Ticket/DC300TestCase.php   |  127 +
 .../doctrine/tests/Ticket/DC302TestCase.php   |  184 +
 .../doctrine/tests/Ticket/DC317TestCase.php   |   86 +
 .../doctrine/tests/Ticket/DC36TestCase.php    |   35 +
 .../doctrine/tests/Ticket/DC399TestCase.php   |   65 +
 .../doctrine/tests/Ticket/DC39TestCase.php    |  114 +
 .../doctrine/tests/Ticket/DC437TestCase.php   |  122 +
 .../doctrine/tests/Ticket/DC521TestCase.php   |  142 +
 .../doctrine/tests/Ticket/DC56TestCase.php    |   69 +
 .../doctrine/tests/Ticket/DC57TestCase.php    |   72 +
 .../doctrine/tests/Ticket/DC63TestCase.php    |   62 +
 .../doctrine/tests/Ticket/DC64TestCase.php    |   93 +
 .../doctrine/tests/Ticket/DC69TestCase.php    |   50 +
 .../doctrine/tests/Ticket/DC709TestCase.php   |   47 +
 .../doctrine/tests/Ticket/DC74TestCase.php    |   83 +
 .../doctrine/tests/Ticket/DC794TestCase.php   |   65 +
 .../doctrine/tests/Ticket/DC7TestCase.php     |   75 +
 .../doctrine/tests/Ticket/DC825TestCase.php   |   88 +
 .../doctrine/tests/Ticket/DC828TestCase.php   |  127 +
 .../doctrine/tests/Ticket/DC82TestCase.php    |   56 +
 .../doctrine/tests/Ticket/DC840TestCase.php   |   84 +
 .../doctrine/tests/Ticket/DC841TestCase.php   |  189 +
 .../doctrine/tests/Ticket/DC843TestCase.php   |  116 +
 .../doctrine/tests/Ticket/DC848TestCase.php   |   52 +
 .../doctrine/tests/Ticket/DC86TestCase.php    |   79 +
 .../doctrine/tests/Ticket/DC879TestCase.php   |   77 +
 .../doctrine/tests/Ticket/DC95/schema.yml     |    8 +
 .../doctrine/tests/Ticket/DC95TestCase.php    |   68 +
 .../tests/Ticket/NewTicketTestCase.php        |  203 +
 .../doctrine/tests/Ticket/NjeroTestCase.php   |   89 +
 .../doctrine/tests/TokenizerTestCase.php      |  146 +
 .../tests/Transaction/MssqlTestCase.php       |   62 +
 .../tests/Transaction/MysqlTestCase.php       |   75 +
 .../tests/Transaction/OracleTestCase.php      |   73 +
 .../tests/Transaction/PgsqlTestCase.php       |   69 +
 .../tests/Transaction/SqliteTestCase.php      |   56 +
 .../doctrine/tests/TransactionTestCase.php    |  358 ++
 .../doctrine/tests/TreeStructureTestCase.php  |  128 +
 .../doctrine/tests/UnitOfWorkTestCase.php     |  139 +
 .../doctrine/tests/UnsortedTestCase.php       |   29 +
 .../tests/Validator/ForeignKeysTestCase.php   |   92 +
 .../tests/Validator/FutureTestCase.php        |   84 +
 .../doctrine/tests/Validator/PastTestCase.php |   84 +
 .../doctrine/tests/ValidatorTestCase.php      |  487 ++
 .../doctrine/tests/ValueHolderTestCase.php    |   60 +
 .../vendor/doctrine/tests/ViewTestCase.php    |   78 +
 .../lib/vendor/doctrine/tests/bootstrap.php   |   22 +
 .../lib/vendor/doctrine/tests/index.php       |    2 +
 .../tests/migration_classes/10_test.class.php |    8 +
 .../tests/migration_classes/11_test.class.php |    8 +
 .../1_add_phonenumber.class.php               |   11 +
 .../migration_classes/2_add_user.class.php    |   11 +
 .../migration_classes/3_add_profile.class.php |   11 +
 .../4_drop_profile.class.php                  |   12 +
 .../tests/migration_classes/5_test.class.php  |    8 +
 .../tests/migration_classes/6_test.class.php  |    8 +
 .../tests/migration_classes/7_test.class.php  |    8 +
 .../tests/migration_classes/8_test.class.php  |    8 +
 .../tests/migration_classes/9_test.class.php  |    8 +
 .../vendor/doctrine/tests/models/Account.php  |   10 +
 .../vendor/doctrine/tests/models/Address.php  |   13 +
 .../vendor/doctrine/tests/models/Album.php    |   17 +
 .../lib/vendor/doctrine/tests/models/App.php  |   19 +
 .../doctrine/tests/models/App_Category.php    |   18 +
 .../vendor/doctrine/tests/models/App_User.php |   18 +
 .../doctrine/tests/models/Assignment.php      |    8 +
 .../lib/vendor/doctrine/tests/models/Auth.php |   14 +
 .../vendor/doctrine/tests/models/Author.php   |   15 +
 .../tests/models/BadlyNamed__Class.php        |    8 +
 .../doctrine/tests/models/BarRecord.php       |   13 +
 .../tests/models/BaseSymfonyRecord.php        |   13 +
 .../lib/vendor/doctrine/tests/models/Blog.php |   32 +
 .../vendor/doctrine/tests/models/BlogTag.php  |   13 +
 .../tests/models/BoardWithPosition.php        |   10 +
 .../lib/vendor/doctrine/tests/models/Book.php |   16 +
 .../vendor/doctrine/tests/models/Bookmark.php |    9 +
 .../doctrine/tests/models/BookmarkUser.php    |   14 +
 .../doctrine/tests/models/BooleanTest.php     |    7 +
 .../doctrine/tests/models/CPK_Association.php |    7 +
 .../vendor/doctrine/tests/models/CPK_Test.php |   13 +
 .../doctrine/tests/models/CPK_Test2.php       |   13 +
 .../tests/models/CascadeDeleteRelatedTest.php |   20 +
 .../models/CascadeDeleteRelatedTest2.php      |   15 +
 .../tests/models/CascadeDeleteTest.php        |   14 +
 .../tests/models/CategoryWithPosition.php     |   10 +
 .../tests/models/CheckConstraintTest.php      |   10 +
 .../doctrine/tests/models/ClientModel.php     |   62 +
 .../doctrine/tests/models/ColumnAliasTest.php |   15 +
 .../doctrine/tests/models/ConcreteEmail.php   |    8 +
 .../doctrine/tests/models/ConcreteGroup.php   |    8 +
 .../tests/models/ConcreteGroupUser.php        |    8 +
 .../models/ConcreteInheritanceTestParent.php  |   18 +
 .../doctrine/tests/models/ConcreteUser.php    |    9 +
 .../doctrine/tests/models/CoverageCodeN.php   |   11 +
 .../vendor/doctrine/tests/models/CustomPK.php |    7 +
 .../tests/models/CustomSequenceRecord.php     |    9 +
 .../doctrine/tests/models/Data_File.php       |   10 +
 .../vendor/doctrine/tests/models/DateTest.php |    7 +
 .../doctrine/tests/models/Description.php     |    8 +
 .../vendor/doctrine/tests/models/Element.php  |   14 +
 .../vendor/doctrine/tests/models/Email.php    |    8 +
 .../vendor/doctrine/tests/models/Entity.php   |   26 +
 .../doctrine/tests/models/EntityAddress.php   |    9 +
 .../doctrine/tests/models/EntityReference.php |   11 +
 .../vendor/doctrine/tests/models/EnumTest.php |   12 +
 .../doctrine/tests/models/EnumTest2.php       |    8 +
 .../doctrine/tests/models/EnumTest3.php       |    7 +
 .../tests/models/EventListenerChainTest.php   |   21 +
 .../tests/models/EventListenerTest.php        |   16 +
 .../doctrine/tests/models/FieldNameTest.php   |   12 +
 .../doctrine/tests/models/File_Owner.php      |    9 +
 .../doctrine/tests/models/FilterTest.php      |    9 +
 .../doctrine/tests/models/FilterTest2.php     |    7 +
 .../doctrine/tests/models/FooBarRecord.php    |    9 +
 .../tests/models/FooForeignlyOwned.php        |    9 +
 .../tests/models/FooForeignlyOwnedWithPK.php  |   12 +
 .../doctrine/tests/models/FooLocallyOwned.php |    9 +
 .../doctrine/tests/models/FooRecord.php       |   43 +
 .../tests/models/FooReferenceRecord.php       |   11 +
 .../doctrine/tests/models/ForeignKeyTest.php  |   24 +
 .../doctrine/tests/models/ForeignKeyTest2.php |   13 +
 .../doctrine/tests/models/Forum_Board.php     |   13 +
 .../doctrine/tests/models/Forum_Category.php  |   25 +
 .../doctrine/tests/models/Forum_Entry.php     |   16 +
 .../doctrine/tests/models/Forum_Thread.php    |   13 +
 .../vendor/doctrine/tests/models/Group.php    |   21 +
 .../doctrine/tests/models/GroupUser.php       |   16 +
 .../vendor/doctrine/tests/models/GzipTest.php |    6 +
 .../tests/models/I18nRelationTest.php         |   28 +
 .../vendor/doctrine/tests/models/I18nTest.php |   13 +
 .../doctrine/tests/models/InheritanceDeal.php |   16 +
 .../tests/models/InheritanceDealUser.php      |   40 +
 .../doctrine/tests/models/InheritanceUser.php |   16 +
 .../lib/vendor/doctrine/tests/models/JC1.php  |    8 +
 .../lib/vendor/doctrine/tests/models/JC2.php  |    8 +
 .../lib/vendor/doctrine/tests/models/JC3.php  |    8 +
 .../doctrine/tests/models/LiabilityCodeN.php  |   11 +
 .../vendor/doctrine/tests/models/Location.php |   14 +
 .../doctrine/tests/models/LocationI18n.php    |   15 +
 .../doctrine/tests/models/Log_Entry.php       |   13 +
 .../doctrine/tests/models/Log_Status.php      |    6 +
 .../vendor/doctrine/tests/models/M2MTest.php  |   16 +
 .../vendor/doctrine/tests/models/M2MTest2.php |   11 +
 .../doctrine/tests/models/MigrationTest.php   |    8 +
 .../vendor/doctrine/tests/models/MyGroup.php  |   17 +
 .../doctrine/tests/models/MyOneThing.php      |   17 +
 .../doctrine/tests/models/MyOtherThing.php    |   16 +
 .../vendor/doctrine/tests/models/MyUser.php   |   19 +
 .../vendor/doctrine/tests/models/MyUser2.php  |   23 +
 .../doctrine/tests/models/MyUserGroup.php     |   18 +
 .../doctrine/tests/models/MyUserOneThing.php  |   19 +
 .../tests/models/MyUserOtherThing.php         |   19 +
 .../doctrine/tests/models/MysqlGroup.php      |   17 +
 .../tests/models/MysqlGroupMember.php         |   10 +
 .../tests/models/MysqlIndexTestRecord.php     |   17 +
 .../doctrine/tests/models/MysqlTestRecord.php |   11 +
 .../doctrine/tests/models/MysqlUser.php       |   17 +
 .../doctrine/tests/models/NestReference.php   |    9 +
 .../vendor/doctrine/tests/models/NestTest.php |   22 +
 .../models/NestedSetTest_SingleRootNode.php   |    9 +
 .../tests/models/NestedSet_MultiRootNode.php  |   10 +
 .../NestedSet_Timestampable_MultiRootNode.php |   10 +
 .../doctrine/tests/models/NotNullTest.php     |    7 +
 .../tests/models/ORM_AccessControl.php        |   14 +
 .../tests/models/ORM_AccessControlsGroups.php |    9 +
 .../doctrine/tests/models/ORM_AccessGroup.php |   14 +
 .../doctrine/tests/models/ORM_TestEntry.php   |   17 +
 .../doctrine/tests/models/ORM_TestItem.php    |   15 +
 .../vendor/doctrine/tests/models/Package.php  |   11 +
 .../doctrine/tests/models/PackageVersion.php  |   14 +
 .../tests/models/PackageVersionNotes.php      |   15 +
 .../lib/vendor/doctrine/tests/models/Page.php |   17 +
 .../doctrine/tests/models/Phonenumber.php     |   23 +
 .../vendor/doctrine/tests/models/Photo.php    |   13 +
 .../vendor/doctrine/tests/models/Phototag.php |    7 +
 .../tests/models/PluginSymfonyRecord.php      |   15 +
 .../tests/models/PluginSymfonyRecordTable.php |    5 +
 .../vendor/doctrine/tests/models/Policy.php   |   15 +
 .../doctrine/tests/models/PolicyAsset.php     |   16 +
 .../doctrine/tests/models/PolicyCodeN.php     |   11 +
 .../vendor/doctrine/tests/models/PolicyN.php  |   16 +
 .../doctrine/tests/models/QueryTest_Board.php |   32 +
 .../tests/models/QueryTest_Category.php       |   43 +
 .../doctrine/tests/models/QueryTest_Entry.php |   25 +
 .../doctrine/tests/models/QueryTest_Item.php  |   10 +
 .../doctrine/tests/models/QueryTest_Rank.php  |   23 +
 .../tests/models/QueryTest_Subscription.php   |    9 +
 .../doctrine/tests/models/QueryTest_User.php  |   30 +
 .../tests/models/QueryTest_UserRank.php       |    9 +
 .../lib/vendor/doctrine/tests/models/RTC1.php |   10 +
 .../lib/vendor/doctrine/tests/models/RTC2.php |   10 +
 .../lib/vendor/doctrine/tests/models/RTC3.php |   11 +
 .../lib/vendor/doctrine/tests/models/RTC4.php |   10 +
 .../vendor/doctrine/tests/models/RateN.php    |   20 +
 .../lib/vendor/doctrine/tests/models/Rec1.php |   15 +
 .../lib/vendor/doctrine/tests/models/Rec2.php |   15 +
 .../tests/models/RecordFilterTest.php         |   16 +
 .../doctrine/tests/models/RecordHookTest.php  |   46 +
 .../doctrine/tests/models/Record_City.php     |   18 +
 .../doctrine/tests/models/Record_Country.php  |   14 +
 .../doctrine/tests/models/Record_District.php |    6 +
 .../doctrine/tests/models/RelationTest.php    |   25 +
 .../vendor/doctrine/tests/models/Resource.php |   14 +
 .../tests/models/ResourceReference.php        |    8 +
 .../doctrine/tests/models/ResourceType.php    |   12 +
 .../lib/vendor/doctrine/tests/models/Role.php |   13 +
 .../doctrine/tests/models/SearchTest.php      |   16 +
 .../doctrine/tests/models/SelfRefTest.php     |   14 +
 .../doctrine/tests/models/SequenceRecord.php  |    8 +
 .../doctrine/tests/models/SerializeTest.php   |   31 +
 .../tests/models/SoftDeleteBCTest.php         |   16 +
 .../doctrine/tests/models/SoftDeleteTest.php  |   14 +
 .../lib/vendor/doctrine/tests/models/Song.php |   16 +
 .../doctrine/tests/models/SymfonyRecord.php   |   16 +
 .../tests/models/SymfonyRecordTable.php       |    7 +
 .../lib/vendor/doctrine/tests/models/Tag.php  |   13 +
 .../lib/vendor/doctrine/tests/models/Task.php |   13 +
 .../doctrine/tests/models/TestError.php       |   13 +
 .../doctrine/tests/models/TestMovie.php       |   27 +
 .../tests/models/TestMovieUserBookmark.php    |   10 +
 .../tests/models/TestMovieUserVote.php        |    9 +
 .../doctrine/tests/models/TestRecord.php      |    8 +
 .../vendor/doctrine/tests/models/TestUser.php |   21 +
 .../vendor/doctrine/tests/models/TreeLeaf.php |   20 +
 .../tests/models/UnderscoreColumn.php         |    9 +
 .../lib/vendor/doctrine/tests/models/User.php |   54 +
 .../doctrine/tests/models/ValidatorTest.php   |   15 +
 .../models/ValidatorTest_AddressModel.php     |   18 +
 .../models/ValidatorTest_ClientModel.php      |   15 +
 .../ValidatorTest_ClientToAddressModel.php    |   19 +
 .../tests/models/ValidatorTest_DateModel.php  |    7 +
 .../models/ValidatorTest_FootballPlayer.php   |    8 +
 .../tests/models/ValidatorTest_Person.php     |   13 +
 .../doctrine/tests/models/VersioningTest.php  |   42 +
 .../doctrine/tests/models/ZeroValueTest.php   |   19 +
 .../tests/models/export/Cms_Category.php      |   21 +
 .../models/export/Cms_CategoryLanguages.php   |   21 +
 .../doctrine/tests/models/gnatEmail.php       |   10 +
 .../vendor/doctrine/tests/models/gnatUser.php |   19 +
 .../doctrine/tests/models/mmrGroupUser_B.php  |    9 +
 .../doctrine/tests/models/mmrGroupUser_C.php  |   10 +
 .../doctrine/tests/models/mmrGroup_B.php      |   14 +
 .../doctrine/tests/models/mmrGroup_C.php      |   15 +
 .../doctrine/tests/models/mmrUser_B.php       |   18 +
 .../doctrine/tests/models/mmrUser_C.php       |   19 +
 .../001_mysql_add_table.php                   |   14 +
 .../002_mysql_change_column.php               |   13 +
 .../lib/vendor/doctrine/tests/run.php         |  320 +
 .../lib/vendor/doctrine/tests/schema.xml      |    2 +
 .../lib/vendor/doctrine/tests/schema.yml      |  216 +
 .../lib/vendor/doctrine/tests/template.tpl    |   35 +
 .../doctrine/tests/tmp/Ticket_1527_User.php   |   16 +
 .../tmp/generated/BaseTicket_1527_User.php    |   40 +
 .../lib/vendor/doctrine/tests/unsolved.php    |   38 +
 .../vendor/doctrine/tools/sandbox/config.php  |   59 +
 .../vendor/doctrine/tools/sandbox/doctrine    |    4 +
 .../doctrine/tools/sandbox/doctrine.php       |   21 +
 .../vendor/doctrine/tools/sandbox/index.php   |    5 +
 .../sfWidgetFormDoctrineArrayChoice.class.php |   85 +
 .../sfWidgetFormDoctrineChoice.class.php      |    2 +-
 .../actions/actions.class.php                 |    2 +-
 .../my_articles/actions/actions.class.php     |    2 +-
 ...y_articlesGeneratorConfiguration.class.php |    2 +-
 .../lib/my_articlesGeneratorHelper.class.php  |    2 +-
 .../articles/actions/actions.class.php        |    2 +-
 .../attachment/actions/actions.class.php      |    2 +-
 .../config/ProjectConfiguration.class.php     |   25 +-
 .../fixtures/data/linked_schema.yml           |    0
 .../doctrine/ArticleFormFilter.class.php      |    2 +-
 .../ArticleTranslationFormFilter.class.php    |    2 +-
 .../doctrine/AttachmentFormFilter.class.php   |    2 +-
 .../doctrine/AuthorFormFilter.class.php       |    2 +-
 ...horInheritanceConcreteFormFilter.class.php |    2 +-
 .../AuthorInheritanceFormFilter.class.php     |    2 +-
 .../doctrine/BaseFormFilterDoctrine.class.php |    2 +-
 .../doctrine/BlogArticleFormFilter.class.php  |    2 +-
 ...BlogArticleTranslationFormFilter.class.php |    2 +-
 .../doctrine/BlogAuthorFormFilter.class.php   |    2 +-
 .../doctrine/CamelCaseFormFilter.class.php    |    2 +-
 .../DefaultValueTestFormFilter.class.php      |    2 +-
 .../FormGeneratorTest2FormFilter.class.php    |    2 +-
 .../filter/doctrine/GroupFormFilter.class.php |    2 +-
 .../doctrine/PermissionFormFilter.class.php   |    2 +-
 .../doctrine/ProfileFormFilter.class.php      |    2 +-
 .../doctrine/ResourceTypeFormFilter.class.php |    2 +-
 .../SettingFormFilter.class.php               |    2 +-
 .../doctrine/SubscriptionFormFilter.class.php |    2 +-
 .../doctrine/UniqueTestFormFilter.class.php   |    2 +-
 .../filter/doctrine/UserFormFilter.class.php  |    2 +-
 .../fixtures/lib/form/BaseForm.class.php      |    2 +-
 .../lib/form/doctrine/ArticleForm.class.php   |    2 +-
 .../doctrine/ArticleTranslationForm.class.php |    2 +-
 .../form/doctrine/AttachmentForm.class.php    |    2 +-
 .../lib/form/doctrine/AuthorForm.class.php    |    2 +-
 .../AuthorInheritanceConcreteForm.class.php   |    2 +-
 .../doctrine/AuthorInheritanceForm.class.php  |    2 +-
 .../form/doctrine/BaseFormDoctrine.class.php  |    2 +-
 .../form/doctrine/BlogArticleForm.class.php   |    2 +-
 .../BlogArticleTranslationForm.class.php      |    2 +-
 .../form/doctrine/BlogAuthorForm.class.php    |    2 +-
 .../lib/form/doctrine/CamelCaseForm.class.php |    2 +-
 .../doctrine/DefaultValueTestForm.class.php   |    2 +-
 .../doctrine/FormGeneratorTestForm.class.php  |    2 +-
 .../lib/form/doctrine/GroupForm.class.php     |    2 +-
 .../form/doctrine/PermissionForm.class.php    |    2 +-
 .../lib/form/doctrine/ProfileForm.class.php   |    2 +-
 .../form/doctrine/ResourceTypeForm.class.php  |    2 +-
 .../SettingsPlugin/SettingForm.class.php      |    2 +-
 .../form/doctrine/SubscriptionForm.class.php  |    2 +-
 .../form/doctrine/UniqueTestForm.class.php    |    2 +-
 .../lib/form/doctrine/UserForm.class.php      |    2 +-
 .../lib/model/doctrine/Attachment.class.php   |    2 +-
 .../doctrine/AuthorInheritance.class.php      |    2 +-
 .../AuthorInheritanceConcrete.class.php       |    2 +-
 .../lib/model/doctrine/AuthorTable.class.php  |   19 +-
 .../lib/model/doctrine/BlogArticle.class.php  |    2 +-
 .../lib/model/doctrine/BlogAuthor.class.php   |    2 +-
 .../lib/model/doctrine/CamelCase.class.php    |    2 +-
 .../model/doctrine/DefaultValueTest.class.php |    2 +-
 .../doctrine/FormGeneratorTest.class.php      |    2 +-
 .../doctrine/FormGeneratorTest2.class.php     |    2 +-
 .../doctrine/ModelFromLinkedSchema.class.php  |    2 +-
 .../lib/model/doctrine/ResourceType.class.php |    2 +-
 .../doctrine/SettingsPlugin/Setting.class.php |    2 +-
 .../PluginSettingFormFilter.class.php         |    2 +-
 .../form/doctrine/PluginSettingForm.class.php |    2 +-
 .../model/doctrine/PluginSetting.class.php    |    2 +-
 .../test/functional/sfDoctrineRecordTest.php  |   13 +-
 .../test/unit/autoloaderTest.php              |   15 -
 .../sfWidgetFormDoctrineArrayChoiceTest.php   |   18 +
 .../widget/sfWidgetFormDoctrineChoiceTest.php |   28 +
 .../sfDoctrinePlugin/web/images/asc.png       |  Bin
 .../sfDoctrinePlugin/web/images/default.png   |  Bin
 .../sfDoctrinePlugin/web/images/delete.png    |  Bin
 .../sfDoctrinePlugin/web/images/desc.png      |  Bin
 .../sfDoctrinePlugin/web/images/edit.png      |  Bin
 .../sfDoctrinePlugin/web/images/error.png     |  Bin
 .../sfDoctrinePlugin/web/images/first.png     |  Bin
 .../sfDoctrinePlugin/web/images/last.png      |  Bin
 .../sfDoctrinePlugin/web/images/list.png      |  Bin
 .../sfDoctrinePlugin/web/images/new.png       |  Bin
 .../sfDoctrinePlugin/web/images/next.png      |  Bin
 .../sfDoctrinePlugin/web/images/previous.png  |  Bin
 .../sfDoctrinePlugin/web/images/tick.png      |  Bin
 .../symfony/lib/request/sfRequest.class.php   |   25 +-
 .../lib/request/sfWebRequest.class.php        |  182 +-
 .../symfony/lib/response/sfResponse.class.php |    2 +-
 .../lib/response/sfWebResponse.class.php      |   64 +-
 .../lib/routing/sfObjectRoute.class.php       |    2 +-
 .../routing/sfObjectRouteCollection.class.php |    6 +-
 .../lib/routing/sfPatternRouting.class.php    |  100 +-
 .../lib/routing/sfRequestRoute.class.php      |    2 +-
 .../symfony/lib/routing/sfRoute.class.php     |    9 +-
 .../lib/routing/sfRouteCollection.class.php   |    2 +-
 .../symfony/lib/routing/sfRouting.class.php   |   11 +-
 .../lib/service/sfServiceContainer.class.php  |  223 +
 .../sfServiceContainerBuilder.class.php       |  338 ++
 .../sfServiceContainerDumper.class.php        |   44 +
 ...sfServiceContainerDumperGraphviz.class.php |  230 +
 ...fServiceContainerDumperInterface.class.php |   22 +
 .../sfServiceContainerDumperPhp.class.php     |  356 ++
 .../sfServiceContainerInterface.class.php     |   38 +
 .../sfServiceContainerLoader.class.php        |  112 +
 .../sfServiceContainerLoaderArray.class.php   |  133 +
 ...fServiceContainerLoaderInterface.class.php |   22 +
 .../lib/service/sfServiceDefinition.class.php |  242 +
 .../lib/service/sfServiceParameter.class.php  |   43 +
 .../lib/service/sfServiceReference.class.php  |   43 +
 .../storage/sfCacheSessionStorage.class.php   |   50 +-
 .../sfDatabaseSessionStorage.class.php        |   17 +-
 .../storage/sfMySQLSessionStorage.class.php   |    2 +-
 .../storage/sfMySQLiSessionStorage.class.php  |    2 +-
 .../symfony/lib/storage/sfNoStorage.class.php |    2 +-
 .../lib/storage/sfPDOSessionStorage.class.php |    4 +-
 .../sfPostgreSQLSessionStorage.class.php      |    2 +-
 .../lib/storage/sfSessionStorage.class.php    |    2 +-
 .../storage/sfSessionTestStorage.class.php    |   13 +-
 .../symfony/lib/storage/sfStorage.class.php   |    2 +-
 .../lib/task/app/sfAppRoutesTask.class.php    |    2 +-
 .../lib/task/cache/sfCacheClearTask.class.php |   21 +-
 .../configure/sfConfigureAuthorTask.class.php |    2 +-
 .../generator/sfGenerateAppTask.class.php     |    8 +-
 .../generator/sfGenerateModuleTask.class.php  |    6 +-
 .../generator/sfGenerateProjectTask.class.php |   21 +-
 .../generator/sfGeneratorBaseTask.class.php   |    2 +-
 .../task/generator/skeleton/app/web/index.php |    2 +-
 .../module/module/actions/actions.class.php   |   12 +-
 .../skeleton/module/test/actionsTest.php      |    2 +-
 .../project/lib/form/BaseForm.class.php       |    2 +-
 .../task/generator/skeleton/project/symfony   |    4 +-
 .../project/test/bootstrap/functional.php     |    2 +-
 .../skeleton/project/test/bootstrap/unit.php  |    4 +-
 .../lib/task/help/sfHelpTask.class.php        |    2 +-
 .../lib/task/help/sfListTask.class.php        |    8 +-
 .../lib/task/i18n/sfI18nExtractTask.class.php |   15 +-
 .../lib/task/i18n/sfI18nFindTask.class.php    |    2 +-
 .../lib/task/log/sfLogClearTask.class.php     |    2 +-
 .../lib/task/log/sfLogRotateTask.class.php    |    2 +-
 .../plugin/sfPluginAddChannelTask.class.php   |    4 +-
 .../task/plugin/sfPluginBaseTask.class.php    |    2 +-
 .../task/plugin/sfPluginInstallTask.class.php |    4 +-
 .../task/plugin/sfPluginListTask.class.php    |    8 +-
 .../sfPluginPublishAssetsTask.class.php       |   22 +-
 .../plugin/sfPluginUninstallTask.class.php    |    4 +-
 .../task/plugin/sfPluginUpgradeTask.class.php |    4 +-
 .../sfProjectClearControllersTask.class.php   |    2 +-
 .../project/sfProjectDeployTask.class.php     |   10 +-
 .../project/sfProjectDisableTask.class.php    |    2 +-
 .../project/sfProjectEnableTask.class.php     |    2 +-
 .../project/sfProjectOptimizeTask.class.php   |   22 +-
 .../sfProjectPermissionsTask.class.php        |    2 +-
 .../project/sfProjectSendEmailsTask.class.php |    2 +-
 .../project/sfProjectValidateTask.class.php   |    4 +-
 .../sfDeprecatedClassesValidation.class.php   |    2 +-
 ...atedConfigurationFilesValidation.class.php |    2 +-
 .../sfDeprecatedHelpersValidation.class.php   |    2 +-
 .../sfDeprecatedMethodsValidation.class.php   |    2 +-
 .../sfDeprecatedPluginsValidation.class.php   |    2 +-
 .../sfDeprecatedSettingsValidation.class.php  |    2 +-
 .../sfParameterHolderValidation.class.php     |    2 +-
 .../project/validation/sfValidation.class.php |    2 +-
 .../symfony/lib/task/sfBaseTask.class.php     |  168 +-
 .../task/sfCommandApplicationTask.class.php   |   92 +-
 .../symfony/lib/task/sfFilesystem.class.php   |   14 +-
 lib/vendor/symfony/lib/task/sfTask.class.php  |   29 +-
 .../symfony/lib/task/symfony/lime_symfony.php |    2 +-
 .../task/symfony/sfSymfonyTestTask.class.php  |   20 +-
 .../lib/task/test/sfLimeHarness.class.php     |   17 +-
 .../lib/task/test/sfTestAllTask.class.php     |   13 +-
 .../lib/task/test/sfTestBaseTask.class.php    |   32 +-
 .../task/test/sfTestCoverageTask.class.php    |    4 +-
 .../task/test/sfTestFunctionalTask.class.php  |    6 +-
 .../lib/task/test/sfTestPluginTask.class.php  |   75 +
 .../lib/task/test/sfTestUnitTask.class.php    |    9 +-
 .../symfony/lib/test/sfTestBrowser.class.php  |    4 +-
 .../lib/test/sfTestFunctional.class.php       |    2 +-
 .../lib/test/sfTestFunctionalBase.class.php   |    4 +-
 .../symfony/lib/test/sfTester.class.php       |    2 +-
 .../symfony/lib/test/sfTesterForm.class.php   |   18 +-
 .../symfony/lib/test/sfTesterMailer.class.php |    2 +-
 .../lib/test/sfTesterRequest.class.php        |    2 +-
 .../lib/test/sfTesterResponse.class.php       |    4 +-
 .../symfony/lib/test/sfTesterUser.class.php   |    2 +-
 .../lib/test/sfTesterViewCache.class.php      |    2 +-
 .../lib/user/sfBasicSecurityUser.class.php    |    2 +-
 .../symfony/lib/user/sfSecurityUser.class.php |    2 +-
 lib/vendor/symfony/lib/user/sfUser.class.php  |    2 +-
 .../symfony/lib/util/sfBrowser.class.php      |    2 +-
 .../symfony/lib/util/sfBrowserBase.class.php  |   21 +-
 .../symfony/lib/util/sfCallable.class.php     |    2 +-
 .../lib/util/sfClassManipulator.class.php     |    2 +-
 .../symfony/lib/util/sfContext.class.php      |  164 +-
 .../lib/util/sfDomCssSelector.class.php       |    6 +-
 .../symfony/lib/util/sfFinder.class.php       |    8 +-
 .../symfony/lib/util/sfInflector.class.php    |    7 +-
 .../sfNamespacedParameterHolder.class.php     |    2 +-
 .../lib/util/sfParameterHolder.class.php      |    2 +-
 .../symfony/lib/util/sfToolkit.class.php      |   19 +-
 .../sfValidatorI18nChoiceCountry.class.php    |    2 +-
 .../sfValidatorI18nChoiceLanguage.class.php   |    2 +-
 .../sfValidatorI18nChoiceTimezone.class.php   |    2 +-
 .../lib/validator/sfValidatedFile.class.php   |   21 +-
 .../lib/validator/sfValidatorAnd.class.php    |   12 +-
 .../lib/validator/sfValidatorBase.class.php   |    6 +-
 .../validator/sfValidatorBoolean.class.php    |    2 +-
 .../validator/sfValidatorCSRFToken.class.php  |    2 +-
 .../validator/sfValidatorCallback.class.php   |    2 +-
 .../lib/validator/sfValidatorChoice.class.php |   40 +-
 .../lib/validator/sfValidatorDate.class.php   |   26 +-
 .../validator/sfValidatorDateRange.class.php  |    2 +-
 .../validator/sfValidatorDateTime.class.php   |    2 +-
 .../validator/sfValidatorDecorator.class.php  |    2 +-
 .../lib/validator/sfValidatorEmail.class.php  |    2 +-
 .../lib/validator/sfValidatorEqual.class.php  |   65 +
 .../lib/validator/sfValidatorError.class.php  |    2 +-
 .../sfValidatorErrorSchema.class.php          |   78 +-
 .../lib/validator/sfValidatorFile.class.php   |   48 +-
 .../validator/sfValidatorFileMulti.class.php  |   20 +
 .../sfValidatorFromDescription.class.php      |    2 +-
 .../validator/sfValidatorInteger.class.php    |    6 +-
 .../lib/validator/sfValidatorIp.class.php     |  111 +
 .../lib/validator/sfValidatorNumber.class.php |    4 +-
 .../lib/validator/sfValidatorOr.class.php     |   10 +-
 .../lib/validator/sfValidatorPass.class.php   |    2 +-
 .../lib/validator/sfValidatorRegex.class.php  |    2 +-
 .../lib/validator/sfValidatorSchema.class.php |   45 +-
 .../sfValidatorSchemaCompare.class.php        |    7 +-
 .../sfValidatorSchemaFilter.class.php         |   12 +-
 .../sfValidatorSchemaForEach.class.php        |   49 -
 .../lib/validator/sfValidatorString.class.php |    2 +-
 .../lib/validator/sfValidatorTime.class.php   |   12 +-
 .../lib/validator/sfValidatorUrl.class.php    |    2 +-
 lib/vendor/symfony/lib/vendor/lime/lime.php   |   59 +-
 .../lib/vendor/swiftmailer/.gitattributes     |    9 +
 .../symfony/lib/vendor/swiftmailer/.gitignore |    4 +
 .../lib/vendor/swiftmailer/.travis.yml        |   27 +
 .../symfony/lib/vendor/swiftmailer/CHANGES    |  230 +
 .../{ => lib/vendor/swiftmailer}/LICENSE      |    2 +-
 .../symfony/lib/vendor/swiftmailer/README     |   15 +
 .../symfony/lib/vendor/swiftmailer/VERSION    |    1 +
 .../lib/vendor/swiftmailer/classes/Swift.php  |   57 -
 .../swiftmailer/classes/Swift/Attachment.php  |   75 -
 .../AbstractFilterableInputStream.php         |  178 -
 .../Swift/ByteStream/ArrayByteStream.php      |  190 -
 .../Swift/ByteStream/FileByteStream.php       |  177 -
 .../classes/Swift/CharacterReader.php         |   60 -
 .../GenericFixedWidthReader.php               |   96 -
 .../Swift/CharacterReader/UsAsciiReader.php   |   83 -
 .../Swift/CharacterReader/Utf8Reader.php      |  183 -
 .../SimpleCharacterReaderFactory.php          |  119 -
 .../classes/Swift/CharacterStream.php         |   86 -
 .../CharacterStream/ArrayCharacterStream.php  |  319 -
 .../CharacterStream/NgCharacterStream.php     |  300 -
 .../classes/Swift/ConfigurableSpool.php       |   59 -
 .../classes/Swift/DependencyContainer.php     |  349 --
 .../classes/Swift/EmbeddedFile.php            |   73 -
 .../swiftmailer/classes/Swift/Encoder.php     |   32 -
 .../classes/Swift/Encoder/Base64Encoder.php   |   63 -
 .../classes/Swift/Encoder/QpEncoder.php       |  263 -
 .../classes/Swift/Encoder/Rfc2231Encoder.php  |   89 -
 .../swiftmailer/classes/Swift/Encoding.php    |   70 -
 .../classes/Swift/Events/CommandEvent.php     |   67 -
 .../classes/Swift/Events/Event.php            |   39 -
 .../classes/Swift/Events/EventDispatcher.php  |   81 -
 .../classes/Swift/Events/EventObject.php      |   65 -
 .../classes/Swift/Events/ResponseEvent.php    |   65 -
 .../classes/Swift/Events/SendEvent.php        |  127 -
 .../classes/Swift/Events/SendListener.php     |   35 -
 .../Swift/Events/SimpleEventDispatcher.php    |  175 -
 .../Swift/Events/TransportChangeListener.php  |   53 -
 .../Swift/Events/TransportExceptionEvent.php  |   50 -
 .../Events/TransportExceptionListener.php     |   30 -
 .../classes/Swift/FailoverTransport.php       |   48 -
 .../swiftmailer/classes/Swift/FileSpool.php   |  116 -
 .../swiftmailer/classes/Swift/Filterable.php  |   34 -
 .../swiftmailer/classes/Swift/Image.php       |   62 -
 .../classes/Swift/InputByteStream.php         |   72 -
 .../swiftmailer/classes/Swift/KeyCache.php    |   99 -
 .../classes/Swift/KeyCache/ArrayKeyCache.php  |  209 -
 .../classes/Swift/KeyCache/DiskKeyCache.php   |  316 -
 .../Swift/KeyCache/KeyCacheInputStream.php    |   53 -
 .../classes/Swift/KeyCache/NullKeyCache.php   |  110 -
 .../KeyCache/SimpleKeyCacheInputStream.php    |  131 -
 .../classes/Swift/LoadBalancedTransport.php   |   48 -
 .../classes/Swift/MailTransport.php           |   48 -
 .../swiftmailer/classes/Swift/Mailer.php      |  173 -
 .../Swift/Mailer/ArrayRecipientIterator.php   |   59 -
 .../Swift/Mailer/RecipientIterator.php        |   34 -
 .../swiftmailer/classes/Swift/Message.php     |   87 -
 .../classes/Swift/Mime/Attachment.php         |  143 -
 .../classes/Swift/Mime/ContentEncoder.php     |   41 -
 .../ContentEncoder/Base64ContentEncoder.php   |   81 -
 .../ContentEncoder/PlainContentEncoder.php    |  175 -
 .../Mime/ContentEncoder/QpContentEncoder.php  |  117 -
 .../classes/Swift/Mime/EmbeddedFile.php       |   51 -
 .../swiftmailer/classes/Swift/Mime/Header.php |   85 -
 .../HeaderEncoder/Base64HeaderEncoder.php     |   36 -
 .../Mime/HeaderEncoder/QpHeaderEncoder.php    |   99 -
 .../classes/Swift/Mime/HeaderFactory.php      |   72 -
 .../classes/Swift/Mime/HeaderSet.php          |  170 -
 .../Swift/Mime/Headers/AbstractHeader.php     |  596 --
 .../classes/Swift/Mime/Headers/DateHeader.php |  118 -
 .../Mime/Headers/IdentificationHeader.php     |  161 -
 .../Swift/Mime/Headers/MailboxHeader.php      |  316 -
 .../Mime/Headers/ParameterizedHeader.php      |  274 -
 .../classes/Swift/Mime/Headers/PathHeader.php |  126 -
 .../Swift/Mime/Headers/UnstructuredHeader.php |  108 -
 .../classes/Swift/Mime/Message.php            |  230 -
 .../classes/Swift/Mime/MimeEntity.php         |  108 -
 .../classes/Swift/Mime/MimePart.php           |  196 -
 .../Swift/Mime/SimpleHeaderFactory.php        |  187 -
 .../classes/Swift/Mime/SimpleHeaderSet.php    |  396 --
 .../classes/Swift/Mime/SimpleMessage.php      |  609 --
 .../classes/Swift/Mime/SimpleMimeEntity.php   |  793 ---
 .../swiftmailer/classes/Swift/MimePart.php    |   65 -
 .../classes/Swift/NullTransport.php           |   38 -
 .../classes/Swift/OutputByteStream.php        |   41 -
 .../classes/Swift/Plugins/AntiFloodPlugin.php |  147 -
 .../Swift/Plugins/BandwidthMonitorPlugin.php  |  173 -
 .../classes/Swift/Plugins/BlackholePlugin.php |   37 -
 .../Swift/Plugins/Decorator/Replacements.php  |   36 -
 .../classes/Swift/Plugins/DecoratorPlugin.php |  201 -
 .../classes/Swift/Plugins/LoggerPlugin.php    |  160 -
 .../Swift/Plugins/Loggers/ArrayLogger.php     |   73 -
 .../Swift/Plugins/Loggers/EchoLogger.php      |   64 -
 .../Swift/Plugins/Pop/Pop3Connection.php      |   36 -
 .../Swift/Plugins/PopBeforeSmtpPlugin.php     |  288 -
 .../Swift/Plugins/RedirectingPlugin.php       |  109 -
 .../classes/Swift/Plugins/Reporter.php        |   36 -
 .../classes/Swift/Plugins/ReporterPlugin.php  |   82 -
 .../Swift/Plugins/Reporters/HitReporter.php   |   63 -
 .../Swift/Plugins/Reporters/HtmlReporter.php  |   47 -
 .../classes/Swift/Plugins/ThrottlerPlugin.php |  188 -
 .../swiftmailer/classes/Swift/Preferences.php |   76 -
 .../classes/Swift/SendmailTransport.php       |   48 -
 .../classes/Swift/SmtpTransport.php           |   56 -
 .../swiftmailer/classes/Swift/Spool.php       |   50 -
 .../classes/Swift/SpoolTransport.php          |   44 -
 .../classes/Swift/StreamFilter.php            |   33 -
 .../ByteArrayReplacementFilter.php            |  188 -
 .../StreamFilters/StringReplacementFilter.php |   66 -
 .../StringReplacementFilterFactory.php        |   53 -
 .../classes/Swift/SwiftException.php          |   28 -
 .../swiftmailer/classes/Swift/Transport.php   |   60 -
 .../Swift/Transport/AbstractSmtpTransport.php |  543 --
 .../Esmtp/Auth/CramMd5Authenticator.php       |   88 -
 .../Esmtp/Auth/LoginAuthenticator.php         |   58 -
 .../Esmtp/Auth/PlainAuthenticator.php         |   57 -
 .../Swift/Transport/Esmtp/AuthHandler.php     |  262 -
 .../Swift/Transport/Esmtp/Authenticator.php   |   38 -
 .../classes/Swift/Transport/EsmtpHandler.php  |   82 -
 .../Swift/Transport/EsmtpTransport.php        |  339 --
 .../Swift/Transport/FailoverTransport.php     |   97 -
 .../classes/Swift/Transport/IoBuffer.php      |   65 -
 .../Swift/Transport/LoadBalancedTransport.php |  188 -
 .../classes/Swift/Transport/MailInvoker.php   |   36 -
 .../classes/Swift/Transport/MailTransport.php |  242 -
 .../classes/Swift/Transport/NullTransport.php |   90 -
 .../Swift/Transport/SendmailTransport.php     |  173 -
 .../Swift/Transport/SimpleMailInvoker.php     |   58 -
 .../classes/Swift/Transport/SmtpAgent.php     |   36 -
 .../Swift/Transport/SpoolTransport.php        |  115 -
 .../classes/Swift/Transport/StreamBuffer.php  |  276 -
 .../lib/vendor/swiftmailer/composer.json      |   36 +
 .../dependency_maps/cache_deps.php            |   25 -
 .../swiftmailer/dependency_maps/mime_deps.php |   97 -
 .../dependency_maps/transport_deps.php        |   70 -
 .../lib/vendor/swiftmailer/doc/headers.rst    |  742 +++
 .../vendor/swiftmailer/doc/help-resources.rst |   44 +
 .../swiftmailer/doc/including-the-files.rst   |   46 +
 .../lib/vendor/swiftmailer/doc/index.rst      |   16 +
 .../lib/vendor/swiftmailer/doc/installing.rst |   89 +
 .../vendor/swiftmailer/doc/introduction.rst   |  135 +
 .../lib/vendor/swiftmailer/doc/japanese.rst   |   22 +
 .../lib/vendor/swiftmailer/doc/messages.rst   | 1057 ++++
 .../lib/vendor/swiftmailer/doc/overview.rst   |  161 +
 .../lib/vendor/swiftmailer/doc/plugins.rst    |  385 ++
 .../lib/vendor/swiftmailer/doc/sending.rst    |  607 ++
 .../swiftmailer/doc/uml/Encoders.graffle      |  Bin 0 -> 3503 bytes
 .../vendor/swiftmailer/doc/uml/Mime.graffle   |  Bin 0 -> 5575 bytes
 .../swiftmailer/doc/uml/Transports.graffle    |  Bin 0 -> 3061 bytes
 .../vendor/swiftmailer/lib/classes/Swift.php  |   80 +
 .../lib/classes/Swift/Attachment.php          |   71 +
 .../AbstractFilterableInputStream.php         |  181 +
 .../Swift/ByteStream/ArrayByteStream.php      |  182 +
 .../Swift/ByteStream/FileByteStream.php       |  231 +
 .../ByteStream/TemporaryFileByteStream.php    |   42 +
 .../lib/classes/Swift/CharacterReader.php     |   67 +
 .../GenericFixedWidthReader.php               |   97 +
 .../Swift/CharacterReader/UsAsciiReader.php   |   84 +
 .../Swift/CharacterReader/Utf8Reader.php      |  176 +
 .../classes/Swift/CharacterReaderFactory.php  |   21 +-
 .../SimpleCharacterReaderFactory.php          |  124 +
 .../lib/classes/Swift/CharacterStream.php     |   89 +
 .../CharacterStream/ArrayCharacterStream.php  |  293 +
 .../CharacterStream/NgCharacterStream.php     |  267 +
 .../lib/classes/Swift/ConfigurableSpool.php   |   63 +
 .../lib/classes/Swift/DependencyContainer.php |  373 ++
 .../classes/Swift/DependencyException.php     |   25 +-
 .../lib/classes/Swift/EmbeddedFile.php        |   69 +
 .../swiftmailer/lib/classes/Swift/Encoder.php |   28 +
 .../classes/Swift/Encoder/Base64Encoder.php   |   58 +
 .../lib/classes/Swift/Encoder/QpEncoder.php   |  300 +
 .../classes/Swift/Encoder/Rfc2231Encoder.php  |   92 +
 .../lib/classes/Swift/Encoding.php            |   64 +
 .../lib/classes/Swift/Events/CommandEvent.php |   65 +
 .../classes/Swift/Events/CommandListener.php  |   19 +-
 .../lib/classes/Swift/Events/Event.php        |   38 +
 .../classes/Swift/Events/EventDispatcher.php  |   83 +
 .../classes/Swift/Events/EventListener.php    |    5 +-
 .../lib/classes/Swift/Events/EventObject.php  |   63 +
 .../classes/Swift/Events/ResponseEvent.php    |   65 +
 .../classes/Swift/Events/ResponseListener.php |   19 +-
 .../lib/classes/Swift/Events/SendEvent.php    |  129 +
 .../lib/classes/Swift/Events/SendListener.php |   31 +
 .../Swift/Events/SimpleEventDispatcher.php    |  156 +
 .../Swift/Events/TransportChangeEvent.php     |   26 +-
 .../Swift/Events/TransportChangeListener.php  |   45 +
 .../Swift/Events/TransportExceptionEvent.php  |   46 +
 .../Events/TransportExceptionListener.php     |   24 +
 .../lib/classes/Swift/FailoverTransport.php   |   45 +
 .../lib/classes/Swift/FileSpool.php           |  208 +
 .../{ => lib}/classes/Swift/FileStream.php    |   18 +-
 .../lib/classes/Swift/Filterable.php          |   32 +
 .../swiftmailer/lib/classes/Swift/Image.php   |   61 +
 .../lib/classes/Swift/InputByteStream.php     |   75 +
 .../{ => lib}/classes/Swift/IoException.php   |   25 +-
 .../lib/classes/Swift/KeyCache.php            |  105 +
 .../classes/Swift/KeyCache/ArrayKeyCache.php  |  206 +
 .../classes/Swift/KeyCache/DiskKeyCache.php   |  321 +
 .../Swift/KeyCache/KeyCacheInputStream.php    |   51 +
 .../classes/Swift/KeyCache/NullKeyCache.php   |  115 +
 .../KeyCache/SimpleKeyCacheInputStream.php    |  127 +
 .../classes/Swift/LoadBalancedTransport.php   |   45 +
 .../lib/classes/Swift/MailTransport.php       |   45 +
 .../swiftmailer/lib/classes/Swift/Mailer.php  |  114 +
 .../Swift/Mailer/ArrayRecipientIterator.php   |   55 +
 .../Swift/Mailer/RecipientIterator.php        |   32 +
 .../lib/classes/Swift/MemorySpool.php         |  110 +
 .../swiftmailer/lib/classes/Swift/Message.php |  291 +
 .../lib/classes/Swift/Mime/Attachment.php     |  149 +
 .../classes/Swift/Mime/CharsetObserver.php    |   16 +-
 .../lib/classes/Swift/Mime/ContentEncoder.php |   34 +
 .../ContentEncoder/Base64ContentEncoder.php   |  104 +
 .../ContentEncoder/NativeQpContentEncoder.php |  123 +
 .../ContentEncoder/PlainContentEncoder.php    |  162 +
 .../Mime/ContentEncoder/QpContentEncoder.php  |  134 +
 .../ContentEncoder/QpContentEncoderProxy.php  |   98 +
 .../Mime/ContentEncoder/RawContentEncoder.php |   64 +
 .../lib/classes/Swift/Mime/EmbeddedFile.php   |   45 +
 .../classes/Swift/Mime/EncodingObserver.php   |   18 +-
 .../lib/classes/Swift/Mime/Grammar.php        |  176 +
 .../lib/classes/Swift/Mime/Header.php         |   93 +
 .../classes/Swift/Mime/HeaderEncoder.php      |   18 +-
 .../HeaderEncoder/Base64HeaderEncoder.php     |   55 +
 .../Mime/HeaderEncoder/QpHeaderEncoder.php    |   65 +
 .../lib/classes/Swift/Mime/HeaderFactory.php  |   78 +
 .../lib/classes/Swift/Mime/HeaderSet.php      |  169 +
 .../Swift/Mime/Headers/AbstractHeader.php     |  503 ++
 .../classes/Swift/Mime/Headers/DateHeader.php |  125 +
 .../Mime/Headers/IdentificationHeader.php     |  180 +
 .../Swift/Mime/Headers/MailboxHeader.php      |  353 ++
 .../Swift/Mime/Headers/OpenDKIMHeader.php     |  137 +
 .../Mime/Headers/ParameterizedHeader.php      |  258 +
 .../classes/Swift/Mime/Headers/PathHeader.php |  143 +
 .../Swift/Mime/Headers/UnstructuredHeader.php |  112 +
 .../lib/classes/Swift/Mime/Message.php        |  223 +
 .../lib/classes/Swift/Mime/MimeEntity.php     |  117 +
 .../lib/classes/Swift/Mime/MimePart.php       |  212 +
 .../Swift/Mime/ParameterizedHeader.php        |   35 +-
 .../Swift/Mime/SimpleHeaderFactory.php        |  193 +
 .../classes/Swift/Mime/SimpleHeaderSet.php    |  414 ++
 .../lib/classes/Swift/Mime/SimpleMessage.php  |  649 ++
 .../classes/Swift/Mime/SimpleMimeEntity.php   |  843 +++
 .../lib/classes/Swift/MimePart.php            |   59 +
 .../lib/classes/Swift/NullTransport.php       |   39 +
 .../lib/classes/Swift/OutputByteStream.php    |   46 +
 .../classes/Swift/Plugins/AntiFloodPlugin.php |  141 +
 .../Swift/Plugins/BandwidthMonitorPlugin.php  |  164 +
 .../Swift/Plugins/Decorator/Replacements.php  |   31 +
 .../classes/Swift/Plugins/DecoratorPlugin.php |  204 +
 .../Swift/Plugins/ImpersonatePlugin.php       |   69 +
 .../classes/Swift/Plugins/Logger.php          |   39 +-
 .../classes/Swift/Plugins/LoggerPlugin.php    |  142 +
 .../Swift/Plugins/Loggers/ArrayLogger.php     |   72 +
 .../Swift/Plugins/Loggers/EchoLogger.php      |   58 +
 .../classes/Swift/Plugins/MessageLogger.php   |   74 +
 .../Swift/Plugins/Pop/Pop3Connection.php      |   31 +
 .../Swift/Plugins/Pop/Pop3Exception.php       |   27 +-
 .../Swift/Plugins/PopBeforeSmtpPlugin.php     |  273 +
 .../Swift/Plugins/RedirectingPlugin.php       |  213 +
 .../lib/classes/Swift/Plugins/Reporter.php    |   32 +
 .../classes/Swift/Plugins/ReporterPlugin.php  |   61 +
 .../Swift/Plugins/Reporters/HitReporter.php   |   59 +
 .../Swift/Plugins/Reporters/HtmlReporter.php  |   39 +
 .../classes/Swift/Plugins/Sleeper.php         |   16 +-
 .../classes/Swift/Plugins/ThrottlerPlugin.php |  200 +
 .../{ => lib}/classes/Swift/Plugins/Timer.php |   16 +-
 .../lib/classes/Swift/Preferences.php         |  103 +
 .../Swift/ReplacementFilterFactory.php        |   20 +-
 .../classes/Swift/RfcComplianceException.php  |   23 +-
 .../lib/classes/Swift/SendmailTransport.php   |   45 +
 .../lib/classes/Swift/SignedMessage.php       |   23 +
 .../swiftmailer/lib/classes/Swift/Signer.php  |   20 +
 .../lib/classes/Swift/Signers/BodySigner.php  |   33 +
 .../lib/classes/Swift/Signers/DKIMSigner.php  |  698 +++
 .../classes/Swift/Signers/DomainKeySigner.php |  525 ++
 .../classes/Swift/Signers/HeaderSigner.php    |   65 +
 .../classes/Swift/Signers/OpenDKIMSigner.php  |  190 +
 .../lib/classes/Swift/Signers/SMimeSigner.php |  436 ++
 .../lib/classes/Swift/SmtpTransport.php       |   58 +
 .../swiftmailer/lib/classes/Swift/Spool.php   |   53 +
 .../lib/classes/Swift/SpoolTransport.php      |   47 +
 .../lib/classes/Swift/StreamFilter.php        |   35 +
 .../ByteArrayReplacementFilter.php            |  169 +
 .../StreamFilters/StringReplacementFilter.php |   66 +
 .../StringReplacementFilterFactory.php        |   45 +
 .../lib/classes/Swift/SwiftException.php      |   29 +
 .../lib/classes/Swift/Transport.php           |   54 +
 .../Swift/Transport/AbstractSmtpTransport.php |  496 ++
 .../Esmtp/Auth/CramMd5Authenticator.php       |   81 +
 .../Esmtp/Auth/LoginAuthenticator.php         |   51 +
 .../Esmtp/Auth/NTLMAuthenticator.php          |  720 +++
 .../Esmtp/Auth/PlainAuthenticator.php         |   50 +
 .../Esmtp/Auth/XOAuth2Authenticator.php       |   70 +
 .../Swift/Transport/Esmtp/AuthHandler.php     |  263 +
 .../Swift/Transport/Esmtp/Authenticator.php   |   35 +
 .../classes/Swift/Transport/EsmtpHandler.php  |   86 +
 .../Swift/Transport/EsmtpTransport.php        |  413 ++
 .../Swift/Transport/FailoverTransport.php     |   88 +
 .../lib/classes/Swift/Transport/IoBuffer.php  |   67 +
 .../Swift/Transport/LoadBalancedTransport.php |  183 +
 .../classes/Swift/Transport/MailInvoker.php   |   32 +
 .../classes/Swift/Transport/MailTransport.php |  257 +
 .../classes/Swift/Transport/NullTransport.php |   93 +
 .../Swift/Transport/SendmailTransport.php     |  160 +
 .../Swift/Transport/SimpleMailInvoker.php     |   39 +
 .../lib/classes/Swift/Transport/SmtpAgent.php |   36 +
 .../Swift/Transport/SpoolTransport.php        |  117 +
 .../classes/Swift/Transport/StreamBuffer.php  |  325 +
 .../classes/Swift/TransportException.php      |   26 +-
 .../lib/classes/Swift/Validate.php            |   43 +
 .../lib/dependency_maps/cache_deps.php        |   23 +
 .../lib/dependency_maps/message_deps.php      |    9 +
 .../lib/dependency_maps/mime_deps.php         |  123 +
 .../lib/dependency_maps/transport_deps.php    |   76 +
 .../lib/vendor/swiftmailer/lib/mime_types.php | 1007 ++++
 .../swiftmailer/{ => lib}/preferences.php     |   23 +-
 .../lib/vendor/swiftmailer/lib/swift_init.php |   28 +
 .../vendor/swiftmailer/lib/swift_required.php |   30 +
 .../swiftmailer/lib/swift_required_pear.php   |   30 +
 .../lib/swiftmailer_generate_mimes_config.php |  193 +
 .../lib/vendor/swiftmailer/mime_types.php     |   76 -
 .../symfony/lib/vendor/swiftmailer/notes/APPS |   15 +
 .../lib/vendor/swiftmailer/notes/CHARSETS     |   46 +
 .../lib/vendor/swiftmailer/notes/message.xml  |   22 +
 .../vendor/swiftmailer/notes/rfc/rfc0821.txt  | 4050 +++++++++++++
 .../vendor/swiftmailer/notes/rfc/rfc0822.txt  | 2901 +++++++++
 .../vendor/swiftmailer/notes/rfc/rfc1341.txt  | 5265 +++++++++++++++++
 .../vendor/swiftmailer/notes/rfc/rfc1521.txt  | 4539 ++++++++++++++
 .../vendor/swiftmailer/notes/rfc/rfc1854.txt  |  395 ++
 .../vendor/swiftmailer/notes/rfc/rfc2015.txt  |  450 ++
 .../vendor/swiftmailer/notes/rfc/rfc2045.txt  | 1739 ++++++
 .../vendor/swiftmailer/notes/rfc/rfc2046.txt  | 2467 ++++++++
 .../vendor/swiftmailer/notes/rfc/rfc2047.txt  |  843 +++
 .../vendor/swiftmailer/notes/rfc/rfc2048.txt  | 1180 ++++
 .../vendor/swiftmailer/notes/rfc/rfc2049.txt  | 1347 +++++
 .../vendor/swiftmailer/notes/rfc/rfc2183.txt  |  675 +++
 .../vendor/swiftmailer/notes/rfc/rfc2222.txt  |  899 +++
 .../vendor/swiftmailer/notes/rfc/rfc2231.txt  |  563 ++
 .../vendor/swiftmailer/notes/rfc/rfc2234.txt  |  787 +++
 .../vendor/swiftmailer/notes/rfc/rfc2440.txt  | 3642 ++++++++++++
 .../vendor/swiftmailer/notes/rfc/rfc2487.txt  |  451 ++
 .../vendor/swiftmailer/notes/rfc/rfc2554.txt  |  619 ++
 .../vendor/swiftmailer/notes/rfc/rfc2821.txt  | 4427 ++++++++++++++
 .../vendor/swiftmailer/notes/rfc/rfc2822.txt  | 2859 +++++++++
 .../vendor/swiftmailer/notes/rfc/rfc3156.txt  |  842 +++
 .../vendor/swiftmailer/notes/rfc/rfc3676.txt  | 1123 ++++
 .../vendor/swiftmailer/notes/rfc/rfc4505.txt  |  507 ++
 .../vendor/swiftmailer/notes/rfc/rfc4616.txt  |  619 ++
 .../vendor/swiftmailer/notes/rfc/rfc4870.txt  | 2298 +++++++
 .../vendor/swiftmailer/notes/rfc/rfc4871.txt  | 3978 +++++++++++++
 .../vendor/swiftmailer/notes/rfc/rfc4880.txt  | 5042 ++++++++++++++++
 .../vendor/swiftmailer/notes/rfc/rfc4954.txt  | 1123 ++++
 .../vendor/swiftmailer/notes/rfc/rfc5751.txt  | 2523 ++++++++
 .../swiftmailer/notes/rfc/whats_where.txt     |   90 +
 .../lib/vendor/swiftmailer/notes/smtp.txt     |   48 +
 .../lib/vendor/swiftmailer/phpunit.xml.dist   |   37 +
 .../lib/vendor/swiftmailer/swift_init.php     |   21 -
 .../lib/vendor/swiftmailer/swift_required.php |   22 -
 .../swiftmailer/swift_required_pear.php       |   22 -
 .../tests/IdenticalBinaryConstraint.php       |   62 +
 .../swiftmailer/tests/StreamCollector.php     |   11 +
 .../tests/SwiftMailerSmokeTestCase.php        |   46 +
 .../swiftmailer/tests/SwiftMailerTestCase.php |   34 +
 .../_samples/charsets/iso-2022-jp/one.txt     |   11 +
 .../_samples/charsets/iso-8859-1/one.txt      |   19 +
 .../tests/_samples/charsets/utf-8/one.txt     |   22 +
 .../tests/_samples/charsets/utf-8/three.txt   |   45 +
 .../tests/_samples/charsets/utf-8/two.txt     |    3 +
 .../tests/_samples/dkim/dkim.test.priv        |   15 +
 .../tests/_samples/dkim/dkim.test.pub         |    6 +
 .../swiftmailer/tests/_samples/files/data.txt |    1 +
 .../tests/_samples/files/swiftmailer.png      |  Bin 0 -> 3194 bytes
 .../tests/_samples/files/textfile.zip         |  Bin 0 -> 202 bytes
 .../swiftmailer/tests/_samples/smime/CA.srl   |    1 +
 .../swiftmailer/tests/_samples/smime/ca.crt   |   21 +
 .../swiftmailer/tests/_samples/smime/ca.key   |   27 +
 .../tests/_samples/smime/create-cert.sh       |   40 +
 .../tests/_samples/smime/encrypt.crt          |   19 +
 .../tests/_samples/smime/encrypt.key          |   27 +
 .../tests/_samples/smime/encrypt2.crt         |   19 +
 .../tests/_samples/smime/encrypt2.key         |   27 +
 .../tests/_samples/smime/intermediate.crt     |   19 +
 .../tests/_samples/smime/intermediate.key     |   27 +
 .../swiftmailer/tests/_samples/smime/sign.crt |   19 +
 .../swiftmailer/tests/_samples/smime/sign.key |   27 +
 .../tests/_samples/smime/sign2.crt            |   19 +
 .../tests/_samples/smime/sign2.key            |   27 +
 .../tests/acceptance.conf.php.default         |   44 +
 .../Swift/AttachmentAcceptanceTest.php        |   12 +
 .../FileByteStreamAcceptanceTest.php          |  174 +
 ...leCharacterReaderFactoryAcceptanceTest.php |  179 +
 .../DependencyContainerAcceptanceTest.php     |   20 +
 .../Swift/EmbeddedFileAcceptanceTest.php      |   12 +
 .../Encoder/Base64EncoderAcceptanceTest.php   |   45 +
 .../Swift/Encoder/QpEncoderAcceptanceTest.php |   54 +
 .../Encoder/Rfc2231EncoderAcceptanceTest.php  |   50 +
 .../Swift/EncodingAcceptanceTest.php          |   30 +
 .../KeyCache/ArrayKeyCacheAcceptanceTest.php  |  173 +
 .../KeyCache/DiskKeyCacheAcceptanceTest.php   |  183 +
 .../Swift/MessageAcceptanceTest.php           |   57 +
 .../Swift/Mime/AttachmentAcceptanceTest.php   |  125 +
 .../Base64ContentEncoderAcceptanceTest.php    |   56 +
 .../NativeQpContentEncoderAcceptanceTest.php  |   88 +
 .../PlainContentEncoderAcceptanceTest.php     |   88 +
 .../QpContentEncoderAcceptanceTest.php        |  160 +
 .../Swift/Mime/EmbeddedFileAcceptanceTest.php |  138 +
 .../Base64HeaderEncoderAcceptanceTest.php     |   32 +
 .../Swift/Mime/MimePartAcceptanceTest.php     |  129 +
 .../Mime/SimpleMessageAcceptanceTest.php      | 1251 ++++
 .../Swift/MimePartAcceptanceTest.php          |   15 +
 .../AbstractStreamBufferAcceptanceTest.php    |  134 +
 .../BasicSocketAcceptanceTest.php             |   34 +
 .../StreamBuffer/ProcessAcceptanceTest.php    |   27 +
 .../StreamBuffer/SocketTimeoutTest.php        |   67 +
 .../StreamBuffer/SslSocketAcceptanceTest.php  |   41 +
 .../StreamBuffer/TlsSocketAcceptanceTest.php  |   40 +
 .../vendor/swiftmailer/tests/bootstrap.php    |   21 +
 .../tests/bug/Swift/Bug111Test.php            |   42 +
 .../tests/bug/Swift/Bug118Test.php            |   20 +
 .../tests/bug/Swift/Bug206Test.php            |   38 +
 .../tests/bug/Swift/Bug274Test.php            |   21 +
 .../swiftmailer/tests/bug/Swift/Bug34Test.php |   75 +
 .../swiftmailer/tests/bug/Swift/Bug35Test.php |   73 +
 .../swiftmailer/tests/bug/Swift/Bug38Test.php |  194 +
 .../tests/bug/Swift/Bug518Test.php            |   38 +
 .../swiftmailer/tests/bug/Swift/Bug51Test.php |  121 +
 .../tests/bug/Swift/Bug534Test.php            |   38 +
 .../tests/bug/Swift/Bug650Test.php            |   36 +
 .../swiftmailer/tests/bug/Swift/Bug71Test.php |   20 +
 .../swiftmailer/tests/bug/Swift/Bug76Test.php |   82 +
 ...FileByteStreamConsecutiveReadCallsTest.php |   19 +
 .../tests/fixtures/MimeEntityFixture.php      |   59 +
 .../swiftmailer/tests/smoke.conf.php.default  |   63 +
 .../smoke/Swift/Smoke/AttachmentSmokeTest.php |   33 +
 .../smoke/Swift/Smoke/BasicSmokeTest.php      |   23 +
 .../Smoke/HtmlWithAttachmentSmokeTest.php     |   31 +
 .../Swift/Smoke/InternationalSmokeTest.php    |   40 +
 .../Swift/ByteStream/ArrayByteStreamTest.php  |  202 +
 .../GenericFixedWidthReaderTest.php           |   43 +
 .../CharacterReader/UsAsciiReaderTest.php     |   52 +
 .../Swift/CharacterReader/Utf8ReaderTest.php  |   65 +
 .../ArrayCharacterStreamTest.php              |  360 ++
 .../unit/Swift/DependencyContainerTest.php    |  174 +
 .../unit/Swift/Encoder/Base64EncoderTest.php  |  173 +
 .../unit/Swift/Encoder/QpEncoderTest.php      |  402 ++
 .../unit/Swift/Encoder/Rfc2231EncoderTest.php |  141 +
 .../unit/Swift/Events/CommandEventTest.php    |   36 +
 .../unit/Swift/Events/EventObjectTest.php     |   34 +
 .../unit/Swift/Events/ResponseEventTest.php   |   40 +
 .../tests/unit/Swift/Events/SendEventTest.php |   99 +
 .../Events/SimpleEventDispatcherTest.php      |  142 +
 .../Swift/Events/TransportChangeEventTest.php |   32 +
 .../Events/TransportExceptionEventTest.php    |   43 +
 .../unit/Swift/KeyCache/ArrayKeyCacheTest.php |  242 +
 .../SimpleKeyCacheInputStreamTest.php         |   73 +
 .../Mailer/ArrayRecipientIteratorTest.php     |   42 +
 .../tests/unit/Swift/MailerTest.php           |  147 +
 .../tests/unit/Swift/MessageTest.php          |  130 +
 .../Swift/Mime/AbstractMimeEntityTest.php     | 1054 ++++
 .../tests/unit/Swift/Mime/AttachmentTest.php  |  320 +
 .../Base64ContentEncoderTest.php              |  323 +
 .../PlainContentEncoderTest.php               |  173 +
 .../ContentEncoder/QpContentEncoderTest.php   |  518 ++
 .../unit/Swift/Mime/EmbeddedFileTest.php      |   57 +
 .../HeaderEncoder/Base64HeaderEncoderTest.php |   13 +
 .../HeaderEncoder/QpHeaderEncoderTest.php     |  223 +
 .../Swift/Mime/Headers/DateHeaderTest.php     |   69 +
 .../Mime/Headers/IdentificationHeaderTest.php |  189 +
 .../Swift/Mime/Headers/MailboxHeaderTest.php  |  327 +
 .../Mime/Headers/ParameterizedHeaderTest.php  |  400 ++
 .../Swift/Mime/Headers/PathHeaderTest.php     |   77 +
 .../Mime/Headers/UnstructuredHeaderTest.php   |  355 ++
 .../tests/unit/Swift/Mime/MimePartTest.php    |  233 +
 .../Swift/Mime/SimpleHeaderFactoryTest.php    |  168 +
 .../unit/Swift/Mime/SimpleHeaderSetTest.php   |  739 +++
 .../unit/Swift/Mime/SimpleMessageTest.php     |  829 +++
 .../unit/Swift/Mime/SimpleMimeEntityTest.php  |   11 +
 .../Swift/Plugins/AntiFloodPluginTest.php     |   95 +
 .../Plugins/BandwidthMonitorPluginTest.php    |  130 +
 .../Swift/Plugins/DecoratorPluginTest.php     |  269 +
 .../unit/Swift/Plugins/LoggerPluginTest.php   |  190 +
 .../Swift/Plugins/Loggers/ArrayLoggerTest.php |   65 +
 .../Swift/Plugins/Loggers/EchoLoggerTest.php  |   24 +
 .../Swift/Plugins/PopBeforeSmtpPluginTest.php |  103 +
 .../Swift/Plugins/RedirectingPluginTest.php   |  185 +
 .../unit/Swift/Plugins/ReporterPluginTest.php |   88 +
 .../Plugins/Reporters/HitReporterTest.php     |   64 +
 .../Plugins/Reporters/HtmlReporterTest.php    |   54 +
 .../Swift/Plugins/ThrottlerPluginTest.php     |  104 +
 .../unit/Swift/Signers/DKIMSignerTest.php     |  227 +
 .../unit/Swift/Signers/OpenDKIMSignerTest.php |   45 +
 .../unit/Swift/Signers/SMimeSignerTest.php    |  554 ++
 .../ByteArrayReplacementFilterTest.php        |  131 +
 .../StringReplacementFilterFactoryTest.php    |   38 +
 .../StringReplacementFilterTest.php           |   55 +
 .../AbstractSmtpEventSupportTest.php          |  560 ++
 .../unit/Swift/Transport/AbstractSmtpTest.php | 1249 ++++
 .../Esmtp/Auth/CramMd5AuthenticatorTest.php   |   66 +
 .../Esmtp/Auth/LoginAuthenticatorTest.php     |   66 +
 .../Esmtp/Auth/NTLMAuthenticatorTest.php      |  235 +
 .../Esmtp/Auth/PlainAuthenticatorTest.php     |   69 +
 .../Swift/Transport/Esmtp/AuthHandlerTest.php |  167 +
 .../EsmtpTransport/ExtensionSupportTest.php   |  528 ++
 .../Swift/Transport/EsmtpTransportTest.php    |  298 +
 .../Swift/Transport/FailoverTransportTest.php |  520 ++
 .../Transport/LoadBalancedTransportTest.php   |  751 +++
 .../Swift/Transport/MailTransportTest.php     |  505 ++
 .../Swift/Transport/SendmailTransportTest.php |  152 +
 .../unit/Swift/Transport/StreamBufferTest.php |   45 +
 .../symfony/lib/view/sfPHPView.class.php      |    2 +-
 .../symfony/lib/view/sfPartialView.class.php  |    2 +-
 lib/vendor/symfony/lib/view/sfView.class.php  |    2 +-
 .../lib/view/sfViewCacheManager.class.php     |    4 +-
 .../lib/view/sfViewParameterHolder.class.php  |    2 +-
 .../sfWidgetFormI18nChoiceCountry.class.php   |    2 +-
 .../sfWidgetFormI18nChoiceCurrency.class.php  |    2 +-
 .../sfWidgetFormI18nChoiceLanguage.class.php  |    2 +-
 .../sfWidgetFormI18nChoiceTimezone.class.php  |    2 +-
 .../i18n/sfWidgetFormI18nDate.class.php       |    2 +-
 .../i18n/sfWidgetFormI18nDateTime.class.php   |    2 +-
 .../i18n/sfWidgetFormI18nTime.class.php       |    2 +-
 .../symfony/lib/widget/sfWidget.class.php     |   15 +-
 .../symfony/lib/widget/sfWidgetForm.class.php |    8 +-
 .../lib/widget/sfWidgetFormChoice.class.php   |    2 +-
 .../lib/widget/sfWidgetFormDate.class.php     |    2 +-
 .../widget/sfWidgetFormDateRange.class.php    |   15 +-
 .../lib/widget/sfWidgetFormDateTime.class.php |    4 +-
 .../widget/sfWidgetFormFilterDate.class.php   |    2 +-
 .../widget/sfWidgetFormFilterInput.class.php  |    2 +-
 .../lib/widget/sfWidgetFormInput.class.php    |    2 +-
 .../sfWidgetFormInputCheckbox.class.php       |    2 +-
 .../widget/sfWidgetFormInputFile.class.php    |    4 +-
 .../sfWidgetFormInputFileEditable.class.php   |    2 +-
 .../sfWidgetFormInputFileMulti.class.php      |   50 +
 .../widget/sfWidgetFormInputHidden.class.php  |    2 +-
 .../sfWidgetFormInputPassword.class.php       |    2 +-
 .../widget/sfWidgetFormInputRead.class.php    |   71 +
 .../widget/sfWidgetFormInputText.class.php    |    2 +-
 .../lib/widget/sfWidgetFormSchema.class.php   |   16 +-
 .../sfWidgetFormSchemaDecorator.class.php     |    2 +-
 .../sfWidgetFormSchemaForEach.class.php       |   36 -
 .../sfWidgetFormSchemaFormatter.class.php     |    4 +-
 .../sfWidgetFormSchemaFormatterList.class.php |    2 +-
 ...sfWidgetFormSchemaFormatterTable.class.php |    2 +-
 .../lib/widget/sfWidgetFormSelect.class.php   |   11 +-
 .../sfWidgetFormSelectCheckbox.class.php      |    4 +-
 .../widget/sfWidgetFormSelectMany.class.php   |    2 +-
 .../widget/sfWidgetFormSelectRadio.class.php  |    4 +-
 .../lib/widget/sfWidgetFormTextarea.class.php |    2 +-
 .../lib/widget/sfWidgetFormTime.class.php     |    2 +-
 .../lib/yaml/{sfYaml.php => sfYaml.class.php} |   60 +-
 ...fYamlDumper.php => sfYamlDumper.class.php} |    2 -
 ...fYamlInline.php => sfYamlInline.class.php} |   31 +-
 ...fYamlParser.php => sfYamlParser.class.php} |   47 +-
 lib/vendor/symfony/package.xml.tmpl           |    8 +-
 lib/vendor/symfony/test/bin/coverage.php      |   38 +-
 lib/vendor/symfony/test/bin/loc.php           |    4 +-
 .../symfony/test/bootstrap/functional.php     |    2 +-
 lib/vendor/symfony/test/bootstrap/task.php    |    2 +-
 lib/vendor/symfony/test/bootstrap/unit.php    |    8 +-
 .../symfony/test/functional/authTest.php      |    2 +-
 .../symfony/test/functional/autoloadTest.php  |    7 +-
 .../symfony/test/functional/cacheTest.php     |    4 +-
 .../symfony/test/functional/escapingTest.php  |    2 +-
 .../symfony/test/functional/filterTest.php    |    2 +-
 .../modules/cache/actions/actions.class.php   |    4 +-
 .../cache/actions/components.class.php        |    2 +-
 .../modules/nocache/actions/actions.class.php |    2 +-
 .../apps/frontend/config/services.yml         |   12 +
 .../fixtures/apps/frontend/config/view.yml    |    3 +
 .../apps/frontend/lib/myAutoload.class.php    |    2 +-
 .../assetInclusion/actions/actions.class.php  |    2 +-
 .../modules/auth/actions/actions.class.php    |    2 +-
 .../autoload/actions/actions.class.php        |    2 +-
 .../modules/browser/actions/actions.class.php |    2 +-
 .../actions/actions.class.php                 |    2 +-
 .../actions/actions.class.php                 |    2 +-
 .../actions/actions.class.php                 |    2 +-
 .../actions/actions.class.php                 |    2 +-
 .../actions/actions.class.php                 |    2 +-
 .../actions/actions.class.php                 |    2 +-
 .../modules/cookie/actions/actions.class.php  |    2 +-
 .../escaping/actions/actions.class.php        |    2 +-
 .../exception/actions/actions.class.php       |    2 +-
 .../modules/filter/actions/actions.class.php  |    2 +-
 .../modules/format/actions/actions.class.php  |    2 +-
 .../notfound/actions/actions.class.php        |    2 +-
 .../presentation/actions/actions.class.php    |    2 +-
 .../renderText/actions/actions.class.php      |    2 +-
 .../modules/view/actions/actions.class.php    |    2 +-
 .../modules/i18n/actions/actions.class.php    |    2 +-
 .../config/ProjectConfiguration.class.php     |    2 +-
 .../functional/fixtures/config/databases.yml  |    5 -
 .../functional/fixtures/config/propel.ini     |   48 -
 .../functional/fixtures/config/services.yml   |    9 +
 .../fixtures/lib/form/BaseForm.class.php      |    2 +-
 .../sfAutoloadPlugin/config/autoload.yml      |    4 +-
 .../sfConfigPlugin/config/services.yml        |    9 +
 .../sfI18NPlugin/actions/actions.class.php    |    2 +-
 .../symfony/test/functional/fixtures/symfony  |    4 +-
 .../symfony/test/functional/formatTest.php    |    2 +-
 .../symfony/test/functional/genericTest.php   |    5 +-
 .../symfony/test/functional/httpcacheTest.php |    2 +-
 .../symfony/test/functional/i18nFormTest.php  |    2 +-
 .../symfony/test/functional/i18nTest.php      |    2 +-
 .../symfony/test/functional/prodTest.php      |    2 +-
 .../test/functional/sfTestBrowserTest.php     |    2 +-
 .../test/other/fixtures/propel/Category.php   |    9 -
 .../test/other/fixtures/propel/databases.yml  |    5 -
 .../test/other/fixtures/propel/propel.ini     |   40 -
 .../test/other/fixtures/propel/schema.yml     |   11 -
 .../test/other/fixtures/task/aTask.class.php  |   12 -
 .../test/other/fixtures/task/zTask.class.php  |   12 -
 .../other/fixtures/test/unit/testTest.php     |    2 +-
 lib/vendor/symfony/test/other/tasksTest.php   |   70 +-
 .../test/unit/action/sfComponentTest.php      |    2 +-
 .../symfony/test/unit/addon/sfPagerTest.php   |    4 +-
 .../test/unit/autoload/sfCoreAutoloadTest.php |    2 +-
 .../unit/autoload/sfSimpleAutoloadTest.php    |    4 +-
 .../test/unit/cache/sfAPCCacheTest.php        |    4 +-
 .../symfony/test/unit/cache/sfCacheTest.php   |    2 +-
 .../unit/cache/sfEAcceleratorCacheTest.php    |    4 +-
 .../test/unit/cache/sfFileCacheTest.php       |    4 +-
 .../test/unit/cache/sfFunctionCacheTest.php   |    4 +-
 .../test/unit/cache/sfMemcacheCacheTest.php   |    6 +-
 .../symfony/test/unit/cache/sfNoCacheTest.php |    2 +-
 .../test/unit/cache/sfSQLiteCacheTest.php     |    4 +-
 .../test/unit/cache/sfXCacheCacheTest.php     |    4 +-
 .../unit/command/sfCommandArgumentSetTest.php |    2 +-
 .../unit/command/sfCommandArgumentTest.php    |    4 +-
 .../unit/command/sfCommandManagerTest.php     |    2 +-
 .../unit/command/sfCommandOptionSetTest.php   |    2 +-
 .../test/unit/command/sfCommandOptionTest.php |    6 +-
 .../sfCompileConfigHandler/simple.yml         |    1 +
 .../root_edit_section.yml                     |    8 +-
 .../root_fields_section.yml                   |    8 +-
 .../root_list_section.yml                     |    8 +-
 .../config/sfCompileConfigHandlerTest.php     |   28 +
 .../test/unit/config/sfConfigHandlerTest.php  |    2 +-
 .../symfony/test/unit/config/sfConfigTest.php |    2 +-
 .../sfDefineEnvironmentConfigHandlerTest.php  |    6 +-
 .../unit/config/sfFilterConfigHandlerTest.php |    4 +-
 .../config/sfGeneratorConfigHandlerTest.php   |    6 +-
 .../unit/config/sfPluginConfigurationTest.php |    4 +-
 .../config/sfProjectConfigurationTest.php     |    8 +-
 .../config/sfSimpleYamlConfigHandlerTest.php  |    4 +-
 .../unit/config/sfViewConfigHandlerTest.php   |    2 +-
 .../unit/config/sfYamlConfigHandlerTest.php   |    2 +-
 .../test/unit/controller/sfControllerTest.php |    2 +-
 .../unit/controller/sfWebControllerTest.php   |    2 +-
 .../test/unit/database/sfDatabaseTest.php     |    2 +-
 .../symfony/test/unit/debug/sfDebugTest.php   |    4 +-
 .../symfony/test/unit/debug/sfTimerTest.php   |    4 +-
 .../test/unit/debug/sfWebDebugTest.php        |    2 +-
 .../sfOutputEscaperArrayDecoratorTest.php     |   16 +-
 .../sfOutputEscaperObjectDecoratorTest.php    |   18 +-
 .../unit/escaper/sfOutputEscaperSafeTest.php  |    6 +-
 .../test/unit/escaper/sfOutputEscaperTest.php |   20 +-
 .../test/unit/event/sfEventDispatcherTest.php |  131 +
 .../symfony/test/unit/event/sfEventTest.php   |   61 +
 .../test/unit/exception/sfExceptionsTest.php  |    2 +-
 .../symfony/test/unit/filter/sfFilterTest.php |    2 +-
 .../unit/form/addon/sfFormSymfonyTest.php     |    2 +-
 .../test/unit/form/sfFormFieldSchemaTest.php  |    2 +-
 .../test/unit/form/sfFormFieldTest.php        |    2 +-
 .../symfony/test/unit/form/sfFormTest.php     |   78 +-
 .../test/unit/generator/sfGeneratorTest.php   |    2 +-
 ...sfModelGeneratorConfigurationFieldTest.php |    2 +-
 .../test/unit/helper/AssetHelperTest.php      |    8 +-
 .../test/unit/helper/DateHelperTest.php       |    8 +-
 .../test/unit/helper/EscapingHelperTest.php   |    6 +-
 .../unit/helper/JavascriptBaseHelperTest.php  |   10 +-
 .../test/unit/helper/NumberHelperTest.php     |    4 +-
 .../test/unit/helper/PartialHelperTest.php    |    6 +-
 .../test/unit/helper/TagHelperTest.php        |    4 +-
 .../test/unit/helper/TextHelperTest.php       |   46 +-
 .../test/unit/helper/UrlHelperTest.php        |    8 +-
 .../symfony/test/unit/i18n/dataTest.php       |    4 +-
 .../unit/i18n/extract/sfI18nExtractTest.php   |    4 +-
 .../i18n/extract/sfI18nPhpExtractorTest.php   |    2 +-
 .../sfI18nYamlGeneratorExtractorTest.php      |    2 +-
 .../sfI18nYamlValidateExtractorTest.php       |    2 +-
 .../test/unit/i18n/sfChoiceFormatTest.php     |    7 +-
 .../test/unit/i18n/sfCultureInfoTest.php      |    2 +-
 .../symfony/test/unit/i18n/sfI18NTest.php     |    8 +-
 .../test/unit/i18n/sfMessageSourceTest.php    |    2 +-
 .../i18n/sfMessageSource_AggregateTest.php    |    6 +-
 .../unit/i18n/sfMessageSource_FileTest.php    |    6 +-
 .../unit/i18n/sfMessageSource_SQLiteTest.php  |   43 +-
 .../unit/i18n/sfMessageSource_XLIFFTest.php   |    4 +-
 .../test/unit/i18n/sfNumberFormatInfoTest.php |    2 +-
 .../test/unit/log/sfAggregateLoggerTest.php   |    4 +-
 .../test/unit/log/sfConsoleLoggerTest.php     |    2 +-
 .../test/unit/log/sfFileLoggerTest.php        |    4 +-
 .../symfony/test/unit/log/sfLoggerTest.php    |    2 +-
 .../test/unit/log/sfLoggerWrapperTest.php     |    2 +-
 .../test/unit/log/sfStreamLoggerTest.php      |    2 +-
 .../symfony/test/unit/log/sfVarLoggerTest.php |    2 +-
 .../test/unit/log/sfWebDebugLoggerTest.php    |    4 +-
 .../symfony/test/unit/mailer/sfMailerTest.php |   12 +-
 .../plugin/sfPearDownloaderTest.class.php     |    2 +-
 .../unit/plugin/sfPearEnvironmentTest.php     |    8 +-
 .../test/unit/plugin/sfPearRestPluginTest.php |    8 +-
 .../test/unit/plugin/sfPearRestTest.class.php |    2 +-
 .../test/unit/plugin/sfPluginManagerTest.php  |   10 +-
 .../unit/plugin/sfPluginTestHelper.class.php  |    4 +-
 .../test/unit/request/sfRequestTest.php       |   19 +-
 .../test/unit/request/sfWebRequestTest.php    |  218 +-
 .../test/unit/response/sfResponseTest.php     |    2 +-
 .../test/unit/response/sfWebResponseTest.php  |   36 +-
 .../routing/fixtures/config_routing.yml.php   |    3 +
 .../routing/sfObjectRouteCollectionTest.php   |    2 +-
 .../test/unit/routing/sfObjectRouteTest.php   |    6 +-
 .../unit/routing/sfPatternRoutingTest.php     |   21 +-
 .../test/unit/routing/sfRequestRouteTest.php  |    2 +-
 .../symfony/test/unit/routing/sfRouteTest.php |    4 +-
 .../fixtures/containers/container10.php       |   11 +
 .../fixtures/containers/container8.php        |   10 +
 .../fixtures/containers/container9.php        |   35 +
 .../service/fixtures/graphviz/services1.dot   |    7 +
 .../fixtures/graphviz/services10-1.dot        |   10 +
 .../service/fixtures/graphviz/services10.dot  |   10 +
 .../service/fixtures/graphviz/services9.dot   |   15 +
 .../service/fixtures/includes/classes.php     |   32 +
 .../unit/service/fixtures/includes/foo.php    |   34 +
 .../unit/service/fixtures/php/services1-1.php |    4 +
 .../unit/service/fixtures/php/services1.php   |    4 +
 .../unit/service/fixtures/php/services8.php   |   27 +
 .../unit/service/fixtures/php/services9.php   |   64 +
 .../unit/service/fixtures/yaml/nonvalid1.yml  |    2 +
 .../unit/service/fixtures/yaml/nonvalid2.yml  |    1 +
 .../unit/service/fixtures/yaml/services1.yml  |    1 +
 .../unit/service/fixtures/yaml/services2.yml  |    9 +
 .../unit/service/fixtures/yaml/services3.yml  |   20 +
 .../service/sfServiceContainerBuilderTest.php |  233 +
 .../sfServiceContainerDumperGraphvizTest.php  |   44 +
 .../sfServiceContainerDumperPhpTest.php       |   50 +
 .../service/sfServiceContainerDumperTest.php  |   29 +
 .../sfServiceContainerLoaderArrayTest.php     |   75 +
 .../service/sfServiceContainerLoaderTest.php  |   79 +
 .../unit/service/sfServiceContainerTest.php   |  142 +
 .../unit/service/sfServiceDefinitionTest.php  |   69 +
 .../unit/service/sfServiceParameterTest.php   |   19 +
 .../unit/service/sfServiceReferenceTest.php   |   19 +
 .../symfony/test/unit/sfNoRouting.class.php   |    8 +
 .../storage/sfCacheSessionStorageTest.php     |    4 +-
 .../test/unit/storage/sfMySQLStorageTest.php  |    2 +-
 .../test/unit/storage/sfMySQLiStorageTest.php |    2 +-
 .../test/unit/storage/sfNoStorageTest.php     |    2 +-
 .../unit/storage/sfPDOSessionStorageTest.php  |    5 +-
 .../unit/storage/sfSessionStorageTest.php     |    4 +-
 .../test/unit/storage/sfStorageTest.php       |    2 +-
 .../unit/task/cache/sfCacheClearTaskTest.php  |    2 +-
 .../symfony/test/unit/task/sfBaseTaskTest.php |   45 +-
 .../test/unit/task/sfFilesystemTest.php       |    2 +-
 .../symfony/test/unit/task/sfTaskTest.php     |   20 +-
 .../test/unit/test/sfTestFunctionalTest.php   |    2 +-
 .../unit/user/sfBasicSecurityUserTest.php     |    2 +-
 .../symfony/test/unit/user/sfUserTest.php     |    2 +-
 .../symfony/test/unit/util/sfBrowserTest.php  |   23 +-
 .../symfony/test/unit/util/sfCallableTest.php |    2 +-
 .../test/unit/util/sfClassManipulatorTest.php |    2 +-
 .../symfony/test/unit/util/sfContextTest.php  |   25 +-
 .../test/unit/util/sfDomCssSelectorTest.php   |    2 +-
 .../symfony/test/unit/util/sfFinderTest.php   |    4 +-
 .../test/unit/util/sfInflectorTest.php        |    2 +-
 .../util/sfNamespacedParameterHolderTest.php  |    2 +-
 .../test/unit/util/sfParameterHolderTest.php  |    2 +-
 .../symfony/test/unit/util/sfToolkitTest.php  |   28 +-
 .../i18n/sfValidatorI18nChoiceCountryTest.php |    2 +-
 .../sfValidatorI18nChoiceLanguageTest.php     |    2 +-
 .../sfValidatorI18nChoiceTimezoneTest.php     |    2 +-
 .../unit/validator/sfValidatorAndTest.php     |    2 +-
 .../unit/validator/sfValidatorBaseTest.php    |    4 +-
 .../unit/validator/sfValidatorBooleanTest.php |    2 +-
 .../validator/sfValidatorCSRFTokenTest.php    |    2 +-
 .../validator/sfValidatorCallbackTest.php     |    2 +-
 .../unit/validator/sfValidatorChoiceTest.php  |   18 +-
 .../validator/sfValidatorDateRangeTest.php    |    2 +-
 .../unit/validator/sfValidatorDateTest.php    |    2 +-
 .../validator/sfValidatorDateTimeTest.php     |    2 +-
 .../validator/sfValidatorDecoratorTest.php    |    2 +-
 .../unit/validator/sfValidatorEmailTest.php   |    2 +-
 .../unit/validator/sfValidatorEqualTest.php   |   83 +
 .../validator/sfValidatorErrorSchemaTest.php  |  100 +-
 .../unit/validator/sfValidatorErrorTest.php   |    2 +-
 .../validator/sfValidatorFileMultiTest.php    |   44 +
 .../unit/validator/sfValidatorFileTest.php    |   18 +-
 .../sfValidatorFromDescriptionTest.php        |    2 +-
 .../unit/validator/sfValidatorIntegerTest.php |    2 +-
 .../test/unit/validator/sfValidatorIpTest.php |  276 +
 .../unit/validator/sfValidatorNumberTest.php  |    2 +-
 .../test/unit/validator/sfValidatorOrTest.php |    2 +-
 .../unit/validator/sfValidatorPassTest.php    |    2 +-
 .../unit/validator/sfValidatorRegexTest.php   |    2 +-
 .../sfValidatorSchemaCompareTest.php          |    2 +-
 .../validator/sfValidatorSchemaFilterTest.php |    2 +-
 .../sfValidatorSchemaForEachTest.php          |   38 -
 .../unit/validator/sfValidatorSchemaTest.php  |   29 +-
 .../unit/validator/sfValidatorStringTest.php  |    2 +-
 .../unit/validator/sfValidatorTimeTest.php    |    2 +-
 .../unit/validator/sfValidatorUrlTest.php     |    2 +-
 .../test/unit/view/sfViewCacheManagerTest.php |    2 +-
 .../unit/view/sfViewParameterHolderTest.php   |    2 +-
 .../symfony/test/unit/view/sfViewTest.php     |    2 +-
 .../sfWidgetFormI18nChoiceCountryTest.php     |    4 +-
 .../sfWidgetFormI18nChoiceCurrencyTest.php    |    2 +-
 .../sfWidgetFormI18nChoiceLanguageTest.php    |    2 +-
 .../sfWidgetFormI18nChoiceTimezoneTest.php    |    2 +-
 .../widget/i18n/sfWidgetFormI18nDateTest.php  |    2 +-
 .../i18n/sfWidgetFormI18nDateTimeTest.php     |    2 +-
 .../widget/i18n/sfWidgetFormI18nTimeTest.php  |    2 +-
 .../unit/widget/sfWidgetFormChoiceTest.php    |    2 +-
 .../unit/widget/sfWidgetFormDateRangeTest.php |    2 +-
 .../test/unit/widget/sfWidgetFormDateTest.php |    2 +-
 .../unit/widget/sfWidgetFormDateTimeTest.php  |    2 +-
 .../widget/sfWidgetFormFilterDateTest.php     |    2 +-
 .../widget/sfWidgetFormFilterInputTest.php    |    2 +-
 .../widget/sfWidgetFormInputCheckboxTest.php  |    2 +-
 .../sfWidgetFormInputFileEditableTest.php     |    2 +-
 .../widget/sfWidgetFormInputFileMultiTest.php |   13 +
 .../unit/widget/sfWidgetFormInputFileTest.php |    2 +-
 .../widget/sfWidgetFormInputHiddenTest.php    |    2 +-
 .../widget/sfWidgetFormInputPasswordTest.php  |    2 +-
 .../unit/widget/sfWidgetFormInputReadTest.php |   28 +
 .../unit/widget/sfWidgetFormInputTextTest.php |    2 +-
 .../sfWidgetFormSchemaDecoratorTest.php       |    2 +-
 .../widget/sfWidgetFormSchemaForEachTest.php  |   26 -
 .../sfWidgetFormSchemaFormatterListTest.php   |    2 +-
 .../sfWidgetFormSchemaFormatterTableTest.php  |    2 +-
 .../sfWidgetFormSchemaFormatterTest.php       |    2 +-
 .../unit/widget/sfWidgetFormSchemaTest.php    |   28 +-
 .../widget/sfWidgetFormSelectCheckboxTest.php |    2 +-
 .../widget/sfWidgetFormSelectManyTest.php     |    2 +-
 .../widget/sfWidgetFormSelectRadioTest.php    |    2 +-
 .../unit/widget/sfWidgetFormSelectTest.php    |    2 +-
 .../test/unit/widget/sfWidgetFormTest.php     |   13 +-
 .../unit/widget/sfWidgetFormTextareaTest.php  |    2 +-
 .../test/unit/widget/sfWidgetFormTimeTest.php |    2 +-
 .../symfony/test/unit/widget/sfWidgetTest.php |    5 +-
 .../unit/yaml/fixtures/YtsAnchorAlias.yml     |   31 +
 .../test/unit/yaml/fixtures/YtsBasicTests.yml |  178 +
 .../unit/yaml/fixtures/YtsBlockMapping.yml    |   52 +
 .../yaml/fixtures/YtsDocumentSeparator.yml    |   85 +
 .../test/unit/yaml/fixtures/YtsErrorTests.yml |   26 +
 .../unit/yaml/fixtures/YtsFlowCollections.yml |   60 +
 .../unit/yaml/fixtures/YtsFoldedScalars.yml   |  176 +
 .../unit/yaml/fixtures/YtsNullsAndEmpties.yml |   45 +
 .../fixtures/YtsSpecificationExamples.yml     | 1681 ++++++
 .../unit/yaml/fixtures/YtsTypeTransfers.yml   |  244 +
 .../symfony/test/unit/yaml/fixtures/index.yml |   15 +
 .../test/unit/yaml/fixtures/sfComments.yml    |   51 +
 .../test/unit/yaml/fixtures/sfMergeKey.yml    |   27 +
 .../test/unit/yaml/fixtures/sfObjects.yml     |   11 +
 .../test/unit/yaml/fixtures/sfQuotes.yml      |   33 +
 .../test/unit/yaml/fixtures/sfTests.yml       |  153 +
 .../test/unit/yaml/sfYamlDumperTest.php       |  149 +
 .../test/unit/yaml/sfYamlInlineTest.php       |  145 +
 .../test/unit/yaml/sfYamlParserTest.php       |   89 +
 2486 files changed, 184198 insertions(+), 19912 deletions(-)
 create mode 100644 lib/vendor/symfony/.editorconfig
 create mode 100644 lib/vendor/symfony/.gitignore
 create mode 100644 lib/vendor/symfony/.gitmodules
 create mode 100644 lib/vendor/symfony/.travis.yml
 rename lib/vendor/symfony/{CHANGELOG => CHANGELOG.md} (74%)
 rename lib/vendor/symfony/{COPYRIGHT => COPYRIGHT.md} (84%)
 create mode 100644 lib/vendor/symfony/LICENSE.md
 delete mode 100644 lib/vendor/symfony/README
 create mode 100644 lib/vendor/symfony/README.md
 create mode 100644 lib/vendor/symfony/UPGRADE.md
 create mode 100644 lib/vendor/symfony/WHATS_NEW.md
 create mode 100755 lib/vendor/symfony/autoload.php
 create mode 100755 lib/vendor/symfony/composer.json
 mode change 100644 => 100755 lib/vendor/symfony/data/web/sf/sf_admin/images/add.png
 mode change 100644 => 100755 lib/vendor/symfony/data/web/sf/sf_admin/images/cancel.png
 mode change 100644 => 100755 lib/vendor/symfony/data/web/sf/sf_admin/images/default_icon.png
 mode change 100644 => 100755 lib/vendor/symfony/data/web/sf/sf_admin/images/delete.png
 mode change 100644 => 100755 lib/vendor/symfony/data/web/sf/sf_admin/images/edit.png
 mode change 100644 => 100755 lib/vendor/symfony/data/web/sf/sf_admin/images/error.png
 mode change 100644 => 100755 lib/vendor/symfony/data/web/sf/sf_admin/images/filter.png
 mode change 100644 => 100755 lib/vendor/symfony/data/web/sf/sf_admin/images/first.png
 mode change 100644 => 100755 lib/vendor/symfony/data/web/sf/sf_admin/images/last.png
 mode change 100644 => 100755 lib/vendor/symfony/data/web/sf/sf_admin/images/list.png
 mode change 100644 => 100755 lib/vendor/symfony/data/web/sf/sf_admin/images/next.png
 mode change 100644 => 100755 lib/vendor/symfony/data/web/sf/sf_admin/images/ok.png
 mode change 100644 => 100755 lib/vendor/symfony/data/web/sf/sf_admin/images/previous.png
 mode change 100644 => 100755 lib/vendor/symfony/data/web/sf/sf_admin/images/reset.png
 mode change 100644 => 100755 lib/vendor/symfony/data/web/sf/sf_admin/images/save.png
 mode change 100644 => 100755 lib/vendor/symfony/data/web/sf/sf_admin/images/tick.png
 mode change 100644 => 100755 lib/vendor/symfony/data/web/sf/sf_web_debug/images/config.png
 mode change 100644 => 100755 lib/vendor/symfony/data/web/sf/sf_web_debug/images/database.png
 mode change 100644 => 100755 lib/vendor/symfony/data/web/sf/sf_web_debug/images/log.png
 mode change 100644 => 100755 lib/vendor/symfony/data/web/sf/sf_web_debug/images/memory.png
 mode change 100644 => 100755 lib/vendor/symfony/data/web/sf/sf_web_debug/images/time.png
 mode change 100644 => 100755 lib/vendor/symfony/lib/autoload/sfCoreAutoload.class.php
 mode change 100644 => 100755 lib/vendor/symfony/lib/autoload/sfSimpleAutoload.class.php
 create mode 100644 lib/vendor/symfony/lib/config/config/services.yml
 mode change 100644 => 100755 lib/vendor/symfony/lib/config/sfAutoloadConfigHandler.class.php
 create mode 100644 lib/vendor/symfony/lib/config/sfServiceConfigHandler.class.php
 rename lib/vendor/symfony/lib/{event_dispatcher/sfEvent.php => event/sfEvent.class.php} (97%)
 rename lib/vendor/symfony/lib/{event_dispatcher/sfEventDispatcher.php => event/sfEventDispatcher.class.php} (97%)
 create mode 100644 lib/vendor/symfony/lib/i18n/sfMessageSource_SQLite3.class.php
 create mode 100644 lib/vendor/symfony/lib/log/sfEventLogger.class.php
 create mode 100644 lib/vendor/symfony/lib/log/sfPsrLoggerAdapter.class.php
 mode change 100644 => 100755 lib/vendor/symfony/lib/mailer/sfMailer.class.php
 create mode 100644 lib/vendor/symfony/lib/mailer/sfNoMailer.class.php
 mode change 100644 => 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/config/sfDoctrinePluginConfiguration.class.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCompileTask.class.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/.gitignore
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/.travis.yml
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/CHANGELOG
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/COPYRIGHT
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/LICENSE
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/UPGRADE_TO_1_2
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/build.properties.dev
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/build.xml
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/composer.json
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Access.php (95%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Adapter/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Adapter/Interface.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Adapter/Mock.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Adapter/Oracle.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Adapter/Statement.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Adapter/Statement/Interface.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Adapter/Statement/Mock.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Adapter/Statement/Oracle.php (98%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/AuditLog.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/AuditLog/Listener.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/AuditLog/Listener/Microtime.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Builder.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Cache/Apc.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Cache/Array.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Cache/Db.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Cache/Driver.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Cache/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Cache/Interface.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Cache/Memcache.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Cache/Xcache.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Cli.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Cli/AnsiColorFormatter.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Cli/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Cli/Formatter.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Collection.php (96%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Collection/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Collection/Iterator.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Collection/Iterator/Expandable.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Collection/Iterator/Normal.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Collection/Iterator/Offset.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Collection/Offset.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Collection/OnDemand.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Column.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Compiler.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Compiler/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Configurable.php (97%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Connection.php (96%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Connection/Common.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Connection/Db2.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Connection/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Connection/Mock.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Connection/Module.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Connection/Mssql.php (63%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Connection/Mssql/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Connection/Mysql.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Connection/Mysql/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Connection/Oracle.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Connection/Oracle/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Connection/Pgsql.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Connection/Pgsql/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Connection/Profiler.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Connection/Profiler/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Connection/Sqlite.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Connection/Sqlite/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Connection/Statement.php (97%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Connection/UnitOfWork.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Core.php (95%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Data.php (85%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Data/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Data/Export.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Data/Import.php (98%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/DataDict.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/DataDict/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/DataDict/Mssql.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/DataDict/Mysql.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/DataDict/Oracle.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/DataDict/Pgsql.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/DataDict/Sqlite.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Event.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/EventListener.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/EventListener/Chain.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/EventListener/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/EventListener/Interface.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Export.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Export/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Export/Mssql.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Export/Mysql.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Export/Oracle.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Export/Pgsql.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Export/Reporter.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Export/Schema.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Export/Sqlite.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Expression.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Expression/Driver.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Expression/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Expression/Mock.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Expression/Mssql.php (79%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Expression/Mysql.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Expression/Oracle.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Expression/Pgsql.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Expression/Sqlite.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/File.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/File/Index.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Formatter.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Hook.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Hook/Equal.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Hook/Integer.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Hook/Parser.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Hook/Parser/Complex.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Hook/WordLike.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Hydrator.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Hydrator/Abstract.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Hydrator/ArrayDriver.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Hydrator/ArrayHierarchyDriver.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Hydrator/ArrayShallowDriver.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Hydrator/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Hydrator/Graph.php (95%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Hydrator/NoneDriver.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Hydrator/RecordDriver.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Hydrator/RecordHierarchyDriver.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Hydrator/ScalarDriver.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Hydrator/SingleScalarDriver.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/I18n.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/I18n/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Import.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Import/Builder.php (98%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Import/Builder/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Import/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Import/Mssql.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Import/Mysql.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Import/Oracle.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Import/Pgsql.php (99%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Import/Schema.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Import/Sqlite.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Inflector.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/IntegrityMapper.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Lib.php (92%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Locator.php (95%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Locator/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Locator/Injectable.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Locking/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Locking/Manager/Pessimistic.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Manager.php (94%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Manager/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Migration.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Migration/Base.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Migration/Builder.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Migration/Diff.php (98%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Migration/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Migration/IrreversibleMigrationException.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Migration/Process.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Node.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Node/AdjacencyList.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Node/AdjacencyList/LevelOrderIterator.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Node/AdjacencyList/PostOrderIterator.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Node/AdjacencyList/PreOrderIterator.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Node/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Node/Interface.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Node/MaterializedPath.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Node/MaterializedPath/LevelOrderIterator.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Node/MaterializedPath/PostOrderIterator.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Node/MaterializedPath/PreOrderIterator.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Node/NestedSet.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Node/NestedSet/LevelOrderIterator.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Node/NestedSet/PostOrderIterator.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Node/NestedSet/PreOrderIterator.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Null.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Overloadable.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Pager.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Pager/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Pager/Layout.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Pager/Range.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Pager/Range/Jumping.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Pager/Range/Sliding.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Parser.php (87%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Parser/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Parser/Json.php (96%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Parser/Serialize.php (92%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Parser/Xml.php (95%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Parser/Yml.php (96%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Parser/sfYaml/sfYaml.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Parser/sfYaml/sfYamlDumper.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Parser/sfYaml/sfYamlInline.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Parser/sfYaml/sfYamlParser.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Query.php (98%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Query/Abstract.php (98%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Query/Check.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Query/Condition.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Query/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Query/Filter.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Query/Filter/Chain.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Query/Filter/Interface.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Query/Forupdate.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Query/From.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Query/Groupby.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Query/Having.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Query/JoinCondition.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Query/Limit.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Query/Offset.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Query/Orderby.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Query/Parser.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Query/Part.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Query/Registry.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Query/Registry/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Query/Select.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Query/Set.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Query/Tokenizer.php (98%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Query/Tokenizer/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Query/Where.php (98%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/RawSql.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/RawSql/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Record.php (99%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Record/Abstract.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Record/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Record/Filter.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Record/Filter/Compound.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Record/Filter/Standard.php (99%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Record/Generator.php (97%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Record/Iterator.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Record/Listener.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Record/Listener/Chain.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Record/Listener/Interface.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Record/State/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Record/UnknownPropertyException.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Relation.php (99%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Relation/Association.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Relation/Association/Self.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Relation/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Relation/ForeignKey.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Relation/LocalKey.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Relation/Nest.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Relation/Parser.php (97%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Relation/Parser/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Search.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Search/Analyzer.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Search/Analyzer/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Search/Analyzer/Interface.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Search/Analyzer/Standard.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Search/Analyzer/Utf8.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Search/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Search/File.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Search/Indexer.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Search/Indexer/Dir.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Search/Indexer/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Search/Listener.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Search/Parser.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Search/Query.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Search/Record.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Sequence.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Sequence/Db2.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Sequence/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Sequence/Mssql.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Sequence/Mysql.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Sequence/Oracle.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Sequence/Pgsql.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Sequence/Sqlite.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Table.php (91%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Table/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Table/Repository.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Table/Repository/Exception.php (100%)
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Table/Repository/None.php
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Task.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Task/BuildAll.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Task/BuildAllLoad.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Task/BuildAllReload.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Task/Compile.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Task/CreateDb.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Task/CreateTables.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Task/Dql.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Task/DropDb.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Task/DumpData.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Task/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Task/GenerateMigration.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Task/GenerateMigrationsDb.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Task/GenerateMigrationsDiff.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Task/GenerateMigrationsModels.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Task/GenerateModelsDb.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Task/GenerateModelsYaml.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Task/GenerateSql.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Task/GenerateYamlDb.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Task/GenerateYamlModels.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Task/LoadData.php (89%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Task/Migrate.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Task/RebuildDb.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Template.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Template/Geographical.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Template/I18n.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Template/Listener/Sluggable.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Template/Listener/SoftDelete.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Template/Listener/Timestampable.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Template/NestedSet.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Template/Searchable.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Template/Sluggable.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Template/SoftDelete.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Template/Timestampable.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Template/Versionable.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Transaction.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Transaction/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Transaction/Mock.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Transaction/Mssql.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Transaction/Mysql.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Transaction/Oracle.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Transaction/Pgsql.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Transaction/Sqlite.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Tree.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Tree/AdjacencyList.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Tree/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Tree/Interface.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Tree/MaterializedPath.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Tree/NestedSet.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Util.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Validator.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Validator/Country.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Validator/Creditcard.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Validator/Date.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Validator/Driver.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Validator/Email.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Validator/ErrorStack.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Validator/Exception.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Validator/Future.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Validator/Htmlcolor.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Validator/Ip.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Validator/Minlength.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Validator/Nospace.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Validator/Notblank.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Validator/Notnull.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Validator/Past.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Validator/Range.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Validator/Readonly.php (100%)
 mode change 100644 => 100755
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Validator/Regexp.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Validator/Time.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Validator/Timestamp.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Validator/Unique.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Validator/Unsigned.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/Validator/Usstate.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/View.php (100%)
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{ => lib}/Doctrine/View/Exception.php (100%)
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/package.xml
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/AccessTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/AuditLogTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/BaseTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/BatchIteratorTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/AbstractTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/ApcTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/ArrayTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/DbTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/MemcacheTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/Query/SqliteTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/QuerySqliteTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/SqliteTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/XcacheTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CacheSqliteTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ClassTableInheritanceTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/CustomDoctrineStyleTask.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/TaskDeclaredInAnIncFile.inc.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/TestTask02.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/baz.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/bip.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/cli-default.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/cli-with-custom-tasks.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/cli-without-autoregistered-custom-tasks.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/doctrine.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/foo.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/testLoadtasksLoadsDoctrineStyleTasksFromTheSpecifiedDirectory/DoctrineStyleTask.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/testLoadtasksLoadsDoctrineStyleTasksFromTheSpecifiedDirectory/EmptyFile.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/testLoadtasksLoadsDoctrineStyleTasksFromTheSpecifiedDirectory/InvalidClassNameForATask.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/testLoadtasksLoadsDoctrineStyleTasksFromTheSpecifiedDirectory/TaskDeclaredInAnIncFile.inc.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/testLoadtasksLoadsDoctrineStyleTasksFromTheSpecifiedDirectory/should-be-ignored.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Collection/SnapshotTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CollectionOffsetTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CollectionTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ColumnAggregationInheritanceTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ColumnAliasTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CompositePrimaryKeyTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ConcreteInheritanceTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ConfigurableTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/CustomTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/MssqlTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/MysqlTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/OracleTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/PgsqlTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/ProfilerTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/SqliteTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/UnitOfWork.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ConnectionTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ConnectionTransactionTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CtiColumnAggregationInheritanceTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CustomPrimaryKeyTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CustomResultSetOrderTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DBTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Data/ExportTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Data/ImportTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDict/MssqlTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDict/MysqlTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDict/OracleTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDict/PgsqlTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDict/SqliteTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDictSqliteTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDictTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataType/BooleanTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataType/EnumTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Db/ProfilerTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DbProfilerTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/Coverage.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/Doctrine_UnitTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/GroupTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/Reporter.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/Reporter/Cli.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/Reporter/Html.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/UnitTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DriverTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/EventListener/ChainTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/EventListenerTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/CheckConstraintTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/MssqlTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/MysqlTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/OracleTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/PgsqlTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/RecordTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/SchemaTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/SqliteTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ExportTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Expression/DriverTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Expression/MssqlTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Expression/MysqlTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Expression/OracleTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Expression/PgsqlTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Expression/SqliteTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ExpressionTestCase.php
 create mode 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Extension/TestExtension/lib/Doctrine/Template/TestBehavior.php
 create mode 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Extension/TestExtension/lib/Doctrine/Test.php
 create mode 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ExtensionTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ForeignKeyTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/HookTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Hydrate/CollectionInitializationTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Hydrate/DriverTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Hydrate/FetchModeTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Hydrate/PerformanceTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Hydrate/ScalarTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/HydrateTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/I18nTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/BuilderTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/MssqlTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/MysqlTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/OracleTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/PgsqlTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/PluginHierarchyTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/SchemaTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/SqliteTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ImportTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/IntegrityActionTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ManagerTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Migration/BaseTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Migration/Diff/schema/from.yml
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Migration/Diff/schema/to.yml
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Migration/DiffTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/MigrationTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ModelLoadingTest/Aggressive/Models.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ModelLoadingTest/Aggressive/MoreModels.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ModelLoadingTest/Conservative/BaseConservativeModelLoadingUser.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ModelLoadingTest/Conservative/ConservativeModelLoadingContact.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ModelLoadingTest/Conservative/ConservativeModelLoadingProfile.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ModelLoadingTest/Conservative/ConservativeModelLoadingUser.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/NestedSet/HydrationTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/NestedSet/MultiRootTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/NestedSet/SingleRootTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/NestedSet/TimestampableMultiRootTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/NewCoreTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/OneTableOneClassInheritanceTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ParserTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/PessimisticLockingTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/PluginTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/AggregateValueTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/ApplyInheritanceTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/CacheTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/CheckTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/ComponentAliasTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/ConditionTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/CopyTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/DeleteTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/DriverTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/ExpressionTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/FromTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/GroupbyTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/HavingTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/HydrateNoneTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/IdentifierQuotingTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/JoinConditionTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/JoinTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/LimitTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/MultiJoin2TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/MultiJoinTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/MultipleAggregateValueTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/MysqlSubqueryHavingTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/MysqlSubqueryTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/OneToOneFetchingTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/OrderbyTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/PgsqlSubqueryTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/ReferenceModelTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/RegistryTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/RemoveQueryPartTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/SelectExpressionTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/SelectTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/ShortAliasesTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/SubqueryTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/UpdateTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/WhereTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/QueryTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/RawSqlTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/CascadingDeleteTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/FilterTestCase.php
 create mode 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/FromArrayTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/GeneratorTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/HookTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/InheritanceTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/LockTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/SaveBlankRecordTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/SerializeUnserializeTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/StateTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/SynchronizeTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/ZeroValuesTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/RecordFilterTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/RecordTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/AccessTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/CircularSavingTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/ColumnAliasesTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/ManyToMany2TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/ManyToManyTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/NestTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/OneToManyTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/OneToOneTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/OrderByTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/ParserTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/RelationTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/RepositoryTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Search/FileTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Search/IndexerTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Search/QueryTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Search/QueryWeightTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Search/_files/content.html
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Search/_files/content.txt
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/SearchTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Sequence/MssqlTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Sequence/MysqlTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Sequence/OracleTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Sequence/PgsqlTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Sequence/SqliteTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/SequenceTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/SluggableTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/SoftDeleteBCTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/SoftDeleteTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Table/NamedQueryTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Table/RemoveColumnTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TableTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TaskTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TaskTestCase/TestTask004.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TaskTestCase/TestTask005.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TaskTestCase/TestTask006.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TemplateTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1015TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1028TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1044TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1071TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1072TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1077TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1099TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1106TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1113TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1116TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1118TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1121TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1123TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1124TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1125TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1131TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1133TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1134TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1160TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1175TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1192TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1195TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1205TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1206TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1208TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1211TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1213TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1225TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1228TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1230TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1236TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1244TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1250TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1251TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1253TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1254TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1257TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1276TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1277TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1280TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1281TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1289TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1296TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1304TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1305TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1307TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1315TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1323TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1323b2TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1325TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1326TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1335TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1338TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1341TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1351TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1365TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1372TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1380TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1381TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1383TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1385TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1390TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1395TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1400TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1417TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1419TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1436TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1441TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1449TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1452TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1454TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1461TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1464TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1465TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1467TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1480TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1483TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1488TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1494TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1500TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1507TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1513TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1520TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1522TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1523TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1524TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1527TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1537TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1540TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1543TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1545TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1558TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1562TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1567TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1604TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1617TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1617_schema.yml
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1619TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1621TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1621bTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1622TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1623TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1628TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1629TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1630TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1636TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1641TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1652TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1653TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1658TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1674TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1703TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1706TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1713TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1716TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1725TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1727/models1/Ticket_1727_Model1.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1727/models1/Ticket_1727_Model2.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1727/models2/Ticket_1727_Model3.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1727/models2/Ticket_1727_Model4.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1727TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1729TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1745TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1762TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1763TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1764TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1768TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1783TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1793TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1795TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1799TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1808TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1818TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1821TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1824TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1830TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1841TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1843TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1858TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1860TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1865TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1875TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1876TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1876bTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1923TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1935TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1940TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1958TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1986TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1991TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1992TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2007TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2015TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2032TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2105TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2123TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2158TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2159TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2160TestCase.php
 rename lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/{Doctrine.php => tests/Ticket/2184TestCase.php} (76%)
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2190TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2204TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2229TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2251TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2292TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2295TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2298TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2334TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2355TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2367TestCase.php
 create mode 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2375/models1/Ticket_2375_Model1.php
 create mode 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2375/models1/Ticket_2375_Model2.php
 create mode 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2375/models2/Ticket_2375_Model3.php
 create mode 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2375/models2/Ticket_2375_Model4.php
 create mode 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2375/models2/Ticket_2375_Model5.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2375TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2377TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2398TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/255TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/381TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/384TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/424BTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/424CTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/428TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/438TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/480TestCase.php
 create mode 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/486TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/565TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/574TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/576TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/583TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/587TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/626BTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/626CTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/626DTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/632TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/638TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/642TestCase.php
 create mode 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/668TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/673TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/697TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/736TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/741TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/749TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/753TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/7745TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/786TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/832TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/838TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/867TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/876TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/889TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/894TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/904TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/912TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/915TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/923TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/927TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/929TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/930TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/932TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/935TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/941TestCase.php
 create mode 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/950TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/952TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/963TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/966TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/969TestCase.php
 create mode 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/973TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/982TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/987TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/990TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/AyoubTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC101TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC112TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC136TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC141TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC147TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC14TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC169TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC171TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC187TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC198TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC217TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC221/TestMigration.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC221TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC236TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC238TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC23TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC23bTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC240TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC241TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC242TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC24TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC25TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC266TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC267TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC276TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC28TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC292/from.yml
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC292/to.yml
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC292TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC300TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC302TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC317TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC36TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC399TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC39TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC437TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC521TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC56TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC57TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC63TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC64TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC69TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC709TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC74TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC794TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC7TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC825TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC828TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC82TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC840TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC841TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC843TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC848TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC86TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC879TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC95/schema.yml
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC95TestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/NewTicketTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/NjeroTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TokenizerTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Transaction/MssqlTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Transaction/MysqlTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Transaction/OracleTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Transaction/PgsqlTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Transaction/SqliteTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TransactionTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TreeStructureTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/UnitOfWorkTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/UnsortedTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Validator/ForeignKeysTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Validator/FutureTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Validator/PastTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ValidatorTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ValueHolderTestCase.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ViewTestCase.php
 create mode 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/bootstrap.php
 create mode 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/index.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/10_test.class.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/11_test.class.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/1_add_phonenumber.class.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/2_add_user.class.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/3_add_profile.class.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/4_drop_profile.class.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/5_test.class.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/6_test.class.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/7_test.class.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/8_test.class.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/9_test.class.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Account.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Address.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Album.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/App.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/App_Category.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/App_User.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Assignment.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Auth.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Author.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BadlyNamed__Class.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BarRecord.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BaseSymfonyRecord.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Blog.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BlogTag.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BoardWithPosition.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Book.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Bookmark.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BookmarkUser.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BooleanTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CPK_Association.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CPK_Test.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CPK_Test2.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CascadeDeleteRelatedTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CascadeDeleteRelatedTest2.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CascadeDeleteTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CategoryWithPosition.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CheckConstraintTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ClientModel.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ColumnAliasTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ConcreteEmail.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ConcreteGroup.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ConcreteGroupUser.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ConcreteInheritanceTestParent.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ConcreteUser.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CoverageCodeN.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CustomPK.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CustomSequenceRecord.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Data_File.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/DateTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Description.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Element.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Email.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Entity.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EntityAddress.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EntityReference.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EnumTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EnumTest2.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EnumTest3.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EventListenerChainTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EventListenerTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FieldNameTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/File_Owner.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FilterTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FilterTest2.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FooBarRecord.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FooForeignlyOwned.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FooForeignlyOwnedWithPK.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FooLocallyOwned.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FooRecord.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FooReferenceRecord.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ForeignKeyTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ForeignKeyTest2.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Forum_Board.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Forum_Category.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Forum_Entry.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Forum_Thread.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Group.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/GroupUser.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/GzipTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/I18nRelationTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/I18nTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/InheritanceDeal.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/InheritanceDealUser.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/InheritanceUser.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/JC1.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/JC2.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/JC3.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/LiabilityCodeN.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Location.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/LocationI18n.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Log_Entry.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Log_Status.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/M2MTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/M2MTest2.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MigrationTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyGroup.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyOneThing.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyOtherThing.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyUser.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyUser2.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyUserGroup.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyUserOneThing.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyUserOtherThing.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MysqlGroup.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MysqlGroupMember.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MysqlIndexTestRecord.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MysqlTestRecord.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MysqlUser.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/NestReference.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/NestTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/NestedSetTest_SingleRootNode.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/NestedSet_MultiRootNode.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/NestedSet_Timestampable_MultiRootNode.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/NotNullTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ORM_AccessControl.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ORM_AccessControlsGroups.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ORM_AccessGroup.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ORM_TestEntry.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ORM_TestItem.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Package.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PackageVersion.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PackageVersionNotes.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Page.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Phonenumber.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Photo.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Phototag.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PluginSymfonyRecord.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PluginSymfonyRecordTable.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Policy.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PolicyAsset.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PolicyCodeN.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PolicyN.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_Board.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_Category.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_Entry.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_Item.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_Rank.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_Subscription.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_User.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_UserRank.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RTC1.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RTC2.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RTC3.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RTC4.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RateN.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Rec1.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Rec2.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RecordFilterTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RecordHookTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Record_City.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Record_Country.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Record_District.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RelationTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Resource.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ResourceReference.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ResourceType.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Role.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SearchTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SelfRefTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SequenceRecord.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SerializeTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SoftDeleteBCTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SoftDeleteTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Song.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SymfonyRecord.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SymfonyRecordTable.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Tag.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Task.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TestError.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TestMovie.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TestMovieUserBookmark.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TestMovieUserVote.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TestRecord.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TestUser.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TreeLeaf.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/UnderscoreColumn.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/User.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest_AddressModel.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest_ClientModel.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest_ClientToAddressModel.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest_DateModel.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest_FootballPlayer.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest_Person.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/VersioningTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ZeroValueTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/export/Cms_Category.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/export/Cms_CategoryLanguages.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/gnatEmail.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/gnatUser.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/mmrGroupUser_B.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/mmrGroupUser_C.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/mmrGroup_B.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/mmrGroup_C.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/mmrUser_B.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/mmrUser_C.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/mysql_migration_classes/001_mysql_add_table.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/mysql_migration_classes/002_mysql_change_column.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/run.php
 create mode 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/schema.xml
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/schema.yml
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/template.tpl
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/tmp/Ticket_1527_User.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/tmp/generated/BaseTicket_1527_User.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/unsolved.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tools/sandbox/config.php
 create mode 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tools/sandbox/doctrine
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tools/sandbox/doctrine.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tools/sandbox/index.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineArrayChoice.class.php
 mode change 100644 => 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/data/linked_schema.yml
 delete mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/unit/autoloaderTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineArrayChoiceTest.php
 create mode 100644 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineChoiceTest.php
 mode change 100644 => 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/asc.png
 mode change 100644 => 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/default.png
 mode change 100644 => 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/delete.png
 mode change 100644 => 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/desc.png
 mode change 100644 => 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/edit.png
 mode change 100644 => 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/error.png
 mode change 100644 => 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/first.png
 mode change 100644 => 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/last.png
 mode change 100644 => 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/list.png
 mode change 100644 => 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/new.png
 mode change 100644 => 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/next.png
 mode change 100644 => 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/previous.png
 mode change 100644 => 100755 lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/tick.png
 create mode 100644 lib/vendor/symfony/lib/service/sfServiceContainer.class.php
 create mode 100644 lib/vendor/symfony/lib/service/sfServiceContainerBuilder.class.php
 create mode 100644 lib/vendor/symfony/lib/service/sfServiceContainerDumper.class.php
 create mode 100644 lib/vendor/symfony/lib/service/sfServiceContainerDumperGraphviz.class.php
 create mode 100644 lib/vendor/symfony/lib/service/sfServiceContainerDumperInterface.class.php
 create mode 100644 lib/vendor/symfony/lib/service/sfServiceContainerDumperPhp.class.php
 create mode 100644 lib/vendor/symfony/lib/service/sfServiceContainerInterface.class.php
 create mode 100644 lib/vendor/symfony/lib/service/sfServiceContainerLoader.class.php
 create mode 100644 lib/vendor/symfony/lib/service/sfServiceContainerLoaderArray.class.php
 create mode 100644 lib/vendor/symfony/lib/service/sfServiceContainerLoaderInterface.class.php
 create mode 100644 lib/vendor/symfony/lib/service/sfServiceDefinition.class.php
 create mode 100644 lib/vendor/symfony/lib/service/sfServiceParameter.class.php
 create mode 100644 lib/vendor/symfony/lib/service/sfServiceReference.class.php
 mode change 100644 => 100755 lib/vendor/symfony/lib/task/generator/sfGenerateProjectTask.class.php
 mode change 100755 => 100644 lib/vendor/symfony/lib/task/generator/skeleton/project/symfony
 create mode 100644 lib/vendor/symfony/lib/task/test/sfTestPluginTask.class.php
 mode change 100644 => 100755 lib/vendor/symfony/lib/util/sfBrowserBase.class.php
 create mode 100644 lib/vendor/symfony/lib/validator/sfValidatorEqual.class.php
 create mode 100644 lib/vendor/symfony/lib/validator/sfValidatorFileMulti.class.php
 create mode 100644 lib/vendor/symfony/lib/validator/sfValidatorIp.class.php
 delete mode 100644 lib/vendor/symfony/lib/validator/sfValidatorSchemaForEach.class.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/.gitattributes
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/.gitignore
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/.travis.yml
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/CHANGES
 rename lib/vendor/symfony/{ => lib/vendor/swiftmailer}/LICENSE (96%)
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/README
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/VERSION
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Attachment.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/ByteStream/AbstractFilterableInputStream.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/ByteStream/ArrayByteStream.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/ByteStream/FileByteStream.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterReader.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterReader/GenericFixedWidthReader.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterReader/UsAsciiReader.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterReader/Utf8Reader.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterStream.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterStream/ArrayCharacterStream.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterStream/NgCharacterStream.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/ConfigurableSpool.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/DependencyContainer.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/EmbeddedFile.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Encoder.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Encoder/Base64Encoder.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Encoder/QpEncoder.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Encoder/Rfc2231Encoder.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Encoding.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/CommandEvent.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/Event.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/EventDispatcher.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/EventObject.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/ResponseEvent.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/SendEvent.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/SendListener.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/SimpleEventDispatcher.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/TransportChangeListener.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/TransportExceptionEvent.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/TransportExceptionListener.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/FailoverTransport.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/FileSpool.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Filterable.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Image.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/InputByteStream.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/KeyCache.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/KeyCache/ArrayKeyCache.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/KeyCache/DiskKeyCache.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/KeyCache/KeyCacheInputStream.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/KeyCache/NullKeyCache.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/LoadBalancedTransport.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/MailTransport.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mailer.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mailer/ArrayRecipientIterator.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mailer/RecipientIterator.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Message.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Attachment.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/ContentEncoder.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/EmbeddedFile.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Header.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/HeaderFactory.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/HeaderSet.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/AbstractHeader.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/DateHeader.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/IdentificationHeader.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/MailboxHeader.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/ParameterizedHeader.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/PathHeader.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/UnstructuredHeader.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Message.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/MimeEntity.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/MimePart.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/SimpleHeaderFactory.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/SimpleHeaderSet.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/SimpleMessage.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/SimpleMimeEntity.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/MimePart.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/NullTransport.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/OutputByteStream.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/AntiFloodPlugin.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/BandwidthMonitorPlugin.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/BlackholePlugin.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Decorator/Replacements.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/DecoratorPlugin.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/LoggerPlugin.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Loggers/ArrayLogger.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Loggers/EchoLogger.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Pop/Pop3Connection.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/RedirectingPlugin.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Reporter.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/ReporterPlugin.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Reporters/HitReporter.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Reporters/HtmlReporter.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/ThrottlerPlugin.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Preferences.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/SendmailTransport.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/SmtpTransport.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Spool.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/SpoolTransport.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/StreamFilter.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/StreamFilters/StringReplacementFilter.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/SwiftException.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/AbstractSmtpTransport.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/Esmtp/AuthHandler.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/Esmtp/Authenticator.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/EsmtpHandler.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/EsmtpTransport.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/FailoverTransport.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/IoBuffer.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/LoadBalancedTransport.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/MailInvoker.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/MailTransport.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/NullTransport.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/SendmailTransport.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/SimpleMailInvoker.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/SmtpAgent.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/SpoolTransport.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/StreamBuffer.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/composer.json
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/dependency_maps/cache_deps.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/dependency_maps/mime_deps.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/dependency_maps/transport_deps.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/doc/headers.rst
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/doc/help-resources.rst
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/doc/including-the-files.rst
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/doc/index.rst
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/doc/installing.rst
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/doc/introduction.rst
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/doc/japanese.rst
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/doc/messages.rst
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/doc/overview.rst
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/doc/plugins.rst
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/doc/sending.rst
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/doc/uml/Encoders.graffle
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/doc/uml/Mime.graffle
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/doc/uml/Transports.graffle
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Attachment.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterReader.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
 rename lib/vendor/symfony/lib/vendor/swiftmailer/{ => lib}/classes/Swift/CharacterReaderFactory.php (55%)
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterStream.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/ConfigurableSpool.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/DependencyContainer.php
 rename lib/vendor/symfony/lib/vendor/swiftmailer/{ => lib}/classes/Swift/DependencyException.php (50%)
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/EmbeddedFile.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Encoder.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Encoding.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
 rename lib/vendor/symfony/lib/vendor/swiftmailer/{ => lib}/classes/Swift/Events/CommandListener.php (55%)
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/Event.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
 rename lib/vendor/symfony/lib/vendor/swiftmailer/{ => lib}/classes/Swift/Events/EventListener.php (88%)
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/EventObject.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
 rename lib/vendor/symfony/lib/vendor/swiftmailer/{ => lib}/classes/Swift/Events/ResponseListener.php (53%)
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/SendEvent.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/SendListener.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
 rename lib/vendor/symfony/lib/vendor/swiftmailer/{ => lib}/classes/Swift/Events/TransportChangeEvent.php (63%)
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/FailoverTransport.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/FileSpool.php
 rename lib/vendor/symfony/lib/vendor/swiftmailer/{ => lib}/classes/Swift/FileStream.php (65%)
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Filterable.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Image.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/InputByteStream.php
 rename lib/vendor/symfony/lib/vendor/swiftmailer/{ => lib}/classes/Swift/IoException.php (50%)
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/KeyCache.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/MailTransport.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mailer.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mailer/RecipientIterator.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/MemorySpool.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Message.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Attachment.php
 rename lib/vendor/symfony/lib/vendor/swiftmailer/{ => lib}/classes/Swift/Mime/CharsetObserver.php (63%)
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
 rename lib/vendor/symfony/lib/vendor/swiftmailer/{ => lib}/classes/Swift/Mime/EncodingObserver.php (53%)
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Grammar.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Header.php
 rename lib/vendor/symfony/lib/vendor/swiftmailer/{ => lib}/classes/Swift/Mime/HeaderEncoder.php (64%)
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Message.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/MimePart.php
 rename lib/vendor/symfony/lib/vendor/swiftmailer/{ => lib}/classes/Swift/Mime/ParameterizedHeader.php (50%)
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/MimePart.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/NullTransport.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/OutputByteStream.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Decorator/Replacements.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
 rename lib/vendor/symfony/lib/vendor/swiftmailer/{ => lib}/classes/Swift/Plugins/Logger.php (51%)
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Connection.php
 rename lib/vendor/symfony/lib/vendor/swiftmailer/{ => lib}/classes/Swift/Plugins/Pop/Pop3Exception.php (58%)
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Reporter.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
 rename lib/vendor/symfony/lib/vendor/swiftmailer/{ => lib}/classes/Swift/Plugins/Sleeper.php (68%)
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
 rename lib/vendor/symfony/lib/vendor/swiftmailer/{ => lib}/classes/Swift/Plugins/Timer.php (67%)
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Preferences.php
 rename lib/vendor/symfony/lib/vendor/swiftmailer/{ => lib}/classes/Swift/ReplacementFilterFactory.php (57%)
 rename lib/vendor/symfony/lib/vendor/swiftmailer/{ => lib}/classes/Swift/RfcComplianceException.php (58%)
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/SendmailTransport.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/SignedMessage.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signer.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signers/BodySigner.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/SmtpTransport.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Spool.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/SpoolTransport.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/StreamFilter.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/SwiftException.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/MailTransport.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
 rename lib/vendor/symfony/lib/vendor/swiftmailer/{ => lib}/classes/Swift/TransportException.php (53%)
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Validate.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/dependency_maps/cache_deps.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/dependency_maps/message_deps.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/dependency_maps/mime_deps.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/dependency_maps/transport_deps.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/mime_types.php
 rename lib/vendor/symfony/lib/vendor/swiftmailer/{ => lib}/preferences.php (53%)
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/swift_init.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/swift_required.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/lib/swift_required_pear.php
 create mode 100755 lib/vendor/symfony/lib/vendor/swiftmailer/lib/swiftmailer_generate_mimes_config.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/mime_types.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/APPS
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/CHARSETS
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/message.xml
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc0821.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc0822.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc1341.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc1521.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc1854.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2015.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2045.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2046.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2047.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2048.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2049.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2183.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2222.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2231.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2234.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2440.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2487.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2554.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2821.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2822.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc3156.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc3676.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc4505.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc4616.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc4870.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc4871.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc4880.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc4954.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc5751.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/whats_where.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/notes/smtp.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/phpunit.xml.dist
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/swift_init.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/swift_required.php
 delete mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/swift_required_pear.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/IdenticalBinaryConstraint.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/StreamCollector.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/SwiftMailerSmokeTestCase.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/SwiftMailerTestCase.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/charsets/iso-2022-jp/one.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/charsets/iso-8859-1/one.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/charsets/utf-8/one.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/charsets/utf-8/three.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/charsets/utf-8/two.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/dkim/dkim.test.priv
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/dkim/dkim.test.pub
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/files/data.txt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/files/swiftmailer.png
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/files/textfile.zip
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/CA.srl
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/ca.crt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/ca.key
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/create-cert.sh
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/encrypt.crt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/encrypt.key
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/encrypt2.crt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/encrypt2.key
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/intermediate.crt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/intermediate.key
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/sign.crt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/sign.key
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/sign2.crt
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/sign2.key
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance.conf.php.default
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/AttachmentAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/ByteStream/FileByteStreamAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/CharacterReaderFactory/SimpleCharacterReaderFactoryAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/DependencyContainerAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/EmbeddedFileAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Encoder/Base64EncoderAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Encoder/QpEncoderAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Encoder/Rfc2231EncoderAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/EncodingAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/KeyCache/ArrayKeyCacheAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/KeyCache/DiskKeyCacheAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/MessageAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/AttachmentAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/Base64ContentEncoderAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/NativeQpContentEncoderAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/PlainContentEncoderAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/QpContentEncoderAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/EmbeddedFileAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/HeaderEncoder/Base64HeaderEncoderAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/MimePartAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/SimpleMessageAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/MimePartAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/AbstractStreamBufferAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/BasicSocketAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/ProcessAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SocketTimeoutTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SslSocketAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/TlsSocketAcceptanceTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/bootstrap.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug111Test.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug118Test.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug206Test.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug274Test.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug34Test.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug35Test.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug38Test.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug518Test.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug51Test.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug534Test.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug650Test.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug71Test.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug76Test.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/BugFileByteStreamConsecutiveReadCallsTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/fixtures/MimeEntityFixture.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/smoke.conf.php.default
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/smoke/Swift/Smoke/AttachmentSmokeTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/smoke/Swift/Smoke/BasicSmokeTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/smoke/Swift/Smoke/HtmlWithAttachmentSmokeTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/smoke/Swift/Smoke/InternationalSmokeTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/ByteStream/ArrayByteStreamTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/CharacterReader/GenericFixedWidthReaderTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/CharacterReader/UsAsciiReaderTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/CharacterReader/Utf8ReaderTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/CharacterStream/ArrayCharacterStreamTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/DependencyContainerTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Encoder/Base64EncoderTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Encoder/QpEncoderTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Encoder/Rfc2231EncoderTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/CommandEventTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/EventObjectTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/ResponseEventTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/SendEventTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/SimpleEventDispatcherTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/TransportChangeEventTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/TransportExceptionEventTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/KeyCache/ArrayKeyCacheTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/KeyCache/SimpleKeyCacheInputStreamTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mailer/ArrayRecipientIteratorTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/MailerTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/MessageTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/AbstractMimeEntityTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/AttachmentTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/Base64ContentEncoderTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/PlainContentEncoderTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/QpContentEncoderTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/EmbeddedFileTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/HeaderEncoder/Base64HeaderEncoderTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/HeaderEncoder/QpHeaderEncoderTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/Headers/DateHeaderTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/Headers/IdentificationHeaderTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/Headers/MailboxHeaderTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/Headers/ParameterizedHeaderTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/Headers/PathHeaderTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/Headers/UnstructuredHeaderTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/MimePartTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderFactoryTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderSetTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/SimpleMessageTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/SimpleMimeEntityTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/AntiFloodPluginTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/BandwidthMonitorPluginTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/DecoratorPluginTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/LoggerPluginTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/Loggers/ArrayLoggerTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/Loggers/EchoLoggerTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/PopBeforeSmtpPluginTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/RedirectingPluginTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/ReporterPluginTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/Reporters/HitReporterTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/Reporters/HtmlReporterTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/ThrottlerPluginTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Signers/DKIMSignerTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Signers/OpenDKIMSignerTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Signers/SMimeSignerTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/StreamFilters/ByteArrayReplacementFilterTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/StreamFilters/StringReplacementFilterFactoryTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/StreamFilters/StringReplacementFilterTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpEventSupportTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/CramMd5AuthenticatorTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/LoginAuthenticatorTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/NTLMAuthenticatorTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/PlainAuthenticatorTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/Esmtp/AuthHandlerTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/EsmtpTransport/ExtensionSupportTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/EsmtpTransportTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/FailoverTransportTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/LoadBalancedTransportTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/MailTransportTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/SendmailTransportTest.php
 create mode 100644 lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/StreamBufferTest.php
 create mode 100644 lib/vendor/symfony/lib/widget/sfWidgetFormInputFileMulti.class.php
 create mode 100644 lib/vendor/symfony/lib/widget/sfWidgetFormInputRead.class.php
 delete mode 100644 lib/vendor/symfony/lib/widget/sfWidgetFormSchemaForEach.class.php
 rename lib/vendor/symfony/lib/yaml/{sfYaml.php => sfYaml.class.php} (69%)
 rename lib/vendor/symfony/lib/yaml/{sfYamlDumper.php => sfYamlDumper.class.php} (96%)
 rename lib/vendor/symfony/lib/yaml/{sfYamlInline.php => sfYamlInline.class.php} (92%)
 rename lib/vendor/symfony/lib/yaml/{sfYamlParser.php => sfYamlParser.class.php} (90%)
 mode change 100644 => 100755 lib/vendor/symfony/test/bin/loc.php
 mode change 100644 => 100755 lib/vendor/symfony/test/functional/autoloadTest.php
 create mode 100644 lib/vendor/symfony/test/functional/fixtures/apps/frontend/config/services.yml
 delete mode 100644 lib/vendor/symfony/test/functional/fixtures/config/propel.ini
 create mode 100644 lib/vendor/symfony/test/functional/fixtures/config/services.yml
 create mode 100644 lib/vendor/symfony/test/functional/fixtures/plugins/sfConfigPlugin/config/services.yml
 delete mode 100644 lib/vendor/symfony/test/other/fixtures/propel/Category.php
 delete mode 100644 lib/vendor/symfony/test/other/fixtures/propel/databases.yml
 delete mode 100644 lib/vendor/symfony/test/other/fixtures/propel/propel.ini
 delete mode 100644 lib/vendor/symfony/test/other/fixtures/propel/schema.yml
 delete mode 100644 lib/vendor/symfony/test/other/fixtures/task/aTask.class.php
 delete mode 100644 lib/vendor/symfony/test/other/fixtures/task/zTask.class.php
 create mode 100644 lib/vendor/symfony/test/unit/config/fixtures/sfCompileConfigHandler/simple.yml
 create mode 100644 lib/vendor/symfony/test/unit/config/sfCompileConfigHandlerTest.php
 create mode 100644 lib/vendor/symfony/test/unit/event/sfEventDispatcherTest.php
 create mode 100644 lib/vendor/symfony/test/unit/event/sfEventTest.php
 mode change 100644 => 100755 lib/vendor/symfony/test/unit/mailer/sfMailerTest.php
 mode change 100644 => 100755 lib/vendor/symfony/test/unit/request/sfRequestTest.php
 create mode 100644 lib/vendor/symfony/test/unit/routing/fixtures/config_routing.yml.php
 create mode 100644 lib/vendor/symfony/test/unit/service/fixtures/containers/container10.php
 create mode 100644 lib/vendor/symfony/test/unit/service/fixtures/containers/container8.php
 create mode 100644 lib/vendor/symfony/test/unit/service/fixtures/containers/container9.php
 create mode 100644 lib/vendor/symfony/test/unit/service/fixtures/graphviz/services1.dot
 create mode 100644 lib/vendor/symfony/test/unit/service/fixtures/graphviz/services10-1.dot
 create mode 100644 lib/vendor/symfony/test/unit/service/fixtures/graphviz/services10.dot
 create mode 100644 lib/vendor/symfony/test/unit/service/fixtures/graphviz/services9.dot
 create mode 100644 lib/vendor/symfony/test/unit/service/fixtures/includes/classes.php
 create mode 100644 lib/vendor/symfony/test/unit/service/fixtures/includes/foo.php
 create mode 100644 lib/vendor/symfony/test/unit/service/fixtures/php/services1-1.php
 create mode 100644 lib/vendor/symfony/test/unit/service/fixtures/php/services1.php
 create mode 100644 lib/vendor/symfony/test/unit/service/fixtures/php/services8.php
 create mode 100644 lib/vendor/symfony/test/unit/service/fixtures/php/services9.php
 create mode 100644 lib/vendor/symfony/test/unit/service/fixtures/yaml/nonvalid1.yml
 create mode 100644 lib/vendor/symfony/test/unit/service/fixtures/yaml/nonvalid2.yml
 create mode 100644 lib/vendor/symfony/test/unit/service/fixtures/yaml/services1.yml
 create mode 100644 lib/vendor/symfony/test/unit/service/fixtures/yaml/services2.yml
 create mode 100644 lib/vendor/symfony/test/unit/service/fixtures/yaml/services3.yml
 create mode 100644 lib/vendor/symfony/test/unit/service/sfServiceContainerBuilderTest.php
 create mode 100644 lib/vendor/symfony/test/unit/service/sfServiceContainerDumperGraphvizTest.php
 create mode 100644 lib/vendor/symfony/test/unit/service/sfServiceContainerDumperPhpTest.php
 create mode 100644 lib/vendor/symfony/test/unit/service/sfServiceContainerDumperTest.php
 create mode 100644 lib/vendor/symfony/test/unit/service/sfServiceContainerLoaderArrayTest.php
 create mode 100644 lib/vendor/symfony/test/unit/service/sfServiceContainerLoaderTest.php
 create mode 100644 lib/vendor/symfony/test/unit/service/sfServiceContainerTest.php
 create mode 100644 lib/vendor/symfony/test/unit/service/sfServiceDefinitionTest.php
 create mode 100644 lib/vendor/symfony/test/unit/service/sfServiceParameterTest.php
 create mode 100644 lib/vendor/symfony/test/unit/service/sfServiceReferenceTest.php
 mode change 100644 => 100755 lib/vendor/symfony/test/unit/util/sfBrowserTest.php
 create mode 100644 lib/vendor/symfony/test/unit/validator/sfValidatorEqualTest.php
 create mode 100644 lib/vendor/symfony/test/unit/validator/sfValidatorFileMultiTest.php
 mode change 100644 => 100755 lib/vendor/symfony/test/unit/validator/sfValidatorFileTest.php
 create mode 100644 lib/vendor/symfony/test/unit/validator/sfValidatorIpTest.php
 delete mode 100644 lib/vendor/symfony/test/unit/validator/sfValidatorSchemaForEachTest.php
 create mode 100644 lib/vendor/symfony/test/unit/widget/sfWidgetFormInputFileMultiTest.php
 create mode 100644 lib/vendor/symfony/test/unit/widget/sfWidgetFormInputReadTest.php
 delete mode 100644 lib/vendor/symfony/test/unit/widget/sfWidgetFormSchemaForEachTest.php
 create mode 100644 lib/vendor/symfony/test/unit/yaml/fixtures/YtsAnchorAlias.yml
 create mode 100644 lib/vendor/symfony/test/unit/yaml/fixtures/YtsBasicTests.yml
 create mode 100644 lib/vendor/symfony/test/unit/yaml/fixtures/YtsBlockMapping.yml
 create mode 100644 lib/vendor/symfony/test/unit/yaml/fixtures/YtsDocumentSeparator.yml
 create mode 100644 lib/vendor/symfony/test/unit/yaml/fixtures/YtsErrorTests.yml
 create mode 100644 lib/vendor/symfony/test/unit/yaml/fixtures/YtsFlowCollections.yml
 create mode 100644 lib/vendor/symfony/test/unit/yaml/fixtures/YtsFoldedScalars.yml
 create mode 100644 lib/vendor/symfony/test/unit/yaml/fixtures/YtsNullsAndEmpties.yml
 create mode 100644 lib/vendor/symfony/test/unit/yaml/fixtures/YtsSpecificationExamples.yml
 create mode 100644 lib/vendor/symfony/test/unit/yaml/fixtures/YtsTypeTransfers.yml
 create mode 100644 lib/vendor/symfony/test/unit/yaml/fixtures/index.yml
 create mode 100644 lib/vendor/symfony/test/unit/yaml/fixtures/sfComments.yml
 create mode 100644 lib/vendor/symfony/test/unit/yaml/fixtures/sfMergeKey.yml
 create mode 100644 lib/vendor/symfony/test/unit/yaml/fixtures/sfObjects.yml
 create mode 100644 lib/vendor/symfony/test/unit/yaml/fixtures/sfQuotes.yml
 create mode 100644 lib/vendor/symfony/test/unit/yaml/fixtures/sfTests.yml
 create mode 100644 lib/vendor/symfony/test/unit/yaml/sfYamlDumperTest.php
 create mode 100644 lib/vendor/symfony/test/unit/yaml/sfYamlInlineTest.php
 create mode 100644 lib/vendor/symfony/test/unit/yaml/sfYamlParserTest.php

diff --git a/lib/vendor/symfony/.editorconfig b/lib/vendor/symfony/.editorconfig
new file mode 100644
index 000000000..4a7ea3036
--- /dev/null
+++ b/lib/vendor/symfony/.editorconfig
@@ -0,0 +1,12 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/lib/vendor/symfony/.gitignore b/lib/vendor/symfony/.gitignore
new file mode 100644
index 000000000..ebc31dcea
--- /dev/null
+++ b/lib/vendor/symfony/.gitignore
@@ -0,0 +1,8 @@
+/test/functional/fixtures/cache
+/test/functional/fixtures/log
+/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/*/doctrine/base/
+/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/*/doctrine/*/base/
+/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/cache/
+lib/plugins/sfDoctrinePlugin/test/functional/fixtures/log/
+/vendor
+/composer.lock
diff --git a/lib/vendor/symfony/.gitmodules b/lib/vendor/symfony/.gitmodules
new file mode 100644
index 000000000..f9e1e7496
--- /dev/null
+++ b/lib/vendor/symfony/.gitmodules
@@ -0,0 +1,7 @@
+[submodule "lib/vendor/swiftmailer"]
+	path = lib/vendor/swiftmailer
+	url = https://github.com/swiftmailer/swiftmailer.git
+	branch = 5.x
+[submodule "lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine"]
+	path = lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine
+	url = https://github.com/LExpress/doctrine1.git
diff --git a/lib/vendor/symfony/.travis.yml b/lib/vendor/symfony/.travis.yml
new file mode 100644
index 000000000..790f21c7a
--- /dev/null
+++ b/lib/vendor/symfony/.travis.yml
@@ -0,0 +1,44 @@
+language: php
+
+php:
+    - 5.3
+    - 5.4
+    - 5.5
+    - 5.6
+    - 7.0
+    - 7.1
+    - hhvm
+    - nightly
+
+# run build against nightly but allow them to fail
+matrix:
+    fast_finish: true
+    allow_failures:
+        - php: hhvm
+        - php: nightly
+
+# faster builds on new travis setup not using sudo
+sudo: false
+
+services:
+    - memcached
+
+# cache vendor dirs
+cache:
+    directories:
+        - lib/vendor
+        - $HOME/.composer/cache
+
+install:
+    - composer self-update
+
+before_script:
+    # by default, --remote is not used on travis
+    - git submodule update --remote --force
+    - sh -c 'if [ $(php -r "echo PHP_MINOR_VERSION;") -le 4 ] && [ $(php -r "echo PHP_MAJOR_VERSION;") -le 5 ]; then echo "extension = apc.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
+    - sh -c 'if [ $(php -r "echo PHP_RELEASE_VERSION;") -le 98 ] && [ $(php -r "echo PHP_MAJOR_VERSION;") -le 5 ]; then echo "extension = memcache.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi;'
+    - composer install
+
+script:
+    - php data/bin/check_configuration.php
+    - php data/bin/symfony symfony:test --trace
diff --git a/lib/vendor/symfony/CHANGELOG b/lib/vendor/symfony/CHANGELOG.md
similarity index 74%
rename from lib/vendor/symfony/CHANGELOG
rename to lib/vendor/symfony/CHANGELOG.md
index 95e5ddc46..b573aae5e 100644
--- a/lib/vendor/symfony/CHANGELOG
+++ b/lib/vendor/symfony/CHANGELOG.md
@@ -1,3 +1,201 @@
+CHANGELOG
+=========
+
+09/02/2017: Version 1.5.9
+-------------------------
+
+* Fix notice in sfValidatorSchema::getBytes" PHP 7.1 #148
+* Fix dumpArray() for PHP 7.1 #146
+* Fix some bugs with new PHP versions #143
+* Fix yaml dumpArray() for PHP 7.1 #142
+
+06/10/2016: Version 1.5.8
+-------------------------
+
+* PHP7 compatibility by @timmipetit #121
+* sfMemcacheCache fix #124
+* sfAutoload include fix for HHVM support #127
+* sfAutoload include: eval only if forced on HHVM #130
+* Fix phpdoc for sfDoctrineRecord::setDateTimeObject() #136
+* Fix session data losing under certain situation #139
+
+02/02/2016: Version 1.5.7
+-------------------------
+
+* Fix error in embedded form #105
+* Added HTTP PATCH request method #110
+* Fix integers used in mt_rand() #113
+* Remove array cast from parameter of sfAction::renderJson #115
+* Don't post unnamed submit fields in sfBrowserBase #112
+* Add support for traits in autoloaders #112
+* Php Inspections (EA Extended): Static Code Analysis #111
+
+22/07/2015: Version 1.5.6
+-------------------------
+
+* Reverts #94. APCu 4.0.7+ is required for PHP 5.5+ #99
+
+18/07/2015: Version 1.5.5
+-------------------------
+
+* Static Code Analysis with Php Inspections #97
+* Change log level of sfException to CRITICAL #96
+
+15/06/2015: Version 1.5.4
+-------------------------
+
+* Add blob support to yaml files #38
+* Ability to integrate a psr compliant log #71
+* Add OPTIONS method in sfRequest #75
+* Add multiple file input #86
+* Allows newer versions of Swiftmailer #90
+* Allow to specify environment in sfI18nExtractTask #92
+
+17/09/2014: Version 1.5.3
+-------------------------
+
+* Use late static binding for config classes #25
+* Remove Doctrine from dependencies (add Doctrine and Propel as suggestions) #35
+* Add relative option for PublishAssetsTask #43
+* Add an option to test:all task to show full output #55
+* Improve PHP built-in webserver compatibility #58
+* Update Swiftmailer to ~5.2.1 #59
+* Re-add Propel in sfDatabaseSessionStorage #66
+
+10/30/2013: Version 1.5.2
+-------------------------
+
+ * Drop support for PHP 5.2
+ * Add support for PHP 5.5
+
+10/04/13: Version 1.5.0
+-----------------------
+
+ * inject the routing into the service container
+ * decoupled routing cache key generation to make it customizable
+ * optimized sfCompileConfigHandler and added unit tests
+ * added possibility to use sfAPCCache without APC (same as sfNoCache)
+ * added logger into service container for command
+ * optimized sfPatternRouting cache with unserialise sfRoute objects on demand, huge gain with `lookup_cache_dedicated_keys`
+ * added sf_cli core configuration
+ * added default option --no-debug for tasks (usefull for project:optimize task)
+ * used `is_file` instead of `file_exists` in sfFileCache, sfAutoload, sfApplicationConfiguration, sfProjectConfiguration and sfSessionTestStorage classes
+ * added sfBaseTask::isVerbose() method
+ * fixed "plugin:publish-assets" task generate absolute symlinks
+ * fixed "project:optimize" task: file permissions, configurable environment and module generation
+ * added task doctrine:compile to package the library into an unique cached file
+ * added send event "application.throw_exception" when an exception occurs in a task
+ * added exceptions catch in "cache:clear" task
+ * added sfServiceContainer* classes to core_compile
+ * cleaned some file class names, removed some require_once
+ * fixed possible warning in sfWidgetFormSelectCheckbox
+ * sfLogger implements sfLoggerInterface
+ * added unit tests for yaml and event classes
+ * added possibility to parse yaml for value when encoding is not utf-8
+ * added sfWidgetFormDoctrineArrayChoice widget
+ * added unit test for sfWidgetFormDoctrineChoice
+ * added sfFormObject::saveObject() method
+ * fixed sfValidatorFile error message for php.ini upload_max_filesize (inspired from Symfony2)
+ * added sfForm::getErrors method
+ * added possibility to set integer as name for named error
+ * fixed: do not clone the form on embed anymore
+ * removed unused sfWidgetFormSchemaForEach and sfValidatorSchemaForEach classes
+ * added skip-build option to sfDoctrineCreateModelTablesTask (patch from @estahn)
+ * better code coverage for sfWebRequest class unit tests
+ * added parameters proxy to sfWebRequest::getClientIp() method (default true)
+ * introduced trust_proxy option on sfWebRequest (default true)
+ * added call to `fastcgi_finish_request()` function if available on sfWebResponse::run() method
+ * added possibility to launch bin/coverage task for only one class
+ * added sfRequest::getOption() method
+ * used SQLite 3 for php 5.3 or later, as it's required for php 5.4
+ * fixed sfI18NTest for php version > 5.2
+ * added possibility for preValidator to modify values
+ * displayed form errors with sfTestBrowser->with(form)->hasError()
+ * added sfValidatorEqual
+ * added test_path option to sfLimeHarness (patch by @stephaneerard)
+ * allowed '-' character in key for sfToolkit::stringToArray (patch by @eXtreme)
+ * added sfValidatorChoice::isEmpty method to test if value is an array with only empty value(s) (inspired by patch of @antitoxic)
+ * added sfWebRequest::getClientIp() method
+ * added sf_upload_dir_name to config
+ * added sfValidatorIp (extracted from symfony2)
+ * removed usage of array_unique in getStylesheets and getJavascripts methods of sfWidgetFormDateRange
+ * fixed sfDoctrineRecordI18nFilter::filterGet() do not return empty translation (patch from @mahono)
+ * fixed possible warning in sfDoctrineConnectionProfiler (patch from @mahono)
+ * added sfWidgetFormInputRead
+ * added sfWebResponse::prependTitle() method
+ * added options truncate_pattern and max_lenght arguments to truncate_text function in TextHelper
+ * added sfBaseTask::withTrace() and sfBaseTask::showStatus() methods
+ * removed usage of array_map in widget
+ * fixed sfValidatorFileTest for PHP >= 5.3.7
+ * injected sf_event_dispatcher, sf_formatter and sf_logger to core service container
+ * introduced recursive form embed (fix many embed form issues)
+ * formatted sfValidatorFile error with KB instead of Bytes for readability
+ * added sfComponent::renderJson() method
+ * added foreign field name for column in foreign key field form definition
+ * removed first choice only if it's strictly an empty string in sfValidatorDoctrineChoice
+ * added sfValidatedFile::resetType() method
+ * enabled trim option by default on sfValidatorBase
+ * throw real exception on sfValidatorSchema and sfValidatorSchemaFilter
+ * return php result for copy and rename methods of sfFilesystem
+ * added clearJavascripts() and clearStylesheets() methods to sfWebResponse
+ * added clear_javascripts and clear_stylesheets functions to AssetHelper
+ * fixed sfAction::setTemplate() to allow view exists only in plugin dir when the module action is extended in application
+ * added sfServiceConfigHandler
+ * imported sfServiceContainer component
+ * replaced embedded swiftmailer by upstream submodule of swiftmailer 4.1
+ * removed sfPropelPlugin
+ * add `sfNoMailer` class for application without mail
+ * do no remove .* files when clearing the cache
+ * Add helper __() to sfComponent to translate messages
+
+05/30/12: Version 1.4.18
+------------------------
+
+ * [33466] fixed a possible DB session fixation attack (patch from Dmitri Groutso)
+ * [33373] fixed test browser click function does not handle css selector without [ or ] (closes #9982, patch from mouette)
+
+08/03/12: Version 1.4.17
+------------------------
+
+ * [33363] added some tests (closes #3237, patch from Stephen.Ostrow)
+ * [33362] fixed a notice on PHP 5.4 (closes #9985, patch from bshaffer)
+ * [33358] fixed Notice with PHP 5.4 (closes #10003)
+ * [33309] fixed error in Debug mode from sfDebug.class.php when myUser implements sfSecurityUser (closes #9996)
+ * [33299] reverted [33226] because of side effects (refs #8348)
+ * [33292] fixed test for PHP 5.3 (patch from pylebecq)
+
+12/13/11: Version 1.4.16
+------------------------
+
+ * [33251] fixed sfChoiceFormat when a string to translate contains a valid range (closes #9973)
+ * [33250] fixed saving i18n fields in subforms (closes #7626, patch from yoshy71)
+ * [33249] fixed last modified date calculation in sfMessageSource_Aggregate (closes #9981, patch from jamiel)
+ * [33226] fixed merging problem for the routing configuration (closes #8348)
+ * [33214] fixed ob_start() behavior on CLI (closes #9970)
+ * [33208] fixed ob_start usage (to avoid warning in PHP 5.4, closes #9970)
+
+10/27/11: Version 1.4.15
+------------------------
+
+ * [33151] fixed usage of mb_strlen in tasks (closes #9940)
+ * [33149] added missing admin.delete_object event (closes #9943)
+ * [33137] fixed multiple database support in Propel plugin (for the generator and sfPropelData, closes #8345)
+ * [33125] fixed the possibility to include files included in an exclude rule in the deploy task (closes #9912)
+ * [33122] fixed include|get_component when sfPartialView class is customized (closes #9932)
+ * [33121] fixed protocol relative URL in the asset helper (closes #9936)
+ * [33053] fixed typo (closes #9927, based on a patch from pmallet)
+
+09/16/11: Version 1.4.14
+------------------------
+
+ * [33025] fixed sfCacheSessionStorage does not always check whether HTTP_USER_AGENT is set (closes #9921, patch from boutell)
+ * [33022] fixed auto_link_text() when an email address is already linked (closes #9915, based on a patch from klemens_u)
+ * [33021] fixed sfCacheSessionStorage does not serialize properly, also uses wrong option name for httponly (closes #9919, based on a patch from boutell)
+ * [32939] fixed memory leak in sfRoute::generate() (closes #9886 - patch from acf0)
+ * [32892] fixed Doctrine form generation when a schema has abstract tables (closes #9885 - patch from chok)
+ * [32891] fixed sfFinder bug when mirroring file with twice the path inside it (closes #9892 - based on a patch from shordeaux)
+ * [32890] fixed bad value of property 'list-style' in css of WebDebug toolbar (closes #9891 - patch from tomi)
+
 08/05/11: Version 1.4.13
 ------------------------
 
diff --git a/lib/vendor/symfony/COPYRIGHT b/lib/vendor/symfony/COPYRIGHT.md
similarity index 84%
rename from lib/vendor/symfony/COPYRIGHT
rename to lib/vendor/symfony/COPYRIGHT.md
index a088ce353..425563a3a 100644
--- a/lib/vendor/symfony/COPYRIGHT
+++ b/lib/vendor/symfony/COPYRIGHT.md
@@ -36,12 +36,3 @@ symfony uses the lime software
 Url:       http://www.symfony-project.com/
 Copyright: Fabien Potencier
 License:   MIT - see licenses/LICENSE.lime file
-
-SwiftMailer
------------
-
-symfony uses the SwiftMailer library
-
-Url:       http://www.swiftmailer.org/
-Copyright: Chris Corbyn
-License:   LGPL - see licenses/LICENSE.swiftmailer
diff --git a/lib/vendor/symfony/LICENSE.md b/lib/vendor/symfony/LICENSE.md
new file mode 100644
index 000000000..cdffe7aeb
--- /dev/null
+++ b/lib/vendor/symfony/LICENSE.md
@@ -0,0 +1,19 @@
+Copyright (c) 2004-2012 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/lib/vendor/symfony/README b/lib/vendor/symfony/README
deleted file mode 100644
index cb87c80b1..000000000
--- a/lib/vendor/symfony/README
+++ /dev/null
@@ -1,20 +0,0 @@
-Symfony is a complete framework designed to optimize the development of web applications by way of several key features.
-For starters, it separates a web application's business rules, server logic, and presentation views.
-It contains numerous tools and classes aimed at shortening the development time of a complex web application.
-Additionally, it automates common tasks so that the developer can focus entirely on the specifics of an application.
-The end result of these advantages means there is no need to reinvent the wheel every time a new web application is built!
-
-Symfony was written entirely in PHP 5.
-It has been thoroughly tested in various real-world projects, and is actually in use for high-demand e-business websites.
-It is compatible with most of the available databases engines, including MySQL, PostgreSQL, Oracle, and Microsoft SQL Server.
-It runs on *nix and Windows platforms.
-
-LICENSE
--------
-
-see LICENSE file
-
-INSTALLATION
-------------
-
-see http://www.symfony-project.org/getting-started/1_4/en/
diff --git a/lib/vendor/symfony/README.md b/lib/vendor/symfony/README.md
new file mode 100644
index 000000000..0fcc657b3
--- /dev/null
+++ b/lib/vendor/symfony/README.md
@@ -0,0 +1,65 @@
+[![Build Status](https://secure.travis-ci.org/LExpress/symfony1.png?branch=master)](http://travis-ci.org/LExpress/symfony1)
+
+About this version
+------------------
+
+This is a community driven fork of symfony 1, as official support has been [interrupted in November 2012](http://symfony.com/blog/symfony-1-4-end-of-maintenance-what-does-it-mean).
+
+**Do not use it for new projects: this version is great to improve existing symfony1 applications, but [Symfony2](http://symfony.com/) is the way to go today.**
+
+All the enhancements and BC breaks are listed in the [WHATS_NEW](https://github.com/LExpress/symfony1/blob/master/WHATS_NEW.md) file, this include:
+
+- [DIC](https://github.com/LExpress/symfony1/wiki/ServiceContainer)
+- Composer support
+- PHP 7.0 support
+- performance boost
+- new widgets & validators
+- some tickets fixed from the symfony trac
+- ...
+
+About symfony
+-------------
+
+Symfony is a complete framework designed to optimize the development of web applications by way of several key features.
+For starters, it separates a web application's business rules, server logic, and presentation views.
+It contains numerous tools and classes aimed at shortening the development time of a complex web application.
+Additionally, it automates common tasks so that the developer can focus entirely on the specifics of an application.
+The end result of these advantages means there is no need to reinvent the wheel every time a new web application is built!
+
+Symfony was written entirely in PHP 5.
+It has been thoroughly tested in various real-world projects, and is actually in use for high-demand e-business websites.
+It is compatible with most of the available databases engines, including MySQL, PostgreSQL, Oracle, and Microsoft SQL Server.
+It runs on *nix and Windows platforms.
+
+Requirements
+------------
+
+PHP 5.3.4 and up. See prerequisites on http://symfony.com/legacy/doc/getting-started/1_4/en/02-Prerequisites
+
+Installation
+------------
+
+See http://symfony.com/legacy/doc/getting-started/1_4/en/03-Symfony-Installation
+
+Option 1: Using [Composer](http://getcomposer.org/doc/00-intro.md) as dependency management:
+
+    composer require lexpress/symfony1 "1.5.*"
+    composer install
+    
+Note: On windows, if your project is a few directories down from the drive root, composer can throw an error  relating to ZipArchive::extractTo(), this can be because pathnames are too long. There currently appears to be no proper solution but a workaround is to move your project to the drive root, run the commands from there, where they will run happily, and then move your project back. 
+
+Option 2: Using Git submodules:
+  
+    git init # your project
+    git submodule add https://github.com/LExpress/symfony1.git lib/vendor/symfony
+    git submodule update --init --recursive
+
+Documentation
+-------------
+
+Read the official [symfony1 documentation](http://symfony.com/legacy)
+
+Contributing
+------------
+
+You can send pull requests or create an issue.
diff --git a/lib/vendor/symfony/UPGRADE.md b/lib/vendor/symfony/UPGRADE.md
new file mode 100644
index 000000000..d43c4ac13
--- /dev/null
+++ b/lib/vendor/symfony/UPGRADE.md
@@ -0,0 +1,57 @@
+Information
+===========
+
+All tests of 1.4 release pass without any change of excepted values and none of them have been removed.
+
+Warning
+=======
+
+Plugin
+------
+
+The sfPropelPlugin has been removed.  
+Use the [sfPropelORMPlugin](https://github.com/propelorm/sfPropelORMPlugin) if you want to use the great Propel ORM.
+
+Form
+----
+
+The `trim` option of `sfValidatorBase` is now set to `true` by default.
+
+The method `sfForm::embedFormForForeach` have been removed.
+
+Due to the new embed form enhancements:
+
+* The form is not cloned anymore when it you embed it
+* You cannot embed the same `sfForm` instance twice or more into an `sfForm`.
+* You cannot added the same `sfValidatorErrorSchema` instance twice or more into an `sfValidatorErrorSchema`.
+* The method `sfValidatorErrorSchema::addErrors` only accept an `sfValidatorErrorSchema` instance as argument.
++ The `sfValidatorErrorSchema` constructor no longer accept an array of errors as second argument.
+
+Doctrine & Project configuration
+--------------------------------
+
+Previously, you were able to configure doctrine in your `/config/ProjectConfiguration.class.php` using the method `configureDoctrine`.
+This method isn't called anymore. You now need to connect to the `doctrine.configure` event:
+
+```php
+<?php
+// ...
+
+class ProjectConfiguration extends sfProjectConfiguration
+{
+  public function setup()
+  {
+    // ...
+
+    $this->dispatcher->connect('doctrine.configure', array($this, 'configureDoctrineEvent'));
+  }
+
+  public function configureDoctrineEvent(sfEvent $event)
+  {
+    $manager = $event->getSubject();
+
+    // configure what ever you want on the doctrine manager
+    $manager->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+  }
+}
+```
diff --git a/lib/vendor/symfony/WHATS_NEW.md b/lib/vendor/symfony/WHATS_NEW.md
new file mode 100644
index 000000000..02bbb92ed
--- /dev/null
+++ b/lib/vendor/symfony/WHATS_NEW.md
@@ -0,0 +1,247 @@
+Service container
+-----------------
+
+A service container has been added (extracted from the [symfony dependency injection component](http://components.symfony-project.org/dependency-injection/)).  
+[More details](https://github.com/LExpress/symfony1/wiki/ServiceContainer) about the integration on symfony core.
+
+Form
+----
+
+Many issues have been fixed for embedded form included:
+
+* You can use `sfFormObject::updateObject()` without save, all embedded form objects are updated.
+* You can use file upload into your embedded forms, files will be correctly removed in embedded forms using `sfWidgetFormInputFileEditable`.
+* `sfFormObject::updateObject()` and `sfFormObject::saveObject()` methods are call recursively from embedded forms.
+* You can use integer in `name` argument of `sfForm::embedForm`.
+
+This fixes the following tickets :
+
+* [#4903](http://trac.symfony-project.org/ticket/4903): sfForm::embedForm($form) saves the $form before cloning | Add sfForm::getEmbeddedForm($name) and make the sfForm::embedForm($form) return the embedded form
+* [#5805](http://trac.symfony-project.org/ticket/5805): extra_fields validation handled oddly with multi-level embedForm - causes error
+* [#5867](http://trac.symfony-project.org/ticket/5867): Embedded forms do not call save() or doSave() on the form
+* [#6937](http://trac.symfony-project.org/ticket/6937): Proposed patch to properly handle embedded (Doctrine) Forms
+* [#7032](http://trac.symfony-project.org/ticket/7032): Embedded forms keep their CSRF token
+* [#7440](http://trac.symfony-project.org/ticket/7440): Performance issue on sfValidatorErrorSchema::addError
+* [#8500](http://trac.symfony-project.org/ticket/8500): sfWidgetFormInputFileEditable dont delete file when is in form embeded by embedRelation
+* [#8800](http://trac.symfony-project.org/ticket/8800): Generated Embedded form with Many-To-Many relations do not save
+* [#9147](http://trac.symfony-project.org/ticket/9147): sfFormDoctrine::processUploadedFile calls method/property on object without checking if it exists
+* [#9172](http://trac.symfony-project.org/ticket/9172): removeFile in embeddedForms from sfFormDoctrine incorrect
+* [#9637](http://trac.symfony-project.org/ticket/9637): Many to many in embedded form
+
+**[BC Break]** The form is not cloned anymore when you passed it to `sfForm::embedForm`.
+
+The method `sfForm::embedFormForForeach()` has been removed.
+
+A new method `sfForm::getErrors()` has been added.  
+This method returns an array with label as key and the validation error message as value (included embedded form errors).
+
+The CRSF protection is now disable in cli environement.
+
+Widget
+------
+
+A new parameter `default` has been added to the method `sfWidget::getOption`.
+
+New widget `sfWidgetFormInputRead` has been added.  
+This allow you to display a readonly input without border, with the value of your choice AND an hidden input with the real value and name for submit.
+
+The method `sfWidgetFormDateRange::getStylesheets()` does not try to remove duplicate (fixes [#9224](http://trac.symfony-project.org/ticket/9224): *sfDoctrineCreateModelTablesTask should have an option to skip "build-model" task*).
+
+Validator
+---------
+
+A new `sfValidatorIp` has been added (extracted from Symfony2).
+
+Routing
+-------
+
+Routing part receive a huge performance improvement. Routes declared in cache are unserialized on demand.  
+With the usage of combined `lookup_cache_dedicated_keys` and `cache` in `factories.yml`, only routes you use in page are instantiated.
+
+When using routing cache, the cache key generated to identify a route or an URL can be customized by extending the `sfPatternRouting` class.
+
+Action
+------
+
+When you overwrite a module from any plugin, it's not required anymore to copy all view files corresponding to the overloaded actions if you don't only need to modify action code.
+
+Response
+--------
+
+Two new methods have been added :
+
+* `sfWebResponse::clearJavascripts()`
+* `sfWebResponse::clearStylesheet()`
+
+This allow you to remove all stylesheets and/or all javascripts added into the global `view.yml` from action files without added a `view.yml` with `[-*]` in your module.
+
+Request
+-------
+
+A new option `trust_proxy` has been added to `sfWebRequest`.  
+You can set to false by adding `trust_proxy: false` in `request` section of your `factories.yml`.
+
+If set to false, the following methods will not use the `HTTP_X_FORWARDED_*` server indication:
+
+* `getHost()`
+* `isSecure()`
+* `getClientIp()`
+
+The new `sfWebRequest::getClientIp()` method returns the client IP address that made the request.  
+It takes a `proxy` parameter. If set to `false`, the IP will never come from proxy that passed the request.
+
+Response
+--------
+
+A new method `sfWebResponse::prependTitle` has been added.  
+This allow you to prepend title to the previous defined title, split by default by a `-` separator.
+
+Filesystem
+----------
+
+`sfFilesystem::copy()` and `sfFilesystem::rename()` methods now return the result from `copy()` or `rename()` php functions (boolean).
+
+Validator
+---------
+
+The method `sfValidatorSchema::preClean` now returns cleaned values (fixes [#5952](http://trac.symfony-project.org/ticket/5952): *preClean in sfValidatorSchema doesn't returns $values passed to it*).  
+This allow you to modify into validators defined in your form `preValidator`.
+
+The method `sfValidatorErrorSchema::addError` accept all possible name different of `null` as second argement.  
+This allow you to set integer name for named error (fixes [#6112](http://trac.symfony-project.org/ticket/6112): *global errors are rendered on fields*).
+
+Also, the method `sfValidatorErrorSchema::addError` uses much less memory for complex form with many (recursive) embedded forms.
+
+**[BC Break]** The method `sfValidatorErrorSchema::addErrors` only accept a `sfValidatorErrorSchema` instance as argument.
+
+The second argument (an array of errors) of the `sfValidatorErrorSchema` constructor should not be used anymore (marked as deprecated).
+
+A new `sfValidatorEqual` has been added.  
+It take one required `value` option and an optional `strict` to compare strictly or not.
+
+The `sfValidatorFile` now returns size error in Kilo Byte instead of Byte.
+
+A new method `sfValidator::resetType()` has been added.
+
+**[BC Break]** The `trim` option of `sfValidatorBase` is set to `true` by default.
+
+Component
+---------
+
+The `sfAction::renderJson` has been added.
+
+Task
+----
+
+The debug mode of a task is now configurable.  
+You can pass `--no-debug` option to any task, which will deactivate debug mode.
+
+A new `sf_cli` configuration is available.  
+This configuration is used to detect cli context (instead of using only debug mode).  
+This allow to run a task in non-debug mode, usefull for using cache or using `project:optimize` for production environnement.
+
+A new method `sfBaseTask::withTrace()` has been added.  
+This is a proxy method to `sfCommandApplication::withTrace()` if available, returns `false` otherwise.
+
+A new method `sfBaseTask::isVerbose()` has been added.  
+This a proxy method to `sfCommandApplication::isVerbose()` if available, returns `false` otherwise.
+
+A new method `sfBaseTask::showStatus()` has been added.  
+This allow you to display a status bar with the progression, elapsed and reamaining time for repetitive actions in part of your task.
+
+Helper
+------
+
+### Text
+
+Two new arguments `truncate_pattern` and `max_length` (used only when `truncate_pattern` is set) have been added to the `truncate_text` function.  
+See [unit tests](https://github.com/LExpress/symfony1/blob/master/test/unit/helper/TextHelperTest.php#L53) for usage examples.
+
+### Asset
+
+Two new functions `clear_javascripts` and `clear_stylesheets` have been added.  
+This allow you to remove all stylesheets and/or all javascripts added into the global `view.yml` from view files.
+
+Configuration
+-------------
+
+A new configuration `sf_upload_dir_name` contains 'uploads' has been added.
+
+Performance
+-----------
+
+### Disable SwiftMailer for real
+
+You can now completely disable SwiftMailer (which is initialized on **each** request by default) by using the new `sfNoMailer` class in your factories.yml:
+
+    mailer:
+      class: sfNoMailer
+
+Test
+----
+
+A new option `test_path` has been added.  
+This allow you to use another directory for unit tests temporary files storage.
+
+Doctrine
+--------
+
+### Widget
+
+A new `sfWidgetFormDoctrineArrayChoice` has been added.  
+This allow you to use an array built by a table method of a model to increase performance.  
+See [unit tests](https://github.com/LExpress/symfony1/blob/master/lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineArrayChoiceTest.php) for usage examples.
+
+### Form generation
+
+Added column name for foreign key colums.  
+This allow you to add a foreign key on a non primary key (works only for indexed columns on MySQL).
+
+### Task
+
+A new option `skip-build` has been added to `sfDoctrineCreateModelTablesTask`.  
+This option allow you to skip the build model subtask called before the model creation.
+
+The `doctrine:compile` task has been added and the generated file is automaticaly detect and use by symfony.
+
+Tasks
+-----
+
+The `project:optimize` task has been fixed.
+
+`php test/bin/coverage.php` take an optional argument to define only one file for coverage of a symfony class:
+
+```bash
+php test/bin/coverage.php sfWebRequest
+```
+
+Logger
+------
+
+You can now integrate a [psr compliant log](https://github.com/php-fig/log). For this you need to set the psr_logger
+setting to true and configure a service with the id logger.psr.
+
+```YAML
+#In settings.yml
+all:
+  .settings:
+    psr_logger: true
+```
+
+This is a example of service configuration using [monolog](https://github.com/Seldaek/monolog)
+
+```YAML
+#In services.yml
+
+all:
+  services:
+    logger.psr:
+      class: Monolog\Logger
+      arguments: [default]
+      calls:
+        - [pushHandler, [@monolog.handler.file]]
+
+    monolog.handler.file:
+      class: Monolog\Handler\StreamHandler
+      arguments: [/the/file/path/of/your/file.log]
+```
\ No newline at end of file
diff --git a/lib/vendor/symfony/autoload.php b/lib/vendor/symfony/autoload.php
new file mode 100755
index 000000000..3f223a024
--- /dev/null
+++ b/lib/vendor/symfony/autoload.php
@@ -0,0 +1,5 @@
+<?php
+
+require_once __DIR__.'/lib/autoload/sfCoreAutoload.class.php';
+
+sfCoreAutoload::register();
diff --git a/lib/vendor/symfony/composer.json b/lib/vendor/symfony/composer.json
new file mode 100755
index 000000000..2562a3bc5
--- /dev/null
+++ b/lib/vendor/symfony/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "lexpress/symfony1",
+    "description": "Fork of symfony 1.4 with dic, form enhancements, latest swiftmailer and better performance",
+    "license": "MIT",
+    "require": {
+        "swiftmailer/swiftmailer": "~5.2"
+    },
+    "require-dev": {
+        "psr/log": "*"
+    },
+    "type": "library",
+    "autoload": {
+        "files": ["autoload.php"]
+    },
+    "suggest": {
+        "lexpress/doctrine1": "Doctrine plugin",
+        "propel/sf-propel-o-r-m-plugin": "Propel plugin",
+        "psr/log": "Psr logger"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.5-dev"
+        }
+    },
+    "bin": ["data/bin/symfony"]
+}
diff --git a/lib/vendor/symfony/data/bin/changelog.php b/lib/vendor/symfony/data/bin/changelog.php
index a29e22202..55d3c1c6f 100644
--- a/lib/vendor/symfony/data/bin/changelog.php
+++ b/lib/vendor/symfony/data/bin/changelog.php
@@ -15,9 +15,9 @@
  *
  * @package    symfony
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: changelog.php 30952 2010-09-22 02:22:51Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
-require_once dirname(__FILE__).'/../../lib/task/sfFilesystem.class.php';
+require_once __DIR__.'/../../lib/task/sfFilesystem.class.php';
 
 if (!isset($argv[1]))
 {
diff --git a/lib/vendor/symfony/data/bin/check_configuration.php b/lib/vendor/symfony/data/bin/check_configuration.php
index ae21a13a8..0315489ba 100644
--- a/lib/vendor/symfony/data/bin/check_configuration.php
+++ b/lib/vendor/symfony/data/bin/check_configuration.php
@@ -67,25 +67,23 @@ function get_ini_path()
 
 // mandatory
 echo "\n** Mandatory requirements **\n\n";
-check(version_compare(phpversion(), '5.2.4', '>='), sprintf('PHP version is at least 5.2.4 (%s)', phpversion()), 'Current version is '.phpversion(), true);
+check(version_compare(phpversion(), '5.3.1', '>='), sprintf('PHP version is at least 5.3.1 (%s)', phpversion()), 'Current version is '.phpversion(), true);
 
 // warnings
 echo "\n** Optional checks **\n\n";
-check(class_exists('PDO'), 'PDO is installed', 'Install PDO (mandatory for Propel and Doctrine)', false);
+check(class_exists('PDO'), 'PDO is installed', 'Install PDO (mandatory for Doctrine)', false);
 if (class_exists('PDO'))
 {
   $drivers = PDO::getAvailableDrivers();
-  check(count($drivers), 'PDO has some drivers installed: '.implode(', ', $drivers), 'Install PDO drivers (mandatory for Propel and Doctrine)');
+  check(count($drivers), 'PDO has some drivers installed: '.implode(', ', $drivers), 'Install PDO drivers (mandatory for Doctrine)');
 }
-check(class_exists('DomDocument'), 'PHP-XML module is installed', 'Install and enable the php-xml module (required by Propel)', false);
-check(class_exists('XSLTProcessor'), 'XSL module is installed', 'Install and enable the XSL module (recommended for Propel)', false);
 check(function_exists('token_get_all'), 'The token_get_all() function is available', 'Install and enable the Tokenizer extension (highly recommended)', false);
 check(function_exists('mb_strlen'), 'The mb_strlen() function is available', 'Install and enable the mbstring extension', false);
 check(function_exists('iconv'), 'The iconv() function is available', 'Install and enable the iconv extension', false);
 check(function_exists('utf8_decode'), 'The utf8_decode() is available', 'Install and enable the XML extension', false);
 check(function_exists('posix_isatty'), 'The posix_isatty() is available', 'Install and enable the php_posix extension (used to colorized the CLI output)', false);
 
-$accelerator = 
+$accelerator =
   (function_exists('apc_store') && ini_get('apc.enabled'))
   ||
   function_exists('eaccelerator_put') && ini_get('eaccelerator.enable')
@@ -99,7 +97,7 @@ function_exists('xcache_set')
 check(!ini_get('register_globals'), 'php.ini has register_globals set to off', 'Set it to off in php.ini', false);
 check(!ini_get('session.auto_start'), 'php.ini has session.auto_start set to off', 'Set it to off in php.ini', false);
 
-check(version_compare(phpversion(), '5.2.9', '!='), 'PHP version is not 5.2.9', 'PHP 5.2.9 broke array_unique() and sfToolkit::arrayDeepMerge(). Use 5.2.10 instead [Ticket #6211]', false);
+check(class_exists('Memcache'), 'Memcache is available', 'You must have memcache installed and enabled to use sfMemcacheCache class.', false);
 
 if (!is_cli())
 {
diff --git a/lib/vendor/symfony/data/bin/release.php b/lib/vendor/symfony/data/bin/release.php
index 6fe52d2d9..366510b48 100644
--- a/lib/vendor/symfony/data/bin/release.php
+++ b/lib/vendor/symfony/data/bin/release.php
@@ -15,12 +15,12 @@
  *
  * @package    symfony
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: release.php 24079 2009-11-17 07:59:41Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
-require_once(dirname(__FILE__).'/../../lib/exception/sfException.class.php');
-require_once(dirname(__FILE__).'/../../lib/task/sfFilesystem.class.php');
-require_once(dirname(__FILE__).'/../../lib/util/sfFinder.class.php');
-require_once(dirname(__FILE__).'/../../lib/vendor/lime/lime.php');
+require_once(__DIR__.'/../../lib/exception/sfException.class.php');
+require_once(__DIR__.'/../../lib/task/sfFilesystem.class.php');
+require_once(__DIR__.'/../../lib/util/sfFinder.class.php');
+require_once(__DIR__.'/../../lib/vendor/lime/lime.php');
 
 if (!isset($argv[1]))
 {
diff --git a/lib/vendor/symfony/data/bin/sandbox_installer.php b/lib/vendor/symfony/data/bin/sandbox_installer.php
index 57569566b..c45891174 100644
--- a/lib/vendor/symfony/data/bin/sandbox_installer.php
+++ b/lib/vendor/symfony/data/bin/sandbox_installer.php
@@ -1,12 +1,12 @@
 <?php
 
-$this->installDir(dirname(__FILE__).'/sandbox_skeleton');
+$this->installDir(__DIR__.'/sandbox_skeleton');
 
 $this->logSection('install', 'add symfony CLI for Windows users');
-$this->getFilesystem()->copy(dirname(__FILE__).'/symfony.bat', sfConfig::get('sf_root_dir').'/symfony.bat');
+$this->getFilesystem()->copy(__DIR__.'/symfony.bat', sfConfig::get('sf_root_dir').'/symfony.bat');
 
 $this->logSection('install', 'add LICENSE');
-$this->getFilesystem()->copy(dirname(__FILE__).'/../../LICENSE', sfConfig::get('sf_root_dir').'/LICENSE');
+$this->getFilesystem()->copy(__DIR__.'/../../LICENSE', sfConfig::get('sf_root_dir').'/LICENSE');
 
 $this->logSection('install', 'default to sqlite');
 $this->runTask('configure:database', sprintf("'sqlite:%s/sandbox.db'", sfConfig::get('sf_data_dir')));
@@ -26,7 +26,7 @@
 $seen = array();
 foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator(sfConfig::get('sf_root_dir')), RecursiveIteratorIterator::CHILD_FIRST) as $path => $item)
 {
-  if ($item->isDir() && !$item->isLink() && !isset($seen[$path]))
+  if (!isset($seen[$path]) && $item->isDir() && !$item->isLink())
   {
     touch($item->getRealPath().'/.sf');
   }
diff --git a/lib/vendor/symfony/data/bin/symfony b/lib/vendor/symfony/data/bin/symfony
index b45db0907..e8ccac14e 100755
--- a/lib/vendor/symfony/data/bin/symfony
+++ b/lib/vendor/symfony/data/bin/symfony
@@ -17,10 +17,10 @@ if (file_exists('config/ProjectConfiguration.class.php'))
 }
 else
 {
-  if (is_readable(dirname(__FILE__).'/../../lib/autoload/sfCoreAutoload.class.php'))
+  if (is_readable(__DIR__.'/../../lib/autoload/sfCoreAutoload.class.php'))
   {
     // SVN
-    $dir = realpath(dirname(__FILE__).'/../../lib');
+    $dir = realpath(__DIR__.'/../../lib');
   }
   else
   {
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/add.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/add.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/cancel.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/cancel.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/default_icon.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/default_icon.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/delete.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/delete.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/edit.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/edit.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/error.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/error.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/filter.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/filter.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/first.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/first.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/last.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/last.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/list.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/list.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/next.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/next.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/ok.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/ok.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/previous.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/previous.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/reset.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/reset.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/save.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/save.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/data/web/sf/sf_admin/images/tick.png b/lib/vendor/symfony/data/web/sf/sf_admin/images/tick.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/data/web/sf/sf_web_debug/images/config.png b/lib/vendor/symfony/data/web/sf/sf_web_debug/images/config.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/data/web/sf/sf_web_debug/images/database.png b/lib/vendor/symfony/data/web/sf/sf_web_debug/images/database.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/data/web/sf/sf_web_debug/images/log.png b/lib/vendor/symfony/data/web/sf/sf_web_debug/images/log.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/data/web/sf/sf_web_debug/images/memory.png b/lib/vendor/symfony/data/web/sf/sf_web_debug/images/memory.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/data/web/sf/sf_web_debug/images/time.png b/lib/vendor/symfony/data/web/sf/sf_web_debug/images/time.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/lib/action/sfAction.class.php b/lib/vendor/symfony/lib/action/sfAction.class.php
index 08988e120..5567d17e2 100644
--- a/lib/vendor/symfony/lib/action/sfAction.class.php
+++ b/lib/vendor/symfony/lib/action/sfAction.class.php
@@ -16,7 +16,7 @@
  * @subpackage action
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfAction.class.php 24279 2009-11-23 15:21:18Z fabien $
+ * @version    SVN: $Id$
  */
 abstract class sfAction extends sfComponent
 {
@@ -268,6 +268,23 @@ public function renderText($text)
     return sfView::NONE;
   }
 
+  /**
+   * Convert the given data into a JSON response.
+   *
+   * <code>return $this->renderJson(array('username' => 'john'))</code>
+   *
+   * @param mixed $data Data to encode as JSON
+   *
+   * @return sfView::NONE
+   */
+  public function renderJson($data)
+  {
+    $this->getResponse()->setContentType('application/json');
+    $this->getResponse()->setContent(json_encode($data));
+
+    return sfView::NONE;
+  }
+
   /**
    * Returns the partial rendered content.
    *
@@ -436,7 +453,8 @@ public function setTemplate($name, $module = null)
 
     if (null !== $module)
     {
-      $name = sfConfig::get('sf_app_dir').'/modules/'.$module.'/templates/'.$name;
+      $dir = $this->context->getConfiguration()->getTemplateDir($module, $name.sfView::SUCCESS.'.php');
+      $name = $dir.'/'.$name;
     }
 
     sfConfig::set('symfony.view.'.$this->getModuleName().'_'.$this->getActionName().'_template', $name);
diff --git a/lib/vendor/symfony/lib/action/sfActionStack.class.php b/lib/vendor/symfony/lib/action/sfActionStack.class.php
index ce31a6823..bd31caafa 100644
--- a/lib/vendor/symfony/lib/action/sfActionStack.class.php
+++ b/lib/vendor/symfony/lib/action/sfActionStack.class.php
@@ -17,7 +17,7 @@
  * @subpackage action
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfActionStack.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfActionStack
 {
diff --git a/lib/vendor/symfony/lib/action/sfActionStackEntry.class.php b/lib/vendor/symfony/lib/action/sfActionStackEntry.class.php
index 61a64a43c..32f691126 100644
--- a/lib/vendor/symfony/lib/action/sfActionStackEntry.class.php
+++ b/lib/vendor/symfony/lib/action/sfActionStackEntry.class.php
@@ -16,7 +16,7 @@
  * @subpackage action
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfActionStackEntry.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfActionStackEntry
 {
diff --git a/lib/vendor/symfony/lib/action/sfActions.class.php b/lib/vendor/symfony/lib/action/sfActions.class.php
index acab76f20..fcc84b47c 100644
--- a/lib/vendor/symfony/lib/action/sfActions.class.php
+++ b/lib/vendor/symfony/lib/action/sfActions.class.php
@@ -16,7 +16,7 @@
  * @subpackage action
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfActions.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class sfActions extends sfAction
 {
diff --git a/lib/vendor/symfony/lib/action/sfComponent.class.php b/lib/vendor/symfony/lib/action/sfComponent.class.php
index 0e0459dcb..4583097bb 100644
--- a/lib/vendor/symfony/lib/action/sfComponent.class.php
+++ b/lib/vendor/symfony/lib/action/sfComponent.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage action
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfComponent.class.php 23922 2009-11-14 14:58:38Z fabien $
+ * @version    SVN: $Id$
  */
 abstract class sfComponent
 {
@@ -106,6 +106,28 @@ public final function getContext()
     return $this->context;
   }
 
+  /**
+   * Retrieves the current service container instance.
+   *
+   * @return sfServiceContainer The current sfServiceContainer instance
+   */
+  public final function getServiceContainer()
+  {
+    return $this->context->getServiceContainer();
+  }
+
+  /**
+   * Retrieves a service from the service container.
+   *
+   * @param  string $id The service identifier
+   *
+   * @return object The service instance
+   */
+  public function getService($id)
+  {
+    return $this->getServiceContainer()->getService($id);
+  }
+
   /**
    * Retrieves the current logger instance.
    *
@@ -134,6 +156,20 @@ public function logMessage($message, $priority = 'info')
     }
   }
 
+  /**
+   * Gets the translation for the given string
+   *
+   * @param  string $string     The string to translate
+   * @param  array  $args       An array of arguments for the translation
+   * @param  string $catalogue  The catalogue name
+   *
+   * @return string The translated string
+   */
+  public function __($string, $args = array(), $catalogue = 'messages')
+  {
+    return $this->context->getI18N()->__($string, $args, $catalogue);
+  }
+
   /**
    * Returns the value of a request parameter.
    *
diff --git a/lib/vendor/symfony/lib/action/sfComponents.class.php b/lib/vendor/symfony/lib/action/sfComponents.class.php
index 3efa9a07b..9c8ceae78 100644
--- a/lib/vendor/symfony/lib/action/sfComponents.class.php
+++ b/lib/vendor/symfony/lib/action/sfComponents.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage action
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfComponents.class.php 20780 2009-08-04 20:30:32Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class sfComponents extends sfComponent
 {
diff --git a/lib/vendor/symfony/lib/addon/sfData.class.php b/lib/vendor/symfony/lib/addon/sfData.class.php
index 61c6b48b9..9741246cb 100644
--- a/lib/vendor/symfony/lib/addon/sfData.class.php
+++ b/lib/vendor/symfony/lib/addon/sfData.class.php
@@ -15,7 +15,7 @@
  * @package    symfony
  * @subpackage addon
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfData.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class sfData
 {
@@ -53,7 +53,7 @@ public function getDeleteCurrentData()
   protected function doLoadDataFromFile($file)
   {
     // import new datas
-    $data = sfYaml::load($file);
+    $data = sfYaml::load($file, sfConfig::get('sf_charset', 'UTF-8'));
 
     $this->loadDataFromArray($data);
   }
diff --git a/lib/vendor/symfony/lib/addon/sfPager.class.php b/lib/vendor/symfony/lib/addon/sfPager.class.php
index 47b231c94..a7d56a037 100644
--- a/lib/vendor/symfony/lib/addon/sfPager.class.php
+++ b/lib/vendor/symfony/lib/addon/sfPager.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage addon
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPager.class.php 27747 2010-02-08 18:02:19Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class sfPager implements Iterator, Countable
 {
@@ -380,7 +380,7 @@ public function getPreviousPage()
    */
   public function setPage($page)
   {
-    $this->page = intval($page);
+    $this->page = (int) $page;
 
     if ($this->page <= 0)
     {
diff --git a/lib/vendor/symfony/lib/autoload/sfAutoload.class.php b/lib/vendor/symfony/lib/autoload/sfAutoload.class.php
index 0a3748928..e3718a1e5 100644
--- a/lib/vendor/symfony/lib/autoload/sfAutoload.class.php
+++ b/lib/vendor/symfony/lib/autoload/sfAutoload.class.php
@@ -17,7 +17,7 @@
  * @package    symfony
  * @subpackage autoload
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfAutoload.class.php 23205 2009-10-20 13:20:17Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfAutoload
 {
@@ -124,18 +124,29 @@ public function reloadClasses($force = false)
     }
 
     self::$freshCache = true;
-    if (file_exists($configuration->getConfigCache()->getCacheName('config/autoload.yml')))
+    if (is_file($configuration->getConfigCache()->getCacheName('config/autoload.yml')))
     {
       self::$freshCache = false;
       if ($force)
       {
-        unlink($configuration->getConfigCache()->getCacheName('config/autoload.yml'));
+        if (file_exists($configuration->getConfigCache()->getCacheName('config/autoload.yml')))
+        {
+          unlink($configuration->getConfigCache()->getCacheName('config/autoload.yml'));
+        }
       }
     }
 
     $file = $configuration->getConfigCache()->checkConfig('config/autoload.yml');
 
-    $this->classes = include($file);
+    if ($force && defined('HHVM_VERSION'))
+    {
+      // workaround for https://github.com/facebook/hhvm/issues/1447
+      $this->classes = eval(str_replace('<?php', '', file_get_contents($file)));
+    }
+    else
+    {
+      $this->classes = include $file;
+    }
 
     foreach ($this->overriden as $class => $path)
     {
diff --git a/lib/vendor/symfony/lib/autoload/sfAutoloadAgain.class.php b/lib/vendor/symfony/lib/autoload/sfAutoloadAgain.class.php
index 065516b43..6d61df830 100644
--- a/lib/vendor/symfony/lib/autoload/sfAutoloadAgain.class.php
+++ b/lib/vendor/symfony/lib/autoload/sfAutoloadAgain.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage autoload
  * @author     Kris Wallsmith <kris.wallsmith@symfony-project.com>
- * @version    SVN: $Id: sfAutoloadAgain.class.php 22248 2009-09-22 17:15:16Z fabien $
+ * @version    SVN: $Id$
  */
 class sfAutoloadAgain
 {
@@ -69,7 +69,7 @@ public function autoload($class)
     {
       foreach ($autoloads as $position => $autoload)
       {
-        if ($this === $autoload[0])
+        if (is_array($autoload) && $this === $autoload[0])
         {
           break;
         }
diff --git a/lib/vendor/symfony/lib/autoload/sfCoreAutoload.class.php b/lib/vendor/symfony/lib/autoload/sfCoreAutoload.class.php
old mode 100644
new mode 100755
index ab105507d..896a44fda
--- a/lib/vendor/symfony/lib/autoload/sfCoreAutoload.class.php
+++ b/lib/vendor/symfony/lib/autoload/sfCoreAutoload.class.php
@@ -11,7 +11,7 @@
 /**
  * The current symfony version.
  */
-define('SYMFONY_VERSION', '1.4.13');
+define('SYMFONY_VERSION', '1.5.9');
 
 /**
  * sfCoreAutoload class.
@@ -23,7 +23,7 @@
  * @subpackage autoload
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @version    SVN: $Id: sfCoreAutoload.class.php 32415 2011-03-30 16:09:00Z Kris.Wallsmith
- $
+ *
  */
 class sfCoreAutoload
 {
@@ -36,7 +36,7 @@ class sfCoreAutoload
 
   protected function __construct()
   {
-    $this->baseDir = realpath(dirname(__FILE__).'/..');
+    $this->baseDir = realpath(__DIR__.'/..');
   }
 
   /**
@@ -141,7 +141,7 @@ public function getBaseDir()
    */
   static public function make()
   {
-    $libDir = str_replace(DIRECTORY_SEPARATOR, '/', realpath(dirname(__FILE__).DIRECTORY_SEPARATOR.'..'));
+    $libDir = str_replace(DIRECTORY_SEPARATOR, '/', realpath(__DIR__.DIRECTORY_SEPARATOR.'..'));
     require_once $libDir.'/util/sfFinder.class.php';
 
     $files = sfFinder::type('file')
@@ -163,7 +163,9 @@ static public function make()
       $class = basename($file, false === strpos($file, '.class.php') ? '.php' : '.class.php');
 
       $contents = file_get_contents($file);
-      if (false !== stripos($contents, 'class '.$class) || false !== stripos($contents, 'interface '.$class))
+      if (false !== stripos($contents, 'class '.$class)
+          || false !== stripos($contents, 'interface '.$class)
+          || false !== stripos($contents, 'trait '.$class))
       {
         $classes .= sprintf("    '%s' => '%s',\n", strtolower($class), substr(str_replace($libDir, '', $file), 1));
       }
@@ -228,6 +230,7 @@ static public function make()
     'sfrootconfighandler' => 'config/sfRootConfigHandler.class.php',
     'sfroutingconfighandler' => 'config/sfRoutingConfigHandler.class.php',
     'sfsecurityconfighandler' => 'config/sfSecurityConfigHandler.class.php',
+    'sfserviceconfighandler' => 'config/sfServiceConfigHandler.class.php',
     'sfsimpleyamlconfighandler' => 'config/sfSimpleYamlConfigHandler.class.php',
     'sfviewconfighandler' => 'config/sfViewConfigHandler.class.php',
     'sfyamlconfighandler' => 'config/sfYamlConfigHandler.class.php',
@@ -259,8 +262,8 @@ static public function make()
     'sfoutputescaperiteratordecorator' => 'escaper/sfOutputEscaperIteratorDecorator.class.php',
     'sfoutputescaperobjectdecorator' => 'escaper/sfOutputEscaperObjectDecorator.class.php',
     'sfoutputescapersafe' => 'escaper/sfOutputEscaperSafe.class.php',
-    'sfevent' => 'event_dispatcher/sfEvent.php',
-    'sfeventdispatcher' => 'event_dispatcher/sfEventDispatcher.php',
+    'sfevent' => 'event/sfEvent.class.php',
+    'sfeventdispatcher' => 'event/sfEventDispatcher.class.php',
     'sfcacheexception' => 'exception/sfCacheException.class.php',
     'sfconfigurationexception' => 'exception/sfConfigurationException.class.php',
     'sfcontrollerexception' => 'exception/sfControllerException.class.php',
@@ -319,22 +322,26 @@ static public function make()
     'sfmessagesource_file' => 'i18n/sfMessageSource_File.class.php',
     'sfmessagesource_mysql' => 'i18n/sfMessageSource_MySQL.class.php',
     'sfmessagesource_sqlite' => 'i18n/sfMessageSource_SQLite.class.php',
+    'sfmessagesource_sqlite3' => 'i18n/sfMessageSource_SQLite3.class.php',
     'sfmessagesource_xliff' => 'i18n/sfMessageSource_XLIFF.class.php',
     'sfmessagesource_gettext' => 'i18n/sfMessageSource_gettext.class.php',
     'sfnumberformat' => 'i18n/sfNumberFormat.class.php',
     'sfnumberformatinfo' => 'i18n/sfNumberFormatInfo.class.php',
     'sfaggregatelogger' => 'log/sfAggregateLogger.class.php',
     'sfconsolelogger' => 'log/sfConsoleLogger.class.php',
+    'sfeventlogger' => 'log/sfEventLogger.class.php',
     'sffilelogger' => 'log/sfFileLogger.class.php',
     'sflogger' => 'log/sfLogger.class.php',
     'sfloggerinterface' => 'log/sfLoggerInterface.class.php',
     'sfloggerwrapper' => 'log/sfLoggerWrapper.class.php',
     'sfnologger' => 'log/sfNoLogger.class.php',
+    'sfpsrloggeradapter' => 'log/sfPsrLoggerAdapter.class.php',
     'sfstreamlogger' => 'log/sfStreamLogger.class.php',
     'sfvarlogger' => 'log/sfVarLogger.class.php',
     'sfwebdebuglogger' => 'log/sfWebDebugLogger.class.php',
     'sfmailer' => 'mailer/sfMailer.class.php',
     'sfmailermessageloggerplugin' => 'mailer/sfMailerMessageLoggerPlugin.class.php',
+    'sfnomailer' => 'mailer/sfNoMailer.class.php',
     'sfpearconfig' => 'plugin/sfPearConfig.class.php',
     'sfpeardownloader' => 'plugin/sfPearDownloader.class.php',
     'sfpearenvironment' => 'plugin/sfPearEnvironment.class.php',
@@ -360,6 +367,19 @@ static public function make()
     'sfroute' => 'routing/sfRoute.class.php',
     'sfroutecollection' => 'routing/sfRouteCollection.class.php',
     'sfrouting' => 'routing/sfRouting.class.php',
+    'sfservicecontainer' => 'service/sfServiceContainer.class.php',
+    'sfservicecontainerbuilder' => 'service/sfServiceContainerBuilder.class.php',
+    'sfservicecontainerdumper' => 'service/sfServiceContainerDumper.class.php',
+    'sfservicecontainerdumpergraphviz' => 'service/sfServiceContainerDumperGraphviz.class.php',
+    'sfservicecontainerdumperinterface' => 'service/sfServiceContainerDumperInterface.class.php',
+    'sfservicecontainerdumperphp' => 'service/sfServiceContainerDumperPhp.class.php',
+    'sfservicecontainerinterface' => 'service/sfServiceContainerInterface.class.php',
+    'sfservicecontainerloader' => 'service/sfServiceContainerLoader.class.php',
+    'sfservicecontainerloaderarray' => 'service/sfServiceContainerLoaderArray.class.php',
+    'sfservicecontainerloaderinterface' => 'service/sfServiceContainerLoaderInterface.class.php',
+    'sfservicedefinition' => 'service/sfServiceDefinition.class.php',
+    'sfserviceparameter' => 'service/sfServiceParameter.class.php',
+    'sfservicereference' => 'service/sfServiceReference.class.php',
     'sfcachesessionstorage' => 'storage/sfCacheSessionStorage.class.php',
     'sfdatabasesessionstorage' => 'storage/sfDatabaseSessionStorage.class.php',
     'sfmysqlsessionstorage' => 'storage/sfMySQLSessionStorage.class.php',
@@ -417,6 +437,7 @@ static public function make()
     'sftestbasetask' => 'task/test/sfTestBaseTask.class.php',
     'sftestcoveragetask' => 'task/test/sfTestCoverageTask.class.php',
     'sftestfunctionaltask' => 'task/test/sfTestFunctionalTask.class.php',
+    'sftestplugintask' => 'task/test/sfTestPluginTask.class.php',
     'sftestunittask' => 'task/test/sfTestUnitTask.class.php',
     'sftestbrowser' => 'test/sfTestBrowser.class.php',
     'sftestfunctional' => 'test/sfTestFunctional.class.php',
@@ -457,11 +478,14 @@ static public function make()
     'sfvalidatordatetime' => 'validator/sfValidatorDateTime.class.php',
     'sfvalidatordecorator' => 'validator/sfValidatorDecorator.class.php',
     'sfvalidatoremail' => 'validator/sfValidatorEmail.class.php',
+    'sfvalidatorequal' => 'validator/sfValidatorEqual.class.php',
     'sfvalidatorerror' => 'validator/sfValidatorError.class.php',
     'sfvalidatorerrorschema' => 'validator/sfValidatorErrorSchema.class.php',
     'sfvalidatorfile' => 'validator/sfValidatorFile.class.php',
+    'sfvalidatorfilemulti' => 'validator/sfValidatorFileMulti.class.php',
     'sfvalidatorfromdescription' => 'validator/sfValidatorFromDescription.class.php',
     'sfvalidatorinteger' => 'validator/sfValidatorInteger.class.php',
+    'sfvalidatorip' => 'validator/sfValidatorIp.class.php',
     'sfvalidatornumber' => 'validator/sfValidatorNumber.class.php',
     'sfvalidatoror' => 'validator/sfValidatorOr.class.php',
     'sfvalidatorpass' => 'validator/sfValidatorPass.class.php',
@@ -469,7 +493,6 @@ static public function make()
     'sfvalidatorschema' => 'validator/sfValidatorSchema.class.php',
     'sfvalidatorschemacompare' => 'validator/sfValidatorSchemaCompare.class.php',
     'sfvalidatorschemafilter' => 'validator/sfValidatorSchemaFilter.class.php',
-    'sfvalidatorschemaforeach' => 'validator/sfValidatorSchemaForEach.class.php',
     'sfvalidatorstring' => 'validator/sfValidatorString.class.php',
     'sfvalidatortime' => 'validator/sfValidatorTime.class.php',
     'sfvalidatorurl' => 'validator/sfValidatorUrl.class.php',
@@ -497,13 +520,14 @@ static public function make()
     'sfwidgetforminput' => 'widget/sfWidgetFormInput.class.php',
     'sfwidgetforminputcheckbox' => 'widget/sfWidgetFormInputCheckbox.class.php',
     'sfwidgetforminputfile' => 'widget/sfWidgetFormInputFile.class.php',
+    'sfwidgetforminputfilemulti' => 'widget/sfWidgetFormInputFileMulti.class.php',
     'sfwidgetforminputfileeditable' => 'widget/sfWidgetFormInputFileEditable.class.php',
     'sfwidgetforminputhidden' => 'widget/sfWidgetFormInputHidden.class.php',
     'sfwidgetforminputpassword' => 'widget/sfWidgetFormInputPassword.class.php',
+    'sfwidgetforminputread' => 'widget/sfWidgetFormInputRead.class.php',
     'sfwidgetforminputtext' => 'widget/sfWidgetFormInputText.class.php',
     'sfwidgetformschema' => 'widget/sfWidgetFormSchema.class.php',
     'sfwidgetformschemadecorator' => 'widget/sfWidgetFormSchemaDecorator.class.php',
-    'sfwidgetformschemaforeach' => 'widget/sfWidgetFormSchemaForEach.class.php',
     'sfwidgetformschemaformatter' => 'widget/sfWidgetFormSchemaFormatter.class.php',
     'sfwidgetformschemaformatterlist' => 'widget/sfWidgetFormSchemaFormatterList.class.php',
     'sfwidgetformschemaformattertable' => 'widget/sfWidgetFormSchemaFormatterTable.class.php',
@@ -513,9 +537,9 @@ static public function make()
     'sfwidgetformselectradio' => 'widget/sfWidgetFormSelectRadio.class.php',
     'sfwidgetformtextarea' => 'widget/sfWidgetFormTextarea.class.php',
     'sfwidgetformtime' => 'widget/sfWidgetFormTime.class.php',
-    'sfyaml' => 'yaml/sfYaml.php',
-    'sfyamldumper' => 'yaml/sfYamlDumper.php',
-    'sfyamlinline' => 'yaml/sfYamlInline.php',
-    'sfyamlparser' => 'yaml/sfYamlParser.php',
+    'sfyaml' => 'yaml/sfYaml.class.php',
+    'sfyamldumper' => 'yaml/sfYamlDumper.class.php',
+    'sfyamlinline' => 'yaml/sfYamlInline.class.php',
+    'sfyamlparser' => 'yaml/sfYamlParser.class.php',
   );
 }
diff --git a/lib/vendor/symfony/lib/autoload/sfSimpleAutoload.class.php b/lib/vendor/symfony/lib/autoload/sfSimpleAutoload.class.php
old mode 100644
new mode 100755
index 91d43d595..ebded51f6
--- a/lib/vendor/symfony/lib/autoload/sfSimpleAutoload.class.php
+++ b/lib/vendor/symfony/lib/autoload/sfSimpleAutoload.class.php
@@ -17,7 +17,7 @@
  * @package    symfony
  * @subpackage autoload
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfSimpleAutoload.class.php 23205 2009-10-20 13:20:17Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfSimpleAutoload
 {
@@ -286,7 +286,7 @@ public function addFile($file, $register = true)
       $this->cacheChanged = true;
     }
 
-    preg_match_all('~^\s*(?:abstract\s+|final\s+)?(?:class|interface)\s+(\w+)~mi', file_get_contents($file), $classes);
+    preg_match_all('~^\s*(?:abstract\s+|final\s+)?(?:class|interface|trait)\s+(\w+)~mi', file_get_contents($file), $classes);
     foreach ($classes[1] as $class)
     {
       $this->classes[strtolower($class)] = $file;
diff --git a/lib/vendor/symfony/lib/cache/sfAPCCache.class.php b/lib/vendor/symfony/lib/cache/sfAPCCache.class.php
index 515d23aba..db1a150d9 100644
--- a/lib/vendor/symfony/lib/cache/sfAPCCache.class.php
+++ b/lib/vendor/symfony/lib/cache/sfAPCCache.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -14,10 +14,12 @@
  * @package    symfony
  * @subpackage cache
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfAPCCache.class.php 21990 2009-09-13 21:09:18Z FabianLange $
+ * @version    SVN: $Id$
  */
 class sfAPCCache extends sfCache
 {
+  protected $enabled;
+
   /**
    * Initializes this sfCache instance.
    *
@@ -31,10 +33,7 @@ public function initialize($options = array())
   {
     parent::initialize($options);
 
-    if (!function_exists('apc_store') || !ini_get('apc.enabled'))
-    {
-      throw new sfInitializationException('You must have APC installed and enabled to use sfAPCCache class.');
-    }
+    $this->enabled = function_exists('apc_store') && ini_get('apc.enabled');
   }
 
  /**
@@ -42,7 +41,13 @@ public function initialize($options = array())
   */
   public function get($key, $default = null)
   {
+    if (!$this->enabled)
+    {
+      return $default;
+    }
+
     $value = $this->fetch($this->getOption('prefix').$key, $has);
+
     return $has ? $value : $default;
   }
 
@@ -51,7 +56,13 @@ public function get($key, $default = null)
    */
   public function has($key)
   {
+    if (!$this->enabled)
+    {
+      return false;
+    }
+
     $this->fetch($this->getOption('prefix').$key, $has);
+
     return $has;
   }
 
@@ -68,15 +79,21 @@ private function fetch($key, &$success)
     {
       $success = $value !== false;
     }
+
     return $value;
   }
-  
-  
+
+
   /**
    * @see sfCache
    */
   public function set($key, $data, $lifetime = null)
   {
+    if (!$this->enabled)
+    {
+      return true;
+    }
+
     return apc_store($this->getOption('prefix').$key, $data, $this->getLifetime($lifetime));
   }
 
@@ -85,6 +102,11 @@ public function set($key, $data, $lifetime = null)
    */
   public function remove($key)
   {
+    if (!$this->enabled)
+    {
+      return true;
+    }
+
     return apc_delete($this->getOption('prefix').$key);
   }
 
@@ -93,6 +115,11 @@ public function remove($key)
    */
   public function clean($mode = sfCache::ALL)
   {
+    if (!$this->enabled)
+    {
+      return true;
+    }
+
     if (sfCache::ALL === $mode)
     {
       return apc_clear_cache('user');
@@ -130,6 +157,11 @@ public function getTimeout($key)
    */
   public function removePattern($pattern)
   {
+    if (!$this->enabled)
+    {
+      return true;
+    }
+
     $infos = apc_cache_info('user');
     if (!is_array($infos['cache_list']))
     {
@@ -147,8 +179,20 @@ public function removePattern($pattern)
     }
   }
 
+  /**
+   * Gets the cache info
+   *
+   * @param  string $key The cache key
+   *
+   * @return string
+   */
   protected function getCacheInfo($key)
   {
+    if (!$this->enabled)
+    {
+      return false;
+    }
+
     $infos = apc_cache_info('user');
 
     if (is_array($infos['cache_list']))
diff --git a/lib/vendor/symfony/lib/cache/sfCache.class.php b/lib/vendor/symfony/lib/cache/sfCache.class.php
index e81e76674..af2c89091 100644
--- a/lib/vendor/symfony/lib/cache/sfCache.class.php
+++ b/lib/vendor/symfony/lib/cache/sfCache.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage cache
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfCache.class.php 28842 2010-03-29 08:18:46Z fabien $
+ * @version    SVN: $Id$
  */
 abstract class sfCache
 {
@@ -57,7 +57,7 @@ public function initialize($options = array())
     $this->options = array_merge(array(
       'automatic_cleaning_factor' => 1000,
       'lifetime'                  => 86400,
-      'prefix'                    => md5(dirname(__FILE__)),
+      'prefix'                    => md5(__DIR__),
     ), $options);
 
     $this->options['prefix'] .= self::SEPARATOR;
diff --git a/lib/vendor/symfony/lib/cache/sfEAcceleratorCache.class.php b/lib/vendor/symfony/lib/cache/sfEAcceleratorCache.class.php
index 50d8f6450..fb620c068 100644
--- a/lib/vendor/symfony/lib/cache/sfEAcceleratorCache.class.php
+++ b/lib/vendor/symfony/lib/cache/sfEAcceleratorCache.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage cache
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfEAcceleratorCache.class.php 21908 2009-09-11 12:06:21Z fabien $
+ * @version    SVN: $Id$
  */
 class sfEAcceleratorCache extends sfCache
 {
diff --git a/lib/vendor/symfony/lib/cache/sfFileCache.class.php b/lib/vendor/symfony/lib/cache/sfFileCache.class.php
index 879929d27..72f8c9cf0 100644
--- a/lib/vendor/symfony/lib/cache/sfFileCache.class.php
+++ b/lib/vendor/symfony/lib/cache/sfFileCache.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage cache
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfFileCache.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfFileCache extends sfCache
 {
@@ -53,7 +53,7 @@ public function initialize($options = array())
   public function get($key, $default = null)
   {
     $file_path = $this->getFilePath($key);
-    if (!file_exists($file_path))
+    if (!is_file($file_path))
     {
       return $default;
     }
@@ -74,7 +74,8 @@ public function get($key, $default = null)
   public function has($key)
   {
     $path = $this->getFilePath($key);
-    return file_exists($path) && $this->isValid($path);
+
+    return is_file($path) && $this->isValid($path);
   }
 
   /**
@@ -82,7 +83,7 @@ public function has($key)
    */
   public function set($key, $data, $lifetime = null)
   {
-    if ($this->getOption('automatic_cleaning_factor') > 0 && rand(1, $this->getOption('automatic_cleaning_factor')) == 1)
+    if ($this->getOption('automatic_cleaning_factor') > 0 && mt_rand(1, $this->getOption('automatic_cleaning_factor')) == 1)
     {
       $this->clean(sfCache::OLD);
     }
@@ -164,7 +165,7 @@ public function getTimeout($key)
   {
     $path = $this->getFilePath($key);
 
-    if (!file_exists($path))
+    if (!is_file($path))
     {
       return 0;
     }
@@ -181,11 +182,11 @@ public function getLastModified($key)
   {
     $path = $this->getFilePath($key);
 
-    if (!file_exists($path))
+    if (!is_file($path))
     {
       return 0;
     }
-    
+
     $data = $this->read($path, self::READ_TIMEOUT | self::READ_LAST_MODIFIED);
 
     if ($data[self::READ_TIMEOUT] < time())
@@ -234,12 +235,12 @@ protected function read($path, $type = self::READ_DATA)
     }
 
     @flock($fp, LOCK_SH);
-    $data[self::READ_TIMEOUT] = intval(@stream_get_contents($fp, 12, 0));
+    $data[self::READ_TIMEOUT] = (int) @stream_get_contents($fp, 12, 0);
     if ($type != self::READ_TIMEOUT && time() < $data[self::READ_TIMEOUT])
     {
       if ($type & self::READ_LAST_MODIFIED)
       {
-        $data[self::READ_LAST_MODIFIED] = intval(@stream_get_contents($fp, 12, 12));
+        $data[self::READ_LAST_MODIFIED] = (int) @stream_get_contents($fp, 12, 12);
       }
       if ($type & self::READ_DATA)
       {
@@ -276,13 +277,13 @@ protected function write($path, $data, $timeout)
     $current_umask = umask();
     umask(0000);
 
-    if (!is_dir(dirname($path)))
+    $cacheDir = dirname($path);
+    if (!is_dir($cacheDir) && !@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir))
     {
-      // create directory structure if needed
-      mkdir(dirname($path), 0777, true);
+      throw new \sfCacheException(sprintf('Cache was not able to create a directory "%s".', $cacheDir));
     }
 
-    $tmpFile = tempnam(dirname($path), basename($path));
+    $tmpFile = tempnam($cacheDir, basename($path));
 
     if (!$fp = @fopen($tmpFile, 'wb'))
     {
diff --git a/lib/vendor/symfony/lib/cache/sfFunctionCache.class.php b/lib/vendor/symfony/lib/cache/sfFunctionCache.class.php
index 664ade444..46a06a5b3 100644
--- a/lib/vendor/symfony/lib/cache/sfFunctionCache.class.php
+++ b/lib/vendor/symfony/lib/cache/sfFunctionCache.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage cache
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfFunctionCache.class.php 23939 2009-11-14 17:46:14Z fabien $
+ * @version    SVN: $Id$
  */
 class sfFunctionCache
 {
diff --git a/lib/vendor/symfony/lib/cache/sfMemcacheCache.class.php b/lib/vendor/symfony/lib/cache/sfMemcacheCache.class.php
index 099debee6..2b4ae9f7c 100644
--- a/lib/vendor/symfony/lib/cache/sfMemcacheCache.class.php
+++ b/lib/vendor/symfony/lib/cache/sfMemcacheCache.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage cache
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfMemcacheCache.class.php 29490 2010-05-17 13:09:00Z fabien $
+ * @version    SVN: $Id$
  */
 class sfMemcacheCache extends sfCache
 {
@@ -92,7 +92,7 @@ public function get($key, $default = null)
   {
     $value = $this->memcache->get($this->getOption('prefix').$key);
 
-    return false === $value ? $default : $value;
+    return (false === $value && false === $this->getMetadata($key)) ? $default : $value;
   }
 
   /**
@@ -100,7 +100,13 @@ public function get($key, $default = null)
    */
   public function has($key)
   {
-    return !(false === $this->memcache->get($this->getOption('prefix').$key));
+    if (false === $this->memcache->get($this->getOption('prefix') . $key))
+    {
+      // if there is metadata, $key exists with a false value
+      return !(false === $this->getMetadata($key));
+    }
+
+    return true;
   }
 
   /**
@@ -232,7 +238,7 @@ protected function getMetadata($key)
    */
   protected function setMetadata($key, $lifetime)
   {
-    $this->memcache->set($this->getOption('prefix').'_metadata'.self::SEPARATOR.$key, array('lastModified' => time(), 'timeout' => time() + $lifetime), false, $lifetime);
+    $this->memcache->set($this->getOption('prefix').'_metadata'.self::SEPARATOR.$key, array('lastModified' => time(), 'timeout' => time() + $lifetime), false, time() + $lifetime);
   }
 
   /**
diff --git a/lib/vendor/symfony/lib/cache/sfNoCache.class.php b/lib/vendor/symfony/lib/cache/sfNoCache.class.php
index a6ccda285..174ccb2fe 100644
--- a/lib/vendor/symfony/lib/cache/sfNoCache.class.php
+++ b/lib/vendor/symfony/lib/cache/sfNoCache.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage cache
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfNoCache.class.php 10970 2008-08-19 19:02:38Z fabien $
+ * @version    SVN: $Id$
  */
 class sfNoCache extends sfCache
 {
diff --git a/lib/vendor/symfony/lib/cache/sfSQLiteCache.class.php b/lib/vendor/symfony/lib/cache/sfSQLiteCache.class.php
index 8d1b1b46c..f46d4f80f 100644
--- a/lib/vendor/symfony/lib/cache/sfSQLiteCache.class.php
+++ b/lib/vendor/symfony/lib/cache/sfSQLiteCache.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -14,13 +14,14 @@
  * @package    symfony
  * @subpackage cache
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfSQLiteCache.class.php 23501 2009-11-01 22:54:37Z FabianLange $
+ * @version    SVN: $Id$
  */
 class sfSQLiteCache extends sfCache
 {
   protected
-    $dbh      = null,
-    $database = '';
+    $dbh            = null,
+    $sqlLiteVersion = null,
+    $database       = '';
 
   /**
    * Initializes this sfCache instance.
@@ -63,7 +64,14 @@ public function getBackend()
    */
   public function get($key, $default = null)
   {
-    $data = $this->dbh->singleQuery(sprintf("SELECT data FROM cache WHERE key = '%s' AND timeout > %d", sqlite_escape_string($key), time()));
+    if ($this->isSqLite3())
+    {
+      $data = $this->dbh->querySingle(sprintf("SELECT data FROM cache WHERE key = '%s' AND timeout > %d", $this->dbh->escapeString($key), time()));
+    }
+    else
+    {
+      $data = $this->dbh->singleQuery(sprintf("SELECT data FROM cache WHERE key = '%s' AND timeout > %d", sqlite_escape_string($key), time()));
+    }
 
     return null === $data ? $default : $data;
   }
@@ -73,6 +81,11 @@ public function get($key, $default = null)
    */
   public function has($key)
   {
+    if ($this->isSqLite3())
+    {
+      return (integer) $this->dbh->querySingle(sprintf("SELECT count(*) FROM cache WHERE key = '%s' AND timeout > %d", $this->dbh->escapeString($key), time()));
+    }
+
     return (boolean) $this->dbh->query(sprintf("SELECT key FROM cache WHERE key = '%s' AND timeout > %d", sqlite_escape_string($key), time()))->numRows();
   }
 
@@ -81,11 +94,16 @@ public function has($key)
    */
   public function set($key, $data, $lifetime = null)
   {
-    if ($this->getOption('automatic_cleaning_factor') > 0 && rand(1, $this->getOption('automatic_cleaning_factor')) == 1)
+    if ($this->getOption('automatic_cleaning_factor') > 0 && mt_rand(1, $this->getOption('automatic_cleaning_factor')) == 1)
     {
       $this->clean(sfCache::OLD);
     }
 
+    if ($this->isSqLite3())
+    {
+      return $this->dbh->exec(sprintf("INSERT OR REPLACE INTO cache (key, data, timeout, last_modified) VALUES ('%s', '%s', %d, %d)", $this->dbh->escapeString($key), $this->dbh->escapeString($data), time() + $this->getLifetime($lifetime), time()));
+    }
+
     return (boolean) $this->dbh->query(sprintf("INSERT OR REPLACE INTO cache (key, data, timeout, last_modified) VALUES ('%s', '%s', %d, %d)", sqlite_escape_string($key), sqlite_escape_string($data), time() + $this->getLifetime($lifetime), time()));
   }
 
@@ -94,6 +112,11 @@ public function set($key, $data, $lifetime = null)
    */
   public function remove($key)
   {
+    if ($this->isSqLite3())
+    {
+      return $this->dbh->exec(sprintf("DELETE FROM cache WHERE key = '%s'", $this->dbh->escapeString($key)));
+    }
+
     return (boolean) $this->dbh->query(sprintf("DELETE FROM cache WHERE key = '%s'", sqlite_escape_string($key)));
   }
 
@@ -102,6 +125,11 @@ public function remove($key)
    */
   public function removePattern($pattern)
   {
+    if ($this->isSqLite3())
+    {
+      return $this->dbh->exec(sprintf("DELETE FROM cache WHERE REGEXP('%s', key)", $this->dbh->escapeString(self::patternToRegexp($pattern))));
+    }
+
     return (boolean) $this->dbh->query(sprintf("DELETE FROM cache WHERE REGEXP('%s', key)", sqlite_escape_string(self::patternToRegexp($pattern))));
   }
 
@@ -110,6 +138,18 @@ public function removePattern($pattern)
    */
   public function clean($mode = sfCache::ALL)
   {
+    if ($this->isSqLite3())
+    {
+      $res = $this->dbh->exec("DELETE FROM cache".(sfCache::OLD == $mode ? sprintf(" WHERE timeout < '%s'", time()) : ''));
+
+      if ($res)
+      {
+        return (boolean) $this->dbh->changes();
+      }
+
+      return false;
+    }
+
     return (boolean) $this->dbh->query("DELETE FROM cache".(sfCache::OLD == $mode ? sprintf(" WHERE timeout < '%s'", time()) : ''))->numRows();
   }
 
@@ -118,9 +158,16 @@ public function clean($mode = sfCache::ALL)
    */
   public function getTimeout($key)
   {
+    if ($this->isSqLite3())
+    {
+      $rs = $this->dbh->querySingle(sprintf("SELECT timeout FROM cache WHERE key = '%s' AND timeout > %d", $this->dbh->escapeString($key), time()));
+
+      return null === $rs ? 0 : $rs;
+    }
+
     $rs = $this->dbh->query(sprintf("SELECT timeout FROM cache WHERE key = '%s' AND timeout > %d", sqlite_escape_string($key), time()));
 
-    return $rs->numRows() ? intval($rs->fetchSingle()) : 0;
+    return $rs->numRows() ? (int) $rs->fetchSingle() : 0;
   }
 
   /**
@@ -128,9 +175,16 @@ public function getTimeout($key)
    */
   public function getLastModified($key)
   {
+    if ($this->isSqLite3())
+    {
+      $rs = $this->dbh->querySingle(sprintf("SELECT last_modified FROM cache WHERE key = '%s' AND timeout > %d", $this->dbh->escapeString($key), time()));
+
+      return null === $rs ? 0 : $rs;
+    }
+
     $rs = $this->dbh->query(sprintf("SELECT last_modified FROM cache WHERE key = '%s' AND timeout > %d", sqlite_escape_string($key), time()));
 
-    return $rs->numRows() ? intval($rs->fetchSingle()) : 0;
+    return $rs->numRows() ? (int) $rs->fetchSingle() : 0;
   }
 
   /**
@@ -163,9 +217,20 @@ protected function setDatabase($database)
       umask($current_umask);
     }
 
-    if (!$this->dbh = new SQLiteDatabase($this->database, 0644, $errmsg))
+    if ($this->isSqLite3())
+    {
+      $this->dbh = new SQLite3($this->database);
+      if ('not an error' !== $errmsg = $this->dbh->lastErrorMsg())
+      {
+        throw new sfCacheException(sprintf('Unable to connect to SQLite database: %s.', $errmsg));
+      }
+    }
+    else
     {
-      throw new sfCacheException(sprintf('Unable to connect to SQLite database: %s.', $errmsg));
+      if (!$this->dbh = new SQLiteDatabase($this->database, 0644, $errmsg))
+      {
+        throw new sfCacheException(sprintf('Unable to connect to SQLite database: %s.', $errmsg));
+      }
     }
 
     $this->dbh->createFunction('regexp', array($this, 'removePatternRegexpCallback'), 2);
@@ -189,6 +254,20 @@ public function removePatternRegexpCallback($regexp, $key)
    */
   public function getMany($keys)
   {
+    if ($this->isSqLite3())
+    {
+      $data = array();
+      if ($results = $this->dbh->query(sprintf("SELECT key, data FROM cache WHERE key IN ('%s') AND timeout > %d", implode('\', \'', array_map(array($this->dbh, 'escapeString'), $keys)), time())))
+      {
+        while ($row = $results->fetchArray())
+        {
+          $data[$row['key']] = $row['data'];
+        }
+      }
+
+      return $data;
+    }
+
     $rows = $this->dbh->arrayQuery(sprintf("SELECT key, data FROM cache WHERE key IN ('%s') AND timeout > %d", implode('\', \'', array_map('sqlite_escape_string', $keys)), time()));
 
     $data = array();
@@ -219,10 +298,37 @@ protected function createSchema()
 
     foreach ($statements as $statement)
     {
-      if (!$this->dbh->query($statement))
+      if (false === $this->dbh->query($statement))
       {
-        throw new sfCacheException(sqlite_error_string($this->dbh->lastError()));
+        $message = $this->isSqLite3() ? $this->dbh->lastErrorMsg() : sqlite_error_string($this->dbh->lastError());
+
+        throw new sfCacheException($message);
       }
     }
   }
-}
\ No newline at end of file
+
+  /**
+   * Checks if sqlite is version 3
+   *
+   * @return boolean
+   */
+  protected function isSqLite3()
+  {
+    return 3 === $this->getSqLiteVersion();
+  }
+
+  /**
+   * Get sqlite version number
+   *
+   * @return integer
+   */
+  protected function getSqLiteVersion()
+  {
+    if (null === $this->sqlLiteVersion)
+    {
+      $this->sqlLiteVersion = version_compare(PHP_VERSION, '5.3', '>') ? 3 : 2;
+    }
+
+    return $this->sqlLiteVersion;
+  }
+}
diff --git a/lib/vendor/symfony/lib/cache/sfXCacheCache.class.php b/lib/vendor/symfony/lib/cache/sfXCacheCache.class.php
index 529c6c894..6f70c6479 100644
--- a/lib/vendor/symfony/lib/cache/sfXCacheCache.class.php
+++ b/lib/vendor/symfony/lib/cache/sfXCacheCache.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage cache
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfXCacheCache.class.php 17865 2009-05-02 09:23:55Z FabianLange $
+ * @version    SVN: $Id$
  */
 class sfXCacheCache extends sfCache
 {
diff --git a/lib/vendor/symfony/lib/command/cli.php b/lib/vendor/symfony/lib/command/cli.php
index c7b8feb95..37a4f635d 100644
--- a/lib/vendor/symfony/lib/command/cli.php
+++ b/lib/vendor/symfony/lib/command/cli.php
@@ -3,20 +3,34 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../autoload/sfCoreAutoload.class.php');
-sfCoreAutoload::register();
+// Try autoloading using composer if available.
+if (!file_exists($autoload = __DIR__.'/../../../../autoload.php'))
+{
+  $autoload = __DIR__.'/../../autoload.php';
+}
+
+// Fall back to classic Symfony loading
+if (!file_exists($autoload))
+{
+  require_once(__DIR__.'/../autoload/sfCoreAutoload.class.php');
+  sfCoreAutoload::register();
+}
+else
+{
+  require_once $autoload;
+}
 
 try
 {
   $dispatcher = new sfEventDispatcher();
   $logger = new sfCommandLogger($dispatcher);
 
-  $application = new sfSymfonyCommandApplication($dispatcher, null, array('symfony_lib_dir' => realpath(dirname(__FILE__).'/..')));
+  $application = new sfSymfonyCommandApplication($dispatcher, null, array('symfony_lib_dir' => realpath(__DIR__.'/..')));
   $statusCode = $application->run();
 }
 catch (Exception $e)
diff --git a/lib/vendor/symfony/lib/command/sfAnsiColorFormatter.class.php b/lib/vendor/symfony/lib/command/sfAnsiColorFormatter.class.php
index 3bea2cf69..37a3ec23d 100644
--- a/lib/vendor/symfony/lib/command/sfAnsiColorFormatter.class.php
+++ b/lib/vendor/symfony/lib/command/sfAnsiColorFormatter.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage command
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfAnsiColorFormatter.class.php 21908 2009-09-11 12:06:21Z fabien $
+ * @version    SVN: $Id$
  */
 class sfAnsiColorFormatter extends sfFormatter
 {
@@ -98,7 +98,7 @@ public function formatSection($section, $text, $size = null, $style = 'INFO')
     $style = array_key_exists($style, $this->styles) ? $style : 'INFO';
     $width = 9 + strlen($this->format('', $style));
 
-    return sprintf(">> %-{$width}s %s", $this->format($section, $style), $this->excerpt($text, $size - 4 - (strlen($section) > 9 ? strlen($section) : 9)));
+    return sprintf(">> %-${width}s %s", $this->format($section, $style), $this->excerpt($text, $size - 4 - (strlen($section) > 9 ? strlen($section) : 9)));
   }
 
   /**
diff --git a/lib/vendor/symfony/lib/command/sfCommandApplication.class.php b/lib/vendor/symfony/lib/command/sfCommandApplication.class.php
index 660c93b90..681d999c6 100644
--- a/lib/vendor/symfony/lib/command/sfCommandApplication.class.php
+++ b/lib/vendor/symfony/lib/command/sfCommandApplication.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage command
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfCommandApplication.class.php 23218 2009-10-20 20:59:02Z FabianLange $
+ * @version    SVN: $Id$
  */
 abstract class sfCommandApplication
 {
@@ -22,6 +22,7 @@ abstract class sfCommandApplication
     $commandManager = null,
     $trace          = false,
     $verbose        = true,
+    $debug          = true,
     $nowrite        = false,
     $name           = 'UNKNOWN',
     $version        = 'UNKNOWN',
@@ -55,6 +56,7 @@ public function __construct(sfEventDispatcher $dispatcher, sfFormatter $formatte
       new sfCommandOption('--trace',   '-t', sfCommandOption::PARAMETER_NONE, 'Turn on invoke/execute tracing, enable full backtrace.'),
       new sfCommandOption('--version', '-V', sfCommandOption::PARAMETER_NONE, 'Display the program version.'),
       new sfCommandOption('--color',   '',   sfCommandOption::PARAMETER_NONE, 'Forces ANSI color output.'),
+      new sfCommandOption('--no-debug','',   sfCommandOption::PARAMETER_NONE, 'Disable debug'),
     ));
     $this->commandManager = new sfCommandManager($argumentSet, $optionSet);
 
@@ -294,6 +296,16 @@ public function withTrace()
     return $this->trace;
   }
 
+  /**
+   * Returns whether the application must be verbose.
+   *
+   * @return Boolean true if the application is in debug mode, false otherwise
+   */
+  public function isDebug()
+  {
+    return $this->debug;
+  }
+
   /**
    * Outputs a help message for the current application.
    */
@@ -339,6 +351,11 @@ protected function handleOptions($options = null)
       $this->verbose = false;
     }
 
+    if ($this->commandManager->getOptionSet()->hasOption('no-debug') && false !== $this->commandManager->getOptionValue('no-debug'))
+    {
+      $this->debug = false;
+    }
+
     if ($this->commandManager->getOptionSet()->hasOption('trace') && false !== $this->commandManager->getOptionValue('trace'))
     {
       $this->verbose = true;
@@ -427,6 +444,8 @@ public function renderException($e)
 
       fwrite(STDERR, "\n");
     }
+
+    $this->dispatcher->notify(new sfEvent($e, 'application.throw_exception'));
   }
 
   /**
@@ -519,7 +538,15 @@ public function getTaskToExecute($name)
 
   protected function strlen($string)
   {
-    return function_exists('mb_strlen') ? mb_strlen($string) : strlen($string);
+    if (!function_exists('mb_strlen')) {
+        return strlen($string);
+    }
+
+    if (false === $encoding = mb_detect_encoding($string)) {
+        return strlen($string);
+    }
+
+    return mb_strlen($string, $encoding);
   }
 
   /**
@@ -530,7 +557,11 @@ protected function strlen($string)
   protected function fixCgi()
   {
     // handle output buffering
-    @ob_end_flush();
+    if (ob_get_level() > 0)
+    {
+      @ob_end_flush();
+    }
+
     ob_implicit_flush(true);
 
     // PHP ini settings
diff --git a/lib/vendor/symfony/lib/command/sfCommandArgument.class.php b/lib/vendor/symfony/lib/command/sfCommandArgument.class.php
index 3fa672b8b..b7bc142cf 100644
--- a/lib/vendor/symfony/lib/command/sfCommandArgument.class.php
+++ b/lib/vendor/symfony/lib/command/sfCommandArgument.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage command
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfCommandArgument.class.php 21908 2009-09-11 12:06:21Z fabien $
+ * @version    SVN: $Id$
  */
 class sfCommandArgument
 {
diff --git a/lib/vendor/symfony/lib/command/sfCommandArgumentSet.class.php b/lib/vendor/symfony/lib/command/sfCommandArgumentSet.class.php
index 5a3186405..88ebbeed2 100644
--- a/lib/vendor/symfony/lib/command/sfCommandArgumentSet.class.php
+++ b/lib/vendor/symfony/lib/command/sfCommandArgumentSet.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage command
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfCommandArgumentSet.class.php 21908 2009-09-11 12:06:21Z fabien $
+ * @version    SVN: $Id$
  */
 class sfCommandArgumentSet
 {
diff --git a/lib/vendor/symfony/lib/command/sfCommandArgumentsException.class.php b/lib/vendor/symfony/lib/command/sfCommandArgumentsException.class.php
index cd6a61cc1..9b23616d6 100644
--- a/lib/vendor/symfony/lib/command/sfCommandArgumentsException.class.php
+++ b/lib/vendor/symfony/lib/command/sfCommandArgumentsException.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfCommandArgumentsException.class.php 5175 2007-09-18 12:07:14Z fabien $
+ * @version    SVN: $Id$
  */
 class sfCommandArgumentsException extends sfCommandException
 {
diff --git a/lib/vendor/symfony/lib/command/sfCommandException.class.php b/lib/vendor/symfony/lib/command/sfCommandException.class.php
index 5fd6c4a34..58d9b312b 100644
--- a/lib/vendor/symfony/lib/command/sfCommandException.class.php
+++ b/lib/vendor/symfony/lib/command/sfCommandException.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfCommandException.class.php 4743 2007-07-30 10:21:06Z fabien $
+ * @version    SVN: $Id$
  */
 class sfCommandException extends sfException
 {
diff --git a/lib/vendor/symfony/lib/command/sfCommandLogger.class.php b/lib/vendor/symfony/lib/command/sfCommandLogger.class.php
index 41c06a21a..3448f2dd6 100644
--- a/lib/vendor/symfony/lib/command/sfCommandLogger.class.php
+++ b/lib/vendor/symfony/lib/command/sfCommandLogger.class.php
@@ -13,7 +13,7 @@
  * @package    symfony
  * @subpackage log
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfCommandLogger.class.php 17865 2009-05-02 09:23:55Z FabianLange $
+ * @version    SVN: $Id$
  */
 class sfCommandLogger extends sfConsoleLogger
 {
diff --git a/lib/vendor/symfony/lib/command/sfCommandManager.class.php b/lib/vendor/symfony/lib/command/sfCommandManager.class.php
index 42eb22cce..d7c0b2f63 100644
--- a/lib/vendor/symfony/lib/command/sfCommandManager.class.php
+++ b/lib/vendor/symfony/lib/command/sfCommandManager.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage command
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfCommandManager.class.php 21908 2009-09-11 12:06:21Z fabien $
+ * @version    SVN: $Id$
  */
 class sfCommandManager
 {
@@ -108,7 +108,9 @@ public function process($arguments = null)
     else if (!is_array($arguments))
     {
       // hack to split arguments with spaces : --test="with some spaces"
-      $arguments = preg_replace('/(\'|")(.+?)\\1/e', "str_replace(' ', '=PLACEHOLDER=', '\\2')", $arguments);
+      $arguments = preg_replace_callback('/(\'|")(.+?)\\1/', function ($match) {
+        return str_replace(' ', '=PLACEHOLDER=', $match[2]);
+      }, $arguments);
       $arguments = preg_split('/\s+/', $arguments);
       $arguments = str_replace('=PLACEHOLDER=', ' ', $arguments);
     }
diff --git a/lib/vendor/symfony/lib/command/sfCommandOption.class.php b/lib/vendor/symfony/lib/command/sfCommandOption.class.php
index ef7c64194..c8329ee1e 100644
--- a/lib/vendor/symfony/lib/command/sfCommandOption.class.php
+++ b/lib/vendor/symfony/lib/command/sfCommandOption.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage command
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfCommandOption.class.php 21908 2009-09-11 12:06:21Z fabien $
+ * @version    SVN: $Id$
  */
 class sfCommandOption
 {
diff --git a/lib/vendor/symfony/lib/command/sfCommandOptionSet.class.php b/lib/vendor/symfony/lib/command/sfCommandOptionSet.class.php
index 8e7359934..5970c32b3 100644
--- a/lib/vendor/symfony/lib/command/sfCommandOptionSet.class.php
+++ b/lib/vendor/symfony/lib/command/sfCommandOptionSet.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage command
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfCommandOptionSet.class.php 17865 2009-05-02 09:23:55Z FabianLange $
+ * @version    SVN: $Id$
  */
 class sfCommandOptionSet
 {
diff --git a/lib/vendor/symfony/lib/command/sfFormatter.class.php b/lib/vendor/symfony/lib/command/sfFormatter.class.php
index 207dabdaa..33b051a4e 100644
--- a/lib/vendor/symfony/lib/command/sfFormatter.class.php
+++ b/lib/vendor/symfony/lib/command/sfFormatter.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage command
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfFormatter.class.php 30008 2010-06-28 09:48:15Z fabien $
+ * @version    SVN: $Id$
  */
 class sfFormatter
 {
diff --git a/lib/vendor/symfony/lib/command/sfSymfonyCommandApplication.class.php b/lib/vendor/symfony/lib/command/sfSymfonyCommandApplication.class.php
index 1de17eac3..2282275a5 100644
--- a/lib/vendor/symfony/lib/command/sfSymfonyCommandApplication.class.php
+++ b/lib/vendor/symfony/lib/command/sfSymfonyCommandApplication.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage command
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfSymfonyCommandApplication.class.php 20053 2009-07-09 12:49:20Z nicolas $
+ * @version    SVN: $Id$
  */
 class sfSymfonyCommandApplication extends sfCommandApplication
 {
diff --git a/lib/vendor/symfony/lib/config/config/config_handlers.yml b/lib/vendor/symfony/lib/config/config/config_handlers.yml
index eb63ee74e..98b77b1ce 100644
--- a/lib/vendor/symfony/lib/config/config/config_handlers.yml
+++ b/lib/vendor/symfony/lib/config/config/config_handlers.yml
@@ -26,6 +26,11 @@ config/filters.yml:
 config/routing.yml:
   class:    sfRoutingConfigHandler
 
+config/services.yml:
+  class:    sfServiceConfigHandler
+  param:
+    base_class: sfServiceContainer
+
 modules/*/config/generator.yml:
   class:    sfGeneratorConfigHandler
 
diff --git a/lib/vendor/symfony/lib/config/config/core_compile.yml b/lib/vendor/symfony/lib/config/config/core_compile.yml
index 0f07c9a07..5c93ed9c0 100644
--- a/lib/vendor/symfony/lib/config/config/core_compile.yml
+++ b/lib/vendor/symfony/lib/config/config/core_compile.yml
@@ -20,6 +20,12 @@
 - %SF_SYMFONY_LIB_DIR%/util/sfNamespacedParameterHolder.class.php
 - %SF_SYMFONY_LIB_DIR%/view/sfView.class.php
 - %SF_SYMFONY_LIB_DIR%/view/sfViewParameterHolder.class.php
+- %SF_SYMFONY_LIB_DIR%/service/sfServiceContainerLoaderInterface.class.php
+- %SF_SYMFONY_LIB_DIR%/service/sfServiceContainerInterface.class.php
+- %SF_SYMFONY_LIB_DIR%/service/sfServiceContainer.class.php
+- %SF_SYMFONY_LIB_DIR%/service/sfServiceContainerBuilder.class.php
+- %SF_SYMFONY_LIB_DIR%/service/sfServiceContainerLoader.class.php
+- %SF_SYMFONY_LIB_DIR%/service/sfServiceContainerLoaderArray.class.php
 
 # these classes are optionals but very likely to be used (in web context)
 - %SF_SYMFONY_LIB_DIR%/controller/sfWebController.class.php
diff --git a/lib/vendor/symfony/lib/config/config/factories.yml b/lib/vendor/symfony/lib/config/config/factories.yml
index 19a82be91..059695c80 100644
--- a/lib/vendor/symfony/lib/config/config/factories.yml
+++ b/lib/vendor/symfony/lib/config/config/factories.yml
@@ -9,6 +9,7 @@ default:
       path_info_array:   SERVER
       path_info_key:     PATH_INFO
       relative_url_root: ~
+      trust_proxy:       true
       formats:
         txt:  text/plain
         js:   [application/javascript, application/x-javascript, text/javascript]
@@ -97,6 +98,12 @@ default:
           param:
             level: debug
             file: %SF_LOG_DIR%/%SF_APP%_%SF_ENVIRONMENT%.log
+        sf_psr_logger:
+          class: sfPsrLoggerAdapter
+          param:
+            logger_service_id: logger.psr
+            auto_connect: true
+            condition: %SF_PSR_LOGGER%
 
   mailer:
     class: sfMailer
@@ -112,3 +119,6 @@ default:
           encryption: ~
           username:   ~
           password:   ~
+
+  service_container:
+    class: sfServiceContainer
diff --git a/lib/vendor/symfony/lib/config/config/services.yml b/lib/vendor/symfony/lib/config/config/services.yml
new file mode 100644
index 000000000..25db23634
--- /dev/null
+++ b/lib/vendor/symfony/lib/config/config/services.yml
@@ -0,0 +1,19 @@
+# Core Services:
+#   sf_event_dispatcher
+#   sf_formatter
+#   sf_filesystem
+#   sf_logger
+#
+all:
+  services:
+
+    sf_logger:
+      class: sfEventLogger
+      arguments:
+        - '@sf_event_dispatcher'
+
+    sf_filesystem:
+      class: sfFilesystem
+      arguments:
+        - '@sf_event_dispatcher'
+        - '@sf_formatter'
diff --git a/lib/vendor/symfony/lib/config/config/settings.yml b/lib/vendor/symfony/lib/config/config/settings.yml
index d4b52fdc8..e16e2833d 100644
--- a/lib/vendor/symfony/lib/config/config/settings.yml
+++ b/lib/vendor/symfony/lib/config/config/settings.yml
@@ -53,6 +53,7 @@ default:
 
     # Logging
     logging_enabled:        true
+    psr_logger:             false
 
     # i18n
     default_culture:        en        # Default user culture
diff --git a/lib/vendor/symfony/lib/config/sfApplicationConfiguration.class.php b/lib/vendor/symfony/lib/config/sfApplicationConfiguration.class.php
index 7786dacfc..296aab60d 100644
--- a/lib/vendor/symfony/lib/config/sfApplicationConfiguration.class.php
+++ b/lib/vendor/symfony/lib/config/sfApplicationConfiguration.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfApplicationConfiguration.class.php 29526 2010-05-19 13:06:40Z fabien $
+ * @version    SVN: $Id$
  */
 abstract class sfApplicationConfiguration extends ProjectConfiguration
 {
@@ -55,7 +55,7 @@ public function __construct($environment, $debug, $rootDir = null, sfEventDispat
       $this->checkLock();
     }
 
-    if (file_exists($file = sfConfig::get('sf_app_cache_dir').'/config/configuration.php'))
+    if (is_file($file = sfConfig::get('sf_app_cache_dir').'/config/configuration.php'))
     {
       $this->cache = require $file;
     }
@@ -98,13 +98,13 @@ public function initConfiguration()
     $configCache = $this->getConfigCache();
 
     // in debug mode, start global timer
-    if ($this->isDebug() && !sfWebDebugPanelTimer::isStarted())
+    if ($this->isDebug() && !sfConfig::get('sf_cli') && !sfWebDebugPanelTimer::isStarted())
     {
       sfWebDebugPanelTimer::startTime();
     }
 
     // required core classes for the framework
-    if (!$this->isDebug() && !sfConfig::get('sf_test') && !self::$coreLoaded)
+    if (!$this->isDebug() && !sfConfig::get('sf_test') && !sfConfig::get('sf_cli') && !self::$coreLoaded)
     {
       $configCache->import('config/core_compile.yml', false);
     }
@@ -124,7 +124,7 @@ public function initConfiguration()
       include($file);
     }
 
-    if (false !== sfConfig::get('sf_csrf_secret'))
+    if (!sfConfig::get('sf_cli') && false !== sfConfig::get('sf_csrf_secret'))
     {
       sfForm::enableCSRFProtection(sfConfig::get('sf_csrf_secret'));
     }
@@ -150,9 +150,9 @@ public function initConfiguration()
     $this->initializePlugins();
 
     // compress output
-    if (!self::$coreLoaded)
+    if (!self::$coreLoaded && sfConfig::get('sf_compressed'))
     {
-      ob_start(sfConfig::get('sf_compressed') ? 'ob_gzhandler' : '');
+      ob_start('ob_gzhandler');
     }
 
     self::$coreLoaded = true;
@@ -178,10 +178,10 @@ protected function initializePlugins()
 
   /**
    * Adds enabled plugins to autoload config.
-   * 
+   *
    * @param   sfEvent $event
    * @param   array   $config
-   * 
+   *
    * @return  array
    */
   public function filterAutoloadConfig(sfEvent $event, array $config)
@@ -288,6 +288,7 @@ public function setRootDir($rootDir)
       'sf_app'         => $this->getApplication(),
       'sf_environment' => $this->getEnvironment(),
       'sf_debug'       => $this->isDebug(),
+      'sf_cli'         => PHP_SAPI === 'cli',
     ));
 
     $this->setAppDir(sfConfig::get('sf_apps_dir').DIRECTORY_SEPARATOR.$this->getApplication());
diff --git a/lib/vendor/symfony/lib/config/sfAutoloadConfigHandler.class.php b/lib/vendor/symfony/lib/config/sfAutoloadConfigHandler.class.php
old mode 100644
new mode 100755
index fa66842ba..d49900ab8
--- a/lib/vendor/symfony/lib/config/sfAutoloadConfigHandler.class.php
+++ b/lib/vendor/symfony/lib/config/sfAutoloadConfigHandler.class.php
@@ -15,7 +15,7 @@
  * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfAutoloadConfigHandler.class.php 24062 2009-11-16 23:31:25Z FabianLange $
+ * @version    SVN: $Id$
  */
 class sfAutoloadConfigHandler extends sfYamlConfigHandler
 {
@@ -69,7 +69,7 @@ public function evaluate($configFiles)
   protected function parse(array $configFiles)
   {
     // parse the yaml
-    $config = self::getConfiguration($configFiles);
+    $config = static::getConfiguration($configFiles);
 
     $mappings = array();
     foreach ($config['autoload'] as $name => $entry)
@@ -126,7 +126,7 @@ protected function parse(array $configFiles)
   static public function parseFile($path, $file, $prefix)
   {
     $mapping = array();
-    preg_match_all('~^\s*(?:abstract\s+|final\s+)?(?:class|interface)\s+(\w+)~mi', file_get_contents($file), $classes);
+    preg_match_all('~^\s*(?:abstract\s+|final\s+)?(?:class|interface|trait)\s+(\w+)~mi', file_get_contents($file), $classes);
     foreach ($classes[1] as $class)
     {
       $localPrefix = '';
@@ -160,7 +160,7 @@ static public function getConfiguration(array $configFiles)
     foreach ($configFiles as $i => $configFile)
     {
       $configFilePath = str_replace(DIRECTORY_SEPARATOR, '/', $configFile);
-      $path = str_replace(DIRECTORY_SEPARATOR, '/', realpath(join('/', array_slice(explode('/', $configFilePath), 0, -2))));
+      $path = str_replace(DIRECTORY_SEPARATOR, '/', realpath(implode('/', array_slice(explode('/', $configFilePath), 0, -2))));
       if (in_array($path, $pluginPaths))
       {
         $pluginConfigFiles[] = $configFile;
@@ -170,13 +170,13 @@ static public function getConfiguration(array $configFiles)
 
     $configFiles = array_merge($pluginConfigFiles, $configFiles);
 
-    $config = self::replaceConstants(self::parseYamls($configFiles));
+    $config = static::replaceConstants(static::parseYamls($configFiles));
 
     foreach ($config['autoload'] as $name => $values)
     {
       if (isset($values['path']))
       {
-        $config['autoload'][$name]['path'] = self::replacePath($values['path']);
+        $config['autoload'][$name]['path'] = static::replacePath($values['path']);
       }
     }
 
diff --git a/lib/vendor/symfony/lib/config/sfCacheConfigHandler.class.php b/lib/vendor/symfony/lib/config/sfCacheConfigHandler.class.php
index b0948bb8b..e16df675b 100644
--- a/lib/vendor/symfony/lib/config/sfCacheConfigHandler.class.php
+++ b/lib/vendor/symfony/lib/config/sfCacheConfigHandler.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfCacheConfigHandler.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfCacheConfigHandler extends sfYamlConfigHandler
 {
@@ -35,7 +35,7 @@ class sfCacheConfigHandler extends sfYamlConfigHandler
   public function execute($configFiles)
   {
     // parse the yaml
-    $this->yamlConfig = self::getConfiguration($configFiles);
+    $this->yamlConfig = static::getConfiguration($configFiles);
 
     // iterate through all action names
     $data  = array();
@@ -109,6 +109,6 @@ protected function addCache($actionName = '')
    */
   static public function getConfiguration(array $configFiles)
   {
-    return self::flattenConfiguration(self::parseYamls($configFiles));
+    return static::flattenConfiguration(static::parseYamls($configFiles));
   }
 }
diff --git a/lib/vendor/symfony/lib/config/sfCompileConfigHandler.class.php b/lib/vendor/symfony/lib/config/sfCompileConfigHandler.class.php
index f51d1a6df..454f7cb38 100644
--- a/lib/vendor/symfony/lib/config/sfCompileConfigHandler.class.php
+++ b/lib/vendor/symfony/lib/config/sfCompileConfigHandler.class.php
@@ -17,7 +17,7 @@
  * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfCompileConfigHandler.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfCompileConfigHandler extends sfYamlConfigHandler
 {
@@ -34,7 +34,7 @@ class sfCompileConfigHandler extends sfYamlConfigHandler
   public function execute($configFiles)
   {
     // parse the yaml
-    $config = self::getConfiguration($configFiles);
+    $config = static::getConfiguration($configFiles);
 
     // init our data
     $data = '';
@@ -56,14 +56,8 @@ public function execute($configFiles)
         $contents = sfToolkit::stripComments($contents);
       }
 
-      // insert configuration files
-/*      $contents = preg_replace_callback(array('#(require|include)(_once)?\((sfContext::getInstance\(\)\->getConfigCache\(\)|\$configCache)->checkConfig\(\'config/([^\']+)\'\)\);#m',
-                                          '#()()(sfContext::getInstance\(\)\->getConfigCache\(\)|\$configCache)->import\(\'config/([^\']+)\'(, false)?\);#m'),
-                                        array($this, 'insertConfigFileCallback'), $contents);
-*/
       // strip php tags
-      $contents = sfToolkit::pregtr($contents, array('/^\s*<\?(php)?/m' => '',
-                                                     '/^\s*\?>/m'       => ''));
+      $contents = sfToolkit::pregtr($contents, array('/^\s*<\?(php\s*)?/m' => '', '/^\s*\?>/m' => ''));
 
       // replace windows and mac format with unix format
       $contents = str_replace("\r", "\n", $contents);
@@ -76,28 +70,11 @@ public function execute($configFiles)
     }
 
     // compile data
-    $retval = sprintf("<?php\n".
+    return sprintf("<?php\n".
                       "// auto-generated by sfCompileConfigHandler\n".
-                      "// date: %s\n%s\n",
+                      "// date: %s\n".
+                      "%s\n",
                       date('Y/m/d H:i:s'), $data);
-
-    return $retval;
-  }
-
-  /**
-   * Callback for configuration file insertion in the cache.
-   *
-   */
-  protected function insertConfigFileCallback($matches)
-  {
-    $configFile = 'config/'.$matches[4];
-
-    $configCache = sfContext::getInstance()->getConfigCache();
-    $configCache->checkConfig($configFile);
-
-    $config = "// '$configFile' config file\n".file_get_contents($configCache->getCacheName($configFile));
-
-    return $config;
   }
 
   /**
@@ -108,9 +85,9 @@ static public function getConfiguration(array $configFiles)
     $config = array();
     foreach ($configFiles as $configFile)
     {
-      $config = array_merge($config, self::parseYaml($configFile));
+      $config = array_merge($config, static::parseYaml($configFile));
     }
 
-    return self::replacePath(self::replaceConstants($config));
+    return static::replacePath(static::replaceConstants($config));
   }
 }
diff --git a/lib/vendor/symfony/lib/config/sfConfig.class.php b/lib/vendor/symfony/lib/config/sfConfig.class.php
index 1e9b5dcf9..ffea69db6 100644
--- a/lib/vendor/symfony/lib/config/sfConfig.class.php
+++ b/lib/vendor/symfony/lib/config/sfConfig.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfConfig.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfConfig
 {
diff --git a/lib/vendor/symfony/lib/config/sfConfigCache.class.php b/lib/vendor/symfony/lib/config/sfConfigCache.class.php
index 404bfa5ba..d8a1eb55b 100644
--- a/lib/vendor/symfony/lib/config/sfConfigCache.class.php
+++ b/lib/vendor/symfony/lib/config/sfConfigCache.class.php
@@ -18,7 +18,7 @@
  * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfConfigCache.class.php 32639 2011-06-11 13:28:46Z fabien $
+ * @version    SVN: $Id$
  */
 class sfConfigCache
 {
@@ -333,15 +333,13 @@ protected function loadConfigHandlers()
   protected function writeCacheFile($config, $cache, $data)
   {
     $current_umask = umask(0000);
-    if (!is_dir(dirname($cache)))
+    $cacheDir      = dirname($cache);
+    if (!is_dir($cacheDir) && !@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir))
     {
-      if (false === @mkdir(dirname($cache), 0777, true))
-      {
-        throw new sfCacheException(sprintf('Failed to make cache directory "%s" while generating cache for configuration file "%s".', dirname($cache), $config));
-      }
+        throw new \sfCacheException(sprintf('Failed to make cache directory "%s" while generating cache for configuration file "%s".', $cacheDir, $config));
     }
 
-    $tmpFile = tempnam(dirname($cache), basename($cache));
+    $tmpFile = tempnam($cacheDir, basename($cache));
 
     if (!$fp = @fopen($tmpFile, 'wb'))
     {
diff --git a/lib/vendor/symfony/lib/config/sfConfigHandler.class.php b/lib/vendor/symfony/lib/config/sfConfigHandler.class.php
index 1797262d1..f662d7251 100644
--- a/lib/vendor/symfony/lib/config/sfConfigHandler.class.php
+++ b/lib/vendor/symfony/lib/config/sfConfigHandler.class.php
@@ -18,7 +18,7 @@
  * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfConfigHandler.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class sfConfigHandler
 {
diff --git a/lib/vendor/symfony/lib/config/sfDatabaseConfigHandler.class.php b/lib/vendor/symfony/lib/config/sfDatabaseConfigHandler.class.php
index 486580cf1..849caf47e 100644
--- a/lib/vendor/symfony/lib/config/sfDatabaseConfigHandler.class.php
+++ b/lib/vendor/symfony/lib/config/sfDatabaseConfigHandler.class.php
@@ -18,7 +18,7 @@
  * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfDatabaseConfigHandler.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDatabaseConfigHandler extends sfYamlConfigHandler
 {
@@ -74,7 +74,7 @@ public function evaluate($configFiles)
   protected function parse($configFiles)
   {
     // parse the yaml
-    $config = self::getConfiguration($configFiles);
+    $config = static::getConfiguration($configFiles);
 
     // init our data and includes arrays
     $data      = array();
@@ -134,13 +134,13 @@ protected function parse($configFiles)
    */
   static public function getConfiguration(array $configFiles)
   {
-    $config = self::replaceConstants(self::flattenConfigurationWithEnvironment(self::parseYamls($configFiles)));
+    $config = static::replaceConstants(static::flattenConfigurationWithEnvironment(static::parseYamls($configFiles)));
 
     foreach ($config as $name => $dbConfig)
     {
       if (isset($dbConfig['file']))
       {
-        $config[$name]['file'] = self::replacePath($dbConfig['file']);
+        $config[$name]['file'] = static::replacePath($dbConfig['file']);
       }
     }
 
diff --git a/lib/vendor/symfony/lib/config/sfDefineEnvironmentConfigHandler.class.php b/lib/vendor/symfony/lib/config/sfDefineEnvironmentConfigHandler.class.php
index e4fc1a5c6..3b1cd049e 100644
--- a/lib/vendor/symfony/lib/config/sfDefineEnvironmentConfigHandler.class.php
+++ b/lib/vendor/symfony/lib/config/sfDefineEnvironmentConfigHandler.class.php
@@ -13,7 +13,7 @@
  * @package    symfony
  * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfDefineEnvironmentConfigHandler.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDefineEnvironmentConfigHandler extends sfYamlConfigHandler
 {
@@ -42,7 +42,7 @@ public function execute($configFiles)
     }
 
     // parse the yaml
-    $config = self::getConfiguration($configFiles);
+    $config = static::getConfiguration($configFiles);
 
     $values = array();
     foreach ($config as $category => $keys)
@@ -143,6 +143,6 @@ protected function fixCategoryName($category, $prefix)
    */
   static public function getConfiguration(array $configFiles)
   {
-    return self::replaceConstants(self::flattenConfigurationWithEnvironment(self::parseYamls($configFiles)));
+    return static::replaceConstants(static::flattenConfigurationWithEnvironment(static::parseYamls($configFiles)));
   }
 }
diff --git a/lib/vendor/symfony/lib/config/sfFactoryConfigHandler.class.php b/lib/vendor/symfony/lib/config/sfFactoryConfigHandler.class.php
index b1615adf0..0c1f2a851 100644
--- a/lib/vendor/symfony/lib/config/sfFactoryConfigHandler.class.php
+++ b/lib/vendor/symfony/lib/config/sfFactoryConfigHandler.class.php
@@ -17,7 +17,7 @@
  * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfFactoryConfigHandler.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfFactoryConfigHandler extends sfYamlConfigHandler
 {
@@ -34,14 +34,14 @@ class sfFactoryConfigHandler extends sfYamlConfigHandler
   public function execute($configFiles)
   {
     // parse the yaml
-    $config = self::getConfiguration($configFiles);
+    $config = static::getConfiguration($configFiles);
 
     // init our data and includes arrays
     $includes  = array();
     $instances = array();
 
     // available list of factories
-    $factories = array('view_cache_manager', 'logger', 'i18n', 'controller', 'request', 'response', 'routing', 'storage', 'user', 'view_cache', 'mailer');
+    $factories = array('view_cache_manager', 'logger', 'i18n', 'controller', 'request', 'response', 'routing', 'storage', 'user', 'view_cache', 'mailer', 'service_container');
 
     // let's do our fancy work
     foreach ($factories as $factory)
@@ -95,7 +95,7 @@ public function execute($configFiles)
           break;
 
         case 'response':
-          $instances[] = sprintf("  \$class = sfConfig::get('sf_factory_response', '%s');\n  \$this->factories['response'] = new \$class(\$this->dispatcher, sfConfig::get('sf_factory_response_parameters', array_merge(array('http_protocol' => 'HTTP/1.1'), %s)));", $class, var_export($parameters, true));
+          $instances[] = sprintf("  \$class = sfConfig::get('sf_factory_response', '%s');\n  \$this->factories['response'] = new \$class(\$this->dispatcher, sfConfig::get('sf_factory_response_parameters', array_merge(array('http_protocol' => isset(\$_SERVER['SERVER_PROTOCOL']) ? \$_SERVER['SERVER_PROTOCOL'] : null), %s)));", $class, var_export($parameters, true));
           // TODO: this is a bit ugly, as it only works for sfWebRequest & sfWebResponse combination. see #3397
           $instances[] = sprintf("  if (\$this->factories['request'] instanceof sfWebRequest \n      && \$this->factories['response'] instanceof sfWebResponse \n      && 'HEAD' == \$this->factories['request']->getMethod())\n  {  \n    \$this->factories['response']->setHeaderOnly(true);\n  }\n");
           break;
@@ -217,12 +217,20 @@ public function execute($configFiles)
 
         case 'mailer':
           $instances[] = sprintf(
-                        "require_once sfConfig::get('sf_symfony_lib_dir').'/vendor/swiftmailer/classes/Swift.php';\n".
-                        "Swift::registerAutoload();\n".
-                        "sfMailer::initialize();\n".
+                        "if (!class_exists('Swift')) {\n".
+                        "  \$swift_dir = sfConfig::get('sf_swiftmailer_dir', sfConfig::get('sf_symfony_lib_dir').'/vendor/swiftmailer/lib');\n".
+                        "  require_once \$swift_dir.'/swift_required.php';\n".
+                        "}\n".
                         "\$this->setMailerConfiguration(array_merge(array('class' => sfConfig::get('sf_factory_mailer', '%s')), sfConfig::get('sf_factory_mailer_parameters', %s)));\n"
-                         , $class, var_export($parameters, true));
+                        , $class, var_export($parameters, true));
           break;
+
+        case 'service_container':
+          $instances[] = (
+                        "\$class = require \$this->configuration->getConfigCache()->checkConfig('config/services.yml', true);\n".
+                        "\$this->setServiceContainerConfiguration(array('class' => \$class));\n"
+                        );
+        break;
       }
     }
 
@@ -241,13 +249,13 @@ public function execute($configFiles)
    */
   static public function getConfiguration(array $configFiles)
   {
-    $config = self::replaceConstants(self::flattenConfigurationWithEnvironment(self::parseYamls($configFiles)));
+    $config = static::replaceConstants(static::flattenConfigurationWithEnvironment(static::parseYamls($configFiles)));
 
     foreach ($config as $factory => $values)
     {
       if (isset($values['file']))
       {
-        $config[$factory]['file'] = self::replacePath($values['file']);
+        $config[$factory]['file'] = static::replacePath($values['file']);
       }
     }
 
diff --git a/lib/vendor/symfony/lib/config/sfFilterConfigHandler.class.php b/lib/vendor/symfony/lib/config/sfFilterConfigHandler.class.php
index 56a1d043e..ae0168a0e 100644
--- a/lib/vendor/symfony/lib/config/sfFilterConfigHandler.class.php
+++ b/lib/vendor/symfony/lib/config/sfFilterConfigHandler.class.php
@@ -16,7 +16,7 @@
  * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfFilterConfigHandler.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfFilterConfigHandler extends sfYamlConfigHandler
 {
@@ -33,7 +33,7 @@ class sfFilterConfigHandler extends sfYamlConfigHandler
   public function execute($configFiles)
   {
     // parse the yaml
-    $config = self::getConfiguration($configFiles);
+    $config = static::getConfiguration($configFiles);
 
     // init our data and includes arrays
     $data     = array();
@@ -169,14 +169,14 @@ protected function addSecurityFilter($category, $class, $parameters)
    */
   static public function getConfiguration(array $configFiles)
   {
-    $config = self::parseYaml($configFiles[0]);
+    $config = static::parseYaml($configFiles[0]);
     foreach (array_slice($configFiles, 1) as $i => $configFile)
     {
       // we get the order of the new file and merge with the previous configurations
       $previous = $config;
 
       $config = array();
-      foreach (self::parseYaml($configFile) as $key => $value)
+      foreach (static::parseYaml($configFile) as $key => $value)
       {
         $value = (array) $value;
         $config[$key] = isset($previous[$key]) ? sfToolkit::arrayDeepMerge($previous[$key], $value) : $value;
@@ -192,13 +192,13 @@ static public function getConfiguration(array $configFiles)
       }
     }
 
-    $config = self::replaceConstants($config);
+    $config = static::replaceConstants($config);
 
     foreach ($config as $category => $keys)
     {
       if (isset($keys['file']))
       {
-        $config[$category]['file'] = self::replacePath($keys['file']);
+        $config[$category]['file'] = static::replacePath($keys['file']);
       }
     }
 
diff --git a/lib/vendor/symfony/lib/config/sfGeneratorConfigHandler.class.php b/lib/vendor/symfony/lib/config/sfGeneratorConfigHandler.class.php
index 3ebc43524..f7df87557 100644
--- a/lib/vendor/symfony/lib/config/sfGeneratorConfigHandler.class.php
+++ b/lib/vendor/symfony/lib/config/sfGeneratorConfigHandler.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfGeneratorConfigHandler.class.php 28366 2010-03-03 14:46:07Z fabien $
+ * @version    SVN: $Id$
  */
 class sfGeneratorConfigHandler extends sfYamlConfigHandler
 {
@@ -32,7 +32,7 @@ class sfGeneratorConfigHandler extends sfYamlConfigHandler
   public function execute($configFiles)
   {
     // parse the yaml
-    $config = self::getConfiguration($configFiles);
+    $config = static::getConfiguration($configFiles);
     if (!$config)
     {
       return '';
@@ -72,7 +72,7 @@ public function execute($configFiles)
     $retval = "<?php\n".
               "// auto-generated by sfGeneratorConfigHandler\n".
               "// date: %s\n%s\n";
-    $retval = sprintf($retval, date('Y/m/d H:i:s'), self::getContent($generatorManager, $config['class'], $generatorParam));
+    $retval = sprintf($retval, date('Y/m/d H:i:s'), static::getContent($generatorManager, $config['class'], $generatorParam));
 
     return $retval;
   }
@@ -87,6 +87,6 @@ static public function getContent(sfGeneratorManager $generatorManager, $class,
    */
   static public function getConfiguration(array $configFiles)
   {
-    return self::parseYamls($configFiles);
+    return static::parseYamls($configFiles);
   }
 }
diff --git a/lib/vendor/symfony/lib/config/sfPluginConfiguration.class.php b/lib/vendor/symfony/lib/config/sfPluginConfiguration.class.php
index 120968b1e..028261837 100644
--- a/lib/vendor/symfony/lib/config/sfPluginConfiguration.class.php
+++ b/lib/vendor/symfony/lib/config/sfPluginConfiguration.class.php
@@ -3,18 +3,18 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 /**
  * sfPluginConfiguration represents a configuration for a symfony plugin.
- * 
+ *
  * @package    symfony
  * @subpackage config
  * @author     Kris Wallsmith <kris.wallsmith@symfony-project.com>
- * @version    SVN: $Id: sfPluginConfiguration.class.php 23822 2009-11-12 15:13:48Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class sfPluginConfiguration
 {
@@ -26,7 +26,7 @@ abstract class sfPluginConfiguration
 
   /**
    * Constructor.
-   * 
+   *
    * @param sfProjectConfiguration $configuration The project configuration
    * @param string                 $rootDir       The plugin root directory
    * @param string                 $name          The plugin name
@@ -50,7 +50,7 @@ public function __construct(sfProjectConfiguration $configuration, $rootDir = nu
 
   /**
    * Sets up the plugin.
-   * 
+   *
    * This method can be used when creating a base plugin configuration class for other plugins to extend.
    */
   public function setup()
@@ -59,7 +59,7 @@ public function setup()
 
   /**
    * Configures the plugin.
-   * 
+   *
    * This method is called before the plugin's classes have been added to sfAutoload.
    */
   public function configure()
@@ -68,9 +68,9 @@ public function configure()
 
   /**
    * Initializes the plugin.
-   * 
+   *
    * This method is called after the plugin's classes have been added to sfAutoload.
-   * 
+   *
    * @return boolean|null If false sfApplicationConfiguration will look for a config.php (maintains BC with symfony < 1.2)
    */
   public function initialize()
@@ -79,7 +79,7 @@ public function initialize()
 
   /**
    * Returns the plugin root directory.
-   * 
+   *
    * @return string
    */
   public function getRootDir()
@@ -89,7 +89,7 @@ public function getRootDir()
 
   /**
    * Returns the plugin name.
-   * 
+   *
    * @return string
    */
   public function getName()
@@ -99,11 +99,11 @@ public function getName()
 
   /**
    * Initializes autoloading for the plugin.
-   * 
+   *
    * This method is called when a plugin is initialized in a project
    * configuration. Otherwise, autoload is handled in
    * {@link sfApplicationConfiguration} using {@link sfAutoload}.
-   * 
+   *
    * @see sfSimpleAutoload
    */
   public function initializeAutoload()
@@ -126,10 +126,10 @@ public function initializeAutoload()
 
   /**
    * Filters sfAutoload configuration values.
-   * 
-   * @param sfEvent $event  
-   * @param array   $config 
-   * 
+   *
+   * @param sfEvent $event
+   * @param array   $config
+   *
    * @return array
    */
   public function filterAutoloadConfig(sfEvent $event, array $config)
@@ -169,10 +169,10 @@ public function connectTests()
 
   /**
    * Listens for the "task.test.filter_test_files" event and adds tests from the current plugin.
-   * 
+   *
    * @param  sfEvent $event
    * @param  array   $files
-   * 
+   *
    * @return array An array of files with the appropriate tests from the current plugin merged in
    */
   public function filterTestFiles(sfEvent $event, $files)
@@ -211,18 +211,18 @@ public function filterTestFiles(sfEvent $event, $files)
 
   /**
    * Guesses the plugin root directory.
-   * 
+   *
    * @return string
    */
   protected function guessRootDir()
   {
     $r = new ReflectionClass(get_class($this));
-    return realpath(dirname($r->getFilename()).'/..');
+    return realpath(dirname($r->getFileName()).'/..');
   }
 
   /**
    * Guesses the plugin name.
-   * 
+   *
    * @return string
    */
   protected function guessName()
diff --git a/lib/vendor/symfony/lib/config/sfPluginConfigurationGeneric.class.php b/lib/vendor/symfony/lib/config/sfPluginConfigurationGeneric.class.php
index c098b89f0..127210c13 100644
--- a/lib/vendor/symfony/lib/config/sfPluginConfigurationGeneric.class.php
+++ b/lib/vendor/symfony/lib/config/sfPluginConfigurationGeneric.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage config
  * @author     Kris Wallsmith <kris.wallsmith@symfony-project.com>
- * @version    SVN: $Id: sfPluginConfigurationGeneric.class.php 12503 2008-10-31 16:58:52Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfPluginConfigurationGeneric extends sfPluginConfiguration
 {
diff --git a/lib/vendor/symfony/lib/config/sfProjectConfiguration.class.php b/lib/vendor/symfony/lib/config/sfProjectConfiguration.class.php
index 7a7316c66..70562a2be 100644
--- a/lib/vendor/symfony/lib/config/sfProjectConfiguration.class.php
+++ b/lib/vendor/symfony/lib/config/sfProjectConfiguration.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfProjectConfiguration.class.php 27191 2010-01-26 13:38:49Z FabianLange $
+ * @version    SVN: $Id$
  */
 class sfProjectConfiguration
 {
@@ -44,8 +44,8 @@ public function __construct($rootDir = null, sfEventDispatcher $dispatcher = nul
       self::$active = $this;
     }
 
-    $this->rootDir = null === $rootDir ? self::guessRootDir() : realpath($rootDir);
-    $this->symfonyLibDir = realpath(dirname(__FILE__).'/..');
+    $this->rootDir = null === $rootDir ? static::guessRootDir() : realpath($rootDir);
+    $this->symfonyLibDir = realpath(__DIR__.'/..');
     $this->dispatcher = null === $dispatcher ? new sfEventDispatcher() : $dispatcher;
 
     ini_set('magic_quotes_runtime', 'off');
@@ -174,8 +174,9 @@ public function setLogDir($logDir)
   public function setWebDir($webDir)
   {
     sfConfig::add(array(
-      'sf_web_dir'    => $webDir,
-      'sf_upload_dir' => $webDir.DIRECTORY_SEPARATOR.'uploads',
+      'sf_web_dir'         => $webDir,
+      'sf_upload_dir_name' => $uploadDirName = 'uploads',
+      'sf_upload_dir'      => $webDir.DIRECTORY_SEPARATOR.$uploadDirName,
     ));
   }
 
@@ -306,7 +307,7 @@ public function getConfigPaths($configPath)
    * Sets the enabled plugins.
    *
    * @param array $plugins An array of plugin names
-   * 
+   *
    * @throws LogicException If plugins have already been loaded
    */
   public function setPlugins(array $plugins)
@@ -339,7 +340,7 @@ public function enablePlugins($plugins)
         $plugins = array($plugins);
       }
     }
-    
+
     $this->setPlugins(array_merge($this->plugins, $plugins));
   }
 
@@ -347,7 +348,7 @@ public function enablePlugins($plugins)
    * Disables a plugin.
    *
    * @param array|string $plugins A plugin name or a plugin list
-   * 
+   *
    * @throws LogicException If plugins have already been loaded
    */
   public function disablePlugins($plugins)
@@ -381,7 +382,7 @@ public function disablePlugins($plugins)
    * Enabled all installed plugins except the one given as argument.
    *
    * @param array|string $plugins A plugin name or a plugin list
-   * 
+   *
    * @throws LogicException If plugins have already been loaded
    */
   public function enableAllPluginsExcept($plugins = array())
@@ -467,7 +468,7 @@ public function getPluginPaths()
 
   /**
    * Returns an array of paths for all available plugins.
-   * 
+   *
    * @return array
    */
   public function getAllPluginPaths()
@@ -497,11 +498,11 @@ public function getAllPluginPaths()
 
   /**
    * Manually sets the location of a particular plugin.
-   * 
+   *
    * This method can be used to ease functional testing of plugins. It is not
    * intended to support sharing plugins between projects, as many plugins
    * save project specific code (to /lib/form/base, for example).
-   * 
+   *
    * @param string $plugin
    * @param string $path
    */
@@ -512,9 +513,9 @@ public function setPluginPath($plugin, $path)
 
   /**
    * Returns the configuration for the requested plugin.
-   * 
+   *
    * @param   string $name
-   * 
+   *
    * @return  sfPluginConfiguration
    */
   public function getPluginConfiguration($name)
@@ -554,7 +555,7 @@ public function getSymfonyLibDir()
    */
   static public function getActive()
   {
-    if (!self::hasActive())
+    if (!static::hasActive())
     {
       throw new RuntimeException('There is no active configuration.');
     }
@@ -564,7 +565,7 @@ static public function getActive()
 
   /**
    * Returns true if these is an active configuration.
-   * 
+   *
    * @return boolean
    */
   static public function hasActive()
@@ -601,10 +602,10 @@ static public function getApplicationConfiguration($application, $environment, $
 
     if (null === $rootDir)
     {
-      $rootDir = self::guessRootDir();
+      $rootDir = static::guessRootDir();
     }
 
-    if (!file_exists($file = $rootDir.'/apps/'.$application.'/config/'.$class.'.class.php'))
+    if (!is_file($file = $rootDir.'/apps/'.$application.'/config/'.$class.'.class.php'))
     {
       throw new InvalidArgumentException(sprintf('The application "%s" does not exist.', $application));
     }
@@ -632,4 +633,4 @@ public function __call($method, $arguments)
 
     return $event->getReturnValue();
   }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/config/sfRootConfigHandler.class.php b/lib/vendor/symfony/lib/config/sfRootConfigHandler.class.php
index bd7b35f66..c48102988 100644
--- a/lib/vendor/symfony/lib/config/sfRootConfigHandler.class.php
+++ b/lib/vendor/symfony/lib/config/sfRootConfigHandler.class.php
@@ -15,7 +15,7 @@
  * @package    symfony
  * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfRootConfigHandler.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfRootConfigHandler extends sfYamlConfigHandler
 {
@@ -32,10 +32,10 @@ class sfRootConfigHandler extends sfYamlConfigHandler
   public function execute($configFiles)
   {
     // parse the yaml
-    $config = self::getConfiguration($configFiles);
+    $config = static::getConfiguration($configFiles);
 
     // determine if we're loading the system config_handlers.yml or a module config_handlers.yml
-    $moduleLevel = ($this->getParameterHolder()->get('module_level') === true) ? true : false;
+    $moduleLevel = ($this->getParameterHolder()->get('module_level') === true);
 
     if ($moduleLevel)
     {
@@ -98,13 +98,13 @@ public function execute($configFiles)
    */
   static public function getConfiguration(array $configFiles)
   {
-    $config = self::replaceConstants(self::parseYamls($configFiles));
+    $config = static::replaceConstants(static::parseYamls($configFiles));
 
     foreach ($config as $category => $keys)
     {
       if (isset($keys['file']))
       {
-        $config[$category]['file'] = self::replacePath($keys['file']);
+        $config[$category]['file'] = static::replacePath($keys['file']);
       }
     }
 
diff --git a/lib/vendor/symfony/lib/config/sfRoutingConfigHandler.class.php b/lib/vendor/symfony/lib/config/sfRoutingConfigHandler.class.php
index 7e280e9d8..0c485f48b 100644
--- a/lib/vendor/symfony/lib/config/sfRoutingConfigHandler.class.php
+++ b/lib/vendor/symfony/lib/config/sfRoutingConfigHandler.class.php
@@ -12,7 +12,7 @@
  * @package    symfony
  * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfRoutingConfigHandler.class.php 24962 2009-12-04 20:39:41Z FabianLange $
+ * @version    SVN: $Id$
  */
 class sfRoutingConfigHandler extends sfYamlConfigHandler
 {
@@ -41,7 +41,7 @@ public function execute($configFiles)
       foreach (sfPatternRouting::flattenRoutes($routes) as $name => $route)
       {
         $route->setDefaultOptions($options);
-        $data[] = sprintf('$this->routes[\'%s\'] = unserialize(%s);', $name, var_export(serialize($route), true));
+        $data[] = sprintf('$this->routes[\'%s\'] = %s;', $name, var_export(serialize($route), true));
       }
     }
 
@@ -74,7 +74,7 @@ public function evaluate($configFiles)
   protected function parse($configFiles)
   {
     // parse the yaml
-    $config = self::getConfiguration($configFiles);
+    $config = static::getConfiguration($configFiles);
 
     // collect routes
     $routes = array();
@@ -95,7 +95,7 @@ protected function parse($configFiles)
       else
       {
         $routes[$name] = array(isset($params['class']) ? $params['class'] : 'sfRoute', array(
-          $params['url'] ? $params['url'] : '/',
+          $params['url'] ?: '/',
           isset($params['params']) ? $params['params'] : (isset($params['param']) ? $params['param'] : array()),
           isset($params['requirements']) ? $params['requirements'] : array(),
           isset($params['options']) ? $params['options'] : array(),
@@ -111,6 +111,6 @@ protected function parse($configFiles)
    */
   static public function getConfiguration(array $configFiles)
   {
-    return self::parseYamls($configFiles);
+    return static::parseYamls($configFiles);
   }
 }
diff --git a/lib/vendor/symfony/lib/config/sfSecurityConfigHandler.class.php b/lib/vendor/symfony/lib/config/sfSecurityConfigHandler.class.php
index 5fa699554..62702c010 100644
--- a/lib/vendor/symfony/lib/config/sfSecurityConfigHandler.class.php
+++ b/lib/vendor/symfony/lib/config/sfSecurityConfigHandler.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfSecurityConfigHandler.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfSecurityConfigHandler extends sfYamlConfigHandler
 {
@@ -32,7 +32,7 @@ class sfSecurityConfigHandler extends sfYamlConfigHandler
   public function execute($configFiles)
   {
     // parse the yaml
-    $config = self::getConfiguration($configFiles);
+    $config = static::getConfiguration($configFiles);
 
     // compile data
     $retval = sprintf("<?php\n".
@@ -48,7 +48,7 @@ public function execute($configFiles)
    */
   static public function getConfiguration(array $configFiles)
   {
-    $config = self::flattenConfiguration(self::parseYamls($configFiles));
+    $config = static::flattenConfiguration(static::parseYamls($configFiles));
 
     // change all of the keys to lowercase
     $config = array_change_key_case($config);
diff --git a/lib/vendor/symfony/lib/config/sfServiceConfigHandler.class.php b/lib/vendor/symfony/lib/config/sfServiceConfigHandler.class.php
new file mode 100644
index 000000000..c7d7303cc
--- /dev/null
+++ b/lib/vendor/symfony/lib/config/sfServiceConfigHandler.class.php
@@ -0,0 +1,68 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * sfSecurityConfigHandler allows you to configure action security.
+ *
+ * @package    symfony
+ * @subpackage config
+ * @author     Jerome Tamarelle <jtamarelle@groupe-exp.com>
+ * @version    SVN: $Id$
+ */
+class sfServiceConfigHandler extends sfYamlConfigHandler
+{
+  /**
+   * Executes this configuration handler.
+   *
+   * @param array $configFiles An array of absolute filesystem path to a configuration file
+   *
+   * @return string Data to be written to a cache file
+   */
+  public function execute($configFiles)
+  {
+    $class = sfConfig::get('sf_app').'_'.sfConfig::get('sf_environment').'ServiceContainer';
+
+    $serviceContainerBuilder = new sfServiceContainerBuilder();
+
+    $loader = new sfServiceContainerLoaderArray($serviceContainerBuilder);
+    $loader->load(static::getConfiguration($configFiles));
+
+    $dumper = new sfServiceContainerDumperPhp($serviceContainerBuilder);
+    $code = $dumper->dump(array(
+      'class'       => $class,
+      'base_class'  => $this->parameterHolder->get('base_class'),
+    ));
+
+    // compile data
+    $retval = sprintf(
+      "<?php\n".
+      "// auto-generated by sfServiceConfigHandler\n".
+      "// date: %s\n\n".
+      "\$class = '%s';\n".
+      "if (!class_exists(\$class, false)) {\n".
+      "%s\n".
+      "}\n".
+      "return \$class;\n\n",
+      date('Y/m/d H:i:s'), $class, $code);
+
+    return $retval;
+  }
+
+  /**
+   * @see sfConfigHandler
+   */
+  static public function getConfiguration(array $configFiles)
+  {
+    $config = static::parseYamls($configFiles);
+    $config = static::flattenConfigurationWithEnvironment($config);
+
+    return $config;
+  }
+}
diff --git a/lib/vendor/symfony/lib/config/sfSimpleYamlConfigHandler.class.php b/lib/vendor/symfony/lib/config/sfSimpleYamlConfigHandler.class.php
index 436c226b4..43a07eb69 100644
--- a/lib/vendor/symfony/lib/config/sfSimpleYamlConfigHandler.class.php
+++ b/lib/vendor/symfony/lib/config/sfSimpleYamlConfigHandler.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfSimpleYamlConfigHandler.class.php 9085 2008-05-20 01:53:23Z Carl.Vondrick $
+ * @version    SVN: $Id$
  */
 class sfSimpleYamlConfigHandler extends sfYamlConfigHandler
 {
@@ -27,7 +27,7 @@ class sfSimpleYamlConfigHandler extends sfYamlConfigHandler
    */
   public function execute($configFiles)
   {
-    $config = self::getConfiguration($configFiles);
+    $config = static::getConfiguration($configFiles);
 
     // compile data
     $retval = "<?php\n".
@@ -43,6 +43,6 @@ public function execute($configFiles)
    */
   static public function getConfiguration(array $configFiles)
   {
-    return self::parseYamls($configFiles);
+    return static::parseYamls($configFiles);
   }
 }
diff --git a/lib/vendor/symfony/lib/config/sfViewConfigHandler.class.php b/lib/vendor/symfony/lib/config/sfViewConfigHandler.class.php
index afa530053..962398f48 100644
--- a/lib/vendor/symfony/lib/config/sfViewConfigHandler.class.php
+++ b/lib/vendor/symfony/lib/config/sfViewConfigHandler.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfViewConfigHandler.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfViewConfigHandler extends sfYamlConfigHandler
 {
@@ -32,7 +32,7 @@ class sfViewConfigHandler extends sfYamlConfigHandler
   public function execute($configFiles)
   {
     // parse the yaml
-    $this->yamlConfig = self::getConfiguration($configFiles);
+    $this->yamlConfig = static::getConfiguration($configFiles);
 
     // init our data array
     $data = array();
@@ -263,6 +263,7 @@ private function addAssets($type, $assets){
       $position = '';
       if (is_array($asset))
       {
+        reset($asset);
         $key = key($asset);
         $options = $asset[$key];
         if (isset($options['position']))
@@ -319,7 +320,7 @@ protected function addEscaping($viewName = '')
    */
   static public function getConfiguration(array $configFiles)
   {
-    return self::mergeConfig(self::parseYamls($configFiles));
+    return static::mergeConfig(static::parseYamls($configFiles));
   }
 
   static protected function mergeConfig($config)
@@ -339,6 +340,6 @@ static protected function mergeConfig($config)
 
     unset($config['default']);
 
-    return self::replaceConstants($config);
+    return static::replaceConstants($config);
   }
 }
diff --git a/lib/vendor/symfony/lib/config/sfYamlConfigHandler.class.php b/lib/vendor/symfony/lib/config/sfYamlConfigHandler.class.php
index e3e513a02..184eb2701 100644
--- a/lib/vendor/symfony/lib/config/sfYamlConfigHandler.class.php
+++ b/lib/vendor/symfony/lib/config/sfYamlConfigHandler.class.php
@@ -15,7 +15,7 @@
  * @package    symfony
  * @subpackage config
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfYamlConfigHandler.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class sfYamlConfigHandler extends sfConfigHandler
 {
@@ -36,7 +36,7 @@ static public function parseYamls($configFiles)
     {
       // the first level is an environment and its value must be an array
       $values = array();
-      foreach (self::parseYaml($configFile) as $env => $value)
+      foreach (static::parseYaml($configFile) as $env => $value)
       {
         if (null !== $value)
         {
@@ -69,7 +69,7 @@ static public function parseYaml($configFile)
     }
 
     // parse our config
-    $config = sfYaml::load($configFile);
+    $config = sfYaml::load($configFile, sfConfig::get('sf_charset', 'UTF-8'));
 
     if ($config === false)
     {
diff --git a/lib/vendor/symfony/lib/controller/default/actions/actions.class.php b/lib/vendor/symfony/lib/controller/default/actions/actions.class.php
index 992be65b1..09784acdc 100644
--- a/lib/vendor/symfony/lib/controller/default/actions/actions.class.php
+++ b/lib/vendor/symfony/lib/controller/default/actions/actions.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage action
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class defaultActions extends sfActions
 {
diff --git a/lib/vendor/symfony/lib/controller/default/templates/disabledSuccess.php b/lib/vendor/symfony/lib/controller/default/templates/disabledSuccess.php
index e72e84c79..b9cb12c1b 100644
--- a/lib/vendor/symfony/lib/controller/default/templates/disabledSuccess.php
+++ b/lib/vendor/symfony/lib/controller/default/templates/disabledSuccess.php
@@ -1,4 +1,4 @@
-<?php decorate_with(dirname(__FILE__).'/defaultLayout.php') ?>
+<?php decorate_with(__DIR__.'/defaultLayout.php') ?>
 
 <div class="sfTMessageContainer sfTAlert"> 
   <?php echo image_tag('/sf/sf_default/images/icons/disabled48.png', array('alt' => 'module disabled', 'class' => 'sfTMessageIcon', 'size' => '48x48')) ?>
diff --git a/lib/vendor/symfony/lib/controller/default/templates/error404Success.php b/lib/vendor/symfony/lib/controller/default/templates/error404Success.php
index 66aaee1d1..a836b757e 100644
--- a/lib/vendor/symfony/lib/controller/default/templates/error404Success.php
+++ b/lib/vendor/symfony/lib/controller/default/templates/error404Success.php
@@ -1,4 +1,4 @@
-<?php decorate_with(dirname(__FILE__).'/defaultLayout.php') ?>
+<?php decorate_with(__DIR__.'/defaultLayout.php') ?>
 
 <div class="sfTMessageContainer sfTAlert"> 
   <?php echo image_tag('/sf/sf_default/images/icons/cancel48.png', array('alt' => 'page not found', 'class' => 'sfTMessageIcon', 'size' => '48x48')) ?>
diff --git a/lib/vendor/symfony/lib/controller/default/templates/indexSuccess.php b/lib/vendor/symfony/lib/controller/default/templates/indexSuccess.php
index edfed0b8d..c4fcb9e8f 100644
--- a/lib/vendor/symfony/lib/controller/default/templates/indexSuccess.php
+++ b/lib/vendor/symfony/lib/controller/default/templates/indexSuccess.php
@@ -1,4 +1,4 @@
-<?php decorate_with(dirname(__FILE__).'/defaultLayout.php') ?>
+<?php decorate_with(__DIR__.'/defaultLayout.php') ?>
 
 <div class="sfTMessageContainer sfTMessage"> 
   <?php echo image_tag('/sf/sf_default/images/icons/ok48.png', array('alt' => 'ok', 'class' => 'sfTMessageIcon', 'size' => '48x48')) ?>
diff --git a/lib/vendor/symfony/lib/controller/default/templates/loginSuccess.php b/lib/vendor/symfony/lib/controller/default/templates/loginSuccess.php
index 10e9280ba..0c064b08b 100644
--- a/lib/vendor/symfony/lib/controller/default/templates/loginSuccess.php
+++ b/lib/vendor/symfony/lib/controller/default/templates/loginSuccess.php
@@ -1,4 +1,4 @@
-<?php decorate_with(dirname(__FILE__).'/defaultLayout.php') ?>
+<?php decorate_with(__DIR__.'/defaultLayout.php') ?>
 
 <div class="sfTMessageContainer sfTLock"> 
   <?php echo image_tag('/sf/sf_default/images/icons/lock48.png', array('alt' => 'login required', 'class' => 'sfTMessageIcon', 'size' => '48x48')) ?>
diff --git a/lib/vendor/symfony/lib/controller/default/templates/moduleSuccess.php b/lib/vendor/symfony/lib/controller/default/templates/moduleSuccess.php
index 7cb6d3561..cacd8cb74 100644
--- a/lib/vendor/symfony/lib/controller/default/templates/moduleSuccess.php
+++ b/lib/vendor/symfony/lib/controller/default/templates/moduleSuccess.php
@@ -1,4 +1,4 @@
-<?php decorate_with(dirname(__FILE__).'/defaultLayout.php') ?>
+<?php decorate_with(__DIR__.'/defaultLayout.php') ?>
 
 <div class="sfTMessageContainer sfTMessage"> 
   <?php echo image_tag('/sf/sf_default/images/icons/ok48.png', array('alt' => 'module created', 'class' => 'sfTMessageIcon', 'size' => '48x48')) ?>
diff --git a/lib/vendor/symfony/lib/controller/default/templates/secureSuccess.php b/lib/vendor/symfony/lib/controller/default/templates/secureSuccess.php
index e19126714..19d893378 100644
--- a/lib/vendor/symfony/lib/controller/default/templates/secureSuccess.php
+++ b/lib/vendor/symfony/lib/controller/default/templates/secureSuccess.php
@@ -1,4 +1,4 @@
-<?php decorate_with(dirname(__FILE__).'/defaultLayout.php') ?>
+<?php decorate_with(__DIR__.'/defaultLayout.php') ?>
 
 <div class="sfTMessageContainer sfTLock"> 
   <?php echo image_tag('/sf/sf_default/images/icons/lock48.png', array('alt' => 'credentials required', 'class' => 'sfTMessageIcon', 'size' => '48x48')) ?>
diff --git a/lib/vendor/symfony/lib/controller/sfController.class.php b/lib/vendor/symfony/lib/controller/sfController.class.php
index 75d5dcf33..79daa24a8 100644
--- a/lib/vendor/symfony/lib/controller/sfController.class.php
+++ b/lib/vendor/symfony/lib/controller/sfController.class.php
@@ -16,7 +16,7 @@
  * @subpackage controller
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfController.class.php 30912 2010-09-15 11:10:46Z fabien $
+ * @version    SVN: $Id$
  */
 abstract class sfController
 {
@@ -489,7 +489,7 @@ public function setRenderMode($mode)
    */
   public function inCLI()
   {
-    return 0 == strncasecmp(PHP_SAPI, 'cli', 3);
+    return 'cli' == PHP_SAPI;
   }
 
   /**
diff --git a/lib/vendor/symfony/lib/controller/sfFrontWebController.class.php b/lib/vendor/symfony/lib/controller/sfFrontWebController.class.php
index 5bb9fefd3..b634223f2 100644
--- a/lib/vendor/symfony/lib/controller/sfFrontWebController.class.php
+++ b/lib/vendor/symfony/lib/controller/sfFrontWebController.class.php
@@ -18,7 +18,7 @@
  * @subpackage controller
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfFrontWebController.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfFrontWebController extends sfWebController
 {
diff --git a/lib/vendor/symfony/lib/controller/sfWebController.class.php b/lib/vendor/symfony/lib/controller/sfWebController.class.php
index 141b776ce..2e7cb480f 100644
--- a/lib/vendor/symfony/lib/controller/sfWebController.class.php
+++ b/lib/vendor/symfony/lib/controller/sfWebController.class.php
@@ -16,7 +16,7 @@
  * @subpackage controller
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfWebController.class.php 30563 2010-08-06 11:22:44Z fabien $
+ * @version    SVN: $Id$
  */
 abstract class sfWebController extends sfController
 {
@@ -120,7 +120,7 @@ public function convertUrlStringToParameters($url)
     }
 
     // routeName?
-    if ($url[0] == '@')
+    if ($url && $url[0] == '@')
     {
       $route = substr($url, 1);
     }
diff --git a/lib/vendor/symfony/lib/database/sfDatabase.class.php b/lib/vendor/symfony/lib/database/sfDatabase.class.php
index 6211ba2ec..0a47edea9 100644
--- a/lib/vendor/symfony/lib/database/sfDatabase.class.php
+++ b/lib/vendor/symfony/lib/database/sfDatabase.class.php
@@ -17,7 +17,7 @@
  * @subpackage database
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfDatabase.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class sfDatabase
 {
diff --git a/lib/vendor/symfony/lib/database/sfDatabaseManager.class.php b/lib/vendor/symfony/lib/database/sfDatabaseManager.class.php
index 736bccb8f..ae9e667f5 100644
--- a/lib/vendor/symfony/lib/database/sfDatabaseManager.class.php
+++ b/lib/vendor/symfony/lib/database/sfDatabaseManager.class.php
@@ -18,7 +18,7 @@
  * @subpackage database
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfDatabaseManager.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDatabaseManager
 {
diff --git a/lib/vendor/symfony/lib/database/sfMySQLDatabase.class.php b/lib/vendor/symfony/lib/database/sfMySQLDatabase.class.php
index 919e119ac..a72260a47 100644
--- a/lib/vendor/symfony/lib/database/sfMySQLDatabase.class.php
+++ b/lib/vendor/symfony/lib/database/sfMySQLDatabase.class.php
@@ -24,7 +24,7 @@
  * @subpackage database
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfMySQLDatabase.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfMySQLDatabase extends sfDatabase
 {
diff --git a/lib/vendor/symfony/lib/database/sfPDODatabase.class.php b/lib/vendor/symfony/lib/database/sfPDODatabase.class.php
index d4af36dce..886d19d0c 100644
--- a/lib/vendor/symfony/lib/database/sfPDODatabase.class.php
+++ b/lib/vendor/symfony/lib/database/sfPDODatabase.class.php
@@ -18,7 +18,7 @@
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
  * @author     Dustin Whittle <dustin.whittle@symfony-project.com>
- * @version    SVN: $Id: sfPDODatabase.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfPDODatabase extends sfDatabase
 {
@@ -42,7 +42,7 @@ public function connect()
       $password   = $this->getParameter('password');
       $persistent = $this->getParameter('persistent');
 
-      $options = ($persistent) ? array(PDO::ATTR_PERSISTENT => true) : array();
+      $options = $persistent ? array(PDO::ATTR_PERSISTENT => true) : array();
 
       $this->connection = new $pdo_class($dsn, $username, $password, $options);
 
@@ -109,6 +109,6 @@ public function shutdown()
    */
   public function __call($method, $arguments)
   {
-    return $this->getConnection()->$method($arguments);
+    return call_user_func_array(array($this->getConnection(), $method), $arguments);
   }
 }
diff --git a/lib/vendor/symfony/lib/database/sfPostgreSQLDatabase.class.php b/lib/vendor/symfony/lib/database/sfPostgreSQLDatabase.class.php
index f5b238344..0bbf8abf3 100644
--- a/lib/vendor/symfony/lib/database/sfPostgreSQLDatabase.class.php
+++ b/lib/vendor/symfony/lib/database/sfPostgreSQLDatabase.class.php
@@ -25,7 +25,7 @@
  * @subpackage database
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfPostgreSQLDatabase.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfPostgreSQLDatabase extends sfDatabase
 {
diff --git a/lib/vendor/symfony/lib/debug/sfDebug.class.php b/lib/vendor/symfony/lib/debug/sfDebug.class.php
index aaf2919b0..f4adbf81f 100644
--- a/lib/vendor/symfony/lib/debug/sfDebug.class.php
+++ b/lib/vendor/symfony/lib/debug/sfDebug.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage debug
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfDebug.class.php 31250 2010-10-26 14:18:26Z fabien $
+ * @version    SVN: $Id$
  */
 class sfDebug
 {
@@ -167,7 +167,7 @@ public static function userAsArray(sfUser $user = null)
       'culture'         => $user->getCulture(),
     );
 
-    if ($user instanceof sfSecurityUser)
+    if ($user instanceof sfBasicSecurityUser)
     {
       $data = array_merge($data, array(
           'authenticated'   => $user->isAuthenticated(),
diff --git a/lib/vendor/symfony/lib/debug/sfTimer.class.php b/lib/vendor/symfony/lib/debug/sfTimer.class.php
index b651e763d..a08037784 100644
--- a/lib/vendor/symfony/lib/debug/sfTimer.class.php
+++ b/lib/vendor/symfony/lib/debug/sfTimer.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfTimer.class.php 9079 2008-05-20 00:38:07Z Carl.Vondrick $
+ * @version    SVN: $Id$
  */
 class sfTimer
 {
diff --git a/lib/vendor/symfony/lib/debug/sfTimerManager.class.php b/lib/vendor/symfony/lib/debug/sfTimerManager.class.php
index a165d7640..324574b67 100644
--- a/lib/vendor/symfony/lib/debug/sfTimerManager.class.php
+++ b/lib/vendor/symfony/lib/debug/sfTimerManager.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfTimerManager.class.php 13339 2008-11-25 14:58:05Z fabien $
+ * @version    SVN: $Id$
  */
 class sfTimerManager
 {
@@ -29,14 +29,17 @@ class sfTimerManager
    *
    * @return sfTimer The timer instance
    */
-  public static function getTimer($name)
+  public static function getTimer($name, $reset=true)
   {
     if (!isset(self::$timers[$name]))
     {
       self::$timers[$name] = new sfTimer($name);
     }
 
-    self::$timers[$name]->startTimer();
+    if ($reset)
+    {
+       self::$timers[$name]->startTimer();
+    }
 
     return self::$timers[$name];
   }
diff --git a/lib/vendor/symfony/lib/debug/sfWebDebug.class.php b/lib/vendor/symfony/lib/debug/sfWebDebug.class.php
index 03f8ec04e..b511da093 100644
--- a/lib/vendor/symfony/lib/debug/sfWebDebug.class.php
+++ b/lib/vendor/symfony/lib/debug/sfWebDebug.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage debug
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWebDebug.class.php 31254 2010-10-26 15:26:03Z fabien $
+ * @version    SVN: $Id$
  */
 class sfWebDebug
 {
@@ -207,7 +207,7 @@ public function asHtml()
           $titles[] = sprintf('<li%s><a title="%s" href="%s"%s>%s</a></li>',
             $panel->getStatus() ? ' class="sfWebDebug'.ucfirst($this->getPriority($panel->getStatus())).'"' : '',
             $panel->getPanelTitle(),
-            $panel->getTitleUrl() ? $panel->getTitleUrl() : '#',
+            $panel->getTitleUrl() ?: '#',
             $panel->getTitleUrl() ? '' : ' onclick="sfWebDebugShowDetailsFor(\''.$id.'\'); return false;"',
             $title
           );
@@ -780,7 +780,7 @@ public function getStylesheet()
   margin: 0;
   padding: 0;
   margin-left: 20px;
-  list-style: number;
+  list-style: decimal;
 }
 
 #sfWebDebugDatabaseLogs li
diff --git a/lib/vendor/symfony/lib/debug/sfWebDebugPanel.class.php b/lib/vendor/symfony/lib/debug/sfWebDebugPanel.class.php
index 0d1f6958a..827f90eab 100644
--- a/lib/vendor/symfony/lib/debug/sfWebDebugPanel.class.php
+++ b/lib/vendor/symfony/lib/debug/sfWebDebugPanel.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage debug
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWebDebugPanel.class.php 27284 2010-01-28 18:34:57Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class sfWebDebugPanel
 {
diff --git a/lib/vendor/symfony/lib/debug/sfWebDebugPanelCache.class.php b/lib/vendor/symfony/lib/debug/sfWebDebugPanelCache.class.php
index 8f13758e0..dce7f206d 100644
--- a/lib/vendor/symfony/lib/debug/sfWebDebugPanelCache.class.php
+++ b/lib/vendor/symfony/lib/debug/sfWebDebugPanelCache.class.php
@@ -15,7 +15,7 @@
  * @package    symfony
  * @subpackage debug
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWebDebugPanelCache.class.php 22932 2009-10-11 22:40:20Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfWebDebugPanelCache extends sfWebDebugPanel
 {
diff --git a/lib/vendor/symfony/lib/debug/sfWebDebugPanelConfig.class.php b/lib/vendor/symfony/lib/debug/sfWebDebugPanelConfig.class.php
index f951c13f7..5e212203b 100644
--- a/lib/vendor/symfony/lib/debug/sfWebDebugPanelConfig.class.php
+++ b/lib/vendor/symfony/lib/debug/sfWebDebugPanelConfig.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage debug
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWebDebugPanelConfig.class.php 19774 2009-07-01 09:46:42Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfWebDebugPanelConfig extends sfWebDebugPanel
 {
diff --git a/lib/vendor/symfony/lib/debug/sfWebDebugPanelLogs.class.php b/lib/vendor/symfony/lib/debug/sfWebDebugPanelLogs.class.php
index 14caab37b..805b89a5e 100644
--- a/lib/vendor/symfony/lib/debug/sfWebDebugPanelLogs.class.php
+++ b/lib/vendor/symfony/lib/debug/sfWebDebugPanelLogs.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage debug
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWebDebugPanelLogs.class.php 22182 2009-09-19 18:51:53Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfWebDebugPanelLogs extends sfWebDebugPanel
 {
diff --git a/lib/vendor/symfony/lib/debug/sfWebDebugPanelMailer.class.php b/lib/vendor/symfony/lib/debug/sfWebDebugPanelMailer.class.php
index 6b8e25cd2..5883e1074 100644
--- a/lib/vendor/symfony/lib/debug/sfWebDebugPanelMailer.class.php
+++ b/lib/vendor/symfony/lib/debug/sfWebDebugPanelMailer.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage debug
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWebDebugPanelMailer.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfWebDebugPanelMailer extends sfWebDebugPanel
 {
diff --git a/lib/vendor/symfony/lib/debug/sfWebDebugPanelMemory.class.php b/lib/vendor/symfony/lib/debug/sfWebDebugPanelMemory.class.php
index 1b24afc37..2a37073ab 100644
--- a/lib/vendor/symfony/lib/debug/sfWebDebugPanelMemory.class.php
+++ b/lib/vendor/symfony/lib/debug/sfWebDebugPanelMemory.class.php
@@ -14,13 +14,13 @@
  * @package    symfony
  * @subpackage debug
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWebDebugPanelMemory.class.php 21069 2009-08-11 23:28:20Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfWebDebugPanelMemory extends sfWebDebugPanel
 {
   public function getTitle()
   {
-    $totalMemory = sprintf('%.1f', (memory_get_peak_usage(true) / 1024));
+    $totalMemory = sprintf('%.1f', memory_get_peak_usage(true) / 1024);
 
     return '<img src="'.$this->webDebug->getOption('image_root_path').'/memory.png" alt="Memory" /> '.$totalMemory.' KB';
   }
diff --git a/lib/vendor/symfony/lib/debug/sfWebDebugPanelSymfonyVersion.class.php b/lib/vendor/symfony/lib/debug/sfWebDebugPanelSymfonyVersion.class.php
index 0866ad77a..02b9ad1d5 100644
--- a/lib/vendor/symfony/lib/debug/sfWebDebugPanelSymfonyVersion.class.php
+++ b/lib/vendor/symfony/lib/debug/sfWebDebugPanelSymfonyVersion.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage debug
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWebDebugPanelSymfonyVersion.class.php 11726 2008-09-22 12:38:17Z fabien $
+ * @version    SVN: $Id$
  */
 class sfWebDebugPanelSymfonyVersion extends sfWebDebugPanel
 {
diff --git a/lib/vendor/symfony/lib/debug/sfWebDebugPanelTimer.class.php b/lib/vendor/symfony/lib/debug/sfWebDebugPanelTimer.class.php
index 909a9ab26..e9e039a59 100644
--- a/lib/vendor/symfony/lib/debug/sfWebDebugPanelTimer.class.php
+++ b/lib/vendor/symfony/lib/debug/sfWebDebugPanelTimer.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage debug
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWebDebugPanelTimer.class.php 22955 2009-10-12 16:44:07Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfWebDebugPanelTimer extends sfWebDebugPanel
 {
diff --git a/lib/vendor/symfony/lib/debug/sfWebDebugPanelView.class.php b/lib/vendor/symfony/lib/debug/sfWebDebugPanelView.class.php
index fa0040b3a..bab2b3712 100644
--- a/lib/vendor/symfony/lib/debug/sfWebDebugPanelView.class.php
+++ b/lib/vendor/symfony/lib/debug/sfWebDebugPanelView.class.php
@@ -10,11 +10,11 @@
 
 /**
  * sfWebDebugPanelView adds a panel to the web debug toolbar with information about the view layer.
- * 
+ *
  * @package     symfony
  * @subpackage  debug
  * @author      Kris Wallsmith <kris.wallsmith@symfony-project.com>
- * @version     SVN: $Id: sfWebDebugPanelView.class.php 24069 2009-11-17 06:59:01Z Kris.Wallsmith $
+ * @version     SVN: $Id$
  */
 class sfWebDebugPanelView extends sfWebDebugPanel
 {
@@ -37,7 +37,7 @@ public function __construct(sfWebDebug $webDebug)
 
   /**
    * Resets the parameter collections.
-   * 
+   *
    * @param sfEvent $event
    */
   public function listenForChangeAction(sfEvent $event)
@@ -48,10 +48,10 @@ public function listenForChangeAction(sfEvent $event)
 
   /**
    * Stacks action and partial parameters in the template.filter_parameters event.
-   * 
+   *
    * @param  sfEvent $event
    * @param  array   $parameters
-   * 
+   *
    * @return array
    */
   public function filterTemplateParameters(sfEvent $event, $parameters)
@@ -72,9 +72,9 @@ public function filterTemplateParameters(sfEvent $event, $parameters)
 
   /**
    * Returns the path to the last template rendered.
-   * 
+   *
    * @param  string $class Name of the rendering view class
-   * 
+   *
    * @return string|null
    */
   protected function getLastTemplate($class = 'sfPHPView')
@@ -128,18 +128,18 @@ public function getPanelContent()
       $html[] = $this->renderTemplateInformation($partial['file'], $partial['parameters'], 'Partial');
     }
 
-    return join("\n", $html);
+    return implode("\n", $html);
   }
 
   /**
    * Renders information about the passed template and its parameters.
-   * 
+   *
    * The rendered HTML for each parameter is filtered through the "debug.web.view.filter_parameter_html" event.
-   * 
+   *
    * @param  string $file       The template file path
    * @param  array  $parameters
    * @param  string $label
-   * 
+   *
    * @return string
    */
   protected function renderTemplateInformation($file, $parameters, $label = 'Template')
@@ -169,15 +169,15 @@ protected function renderTemplateInformation($file, $parameters, $label = 'Templ
     }
     $html[] = '</div>';
 
-    return join("\n", $html);
+    return implode("\n", $html);
   }
 
   /**
    * Formats information about a parameter as HTML.
-   * 
+   *
    * @param  string $name
    * @param  mixed  $parameter
-   * 
+   *
    * @return string
    */
   protected function formatParameterAsHtml($name, $parameter)
@@ -192,10 +192,10 @@ protected function formatParameterAsHtml($name, $parameter)
 
   /**
    * Formats object information as HTML.
-   * 
+   *
    * @param  string $name
    * @param  object $parameter
-   * 
+   *
    * @return string
    */
   protected function formatObjectAsHtml($name, $parameter)
@@ -212,10 +212,10 @@ protected function formatObjectAsHtml($name, $parameter)
 
   /**
    * Formats form information as HTML.
-   * 
+   *
    * @param  string $name
    * @param  sfForm $form
-   * 
+   *
    * @return string
    */
   protected function formatFormAsHtml($name, sfForm $form)
@@ -242,15 +242,15 @@ protected function formatFormAsHtml($name, sfForm $form)
     $html[] = '<ul>'.$this->formatFormFieldSchemaAsHtml($form->getFormFieldSchema(), $name.'[%s]').'</ul>';
     $html[] = '</div>';
 
-    return join("\n", $html);
+    return implode("\n", $html);
   }
 
   /**
    * Formats form field schema information as HTML.
-   * 
+   *
    * @param  sfFormFieldSchema $fieldSchema
    * @param  string            $nameFormat
-   * 
+   *
    * @return string
    */
   protected function formatFormFieldSchemaAsHtml(sfFormFieldSchema $fieldSchema, $nameFormat = '%s')
@@ -278,15 +278,15 @@ protected function formatFormFieldSchemaAsHtml(sfFormFieldSchema $fieldSchema, $
       }
     }
 
-    return join("\n", $html);
+    return implode("\n", $html);
   }
 
   /**
    * Formats information about a parameter as HTML.
-   * 
+   *
    * @param  string $name
    * @param  mixed  $parameter
-   * 
+   *
    * @return string
    */
   protected function getParameterDescription($name, $parameter, $nameFormat = null, $typeFormat = null)
@@ -306,9 +306,9 @@ protected function getParameterDescription($name, $parameter, $nameFormat = null
 
   /**
    * Shortens an action's template path.
-   * 
+   *
    * @param  string $path
-   * 
+   *
    * @return string
    */
   protected function shortenTemplatePath($path)
@@ -327,9 +327,9 @@ protected function shortenTemplatePath($path)
 
   /**
    * Removes parameters prefixed with "sf_" from the array.
-   * 
+   *
    * @param  array $parameters
-   * 
+   *
    * @return array
    */
   protected function filterCoreParameters($parameters)
@@ -349,9 +349,9 @@ protected function filterCoreParameters($parameters)
 
   /**
    * Returns a string representation of a value.
-   * 
+   *
    * @param  string $value
-   * 
+   *
    * @return string
    */
   protected function varExport($value)
diff --git a/lib/vendor/symfony/lib/escaper/sfOutputEscaper.class.php b/lib/vendor/symfony/lib/escaper/sfOutputEscaper.class.php
index 581044ad5..6eeec7dcd 100644
--- a/lib/vendor/symfony/lib/escaper/sfOutputEscaper.class.php
+++ b/lib/vendor/symfony/lib/escaper/sfOutputEscaper.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage view
  * @author     Mike Squire <mike@somosis.co.uk>
- * @version    SVN: $Id: sfOutputEscaper.class.php 21908 2009-09-11 12:06:21Z fabien $
+ * @version    SVN: $Id$
  */
 abstract class sfOutputEscaper
 {
diff --git a/lib/vendor/symfony/lib/escaper/sfOutputEscaperArrayDecorator.class.php b/lib/vendor/symfony/lib/escaper/sfOutputEscaperArrayDecorator.class.php
index 67d410a84..91bd50c58 100644
--- a/lib/vendor/symfony/lib/escaper/sfOutputEscaperArrayDecorator.class.php
+++ b/lib/vendor/symfony/lib/escaper/sfOutputEscaperArrayDecorator.class.php
@@ -15,7 +15,7 @@
  * @package    symfony
  * @subpackage view
  * @author     Mike Squire <mike@somosis.co.uk>
- * @version    SVN: $Id: sfOutputEscaperArrayDecorator.class.php 27752 2010-02-08 19:21:22Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfOutputEscaperArrayDecorator extends sfOutputEscaperGetterDecorator implements Iterator, ArrayAccess, Countable
 {
diff --git a/lib/vendor/symfony/lib/escaper/sfOutputEscaperGetterDecorator.class.php b/lib/vendor/symfony/lib/escaper/sfOutputEscaperGetterDecorator.class.php
index a0caa1579..7ff241f64 100644
--- a/lib/vendor/symfony/lib/escaper/sfOutputEscaperGetterDecorator.class.php
+++ b/lib/vendor/symfony/lib/escaper/sfOutputEscaperGetterDecorator.class.php
@@ -15,7 +15,7 @@
  * @package    symfony
  * @subpackage view
  * @author     Mike Squire <mike@somosis.co.uk>
- * @version    SVN: $Id: sfOutputEscaperGetterDecorator.class.php 9047 2008-05-19 08:43:05Z FabianLange $
+ * @version    SVN: $Id$
  */
 abstract class sfOutputEscaperGetterDecorator extends sfOutputEscaper
 {
diff --git a/lib/vendor/symfony/lib/escaper/sfOutputEscaperIteratorDecorator.class.php b/lib/vendor/symfony/lib/escaper/sfOutputEscaperIteratorDecorator.class.php
index 99bc43b8d..352142b1c 100644
--- a/lib/vendor/symfony/lib/escaper/sfOutputEscaperIteratorDecorator.class.php
+++ b/lib/vendor/symfony/lib/escaper/sfOutputEscaperIteratorDecorator.class.php
@@ -24,7 +24,7 @@
  * @package    symfony
  * @subpackage view
  * @author     Mike Squire <mike@somosis.co.uk>
- * @version    SVN: $Id: sfOutputEscaperIteratorDecorator.class.php 23436 2009-10-29 16:10:39Z fabien $
+ * @version    SVN: $Id$
  */
 class sfOutputEscaperIteratorDecorator extends sfOutputEscaperObjectDecorator implements Iterator, ArrayAccess
 {
diff --git a/lib/vendor/symfony/lib/escaper/sfOutputEscaperObjectDecorator.class.php b/lib/vendor/symfony/lib/escaper/sfOutputEscaperObjectDecorator.class.php
index 9bd050492..89e70edcd 100644
--- a/lib/vendor/symfony/lib/escaper/sfOutputEscaperObjectDecorator.class.php
+++ b/lib/vendor/symfony/lib/escaper/sfOutputEscaperObjectDecorator.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage view
  * @author     Mike Squire <mike@somosis.co.uk>
- * @version    SVN: $Id: sfOutputEscaperObjectDecorator.class.php 29990 2010-06-25 17:06:20Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfOutputEscaperObjectDecorator extends sfOutputEscaperGetterDecorator implements Countable
 {
diff --git a/lib/vendor/symfony/lib/escaper/sfOutputEscaperSafe.class.php b/lib/vendor/symfony/lib/escaper/sfOutputEscaperSafe.class.php
index 36b46e974..c4ddba4c2 100644
--- a/lib/vendor/symfony/lib/escaper/sfOutputEscaperSafe.class.php
+++ b/lib/vendor/symfony/lib/escaper/sfOutputEscaperSafe.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage view
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfOutputEscaperSafe.class.php 16553 2009-03-24 16:49:06Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfOutputEscaperSafe extends ArrayIterator
 {
diff --git a/lib/vendor/symfony/lib/event_dispatcher/sfEvent.php b/lib/vendor/symfony/lib/event/sfEvent.class.php
similarity index 97%
rename from lib/vendor/symfony/lib/event_dispatcher/sfEvent.php
rename to lib/vendor/symfony/lib/event/sfEvent.class.php
index 1e97e0100..0ffd44281 100644
--- a/lib/vendor/symfony/lib/event_dispatcher/sfEvent.php
+++ b/lib/vendor/symfony/lib/event/sfEvent.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -12,7 +12,7 @@
  * sfEvent.
  *
  * @package    symfony
- * @subpackage event_dispatcher
+ * @subpackage event
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @version    SVN: $Id: sfEvent.class.php 8698 2008-04-30 16:35:28Z fabien $
  */
@@ -143,7 +143,7 @@ public function offsetGet($name)
    * Sets a parameter (implements the ArrayAccess interface).
    *
    * @param string  $name   The parameter name
-   * @param mixed   $value  The parameter value 
+   * @param mixed   $value  The parameter value
    */
   public function offsetSet($name, $value)
   {
diff --git a/lib/vendor/symfony/lib/event_dispatcher/sfEventDispatcher.php b/lib/vendor/symfony/lib/event/sfEventDispatcher.class.php
similarity index 97%
rename from lib/vendor/symfony/lib/event_dispatcher/sfEventDispatcher.php
rename to lib/vendor/symfony/lib/event/sfEventDispatcher.class.php
index 344cd79d4..1a4d38819 100644
--- a/lib/vendor/symfony/lib/event_dispatcher/sfEventDispatcher.php
+++ b/lib/vendor/symfony/lib/event/sfEventDispatcher.class.php
@@ -1,11 +1,9 @@
 <?php
 
-require_once dirname(__FILE__).'/sfEvent.php';
-
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -16,7 +14,7 @@
  * @see http://developer.apple.com/documentation/Cocoa/Conceptual/Notifications/index.html Apple's Cocoa framework
  *
  * @package    symfony
- * @subpackage event_dispatcher
+ * @subpackage event
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @version    SVN: $Id: sfEventDispatcher.class.php 10631 2008-08-03 16:50:47Z fabien $
  */
diff --git a/lib/vendor/symfony/lib/exception/sfCacheException.class.php b/lib/vendor/symfony/lib/exception/sfCacheException.class.php
index 7652deaeb..e6b490de3 100644
--- a/lib/vendor/symfony/lib/exception/sfCacheException.class.php
+++ b/lib/vendor/symfony/lib/exception/sfCacheException.class.php
@@ -16,7 +16,7 @@
  * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfCacheException.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfCacheException extends sfException
 {
diff --git a/lib/vendor/symfony/lib/exception/sfConfigurationException.class.php b/lib/vendor/symfony/lib/exception/sfConfigurationException.class.php
index 39d939585..deb916ee7 100644
--- a/lib/vendor/symfony/lib/exception/sfConfigurationException.class.php
+++ b/lib/vendor/symfony/lib/exception/sfConfigurationException.class.php
@@ -17,7 +17,7 @@
  * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfConfigurationException.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfConfigurationException extends sfException
 {
diff --git a/lib/vendor/symfony/lib/exception/sfControllerException.class.php b/lib/vendor/symfony/lib/exception/sfControllerException.class.php
index dc78eaf31..97a21a93c 100644
--- a/lib/vendor/symfony/lib/exception/sfControllerException.class.php
+++ b/lib/vendor/symfony/lib/exception/sfControllerException.class.php
@@ -17,7 +17,7 @@
  * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfControllerException.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfControllerException extends sfException
 {
diff --git a/lib/vendor/symfony/lib/exception/sfDatabaseException.class.php b/lib/vendor/symfony/lib/exception/sfDatabaseException.class.php
index 149599b94..af07b3e51 100644
--- a/lib/vendor/symfony/lib/exception/sfDatabaseException.class.php
+++ b/lib/vendor/symfony/lib/exception/sfDatabaseException.class.php
@@ -16,7 +16,7 @@
  * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfDatabaseException.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDatabaseException extends sfException
 {
diff --git a/lib/vendor/symfony/lib/exception/sfError404Exception.class.php b/lib/vendor/symfony/lib/exception/sfError404Exception.class.php
index 5a6205530..bec7a9903 100644
--- a/lib/vendor/symfony/lib/exception/sfError404Exception.class.php
+++ b/lib/vendor/symfony/lib/exception/sfError404Exception.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfError404Exception.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfError404Exception extends sfException
 {
diff --git a/lib/vendor/symfony/lib/exception/sfException.class.php b/lib/vendor/symfony/lib/exception/sfException.class.php
index 727500925..4ae9d290e 100644
--- a/lib/vendor/symfony/lib/exception/sfException.class.php
+++ b/lib/vendor/symfony/lib/exception/sfException.class.php
@@ -4,7 +4,7 @@
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
  * (c) 2004-2006 Sean Kerr <sean@code-box.org>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -18,7 +18,7 @@
  * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfException.class.php 32641 2011-06-11 13:39:35Z fabien $
+ * @version    SVN: $Id$
  */
 class sfException extends Exception
 {
@@ -73,7 +73,7 @@ static public function clearLastException()
   {
   	self::$lastException = null;
   }
-  
+
   /**
    * Prints the stack trace for this exception.
    */
@@ -100,7 +100,9 @@ public function printStackTrace()
         }
       }
 
-      ob_start(sfConfig::get('sf_compressed') ? 'ob_gzhandler' : '');
+      if (sfConfig::get('sf_compressed')) {
+          ob_start('ob_gzhandler');
+      }
 
       header('HTTP/1.0 500 Internal Server Error');
     }
@@ -135,7 +137,8 @@ static protected function outputStackTrace(Exception $exception)
 
       if (sfConfig::get('sf_logging_enabled'))
       {
-        $dispatcher->notify(new sfEvent($exception, 'application.log', array($exception->getMessage(), 'priority' => sfLogger::ERR)));
+        $priority = $exception instanceof sfError404Exception ? sfLogger::ERR : sfLogger::CRIT;
+        $dispatcher->notify(new sfEvent($exception, 'application.log', array($exception->getMessage(), 'priority' => $priority)));
       }
 
       $event = $dispatcher->notifyUntil(new sfEvent($exception, 'application.throw_exception'));
@@ -193,8 +196,9 @@ static protected function outputStackTrace(Exception $exception)
       }
     }
 
-    // when using CLI, we force the format to be TXT
-    if (0 == strncasecmp(PHP_SAPI, 'cli', 3))
+    // when using CLI, we force the format to be TXT. Compare exactly to
+    // the string 'cli' because the php 5.4 server is identified by 'cli-server'
+    if ('cli' == PHP_SAPI)
     {
       $format = 'txt';
     }
@@ -256,7 +260,7 @@ static public function getTemplatePathForError($format, $debug)
     $templatePaths = array(
       sfConfig::get('sf_app_config_dir').'/error',
       sfConfig::get('sf_config_dir').'/error',
-      dirname(__FILE__).'/data',
+      __DIR__.'/data',
     );
 
     $template = sprintf('%s.%s.php', $debug ? 'exception' : 'error', $format);
@@ -394,7 +398,7 @@ static protected function formatArgs($args, $single = false, $format = 'html')
       {
         $formattedValue = $value;
       }
-      
+
       $result[] = is_int($key) ? $formattedValue : sprintf("'%s' => %s", self::escape($key), $formattedValue);
     }
 
@@ -403,12 +407,12 @@ static protected function formatArgs($args, $single = false, $format = 'html')
 
   /**
    * Formats a file path.
-   * 
+   *
    * @param  string  $file   An absolute file path
    * @param  integer $line   The line number
    * @param  string  $format The output format (txt or html)
    * @param  string  $text   Use this text for the link rather than the file path
-   * 
+   *
    * @return string
    */
   static protected function formatFile($file, $line, $format = 'html', $text = null)
@@ -440,7 +444,7 @@ static protected function escape($value)
     {
       return $value;
     }
-    
+
     return htmlspecialchars($value, ENT_QUOTES, sfConfig::get('sf_charset', 'UTF-8'));
   }
 }
diff --git a/lib/vendor/symfony/lib/exception/sfFactoryException.class.php b/lib/vendor/symfony/lib/exception/sfFactoryException.class.php
index 4579a45d1..e882c49fd 100644
--- a/lib/vendor/symfony/lib/exception/sfFactoryException.class.php
+++ b/lib/vendor/symfony/lib/exception/sfFactoryException.class.php
@@ -17,7 +17,7 @@
  * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfFactoryException.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfFactoryException extends sfException
 {
diff --git a/lib/vendor/symfony/lib/exception/sfFileException.class.php b/lib/vendor/symfony/lib/exception/sfFileException.class.php
index e27157026..b31fc58d0 100644
--- a/lib/vendor/symfony/lib/exception/sfFileException.class.php
+++ b/lib/vendor/symfony/lib/exception/sfFileException.class.php
@@ -16,7 +16,7 @@
  * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfFileException.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfFileException extends sfException
 {
diff --git a/lib/vendor/symfony/lib/exception/sfFilterException.class.php b/lib/vendor/symfony/lib/exception/sfFilterException.class.php
index b5a331b06..11946230d 100644
--- a/lib/vendor/symfony/lib/exception/sfFilterException.class.php
+++ b/lib/vendor/symfony/lib/exception/sfFilterException.class.php
@@ -17,7 +17,7 @@
  * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfFilterException.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfFilterException extends sfException
 {
diff --git a/lib/vendor/symfony/lib/exception/sfForwardException.class.php b/lib/vendor/symfony/lib/exception/sfForwardException.class.php
index 2c888a2ca..b8537d986 100644
--- a/lib/vendor/symfony/lib/exception/sfForwardException.class.php
+++ b/lib/vendor/symfony/lib/exception/sfForwardException.class.php
@@ -17,7 +17,7 @@
  * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfForwardException.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfForwardException extends sfException
 {
diff --git a/lib/vendor/symfony/lib/exception/sfInitializationException.class.php b/lib/vendor/symfony/lib/exception/sfInitializationException.class.php
index a95b8dd45..e6db11094 100644
--- a/lib/vendor/symfony/lib/exception/sfInitializationException.class.php
+++ b/lib/vendor/symfony/lib/exception/sfInitializationException.class.php
@@ -16,7 +16,7 @@
  * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfInitializationException.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfInitializationException extends sfException
 {
diff --git a/lib/vendor/symfony/lib/exception/sfParseException.class.php b/lib/vendor/symfony/lib/exception/sfParseException.class.php
index 0e6754462..768821640 100644
--- a/lib/vendor/symfony/lib/exception/sfParseException.class.php
+++ b/lib/vendor/symfony/lib/exception/sfParseException.class.php
@@ -17,7 +17,7 @@
  * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfParseException.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfParseException extends sfException
 {
diff --git a/lib/vendor/symfony/lib/exception/sfRenderException.class.php b/lib/vendor/symfony/lib/exception/sfRenderException.class.php
index b66c15d48..94496e55c 100644
--- a/lib/vendor/symfony/lib/exception/sfRenderException.class.php
+++ b/lib/vendor/symfony/lib/exception/sfRenderException.class.php
@@ -16,7 +16,7 @@
  * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfRenderException.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfRenderException extends sfException
 {
diff --git a/lib/vendor/symfony/lib/exception/sfSecurityException.class.php b/lib/vendor/symfony/lib/exception/sfSecurityException.class.php
index ffd698852..529f54011 100644
--- a/lib/vendor/symfony/lib/exception/sfSecurityException.class.php
+++ b/lib/vendor/symfony/lib/exception/sfSecurityException.class.php
@@ -16,7 +16,7 @@
  * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfSecurityException.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfSecurityException extends sfException
 {
diff --git a/lib/vendor/symfony/lib/exception/sfStopException.class.php b/lib/vendor/symfony/lib/exception/sfStopException.class.php
index fde1df3e8..41b3cb52d 100644
--- a/lib/vendor/symfony/lib/exception/sfStopException.class.php
+++ b/lib/vendor/symfony/lib/exception/sfStopException.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfStopException.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfStopException extends sfException
 {
diff --git a/lib/vendor/symfony/lib/exception/sfStorageException.class.php b/lib/vendor/symfony/lib/exception/sfStorageException.class.php
index 9b3c35944..16e85f71b 100644
--- a/lib/vendor/symfony/lib/exception/sfStorageException.class.php
+++ b/lib/vendor/symfony/lib/exception/sfStorageException.class.php
@@ -17,7 +17,7 @@
  * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfStorageException.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfStorageException extends sfException
 {
diff --git a/lib/vendor/symfony/lib/exception/sfViewException.class.php b/lib/vendor/symfony/lib/exception/sfViewException.class.php
index 57e5531cf..6b9f8964e 100644
--- a/lib/vendor/symfony/lib/exception/sfViewException.class.php
+++ b/lib/vendor/symfony/lib/exception/sfViewException.class.php
@@ -16,7 +16,7 @@
  * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfViewException.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfViewException extends sfException
 {
diff --git a/lib/vendor/symfony/lib/filter/sfBasicSecurityFilter.class.php b/lib/vendor/symfony/lib/filter/sfBasicSecurityFilter.class.php
index 6917fb078..bbd22332a 100644
--- a/lib/vendor/symfony/lib/filter/sfBasicSecurityFilter.class.php
+++ b/lib/vendor/symfony/lib/filter/sfBasicSecurityFilter.class.php
@@ -18,7 +18,7 @@
  * @package    symfony
  * @subpackage filter
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfBasicSecurityFilter.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfBasicSecurityFilter extends sfFilter
 {
diff --git a/lib/vendor/symfony/lib/filter/sfCacheFilter.class.php b/lib/vendor/symfony/lib/filter/sfCacheFilter.class.php
index 70856b542..d7942eafd 100644
--- a/lib/vendor/symfony/lib/filter/sfCacheFilter.class.php
+++ b/lib/vendor/symfony/lib/filter/sfCacheFilter.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage filter
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfCacheFilter.class.php 28625 2010-03-19 19:00:53Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfCacheFilter extends sfFilter
 {
diff --git a/lib/vendor/symfony/lib/filter/sfExecutionFilter.class.php b/lib/vendor/symfony/lib/filter/sfExecutionFilter.class.php
index b64abc09e..812657d41 100644
--- a/lib/vendor/symfony/lib/filter/sfExecutionFilter.class.php
+++ b/lib/vendor/symfony/lib/filter/sfExecutionFilter.class.php
@@ -17,7 +17,7 @@
  * @subpackage filter
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfExecutionFilter.class.php 29523 2010-05-19 12:50:54Z fabien $
+ * @version    SVN: $Id$
  */
 class sfExecutionFilter extends sfFilter
 {
diff --git a/lib/vendor/symfony/lib/filter/sfFilter.class.php b/lib/vendor/symfony/lib/filter/sfFilter.class.php
index bfde01307..f7a8aca22 100644
--- a/lib/vendor/symfony/lib/filter/sfFilter.class.php
+++ b/lib/vendor/symfony/lib/filter/sfFilter.class.php
@@ -16,7 +16,7 @@
  * @subpackage filter
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfFilter.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class sfFilter
 {
diff --git a/lib/vendor/symfony/lib/filter/sfFilterChain.class.php b/lib/vendor/symfony/lib/filter/sfFilterChain.class.php
index 4bed13cd3..e2aa748dc 100644
--- a/lib/vendor/symfony/lib/filter/sfFilterChain.class.php
+++ b/lib/vendor/symfony/lib/filter/sfFilterChain.class.php
@@ -16,7 +16,7 @@
  * @subpackage filter
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfFilterChain.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfFilterChain
 {
diff --git a/lib/vendor/symfony/lib/filter/sfRenderingFilter.class.php b/lib/vendor/symfony/lib/filter/sfRenderingFilter.class.php
index 9eed36824..e77001101 100644
--- a/lib/vendor/symfony/lib/filter/sfRenderingFilter.class.php
+++ b/lib/vendor/symfony/lib/filter/sfRenderingFilter.class.php
@@ -15,7 +15,7 @@
  * @package    symfony
  * @subpackage filter
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfRenderingFilter.class.php 29524 2010-05-19 12:55:30Z fabien $
+ * @version    SVN: $Id$
  */
 class sfRenderingFilter extends sfFilter
 {
diff --git a/lib/vendor/symfony/lib/form/addon/sfFormFilter.class.php b/lib/vendor/symfony/lib/form/addon/sfFormFilter.class.php
index d83938d1f..a670db69a 100644
--- a/lib/vendor/symfony/lib/form/addon/sfFormFilter.class.php
+++ b/lib/vendor/symfony/lib/form/addon/sfFormFilter.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage form
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfFormFilter.class.php 18331 2009-05-16 11:13:47Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfFormFilter extends BaseForm
 {
diff --git a/lib/vendor/symfony/lib/form/addon/sfFormObject.class.php b/lib/vendor/symfony/lib/form/addon/sfFormObject.class.php
index ae80719b1..3652a511c 100644
--- a/lib/vendor/symfony/lib/form/addon/sfFormObject.class.php
+++ b/lib/vendor/symfony/lib/form/addon/sfFormObject.class.php
@@ -10,11 +10,11 @@
 
 /**
  * Base class for forms that deal with a single object.
- * 
+ *
  * @package    symfony
  * @subpackage form
  * @author     Kris Wallsmith <kris.wallsmith@symfony-project.com>
- * @version    SVN: $Id: sfFormObject.class.php 22917 2009-10-10 13:44:53Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class sfFormObject extends BaseForm
 {
@@ -24,7 +24,7 @@ abstract class sfFormObject extends BaseForm
 
   /**
    * Returns the current model name.
-   * 
+   *
    * @return string
    */
   abstract public function getModelName();
@@ -50,7 +50,7 @@ abstract protected function doUpdateObject($values);
    * Processes cleaned up values.
    *
    * @param  array $values An array of values
-   * 
+   *
    * @return array An array of cleaned up values
    */
   abstract public function processValues($values);
@@ -108,7 +108,7 @@ public function bindAndSave($taintedValues, $taintedFiles = null, $con = null)
    * @return mixed The current saved object
    *
    * @see doSave()
-   * 
+   *
    * @throws sfValidatorError If the form is not valid
    */
   public function save($con = null)
@@ -123,10 +123,9 @@ public function save($con = null)
       $con = $this->getConnection();
     }
 
+    $con->beginTransaction();
     try
     {
-      $con->beginTransaction();
-
       $this->doSave($con);
 
       $con->commit();
@@ -150,18 +149,27 @@ public function save($con = null)
    * @param mixed $con An optional connection object
    */
   protected function doSave($con = null)
+  {
+    $this->updateObject();
+    $this->saveObject($con);
+  }
+
+  /**
+   * Save form object
+   *
+   * @param  mixed $con An optional connection object
+   */
+  public function saveObject($con = null)
   {
     if (null === $con)
     {
       $con = $this->getConnection();
     }
 
-    $this->updateObject();
-
     $this->getObject()->save($con);
 
     // embedded forms
-    $this->saveEmbeddedForms($con);
+    $this->saveObjectEmbeddedForms($con);
   }
 
   /**
@@ -225,7 +233,7 @@ public function updateObjectEmbeddedForms($values, $forms = null)
    * @param mixed $con   An optional connection object
    * @param array $forms An array of forms
    */
-  public function saveEmbeddedForms($con = null, $forms = null)
+  public function saveObjectEmbeddedForms($con = null, $forms = null)
   {
     if (null === $con)
     {
@@ -241,12 +249,11 @@ public function saveEmbeddedForms($con = null, $forms = null)
     {
       if ($form instanceof sfFormObject)
       {
-        $form->saveEmbeddedForms($con);
-        $form->getObject()->save($con);
+        $form->saveObject($con);
       }
       else
       {
-        $this->saveEmbeddedForms($con, $form->getEmbeddedForms());
+        $this->saveObjectEmbeddedForms($con, $form->getEmbeddedForms());
       }
     }
   }
@@ -278,6 +285,6 @@ public function renderFormTag($url, array $attributes = array())
 
   protected function camelize($text)
   {
-    return preg_replace(array('#/(.?)#e', '/(^|_|-)+(.)/e'), array("'::'.strtoupper('\\1')", "strtoupper('\\2')"), $text);
+    return strtr(ucwords(strtr($text, array('/' => ':: ', '_' => ' ', '-' => ' '))), array(' ' => ''));
   }
 }
diff --git a/lib/vendor/symfony/lib/form/addon/sfFormSymfony.class.php b/lib/vendor/symfony/lib/form/addon/sfFormSymfony.class.php
index 3462b9149..ef1745dd9 100644
--- a/lib/vendor/symfony/lib/form/addon/sfFormSymfony.class.php
+++ b/lib/vendor/symfony/lib/form/addon/sfFormSymfony.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage form
  * @author     Kris Wallsmith <kris.wallsmith@symfony-project.com>
- * @version    SVN: $Id: sfFormSymfony.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfFormSymfony extends sfForm
 {
diff --git a/lib/vendor/symfony/lib/form/sfForm.class.php b/lib/vendor/symfony/lib/form/sfForm.class.php
index 8d750d4a3..4d206a7d3 100644
--- a/lib/vendor/symfony/lib/form/sfForm.class.php
+++ b/lib/vendor/symfony/lib/form/sfForm.class.php
@@ -23,7 +23,7 @@
  * @package    symfony
  * @subpackage form
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfForm.class.php 29678 2010-05-30 14:38:42Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfForm implements ArrayAccess, Iterator, Countable
 {
@@ -154,7 +154,7 @@ public function renderUsing($formatterName, $attributes = array())
    * @param boolean $recursive False will prevent hidden fields from embedded forms from rendering
    *
    * @return string
-   * 
+   *
    * @see sfFormFieldSchema
    */
   public function renderHiddenFields($recursive = true)
@@ -237,6 +237,11 @@ public function bind(array $taintedValues = null, array $taintedFiles = null)
       $this->values = array();
       $this->errorSchema = $e;
     }
+
+    if ($this->embeddedForms)
+    {
+      $this->bindEmbeddedForms($this->taintedValues, $this->taintedFiles);
+    }
   }
 
   /**
@@ -249,6 +254,44 @@ protected function doBind(array $values)
     $this->values = $this->validatorSchema->clean($values);
   }
 
+  /**
+   * Bind embedded forms (recursivly)
+   *
+   * @param array $taintedValues
+   * @param array $taintedFiles
+   */
+  public function bindEmbeddedForms(array $taintedValues = null, array $taintedFiles = null)
+  {
+    foreach ($this->embeddedForms as $name => $form)
+    {
+      // remove CSRF token
+      unset($form[self::$CSRFFieldName]);
+
+      // bind
+      $form->bind(
+        isset($taintedValues[$name]) ? $taintedValues[$name] : array(),
+        isset($taintedFiles[$name]) ? $taintedFiles[$name] : array()
+      );
+
+      // set values for current form
+      $this->values[$name] = $form->getValues();
+
+      // set widget schema for current form
+      $widgetSchema = $form->getWidgetSchema();
+      $decorator = $widgetSchema->getFormFormatter()->getDecoratorFormat();
+      $this->widgetSchema[$name] = new sfWidgetFormSchemaDecorator($widgetSchema, $decorator);
+
+      // keep widgetSchema synchronized
+      $form->setWidgetSchema($this->widgetSchema[$name]->getWidget());
+
+      // update errorSchema
+      if ($form->hasErrors())
+      {
+        $this->errorSchema->addError($form->getErrorSchema(), $name);
+      }
+    }
+  }
+
   /**
    * Returns true if the form is bound to input values.
    *
@@ -259,6 +302,37 @@ public function isBound()
     return $this->isBound;
   }
 
+  /**
+   * Directly updates form (and embbeded forms) values
+   *
+   * USE WITH CAUTION !!!!
+   *
+   * @param array $values
+   */
+  public function updateValues(array $values)
+  {
+    $this->values = $values + $this->values;
+
+    $this->updateValuesEmbeddedForms($values);
+  }
+
+  /**
+   * Directly updates embedded form values
+   *
+   * @param array $values®
+   */
+  public function updateValuesEmbeddedForms(array $values)
+  {
+    foreach ($this->embeddedForms as $name => $form)
+    {
+      if (isset($values[$name]))
+      {
+        $form->updateValues($values[$name]);
+        $this->values[$name] = $form->getValues();
+      }
+    }
+  }
+
   /**
    * Returns the submitted tainted values.
    *
@@ -296,7 +370,7 @@ public function isValid()
    *
    * It returns false if the form is not bound.
    *
-   * @return Boolean true if the form has no errors, false otherwise
+   * @return Boolean true if the form has some errors, false otherwise
    */
   public function hasErrors()
   {
@@ -375,11 +449,10 @@ public function embedForm($name, sfForm $form, $decorator = null)
       throw new LogicException('A bound form cannot be embedded');
     }
 
-    $this->embeddedForms[$name] = $form;
-
-    $form = clone $form;
     unset($form[self::$CSRFFieldName]);
 
+    $this->embeddedForms[$name] = $form;
+
     $widgetSchema = $form->getWidgetSchema();
 
     $this->setDefault($name, $form->getDefaults());
@@ -387,64 +460,10 @@ public function embedForm($name, sfForm $form, $decorator = null)
     $decorator = null === $decorator ? $widgetSchema->getFormFormatter()->getDecoratorFormat() : $decorator;
 
     $this->widgetSchema[$name] = new sfWidgetFormSchemaDecorator($widgetSchema, $decorator);
-    $this->validatorSchema[$name] = $form->getValidatorSchema();
-
-    $this->resetFormFields();
-  }
-
-  /**
-   * Embeds a sfForm into the current form n times.
-   *
-   * @param string  $name             The field name
-   * @param sfForm  $form             A sfForm instance
-   * @param integer $n                The number of times to embed the form
-   * @param string  $decorator        A HTML decorator for the main form around embedded forms
-   * @param string  $innerDecorator   A HTML decorator for each embedded form
-   * @param array   $options          Options for schema
-   * @param array   $attributes       Attributes for schema
-   * @param array   $labels           Labels for schema
-   */
-  public function embedFormForEach($name, sfForm $form, $n, $decorator = null, $innerDecorator = null, $options = array(), $attributes = array(), $labels = array())
-  {
-    if (true === $this->isBound() || true === $form->isBound())
-    {
-      throw new LogicException('A bound form cannot be embedded');
-    }
-
-    $this->embeddedForms[$name] = new sfForm();
-
-    $form = clone $form;
-    unset($form[self::$CSRFFieldName]);
-
-    $widgetSchema = $form->getWidgetSchema();
-
-    // generate default values
-    $defaults = array();
-    for ($i = 0; $i < $n; $i++)
-    {
-      $defaults[$i] = $form->getDefaults();
-
-      $this->embeddedForms[$name]->embedForm($i, $form);
-    }
+    $this->validatorSchema[$name] = new sfValidatorPass();
 
-    $this->setDefault($name, $defaults);
-
-    $decorator = null === $decorator ? $widgetSchema->getFormFormatter()->getDecoratorFormat() : $decorator;
-    $innerDecorator = null === $innerDecorator ? $widgetSchema->getFormFormatter()->getDecoratorFormat() : $innerDecorator;
-
-    $this->widgetSchema[$name] = new sfWidgetFormSchemaDecorator(new sfWidgetFormSchemaForEach(new sfWidgetFormSchemaDecorator($widgetSchema, $innerDecorator), $n, $options, $attributes), $decorator);
-    $this->validatorSchema[$name] = new sfValidatorSchemaForEach($form->getValidatorSchema(), $n);
-
-    // generate labels
-    for ($i = 0; $i < $n; $i++)
-    {
-      if (!isset($labels[$i]))
-      {
-        $labels[$i] = sprintf('%s (%s)', $this->widgetSchema->getFormFormatter()->generateLabelName($name), $i);
-      }
-    }
-
-    $this->widgetSchema[$name]->setLabels($labels);
+    // keep widgetSchema synchronized
+    $form->setWidgetSchema($this->widgetSchema[$name]->getWidget());
 
     $this->resetFormFields();
   }
@@ -465,7 +484,7 @@ public function getEmbeddedForms()
    * @param  string $name The name used to embed the form
    *
    * @return sfForm
-   * 
+   *
    * @throws InvalidArgumentException If there is no form embedded with the supplied name
    */
   public function getEmbeddedForm($name)
@@ -591,6 +610,11 @@ public function setValidators(array $validators)
    */
   public function setValidator($name, sfValidatorBase $validator)
   {
+    if (isset($this->embeddedForms[$name]))
+    {
+      throw new LogicException('You cannot set a validator for an embedded form.');
+    }
+
     $this->validatorSchema[$name] = $validator;
 
     $this->resetFormFields();
@@ -612,6 +636,11 @@ public function getValidator($name)
       throw new InvalidArgumentException(sprintf('The validator "%s" does not exist.', $name));
     }
 
+    if (isset($this->embeddedForms[$name]))
+    {
+      return $this->embeddedForms[$name]->getValidatorSchema();
+    }
+
     return $this->validatorSchema[$name];
   }
 
@@ -829,7 +858,7 @@ public function setDefaults($defaults)
 
     if ($this->isCSRFProtected())
     {
-      $this->setDefault(self::$CSRFFieldName, $this->getCSRFToken($this->localCSRFSecret ? $this->localCSRFSecret : self::$CSRFSecret));
+      $this->setDefault(self::$CSRFFieldName, $this->getCSRFToken($this->localCSRFSecret ?: self::$CSRFSecret));
     }
 
     $this->resetFormFields();
@@ -899,7 +928,7 @@ public function getCSRFToken($secret = null)
   {
     if (null === $secret)
     {
-      $secret = $this->localCSRFSecret ? $this->localCSRFSecret : self::$CSRFSecret;
+      $secret = $this->localCSRFSecret ?: self::$CSRFSecret;
     }
 
     return md5($secret.session_id().get_class($this));
@@ -1153,6 +1182,43 @@ public function getFormFieldSchema()
     return $this->formFieldSchema;
   }
 
+  /**
+   * Get all errors (included embedded forms errors)
+   *
+   * @return array
+   */
+  public function getErrors()
+  {
+    $errors = array();
+
+    if ($this->hasGlobalErrors())
+    {
+      $errors['_globals'] = array();
+      foreach ($this->getGlobalErrors() as $name => $error)
+      {
+        $errors['_globals'][$name] = $error->getMessage();
+      }
+    }
+
+    foreach ($this as $name => $field)
+    {
+      if (!($field instanceof sfFormFieldSchema) && $field->hasError())
+      {
+        $errors[$this->widgetSchema->getFormFormatter()->generateLabelName($name)] = $field->getError()->getMessage();
+      }
+    }
+
+    foreach ($this->getEmbeddedForms() as $name => $form)
+    {
+      if ($form->hasErrors())
+      {
+        $errors[$name] = $form->getErrors();
+      }
+    }
+
+    return $errors;
+  }
+
   /**
    * Resets the field names array to the beginning (implements the Iterator interface).
    */
diff --git a/lib/vendor/symfony/lib/form/sfFormField.class.php b/lib/vendor/symfony/lib/form/sfFormField.class.php
index 8cc4279d5..558d4b9f2 100644
--- a/lib/vendor/symfony/lib/form/sfFormField.class.php
+++ b/lib/vendor/symfony/lib/form/sfFormField.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage form
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfFormField.class.php 22401 2009-09-25 03:49:27Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfFormField
 {
diff --git a/lib/vendor/symfony/lib/form/sfFormFieldSchema.class.php b/lib/vendor/symfony/lib/form/sfFormFieldSchema.class.php
index a30483a38..520058dfe 100644
--- a/lib/vendor/symfony/lib/form/sfFormFieldSchema.class.php
+++ b/lib/vendor/symfony/lib/form/sfFormFieldSchema.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage form
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfFormFieldSchema.class.php 23214 2009-10-20 18:11:23Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfFormFieldSchema extends sfFormField implements ArrayAccess, Iterator, Countable
 {
@@ -120,7 +120,9 @@ public function offsetGet($name)
 
         if ($error && !$error instanceof sfValidatorErrorSchema)
         {
-          $error = new sfValidatorErrorSchema($error->getValidator(), array($error));
+          $current = $error;
+          $error = new sfValidatorErrorSchema($error->getValidator());
+          $error->addError($current);
         }
       }
       else
diff --git a/lib/vendor/symfony/lib/generator/sfGenerator.class.php b/lib/vendor/symfony/lib/generator/sfGenerator.class.php
index d1bbcbdd6..e78f1b176 100644
--- a/lib/vendor/symfony/lib/generator/sfGenerator.class.php
+++ b/lib/vendor/symfony/lib/generator/sfGenerator.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage generator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfGenerator.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class sfGenerator
 {
diff --git a/lib/vendor/symfony/lib/generator/sfGeneratorManager.class.php b/lib/vendor/symfony/lib/generator/sfGeneratorManager.class.php
index 6852599ac..d7dfaebbc 100644
--- a/lib/vendor/symfony/lib/generator/sfGeneratorManager.class.php
+++ b/lib/vendor/symfony/lib/generator/sfGeneratorManager.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage generator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfGeneratorManager.class.php 23922 2009-11-14 14:58:38Z fabien $
+ * @version    SVN: $Id$
  */
 class sfGeneratorManager
 {
@@ -80,12 +80,13 @@ public function save($path, $content)
   {
     $path = $this->getBasePath().DIRECTORY_SEPARATOR.$path;
 
-    if (!is_dir(dirname($path)))
+    $cacheDir = dirname($path);
+    if (!is_dir($cacheDir))
     {
       $current_umask = umask(0000);
-      if (false === @mkdir(dirname($path), 0777, true))
+      if (!@mkdir($cacheDir, 0777, true) && !is_dir($cacheDir))
       {
-        throw new sfCacheException(sprintf('Failed to make cache directory "%s".', dirname($path)));
+        throw new \sfCacheException(sprintf('Failed to make cache directory "%s".', $cacheDir));
       }
       umask($current_umask);
     }
diff --git a/lib/vendor/symfony/lib/generator/sfModelGenerator.class.php b/lib/vendor/symfony/lib/generator/sfModelGenerator.class.php
index 10d32e139..0272dd01f 100644
--- a/lib/vendor/symfony/lib/generator/sfModelGenerator.class.php
+++ b/lib/vendor/symfony/lib/generator/sfModelGenerator.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage generator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfModelGenerator.class.php 25459 2009-12-16 13:08:43Z fabien $
+ * @version    SVN: $Id$
  */
 abstract class sfModelGenerator extends sfGenerator
 {
diff --git a/lib/vendor/symfony/lib/generator/sfModelGeneratorConfiguration.class.php b/lib/vendor/symfony/lib/generator/sfModelGeneratorConfiguration.class.php
index c13a6381c..0137e0f74 100644
--- a/lib/vendor/symfony/lib/generator/sfModelGeneratorConfiguration.class.php
+++ b/lib/vendor/symfony/lib/generator/sfModelGeneratorConfiguration.class.php
@@ -6,7 +6,7 @@
  * @package    symfony
  * @subpackage generator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfModelGeneratorConfiguration.class.php 29656 2010-05-28 13:09:33Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class sfModelGeneratorConfiguration
 {
@@ -99,12 +99,12 @@ protected function compile()
       'new'    => array(
         'fields'  => array(),
         'title'   => $this->getNewTitle(),
-        'actions' => $this->getNewActions() ? $this->getNewActions() : $this->getFormActions(),
+        'actions' => $this->getNewActions() ?: $this->getFormActions(),
       ),
       'edit'   => array(
         'fields'  => array(),
         'title'   => $this->getEditTitle(),
-        'actions' => $this->getEditActions() ? $this->getEditActions() : $this->getFormActions(),
+        'actions' => $this->getEditActions() ?: $this->getFormActions(),
       ),
     );
 
diff --git a/lib/vendor/symfony/lib/generator/sfModelGeneratorConfigurationField.class.php b/lib/vendor/symfony/lib/generator/sfModelGeneratorConfigurationField.class.php
index 8b17026ed..70c92c1b4 100644
--- a/lib/vendor/symfony/lib/generator/sfModelGeneratorConfigurationField.class.php
+++ b/lib/vendor/symfony/lib/generator/sfModelGeneratorConfigurationField.class.php
@@ -6,7 +6,7 @@
  * @package    symfony
  * @subpackage generator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfModelGeneratorConfigurationField.class.php 21908 2009-09-11 12:06:21Z fabien $
+ * @version    SVN: $Id$
  */
 class sfModelGeneratorConfigurationField
 {
diff --git a/lib/vendor/symfony/lib/generator/sfModelGeneratorHelper.class.php b/lib/vendor/symfony/lib/generator/sfModelGeneratorHelper.class.php
index 536a6c152..d93eccd5a 100644
--- a/lib/vendor/symfony/lib/generator/sfModelGeneratorHelper.class.php
+++ b/lib/vendor/symfony/lib/generator/sfModelGeneratorHelper.class.php
@@ -6,7 +6,7 @@
  * @package    symfony
  * @subpackage generator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfModelGeneratorHelper.class.php 22914 2009-10-10 12:24:29Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class sfModelGeneratorHelper
 {
diff --git a/lib/vendor/symfony/lib/helper/AssetHelper.php b/lib/vendor/symfony/lib/helper/AssetHelper.php
index c6537fe62..2812cf6c6 100644
--- a/lib/vendor/symfony/lib/helper/AssetHelper.php
+++ b/lib/vendor/symfony/lib/helper/AssetHelper.php
@@ -16,7 +16,7 @@
  * @subpackage helper
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     David Heinemeier Hansson
- * @version    SVN: $Id: AssetHelper.php 24289 2009-11-23 19:45:06Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 
 /**
@@ -365,7 +365,9 @@ function image_tag($source, $options = array())
 
   if (isset($options['size']))
   {
-    list($options['width'], $options['height']) = explode('x', $options['size'], 2);
+    list($width, $height) = explode('x', $options['size'], 2);
+    $options['height'] = $height;
+    $options['width'] = $width;
     unset($options['size']);
   }
 
@@ -374,7 +376,7 @@ function image_tag($source, $options = array())
 
 function _compute_public_path($source, $dir, $ext, $absolute = false)
 {
-  if (strpos($source, '://'))
+  if (strpos($source, '://') || strpos($source, '//') === 0)
   {
     return $source;
   }
@@ -513,6 +515,16 @@ function include_javascripts()
   echo get_javascripts();
 }
 
+/**
+ * Clear all javascripts of the response object.
+ *
+ * @see sfResponse->clearJavascripts()
+ */
+function clear_javascripts()
+{
+  sfContext::getInstance()->getResponse()->clearJavascripts();
+}
+
 /**
  * Returns <link> tags for all stylesheets configured in view.yml or added to the response object.
  *
@@ -546,6 +558,15 @@ function include_stylesheets()
   echo get_stylesheets();
 }
 
+/* Clear all stylesheets of the response object.
+ *
+ * @see sfResponse->clearStylesheets()
+ */
+function clear_stylesheets()
+{
+  sfContext::getInstance()->getResponse()->clearStylesheets();
+}
+
 /**
  * Returns a <script> include tag for the given internal URI.
  *
@@ -621,7 +642,7 @@ function _dynamic_path($uri, $format, $absolute = false)
 function get_javascripts_for_form(sfForm $form)
 {
   $html = '';
-  foreach ($form->getJavascripts() as $file)
+  foreach ($form->getJavaScripts() as $file)
   {
     $html .= javascript_include_tag($file);
   }
@@ -648,7 +669,7 @@ function use_javascripts_for_form(sfForm $form)
 {
   $response = sfContext::getInstance()->getResponse();
 
-  foreach ($form->getJavascripts() as $file)
+  foreach ($form->getJavaScripts() as $file)
   {
     $response->addJavascript($file);
   }
diff --git a/lib/vendor/symfony/lib/helper/CacheHelper.php b/lib/vendor/symfony/lib/helper/CacheHelper.php
index ea2d59de6..71ba2d569 100644
--- a/lib/vendor/symfony/lib/helper/CacheHelper.php
+++ b/lib/vendor/symfony/lib/helper/CacheHelper.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage helper
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: CacheHelper.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 
 /* Usage
diff --git a/lib/vendor/symfony/lib/helper/DateHelper.php b/lib/vendor/symfony/lib/helper/DateHelper.php
index d46f317e6..564aae975 100644
--- a/lib/vendor/symfony/lib/helper/DateHelper.php
+++ b/lib/vendor/symfony/lib/helper/DateHelper.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage helper
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: DateHelper.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 
 function format_daterange($start_date, $end_date, $format = 'd', $full_text, $start_text, $end_text, $culture = null, $charset = null)
@@ -67,7 +67,7 @@ function format_datetime($date, $format = 'F', $culture = null, $charset = null)
 
 function distance_of_time_in_words($from_time, $to_time = null, $include_seconds = false)
 {
-  $to_time = $to_time? $to_time: time();
+  $to_time = $to_time ?: time();
 
   $distance_in_minutes = floor(abs($to_time - $from_time) / 60);
   $distance_in_seconds = floor(abs($to_time - $from_time));
@@ -153,7 +153,7 @@ function distance_of_time_in_words($from_time, $to_time = null, $include_seconds
 
   if (sfConfig::get('sf_i18n'))
   {
-    require_once dirname(__FILE__).'/I18NHelper.php';
+    require_once __DIR__.'/I18NHelper.php';
 
     return __($string, $parameters);
   }
diff --git a/lib/vendor/symfony/lib/helper/EscapingHelper.php b/lib/vendor/symfony/lib/helper/EscapingHelper.php
index 89768bf3f..ee4aeeea2 100644
--- a/lib/vendor/symfony/lib/helper/EscapingHelper.php
+++ b/lib/vendor/symfony/lib/helper/EscapingHelper.php
@@ -28,7 +28,7 @@
  * @package    symfony
  * @subpackage helper
  * @author     Mike Squire <mike@somosis.co.uk>
- * @version    SVN: $Id: EscapingHelper.php 18907 2009-06-04 09:36:30Z FabianLange $
+ * @version    SVN: $Id$
  */
 
 /**
diff --git a/lib/vendor/symfony/lib/helper/HelperHelper.php b/lib/vendor/symfony/lib/helper/HelperHelper.php
index 6ecb3ed66..9e573a403 100644
--- a/lib/vendor/symfony/lib/helper/HelperHelper.php
+++ b/lib/vendor/symfony/lib/helper/HelperHelper.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage helper
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: HelperHelper.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 
 function use_helper()
diff --git a/lib/vendor/symfony/lib/helper/I18NHelper.php b/lib/vendor/symfony/lib/helper/I18NHelper.php
index cac6737fc..cde3e3352 100644
--- a/lib/vendor/symfony/lib/helper/I18NHelper.php
+++ b/lib/vendor/symfony/lib/helper/I18NHelper.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage helper
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: I18NHelper.php 31894 2011-01-24 18:12:37Z fabien $
+ * @version    SVN: $Id$
  */
 
 function __($text, $args = array(), $catalogue = 'messages')
diff --git a/lib/vendor/symfony/lib/helper/JavascriptBaseHelper.php b/lib/vendor/symfony/lib/helper/JavascriptBaseHelper.php
index a609dcbef..54b66d569 100644
--- a/lib/vendor/symfony/lib/helper/JavascriptBaseHelper.php
+++ b/lib/vendor/symfony/lib/helper/JavascriptBaseHelper.php
@@ -18,7 +18,7 @@
  * @author     John Christopher <john.christopher@symfony-project.com>
  * @author     David Heinemeier Hansson
  * @author     Fabian Lange <fabian.lange@symfony-project.com>
- * @version    SVN: $Id: JavascriptBaseHelper.php 24499 2009-11-28 14:12:02Z FabianLange $
+ * @version    SVN: $Id$
  */
 
 /*
@@ -133,7 +133,7 @@ function array_or_string_for_javascript($option)
 {
   if (is_array($option))
   {
-    return "['".join('\',\'', $option)."']";
+    return "['".implode('\',\'', $option)."']";
   }
   else if (is_string($option) && $option[0] != "'")
   {
@@ -161,7 +161,7 @@ function options_for_javascript($options)
   }
   sort($opts);
 
-  return '{'.join(', ', $opts).'}';
+  return '{'.implode(', ', $opts).'}';
 }
 
 /**
diff --git a/lib/vendor/symfony/lib/helper/NumberHelper.php b/lib/vendor/symfony/lib/helper/NumberHelper.php
index aaaee477f..2f5482c90 100644
--- a/lib/vendor/symfony/lib/helper/NumberHelper.php
+++ b/lib/vendor/symfony/lib/helper/NumberHelper.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage helper
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: NumberHelper.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 
 function format_number($number, $culture = null)
@@ -43,5 +43,5 @@ function format_currency($amount, $currency = null, $culture = null)
 
 function _current_language($culture)
 {
-  return $culture ? $culture : sfContext::getInstance()->getUser()->getCulture();
+  return $culture ?: sfContext::getInstance()->getUser()->getCulture();
 }
diff --git a/lib/vendor/symfony/lib/helper/PartialHelper.php b/lib/vendor/symfony/lib/helper/PartialHelper.php
index 9bfb4e11b..e20d0b9c2 100644
--- a/lib/vendor/symfony/lib/helper/PartialHelper.php
+++ b/lib/vendor/symfony/lib/helper/PartialHelper.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage helper
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: PartialHelper.php 27755 2010-02-08 20:51:02Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 
 /**
@@ -136,6 +136,8 @@ function get_component($moduleName, $componentName, $vars = array())
   $context = sfContext::getInstance();
   $actionName = '_'.$componentName;
 
+  require($context->getConfigCache()->checkConfig('modules/'.$moduleName.'/config/module.yml'));
+
   $class = sfConfig::get('mod_'.strtolower($moduleName).'_partial_view_class', 'sf').'PartialView';
   $view = new $class($context, $moduleName, $actionName, '');
   $view->setPartialVars(true === sfConfig::get('sf_escaping_strategy') ? sfOutputEscaper::unescape($vars) : $vars);
@@ -213,7 +215,7 @@ function get_partial($templateName, $vars = array())
 
   $class = sfConfig::get('mod_'.strtolower($moduleName).'_partial_view_class', 'sf').'PartialView';
   $view = new $class($context, $moduleName, $actionName, '');
-  $view->setPartialVars($vars);
+  $view->setPartialVars(true === sfConfig::get('sf_escaping_strategy') ? sfOutputEscaper::unescape($vars) : $vars);
 
   return $view->render();
 }
diff --git a/lib/vendor/symfony/lib/helper/TagHelper.php b/lib/vendor/symfony/lib/helper/TagHelper.php
index 25397e9ab..848895109 100644
--- a/lib/vendor/symfony/lib/helper/TagHelper.php
+++ b/lib/vendor/symfony/lib/helper/TagHelper.php
@@ -16,7 +16,7 @@
  * @subpackage helper
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     David Heinemeier Hansson
- * @version    SVN: $Id: TagHelper.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 
 /**
@@ -34,7 +34,7 @@ function tag($name, $options = array(), $open = false)
     return '';
   }
 
-  return '<'.$name._tag_options($options).(($open) ? '>' : ' />');
+  return '<'.$name._tag_options($options).($open ? '>' : ' />');
 }
 
 function content_tag($name, $content = '', $options = array())
@@ -158,7 +158,7 @@ function _get_option(&$options, $name, $default = null)
 function get_id_from_name($name, $value = null)
 {
   // check to see if we have an array variable for a field name
-  if (strstr($name, '['))
+  if (false !== strpos($name, '['))
   {
     $name = str_replace(array('[]', '][', '[', ']'), array((($value != null) ? '_'.$value : ''), '_', '_', ''), $name);
   }
diff --git a/lib/vendor/symfony/lib/helper/TextHelper.php b/lib/vendor/symfony/lib/helper/TextHelper.php
index e92184d9c..a09029c1e 100644
--- a/lib/vendor/symfony/lib/helper/TextHelper.php
+++ b/lib/vendor/symfony/lib/helper/TextHelper.php
@@ -16,31 +16,62 @@
  * @subpackage helper
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     David Heinemeier Hansson
- * @version    SVN: $Id: TextHelper.php 31895 2011-01-24 18:37:43Z fabien $
+ * @version    SVN: $Id$
  */
 
 /**
  * Truncates +text+ to the length of +length+ and replaces the last three characters with the +truncate_string+
  * if the +text+ is longer than +length+.
+ *
+ * @param string $text The original text
+ * @param integer $length The length for truncate
+ * @param string $truncate_string The string to add after truncated text
+ * @param string $truncate_lastspace Remove or not last space after truncate
+ * @param string $truncate_pattern Pattern
+ * @param integer $length_max Used only with truncate_patter
+ *
+ * @return string
  */
-function truncate_text($text, $length = 30, $truncate_string = '...', $truncate_lastspace = false)
+function truncate_text($text, $length = 30, $truncate_string = '...', $truncate_lastspace = false, $truncate_pattern = null, $length_max = null)
 {
-  if ($text == '')
+  if ('' == $text)
   {
     return '';
   }
 
   $mbstring = extension_loaded('mbstring');
-  if($mbstring)
+  if ($mbstring)
   {
-   $old_encoding = mb_internal_encoding();
-   @mb_internal_encoding(mb_detect_encoding($text));
+    $old_encoding = mb_internal_encoding();
+    @mb_internal_encoding(mb_detect_encoding($text));
   }
-  $strlen = ($mbstring) ? 'mb_strlen' : 'strlen';
-  $substr = ($mbstring) ? 'mb_substr' : 'substr';
+  $strlen = $mbstring ? 'mb_strlen' : 'strlen';
+  $substr = $mbstring ? 'mb_substr' : 'substr';
 
   if ($strlen($text) > $length)
   {
+    if ($truncate_pattern)
+    {
+      $length_min = null !== $length_max && (0 == $length_max || $length_max > $length) ? $length : null;
+
+      preg_match($truncate_pattern, $text, $matches, PREG_OFFSET_CAPTURE, $length_min);
+
+      if ($matches)
+      {
+        if ($length_min)
+        {
+          $truncate_string = $matches[0][0].$truncate_string;
+          $length = $matches[0][1] + $strlen($truncate_string);
+        }
+        else
+        {
+          $match = end($matches);
+          $truncate_string = $match[0].$truncate_string;
+          $length = $match[1] + $strlen($truncate_string);
+        }
+      }
+    }
+
     $truncate_text = $substr($text, 0, $length - $strlen($truncate_string));
     if ($truncate_lastspace)
     {
@@ -49,9 +80,9 @@ function truncate_text($text, $length = 30, $truncate_string = '...', $truncate_
     $text = $truncate_text.$truncate_string;
   }
 
-  if($mbstring)
+  if ($mbstring)
   {
-   @mb_internal_encoding($old_encoding);
+    @mb_internal_encoding($old_encoding);
   }
 
   return $text;
@@ -64,7 +95,7 @@ function truncate_text($text, $length = 30, $truncate_string = '...', $truncate_
  * N.B.: The +phrase+ is sanitized to include only letters, digits, and spaces before use.
  *
  * @param string $text subject input to preg_replace.
- * @param string $phrase string or array of words to highlight
+ * @param mixed $phrase string, array or sfOutputEscaperArrayDecorator instance of words to highlight
  * @param string $highlighter regex replacement input to preg_replace.
  *
  * @return string
@@ -283,5 +314,10 @@ function _auto_link_urls($text, $href_options = array(), $truncate = false, $tru
  */
 function _auto_link_email_addresses($text)
 {
-  return preg_replace('/([\w\.!#\$%\-+.]+@[A-Za-z0-9\-]+(\.[A-Za-z0-9\-]+)+)/', '<a href="mailto:\\1">\\1</a>', $text);
+  // Taken from http://snippets.dzone.com/posts/show/6156
+  return preg_replace("#(^|[\n ])([a-z0-9&\-_\.]+?)@([\w\-]+\.([\w\-\.]+\.)*[\w]+)#i", "\\1<a href=\"mailto:\\2@\\3\">\\2@\\3</a>", $text);
+
+  // Removed since it destroys already linked emails
+  // Example:   <a href="mailto:me@example.com">bar</a> gets <a href="mailto:me@example.com">bar</a> gets <a href="mailto:<a href="mailto:me@example.com">bar</a>
+  //return preg_replace('/([\w\.!#\$%\-+.]+@[A-Za-z0-9\-]+(\.[A-Za-z0-9\-]+)+)/', '<a href="mailto:\\1">\\1</a>', $text);
 }
diff --git a/lib/vendor/symfony/lib/helper/UrlHelper.php b/lib/vendor/symfony/lib/helper/UrlHelper.php
index 4995c498f..88b1895ac 100644
--- a/lib/vendor/symfony/lib/helper/UrlHelper.php
+++ b/lib/vendor/symfony/lib/helper/UrlHelper.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage helper
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: UrlHelper.php 31396 2010-11-15 16:08:26Z fabien $
+ * @version    SVN: $Id$
  */
 
 /**
@@ -74,7 +74,7 @@ function link_to1($name, $internal_uri, $options = array())
     }
   }
 
-  if (!strlen($name))
+  if ('' === $name)
   {
     $name = $html_options['href'];
   }
@@ -109,7 +109,7 @@ function url_for1($internal_uri, $absolute = false)
  *  echo url_for('my_module/my_action');
  *    => /path/to/my/action
  *  echo url_for('@my_rule');
- *    => /path/to/my/action 
+ *    => /path/to/my/action
  *  echo url_for('@my_rule', true);
  *    => http://myapp.example.com/path/to/my/action
  * </code>
@@ -136,11 +136,11 @@ function url_for()
  * Creates a <a> link tag of the given name using a routed URL
  * based on the module/action passed as argument and the routing configuration.
  * It's also possible to pass a string instead of a module/action pair to
- * get a link tag that just points without consideration. 
+ * get a link tag that just points without consideration.
  * If null is passed as a name, the link itself will become the name.
  * If an object is passed as a name, the object string representation is used.
- * One of the options serves for for creating javascript confirm alerts where 
- * if you pass 'confirm' => 'Are you sure?', the link will be guarded 
+ * One of the options serves for for creating javascript confirm alerts where
+ * if you pass 'confirm' => 'Are you sure?', the link will be guarded
  * with a JS popup asking that question. If the user accepts, the link is processed,
  * otherwise not.
  *
@@ -149,7 +149,7 @@ function url_for()
  * - 'query_string' - to append a query string (starting by ?) to the routed url
  * - 'anchor' - to append an anchor (starting by #) to the routed url
  * - 'confirm' - displays a javascript confirmation alert when the link is clicked
- * - 'popup' - if set to true, the link opens a new browser window 
+ * - 'popup' - if set to true, the link opens a new browser window
  * - 'post' - if set to true, the link submits a POST request instead of GET (caution: do not use inside a form)
  * - 'method' - if set to post, delete, or put, the link submits a request with the given HTTP method instead of GET (caution: do not use inside a form)
  *
@@ -220,14 +220,14 @@ function form_tag_for(sfForm $form, $routePrefix, $attributes = array())
  * - 'query_string' - to append a query string (starting by ?) to the routed url
  * - 'anchor' - to append an anchor (starting by #) to the routed url
  * - 'confirm' - displays a javascript confirmation alert when the link is clicked
- * - 'popup' - if set to true, the link opens a new browser window 
+ * - 'popup' - if set to true, the link opens a new browser window
  * - 'post' - if set to true, the link submits a POST request instead of GET (caution: do not use inside a form)
  *
  * <b>Examples:</b>
  * <code>
  *  echo link_to_if($user->isAdministrator(), 'Delete this page', 'my_module/my_action');
  *    => <a href="/path/to/my/action">Delete this page</a>
- *  echo link_to_if(!$user->isAdministrator(), 'Delete this page', 'my_module/my_action'); 
+ *  echo link_to_if(!$user->isAdministrator(), 'Delete this page', 'my_module/my_action');
  *    => <span>Delete this page</span>
  * </code>
  *
@@ -261,9 +261,7 @@ function link_to_if()
   }
   else
   {
-    unset($html_options['query_string']);
-    unset($html_options['absolute_url']);
-    unset($html_options['absolute']);
+    unset($html_options['query_string'], $html_options['absolute_url'], $html_options['absolute']);
 
     $tag = _get_option($html_options, 'tag', 'span');
 
@@ -283,14 +281,14 @@ function link_to_if()
  * - 'query_string' - to append a query string (starting by ?) to the routed url
  * - 'anchor' - to append an anchor (starting by #) to the routed url
  * - 'confirm' - displays a javascript confirmation alert when the link is clicked
- * - 'popup' - if set to true, the link opens a new browser window 
+ * - 'popup' - if set to true, the link opens a new browser window
  * - 'post' - if set to true, the link submits a POST request instead of GET (caution: do not use inside a form)
  *
  * <b>Examples:</b>
  * <code>
  *  echo link_to_unless($user->isAdministrator(), 'Delete this page', 'my_module/my_action');
  *    => <span>Delete this page</span>
- *  echo link_to_unless(!$user->isAdministrator(), 'Delete this page', 'my_module/my_action'); 
+ *  echo link_to_unless(!$user->isAdministrator(), 'Delete this page', 'my_module/my_action');
  *    => <a href="/path/to/my/action">Delete this page</a>
  * </code>
  *
@@ -313,9 +311,9 @@ function link_to_unless()
 /**
  * Returns a URL rooted at the web root
  *
- * @param   string  $path     The route to append 
+ * @param   string  $path     The route to append
  * @param   bool    $absolute If true, an absolute path is returned (optional)
- * @return  The web URL root 
+ * @return  The web URL root
  */
 function public_path($path, $absolute = false)
 {
@@ -335,7 +333,7 @@ function public_path($path, $absolute = false)
   {
     $source = $root;
   }
-  
+
   if (substr($path, 0, 1) != '/')
   {
     $path = '/'.$path;
@@ -354,7 +352,7 @@ function public_path($path, $absolute = false)
  * - 'query_string' - to append a query string (starting by ?) to the routed url
  * - 'anchor' - to append an anchor (starting by #) to the routed url
  * - 'confirm' - displays a javascript confirmation alert when the button is clicked
- * - 'popup' - if set to true, the button opens a new browser window 
+ * - 'popup' - if set to true, the button opens a new browser window
  * - 'post' - if set to true, the button submits a POST request instead of GET (caution: do not use inside a form)
  *
  * <b>Examples:</b>
@@ -419,7 +417,7 @@ function button_to($name, $internal_uri, $options = array())
  * Returns an HTML <form> tag that points to a valid action, route or URL as defined by <i>$url_for_options</i>.
  *
  * By default, the form tag is generated in POST format, but can easily be configured along with any additional
- * HTML parameters via the optional <i>$options</i> parameter. If you are using file uploads, be sure to set the 
+ * HTML parameters via the optional <i>$options</i> parameter. If you are using file uploads, be sure to set the
  * <i>multipart</i> option to true.
  *
  * <b>Options:</b>
@@ -498,7 +496,7 @@ function mail_to($email, $name = '', $options = array(), $default_value = array(
   $default = array();
   foreach ($default_tmp as $key => $value)
   {
-    $default[] = rawurlencode($key).'='.rawurlencode($value);
+    $default[] = urlencode($key).'='.urlencode($value);
   }
   $options = count($default) ? '?'.implode('&', $default) : '';
 
@@ -633,7 +631,7 @@ function _encodeText($text)
   for ($i = 0; $i < strlen($text); $i++)
   {
     $char = $text{$i};
-    $r = rand(0, 100);
+    $r = mt_rand(0, 100);
 
     # roughly 10% raw, 45% hex, 45% dec
     # '@' *must* be encoded. I insist.
diff --git a/lib/vendor/symfony/lib/i18n/Gettext/MO.php b/lib/vendor/symfony/lib/i18n/Gettext/MO.php
index 9cacfb52b..6df1a4b82 100644
--- a/lib/vendor/symfony/lib/i18n/Gettext/MO.php
+++ b/lib/vendor/symfony/lib/i18n/Gettext/MO.php
@@ -12,47 +12,47 @@
 // | Copyright (c) 2004 Michael Wallner <mike@iworks.at>                  |
 // +----------------------------------------------------------------------+
 //
-// $Id: MO.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+// $Id$
 
 /**
  * File::Gettext::MO
- * 
+ *
  * @author      Michael Wallner <mike@php.net>
  * @license     PHP License
  */
 
-require_once dirname(__FILE__).'/TGettext.class.php';
+require_once __DIR__.'/TGettext.class.php';
 
-/** 
+/**
  * File_Gettext_MO
- * 
+ *
  * GNU MO file reader and writer.
  *
  * @author      Michael Wallner <mike@php.net>
  * @version     $Revision: 9856 $
  * @access      public
- * @package System.I18N.core 
+ * @package System.I18N.core
  */
 class TGettext_MO extends TGettext
 {
     /**
      * file handle
-     * 
+     *
      * @access  private
      * @var     resource
      */
     protected $_handle = null;
-    
+
     /**
      * big endianess
-     * 
+     *
      * Whether to write with big endian byte order.
-     * 
+     *
      * @access  public
      * @var     bool
      */
     protected $writeBigEndian = false;
-    
+
     /**
      * Constructor
      *
@@ -60,7 +60,7 @@ class TGettext_MO extends TGettext
      * @return  object      File_Gettext_MO
      * @param   string      $file   path to GNU MO file
      */
-    function TGettext_MO($file = '')
+    public function __construct($file = '')
     {
         $this->file = $file;
     }
@@ -79,7 +79,7 @@ function _read($bytes = 1)
         }
         return null;
     }
-    
+
     /**
      * _readInt
      *
@@ -93,7 +93,7 @@ function _readInt($bigendian = false)
 		$unpacked = unpack($bigendian ? 'N' : 'V', $this->_read(4));
         return array_shift($unpacked);
     }
-    
+
     /**
      * _writeInt
      *
@@ -105,7 +105,7 @@ function _writeInt($int)
     {
         return $this->_write(pack($this->writeBigEndian ? 'N' : 'V', (int) $int));
     }
-    
+
     /**
      * _write
      *
@@ -117,7 +117,7 @@ function _write($data)
     {
         return fwrite($this->_handle, $data);
     }
-    
+
     /**
      * _writeStr
      *
@@ -129,13 +129,13 @@ function _writeStr($string)
     {
         return $this->_write($string . "\0");
     }
-    
+
     /**
      * _readStr
      *
      * @access  private
      * @return  string
-     * @param   array   $params     associative array with offset and length 
+     * @param   array   $params     associative array with offset and length
      *                              of the string
      */
     function _readStr($params)
@@ -143,7 +143,7 @@ function _readStr($params)
         fseek($this->_handle, $params['offset']);
         return $this->_read($params['length']);
     }
-    
+
     /**
      * Load MO file
      *
@@ -156,7 +156,7 @@ function load($file = null)
         if (!isset($file)) {
             $file = $this->file;
         }
-        
+
         // open MO file
         if (!is_resource($this->_handle = @fopen($file, 'rb'))) {
             return false;
@@ -166,7 +166,7 @@ function load($file = null)
             @fclose($this->_handle);
             return false;
         }
-        
+
         // read (part of) magic number from MO file header and define endianess
 
 		//unpack returns a reference????
@@ -176,11 +176,11 @@ function load($file = null)
             case -34:
                 $be = false;
             break;
-            
+
             case -107:
                 $be = true;
             break;
-            
+
             default:
                 return false;
         }
@@ -189,15 +189,15 @@ function load($file = null)
         if (0 !== ($_rev = $this->_readInt($be))) {
             return false;
         }
-       
+
         // count of strings in this file
         $count = $this->_readInt($be);
-        
+
         // offset of hashing table of the msgids
         $offset_original = $this->_readInt($be);
         // offset of hashing table of the msgstrs
         $offset_translat = $this->_readInt($be);
-        
+
         // move to msgid hash table
         fseek($this->_handle, $offset_original);
         // read lengths and offsets of msgids
@@ -208,7 +208,7 @@ function load($file = null)
                 'offset' => $this->_readInt($be)
             );
         }
-        
+
         // move to msgstr hash table
         fseek($this->_handle, $offset_translat);
         // read lengths and offsets of msgstrs
@@ -219,27 +219,27 @@ function load($file = null)
                 'offset' => $this->_readInt($be)
             );
         }
-        
+
         // read all
         for ($i = 0; $i < $count; $i++) {
-            $this->strings[$this->_readStr($original[$i])] = 
+            $this->strings[$this->_readStr($original[$i])] =
                 $this->_readStr($translat[$i]);
         }
-        
+
         // done
         @flock($this->_handle, LOCK_UN);
         @fclose($this->_handle);
         $this->_handle = null;
-        
+
         // check for meta info
         if (isset($this->strings[''])) {
             $this->meta = parent::meta2array($this->strings['']);
             unset($this->strings['']);
         }
-        
+
         return true;
     }
-    
+
     /**
      * Save MO file
      *
@@ -252,7 +252,7 @@ function save($file = null)
         if (!isset($file)) {
             $file = $this->file;
         }
-        
+
         // open MO file
         if (!is_resource($this->_handle = @fopen($file, 'wb'))) {
             return false;
@@ -262,36 +262,36 @@ function save($file = null)
             @fclose($this->_handle);
             return false;
         }
-        
+
         // write magic number
         if ($this->writeBigEndian) {
             $this->_write(pack('c*', 0x95, 0x04, 0x12, 0xde));
         } else {
             $this->_write(pack('c*', 0xde, 0x12, 0x04, 0x95));
         }
-        
+
         // write file format revision
         $this->_writeInt(0);
-        
+
         $count = count($this->strings) + ($meta = (count($this->meta) ? 1 : 0));
         // write count of strings
         $this->_writeInt($count);
-        
+
         $offset = 28;
         // write offset of orig. strings hash table
         $this->_writeInt($offset);
-        
+
         $offset += ($count * 8);
         // write offset transl. strings hash table
         $this->_writeInt($offset);
-        
+
         // write size of hash table (we currently ommit the hash table)
         $this->_writeInt(0);
-        
+
         $offset += ($count * 8);
         // write offset of hash table
         $this->_writeInt($offset);
-        
+
         // unshift meta info
         if ($meta) {
             $meta = '';
@@ -302,7 +302,7 @@ function save($file = null)
         } else {
             $strings = $this->strings;
         }
-        
+
         // write offsets for original strings
         foreach (array_keys($strings) as $o) {
             $len = strlen($o);
@@ -310,7 +310,7 @@ function save($file = null)
             $this->_writeInt($offset);
             $offset += $len + 1;
         }
-        
+
         // write offsets for translated strings
         foreach ($strings as $t) {
             $len = strlen($t);
@@ -328,10 +328,10 @@ function save($file = null)
         foreach ($strings as $t) {
             $this->_writeStr($t);
         }
-        
+
         // done
         @flock($this->_handle, LOCK_UN);
         @fclose($this->_handle);
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/i18n/Gettext/PO.php b/lib/vendor/symfony/lib/i18n/Gettext/PO.php
index 51128f28e..079828c6a 100644
--- a/lib/vendor/symfony/lib/i18n/Gettext/PO.php
+++ b/lib/vendor/symfony/lib/i18n/Gettext/PO.php
@@ -12,26 +12,26 @@
 // | Copyright (c) 2004 Michael Wallner <mike@iworks.at>                  |
 // +----------------------------------------------------------------------+
 //
-// $Id: PO.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+// $Id$
 
 /**
  * File::Gettext::PO
- * 
+ *
  * @author      Michael Wallner <mike@php.net>
  * @license     PHP License
  */
- 
-require_once dirname(__FILE__).'/TGettext.class.php';
 
-/** 
+require_once __DIR__.'/TGettext.class.php';
+
+/**
  * File_Gettext_PO
  *
  * GNU PO file reader and writer.
- * 
+ *
  * @author      Michael Wallner <mike@php.net>
  * @version     $Revision: 9856 $
  * @access      public
- * @package System.I18N.core 
+ * @package System.I18N.core
  */
 class TGettext_PO extends TGettext
 {
@@ -42,7 +42,7 @@ class TGettext_PO extends TGettext
      * @return  object      File_Gettext_PO
      * @param   string      path to GNU PO file
      */
-    function TGettext_PO($file = '')
+    public function __construct($file = '')
     {
         $this->file = $file;
     }
@@ -59,13 +59,13 @@ function load($file = null)
         if (!isset($file)) {
             $file = $this->file;
         }
-        
+
         // load file
         if (!$contents = @file($file)) {
             return false;
         }
         $contents = implode('', $contents);
-        
+
         // match all msgid/msgstr entries
         $matched = preg_match_all(
             '/(msgid\s+("([^"]|\\\\")*?"\s*)+)\s+' .
@@ -73,11 +73,11 @@ function load($file = null)
             $contents, $matches
         );
         unset($contents);
-        
+
         if (!$matched) {
             return false;
         }
-        
+
         // get all msgids and msgtrs
         for ($i = 0; $i < $matched; $i++) {
             $msgid = preg_replace(
@@ -86,16 +86,16 @@ function load($file = null)
                 '/\s*msgstr\s*"(.*)"\s*/s', '\\1', $matches[4][$i]);
             $this->strings[parent::prepare($msgid)] = parent::prepare($msgstr);
         }
-        
+
         // check for meta info
         if (isset($this->strings[''])) {
             $this->meta = parent::meta2array($this->strings['']);
             unset($this->strings['']);
         }
-        
+
         return true;
     }
-    
+
     /**
      * Save PO file
      *
@@ -134,10 +134,10 @@ function save($file = null)
                 'msgstr "' . parent::prepare($t, true) . '"' . "\n\n"
             );
         }
-        
+
         //done
         @flock($fh, LOCK_UN);
         @fclose($fh);
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/i18n/Gettext/TGettext.class.php b/lib/vendor/symfony/lib/i18n/Gettext/TGettext.class.php
index 68616e8f2..4d137e538 100644
--- a/lib/vendor/symfony/lib/i18n/Gettext/TGettext.class.php
+++ b/lib/vendor/symfony/lib/i18n/Gettext/TGettext.class.php
@@ -12,11 +12,11 @@
 // | Copyright (c) 2004 Michael Wallner <mike@iworks.at>                  |
 // +----------------------------------------------------------------------+
 //
-// $Id: TGettext.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+// $Id$
 
 /**
  * File::Gettext
- * 
+ *
  * @author      Michael Wallner <mike@php.net>
  * @license     PHP License
  */
@@ -26,11 +26,11 @@
  */
 //ini_set('track_errors', true);
 
-/** 
+/**
  * File_Gettext
- * 
+ *
  * GNU gettext file reader and writer.
- * 
+ *
  * #################################################################
  * # All protected members of this class are public in its childs. #
  * #################################################################
@@ -38,15 +38,15 @@
  * @author      Michael Wallner <mike@php.net>
  * @version     $Revision: 9856 $
  * @access      public
- * @package System.I18N.core 
+ * @package System.I18N.core
  */
 class TGettext
 {
     /**
      * strings
-     * 
+     *
      * associative array with all [msgid => msgstr] entries
-     * 
+     *
      * @access  protected
      * @var     array
     */
@@ -54,40 +54,40 @@ class TGettext
 
     /**
      * meta
-     * 
-     * associative array containing meta 
+     *
+     * associative array containing meta
      * information like project name or content type
-     * 
+     *
      * @access  protected
      * @var     array
      */
     protected $meta = array();
-    
+
     /**
      * file path
-     * 
+     *
      * @access  protected
      * @var     string
      */
     protected $file = '';
-    
+
     /**
      * Factory
      *
      * @static
      * @access  public
-     * @return  object  Returns File_Gettext_PO or File_Gettext_MO on success 
+     * @return  object  Returns File_Gettext_PO or File_Gettext_MO on success
      *                  or PEAR_Error on failure.
      * @param   string  $format MO or PO
      * @param   string  $file   path to GNU gettext file
      */
     static function factory($format, $file = '')
     {
-        $format = strToUpper($format);
-        $filename = dirname(__FILE__).'/'.$format.'.php';
+        $format = strtoupper($format);
+        $filename = __DIR__.'/'.$format.'.php';
         if (is_file($filename) == false)
         	throw new Exception ("Class file $file not found");
-        	
+
         include_once $filename;
         $class = 'TGettext_' . $format;
 
@@ -99,7 +99,7 @@ static function factory($format, $file = '')
      *
      * That's a simple fake of the 'msgfmt' console command.  It reads the
      * contents of a GNU PO file and saves them to a GNU MO file.
-     * 
+     *
      * @static
      * @access  public
      * @return  mixed   Returns true on success or PEAR_Error on failure.
@@ -111,23 +111,23 @@ function poFile2moFile($pofile, $mofile)
         if (!is_file($pofile)) {
             throw new Exception("File $pofile doesn't exist.");
         }
-        
-        include_once dirname(__FILE__).'/PO.php';
-        
+
+        include_once __DIR__.'/PO.php';
+
         $PO = new TGettext_PO($pofile);
         if (true !== ($e = $PO->load())) {
             return $e;
         }
-        
+
         $MO = $PO->toMO();
         if (true !== ($e = $MO->save($mofile))) {
             return $e;
         }
         unset($PO, $MO);
-        
+
         return true;
     }
-    
+
     /**
      * prepare
      *
@@ -150,7 +150,7 @@ function prepare($string, $reverse = false)
             return (string) str_replace($smap, $rmap, $string);
         }
     }
-    
+
     /**
      * meta2array
      *
@@ -173,7 +173,7 @@ function meta2array($meta)
 
     /**
      * toArray
-     * 
+     *
      * Returns meta info and strings as an array of a structure like that:
      * <code>
      *   array(
@@ -190,7 +190,7 @@ function meta2array($meta)
      *       )
      *   )
      * </code>
-     * 
+     *
      * @see     fromArray()
      * @access  protected
      * @return  array
@@ -199,10 +199,10 @@ function toArray()
     {
     	return array('meta' => $this->meta, 'strings' => $this->strings);
     }
-    
+
     /**
      * fromArray
-     * 
+     *
      * Assigns meta info and strings from an array of a structure like that:
      * <code>
      *   array(
@@ -219,7 +219,7 @@ function toArray()
      *       )
      *   )
      * </code>
-     * 
+     *
      * @see     toArray()
      * @access  protected
      * @return  bool
@@ -239,7 +239,7 @@ function fromArray($array)
         }
         return true;
     }
-    
+
     /**
      * toMO
      *
@@ -248,12 +248,12 @@ function fromArray($array)
      */
     function toMO()
     {
-        include_once dirname(__FILE__).'/MO.php';
+        include_once __DIR__.'/MO.php';
         $MO = new TGettext_MO;
         $MO->fromArray($this->toArray());
         return $MO;
     }
-    
+
     /**
      * toPO
      *
@@ -262,9 +262,9 @@ function toMO()
      */
     function toPO()
     {
-        include_once dirname(__FILE__).'/PO.php';
+        include_once __DIR__.'/PO.php';
         $PO = new TGettext_PO;
         $PO->fromArray($this->toArray());
         return $PO;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/i18n/extract/sfI18nApplicationExtract.class.php b/lib/vendor/symfony/lib/i18n/extract/sfI18nApplicationExtract.class.php
index 1b514c6c6..8b9feb830 100644
--- a/lib/vendor/symfony/lib/i18n/extract/sfI18nApplicationExtract.class.php
+++ b/lib/vendor/symfony/lib/i18n/extract/sfI18nApplicationExtract.class.php
@@ -12,7 +12,7 @@
  * @package    symfony
  * @subpackage i18n
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfI18nApplicationExtract.class.php 14872 2009-01-19 08:32:06Z fabien $
+ * @version    SVN: $Id$
  */
 class sfI18nApplicationExtract extends sfI18nExtract
 {
diff --git a/lib/vendor/symfony/lib/i18n/extract/sfI18nExtract.class.php b/lib/vendor/symfony/lib/i18n/extract/sfI18nExtract.class.php
index 0ee4d9413..2fb037d01 100644
--- a/lib/vendor/symfony/lib/i18n/extract/sfI18nExtract.class.php
+++ b/lib/vendor/symfony/lib/i18n/extract/sfI18nExtract.class.php
@@ -12,7 +12,7 @@
  * @package    symfony
  * @subpackage i18n
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfI18nExtract.class.php 9128 2008-05-21 00:58:19Z Carl.Vondrick $
+ * @version    SVN: $Id$
  */
 abstract class sfI18nExtract
 {
diff --git a/lib/vendor/symfony/lib/i18n/extract/sfI18nExtractorInterface.class.php b/lib/vendor/symfony/lib/i18n/extract/sfI18nExtractorInterface.class.php
index cea73e2f9..d32d3560f 100644
--- a/lib/vendor/symfony/lib/i18n/extract/sfI18nExtractorInterface.class.php
+++ b/lib/vendor/symfony/lib/i18n/extract/sfI18nExtractorInterface.class.php
@@ -12,7 +12,7 @@
  * @package    symfony
  * @subpackage i18n
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfI18nExtractorInterface.class.php 9128 2008-05-21 00:58:19Z Carl.Vondrick $
+ * @version    SVN: $Id$
  */
 interface sfI18nExtractorInterface
 {
diff --git a/lib/vendor/symfony/lib/i18n/extract/sfI18nModuleExtract.class.php b/lib/vendor/symfony/lib/i18n/extract/sfI18nModuleExtract.class.php
index 2f818fdec..3179545b4 100644
--- a/lib/vendor/symfony/lib/i18n/extract/sfI18nModuleExtract.class.php
+++ b/lib/vendor/symfony/lib/i18n/extract/sfI18nModuleExtract.class.php
@@ -12,7 +12,7 @@
  * @package    symfony
  * @subpackage i18n
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfI18nModuleExtract.class.php 31248 2010-10-26 13:54:12Z fabien $
+ * @version    SVN: $Id$
  */
 class sfI18nModuleExtract extends sfI18nExtract
 {
diff --git a/lib/vendor/symfony/lib/i18n/extract/sfI18nPhpExtractor.class.php b/lib/vendor/symfony/lib/i18n/extract/sfI18nPhpExtractor.class.php
index 987c88ad3..b4e6e2291 100644
--- a/lib/vendor/symfony/lib/i18n/extract/sfI18nPhpExtractor.class.php
+++ b/lib/vendor/symfony/lib/i18n/extract/sfI18nPhpExtractor.class.php
@@ -12,7 +12,7 @@
  * @package    symfony
  * @subpackage i18n
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfI18nPhpExtractor.class.php 28843 2010-03-29 08:25:39Z fabien $
+ * @version    SVN: $Id$
  */
 class sfI18nPhpExtractor implements sfI18nExtractorInterface
 {
diff --git a/lib/vendor/symfony/lib/i18n/extract/sfI18nYamlExtractor.class.php b/lib/vendor/symfony/lib/i18n/extract/sfI18nYamlExtractor.class.php
index 9fe83afc4..48757ffe7 100644
--- a/lib/vendor/symfony/lib/i18n/extract/sfI18nYamlExtractor.class.php
+++ b/lib/vendor/symfony/lib/i18n/extract/sfI18nYamlExtractor.class.php
@@ -12,7 +12,7 @@
  * @package    symfony
  * @subpackage i18n
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfI18nYamlExtractor.class.php 4359 2007-06-25 10:45:40Z fabien $
+ * @version    SVN: $Id$
  */
 abstract class sfI18nYamlExtractor implements sfI18nExtractorInterface
 {
diff --git a/lib/vendor/symfony/lib/i18n/extract/sfI18nYamlGeneratorExtractor.class.php b/lib/vendor/symfony/lib/i18n/extract/sfI18nYamlGeneratorExtractor.class.php
index 440b1e18c..bd077455a 100644
--- a/lib/vendor/symfony/lib/i18n/extract/sfI18nYamlGeneratorExtractor.class.php
+++ b/lib/vendor/symfony/lib/i18n/extract/sfI18nYamlGeneratorExtractor.class.php
@@ -12,7 +12,7 @@
  * @package    symfony
  * @subpackage i18n
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfI18nYamlGeneratorExtractor.class.php 28848 2010-03-29 09:37:05Z fabien $
+ * @version    SVN: $Id$
  */
 class sfI18nYamlGeneratorExtractor extends sfI18nYamlExtractor
 {
@@ -29,7 +29,7 @@ public function extract($content)
   {
     $this->strings = array();
 
-    $config = sfYaml::load($content);
+    $config = sfYaml::load($content, sfConfig::get('sf_charset', 'UTF-8'));
 
     if (!isset($config['generator']['param']['config']))
     {
@@ -82,7 +82,7 @@ public function extract($content)
         }
       }
     }
-  
+
     return $this->strings;
   }
 
diff --git a/lib/vendor/symfony/lib/i18n/extract/sfI18nYamlValidateExtractor.class.php b/lib/vendor/symfony/lib/i18n/extract/sfI18nYamlValidateExtractor.class.php
index 1cd25a6f8..d8a7fbf8d 100644
--- a/lib/vendor/symfony/lib/i18n/extract/sfI18nYamlValidateExtractor.class.php
+++ b/lib/vendor/symfony/lib/i18n/extract/sfI18nYamlValidateExtractor.class.php
@@ -12,7 +12,7 @@
  * @package    symfony
  * @subpackage i18n
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfI18nYamlValidateExtractor.class.php 9128 2008-05-21 00:58:19Z Carl.Vondrick $
+ * @version    SVN: $Id$
  */
 class sfI18nYamlValidateExtractor extends sfI18nYamlExtractor
 {
@@ -27,7 +27,7 @@ public function extract($content)
   {
     $strings = array();
 
-    $config = sfYaml::load($content);
+    $config = sfYaml::load($content, sfConfig::get('sf_charset', 'UTF-8'));
 
     // New validate.yml format
 
diff --git a/lib/vendor/symfony/lib/i18n/sfChoiceFormat.class.php b/lib/vendor/symfony/lib/i18n/sfChoiceFormat.class.php
index 238142608..8c3e99681 100644
--- a/lib/vendor/symfony/lib/i18n/sfChoiceFormat.class.php
+++ b/lib/vendor/symfony/lib/i18n/sfChoiceFormat.class.php
@@ -13,7 +13,7 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version    $Id: sfChoiceFormat.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    $Id$
  * @package    symfony
  * @subpackage i18n
  */
@@ -21,18 +21,18 @@
 
 /**
  * sfChoiceFormat class.
- * 
- * sfChoiceFormat converts between ranges of numeric values and string 
+ *
+ * sfChoiceFormat converts between ranges of numeric values and string
  * names for those ranges.
  *
- * A sfChoiceFormat splits the real number line -Inf to +Inf into two or 
- * more contiguous ranges. Each range is mapped to a string. 
- * sfChoiceFormat is generally used in a MessageFormat for displaying 
+ * A sfChoiceFormat splits the real number line -Inf to +Inf into two or
+ * more contiguous ranges. Each range is mapped to a string.
+ * sfChoiceFormat is generally used in a MessageFormat for displaying
  * grammatically correct plurals such as "There are 2 files."
  *
  * <code>
  *  $string = '[0] are no files |[1] is one file |(1,Inf] are {number} files';
- *  
+ *
  *  $formatter = new sfMessageFormat(...); //init for a source
  *  $translated = $formatter->format($string);
  *
@@ -45,7 +45,7 @@
  *  # <t>[1,2]</t> -- accepts values between 1 and 2, inclusive.
  *  # <t>(1,2)</t> -- accepts values between 1 and 2, excluding 1 and 2.
  *  # <t>{1,2,3,4}</t> -- only values defined in the set are accepted.
- *  # <t>[-Inf,0)</t> -- accepts value greater or equal to negative infinity 
+ *  # <t>[-Inf,0)</t> -- accepts value greater or equal to negative infinity
  *                       and strictly less than 0
  * Any non-empty combinations of the delimiters of square and round brackets
  * are acceptable.
@@ -65,7 +65,7 @@ class sfChoiceFormat
   /**
    * The pattern to parse the formatting string.
    */
-  protected $parse = '/\s*\|?([\(\[\{]([-Inf\d:\s]+,?[\+Inf\d\s:\?\-=!><%\|&\(\)]*)+[\)\]\}])\s*/';
+  protected $parse = '/(?:^\s*|\s*\|)([\(\[\{]([-Inf\d:\s]+,?[\+Inf\d\s:\?\-=!><%\|&\(\)]*)+[\)\]\}])\s*/';
 
   /**
    * The value for positive infinity.
@@ -122,13 +122,13 @@ public function isValid($number, $set)
         }
         else
         {
-          $elements[] = floatval($string);
+          $elements[] = (float) $string;
         }
       }
       $i++;
     }
     $total = count($elements);
-    $number = floatval($number);
+    $number = (float) $number;
 
     if ($leftBracket == '{' && $rightBracket == '}')
     {
@@ -155,12 +155,7 @@ public function isValid($number, $set)
       $right = $number < $elements[$total - 1];
     }
 
-    if ($left && $right)
-    {
-      return true;
-    }
-
-    return false;
+    return $left && $right;
   }
 
   protected function isValidSetNotation($number, $set)
diff --git a/lib/vendor/symfony/lib/i18n/sfCultureInfo.class.php b/lib/vendor/symfony/lib/i18n/sfCultureInfo.class.php
index a9ded67f9..a14fd7c0f 100644
--- a/lib/vendor/symfony/lib/i18n/sfCultureInfo.class.php
+++ b/lib/vendor/symfony/lib/i18n/sfCultureInfo.class.php
@@ -13,7 +13,7 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version    $Id: sfCultureInfo.class.php 32741 2011-07-09 09:41:59Z fabien $
+ * @version    $Id$
  * @package    symfony
  * @subpackage i18n
  */
@@ -225,7 +225,7 @@ public function __construct($culture = 'en')
    */
   protected static function dataDir()
   {
-    return dirname(__FILE__).'/data/';
+    return __DIR__.'/data/';
   }
 
   /**
@@ -772,16 +772,23 @@ public function getCurrencies($currencies = null, $full = false)
       $allCurrencies = array_intersect_key($allCurrencies, array_flip($currencies));
     }
 
-    if (!$full)
+    $tmp = array();
+    foreach ($allCurrencies as $key => $value)
     {
-      foreach ($allCurrencies as $key => $value)
-      {
-        $allCurrencies[$key] = $value[1];
-      }
+      $allCurrencies[$key] = $value[1];
+      $tmp[$key] = $value[0];
     }
 
     $this->sortArray($allCurrencies);
 
+    if ($full)
+    {
+        foreach ($allCurrencies as $key => $value)
+        {
+          $allCurrencies[$key] = array($tmp[$key], $value);
+        }
+    }
+
     return $allCurrencies;
   }
 
@@ -846,7 +853,7 @@ public function getTimeZones()
   /**
    * sorts the passed array according to the locale of this sfCultureInfo class
    *
-   * @param  array the array to pe sorted wiht "asort" and this locale
+   * @param  array the array to be sorted with "asort" and this locale
    */
   public function sortArray(&$array)
   {
diff --git a/lib/vendor/symfony/lib/i18n/sfDateFormat.class.php b/lib/vendor/symfony/lib/i18n/sfDateFormat.class.php
index 43861f1f8..064bc65a1 100644
--- a/lib/vendor/symfony/lib/i18n/sfDateFormat.class.php
+++ b/lib/vendor/symfony/lib/i18n/sfDateFormat.class.php
@@ -12,24 +12,24 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version    $Id: sfDateFormat.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    $Id$
  * @package    symfony
  * @subpackage i18n
  */
 
 /**
  * sfDateFormat class.
- * 
- * The sfDateFormat class allows you to format dates and times with 
- * predefined styles in a locale-sensitive manner. Formatting times 
+ *
+ * The sfDateFormat class allows you to format dates and times with
+ * predefined styles in a locale-sensitive manner. Formatting times
  * with the sfDateFormat class is similar to formatting dates.
  *
- * Formatting dates with the sfDateFormat class is a two-step process. 
- * First, you create a formatter with the getDateInstance method. 
- * Second, you invoke the format method, which returns a string containing 
- * the formatted date. 
+ * Formatting dates with the sfDateFormat class is a two-step process.
+ * First, you create a formatter with the getDateInstance method.
+ * Second, you invoke the format method, which returns a string containing
+ * the formatted date.
  *
- * DateTime values are formatted using standard or custom patterns stored 
+ * DateTime values are formatted using standard or custom patterns stored
  * in the properties of a DateTimeFormatInfo.
  *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
@@ -41,7 +41,7 @@ class sfDateFormat
 {
   /**
    * A list of tokens and their function call.
-   * @var array 
+   * @var array
    */
   protected $tokens = array(
     'G' => 'Era',
@@ -65,13 +65,13 @@ class sfDateFormat
 
   /**
    * A list of methods, to be used by the token function calls.
-   * @var array 
+   * @var array
    */
   protected $methods = array();
 
   /**
    * The sfDateTimeFormatInfo, containing culture specific patterns and names.
-   * @var sfDateTimeFormatInfo   
+   * @var sfDateTimeFormatInfo
    */
   protected $formatInfo;
 
@@ -212,7 +212,7 @@ public function getDate($time, $pattern = null)
    * @param string  $pattern        the pattern
    * @param string  $inputPattern   the input pattern
    * @param string  $charset        the charset
-   * @return string formatted date time. 
+   * @return string formatted date time.
    */
   public function format($time, $pattern = 'F', $inputPattern = null, $charset = 'UTF-8')
   {
@@ -276,7 +276,7 @@ protected function getFunctionName($token)
    * Gets the pattern from DateTimeFormatInfo or some predefined patterns.
    * If the $pattern parameter is an array of 2 element, it will assume
    * that the first element is the date, and second the time
-   * and try to find an appropriate pattern and apply 
+   * and try to find an appropriate pattern and apply
    * DateTimeFormatInfo::formatDateTime
    * See the tutorial documentation for futher details on the patterns.
    *
@@ -304,7 +304,7 @@ public function getPattern($pattern)
         break;
       case 'P':
         return $this->formatInfo->FullDatePattern;
-        break;        
+        break;
       case 't':
         return $this->formatInfo->ShortTimePattern;
         break;
@@ -371,17 +371,17 @@ public function getPattern($pattern)
   public function getInputPattern($pattern)
   {
     $pattern = $this->getPattern($pattern);
-    
+
     $pattern = strtr($pattern, array('yyyy' => 'Y', 'h'=>'H', 'z'=>'', 'a'=>''));
     $pattern = strtr($pattern, array('yy'=>'yyyy', 'Y'=>'yyyy'));
-    
+
     return trim($pattern);
   }
 
   /**
    * Tokenizes the pattern. The tokens are delimited by group of
    * similar characters, e.g. 'aabb' will form 2 tokens of 'aa' and 'bb'.
-   * Any substrings, starting and ending with a single quote (') 
+   * Any substrings, starting and ending with a single quote (')
    * will be treated as a single token.
    *
    * @param string $pattern pattern.
@@ -427,7 +427,7 @@ protected function getTokens($pattern)
 
     return $tokens;
   }
-  
+
   // makes a unix date from our incomplete $date array
   protected function getUnixDate($date)
   {
@@ -454,7 +454,7 @@ protected function getYear($date, $pattern = 'yyyy')
       case 'yyy':
       case 'yyyy':
         return $year;
-      default: 
+      default:
         throw new sfException('The pattern for year is either "y", "yy", "yyy" or "yyyy".');
     }
   }
@@ -574,7 +574,7 @@ protected function getEra($date, $pattern = 'G')
   }
 
   /**
-   * Gets the hours in 24 hour format, i.e. [0-23]. 
+   * Gets the hours in 24 hour format, i.e. [0-23].
    * "H" for non-padding, "HH" will always return 2 characters.
    *
    * @param array   $date     getdate format.
@@ -610,11 +610,11 @@ protected function getAMPM($date, $pattern = 'a')
       throw new sfException('The pattern for AM/PM marker is "a".');
     }
 
-    return $this->formatInfo->AMPMMarkers[intval($date['hours'] / 12)];
+    return $this->formatInfo->AMPMMarkers[(int) ($date['hours'] / 12)];
   }
 
   /**
-   * Gets the hours in 12 hour format. 
+   * Gets the hours in 12 hour format.
    * "h" for non-padding, "hh" will always return 2 characters.
    *
    * @param array   $date     getdate format.
@@ -689,7 +689,7 @@ protected function getSeconds($date, $pattern = 's')
    * @todo How to get the timezone for a different region?
    * @param array   $date     getdate format.
    * @param string  $pattern  a pattern.
-   * @return string time zone 
+   * @return string time zone
    */
   protected function getTimeZone($date, $pattern = 'z')
   {
diff --git a/lib/vendor/symfony/lib/i18n/sfDateTimeFormatInfo.class.php b/lib/vendor/symfony/lib/i18n/sfDateTimeFormatInfo.class.php
index 27897bdb8..1c7d6d399 100644
--- a/lib/vendor/symfony/lib/i18n/sfDateTimeFormatInfo.class.php
+++ b/lib/vendor/symfony/lib/i18n/sfDateTimeFormatInfo.class.php
@@ -13,7 +13,7 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version    $Id: sfDateTimeFormatInfo.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    $Id$
  * @package    symfony
  * @subpackage i18n
  */
diff --git a/lib/vendor/symfony/lib/i18n/sfI18N.class.php b/lib/vendor/symfony/lib/i18n/sfI18N.class.php
index b5c8b6b14..b64ebccb4 100644
--- a/lib/vendor/symfony/lib/i18n/sfI18N.class.php
+++ b/lib/vendor/symfony/lib/i18n/sfI18N.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage i18n
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfI18N.class.php 29520 2010-05-19 11:47:08Z fabien $
+ * @version    SVN: $Id$
  */
 class sfI18N
 {
diff --git a/lib/vendor/symfony/lib/i18n/sfIMessageSource.class.php b/lib/vendor/symfony/lib/i18n/sfIMessageSource.class.php
index 5c487cdf5..cd6178f7c 100644
--- a/lib/vendor/symfony/lib/i18n/sfIMessageSource.class.php
+++ b/lib/vendor/symfony/lib/i18n/sfIMessageSource.class.php
@@ -13,7 +13,7 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version    $Id: sfIMessageSource.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    $Id$
  * @package    symfony
  * @subpackage i18n
  */
diff --git a/lib/vendor/symfony/lib/i18n/sfMessageFormat.class.php b/lib/vendor/symfony/lib/i18n/sfMessageFormat.class.php
index 4b3f1bf2f..fb95f1573 100644
--- a/lib/vendor/symfony/lib/i18n/sfMessageFormat.class.php
+++ b/lib/vendor/symfony/lib/i18n/sfMessageFormat.class.php
@@ -13,7 +13,7 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version    $Id: sfMessageFormat.class.php 24622 2009-11-30 23:49:47Z FabianLange $
+ * @version    $Id$
  * @package    symfony
  * @subpackage i18n
  */
diff --git a/lib/vendor/symfony/lib/i18n/sfMessageSource.class.php b/lib/vendor/symfony/lib/i18n/sfMessageSource.class.php
index d77f2a647..0192a7673 100644
--- a/lib/vendor/symfony/lib/i18n/sfMessageSource.class.php
+++ b/lib/vendor/symfony/lib/i18n/sfMessageSource.class.php
@@ -13,7 +13,7 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version    $Id: sfMessageSource.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    $Id$
  * @package    symfony
  * @subpackage i18n
  */
@@ -128,6 +128,11 @@ static function factory($type, $source = '.', $filename = '')
       include_once($filename);
     }
 
+    if (('SQLite' == $type) && version_compare(PHP_VERSION, '5.3', '>'))
+    {
+      $type .= '3';
+    }
+
     $class = 'sfMessageSource_'.$type;
     if (!class_exists($class))
     {
diff --git a/lib/vendor/symfony/lib/i18n/sfMessageSource_Aggregate.class.php b/lib/vendor/symfony/lib/i18n/sfMessageSource_Aggregate.class.php
index 67b43ac4e..14c89aeea 100644
--- a/lib/vendor/symfony/lib/i18n/sfMessageSource_Aggregate.class.php
+++ b/lib/vendor/symfony/lib/i18n/sfMessageSource_Aggregate.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage i18n
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfMessageSource_Aggregate.class.php 13401 2008-11-27 11:18:39Z fabien $
+ * @version    SVN: $Id$
  */
 class sfMessageSource_Aggregate extends sfMessageSource
 {
@@ -51,7 +51,10 @@ protected function getLastModified($sources)
     $lastModified = time();
     foreach ($sources as $source)
     {
-      $lastModified = min($lastModified, $source[0]->getLastModified($source[1]));
+      if (0 !== $sourceLastModified = $source[0]->getLastModified($source[1]))
+      {
+        $lastModified = min($lastModified, $sourceLastModified);
+      }
     }
 
     return $lastModified;
diff --git a/lib/vendor/symfony/lib/i18n/sfMessageSource_Database.class.php b/lib/vendor/symfony/lib/i18n/sfMessageSource_Database.class.php
index 10462067e..d1add0119 100644
--- a/lib/vendor/symfony/lib/i18n/sfMessageSource_Database.class.php
+++ b/lib/vendor/symfony/lib/i18n/sfMessageSource_Database.class.php
@@ -13,7 +13,7 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version    $Id: sfMessageSource_Database.class.php 17749 2009-04-29 11:54:22Z fabien $
+ * @version    $Id$
  * @package    symfony
  * @subpackage i18n
  */
diff --git a/lib/vendor/symfony/lib/i18n/sfMessageSource_File.class.php b/lib/vendor/symfony/lib/i18n/sfMessageSource_File.class.php
index 3e0e7ec28..d40164315 100644
--- a/lib/vendor/symfony/lib/i18n/sfMessageSource_File.class.php
+++ b/lib/vendor/symfony/lib/i18n/sfMessageSource_File.class.php
@@ -13,7 +13,7 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version    $Id: sfMessageSource_File.class.php 9128 2008-05-21 00:58:19Z Carl.Vondrick $
+ * @version    $Id$
  * @package    symfony
  * @subpackage i18n
  */
@@ -159,7 +159,7 @@ public function catalogues()
    */
   protected function getCatalogues($dir = null, $variant = null)
   {
-    $dir = $dir ? $dir : $this->getSource($variant);
+    $dir = $dir ?: $this->getSource($variant);
     $files = scandir($dir);
 
     $catalogue = array();
diff --git a/lib/vendor/symfony/lib/i18n/sfMessageSource_MySQL.class.php b/lib/vendor/symfony/lib/i18n/sfMessageSource_MySQL.class.php
index e9e5f6bcb..5fbfec015 100644
--- a/lib/vendor/symfony/lib/i18n/sfMessageSource_MySQL.class.php
+++ b/lib/vendor/symfony/lib/i18n/sfMessageSource_MySQL.class.php
@@ -13,14 +13,14 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version    $Id: sfMessageSource_MySQL.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    $Id$
  * @package    symfony
  * @subpackage i18n
  */
 
 /**
  * sfMessageSource_MySQL class.
- * 
+ *
  * Retrieve the message translation from a MySQL database.
  *
  * See the MessageSource::factory() method to instantiate this class.
@@ -93,19 +93,19 @@ class sfMessageSource_MySQL extends sfMessageSource_Database
 {
   /**
    * The datasource string, full DSN to the database.
-   * @var string 
+   * @var string
    */
   protected $source;
 
   /**
    * The DSN array property, parsed by PEAR's DB DSN parser.
-   * @var array 
+   * @var array
    */
   protected $dsn;
 
   /**
    * A resource link to the database
-   * @var db 
+   * @var db
    */
   protected $db;
 
@@ -147,7 +147,7 @@ protected function connect()
     }
     else
     {
-      $dbhost = $dsninfo['hostspec'] ? $dsninfo['hostspec'] : 'localhost';
+      $dbhost = $dsninfo['hostspec'] ?: 'localhost';
       if (!empty($dsninfo['port']))
       {
         $dbhost .= ':'.$dsninfo['port'];
@@ -203,7 +203,7 @@ protected function connect()
   /**
    * Gets the database connection.
    *
-   * @return db database connection. 
+   * @return db database connection.
    */
   public function connection()
   {
@@ -255,9 +255,7 @@ protected function getLastModified($source)
 
     $rs = mysql_query("SELECT date_modified FROM catalogue WHERE name = '{$source}'", $this->db);
 
-    $result = $rs ? intval(mysql_result($rs, 0)) : 0;
-
-    return $result;
+    return $rs ? (int)mysql_result($rs, 0) : 0;
   }
 
   /**
@@ -265,7 +263,7 @@ protected function getLastModified($source)
    *
    * @param string $variant catalogue+variant
    * @return boolean true if the catalogue+variant is in the database, false otherwise.
-   */ 
+   */
   public function isValidSource($variant)
   {
     $variant = mysql_real_escape_string ($variant, $this->db);
@@ -274,16 +272,14 @@ public function isValidSource($variant)
 
     $row = mysql_fetch_array($rs, MYSQL_NUM);
 
-    $result = $row && $row[0] == '1';
-
-    return $result;
+    return $row && $row[0] == '1';
   }
 
   /**
    * Retrieves catalogue details, array($cat_id, $variant, $count).
    *
    * @param string $catalogue catalogue
-   * @return array catalogue details, array($cat_id, $variant, $count). 
+   * @return array catalogue details, array($cat_id, $variant, $count).
    */
   protected function getCatalogueDetails($catalogue = 'messages')
   {
@@ -303,12 +299,12 @@ protected function getCatalogueDetails($catalogue = 'messages')
       return false;
     }
 
-    $cat_id = intval(mysql_result($rs, 0));
+    $cat_id = (int) mysql_result($rs, 0);
 
     // first get the catalogue ID
     $rs = mysql_query("SELECT COUNT(*) FROM trans_unit WHERE cat_id = {$cat_id}", $this->db);
 
-    $count = intval(mysql_result($rs, 0));
+    $count = (int) mysql_result($rs, 0);
 
     return array($cat_id, $variant, $count);
   }
@@ -316,7 +312,7 @@ protected function getCatalogueDetails($catalogue = 'messages')
   /**
    * Updates the catalogue last modified time.
    *
-   * @return boolean true if updated, false otherwise. 
+   * @return boolean true if updated, false otherwise.
    */
   protected function updateCatalogueTime($cat_id, $variant)
   {
@@ -333,7 +329,7 @@ protected function updateCatalogueTime($cat_id, $variant)
   }
 
   /**
-   * Saves the list of untranslated blocks to the translation source. 
+   * Saves the list of untranslated blocks to the translation source.
    * If the translation was not found, you should add those
    * strings to the translation source via the <b>append()</b> method.
    *
@@ -391,7 +387,7 @@ function save($catalogue = 'messages')
    *
    * @param string $message   the source message to delete.
    * @param string $catalogue the catalogue to delete from.
-   * @return boolean true if deleted, false otherwise. 
+   * @return boolean true if deleted, false otherwise.
    */
   function delete($message, $catalogue = 'messages')
   {
@@ -427,7 +423,7 @@ function delete($message, $catalogue = 'messages')
    * @param string $target    the new translation string.
    * @param string $comments  comments
    * @param string $catalogue the catalogue of the translation.
-   * @return boolean true if translation was updated, false otherwise. 
+   * @return boolean true if translation was updated, false otherwise.
    */
   function update($text, $target, $comments, $catalogue = 'messages')
   {
@@ -463,7 +459,7 @@ function update($text, $target, $comments, $catalogue = 'messages')
   /**
    * Returns a list of catalogue as key and all it variants as value.
    *
-   * @return array list of catalogues 
+   * @return array list of catalogues
    */
   function catalogues()
   {
diff --git a/lib/vendor/symfony/lib/i18n/sfMessageSource_SQLite.class.php b/lib/vendor/symfony/lib/i18n/sfMessageSource_SQLite.class.php
index d0a7dd844..e2d9bce06 100644
--- a/lib/vendor/symfony/lib/i18n/sfMessageSource_SQLite.class.php
+++ b/lib/vendor/symfony/lib/i18n/sfMessageSource_SQLite.class.php
@@ -13,14 +13,14 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version    $Id: sfMessageSource_SQLite.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    $Id$
  * @package    symfony
  * @subpackage i18n
  */
 
 /**
  * sfMessageSource_SQLite class.
- * 
+ *
  * Retrieve the message translation from a SQLite database.
  *
  * See the MessageSource::factory() method to instantiate this class.
@@ -89,7 +89,7 @@ class sfMessageSource_SQLite extends sfMessageSource_Database
 {
   /**
    * The SQLite datasource, the filename of the database.
-   * @var string 
+   * @var string
    */
   protected $source;
 
@@ -155,7 +155,7 @@ protected function getLastModified($source)
 
     $rs = sqlite_query("SELECT date_modified FROM catalogue WHERE name = '{$source}'", $db);
 
-    $result = $rs ? intval(sqlite_fetch_single($rs)) : 0;
+    $result = $rs ? (int) sqlite_fetch_single($rs) : 0;
 
     sqlite_close($db);
 
@@ -173,7 +173,7 @@ public function isValidSource($variant)
     $variant = sqlite_escape_string($variant);
     $db = sqlite_open($this->source);
     $rs = sqlite_query("SELECT COUNT(*) FROM catalogue WHERE name = '{$variant}'", $db);
-    $result = $rs && intval(sqlite_fetch_single($rs));
+    $result = $rs && (int) sqlite_fetch_single($rs);
     sqlite_close($db);
 
     return $result;
@@ -205,12 +205,12 @@ protected function getCatalogueDetails($catalogue = 'messages')
       return false;
     }
 
-    $cat_id = intval(sqlite_fetch_single($rs));
+    $cat_id = (int) (sqlite_fetch_single($rs);
 
     // first get the catalogue ID
     $rs = sqlite_query("SELECT count(msg_id) FROM trans_unit WHERE cat_id = {$cat_id}", $db);
 
-    $count = intval(sqlite_fetch_single($rs));
+    $count = (int) sqlite_fetch_single($rs);
 
     sqlite_close($db);
 
@@ -220,7 +220,7 @@ protected function getCatalogueDetails($catalogue = 'messages')
   /**
    * Updates the catalogue last modified time.
    *
-   * @return boolean true if updated, false otherwise. 
+   * @return boolean true if updated, false otherwise.
    */
   protected function updateCatalogueTime($cat_id, $variant, $db)
   {
@@ -237,7 +237,7 @@ protected function updateCatalogueTime($cat_id, $variant, $db)
   }
 
   /**
-   * Saves the list of untranslated blocks to the translation source. 
+   * Saves the list of untranslated blocks to the translation source.
    * If the translation was not found, you should add those
    * strings to the translation source via the <b>append()</b> method.
    *
@@ -299,7 +299,7 @@ function save($catalogue = 'messages')
    * @param string $target    the new translation string.
    * @param string $comments  comments
    * @param string $catalogue the catalogue of the translation.
-   * @return boolean true if translation was updated, false otherwise. 
+   * @return boolean true if translation was updated, false otherwise.
    */
   function update($text, $target, $comments, $catalogue = 'messages')
   {
@@ -343,7 +343,7 @@ function update($text, $target, $comments, $catalogue = 'messages')
    *
    * @param string  $message    the source message to delete.
    * @param string  $catalogue  the catalogue to delete from.
-   * @return boolean true if deleted, false otherwise. 
+   * @return boolean true if deleted, false otherwise.
    */
   function delete($message, $catalogue = 'messages')
   {
@@ -380,7 +380,7 @@ function delete($message, $catalogue = 'messages')
   /**
    * Returns a list of catalogue as key and all it variants as value.
    *
-   * @return array list of catalogues 
+   * @return array list of catalogues
    */
   function catalogues()
   {
diff --git a/lib/vendor/symfony/lib/i18n/sfMessageSource_SQLite3.class.php b/lib/vendor/symfony/lib/i18n/sfMessageSource_SQLite3.class.php
new file mode 100644
index 000000000..45cd7e7e9
--- /dev/null
+++ b/lib/vendor/symfony/lib/i18n/sfMessageSource_SQLite3.class.php
@@ -0,0 +1,418 @@
+<?php
+
+/**
+ * sfMessageSource_SQLite class file.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the BSD License.
+ *
+ * Copyright(c) 2004 by Qiang Xue. All rights reserved.
+ *
+ * To contact the author write to {@link mailto:qiang.xue@gmail.com Qiang Xue}
+ * The latest version of PRADO can be obtained from:
+ * {@link http://prado.sourceforge.net/}
+ *
+ * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * @author     Jérôme Macias <jmacias@groupe-exp.com>
+ * @version    $Id$
+ * @package    symfony
+ * @subpackage i18n
+ */
+
+/**
+ * sfMessageSource_SQLite class.
+ *
+ * Retrieve the message translation from a SQLite database.
+ *
+ * See the MessageSource::factory() method to instantiate this class.
+ *
+ * SQLite schema:
+ *
+ * CREATE TABLE catalogue (
+ *   cat_id INTEGER PRIMARY KEY,
+ *   name VARCHAR NOT NULL,
+ *   source_lang VARCHAR,
+ *   target_lang VARCHAR,
+ *   date_created INT,
+ *   date_modified INT,
+ *   author VARCHAR);
+ *
+ * CREATE TABLE trans_unit (
+ *   msg_id INTEGER PRIMARY KEY,
+ *   cat_id INTEGER NOT NULL DEFAULT '1',
+ *   id VARCHAR,
+ *   source TEXT,
+ *   target TEXT,
+ *   comments TEXT,
+ *   date_added INT,
+ *   date_modified INT,
+ *   author VARCHAR,
+ *   translated INT(1) NOT NULL DEFAULT '0');
+ *
+ * Propel schema (in .xml format):
+ *
+ *  <database ...>
+ *    ...
+ *    <table name="catalogue">
+ *     <column name="cat_id" type="integer" required="true" primaryKey="true" autoincrement="true" />
+ *     <column name="name" type="varchar" size="100" />
+ *     <column name="source_lang" type="varchar" size="100" />
+ *     <column name="target_lang" type="varchar" size="100" />
+ *     <column name="date_created" type="timestamp" />
+ *     <column name="date_modified" type="timestamp" />
+ *     <column name="author" type="varchar" size="255" />
+ *    </table>
+ *
+ *    <table name="trans_unit">
+ *     <column name="msg_id" type="integer" required="true" primaryKey="true" autoincrement="true" />
+ *     <column name="cat_id" type="integer" />
+ *       <foreign-key foreignTable="catalogue" onDelete="cascade">
+ *         <reference local="cat_id" foreign="cat_id"/>
+ *       </foreign-key>
+ *     <column name="id" type="varchar" size="255" />
+ *     <column name="source" type="longvarchar" />
+ *     <column name="target" type="longvarchar" />
+ *     <column name="comments" type="longvarchar" />
+ *     <column name="date_created" type="timestamp" />
+ *     <column name="date_modified" type="timestamp" />
+ *     <column name="author" type="varchar" size="255" />
+ *     <column name="translated" type="integer" />
+ *    </table>
+ *    ...
+ *  </database>
+ *
+ * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
+ * @version v1.0, last update on Fri Dec 24 16:58:58 EST 2004
+ * @package    symfony
+ * @subpackage i18n
+ */
+class sfMessageSource_SQLite3 extends sfMessageSource_Database
+{
+  /**
+   * The SQLite datasource, the filename of the database.
+   * @var string
+   */
+  protected $source;
+
+  /**
+   * Constructor.
+   * Creates a new message source using SQLite.
+   * @see MessageSource::factory();
+   * @param string $source SQLite datasource, in PEAR's DB DSN format.
+   */
+  function __construct($source)
+  {
+    $dsn = $this->parseDSN((string) $source);
+    $this->source = $dsn['database'];
+  }
+
+  /**
+   * Gets an array of messages for a particular catalogue and cultural variant.
+   *
+   * @param string $variant the catalogue name + variant
+   * @return array translation messages.
+   */
+  public function &loadData($variant)
+  {
+    $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+
+    $variant = $db->escapeString($variant);
+
+    $statement =
+      "SELECT t.id, t.source, t.target, t.comments
+        FROM trans_unit t, catalogue c
+        WHERE c.cat_id =  t.cat_id
+          AND c.name = '{$variant}'
+        ORDER BY id ASC";
+
+    $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+    $rs = $db->query($statement);
+
+    $result = array();
+
+    while ($row = $rs->fetchArray(SQLITE3_NUM))
+    {
+      $source = $row[1];
+      $result[$source][] = $row[2]; //target
+      $result[$source][] = $row[0]; //id
+      $result[$source][] = $row[3]; //comments
+    }
+
+    $db->close();
+
+    return $result;
+  }
+
+  /**
+   * Gets the last modified unix-time for this particular catalogue+variant.
+   * We need to query the database to get the date_modified.
+   *
+   * @param string $source catalogue+variant
+   * @return int last modified in unix-time format.
+   */
+  protected function getLastModified($source)
+  {
+    $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+
+    $source = $db->escapeString($source);
+    $rs = $db->querySingle("SELECT date_modified FROM catalogue WHERE name = '{$source}'");
+    $result = null !== $rs ? (int) $rs : 0;
+
+    $db->close();
+
+    return $result;
+  }
+
+  /**
+   * Checks if a particular catalogue+variant exists in the database.
+   *
+   * @param string $variant catalogue+variant
+   * @return boolean true if the catalogue+variant is in the database, false otherwise.
+   */
+  public function isValidSource($variant)
+  {
+    $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+
+    $variant = $db->escapeString($variant);
+    $rs = $db->querySingle("SELECT COUNT(*) FROM catalogue WHERE name = '{$variant}'");
+    $result = null !== $rs && (int) $rs;
+
+    $db->close();
+
+    return $result;
+  }
+
+  /**
+   * Retrieves catalogue details, array($cat_id, $variant, $count).
+   *
+   * @param string $catalogue catalogue
+   * @return array catalogue details, array($cat_id, $variant, $count).
+   */
+  protected function getCatalogueDetails($catalogue = 'messages')
+  {
+    if (empty($catalogue))
+    {
+      $catalogue = 'messages';
+    }
+
+    $variant = $catalogue.'.'.$this->culture;
+
+    $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+
+    $name = $db->escapeString($this->getSource($variant));
+
+    $rs = $db->query("SELECT cat_id FROM catalogue WHERE name = '{$name}'");
+
+    $i = 0;
+    while ($row = $rs->fetchArray(SQLITE3_NUM))
+    {
+      if (0 == $i)
+      {
+        $cat_id = (int) $row[0];
+      }
+
+      if (1 == $i)
+      {
+        return false;
+      }
+
+      ++$i;
+    }
+
+    // first get the catalogue ID
+    $rs = $db->querySingle("SELECT count(msg_id) FROM trans_unit WHERE cat_id = {$cat_id}");
+
+    $count = (int) $rs;
+
+    $db->close();
+
+    return array($cat_id, $variant, $count);
+  }
+
+  /**
+   * Updates the catalogue last modified time.
+   *
+   * @return boolean true if updated, false otherwise.
+   */
+  protected function updateCatalogueTime($cat_id, $variant)
+  {
+    $time = time();
+
+    $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+    $result = $db->exec("UPDATE catalogue SET date_modified = {$time} WHERE cat_id = {$cat_id}");
+    $res = (boolean) $db->changes();
+    $db->close();
+
+    if ($this->cache)
+    {
+      $this->cache->remove($variant.':'.$this->culture);
+    }
+
+    return $res;
+  }
+
+  /**
+   * Saves the list of untranslated blocks to the translation source.
+   * If the translation was not found, you should add those
+   * strings to the translation source via the <b>append()</b> method.
+   *
+   * @param string $catalogue the catalogue to add to
+   * @return boolean true if saved successfuly, false otherwise.
+   */
+  public function save($catalogue = 'messages')
+  {
+    $messages = $this->untranslated;
+
+    if (count($messages) <= 0)
+    {
+      return false;
+    }
+
+    $details = $this->getCatalogueDetails($catalogue);
+
+    if ($details)
+    {
+      list($cat_id, $variant, $count) = $details;
+    }
+    else
+    {
+      return false;
+    }
+
+    if ($cat_id <= 0)
+    {
+      return false;
+    }
+    $inserted = 0;
+
+    $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+    $time = time();
+
+    foreach ($messages as $message)
+    {
+      $message = $db->escapeString($message);
+      $db->exec("INSERT INTO trans_unit (cat_id, id, source, date_added) VALUES ({$cat_id}, {$count}, '{$message}', $time)");
+      if ($db->changes())
+      {
+        ++$count;
+        ++$inserted;
+      }
+    }
+    if ($inserted > 0)
+    {
+      $this->updateCatalogueTime($cat_id, $variant);
+    }
+
+    $db->close();
+
+    return $inserted > 0;
+  }
+
+  /**
+   * Updates the translation.
+   *
+   * @param string $text      the source string.
+   * @param string $target    the new translation string.
+   * @param string $comments  comments
+   * @param string $catalogue the catalogue of the translation.
+   * @return boolean true if translation was updated, false otherwise.
+   */
+  function update($text, $target, $comments, $catalogue = 'messages')
+  {
+    if ($details = $this->getCatalogueDetails($catalogue))
+    {
+      list($cat_id, $variant, $count) = $details;
+    }
+    else
+    {
+      return false;
+    }
+
+    $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+
+    $comments = $db->escapeString($comments);
+    $target = $db->escapeString($target);
+    $text = $db->escapeString($text);
+
+    $time = time();
+
+    $db->exec("UPDATE trans_unit SET target = '{$target}', comments = '{$comments}', date_modified = '{$time}' WHERE cat_id = {$cat_id} AND source = '{$text}'");
+
+    $updated = false;
+    if ($db->changes())
+    {
+      $this->updateCatalogueTime($cat_id, $variant);
+      $updated = true;
+    }
+
+    $db->close();
+
+    return $updated;
+  }
+
+  /**
+   * Deletes a particular message from the specified catalogue.
+   *
+   * @param string  $message    the source message to delete.
+   * @param string  $catalogue  the catalogue to delete from.
+   * @return boolean true if deleted, false otherwise.
+   */
+  function delete($message, $catalogue = 'messages')
+  {
+    $details = $this->getCatalogueDetails($catalogue);
+    if ($details)
+    {
+      list($cat_id, $variant, $count) = $details;
+    }
+    else
+    {
+      return false;
+    }
+
+    $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+    $text = $db->escapeString($message);
+
+    $db->exec("DELETE FROM trans_unit WHERE cat_id = {$cat_id} AND source = '{$message}'");
+
+    if ($db->changes())
+    {
+      $this->updateCatalogueTime($cat_id, $variant);
+      $deleted = true;
+    }
+    else
+    {
+      $deleted = false;
+    }
+
+    $db->close();
+
+    return $deleted;
+  }
+
+  /**
+   * Returns a list of catalogue as key and all it variants as value.
+   *
+   * @return array list of catalogues
+   */
+  function catalogues()
+  {
+    $db = new SQLite3($this->source, SQLITE3_OPEN_READWRITE);
+    $statement = 'SELECT name FROM catalogue ORDER BY name';
+    $rs = $db->query($statement);
+
+    $result = array();
+    while ($row = $rs->fetchArray(SQLITE3_NUM))
+    {
+      $details = explode('.', $row[0]);
+      if (!isset($details[1]))
+      {
+        $details[1] = null;
+      }
+
+      $result[] = $details;
+    }
+    $db->close();
+
+    return $result;
+  }
+}
diff --git a/lib/vendor/symfony/lib/i18n/sfMessageSource_XLIFF.class.php b/lib/vendor/symfony/lib/i18n/sfMessageSource_XLIFF.class.php
index 071eb551c..e6f8fdecc 100644
--- a/lib/vendor/symfony/lib/i18n/sfMessageSource_XLIFF.class.php
+++ b/lib/vendor/symfony/lib/i18n/sfMessageSource_XLIFF.class.php
@@ -13,7 +13,7 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version    $Id: sfMessageSource_XLIFF.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    $Id$
  * @package    symfony
  * @subpackage i18n
  */
@@ -53,9 +53,7 @@ public function &loadData($filename)
     libxml_use_internal_errors(true);
     if (!$xml = simplexml_load_file($filename))
     {
-      $error = false;
-
-      return $error;
+      return false;
     }
     libxml_use_internal_errors(false);
 
@@ -183,7 +181,7 @@ public function save($catalogue = 'messages')
     $lastNodes = $xpath->query('//trans-unit[not(@id <= preceding-sibling::trans-unit/@id) and not(@id <= following-sibling::trans-unit/@id)]');
     if (null !== $last = $lastNodes->item(0))
     {
-      $count = intval($last->getAttribute('id'));
+      $count = (int) $last->getAttribute('id');
     }
     else
     {
diff --git a/lib/vendor/symfony/lib/i18n/sfMessageSource_gettext.class.php b/lib/vendor/symfony/lib/i18n/sfMessageSource_gettext.class.php
index e173d82c0..9232e0dff 100644
--- a/lib/vendor/symfony/lib/i18n/sfMessageSource_gettext.class.php
+++ b/lib/vendor/symfony/lib/i18n/sfMessageSource_gettext.class.php
@@ -13,7 +13,7 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version    $Id: sfMessageSource_gettext.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    $Id$
  * @package    symfony
  * @subpackage i18n
  */
diff --git a/lib/vendor/symfony/lib/i18n/sfNumberFormat.class.php b/lib/vendor/symfony/lib/i18n/sfNumberFormat.class.php
index 0da753459..9c559f6f3 100644
--- a/lib/vendor/symfony/lib/i18n/sfNumberFormat.class.php
+++ b/lib/vendor/symfony/lib/i18n/sfNumberFormat.class.php
@@ -13,14 +13,14 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version    $Id: sfNumberFormat.class.php 32678 2011-06-29 16:43:32Z fabien $
+ * @version    $Id$
  * @package    symfony
  * @subpackage i18n
  */
 
 /**
  * sfNumberFormat class.
- * 
+ *
  * sfNumberFormat formats decimal numbers in any locale. The decimal
  * number is formatted according to a particular pattern. These
  * patterns can arise from the sfNumberFormatInfo object which is
@@ -30,7 +30,7 @@
  * <code>
  *  //create a invariant number formatter.
  *  $formatter = new sfNumberFormat();
- * 
+ *
  *  //create a number format for the french language locale.
  *  $fr = new sfNumberFormat('fr');
  *
@@ -38,7 +38,7 @@
  *  $format = new sfNumberFormat($numberInfo);
  * </code>
  *
- * A normal decimal number can also be displayed as a currency 
+ * A normal decimal number can also be displayed as a currency
  * or as a percentage. For example
  * <code>
  * $format->format(1234.5); //Decimal number "1234.5"
@@ -50,12 +50,12 @@
  * to format the number as Japanese Yen:
  * <code>
  *  $ja = new sfNumberFormat('ja_JP');
- * 
+ *
  *  //Japanese currency pattern, and using Japanese Yen symbol
  *  $ja->format(123.14,'c','JPY'); //ï¿?123 (Yen 123)
  * </code>
  * For each culture, the symbol for each currency may be different.
- * 
+ *
  * @author Xiang Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @version v1.0, last update on Fri Dec 10 18:10:20 EST 2004
  * @package    symfony
@@ -105,12 +105,12 @@ function __construct($formatInfo = null)
    *
    * @param mixed   $number   the number to format.
    * @param string  $pattern  the format pattern, either, 'c', 'd', 'e', 'p'
-   * or a custom pattern. E.g. "#.000" will format the number to 
+   * or a custom pattern. E.g. "#.000" will format the number to
    * 3 decimal places.
-   * @param string  $currency 3-letter ISO 4217 code. For example, the code 
+   * @param string  $currency 3-letter ISO 4217 code. For example, the code
    * "USD" represents the US Dollar and "EUR" represents the Euro currency.
    * @param string  $charset  The charset
-   * @return string formatted number string 
+   * @return string formatted number string
    */
   function format($number, $pattern = 'd', $currency = 'USD', $charset = 'UTF-8')
   {
@@ -118,7 +118,7 @@ function format($number, $pattern = 'd', $currency = 'USD', $charset = 'UTF-8')
 
     if (strtolower($pattern) == 'p')
     {
-      $number = $number * 100;
+      $number *= 100;
     }
 
     // avoid conversion with exponents
@@ -322,7 +322,7 @@ protected function fixFloat($float)
   {
     $string = (string) $float;
 
-    if (false === strstr($float, 'E'))
+    if (false === strpos($float, 'E'))
     {
       return $string;
     }
diff --git a/lib/vendor/symfony/lib/i18n/sfNumberFormatInfo.class.php b/lib/vendor/symfony/lib/i18n/sfNumberFormatInfo.class.php
index c2a84b725..613b48adb 100644
--- a/lib/vendor/symfony/lib/i18n/sfNumberFormatInfo.class.php
+++ b/lib/vendor/symfony/lib/i18n/sfNumberFormatInfo.class.php
@@ -13,7 +13,7 @@
  * {@link http://prado.sourceforge.net/}
  *
  * @author     Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version    $Id: sfNumberFormatInfo.class.php 28725 2010-03-23 16:56:48Z FabianLange $
+ * @version    $Id$
  * @package    symfony
  * @subpackage i18n
  */
diff --git a/lib/vendor/symfony/lib/log/sfAggregateLogger.class.php b/lib/vendor/symfony/lib/log/sfAggregateLogger.class.php
index 261805071..ecba60895 100644
--- a/lib/vendor/symfony/lib/log/sfAggregateLogger.class.php
+++ b/lib/vendor/symfony/lib/log/sfAggregateLogger.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage log
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfAggregateLogger.class.php 14603 2009-01-11 10:35:17Z dwhittle $
+ * @version    SVN: $Id$
  */
 class sfAggregateLogger extends sfLogger
 {
@@ -36,7 +36,7 @@ class sfAggregateLogger extends sfLogger
   public function initialize(sfEventDispatcher $dispatcher, $options = array())
   {
     $this->dispatcher = $dispatcher;
-    
+
     if (isset($options['loggers']))
     {
       if (!is_array($options['loggers']))
@@ -78,7 +78,7 @@ public function addLoggers($loggers)
    *
    * @param object $logger The Logger object
    */
-  public function addLogger(sfLogger $logger)
+  public function addLogger(sfLoggerInterface $logger)
   {
     $this->loggers[] = $logger;
 
@@ -106,7 +106,10 @@ public function shutdown()
   {
     foreach ($this->loggers as $logger)
     {
-      $logger->shutdown();
+      if ($logger instanceof sfLogger)
+      {
+        $logger->shutdown();
+      }
     }
 
     $this->loggers = array();
diff --git a/lib/vendor/symfony/lib/log/sfConsoleLogger.class.php b/lib/vendor/symfony/lib/log/sfConsoleLogger.class.php
index b447d2826..a3747f940 100644
--- a/lib/vendor/symfony/lib/log/sfConsoleLogger.class.php
+++ b/lib/vendor/symfony/lib/log/sfConsoleLogger.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage log
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfConsoleLogger.class.php 10952 2008-08-19 15:04:33Z fabien $
+ * @version    SVN: $Id$
  */
 class sfConsoleLogger extends sfStreamLogger
 {
diff --git a/lib/vendor/symfony/lib/log/sfEventLogger.class.php b/lib/vendor/symfony/lib/log/sfEventLogger.class.php
new file mode 100644
index 000000000..a371574c4
--- /dev/null
+++ b/lib/vendor/symfony/lib/log/sfEventLogger.class.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * sfEventLogger sends log messages to the event dispatcher to be processed
+ * by registered loggers.
+ *
+ * @package    symfony
+ * @subpackage log
+ * @author     Jérôme Tamarelle <jtamarelle@groupe-exp.com>
+ */
+class sfEventLogger extends sfLogger
+{
+  /**
+   * {@inheritDoc}
+   */
+  public function initialize(sfEventDispatcher $dispatcher, $options = array())
+  {
+    $this->dispatcher = $dispatcher;
+    $this->options = $options;
+
+    if (isset($this->options['level']))
+    {
+      $this->setLogLevel($this->options['level']);
+    }
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  protected function doLog($message, $priority)
+  {
+    $this->dispatcher->notify(new sfEvent($this, 'command.log', array($message)));
+  }
+}
diff --git a/lib/vendor/symfony/lib/log/sfFileLogger.class.php b/lib/vendor/symfony/lib/log/sfFileLogger.class.php
index bc94a4809..f4d9d4cce 100644
--- a/lib/vendor/symfony/lib/log/sfFileLogger.class.php
+++ b/lib/vendor/symfony/lib/log/sfFileLogger.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage log
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfFileLogger.class.php 10964 2008-08-19 18:33:50Z fabien $
+ * @version    SVN: $Id$
  */
 class sfFileLogger extends sfLogger
 {
@@ -63,10 +63,11 @@ public function initialize(sfEventDispatcher $dispatcher, $options = array())
       $this->type = $options['type'];
     }
 
-    $dir = dirname($options['file']);
-    if (!is_dir($dir))
+    $dir     = dirname($options['file']);
+    $dirMode = isset($options['dir_mode']) ? $options['dir_mode'] : 0777;
+    if (!is_dir($dir) && !@mkdir($dir, $dirMode, true) && !is_dir($dir))
     {
-      mkdir($dir, isset($options['dir_mode']) ? $options['dir_mode'] : 0777, true);
+      throw new \RuntimeException(sprintf('Logger was not able to create a directory "%s"', $dir));
     }
 
     $fileExists = file_exists($options['file']);
diff --git a/lib/vendor/symfony/lib/log/sfLogger.class.php b/lib/vendor/symfony/lib/log/sfLogger.class.php
index e78f18a48..d08fc690c 100644
--- a/lib/vendor/symfony/lib/log/sfLogger.class.php
+++ b/lib/vendor/symfony/lib/log/sfLogger.class.php
@@ -24,9 +24,9 @@
  * @package    symfony
  * @subpackage log
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfLogger.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
-abstract class sfLogger
+abstract class sfLogger implements sfLoggerInterface
 {
   const EMERG   = 0; // System is unusable
   const ALERT   = 1; // Immediate action required
diff --git a/lib/vendor/symfony/lib/log/sfLoggerInterface.class.php b/lib/vendor/symfony/lib/log/sfLoggerInterface.class.php
index 98a6a8d83..15f2258e5 100644
--- a/lib/vendor/symfony/lib/log/sfLoggerInterface.class.php
+++ b/lib/vendor/symfony/lib/log/sfLoggerInterface.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage log
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfLoggerInterface.class.php 9081 2008-05-20 00:47:12Z Carl.Vondrick $
+ * @version    SVN: $Id$
  */
 interface sfLoggerInterface
 {
diff --git a/lib/vendor/symfony/lib/log/sfLoggerWrapper.class.php b/lib/vendor/symfony/lib/log/sfLoggerWrapper.class.php
index 50c2fc6a7..63e1ebcea 100644
--- a/lib/vendor/symfony/lib/log/sfLoggerWrapper.class.php
+++ b/lib/vendor/symfony/lib/log/sfLoggerWrapper.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage log
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfLoggerWrapper.class.php 9081 2008-05-20 00:47:12Z Carl.Vondrick $
+ * @version    SVN: $Id$
  */
 class sfLoggerWrapper extends sfLogger
 {
diff --git a/lib/vendor/symfony/lib/log/sfNoLogger.class.php b/lib/vendor/symfony/lib/log/sfNoLogger.class.php
index ab67972d5..5459fb357 100644
--- a/lib/vendor/symfony/lib/log/sfNoLogger.class.php
+++ b/lib/vendor/symfony/lib/log/sfNoLogger.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage log
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfNoLogger.class.php 9081 2008-05-20 00:47:12Z Carl.Vondrick $
+ * @version    SVN: $Id$
  */
 class sfNoLogger extends sfLogger
 {
diff --git a/lib/vendor/symfony/lib/log/sfPsrLoggerAdapter.class.php b/lib/vendor/symfony/lib/log/sfPsrLoggerAdapter.class.php
new file mode 100644
index 000000000..ad71b59ec
--- /dev/null
+++ b/lib/vendor/symfony/lib/log/sfPsrLoggerAdapter.class.php
@@ -0,0 +1,161 @@
+<?php
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * sfPsrLoggerAdapter is meant to be able to use a Prs compliant logger in symfony 1.
+ *
+ * @see https://github.com/php-fig/log
+ *
+ * @package    symfony
+ * @subpackage service
+ * @author     Martin Poirier Theoret <mpoiriert@gmail.com>
+ */
+class sfPsrLoggerAdapter extends sfLogger
+{
+  /**
+   * Buffer to keep all the log before the psr logger is registered
+   *
+   * @var array
+   */
+  private $buffer = array();
+
+  /**
+   * The logger that will the log will be forward to
+   *
+   * @var \Psr\Log\LoggerInterface
+   */
+  private $logger;
+
+  /**
+   * The service id that will be use as the psr logger
+   *
+   * @var string
+   */
+  private $loggerServiceId = 'logger.psr';
+
+  /**
+   * Initializes this logger.
+   *
+   * Available options:
+   *
+   * - logger_service_id: The service id to use as the logger. Default: logger.psr
+   * - auto_connect: If we must connect automatically to the context.load_factories to set the logger. Default: true
+   *
+   * @param sfEventDispatcher $dispatcher
+   * @param array $options
+   *
+   * @return void
+   */
+  public function initialize(sfEventDispatcher $dispatcher, $options = array())
+  {
+    if (isset($options['logger_service_id']))
+    {
+      $this->loggerServiceId = $options['logger_service_id'];
+    }
+
+    if (!isset($options['auto_connect']) || $options['auto_connect'])
+    {
+      $dispatcher->connect('context.load_factories', array($this, 'listenContextLoadFactoriesEvent'));
+    }
+
+    parent::initialize($dispatcher, $options);
+  }
+
+  /**
+   * Listen the context load factories to get the configure service after the service container is available
+   *
+   * @param sfEvent $event
+   *
+   * @return void
+   */
+  public function listenContextLoadFactoriesEvent(sfEvent $event)
+  {
+    $context = $event->getSubject();
+    /* @var $context sfContext */
+    $this->setLogger($context->getService($this->loggerServiceId));
+    $this->dispatcher->disconnect('context.load_factories', array($this, 'listenContextLoadFactoriesEvent'));
+  }
+
+  /**
+   * Set the logger
+   *
+   * @param \Psr\Log\LoggerInterface $logger
+   */
+  public function setLogger(\Psr\Log\LoggerInterface $logger)
+  {
+    $this->logger = $logger;
+    $this->flushBuffer();
+  }
+
+  /**
+   * Flush the current buffer to the register logger
+   *
+   * @return void
+   */
+  public function flushBuffer()
+  {
+    if (!$this->logger)
+    {
+      $this->buffer = array();
+      return;
+    }
+
+    foreach ($this->buffer as $log)
+    {
+      $this->log($log['message'], $log['priority']);
+    }
+
+    $this->buffer = array();
+  }
+
+  /**
+   * Logs a message.
+   *
+   * @param string $message Message
+   * @param string $priority Message priority
+   *
+   * @return void
+   */
+  public function doLog($message, $priority)
+  {
+    if (!$this->logger)
+    {
+      $this->buffer[] = compact('message', 'priority');
+      return;
+    }
+
+    switch ($priority)
+    {
+      case sfLogger::EMERG:
+        $this->logger->emergency($message);
+        break;
+      case sfLogger::ALERT:
+        $this->logger->alert($message);
+        break;
+      case sfLogger::CRIT:
+        $this->logger->critical($message);
+        break;
+      case sfLogger::ERR:
+        $this->logger->error($message);
+        break;
+      case sfLogger::WARNING:
+        $this->logger->warning($message);
+        break;
+      case sfLogger::NOTICE:
+        $this->logger->notice($message);
+        break;
+      case sfLogger::INFO:
+        $this->logger->info($message);
+        break;
+      case sfLogger::DEBUG:
+        $this->logger->debug($message);
+        break;
+    }
+  }
+}
diff --git a/lib/vendor/symfony/lib/log/sfStreamLogger.class.php b/lib/vendor/symfony/lib/log/sfStreamLogger.class.php
index c8082669f..3ede2bd6c 100644
--- a/lib/vendor/symfony/lib/log/sfStreamLogger.class.php
+++ b/lib/vendor/symfony/lib/log/sfStreamLogger.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage log
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfStreamLogger.class.php 9081 2008-05-20 00:47:12Z Carl.Vondrick $
+ * @version    SVN: $Id$
  */
 class sfStreamLogger extends sfLogger
 {
diff --git a/lib/vendor/symfony/lib/log/sfVarLogger.class.php b/lib/vendor/symfony/lib/log/sfVarLogger.class.php
index 5ea40d90f..a778d78b1 100644
--- a/lib/vendor/symfony/lib/log/sfVarLogger.class.php
+++ b/lib/vendor/symfony/lib/log/sfVarLogger.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage log
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfVarLogger.class.php 26989 2010-01-21 12:43:21Z FabianLange $
+ * @version    SVN: $Id$
  */
 class sfVarLogger extends sfLogger
 {
diff --git a/lib/vendor/symfony/lib/log/sfWebDebugLogger.class.php b/lib/vendor/symfony/lib/log/sfWebDebugLogger.class.php
index 90190b3dd..98c2383c2 100644
--- a/lib/vendor/symfony/lib/log/sfWebDebugLogger.class.php
+++ b/lib/vendor/symfony/lib/log/sfWebDebugLogger.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage log
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWebDebugLogger.class.php 30790 2010-08-31 13:23:50Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfWebDebugLogger extends sfVarLogger
 {
diff --git a/lib/vendor/symfony/lib/mailer/sfMailer.class.php b/lib/vendor/symfony/lib/mailer/sfMailer.class.php
old mode 100644
new mode 100755
index b072df8a7..ee9ce93e8
--- a/lib/vendor/symfony/lib/mailer/sfMailer.class.php
+++ b/lib/vendor/symfony/lib/mailer/sfMailer.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage mailer
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfMailer.class.php 28841 2010-03-29 08:13:57Z fabien $
+ * @version    SVN: $Id$
  */
 class sfMailer extends Swift_Mailer
 {
@@ -59,7 +59,7 @@ public function __construct(sfEventDispatcher $dispatcher, $options)
     $options = array_merge(array(
       'charset' => 'UTF-8',
       'logging' => false,
-      'delivery_strategy' => 'realtime',
+      'delivery_strategy' => self::REALTIME,
       'transport' => array(
         'class' => 'Swift_MailTransport',
         'param' => array(),
@@ -73,6 +73,11 @@ public function __construct(sfEventDispatcher $dispatcher, $options)
       throw new InvalidArgumentException(sprintf('Unknown mail delivery strategy "%s" (should be one of realtime, spool, single_address, or none)', $options['delivery_strategy']));
     }
 
+    if (sfMailer::NONE == $this->strategy)
+    {
+      $options['transport']['class'] = 'Swift_NullTransport';
+    }
+
     // transport
     $class = $options['transport']['class'];
     $transport = new $class();
@@ -141,12 +146,6 @@ public function __construct(sfEventDispatcher $dispatcher, $options)
       $transport->registerPlugin($this->logger);
     }
 
-    if (sfMailer::NONE == $this->strategy)
-    {
-      // must be registered after logging
-      $transport->registerPlugin(new Swift_Plugins_BlackholePlugin());
-    }
-
     // preferences
     Swift_Preferences::getInstance()->setCharset($options['charset']);
 
@@ -323,9 +322,4 @@ public function getSpool()
 
     return $this->spool;
   }
-
-  static public function initialize()
-  {
-    require_once sfConfig::get('sf_symfony_lib_dir').'/vendor/swiftmailer/swift_init.php';
-  }
 }
diff --git a/lib/vendor/symfony/lib/mailer/sfMailerMessageLoggerPlugin.class.php b/lib/vendor/symfony/lib/mailer/sfMailerMessageLoggerPlugin.class.php
index c6f3f792a..2234f42d2 100644
--- a/lib/vendor/symfony/lib/mailer/sfMailerMessageLoggerPlugin.class.php
+++ b/lib/vendor/symfony/lib/mailer/sfMailerMessageLoggerPlugin.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage mailer
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfMailerMessageLoggerPlugin.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfMailerMessageLoggerPlugin implements Swift_Events_SendListener
 {
diff --git a/lib/vendor/symfony/lib/mailer/sfNoMailer.class.php b/lib/vendor/symfony/lib/mailer/sfNoMailer.class.php
new file mode 100644
index 000000000..83324e9a0
--- /dev/null
+++ b/lib/vendor/symfony/lib/mailer/sfNoMailer.class.php
@@ -0,0 +1,73 @@
+<?php
+
+/**
+ * sfMailer is the main entry point for the mailer system - sfNoMailer disable all mailer features.
+ */
+class sfNoMailer
+{
+  public function __construct(sfEventDispatcher $dispatcher, $options)
+  {
+  }
+
+  public function getRealtimeTransport()
+  {
+    return null;
+  }
+
+  public function setRealtimeTransport(Swift_Transport $transport)
+  {
+  }
+
+  public function getLogger()
+  {
+    return null;
+  }
+
+  public function setLogger($logger)
+  {
+  }
+
+  public function getDeliveryStrategy()
+  {
+    return null;
+  }
+
+  public function getDeliveryAddress()
+  {
+    return null;
+  }
+
+  public function setDeliveryAddress($address)
+  {
+  }
+
+  public function compose($from = null, $to = null, $subject = null, $body = null)
+  {
+    return null;
+  }
+
+  public function composeAndSend($from, $to, $subject, $body)
+  {
+    return null;
+  }
+
+  public function sendNextImmediately()
+  {
+    return null;
+  }
+
+  public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+  {
+    return null;
+  }
+
+  public function flushQueue(&$failedRecipients = null)
+  {
+    return null;
+  }
+
+  public function getSpool()
+  {
+    return null;
+  }
+}
diff --git a/lib/vendor/symfony/lib/plugin/sfPearConfig.class.php b/lib/vendor/symfony/lib/plugin/sfPearConfig.class.php
index d4fbe551c..cf0f1336e 100644
--- a/lib/vendor/symfony/lib/plugin/sfPearConfig.class.php
+++ b/lib/vendor/symfony/lib/plugin/sfPearConfig.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPearConfig.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfPearConfig extends PEAR_Config
 {
@@ -24,8 +24,6 @@ function &getREST($version, $options = array())
   {
     $class = 'sfPearRest'.str_replace('.', '', $version);
 
-    $remote = new $class($this, $options);
-
-    return $remote;
+    return new $class($this, $options);
   }
 }
diff --git a/lib/vendor/symfony/lib/plugin/sfPearDownloader.class.php b/lib/vendor/symfony/lib/plugin/sfPearDownloader.class.php
index 36802b5c3..3a8f72cc4 100644
--- a/lib/vendor/symfony/lib/plugin/sfPearDownloader.class.php
+++ b/lib/vendor/symfony/lib/plugin/sfPearDownloader.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPearDownloader.class.php 5250 2007-09-24 08:11:50Z fabien $
+ * @version    SVN: $Id$
  */
 class sfPearDownloader extends PEAR_Downloader
 {
diff --git a/lib/vendor/symfony/lib/plugin/sfPearEnvironment.class.php b/lib/vendor/symfony/lib/plugin/sfPearEnvironment.class.php
index b17fa5aac..83c748f32 100644
--- a/lib/vendor/symfony/lib/plugin/sfPearEnvironment.class.php
+++ b/lib/vendor/symfony/lib/plugin/sfPearEnvironment.class.php
@@ -26,7 +26,7 @@
  * @package    symfony
  * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPearEnvironment.class.php 17450 2009-04-20 17:37:49Z fabien $
+ * @version    SVN: $Id$
  */
 class sfPearEnvironment
 {
@@ -79,9 +79,9 @@ public function initialize(sfEventDispatcher $dispatcher, $options = array())
       throw new sfConfigurationException('You must provide a "cache_dir" option.');
     }
 
-    if (!is_dir($options['cache_dir']))
+    if (!is_dir($options['cache_dir']) && !@mkdir($options['cache_dir'], 0777, true) && !is_dir($options['cache_dir']))
     {
-      mkdir($options['cache_dir'], 0777, true);
+      throw new \RuntimeException(sprintf('Pear was not able to create a directory "%s"', $options['cache_dir']));
     }
 
     if (!isset($options['rest_base_class']))
diff --git a/lib/vendor/symfony/lib/plugin/sfPearFrontendPlugin.class.php b/lib/vendor/symfony/lib/plugin/sfPearFrontendPlugin.class.php
index a3a7d02f8..06e2aaef3 100644
--- a/lib/vendor/symfony/lib/plugin/sfPearFrontendPlugin.class.php
+++ b/lib/vendor/symfony/lib/plugin/sfPearFrontendPlugin.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -17,7 +17,7 @@
  * @package    symfony
  * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPearFrontendPlugin.class.php 9131 2008-05-21 04:12:00Z Carl.Vondrick $
+ * @version    SVN: $Id$
  */
 class sfPearFrontendPlugin extends PEAR_Frontend_CLI
 {
@@ -46,7 +46,7 @@ public function _display($text)
 
   protected function splitLongLine($text)
   {
-    $lines = '';
+    $lines = array();
     foreach (explode("\n", $text) as $longline)
     {
       foreach (explode("\n", wordwrap($longline, 62)) as $line)
diff --git a/lib/vendor/symfony/lib/plugin/sfPearRest.class.php b/lib/vendor/symfony/lib/plugin/sfPearRest.class.php
index 0cdca659e..f17b6deb3 100644
--- a/lib/vendor/symfony/lib/plugin/sfPearRest.class.php
+++ b/lib/vendor/symfony/lib/plugin/sfPearRest.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPearRest.class.php 10677 2008-08-05 19:11:48Z fabien $
+ * @version    SVN: $Id$
  */
 class sfPearRest extends PEAR_REST
 {
diff --git a/lib/vendor/symfony/lib/plugin/sfPearRest10.class.php b/lib/vendor/symfony/lib/plugin/sfPearRest10.class.php
index 2b7c1ea11..90f1dcf2f 100644
--- a/lib/vendor/symfony/lib/plugin/sfPearRest10.class.php
+++ b/lib/vendor/symfony/lib/plugin/sfPearRest10.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPearRest10.class.php 5250 2007-09-24 08:11:50Z fabien $
+ * @version    SVN: $Id$
  */
 class sfPearRest10 extends PEAR_REST_10
 {
diff --git a/lib/vendor/symfony/lib/plugin/sfPearRest11.class.php b/lib/vendor/symfony/lib/plugin/sfPearRest11.class.php
index 7cbb29088..b1722e844 100644
--- a/lib/vendor/symfony/lib/plugin/sfPearRest11.class.php
+++ b/lib/vendor/symfony/lib/plugin/sfPearRest11.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPearRest11.class.php 5250 2007-09-24 08:11:50Z fabien $
+ * @version    SVN: $Id$
  */
 class sfPearRest11 extends PEAR_REST_11
 {
diff --git a/lib/vendor/symfony/lib/plugin/sfPearRestPlugin.class.php b/lib/vendor/symfony/lib/plugin/sfPearRestPlugin.class.php
index 1fa90d45e..74b9dbabf 100644
--- a/lib/vendor/symfony/lib/plugin/sfPearRestPlugin.class.php
+++ b/lib/vendor/symfony/lib/plugin/sfPearRestPlugin.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPearRestPlugin.class.php 31396 2010-11-15 16:08:26Z fabien $
+ * @version    SVN: $Id$
  */
 class sfPearRestPlugin extends sfPearRest11
 {
diff --git a/lib/vendor/symfony/lib/plugin/sfPluginDependencyException.class.php b/lib/vendor/symfony/lib/plugin/sfPluginDependencyException.class.php
index fb80b2618..24a28f4e2 100644
--- a/lib/vendor/symfony/lib/plugin/sfPluginDependencyException.class.php
+++ b/lib/vendor/symfony/lib/plugin/sfPluginDependencyException.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPluginDependencyException.class.php 5250 2007-09-24 08:11:50Z fabien $
+ * @version    SVN: $Id$
  */
 class sfPluginDependencyException extends sfPluginException
 {
diff --git a/lib/vendor/symfony/lib/plugin/sfPluginException.class.php b/lib/vendor/symfony/lib/plugin/sfPluginException.class.php
index bb0d327d3..7807839ad 100644
--- a/lib/vendor/symfony/lib/plugin/sfPluginException.class.php
+++ b/lib/vendor/symfony/lib/plugin/sfPluginException.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPluginException.class.php 5250 2007-09-24 08:11:50Z fabien $
+ * @version    SVN: $Id$
  */
 class sfPluginException extends sfException
 {
diff --git a/lib/vendor/symfony/lib/plugin/sfPluginManager.class.php b/lib/vendor/symfony/lib/plugin/sfPluginManager.class.php
index b9019ffdc..7505f7e9f 100644
--- a/lib/vendor/symfony/lib/plugin/sfPluginManager.class.php
+++ b/lib/vendor/symfony/lib/plugin/sfPluginManager.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPluginManager.class.php 21908 2009-09-11 12:06:21Z fabien $
+ * @version    SVN: $Id$
  */
 class sfPluginManager
 {
diff --git a/lib/vendor/symfony/lib/plugin/sfPluginRecursiveDependencyException.class.php b/lib/vendor/symfony/lib/plugin/sfPluginRecursiveDependencyException.class.php
index 39a5e4408..2fbc8f998 100644
--- a/lib/vendor/symfony/lib/plugin/sfPluginRecursiveDependencyException.class.php
+++ b/lib/vendor/symfony/lib/plugin/sfPluginRecursiveDependencyException.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPluginRecursiveDependencyException.class.php 5250 2007-09-24 08:11:50Z fabien $
+ * @version    SVN: $Id$
  */
 class sfPluginRecursiveDependencyException extends sfPluginException
 {
diff --git a/lib/vendor/symfony/lib/plugin/sfPluginRestException.class.php b/lib/vendor/symfony/lib/plugin/sfPluginRestException.class.php
index a73549ebd..2f28c606d 100644
--- a/lib/vendor/symfony/lib/plugin/sfPluginRestException.class.php
+++ b/lib/vendor/symfony/lib/plugin/sfPluginRestException.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPluginRestException.class.php 5250 2007-09-24 08:11:50Z fabien $
+ * @version    SVN: $Id$
  */
 class sfPluginRestException extends sfPluginException
 {
diff --git a/lib/vendor/symfony/lib/plugin/sfSymfonyPluginManager.class.php b/lib/vendor/symfony/lib/plugin/sfSymfonyPluginManager.class.php
index ab89bf199..e68709ca1 100644
--- a/lib/vendor/symfony/lib/plugin/sfSymfonyPluginManager.class.php
+++ b/lib/vendor/symfony/lib/plugin/sfSymfonyPluginManager.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfSymfonyPluginManager.class.php 25218 2009-12-10 20:06:45Z Jonathan.Wage $
+ * @version    SVN: $Id$
  */
 class sfSymfonyPluginManager extends sfPluginManager
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/config/sfDoctrinePluginConfiguration.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/config/sfDoctrinePluginConfiguration.class.php
old mode 100644
new mode 100755
index f1afce076..57ac53f9d
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/config/sfDoctrinePluginConfiguration.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/config/sfDoctrinePluginConfiguration.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage doctrine
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrinePluginConfiguration.class.php 30445 2010-07-28 04:37:32Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDoctrinePluginConfiguration extends sfPluginConfiguration
 {
@@ -37,11 +37,11 @@ public function initialize()
       $this->dispatcher->connect('debug.web.load_panels', array('sfWebDebugPanelDoctrine', 'listenToAddPanelEvent'));
     }
 
-    if (!class_exists('Doctrine_Core', false))
+    if (!class_exists('Doctrine_Core'))
     {
-      require_once sfConfig::get('sf_doctrine_dir', realpath(dirname(__FILE__).'/../lib/vendor/doctrine')).'/Doctrine/Core.php';
+      require_once sfConfig::get('sf_doctrine_dir', realpath(dirname(__FILE__).'/../lib/vendor/doctrine/lib')).'/Doctrine/Core.php';
+      spl_autoload_register(array('Doctrine_Core', 'autoload'));
     }
-    spl_autoload_register(array('Doctrine_Core', 'autoload'));
 
     $manager = Doctrine_Manager::getInstance();
     $manager->setAttribute(Doctrine_Core::ATTR_EXPORT, Doctrine_Core::EXPORT_ALL);
@@ -53,11 +53,7 @@ public function initialize()
     // apply default attributes
     $manager->setDefaultAttributes();
 
-    if (method_exists($this->configuration, 'configureDoctrine'))
-    {
-      $this->configuration->configureDoctrine($manager);
-    }
-
+    // configure doctrine through the dispatcher
     $this->dispatcher->notify(new sfEvent($manager, 'doctrine.configure'));
 
     // make sure the culture is intercepted
@@ -80,13 +76,10 @@ public function getModelBuilderOptions()
       'baseClassName'        => 'sfDoctrineRecord',
     );
 
-    // for BC
-    $options = array_merge($options, sfConfig::get('doctrine_model_builder_options', array()));
-
     // filter options through the dispatcher
-    $options = $this->dispatcher->filter(new sfEvent($this, 'doctrine.filter_model_builder_options'), $options)->getReturnValue();
-
-    return $options;
+    return $this->dispatcher
+      ->filter(new sfEvent($this, 'doctrine.filter_model_builder_options'), $options)
+      ->getReturnValue();
   }
 
   /**
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrineFormBaseTemplate.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrineFormBaseTemplate.php
index d536e9702..81e961965 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrineFormBaseTemplate.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrineFormBaseTemplate.php
@@ -6,7 +6,7 @@
  * @package    ##PROJECT_NAME##
  * @subpackage form
  * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: sfDoctrineFormBaseTemplate.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class BaseFormDoctrine extends sfFormDoctrine
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrineFormGeneratedInheritanceTemplate.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrineFormGeneratedInheritanceTemplate.php
index 77895e8c0..9618c48f2 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrineFormGeneratedInheritanceTemplate.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrineFormGeneratedInheritanceTemplate.php
@@ -8,7 +8,7 @@
  * @package    ##PROJECT_NAME##
  * @subpackage form
  * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: sfDoctrineFormGeneratedInheritanceTemplate.php 29553 2010-05-20 14:33:00Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class Base<?php echo $this->modelName ?>Form extends <?php echo $this->getFormClassToExtend().PHP_EOL ?>
 {
@@ -48,36 +48,32 @@ public function updateDefaultsFromObject()
 <?php endforeach; ?>
   }
 
-  protected function doSave($con = null)
+  protected function doUpdateObject($values)
   {
 <?php foreach ($this->getManyToManyRelations() as $relation): ?>
-    $this->save<?php echo $relation['alias'] ?>List($con);
+    $this->update<?php echo $relation['alias'] ?>List($values);
 <?php endforeach; ?>
 
-    parent::doSave($con);
+    parent::doUpdateObject($values);
   }
 
 <?php foreach ($this->getManyToManyRelations() as $relation): ?>
-  public function save<?php echo $relation['alias'] ?>List($con = null)
+  public function update<?php echo $relation['alias'] ?>List($values)
   {
-    if (!$this->isValid())
-    {
-      throw $this->getErrorSchema();
-    }
-
     if (!isset($this->widgetSchema['<?php echo $this->underscore($relation['alias']) ?>_list']))
     {
       // somebody has unset this widget
       return;
     }
 
-    if (null === $con)
+    if (!array_key_exists('<?php echo $this->underscore($relation['alias']) ?>_list', $values))
     {
-      $con = $this->getConnection();
+      // no values for this widget
+      return;
     }
 
     $existing = $this->object-><?php echo $relation['alias']; ?>->getPrimaryKeys();
-    $values = $this->getValue('<?php echo $this->underscore($relation['alias']) ?>_list');
+    $values = $values['<?php echo $this->underscore($relation['alias']) ?>_list'];
     if (!is_array($values))
     {
       $values = array();
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrineFormGeneratedTemplate.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrineFormGeneratedTemplate.php
index 6e336d7ae..daf255cef 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrineFormGeneratedTemplate.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrineFormGeneratedTemplate.php
@@ -8,7 +8,7 @@
  * @package    ##PROJECT_NAME##
  * @subpackage form
  * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: sfDoctrineFormGeneratedTemplate.php 29553 2010-05-20 14:33:00Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class Base<?php echo $this->modelName ?>Form extends <?php echo $this->getFormClassToExtend().PHP_EOL ?>
 {
@@ -74,36 +74,32 @@ public function updateDefaultsFromObject()
 <?php endforeach; ?>
   }
 
-  protected function doSave($con = null)
+  protected function doUpdateObject($values)
   {
 <?php foreach ($this->getManyToManyRelations() as $relation): ?>
-    $this->save<?php echo $relation['alias'] ?>List($con);
+    $this->update<?php echo $relation['alias'] ?>List($values);
 <?php endforeach; ?>
 
-    parent::doSave($con);
+    parent::doUpdateObject($values);
   }
 
 <?php foreach ($this->getManyToManyRelations() as $relation): ?>
-  public function save<?php echo $relation['alias'] ?>List($con = null)
+  public function update<?php echo $relation['alias'] ?>List($values)
   {
-    if (!$this->isValid())
-    {
-      throw $this->getErrorSchema();
-    }
-
     if (!isset($this->widgetSchema['<?php echo $this->underscore($relation['alias']) ?>_list']))
     {
       // somebody has unset this widget
       return;
     }
 
-    if (null === $con)
+    if (!array_key_exists('<?php echo $this->underscore($relation['alias']) ?>_list', $values))
     {
-      $con = $this->getConnection();
+      // no values for this widget
+      return;
     }
 
     $existing = $this->object-><?php echo $relation['alias']; ?>->getPrimaryKeys();
-    $values = $this->getValue('<?php echo $this->underscore($relation['alias']) ?>_list');
+    $values = $values['<?php echo $this->underscore($relation['alias']) ?>_list'];
     if (!is_array($values))
     {
       $values = array();
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrineFormPluginTemplate.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrineFormPluginTemplate.php
index 489ccd9a4..0867ce52a 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrineFormPluginTemplate.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrineFormPluginTemplate.php
@@ -6,7 +6,7 @@
  * @package    ##PROJECT_NAME##
  * @subpackage form
  * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: sfDoctrineFormPluginTemplate.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class Plugin<?php echo $this->table->getOption('name') ?>Form extends Base<?php echo $this->table->getOption('name') ?>Form
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrineFormTemplate.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrineFormTemplate.php
index 55696f1e8..1d2355f07 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrineFormTemplate.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrineFormTemplate.php
@@ -6,7 +6,7 @@
  * @package    ##PROJECT_NAME##
  * @subpackage form
  * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: sfDoctrineFormTemplate.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class <?php echo $this->table->getOption('name') ?>Form extends Base<?php echo $this->table->getOption('name') ?>Form
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrinePluginFormTemplate.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrinePluginFormTemplate.php
index 72e8e2b06..c726ed5b8 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrinePluginFormTemplate.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineForm/default/template/sfDoctrinePluginFormTemplate.php
@@ -6,7 +6,7 @@
  * @package    ##PROJECT_NAME##
  * @subpackage form
  * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: sfDoctrinePluginFormTemplate.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class <?php echo $this->table->getOption('name') ?>Form extends Plugin<?php echo $this->table->getOption('name') ?>Form
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterBaseTemplate.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterBaseTemplate.php
index 87d921c85..eee2ff2ca 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterBaseTemplate.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterBaseTemplate.php
@@ -6,7 +6,7 @@
  * @package    ##PROJECT_NAME##
  * @subpackage filter
  * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: sfDoctrineFormFilterBaseTemplate.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class BaseFormFilterDoctrine extends sfFormFilterDoctrine
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedInheritanceTemplate.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedInheritanceTemplate.php
index 5435b1598..d69e649db 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedInheritanceTemplate.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedInheritanceTemplate.php
@@ -6,7 +6,7 @@
  * @package    ##PROJECT_NAME##
  * @subpackage filter
  * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: sfDoctrineFormFilterGeneratedInheritanceTemplate.php 29570 2010-05-21 14:49:47Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class Base<?php echo $this->table->getOption('name') ?>FormFilter extends <?php echo $this->getFormClassToExtend().PHP_EOL ?>
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedTemplate.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedTemplate.php
index 160aafaad..fe9f876dc 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedTemplate.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterGeneratedTemplate.php
@@ -6,7 +6,7 @@
  * @package    ##PROJECT_NAME##
  * @subpackage filter
  * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: sfDoctrineFormFilterGeneratedTemplate.php 29570 2010-05-21 14:49:47Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class Base<?php echo $this->table->getOption('name') ?>FormFilter extends <?php echo $this->getFormClassToExtend().PHP_EOL ?>
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterPluginTemplate.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterPluginTemplate.php
index 0ade15bcc..48be71416 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterPluginTemplate.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterPluginTemplate.php
@@ -6,7 +6,7 @@
  * @package    ##PROJECT_NAME##
  * @subpackage filter
  * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: sfDoctrineFormFilterPluginTemplate.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class Plugin<?php echo $this->table->getOption('name') ?>FormFilter extends Base<?php echo $this->table->getOption('name') ?>FormFilter
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterTemplate.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterTemplate.php
index 3bbd47114..a018c4674 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterTemplate.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrineFormFilterTemplate.php
@@ -6,7 +6,7 @@
  * @package    ##PROJECT_NAME##
  * @subpackage filter
  * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: sfDoctrineFormFilterTemplate.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class <?php echo $this->table->getOption('name') ?>FormFilter extends Base<?php echo $this->table->getOption('name') ?>FormFilter
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrinePluginFormFilterTemplate.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrinePluginFormFilterTemplate.php
index 34c43e37e..b6b28b8ae 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrinePluginFormFilterTemplate.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineFormFilter/default/template/sfDoctrinePluginFormFilterTemplate.php
@@ -6,7 +6,7 @@
  * @package    ##PROJECT_NAME##
  * @subpackage filter
  * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: sfDoctrinePluginFormFilterTemplate.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class <?php echo $this->table->getOption('name') ?>FormFilter extends Plugin<?php echo $this->table->getOption('name') ?>FormFilter
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/parts/batchAction.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/parts/batchAction.php
index 323a7e017..e2c181298 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/parts/batchAction.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/parts/batchAction.php
@@ -54,6 +54,8 @@ protected function executeBatchDelete(sfWebRequest $request)
 
     foreach ($records as $record)
     {
+      $this->dispatcher->notify(new sfEvent($this, 'admin.delete_object', array('object' => $record)));
+
       $record->delete();
     }
 
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/parts/configuration.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/parts/configuration.php
index e97d51fb1..6db4ec5d2 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/parts/configuration.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/parts/configuration.php
@@ -6,7 +6,7 @@
  * @package    ##PROJECT_NAME##
  * @subpackage <?php echo $this->getModuleName()."\n" ?>
  * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: configuration.php 24171 2009-11-19 16:37:50Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class Base<?php echo ucfirst($this->getModuleName()) ?>GeneratorConfiguration extends sfModelGeneratorConfiguration
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/skeleton/actions/actions.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/skeleton/actions/actions.class.php
index cb62481d0..9775945d9 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/skeleton/actions/actions.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/skeleton/actions/actions.class.php
@@ -9,7 +9,7 @@
  * @package    ##PROJECT_NAME##
  * @subpackage ##MODULE_NAME##
  * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: actions.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class ##MODULE_NAME##Actions extends auto##UC_MODULE_NAME##Actions
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/skeleton/lib/configuration.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/skeleton/lib/configuration.php
index df0351f9e..a9be3c522 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/skeleton/lib/configuration.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/skeleton/lib/configuration.php
@@ -6,7 +6,7 @@
  * @package    ##PROJECT_NAME##
  * @subpackage ##MODULE_NAME##
  * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: configuration.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class ##MODULE_NAME##GeneratorConfiguration extends Base##UC_MODULE_NAME##GeneratorConfiguration
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/skeleton/lib/helper.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/skeleton/lib/helper.php
index 46c54e4d6..7c93a5ca7 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/skeleton/lib/helper.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/skeleton/lib/helper.php
@@ -6,7 +6,7 @@
  * @package    ##PROJECT_NAME##
  * @subpackage ##MODULE_NAME##
  * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: helper.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class ##MODULE_NAME##GeneratorHelper extends Base##UC_MODULE_NAME##GeneratorHelper
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/template/actions/actions.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/template/actions/actions.class.php
index de1ba50ad..f893679dd 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/template/actions/actions.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/template/actions/actions.class.php
@@ -9,7 +9,7 @@
  * @package    ##PROJECT_NAME##
  * @subpackage <?php echo $this->getModuleName()."\n" ?>
  * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: actions.class.php 31002 2010-09-27 12:04:07Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class <?php echo $this->getGeneratedModuleName() ?>Actions extends <?php echo $this->getActionsBaseClass()."\n" ?>
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/template/lib/helper.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/template/lib/helper.php
index b41f2b5f4..5e89e69d0 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/template/lib/helper.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/admin/template/lib/helper.php
@@ -6,7 +6,7 @@
  * @package    ##PROJECT_NAME##
  * @subpackage <?php echo $this->getModuleName()."\n" ?>
  * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: helper.php 24171 2009-11-19 16:37:50Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class Base<?php echo ucfirst($this->getModuleName()) ?>GeneratorHelper extends sfModelGeneratorHelper
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/default/skeleton/actions/actions.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/default/skeleton/actions/actions.class.php
index ccafb8ce4..d3cb707be 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/default/skeleton/actions/actions.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/default/skeleton/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    ##PROJECT_NAME##
  * @subpackage ##MODULE_NAME##
  * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: actions.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class ##MODULE_NAME##Actions extends auto##MODULE_NAME##Actions
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/default/template/actions/actions.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/default/template/actions/actions.class.php
index 849efe54e..5284e28ae 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/default/template/actions/actions.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/data/generator/sfDoctrineModule/default/template/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    ##PROJECT_NAME##
  * @subpackage <?php echo $this->getModuleName()."\n" ?>
  * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: actions.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class <?php echo $this->getGeneratedModuleName() ?>Actions extends <?php echo $this->getActionsBaseClass() ?>
 
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/i18n/sf_admin.fr.xml b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/i18n/sf_admin.fr.xml
index 95a6c144a..cffa788aa 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/i18n/sf_admin.fr.xml
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/i18n/sf_admin.fr.xml
@@ -81,14 +81,6 @@
         <source>[0] no result|[1] 1 result|(1,+Inf] %1% results</source>
         <target>[0] aucun résultat|[1] 1 résultat|(1,+Inf] %1% résultats</target>
       </trans-unit>
-      <trans-unit>
-        <source>Are you sure?</source>
-        <target>Etes-vous sûr?</target>
-      </trans-unit>
-      <trans-unit>
-        <source>Checked</source>
-        <target>Activé</target>
-      </trans-unit>
 
       <!-- Pagination -->
       <trans-unit>
@@ -177,6 +169,43 @@
         <source><![CDATA[from %from_date%<br />to %to_date%]]></source>
         <target><![CDATA[du %from_date%<br />au %to_date%]]></target>
       </trans-unit>
+
+      <trans-unit>
+        <source>Required.</source>
+        <target>Obligatoire.</target>
+      </trans-unit>
+      <trans-unit>
+        <source>Invalid.</source>
+        <target>Invalide.</target>
+      </trans-unit>
+      <trans-unit>
+        <source><![CDATA["%value%" is not an integer.]]></source>
+        <target><![CDATA["%value%" n'est pas un nombre entier.]]></target>
+      </trans-unit>
+      <trans-unit>
+        <source><![CDATA["%value%" is not a number.]]></source>
+        <target><![CDATA["%value%" n'est pas un nombre.]]></target>
+      </trans-unit>
+      <trans-unit>
+        <source><![CDATA[At least %min% values must be selected (%count% values selected).]]></source>
+        <target><![CDATA[Au minimum %min% valeurs doivent être choisies (%count% choisies).]]></target>
+      </trans-unit>
+      <trans-unit>
+        <source><![CDATA[At most %max% values must be selected (%count% values selected).]]></source>
+        <target><![CDATA[Au maximum %max% valeurs doivent être choisies (%count% choisies).]]></target>
+      </trans-unit>
+      <trans-unit>
+        <source><![CDATA[CSRF attack detected.]]></source>
+        <target><![CDATA[Attaque CSRF détectée.]]></target>
+      </trans-unit>
+      <trans-unit>
+        <source>Are you sure?</source>
+        <target>Etes-vous sûr ?</target>
+      </trans-unit>
+      <trans-unit>
+        <source>Checked</source>
+        <target>Activé</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/cli/sfDoctrineCli.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/cli/sfDoctrineCli.class.php
index a67f80484..cdc198e55 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/cli/sfDoctrineCli.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/cli/sfDoctrineCli.class.php
@@ -16,7 +16,7 @@
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineCli.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDoctrineCli extends Doctrine_Cli
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionListener.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionListener.class.php
index 007c391bf..ad39b2aae 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionListener.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionListener.class.php
@@ -16,7 +16,7 @@
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineConnectionListener.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDoctrineConnectionListener extends Doctrine_EventListener
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionProfiler.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionProfiler.class.php
index 84c1d9365..0643cab71 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionProfiler.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineConnectionProfiler.class.php
@@ -2,11 +2,11 @@
 
 /**
  * Connection profiler.
- * 
+ *
  * @package    sfDoctrinePlugin
  * @subpackage database
  * @author     Kris Wallsmith <kris.wallsmith@symfony-project.com>
- * @version    SVN: $Id: sfDoctrineConnectionProfiler.class.php 20157 2009-07-13 17:00:12Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDoctrineConnectionProfiler extends Doctrine_Connection_Profiler
 {
@@ -16,12 +16,12 @@ class sfDoctrineConnectionProfiler extends Doctrine_Connection_Profiler
 
   /**
    * Constructor.
-   * 
+   *
    * Available options:
-   * 
+   *
    *  * logging:              Whether to notify query logging events (defaults to false)
    *  * slow_query_threshold: How many seconds a query must take to be considered slow (defaults to 1)
-   * 
+   *
    * @param sfEventDispatcher $dispatcher
    * @param array             $options
    */
@@ -36,9 +36,9 @@ public function __construct(sfEventDispatcher $dispatcher, $options = array())
 
   /**
    * Returns an option value.
-   * 
+   *
    * @param  string $name
-   * 
+   *
    * @return mixed
    */
   public function getOption($name)
@@ -48,7 +48,7 @@ public function getOption($name)
 
   /**
    * Sets an option value.
-   * 
+   *
    * @param string $name
    * @param mixed  $value
    */
@@ -59,7 +59,7 @@ public function setOption($name, $value)
 
   /**
    * Logs time and a connection query on behalf of the connection.
-   * 
+   *
    * @param Doctrine_Event $event
    */
   public function preQuery(Doctrine_Event $event)
@@ -77,12 +77,12 @@ public function preQuery(Doctrine_Event $event)
 
   /**
    * Logs to the timer.
-   * 
+   *
    * @param Doctrine_Event $event
    */
   public function postQuery(Doctrine_Event $event)
   {
-    sfTimerManager::getTimer('Database (Doctrine)')->addTime();
+    sfTimerManager::getTimer('Database (Doctrine)', false)->addTime();
 
     $args = func_get_args();
     $this->__call(__FUNCTION__, $args);
@@ -95,7 +95,7 @@ public function postQuery(Doctrine_Event $event)
 
   /**
    * Logs a connection exec on behalf of the connection.
-   * 
+   *
    * @param Doctrine_Event $event
    */
   public function preExec(Doctrine_Event $event)
@@ -113,12 +113,12 @@ public function preExec(Doctrine_Event $event)
 
   /**
    * Logs to the timer.
-   * 
+   *
    * @param Doctrine_Event $event
    */
   public function postExec(Doctrine_Event $event)
   {
-    sfTimerManager::getTimer('Database (Doctrine)')->addTime();
+    sfTimerManager::getTimer('Database (Doctrine)', false)->addTime();
 
     $args = func_get_args();
     $this->__call(__FUNCTION__, $args);
@@ -131,7 +131,7 @@ public function postExec(Doctrine_Event $event)
 
   /**
    * Logs a statement execute on behalf of the statement.
-   * 
+   *
    * @param Doctrine_Event $event
    */
   public function preStmtExecute(Doctrine_Event $event)
@@ -149,12 +149,12 @@ public function preStmtExecute(Doctrine_Event $event)
 
   /**
    * Logs to the timer.
-   * 
+   *
    * @param Doctrine_Event $event
    */
   public function postStmtExecute(Doctrine_Event $event)
   {
-    sfTimerManager::getTimer('Database (Doctrine)')->addTime();
+    sfTimerManager::getTimer('Database (Doctrine)', false)->addTime();
 
     $args = func_get_args();
     $this->__call(__FUNCTION__, $args);
@@ -186,13 +186,18 @@ public function getQueryExecutionEvents()
 
   /**
    * Fixes query parameters for logging.
-   * 
+   *
    * @param  array $params
-   * 
+   *
    * @return array
    */
   static public function fixParams($params)
   {
+    if (!is_array($params))
+    {
+      return array();
+    }
+
     foreach ($params as $key => $param)
     {
       if (strlen($param) >= 255)
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineDatabase.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineDatabase.class.php
index 58a67ed96..9e3847025 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineDatabase.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/database/sfDoctrineDatabase.class.php
@@ -16,7 +16,7 @@
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineDatabase.class.php 28902 2010-03-30 20:57:27Z Jonathan.Wage $
+ * @version    SVN: $Id$
  */
 class sfDoctrineDatabase extends sfDatabase
 {
@@ -103,19 +103,6 @@ public function initialize($parameters = array())
       $this->_doctrineConnection->addListener($this->profiler, 'symfony_profiler');
     }
 
-    // Invoke the configuration methods for the connection if they exist (deprecated in favor of the "doctrine.configure_connection" event)
-    $method = sprintf('configureDoctrineConnection%s', ucwords($this->_doctrineConnection->getName()));
-
-    if (method_exists($configuration, 'configureDoctrineConnection') && ! method_exists($configuration, $method))
-    {
-      $configuration->configureDoctrineConnection($this->_doctrineConnection);
-    }
-
-    if (method_exists($configuration, $method))
-    {
-      $configuration->$method($this->_doctrineConnection);
-    }
-
     $dispatcher->notify(new sfEvent($manager, 'doctrine.configure_connection', array('connection' => $this->_doctrineConnection, 'database' => $this)));
   }
 
@@ -131,7 +118,7 @@ public function getDoctrineConnection()
 
   /**
    * Returns the connection profiler.
-   * 
+   *
    * @return sfDoctrineConnectionProfiler|null
    */
   public function getProfiler()
@@ -160,9 +147,9 @@ public function shutdown()
     {
       $this->connection = null;
     }
-    if ($this->_doctrineConnection !== null) 
-    { 
-      $this->_doctrineConnection->getManager()->closeConnection($this->_doctrineConnection); 
+    if ($this->_doctrineConnection !== null)
+    {
+      $this->_doctrineConnection->getManager()->closeConnection($this->_doctrineConnection);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/debug/sfWebDebugPanelDoctrine.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/debug/sfWebDebugPanelDoctrine.class.php
index 29e064314..e7477b34d 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/debug/sfWebDebugPanelDoctrine.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/debug/sfWebDebugPanelDoctrine.class.php
@@ -16,7 +16,7 @@
  * @subpackage debug
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfWebDebugPanelDoctrine.class.php 28999 2010-04-06 17:42:14Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfWebDebugPanelDoctrine extends sfWebDebugPanel
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/form/sfFormDoctrine.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/form/sfFormDoctrine.class.php
index 3a0100cd7..6fbadf82d 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/form/sfFormDoctrine.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/form/sfFormDoctrine.class.php
@@ -18,7 +18,7 @@
  * @subpackage form
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfFormDoctrine.class.php 32740 2011-07-09 09:24:03Z fabien $
+ * @version    SVN: $Id$
  */
 abstract class sfFormDoctrine extends sfFormObject
 {
@@ -187,7 +187,7 @@ public function processValues($values)
         if ($this->validatorSchema[$field] instanceof sfValidatorFile)
         {
           $values[$field] = $this->processUploadedFile($field, null, $valuesToProcess);
-        }          
+        }
       }
     }
 
@@ -341,7 +341,20 @@ protected function removeFile($field)
     }
 
     $directory = $this->validatorSchema[$field]->getOption('path');
-    if ($directory && is_file($file = $directory.'/'.$this->getObject()->$field))
+    $filename = $this->getObject()->$field;
+
+    // this is needed if the form is embedded, in which case
+    // the parent form has already changed the value of the field
+    if (!is_string($filename))
+    {
+      $oldValues = $this->getObject()->getModified(true, false);
+      if (isset($oldValues[$field]))
+      {
+        $filename = $oldValues[$field];
+      }
+    }
+
+    if ($directory && $filename && is_file($file = $directory.'/'.$filename))
     {
       unlink($file);
     }
@@ -382,11 +395,6 @@ protected function saveFile($field, $filename = null, sfValidatedFile $file = nu
     {
       return $file->save($this->getObject()->$method($file));
     }
-    else if (method_exists($this->getObject(), $method = sprintf('generate%sFilename', $field)))
-    {
-      // this non-camelized method name has been deprecated
-      return $file->save($this->getObject()->$method($file));
-    }
     else
     {
       return $file->save();
@@ -402,11 +410,11 @@ protected function setupInheritance()
 
   /**
    * Returns the name of the related model.
-   * 
+   *
    * @param string $alias A relation alias
-   * 
+   *
    * @return string
-   * 
+   *
    * @throws InvalidArgumentException If no relation with the supplied alias exists on the current model
    */
   protected function getRelatedModelName($alias)
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/form/sfFormFilterDoctrine.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/form/sfFormFilterDoctrine.class.php
index e644c307c..8354e5bf5 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/form/sfFormFilterDoctrine.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/form/sfFormFilterDoctrine.class.php
@@ -21,7 +21,7 @@
  * @subpackage form
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfFormFilterDoctrine.class.php 32740 2011-07-09 09:24:03Z fabien $
+ * @version    SVN: $Id$
  */
 abstract class sfFormFilterDoctrine extends sfFormFilter
 {
@@ -64,7 +64,7 @@ public function setTableMethod($tableMethod)
 
   /**
    * Sets the query object to use.
-   * 
+   *
    * @param Doctrine_Query $query
    */
   public function setQuery($query)
@@ -290,11 +290,11 @@ protected function setupInheritance()
 
   /**
    * Returns the name of the related model.
-   * 
+   *
    * @param string $alias A relation alias
-   * 
+   *
    * @return string
-   * 
+   *
    * @throws InvalidArgumentException If no relation with the supplied alias exists on the current model
    */
   protected function getRelatedModelName($alias)
@@ -323,7 +323,7 @@ protected function getFieldName($colName)
 
   protected function camelize($text)
   {
-    return sfToolkit::pregtr($text, array('#/(.?)#e' => "'::'.strtoupper('\\1')", '/(^|_|-)+(.)/e' => "strtoupper('\\2')"));
+    return strtr(ucwords(strtr($text, array('/' => ':: ', '_' => ' ', '-' => ' '))), array(' ' => ''));
   }
 
   protected function getTable()
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineColumn.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineColumn.class.php
index 6f77fa106..6611f26a3 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineColumn.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineColumn.class.php
@@ -16,7 +16,7 @@
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineColumn.class.php 24604 2009-11-30 21:00:46Z Jonathan.Wage $
+ * @version    SVN: $Id$
  */
 class sfDoctrineColumn implements ArrayAccess
 {
@@ -48,6 +48,14 @@ class sfDoctrineColumn implements ArrayAccess
    */
   protected $foreignClassName = null;
 
+  /**
+   * Store the name of the related column for this column if it is
+   * a foreign key
+   *
+   * @var string
+   */
+  protected $foreignFieldName = null;
+
   /**
    * Doctrine_Table instance this column belongs to
    *
@@ -69,6 +77,12 @@ class sfDoctrineColumn implements ArrayAccess
    */
   protected $definition = array();
 
+  /**
+   * Constructor
+   *
+   * @param string $name
+   * @param Doctrine_Table $table
+   */
   public function __construct($name, Doctrine_Table $table)
   {
     $this->name = $name;
@@ -171,16 +185,16 @@ public function getDefinitionKey($key)
     if ($this->hasDefinitionKey($key))
     {
       return $this->definition[$key];
-    } else {
-      return false;
     }
+
+    return false;
   }
 
   /**
    * Returns a value from the current column's relation.
-   * 
+   *
    * @param string $key
-   * 
+   *
    * @return mixed|null
    */
   public function getRelationKey($key)
@@ -194,6 +208,8 @@ public function getRelationKey($key)
         return $relation[$key];
       }
     }
+
+    return null;
   }
 
   /**
@@ -207,10 +223,12 @@ public function isNotNull()
     {
       return $this->definition['notnull'];
     }
+
     if (isset($this->definition['notblank']))
     {
       return $this->definition['notblank'];
     }
+
     return false;
   }
 
@@ -225,6 +243,7 @@ public function isPrimaryKey()
     {
       return $this->definition['primary'];
     }
+
     return false;
   }
 
@@ -252,9 +271,15 @@ public function isForeignKey()
       if (in_array(strtolower($this->name), $local))
       {
         $this->foreignClassName = $relation['class'];
+        if ($relation->getType() === Doctrine_Relation::ONE)
+        {
+          $this->foreignFieldName = $relation['foreign'];
+        }
+
         return true;
       }
     }
+
     return false;
   }
 
@@ -268,9 +293,24 @@ public function getForeignClassName()
     if ($this->isForeignKey())
     {
       return $this->foreignClassName;
-    } else {
-      return false;
     }
+
+    return false;
+  }
+
+  /**
+   * Get the name of the related field for this column foreign key.
+   *
+   * @return string
+   */
+  public function getForeignFieldName()
+  {
+    if ($this->isForeignKey())
+    {
+      return $this->foreignFieldName;
+    }
+
+    return false;
   }
 
   /**
@@ -283,9 +323,9 @@ public function getForeignTable()
     if ($this->isForeignKey())
     {
       return Doctrine_Core::getTable($this->foreignClassName);
-    } else {
-      return false;
     }
+
+    return false;
   }
 
   /**
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php
index 2a7cf8a15..ec8354651 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormFilterGenerator.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage generator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfDoctrineFormFilterGenerator.class.php 27842 2010-02-10 19:42:03Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDoctrineFormFilterGenerator extends sfDoctrineFormGenerator
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php
index fc7713b8d..ab372889b 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineFormGenerator.class.php
@@ -18,7 +18,7 @@
  * @subpackage generator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineFormGenerator.class.php 29661 2010-05-28 16:56:42Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDoctrineFormGenerator extends sfGenerator
 {
@@ -136,7 +136,7 @@ public function generate($params = array())
    * Get all the models which are a part of a plugin and the name of the plugin.
    * The array format is modelName => pluginName
    *
-   * @todo This method is ugly and is a very weird way of finding the models which 
+   * @todo This method is ugly and is a very weird way of finding the models which
    *       belong to plugins. If we could come up with a better way that'd be great
    * @return array $pluginModels
    */
@@ -167,10 +167,14 @@ public function getPluginModels()
             if ($reflection->isSubClassOf($parent))
             {
               $this->pluginModels[$modelName] = $pluginName;
-              $generators = Doctrine_Core::getTable($modelName)->getGenerators();
-              foreach ($generators as $generator)
+
+              if ($reflection->isInstantiable())
               {
-                $this->pluginModels[$generator->getOption('className')] = $pluginName;
+                $generators = Doctrine_Core::getTable($modelName)->getGenerators();
+                foreach ($generators as $generator)
+                {
+                  $this->pluginModels[$generator->getOption('className')] = $pluginName;
+                }
               }
             }
           }
@@ -184,7 +188,7 @@ public function getPluginModels()
   /**
    * Check to see if a model is part of a plugin
    *
-   * @param string $modelName 
+   * @param string $modelName
    * @return boolean $bool
    */
   public function isPluginModel($modelName)
@@ -195,7 +199,7 @@ public function isPluginModel($modelName)
   /**
    * Get the name of the plugin a model belongs to
    *
-   * @param string $modelName 
+   * @param string $modelName
    * @return string $pluginName
    */
   public function getPluginNameForModel($modelName)
@@ -238,7 +242,7 @@ public function getManyToManyRelations()
    *
    * This method does not returns foreign keys that are also primary keys.
    *
-   * @return array An array composed of: 
+   * @return array An array composed of:
    *                 * The foreign table PHP name
    *                 * The foreign key PHP name
    *                 * A Boolean to indicate whether the column is required or not
@@ -332,7 +336,7 @@ public function getWidgetClassForColumn($column)
    * Returns a PHP string representing options to pass to a widget for a given column.
    *
    * @param sfDoctrineColumn $column
-   * 
+   *
    * @return string The options to pass to the widget as a PHP string
    */
   public function getWidgetOptionsForColumn($column)
@@ -429,7 +433,14 @@ public function getValidatorOptionsForColumn($column)
 
     if ($column->isForeignKey())
     {
-      $options[] = sprintf('\'model\' => $this->getRelatedModelName(\'%s\')', $column->getRelationKey('alias'));
+      if ($foreignColumn = $column->getForeignTable()->getColumnName($column->getForeignFieldName()))
+      {
+        $options[] = sprintf('\'model\' => $this->getRelatedModelName(\'%s\'), \'column\' => \'%s\'', $column->getRelationKey('alias'), $foreignColumn);
+      }
+      else
+      {
+        $options[] = sprintf('\'model\' => $this->getRelatedModelName(\'%s\')', $column->getRelationKey('alias'));
+      }
     }
     else if ($column->isPrimaryKey())
     {
@@ -559,6 +570,26 @@ public function getColumns()
       $columns[] = new sfDoctrineColumn($name, $this->table);
     }
 
+    // add relations to columns for inherited classes
+    if ($parentModel)
+    {
+      $parentRelationNames = array_keys(Doctrine_Core::getTable($parentModel)->getRelations());
+      $relations = $this->table->getRelations();
+      $relationColumns = array();
+      foreach (array_diff(array_keys($relations), $parentRelationNames) as $relationName)
+      {
+        if (Doctrine_Relation::ONE == $relations[$relationName]->getType())
+        {
+          $columnName = $relations[$relationName]->getLocal();
+          if (!in_array($columnName, $relationColumns))
+          {
+            $relationColumns[] = $columnName;
+            $columns[] = new sfDoctrineColumn($columnName, $this->table);
+          }
+        }
+      }
+    }
+
     return $columns;
   }
 
@@ -652,7 +683,7 @@ protected function arrayExport($values)
 
   /**
    * Returns the name of the model class this model extends.
-   * 
+   *
    * @return string|null
    */
   public function getParentModel()
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineGenerator.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineGenerator.class.php
index f17199d57..743f20f03 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineGenerator.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/generator/sfDoctrineGenerator.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfDoctrineGenerator.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDoctrineGenerator extends sfModelGenerator
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/mailer/Swift_DoctrineSpool.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/mailer/Swift_DoctrineSpool.class.php
index 7665aee84..01a520ec6 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/mailer/Swift_DoctrineSpool.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/mailer/Swift_DoctrineSpool.class.php
@@ -21,7 +21,7 @@
  * @package    symfony
  * @subpackage mailer
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: Swift_DoctrineSpool.class.php 31249 2010-10-26 13:57:10Z fabien $
+ * @version    SVN: $Id$
  */
 class Swift_DoctrineSpool extends Swift_ConfigurableSpool
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/pager/sfDoctrinePager.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/pager/sfDoctrinePager.class.php
index 27b255395..9592575f1 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/pager/sfDoctrinePager.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/pager/sfDoctrinePager.class.php
@@ -15,7 +15,7 @@
  * @package    sfDoctrinePlugin
  * @subpackage pager
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrinePager.class.php 28897 2010-03-30 20:30:24Z Jonathan.Wage $
+ * @version    SVN: $Id$
  */
 class sfDoctrinePager extends sfPager implements Serializable
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecord.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecord.class.php
index d60fb71d4..c281b3358 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecord.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecord.class.php
@@ -17,7 +17,7 @@
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineRecord.class.php 29659 2010-05-28 16:49:48Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class sfDoctrineRecord extends Doctrine_Record
 {
@@ -207,17 +207,23 @@ public function __call($method, $arguments)
   }
 
   /**
-   * Get the Doctrine date value as a PHP DateTime object
+   * Get the Doctrine date value as a PHP DateTime object, null if the value is not set
    *
    * @param string $dateFieldName   The field name to get the DateTime object for
-   * @return DateTime $dateTime     The instance of PHPs DateTime
+   *
+   * @return DateTime|null $dateTime     The instance of PHPs DateTime
+   * @throws sfException if the field is not one of date, datetime, or timestamp types
    */
   public function getDateTimeObject($dateFieldName)
   {
     $type = $this->getTable()->getTypeOf($dateFieldName);
     if ($type == 'date' || $type == 'timestamp' || $type == 'datetime')
     {
-      return new DateTime($this->get($dateFieldName));
+      $datetime = $this->get($dateFieldName);
+      if ($datetime)
+      {
+        return new DateTime($datetime);
+      }
     }
     else
     {
@@ -230,13 +236,19 @@ public function getDateTimeObject($dateFieldName)
    *
    * @param string $dateFieldName       The field name to set the date for
    * @param DateTime $dateTimeObject    The DateTime instance to use to set the value
-   * @return void
+   *
+   * @return sfDoctrineRecord
+   * @throws sfException if the field is not one of date, datetime, or timestamp types
    */
-  public function setDateTimeObject($dateFieldName, DateTime $dateTimeObject)
+  public function setDateTimeObject($dateFieldName, DateTime $dateTimeObject = null)
   {
     $type = $this->getTable()->getTypeOf($dateFieldName);
     if ($type == 'date' || $type == 'timestamp' || $type == 'datetime')
     {
+      if (null === $dateTimeObject)
+      {
+        return $this->set($dateFieldName, null);
+      }
       return $this->set($dateFieldName, $dateTimeObject->format('Y-m-d H:i:s'));
     }
     else
@@ -244,4 +256,4 @@ public function setDateTimeObject($dateFieldName, DateTime $dateTimeObject)
       throw new sfException('Cannot call setDateTimeObject() on a field that is not of type date or timestamp.');
     }
   }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecordI18nFilter.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecordI18nFilter.class.php
index 5b9cb6d96..348bc8b48 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecordI18nFilter.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/record/sfDoctrineRecordI18nFilter.class.php
@@ -15,7 +15,7 @@
  * @package    symfony
  * @subpackage doctrine
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineRecordI18nFilter.class.php 24337 2009-11-24 14:37:03Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDoctrineRecordI18nFilter extends Doctrine_Record_Filter
 {
@@ -51,14 +51,13 @@ public function filterSet(Doctrine_Record $record, $name, $value)
   public function filterGet(Doctrine_Record $record, $name)
   {
     $culture = sfDoctrineRecord::getDefaultCulture();
-    if (isset($record['Translation'][$culture]))
+    if (isset($record['Translation'][$culture]) && '' != $record['Translation'][$culture][$name])
     {
       return $record['Translation'][$culture][$name];
     }
-    else
-    {
-      $defaultCulture = sfConfig::get('sf_default_culture');
-      return $record['Translation'][$defaultCulture][$name];
-    }
+
+    $defaultCulture = sfConfig::get('sf_default_culture');
+
+    return $record['Translation'][$defaultCulture][$name];
   }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/routing/sfDoctrineRoute.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/routing/sfDoctrineRoute.class.php
index c1e10a56e..7aa937ead 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/routing/sfDoctrineRoute.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/routing/sfDoctrineRoute.class.php
@@ -18,7 +18,7 @@
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineRoute.class.php 28633 2010-03-20 14:35:57Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDoctrineRoute extends sfObjectRoute
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/routing/sfDoctrineRouteCollection.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/routing/sfDoctrineRouteCollection.class.php
index 5cc51d51d..35f1048f7 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/routing/sfDoctrineRouteCollection.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/routing/sfDoctrineRouteCollection.class.php
@@ -16,7 +16,7 @@
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineRouteCollection.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDoctrineRouteCollection extends sfObjectRouteCollection
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/sfDoctrineException.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/sfDoctrineException.class.php
index 3b0182e4f..82042e207 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/sfDoctrineException.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/sfDoctrineException.class.php
@@ -16,7 +16,7 @@
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineException.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDoctrineException extends sfException
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php
index f0de5f60b..40fcb082c 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBaseTask.class.php
@@ -16,7 +16,7 @@
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineBaseTask.class.php 28976 2010-04-05 00:27:39Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class sfDoctrineBaseTask extends sfBaseTask
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildDbTask.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildDbTask.class.php
index 8064660c7..9559d3dab 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildDbTask.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildDbTask.class.php
@@ -18,7 +18,7 @@
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineBuildDbTask.class.php 24341 2009-11-24 15:01:58Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDoctrineBuildDbTask extends sfDoctrineBaseTask
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFiltersTask.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFiltersTask.class.php
index f3af8b488..885e72672 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFiltersTask.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFiltersTask.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfDoctrineBuildFiltersTask.class.php 23927 2009-11-14 16:10:57Z fabien $
+ * @version    SVN: $Id$
  */
 class sfDoctrineBuildFiltersTask extends sfDoctrineBaseTask
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFormsTask.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFormsTask.class.php
index 6db048ab5..a76ca2347 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFormsTask.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildFormsTask.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfDoctrineBuildFormsTask.class.php 23927 2009-11-14 16:10:57Z fabien $
+ * @version    SVN: $Id$
  */
 class sfDoctrineBuildFormsTask extends sfDoctrineBaseTask
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildModelTask.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildModelTask.class.php
index 9f8f111d6..7be173e4d 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildModelTask.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildModelTask.class.php
@@ -18,7 +18,7 @@
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineBuildModelTask.class.php 30901 2010-09-13 17:41:16Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDoctrineBuildModelTask extends sfDoctrineBaseTask
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSchemaTask.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSchemaTask.class.php
index 66cf20d10..d6b9026d6 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSchemaTask.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSchemaTask.class.php
@@ -18,7 +18,7 @@
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineBuildSchemaTask.class.php 23922 2009-11-14 14:58:38Z fabien $
+ * @version    SVN: $Id$
  */
 class sfDoctrineBuildSchemaTask extends sfDoctrineBaseTask
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSqlTask.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSqlTask.class.php
index 56f5c7bd6..f3358055f 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSqlTask.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildSqlTask.class.php
@@ -18,7 +18,7 @@
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineBuildSqlTask.class.php 23922 2009-11-14 14:58:38Z fabien $
+ * @version    SVN: $Id$
  */
 class sfDoctrineBuildSqlTask extends sfDoctrineBaseTask
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildTask.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildTask.class.php
index 4e2d0d65d..4928cd18d 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildTask.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineBuildTask.class.php
@@ -17,7 +17,7 @@
  * @package    sfDoctrinePlugin
  * @subpackage task
  * @author     Kris Wallsmith <kris.wallsmith@symfony-project.com>
- * @version    SVN: $Id: sfDoctrineBuildTask.class.php 23156 2009-10-17 13:08:16Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDoctrineBuildTask extends sfDoctrineBaseTask
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCleanModelFilesTask.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCleanModelFilesTask.class.php
index 202dcd8ea..e963f0560 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCleanModelFilesTask.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCleanModelFilesTask.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage doctrine
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineCleanModelFilesTask.class.php 29677 2010-05-30 14:19:33Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDoctrineCleanModelFilesTask extends sfDoctrineBaseTask
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCompileTask.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCompileTask.class.php
new file mode 100644
index 000000000..11a9224e6
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCompileTask.class.php
@@ -0,0 +1,79 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * (c) Jonathan H. Wage <jonwage@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once(dirname(__FILE__).'/sfDoctrineBaseTask.class.php');
+
+/**
+ * Compile Doctrine
+ *
+ * @package    symfony
+ * @subpackage doctrine
+ * @author     Jerome Tamarelle <jerome@tamarelle.net>
+ * @version    SVN: $Id: sfDoctrineCompileTask.class.php 105 2012-03-22 16:26:34Z jtamarelle $
+ */
+class sfDoctrineCompileTask extends sfDoctrineBaseTask
+{
+  /**
+   * @see sfTask
+   */
+  protected function configure()
+  {
+    $this->addArguments(array(
+      new sfCommandArgument('database', sfCommandArgument::OPTIONAL | sfCommandArgument::IS_ARRAY, 'A specific database'),
+    ));
+
+    $this->addOptions(array(
+      new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
+      new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+      new sfCommandOption('no-confirmation', null, sfCommandOption::PARAMETER_NONE, 'Whether to force dropping of the database')
+    ));
+
+    $this->namespace = 'doctrine';
+    $this->name = 'compile';
+    $this->briefDescription = 'Compile doctrine into the cache directory';
+
+    $this->detailedDescription = <<<EOF
+The [doctrine:compile|INFO] task generated a compiled Doctrine file:
+
+  [./symfony doctrine:compile|INFO]
+EOF;
+  }
+
+  /**
+   * @see sfTask
+   */
+  protected function execute($arguments = array(), $options = array())
+  {
+    $databaseManager = new sfDatabaseManager($this->configuration);
+
+    $compiledFile = sfConfig::get('sf_cache_dir') . '/doctrine.compiled.php';
+
+    if (file_exists($compiledFile))
+    {
+      $this->logSection('error', $compiledFile.' already exists', null, 'ERROR');
+      $this->logBlock('Run symfony:cache-clear first', 'INFO');
+      return;
+    }
+
+    $drivers = array();
+    foreach ($databaseManager->getNames() as $name)
+    {
+      $drivers[] = strtolower($databaseManager->getDatabase($name)->getDoctrineConnection()->getDriverName());
+    }
+    $drivers = array_unique($drivers);
+
+    $this->logSection('compile', 'Included drivers: '.implode(', ', $drivers));
+
+    Doctrine_Core::compile($compiledFile, $drivers);
+
+    $this->logSection('file+', $compiledFile);
+  }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineConfigureDatabaseTask.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineConfigureDatabaseTask.class.php
index 62500e471..26cfa77e2 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineConfigureDatabaseTask.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineConfigureDatabaseTask.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfDoctrineConfigureDatabaseTask.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDoctrineConfigureDatabaseTask extends sfBaseTask
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCreateModelTablesTask.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCreateModelTablesTask.class.php
index 910996db9..3fce70c2b 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCreateModelTablesTask.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineCreateModelTablesTask.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage doctrine
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineCreateModelTablesTask.class.php 23922 2009-11-14 14:58:38Z fabien $
+ * @version    SVN: $Id$
  */
 class sfDoctrineCreateModelTables extends sfDoctrineBaseTask
 {
@@ -29,6 +29,7 @@ protected function configure()
     $this->addOptions(array(
       new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', 'frontend'),
       new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
+      new sfCommandOption('skip-build', null, sfCommandOption::PARAMETER_NONE, 'Skip the doctrine:build-model task.')
     ));
 
     $this->namespace = 'doctrine';
@@ -46,10 +47,13 @@ protected function execute($arguments = array(), $options = array())
   {
     $databaseManager = new sfDatabaseManager($this->configuration);
 
-    $buildModel = new sfDoctrineBuildModelTask($this->dispatcher, $this->formatter);
-    $buildModel->setCommandApplication($this->commandApplication);
-    $buildModel->setConfiguration($this->configuration);
-    $ret = $buildModel->run();
+    if (!$options['skip-build'])
+    {
+      $buildModel = new sfDoctrineBuildModelTask($this->dispatcher, $this->formatter);
+      $buildModel->setCommandApplication($this->commandApplication);
+      $buildModel->setConfiguration($this->configuration);
+      $buildModel->run();
+    }
 
     $connections = array();
     $models = $arguments['models'];
@@ -88,4 +92,4 @@ protected function execute($arguments = array(), $options = array())
       Doctrine_Core::createTablesFromArray($models);
     }
   }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataDumpTask.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataDumpTask.class.php
index 6c8c9fc08..2de4d8006 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataDumpTask.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataDumpTask.class.php
@@ -18,7 +18,7 @@
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineDataDumpTask.class.php 23922 2009-11-14 14:58:38Z fabien $
+ * @version    SVN: $Id$
  */
 class sfDoctrineDataDumpTask extends sfDoctrineBaseTask
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataLoadTask.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataLoadTask.class.php
index b9ae2ad91..c3874834b 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataLoadTask.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDataLoadTask.class.php
@@ -18,7 +18,7 @@
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineDataLoadTask.class.php 23922 2009-11-14 14:58:38Z fabien $
+ * @version    SVN: $Id$
  */
 class sfDoctrineDataLoadTask extends sfDoctrineBaseTask
 {
@@ -35,6 +35,7 @@ protected function configure()
       new sfCommandOption('application', null, sfCommandOption::PARAMETER_OPTIONAL, 'The application name', true),
       new sfCommandOption('env', null, sfCommandOption::PARAMETER_REQUIRED, 'The environment', 'dev'),
       new sfCommandOption('append', null, sfCommandOption::PARAMETER_NONE, 'Don\'t delete current data in the database'),
+      new sfCommandOption('charset', null, sfCommandOption::PARAMETER_OPTIONAL, 'Specify charset'),
     ));
 
     $this->namespace = 'doctrine';
@@ -77,6 +78,7 @@ protected function execute($arguments = array(), $options = array())
     $doctrineArguments = array(
       'data_fixtures_path' => $arguments['dir_or_file'],
       'append'             => $options['append'],
+      'charset'            => $options['charset'],
     );
 
     foreach ($arguments['dir_or_file'] as $target)
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDeleteModelFilesTask.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDeleteModelFilesTask.class.php
index 6a6a8874e..166faa2dc 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDeleteModelFilesTask.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDeleteModelFilesTask.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage doctrine
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineDeleteModelFilesTask.class.php 29677 2010-05-30 14:19:33Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDoctrineDeleteModelFilesTask extends sfDoctrineBaseTask
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDqlTask.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDqlTask.class.php
index a02744dc3..4e052d103 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDqlTask.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDqlTask.class.php
@@ -18,7 +18,7 @@
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineDqlTask.class.php 24625 2009-12-01 00:05:40Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDoctrineDqlTask extends sfDoctrineBaseTask
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDropDbTask.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDropDbTask.class.php
index bc3210a2d..e62941d7c 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDropDbTask.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineDropDbTask.class.php
@@ -18,7 +18,7 @@
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineDropDbTask.class.php 24341 2009-11-24 15:01:58Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDoctrineDropDbTask extends sfDoctrineBaseTask
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateAdminTask.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateAdminTask.class.php
index c94affccf..6a99216a5 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateAdminTask.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateAdminTask.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfDoctrineGenerateAdminTask.class.php 28809 2010-03-26 17:19:58Z Jonathan.Wage $
+ * @version    SVN: $Id$
  */
 class sfDoctrineGenerateAdminTask extends sfDoctrineBaseTask
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationTask.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationTask.class.php
index e9c7b9313..dfd899303 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationTask.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationTask.class.php
@@ -18,7 +18,7 @@
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineGenerateMigrationTask.class.php 24390 2009-11-25 18:21:06Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDoctrineGenerateMigrationTask extends sfDoctrineBaseTask
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDbTask.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDbTask.class.php
index 41c31cdea..3b67ffac8 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDbTask.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDbTask.class.php
@@ -18,7 +18,7 @@
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineGenerateMigrationsDbTask.class.php 23922 2009-11-14 14:58:38Z fabien $
+ * @version    SVN: $Id$
  */
 class sfDoctrineGenerateMigrationsDbTask extends sfDoctrineBaseTask
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDiffTask.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDiffTask.class.php
index 99d145f8e..77ed3bd8a 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDiffTask.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsDiffTask.class.php
@@ -18,7 +18,7 @@
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineGenerateMigrationsDiffTask.class.php 28871 2010-03-29 17:28:03Z Jonathan.Wage $
+ * @version    SVN: $Id$
  */
 class sfDoctrineGenerateMigrationsDiffTask extends sfDoctrineBaseTask
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsModelsTask.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsModelsTask.class.php
index d8f175fb4..b5bf20f6b 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsModelsTask.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateMigrationsModelsTask.class.php
@@ -18,7 +18,7 @@
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineGenerateMigrationsModelsTask.class.php 23922 2009-11-14 14:58:38Z fabien $
+ * @version    SVN: $Id$
  */
 class sfDoctrineGenerateMigrationsModelsTask extends sfDoctrineBaseTask
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleForRouteTask.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleForRouteTask.class.php
index dd7dc2a5f..9228a1d8a 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleForRouteTask.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleForRouteTask.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfDoctrineGenerateModuleForRouteTask.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDoctrineGenerateModuleForRouteTask extends sfDoctrineBaseTask
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleTask.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleTask.class.php
index b8133dd00..e2880d296 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleTask.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineGenerateModuleTask.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfDoctrineGenerateModuleTask.class.php 24637 2009-12-01 05:06:21Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDoctrineGenerateModuleTask extends sfDoctrineBaseTask
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineInsertSqlTask.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineInsertSqlTask.class.php
index da2377185..60cbb1674 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineInsertSqlTask.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineInsertSqlTask.class.php
@@ -18,7 +18,7 @@
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineInsertSqlTask.class.php 27942 2010-02-12 14:05:53Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfDoctrineInsertSqlTask extends sfDoctrineBaseTask
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineMigrateTask.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineMigrateTask.class.php
index 8362fc0c4..03c65a8bf 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineMigrateTask.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/task/sfDoctrineMigrateTask.class.php
@@ -18,7 +18,7 @@
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfDoctrineMigrateTask.class.php 23922 2009-11-14 14:58:38Z fabien $
+ * @version    SVN: $Id$
  */
 class sfDoctrineMigrateTask extends sfDoctrineBaseTask
 {
@@ -100,7 +100,23 @@ protected function execute($arguments = array(), $options = array())
     $this->logSection('doctrine', sprintf('Migrating from version %s to %s%s', $from, $version, $options['dry-run'] ? ' (dry run)' : ''));
     try
     {
-      $migration->migrate($version, $options['dry-run']);
+      $migration_classes = $migration->getMigrationClasses();
+      if($version < $from)
+      {
+        for($i = (int)$from - 1; $i >= (int)$version; $i--)
+        {
+          $this->logSection('doctrine', 'executing migration : '.$i .', class: '.$migration_classes[$i]);
+          $migration->migrate($i, $options['dry-run']);
+        }
+      }
+      else
+      {
+        for($i = (int)$from + 1; $i <= (int)$version; $i++)
+        {
+          $this->logSection('doctrine', 'executing migration : '.$i.', class: '.$migration_classes[$i]);
+          $migration->migrate($i, $options['dry-run']);
+        }
+      }
     }
     catch (Exception $e)
     {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php
index 2e6678a2a..8ce1c985c 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/test/sfTesterDoctrine.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage test
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfTesterDoctrine.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfTesterDoctrine extends sfTester
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineChoice.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineChoice.class.php
index d9210f6b1..cfc11c94c 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineChoice.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineChoice.class.php
@@ -16,7 +16,7 @@
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfValidatorDoctrineChoice.class.php 27736 2010-02-08 14:50:13Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfValidatorDoctrineChoice extends sfValidatorBase
 {
@@ -69,7 +69,7 @@ protected function doClean($value)
         $value = array($value);
       }
 
-      if (isset($value[0]) && !$value[0])
+      if (isset($value[0]) && '' === $value[0])
       {
         unset($value[0]);
       }
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineUnique.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineUnique.class.php
index ca3d820cc..ebd4e774b 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineUnique.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/validator/sfValidatorDoctrineUnique.class.php
@@ -20,7 +20,7 @@
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfValidatorDoctrineUnique.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfValidatorDoctrineUnique extends sfValidatorSchema
 {
@@ -113,7 +113,10 @@ protected function doClean($values)
 
     $columns = $this->getOption('column');
 
-    throw new sfValidatorErrorSchema($this, array($columns[0] => $error));
+    $errorSchema = new sfValidatorErrorSchema($this);
+    $errorSchema->addError($error, $columns[0]);
+
+    throw $errorSchema;
   }
 
   /**
@@ -158,4 +161,4 @@ protected function getPrimaryKeys()
 
     return $this->getOption('primary_key');
   }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/.gitignore b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/.gitignore
new file mode 100644
index 000000000..7cdc81d2a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/.gitignore
@@ -0,0 +1,2 @@
+tests/DoctrineTest/doctrine_tests/*
+*TestCase.php
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/.travis.yml b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/.travis.yml
new file mode 100644
index 000000000..5226516a8
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/.travis.yml
@@ -0,0 +1,19 @@
+sudo: false
+language: php
+
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+  - hhvm
+  - nightly
+
+matrix:
+    fast_finish: true
+    allow_failures:
+        - php: nightly
+
+script:
+  - php -dshort_open_tag=Off -dmagic_quotes_gpc=Off tests/index.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/CHANGELOG b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/CHANGELOG
new file mode 100644
index 000000000..738eaef1f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/CHANGELOG
@@ -0,0 +1,341 @@
+1.2.1
+-----
+     * [r6827] [1.2] Releasing 1.2.0 stable
+     * [r6834] [1.2][DC-302] Fixing issue with relationship ordering
+     * [r6835] [1.2][DC-306] Fixes issue with oracle adapter statement using wrong constant
+     * [r6836] [1.2][DC-304] Fixing issue with sfYaml autoload not returning true
+     * [r6837] [1.2][DC-305] Fixes issue with oracle adapte close cursor
+     * [r6838] [1.2][DC-307] Fixing issue with oracle adapter and errmode
+     * [r6839] [1.2][DC-298] Fixes issue with array cache driver and deleting
+     * [r6840] [1.2][DC-308] Fixed thrown Exceptions to be package-level
+	  Ticket: 308
+     * [r6842] [1.2] Fixes issue with $length in migrations addColumn
+     * [r6859] [1.2] fixed misplaced paren when parsing join condition
+     * [r6883] [1.2][DC-330] Added empty init() method implementation to avoid method does not exist error
+     * [r6886] [1.2][DC-316] Updating upgrade file with information about modelsAutoload()
+     * [r6888] [1.2][DC-292] Added coverage for issue
+     * [r6889] [1.2][DC-317] Fixing issue with nested set createRoot() method and string root column
+     * [r6891] [1.2] Fixing sandbox
+     * [r6893] [1.2][DC-333] Adding _cleanup() call to start of migrations diff to make sure directory is clean
+
+1.2.0
+-----
+     * [r6799] [1.2] Fixing issue where queries have connection passed when they should not
+     * [r6800] [1.0, 1.1, 1.2][DC-283] Fixes issue with wrong class property referenced
+     * [r6801] [1.2][DC-282] Fixing issue with memory leak and dql callbacks
+     * [r6802] [1.2][DC-281] Fix to generating yaml/models from db and relationship names
+     * [r6804] [1.2][DC-233] Adding alias to relationship name for Versionable in the same way I18n does
+     * [r6805] [1.2][DC-275] Fixing issue with importing from mysql and decimal types
+     * [r6806] [1.2][DC-271] Fixing issue with object access
+     * [r6819] [1.2][DC-299] Fixing issue with loadModels() including invalid classes in returned array
+     * [r6820] [1.2][DC-295] Added class prefix attribute for easier configuration
+     * [r6821] [1.2][DC-298] Updating api doc blocks
+     * [r6822] [1.2][DC-288] Moving location of sfYaml external
+     * [r6823] [1.2][DC-286] Fixed issue with loadModels dir contains a trailing directory separator
+     * [r6824] [1.2][DC-295] Fixing mistake with last commit for this ticket
+     * [r6825] [1.2] Changing order of searchable columns so keyword is first
+
+1.2.0-RC1
+---------
+     * [r6735] [1.2] Releasing Doctrine 1.2.0-BETA3
+     * [r6736] [1.2] Fixes issue with load data and append option
+     * [r6740] [1.2][DC-241] Code changes towards possible fix
+     * [r6741] [1.2][DC-236] Adding test coverage
+     * [r6742] [1.2][DC-241] Adding test coverage
+     * [r6743] [1.2][DC-240] Fixes issue with relationship orderBy on m2m refclass
+     * [r6744] [1.2][DC-244] Adding some missing event methods
+     * [r6745] [1.2][DC-243] Fixing issue with generating models from db not using model builder options
+     * [r6746] [1.2][DC-242][DC-228][DC-189] Fixes issue with link(), unlink(), fromArray() and synchronizeWithArray()
+     * [r6747] [1.2][DC-238] Making count() use result cache
+     * [r6748] [1.2][DC-241] Fixes issue with limit subquery being invoked with dql callbacks and when running count()
+     * [r6749] [1.2] Added static method hasConnection(). It's an accessor method for $isConnected.
+     * [r6750] [1.2][DC-62] Fixing mysql to map float, decimal and double properly
+     * [r6751] [1.2] Adding only-failed option to test suite
+     * [r6752] [1.2][DC-140] Fixed generated sql for oracle limit clause
+     * [r6758] [1.2][DC-252] Fixing issue with mysql ignoring unique option on integers
+     * [r6759] [1.2][DC-253] Adding missing data types for mssql
+     * [r6760] [1.2][DC-252] Fixing mysql integer unique issue again
+     * [r6763] [1.2] Fixing closeConnection() to only change the current connection if we close the current one
+     * [r6764] [1.2][DC-254] Updating getLimitSubquery() to include all orderby parts
+     * [r6765] [1.2][DC-255] Fixing issue with xml parser not exporting data in utf8
+     * [r6768] [1.2][DC-256] Fixing issue with id quoting and generated subqueries
+     * [r6769] [1.2][DC-257] Adding missing identifier quoting for oracle
+     * [r6770] [1.2] Removing behavior nesting example as it still does not properly work
+     * [r6775] [1.2][DC-266] Fixing generators to inherit table name from parent
+     * [r6776] [1.2][DC-267] Fixing hydrator to put aliased fields in relationship if it exists
+     * [r6777] [1.2][DC-263] Fixing pgsql type import for varchar
+     * [r6778] [1.2][DC-261] Fixes issue with bound query overriding passed query
+     * [r6779] [1.2][DC-255] Fixing arrayToXml so charset is passed recursively
+     * [r6780] [1.2][DC-198] Fixing refreshRelated() for good
+     * [r6781] [1.2] Adding missing tests
+     * [r6782] [1.2] fixed issue: when second parameter ($params) of andWhereIn() or orWhereIn() is NULL, the exception('You must pass at least one parameter when using an IN()') was not thrown
+     * [r6783] [1.2] added testExceptionIsThrownWhenParameterIsNull() to Query/WhereTestCase.php
+     * [r6792] [1.2][DC-276] Fixes issue with having not parsing dql table aliases
+     * [r6793] [1.2][DC-260] Fixes issue with oracle integers
+     * [r6794] [1.2][DC-274] Fixing issue with use of sfYaml
+     * [r6795] [1.2][DC-37][DC-279] Fixes issue with mssql modifyLimitQuery()
+     * [r6796] [1.2][DC-277] Fixing loadModels() for pear style model loading
+     * [r6797] [1.2] Fixing r6748 to be isConnected() instead of static method
+
+1.2.0-BETA3
+-----------
+     * [r6699] [1.2] Releasing Doctrine 1.2.0-BETA2
+     * [r6709] [1.2] moved property along with method moved in r6462
+     * [r6710] [1.2] removed manipulation of load references attribute in hydrators
+     * [r6711] [1.2] fixed convenience migration method for dropping a primary key
+     * [r6712] [1.2][DC-222] Fixed reference to Doctrine:: instead of Doctrine_Core::
+     * [r6713] [1.2][DC-223] Fixes issue with cloning queries and the hydrator
+     * [r6714] [1.2][DC-224] Fixes issue with pear style model loading and underscores in the directory path
+     * [r6715] [1.2][DC-225][DC-210] Fixes issue with classPrefix and pearStyle to model builder
+     * [r6716] [1.2][DC-211] Fixes issue with phpDoc relations not including classPrefix
+     * [r6717] [1.2][DC-221] Fixes issue with loading migrations from the same directory twice
+     * [r6718] [1.2][DC-209] Fixing compiler to only compile Doctrine dir
+     * [r6719] [1.2][DC-213] Fixing global options to work more like inheritance should work
+     * [r6720] [1.2][DC-194] Fixing SQL for oracle dropDatabase()
+     * [r6721] [1.2][DC-187] Fix to unique() to allow disabling of unique index and ability to specify options for unique validator
+     * [r6722] [1.2] Updating document
+     * [r6729] [1.2][DC-235] Fixes issue with cache deleteByPrefix()
+     * [r6730] [1.2][DC-232] Adding missing hasMappedValue() method
+     * [r6731] [1.2][DC-183] Another fix for getting correct max varchar length
+     * [r6732] [1.2][DC-212] Fixing issue with nested set hasParent() method
+     * [r6733] [1.0, 1.1, 1.2] Fixing small regression in importer from database for the generated class names
+     * [r6734] [1.2][DC-236] Fixes issue with Doctrine_Collection::toHierarchy()
+
+1.2.0-BETA2
+-----------
+     * [r6648] [1.1] Releasing Doctrine 1.2.0-BETA1
+     * [r6655] [1.2][DC-165] Shouldn't attempt implicit autoloading of sfYaml through class_exists() call. Handled already by the require_once's.
+     * [r6659] [1.2][DC-67] Fixing having for limit subquery
+     * [r6661] [1.2] Increased the index number for bound parameters. This solves the problem that occured after changeset r6568 in which parameters started to be bound from index 1.
+     * [r6666] [1.0, 1.1, 1.2][DC-183] Fixes issue with non existant constant in sqlite datadict
+     * [r6667] [1.2][DC-184] Fixing strict standards notice
+     * [r6668] [1.2][DC-180] Fixing issue with unique index names
+     * [r6669] [1.2][DC-179] Fixing decimal length validator when decimal point is something other than "."
+     * [r6670] [1.2][DC-178] Fixes issue with default table class name and the model builder
+     * [r6673] [1.2][DC-186] Fix to correct CLI tests
+     * [r6689] [1.2][DC-205] Fix to sequences not being set on inserts
+     * [r6690] [1.2][DC-207] Fixing situation where real exception is masked. Forcing connection on saveGraph() before try catch
+     * [r6691] [1.2][DC-204] Fixing issue with clone and reference to old hydrator
+     * [r6692] [1.2][DC-201] Fixes issue with oracle and level keyword
+     * [r6693] [1.2][DC-191] Fixes issue with loading migration classes from a directory twice
+     * [r6694] [1.2][DC-190] Fixing issue with Doctrine_Manager::reset()
+     * [r6696] [1.2][DC-198] Another attempt at fixing hasOne relationships with refreshRelated
+     * [r6697] [1.2][DC-197] Fix to new orderBy functionality with UPDATE and DELETE DQL queries
+     * [r6698] [1.2][DC-192] Fixes issue with class prefix and relation aliases
+
+1.2.0-BETA1
+-----------
+     * [r6549] [1.2] Releasing Doctrine 1.2 ALPHA3
+     * [r6559] [1.2][DC-131][DC-134] Small refactoring to match cache drivers of D2 and fixed a few bugs
+     * [r6560] [1.2][DC-136] Fixes issue with modified properties not being reset when hydration overrides local changes
+     * [r6561] [1.2][DC-115] Last bit of CLI refactorings
+     * [r6568] [1.2][DC-132] Fixes issue with file handles and BLOB fields not using LOB mode
+     * [r6581] [1.2] Removing some left over code from hydration refactorings and fixing a few issues
+     * [r6586] [1.2][DC-146] Fixing generated migrations to use right changeColumn() argument order
+     * [r6587] [1.2][DC-87] Fixing import/export to include connection name
+     * [r6588] [1.2][DC-132][DC-141] Fixing issue with r6568
+     * [r6589] [1.2][DC-151] Improved loadRelated() to handle empty collections and other scenarios
+     * [r6590] [1.2][DC-73] Fixing issue with identity map and test suite
+     * [r6591] [1.0, 1.1, 1.2][DC-93] Fixes issue with refreshRelated() causing hasOne records to be created
+     * [r6592] [1.2][DC-103] Change to get table from relation instead of value
+     * [r6611] [1.2][DC-39][DC-69] Fixes to synchronizeWithArray(), link() and unlink()
+     * [r6612] [1.2][DC-172] Fixing issue with previous commit
+     * [r6613] [1.2][DC-74] Fix to check proxy state dynamically
+     * [r6614] [1.0, 1.1, 1.2][DC-116] Fixing issue with nested set getParent() method
+     * [r6616] [1.2][DC-137] Fixing autoloading for record generator models
+     * [r6617] [1.2][DC-127] Fix to model loading for models with a prefix
+     * [r6618] [1.2][DC-128] Fix to searchable using wrong connection
+     * [r6619] [1.1, 1.2][DC-152] Fixing isModified($deep = true) issue when only deep objects are modified
+     * [r6620] [1.2] Fixing test case that can fail sometimes.
+     * [r6621] [1.2][DC-158] Fixing postgresql import for composite primary keys
+     * [r6622] [1.2] Fixing test case that has some output when it shouldn't
+     * [r6623] [1.2][DC-165] Making sfYaml a svn external
+     * [r6624] [1.0, 1.1, 1.2][DC-110] Fixes issue with Doctrine_Export_Mysql::createIndexSql()
+     * [r6625] [1.2][DC-114] Fix to auto generated cache keys for queries with pending join conditions
+     * [r6626] [1.2] Fixing yaml parser to dump with expanded code
+     * [r6627] [1.0, 1.1, 1.2][DC-130] Fix to relationship generating with quoted table names for pgsql
+     * [r6628] [1.2][DC-153] Fixing core code to operate without a current connection set
+     * [r6629] [1.2][DC-144] Fix for getConnectionForComponent() to use modelsAutoload() instead of autoload()
+     * [r6630] [1.2][DC-147] Adding test coverage
+     * [r6631] [1.2] Reversing accidential commit
+     * [r6632] [1.2][DC-153] Fixing missing piece of code
+     * [r6633] [1.2][DC-148] Adding invoking sql query to rethrown pdo exceptions
+     * [r6634] [1.2][DC-167] Fixes uniqueBy when using a fk or relationship name
+     * [r6635] [1.2][DC-169] Improving replace() to work more like update() and insert()
+     * [r6636] [1.2][DC-171] Adding hardDelete() method to SoftDelete
+     * [r6638] [1.2][DC-96] Adding support for MySQL SET type
+     * [r6642] [1.2][DC-175] Fixing hardDelete() issue
+     * [r6643] [1.2] Adding docs for most recent changes
+
+1.2.0-ALPHA3
+------------
+     * [r6440] [1.2] Release Doctrine 1.2 ALPHA2
+     * [r6462] [1.2] moved hydration method to parent for easier use in custom hydrators
+     * [r6465] [1.2][DC-95] Added better support for PEAR style naming convention when generating and loading models
+     * [r6466] [1.2][DC-63] Added new setColumnValidators() method for specifying mapping information
+     * [r6467] [2.0][DC-90] Renaming setColumnValidators() to setColumnOptions() and setColumnOption()
+     * [r6468] [1.2][DC-88] Fixing consistancy of the validators
+     * [r6469] [1.0, 1.1, 1.2][DC-89] Fixing issue with setColumn() string parsing
+     * [r6470] [1.2] Fixing bad tests that could cause other fails
+     * [r6471] [1.2][DC-76] Updating record listener interface
+     * [r6472] [1.2][DC-79] Fix to not save any foreign keys or m2m associations if parent record validation fails
+     * [r6473] [1.2] Adding methods to reset Doctrine_Manager static instance
+     * [r6474] [1.2] Fixing sandbox
+     * [r6475] [2.0][DC-78] CLI refactorings to allow you to register a task
+     * [r6476] [1.2] Removing unncessary is_object
+     * [r6477] [1.2] One more tweak to ErrorStack::add()
+     * [r6478] [1.2] Fixing exception class
+     * [r6479] [1.2] Removing unused function
+     * [r6480] [1.2] Fixing __toString() to return class name if it does not start with Doctrine_Validator_
+     * [r6483] [1.2] Adding functionality to convert nested set structures to a hierarchical structure
+     * [r6484] [1.2] Moving Doctrine to Doctrine_Core to fix autoloaders issue
+     * [r6485] [1.2][DC-102] Fixes issue with model builder class prefixes
+     * [r6486] [1.2] Fix for cti
+     * [r6487] [1.2][DC-99] Formatting the name of foreign key constraint
+     * [r6489] [1.2] Changing require to require_once
+     * [r6490] [1.2] Adding to upgrade file about Doctrine_Core
+     * [r6491] [1.2] Fix to mysql drop database to disable foreign key checks
+     * [r6492] [1.2][DC-101] Added support for foreignKeyName in relationship setup.
+     * [r6493] [1.2] Fix for behavior nesting and php 5.3 limit subquery orderby
+     * [r6494] [1.0, 1.1, 1.2][DC-92] Fixes issue with pgsql boolean default on import
+     * [r6495] [1.2][DC-84] Fix to migration automation functionality executing in wrong order when migrating down
+     * [r6496] [1.2] Added provider option for Sluggable behavior
+     * [r6497] [1.2][DC-86] Fixing sqlite now() expression
+     * [r6498] [1.2][DC-82] Adding support for conditional unique validator for pgsql
+     * [r6499] [1.2] Adding missing test case files
+     * [r6501] [1.2] Adding exception trace to rethrown exception
+     * [r6502] [1.2] Fixed changeColumn() argument order and added createPrimaryKey() and dropPrimaryKey() convenience methods
+     * [r6503] [1.2] Documenting previous commits
+     * [r6504] [1.2] Change so version table is not created until needed
+     * [r6505] [1.2] Fix so that if migration connection is changed the processor will use it
+     * [r6506] [1.2] Reverting r6493 in prep for a new version of the patch which is BC
+     * [r6507] [1.2] Fixing nesting behaviors for good
+     * [r6508] [1.2] Added ability for relationships to specify a default order by with the "orderBy" configuration option
+     * [r6509] [1.2] Fixing parse error
+     * [r6510] [1.2] Fixing typo again
+     * [r6511] [1.2] Updating upgrade doc for nesting behavior changes
+     * [r6512] [1.2] Fixing wrong code block name
+     * [r6513] [1.2] moved the schema importer's array of global definition keys to a static var so it can be used elsewhere
+     * [r6514] [1.2] added missing array
+     * [r6516] [1.2] A little refactoring
+     * [r6517] [1.2][DC-105] Fix to mssql export for notnull false
+     * [r6528] [1.2] Fixing issue with spaces in join condition dql
+     * [r6529] [1.2] Commenting out test temporarily
+     * [r6532] [1.2] Enhancing default order by functionality and enhancing result set cache to allow you to set the cache key/hash for storing entries.
+     * [r6537] [1.2][DC-113] Fix for sequences. Thanks for suggested patch
+     * [r6538] [1.2] Another fix for sequences.
+     * [r6540] [1.2][DC-117] Added support to migrations default options. Thanks Dan Bettles for patch
+     * [r6543] [1.2][DC-124] Removing use of tabs in Doctrine_Inflector
+     * [r6544] [1.0, 1.1, 1.2][DC-125] Fixes issue with memory leak in batchUpdateIndex() for Searchable behavior
+     * [r6545] [1.2][DC-112] Initial entry of functionality for deleting cache entries by regular expressions
+     * [r6546] [1.2][DC-112] Adding documentation for deleteByRegex()
+     * [r6547] [1.2] Removing unused file.
+     * [r6548] [1.2][DC-112] More refactorings on cache drivers for improved delete functionality
+
+1.2.0-ALPHA2
+------------
+     * [r6384] [1.2] Releasing Doctrine 1.2.0-ALPHA1
+     * [r6393] [1.0, 1.1, 1.2] Fixed typo in PostgreSQL Export driver
+     * [r6394] [1.2][DC-1] fixed regression introduced in r6357 when a column aggregation subclass is referenced
+     * [r6396] [1.2][DC-26] Fixed wrong behavior of query conditions (lack of parenthesis). Since this changes the generated SQL a lot, we are still validating if we will backport to 1.0 and 1.1
+	  branches
+     * [r6398] [1.0, 1.1, 1.2] Fized issue with Unique validator. Fixes #2356
+     * [r6399] [1.0, 1.1, 1.2] Fized issue with length validator. Fixes #2310
+     * [r6400] [1.1, 1.2][DC-28] Fixes issue with pending join conditions not being properly cleared
+     * [r6402] [1.0, 1.1, 1.2][DC-56] Fixes issue with Geographical behavior and customized column names
+     * [r6403] [1.0, 1.1, 1.2][DC-57] Fixes issue with validation and timestamp columns
+     * [r6404] [1.0, 1.1, 1.2][DC-46] Fixed wrong code that was not throwing exception if whereIn was passed without any parameter argument (empty array)
+     * [r6405] [1.0, 1.1, 1.2][DC-58] Fixed not so verbose exception thrown when using findBy. Fixes #2458 which is the original report
+     * [r6406] [1.0, 1.1, 1.2][DC-59] Fixed issue with mysql attributes. Fixes #2449, the original ticket reference
+     * [r6407] [1.0, 1.1, 1.2][DC-25] Fixed issue with multiple join to same alias generated wrong SQL.
+     * [r6409] [1.2] optimized collection of class names for flush tree in data import
+     * [r6410] [1.2] Removing tabs from generated migration classes
+     * [r6438] [1.2][DC-66] Fixing validation for expressions
+     * [r6439] [1.0, 1.1, 1.2][DC-80] Fixing pgsql importing issue with varchars that have a default value
+
+1.2.0-ALPHA1
+------------
+     * [r5285] [1.2] Updating UPGRADE file to document the changes to SoftDelete.
+     * [r5900] [1.2] Creating 1.2 branch
+     * [r5901] [1.2] Massive cleanup before new development begins
+     * [r5902] [1.2] Fixing tests related to limit subquery not maintaining orderby anymore.
+     * [r5903] [1.2] Added ability to configure the class generated Doctrine_Table classes extend from
+     * [r5904] [1.2] Added ability to configure a query class by use of the attribute Doctrine::ATTR_QUERY_CLASS
+     * [r5905] [1.2] Changed arrayToXml() to be static (closes #1673)
+     * [r5906] [1.2] Fixing converting to xml in the file parser (closes #1674)
+     * [r5907] [1.2] Refactored migrations to allow you to specify the connection it should use.
+     * [r5908] [1.2] Splitting getSqlQuery() in to 2 methods by adding buildSqlQuery()
+     * [r5910] [1.2] Adding configuration to turn off cascading saves by default (closes #1623)
+     * [r5911] [1.2] Removing unused methods related to string attribute support
+     * [r5919] [1.2] Making setAttribute() slightly dumber to improve performance
+     * [r5920] [1.2] Adding Doctrine::setPath() method
+     * [r5921] [1.2] Added new methods for checking related records existence for and clearing related records.
+     * [r5922] [1.2] Allowing unknown column types to be reverse engineered. Simply defaults to string if we can't map it to a Doctrine type
+     * [r5923] [1.2] Updating Doctrine_Adapter_Oracle to allow persistent connections (closes #2195)
+     * [r5924] [1.2] Making generated base classes call parent::setUp() to allow base classes to add global setup (closes #2239)
+     * [r5925] [1.2] Added new option to not add class prefixes to file names when generating models (closes #2250)
+     * [r5926] [1.2] Performance patch for events and profiler
+     * [r5927] [1.2] Removing commented code
+     * [r5928] [1.2] Adding Doctrine::VALIDATE_USER attribute
+     * [r5929] [1.2] Making findBy() and findOneBy() public methods
+     * [r5930] [1.2] Expanded support for magic table finders
+     * [r5932] [1.2] Refactoring output of tests
+     * [r5933] [1.2] Fixing sandbox config
+     * [r5934] [1.2] Added ability to configure a custom child Doctrine_Collection class instead of having it hardcoded inside Doctrine
+     * [r5936] [1.2] Refactoring hydration methods to drivers and adding ability to register custom drivers
+     * [r5938] [1.2] Fixes #1592: Oracle integers are compatible with INT types from MySQL or Postgresql
+     * [r5939] [1.2] More hydration refactoring.
+     * [r5942] [1.2] Starting refactoring of connection code to allow custom connection/adapters
+     * [r5943] [1.2] Excluding failing ticket test case
+     * [r5946] [1.2] Initial entry of extensions system
+     * [r5948] [1.2] Enhancing sandbox to have support for extensions
+     * [r5949] [1.2] Updating UPGRADE file to include information about extensions
+     * [r5950] [1.2] Adding directory structure of Sortable behavior as an example
+     * [r5956] [1.2] Updating readme to show example using new hydration type
+     * [r5957] [1.2] Updating path to Sortable
+     * [r5959] [1.2] Adding documentation about custom connection drivers
+     * [r5960] [1.2] Removing some more code related to attribute string support
+     * [r5968] [1.2] Possibility to avoid exporting table and relations to it by setting ATTR_EXPORT to EXPORT_NONE at a table level.
+     * [r5969] [1.2] Added ability to drop/create db using the Doctrine_Oracle_Adapter, moved varchar2_max_length from property to params to allow user change it.
+     * [r5971] [1.2] Fixed unpredictable ordering of resultset. This fixes the last remaining PHP 5.3 related issue we found until now.
+     * [r5972] [1.2] Commented known to fail ticket #2015 . Test cases that are known to fail should be only uncommented when patch is applied, otherwise Continuous Integration server keeps
+     * [r6002] [1.2] Fix for html vs cli output
+     * [r6008] [1.2] Reversing change to remove order by from limit subquery
+     * [r6010] [1.2] Fixing failing tests related to reversing a bug fix related to limit subquery orderby
+     * [r6016] [1.2] Fixing mistake in upgrade doc (closes #2319)
+     * [r6054] [1.2] Fixing failing test case and fixing test suite issue where messages are not reported to you
+     * [r6057] [1.2] Adding exception message to fail
+     * [r6064] [1.2] Fixed various tokenizer issues. This patch closes #671, #1885, #2104, #2107, #2111, #2298
+     * [r6065] [1.2] Uncomment needed code to get DATE(u.created_at, INTERVAL '-1 month') to work.
+     * [r6075] [1.2] Fixed author credits on Tokenizer class.
+     * [r6122] [1.2] Fixes for oracle connecting using adapter, and the drop/create db functionality (closes #2359)
+     * [r6126] [1.2] Changed skipOperation behavior on preSave() event to skip the entire operation and not just the insert()/update() calls (closes #2325)
+     * [r6128] [1.2] Removing try, catch and rethrow from Doctrine_Export (closes #2285)
+     * [r6131] [1.2] Fixes issue with previous commit and oracle create/drop db functionality
+     * [r6132] [1.2] Fixes issue with importing from existing database and unsigned flag as well as other flags (closes #2354)
+     * [r6136] [1.2] Added option to allow configuration of cascading delete operations on generators (closes #2367)
+     * [r6149] [1.2] Fixes mistake in previous commit (addresses #2367)
+     * [r6204] [1.2] Fixed #2398. Thanks to Russ Flynn.
+     * [r6218] [1.2] optimized logic in autoload so only doctrine classes are handled
+     * [r6244] [1.0][1.1][1.2] Fixed E_STRICT notice on PHP
+     * [r6345] [1.2] Mssql now supports renaming tables, columns, altering tables. Exporting Mssql SQL automatically turn all primary keys to "NOT NULL".
+     * [r6346] [1.2] Fixed #2487. Patch provided by Stefan Klug.
+     * [r6349] [1.2] Fixed minor issues which was breaking unit test suite under certain environments
+     * [r6350] [1.2] Semi-reverted my previous commit since it reveals a hidden bug and it's now bugging CI server. Need to do more efforts to effectively fix all related issues of my previous
+     * [r6357] [1.2][DC-1] Fixes issue with data fixtures import keys being overriden
+     * [r6362] [1.2] Fixed a couple of issues that were preventing Unit Test Suite to run in certain situations
+     * [r6363] [1.2] Fix for class_exists
+     * [r6365] [1.2][DC-12] Added Doctrine::ATTR_TABLE_CLASS
+     * [r6366] [1.2][DC-14] Fixes issue with DQL parser and NOT BETWEEN where conditions
+     * [r6367] [1.2][DC-12] Updating doc block for Doctrine_Migration_Base::changeColumn()
+     * [r6368] [1.2][DC-10] Fixed exception catching and rethrowing from CLI
+     * [r6370] [1.2][DC-7] Implementing first draft of ON DEMAND hydration
+     * [r6371] [1.2][DC-5] Automatically indexing column aggregation inheritance type column
+     * [r6372] [1.2][DC-17] Removing exception suppressing for dropping and creating databases
+     * [r6373] [1.2][DC-9] Modified yaml schema parser to allow comment on table and fields
+     * [r6376] [1.2][DC-32] Making change so non portable types are passed through instead of throwing exceptions
+     * [r6377] [1.2][DC-23] Fixed issue with referencing fixtures more than 1 level deep and self referencing fixtures
+     * [r6378] [1.2] Cleaning up on demand hydration so it is much simpler and just a hydration mode. No more policies.
+     * [r6379] [1.2] Updating upgrade file
+     * [r6381] [1.2][DC-24] Removing deprecated aggregate values in relationships when hydrating
+     * [r6382] [1.2][DC-24] Updating upgrade file for previous changeset
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/COPYRIGHT b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/COPYRIGHT
new file mode 100644
index 000000000..8ce4c6244
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/COPYRIGHT
@@ -0,0 +1,37 @@
+Copyrights
+----------
+
+Doctrine
+--------
+
+Doctrine is a Object Relational Mapper built from scratch with PHP5. It contains a few ports of other popular PHP classes/libraries.
+
+Url:        http://www.doctrine-project.org
+Copyright:  2005-2007 Konsta Vesterinen
+License:    LGPL - see LICENSE file
+
+symfony
+-------
+
+Doctrine contains ports of a few symfony classes/libraries
+
+Url:       http://www.symfony-project.com/
+Copyright: Fabien Potencier
+License:   MIT - see LICENSE file
+
+Spyc
+----
+
+Doctrine contains a port of the Spyc software
+
+Url:       http://spyc.sourceforge.net/
+Copyright: 2005-2006 Chris Wanstrath
+License:   MIT - http://www.opensource.org/licenses/mit-license.php
+
+Zend Framework
+--------------
+
+Doctrine contains ports of a few Zend components and has borrowed concepts and ideas from the Zend Framework project.
+
+Url:       http://framework.zend.com
+Copyright: Copyright © 2006-2007 by Zend Technologies, All rights reserved.
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/LICENSE b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/LICENSE
new file mode 100644
index 000000000..1c03f74b9
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/LICENSE
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+		     
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/UPGRADE_TO_1_2 b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/UPGRADE_TO_1_2
new file mode 100644
index 000000000..ef78cbbd8
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/UPGRADE_TO_1_2
@@ -0,0 +1,983 @@
+# Upgrade from 1.1 to 1.2
+
+This document details the changes made to Doctrine 1.2 to make it easier for you
+to upgrade your projects to use this version.
+
+## Removed Attribute String Support
+
+The string support of `Doctrine_Configurable::getAttribute()` and 
+`Doctrine_Configurable::setAttribute()` have been removed.
+
+The reason is that the performance of this simple convenience feature is 
+significant and it is totally unneeded.
+
+The following code is no longer supported.
+
+    [php]
+    $connection->setAttribute('use_native_enum', true);
+
+You must now always use the following code.
+
+    [php]
+    $connection->setAttribute(Doctrine_Core::ATTR_USE_NATIVE_ENUM, true);
+
+## Removed all Deprecated Functions
+
+Removed all functions labeled `@deprecated` in the doc blocks.
+
+Affected Classes
+
+* Doctrine_Query
+* Doctrine_Query_Abstract
+
+## Renamed Methods
+
+* Doctrine_Query_Abstract::getSql() to getSqlQuery()
+* Doctrine_Search_Query::getSql() to getSqlQuery()
+* Doctrine_Query_Abstract::*getCountQuery
+* 
+* 
+* 
+* 
+* 
+() to getCountSqlQuery()
+* Doctrine_RawSql::getCountQuery() to getCountSqlQuery()
+
+## Added ability to configure table class
+
+Added ability to specify the base `Doctrine_Table` class to use if no custom 
+`UserModelTable` class exists.
+
+    [php]
+    $manager->setAttribute(Doctrine_Core::ATTR_TABLE_CLASS, 'MyTable');
+
+Now just make sure the class exists somewhere and is loaded.
+
+    [php]
+    class MyTable extends Doctrine_Table
+    {
+
+    }
+
+This attribute value will be used for the following new option if you don't 
+specify it.
+
+    [php]
+    $builder = new Doctrine_Import_Builder();
+    $builder->setOption('baseTableClassName', 'MyBaseTable');
+
+## Added ability to configure query class
+
+Before Doctrine 1.2 it was hard coded internally to always use the 
+`Doctrine_Query` class whenever you instantiate a new query. Now you can 
+configure which class this is to use by setting the `Doctrine_Core::ATTR_QUERY_CLASS` 
+attribute.
+
+    [php]
+    class MyQuery extends Doctrine_Query
+    {
+      
+    }
+
+    $manager->setAttribute(Doctrine_Core::ATTR_QUERY_CLASS, 'MyQuery');
+
+    $q = Doctrine_Query::create();
+
+    echo get_class($q); // MyQuery
+
+## Changed Doctrine_Parser_Xml::arrayToXml() to be static
+
+Now the `arrayToXml()` method can be called directly because it is static.
+
+    [php]
+    $array = array(
+      'key1' => 'value',
+      'key2' => 'value'
+    );
+    $xml = Doctrine_Parser_Xml::arrayToXml($array);
+
+## Refactored Migrations to better handle multiple connections
+
+Now when working with `Doctrine_Migration` instance you can specify as the 
+second argument to the constructor the connection instance to use for the 
+migrations.
+
+Migrations for different databases should be handled with a different set of 
+migration classes.
+
+Previous method of finding connection based on the table name is flawed since 
+databases could have the same table name multiple times.
+
+    [php]
+    $conn = Doctrine_Manager::connection();
+    $migration = new Doctrine_Migration('/path/to/migrations', $conn);
+
+## Added option for save cascading
+
+Added a new attribute to control whether cascading save operations are done by 
+default. Previous to Doctrine 1.2 they were always cascaded.
+
+As of 1.2 you have the option to disable cascading saves and will only cascade 
+if the record is dirty. The cost of this is that you can't cascade and save 
+records who are dirty that are more then one level deep in the hierarchy.
+
+See: http://trac.doctrine-project.org/ticket/1623
+
+You can disable cascading saves with the following code.
+
+    [php]
+    $manager->setAttribute(Doctrine_Core::ATTR_CASCADE_SAVES, false);
+
+Disabling this will increase performance significantly when saving objects.
+
+## Added Doctrine_Core::setPath()
+
+Now you can specify the path to your Doctrine libraries if Doctrine.php is 
+outside of the location of your libraries.
+
+So if `Doctrine.php` is located at `/path/to/Doctrine.php` and the actual 
+libraries are at `/path/to/the/doctrine/libs` you would need to do the 
+following.
+
+    [php]
+    Doctrine_Core::setPath('/path/to/the/doctrine/libs');
+
+## Ability to clear an individual reference
+
+Previously the `Doctrine_Record::clearRelated()` would only allow the clearing 
+of ALL references. It will now accept a relationship name and you can clear an 
+individual reference.
+
+    [php]
+    $user->clearRelated('Phonenumber');
+
+## Check related exists
+
+Often you want to check if a relationship exists in the database, but if it 
+doesn't exist you get a newly created blank relationship that will try to be 
+saved when you call save on the parent record. Use the new `relatedExists()` 
+method to check to avoid this behavior.
+
+    [php]
+    if ($user->relatedExists('Profile')) {
+      // do something if the user has a profile
+    }
+
+## Reverse Engineered Columns
+
+If Doctrine does not recognize a column from a database when reverse engineering 
+a schema, instead of throwing an exception, it will default to a string.
+
+This allows custom column types or proprietary column types to be reverse 
+engineered without stopping the schema from being built completely.
+
+## Oracle Adapter Persistent Connections
+
+The `Doctrine_Adapter_Oracle` now will use persistent connections if specified.
+
+    [php]
+    $info = array(
+      'oracle:dbname=SID;charset=NLS_CHARACTERSET;persistent=true',
+      'usr',
+      'pass'
+    );
+
+    Doctrine_Manager::connection($info, 'conn_name');
+
+## New Class/File Prefix Option for Model Builder
+
+You can now set a prefix for your generated models and choose to not have the 
+generated filename include that prefix as well.
+
+    [php]
+    $builder = new Doctrine_Import_Builder();
+    $builder->setOption('classPrefixFiles', false);
+    $builder->setOption('classPrefix', 'MyClassPrefix_');
+
+Without the first option you'd get a file like `MyClassPrefix_ModelName.php` but 
+now you will get `ModelName.php` with a class named `MyClassPrefix_ModelName` 
+inside.
+
+## Expanded Magic Finders to Multiple Fields
+
+You can now `findBy` multiple fields and specify conditions between the fields.
+
+    [php]
+    $user = $userTable->findOneByUsernameAndPassword('jwage', md5('changeme'));
+
+Or you could do something like the following and find admin users and moderator 
+users.
+
+    [php]
+    $users = $userTable->findByIsAdminOrIsModerator(true, true);
+
+You can mix the conditions.
+
+    [php]
+    $users = $userTable->findByIsAdminAndIsModeratorOrIsSuperAdmin(true, true, true);
+
+> **CAUTION**
+> These are very limited magic finders and it is always recommended to expand 
+> your queries to be manually written DQL queries. These methods are meant for 
+> only quickly accessing single records, no relationships, and are good for 
+> prototyping code quickly.
+
+## Custom Collection Class
+
+You can now specify a custom child class to use for all collections inside 
+Doctrine.
+
+    [php]
+    $manager->setAttribute(Doctrine_Core::ATTR_COLLECTION_CLASS, 'MyCollection');
+    
+    $phonenumbers = $user->Phonenumbers;
+    echo get_class($phonenumbers); // MyCollection
+
+Now define the simple child class.
+
+    [php]
+    class MyCollection extends Doctrine_Collection
+    {
+      
+    }
+
+This option can be set at the manager, connection and table levels.
+
+## Custom Hydrators
+
+As of Doctrine 1.2 it is now possible to register your own custom data 
+hydrators. The core hydration process has been decoupled to proper drivers and 
+now you can register your own to handle the hydration process.
+
+First lets register our custom hydrator class.
+
+    [php]
+    $manager->registerHydrator('MyHydrator', 'Doctrine_Hydrator_MyHydrator');
+
+So now we need to define a hydrator class named `MyHydrator` and it must 
+implement a method named `hydrateResultSet($stmt)` method which accepts a 
+query statement object.
+
+    [php]
+    class Doctrine_Hydrator_MyHydrator extends Doctrine_Hydrator_Abstract
+    {
+        public function hydrateResultSet($stmt)
+        {
+            return $stmt->fetchAll(PDO::FETCH_ASSOC);
+        }
+    }
+
+Now you can run a query like the following which would use the new `MyHydrator`.
+
+    [php]
+    $q->execute(array(), 'MyHydrator');
+
+## Custom Connections
+
+You can now write and register your own custom Doctrine connection drivers and 
+adapters.
+
+    [php]
+    class Doctrine_Connection_Test extends Doctrine_Connection_Common
+    {
+    }
+
+    class Doctrine_Adapter_Test implements Doctrine_Adapter_Interface
+    {
+      // ... all the methods defined in the interface
+    }
+
+Now we can register this with Doctrine so we can utilize it as our connection.
+
+    [php]
+    $manager->registerConnectionDriver('test', 'Doctrine_Connection_Test');
+
+Now you can utilize that type of connection in your DSN when connecting.
+
+    [php]
+    $conn = $manager->openConnection('test://username:password@localhost/dbname');
+
+Now if we were to check what classes are used for the connection you will notice
+that they are the classes we defined above.
+
+    [php]
+    echo get_class($conn); // Doctrine_Connection_Test
+    echo get_class($conn->getDbh()); // Doctrine_Adapter_Test
+
+## Doctrine Extensions
+
+Doctrine now has support for creating, loading and testing extensions in to your 
+projects.
+
+First we need to simply tell `Doctrine` where the extensions are being loaded 
+from.
+
+    [php]
+    Doctrine_Core::setExtensionsPath('/path/to/extensions');
+
+Now we can check out one of the first available extensions in to our extensions 
+directory and then register it.
+
+    $ svn co http://svn.doctrine-project.org/extensions/Sortable/branches/1.2-1.0/ /path/to/extensions/Sortable
+
+The directory structure of this extension looks like the following.
+
+    Sortable/
+    	lib/
+    		Doctrine/
+    			Template/
+    				Listener/
+    					Sortable.php
+    				Sortable.php
+    	tests/
+    		run.php
+    		Template/
+    			SortableTestCase.php
+
+You can even run the tests that come bundled with it. We just need to tell your 
+CLI where your Doctrine code is.
+
+    $ export DOCTRINE_DIR=/path/to/doctrine
+
+> **NOTE**
+> The above path to Doctrine must be the path to the main folder, not just the 
+> lib folder. In order to run the tests it must have access to the `tests` 
+> directory included with Doctrine.
+
+Now you can run the tests included.
+
+    $ cd /path/to/extensions/Sortable/tests
+    $ php run.php
+
+It should output something like the following.
+
+    Doctrine Unit Tests
+    ===================
+    Doctrine_Template_Sortable_TestCase.............................................passed
+
+    Tested: 1 test cases.
+    Successes: 26 passes.
+    Failures: 0 fails.
+    Number of new Failures: 0 
+    Number of fixed Failures: 0 
+
+    Tests ran in 1 seconds and used 13024.9414062 KB of memory
+
+Now if you want to use the extension in your project you will need register the 
+extension with Doctrine and setup the extension autoloading mechanism.
+
+First lets setup the extension autoloading.
+
+    [php]
+    spl_autoload_register(array('Doctrine', 'extensionsAutoload'));
+
+Now you can register the extension and the classes inside that extension will be 
+autoloaded.
+
+    [php]
+    $manager->registerExtension('Sortable');
+
+> **NOTE**
+> If you need to register an extension from a different location you can specify 
+> the full path to the extension directory as the second argument to the 
+> `registerExtension()` method.
+
+## Generator Cascading Delete Configuration
+
+It is now possible to configure the cascading delete operation of a 
+`Doctrine_Record_Generator`. For example you can now configure the `I18n` 
+behavior to use app level cascade deletes instead of database level.
+
+    [yml]
+    Article:
+      actAs:
+        I18n:
+          fields: [title, body]
+          appLevelDelete: true
+      columns:
+        title: string(255)
+        body: clob
+
+You can also completely disable cascading deletes by using the `cascadeDelete` 
+option and setting it to `false.`
+
+## Column Aggregation Key Column
+
+The column aggregation key column is now automatically indexed.
+
+    [yml]
+    User:
+      tableName: users
+      columns:
+        username: string(255)
+        password: string(255)
+
+    Employee:
+      inheritance:
+        extends: User
+        type: column_aggregation
+
+The above schema would add a `type` column to the `User` model. This is a flag 
+tell Doctrine which subclass each record in the database belongs to. This column
+is now automatically indexed where before it was not.
+
+    [sql]
+    CREATE TABLE users (id INTEGER PRIMARY KEY AUTOINCREMENT, username VARCHAR(255), password VARCHAR(255), type VARCHAR(255));
+    CREATE INDEX type_idx ON users (type);
+
+## On Demand Hydration
+
+You can now utilize a new hydration mode which utilizes much less memory. It only
+hydrates one object in to memory at a time. So it uses less memory and is faster
+for larger results.
+
+    [php]
+    // Returns instance of Doctrine_Collection_OnDemand
+    $result = $q->execute(array(), Doctrine_Core::HYDRATE_ON_DEMAND);
+    foreach ($result as $obj) {
+        // ...
+    }
+
+`Doctrine_Collection_OnDemand` hydrates each object one at a time as you iterate
+over it.
+
+## Aggregate Values Hydration
+
+Now aggregate/calculated values can only be found in the root component of your 
+queries. Previously they could be found in both the root component and the 
+relationship. This causes lots of problems, for example this query.
+
+    [php]
+    $master = Doctrine_Query::create()
+			  ->select('m.*, s.bar AS joe')
+			  ->from('Ticket_DC24_Master m')
+			  ->innerJoin('m.Ticket_DC24_Servant s')
+			  ->where('m.id = 1')
+			  ->fetchOne();
+
+This produces a data structure like this.
+
+    Array
+    (
+        [id] => 1
+        [foo] => 6
+        [servant_id] =>
+        [Ticket_DC24_Servant] => Array
+            (
+                [id] =>
+                [bar] =>
+                [joe] => 6
+            )
+
+        [joe] => 6
+    )
+
+Now we have a blank `Ticket_DC24_Servant` instance and if we were to try and call
+`save()` like below we would get an error.
+
+    [php]
+    $master->some_field = 'test';
+    $master->save();
+
+Now as of 1.2 the structure will only look like this.
+
+    Array
+    (
+        [id] => 1
+        [foo] => 6
+        [servant_id] => 1
+        [joe] => 6
+    )
+
+## PEAR Style Model Loading and Generation
+
+Doctrine 1.2 now has the ability to generate PEAR style naming conventions for your
+models and can autoload them.
+
+First we have a new method for setting the path to our models for the autoloader.
+
+    [php]
+    Doctrine_Core::setModelsDirectory('/path/to/my/models');
+
+Make sure you have registered the `modelsAutoload()` method:
+
+    [php]
+    spl_autoload_register(array('Doctrine', 'modelsAutoload'));
+
+Now when you ask for a class named `My_Test_Model` it will try and autoload it 
+from `/path/to/my/models/My/Test/Model.php`.
+
+So now you can autoload PEAR style models, but what about generating them? For this
+we had to add a new option to the model builder called `pearStyle`. When this option
+is enabled it will string replace any `_` in the path to the file and replace it with the directory
+separator `/` right before creating the directories and writing the file.
+
+Here I'll show an example how you can use the options to convert this schema and
+what it would result in.
+
+    [yml]
+    Article:
+      columns:
+        title: string(255)
+        content: clob
+
+    Article_Category:
+      columns:
+        name: string(255)
+
+Now if we configure a schema importer like the following.
+
+    [php]
+    $import = new Doctrine_Import_Schema();
+    $import->setOptions(array(
+        'pearStyle' => true,
+        'baseClassesDirectory' => null,
+        'baseClassPrefix' => 'Base_',
+        'classPrefix' => 'MyProject_Models_',
+        'classPrefixFiles' => true
+    ));
+    $import->importSchema('schema.yml', 'yml', 'lib');
+
+This will result in some files and directories like the following.
+
+    lib/
+      MyProject/
+        Models/
+          Article/
+            Category.php
+          Article.php
+          Base/
+            Article/
+              Category.php
+            Article.php
+
+So now you can easily use our autoloader or your own to load our models with the
+PEAR style naming convention.
+
+    [php]
+    spl_autoload_register(array('Doctrine', 'autoload'));
+    Doctrine_Core::setModelsDirectory('lib');
+
+Now if we use this code.
+
+    [php]
+    $article = MyProject_Models_Article();
+
+It will autoload the file from `lib/MyProject/Models/Article.php`
+
+## Customizing Column Validators
+
+Often when you generate models from a database, you want to customize and improve
+your models by overriding the `setTableDefinition()` and tweaking things. To make
+this easier we added a new method to customize column options but not completely
+override it.
+
+    [php]
+    class User extends BaseUser
+    {
+        public function setTableDefinition()
+        {
+            parent::setTableDefinition();
+
+            $this->setColumnOptions('username', array('unique' => true));
+        }
+    }
+
+## Resetting Manager Instances
+
+Sometimes when performing unit tests using Doctrine, you will want to reset
+the static manager instance held in `Doctrine_Manager`.
+
+We've added a static method `resetInstance()` and a public method `reset()`
+to help you with this.
+
+    [php]
+    $manager1 = Doctrine_Manager::getInstance();
+    Doctrine_Manager::resetInstance();
+    $manager2 = Doctrine_Manager::getInstance();
+    
+    // $manager1 !== $manager2
+
+You can also simply reset an instance back to the state when it was first created.
+
+    [php]
+    $manager->reset();
+
+## Registering Custom CLI Tasks
+
+Thanks to Dan Bettles, he contributed some refactorings to the Doctrine 1 CLI
+to allow us to register custom tasks with the `registerTask()` method.
+
+    [php]
+    $cli = new Doctrine_Cli($config);
+    $cli->registerTask('/path/to/MyCustomTask', 'my-task');
+    $cli->run($_SERVER['argv']);
+
+Now you can execute:
+
+    $ php doctrine my-task
+
+Be sure to define the class like this.
+
+    [php]
+    class MyCustomTask extends Doctrine_Task
+    {
+        public $description       =   'My custom task',
+               $requiredArguments =   array('arg1' => 'Required first argument.'),
+               $optionalArguments =   array('arg2' => 'Optional second argument.');
+
+        public function execute()
+        {
+            $arg1 = $this->getArgument('arg1');
+            $arg2 = $this->getArgument('arg2');
+        }
+    }
+
+## Doctrine Nested Set Hierarchy Structure
+
+When working with the `NestedSet` behavior in Doctrine 1.2 it has some very nice
+features that make working with hierarchical data very easy. One of the things
+it has always missed is a way to hydrate that data in to a hierarchical structure.
+With 1.2 this is now possible with some new hydration types.
+
+    [php]
+    $categories = Doctrine_Core::getTable('Category')
+        ->createQuery('c')
+        ->execute(array(), Doctrine_Core::HYDRATE_RECORD_HIERARCHY);
+
+Now you can access the children of a record by accessing the mapped value property
+named `__children`. It is named with the underscores prefixed to avoid any conflicts.
+
+    [php]
+    foreach ($categories->getFirst()->get('__children') as $child) {
+        // ...
+    }
+
+You can also execute this structure using array hydration and get back the same
+structure except as an array.
+
+    [php]
+    $results = Doctrine_Core::getTable('NestedSetTest_SingleRootNode')
+        ->createQuery('n')
+        ->execute(array(), Doctrine_Core::HYDRATE_ARRAY_HIERARCHY);
+
+If you have an existing `Doctrine_Colletion` instance you can convert that to a
+hierarchy as well.
+
+    [php]
+    $hierarchy = $coll->toHierarchy();
+
+The hierarchy a collection can be converted to an array as well.
+
+    [php]
+    print_r($hierarchy->toArray());
+
+## Moved Doctrine to Doctrine_Core
+
+For integration purposes we have deprecated the `Doctrine` class and moved it to
+`Doctrine_Core`. The old class still exists and extends `Doctrine_Core` for BC.
+
+## Specify Relationship Foreign Key Name
+
+Up until now, Doctrine would always try and generate a foreign key name for you
+for your relationships. Sometimes you may want to customize this name or Doctrine
+generates a name that is too long for you. You can customize the foreign key name
+now with the `foreignKeyName` option.
+
+    [php]
+    public function setUp()
+    {
+        $this->hasOne('User', array(
+            'local' => 'user_id',
+            'foreign' => 'id',
+            'foreignKeyName' => 'user_id_fk'
+        ));
+    }
+
+Or in YAML you can do the following.
+
+    [yml]
+    Profile:
+      columns:
+      # ...
+        user_id: integer
+      relations:
+        User:
+          foreignKeyName: user_id_fk
+
+## Sluggable Provider Option
+
+You can now use a provider option to the `Sluggable` behavior so you can customize
+the PHP code that is used to generate a slug for a record.
+
+    [yml]
+    Article:
+    # ...
+      actAs:
+        Sluggable:
+          provider: [MyClass, provideSlug]
+
+Now you must have some PHP code like this.
+
+    [php]
+    class MyClass
+    {
+        public static function provideSlug(Doctrine_Record $record)
+        {
+            // return something
+        }
+    }
+
+## Migrations Primary Key Convenience Methods
+
+To ease the process of creating and dropping primary keys in Doctrine when using
+migrations we've implemented two convenience methods named `createPrimaryKey()` 
+and `dropPrimaryKey()`.
+
+You can use create primary keys like the following.
+
+    [php]
+    $columns = array(
+        'id' => array(
+            'type' => 'integer',
+            'autoincrement' => true
+         )
+    );
+    $this->createPrimaryKey('my_table', $columns);
+
+If you want to drop the primary key you can do the following.
+
+    [php]
+    $this->dropPrimaryKey('my_table', array('id'));
+
+You can also use the automation helper with these methods.
+
+    [php]
+    class MyMigration extends Doctrine_Migration_Base
+    {
+        public function migrate($direction)
+        {
+            $columns = array(
+                'id' => array(
+                    'type' => 'integer',
+                    'autoincrement' => true
+                 )
+            );
+            $this->primaryKey('my_table', $columns);
+        }
+    }
+
+The above migration will create the primary key when migrating up and drop it when
+migrating down.
+
+## Fixed changeColumn() Argument Order in Migrations
+
+Previously the order of `changeColumn()` was not in the order you would expect.
+
+    [php]
+    public function changeColumn($tableName, $columnName, $length = null, $type = null, array $options = array())
+
+Notice how the `$length` is before `$type`. Everywhere else in Doctrine that's 
+how it is. So for this version we have fixed that.
+
+    [php]
+    public function changeColumn($tableName, $columnName, $type = null, $length = null, array $options = array())
+
+## Ordering Relationships
+
+It is now possible to set a default order by for your relationships. The order by
+is automatically included in the final SQL when writing DQL queries or lazily
+fetching relationships.
+
+    [yml]
+    User:
+      columns:
+        username: string(255)
+        password: string(255)
+      relations:
+        Articles:
+          class: Article
+          local: id
+          foreign: user_id
+          type: many
+          foreignType: one
+          orderBy: title ASC
+    
+    Article:
+      columns:
+        title: string(255)
+        content: clob
+        user_id: integer
+
+Now if we were to do the following PHP we'll get the SQL with an order by.
+
+    [php]
+    $q = Doctrine::getTable('User')
+        ->createQuery('u')
+        ->leftJoin('u.Articles a');
+
+    echo $q->getSqlQuery() . "\n\n";
+
+Now you should see this SQL query.
+
+    [sql]
+    SELECT u.id AS u__id, u.username AS u__username, u.password AS u__password, a.id AS a__id, a.title AS a__title, a.content AS a__content, a.user_id AS a__user_id FROM user u LEFT JOIN article a ON u.id = a.user_id ORDER BY a.title ASC
+
+Or if you lazily fetch the `Articles` they will be lazily loaded with the order by.
+
+    [php]
+    $user = Doctrine::getTable('User')->find(1);
+    $articles = $user->Articles;
+
+This would execute the following SQL query.
+
+    [sql]
+    SELECT a.id AS a__id, a.title AS a__title, a.content AS a__content, a.user_id AS a__user_id FROM article a WHERE (a.user_id IN (?)) ORDER BY a.title ASC
+
+You can also specify the default order by for a model itself instead of on the relationship.
+
+    [yml]
+    Article:
+      options:
+        orderBy: title ASC
+      columns:
+        title: string(255)
+
+Now any query involving the `Article` model will have that order by.
+
+## Result Cache Improvements
+
+In Doctrine when you use result caching, it stores the results of a query in the
+cache driver the first time it executes and retrieves it from the cache for all
+subsequent requests. The key for this cache entry in the driver is automatically
+generated so it is hard for you to identify a single entry and clear it manually.
+
+In Doctrine 1.2 we added the ability to set the result cache hash/key used.
+
+    [php]
+    $q = Doctrine_Query::create()
+        ->from('User u')
+        ->useResultCache(true, 3600, 'user_list');
+
+If you want to manually clear the item from the query object you can do.
+
+    [php]
+    $q->clearResultCache();
+
+Or if you have the cache driver you could delete it by the key.
+
+    [php]
+    $cacheDriver->delete('user_list');
+
+You can also use the `setResultCacheHash()` to set the key used to store the cache
+entry.
+
+    [php]
+    $q = Doctrine_Query::create()
+        ->from('User u')
+        ->useResultCache(true, 3600);
+
+    $q->setResultCacheHash('user_list');
+
+You can also now delete cache entries from the cache drivers using PHP regular
+expressions.
+
+    [php]
+    $cacheDriver = new Doctrine_Cache_Apc();
+
+    $cacheDriver->save('my_cache_one');
+    $cacheDriver->save('my_cache_two');
+    $cacheDriver->save('my_cache_three');
+
+    echo $cacheDriver->deleteByRegex('/my_cache_.*/'); // 3
+
+If you're not a regular expression master and just want to simply delete with 
+some wild cards then you can use the `*` character with the normal `delete()`
+method and we'll build the regular expression for you and call `deleteByRegex()`.
+
+    [php]
+    echo $cacheDriver->delete('my_cache_*');
+
+Since `preg_match()` is pretty slow the above example would not perform well
+with lots of cache keys to compare to the regular expression so you can
+alternatively use the `deleteByPrefix()` and `deleteBySuffix()` method if
+that is sufficient enough for you.
+
+    [php]
+    echo $cacheDriver->deleteByPrefix('my_cache_');
+
+## BLOB and File Handle Resources
+
+It is now possible to provide the contents for a blob column through a file
+handle resource.
+
+    [php]
+    $file = new File();
+    $file->binary_data = file('/path/to/file');
+    $file->save();
+
+## Symfony sfYaml External
+
+Doctrine is now using the Symfony Component `sfYaml` for our YAML parsing as an 
+SVN external. So it will always be up to date and receive bug fixes from Symfony.
+
+## Better replace() Support
+
+The `Doctrine_Record::replace()` had a lot of issues previously as it did not 
+behave the same as if you were to call `save()`, `update()`, or `insert()`. 
+Now when you call `replace()` all the same events will be triggered and the
+saving of the graph will be triggered just as if you were using `save()`.
+
+    [php]
+    $user = new User();
+    $user->username = 'jonwage';
+    $user->password = 'changeme2';
+    $user->replace();
+
+## Added hardDelete() method to SoftDelete
+
+Something missing from the `SoftDelete` behavior was the ability to force the 
+deletion of a record in the database. For this we have added a new `hardDelete()`
+method.
+
+    [php]
+    $user = new User();
+    $user->username = 'jwage';
+    $user->password = 'changeme';
+    $user->save();
+    $user->delete() // Doesn't actually delete, sets deleted_at flag
+    
+    $user->hardDelete(); // Will actually delete the record from the database.
+
+## Added MySQL SET Support
+
+Just like the `enum` type for MySQL we also now support the `set` type. It basically
+very similar to `enum` but instead of being able to store only one value you can
+store multiple of the possible values.
+
+    [yml]
+    User:
+      columns:
+        username: string(255)
+        password: string(255)
+        permissions:
+          type: set
+          values: [admin, member, moderator, banned]
+
+Now you can do the following:
+
+    [php]
+    $user = new User();
+    $user->username = 'jwage';
+    $user->password = 'changeme';
+    $user->permissions = array('admin', 'member');
+
+## Models Autoloading
+
+In Doctrine 1.2 the models autoloading was moved to a custom autoloader for more
+flexibility and not forcing the models autoloading on users if they don't want to
+use it. If you still wish to use the Doctrine model autoloading then you must
+use the following code:
+
+    [php]
+    spl_autoload_register(array('Doctrine_Core', 'modelsAutoload'));
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/build.properties.dev b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/build.properties.dev
new file mode 100644
index 000000000..e7f708229
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/build.properties.dev
@@ -0,0 +1,11 @@
+version=1.2.3
+stability=stable
+build.dir=build
+dist.dir=dist
+report.dir=reports
+log.archive.dir=logs
+test.phpunit_configuration_file=
+test.phpunit_generate_coverage=0
+test.pmd_reports=0
+test.pdepend_exec=
+test.phpmd_exec=
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/build.xml b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/build.xml
new file mode 100644
index 000000000..5ff0aea54
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/build.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0"?>
+
+<!--
+    Doctrine build file.
+-->
+
+<project name="Doctrine" default="build" basedir=".">
+
+    <taskdef classname="phing.tasks.ext.d51PearPkg2Task" name="d51pearpkg2" />
+
+    <property file="build.properties" />
+
+    <!--
+        Fileset for artifacts shared across all distributed packages.
+    -->
+    <fileset id="shared-artifacts" dir=".">
+        <include name="LICENSE"/>
+    </fileset>
+
+    <!--
+        Fileset for the sources of the Doctrine Common dependency.
+    -->
+    <fileset id="sources" dir="./lib">
+        <include name="**"/>
+    </fileset>
+
+    <!--
+        Clean the directory for the next build.
+    -->
+    <target name="clean">
+        <available file="./build.properties" property="build_properties_exist" value="true"/>
+        <fail unless="build_properties_exist" message="The build.properties file is missing." />
+
+        <delete dir="${build.dir}" includeemptydirs="true" />
+        <delete dir="${dist.dir}" includeemptydirs="true" />
+        <delete dir="${report.dir}" includeemptydirs="true" />
+    </target>
+
+    <!--
+        Prepare the new build directories after cleaning
+    -->
+    <target name="prepare" depends="clean">
+        <echo msg="Creating build directory: ${build.dir}" />
+        <mkdir dir="${build.dir}" />
+        <echo msg="Creating distribution directory: ${dist.dir}" />
+        <mkdir dir="${dist.dir}" />
+        <echo msg="Creating report directory: ${report.dir}" />
+        <mkdir dir="${report.dir}" />
+        <mkdir dir="${build.dir}/logs"/>
+        <mkdir dir="${report.dir}/tests"/>
+    </target>
+
+    <!--
+        Builds ORM package, preparing it for distribution.
+    -->
+    <target name="build" depends="prepare">
+        <copy todir="${build.dir}">
+            <fileset refid="shared-artifacts"/>
+        </copy>
+        <copy todir="${build.dir}">
+            <fileset refid="sources"/>
+        </copy>
+    </target>
+
+    <!--
+        Builds distributable PEAR packages.
+    -->
+    <target name="build-packages" depends="build">
+        <d51pearpkg2 baseinstalldir="/" dir="${build.dir}">
+           <name>Doctrine</name>
+           <summary>PHP5 Database ORM</summary>
+           <channel>pear.doctrine-project.org</channel>
+           <description>
+Doctrine is an ORM (object relational mapper) for PHP 5.2.x+ that sits on top of
+a powerful DBAL (database abstraction layer). One of its key features is the
+ability to optionally write database queries in an OO (object oriented)
+SQL-dialect called DQL inspired by Hibernates HQL. This provides developers with
+a powerful alternative to SQL that maintains a maximum of flexibility without
+requiring needless code duplication.
+           </description>
+           <lead user="jwage" name="Jonathan H. Wage" email="jonwage@gmail.com" />
+           <license>LGPL</license>
+           <version release="${version}" api="${version}" />
+           <stability release="${stability}" api="${stability}" />
+           <notes>-</notes>
+           <dependencies>
+               <php minimum_version="5.2.3" />
+               <pear minimum_version="1.6.0" recommended_version="1.6.1" />
+           </dependencies>
+        </d51pearpkg2>
+        <exec command="pear package" dir="${build.dir}" passthru="true" />
+        <exec command="mv Doctrine-${version}.tgz ../dist" dir="${build.dir}" passthru="true" />
+    </target>
+</project>
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/composer.json b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/composer.json
new file mode 100644
index 000000000..58741c701
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/composer.json
@@ -0,0 +1,19 @@
+{
+    "name": "lexpress/doctrine1",
+    "type": "library",
+    "description": "PHP5 Database ORM",
+    "keywords": ["orm", "database"],
+    "homepage": "http://www.doctrine-project.org",
+    "license": "LGPL",
+    "authors": [
+        {"name": "Konsta Vesterinen", "email": "kvesteri@cc.hut.fi"},
+        {"name": "Jonathan Wage", "email": "jonwage@gmail.com"}
+    ],
+    "require": {
+        "php": ">=5.2.3",
+        "ext-pdo": "*"
+    },
+    "autoload": {
+        "psr-0": { "Doctrine_": "lib/" }
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Access.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Access.php
similarity index 95%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Access.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Access.php
index 9a0db8da6..572ff7ff0 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Access.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Access.php
@@ -114,6 +114,12 @@ public function offsetExists($offset)
      */
     public function offsetGet($offset)
     {
+        // array notation with no index was causing 'undefined variable: $offset' notices in php7,
+        // for example:
+        // $record->Relations[]->name = 'test';
+        if (!isset($offset)) {
+            return $this->get(null);
+        }
         return $this->get($offset);
     }
 
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Adapter/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Adapter/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Adapter/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Adapter/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Adapter/Interface.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Adapter/Interface.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Adapter/Interface.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Adapter/Interface.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Adapter/Mock.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Adapter/Mock.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Adapter/Mock.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Adapter/Mock.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Adapter/Oracle.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Adapter/Oracle.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Adapter/Oracle.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Adapter/Oracle.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Adapter/Statement.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Adapter/Statement.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Adapter/Statement.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Adapter/Statement.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Adapter/Statement/Interface.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Adapter/Statement/Interface.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Adapter/Statement/Interface.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Adapter/Statement/Interface.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Adapter/Statement/Mock.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Adapter/Statement/Mock.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Adapter/Statement/Mock.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Adapter/Statement/Mock.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Adapter/Statement/Oracle.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Adapter/Statement/Oracle.php
similarity index 98%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Adapter/Statement/Oracle.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Adapter/Statement/Oracle.php
index b3d4fe354..0198f78f1 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Adapter/Statement/Oracle.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Adapter/Statement/Oracle.php
@@ -187,7 +187,10 @@ public function bindParam($column, &$variable, $type = null, $length = null, $dr
     public function closeCursor()
     {
         $this->bindParams = array();
-        return oci_free_statement($this->statement);
+        if (is_resource($this->statement)) {
+            return oci_free_statement($this->statement);
+        }
+        return true;
     }
 
     /** 
@@ -583,7 +586,7 @@ private function parseQuery($query=null)
         }
         $bind_index = 1;
         // Replace ? bind-placeholders with :oci_b_var_ variables
-        $query = preg_replace("/(\?)/e", '":oci_b_var_". $bind_index++' , $query);
+        $query = preg_replace_callback("/(\?)/", function($m) use(&$bind_index) { return ":oci_b_var_". $bind_index++; } , $query);
 
         $this->statement =  @oci_parse($this->connection, $query);
 
@@ -594,4 +597,4 @@ private function parseQuery($query=null)
 
         return $this->statement;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/AuditLog.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/AuditLog.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/AuditLog.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/AuditLog.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/AuditLog/Listener.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/AuditLog/Listener.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/AuditLog/Listener.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/AuditLog/Listener.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/AuditLog/Listener/Microtime.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/AuditLog/Listener/Microtime.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/AuditLog/Listener/Microtime.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/AuditLog/Listener/Microtime.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Builder.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Builder.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Builder.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Builder.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Cache/Apc.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Cache/Apc.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Cache/Apc.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Cache/Apc.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Cache/Array.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Cache/Array.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Cache/Array.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Cache/Array.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Cache/Db.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Cache/Db.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Cache/Db.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Cache/Db.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Cache/Driver.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Cache/Driver.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Cache/Driver.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Cache/Driver.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Cache/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Cache/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Cache/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Cache/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Cache/Interface.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Cache/Interface.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Cache/Interface.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Cache/Interface.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Cache/Memcache.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Cache/Memcache.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Cache/Memcache.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Cache/Memcache.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Cache/Xcache.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Cache/Xcache.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Cache/Xcache.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Cache/Xcache.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Cli.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Cli.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Cli.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Cli.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Cli/AnsiColorFormatter.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Cli/AnsiColorFormatter.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Cli/AnsiColorFormatter.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Cli/AnsiColorFormatter.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Cli/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Cli/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Cli/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Cli/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Cli/Formatter.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Cli/Formatter.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Cli/Formatter.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Cli/Formatter.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Collection.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Collection.php
similarity index 96%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Collection.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Collection.php
index 4f82c5810..57b68e17a 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Collection.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Collection.php
@@ -137,7 +137,7 @@ public function getTable()
      * @param array $data
      * @return Doctrine_Collection
      */
-    public function setData(array $data) 
+    public function setData(array $data)
     {
         $this->data = $data;
     }
@@ -200,7 +200,7 @@ public function unserialize($serialized)
     public function setKeyColumn($column)
     {
         $this->keyColumn = $column;
-        
+
         return $this;
     }
 
@@ -264,6 +264,18 @@ public function key()
         return key($this->data);
     }
 
+    /**
+     * Sort by key
+     *
+     * @return Doctrine_Collection
+     */
+    public function ksort()
+    {
+        ksort($this->data);
+
+        return $this;
+    }
+
     /**
      * Sets a reference pointer
      *
@@ -274,7 +286,7 @@ public function setReference(Doctrine_Record $record, Doctrine_Relation $relatio
         $this->reference = $record;
         $this->relation  = $relation;
 
-        if ($relation instanceof Doctrine_Relation_ForeignKey || 
+        if ($relation instanceof Doctrine_Relation_ForeignKey ||
                 $relation instanceof Doctrine_Relation_LocalKey) {
             $this->referenceField = $relation->getForeignFieldName();
 
@@ -330,7 +342,7 @@ public function contains($key)
     /**
      * Search a Doctrine_Record instance
      *
-     * @param string $Doctrine_Record 
+     * @param string $Doctrine_Record
      * @return void
      */
     public function search(Doctrine_Record $record)
@@ -371,7 +383,7 @@ public function get($key)
             if ($key === null) {
                 $this->data[] = $record;
             } else {
-                $this->data[$key] = $record;      	
+                $this->data[$key] = $record;
             }
 
             if (isset($this->keyColumn)) {
@@ -460,7 +472,7 @@ public function add($record, $key = null)
             $relations = $this->relation['table']->getRelations();
             foreach ($relations as $relation) {
                 if ($this->relation['class'] == $relation['localTable']->getOption('name') && $relation->getLocal() == $this->relation->getForeignFieldName()) {
-                    $record->$relation['alias'] = $this->reference;
+                    $record->{$relation['alias']} = $this->reference;
                     break;
                 }
             }
@@ -496,10 +508,10 @@ public function add($record, $key = null)
 
         return true;
     }
-    
+
     /**
      * Merges collection into $this and returns merged collection
-     * 
+     *
      * @param Doctrine_Collection $coll
      * @return Doctrine_Collection
      */
@@ -507,15 +519,15 @@ public function merge(Doctrine_Collection $coll)
     {
         $localBase = $this->getTable()->getComponentName();
         $otherBase = $coll->getTable()->getComponentName();
-        
+
         if ($otherBase != $localBase && !is_subclass_of($otherBase, $localBase) ) {
             throw new Doctrine_Collection_Exception("Can't merge collections with incompatible record types");
         }
-        
+
         foreach ($coll->getData() as $record) {
             $this->add($record);
         }
-        
+
         return $this;
     }
 
@@ -655,7 +667,7 @@ public function getNormalIterator()
     public function takeSnapshot()
     {
         $this->_snapshot = $this->data;
-        
+
         return $this;
     }
 
@@ -680,7 +692,7 @@ public function getSnapshot()
      *
      * @return Doctrine_Collection
      */
-    public function processDiff() 
+    public function processDiff()
     {
         foreach (array_udiff($this->_snapshot, $this->data, array($this, "compareRecords")) as $record) {
             $record->delete();
@@ -698,20 +710,20 @@ public function toArray($deep = true, $prefixKey = false)
     {
         $data = array();
         foreach ($this as $key => $record) {
-            
+
             $key = $prefixKey ? get_class($record) . '_' .$key:$key;
-            
+
             $data[$key] = $record->toArray($deep, $prefixKey);
         }
-        
+
         return $data;
     }
 
     /**
      * Build an array made up of the values from the 2 specified columns
      *
-     * @param string $key 
-     * @param string $value 
+     * @param string $key
+     * @param string $value
      * @return array $result
      */
     public function toKeyValueArray($key, $value)
@@ -774,7 +786,7 @@ public function toHierarchy()
     /**
      * Populate a Doctrine_Collection from an array of data
      *
-     * @param string $array 
+     * @param string $array
      * @return void
      */
     public function fromArray($array, $deep = true)
@@ -819,8 +831,8 @@ public function synchronizeFromArray(array $array)
     /**
      * Export a Doctrine_Collection to one of the supported Doctrine_Parser formats
      *
-     * @param string $type 
-     * @param string $deep 
+     * @param string $type
+     * @param string $deep
      * @return void
      */
     public function exportTo($type, $deep = true)
@@ -835,8 +847,8 @@ public function exportTo($type, $deep = true)
     /**
      * Import data to a Doctrine_Collection from one of the supported Doctrine_Parser formats
      *
-     * @param string $type 
-     * @param string $data 
+     * @param string $type
+     * @param string $data
      * @return void
      */
     public function importFrom($type, $data)
@@ -871,8 +883,8 @@ public function getInsertDiff()
     /**
      * Compares two records. To be used on _snapshot diffs using array_udiff
      *
-     * @param Doctrine_Record $a 
-     * @param Doctrine_Record $b 
+     * @param Doctrine_Record $a
+     * @param Doctrine_Record $b
      * @return integer
      */
     protected function compareRecords($a, $b)
@@ -880,12 +892,12 @@ protected function compareRecords($a, $b)
         if ($a->getOid() == $b->getOid()) {
             return 0;
         }
-        
+
         return ($a->getOid() > $b->getOid()) ? 1 : -1;
     }
 
     /**
-     * Saves all records of this collection and processes the 
+     * Saves all records of this collection and processes the
      * difference of the last snapshot and the current data
      *
      * @param Doctrine_Connection $conn     optional connection parameter
@@ -896,7 +908,7 @@ public function save(Doctrine_Connection $conn = null, $processDiff = true)
         if ($conn == null) {
             $conn = $this->_table->getConnection();
         }
-        
+
         try {
             $conn->beginInternalTransaction();
 
@@ -920,7 +932,7 @@ public function save(Doctrine_Connection $conn = null, $processDiff = true)
     }
 
     /**
-     * Replaces all records of this collection and processes the 
+     * Replaces all records of this collection and processes the
      * difference of the last snapshot and the current data
      *
      * @param Doctrine_Connection $conn     optional connection parameter
@@ -964,7 +976,7 @@ public function delete(Doctrine_Connection $conn = null, $clearColl = true)
         if ($conn == null) {
             $conn = $this->_table->getConnection();
         }
-        
+
         try {
             $conn->beginInternalTransaction();
             $conn->transaction->addCollection($this);
@@ -978,14 +990,14 @@ public function delete(Doctrine_Connection $conn = null, $clearColl = true)
             $conn->rollback();
             throw $e;
         }
-        
+
         if ($clearColl) {
             $this->clear();
         }
-        
+
         return $this;
     }
-    
+
     /**
      * Clears the collection.
      *
@@ -1039,7 +1051,7 @@ public function __toString()
     {
         return Doctrine_Lib::getCollectionAsString($this);
     }
-    
+
     /**
      * Returns the relation object
      *
@@ -1050,21 +1062,21 @@ public function getRelation()
         return $this->relation;
     }
 
-    /** 
-     * checks if one of the containing records is modified 
-     * returns true if modified, false otherwise 
-     *  
-     * @return boolean  
-     */ 
-    final public function isModified() { 
-        $dirty = (count($this->getInsertDiff()) > 0 || count($this->getDeleteDiff()) > 0); 
-        if ( ! $dirty) {  
-            foreach($this as $record) { 
+    /**
+     * checks if one of the containing records is modified
+     * returns true if modified, false otherwise
+     *
+     * @return boolean
+     */
+    final public function isModified() {
+        $dirty = (count($this->getInsertDiff()) > 0 || count($this->getDeleteDiff()) > 0);
+        if ( ! $dirty) {
+            foreach($this as $record) {
                 if ($dirty = $record->isModified()) {
                     break;
-                } 
-            } 
-        } 
-        return $dirty; 
+                }
+            }
+        }
+        return $dirty;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Collection/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Collection/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Collection/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Collection/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Collection/Iterator.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Collection/Iterator.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Collection/Iterator.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Collection/Iterator.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Collection/Iterator/Expandable.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Collection/Iterator/Expandable.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Collection/Iterator/Expandable.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Collection/Iterator/Expandable.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Collection/Iterator/Normal.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Collection/Iterator/Normal.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Collection/Iterator/Normal.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Collection/Iterator/Normal.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Collection/Iterator/Offset.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Collection/Iterator/Offset.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Collection/Iterator/Offset.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Collection/Iterator/Offset.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Collection/Offset.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Collection/Offset.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Collection/Offset.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Collection/Offset.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Collection/OnDemand.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Collection/OnDemand.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Collection/OnDemand.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Collection/OnDemand.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Column.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Column.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Column.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Column.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Compiler.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Compiler.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Compiler.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Compiler.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Compiler/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Compiler/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Compiler/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Compiler/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Configurable.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Configurable.php
similarity index 97%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Configurable.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Configurable.php
index 0db5c1db6..5a3493e81 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Configurable.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Configurable.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *  $Id: Configurable.php 7490 2010-03-29 19:53:27Z jwage $
+ *  $Id$
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -28,7 +28,7 @@
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link        www.doctrine-project.org
  * @since       1.0
- * @version     $Revision: 7490 $
+ * @version     $Revision$
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
 abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable
@@ -49,7 +49,7 @@ abstract class Doctrine_Configurable extends Doctrine_Locator_Injectable
      *                                      implementation classes
      */
     protected $_impl = array();
-    
+
     /**
      * @var array $_params                  an array of user defined parameters
      */
@@ -87,6 +87,7 @@ public function setAttribute($attribute, $value)
             case Doctrine_Core::ATTR_CACHE:
             case Doctrine_Core::ATTR_RESULT_CACHE:
             case Doctrine_Core::ATTR_QUERY_CACHE:
+            case Doctrine_Core::ATTR_TABLE_CACHE:
                 if ($value !== null) {
                     if ( ! ($value instanceof Doctrine_Cache_Interface)) {
                         throw new Doctrine_Exception('Cache driver should implement Doctrine_Cache_Interface');
@@ -121,43 +122,43 @@ public function getParams($namespace = null)
     	if ($namespace == null) {
     	    $namespace = $this->getAttribute(Doctrine_Core::ATTR_DEFAULT_PARAM_NAMESPACE);
     	}
-    	
+
     	if ( ! isset($this->_params[$namespace])) {
     	    return null;
     	}
 
         return $this->_params[$namespace];
     }
-    
+
     public function getParamNamespaces()
     {
         return array_keys($this->_params);
     }
 
-    public function setParam($name, $value, $namespace = null) 
+    public function setParam($name, $value, $namespace = null)
     {
     	if ($namespace == null) {
     	    $namespace = $this->getAttribute(Doctrine_Core::ATTR_DEFAULT_PARAM_NAMESPACE);
     	}
-    	
+
     	$this->_params[$namespace][$name] = $value;
-    	
+
     	return $this;
     }
-    
-    public function getParam($name, $namespace = null) 
+
+    public function getParam($name, $namespace = null)
     {
     	if ($namespace == null) {
     	    $namespace = $this->getAttribute(Doctrine_Core::ATTR_DEFAULT_PARAM_NAMESPACE);
     	}
-    	
+
         if ( ! isset($this->_params[$namespace][$name])) {
             if (isset($this->parent)) {
                 return $this->parent->getParam($name, $namespace);
             }
             return null;
         }
-        
+
         return $this->_params[$namespace][$name];
     }
 
@@ -194,8 +195,8 @@ public function getImpl($template)
         }
         return $this->_impl[$template];
     }
-    
-    
+
+
     public function hasImpl($template)
     {
         if ( ! isset($this->_impl[$template])) {
@@ -331,7 +332,7 @@ public function getAttribute($attribute)
         if (isset($this->attributes[$attribute])) {
             return $this->attributes[$attribute];
         }
-        
+
         if (isset($this->parent)) {
             return $this->parent->getAttribute($attribute);
         }
@@ -424,4 +425,4 @@ public function getParent()
     {
         return $this->parent;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection.php
similarity index 96%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection.php
index e094bc080..a6703a221 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *  $Id: Connection.php 7490 2010-03-29 19:53:27Z jwage $
+ *  $Id$
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -49,7 +49,7 @@
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link        www.doctrine-project.org
  * @since       1.0
- * @version     $Revision: 7490 $
+ * @version     $Revision$
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @author      Lukas Smith <smith@pooteeweet.org> (MDB2 library)
  */
@@ -179,9 +179,15 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
      * @var array $_userFkNames                 array of foreign key names that have been used
      */
     protected $_usedNames = array(
-            'foreign_keys' => array(),
-            'indexes' => array()
-        );
+        'foreign_keys' => array(),
+        'indexes' => array()
+    );
+
+    /**
+     * @var Doctrine_Cache_Interface  The cache driver used for caching tables.
+     */
+    protected $_tableCache;
+    protected $_tableCacheTTL;
 
     /**
      * the constructor
@@ -219,6 +225,8 @@ public function __construct(Doctrine_Manager $manager, $adapter, $user = null, $
         $this->setAttribute(Doctrine_Core::ATTR_ERRMODE, Doctrine_Core::ERRMODE_EXCEPTION);
 
         $this->getAttribute(Doctrine_Core::ATTR_LISTENER)->onOpen($this);
+
+        $this->_tableCacheTTL = $this->getAttribute(Doctrine_Core::ATTR_TABLE_CACHE_LIFESPAN);
     }
 
     /**
@@ -1116,6 +1124,20 @@ public function getTable($name)
             return $this->tables[$name];
         }
 
+        $hasTableCache = $this->_tableCache !== false && ($this->_tableCache || $this->getAttribute(Doctrine_Core::ATTR_TABLE_CACHE));
+        if ($hasTableCache) {
+            $tableCacheDriver = $this->getTableCacheDriver();
+            $hash = md5($name . 'DOCTRINE_TABLE_CACHE_SALT');
+            $cached = $tableCacheDriver->fetch($hash);
+
+            if ($cached) {
+                $table = unserialize($cached);
+                $table->initializeFromCache($this);
+
+                return $this->tables[$name] = $table;
+            }
+        }
+
         $class = sprintf($this->getAttribute(Doctrine_Core::ATTR_TABLE_CLASS_FORMAT), $name);
 
         if (class_exists($class, $this->getAttribute(Doctrine_Core::ATTR_AUTOLOAD_TABLE_CLASSES)) &&
@@ -1126,6 +1148,11 @@ public function getTable($name)
             $table = new $tableClass($name, $this, true);
         }
 
+        if ($hasTableCache) {
+            // Save cached query
+            $tableCacheDriver->save($hash, serialize($table), $this->getTableCacheLifeSpan());
+        }
+
         return $table;
     }
 
@@ -1181,6 +1208,7 @@ public function addTable(Doctrine_Table $table)
             return false;
         }
         $this->tables[$name] = $table;
+
         return true;
     }
 
@@ -1337,6 +1365,30 @@ public function getQueryCacheDriver()
         return $this->getAttribute(Doctrine_Core::ATTR_QUERY_CACHE);
     }
 
+    /**
+     * getQueryCacheDriver
+     *
+     * @return Doctrine_Cache_Interface
+     */
+    public function getTableCacheDriver()
+    {
+        if ( ! $this->getAttribute(Doctrine_Core::ATTR_TABLE_CACHE)) {
+            throw new Doctrine_Exception('Query Cache driver not initialized.');
+        }
+
+        return $this->getAttribute(Doctrine_Core::ATTR_TABLE_CACHE);
+    }
+
+    /**
+     * Gets the life span of the table cache the Query object is using.
+     *
+     * @return integer  The life span in seconds.
+     */
+    public function getTableCacheLifeSpan()
+    {
+        return $this->_tableCacheTTL;
+    }
+
     /**
      * lastInsertId
      *
@@ -1661,4 +1713,4 @@ protected function _generateUniqueName($type, $parts, $key, $format = '%s', $max
 
         return $name;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Common.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Common.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Common.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Common.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Db2.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Db2.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Db2.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Db2.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Mock.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Mock.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Mock.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Mock.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Module.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Module.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Module.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Module.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Mssql.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Mssql.php
similarity index 63%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Mssql.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Mssql.php
index 6cd8e6f08..ecce33f10 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Mssql.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Mssql.php
@@ -86,64 +86,37 @@ public function quoteIdentifier($identifier, $checkOption = false)
         if ($checkOption && ! $this->getAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER)) {
             return $identifier;
         }
-        
-        if (strpos($identifier, '.') !== false) { 
-            $parts = explode('.', $identifier); 
-            $quotedParts = array(); 
-            foreach ($parts as $p) { 
-                $quotedParts[] = $this->quoteIdentifier($p); 
+
+        if (strpos($identifier, '.') !== false) {
+            $parts = explode('.', $identifier);
+            $quotedParts = array();
+            foreach ($parts as $p) {
+                $quotedParts[] = $this->quoteIdentifier($p);
             }
-            
-            return implode('.', $quotedParts); 
+
+            return implode('.', $quotedParts);
         }
-        
-        return '[' . str_replace(']', ']]', $identifier) . ']';
+
+        return '[' . trim($identifier, '[]') . ']';
     }
 
     /**
      * Adds an adapter-specific LIMIT clause to the SELECT statement.
-     * [ original code borrowed from Zend Framework ]
-     *
-     * License available at: http://framework.zend.com/license
-     *
-     * Copyright (c) 2005-2008, Zend Technologies USA, Inc.
-     * All rights reserved.
-     * 
-     * Redistribution and use in source and binary forms, with or without modification,
-     * are permitted provided that the following conditions are met:
-     * 
-     *     * Redistributions of source code must retain the above copyright notice,
-     *       this list of conditions and the following disclaimer.
-     * 
-     *     * Redistributions in binary form must reproduce the above copyright notice,
-     *       this list of conditions and the following disclaimer in the documentation
-     *       and/or other materials provided with the distribution.
-     * 
-     *     * Neither the name of Zend Technologies USA, Inc. nor the names of its
-     *       contributors may be used to endorse or promote products derived from this
-     *       software without specific prior written permission.
-     * 
-     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-     * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-     * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-     * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-     * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-     * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-     * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-     * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-     * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-     * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+     * Inspired by Doctrine2 DBAL
      *
      * @param string $query
      * @param mixed $limit
      * @param mixed $offset
-     * @link http://lists.bestpractical.com/pipermail/rt-devel/2005-June/007339.html
+     * @param boolean $isSubQuery
+     * @param Doctrine_Query $queryOrigin
+     * @link https://github.com/doctrine/dbal/blob/master/lib/Doctrine/DBAL/Platforms/MsSqlPlatform.php#L607
+     * @link http://www.toosweettobesour.com/2010/09/16/doctrine-1-2-mssql-alternative-limitpaging/
      * @return string
      */
     public function modifyLimitQuery($query, $limit = false, $offset = false, $isManip = false, $isSubQuery = false, Doctrine_Query $queryOrigin = null)
     {
         if ($limit === false || !($limit > 0)) {
-            return $query; 
+            return $query;
         }
 
         $orderby = stristr($query, 'ORDER BY');
@@ -151,95 +124,49 @@ public function modifyLimitQuery($query, $limit = false, $offset = false, $isMan
         if ($offset !== false && $orderby === false) {
             throw new Doctrine_Connection_Exception("OFFSET cannot be used in MSSQL without ORDER BY due to emulation reasons.");
         }
-        
-        $count = intval($limit);
+
+        $limit = intval($limit);
         $offset = intval($offset);
 
         if ($offset < 0) {
             throw new Doctrine_Connection_Exception("LIMIT argument offset=$offset is not valid");
         }
 
-        $orderbySql = $queryOrigin->getSqlQueryPart('orderby');
-        $orderbyDql = $queryOrigin->getDqlPart('orderby');
-
-        if ($orderby !== false) {
-            $orders = $this->parseOrderBy(implode(', ', $queryOrigin->getDqlPart('orderby')));
-
-            for ($i = 0; $i < count($orders); $i++) {
-                $sorts[$i] = (stripos($orders[$i], ' desc') !== false) ? 'DESC' : 'ASC';
-                $orders[$i] = trim(preg_replace('/\s+(ASC|DESC)$/i', '', $orders[$i]));
-
-                list($fieldAliases[$i], $fields[$i]) = strstr($orders[$i], '.') ? explode('.', $orders[$i]) : array('', $orders[$i]);
-                $columnAlias[$i] = $queryOrigin->getSqlTableAlias($queryOrigin->getExpressionOwner($orders[$i]));
-
-                $cmp = $queryOrigin->getQueryComponent($queryOrigin->getExpressionOwner($orders[$i]));
-                $tables[$i] = $cmp['table'];
-                $columns[$i] = $cmp['table']->getColumnName($fields[$i]);
-
-                // TODO: This sould be refactored as method called Doctrine_Table::getColumnAlias(<column name>).
-                $aliases[$i] = $columnAlias[$i] . '__' . $columns[$i];
-            }
-        }
-
-        // Ticket #1259: Fix for limit-subquery in MSSQL
-        $selectRegExp = 'SELECT\s+';
-        $selectReplace = 'SELECT ';
-
-        if (preg_match('/^SELECT(\s+)DISTINCT/i', $query)) {
-            $selectRegExp .= 'DISTINCT\s+';
-            $selectReplace .= 'DISTINCT ';
-        }
-
-        $fields_string = substr($query, strlen($selectReplace), strpos($query, ' FROM ') - strlen($selectReplace));
-        $field_array = explode(',', $fields_string);
-        $field_array = array_shift($field_array);
-        $aux2 = preg_split('/ as /i', $field_array);
-        $aux2 = explode('.', end($aux2));
-        $key_field = trim(end($aux2));
-
-        $query = preg_replace('/^'.$selectRegExp.'/i', $selectReplace . 'TOP ' . ($count + $offset) . ' ', $query);
-
-        if ($isSubQuery === true) {
-            $query = 'SELECT TOP ' . $count . ' ' . $this->quoteIdentifier('inner_tbl') . '.' . $key_field . ' FROM (' . $query . ') AS ' . $this->quoteIdentifier('inner_tbl');
+        if ($offset == 0) {
+           $query = preg_replace('/^SELECT( DISTINCT)?\s/i', 'SELECT\1 TOP ' . $limit . ' ', $query);
         } else {
-            $query = 'SELECT * FROM (SELECT TOP ' . $count . ' * FROM (' . $query . ') AS ' . $this->quoteIdentifier('inner_tbl');
-        }
+            $over = stristr($query, 'ORDER BY');
 
-        if ($orderby !== false) {
-            $query .= ' ORDER BY '; 
-
-            for ($i = 0, $l = count($orders); $i < $l; $i++) { 
-                if ($i > 0) { // not first order clause 
-                    $query .= ', '; 
-                } 
-
-                $query .= $this->modifyOrderByColumn($tables[$i], $columns[$i], $this->quoteIdentifier('inner_tbl') . '.' . $this->quoteIdentifier($aliases[$i])) . ' '; 
-                $query .= (stripos($sorts[$i], 'asc') !== false) ? 'DESC' : 'ASC';
+            if (!$over) {
+                $over = 'ORDER BY (SELECT 0)';
+            } else {
+                // Remove ORDER BY clause from $query
+                $query = stristr($query, 'ORDER BY', true);
             }
-        }
 
-        if ($isSubQuery !== true) {
-            $query .= ') AS ' . $this->quoteIdentifier('outer_tbl');
+            // Remove the first SELECT from query
+            $query = substr($query, strlen('SELECT '));
+            $select = 'SELECT';
 
-            if ($orderby !== false) {
-                $query .= ' ORDER BY ';
+            if (0 === strpos($query, 'DISTINCT'))
+            {
+              $query = substr($query, strlen('DISTINCT '));
+              $select .= ' DISTINCT';
+            }
 
-                for ($i = 0, $l = count($orders); $i < $l; $i++) {
-                    if ($i > 0) { // not first order clause
-                        $query .= ', ';
-                    }
+            $start = $offset + 1;
+            $end = $offset + $limit;
 
-                    $query .= $this->modifyOrderByColumn($tables[$i], $columns[$i], $this->quoteIdentifier('outer_tbl') . '.' . $this->quoteIdentifier($aliases[$i])) . ' ' . $sorts[$i];
-                }
-            }
+            $query = "SELECT * FROM ($select ROW_NUMBER() OVER ($over) AS [DOCTRINE_ROWNUM], $query) AS [doctrine_tbl] WHERE [DOCTRINE_ROWNUM] BETWEEN $start AND $end";
         }
 
         return $query;
     }
 
+
     /**
-     * Parse an OrderBy-Statement into chunks 
-     * 
+     * Parse an OrderBy-Statement into chunks
+     *
      * @param string $orderby
      */
     private function parseOrderBy($orderby)
@@ -250,31 +177,31 @@ private function parseOrderBy($orderby)
         $parsed  = str_ireplace('ORDER BY', '', $orderby);
 
         preg_match_all('/(\w+\(.+?\)\s+(ASC|DESC)),?/', $orderby, $matches);
-        
+
         $matchesWithExpressions = $matches[1];
 
         foreach ($matchesWithExpressions as $match) {
             $chunks[] = $match;
             $parsed = str_replace($match, '##' . (count($chunks) - 1) . '##', $parsed);
         }
-        
+
         $tokens = preg_split('/,/', $parsed);
-        
+
         for ($i = 0, $iMax = count($tokens); $i < $iMax; $i++) {
-            $tokens[$i] = trim(preg_replace('/##(\d+)##/e', "\$chunks[\\1]", $tokens[$i]));
+            $tokens[$i] = trim(preg_replace_callback('/##(\d+)##/', function($m) { return $chunks[$m[1]]; }, $tokens[$i]));
         }
 
         return $tokens;
     }
-    
+
     /**
      * Order and Group By are not possible on columns from type text.
-     * This method fix this issue by wrap the given term (column) into a CAST directive. 
-     * 
+     * This method fix this issue by wrap the given term (column) into a CAST directive.
+     *
      * @see DC-828
      * @param Doctrine_Table $table
      * @param string $field
-     * @param string $term The term which will changed if it's necessary, depending to the field type. 
+     * @param string $term The term which will changed if it's necessary, depending to the field type.
      * @return string
      */
     public function modifyOrderByColumn(Doctrine_Table $table, $field, $term)
@@ -284,7 +211,7 @@ public function modifyOrderByColumn(Doctrine_Table $table, $field, $term)
         if ($def['type'] == 'string' && $def['length'] === NULL) {
             $term = 'CAST(' . $term . ' AS varchar(8000))';
         }
-        
+
         return $term;
     }
 
@@ -298,7 +225,7 @@ public function modifyLimitSubquery(Doctrine_Table $rootTable, $query, $limit =
     {
         return $this->modifyLimitQuery($query, $limit, $offset, $isManip, true);
     }
-    
+
     /**
      * return version information about the server
      *
@@ -398,18 +325,19 @@ public function exec($query, array $params = array())
      * @param string $query
      * @param array $params
      */
-    protected function replaceBoundParamsWithInlineValuesInQuery($query, array $params) {
-
+    protected function replaceBoundParamsWithInlineValuesInQuery($query, array $params)
+    {
         foreach($params as $key => $value) {
             $re = '/(?<=WHERE|VALUES|SET|JOIN)(.*?)(\?)/';
             $query = preg_replace($re, "\\1##{$key}##", $query, 1);
         }
-        
-        $replacement = 'is_null($value) ? \'NULL\' : $this->quote($params[\\1])';
-        $query = preg_replace('/##(\d+)##/e', $replacement, $query);
 
-        return $query;
+        $self = $this;
+        $query = preg_replace_callback('/##(\d+)##/', function($m) use ($params, $self) {
+            return (null === $params[$m[1]]) ? 'NULL' : $self->quote($params[$m[1]]);
+        }, $query);
 
+        return $query;
     }
 
     /**
@@ -452,4 +380,4 @@ public function insert(Doctrine_Table $table, array $fields)
 
         return parent::insert($table, $fields);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Mssql/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Mssql/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Mssql/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Mssql/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Mysql.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Mysql.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Mysql.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Mysql.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Mysql/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Mysql/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Mysql/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Mysql/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Oracle.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Oracle.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Oracle.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Oracle.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Oracle/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Oracle/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Oracle/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Oracle/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Pgsql.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Pgsql.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Pgsql.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Pgsql.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Pgsql/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Pgsql/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Pgsql/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Pgsql/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Profiler.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Profiler.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Profiler.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Profiler.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Profiler/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Profiler/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Profiler/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Profiler/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Sqlite.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Sqlite.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Sqlite.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Sqlite.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Sqlite/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Sqlite/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Sqlite/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Sqlite/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Statement.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Statement.php
similarity index 97%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Statement.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Statement.php
index ccbec132b..32efaa96c 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/Statement.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/Statement.php
@@ -59,7 +59,16 @@ public function __construct(Doctrine_Connection $conn, $stmt)
             throw new Doctrine_Exception('Unknown statement object given.');
         }
     }
-
+    /**
+     * destructor
+     *
+     * make sure that the cursor is closed
+     *
+     */
+    public function __destruct()
+    {
+        $this->closeCursor();
+    }
     /**
      * getConnection
      * returns the connection object this statement uses
@@ -261,6 +270,12 @@ public function execute($params = null)
 
             $this->_conn->getListener()->postStmtExecute($event);
 
+            //fix a possible "ORA-01000: maximum open cursors exceeded" when many non-SELECTs are executed and the profiling is enabled
+            $queryBeginningSubstring = strtoupper(substr(ltrim($this->_stmt->queryString), 0, 6));
+            if ($queryBeginningSubstring != 'SELECT' && substr($queryBeginningSubstring, 0, 4) != 'WITH' ){
+                $this->closeCursor();
+            }
+
             return $result;
         } catch (PDOException $e) {
         } catch (Doctrine_Adapter_Exception $e) {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/UnitOfWork.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/UnitOfWork.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Connection/UnitOfWork.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Connection/UnitOfWork.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Core.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Core.php
similarity index 95%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Core.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Core.php
index 97a8f104b..5d46e6f3d 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Core.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Core.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *  $Id: Doctrine.php 6483 2009-10-12 17:29:18Z jwage $
+ *  $Id$
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -28,7 +28,7 @@
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link        www.doctrine-project.org
  * @since       1.0
- * @version     $Revision: 6483 $
+ * @version     $Revision$
  */
 class Doctrine_Core
 {
@@ -180,7 +180,7 @@ class Doctrine_Core
     const ATTR_NAME_PREFIX                  = 121;
     const ATTR_CREATE_TABLES                = 122;
     const ATTR_COLL_LIMIT                   = 123;
-                                        
+
     const ATTR_CACHE                        = 150;
     const ATTR_RESULT_CACHE                 = 150;
     const ATTR_CACHE_LIFESPAN               = 151;
@@ -210,6 +210,11 @@ class Doctrine_Core
     const ATTR_MODEL_CLASS_PREFIX           = 178;
     const ATTR_TABLE_CLASS_FORMAT           = 179;
     const ATTR_MAX_IDENTIFIER_LENGTH        = 180;
+    const ATTR_USE_TABLE_REPOSITORY         = 181;
+    const ATTR_USE_TABLE_IDENTITY_MAP       = 182;
+    const ATTR_TABLE_CACHE                  = 183;
+    const ATTR_TABLE_CACHE_LIFESPAN         = 184;
+
 
     /**
      * LIMIT CONSTANTS
@@ -347,12 +352,12 @@ class Doctrine_Core
      * HYDRATE_NONE
      */
     const HYDRATE_NONE              = 4;
-    
+
     /**
      * HYDRATE_SCALAR
      */
     const HYDRATE_SCALAR            = 5;
-    
+
     /**
      * HYDRATE_SINGLE_SCALAR
      */
@@ -362,14 +367,14 @@ class Doctrine_Core
      * HYDRATE_ON_DEMAND
      */
     const HYDRATE_ON_DEMAND         = 7;
-    
+
     /**
-     * HYDRATE_ARRAY_HIERARCHY     
+     * HYDRATE_ARRAY_HIERARCHY
      */
     const HYDRATE_ARRAY_HIERARCHY   = 8;
-    
+
     /**
-     * HYDRATE_RECORD_HIERARCHY     
+     * HYDRATE_RECORD_HIERARCHY
      */
     const HYDRATE_RECORD_HIERARCHY  = 9;
 
@@ -403,9 +408,9 @@ class Doctrine_Core
      */
     const VALIDATE_ALL              = 7;
 
-    /** 
+    /**
      * VALIDATE_USER
-     */ 
+     */
     const VALIDATE_USER             = 8;
 
     /**
@@ -457,7 +462,7 @@ class Doctrine_Core
      * MODEL_LOADING_PEAR
      *
      * Constant for pear model loading
-     * Will simply store the path passed to Doctrine_Core::loadModels() 
+     * Will simply store the path passed to Doctrine_Core::loadModels()
      * and Doctrine_Core::autoload() will check there
      */
     const MODEL_LOADING_PEAR = 3;
@@ -568,7 +573,7 @@ public static function getPath()
     /**
      * Set the path to autoload extension classes from
      *
-     * @param string $extensionsPath 
+     * @param string $extensionsPath
      * @return void
      */
     public static function setExtensionsPath($extensionsPath)
@@ -600,7 +605,7 @@ public static function loadModel($className, $path = null)
      * Set the directory where your models are located for PEAR style
      * naming convention autoloading.
      *
-     * @param string $directory 
+     * @param string $directory
      * @return void
      */
     public static function setModelsDirectory($directory)
@@ -646,10 +651,10 @@ public static function loadModels($directory, $modelLoading = null, $classPrefix
 
                 $it = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir),
                                                         RecursiveIteratorIterator::LEAVES_ONLY);
-                                                        
+
                 foreach ($it as $file) {
                     $e = explode('.', $file->getFileName());
-                    
+
                     if (end($e) === 'php' && strpos($file->getFileName(), '.inc') === false) {
                         if ($modelLoading == Doctrine_Core::MODEL_LOADING_PEAR) {
                             $className = str_replace($dir . DIRECTORY_SEPARATOR, null, $file->getPathName());
@@ -672,10 +677,16 @@ public static function loadModels($directory, $modelLoading = null, $classPrefix
                                 $declaredBefore = get_declared_classes();
                                 require_once($file->getPathName());
                                 $declaredAfter = get_declared_classes();
-                                
-                                // Using array_slice because array_diff is broken is some PHP versions
-                                $foundClasses = array_slice($declaredAfter, count($declaredBefore));
-                                
+
+                                if (defined('HHVM_VERSION')) {
+                                    // on HHVM get_declared_classes() returns in a different order, array_diff() works, so we have to use it
+                                    $foundClasses = array_diff($declaredAfter, $declaredBefore);
+                                } else {
+                                    // Using array_slice because array_diff is broken is some PHP versions
+                                    // https://bugs.php.net/bug.php?id=47643
+                                    $foundClasses = array_slice($declaredAfter, count($declaredBefore));
+                                }
+
                                 if ($foundClasses) {
                                     foreach ($foundClasses as $className) {
                                         if (self::isValidModelClass($className)) {
@@ -685,7 +696,7 @@ public static function loadModels($directory, $modelLoading = null, $classPrefix
                                         }
                                     }
                                 }
-                                
+
                                 $previouslyLoaded = array_keys(self::$_loadedModelFiles, $file->getPathName());
 
                                 if ( ! empty($previouslyLoaded)) {
@@ -700,9 +711,9 @@ public static function loadModels($directory, $modelLoading = null, $classPrefix
                 }
             }
         }
-        
+
         asort($loadedModels);
-        
+
         return $loadedModels;
     }
 
@@ -743,8 +754,14 @@ public static function initializeModels($models)
             Doctrine_Core::getTable($model);
 
             $declaredAfter = get_declared_classes();
-            // Using array_slice because array_diff is broken is some PHP versions
-            $foundClasses = array_slice($declaredAfter, count($declaredBefore) - 1);
+            if (defined('HHVM_VERSION')) {
+                // on HHVM get_declared_classes() returns in a different order, array_diff() works, so we have to use it
+                $foundClasses = array_diff($declaredAfter, $declaredBefore);
+            } else {
+                // Using array_slice because array_diff is broken is some PHP versions
+                // https://bugs.php.net/bug.php?id=47643
+                $foundClasses = array_slice($declaredAfter, count($declaredBefore) - 1);
+            }
             foreach ($foundClasses as $class) {
                 if (self::isValidModelClass($class)) {
                     $models[] = $class;
@@ -999,11 +1016,11 @@ public static function dumpData($yamlPath, $individualFiles = false)
      * @param string $append Whether or not to append the data
      * @return void
      */
-    public static function loadData($yamlPath, $append = false)
+    public static function loadData($yamlPath, $append = false, $charset = 'UTF-8')
     {
         $data = new Doctrine_Data();
 
-        return $data->importData($yamlPath, 'yml', array(), $append);
+        return $data->importData($yamlPath, 'yml', array(), $append, $charset);
     }
 
     /**
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Data.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Data.php
similarity index 85%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Data.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Data.php
index 2fb2f6901..b9bcd118d 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Data.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Data.php
@@ -21,7 +21,7 @@
 
 /**
  * Doctrine_Data
- * 
+ *
  * Base Doctrine_Data class for dumping and loading data to and from fixtures files.
  * Support formats are based on what formats are available in Doctrine_Parser such as yaml, xml, json, etc.
  *
@@ -46,7 +46,7 @@ class Doctrine_Data
 
     /**
      * format
-     * 
+     *
      * the default and current format we are working with
      *
      * @var string
@@ -80,12 +80,14 @@ class Doctrine_Data
      */
     protected $_exportIndividualFiles = false;
 
+    protected $_charset = 'UTF-8';
+
     /**
      * setFormat
      *
      * Set the current format we are working with
-     * 
-     * @param string $format 
+     *
+     * @param string $format
      * @return void
      */
     public function setFormat($format)
@@ -97,7 +99,7 @@ public function setFormat($format)
      * getFormat
      *
      * Get the current format we are working with
-     * 
+     *
      * @return void
      */
     public function getFormat()
@@ -106,10 +108,10 @@ public function getFormat()
     }
 
     /**
-     * getFormats 
+     * getFormats
      *
      * Get array of available formats
-     * 
+     *
      * @return void
      */
     public function getFormats()
@@ -121,7 +123,7 @@ public function getFormats()
      * setDirectory
      *
      * Set the array/string of directories or yml file paths
-     * 
+     *
      * @return void
      */
     public function setDirectory($directory)
@@ -133,7 +135,7 @@ public function setDirectory($directory)
      * getDirectory
      *
      * Get directory for dumping/loading data from and to
-     * 
+     *
      * @return void
      */
     public function getDirectory()
@@ -145,8 +147,8 @@ public function getDirectory()
      * setModels
      *
      * Set the array of specified models to work with
-     * 
-     * @param string $models 
+     *
+     * @param string $models
      * @return void
      */
     public function setModels($models)
@@ -167,10 +169,10 @@ public function getModels()
     }
 
     /**
-     * _exportIndividualFiles 
+     * _exportIndividualFiles
      *
      * Set/Get whether or not to export individual files
-     * 
+     *
      * @return bool $_exportIndividualFiles
      */
     public function exportIndividualFiles($bool = null)
@@ -178,19 +180,29 @@ public function exportIndividualFiles($bool = null)
         if ($bool !== null) {
             $this->_exportIndividualFiles = $bool;
         }
-        
+
         return $this->_exportIndividualFiles;
     }
 
+    public function setCharset($charset)
+    {
+        $this->_charset = $charset;
+    }
+
+    public function getCharset()
+    {
+        return $this->_charset;
+    }
+
     /**
      * exportData
      *
      * Interface for exporting data to fixtures files from Doctrine models
      *
-     * @param string $directory 
-     * @param string $format 
-     * @param string $models 
-     * @param string $_exportIndividualFiles 
+     * @param string $directory
+     * @param string $format
+     * @param string $models
+     * @param string $_exportIndividualFiles
      * @return void
      */
     public function exportData($directory, $format = 'yml', $models = array(), $_exportIndividualFiles = false)
@@ -199,7 +211,7 @@ public function exportData($directory, $format = 'yml', $models = array(), $_exp
         $export->setFormat($format);
         $export->setModels($models);
         $export->exportIndividualFiles($_exportIndividualFiles);
-        
+
         return $export->doExport();
     }
 
@@ -208,17 +220,18 @@ public function exportData($directory, $format = 'yml', $models = array(), $_exp
      *
      * Interface for importing data from fixture files to Doctrine models
      *
-     * @param string $directory 
-     * @param string $format 
-     * @param string $models 
+     * @param string $directory
+     * @param string $format
+     * @param string $models
      * @return void
      */
-    public function importData($directory, $format = 'yml', $models = array(), $append = false)
+    public function importData($directory, $format = 'yml', $models = array(), $append = false, $charset = 'UTF-8')
     {
         $import = new Doctrine_Data_Import($directory);
         $import->setFormat($format);
         $import->setModels($models);
-        
+        $import->setCharset($charset);
+
         return $import->doImport($append);
     }
 
@@ -226,33 +239,33 @@ public function importData($directory, $format = 'yml', $models = array(), $appe
      * isRelation
      *
      * Check if a fieldName on a Doctrine_Record is a relation, if it is we return that relationData
-     * 
-     * @param string $Doctrine_Record 
-     * @param string $fieldName 
+     *
+     * @param string $Doctrine_Record
+     * @param string $fieldName
      * @return void
      */
     public function isRelation(Doctrine_Record $record, $fieldName)
     {
         $relations = $record->getTable()->getRelations();
-        
+
         foreach ($relations as $relation) {
             $relationData = $relation->toArray();
-            
+
             if ($relationData['local'] === $fieldName) {
                 return $relationData;
             }
-            
+
         }
-        
+
         return false;
     }
 
     /**
      * purge
-     * 
+     *
      * Purge all data for loaded models or for the passed array of Doctrine_Records
      *
-     * @param string $models 
+     * @param string $models
      * @return void
      */
     public function purge($models = null)
@@ -269,11 +282,15 @@ public function purge($models = null)
         }
 
         foreach ($connections as $connection => $models) {
-            $models = Doctrine_Manager::getInstance()->getConnection($connection)->unitOfWork->buildFlushTree($models);
-            $models = array_reverse($models);
+            $conn = Doctrine_Manager::getInstance()->getConnection($connection);
+            $conn->beginTransaction();
+
+            $models = array_reverse($conn->unitOfWork->buildFlushTree($models));
             foreach ($models as $model) {
                 Doctrine_Core::getTable($model)->createQuery()->delete()->execute();
             }
+
+            $conn->commit();
         }
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Data/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Data/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Data/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Data/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Data/Export.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Data/Export.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Data/Export.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Data/Export.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Data/Import.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Data/Import.php
similarity index 98%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Data/Import.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Data/Import.php
index 649acbfed..23d0f6079 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Data/Import.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Data/Import.php
@@ -78,12 +78,12 @@ public function doParsing()
 
                 // If they specified a specific yml file
                 if (end($e) == 'yml') {
-                    $array = $mergeFunction($array, Doctrine_Parser::load($dir, $this->getFormat()));
+                    $array = $mergeFunction($array, Doctrine_Parser::load($dir, $this->getFormat(), $this->getCharset()));
                 // If they specified a directory
                 } else if (is_dir($dir)) {
                     $it = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir),
                                                             RecursiveIteratorIterator::LEAVES_ONLY);
-                    $filesOrdered = array();                                        
+                    $filesOrdered = array();
                     foreach ($it as $file) {
                         $filesOrdered[] = $file;
                     }
@@ -92,7 +92,7 @@ public function doParsing()
                     foreach ($filesOrdered as $file) {
                         $e = explode('.', $file->getFileName());
                         if (in_array(end($e), $this->getFormats())) {
-                            $array = $mergeFunction($array, Doctrine_Parser::load($file->getPathName(), $this->getFormat()));
+                            $array = $mergeFunction($array, Doctrine_Parser::load($file->getPathName(), $this->getFormat(), $this->getCharset()));
                         }
                     }
                 }
@@ -138,7 +138,7 @@ protected function _buildRows($className, $data)
                         $rel = $table->getRelation($key);
                         $relClassName = $rel->getTable()->getOption('name');
                         $relRowKey = $rowKey . '_' . $relClassName;
-            
+
                         if ($rel->getType() == Doctrine_Relation::ONE) {
                             $val = array($relRowKey => $value);
                             $this->_rows[$className][$rowKey][$key] = $relRowKey;
@@ -146,7 +146,7 @@ protected function _buildRows($className, $data)
                             $val = $value;
                             $this->_rows[$className][$rowKey][$key] = array_keys($val);
                         }
-            
+
                         $this->_buildRows($relClassName, $val);
                     }
                 }
@@ -183,7 +183,7 @@ protected function _buildNestedSetRows($className, $data)
      */
     protected function _getImportedObject($rowKey, Doctrine_Record $record, $relationName, $referringRowKey)
     {
-        $relation = $record->getTable()->getRelation($relationName); 
+        $relation = $record->getTable()->getRelation($relationName);
         $rowKey = $this->_getRowKeyPrefix($relation->getTable()) . $rowKey;
 
         if ( ! isset($this->_importedObjects[$rowKey])) {
@@ -338,6 +338,7 @@ protected function _loadData(array $array)
         foreach ($manager as $connection) {
             $tree = $connection->unitOfWork->buildFlushTree(array_keys($array));
 
+            $connection->beginTransaction();
             foreach ($tree as $model) {
                 foreach ($this->_importedObjects as $obj) {
 
@@ -346,8 +347,8 @@ protected function _loadData(array $array)
                     }
                 }
             }
+            $connection->commit();
         }
-
     }
 
     /**
@@ -399,4 +400,4 @@ protected function _getRowKeyPrefix(Doctrine_Table $table)
     {
         return sprintf('(%s) ', $table->getTableName());
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/DataDict.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/DataDict.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/DataDict.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/DataDict.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/DataDict/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/DataDict/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/DataDict/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/DataDict/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/DataDict/Mssql.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/DataDict/Mssql.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/DataDict/Mssql.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/DataDict/Mssql.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/DataDict/Mysql.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/DataDict/Mysql.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/DataDict/Mysql.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/DataDict/Mysql.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/DataDict/Oracle.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/DataDict/Oracle.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/DataDict/Oracle.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/DataDict/Oracle.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/DataDict/Pgsql.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/DataDict/Pgsql.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/DataDict/Pgsql.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/DataDict/Pgsql.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/DataDict/Sqlite.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/DataDict/Sqlite.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/DataDict/Sqlite.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/DataDict/Sqlite.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Event.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Event.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Event.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Event.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/EventListener.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/EventListener.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/EventListener.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/EventListener.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/EventListener/Chain.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/EventListener/Chain.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/EventListener/Chain.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/EventListener/Chain.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/EventListener/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/EventListener/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/EventListener/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/EventListener/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/EventListener/Interface.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/EventListener/Interface.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/EventListener/Interface.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/EventListener/Interface.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Export.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Export.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Export.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Export.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Export/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Export/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Export/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Export/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Export/Mssql.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Export/Mssql.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Export/Mssql.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Export/Mssql.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Export/Mysql.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Export/Mysql.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Export/Mysql.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Export/Mysql.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Export/Oracle.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Export/Oracle.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Export/Oracle.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Export/Oracle.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Export/Pgsql.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Export/Pgsql.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Export/Pgsql.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Export/Pgsql.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Export/Reporter.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Export/Reporter.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Export/Reporter.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Export/Reporter.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Export/Schema.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Export/Schema.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Export/Schema.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Export/Schema.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Export/Sqlite.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Export/Sqlite.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Export/Sqlite.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Export/Sqlite.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Expression.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Expression.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Expression.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Expression.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Expression/Driver.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Expression/Driver.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Expression/Driver.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Expression/Driver.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Expression/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Expression/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Expression/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Expression/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Expression/Mock.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Expression/Mock.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Expression/Mock.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Expression/Mock.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Expression/Mssql.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Expression/Mssql.php
similarity index 79%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Expression/Mssql.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Expression/Mssql.php
index 0dea240fc..dc4f49437 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Expression/Mssql.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Expression/Mssql.php
@@ -101,4 +101,35 @@ public function length($column)
     {
         return 'LEN (' . $column . ')';
     }
-}
\ No newline at end of file
+
+    /**
+     * Returns an integer representing the specified datepart of the specified date.
+     *
+     * datepart
+     *
+     * Is the parameter that specifies the part of the date to return. The table lists dateparts and abbreviations recognized by Microsoft¨ SQL Serverª.
+     *
+     * Datepart Abbreviations
+     * year yy, yyyy
+     * quarter qq, q
+     * month mm, m
+     * dayofyear dy, y
+     * day dd, d
+     * week wk, ww
+     * weekday dw
+     * hour hh
+     * minute mi, n
+     * second ss, s
+     * millisecond ms
+     *
+     * @param $datepart
+     * @param $date
+     */
+    public function date_part($datepart, $date)
+    {
+        // remove ' and " from datepart for dblib
+        $datepart = str_replace(array('\'', '"'), '', $datepart);
+
+        return 'DATEPART(' . $datepart . ', ' . $date . ')';
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Expression/Mysql.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Expression/Mysql.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Expression/Mysql.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Expression/Mysql.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Expression/Oracle.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Expression/Oracle.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Expression/Oracle.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Expression/Oracle.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Expression/Pgsql.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Expression/Pgsql.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Expression/Pgsql.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Expression/Pgsql.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Expression/Sqlite.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Expression/Sqlite.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Expression/Sqlite.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Expression/Sqlite.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/File.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/File.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/File.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/File.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/File/Index.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/File/Index.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/File/Index.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/File/Index.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Formatter.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Formatter.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Formatter.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Formatter.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hook.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hook.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hook.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hook.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hook/Equal.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hook/Equal.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hook/Equal.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hook/Equal.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hook/Integer.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hook/Integer.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hook/Integer.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hook/Integer.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hook/Parser.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hook/Parser.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hook/Parser.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hook/Parser.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hook/Parser/Complex.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hook/Parser/Complex.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hook/Parser/Complex.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hook/Parser/Complex.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hook/WordLike.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hook/WordLike.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hook/WordLike.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hook/WordLike.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hydrator.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hydrator.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hydrator.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hydrator.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hydrator/Abstract.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hydrator/Abstract.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hydrator/Abstract.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hydrator/Abstract.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hydrator/ArrayDriver.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hydrator/ArrayDriver.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hydrator/ArrayDriver.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hydrator/ArrayDriver.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hydrator/ArrayHierarchyDriver.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hydrator/ArrayHierarchyDriver.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hydrator/ArrayHierarchyDriver.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hydrator/ArrayHierarchyDriver.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hydrator/ArrayShallowDriver.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hydrator/ArrayShallowDriver.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hydrator/ArrayShallowDriver.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hydrator/ArrayShallowDriver.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hydrator/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hydrator/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hydrator/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hydrator/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hydrator/Graph.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hydrator/Graph.php
similarity index 95%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hydrator/Graph.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hydrator/Graph.php
index b1fa90ac5..726aed31f 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hydrator/Graph.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hydrator/Graph.php
@@ -74,15 +74,15 @@ public function hydrateResultSet($stmt)
         $id = array();
         $idTemplate = array();
 
-        // Initialize 
-        foreach ($this->_queryComponents as $dqlAlias => $data) { 
-            $componentName = $data['table']->getComponentName(); 
-            $instances[$componentName] = $data['table']->getRecordInstance(); 
-            $listeners[$componentName] = $data['table']->getRecordListener(); 
-            $identifierMap[$dqlAlias] = array(); 
-            $prev[$dqlAlias] = null; 
-            $idTemplate[$dqlAlias] = ''; 
-        } 
+        // Initialize
+        foreach ($this->_queryComponents as $dqlAlias => $data) {
+            $componentName = $data['table']->getComponentName();
+            $instances[$componentName] = $data['table']->getRecordInstance();
+            $listeners[$componentName] = $data['table']->getRecordListener();
+            $identifierMap[$dqlAlias] = array();
+            $prev[$dqlAlias] = null;
+            $idTemplate[$dqlAlias] = '';
+        }
         $cache = array();
 
         $result = $this->getElementCollection($rootComponentName);
@@ -109,33 +109,34 @@ public function hydrateResultSet($stmt)
                 }
             }
             $activeRootIdentifier = null;
-        } else { 
-            $data = $stmt->fetch(Doctrine_Core::FETCH_ASSOC); 
-            if ( ! $data) { 
-                return $result; 
+        } else {
+            $data = $stmt->fetch(Doctrine_Core::FETCH_ASSOC);
+            if ( ! $data) {
+                $stmt->closeCursor();
+                return $result;
             }
         }
 
         do {
             $table = $this->_queryComponents[$rootAlias]['table'];
-        
+
             if ($table->getConnection()->getAttribute(Doctrine_Core::ATTR_PORTABILITY) & Doctrine_Core::PORTABILITY_RTRIM) {
                 array_map('rtrim', $data);
             }
-        
+
             $id = $idTemplate; // initialize the id-memory
             $nonemptyComponents = array();
             $rowData = $this->_gatherRowData($data, $cache, $id, $nonemptyComponents);
 
-            if ($this->_hydrationMode == Doctrine_Core::HYDRATE_ON_DEMAND)  { 
-                if (is_null($activeRootIdentifier)) { 
-                    // first row for this record 
-                    $activeRootIdentifier = $id[$rootAlias]; 
-                } else if ($activeRootIdentifier != $id[$rootAlias]) { 
-                    // first row for the next record 
-                    $this->_priorRow = $data; 
-                    return $result; 
-                } 
+            if ($this->_hydrationMode == Doctrine_Core::HYDRATE_ON_DEMAND)  {
+                if (is_null($activeRootIdentifier)) {
+                    // first row for this record
+                    $activeRootIdentifier = $id[$rootAlias];
+                } else if ($activeRootIdentifier != $id[$rootAlias]) {
+                    // first row for the next record
+                    $this->_priorRow = $data;
+                    return $result;
+                }
             }
 
             //
@@ -235,9 +236,9 @@ public function hydrateResultSet($stmt)
                                 }
                                 $prev[$parent][$relationAlias][$element[$field]] = $element;
                             } else {
-                                $prev[$parent][$relationAlias][] = $element; 
+                                $prev[$parent][$relationAlias][] = $element;
                             }
-                            $identifierMap[$path][$id[$parent]][$id[$dqlAlias]] = $this->getLastKey($prev[$parent][$relationAlias]);                            
+                            $identifierMap[$path][$id[$parent]][$id[$dqlAlias]] = $this->getLastKey($prev[$parent][$relationAlias]);
                         }
                         $collection = $prev[$parent][$relationAlias];
                         if ($collection instanceof Doctrine_Collection && $indexField) {
@@ -263,7 +264,7 @@ public function hydrateResultSet($stmt)
                         $prev[$parent][$relationAlias] = $element;
                     }
                 }
-                if ($prev[$parent][$relationAlias] !== null) {
+                if ($prev[$parent][$relationAlias] !== null && !$prev[$parent][$relationAlias] instanceof Doctrine_Null) {
                     $coll =& $prev[$parent][$relationAlias];
                     $this->setLastElement($prev, $coll, $index, $dqlAlias, $oneToOne);
                 }
@@ -289,7 +290,7 @@ protected function _gatherRowData(&$data, &$cache, &$id, &$nonemptyComponents)
         $rowData = array();
 
         foreach ($data as $key => $value) {
-            // Parse each column name only once. Cache the results. 
+            // Parse each column name only once. Cache the results.
             if ( ! isset($cache[$key])) {
                 // check ignored names. fastest solution for now. if we get more we'll start
                 // to introduce a list.
@@ -360,11 +361,11 @@ protected function _gatherRowData(&$data, &$cache, &$id, &$nonemptyComponents)
     abstract public function getElementCollection($component);
 
     abstract public function registerCollection($coll);
- 
+
     abstract public function initRelated(&$record, $name, $keyColumn = null);
- 
+
     abstract public function getNullPointer();
- 
+
     abstract public function getElement(array $data, $component);
 
     abstract public function getLastKey(&$coll);
@@ -395,11 +396,11 @@ protected function _getClassnameToReturn(array &$data, $component)
         if ( ! isset($this->_tables[$component])) {
             $this->_tables[$component] = Doctrine_Core::getTable($component);
         }
-        
+
         if ( ! ($subclasses = $this->_tables[$component]->getOption('subclasses'))) {
             return $component;
         }
-        
+
         $matchedComponents = array($component);
         foreach ($subclasses as $subclass) {
             $table = Doctrine_Core::getTable($subclass);
@@ -425,13 +426,13 @@ protected function _getClassnameToReturn(array &$data, $component)
                 }
             }
         }
-        
+
         $matchedComponent = $matchedComponents[count($matchedComponents)-1];
-        
+
         if ( ! isset($this->_tables[$matchedComponent])) {
             $this->_tables[$matchedComponent] = Doctrine_Core::getTable($matchedComponent);
         }
-        
+
         return $matchedComponent;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hydrator/NoneDriver.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hydrator/NoneDriver.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hydrator/NoneDriver.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hydrator/NoneDriver.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hydrator/RecordDriver.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hydrator/RecordDriver.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hydrator/RecordDriver.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hydrator/RecordDriver.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hydrator/RecordHierarchyDriver.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hydrator/RecordHierarchyDriver.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hydrator/RecordHierarchyDriver.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hydrator/RecordHierarchyDriver.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hydrator/ScalarDriver.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hydrator/ScalarDriver.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hydrator/ScalarDriver.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hydrator/ScalarDriver.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hydrator/SingleScalarDriver.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hydrator/SingleScalarDriver.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Hydrator/SingleScalarDriver.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Hydrator/SingleScalarDriver.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/I18n.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/I18n.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/I18n.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/I18n.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/I18n/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/I18n/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/I18n/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/I18n/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Import.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Import.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Import.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Import.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Import/Builder.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Import/Builder.php
similarity index 98%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Import/Builder.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Import/Builder.php
index c213fbdda..6920163f0 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Import/Builder.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Import/Builder.php
@@ -129,11 +129,11 @@ class Doctrine_Import_Builder extends Doctrine_Builder
      */
     protected $_classPrefix = null;
 
-    /** 
-     * Whether to use the class prefix for the filenames too 
-     * 
-     * @var boolean 
-     **/ 
+    /**
+     * Whether to use the class prefix for the filenames too
+     *
+     * @var boolean
+     **/
     protected $_classPrefixFiles = true;
 
     /**
@@ -425,11 +425,11 @@ public function buildSetUp(array $definition)
                 if (isset($relation['refClass'])) {
                     $a[] = '\'refClass\' => ' . $this->varExport($relation['refClass']);
                 }
-                
+
                 if (isset($relation['refClassRelationAlias'])) {
                     $a[] = '\'refClassRelationAlias\' => ' . $this->varExport($relation['refClassRelationAlias']);
                 }
-                
+
                 if (isset($relation['deferred']) && $relation['deferred']) {
                     $a[] = '\'default\' => ' . $this->varExport($relation['deferred']);
                 }
@@ -536,12 +536,12 @@ public function buildColumns(array $columns)
                     sprintf('When using a column alias you cannot pass it via column name and column alias definition (column: %s).', $column['name'])
                 );
             }
-            
+
             // Update column name if an alias is provided
             if (isset($column['alias']) && !isset($column['name'])) {
                 $column['name'] = $name . ' as ' . $column['alias'];
             }
-          
+
             $columnName = isset($column['name']) ? $column['name']:$name;
             if ($manager->getAttribute(Doctrine_Core::ATTR_AUTO_ACCESSOR_OVERRIDE)) {
                 $e = explode(' as ', $columnName);
@@ -798,17 +798,17 @@ private function innerBuildActAs($actAs, $level = 0, $parent = null, array &$emi
                         } else {
                             $leftActAs[$name] = $options[$name];
                         }
-                    } 
+                    }
 
                     $optionPHP = $this->varExport($realOptions);
-                    $build .= $this->emitAssign($level, $template, $optionPHP); 
+                    $build .= $this->emitAssign($level, $template, $optionPHP);
                     if ($level == 0) {
                         $emittedActAs[] = $this->emitActAs($level, $template);
                     } else {
                         $build .= $this->emitAddChild($level, $currentParent, $template);
                     }
                     // descend for the remainings actAs
-                    $parent = $template;            
+                    $parent = $template;
                     $build .= $this->innerBuildActAs($leftActAs, $level, $template, $emittedActAs);
                 } else {
                     $build .= $this->emitAssign($level, $template, null);
@@ -817,7 +817,7 @@ private function innerBuildActAs($actAs, $level = 0, $parent = null, array &$emi
                     } else {
                         $build .= $this->emitAddChild($level, $currentParent, $template);
                     }
-                    $parent = $template;            
+                    $parent = $template;
                 }
             }
         } else {
@@ -835,20 +835,20 @@ private function innerBuildActAs($actAs, $level = 0, $parent = null, array &$emi
     /**
      * Build php code for adding record listeners
      *
-     * @param string $listeners 
+     * @param string $listeners
      * @return string $build
      */
     public function buildListeners($listeners)
     {
         $build = '';
-        
+
         foreach($listeners as $name => $options) {
             if ( ! is_array($options) && $options !== null) {
                 $name = $options;
                 $options = null;
             }
 
-            $useOptions = ( ! empty($options) && isset($options['useOptions']) && $options['useOptions'] == true) 
+            $useOptions = ( ! empty($options) && isset($options['useOptions']) && $options['useOptions'] == true)
                 ? '$this->getTable()->getOptions()' : 'array()';
             $class = ( ! empty($options) && isset($options['class'])) ? $options['class'] : $name;
 
@@ -868,7 +868,7 @@ public function buildAttributes(array $attributes)
     {
         $build = PHP_EOL;
         foreach ($attributes as $key => $value) {
-    
+
             $values = array();
             if (is_bool($value))
             {
@@ -877,7 +877,7 @@ public function buildAttributes(array $attributes)
                 if ( ! is_array($value)) {
                     $value = array($value);
                 }
-    
+
                 foreach ($value as $attr) {
                     $const = "Doctrine_Core::" . strtoupper($key) . "_" . strtoupper($attr);
                     if (defined($const)) {
@@ -887,11 +887,11 @@ public function buildAttributes(array $attributes)
                     }
                 }
             }
-    
+
             $string = implode(' ^ ', $values);
             $build .= "        \$this->setAttribute(Doctrine_Core::ATTR_" . strtoupper($key) . ", " . $string . ");" . PHP_EOL;
         }
-    
+
         return $build;
     }
 
@@ -977,7 +977,7 @@ public function buildDefinition(array $definition)
         }
 
         $setUpCode.= $this->buildToString($definition);
-        
+
         $docs = PHP_EOL . $this->buildPhpDocs($definition);
 
         $content = sprintf(self::$_tpl, $docs, $abstract,
@@ -1086,7 +1086,7 @@ public function buildTableClassDefinition($className, $definition, $options = ar
         $code = sprintf("    /**
      * Returns an instance of this class.
      *
-     * @return object %s
+     * @return %s The table instance
      */
     public static function getInstance()
     {
@@ -1127,7 +1127,7 @@ public function writeTableClassDefinition(array $definition, $path, $options = a
         if ($prefix = $this->_classPrefix) {
             $className = $prefix . $definition['tableClassName'];
             if ($this->_classPrefixFiles) {
-                $fileName = $className . $this->_suffix;               
+                $fileName = $className . $this->_suffix;
             } else {
                 $fileName = $definition['tableClassName'] . $this->_suffix;
             }
@@ -1293,4 +1293,4 @@ public function writeDefinition(array $definition)
 
         Doctrine_Core::loadModel($definition['className'], $writePath);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Import/Builder/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Import/Builder/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Import/Builder/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Import/Builder/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Import/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Import/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Import/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Import/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Import/Mssql.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Import/Mssql.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Import/Mssql.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Import/Mssql.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Import/Mysql.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Import/Mysql.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Import/Mysql.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Import/Mysql.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Import/Oracle.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Import/Oracle.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Import/Oracle.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Import/Oracle.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Import/Pgsql.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Import/Pgsql.php
similarity index 99%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Import/Pgsql.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Import/Pgsql.php
index 71791d12e..bdef1d00b 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Import/Pgsql.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Import/Pgsql.php
@@ -191,7 +191,7 @@ public function listTableColumns($table)
             );
 
             // If postgres enum type            
-            if ($val['typtype'] == 'e'){
+            if ($val['type'] == 'e'){
                 $description['default'] = isset($decl['default']) ? $decl['default'] : null;
                 $t_result = $this->conn->fetchAssoc(sprintf('select enum_range(null::%s) as range ', $decl['enum_name']));                
                 if (isset($t_result[0])){
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Import/Schema.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Import/Schema.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Import/Schema.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Import/Schema.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Import/Sqlite.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Import/Sqlite.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Import/Sqlite.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Import/Sqlite.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Inflector.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Inflector.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Inflector.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Inflector.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/IntegrityMapper.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/IntegrityMapper.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/IntegrityMapper.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/IntegrityMapper.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Lib.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Lib.php
similarity index 92%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Lib.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Lib.php
index c884f9eb3..97d740026 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Lib.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Lib.php
@@ -35,7 +35,7 @@ class Doctrine_Lib
     /**
      * Generates a human readable representation of a record's state.
      *
-     * This method translates a Doctrine_Record state (integer constant) 
+     * This method translates a Doctrine_Record state (integer constant)
      * in an english string.
      * @see Doctrine_Record::STATE_* constants
      *
@@ -128,7 +128,7 @@ public static function getConnectionAsString(Doctrine_Connection $connection)
         $r[] = 'Table in memory     : ' . $connection->count();
         $r[] = 'Driver name         : ' . $connection->getAttribute(Doctrine_Core::ATTR_DRIVER_NAME);
         $r[] = "</pre>";
-        
+
         return implode("\n",$r)."<br>";
     }
 
@@ -146,16 +146,16 @@ public static function getTableAsString(Doctrine_Table $table)
         $r[] = "Component   : ".$table->getComponentName();
         $r[] = "Table       : ".$table->getTableName();
         $r[] = "</pre>";
-        
+
         return implode("\n",$r)."<br>";
     }
 
     /**
-     * Generates a colored sql query. 
+     * Generates a colored sql query.
      *
      * This methods parses a plain text query and generates the html needed
      * for visual formatting.
-     * 
+     *
      * @todo: What about creating a config varialbe for the color?
      * @param string $sql   plain text query
      * @return string       the formatted sql code
@@ -185,7 +185,7 @@ public static function formatSql($sql)
     /**
      * Generates a string representation of a collection.
      *
-     * This method returns an html dump of a collection of records, containing 
+     * This method returns an html dump of a collection of records, containing
      * all data.
      *
      * @param Doctrine_Collection $collection
@@ -198,7 +198,7 @@ public static function getCollectionAsString(Doctrine_Collection $collection)
         $r[] = 'data : ' . Doctrine_Core::dump($collection->getData(), false);
         //$r[] = 'snapshot : ' . Doctrine_Core::dump($collection->getSnapshot());
         $r[] = "</pre>";
-        
+
         return implode("\n",$r);
     }
 
@@ -234,7 +234,7 @@ public static function arrayDeepMerge()
              case 2:
                 $args = func_get_args();
                 $args[2] = array();
-                
+
                 if (is_array($args[0]) && is_array($args[1]))
                 {
                     foreach (array_unique(array_merge(array_keys($args[0]),array_keys($args[1]))) as $key)
@@ -268,9 +268,47 @@ public static function arrayDeepMerge()
         }
     }
 
+    /**
+     * arrayDiffSimple
+     *
+     * array arrayDiffSimple ( array array1 , array array2 )
+     *
+     * Like array_diff
+     *
+     * arrayDiffSimple() has exactly the same behavior than array_diff, but can handle
+     * only 2 arrays. PHP versions > 5.4.0 generate some NOTICE if you use array_diff
+     * sometimes because of array_diff internal behavior with (string) casts.
+     * This method solves the problem.
+     *
+     * Code from symfony sfToolkit class. See LICENSE
+     * code from cto at verylastroom dot com
+     *
+     * @param array $array1
+     * @param array $array2
+     * @static
+     * @access public
+     * @return array
+     */
+    public static function arrayDiffSimple($array1, $array2)
+    {
+        $diff = array();
+
+        foreach($array1 as $key => $val) {
+            if(!isset($array2[$key])) {
+                $diff[$key] = $val;
+            } else {
+                if(is_array($array2[$key]) && !is_array($val)) {
+                    $diff[$key] = $val;
+                }
+            }
+        }
+
+        return $diff;
+    }
+
     /**
      * Makes the directories for a path recursively.
-     * 
+     *
      * This method creates a given path issuing mkdir commands for all folders
      * that do not exist yet. Equivalent to 'mkdir -p'.
      *
@@ -327,7 +365,7 @@ public static function removeDirectories($folderPath)
 
     /**
      * Copy all directory content in another one.
-     * 
+     *
      * This method recursively copies all $source files and subdirs in $dest.
      * If $source is a file, only it will be copied in $dest.
      *
@@ -369,8 +407,8 @@ public static function copyDirectory($source, $dest)
 
     /**
      * Checks for a valid class name for Doctrine coding standards.
-     * 
-     * This methods tests if $className is a valid class name for php syntax 
+     *
+     * This methods tests if $className is a valid class name for php syntax
      * and for Doctrine coding standards. $className must use camel case naming
      * and underscores for directory separation.
      *
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Locator.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Locator.php
similarity index 95%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Locator.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Locator.php
index 723daa081..70d1998d6 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Locator.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Locator.php
@@ -45,7 +45,7 @@ class Doctrine_Locator implements Countable, IteratorAggregate
      */
     protected $_classPrefix = 'Doctrine_';
 
-    /** 
+    /**
      * @var array $_instances       a pool of this object's instances
      */
     protected static $_instances = array();
@@ -69,7 +69,7 @@ public function __construct(array $defaults = null)
         self::$_instances[] = $this;
     }
 
-    /** 
+    /**
      * instance
      *
      * @return Sensei_Locator
@@ -87,7 +87,7 @@ public static function instance()
      *
      * @param string $prefix
      */
-    public function setClassPrefix($prefix) 
+    public function setClassPrefix($prefix)
     {
         $this->_classPrefix = $prefix;
     }
@@ -124,7 +124,7 @@ public function contains($name)
     public function bind($name, $value)
     {
         $this->_resources[$name] = $value;
-        
+
         return $this;
     }
 
@@ -146,12 +146,13 @@ public function locate($name)
             if ( ! class_exists($className)) {
 
                 $name = explode('.', $name);
-                $name = array_map('strtolower', $name);
-                $name = array_map('ucfirst', $name);
+                foreach ($name as &$v) {
+                    $v = ucfirst(strtolower($v));
+                }
                 $name = implode('_', $name);
-                
+
                 $className = $this->_classPrefix . $name;
-                
+
                 if ( ! class_exists($className)) {
                     throw new Doctrine_Locator_Exception("Couldn't locate resource " . $className);
                 }
@@ -184,10 +185,10 @@ public function count()
 
     /**
      * getIterator
-     * returns an ArrayIterator that iterates through all 
+     * returns an ArrayIterator that iterates through all
      * bound resources
      *
-     * @return ArrayIterator    an iterator for iterating through 
+     * @return ArrayIterator    an iterator for iterating through
      *                          all bound resources
      */
     public function getIterator()
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Locator/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Locator/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Locator/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Locator/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Locator/Injectable.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Locator/Injectable.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Locator/Injectable.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Locator/Injectable.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Locking/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Locking/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Locking/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Locking/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Locking/Manager/Pessimistic.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Locking/Manager/Pessimistic.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Locking/Manager/Pessimistic.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Locking/Manager/Pessimistic.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Manager.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Manager.php
similarity index 94%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Manager.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Manager.php
index 70a6a0b65..a8f75be7b 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Manager.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Manager.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *  $Id: Manager.php 7657 2010-06-08 17:57:01Z jwage $
+ *  $Id$
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -29,7 +29,7 @@
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link        www.doctrine-project.org
  * @since       1.0
- * @version     $Revision: 7657 $
+ * @version     $Revision$
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  */
 class Doctrine_Manager extends Doctrine_Configurable implements Countable, IteratorAggregate
@@ -90,16 +90,16 @@ class Doctrine_Manager extends Doctrine_Configurable implements Countable, Itera
         'oracle'   => 'Doctrine_Connection_Oracle',
         'mssql'    => 'Doctrine_Connection_Mssql',
         'dblib'    => 'Doctrine_Connection_Mssql',
-        'odbc'     => 'Doctrine_Connection_Mssql', 
+        'odbc'     => 'Doctrine_Connection_Mssql',
         'mock'     => 'Doctrine_Connection_Mock'
     );
 
     protected $_extensions = array();
 
     /**
-     * @var boolean                     Whether or not the validators from disk have been loaded
+     * @var boolean                     Whether or not the default validators have been loaded
      */
-    protected $_loadedValidatorsFromDisk = false;
+    protected $_loadedDefaultValidators = false;
 
     protected static $_instance;
 
@@ -120,8 +120,8 @@ private function __construct()
     /**
      * Sets default attributes values.
      *
-     * This method sets default values for all null attributes of this 
-     * instance. It is idempotent and can only be called one time. Subsequent 
+     * This method sets default values for all null attributes of this
+     * instance. It is idempotent and can only be called one time. Subsequent
      * calls does not alter the attribute values.
      *
      * @return boolean      true if inizialization was executed
@@ -134,6 +134,7 @@ public function setDefaultAttributes()
                         Doctrine_Core::ATTR_CACHE                        => null,
                         Doctrine_Core::ATTR_RESULT_CACHE                 => null,
                         Doctrine_Core::ATTR_QUERY_CACHE                  => null,
+                        Doctrine_Core::ATTR_TABLE_CACHE                  => null,
                         Doctrine_Core::ATTR_LOAD_REFERENCES              => true,
                         Doctrine_Core::ATTR_LISTENER                     => new Doctrine_EventListener(),
                         Doctrine_Core::ATTR_RECORD_LISTENER              => new Doctrine_Record_Listener(),
@@ -161,8 +162,10 @@ public function setDefaultAttributes()
                         Doctrine_Core::ATTR_COLLECTION_CLASS             => 'Doctrine_Collection',
                         Doctrine_Core::ATTR_TABLE_CLASS                  => 'Doctrine_Table',
                         Doctrine_Core::ATTR_CASCADE_SAVES                => true,
-                        Doctrine_Core::ATTR_TABLE_CLASS_FORMAT           => '%sTable'
-                        ); 
+                        Doctrine_Core::ATTR_TABLE_CLASS_FORMAT           => '%sTable',
+                        Doctrine_Core::ATTR_USE_TABLE_REPOSITORY         => true,
+                        Doctrine_Core::ATTR_USE_TABLE_IDENTITY_MAP       => true,
+                        );
             foreach ($attributes as $attribute => $value) {
                 $old = $this->getAttribute($attribute);
                 if ($old === null) {
@@ -216,7 +219,7 @@ public function reset()
         $this->_extensions = array();
         $this->_bound = array();
         $this->_validators = array();
-        $this->_loadedValidatorsFromDisk = false;
+        $this->_loadedDefaultValidators = false;
         $this->_index = 0;
         $this->_currIndex = 0;
         $this->_initialized = false;
@@ -243,7 +246,7 @@ public function getQueryRegistry()
     public function setQueryRegistry(Doctrine_Query_Registry $registry)
     {
         $this->_queryRegistry = $registry;
-        
+
         return $this;
     }
 
@@ -345,7 +348,7 @@ public function openConnection($adapter, $name = null, $setCurrent = true)
         }
         return $this->_connections[$name];
     }
-    
+
     /**
      * Parse a pdo style dsn in to an array of parts
      *
@@ -395,7 +398,7 @@ public function parsePdoDsn($dsn)
      * Build the blank dsn parts array used with parseDsn()
      *
      * @see parseDsn()
-     * @param string $dsn 
+     * @param string $dsn
      * @return array $parts
      */
     protected function _buildDsnPartsArray($dsn)
@@ -730,25 +733,34 @@ public function __toString()
      */
     public function getValidators()
     {
-        if ( ! $this->_loadedValidatorsFromDisk) {
-            $this->_loadedValidatorsFromDisk = true;
-
-            $validators = array();
-
-            $dir = Doctrine_Core::getPath() . DIRECTORY_SEPARATOR . 'Doctrine' . DIRECTORY_SEPARATOR . 'Validator';
-
-            $files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir), RecursiveIteratorIterator::LEAVES_ONLY);
-            foreach ($files as $file) {
-                $e = explode('.', $file->getFileName());
-
-                if (end($e) == 'php') {
-                    $name = strtolower($e[0]);
-
-                    $validators[] = $name;
-                }
-            }
-
-            $this->registerValidators($validators);
+        if ( ! $this->_loadedDefaultValidators) {
+            $this->_loadedDefaultValidators = true;
+
+            $this->registerValidators(array(
+                'unique',
+                'past',
+                'range',
+                'ip',
+                'notblank',
+                'unsigned',
+                'errorstack',
+                'nospace',
+                'creditcard',
+                'regexp',
+                'exception',
+                'time',
+                'future',
+                'notnull',
+                'driver',
+                'readonly',
+                'htmlcolor',
+                'date',
+                'timestamp',
+                'minlength',
+                'usstate',
+                'email',
+                'country',
+            ));
         }
 
         return $this->_validators;
@@ -757,7 +769,7 @@ public function getValidators()
     /**
      * Register validators so that Doctrine is aware of them
      *
-     * @param  mixed $validators Name of validator or array of validators
+     * @param  mixed $validators Name of validator or array of validators
      * @return void
      */
     public function registerValidators($validators)
@@ -813,8 +825,8 @@ public function getConnectionDrivers()
     /**
      * Register a Doctrine extension for extensionsAutoload() method
      *
-     * @param string $name 
-     * @param string $path 
+     * @param string $name
+     * @param string $path
      * @return void
      */
     public function registerExtension($name, $path = null)
@@ -834,4 +846,4 @@ public function getExtensions()
     {
         return $this->_extensions;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Manager/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Manager/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Manager/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Manager/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Migration.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Migration.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Migration.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Migration.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Migration/Base.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Migration/Base.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Migration/Base.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Migration/Base.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Migration/Builder.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Migration/Builder.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Migration/Builder.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Migration/Builder.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Migration/Diff.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Migration/Diff.php
similarity index 98%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Migration/Diff.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Migration/Diff.php
index 79c23c688..2b3b621a3 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Migration/Diff.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Migration/Diff.php
@@ -111,7 +111,10 @@ public function generateChanges()
     {
         $this->_cleanup();
 
-        $from = $this->_generateModels(self::$_fromPrefix, $this->_from);
+        $from = $this->_generateModels(
+            Doctrine_Manager::getInstance()->getAttribute(Doctrine_Core::ATTR_MODEL_CLASS_PREFIX) . self::$_fromPrefix,
+            $this->_from
+        );
         $to = $this->_generateModels(
             Doctrine_Manager::getInstance()->getAttribute(Doctrine_Core::ATTR_MODEL_CLASS_PREFIX) . self::$_toPrefix,
             $this->_to
@@ -135,7 +138,7 @@ public function generateMigrationClasses()
     /**
      * Initialize some Doctrine models at a given path.
      *
-     * @param string $path 
+     * @param string $path
      * @return array $models
      */
     protected function _initializeModels($path)
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Migration/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Migration/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Migration/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Migration/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Migration/IrreversibleMigrationException.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Migration/IrreversibleMigrationException.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Migration/IrreversibleMigrationException.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Migration/IrreversibleMigrationException.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Migration/Process.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Migration/Process.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Migration/Process.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Migration/Process.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/AdjacencyList.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/AdjacencyList.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/AdjacencyList.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/AdjacencyList.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/AdjacencyList/LevelOrderIterator.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/AdjacencyList/LevelOrderIterator.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/AdjacencyList/LevelOrderIterator.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/AdjacencyList/LevelOrderIterator.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/AdjacencyList/PostOrderIterator.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/AdjacencyList/PostOrderIterator.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/AdjacencyList/PostOrderIterator.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/AdjacencyList/PostOrderIterator.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/AdjacencyList/PreOrderIterator.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/AdjacencyList/PreOrderIterator.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/AdjacencyList/PreOrderIterator.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/AdjacencyList/PreOrderIterator.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/Interface.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/Interface.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/Interface.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/Interface.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/MaterializedPath.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/MaterializedPath.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/MaterializedPath.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/MaterializedPath.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/MaterializedPath/LevelOrderIterator.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/MaterializedPath/LevelOrderIterator.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/MaterializedPath/LevelOrderIterator.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/MaterializedPath/LevelOrderIterator.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/MaterializedPath/PostOrderIterator.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/MaterializedPath/PostOrderIterator.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/MaterializedPath/PostOrderIterator.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/MaterializedPath/PostOrderIterator.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/MaterializedPath/PreOrderIterator.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/MaterializedPath/PreOrderIterator.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/MaterializedPath/PreOrderIterator.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/MaterializedPath/PreOrderIterator.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/NestedSet.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/NestedSet.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/NestedSet.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/NestedSet.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/NestedSet/LevelOrderIterator.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/NestedSet/LevelOrderIterator.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/NestedSet/LevelOrderIterator.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/NestedSet/LevelOrderIterator.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/NestedSet/PostOrderIterator.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/NestedSet/PostOrderIterator.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/NestedSet/PostOrderIterator.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/NestedSet/PostOrderIterator.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/NestedSet/PreOrderIterator.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/NestedSet/PreOrderIterator.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Node/NestedSet/PreOrderIterator.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Node/NestedSet/PreOrderIterator.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Null.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Null.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Null.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Null.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Overloadable.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Overloadable.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Overloadable.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Overloadable.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Pager.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Pager.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Pager.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Pager.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Pager/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Pager/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Pager/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Pager/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Pager/Layout.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Pager/Layout.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Pager/Layout.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Pager/Layout.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Pager/Range.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Pager/Range.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Pager/Range.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Pager/Range.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Pager/Range/Jumping.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Pager/Range/Jumping.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Pager/Range/Jumping.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Pager/Range/Jumping.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Pager/Range/Sliding.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Pager/Range/Sliding.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Pager/Range/Sliding.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Pager/Range/Sliding.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Parser.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Parser.php
similarity index 87%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Parser.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Parser.php
index 715296320..d9c8c124d 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Parser.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Parser.php
@@ -37,19 +37,19 @@ abstract class Doctrine_Parser
      *
      * Override in the parser driver
      *
-     * @param string $array 
+     * @param string $array
      * @return void
      * @author Jonathan H. Wage
      */
-    abstract public function loadData($array);
+    abstract public function loadData($array, $charset = 'UTF-8');
 
     /**
      * dumpData
      *
      * Override in the parser driver
      *
-     * @param string $array 
-     * @param string $path 
+     * @param string $array
+     * @param string $path
      * @param string $charset The charset of the data being dumped
      * @return void
      * @author Jonathan H. Wage
@@ -61,7 +61,7 @@ abstract public function dumpData($array, $path = null, $charset = null);
      *
      * Get instance of the specified parser
      *
-     * @param string $type 
+     * @param string $type
      * @return void
      * @author Jonathan H. Wage
      */
@@ -77,16 +77,16 @@ static public function getParser($type)
      *
      * Interface for loading and parsing data from a file
      *
-     * @param string $path 
-     * @param string $type 
+     * @param string $path
+     * @param string $type
      * @return void
      * @author Jonathan H. Wage
      */
-    static public function load($path, $type = 'xml')
+    static public function load($path, $type = 'xml', $charset = 'UTF-8')
     {
         $parser = self::getParser($type);
 
-        return (array) $parser->loadData($path);
+        return (array) $parser->loadData($path, $charset);
     }
 
     /**
@@ -94,9 +94,9 @@ static public function load($path, $type = 'xml')
      *
      * Interface for pulling and dumping data to a file
      *
-     * @param string $array 
-     * @param string $path 
-     * @param string $type 
+     * @param string $array
+     * @param string $path
+     * @param string $type
      * @param string $charset The charset of the data being dumped
      * @return void
      * @author Jonathan H. Wage
@@ -114,7 +114,7 @@ static public function dump($array, $type = 'xml', $path = null, $charset = null
      * Get contents whether it is the path to a file file or a string of txt.
      * Either should allow php code in it.
      *
-     * @param string $path 
+     * @param string $path
      * @return void
      */
     public function doLoad($path)
@@ -128,7 +128,7 @@ public function doLoad($path)
         }
 
         include($path);
-        
+
         // Fix #1569. Need to check if it's still all valid
         $contents = ob_get_clean(); //iconv("UTF-8", "UTF-8", ob_get_clean());
 
@@ -138,8 +138,8 @@ public function doLoad($path)
     /**
      * doDump
      *
-     * @param string $data 
-     * @param string $path 
+     * @param string $data
+     * @param string $path
      * @return void
      */
     public function doDump($data, $path = null)
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Parser/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Parser/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Parser/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Parser/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Parser/Json.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Parser/Json.php
similarity index 96%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Parser/Json.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Parser/Json.php
index 749dc0b4c..df4655de1 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Parser/Json.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Parser/Json.php
@@ -36,7 +36,7 @@ class Doctrine_Parser_Json extends Doctrine_Parser
      * dumpData
      *
      * Dump an array of data to a specified path or return
-     * 
+     *
      * @param string $array Array of data to dump to json
      * @param string $path  Path to dump json data to
      * @param string $charset The charset of the data being dumped
@@ -46,7 +46,7 @@ class Doctrine_Parser_Json extends Doctrine_Parser
     public function dumpData($array, $path = null, $charset = null)
     {
         $data = json_encode($array);
-        
+
         return $this->doDump($data, $path);
     }
 
@@ -54,16 +54,16 @@ public function dumpData($array, $path = null, $charset = null)
      * loadData
      *
      * Load and unserialize data from a file or from passed data
-     * 
+     *
      * @param  string $path   Path to dump data to
      * @return array  $json   Array of json objects
      */
-    public function loadData($path)
+    public function loadData($path, $charset = 'UTF-8')
     {
         $contents = $this->doLoad($path);
-        
+
         $json = json_decode($contents);
-        
+
         return $json;
     }
 }
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Parser/Serialize.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Parser/Serialize.php
similarity index 92%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Parser/Serialize.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Parser/Serialize.php
index 34ef3b32b..e2eff7565 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Parser/Serialize.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Parser/Serialize.php
@@ -36,16 +36,16 @@ class Doctrine_Parser_Serialize extends Doctrine_Parser
      * dumpData
      *
      * Dump an array of data to a specified path or return
-     * 
-     * @param string $array 
-     * @param string $path 
+     *
+     * @param string $array
+     * @param string $path
      * @param string $charset The charset of the data being dumped
      * @return void
      */
     public function dumpData($array, $path = null, $charset = null)
     {
         $data = serialize($array);
-        
+
         return $this->doDump($data, $path);
     }
 
@@ -53,14 +53,14 @@ public function dumpData($array, $path = null, $charset = null)
      * loadData
      *
      * Load and unserialize data from a file or from passed data
-     * 
-     * @param string $path 
+     *
+     * @param string $path
      * @return void
      */
-    public function loadData($path)
+    public function loadData($path, $charset = 'UTF-8')
     {
         $contents = $this->doLoad($path);
-        
+
         return unserialize($contents);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Parser/Xml.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Parser/Xml.php
similarity index 95%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Parser/Xml.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Parser/Xml.php
index 4ab6eb881..a091580be 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Parser/Xml.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Parser/Xml.php
@@ -34,7 +34,7 @@ class Doctrine_Parser_Xml extends Doctrine_Parser
 {
     /**
      * dumpData
-     * 
+     *
      * Convert array to xml and dump to specified path or return the xml
      *
      * @param  string $array Array of data to convert to xml
@@ -46,14 +46,14 @@ class Doctrine_Parser_Xml extends Doctrine_Parser
     public function dumpData($array, $path = null, $charset = null)
     {
         $data = self::arrayToXml($array, 'data', null, $charset);
-        
+
         return $this->doDump($data, $path);
     }
 
     /**
      * arrayToXml
      *
-     * @param  string $array        Array to convert to xml    
+     * @param  string $array        Array to convert to xml
      * @param  string $rootNodeName Name of the root node
      * @param  string $xml          SimpleXmlElement
      * @return string $asXml        String of xml built from array
@@ -79,7 +79,7 @@ public static function arrayToXml($array, $rootNodeName = 'data', $xml = null, $
                 }
 
                 self::arrayToXml($value, $rootNodeName, $node, $charset);
-            } else if (is_int($key)) {               
+            } else if (is_int($key)) {
                 $xml->addChild($value, 'true');
             } else {
                 $charset = $charset ? $charset : 'utf-8';
@@ -102,12 +102,12 @@ public static function arrayToXml($array, $rootNodeName = 'data', $xml = null, $
      * @param  string $path  Path to load xml data from
      * @return array  $array Array of data converted from xml
      */
-    public function loadData($path)
+    public function loadData($path, $charset = 'UTF-8')
     {
         $contents = $this->doLoad($path);
-        
+
         $simpleXml = simplexml_load_string($contents);
-        
+
         return $this->prepareData($simpleXml);
     }
 
@@ -116,7 +116,7 @@ public function loadData($path)
      *
      * Prepare simple xml to array for return
      *
-     * @param  string $simpleXml 
+     * @param  string $simpleXml
      * @return array  $return
      */
     public function prepareData($simpleXml)
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Parser/Yml.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Parser/Yml.php
similarity index 96%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Parser/Yml.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Parser/Yml.php
index f96983331..9990be1db 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Parser/Yml.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Parser/Yml.php
@@ -68,7 +68,7 @@ public function dumpData($array, $path = null, $charset = null)
      * @param  string  $path  Path to load yaml data from
      * @return array   $array Array of parsed yaml data
      */
-    public function loadData($path)
+    public function loadData($path, $charset = 'UTF-8')
     {
         try {
           /*
@@ -77,7 +77,7 @@ public function loadData($path)
            */
           $contents = $this->doLoad($path);
 
-          $array = sfYaml::load($contents);
+          $array = sfYaml::load($contents, $charset);
 
           return $array;
 
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Parser/sfYaml/sfYaml.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Parser/sfYaml/sfYaml.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Parser/sfYaml/sfYaml.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Parser/sfYaml/sfYaml.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Parser/sfYaml/sfYamlDumper.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Parser/sfYaml/sfYamlDumper.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Parser/sfYaml/sfYamlDumper.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Parser/sfYaml/sfYamlDumper.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Parser/sfYaml/sfYamlInline.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Parser/sfYaml/sfYamlInline.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Parser/sfYaml/sfYamlInline.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Parser/sfYaml/sfYamlInline.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Parser/sfYaml/sfYamlParser.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Parser/sfYaml/sfYamlParser.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Parser/sfYaml/sfYamlParser.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Parser/sfYaml/sfYamlParser.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query.php
similarity index 98%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query.php
index 14e656126..521cfe569 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *  $Id: Query.php 7674 2010-06-08 22:59:01Z jwage $
+ *  $Id$
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -30,7 +30,7 @@
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
  * @link        www.doctrine-project.org
  * @since       1.0
- * @version     $Revision: 7674 $
+ * @version     $Revision$
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @todo        Proposal: This class does far too much. It should have only 1 task: Collecting
  *              the DQL query parts and the query parameters (the query state and caching options/methods
@@ -274,7 +274,7 @@ public function fetchArray($params = array())
      *
      * @param string $params        Query parameters
      * @param int $hydrationMode    Hydration mode: see Doctrine_Core::HYDRATE_* constants
-     * @return mixed                Array or Doctrine_Collection, depending on hydration mode. False if no result.
+     * @return array|Doctrine_Record      Array or Doctrine_Record, depending on hydration mode. False if no result.
      */
     public function fetchOne($params = array(), $hydrationMode = null)
     {
@@ -1288,7 +1288,10 @@ public function buildSqlQuery($limitSubquery = true)
 
                     // mysql doesn't support LIMIT in subqueries
                     $list = $this->_conn->execute($subquery, $this->_execParams)->fetchAll(Doctrine_Core::FETCH_COLUMN);
-                    $subquery = implode(', ', array_map(array($this->_conn, 'quote'), $list));
+                    foreach ($list as &$v) {
+                        $v = $this->_conn->quote($v);
+                    }
+                    $subquery = implode(', ', $list);
 
                     break;
 
@@ -1354,8 +1357,8 @@ public function buildSqlQuery($limitSubquery = true)
 
                 if ($orderBy) {
                     $e = explode(',', $orderBy);
-                    $e = array_map('trim', $e);
                     foreach ($e as $v) {
+                        $v = trim($v);
                         if ( ! in_array($v, $this->_sqlParts['orderby'])) {
                             $this->_sqlParts['orderby'][] = $v;
                         }
@@ -1406,7 +1409,7 @@ public function getLimitSubquery()
         $driverName = $this->_conn->getAttribute(Doctrine_Core::ATTR_DRIVER_NAME);
 
         // initialize the base of the subquery
-        if (($driverName == 'oracle' || $driverName == 'oci') && $this->_isOrderedByJoinedColumn()) {
+        if (($driverName == 'oracle' || $driverName == 'oci' || $driverName == 'oci8') && $this->_isOrderedByJoinedColumn()) {
             $subquery = 'SELECT ';
         } else {
             $subquery = 'SELECT DISTINCT ';
@@ -1414,15 +1417,18 @@ public function getLimitSubquery()
         $subquery .= $this->_conn->quoteIdentifier($primaryKey);
 
         // pgsql & oracle need the order by fields to be preserved in select clause
-        if ($driverName == 'pgsql' || $driverName == 'oracle' || $driverName == 'oci' || $driverName == 'mssql' || $driverName == 'odbc') {
+        if ($driverName == 'pgsql' || $driverName == 'oracle' || $driverName == 'oci' || $driverName == 'oci8' || $driverName == 'mssql' || $driverName == 'odbc') {
             foreach ($this->_sqlParts['orderby'] as $part) {
                 // Remove identifier quoting if it exists
                 $e = $this->_tokenizer->bracketExplode($part, ' ');
                 foreach ($e as $f) {
                     if ($f == 0 || $f % 2 == 0) {
                         $partOriginal = str_replace(',', '', trim($f));
-                        $callback = create_function('$e', 'return trim($e, \'[]`"\');');
-                        $part = trim(implode('.', array_map($callback, explode('.', $partOriginal))));
+                        $e = explode('.', $partOriginal);
+                        foreach ($e as &$v) {
+                            $v = trim($v, '[]`"');
+                        }
+                        $part = trim(implode('.', $e));
 
                         if (strpos($part, '.') === false) {
                             continue;
@@ -1494,7 +1500,7 @@ public function getLimitSubquery()
         $subquery .= ( ! empty($having))?  ' HAVING '   . implode(' AND ', $having) : '';
         $subquery .= ( ! empty($orderby))? ' ORDER BY ' . implode(', ', $orderby)  : '';
 
-        if (($driverName == 'oracle' || $driverName == 'oci') && $this->_isOrderedByJoinedColumn()) {
+        if (($driverName == 'oracle' || $driverName == 'oci' || $driverName == 'oci8') && $this->_isOrderedByJoinedColumn()) {
             // When using "ORDER BY x.foo" where x.foo is a column of a joined table,
             // we may get duplicate primary keys because all columns in ORDER BY must appear
             // in the SELECT list when using DISTINCT. Hence we need to filter out the
@@ -2246,4 +2252,4 @@ public function free()
         $this->_parsers = array();
         $this->_dqlParts = array();
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Abstract.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Abstract.php
similarity index 98%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Abstract.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Abstract.php
index 015f2c9c4..7b69d4c47 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Abstract.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Abstract.php
@@ -138,6 +138,10 @@ abstract class Doctrine_Query_Abstract
     protected $_expireQueryCache = false;
     protected $_queryCacheTTL;
 
+    /**
+     * @var boolean $_autoFree  A boolean value that indicates whether or not use auto free.
+     */
+    protected $_autoFree = false;
 
     /**
      * @var Doctrine_Connection  The connection used by this query object.
@@ -211,7 +215,7 @@ abstract class Doctrine_Query_Abstract
      * @var string
      */
     protected $_rootAlias = '';
-	
+
     /**
      * @var integer $type                   the query type
      *
@@ -292,6 +296,7 @@ public function __construct(Doctrine_Connection $connection = null,
         $this->_tokenizer = new Doctrine_Query_Tokenizer();
         $this->_resultCacheTTL = $this->_conn->getAttribute(Doctrine_Core::ATTR_RESULT_CACHE_LIFESPAN);
         $this->_queryCacheTTL = $this->_conn->getAttribute(Doctrine_Core::ATTR_QUERY_CACHE_LIFESPAN);
+        $this->_autoFree = $this->_conn->getAttribute(Doctrine_Core::ATTR_AUTO_FREE_QUERY_OBJECTS);
     }
 
     /**
@@ -321,6 +326,18 @@ public function setOption($name, $value)
         $this->_options[$name] = $value;
     }
 
+    /**
+     * Sets auto free
+     *
+     * @param boolean $value True or false (true by default)
+     */
+    public function setAutoFree($value = true)
+    {
+        $this->_autoFree = (boolean) $value;
+
+        return $this;
+    }
+
     /**
      * hasSqlTableAlias
      * whether or not this object has given tableAlias
@@ -509,7 +526,7 @@ public function getParams()
     public function getFlattenedParams($params = array())
     {
         return array_merge(
-            (array) $params, (array) $this->_params['exec'], 
+            (array) $params, (array) $this->_params['exec'],
             $this->_params['join'], $this->_params['set'],
             $this->_params['where'], $this->_params['having']
         );
@@ -534,7 +551,7 @@ public function setParams(array $params = array())
     {
         $this->_params = $params;
     }
-    
+
     /**
      * getCountQueryParams
      * Retrieves the parameters for count query
@@ -562,19 +579,19 @@ public function getCountQueryParams($params = array())
     public function fixArrayParameterValues($params = array())
     {
         $i = 0;
-	
+
         foreach ($params as $param) {
             if (is_array($param)) {
                 $c = count($param);
 
                 array_splice($params, $i, 1, $param);
-                
+
                 $i += $c;
             } else {
                 $i++;
             }
         }
-        
+
         $this->_execParams = $params;
     }
 
@@ -639,17 +656,17 @@ public function getInheritanceCondition($componentAlias)
             $tableAlias .= '.';
         }
 
-        // Fix for 2015: loop through whole inheritanceMap to add all   
-        // keyFields for inheritance (and not only the first) 
-        $retVal = ""; 
-        $count = 0; 
-         
-        foreach ($map as $field => $value) { 
+        // Fix for 2015: loop through whole inheritanceMap to add all
+        // keyFields for inheritance (and not only the first)
+        $retVal = "";
+        $count = 0;
+
+        foreach ($map as $field => $value) {
             if ($count++ > 0) {
                 $retVal .= ' AND ';
             }
 
-            $identifier = $this->_conn->quoteIdentifier($tableAlias . $field); 
+            $identifier = $this->_conn->quoteIdentifier($tableAlias . $field);
             $retVal .= $identifier . ' = ' . $this->_conn->quote($value);
         }
 
@@ -784,7 +801,7 @@ public function getRootAlias()
         if ( ! $this->_queryComponents) {
             $this->getSqlQuery(array(), false);
         }
-        
+
         return $this->_rootAlias;
     }
 
@@ -938,13 +955,13 @@ protected function _execute($params)
                 if ($cached) {
                     // Rebuild query from cache
                     $query = $this->_constructQueryFromCache($cached);
-                    
+
                     // Assign building/execution specific params
                     $this->_params['exec'] = $params;
-            
+
                     // Initialize prepared parameters array
                     $this->_execParams = $this->getFlattenedParams();
-                    
+
                     // Fix possible array parameter values in SQL params
                     $this->fixArrayParameterValues($this->getInternalParams());
                 } else {
@@ -967,7 +984,7 @@ protected function _execute($params)
         } else {
             $query = $this->_view->getSelectSql();
         }
-        
+
         // Get prepared SQL params for execution
         $params = $this->getInternalParams();
 
@@ -1038,13 +1055,13 @@ public function execute($params = array(), $hydrationMode = null)
                 $this->_hydrator->setQueryComponents($this->_queryComponents);
                 if ($this->_type == self::SELECT && $hydrationMode == Doctrine_Core::HYDRATE_ON_DEMAND) {
                     $hydrationDriver = $this->_hydrator->getHydratorDriver($hydrationMode, $this->_tableAliasMap);
-                    $result = new Doctrine_Collection_OnDemand($stmt, $hydrationDriver, $this->_tableAliasMap); 
+                    $result = new Doctrine_Collection_OnDemand($stmt, $hydrationDriver, $this->_tableAliasMap);
                 } else {
                     $result = $this->_hydrator->hydrateResultSet($stmt, $this->_tableAliasMap);
                 }
             }
         }
-        if ($this->getConnection()->getAttribute(Doctrine_Core::ATTR_AUTO_FREE_QUERY_OBJECTS)) {
+        if ($this->_autoFree) {
             $this->free();
         }
 
@@ -1055,7 +1072,7 @@ public function execute($params = array(), $hydrationMode = null)
      * Blank template method free(). Override to be used to free query object memory
      */
     public function free()
-    { 
+    {
     }
 
     /**
@@ -1118,8 +1135,8 @@ protected function _preQuery($params = array())
                 $params = array('component' => $component, 'alias' => $alias);
                 $event = new Doctrine_Event($record, $callback['const'], $this, $params);
 
-                $record->$callback['callback']($event);
-                $table->getRecordListener()->$callback['callback']($event);
+                $record->{$callback['callback']}($event);
+                $table->getRecordListener()->{$callback['callback']}($event);
             }
         }
 
@@ -1149,7 +1166,7 @@ protected function _getDqlCallbackComponents($params = array())
         $copy->free();
 
         if ($componentsBefore !== $componentsAfter) {
-            return array_diff($componentsAfter, $componentsBefore);
+            return Doctrine_Lib::arrayDiffSimple($componentsAfter, $componentsBefore);
         } else {
             return $componentsAfter;
         }
@@ -1183,9 +1200,9 @@ protected function _constructQueryFromCache($cached)
         foreach ($cachedComponents as $alias => $components) {
             $e = explode('.', $components['name']);
             if (count($e) === 1) {
-                $manager = Doctrine_Manager::getInstance(); 
-                if ( ! $this->_passedConn && $manager->hasConnectionForComponent($e[0])) { 
-                    $this->_conn = $manager->getConnectionForComponent($e[0]); 
+                $manager = Doctrine_Manager::getInstance();
+                if ( ! $this->_passedConn && $manager->hasConnectionForComponent($e[0])) {
+                    $this->_conn = $manager->getConnectionForComponent($e[0]);
                 }
                 $queryComponents[$alias]['table'] = $this->_conn->getTable($e[0]);
             } else {
@@ -1491,7 +1508,7 @@ public function addGroupBy($groupby)
     /**
      * Adds conditions to the HAVING part of the query.
      *
-     * This methods add HAVING clauses. These clauses are used to narrow the 
+     * This methods add HAVING clauses. These clauses are used to narrow the
      * results by operating on aggregated values.
      * <code>
      * $q->having('num_phonenumbers > ?', 1);
@@ -2168,4 +2185,4 @@ public function setDisableLimitSubquery($disableLimitSubquery)
     {
         $this->disableLimitSubquery = $disableLimitSubquery;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Check.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Check.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Check.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Check.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Condition.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Condition.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Condition.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Condition.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Filter.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Filter.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Filter.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Filter.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Filter/Chain.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Filter/Chain.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Filter/Chain.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Filter/Chain.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Filter/Interface.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Filter/Interface.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Filter/Interface.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Filter/Interface.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Forupdate.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Forupdate.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Forupdate.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Forupdate.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/From.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/From.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/From.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/From.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Groupby.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Groupby.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Groupby.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Groupby.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Having.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Having.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Having.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Having.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/JoinCondition.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/JoinCondition.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/JoinCondition.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/JoinCondition.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Limit.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Limit.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Limit.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Limit.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Offset.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Offset.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Offset.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Offset.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Orderby.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Orderby.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Orderby.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Orderby.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Parser.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Parser.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Parser.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Parser.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Part.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Part.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Part.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Part.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Registry.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Registry.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Registry.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Registry.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Registry/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Registry/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Registry/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Registry/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Select.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Select.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Select.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Select.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Set.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Set.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Set.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Set.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Tokenizer.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Tokenizer.php
similarity index 98%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Tokenizer.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Tokenizer.php
index f18b51755..402274132 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Tokenizer.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Tokenizer.php
@@ -78,7 +78,7 @@ public function tokenizeQuery($query)
                     //$parts[$token] = array();
                     $parts[$token] = '';
                 break;
-            
+
                 case 'order':
                 case 'group':
                     $i = ($index + 1);
@@ -91,10 +91,10 @@ public function tokenizeQuery($query)
                         //$parts[$p][] = $token;
                     }
                 break;
-            
+
                 case 'by':
                     continue;
-            
+
                 default:
                     if ( ! isset($p)) {
                         throw new Doctrine_Query_Tokenizer_Exception(
@@ -387,7 +387,7 @@ private function clauseExplodeCountBrackets($str, $regexp, $e1 = '(', $e2 = ')')
                 $i += sizeof($subterms);
             }
         }
-        
+
         return $terms;
     }
 
@@ -442,9 +442,9 @@ private function clauseExplodeNonQuoted($str, $regexp)
 
     /**
      * This expects input from clauseExplodeNonQuoted.
-     * It will go through the result and merges any bracket terms with 
+     * It will go through the result and merges any bracket terms with
      * unbalanced bracket count.
-     * Note that only the third parameter in each term is used to get the 
+     * Note that only the third parameter in each term is used to get the
      * bracket overhang. This is needed to be able to handle quoted strings
      * wich contain brackets
      *
@@ -478,7 +478,7 @@ private function mergeBracketTerms(array $terms)
             if ( ! isset($res[$i])) {
                 $res[$i] = array($val[0], $val[1], $val[2]);
             } else {
-                $res[$i][0] .= $res[$i][1] . $val[0]; 
+                $res[$i][0] .= $res[$i][1] . $val[0];
                 $res[$i][1] = $val[1];
                 $res[$i][2] += $val[2];
             }
@@ -513,7 +513,10 @@ private function mergeBracketTerms(array $terms)
     public function quotedStringExplode($str)
     {
         // Split by all possible incarnations of a quote
-        $split = array_map('preg_quote', array("\\'","''","'", "\\\"", "\"\"", "\""));
+        $split = array("\\'","''","'", "\\\"", "\"\"", "\"");
+        foreach ($split as &$v) {
+            $v = preg_quote($v);
+        }
         $split = '#(' . implode('|', $split) . ')#';
         $str = preg_split($split, $str, -1, PREG_SPLIT_DELIM_CAPTURE);
 
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Tokenizer/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Tokenizer/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Tokenizer/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Tokenizer/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Where.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Where.php
similarity index 98%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Where.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Where.php
index b2e64dcac..554d6751f 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Query/Where.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Query/Where.php
@@ -44,7 +44,7 @@ public function load($where)
 
         $where = $this->_tokenizer->bracketTrim(trim($where));
         $conn  = $this->query->getConnection();
-        $terms = $this->_tokenizer->sqlExplode($where);  
+        $terms = $this->_tokenizer->sqlExplode($where);
 
         if (count($terms) > 1) {
             if (substr($where, 0, 6) == 'EXISTS') {
@@ -76,20 +76,20 @@ public function load($where)
                     $map = $this->query->load($reference, false);
                     $alias = $this->query->getSqlTableAlias($reference);
                 }
-                
+
                 // DC-843 Modifiy operator for MSSQL
                 // @TODO apply database dependent parsing
-                //       list($leftExpr, $operator, $rightExpr) = $conn->modifyWhereCondition($leftExpr, $operator, $rightExpr); 
+                //       list($leftExpr, $operator, $rightExpr) = $conn->modifyWhereCondition($leftExpr, $operator, $rightExpr);
                 $driverName = strtolower($conn->getDriverName());
                 if ($driverName == 'mssql' && !empty($reference)) {
                     $cmp = $this->query->getQueryComponent($reference);
                     $table = $cmp['table'];
-                
+
                     /* @var $table Doctrine_Table */
                     $column = $table->getColumnName($fieldname);
                     $columndef = $table->getColumnDefinition($column);
 
-                    if ($columndef['type'] == 'string' && ($columndef['length'] == NULL || $columndef['length'] > $conn->varchar_max_length)) {
+                    if ($columndef['type'] == 'string' && ($columndef['length'] == NULL || $columndef['length'] > $conn->varchar_max_length) && strtoupper($rightExpr) != 'NULL') {
                         $operator = 'LIKE';
                     }
                 }
@@ -131,7 +131,7 @@ protected function _buildSql($leftExpr, $operator, $rightExpr)
                 $leftExprOriginal . ' ' . $operator . ' ' . $rightExpr . '"'
             );
         }
-        
+
         // Right Expression
         $rightExpr = ($rightExpr == '?' && $isInX)
             ? $this->_buildWhereInArraySqlPart($rightExpr)
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/RawSql.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/RawSql.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/RawSql.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/RawSql.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/RawSql/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/RawSql/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/RawSql/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/RawSql/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record.php
similarity index 99%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record.php
index d30276958..9c1d376ef 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record.php
@@ -2006,6 +2006,8 @@ public function fromArray(array $array, $deep = true)
         if ($refresh) {
             $this->refresh();
         }
+
+        return $this;
     }
 
     /**
@@ -2715,4 +2717,4 @@ public function __toString()
     {
         return (string) $this->_oid;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/Abstract.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record/Abstract.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/Abstract.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record/Abstract.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/Filter.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record/Filter.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/Filter.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record/Filter.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/Filter/Compound.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record/Filter/Compound.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/Filter/Compound.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record/Filter/Compound.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/Filter/Standard.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record/Filter/Standard.php
similarity index 99%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/Filter/Standard.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record/Filter/Standard.php
index 20f7d6d0b..7e4572889 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/Filter/Standard.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record/Filter/Standard.php
@@ -54,4 +54,4 @@ public function filterGet(Doctrine_Record $record, $name)
     {
         throw new Doctrine_Record_UnknownPropertyException(sprintf('Unknown record property / related component "%s" on "%s"', $name, get_class($record)));
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/Generator.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record/Generator.php
similarity index 97%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/Generator.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record/Generator.php
index a06f136ac..728207ee0 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/Generator.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record/Generator.php
@@ -32,8 +32,6 @@
  */
 abstract class Doctrine_Record_Generator extends Doctrine_Record_Abstract
 {
-    protected static $initializedTables = array();
-
     /**
      * _options
      *
@@ -162,13 +160,12 @@ public function initialize(Doctrine_Table $table)
             $this->_options['tableName'] = str_replace('%TABLE%', $ownerTableName, $tableName);
         }
 
-        $currentTableHash = spl_object_hash($table);
-        if (!empty(self::$initializedTables[$currentTableHash])) {
-            return null;
+        // check that class doesn't exist (otherwise we cannot create it)
+        if ($this->_options['generateFiles'] === false && class_exists($this->_options['className'])) {
+            $this->_table = Doctrine_Core::getTable($this->_options['className']);
+            return false;
         }
 
-        self::$initializedTables[$currentTableHash] = true;
-
         $this->buildTable();
 
         $fk = $this->buildForeignKeys($this->_options['table']);
@@ -180,9 +177,7 @@ public function initialize(Doctrine_Table $table)
         $this->setTableDefinition();
         $this->setUp();
 
-        if ($this->_options['generateFiles'] === true || !class_exists($this->_options['className'])) {
-            $this->generateClassFromTable($this->_table);
-        }
+        $this->generateClassFromTable($this->_table);
 
         $this->buildChildDefinitions();
 
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/Iterator.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record/Iterator.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/Iterator.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record/Iterator.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/Listener.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record/Listener.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/Listener.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record/Listener.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/Listener/Chain.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record/Listener/Chain.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/Listener/Chain.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record/Listener/Chain.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/Listener/Interface.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record/Listener/Interface.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/Listener/Interface.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record/Listener/Interface.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/State/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record/State/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/State/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record/State/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/UnknownPropertyException.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record/UnknownPropertyException.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Record/UnknownPropertyException.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Record/UnknownPropertyException.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Relation.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Relation.php
similarity index 99%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Relation.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Relation.php
index e139a76d1..03d77e1c4 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Relation.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Relation.php
@@ -453,4 +453,4 @@ public function __toString()
         $r[] = "</pre>";
         return implode("\n", $r);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Relation/Association.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Relation/Association.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Relation/Association.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Relation/Association.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Relation/Association/Self.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Relation/Association/Self.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Relation/Association/Self.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Relation/Association/Self.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Relation/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Relation/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Relation/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Relation/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Relation/ForeignKey.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Relation/ForeignKey.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Relation/ForeignKey.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Relation/ForeignKey.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Relation/LocalKey.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Relation/LocalKey.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Relation/LocalKey.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Relation/LocalKey.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Relation/Nest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Relation/Nest.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Relation/Nest.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Relation/Nest.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Relation/Parser.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Relation/Parser.php
similarity index 97%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Relation/Parser.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Relation/Parser.php
index 0e00ef01a..45eda5bd5 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Relation/Parser.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Relation/Parser.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *  $Id: Table.php 1397 2007-05-19 19:54:15Z zYne $
+ *  $Id$
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -26,12 +26,12 @@
  * @subpackage  Relation
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @version     $Revision: 1397 $
+ * @version     $Revision$
  * @link        www.doctrine-project.org
  * @since       1.0
  * @todo Composite key support?
  */
-class Doctrine_Relation_Parser 
+class Doctrine_Relation_Parser
 {
     /**
      * @var Doctrine_Table $_table          the table object this parser belongs to
@@ -53,7 +53,7 @@ class Doctrine_Relation_Parser
      *
      * @param Doctrine_Table $table         the table object this parser belongs to
      */
-    public function __construct(Doctrine_Table $table) 
+    public function __construct(Doctrine_Table $table)
     {
         $this->_table = $table;
     }
@@ -73,12 +73,12 @@ public function getTable()
      *
      * @return array            an array defining a pending relation
      */
-    public function getPendingRelation($name) 
+    public function getPendingRelation($name)
     {
         if ( ! isset($this->_pending[$name])) {
             throw new Doctrine_Relation_Exception('Unknown pending relation ' . $name);
         }
-        
+
         return $this->_pending[$name];
     }
 
@@ -87,7 +87,7 @@ public function getPendingRelation($name)
      *
      * @return array            an array containing all the pending relations
      */
-    public function getPendingRelations() 
+    public function getPendingRelations()
     {
         return $this->_pending;
     }
@@ -98,7 +98,7 @@ public function getPendingRelations()
      *
      * @param string            relation to remove
      */
-    public function unsetPendingRelations($name) 
+    public function unsetPendingRelations($name)
     {
        unset($this->_pending[$name]);
     }
@@ -106,7 +106,7 @@ public function unsetPendingRelations($name)
     /**
      * Check if a relation alias exists
      *
-     * @param string $name 
+     * @param string $name
      * @return boolean $bool
      */
     public function hasRelation($name)
@@ -114,7 +114,7 @@ public function hasRelation($name)
         if ( ! isset($this->_pending[$name]) && ! isset($this->_relations[$name])) {
             return false;
         }
-        
+
         return true;
     }
 
@@ -127,8 +127,10 @@ public function hasRelation($name)
      */
     public function bind($name, $options = array())
     {
-        $e    = explode(' as ', $name);
-        $e    = array_map('trim', $e);
+        $e = explode(' as ', $name);
+        foreach ($e as &$v) {
+            $v = trim($v);
+        }
         $name = $e[0];
         $alias = isset($e[1]) ? $e[1] : $name;
 
@@ -534,4 +536,4 @@ public function completeDefinition($def)
         }
         return $def;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Relation/Parser/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Relation/Parser/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Relation/Parser/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Relation/Parser/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/Analyzer.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/Analyzer.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/Analyzer.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/Analyzer.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/Analyzer/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/Analyzer/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/Analyzer/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/Analyzer/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/Analyzer/Interface.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/Analyzer/Interface.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/Analyzer/Interface.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/Analyzer/Interface.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/Analyzer/Standard.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/Analyzer/Standard.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/Analyzer/Standard.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/Analyzer/Standard.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/Analyzer/Utf8.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/Analyzer/Utf8.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/Analyzer/Utf8.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/Analyzer/Utf8.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/File.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/File.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/File.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/File.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/Indexer.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/Indexer.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/Indexer.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/Indexer.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/Indexer/Dir.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/Indexer/Dir.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/Indexer/Dir.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/Indexer/Dir.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/Indexer/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/Indexer/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/Indexer/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/Indexer/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/Listener.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/Listener.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/Listener.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/Listener.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/Parser.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/Parser.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/Parser.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/Parser.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/Query.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/Query.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/Query.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/Query.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/Record.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/Record.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Search/Record.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Search/Record.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Sequence.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Sequence.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Sequence.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Sequence.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Sequence/Db2.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Sequence/Db2.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Sequence/Db2.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Sequence/Db2.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Sequence/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Sequence/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Sequence/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Sequence/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Sequence/Mssql.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Sequence/Mssql.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Sequence/Mssql.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Sequence/Mssql.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Sequence/Mysql.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Sequence/Mysql.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Sequence/Mysql.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Sequence/Mysql.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Sequence/Oracle.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Sequence/Oracle.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Sequence/Oracle.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Sequence/Oracle.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Sequence/Pgsql.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Sequence/Pgsql.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Sequence/Pgsql.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Sequence/Pgsql.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Sequence/Sqlite.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Sequence/Sqlite.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Sequence/Sqlite.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Sequence/Sqlite.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Table.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Table.php
similarity index 91%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Table.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Table.php
index 30c332b68..43f411021 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Table.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Table.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *  $Id: Table.php 7681 2010-08-24 15:55:34Z jwage $
+ *  $Id$
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -28,13 +28,13 @@
  * @package     Doctrine
  * @subpackage  Table
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @version     $Revision: 7681 $
+ * @version     $Revision$
  * @link        www.doctrine-project.org
  * @since       1.0
  * @method mixed findBy*(mixed $value) magic finders; @see __call()
  * @method mixed findOneBy*(mixed $value) magic finders; @see __call()
  */
-class Doctrine_Table extends Doctrine_Configurable implements Countable
+class Doctrine_Table extends Doctrine_Configurable implements Countable, Serializable
 {
     /**
      * @var array $data                                 temporary data which is then loaded into Doctrine_Record::$_data
@@ -222,6 +222,11 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
      */
     protected $_invokedMethods = array();
 
+    /**
+     * @var boolean $_useIdentityMap Use or not identyMap cache
+     */
+    protected $_useIdentityMap = true;
+
     /**
      * @var Doctrine_Record $record             empty instance of the given model
      */
@@ -270,7 +275,13 @@ public function __construct($name, Doctrine_Connection $conn, $initDefinition =
         }
 
         $this->_filters[]  = new Doctrine_Record_Filter_Standard();
-        $this->_repository = new Doctrine_Table_Repository($this);
+        if ($this->getAttribute(Doctrine_Core::ATTR_USE_TABLE_REPOSITORY)) {
+            $this->_repository = new Doctrine_Table_Repository($this);
+        } else {
+            $this->_repository = new Doctrine_Table_Repository_None($this);
+        }
+
+        $this->_useIdentityMap = $this->getAttribute(Doctrine_Core::ATTR_USE_TABLE_IDENTITY_MAP);
 
         $this->construct();
     }
@@ -1126,8 +1137,9 @@ public function processOrderBy($alias, $orderBy, $columnNames = false)
         } else {
             $e1 = $orderBy;
         }
-        $e1 = array_map('trim', $e1);
+
         foreach ($e1 as $k => $v) {
+            $v = trim($v);
             $e2 = explode(' ', $v);
             if ($columnNames) {
                 $e2[0] = $this->getColumnName($e2[0]);
@@ -1374,7 +1386,7 @@ public function setColumn($name, $type = null, $length = null, $options = array(
 
         $options['type'] = $type;
         $options['length'] = $length;
-        
+
         if (strtolower($fieldName) != $name) {
             $options['alias'] = $fieldName;
         }
@@ -1483,7 +1495,7 @@ public function hasField($fieldName)
      * This method assign the connection which this table will use
      * to create queries.
      *
-     * @params Doctrine_Connection      a connection object
+     * @param Doctrine_Connection      a connection object
      * @return Doctrine_Table           this object; fluent interface
      */
     public function setConnection(Doctrine_Connection $conn)
@@ -1511,7 +1523,7 @@ public function getConnection()
      * This method create a new instance of the model defined by this table.
      * The class of this record is the subclass of Doctrine_Record defined by
      * this component. The record is not created in the database until you
-     * call @save().
+     * call Doctrine_Record::save().
      *
      * @param $array             an array where keys are field names and
      *                           values representing field values. Can contain
@@ -1632,8 +1644,6 @@ public function find()
             $res = $q->fetchOne($params, $hydrationMode);
         }
 
-        $q->free();
-
         return $res;
     }
 
@@ -1645,8 +1655,7 @@ public function find()
      */
     public function findAll($hydrationMode = null)
     {
-        return $this->createQuery('dctrn_find')
-            ->execute(array(), $hydrationMode);
+        return $this->createQuery('dctrn_find')->execute(array(), $hydrationMode);
     }
 
     /**
@@ -1772,6 +1781,10 @@ public function clear()
      */
     public function addRecord(Doctrine_Record $record)
     {
+        if (!$this->_useIdentityMap) {
+            return false;
+        }
+
         $id = implode(' ', $record->identifier());
 
         if (isset($this->_identityMap[$id])) {
@@ -1795,6 +1808,10 @@ public function addRecord(Doctrine_Record $record)
      */
     public function removeRecord(Doctrine_Record $record)
     {
+        if (!$this->_useIdentityMap) {
+            return false;
+        }
+
         $id = implode(' ', $record->identifier());
 
         if (isset($this->_identityMap[$id])) {
@@ -1841,7 +1858,7 @@ public function getRecord()
 
             $id = implode(' ', $id);
 
-            if (isset($this->_identityMap[$id])) {
+            if ($this->_useIdentityMap && isset($this->_identityMap[$id])) {
                 $record = $this->_identityMap[$id];
                 if ($record->getTable()->getAttribute(Doctrine_Core::ATTR_HYDRATE_OVERWRITE)) {
                     $record->hydrate($this->_data);
@@ -1856,7 +1873,10 @@ public function getRecord()
             } else {
                 $recordName = $this->getComponentName();
                 $record = new $recordName($this);
-                $this->_identityMap[$id] = $record;
+
+                if ($this->_useIdentityMap) {
+                    $this->_identityMap[$id] = $record;
+                }
             }
             $this->_data = array();
         } else {
@@ -1942,6 +1962,7 @@ final public function applyInheritance($where)
             $i = implode(' AND ', $a);
             $where .= ' AND ' . $i;
         }
+
         return $where;
     }
 
@@ -1962,6 +1983,7 @@ public function getQueryObject()
     {
         $graph = $this->createQuery();
         $graph->load($this->getComponentName());
+
         return $graph;
     }
 
@@ -2072,7 +2094,9 @@ public function validateField($fieldName, $value, Doctrine_Record $record = null
                 // Convert string to array
                 if (is_string($value)) {
                     $value = explode(',', $value);
-                    $value = array_map('trim', $value);
+                    foreach ($value as &$v) {
+                        $v = trim($v);
+                    }
                     $record->set($fieldName, $value);
                 }
                 // Make sure each set value is valid
@@ -2727,8 +2751,16 @@ public function buildFindByWhere($fieldName)
     {
         // Get all variations of possible field names
         $fields = array_merge($this->getFieldNames(), $this->getColumnNames());
-        $fields = array_merge($fields, array_map(array('Doctrine_Inflector', 'classify'), $fields));
-        $fields = array_merge($fields, array_map('ucfirst', $fields));
+        $classifyFields = array();
+        foreach ($fields as $k => $v) {
+            $classifyFields[$k] = Doctrine_Inflector::classify($v);
+        }
+        $fields = array_merge($fields, $classifyFields);
+        $ucfirstFields = array();
+        foreach ($fields as $k => $v) {
+            $ucfirstFields[$k] = ucfirst($v);
+        }
+        $fields = array_merge($fields, $ucfirstFields);
 
         // Sort field names by length - smallest first
         // and then reverse so that largest is first
@@ -2738,12 +2770,15 @@ public function buildFindByWhere($fieldName)
         // Identify fields and operators
         preg_match_all('/(' . implode('|', $fields) . ')(Or|And)?/', $fieldName, $matches);
         $fieldsFound = $matches[1];
-        $operatorFound = array_map('strtoupper', $matches[2]);
+        $operatorFound = $matches[2];
+        foreach ($operatorFound as &$v) {
+            $v = strtoupper($v);
+        }
 
-        // Check if $fieldName has unidentified parts left 
+        // Check if $fieldName has unidentified parts left
         if (strlen(implode('', $fieldsFound) . implode('', $operatorFound)) !== strlen($fieldName)) {
             $expression = preg_replace('/(' . implode('|', $fields) . ')(Or|And)?/', '($1)$2', $fieldName);
-            throw new Doctrine_Table_Exception('Invalid expression found: ' . $expression);    
+            throw new Doctrine_Table_Exception('Invalid expression found: ' . $expression);
         }
 
         // Build result
@@ -2768,7 +2803,7 @@ public function buildFindByWhere($fieldName)
             }
 
             $where .= ' ' . strtoupper($operatorFound[$index]) . ' ';
-            
+
             $lastOperator = $operatorFound[$index];
         }
 
@@ -2798,6 +2833,81 @@ protected function _resolveFindByFieldName($name)
         }
     }
 
+    /**
+     * deletes table row(s) matching the specified identifier
+     *
+     * @throws Doctrine_Connection_Exception    if something went wrong at the database level
+     * @param mixed $identifier         An associateve array containing identifier column-value pairs.
+     * @return integer                  the number of affected rows. Boolean false if empty value array was given,
+     */
+    public function delete($identifier)
+    {
+        return $this->getConnection()->delete($this, (array) $identifier);
+    }
+
+    /**
+     * Inserts a table row with specified data.
+     *
+     * @param array $fields             An associative array containing column-value pairs.
+     *                                  Values can be strings or Doctrine_Expression instances.
+     * @return integer                  the number of affected rows. Boolean false if empty value array was given,
+     */
+    public function insert(array $fields)
+    {
+        return $this->getConnection()->insert($this, $fields);
+    }
+
+    /**
+     * Updates table row(s) with specified data.
+     *
+     * @throws Doctrine_Connection_Exception    if something went wrong at the database level
+     * @param array $fields             An associative array containing column-value pairs.
+     *                                  Values can be strings or Doctrine_Expression instances.
+     * @param mixed $identifier         An associateve array containing identifier column-value pairs.
+     * @return integer                  the number of affected rows. Boolean false if empty value array was given,
+     */
+    public function update(array $fields, $identifier)
+    {
+        return $this->getConnection()->update($this, $fields, (array) $identifier);
+    }
+
+    /**
+     * Execute a SQL REPLACE query. A REPLACE query is identical to a INSERT
+     * query, except that if there is already a row in the table with the same
+     * key field values, the REPLACE query just updates its values instead of
+     * inserting a new row.
+     *
+     * The REPLACE type of query does not make part of the SQL standards. Since
+     * practically only MySQL and SQLIte implement it natively, this type of
+     * query isemulated through this method for other DBMS using standard types
+     * of queries inside a transaction to assure the atomicity of the operation.
+     *
+     *
+     * @param array $fields     an associative array that describes the fields and the
+     *                          values that will be inserted or updated in the specified table. The
+     *                          indexes of the array are the names of all the fields of the table.
+     *
+     *                          The values of the array are values to be assigned to the specified field.
+     *
+     * @param mixed $keys       an array containing all key fields (primary key fields
+     *                          or unique index fields) for this table
+     *
+     *                          the uniqueness of a row will be determined according to
+     *                          the provided key fields
+     *
+     *                          this method will fail if no key fields are specified
+     *
+     * @throws Doctrine_Connection_Exception        if this driver doesn't support replace
+     * @throws Doctrine_Connection_Exception        if some of the key values was null
+     * @throws Doctrine_Connection_Exception        if there were no key fields
+     * @throws PDOException                         if something fails at PDO level
+     * @ return integer                              number of rows affected
+     */
+    public function replace(array $fields, $keys)
+    {
+        return $this->getConnection()->replace($this, $fields, (array) $keys);
+    }
+
     /**
      * Adds support for magic finders.
      *
@@ -2855,4 +2965,97 @@ public function __call($method, $arguments)
 
         throw new Doctrine_Table_Exception(sprintf('Unknown method %s::%s', get_class($this), $method));
     }
+
+    public function serialize()
+    {
+        $options = $this->_options;
+        unset($options['declaringClass']);
+
+        return serialize(array(
+            $this->_identifier,
+            $this->_identifierType,
+            $this->_columns,
+            $this->_uniques,
+            $this->_fieldNames,
+            $this->_columnNames,
+            $this->columnCount,
+            $this->hasDefaultValues,
+            $options,
+            $this->_invokedMethods,
+            $this->_useIdentityMap,
+        ));
+    }
+
+    public function unserialize($data)
+    {
+        $all = unserialize($data);
+
+        $this->_identifier = $all[0];
+        $this->_identifierType = $all[1];
+        $this->_columns = $all[2];
+        $this->_uniques = $all[3];
+        $this->_fieldNames = $all[4];
+        $this->_columnNames = $all[5];
+        $this->columnCount = $all[6];
+        $this->hasDefaultValues = $all[7];
+        $this->_options = $all[8];
+        $this->_invokedMethods = $all[9];
+        $this->_useIdentityMap = $all[10];
+    }
+
+    public function initializeFromCache(Doctrine_Connection $conn)
+    {
+        $this->_conn = $conn;
+        $this->setParent($this->_conn);
+
+        $this->_parser = new Doctrine_Relation_Parser($this);
+
+        $name = $this->_options['name'];
+        if ( ! class_exists($name) || empty($name)) {
+            throw new Doctrine_Exception("Couldn't find class " . $name);
+        }
+        $record = new $name($this);
+
+        $class = $name;
+
+        // get parent classes
+        do {
+            if ($class === 'Doctrine_Record') {
+                break;
+            }
+        } while ($class = get_parent_class($class));
+
+        if ($class === false) {
+            throw new Doctrine_Table_Exception('Class "' . $name . '" must be a child class of Doctrine_Record');
+        }
+
+        if (method_exists($record, 'setTableDefinition')) {
+            // get the declaring class of setTableDefinition method
+            $method = new ReflectionMethod($this->_options['name'], 'setTableDefinition');
+            $class = $method->getDeclaringClass();
+
+        } else {
+            $class = new ReflectionClass($class);
+        }
+
+        $this->record = $record;
+
+        $this->_options['declaringClass'] = $class;
+
+        $this->record->setUp();
+
+        // if tree, set up tree
+        if ($this->isTree()) {
+            $this->getTree()->setUp();
+        }
+
+        $this->_filters[]  = new Doctrine_Record_Filter_Standard();
+        if ($this->getAttribute(Doctrine_Core::ATTR_USE_TABLE_REPOSITORY)) {
+            $this->_repository = new Doctrine_Table_Repository($this);
+        } else {
+            $this->_repository = new Doctrine_Table_Repository_None($this);
+        }
+
+        $this->construct();
+    }
 }
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Table/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Table/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Table/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Table/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Table/Repository.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Table/Repository.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Table/Repository.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Table/Repository.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Table/Repository/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Table/Repository/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Table/Repository/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Table/Repository/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Table/Repository/None.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Table/Repository/None.php
new file mode 100644
index 000000000..da421ec74
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Table/Repository/None.php
@@ -0,0 +1,90 @@
+<?php
+/*
+ *  $Id: None.php 115 2012-03-30 15:25:38Z jmacias $
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Repository
+ * each record is added into Doctrine_Repository at the same time they are created,
+ * loaded from the database or retrieved from the cache
+ *
+ * @author      Jérôme Macias <jmacias@groupe-exp.com>
+ * @package     Doctrine
+ * @subpackage  Table
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision: 115 $
+ */
+class Doctrine_Table_Repository_None extends Doctrine_Table_Repository implements Countable, IteratorAggregate
+{
+    /**
+     * add
+     *
+     * @param Doctrine_Record $record       record to be added into registry
+     * @return boolean
+     */
+    public function add(Doctrine_Record $record)
+    {
+        return false;
+    }
+
+    /**
+     * get
+     *
+     * @param integer $oid
+     * @throws Doctrine_Table_Repository_Exception
+     */
+    public function get($oid)
+    {
+        throw new Doctrine_Table_Repository_Exception("Unknown object identifier");
+    }
+
+    /**
+     * count
+     * Doctrine_Registry implements interface Countable
+     *
+     * @return integer                      the number of records this registry has
+     */
+    public function count()
+    {
+        return 0;
+    }
+
+    /**
+     * evict
+     *
+     * @param integer $oid                  object identifier
+     * @return boolean                      whether ot not the operation was successful
+     */
+    public function evict($oid)
+    {
+        return false;
+    }
+
+    /**
+     * evictAll
+     *
+     * @return integer                      number of records evicted
+     */
+    public function evictAll()
+    {
+        return 0;
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/BuildAll.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/BuildAll.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/BuildAll.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/BuildAll.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/BuildAllLoad.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/BuildAllLoad.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/BuildAllLoad.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/BuildAllLoad.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/BuildAllReload.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/BuildAllReload.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/BuildAllReload.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/BuildAllReload.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/Compile.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/Compile.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/Compile.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/Compile.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/CreateDb.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/CreateDb.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/CreateDb.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/CreateDb.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/CreateTables.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/CreateTables.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/CreateTables.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/CreateTables.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/Dql.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/Dql.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/Dql.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/Dql.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/DropDb.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/DropDb.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/DropDb.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/DropDb.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/DumpData.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/DumpData.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/DumpData.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/DumpData.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/GenerateMigration.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/GenerateMigration.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/GenerateMigration.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/GenerateMigration.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/GenerateMigrationsDb.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/GenerateMigrationsDb.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/GenerateMigrationsDb.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/GenerateMigrationsDb.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/GenerateMigrationsDiff.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/GenerateMigrationsDiff.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/GenerateMigrationsDiff.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/GenerateMigrationsDiff.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/GenerateMigrationsModels.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/GenerateMigrationsModels.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/GenerateMigrationsModels.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/GenerateMigrationsModels.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/GenerateModelsDb.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/GenerateModelsDb.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/GenerateModelsDb.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/GenerateModelsDb.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/GenerateModelsYaml.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/GenerateModelsYaml.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/GenerateModelsYaml.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/GenerateModelsYaml.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/GenerateSql.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/GenerateSql.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/GenerateSql.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/GenerateSql.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/GenerateYamlDb.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/GenerateYamlDb.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/GenerateYamlDb.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/GenerateYamlDb.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/GenerateYamlModels.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/GenerateYamlModels.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/GenerateYamlModels.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/GenerateYamlModels.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/LoadData.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/LoadData.php
similarity index 89%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/LoadData.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/LoadData.php
index 3be700f37..32e31efa1 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/LoadData.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/LoadData.php
@@ -35,13 +35,14 @@ class Doctrine_Task_LoadData extends Doctrine_Task
     public $description          =   'Load data from a yaml data fixture file.',
            $requiredArguments    =   array('data_fixtures_path' =>  'Specify the complete path to load the yaml data fixtures files from.',
                                            'models_path'        =>  'Specify path to your Doctrine_Record definitions.'),
-           $optionalArguments    =   array('append'             =>  'Whether or not to append the data');
-    
+           $optionalArguments    =   array('append'             =>  'Whether or not to append the data',
+                                           'charset'            =>  'Specify the charset to use for yaml laod');
+
     public function execute()
     {
         Doctrine_Core::loadModels($this->getArgument('models_path'));
-        Doctrine_Core::loadData($this->getArgument('data_fixtures_path'), $this->getArgument('append', false));
-        
+        Doctrine_Core::loadData($this->getArgument('data_fixtures_path'), $this->getArgument('append', false), $this->getArgument('charset', 'UTF-8'));
+
         $this->notify('Data was successfully loaded');
     }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/Migrate.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/Migrate.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/Migrate.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/Migrate.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/RebuildDb.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/RebuildDb.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Task/RebuildDb.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Task/RebuildDb.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Template.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Template.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Template.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Template.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Template/Geographical.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Template/Geographical.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Template/Geographical.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Template/Geographical.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Template/I18n.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Template/I18n.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Template/I18n.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Template/I18n.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Template/Listener/Sluggable.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Template/Listener/Sluggable.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Template/Listener/Sluggable.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Template/Listener/Sluggable.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Template/Listener/SoftDelete.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Template/Listener/SoftDelete.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Template/Listener/SoftDelete.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Template/Listener/SoftDelete.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Template/Listener/Timestampable.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Template/Listener/Timestampable.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Template/Listener/Timestampable.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Template/Listener/Timestampable.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Template/NestedSet.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Template/NestedSet.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Template/NestedSet.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Template/NestedSet.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Template/Searchable.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Template/Searchable.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Template/Searchable.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Template/Searchable.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Template/Sluggable.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Template/Sluggable.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Template/Sluggable.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Template/Sluggable.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Template/SoftDelete.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Template/SoftDelete.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Template/SoftDelete.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Template/SoftDelete.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Template/Timestampable.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Template/Timestampable.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Template/Timestampable.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Template/Timestampable.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Template/Versionable.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Template/Versionable.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Template/Versionable.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Template/Versionable.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Transaction.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Transaction.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Transaction.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Transaction.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Transaction/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Transaction/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Transaction/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Transaction/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Transaction/Mock.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Transaction/Mock.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Transaction/Mock.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Transaction/Mock.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Transaction/Mssql.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Transaction/Mssql.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Transaction/Mssql.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Transaction/Mssql.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Transaction/Mysql.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Transaction/Mysql.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Transaction/Mysql.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Transaction/Mysql.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Transaction/Oracle.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Transaction/Oracle.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Transaction/Oracle.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Transaction/Oracle.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Transaction/Pgsql.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Transaction/Pgsql.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Transaction/Pgsql.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Transaction/Pgsql.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Transaction/Sqlite.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Transaction/Sqlite.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Transaction/Sqlite.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Transaction/Sqlite.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Tree.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Tree.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Tree.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Tree.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Tree/AdjacencyList.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Tree/AdjacencyList.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Tree/AdjacencyList.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Tree/AdjacencyList.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Tree/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Tree/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Tree/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Tree/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Tree/Interface.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Tree/Interface.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Tree/Interface.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Tree/Interface.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Tree/MaterializedPath.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Tree/MaterializedPath.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Tree/MaterializedPath.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Tree/MaterializedPath.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Tree/NestedSet.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Tree/NestedSet.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Tree/NestedSet.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Tree/NestedSet.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Util.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Util.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Util.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Util.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Country.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Country.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Country.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Country.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Creditcard.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Creditcard.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Creditcard.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Creditcard.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Date.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Date.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Date.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Date.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Driver.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Driver.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Driver.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Driver.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Email.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Email.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Email.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Email.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/ErrorStack.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/ErrorStack.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/ErrorStack.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/ErrorStack.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Future.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Future.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Future.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Future.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Htmlcolor.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Htmlcolor.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Htmlcolor.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Htmlcolor.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Ip.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Ip.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Ip.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Ip.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Minlength.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Minlength.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Minlength.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Minlength.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Nospace.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Nospace.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Nospace.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Nospace.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Notblank.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Notblank.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Notblank.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Notblank.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Notnull.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Notnull.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Notnull.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Notnull.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Past.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Past.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Past.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Past.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Range.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Range.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Range.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Range.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Readonly.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Readonly.php
old mode 100644
new mode 100755
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Readonly.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Readonly.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Regexp.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Regexp.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Regexp.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Regexp.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Time.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Time.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Time.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Time.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Timestamp.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Timestamp.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Timestamp.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Timestamp.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Unique.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Unique.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Unique.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Unique.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Unsigned.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Unsigned.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Unsigned.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Unsigned.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Usstate.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Usstate.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/Validator/Usstate.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/Validator/Usstate.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/View.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/View.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/View.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/View.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/View/Exception.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/View/Exception.php
similarity index 100%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine/View/Exception.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/lib/Doctrine/View/Exception.php
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/package.xml b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/package.xml
new file mode 100644
index 000000000..056831624
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/package.xml
@@ -0,0 +1,1625 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package packagerversion="1.9.0" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
+ <name>Doctrine</name>
+ <channel>pear.doctrine-project.org</channel>
+ <summary>PHP5 Database ORM</summary>
+ <description>Doctrine is an ORM (object relational mapper) for PHP 5.2.x+ that sits on top of
+a powerful DBAL (database abstraction layer). One of its key features is the
+ability to optionally write database queries in an OO (object oriented)
+SQL-dialect called DQL inspired by Hibernates HQL. This provides developers with
+a powerful alternative to SQL that maintains a maximum of flexibility without
+requiring needless code duplication.</description>
+ <lead>
+  <name>Konsta Vesterinen</name>
+  <user>zYne-</user>
+  <email>kvesteri@cc.hut.fi</email>
+  <active>yes</active>
+ </lead>
+ <lead>
+  <name>Jonathan H. Wage</name>
+  <user>jwage</user>
+  <email>jonwage@gmail.com</email>
+  <active>yes</active>
+ </lead>
+ <date>2010-03-29</date>
+ <time>17:03:32</time>
+ <version>
+  <release>1.2.2</release>
+  <api>1.2.2</api>
+ </version>
+ <stability>
+  <release>stable</release>
+  <api>stable</api>
+ </stability>
+ <license uri="http://www.doctrine-project.org/license">LGPL license</license>
+ <notes>
+-
+ </notes>
+ <contents>
+  <dir baseinstalldir="Doctrine" name="/">
+   <dir name="lib">
+    <dir name="Doctrine">
+     <dir name="Adapter">
+      <dir name="Statement">
+       <file name="Interface.php" role="php" />
+       <file name="Mock.php" role="php" />
+       <file name="Oracle.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Adapter/Statement -->
+      <file name="Exception.php" role="php" />
+      <file name="Interface.php" role="php" />
+      <file name="Mock.php" role="php" />
+      <file name="Oracle.php" role="php" />
+      <file name="Statement.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Adapter -->
+     <dir name="AuditLog">
+      <dir name="Listener">
+       <file name="Microtime.php" role="php" />
+      </dir> <!-- /lib/Doctrine/AuditLog/Listener -->
+      <file name="Listener.php" role="php" />
+     </dir> <!-- /lib/Doctrine/AuditLog -->
+     <dir name="Cache">
+      <file name="Apc.php" role="php" />
+      <file name="Array.php" role="php" />
+      <file name="Db.php" role="php" />
+      <file name="Driver.php" role="php" />
+      <file name="Exception.php" role="php" />
+      <file name="Interface.php" role="php" />
+      <file name="Memcache.php" role="php" />
+      <file name="Xcache.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Cache -->
+     <dir name="Cli">
+      <file name="AnsiColorFormatter.php" role="php" />
+      <file name="Exception.php" role="php" />
+      <file name="Formatter.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Cli -->
+     <dir name="Collection">
+      <dir name="Iterator">
+       <file name="Expandable.php" role="php" />
+       <file name="Normal.php" role="php" />
+       <file name="Offset.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Collection/Iterator -->
+      <file name="Exception.php" role="php" />
+      <file name="Iterator.php" role="php" />
+      <file name="Offset.php" role="php" />
+      <file name="OnDemand.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Collection -->
+     <dir name="Compiler">
+      <file name="Exception.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Compiler -->
+     <dir name="Connection">
+      <dir name="Mssql">
+       <file name="Exception.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Connection/Mssql -->
+      <dir name="Mysql">
+       <file name="Exception.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Connection/Mysql -->
+      <dir name="Oracle">
+       <file name="Exception.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Connection/Oracle -->
+      <dir name="Pgsql">
+       <file name="Exception.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Connection/Pgsql -->
+      <dir name="Profiler">
+       <file name="Exception.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Connection/Profiler -->
+      <dir name="Sqlite">
+       <file name="Exception.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Connection/Sqlite -->
+      <file name="Common.php" role="php" />
+      <file name="Db2.php" role="php" />
+      <file name="Exception.php" role="php" />
+      <file name="Mock.php" role="php" />
+      <file name="Module.php" role="php" />
+      <file name="Mssql.php" role="php" />
+      <file name="Mysql.php" role="php" />
+      <file name="Oracle.php" role="php" />
+      <file name="Pgsql.php" role="php" />
+      <file name="Profiler.php" role="php" />
+      <file name="Sqlite.php" role="php" />
+      <file name="Statement.php" role="php" />
+      <file name="UnitOfWork.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Connection -->
+     <dir name="Data">
+      <file name="Exception.php" role="php" />
+      <file name="Export.php" role="php" />
+      <file name="Import.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Data -->
+     <dir name="DataDict">
+      <file name="Exception.php" role="php" />
+      <file name="Mssql.php" role="php" />
+      <file name="Mysql.php" role="php" />
+      <file name="Oracle.php" role="php" />
+      <file name="Pgsql.php" role="php" />
+      <file name="Sqlite.php" role="php" />
+     </dir> <!-- /lib/Doctrine/DataDict -->
+     <dir name="EventListener">
+      <file name="Chain.php" role="php" />
+      <file name="Exception.php" role="php" />
+      <file name="Interface.php" role="php" />
+     </dir> <!-- /lib/Doctrine/EventListener -->
+     <dir name="Export">
+      <file name="Exception.php" role="php" />
+      <file name="Mssql.php" role="php" />
+      <file name="Mysql.php" role="php" />
+      <file name="Oracle.php" role="php" />
+      <file name="Pgsql.php" role="php" />
+      <file name="Reporter.php" role="php" />
+      <file name="Schema.php" role="php" />
+      <file name="Sqlite.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Export -->
+     <dir name="Expression">
+      <file name="Driver.php" role="php" />
+      <file name="Exception.php" role="php" />
+      <file name="Mock.php" role="php" />
+      <file name="Mssql.php" role="php" />
+      <file name="Mysql.php" role="php" />
+      <file name="Oracle.php" role="php" />
+      <file name="Pgsql.php" role="php" />
+      <file name="Sqlite.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Expression -->
+     <dir name="File">
+      <file name="Index.php" role="php" />
+     </dir> <!-- /lib/Doctrine/File -->
+     <dir name="Hook">
+      <dir name="Parser">
+       <file name="Complex.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Hook/Parser -->
+      <file name="Equal.php" role="php" />
+      <file name="Integer.php" role="php" />
+      <file name="Parser.php" role="php" />
+      <file name="WordLike.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Hook -->
+     <dir name="Hydrator">
+      <file name="Abstract.php" role="php" />
+      <file name="ArrayDriver.php" role="php" />
+      <file name="ArrayHierarchyDriver.php" role="php" />
+      <file name="Exception.php" role="php" />
+      <file name="Graph.php" role="php" />
+      <file name="NoneDriver.php" role="php" />
+      <file name="RecordDriver.php" role="php" />
+      <file name="RecordHierarchyDriver.php" role="php" />
+      <file name="ScalarDriver.php" role="php" />
+      <file name="SingleScalarDriver.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Hydrator -->
+     <dir name="I18n">
+      <file name="Exception.php" role="php" />
+     </dir> <!-- /lib/Doctrine/I18n -->
+     <dir name="Import">
+      <dir name="Builder">
+       <file name="Exception.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Import/Builder -->
+      <file name="Builder.php" role="php" />
+      <file name="Exception.php" role="php" />
+      <file name="Mssql.php" role="php" />
+      <file name="Mysql.php" role="php" />
+      <file name="Oracle.php" role="php" />
+      <file name="Pgsql.php" role="php" />
+      <file name="Schema.php" role="php" />
+      <file name="Sqlite.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Import -->
+     <dir name="Locator">
+      <file name="Exception.php" role="php" />
+      <file name="Injectable.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Locator -->
+     <dir name="Locking">
+      <dir name="Manager">
+       <file name="Pessimistic.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Locking/Manager -->
+      <file name="Exception.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Locking -->
+     <dir name="Manager">
+      <file name="Exception.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Manager -->
+     <dir name="Migration">
+      <file name="Base.php" role="php" />
+      <file name="Builder.php" role="php" />
+      <file name="Diff.php" role="php" />
+      <file name="Exception.php" role="php" />
+      <file name="IrreversibleMigrationException.php" role="php" />
+      <file name="Process.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Migration -->
+     <dir name="Node">
+      <dir name="AdjacencyList">
+       <file name="LevelOrderIterator.php" role="php" />
+       <file name="PostOrderIterator.php" role="php" />
+       <file name="PreOrderIterator.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Node/AdjacencyList -->
+      <dir name="MaterializedPath">
+       <file name="LevelOrderIterator.php" role="php" />
+       <file name="PostOrderIterator.php" role="php" />
+       <file name="PreOrderIterator.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Node/MaterializedPath -->
+      <dir name="NestedSet">
+       <file name="LevelOrderIterator.php" role="php" />
+       <file name="PostOrderIterator.php" role="php" />
+       <file name="PreOrderIterator.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Node/NestedSet -->
+      <file name="AdjacencyList.php" role="php" />
+      <file name="Exception.php" role="php" />
+      <file name="Interface.php" role="php" />
+      <file name="MaterializedPath.php" role="php" />
+      <file name="NestedSet.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Node -->
+     <dir name="Pager">
+      <dir name="Range">
+       <file name="Jumping.php" role="php" />
+       <file name="Sliding.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Pager/Range -->
+      <file name="Exception.php" role="php" />
+      <file name="Layout.php" role="php" />
+      <file name="Range.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Pager -->
+     <dir name="Parser">
+      <dir name="sfYaml">
+       <file name="sfYaml.php" role="php" />
+       <file name="sfYamlDumper.php" role="php" />
+       <file name="sfYamlInline.php" role="php" />
+       <file name="sfYamlParser.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Parser/sfYaml -->
+      <file name="Exception.php" role="php" />
+      <file name="Json.php" role="php" />
+      <file name="Serialize.php" role="php" />
+      <file name="Xml.php" role="php" />
+      <file name="Yml.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Parser -->
+     <dir name="Query">
+      <dir name="Filter">
+       <file name="Chain.php" role="php" />
+       <file name="Interface.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Query/Filter -->
+      <dir name="Registry">
+       <file name="Exception.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Query/Registry -->
+      <dir name="Tokenizer">
+       <file name="Exception.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Query/Tokenizer -->
+      <file name="Abstract.php" role="php" />
+      <file name="Check.php" role="php" />
+      <file name="Condition.php" role="php" />
+      <file name="Exception.php" role="php" />
+      <file name="Filter.php" role="php" />
+      <file name="Forupdate.php" role="php" />
+      <file name="From.php" role="php" />
+      <file name="Groupby.php" role="php" />
+      <file name="Having.php" role="php" />
+      <file name="JoinCondition.php" role="php" />
+      <file name="Limit.php" role="php" />
+      <file name="Offset.php" role="php" />
+      <file name="Orderby.php" role="php" />
+      <file name="Parser.php" role="php" />
+      <file name="Part.php" role="php" />
+      <file name="Registry.php" role="php" />
+      <file name="Select.php" role="php" />
+      <file name="Set.php" role="php" />
+      <file name="Tokenizer.php" role="php" />
+      <file name="Where.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Query -->
+     <dir name="RawSql">
+      <file name="Exception.php" role="php" />
+     </dir> <!-- /lib/Doctrine/RawSql -->
+     <dir name="Record">
+      <dir name="Filter">
+       <file name="Compound.php" role="php" />
+       <file name="Standard.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Record/Filter -->
+      <dir name="Listener">
+       <file name="Chain.php" role="php" />
+       <file name="Interface.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Record/Listener -->
+      <dir name="State">
+       <file name="Exception.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Record/State -->
+      <file name="Abstract.php" role="php" />
+      <file name="Exception.php" role="php" />
+      <file name="Filter.php" role="php" />
+      <file name="Generator.php" role="php" />
+      <file name="Iterator.php" role="php" />
+      <file name="Listener.php" role="php" />
+      <file name="UnknownPropertyException.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Record -->
+     <dir name="Relation">
+      <dir name="Association">
+       <file name="Self.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Relation/Association -->
+      <dir name="Parser">
+       <file name="Exception.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Relation/Parser -->
+      <file name="Association.php" role="php" />
+      <file name="Exception.php" role="php" />
+      <file name="ForeignKey.php" role="php" />
+      <file name="LocalKey.php" role="php" />
+      <file name="Nest.php" role="php" />
+      <file name="Parser.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Relation -->
+     <dir name="Search">
+      <dir name="Analyzer">
+       <file name="Exception.php" role="php" />
+       <file name="Interface.php" role="php" />
+       <file name="Standard.php" role="php" />
+       <file name="Utf8.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Search/Analyzer -->
+      <dir name="Indexer">
+       <file name="Dir.php" role="php" />
+       <file name="Exception.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Search/Indexer -->
+      <file name="Analyzer.php" role="php" />
+      <file name="Exception.php" role="php" />
+      <file name="File.php" role="php" />
+      <file name="Indexer.php" role="php" />
+      <file name="Listener.php" role="php" />
+      <file name="Parser.php" role="php" />
+      <file name="Query.php" role="php" />
+      <file name="Record.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Search -->
+     <dir name="Sequence">
+      <file name="Db2.php" role="php" />
+      <file name="Exception.php" role="php" />
+      <file name="Mssql.php" role="php" />
+      <file name="Mysql.php" role="php" />
+      <file name="Oracle.php" role="php" />
+      <file name="Pgsql.php" role="php" />
+      <file name="Sqlite.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Sequence -->
+     <dir name="Table">
+      <dir name="Repository">
+       <file name="Exception.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Table/Repository -->
+      <file name="Exception.php" role="php" />
+      <file name="Repository.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Table -->
+     <dir name="Task">
+      <file name="BuildAll.php" role="php" />
+      <file name="BuildAllLoad.php" role="php" />
+      <file name="BuildAllReload.php" role="php" />
+      <file name="Compile.php" role="php" />
+      <file name="CreateDb.php" role="php" />
+      <file name="CreateTables.php" role="php" />
+      <file name="Dql.php" role="php" />
+      <file name="DropDb.php" role="php" />
+      <file name="DumpData.php" role="php" />
+      <file name="Exception.php" role="php" />
+      <file name="GenerateMigration.php" role="php" />
+      <file name="GenerateMigrationsDb.php" role="php" />
+      <file name="GenerateMigrationsDiff.php" role="php" />
+      <file name="GenerateMigrationsModels.php" role="php" />
+      <file name="GenerateModelsDb.php" role="php" />
+      <file name="GenerateModelsYaml.php" role="php" />
+      <file name="GenerateSql.php" role="php" />
+      <file name="GenerateYamlDb.php" role="php" />
+      <file name="GenerateYamlModels.php" role="php" />
+      <file name="LoadData.php" role="php" />
+      <file name="Migrate.php" role="php" />
+      <file name="RebuildDb.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Task -->
+     <dir name="Template">
+      <dir name="Listener">
+       <file name="Sluggable.php" role="php" />
+       <file name="SoftDelete.php" role="php" />
+       <file name="Timestampable.php" role="php" />
+      </dir> <!-- /lib/Doctrine/Template/Listener -->
+      <file name="Geographical.php" role="php" />
+      <file name="I18n.php" role="php" />
+      <file name="NestedSet.php" role="php" />
+      <file name="Searchable.php" role="php" />
+      <file name="Sluggable.php" role="php" />
+      <file name="SoftDelete.php" role="php" />
+      <file name="Timestampable.php" role="php" />
+      <file name="Versionable.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Template -->
+     <dir name="Transaction">
+      <file name="Exception.php" role="php" />
+      <file name="Mock.php" role="php" />
+      <file name="Mssql.php" role="php" />
+      <file name="Mysql.php" role="php" />
+      <file name="Oracle.php" role="php" />
+      <file name="Pgsql.php" role="php" />
+      <file name="Sqlite.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Transaction -->
+     <dir name="Tree">
+      <file name="AdjacencyList.php" role="php" />
+      <file name="Exception.php" role="php" />
+      <file name="Interface.php" role="php" />
+      <file name="MaterializedPath.php" role="php" />
+      <file name="NestedSet.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Tree -->
+     <dir name="Validator">
+      <file name="Country.php" role="php" />
+      <file name="Creditcard.php" role="php" />
+      <file name="Date.php" role="php" />
+      <file name="Driver.php" role="php" />
+      <file name="Email.php" role="php" />
+      <file name="ErrorStack.php" role="php" />
+      <file name="Exception.php" role="php" />
+      <file name="Future.php" role="php" />
+      <file name="Htmlcolor.php" role="php" />
+      <file name="Ip.php" role="php" />
+      <file name="Minlength.php" role="php" />
+      <file name="Nospace.php" role="php" />
+      <file name="Notblank.php" role="php" />
+      <file name="Notnull.php" role="php" />
+      <file name="Past.php" role="php" />
+      <file name="Range.php" role="php" />
+      <file name="Readonly.php" role="php" />
+      <file name="Regexp.php" role="php" />
+      <file name="Time.php" role="php" />
+      <file name="Timestamp.php" role="php" />
+      <file name="Unique.php" role="php" />
+      <file name="Unsigned.php" role="php" />
+      <file name="Usstate.php" role="php" />
+     </dir> <!-- /lib/Doctrine/Validator -->
+     <dir name="View">
+      <file name="Exception.php" role="php" />
+     </dir> <!-- /lib/Doctrine/View -->
+     <file name="Access.php" role="php" />
+     <file name="AuditLog.php" role="php" />
+     <file name="Builder.php" role="php" />
+     <file name="Cli.php" role="php" />
+     <file name="Collection.php" role="php" />
+     <file name="Column.php" role="php" />
+     <file name="Compiler.php" role="php" />
+     <file name="Configurable.php" role="php" />
+     <file name="Connection.php" role="php" />
+     <file name="Core.php" role="php" />
+     <file name="Data.php" role="php" />
+     <file name="DataDict.php" role="php" />
+     <file name="Event.php" role="php" />
+     <file name="EventListener.php" role="php" />
+     <file name="Exception.php" role="php" />
+     <file name="Export.php" role="php" />
+     <file name="Expression.php" role="php" />
+     <file name="File.php" role="php" />
+     <file name="Formatter.php" role="php" />
+     <file name="Hook.php" role="php" />
+     <file name="Hydrator.php" role="php" />
+     <file name="I18n.php" role="php" />
+     <file name="Import.php" role="php" />
+     <file name="Inflector.php" role="php" />
+     <file name="IntegrityMapper.php" role="php" />
+     <file name="Lib.php" role="php" />
+     <file name="Locator.php" role="php" />
+     <file name="Manager.php" role="php" />
+     <file name="Migration.php" role="php" />
+     <file name="Node.php" role="php" />
+     <file name="Null.php" role="php" />
+     <file name="Overloadable.php" role="php" />
+     <file name="Pager.php" role="php" />
+     <file name="Parser.php" role="php" />
+     <file name="Query.php" role="php" />
+     <file name="RawSql.php" role="php" />
+     <file name="Record.php" role="php" />
+     <file name="Relation.php" role="php" />
+     <file name="Search.php" role="php" />
+     <file name="Sequence.php" role="php" />
+     <file name="Table.php" role="php" />
+     <file name="Task.php" role="php" />
+     <file name="Template.php" role="php" />
+     <file name="Transaction.php" role="php" />
+     <file name="Tree.php" role="php" />
+     <file name="Util.php" role="php" />
+     <file name="Validator.php" role="php" />
+     <file name="View.php" role="php" />
+    </dir> <!-- /lib/Doctrine -->
+    <dir name="vendor">
+     <dir name="sfYaml">
+      <file name="sfYaml.php" role="php" />
+      <file name="sfYamlDumper.php" role="php" />
+      <file name="sfYamlInline.php" role="php" />
+      <file name="sfYamlParser.php" role="php" />
+     </dir> <!-- /lib/vendor/sfYaml -->
+    </dir> <!-- /lib/vendor -->
+    <file name="Doctrine.php" role="php" />
+   </dir> <!-- /lib -->
+   <dir name="tests">
+    <dir name="Cache">
+     <dir name="Query">
+      <file name="SqliteTestCase.php" role="test" />
+     </dir> <!-- /tests/Cache/Query -->
+     <file name="AbstractTestCase.php" role="test" />
+     <file name="ApcTestCase.php" role="test" />
+     <file name="ArrayTestCase.php" role="test" />
+     <file name="DbTestCase.php" role="test" />
+     <file name="MemcacheTestCase.php" role="test" />
+     <file name="QuerySqliteTestCase.php" role="test" />
+     <file name="SqliteTestCase.php" role="test" />
+     <file name="XcacheTestCase.php" role="test" />
+    </dir> <!-- /tests/Cache -->
+    <dir name="CliTestCase">
+     <dir name="testLoadtasksLoadsDoctrineStyleTasksFromTheSpecifiedDirectory">
+      <file name="DoctrineStyleTask.php" role="test" />
+      <file name="EmptyFile.php" role="test" />
+      <file name="InvalidClassNameForATask.php" role="test" />
+      <file name="should-be-ignored.php" role="test" />
+      <file name="TaskDeclaredInAnIncFile.inc.php" role="test" />
+     </dir> <!-- /tests/CliTestCase/testLoadtasksLoadsDoctrineStyleTasksFromTheSpecifiedDirectory -->
+     <file name="baz.php" role="test" />
+     <file name="bip.php" role="test" />
+     <file name="cli-default.php" role="test" />
+     <file name="cli-with-custom-tasks.php" role="test" />
+     <file name="cli-without-autoregistered-custom-tasks.php" role="test" />
+     <file name="CustomDoctrineStyleTask.php" role="test" />
+     <file name="doctrine.php" role="test" />
+     <file name="foo.php" role="test" />
+     <file name="TaskDeclaredInAnIncFile.inc.php" role="test" />
+     <file name="TestTask02.php" role="test" />
+    </dir> <!-- /tests/CliTestCase -->
+    <dir name="Collection">
+     <file name="SnapshotTestCase.php" role="test" />
+    </dir> <!-- /tests/Collection -->
+    <dir name="Connection">
+     <file name="CustomTestCase.php" role="test" />
+     <file name="MssqlTestCase.php" role="test" />
+     <file name="MysqlTestCase.php" role="test" />
+     <file name="OracleTestCase.php" role="test" />
+     <file name="PgsqlTestCase.php" role="test" />
+     <file name="ProfilerTestCase.php" role="test" />
+     <file name="SqliteTestCase.php" role="test" />
+     <file name="UnitOfWork.php" role="test" />
+    </dir> <!-- /tests/Connection -->
+    <dir name="Data">
+     <file name="ExportTestCase.php" role="test" />
+     <file name="ImportTestCase.php" role="test" />
+    </dir> <!-- /tests/Data -->
+    <dir name="DataDict">
+     <file name="MssqlTestCase.php" role="test" />
+     <file name="MysqlTestCase.php" role="test" />
+     <file name="OracleTestCase.php" role="test" />
+     <file name="PgsqlTestCase.php" role="test" />
+     <file name="SqliteTestCase.php" role="test" />
+    </dir> <!-- /tests/DataDict -->
+    <dir name="DataType">
+     <file name="BooleanTestCase.php" role="test" />
+     <file name="EnumTestCase.php" role="test" />
+    </dir> <!-- /tests/DataType -->
+    <dir name="Db">
+     <file name="ProfilerTestCase.php" role="test" />
+    </dir> <!-- /tests/Db -->
+    <dir name="DoctrineTest">
+     <dir name="Reporter">
+      <file name="Cli.php" role="test" />
+      <file name="Html.php" role="test" />
+     </dir> <!-- /tests/DoctrineTest/Reporter -->
+     <file name="Coverage.php" role="test" />
+     <file name="Doctrine_UnitTestCase.php" role="test" />
+     <file name="GroupTest.php" role="test" />
+     <file name="Reporter.php" role="test" />
+     <file name="UnitTestCase.php" role="test" />
+    </dir> <!-- /tests/DoctrineTest -->
+    <dir name="EventListener">
+     <file name="ChainTestCase.php" role="test" />
+    </dir> <!-- /tests/EventListener -->
+    <dir name="Export">
+     <file name="CheckConstraintTestCase.php" role="test" />
+     <file name="MssqlTestCase.php" role="test" />
+     <file name="MysqlTestCase.php" role="test" />
+     <file name="OracleTestCase.php" role="test" />
+     <file name="PgsqlTestCase.php" role="test" />
+     <file name="RecordTestCase.php" role="test" />
+     <file name="SchemaTestCase.php" role="test" />
+     <file name="SqliteTestCase.php" role="test" />
+    </dir> <!-- /tests/Export -->
+    <dir name="Expression">
+     <file name="DriverTestCase.php" role="test" />
+     <file name="MssqlTestCase.php" role="test" />
+     <file name="MysqlTestCase.php" role="test" />
+     <file name="OracleTestCase.php" role="test" />
+     <file name="PgsqlTestCase.php" role="test" />
+     <file name="SqliteTestCase.php" role="test" />
+    </dir> <!-- /tests/Expression -->
+    <dir name="Extension">
+     <dir name="TestExtension">
+      <dir name="lib">
+       <dir name="Doctrine">
+        <dir name="Template">
+         <file name="TestBehavior.php" role="test" />
+        </dir> <!-- /tests/Extension/TestExtension/lib/Doctrine/Template -->
+        <file name="Test.php" role="test" />
+       </dir> <!-- /tests/Extension/TestExtension/lib/Doctrine -->
+      </dir> <!-- /tests/Extension/TestExtension/lib -->
+     </dir> <!-- /tests/Extension/TestExtension -->
+    </dir> <!-- /tests/Extension -->
+    <dir name="Hydrate">
+     <file name="CollectionInitializationTestCase.php" role="test" />
+     <file name="DriverTestCase.php" role="test" />
+     <file name="FetchModeTestCase.php" role="test" />
+     <file name="PerformanceTestCase.php" role="test" />
+     <file name="ScalarTestCase.php" role="test" />
+    </dir> <!-- /tests/Hydrate -->
+    <dir name="Import">
+     <file name="BuilderTestCase.php" role="test" />
+     <file name="MssqlTestCase.php" role="test" />
+     <file name="MysqlTestCase.php" role="test" />
+     <file name="OracleTestCase.php" role="test" />
+     <file name="PgsqlTestCase.php" role="test" />
+     <file name="PluginHierarchyTestCase.php" role="test" />
+     <file name="SchemaTestCase.php" role="test" />
+     <file name="SqliteTestCase.php" role="test" />
+    </dir> <!-- /tests/Import -->
+    <dir name="Migration">
+     <dir name="Diff">
+      <dir name="schema">
+       <file name="from.yml" role="test" />
+       <file name="to.yml" role="test" />
+      </dir> <!-- /tests/Migration/Diff/schema -->
+     </dir> <!-- /tests/Migration/Diff -->
+     <file name="BaseTestCase.php" role="test" />
+     <file name="DiffTestCase.php" role="test" />
+    </dir> <!-- /tests/Migration -->
+    <dir name="migration_classes">
+     <file name="1224120878_add_phonenumber.class.php" role="test" />
+     <file name="1224120879_add_user.class.php" role="test" />
+     <file name="1224120880_add_profile.class.php" role="test" />
+     <file name="1224120881_drop_profile.class.php.php" role="test" />
+    </dir> <!-- /tests/migration_classes -->
+    <dir name="ModelLoadingTest">
+     <dir name="Aggressive">
+      <file name="Models.php" role="test" />
+      <file name="MoreModels.php" role="test" />
+     </dir> <!-- /tests/ModelLoadingTest/Aggressive -->
+     <dir name="Conservative">
+      <file name="BaseConservativeModelLoadingUser.php" role="test" />
+      <file name="ConservativeModelLoadingContact.php" role="test" />
+      <file name="ConservativeModelLoadingProfile.php" role="test" />
+      <file name="ConservativeModelLoadingUser.php" role="test" />
+     </dir> <!-- /tests/ModelLoadingTest/Conservative -->
+    </dir> <!-- /tests/ModelLoadingTest -->
+    <dir name="models">
+     <dir name="export">
+      <file name="Cms_Category.php" role="test" />
+      <file name="Cms_CategoryLanguages.php" role="test" />
+     </dir> <!-- /tests/models/export -->
+     <file name="Account.php" role="test" />
+     <file name="Address.php" role="test" />
+     <file name="Album.php" role="test" />
+     <file name="App.php" role="test" />
+     <file name="App_Category.php" role="test" />
+     <file name="App_User.php" role="test" />
+     <file name="Assignment.php" role="test" />
+     <file name="Auth.php" role="test" />
+     <file name="Author.php" role="test" />
+     <file name="BadlyNamed__Class.php" role="test" />
+     <file name="BarRecord.php" role="test" />
+     <file name="BaseSymfonyRecord.php" role="test" />
+     <file name="Blog.php" role="test" />
+     <file name="BlogTag.php" role="test" />
+     <file name="BoardWithPosition.php" role="test" />
+     <file name="Book.php" role="test" />
+     <file name="Bookmark.php" role="test" />
+     <file name="BookmarkUser.php" role="test" />
+     <file name="BooleanTest.php" role="test" />
+     <file name="CascadeDeleteRelatedTest.php" role="test" />
+     <file name="CascadeDeleteRelatedTest2.php" role="test" />
+     <file name="CascadeDeleteTest.php" role="test" />
+     <file name="CategoryWithPosition.php" role="test" />
+     <file name="CheckConstraintTest.php" role="test" />
+     <file name="ClientModel.php" role="test" />
+     <file name="ColumnAliasTest.php" role="test" />
+     <file name="ConcreteEmail.php" role="test" />
+     <file name="ConcreteGroup.php" role="test" />
+     <file name="ConcreteGroupUser.php" role="test" />
+     <file name="ConcreteInheritanceTestParent.php" role="test" />
+     <file name="ConcreteUser.php" role="test" />
+     <file name="CoverageCodeN.php" role="test" />
+     <file name="CPK_Association.php" role="test" />
+     <file name="CPK_Test.php" role="test" />
+     <file name="CPK_Test2.php" role="test" />
+     <file name="CustomPK.php" role="test" />
+     <file name="CustomSequenceRecord.php" role="test" />
+     <file name="Data_File.php" role="test" />
+     <file name="DateTest.php" role="test" />
+     <file name="Description.php" role="test" />
+     <file name="Element.php" role="test" />
+     <file name="Email.php" role="test" />
+     <file name="Entity.php" role="test" />
+     <file name="EntityAddress.php" role="test" />
+     <file name="EntityReference.php" role="test" />
+     <file name="EnumTest.php" role="test" />
+     <file name="EnumTest2.php" role="test" />
+     <file name="EnumTest3.php" role="test" />
+     <file name="Error.php" role="test" />
+     <file name="EventListenerChainTest.php" role="test" />
+     <file name="EventListenerTest.php" role="test" />
+     <file name="FieldNameTest.php" role="test" />
+     <file name="File_Owner.php" role="test" />
+     <file name="FilterTest.php" role="test" />
+     <file name="FilterTest2.php" role="test" />
+     <file name="FooBarRecord.php" role="test" />
+     <file name="FooForeignlyOwned.php" role="test" />
+     <file name="FooForeignlyOwnedWithPK.php" role="test" />
+     <file name="FooLocallyOwned.php" role="test" />
+     <file name="FooRecord.php" role="test" />
+     <file name="FooReferenceRecord.php" role="test" />
+     <file name="ForeignKeyTest.php" role="test" />
+     <file name="ForeignKeyTest2.php" role="test" />
+     <file name="Forum_Board.php" role="test" />
+     <file name="Forum_Category.php" role="test" />
+     <file name="Forum_Entry.php" role="test" />
+     <file name="Forum_Thread.php" role="test" />
+     <file name="gnatEmail.php" role="test" />
+     <file name="gnatUser.php" role="test" />
+     <file name="Group.php" role="test" />
+     <file name="GroupUser.php" role="test" />
+     <file name="GzipTest.php" role="test" />
+     <file name="I18nRelationTest.php" role="test" />
+     <file name="I18nTest.php" role="test" />
+     <file name="InheritanceDeal.php" role="test" />
+     <file name="InheritanceDealUser.php" role="test" />
+     <file name="InheritanceUser.php" role="test" />
+     <file name="JC1.php" role="test" />
+     <file name="JC2.php" role="test" />
+     <file name="JC3.php" role="test" />
+     <file name="LiabilityCodeN.php" role="test" />
+     <file name="Location.php" role="test" />
+     <file name="LocationI18n.php" role="test" />
+     <file name="Log_Entry.php" role="test" />
+     <file name="Log_Status.php" role="test" />
+     <file name="M2MTest.php" role="test" />
+     <file name="M2MTest2.php" role="test" />
+     <file name="MigrationTest.php" role="test" />
+     <file name="mmrGroupUser_B.php" role="test" />
+     <file name="mmrGroupUser_C.php" role="test" />
+     <file name="mmrGroup_B.php" role="test" />
+     <file name="mmrGroup_C.php" role="test" />
+     <file name="mmrUser_B.php" role="test" />
+     <file name="mmrUser_C.php" role="test" />
+     <file name="MyGroup.php" role="test" />
+     <file name="MyOneThing.php" role="test" />
+     <file name="MyOtherThing.php" role="test" />
+     <file name="MysqlGroup.php" role="test" />
+     <file name="MysqlGroupMember.php" role="test" />
+     <file name="MysqlIndexTestRecord.php" role="test" />
+     <file name="MysqlTestRecord.php" role="test" />
+     <file name="MysqlUser.php" role="test" />
+     <file name="MyUser.php" role="test" />
+     <file name="MyUser2.php" role="test" />
+     <file name="MyUserGroup.php" role="test" />
+     <file name="MyUserOneThing.php" role="test" />
+     <file name="MyUserOtherThing.php" role="test" />
+     <file name="NestedSetTest_SingleRootNode.php" role="test" />
+     <file name="NestedSet_MultiRootNode.php" role="test" />
+     <file name="NestedSet_Timestampable_MultiRootNode.php" role="test" />
+     <file name="NestReference.php" role="test" />
+     <file name="NestTest.php" role="test" />
+     <file name="NotNullTest.php" role="test" />
+     <file name="ORM_AccessControl.php" role="test" />
+     <file name="ORM_AccessControlsGroups.php" role="test" />
+     <file name="ORM_AccessGroup.php" role="test" />
+     <file name="ORM_TestEntry.php" role="test" />
+     <file name="ORM_TestItem.php" role="test" />
+     <file name="Package.php" role="test" />
+     <file name="PackageVersion.php" role="test" />
+     <file name="PackageVersionNotes.php" role="test" />
+     <file name="Page.php" role="test" />
+     <file name="Phonenumber.php" role="test" />
+     <file name="Photo.php" role="test" />
+     <file name="Phototag.php" role="test" />
+     <file name="PluginSymfonyRecord.php" role="test" />
+     <file name="PluginSymfonyRecordTable.php" role="test" />
+     <file name="Policy.php" role="test" />
+     <file name="PolicyAsset.php" role="test" />
+     <file name="PolicyCodeN.php" role="test" />
+     <file name="PolicyN.php" role="test" />
+     <file name="QueryTest_Board.php" role="test" />
+     <file name="QueryTest_Category.php" role="test" />
+     <file name="QueryTest_Entry.php" role="test" />
+     <file name="QueryTest_Item.php" role="test" />
+     <file name="QueryTest_Rank.php" role="test" />
+     <file name="QueryTest_Subscription.php" role="test" />
+     <file name="QueryTest_User.php" role="test" />
+     <file name="QueryTest_UserRank.php" role="test" />
+     <file name="RateN.php" role="test" />
+     <file name="Rec1.php" role="test" />
+     <file name="Rec2.php" role="test" />
+     <file name="RecordFilterTest.php" role="test" />
+     <file name="RecordHookTest.php" role="test" />
+     <file name="Record_City.php" role="test" />
+     <file name="Record_Country.php" role="test" />
+     <file name="Record_District.php" role="test" />
+     <file name="RelationTest.php" role="test" />
+     <file name="Resource.php" role="test" />
+     <file name="ResourceReference.php" role="test" />
+     <file name="ResourceType.php" role="test" />
+     <file name="Role.php" role="test" />
+     <file name="RTC1.php" role="test" />
+     <file name="RTC2.php" role="test" />
+     <file name="RTC3.php" role="test" />
+     <file name="RTC4.php" role="test" />
+     <file name="SearchTest.php" role="test" />
+     <file name="SelfRefTest.php" role="test" />
+     <file name="SequenceRecord.php" role="test" />
+     <file name="SerializeTest.php" role="test" />
+     <file name="SoftDeleteBCTest.php" role="test" />
+     <file name="SoftDeleteTest.php" role="test" />
+     <file name="Song.php" role="test" />
+     <file name="SymfonyRecord.php" role="test" />
+     <file name="SymfonyRecordTable.php" role="test" />
+     <file name="Tag.php" role="test" />
+     <file name="Task.php" role="test" />
+     <file name="TestMovie.php" role="test" />
+     <file name="TestMovieUserBookmark.php" role="test" />
+     <file name="TestMovieUserVote.php" role="test" />
+     <file name="TestRecord.php" role="test" />
+     <file name="TestUser.php" role="test" />
+     <file name="TreeLeaf.php" role="test" />
+     <file name="UnderscoreColumn.php" role="test" />
+     <file name="User.php" role="test" />
+     <file name="ValidatorTest.php" role="test" />
+     <file name="ValidatorTest_AddressModel.php" role="test" />
+     <file name="ValidatorTest_ClientModel.php" role="test" />
+     <file name="ValidatorTest_ClientToAddressModel.php" role="test" />
+     <file name="ValidatorTest_DateModel.php" role="test" />
+     <file name="ValidatorTest_FootballPlayer.php" role="test" />
+     <file name="ValidatorTest_Person.php" role="test" />
+     <file name="VersioningTest.php" role="test" />
+     <file name="ZeroValueTest.php" role="test" />
+    </dir> <!-- /tests/models -->
+    <dir name="mysql_migration_classes">
+     <file name="001_mysql_add_table.php" role="test" />
+     <file name="002_mysql_change_column.php" role="test" />
+    </dir> <!-- /tests/mysql_migration_classes -->
+    <dir name="NestedSet">
+     <file name="HydrationTestCase.php" role="test" />
+     <file name="MultiRootTestCase.php" role="test" />
+     <file name="SingleRootTestCase.php" role="test" />
+     <file name="TimestampableMultiRootTestCase.php" role="test" />
+    </dir> <!-- /tests/NestedSet -->
+    <dir name="Query">
+     <file name="AggregateValueTestCase.php" role="test" />
+     <file name="ApplyInheritanceTestCase.php" role="test" />
+     <file name="CacheTestCase.php" role="test" />
+     <file name="CheckTestCase.php" role="test" />
+     <file name="ComponentAliasTestCase.php" role="test" />
+     <file name="ConditionTestCase.php" role="test" />
+     <file name="CopyTestCase.php" role="test" />
+     <file name="DeleteTestCase.php" role="test" />
+     <file name="DriverTestCase.php" role="test" />
+     <file name="ExpressionTestCase.php" role="test" />
+     <file name="FromTestCase.php" role="test" />
+     <file name="GroupbyTestCase.php" role="test" />
+     <file name="HavingTestCase.php" role="test" />
+     <file name="HydrateNoneTestCase.php" role="test" />
+     <file name="IdentifierQuotingTestCase.php" role="test" />
+     <file name="JoinConditionTestCase.php" role="test" />
+     <file name="JoinTestCase.php" role="test" />
+     <file name="LimitTestCase.php" role="test" />
+     <file name="MultiJoin2TestCase.php" role="test" />
+     <file name="MultiJoinTestCase.php" role="test" />
+     <file name="MultipleAggregateValueTestCase.php" role="test" />
+     <file name="MysqlSubqueryHavingTestCase.php" role="test" />
+     <file name="MysqlSubqueryTestCase.php" role="test" />
+     <file name="OneToOneFetchingTestCase.php" role="test" />
+     <file name="OrderbyTestCase.php" role="test" />
+     <file name="PgsqlSubqueryTestCase.php" role="test" />
+     <file name="ReferenceModelTestCase.php" role="test" />
+     <file name="RegistryTestCase.php" role="test" />
+     <file name="RemoveQueryPartTestCase.php" role="test" />
+     <file name="SelectExpressionTestCase.php" role="test" />
+     <file name="SelectTestCase.php" role="test" />
+     <file name="ShortAliasesTestCase.php" role="test" />
+     <file name="SubqueryTestCase.php" role="test" />
+     <file name="UpdateTestCase.php" role="test" />
+     <file name="WhereTestCase.php" role="test" />
+    </dir> <!-- /tests/Query -->
+    <dir name="Record">
+     <file name="CascadingDeleteTestCase.php" role="test" />
+     <file name="FilterTestCase.php" role="test" />
+     <file name="FromArrayTestCase.php" role="test" />
+     <file name="GeneratorTestCase.php" role="test" />
+     <file name="HookTestCase.php" role="test" />
+     <file name="InheritanceTestCase.php" role="test" />
+     <file name="LockTestCase.php" role="test" />
+     <file name="SaveBlankRecordTestCase.php" role="test" />
+     <file name="SerializeUnserializeTestCase.php" role="test" />
+     <file name="StateTestCase.php" role="test" />
+     <file name="SynchronizeTestCase.php" role="test" />
+     <file name="ZeroValuesTestCase.php" role="test" />
+    </dir> <!-- /tests/Record -->
+    <dir name="Relation">
+     <file name="AccessTestCase.php" role="test" />
+     <file name="CircularSavingTestCase.php" role="test" />
+     <file name="ColumnAliasesTestCase.php" role="test" />
+     <file name="ManyToMany2TestCase.php" role="test" />
+     <file name="ManyToManyTestCase.php" role="test" />
+     <file name="NestTestCase.php" role="test" />
+     <file name="OneToManyTestCase.php" role="test" />
+     <file name="OneToOneTestCase.php" role="test" />
+     <file name="OrderByTestCase.php" role="test" />
+     <file name="ParserTestCase.php" role="test" />
+    </dir> <!-- /tests/Relation -->
+    <dir name="Search">
+     <dir name="_files">
+      <file name="content.html" role="test" />
+      <file name="content.txt" role="test" />
+     </dir> <!-- /tests/Search/_files -->
+     <file name="FileTestCase.php" role="test" />
+     <file name="IndexerTestCase.php" role="test" />
+     <file name="QueryTestCase.php" role="test" />
+     <file name="QueryWeightTestCase.php" role="test" />
+    </dir> <!-- /tests/Search -->
+    <dir name="Sequence">
+     <file name="MssqlTestCase.php" role="test" />
+     <file name="MysqlTestCase.php" role="test" />
+     <file name="OracleTestCase.php" role="test" />
+     <file name="PgsqlTestCase.php" role="test" />
+     <file name="SqliteTestCase.php" role="test" />
+    </dir> <!-- /tests/Sequence -->
+    <dir name="Table">
+     <file name="NamedQueryTestCase.php" role="test" />
+     <file name="RemoveColumnTestCase.php" role="test" />
+    </dir> <!-- /tests/Table -->
+    <dir name="TaskTestCase">
+     <file name="TestTask004.php" role="test" />
+     <file name="TestTask005.php" role="test" />
+     <file name="TestTask006.php" role="test" />
+    </dir> <!-- /tests/TaskTestCase -->
+    <dir name="Ticket">
+     <dir name="1727">
+      <dir name="models1">
+       <file name="Ticket_1727_Model1.php" role="test" />
+       <file name="Ticket_1727_Model2.php" role="test" />
+      </dir> <!-- /tests/Ticket/1727/models1 -->
+      <dir name="models2">
+       <file name="Ticket_1727_Model3.php" role="test" />
+       <file name="Ticket_1727_Model4.php" role="test" />
+      </dir> <!-- /tests/Ticket/1727/models2 -->
+     </dir> <!-- /tests/Ticket/1727 -->
+     <dir name="2375">
+      <dir name="models1">
+       <file name="Ticket_2375_Model1.php" role="test" />
+       <file name="Ticket_2375_Model2.php" role="test" />
+      </dir> <!-- /tests/Ticket/2375/models1 -->
+      <dir name="models2">
+       <file name="Ticket_2375_Model3.php" role="test" />
+       <file name="Ticket_2375_Model4.php" role="test" />
+       <file name="Ticket_2375_Model5.php" role="test" />
+      </dir> <!-- /tests/Ticket/2375/models2 -->
+     </dir> <!-- /tests/Ticket/2375 -->
+     <dir name="DC95">
+      <file name="schema.yml" role="test" />
+     </dir> <!-- /tests/Ticket/DC95 -->
+     <dir name="DC221">
+      <file name="TestMigration.php" role="test" />
+     </dir> <!-- /tests/Ticket/DC221 -->
+     <dir name="DC292">
+      <file name="from.yml" role="test" />
+      <file name="to.yml" role="test" />
+     </dir> <!-- /tests/Ticket/DC292 -->
+     <file name="255TestCase.php" role="test" />
+     <file name="381TestCase.php" role="test" />
+     <file name="384TestCase.php" role="test" />
+     <file name="424BTestCase.php" role="test" />
+     <file name="424CTestCase.php" role="test" />
+     <file name="428TestCase.php" role="test" />
+     <file name="438TestCase.php" role="test" />
+     <file name="480TestCase.php" role="test" />
+     <file name="486TestCase.php" role="test" />
+     <file name="565TestCase.php" role="test" />
+     <file name="574TestCase.php" role="test" />
+     <file name="576TestCase.php" role="test" />
+     <file name="583TestCase.php" role="test" />
+     <file name="587TestCase.php" role="test" />
+     <file name="626BTestCase.php" role="test" />
+     <file name="626CTestCase.php" role="test" />
+     <file name="626DTestCase.php" role="test" />
+     <file name="632TestCase.php" role="test" />
+     <file name="638TestCase.php" role="test" />
+     <file name="642TestCase.php" role="test" />
+     <file name="668TestCase.php" role="test" />
+     <file name="673TestCase.php" role="test" />
+     <file name="697TestCase.php" role="test" />
+     <file name="736TestCase.php" role="test" />
+     <file name="741TestCase.php" role="test" />
+     <file name="749TestCase.php" role="test" />
+     <file name="753TestCase.php" role="test" />
+     <file name="786TestCase.php" role="test" />
+     <file name="832TestCase.php" role="test" />
+     <file name="838TestCase.php" role="test" />
+     <file name="867TestCase.php" role="test" />
+     <file name="876TestCase.php" role="test" />
+     <file name="889TestCase.php" role="test" />
+     <file name="894TestCase.php" role="test" />
+     <file name="904TestCase.php" role="test" />
+     <file name="912TestCase.php" role="test" />
+     <file name="915TestCase.php" role="test" />
+     <file name="923TestCase.php" role="test" />
+     <file name="927TestCase.php" role="test" />
+     <file name="929TestCase.php" role="test" />
+     <file name="930TestCase.php" role="test" />
+     <file name="932TestCase.php" role="test" />
+     <file name="935TestCase.php" role="test" />
+     <file name="941TestCase.php" role="test" />
+     <file name="950TestCase.php" role="test" />
+     <file name="952TestCase.php" role="test" />
+     <file name="963TestCase.php" role="test" />
+     <file name="966TestCase.php" role="test" />
+     <file name="969TestCase.php" role="test" />
+     <file name="973TestCase.php" role="test" />
+     <file name="982TestCase.php" role="test" />
+     <file name="987TestCase.php" role="test" />
+     <file name="990TestCase.php" role="test" />
+     <file name="1015TestCase.php" role="test" />
+     <file name="1028TestCase.php" role="test" />
+     <file name="1044TestCase.php" role="test" />
+     <file name="1071TestCase.php" role="test" />
+     <file name="1072TestCase.php" role="test" />
+     <file name="1077TestCase.php" role="test" />
+     <file name="1099TestCase.php" role="test" />
+     <file name="1106TestCase.php" role="test" />
+     <file name="1113TestCase.php" role="test" />
+     <file name="1116TestCase.php" role="test" />
+     <file name="1118TestCase.php" role="test" />
+     <file name="1121TestCase.php" role="test" />
+     <file name="1123TestCase.php" role="test" />
+     <file name="1124TestCase.php" role="test" />
+     <file name="1125TestCase.php" role="test" />
+     <file name="1131TestCase.php" role="test" />
+     <file name="1133TestCase.php" role="test" />
+     <file name="1134TestCase.php" role="test" />
+     <file name="1160TestCase.php" role="test" />
+     <file name="1175TestCase.php" role="test" />
+     <file name="1192TestCase.php" role="test" />
+     <file name="1195TestCase.php" role="test" />
+     <file name="1205TestCase.php" role="test" />
+     <file name="1206TestCase.php" role="test" />
+     <file name="1208TestCase.php" role="test" />
+     <file name="1211TestCase.php" role="test" />
+     <file name="1213TestCase.php" role="test" />
+     <file name="1225TestCase.php" role="test" />
+     <file name="1228TestCase.php" role="test" />
+     <file name="1230TestCase.php" role="test" />
+     <file name="1236TestCase.php" role="test" />
+     <file name="1244TestCase.php" role="test" />
+     <file name="1250TestCase.php" role="test" />
+     <file name="1251TestCase.php" role="test" />
+     <file name="1253TestCase.php" role="test" />
+     <file name="1254TestCase.php" role="test" />
+     <file name="1257TestCase.php" role="test" />
+     <file name="1276TestCase.php" role="test" />
+     <file name="1277TestCase.php" role="test" />
+     <file name="1280TestCase.php" role="test" />
+     <file name="1281TestCase.php" role="test" />
+     <file name="1289TestCase.php" role="test" />
+     <file name="1296TestCase.php" role="test" />
+     <file name="1304TestCase.php" role="test" />
+     <file name="1305TestCase.php" role="test" />
+     <file name="1307TestCase.php" role="test" />
+     <file name="1315TestCase.php" role="test" />
+     <file name="1323b2TestCase.php" role="test" />
+     <file name="1323TestCase.php" role="test" />
+     <file name="1325TestCase.php" role="test" />
+     <file name="1326TestCase.php" role="test" />
+     <file name="1335TestCase.php" role="test" />
+     <file name="1338TestCase.php" role="test" />
+     <file name="1341TestCase.php" role="test" />
+     <file name="1351TestCase.php" role="test" />
+     <file name="1365TestCase.php" role="test" />
+     <file name="1372TestCase.php" role="test" />
+     <file name="1380TestCase.php" role="test" />
+     <file name="1381TestCase.php" role="test" />
+     <file name="1383TestCase.php" role="test" />
+     <file name="1385TestCase.php" role="test" />
+     <file name="1390TestCase.php" role="test" />
+     <file name="1395TestCase.php" role="test" />
+     <file name="1400TestCase.php" role="test" />
+     <file name="1417TestCase.php" role="test" />
+     <file name="1419TestCase.php" role="test" />
+     <file name="1436TestCase.php" role="test" />
+     <file name="1441TestCase.php" role="test" />
+     <file name="1449TestCase.php" role="test" />
+     <file name="1452TestCase.php" role="test" />
+     <file name="1454TestCase.php" role="test" />
+     <file name="1461TestCase.php" role="test" />
+     <file name="1464TestCase.php" role="test" />
+     <file name="1465TestCase.php" role="test" />
+     <file name="1467TestCase.php" role="test" />
+     <file name="1480TestCase.php" role="test" />
+     <file name="1483TestCase.php" role="test" />
+     <file name="1488TestCase.php" role="test" />
+     <file name="1494TestCase.php" role="test" />
+     <file name="1500TestCase.php" role="test" />
+     <file name="1507TestCase.php" role="test" />
+     <file name="1513TestCase.php" role="test" />
+     <file name="1520TestCase.php" role="test" />
+     <file name="1522TestCase.php" role="test" />
+     <file name="1523TestCase.php" role="test" />
+     <file name="1524TestCase.php" role="test" />
+     <file name="1527TestCase.php" role="test" />
+     <file name="1537TestCase.php" role="test" />
+     <file name="1540TestCase.php" role="test" />
+     <file name="1543TestCase.php" role="test" />
+     <file name="1545TestCase.php" role="test" />
+     <file name="1558TestCase.php" role="test" />
+     <file name="1562TestCase.php" role="test" />
+     <file name="1567TestCase.php" role="test" />
+     <file name="1604TestCase.php" role="test" />
+     <file name="1617TestCase.php" role="test" />
+     <file name="1617_schema.yml" role="test" />
+     <file name="1619TestCase.php" role="test" />
+     <file name="1621bTestCase.php" role="test" />
+     <file name="1621TestCase.php" role="test" />
+     <file name="1622TestCase.php" role="test" />
+     <file name="1623TestCase.php" role="test" />
+     <file name="1628TestCase.php" role="test" />
+     <file name="1629TestCase.php" role="test" />
+     <file name="1630TestCase.php" role="test" />
+     <file name="1636TestCase.php" role="test" />
+     <file name="1641TestCase.php" role="test" />
+     <file name="1652TestCase.php" role="test" />
+     <file name="1653TestCase.php" role="test" />
+     <file name="1658TestCase.php" role="test" />
+     <file name="1674TestCase.php" role="test" />
+     <file name="1703TestCase.php" role="test" />
+     <file name="1706TestCase.php" role="test" />
+     <file name="1713TestCase.php" role="test" />
+     <file name="1716TestCase.php" role="test" />
+     <file name="1725TestCase.php" role="test" />
+     <file name="1727TestCase.php" role="test" />
+     <file name="1729TestCase.php" role="test" />
+     <file name="1745TestCase.php" role="test" />
+     <file name="1762TestCase.php" role="test" />
+     <file name="1763TestCase.php" role="test" />
+     <file name="1764TestCase.php" role="test" />
+     <file name="1768TestCase.php" role="test" />
+     <file name="1783TestCase.php" role="test" />
+     <file name="1793TestCase.php" role="test" />
+     <file name="1795TestCase.php" role="test" />
+     <file name="1799TestCase.php" role="test" />
+     <file name="1808TestCase.php" role="test" />
+     <file name="1818TestCase.php" role="test" />
+     <file name="1821TestCase.php" role="test" />
+     <file name="1824TestCase.php" role="test" />
+     <file name="1830TestCase.php" role="test" />
+     <file name="1841TestCase.php" role="test" />
+     <file name="1843TestCase.php" role="test" />
+     <file name="1858TestCase.php" role="test" />
+     <file name="1860TestCase.php" role="test" />
+     <file name="1865TestCase.php" role="test" />
+     <file name="1875TestCase.php" role="test" />
+     <file name="1876bTestCase.php" role="test" />
+     <file name="1876TestCase.php" role="test" />
+     <file name="1923TestCase.php" role="test" />
+     <file name="1935TestCase.php" role="test" />
+     <file name="1940TestCase.php" role="test" />
+     <file name="1958TestCase.php" role="test" />
+     <file name="1986TestCase.php" role="test" />
+     <file name="1991TestCase.php" role="test" />
+     <file name="1992TestCase.php" role="test" />
+     <file name="2007TestCase.php" role="test" />
+     <file name="2015TestCase.php" role="test" />
+     <file name="2032TestCase.php" role="test" />
+     <file name="2105TestCase.php" role="test" />
+     <file name="2123TestCase.php" role="test" />
+     <file name="2158TestCase.php" role="test" />
+     <file name="2159TestCase.php" role="test" />
+     <file name="2160TestCase.php" role="test" />
+     <file name="2184TestCase.php" role="test" />
+     <file name="2190TestCase.php" role="test" />
+     <file name="2204TestCase.php" role="test" />
+     <file name="2229TestCase.php" role="test" />
+     <file name="2251TestCase.php" role="test" />
+     <file name="2292TestCase.php" role="test" />
+     <file name="2295TestCase.php" role="test" />
+     <file name="2298TestCase.php" role="test" />
+     <file name="2334TestCase.php" role="test" />
+     <file name="2355TestCase.php" role="test" />
+     <file name="2367TestCase.php" role="test" />
+     <file name="2375TestCase.php" role="test" />
+     <file name="2377TestCase.php" role="test" />
+     <file name="2398TestCase.php" role="test" />
+     <file name="AyoubTestCase.php" role="test" />
+     <file name="DC7TestCase.php" role="test" />
+     <file name="DC14TestCase.php" role="test" />
+     <file name="DC23bTestCase.php" role="test" />
+     <file name="DC23TestCase.php" role="test" />
+     <file name="DC24TestCase.php" role="test" />
+     <file name="DC25TestCase.php" role="test" />
+     <file name="DC28TestCase.php" role="test" />
+     <file name="DC36TestCase.php" role="test" />
+     <file name="DC39TestCase.php" role="test" />
+     <file name="DC56TestCase.php" role="test" />
+     <file name="DC57TestCase.php" role="test" />
+     <file name="DC63TestCase.php" role="test" />
+     <file name="DC64TestCase.php" role="test" />
+     <file name="DC69TestCase.php" role="test" />
+     <file name="DC74TestCase.php" role="test" />
+     <file name="DC82TestCase.php" role="test" />
+     <file name="DC86TestCase.php" role="test" />
+     <file name="DC95TestCase.php" role="test" />
+     <file name="DC101TestCase.php" role="test" />
+     <file name="DC112TestCase.php" role="test" />
+     <file name="DC136TestCase.php" role="test" />
+     <file name="DC141TestCase.php" role="test" />
+     <file name="DC147TestCase.php" role="test" />
+     <file name="DC169TestCase.php" role="test" />
+     <file name="DC171TestCase.php" role="test" />
+     <file name="DC187TestCase.php" role="test" />
+     <file name="DC198TestCase.php" role="test" />
+     <file name="DC217TestCase.php" role="test" />
+     <file name="DC221TestCase.php" role="test" />
+     <file name="DC236TestCase.php" role="test" />
+     <file name="DC238TestCase.php" role="test" />
+     <file name="DC240TestCase.php" role="test" />
+     <file name="DC241TestCase.php" role="test" />
+     <file name="DC242TestCase.php" role="test" />
+     <file name="DC266TestCase.php" role="test" />
+     <file name="DC267TestCase.php" role="test" />
+     <file name="DC276TestCase.php" role="test" />
+     <file name="DC292TestCase.php" role="test" />
+     <file name="DC300TestCase.php" role="test" />
+     <file name="DC302TestCase.php" role="test" />
+     <file name="DC317TestCase.php" role="test" />
+     <file name="DC437TestCase.php" role="test" />
+     <file name="DC521TestCase.php" role="test" />
+     <file name="NewTicketTestCase.php" role="test" />
+     <file name="NjeroTestCase.php" role="test" />
+    </dir> <!-- /tests/Ticket -->
+    <dir name="Transaction">
+     <file name="MssqlTestCase.php" role="test" />
+     <file name="MysqlTestCase.php" role="test" />
+     <file name="OracleTestCase.php" role="test" />
+     <file name="PgsqlTestCase.php" role="test" />
+     <file name="SqliteTestCase.php" role="test" />
+    </dir> <!-- /tests/Transaction -->
+    <dir name="Validator">
+     <file name="ForeignKeysTestCase.php" role="test" />
+     <file name="FutureTestCase.php" role="test" />
+     <file name="PastTestCase.php" role="test" />
+    </dir> <!-- /tests/Validator -->
+    <file name="AccessTestCase.php" role="test" />
+    <file name="AuditLogTestCase.php" role="test" />
+    <file name="BaseTestCase.php" role="test" />
+    <file name="BatchIteratorTestCase.php" role="test" />
+    <file name="bootstrap.php" role="test" />
+    <file name="CacheSqliteTestCase.php" role="test" />
+    <file name="ClassTableInheritanceTestCase.php" role="test" />
+    <file name="CliTestCase.php" role="test" />
+    <file name="CollectionOffsetTestCase.php" role="test" />
+    <file name="CollectionTestCase.php" role="test" />
+    <file name="ColumnAggregationInheritanceTestCase.php" role="test" />
+    <file name="ColumnAliasTestCase.php" role="test" />
+    <file name="CompositePrimaryKeyTestCase.php" role="test" />
+    <file name="ConcreteInheritanceTestCase.php" role="test" />
+    <file name="ConfigurableTestCase.php" role="test" />
+    <file name="ConnectionTestCase.php" role="test" />
+    <file name="ConnectionTransactionTestCase.php" role="test" />
+    <file name="CtiColumnAggregationInheritanceTestCase.php" role="test" />
+    <file name="CustomPrimaryKeyTestCase.php" role="test" />
+    <file name="CustomResultSetOrderTestCase.php" role="test" />
+    <file name="DataDictSqliteTestCase.php" role="test" />
+    <file name="DataDictTestCase.php" role="test" />
+    <file name="DbProfilerTestCase.php" role="test" />
+    <file name="DBTestCase.php" role="test" />
+    <file name="DoctrineTest.php" role="test" />
+    <file name="DriverTestCase.php" role="test" />
+    <file name="EventListenerTestCase.php" role="test" />
+    <file name="ExportTestCase.php" role="test" />
+    <file name="ExpressionTestCase.php" role="test" />
+    <file name="ExtensionTestCase.php" role="test" />
+    <file name="ForeignKeyTestCase.php" role="test" />
+    <file name="HookTestCase.php" role="test" />
+    <file name="HydrateTestCase.php" role="test" />
+    <file name="I18nTestCase.php" role="test" />
+    <file name="ImportTestCase.php" role="test" />
+    <file name="index.php" role="test" />
+    <file name="IntegrityActionTestCase.php" role="test" />
+    <file name="ManagerTestCase.php" role="test" />
+    <file name="MigrationTestCase.php" role="test" />
+    <file name="NewCoreTestCase.php" role="test" />
+    <file name="OneTableOneClassInheritanceTestCase.php" role="test" />
+    <file name="ParserTestCase.php" role="test" />
+    <file name="PessimisticLockingTestCase.php" role="test" />
+    <file name="PluginTestCase.php" role="test" />
+    <file name="QueryTestCase.php" role="test" />
+    <file name="RawSqlTestCase.php" role="test" />
+    <file name="RecordFilterTestCase.php" role="test" />
+    <file name="RecordTestCase.php" role="test" />
+    <file name="RelationTestCase.php" role="test" />
+    <file name="RepositoryTestCase.php" role="test" />
+    <file name="run.php" role="test" />
+    <file name="schema.xml" role="test" />
+    <file name="schema.yml" role="test" />
+    <file name="SearchTestCase.php" role="test" />
+    <file name="SequenceTestCase.php" role="test" />
+    <file name="SluggableTestCase.php" role="test" />
+    <file name="SoftDeleteBCTestCase.php" role="test" />
+    <file name="SoftDeleteTestCase.php" role="test" />
+    <file name="TableTestCase.php" role="test" />
+    <file name="TaskTestCase.php" role="test" />
+    <file name="template.tpl" role="test" />
+    <file name="TemplateTestCase.php" role="test" />
+    <file name="TokenizerTestCase.php" role="test" />
+    <file name="TransactionTestCase.php" role="test" />
+    <file name="TreeStructureTestCase.php" role="test" />
+    <file name="UnitOfWorkTestCase.php" role="test" />
+    <file name="unsolved.php" role="test" />
+    <file name="UnsortedTestCase.php" role="test" />
+    <file name="ValidatorTestCase.php" role="test" />
+    <file name="ValueHolderTestCase.php" role="test" />
+    <file name="ViewTestCase.php" role="test" />
+   </dir> <!-- /tests -->
+   <file name="CHANGELOG" role="doc" />
+   <file name="COPYRIGHT" role="doc" />
+   <file name="LICENSE" role="doc" />
+  </dir> <!-- / -->
+ </contents>
+ <dependencies>
+  <required>
+   <php>
+    <min>5.2.3</min>
+   </php>
+   <pearinstaller>
+    <min>1.4.0b1</min>
+   </pearinstaller>
+   <package>
+    <name>PEAR</name>
+    <channel>pear.php.net</channel>
+    <min>1.3.6</min>
+   </package>
+   <extension>
+    <name>pdo</name>
+   </extension>
+  </required>
+  <optional>
+   <extension>
+    <name>pdo_dblib</name>
+   </extension>
+   <extension>
+    <name>pdo_mysql</name>
+   </extension>
+   <extension>
+    <name>pdo_odbc</name>
+   </extension>
+   <extension>
+    <name>pdo_sqlite</name>
+   </extension>
+   <extension>
+    <name>pdo_oci</name>
+   </extension>
+   <extension>
+    <name>pdo_pgsql</name>
+   </extension>
+  </optional>
+ </dependencies>
+ <phprelease />
+ <changelog>
+  <release>
+   <version>
+    <release>1.2.2</release>
+    <api>1.2.2</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2010-03-29</date>
+   <license uri="http://www.doctrine-project.org/license">LGPL license</license>
+   <notes>
+-
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.2.1</release>
+    <api>1.2.1</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2009-12-07</date>
+   <license uri="http://www.doctrine-project.org/license">LGPL license</license>
+   <notes>
+-
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.2.0</release>
+    <api>1.2.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2009-11-30</date>
+   <license uri="http://www.doctrine-project.org/license">LGPL license</license>
+   <notes>
+-
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.1.2</release>
+    <api>1.1.2</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2009-06-15</date>
+   <license uri="http://www.doctrine-project.org/license">LGPL license</license>
+   <notes>
+-
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.1.1</release>
+    <api>1.1.1</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2009-05-11</date>
+   <license uri="http://www.doctrine-project.org/license">LGPL license</license>
+   <notes>
+-
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.1.0</release>
+    <api>1.1.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2009-03-16</date>
+   <license uri="http://www.doctrine-project.org/license">LGPL license</license>
+   <notes>
+-
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.0.2</release>
+    <api>1.0.2</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2008-09-11</date>
+   <license uri="http://www.doctrine-project.org/license">LGPL license</license>
+   <notes>
+-
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.0.1</release>
+    <api>1.0.1</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2008-09-09</date>
+   <license uri="http://www.doctrine-project.org/license">LGPL license</license>
+   <notes>
+-
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>1.0.0</release>
+    <api>1.0.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2008-09-01</date>
+   <license uri="http://www.doctrine-project.org/license">LGPL license</license>
+   <notes>
+-
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>0.11.0</release>
+    <api>0.11.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2008-06-23</date>
+   <license uri="http://www.doctrine-project.org/license">LGPL license</license>
+   <notes>
+-
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>0.10.4</release>
+    <api>0.10.4</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2008-03-28</date>
+   <license uri="http://www.doctrine-project.org/license">LGPL license</license>
+   <notes>
+-
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>0.10.3</release>
+    <api>0.10.3</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2008-03-18</date>
+   <license uri="http://www.doctrine-project.org/license">LGPL license</license>
+   <notes>
+-
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>0.10.2</release>
+    <api>0.10.2</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2008-03-01</date>
+   <license uri="http://www.doctrine-project.org/license">LGPL license</license>
+   <notes>
+-
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>0.10.1</release>
+    <api>0.10.1</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2008-02-29</date>
+   <license uri="http://www.doctrine-project.org/license">LGPL license</license>
+   <notes>
+-
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>0.10.0</release>
+    <api>0.10.0</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2008-02-13</date>
+   <license uri="http://www.doctrine-project.org/license">LGPL license</license>
+   <notes>
+-
+   </notes>
+  </release>
+  <release>
+   <version>
+    <release>0.9</release>
+    <api>0.9</api>
+   </version>
+   <stability>
+    <release>beta</release>
+    <api>beta</api>
+   </stability>
+   <date>2008-02-06</date>
+   <license uri="http://doctrine-project.org/license">MIT license</license>
+   <notes>
+barfoo
+   </notes>
+  </release>
+ </changelog>
+</package>
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/AccessTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/AccessTestCase.php
new file mode 100644
index 000000000..f3fcff42d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/AccessTestCase.php
@@ -0,0 +1,128 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Access_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Access_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData() 
+    {
+
+    }
+
+    public function prepareTables() 
+    {
+        $this->tables = array('Entity', 'User'); 
+        parent::prepareTables();
+    }
+
+    public function testUnset() 
+    {
+
+    }
+
+    public function testIsset() 
+    {
+        $user = new User();
+
+        $this->assertTrue(isset($user->name));  
+        $this->assertFalse(isset($user->unknown));
+        
+        $this->assertTrue(isset($user['name']));
+        $this->assertFalse(isset($user['unknown']));
+        
+        $coll = new Doctrine_Collection('User');
+        
+        $this->assertFalse(isset($coll[0]));
+        // test repeated call
+        $this->assertFalse(isset($coll[0]));
+        $coll[0];
+        
+        $this->assertTrue(isset($coll[0]));
+        // test repeated call
+        $this->assertTrue(isset($coll[0]));
+    }
+
+    public function testOffsetMethods() 
+    {
+        $user = new User();
+        $this->assertEqual($user['name'], null);
+
+        $user['name'] = 'Jack';
+        $this->assertEqual($user['name'], 'Jack');
+
+        $user->save();
+
+        $user = $this->connection->getTable('User')->find($user->identifier());
+        $this->assertEqual($user->name, 'Jack');
+
+        $user['name'] = 'Jack';
+        $this->assertEqual($user['name'], 'Jack');
+        $user['name'] = 'zYne';
+        $this->assertEqual($user['name'], 'zYne');
+    }
+
+    public function testOverload() 
+    {
+        $user = new User();
+        $this->assertEqual($user->name,null);
+
+        $user->name = 'Jack';
+
+        $this->assertEqual($user->name, 'Jack');
+        
+        $user->save();
+
+        $user = $this->connection->getTable('User')->find($user->identifier());
+        $this->assertEqual($user->name, 'Jack');
+
+        $user->name = 'Jack';
+        $this->assertEqual($user->name, 'Jack');
+        $user->name = 'zYne';
+        $this->assertEqual($user->name, 'zYne');
+    }
+    
+    public function testSet() {
+        $user = new User();
+        $this->assertEqual($user->get('name'),null);
+
+        $user->set('name', 'Jack');
+        $this->assertEqual($user->get('name'), 'Jack');
+
+        $user->save();
+
+        $user = $this->connection->getTable('User')->find($user->identifier());
+
+        $this->assertEqual($user->get('name'), 'Jack');
+
+        $user->set('name', 'Jack');
+        $this->assertEqual($user->get('name'), 'Jack');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/AuditLogTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/AuditLogTestCase.php
new file mode 100644
index 000000000..1c1242698
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/AuditLogTestCase.php
@@ -0,0 +1,121 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_AuditLog_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_AuditLog_TestCase extends Doctrine_UnitTestCase
+{
+
+    public function prepareData()
+    { }
+
+    public function prepareTables()
+    {
+        $this->profiler = new Doctrine_Connection_Profiler();
+        $this->conn->addListener($this->profiler);
+        $this->tables = array('VersioningTest', 'VersioningTestVersion', 'VersioningTest2');
+
+        parent::prepareTables();
+    }
+
+    public function testVersioningListenerListensAllManipulationOperations()
+    {
+        $entity = new VersioningTest();
+
+        $entity->name = 'zYne';
+        $entity->save();
+        $this->assertEqual($entity->version, 1);
+
+        $entity->name = 'zYne 2';
+        $entity->save();
+        $this->assertEqual($entity->name, 'zYne 2');
+        $this->assertEqual($entity->version, 2);
+        $this->conn->clear();
+
+        $entity = $this->conn->getTable('VersioningTest')->find(1);
+
+        $this->assertEqual($entity->name, 'zYne 2');
+        $this->assertEqual($entity->version, 2);
+
+        $entity->revert(1);
+
+        $this->assertEqual($entity->name, 'zYne');
+        $this->assertEqual($entity->version, 1);
+        $entity->save(); // new Version 3 should be created
+    }
+
+    public function testRevertThrowsExceptionForTransientRecords()
+    {
+        $entity = new VersioningTest();
+
+        try {
+            $entity->revert(1);
+            $this->fail();
+        } catch (Doctrine_Record_Exception $e) {
+            $this->pass();
+        }
+    }
+
+    public function testNoAuditLog()
+    {
+        $entity = new VersioningTest2();
+        $entity->name = 'test';
+        $entity->save();
+        $this->assertTrue($entity->version, 1);
+        $entity->name = 'test2';
+        $entity->save();
+        $this->assertTrue($entity->version, 2);
+    }
+
+    public function testTableName()
+    {
+        $entity = new VersioningTest3();
+        $this->assertEqual($entity->getAuditLog()->getTable()->getTableName(), 'tbl_prefix_comments_version');
+        $this->assertEqual($entity->getAuditLog()->getTable()->getComponentName(), 'VersioningTestClass');
+    }
+
+
+    public function testNoAuditLogThrowsExceptions()
+    {
+        $entity = new VersioningTest2();
+        $entity->name = 'test';
+        $entity->save();
+        $entity->name = 'test2';
+        $entity->save();
+
+        try {
+            $entity->revert(1);
+            $this->fail();
+        } catch (Exception $e) {
+            $this->pass();
+            $this->assertEqual($e->getMessage(), 'Audit log is turned off, no version history is recorded.');
+        }
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/BaseTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/BaseTestCase.php
new file mode 100644
index 000000000..6a6595cd4
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/BaseTestCase.php
@@ -0,0 +1,112 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Base_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Base_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testAggressiveModelLoading()
+    {
+        $path = realpath('ModelLoadingTest/Aggressive');
+        
+        $models = Doctrine_Core::loadModels($path, Doctrine_Core::MODEL_LOADING_AGGRESSIVE);
+
+        // Ensure the correct model names were returned
+        $this->assertTrue(isset($models['AggressiveModelLoadingUser']) && $models['AggressiveModelLoadingUser'] == 'AggressiveModelLoadingUser');
+        $this->assertTrue(isset($models['AggressiveModelLoadingProfile']) && $models['AggressiveModelLoadingProfile'] == 'AggressiveModelLoadingProfile');
+        $this->assertTrue(isset($models['AggressiveModelLoadingContact']) && $models['AggressiveModelLoadingContact'] == 'AggressiveModelLoadingContact');
+
+        // Make sure it does not include the base classes
+        $this->assertTrue( ! isset($models['BaseAggressiveModelLoadingUser']));
+        
+        $filteredModels = Doctrine_Core::filterInvalidModels($models);
+
+        // Make sure filterInvalidModels filters out base abstract classes
+        $this->assertTrue( ! isset($models['BaseAggressiveModelLoadingUser']));
+    }
+
+    public function testConservativeModelLoading()
+    {
+        $path = realpath('ModelLoadingTest/Conservative');
+
+        $models = Doctrine_Core::loadModels($path, Doctrine_Core::MODEL_LOADING_CONSERVATIVE);
+
+        $this->assertTrue( ! class_exists('ConservativeModelLoadingUser', false));
+        $this->assertTrue( ! class_exists('ConservativeModelLoadingProfile', false));
+        $this->assertTrue( ! class_exists('ConservativeModelLoadingContact', false));
+        $this->assertTrue( ! class_exists('BaseConservativeModelLoadingUser', false));
+    }
+
+    public function testAllModelsAvailable()
+    {
+        // Ensure models were loaded
+        $this->assertTrue(class_exists('AggressiveModelLoadingUser'));
+        $this->assertTrue(class_exists('AggressiveModelLoadingProfile'));
+        $this->assertTrue(class_exists('AggressiveModelLoadingContact'));
+        $this->assertTrue(class_exists('BaseAggressiveModelLoadingUser'));
+
+        $this->assertTrue( class_exists('ConservativeModelLoadingUser', true));
+        $this->assertTrue( class_exists('ConservativeModelLoadingProfile', true));
+        $this->assertTrue( class_exists('ConservativeModelLoadingContact', true));
+        $this->assertTrue( class_exists('BaseConservativeModelLoadingUser', true));
+    }
+
+    public function testModelLoadingCacheInformation()
+    {
+        $models = Doctrine_Core::getLoadedModels();
+
+        $this->assertTrue(in_array('AggressiveModelLoadingUser', $models));
+        $this->assertTrue(in_array('ConservativeModelLoadingProfile', $models));
+        $this->assertTrue(in_array('ConservativeModelLoadingContact', $models));
+        
+        $modelFiles = Doctrine_Core::getLoadedModelFiles();
+        $this->assertTrue(file_exists($modelFiles['ConservativeModelLoadingUser']));
+        $this->assertTrue(file_exists($modelFiles['ConservativeModelLoadingProfile']));
+        $this->assertTrue(file_exists($modelFiles['ConservativeModelLoadingContact']));
+    }
+
+    public function testGetConnectionByTableName()
+    {
+        $connectionBefore = Doctrine_Core::getConnectionByTableName('entity');
+
+        Doctrine_Manager::connection('sqlite::memory:', 'test_memory');
+        Doctrine_Manager::getInstance()->bindComponent('Entity', 'test_memory');
+
+        $connectionAfter = Doctrine_Core::getConnectionByTableName('entity');
+
+        $this->assertEqual($connectionAfter->getName(), 'test_memory');
+
+        Doctrine_Manager::getInstance()->bindComponent('Entity', $connectionBefore->getName());
+
+        $connectionAfter = Doctrine_Core::getConnectionByTableName('entity');
+        
+        $this->assertEqual($connectionBefore->getName(), $connectionAfter->getName());
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/BatchIteratorTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/BatchIteratorTestCase.php
new file mode 100644
index 000000000..7e3fca498
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/BatchIteratorTestCase.php
@@ -0,0 +1,86 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_BatchIterator_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_BatchIterator_TestCase extends Doctrine_UnitTestCase {
+    public function prepareTables() {
+        $this->tables = array("EntityAddress", "Entity", "User", "Group", "Address", "Email", "Phonenumber");
+        parent::prepareTables();
+    }
+
+    public function testIterator() {
+        $graph = new Doctrine_Query($this->connection);
+        $entities = $graph->query("FROM Entity");
+        $i = 0;
+        foreach($entities as $entity) {
+            $this->assertEqual(gettype($entity->name),"string");
+            $i++;
+        }
+        $this->assertTrue($i == $entities->count());
+        
+        $user = $graph->query("FROM User");
+        foreach($user[1]->Group as $group) {
+            $this->assertTrue(is_string($group->name));
+        }     
+        
+        $user = new User();
+        $user->name = "tester";
+        
+        $user->Address[0]->address = "street 1";
+        $user->Address[1]->address = "street 2";
+        
+        $this->assertEqual($user->name, "tester");
+        $this->assertEqual($user->Address[0]->address, "street 1");
+        $this->assertEqual($user->Address[1]->address, "street 2");
+
+        foreach($user->Address as $address) {
+            $a[] = $address->address;
+        }
+        $this->assertEqual($a, array("street 1", "street 2"));   
+
+        $user->save();
+        
+        $user = $user->getTable()->find($user->id);
+        $this->assertEqual($user->name, "tester");
+        $this->assertEqual($user->Address[0]->address, "street 1");
+        $this->assertEqual($user->Address[1]->address, "street 2");
+        
+        $user = $user->getTable()->find($user->id);
+        $a = array();
+        foreach($user->Address as $address) {
+            $a[] = $address->address;
+        }
+        $this->assertEqual($a, array("street 1", "street 2"));                                    
+
+
+        $user = $graph->query("FROM User");
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/AbstractTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/AbstractTestCase.php
new file mode 100644
index 000000000..a123ac9e2
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/AbstractTestCase.php
@@ -0,0 +1,154 @@
+<?php
+/*
+ *  $Id: AbstractTestCase.php 7490 2010-03-29 19:53:27Z jwage $
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Cache_Abstract_TestCase
+ *
+ * @package     Doctrine
+ * @subpackage  Doctrine_Cache
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision: 7490 $
+ */
+abstract class Doctrine_Cache_Abstract_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables = array('User');
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+        $user = new User();
+        $user->name = 'Hans';
+        $user->save();
+    }
+
+    public function testAsResultCache()
+    {
+        if ( !$this->_isEnabled()) {
+            return;
+        }
+        $this->_clearCache();
+        $cache = $this->_getCacheDriver();
+
+        $this->conn->setAttribute(Doctrine_Core::ATTR_RESULT_CACHE, $cache);
+
+        $queryCountBefore = $this->conn->count();
+
+        for ($i = 0; $i < 10; $i++) {
+            $u = Doctrine_Query::create()
+                ->from('User u')
+                ->addWhere('u.name = ?', array('Hans'))
+                ->useResultCache($cache, 3600, 'hans_query')
+                ->execute();
+            $this->assertEqual(1, count($u));
+            $this->assertEqual("Hans", $u[0]->name);
+        }
+
+        // Just 1 query should be run
+        $this->assertEqual($queryCountBefore + 1, $this->conn->count());
+        $this->assertTrue($cache->contains('hans_query'));
+    }
+
+    public function testCacheCore()
+    {
+        if ( !$this->_isEnabled()) {
+            return;
+        }
+        $this->_clearCache();
+        $cache = $this->_getCacheDriver();
+
+        $object = 'test_data';
+        $cache->save('foo', $object, 3600);
+        $this->assertTrue($cache->contains('foo'));
+
+        $this->assertEqual($cache->fetch('foo'), 'test_data');
+
+        $cache->delete('foo');
+        $this->assertFalse($cache->contains('foo'));
+    }
+
+    public function testDeleteByPrefix()
+    {
+        if ( !$this->_isEnabled()) {
+            return;
+        }
+        $this->_clearCache();
+        $cache = $this->_getCacheDriver();
+
+        $object = 'test_data';
+        $cache->save('prefix_foo', $object, 3600);
+        $cache->save('prefix_bar', $object, 3600);
+        $cache->save('foo', $object, 3600);
+
+        $cache->deleteByPrefix('prefix_');
+        $this->assertFalse($cache->contains('prefix_foo'));
+        $this->assertFalse($cache->contains('prefix_bar'));
+        $this->assertTrue($cache->contains('foo'));
+    }
+
+    public function testDeleteBySuffix()
+    {
+        if ( !$this->_isEnabled()) {
+            return;
+        }
+        $this->_clearCache();
+        $cache = $this->_getCacheDriver();
+
+        $object = 'test_data';
+        $cache->save('foo_suffix', $object, 3600);
+        $cache->save('bar_suffix', $object, 3600);
+        $cache->save('foo', $object, 3600);
+
+        $cache->deleteBySuffix('_suffix');
+        $this->assertFalse($cache->contains('foo_suffix'));
+        $this->assertFalse($cache->contains('bar_suffix'));
+        $this->assertTrue($cache->contains('foo'));
+    }
+    
+    public function testDeleteByRegex()
+    {
+        if ( !$this->_isEnabled()) {
+            return;
+        }
+        $this->_clearCache();
+        $cache = $this->_getCacheDriver();
+
+        $object = 'test_data';
+        $cache->save('foo_match_me', $object, 3600);
+        $cache->save('bar_match_me', $object, 3600);
+        $cache->save('foo', $object, 3600);
+
+        $cache->deleteByRegex('/match/');
+        $this->assertFalse($cache->contains('foo_match_me'));
+        $this->assertFalse($cache->contains('bar_match_me'));
+        $this->assertTrue($cache->contains('foo'));
+    }
+    
+    abstract protected function _clearCache();    
+    abstract protected function _isEnabled();
+    abstract protected function _getCacheDriver();
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/ApcTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/ApcTestCase.php
new file mode 100644
index 000000000..ed141caa8
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/ApcTestCase.php
@@ -0,0 +1,50 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Cache_Apc_TestCase
+ *
+ * @package     Doctrine
+ * @subpackage  Doctrine_Cache
+ * @author      David Abdemoulaie <dave@hobodave.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.2
+ * @version     $Revision$
+ */
+class Doctrine_Cache_Apc_TestCase extends Doctrine_Cache_Abstract_TestCase
+{
+    protected function _clearCache()
+    {
+        apc_clear_cache('user');
+    }
+    
+    protected function _isEnabled()
+    {
+        return extension_loaded('apc');
+    }
+    
+    protected function _getCacheDriver()
+    {
+        return new Doctrine_Cache_Apc();
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/ArrayTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/ArrayTestCase.php
new file mode 100644
index 000000000..5ff131189
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/ArrayTestCase.php
@@ -0,0 +1,50 @@
+<?php
+/*
+ *  $Id: ArrayTestCase.php 7490 2010-03-29 19:53:27Z jwage $
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Cache_Array_TestCase
+ *
+ * @package     Doctrine
+ * @subpackage  Doctrine_Cache
+ * @author      David Abdemoulaie <dave@hobodave.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.2
+ * @version     $Revision: 7490 $
+ */
+class Doctrine_Cache_Array_TestCase extends Doctrine_Cache_Abstract_TestCase
+{
+    protected function _clearCache()
+    {
+        // do nothing
+    }
+    
+    protected function _isEnabled()
+    {
+        return true;
+    }
+    
+    protected function _getCacheDriver()
+    {
+        return new Doctrine_Cache_Array();
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/DbTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/DbTestCase.php
new file mode 100644
index 000000000..91dc4563a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/DbTestCase.php
@@ -0,0 +1,86 @@
+<?php
+/*
+ *  $Id: DbTestCase.php 7490 2010-03-29 19:53:27Z jwage $
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Cache_Db_TestCase
+ *
+ * @package     Doctrine
+ * @subpackage  Doctrine_Cache
+ * @author      David Abdemoulaie <dave@hobodave.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.2
+ * @version     $Revision: 7490 $
+ */
+class Doctrine_Cache_Db_TestCase extends Doctrine_Cache_Abstract_TestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->cache = new Doctrine_Cache_Db(array(
+            'connection' => $this->connection,
+            'tableName' => 'd_cache',
+        ));
+        $this->connection->exec('DROP TABLE IF EXISTS d_cache');
+        $this->cache->createTable();
+    }
+    protected function _clearCache()
+    {
+        $this->connection->exec('DELETE FROM d_cache');
+    }
+
+    protected function _isEnabled()
+    {
+        return true;
+    }
+
+    protected function _getCacheDriver()
+    {
+        return $this->cache;
+    }
+
+    public function testAsResultCache()
+    {
+        if ( !$this->_isEnabled()) {
+            return;
+        }
+        $this->_clearCache();
+        $cache = $this->_getCacheDriver();
+
+        $this->conn->setAttribute(Doctrine_Core::ATTR_RESULT_CACHE, $cache);
+
+        $queryCountBefore = $this->conn->count();
+
+        for ($i = 0; $i < 10; $i++) {
+            $u = Doctrine_Query::create()
+                ->from('User u')
+                ->addWhere('u.name = ?', array('Hans'))
+                ->useResultCache($cache, 3600, 'hans_query')
+                ->execute();
+            $this->assertEqual(1, count($u));
+            $this->assertEqual("Hans", $u[0]->name);
+        }
+
+        $this->assertTrue($cache->contains('hans_query'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/MemcacheTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/MemcacheTestCase.php
new file mode 100644
index 000000000..68c4004cf
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/MemcacheTestCase.php
@@ -0,0 +1,51 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Cache_Memcache_TestCase
+ *
+ * @package     Doctrine
+ * @subpackage  Doctrine_Cache
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Cache_Memcache_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables() 
+    { }
+    public function prepareData()
+    { }
+}
+class Doctrine_Cache_Memcache_Mock extends Doctrine_Cache_Memcache 
+{
+}
+
+if ( ! class_exists('Memcache'))
+{
+    class Memcache
+    {
+
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/Query/SqliteTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/Query/SqliteTestCase.php
new file mode 100644
index 000000000..ee95083ec
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/Query/SqliteTestCase.php
@@ -0,0 +1,35 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Cache_Query_Sqlite_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Cache_Query_Sqlite_TestCase extends Doctrine_UnitTestCase 
+{
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/QuerySqliteTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/QuerySqliteTestCase.php
new file mode 100644
index 000000000..8e9c9da2f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/QuerySqliteTestCase.php
@@ -0,0 +1,41 @@
+<?php
+
+class Doctrine_Cache_Query_SqliteTestCase extends Doctrine_UnitTestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+
+        $dir = $this->connection->getAttribute(Doctrine_Core::ATTR_CACHE_DIR);
+
+        if (file_exists($dir.DIRECTORY_SEPARATOR."stats.cache"))
+            unlink($dir.DIRECTORY_SEPARATOR."stats.cache");
+
+        $this->cache = new Doctrine_Cache_Query_Sqlite($this->connection);
+        $this->cache->deleteAll();
+    }
+
+    public function testStore() {
+
+        $this->cache->store("SELECT * FROM user", array(array('name' => 'Jack Daniels')), 60);
+        $this->assertEqual($this->cache->count(), 1);
+
+        $this->cache->store("SELECT * FROM group", array(array('name' => 'Drinkers club')), 60);
+        
+        $md5 = md5("SELECT * FROM user");
+        $result = $this->cache->fetch($md5);
+        $this->assertEqual($result, array(array('name' => 'Jack Daniels')));
+
+        $md5 = md5("SELECT * FROM group");
+        $result = $this->cache->fetch($md5);
+        $this->assertEqual($result, array(array('name' => 'Drinkers club')));
+
+        $this->assertEqual($this->cache->count(), 2);
+        
+        $this->cache->delete($md5);
+        $this->assertEqual($this->cache->count(), 1);
+        
+        $this->cache->deleteAll();
+        $this->assertEqual($this->cache->count(), 0);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/SqliteTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/SqliteTestCase.php
new file mode 100644
index 000000000..beebc50c7
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/SqliteTestCase.php
@@ -0,0 +1,40 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Cache_Sqlite_TestCase
+ *
+ * @package     Doctrine
+ * @subpackage  Doctrine_Cache
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Cache_Sqlite_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables() 
+    { }
+    public function prepareData()
+    { }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/XcacheTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/XcacheTestCase.php
new file mode 100644
index 000000000..4a5b87316
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Cache/XcacheTestCase.php
@@ -0,0 +1,57 @@
+<?php
+/*
+ *  $Id: XcacheTestCase.php 7490 2010-03-29 19:53:27Z jwage $
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Cache_Xcache_TestCase
+ *
+ * @package     Doctrine
+ * @subpackage  Doctrine_Cache
+ * @author      David Abdemoulaie <dave@hobodave.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.2
+ * @version     $Revision: 7490 $
+ */
+class Doctrine_Cache_Xcache_TestCase extends Doctrine_Cache_Abstract_TestCase
+{
+    protected function _clearCache()
+    {
+        for ($i = 0, $count = xcache_count(XC_TYPE_VAR); $i < $count; $i++) {
+            xcache_clear_cache(XC_TYPE_VAR, $i);
+        }
+    }
+
+    protected function _isEnabled()
+    {
+        // Wow, Xcache doesn't work in CLI by design
+        if (array_key_exists('SHELL', $_ENV)) {
+            return false;
+        }
+
+        return extension_loaded('xcache');
+    }
+
+    protected function _getCacheDriver()
+    {
+        return new Doctrine_Cache_Xcache();
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CacheSqliteTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CacheSqliteTestCase.php
new file mode 100644
index 000000000..221c739b6
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CacheSqliteTestCase.php
@@ -0,0 +1,125 @@
+<?php
+require_once("UnitTestCase.php");
+
+class Doctrine_Cache_SqliteTestCase extends Doctrine_UnitTestCase
+{
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->manager->setAttribute(Doctrine_Core::ATTR_CACHE,Doctrine_Core::CACHE_NONE);
+        $dir = $this->connection->getAttribute(Doctrine_Core::ATTR_CACHE_DIR);
+
+        if (file_exists($dir.DIRECTORY_SEPARATOR."stats.cache")) {
+            unlink($dir.DIRECTORY_SEPARATOR."stats.cache");
+        }
+
+        $this->cache = new Doctrine_Cache_Sqlite($this->objTable);
+        $this->cache->deleteAll();
+    }
+
+    public function testStore()
+    {
+        // does not store proxy objects
+        $this->assertFalse($this->cache->store($this->objTable->getProxy(4)));
+        
+        $this->assertTrue($this->cache->store($this->objTable->find(4)));
+
+        $record = $this->cache->fetch(4);
+        $this->assertTrue($record instanceof Doctrine_Record);
+
+        foreach($this->old as $name => $value) {
+            $this->assertEqual($record->get($name), $value);
+        }
+        $this->assertEqual($record->obtainIdentifier(), $this->old->obtainIdentifier());
+
+    }
+
+    public function testFetchMultiple()
+    {
+        $this->assertFalse($this->cache->fetchMultiple(array(5,6)));
+        $this->cache->store($this->objTable->find(5));
+
+        $array = $this->cache->fetchMultiple(array(5,6));
+        $this->assertEqual(gettype($array), "array");
+        $this->assertEqual(count($array), 1);
+        $this->assertTrue($array[0] instanceof Doctrine_Record);
+    }
+
+    public function testDeleteMultiple()
+    {
+        $this->assertEqual($this->cache->deleteMultiple(array()),0);
+        $this->cache->store($this->objTable->find(5));
+        $this->cache->store($this->objTable->find(6));
+
+        $count = $this->cache->deleteMultiple(array(5,6));
+
+        $this->assertEqual($count,2);
+        $this->cache->store($this->objTable->find(6));
+        $count = $this->cache->deleteMultiple(array(5,6));
+        $this->assertEqual($count,1);
+    }
+
+    public function testDelete()
+    {
+        $this->cache->store($this->objTable->find(5));
+        $this->assertTrue($this->cache->fetch(5) instanceof Doctrine_Record);
+
+        $this->assertEqual($this->cache->delete(5),true);
+        $this->assertFalse($this->cache->fetch(5));
+
+        $this->assertFalse($this->cache->delete(0));
+    }
+
+    public function testFetch()
+    {
+        $this->assertFalse($this->cache->fetch(3));
+    }
+
+    public function testCount()
+    {
+        $this->assertEqual($this->cache->count(), 0);
+        $this->cache->store($this->objTable->find(5));
+        $this->assertEqual($this->cache->count(), 1);
+    }
+
+    public function testSaveStats()
+    {
+        $this->assertFalse($this->cache->saveStats());
+        $this->cache->store($this->objTable->find(5));
+        $this->cache->store($this->objTable->find(6));
+        $this->cache->store($this->objTable->find(7));
+        $this->cache->fetchMultiple(array(5,6,7));
+
+        $this->assertTrue($this->cache->saveStats());
+        $this->assertTrue(gettype($this->cache->getStats()), "array");
+        $this->assertEqual($this->cache->getStats(),array(5 => 1, 6 => 1, 7 => 1));
+
+        $this->cache->fetchMultiple(array(5,6,7));
+        $this->cache->fetch(5);
+        $this->cache->fetch(7);
+        $this->assertTrue($this->cache->saveStats());
+        $this->assertEqual($this->cache->getStats(),array(5 => 3, 6 => 2, 7 => 3));
+    }
+
+    public function testClean()
+    {
+        $this->cache->store($this->objTable->find(4));
+        $this->cache->store($this->objTable->find(5));
+        $this->cache->store($this->objTable->find(6));
+        $this->cache->store($this->objTable->find(7));
+        $this->cache->store($this->objTable->find(8));
+        $this->cache->store($this->objTable->find(9));
+        $this->assertEqual($this->cache->count(), 6);
+        $this->cache->fetch(5);
+        $this->cache->fetch(7);
+        $this->cache->fetchMultiple(array(5,6,7));
+        $this->cache->fetchMultiple(array(5,6,7));
+        $this->cache->fetchMultiple(array(5,6,7));
+        $this->cache->fetchMultiple(array(4,5,6,7,8,9));
+        $this->assertTrue($this->cache->saveStats());
+        
+        $this->manager->setAttribute(Doctrine_Core::ATTR_CACHE_SIZE, 3);
+        $this->assertEqual($this->cache->clean(), 3);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ClassTableInheritanceTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ClassTableInheritanceTestCase.php
new file mode 100644
index 000000000..986742cc5
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ClassTableInheritanceTestCase.php
@@ -0,0 +1,321 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_ClassTableInheritance_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_ClassTableInheritance_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    { }
+    public function prepareData()
+    { }
+
+    public function testClassTableInheritanceIsTheDefaultInheritanceType()
+    {
+        $class = new CTITest();
+
+        $table = $class->getTable();
+
+        $this->assertEqual($table->getOption('joinedParents'), array('CTITestParent2', 'CTITestParent3'));
+    }
+
+    public function testExportGeneratesAllInheritedTables()
+    {
+        $sql = $this->conn->export->exportClassesSql(array('CTITest', 'CTITestOneToManyRelated', 'NoIdTestParent', 'NoIdTestChild'));
+
+        $this->assertEqual($sql[0], 'CREATE TABLE no_id_test_parent (myid INTEGER PRIMARY KEY AUTOINCREMENT, name TEXT)');
+        $this->assertEqual($sql[1], 'CREATE TABLE no_id_test_child (myid INTEGER, child_column TEXT, PRIMARY KEY(myid))');
+        $this->assertEqual($sql[2], 'CREATE TABLE c_t_i_test_parent4 (id INTEGER, age INTEGER, PRIMARY KEY(id))');
+        $this->assertEqual($sql[3], 'CREATE TABLE c_t_i_test_parent3 (id INTEGER, added INTEGER, PRIMARY KEY(id))');
+        $this->assertEqual($sql[4], 'CREATE TABLE c_t_i_test_parent2 (id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(200), verified INTEGER)');
+    
+        foreach ($sql as $query) {
+            $this->conn->exec($query);
+        }
+    }
+
+    public function testInheritedPropertiesGetOwnerFlags()
+    {
+        $class = new CTITest();
+
+        $table = $class->getTable();
+        
+        $columns = $table->getColumns();
+
+        $this->assertEqual($columns['verified']['owner'], 'CTITestParent2');
+        $this->assertEqual($columns['name']['owner'], 'CTITestParent2');
+        $this->assertEqual($columns['added']['owner'], 'CTITestParent3');
+    }
+
+    public function testNewlyCreatedRecordsHaveInheritedPropertiesInitialized()
+    {
+    	$profiler = new Doctrine_Connection_Profiler();
+
+    	$this->conn->addListener($profiler);
+
+        $record = new CTITest();
+
+        $this->assertEqual($record->toArray(), array('id' => null,
+                                                    'age' => null,
+                                                    'name' => null,
+                                                    'verified' => null,
+                                                    'added' => null));
+
+        $record->age = 13;
+        $record->name = 'Jack Daniels';
+        $record->verified = true;
+        $record->added = time();
+        $record->save();
+        
+        // pop the commit event
+        $profiler->pop();
+        $this->assertEqual($profiler->pop()->getQuery(), 'INSERT INTO c_t_i_test_parent4 (age, id) VALUES (?, ?)');
+        // pop the prepare event
+        $profiler->pop();
+        $this->assertEqual($profiler->pop()->getQuery(), 'INSERT INTO c_t_i_test_parent3 (added, id) VALUES (?, ?)');
+        // pop the prepare event
+        $profiler->pop();
+        $this->assertEqual($profiler->pop()->getQuery(), 'INSERT INTO c_t_i_test_parent2 (name, verified) VALUES (?, ?)');
+        $this->conn->addListener(new Doctrine_EventListener());
+    }
+    
+    public function testParentalJoinsAreAddedAutomaticallyWithDql()
+    {
+        $q = new Doctrine_Query();
+        $q->from('CTITest c')->where('c.id = 1');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT c.id AS c__id, c3.added AS c__added, c2.name AS c__name, c2.verified AS c__verified, c.age AS c__age FROM c_t_i_test_parent4 c LEFT JOIN c_t_i_test_parent2 c2 ON c.id = c2.id LEFT JOIN c_t_i_test_parent3 c3 ON c.id = c3.id WHERE (c.id = 1)');
+
+        $record = $q->fetchOne();
+        
+        $this->assertEqual($record->id, 1);
+        $this->assertEqual($record->name, 'Jack Daniels');
+        $this->assertEqual($record->verified, true);
+        $this->assertTrue(isset($record->added));
+        $this->assertEqual($record->age, 13);
+    }
+
+    public function testReferenfingParentColumnsUsesProperAliases()
+    {
+        $q = new Doctrine_Query();
+        $q->from('CTITest c')->where("c.name = 'Jack'");
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT c.id AS c__id, c3.added AS c__added, c2.name AS c__name, c2.verified AS c__verified, c.age AS c__age FROM c_t_i_test_parent4 c LEFT JOIN c_t_i_test_parent2 c2 ON c.id = c2.id LEFT JOIN c_t_i_test_parent3 c3 ON c.id = c3.id WHERE (c2.name = 'Jack')");
+
+        $q = new Doctrine_Query();
+        $q->from('CTITest c')->where("name = 'Jack'");
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT c.id AS c__id, c3.added AS c__added, c2.name AS c__name, c2.verified AS c__verified, c.age AS c__age FROM c_t_i_test_parent4 c LEFT JOIN c_t_i_test_parent2 c2 ON c.id = c2.id LEFT JOIN c_t_i_test_parent3 c3 ON c.id = c3.id WHERE (c2.name = 'Jack')");
+    }
+
+    public function testFetchingCtiRecordsSupportsLimitSubqueryAlgorithm()
+    {
+    	$record = new CTITestOneToManyRelated;
+    	$record->name = 'Someone';
+    	$record->cti_id = 1;
+    	$record->save();
+
+        $this->conn->clear();
+
+        $q = new Doctrine_Query();
+        $q->from('CTITestOneToManyRelated c')->leftJoin('c.CTITest c2')->where('c.id = 1')->limit(1);
+
+        $record = $q->fetchOne();
+        
+        $this->assertEqual($record->name, 'Someone');
+        $this->assertEqual($record->cti_id, 1);
+
+        $cti = $record->CTITest[0];
+
+        $this->assertEqual($cti->id, 1);
+        $this->assertEqual($cti->name, 'Jack Daniels');
+        $this->assertEqual($cti->verified, true);
+        $this->assertTrue(isset($cti->added));
+        $this->assertEqual($cti->age, 13);
+    }
+
+    public function testUpdatingCtiRecordsUpdatesAllParentTables()
+    {
+        $this->conn->clear();
+
+        $profiler = new Doctrine_Connection_Profiler();
+    	$this->conn->addListener($profiler);
+
+        $record = $this->conn->getTable('CTITest')->find(1);
+        
+        $record->age = 11;
+        $record->name = 'Jack';
+        $record->verified = false;
+        $record->added = 0;
+        
+        $record->save();
+        
+        // pop the commit event
+        $profiler->pop();
+        $this->assertEqual($profiler->pop()->getQuery(), 'UPDATE c_t_i_test_parent4 SET age = ? WHERE id = ?');
+        // pop the prepare event
+        $profiler->pop();
+        $this->assertEqual($profiler->pop()->getQuery(), 'UPDATE c_t_i_test_parent3 SET added = ? WHERE id = ?');
+        // pop the prepare event
+        $profiler->pop();
+        $this->assertEqual($profiler->pop()->getQuery(), 'UPDATE c_t_i_test_parent2 SET name = ?, verified = ? WHERE id = ?');
+        $this->conn->addListener(new Doctrine_EventListener());
+    }
+    
+    public function testUpdateOperationIsPersistent()
+    {
+        $this->conn->clear();
+        
+        $record = $this->conn->getTable('CTITest')->find(1);
+        
+        $this->assertEqual($record->id, 1);
+        $this->assertEqual($record->name, 'Jack');
+        $this->assertEqual($record->verified, false);
+        $this->assertEqual($record->added, 0);
+        $this->assertEqual($record->age, 11);
+    }
+    
+    public function testValidationSkipsOwnerOption()
+    {
+        $this->conn->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+        $record = $this->conn->getTable('CTITest')->find(1);
+        try {
+            $record->name = "winston";
+            $this->assertTrue($record->isValid());
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail();
+        }
+        $this->conn->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+    
+    public function testDeleteIssuesQueriesOnAllJoinedTables()
+    {
+        $this->conn->clear();
+
+        $profiler = new Doctrine_Connection_Profiler();
+    	$this->conn->addListener($profiler);
+
+        $record = $this->conn->getTable('CTITest')->find(1);
+        
+        $record->delete();
+
+        // pop the commit event
+        
+        // pop the prepare event
+        $profiler->pop();
+        $this->assertEqual($profiler->pop()->getQuery(), 'DELETE FROM c_t_i_test_parent2 WHERE id = ?');
+        $profiler->pop();
+        $this->assertEqual($profiler->pop()->getQuery(), 'DELETE FROM c_t_i_test_parent3 WHERE id = ?');
+        $profiler->pop();
+        $this->assertEqual($profiler->pop()->getQuery(), 'DELETE FROM c_t_i_test_parent4 WHERE id = ?');
+        $this->conn->addListener(new Doctrine_EventListener());
+    }
+    
+    public function testNoIdCti()
+    {
+        $NoIdTestChild = new NoIdTestChild();
+        $NoIdTestChild->name = 'test';
+        $NoIdTestChild->child_column = 'test';
+        $NoIdTestChild->save();
+        
+        $NoIdTestChild = Doctrine_Core::getTable('NoIdTestChild')->find(1);
+        $this->assertEqual($NoIdTestChild->myid, 1);
+        $this->assertEqual($NoIdTestChild->name, 'test');
+        $this->assertEqual($NoIdTestChild->child_column, 'test');
+    }
+}
+abstract class CTIAbstractBase extends Doctrine_Record
+{ }
+class CTITestParent1 extends CTIAbstractBase
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 200);
+    }
+}
+class CTITestParent2 extends CTITestParent1
+{
+    public function setTableDefinition()
+    {
+    	parent::setTableDefinition();
+
+        $this->hasColumn('verified', 'boolean', 1);
+    }
+}
+class CTITestParent3 extends CTITestParent2
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('added', 'integer');
+    }
+}
+class CTITestParent4 extends CTITestParent3
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('age', 'integer', 4);
+    }
+}
+class CTITest extends CTITestParent4
+{
+
+}
+
+class CTITestOneToManyRelated extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string');
+        $this->hasColumn('cti_id', 'integer');
+    }
+    
+    public function setUp()
+    {
+        $this->hasMany('CTITest', array('local' => 'cti_id', 'foreign' => 'id'));
+    }
+}
+
+class NoIdTestParent extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('myid', 'integer', null, array('autoincrement' => true, 'primary' => true));
+        $this->hasColumn('name', 'string');
+    }
+}
+
+class NoIdTestChild extends NoIdTestParent
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('child_column', 'string');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase.php
new file mode 100644
index 000000000..681bcb833
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase.php
@@ -0,0 +1,449 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Cli_TestCase
+ *
+ * @package     Doctrine
+ * @author      Dan Bettles <danbettles@yahoo.co.uk>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Cli_TestCase extends Doctrine_UnitTestCase 
+{
+    /**
+     * @ignore
+     * @var string
+     */
+    protected $fixturesPath;
+
+    /**
+     * The names of some of the Doctrine Task classes
+     * 
+     * @ignore
+     * @var array
+     */
+    protected $doctrineTaskClassName = array(
+        'Doctrine_Task_CreateDb' => 'create-db',
+        'Doctrine_Task_Migrate' => 'migrate',
+        'Doctrine_Task_GenerateModelsDb' => 'generate-models-db',
+    );
+
+    /**
+     * @ignore
+     * @return string
+     */
+    protected function getFixturesPath()
+    {
+        if (! isset($this->fixturesPath)) {
+            $this->fixturesPath = dirname(__FILE__) . '/CliTestCase';
+        }
+
+        return $this->fixturesPath;
+    }
+
+    public function setUp() {}
+
+    public function tearDown() {}
+
+    public function testTheNameOfTheTaskBaseClassNameIsStoredInAClassConstant()
+    {
+        $this->assertFalse(is_null(constant('Doctrine_Cli::TASK_BASE_CLASS')));
+    }
+
+    public function testGetconfigReturnsTheArrayUsedToConstructTheInstance()
+    {
+        $config = array('foo' => 'bar', 'baz' => 'bip');
+        $cli = new Doctrine_Cli_TestCase_PassiveCli($config);
+        $this->assertEqual($config, $cli->getConfig());
+    }
+
+    public function testIsConstructedWithAnEmptyConfigArrayByDefault()
+    {
+        $cli = new Doctrine_Cli_TestCase_PassiveCli();
+        $this->assertEqual(array(), $cli->getConfig());
+    }
+
+    public function testGetconfigReturnsTheArraySetWithSetconfig()
+    {
+        $cli = new Doctrine_Cli_TestCase_PassiveCli();
+
+        $this->assertEqual(array(), $cli->getConfig());
+
+        $config = array('foo' => 'bar', 'baz' => 'bip');
+        $cli->setConfig($config);
+        $this->assertEqual($config, $cli->getConfig());
+    }
+
+    public function testGetformatterReturnsTheFormatterUsedToConstructTheInstance()
+    {
+        $formatter = new Doctrine_Cli_Formatter();
+        $cli = new Doctrine_Cli_TestCase_PassiveCli(array(), $formatter);
+        $this->assertIdentical($formatter, $cli->getFormatter());
+    }
+
+    public function testIsConstructedWithAnAnsiColourFormatterByDefault()
+    {
+        $cli = new Doctrine_Cli_TestCase_PassiveCli();
+        $this->assertTrue($cli->getFormatter() instanceof Doctrine_Cli_AnsiColorFormatter);
+    }
+
+    public function testGetformatterReturnsTheFormatterSetWithSetformatter()
+    {
+        $cli = new Doctrine_Cli_TestCase_PassiveCli();
+        $formatter = new Doctrine_Cli_Formatter();
+        $cli->setFormatter($formatter);
+        $this->assertIdentical($formatter, $cli->getFormatter());
+    }
+
+    public function testHasconfigvalueReturnsTrueIfTheElementInTheConfigHasTheSpecifiedValue()
+    {
+        $cli = new Doctrine_Cli_TestCase_PassiveCli(array('foo' => 'bar', 'true' => true));
+
+        $this->assertTrue($cli->hasConfigValue('foo', 'bar'));
+        $this->assertFalse($cli->hasConfigValue('foo', 'baz'));
+
+        $this->assertTrue($cli->hasConfigValue('true', 1));
+        $this->assertTrue($cli->hasConfigValue('true', true));
+        $this->assertFalse($cli->hasConfigValue('true', 1, true));
+        $this->assertTrue($cli->hasConfigValue('true', true, true));
+
+        $this->assertFalse($cli->hasConfigValue('missing', 'anything'));
+    }
+
+    public function testHasconfigvalueReturnsTrueIfTheElementInTheConfigIsSetAndAValueWasNotSpecified()
+    {
+        $cli = new Doctrine_Cli_TestCase_PassiveCli(array('foo' => 'bar'));
+        $this->assertTrue($cli->hasConfigValue('foo'));
+        $this->assertFalse($cli->hasConfigValue('baz'));
+    }
+
+    public function testGetconfigvalueReturnsTheValueOfTheSpecifiedElementInTheConfig()
+    {
+        $cli = new Doctrine_Cli_TestCase_PassiveCli(array('foo' => 'bar'));
+        $this->assertEqual('bar', $cli->getConfigValue('foo'));
+    }
+
+    public function testGetconfigvalueThrowsAnExceptionIfTheSpecifiedElementDoesNotExistInTheConfig()
+    {
+        $cli = new Doctrine_Cli_TestCase_PassiveCli();
+
+        $key = 'anything';
+
+        try {
+            $cli->getConfigValue($key);
+        } catch (OutOfBoundsException $e) {
+            if ($e->getMessage() == "The element \"{$key}\" does not exist in the config") {
+                $this->pass();
+                return;
+            }
+        }
+
+        $this->fail();
+    }
+
+    public function testGetconfigvalueReturnsTheDefaultValueIfTheSpecifiedElementDoesNotExistInTheConfig()
+    {
+        $cli = new Doctrine_Cli_TestCase_PassiveCli();
+        $this->assertEqual('default', $cli->getConfigValue('anything', 'default'));
+    }
+
+    public function testGetregisteredtasksReturnsTheArraySetWithSetregisteredtasks()
+    {
+        $cli = new Doctrine_Cli_TestCase_PassiveCli();
+
+        $this->assertEqual(array(), $cli->getRegisteredTasks());
+
+        $registeredTask = array('Doctrine_Task_CreateDb' => 'anything');
+        $cli->setRegisteredTasks($registeredTask);
+        $this->assertEqual($registeredTask, $cli->getRegisteredTasks());
+    }
+
+    public function testTaskclassisregisteredReturnsTrueIfTheSpecifiedClassIsRegistered()
+    {
+        $cli = new Doctrine_Cli_TestCase_PassiveCli();
+
+        $this->assertFalse($cli->taskClassIsRegistered('Doctrine_Task_CreateDb'));
+        $this->assertFalse($cli->taskClassIsRegistered('Doctrine_Task_DropDb'));
+
+        $cli->setRegisteredTasks(array('Doctrine_Task_CreateDb' => 'anything'));
+        $this->assertTrue($cli->taskClassIsRegistered('Doctrine_Task_CreateDb'));
+        $this->assertFalse($cli->taskClassIsRegistered('Doctrine_Task_DropDb'));
+    }
+
+    public function testTasknameisregisteredReturnsTrueIfATaskWithTheSpecifiedNameIsRegistered()
+    {
+        $cli = new Doctrine_Cli_TestCase_PassiveCli();
+
+        $expectedClassName = 'Doctrine_Cli_TestCase_TestTask01';
+        $task = new $expectedClassName();
+        $expectedTaskName = $task->getTaskName();
+
+        $this->assertFalse($cli->taskNameIsRegistered($expectedTaskName));
+
+        $cli->setRegisteredTasks(array($expectedClassName => $task));
+        $this->assertTrue($cli->taskNameIsRegistered($expectedTaskName, $actualClassName));
+        $this->assertEqual($expectedClassName, $actualClassName);
+    }
+
+    public function testDoctrineTaskClassesAreNotAlreadyLoaded()
+    {
+        foreach ($this->doctrineTaskClassName as $taskClassName) {
+            $this->assertFalse(class_exists($taskClassName, false));
+        }
+    }
+
+    //Apologies for this cheap, non-atomic test - this area needs some more work once this round of refactoring's done
+    public function testAutomaticallyIncludesAndRegistersDoctrineTasks()
+    {
+        $cli = new Doctrine_Cli_TestCase_EmptyCli(array('autoregister_custom_tasks' => false));
+
+        //Make sure those Doctrine core Tasks are loaded
+        foreach ($this->doctrineTaskClassName as $className => $taskName) {
+            $this->assertTrue(class_exists($className, false));
+            $this->assertTrue($cli->taskClassIsRegistered($className));
+        }
+
+        //Now, make sure we haven't registered any custom Tasks
+        $this->assertFalse($cli->taskClassIsRegistered('Doctrine_Cli_TestCase_EmptyTask'));
+    }
+
+    public function testByDefaultAutomaticallyRegistersIncludedCustomTasks()
+    {
+        $cli = new Doctrine_Cli_TestCase_EmptyCli();
+        $this->assertTrue($cli->taskClassIsRegistered('Doctrine_Cli_TestCase_EmptyTask'));
+    }
+
+    public function testRegistertaskclassRegistersTheSpecifiedClass()
+    {
+        $cli = new Doctrine_Cli_TestCase_EmptyCli();
+
+        $this->assertFalse($cli->taskClassIsRegistered('Doctrine_Cli_TestCase_TestTask02'));
+
+        require_once($this->getFixturesPath() . '/TestTask02.php');
+        $cli->registerTaskClass('Doctrine_Cli_TestCase_TestTask02');
+        $this->assertTrue($cli->taskClassIsRegistered('Doctrine_Cli_TestCase_TestTask02'));
+
+        //Nothing should happen if we attempt to register a registered class
+        $cli->registerTaskClass('Doctrine_Cli_TestCase_TestTask02');
+        $this->assertTrue($cli->taskClassIsRegistered('Doctrine_Cli_TestCase_TestTask02'));
+    }
+
+    public function testRegistertaskclassThrowsAnExceptionIfTheSpecifiedClassIsNotLoaded()
+    {
+        $cli = new Doctrine_Cli_TestCase_EmptyCli();
+
+        try {
+            $cli->registerTaskClass('anything');
+        } catch (InvalidArgumentException $e) {
+            if ($e->getMessage() == 'The task class "anything" does not exist') {
+                $this->pass();
+                return;
+            }
+        }
+
+        $this->fail();
+    }
+
+    public function testRegistertaskclassThrowsAnExceptionIfTheSpecifiedClassIsNotATask()
+    {
+        $cli = new Doctrine_Cli_TestCase_EmptyCli();
+
+        $thisClassName = get_class($this);
+
+        try {
+            $cli->registerTaskClass($thisClassName);
+        } catch (DomainException $e) {
+            if ($e->getMessage() == "The class \"{$thisClassName}\" is not a Doctrine Task") {
+                $this->pass();
+                return;
+            }
+        }
+
+        $this->fail();
+    }
+
+    /*
+     * Exists only to ensure the method behaves the same as it did before refactoring
+     */
+    public function testLoadtasksThrowsAnExceptionIfTheSpecifiedDirectoryDoesNotExist()
+    {
+        $cli = new Doctrine_Cli_TestCase_PassiveCli();
+
+        $directory = $this->getFixturesPath() . '/foo';
+    
+        try {
+            $cli->loadTasks($directory);
+        } catch (InvalidArgumentException $e) {
+            if ($e->getMessage() == "The directory \"{$directory}\" does not exist") {
+                $this->pass();
+                return;
+            }
+        }
+    
+        $this->fail();
+    }
+
+    /*
+     * Exists (mostly) to ensure the method behaves the same as it did before refactoring
+     */
+    public function testLoadtasksLoadsDoctrineStyleTasksFromTheSpecifiedDirectory()
+    {
+        $cli = new Doctrine_Cli_TestCase_PassiveCli();
+    
+        $this->assertEqual(array(), $cli->getRegisteredTasks());
+    
+        $loadedTaskName = $cli->loadTasks($this->getFixturesPath() . '/' . __FUNCTION__);
+        $expectedTaskName = array('doctrine-style-task' => 'doctrine-style-task');
+        $this->assertEqual($expectedTaskName, $loadedTaskName);
+
+        $registeredTasks = $cli->getRegisteredTasks();
+
+        $this->assertTrue(isset($registeredTasks['Doctrine_Task_DoctrineStyleTask']));
+
+        $this->assertFalse(isset($registeredTasks['Doctrine_Cli_TestCase_InvalidClassNameForATask']));
+        $this->assertFalse(isset($registeredTasks['Doctrine_Task_TaskDeclaredInAnIncFile']));
+    }
+
+    /*
+     * Exists only to ensure the method behaves the same as it did before refactoring
+     */
+    public function testLoadtasksReturnsAnArrayOfTaskNames()
+    {
+        $cli = new Doctrine_Cli_TestCase_EmptyCli();
+        $loadedTaskNames = $cli->loadTasks();
+        $expectedTaskName = array_combine($this->doctrineTaskClassName, $this->doctrineTaskClassName);
+        $this->assertEqual($expectedTaskName, array_intersect_assoc($expectedTaskName, $loadedTaskNames));
+    }
+
+    /*
+     * Exists only to ensure the method behaves the same as it did before refactoring
+     */
+    public function testGetloadedtasksReturnsAnArrayOfTaskNames()
+    {
+        $cli = new Doctrine_Cli_TestCase_EmptyCli();
+        $loadedTaskNames = $cli->getLoadedTasks();
+        $expectedTaskName = array_combine($this->doctrineTaskClassName, $this->doctrineTaskClassName);
+        $this->assertEqual($expectedTaskName, array_intersect_assoc($expectedTaskName, $loadedTaskNames));
+    }
+    
+    /*
+     * Exists only to ensure the method behaves the same as it did before refactoring
+     */
+    public function test_gettaskclassfromargsReturnsTheNameOfTheClassAssociatedWithTheSpecifiedTask()
+    {
+        $cli = new Doctrine_Cli_TestCase_PassiveCli02();
+        $this->assertEqual('Doctrine_Task_TaskName', $cli->_getTaskClassFromArgs(array('scriptName', 'task-name')));
+    }
+
+    public function testRunByDefaultDoesNotThrowExceptions()
+    {
+        //Hide printed output from the CLI
+        ob_start();
+
+        $cli = new Doctrine_Cli_TestCase_NoisyCli();
+        $cli->run(array());
+        $this->pass();
+    
+        $cli = new Doctrine_Cli_TestCase_NoisyCli(array('rethrow_exceptions' => false));
+        $cli->run(array());
+        $this->pass();
+    
+        $cli = new Doctrine_Cli_TestCase_NoisyCli(array('rethrow_exceptions' => 0));
+        $cli->run(array());
+        $this->pass();
+
+        ob_end_clean();
+    }
+
+    public function testRunThrowsExceptionsIfTheCliWasConstructedWithTheRethrowexceptionsOptionSetToTrue()
+    {
+        //Hide printed output from the CLI
+        ob_start();
+
+        $cli = new Doctrine_Cli_TestCase_NoisyCli(array('rethrow_exceptions' => 1));
+    
+        try {
+            $cli->run(array());
+        //The same exception must be re-thrown...
+        } catch (Doctrine_Cli_TestCase_Exception $e) {
+            //...And it must be formatted
+            if (preg_match('/Foo\W+/', $e->getMessage())) {
+                $this->pass();
+                return;
+            }
+        }
+    
+        $this->fail();
+
+        ob_end_clean();
+    }
+
+    public function testGettaskinstanceReturnsTheTaskSetWithSettaskinstance()
+    {
+        $cli = new Doctrine_Cli_TestCase_PassiveCli();
+        $task = new Doctrine_Cli_TestCase_EmptyTask();
+        $cli->setTaskInstance($task);
+        $this->assertIdentical($task, $cli->getTaskInstance());
+    }
+}
+
+class Doctrine_Cli_TestCase_PassiveCli extends Doctrine_Cli
+{
+    protected function includeAndRegisterTaskClasses() {}
+}
+
+class Doctrine_Cli_TestCase_EmptyCli extends Doctrine_Cli
+{
+}
+
+class Doctrine_Cli_TestCase_EmptyTask extends Doctrine_Task
+{
+    public function execute() {}
+}
+
+class Doctrine_Cli_TestCase_PassiveCli02 extends Doctrine_Cli_TestCase_PassiveCli
+{
+    public function _getTaskClassFromArgs(array $args)
+    {
+        return parent::_getTaskClassFromArgs($args);
+    }
+}
+
+class Doctrine_Cli_TestCase_Exception extends Exception
+{
+}
+
+class Doctrine_Cli_TestCase_NoisyCli extends Doctrine_Cli_TestCase_PassiveCli
+{
+    protected function _run(array $args)
+    {
+        throw new Doctrine_Cli_TestCase_Exception('Foo');
+    }
+}
+
+class Doctrine_Cli_TestCase_TestTask01 extends Doctrine_Task
+{
+    public function execute() {}
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/CustomDoctrineStyleTask.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/CustomDoctrineStyleTask.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/TaskDeclaredInAnIncFile.inc.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/TaskDeclaredInAnIncFile.inc.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/TestTask02.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/TestTask02.php
new file mode 100644
index 000000000..dd96e85b0
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/TestTask02.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Fixture for Doctrine_Cli_TestCase
+ * 
+ * @author Dan Bettles <danbettles@yahoo.co.uk>
+ */
+
+class Doctrine_Cli_TestCase_TestTask02 extends Doctrine_Task
+{
+    public function execute() {}
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/baz.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/baz.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/bip.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/bip.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/cli-default.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/cli-default.php
new file mode 100644
index 000000000..cf3e8f524
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/cli-default.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Script to test the output from Doctrine_Cli
+ *
+ * @author Dan Bettles <danbettles@yahoo.co.uk>
+ */
+
+require_once(dirname(dirname(dirname(__FILE__))) . '/lib/Doctrine/Core.php');
+spl_autoload_register(array('Doctrine_Core', 'autoload'));
+
+require_once(dirname(__FILE__) . '/TestTask02.php');
+
+$cli = new Doctrine_Cli();
+$cli->run($_SERVER['argv']);
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/cli-with-custom-tasks.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/cli-with-custom-tasks.php
new file mode 100644
index 000000000..ef081e51f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/cli-with-custom-tasks.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Script to test the output from Doctrine_Cli
+ *
+ * @author Dan Bettles <danbettles@yahoo.co.uk>
+ */
+
+require_once(dirname(dirname(dirname(__FILE__))) . '/lib/Doctrine/Core.php');
+spl_autoload_register(array('Doctrine_Core', 'autoload'));
+
+$cli = new Doctrine_Cli();
+
+require_once(dirname(__FILE__) . '/TestTask02.php');
+
+//Either...:
+$cli->registerTaskClass('Doctrine_Cli_TestCase_TestTask02');
+//...Or:
+$cli->registerIncludedTaskClasses();
+
+$cli->run($_SERVER['argv']);
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/cli-without-autoregistered-custom-tasks.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/cli-without-autoregistered-custom-tasks.php
new file mode 100644
index 000000000..f9b644f5a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/cli-without-autoregistered-custom-tasks.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Script to test the output from Doctrine_Cli
+ *
+ * @author Dan Bettles <danbettles@yahoo.co.uk>
+ */
+
+require_once(dirname(dirname(dirname(__FILE__))) . '/lib/Doctrine/Core.php');
+spl_autoload_register(array('Doctrine_Core', 'autoload'));
+
+require_once(dirname(__FILE__) . '/TestTask02.php');
+
+$cli = new Doctrine_Cli(array('autoregister_custom_tasks' => false));
+$cli->run($_SERVER['argv']);
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/doctrine.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/doctrine.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/foo.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/foo.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/testLoadtasksLoadsDoctrineStyleTasksFromTheSpecifiedDirectory/DoctrineStyleTask.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/testLoadtasksLoadsDoctrineStyleTasksFromTheSpecifiedDirectory/DoctrineStyleTask.php
new file mode 100644
index 000000000..1b2d3c82a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/testLoadtasksLoadsDoctrineStyleTasksFromTheSpecifiedDirectory/DoctrineStyleTask.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Fixture for Doctrine_Cli_TestCase
+ * 
+ * @author Dan Bettles <danbettles@yahoo.co.uk>
+ */
+
+class Doctrine_Task_DoctrineStyleTask extends Doctrine_Task
+{
+    public function execute() {}
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/testLoadtasksLoadsDoctrineStyleTasksFromTheSpecifiedDirectory/EmptyFile.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/testLoadtasksLoadsDoctrineStyleTasksFromTheSpecifiedDirectory/EmptyFile.php
new file mode 100644
index 000000000..4745fdf8b
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/testLoadtasksLoadsDoctrineStyleTasksFromTheSpecifiedDirectory/EmptyFile.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Fixture for Doctrine_Cli_TestCase
+ * 
+ * @author Dan Bettles <danbettles@yahoo.co.uk>
+ */
+
+//This empty file shouldn't cause any problems for the CLI
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/testLoadtasksLoadsDoctrineStyleTasksFromTheSpecifiedDirectory/InvalidClassNameForATask.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/testLoadtasksLoadsDoctrineStyleTasksFromTheSpecifiedDirectory/InvalidClassNameForATask.php
new file mode 100644
index 000000000..8cfdf6a00
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/testLoadtasksLoadsDoctrineStyleTasksFromTheSpecifiedDirectory/InvalidClassNameForATask.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Fixture for Doctrine_Cli_TestCase
+ * 
+ * @author Dan Bettles <danbettles@yahoo.co.uk>
+ */
+
+class Doctrine_Cli_TestCase_InvalidClassNameForATask extends Doctrine_Task
+{
+    public function execute() {}
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/testLoadtasksLoadsDoctrineStyleTasksFromTheSpecifiedDirectory/TaskDeclaredInAnIncFile.inc.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/testLoadtasksLoadsDoctrineStyleTasksFromTheSpecifiedDirectory/TaskDeclaredInAnIncFile.inc.php
new file mode 100644
index 000000000..732998629
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/testLoadtasksLoadsDoctrineStyleTasksFromTheSpecifiedDirectory/TaskDeclaredInAnIncFile.inc.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Fixture for Doctrine_Cli_TestCase
+ * 
+ * @author Dan Bettles <danbettles@yahoo.co.uk>
+ */
+
+class Doctrine_Task_TaskDeclaredInAnIncFile extends Doctrine_Task
+{
+    public function execute() {}
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/testLoadtasksLoadsDoctrineStyleTasksFromTheSpecifiedDirectory/should-be-ignored.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/testLoadtasksLoadsDoctrineStyleTasksFromTheSpecifiedDirectory/should-be-ignored.php
new file mode 100644
index 000000000..25dbd23b1
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CliTestCase/testLoadtasksLoadsDoctrineStyleTasksFromTheSpecifiedDirectory/should-be-ignored.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Fixture for Doctrine_Cli_TestCase
+ * 
+ * @author Dan Bettles <danbettles@yahoo.co.uk>
+ */
+
+This file should be ignored because its filename starts with a lowercase letter.  You shouldn't, therefore, see any
+syntax errors when running Doctrine_Cli_TestCase.
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Collection/SnapshotTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Collection/SnapshotTestCase.php
new file mode 100644
index 000000000..0605cd576
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Collection/SnapshotTestCase.php
@@ -0,0 +1,143 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Collection_Snapshot_TestCase
+ *
+ * This test case is used for testing the snapshot functionality
+ * of the Doctrine_Collection
+ *
+ * Snapshots are used for counting the diff between original and changed 
+ * state of the collection.
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Collection_Snapshot_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables = array('Entity', 'User', 'Group', 'GroupUser', 'Account', 'Album', 'Phonenumber', 'Email', 'Book');
+        
+        parent::prepareTables();
+    }
+
+    public function testDiffForSimpleCollection()
+    {
+        $q = Doctrine_Query::create()->from('User u')->orderby('u.id');
+
+        $coll = $q->execute();
+        $this->assertEqual($coll->count(), 8);
+
+        unset($coll[0]);
+        unset($coll[1]);
+
+        $coll[]->name = 'new user';
+
+        $this->assertEqual($coll->count(), 7);
+        $this->assertEqual(count($coll->getSnapshot()), 8);
+
+        $count = $this->conn->count();
+
+        $coll->save();
+
+        $this->connection->clear();
+        $coll = Doctrine_Query::create()->from('User u')->execute();
+        $this->assertEqual($coll->count(), 7);
+    }
+
+    public function testDiffForOneToManyRelatedCollection()
+    {
+        $q = new Doctrine_Query();
+        $q->from('User u LEFT JOIN u.Phonenumber p')
+             ->where('u.id = 8');
+
+        $coll = $q->execute();
+
+        $this->assertEqual($coll->count(), 1);
+
+        $this->assertEqual($coll[0]->Phonenumber->count(), 3);
+        $this->assertTrue($coll[0]->Phonenumber instanceof Doctrine_Collection);
+
+        unset($coll[0]->Phonenumber[0]);
+        $coll[0]->Phonenumber->remove(2);
+
+        $this->assertEqual(count($coll[0]->Phonenumber->getSnapshot()), 3);
+        $coll[0]->save();
+
+        $this->assertEqual($coll[0]->Phonenumber->count(), 1);
+
+        $this->connection->clear();
+
+        $q = new Doctrine_Query();
+        $q = Doctrine_Query::create()->from('User u LEFT JOIN u.Phonenumber p')->where('u.id = 8');
+
+        $coll = $q->execute();
+
+        $this->assertEqual($coll[0]->Phonenumber->count(), 1);
+
+    }
+
+    public function testDiffForManyToManyRelatedCollection()
+    {
+        $user = new User();
+        $user->name = 'zYne';
+        $user->Group[0]->name = 'PHP';
+        $user->Group[1]->name = 'Web';
+        $user->save();
+
+        $this->connection->clear();
+
+        $users = Doctrine_Query::create()->from('User u LEFT JOIN u.Group g')
+                 ->where('u.id = ' . $user->id)->execute();
+
+        $this->assertEqual($users[0]->Group[0]->name, 'PHP');
+        $this->assertEqual($users[0]->Group[1]->name, 'Web');
+        $this->assertEqual(count($user->Group->getSnapshot()), 2);
+        unset($user->Group[0]);
+
+        $user->save();
+        $this->assertEqual(count($user->Group), 1);
+
+        $this->assertEqual(count($user->Group->getSnapshot()), 1);
+        unset($user->Group[1]);
+        $this->assertEqual(count($user->Group->getSnapshot()), 1);
+        
+        $count = count($this->conn);
+        $user->save();
+
+        $this->assertEqual(count($user->Group->getSnapshot()), 0);
+        
+        $this->conn->clear();
+
+        $users = Doctrine_Query::create()->from('User u LEFT JOIN u.Group g')
+                 ->where('u.id = ' . $user->id)->execute();
+        
+        $this->assertEqual(count($user->Group), 0);
+
+    }
+
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CollectionOffsetTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CollectionOffsetTestCase.php
new file mode 100644
index 000000000..c3a509080
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CollectionOffsetTestCase.php
@@ -0,0 +1,76 @@
+<?php
+class Doctrine_Collection_Offset_TestCase extends Doctrine_UnitTestCase {
+    public function testExpand() {
+
+        $users = $this->connection->query("FROM User-o");
+        $this->assertTrue($users instanceof Doctrine_Collection_Offset);
+
+        $this->assertEqual(count($users), 5);
+        $users[5];
+
+        $this->assertEqual($users[5]->getState(), Doctrine_Record::STATE_CLEAN);
+        $users[5];
+
+        $this->connection->setAttribute(Doctrine_Core::ATTR_COLL_LIMIT, 3);
+
+        $users = $this->connection->query("FROM User-o");
+        $this->assertEqual(count($users), 3);
+        $this->assertEqual($users[0]->getState(), Doctrine_Record::STATE_CLEAN);
+        $this->assertEqual($users[1]->getState(), Doctrine_Record::STATE_CLEAN);
+        $this->assertEqual($users[2]->getState(), Doctrine_Record::STATE_CLEAN);
+        // indexes 0,1,2 in use
+
+        $users[7];
+        $this->assertEqual(count($users), 5);
+        $this->assertFalse($users->contains(3));
+        $this->assertFalse($users->contains(4));
+        $this->assertFalse($users->contains(5));
+        $this->assertTrue($users->contains(6));
+        $this->assertTrue($users->contains(7));
+
+        $this->assertEqual($users[6]->getState(), Doctrine_Record::STATE_CLEAN);
+        $this->assertEqual($users[7]->getState(), Doctrine_Record::STATE_CLEAN);
+
+
+        $users[5];
+        $this->assertEqual(count($users), 8);
+        $this->assertEqual($users[3]->getState(), Doctrine_Record::STATE_CLEAN);
+        $this->assertEqual($users[4]->getState(), Doctrine_Record::STATE_CLEAN);
+        $this->assertEqual($users[5]->getState(), Doctrine_Record::STATE_CLEAN);
+
+
+        $this->connection->setAttribute(Doctrine_Core::ATTR_COLL_LIMIT, 1);
+        $users = $this->connection->query("FROM User-b, User.Phonenumber-o WHERE User.".$this->objTable->getIdentifier()." = 5");
+
+        $this->assertEqual(count($users), 1);
+
+        $coll = $users[0]->Phonenumber;
+        $this->assertEqual(count($coll), 3);
+        $coll[1];
+
+        $this->assertEqual(count($coll), 3);
+        $this->assertEqual($coll[1]->phonenumber, "456 456");
+
+    }
+
+    public function testGetIterator() {
+        $this->connection->setAttribute(Doctrine_Core::ATTR_COLL_LIMIT, 4);
+        $coll = $this->connection->query("FROM User-o");
+
+        foreach($coll as $user) {
+        }
+        $this->assertEqual($coll->count(), 8);
+        $this->assertEqual($coll[3]->getState(), Doctrine_Record::STATE_CLEAN);
+        $this->assertEqual($coll[6]->getState(), Doctrine_Record::STATE_CLEAN);
+
+        $this->connection->setAttribute(Doctrine_Core::ATTR_COLL_LIMIT, 3);
+
+        $coll = $this->connection->query("FROM User-o");
+
+        foreach($coll as $user) {
+        }
+        $this->assertEqual($coll->count(), 8);
+        $this->assertEqual($coll[3]->getState(), Doctrine_Record::STATE_CLEAN);
+        $this->assertEqual($coll[6]->getState(), Doctrine_Record::STATE_CLEAN);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CollectionTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CollectionTestCase.php
new file mode 100644
index 000000000..9de8d0cdd
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CollectionTestCase.php
@@ -0,0 +1,341 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Collection_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Collection_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testLoadRelatedForAssociation() 
+    {
+        $coll = $this->connection->query('FROM User');
+
+        $this->assertEqual($coll->count(), 8);
+
+        $coll[0]->Group[1]->name = 'Actors House 2';
+
+        $coll[0]->Group[2]->name = 'Actors House 3';
+
+        $coll[2]->Group[0]->name = 'Actors House 4';
+        $coll[2]->Group[1]->name = 'Actors House 5';
+        $coll[2]->Group[2]->name = 'Actors House 6';
+        
+        $coll[5]->Group[0]->name = 'Actors House 7';
+        $coll[5]->Group[1]->name = 'Actors House 8';
+        $coll[5]->Group[2]->name = 'Actors House 9';
+        
+        $coll->save();
+        
+        $this->connection->clear();
+        
+        $coll = $this->connection->query('FROM User');
+
+        $this->assertEqual($coll->count(), 8);
+        $this->assertEqual($coll[0]->Group->count(), 2);
+        $this->assertEqual($coll[1]->Group->count(), 1);
+        $this->assertEqual($coll[2]->Group->count(), 3);
+        $this->assertEqual($coll[5]->Group->count(), 3);
+
+        $this->connection->clear();
+        
+        $coll = $this->connection->query('FROM User');
+
+        $this->assertEqual($coll->count(), 8);
+
+        $count = $this->connection->count();
+
+        $coll->loadRelated('Group');
+        $this->assertEqual(($count + 1), $this->connection->count());
+        $this->assertEqual($coll[0]->Group->count(), 2);
+        $this->assertEqual(($count + 1), $this->connection->count());
+        $this->assertEqual($coll[1]->Group->count(), 1);
+
+        $this->assertEqual(($count + 1), $this->connection->count());
+
+        $this->assertEqual($coll[2]->Group->count(), 3);
+
+        $this->assertEqual(($count + 1), $this->connection->count());
+        $this->assertEqual($coll[5]->Group->count(), 3);
+
+        $this->assertEqual(($count + 1), $this->connection->count());
+
+        $this->connection->clear();
+    }
+
+    public function testOffsetGetWithNullArgumentReturnsNewRecord() 
+    {
+        $coll = new Doctrine_Collection('User');
+        $this->assertEqual($coll->count(), 0);
+
+        $coll[]->name = 'zYne';
+
+        $this->assertEqual($coll->count(), 1);
+        $this->assertEqual($coll[0]->name, 'zYne');
+    }
+
+    public function testLoadRelatedForNormalAssociation() 
+    {
+        $resource = new Doctrine_Collection('Resource');
+        $resource[0]->name = 'resource 1';
+        $resource[0]->Type[0]->type = 'type 1';
+        $resource[0]->Type[1]->type = 'type 2';
+        $resource[1]->name = 'resource 2';
+        $resource[1]->Type[0]->type = 'type 3';
+        $resource[1]->Type[1]->type = 'type 4';
+
+        $resource->save();
+        
+        $this->connection->clear();
+
+        $resources = $this->connection->query('FROM Resource');
+
+        $count = $this->connection->count();
+        $resources->loadRelated('Type');
+
+        $this->assertEqual(($count + 1), $this->connection->count());
+        $this->assertEqual($resources[0]->name, 'resource 1');
+        $this->assertEqual($resource[0]->Type[0]->type, 'type 1');
+        $this->assertEqual($resource[0]->Type[1]->type, 'type 2');
+        $this->assertEqual(($count + 1), $this->connection->count());
+
+        $this->assertEqual($resource[1]->name, 'resource 2');
+        $this->assertEqual($resource[1]->Type[0]->type, 'type 3');
+        $this->assertEqual($resource[1]->Type[1]->type, 'type 4');
+        $this->assertEqual(($count + 1), $this->connection->count());
+    }
+    
+    public function testAdd() 
+    {
+        $coll = new Doctrine_Collection($this->objTable);
+        $coll->add(new User());
+        $this->assertEqual($coll->count(),1);
+        $coll->add(new User());
+        $this->assertTrue($coll->count(),2);
+
+        $this->assertEqual($coll->getKeys(), array(0,1));
+
+        $coll[2] = new User();
+
+        $this->assertTrue($coll->count(),3);
+        $this->assertEqual($coll->getKeys(), array(0,1,2));
+    }
+
+    public function testLoadRelated() 
+    {
+        $coll = $this->connection->query('FROM User u');
+
+        $q = $coll->loadRelated();
+
+        $this->assertTrue($q instanceof Doctrine_Query);
+        
+        $q->addFrom('User.Group g');
+
+        $this->assertEqual($q->getSqlQuery($coll->getPrimaryKeys()), 'SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id, e2.id AS e2__id, e2.name AS e2__name, e2.loginname AS e2__loginname, e2.password AS e2__password, e2.type AS e2__type, e2.created AS e2__created, e2.updated AS e2__updated, e2.email_id AS e2__email_id FROM entity e LEFT JOIN groupuser g ON (e.id = g.user_id) LEFT JOIN entity e2 ON e2.id = g.group_id AND e2.type = 1 WHERE (e.id IN (?, ?, ?, ?, ?, ?, ?, ?) AND (e.type = 0))');
+
+        $coll2 = $q->execute($coll->getPrimaryKeys());
+        $this->assertEqual($coll2->count(), $coll->count());
+
+        $count = $this->connection->count();
+        $coll[0]->Group[0];
+        $this->assertEqual($count, $this->connection->count());
+    }
+
+    public function testLoadRelatedForLocalKeyRelation() 
+    {
+        $coll = $this->connection->query('FROM User');
+
+        $this->assertEqual($coll->count(), 8);
+        
+        $count = $this->connection->count();
+        $coll->loadRelated('Email');
+
+        $this->assertEqual(($count + 1), $this->connection->count());
+
+        $this->assertEqual($coll[0]->Email->address, 'zYne@example.com');
+
+        $this->assertEqual(($count + 1), $this->connection->count());
+
+        $this->assertEqual($coll[2]->Email->address, 'caine@example.com');
+
+        $this->assertEqual($coll[3]->Email->address, 'kitano@example.com');
+
+        $this->assertEqual($coll[4]->Email->address, 'stallone@example.com');
+
+        $this->assertEqual(($count + 1), $this->connection->count());
+
+        $this->connection->clear();
+    }
+
+    public function testLoadRelatedForForeignKey() 
+    {
+        $coll = $this->connection->query("FROM User");
+        $this->assertEqual($coll->count(), 8);
+        
+        $count = $this->connection->count();
+        $coll->loadRelated("Phonenumber");
+
+        $this->assertEqual(($count + 1), $this->connection->count());
+
+        $this->assertEqual($coll[0]->Phonenumber[0]->phonenumber, "123 123");
+
+        $this->assertEqual(($count + 1), $this->connection->count());
+
+        $coll[0]->Phonenumber[1]->phonenumber;
+
+        $this->assertEqual(($count + 1), $this->connection->count());
+
+        $this->assertEqual($coll[4]->Phonenumber[0]->phonenumber, "111 555 333");
+        $this->assertEqual($coll[4]["Phonenumber"][1]->phonenumber, "123 213");
+        $this->assertEqual($coll[4]["Phonenumber"][2]->phonenumber, "444 555");
+
+        $this->assertEqual($coll[5]->Phonenumber[0]->phonenumber, "111 222 333");
+
+
+        $this->assertEqual($coll[6]->Phonenumber[0]->phonenumber, "111 222 333");
+        $this->assertEqual($coll[6]["Phonenumber"][1]->phonenumber, "222 123");
+        $this->assertEqual($coll[6]["Phonenumber"][2]->phonenumber, "123 456");
+        
+        $this->assertEqual(($count + 1), $this->connection->count());
+        
+        $this->connection->clear();
+    }
+
+    public function testCount() 
+    {
+        $coll = new Doctrine_Collection($this->connection->getTable('User'));
+        $this->assertEqual($coll->count(), 0);
+        $coll[0];
+        $this->assertEqual($coll->count(), 1);
+    }
+
+    public function testGenerator() 
+    {
+        $coll = new Doctrine_Collection($this->objTable);
+        $coll->setKeyColumn('name');
+
+        $user = new User();
+        $user->name = "name";
+        $coll->add($user);
+
+        $this->assertTrue($coll["name"] === $user);
+
+        $this->connection->getTable("email")->setAttribute(Doctrine_Core::ATTR_COLL_KEY,"address");
+        $emails = $this->connection->getTable("email")->findAll();
+        foreach($emails as $k => $v) {
+            $this->assertTrue(gettype($k), "string");
+        }
+
+    }
+
+    public function testFetchCollectionWithIdAsIndex() 
+    {
+        $user = new User();
+        $user->attribute(Doctrine_Core::ATTR_COLL_KEY, 'id');
+        
+        $users = $user->getTable()->findAll();
+        $this->assertFalse($users->contains(0));
+        $this->assertEqual($users->count(), 8);
+    }
+
+    public function testFetchCollectionWithNameAsIndex() 
+    {
+        $user = new User();
+        $user->attribute(Doctrine_Core::ATTR_COLL_KEY, 'name');
+        
+        $users = $user->getTable()->findAll();
+        $this->assertFalse($users->contains(0));
+        $this->assertEqual($users->count(), 8);
+    }
+
+    public function testFetchMultipleCollections() 
+    {
+        $this->connection->clear();
+        
+        $user = new User();
+        $user->attribute(Doctrine_Core::ATTR_COLL_KEY, 'id');
+        $phonenumber = new Phonenumber();
+        $phonenumber->attribute(Doctrine_Core::ATTR_COLL_KEY, 'id');
+
+
+        $q = new Doctrine_Query();
+        $users = $q->from('User u, u.Phonenumber p')->execute();
+        $this->assertFalse($users->contains(0));
+        $this->assertEqual($users->count(), 8);
+
+        $this->assertEqual($users[4]->name, 'zYne');
+
+        $this->assertEqual($users[4]->Phonenumber[0]->exists(), false);
+        $this->assertEqual($users[4]->Phonenumber[1]->exists(), false);
+    }
+
+    public function testCustomManagerCollectionClass()
+    {
+        $manager = Doctrine_Manager::getInstance();
+        $manager->setAttribute(Doctrine_Core::ATTR_COLLECTION_CLASS, 'MyCollection');
+
+        $user = new User();
+        $this->assertTrue($user->Phonenumber instanceof MyCollection);
+
+        $manager->setAttribute(Doctrine_Core::ATTR_COLLECTION_CLASS, 'Doctrine_Collection');
+    }
+
+    public function testCustomConnectionCollectionClass()
+    {
+        $conn = Doctrine_Core::getTable('Phonenumber')->getConnection();
+        $conn->setAttribute(Doctrine_Core::ATTR_COLLECTION_CLASS, 'MyConnectionCollection');
+
+        $user = new User();
+        $this->assertTrue($user->Phonenumber instanceof MyConnectionCollection);
+
+        $conn->unsetAttribute(Doctrine_Core::ATTR_COLLECTION_CLASS);
+    }
+
+    public function testCustomTableCollectionClass()
+    {
+        $userTable = Doctrine_Core::getTable('Phonenumber');
+        $userTable->setAttribute(Doctrine_Core::ATTR_COLLECTION_CLASS, 'MyPhonenumberCollection');
+
+        $user = new User();
+        $this->assertTrue($user->Phonenumber instanceof MyPhonenumberCollection);
+
+        $userTable->unsetAttribute(Doctrine_Core::ATTR_COLLECTION_CLASS);
+    }
+}
+
+class MyCollection extends Doctrine_Collection
+{
+}
+
+class MyConnectionCollection extends MyCollection
+{
+}
+
+class MyPhonenumberCollection extends MyConnectionCollection
+{
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ColumnAggregationInheritanceTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ColumnAggregationInheritanceTestCase.php
new file mode 100644
index 000000000..c46d11008
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ColumnAggregationInheritanceTestCase.php
@@ -0,0 +1,83 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_ColumnAggregationInheritance_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @author      Bjarte Stien Karlsen <bjartka@pvv.ntnu.no> 
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_ColumnAggregationInheritance_TestCase extends Doctrine_UnitTestCase 
+{
+    protected $otherEntity = null;
+
+    public function prepareData()
+    {
+        parent::prepareData();
+        //we create a test entity that is not a user and not a group
+        $entity = new Entity();
+        $entity->name='Other Entity';
+        $entity->type = 2; 
+        $entity->save();
+        $this->otherEntity = $entity;
+    }
+
+    public function testQueriedClassReturnedIfNoSubclassMatch()
+    {
+        $q = new Doctrine_Query();
+        $entityOther = $q->from('Entity')->where('id = ?')->execute(array($this->otherEntity->id))->getFirst();
+        $this->assertTrue($entityOther instanceOf Entity);
+    }
+
+    public function testSubclassReturnedIfInheritanceMatches()
+    {
+        $q = new Doctrine_Query();
+        $group = $q->from('Entity')->where('id=?')->execute(array(1))->getFirst();
+        $this->assertTrue($group instanceOf Group);
+
+        $q = new Doctrine_Query();
+        $user = $q->from('Entity')->where('id=?')->execute(array(5))->getFirst();
+        $this->assertTrue($user instanceOf User);
+    }
+
+    public function testStringColumnInheritance()
+    {
+        $q = new Doctrine_Query();
+        $q->select('g.name')->from('Group g');
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e.name AS e__name FROM entity e WHERE (e.type = 1)");
+    }
+
+    public function testSubclassFieldSetWhenCreatingNewSubclassedRecord()
+    {
+        $child = new User();
+        $child->name = 'Pedro';
+        $this->assertTrue(isset($child->type));
+
+        $child->save();
+        $this->assertEqual($child->type, '0');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ColumnAliasTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ColumnAliasTestCase.php
new file mode 100644
index 000000000..edaf526c4
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ColumnAliasTestCase.php
@@ -0,0 +1,155 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_ColumnAlias_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_ColumnAlias_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData() 
+    {
+        $book1 = new Book();
+        $book1->name = 'Das Boot';
+        $book1->save();
+        
+        $record1 = new ColumnAliasTest();
+        $record1->alias1 = 'first';
+        $record1->alias2 = 123;
+        $record1->anotherField = 'camelCase';
+        $record1->bookId = $book1->id;
+        $record1->save();
+        
+        $record2 = new ColumnAliasTest();
+        $record2->alias1 = 'one';
+        $record2->alias2 = 456;
+        $record2->anotherField = 'KoQ';
+        $record2->save();
+        
+        $record2->anotherField = 'foo';
+    }
+    
+    public function prepareTables()
+    { 
+        $this->tables = array('ColumnAliasTest', 'Book');
+        
+        parent::prepareTables();
+    }
+
+    public function testAliasesAreSupportedForJoins()
+    {
+        $q = new Doctrine_Query();
+        $q->select('c.*, b.name')->from('ColumnAliasTest c')
+                ->innerJoin('c.book b')
+                ->where('c.anotherField = ?', 'camelCase');
+        $result = $q->execute();
+        $this->assertTrue(isset($result[0]->book));
+        $this->assertEqual($result[0]->book->name, 'Das Boot');
+    }
+    
+    public function testAliasesAreSupportedForArrayFetching()
+    {
+        $q = new Doctrine_Query();
+        $q->select('c.*, b.name')->from('ColumnAliasTest c')
+                ->innerJoin('c.book b')
+                ->where('c.anotherField = ?', 'camelCase')
+                ->setHydrationMode(Doctrine_Core::HYDRATE_ARRAY);
+        $result = $q->execute();
+        $this->assertEqual($result[0]['alias1'], 'first');
+        $this->assertEqual($result[0]['alias2'], 123);
+        $this->assertEqual($result[0]['anotherField'], 'camelCase');
+        $this->assertTrue(isset($result[0]['book']));
+        $this->assertEqual($result[0]['book']['name'], 'Das Boot');
+    }
+
+    public function testAliasesAreSupportedForRecordPropertyAccessors()
+    {
+        $record = new ColumnAliasTest;
+        try {
+            $record->alias1 = 'someone';
+            $record->alias2 = 187;
+            
+            $this->assertEqual($record->alias1, 'someone');
+            $this->assertEqual($record->alias2, 187);
+        } catch (Doctrine_Record_Exception $e) {
+            $this->fail();
+        }
+    }
+    
+    public function testAliasesAreSupportedForDqlSelectPart()
+    {
+        $q = new Doctrine_Query();
+        $q->select('c.alias1, c.alias2, c.anotherField')->from('ColumnAliasTest c');
+        $coll = $q->execute();
+
+        $this->assertEqual($coll[0]->alias1, 'first');
+        $this->assertEqual($coll[0]->alias2, 123);
+        $this->assertEqual($coll[0]->anotherField, 'camelCase');
+    }
+    
+    public function testAliasesAreSupportedForDqlWherePart()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('c.alias1, c.alias2, c.anotherField')
+          ->from('ColumnAliasTest c')
+          ->where('c.anotherField = ?');
+
+        $coll = $q->execute(array('KoQ'));
+
+        $this->assertEqual($coll[0]->alias1, 'one');
+        $this->assertEqual($coll[0]->alias2, 456);
+        $this->assertEqual($coll[0]->anotherField, 'KoQ');
+    }
+    
+    public function testAliasesAreSupportedForDqlAggregateFunctions()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('MAX(c.alias2)')->from('ColumnAliasTest c');
+
+        $coll = $q->execute();
+
+        $this->assertEqual($coll[0]->MAX, 456);
+    }
+    
+    public function testAliasesAreSupportedForDqlHavingPart()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('c.alias2')
+          ->from('ColumnAliasTest c')
+          ->groupby('c.id')
+          ->having('c.alias2 > 123');
+
+        $coll = $q->execute();
+        
+        $this->assertEqual($coll[0]->alias2, 456);
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CompositePrimaryKeyTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CompositePrimaryKeyTestCase.php
new file mode 100644
index 000000000..075a0f220
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CompositePrimaryKeyTestCase.php
@@ -0,0 +1,13 @@
+<?php
+class Doctrine_Composite_PrimaryKey_TestCase extends Doctrine_UnitTestCase {
+    public function prepareData() { }
+
+    public function prepareTables() { 
+        $this->tables = array();
+        $this->tables[] = "CPK_Test";
+        $this->tables[] = "CPK_Test2";
+        $this->tables[] = "CPK_Association";
+        
+        parent::prepareTables();
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ConcreteInheritanceTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ConcreteInheritanceTestCase.php
new file mode 100644
index 000000000..b4ca5dc23
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ConcreteInheritanceTestCase.php
@@ -0,0 +1,64 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_ConcreteInheritance_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_ConcreteInheritance_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        
+    }
+}
+
+class ConcreteMain extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+}
+
+class ConcreteParent extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+}
+
+class ConcreteChild extends ConcreteParent
+{
+    public function setTableDefinition()
+    {
+        parent::setTableDefinition();
+        $this->hasColumn('child_column', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ConfigurableTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ConfigurableTestCase.php
new file mode 100644
index 000000000..4ace013b6
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ConfigurableTestCase.php
@@ -0,0 +1,222 @@
+<?php
+class Doctrine_Configurable_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+
+    }
+
+    public function prepareData()
+    {
+
+    }
+
+    public function testGetIndexNameFormatAttribute()
+    {
+        // default index name format is %_idx
+        $this->assertEqual($this->manager->getAttribute(Doctrine_Core::ATTR_IDXNAME_FORMAT), '%s_idx');
+    }
+
+    public function testGetSequenceNameFormatAttribute()
+    {
+        // default sequence name format is %_seq
+        $this->assertEqual($this->manager->getAttribute(Doctrine_Core::ATTR_SEQNAME_FORMAT), '%s_seq');
+    }
+
+    public function testSetIndexNameFormatAttribute()
+    {
+        $original = $this->manager->getAttribute(Doctrine_Core::ATTR_IDXNAME_FORMAT);
+        $this->manager->setAttribute(Doctrine_Core::ATTR_IDXNAME_FORMAT, '%_index');
+
+        $this->assertEqual($this->manager->getAttribute(Doctrine_Core::ATTR_IDXNAME_FORMAT), '%_index');
+        $this->manager->setAttribute(Doctrine_Core::ATTR_IDXNAME_FORMAT, $original);
+    }
+
+    public function testSetSequenceNameFormatAttribute()
+    {
+        $original = $this->manager->getAttribute(Doctrine_Core::ATTR_SEQNAME_FORMAT);
+        $this->manager->setAttribute(Doctrine_Core::ATTR_SEQNAME_FORMAT, '%_sequence');
+
+        $this->assertEqual($this->manager->getAttribute(Doctrine_Core::ATTR_SEQNAME_FORMAT), '%_sequence');
+        $this->manager->setAttribute(Doctrine_Core::ATTR_SEQNAME_FORMAT, $original);
+    }
+
+    public function testExceptionIsThrownWhenSettingIndexNameFormatAttributeAtTableLevel()
+    {
+        try {
+            $this->connection->getTable('Entity')->setAttribute(Doctrine_Core::ATTR_IDXNAME_FORMAT, '%s_idx');
+            $this->fail();
+        } catch(Doctrine_Exception $e) {
+            $this->pass();
+        }
+    }
+
+    public function testExceptionIsThrownWhenSettingSequenceNameFormatAttributeAtTableLevel()
+    {
+        try {
+            $this->connection->getTable('Entity')->setAttribute(Doctrine_Core::ATTR_SEQNAME_FORMAT, '%s_seq');
+            $this->fail();
+        } catch(Doctrine_Exception $e) {
+            $this->pass();
+        }
+    }
+
+    public function testSettingFieldCaseIsSuccesfulWithZero()
+    {
+        $original = $this->connection->getAttribute(Doctrine_Core::ATTR_FIELD_CASE);
+        try {
+            $this->connection->setAttribute(Doctrine_Core::ATTR_FIELD_CASE, 0);
+            $this->pass();
+        } catch(Doctrine_Exception $e) {
+            $this->fail();
+        }
+        $this->connection->setAttribute(Doctrine_Core::ATTR_FIELD_CASE, $original);
+    }
+
+    public function testSettingFieldCaseIsSuccesfulWithCaseConstants()
+    {
+        $original = $this->connection->getAttribute(Doctrine_Core::ATTR_FIELD_CASE);
+        try {
+            $this->connection->setAttribute(Doctrine_Core::ATTR_FIELD_CASE, CASE_LOWER);
+            $this->pass();
+        } catch(Doctrine_Exception $e) {
+            $this->fail();
+        }
+        $this->connection->setAttribute(Doctrine_Core::ATTR_FIELD_CASE, $original);
+    }
+
+    public function testSettingFieldCaseIsSuccesfulWithCaseConstants2()
+    {
+        $original = $this->connection->getAttribute(Doctrine_Core::ATTR_FIELD_CASE);
+        try {
+            $this->connection->setAttribute(Doctrine_Core::ATTR_FIELD_CASE, CASE_UPPER);
+            $this->pass();
+        } catch(Doctrine_Exception $e) {
+            $this->fail();
+        }
+        $this->connection->setAttribute(Doctrine_Core::ATTR_FIELD_CASE, $original);
+    }
+
+    public function testExceptionIsThrownWhenSettingFieldCaseToNotZeroOneOrTwo()
+    {
+        try {
+            $this->connection->setAttribute(Doctrine_Core::ATTR_FIELD_CASE, -1);
+            $this->fail();
+        } catch(Doctrine_Exception $e) {
+            $this->pass();
+        }
+    }
+
+    public function testExceptionIsThrownWhenSettingFieldCaseToNotZeroOneOrTwo2()
+    {
+        try {
+            $this->connection->setAttribute(Doctrine_Core::ATTR_FIELD_CASE, 5);
+            $this->fail();
+        } catch(Doctrine_Exception $e) {
+            $this->pass();
+        }
+    }
+
+    public function testDefaultQuoteIdentifierAttributeValueIsFalse()
+    {
+        $this->assertEqual($this->manager->getAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER), false);
+    }
+
+    public function testQuoteIdentifierAttributeAcceptsBooleans()
+    {
+        $this->manager->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, true);
+
+        $this->assertEqual($this->manager->getAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER), true);
+        $this->manager->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, false);
+    }
+
+    public function testDefaultSequenceColumnNameAttributeValueIsId()
+    {
+        $this->assertEqual($this->manager->getAttribute(Doctrine_Core::ATTR_SEQCOL_NAME), 'id');
+    }
+
+    public function testSequenceColumnNameAttributeAcceptsStrings()
+    {
+        $original = $this->manager->getAttribute(Doctrine_Core::ATTR_SEQCOL_NAME);
+        $this->manager->setAttribute(Doctrine_Core::ATTR_SEQCOL_NAME, 'sequence');
+
+        $this->assertEqual($this->manager->getAttribute(Doctrine_Core::ATTR_SEQCOL_NAME), 'sequence');
+        $this->manager->setAttribute(Doctrine_Core::ATTR_SEQCOL_NAME, $original);
+    }
+
+    public function testValidatorAttributeAcceptsBooleans()
+    {
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, true);
+        
+        $this->assertEqual($this->manager->getAttribute(Doctrine_Core::ATTR_VALIDATE), true);
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, false);
+    }
+
+    public function testDefaultPortabilityAttributeValueIsAll()
+    {
+        $this->assertEqual($this->manager->getAttribute(Doctrine_Core::ATTR_PORTABILITY), Doctrine_Core::PORTABILITY_NONE);
+    }
+
+    public function testPortabilityAttributeAcceptsPortabilityConstants()
+    {
+        $this->manager->setAttribute(Doctrine_Core::ATTR_PORTABILITY, Doctrine_Core::PORTABILITY_RTRIM | Doctrine_Core::PORTABILITY_FIX_CASE);
+
+        $this->assertEqual($this->manager->getAttribute(Doctrine_Core::ATTR_PORTABILITY), 
+                           Doctrine_Core::PORTABILITY_RTRIM | Doctrine_Core::PORTABILITY_FIX_CASE);
+        $this->manager->setAttribute(Doctrine_Core::ATTR_PORTABILITY, Doctrine_Core::PORTABILITY_ALL);
+    }
+
+    public function testDefaultListenerIsDoctrineEventListener()
+    {
+        $this->assertTrue($this->manager->getAttribute(Doctrine_Core::ATTR_LISTENER) instanceof Doctrine_EventListener);                                                                     
+    }
+
+    public function testListenerAttributeAcceptsEventListenerObjects()
+    {
+        $original = $this->manager->getAttribute(Doctrine_Core::ATTR_LISTENER);
+        $this->manager->setAttribute(Doctrine_Core::ATTR_LISTENER, new Doctrine_EventListener());
+
+        $this->assertTrue($this->manager->getAttribute(Doctrine_Core::ATTR_LISTENER) instanceof Doctrine_EventListener);
+        $this->manager->setAttribute(Doctrine_Core::ATTR_LISTENER, $original);
+    }
+
+    public function testCollectionKeyAttributeAcceptsValidColumnName()
+    {
+        $original = $this->connection->getTable('User')->getAttribute(Doctrine_Core::ATTR_COLL_KEY);
+        try {
+            $this->connection->getTable('User')->setAttribute(Doctrine_Core::ATTR_COLL_KEY, 'name');
+            
+            $this->pass();
+        } catch(Exception $e) {
+            $this->fail();
+        }
+        $this->connection->getTable('User')->setAttribute(Doctrine_Core::ATTR_COLL_KEY, $original);
+    }
+
+    public function testSettingInvalidColumnNameToCollectionKeyAttributeThrowsException()
+    {
+        try {
+            $this->connection->getTable('User')->setAttribute(Doctrine_Core::ATTR_COLL_KEY, 'unknown');
+            
+            $this->fail();
+        } catch(Exception $e) {
+            $this->pass();
+        }
+    }
+
+    public function testSettingCollectionKeyAttributeOnOtherThanTableLevelThrowsException()
+    {
+        try {
+            $this->connection->setAttribute(Doctrine_Core::ATTR_COLL_KEY, 'name');
+            
+            $this->fail();
+        } catch(Exception $e) {
+            $this->pass();
+        }
+    }
+
+    public function testGetAttributes()
+    {
+        $this->assertTrue(is_array($this->manager->getAttributes()));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/CustomTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/CustomTestCase.php
new file mode 100644
index 000000000..badb87d77
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/CustomTestCase.php
@@ -0,0 +1,112 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Connection_Custom_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Connection_Custom_TestCase extends Doctrine_UnitTestCase 
+{
+    public function setUp()
+    {
+        $manager = Doctrine_Manager::getInstance();
+        $manager->registerConnectionDriver('test', 'Doctrine_Connection_Test');
+        $this->_conn = $manager->openConnection('test://username:password@localhost/dbname', false);
+        $this->_dbh = $this->_conn->getDbh();
+    }
+
+    public function testConnection()
+    {
+        $this->assertTrue($this->_conn instanceof Doctrine_Connection_Test);
+        $this->assertTrue($this->_dbh instanceof Doctrine_Adapter_Test);
+    }
+}
+
+class Doctrine_Connection_Test extends Doctrine_Connection_Common
+{
+    
+}
+
+class Doctrine_Adapter_Test implements Doctrine_Adapter_Interface
+{
+    public function __construct($dsn, $username, $password, $options)
+    {
+    }
+
+    public function prepare($prepareString)
+    {
+    }
+
+    public function query($queryString)
+    {
+    }
+
+    public function quote($input)
+    {
+    }
+
+    public function exec($statement)
+    {
+    }
+
+    public function lastInsertId()
+    {
+    }
+
+    public function beginTransaction()
+    {
+    }
+
+    public function commit()
+    {
+    }
+
+    public function rollBack()
+    {
+    }
+
+    public function errorCode()
+    {
+    }
+
+    public function errorInfo()
+    {
+    }
+
+    public function getAttribute($attribute)
+    {
+    }
+
+    public function setAttribute($attribute, $value)
+    {
+    }
+
+    public function sqliteCreateFunction()
+    {
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/MssqlTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/MssqlTestCase.php
new file mode 100644
index 000000000..c17571f11
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/MssqlTestCase.php
@@ -0,0 +1,124 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Connection_Mssql_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Connection_Mssql_TestCase extends Doctrine_UnitTestCase
+{
+    public function testAlreadyExistsErrorIsSupported() {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 2714, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_ALREADY_EXISTS);
+    }
+
+    public function testAlreadyExistsErrorIsSupported2()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 1913, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_ALREADY_EXISTS);
+    }
+
+    public function testValueCountOnRowErrorIsSupported()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 110, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_VALUE_COUNT_ON_ROW);
+    }
+
+    public function testNoSuchFieldErrorIsSupported()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 155, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOSUCHFIELD);
+    }
+
+    public function testNoSuchFieldErrorIsSupported2()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 207, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOSUCHFIELD);
+    }
+
+    public function testNoSuchTableErrorIsSupported()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 208, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOSUCHTABLE);
+    }
+
+    public function testNoSuchTableErrorIsSupported2()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 3701, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOSUCHTABLE);
+    }
+
+    public function testSyntaxErrorIsSupported()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 170, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_SYNTAX);
+    }
+
+    public function testInvalidNumberErrorIsSupported()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 245, '')));
+
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_INVALID_NUMBER);
+    }
+
+    public function testNotNullConstraintErrorIsSupported()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 515, '')));
+
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_CONSTRAINT_NOT_NULL);
+    }
+
+    public function testConstraintErrorIsSupported()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 547, '')));
+
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_CONSTRAINT);
+    }
+
+    public function testConstraintErrorIsSupported2()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 2627, '')));
+
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_CONSTRAINT);
+    }
+
+    public function testDivZeroErrorIsSupported()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 8134, '')));
+
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_DIVZERO);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/MysqlTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/MysqlTestCase.php
new file mode 100644
index 000000000..df42d32a2
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/MysqlTestCase.php
@@ -0,0 +1,201 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Connection_Mysql_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Connection_Mysql_TestCase extends Doctrine_UnitTestCase
+{
+    public function testQuoteIdentifier()
+    {
+        $id = $this->connection->quoteIdentifier('identifier', false);
+        $this->assertEqual($id, '`identifier`');
+    }
+
+    public function testNotLockedErrorIsSupported()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 1100, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOT_LOCKED);
+    }
+
+    public function testNotFoundErrorIsSupported()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 1091, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOT_FOUND);
+    }
+
+    public function testSyntaxErrorIsSupported()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 1064, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_SYNTAX);
+    }
+
+    public function testNoSuchDbErrorIsSupported()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 1049, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOSUCHDB);
+    }
+
+    public function testNoSuchFieldErrorIsSupported()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 1054, '')));
+
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOSUCHFIELD);
+    }
+
+    public function testNoSuchTableErrorIsSupported()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 1051, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOSUCHTABLE);
+    }
+
+    public function testNoSuchTableErrorIsSupported2()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 1146, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOSUCHTABLE);
+    }
+
+    public function testConstraintErrorIsSupported()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 1048, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_CONSTRAINT);
+    }
+
+    public function testConstraintErrorIsSupported2()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 1216, '')));
+
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_CONSTRAINT);
+    }
+
+    public function testConstraintErrorIsSupported3()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 1217, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_CONSTRAINT);
+    }
+
+    public function testNoDbSelectedErrorIsSupported()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 1046, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NODBSELECTED);
+    }
+
+    public function testAccessViolationErrorIsSupported()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 1142, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_ACCESS_VIOLATION);
+    }
+
+    public function testAccessViolationErrorIsSupported2()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 1044, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_ACCESS_VIOLATION);
+    }
+
+    public function testCannotDropErrorIsSupported()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 1008, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_CANNOT_DROP);
+    }
+
+    public function testCannotCreateErrorIsSupported()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 1004, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_CANNOT_CREATE);
+    }
+
+    public function testCannotCreateErrorIsSupported2()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 1005, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_CANNOT_CREATE);
+    }
+
+    public function testCannotCreateErrorIsSupported3()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 1006, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_CANNOT_CREATE);
+    }
+
+    public function testAlreadyExistsErrorIsSupported()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 1007, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_ALREADY_EXISTS);
+    }
+
+    public function testAlreadyExistsErrorIsSupported2()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 1022, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_ALREADY_EXISTS);
+    }
+
+    public function testAlreadyExistsErrorIsSupported3()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 1050, '')));
+
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_ALREADY_EXISTS);
+    }
+
+    public function testAlreadyExistsErrorIsSupported4()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 1061, '')));
+
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_ALREADY_EXISTS);
+    }
+
+    public function testAlreadyExistsErrorIsSupported5()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 1062, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_ALREADY_EXISTS);
+    }
+
+    public function testValueCountOnRowErrorIsSupported()
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 1136, '')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_VALUE_COUNT_ON_ROW);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/OracleTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/OracleTestCase.php
new file mode 100644
index 000000000..73f547c2a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/OracleTestCase.php
@@ -0,0 +1,160 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Connection_Oracle_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Connection_Oracle_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testNoSuchTableErrorIsSupported()
+    {
+        $this->exc->processErrorInfo(array(0, 942, ''));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOSUCHTABLE);
+    }
+
+    public function testSyntaxErrorIsSupported()
+    {
+        $this->exc->processErrorInfo(array(0, 900, ''));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_SYNTAX);
+    }
+
+    public function testSyntaxErrorIsSupported2()
+    {
+        $this->exc->processErrorInfo(array(0, 921, ''));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_SYNTAX);
+    }
+
+    public function testSyntaxErrorIsSupported3()
+    {
+        $this->exc->processErrorInfo(array(0, 923, ''));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_SYNTAX);
+    }
+
+    public function testNoSuchFieldErrorIsSupported()
+    {
+        $this->exc->processErrorInfo(array(0, 904, ''));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOSUCHFIELD);
+    }
+
+    public function testConstraintErrorIsSupported()
+    {
+        $this->exc->processErrorInfo(array(0, 1, ''));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_CONSTRAINT);
+    }
+
+    public function testConstraintErrorIsSupported2()
+    {
+        $this->exc->processErrorInfo(array(0, 2291, ''));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_CONSTRAINT);
+    }
+
+    public function testConstraintErrorIsSupported3()
+    {
+        $this->exc->processErrorInfo(array(0, 2449, ''));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_CONSTRAINT);
+    }
+
+    public function testConstraintErrorIsSupported4()
+    {
+        $this->exc->processErrorInfo(array(0, 2292, ''));
+
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_CONSTRAINT);
+    }
+
+    public function testNoSuchTableErrorIsSupported4()
+    {
+        $this->exc->processErrorInfo(array(0, 2289, ''));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOSUCHTABLE);
+    }
+
+    public function testInvalidNumberErrorIsSupported()
+    {
+        $this->exc->processErrorInfo(array(0, 1722, ''));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_INVALID_NUMBER);
+    }
+
+    public function testDivZeroErrorIsSupported1()
+    {
+        $this->exc->processErrorInfo(array(0, 1476, ''));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_DIVZERO);
+    }
+
+    public function testNotFoundErrorIsSupported()
+    {
+        $this->exc->processErrorInfo(array(0, 1418, ''));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOT_FOUND);
+    }
+
+    public function testNotNullConstraintErrorIsSupported()
+    {
+        $this->exc->processErrorInfo(array(0, 1400, ''));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_CONSTRAINT_NOT_NULL);
+    }
+
+    public function testNotNullConstraintErrorIsSupported2()
+    {
+        $this->exc->processErrorInfo(array(0, 1407, ''));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_CONSTRAINT_NOT_NULL);
+    }
+
+    public function testInvalidErrorIsSupported()
+    {
+        $this->exc->processErrorInfo(array(0, 1401, ''));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_INVALID);
+    }
+
+    public function testAlreadyExistsErrorIsSupported()
+    {
+        $this->exc->processErrorInfo(array(0, 955, ''));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_ALREADY_EXISTS);
+    }
+    
+    public function testValueCountOnRowErrorIsSupported()
+    {
+        $this->exc->processErrorInfo(array(0, 913, ''));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_VALUE_COUNT_ON_ROW);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/PgsqlTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/PgsqlTestCase.php
new file mode 100644
index 000000000..63411a0f3
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/PgsqlTestCase.php
@@ -0,0 +1,217 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Connection_Pgsql_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Connection_Pgsql_TestCase extends Doctrine_UnitTestCase 
+{
+
+    public function testNoSuchTableErrorIsSupported() 
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 0, 'table test does not exist')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOSUCHTABLE);
+    }
+
+    public function testNoSuchTableErrorIsSupported2() 
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 0, 'relation does not exist')));
+
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOSUCHTABLE);
+    }
+
+    public function testNoSuchTableErrorIsSupported3() 
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 0, 'sequence does not exist')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOSUCHTABLE);
+    }
+
+    public function testNoSuchTableErrorIsSupported4() 
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 0, 'class xx not found')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOSUCHTABLE);
+    }
+
+    public function testSyntaxErrorIsSupported() 
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 0, 'parser: parse error at or near')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_SYNTAX);
+    }
+
+    public function testSyntaxErrorIsSupported2() 
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 0, 'syntax error at')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_SYNTAX);
+    }
+
+    public function testSyntaxErrorIsSupported3() 
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 0, 'column reference r.r is ambiguous')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_SYNTAX);
+    }
+
+    public function testInvalidNumberErrorIsSupported() 
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 0, 'pg_atoi: error in somewhere: can\'t parse ')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_INVALID_NUMBER);
+    }
+
+    public function testInvalidNumberErrorIsSupported2() 
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 0, 'value unknown is out of range for type bigint')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_INVALID_NUMBER);
+    }
+
+    public function testInvalidNumberErrorIsSupported3() 
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 0, 'integer out of range')));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_INVALID_NUMBER);
+    }
+
+    public function testInvalidNumberErrorIsSupported4() 
+    {
+        $this->assertTrue($this->exc->processErrorInfo(array(0, 0, 'invalid input syntax for type integer')));
+
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_INVALID_NUMBER);
+    }
+
+    public function testNoSuchFieldErrorIsSupported() 
+    {
+        $this->exc->processErrorInfo(array(0, 0, 'column name (of relation xx) does not exist'));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOSUCHFIELD);
+    }
+
+    public function testNoSuchFieldErrorIsSupported2() 
+    {
+        $this->exc->processErrorInfo(array(0, 0, 'attribute xx not found'));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOSUCHFIELD);
+    }
+
+    public function testNoSuchFieldErrorIsSupported3() 
+    {
+        $this->exc->processErrorInfo(array(0, 0, 'relation xx does not have attribute'));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOSUCHFIELD);
+    }
+
+    public function testNoSuchFieldErrorIsSupported4() 
+    {
+        $this->exc->processErrorInfo(array(0, 0, 'column xx specified in USING clause does not exist in left table'));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOSUCHFIELD);
+    }
+
+    public function testNoSuchFieldErrorIsSupported5() 
+    {
+        $this->exc->processErrorInfo(array(0, 0, 'column xx specified in USING clause does not exist in right table'));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOSUCHFIELD);
+    }
+
+    public function testNotFoundErrorIsSupported() 
+    {
+        $this->exc->processErrorInfo(array(0, 0, 'index xx does not exist/'));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOT_FOUND);
+    }
+    
+    public function testNotNullConstraintErrorIsSupported() 
+    {
+        $this->exc->processErrorInfo(array(0, 0, 'violates not-null constraint'));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_CONSTRAINT_NOT_NULL);
+    }
+
+    public function testConstraintErrorIsSupported() 
+    {
+        $this->exc->processErrorInfo(array(0, 0, 'referential integrity violation'));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_CONSTRAINT);
+    }
+
+    public function testConstraintErrorIsSupported2() 
+    {
+        $this->exc->processErrorInfo(array(0, 0, 'violates xx constraint'));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_CONSTRAINT);
+    }
+
+    public function testInvalidErrorIsSupported()
+    {
+        $this->exc->processErrorInfo(array(0, 0, 'value too long for type character'));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_INVALID);
+    }
+
+    public function testAlreadyExistsErrorIsSupported() 
+    {
+        $this->exc->processErrorInfo(array(0, 0, 'relation xx already exists'));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_ALREADY_EXISTS);
+    }
+
+    public function testDivZeroErrorIsSupported() 
+    {
+        $this->exc->processErrorInfo(array(0, 0, 'division by zero'));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_DIVZERO);
+    }
+
+    public function testDivZeroErrorIsSupported2() 
+    {
+        $this->exc->processErrorInfo(array(0, 0, 'divide by zero'));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_DIVZERO);
+    }
+
+    public function testAccessViolationErrorIsSupported()
+    {
+        $this->exc->processErrorInfo(array(0, 0, 'permission denied'));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_ACCESS_VIOLATION);
+    }
+    
+    public function testValueCountOnRowErrorIsSupported() 
+    {
+        $this->exc->processErrorInfo(array(0, 0, 'more expressions than target columns'));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_VALUE_COUNT_ON_ROW);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/ProfilerTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/ProfilerTestCase.php
new file mode 100644
index 000000000..03d70ec13
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/ProfilerTestCase.php
@@ -0,0 +1,183 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Connection_Profiler_TestCase
+ *
+ * @package     Doctrine
+ * @subpackage  Doctrine_Db
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Connection_Profiler_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {}
+    public function prepareData() 
+    {}
+    public function setUp() 
+    {}
+
+    public function testQuery() 
+    {
+        $this->conn = Doctrine_Manager::getInstance()->openConnection(array('sqlite::memory:'));
+
+        $this->profiler = new Doctrine_Connection_Profiler();
+
+        $this->conn->setListener($this->profiler);
+
+        $this->conn->exec('CREATE TABLE test (id INT)');
+        
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), 'CREATE TABLE test (id INT)');
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getCode(), Doctrine_Event::CONN_EXEC);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+        
+        $this->assertEqual($this->conn->count(), 1);
+    }
+
+    public function testPrepareAndExecute()
+    {
+
+        $stmt  = $this->conn->prepare('INSERT INTO test (id) VALUES (?)');
+        $event = $this->profiler->lastEvent();
+
+        $this->assertEqual($event->getQuery(), 'INSERT INTO test (id) VALUES (?)');
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getCode(), Doctrine_Event::CONN_PREPARE);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+
+        $stmt->execute(array(1));
+
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), 'INSERT INTO test (id) VALUES (?)');
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getCode(), Doctrine_Event::STMT_EXECUTE);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+
+        $this->assertEqual($this->conn->count(), 2);
+    }
+
+    public function testMultiplePrepareAndExecute()
+    {
+
+        $stmt = $this->conn->prepare('INSERT INTO test (id) VALUES (?)');
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), 'INSERT INTO test (id) VALUES (?)');
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getCode(), Doctrine_Event::CONN_PREPARE);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+
+        $stmt2 = $this->conn->prepare('INSERT INTO test (id) VALUES (?)');
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), 'INSERT INTO test (id) VALUES (?)');
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getCode(), Doctrine_Event::CONN_PREPARE);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+         /** TODO: strange errors here
+        $stmt->execute(array(1));
+        $stmt2->execute(array(1));
+
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), 'INSERT INTO test (id) VALUES (?)');
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getCode(), Doctrine_Event::EXECUTE);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+
+        $this->assertEqual($this->conn->count(), 4);
+        */
+    }
+    
+    public function testExecuteStatementMultipleTimes() 
+    {
+        try {
+            $stmt = $this->conn->prepare('INSERT INTO test (id) VALUES (?)');
+            $stmt->execute(array(1));
+            $stmt->execute(array(1));
+            $this->pass();
+        } catch(Doctrine_Db_Exception $e) {
+
+            $this->fail($e->__toString());
+        }
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), 'INSERT INTO test (id) VALUES (?)');
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getCode(), Doctrine_Event::STMT_EXECUTE);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), 'INSERT INTO test (id) VALUES (?)');
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getCode(), Doctrine_Event::STMT_EXECUTE);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+    }
+
+    public function testTransactionRollback() 
+    {
+        try {
+            $this->conn->beginTransaction();
+            $this->pass();
+        } catch(Doctrine_Db_Exception $e) {
+            $this->fail($e->__toString());
+        }
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), null);
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getCode(), Doctrine_Event::TX_BEGIN);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+        
+        try {
+            $this->conn->rollback();
+            $this->pass();
+        } catch(Doctrine_Db_Exception $e) {
+            $this->fail($e->__toString());
+        }
+
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), null);
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getCode(), Doctrine_Event::TX_ROLLBACK);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+    }
+
+    public function testTransactionCommit() 
+    {
+        try {
+            $this->conn->beginTransaction();
+            $this->pass();
+        } catch(Doctrine_Db_Exception $e) {
+            $this->fail($e->__toString());
+        }
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), null);
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getCode(), Doctrine_Event::TX_BEGIN);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+        
+        try {
+            $this->conn->commit();
+            $this->pass();
+        } catch(Doctrine_Db_Exception $e) {
+            $this->fail($e->__toString());
+            $this->conn->rollback();
+        }
+
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), null);
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getCode(), Doctrine_Event::TX_COMMIT);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/SqliteTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/SqliteTestCase.php
new file mode 100644
index 000000000..6e3eec3f0
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/SqliteTestCase.php
@@ -0,0 +1,111 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Connection_Sqlite_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Connection_Sqlite_TestCase extends Doctrine_UnitTestCase
+{
+    public function testNoSuchTableErrorIsSupported()
+    {
+        $this->exc->processErrorInfo(array(0,0, 'no such table: test1'));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOSUCHTABLE);
+    }
+
+    public function testNoSuchIndexErrorIsSupported()
+    {
+        $this->exc->processErrorInfo(array(0,0, 'no such index: test1'));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOT_FOUND);
+    }
+
+    public function testUniquePrimaryKeyErrorIsSupported()
+    {
+        $this->exc->processErrorInfo(array(0,0, 'PRIMARY KEY must be unique'));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_CONSTRAINT);
+    }
+
+    public function testIsNotUniqueErrorIsSupported()
+    {
+        $this->exc->processErrorInfo(array(0,0, 'is not unique'));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_CONSTRAINT);
+    }
+
+    public function testColumnsNotUniqueErrorIsSupported()
+    {
+        $this->exc->processErrorInfo(array(0,0, 'columns name, id are not unique'));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_CONSTRAINT);
+    }
+
+    public function testUniquenessConstraintErrorIsSupported()
+    {
+        $this->exc->processErrorInfo(array(0,0, 'uniqueness constraint failed'));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_CONSTRAINT);
+    }
+
+    public function testNotNullConstraintErrorIsSupported()
+    {
+        $this->exc->processErrorInfo(array(0,0, 'may not be NULL'));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_CONSTRAINT_NOT_NULL);
+    }
+
+    public function testNoSuchFieldErrorIsSupported()
+    {
+        $this->exc->processErrorInfo(array(0,0, 'no such column: column1'));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOSUCHFIELD);
+    }
+
+    public function testColumnNotPresentInTablesErrorIsSupported2()
+    {
+        $this->exc->processErrorInfo(array(0,0, 'column not present in both tables'));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_NOSUCHFIELD);
+    }
+
+    public function testNearSyntaxErrorIsSupported()
+    {
+        $this->exc->processErrorInfo(array(0,0, "near \"SELECT FROM\": syntax error"));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_SYNTAX);
+    }
+
+    public function testValueCountOnRowErrorIsSupported()
+    {
+        $this->exc->processErrorInfo(array(0,0, '3 values for 2 columns'));
+        
+        $this->assertEqual($this->exc->getPortableCode(), Doctrine_Core::ERR_VALUE_COUNT_ON_ROW);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/UnitOfWork.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/UnitOfWork.php
new file mode 100644
index 000000000..f368447a6
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Connection/UnitOfWork.php
@@ -0,0 +1,213 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Connection_UnitOfWork_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Connection_UnitOfWork_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testFlush() 
+    {
+        $user = $this->connection->getTable('User')->find(4);
+        $this->assertTrue(is_numeric($user->Phonenumber[0]->entity_id));
+
+        $user    = $this->connection->create('Email');
+        $user    = $this->connection->create('User');
+        $record  = $this->connection->create('Phonenumber');
+
+        $user->Email->address = 'example@drinkmore.info';
+        $this->assertTrue($user->email_id instanceof Email);
+
+        $user->name = 'Example user';
+        $user->Group[0]->name = 'Example group 1';
+        $user->Group[1]->name = 'Example group 2';
+
+        $user->Phonenumber[0]->phonenumber = '123 123';
+
+        $user->Phonenumber[1]->phonenumber = '321 2132';
+        $user->Phonenumber[2]->phonenumber = '123 123';
+        $user->Phonenumber[3]->phonenumber = '321 2132';
+
+
+
+        $this->assertTrue($user->Phonenumber[0]->entity_id instanceof User);
+        $this->assertTrue($user->Phonenumber[2]->entity_id instanceof User);
+
+        $this->connection->flush();
+
+        $this->assertTrue(is_numeric($user->Phonenumber[0]->entity_id));
+
+        $this->assertEqual(count($user->Group), 2);
+        $user2 = $user;
+
+        $user = $this->objTable->find($user->id);
+
+        $this->assertEqual($user->id, $user2->id);
+
+        $this->assertTrue(is_numeric($user->id));
+        $this->assertTrue(is_numeric($user->email_id));
+
+        $this->assertTrue(is_numeric($user->Phonenumber[0]->entity_id));
+        $this->assertTrue($user->Phonenumber->count(), 4);
+        $this->assertEqual($user->Group->count(), 2);
+
+
+        $user = $this->objTable->find(5);
+
+        $pf   = $this->connection->getTable('Phonenumber');
+
+        $this->assertTrue($user->Phonenumber instanceof Doctrine_Collection);
+        $this->assertTrue($user->Phonenumber->count() == 3);
+
+        $coll = new Doctrine_Collection($pf);
+
+        $user->Phonenumber = $coll;
+        $this->assertTrue($user->Phonenumber->count() == 0);
+
+        $this->connection->flush();
+        unset($user);
+        $user = $this->objTable->find(5);
+
+        $this->assertEqual($user->Phonenumber->count(), 0);
+
+        // ADDING REFERENCES
+
+        $user->Phonenumber[0]->phonenumber = '123 123';
+        $this->assertTrue(is_numeric($user->Phonenumber[0]->entity_id));
+
+        $user->Phonenumber[1]->phonenumber = '123 123';
+        $this->connection->flush();
+
+
+        $this->assertEqual($user->Phonenumber->count(), 2);
+
+        unset($user);
+        $user = $this->objTable->find(5);
+        $this->assertEqual($user->Phonenumber->count(), 2);
+
+        $user->Phonenumber[3]->phonenumber = '123 123';
+        $this->connection->flush();
+
+        $this->assertEqual($user->Phonenumber->count(), 3);
+        unset($user);
+        $user = $this->objTable->find(5);
+        $this->assertEqual($user->Phonenumber->count(), 3);
+
+        // DELETING REFERENCES
+
+        $user->Phonenumber->delete();
+
+        $this->assertEqual($user->Phonenumber->count(), 0);
+        unset($user);
+        $user = $this->objTable->find(5);
+        $this->assertEqual($user->Phonenumber->count(), 0);
+        
+        // ADDING REFERENCES WITH STRING KEYS
+
+        $user->Phonenumber['home']->phonenumber = '123 123';
+        $user->Phonenumber['work']->phonenumber = '444 444';
+
+        $this->assertEqual($user->Phonenumber->count(), 2);
+        $this->connection->flush();
+
+        $this->assertEqual($user->Phonenumber->count(), 2);
+        unset($user);
+        $user = $this->objTable->find(5);
+        $this->assertEqual($user->Phonenumber->count(), 2);
+
+        // REPLACING ONE-TO-MANY REFERENCE
+
+        unset($coll);
+        $coll = new Doctrine_Collection($pf);
+        $coll[0]->phonenumber = '123 123';
+        $coll['home']->phonenumber = '444 444';
+        $coll['work']->phonenumber = '444 444';
+
+
+
+
+        $user->Phonenumber = $coll;
+        $this->connection->flush();
+        $this->assertEqual($user->Phonenumber->count(), 3);
+        $user = $this->objTable->find(5);
+        $this->assertEqual($user->Phonenumber->count(), 3);
+
+        
+        // ONE-TO-ONE REFERENCES
+
+        $user->Email->address = 'drinker@drinkmore.info';
+        $this->assertTrue($user->Email instanceof Email);
+        $this->connection->flush();
+        $this->assertTrue($user->Email instanceof Email);
+        $user = $this->objTable->find(5);
+        $this->assertEqual($user->Email->address, 'drinker@drinkmore.info');
+        $id = $user->Email->id;
+
+        // REPLACING ONE-TO-ONE REFERENCES
+
+        $email = $this->connection->create('Email');
+        $email->address = 'absolutist@nottodrink.com';
+        $user->Email = $email;
+
+        $this->assertTrue($user->Email instanceof Email);
+        $this->assertEqual($user->Email->address, 'absolutist@nottodrink.com');
+        $this->connection->flush();
+        unset($user);
+
+        $user = $this->objTable->find(5);
+        $this->assertTrue($user->Email instanceof Email);
+        $this->assertEqual($user->Email->address, 'absolutist@nottodrink.com');
+        
+        $emails = $this->connection->query("FROM Email WHERE Email.id = $id");
+        //$this->assertEqual(count($emails),0);
+    }
+
+    public function testTransactions() 
+    {
+
+        $this->connection->beginTransaction();
+        $this->assertEqual($this->connection->transaction->getState(),Doctrine_Transaction::STATE_ACTIVE);
+        $this->connection->commit();
+        $this->assertEqual($this->connection->transaction->getState(),Doctrine_Transaction::STATE_SLEEP);
+
+        $this->connection->beginTransaction();
+        
+        $user = $this->objTable->find(6);
+        
+        $user->name = 'Jack Daniels';
+        $this->connection->flush();
+        $this->connection->commit();
+
+        $user = $this->objTable->find(6);
+        $this->assertEqual($user->name, 'Jack Daniels');
+
+    }
+
+
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ConnectionTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ConnectionTestCase.php
new file mode 100644
index 000000000..70d3f28be
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ConnectionTestCase.php
@@ -0,0 +1,252 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Connection_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Connection_TestCase extends Doctrine_UnitTestCase 
+{
+
+    public function testUnknownModule() 
+    {
+        try {
+            $this->connection->unknown;
+            $this->fail();
+        } catch(Doctrine_Connection_Exception $e) {
+            $this->pass();
+        }
+    }
+
+    public function testGetModule() 
+    {
+        $this->assertTrue($this->connection->unitOfWork instanceof Doctrine_Connection_UnitOfWork);
+        //$this->assertTrue($this->connection->dataDict instanceof Doctrine_DataDict);
+        $this->assertTrue($this->connection->expression instanceof Doctrine_Expression_Driver);
+        $this->assertTrue($this->connection->transaction instanceof Doctrine_Transaction);
+        $this->assertTrue($this->connection->export instanceof Doctrine_Export);
+    }
+
+    public function testFetchAll() 
+    {
+        $this->conn->exec('DROP TABLE entity');
+        $this->conn->exec('CREATE TABLE entity (id INT, name TEXT)');
+
+        $this->conn->exec("INSERT INTO entity (id, name) VALUES (1, 'zYne')");
+        $this->conn->exec("INSERT INTO entity (id, name) VALUES (2, 'John')");
+
+        $a = $this->conn->fetchAll('SELECT * FROM entity');
+
+
+        $this->assertEqual($a, array (
+                            0 =>
+                            array (
+                              'id' => '1',
+                              'name' => 'zYne',
+                            ),
+                            1 =>
+                            array (
+                              'id' => '2',
+                              'name' => 'John',
+                            ),
+                          ));
+    }
+
+    public function testFetchOne()
+    {
+        $c = $this->conn->fetchOne('SELECT COUNT(1) FROM entity');
+        
+        $this->assertEqual($c, 2);
+        
+        $c = $this->conn->fetchOne('SELECT COUNT(1) FROM entity WHERE id = ?', array(1));
+        
+        $this->assertEqual($c, 1);
+    }
+    
+
+    public function testFetchColumn() 
+    {
+        $a = $this->conn->fetchColumn('SELECT * FROM entity');
+
+        $this->assertEqual($a, array (
+                              0 => '1',
+                              1 => '2',
+                            ));
+
+        $a = $this->conn->fetchColumn('SELECT * FROM entity WHERE id = ?', array(1));
+
+        $this->assertEqual($a, array (
+                              0 => '1',
+                            ));
+    }
+
+    public function testFetchArray() 
+    {
+        $a = $this->conn->fetchArray('SELECT * FROM entity');
+
+        $this->assertEqual($a, array (
+                              0 => '1',
+                              1 => 'zYne',
+                            ));
+
+        $a = $this->conn->fetchArray('SELECT * FROM entity WHERE id = ?', array(1));
+
+        $this->assertEqual($a, array (
+                              0 => '1',
+                              1 => 'zYne',
+                            ));
+    }
+
+    public function testFetchRow() 
+    {
+        $c = $this->conn->fetchRow('SELECT * FROM entity');
+
+        $this->assertEqual($c, array (
+                              'id' => '1',
+                              'name' => 'zYne',
+                            ));
+
+        $c = $this->conn->fetchRow('SELECT * FROM entity WHERE id = ?', array(1));
+        
+        $this->assertEqual($c, array (
+                              'id' => '1',
+                              'name' => 'zYne',
+                            ));
+    }
+
+    public function testFetchPairs() 
+    {
+        $this->conn->exec('DROP TABLE entity');
+    }
+
+    public function testGetManager() 
+    {
+        $this->assertTrue($this->connection->getManager() === $this->manager);
+    }
+
+    public function testDeleteOnTransientRecordIsIgnored() 
+    {
+        $user = $this->connection->create('User');
+        try {
+            $this->connection->unitOfWork->delete($user);
+        } catch (Doctrine_Connection_Exception $e) {
+            $this->fail();
+        }
+    }
+
+    public function testGetTable() 
+    {
+        $table = $this->connection->getTable('Group');
+        $this->assertTrue($table instanceof Doctrine_Table);
+        try {
+            $table = $this->connection->getTable('Unknown');
+            $f = false;
+        } catch(Doctrine_Exception $e) {
+            $f = true;
+        }
+        $this->assertTrue($f);
+
+        $table = $this->connection->getTable('User');
+        $this->assertTrue($table instanceof UserTable);
+
+    }
+
+    public function testCreate() 
+    {
+        $email = $this->connection->create('Email');
+        $this->assertTrue($email instanceof Email);
+    }
+
+    public function testGetDbh() 
+    {
+        $this->assertTrue($this->connection->getDbh() instanceof PDO);
+    }
+
+    public function testCount() 
+    {
+        $this->assertTrue(is_integer(count($this->connection)));
+    }
+
+    public function testGetIterator() 
+    {
+        $this->assertTrue($this->connection->getIterator() instanceof ArrayIterator);
+    }
+
+    public function testGetState()
+    {
+        $this->assertEqual($this->connection->transaction->getState(),Doctrine_Transaction::STATE_SLEEP);
+        $this->assertEqual(Doctrine_Lib::getConnectionStateAsString($this->connection->transaction->getState()), 'open');
+    }
+
+    public function testGetTables() 
+    {
+        $this->assertTrue(is_array($this->connection->getTables()));
+    }
+
+    public function testRollback() 
+    {
+        $this->connection->beginTransaction();
+        $this->assertEqual($this->connection->transaction->getTransactionLevel(),1);
+        $this->assertEqual($this->connection->transaction->getState(), Doctrine_Transaction::STATE_ACTIVE);
+        $this->connection->rollback();
+        $this->assertEqual($this->connection->transaction->getState(), Doctrine_Transaction::STATE_SLEEP);
+        $this->assertEqual($this->connection->transaction->getTransactionLevel(),0);
+    }
+
+    public function testNestedTransactions()
+    {
+        $this->assertEqual($this->connection->transaction->getTransactionLevel(),0);
+        $this->connection->beginTransaction();
+        $this->assertEqual($this->connection->transaction->getTransactionLevel(),1);
+        $this->assertEqual($this->connection->transaction->getState(), Doctrine_Transaction::STATE_ACTIVE);
+        $this->connection->beginTransaction();
+        $this->assertEqual($this->connection->transaction->getState(), Doctrine_Transaction::STATE_BUSY);
+        $this->assertEqual($this->connection->transaction->getTransactionLevel(),2);
+        $this->connection->commit();
+        $this->assertEqual($this->connection->transaction->getState(), Doctrine_Transaction::STATE_ACTIVE);
+        $this->assertEqual($this->connection->transaction->getTransactionLevel(),1);
+        $this->connection->commit();
+        $this->assertEqual($this->connection->transaction->getState(), Doctrine_Transaction::STATE_SLEEP);
+        $this->assertEqual($this->connection->transaction->getTransactionLevel(),0);
+    }
+
+    public function testSqliteDsn()
+    {
+        $conn = Doctrine_Manager::connection('sqlite:foo.sq3');
+
+        try {
+            $conn->connect();
+
+            $conn->close();
+            $this->pass();
+        } catch (Doctrine_Exception $e) {
+            $this->fail();
+        }
+        unlink('foo.sq3');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ConnectionTransactionTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ConnectionTransactionTestCase.php
new file mode 100644
index 000000000..44e1970b9
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ConnectionTransactionTestCase.php
@@ -0,0 +1,205 @@
+<?php
+
+class Transaction_TestLogger implements Doctrine_Overloadable
+{
+    private $messages = array();
+    
+    public function __call($m, $a)
+    {
+        $this->messages[] = $m;
+    }
+
+    public function pop()
+    {
+        return array_pop($this->messages);
+    }
+
+    public function clear()
+    {
+        $this->messages = array();
+    }
+
+    public function getAll()
+    {
+        return $this->messages;
+    }
+}
+
+class Doctrine_Connection_Transaction_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData()
+    {
+
+    }
+
+    public function testInsert()
+    {
+        $count = count($this->dbh);
+
+
+        $listener = new Transaction_TestLogger();
+
+        $user = new User();
+        $user->getTable()->getConnection()->setListener($listener);
+
+        $this->connection->beginTransaction();
+
+        $user->name = 'John';
+
+        $user->save();
+
+        $this->assertEqual($listener->pop(), 'onSave');
+        $this->assertEqual($listener->pop(), 'onInsert');
+        $this->assertEqual($listener->pop(), 'onPreInsert');
+        $this->assertEqual($listener->pop(), 'onPreSave');
+        $this->assertEqual($listener->pop(), 'onSetProperty');
+        $this->assertEqual($listener->pop(), 'onTransactionBegin');
+        $this->assertEqual($listener->pop(), 'onPreTransactionBegin');
+
+        $this->assertEqual($user->id, 1);
+        
+        $this->assertTrue($count < count($this->dbh));
+
+        $this->connection->commit();
+
+        $this->assertEqual($listener->pop(), 'onTransactionCommit');
+        $this->assertEqual($listener->pop(), 'onPreTransactionCommit');
+    }
+
+    public function testInsertMultiple()
+    {
+        $count = count($this->dbh);
+
+
+        $listener = new Transaction_TestLogger();
+
+        $users = new Doctrine_Collection('User');
+        $users->getTable()->getConnection()->setListener($listener);
+
+        $this->connection->beginTransaction();
+
+        $users[0]->name = 'Arnold';
+        $users[1]->name = 'Vincent';
+
+        $users[0]->save();
+        $users[1]->save();
+
+
+        $this->assertEqual($listener->pop(), 'onSave');
+        $this->assertEqual($listener->pop(), 'onInsert');
+        $this->assertEqual($listener->pop(), 'onPreInsert');
+        $this->assertEqual($listener->pop(), 'onPreSave');
+        $this->assertEqual($listener->pop(), 'onSave');
+        $this->assertEqual($listener->pop(), 'onInsert');
+        $this->assertEqual($listener->pop(), 'onPreInsert');
+        $this->assertEqual($listener->pop(), 'onPreSave');
+
+        $this->assertEqual($users[0]->id, 2);
+
+        $this->assertEqual($users[1]->id, 3);
+        
+        $this->assertTrue($count < count($this->dbh));
+
+        $this->connection->commit();
+
+        $this->assertEqual($listener->pop(), 'onTransactionCommit');
+        $this->assertEqual($listener->pop(), 'onPreTransactionCommit');
+    }
+
+    public function testUpdate()
+    {
+        $count = count($this->dbh);
+
+
+        $user = $this->connection->getTable('User')->find(1);
+        
+        $listener = new Transaction_TestLogger();
+        $user->getTable()->getConnection()->setListener($listener);
+        $this->connection->beginTransaction();
+
+        $user->name = 'Jack';
+
+        $user->save();
+
+        $this->assertEqual($listener->pop(), 'onSave');
+        $this->assertEqual($listener->pop(), 'onUpdate');
+        $this->assertEqual($listener->pop(), 'onPreUpdate');
+        $this->assertEqual($listener->pop(), 'onPreSave');
+        $this->assertEqual($listener->pop(), 'onSetProperty');
+        $this->assertEqual($listener->pop(), 'onTransactionBegin');
+        $this->assertEqual($listener->pop(), 'onPreTransactionBegin');
+
+        $this->assertEqual($user->id, 1);
+        
+        $this->assertTrue($count < count($this->dbh));
+
+        $this->connection->commit();
+
+        $this->assertEqual($listener->pop(), 'onTransactionCommit');
+        $this->assertEqual($listener->pop(), 'onPreTransactionCommit');
+    }
+
+    public function testUpdateMultiple()
+    {
+        $count = count($this->dbh);
+
+        $listener = new Transaction_TestLogger();
+
+        $users = $this->connection->query('FROM User');
+        $users->getTable()->getConnection()->setListener($listener);
+
+        $this->connection->beginTransaction();
+
+        $users[1]->name = 'Arnold';
+        $users[2]->name = 'Vincent';
+
+        $users[1]->save();
+        $users[2]->save();
+
+
+        $this->assertEqual($listener->pop(), 'onSave');
+        $this->assertEqual($listener->pop(), 'onUpdate');
+        $this->assertEqual($listener->pop(), 'onPreUpdate');
+        $this->assertEqual($listener->pop(), 'onPreSave');
+        $this->assertEqual($listener->pop(), 'onSave');
+        $this->assertEqual($listener->pop(), 'onUpdate');
+        $this->assertEqual($listener->pop(), 'onPreUpdate');
+        $this->assertEqual($listener->pop(), 'onPreSave');
+
+        $this->assertEqual($users[1]->id, 2);
+
+        $this->assertEqual($users[2]->id, 3);
+        
+        $this->assertTrue($count < count($this->dbh));
+
+        $this->connection->commit();
+
+        $this->assertEqual($listener->pop(), 'onTransactionCommit');
+        $this->assertEqual($listener->pop(), 'onPreTransactionCommit');
+    }
+
+    public function testDelete()
+    {
+        $count = count($this->dbh);
+
+        $listener = new Transaction_TestLogger();
+        $listener->clear();
+        $users = $this->connection->query('FROM User');
+        $users->getTable()->getConnection()->setListener($listener);
+
+        $this->connection->beginTransaction();
+
+        $users->delete();
+
+        $this->assertEqual($listener->pop(), 'onDelete');
+
+        $this->assertTrue($count, count($this->dbh));
+
+        $this->connection->commit();
+
+        $this->assertTrue(($count + 1), count($this->dbh));
+
+        $this->assertEqual($listener->pop(), 'onTransactionCommit');
+        $this->assertEqual($listener->pop(), 'onPreTransactionCommit');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CtiColumnAggregationInheritanceTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CtiColumnAggregationInheritanceTestCase.php
new file mode 100644
index 000000000..c398771b9
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CtiColumnAggregationInheritanceTestCase.php
@@ -0,0 +1,100 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_CtiColumnAggregation_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_CtiColumnAggregationInheritance_TestCase extends Doctrine_UnitTestCase 
+{
+
+}
+abstract class CTICAAbstractBase extends Doctrine_Record
+{ }
+class CTICATestParent1 extends CTICAAbstractBase
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 200);
+    }
+}
+class CTICATestParent2 extends CTICATestParent1
+{
+    public function setTableDefinition()
+    {
+    	parent::setTableDefinition();
+
+        $this->hasColumn('verified', 'boolean', 1);
+        $this->hasColumn('type', 'integer', 2);
+        
+        $this->setSubclasses(array(
+            'CTICATest'  => array('type' => 1),
+            'CTICATest2' => array('type' => 2)
+            ));
+
+    }
+}
+class CTICATestParent3 extends CTICATestParent2
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('added', 'integer');
+    }
+}
+class CTICATestParent4 extends CTICATestParent3
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('age', 'integer', 4);
+    }
+}
+class CTICATest extends CTICATestParent4
+{
+
+}
+class CTICATest2 extends CTICATestParent2
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('updated', 'integer');
+    }
+}
+
+class CTICATestOneToManyRelated extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string');
+        $this->hasColumn('cti_id', 'integer');
+    }
+    
+    public function setUp()
+    {
+        $this->hasMany('CTICATestParent1', array('local' => 'cti_id', 'foreign' => 'id'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CustomPrimaryKeyTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CustomPrimaryKeyTestCase.php
new file mode 100644
index 000000000..90f94e0e4
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CustomPrimaryKeyTestCase.php
@@ -0,0 +1,63 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_CustomPrimaryKey_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_CustomPrimaryKey_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData() 
+    {
+
+    }
+    
+    public function prepareTables() 
+    {
+        $this->tables = array('CustomPK');
+        
+        parent::prepareTables();
+    }
+
+    public function testOperations() 
+    {
+        $c = new CustomPK();
+        $this->assertTrue($c instanceof Doctrine_Record);
+
+        $c->name = 'custom pk test';
+        $this->assertEqual($c->identifier(), array());
+        
+        $c->save();
+        $this->assertEqual($c->identifier(), array('uid' => 1));
+        $this->connection->clear();
+        
+        $c = $this->connection->getTable('CustomPK')->find(1);
+    
+        $this->assertEqual($c->identifier(), array('uid' => 1));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CustomResultSetOrderTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CustomResultSetOrderTestCase.php
new file mode 100644
index 000000000..82a5beb84
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/CustomResultSetOrderTestCase.php
@@ -0,0 +1,179 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_CustomResultSetOrder_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_CustomResultSetOrder_TestCase extends Doctrine_UnitTestCase {
+    
+    /**
+     * Prepares the data under test.
+     * 
+     * 1st category: 3 Boards
+     * 2nd category: 1 Board
+     * 3rd category: 0 boards
+     * 
+     */
+    public function prepareData() {
+        $this->connection->clear();
+        $cat1 = new CategoryWithPosition();
+        $cat1->position = 0;
+        $cat1->name = "First";
+        
+        $cat2 = new CategoryWithPosition();
+        $cat2->position = 0; // same 'priority' as the first
+        $cat2->name = "Second";
+        
+        $cat3 = new CategoryWithPosition();
+        $cat3->position = 1;
+        $cat3->name = "Third";
+        
+        $board1 = new BoardWithPosition();
+        $board1->position = 0;
+        
+        $board2 = new BoardWithPosition();
+        $board2->position = 1;
+        
+        $board3 = new BoardWithPosition();
+        $board3->position = 2;
+        
+        // The first category gets 3 boards!
+        $cat1->Boards[0] = $board1;
+        $cat1->Boards[1] = $board2;
+        $cat1->Boards[2] = $board3;
+        
+        $board4 = new BoardWithPosition();
+        $board4->position = 0;
+        
+        // The second category gets 1 board!
+        $cat2->Boards[0] = $board4;
+        
+        $this->connection->flush();
+    }
+
+    /**
+     * Prepares the tables.
+     */
+    public function prepareTables() {
+        $this->tables[] = "CategoryWithPosition";
+        $this->tables[] = "BoardWithPosition";
+        parent::prepareTables();
+    }
+
+    /**
+     * Checks whether the boards are correctly assigned to the categories.
+     *
+     * The 'evil' result set that confuses the object population is displayed below.
+     * 
+     * catId | catPos | catName  | boardPos | board.category_id
+     *  1    | 0      | First    | 0        | 1
+     *  2    | 0      | Second   | 0        | 2   <-- The split that confuses the object population
+     *  1    | 0      | First    | 1        | 1
+     *  1    | 0      | First    | 2        | 1
+     *  3    | 2      | Third    | NULL
+     */
+    public function testQueryWithOrdering2() {
+        $q = new Doctrine_Query($this->connection);
+
+        $categories = $q->select('c.*, b.*')
+                ->from('CategoryWithPosition c')
+                ->leftJoin('c.Boards b')
+                ->orderBy('c.position ASC, b.position ASC')
+                ->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+        $this->assertEqual(3, count($categories), 'Some categories were doubled!');
+                
+        // Check each category
+        foreach ($categories as $category) {
+            switch ($category['name']) {
+                case 'First':
+                    // The first category should have 3 boards, right?
+                    // It has only 1! The other two slipped to the 2nd category!
+                    $this->assertEqual(3, count($category['Boards']));
+                break;
+                case 'Second':
+                    // The second category should have 1 board, but it got 3 now
+                    $this->assertEqual(1, count($category['Boards']));;
+                break;
+                case 'Third':
+                    // The third has no boards as expected.
+                    //print $category->Boards[0]->position;
+                    $this->assertEqual(0, count($category['Boards']));
+                break;
+            }
+            
+        }
+    }
+
+    /**
+     * Checks whether the boards are correctly assigned to the categories.
+     *
+     * The 'evil' result set that confuses the object population is displayed below.
+     * 
+     * catId | catPos | catName  | boardPos | board.category_id 
+     *  1    | 0      | First    | 0        | 1
+     *  2    | 0      | Second   | 0        | 2   <-- The split that confuses the object population
+     *  1    | 0      | First    | 1        | 1
+     *  1    | 0      | First    | 2        | 1
+     *  3    | 2      | Third    | NULL
+     */
+    public function testQueryWithOrdering() {
+        $q = new Doctrine_Query($this->connection);
+        $categories = $q->select('c.*, b.*')
+                ->from('CategoryWithPosition c')
+                ->leftJoin('c.Boards b')
+                ->orderBy('c.position ASC, b.position ASC')
+                ->execute();
+
+        $this->assertEqual(3, $categories->count(), 'Some categories were doubled!');
+                
+        // Check each category
+        foreach ($categories as $category) {
+            
+            switch ($category->name) {
+                case 'First':
+                    // The first category should have 3 boards
+
+                    $this->assertEqual(3, $category->Boards->count());
+                break;
+                case 'Second':
+                    // The second category should have 1 board
+
+                    $this->assertEqual(1, $category->Boards->count());
+                break;
+                case 'Third':
+                    // The third has no boards as expected.
+                    //print $category->Boards[0]->position;
+                    $this->assertEqual(0, $category->Boards->count());
+                break;
+            }
+            
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DBTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DBTestCase.php
new file mode 100644
index 000000000..ef8ebddcf
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DBTestCase.php
@@ -0,0 +1,420 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Db_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Db_TestCase extends Doctrine_UnitTestCase
+{
+
+    public function prepareData() 
+    { }
+
+    public function prepareTables() 
+    { }
+
+    public function init() 
+    { }
+    
+    public function testInitialize() 
+    {
+        $this->conn = Doctrine_Manager::getInstance()->openConnection(array('sqlite::memory:'));
+        $this->conn->exec('CREATE TABLE entity (id INTEGER, name TEXT)');
+
+        $this->conn->exec("INSERT INTO entity (id, name) VALUES (1, 'zYne')");
+        $this->conn->exec("INSERT INTO entity (id, name) VALUES (2, 'John')");
+        
+        
+        $this->assertEqual($this->conn->getAttribute(Doctrine_Core::ATTR_DRIVER_NAME), 'sqlite');
+    }
+
+    public function testAddValidEventListener() 
+    {
+        $this->conn->setListener(new Doctrine_EventListener());
+
+        $this->assertTrue($this->conn->getListener() instanceof Doctrine_EventListener);
+        try {
+            $ret = $this->conn->addListener(new Doctrine_Connection_TestLogger());
+            $this->pass();
+            $this->assertTrue($ret instanceof Doctrine_Connection);
+        } catch(Doctrine_EventListener_Exception $e) {
+            $this->fail();
+        }
+        $this->assertTrue($this->conn->getListener() instanceof Doctrine_EventListener_Chain);
+        $this->assertTrue($this->conn->getListener()->get(0) instanceof Doctrine_Connection_TestLogger);
+
+        try {
+            $ret = $this->conn->addListener(new Doctrine_Connection_TestValidListener());
+            $this->pass();
+            $this->assertTrue($ret instanceof Doctrine_Connection);
+        } catch(Doctrine_EventListener_Exception $e) {
+            $this->fail();
+        }
+        $this->assertTrue($this->conn->getListener() instanceof Doctrine_EventListener_Chain);
+        $this->assertTrue($this->conn->getListener()->get(0) instanceof Doctrine_Connection_TestLogger);
+        $this->assertTrue($this->conn->getListener()->get(1) instanceof Doctrine_Connection_TestValidListener);
+        
+        try {
+            $ret = $this->conn->addListener(new Doctrine_EventListener_Chain(), 'chain');
+            $this->pass();
+            $this->assertTrue($ret instanceof Doctrine_Connection);
+        } catch(Doctrine_EventListener_Exception $e) {
+            $this->fail();
+        }
+        $this->assertTrue($this->conn->getListener() instanceof Doctrine_EventListener_Chain);
+        $this->assertTrue($this->conn->getListener()->get(0) instanceof Doctrine_Connection_TestLogger);
+        $this->assertTrue($this->conn->getListener()->get(1) instanceof Doctrine_Connection_TestValidListener);
+        $this->assertTrue($this->conn->getListener()->get('chain') instanceof Doctrine_EventListener_Chain);
+
+        // replacing
+
+        try {
+            $ret = $this->conn->addListener(new Doctrine_EventListener_Chain(), 'chain');
+            $this->pass();
+            $this->assertTrue($ret instanceof Doctrine_Connection);
+        } catch(Doctrine_EventListener_Exception $e) {
+            $this->fail();
+        }
+        $this->assertTrue($this->conn->getListener() instanceof Doctrine_EventListener_Chain);
+        $this->assertTrue($this->conn->getListener()->get(0) instanceof Doctrine_Connection_TestLogger);
+        $this->assertTrue($this->conn->getListener()->get(1) instanceof Doctrine_Connection_TestValidListener);
+        $this->assertTrue($this->conn->getListener()->get('chain') instanceof Doctrine_EventListener_Chain);
+    }
+
+    public function testListeningEventsWithSingleListener() 
+    {
+        $this->conn->setListener(new Doctrine_Connection_TestLogger());
+        $listener = $this->conn->getListener();
+        $stmt = $this->conn->prepare('INSERT INTO entity (id) VALUES(?)');
+
+        $this->assertEqual($listener->pop(), 'postPrepare');
+        $this->assertEqual($listener->pop(), 'prePrepare');
+        
+        $stmt->execute(array(1));
+
+        $this->assertEqual($listener->pop(), 'postStmtExecute');
+        $this->assertEqual($listener->pop(), 'preStmtExecute');
+        
+        $this->conn->exec('DELETE FROM entity');
+
+        $this->assertEqual($listener->pop(), 'postExec');
+        $this->assertEqual($listener->pop(), 'preExec');
+        
+        $this->conn->beginTransaction();
+
+        $this->assertEqual($listener->pop(), 'postTransactionBegin');
+        $this->assertEqual($listener->pop(), 'preTransactionBegin');
+
+        $this->conn->exec('INSERT INTO entity (id) VALUES (1)');
+
+        $this->assertEqual($listener->pop(), 'postExec');
+        $this->assertEqual($listener->pop(), 'preExec');
+
+        $this->conn->commit();
+        
+        $this->assertEqual($listener->pop(), 'postTransactionCommit');
+        $this->assertEqual($listener->pop(), 'preTransactionCommit');
+    }
+
+    public function testListeningQueryEventsWithListenerChain() 
+    {
+        $this->conn->exec('DROP TABLE entity');
+
+        $this->conn->addListener(new Doctrine_Connection_TestLogger());
+        $this->conn->addListener(new Doctrine_Connection_TestLogger());
+
+        $this->conn->exec('CREATE TABLE entity (id INT)');
+
+        $listener = $this->conn->getListener()->get(0);
+        $listener2 = $this->conn->getListener()->get(1);
+        $this->assertEqual($listener->pop(), 'postExec');
+        $this->assertEqual($listener->pop(), 'preExec');
+
+        $this->assertEqual($listener2->pop(), 'postExec');
+        $this->assertEqual($listener2->pop(), 'preExec');
+    }
+
+    public function testListeningPrepareEventsWithListenerChain() 
+    {
+
+        $stmt = $this->conn->prepare('INSERT INTO entity (id) VALUES(?)');
+        $listener = $this->conn->getListener()->get(0);
+        $listener2 = $this->conn->getListener()->get(1);
+        $this->assertEqual($listener->pop(), 'postPrepare');
+        $this->assertEqual($listener->pop(), 'prePrepare');
+
+        $this->assertEqual($listener2->pop(), 'postPrepare');
+        $this->assertEqual($listener2->pop(), 'prePrepare');
+
+        $stmt->execute(array(1));
+
+        $this->assertEqual($listener->pop(), 'postStmtExecute');
+        $this->assertEqual($listener->pop(), 'preStmtExecute');
+
+        $this->assertEqual($listener2->pop(), 'postStmtExecute');
+        $this->assertEqual($listener2->pop(), 'preStmtExecute');
+    }
+
+    public function testListeningErrorHandlingMethodsOnExec()
+    {
+        $this->conn->setAttribute(Doctrine_Core::ATTR_THROW_EXCEPTIONS, false);
+        $listener = $this->conn->getListener()->get(0);
+        $this->conn->exec('DELETE FROM unknown');
+
+        $this->assertEqual($listener->pop(), 'postError');
+        $this->assertEqual($listener->pop(), 'preError');
+
+        $this->assertEqual($listener->pop(), 'preExec');
+    }
+
+    public function testListeningErrorHandlingMethodsOnQuery()
+    {
+        $this->conn->setAttribute(Doctrine_Core::ATTR_THROW_EXCEPTIONS, false);
+        $listener = $this->conn->getListener()->get(0);
+        $this->conn->execute('DELETE FROM unknown');
+
+        $this->assertEqual($listener->pop(), 'postError');
+        $this->assertEqual($listener->pop(), 'preError');
+
+        $this->assertEqual($listener->pop(), 'preQuery');
+    }
+
+    public function testListeningErrorHandlingMethodsOnPrepare()
+    {
+        $this->conn->setAttribute(Doctrine_Core::ATTR_THROW_EXCEPTIONS, false);
+        $listener = $this->conn->getListener()->get(0);
+
+        $this->conn->prepare('INSERT INTO unknown (id) VALUES (?)');
+
+        $this->assertEqual($listener->pop(), 'postError');
+        $this->assertEqual($listener->pop(), 'preError');
+
+        $this->assertEqual($listener->pop(), 'prePrepare');
+    }
+
+    public function testListeningErrorHandlingMethodsOnStatementExecute()
+    {
+        $this->conn->setAttribute(Doctrine_Core::ATTR_THROW_EXCEPTIONS, false);
+        $listener = $this->conn->getListener()->get(0);
+
+        $stmt = $this->conn->prepare('INSERT INTO entity (id) VALUES (?)');
+
+        $stmt->execute(array(1, 2, 3));
+
+        $this->assertEqual($listener->pop(), 'postError');
+        $this->assertEqual($listener->pop(), 'preError');
+
+        $this->assertEqual($listener->pop(), 'preStmtExecute');
+        $this->assertEqual($listener->pop(), 'postPrepare');
+        $this->assertEqual($listener->pop(), 'prePrepare');
+    }
+
+    public function testListeningExecEventsWithListenerChain()
+    {
+        $this->conn->exec('DELETE FROM entity');
+        $listener = $this->conn->getListener()->get(0);
+        $listener2 = $this->conn->getListener()->get(1);
+        $this->assertEqual($listener->pop(), 'postExec');
+        $this->assertEqual($listener->pop(), 'preExec');
+
+        $this->assertEqual($listener2->pop(), 'postExec');
+        $this->assertEqual($listener2->pop(), 'preExec');
+    }
+
+    public function testListeningTransactionEventsWithListenerChain() 
+    {
+        $this->conn->beginTransaction();
+        $listener = $this->conn->getListener()->get(0);
+        $listener2 = $this->conn->getListener()->get(1);
+        $this->assertEqual($listener->pop(), 'postTransactionBegin');
+        $this->assertEqual($listener->pop(), 'preTransactionBegin');
+
+        $this->assertEqual($listener2->pop(), 'postTransactionBegin');
+        $this->assertEqual($listener2->pop(), 'preTransactionBegin');
+
+        $this->conn->exec('INSERT INTO entity (id) VALUES (1)');
+
+        $this->conn->commit();
+
+        $this->assertEqual($listener->pop(), 'postTransactionCommit');
+        $this->assertEqual($listener->pop(), 'preTransactionCommit');
+        
+        $this->assertEqual($listener->pop(), 'postExec');
+        $this->assertEqual($listener->pop(), 'preExec');
+        
+        $this->conn->exec('DROP TABLE entity');
+    }
+
+    public function testSetValidEventListener() 
+    {
+        try {
+            $this->conn->setListener(new Doctrine_Connection_TestLogger());
+            $this->pass();
+        } catch(Doctrine_EventListener_Exception $e) {
+            $this->fail();
+        }
+        $this->assertTrue($this->conn->getListener() instanceof Doctrine_Connection_TestLogger);
+        try {
+            $this->conn->setListener(new Doctrine_Connection_TestValidListener());
+            $this->pass();
+        } catch(Doctrine_EventListener_Exception $e) {
+            $this->fail();
+        }
+        $this->assertTrue($this->conn->getListener() instanceof Doctrine_Connection_TestValidListener);
+        try {
+            $this->conn->setListener(new Doctrine_EventListener_Chain());
+            $this->pass();
+
+        } catch(Doctrine_EventListener_Exception $e) {
+            $this->fail();
+        }
+        $this->assertTrue($this->conn->getListener() instanceof Doctrine_EventListener_Chain);
+        try {
+            $this->conn->setListener(new Doctrine_EventListener());
+            $this->pass();
+        } catch(Doctrine_EventListener_Exception $e) {
+            $this->fail();
+        }
+        $this->assertTrue($this->conn->getListener() instanceof Doctrine_EventListener);
+    }
+
+    public function testSetInvalidEventListener() 
+    {
+        try {
+            $this->conn->setListener(new Doctrine_Connection_TestInvalidListener());
+            $this->fail();
+        } catch(Doctrine_EventListener_Exception $e) {
+            $this->pass();
+        }
+    }
+    public function testInvalidDSN() 
+    {
+        $manager = Doctrine_Manager::getInstance();
+        try {
+            $this->conn = $manager->openConnection('');
+            $this->fail();
+        } catch(Doctrine_Exception $e) {
+            $this->pass();
+        }
+        try {
+            $this->conn = $manager->openConnection('unknown');
+            $this->fail();
+        } catch(Doctrine_Exception $e) {
+            $this->pass();
+        }   
+        try {
+            $this->conn = $manager->openConnection(0);
+            $this->fail();
+        } catch(Doctrine_Exception $e) {
+            $this->pass();
+        }
+    }
+    public function testInvalidScheme() 
+    {
+        $manager = Doctrine_Manager::getInstance();
+        try {
+            $this->conn = $manager->openConnection('unknown://:memory:');
+            $this->fail();
+        } catch(Doctrine_Exception $e) {
+            $this->pass();
+        }
+    }
+    public function testInvalidHost() 
+    {
+        $manager = Doctrine_Manager::getInstance();
+        try {
+            $this->conn = $manager->openConnection('mysql://user:password@');
+            $this->fail();
+        } catch(Doctrine_Exception $e) {
+            $this->pass();
+        }
+    }
+    public function testInvalidDatabase() 
+    {
+        $manager = Doctrine_Manager::getInstance();
+        try {
+            $this->conn = $manager->openConnection('mysql://user:password@host/');
+            $this->fail();
+        } catch(Doctrine_Exception $e) {
+            $this->pass();
+        }
+    }
+
+    /**
+    public function testGetConnectionPdoLikeDSN()
+    {
+        $this->conn = Doctrine_Manager::openConnection(array('mysql:host=localhost;dbname=test', 'root', 'password'));
+        $this->assertEqual($this->conn->getOption('dsn'), 'mysql:host=localhost;dbname=test');
+        $this->assertEqual($this->conn->getOption('username'), 'root');
+        $this->assertEqual($this->conn->getOption('password'), 'password');
+
+
+        $this->conn = Doctrine_Connection::getConnection('sqlite::memory:');
+
+        $this->assertEqual($this->conn->getOption('dsn'), 'sqlite::memory:');
+        $this->assertEqual($this->conn->getOption('username'), false);
+        $this->assertEqual($this->conn->getOption('password'), false);
+    }
+    public function testDriverName()
+    {
+
+    }
+
+    public function testGetConnectionWithPearLikeDSN()
+    {
+        $this->conn = Doctrine_Connection::getConnection('mysql://zYne:password@localhost/test');
+        $this->assertEqual($this->conn->getOption('dsn'), 'mysql:host=localhost;dbname=test');
+        $this->assertEqual($this->conn->getOption('username'), 'zYne');
+        $this->assertEqual($this->conn->getOption('password'), 'password');
+
+
+        $this->conn = Doctrine_Connection::getConnection('sqlite://:memory:');
+
+        $this->assertEqual($this->conn->getOption('dsn'), 'sqlite::memory:');
+        $this->assertEqual($this->conn->getOption('username'), false);
+        $this->assertEqual($this->conn->getOption('password'), false);
+    }
+    */
+}   
+
+class Doctrine_Connection_TestLogger implements Doctrine_Overloadable {
+    private $messages = array();
+    
+    public function __call($m, $a) {
+        $this->messages[] = $m;
+    }
+    public function pop() {
+        return array_pop($this->messages);
+    }
+    public function getAll() {
+        return $this->messages;
+    }
+}
+class Doctrine_Connection_TestValidListener extends Doctrine_EventListener { }
+class Doctrine_Connection_TestInvalidListener { }
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Data/ExportTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Data/ExportTestCase.php
new file mode 100644
index 000000000..3c176c3d0
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Data/ExportTestCase.php
@@ -0,0 +1,96 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Data_Export_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Data_Export_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'I18nTestExport';
+        parent::prepareTables();
+    }
+
+    public function testI18nExport()
+    {
+        try {
+            $i = new I18nTestExport();
+            $i->Translation['en']->title = 'english test';
+            $i->Translation['fr']->title = 'french test';
+            $i->test_object = new stdClass();
+            $i->save();
+
+            $data = new Doctrine_Data();
+            $data->exportData('test.yml', 'yml', array('I18nTestExport', 'I18nTestExportTranslation'));
+
+            $array = Doctrine_Parser::load('test.yml', 'yml');
+
+            $this->assertTrue( ! empty($array));
+            $this->assertTrue(isset($array['I18nTestExport']['I18nTestExport_1']));
+            $this->assertTrue(isset($array['I18nTestExportTranslation']['I18nTestExportTranslation_1_en']));
+            $this->assertTrue(isset($array['I18nTestExportTranslation']['I18nTestExportTranslation_1_fr']));
+
+            $i->Translation->delete();
+            $i->delete();
+
+            Doctrine_Core::loadData('test.yml');
+
+            $q = Doctrine_Query::create()
+                ->from('I18nTestExport e')
+                ->leftJoin('e.Translation t');
+
+            $results = $q->execute();
+            $this->assertEqual(get_class($results[0]->test_object), 'stdClass');
+
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+
+        if (file_exists('test.yml')) {
+            unlink('test.yml');
+        }
+    }
+}
+
+class I18nTestExport extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 200);
+        $this->hasColumn('title', 'string', 200);
+        $this->hasColumn('test_object', 'object');
+    }
+
+    public function setUp()
+    {
+        $this->actAs('I18n', array('fields' => array('name', 'title')));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Data/ImportTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Data/ImportTestCase.php
new file mode 100644
index 000000000..fa07a25cd
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Data/ImportTestCase.php
@@ -0,0 +1,612 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Data_Import_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Data_Import_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'User';
+        $this->tables[] = 'Phonenumber';
+        $this->tables[] = 'Album';
+        $this->tables[] = 'I18nTestImport';
+        $this->tables[] = 'ImportNestedSet';
+        $this->tables[] = 'ImportNestedSetMultipleTree';
+        $this->tables[] = 'I18nNumberLang';
+        parent::prepareTables();
+    }
+    
+    public function testInlineMany()
+    {
+        $yml = <<<END
+---
+User: 
+  User_1: 
+    name: jwage
+    password: changeme
+    Phonenumber: 
+      Phonenumber_1: 
+        phonenumber: 6155139185
+END;
+        try {
+            file_put_contents('test.yml', $yml);
+            Doctrine_Core::loadData('test.yml', true);
+
+            $this->conn->clear();
+
+            $query = new Doctrine_Query();
+            $query->from('User u, u.Phonenumber')
+                  ->where('u.name = ?', 'jwage');
+
+            $user = $query->execute()->getFirst();
+
+            $this->assertEqual($user->name, 'jwage');
+            $this->assertEqual($user->Phonenumber->count(), 1);
+            $this->assertEqual($user->Phonenumber[0]->phonenumber, '6155139185');
+
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail();
+        }
+
+        unlink('test.yml');
+    }
+
+    public function testInlineOne()
+    {
+        $yml = <<<END
+---
+Album:
+  Album_1:
+    name: zYne- Christmas Album
+    User:
+      name: zYne-
+      password: changeme
+END;
+        try {
+            file_put_contents('test.yml', $yml);
+            Doctrine_Core::loadData('test.yml', true);
+
+            $this->conn->clear();
+
+            $query = new Doctrine_Query();
+            $query->from('User u, u.Album a, a.User u2')
+                  ->where('u.name = ?', 'zYne-');
+
+            $user = $query->execute()->getFirst();
+
+            $this->assertEqual($user->name, 'zYne-');
+            $this->assertEqual($user->Album->count(), 1);
+            $this->assertEqual($user->Album[0]->name, 'zYne- Christmas Album');
+
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail();
+        }
+        unlink('test.yml');
+    }
+
+    public function testNormalMany()
+    {
+        $yml = <<<END
+---
+User: 
+  User_1: 
+    name: jwage2
+    password: changeme
+    Phonenumber: [Phonenumber_1, Phonenumber_2]
+Phonenumber:
+  Phonenumber_1:
+    phonenumber: 6155139185
+  Phonenumber_2:
+    phonenumber: 6153137679
+END;
+        try {
+            file_put_contents('test.yml', $yml);
+            Doctrine_Core::loadData('test.yml', true);
+
+            $this->conn->clear();
+
+            $query = Doctrine_Query::create();
+            $query->from('User u, u.Phonenumber')
+                  ->where('u.name = ?', 'jwage2');
+
+            $user = $query->execute()->getFirst();
+
+            $this->assertEqual($user->name, 'jwage2');
+            $this->assertEqual($user->Phonenumber->count(), 2);
+            $this->assertEqual($user->Phonenumber[0]->phonenumber, '6155139185');
+            $this->assertEqual($user->Phonenumber[1]->phonenumber, '6153137679');
+
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail();
+        }
+        unlink('test.yml');
+    }
+
+    public function testI18nImport()
+    {
+        $yml = <<<END
+---
+I18nTestImport:
+  I18nTestImport_1:
+    Translation:
+      en:
+        name: english name
+        title: english title
+      fr:
+        name: french name
+        title: french title
+END;
+        try {
+            file_put_contents('test.yml', $yml);
+            Doctrine_Core::loadData('test.yml', true);
+
+            $this->conn->clear();
+
+            $query = new Doctrine_Query();
+            $query->from('I18nTestImport i, i.Translation t');
+
+            $i = $query->execute()->getFirst();
+
+            $this->assertEqual($i->Translation['en']->name, 'english name');
+            $this->assertEqual($i->Translation['fr']->name, 'french name');
+            $this->assertEqual($i->Translation['en']->title, 'english title');
+            $this->assertEqual($i->Translation['fr']->title, 'french title');
+
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+
+        unlink('test.yml'); 
+    }
+
+    public function testImportNestedSetData()
+    {
+        $yml = <<<END
+---
+ImportNestedSet:
+  ImportNestedSet_1:
+    name: Root
+    children:
+      ImportNestedSet_2:
+        name: Child 1
+      ImportNestedSet_3:
+        name: Child 2
+        children:
+          ImportNestedSet_4:
+            name: Sub-Child 1
+END;
+        try {
+            file_put_contents('test.yml', $yml);
+            Doctrine_Core::loadData('test.yml', true);
+
+            $this->conn->clear();
+
+            $query = new Doctrine_Query();
+            $query->from('ImportNestedSet');
+
+            $i = $query->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+            $this->assertEqual($i[0]['name'], 'Root');
+            $this->assertEqual($i[0]['lft'], 1);
+            $this->assertEqual($i[0]['rgt'], 8);
+            $this->assertEqual($i[0]['level'], 0);
+
+            $this->assertEqual($i[1]['name'], 'Child 2');
+            $this->assertEqual($i[1]['lft'], 4);
+            $this->assertEqual($i[1]['rgt'], 7);
+            $this->assertEqual($i[1]['level'], 1);
+
+            $this->assertEqual($i[2]['name'], 'Sub-Child 1');
+            $this->assertEqual($i[2]['lft'], 5);
+            $this->assertEqual($i[2]['rgt'], 6);
+            $this->assertEqual($i[2]['level'], 2);
+
+            $this->assertEqual($i[3]['name'], 'Child 1');
+            $this->assertEqual($i[3]['lft'], 2);
+            $this->assertEqual($i[3]['rgt'], 3);
+            $this->assertEqual($i[3]['level'], 1);
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail();
+        }
+
+        unlink('test.yml'); 
+    }
+    
+    public function testImportNestedSetMultipleTreeData()
+    {
+        $yml = <<<END
+---
+ImportNestedSetMultipleTree:
+  ImportNestedSetMultipleTree_Item1:
+    name: Item 1
+
+    children:
+      ImportNestedSetMultipleTree_Item1_1:
+        name: Item 1.1
+
+      ImportNestedSetMultipleTree_Item1_2:
+        name: Item 1.2
+
+  ImportNestedSetMultipleTree_Item2:
+    name: Item 2
+
+    children:
+      ImportNestedSetMultipleTree_Item2_1:
+        name: Item 2.1
+
+      ImportNestedSetMultipleTree_Item2_2:
+        name: Item 2.2
+
+        children:
+          ImportNestedSetMultipleTree_Item2_2_1:
+            name: Item 2.2.1
+
+          ImportNestedSetMultipleTree_Item2_2_2:
+            name: Item 2.2.2
+
+          ImportNestedSetMultipleTree_Item2_2_3:
+            name: Item 2.2.3
+END;
+        try {
+            file_put_contents('test.yml', $yml);
+            Doctrine_Core::loadData('test.yml', true);
+
+            $this->conn->clear();
+
+            $query = Doctrine_Query::create()
+                ->from('ImportNestedSetMultipleTree insmt')
+                ->orderBy('insmt.root_id ASC, insmt.lft ASC');
+
+            $i = $query->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+            $this->assertEqual($i[0]['name'], 'Item 1');
+            $this->assertEqual($i[0]['lft'], 1);
+            $this->assertEqual($i[0]['rgt'], 6);
+            $this->assertEqual($i[0]['level'], 0);
+            $this->assertEqual($i[0]['root_id'], $i[0]['id']);
+
+            $this->assertEqual($i[1]['name'], 'Item 1.1');
+            $this->assertEqual($i[1]['lft'], 2);
+            $this->assertEqual($i[1]['rgt'], 3);
+            $this->assertEqual($i[1]['level'], 1);
+            $this->assertEqual($i[1]['root_id'], $i[0]['root_id']);
+
+            $this->assertEqual($i[3]['name'], 'Item 2');
+            $this->assertEqual($i[3]['lft'], 1);
+            $this->assertEqual($i[3]['rgt'], 12);
+            $this->assertEqual($i[3]['level'], 0);
+            $this->assertEqual($i[3]['root_id'], $i[3]['id']);
+
+            $this->assertEqual($i[4]['name'], 'Item 2.1');
+            $this->assertEqual($i[4]['lft'], 2);
+            $this->assertEqual($i[4]['rgt'], 3);
+            $this->assertEqual($i[4]['level'], 1);
+            $this->assertEqual($i[4]['root_id'], $i[3]['root_id']);
+            
+            $this->assertEqual($i[5]['name'], 'Item 2.2');
+            $this->assertEqual($i[5]['lft'], 4);
+            $this->assertEqual($i[5]['rgt'], 11);
+            $this->assertEqual($i[5]['level'], 1);
+            $this->assertEqual($i[5]['root_id'], $i[3]['root_id']);
+
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail();
+        }
+
+        unlink('test.yml'); 
+    }
+
+    public function testMany2ManyManualDataFixtures()
+    {
+        self::prepareTables();
+        $yml = <<<END
+---
+User:
+  User_1:
+    name: jwage400
+    password: changeme
+
+Groupuser:
+  Groupuser_1:
+    User: User_1
+    Group: Group_1
+
+Group:
+  Group_1:
+    name: test
+END;
+        try {
+            file_put_contents('test.yml', $yml);
+            Doctrine_Core::loadData('test.yml', true);
+
+            $this->conn->clear();
+
+            $testRef = Doctrine_Query::create()->from('Groupuser')->execute()->getFirst();
+
+            $this->assertTrue($testRef->group_id > 0);
+            $this->assertTrue($testRef->user_id > 0);
+
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+
+        unlink('test.yml');
+    }
+    
+    public function testInvalidElementThrowsException()
+    {
+        self::prepareTables();
+        $yml = <<<END
+---
+User:
+  User_1:
+    name: jwage400
+    pass: changeme
+
+Groupuser:
+  Groupuser_1:
+    User: User_1
+    Group: Group_1
+
+Group:
+  Group_1:
+    name: test
+END;
+        try {
+            file_put_contents('test.yml', $yml);
+            Doctrine_Core::loadData('test.yml', true);
+            $this->fail();
+        } catch (Exception $e) {
+            $this->pass();
+        }
+        
+        unlink('test.yml');
+    }
+
+    public function testNormalNonRecursiveFixturesLoading()
+    {
+        self::prepareTables();
+        $yml1 = <<<END
+---
+User:
+  User_1:
+    name: jwage400
+    pass: changeme
+END;
+
+        $yml2 = <<<END
+---
+User:
+  User_2:
+    name: jwage500
+    pass: changeme2
+END;
+
+        mkdir('test_data_fixtures');
+        file_put_contents('test_data_fixtures/test1.yml', $yml1);
+        file_put_contents('test_data_fixtures/test2.yml', $yml2);
+        $import = new Doctrine_Data_Import(getcwd() . '/test_data_fixtures');
+        $import->setFormat('yml');
+
+        $array = $import->doParsing();
+
+        // Last User definition in test2.yml takes presedence
+        $this->assertTrue(isset($array['User']['User_2']));
+
+        unlink('test_data_fixtures/test1.yml');
+        unlink('test_data_fixtures/test2.yml');
+        rmdir('test_data_fixtures');
+    }
+
+    public function testRecursiveFixturesLoading()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_RECURSIVE_MERGE_FIXTURES, true);
+        self::prepareTables();
+        $yml1 = <<<END
+---
+User:
+  User_1:
+    name: jwage400
+    pass: changeme
+END;
+
+        $yml2 = <<<END
+---
+User:
+  User_2:
+    name: jwage500
+    pass: changeme2
+END;
+
+        mkdir('test_data_fixtures');
+        file_put_contents('test_data_fixtures/test1.yml', $yml1);
+        file_put_contents('test_data_fixtures/test2.yml', $yml2);
+        $import = new Doctrine_Data_Import(getcwd() . '/test_data_fixtures');
+        $import->setFormat('yml');
+
+        $array = $import->doParsing();
+
+        $this->assertTrue(isset($array['User']['User_1']));
+        $this->assertTrue(isset($array['User']['User_2']));
+
+        unlink('test_data_fixtures/test1.yml');
+        unlink('test_data_fixtures/test2.yml');
+        rmdir('test_data_fixtures');
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_RECURSIVE_MERGE_FIXTURES, false);
+    }
+
+    public function testIncorrectYamlRelationThrowsException()
+    {
+        self::prepareTables();
+        $yml = <<<END
+---
+User:
+  User_1:
+    name: jwage400
+    password: changeme
+
+Groupuser:
+  Groupuser_1:
+    User: Group_1
+    Group: User_1
+
+Group:
+  Group_1:
+    name: test
+END;
+        try {
+            file_put_contents('test.yml', $yml);
+            Doctrine_Core::loadData('test.yml', true);
+
+            $this->conn->clear();
+
+            $testRef = Doctrine_Query::create()->from('Groupuser')->execute()->getFirst();
+
+            $this->assertTrue($testRef->group_id > 0);
+            $this->assertTrue($testRef->user_id > 0);
+
+            $this->fail();
+        } catch (Exception $e) {
+            $this->pass();
+            $this->assertEqual($e->getMessage(), 'Class referred to in "(groupuser) Groupuser_1" is expected to be "User" and "Group" was given');
+        }
+
+        unlink('test.yml');
+    }
+
+    public function testI18nImportWithInteger()
+    {
+        $yml = <<<END
+---
+I18nNumberLang:
+  I18nNumberLang_1:
+    name: test
+    Translation:
+      0:
+        title: english title
+        body: english body
+      1:
+        title: french title
+        body: french body
+END;
+        try {
+            file_put_contents('test.yml', $yml);
+            Doctrine_Core::loadData('test.yml', true);
+
+            $this->conn->clear();
+
+            $query = new Doctrine_Query();
+            $query->from('I18nNumberLang i, i.Translation t');
+
+            $i = $query->execute()->getFirst();
+
+            $this->assertEqual($i->name, 'test');
+            $this->assertEqual($i->Translation['0']->title, 'english title');
+            $this->assertEqual($i->Translation['1']->title, 'french title');
+            $this->assertEqual($i->Translation['0']->body, 'english body');
+            $this->assertEqual($i->Translation['1']->body, 'french body');
+
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+
+        unlink('test.yml'); 
+    }
+
+}
+
+class ImportNestedSet extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('NestedSet');
+    }
+}
+
+class ImportNestedSetMultipleTree extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->actAs(
+            'NestedSet', array(
+                'hasManyRoots' => true,
+                'rootColumnName' => 'root_id'
+            )
+        );
+    }
+}
+
+class I18nNumberLang extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+        $this->hasColumn('title', 'string', 255);
+        $this->hasColumn('body', 'clob');
+    }
+
+    public function setUp()
+    {
+        $this->actAs('I18n', array('fields' => array('title', 'body'), 'type' => 'integer', 'length' => 4));
+    }
+}
+
+class I18nTestImport extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 200);
+        $this->hasColumn('title', 'string', 200);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('I18n', array('fields' => array('name', 'title')));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDict/MssqlTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDict/MssqlTestCase.php
new file mode 100644
index 000000000..93011eb16
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDict/MssqlTestCase.php
@@ -0,0 +1,259 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_DataDict_Mysql_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_DataDict_Mssql_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testGetPortableDeclarationSupportsNativeBitType() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'bit'));
+        
+        $this->assertEqual($type, array('type' => array('boolean'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+    }
+
+    public function testGetPortableDeclarationSupportsNativeStringTypes() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'text'));
+
+        $this->assertEqual($type, array('type' => array('string', 'clob'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'char', 'length' => 1));
+
+        $this->assertEqual($type, array('type' => array('string', 'boolean'),
+                                        'length' => 1,
+                                        'unsigned' => null,
+                                        'fixed' => true));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'varchar', 'length' => 1));
+        
+        $this->assertEqual($type, array('type' => array('string', 'boolean'),
+                                        'length' => 1,
+                                        'unsigned' => null,
+                                        'fixed' => false));
+    }
+
+    public function testGetPortableDeclarationSupportsNativeBlobTypes() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'image'));
+        
+        $this->assertEqual($type, array('type' => array('blob'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'varbinary'));
+
+        $this->assertEqual($type, array('type' => array('blob'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+    }
+
+    public function testGetPortableDeclarationSupportsNativeIntegerTypes() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'int'));
+        
+        $this->assertEqual($type, array('type' => array('integer'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'int', 'length' => 1));
+        
+        $this->assertEqual($type, array('type' => array('integer', 'boolean'),
+                                        'length' => 1,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+    }
+
+    public function testGetPortableDeclarationSupportsNativeTimestampType() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'datetime'));
+        
+        $this->assertEqual($type, array('type' => array('timestamp'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+    }
+
+    public function testGetPortableDeclarationSupportsNativeDecimalTypes() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'decimal'));
+
+        $this->assertEqual($type, array('type' => array('decimal'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'money'));
+
+        $this->assertEqual($type, array('type' => array('decimal'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+    }
+
+    public function testGetPortableDeclarationSupportsNativeFloatTypes() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'float'));
+
+        $this->assertEqual($type, array('type' => array('float'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'real'));
+
+        $this->assertEqual($type, array('type' => array('float'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'numeric'));
+
+        $this->assertEqual($type, array('type' => array('float'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+    }
+
+    public function testGetNativeDefinitionSupportsIntegerType() 
+    {
+        $a = array('type' => 'integer', 'length' => 20, 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'INT');
+        
+        $a['length'] = 4;
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'INT');
+
+        $a['length'] = 2;
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'INT');
+    }
+
+    public function testGetNativeDefinitionSupportsFloatType() 
+    {
+        $a = array('type' => 'float', 'length' => 20, 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'FLOAT');
+    }
+
+    public function testGetNativeDefinitionSupportsBooleanType() 
+    {
+        $a = array('type' => 'boolean', 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'BIT');
+    }
+
+    public function testGetNativeDefinitionSupportsDateType() 
+    {
+        $a = array('type' => 'date', 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'CHAR(10)');
+    }
+
+    public function testGetNativeDefinitionSupportsTimestampType() 
+    {
+        $a = array('type' => 'timestamp', 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'CHAR(19)');
+    }
+
+    public function testGetNativeDefinitionSupportsTimeType() 
+    {
+        $a = array('type' => 'time', 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'CHAR(8)');
+    }
+
+    public function testGetNativeDefinitionSupportsClobType() 
+    {
+        $a = array('type' => 'clob');
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'TEXT');
+    }
+
+    public function testGetNativeDefinitionSupportsBlobType() 
+    {
+        $a = array('type' => 'blob');
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'IMAGE');
+    }
+
+    public function testGetNativeDefinitionSupportsCharType() 
+    {
+        $a = array('type' => 'char', 'length' => 10);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'CHAR(10)');
+    }
+
+    public function testGetNativeDefinitionSupportsVarcharType() 
+    {
+        $a = array('type' => 'varchar', 'length' => 10);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'VARCHAR(10)');
+    }
+
+    public function testGetNativeDefinitionSupportsArrayType() 
+    {
+        $a = array('type' => 'array', 'length' => 40);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'VARCHAR(40)');
+    }
+
+    public function testGetNativeDefinitionSupportsStringType() 
+    {
+        $a = array('type' => 'string');
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'TEXT');
+    }
+
+    public function testGetNativeDefinitionSupportsArrayType2() 
+    {
+        $a = array('type' => 'array');
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'TEXT');
+    }
+
+    public function testGetNativeDefinitionSupportsObjectType() 
+    {
+        $a = array('type' => 'object');
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'TEXT');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDict/MysqlTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDict/MysqlTestCase.php
new file mode 100644
index 000000000..fd67636aa
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDict/MysqlTestCase.php
@@ -0,0 +1,364 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_DataDict_Mysql_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_DataDict_Mysql_TestCase extends Doctrine_UnitTestCase
+{
+    public function testGetCharsetFieldDeclarationReturnsValidSql() 
+    {
+        $this->assertEqual($this->dataDict->getCharsetFieldDeclaration('UTF-8'), 'CHARACTER SET UTF-8');
+    }
+
+    public function testGetCollationFieldDeclarationReturnsValidSql() 
+    {
+        $this->assertEqual($this->dataDict->getCollationFieldDeclaration('xx'), 'COLLATE xx');
+    }
+
+    public function testGetPortableDeclarationSupportsNativeIntegerTypes() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'tinyint'));
+
+
+        $this->assertEqual($type, array('type' => array('integer', 'boolean'),
+                                        'length' => 1,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'smallint unsigned'));
+
+        $this->assertEqual($type, array('type' => array('integer'), 
+                                        'length' => 2, 
+                                        'unsigned' => true,
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'mediumint unsigned'));
+
+        $this->assertEqual($type, array('type' => array('integer'), 
+                                        'length' => 3,
+                                        'unsigned' => true,
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'int unsigned'));
+
+        $this->assertEqual($type, array('type' => array('integer'), 
+                                        'length' => 4,
+                                        'unsigned' => true,
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'integer unsigned'));
+
+        $this->assertEqual($type, array('type' => array('integer'), 
+                                        'length' => 4,
+                                        'unsigned' => true,
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'bigint unsigned'));
+
+        $this->assertEqual($type, array('type' => array('integer'), 
+                                        'length' => 8,
+                                        'unsigned' => true,
+                                        'fixed' => null));
+    }
+
+    public function testGetPortableDeclarationSupportsNativeStringTypes() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'text'));
+
+        $this->assertEqual($type, array('type' => array('string', 'clob'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => false));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'longtext'));
+
+        $this->assertEqual($type, array('type' => array('string', 'clob'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => false));
+        
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'mediumtext'));
+
+        $this->assertEqual($type, array('type' => array('string', 'clob'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => false));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'tinytext'));
+
+        $this->assertEqual($type, array('type' => array('string', 'clob'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => false));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'char(1)'));
+
+        $this->assertEqual($type, array('type' => array('string', 'boolean'),
+                                        'length' => 1,
+                                        'unsigned' => null,
+                                        'fixed' => true));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'varchar(1)'));
+
+        $this->assertEqual($type, array('type' => array('string', 'boolean'),
+                                        'length' => 1,
+                                        'unsigned' => null,
+                                        'fixed' => false));
+    }
+
+    public function testGetPortableDeclarationSupportsNativeFloatTypes() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'float'));
+        
+        $this->assertEqual($type, array('type' => array('float'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'real unsigned'));
+
+        $this->assertEqual($type, array('type' => array('float'),
+                                        'length' => null,
+                                        'unsigned' => true,
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'double'));
+        
+        $this->assertEqual($type, array('type' => array('float'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+    }
+
+    public function testGetPortableDeclarationSupportsNativeDateType() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'date'));
+        
+        $this->assertEqual($type, array('type' => array('date'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+    }
+
+    public function testGetPortableDeclarationSupportsNativeDecimalTypes() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'decimal'));
+        
+        $this->assertEqual($type, array('type' => array('decimal'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'unknown'));
+        
+        $this->assertEqual($type, array('type' => array('decimal'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+        
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'numeric'));
+        
+        $this->assertEqual($type, array('type' => array('decimal'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+    }
+
+    public function testGetPortableDeclarationSupportsNativeTimestampTypes() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'timestamp'));
+        
+        $this->assertEqual($type, array('type' => array('timestamp'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+        
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'datetime'));
+        
+        $this->assertEqual($type, array('type' => array('timestamp'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+    }
+
+    public function testGetPortableDeclarationSupportsNativeYearType() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'year'));
+
+        
+        $this->assertEqual($type, array('type' => array('integer', 'date'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+    }
+
+    public function testGetPortableDeclarationSupportsNativeBlobTypes() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'blob'));
+
+        $this->assertEqual($type, array('type' => array('blob'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'mediumblob'));
+
+        $this->assertEqual($type, array('type' => array('blob'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+        
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'tinyblob'));
+
+        $this->assertEqual($type, array('type' => array('blob'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'longblob'));
+
+        $this->assertEqual($type, array('type' => array('blob'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+    }
+
+    public function testGetNativeDefinitionSupportsIntegerType() 
+    {
+        $a = array('type' => 'integer', 'length' => 20, 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'BIGINT');
+        
+        $a['length'] = 4;
+
+        $this->assertEqual($this->dataDict->GetNativeDeclaration($a), 'INT');
+
+        $a['length'] = 2;
+
+        $this->assertEqual($this->dataDict->GetNativeDeclaration($a), 'SMALLINT');
+    }
+
+    public function testGetNativeDeclarationSupportsFloatType() 
+    {
+        $a = array('type' => 'float', 'length' => 20, 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->GetNativeDeclaration($a), 'FLOAT(20, 2)');
+    }
+
+    public function testGetNativeDeclarationSupportsBooleanType() 
+    {
+        $a = array('type' => 'boolean', 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->GetNativeDeclaration($a), 'TINYINT(1)');
+    }
+
+    public function testGetNativeDeclarationSupportsDateType() 
+    {
+        $a = array('type' => 'date', 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->GetNativeDeclaration($a), 'DATE');
+    }
+
+    public function testGetNativeDeclarationSupportsTimestampType() 
+    {
+        $a = array('type' => 'timestamp', 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->GetNativeDeclaration($a), 'DATETIME');
+    }
+
+    public function testGetNativeDeclarationSupportsTimeType() 
+    {
+        $a = array('type' => 'time', 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->GetNativeDeclaration($a), 'TIME');
+    }
+
+    public function testGetNativeDeclarationSupportsClobType() 
+    {
+        $a = array('type' => 'clob');
+
+        $this->assertEqual($this->dataDict->GetNativeDeclaration($a), 'LONGTEXT');
+    }
+
+    public function testGetNativeDeclarationSupportsBlobType() 
+    {
+        $a = array('type' => 'blob');
+
+        $this->assertEqual($this->dataDict->GetNativeDeclaration($a), 'LONGBLOB');
+    }
+
+    public function testGetNativeDeclarationSupportsCharType() 
+    {
+        $a = array('type' => 'char', 'length' => 10);
+
+        $this->assertEqual($this->dataDict->GetNativeDeclaration($a), 'CHAR(10)');
+    }
+
+    public function testGetNativeDeclarationSupportsVarcharType() 
+    {
+        $a = array('type' => 'varchar', 'length' => 10);
+
+        $this->assertEqual($this->dataDict->GetNativeDeclaration($a), 'VARCHAR(10)');
+    }
+
+    public function testGetNativeDeclarationSupportsArrayType() 
+    {
+        $a = array('type' => 'array', 'length' => 40);
+
+        $this->assertEqual($this->dataDict->GetNativeDeclaration($a), 'TINYTEXT');
+    }
+
+    public function testGetNativeDeclarationSupportsStringType() 
+    {
+        $a = array('type' => 'string');
+
+        $this->assertEqual($this->dataDict->GetNativeDeclaration($a), 'TEXT');
+    }
+
+    public function testGetNativeDeclarationSupportsStringTypeWithLongLength() 
+    {
+        $a = array('type' => 'string', 'length' => 2000);
+
+        $this->assertEqual($this->dataDict->GetNativeDeclaration($a), 'TEXT');
+    }
+
+    public function testGetNativeDeclarationSupportsArrayType2() 
+    {
+        $a = array('type' => 'array');
+
+        $this->assertEqual($this->dataDict->GetNativeDeclaration($a), 'LONGTEXT');
+    }
+
+    public function testGetNativeDeclarationSupportsObjectType() 
+    {
+        $a = array('type' => 'object');
+
+        $this->assertEqual($this->dataDict->GetNativeDeclaration($a), 'LONGTEXT');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDict/OracleTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDict/OracleTestCase.php
new file mode 100644
index 000000000..78d92c30b
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDict/OracleTestCase.php
@@ -0,0 +1,348 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_DataDict_Oracle_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_DataDict_Oracle_TestCase extends Doctrine_UnitTestCase
+{
+    public function testGetPortableDeclarationSupportsNativeFloatType() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('data_type' => 'float'));
+
+        $this->assertEqual($type, array('type' => array('float'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+    }
+
+    public function testGetPortableDeclarationSupportsNativeIntegerTypes()
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('data_type' => 'integer'));
+        
+        $this->assertEqual($type, array('type' => array('integer'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('data_type' => 'pls_integer', 'data_length' => 1));
+        
+        $this->assertEqual($type, array('type' => array('integer', 'boolean'),
+                                        'length' => 1,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('data_type' => 'binary_integer', 'data_length' => 1));
+        
+        $this->assertEqual($type, array('type' => array('integer', 'boolean'),
+                                        'length' => 1,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+    }
+
+    public function testGetPortableDeclarationSupportsNativeStringTypes() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('data_type' => 'varchar'));
+
+        $this->assertEqual($type, array('type' => array('string'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('data_type' => 'varchar2', 'data_length' => 1));
+
+        $this->assertEqual($type, array('type' => array('string', 'boolean'),
+                                        'length' => 1,
+                                        'unsigned' => null,
+                                        'fixed' => false));
+
+        $type = $this->dataDict->getPortableDeclaration(array('data_type' => 'nvarchar2', 'data_length' => 1));
+        
+        $this->assertEqual($type, array('type' => array('string', 'boolean'),
+                                        'length' => 1,
+                                        'unsigned' => null,
+                                        'fixed' => false));
+        
+        $type = $this->dataDict->getPortableDeclaration(array('data_type' => 'char', 'data_length' => 1));
+
+        $this->assertEqual($type, array('type' => array('string', 'boolean'),
+                                        'length' => 1,
+                                        'unsigned' => null,
+                                        'fixed' => true));
+
+        $type = $this->dataDict->getPortableDeclaration(array('data_type' => 'nchar', 'data_length' => 1));
+        
+        $this->assertEqual($type, array('type' => array('string', 'boolean'),
+                                        'length' => 1,
+                                        'unsigned' => null,
+                                        'fixed' => true));
+    }
+
+    public function testGetPortableDeclarationSupportsNativeNumberType() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('data_type' => 'number'));
+        
+        $this->assertEqual($type, array('type' => array('integer'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+
+
+        $type = $this->dataDict->getPortableDeclaration(array('data_type' => 'number', 'data_length' => 1));
+        
+        $this->assertEqual($type, array('type' => array('integer', 'boolean'),
+                                        'length' => 1,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+
+    }
+
+    public function testGetPortableDeclarationSupportsNativeTimestampType() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('data_type' => 'date'));
+        
+        $this->assertEqual($type, array('type' => array('timestamp'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('data_type' => 'timestamp'));
+        
+        $this->assertEqual($type, array('type' => array('timestamp'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+    }
+
+    public function testGetPortableDeclarationSupportsNativeClobTypes() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('data_type' => 'clob'));
+        
+        $this->assertEqual($type, array('type' => array('clob'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('data_type' => 'long'));
+        
+        $this->assertEqual($type, array('type' => array('string', 'clob'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+        
+        $type = $this->dataDict->getPortableDeclaration(array('data_type' => 'nclob'));
+        
+        $this->assertEqual($type, array('type' => array('clob'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+
+    }
+
+    public function testGetPortableDeclarationSupportsNativeBlobTypes() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('data_type' => 'blob'));
+        
+        $this->assertEqual($type, array('type' => array('blob'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('data_type' => 'long raw'));
+
+        $this->assertEqual($type, array('type' => array('blob'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('data_type' => 'long raw'));
+
+        $this->assertEqual($type, array('type' => array('blob'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+        
+        $type = $this->dataDict->getPortableDeclaration(array('data_type' => 'raw'));
+
+        $this->assertEqual($type, array('type' => array('blob'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => null));
+    }
+
+    public function testGetNativeDefinitionSupportsIntegerType() 
+    {
+        $a = array('type' => 'integer', 'length' => 20, 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'INTEGER');
+        
+        $a['length'] = 8;
+        
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'NUMBER(20)');
+        
+        $a['length'] = 4;
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'NUMBER(10)');
+
+        $a['length'] = 3;
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'NUMBER(8)');
+        
+        $a['length'] = 2;
+        
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'NUMBER(5)');
+        
+        $a['length'] = 1;
+        
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'NUMBER(3)');
+        
+        unset($a['length']);
+        
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'INTEGER');
+    }
+
+    public function testGetNativeDefinitionSupportsFloatType() 
+    {
+        $a = array('type' => 'float', 'length' => 20, 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'NUMBER');
+    }
+
+    public function testGetNativeDefinitionSupportsBooleanType() 
+    {
+        $a = array('type' => 'boolean', 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'NUMBER(1)');
+    }
+
+    public function testGetNativeDefinitionSupportsDateType() 
+    {
+        $a = array('type' => 'date', 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'DATE');
+    }
+
+    public function testGetNativeDefinitionSupportsTimestampType() 
+    {
+        $a = array('type' => 'timestamp', 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'DATE');
+    }
+
+    public function testGetNativeDefinitionSupportsTimeType() 
+    {
+        $a = array('type' => 'time', 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'DATE');
+    }
+
+    public function testGetNativeDefinitionSupportsClobType() 
+    {
+        $a = array('type' => 'clob');
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'CLOB');
+    }
+
+    public function testGetNativeDefinitionSupportsBlobType() 
+    {
+        $a = array('type' => 'blob');
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'BLOB');
+    }
+
+    public function testGetNativeDefinitionSupportsCharType() 
+    {
+        $a = array('type' => 'char', 'length' => 10);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'CHAR(10)');
+    }
+
+    public function testGetNativeDefinitionSupportsVarcharType() 
+    {
+        $a = array('type' => 'varchar', 'length' => 10);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'VARCHAR2(10)');
+    }
+
+    public function testGetNativeDefinitionSupportsVarcharOwnParams()
+    {
+        $a = array('type' => 'varchar', 'length' => 10);
+        
+        $this->conn->setParam('char_unit', 'CHAR');
+        $this->conn->setParam('varchar2_max_length', 1000);
+        
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'VARCHAR2(10 CHAR)');
+        
+        $a['length'] = 1001;
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'CLOB');
+        
+        $this->conn->setParam('char_unit', 'BYTE');
+        $this->conn->setParam('varchar2_max_length', 4000);
+        
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'VARCHAR2(1001 BYTE)');
+        
+        $this->conn->setParam('char_unit', null);
+    }
+
+    public function testGetNativeDefinitionSupportsArrayType() 
+    {
+        $a = array('type' => 'array', 'length' => 40);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'VARCHAR2(40)');
+    }
+
+    public function testGetNativeDefinitionSupportsStringType() 
+    {
+        $a = array('type' => 'string');
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'CLOB');
+    }
+
+    public function testGetNativeDefinitionSupportsArrayType2() 
+    {
+        $a = array('type' => 'array');
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'CLOB');
+    }
+
+    public function testGetNativeDefinitionSupportsObjectType() 
+    {
+        $a = array('type' => 'object');
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'CLOB');
+    }
+
+    public function testGetNativeDefinitionSupportsLargerStrings()
+    {
+        $a = array('type' => 'string', 'length' => 4001);
+        
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'CLOB');
+    }
+    
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDict/PgsqlTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDict/PgsqlTestCase.php
new file mode 100644
index 000000000..d919bdc4e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDict/PgsqlTestCase.php
@@ -0,0 +1,373 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_DataDict_Oracle_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_DataDict_Pgsql_TestCase extends Doctrine_UnitTestCase 
+{
+    public function getDeclaration($type) 
+    {
+        return $this->dataDict->getPortableDeclaration(array('type' => $type, 'name' => 'colname', 'length' => 2, 'fixed' => true));
+    }
+ 
+    public function testGetPortableDeclarationSupportsNativeBlobTypes() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'blob'));
+        
+        $this->assertEqual($type, array('type' => array('blob'), 
+                                        'length' => null, 
+                                        'unsigned' => null, 
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'tinyblob'));
+
+        $this->assertEqual($type, array('type' => array('blob'), 
+                                        'length' => null, 
+                                        'unsigned' => null, 
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'mediumblob'));
+
+        $this->assertEqual($type, array('type' => array('blob'), 
+                                        'length' => null, 
+                                        'unsigned' => null, 
+                                        'fixed' => null));
+        
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'longblob'));
+
+        $this->assertEqual($type, array('type' => array('blob'), 
+                                        'length' => null, 
+                                        'unsigned' => null, 
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'bytea'));
+
+        $this->assertEqual($type, array('type' => array('blob'), 
+                                        'length' => null, 
+                                        'unsigned' => null, 
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'oid'));
+
+        $this->assertEqual($type, array('type' => array('blob', 'clob'),
+                                        'length' => null, 
+                                        'unsigned' => null,
+                                        'fixed' => null));
+    }
+
+    public function testGetPortableDeclarationSupportsNativeTimestampTypes()
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'timestamp'));
+        
+        $this->assertEqual($type, array('type' => array('timestamp'),
+                                        'length' => null, 
+                                        'unsigned' => null, 
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'datetime'));
+        
+        $this->assertEqual($type, array('type' => array('timestamp'),
+                                        'length' => null, 
+                                        'unsigned' => null, 
+                                        'fixed' => null));
+    }
+
+    public function testGetPortableDeclarationSupportsNativeDecimalTypes() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'decimal'));
+
+        $this->assertEqual($type, array('type' => array('decimal'),
+                                        'length' => null, 
+                                        'unsigned' => null, 
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'money'));
+
+        $this->assertEqual($type, array('type' => array('decimal'),
+                                        'length' => null, 
+                                        'unsigned' => null, 
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'numeric'));
+
+        $this->assertEqual($type, array('type' => array('decimal'),
+                                        'length' => null, 
+                                        'unsigned' => null, 
+                                        'fixed' => null));
+    }
+
+    public function testGetPortableDeclarationSupportsNativeFloatTypes() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'float'));
+        
+        $this->assertEqual($type, array('type' => array('float'),
+                                        'length' => null, 
+                                        'unsigned' => null, 
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'double'));
+        
+        $this->assertEqual($type, array('type' => array('float'),
+                                        'length' => null, 
+                                        'unsigned' => null, 
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'real'));
+        
+        $this->assertEqual($type, array('type' => array('float'),
+                                        'length' => null, 
+                                        'unsigned' => null, 
+                                        'fixed' => null));
+    }
+
+    public function testGetPortableDeclarationSupportsNativeYearType() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'year'));
+
+        $this->assertEqual($type, array('type' => array('integer', 'date'),
+                                        'length' => null, 
+                                        'unsigned' => null, 
+                                        'fixed' => null));
+    }
+
+    public function testGetPortableDeclarationSupportsNativeDateType() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'date'));
+        
+        $this->assertEqual($type, array('type' => array('date'),
+                                        'length' => null, 
+                                        'unsigned' => null, 
+                                        'fixed' => null));
+    }
+
+    public function testGetPortableDeclarationSupportsNativeTimeType() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'time'));
+        
+        $this->assertEqual($type, array('type' => array('time'),
+                                        'length' => null, 
+                                        'unsigned' => null, 
+                                        'fixed' => null));
+    }
+
+    public function testGetPortableDeclarationSupportsNativeStringTypes() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'text'));
+
+        $this->assertEqual($type, array('type' => array('string', 'clob'),
+                                        'length' => null, 
+                                        'unsigned' => null, 
+                                        'fixed' => null));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'interval'));
+
+        $this->assertEqual($type, array('type' => array('string'),
+                                        'length' => null,
+                                        'unsigned' => null,
+                                        'fixed' => false));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'varchar', 'length' => 1));
+
+        $this->assertEqual($type, array('type' => array('string', 'boolean'),
+                                        'length' => 1,
+                                        'unsigned' => null,
+                                        'fixed' => false));
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'unknown', 'length' => 1));
+        
+        $this->assertEqual($type, array('type' => array('string', 'boolean'),
+                                        'length' => 1,
+                                        'unsigned' => null,
+                                        'fixed' => true));
+
+        
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'char', 'length' => 1));
+
+        $this->assertEqual($type, array('type' => array('string', 'boolean'),
+                                        'length' => 1,
+                                        'unsigned' => null,
+                                        'fixed' => true));
+
+
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'bpchar', 'length' => 1));
+        
+        $this->assertEqual($type, array('type' => array('string', 'boolean'),
+                                        'length' => 1,
+                                        'unsigned' => null,
+                                        'fixed' => true));
+
+    }
+
+    public function testGetPortableDeclarationSupportsNativeIntegerTypes() 
+    {
+        $type = $this->dataDict->getPortableDeclaration(array('type' => 'smallint'));
+
+        $this->assertEqual($this->getDeclaration('smallint'), array('type' => array('integer', 'boolean'), 'length' => 2, 'unsigned' => false, 'fixed' => null));
+        $this->assertEqual($this->getDeclaration('int2'), array('type' => array('integer', 'boolean'), 'length' => 2, 'unsigned' => false, 'fixed' => null));
+
+        $this->assertEqual($this->getDeclaration('int'), array('type' => array('integer'), 'length' => 4, 'unsigned' => false, 'fixed' => null));
+        $this->assertEqual($this->getDeclaration('int4'), array('type' => array('integer'), 'length' => 4, 'unsigned' => false, 'fixed' => null));
+        $this->assertEqual($this->getDeclaration('integer'), array('type' => array('integer'), 'length' => 4, 'unsigned' => false, 'fixed' => null));
+        $this->assertEqual($this->getDeclaration('serial'), array('type' => array('integer'), 'length' => 4, 'unsigned' => false, 'fixed' => null));
+        $this->assertEqual($this->getDeclaration('serial4'), array('type' => array('integer'), 'length' => 4, 'unsigned' => false, 'fixed' => null));
+
+        $this->assertEqual($this->getDeclaration('bigint'), array('type' => array('integer'), 'length' => 8, 'unsigned' => false, 'fixed' => null));
+        $this->assertEqual($this->getDeclaration('int8'), array('type' => array('integer'), 'length' => 8, 'unsigned' => false, 'fixed' => null));
+        $this->assertEqual($this->getDeclaration('bigserial'), array('type' => array('integer'), 'length' => 8, 'unsigned' => false, 'fixed' => null));
+        $this->assertEqual($this->getDeclaration('serial8'), array('type' => array('integer'), 'length' => 8, 'unsigned' => false, 'fixed' => null));
+    }
+
+    public function testGetPortableDeclarationSupportsNativeBooleanTypes()
+    {
+        $this->assertEqual($this->getDeclaration('bool'), array('type' => array('boolean'), 'length' => 1, 'unsigned' => false, 'fixed' => null));
+        $this->assertEqual($this->getDeclaration('boolean'), array('type' => array('boolean'), 'length' => 1, 'unsigned' => false, 'fixed' => null));
+    }
+
+    public function testGetNativeDefinitionSupportsIntegerType() 
+    {
+        $a = array('type' => 'integer', 'length' => 20, 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'BIGINT');
+        
+        $a['length'] = 4;
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'INT');
+
+        $a['length'] = 2;
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'SMALLINT');
+    }
+
+    public function testGetNativeDefinitionSupportsIntegerTypeWithAutoinc() 
+    {
+        $a = array('type' => 'integer', 'length' => 20, 'fixed' => false, 'autoincrement' => true);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'BIGSERIAL');
+
+        $a['length'] = 4;
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'SERIAL');
+
+        $a['length'] = 2;
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'SERIAL');
+    }
+
+    public function testGetNativeDefinitionSupportsFloatType() 
+    {
+        $a = array('type' => 'float', 'length' => 20, 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'FLOAT');
+    }
+
+    public function testGetNativeDefinitionSupportsBooleanType()
+    {
+        $a = array('type' => 'boolean', 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'BOOLEAN');
+    }
+
+    public function testGetNativeDefinitionSupportsDateType() 
+    {
+        $a = array('type' => 'date', 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'DATE');
+    }
+
+    public function testGetNativeDefinitionSupportsTimestampType() 
+    {
+        $a = array('type' => 'timestamp', 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'TIMESTAMP');
+    }
+
+    public function testGetNativeDefinitionSupportsTimeType() 
+    {
+        $a = array('type' => 'time', 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'TIME');
+    }
+
+    public function testGetNativeDefinitionSupportsClobType() 
+    {
+        $a = array('type' => 'clob');
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'TEXT');
+    }
+
+    public function testGetNativeDefinitionSupportsBlobType() 
+    {
+        $a = array('type' => 'blob');
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'BYTEA');
+    }
+
+    public function testGetNativeDefinitionSupportsCharType() 
+    {
+        $a = array('type' => 'char', 'length' => 10);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'CHAR(10)');
+    }
+
+    public function testGetNativeDefinitionSupportsVarcharType() 
+    {
+        $a = array('type' => 'varchar', 'length' => 10);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'VARCHAR(10)');
+    }
+
+    public function testGetNativeDefinitionSupportsArrayType() 
+    {
+        $a = array('type' => 'array', 'length' => 40);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'VARCHAR(40)');
+    }
+
+    public function testGetNativeDefinitionSupportsStringType() 
+    {
+        $a = array('type' => 'string');
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'TEXT');
+    }
+
+    public function testGetNativeDefinitionSupportsArrayType2() 
+    {
+        $a = array('type' => 'array');
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'TEXT');
+    }
+
+    public function testGetNativeDefinitionSupportsObjectType() 
+    {
+        $a = array('type' => 'object');
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'TEXT');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDict/SqliteTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDict/SqliteTestCase.php
new file mode 100644
index 000000000..a0c3753f4
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDict/SqliteTestCase.php
@@ -0,0 +1,183 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_DataDict_Sqlite_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_DataDict_Sqlite_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testBooleanMapsToBooleanType() 
+    {
+        $this->assertDeclarationType('boolean', 'boolean');
+    }
+
+    public function testIntegersMapToIntegerType() 
+    {
+        $this->assertDeclarationType('tinyint', array('integer', 'boolean'));
+        $this->assertDeclarationType('smallint', 'integer');
+        $this->assertDeclarationType('mediumint', 'integer');
+        $this->assertDeclarationType('int', 'integer');
+        $this->assertDeclarationType('integer', 'integer');
+        $this->assertDeclarationType('serial', 'integer');
+        $this->assertDeclarationType('bigint', 'integer');
+        $this->assertDeclarationType('bigserial', 'integer');
+    }
+
+    public function testBlobsMapToBlobType() 
+    {
+        $this->assertDeclarationType('tinyblob', 'blob');
+        $this->assertDeclarationType('mediumblob', 'blob');
+        $this->assertDeclarationType('longblob', 'blob');
+        $this->assertDeclarationType('blob', 'blob');
+    }
+
+    public function testDecimalMapsToDecimal() 
+    {
+        $this->assertDeclarationType('decimal', 'decimal');
+        $this->assertDeclarationType('numeric', 'decimal');
+    }
+
+    public function testFloatRealAndDoubleMapToFloat() 
+    {
+        $this->assertDeclarationType('float', 'float');
+        $this->assertDeclarationType('double', 'float');
+        $this->assertDeclarationType('real', 'float');
+    }
+
+    public function testYearMapsToIntegerAndDate() 
+    {
+        $this->assertDeclarationType('year', array('integer','date'));
+    }
+
+    public function testGetNativeDefinitionSupportsIntegerType() 
+    {
+        $a = array('type' => 'integer', 'length' => 20, 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'INTEGER');
+
+        $a['length'] = 4;
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'INTEGER');
+
+        $a['length'] = 2;
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'INTEGER');
+    }
+
+    public function testGetNativeDefinitionSupportsFloatType() 
+    {
+        $a = array('type' => 'float', 'length' => 20, 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'DOUBLE');
+    }
+
+    public function testGetNativeDefinitionSupportsBooleanType() 
+    {
+        $a = array('type' => 'boolean', 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'INTEGER');
+    }
+
+    public function testGetNativeDefinitionSupportsDateType() 
+    {
+        $a = array('type' => 'date', 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'DATE');
+    }
+
+    public function testGetNativeDefinitionSupportsTimestampType() 
+    {
+        $a = array('type' => 'timestamp', 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'DATETIME');
+    }
+
+    public function testGetNativeDefinitionSupportsTimeType() 
+    {
+        $a = array('type' => 'time', 'fixed' => false);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'TIME');
+    }
+
+    public function testGetNativeDefinitionSupportsClobType() 
+    {
+        $a = array('type' => 'clob');
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'LONGTEXT');
+    }
+
+    public function testGetNativeDefinitionSupportsBlobType() 
+    {
+        $a = array('type' => 'blob');
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'LONGBLOB');
+    }
+
+    public function testGetNativeDefinitionSupportsCharType() 
+    {
+        $a = array('type' => 'char', 'length' => 10);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'CHAR(10)');
+    }
+
+    public function testGetNativeDefinitionSupportsVarcharType() 
+    {
+        $a = array('type' => 'varchar', 'length' => 10);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'VARCHAR(10)');
+    }
+
+    public function testGetNativeDefinitionSupportsArrayType() 
+    {
+        $a = array('type' => 'array', 'length' => 40);
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'VARCHAR(40)');
+    }
+
+    public function testGetNativeDefinitionSupportsStringType() 
+    {
+        $a = array('type' => 'string');
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'TEXT');
+    }
+
+    public function testGetNativeDefinitionSupportsArrayType2() 
+    {
+        $a = array('type' => 'array');
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'TEXT');
+    }
+
+    public function testGetNativeDefinitionSupportsObjectType() 
+    {
+        $a = array('type' => 'object');
+
+        $this->assertEqual($this->dataDict->getNativeDeclaration($a), 'TEXT');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDictSqliteTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDictSqliteTestCase.php
new file mode 100644
index 000000000..f2019de66
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDictSqliteTestCase.php
@@ -0,0 +1,63 @@
+<?php
+/**
+class Doctrine_DataDict_Sqlite_TestCase extends Doctrine_UnitTestCase {
+    private $dict;
+    
+    private $columns;
+    public function prepareData() { }
+    public function prepareTables() {
+        $this->dbh->query("CREATE TABLE test (col_null NULL,
+                                              col_int  INTEGER NOT NULL,
+                                              col_real REAL,
+                                              col_text TEXT DEFAULT 'default' NOT NULL,
+                                              col_blob BLOB)");
+
+        $this->dict = new Doctrine_DataDict_Sqlite($this->dbh);
+        $this->columns = $this->dict->listTableColumns('test');
+    }
+    public function testListTables() {
+        $result = $this->dict->listTables();
+        
+    }
+    public function testIntegerType() {
+        $this->assertEqual($this->columns['col_int']->isUnique(), false);
+        $this->assertEqual($this->columns['col_int']->isNotNull(), true);
+        $this->assertEqual($this->columns['col_int']->defaultValue(), null);
+        $this->assertEqual($this->columns['col_int']->isPrimaryKey(), false);
+        $this->assertEqual($this->columns['col_int']->getType(), 'INTEGER');
+        $this->assertEqual($this->columns['col_int']->getName(), 'col_int');
+    }
+    public function testNullType() {
+        $this->assertEqual($this->columns['col_null']->isUnique(), false);
+        $this->assertEqual($this->columns['col_null']->isNotNull(), false);
+        $this->assertEqual($this->columns['col_null']->defaultValue(), null);
+        $this->assertEqual($this->columns['col_null']->isPrimaryKey(), false);
+        $this->assertEqual($this->columns['col_null']->getType(), 'numeric');
+        $this->assertEqual($this->columns['col_null']->getName(), 'col_null');
+    }
+    public function testTextType() {
+        $this->assertEqual($this->columns['col_text']->isUnique(), false);
+        $this->assertEqual($this->columns['col_text']->isNotNull(), true);
+        $this->assertEqual($this->columns['col_text']->defaultValue(), 'default');
+        $this->assertEqual($this->columns['col_text']->isPrimaryKey(), false);
+        $this->assertEqual($this->columns['col_text']->getType(), 'TEXT');
+        $this->assertEqual($this->columns['col_text']->getName(), 'col_text');
+    }
+    public function testBlobType() {
+        $this->assertEqual($this->columns['col_blob']->isUnique(), false);
+        $this->assertEqual($this->columns['col_blob']->isNotNull(), false);
+        $this->assertEqual($this->columns['col_blob']->defaultValue(), null);
+        $this->assertEqual($this->columns['col_blob']->isPrimaryKey(), false);
+        $this->assertEqual($this->columns['col_blob']->getType(), 'BLOB');
+        $this->assertEqual($this->columns['col_blob']->getName(), 'col_blob');
+    }        
+    public function testRealType() {
+        $this->assertEqual($this->columns['col_real']->isUnique(), false);
+        $this->assertEqual($this->columns['col_real']->isNotNull(), false);
+        $this->assertEqual($this->columns['col_real']->defaultValue(), null);
+        $this->assertEqual($this->columns['col_real']->isPrimaryKey(), false);
+        $this->assertEqual($this->columns['col_real']->getType(), 'REAL');
+        $this->assertEqual($this->columns['col_real']->getName(), 'col_real');
+    }
+}
+*/
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDictTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDictTestCase.php
new file mode 100644
index 000000000..66059782b
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataDictTestCase.php
@@ -0,0 +1,34 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_DataDict_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_DataDict_TestCase extends Doctrine_UnitTestCase {
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataType/BooleanTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataType/BooleanTestCase.php
new file mode 100644
index 000000000..78863ea0a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataType/BooleanTestCase.php
@@ -0,0 +1,118 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_DataType_Boolean_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_DataType_Boolean_TestCase extends Doctrine_UnitTestCase {
+    public function prepareData() { }
+    public function prepareTables() {
+        $this->tables = array("BooleanTest");
+        parent::prepareTables();
+    }
+   
+    public function testSetFalse() {
+        $test = new BooleanTest();
+        $test->is_working = false;
+
+        $this->assertIdentical($test->is_working, false);
+        $this->assertEqual($test->state(), Doctrine_Record::STATE_TDIRTY);
+        $test->save();
+
+        $test->refresh();
+        $this->assertIdentical($test->is_working, false);
+    }
+
+    public function testSetTrue() {
+        $test = new BooleanTest();
+        $test->is_working = true;
+        $this->assertIdentical($test->is_working, true);
+        $test->save();
+        
+        $test->refresh();
+        $this->assertIdentical($test->is_working, true);
+        
+        $this->connection->clear();
+        
+        $test = $test->getTable()->find($test->id);
+        $this->assertIdentical($test->is_working, true);
+    }
+    public function testNormalQuerying() {
+        $query = new Doctrine_Query($this->connection);
+        $ret = $query->query('FROM BooleanTest WHERE BooleanTest.is_working = 0');
+        $this->assertEqual(count($ret), 1);
+
+        $query = new Doctrine_Query($this->connection);
+        $ret = $query->query('FROM BooleanTest WHERE BooleanTest.is_working = 1');
+
+        $this->assertEqual(count($ret), 1);
+    }
+    public function testPreparedQueries() {
+        $query = new Doctrine_Query($this->connection);
+        $ret = $query->query('FROM BooleanTest WHERE BooleanTest.is_working = ?', array(false));
+        $this->assertEqual(count($ret), 1);
+
+        $query = new Doctrine_Query($this->connection);
+        $ret = $query->query('FROM BooleanTest WHERE BooleanTest.is_working = ?', array(true));
+        $this->assertEqual(count($ret), 1);
+    }
+    public function testFetchingWithSmartConversion() {
+        $query = new Doctrine_Query($this->connection);
+        $ret = $query->query('FROM BooleanTest WHERE BooleanTest.is_working = false');
+        $this->assertEqual(count($ret), 1);
+
+        $query = new Doctrine_Query($this->connection);
+        $ret = $query->query('FROM BooleanTest WHERE BooleanTest.is_working = true');
+
+        $this->assertEqual(count($ret), 1);
+    }
+
+    public function testSavingNullValue() {
+        $test = new BooleanTest();
+        $test->is_working = null;
+
+        $this->assertIdentical($test->is_working, null);
+        $this->assertEqual($test->state(), Doctrine_Record::STATE_TDIRTY);
+        $test->save();
+
+        $test->refresh();
+        $this->assertIdentical($test->is_working, null);
+        
+        $test = new BooleanTest();
+        $test->is_working_notnull = null;
+
+        $this->assertIdentical($test->is_working_notnull, false);
+        $this->assertEqual($test->state(), Doctrine_Record::STATE_TDIRTY);
+        $test->save();
+
+        $test->refresh();
+        $this->assertIdentical($test->is_working_notnull, false);
+    }
+
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataType/EnumTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataType/EnumTestCase.php
new file mode 100644
index 000000000..a722becdc
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DataType/EnumTestCase.php
@@ -0,0 +1,258 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_DataType_Enum_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_DataType_Enum_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData() 
+    { }
+    public function prepareTables() 
+    {
+        $this->tables = array("EnumTest", "EnumTest2", "EnumTest3");
+        parent::prepareTables();
+    }
+
+    public function testParameterConversion() 
+    {
+        $test = new EnumTest();
+        $test->status = 'open';
+        $this->assertEqual($test->status, 'open');
+        $test->save();
+        
+        try {
+            $query = new Doctrine_Query($this->connection);
+            $ret = $query->query("FROM EnumTest WHERE EnumTest.status = 'open'");
+            $this->assertEqual(count($ret), 1);
+        } catch (Exception $e) {
+          $this->fail();
+        }
+    }
+    
+    public function testUpdate()
+    {
+        $test = new EnumTest2();
+        $test->status = 'open';
+        $this->assertEqual($test->status, 'open');
+        $test->save();
+
+        $test_update = Doctrine_Core::getTable('EnumTest2')->find(1);
+        $test_update->status = 'verified';
+        $this->assertEqual($test_update->status, 'verified');
+        $test_update->save();
+    }
+
+    public function testDqlUpdate()
+    {
+        $query = new Doctrine_Query($this->connection);
+        $query->update('EnumTest2 u')
+            ->set('u.status', '?', 'verified');
+
+        $this->assertEqual($query->getSqlQuery(), 'UPDATE enum_test2 SET status = ?');   
+
+        $query->execute();
+
+        try {
+            $query = new Doctrine_Query($this->connection);
+            $ret = $query->query("FROM EnumTest2 WHERE EnumTest2.status = 'verified'");
+            $this->assertEqual(count($ret), 1);
+        } catch (Exception $e) {
+            $this->fail();
+        }
+    }
+    
+    public function testParameterConversionInCount() 
+    {
+        try {
+            $query = new Doctrine_Query($this->connection);
+            $ret = $query->parseDqlQuery("FROM EnumTest WHERE EnumTest.status = 'open'")
+              ->count();
+            $this->assertEqual($ret, 1);
+        } catch (Exception $e) {
+            $this->fail();
+        }
+
+        try {
+            $query = new Doctrine_Query($this->connection);
+            $ret = $query->parseDqlQuery("FROM EnumTest WHERE EnumTest.status = ?")
+              ->count(array('open'));
+            $this->assertEqual($ret, 1);
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+
+    public function testInAndNotIn() 
+    {
+        try {
+            $query = new Doctrine_Query($this->connection);
+            $ret = $query->query("FROM EnumTest WHERE EnumTest.status IN ('open')");
+            $this->assertEqual(count($ret), 1);
+        } catch (Exception $e) {
+            $this->fail();
+        }
+
+        try {
+            $query = new Doctrine_Query($this->connection);
+            $ret = $query->query("FROM EnumTest WHERE EnumTest.status NOT IN ('verified', 'closed')");
+            $this->assertEqual(count($ret), 1);
+        } catch (Exception $e) {
+            $this->fail();
+        }
+    }
+
+    public function testExpressionComposition() 
+    {
+        try {
+            $query = new Doctrine_Query($this->connection);
+            $ret = $query->query("FROM EnumTest e WHERE e.id > 0 AND (e.status != 'closed' OR e.status = 'verified')");
+            $this->assertEqual(count($ret), 1);
+        } catch (Exception $e) {
+            $this->fail();
+        }
+    }
+
+    public function testNotEqual() 
+    {
+        try {
+            $query = new Doctrine_Query($this->connection);
+            $ret = $query->query("FROM EnumTest WHERE EnumTest.status != 'closed'");
+            $this->assertEqual(count($ret), 1);
+        } catch (Exception $e) {
+            $this->fail();
+        }
+    }
+
+    public function testEnumType() 
+    {
+
+        $enum = new EnumTest();
+        $enum->status = 'open';
+        $this->assertEqual($enum->status, 'open');
+        $enum->save();
+        $this->assertEqual($enum->status, 'open');
+        $enum->refresh();
+        $this->assertEqual($enum->status, 'open');
+
+        $enum->status = 'closed';
+
+        $this->assertEqual($enum->status, 'closed');
+
+        $enum->save();
+        $this->assertEqual($enum->status, 'closed');
+        $this->assertTrue(is_numeric($enum->id));
+        $enum->refresh();
+        $this->assertEqual($enum->status, 'closed');
+    }
+
+    public function testEnumTypeWithCaseConversion() 
+    {
+        $this->conn->setAttribute(PDO::ATTR_CASE, PDO::CASE_UPPER);
+
+        $enum = new EnumTest();
+
+        $enum->status = 'open';
+        $this->assertEqual($enum->status, 'open');
+
+        $enum->save();
+        $this->assertEqual($enum->status, 'open');
+
+        $enum->refresh();
+        $this->assertEqual($enum->status, 'open');      
+        
+        $enum->status = 'closed';
+
+        $this->assertEqual($enum->status, 'closed');
+
+        $enum->save();
+        $this->assertEqual($enum->status, 'closed');
+
+        $enum->refresh();
+        $this->assertEqual($enum->status, 'closed');
+
+        $this->conn->setAttribute(PDO::ATTR_CASE, PDO::CASE_NATURAL);
+    }
+
+    public function testFailingRefresh() 
+    {
+        $enum = $this->connection->getTable('EnumTest')->find(1);
+
+        $this->conn->exec('DELETE FROM enum_test WHERE id = 1');
+
+        try {
+            $enum->refresh();
+
+            $this->fail();
+        } catch(Doctrine_Record_Exception $e) {
+            $this->pass();
+        }
+    }
+
+    public function testEnumFetchArray()
+    {
+        $q = new Doctrine_Query();
+        $q->select('e.*')
+          ->from('EnumTest e')
+          ->limit(1);
+        $ret = $q->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+        if (is_numeric($ret[0]['status'])) {
+            $this->fail();
+        }
+    }
+
+    public function testLiteralEnumValueConversionSupportsJoins()
+    {
+        $q = new Doctrine_Query($this->connection);
+        $q->addSelect('e.*')
+          ->addSelect('e3.*')
+          ->from('EnumTest e')
+          ->leftJoin('e.Enum3 e3')
+          ->where("e.status = 'verified'")
+          ->execute();
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e.status AS e__status, e.text AS e__text, e2.text AS e2__text FROM enum_test e LEFT JOIN enum_test3 e2 ON e.text = e2.text WHERE (e.status = 'verified')");
+    }
+
+    public function testInvalidValueErrors()
+    {
+        $orig = Doctrine_Manager::getInstance()->getAttribute(Doctrine_Core::ATTR_VALIDATE);
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+        try {
+            $test = new EnumTest();
+            $test->status = 'opeerertn';
+            $test->save();
+            $this->fail();
+        } catch (Exception $e) {
+            $this->pass();
+        }
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, $orig);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Db/ProfilerTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Db/ProfilerTestCase.php
new file mode 100644
index 000000000..bad7733a4
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Db/ProfilerTestCase.php
@@ -0,0 +1,176 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Connection_Profiler_TestCase
+ *
+ * @package     Doctrine
+ * @subpackage  Doctrine_Db
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Connection_Profiler_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {}
+    public function prepareData() 
+    {}
+    
+    public function testQuery() 
+    {
+        $this->conn = Doctrine_Manager::getInstance()->openConnection(array('sqlite::memory:'));
+
+        $this->profiler = new Doctrine_Connection_Profiler();
+
+        $this->conn->setListener($this->profiler);
+
+        $this->conn->exec('CREATE TABLE test (id INT)');
+        
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), 'CREATE TABLE test (id INT)');
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getCode(), Doctrine_Db_Event::EXEC);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+        
+        $this->assertEqual($this->conn->count(), 1);
+    }
+    public function testPrepareAndExecute() 
+    {
+
+        $stmt  = $this->conn->prepare('INSERT INTO test (id) VALUES (?)');
+        $event = $this->profiler->lastEvent();
+
+        $this->assertEqual($event->getQuery(), 'INSERT INTO test (id) VALUES (?)');
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getCode(), Doctrine_Db_Event::PREPARE);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+
+        $stmt->execute(array(1));
+
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), 'INSERT INTO test (id) VALUES (?)');
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getCode(), Doctrine_Db_Event::EXECUTE);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+
+        $this->assertEqual($this->conn->count(), 2);
+    }
+    public function testMultiplePrepareAndExecute() 
+    {
+
+        $stmt = $this->conn->prepare('INSERT INTO test (id) VALUES (?)');
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), 'INSERT INTO test (id) VALUES (?)');
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getCode(), Doctrine_Db_Event::PREPARE);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+
+        $stmt2 = $this->conn->prepare('INSERT INTO test (id) VALUES (?)');
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), 'INSERT INTO test (id) VALUES (?)');
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getCode(), Doctrine_Db_Event::PREPARE);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+
+        $stmt->execute(array(1));
+        $stmt2->execute(array(1));
+
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), 'INSERT INTO test (id) VALUES (?)');
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getCode(), Doctrine_Db_Event::EXECUTE);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+
+        $this->assertEqual($this->conn->count(), 4);
+
+    }
+    public function testExecuteStatementMultipleTimes()
+    {
+        try {
+            $stmt = $this->conn->prepare('INSERT INTO test (id) VALUES (?)');
+            $stmt->execute(array(1));
+            $stmt->execute(array(1));
+            $this->pass();
+        } catch(Doctrine_Db_Exception $e) {
+
+            $this->fail($e->__toString());
+        }
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), 'INSERT INTO test (id) VALUES (?)');
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getCode(), Doctrine_Db_Event::EXECUTE);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), 'INSERT INTO test (id) VALUES (?)');
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getCode(), Doctrine_Db_Event::EXECUTE);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+    }
+    public function testTransactionRollback() 
+    {
+        try {
+            $this->conn->beginTransaction();
+            $this->pass();
+        } catch(Doctrine_Db_Exception $e) {
+            $this->fail($e->__toString());
+        }
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), null);
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getCode(), Doctrine_Db_Event::BEGIN);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+        
+        try {
+            $this->conn->rollback();
+            $this->pass();
+        } catch(Doctrine_Db_Exception $e) {
+            $this->fail($e->__toString());
+        }
+
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), null);
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getCode(), Doctrine_Db_Event::ROLLBACK);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+    }
+    public function testTransactionCommit() 
+    {
+        try {
+            $this->conn->beginTransaction();
+            $this->pass();
+        } catch(Doctrine_Db_Exception $e) {
+            $this->fail($e->__toString());
+        }
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), null);
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getCode(), Doctrine_Db_Event::BEGIN);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+        
+        try {
+            $this->conn->commit();
+            $this->pass();
+        } catch(Doctrine_Db_Exception $e) {
+            $this->fail($e->__toString());
+            $this->conn->rollback();
+        }
+
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), null);
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getCode(), Doctrine_Db_Event::COMMIT);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DbProfilerTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DbProfilerTestCase.php
new file mode 100644
index 000000000..1494f3751
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DbProfilerTestCase.php
@@ -0,0 +1,137 @@
+<?php
+class Doctrine_Db_Profiler_TestCase extends Doctrine_UnitTestCase {
+    protected $dbh;
+    
+    protected $profiler;
+    public function prepareTables() {}
+    public function prepareData() {} 
+    
+    public function testQuery() {
+        $this->dbh = Doctrine_Db2::getConnection('sqlite::memory:');
+
+        $this->profiler = new Doctrine_Db_Profiler();
+
+        $this->dbh->setListener($this->profiler);
+
+        $this->dbh->query('CREATE TABLE test (id INT)');
+        
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), 'CREATE TABLE test (id INT)');
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getType(), Doctrine_Db_Event::QUERY);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+        
+        $this->assertEqual($this->dbh->count(), 1);
+    }
+    public function testPrepareAndExecute() {
+
+        $stmt  = $this->dbh->prepare('INSERT INTO test (id) VALUES (?)');
+        $event = $this->profiler->lastEvent();
+
+        $this->assertEqual($event->getQuery(), 'INSERT INTO test (id) VALUES (?)');
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getType(), Doctrine_Db_Event::PREPARE);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+
+        $stmt->execute(array(1));
+
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), 'INSERT INTO test (id) VALUES (?)');
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getType(), Doctrine_Db_Event::EXECUTE);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+
+        $this->assertEqual($this->dbh->count(), 2);
+    }
+    public function testMultiplePrepareAndExecute() {
+
+        $stmt = $this->dbh->prepare('INSERT INTO test (id) VALUES (?)');
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), 'INSERT INTO test (id) VALUES (?)');
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getType(), Doctrine_Db_Event::PREPARE);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+
+        $stmt2 = $this->dbh->prepare('INSERT INTO test (id) VALUES (?)');
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), 'INSERT INTO test (id) VALUES (?)');
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getType(), Doctrine_Db_Event::PREPARE);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+
+        $stmt->execute(array(1));
+        $stmt2->execute(array(1));
+
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), 'INSERT INTO test (id) VALUES (?)');
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getType(), Doctrine_Db_Event::EXECUTE);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+
+        $this->assertEqual($this->dbh->count(), 4);
+    }
+    public function testExecuteStatementMultipleTimes() {
+        try {
+            $stmt = $this->dbh->prepare('INSERT INTO test (id) VALUES (?)');
+            $stmt->execute(array(1));
+            $stmt->execute(array(1));
+            $this->pass();
+        } catch(Doctrine_Db_Exception $e) {
+
+            $this->fail($e->__toString());
+        }
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), 'INSERT INTO test (id) VALUES (?)');
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getType(), Doctrine_Db_Event::EXECUTE);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), 'INSERT INTO test (id) VALUES (?)');
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getType(), Doctrine_Db_Event::EXECUTE);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+    }
+    public function testTransactionRollback() {
+        try {
+            $this->dbh->beginTransaction();
+            $this->pass();
+        } catch(Doctrine_Db_Exception $e) {
+            $this->fail($e->__toString());
+        }
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), null);
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getType(), Doctrine_Db_Event::BEGIN);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+        
+        try {
+            $this->dbh->rollback();
+            $this->pass();
+        } catch(Doctrine_Db_Exception $e) {
+            $this->fail($e->__toString());
+        }
+
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), null);
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getType(), Doctrine_Db_Event::ROLLBACK);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+    }
+    public function testTransactionCommit() {
+        try {
+            $this->dbh->beginTransaction();
+            $this->pass();
+        } catch(Doctrine_Db_Exception $e) {
+            $this->fail($e->__toString());
+        }
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), null);
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getType(), Doctrine_Db_Event::BEGIN);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+        
+        try {
+            $this->dbh->commit();
+            $this->pass();
+        } catch(Doctrine_Db_Exception $e) {
+            $this->fail($e->__toString());
+            $this->dbh->rollback();
+        }
+
+        $this->assertEqual($this->profiler->lastEvent()->getQuery(), null);
+        $this->assertTrue($this->profiler->lastEvent()->hasEnded());
+        $this->assertEqual($this->profiler->lastEvent()->getType(), Doctrine_Db_Event::COMMIT);
+        $this->assertTrue(is_numeric($this->profiler->lastEvent()->getElapsedSecs()));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest.php
new file mode 100644
index 000000000..59e60b050
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest.php
@@ -0,0 +1,289 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_UnitTestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @author      Bjarte S. Karlsen <bjartka@pvv.ntnu.no>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+
+require_once dirname(__FILE__) . '/DoctrineTest/UnitTestCase.php';
+require_once dirname(__FILE__) . '/DoctrineTest/GroupTest.php';
+require_once dirname(__FILE__) . '/DoctrineTest/Doctrine_UnitTestCase.php';
+require_once dirname(__FILE__) . '/DoctrineTest/Reporter.php';
+
+class DoctrineTest
+{
+
+    protected $testGroup; // the default test group
+    protected $groups;
+
+    public function __construct()
+    {
+        $this->requireModels();
+        $this->testGroup = new GroupTest('Doctrine Unit Tests', 'main');
+    }
+
+    /**
+     * Add a test to be run.
+     *
+     * This is a thin wrapper around GroupTest that also store the testcase in
+     * this class so that it is easier to create custom groups
+     *
+     * @param UnitTestCase A test case
+     */
+    public function addTestCase($testCase)
+    {
+        $this->groups[$testCase->getName()] = $testCase;
+        $this->testGroup->addTestCase($testCase);
+    }
+
+    /**
+     * Run the tests
+     *
+     * This method will run the tests with the correct Reporter. It will run
+     * grouped tests if asked to and filter results. It also has support for
+     * running coverage report.
+     *
+     */
+    public function run()
+    {
+        $testGroup = $this->testGroup;
+        if (PHP_SAPI === 'cli') {
+            require_once(dirname(__FILE__) . '/DoctrineTest/Reporter/Cli.php');
+            $reporter = new DoctrineTest_Reporter_Cli();
+            $argv = $_SERVER['argv'];
+            array_shift($argv);
+            $options = $this->parseOptions($argv);
+        } else {
+            require_once(dirname(__FILE__) . '/DoctrineTest/Reporter/Html.php');
+            $options = $_GET;
+            if (isset($options['filter'])) {
+                if ( ! is_array($options['filter'])) {
+                    $options['filter'] = explode(',', $options['filter']);
+                }
+            }
+            if (isset($options['group'])) {
+                if ( ! is_array($options['group'])) {
+                    $options['group'] = explode(',', $options['group']);
+                }
+            }
+            $reporter = new DoctrineTest_Reporter_Html();
+        }
+
+        //replace global group with custom group if we have group option set
+        if (isset($options['group'])) {
+            $testGroup = new GroupTest('Doctrine Custom Test', 'custom');
+            foreach($options['group'] as $group) {
+                if (isset($this->groups[$group])) {
+                    $testGroup->addTestCase($this->groups[$group]);
+                } else if (class_exists($group)) {
+                    $testGroup->addTestCase(new $group);
+                } else {
+                    die($group . " is not a valid group or doctrine test class\n ");
+                }
+            }
+        }
+
+        if (isset($options['ticket'])) {
+            $testGroup = new GroupTest('Doctrine Custom Test', 'custom');
+            foreach ($options['ticket'] as $ticket) {
+                $class = 'Doctrine_Ticket_' . $ticket. '_TestCase';
+                $testGroup->addTestCase(new $class);
+            }
+        }
+
+        $filter = '';
+        if (isset($options['filter'])) {
+            $filter = $options['filter'];
+        }
+
+        //show help text
+        if (isset($options['help'])) {
+            $availableGroups = array_keys($this->groups);
+            sort($availableGroups);
+
+            echo "Doctrine test runner help\n";
+            echo "===========================\n";
+            echo " To run all tests simply run this script without arguments. \n";
+            echo "\n Flags:\n";
+            echo " -coverage will generate coverage report data that can be viewed with the cc.php script in this folder. NB! This takes time. You need xdebug to run this\n";
+            echo " -group <groupName1> <groupName2> <className1> Use this option to run just a group of tests or tests with a given classname. Groups are currently defined as the variable name they are called in this script.\n";
+            echo " -filter <string1> <string2> case insensitive strings that will be applied to the className of the tests. A test_classname must contain all of these strings to be run\n";
+            echo "\nAvailable groups:\n " . implode(', ', $availableGroups) . "\n";
+
+            die();
+        }
+
+        //generate coverage report
+        if (isset($options['coverage'])) {
+
+            /*
+             * The below code will not work for me (meus). It would be nice if
+             * somebody could give it a try. Just replace this block of code
+             * with the one below
+             *
+             define('PHPCOVERAGE_HOME', dirname(dirname(__FILE__)) . '/vendor/spikephpcoverage');
+            require_once PHPCOVERAGE_HOME . '/CoverageRecorder.php';
+            require_once PHPCOVERAGE_HOME . '/reporter/HtmlCoverageReporter.php';
+
+            $covReporter = new HtmlCoverageReporter('Doctrine Code Coverage Report', '', 'coverage2');
+
+            $includePaths = array('../lib');
+            $excludePaths = array();
+            $cov = new CoverageRecorder($includePaths, $excludePaths, $covReporter);
+
+            $cov->startInstrumentation();
+            $ret = $testGroup->run($reporter, $filter);
+            $cov->stopInstrumentation();
+
+            $cov->generateReport();
+            $covReporter->printTextSummary();
+            return $ret;
+             */
+            xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);
+            $ret = $testGroup->run($reporter, $filter);
+            $result['coverage'] = xdebug_get_code_coverage();
+            xdebug_stop_code_coverage();
+            file_put_contents(dirname(__FILE__) . '/coverage/coverage.txt', serialize($result));
+            require_once dirname(__FILE__) . '/DoctrineTest/Coverage.php';
+            $coverageGeneration = new DoctrineTest_Coverage();
+            $coverageGeneration->generateReport();
+            return $ret;
+            // */
+        }
+
+        if (array_key_exists('only-failed', $options)) {
+            $testGroup->onlyRunFailed(true);
+        }
+        $result = $testGroup->run($reporter, $filter);
+
+        global $startTime;
+
+        $endTime = time();
+        $time = $endTime - $startTime;
+
+        if (PHP_SAPI === 'cli') {
+          echo "\nTests ran in " . $time . " seconds and used " . (memory_get_peak_usage() / 1024) . " KB of memory\n\n";
+        } else {
+          echo "<p>Tests ran in " . $time . " seconds and used " . (memory_get_peak_usage() / 1024) . " KB of memory</p>";
+        }
+
+        return $result;
+    }
+
+    /**
+     * Require all the models needed in the tests
+     *
+     */
+    public function requireModels()
+    {
+        $models = new DirectoryIterator(dirname(__FILE__) . '/models/');
+
+        foreach($models as $key => $file) {
+            if ($file->isFile() && ! $file->isDot()) {
+                $e = explode('.', $file->getFileName());
+
+                if (end($e) === 'php') {
+                    require_once $file->getPathname();
+                }
+            }
+        }
+    }
+
+    /**
+     * Parse Options from cli into an associative array
+     *
+     * @param array $array An argv array from cli
+     * @return array An array with options
+     */
+    public function parseOptions($array) {
+        $currentName = '';
+        $options = array();
+
+        foreach($array as $name) {
+            if (strpos($name, '--') === 0) {
+                $name = ltrim($name, '--');
+                $currentName = $name;
+
+                if ( ! isset($options[$currentName])) {
+                    $options[$currentName] = array();
+                }
+            } else {
+                $values = $options[$currentName];
+                array_push($values, $name);
+                $options[$currentName] = $values;
+            }
+        }
+
+        return $options;
+    }
+
+    /**
+     * Autoload test cases
+     *
+     * Will create test case if it does not exist
+     *
+     * @param string $class The name of the class to autoload
+     * @return boolean True
+     */
+    public static function autoload($class)
+    {
+        if (strpos($class, 'TestCase') === false) {
+            return false;
+        }
+
+        $e = explode('_', $class);
+        $count = count($e);
+        $prefix = array_shift($e);
+
+        if ($prefix !== 'Doctrine') {
+            return false;
+        }
+
+        $dir = array_shift($e);
+        $file = $dir . '_' . substr(implode('_', $e), 0, -(strlen('_TestCase'))) . 'TestCase.php';
+        $file = str_replace('_', (($count > 3) ? DIRECTORY_SEPARATOR : ''), $file);
+
+        // create a test case file if it doesn't exist
+        if ( ! file_exists($file)) {
+            $contents = file_get_contents(DOCTRINE_DIR.'/tests/template.tpl');
+            $contents = sprintf($contents, $class, $class);
+
+            if ( ! file_exists($dir)) {
+                mkdir($dir, 0777);
+            }
+
+            file_put_contents($file, $contents);
+        }
+
+        require_once($file);
+
+        return true;
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/Coverage.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/Coverage.php
new file mode 100644
index 000000000..4307124b0
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/Coverage.php
@@ -0,0 +1,346 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_UnitTestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @author      Bjarte S. Karlsen <bjartka@pvv.ntnu.no>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+
+class DoctrineTest_Coverage
+{
+
+    const COVERED = 1;
+    const MAYBE = -2;
+    const NOTCOVERED = -1;
+
+    private $covered;
+    private $totallines = 0;
+    private $totalcovered = 0;
+    private $totalmaybe = 0;
+    private $totalnotcovered = 0;
+    private $result;
+
+    /*
+     * Create a new Coverage object. We read data from a fixed file. 
+     */
+    public function __construct()
+    {
+        $this->result = unserialize(file_get_contents($this->getCoverageDir() . "coverage.txt"));
+        $this->sortBy ="percentage"; // default sort
+    }
+
+    /**
+     * Get the directory to store coverage report in
+     *
+     * @return string The path to store the coverage in
+     */
+    public function getCoverageDir()
+    {
+        $dir = Doctrine_Core::getPath() . DIRECTORY_SEPARATOR . ".." . DIRECTORY_SEPARATOR . "tests" . DIRECTORY_SEPARATOR . "coverage" . DIRECTORY_SEPARATOR;
+        return $dir;
+    }
+
+    /*
+     * Show a summary of all files in Doctrine and their coverage data
+     *
+     */
+    public function showSummary()
+    {
+        if ( isset($_GET['order'])) {
+            $this->sortBy = $_GET['order'];
+        }
+
+        if ( ! isset($this->result['data'])) {
+            die("Impropper coverage report. Please regenerate");
+        }
+
+        $coveredArray = $this->result["data"];
+        //lets sort it.
+        uasort($coveredArray, array($this,"sortArray"));
+
+        //and flip if it perhaps?
+        if (isset($_GET["flip"]) && $_GET["flip"] == "true") {
+            $coveredArray = array_reverse($coveredArray, true);
+        }
+
+        $totals = $this->result["totals"];
+
+        echo '<tr><td>TOTAL</td><td>' , 
+            $totals['percentage'] , '%</td><td>' , 
+            $totals['lines'] , '</td><td>' , 
+            $totals['covered'] , '</td><td>', 
+            $totals['maybe'] , '</td><td>',
+            $totals['notcovered'] , '</td><td></tr>';
+
+        foreach($coveredArray as $class => $info) {
+
+            echo '<tr><td>';
+            if ( $info['type'] == "covered") {
+                echo '<a href="' , $class , '.html">', $class , '</a>';
+            }else{
+                echo $class;
+            }
+            echo '<td>' . $info['percentage'] . ' % </td><td>' . $info['total'] . '</td><td>' . $info['covered'] . '</td><td>' . $info['maybe'] . '</td><td>' . $info['notcovered']. '</td></tr>';
+        }
+    }
+
+    /**
+     * Return the revision the coverage was made against
+     *
+     *@param int The revision number
+     */
+    public function getRevision()
+    {
+        return $this->result["revision"];
+    }
+
+    /**
+     * Generate the report.
+     *
+     * This method will analyze the coverage data and create a data array that 
+     * contains information about each of the classes in Doctrine/lib. It will 
+     * also generate html files for each file that has coverage data with 
+     * information about what lines that are covered. 
+     *
+     *
+     * @uses generateCoverageInfoCoveredFile
+     * @uses saveFile
+     * @uses generateCoverageInfoNotCoveredFile
+     * @uses getCoverageDir
+     * @uses calculateTotalPercentage
+     *
+     */
+    public function generateReport()
+    {
+        $svn_info = explode(" ", exec("svn info | grep Revision"));
+        $this->result["revision"] = $svn_info[1];
+
+        //loop through all files and generate coverage files for them
+        $it = new RecursiveDirectoryIterator(Doctrine_Core::getPath());
+        $notCoveredArray = array();
+        foreach (new RecursiveIteratorIterator($it) as $file) {
+
+            if (strpos($file->getPathname(), "config.php")) {
+                continue;
+            }
+
+            if (strpos($file->getPathname(), ".svn")) {
+                continue;
+            } 
+            
+            $class = $this->getClassNameFromFileName($file->getPathname());
+
+            if (strpos($class, '_Interface')) {
+                continue;
+            }
+
+            if ( ! class_exists($class)) {
+                continue;
+            }
+
+            if (isset($this->result['coverage'][$file->getPathname()])) {
+                $coverageInfo[$class] = $this->generateCoverageInfoCoveredFile($file->getPathname());
+                $this->saveFile($file->getPathname());
+            } else {
+                $coverageInfo[$class] = $this->generateCoverageInfoNotCoveredFile($class);
+            }
+        }
+        $this->result["totals"] = array(
+            "lines" => $this->totallines, 
+            "notcovered" => $this->totalnotcovered,
+            "covered" => $this->totalcovered, 
+            "maybe" => $this->totalmaybe, 
+            "percentage" => $this->calculateTotalPercentage());  
+
+        $this->result["data"] = $coverageInfo;
+
+        file_put_contents($this->getCoverageDir() . "coverage.txt", serialize($this->result));
+        return true;
+
+    }
+
+    /**
+     *
+     * Return the name of a class from its filename.
+     *
+     * This method simply removes the Doctrine Path and raplces _ with / and 
+     * removes .php to get the classname for a file
+     *
+     * @param string $fileName The name of the file
+     * @return string The name of the class
+     */
+    public function getClassNameFromFileName($fileName)
+    {
+        $path = Doctrine_Core::getPath() . DIRECTORY_SEPARATOR;
+        $class = str_replace($path, "", $fileName);
+        $class = str_replace(DIRECTORY_SEPARATOR, "_", $class);
+        $class = substr($class, 0,-4);
+        return $class;
+    }
+
+    /**
+     * Calculate total coverage percentage
+     *
+     * @return double The percetage as a double
+     */
+    public function calculateTotalPercentage()
+    {
+        return round((($this->totalcovered + $this->totalmaybe) / $this->totallines) * 100, 2);
+    }
+
+    /**
+     * Generate Coverage for a class that is not in the coverage report.
+     *
+     * This method will simply check if the method has no lines that should be 
+     * tested or not. Then it will return data to be stored for later use. 
+     *
+     * @param string $class The name of a class
+     * @return array An associative array with coverage information
+     */
+    public function generateCoverageInfoNotCoveredFile($class)
+    {
+        try {
+            $refClass = new ReflectionClass($class);
+        } catch (Exception $e) {
+            echo $e->getMessage();
+        }
+        $lines = 0;
+        $methodLines = 0;
+        foreach ($refClass->getMethods() as $refMethod) {
+            if ($refMethod->getDeclaringClass() != $refClass) {
+                continue;
+            }
+            $methodLines = $refMethod->getEndLine() - $refMethod->getStartLine();
+            $lines += $methodLines;
+        }
+        $this->totallines += $lines;
+        $this->totalnotcovered += $lines;
+        if ($lines == 0) {
+            return array("covered" => 0, "maybe" => 0, "notcovered"=>$lines, "total" => $lines, "percentage" => 100, "type" => "notcovered");
+        } else {
+            return  array("covered" => 0, "maybe" => 0, "notcovered"=>$lines, "total" => $lines, "percentage" => 0, "type" => "notcovered");
+        }
+    }
+
+
+    /*
+     * Save a html report for the given filename 
+     *
+     * @param string $fileName The name of the file 
+     */
+    public function saveFile($fileName)
+    {
+        $className = $this->getClassNameFromFileName($fileName);
+        $title = "Coverage for " . $className;
+        
+        $html = '<html>
+    <head>
+        <title>' . $title . '</title>
+        <style type="text/css">
+            .covered{ background: green;}
+            .normal{ background: white;}
+            .red{ background: red;}
+            .orange{ background: #f90;}
+       </style>
+</head>
+<body><h1>' . $title . '</h1><p><a href="index.php">Back to coverage report</a></p>';
+        $coveredLines = $this->result["coverage"][$fileName];
+        $fileArray = file($fileName);
+
+        $html .= '<table>' . "\n";
+        foreach ($fileArray as $num => $line) {
+            $linenum = $num+1;
+            $html .= '<tr><td>' . $linenum . '</td>' . "\n";
+            $class ="normal";
+            if (isset($coveredLines[$linenum]) && $coveredLines[$linenum] == self::COVERED) {
+                $class = "covered";
+            } else if (isset($coveredLines[$linenum]) && $coveredLines[$linenum] == self::NOTCOVERED) {
+                $class ="red";
+            } else if (isset($coveredLines[$linenum]) && $coveredLines[$linenum] == self::MAYBE) {
+                $class ="orange";
+            }
+
+            $line = str_replace(" ", "&nbsp;", htmlspecialchars($line));
+            $html .= '<td class="' . $class . '">' . $line . '</td></tr>' . "\n";
+        }
+        $html .='</table></body></html>';
+        file_put_contents($this->getCoverageDir() . $className . ".html",$html);
+    }
+
+    /*
+     * Generate coverage data for tested file
+     *
+     *@return array An array of coverage data
+     */
+    public function generateCoverageInfoCoveredFile($file)
+    {
+        $lines = $this->result["coverage"][$file];
+
+        $total = count($lines) -1; //we have to remove one since it always reports the last line as a hit
+        $covered = 0;
+        $maybe = 0;
+        $notcovered = 0;
+        foreach ($lines as $result) {
+            switch($result) {
+            case self::COVERED:
+                $covered++;
+                break;
+            case self::NOTCOVERED:
+                $notcovered++;
+                break;
+            case self::MAYBE:
+                $maybe++;
+                break;
+            }
+        }
+        $covered--; //again we have to remove that last line.
+        $this->totallines += $total;
+        $this->totalcovered += $covered;
+        $this->totalnotcovered += $notcovered;
+        $this->totalmaybe += $maybe;
+
+        if ($total === 0) {
+            $total = 1;
+        }
+        $percentage = round((($covered + $maybe) / $total) * 100, 2);
+        return array("covered" => $covered, "maybe" => $maybe, "notcovered"=>$notcovered, "total" => $total, "percentage" => $percentage, "type" => "covered");
+    }
+
+    /*
+     * Uasort function to sort the array by key
+     *
+     */
+    public function sortArray($a, $b)
+    {
+        if ($a[$this->sortBy] == $b[$this->sortBy]) {
+            return 0;
+        }
+        return ( $a[$this->sortBy] < $b[$this->sortBy]) ? 1 : -1;
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/Doctrine_UnitTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/Doctrine_UnitTestCase.php
new file mode 100644
index 000000000..15d05f36e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/Doctrine_UnitTestCase.php
@@ -0,0 +1,292 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_UnitTestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_UnitTestCase extends UnitTestCase
+{
+    protected $manager;
+    protected $connection;
+    protected $objTable;
+    protected $new;
+    protected $old;
+    protected $dbh;
+    protected $listener;
+
+    protected $users;
+    protected $valueHolder;
+    protected $tables = array();
+    protected $unitOfWork;
+    protected $driverName = false;
+    protected $generic = false;
+    protected $conn;
+    protected $adapter;
+    protected $export;
+    protected $expr;
+    protected $dataDict;
+    protected $transaction;
+    protected $_name;
+
+
+    protected $init = false;
+
+    public function getName()
+    {
+        return $this->_name;
+    }
+
+    public function init()
+    {
+        $this->_name = get_class($this);
+
+        $this->manager   = Doctrine_Manager::getInstance();
+        $this->manager->setAttribute(Doctrine_Core::ATTR_EXPORT, Doctrine_Core::EXPORT_ALL);
+
+        $this->tables = array_merge($this->tables,
+                        array('entity',
+                              'entityReference',
+                              'email',
+                              'phonenumber',
+                              'groupuser',
+                              'album',
+                              'song',
+                              'element',
+                              'testerror',
+                              'description',
+                              'address',
+                              'account',
+                              'task',
+                              'resource',
+                              'assignment',
+                              'resourceType',
+                              'resourceReference')
+                              );
+
+
+        $class = get_class($this);
+        $e     = explode('_', $class);
+
+
+        if ( ! $this->driverName) {
+            $this->driverName = 'main';
+
+            switch($e[1]) {
+                case 'Export':
+                case 'Import':
+                case 'Transaction':
+                case 'DataDict':
+                case 'Sequence':
+                    $this->driverName = 'Sqlite';
+                break;
+            }
+
+            $module = $e[1];
+
+            if (count($e) > 3) {
+                $driver = $e[2];
+                switch($e[2]) {
+                    case 'Mysql':
+                    case 'Mssql':
+                    case 'Oracle':
+                    case 'Pgsql':
+                    case 'Sqlite':
+                        $this->driverName = $e[2];
+                    break;
+                }
+            }
+        }
+
+        try {
+            $this->conn = $this->connection = $this->manager->getConnection($this->driverName);
+            $this->manager->setCurrentConnection($this->driverName);
+
+            $this->connection->evictTables();
+            $this->dbh      = $this->adapter = $this->connection->getDbh();
+            $this->listener = $this->manager->getAttribute(Doctrine_Core::ATTR_LISTENER);
+
+            $this->manager->setAttribute(Doctrine_Core::ATTR_LISTENER, $this->listener);
+
+        } catch(Doctrine_Manager_Exception $e) {
+            if ($this->driverName == 'main') {
+                $this->dbh = new PDO('sqlite::memory:');
+                $this->dbh->sqliteCreateFunction('trim', 'trim', 1);
+            } else {
+                $this->dbh = $this->adapter = new Doctrine_Adapter_Mock($this->driverName);
+            }
+
+            $this->conn = $this->connection = $this->manager->openConnection($this->dbh, $this->driverName);
+
+            if ($this->driverName !== 'main') {
+                $exc  = 'Doctrine_Connection_' . ucwords($this->driverName) . '_Exception';
+
+                $this->exc = new $exc();
+
+            } else {
+            }
+
+            $this->listener = new Doctrine_EventListener();
+            $this->manager->setAttribute(Doctrine_Core::ATTR_LISTENER, $this->listener);
+        }
+        if ($this->driverName !== 'main') {
+
+            if (isset($module)) {
+                switch($module) {
+                    case 'Export':
+                    case 'Import':
+                    case 'Transaction':
+                    case 'Sequence':
+                    case 'Expression':
+                        $lower = strtolower($module);
+
+                        $this->$lower = $this->connection->$lower;
+                    break;
+                    case 'DataDict':
+                        $this->dataDict = $this->connection->dataDict;
+                    break;
+                }
+            }
+        }
+        $this->unitOfWork = $this->connection->unitOfWork;
+        $this->connection->setListener(new Doctrine_EventListener());
+        $this->query = new Doctrine_Query($this->connection);
+
+        if ($this->driverName === 'main') {
+            $this->prepareTables();
+            $this->prepareData();
+            foreach ($this->tables as $name) {
+            	$this->connection->getTable(ucwords($name))->clear();
+            }
+        }
+    }
+    public function prepareTables() {
+        foreach($this->tables as $name) {
+            $name = ucwords($name);
+            $table = $this->connection->getTable($name);
+            $query = 'DROP TABLE ' . $table->getTableName();
+            try {
+                $this->conn->exec($query);
+            } catch(Doctrine_Connection_Exception $e) {
+
+            }
+        }
+        $this->conn->export->exportClasses($this->tables);
+        $this->objTable = $this->connection->getTable('User');
+    }
+    public function prepareData()
+    {
+        $groups = new Doctrine_Collection($this->connection->getTable('Group'));
+
+        $groups[0]->name = 'Drama Actors';
+
+        $groups[1]->name = 'Quality Actors';
+
+
+        $groups[2]->name = 'Action Actors';
+        $groups[2]['Phonenumber'][0]->phonenumber = '123 123';
+        $groups->save();
+
+        $users = new Doctrine_Collection('User');
+
+
+        $users[0]->name = 'zYne';
+        $users[0]['Email']->address = 'zYne@example.com';
+        $users[0]['Phonenumber'][0]->phonenumber = '123 123';
+
+        $users[1]->name = 'Arnold Schwarzenegger';
+        $users[1]->Email->address = 'arnold@example.com';
+        $users[1]['Phonenumber'][0]->phonenumber = '123 123';
+        $users[1]['Phonenumber'][1]->phonenumber = '456 456';
+        $users[1]->Phonenumber[2]->phonenumber = '789 789';
+        $users[1]->Group[0] = $groups[2];
+
+        $users[2]->name = 'Michael Caine';
+        $users[2]->Email->address = 'caine@example.com';
+        $users[2]->Phonenumber[0]->phonenumber = '123 123';
+
+        $users[3]->name = 'Takeshi Kitano';
+        $users[3]->Email->address = 'kitano@example.com';
+        $users[3]->Phonenumber[0]->phonenumber = '111 222 333';
+
+        $users[4]->name = 'Sylvester Stallone';
+        $users[4]->Email->address = 'stallone@example.com';
+        $users[4]->Phonenumber[0]->phonenumber = '111 555 333';
+        $users[4]['Phonenumber'][1]->phonenumber = '123 213';
+        $users[4]['Phonenumber'][2]->phonenumber = '444 555';
+
+        $users[5]->name = 'Kurt Russell';
+        $users[5]->Email->address = 'russell@example.com';
+        $users[5]->Phonenumber[0]->phonenumber = '111 222 333';
+
+        $users[6]->name = 'Jean Reno';
+        $users[6]->Email->address = 'reno@example.com';
+        $users[6]->Phonenumber[0]->phonenumber = '111 222 333';
+        $users[6]['Phonenumber'][1]->phonenumber = '222 123';
+        $users[6]['Phonenumber'][2]->phonenumber = '123 456';
+
+        $users[7]->name = 'Edward Furlong';
+        $users[7]->Email->address = 'furlong@example.com';
+        $users[7]->Phonenumber[0]->phonenumber = '111 567 333';
+
+        $this->users = $users;
+        $this->users->save();
+    }
+    public function getConnection()
+    {
+        return $this->connection;
+    }
+    public function assertDeclarationType($type, $type2)
+    {
+        $dec = $this->getDeclaration($type);
+
+        if ( ! is_array($type2)) {
+            $type2 = array($type2);
+        }
+
+        $this->assertEqual($dec['type'], $type2);
+    }
+    public function getDeclaration($type)
+    {
+        return $this->dataDict->getPortableDeclaration(array('type' => $type, 'name' => 'colname', 'length' => 1, 'fixed' => true));
+    }
+    public function setUp()
+    {
+        if ( ! $this->init) {
+            $this->init();
+        }
+        if (isset($this->objTable)) {
+            $this->objTable->clear();
+        }
+
+        $this->init = true;
+    }
+
+    public function tearDown() {
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/GroupTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/GroupTest.php
new file mode 100644
index 000000000..5e826c048
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/GroupTest.php
@@ -0,0 +1,110 @@
+<?php
+class GroupTest extends UnitTestCase
+{
+    protected $_testCases = array();
+    protected $_name;
+    protected $_title;
+    protected $_onlyRunFailed = false;
+
+    public function __construct($title, $name)
+    {
+        $this->_title = $title;
+        $this->_name =  $name;
+        if ( PHP_SAPI != 'cli' && ! defined('STDOUT')) {
+            define('STDOUT', '');
+        }
+        $this->_formatter = new Doctrine_Cli_AnsiColorFormatter();
+    }
+
+    public function onlyRunFailed($bool)
+    {
+        $this->_onlyRunFailed = $bool;
+    }
+
+    public function getName()
+    {
+        return $this->_name;
+    }
+
+    public function addTestCase(UnitTestCase $testCase)
+    {
+        if ($testCase instanceOf GroupTest) {
+            $this->_testCases = array_merge($this->_testCases, $testCase->getTestCases());
+         } else {
+            $this->_testCases[get_class($testCase)] = $testCase;
+         }
+    }
+
+    public function shouldBeRun($testCase, $filter)
+    {
+        if ( ! is_array($filter)) {
+            return true;
+        }
+        foreach($filter as $subFilter) {
+            $name = strtolower(get_class($testCase));
+            $pos = strpos($name, strtolower($subFilter));
+            //it can be 0 so we have to use === to see if false
+            if ($pos === false) {
+                return false;
+            }
+        }
+        return true;
+    }
+    public function run(DoctrineTest_Reporter $reporter = null, $filter = null)
+    {
+        set_time_limit(900);
+
+        $this->init();
+
+        $reporter->setTestCase($this);
+        $reporter->paintHeader($this->_title);
+
+        $lastRunsFails = $this->getLastRunsFails();
+
+        foreach ($this->_testCases as $k => $testCase) {
+            if ($this->_onlyRunFailed && ! isset($lastRunsFails[get_class($testCase)])) {
+                continue;
+            }
+
+            $reporter->setTestCase($testCase);
+
+            if ( ! $this->shouldBeRun($testCase, $filter)) {
+                continue;
+            }
+            try {
+                $testCase->run();
+            } catch (Exception $e) {
+                $this->_failed += 1;
+                $message = 'Unexpected ' . get_class($e) . ' thrown in [' . get_class($testCase) . '] with message [' . $e->getMessage() . '] in ' . $e->getFile() . ' on line ' . $e->getLine() . "\n\nTrace\n-------------\n\n" . $e->getTraceAsString();
+                $testCase->addMessage($message);
+            }
+
+            $this->_passed += $testCase->getPassCount();
+            $this->_failed += $testCase->getFailCount();
+
+            $this->_testCases[$k] = null;
+
+            $reporter->paintMessages();
+        }
+
+        $reporter->setTestCase($this);
+
+        $reporter->paintMessages();
+
+        $this->cachePassesAndFails();
+
+        $reporter->paintFooter();
+
+        return $this->_failed ? false : true;
+    }
+
+    public function getTestCaseCount()
+    {
+        return count($this->_testCases);
+    }
+
+    public function getTestCases()
+    {
+        return $this->_testCases;
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/Reporter.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/Reporter.php
new file mode 100644
index 000000000..5f9727009
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/Reporter.php
@@ -0,0 +1,56 @@
+<?php
+
+class DoctrineTest_Reporter
+{
+    protected
+        $_formatter,
+        $_test;
+
+    public function __construct()
+    {
+        $this->_formatter = new Doctrine_Cli_AnsiColorFormatter();
+    }
+
+    public function format($message, $type)
+    {
+        if (PHP_SAPI == 'cli') {
+            return $this->_formatter->format($message, $type);
+        } else {
+            if ($type == 'INFO') {
+                $color = 'green';
+            } else if ($type == 'ERROR') {
+                $color = 'red';
+            } else {
+                $color = 'black';
+            }
+            return '<span style="font-weight: bold; color: ' . $color . ';">' . $message . '</span>';
+        }
+    }
+    
+    public function setTestCase($test) 
+    {
+        $this->_test = $test;
+    }
+
+    public function paintMessages()
+    {
+        $max = 80;
+        $class = get_class($this->_test);
+        $messages = $this->_test->getMessages();
+        $failed = ($this->_test->getFailCount() || count($messages)) ? true:false;
+
+        if ($class != 'GroupTest') {
+            $strRepeatLength = $max - strlen($class);
+            echo $class.str_repeat('.', $strRepeatLength).$this->format($failed ? 'failed':'passed', $failed ? 'ERROR':'INFO')."\n";
+        }
+
+        if (! empty($messages)) {
+            echo "\n";
+            echo "\n";
+            foreach ($messages as $message) {
+                echo $this->format($message, 'ERROR') . "\n\n";
+            }
+            echo "\n";
+        }
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/Reporter/Cli.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/Reporter/Cli.php
new file mode 100644
index 000000000..54e9c3eb1
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/Reporter/Cli.php
@@ -0,0 +1,20 @@
+<?php
+
+class DoctrineTest_Reporter_Cli extends DoctrineTest_Reporter
+{
+    public function paintHeader($name)
+    {
+        echo $this->format($name, 'INFO') . "\n";
+        echo str_repeat('=', strlen($name)) . "\n";
+    }
+
+    public function paintFooter()
+    {
+        echo "\n";
+        echo $this->format("Tested: " . $this->_test->getTestCaseCount() . ' test cases.', 'INFO') . "\n";
+        echo $this->format("Successes: " . $this->_test->getPassCount() . " passes.", 'INFO') . "\n";
+        echo $this->format("Failures: " . $this->_test->getFailCount() . " fails.", $this->_test->getFailCount() ? 'ERROR':'INFO') . "\n";
+        echo $this->format("Number of new Failures: " . $this->_test->getNumNewFails(), $this->_test->getNumNewFails() ? 'ERROR':'INFO') . ' ' . implode(", ", $this->_test->getNewFails()) . "\n";
+        echo $this->format("Number of fixed Failures: " . $this->_test->getNumFixedFails(), $this->_test->getNumFixedFails() ? 'INFO':'HEADER') . ' ' . implode(", ", $this->_test->getFixedFails()) . "\n";
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/Reporter/Html.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/Reporter/Html.php
new file mode 100644
index 000000000..0810ffd76
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/Reporter/Html.php
@@ -0,0 +1,82 @@
+<?php
+class DoctrineTest_Reporter_Html extends DoctrineTest_Reporter
+{
+    public function paintHeader($name)
+    {
+?>
+<html>
+<head>
+  <title>Doctrine Unit Tests</title>
+  <style>
+  .fail
+  {
+      color: red;
+  }
+  
+  #messages
+  {
+      font-family: courier new, monospace;
+      border-left: 1px solid #333333;
+      border-right: 1px solid #333333;
+      border-top: 1px solid #333333;
+      background-color: #f5f5f5;
+      padding: 10px;
+  }
+  
+  #summary
+  {
+      border: 1px solid #333333;
+      background-color: #ffc;
+      padding: 8px;
+      color: white;
+      margin-bottom: 10px;
+  }
+  
+  #wrapper
+  {
+      
+  }
+  
+  #wrapper h1
+  {
+      font-size: 20pt;
+      margin-bottom: 10px;
+      font-weight: bold;
+  }
+  </style>
+</head>
+
+<body>
+
+<div id="wrapper">
+<h1><?php echo $name ?></h1>
+
+<div id="messages">
+<?php
+    }
+
+    public function paintFooter()
+    {
+        print '</div></div>';
+        
+            $this->paintSummary();
+    }
+
+    public function paintMessages()
+    {
+        parent::paintMessages();
+    }
+
+    public function paintSummary()
+    {
+        print '<div id="summary">';
+
+        echo $this->format("Tested: " . $this->_test->getTestCaseCount() . ' test cases.', 'INFO') . "<br/>";
+        echo $this->format("Successes: " . $this->_test->getPassCount() . " passes.", 'INFO') . "<br/>";
+        echo $this->format("Failures: " . $this->_test->getFailCount() . " fails.", $this->_test->getFailCount() ? 'ERROR':'INFO') . "<br/>";
+        echo $this->format("Number of new Failures: " . $this->_test->getNumNewFails(), $this->_test->getNumNewFails() ? 'ERROR':'INFO') . ' ' . implode(", ", $this->_test->getNewFails()) . "<br/>";
+        echo $this->format("Number of fixed Failures: " . $this->_test->getNumFixedFails(), $this->_test->getNumFixedFails() ? 'INFO':'HEADER') . ' ' . implode(", ", $this->_test->getFixedFails()) . "<br/>";
+
+        print '</div>';
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/UnitTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/UnitTestCase.php
new file mode 100644
index 000000000..e62d83f46
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DoctrineTest/UnitTestCase.php
@@ -0,0 +1,252 @@
+<?php
+class UnitTestCase
+{
+    protected $_passed = 0;
+    
+    protected $_failed = 0;
+    
+    protected $_messages = array();
+
+    protected static $_passesAndFails = array('passes' => array(), 'fails' => array());
+
+    protected static $_lastRunsPassesAndFails = array('passes' => array(), 'fails' => array());
+
+    public function init()
+    {
+        $tmpFileName = $this->getPassesAndFailsCachePath();
+
+        if (file_exists($tmpFileName)) {
+            $array = unserialize(file_get_contents($tmpFileName));
+        } else {
+            $array = array();
+        }
+        if ($array) {
+            self::$_lastRunsPassesAndFails = $array;
+        }
+    }
+
+    public function addMessage($msg)
+    {
+        $this->_messages[] = $msg;
+    }
+
+    public function assertEqual($value, $value2)
+    {
+        if ($value == $value2) {
+            $this->pass();
+        } else {
+            $seperator = "<br>";
+            if (PHP_SAPI === "cli") {
+                $seperator = "\n";
+            }
+
+            if (is_array($value)) {
+                $value = var_export($value, true);
+            }
+
+            if (is_array($value2)) {
+                $value2 = var_export($value2, true);
+            }
+
+            $message = "$seperator Value1: $value $seperator != $seperator Value2: $value2 $seperator";
+            $this->_fail($message);
+        }
+    }
+
+    public function assertIdentical($value, $value2)
+    {
+        if ($value === $value2) {
+            $this->pass();
+        } else {
+            $this->_fail();
+        }
+    }
+
+    public function assertNotEqual($value, $value2)
+    {
+        if ($value != $value2) {
+            $this->pass();
+        } else {
+            $this->_fail();
+        }
+    }
+
+    public function assertTrue($expr)
+    {
+        if ($expr) {
+            $this->pass();
+        } else {
+            $this->_fail();
+        }
+    }
+
+    public function assertFalse($expr)
+    {
+        if ( ! $expr) {
+            $this->pass();
+        } else {
+            $this->_fail();
+        }
+    }
+
+    public function assertNull($expr)
+    {
+        if (is_null($expr)) {
+            $this->pass();
+        } else {
+            $this->fail();
+        }
+    }
+
+    public function assertNotNull($expr)
+    {
+        if (is_null($expr)) {
+            $this->fail();
+        } else {
+            $this->pass();
+        }
+    }
+
+    public function pass() 
+    {
+        $class = get_class($this);
+        if ( ! isset(self::$_passesAndFails['fails'][$class])) {
+            self::$_passesAndFails['passes'][$class] = $class;
+        }
+        $this->_passed++;
+    }
+
+    public function fail($message = "")
+    {
+        $this->_fail($message);    
+    }
+
+    public function _fail($message = "")
+    {
+        $trace = debug_backtrace();
+        array_shift($trace);
+
+
+        foreach ($trace as $stack) {
+            if (substr($stack['function'], 0, 4) === 'test') {
+                $class = new ReflectionClass($stack['class']);
+
+                if ( ! isset($line)) {
+                    $line = $stack['line'];
+                }
+
+                $errorMessage = $class->getName() . ' : method ' . $stack['function'] . ' failed on line ' . $line;
+                $this->_messages[] =  $errorMessage . " " . $message;
+                break;
+            }
+            $line = $stack['line'];
+        }
+        $this->_failed++;
+        $class = get_class($this);
+        if (isset(self::$_passesAndFails['passes'][$class])) {
+            unset(self::$_passesAndFails['passes'][$class]);
+        }
+        self::$_passesAndFails['fails'][$class] = $class;
+    }
+
+    public function run(DoctrineTest_Reporter $reporter = null, $filter = null) 
+    {
+        foreach (get_class_methods($this) as $method) {
+            if (substr($method, 0, 4) === 'test') {
+                $this->setUp();
+
+                $this->$method();
+                
+                $this->tearDown();
+            }
+        }
+    }
+
+    public function getMessages() 
+    {
+        return $this->_messages;
+    }
+
+    public function getFailCount()
+    {
+        return $this->_failed;
+    }
+
+    public function getPassCount()
+    {
+        return $this->_passed;
+    }
+
+    public function getPassesAndFailsCachePath()
+    {
+        $dir = dirname(__FILE__) . '/doctrine_tests';
+        if ( ! is_dir($dir)) {
+            mkdir($dir, 0777, true);
+        }
+
+        $path = $dir . '/' . md5(serialize(array_keys($this->_testCases)));
+        return $path;
+    }
+
+    public function cachePassesAndFails()
+    {
+        $tmpFileName = $this->getPassesAndFailsCachePath();
+        file_put_contents($tmpFileName, serialize(self::$_passesAndFails));
+    }
+
+    public function getPassesAndFails()
+    {
+        return self::$_passesAndFails;
+    }
+
+    public function getLastRunsPassesAndFails()
+    {
+        return self::$_lastRunsPassesAndFails;
+    }
+
+    public function getLastRunsFails()
+    {
+        return isset(self::$_lastRunsPassesAndFails['fails']) ? self::$_lastRunsPassesAndFails['fails'] : array();
+    }
+
+    public function getLastRunsPass()
+    {
+        return isset(self::$_lastRunsPassesAndFails['passes']) ? self::$_lastRunsPassesAndFails['passes'] : array();
+    }
+
+    public function getNewFails()
+    {
+        $newFails = array();
+        $fails = self::$_passesAndFails['fails'];
+        foreach ($fails as $fail) {
+            // If it passed before then it is a new fail
+            if (isset(self::$_lastRunsPassesAndFails['passes'][$fail])) {
+                $newFails[$fail] = $fail;
+            }
+        }
+        return $newFails;;
+    }
+
+    public function getFixedFails()
+    {
+        $fixed = array();
+        $fails = self::$_lastRunsPassesAndFails['fails'];
+        foreach ($fails as $fail) {
+            // If the fail passes this time then it is fixed
+            if (isset(self::$_passesAndFails['passes'][$fail])) {
+                $fixed[$fail] = $fail;
+            }
+        }
+        return $fixed;;
+    }
+
+    public function getNumNewFails()
+    {
+        return count($this->getNewFails());
+    }
+
+    public function getNumFixedFails()
+    {
+        return count($this->getFixedFails());
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DriverTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DriverTestCase.php
new file mode 100644
index 000000000..c247eed3c
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/DriverTestCase.php
@@ -0,0 +1,253 @@
+<?php
+class AdapterMock implements Doctrine_Adapter_Interface {
+    private $name;
+    
+    private $queries = array();
+    
+    private $exception = array();
+    
+    private $lastInsertIdFail = false;
+
+    public function __construct($name) 
+    {
+        $this->name = $name;
+    }
+
+    public function getName() 
+    {
+        return $this->name;
+    }
+
+    public function pop() 
+    {
+        return array_pop($this->queries);
+    }
+
+    public function forceException($name, $message = '', $code = 0) 
+    {
+        $this->exception = array($name, $message, $code);
+    }
+
+    public function prepare($query)
+    {
+        return new AdapterStatementMock($this, $query);
+    }
+
+    public function addQuery($query)
+    {
+        $this->queries[] = $query;
+    }
+
+    public function query($query)
+    {
+        $this->queries[] = $query;
+
+        $e    = $this->exception;
+
+        if ( ! empty($e)) {
+            $name = $e[0];
+
+            $this->exception = array();
+
+            throw new $name($e[1], $e[2]);
+        }
+
+        return new AdapterStatementMock($this, $query);
+    }
+
+    public function getAll()
+    {
+        return $this->queries;
+    }
+
+    public function quote($input)
+    {
+        return "'" . addslashes($input) . "'";
+    }
+
+    public function exec($statement)
+    {
+        $this->queries[] = $statement;
+
+        $e    = $this->exception;
+
+        if ( ! empty($e)) {
+            $name = $e[0];
+
+            $this->exception = array();
+
+            throw new $name($e[1], $e[2]);
+        }
+
+        return 0;
+    }
+
+    public function forceLastInsertIdFail($fail = true)
+    {
+        if ($fail) {
+            $this->lastInsertIdFail = true;
+        } else {
+            $this->lastInsertIdFail = false;
+        }
+    }
+
+    public function lastInsertId()
+    {
+        $this->queries[] = 'LAST_INSERT_ID()';
+        if ($this->lastInsertIdFail) {
+            return null;
+        } else {
+            return 1;
+        }
+    }
+
+    public function beginTransaction()
+    { 
+        $this->queries[] = 'BEGIN TRANSACTION';
+    }
+
+    public function commit()
+    {
+        $this->queries[] = 'COMMIT';
+    }
+
+    public function rollBack() 
+    { 
+        $this->queries[] = 'ROLLBACK';
+    }
+
+    public function errorCode()
+    {
+
+    }
+
+    public function errorInfo()
+    {
+
+    }
+
+    public function getAttribute($attribute)
+    {
+        if ($attribute == PDO::ATTR_DRIVER_NAME) {
+            return strtolower($this->name);
+        }
+    }
+
+    public function setAttribute($attribute, $value)
+    {
+
+    }
+}
+
+class AdapterStatementMock
+{
+    private $mock;
+    
+    private $query;
+
+    public function __construct(AdapterMock $mock, $query)
+    {
+        $this->mock  = $mock;
+        $this->query = $query;
+    }
+
+    public function fetch($fetchMode)
+    {
+        return array();
+    }
+
+    public function fetchAll($fetchMode)
+    {
+        return array();
+    }
+
+    public function execute()
+    {
+        $this->mock->addQuery($this->query);
+        return true;
+    }
+
+    public function fetchColumn($colnum = 0)
+    {
+        return 0;
+    }
+}
+
+class Doctrine_Driver_UnitTestCase extends UnitTestCase
+{
+    protected $driverName = false;
+    protected $generic = false;
+    protected $manager;
+    protected $conn;
+    protected $adapter;
+    protected $export;
+    protected $dataDict;
+    protected $transaction;
+
+    public function __construct($driverName, $generic = false)
+    {
+
+        $this->driverName = $driverName;
+        $this->generic    = $generic;
+    }
+
+    public function assertDeclarationType($type, $type2)
+    {
+        $dec = $this->getDeclaration($type);
+        if ( ! is_array($type2)) {
+            $type2 = array($type2);
+        }
+        $this->assertEqual($dec[0], $type2);
+    }
+
+    public function getDeclaration($type)
+    {
+        return $this->dataDict->getPortableDeclaration(array('type' => $type, 'name' => 'colname', 'length' => 1, 'fixed' => true));
+    }
+
+    public function setDriverName($driverName)
+    {
+        $this->driverName = $driverName;
+    }
+
+    public function init()
+    {
+        $this->adapter = new AdapterMock($this->driverName);
+        $this->manager = Doctrine_Manager::getInstance();
+        $this->manager->setDefaultAttributes();
+        $this->conn = $this->manager->openConnection($this->adapter);
+
+        if ( ! $this->generic) {
+            $this->export   = $this->conn->export;
+
+            $name = $this->adapter->getName();
+
+            if ($this->adapter->getName() == 'oci')
+                $name = 'Oracle';
+            
+            $tx = 'Doctrine_Transaction_' . ucwords($name);
+            $dataDict = 'Doctrine_DataDict_' . ucwords($name);
+            
+            $exc  = 'Doctrine_Connection_' . ucwords($name) . '_Exception';
+            
+            $this->exc = new $exc();
+            if (class_exists($tx))
+                $this->transaction = new $tx($this->conn);
+            if (class_exists($dataDict)) {
+                $this->dataDict = new $dataDict($this->conn);
+            }
+            //$this->dataDict = $this->conn->dataDict;
+        } else {
+            $this->export   = new Doctrine_Export($this->conn);
+            $this->transaction = new Doctrine_Transaction($this->conn);
+        }
+    }
+
+    public function setUp() {
+        static $init = false;
+        if ( ! $init) {
+            $this->init();
+            $init = true;
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/EventListener/ChainTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/EventListener/ChainTestCase.php
new file mode 100644
index 000000000..af27013dd
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/EventListener/ChainTestCase.php
@@ -0,0 +1,50 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_EventListener_Chain_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_EventListener_Chain_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData() 
+    { }
+    public function prepareTables() 
+    {
+        $this->tables = array('EventListenerChainTest');
+        parent::prepareTables();
+    }
+    public function testAccessorInvokerChain() 
+    {
+        $e = new EventListenerChainTest;
+        $e->name = "something";
+
+    }
+
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/EventListenerTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/EventListenerTestCase.php
new file mode 100644
index 000000000..737910ebb
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/EventListenerTestCase.php
@@ -0,0 +1,199 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_EventListener_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_EventListener_TestCase extends Doctrine_UnitTestCase {
+    private $logger;
+
+
+    public function prepareData() 
+    { }
+    public function prepareTables() {
+        $this->tables = array('EventListenerTest');
+        parent::prepareTables();
+    }
+
+    public function testSetListener() {
+        $this->logger = new Doctrine_EventListener_TestLogger();
+    
+        $e = new EventListenerTest;
+        
+        $e->getTable()->setListener($this->logger);
+
+        $e->name = 'listener';
+        $e->save();
+
+        $this->assertEqual($e->getTable()->getListener(), $this->logger);
+    }
+
+    /**
+    public function testOnLoad() {
+        $this->logger->clear();
+        $this->assertEqual($this->connection->getTable('EventListenerTest')->getListener(), $this->logger);
+        $this->connection->clear();
+
+        $e = $this->connection->getTable('EventListenerTest')->find(1);
+
+
+        $this->assertEqual($e->getTable()->getListener(), $this->logger);
+
+        $this->assertEqual($this->logger->pop(), 'onLoad');
+        $this->assertEqual($this->logger->pop(), 'onPreLoad');
+    }
+
+    public function testOnCreate() {
+        $e = new EventListenerTest;
+        
+
+        $e->setListener($this->logger);
+        $this->logger->clear();
+        $e = new EventListenerTest;
+
+        $this->assertEqual($this->logger->pop(), 'onCreate');
+        $this->assertEqual($this->logger->pop(), 'onPreCreate');
+        $this->assertEqual($this->logger->count(), 0);
+    }
+    public function testOnSleepAndOnWakeUp() {
+        $e = new EventListenerTest;
+
+        $this->logger->clear();
+
+        $s = serialize($e);
+
+        $this->assertEqual($this->logger->pop(), 'onSleep');
+        $this->assertEqual($this->logger->count(), 0);
+
+        $e = unserialize($s);
+
+        $this->assertEqual($this->logger->pop(), 'onWakeUp');
+        $this->assertEqual($this->logger->count(), 0);
+    }
+    public function testTransaction() {
+        $e = new EventListenerTest();
+        $e->name = "test 1";
+        
+        $this->logger->clear();
+
+        $e->save();
+
+        $this->assertEqual($this->logger->pop(), 'onSave');
+        $this->assertEqual($this->logger->pop(), 'onInsert');
+        $this->assertEqual($this->logger->pop(), 'onPreInsert');
+        $this->assertEqual($this->logger->pop(), 'onPreSave');
+        
+        $e->name = "test 2";
+
+        $e->save();
+
+        $this->assertEqual($this->logger->pop(), 'onSave');
+        $this->assertEqual($this->logger->pop(), 'onUpdate');
+        $this->assertEqual($this->logger->pop(), 'onPreUpdate');
+        $this->assertEqual($this->logger->pop(), 'onPreSave');
+        
+        $this->logger->clear();
+
+        $e->delete();
+
+        $this->assertEqual($this->logger->pop(), 'onDelete');
+        $this->assertEqual($this->logger->pop(), 'onPreDelete');
+    }
+    public function testTransactionWithConnectionListener() {
+        $e = new EventListenerTest();
+        $e->getTable()->getConnection()->setListener($this->logger);
+        
+        $e->name = "test 2";
+        
+        $this->logger->clear();
+        
+        $e->save();
+
+        $this->assertEqual($this->logger->pop(), 'onTransactionCommit');
+        $this->assertEqual($this->logger->pop(), 'onPreTransactionCommit');
+        $this->assertEqual($this->logger->pop(), 'onSave');
+        $this->assertEqual($this->logger->pop(), 'onInsert');
+        $this->assertEqual($this->logger->pop(), 'onPreInsert');
+        $this->assertEqual($this->logger->pop(), 'onPreSave');
+
+        $this->assertEqual($this->logger->pop(), 'onTransactionBegin');
+        $this->assertEqual($this->logger->pop(), 'onPreTransactionBegin');
+
+        $e->name = "test 1";
+
+        $e->save();
+
+        $this->assertEqual($this->logger->pop(), 'onTransactionCommit');
+        $this->assertEqual($this->logger->pop(), 'onPreTransactionCommit');
+        $this->assertEqual($this->logger->pop(), 'onSave');
+        $this->assertEqual($this->logger->pop(), 'onUpdate');
+        $this->assertEqual($this->logger->pop(), 'onPreUpdate');
+        $this->assertEqual($this->logger->pop(), 'onPreSave');
+
+        $this->assertEqual($this->logger->pop(), 'onTransactionBegin');
+        $this->assertEqual($this->logger->pop(), 'onPreTransactionBegin');
+
+        $this->logger->clear();
+
+        $e->delete();
+
+        $this->assertEqual($this->logger->pop(), 'onTransactionCommit');
+        $this->assertEqual($this->logger->pop(), 'onPreTransactionCommit');
+        $this->assertEqual($this->logger->pop(), 'onDelete');
+
+        $this->assertEqual($this->logger->pop(), 'onPreDelete');
+        $this->assertEqual($this->logger->pop(), 'onTransactionBegin');
+        $this->assertEqual($this->logger->pop(), 'onPreTransactionBegin');
+    
+        $this->connection->setListener(new Doctrine_EventListener());
+    }
+    */
+}
+
+class Doctrine_EventListener_TestLogger implements Doctrine_Overloadable, Countable {
+    private $messages = array();
+
+    public function __call($m, $a) {
+
+        $this->messages[] = $m;
+    }
+    public function pop() {
+        return array_pop($this->messages);
+    }
+    public function clear() {
+        $this->messages = array();
+    }
+    public function getAll() {
+        return $this->messages;
+    }
+    public function count() {
+        return count($this->messages);
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/CheckConstraintTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/CheckConstraintTestCase.php
new file mode 100644
index 000000000..49b1b8955
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/CheckConstraintTestCase.php
@@ -0,0 +1,56 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Export_CheckConstraint_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Export_CheckConstraint_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData()
+    { }
+    public function prepareTables()
+    { }
+    
+    public function testCheckConstraints()
+    {
+        $e = $this->conn->export;
+
+        $sql = $e->exportClassesSql(array('CheckConstraintTest'));
+   
+        $this->assertEqual($sql[0], 'CREATE TABLE check_constraint_test (id INTEGER PRIMARY KEY AUTOINCREMENT, price DECIMAL(2,2), discounted_price DECIMAL(2,2), CHECK (price >= 100), CHECK (price <= 5000), CHECK (price > discounted_price))');
+    
+        try {
+            $dbh = new PDO('sqlite::memory:');
+            $dbh->exec($sql[0]);
+            $this->pass();
+        } catch (PDOException $e) {
+            $this->fail();
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/MssqlTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/MssqlTestCase.php
new file mode 100644
index 000000000..d6ff4cb0d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/MssqlTestCase.php
@@ -0,0 +1,228 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Export_Mssql_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Export_Mssql_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    { }
+    public function prepareData()
+    { }
+
+    public function testAlterTableName()
+    {
+        $this->export->alterTable('user', array(
+            'name' => 'userlist'
+        ));
+        
+        $this->assertEqual($this->adapter->pop(), "EXECUTE sp_RENAME '[user]', 'userlist';");
+}
+    public function testAlterTableRename()
+    {
+        $this->export->alterTable('user', array(
+            'rename' => array(
+                'sex' => array(
+                    'name' => 'gender',
+                    'definition' => array(
+                        'type' => 'text',
+                        'length' => 1,
+                        'default' => 'M',
+                    ),
+                )
+            )
+        ));
+
+        $this->assertEqual($this->adapter->pop(), "EXECUTE sp_RENAME '[user].[sex]', 'gender', 'COLUMN';");
+    }
+    public function testAlterTableRemove()
+    {
+        $this->export->alterTable('user', array(
+            'remove' => array(
+                'file_limit' => array(),
+                'time_limit' => array(),
+            )
+        ));
+
+        $this->assertEqual($this->adapter->pop(), "ALTER TABLE user DROP COLUMN file_limit, time_limit;");
+    }
+    public function testAlterTableChange()
+    {
+        $this->export->alterTable('user', array(
+            'change' => array(
+                'name' => array(
+                    'length' => '20',
+                    'definition' => array(
+                        'type' => 'text',
+                        'length' => '20',
+                    ),
+                ),
+            )
+        ));
+
+        $this->assertEqual($this->adapter->pop(), "ALTER TABLE user ALTER COLUMN name VARCHAR(20) NULL;");
+    }
+    public function testAlterTableThrowsExceptionWithoutValidTableName()
+    {
+        try {
+            $this->export->alterTable(0, array(), array());
+
+            $this->fail();
+        } catch(Doctrine_Export_Exception $e) {
+            $this->pass();
+        }
+    }
+    public function testAlterTableMultipleColumnAlterationsRequireMultipleAlterTableQueries()
+    {
+        $this->export->alterTable('user', array(
+            'change' => array(
+                'name' => array(
+                    'length' => '20',
+                    'definition' => array(
+                        'type' => 'text',
+                        'length' => '20',
+                    ),
+                ),
+                'name2' => array(
+                    'length' => '20',
+                    'definition' => array(
+                        'type' => 'text',
+                        'length' => '20',
+                    ),
+                ),
+            )
+        ));
+
+        $this->assertEqual($this->adapter->pop(), 'ALTER TABLE user ALTER COLUMN name VARCHAR(20) NULL; ALTER TABLE user ALTER COLUMN name2 VARCHAR(20) NULL;');
+    }
+    public function testCreateTableExecutesSql()
+    {
+        $name = 'mytable';
+
+        $fields  = array('id' => array('type' => 'integer', 'unsigned' => 1));
+        
+
+        $this->export->createTable($name, $fields);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id BIGINT NULL)');
+    }
+    public function testCreateTableSupportsMultiplePks()
+    {
+        $name = 'mytable';
+        $fields  = array('name' => array('type' => 'char', 'length' => 10, 'notnull' => true),
+                         'type' => array('type' => 'integer', 'length' => 3, 'notnull' => true));
+
+        $options = array('primary' => array('name', 'type'));
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (name CHAR(10) NOT NULL, type INT NOT NULL, PRIMARY KEY([name], [type]))');
+    }
+    public function testCreateTableSupportsAutoincPks()
+    {
+        $name = 'mytable';
+
+        $fields  = array('id' => array('type' => 'integer', 'notnull' => true, 'unsigned' => 1, 'autoincrement' => true));
+        $options = array('primary' => array('id'));
+
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id BIGINT NOT NULL identity, PRIMARY KEY([id]))');
+    }
+    public function testCreateTableSupportsForeignKeys()
+    {
+        $name = 'mytable';
+
+        $fields = array('id' => array('type' => 'boolean', 'primary' => true, 'notnull' => true),
+                        'foreignKey' => array('type' => 'integer')
+                        );
+        $options = array('foreignKeys' => array(array('local' => 'foreignKey',
+                                                      'foreign' => 'id',
+                                                      'foreignTable' => 'sometable'))
+                         );
+
+
+        $sql = $this->export->createTableSql($name, $fields, $options);
+
+        $this->assertEqual(count($sql), 2);
+        $this->assertEqual($sql[0], 'CREATE TABLE mytable (id BIT NOT NULL, foreignKey INT NULL, PRIMARY KEY([id]))');
+        $this->assertEqual($sql[1], 'ALTER TABLE [mytable] ADD FOREIGN KEY ([foreignKey]) REFERENCES [sometable]([id])');
+    }
+    public function testCreateDatabaseExecutesSql()
+    {
+        $this->export->createDatabase('db');
+        
+        $this->assertEqual($this->adapter->pop(), 'CREATE DATABASE db');
+    }
+    public function testDropDatabaseExecutesSql()
+    {
+        $this->export->dropDatabase('db');
+
+        $this->assertEqual($this->adapter->pop(), 'DROP DATABASE db');
+    }
+    public function testDropIndexExecutesSql()
+    {
+        $this->export->dropIndex('sometable', 'relevancy');
+
+        $this->assertEqual($this->adapter->pop(), 'DROP INDEX [relevancy_idx] ON [sometable]');
+    }
+    public function testCreateTableSupportsIndexesUsingSingleFieldString()
+    {
+        $fields  = array('id' => array('type' => 'integer', 'unsigned' => 1, 'autoincrement' => true, 'unique' => true, 'notnull' => true),
+                         'name' => array('type' => 'string', 'length' => 4),
+                         );
+
+        $options = array('primary' => array('id'),
+                         'indexes' => array('myindex' => array(
+                                                    'fields' => array('name')))
+                         );
+
+        $this->export->createTable('sometable', $fields, $options);
+        $this->assertEqual($this->adapter->pop(), 'CREATE INDEX [myindex] ON [sometable] ([name])');
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE sometable (id BIGINT NOT NULL identity, name VARCHAR(4) NULL, PRIMARY KEY([id]))');
+    }
+    public function testCreateTableSupportsCompoundForeignKeys()
+    {
+        $name = 'mytable';
+
+        $fields = array('id' => array('type' => 'boolean', 'primary' => true, 'notnull' => true),
+                        'lang' => array('type' => 'integer', 'primary' => true, 'notnull' => true)
+                        );
+        $options = array('foreignKeys' => array(array('local' => array ('id', 'lang' ),
+                                                      'foreign' => array ('id', 'lang'),
+                                                      'foreignTable' => 'sometable'))
+                         );
+
+        $sql = $this->export->createTableSql($name, $fields, $options);
+        
+        $this->assertEqual(count($sql), 2);
+        $this->assertEqual($sql[0], 'CREATE TABLE mytable (id BIT NOT NULL, lang INT NOT NULL, PRIMARY KEY([id], [lang]))');
+        $this->assertEqual($sql[1], 'ALTER TABLE [mytable] ADD FOREIGN KEY ([id], [lang]) REFERENCES [sometable]([id], [lang])');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/MysqlTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/MysqlTestCase.php
new file mode 100644
index 000000000..399add35b
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/MysqlTestCase.php
@@ -0,0 +1,383 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Export_Mysql_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Export_Mysql_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables() 
+    { }
+    public function prepareData() 
+    { }
+
+    public function testAlterTableThrowsExceptionWithoutValidTableName()
+    {
+        try {
+            $this->export->alterTable(0, array(), array());
+
+            $this->fail();
+        } catch(Doctrine_Export_Exception $e) {
+            $this->pass();
+        }
+    }
+    public function testCreateTableExecutesSql() 
+    {
+        $name = 'mytable';
+        
+        $fields  = array('id' => array('type' => 'integer', 'unsigned' => 1));
+        $options = array('type' => 'MYISAM');
+        
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id INT UNSIGNED) ENGINE = MYISAM');
+    }
+    public function testCreateTableSupportsDefaultTableType() 
+    {
+        $name = 'mytable';
+        
+        $fields  = array('id' => array('type' => 'integer', 'unsigned' => 1));
+
+        $this->export->createTable($name, $fields);
+
+        // INNODB is the default type
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id INT UNSIGNED) ENGINE = INNODB');
+    }
+    public function testCreateTableSupportsMultiplePks() 
+    {
+        $name = 'mytable';
+        $fields  = array('name' => array('type' => 'char', 'length' => 10),
+                         'type' => array('type' => 'integer', 'length' => 3));
+                         
+        $options = array('primary' => array('name', 'type'));
+        $this->export->createTable($name, $fields, $options);
+        
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (name CHAR(10), type MEDIUMINT, PRIMARY KEY(name, type)) ENGINE = INNODB');
+    }
+    public function testCreateTableSupportsAutoincPks() 
+    {
+        $name = 'mytable';
+
+        $fields  = array('id' => array('type' => 'integer', 'unsigned' => 1, 'autoincrement' => true));
+        $options = array('primary' => array('id'), 
+                        'type' => 'INNODB');
+        
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id INT UNSIGNED AUTO_INCREMENT, PRIMARY KEY(id)) ENGINE = INNODB');
+    }
+    public function testCreateTableSupportsCharType() 
+    {
+        $name = 'mytable';
+        
+        $fields  = array('id' => array('type' => 'char', 'length' => 3));
+        $options = array('type' => 'MYISAM');
+        
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id CHAR(3)) ENGINE = MYISAM');
+    }
+    public function testCreateTableSupportsCharType2() 
+    {
+        $name = 'mytable';
+        
+        $fields  = array('id' => array('type' => 'char'));
+        $options = array('type' => 'MYISAM');
+        
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id CHAR(255)) ENGINE = MYISAM');
+    }
+    public function testCreateTableSupportsVarcharType() 
+    {
+        $name = 'mytable';
+        
+        $fields  = array('id' => array('type' => 'varchar', 'length' => '100'));
+        $options = array('type' => 'MYISAM');
+
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id VARCHAR(100)) ENGINE = MYISAM');
+    }
+    public function testCreateTableSupportsIntegerType() 
+    {
+        $name = 'mytable';
+        
+        $fields  = array('id' => array('type' => 'integer', 'length' => '10'));
+        $options = array('type' => 'MYISAM');
+
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id BIGINT) ENGINE = MYISAM');
+    }
+    public function testCreateTableSupportsBlobType() 
+    {
+        $name = 'mytable';
+        
+        $fields  = array('content' => array('type' => 'blob'));
+        $options = array('type' => 'MYISAM');
+
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (content LONGBLOB) ENGINE = MYISAM');
+    }
+    public function testCreateTableSupportsBlobType2() 
+    {
+        $name = 'mytable';
+        
+        $fields  = array('content' => array('type' => 'blob', 'length' => 2000));
+        $options = array('type' => 'MYISAM');
+
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (content BLOB) ENGINE = MYISAM');
+    }
+
+    public function testCreateTableSupportsBooleanType()
+    {
+        $name = 'mytable';
+        
+        $fields  = array('id' => array('type' => 'boolean'));
+        $options = array('type' => 'MYISAM');
+
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id TINYINT(1)) ENGINE = MYISAM');
+    }
+    public function testCreateTableSupportsForeignKeys()
+    {
+        $name = 'mytable';
+        
+        $fields = array('id' => array('type' => 'boolean', 'primary' => true),
+                        'foreignKey' => array('type' => 'integer')
+                        );
+        $options = array('type' => 'INNODB',
+                         'foreignKeys' => array(array('local' => 'foreignKey',
+                                                      'foreign' => 'id',
+                                                      'foreignTable' => 'sometable'))
+                         );
+
+
+        $sql = $this->export->createTableSql($name, $fields, $options);
+
+        $this->assertEqual($sql[0], 'CREATE TABLE mytable (id TINYINT(1), foreignKey INT, INDEX foreignKey_idx (foreignKey)) ENGINE = INNODB');
+        $this->assertEqual($sql[1], 'ALTER TABLE mytable ADD FOREIGN KEY (foreignKey) REFERENCES sometable(id)');
+    }
+    public function testForeignKeyIdentifierQuoting()
+    {
+        $this->conn->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, true);
+
+        $name = 'mytable';
+
+        $fields = array('id' => array('type' => 'boolean', 'primary' => true),
+                        'foreignKey' => array('type' => 'integer')
+                        );
+        $options = array('type' => 'INNODB',
+                         'foreignKeys' => array(array('local' => 'foreignKey',
+                                                      'foreign' => 'id',
+                                                      'foreignTable' => 'sometable'))
+                         );
+
+
+        $sql = $this->export->createTableSql($name, $fields, $options);
+
+        $this->assertEqual($sql[0], 'CREATE TABLE `mytable` (`id` TINYINT(1), `foreignKey` INT, INDEX `foreignKey_idx` (`foreignKey`)) ENGINE = INNODB');
+        $this->assertEqual($sql[1], 'ALTER TABLE `mytable` ADD FOREIGN KEY (`foreignKey`) REFERENCES `sometable`(`id`)');
+
+        $this->conn->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, false);
+    }
+    public function testIndexIdentifierQuoting()
+    {
+        $this->conn->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, true);
+
+        $fields  = array('id' => array('type' => 'integer', 'unsigned' => 1, 'autoincrement' => true),
+                         'name' => array('type' => 'string', 'length' => 4),
+                         );
+
+        $options = array('primary' => array('id'),
+                         'indexes' => array('myindex' => array('fields' => array('id', 'name')))
+                         );
+
+        $this->export->createTable('sometable', $fields, $options);
+
+        //this was the old line, but it looks like the table is created first 
+        //and then the index so i replaced it with the ones below
+        //$this->assertEqual($var, 'CREATE TABLE sometable (id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(4), INDEX myindex (id, name))');
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE `sometable` (`id` INT UNSIGNED AUTO_INCREMENT, `name` VARCHAR(4), INDEX `myindex_idx` (`id`, `name`), PRIMARY KEY(`id`)) ENGINE = INNODB');
+
+        $this->conn->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, false);
+    }
+    public function testCreateTableDoesNotAutoAddIndexesWhenIndexForFkFieldAlreadyExists()
+    {
+        $name = 'mytable';
+        
+        $fields = array('id' => array('type' => 'boolean', 'primary' => true),
+                        'foreignKey' => array('type' => 'integer')
+                        );
+        $options = array('type' => 'INNODB',
+                         'foreignKeys' => array(array('local' => 'foreignKey',
+                                                      'foreign' => 'id',
+                                                      'foreignTable' => 'sometable')),
+                         'indexes' => array('myindex' => array('fields' => array('foreignKey'))),
+                         );
+
+
+        $sql = $this->export->createTableSql($name, $fields, $options);
+        $this->assertEqual($sql[0], 'CREATE TABLE mytable (id TINYINT(1), foreignKey INT, INDEX myindex_idx (foreignKey)) ENGINE = INNODB');
+        $this->assertEqual($sql[1], 'ALTER TABLE mytable ADD FOREIGN KEY (foreignKey) REFERENCES sometable(id)');
+    }
+    public function testCreateDatabaseExecutesSql()
+    {
+        $this->export->createDatabase('db');
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE DATABASE db');
+    }
+    public function testDropDatabaseExecutesSql() 
+    {
+        $this->export->dropDatabase('db');
+
+        $this->assertEqual($this->adapter->pop(), 'SET FOREIGN_KEY_CHECKS = 1');
+        $this->assertEqual($this->adapter->pop(), 'DROP DATABASE db');
+        $this->assertEqual($this->adapter->pop(), 'SET FOREIGN_KEY_CHECKS = 0');
+    }
+
+    public function testDropIndexExecutesSql() 
+    {
+        $this->export->dropIndex('sometable', 'relevancy');
+
+        $this->assertEqual($this->adapter->pop(), 'DROP INDEX relevancy_idx ON sometable');
+    }
+    public function testUnknownIndexSortingAttributeThrowsException()
+    {
+        $fields = array('id' => array('sorting' => 'ASC'),
+                        'name' => array('sorting' => 'unknown'));
+
+        try {
+            $this->export->getIndexFieldDeclarationList($fields);
+            $this->fail();
+        } catch(Doctrine_Export_Exception $e) {
+            $this->pass();
+        }
+    }
+    public function testIndexDeclarationsSupportSortingAndLengthAttributes()
+    {
+        $fields = array('id' => array('sorting' => 'ASC', 'length' => 10),
+                        'name' => array('sorting' => 'DESC', 'length' => 1));
+
+        $this->assertEqual($this->export->getIndexFieldDeclarationList($fields), 'id(10) ASC, name(1) DESC');
+    }
+    public function testCreateTableSupportsIndexesUsingSingleFieldString()
+    {
+        $fields  = array('id' => array('type' => 'integer', 'unsigned' => 1, 'autoincrement' => true),
+                         'name' => array('type' => 'string', 'length' => 4),
+                         );
+
+        $options = array('primary' => array('id'),
+                         'indexes' => array('myindex' => array(
+                                                    'fields' => 'name'))
+                         );
+
+        $this->export->createTable('sometable', $fields, $options);        
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE sometable (id INT UNSIGNED AUTO_INCREMENT, name VARCHAR(4), INDEX myindex_idx (name), PRIMARY KEY(id)) ENGINE = INNODB');
+    }
+    public function testCreateTableSupportsIndexesWithCustomSorting()
+    {
+        $fields  = array('id' => array('type' => 'integer', 'unsigned' => 1, 'autoincrement' => true),
+                         'name' => array('type' => 'string', 'length' => 4),
+                         );
+
+        $options = array('primary' => array('id'),
+                         'indexes' => array('myindex' => array(
+                                                    'fields' => array(
+                                                            'id' => array('sorting' => 'ASC'), 
+                                                            'name' => array('sorting' => 'DESC')
+                                                                )
+                                                            ))
+                         );
+
+        $this->export->createTable('sometable', $fields, $options);
+        
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE sometable (id INT UNSIGNED AUTO_INCREMENT, name VARCHAR(4), INDEX myindex_idx (id ASC, name DESC), PRIMARY KEY(id)) ENGINE = INNODB');
+    }
+    public function testCreateTableSupportsFulltextIndexes()
+    {
+        $fields  = array('id' => array('type' => 'integer', 'unsigned' => 1, 'autoincrement' => true),
+                         'content' => array('type' => 'string', 'length' => 4),
+                         );
+
+        $options = array('primary' => array('id'),
+                         'indexes' => array('myindex' => array(
+                                                    'fields' => array(
+                                                            'content' => array('sorting' => 'DESC')
+                                                                ),
+                                                    'type' => 'fulltext',
+                                                            )),
+                         'type'    => 'MYISAM',
+                         );
+
+        $this->export->createTable('sometable', $fields, $options);
+        
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE sometable (id INT UNSIGNED AUTO_INCREMENT, content VARCHAR(4), FULLTEXT INDEX myindex_idx (content DESC), PRIMARY KEY(id)) ENGINE = MYISAM');
+    }
+    public function testCreateTableSupportsCompoundForeignKeys()
+    {
+        $name = 'mytable';
+
+        $fields = array('id' => array('type' => 'boolean', 'primary' => true),
+                        'lang' => array('type' => 'integer', 'primary' => true)
+                        );
+        $options = array('type' => 'INNODB',
+                         'foreignKeys' => array(array('local' => array ('id', 'lang' ),
+                                                      'foreign' => array ('id', 'lang'),
+                                                      'foreignTable' => 'sometable'))
+                         );
+
+        $sql = $this->export->createTableSql($name, $fields, $options);
+
+        $this->assertEqual($sql[0], 'CREATE TABLE mytable (id TINYINT(1), lang INT, INDEX id_idx (id), INDEX lang_idx (lang)) ENGINE = INNODB');
+        $this->assertEqual($sql[1], 'ALTER TABLE mytable ADD FOREIGN KEY (id, lang) REFERENCES sometable(id, lang)');
+    }
+    public function testCreateTableSupportsFieldCharset()
+    {
+        $sql = $this->export->createTableSql('mytable', array(
+            'name' => array('type' => 'string', 'length' => 255, 'charset' => 'utf8'),
+        ));
+
+        $this->assertEqual($sql[0], 'CREATE TABLE mytable (name VARCHAR(255) CHARACTER SET utf8) ENGINE = INNODB');
+    }
+    public function testCreateTableSupportsFieldCollation()
+    {
+        $sql = $this->export->createTableSql('mytable', array(
+            'name' => array('type' => 'string', 'length' => 255, 'collation' => 'utf8_general_ci'),
+        ));
+
+        $this->assertEqual($sql[0], 'CREATE TABLE mytable (name VARCHAR(255) COLLATE utf8_general_ci) ENGINE = INNODB');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/OracleTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/OracleTestCase.php
new file mode 100644
index 000000000..5c16b2602
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/OracleTestCase.php
@@ -0,0 +1,235 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Export_Oracle_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Export_Oracle_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testCreateSequenceExecutesSql() 
+    {
+        $sequenceName = 'sequence';
+        $start = 1;
+        $query = 'CREATE SEQUENCE ' . $sequenceName . '_seq START WITH ' . $start . ' INCREMENT BY 1 NOCACHE';
+
+        $this->export->createSequence($sequenceName, $start);
+        
+        $this->assertEqual($this->adapter->pop(), $query);
+    }
+
+    public function testDropSequenceExecutesSql() 
+    {
+        $sequenceName = 'sequence';
+
+        $query = 'DROP SEQUENCE ' . $sequenceName;
+
+        $this->export->dropSequence($sequenceName);
+        
+        $this->assertEqual($this->adapter->pop(), $query . '_seq');
+    }
+    public function testCreateTableExecutesSql() 
+    {
+        $name = 'mytable';
+        
+        $fields  = array('id' => array('type' => 'integer'));
+        $options = array('type' => 'MYISAM');
+        
+        $this->export->createTable($name, $fields);
+
+        $this->assertEqual($this->adapter->pop(), 'COMMIT');
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id INTEGER)');
+        $this->assertEqual($this->adapter->pop(), 'BEGIN TRANSACTION');
+    }
+    public function testCreateTableSupportsDefaultAttribute() 
+    {
+        $name = 'mytable';
+        $fields  = array('name' => array('type' => 'char', 'length' => 10, 'default' => 'def'),
+                         'type' => array('type' => 'integer', 'length' => 3, 'default' => 12)
+                         );
+                         
+        $options = array('primary' => array('name', 'type'));
+        $this->export->createTable($name, $fields, $options);
+        
+
+        $this->assertEqual($this->adapter->pop(), 'COMMIT');
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (name CHAR(10) DEFAULT \'def\', type NUMBER(8) DEFAULT 12, PRIMARY KEY(name, type))');
+        $this->assertEqual($this->adapter->pop(), 'BEGIN TRANSACTION');
+    }
+    
+    public function testCreateTableWithOwnParams()
+    {
+        $this->conn->setParam('char_unit', 'CHAR');
+        $this->conn->setParam('varchar2_max_length', 1000);
+        
+        $fields = array(
+            'type' => array('type' => 'char', 'length' => 10, 'default' => 'admin'),
+            'name' => array('type' => 'string', 'length' => 1000),
+            'about' => array('type' => 'string', 'length' => 1001, 'default' => 'def'),
+        );
+        
+        $sql = $this->export->createTableSql('mytable', $fields);
+        $this->assertEqual($sql[0], "CREATE TABLE mytable (type CHAR(10 CHAR) DEFAULT 'admin', name VARCHAR2(1000 CHAR), about CLOB DEFAULT 'def')");
+        
+        $this->conn->setParam('char_unit', null);
+        $this->conn->setParam('varchar2_max_length', 4000);
+    }
+    
+    public function testCreateTableSupportsMultiplePks() 
+    {
+        $name = 'mytable';
+        $fields  = array('name' => array('type' => 'char', 'length' => 10),
+                         'type' => array('type' => 'integer', 'length' => 3));
+                         
+        $options = array('primary' => array('name', 'type'));
+        $this->export->createTable($name, $fields, $options);
+        
+
+        $this->assertEqual($this->adapter->pop(), 'COMMIT');
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (name CHAR(10), type NUMBER(8), PRIMARY KEY(name, type))');
+        $this->assertEqual($this->adapter->pop(), 'BEGIN TRANSACTION');
+    }
+    public function testCreateTableSupportsAutoincPks() 
+    {
+        $name = 'mytable';
+        
+        $fields  = array('id' => array('type' => 'integer', 'autoincrement' => true));
+
+
+        $this->export->createTable($name, $fields);
+
+        $this->assertEqual($this->adapter->pop(), 'COMMIT');
+        $this->assertEqual(substr($this->adapter->pop(), 0, 14), 'CREATE TRIGGER');
+        $this->assertEqual($this->adapter->pop(), 'CREATE SEQUENCE MYTABLE_seq START WITH 1 INCREMENT BY 1 NOCACHE');  
+        $this->assertEqual(substr($this->adapter->pop(), 0, 7), "DECLARE");
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id INTEGER)');
+        $this->assertEqual($this->adapter->pop(), 'BEGIN TRANSACTION');
+    }
+
+    public function testCreateTableSupportsCharType() 
+    {
+        $name = 'mytable';
+        
+        $fields  = array('id' => array('type' => 'char', 'length' => 3));
+
+        $this->export->createTable($name, $fields);
+
+        $this->adapter->pop();
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id CHAR(3))');
+    }
+    public function testCreateTableSupportsUniqueConstraint()
+    {
+        $fields  = array('id' => array('type' => 'integer', 'unsigned' => 1, 'autoincrement' => true, 'unique' => true),
+                         'name' => array('type' => 'string', 'length' => 4),
+                         );
+
+        $options = array('primary' => array('id'),
+                         );
+
+        $sql = $this->export->createTableSql('sometable', $fields, $options);
+
+        $this->assertEqual($sql[0], 'CREATE TABLE sometable (id INTEGER UNIQUE, name VARCHAR2(4), PRIMARY KEY(id))');
+    }
+    public function testCreateTableSupportsIndexes()
+    {
+        $fields  = array('id' => array('type' => 'integer', 'unsigned' => 1, 'autoincrement' => true, 'unique' => true),
+                         'name' => array('type' => 'string', 'length' => 4),
+                         );
+
+        $options = array('primary' => array('id'),
+                         'indexes' => array('myindex' => array('fields' => array('id', 'name')))
+                         );
+
+        $sql = $this->export->createTableSql('sometable', $fields, $options);
+
+        $this->assertEqual($sql[0], 'CREATE TABLE sometable (id INTEGER UNIQUE, name VARCHAR2(4), PRIMARY KEY(id))');
+        $this->assertEqual($sql[4], 'CREATE INDEX myindex ON sometable (id, name)');
+        
+        $fields = array('id'=> array('type'=>'integer', 'unisgned' => 1, 'autoincrement' => true),
+                        'name' => array('type' => 'string', 'length' => 4),
+                        'category' => array('type'=>'integer', 'length'=>2),
+                        );
+        $options = array('primary' => array('id'),
+                         'indexes' => array('category_index' => array('fields'=> array('category')), 'unique_index' => array('type'=> 'unique', 'fields'=> array('id', 'name'))),
+                         );
+        $sql = $this->export->createTableSql('sometable', $fields, $options);
+        $this->assertEqual($sql[0], 'CREATE TABLE sometable (id INTEGER, name VARCHAR2(4), category NUMBER(5), PRIMARY KEY(id), CONSTRAINT unique_index UNIQUE (id, name))');
+        $this->assertEqual($sql[4], 'CREATE INDEX category_index ON sometable (category)');
+    }
+    
+    public function testIdentifierQuoting()
+    {
+    	$this->conn->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, true);
+        
+        $fields = array('id' => array('type' => 'integer', 'unsigned' => 1, 'autoincrement' => true),
+                        'name' => array('type' => 'string', 'length' => 4),
+                        );
+        $options = array('primary' => array('id'),
+                         'indexes' => array('myindex' => array('fields' => array('id', 'name')))
+                         );
+                         
+        $sql  = $this->export->createTableSql('sometable', $fields, $options);
+        $this->assertEqual($sql[0], 'CREATE TABLE "sometable" ("id" INTEGER, "name" VARCHAR2(4), PRIMARY KEY("id"))');
+        $this->assertEqual($sql[1], 'DECLARE
+  constraints_Count NUMBER;
+BEGIN
+  SELECT COUNT(CONSTRAINT_NAME) INTO constraints_Count FROM USER_CONSTRAINTS WHERE TABLE_NAME = \'sometable\' AND CONSTRAINT_TYPE = \'P\';
+  IF constraints_Count = 0 THEN
+    EXECUTE IMMEDIATE \'ALTER TABLE "sometable" ADD CONSTRAINT "sometable_AI_PK_idx" PRIMARY KEY ("id")\';
+  END IF;
+END;');
+        $this->assertEqual($sql[2], 'CREATE SEQUENCE "sometable_seq" START WITH 1 INCREMENT BY 1 NOCACHE');
+        $this->assertEqual($sql[3], 'CREATE TRIGGER "sometable_AI_PK"
+   BEFORE INSERT
+   ON "sometable"
+   FOR EACH ROW
+DECLARE
+   last_Sequence NUMBER;
+   last_InsertID NUMBER;
+BEGIN
+   IF (:NEW."id" IS NULL OR :NEW."id" = 0) THEN
+      SELECT "sometable_seq".NEXTVAL INTO :NEW."id" FROM DUAL;
+   ELSE
+      SELECT NVL(Last_Number, 0) INTO last_Sequence
+        FROM User_Sequences
+       WHERE UPPER(Sequence_Name) = UPPER(\'sometable_seq\');
+      SELECT :NEW."id" INTO last_InsertID FROM DUAL;
+      WHILE (last_InsertID > last_Sequence) LOOP
+         SELECT "sometable_seq".NEXTVAL INTO last_Sequence FROM DUAL;
+      END LOOP;
+   END IF;
+END;');
+		$this->assertEqual($sql[4], 'CREATE INDEX "myindex" ON "sometable" ("id", "name")');
+		
+		// test dropping sequence		
+		$sql = $this->export->dropSequenceSql('sometable');
+		$this->assertEqual($sql, 'DROP SEQUENCE "sometable_seq"');
+		
+        $this->conn->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, false);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/PgsqlTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/PgsqlTestCase.php
new file mode 100644
index 000000000..aa99596bc
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/PgsqlTestCase.php
@@ -0,0 +1,178 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Export_Mysql_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Export_Pgsql_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testCreateDatabaseExecutesSql() 
+    {
+        $this->export->createDatabase('db');
+        $this->assertEqual($this->adapter->pop(), 'CREATE DATABASE db');
+    }
+    public function testDropDatabaseExecutesSql()
+    {
+        $this->export->dropDatabase('db');
+
+        $this->assertEqual($this->adapter->pop(), 'DROP DATABASE db');
+    }
+    public function testCreateTableSupportsAutoincPks() 
+    {
+        $name = 'mytable';
+        
+        $fields  = array('id' => array('type' => 'integer', 'unsigned' => 1, 'autoincrement' => true));
+        $options = array('primary' => array('id'));
+        
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id SERIAL, PRIMARY KEY(id))');
+    }
+    public function testQuoteAutoincPks() 
+    {
+        $this->conn->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, true);
+
+        $name = 'mytable';
+
+        $fields  = array('id' => array('type' => 'integer', 'unsigned' => 1, 'autoincrement' => true));
+        $options = array('primary' => array('id'));
+
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE "mytable" ("id" SERIAL, PRIMARY KEY("id"))');
+
+        $name = 'mytable';
+        $fields  = array('name' => array('type' => 'char', 'length' => 10),
+                         'type' => array('type' => 'integer', 'length' => 3));
+
+        $options = array('primary' => array('name', 'type'));
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE "mytable" ("name" CHAR(10), "type" INT, PRIMARY KEY("name", "type"))');
+
+        $this->conn->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, false);
+    }
+    public function testForeignKeyIdentifierQuoting()
+    {
+        $this->conn->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, true);
+
+        $name = 'mytable';
+
+        $fields = array('id' => array('type' => 'boolean', 'primary' => true),
+                        'foreignKey' => array('type' => 'integer')
+                        );
+        $options = array('foreignKeys' => array(array('local' => 'foreignKey',
+                                                      'foreign' => 'id',
+                                                      'foreignTable' => 'sometable'))
+                         );
+
+
+        $sql = $this->export->createTableSql($name, $fields, $options);
+
+        $this->assertEqual($sql[0], 'CREATE TABLE "mytable" ("id" BOOLEAN, "foreignKey" INT)');
+        $this->assertEqual($sql[1], 'ALTER TABLE "mytable" ADD FOREIGN KEY ("foreignKey") REFERENCES "sometable"("id") NOT DEFERRABLE INITIALLY IMMEDIATE');
+
+        $this->conn->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, false);
+    }
+    public function testCreateTableSupportsDefaultAttribute() 
+    {
+        $name = 'mytable';
+        $fields  = array('name' => array('type' => 'char', 'length' => 10, 'default' => 'def'),
+                         'type' => array('type' => 'integer', 'length' => 3, 'default' => 12),
+                         'is_active' => array('type' => 'boolean', 'default'=>'0'),
+                         'is_admin'  => array('type' => 'boolean', 'default'=>'true'),
+                         );
+                         
+        $options = array('primary' => array('name', 'type'));
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), "CREATE TABLE mytable (name CHAR(10) DEFAULT 'def', type INT DEFAULT 12, is_active BOOLEAN DEFAULT 'false', is_admin BOOLEAN DEFAULT 'true', PRIMARY KEY(name, type))");
+    }
+    public function testCreateTableSupportsMultiplePks()
+     {
+        $name = 'mytable';
+        $fields  = array('name' => array('type' => 'char', 'length' => 10),
+                         'type' => array('type' => 'integer', 'length' => 3));
+                         
+        $options = array('primary' => array('name', 'type'));
+        $this->export->createTable($name, $fields, $options);
+        
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (name CHAR(10), type INT, PRIMARY KEY(name, type))');
+    }
+    public function testExportSql()
+    {
+        $sql = $this->export->exportClassesSql(array("FooRecord", "FooReferenceRecord", "FooLocallyOwned", "FooForeignlyOwned", "FooForeignlyOwnedWithPK", "FooBarRecord", "BarRecord"));
+        //dirname(__FILE__) . DIRECTORY_SEPARATOR . '_files');
+
+        $this->assertEqual($sql, array ( 0 => 'CREATE TABLE foo_reference (foo1 BIGINT, foo2 BIGINT, PRIMARY KEY(foo1, foo2))', 
+                                         1 => 'CREATE TABLE foo_locally_owned (id BIGSERIAL, name VARCHAR(200), PRIMARY KEY(id))', 
+                                         2 => 'CREATE TABLE foo_foreignly_owned_with_pk (id BIGSERIAL, name VARCHAR(200), PRIMARY KEY(id))', 
+                                         3 => 'CREATE TABLE foo_foreignly_owned (id BIGSERIAL, name VARCHAR(200), fooid BIGINT, PRIMARY KEY(id))', 
+                                         4 => 'CREATE TABLE foo_bar_record (fooid BIGINT, barid BIGINT, PRIMARY KEY(fooid, barid))', 
+                                         5 => 'CREATE TABLE foo (id BIGSERIAL, name VARCHAR(200) NOT NULL, parent_id BIGINT, local_foo BIGINT, PRIMARY KEY(id))', 
+                                         6 => 'CREATE TABLE bar (id BIGSERIAL, name VARCHAR(200), PRIMARY KEY(id))', 
+                                         7 => 'ALTER TABLE foo_reference ADD CONSTRAINT foo_reference_foo1_foo_id FOREIGN KEY (foo1) REFERENCES foo(id) NOT DEFERRABLE INITIALLY IMMEDIATE', 
+                                         8 => 'ALTER TABLE foo_bar_record ADD CONSTRAINT foo_bar_record_fooid_foo_id FOREIGN KEY (fooid) REFERENCES foo(id) NOT DEFERRABLE INITIALLY IMMEDIATE', 
+                                         9 => 'ALTER TABLE foo ADD CONSTRAINT foo_parent_id_foo_id FOREIGN KEY (parent_id) REFERENCES foo(id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE', 
+                                         10 => 'ALTER TABLE foo ADD CONSTRAINT foo_local_foo_foo_locally_owned_id FOREIGN KEY (local_foo) REFERENCES foo_locally_owned(id) ON DELETE RESTRICT NOT DEFERRABLE INITIALLY IMMEDIATE', 
+                                         ));
+    }
+
+	public function testAlterTableSql()
+    {
+        $changes  = array(
+			'add' => array('newfield' => array('type' => 'int')),
+			'remove' => array('oldfield' => array())
+		);
+
+        $sql = $this->export->alterTableSql('mytable', $changes);
+
+		$this->assertEqual($sql, array(
+		    0 => 'ALTER TABLE mytable ADD newfield INT',
+			1 => 'ALTER TABLE mytable DROP oldfield'
+		));
+    }
+
+	public function testAlterTableSqlIdentifierQuoting()
+    {
+		$this->conn->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, true);
+		
+        $changes  = array(
+			'add' => array('newfield' => array('type' => 'int')),
+			'remove' => array('oldfield' => array())
+		);
+
+        $sql = $this->export->alterTableSql('mytable', $changes);
+
+		$this->assertEqual($sql, array(
+		    0 => 'ALTER TABLE "mytable" ADD "newfield" INT',
+			1 => 'ALTER TABLE "mytable" DROP "oldfield"'
+		));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/RecordTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/RecordTestCase.php
new file mode 100644
index 000000000..39a6976af
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/RecordTestCase.php
@@ -0,0 +1,108 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+clearstatcache();
+/**
+ * Doctrine_Export_Record_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Export_Record_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables() 
+    { }
+    public function prepareData() 
+    { }
+    public function setUp() {
+        $this->driverName = 'mysql';
+        if ( ! $this->init) {
+            $this->init();
+        }
+
+        $this->init    = true;
+    }
+
+    public function testExportSupportsForeignKeys()
+    {
+        $sql = $this->conn->export->exportClassesSql(array('ForeignKeyTest'));
+
+        $this->assertEqual($sql[0], 'CREATE TABLE foreign_key_test (id BIGINT AUTO_INCREMENT, name TEXT, code INT, content TEXT, parent_id BIGINT, INDEX parent_id_idx (parent_id), PRIMARY KEY(id)) ENGINE = INNODB');
+        if (isset($sql[1])) {
+            $this->assertEqual($sql[1], 'ALTER TABLE foreign_key_test ADD CONSTRAINT foreign_key_test_parent_id_foreign_key_test_id FOREIGN KEY (parent_id) REFERENCES foreign_key_test(id) ON UPDATE RESTRICT ON DELETE CASCADE');
+        } else {
+            $this->fail('$sql should contain ALTER TABLE statement');
+        }
+    }
+
+    public function testExportSupportsIndexes()
+    {
+        $sql = $this->conn->export->exportClassesSql(array('MysqlIndexTestRecord'));
+
+        $this->assertEqual($sql[0], 'CREATE TABLE mysql_index_test_record (id BIGINT AUTO_INCREMENT, name TEXT, code INT, content TEXT, FULLTEXT INDEX content_idx (content), UNIQUE INDEX namecode_idx (name, code), PRIMARY KEY(id)) ENGINE = MYISAM');
+    }
+
+    public function testRecordDefinitionsSupportTableOptions()
+    {
+        $sql = $this->conn->export->exportClassesSql(array('MysqlTestRecord'));
+
+        $this->assertEqual($sql[0], 'CREATE TABLE mysql_test_record (name TEXT, code BIGINT, PRIMARY KEY(name, code)) ENGINE = INNODB');
+    }
+
+    public function testExportSupportsForeignKeysWithoutAttributes()
+    {
+        $sql = $this->conn->export->exportClassesSql(array('ForeignKeyTest'));
+
+        $this->assertEqual($sql[0], 'CREATE TABLE foreign_key_test (id BIGINT AUTO_INCREMENT, name TEXT, code INT, content TEXT, parent_id BIGINT, INDEX parent_id_idx (parent_id), PRIMARY KEY(id)) ENGINE = INNODB');
+        if (isset($sql[1])) {
+            $this->assertEqual($sql[1], 'ALTER TABLE foreign_key_test ADD CONSTRAINT foreign_key_test_parent_id_foreign_key_test_id FOREIGN KEY (parent_id) REFERENCES foreign_key_test(id) ON UPDATE RESTRICT ON DELETE CASCADE');
+        } else {
+            $this->fail('$sql should contain ALTER TABLE statement');
+        }
+    }
+
+    public function testExportSupportsForeignKeysForManyToManyRelations()
+    {
+        $sql = $this->conn->export->exportClassesSql(array('MysqlUser'));
+
+        $this->assertEqual($sql[0], 'CREATE TABLE mysql_user (id BIGINT AUTO_INCREMENT, name TEXT, PRIMARY KEY(id)) ENGINE = INNODB');
+
+        $sql = $this->conn->export->exportClassesSql(array('MysqlGroup'));
+
+        $this->assertEqual($sql[0], 'CREATE TABLE mysql_group (id BIGINT AUTO_INCREMENT, name TEXT, PRIMARY KEY(id)) ENGINE = INNODB');
+    }
+
+    public function testExportModelFromDirectory()
+    {
+        
+        Doctrine_Core::createTablesFromModels(dirname(__FILE__) . DIRECTORY_SEPARATOR .'..' . DIRECTORY_SEPARATOR . 'models' . DIRECTORY_SEPARATOR . 'export');
+        $this->assertEqual($this->adapter->pop(), 'COMMIT');
+        $this->assertEqual($this->adapter->pop(), 'ALTER TABLE cms__category_languages ADD CONSTRAINT cms__category_languages_category_id_cms__category_id FOREIGN KEY (category_id) REFERENCES cms__category(id) ON DELETE CASCADE');
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE cms__category_languages (id BIGINT AUTO_INCREMENT, name TEXT, category_id BIGINT, language_id BIGINT, INDEX index_category_idx (category_id), INDEX index_language_idx (language_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = INNODB');
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE cms__category (id BIGINT AUTO_INCREMENT, created DATETIME, parent BIGINT, position MEDIUMINT, active BIGINT, INDEX index_parent_idx (parent), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = INNODB');   
+        $this->assertEqual($this->adapter->pop(), 'BEGIN TRANSACTION');
+    }
+
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/SchemaTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/SchemaTestCase.php
new file mode 100644
index 000000000..960611a6f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/SchemaTestCase.php
@@ -0,0 +1,62 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Export_Schema_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Export_Schema_TestCase extends Doctrine_UnitTestCase 
+{
+    public $tables =   array('Entity',
+                      'EntityReference',
+                      'EntityAddress',
+                      'Email',
+                      'Phonenumber',
+                      'Groupuser',
+                      'Group',
+                      'User',
+                      'Album',
+                      'Song',
+                      'Element',
+                      'TestError',
+                      'Description',
+                      'Address',
+                      'Account',
+                      'Task',
+                      'Resource',
+                      'Assignment',
+                      'ResourceType',
+                      'ResourceReference');
+    
+    public function testYmlExport()
+    {
+        $export = new Doctrine_Export_Schema();
+        $export->exportSchema('schema-export.yml', 'yml', dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'models', $this->tables);
+        unlink('schema-export.yml');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/SqliteTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/SqliteTestCase.php
new file mode 100644
index 000000000..377696153
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Export/SqliteTestCase.php
@@ -0,0 +1,188 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Export_Sqlite_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Export_Sqlite_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testCreateDatabaseDoesNotExecuteSqlAndCreatesSqliteFile()
+    {
+        $this->export->createDatabase('sqlite.db');
+      
+        $this->assertTrue(file_exists('sqlite.db'));
+    }
+    public function testDropDatabaseDoesNotExecuteSqlAndDeletesSqliteFile()
+    {
+        $this->export->dropDatabase('sqlite.db');
+
+        $this->assertFalse(file_exists('sqlite.db'));
+    }
+    public function testCreateTableSupportsAutoincPks() 
+    {
+        $name = 'mytable';
+        
+        $fields  = array('id' => array('type' => 'integer', 'unsigned' => 1, 'autoincrement' => true));
+
+        $this->export->createTable($name, $fields);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (id INTEGER PRIMARY KEY AUTOINCREMENT)');
+    }
+    public function testCreateTableSupportsDefaultAttribute() 
+    {
+        $name = 'mytable';
+        $fields  = array('name' => array('type' => 'char', 'length' => 10, 'default' => 'def'),
+                         'type' => array('type' => 'integer', 'length' => 3, 'default' => 12)
+                         );
+
+        $options = array('primary' => array('name', 'type'));
+        $this->export->createTable($name, $fields, $options);
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (name CHAR(10) DEFAULT \'def\', type INTEGER DEFAULT 12, PRIMARY KEY(name, type))');
+    }
+    public function testCreateTableSupportsMultiplePks() 
+    {
+        $name = 'mytable';
+        $fields  = array('name' => array('type' => 'char', 'length' => 10),
+                         'type' => array('type' => 'integer', 'length' => 3));
+                         
+        $options = array('primary' => array('name', 'type'));
+        $this->export->createTable($name, $fields, $options);
+        
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE mytable (name CHAR(10), type INTEGER, PRIMARY KEY(name, type))');
+    }
+    public function testCreateTableSupportsIndexes()
+    {
+        $fields  = array('id' => array('type' => 'integer', 'unsigned' => 1, 'autoincrement' => true, 'unique' => true),
+                         'name' => array('type' => 'string', 'length' => 4),
+                         );
+
+        $options = array('primary' => array('id'),
+                         'indexes' => array('myindex' => array('fields' => array('id', 'name')))
+                         );
+
+        $this->export->createTable('sometable', $fields, $options);
+
+        //this was the old line, but it looks like the table is created first 
+        //and then the index so i replaced it with the ones below
+        //$this->assertEqual($var, 'CREATE TABLE sometable (id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(4), INDEX myindex (id, name))');
+
+        $this->assertEqual($this->adapter->pop(),"CREATE INDEX myindex_idx ON sometable (id, name)");
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE sometable (id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(4))');
+    }
+    public function testIdentifierQuoting()
+    {
+        $this->conn->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, true);
+
+        $fields  = array('id' => array('type' => 'integer', 'unsigned' => 1, 'autoincrement' => true, 'unique' => true),
+                         'name' => array('type' => 'string', 'length' => 4),
+                         );
+
+        $options = array('primary' => array('id'),
+                         'indexes' => array('myindex' => array('fields' => array('id', 'name')))
+                         );
+
+        $this->export->createTable('sometable', $fields, $options);
+
+        //this was the old line, but it looks like the table is created first 
+        //and then the index so i replaced it with the ones below
+        //$this->assertEqual($var, 'CREATE TABLE sometable (id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(4), INDEX myindex (id, name))');
+
+        $this->assertEqual($this->adapter->pop(),'CREATE INDEX "myindex_idx" ON "sometable" ("id", "name")');
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE "sometable" ("id" INTEGER PRIMARY KEY AUTOINCREMENT, "name" VARCHAR(4))');
+
+        $this->conn->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, false);
+    }
+    public function testQuoteMultiplePks() 
+    {
+        $this->conn->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, true);
+
+        $name = 'mytable';
+        $fields  = array('name' => array('type' => 'char', 'length' => 10),
+                         'type' => array('type' => 'integer', 'length' => 3));
+                         
+        $options = array('primary' => array('name', 'type'));
+        $this->export->createTable($name, $fields, $options);
+        
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE "mytable" ("name" CHAR(10), "type" INTEGER, PRIMARY KEY("name", "type"))');
+
+        $this->conn->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, false);
+    }
+    public function testUnknownIndexSortingAttributeThrowsException()
+    {
+        $fields = array('id' => array('sorting' => 'ASC'),
+                        'name' => array('sorting' => 'unknown'));
+
+        try {
+            $this->export->getIndexFieldDeclarationList($fields);
+            $this->fail();
+        } catch(Doctrine_Export_Exception $e) {
+            $this->pass();
+        }
+    }
+    public function testCreateTableSupportsIndexesWithCustomSorting()
+    {
+        $fields  = array('id' => array('type' => 'integer', 'unsigned' => 1, 'autoincrement' => true, 'unique' => true),
+                         'name' => array('type' => 'string', 'length' => 4),
+                         );
+
+        $options = array('primary' => array('id'),
+                         'indexes' => array('myindex' => array(
+                                                    'fields' => array(
+                                                            'id' => array('sorting' => 'ASC'), 
+                                                            'name' => array('sorting' => 'DESC')
+                                                                )
+                                                            ))
+                         );
+
+        $this->export->createTable('sometable', $fields, $options);
+        
+        //removed this assertion and inserted the two below
+//        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE sometable (id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(4), INDEX myindex (id ASC, name DESC))');
+
+        $this->assertEqual($this->adapter->pop(),"CREATE INDEX myindex_idx ON sometable (id ASC, name DESC)");
+
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE sometable (id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(4))');
+
+    }
+
+    /**
+    public function testExportSupportsEmulationOfCascadingDeletes()
+    {
+        $r = new ForeignKeyTest;
+
+        $this->assertEqual($this->adapter->pop(), 'COMMIT');
+        $this->assertEqual($this->adapter->pop(), 'CREATE TRIGGER doctrine_foreign_key_test_cscd_delete AFTER DELETE ON foreign_key_test BEGIN DELETE FROM foreign_key_test WHERE parent_id = old.id;END;');
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE foreign_key_test (id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(2147483647), code INTEGER, content VARCHAR(4000), parent_id INTEGER)');
+        $this->assertEqual($this->adapter->pop(), 'BEGIN TRANSACTION');
+    }
+    */
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ExportTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ExportTestCase.php
new file mode 100644
index 000000000..85981914f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ExportTestCase.php
@@ -0,0 +1,96 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Export_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Export_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testCreateTableThrowsExceptionWithoutValidTableName() 
+    {
+        try {
+            $this->export->createTable(0, array(), array());
+
+            $this->fail();
+        } catch(Doctrine_Export_Exception $e) {
+            $this->pass();
+        }
+    }
+    public function testCreateTableThrowsExceptionWithEmptyFieldsArray() 
+    {
+        try {
+            $this->export->createTable('sometable', array(), array());
+
+            $this->fail();
+        } catch(Doctrine_Export_Exception $e) {
+            $this->pass();
+        }
+    }
+    public function testDropConstraintExecutesSql() 
+    {
+        $this->export->dropConstraint('sometable', 'relevancy');
+
+        $this->assertEqual($this->adapter->pop(), 'ALTER TABLE sometable DROP CONSTRAINT relevancy');
+    }
+    public function testCreateIndexExecutesSql() 
+    {
+        $this->export->createIndex('sometable', 'relevancy', array('fields' => array('title' => array(), 'content' => array())));
+        
+        $this->assertEqual($this->adapter->pop(), 'CREATE INDEX relevancy_idx ON sometable (title, content)');
+    }
+
+    public function testDropIndexExecutesSql() 
+    {
+        $this->export->dropIndex('sometable', 'relevancy');
+        
+        $this->assertEqual($this->adapter->pop(), 'DROP INDEX relevancy_idx');
+    }
+    public function testDropTableExecutesSql() 
+    {
+        $this->export->dropTable('sometable');
+        
+        $this->assertEqual($this->adapter->pop(), 'DROP TABLE sometable');
+    }
+    public function testRecordIsExportedProperly() 
+    {
+
+    }
+    public function testExport() 
+    {
+        
+    }
+    public function testDropDottedForeignKey()
+    {
+        $this->export->dropForeignKey('sometable', 'normal_foreign_key');
+        $this->assertEqual($this->adapter->pop(), 'ALTER TABLE sometable DROP CONSTRAINT normal_foreign_key');
+
+        $this->export->dropForeignKey('sometable', 'dotted.foreign.key');
+        $this->assertEqual($this->adapter->pop(), 'ALTER TABLE sometable DROP CONSTRAINT dotted_foreign_key');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Expression/DriverTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Expression/DriverTestCase.php
new file mode 100644
index 000000000..5b99e16da
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Expression/DriverTestCase.php
@@ -0,0 +1,171 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Expression_Driver_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Expression_Driver_TestCase extends Doctrine_UnitTestCase {
+
+    /**
+     * AGGREGATE FUNCTIONS
+     */
+    public function testAvgReturnsValidSql() {
+        $this->expr = new Doctrine_Expression_Mock();
+
+        $this->assertEqual($this->expr->avg('id'), 'AVG(id)');
+    }
+    public function testCountReturnsValidSql() {
+        $this->assertEqual($this->expr->count('id'), 'COUNT(id)');
+    }
+    public function testMaxReturnsValidSql() {
+        $this->assertEqual($this->expr->max('id'), 'MAX(id)');
+    }
+    public function testMinReturnsValidSql() {
+        $this->assertEqual($this->expr->min('id'), 'MIN(id)');
+    }
+    public function testSumReturnsValidSql() {
+        $this->assertEqual($this->expr->sum('id'), 'SUM(id)');
+    }
+
+    public function testRegexpImplementedOnlyAtDriverLevel() {
+        try {
+            $this->expr->regexp('[abc]');
+            $this->fail();
+        } catch(Doctrine_Expression_Exception $e) {
+            $this->pass();
+        }
+    }
+    public function testSoundexImplementedOnlyAtDriverLevel() {
+        try {
+            $this->expr->soundex('arnold');
+            $this->fail();
+        } catch(Doctrine_Expression_Exception $e) {
+            $this->pass();
+        }
+    }
+
+    /**
+     * TIME FUNCTIONS
+     */
+    public function testNowReturnsValidSql() {
+        $this->assertEqual($this->expr->now(), 'NOW()');
+    }
+
+    /**
+     * STRING FUNCTIONS
+     */
+    public function testUpperReturnsValidSql() {
+        $this->assertEqual($this->expr->upper('id', 3), 'UPPER(id)');
+    }
+    public function testLowerReturnsValidSql() {
+        $this->assertEqual($this->expr->lower('id'), 'LOWER(id)');
+    }
+    public function testLengthReturnsValidSql() {
+        $this->assertEqual($this->expr->length('id'), 'LENGTH(id)');
+    }
+    public function testLtrimReturnsValidSql() {
+        $this->assertEqual($this->expr->ltrim('id'), 'LTRIM(id)');
+    }
+    public function testLocateReturnsValidSql() {
+        $this->assertEqual($this->expr->locate('id', 3), 'LOCATE(id, 3)');
+    }
+    public function testConcatReturnsValidSql() {
+        $this->assertEqual($this->expr->concat('id', 'type'), 'CONCAT(id, type)');
+    }
+    public function testSubstringReturnsValidSql() {
+        $this->assertEqual($this->expr->substring('id', 3), 'SUBSTRING(id FROM 3)');
+
+        $this->assertEqual($this->expr->substring('id', 3, 2), 'SUBSTRING(id FROM 3 FOR 2)');
+    }
+
+    /**
+     * MATH FUNCTIONS
+     */
+    public function testRoundReturnsValidSql() {
+        $this->assertEqual($this->expr->round(2.3), 'ROUND(2.3, 0)');
+
+        $this->assertEqual($this->expr->round(2.3, 1), 'ROUND(2.3, 1)');
+    }
+    public function testModReturnsValidSql() {
+        $this->assertEqual($this->expr->mod(2, 3), 'MOD(2, 3)');
+    }
+    public function testSubReturnsValidSql() {
+        $this->assertEqual($this->expr->sub(array(2, 3)), '(2 - 3)');
+    }
+    public function testMulReturnsValidSql() {
+        $this->assertEqual($this->expr->mul(array(2, 3)), '(2 * 3)');
+    }
+    public function testAddReturnsValidSql() {
+        $this->assertEqual($this->expr->add(array(2, 3)), '(2 + 3)');
+    }
+    public function testDivReturnsValidSql() {
+        $this->assertEqual($this->expr->div(array(2, 3)), '(2 / 3)');
+    }
+
+    /**
+     * ASSERT OPERATORS
+     */
+    public function testEqReturnsValidSql() {
+        $this->assertEqual($this->expr->eq(1, 1), '1 = 1');
+    }
+    public function testNeqReturnsValidSql() {
+        $this->assertEqual($this->expr->neq(1, 2), '1 <> 2');
+    }
+    public function testGtReturnsValidSql() {
+        $this->assertEqual($this->expr->gt(2, 1), '2 > 1');
+    }
+    public function testGteReturnsValidSql() {
+        $this->assertEqual($this->expr->gte(1, 1), '1 >= 1');
+    }
+    public function testLtReturnsValidSql() {
+        $this->assertEqual($this->expr->lt(1, 2), '1 < 2');
+    }
+    public function testLteReturnsValidSql() {
+        $this->assertEqual($this->expr->lte(1, 1), '1 <= 1');
+    }
+
+    /**
+     * WHERE OPERATORS
+     */
+    public function testNotReturnsValidSql() {
+        $this->assertEqual($this->expr->not('id'), 'NOT(id)');
+    }
+    public function testInReturnsValidSql() {
+        $this->assertEqual($this->expr->in('id', array(1, 2)), 'id IN (1, 2)');
+    }
+    public function testIsNullReturnsValidSql() {
+        $this->assertEqual($this->expr->isNull('type'), 'type IS NULL');
+    }
+    public function testIsNotNullReturnsValidSql() {
+        $this->assertEqual($this->expr->isNotNull('type'), 'type IS NOT NULL');
+    }
+    public function testBetweenReturnsValidSql() {
+        $this->assertEqual($this->expr->between('age', 12, 14), 'age BETWEEN 12 AND 14');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Expression/MssqlTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Expression/MssqlTestCase.php
new file mode 100644
index 000000000..4d5bac712
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Expression/MssqlTestCase.php
@@ -0,0 +1,34 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Expression_Mssql_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Expression_Mssql_TestCase extends Doctrine_UnitTestCase {
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Expression/MysqlTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Expression/MysqlTestCase.php
new file mode 100644
index 000000000..c0762e0e7
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Expression/MysqlTestCase.php
@@ -0,0 +1,34 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Expression_Mysql_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Expression_Mysql_TestCase extends Doctrine_UnitTestCase {
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Expression/OracleTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Expression/OracleTestCase.php
new file mode 100644
index 000000000..c92c406d9
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Expression/OracleTestCase.php
@@ -0,0 +1,34 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Expression_Oracle_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Expression_Oracle_TestCase extends Doctrine_UnitTestCase {
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Expression/PgsqlTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Expression/PgsqlTestCase.php
new file mode 100644
index 000000000..00f95e8aa
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Expression/PgsqlTestCase.php
@@ -0,0 +1,34 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Expression_Pgsql_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Expression_Pgsql_TestCase extends Doctrine_UnitTestCase {
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Expression/SqliteTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Expression/SqliteTestCase.php
new file mode 100644
index 000000000..c4a8e92c2
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Expression/SqliteTestCase.php
@@ -0,0 +1,34 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Expression_Sqlite_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Expression_Sqlite_TestCase extends Doctrine_UnitTestCase {
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ExpressionTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ExpressionTestCase.php
new file mode 100644
index 000000000..dad0c3e3d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ExpressionTestCase.php
@@ -0,0 +1,69 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Expression_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Expression_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData()
+    {
+    }
+
+    public function testSavingWithAnExpression()
+    {
+        $e = new Doctrine_Expression("CONCAT('some', 'one')");
+        $this->assertEqual($e->getSql(), "CONCAT('some', 'one')");
+
+        $u = new User();
+        $u->name = $e;
+        $u->save();
+        $u->refresh();
+        $this->assertEqual($u->name, 'someone');
+    }
+
+    public function testExpressionParserSupportsNumericalClauses()
+    {
+        $e = new Doctrine_Expression('1 + 2');
+        $this->assertEqual($e->getSql(), '1 + 2');
+    }
+
+    public function testExpressionParserSupportsFunctionComposition()
+    {
+        $e = new Doctrine_Expression("SUBSTRING(CONCAT('some', 'one'), 0, 3)");
+        $this->assertEqual($e->getSql(), "SUBSTR(CONCAT('some', 'one'), 0, 3)");
+    }
+
+    public function testExpressionParserSupportsParensInClauses()
+    {
+        $e = new Doctrine_Expression("CONCAT('(some)', '(one)')");
+        $this->assertEqual($e->getSql(), "CONCAT('(some)', '(one)')");
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Extension/TestExtension/lib/Doctrine/Template/TestBehavior.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Extension/TestExtension/lib/Doctrine/Template/TestBehavior.php
new file mode 100755
index 000000000..fbcad67cc
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Extension/TestExtension/lib/Doctrine/Template/TestBehavior.php
@@ -0,0 +1,9 @@
+<?php
+
+class Doctrine_Template_TestBehavior extends Doctrine_Template
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('test', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Extension/TestExtension/lib/Doctrine/Test.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Extension/TestExtension/lib/Doctrine/Test.php
new file mode 100755
index 000000000..de8f62280
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Extension/TestExtension/lib/Doctrine/Test.php
@@ -0,0 +1,5 @@
+<?php
+
+class Doctrine_Test
+{
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ExtensionTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ExtensionTestCase.php
new file mode 100755
index 000000000..30bf0cf61
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ExtensionTestCase.php
@@ -0,0 +1,76 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Extension_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Extension_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        Doctrine_Core::setExtensionsPath(dirname(__FILE__).'/Extension');
+        spl_autoload_register(array('Doctrine_Core', 'extensionsAutoload'));
+
+        Doctrine_Manager::getInstance()
+            ->registerExtension('TestExtension');
+
+        $this->tables[] = 'ExtensionBehaviorTest';
+        parent::prepareTables();
+    }
+
+    public function testExtensionAutoload()
+    {
+        $this->assertTrue(class_exists('Doctrine_Test'));
+    }
+
+    public function testBehaviorExtension()
+    {
+        $test = Doctrine_Core::getTable('ExtensionBehaviorTest');
+        $this->assertTrue($test->hasColumn('testing'));
+        $this->assertTrue($test->hasColumn('test'));
+    }
+
+    public function tearDown()
+    {
+        spl_autoload_unregister(array('Doctrine_Core', 'extensionsAutoload'));
+    }
+}
+
+class ExtensionBehaviorTest extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('testing', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('TestBehavior');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ForeignKeyTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ForeignKeyTestCase.php
new file mode 100644
index 000000000..0a8851577
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ForeignKeyTestCase.php
@@ -0,0 +1,56 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_ForeignKey_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_ForeignKey_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData()
+    { }
+    public function prepareTables()
+    { }
+    
+
+    public function testExportingForeignKeysSupportsAssociationTables()
+    {
+        $this->dbh = new Doctrine_Adapter_Mock('mysql');
+        $this->conn = $this->manager->openConnection($this->dbh);
+        
+        $sql = $this->conn->export->exportClassesSql(array('ClientModel', 'ClientToAddressModel', 'AddressModel'));
+        
+        $this->assertEqual($sql, array (
+                                        0 => 'CREATE TABLE clients_to_addresses (client_id BIGINT, address_id BIGINT, INDEX client_id_idx (client_id), INDEX address_id_idx (address_id), PRIMARY KEY(client_id, address_id)) ENGINE = INNODB',
+                                        1 => 'CREATE TABLE clients (id INT UNSIGNED NOT NULL AUTO_INCREMENT, short_name VARCHAR(32) NOT NULL UNIQUE, PRIMARY KEY(id)) ENGINE = INNODB',
+                                        2 => 'CREATE TABLE addresses (id BIGINT AUTO_INCREMENT, address1 VARCHAR(255) NOT NULL, address2 VARCHAR(255) NOT NULL, city VARCHAR(255) NOT NULL, state VARCHAR(10) NOT NULL, zip VARCHAR(15) NOT NULL, PRIMARY KEY(id)) ENGINE = INNODB',
+                                        3 => 'ALTER TABLE clients_to_addresses ADD CONSTRAINT FOREIGN KEY (client_id) REFERENCES clients(id) ON DELETE CASCADE',
+                                        4 => 'ALTER TABLE clients_to_addresses ADD CONSTRAINT FOREIGN KEY (address_id) REFERENCES addresses(id) ON DELETE CASCADE',
+                                      ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/HookTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/HookTestCase.php
new file mode 100644
index 000000000..ceecdbd7f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/HookTestCase.php
@@ -0,0 +1,172 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Hook_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Hook_TestCase extends Doctrine_UnitTestCase 
+{
+
+    public function testWordLikeParserSupportsHyphens() 
+    {
+        $parser = new Doctrine_Hook_WordLike();
+        
+        $parser->parse('u', 'name', "'some guy' OR zYne");
+
+        $this->assertEqual($parser->getCondition(), '(u.name LIKE ? OR u.name LIKE ?)');
+        $this->assertEqual($parser->getParams(), array('%some guy%', '%zYne%'));
+    }
+
+    public function testHookOrderbyAcceptsArray()
+    {
+        $hook = new Doctrine_Hook('SELECT u.name FROM User u LEFT JOIN u.Phonenumber p');
+
+        $a['orderby'] = array('u.name ASC');
+
+        $hook->hookOrderBy($a['orderby']);
+        $this->assertEqual($hook->getQuery()->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.type = 0) ORDER BY e.name ASC');
+    }
+
+    public function testHookOrderbyAcceptsDescendingOrder()
+    {
+        $hook = new Doctrine_Hook('SELECT u.name FROM User u LEFT JOIN u.Phonenumber p');
+
+        $a['orderby'] = array('u.name DESC');
+
+        $hook->hookOrderBy($a['orderby']);
+        $this->assertEqual($hook->getQuery()->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.type = 0) ORDER BY e.name DESC');
+    }
+
+    public function testHookOrderbyDoesntAcceptUnknownColumn()
+    {
+        $hook = new Doctrine_Hook('SELECT u.name FROM User u LEFT JOIN u.Phonenumber p');
+
+        $a['orderby'] = array('u.unknown DESC');
+
+        $hook->hookOrderBy($a['orderby']);
+        $this->assertEqual($hook->getQuery()->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.type = 0)');
+    }
+
+    public function testHookOrderbyAcceptsMultipleParameters()
+    {
+        $hook = new Doctrine_Hook('SELECT u.name FROM User u LEFT JOIN u.Phonenumber p');
+
+        $a['orderby'] = array('u.name ASC', 'u.id DESC');
+
+        $hook->hookOrderBy($a['orderby']);
+        $this->assertEqual($hook->getQuery()->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.type = 0) ORDER BY e.name ASC, e.id DESC');
+
+        $users =  $hook->getQuery()->execute();
+    }
+
+    public function testHookWhereAcceptsArrays()
+    {
+        $hook = new Doctrine_Hook('SELECT u.name FROM User u LEFT JOIN u.Phonenumber p');
+
+        $a['where'] = array('u.name' => 'Jack Daniels',
+                            'u.loginname' => 'TheMan');
+
+        $hook->hookWhere($a['where']);
+        $this->assertEqual($hook->getQuery()->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.name LIKE ? OR e.name LIKE ?) AND e.loginname LIKE ? AND (e.type = 0)');
+        $this->assertEqual($hook->getQuery()->getFlattenedParams(), array('%Jack%', '%Daniels%', '%TheMan%'));
+    }
+
+    public function testHookWhereSupportsIntegerTypes()
+    {
+        $hook = new Doctrine_Hook('SELECT u.name FROM User u LEFT JOIN u.Phonenumber p');
+
+        $a['where'] = array('u.id' => 10000);
+
+        $hook->hookWhere($a['where']);
+        $this->assertEqual($hook->getQuery()->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.id = ? AND (e.type = 0))');
+        $this->assertEqual($hook->getQuery()->getFlattenedParams(), array(10000));
+    }
+
+    public function testHookWhereDoesntAcceptUnknownColumn()
+    {
+        $hook = new Doctrine_Hook('SELECT u.name FROM User u LEFT JOIN u.Phonenumber p');
+
+        $a['where'] = array('u.unknown' => 'Jack Daniels');
+
+        $hook->hookWhere($a['where']);
+
+        $this->assertEqual($hook->getQuery()->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.type = 0)');
+    }
+
+    public function testEqualParserUsesEqualOperator()
+    {
+        $parser = new Doctrine_Hook_Equal();
+
+        $parser->parse('u', 'name', 'zYne');
+
+        $this->assertEqual($parser->getCondition(), 'u.name = ?');
+        $this->assertEqual($parser->getParams(), array('zYne'));
+    }
+
+    public function testWordLikeParserUsesLikeOperator()
+    {
+        $parser = new Doctrine_Hook_WordLike();
+
+        $parser->parse('u', 'name', 'zYne');
+
+        $this->assertEqual($parser->getCondition(), 'u.name LIKE ?');
+        $this->assertEqual($parser->getParams(), array('%zYne%'));
+    }
+
+    public function testIntegerParserSupportsIntervals()
+    {
+        $parser = new Doctrine_Hook_Integer();
+
+        $parser->parse('m', 'year', '1998-2000');
+
+        $this->assertEqual($parser->getCondition(), '(m.year > ? AND m.year < ?)');
+        $this->assertEqual($parser->getParams(), array('1998', '2000'));
+    }
+
+    public function testIntegerParserSupportsEqualOperator()
+    {
+        $parser = new Doctrine_Hook_Integer();
+
+        $parser->parse('m', 'year', '1998');
+
+        $this->assertEqual($parser->getCondition(), 'm.year = ?');
+        $this->assertEqual($parser->getParams(), array('1998'));
+    }
+
+    public function testIntegerParserSupportsNestingConditions()
+    {
+        $parser = new Doctrine_Hook_Integer();
+
+        $parser->parse('m', 'year', '1998-2000 OR 2001');
+
+        $this->assertEqual($parser->getCondition(), '((m.year > ? AND m.year < ?) OR m.year = ?)');
+        $this->assertEqual($parser->getParams(), array('1998', '2000', '2001'));
+    }
+
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Hydrate/CollectionInitializationTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Hydrate/CollectionInitializationTestCase.php
new file mode 100644
index 000000000..480fa98c3
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Hydrate/CollectionInitializationTestCase.php
@@ -0,0 +1,91 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Hydrate_CollectionInitialization_TestCase
+ *
+ * @package     Doctrine
+ * @author      Roman Borschel <roman@code-factory.org>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Hydrate_CollectionInitialization_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData()
+    {
+        $user = new User();
+        $user->name = 'romanb';
+        
+        $user->Phonenumber[0]->phonenumber = '112';
+        $user->Phonenumber[1]->phonenumber = '110';
+        
+        $user->save();
+    }
+    
+    public function prepareTables()
+    {
+        $this->tables = array('Entity', 'Phonenumber'); 
+        parent::prepareTables();
+    }
+    
+    public function testCollectionsAreReinitializedOnHydration()
+    {
+        // query for user with first phonenumber.
+        $q = Doctrine_Query::create();
+        $q->select("u.*, p.*")->from("User u")->innerJoin("u.Phonenumber p")
+                ->where("p.phonenumber = '112'");
+        
+        $users = $q->execute();
+        $this->assertEqual(1, count($users));
+        $this->assertEqual(1, count($users[0]->Phonenumber));
+        $this->assertEqual('112', $users[0]->Phonenumber[0]->phonenumber);
+        
+        // now query again. this time for the other phonenumber. collection should be re-initialized.
+        $q = Doctrine_Query::create();
+        $q->select("u.*, p.*")->from("User u")->innerJoin("u.Phonenumber p")
+                ->where("p.phonenumber = '110'");
+        $users = $q->execute();
+        $this->assertEqual(1, count($users));
+        $this->assertEqual(1, count($users[0]->Phonenumber));
+        $this->assertEqual('110', $users[0]->Phonenumber[0]->phonenumber);
+
+        // now query again. this time for both phonenumbers. collection should be re-initialized.
+        $q = Doctrine_Query::create();
+        $q->select("u.*, p.*")->from("User u")->innerJoin("u.Phonenumber p");
+        $users = $q->execute();
+        $this->assertEqual(1, count($users));
+        $this->assertEqual(2, count($users[0]->Phonenumber));
+        $this->assertEqual('112', $users[0]->Phonenumber[0]->phonenumber);
+        $this->assertEqual('110', $users[0]->Phonenumber[1]->phonenumber);
+
+        // now query AGAIN for both phonenumbers. collection should be re-initialized (2 elements, not 4).
+        $q = Doctrine_Query::create();
+        $q->select("u.*, p.*")->from("User u")->innerJoin("u.Phonenumber p");
+        $users = $q->execute();
+        $this->assertEqual(1, count($users));
+        $this->assertEqual(2, count($users[0]->Phonenumber));
+        $this->assertEqual('112', $users[0]->Phonenumber[0]->phonenumber);
+        $this->assertEqual('110', $users[0]->Phonenumber[1]->phonenumber);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Hydrate/DriverTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Hydrate/DriverTestCase.php
new file mode 100644
index 000000000..4a9de48f6
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Hydrate/DriverTestCase.php
@@ -0,0 +1,100 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Hydrate_Driver_TestCase
+ *
+ * @package     Doctrine
+ * @author      Jonathan H. Wage <jonwage@gmail.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.1
+ * @version     $Revision$
+ */
+class Doctrine_Hydrate_Driver_TestCase extends Doctrine_UnitTestCase
+{
+    public function testCustomHydrator()
+    {
+        Doctrine_Manager::getInstance()
+            ->registerHydrator('MyHydrator', 'MyHydrator');
+
+        $result = Doctrine_Core::getTable('User')
+            ->createQuery('u')
+            ->execute(array(), 'MyHydrator');
+
+        $this->assertEqual($result, 'MY_HYDRATOR');
+    }
+
+    public function testCustomHydratorUsingClassInstance()
+    {
+        $hydrator = new MyHydrator();
+        Doctrine_Manager::getInstance()
+            ->registerHydrator('MyHydrator', $hydrator);
+
+        $result = Doctrine_Core::getTable('User')
+            ->createQuery('u')
+            ->execute(array(), 'MyHydrator');
+
+        $this->assertEqual($result, 'MY_HYDRATOR');
+    }
+
+    public function testCustomHydratorConstructor()
+    {
+        $queryComponents = array('queryComponents');
+        $tableAliases = array('tableAliases');
+        $hydrationMode = array('hydrationMode');
+
+        $hydrator = new MyHydrator($queryComponents, $tableAliases, $hydrationMode);
+
+        $this->assertEqual($queryComponents, $hydrator->_queryComponents);
+        $this->assertEqual($tableAliases, $hydrator->_tableAliases);
+        $this->assertEqual($hydrationMode, $hydrator->_hydrationMode);
+    }
+
+    public function testCustomHydratorUsingClassInstanceExceptingException()
+    {
+        $hydrator = new StdClass();
+        Doctrine_Manager::getInstance()
+            ->registerHydrator('MyHydrator', $hydrator);
+
+        try {
+             Doctrine_Core::getTable('User')
+                ->createQuery('u')
+                ->execute(array(), 'MyHydrator');
+
+            $this->fail('Expected exception not thrown: Doctrine_Hydrator_Exception');
+        } catch (Doctrine_Hydrator_Exception $e) {
+        }
+    }
+}
+
+class MyHydrator extends Doctrine_Hydrator_Abstract
+{
+    public $_queryComponents;
+    public $_tableAliases;
+    public $_hydrationMode;
+
+    public function hydrateResultSet($stmt)
+    {
+        return 'MY_HYDRATOR';
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Hydrate/FetchModeTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Hydrate/FetchModeTestCase.php
new file mode 100644
index 000000000..2e684da88
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Hydrate/FetchModeTestCase.php
@@ -0,0 +1,176 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Hydrate_FetchMode_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Hydrate_FetchMode_TestCase extends Doctrine_UnitTestCase 
+{
+
+    public function testFetchArraySupportsOneToManyRelations()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('u.*, p.*')->from('User u')->innerJoin('u.Phonenumber p')->where("u.name = 'zYne'");;
+        
+        $users = $q->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+        $this->assertTrue(is_array($users));
+
+        $this->assertEqual(count($users), 1);
+    }
+    public function testFetchArraySupportsOneToManyRelations2()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('u.*, p.*')->from('User u')->innerJoin('u.Phonenumber p');
+        
+        $users = $q->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+        $this->assertTrue(is_array($users));
+
+        $this->assertEqual(count($users), 8);
+    }
+    public function testFetchArraySupportsOneToManyRelations3()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('u.*, p.*')->from('User u')->innerJoin('u.Phonenumber p')->where("u.name = 'Jean Reno'");
+        
+        $users = $q->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+        $this->assertTrue(is_array($users));
+
+        $this->assertEqual(count($users), 1);
+        $this->assertEqual(count($users[0]['Phonenumber']), 3);
+    }
+    public function testFetchArraySupportsOneToOneRelations()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('u.*, e.*')->from('User u')->innerJoin('u.Email e');
+        
+        $users = $q->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+        $this->assertEqual(count($users), 8);
+        $this->assertEqual($users[0]['Email']['address'], 'zYne@example.com');
+    }
+    public function testFetchArraySupportsOneToOneRelations2()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('u.*, e.*')->from('User u')->innerJoin('u.Email e')->where("u.name = 'zYne'");
+        
+        $users = $q->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+        $this->assertEqual(count($users), 1);
+        $this->assertEqual($users[0]['Email']['address'], 'zYne@example.com');
+    }
+
+    public function testFetchRecordSupportsOneToOneRelations()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('u.*, e.*')->from('User u')->innerJoin('u.Email e');
+        $count = count($this->conn);
+        $users = $q->execute(array(), Doctrine_Core::HYDRATE_RECORD);
+
+        $this->assertEqual(count($users), 8);
+
+        $this->assertEqual($users[0]['Email']['address'], 'zYne@example.com');
+        $this->assertTrue($users[0] instanceof User);
+        $this->assertTrue($users instanceof Doctrine_Collection);  
+        $this->assertEqual($users[0]->state(), Doctrine_Record::STATE_CLEAN);
+        $this->assertEqual($users[0]->id, 4);
+
+        $this->assertTrue($users[0]['Email'] instanceof Email);
+        $this->assertEqual($users[0]['email_id'], 1);
+
+        $this->assertEqual(count($this->conn), $count + 1);
+    }
+
+    public function testFetchRecordSupportsOneToManyRelations()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('u.*, p.*')->from('User u')->innerJoin('u.Phonenumber p');
+        $count = count($this->conn);
+        $users = $q->execute(array(), Doctrine_Core::HYDRATE_RECORD);
+
+        $this->assertEqual(count($users), 8);
+        $this->assertTrue($users[0] instanceof User);
+        $this->assertEqual($users[0]->state(), Doctrine_Record::STATE_CLEAN);
+        $this->assertTrue($users instanceof Doctrine_Collection);
+        $this->assertTrue($users[0]->Phonenumber instanceof Doctrine_Collection);
+
+        $this->assertEqual(count($this->conn), $count + 1);
+    }
+
+    public function testFetchRecordSupportsSimpleFetching()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('u.*')->from('User u');
+        $count = $this->conn->count();
+        $users = $q->execute(array(), Doctrine_Core::HYDRATE_RECORD);
+
+        $this->assertEqual(count($users), 8);
+        $this->assertTrue($users[0] instanceof User);
+        $this->assertEqual($users[0]->state(), Doctrine_Record::STATE_CLEAN);
+
+
+        $this->assertEqual($this->conn->count(), $count + 1);
+    }
+
+    public function testFetchArrayNull()
+    {
+        $u = new User();
+        $u->name = "fetch_array_test";
+        $u->created = null;
+        $u->save();
+  
+        $q = new Doctrine_Query();
+        $q->select('u.*')->from('User u')->where('u.id = ?');
+        $users = $q->execute(array($u->id), Doctrine_Core::HYDRATE_ARRAY);
+        $this->assertEqual($users[0]['created'], null);
+    }
+    
+    public function testHydrateNone()
+    {
+        $u = new User();
+        $u->name = "fetch_array_test";
+        $u->created = null;
+        $u->save();
+  
+        $q = new Doctrine_Query();
+        $q->select('COUNT(u.id) num')->from('User u')->where('u.id = ?');
+        $res = $q->execute(array($u->id), Doctrine_Core::HYDRATE_NONE);
+        $this->assertEqual(1, $res[0][0]);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Hydrate/PerformanceTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Hydrate/PerformanceTestCase.php
new file mode 100644
index 000000000..405c9b593
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Hydrate/PerformanceTestCase.php
@@ -0,0 +1,81 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Hydrate_Scalar_TestCase
+ *
+ * @package     Doctrine
+ * @author      Roman Borschel <roman@code-factory.org>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.1
+ * @version     $Revision$
+ */
+class Doctrine_Hydrate_Performance_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData()
+    {
+        for ($i = 0; $i < 10000; $i++)
+        {
+            $test = new HydratePerformance();
+            for ($j = 1; $j <= 6; $j++)
+            {
+                $test->set('column'.$j, 'Test value');
+            }
+            $test->save();
+        }
+    }
+
+    public function prepareTables()
+    {
+        $this->tables[] = 'HydratePerformance';
+        parent::prepareTables();
+    }
+
+    public function testPerformance()
+    {
+        $s = microtime(true);
+
+        $q = Doctrine_Core::getTable('HydratePerformance')
+            ->createQuery('u');
+
+        $records = $q->execute();
+
+        $e = microtime(true);
+        $time = $e - $s;
+
+        echo PHP_EOL.'Hydration for ' . count($records) . ' records took ' . $time . PHP_EOL;
+    }
+}
+
+class HydratePerformance extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('column1', 'string', 255);
+        $this->hasColumn('column2', 'string', 255);
+        $this->hasColumn('column3', 'string', 255);
+        $this->hasColumn('column4', 'string', 255);
+        $this->hasColumn('column5', 'string', 255);
+        $this->hasColumn('column6 ', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Hydrate/ScalarTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Hydrate/ScalarTestCase.php
new file mode 100644
index 000000000..50d58a984
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Hydrate/ScalarTestCase.php
@@ -0,0 +1,245 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Hydrate_Scalar_TestCase
+ *
+ * @package     Doctrine
+ * @author      Roman Borschel <roman@code-factory.org>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.1
+ * @version     $Revision$
+ */
+class Doctrine_Hydrate_Scalar_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData()
+    {
+        $user = new User();
+        $user->name = 'romanb';
+        $user->Phonenumber[0]->phonenumber = '112';
+        $user->Phonenumber[1]->phonenumber = '110';
+        $user->save();
+    }
+    
+    public function prepareTables()
+    {
+        $this->tables = array('Entity', 'Phonenumber'); 
+        parent::prepareTables();
+    }
+    
+    public function testHydrateScalarWithJoin()
+    {
+        $q = Doctrine_Query::create();
+        $q->select("u.*, p.*")
+            ->from("User u")
+            ->innerJoin("u.Phonenumber p");
+        
+        $res = $q->execute(array(), Doctrine_Core::HYDRATE_SCALAR);
+        
+        $this->assertTrue(is_array($res));
+        $this->assertEqual(2, count($res));
+        //row1
+        $this->assertEqual(1, $res[0]['u_id']);
+        $this->assertEqual('romanb', $res[0]['u_name']);
+        $this->assertEqual(null, $res[0]['u_loginname']);
+        $this->assertEqual(null, $res[0]['u_password']);
+        $this->assertEqual(0, $res[0]['u_type']);
+        $this->assertEqual(null, $res[0]['u_created']);
+        $this->assertEqual(null, $res[0]['u_updated']);
+        $this->assertEqual(null, $res[0]['u_email_id']);
+        $this->assertEqual(1, $res[0]['p_id']);
+        $this->assertEqual(112, $res[0]['p_phonenumber']);
+        $this->assertEqual(1, $res[0]['p_entity_id']);
+        //row2
+        $this->assertEqual(1, $res[1]['u_id']);
+        $this->assertEqual('romanb', $res[1]['u_name']);
+        $this->assertEqual(null, $res[1]['u_loginname']);
+        $this->assertEqual(null, $res[1]['u_password']);
+        $this->assertEqual(0, $res[1]['u_type']);
+        $this->assertEqual(null, $res[1]['u_created']);
+        $this->assertEqual(null, $res[1]['u_updated']);
+        $this->assertEqual(null, $res[1]['u_email_id']);
+        $this->assertEqual(2, $res[1]['p_id']);
+        $this->assertEqual(110, $res[1]['p_phonenumber']);
+        $this->assertEqual(1, $res[1]['p_entity_id']);
+        
+        $q->free();
+    }
+    
+    public function testHydrateScalar()
+    {
+        $q = Doctrine_Query::create();
+        $q->select("u.*")->from("User u");
+        
+        $res = $q->execute(array(), Doctrine_Core::HYDRATE_SCALAR);
+        
+        $this->assertTrue(is_array($res));
+        $this->assertEqual(1, count($res));
+        //row1
+        $this->assertEqual(1, $res[0]['u_id']);
+        $this->assertEqual('romanb', $res[0]['u_name']);
+        $this->assertEqual(null, $res[0]['u_loginname']);
+        $this->assertEqual(null, $res[0]['u_password']);
+        $this->assertEqual(0, $res[0]['u_type']);
+        $this->assertEqual(null, $res[0]['u_created']);
+        $this->assertEqual(null, $res[0]['u_updated']);
+        $this->assertEqual(null, $res[0]['u_email_id']);
+        
+        $q->free();
+    }
+    
+    public function testHydrateSingleScalarDoesNotAddPKToSelect()
+    {
+        $q = Doctrine_Query::create();
+        $q->select("u.name")->from("User u");
+        $res = $q->execute(array(), Doctrine_Core::HYDRATE_SINGLE_SCALAR);
+        $this->assertEqual('romanb', $res);
+        $q->free();
+    }
+    
+    public function testHydrateSingleScalarWithAggregate()
+    {
+        $q = Doctrine_Query::create();
+        $q->select("COUNT(u.id) num_ids")->from("User u");
+        $res = $q->execute(array(), Doctrine_Core::HYDRATE_SINGLE_SCALAR);
+        $this->assertEqual(1, $res);
+        $q->free();
+    }
+    
+    public function testHydrateScalarWithJoinAndAggregate()
+    {
+        $q = Doctrine_Query::create();
+        $q->select("u.id, UPPER(u.name) nameUpper, p.*")
+            ->from("User u")
+            ->innerJoin("u.Phonenumber p");
+        
+        $res = $q->execute(array(), Doctrine_Core::HYDRATE_SCALAR);
+        
+        $this->assertTrue(is_array($res));
+        $this->assertEqual(2, count($res));
+        
+        //row1
+        $this->assertEqual(1, $res[0]['u_id']);
+        $this->assertEqual('ROMANB', $res[0]['u_nameUpper']);
+        $this->assertEqual(1, $res[0]['p_id']);
+        $this->assertEqual(112, $res[0]['p_phonenumber']);
+        $this->assertEqual(1, $res[0]['p_entity_id']);
+        //row2
+        $this->assertEqual(1, $res[1]['u_id']);
+        $this->assertEqual('ROMANB', $res[1]['u_nameUpper']);
+        $this->assertEqual(2, $res[1]['p_id']);
+        $this->assertEqual(110, $res[1]['p_phonenumber']);
+        $this->assertEqual(1, $res[1]['p_entity_id']);
+        
+        $q->free();
+    }
+
+    public function testHydrateArrayShallowWithJoin()
+    {
+        $q = Doctrine_Query::create();
+        $q->select("u.*, p.id as phonenumber_id, p.phonenumber, p.entity_id")
+            ->from("User u")
+            ->innerJoin("u.Phonenumber p");
+
+        $res = $q->execute(array(), Doctrine_Core::HYDRATE_ARRAY_SHALLOW);
+
+        $this->assertTrue(is_array($res));
+        $this->assertEqual(2, count($res));
+        //row1
+        $this->assertEqual(1, $res[0]['id']);
+        $this->assertEqual('romanb', $res[0]['name']);
+        $this->assertEqual(null, $res[0]['loginname']);
+        $this->assertEqual(null, $res[0]['password']);
+        $this->assertEqual(0, $res[0]['type']);
+        $this->assertEqual(null, $res[0]['created']);
+        $this->assertEqual(null, $res[0]['updated']);
+        $this->assertEqual(null, $res[0]['email_id']);
+        $this->assertEqual(1, $res[0]['phonenumber_id']);
+        $this->assertEqual(112, $res[0]['phonenumber']);
+        $this->assertEqual(1, $res[0]['entity_id']);
+        //row2
+        $this->assertEqual(1, $res[1]['id']);
+        $this->assertEqual('romanb', $res[1]['name']);
+        $this->assertEqual(null, $res[1]['loginname']);
+        $this->assertEqual(null, $res[1]['password']);
+        $this->assertEqual(0, $res[1]['type']);
+        $this->assertEqual(null, $res[1]['created']);
+        $this->assertEqual(null, $res[1]['updated']);
+        $this->assertEqual(null, $res[1]['email_id']);
+        $this->assertEqual(2, $res[1]['phonenumber_id']);
+        $this->assertEqual(110, $res[1]['phonenumber']);
+        $this->assertEqual(1, $res[1]['entity_id']);
+
+        $q->free();
+    }
+
+    public function testHydrateArrayShallow()
+    {
+        $q = Doctrine_Query::create();
+        $q->select("u.*")->from("User u");
+
+        $res = $q->execute(array(), Doctrine_Core::HYDRATE_ARRAY_SHALLOW);
+
+        $this->assertTrue(is_array($res));
+        $this->assertEqual(1, count($res));
+        //row1
+        $this->assertEqual(1, $res[0]['id']);
+        $this->assertEqual('romanb', $res[0]['name']);
+        $this->assertEqual(null, $res[0]['loginname']);
+        $this->assertEqual(null, $res[0]['password']);
+        $this->assertEqual(0, $res[0]['type']);
+        $this->assertEqual(null, $res[0]['created']);
+        $this->assertEqual(null, $res[0]['updated']);
+        $this->assertEqual(null, $res[0]['email_id']);
+
+        $q->free();
+    }
+
+    public function testHydrateArrayShallowWithJoinAndAggregate()
+    {
+        $q = Doctrine_Query::create();
+        $q->select("u.id, UPPER(u.name) nameUpper, p.id as phonenumber_id, p.phonenumber, p.entity_id")
+            ->from("User u")
+            ->innerJoin("u.Phonenumber p");
+
+        $res = $q->execute(array(), Doctrine_Core::HYDRATE_ARRAY_SHALLOW);
+
+        $this->assertTrue(is_array($res));
+        $this->assertEqual(2, count($res));
+
+        //row1
+        $this->assertEqual(1, $res[0]['id']);
+        $this->assertEqual('ROMANB', $res[0]['nameUpper']);
+        $this->assertEqual(1, $res[0]['id']);
+        $this->assertEqual(112, $res[0]['phonenumber']);
+        $this->assertEqual(1, $res[0]['entity_id']);
+        //row2
+        $this->assertEqual(1, $res[1]['id']);
+        $this->assertEqual('ROMANB', $res[1]['nameUpper']);
+        $this->assertEqual(2, $res[1]['phonenumber_id']);
+        $this->assertEqual(110, $res[1]['phonenumber']);
+        $this->assertEqual(1, $res[1]['entity_id']);
+
+        $q->free();
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/HydrateTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/HydrateTestCase.php
new file mode 100644
index 000000000..db52fa781
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/HydrateTestCase.php
@@ -0,0 +1,107 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Hydrate_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Hydrate_TestCase extends Doctrine_UnitTestCase
+{
+    protected $testData1 = array(
+                              array(
+                                  'e' => array('id' => 1, 'name' => 'zYne'),
+                                  'p' => array('id' => 1, 'phonenumber' => '123 123', 'user_id' => 1)
+                                  ),
+                              array(
+                                  'e' => array('id' => 2, 'name' => 'John'),
+                                  'p' => array('id' => 2, 'phonenumber' => '222 222', 'user_id' => 2)
+                                  ),
+                              array(
+                                  'e' => array('id' => 2, 'name' => 'John'),
+                                  'p' => array('id' => 3, 'phonenumber' => '343 343', 'user_id' => 2)
+                                  ),
+                              array(
+                                  'e' => array('id' => 3, 'name' => 'Arnold'),
+                                  'p' => array('id' => 4, 'phonenumber' => '333 333', 'user_id' => 3)
+                                  ),
+                              array(
+                                  'e' => array('id' => 4, 'name' => 'Arnold'),
+                                  'p' => array('id' => null, 'phonenumber' => null, 'user_id' => null)
+                                  )
+                              );
+    public function prepareData()
+    { }
+
+    public function testHydrateHooks()
+    {
+        $user = new User();
+        $user->getTable()->addRecordListener(new HydrationListener);
+
+        $user->name = 'zYne';
+        $user->save();
+
+        $this->conn->clear();
+
+        $user = Doctrine_Query::create()->from('User u')->fetchOne();
+
+        $this->assertEqual($user->name, 'ZYNE');
+        $this->assertEqual($user->password, 'DEFAULT PASS');
+    }
+}
+
+class HydrationListener extends Doctrine_Record_Listener
+{
+    public function preHydrate(Doctrine_Event $event) 
+    {
+        $data = $event->data;
+        $data['password'] = 'default pass';
+        
+        $event->data = $data;
+    }
+    public function postHydrate(Doctrine_Event $event)
+    {
+    	foreach ($event->data as $key => $value) {
+            $event->data[$key] = strtoupper($value);
+        }
+    }
+}
+
+class Doctrine_Hydrate_Mock extends Doctrine_Hydrator_Abstract
+{
+    protected $data;
+
+    public function setData($data)
+    {
+        $this->data = $data;
+    }
+    
+    public function hydrateResultSet($stmt)
+    {
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/I18nTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/I18nTestCase.php
new file mode 100644
index 000000000..81f6e2caa
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/I18nTestCase.php
@@ -0,0 +1,144 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_I18n_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_I18n_TestCase extends Doctrine_UnitTestCase
+{
+
+    public function prepareData()
+    { }
+
+    public function prepareTables()
+    {
+        $this->tables = array();
+
+        parent::prepareTables();
+    }
+
+    public function testTranslationTableGetsExported()
+    {
+    	$this->conn->setAttribute(Doctrine_Core::ATTR_EXPORT, Doctrine_Core::EXPORT_ALL);
+    	
+    	$this->assertTrue(Doctrine_Core::EXPORT_ALL & Doctrine_Core::EXPORT_TABLES);
+        $this->assertTrue(Doctrine_Core::EXPORT_ALL & Doctrine_Core::EXPORT_CONSTRAINTS);
+        $this->assertTrue(Doctrine_Core::EXPORT_ALL & Doctrine_Core::EXPORT_PLUGINS);
+
+        $sql = $this->conn->export->exportClassesSql(array('I18nTest'));
+
+        foreach ($sql as $query) {
+            $this->conn->exec($query);
+        }
+    }
+
+    public function testTranslatedColumnsAreRemovedFromMainComponent()
+    {
+        $i = new I18nTest();
+        
+        $columns = $i->getTable()->getColumns();
+
+        $this->assertFalse(isset($columns['title']));
+        $this->assertFalse(isset($columns['name']));
+    }
+
+    public function testTranslationTableIsInitializedProperly()
+    {
+        $i = new I18nTest();
+        $i->id = 1;
+
+        $i->Translation['EN']->name = 'some name';
+        $i->Translation['EN']->title = 'some title';
+        $this->assertEqual($i->Translation->getTable()->getComponentName(), 'I18nTestTranslation');
+
+
+        $i->Translation['FI']->name = 'joku nimi';
+        $i->Translation['FI']->title = 'joku otsikko';
+        $i->Translation['FI']->lang = 'FI';
+
+        $i->save();
+
+        $this->conn->clear();
+
+        $t = Doctrine_Query::create()->from('I18nTestTranslation')->fetchOne();
+
+        $this->assertEqual($t->name, 'some name');
+        $this->assertEqual($t->title, 'some title');
+        $this->assertEqual($t->lang, 'EN');
+
+    }
+
+
+    public function testUpdatingI18nItems()
+    {
+        $i = Doctrine_Query::create()->query('FROM I18nTest')->getFirst();
+
+        $i->Translation['EN']->name = 'updated name';
+        $i->Translation['EN']->title = 'updated title';
+
+        $i->Translation->save();
+
+        $this->conn->clear();
+
+        $t = Doctrine_Query::create()->from('I18nTestTranslation')->fetchOne();
+
+        $this->assertEqual($t->name, 'updated name');
+        $this->assertEqual($t->title, 'updated title');
+    }
+
+
+    public function testDataFetching()
+    {
+        $i = Doctrine_Query::create()->from('I18nTest i')->innerJoin('i.Translation t INDEXBY t.lang')->orderby('t.lang')->fetchOne(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+        $this->assertEqual($i['Translation']['EN']['name'], 'updated name');
+        $this->assertEqual($i['Translation']['EN']['title'], 'updated title');
+        $this->assertEqual($i['Translation']['EN']['lang'], 'EN');
+
+        $this->assertEqual($i['Translation']['FI']['name'], 'joku nimi');
+        $this->assertEqual($i['Translation']['FI']['title'], 'joku otsikko');
+        $this->assertEqual($i['Translation']['FI']['lang'], 'FI');
+    }
+    
+    public function testIndexByLangIsAttachedToNewlyCreatedCollections()
+    {
+    	$coll = new Doctrine_Collection('I18nTestTranslation');
+
+        $coll['EN']['name'] = 'some name';
+        
+        $this->assertEqual($coll['EN']->lang, 'EN');
+    }
+
+    public function testIndexByLangIsAttachedToFetchedCollections()
+    {
+        $coll = Doctrine_Query::create()->from('I18nTestTranslation')->execute();
+
+        $this->assertTrue($coll['FI']->exists());
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/BuilderTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/BuilderTestCase.php
new file mode 100644
index 000000000..467d222b5
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/BuilderTestCase.php
@@ -0,0 +1,125 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Import_Builder_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Import_Builder_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testInheritanceGeneration()
+    {
+        $path = dirname(__FILE__) . '/import_builder_test';
+
+        $import = new Doctrine_Import_Schema();
+        $import->setOption('generateTableClasses', true);
+        $import->importSchema('schema.yml', 'yml', $path);
+
+        $models = Doctrine_Core::loadModels($path, Doctrine_Core::MODEL_LOADING_CONSERVATIVE);
+
+        $schemaTestInheritanceParent = new ReflectionClass('SchemaTestInheritanceParent');
+        $schemaTestInheritanceChild1 = new ReflectionClass('SchemaTestInheritanceChild1');
+        $schemaTestInheritanceChild2 = new ReflectionClass('SchemaTestInheritanceChild2');
+
+        $schemaTestInheritanceParentTable = new ReflectionClass('SchemaTestInheritanceParentTable');
+        $schemaTestInheritanceChild1Table = new ReflectionClass('SchemaTestInheritanceChild1Table');
+        $schemaTestInheritanceChild2Table = new ReflectionClass('SchemaTestInheritanceChild2Table');
+
+        $this->assertTrue($schemaTestInheritanceParent->isSubClassOf('Doctrine_Record'));
+        $this->assertTrue($schemaTestInheritanceParent->isSubClassOf('BaseSchemaTestInheritanceParent'));
+        $this->assertTrue($schemaTestInheritanceParent->isSubClassOf('PackageSchemaTestInheritanceParent'));
+        $this->assertTrue($schemaTestInheritanceChild1->isSubClassOf('BaseSchemaTestInheritanceChild1'));
+        $this->assertTrue($schemaTestInheritanceChild2->isSubClassOf('BaseSchemaTestInheritanceChild2'));
+        
+        $this->assertTrue($schemaTestInheritanceChild1->isSubClassOf('SchemaTestInheritanceParent'));
+        $this->assertTrue($schemaTestInheritanceChild1->isSubClassOf('BaseSchemaTestInheritanceParent'));
+        
+        $this->assertTrue($schemaTestInheritanceChild2->isSubClassOf('SchemaTestInheritanceParent'));
+        $this->assertTrue($schemaTestInheritanceChild2->isSubClassOf('BaseSchemaTestInheritanceParent'));
+        $this->assertTrue($schemaTestInheritanceChild2->isSubClassOf('SchemaTestInheritanceChild1'));
+        $this->assertTrue($schemaTestInheritanceChild2->isSubClassOf('BaseSchemaTestInheritanceChild1'));
+        $this->assertTrue($schemaTestInheritanceChild2->isSubClassOf('PackageSchemaTestInheritanceParent'));
+
+        $this->assertTrue($schemaTestInheritanceParentTable->isSubClassOf('Doctrine_Table'));
+        $this->assertTrue($schemaTestInheritanceChild1Table->isSubClassOf('SchemaTestInheritanceParentTable'));
+        $this->assertTrue($schemaTestInheritanceChild1Table->isSubClassOf('PackageSchemaTestInheritanceParentTable'));
+
+        $this->assertTrue($schemaTestInheritanceChild2Table->isSubClassOf('SchemaTestInheritanceParentTable'));
+        $this->assertTrue($schemaTestInheritanceChild2Table->isSubClassOf('PackageSchemaTestInheritanceParentTable'));
+        $this->assertTrue($schemaTestInheritanceChild2Table->isSubClassOf('SchemaTestInheritanceChild1Table'));
+        $this->assertTrue($schemaTestInheritanceChild2Table->isSubClassOf('PackageSchemaTestInheritanceChild1Table'));
+
+        # Simple Inheritance
+        $schemaTestSimpleInheritanceParent = new ReflectionClass('SchemaTestSimpleInheritanceParent');
+        $schemaTestSimpleInheritanceChild = new ReflectionClass('SchemaTestSimpleInheritanceChild');
+
+        $this->assertTrue($schemaTestSimpleInheritanceParent->hasMethod('setTableDefinition'));
+        $this->assertTrue($schemaTestSimpleInheritanceChild->isSubClassOf('SchemaTestSimpleInheritanceParent'));
+
+        # Class Table Inheritance
+        $schemaTestClassTableInheritanceParent = new ReflectionClass('SchemaTestClassTableInheritanceParent');
+        $schemaTestClassTableInheritanceChild = new ReflectionClass('SchemaTestClassTableInheritanceChild');
+
+        # Concrete Inheritance
+        $schemaTestConcreteInheritanceParent = new ReflectionClass('SchemaTestConcreteInheritanceParent');
+        $schemaTestConcreteInheritanceChild = new ReflectionClass('SchemaTestConcreteInheritanceChild');
+
+        # Column Aggregation Inheritance
+        $schemaTestColumnAggregationInheritanceParent = new ReflectionClass('SchemaTestColumnAggregationInheritanceParent');
+        $schemaTestColumnAggregationInheritanceChild = new ReflectionClass('SchemaTestColumnAggregationInheritanceChild');
+
+        $sql = Doctrine_Core::generateSqlFromArray(array('SchemaTestSimpleInheritanceParent', 'SchemaTestSimpleInheritanceChild'));
+        $this->assertEqual(count($sql), 1);
+        $this->assertEqual($sql[0], 'CREATE TABLE schema_test_simple_inheritance_parent (id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(255), description VARCHAR(255))');
+
+        $sql = Doctrine_Core::generateSqlFromArray(array('SchemaTestClassTableInheritanceParent', 'SchemaTestClassTableInheritanceChild'));
+        $this->assertEqual(count($sql), 2);
+        $this->assertEqual($sql[0], 'CREATE TABLE schema_test_class_table_inheritance_parent (id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(255))');
+        $this->assertEqual($sql[1], 'CREATE TABLE schema_test_class_table_inheritance_child (id INTEGER, title VARCHAR(255), description VARCHAR(255), PRIMARY KEY(id))');
+
+        $sql = Doctrine_Core::generateSqlFromArray(array('SchemaTestConcreteInheritanceParent', 'SchemaTestConcreteInheritanceChild'));
+        $this->assertEqual(count($sql), 2);
+        $this->assertEqual($sql[0], 'CREATE TABLE schema_test_concrete_inheritance_parent (id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(255))');
+        $this->assertEqual($sql[1], 'CREATE TABLE schema_test_concrete_inheritance_child (id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(255), title VARCHAR(255), description VARCHAR(255))');
+
+        $sql = Doctrine_Core::generateSqlFromArray(array('SchemaTestColumnAggregationInheritanceParent', 'SchemaTestColumnAggregationInheritanceChild'));
+        $this->assertEqual(count($sql), 2);
+        $this->assertEqual($sql[0], 'CREATE TABLE schema_test_column_aggregation_inheritance_parent (id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(255), type VARCHAR(255), title VARCHAR(255), description VARCHAR(255))');
+        $this->assertEqual($sql[1], 'CREATE INDEX schema_test_column_aggregation_inheritance_parent_type_idx ON schema_test_column_aggregation_inheritance_parent (type)');
+
+        Doctrine_Lib::removeDirectories($path);
+    }
+
+    public function testBaseTableClass()
+    {
+        $builder = new Doctrine_Import_Builder();
+        $builder->setOption('baseTableClassName', 'MyBaseTable');
+        $class = $builder->buildTableClassDefinition('MyTestTable', array('className' => 'MyTest'));
+        $this->assertTrue(strpos($class, 'class MyTestTable extends MyBaseTable'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/MssqlTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/MssqlTestCase.php
new file mode 100644
index 000000000..4871406df
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/MssqlTestCase.php
@@ -0,0 +1,72 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Import_Mssql_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Import_Mssql_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testListSequencesExecutesSql() 
+    {
+        $this->import->listSequences('table');
+        
+        $this->assertEqual($this->adapter->pop(), "SELECT name FROM sysobjects WHERE xtype = 'U'");
+    }
+    public function testListTableColumnsExecutesSql()
+    {
+        $this->conn->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, false);
+        $this->import->listTableColumns('table');
+        
+        $this->assertEqual($this->adapter->pop(), "EXEC sp_columns @table_name = table");
+    }
+    public function testListTablesExecutesSql()
+    {
+        $this->import->listTables();
+        
+        $this->assertEqual($this->adapter->pop(), "SELECT name FROM sysobjects WHERE type = 'U' AND name <> 'dtproperties' AND name <> 'sysdiagrams' ORDER BY name");
+    }
+    public function testListTriggersExecutesSql()
+    {
+        $this->import->listTriggers();
+        
+        $this->assertEqual($this->adapter->pop(), "SELECT name FROM sysobjects WHERE xtype = 'TR'");
+    }
+    public function testListTableTriggersExecutesSql()
+    {
+        $this->import->listTableTriggers('table');
+        
+        $this->assertEqual($this->adapter->pop(), "SELECT name FROM sysobjects WHERE xtype = 'TR' AND object_name(parent_obj) = 'table'");
+    }
+    public function testListViewsExecutesSql()
+    {
+        $this->import->listViews();
+        
+        $this->assertEqual($this->adapter->pop(), "SELECT name FROM sysobjects WHERE xtype = 'V'");
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/MysqlTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/MysqlTestCase.php
new file mode 100644
index 000000000..8e94e09eb
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/MysqlTestCase.php
@@ -0,0 +1,34 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Import_Mysql_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Import_Mysql_TestCase extends Doctrine_UnitTestCase {
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/OracleTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/OracleTestCase.php
new file mode 100644
index 000000000..413d73ccb
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/OracleTestCase.php
@@ -0,0 +1,114 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Import_Oracle_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Import_Oracle_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testListSequencesExecutesSql()
+    {
+        $this->conn->setAttribute(Doctrine_Core::ATTR_EMULATE_DATABASE, true);
+
+        $this->import->listSequences('table');
+        
+        $this->assertEqual($this->adapter->pop(), "SELECT sequence_name FROM sys.user_sequences");
+    }
+    public function testListTableColumnsExecutesSql()
+    {
+        $this->import->listTableColumns('table');
+
+        $q = "SELECT tc.column_name, data_type,
+CASE WHEN data_type = 'NUMBER' THEN data_precision ELSE data_length END AS data_length,
+nullable, data_default, data_scale, data_precision, pk.primary
+FROM all_tab_columns tc
+LEFT JOIN (
+ select 'primary' primary, cc.table_name, cc.column_name from all_constraints cons
+ join all_cons_columns cc on cons.constraint_name = cc.constraint_name
+ where cons.constraint_type = 'P'
+) pk ON pk.column_name = tc.column_name and pk.table_name = tc.table_name
+WHERE tc.table_name = :tableName ORDER BY column_id";
+
+        $this->assertEqual($this->adapter->pop(), $q);
+    }
+    public function testListTableIndexesExecutesSql()
+    {
+        $this->import->listTableIndexes('table');
+
+        $q = 'SELECT index_name name FROM user_indexes'
+           . " WHERE table_name = 'table' OR table_name = 'TABLE'"
+           . " AND generated = 'N'";
+
+        $this->assertEqual($this->adapter->pop(), $q);
+    }
+    public function testListTablesExecutesSql()
+    {
+        $this->import->listTables();
+        
+        $q = "SELECT * FROM user_objects WHERE object_type = 'TABLE' and object_name in (select table_name from user_tables)";
+        $this->assertEqual($this->adapter->pop(), $q);
+    }
+    public function testListDatabasesExecutesSql()
+    {
+        $this->import->listDatabases();
+        
+        $q = 'SELECT username FROM sys.user_users';
+        $this->assertEqual($this->adapter->pop(), $q);
+    }
+    public function testListUsersExecutesSql()
+    {
+        $this->import->listUsers();
+        
+        $q = 'SELECT username FROM sys.all_users';
+        $this->assertEqual($this->adapter->pop(), $q);
+    }
+    public function testListViewsExecutesSql()
+    {
+        $this->import->listViews();
+        
+        $q = 'SELECT view_name FROM sys.user_views';
+        $this->assertEqual($this->adapter->pop(), $q);
+    }
+    public function testListFunctionsExecutesSql()
+    {
+        $this->import->listFunctions();
+        
+        $q = "SELECT name FROM sys.user_source WHERE line = 1 AND type = 'FUNCTION'";
+        $this->assertEqual($this->adapter->pop(), $q);
+    }
+    public function testListTableConstraintsExecutesSql()
+    {
+        $this->import->listTableConstraints('table');
+        
+        $q = "SELECT index_name name FROM user_constraints"
+           . " WHERE table_name = 'table' OR table_name = 'TABLE'";
+
+        $this->assertEqual($this->adapter->pop(), $q);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/PgsqlTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/PgsqlTestCase.php
new file mode 100644
index 000000000..f2e1eff3d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/PgsqlTestCase.php
@@ -0,0 +1,165 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Import_Pgsql_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Import_Pgsql_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testListSequencesExecutesSql() 
+    {
+        $this->import->listSequences('table');
+        
+        $this->assertEqual($this->adapter->pop(), "SELECT
+                                                regexp_replace(relname, '_seq$', '')
+                                            FROM
+                                                pg_class
+                                            WHERE relkind = 'S' AND relnamespace IN
+                                                (SELECT oid FROM pg_namespace
+                                                 WHERE nspname NOT LIKE 'pg_%' AND nspname != 'information_schema')");
+    }
+    public function testListTableColumnsExecutesSql()
+    {
+        $this->import->listTableColumns('table');
+        
+        $this->assertEqual($this->adapter->pop(), "SELECT
+                                                     ordinal_position as attnum,
+                                                     column_name as field,
+                                                     udt_name as type,
+                                                     data_type as complete_type,
+                                                     is_nullable as isnotnull,
+                                                     column_default as default,
+                                                     (
+                                                       SELECT 't'
+                                                         FROM pg_index, pg_attribute a, pg_class c, pg_type t
+                                                         WHERE c.relname = table_name AND a.attname = column_name
+                                                         AND a.attnum > 0 AND a.attrelid = c.oid AND a.atttypid = t.oid
+                                                         AND c.oid = pg_index.indrelid AND a.attnum = ANY (pg_index.indkey)
+                                                         AND pg_index.indisprimary = 't'
+                                                     ) as pri,
+                                                     character_maximum_length as length
+                                                   FROM information_schema.COLUMNS
+                                                   WHERE table_name = 'table'
+                                                   ORDER BY ordinal_position");
+    }
+    public function testListTableIndexesExecutesSql()
+    {
+        $this->import->listTableIndexes('table');
+        
+        $this->assertEqual($this->adapter->pop(), "SELECT
+                                                        relname
+                                                   FROM
+                                                        pg_class
+                                                   WHERE oid IN (
+                                                        SELECT indexrelid
+                                                        FROM pg_index, pg_class
+                                                        WHERE pg_class.relname = 'table'
+                                                            AND pg_class.oid=pg_index.indrelid
+                                                            AND indisunique != 't'
+                                                            AND indisprimary != 't'
+                                                        )");
+    }
+    public function testListTablesExecutesSql()
+    {
+        $this->import->listTables();
+        
+        $q = "SELECT
+                                                c.relname AS table_name
+                                            FROM pg_class c, pg_user u
+                                            WHERE c.relowner = u.usesysid
+                                                AND c.relkind = 'r'
+                                                AND NOT EXISTS (SELECT 1 FROM pg_views WHERE viewname = c.relname AND schemaname <> 'information_schema')
+                                                AND c.relname !~ '^(pg_|sql_)'
+                                            UNION
+                                            SELECT c.relname AS table_name
+                                            FROM pg_class c
+                                            WHERE c.relkind = 'r'
+                                                AND NOT EXISTS (SELECT 1 FROM pg_views WHERE viewname = c.relname)
+                                                AND NOT EXISTS (SELECT 1 FROM pg_user WHERE usesysid = c.relowner)
+                                                AND c.relname !~ '^pg_'";
+        $this->assertEqual($this->adapter->pop(), $q);
+    }
+    public function testListDatabasesExecutesSql()
+    {
+        $this->import->listDatabases();
+        
+        $q = 'SELECT datname FROM pg_database';
+        $this->assertEqual($this->adapter->pop(), $q);
+    }
+    public function testListUsersExecutesSql()
+    {
+        $this->import->listUsers();
+        
+        $q = 'SELECT usename FROM pg_user';
+        $this->assertEqual($this->adapter->pop(), $q);
+    }
+    public function testListViewsExecutesSql()
+    {
+        $this->import->listViews();
+        
+        $q = 'SELECT viewname FROM pg_views';
+        $this->assertEqual($this->adapter->pop(), $q);
+    }
+    public function testListFunctionsExecutesSql()
+    {
+        $this->import->listFunctions();
+        
+        $q = "SELECT
+                                                proname
+                                            FROM
+                                                pg_proc pr,
+                                                pg_type tp
+                                            WHERE
+                                                tp.oid = pr.prorettype
+                                                AND pr.proisagg = FALSE
+                                                AND tp.typname <> 'trigger'
+                                                AND pr.pronamespace IN
+                                                    (SELECT oid FROM pg_namespace
+                                                     WHERE nspname NOT LIKE 'pg_%' AND nspname != 'information_schema'";
+        $this->assertEqual($this->adapter->pop(), $q);
+    }
+    public function testListTableConstraintsExecutesSql()
+    {
+        $this->import->listTableConstraints('table');
+
+
+        $q = "SELECT
+                                                        relname
+                                                   FROM
+                                                        pg_class
+                                                   WHERE oid IN (
+                                                        SELECT indexrelid
+                                                        FROM pg_index, pg_class
+                                                        WHERE pg_class.relname = 'table'
+                                                            AND pg_class.oid = pg_index.indrelid
+                                                            AND (indisunique = 't' OR indisprimary = 't')
+                                                        )";
+        $this->assertEqual($this->adapter->pop(), $q);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/PluginHierarchyTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/PluginHierarchyTestCase.php
new file mode 100644
index 000000000..6082cbcc4
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/PluginHierarchyTestCase.php
@@ -0,0 +1,86 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Import_PluginHierarchy_TestCase
+ *
+ * @package     Doctrine
+ * @subpackage  Doctrine_Import_Builder
+ * @author      Brice Figureau <brice+doctrine@daysofwonder.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Import_PluginHierarchy_TestCase extends Doctrine_UnitTestCase
+{
+
+    public function testImportOfHieriarchyOfPluginGeneration()
+    {
+        $yml = <<<END
+---
+WikiTest:
+  actAs:
+    I18n:
+      fields: [title, content]
+      actAs:
+        Versionable:
+          fields: [title, content]
+        Searchable:
+          fields: [title, content]
+        Sluggable:
+          fields: [title]
+  columns:
+    title: string(255)
+    content: string
+END;
+        
+        file_put_contents('wiki.yml', $yml);
+        $path = dirname(__FILE__) . '/tmp/import_builder_test';
+
+        $import = new Doctrine_Import_Schema();
+        $import->setOption('generateTableClasses', true);
+        $import->importSchema('wiki.yml', 'yml', $path);
+
+        // check that the plugin hierarchy will produce the right sql statements
+        // this is almost an end-to-end testing :-)
+        $models = Doctrine_Core::loadModels($path, Doctrine_Core::MODEL_LOADING_CONSERVATIVE);
+
+        $sql = $this->conn->export->exportSortedClassesSql(array('WikiTest'));
+        $sql = current($sql);
+
+        $result = array(
+            0 => 'CREATE TABLE wiki_test_translation_version (id INTEGER, lang CHAR(2), title VARCHAR(255), content TEXT, version INTEGER, PRIMARY KEY(id, lang, version))',
+            1 => 'CREATE TABLE wiki_test_translation_index (keyword VARCHAR(200), field VARCHAR(50), position INTEGER, id INTEGER, lang CHAR(2), PRIMARY KEY(keyword, field, position, id, lang))',
+            2 => 'CREATE TABLE wiki_test_translation (id INTEGER, title VARCHAR(255), content TEXT, lang CHAR(2), version INTEGER, slug VARCHAR(255), PRIMARY KEY(id, lang))',
+            3 => 'CREATE TABLE wiki_test (id INTEGER PRIMARY KEY AUTOINCREMENT)',
+            4 => 'CREATE UNIQUE INDEX wiki_test_translation_sluggable_idx ON wiki_test_translation (slug)',
+        );
+            
+        foreach($sql as $idx => $req) {
+            $this->assertEqual($req, $result[$idx]);
+        }        
+        
+        Doctrine_Lib::removeDirectories($path);
+        unlink('wiki.yml');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/SchemaTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/SchemaTestCase.php
new file mode 100644
index 000000000..a480499db
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/SchemaTestCase.php
@@ -0,0 +1,113 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Import_Schema_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Import_Schema_TestCase extends Doctrine_UnitTestCase 
+{
+    public $buildSchema;
+    public $schema;
+    
+    public function testYmlImport()
+    {
+        $path = dirname(__FILE__) . '/import_builder_test';
+        
+        $import = new Doctrine_Import_Schema();
+        $import->importSchema('schema.yml', 'yml', $path);
+        
+        if ( ! file_exists($path . '/SchemaTestUser.php')) {
+            $this->fail();
+        }
+        
+        if ( ! file_exists($path . '/SchemaTestProfile.php')) {
+            $this->fail();
+        }
+
+        $this->assertEqual(Doctrine_Core::getTable('AliasTest')->getFieldName('test_col'), 'test_col_alias');
+
+        Doctrine_Lib::removeDirectories($path);
+    }
+    
+    public function testBuildSchema()
+    {
+        $schema = new Doctrine_Import_Schema();
+        $array = $schema->buildSchema('schema.yml', 'yml');
+        
+        $model = $array['SchemaTestUser'];
+
+        $this->assertTrue(array_key_exists('connection', $model));
+        $this->assertTrue(array_key_exists('className', $model));
+        $this->assertTrue(array_key_exists('tableName', $model));
+        $this->assertTrue(array_key_exists('columns', $model) && is_array($model['columns']));
+        $this->assertTrue(array_key_exists('relations', $model) && is_array($model['relations']));
+        $this->assertTrue(array_key_exists('indexes', $model) && is_array($model['indexes']));
+        $this->assertTrue(array_key_exists('attributes', $model) && is_array($model['attributes']));
+        $this->assertTrue(array_key_exists('templates', $model) && is_array($model['columns']));
+        $this->assertTrue(array_key_exists('actAs', $model) && is_array($model['actAs']));
+        $this->assertTrue(array_key_exists('options', $model) && is_array($model['options']));
+        $this->assertTrue(array_key_exists('package', $model));
+        $this->assertTrue(array_key_exists('inheritance', $model) && is_array($model['inheritance']));
+        $this->assertTrue(array_key_exists('detect_relations', $model) && is_bool($model['detect_relations']));
+        $this->assertEqual($array['AliasTest']['columns']['test_col']['name'], 'test_col as test_col_alias');
+    }
+    
+    public function testSchemaRelationshipCompletion()
+    {
+        $this->buildSchema = new Doctrine_Import_Schema();
+        $this->schema = $this->buildSchema->buildSchema('schema.yml', 'yml');
+        
+        foreach ($this->schema as $name => $properties) {
+            foreach ($properties['relations'] as $alias => $relation) {
+                if ( ! $this->_verifyMultiDirectionalRelationship($name, $alias, $relation)) {
+                    $this->fail();
+                    
+                    return false;
+                }
+            }
+        }
+        
+        $this->pass();
+    }
+    
+    protected function _verifyMultiDirectionalRelationship($class, $relationAlias, $relation)
+    {
+        $foreignClass = $relation['class'];
+        $foreignAlias = isset($relation['foreignAlias']) ? $relation['foreignAlias']:$class;
+        
+        $foreignClassRelations = $this->schema[$foreignClass]['relations'];
+        
+        // Check to see if the foreign class has the opposite end defined for the class/foreignAlias
+        if (isset($foreignClassRelations[$foreignAlias])) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/SqliteTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/SqliteTestCase.php
new file mode 100644
index 000000000..812d3f41f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Import/SqliteTestCase.php
@@ -0,0 +1,61 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Import_Sqlite_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Import_Sqlite_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testListSequencesExecutesSql() 
+    {
+        $this->import->listSequences('table');
+        
+        $this->assertEqual($this->adapter->pop(), "SELECT name FROM sqlite_master WHERE type='table' AND sql NOT NULL ORDER BY name");
+    }
+    public function testListTableColumnsExecutesSql()
+    {
+        $this->import->listTableColumns('table');
+        
+        $this->assertEqual($this->adapter->pop(), "PRAGMA table_info(table)");
+    }
+    public function testListTableIndexesExecutesSql()
+    {
+        $this->import->listTableIndexes('table');
+        
+        $this->assertEqual($this->adapter->pop(), "PRAGMA index_list(table)");
+    }
+    public function testListTablesExecutesSql()
+    {
+        $this->import->listTables();
+        
+        $q = "SELECT name FROM sqlite_master WHERE type = 'table' AND name != 'sqlite_sequence' UNION ALL SELECT name FROM sqlite_temp_master WHERE type = 'table' ORDER BY name";
+
+        $this->assertEqual($this->adapter->pop(), $q);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ImportTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ImportTestCase.php
new file mode 100644
index 000000000..8d062a252
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ImportTestCase.php
@@ -0,0 +1,54 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Import_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Import_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables() 
+    { }
+    public function prepareData() 
+    { }
+
+    public function testImport()
+    {
+        $this->dbh = new PDO('sqlite::memory:');
+
+        $this->dbh->exec('CREATE TABLE import_test_user (id INTEGER PRIMARY KEY, name TEXT)');
+
+        $this->conn = Doctrine_Manager::connection($this->dbh, 'tmp123');
+
+        $this->conn->import->importSchema('Import/_files', array('tmp123'));
+
+        $this->assertTrue(file_exists('Import/_files/ImportTestUser.php'));
+        $this->assertTrue(file_exists('Import/_files/generated/BaseImportTestUser.php'));
+        Doctrine_Lib::removeDirectories('Import/_files');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/IntegrityActionTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/IntegrityActionTestCase.php
new file mode 100644
index 000000000..5eb5880b7
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/IntegrityActionTestCase.php
@@ -0,0 +1,71 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_IntegrityAction_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_IntegrityAction_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData()
+    { }
+    public function prepareTables()
+    {
+        $this->tables = array('CascadeDeleteTest', 'CascadeDeleteRelatedTest', 'CascadeDeleteRelatedTest2');
+        
+        parent::prepareTables();
+    }
+    public function testIntegrityActionsAreAddedIntoGlobalActionsArray()
+    {
+        $c = new CascadeDeleteTest;
+        $c2 = new CascadeDeleteRelatedTest;
+
+        $expected = array('CascadeDeleteRelatedTest' => 'CASCADE');
+        $this->assertEqual($this->manager->getDeleteActions('CascadeDeleteTest'), $expected);
+        
+        $expected = array('CascadeDeleteRelatedTest' => 'SET NULL');
+        $this->assertEqual($this->manager->getUpdateActions('CascadeDeleteTest'), $expected);
+    }
+    public function testOnDeleteCascadeEmulation()
+    {
+        $c = new CascadeDeleteTest;
+        $c->name = 'c 1';
+        $c->Related[]->name = 'r 1';
+        $c->Related[]->name = 'r 2';
+        $c->Related[0]->Related[]->name = 'r r 1';
+        $c->Related[1]->Related[]->name = 'r r 2';
+        
+        $c->save();
+        
+        $this->connection->clear();
+        
+        $c = $this->conn->queryOne('FROM CascadeDeleteTest c WHERE c.id = 1');
+        
+        $c->delete();
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ManagerTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ManagerTestCase.php
new file mode 100644
index 000000000..4765a6256
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ManagerTestCase.php
@@ -0,0 +1,178 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Manager_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Manager_TestCase extends Doctrine_UnitTestCase {
+    public function testGetInstance() {
+        $this->assertTrue(Doctrine_Manager::getInstance() instanceOf Doctrine_Manager);
+    }
+    public function testOpenConnection() {
+        $this->assertTrue($this->connection instanceOf Doctrine_Connection);
+    }
+    public function testGetIterator() {
+        $this->assertTrue($this->manager->getIterator() instanceof ArrayIterator);
+    }
+    public function testCount() {
+        $this->assertTrue(is_integer(count($this->manager)));
+    }
+    public function testGetCurrentConnection() {
+        $this->assertTrue($this->manager->getCurrentConnection() === $this->connection);
+    }
+    public function testGetConnections() {
+        $this->assertTrue(is_integer(count($this->manager->getConnections())));
+    }
+    public function testClassifyTableize() {
+        $name = "Forum_Category";
+        $this->assertEqual(Doctrine_Inflector::tableize($name), "forum__category");
+        $this->assertEqual(Doctrine_Inflector::classify(Doctrine_Inflector::tableize($name)), $name);
+        
+        
+    }
+    public function testDsnParser()
+    {
+        $mysql = 'mysql://user:pass@localhost/dbname';
+        $sqlite = 'sqlite:////full/unix/path/to/file.db';
+        $sqlitewin = 'sqlite:///c:/full/windows/path/to/file.db';
+        $sqlitewin2 = 'sqlite:///D:\full\windows\path\to\file.db';
+        
+        $manager = Doctrine_Manager::getInstance();
+        
+        try {
+            $res = $manager->parseDsn($mysql);
+            $expectedMysqlDsn = array(
+                "scheme" => "mysql",
+                "host" => "localhost",
+                "user" => "user",
+                "pass" => "pass",
+                "path" => "/dbname",
+                "dsn" => "mysql:host=localhost;dbname=dbname",
+                "port" => NULL,
+                "query" => NULL, 
+                "fragment" => NULL,
+                "database" => "dbname");
+            $this->assertEqual($expectedMysqlDsn, $res);
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+        
+        try {
+            $expectedDsn = array(
+                "scheme" => "sqlite",
+                "host" => NULL,
+                "user" => NULL,
+                "pass" => NULL,
+                "path" => "/full/unix/path/to/file.db",
+                "dsn" => "sqlite:/full/unix/path/to/file.db",
+                "port" => NULL,
+                "query" => NULL, 
+                "fragment" => NULL,
+                "database" => "/full/unix/path/to/file.db");
+              
+            $res = $manager->parseDsn($sqlite);
+            $this->assertEqual($expectedDsn, $res);
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+        
+        try {
+             $expectedDsn = array(
+                "scheme" => "sqlite",
+                "host" => NULL,
+                "path" => "c:/full/windows/path/to/file.db",
+                "dsn" => "sqlite:c:/full/windows/path/to/file.db",
+                "port" => NULL,
+                "user" => NULL,
+                "pass" => NULL,
+                "query" => NULL, 
+                "fragment" => NULL,
+                "database" => "c:/full/windows/path/to/file.db");
+            $res = $manager->parseDsn($sqlitewin);
+            $this->assertEqual($expectedDsn, $res);
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+
+        try {
+             $expectedDsn = array(
+                "scheme" => "sqlite",
+                "host" => NULL,
+                "path" => 'D:/full/windows/path/to/file.db',
+                "dsn" => 'sqlite:D:/full/windows/path/to/file.db',
+                "port" => NULL,
+                "user" => NULL,
+                "pass" => NULL,
+                "query" => NULL, 
+                "fragment" => NULL,
+                "database" => 'D:/full/windows/path/to/file.db');
+            $res = $manager->parseDsn($sqlitewin2);
+            $this->assertEqual($expectedDsn, $res);
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+    
+    public function testCreateDatabases()
+    {
+        // We need to know if we're under Windows or *NIX 
+        $OS = strtoupper(substr(PHP_OS, 0,3)); 
+
+        $tmp_dir = ($OS == 'WIN') ? str_replace('\\','/',sys_get_temp_dir()) : '/tmp';
+       
+        $this->conn1_database = $tmp_dir . "/doctrine1.db";
+        $this->conn2_database = $tmp_dir . "/doctrine2.db";
+
+        $this->conn1 = Doctrine_Manager::connection('sqlite:///' . $this->conn1_database, 'doctrine1');
+        $this->conn2 = Doctrine_Manager::connection('sqlite:///' . $this->conn2_database, 'doctrine2');
+        
+        $result1 = $this->conn1->createDatabase();
+        $result2 = $this->conn2->createDatabase();
+    }
+    
+    public function testDropDatabases()
+    {
+        $result1 = $this->conn1->dropDatabase();
+        $result2 = $this->conn2->dropDatabase();
+    }
+    
+    public function testConnectionInformationDecoded()
+    {
+      $dsn = 'mysql://' . urlencode('test/t') . ':' . urlencode('p@ssword') . '@localhost/' . urlencode('db/name');
+
+      $conn = Doctrine_Manager::connection($dsn);
+      $options = $conn->getOptions();
+
+      $this->assertEqual($options['username'], 'test/t');
+      $this->assertEqual($options['password'], 'p@ssword');
+      $this->assertEqual($options['dsn'], 'mysql:host=localhost;dbname=db/name');
+    }
+    public function prepareData() { }
+    public function prepareTables() { }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Migration/BaseTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Migration/BaseTestCase.php
new file mode 100644
index 000000000..328162327
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Migration/BaseTestCase.php
@@ -0,0 +1,99 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Migration_Base_TestCase
+ * 
+ * @package     Doctrine
+ * @author      Dan Bettles <danbettles@yahoo.co.uk>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Migration_Base_TestCase extends Doctrine_UnitTestCase 
+{
+    public function setUp() {}
+
+    public function testIsAbstract()
+    {
+        $reflectionClass = new ReflectionClass('Doctrine_Migration_Base');
+        $this->assertTrue($reflectionClass->isAbstract());
+    }
+
+    public function testByDefaultHasNoDefaultTableOptions()
+    {
+        $this->assertEqual(array(), Doctrine_Migration_Base::getDefaultTableOptions());
+    }
+
+    public function testGetdefaulttableoptionsReturnsTheOptionsSetWithSetdefaulttableoptions()
+    {
+        $fixtures = array(
+            array(array('charset' => 'utf8')),
+            array(array()),
+            array('type' => 'INNODB', 'charset' => 'utf8', 'collate' => 'utf8_unicode_ci'),
+        );
+
+        foreach ($fixtures as $fixture) {
+            Doctrine_Migration_Base::setDefaultTableOptions($fixture);
+            $this->assertEqual($fixture, Doctrine_Migration_Base::getDefaultTableOptions());
+        }
+    }
+
+    public function tearDown()
+    {
+        Doctrine_Migration_Base::setDefaultTableOptions(array());
+    }
+
+    public function testCreatetableMergesTheDefaultTableOptionsWithTheSpecifiedOptions()
+    {
+        $fixtures = array(
+            array(
+                'default' => array('type' => 'INNODB', 'charset' => 'utf8', 'collate' => 'utf8_unicode_ci'),
+                'user' => array(),
+                'expected' => array('type' => 'INNODB', 'charset' => 'utf8', 'collate' => 'utf8_unicode_ci'),
+            ),
+            array(
+                'default' => array('type' => 'INNODB', 'charset' => 'utf8', 'collate' => 'utf8_unicode_ci'),
+                'user' => array('charset' => 'latin1', 'collate' => 'latin1_general_ci'),
+                'expected' => array('type' => 'INNODB', 'charset' => 'latin1', 'collate' => 'latin1_general_ci'),
+            ),
+        );
+
+        foreach ($fixtures as $fixture) {
+            Doctrine_Migration_Base_TestCase_TestBase01::setDefaultTableOptions($fixture['default']);
+            $migration = new Doctrine_Migration_Base_TestCase_TestBase01();
+            $migration->createTable('anything', array(), $fixture['user']);
+            $this->assertEqual($fixture['expected'], $migration->mergedOptions);
+        }
+    }
+}
+
+class Doctrine_Migration_Base_TestCase_TestBase01 extends Doctrine_Migration_Base
+{
+    public $mergedOptions = array();
+
+    public function table($upDown, $tableName, array $fields = array(), array $options = array())
+    {
+        $this->mergedOptions = $options;
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Migration/Diff/schema/from.yml b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Migration/Diff/schema/from.yml
new file mode 100644
index 000000000..ed62b6e32
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Migration/Diff/schema/from.yml
@@ -0,0 +1,27 @@
+---
+User:
+  columns:
+    username: string(255)
+    password: string(255)
+    homepage_id: integer
+    profile_id: integer
+    is_active:
+      type: boolean
+      default: true
+  relations:
+    Profile:
+      foreignType: one
+    Homepage:
+      foreignType: one
+  indexes:
+    is_active:
+      fields: [is_active]
+
+Homepage:
+  columns:
+    title: string(255)
+
+Profile:
+  columns:
+    name: string(255)
+    email_address: string(255)
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Migration/Diff/schema/to.yml b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Migration/Diff/schema/to.yml
new file mode 100644
index 000000000..4907666fe
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Migration/Diff/schema/to.yml
@@ -0,0 +1,31 @@
+---
+User:
+  columns:
+    username:
+      type: string(255)
+      unique: true
+      notnull: true
+    password: string(255)
+    is_active:
+      type: boolean
+      default: true
+
+Profile:
+  columns:
+    user_id: integer
+    name: string(255)
+    email_address: string(255)
+  relations:
+    User:
+      onDelete: CASCADE
+      foreignType: one
+
+BlogPost:
+  columns:
+    user_id: integer
+    title: string(255)
+    body: clob
+  relations:
+    User:
+      onDelete: CASCADE
+      foreignAlias: BlogPosts
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Migration/DiffTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Migration/DiffTestCase.php
new file mode 100644
index 000000000..7a05d7c1d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Migration/DiffTestCase.php
@@ -0,0 +1,79 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Migration_Diff_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Migration_Diff_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $from = dirname(__FILE__) . '/Diff/schema/from.yml';
+        $to = dirname(__FILE__) . '/Diff/schema/to.yml';
+        $migrationsPath = dirname(__FILE__) . '/Diff/migrations';
+        Doctrine_Lib::makeDirectories($migrationsPath);
+
+        $diff = new Doctrine_Migration_Diff($from, $to, $migrationsPath);
+        $changes = $diff->generateChanges();
+        $this->assertEqual($changes['dropped_tables']['homepage']['tableName'], 'homepage');
+        $this->assertEqual($changes['created_tables']['blog_post']['tableName'], 'blog_post');
+        $this->assertEqual($changes['created_columns']['profile']['user_id'], array('type' => 'integer', 'length' => 8));
+        $this->assertEqual($changes['dropped_columns']['user']['homepage_id'], array('type' => 'integer', 'length' => 8));
+        $this->assertEqual($changes['dropped_columns']['user']['profile_id'], array('type' => 'integer', 'length' => 8));
+        $this->assertEqual($changes['changed_columns']['user']['username'], array('type' => 'string', 'length' => 255, 'unique' => true, 'notnull' => true));
+        $this->assertEqual($changes['created_foreign_keys']['profile']['profile_user_id_user_id']['local'], 'user_id');
+        $this->assertEqual($changes['created_foreign_keys']['blog_post']['blog_post_user_id_user_id']['local'], 'user_id');
+        $this->assertEqual($changes['dropped_foreign_keys']['user']['user_profile_id_profile_id']['local'], 'profile_id');
+        $this->assertEqual($changes['dropped_foreign_keys']['user']['user_homepage_id_homepage_id']['local'], 'homepage_id');
+        $this->assertEqual($changes['created_indexes']['blog_post']['blog_post_user_id'], array('fields' => array('user_id')));
+        $this->assertEqual($changes['created_indexes']['profile']['profile_user_id'], array('fields' => array('user_id')));
+        $this->assertEqual($changes['dropped_indexes']['user']['is_active'], array('fields' => array('is_active')));
+        $diff->generateMigrationClasses();
+
+        $files = glob($migrationsPath . '/*.php');
+        $this->assertEqual(count($files), 2);
+        $this->assertTrue(strpos($files[0], '_version1.php'));
+        $this->assertTrue(strpos($files[1], '_version2.php'));
+        
+        $code1 = file_get_contents($files[0]);
+        $this->assertTrue(strpos($code1, 'this->dropTable'));
+        $this->assertTrue(strpos($code1, 'this->createTable'));
+        $this->assertTrue(strpos($code1, 'this->removeColumn'));
+        $this->assertTrue(strpos($code1, 'this->addColumn'));
+        $this->assertTrue(strpos($code1, 'this->changeColumn'));
+
+        $code2 = file_get_contents($files[1]);
+        $this->assertTrue(strpos($code2, 'this->dropForeignKey'));
+        $this->assertTrue(strpos($code2, 'this->removeIndex'));
+        $this->assertTrue(strpos($code2, 'this->addIndex'));
+        $this->assertTrue(strpos($code2, 'this->createForeignKey'));
+
+        Doctrine_Lib::removeDirectories($migrationsPath);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/MigrationTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/MigrationTestCase.php
new file mode 100644
index 000000000..59b2b336c
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/MigrationTestCase.php
@@ -0,0 +1,156 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Migration_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Migration_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'MigrationPhonenumber';
+        $this->tables[] = 'MigrationUser';
+        $this->tables[] = 'MigrationProfile';
+        parent::prepareTables();
+    }
+
+    public function testMigration()
+    {
+        $migration = new Doctrine_Migration('migration_classes');
+        $this->assertFalse($migration->hasMigrated());
+        $migration->setCurrentVersion(3);
+        $migration->migrate(0);
+        $this->assertEqual($migration->getCurrentVersion(), 0);
+        $this->assertEqual($migration->getLatestVersion(), 11);
+        $this->assertEqual($migration->getNextVersion(), 12);
+        $current = $migration->getCurrentVersion();
+        $migration->setCurrentVersion(100);
+        $this->assertEqual($migration->getCurrentVersion(), 100);
+        $migration->setCurrentVersion($current);
+
+        $migration->migrate(3);
+        $this->assertTrue($migration->hasMigrated());
+        $this->assertEqual($migration->getCurrentVersion(), 3);
+        $this->assertTrue($this->conn->import->tableExists('migration_phonenumber'));
+        $this->assertTrue($this->conn->import->tableExists('migration_user'));
+        $this->assertTrue($this->conn->import->tableExists('migration_profile'));
+        $migration->migrate(4);
+        $this->assertFalse($this->conn->import->tableExists('migration_profile'));
+
+        $migration->migrate(0);
+        $this->assertEqual($migration->getCurrentVersion(), 0);
+        $this->assertTrue($migration->getMigrationClass(1) instanceof AddPhonenumber);
+        $this->assertTrue($migration->getMigrationClass(2) instanceof AddUser);
+        $this->assertTrue($migration->getMigrationClass(3) instanceof AddProfile);
+        $this->assertTrue($migration->getMigrationClass(4) instanceof DropProfile);
+        $this->assertFalse($this->conn->import->tableExists('migration_phonenumber'));
+        $this->assertFalse($this->conn->import->tableExists('migration_user'));
+        $this->assertFalse($this->conn->import->tableExists('migration_profile'));
+        $this->assertEqual(array(
+          1 => 'AddPhonenumber',
+          2 => 'AddUser',
+          3 => 'AddProfile',
+          4 => 'DropProfile',
+          5 => 'Test5',
+          6 => 'Test6',
+          7 => 'Test7',
+          8 => 'Test8',
+          9 => 'Test9',
+          10 => 'Test10',
+          11 => 'Test11',
+        ), $migration->getMigrationClasses());
+    }
+
+    public function testMigrateClearsErrors()
+    {
+        $migration = new Doctrine_Migration('migration_classes');
+        $migration->setCurrentVersion(3);
+        try {
+            $migration->migrate(3);
+        } catch (Doctrine_Migration_Exception $e) {
+            $this->assertTrue($migration->hasErrors());
+            $this->assertEqual(1, $migration->getNumErrors());
+        }
+
+        try {
+            $migration->migrate(3);
+        } catch (Doctrine_Migration_Exception $e) {
+            $this->assertTrue($migration->hasErrors());
+            $this->assertEqual(1, $migration->getNumErrors());
+        }
+
+        $migration->clearErrors();
+        $this->assertFalse($migration->hasErrors());
+        $this->assertEqual(0, $migration->getNumErrors());
+    }
+
+    public function testMigrationClassNameInflected()
+    {
+        $tests = array('test-class-Name',
+                       'test_class_name',
+                       'test:class:name',
+                       'test(class)name',
+                       'test*class*name',
+                       'test class name',
+                       'test&class&name');
+
+        $builder = new Doctrine_Migration_Builder();
+
+        foreach ($tests as $test) {
+            $code = $builder->generateMigrationClass($test);
+            $this->assertTrue($code);
+        }
+    }
+}
+
+class MigrationPhonenumber extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('user_id', 'integer');
+        $this->hasColumn('phonenumber', 'string', 255);
+    }
+}
+
+class MigrationUser extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+    }
+}
+
+class MigrationProfile extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ModelLoadingTest/Aggressive/Models.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ModelLoadingTest/Aggressive/Models.php
new file mode 100644
index 000000000..8205faae8
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ModelLoadingTest/Aggressive/Models.php
@@ -0,0 +1,16 @@
+<?php
+abstract class BaseAggressiveModelLoadingUser extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        
+    }
+}
+
+class AggressiveModelLoadingUser extends BaseAggressiveModelLoadingUser
+{
+    public function setTableDefinition()
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ModelLoadingTest/Aggressive/MoreModels.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ModelLoadingTest/Aggressive/MoreModels.php
new file mode 100644
index 000000000..a0258bb4c
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ModelLoadingTest/Aggressive/MoreModels.php
@@ -0,0 +1,16 @@
+<?php
+class AggressiveModelLoadingContact extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        
+    }
+}
+
+class AggressiveModelLoadingProfile extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ModelLoadingTest/Conservative/BaseConservativeModelLoadingUser.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ModelLoadingTest/Conservative/BaseConservativeModelLoadingUser.php
new file mode 100644
index 000000000..a548bb7c9
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ModelLoadingTest/Conservative/BaseConservativeModelLoadingUser.php
@@ -0,0 +1,8 @@
+<?php
+abstract class BaseConservativeModelLoadingUser extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ModelLoadingTest/Conservative/ConservativeModelLoadingContact.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ModelLoadingTest/Conservative/ConservativeModelLoadingContact.php
new file mode 100644
index 000000000..31e1c1d4e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ModelLoadingTest/Conservative/ConservativeModelLoadingContact.php
@@ -0,0 +1,8 @@
+<?php
+class ConservativeModelLoadingContact extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ModelLoadingTest/Conservative/ConservativeModelLoadingProfile.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ModelLoadingTest/Conservative/ConservativeModelLoadingProfile.php
new file mode 100644
index 000000000..9dbc11254
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ModelLoadingTest/Conservative/ConservativeModelLoadingProfile.php
@@ -0,0 +1,8 @@
+<?php
+class ConservativeModelLoadingProfile extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ModelLoadingTest/Conservative/ConservativeModelLoadingUser.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ModelLoadingTest/Conservative/ConservativeModelLoadingUser.php
new file mode 100644
index 000000000..b0ea00ec0
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ModelLoadingTest/Conservative/ConservativeModelLoadingUser.php
@@ -0,0 +1,10 @@
+<?php
+require_once('BaseConservativeModelLoadingUser.php');
+
+class ConservativeModelLoadingUser extends BaseConservativeModelLoadingUser
+{
+    public function setTableDefinition()
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/NestedSet/HydrationTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/NestedSet/HydrationTestCase.php
new file mode 100644
index 000000000..1c0622485
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/NestedSet/HydrationTestCase.php
@@ -0,0 +1,112 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Record_State_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_NestedSet_Hydration_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'NestedSetTest_SingleRootNode';
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+        $node = new NestedSetTest_SingleRootNode();
+        $node->name = 'root';
+        $treeMngr = $this->conn->getTable('NestedSetTest_SingleRootNode')->getTree();
+        $treeMngr->createRoot($node);
+        
+        $node2 = new NestedSetTest_SingleRootNode();
+        $node2->name = 'node2';
+        $node2->getNode()->insertAsLastChildOf($node);
+        
+        $node3 = new NestedSetTest_SingleRootNode();
+        $node3->name = 'node3';
+        $node3->getNode()->insertAsLastChildOf($node2);
+    }
+
+    public function testRecordHierarchyHydration()
+    {
+        $results = Doctrine_Core::getTable('NestedSetTest_SingleRootNode')
+            ->createQuery('n')
+            ->execute(array(), Doctrine_Core::HYDRATE_RECORD_HIERARCHY);
+
+        $this->assertEqual($results[0]['__children'][0]['__children'][0]['name'], 'node3');
+        $this->assertTrue($results instanceof Doctrine_Collection);
+    }
+
+    public function testArrayHierarchyHydration()
+    {
+        $results = Doctrine_Core::getTable('NestedSetTest_SingleRootNode')
+            ->createQuery('n')
+            ->execute(array(), Doctrine_Core::HYDRATE_ARRAY_HIERARCHY);
+
+        $this->assertEqual($results[0]['__children'][0]['__children'][0]['name'], 'node3');
+        $this->assertTrue(is_array($results));
+    }
+
+    public function testArrayHierarchyToArray()
+    {
+        $array = Doctrine_Core::getTable('NestedSetTest_SingleRootNode')
+            ->createQuery('n')
+            ->execute(array(), Doctrine_Core::HYDRATE_ARRAY_HIERARCHY);
+
+        $coll = Doctrine_Core::getTable('NestedSetTest_SingleRootNode')
+            ->createQuery('n')
+            ->execute(array(), Doctrine_Core::HYDRATE_RECORD_HIERARCHY);
+
+        $this->assertEqual($array, $coll->toArray());
+    }
+
+    public function testHierarchyHydrationNotAllowedOnInvalidModel()
+    {
+        try {
+            $results = Doctrine_Core::getTable('User')
+                ->createQuery('u')
+                ->execute(array(), Doctrine_Core::HYDRATE_RECORD_HIERARCHY);
+
+            $this->fail();
+        } catch (Exception $e) {
+            $this->pass();
+        }
+
+        try {
+            $results = Doctrine_Core::getTable('User')
+                ->createQuery('u')
+                ->execute(array(), Doctrine_Core::HYDRATE_ARRAY_HIERARCHY);
+
+            $this->fail();
+        } catch (Exception $e) {
+            $this->pass();
+        }
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/NestedSet/MultiRootTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/NestedSet/MultiRootTestCase.php
new file mode 100644
index 000000000..265b8511c
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/NestedSet/MultiRootTestCase.php
@@ -0,0 +1,165 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Record_State_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_NestedSet_MultiRoot_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'NestedSet_MultiRootNode';
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {}
+    
+    public function testSavingNewRecordAsRootWithoutRootIdThrowsException() {
+        $node = new NestedSet_MultiRootNode();
+        $node->name = 'root';
+        try {
+            $treeMngr = $this->conn->getTable('NestedSet_MultiRootNode')->getTree();
+            $treeMngr->createRoot($node);
+            $this->fail();
+        } catch (Doctrine_Tree_Exception $e) {
+            $this->pass();
+        }
+    }
+    
+    public function testSavingNewRecordWithRootIdWorks() {
+        $node = new NestedSet_MultiRootNode();
+        $node->name = 'root';
+        $node->root_id = 42;
+        try {
+            $treeMngr = $this->conn->getTable('NestedSet_MultiRootNode')->getTree();
+            $treeMngr->createRoot($node);
+            $this->assertEqual(1, $node['lft']);
+            $this->assertEqual(2, $node['rgt']);
+            $node->getNode()->delete();
+        } catch (Doctrine_Tree_Exception $e) {
+            $this->fail();
+        }
+    }
+    
+    public function testSavingPersistentRecordAsRootAssignsIdToRootId() {
+        $node = new NestedSet_MultiRootNode();
+        $node->name = 'root';
+        $node->save();
+        try {
+            $treeMngr = $this->conn->getTable('NestedSet_MultiRootNode')->getTree();
+            $treeMngr->createRoot($node);
+            $this->assertEqual(1, $node['lft']);
+            $this->assertEqual(2, $node['rgt']);
+            $this->assertEqual($node->id, $node->root_id);
+            $node->getNode()->delete();
+        } catch (Doctrine_Tree_Exception $e) {
+            $this->fail();
+        }
+    }
+    
+    public function testSaveMultipleRootsWithChildren() {
+        $root1 = new NestedSet_MultiRootNode();
+        $root1->name = 'root1';
+        $root1->save();
+        try {
+            $treeMngr = $this->conn->getTable('NestedSet_MultiRootNode')->getTree();
+            $treeMngr->createRoot($root1);
+            $this->assertEqual(1, $root1['lft']);
+            $this->assertEqual(2, $root1['rgt']);
+            $this->assertEqual($root1->id, $root1->root_id);
+        } catch (Doctrine_Tree_Exception $e) {
+            $this->fail();
+        }
+        
+        $root2 = new NestedSet_MultiRootNode();
+        $root2->name = 'root';
+        $root2->save();
+        try {
+            $treeMngr = $this->conn->getTable('NestedSet_MultiRootNode')->getTree();
+            $treeMngr->createRoot($root2);
+            $this->assertEqual(1, $root2['lft']);
+            $this->assertEqual(2, $root2['rgt']);
+            $this->assertEqual($root2->id, $root2->root_id);
+        } catch (Doctrine_Tree_Exception $e) {
+            $this->fail();
+        }
+        
+        // now a child for root1
+        $child1 = new NestedSet_MultiRootNode();
+        $child1->name = "child1";
+        $child1->getNode()->insertAsLastChildOf($root1);
+        
+        $root1->refresh(); // ! updates lft/rgt
+        // test insertion
+        $this->assertEqual(2, $child1->lft);
+        $this->assertEqual(3, $child1->rgt);
+        $this->assertEqual(1, $child1->level);
+        // test root1 has been shifted
+        $this->assertEqual(1, $root1->lft);
+        $this->assertEqual(4, $root1->rgt);
+        $this->assertEqual(0, $root1->level);
+        
+        // now a child for root2
+        $child2 = new NestedSet_MultiRootNode();
+        $child2->name = "child2";
+        $child2->getNode()->insertAsLastChildOf($root2);
+        
+        $root2->refresh(); // ! updates lft/rgt
+        // test insertion
+        $this->assertEqual(2, $child2->lft);
+        $this->assertEqual(3, $child2->rgt);
+        $this->assertEqual(1, $child2->level);
+        // test root2 has been shifted
+        $this->assertEqual(1, $root2->lft);
+        $this->assertEqual(4, $root2->rgt);
+        $this->assertEqual(0, $root2->level);
+        
+        // query some
+        $root1Id = $root1->id;
+        $root2Id = $root2->id;
+        $this->conn->getTable('NestedSet_MultiRootNode')->clear();
+        // check the root1 child
+        $treeMngr = $this->conn->getTable('NestedSet_MultiRootNode')->getTree();
+        $root1 = $treeMngr->fetchRoot($root1Id);
+        $desc = $root1->getNode()->getDescendants();
+        $this->assertTrue($desc !== false);
+        $this->assertEqual(1, count($desc));
+        $this->assertEqual('child1', $desc[0]['name']);
+        $this->assertEqual(1, $desc[0]['level']);
+        // check the root2 child
+        $root2 = $treeMngr->fetchRoot($root2Id);
+        $desc = $root2->getNode()->getDescendants();
+        $this->assertTrue($desc !== false);
+        $this->assertEqual(1, count($desc));
+        $this->assertEqual('child2', $desc[0]['name']);
+        $this->assertEqual(1, $desc[0]['level']);
+    }
+
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/NestedSet/SingleRootTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/NestedSet/SingleRootTestCase.php
new file mode 100644
index 000000000..7a449d454
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/NestedSet/SingleRootTestCase.php
@@ -0,0 +1,103 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Record_State_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_NestedSet_SingleRoot_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'NestedSetTest_SingleRootNode';
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+        $node = new NestedSetTest_SingleRootNode();
+        $node->name = 'root';
+        $treeMngr = $this->conn->getTable('NestedSetTest_SingleRootNode')->getTree();
+        $treeMngr->createRoot($node);
+        
+        $node2 = new NestedSetTest_SingleRootNode();
+        $node2->name = 'node2';
+        $node2->getNode()->insertAsLastChildOf($node);
+        
+        $node3 = new NestedSetTest_SingleRootNode();
+        $node3->name = 'node3';
+        $node3->getNode()->insertAsLastChildOf($node2);
+    }
+    
+    public function testLftRgtValues()
+    {
+        $treeMngr = $this->conn->getTable('NestedSetTest_SingleRootNode')->getTree();
+        $root = $treeMngr->fetchRoot();
+        $this->assertEqual(1, $root['lft']);
+        $this->assertEqual(6, $root['rgt']);
+    }
+
+    public function testGetDescendants()
+    {
+        $treeMngr = $this->conn->getTable('NestedSetTest_SingleRootNode')->getTree();
+        $root = $treeMngr->fetchRoot();
+        $desc = $root->getNode()->getDescendants();
+        $this->assertTrue($desc !== false);
+        $this->assertEqual(2, count($desc));
+        $this->assertEqual('node2', $desc[0]['name']);
+        $this->assertEqual(1, $desc[0]['level']);
+    }
+
+    public function testGetNumberChildren()
+    {
+        $treeMngr = $this->conn->getTable('NestedSetTest_SingleRootNode')->getTree();
+        $root = $treeMngr->fetchRoot();
+        $this->assertEqual(1, $root->getNode()->getNumberChildren());
+        $this->assertFalse($root->getNode()->hasParent());
+    }
+    
+    public function testGetAncestors()
+    {
+        $node = $this->conn->query("SELECT n.* FROM NestedSetTest_SingleRootNode n WHERE n.name = ?",
+                array('node2'))->getFirst();
+        $anc = $node->getNode()->getAncestors();
+        $this->assertTrue($anc !== false);
+        $this->assertEqual(1, count($anc));
+        $this->assertEqual('root', $anc[0]['name']);
+        $this->assertEqual(0, $anc[0]['level']);
+        $this->assertTrue($node->getNode()->hasParent());
+    }
+
+    public function testInvalidNodeHasParent()
+    {
+        $node = new NestedSetTest_SingleRootNode();
+        $node->name = 'root';
+
+        $this->assertFalse($node->getNode()->hasParent());
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/NestedSet/TimestampableMultiRootTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/NestedSet/TimestampableMultiRootTestCase.php
new file mode 100644
index 000000000..20972a138
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/NestedSet/TimestampableMultiRootTestCase.php
@@ -0,0 +1,82 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Record_State_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_NestedSet_TimestampableMultiRoot_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'NestedSet_Timestampable_MultiRootNode';
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {}
+    
+    
+    public function testSavingNewRecordWithRootIdWorks() {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true );
+        $node = new NestedSet_Timestampable_MultiRootNode();
+        $node->name = 'root';
+        $node->root_id = 42;
+        $child1 = new NestedSet_Timestampable_MultiRootNode();
+        $child1->name = 'node1';
+        $child1->root_id = 42;
+        $node2 = new NestedSet_Timestampable_MultiRootNode();
+        $node2->name = 'node2';
+        $node2->root_id = 42;
+        //try {
+            $treeMngr = $this->conn->getTable('NestedSet_Timestampable_MultiRootNode')->getTree();
+            $treeMngr->createRoot($node);
+            $this->assertEqual(1, $node['lft']);
+            $this->assertEqual(2, $node['rgt']);
+            $this->assertNotEqual(null, $node['created_at']);
+            $this->assertNotEqual(null, $node['updated_at']);
+            $child1->name = "child1";
+            $child1->getNode()->insertAsLastChildOf($node);
+        
+            $node->refresh(); // ! updates lft/rgt
+            // test insertion
+            $this->assertEqual(2, $child1->lft);
+            $this->assertEqual(3, $child1->rgt);
+            $this->assertEqual(1, $child1->level);
+            // test node has been shifted
+            $this->assertEqual(1, $node->lft);
+            $this->assertEqual(4, $node->rgt);
+            $this->assertEqual(0, $node->level);
+            
+            $node->getNode()->delete();
+        //} catch (Exception $e) {
+        //    $this->fail();
+        //}
+    }
+
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/NewCoreTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/NewCoreTestCase.php
new file mode 100644
index 000000000..f75bdecba
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/NewCoreTestCase.php
@@ -0,0 +1,48 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_NewCore_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_NewCore_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testFromParser()
+    {
+        $q = new Doctrine_Query();
+        
+        $q->load('User u', true);
+
+        $this->assertEqual($q->getSqlQueryPart('from'), array('entity e'));
+        $this->assertEqual(count($q->getQueryComponents()), 1);
+
+        $q->load('u.Phonenumber p', false);
+
+        $this->assertEqual($q->getSqlQueryPart('from'), array('entity e', 'p' => 'LEFT JOIN phonenumber p ON e.id = p.entity_id'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/OneTableOneClassInheritanceTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/OneTableOneClassInheritanceTestCase.php
new file mode 100644
index 000000000..0f193b0d0
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/OneTableOneClassInheritanceTestCase.php
@@ -0,0 +1,46 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_OneTableOneClassInheritance_TestCase
+ *
+ * @package     Doctrine
+ * @author      Bjarte Stien Karlsen <bjartka@pvv.ntnu.no> 
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_OneTableOneClassInheritance_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData() 
+    { }
+    public function prepareTables() 
+    { }
+    public function testTableExporting()
+    {
+        $sql = $this->conn->export->exportClassesSql(array('ConcreteInheritanceTestParent',
+                                                           'ConcreteInheritanceTestChild'));
+        $this->assertEqual($sql[0], 'CREATE TABLE concrete_inheritance_test_parent (id INTEGER PRIMARY KEY AUTOINCREMENT, name VARCHAR(2147483647))');
+        $this->assertEqual($sql[1], 'CREATE TABLE concrete_inheritance_test_child (id INTEGER PRIMARY KEY AUTOINCREMENT, age INTEGER, name VARCHAR(2147483647))');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ParserTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ParserTestCase.php
new file mode 100644
index 000000000..7f5e54862
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ParserTestCase.php
@@ -0,0 +1,101 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Parser_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Parser_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testGetParserInstance()
+    {
+        $instance = Doctrine_Parser::getParser('Yml');
+        
+        if ($instance instanceof Doctrine_Parser_Yml) {
+            $this->pass();
+        } else {
+            $this->fail();
+        }
+    }
+    
+    public function testFacadeLoadAndDump()
+    {
+        Doctrine_Parser::dump(array('test' => 'good job', 'test2' => true, array('testing' => false)), 'yml', 'test.yml');
+        $array = Doctrine_Parser::load('test.yml', 'yml');
+        
+        $this->assertEqual($array, array('test' => 'good job', 'test2' => true, array('testing' => false)));
+        unlink('test.yml');
+    }
+    
+    public function testParserSupportsEmbeddingPhpSyntax()
+    {
+        $parser = Doctrine_Parser::getParser('Yml');
+        $yml = "---
+test: good job
+test2: true
+testing: <?php echo 'false'.\"\n\"; ?>
+w00t: not now
+";
+        $data = $parser->doLoad($yml);
+        
+        $array = $parser->loadData($data);
+        
+        $this->assertEqual($array, array('test' => 'good job', 'test2' => true, 'testing' => false, 'w00t' => 'not now'));
+    }
+    
+    public function testParserWritingToDisk()
+    {
+        $parser = Doctrine_Parser::getParser('Yml');
+        $parser->doDump('test', 'test.yml');
+        
+        $this->assertEqual('test', file_get_contents('test.yml'));
+        unlink('test.yml');
+    }
+    
+    public function testParserReturningLoadedData()
+    {
+        $parser = Doctrine_Parser::getParser('Yml');
+        $result = $parser->doDump('test');
+        
+        $this->assertEqual('test', $result);
+    }
+    
+    public function testLoadFromString()
+    {
+        $yml = "---
+test: good job
+test2: true
+testing: <?php echo 'false'.\"\n\"; ?>
+w00t: not now
+";
+
+        $array = Doctrine_Parser::load($yml, 'yml');
+        
+        $this->assertEqual($array, array('test' => 'good job', 'test2' => true, 'testing' => false, 'w00t' => 'not now'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/PessimisticLockingTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/PessimisticLockingTestCase.php
new file mode 100644
index 000000000..306067b78
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/PessimisticLockingTestCase.php
@@ -0,0 +1,122 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Boolean_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_PessimisticLocking_TestCase extends Doctrine_UnitTestCase
+{
+    private $lockingManager;
+
+    /**
+     * Sets up everything for the lock testing
+     *
+     * Creates a locking manager and a test record to work with.
+     */
+    public function testInitData()
+    {
+        $this->lockingManager = new Doctrine_Locking_Manager_Pessimistic($this->connection);
+        
+        // Create sample data to test on
+        $entry1 = new Forum_Entry();
+        $entry1->author = 'Bart Simpson';
+        $entry1->topic  = 'I love donuts!';
+        $entry1->save();
+    }
+    
+    public function prepareTables()
+    {
+        $this->tables = array('Forum_Entry', 'Entity', 'Phonenumber', 'Email', 'Groupuser');
+        parent::prepareTables();
+    }
+
+    /**
+     * Tests the basic locking mechanism
+     * 
+     * Currently tested: successful lock, failed lock, release lock 
+     */
+    public function testLock()
+    {
+        $entries = $this->connection->query("FROM Forum_Entry WHERE Forum_Entry.author = 'Bart Simpson'");
+        
+        // Test successful lock
+        $gotLock = $this->lockingManager->getLock($entries[0], 'romanb');
+        $this->assertTrue($gotLock);
+        
+        // Test failed lock (another user already got a lock on the entry)
+        $gotLock = $this->lockingManager->getLock($entries[0], 'konstav');
+        $this->assertFalse($gotLock);
+        
+        // Test release lock
+        $released = $this->lockingManager->releaseLock($entries[0], 'romanb');
+        $this->assertTrue($released);
+    }
+
+    /**
+     * Tests the release mechanism of aged locks
+     * This test implicitly tests getLock().
+     */
+    public function testReleaseAgedLocks()
+    {
+        $entries = $this->connection->query("FROM Forum_Entry WHERE Forum_Entry.author = 'Bart Simpson'");
+        $this->lockingManager->getLock($entries[0], 'romanb');
+        $released = $this->lockingManager->releaseAgedLocks(-1); // age -1 seconds => release all
+        $this->assertEqual(1, $released);
+        
+        // A second call should return false (no locks left)
+        $released = $this->lockingManager->releaseAgedLocks(-1);
+        $this->assertEqual(0, $released);
+        
+        // Test with further parameters
+        $this->lockingManager->getLock($entries[0], 'romanb');
+        $released = $this->lockingManager->releaseAgedLocks(-1, 'User'); // shouldnt release anything
+        $this->assertEqual(0, $released);
+        $released = $this->lockingManager->releaseAgedLocks(-1, 'Forum_Entry'); // should release the lock
+        $this->assertEqual(1, $released);
+        
+        $this->lockingManager->getLock($entries[0], 'romanb');
+        $released = $this->lockingManager->releaseAgedLocks(-1, 'Forum_Entry', 'zyne'); // shouldnt release anything
+        $this->assertEqual(0, $released);
+        $released = $this->lockingManager->releaseAgedLocks(-1, 'Forum_Entry', 'romanb'); // should release the lock
+        $this->assertEqual(1, $released);
+    }
+
+    /**
+     * Tests the retrieving of a lock's owner.
+     * This test implicitly tests getLock().
+     *
+     * @param Doctrine_Record $lockedRecord
+     */
+    public function testGetLockOwner()
+    {
+        $entries = $this->connection->query("FROM Forum_Entry WHERE Forum_Entry.author = 'Bart Simpson'");
+        $gotLock = $this->lockingManager->getLock($entries[0], 'romanb');
+        $this->assertEqual('romanb', $this->lockingManager->getLockOwner($entries[0]));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/PluginTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/PluginTestCase.php
new file mode 100644
index 000000000..bc8ab0b8e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/PluginTestCase.php
@@ -0,0 +1,152 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Plugin_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Plugin_TestCase extends Doctrine_UnitTestCase 
+{
+
+    public function prepareData()
+    { }
+
+    public function prepareTables()
+    { }
+
+    public function testNestedPluginsGetExportedRecursively()
+    {
+        $sql = $this->conn->export->exportSortedClassesSql(array('Wiki'));
+        $sql = current($sql);
+
+        $this->assertEqual($sql[0], 'CREATE TABLE wiki_translation_version (id INTEGER, lang CHAR(2), title VARCHAR(255), content TEXT, version INTEGER, PRIMARY KEY(id, lang, version))');
+        $this->assertEqual($sql[1], 'CREATE TABLE wiki_translation_index (keyword VARCHAR(200), field VARCHAR(50), position INTEGER, id INTEGER, lang CHAR(2), PRIMARY KEY(keyword, field, position, id, lang))');
+        $this->assertEqual($sql[2], 'CREATE TABLE wiki_translation (id INTEGER, title VARCHAR(255), content TEXT, lang CHAR(2), version INTEGER, slug VARCHAR(255), PRIMARY KEY(id, lang))');
+        $this->assertEqual($sql[3], 'CREATE TABLE wiki (id INTEGER PRIMARY KEY AUTOINCREMENT, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL)');
+
+        foreach ($sql as $query) {
+            $this->conn->exec($query);
+        }
+
+    }
+
+    public function testCreatingNewRecordsInvokesAllPlugins()
+    {
+        $wiki = new Wiki();
+        $wiki->state(Doctrine_Record::STATE_TDIRTY);
+        $wiki->save();
+
+        $fi = $wiki->Translation['FI'];
+        $fi->title = 'Michael Jeffrey Jordan';
+        $fi->content = "Michael Jeffrey Jordan (s. 17. helmikuuta 1963, Brooklyn, New York) on yhdysvaltalainen entinen NBA-koripalloilija, jota pidet��n yleisesti kaikkien aikojen parhaana pelaajana.";
+
+        $fi->save();
+        $this->assertEqual($fi->version, 1);
+
+        $fi->title = 'Micheal Jordan';
+        $fi->save();
+        
+        $this->assertEqual($fi->version, 2);
+    }
+
+    public function testSavingUnmodifiedRecordsDoesNotInvokeTimestampableListener()
+    {
+    	$this->conn->clear();
+
+        $wiki = Doctrine_Query::create()->from('Wiki w')->where('w.id = 1')->fetchOne();
+        
+        $wiki->save();
+
+        $this->assertEqual($wiki->Translation['FI']->version, 2);
+    }
+
+    public function testSearchableChildTemplate()
+    {
+    	  $this->conn->clear();
+
+        $wiki = new Wiki();
+        $wiki->state(Doctrine_Record::STATE_TDIRTY);
+        $wiki->save();
+        $fi = $wiki->Translation['FI'];
+        $fi->title = 'New Title';
+        $fi->content = "Sorry, I'm not able to write a Finish sentence about Michael Jordan...";
+
+        $fi->save();
+
+        $t = Doctrine_Core::getTable('WikiTranslationIndex');
+        $oQuery = new Doctrine_Search_Query($t);
+        $oQuery->query("jordan");
+        $out = $this->conn->fetchAll($oQuery->getSqlQuery(), $oQuery->getParams());
+
+        $this->assertEqual($out[0]['relevance'], 2);
+        $this->assertEqual($out[1]['relevance'], 1);
+        $this->assertEqual($out[0]['id'], 1);
+        $this->assertEqual($out[1]['id'], 2);
+    }
+
+    public function testSluggableChildTemplate()
+    {
+    	  $this->conn->clear();
+
+        $wiki = new Wiki();
+        $wiki->state(Doctrine_Record::STATE_TDIRTY);
+        $wiki->save();
+        $fi = $wiki->Translation['FI'];
+        $fi->title = 'This is the title';
+        $fi->content = "Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nulla sed.";
+
+        $fi->save();
+        $this->assertEqual($fi->slug, 'this-is-the-title');
+		}
+}
+
+class Wiki extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('title', 'string', 255);
+        $this->hasColumn('content', 'string');
+    }
+
+    public function setUp()
+    {
+        $options = array('fields' => array('title', 'content'));
+        $auditLog = new Doctrine_Template_Versionable($options);
+        $search = new Doctrine_Template_Searchable($options);
+        $slug = new Doctrine_Template_Sluggable(array('fields' => array('title'), 'indexName' => 'plugin_test_case_sluggable'));
+        $i18n = new Doctrine_Template_I18n($options);
+
+        $i18n->addChild($auditLog)
+             ->addChild($search)
+             ->addChild($slug);
+
+        $this->actAs($i18n);
+
+        $this->actAs('Timestampable');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/AggregateValueTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/AggregateValueTestCase.php
new file mode 100644
index 000000000..75c480322
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/AggregateValueTestCase.php
@@ -0,0 +1,229 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_AggregateValue_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_AggregateValue_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData() 
+    { 
+    }
+    public function testInitData() 
+    {
+        $users = new Doctrine_Collection('User');
+        
+        $users[0]->name = 'John';
+        $users[0]->Phonenumber[0]->phonenumber = '123 123';
+        $users[0]->Phonenumber[1]->phonenumber = '222 222';
+        $users[0]->Phonenumber[2]->phonenumber = '333 333';
+
+        $users[1]->name = 'John';
+        $users[2]->name = 'James';
+        $users[2]->Phonenumber[0]->phonenumber = '222 344';
+        $users[2]->Phonenumber[1]->phonenumber = '222 344';
+        $users[3]->name = 'James';
+        $users[3]->Phonenumber[0]->phonenumber = '123 123';
+
+        $users->save();
+    }
+
+    public function testRecordSupportsValueMapping()
+    {
+        $record = new User();
+
+        try {
+            $record->get('count');
+            $this->fail();
+        } catch(Doctrine_Exception $e) {
+            $this->pass();
+        }
+
+        $record->mapValue('count', 3);
+
+        try {
+            $i = $record->get('count');
+        } catch(Doctrine_Exception $e) {
+            $this->fail();
+        }
+        $this->assertEqual($i, 3);
+    }
+
+    public function testAggregateValueIsMappedToNewRecordOnEmptyResultSet()
+    {
+        $this->connection->clear();
+
+        $q = new Doctrine_Query();
+
+        $q->select('COUNT(u.id) count')->from('User u');
+        $this->assertEqual($q->getSqlQuery(), "SELECT COUNT(e.id) AS e__0 FROM entity e WHERE (e.type = 0)");
+
+        $users = $q->execute();
+
+        $this->assertEqual(count($users), 1);
+
+        $this->assertEqual($users[0]->state(), Doctrine_Record::STATE_TCLEAN);
+    }
+
+    public function testAggregateValueIsMappedToRecord()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('u.name, COUNT(u.id) count')->from('User u')->groupby('u.name');
+
+        $users = $q->execute();
+
+        $this->assertEqual($users->count(), 2);
+        
+        $this->assertEqual($users[0]->state(), Doctrine_Record::STATE_PROXY);
+        $this->assertEqual($users[1]->state(), Doctrine_Record::STATE_PROXY);
+        
+        $this->assertEqual($users[0]->count, 2);
+        $this->assertEqual($users[1]->count, 2);
+    }
+
+    public function testAggregateOrder()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('u.name, COUNT(u.id) count')->from('User u')->groupby('u.name')->orderby('count');
+
+        $users = $q->execute();
+
+        $this->assertEqual($users->count(), 2);
+        
+        $this->assertEqual($users[0]->state(), Doctrine_Record::STATE_PROXY);
+        $this->assertEqual($users[1]->state(), Doctrine_Record::STATE_PROXY);
+        
+        $this->assertEqual($users[0]->count, 2);
+        $this->assertEqual($users[1]->count, 2);
+    }
+
+    public function testAggregateValueMappingSupportsLeftJoins() 
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('u.name, COUNT(p.id) count')->from('User u')->leftJoin('u.Phonenumber p')->groupby('u.id');
+
+        $users = $q->execute();   
+
+        $this->assertEqual(count($users), 4);
+
+        $this->assertEqual($users[0]['count'], 3);
+        $this->assertEqual($users[1]['count'], 0);
+        $this->assertEqual($users[2]['count'], 2);
+        $this->assertEqual($users[3]['count'], 1);
+    }
+
+    public function testAggregateValueMappingSupportsLeftJoins2()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('MAX(u.name), u.*, p.*')->from('User u')->leftJoin('u.Phonenumber p')->groupby('u.id');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id, p.id AS p__id, p.phonenumber AS p__phonenumber, p.entity_id AS p__entity_id, MAX(e.name) AS e__0 FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.type = 0) GROUP BY e.id');
+        $users = $q->execute();
+
+        $this->assertEqual($users->count(), 4);
+    }
+
+    public function testAggregateValueMappingSupportsMultipleValues()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('u.name, COUNT(p.id) count, MAX(p.id) max')->from('User u')->innerJoin('u.Phonenumber p')->groupby('u.id');
+
+        $users = $q->execute();
+        $this->assertEqual($users[0]->max, 3);
+        $this->assertEqual($users[0]->count, 3);
+    }
+    
+    public function testAggregateValueMappingSupportsMultipleValues2()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('COUNT(u.id) count, MAX(p.id) max')->from('User u')->innerJoin('u.Phonenumber p')->groupby('u.id');
+
+        $users = $q->execute();
+
+        $this->assertEqual($users[0]['max'], 3);
+        $this->assertEqual($users[0]['count'], 3);
+    }
+    
+    public function testAggregateValueMappingSupportsInnerJoins()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('u.name, COUNT(p.id) count')->from('User u')->innerJoin('u.Phonenumber p')->groupby('u.id');
+
+        $users = $q->execute();
+
+        $this->assertEqual($users->count(), 3);
+
+        $this->assertEqual($users[0]->count, 3);
+        $this->assertEqual($users[1]->count, 2);
+        $this->assertEqual($users[2]->count, 1);
+    }
+    public function testAggregateFunctionParser()
+    {
+        $q = new Doctrine_Query();
+        $q->select('SUM(i.price)')->from('QueryTest_Item i');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT SUM(q.price) AS q__0 FROM query_test__item q');
+    }
+    public function testAggregateFunctionParser2()
+    {
+        $q = new Doctrine_Query();
+        $q->select('SUM(i.price * i.quantity)')->from('QueryTest_Item i');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT SUM(q.price * q.quantity) AS q__0 FROM query_test__item q');
+    }
+    public function testAggregateFunctionParser3()
+    {
+        $q = new Doctrine_Query();
+        $q->select('MOD(i.price, i.quantity)')->from('QueryTest_Item i');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT MOD(q.price, q.quantity) AS q__0 FROM query_test__item q');
+    }
+    public function testAggregateFunctionParser4()
+    {
+        $q = new Doctrine_Query();
+        $q->select('CONCAT(i.price, i.quantity)')->from('QueryTest_Item i');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT CONCAT(q.price, q.quantity) AS q__0 FROM query_test__item q');
+    }
+    public function testAggregateFunctionParsingSupportsMultipleComponentReferences()
+    {
+        $q = new Doctrine_Query();
+        $q->select('SUM(i.price * i.quantity)')
+          ->from('QueryTest_Item i');
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT SUM(q.price * q.quantity) AS q__0 FROM query_test__item q");
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/ApplyInheritanceTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/ApplyInheritanceTestCase.php
new file mode 100644
index 000000000..466464f21
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/ApplyInheritanceTestCase.php
@@ -0,0 +1,57 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_ApplyInheritance_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_ApplyInheritance_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData() 
+    {
+        
+    }
+    
+    public function prepareTables() 
+    {
+        $this->tables = array('InheritanceDeal', 'InheritanceEntityUser', 'InheritanceUser');
+        
+        parent::prepareTables();
+    }
+    
+    public function testApplyInheritance()
+    {
+        $query = new Doctrine_Query();
+        $query->from('InheritanceDeal d, d.Users u');
+        $query->where('u.id = 1');
+        
+        $sql = 'SELECT i.id AS i__id, i.name AS i__name, i2.id AS i2__id, i2.username AS i2__username FROM inheritance_deal i LEFT JOIN inheritance_entity_user i3 ON (i.id = i3.entity_id) AND i3.type = 1 LEFT JOIN inheritance_user i2 ON i2.id = i3.user_id WHERE (i2.id = 1)';
+        
+        $this->assertEqual($sql, $query->getSqlQuery());
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/CacheTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/CacheTestCase.php
new file mode 100644
index 000000000..cf45fe799
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/CacheTestCase.php
@@ -0,0 +1,258 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_Cache_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_Cache_TestCase extends Doctrine_UnitTestCase
+{
+
+    public function testQueryCacheAddsQueryIntoCache()
+    {
+        $cache = $this->_getCacheDriver();
+
+        $q = Doctrine_Query::create()
+            ->select('u.id, u.name, p.id')
+            ->from('User u')
+            ->leftJoin('u.Phonenumber p')
+            ->where('u.name = ?', 'walhala')
+            ->useQueryCache($cache);
+
+        $coll = $q->execute();
+
+        $this->assertTrue($cache->contains($q->calculateQueryCacheHash()));
+        $this->assertEqual(count($coll), 0);
+
+        $coll = $q->execute();
+
+        $this->assertTrue($cache->contains($q->calculateQueryCacheHash()));
+        $this->assertEqual(count($coll), 0);
+    }
+
+    public function testQueryCacheWorksWithGlobalConfiguration()
+    {
+        $cache = $this->_getCacheDriver();
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_QUERY_CACHE, $cache);
+
+        $q = Doctrine_Query::create()
+            ->select('u.id, u.name, p.id')
+            ->from('User u')
+            ->leftJoin('u.Phonenumber p');
+
+        $coll = $q->execute();
+
+        $this->assertTrue($cache->contains($q->calculateQueryCacheHash()));
+        $this->assertEqual(count($coll), 8);
+
+        $coll = $q->execute();
+
+        $this->assertTrue($cache->contains($q->calculateQueryCacheHash()));
+        $this->assertEqual(count($coll), 8);
+    }
+
+    public function testResultSetCacheAddsResultSetsIntoCache()
+    {
+        $q = new Doctrine_Query();
+
+        $cache = $this->_getCacheDriver();
+        $q->useResultCache($cache)->select('u.name')->from('User u');
+        $coll = $q->execute();
+
+        $this->assertTrue($cache->contains($q->calculateResultCacheHash()));
+        $this->assertEqual(count($coll), 8);
+
+        $coll = $q->execute();
+
+        $this->assertTrue($cache->contains($q->calculateResultCacheHash()));
+        $this->assertEqual(count($coll), 8);
+    }
+
+    public function testResultSetCacheSupportsQueriesWithJoins()
+    {
+        $q = new Doctrine_Query();
+
+        $cache = $this->_getCacheDriver();
+        $q->useResultCache($cache);
+        $q->select('u.name')->from('User u')->leftJoin('u.Phonenumber p');
+        $coll = $q->execute();
+
+        $this->assertTrue($cache->contains($q->calculateResultCacheHash()));
+        $this->assertEqual(count($coll), 8);
+
+        $coll = $q->execute();
+
+        $this->assertTrue($cache->contains($q->calculateResultCacheHash()));
+        $this->assertEqual(count($coll), 8);
+    }
+
+    public function testResultSetCacheSupportsPreparedStatements()
+    {
+        $q = new Doctrine_Query();
+
+        $cache = $this->_getCacheDriver();
+        $q->useResultCache($cache);
+        $q->select('u.name')->from('User u')->leftJoin('u.Phonenumber p')
+          ->where('u.id = ?');
+
+        $coll = $q->execute(array(5));
+
+        $this->assertTrue($coll instanceof Doctrine_Collection);
+        $this->assertEqual(5, $coll[0]->id);
+        $this->assertTrue($coll[0] instanceof Doctrine_Record);
+        $this->assertTrue($coll[0]->Phonenumber[0] instanceof Doctrine_Record);
+        $this->assertTrue($cache->contains($q->calculateResultCacheHash(array(5))));
+        $this->assertEqual(count($coll), 1);
+        $coll->free(true);
+
+        $coll = $q->execute(array(5));
+
+        $this->assertTrue($coll instanceof Doctrine_Collection);
+        $this->assertEqual(5, $coll[0]->id);
+        $this->assertTrue($coll[0] instanceof Doctrine_Record);
+        // references to related objects are not serialized/unserialized, so the following
+        // would trigger an additional query (lazy-load).
+        //echo $this->conn->count() . "<br/>";
+        //$this->assertTrue($coll[0]->Phonenumber[0] instanceof Doctrine_Record);
+        //echo $this->conn->count() . "<br/>"; // count is increased => lazy load
+        $this->assertTrue($cache->contains($q->calculateResultCacheHash(array(5))));
+        $this->assertEqual(count($coll), 1);
+    }
+
+    public function testUseCacheSupportsBooleanTrueAsParameter()
+    {
+        $q = new Doctrine_Query();
+
+        $cache = $this->_getCacheDriver();
+        $this->conn->setAttribute(Doctrine_Core::ATTR_CACHE, $cache);
+
+        $q->useResultCache(true);
+        $q->select('u.name')->from('User u')->leftJoin('u.Phonenumber p')
+          ->where('u.id = ?');
+
+        $coll = $q->execute(array(5));
+
+        $this->assertTrue($cache->contains($q->calculateResultCacheHash(array(5))));
+        $this->assertEqual(count($coll), 1);
+
+        $coll = $q->execute(array(5));
+
+        $this->assertTrue($cache->contains($q->calculateResultCacheHash(array(5))));
+        $this->assertEqual(count($coll), 1);
+
+        $this->conn->setAttribute(Doctrine_Core::ATTR_CACHE, null);
+    }
+
+    public function testResultCacheLifeSpan()
+    {
+        // initially NULL = not cached
+        $q = new Doctrine_Query();
+        $this->assertIdentical(null, $q->getResultCacheLifeSpan());
+        $q->free();
+
+        // 0 = cache forever
+        $this->manager->setAttribute(Doctrine_Core::ATTR_RESULT_CACHE_LIFESPAN, 0);
+        $q = new Doctrine_Query();
+        $this->assertIdentical(0, $q->getResultCacheLifeSpan());
+        $q->free();
+
+        $this->manager->setAttribute(Doctrine_Core::ATTR_RESULT_CACHE_LIFESPAN, 3600);
+        $q = new Doctrine_Query();
+        $this->assertIdentical(3600, $q->getResultCacheLifeSpan());
+        $q->free();
+
+        // test that value set on connection level has precedence
+        $this->conn->setAttribute(Doctrine_Core::ATTR_RESULT_CACHE_LIFESPAN, 42);
+        $q = new Doctrine_Query();
+        $this->assertIdentical(42, $q->getResultCacheLifeSpan());
+        $q->free();
+
+        // test that value set on the query has highest precedence
+        $q = new Doctrine_Query();
+        $q->useResultCache(true, 1234);
+        $this->assertIdentical(1234, $q->getResultCacheLifeSpan());
+        $q->setResultCacheLifeSPan(4321);
+        $this->assertIdentical(4321, $q->getResultCacheLifeSpan());
+        $q->free();
+    }
+
+    public function testQueryCacheLifeSpan()
+    {
+        // initially NULL = not cached
+        $q = new Doctrine_Query();
+        $this->assertIdentical(null, $q->getQueryCacheLifeSpan());
+        $q->free();
+
+        // 0 = forever
+        $this->manager->setAttribute(Doctrine_Core::ATTR_QUERY_CACHE_LIFESPAN, 0);
+        $q = new Doctrine_Query();
+        $this->assertIdentical(0, $q->getQueryCacheLifeSpan());
+        $q->free();
+
+        $this->manager->setAttribute(Doctrine_Core::ATTR_QUERY_CACHE_LIFESPAN, 3600);
+        $q = new Doctrine_Query();
+        $this->assertIdentical(3600, $q->getQueryCacheLifeSpan());
+        $q->free();
+
+        // test that value set on connection level has precedence
+        $this->conn->setAttribute(Doctrine_Core::ATTR_QUERY_CACHE_LIFESPAN, 42);
+        $q = new Doctrine_Query();
+        $this->assertIdentical(42, $q->getQueryCacheLifeSpan());
+        $q->free();
+
+        // test that value set on the query has highest precedence
+        $q = new Doctrine_Query();
+        $q->setQueryCacheLifeSpan(4321);
+        $this->assertIdentical(4321, $q->getQueryCacheLifeSpan());
+        $q->free();
+    }
+
+    public function testQueryCacheCanBeDisabledForSingleQuery()
+    {
+        $cache = $this->_getCacheDriver();
+        $q = new Doctrine_Query();
+        $q->select('u.name')->from('User u')->leftJoin('u.Phonenumber p')->where('u.name = ?', 'walhala')
+                ->useQueryCache(false);
+
+        $coll = $q->execute();
+
+        $this->assertFalse($cache->contains($q->calculateQueryCacheHash()));
+        $this->assertEqual(count($coll), 0);
+
+        $coll = $q->execute();
+
+        $this->assertFalse($cache->contains($q->calculateQueryCacheHash()));
+        $this->assertEqual(count($coll), 0);
+    }
+    
+    protected function _getCacheDriver()
+    {
+        return new Doctrine_Cache_Array();
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/CheckTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/CheckTestCase.php
new file mode 100644
index 000000000..57078f44b
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/CheckTestCase.php
@@ -0,0 +1,69 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_Check_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_Check_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData()
+    { }
+    public function prepareTables()
+    { }
+    public function testCheckParserSupportsStandardFunctions()
+    {
+        $q = new Doctrine_Query_Check('User');
+        
+        $q->parse('LENGTH(name) > 6');
+        
+        $this->assertEqual($q->getSql(), 'LENGTH(name) > 6');
+    }
+    public function testCheckParserThrowsExceptionForUnknownOperator()
+    {
+        $q = new Doctrine_Query_Check('User');
+        
+        try {
+            $q->parse('LENGTH(name) ? 6');
+            $this->fail();
+        } catch(Doctrine_Query_Exception $e) {
+            $this->pass();
+        }
+    }
+    public function testCheckParserThrowsExceptionForUnknownFunction()
+    {
+        $q = new Doctrine_Query_Check('User');
+        
+        try {
+            $q->parse('SomeUnknownFunction(name) = 6');
+            $this->fail();
+        } catch(Doctrine_Exception $e) {
+            $this->pass();
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/ComponentAliasTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/ComponentAliasTestCase.php
new file mode 100644
index 000000000..1ea65effb
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/ComponentAliasTestCase.php
@@ -0,0 +1,123 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_ComponentAlias_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_ComponentAlias_TestCase extends Doctrine_UnitTestCase
+{
+
+    public function testQueryWithSingleAlias()
+    {
+        $this->connection->clear();
+        $q = new Doctrine_Query();
+
+        $q->from('User u, u.Phonenumber');
+
+        $users = $q->execute();
+
+        $count = count($this->conn);
+
+        $this->assertEqual($users->count(), 8);
+        $this->assertTrue($users[0]->Phonenumber instanceof Doctrine_Collection);
+        $this->assertEqual($q->getSqlQuery(),
+        "SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id, p.id AS p__id, p.phonenumber AS p__phonenumber, p.entity_id AS p__entity_id FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.type = 0)");
+        $this->assertEqual($count, count($this->conn));
+    }
+
+    public function testQueryWithNestedAliases()
+    {
+        $this->connection->clear();
+        $q = new Doctrine_Query();
+
+        $q->from('User u, u.Group g, g.Phonenumber');
+
+        $users = $q->execute();
+
+        $count = count($this->conn);
+
+        $this->assertEqual($users->count(), 8);
+        $this->assertTrue($users[0]->Phonenumber instanceof Doctrine_Collection);
+        $this->assertEqual($q->getSqlQuery(),
+        "SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id, e2.id AS e2__id, e2.name AS e2__name, e2.loginname AS e2__loginname, e2.password AS e2__password, e2.type AS e2__type, e2.created AS e2__created, e2.updated AS e2__updated, e2.email_id AS e2__email_id, p.id AS p__id, p.phonenumber AS p__phonenumber, p.entity_id AS p__entity_id FROM entity e LEFT JOIN groupuser g ON (e.id = g.user_id) LEFT JOIN entity e2 ON e2.id = g.group_id AND e2.type = 1 LEFT JOIN phonenumber p ON e2.id = p.entity_id WHERE (e.type = 0)");
+        $this->assertEqual(($count + 1), count($this->conn));
+    }
+    public function testQueryWithNestedAliasesAndArrayFetching()
+    {
+        $this->connection->clear();
+        $q = new Doctrine_Query();
+
+        $q->from('User u, u.Group g, g.Phonenumber');
+
+        $users = $q->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+        $count = count($this->conn);
+
+        $this->assertEqual(count($users), 8);
+        $this->assertEqual(count($users[7]['Group']), 0);
+        $this->assertEqual(count($users[1]['Group']), 1);
+    }
+
+    public function testQueryWithMultipleNestedAliases()
+    {
+        $this->connection->clear();
+        $q = new Doctrine_Query();
+
+        $q->from('User u, u.Phonenumber, u.Group g, g.Phonenumber')->where('u.id IN (5,6)');
+
+        $users = $q->execute();
+
+        $count = count($this->conn);
+
+
+        $this->assertTrue($users[0]->Phonenumber instanceof Doctrine_Collection); 
+        $this->assertEqual($q->getSqlQuery(),
+        "SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id, p.id AS p__id, p.phonenumber AS p__phonenumber, p.entity_id AS p__entity_id, e2.id AS e2__id, e2.name AS e2__name, e2.loginname AS e2__loginname, e2.password AS e2__password, e2.type AS e2__type, e2.created AS e2__created, e2.updated AS e2__updated, e2.email_id AS e2__email_id, p2.id AS p2__id, p2.phonenumber AS p2__phonenumber, p2.entity_id AS p2__entity_id FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id LEFT JOIN groupuser g ON (e.id = g.user_id) LEFT JOIN entity e2 ON e2.id = g.group_id AND e2.type = 1 LEFT JOIN phonenumber p2 ON e2.id = p2.entity_id WHERE (e.id IN (5, 6) AND (e.type = 0))");
+        $this->assertEqual(count($users), 2);
+        $this->assertEqual(count($users[0]['Group']), 1);
+        $this->assertEqual(count($users[0]['Group'][0]['Phonenumber']), 1);
+        $this->assertEqual(count($users[1]['Group']), 0);
+        
+        $this->assertEqual($count, count($this->conn));
+    }
+
+    public function testQueryWithMultipleNestedAliasesAndArrayFetching()
+    {
+        $q = new Doctrine_Query();
+        $q->from('User u, u.Phonenumber, u.Group g, g.Phonenumber')->where('u.id IN (5,6)');
+
+        $users = $q->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+        $this->assertEqual(count($users), 2);
+        $this->assertEqual(count($users[0]['Group']), 1);
+        $this->assertEqual(count($users[0]['Group'][0]['Phonenumber']), 1);
+        $this->assertEqual(count($users[1]['Group']), 0);
+    }
+
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/ConditionTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/ConditionTestCase.php
new file mode 100644
index 000000000..b4933996c
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/ConditionTestCase.php
@@ -0,0 +1,119 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_Condition_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_Condition_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData() { }
+    public function prepareTables() { }
+    
+    /** @todo belongs in TokenizerTestCase? */
+    public function testBracktExplode() 
+    {
+        $tokenizer = new Doctrine_Query_Tokenizer();
+        $str   = "item OR item OR item";
+        $parts = $tokenizer->bracketExplode($str, array(' OR '), "(", ")");
+
+        $this->assertEqual($parts, array('item','item','item'));
+
+    }
+    public function testConditionParser() 
+    {
+        $query = new Doctrine_Query($this->connection);
+
+        $query->select('User.id')->from("User")->where("User.name LIKE 'z%' OR User.name LIKE 's%'");
+
+        $sql = "SELECT e.id AS e__id FROM entity e WHERE (e.name LIKE 'z%' OR e.name LIKE 's%') AND (e.type = 0)";
+        $this->assertEqual($query->getSqlQuery(), $sql);
+
+        $query->where("(User.name LIKE 'z%') OR (User.name LIKE 's%')");
+        $this->assertEqual($query->getSqlQuery(), $sql);
+
+        $query->where("((User.name LIKE 'z%') OR (User.name LIKE 's%'))");
+        $this->assertEqual($query->getSqlQuery(), $sql);
+
+        $query->where("(((User.name LIKE 'z%') OR (User.name LIKE 's%')))");
+        $this->assertEqual($query->getSqlQuery(), $sql);
+
+        $query->where("(((User.name LIKE 'z%') OR User.name LIKE 's%'))");
+        $this->assertEqual($query->getSqlQuery(), $sql);
+
+        $query->where("(User.name LIKE 'z%') OR User.name LIKE 's%' AND User.name LIKE 'a%'");
+
+        $this->assertEqual($query->getSqlQuery(), "SELECT e.id AS e__id FROM entity e WHERE (e.name LIKE 'z%' OR (e.name LIKE 's%' AND e.name LIKE 'a%')) AND (e.type = 0)");
+
+        $query->where("(((User.name LIKE 'z%') OR User.name LIKE 's%')) AND User.name LIKE 'a%'");
+        $this->assertEqual($query->getSqlQuery(), "SELECT e.id AS e__id FROM entity e WHERE ((e.name LIKE 'z%' OR e.name LIKE 's%') AND e.name LIKE 'a%') AND (e.type = 0)");
+
+        $query->where("((((User.name LIKE 'z%') OR User.name LIKE 's%')) AND User.name LIKE 'a%')");
+        $this->assertEqual($query->getSqlQuery(), "SELECT e.id AS e__id FROM entity e WHERE ((e.name LIKE 'z%' OR e.name LIKE 's%') AND e.name LIKE 'a%') AND (e.type = 0)");
+
+        $query->where("(((((User.name LIKE 'z%') OR User.name LIKE 's%')) AND User.name LIKE 'a%'))");
+        $this->assertEqual($query->getSqlQuery(), "SELECT e.id AS e__id FROM entity e WHERE ((e.name LIKE 'z%' OR e.name LIKE 's%') AND e.name LIKE 'a%') AND (e.type = 0)");
+    }
+
+    public function testConditionParser2() 
+    {
+        $query = new Doctrine_Query($this->connection);
+
+        $query->select('User.id')->from("User")->where("User.name LIKE 'z%' OR User.name LIKE 's%'");
+
+        $sql = "SELECT e.id AS e__id FROM entity e WHERE (e.name LIKE 'z%' OR e.name LIKE 's%') AND (e.type = 0)";
+        $this->assertEqual($query->getSqlQuery(), $sql);
+
+        $query->where("(User.name LIKE 'z%') OR (User.name LIKE 's%')");
+        $this->assertEqual($query->getSqlQuery(), $sql);
+
+        $query->where("((User.name LIKE 'z%') OR (User.name LIKE 's%'))");
+        $this->assertEqual($query->getSqlQuery(), $sql);
+
+        $query->where("(((User.name LIKE 'z%') OR (User.name LIKE 's%')))");
+        $this->assertEqual($query->getSqlQuery(), $sql);
+
+        $query->where("(((User.name LIKE 'z%') OR User.name LIKE 's%'))");
+        $this->assertEqual($query->getSqlQuery(), $sql);
+
+        $query->where("(User.name LIKE 'z%') OR User.name LIKE 's%' AND User.name LIKE 'a%'");
+
+        $sql = "SELECT e.id AS e__id FROM entity e WHERE ((e.name LIKE 'z%' OR e.name LIKE 's%') AND e.name LIKE 'a%') AND (e.type = 0)";
+
+        $this->assertEqual($query->getSqlQuery(), "SELECT e.id AS e__id FROM entity e WHERE (e.name LIKE 'z%' OR (e.name LIKE 's%' AND e.name LIKE 'a%')) AND (e.type = 0)");
+
+        $query->where("(((User.name LIKE 'z%') OR User.name LIKE 's%')) AND User.name LIKE 'a%'");
+        $this->assertEqual($query->getSqlQuery(), $sql);
+
+        $query->where("((((User.name LIKE 'z%') OR User.name LIKE 's%')) AND User.name LIKE 'a%')");
+        $this->assertEqual($query->getSqlQuery(), $sql);
+
+        $query->where("(((((User.name LIKE 'z%') OR User.name LIKE 's%')) AND User.name LIKE 'a%'))");
+        $this->assertEqual($query->getSqlQuery(), $sql);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/CopyTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/CopyTestCase.php
new file mode 100644
index 000000000..cc9137122
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/CopyTestCase.php
@@ -0,0 +1,47 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_Copy_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_Copy_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testQueryCopy()
+    {
+        $q = new Doctrine_Query();
+
+        $q->from('User u');
+        
+        $q2 = $q->copy();
+        
+        $this->assertEqual($q->getSqlQuery(), $q2->getSqlQuery());
+
+	    $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id FROM entity e WHERE (e.type = 0)');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/DeleteTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/DeleteTestCase.php
new file mode 100644
index 000000000..b7e268487
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/DeleteTestCase.php
@@ -0,0 +1,137 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_Delete_TestCase
+ * This test case is used for testing DQL DELETE queries
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_Delete_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'DeleteTestModel';
+        parent::prepareTables();
+    }
+
+    public function testDeleteAllWithColumnAggregationInheritance() 
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery('DELETE FROM User');
+
+        $this->assertEqual($q->getSqlQuery(), 'DELETE FROM entity WHERE (type = 0)');
+
+        $q = new Doctrine_Query();
+
+        $q->delete()->from('User');
+        
+        $this->assertEqual($q->getSqlQuery(), 'DELETE FROM entity WHERE (type = 0)');
+    }
+
+    public function testDeleteAll() 
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery('DELETE FROM Entity');
+
+        $this->assertEqual($q->getSqlQuery(), 'DELETE FROM entity');
+        
+        $q = new Doctrine_Query();
+
+        $q->delete()->from('Entity');
+        
+        $this->assertEqual($q->getSqlQuery(), 'DELETE FROM entity');
+    }
+
+    public function testDeleteWithCondition() 
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery('DELETE FROM Entity WHERE id = 3');
+
+        $this->assertEqual($q->getSqlQuery(), 'DELETE FROM entity WHERE (id = 3)');
+        
+        $q = new Doctrine_Query();
+
+        $q->delete()->from('Entity')->where('id = 3');
+        
+        $this->assertEqual($q->getSqlQuery(), 'DELETE FROM entity WHERE (id = 3)');
+    }
+
+    public function testDeleteWithLimit() 
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery('DELETE FROM Entity LIMIT 20');
+
+        $this->assertEqual($q->getSqlQuery(), 'DELETE FROM entity LIMIT 20');
+        
+        $q = new Doctrine_Query();
+
+        $q->delete()->from('Entity')->limit(20);
+        
+        $this->assertEqual($q->getSqlQuery(), 'DELETE FROM entity LIMIT 20');
+    }
+
+    public function testDeleteWithLimitAndOffset() 
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery('DELETE FROM Entity LIMIT 10 OFFSET 20');
+
+        $this->assertEqual($q->getSqlQuery(), 'DELETE FROM entity LIMIT 10 OFFSET 20');
+
+        $q = new Doctrine_Query();
+
+        $q->delete()->from('Entity')->limit(10)->offset(20);
+        
+        $this->assertEqual($q->getSqlQuery(), 'DELETE FROM entity LIMIT 10 OFFSET 20');
+    }
+
+    public function testDeleteWithFromInDeleteFunction()
+    {
+        $q = Doctrine_Core::getTable('Entity')->createQuery()->delete();
+        $this->assertEqual($q->getDql(), 'DELETE FROM Entity');
+        $q = Doctrine_Query::create()->delete('Entity');
+        $this->assertEqual($q->getDql(), 'DELETE FROM Entity');
+
+        $q = Doctrine_Core::getTable('DeleteTestModel')->createQuery()->delete('DeleteTestModel');
+        $this->assertEqual($q->getDql(), 'DELETE FROM DeleteTestModel');
+        $this->assertEqual($q->getSqlQuery(), 'DELETE FROM delete_test_model');
+        $q->execute();
+    }
+}
+
+class DeleteTestModel extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/DriverTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/DriverTestCase.php
new file mode 100644
index 000000000..b16ba7946
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/DriverTestCase.php
@@ -0,0 +1,173 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_Driver_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_Driver_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData()
+    { }
+    public function prepareTables()
+    { }
+
+    public function testLimitQueriesForPgsql()
+    {
+        $this->dbh = new Doctrine_Adapter_Mock('pgsql');
+
+        $conn = $this->manager->openConnection($this->dbh);
+
+        $q = new Doctrine_Query($conn);
+    
+        $q->from('User u')->limit(5);
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id FROM entity e WHERE (e.type = 0) LIMIT 5');
+    }
+
+    public function testLimitQueriesForSqlite()
+    {
+        $this->dbh = new Doctrine_Adapter_Mock('sqlite');
+
+        $conn = $this->manager->openConnection($this->dbh);
+
+        $q = new Doctrine_Query($conn);
+    
+        $q->from('User u')->limit(5);
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id FROM entity e WHERE (e.type = 0) LIMIT 5');
+    }
+    
+    public function testLimitQueriesForMysql()
+    {
+        $this->dbh = new Doctrine_Adapter_Mock('mysql');
+
+        $conn = $this->manager->openConnection($this->dbh);
+
+        $q = new Doctrine_Query($conn);
+    
+        $q->from('User u')->limit(5);
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id FROM entity e WHERE (e.type = 0) LIMIT 5');
+    }
+
+    public function testLimitQueriesForOracle()
+    {
+        $this->dbh = new Doctrine_Adapter_Mock('oracle');
+
+        $conn = $this->manager->openConnection($this->dbh);
+
+        $q = new Doctrine_Query($conn);
+
+        $q->from('User u')->limit(5);
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT a.* FROM ( SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id FROM entity e WHERE (e.type = 0) ) a WHERE ROWNUM <= 5');
+    }
+
+    public function testLimitOffsetQueriesForOracle()
+    {
+        $this->dbh = new Doctrine_Adapter_Mock('oracle');
+
+        $conn = $this->manager->openConnection($this->dbh);
+
+        $q = new Doctrine_Query($conn);
+
+        $q->from('User u')->limit(5)->offset(2);
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT b.* FROM ( SELECT a.*, ROWNUM AS doctrine_rownum FROM ( SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id FROM entity e WHERE (e.type = 0) ) a  ) b WHERE doctrine_rownum BETWEEN 3 AND 7');
+    }
+    
+    public function testLimitOffsetLimitSubqueriesForOracle()
+    {
+        $this->dbh = new Doctrine_Adapter_Mock('oracle');
+        $conn = $this->manager->openConnection($this->dbh);
+        $q = new Doctrine_Query($conn);
+        $q->from('User u')->innerJoin('u.Phonenumber p')->limit(5)->offset(2);
+        
+        $correctSql = "SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, "
+                            . "e.password AS e__password, e.type AS e__type, e.created AS e__created, "
+                            . "e.updated AS e__updated, e.email_id AS e__email_id, p.id AS p__id, "
+                            . "p.phonenumber AS p__phonenumber, p.entity_id AS p__entity_id "
+                    . "FROM entity e "
+                    . "INNER JOIN phonenumber p ON e.id = p.entity_id "
+                    . "WHERE e.id IN ("
+                        . "SELECT b.id FROM ( "
+                            . "SELECT a.*, ROWNUM AS doctrine_rownum "
+                            . "FROM ( "
+                                . "SELECT DISTINCT e2.id "
+                                . "FROM entity e2 "
+                                . "INNER JOIN phonenumber p2 ON e2.id = p2.entity_id "
+                                . "WHERE (e2.type = 0) "
+                            . ") a "
+                        . " ) b "
+                        . "WHERE doctrine_rownum BETWEEN 3 AND 7"
+                    . ") AND (e.type = 0)";
+        
+        $this->assertEqual($q->getSqlQuery(), $correctSql);
+    }
+    
+ /**
+ * Ticket #1038
+  */
+    public function testLimitOffsetLimitSubqueriesForOracleWithGroupByOrderBy()
+    {
+        $this->dbh = new Doctrine_Adapter_Mock('oracle');
+        $conn = $this->manager->openConnection($this->dbh);
+        $q = new Doctrine_Query($conn);
+        // The orderBy(p.id) will force p.id to be added to the SELECT part of the 
+        // SELECT DISTINCT subquery because that is required by oracle. This, however,
+        // can result in duplicated primary keys that would cause incorrect ROWNUM calculations,
+        // hence an additional subquery used to filter out the primary keys is added. 
+        $q->from('User u')->innerJoin('u.Phonenumber p')
+                ->groupBy('u.name') // !
+                ->orderBy('p.id') // !!
+                ->limit(5)->offset(2);
+        $correctSql = "SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, "
+                    . "e.password AS e__password, e.type AS e__type, e.created AS e__created, "
+                    . "e.updated AS e__updated, e.email_id AS e__email_id, p.id AS p__id, "
+                    . "p.phonenumber AS p__phonenumber, p.entity_id AS p__entity_id "
+                    . "FROM entity e "
+                    . "INNER JOIN phonenumber p ON e.id = p.entity_id "
+                    . "WHERE e.id IN ("
+                        . "SELECT b.id FROM ( "
+                            . "SELECT a.*, ROWNUM AS doctrine_rownum "
+                                  . "FROM ( "
+                                      . "SELECT doctrine_subquery_alias.id FROM ("
+                                          . "SELECT e2.id, p2.id "
+                                          . "FROM entity e2 "
+                                          . "INNER JOIN phonenumber p2 ON e2.id = p2.entity_id "
+                                          . "WHERE (e2.type = 0) GROUP BY e2.name ORDER BY p2.id"
+                                      . ") doctrine_subquery_alias GROUP BY doctrine_subquery_alias.id ORDER BY MIN(ROWNUM) "
+                                  . ") a "
+                              . " ) b "
+                              . "WHERE doctrine_rownum BETWEEN 3 AND 7"
+                          . ") AND (e.type = 0) GROUP BY e.name ORDER BY p.id";
+                         
+              $this->assertEqual($q->getSqlQuery(), $correctSql);
+          }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/ExpressionTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/ExpressionTestCase.php
new file mode 100644
index 000000000..ed4066ff5
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/ExpressionTestCase.php
@@ -0,0 +1,139 @@
+<?php
+/* 
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_Expression_TestCase
+ *
+ * @package     Doctrine
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @version     $Revision$
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ */
+class Doctrine_Query_Expression_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testUnknownExpressionInSelectClauseThrowsException()
+    {
+        // Activate portability all
+        $this->conn->setAttribute(Doctrine_Core::ATTR_PORTABILITY, Doctrine_Core::PORTABILITY_ALL);
+
+        try {
+            $q = Doctrine_Query::create()
+                ->parseDqlQuery("SELECT SOMEUNKNOWNFUNC(u.name, ' ', u.loginname) FROM User u");
+
+            $sql = $q->getSqlQuery();
+
+            $this->fail('SOMEUNKNOWNFUNC() should throw an Exception, but actually it passed and generated the SQL: ' . $sql);
+        } catch(Doctrine_Query_Exception $e) {
+            $this->pass();
+        }
+
+        // Reassign old portability mode
+        $this->conn->setAttribute(Doctrine_Core::ATTR_PORTABILITY, Doctrine_Core::PORTABILITY_ALL);
+    }
+
+
+    public function testUnknownExpressionInSelectClauseDoesntThrowException()
+    {
+        // Deactivate portability expression mode
+        $this->conn->setAttribute(Doctrine_Core::ATTR_PORTABILITY, Doctrine_Core::PORTABILITY_ALL ^ Doctrine_Core::PORTABILITY_EXPR);
+
+        try {
+            $q = Doctrine_Query::create()
+                ->parseDqlQuery("SELECT SOMEUNKNOWNFUNC(u.name, ' ', u.loginname) FROM User u");
+
+            $sql = $q->getSqlQuery();
+
+            $this->pass();
+        } catch(Doctrine_Query_Exception $e) {
+            $this->fail('SOMEUNKNOWNFUNC() should pass, but actually it fail with message: ' . $e->getMessage());
+        }
+
+        // Reassign old portability mode
+        $this->conn->setAttribute(Doctrine_Core::ATTR_PORTABILITY, Doctrine_Core::PORTABILITY_ALL);
+    }
+
+    public function testUnknownColumnWithinFunctionInSelectClauseThrowsException()
+    {
+        $q = new Doctrine_Query();
+
+        try {
+            $q->parseDqlQuery('SELECT CONCAT(u.name, u.unknown) FROM User u');
+
+            $q->execute();
+            $this->fail();
+        } catch(Doctrine_Query_Exception $e) {
+            $this->pass();
+        }
+    }
+
+    public function testConcatIsSupportedInSelectClause()
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery('SELECT u.id, CONCAT(u.name, u.loginname) FROM User u');
+        
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, CONCAT(e.name, e.loginname) AS e__0 FROM entity e WHERE (e.type = 0)');
+    }
+
+    public function testConcatInSelectClauseSupportsLiteralStrings() 
+    {
+        $q = new Doctrine_Query();
+        
+        $q->parseDqlQuery("SELECT u.id, CONCAT(u.name, 'The Man') FROM User u");
+        
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, CONCAT(e.name, 'The Man') AS e__0 FROM entity e WHERE (e.type = 0)");
+    }
+
+    public function testConcatInSelectClauseSupportsMoreThanTwoArgs() 
+    {
+        $q = new Doctrine_Query();
+        
+        $q->parseDqlQuery("SELECT u.id, CONCAT(u.name, 'The Man', u.loginname) FROM User u");
+        
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, CONCAT(e.name, 'The Man', e.loginname) AS e__0 FROM entity e WHERE (e.type = 0)");
+    }
+
+    public function testNonPortableFunctionsAreSupported()
+    {
+         $query = new Doctrine_Query();
+         // we are using stored procedure here, so adjust portability settings
+         $this->conn->setAttribute(Doctrine_Core::ATTR_PORTABILITY, Doctrine_Core::PORTABILITY_ALL ^ Doctrine_Core::PORTABILITY_EXPR);
+
+         $lat = '13.23';
+         $lon = '33.23';
+         $radius = '33';
+
+         $query->select("l.*, i18n.*, GeoDistKM(l.lat, l.lon, $lat, $lon) distance")
+              ->from('Location l, l.LocationI18n i18n')          
+              ->where('l.id <> ? AND i18n.culture = ?', array(1, 'en'))
+              ->having("distance < $radius")
+              ->orderby('distance ASC')
+              ->groupby('l.id')
+              ->limit(5);
+
+         $this->assertEqual($query->getSqlQuery(), "SELECT l.id AS l__id, l.lat AS l__lat, l.lon AS l__lon, l2.name AS l2__name, l2.id AS l2__id, l2.culture AS l2__culture, GeoDistKM(l.lat, l.lon, 13.23, 33.23) AS l__0 FROM location l LEFT JOIN location_i18n l2 ON l.id = l2.id WHERE l.id IN (SELECT DISTINCT l3.id FROM location l3 LEFT JOIN location_i18n l4 ON l3.id = l4.id WHERE (l3.id <> ? AND l4.culture = ?) GROUP BY l3.id HAVING GeoDistKM(l3.lat, l3.lon, 13.23, 33.23) < 33 ORDER BY GeoDistKM(l3.lat, l3.lon, 13.23, 33.23) LIMIT 5) AND (l.id <> ? AND l2.culture = ?) GROUP BY l.id HAVING l__0 < 33 ORDER BY l__0 ASC");
+
+         $this->conn->setAttribute(Doctrine_Core::ATTR_PORTABILITY, Doctrine_Core::PORTABILITY_ALL);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/FromTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/FromTestCase.php
new file mode 100644
index 000000000..8f793c397
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/FromTestCase.php
@@ -0,0 +1,119 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_From_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_From_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData()
+    { }
+
+    public function testCount()
+    {
+        $count = Doctrine_Query::create()->from('User')->count();
+    
+        $this->assertEqual($count, 0);
+    }
+    public function testLeftJoin()
+    {
+        $q = new Doctrine_Query();
+
+        $q->from('User u LEFT JOIN u.Group');
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id, e2.id AS e2__id, e2.name AS e2__name, e2.loginname AS e2__loginname, e2.password AS e2__password, e2.type AS e2__type, e2.created AS e2__created, e2.updated AS e2__updated, e2.email_id AS e2__email_id FROM entity e LEFT JOIN groupuser g ON (e.id = g.user_id) LEFT JOIN entity e2 ON e2.id = g.group_id AND e2.type = 1 WHERE (e.type = 0)");
+    }
+
+    public function testDefaultJoinIsLeftJoin()
+    {
+        $q = new Doctrine_Query();
+
+        $q->from('User u JOIN u.Group');
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id, e2.id AS e2__id, e2.name AS e2__name, e2.loginname AS e2__loginname, e2.password AS e2__password, e2.type AS e2__type, e2.created AS e2__created, e2.updated AS e2__updated, e2.email_id AS e2__email_id FROM entity e LEFT JOIN groupuser g ON (e.id = g.user_id) LEFT JOIN entity e2 ON e2.id = g.group_id AND e2.type = 1 WHERE (e.type = 0)");
+    }
+
+    public function testInnerJoin()
+    {
+        $q = new Doctrine_Query();
+
+        $q->from('User u INNER JOIN u.Group');
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id, e2.id AS e2__id, e2.name AS e2__name, e2.loginname AS e2__loginname, e2.password AS e2__password, e2.type AS e2__type, e2.created AS e2__created, e2.updated AS e2__updated, e2.email_id AS e2__email_id FROM entity e INNER JOIN groupuser g ON (e.id = g.user_id) INNER JOIN entity e2 ON e2.id = g.group_id AND e2.type = 1 WHERE (e.type = 0)");
+    }
+
+    public function testMultipleLeftJoin() 
+    {
+        $q = new Doctrine_Query();
+
+        $q->from('User u LEFT JOIN u.Group LEFT JOIN u.Phonenumber');
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id, e2.id AS e2__id, e2.name AS e2__name, e2.loginname AS e2__loginname, e2.password AS e2__password, e2.type AS e2__type, e2.created AS e2__created, e2.updated AS e2__updated, e2.email_id AS e2__email_id, p.id AS p__id, p.phonenumber AS p__phonenumber, p.entity_id AS p__entity_id FROM entity e LEFT JOIN groupuser g ON (e.id = g.user_id) LEFT JOIN entity e2 ON e2.id = g.group_id AND e2.type = 1 LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.type = 0)");
+    }
+    public function testMultipleLeftJoin2() 
+    {
+        $q = new Doctrine_Query();
+
+        $q->from('User u LEFT JOIN u.Group LEFT JOIN u.Phonenumber');
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id, e2.id AS e2__id, e2.name AS e2__name, e2.loginname AS e2__loginname, e2.password AS e2__password, e2.type AS e2__type, e2.created AS e2__created, e2.updated AS e2__updated, e2.email_id AS e2__email_id, p.id AS p__id, p.phonenumber AS p__phonenumber, p.entity_id AS p__entity_id FROM entity e LEFT JOIN groupuser g ON (e.id = g.user_id) LEFT JOIN entity e2 ON e2.id = g.group_id AND e2.type = 1 LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.type = 0)");
+    }
+    public function testMultipleInnerJoin() 
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('u.name')->from('User u INNER JOIN u.Group INNER JOIN u.Phonenumber');
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e.name AS e__name FROM entity e INNER JOIN groupuser g ON (e.id = g.user_id) INNER JOIN entity e2 ON e2.id = g.group_id AND e2.type = 1 INNER JOIN phonenumber p ON e.id = p.entity_id WHERE (e.type = 0)");
+    }
+    public function testMultipleInnerJoin2() 
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('u.name')->from('User u INNER JOIN u.Group, u.Phonenumber');
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e.name AS e__name FROM entity e INNER JOIN groupuser g ON (e.id = g.user_id) INNER JOIN entity e2 ON e2.id = g.group_id AND e2.type = 1 INNER JOIN phonenumber p ON e.id = p.entity_id WHERE (e.type = 0)");
+    }
+    public function testMixingOfJoins() 
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('u.name, g.name, p.phonenumber')->from('User u INNER JOIN u.Group g LEFT JOIN u.Phonenumber p');
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e.name AS e__name, e2.id AS e2__id, e2.name AS e2__name, p.id AS p__id, p.phonenumber AS p__phonenumber FROM entity e INNER JOIN groupuser g ON (e.id = g.user_id) INNER JOIN entity e2 ON e2.id = g.group_id AND e2.type = 1 LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.type = 0)");
+    } 
+    public function testMixingOfJoins2()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('u.name, g.name, p.phonenumber')->from('User u INNER JOIN u.Group g LEFT JOIN g.Phonenumber p');
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e.name AS e__name, e2.id AS e2__id, e2.name AS e2__name, p.id AS p__id, p.phonenumber AS p__phonenumber FROM entity e INNER JOIN groupuser g ON (e.id = g.user_id) INNER JOIN entity e2 ON e2.id = g.group_id AND e2.type = 1 LEFT JOIN phonenumber p ON e2.id = p.entity_id WHERE (e.type = 0)");
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/GroupbyTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/GroupbyTestCase.php
new file mode 100644
index 000000000..c25c8cb0a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/GroupbyTestCase.php
@@ -0,0 +1,43 @@
+<?php
+/* 
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_Groupby_TestCase
+ *
+ * @package     Doctrine
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @version     $Revision$
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ */
+class Doctrine_Query_Groupby_TestCase extends Doctrine_UnitTestCase
+{
+    public function testAggregateFunctionsInHavingReturnValidSql() 
+    {
+        $q = new Doctrine_Query();
+        
+        $q->parseDqlQuery('SELECT u.name, COUNT(p.id) count FROM User u LEFT JOIN u.Phonenumber p GROUP BY count');
+        
+        $this->assertEqual($q->getQuery(), 'SELECT e.id AS e__id, e.name AS e__name, COUNT(p.id) AS p__0 FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.type = 0) GROUP BY p__0');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/HavingTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/HavingTestCase.php
new file mode 100644
index 000000000..8c366c57b
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/HavingTestCase.php
@@ -0,0 +1,67 @@
+<?php
+/* 
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_Having_TestCase
+ *
+ * @package     Doctrine
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @version     $Revision$
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ */
+class Doctrine_Query_Having_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testAggregateFunctionsInHavingReturnValidSql() 
+    {
+        $q = new Doctrine_Query();
+        
+        $q->parseDqlQuery('SELECT u.name FROM User u LEFT JOIN u.Phonenumber p HAVING COUNT(p.id) > 2');
+        
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.type = 0) HAVING COUNT(p.id) > 2');
+    }
+    public function testAggregateFunctionsInHavingReturnValidSql2() 
+    {
+        $q = new Doctrine_Query();
+        
+        $q->parseDqlQuery("SELECT u.name FROM User u LEFT JOIN u.Phonenumber p HAVING MAX(u.name) = 'zYne'");
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e.name AS e__name FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.type = 0) HAVING MAX(e.name) = 'zYne'");
+    }
+
+    public function testAggregateFunctionsInHavingSupportMultipleParameters() 
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery("SELECT CONCAT(u.name, u.loginname) name FROM User u LEFT JOIN u.Phonenumber p HAVING name = 'xx'");
+    }
+
+    public function testReturnFuncIfNumeric()
+    {
+       $having =  new Doctrine_Query_Having(new Doctrine_Query());
+       $part = $having->load("1");
+       $this->assertEqual("1",trim($part));
+
+    }
+
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/HydrateNoneTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/HydrateNoneTestCase.php
new file mode 100644
index 000000000..11217ff79
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/HydrateNoneTestCase.php
@@ -0,0 +1,43 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_Check_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_HydrateNone_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testCheckParserSupportsStandardFunctions()
+    {
+        $q = Doctrine_Query::create();
+        $res = $q->select('u.name')->from('User u')->execute(array(), Doctrine_Core::HYDRATE_NONE);
+        foreach ($res as $row) {
+            $this->assertEqual(1, count($row)); // just 1 column, the name
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/IdentifierQuotingTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/IdentifierQuotingTestCase.php
new file mode 100644
index 000000000..56474726e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/IdentifierQuotingTestCase.php
@@ -0,0 +1,184 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_IdentifierQuoting_TestCase
+ *
+ * This test case is used for testing DQL API quotes all identifiers properly
+ * if idenfitier quoting is turned on
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_IdentifierQuoting_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables() 
+    { 
+        $this->tables = array('Entity', 'Phonenumber');
+        
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    { }
+
+    public function testQuerySupportsIdentifierQuoting() 
+    {
+        $this->conn->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, true);
+
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery('SELECT u.id, MAX(u.id), MIN(u.name) FROM User u');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT "e"."id" AS "e__id", MAX("e"."id") AS "e__0", MIN("e"."name") AS "e__1" FROM "entity" "e" WHERE ("e"."type" = 0)');
+
+        $q->execute();
+    }
+
+    public function testQuerySupportsIdentifierQuotingInWherePart()
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery('SELECT u.name FROM User u WHERE u.id = 3');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT "e"."id" AS "e__id", "e"."name" AS "e__name" FROM "entity" "e" WHERE ("e"."id" = 3 AND ("e"."type" = 0))');
+    
+        $q->execute();
+    }
+
+    /*
+    public function testQuerySupportsIdentifierQuotingWorksWithinFunctions()
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery("SELECT u.name FROM User u WHERE TRIM(u.name) = 'zYne'");
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT "e"."id" AS "e__id", "e"."name" AS "e__name" FROM "entity" "e" WHERE TRIM(u.name) = 3 AND ("e"."type" = 0)');
+    }
+    */
+
+    public function testQuerySupportsIdentifierQuotingWithJoins() 
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery('SELECT u.name FROM User u LEFT JOIN u.Phonenumber p');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT "e"."id" AS "e__id", "e"."name" AS "e__name" FROM "entity" "e" LEFT JOIN "phonenumber" "p" ON "e"."id" = "p"."entity_id" WHERE ("e"."type" = 0)');
+
+    }
+
+    public function testLimitSubqueryAlgorithmSupportsIdentifierQuoting()
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery('SELECT u.name FROM User u INNER JOIN u.Phonenumber p')->limit(5);
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT "e"."id" AS "e__id", "e"."name" AS "e__name" FROM "entity" "e" INNER JOIN "phonenumber" "p" ON "e"."id" = "p"."entity_id" WHERE "e"."id" IN (SELECT DISTINCT "e2"."id" FROM "entity" "e2" INNER JOIN "phonenumber" "p2" ON "e2"."id" = "p2"."entity_id" WHERE ("e2"."type" = 0) LIMIT 5) AND ("e"."type" = 0)');
+    }
+    
+    public function testCountQuerySupportsIdentifierQuoting()
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery('SELECT u.name FROM User u INNER JOIN u.Phonenumber p');
+        
+        $this->assertEqual($q->getCountSqlQuery(), 'SELECT COUNT(*) AS "num_results" FROM (SELECT "e"."id" FROM "entity" "e" INNER JOIN "phonenumber" "p" ON "e"."id" = "p"."entity_id" WHERE ("e"."type" = 0) GROUP BY "e"."id") "dctrn_count_query"');
+    }
+
+    public function testUpdateQuerySupportsIdentifierQuoting()
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery('UPDATE User u SET u.name = ? WHERE u.id = ?');
+        
+        $this->assertEqual($q->getSqlQuery(), 'UPDATE "entity" SET "name" = ? WHERE ("id" = ? AND ("type" = 0))');
+    }
+
+    public function testUpdateQuerySupportsIdentifierQuoting2()
+    {
+        $q = new Doctrine_Query();
+
+        $q->update('User')->set('name', '?', 'guilhermeblanco')->where('id = ?');
+        
+        $this->assertEqual($q->getSqlQuery(), 'UPDATE "entity" SET "name" = ? WHERE ("id" = ? AND ("type" = 0))');
+    }
+
+    public function testUpdateQuerySupportsIdentifierQuoting3()
+    {
+        $q = new Doctrine_Query();
+
+        $q->update('User')->set('name', 'LOWERCASE(name)')->where('id = ?');
+        
+        $this->assertEqual($q->getSqlQuery(), 'UPDATE "entity" SET "name" = LOWERCASE("name") WHERE ("id" = ? AND ("type" = 0))');
+    }
+
+    public function testUpdateQuerySupportsIdentifierQuoting4()
+    {
+        $q = new Doctrine_Query();
+
+        $q->update('User u')->set('u.name', 'LOWERCASE(u.name)')->where('u.id = ?');
+        
+        $this->assertEqual($q->getSqlQuery(), 'UPDATE "entity" SET "name" = LOWERCASE("name") WHERE ("id" = ? AND ("type" = 0))');
+    }
+
+    public function testUpdateQuerySupportsIdentifierQuoting5()
+    {
+        $q = new Doctrine_Query();
+
+        $q->update('User u')->set('u.name', 'UPPERCASE(LOWERCASE(u.name))')->where('u.id = ?');
+        
+        $this->assertEqual($q->getSqlQuery(), 'UPDATE "entity" SET "name" = UPPERCASE(LOWERCASE("name")) WHERE ("id" = ? AND ("type" = 0))');
+    }
+
+    public function testUpdateQuerySupportsIdentifierQuoting6()
+    {
+        $q = new Doctrine_Query();
+
+        $q->update('User u')->set('u.name', 'UPPERCASE(LOWERCASE(u.id))')->where('u.id = ?');
+        
+        $this->assertEqual($q->getSqlQuery(), 'UPDATE "entity" SET "name" = UPPERCASE(LOWERCASE("id")) WHERE ("id" = ? AND ("type" = 0))');
+    }
+
+    public function testUpdateQuerySupportsIdentifierQuoting7()
+    {
+        $q = new Doctrine_Query();
+
+        $q->update('User u')->set('u.name', 'CURRENT_TIMESTAMP')->where('u.id = ?');
+        
+        $this->assertEqual($q->getSqlQuery(), 'UPDATE "entity" SET "name" = CURRENT_TIMESTAMP WHERE ("id" = ? AND ("type" = 0))');
+    }
+
+    public function testUpdateQuerySupportsIdentifierQuoting8()
+    {
+        $q = new Doctrine_Query();
+
+        $q->update('User u')->set('u.id', 'u.id + 1')->where('u.name = ?');
+        
+        $this->assertEqual($q->getSqlQuery(), 'UPDATE "entity" SET "id" = "id" + 1 WHERE ("name" = ? AND ("type" = 0))');
+
+        $this->conn->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, false);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/JoinConditionTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/JoinConditionTestCase.php
new file mode 100644
index 000000000..a8ec86856
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/JoinConditionTestCase.php
@@ -0,0 +1,95 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_JoinCondition_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_JoinCondition_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData() 
+    { }
+
+    public function prepareTables() 
+    { }
+
+    public function testJoinConditionsAreSupportedForOneToManyLeftJoins()
+    {
+        $q = new Doctrine_Query();
+        
+        $q->parseDqlQuery("SELECT u.name, p.id FROM User u LEFT JOIN u.Phonenumber p ON p.phonenumber = '123 123'");
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e.name AS e__name, p.id AS p__id FROM entity e LEFT JOIN phonenumber p ON (p.phonenumber = '123 123') WHERE (e.type = 0)");
+    }
+
+    public function testJoinConditionsAreSupportedForOneToManyInnerJoins()
+    {
+        $q = new Doctrine_Query();
+        
+        $q->parseDqlQuery("SELECT u.name, p.id FROM User u INNER JOIN u.Phonenumber p ON p.phonenumber = '123 123'");
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e.name AS e__name, p.id AS p__id FROM entity e INNER JOIN phonenumber p ON (p.phonenumber = '123 123') WHERE (e.type = 0)");
+    }
+
+    public function testJoinConditionsAreSupportedForManyToManyLeftJoins()
+    {
+        $q = new Doctrine_Query();
+        
+        $q->parseDqlQuery("SELECT u.name, g.id FROM User u LEFT JOIN u.Group g ON g.id > 2");
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e.name AS e__name, e2.id AS e2__id FROM entity e LEFT JOIN groupuser g ON (e.id = g.user_id) LEFT JOIN entity e2 ON (e2.id > 2) AND e2.type = 1 WHERE (e.type = 0)");
+    }
+
+    public function testJoinConditionsAreSupportedForManyToManyInnerJoins()
+    {
+        $q = new Doctrine_Query();
+        
+        $q->parseDqlQuery("SELECT u.name, g.id FROM User u INNER JOIN u.Group g ON g.id > 2");
+    
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e.name AS e__name, e2.id AS e2__id FROM entity e INNER JOIN groupuser g ON (e.id = g.user_id) INNER JOIN entity e2 ON (e2.id > 2) AND e2.type = 1 WHERE (e.type = 0)");
+    }
+
+    public function testJoinConditionsWithClauseAndAliases()
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery("SELECT a.name, b.id FROM User a LEFT JOIN a.Phonenumber b ON a.name = b.phonenumber");
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e.name AS e__name, p.id AS p__id FROM entity e LEFT JOIN phonenumber p ON (e.name = p.phonenumber) WHERE (e.type = 0)");
+    }
+
+    public function testJoinWithConditionAndNotInClause()
+    {
+        // Related to ticket #1329
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery("SELECT a.name, b.id FROM User a LEFT JOIN a.Phonenumber b WITH a.id NOT IN (1, 2, 3)");
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e.name AS e__name, p.id AS p__id FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id AND (e.id NOT IN (1, 2, 3)) WHERE (e.type = 0)");
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/JoinTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/JoinTestCase.php
new file mode 100644
index 000000000..40509640b
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/JoinTestCase.php
@@ -0,0 +1,291 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_JoinCondition_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_Join_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables = array('Record_Country', 'Record_City', 'Record_District', 'Entity',
+                              'User', 'Group', 'Email', 'Phonenumber', 'Groupuser', 'Account');
+
+        parent::prepareTables();
+    }
+    public function prepareData()
+    {
+    }
+
+    public function testInitData()
+    {
+        $c = new Record_Country();
+
+        $c->name = 'Some country';
+
+        $c->City[0]->name = 'City 1';
+        $c->City[1]->name = 'City 2';
+        $c->City[2]->name = 'City 3';
+
+        $c->City[0]->District->name = 'District 1';
+        $c->City[2]->District->name = 'District 2';
+        
+        $this->assertTrue(gettype($c->City[0]->District), 'object');
+        $this->assertTrue(gettype($c->City[0]->District->name), 'string');
+
+        $c->save();
+
+        $this->connection->clear();
+    }
+
+    public function testQuerySupportsCustomJoins()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('c.*, c2.*, d.*')
+          ->from('Record_Country c')->innerJoin('c.City c2 ON c2.id = 2')
+          ->where('c.id = ?', array(1));
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT r.id AS r__id, r.name AS r__name, r2.id AS r2__id, r2.name AS r2__name, r2.country_id AS r2__country_id, r2.district_id AS r2__district_id FROM record__country r INNER JOIN record__city r2 ON (r2.id = 2) WHERE (r.id = ?)');
+    }
+
+
+    public function testQueryAggFunctionInJoins()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('c.*, c2.*, d.*')
+          ->from('Record_Country c')
+          ->innerJoin('c.City c2 WITH LOWER(c2.name) LIKE LOWER(?)', array('city 1'))
+          ->where('c.id = ?', array(1));
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT r.id AS r__id, r.name AS r__name, r2.id AS r2__id, r2.name AS r2__name, r2.country_id AS r2__country_id, r2.district_id AS r2__district_id FROM record__country r INNER JOIN record__city r2 ON r.id = r2.country_id AND (LOWER(r2.name) LIKE LOWER(?)) WHERE (r.id = ?)');
+    }
+
+    public function testSubQueryInJoins()
+    {
+        try {
+            $q = new Doctrine_Query();
+
+            $q->from('Record_Country c')
+              ->innerJoin('c.City c2 WITH (c2.name = ? OR c2.id IN (SELECT c3.id FROM Record_City c3 WHERE c3.id = ? OR c3.id = ?))');
+            $sql = $q->getSqlQuery();
+            $this->assertEqual($sql, 'SELECT r.id AS r__id, r.name AS r__name, r2.id AS r2__id, r2.name AS r2__name, r2.country_id AS r2__country_id, r2.district_id AS r2__district_id FROM record__country r INNER JOIN record__city r2 ON r.id = r2.country_id AND ((r2.name = ? OR r2.id IN (SELECT r3.id AS r3__id FROM record__city r3 WHERE (r3.id = ? OR r3.id = ?))))');
+
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+
+    public function testQueryMultipleAggFunctionInJoins()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('c.*, c2.*, d.*')
+          ->from('Record_Country c')
+          ->innerJoin('c.City c2 WITH LOWER(UPPER(c2.name)) LIKE LOWER(?)', array('city 1'))
+          ->where('c.id = ?', array(1));
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT r.id AS r__id, r.name AS r__name, r2.id AS r2__id, r2.name AS r2__name, r2.country_id AS r2__country_id, r2.district_id AS r2__district_id FROM record__country r INNER JOIN record__city r2 ON r.id = r2.country_id AND (LOWER(UPPER(r2.name)) LIKE LOWER(?)) WHERE (r.id = ?)');
+    }
+    
+    
+    public function testQueryMultipleAggFunctionInJoins2()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('c.*, c2.*, d.*')
+          ->from('Record_Country c')
+          ->innerJoin('c.City c2 WITH LOWER(UPPER(c2.name)) LIKE CONCAT(UPPER(?), UPPER(c2.name))', array('city 1'))
+          ->where('c.id = ?', array(1));
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT r.id AS r__id, r.name AS r__name, r2.id AS r2__id, r2.name AS r2__name, r2.country_id AS r2__country_id, r2.district_id AS r2__district_id FROM record__country r INNER JOIN record__city r2 ON r.id = r2.country_id AND (LOWER(UPPER(r2.name)) LIKE CONCAT(UPPER(?), UPPER(r2.name))) WHERE (r.id = ?)');
+    }
+    
+    
+    public function testQueryMultipleAggFunctionInJoins3()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('c.*, c2.*, d.*')
+          ->from('Record_Country c')
+          ->innerJoin('c.City c2 WITH CONCAT(UPPER(c2.name), c2.name) LIKE UPPER(?)', array('CITY 1city 1'))
+          ->where('c.id = ?', array(1));
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT r.id AS r__id, r.name AS r__name, r2.id AS r2__id, r2.name AS r2__name, r2.country_id AS r2__country_id, r2.district_id AS r2__district_id FROM record__country r INNER JOIN record__city r2 ON r.id = r2.country_id AND (CONCAT(UPPER(r2.name), r2.name) LIKE UPPER(?)) WHERE (r.id = ?)');
+    }
+
+
+    public function testQueryWithInInsideJoins()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('c.*, c2.*, d.*')
+          ->from('Record_Country c')
+          ->innerJoin('c.City c2 WITH c2.id IN (?, ?)', array(1, 2))
+          ->where('c.id = ?', array(1));
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT r.id AS r__id, r.name AS r__name, r2.id AS r2__id, r2.name AS r2__name, r2.country_id AS r2__country_id, r2.district_id AS r2__district_id FROM record__country r INNER JOIN record__city r2 ON r.id = r2.country_id AND (r2.id IN (?, ?)) WHERE (r.id = ?)');
+    }
+
+
+    public function testQuerySupportsCustomJoinsAndWithKeyword()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('c.*, c2.*, d.*')
+          ->from('Record_Country c')->innerJoin('c.City c2 WITH c2.id = 2')
+          ->where('c.id = ?', array(1));
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT r.id AS r__id, r.name AS r__name, r2.id AS r2__id, r2.name AS r2__name, r2.country_id AS r2__country_id, r2.district_id AS r2__district_id FROM record__country r INNER JOIN record__city r2 ON r.id = r2.country_id AND (r2.id = 2) WHERE (r.id = ?)');
+    }
+
+    public function testRecordHydrationWorksWithDeeplyNestedStructuresAndArrayFetching()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('c.*, c2.*, d.*')
+          ->from('Record_Country c')->leftJoin('c.City c2')->leftJoin('c2.District d')
+          ->where('c.id = ?', array(1));
+
+        $countries = $q->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+        $c = $countries[0];
+        $this->assertEqual($c['City'][0]['name'], 'City 1');
+        $this->assertEqual($c['City'][1]['name'], 'City 2');
+        $this->assertEqual($c['City'][2]['name'], 'City 3');
+
+        $this->assertEqual($c['City'][0]['District']['name'], 'District 1');
+        $this->assertEqual($c['City'][2]['District']['name'], 'District 2');
+    }
+
+    public function testRecordHydrationWorksWithDeeplyNestedStructures()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('c.*, c2.*, d.*')
+          ->from('Record_Country c')->leftJoin('c.City c2')->leftJoin('c2.District d')
+          ->where('c.id = ?', array(1));
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT r.id AS r__id, r.name AS r__name, r2.id AS r2__id, r2.name AS r2__name, r2.country_id AS r2__country_id, r2.district_id AS r2__district_id, r3.id AS r3__id, r3.name AS r3__name FROM record__country r LEFT JOIN record__city r2 ON r.id = r2.country_id LEFT JOIN record__district r3 ON r2.district_id = r3.id WHERE (r.id = ?)");
+
+        $countries = $q->execute();
+
+        $c = $countries[0];
+        $this->assertEqual($c->City[0]->name, 'City 1');
+        $this->assertEqual($c->City[1]->name, 'City 2');
+        $this->assertEqual($c->City[2]->name, 'City 3');
+
+        $this->assertEqual($c->City[0]->District->name, 'District 1');
+        $this->assertEqual($c->City[2]->District->name, 'District 2');
+    }
+
+    public function testManyToManyJoinUsesProperTableAliases()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('u.name')->from('User u INNER JOIN u.Group g');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name FROM entity e INNER JOIN groupuser g ON (e.id = g.user_id) INNER JOIN entity e2 ON e2.id = g.group_id AND e2.type = 1 WHERE (e.type = 0)');
+    }
+
+    public function testSelfReferentialAssociationJoinsAreSupported()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('e.name')->from('Entity e INNER JOIN e.Entity e2');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name FROM entity e INNER JOIN entity_reference e3 ON (e.id = e3.entity1 OR e.id = e3.entity2) INNER JOIN entity e2 ON (e2.id = e3.entity2 OR e2.id = e3.entity1) AND e2.id != e.id');
+    }
+
+    public function testMultipleJoins()
+    {
+        $q = new Doctrine_Query();
+        $q->select('u.id, g.id, e.id')->from('User u')
+          ->leftJoin('u.Group g')->leftJoin('g.Email e');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e2.id AS e2__id, e3.id AS e3__id FROM entity e LEFT JOIN groupuser g ON (e.id = g.user_id) LEFT JOIN entity e2 ON e2.id = g.group_id AND e2.type = 1 LEFT JOIN email e3 ON e2.email_id = e3.id WHERE (e.type = 0)');
+        try {
+            $q->execute();
+            $this->pass();
+        } catch (Doctrine_Exception $e) {
+            $this->fail();
+        }
+    }
+
+    public function testMultipleJoins2()
+    {
+        $q = new Doctrine_Query();
+        $q->select('u.id, g.id, e.id')->from('Group g')
+          ->leftJoin('g.User u')->leftJoin('u.Account a');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e2.id AS e2__id FROM entity e LEFT JOIN groupuser g ON (e.id = g.group_id) LEFT JOIN entity e2 ON e2.id = g.user_id AND e2.type = 0 LEFT JOIN account a ON e2.id = a.entity_id WHERE (e.type = 1)');
+        try {
+            $q->execute();
+            $this->pass();
+        } catch (Doctrine_Exception $e) {
+            $this->fail();
+        }
+    }
+
+    public function testMapKeywordForQueryWithOneComponent()
+    {
+        $q = new Doctrine_Query();
+        $coll = $q->from('Record_City c INDEXBY c.name')->fetchArray();
+        
+        $this->assertTrue(isset($coll['City 1']));
+        $this->assertTrue(isset($coll['City 2']));
+        $this->assertTrue(isset($coll['City 3']));
+    }
+
+    public function testMapKeywordSupportsJoins()
+    {
+        $q = new Doctrine_Query();
+        $country = $q->from('Record_Country c LEFT JOIN c.City c2 INDEXBY c2.name')->fetchOne();
+        $coll = $country->City;
+
+        $this->assertTrue(isset($coll['City 1']));
+        $this->assertTrue(isset($coll['City 2']));
+        $this->assertTrue(isset($coll['City 3']));
+        $this->assertEqual('name', $coll->getKeyColumn());
+    }
+
+    public function testMapKeywordThrowsExceptionOnNonExistentColumn()
+    {
+        try {
+            $q = new Doctrine_Query();
+            $country = $q->from('Record_Country c LEFT JOIN c.City c2 INDEXBY c2.unknown')->fetchOne();
+        
+            $this->fail();
+        } catch (Doctrine_Query_Exception $e) {
+            $this->pass();
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/LimitTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/LimitTestCase.php
new file mode 100644
index 000000000..716381033
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/LimitTestCase.php
@@ -0,0 +1,329 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_Limit_TestCase
+ *
+ * This test case is used for testing DQL LIMIT clause
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_Limit_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables() 
+    {
+        $this->tables[] = "Photo";
+        $this->tables[] = "Tag";
+        $this->tables[] = "Phototag";
+
+        parent::prepareTables();
+    }
+    
+    public function testLimitWithNormalManyToMany() 
+    {
+        $coll = new Doctrine_Collection($this->connection->getTable("Photo"));
+        $tag = new Tag();
+        $tag->tag = "Some tag";
+        $coll[0]->Tag[0] = $tag;
+        $coll[0]->name = "photo 1";
+        $coll[1]->Tag[0] = $tag;
+        $coll[1]->name = "photo 2";
+        $coll[2]->Tag[0] = $tag;
+        $coll[2]->name = "photo 3";
+        $coll[3]->Tag[0]->tag = "Other tag";
+        $coll[3]->name = "photo 4";
+        $this->connection->flush();
+
+        $q = new Doctrine_Query();
+        $q->from('Photo')->where('Photo.Tag.id = ?')->orderby('Photo.id DESC')->limit(100);
+
+        $photos = $q->execute(array(1));
+        $this->assertEqual($photos->count(), 3);            
+        $this->assertEqual($q->getSqlQuery(), 
+        "SELECT p.id AS p__id, p.name AS p__name FROM photo p LEFT JOIN phototag p2 ON (p.id = p2.photo_id) LEFT JOIN tag t ON t.id = p2.tag_id WHERE p.id IN (SELECT DISTINCT p3.id FROM photo p3 LEFT JOIN phototag p4 ON (p3.id = p4.photo_id) LEFT JOIN tag t2 ON t2.id = p4.tag_id WHERE t2.id = ? ORDER BY p3.id DESC LIMIT 100) AND (t.id = ?) ORDER BY p.id DESC");
+    }
+
+    public function testLimitWithOneToOneLeftJoin()
+    {
+        $q = new Doctrine_Query();
+        $q->select('u.id, e.*')->from('User u, u.Email e')->limit(5);
+
+        $users = $q->execute();
+        $this->assertEqual($users->count(), 5);
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e2.id AS e2__id, e2.address AS e2__address FROM entity e LEFT JOIN email e2 ON e.email_id = e2.id WHERE (e.type = 0) LIMIT 5");
+
+    }
+    public function testLimitWithOneToOneInnerJoin()
+    {
+        $q = new Doctrine_Query();
+        $q->select('u.id, e.*')->from('User u, u:Email e')->limit(5);
+
+        $users = $q->execute();
+        $this->assertEqual($users->count(), 5);
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e2.id AS e2__id, e2.address AS e2__address FROM entity e INNER JOIN email e2 ON e.email_id = e2.id WHERE (e.type = 0) LIMIT 5");
+    }
+
+    public function testLimitWithOneToManyLeftJoin() 
+    {
+        $q = new Doctrine_Query();
+        $q->select('u.id, p.*')->from('User u, u.Phonenumber p')->limit(5);
+
+        $sql = $q->getSqlQuery();
+
+        $this->assertEqual($q->getSqlQuery(), 
+        'SELECT e.id AS e__id, p.id AS p__id, p.phonenumber AS p__phonenumber, p.entity_id AS p__entity_id FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE e.id IN (SELECT DISTINCT e2.id FROM entity e2 LEFT JOIN phonenumber p2 ON e2.id = p2.entity_id WHERE (e2.type = 0) LIMIT 5) AND (e.type = 0)');
+
+        $users = $q->execute();
+        $count = $this->conn->count();
+        $this->assertEqual($users->count(), 5);
+        $users[0]->Phonenumber[0];
+        $this->assertEqual($count, $this->conn->count());
+
+        $q->offset(2);
+
+        $users = $q->execute();
+        $count = $this->conn->count();
+        $this->assertEqual($users->count(), 5);
+        $users[3]->Phonenumber[0];
+        $this->assertEqual($count, $this->conn->count());
+    }
+
+    public function testLimitWithOneToManyLeftJoinAndCondition() 
+    {
+        $q = new Doctrine_Query();
+        $q->select('User.name')->from('User')->where("User.Phonenumber.phonenumber LIKE '%123%'")->limit(5);
+
+        $users = $q->execute();
+
+        $this->assertEqual($users->count(), 5);
+
+        $this->assertEqual($users[0]->name, 'zYne');
+        $this->assertEqual($users[1]->name, 'Arnold Schwarzenegger');
+        $this->assertEqual($users[2]->name, 'Michael Caine');
+        $this->assertEqual($users[3]->name, 'Sylvester Stallone');
+        $this->assertEqual($users[4]->name, 'Jean Reno');
+
+        $this->assertEqual($q->getSqlQuery(),
+        "SELECT e.id AS e__id, e.name AS e__name FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE e.id IN (SELECT DISTINCT e2.id FROM entity e2 LEFT JOIN phonenumber p2 ON e2.id = p2.entity_id WHERE p2.phonenumber LIKE '%123%' AND (e2.type = 0) LIMIT 5) AND (p.phonenumber LIKE '%123%' AND (e.type = 0))");
+    }
+
+
+    public function testLimitWithOneToManyLeftJoinAndOrderBy() 
+    {
+        $q = new Doctrine_Query();
+        $q->select('User.name')->distinct()->from('User')->where("User.Phonenumber.phonenumber LIKE '%123%'")->orderby('User.Email.address')->limit(5);
+        
+
+        $users = $q->execute();
+
+        $this->assertEqual($users[0]->name, 'Arnold Schwarzenegger');
+        $this->assertEqual($users[1]->name, 'Michael Caine');
+        $this->assertEqual($users[2]->name, 'Jean Reno');
+        $this->assertEqual($users[3]->name, 'Sylvester Stallone');
+        $this->assertEqual($users[4]->name, 'zYne');
+
+        $this->assertEqual($users->count(), 5);
+    }
+
+    public function testLimitWithOneToManyInnerJoin() 
+    {
+        $q = new Doctrine_Query();
+        $q->select('u.id, p.*')->from('User u INNER JOIN u.Phonenumber p');
+        $q->limit(5);
+
+
+        $sql = $q->getSqlQuery();
+
+        $users = $q->execute();
+        $count = $this->conn->count();
+        $this->assertEqual($users->count(), 5);
+        $users[0]->Phonenumber[0];
+        $this->assertEqual($count, $this->conn->count());
+
+
+        $q->offset(2);
+
+        $users = $q->execute();
+        $count = $this->conn->count();
+        $this->assertEqual($users->count(), 5);
+        $users[3]->Phonenumber[0];
+        $this->assertEqual($count, $this->conn->count());
+        
+        $this->assertEqual($q->getSqlQuery(),
+        'SELECT e.id AS e__id, p.id AS p__id, p.phonenumber AS p__phonenumber, p.entity_id AS p__entity_id FROM entity e INNER JOIN phonenumber p ON e.id = p.entity_id WHERE e.id IN (SELECT DISTINCT e2.id FROM entity e2 INNER JOIN phonenumber p2 ON e2.id = p2.entity_id WHERE (e2.type = 0) LIMIT 5 OFFSET 2) AND (e.type = 0)');
+    }
+
+    public function testLimitWithPreparedQueries() 
+    {
+        $q = new Doctrine_Query();
+        $q->select('u.id, p.id')->from('User u LEFT JOIN u.Phonenumber p');
+        $q->where('u.name = ?', array('zYne'));
+        $q->limit(5);
+        $users = $q->execute();
+
+        $this->assertEqual($users->count(), 1);
+        $count = $this->conn->count();
+        $users[0]->Phonenumber[0];
+        $this->assertEqual($count, $this->conn->count());
+
+        $this->assertEqual($q->getSqlQuery(),
+        'SELECT e.id AS e__id, p.id AS p__id FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE e.id IN (SELECT DISTINCT e2.id FROM entity e2 LEFT JOIN phonenumber p2 ON e2.id = p2.entity_id WHERE e2.name = ? AND (e2.type = 0) LIMIT 5) AND (e.name = ? AND (e.type = 0))');
+
+        $q = new Doctrine_Query();
+        $q->select('u.id, p.id')->from('User u LEFT JOIN u.Phonenumber p');
+        $q->where("u.name LIKE ? OR u.name LIKE ?");
+        $q->limit(5);
+
+        $users = $q->execute(array('%zYne%', '%Arnold%'));
+        $this->assertEqual($users->count(), 2);
+
+
+        $count = $this->conn->count();
+        $users[0]->Phonenumber[0];
+        $this->assertEqual($count, $this->conn->count());
+
+        $this->assertEqual($q->getSqlQuery(),
+        "SELECT e.id AS e__id, p.id AS p__id FROM entity e LEFT JOIN phonenumber p ON"
+        . " e.id = p.entity_id WHERE e.id IN (SELECT DISTINCT e2.id FROM entity e2 LEFT JOIN phonenumber p2"
+        . " ON e2.id = p2.entity_id WHERE (e2.name LIKE ? OR e2.name LIKE ?) AND (e2.type = 0) LIMIT 5) AND "
+        . "(e.name LIKE ? OR e.name LIKE ?) AND (e.type = 0)");
+    }
+
+    public function testConnectionFlushing() 
+    {
+        $q = new Doctrine_Query();
+        $q->from('User.Phonenumber');
+        $q->where('User.name = ?', array('zYne'));
+        $q->limit(5);
+
+        $users = $q->execute();
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id, p.id AS p__id, p.phonenumber AS p__phonenumber, p.entity_id AS p__entity_id FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE e.id IN (SELECT DISTINCT e2.id FROM entity e2 LEFT JOIN phonenumber p2 ON e2.id = p2.entity_id WHERE e2.name = ? AND (e2.type = 0) LIMIT 5) AND (e.name = ? AND (e.type = 0))');
+        
+        $this->assertEqual($users->count(), 1);
+        //$this->connection->flush();
+    }
+    public function testLimitWithManyToManyColumnAggInheritanceLeftJoin() 
+    {
+        $q = new Doctrine_Query();
+        $q->from('User.Group')->limit(5);
+        
+        $users = $q->execute();
+
+        $this->assertEqual($users->count(), 5);
+        
+        $user = $this->objTable->find(5);
+        
+        $user->Group[1]->name = "Tough guys inc.";
+        
+        $user->Group[2]->name = "Terminators";
+        
+        $user2 = $this->objTable->find(4);
+        //$user2->Group = $user->Group;
+        $user2->Group = new Doctrine_Collection('Group');
+        $user2->Group[] = $user->Group[0];
+        $user2->Group[] = $user->Group[1];
+        $user2->Group[] = $user->Group[2];
+        
+        $user3 = $this->objTable->find(6);
+        //$user3->Group = $user->Group;
+        $user3->Group = new Doctrine_Collection('Group');
+        $user3->Group[] = $user->Group[0];
+        $user3->Group[] = $user->Group[1];
+        $user3->Group[] = $user->Group[2];
+
+        $this->assertEqual($user->Group[0]->name, "Action Actors");
+        $this->assertEqual(count($user->Group), 3);
+        $this->assertEqual(count($user2->Group), 3);
+        $this->assertEqual(count($user3->Group), 3);
+
+        $this->connection->flush();
+        
+        $this->assertEqual($user->Group[0]->name, "Action Actors");
+        $this->assertEqual(count($user->Group), 3);
+        
+        $q = new Doctrine_Query();
+        $q->from("User")->where("User.Group.id = ?")->orderby("User.id ASC")->limit(5);
+        
+        $users = $q->execute(array($user->Group[1]->id));
+        
+        $this->assertEqual($users->count(), 3);
+        
+        $this->connection->clear();
+        $q = new Doctrine_Query();
+        $q->from('User')->where('User.Group.id = ?')->orderby('User.id DESC');
+        $users = $q->execute(array($user->Group[1]->id));
+
+        $this->assertEqual($users->count(), 3);
+    }
+
+    public function testLimitAttribute() 
+    {
+        $this->manager->setAttribute(Doctrine_Core::ATTR_QUERY_LIMIT, Doctrine_Core::LIMIT_ROWS);
+        
+        $this->connection->clear();
+        $q = new Doctrine_Query();
+        $q->from('User')->where('User.Group.name = ?')->orderby('User.id DESC')->limit(5);
+        $users = $q->execute(array('Tough guys inc.'));
+
+        $this->assertEqual($users->count(), 3);
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id FROM entity e LEFT JOIN groupuser g ON (e.id = g.user_id) LEFT JOIN entity e2 ON e2.id = g.group_id AND e2.type = 1 WHERE (e2.name = ? AND (e.type = 0)) ORDER BY e.id DESC LIMIT 5");
+        $this->manager->setAttribute(Doctrine_Core::ATTR_QUERY_LIMIT, Doctrine_Core::LIMIT_RECORDS);
+    }
+
+    public function testLimitWithManyToManyAndColumnAggregationInheritance() 
+    {
+        $q = new Doctrine_Query();
+        $q->from('User u, u.Group g')->where('g.id > 1')->orderby('u.name DESC')->limit(10); 
+
+    }
+
+    public function testLimitNoticesOrderbyJoins()
+    {
+        $q = new Doctrine_Query();
+        
+        $q->from('Photo p')
+          ->leftJoin('p.Tag t')
+          ->orderby('t.id DESC')->limit(10);
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT p.id AS p__id, p.name AS p__name, t.id AS t__id, t.tag AS t__tag FROM photo p LEFT JOIN phototag p2 ON (p.id = p2.photo_id) LEFT JOIN tag t ON t.id = p2.tag_id WHERE p.id IN (SELECT DISTINCT p3.id FROM photo p3 LEFT JOIN phototag p4 ON (p3.id = p4.photo_id) LEFT JOIN tag t2 ON t2.id = p4.tag_id ORDER BY t2.id DESC LIMIT 10) ORDER BY t.id DESC");
+    }
+    
+    public function testLimitSubqueryNotNeededIfSelectSingleFieldDistinct()
+    {
+        $q = new Doctrine_Query();
+        $q->select('u.id')->distinct()->from('User u LEFT JOIN u.Phonenumber p');
+        $q->where('u.name = ?');
+        $q->limit(5);
+
+        $users = $q->execute(array('zYne'));
+        $this->assertEqual(1, $users->count());
+        
+        $this->assertEqual($q->getSqlQuery(), "SELECT DISTINCT e.id AS e__id FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.name = ? AND (e.type = 0)) LIMIT 5");
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/MultiJoin2TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/MultiJoin2TestCase.php
new file mode 100644
index 000000000..566535daf
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/MultiJoin2TestCase.php
@@ -0,0 +1,115 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_MultiJoin2_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_MultiJoin2_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData()
+    { }
+    public function prepareTables()
+    { 
+        $this->tables = array('QueryTest_Category', 'QueryTest_Board', 'QueryTest_User', 'QueryTest_Entry');
+        
+        parent::prepareTables();
+    }
+    public function testInitializeData() 
+    {
+        $query = new Doctrine_Query($this->connection);
+        
+        $cat = new QueryTest_Category();
+
+        $cat->rootCategoryId = 0;
+        $cat->parentCategoryId = 0;
+        $cat->name = "Cat1";
+        $cat->position = 0;
+        $cat->save();
+        
+        $board = new QueryTest_Board();
+        $board->name = "B1";
+        $board->categoryId = $cat->id;
+        $board->position = 0;
+        $board->save();
+        
+        $author = new QueryTest_User();
+        $author->username = "romanb";
+        $author->save();
+
+        $lastEntry = new QueryTest_Entry();
+        $lastEntry->authorId = $author->id;
+        $lastEntry->date = 1234;
+        $lastEntry->save();
+
+    }
+
+    public function testMultipleJoinFetchingWithDeepJoins() 
+    {
+        $query = new Doctrine_Query($this->connection);
+        $queryCount = $this->connection->count();
+        try {
+            $categories = $query->select('c.*, subCats.*, b.*, le.*, a.*')
+                    ->from('QueryTest_Category c')
+                    ->leftJoin('c.subCategories subCats')
+                    ->leftJoin('c.boards b')
+                    ->leftJoin('b.lastEntry le')
+                    ->leftJoin('le.author a')
+                    ->where('c.parentCategoryId = 0')
+                    ->orderBy('c.position ASC, subCats.position ASC, b.position ASC')
+                    ->execute();
+            // Test that accessing a loaded (but empty) relation doesnt trigger an extra query
+            $this->assertEqual($queryCount + 1, $this->connection->count());
+
+            $categories[0]->subCategories;
+            $this->assertEqual($queryCount + 1, $this->connection->count());
+        } catch (Doctrine_Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+    
+    public function testMultipleJoinFetchingWithArrayFetching() 
+    {
+        $query = new Doctrine_Query($this->connection);
+        $queryCount = $this->connection->count();
+        try {
+            $categories = $query->select('c.*, subCats.*, b.*, le.*, a.*')
+                    ->from('QueryTest_Category c')
+                    ->leftJoin('c.subCategories subCats')
+                    ->leftJoin('c.boards b')
+                    ->leftJoin('b.lastEntry le')
+                    ->leftJoin('le.author a')
+                    ->where('c.parentCategoryId = 0')
+                    ->orderBy('c.position ASC, subCats.position ASC, b.position ASC')
+                    ->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+            $this->pass();
+        } catch (Doctrine_Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/MultiJoinTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/MultiJoinTestCase.php
new file mode 100644
index 000000000..f5b2eb4d3
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/MultiJoinTestCase.php
@@ -0,0 +1,192 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_MultiJoin_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_MultiJoin_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Book';
+        $this->tables[] = 'Author';
+        parent::prepareTables();
+    }
+    public function testInitializeData() 
+    {
+
+        $query = new Doctrine_Query($this->connection);
+
+        $user = $this->connection->getTable('User')->find(4);
+
+
+        $album = $this->connection->create('Album');
+        $album->Song[0];
+
+        $user->Album[0]->name = 'Damage Done';
+        $user->Album[1]->name = 'Haven';
+
+        $user->Album[0]->Song[0]->title = 'Damage Done';
+        $user->Album[0]->Song[1]->title = 'The Treason Wall';
+        $user->Album[0]->Song[2]->title = 'Monochromatic Stains';
+
+        $this->assertEqual(count($user->Album[0]->Song), 3);
+
+
+        $user->Album[1]->Song[0]->title = 'Not Built To Last';
+        $user->Album[1]->Song[1]->title = 'The Wonders At Your Feet';
+        $user->Album[1]->Song[2]->title = 'Feast Of Burden';
+        $user->Album[1]->Song[3]->title = 'Fabric';
+        $this->assertEqual(count($user->Album[1]->Song), 4);
+
+        $user->save();
+
+        $user = $this->objTable->find(4);
+
+        $this->assertEqual(count($user->Album[0]->Song), 3);
+        $this->assertEqual(count($user->Album[1]->Song), 4);
+        
+        
+        $user = $this->connection->getTable('User')->find(5);
+        
+        $user->Album[0]->name = 'Clayman';
+        $user->Album[1]->name = 'Colony';
+        $user->Album[1]->Song[0]->title = 'Colony';
+        $user->Album[1]->Song[1]->title = 'Ordinary Story';
+        
+        $user->save();
+        
+        $this->assertEqual(count($user->Album[0]->Song), 0);
+        $this->assertEqual(count($user->Album[1]->Song), 2);
+    }
+    public function testMultipleOneToManyFetching() 
+    {
+        $this->connection->clear();
+
+        $query = new Doctrine_Query();
+
+        $users = $query->query('FROM User.Album.Song, User.Phonenumber WHERE User.id IN (4,5)');
+
+        $this->assertEqual($users->count(), 2);
+
+        $this->assertEqual($users[0]->id, 4);
+
+        $this->assertEqual($users[0]->Album[0]->name, 'Damage Done');
+        $this->assertEqual($users[0]->Album[0]->Song[0]->title, 'Damage Done');
+        $this->assertEqual($users[0]->Album[0]->Song[1]->title, 'The Treason Wall');
+        $this->assertEqual($users[0]->Album[0]->Song[2]->title, 'Monochromatic Stains');
+        $this->assertEqual($users[0]->Album[1]->name, 'Haven');
+        $this->assertEqual($users[0]->Album[1]->Song[0]->title, 'Not Built To Last');
+        $this->assertEqual($users[0]->Album[1]->Song[1]->title, 'The Wonders At Your Feet');
+        $this->assertEqual($users[0]->Album[1]->Song[2]->title, 'Feast Of Burden');
+        $this->assertEqual($users[0]->Album[1]->Song[3]->title, 'Fabric');
+
+        $this->assertEqual($users[1]->id, 5);
+        $this->assertEqual($users[1]->Album[0]->name, 'Clayman');
+        $this->assertEqual($users[1]->Album[1]->name, 'Colony');
+        $this->assertEqual($users[1]->Album[1]->Song[0]->title, 'Colony');
+        $this->assertEqual($users[1]->Album[1]->Song[1]->title, 'Ordinary Story');
+        
+        $this->assertEqual($users[0]->Phonenumber[0]->phonenumber, '123 123');
+        
+        $this->assertEqual($users[1]->Phonenumber[0]->phonenumber, '123 123');
+        $this->assertEqual($users[1]->Phonenumber[1]->phonenumber, '456 456');
+        $this->assertEqual($users[1]->Phonenumber[2]->phonenumber, '789 789');
+    }
+
+    public function testInitializeMoreData() 
+    {
+        $user = $this->connection->getTable('User')->find(4);
+        $user->Book[0]->name = 'The Prince';
+        $user->Book[0]->Author[0]->name = 'Niccolo Machiavelli';
+        $user->Book[0]->Author[1]->name = 'Someone';
+        $user->Book[1]->name = 'The Art of War';
+        $user->Book[1]->Author[0]->name = 'Someone';
+        $user->Book[1]->Author[1]->name = 'Niccolo Machiavelli';
+
+
+        $user->save();
+
+        $user = $this->connection->getTable('User')->find(5);
+        $user->Book[0]->name = 'Zadig';
+        $user->Book[0]->Author[0]->name = 'Voltaire';
+        $user->Book[0]->Author[1]->name = 'Someone';
+        $user->Book[1]->name = 'Candide';
+        $user->Book[1]->Author[0]->name = 'Someone';
+        $user->Book[1]->Author[1]->name = 'Voltaire';
+        $user->save();
+
+        $this->connection->clear();
+    }
+    public function testMultipleOneToManyFetching2() 
+    {
+        $query = new Doctrine_Query();
+
+        $users = $query->query("FROM User.Album.Song, User.Book.Author WHERE User.id IN (4,5)");
+        
+        $this->assertEqual($users->count(), 2);
+
+        $this->assertEqual($users[0]->id, 4);
+        $this->assertEqual($users[0]->Album[0]->name, 'Damage Done');
+        $this->assertEqual($users[0]->Album[0]->Song[0]->title, 'Damage Done');
+        $this->assertEqual($users[0]->Album[0]->Song[1]->title, 'The Treason Wall');
+        $this->assertEqual($users[0]->Album[0]->Song[2]->title, 'Monochromatic Stains');
+        $this->assertEqual($users[0]->Album[1]->name, 'Haven');
+        $this->assertEqual($users[0]->Album[1]->Song[0]->title, 'Not Built To Last');
+        $this->assertEqual($users[0]->Album[1]->Song[1]->title, 'The Wonders At Your Feet');
+        $this->assertEqual($users[0]->Album[1]->Song[2]->title, 'Feast Of Burden');
+        $this->assertEqual($users[0]->Album[1]->Song[3]->title, 'Fabric');
+        
+        $this->assertEqual($users[0]->Book[0]->Author[0]->name, 'Niccolo Machiavelli');
+        $this->assertEqual($users[0]->Book[0]->Author[1]->name, 'Someone');
+        $this->assertEqual($users[0]->Book[1]->name, 'The Art of War');
+        $this->assertEqual($users[0]->Book[1]->Author[0]->name, 'Someone');
+        $this->assertEqual($users[0]->Book[1]->Author[1]->name, 'Niccolo Machiavelli');
+
+        $this->assertEqual($users[1]->id, 5);
+        $this->assertEqual($users[1]->Album[0]->name, 'Clayman');
+        $this->assertEqual($users[1]->Album[1]->name, 'Colony');
+        $this->assertEqual($users[1]->Album[1]->Song[0]->title, 'Colony');
+        $this->assertEqual($users[1]->Album[1]->Song[1]->title, 'Ordinary Story');
+
+        $this->assertEqual($users[1]->Book[0]->name, 'Zadig');
+        $this->assertEqual($users[1]->Book[0]->Author[0]->name, 'Voltaire');
+        $this->assertEqual($users[1]->Book[0]->Author[1]->name, 'Someone');
+        $this->assertEqual($users[1]->Book[1]->name, 'Candide');
+        $this->assertEqual($users[1]->Book[1]->Author[0]->name, 'Someone');
+        $this->assertEqual($users[1]->Book[1]->Author[1]->name, 'Voltaire');
+    }
+
+    public function testMultipleOneToManyFetchingWithOrderBy() 
+    {
+        $query = new Doctrine_Query();
+
+        $users = $query->query("FROM User.Album.Song WHERE User.id IN (4,5) ORDER BY User.Album.Song.title DESC");
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/MultipleAggregateValueTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/MultipleAggregateValueTestCase.php
new file mode 100644
index 000000000..71c09f446
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/MultipleAggregateValueTestCase.php
@@ -0,0 +1,96 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_MultipleAggregateValue_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @author      Jonathan H. Wage <jonwage@gmail.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_MultipleAggregateValue_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData() 
+    { }
+    public function testInitData()
+    {
+        $user = new User();
+        $user->name = 'jon';
+        
+        $user->Album[0] = new Album();
+        $user->Album[1] = new Album();
+        $user->Album[2] = new Album();
+        
+        $user->Book[0] = new Book();
+        $user->Book[1] = new Book();
+        $user->save();
+    }
+    
+    public function testMultipleAggregateValues()
+    {
+        $query = new Doctrine_Query();
+        $query->select('u.*, COUNT(DISTINCT b.id) num_books, COUNT(DISTINCT a.id) num_albums');
+        $query->from('User u');
+        $query->leftJoin('u.Album a, u.Book b');
+        $query->where("u.name = 'jon'");
+        $query->limit(1);
+        
+        $user = $query->execute()->getFirst();
+        
+        try {
+            $name = $user->name;
+            $num_albums = $user->num_albums;
+            $num_books = $user->num_books;    
+        } catch (Doctrine_Exception $e) {
+            $this->fail();
+        }
+        
+        $this->assertEqual($num_albums, 3);
+        $this->assertEqual($num_books, 2);
+    }
+    public function testMultipleAggregateValuesWithArrayFetching()
+    {
+        $query = new Doctrine_Query();
+        $query->select('u.*, COUNT(DISTINCT b.id) num_books, COUNT(DISTINCT a.id) num_albums');
+        $query->from('User u');
+        $query->leftJoin('u.Album a, u.Book b');
+        $query->where("u.name = 'jon'");
+        $query->limit(1);
+        
+        $users = $query->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+        try {
+            $name = $users[0]['name'];
+            $num_albums = $users[0]['num_albums'];
+            $num_books = $users[0]['num_books'];
+        } catch (Doctrine_Exception $e) {
+            $this->fail();
+        }
+
+        $this->assertEqual($num_albums, 3);
+        $this->assertEqual($num_books, 2);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/MysqlSubqueryHavingTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/MysqlSubqueryHavingTestCase.php
new file mode 100644
index 000000000..6e04ce560
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/MysqlSubqueryHavingTestCase.php
@@ -0,0 +1,73 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_MysqlSubquery_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_MysqlSubqueryHaving_TestCase extends Doctrine_UnitTestCase 
+{
+    public function setUp()
+    {
+        $this->dbh = new Doctrine_Adapter_Mock('mysql');
+        $this->conn = Doctrine_Manager::getInstance()->openConnection($this->dbh);
+    }
+
+    public function testGetLimitSubqueryWithHavingOnAggregateValues()
+    {
+        $q = new Doctrine_Query();
+        $q->select('u.name, COUNT(DISTINCT a.id) num_albums');
+        $q->from('User u, u.Album a');
+        $q->orderby('num_albums DESC');
+        $q->having('num_albums > 0');
+        $q->groupby('u.id');
+        $q->limit(5);
+
+        $q->execute();
+
+        $this->dbh->pop();
+
+        $this->assertEqual($this->dbh->pop(), 'SELECT DISTINCT e2.id, COUNT(DISTINCT a2.id) AS a2__0 FROM entity e2 LEFT JOIN album a2 ON e2.id = a2.user_id WHERE (e2.type = 0) GROUP BY e2.id HAVING a2__0 > 0 ORDER BY a2__0 DESC LIMIT 5');
+    }
+    
+    public function testGetLimitSubqueryWithHavingOnAggregateValuesIncorrectAlias()
+    {
+        $q = new Doctrine_Query();
+        $q->select('u.name, COUNT(a.id) num_albums');
+        $q->from('User u, u.Album a');
+        $q->orderby('num_albums DESC');
+        $q->having('num_albums > 0');
+        $q->groupby('u.id');
+        $q->limit(5);
+
+        $q->execute();
+
+        $this->dbh->pop();
+        $this->assertEqual($this->dbh->pop(), 'SELECT DISTINCT e2.id, COUNT(a2.id) AS a2__0 FROM entity e2 LEFT JOIN album a2 ON e2.id = a2.user_id WHERE (e2.type = 0) GROUP BY e2.id HAVING a2__0 > 0 ORDER BY a2__0 DESC LIMIT 5');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/MysqlSubqueryTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/MysqlSubqueryTestCase.php
new file mode 100644
index 000000000..54542018d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/MysqlSubqueryTestCase.php
@@ -0,0 +1,117 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_MysqlSubquery_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_MysqlSubquery_TestCase extends Doctrine_UnitTestCase 
+{
+    public function setUp()
+    {
+        $this->dbh = new Doctrine_Adapter_Mock('mysql');
+        $this->conn = Doctrine_Manager::getInstance()->openConnection($this->dbh);
+    }
+
+    public function testGetLimitSubquerSupportsOrderByWithAggregateValues()
+    {
+        $q = new Doctrine_Query();
+        $q->select('u.name, COUNT(DISTINCT a.id) num_albums');
+        $q->from('User u, u.Album a');
+        $q->orderby('num_albums');
+        $q->groupby('u.id');
+        $q->limit(5);
+
+        $q->execute();
+
+        $this->dbh->pop();
+
+        $this->assertEqual($this->dbh->pop(), 'SELECT DISTINCT e2.id, COUNT(DISTINCT a2.id) AS a2__0 FROM entity e2 LEFT JOIN album a2 ON e2.id = a2.user_id WHERE (e2.type = 0) GROUP BY e2.id ORDER BY a2__0 LIMIT 5');
+    }
+    public function testGetLimitSubquerySupportsOrderByWithAggregateValuesAndDescKeyword()
+    {
+        $q = new Doctrine_Query();
+        $q->select('u.name, COUNT(DISTINCT a.id) num_albums');
+        $q->from('User u, u.Album a');
+        $q->orderby('num_albums DESC, u.name');
+        $q->groupby('u.id');
+        $q->limit(5);
+
+        $q->execute();
+
+        $this->dbh->pop();
+
+        $this->assertEqual($this->dbh->pop(), 'SELECT DISTINCT e2.id, COUNT(DISTINCT a2.id) AS a2__0 FROM entity e2 LEFT JOIN album a2 ON e2.id = a2.user_id WHERE (e2.type = 0) GROUP BY e2.id ORDER BY a2__0 DESC, e2.name LIMIT 5');
+    }
+    public function testGetLimitSubquerySupportsOrderByWithAggregateValuesAndColumns()
+    {
+        $q = new Doctrine_Query();
+        $q->select('u.name, COUNT(DISTINCT a.id) num_albums');
+        $q->from('User u, u.Album a');
+        $q->orderby('num_albums, u.name');
+        $q->groupby('u.id');
+        $q->limit(5);
+
+        $q->execute();
+
+        $this->dbh->pop();
+
+        $this->assertEqual($this->dbh->pop(), 'SELECT DISTINCT e2.id, COUNT(DISTINCT a2.id) AS a2__0 FROM entity e2 LEFT JOIN album a2 ON e2.id = a2.user_id WHERE (e2.type = 0) GROUP BY e2.id ORDER BY a2__0, e2.name LIMIT 5');
+    }
+    public function testGetLimitSubquerySupportsOrderByAndHavingWithAggregateValues()
+    {
+        $q = new Doctrine_Query();
+        $q->select('u.name, COUNT(DISTINCT a.id) num_albums');
+        $q->from('User u, u.Album a');
+        $q->orderby('num_albums DESC');
+        $q->having('num_albums > 0');
+        $q->groupby('u.id');
+        $q->limit(5);
+
+        $q->execute();
+
+        $this->dbh->pop();
+        
+        $this->assertEqual($this->dbh->pop(), 'SELECT DISTINCT e2.id, COUNT(DISTINCT a2.id) AS a2__0 FROM entity e2 LEFT JOIN album a2 ON e2.id = a2.user_id WHERE (e2.type = 0) GROUP BY e2.id HAVING a2__0 > 0 ORDER BY a2__0 DESC LIMIT 5');
+    }
+    public function testGetLimitSubquerySupportsHavingWithAggregateValues()
+    {
+        $q = new Doctrine_Query();
+        $q->select('u.name, COUNT(DISTINCT a.id) num_albums');
+        $q->from('User u, u.Album a');
+        $q->having('num_albums > 0');
+        $q->groupby('u.id');
+        $q->limit(5);
+
+        $q->execute();
+
+        $this->dbh->pop();
+        
+        $this->assertEqual($this->dbh->pop(), 'SELECT DISTINCT e2.id, COUNT(DISTINCT a2.id) AS a2__0 FROM entity e2 LEFT JOIN album a2 ON e2.id = a2.user_id WHERE (e2.type = 0) GROUP BY e2.id HAVING a2__0 > 0 LIMIT 5');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/OneToOneFetchingTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/OneToOneFetchingTestCase.php
new file mode 100644
index 000000000..84a530761
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/OneToOneFetchingTestCase.php
@@ -0,0 +1,263 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_MultiJoin2_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_OneToOneFetching_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData()
+    { }
+    public function prepareTables()
+    {
+        $this->tables[] = 'QueryTest_Category';
+        $this->tables[] = 'QueryTest_Board';
+        $this->tables[] = 'QueryTest_User';
+        $this->tables[] = 'QueryTest_Entry';
+        $this->tables[] = 'QueryTest_Rank';
+        parent::prepareTables();
+    }
+    public function testInitializeData() 
+    {
+        $query = new Doctrine_Query($this->connection);
+        
+        $cat = new QueryTest_Category();
+
+        $cat->rootCategoryId = 0;
+        $cat->parentCategoryId = 0;
+        $cat->name = "Testcat";
+        $cat->position = 0;
+        $cat->save();
+        
+        $board = new QueryTest_Board();
+        $board->name = "Testboard";
+        $board->categoryId = $cat->id;
+        $board->position = 0;
+        $board->save();
+        
+        $author = new QueryTest_User();
+        $author->username = "romanbb";
+        $author->save();
+        
+        $lastEntry = new QueryTest_Entry();
+        $lastEntry->authorId = $author->id;
+        $lastEntry->date = 1234;
+        $lastEntry->save();
+        
+        // Set the last entry
+        $board->lastEntry = $lastEntry;
+        $board->save();
+        
+        $visibleRank = new QueryTest_Rank();
+        $visibleRank->title = "Freak";
+        $visibleRank->color = "red";
+        $visibleRank->icon = "freak.png";
+        $visibleRank->save();
+        
+        // grant him a rank
+        $author->visibleRank = $visibleRank;
+        $author->save();
+
+    }
+
+    /**
+     * Tests that one-one relations are correctly loaded with array fetching
+     * when the related records EXIST.
+     * 
+     * !!! Currently it produces a notice with:
+     * !!! Array to string conversion in Doctrine\Hydrate.php on line 937 
+     * 
+     * !!! And shortly after exits with a fatal error:
+     * !!! Fatal error:  Cannot create references to/from string offsets nor overloaded objects
+     * !!! in Doctrine\Hydrate.php on line 939
+     */
+    public function testOneToOneArrayFetchingWithExistingRelations()
+    {
+        $query = new Doctrine_Query($this->connection);
+        try {
+            $categories = $query->select("c.*, b.*, le.*, a.username, vr.title, vr.color, vr.icon")
+                    ->from("QueryTest_Category c")
+                    ->leftJoin("c.boards b")
+                    ->leftJoin("b.lastEntry le")
+                    ->leftJoin("le.author a")
+                    ->leftJoin("a.visibleRank vr")
+                    ->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+            // --> currently quits here with a fatal error! <--
+                    
+            // check boards/categories
+            $this->assertEqual(1, count($categories));
+            $this->assertTrue(isset($categories[0]['boards']));
+            $this->assertEqual(1, count($categories[0]['boards']));
+            
+            // get the baord for inspection
+            $board = $categories[0]['boards'][0];
+            
+            $this->assertTrue(isset($board['lastEntry']));
+            
+            // lastentry should've 2 fields. one regular field, one relation.
+            //$this->assertEqual(2, count($board['lastEntry']));
+            $this->assertEqual(1234, (int)$board['lastEntry']['date']);
+            $this->assertTrue(isset($board['lastEntry']['author']));
+
+            // author should've 2 fields. one regular field, one relation.
+            //$this->assertEqual(2, count($board['lastEntry']['author']));
+            $this->assertEqual('romanbb', $board['lastEntry']['author']['username']);
+            $this->assertTrue(isset($board['lastEntry']['author']['visibleRank']));
+
+            // visibleRank should've 3 regular fields
+            //$this->assertEqual(3, count($board['lastEntry']['author']['visibleRank']));
+            $this->assertEqual('Freak', $board['lastEntry']['author']['visibleRank']['title']);
+            $this->assertEqual('red', $board['lastEntry']['author']['visibleRank']['color']);
+            $this->assertEqual('freak.png', $board['lastEntry']['author']['visibleRank']['icon']);
+                    
+        } catch (Doctrine_Exception $e) {
+            $this->fail();                                    
+        }
+    }
+
+     /**
+     * Tests that one-one relations are correctly loaded with array fetching
+     * when the related records DONT EXIST.
+     */
+    public function testOneToOneArrayFetchingWithEmptyRelations()
+    {
+        // temporarily remove the relation to fake a non-existant one
+        $board = $this->connection->query("FROM QueryTest_Board b WHERE b.name = ?", array('Testboard'))->getFirst();
+        $lastEntryId = $board->lastEntryId;
+        $board->lastEntryId = 0;
+        $board->save();
+        
+        $query = new Doctrine_Query($this->connection);
+        try {
+            $categories = $query->select("c.*, b.*, le.*, a.username, vr.title, vr.color, vr.icon")
+                    ->from("QueryTest_Category c")
+                    ->leftJoin("c.boards b")
+                    ->leftJoin("b.lastEntry le")
+                    ->leftJoin("le.author a")
+                    ->leftJoin("a.visibleRank vr")
+                    ->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+
+            // check boards/categories
+            $this->assertEqual(1, count($categories));
+            $this->assertTrue(isset($categories[0]['boards']));
+            $this->assertEqual(1, count($categories[0]['boards']));
+            
+            // get the board for inspection
+            $tmpBoard = $categories[0]['boards'][0];
+            
+            $this->assertTrue( ! isset($tmpBoard['lastEntry']));
+                    
+        } catch (Doctrine_Exception $e) {
+            $this->fail();                                    
+        }
+        
+        $board->lastEntryId = $lastEntryId;
+        $board->save();
+    }
+
+    // Tests that one-one relations are correctly loaded with record fetching
+    // when the related records EXIST.
+    public function testOneToOneRecordFetchingWithExistingRelations()
+    {
+        $query = new Doctrine_Query($this->connection);
+        try {
+            $categories = $query->select("c.*, b.*, le.date, a.username, vr.title, vr.color, vr.icon")
+                    ->from("QueryTest_Category c")
+                    ->leftJoin("c.boards b")
+                    ->leftJoin("b.lastEntry le")
+                    ->leftJoin("le.author a")
+                    ->leftJoin("a.visibleRank vr")
+                    ->execute();
+ 
+            // check boards/categories
+            $this->assertEqual(1, count($categories));
+            $this->assertEqual(1, count($categories[0]['boards']));
+            
+            // get the baord for inspection
+            $board = $categories[0]['boards'][0];
+
+            $this->assertEqual(1234, (int)$board['lastEntry']['date']);
+            $this->assertTrue(isset($board['lastEntry']['author']));
+            
+            $this->assertEqual('romanbb', $board['lastEntry']['author']['username']);
+            $this->assertTrue(isset($board['lastEntry']['author']['visibleRank']));
+            
+            $this->assertEqual('Freak', $board['lastEntry']['author']['visibleRank']['title']);
+            $this->assertEqual('red', $board['lastEntry']['author']['visibleRank']['color']);
+            $this->assertEqual('freak.png', $board['lastEntry']['author']['visibleRank']['icon']);
+                    
+        } catch (Doctrine_Exception $e) {
+            $this->fail();                                    
+        }
+    }
+
+
+    // Tests that one-one relations are correctly loaded with record fetching
+    // when the related records DONT EXIST.
+
+    public function testOneToOneRecordFetchingWithEmptyRelations()
+    {
+        // temporarily remove the relation to fake a non-existant one
+        $board = $this->connection->query("FROM QueryTest_Board b WHERE b.name = ?", array('Testboard'))->getFirst();
+        $lastEntryId = $board->lastEntryId;
+        $board->lastEntryId = null;
+        $board->lastEntry = null;
+        $board->save();
+        
+        $query = new Doctrine_Query($this->connection);
+        try {
+            $categories = $query->select("c.*, b.*, le.*, a.username, vr.title, vr.color, vr.icon")
+                    ->from("QueryTest_Category c")
+                    ->leftJoin("c.boards b")
+                    ->leftJoin("b.lastEntry le")
+                    ->leftJoin("le.author a")
+                    ->leftJoin("a.visibleRank vr")
+                    ->execute();
+
+            // check boards/categories
+            $this->assertEqual(1, count($categories));
+            $this->assertTrue(isset($categories[0]['boards']));
+            $this->assertEqual(1, count($categories[0]['boards']));
+
+            // get the board for inspection
+            $tmpBoard = $categories[0]['boards'][0];
+            $this->assertTrue( ! isset($tmpBoard['lastEntry']));
+
+        } catch (Doctrine_Exception $e) {
+            print $e;
+            $this->fail();
+        }
+
+        $board->lastEntryId = $lastEntryId;
+        //$board->save();
+    }
+
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/OrderbyTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/OrderbyTestCase.php
new file mode 100644
index 000000000..815fe0d57
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/OrderbyTestCase.php
@@ -0,0 +1,105 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_Orderby_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_Orderby_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testOrderByRandomIsSupported()
+    {
+        $q = new Doctrine_Query();
+        
+        $q->select('u.name, RANDOM() rand')
+          ->from('User u')
+          ->orderby('rand DESC');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name, ((RANDOM() + 2147483648) / 4294967296) AS e__0 FROM entity e WHERE (e.type = 0) ORDER BY e__0 DESC');
+    }
+    public function testOrderByAggregateValueIsSupported()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('u.name, COUNT(p.phonenumber) count')
+          ->from('User u')
+          ->leftJoin('u.Phonenumber p')
+          ->orderby('count DESC');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name, COUNT(p.phonenumber) AS p__0 FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.type = 0) ORDER BY p__0 DESC');
+    }
+
+    // ticket #681
+    public function testOrderByWithCoalesce()
+    {
+        try {
+            $q = new Doctrine_Query();
+        
+            $q->select('u.name')
+              ->from('User u')
+              ->orderby('COALESCE(u.id, u.name) DESC');
+            // nonesese results expected, but query is syntatically ok.
+            $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name FROM entity e WHERE (e.type = 0) ORDER BY COALESCE(e.id, e.name) DESC');
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+    
+    public function testOrderByWithMultipleCoalesce()
+    {
+        try {
+            $q = new Doctrine_Query();
+        
+            $q->select('u.name')
+              ->from('User u')
+              ->orderby('COALESCE(u.id, u.name) DESC, COALESCE(u.name, u.id) ASC');
+            // nonesese results expected, but query is syntatically ok.
+            $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name FROM entity e WHERE (e.type = 0) ORDER BY COALESCE(e.id, e.name) DESC, COALESCE(e.name, e.id) ASC');
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+
+    public function testOrderByWithDifferentOrderning()
+    {
+        try {
+            $q = new Doctrine_Query();
+        
+            $q->select('u.name')
+              ->from('User u')
+              ->orderby('u.id ASC, u.name DESC');
+            // nonesese results expected, but query is syntatically ok.
+            $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name FROM entity e WHERE (e.type = 0) ORDER BY e.id ASC, e.name DESC');
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/PgsqlSubqueryTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/PgsqlSubqueryTestCase.php
new file mode 100644
index 000000000..46256fc60
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/PgsqlSubqueryTestCase.php
@@ -0,0 +1,73 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_PgsqlSubquery_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_PgsqlSubquery_TestCase extends Doctrine_UnitTestCase
+{
+    public function setUp()
+    {
+        $this->dbh = new Doctrine_Adapter_Mock('pgsql');
+        $this->conn = Doctrine_Manager::getInstance()->openConnection($this->dbh);
+    }
+
+    public function testGetLimitSubqueryWithOrderByOnAggregateValues()
+    {
+        $q = new Doctrine_Query();
+        $q->select('u.name, COUNT(DISTINCT a.id) num_albums');
+        $q->from('User u, u.Album a');
+        $q->orderby('num_albums');
+        $q->groupby('u.id');
+        $q->limit(5);
+
+        $q->execute();
+
+        $this->assertEqual($this->dbh->pop(), 'SELECT e.id AS e__id, e.name AS e__name, COUNT(DISTINCT a.id) AS a__0 FROM entity e LEFT JOIN album a ON e.id = a.user_id WHERE e.id IN '
+                                             . '(SELECT doctrine_subquery_alias.id FROM '
+                                             . '(SELECT DISTINCT e2.id, COUNT(DISTINCT a2.id) AS a2__0 FROM entity e2 LEFT JOIN album a2 ON e2.id = a2.user_id WHERE (e2.type = 0) GROUP BY e2.id ORDER BY a2__0 LIMIT 5) '
+                                             . 'AS doctrine_subquery_alias) AND (e.type = 0) GROUP BY e.id ORDER BY a__0');
+
+    }
+
+    public function testGetLimitSubqueryWithOrderByOnAggregateValuesAndColumns()
+    {
+        $q = new Doctrine_Query();
+        $q->select('u.name, COUNT(DISTINCT a.id) num_albums');
+        $q->from('User u, u.Album a');
+        $q->orderby('num_albums, u.name');
+        $q->groupby('u.id');
+        $q->limit(5);
+
+        $q->execute();
+
+        $this->assertEqual($this->dbh->pop(), 'SELECT e.id AS e__id, e.name AS e__name, COUNT(DISTINCT a.id) AS a__0 FROM entity e LEFT JOIN album a ON e.id = a.user_id WHERE e.id IN (SELECT doctrine_subquery_alias.id FROM (SELECT DISTINCT e2.id, e2.name, COUNT(DISTINCT a2.id) AS a2__0 FROM entity e2 LEFT JOIN album a2 ON e2.id = a2.user_id WHERE (e2.type = 0) GROUP BY e2.id ORDER BY a2__0, e2.name LIMIT 5) AS doctrine_subquery_alias) AND (e.type = 0) GROUP BY e.id ORDER BY a__0, e.name');
+    }
+
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/ReferenceModelTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/ReferenceModelTestCase.php
new file mode 100644
index 000000000..a8138b9db
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/ReferenceModelTestCase.php
@@ -0,0 +1,204 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_ReferenceModel_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_ReferenceModel_TestCase extends Doctrine_UnitTestCase {
+    public function prepareTables() {
+        $this->tables = array();
+        $this->tables[] = "Forum_Category";
+        $this->tables[] = "Forum_Entry";
+        $this->tables[] = "Forum_Board";
+        $this->tables[] = "Forum_Thread";
+
+        parent::prepareTables();
+        $this->connection->clear();
+    }
+    public function prepareData() 
+    { }
+
+    public function testInitializeData() {
+        $this->connection->clear();
+        $query = new Doctrine_Query($this->connection);
+
+        $category = new Forum_Category();
+
+        $category->name = 'Root';
+        $category->Subcategory[0]->name = 'Sub 1';
+        $category->Subcategory[1]->name = 'Sub 2';
+        $category->Subcategory[0]->Subcategory[0]->name = 'Sub 1 Sub 1';
+        $category->Subcategory[0]->Subcategory[1]->name = 'Sub 1 Sub 2';
+        $category->Subcategory[1]->Subcategory[0]->name = 'Sub 2 Sub 1';
+        $category->Subcategory[1]->Subcategory[1]->name = 'Sub 2 Sub 2';
+
+        $this->connection->flush();
+        $this->connection->clear();
+
+        $category = $category->getTable()->find($category->id);
+
+        $this->assertEqual($category->name, 'Root');
+        $this->assertEqual($category->Subcategory[0]->name, 'Sub 1');
+        $this->assertEqual($category->Subcategory[1]->name, 'Sub 2');
+        $this->assertEqual($category->Subcategory[0]->Subcategory[0]->name, 'Sub 1 Sub 1');
+        $this->assertEqual($category->Subcategory[0]->Subcategory[1]->name, 'Sub 1 Sub 2');
+        $this->assertEqual($category->Subcategory[1]->Subcategory[0]->name, 'Sub 2 Sub 1');
+        $this->assertEqual($category->Subcategory[1]->Subcategory[1]->name, 'Sub 2 Sub 2');
+
+        $this->connection->clear();
+    }
+
+    public function testSelfReferencingWithNestedOrderBy() {
+        $query = new Doctrine_Query();
+        
+        $query->from('Forum_Category.Subcategory.Subcategory');
+        $query->orderby('Forum_Category.id ASC, Forum_Category.Subcategory.name DESC');
+
+        $coll = $query->execute();
+        
+        $category = $coll[0];
+
+        $this->assertEqual($category->name, 'Root');
+        $this->assertEqual($category->Subcategory[0]->name, 'Sub 2');
+        $this->assertEqual($category->Subcategory[1]->name, 'Sub 1');
+        $this->assertEqual($category->Subcategory[1]->Subcategory[0]->name, 'Sub 1 Sub 1');
+        $this->assertEqual($category->Subcategory[1]->Subcategory[1]->name, 'Sub 1 Sub 2');
+        $this->assertEqual($category->Subcategory[0]->Subcategory[0]->name, 'Sub 2 Sub 1');
+        $this->assertEqual($category->Subcategory[0]->Subcategory[1]->name, 'Sub 2 Sub 2');
+
+        $this->connection->clear();
+    }
+
+    /**
+    public function testSelfReferencingWithDoubleNesting() {
+        $query = new Doctrine_Query();
+        $category = new Forum_Category();
+
+        $query->from('Forum_Category.Subcategory.Subcategory');
+        $coll = $query->execute();
+        $category = $coll[0];
+
+        $count = count($this->dbh);
+
+        $this->assertEqual($category->name, 'Root');
+        
+        $this->assertEqual($count, count($this->dbh));
+        $this->assertEqual($category->Subcategory[0]->name, 'Sub 1');
+        $this->assertEqual($category->Subcategory[1]->name, 'Sub 2');
+
+        $this->assertEqual($count, count($this->dbh));
+        $this->assertEqual($category->Subcategory[0]->Subcategory[0]->name, 'Sub 1 Sub 1');
+        $this->assertEqual($category->Subcategory[0]->Subcategory[1]->name, 'Sub 1 Sub 2');
+        $this->assertEqual($category->Subcategory[1]->Subcategory[0]->name, 'Sub 2 Sub 1');
+        $this->assertEqual($category->Subcategory[1]->Subcategory[1]->name, 'Sub 2 Sub 2');
+        $this->assertEqual($count, count($this->dbh));
+        
+        $this->connection->clear();
+    }
+    public function testSelfReferencingWithNestingAndConditions() {
+        $query = new Doctrine_Query();
+        $query->from("Forum_Category.Parent.Parent")->where("Forum_Category.name LIKE 'Sub%Sub%'");
+        $coll = $query->execute();
+
+
+        $count = count($this->dbh);
+        $this->assertEqual($coll->count(), 4);
+        $this->assertEqual($coll[0]->name, 'Sub 1 Sub 1');
+        $this->assertEqual($coll[1]->name, 'Sub 1 Sub 2');
+        $this->assertEqual($coll[2]->name, 'Sub 2 Sub 1');
+        $this->assertEqual($coll[3]->name, 'Sub 2 Sub 2');
+
+        $this->assertEqual($count, count($this->dbh));
+
+        $this->assertEqual($coll[0]->Parent->name, 'Sub 1');
+        $this->assertEqual($coll[1]->Parent->name, 'Sub 1');
+        $this->assertEqual($coll[2]->Parent->name, 'Sub 2');
+        $this->assertEqual($coll[3]->Parent->name, 'Sub 2');
+        
+        $this->assertEqual($count, count($this->dbh));
+
+        $this->assertEqual($coll[0]->Parent->Parent->name, 'Root');
+        $this->assertEqual($coll[1]->Parent->Parent->name, 'Root');
+        $this->assertEqual($coll[2]->Parent->Parent->name, 'Root');
+        $this->assertEqual($coll[3]->Parent->Parent->name, 'Root');
+
+        $this->assertEqual($count, count($this->dbh));
+    }
+    public function testSelfReferencingWithNestingAndMultipleConditions() {
+        $query = new Doctrine_Query();
+        $query->from("Forum_Category.Parent, Forum_Category.Subcategory")->where("Forum_Category.name = 'Sub 1' || Forum_Category.name = 'Sub 2'");
+
+
+        $coll = $query->execute();
+        
+        $count = count($this->dbh);
+        
+        $this->assertEqual($coll->count(), 2);
+        $this->assertEqual($coll[0]->name, 'Sub 1');
+        $this->assertEqual($coll[1]->name, 'Sub 2');
+        
+        $this->assertEqual($count, count($this->dbh));
+
+        $this->assertEqual($coll[0]->Subcategory[0]->name, 'Sub 1 Sub 1');
+        $this->assertEqual($coll[0]->Subcategory[1]->name, 'Sub 1 Sub 2');
+        $this->assertEqual($coll[1]->Subcategory[0]->name, 'Sub 2 Sub 1');
+        $this->assertEqual($coll[1]->Subcategory[1]->name, 'Sub 2 Sub 2');
+
+        $this->assertEqual($count, count($this->dbh));
+
+        $this->assertEqual($coll[0]->Parent->name, 'Root');
+        $this->assertEqual($coll[1]->Parent->name, 'Root');
+
+        $this->assertEqual($count, count($this->dbh));
+        
+        $this->connection->clear();
+    }
+    public function testSelfReferencingWithIsNull() {
+        $query = new Doctrine_Query();
+        $query->from('Forum_Category.Subcategory.Subcategory')->where('Forum_Category.parent_category_id IS NULL');
+        $coll = $query->execute();
+        $this->assertEqual($coll->count(), 1);
+        
+        $count = count($this->dbh);
+        $category = $coll[0];
+        $this->assertEqual($category->name, 'Root');
+        
+        $this->assertEqual($count, count($this->dbh));
+        $this->assertEqual($category->Subcategory[0]->name, 'Sub 1');
+        $this->assertEqual($category->Subcategory[1]->name, 'Sub 2');
+
+        $this->assertEqual($count, count($this->dbh));
+        $this->assertEqual($category->Subcategory[0]->Subcategory[0]->name, 'Sub 1 Sub 1');
+        $this->assertEqual($category->Subcategory[0]->Subcategory[1]->name, 'Sub 1 Sub 2');
+        $this->assertEqual($category->Subcategory[1]->Subcategory[0]->name, 'Sub 2 Sub 1');
+        $this->assertEqual($category->Subcategory[1]->Subcategory[1]->name, 'Sub 2 Sub 2');
+        $this->assertEqual($count, count($this->dbh));
+    }
+    */
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/RegistryTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/RegistryTestCase.php
new file mode 100644
index 000000000..8789c0989
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/RegistryTestCase.php
@@ -0,0 +1,67 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_Registry_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_Registry_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables = array('User');
+        
+        parent::prepareTables();
+    }
+    public function prepareData()
+    { }
+
+    public function testAddingQueries()
+    {
+        $registry = new Doctrine_Query_Registry();
+
+        $registry->add('all-users', 'SELECT u.* FROM User u');
+
+        $this->assertEqual($registry->get('all-users')->getDql(), 'SELECT u.* FROM User u');
+    }
+
+    public function testAddingQueriesWithNamespaces()
+    {
+        $registry = new Doctrine_Query_Registry();
+
+        $registry->add('User/all', 'SELECT u.* FROM User u');
+
+        $this->assertEqual($registry->get('all', 'User')->getDql(), 'SELECT u.* FROM User u');
+        
+        $this->manager->setQueryRegistry($registry);
+
+        $user = new User();
+        
+        $user->getTable()->execute('all');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/RemoveQueryPartTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/RemoveQueryPartTestCase.php
new file mode 100644
index 000000000..aefcacb33
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/RemoveQueryPartTestCase.php
@@ -0,0 +1,85 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_Copy_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_RemoveQueryPart_TestCase extends Doctrine_UnitTestCase 
+{
+	public function testQueryRemoveOrderByPart()
+	{
+		$q = new Doctrine_Query();
+		$q->from('User u');
+        $q->orderBy('u.id DESC');
+
+		$q->removeDqlQueryPart('orderby');
+
+		$this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id FROM entity e WHERE (e.type = 0)');
+	}
+
+	public function testQueryRemoveLimitPart()
+	{
+		$q = new Doctrine_Query();
+		$q->from('User u');
+        $q->limit(20);
+		$q->removeDqlQueryPart('limit');
+
+		$this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id FROM entity e WHERE (e.type = 0)');
+	}
+
+	public function testQueryRemoveOffsetPart()
+	{
+		$q = new Doctrine_Query();
+		$q->from('User u');
+        $q->offset(10);
+		$q->removeDqlQueryPart('offset');
+
+		$this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id FROM entity e WHERE (e.type = 0)');
+	}
+
+	public function testQuerySetLimitToZero()
+	{
+		$q = new Doctrine_Query();
+		$q->from('User u');
+        $q->limit(20);
+		$q->limit(0);
+
+		$this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id FROM entity e WHERE (e.type = 0)');
+	}
+
+	public function testQuerySetOffsetToZero()
+	{
+		$q = new Doctrine_Query();
+		$q->from('User u');
+        $q->offset(20);
+		$q->offset(0);
+
+		$this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id FROM entity e WHERE (e.type = 0)');
+	}	
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/SelectExpressionTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/SelectExpressionTestCase.php
new file mode 100644
index 000000000..d72549759
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/SelectExpressionTestCase.php
@@ -0,0 +1,113 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_SelectExpression_TestCase
+ * This test case is used for testing DQL SELECT expressions functionality
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_SelectExpression_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData() 
+    { }
+    public function prepareTables() 
+    { 
+        $this->tables = array('User');
+        parent::prepareTables();
+    }
+    public function testAdditionExpression()
+    {
+        $query = new Doctrine_Query();
+        $query->select('u.*, (u.id + u.id) addition');
+        $query->from('User u');
+
+        try {
+            $users = $query->execute();
+            $this->pass();
+        } catch(Exception $e) {
+            $this->fail();
+        }
+    }
+    
+    public function testSubtractionExpression()
+    {
+        $query = new Doctrine_Query();
+        $query->select('u.*, (u.id - u.id) subtraction');
+        $query->from('User u');
+        
+        try {
+            $users = $query->execute();
+            $this->pass();
+        } catch(Exception $e) {
+            $this->fail();
+        }
+    }
+    
+    public function testDivisionExpression()
+    {
+        $query = new Doctrine_Query();
+        $query->select('u.*, (u.id/u.id) division');
+        $query->from('User u');
+        
+        try {
+            $users = $query->execute();
+            $this->pass();
+        } catch(Exception $e) {
+            $this->fail();
+        } 
+    }
+    
+    public function testMultiplicationExpression()
+    {
+        $query = new Doctrine_Query();
+        $query->select('u.*, (u.id * u.id) multiplication');
+        $query->from('User u');
+        
+        try {
+            $users = $query->execute();
+            $this->pass();
+        } catch(Exception $e) {
+            $this->fail();
+        } 
+    }
+    
+    public function testOrderByExpression()
+    {
+        $query = new Doctrine_Query();
+        $query->select('u.*, (u.id * u.id) multiplication');
+        $query->from('User u');
+        $query->orderby('multiplication asc');
+        
+        try {
+            $users = $query->execute();
+            $this->pass();
+        } catch(Exception $e) {
+            $this->fail();
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/SelectTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/SelectTestCase.php
new file mode 100644
index 000000000..f4c7820f9
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/SelectTestCase.php
@@ -0,0 +1,267 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_Select_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_Select_TestCase extends Doctrine_UnitTestCase
+{
+    
+    public function testParseSelect()
+    {
+    	$q = new Doctrine_Query();
+
+        $q->select('TRIM(u.name) name')->from('User u');
+
+        $q->execute();
+    }
+
+    public function testAggregateFunctionParsingSupportsMultipleComponentReferences()
+    {
+        $q = new Doctrine_Query();
+        $q->select("CONCAT(u.name, ' ', e.address) value")
+          ->from('User u')->innerJoin('u.Email e');
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT CONCAT(e.name, ' ', e2.address) AS e__0 FROM entity e INNER JOIN email e2 ON e.email_id = e2.id WHERE (e.type = 0)");
+
+        $users = $q->execute();
+        $this->assertEqual($users[0]->value, 'zYne zYne@example.com');
+    }
+
+    public function testSelectDistinctIsSupported()
+    {
+        $q = new Doctrine_Query();
+        
+        $q->distinct()->select('u.name')->from('User u');
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT DISTINCT e.id AS e__id, e.name AS e__name FROM entity e WHERE (e.type = 0)");
+    }
+
+    public function testSelectDistinctIsSupported2()
+    {
+        $q = new Doctrine_Query();
+        
+        $q->select('DISTINCT u.name')->from('User u');
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT DISTINCT e.id AS e__id, e.name AS e__name FROM entity e WHERE (e.type = 0)");
+    }
+
+    public function testAggregateFunctionWithDistinctKeyword() 
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery('SELECT COUNT(DISTINCT u.name) FROM User u');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT COUNT(DISTINCT e.name) AS e__0 FROM entity e WHERE (e.type = 0)');
+    }
+
+    public function testAggregateFunction() 
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery('SELECT COUNT(u.id) FROM User u');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT COUNT(e.id) AS e__0 FROM entity e WHERE (e.type = 0)');
+    }
+
+    public function testSelectPartSupportsMultipleAggregateFunctions() 
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery('SELECT MAX(u.id), MIN(u.name) FROM User u');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT MAX(e.id) AS e__0, MIN(e.name) AS e__1 FROM entity e WHERE (e.type = 0)');
+    }
+
+    public function testMultipleAggregateFunctionsWithMultipleComponents()
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery('SELECT MAX(u.id), MIN(u.name), COUNT(p.id) FROM User u, u.Phonenumber p');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT MAX(e.id) AS e__0, MIN(e.name) AS e__1, COUNT(p.id) AS p__2 FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.type = 0)');
+    }
+
+    public function testChangeUpdateToSelect()
+    {
+        $q = Doctrine_Query::create()
+            ->update('User u')
+            ->set('u.password', '?', 'newpassword')
+            ->where('u.username = ?', 'jwage');
+
+        $this->assertEqual($q->getType(), Doctrine_Query_Abstract::UPDATE);
+        $this->assertEqual($q->getDql(), 'UPDATE User u SET u.password = ? WHERE u.username = ?');
+
+        $q->select();
+
+        $this->assertEqual($q->getType(), Doctrine_Query_Abstract::SELECT);
+        $this->assertEqual($q->getDql(), ' FROM User u WHERE u.username = ?');
+    }
+
+    public function testUnknownAggregateFunction() 
+    {
+        $q = new Doctrine_Query();
+        
+        try {
+            $q->parseDqlQuery('SELECT UNKNOWN(u.id) FROM User u');
+            
+            $q->getSqlQuery();
+            $this->fail();
+        } catch(Doctrine_Query_Exception $e) {
+            $this->pass();
+        }
+    }
+
+    public function testAggregateFunctionValueHydration()
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery('SELECT u.id, u.name, COUNT(p.id) FROM User u LEFT JOIN u.Phonenumber p GROUP BY u.id');
+
+        $users = $q->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+        $this->assertEqual($users[0]['COUNT'], 1);
+
+        $this->assertEqual($users[1]['COUNT'], 3);
+        $this->assertEqual($users[2]['COUNT'], 1);
+        $this->assertEqual($users[3]['COUNT'], 1);
+        $this->assertEqual($users[4]['COUNT'], 3);
+    }
+
+    public function testSingleComponentWithAsterisk()
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery('SELECT u.* FROM User u');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id FROM entity e WHERE (e.type = 0)');
+    }
+    public function testSingleComponentWithMultipleColumns()
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery('SELECT u.name, u.type FROM User u'); 
+        
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name, e.type AS e__type FROM entity e WHERE (e.type = 0)');
+    }
+    public function testMultipleComponentsWithAsterisk()
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery('SELECT u.*, p.* FROM User u, u.Phonenumber p');
+
+        $this->assertEqual($q->getSqlQuery(),'SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id, p.id AS p__id, p.phonenumber AS p__phonenumber, p.entity_id AS p__entity_id FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.type = 0)');
+    }
+    public function testMultipleComponentsWithMultipleColumns()
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery('SELECT u.id, u.name, p.id FROM User u, u.Phonenumber p');
+
+        $this->assertEqual($q->getSqlQuery(),'SELECT e.id AS e__id, e.name AS e__name, p.id AS p__id FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.type = 0)');
+    }
+    public function testAggregateFunctionValueHydrationWithAliases()
+    {
+
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery('SELECT u.id, COUNT(p.id) count FROM User u, u.Phonenumber p GROUP BY u.id');
+
+        $users = $q->execute();
+
+        $this->assertEqual($users[0]->count, 1);
+        $this->assertEqual($users[1]->count, 3);
+        $this->assertEqual($users[2]->count, 1);
+        $this->assertEqual($users[3]->count, 1);
+        $this->assertEqual($users[4]->count, 3);
+    }
+    public function testMultipleAggregateFunctionValueHydrationWithAliases()
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery('SELECT u.id, COUNT(p.id) count, MAX(p.phonenumber) max FROM User u, u.Phonenumber p GROUP BY u.id');
+
+        $users = $q->execute();
+        $this->assertEqual($users[0]->count, 1);
+        $this->assertEqual($users[1]->count, 3);
+        $this->assertEqual($users[2]->count, 1);
+        $this->assertEqual($users[3]->count, 1);
+        $this->assertEqual($users[4]->count, 3);
+
+        $this->assertEqual($users[0]->max, '123 123');
+        $this->assertEqual($users[1]->max, '789 789');
+        $this->assertEqual($users[2]->max, '123 123');
+        $this->assertEqual($users[3]->max, '111 222 333');
+        $this->assertEqual($users[4]->max, '444 555');
+    }
+    public function testMultipleAggregateFunctionValueHydrationWithAliasesAndCleanRecords()
+    {
+        $this->connection->clear();
+
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery('SELECT u.id, COUNT(p.id) count, MAX(p.phonenumber) max FROM User u, u.Phonenumber p GROUP BY u.id');
+        
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, COUNT(p.id) AS p__0, MAX(p.phonenumber) AS p__1 FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.type = 0) GROUP BY e.id');
+
+        $users = $q->execute();
+
+        $this->assertEqual($users[0]->count, 1);
+        $this->assertEqual($users[1]->count, 3);
+        $this->assertEqual($users[2]->count, 1);
+        $this->assertEqual($users[3]->count, 1);
+        $this->assertEqual($users[4]->count, 3);
+
+        $this->assertEqual($users[0]->max, '123 123');
+        $this->assertEqual($users[1]->max, '789 789');
+        $this->assertEqual($users[2]->max, '123 123');
+        $this->assertEqual($users[3]->max, '111 222 333');
+        $this->assertEqual($users[4]->max, '444 555');
+    }
+
+    public function testWhereInSupportInDql()
+    {
+        $q = Doctrine_Query::create()
+            ->select('u.id, p.id')
+            ->from('User u')
+            ->leftJoin('u.Phonenumber p')
+            ->where('u.id IN ?');
+
+        $params = array(array(4, 5, 6));
+
+        $this->assertEqual(
+            $q->getSqlQuery($params),
+            'SELECT e.id AS e__id, p.id AS p__id FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.id IN (?, ?, ?) AND (e.type = 0))'
+        );
+
+        $users = $q->execute($params, Doctrine_Core::HYDRATE_ARRAY);
+        
+        $this->assertEqual(count($users), 3);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/ShortAliasesTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/ShortAliasesTestCase.php
new file mode 100644
index 000000000..49f2d027b
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/ShortAliasesTestCase.php
@@ -0,0 +1,31 @@
+<?php
+class Doctrine_Query_ShortAliases_TestCase extends Doctrine_UnitTestCase {
+    /**
+    public function testShortAliasesWithSingleComponent() {
+        $q = new Doctrine_Query();
+
+        $q->select('u.name')->from('User u');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name FROM entity e WHERE (e.type = 0)');
+    }
+    */
+    public function testShortAliasesWithOneToManyLeftJoin() {
+        $q = new Doctrine_Query();
+        
+        $q->select('u.name, p.id')->from('User u LEFT JOIN u.Phonenumber p');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name, p.id AS p__id FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.type = 0)');
+
+        $users = $q->execute();
+        
+        $this->assertEqual($users->count(), 8);
+
+    }
+
+    public function testQuoteEncapedDots()
+    {
+        $q = new Doctrine_Query();
+        $q->select("CONCAT('testing.dot\'\"s.inquotes', p.id, '\'\"') as test, u.name")->from('User u LEFT JOIN u.Phonenumber p');
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e.name AS e__name, CONCAT('testing.dot\'\"s.inquotes', p.id, '\'\"') AS e__0 FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.type = 0)");
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/SubqueryTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/SubqueryTestCase.php
new file mode 100644
index 000000000..d7e9fb5ef
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/SubqueryTestCase.php
@@ -0,0 +1,151 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_Subquery_TestCase
+ * This test case is used for testing DQL subquery functionality
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_Subquery_TestCase extends Doctrine_UnitTestCase 
+{
+
+    public function testSubqueryWithWherePartAndInExpression()
+    {
+        $q = new Doctrine_Query();
+        $q->from('User u')->where("u.id NOT IN (SELECT u2.id FROM User u2 WHERE u2.name = 'zYne')");
+
+        $this->assertEqual($q->getSqlQuery(),
+        "SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id FROM entity e WHERE (e.id NOT IN (SELECT e2.id AS e2__id FROM entity e2 WHERE (e2.name = 'zYne' AND (e2.type = 0))) AND (e.type = 0))");
+
+        $users = $q->execute();
+
+        $this->assertEqual($users->count(), 7);
+        $this->assertEqual($users[0]->name, 'Arnold Schwarzenegger');
+    }
+
+    public function testSubqueryAllowsSelectingOfAnyField()
+    {
+        $q = new Doctrine_Query();
+        $q->from('User u')->where('u.id NOT IN (SELECT g.user_id FROM Groupuser g)');
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id FROM entity e WHERE (e.id NOT IN (SELECT g.user_id AS g__user_id FROM groupuser g) AND (e.type = 0))");
+    }
+
+    public function testSubqueryInSelectPart()
+    {
+        // ticket #307
+        $q = new Doctrine_Query();
+        
+        $q->parseDqlQuery("SELECT u.name, (SELECT COUNT(p.id) FROM Phonenumber p WHERE p.entity_id = u.id) pcount FROM User u WHERE u.name = 'zYne' LIMIT 1");
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e.name AS e__name, (SELECT COUNT(p.id) AS p__0 FROM phonenumber p WHERE (p.entity_id = e.id)) AS e__0 FROM entity e WHERE (e.name = 'zYne' AND (e.type = 0)) LIMIT 1");
+        // test consequent call
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e.name AS e__name, (SELECT COUNT(p.id) AS p__0 FROM phonenumber p WHERE (p.entity_id = e.id)) AS e__0 FROM entity e WHERE (e.name = 'zYne' AND (e.type = 0)) LIMIT 1");
+
+        $users = $q->execute();
+
+        $this->assertEqual($users->count(), 1);
+
+        $this->assertEqual($users[0]->name, 'zYne');
+        $this->assertEqual($users[0]->pcount, 1);
+    }
+
+    public function testSubqueryInSelectPartWithRawSql()
+    {
+        // ticket DC-706
+        $q = new Doctrine_Query();
+        
+        $q->parseDqlQuery("SELECT u.name, (SQL:SELECT COUNT(p.id) AS p__0 FROM phonenumber p WHERE (p.entity_id = e.id)) as pcount FROM User u WHERE u.name = 'zYne' LIMIT 1");
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e.name AS e__name, (SELECT COUNT(p.id) AS p__0 FROM phonenumber p WHERE (p.entity_id = e.id)) AS e__0 FROM entity e WHERE (e.name = 'zYne' AND (e.type = 0)) LIMIT 1");
+        // test consequent call
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e.name AS e__name, (SELECT COUNT(p.id) AS p__0 FROM phonenumber p WHERE (p.entity_id = e.id)) AS e__0 FROM entity e WHERE (e.name = 'zYne' AND (e.type = 0)) LIMIT 1");
+
+        $users = $q->execute();
+
+        $this->assertEqual($users->count(), 1);
+
+        $this->assertEqual($users[0]->name, 'zYne');
+        $this->assertEqual($users[0]->pcount, 1);
+    }
+
+    public function testSubqueryInSelectPart2()
+    {
+        // ticket #307
+        $q = new Doctrine_Query();
+        
+        $q->parseDqlQuery("SELECT u.name, (SELECT COUNT(w.id) FROM User w WHERE w.id = u.id) pcount FROM User u WHERE u.name = 'zYne' LIMIT 1");
+        
+        $this->assertNotEqual($q->getSqlQuery(), "SELECT e.id AS e__id, e.name AS e__name, (SELECT COUNT(e.id) AS e__0 FROM entity e WHERE e.id = e.id AND (e.type = 0)) AS e__0 FROM entity e WHERE e.name = 'zYne' AND (e.type = 0) LIMIT 1");
+
+    }
+
+    public function testGetLimitSubqueryOrderBy2()
+    {
+        $q = new Doctrine_Query();
+        $q->select('u.name, COUNT(DISTINCT a.id) num_albums');
+        $q->from('User u, u.Album a');
+        $q->orderby('num_albums');
+        $q->groupby('u.id');
+
+        try {
+            // this causes getLimitSubquery() to be used, and it fails
+            $q->limit(5);
+
+            $users = $q->execute();
+
+            $count = $users->count();
+        } catch (Doctrine_Exception $e) {
+            $this->fail($e->getMessage());
+        }
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name, COUNT(DISTINCT a.id) AS a__0 FROM entity e LEFT JOIN album a ON e.id = a.user_id WHERE e.id IN (SELECT DISTINCT e2.id FROM entity e2 LEFT JOIN album a2 ON e2.id = a2.user_id WHERE (e2.type = 0) GROUP BY e2.id ORDER BY COUNT(DISTINCT a2.id) LIMIT 5) AND (e.type = 0) GROUP BY e.id ORDER BY a__0');
+    }
+
+    public function testAggregateFunctionsInOrderByAndHavingWithCount()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('u.*, COUNT(a.id) num_albums')
+          ->from('User u')
+          ->leftJoin('u.Album a')
+          ->orderby('num_albums desc')
+          ->groupby('u.id')
+          ->having('num_albums > 0')
+          ->limit(5);
+        
+        try {
+            $this->assertEqual($q->getCountSqlQuery(), 'SELECT COUNT(*) AS num_results FROM (SELECT e.id, COUNT(a.id) AS a__0 FROM entity e LEFT JOIN album a ON e.id = a.user_id WHERE (e.type = 0) GROUP BY e.id HAVING a__0 > 0) dctrn_count_query');
+            $q->count();
+            
+            $this->pass();
+        } catch (Doctrine_Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/UpdateTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/UpdateTestCase.php
new file mode 100644
index 000000000..9f083c249
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/UpdateTestCase.php
@@ -0,0 +1,150 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_Delete_TestCase
+ * This test case is used for testing DQL UPDATE queries
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_Update_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData() 
+    { }
+    public function prepareTables() 
+    {
+        $this->tables = array('Entity', 'User', 'EnumTest');
+        parent::prepareTables();
+    }
+    public function testUpdateAllWithColumnAggregationInheritance() 
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery("UPDATE User u SET u.name = 'someone'");
+
+        $this->assertEqual($q->getSqlQuery(), "UPDATE entity SET name = 'someone' WHERE (type = 0)");
+
+        $q = new Doctrine_Query();
+
+        $q->update('User u')->set('u.name', "'someone'");
+
+        $this->assertEqual($q->getSqlQuery(), "UPDATE entity SET name = 'someone' WHERE (type = 0)");
+    }
+
+    public function testUpdateWorksWithMultipleColumns() 
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery("UPDATE User u SET u.name = 'someone', u.email_id = 5");
+
+        $this->assertEqual($q->getSqlQuery(), "UPDATE entity SET name = 'someone', email_id = 5 WHERE (type = 0)");
+
+        $q = new Doctrine_Query();
+
+        $q->update('User u')->set('u.name', "'someone'")->set('u.email_id', 5);
+
+        $this->assertEqual($q->getSqlQuery(), "UPDATE entity SET name = 'someone', email_id = 5 WHERE (type = 0)");
+    }
+    
+    public function testUpdateSupportsConditions() 
+    {
+        $q = new Doctrine_Query();
+
+        $q->parseDqlQuery("UPDATE User u SET u.name = 'someone' WHERE u.id = 5");
+
+        $this->assertEqual($q->getSqlQuery(), "UPDATE entity SET name = 'someone' WHERE (id = 5 AND (type = 0))");
+    }
+    public function testUpdateSupportsColumnReferencing()
+    {
+        $q = new Doctrine_Query();
+
+        $q->update('User u')->set('u.id', 'u.id + 1');
+
+        $this->assertEqual($q->getSqlQuery(), "UPDATE entity SET id = id + 1 WHERE (type = 0)");
+    }
+    public function testUpdateSupportsComplexExpressions()
+    {
+        $q = new Doctrine_Query();
+        $q->update('User u')->set('u.name', "CONCAT(?, CONCAT(':', SUBSTRING(u.name, LOCATE(':', u.name)+1, LENGTH(u.name) - LOCATE(':', u.name)+1)))", array('gblanco'))
+              ->where('u.id IN (SELECT u2.id FROM User u2 WHERE u2.name = ?) AND u.email_id = ?', array('guilhermeblanco', 5));
+        $this->assertEqual($q->getSqlQuery(), "UPDATE entity SET name = CONCAT(?, CONCAT(':', SUBSTRING(name, LOCATE(':', name)+1, LENGTH(name) - LOCATE(':', name)+1))) WHERE (id IN (SELECT e2.id AS e2__id FROM entity e2 WHERE (e2.name = ? AND (e2.type = 0))) AND email_id = ?) AND (type = 0)");
+    }
+    public function testUpdateSupportsNullSetting()
+    {
+        $user = new User();
+        $user->name = 'jon';
+        $user->loginname = 'jwage';
+        $user->password = 'changeme';
+        $user->save();
+
+        $id = $user->id;
+        $user->free();
+
+        $q = Doctrine_Query::create()
+                ->update('User u')
+                ->set('u.name', 'NULL')
+                ->where('u.id = ?', $id);
+
+        $this->assertEqual($q->getSqlQuery(), 'UPDATE entity SET name = NULL WHERE (id = ? AND (type = 0))');
+
+        $q->execute();
+
+        $user = Doctrine_Query::create()
+                    ->from('User u')
+                    ->where('u.id = ?', $id)
+                    ->fetchOne();
+
+        $this->assertEqual($user->name, '');
+    }
+    public function testEnumAndAnotherColumnUpdate()
+    {
+        $enumTest = new EnumTest();
+        $enumTest->status = 'open';
+        $enumTest->text = 'test';
+        $enumTest->save();
+
+        $id = $enumTest->id;
+        $enumTest->free();
+
+        $q = Doctrine_Query::create()
+                ->update('EnumTest t')
+                ->set('status', '?', 'closed')
+                ->set('text', '?', 'test2')
+                ->where('t.id = ?', $id);
+        $q->execute();
+
+        $this->assertEqual($q->getSqlQuery(), 'UPDATE enum_test SET status = ?, text = ? WHERE (id = ?)');
+
+        $enumTest = Doctrine_Query::create()
+                        ->from('EnumTest t')
+                        ->where('t.id = ?', $id)
+                        ->fetchOne();
+
+        $this->assertEqual($enumTest->status, 'closed');
+        $this->assertEqual($enumTest->text, 'test2');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/WhereTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/WhereTestCase.php
new file mode 100644
index 000000000..adc62cdf0
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Query/WhereTestCase.php
@@ -0,0 +1,306 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_Where_TestCase
+ * This test case is used for testing DQL WHERE part functionality
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_Where_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData() 
+    { }
+
+    public function prepareTables() 
+    {
+        $this->tables = array('Entity', 'EnumTest', 'GroupUser', 'Account', 'Book');
+        parent::prepareTables();
+    }
+
+    public function testDirectParameterSetting()
+    {
+        $this->connection->clear();
+
+        $user = new User();
+        $user->name = 'someone';
+        $user->save();
+
+        $q = new Doctrine_Query();
+
+        $q->from('User')->addWhere('User.id = ?', 1);
+
+        $users = $q->execute();
+
+        $this->assertEqual($users->count(), 1);
+        $this->assertEqual($users[0]->name, 'someone');
+    }
+
+    public function testFunctionalExpressionAreSupportedInWherePart()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('u.name')->from('User u')->addWhere('TRIM(u.name) = ?', 'someone');
+
+        $users = $q->execute();
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name FROM entity e WHERE (TRIM(e.name) = ? AND (e.type = 0))');
+        $this->assertEqual($users->count(), 1);
+        $this->assertEqual($users[0]->name, 'someone');
+    }
+
+    public function testArithmeticExpressionAreSupportedInWherePart()
+    {
+        $this->connection->clear();
+
+        $account = new Account();
+        $account->amount = 1000;
+        $account->save();
+
+        $q = new Doctrine_Query();
+
+        $q->from('Account a')->addWhere('((a.amount + 5000) * a.amount + 3) < 10000000');
+
+        $accounts = $q->execute();
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT a.id AS a__id, a.entity_id AS a__entity_id, a.amount AS a__amount FROM account a WHERE (((a.amount + 5000) * a.amount + 3) < 10000000)');
+        $this->assertEqual($accounts->count(), 1);
+        $this->assertEqual($accounts[0]->amount, 1000);
+    }
+
+    public function testDirectMultipleParameterSetting() 
+    {
+        $user = new User();
+        $user->name = 'someone.2';
+        $user->save();
+
+        $q = new Doctrine_Query();
+
+        $q->from('User')->addWhere('User.id IN (?, ?)', array(1, 2));
+
+        $users = $q->execute();
+
+        $this->assertEqual($users->count(), 2);
+        $this->assertEqual($users[0]->name, 'someone');
+        $this->assertEqual($users[1]->name, 'someone.2');
+    }
+    
+    public function testExceptionIsThrownWhenParameterIsNull()
+    {
+       try
+       {
+            Doctrine_Query::create()->delete('User')->whereIn('User.id', null)->execute();
+            $this->fail("Should throw exception");
+        } catch(Doctrine_Query_Exception $e) {
+            $this->pass();
+        }
+    }
+
+    public function testDirectMultipleParameterSetting2()
+    {
+        $q = Doctrine_Query::create()
+            ->from('User')
+            ->where('User.id IN (?, ?)', array(1, 2));
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id FROM entity e WHERE (e.id IN (?, ?) AND (e.type = 0))');
+
+        $users = $q->execute();
+
+        $this->assertEqual($users->count(), 2);
+        $this->assertEqual($users[0]->name, 'someone');
+        $this->assertEqual($users[1]->name, 'someone.2');
+
+        // the parameters and where part should be reseted
+        $q->where('User.id IN (?, ?)', array(1, 2));
+
+        $users = $q->execute();
+
+        $this->assertEqual($users->count(), 2);
+        $this->assertEqual($users[0]->name, 'someone');
+        $this->assertEqual($users[1]->name, 'someone.2');
+    }
+    
+    public function testNotInExpression()
+    {
+        $q = new Doctrine_Query();
+
+        $q->from('User u')->addWhere('u.id NOT IN (?)', array(1));
+        $users = $q->execute();
+
+        $this->assertEqual($users->count(), 1);
+        $this->assertEqual($users[0]->name, 'someone.2');
+    }
+
+    public function testExistsExpression() 
+    {
+        $q = new Doctrine_Query();
+        
+        $user = new User();
+        $user->name = 'someone with a group';
+        $user->Group[0]->name = 'some group';
+        $user->save();
+        
+        // find all users which have groups
+        try {
+            $q->from('User u')->where('EXISTS (SELECT g.id FROM Groupuser g WHERE g.user_id = u.id)');
+            $this->pass();
+        } catch(Doctrine_Exception $e) {
+            $this->fail();
+        }
+        $users = $q->execute();
+
+        $this->assertEqual($users->count(), 1);
+        $this->assertEqual($users[0]->name, 'someone with a group');
+    }
+
+    public function testNotExistsExpression() 
+    {
+        $q = new Doctrine_Query();
+
+        // find all users which don't have groups
+        try {
+            $q->from('User u')->where('NOT EXISTS (SELECT Groupuser.id FROM Groupuser WHERE Groupuser.user_id = u.id)');
+            $this->pass();
+        } catch(Doctrine_Exception $e) {
+            $this->fail();
+        }
+        $users = $q->execute();
+        $this->assertEqual($users->count(), 2);
+        $this->assertEqual($users[0]->name, 'someone');
+        $this->assertEqual($users[1]->name, 'someone.2');
+    }
+
+    public function testComponentAliases() 
+    {
+        $q = new Doctrine_Query();
+
+        $q->from('User u')->addWhere('u.id IN (?, ?)', array(1,2));
+
+        $users = $q->execute();
+
+        $this->assertEqual($users->count(), 2);
+        $this->assertEqual($users[0]->name, 'someone');
+        $this->assertEqual($users[1]->name, 'someone.2');             
+
+    }
+
+    public function testComponentAliases2() 
+    {
+        $q = new Doctrine_Query();
+
+        $q->from('User u')->addWhere('u.name = ?', array('someone'));
+
+        $users = $q->execute();
+
+        $this->assertEqual($users->count(), 1);
+        $this->assertEqual($users[0]->name, 'someone');
+    }
+
+    public function testOperatorWithNoTrailingSpaces()
+    {
+        $q = new Doctrine_Query();
+        
+        $q->select('User.id')->from('User')->where("User.name='someone'");
+
+        $users = $q->execute();
+        $this->assertEqual($users->count(), 1);
+        
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id FROM entity e WHERE (e.name = 'someone' AND (e.type = 0))");
+    }
+
+    public function testOperatorWithNoTrailingSpaces2() 
+    {
+        $q = new Doctrine_Query();
+        
+        $q->select('User.id')->from('User')->where("User.name='foo.bar'");
+
+        $users = $q->execute();
+        $this->assertEqual($users->count(), 0);
+        
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id FROM entity e WHERE (e.name = 'foo.bar' AND (e.type = 0))");
+    }
+
+    public function testOperatorWithSingleTrailingSpace() 
+    {
+        $q = new Doctrine_Query();
+        
+        $q->select('User.id')->from('User')->where("User.name= 'foo.bar'");
+
+        $users = $q->execute();
+        $this->assertEqual($users->count(), 0);
+        
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id FROM entity e WHERE (e.name = 'foo.bar' AND (e.type = 0))");
+    }
+
+    public function testOperatorWithSingleTrailingSpace2() 
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('User.id')->from('User')->where("User.name ='foo.bar'");
+
+        $users = $q->execute();
+        $this->assertEqual($users->count(), 0);
+        
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id FROM entity e WHERE (e.name = 'foo.bar' AND (e.type = 0))");
+    }
+
+    public function testDeepComponentReferencingIsSupported()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('u.id')->from('User u')->where("u.Group.name ='some group'");
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id FROM entity e LEFT JOIN groupuser g ON (e.id = g.user_id) LEFT JOIN entity e2 ON e2.id = g.group_id AND e2.type = 1 WHERE (e2.name = 'some group' AND (e.type = 0))");
+    }
+
+    public function testDeepComponentReferencingIsSupported2()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('u.id')->from('User u')->addWhere("u.Group.name ='some group'");
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id FROM entity e LEFT JOIN groupuser g ON (e.id = g.user_id) LEFT JOIN entity e2 ON e2.id = g.group_id AND e2.type = 1 WHERE (e2.name = 'some group' AND (e.type = 0))");
+    }
+
+    public function testLiteralValueAsInOperatorOperandIsSupported()
+    {
+        $q = new Doctrine_Query();
+        
+        $q->select('u.id')->from('User u')->where('1 IN (1, 2)');
+        
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id FROM entity e WHERE (1 IN (1, 2) AND (e.type = 0))');
+    }
+
+    public function testCorrelatedSubqueryWithInOperatorIsSupported()
+    {
+        $q = new Doctrine_Query();
+        
+        $q->select('u.id')->from('User u')->where('u.name IN (SELECT u2.name FROM User u2 WHERE u2.id = u.id)');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id FROM entity e WHERE (e.name IN (SELECT e2.name AS e2__name FROM entity e2 WHERE (e2.id = e.id AND (e2.type = 0))) AND (e.type = 0))');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/QueryTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/QueryTestCase.php
new file mode 100644
index 000000000..7c48a32c9
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/QueryTestCase.php
@@ -0,0 +1,394 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Query_TestCase extends Doctrine_UnitTestCase 
+{
+    
+    public function testWhereInSupportInDql()
+    {
+        $q = Doctrine_Query::create()
+            ->from('User u')
+            ->where('u.id IN ?', array(array(1, 2, 3)))
+            ->whereNotIn('u.name', array('', 'a'))
+            ->addWhere('u.id NOT IN ?', array(array(4, 5, 6, 7)));
+
+        $this->assertEqual(
+            $q->getSqlQuery(),
+            'SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id FROM entity e WHERE (e.id IN (?, ?, ?) AND e.name NOT IN (?, ?) AND e.id NOT IN (?, ?, ?, ?) AND (e.type = 0))'
+        );
+    }
+    
+    
+    public function testWhereInSupportInDql2()
+    {
+        $q = Doctrine_Query::create()
+            ->from('User u')
+            ->where('u.id IN ?', array(1));
+
+        $this->assertEqual(
+            $q->getSqlQuery(),
+            'SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id FROM entity e WHERE (e.id IN (?) AND (e.type = 0))'
+        );
+    }
+
+    
+    public function testGetQueryHookResetsTheManuallyAddedDqlParts()
+    {
+        $q = new MyQuery();
+
+        $q->from('User u');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id FROM entity e WHERE (e.id = 4 AND (e.type = 0))');
+
+        // test consequent calls
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id FROM entity e WHERE (e.id = 4 AND (e.type = 0))');
+    }
+
+
+    public function testParseClauseSupportsArithmeticOperators()
+    {
+    	$q = new Doctrine_Query();
+
+        $str = $q->parseClause('2 + 3');
+
+        $this->assertEqual($str, '2 + 3');
+
+        $str = $q->parseClause('2 + 3 - 5 * 6');
+
+        $this->assertEqual($str, '2 + 3 - 5 * 6');
+    }
+    public function testParseClauseSupportsArithmeticOperatorsWithFunctions()
+    {
+    	$q = new Doctrine_Query();
+
+        $str = $q->parseClause('ACOS(2) + 3');
+
+        $this->assertEqual($str, 'ACOS(2) + 3');
+    }
+
+    public function testParseClauseSupportsArithmeticOperatorsWithParenthesis()
+    {
+    	$q = new Doctrine_Query();
+
+        $str = $q->parseClause('(3 + 3)*3');
+
+        $this->assertEqual($str, '(3 + 3)*3');
+
+        $str = $q->parseClause('((3 + 3)*3 - 123) * 12 * (13 + 31)');
+
+        $this->assertEqual($str, '((3 + 3)*3 - 123) * 12 * (13 + 31)');
+    }
+
+    public function testParseClauseSupportsArithmeticOperatorsWithParenthesisAndFunctions()
+    {
+    	$q = new Doctrine_Query();
+
+        $str = $q->parseClause('(3 + 3)*ACOS(3)');
+
+        $this->assertEqual($str, '(3 + 3)*ACOS(3)');
+
+        $str = $q->parseClause('((3 + 3)*3 - 123) * ACOS(12) * (13 + 31)');
+
+        $this->assertEqual($str, '((3 + 3)*3 - 123) * ACOS(12) * (13 + 31)');
+    }
+
+    public function testParseClauseSupportsComponentReferences()
+    {
+    	$q = new Doctrine_Query();
+        $q->from('User u')->leftJoin('u.Phonenumber p');
+        $q->getSqlQuery();
+        //Doctrine_Core::dump($q->getCachedForm(array('foo' => 'bar')));
+        $this->assertEqual($q->parseClause("CONCAT('u.name', u.name)"), "CONCAT('u.name', e.name)");
+    }
+    
+    public function testCountMaintainsParams()
+    {
+        $q = new Doctrine_Query();
+        $q->from('User u');
+        $q->leftJoin('u.Phonenumber p');
+        $q->where('u.name = ?', 'zYne');
+
+        $this->assertEqual($q->count(), $q->execute()->count());
+    }
+
+    public function testCountWithGroupBy()
+    {
+        $q = new Doctrine_Query();
+        $q->from('User u');
+        $q->leftJoin('u.Phonenumber p');
+        $q->groupBy('p.entity_id');
+
+        $this->assertEqual($q->count(), $q->execute()->count());
+    }
+
+    // ticket #821
+    public function testQueryCopyClone()
+    {
+        $query = new Doctrine_Query();
+        $query->select('u.*')->from('User u');
+        $sql = $query->getSqlQuery();
+        
+        $data = $query->execute();
+        $query2 = $query->copy();
+        
+        $this->assertTrue($sql, $query2->getSqlQuery());
+        
+        $query2->limit(0);
+        $query2->offset(0);
+        $query2->select('COUNT(u.id) as nb');
+        
+        $this->assertTrue($query2->getSqlQuery(), 'SELECT COUNT(e.id) AS e__0 FROM entity e WHERE (e.type = 0)');
+    }
+    
+    public function testNullAggregateIsSet()
+    {
+        $user = new User();
+        $user->name = 'jon';
+        $user->loginname = 'jwage';
+        $user->Phonenumber[0]->phonenumber = new Doctrine_Expression('NULL');
+        $user->save();
+        $id = $user->id;
+        $user->free();
+
+        $query = Doctrine_Query::create()
+                    ->select('u.*, p.*, SUM(p.phonenumber) summ')
+                    ->from('User u')
+                    ->leftJoin('u.Phonenumber p')
+                    ->where('u.id = ?', $id);
+
+        $users = $query->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+        $this->assertTrue(array_key_exists('summ', $users[0]));
+    }
+
+    public function testQueryWithNoSelectFromRootTableThrowsException()
+    {
+        try {
+            $users = Doctrine_Query::create()
+                        ->select('p.*')
+                        ->from('User u')
+                        ->leftJoin('u.Phonenumber p')
+                        ->execute();
+            $this->fail();
+        } catch (Doctrine_Query_Exception $e) {
+            $this->pass();
+        }
+    }
+    
+    
+    public function testOrQuerySupport()
+    {
+        $q1 = Doctrine_Query::create()
+            ->select('u.id')
+            ->from('User u')
+            ->leftJoin('u.Phonenumber p')
+            ->where('u.name = ?')
+            ->orWhere('u.loginname = ?');
+            
+        $q2 = Doctrine_Query::create()
+            ->select('u.id')
+            ->from('User u')
+            ->leftJoin('u.Phonenumber p')
+            ->where('u.name = ? OR u.loginname = ?');
+
+        $this->assertEqual(
+            $q1->getSqlQuery(),
+            'SELECT e.id AS e__id FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id ' .
+            'WHERE (e.name = ? OR e.loginname = ? AND (e.type = 0))'
+        );
+        
+        $items1 = $q1->execute(array('zYne', 'jwage'), Doctrine_Core::HYDRATE_ARRAY);
+        $items2 = $q2->execute(array('zYne', 'jwage'), Doctrine_Core::HYDRATE_ARRAY);
+
+        $this->assertEqual(count($items1), count($items2));
+        
+        $q1->free();
+        $q2->free();
+    }
+
+
+    public function testOrQuerySupport2()
+    {
+        $q1 = Doctrine_Query::create()
+            ->select('u.id')
+            ->from('User u')
+            ->leftJoin('u.Phonenumber p')
+            ->where('u.name = ?')
+            ->andWhere('u.loginname = ?')
+            ->orWhere('u.id = ?');
+            
+        $q2 = Doctrine_Query::create()
+            ->select('u.id')
+            ->from('User u')
+            ->leftJoin('u.Phonenumber p')
+            ->where('(u.name = ? AND u.loginname = ?) OR (u.id = ?)');
+
+        $this->assertEqual(
+            $q1->getSqlQuery(),
+            'SELECT e.id AS e__id FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id ' .
+            'WHERE (e.name = ? AND e.loginname = ? OR e.id = ? AND (e.type = 0))'
+        );
+        
+        $items1 = $q1->execute(array('jon', 'jwage', 4), Doctrine_Core::HYDRATE_ARRAY);
+        $items2 = $q2->execute(array('jon', 'jwage', 4), Doctrine_Core::HYDRATE_ARRAY);
+
+        $this->assertEqual(count($items1), count($items2));
+
+        $q1->free();
+        $q2->free();
+    }
+    
+    
+    public function testOrQuerySupport3()
+    {
+        $q1 = Doctrine_Query::create()
+            ->select('u.id')
+            ->from('User u')
+            ->leftJoin('u.Phonenumber p')
+            ->where("u.name = 'jon'")
+            ->andWhere("u.loginname = 'jwage'")
+            ->orWhere("u.id = 4")
+            ->orWhere("u.id = 5")
+            ->andWhere("u.name LIKE 'Arnold%'");
+            
+        $q2 = Doctrine_Query::create()
+            ->select('u.id')
+            ->from('User u')
+            ->leftJoin('u.Phonenumber p')
+            ->where("((u.name = 'jon' AND u.loginname = 'jwage') OR (u.id = 4 OR (u.id = 5 AND u.name LIKE 'Arnold%')))");
+
+        $this->assertEqual(
+            $q1->getSqlQuery(),
+            "SELECT e.id AS e__id FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id " .
+            "WHERE (e.name = 'jon' AND e.loginname = 'jwage' OR e.id = 4 OR e.id = 5 AND e.name LIKE 'Arnold%' AND (e.type = 0))"
+        );
+        
+        $items1 = $q1->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+        $items2 = $q2->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+        $this->assertEqual(count($items1), count($items2));
+
+        $q1->free();
+        $q2->free();
+    }
+    
+    public function testParseTableAliasesWithBetweenInWhereClause()
+    {
+        
+        $q1 = Doctrine_Query::create()
+            ->select('u.id')
+            ->from('QueryTest_User u')
+            ->where("CURRENT_DATE() BETWEEN u.QueryTest_Subscription.begin AND u.QueryTest_Subscription.begin")
+            ->addWhere( 'u.id != 5' )
+            ;
+            
+        $expected = 'SELECT q.id AS q__id FROM query_test__user q LEFT JOIN query_test__subscription q2 ON q.subscriptionid = q2.id WHERE (CURRENT_DATE() BETWEEN q2.begin AND q2.begin AND q.id != 5)';
+        
+        $this->assertEqual( $q1->getSqlQuery(), $expected );
+        
+    } 
+
+
+    public function testQuoteAndBracketUsageAsValueInQuery()
+    {
+        $q = Doctrine_Query::create()
+            ->select('u.id')
+            ->from('User u')
+            ->where("u.name = 'John O\'Connor (West)'");
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id FROM entity e WHERE (e.name = 'John O\'Connor (West)' AND (e.type = 0))");
+    }
+
+    public function testAsAndBracketUsageAsValueInQuery()
+    {
+        $q = Doctrine_Query::create()
+            ->select('u.id')
+            ->from('User u')
+            ->where("u.name = 'Total Kjeldahl Nitrogen (TKN) as N'");
+
+        $this->assertEqual($q->getSqlQuery(), "SELECT e.id AS e__id FROM entity e WHERE (e.name = 'Total Kjeldahl Nitrogen (TKN) as N' AND (e.type = 0))");
+    }
+
+    public function testSetQueryClassManagerAttribute()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_QUERY_CLASS, 'MyQuery');
+
+        $q = Doctrine_Query::create();
+        $this->assertTrue($q instanceof MyQuery);
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_QUERY_CLASS, 'Doctrine_Query');
+    }
+
+    public function testSetQueryClassConnectionAttribute()
+    {
+        $userTable = Doctrine_Core::getTable('User');
+        $userTable->getConnection()->setAttribute(Doctrine_Core::ATTR_QUERY_CLASS, 'MyQuery');
+
+        $q = $userTable->createQuery();
+        $this->assertTrue($q instanceof MyQuery);
+
+        $userTable->getConnection()->setAttribute(Doctrine_Core::ATTR_QUERY_CLASS, 'Doctrine_Query');
+    }
+
+    public function testSetQueryClassTableAttribute()
+    {
+        $userTable = Doctrine_Core::getTable('User');
+        $userTable->setAttribute(Doctrine_Core::ATTR_QUERY_CLASS, 'MyQuery');
+
+        $q = $userTable->createQuery();
+        $this->assertTrue($q instanceof MyQuery);
+
+        $userTable->setAttribute(Doctrine_Core::ATTR_QUERY_CLASS, 'Doctrine_Query');
+    }
+    
+    public function testNoLimitSubqueryIfXToOneSelected()
+    {
+        
+        $q = Doctrine_Query::create()
+                    ->select('u.name, e.address')
+                    ->from('User u')
+                    ->leftJoin('u.Email e')
+                    ->leftJoin('u.Phonenumber p')
+                    ->distinct()
+                    ->limit(1);
+        
+        $this->assertEqual($q->getSqlQuery(), "SELECT DISTINCT e.id AS e__id, e.name AS e__name, e2.id AS e2__id, e2.address AS e2__address FROM entity e LEFT JOIN email e2 ON e.email_id = e2.id LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.type = 0) LIMIT 1");
+    }
+}
+
+class MyQuery extends Doctrine_Query
+{
+    public function preQuery()
+    {
+        $this->where('u.id = 4');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/RawSqlTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/RawSqlTestCase.php
new file mode 100644
index 000000000..9d7e74e3c
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/RawSqlTestCase.php
@@ -0,0 +1,298 @@
+<?php
+/*
+ *  $Id: RawSqlTestCase.php 1181 2007-03-20 23:22:51Z gnat $
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_RawSql_TestCase
+ * This class tests the functinality of Doctrine_RawSql component
+ *
+ * @package     Doctrine
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision: 1181 $
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ */
+class Doctrine_RawSql_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testQueryParser()
+    {
+        $sql = 'SELECT {p.*} FROM photos p';
+        $query = new Doctrine_RawSql($this->connection);
+        $query->parseDqlQuery($sql);
+        
+        $this->assertEqual($query->getSqlQueryPart('from'), array('photos p'));
+
+
+        $sql = 'SELECT {p.*} FROM (SELECT p.* FROM photos p LEFT JOIN photos_tags t ON t.photo_id = p.id WHERE t.tag_id = 65) p LEFT JOIN photos_tags t ON t.photo_id = p.id WHERE p.can_see = -1 AND t.tag_id = 62 LIMIT 200';
+        $query->parseDqlQuery($sql);
+
+        $this->assertEqual($query->getSqlQueryPart('from'), array('(SELECT p.* FROM photos p LEFT JOIN photos_tags t ON t.photo_id = p.id WHERE t.tag_id = 65) p LEFT JOIN photos_tags t ON t.photo_id = p.id'));
+        $this->assertEqual($query->getSqlQueryPart('where'), array('p.can_see = -1 AND t.tag_id = 62'));
+        $this->assertEqual($query->getSqlQueryPart('limit'), array(200));
+    }
+
+    public function testAsteriskOperator() 
+    {
+        // Selecting with *
+
+        $query = new Doctrine_RawSql($this->connection);
+        $query->parseDqlQuery('SELECT {entity.*} FROM entity');
+        $fields = $query->getFields();
+
+        $this->assertEqual($fields, array('entity.*'));
+
+        $query->addComponent('entity', 'Entity');
+
+        $coll = $query->execute();
+
+        $this->assertEqual($coll->count(), 11);
+    }
+
+    public function testLazyPropertyLoading() 
+    {
+        $query = new Doctrine_RawSql($this->connection);
+        $this->connection->clear();
+
+        // selecting proxy objects (lazy property loading)
+
+        $query->parseDqlQuery('SELECT {entity.name}, {entity.id} FROM entity');
+        $fields = $query->getFields();
+
+        $this->assertEqual($fields, array('entity.name', 'entity.id'));
+        $query->addComponent('entity', 'Entity');
+
+        $coll = $query->execute();
+
+        $this->assertEqual($coll->count(), 11);
+
+        $this->assertEqual($coll[0]->state(), Doctrine_Record::STATE_PROXY);
+        $this->assertEqual($coll[3]->state(), Doctrine_Record::STATE_PROXY); 
+    }
+    public function testSmartMapping() 
+    {
+        $query = new Doctrine_RawSql($this->connection);
+        // smart component mapping (no need for additional addComponent call
+        
+        $query->parseDqlQuery('SELECT {entity.name}, {entity.id} FROM entity');
+        $fields = $query->getFields();
+
+        $this->assertEqual($fields, array('entity.name', 'entity.id'));
+        
+        $coll = $query->execute();        
+
+        $this->assertEqual($coll->count(), 11);
+
+        $this->assertEqual($coll[0]->state(), Doctrine_Record::STATE_PROXY);
+        $this->assertEqual($coll[3]->state(), Doctrine_Record::STATE_PROXY);
+    }
+
+    public function testMultipleComponents() 
+    {
+        $query = new Doctrine_RawSql($this->connection);
+        // multi component fetching
+
+        $query->parseDqlQuery('SELECT {entity.name}, {entity.id}, {phonenumber.*} FROM entity LEFT JOIN phonenumber ON phonenumber.entity_id = entity.id');
+
+        $query->addComponent('entity', 'Entity');
+
+        $query->addComponent('phonenumber', 'Entity.Phonenumber');
+
+        $coll = $query->execute();
+        $this->assertEqual($coll->count(), 11);
+
+        $count = $this->conn->count();
+        
+        $coll[4]->Phonenumber[0]->phonenumber;
+        $this->assertEqual($count, $this->conn->count());
+
+        $coll[5]->Phonenumber[0]->phonenumber;
+        $this->assertEqual($count, $this->conn->count());
+    }
+    
+    public function testAliasesAreSupportedInAddComponent()
+    {
+        $query = new Doctrine_RawSql();
+        $query->parseDqlQuery('SELECT {entity.name}, {entity.id}, {phonenumber.*} FROM entity LEFT JOIN phonenumber ON phonenumber.entity_id = entity.id');
+
+        $query->addComponent('entity', 'Entity e');
+        $query->addComponent('phonenumber', 'e.Phonenumber');
+
+        $this->assertEqual(array_keys($query->getQueryComponents()), array('e', 'e.Phonenumber'));
+
+        $coll = $query->execute();
+        $this->assertEqual($coll->count(), 11);
+
+        $count = $this->conn->count();
+        
+        $coll[4]['Phonenumber'][0]['phonenumber'];
+        $this->assertEqual($count, $this->conn->count());
+
+        $coll[5]['Phonenumber'][0]['phonenumber'];
+        $this->assertEqual($count, $this->conn->count());
+    }
+    public function testPrimaryKeySelectForcing()
+    {
+        // forcing the select of primary key fields
+        
+        $query = new Doctrine_RawSql($this->connection);
+
+        $query->parseDqlQuery('SELECT {entity.name} FROM entity');
+        
+        $coll = $query->execute();
+        
+        $this->assertEqual($coll->count(), 11);
+        $this->assertTrue(is_numeric($coll[0]->id));
+        $this->assertTrue(is_numeric($coll[3]->id));
+        $this->assertTrue(is_numeric($coll[7]->id));
+    }
+    
+    public function testConvenienceMethods()
+    {
+        
+        $query = new Doctrine_RawSql($this->connection);
+        $query->select('{entity.name}')->from('entity');
+        $query->addComponent('entity', 'User');
+        
+        $coll = $query->execute();
+
+        $this->assertEqual($coll->count(), 8);
+        $this->assertTrue(is_numeric($coll[0]->id));
+        $this->assertTrue(is_numeric($coll[3]->id));
+        $this->assertTrue(is_numeric($coll[7]->id));
+    }
+
+    public function testColumnAggregationInheritance() 
+    {
+        // forcing the select of primary key fields
+
+        $query = new Doctrine_RawSql($this->connection);
+
+        $query->parseDqlQuery('SELECT {entity.name} FROM entity');
+        $query->addComponent('entity', 'User');
+        $coll = $query->execute();
+
+        $this->assertEqual($coll->count(), 8);
+        $this->assertTrue(is_numeric($coll[0]->id));
+        $this->assertTrue(is_numeric($coll[3]->id));
+        $this->assertTrue(is_numeric($coll[7]->id));
+    }
+
+    public function testColumnAggregationInheritanceWithOrderBy() 
+    {
+        // forcing the select of primary key fields
+
+        $query = new Doctrine_RawSql($this->connection);
+
+        $query->parseDqlQuery('SELECT {entity.name} FROM entity ORDER BY entity.name');
+        $query->addComponent('entity', 'User');
+
+        $this->assertEqual($query->getSqlQuery(), "SELECT entity.name AS entity__name, entity.id AS entity__id FROM entity WHERE entity.type = 0 ORDER BY entity.name");
+
+
+        $coll = $query->execute();
+
+        $this->assertEqual($coll->count(), 8);
+        $this->assertTrue(is_numeric($coll[0]->id));
+        $this->assertTrue(is_numeric($coll[3]->id));
+        $this->assertTrue(is_numeric($coll[7]->id));
+
+    }
+
+    public function testQueryParser2() 
+    {
+        $query = new Doctrine_RawSql();
+        
+        $query->parseDqlQuery("SELECT {entity.name} FROM (SELECT entity.name FROM entity WHERE entity.name = 'something') WHERE entity.id = 2 ORDER BY entity.name");
+
+        $this->assertEqual($query->getSqlQuery(),
+        "SELECT entity.name AS entity__name, entity.id AS entity__id FROM (SELECT entity.name FROM entity WHERE entity.name = 'something') WHERE entity.id = 2 ORDER BY entity.name");
+    }
+
+    public function testSelectingWithoutIdentifiersOnRootComponent()
+    {
+        $query = new Doctrine_RawSql();
+
+        $query->parseDqlQuery('SELECT {entity.name}, {phonenumber.*} FROM entity LEFT JOIN phonenumber ON phonenumber.entity_id = entity.id LIMIT 3');
+        $query->addComponent('entity', 'Entity');
+        $query->addComponent('phonenumber', 'Entity.Phonenumber');
+        $this->assertEqual($query->getSqlQuery(), 'SELECT entity.name AS entity__name, entity.id AS entity__id, phonenumber.id AS phonenumber__id, phonenumber.phonenumber AS phonenumber__phonenumber, phonenumber.entity_id AS phonenumber__entity_id FROM entity LEFT JOIN phonenumber ON phonenumber.entity_id = entity.id LIMIT 3');
+        $coll = $query->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+        $this->assertEqual(count($coll), 3);
+    }
+    
+    public function testSwitchingTheFieldOrder()
+    {
+        $query = new Doctrine_RawSql();
+
+        $query->parseDqlQuery('SELECT {phonenumber.*}, {entity.name} FROM entity LEFT JOIN phonenumber ON phonenumber.entity_id = entity.id LIMIT 3');
+        $query->addComponent('entity', 'Entity');
+        $query->addComponent('phonenumber', 'Entity.Phonenumber');
+        $this->assertEqual($query->getSqlQuery(), 'SELECT entity.name AS entity__name, entity.id AS entity__id, phonenumber.id AS phonenumber__id, phonenumber.phonenumber AS phonenumber__phonenumber, phonenumber.entity_id AS phonenumber__entity_id FROM entity LEFT JOIN phonenumber ON phonenumber.entity_id = entity.id LIMIT 3');
+        $coll = $query->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+        $this->assertEqual(count($coll), 3);
+    }
+    
+    public function testParseQueryPartShouldAddPartIfNotSelectAndAppend()
+    {
+      $query = new Doctrine_Rawsql();
+      $query->parseDqlQueryPart("test", "test", true);
+      $parts = $query->getSqlParts();
+      $this->assertTrue(isset($parts["test"]));
+      $this->assertTrue(is_array($parts["test"]));
+      $this->assertTrue(isset($parts["test"][0]));
+      $this->assertEqual("test", $parts["test"][0]);
+    }
+    
+    public function testParseQueryShouldExtractGroupBy()
+    {
+        $query = new Doctrine_RawSql();
+        $query->parseDqlQuery("having group");
+        $parts = $query->getSqlParts();
+        $this->assertEqual($parts["having"][0], "group");
+    }
+
+    public function testThrowExceptionIfFieldNameIsOnWrongForm()
+    {  
+      $query = new Doctrine_RawSql();
+      $query->parseDqlQueryPart("select", "{test}");
+      try{
+          $query->getSqlQuery();
+          $this->fail("Should throw exception");
+      } catch(Doctrine_RawSql_Exception $exception) {
+          $this->assertEqual($exception->getMessage(), "All selected fields in Sql query must be in format tableAlias.fieldName"); 
+      }
+    }
+
+    public function testThrowExceptionIfAliasDoesNotExist()
+    {  
+      $query = new Doctrine_RawSql();
+      $query->parseDqlQueryPart("select", "{test.test}");
+      try {
+          $query->getSqlQuery();
+          $this->fail("Should throw exception");
+      } catch(Doctrine_RawSql_Exception $exception) {
+          $this->assertEqual($exception->getMessage(), "The associated component for table alias test couldn't be found.");
+      }
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/CascadingDeleteTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/CascadingDeleteTestCase.php
new file mode 100644
index 000000000..3dd18f43d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/CascadingDeleteTestCase.php
@@ -0,0 +1,314 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_CascadingDelete_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Record_CascadingDelete_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData()
+    { }
+    public function prepareTables()
+    {
+        $this->tables = array();
+        $this->tables[] = 'ForeignKeyTest';
+        $this->tables[] = 'CascadeDelete_HouseOwner';
+        $this->tables[] = 'CascadeDelete_House';
+        $this->tables[] = 'CascadeDelete_CompositeKeyItem';
+        $this->tables[] = 'CascadeDelete_ManyManySideA';
+        $this->tables[] = 'CascadeDelete_ManyManySideB';
+        $this->tables[] = 'CascadeDelete_ManyManyAToB';
+        parent::prepareTables();
+    }
+    public function testCascadingDeleteEmulation()
+    {
+        $r = new ForeignKeyTest;
+        $r->name = 'Parent';
+        $r->Children[0]->name = 'Child 1';
+        $this->assertEqual($r->id, null);
+        $this->assertEqual($r->Children[0]->id, null);
+        $r->save();
+
+        $this->assertEqual($r->id, 1);
+        $this->assertEqual($r->Children[0]->id, 2);
+
+        $this->connection->clear();
+
+        $r = $this->connection->query('FROM ForeignKeyTest');
+        
+        $this->assertEqual($r->count(), 2);
+        
+        // should delete the first child
+        $r[0]->delete();
+        
+        $this->assertEqual(Doctrine_Record::STATE_TCLEAN, $r[0]->state());
+        $this->assertEqual(Doctrine_Record::STATE_TCLEAN, $r[0]->Children[0]->state());
+
+        $this->connection->clear();
+
+        $r = $this->connection->query('FROM ForeignKeyTest');
+
+        $this->assertEqual($r->count(), 0);
+    }
+    
+    public function testCascadingDeleteEmulationWithListenerInvocations()
+    {
+        $cascadeListener = new CascadeDeleteListener($this);
+        $this->conn->getTable('ForeignKeyTest')->addRecordListener($cascadeListener);
+        
+        $r = new ForeignKeyTest;
+        $r->name = 'Parent';
+        $r->Children[0]->name = 'Child 1';
+        $r->Children[0]->Children[0]->name = 'Child 1 Child 1';
+        $r->Children[1]->name = 'Child 2';
+        $r->save();
+
+        $this->connection->clear();
+
+        $r = $this->connection->query('FROM ForeignKeyTest');
+        
+        $this->assertEqual($r->count(), 4);
+
+        // should delete the children recursively
+        $r[0]->delete();
+        
+        // validate listener invocations
+        $this->assertTrue($cascadeListener->preDeleteInvoked);
+        $this->assertEqual(4, $cascadeListener->preDeleteInvocationCount);
+        $this->assertTrue($cascadeListener->postDeleteInvoked);
+        $this->assertEqual(4, $cascadeListener->postDeleteInvocationCount);
+        $cascadeListener->reset();
+        
+        $this->connection->clear();
+
+        $r = $this->connection->query('FROM ForeignKeyTest');
+        $this->assertEqual($r->count(), 0);
+    }
+    
+    public function testBidirectionalCascadeDeleteDoesNotCauseInfiniteLoop()
+    {        
+        $house = new CascadeDelete_House();
+        $house->bathrooms = 4;
+        $owner = new CascadeDelete_HouseOwner();
+        $owner->name = 'Bill Clinton';
+        $owner->house = $house;
+        $house->owner = $owner;
+        $owner->save();
+        
+        $this->assertEqual(Doctrine_Record::STATE_CLEAN, $owner->state());
+        $this->assertEqual(Doctrine_Record::STATE_CLEAN, $house->state());
+        $this->assertTrue($owner->exists());
+        $this->assertTrue($house->exists());
+        
+        $house->delete();
+        
+        $this->assertEqual(Doctrine_Record::STATE_TCLEAN, $owner->state());
+        $this->assertEqual(Doctrine_Record::STATE_TCLEAN, $house->state());
+        $this->assertFalse($owner->exists());
+        $this->assertFalse($house->exists());
+        
+    }
+    
+    public function testCascadingDeleteInOneToZeroOrOneRelation()
+    {
+        $owner = new CascadeDelete_HouseOwner();
+        $owner->name = 'Jeff Bridges';
+        $owner->save();
+        try {
+            $owner->delete();
+            $this->pass();
+        } catch (Doctrine_Exception $e) {
+            $this->fail("Failed to delete record. Message:" . $e->getMessage());
+        }
+        
+    }
+    
+    public function testDeletionOfCompositeKeys()
+    {
+        $compItem = new CascadeDelete_CompositeKeyItem();
+        $compItem->id1 = 10;
+        $compItem->id2 = 11;
+        $compItem->save();
+        $compItem->delete();
+        
+        $this->assertEqual(Doctrine_Record::STATE_TCLEAN, $compItem->state());
+        $this->assertFalse($compItem->exists());
+    }
+    
+    public function testCascadeDeleteManyMany()
+    {
+        $a1 = new CascadeDelete_ManyManySideA();
+        $a1->name = 'some';
+        $b1 = new CascadeDelete_ManyManySideB();
+        $b1->name = 'other';
+        $a1->Bs[] = $b1;
+        //$b1->As[] = $a1; <- This causes 2 insertions into the AToB table => BUG
+        
+        $a1->save();
+        
+        $a1->delete();
+        
+        $this->assertEqual(Doctrine_Record::STATE_TCLEAN, $a1->state());
+        $this->assertFalse($a1->exists());
+        $this->assertEqual(Doctrine_Record::STATE_TCLEAN, $b1->state());
+        $this->assertFalse($b1->exists());
+        
+        $a1->refreshRelated('assocsA');
+        $this->assertEqual(0, count($a1->assocsA));
+        $b1->refreshRelated('assocsB');
+        $this->assertEqual(0, count($b1->assocsB));
+    }
+}
+
+/* This listener is used to verify the correct invocations of listeners during the
+   delete procedure, as well as to verify the object states at the defined points. */
+class CascadeDeleteListener extends Doctrine_Record_Listener {
+    
+    private $_test;
+    public $preDeleteInvoked = false;
+    public $preDeleteInvocationCount = 0;
+    public $postDeleteInvoked = false;
+    public $postDeleteInvocationCount = 0;
+    
+    public function __construct($test) {
+        $this->_test = $test;
+    }
+    
+    public function preDelete(Doctrine_Event $event) {
+        $this->_test->assertEqual(Doctrine_Record::STATE_CLEAN, $event->getInvoker()->state());
+        $this->preDeleteInvoked = true;
+        $this->preDeleteInvocationCount++;
+    }
+    
+    public function postDelete(Doctrine_Event $event) {
+        $this->_test->assertEqual(Doctrine_Record::STATE_TCLEAN, $event->getInvoker()->state());
+        $this->postDeleteInvoked = true;
+        $this->postDeleteInvocationCount++;
+    }
+    
+    public function reset() {
+        $this->preDeleteInvoked = false;
+        $this->preDeleteInvocationCount = 0;
+        $this->postDeleteInvoked = false;
+        $this->postDeleteInvocationCount = 0;
+    }
+    
+}
+
+/* The following is a typical one-to-one cascade => delete scenario. The association
+   is bidirectional, as is the cascade. */
+
+class CascadeDelete_HouseOwner extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('id', 'integer', 4, array('primary' => true, 'autoincrement' => true));
+        $this->hasColumn('name', 'string', 50);
+    }
+    public function setUp() {
+        $this->hasOne('CascadeDelete_House as house', array(
+                'local' => 'id', 'foreign' => 'owner_id',
+                'cascade' => array('delete')));
+    }
+}
+
+class CascadeDelete_House extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('id', 'integer', 4, array('primary' => true, 'autoincrement' => true));
+        $this->hasColumn('bathrooms', 'integer', 1);
+        $this->hasColumn('owner_id', 'integer', 4);
+    }
+    public function setUp() {
+        $this->hasOne('CascadeDelete_HouseOwner as owner', array(
+                'local' => 'owner_id', 'foreign' => 'id',
+                'cascade' => array('delete')));
+    }
+}
+
+
+/* The following is just a stand-alone class with a composite-key to test the new
+   deletion routines with composite keys. Composite foreign keys are currently not
+   supported, so we can't test this class in a cascade => delete scenario. */
+
+class CascadeDelete_CompositeKeyItem extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('id1', 'integer', 4, array('primary' => true));
+        $this->hasColumn('id2', 'integer', 4, array('primary' => true));
+    }
+}
+
+
+/* The following is an app-level cascade => delete setup of a many-many association
+   Note that such a scenario is very unlikely in the real world and also pretty 
+   slow. */
+
+class CascadeDelete_ManyManySideA extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('id', 'integer', 4, array('primary' => true, 'autoincrement' => true));
+        $this->hasColumn('name', 'string', 4);
+    }
+    public function setUp() {
+        $this->hasMany('CascadeDelete_ManyManySideB as Bs', array(
+                'local' => 'a_id', 'foreign' => 'b_id',
+                'refClass' => 'CascadeDelete_ManyManyAToB',
+                'cascade' => array('delete')));
+                
+        // overrides the doctrine-generated relation to the association class
+        // in order to apply the app-level cascade
+        $this->hasMany('CascadeDelete_ManyManyAToB as assocsA', array(
+                'local' => 'id', 'foreign' => 'a_id',
+                'cascade' => array('delete')));
+    }
+}
+
+class CascadeDelete_ManyManySideB extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('id', 'integer', 4, array('primary' => true, 'autoincrement' => true));
+        $this->hasColumn('name', 'string', 4);
+    }
+    public function setUp() {
+        $this->hasMany('CascadeDelete_ManyManySideA as As', array(
+                'local' => 'b_id', 'foreign' => 'a_id',
+                'refClass' => 'CascadeDelete_ManyManyAToB',
+                'cascade' => array('delete')));
+        
+        // overrides the doctrine-generated relation to the association class
+        // in order to apply the app-level cascade
+        $this->hasMany('CascadeDelete_ManyManyAToB as assocsB', array(
+                'local' => 'id', 'foreign' => 'b_id',
+                'cascade' => array('delete')));
+    }
+}
+
+class CascadeDelete_ManyManyAToB extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('a_id', 'integer', 4, array('primary' => true));
+        $this->hasColumn('b_id', 'integer', 4, array('primary' => true));
+    }
+}
+
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/FilterTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/FilterTestCase.php
new file mode 100644
index 000000000..7b82b45f7
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/FilterTestCase.php
@@ -0,0 +1,107 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Record_Filter_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Record_Filter_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData()
+    { }
+    public function prepareTables()
+    {
+        $this->tables = array('CompositeRecord', 'RelatedCompositeRecord');
+        
+        parent::prepareTables();
+    }
+    public function testStandardFiltersThrowsExceptionWhenGettingUnknownProperties()
+    {
+        $u = new User();
+        
+        try {
+            $u->unknown;
+        
+            $this->fail();
+        } catch (Doctrine_Record_Exception $e) {
+            $this->pass();
+        }
+    }
+
+    public function testStandardFiltersThrowsExceptionWhenSettingUnknownProperties()
+    {
+        $u = new User();
+        
+        try {
+            $u->unknown = 'something';
+        
+            $this->fail();
+        } catch (Doctrine_Record_Exception $e) {
+            $this->pass();
+        }
+    }
+
+    public function testCompoundFilterSupportsAccessingRelatedComponentProperties()
+    {
+        $u = new CompositeRecord();
+        
+        try {
+            $u->name    = 'someone';
+            $u->address = 'something';
+
+            $u->save();
+
+            $this->assertEqual($u->name, 'someone');
+            $this->assertEqual($u->address, 'something');
+            $this->assertEqual($u->Related->address, 'something');
+        } catch (Doctrine_Record_Exception $e) {
+            $this->fail();
+        }
+    }
+}
+class CompositeRecord extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string');
+    }
+    public function setUp()
+    {
+    	$this->hasOne('RelatedCompositeRecord as Related', array('foreign' => 'foreign_id'));
+
+    	$this->unshiftFilter(new Doctrine_Record_Filter_Compound(array('Related')));
+    }
+}
+class RelatedCompositeRecord extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('address', 'string');
+        $this->hasColumn('foreign_id', 'integer');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/FromArrayTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/FromArrayTestCase.php
new file mode 100755
index 000000000..292ee38c5
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/FromArrayTestCase.php
@@ -0,0 +1,88 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Record_FromArray_TestCase
+ *
+ * @package     Doctrine
+ * @author      Stephen Ostrow <sostrow@sowebdesigns.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Record_FromArray_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        parent::prepareTables();
+    }
+    
+    public function prepareData()
+    {
+        # Create an existing group
+        $group = new Group();
+        $group->name = 'Group One';
+        $group->save();
+        $this->previous_group = $group['id'];
+    }
+
+    public function testFromArrayRecord()
+    {
+        $user = new User();
+        $userArray = $user->toArray();
+
+        # add a Phonenumber
+        $userArray['Phonenumber'][0]['phonenumber'] = '555 321';
+        
+        # add an Email address
+        $userArray['Email']['address'] = 'johndow@mail.com';
+        
+        # add group
+        $userArray['Group'][0]['name'] = 'New Group'; # This is a n-m relationship
+        # add a group which exists
+        $userArray['Group'][1]['_identifier'] = $this->previous_group; # This is a n-m relationship where the group was made in prepareData
+          
+        $user->fromArray($userArray);
+        
+        $this->assertEqual($user->Phonenumber->count(), 1);
+        $this->assertEqual($user->Phonenumber[0]->phonenumber, '555 321');
+        $this->assertEqual($user->Group[0]->name, 'New Group');
+        $this->assertEqual($user->Group[1]->name, 'Group One');
+        
+        try {
+          $user->save();
+        } catch (Exception $e ) {
+          $this->fail("Failed saving with " . $e->getMessage());
+        }
+    }
+
+    public function testFromArrayAfterSaveRecord()
+    {
+        $user = Doctrine_Query::create()->from('User u, u.Email, u.Phonenumber, u.Group')->fetchOne();
+        $this->assertEqual($user->Phonenumber->count(), 1);
+        $this->assertEqual($user->Phonenumber[0]->phonenumber, '555 321');
+        $this->assertEqual($user->Email->address, 'johndow@mail.com');
+        $this->assertEqual($user->Group[0]->name, 'New Group');
+        $this->assertEqual($user->Group[1]->name, 'Group One');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/GeneratorTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/GeneratorTestCase.php
new file mode 100644
index 000000000..c9e963278
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/GeneratorTestCase.php
@@ -0,0 +1,72 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Record_Generator_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Record_Generator_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testGeneratorComponentBinding()
+    {
+        Doctrine_Manager::connection('sqlite::memory:', 'test_tmp_conn', false);
+        Doctrine_Manager::getInstance()->bindComponent('I18nGeneratorComponentBinding', 'test_tmp_conn');
+        Doctrine_Core::createTablesFromArray(array('I18nGeneratorComponentBinding'));
+
+        try {
+            $i = new I18nGeneratorComponentBinding();
+            $i->name = 'test';
+            $i->Translation['EN']->title = 'en test';
+            $i->Translation['FR']->title = 'fr test';
+            $i->save();
+            
+            $this->pass();
+            
+            $this->assertTrue($i->id > 0);
+            $this->assertEqual($i->Translation['EN']->title, 'en test');
+            $this->assertEqual($i->Translation['FR']->title, 'fr test');
+            $this->assertEqual($i->getTable()->getConnection()->getName(), $i->Translation->getTable()->getConnection()->getName());
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+}
+
+class I18nGeneratorComponentBinding extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string');
+        $this->hasColumn('title', 'string');
+    }
+    
+    public function setUp()
+    {
+        $this->actAs('I18n', array('fields' => array('title')));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/HookTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/HookTestCase.php
new file mode 100644
index 000000000..1f970224d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/HookTestCase.php
@@ -0,0 +1,103 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Record_Hook_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Record_Hook_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData()
+    { }
+    public function prepareTables() 
+    { 
+        $this->tables = array('RecordHookTest', 'SoftDeleteTest');
+
+        parent::prepareTables();
+    }
+
+    public function testInsertHooksGetInvoked()
+    {
+        $r = new RecordHookTest();
+        
+        $r->name = 'record';
+        $r->save();
+
+        $this->assertEqual($r->pop(), 'postSave');
+        $this->assertEqual($r->pop(), 'postInsert');
+        $this->assertEqual($r->pop(), 'preInsert');
+        $this->assertEqual($r->pop(), 'preSave');
+    }
+
+    public function testUpdateHooksGetInvoked()
+    {
+        $records = Doctrine_Query::create()->from('RecordHookTest t')->where("t.name = 'record'")->execute();
+        $r = $records[0];
+
+        $r->name = 'record 2';
+        $r->save();
+
+        $this->assertEqual($r->pop(), 'postSave');
+        $this->assertEqual($r->pop(), 'postUpdate');
+        $this->assertEqual($r->pop(), 'preUpdate');
+        $this->assertEqual($r->pop(), 'preSave');
+    }
+
+    public function testDeleteHooksGetInvoked()
+    {
+        $records = Doctrine_Query::create()->from('RecordHookTest t')->where("t.name = 'record 2'")->execute();
+        $r = $records[0];
+
+        $r->delete();
+
+        $this->assertEqual($r->pop(), 'postDelete');
+        $this->assertEqual($r->pop(), 'preDelete');
+    }
+
+    public function testSoftDelete()
+    {
+        $r = new SoftDeleteTest();
+        $r->name = 'something';
+        $r->something ='something';
+        $r->save();
+
+        $this->assertEqual($r->name, 'something');
+        $this->assertEqual($r->something, 'something');
+
+        $this->assertEqual($r->deleted_at, null);
+        $this->assertEqual($r->state(), Doctrine_Record::STATE_CLEAN);
+
+        try {
+            $r->delete();
+            $this->assertEqual($r->state(), Doctrine_Record::STATE_CLEAN);
+            $this->assertTrue(strtotime($r->deleted_at) > 0);
+        } catch(Doctrine_Exception $e) {
+            $this->fail();
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/InheritanceTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/InheritanceTestCase.php
new file mode 100644
index 000000000..d10ca949e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/InheritanceTestCase.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Doctrine_Record_Inheritance_TestCase
+ *
+ * This test case demonstrates the use of inheritance involving subclasses of
+ * Doctrine_Record.  This type of inheritance is heavily used in sfDoctrine,
+ * and as new inheritance-related features get added to Doctrine it seems to
+ * be an area where subtle breakage can sneak in.
+ *
+ * @package     Doctrine
+ * @author      David Brewer <dbrewer@secondstory.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+
+class Doctrine_Record_Inheritance_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables = array_merge($this->tables, array('SymfonyRecord'));
+        parent::prepareTables();
+    }
+    public function prepareData()
+    {
+        parent::prepareData();
+    }
+
+    public function testInit()
+    {
+        $record = new SymfonyRecord();
+        $record['name'] = 'Test me';
+        $record->save();
+    }
+
+    public function testInstantiatingRecordWithAbstractParents()
+    {
+        // load our record
+        $record = Doctrine_Query::create()->query(
+            'SELECT * FROM SymfonyRecord r', array())->getFirst();
+
+        // did we get a record object?
+        $this->assertTrue($record instanceof SymfonyRecord);
+        $this->assertTrue($record->exists());
+
+        // does it have the appropriate parentage?
+        $this->assertTrue($record instanceof PluginSymfonyRecord);
+        $this->assertTrue($record instanceof BaseSymfonyRecord);
+        $this->assertTrue($record instanceof Doctrine_Record);
+
+        // does it have the expected data?
+        $this->assertEqual($record['name'], 'Test me');
+        
+
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/LockTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/LockTestCase.php
new file mode 100644
index 000000000..b061918cd
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/LockTestCase.php
@@ -0,0 +1,23 @@
+<?php
+class Doctrine_Record_Lock_TestCase extends Doctrine_UnitTestCase {
+    public function prepareTables()
+    {
+        $this->tables[] = 'rec1';
+        $this->tables[] = 'rec2';
+        parent::prepareTables();
+    }        
+        
+    public function prepareData() { }
+    
+    public function testDeleteRecords()
+    {
+        $rec1 = new Rec1();
+        $rec1->first_name = 'Some name';
+        $rec1->Account = new Rec2();
+        $rec1->Account->address = 'Some address';
+        $rec1->save();
+        
+        $rec1->delete();
+        $this->pass();
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/SaveBlankRecordTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/SaveBlankRecordTestCase.php
new file mode 100644
index 000000000..4d7255f76
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/SaveBlankRecordTestCase.php
@@ -0,0 +1,63 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Record_State_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Record_SaveBlankRecord_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'MyUserGroup';
+        $this->tables[] = 'MyUser';
+
+        parent::prepareTables();
+    }
+    
+    public function prepareData()
+    { }
+
+    public function testSaveBlankRecord()
+    {
+        $user = new MyUser();
+        $user->state('TDIRTY');
+        $user->save();
+        
+        $this->assertTrue(isset($user['id']) && $user['id']);
+    }
+    
+    public function testSaveBlankRecord2()
+    {
+        $group = new MyUserGroup();
+        $group->state('TDIRTY');
+        $group->save();
+        
+        $this->assertTrue(isset($group['id']) && $group['id']);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/SerializeUnserializeTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/SerializeUnserializeTestCase.php
new file mode 100644
index 000000000..ae07ffc9c
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/SerializeUnserializeTestCase.php
@@ -0,0 +1,117 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Record_SerializeUnserialize_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Record_SerializeUnserialize_TestCase extends Doctrine_UnitTestCase 
+{
+    
+    public function prepareTables()
+    {
+        $this->tables[] = 'SerializeTest';
+        $this->tables[] = 'TestRecord';
+
+        parent::prepareTables();
+    }
+    
+    public function prepareData()
+    { }
+
+    public function testSerializeUnserialize()
+    {
+        $object = new SerializeTest();
+        $object->booltest = true;
+        $object->integertest = 13;
+        $object->floattest = 0.13;
+        $object->stringtest = 'string';
+        $object->arraytest = array(1, 2, 3);
+        $object->objecttest = new TestObject(13);
+        $object->enumtest = 'java';
+        $object->blobtest = 'blobtest';
+        $object->clobtest = 'clobtest';
+        $object->gziptest = 'gziptest';
+        $object->timestamptest = '2007-08-07 11:55:00';
+        $object->timetest = '11:55:00';
+        $object->datetest = '2007-08-07';
+        
+        $object->save();
+        
+        $object_before = clone($object);
+        $serialized = serialize($object);
+        $object_after = unserialize($serialized);
+        
+        $this->assertIdentical($object_before->booltest, $object_after->booltest);
+        $this->assertIdentical($object_before->integertest, $object_after->integertest);
+        $this->assertIdentical($object_before->floattest, $object_after->floattest);
+        $this->assertIdentical($object_before->stringtest, $object_after->stringtest);
+        $this->assertIdentical($object_before->arraytest, $object_after->arraytest);
+        $this->assertIdentical($object_before->enumtest, $object_after->enumtest);
+        $this->assertEqual($object_before->objecttest, $object_after->objecttest);
+        $this->assertIdentical($object_before->blobtest, $object_after->blobtest);
+        $this->assertIdentical($object_before->clobtest, $object_after->clobtest);
+        $this->assertIdentical($object_before->gziptest, $object_after->gziptest);
+        $this->assertIdentical($object_before->timestamptest, $object_after->timestamptest);
+        $this->assertIdentical($object_before->timetest, $object_after->timetest);
+        $this->assertIdentical($object_before->datetest, $object_after->datetest);
+        
+    }
+    
+    public function testSerializeUnserializeRecord()
+    {
+        $test = new TestRecord();
+        $test->save();
+        
+        $object = new SerializeTest();
+        $object->objecttest = $test;
+         
+        $object->save();
+        
+        $object_before = clone($object);
+       
+        $serialized = serialize($object);
+        $object_after = unserialize($serialized);
+        
+        $this->assertIdentical(get_class($object_after->objecttest), 'TestRecord');
+    }
+    
+}
+
+class TestObject
+{
+    
+    private $test_field;
+    
+    public function __construct($value)
+    {
+        $this->test_field = $value;
+    }
+        
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/StateTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/StateTestCase.php
new file mode 100644
index 000000000..fd6a136c7
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/StateTestCase.php
@@ -0,0 +1,63 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Record_State_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Record_State_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables() 
+    { 
+        $this->tables = array('Entity');
+        
+        parent::prepareTables();
+    }
+
+    public function prepareData() 
+    { }
+
+    public function testAssigningAutoincId()
+    {
+        $user = new User();
+        
+        $this->assertEqual($user->id, null);
+        
+        $user->name = 'zYne';
+
+        $user->save();
+
+        $this->assertEqual($user->id, 1);
+        
+        $user->id = 2;
+
+        $this->assertEqual($user->id, 2);
+        
+        $user->save();
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/SynchronizeTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/SynchronizeTestCase.php
new file mode 100644
index 000000000..2f1b1628a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/SynchronizeTestCase.php
@@ -0,0 +1,148 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Record_State_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Record_Synchronize_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        parent::prepareTables();
+    }
+    
+    public function prepareData()
+    {
+        $user = new User();
+        $user->name = 'John';
+        $user->Email->address = 'john@mail.com';
+        $user->Phonenumber[0]->phonenumber = '555 123';
+        $user->Phonenumber[1]->phonenumber = '555 448';
+        $user->save();
+        
+        # Create an existing group
+        $group = new Group();
+        $group->name = 'Group One';
+        $group->save();
+        $this->previous_group = $group['id'];
+    }
+
+    public function testSynchronizeRecord()
+    {
+        $user = Doctrine_Query::create()->from('User u, u.Email, u.Phonenumber')->fetchOne();
+        $userArray = $user->toArray(true);
+        $this->assertEqual($user->Phonenumber->count(), 2);
+        $this->assertEqual($user->Phonenumber[0]->phonenumber, '555 123');
+
+        // modify a Phonenumber
+        $userArray['Phonenumber'][0]['phonenumber'] = '555 321';
+
+        // delete a Phonenumber
+        array_pop($userArray['Phonenumber']);
+        
+        // add group
+        $userArray['Group'][]['name'] = 'New Group'; # This is a n-m relationship
+        // add a group which exists
+        $userArray['Group'][1]['_identifier'] = $this->previous_group; # This is a n-m relationship where the group was made in prepareData
+
+        $user->synchronizeWithArray($userArray);
+        $this->assertEqual($user->Phonenumber->count(), 1);
+        $this->assertEqual($user->Phonenumber[0]->phonenumber, '555 321');
+        $this->assertEqual($user->Group[0]->name, 'New Group');
+        $this->assertEqual($user->Group[1]->name, 'Group One');
+
+        // change Email
+        $userArray['Email']['address'] = 'johndow@mail.com';
+        try {
+          $user->synchronizeWithArray($userArray);
+        } catch (Exception $e) {
+          $this->fail($e->getMessage());
+        }
+
+        $this->assertEqual($user->Email->address, 'johndow@mail.com');
+
+        try {
+          $user->save();
+        } catch (Exception $e ) {
+          $this->fail("Failed saving with " . $e->getMessage());
+        }
+    }
+
+    public function testSynchronizeAfterSaveRecord()
+    {
+        $user = Doctrine_Query::create()->from('User u, u.Group g, u.Email e, u.Phonenumber p')->fetchOne();
+        $this->assertEqual($user->Phonenumber->count(), 1);
+        $this->assertEqual($user->Phonenumber[0]->phonenumber, '555 321');
+        $this->assertEqual($user->Email->address, 'johndow@mail.com');
+        $this->assertEqual($user->Group[0]->name, 'New Group');
+        $this->assertEqual($user->Group[1]->name, 'Group One');
+    }
+
+    public function testSynchronizeAddRecord()
+    {
+        $user = Doctrine_Query::create()->from('User u, u.Email, u.Phonenumber')->fetchOne();
+        $userArray = $user->toArray(true);
+        $userArray['Phonenumber'][] = array('phonenumber' => '333 238');
+
+        $user->synchronizeWithArray($userArray);
+        
+        $this->assertEqual($user->Phonenumber->count(), 2);
+        $this->assertEqual($user->Phonenumber[1]->phonenumber, '333 238');
+        $user->save();
+    }
+
+    public function testSynchronizeAfterAddRecord()
+    {
+        $user = Doctrine_Query::create()->from('User u, u.Email, u.Phonenumber')->fetchOne();
+        
+        $this->assertEqual($user->Phonenumber->count(), 2);
+        $this->assertEqual($user->Phonenumber[1]->phonenumber, '333 238');
+    }
+
+    public function testSynchronizeRemoveRecord()
+    {
+        $user = Doctrine_Query::create()->from('User u, u.Email, u.Phonenumber')->fetchOne();
+        $userArray = $user->toArray(true);
+        unset($userArray['Phonenumber']);
+        unset($userArray['Email']);
+        unset($userArray['email_id']);
+
+        $user->synchronizeWithArray($userArray);
+        $this->assertEqual($user->Phonenumber->count(), 0);
+        $this->assertTrue(!isset($user->Email));
+        $user->save();
+    }
+
+    public function testSynchronizeAfterRemoveRecord()
+    {
+        $user = Doctrine_Query::create()->from('User u, u.Email, u.Phonenumber')->fetchOne();
+        $this->assertEqual($user->Phonenumber->count(), 0);
+        $this->assertTrue(!isset($user->Email));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/ZeroValuesTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/ZeroValuesTestCase.php
new file mode 100644
index 000000000..16dcdb16d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Record/ZeroValuesTestCase.php
@@ -0,0 +1,79 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Record_State_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Record_ZeroValues_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'ZeroValueTest';
+
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+        $user = new ZeroValueTest();
+        $user['is_super_admin'] = 0; // set it to 0 and it should be 0 when we pull it back from the database
+        $user['username'] = 'jwage';
+        $user['salt'] = 'test';
+        $user['password'] = 'test';
+        $user->save();
+    }
+
+    public function testZeroValuesMaintained()
+    {
+        $users = $this->dbh->query('SELECT * FROM zero_value_test')->fetchAll(PDO::FETCH_ASSOC);
+
+        $this->assertIdentical($users[0]['is_super_admin'], '0');
+    }
+
+    public function testZeroValuesMaintained2()
+    {
+        $q = new Doctrine_Query();
+        $q->from('ZeroValueTest');
+        $users = $q->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+        $this->assertIdentical($users[0]['is_super_admin'], false);
+        // check for aggregate bug
+        $this->assertTrue( ! isset($users[0][0]));
+    }
+
+    public function testZeroValuesMaintained3()
+    {
+        $q = new Doctrine_Query();
+        $q->from('ZeroValueTest');
+        $users = $q->execute();
+
+        $this->assertIdentical($users[0]['is_super_admin'], false);
+    }
+
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/RecordFilterTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/RecordFilterTestCase.php
new file mode 100644
index 000000000..b089208c3
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/RecordFilterTestCase.php
@@ -0,0 +1,45 @@
+<?php
+class Doctrine_Record_Filter_TestCase extends Doctrine_UnitTestCase {
+    public function prepareData() { }
+    public function prepareTables() { }
+
+    public function testValueWrapper() {
+        $e = new RecordFilterTest;
+        $e->name = "something";
+        $e->password = "123";
+
+
+        $this->assertEqual($e->get('name'), 'SOMETHING');
+        // test repeated calls
+        $this->assertEqual($e->get('name'), 'SOMETHING');
+        $this->assertEqual($e->id, null);
+        $this->assertEqual($e->rawGet('name'), 'something');
+        $this->assertEqual($e->password, '202cb962ac59075b964b07152d234b70');
+
+        $e->save();
+
+        $this->assertEqual($e->id, 1);
+        $this->assertEqual($e->name, 'SOMETHING');
+        $this->assertEqual($e->rawGet('name'), 'something');
+        $this->assertEqual($e->password, '202cb962ac59075b964b07152d234b70');
+
+        $this->connection->clear();
+
+        $e->refresh();
+
+        $this->assertEqual($e->id, 1);
+        $this->assertEqual($e->name, 'SOMETHING');
+        $this->assertEqual($e->rawGet('name'), 'something');
+        $this->assertEqual($e->password, '202cb962ac59075b964b07152d234b70');
+
+        $this->connection->clear();
+
+        $e = $e->getTable()->find($e->id);
+
+        $this->assertEqual($e->id, 1);
+        $this->assertEqual($e->name, 'SOMETHING');
+        $this->assertEqual($e->rawGet('name'), 'something');
+        $this->assertEqual($e->password, '202cb962ac59075b964b07152d234b70');
+
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/RecordTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/RecordTestCase.php
new file mode 100644
index 000000000..b0b06efb5
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/RecordTestCase.php
@@ -0,0 +1,1025 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Record_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Record_TestCase extends Doctrine_UnitTestCase
+{
+
+    public function prepareTables()
+    {
+        $this->tables[] = 'enumTest';
+        $this->tables[] = 'fieldNameTest';
+        $this->tables[] = 'GzipTest';
+        $this->tables[] = 'Book';
+        $this->tables[] = 'EntityAddress';
+        $this->tables[] = 'UnderscoreColumn';
+        parent::prepareTables();
+    }
+
+    public function testOne2OneForeign()
+    {
+        $this->conn->clear();
+        $user = new User();
+        $user->name = "Richard Linklater";
+
+        $rel = $user->getTable()->getRelation('Account');
+
+        $this->assertTrue($rel instanceof Doctrine_Relation_ForeignKey);
+
+        $account = $user->Account;
+        $account->amount = 1000;
+        $this->assertTrue($account instanceof Account);
+        $this->assertEqual($account->state(), Doctrine_Record::STATE_TDIRTY);
+        $this->assertEqual($account->entity_id->getOid(), $user->getOid());
+        $this->assertEqual($account->amount, 1000);
+        $this->assertEqual($user->name, "Richard Linklater");
+
+        $user->save();
+        $this->assertEqual($account->entity_id, $user->id);
+
+        $user->refresh();
+
+        $account = $user->Account;
+        $this->assertTrue($account instanceof Account);
+        $this->assertEqual($account->state(), Doctrine_Record::STATE_CLEAN);
+        $this->assertEqual($account->entity_id, $user->id);
+        $this->assertEqual($account->amount, 1000);
+        $this->assertEqual($user->name, "Richard Linklater");
+
+
+        $user = new User();
+        $user->name = 'John Rambo';
+        $account = $user->Account;
+        $account->amount = 2000;
+        $this->assertEqual($account->getTable()->getColumnNames(), array('id', 'entity_id', 'amount'));
+
+        $this->connection->flush();
+        $this->assertEqual($user->state(), Doctrine_Record::STATE_CLEAN);
+        $this->assertTrue($account instanceof Account);
+
+        $this->assertEqual($account->getTable()->getColumnNames(), array('id', 'entity_id', 'amount'));
+        $this->assertEqual($account->entity_id, $user->id);
+        $this->assertEqual($account->amount, 2000);
+
+
+        $user = $user->getTable()->find($user->id);
+        $this->assertEqual($user->state(), Doctrine_Record::STATE_CLEAN);
+
+
+        $account = $user->Account;
+        $this->assertTrue($account instanceof Account);
+
+        $this->assertEqual($account->state(), Doctrine_Record::STATE_CLEAN);
+        $this->assertEqual($account->getTable()->getColumnNames(), array('id', 'entity_id', 'amount'));
+
+        $this->assertEqual($account->entity_id, $user->id);
+        $this->assertEqual($account->amount, 2000);
+        $this->assertEqual($user->name, "John Rambo");
+
+    }
+
+    public function testIssetForPrimaryKey()
+    {
+        $this->assertTrue(isset($this->users[0]->id));
+        $this->assertTrue(isset($this->users[0]['id']));
+        $this->assertTrue($this->users[0]->contains('id'));
+
+        $user = new User();
+
+        $this->assertTrue(isset($user->id));
+        $this->assertTrue(isset($user['id']));
+        $this->assertTrue($user->contains('id'));
+    }
+
+    public function testNotNullConstraint()
+    {
+        $null = new NotNullTest();
+
+        $null->name = null;
+
+        $null->type = 1;
+        try {
+            $null->save();
+            $this->fail();
+        } catch (Exception $e) {
+            $this->pass();
+        }
+
+    }
+
+    public function testGzipType()
+    {
+        $gzip = new GzipTest();
+        $gzip->gzip = "compressed";
+
+        $this->assertEqual($gzip->gzip, "compressed");
+        $gzip->save();
+        $this->assertEqual($gzip->gzip, "compressed");
+        $gzip->refresh();
+        $this->assertEqual($gzip->gzip, "compressed");
+
+        $this->connection->clear();
+        $gzip = $gzip->getTable()->find($gzip->id);
+        $this->assertEqual($gzip->gzip, "compressed");
+
+        $gzip->gzip = "compressed 2";
+
+        $this->assertEqual($gzip->gzip, "compressed 2");
+        $gzip->save();
+        $this->assertEqual($gzip->gzip, "compressed 2");
+        $gzip->refresh();
+        $this->assertEqual($gzip->gzip, "compressed 2");
+    }
+
+    public function testDefaultValues()
+    {
+
+        $test = new FieldNameTest;
+
+        $this->assertEqual($test->someColumn, 'some string');
+        $this->assertEqual($test->someEnum, 'php');
+        $this->assertEqual($test->someArray, array());
+        $this->assertTrue(is_object($test->someObject));
+        $this->assertEqual($test->someInt, 11);
+    }
+
+
+    public function testToArray()
+    {
+        $query = Doctrine_Query::create()
+            ->select('u.id')
+            ->from('User u')
+            ->limit(1);
+        $user = $query->fetchOne()->toArray();
+        $this->assertFalse((bool) $user['name']);
+
+        $user = new User();
+
+        $a = $user->toArray();
+
+        $this->assertTrue(is_array($a));
+        $this->assertTrue(array_key_exists('name', $a));
+
+
+        $this->assertEqual($a['name'], null);
+        $this->assertTrue(array_key_exists('id', $a));
+        $this->assertEqual($a['id'], null);
+
+        $user->name = 'Someone';
+
+        $user->save();
+
+        $a = $user->toArray();
+
+        $this->assertTrue(is_array($a));
+        $this->assertTrue(array_key_exists('name', $a));
+        $this->assertEqual($a['name'], 'Someone');
+        $this->assertTrue(array_key_exists('id', $a));
+        $this->assertTrue(is_numeric($a['id']));
+
+        $user->refresh();
+
+        $a = $user->toArray();
+
+        $this->assertTrue(is_array($a));
+        $this->assertTrue(array_key_exists('name', $a));
+        $this->assertEqual($a['name'], 'Someone');
+        $this->assertTrue(array_key_exists('id', $a));
+        $this->assertTrue(is_numeric($a['id']));
+        $this->connection->clear();
+        $user = $user->getTable()->find($user->id);
+
+        $a = $user->toArray();
+
+        $this->assertTrue(is_array($a));
+        $this->assertTrue(array_key_exists('name', $a));
+        $this->assertEqual($a['name'], 'Someone');
+        $this->assertTrue(array_key_exists('id', $a));
+        $this->assertTrue(is_numeric($a['id']));
+    }
+
+    public function testReferences2()
+    {
+        $user = new User();
+        $user->Phonenumber[0]->phonenumber = '123 123';
+        $ref = $user->Phonenumber[0]->entity_id;
+
+        $this->assertEqual($ref->getOid(), $user->getOid());
+    }
+
+    public function testUpdatingWithNullValue()
+    {
+        $user = $this->connection->getTable('User')->find(5);
+        $user->name = null;
+        $this->assertEqual($user->name, null);
+
+        $user->save();
+
+        $this->assertEqual($user->name, null);
+
+        $this->connection->clear();
+
+        $user = $this->connection->getTable('User')->find(5);
+
+        $this->assertEqual($user->name, null);
+
+    }
+
+    public function testSerialize()
+    {
+        $user = $this->connection->getTable("User")->find(4);
+        $str = serialize($user);
+        $user2 = unserialize($str);
+
+        $this->assertTrue($user2 instanceof User);
+        $this->assertEqual($user2->identifier(), $user->identifier());
+    }
+
+    public function testCallback()
+    {
+        $user = new User();
+        $user->name = " zYne ";
+        $user->call('trim', 'name');
+        $this->assertEqual($user->name, 'zYne');
+        $user->call('substr', 'name', 0, 1);
+        $this->assertEqual($user->name, 'z');
+    }
+
+    public function testCompositePK() {
+        $record = new EntityReference();
+        $this->assertEqual($record->getTable()->getIdentifier(), array("entity1","entity2"));
+        $this->assertEqual($record->getTable()->getIdentifierType(), Doctrine_Core::IDENTIFIER_COMPOSITE);
+        $this->assertEqual($record->identifier(), array("entity1" => null, "entity2" => null));
+        $this->assertEqual($record->state(), Doctrine_Record::STATE_TCLEAN);
+
+        $record->entity1 = 3;
+        $record->entity2 = 4;
+        $this->assertEqual($record->entity2, 4);
+        $this->assertEqual($record->entity1, 3);
+        $this->assertEqual($record->state(), Doctrine_Record::STATE_TDIRTY);
+        $this->assertEqual($record->identifier(), array("entity1" => null, "entity2" => null));
+
+        $record->save();
+        $this->assertEqual($record->state(), Doctrine_Record::STATE_CLEAN);
+        $this->assertEqual($record->entity2, 4);
+        $this->assertEqual($record->entity1, 3);
+        $this->assertEqual($record->identifier(), array("entity1" => 3, "entity2" => 4));
+
+        $record = $record->getTable()->find($record->identifier());
+        $this->assertEqual($record->state(), Doctrine_Record::STATE_CLEAN);
+        $this->assertEqual($record->entity2, 4);
+        $this->assertEqual($record->entity1, 3);
+
+        $this->assertEqual($record->identifier(), array("entity1" => 3, "entity2" => 4));
+
+        $record->entity2 = 5;
+        $record->entity1 = 2;
+        $this->assertEqual($record->state(), Doctrine_Record::STATE_DIRTY);
+        $this->assertEqual($record->entity2, 5);
+        $this->assertEqual($record->entity1, 2);
+        $this->assertEqual($record->identifier(), array("entity1" => 3, "entity2" => 4));
+
+        $record->save();
+        $this->assertEqual($record->state(), Doctrine_Record::STATE_CLEAN);
+        $this->assertEqual($record->entity2, 5);
+        $this->assertEqual($record->entity1, 2);
+        $this->assertEqual($record->identifier(), array("entity1" => 2, "entity2" => 5));
+        $record = $record->getTable()->find($record->identifier());
+
+        $this->assertEqual($record->state(), Doctrine_Record::STATE_CLEAN);
+        $this->assertEqual($record->entity2, 5);
+        $this->assertEqual($record->entity1, 2);
+        $this->assertEqual($record->identifier(), array("entity1" => 2, "entity2" => 5));
+
+        $record->refresh();
+        $this->assertEqual($record->state(), Doctrine_Record::STATE_CLEAN);
+        $this->assertEqual($record->entity2, 5);
+        $this->assertEqual($record->entity1, 2);
+        $this->assertEqual($record->identifier(), array("entity1" => 2, "entity2" => 5));
+
+        $record = new EntityReference();
+        $record->entity2 = 6;
+        $record->entity1 = 2;
+        $record->save();
+
+        $coll = $this->connection->query("FROM EntityReference");
+        $this->assertTrue($coll[0] instanceof EntityReference);
+        $this->assertEqual($coll[0]->state(), Doctrine_Record::STATE_CLEAN);
+        $this->assertTrue($coll[1] instanceof EntityReference);
+        $this->assertEqual($coll[1]->state(), Doctrine_Record::STATE_CLEAN);
+
+        $coll = $this->connection->query("FROM EntityReference WHERE EntityReference.entity2 = 5");
+        $this->assertEqual($coll->count(), 1);
+    }
+
+    public function testManyToManyTreeStructure()
+    {
+        $this->conn->clear();
+        $task = $this->connection->create("Task");
+
+        $task->name = "Task 1";
+        $task->ResourceAlias[0]->name = "Resource 1";
+
+        $this->connection->flush();
+
+        $this->assertTrue($task->ResourceAlias[0] instanceof Resource);
+        $this->assertEqual($task->ResourceAlias[0]->name, "Resource 1");
+        $this->assertEqual($this->dbh->query("SELECT COUNT(*) FROM assignment")->fetch(PDO::FETCH_NUM),array(1));
+
+        $task = new Task();
+        $this->assertTrue($task instanceof Task);
+        $this->assertEqual($task->state(), Doctrine_Record::STATE_TCLEAN);
+        $this->assertTrue($task->Subtask[0] instanceof Task);
+
+        //$this->assertEqual($task->Subtask[0]->state(), Doctrine_Record::STATE_TDIRTY);
+        $this->assertTrue($task->ResourceAlias[0] instanceof Resource);
+        $this->assertEqual($task->ResourceAlias[0]->state(), Doctrine_Record::STATE_TCLEAN);
+
+        $task->name = "Task 1";
+        $task->ResourceAlias[0]->name = "Resource 1";
+        $task->Subtask[0]->name = "Subtask 1";
+
+        $this->assertEqual($task->name, "Task 1");
+        $this->assertEqual($task->ResourceAlias[0]->name, "Resource 1");
+        $this->assertEqual($task->ResourceAlias->count(), 1);
+        $this->assertEqual($task->Subtask[0]->name, "Subtask 1");
+
+        $this->connection->flush();
+
+        $task = $task->getTable()->find($task->identifier());
+
+        $this->assertEqual($task->name, "Task 1");
+        $this->assertEqual($task->ResourceAlias[0]->name, "Resource 1");
+        $this->assertEqual($task->ResourceAlias->count(), 1);
+        $this->assertEqual($task->Subtask[0]->name, "Subtask 1");
+
+    }
+
+
+    public function testGet()
+    {
+        $user = new User();
+        $user->name = "Jack Daniels";
+        $this->assertEqual($user->name, "Jack Daniels");
+        $this->assertEqual($user->created, null);
+        $this->assertEqual($user->updated, null);
+        $user->save();
+        $id = $user->identifier();
+        $user = $user->getTable()->find($id);
+        $this->assertEqual($user->name, "Jack Daniels");
+        $this->assertEqual($user->created, null);
+        $this->assertEqual($user->updated, null);
+        $this->assertEqual($user->getTable()->getData(), array());
+    }
+    
+    
+    public function testUnknownFieldGet()
+    {
+        $user = new User();
+        $user->name = "Jack Daniels";
+        $user->save();
+        
+        try {
+            $foo = $user->unexistentColumnInThisClass;
+
+            $this->fail();
+        } catch (Doctrine_Record_Exception $e) {
+            $this->pass();
+        }
+
+        try {
+            $foo = $user->get('unexistentColumnInThisClass');
+
+            $this->fail();
+        } catch (Doctrine_Record_Exception $e) {
+            $this->pass();
+        }
+    }
+
+
+    public function testNewOperator()
+    {
+        $table = $this->connection->getTable("User");
+
+        $this->assertEqual($this->connection->getTable("User")->getData(), array());
+        $user = new User();
+        $this->assertEqual(Doctrine_Lib::getRecordStateAsString($user->state()), Doctrine_Lib::getRecordStateAsString(Doctrine_Record::STATE_TCLEAN));
+        $user->name = "John Locke";
+
+        $this->assertTrue($user->name,"John Locke");
+        $this->assertTrue($user->state() == Doctrine_Record::STATE_TDIRTY);
+        $user->save();
+        $this->assertTrue($user->state() == Doctrine_Record::STATE_CLEAN);
+        $this->assertTrue($user->name,"John Locke");
+    }
+
+    public function testTreeStructure()
+    {
+        $this->conn->clear();
+        $e = new Element();
+
+        $fk = $e->getTable()->getRelation("Child");
+        $this->assertTrue($fk instanceof Doctrine_Relation_ForeignKey);
+        $this->assertEqual($fk->getType(), Doctrine_Relation::MANY);
+        $this->assertEqual($fk->getForeign(), "parent_id");
+        $this->assertEqual($fk->getLocal(), "id");
+
+
+
+        $e->name = "parent";
+        $e->Child[0]->name = "child 1";
+        $e->Child[1]->name = "child 2";
+
+        $e->Child[1]->Child[0]->name = "child 1's child 1";
+        $e->Child[1]->Child[1]->name = "child 1's child 1";
+
+        $this->assertEqual($e->name,"parent");
+
+        $this->assertEqual($e->Child[0]->name,"child 1");
+        $this->assertEqual($e->Child[1]->name,"child 2");
+        $this->assertEqual($e->Child[1]->Child[0]->name,"child 1's child 1");
+        $this->assertEqual($e->Child[1]->Child[1]->name,"child 1's child 1");
+
+
+
+        $this->connection->flush();
+        $elements = $this->connection->query("FROM Element");
+        $this->assertEqual($elements->count(), 5);
+
+        $e = $e->getTable()->find(1);
+        $this->assertEqual($e->name,"parent");
+
+        $this->assertEqual($e->Child[0]->name,"child 1");
+
+        $c = $e->getTable()->find(2);
+        $this->assertEqual($c->name, "child 1");
+
+        $this->assertEqual($e->Child[0]->parent_id, 1);
+        $this->assertEqual($e->Child[0]->Parent->identifier(), $e->identifier());
+
+
+        $this->assertEqual($e->Child[1]->parent_id, 1);
+        $this->assertEqual($e->Child[1]->Child[0]->name,"child 1's child 1");
+        $this->assertEqual($e->Child[1]->Child[1]->name,"child 1's child 1");
+        $this->assertEqual($e->Child[1]->Child[0]->parent_id, 3);
+        $this->assertEqual($e->Child[1]->Child[1]->parent_id, 3);
+
+    }
+
+    public function testUniqueKeyComponent()
+    {
+        $e = new TestError();
+        $e->message  = 'user error';
+        $e->file_md5 = md5(0);
+        $e->code     = 1;
+
+        // ADDING NEW RECORD
+        $this->assertEqual($e->code,1);
+        $this->assertEqual($e->file_md5, md5(0));
+        $this->assertEqual($e->message, 'user error');
+
+        $e2 = new TestError();
+        $e2->message  = 'user error2';
+        $e2->file_md5 = md5(1);
+        $e2->code     = 2;
+
+        $this->assertEqual($e2->code,2);
+        $this->assertEqual($e2->file_md5, md5(1));
+        $this->assertEqual($e2->message, 'user error2');
+
+
+        $fk = $e->getTable()->getRelation('Description');
+        $this->assertTrue($fk instanceof Doctrine_Relation_ForeignKey);
+        $this->assertEqual($fk->getLocal(),'file_md5');
+        $this->assertEqual($fk->getForeign(),'file_md5');
+        $this->assertTrue($fk->getTable() instanceof Doctrine_Table);
+
+        $e->Description[0]->description = 'This is the 1st description';
+        $e->Description[1]->description = 'This is the 2nd description';
+        $this->assertEqual($e->Description[0]->description, 'This is the 1st description');
+        $this->assertEqual($e->Description[1]->description, 'This is the 2nd description');
+        $this->assertEqual($e->Description[0]->file_md5, $e->file_md5);
+        $this->assertEqual($e->Description[1]->file_md5, $e->file_md5);
+
+        $this->assertEqual($e2->Description[0]->description, null);
+        $this->assertEqual($e2->Description[1]->description, null);
+        $this->assertEqual($e2->Description[0]->file_md5, $e2->file_md5);
+        $this->assertEqual($e2->Description[1]->file_md5, $e2->file_md5);
+
+        $e->save();
+
+        $coll = $this->connection->query('FROM TestError');
+        $e = $coll[0];
+
+
+        $this->assertEqual($e->code,1);
+        $this->assertEqual($e->file_md5, md5(0));
+        $this->assertEqual($e->message, 'user error');
+
+        $this->assertTrue($e->Description instanceof Doctrine_Collection);
+        $this->assertTrue($e->Description[0] instanceof Description);
+        $this->assertTrue($e->Description[1] instanceof Description);
+
+        $this->assertEqual($e->Description[0]->description, 'This is the 1st description');
+        $this->assertEqual($e->Description[1]->description, 'This is the 2nd description');
+
+        // UPDATING
+
+        $e->code = 2;
+        $e->message = 'changed message';
+        $e->Description[0]->description = '1st changed description';
+        $e->Description[1]->description = '2nd changed description';
+
+
+        $this->assertEqual($e->code,2);
+        $this->assertEqual($e->message,'changed message');
+        $this->assertEqual($e->Description[0]->description, '1st changed description');
+        $this->assertEqual($e->Description[1]->description, '2nd changed description');
+
+        $e->save();
+        $this->assertEqual($e->code,2);
+        $this->assertEqual($e->message,'changed message');
+        $this->assertEqual($e->Description[0]->description, '1st changed description');
+        $this->assertEqual($e->Description[1]->description, '2nd changed description');
+    }
+
+    public function testInsert()
+    {
+        $user = new User();
+        $user->name = "John Locke";
+        $user->save();
+
+        $this->assertTrue(is_numeric($user->id) && $user->id > 0);
+
+        $this->assertTrue($user->getModified() == array());
+        $this->assertTrue($user->state() == Doctrine_Record::STATE_CLEAN);
+
+        $user->delete();
+        $this->assertEqual($user->state(), Doctrine_Record::STATE_TCLEAN);
+    }
+
+    public function testUpdate()
+    {
+        $user = $this->connection->getTable("User")->find(4);
+        $user->set("name","Jack Daniels",true);
+
+
+        $user->save();
+        //print $this->old->name;
+
+        $this->assertEqual($user->getModified(), array());
+        $this->assertEqual($user->name, "Jack Daniels");
+    }
+
+    public function testCopy()
+    {
+        $user = $this->connection->getTable("User")->find(4);
+        $new = $user->copy();
+
+        $this->assertTrue($new instanceof Doctrine_Record);
+        $this->assertTrue($new->state() == Doctrine_Record::STATE_TDIRTY);
+
+        $new = $user->copy();
+        $new->save();
+        $this->assertEqual($user->name, $new->name);
+        $this->assertTrue(is_numeric($new->id) && $new->id > 0);
+        $new->refresh();
+        $this->assertEqual($user->name, $new->name);
+        $this->assertTrue(is_numeric($new->id) && $new->id > 0);
+    }
+
+    public function testCopyAndModify()
+    {
+        $user = $this->connection->getTable("User")->find(4);
+        $new = $user->copy();
+
+        $this->assertTrue($new instanceof Doctrine_Record);
+        $this->assertTrue($new->state() == Doctrine_Record::STATE_TDIRTY);
+
+        $new->loginname = 'jackd';
+
+        $this->assertEqual($user->name, $new->name);
+        $this->assertEqual($new->loginname, 'jackd');
+
+        $new->save();
+        $this->assertTrue(is_numeric($new->id) && $new->id > 0);
+
+        $new->refresh();
+        $this->assertEqual($user->name, $new->name);
+        $this->assertEqual($new->loginname, 'jackd');
+    }
+
+    public function testReferences()
+    {
+        try {
+            $user = $this->connection->getTable('User')->find(5);
+
+            $this->assertTrue($user->Phonenumber instanceof Doctrine_Collection);
+            $this->assertEqual($user->Phonenumber->count(), 3);
+
+            $coll = new Doctrine_Collection('Phonenumber');
+
+            $user->Phonenumber = $coll;
+            $this->assertEqual($user->Phonenumber->count(), 0);
+            $user->save();
+
+            $user->getTable()->clear();
+
+            $user = $this->objTable->find(5);
+
+            $this->assertEqual($user->Phonenumber->count(), 0);
+            $this->assertEqual(get_class($user->Phonenumber), 'Doctrine_Collection');
+
+            $user->Phonenumber[0]->phonenumber;
+            $this->assertEqual($user->Phonenumber->count(), 1);
+
+            // ADDING REFERENCES
+
+            $user->Phonenumber[0]->phonenumber = "123 123";
+
+            $this->assertEqual($user->Phonenumber->count(), 1);
+            $user->Phonenumber[1]->phonenumber = "123 123";
+            $this->assertEqual($user->Phonenumber->count(), 2);
+
+            $user->save();
+
+
+            $this->assertEqual($user->Phonenumber->count(), 2);
+
+            unset($user);
+            $user = $this->objTable->find(5);
+            $this->assertEqual($user->Phonenumber->count(), 2);
+
+            $user->Phonenumber[3]->phonenumber = "123 123";
+            $user->save();
+
+            $this->assertEqual($user->Phonenumber->count(), 3);
+            unset($user);
+            $user = $this->objTable->find(5);
+            $this->assertEqual($user->Phonenumber->count(), 3);
+
+            // DELETING REFERENCES
+
+            $user->Phonenumber->delete();
+
+            $this->assertEqual($user->Phonenumber->count(), 0);
+            unset($user);
+            $user = $this->objTable->find(5);
+            $this->assertEqual($user->Phonenumber->count(), 0);
+
+            // ADDING REFERENCES WITH STRING KEYS
+
+            $user->Phonenumber["home"]->phonenumber = "123 123";
+            $user->Phonenumber["work"]->phonenumber = "444 444";
+            $user->save();
+
+            $this->assertEqual($user->Phonenumber->count(), 2);
+            unset($user);
+            $user = $this->objTable->find(5);
+            $this->assertEqual($user->Phonenumber->count(), 2);
+
+            // REPLACING ONE-TO-MANY REFERENCE
+            unset($coll);
+            $coll = new Doctrine_Collection('Phonenumber');
+            $coll[0]->phonenumber = "123 123";
+            $coll["home"]->phonenumber = "444 444";
+            $coll["work"]->phonenumber = "444 444";
+
+            $user->Phonenumber = $coll;
+            $user->save();
+            $this->assertEqual($user->Phonenumber->count(), 3);
+
+            $user = $this->objTable->find(5);
+            //$this->assertEqual($user->Phonenumber->count(), 3);
+
+
+            // ONE-TO-ONE REFERENCES
+
+            $user->Email->address = "drinker@drinkmore.info";
+            $this->assertTrue($user->Email instanceof Email);
+            $this->assertEqual($user->Email->address, "drinker@drinkmore.info");
+
+            $user->save();
+
+            $this->assertTrue($user->Email instanceof Email);
+            $this->assertEqual($user->Email->address, "drinker@drinkmore.info");
+            $this->assertEqual($user->Email->id, $user->email_id);
+
+            $user = $this->objTable->find(5);
+
+            $this->assertTrue($user->Email instanceof Email);
+            $this->assertEqual($user->Email->id, $user->email_id);
+            $this->assertEqual($user->Email->state(), Doctrine_Record::STATE_CLEAN);
+            $this->assertEqual($user->Email->address, "drinker@drinkmore.info");
+            $id = $user->Email->id;
+
+            // REPLACING ONE-TO-ONE REFERENCES
+
+            $email = $this->connection->create("Email");
+            $email->address = "absolutist@nottodrink.com";
+            $user->Email = $email;
+
+            $this->assertTrue($user->Email instanceof Email);
+            $this->assertEqual($user->Email->address, "absolutist@nottodrink.com");
+            $user->save();
+            unset($user);
+
+            $user = $this->objTable->find(5);
+            $this->assertTrue($user->Email instanceof Email);
+            $this->assertEqual($user->Email->address, "absolutist@nottodrink.com");
+
+            $emails = $this->connection->query("FROM Email WHERE Email.id = $id");
+            //$this->assertEqual(count($emails),0);
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+
+    public function testDeleteReference()
+    {
+        $user = $this->objTable->find(5);
+        $int  = $user->Phonenumber->delete();
+
+        $this->assertTrue($user->Phonenumber->count() == 0);
+    }
+
+
+    public function testSaveAssociations()
+    {
+        $user = $this->objTable->find(5);
+
+        $gf   = $this->connection->getTable("Group");
+
+        $this->assertTrue($user->Group instanceof Doctrine_Collection);
+        $this->assertEqual($user->Group->count(), 1);
+        $this->assertEqual($user->Group[0]->id, 3);
+
+
+        // ADDING ASSOCIATED REFERENCES
+
+
+        $group1 = $gf->find(1);
+        $group2 = $gf->find(2);
+        $user->Group[1] = $group1;
+        $user->Group[2] = $group2;
+
+        $this->assertEqual($user->Group->count(), 3);
+
+        $user->save();
+        $coll = $user->Group;
+
+
+        // UNSETTING ASSOCIATED REFERENCES
+        unset($user);
+        $user = $this->objTable->find(5);
+        $this->assertEqual($user->Group->count(), 3);
+        $this->assertEqual($user->Group[1]->id, 1);
+        $this->assertEqual($user->Group[2]->id, 2);
+
+        $user->unlink('Group', array($group1->id, $group2->id), true);
+        $this->assertEqual($user->Group->count(), 1);
+
+        $user->save();
+        unset($user);
+
+
+        // CHECKING THE PERSISTENCE OF UNSET ASSOCIATED REFERENCES
+        $this->connection->clear();
+        $user = $this->objTable->find(5);
+        $this->assertEqual($user->Group->count(), 1);
+        $this->assertEqual($user->Group[0]->id, 3);
+        $this->assertEqual($gf->findAll()->count(), 3);
+
+
+        // REPLACING OLD ASSOCIATED REFERENCE
+        $user->unlink('Group', 3, true);  // you MUST first unlink old relationship
+        $user->Group[1] = $group1;
+        $user->Group[0] = $group2;
+        $user->save();
+
+        $user = $this->objTable->find(5);
+        $this->assertEqual($user->Group->count(), 2);
+        $this->assertEqual($user->Group[0]->identifier(), $group2->identifier());
+        $this->assertEqual($user->Group[1]->identifier(), $group1->identifier());
+
+        $user->unlink('Group', array(), true);
+        $user->save();
+        $user->free();
+
+        $user = $this->objTable->find(5);
+        $this->assertEqual($user->Group->count(), 0);
+
+
+        // ACCESSING ASSOCIATION OBJECT PROPERTIES
+
+        $user = new User();
+        $this->assertTrue($user->getTable()->getRelation("Groupuser") instanceof Doctrine_Relation_ForeignKey);
+
+        $this->assertTrue($user->Groupuser instanceof Doctrine_Collection);
+        $this->assertTrue($user->Groupuser[0] instanceof Groupuser);
+
+        $user->name = "Jack Daniels";
+        $user->Group[0]->name = "Group #1";
+        $user->Group[1]->name = "Group #2";
+        $t1 = time();
+        $t2 = time();
+        $user->Groupuser[0]->added = $t1;
+        $user->Groupuser[1]->added = $t2;
+
+        $this->assertEqual($user->Groupuser[0]->added, $t1);
+        $this->assertEqual($user->Groupuser[1]->added, $t2);
+
+        $user->save();
+
+        $user->refresh();
+        $this->assertEqual($user->Groupuser[0]->added, $t1);
+        $this->assertEqual($user->Groupuser[1]->added, $t2);
+
+    }
+
+
+    public function testCount()
+    {
+        $user = $this->connection->getTable("User")->find(4);
+
+        $this->assertTrue(is_integer($user->count()));
+    }
+
+    public function testGetReference()
+    {
+        $user = $this->connection->getTable("User")->find(4);
+
+        $this->assertTrue($user->Email instanceof Doctrine_Record);
+        $this->assertTrue($user->Phonenumber instanceof Doctrine_Collection);
+        $this->assertTrue($user->Group instanceof Doctrine_Collection);
+
+        $this->assertTrue($user->Phonenumber->count() == 1);
+    }
+    public function testGetIterator()
+    {
+        $user = $this->connection->getTable("User")->find(4);
+        $this->assertTrue($user->getIterator() instanceof ArrayIterator);
+    }
+
+    public function testRefreshRelated()
+    {
+        $user = $this->connection->getTable("User")->find(4);
+        $user->Address[0]->address = "Address #1";
+        $user->Address[1]->address = "Address #2";
+        $user->save();
+        $this->assertEqual(count($user->Address), 2);
+        Doctrine_Query::create()->delete()->from('EntityAddress')->where('user_id = ? AND address_id = ?', array($user->id, $user->Address[1]->id))->execute();
+        $user->refreshRelated('Address');
+        $this->assertEqual(count($user->Address), 1);
+        Doctrine_Query::create()->delete()->from('EntityAddress')->where('user_id = ? AND address_id = ?', array($user->id, $user->Address[0]->id))->execute();
+        $user->refreshRelated();
+        $this->assertEqual(count($user->Address), 0);
+    }
+
+    public function testRefreshDeep()
+    {
+        $user = $this->connection->getTable("User")->find(4);
+        $user->Address[0]->address = "Address #1";
+        $user->Address[1]->address = "Address #2";
+        $user->save();
+        $this->assertEqual(count($user->Address), 2);
+
+        Doctrine_Query::create()->delete()->from('EntityAddress')->where('user_id = ? AND address_id = ?', array($user->id, $user->Address[1]->id))->execute();
+        $user->refresh(true);
+        $this->assertEqual(count($user->Address), 1);
+
+        $address = $user->Address[0];
+        Doctrine_Query::create()->delete()->from('EntityAddress')->where('user_id = ? AND address_id = ?', array($user->id, $user->Address[0]->id))->execute();
+        $user->refresh(true);
+        $this->assertEqual(count($user->Address), 0);
+
+        $entity_address = new EntityAddress();
+        $entity_address->user_id = $user->id;
+        $entity_address->address_id = $address->id;
+        $entity_address->save();
+        $this->assertNotEqual(count($user->Address), 1);
+        $user->refresh(true);
+        $this->assertEqual(count($user->Address), 1);
+    }
+
+    public function testAggregateWithCommaGroupBy()
+    {
+        try {
+            $query = Doctrine_Query::create()->from('EntityAddress e')->groupby('COALESCE(e.user_id, e.address_id)');
+            $this->assertEqual($query->getSqlQuery(), 'SELECT e.user_id AS e__user_id, e.address_id AS e__address_id FROM entity_address e GROUP BY COALESCE(e.user_id, e.address_id)');
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+
+    public function testFirstCharUnderscoreInColumnNameAndTableName()
+    {
+        $record = new UnderscoreColumn();
+        $record->_underscore_ = 'test';
+        $record->save();
+
+        $this->assertEqual($record->_underscore_, 'test');
+        $this->assertTrue($record->id);
+
+        $query = new Doctrine_Query();
+        $query->from('UnderscoreColumn');
+
+        $result = $query->execute()->getFirst();
+        $this->assertEqual($result->_underscore_, 'test');
+    }
+
+    public function testRecordReplaceNoException()
+    {
+        try {
+            $user = new User();
+            $user->name = 'jon wage';
+            $user->loginname = 'jwage';
+            $user->replace();
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail('Doctrine_Record::replace() does not work: ' . $e->getMessage());
+        }
+    }
+
+    public function testReplaceReplacesAndNotInsertsNewRecord()
+    {
+        $users = Doctrine_Query::create()->from('User u');
+        $count = $users->count();
+
+        $user = new User();
+        $user->name = 'jon wage2';
+        $user->loginname = 'jwage2';
+        $user->save();
+        $id = $user->id;
+        $user->free();
+        $count++;
+
+        $users = Doctrine_Query::create()->from('User u')->execute();
+        $this->assertEqual($users->count(), $count);
+        $users->free();
+
+        $user = new User();
+        $user->assignIdentifier($id);
+        $user->name = 'jon wage changed';
+        $user->loginname = 'jwage2';
+        $user->replace();
+        $user->free();
+
+        $users = Doctrine_Query::create()->from('User u')->execute();
+        $this->assertEqual($users->count(), $count);
+        $users->free();
+
+        $user = Doctrine_Query::create()->from('User u')->where('u.loginname = ?', 'jwage2')->fetchOne();
+        $this->assertEqual($user->name, 'jon wage changed');
+
+        $user->name = 'jon wage changed2';
+        $user->replace();
+
+        $user = Doctrine_Query::create()->from('User u')->where('u.loginname = ?', 'jwage2')->fetchOne();
+        $this->assertEqual($user->name, 'jon wage changed2');
+    }
+
+    public function testDeleteReturnBooleanAndThrowsException()
+    {
+        $user = new User();
+        $user->name = 'jonnnn wage';
+        $user->loginname = 'jwage3';
+        $user->save();
+
+        $this->assertTrue($user->delete());
+        try {
+          // delete() on transient objects should just be ignored.
+          $user->delete();
+        } catch (Exception $e) {
+          $this->fail();
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/AccessTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/AccessTestCase.php
new file mode 100644
index 000000000..b46c7683e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/AccessTestCase.php
@@ -0,0 +1,210 @@
+<?php
+class Doctrine_Relation_Access_TestCase extends Doctrine_UnitTestCase {
+    public function prepareData() {
+        $this->conn->clear();
+        $o1 = new File_Owner();
+        $o1->name = "owner1";
+        $o2 = new File_Owner();
+        $o2->name = "owner2";
+
+        $f1 = new Data_File();
+        $f1->filename = 'file1';
+        $f2 = new Data_File();
+        $f2->filename = 'file2';
+        $f3 = new Data_File();
+        $f3->filename = 'file3';
+
+        $o1->Data_File->filename = 'file4';
+
+        // multiple left join branches test
+        $us = array();
+        $us[1] = new MyUser();
+        $us[1]->name = "user1";
+        $this->connection->flush();
+        // OneThings
+        $onethings_gs = array(
+            array(6,1)
+        );
+        $count = 1;
+        foreach($onethings_gs as $onething_g) {
+            for($i=$count;$i<$count+$onething_g[0];$i++) {
+                $d = new MyOneThing();
+                $d->name = "onething".$i;
+                if ($onething_g[1]) {
+                    $us[$onething_g[1]]->MyOneThing->add($d);
+                }
+            }
+            $count += $onething_g[0];
+        }
+        // OtherThings
+        for($i=0;$i<6;$i++) {
+            $o = new MyOtherThing();
+            $o->name = "otherthing".$i;
+            $us[1]->MyOtherThing->add($o);
+        }
+        // UserOneThings
+        /* Doctrine assigns the foreign keys automatically
+        $one_id_gs = array(
+                    array(array(2,3,6,5,1), 1)
+                    );
+        foreach($one_id_gs as $one_ids) {
+            foreach($one_ids[0] as $oid) {
+                $od = new MyUserOneThing();
+                $od->one_thing_id = $oid;
+                $od->user_id = $one_ids[1];
+            }
+        }
+        // UserOtherThings
+        $oth_id_gs = array(
+                    array(array(5,4), 1)
+                    );
+        foreach($oth_id_gs as $oth_ids) {
+            foreach($oth_ids[0] as $oid) {
+                $uo = new MyUserOtherThing();
+                $uo->other_thing_id = $oid;
+                $uo->user_id = $oth_ids[1];
+            }
+        }
+         */
+        $this->connection->flush();
+        $this->connection->clear();
+    }
+
+    public function prepareTables() {
+        $this->tables = array("Data_File", "File_Owner","MyUser",
+            "MyOneThing",
+            "MyUserOneThing",
+            "MyOtherThing",
+            "MyUserOtherThing"); 
+        parent::prepareTables();
+    }
+
+    public function testOneToOneAggregateRelationFetching() {
+        $coll = $this->connection->query("FROM File_Owner.Data_File WHERE File_Owner.name = 'owner1'");
+        $this->assertTrue(count($coll) == 1);
+        $this->assertTrue($coll[0] instanceof Doctrine_Record);
+
+        $this->assertEqual($coll[0]->id, 1);
+    }
+    public function testAccessOneToOneFromForeignSide() {
+
+        $check = $this->connection->query("FROM File_Owner WHERE File_Owner.name = 'owner1'");
+        $owner1 = $this->connection->query("FROM File_Owner.Data_File WHERE File_Owner.name = 'owner1'");
+        $owner2 = $this->connection->query("FROM File_Owner.Data_File WHERE File_Owner.name = 'owner2'");
+        $this->assertTrue(count($check) == 1);
+
+        $this->assertTrue(count($owner2) == 1);
+
+        $check = $check[0];
+        $owner1 = $owner1[0];
+        $owner2 = $owner2[0];
+        $this->assertEqual($owner1->name, 'owner1');
+        $this->assertEqual($owner1->id, 1);
+
+        $check2 = $this->connection->query("FROM File_Owner WHERE File_Owner.id = ".$owner1->get('id'));
+        $this->assertEqual(1, count($check2));
+        $check2 = $check2[0];
+        $this->assertEqual('owner1', $check2->get('name'));
+
+        $this->assertTrue(isset($owner1->Data_File));
+        $this->assertFalse(isset($owner2->Data_File));;
+        $this->assertIdentical($check, $owner1);
+        $this->assertEqual($owner1->get('id'), $check->get('id'));
+    }
+
+    public function testAccessOneToOneFromLocalSide() {
+        $check = $this->connection->query("FROM Data_File WHERE Data_File.filename = 'file4'");
+        $file1 = $this->connection->query("FROM Data_File.File_Owner WHERE Data_File.filename = 'file4'");
+        $file2 = $this->connection->query("FROM Data_File.File_Owner WHERE Data_File.filename = 'file1'");
+        $this->assertTrue(count($check) == 1);
+        $this->assertTrue(count($file1) == 1);
+        $this->assertTrue(count($file2) == 1);
+
+        $check = $check[0];
+        $file1 = $file1[0];
+        $file2 = $file2[0];
+
+        $check2 = $this->connection->query("FROM Data_File WHERE Data_File.id = ".$file1->get('id'));
+        $this->assertEqual(1, count($check2));
+        $check2 = $check2[0];
+        $this->assertEqual('file4', $check2->get('filename'));
+
+        $this->assertTrue(isset($file1->File_Owner));
+        $this->assertFalse(isset($file2->File_Owner));
+        $this->assertIdentical($check, $file1);
+        $this->assertEqual($file1->get('id'), $check->get('id'));
+    }
+
+    public function testMultipleLeftJoinBranches() {
+        $query = "FROM MyUserOtherThing";
+        $other = $this->connection->query($query);
+        $check1 = array();
+        foreach($other as $oth) {
+            if ( ! isset($check1[$oth->other_thing_id])) {
+                $check1[$oth->other_thing_id] = array();
+            }
+            $check1[$oth->other_thing_id][$oth->id] = $oth;
+        }
+        $query = "FROM MyUserOneThing";
+        $ones = $this->connection->query($query);
+        $check2 = array();
+        foreach($ones as $one) {
+            if ( ! isset($check2[$one->one_thing_id])) {
+                $check2[$one->one_thing_id] = array();
+            }
+            $check2[$one->one_thing_id][$one->id] = $one;
+        }
+
+        $query = "FROM MyUser a1,
+            a1.MyOneThing a2,
+            a2.MyUserOneThing a3,
+            a1.MyOtherThing a4,
+            a4.MyUserOtherThing a5";
+        $users = $this->connection->query($query);
+        foreach($users as $u) {
+            $this->assertEqual($u->MyOtherThing->count(), 6, "incorrect count of MyOtherThing");
+            foreach($u->MyOtherThing as $o) {
+                $in_check = array_key_exists($o->id, $check1);
+                $wanted_user_thing_count = $in_check ? count($check1[$o->id]) : 0;
+                $this->assertEqual($o->MyUserOtherThing->count(), $wanted_user_thing_count, "incorrect count of MyUserOtherThing on MyOtherThing");
+                foreach($o->MyUserOtherThing as $uo) {
+                    $this->assertEqual($uo->other_thing_id, $o->id, "incorrectly assigned MyOtherThing.id on MyUserOtherThing");
+                    if ($in_check) {
+                        $wanted_user_thing_exists = array_key_exists($uo->id, $check1[$o->id]);
+                        $this->assertTrue($wanted_user_thing_exists, "MyUserOtherThing incorrectly assigned to MyOtherThing.");
+                        if ($wanted_user_thing_exists) {
+                            $this->assertEqual($uo->other_thing_id, $check1[$o->id][$uo->id]->user_id, "incorrect value of MyUserOtherThing.user_id");
+                            $this->assertEqual($uo->other_thing_id, $check1[$o->id][$uo->id]->other_thing_id, "incorrect value of MyUserOtherThing.other_thing_id");
+                        }
+                    }
+                }
+            }
+        }
+
+        $query = "FROM MyUser a1,
+            a1.MyOtherThing a2,
+            a2.MyUserOtherThing a3,
+            a1.MyOneThing a4,
+            a4.MyUserOneThing a5";
+        $users = $this->connection->query($query);
+        foreach($users as $u) {
+            $this->assertEqual($u->MyOneThing->count(), 6, "incorrect count of MyOneThing");
+            foreach($u->MyOneThing as $o) {
+                $in_check = array_key_exists($o->id, $check2);
+                $wanted_user_thing_count = $in_check ? count($check2[$o->id]) : 0;
+                $this->assertEqual($o->MyUserOneThing->count(), $wanted_user_thing_count, "incorrect count of MyUserOneThing on MyOneThing");
+                foreach($o->MyUserOneThing as $uo) {
+                    $this->assertEqual($uo->one_thing_id, $o->id, "incorrectly assigned MyOneThing.id on MyUserOneThing");
+                    if ($in_check) {
+                        $wanted_user_thing_exists = array_key_exists($uo->id, $check2[$o->id]);
+                        $this->assertTrue($wanted_user_thing_exists, "MyUserOneThing incorrectly assigned to MyOneThing.");
+                        if ($wanted_user_thing_exists) {
+                            $this->assertEqual($uo->one_thing_id, $check2[$o->id][$uo->id]->user_id, "incorrect value of MyUserOneThing.user_id");
+                            $this->assertEqual($uo->one_thing_id, $check2[$o->id][$uo->id]->one_thing_id, "incorrect value of MyUserOneThing.one_thing_id");
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/CircularSavingTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/CircularSavingTestCase.php
new file mode 100644
index 000000000..b0b75c5e3
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/CircularSavingTestCase.php
@@ -0,0 +1,108 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Relation_CircularSaving_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @author      Jan Schaefer <tanken@gmx.de> 
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Relation_CircularSaving_TestCase extends Doctrine_UnitTestCase
+{
+
+    public function prepareData() 
+    { }
+    public function prepareTables() 
+    {
+        $this->tables = array('NestTest', 'NestReference');
+        
+        parent::prepareTables();
+    }
+
+    public function testMultiplePrimaryKeys()
+    {
+        $r = new Doctrine_Collection('NestReference');
+        $r[0]->parent_id = 1;
+        $r[0]->child_id = 2;
+        $r[1]->parent_id = 2;
+        $r[1]->child_id = 3;
+        $r->save();
+
+        $r->delete();
+        $this->conn->clear();
+        $q = new Doctrine_Query();
+        $coll = $q->from('NestReference')->execute();
+        $this->assertEqual(count($coll), 0);
+    }
+
+    public function testCircularNonEqualSelfReferencingRelationSaving() 
+    {
+        $n1 = new NestTest();
+        $n1->set('name', 'node1');
+        $n1->save();
+        $n2 = new NestTest();
+        $n2->set('name', 'node2');
+        $n2->save();
+
+        $n1->get('Children')->add($n2);
+        $n1->save();
+        $n2->get('Children')->add($n1);
+        $n2->save();
+
+        $q = new Doctrine_Query();
+        $coll = $q->from('NestReference')->execute();
+
+        $this->assertEqual(count($coll), 2);
+
+        $coll->delete();
+        $this->conn->clear();
+
+        $q = new Doctrine_Query();
+        $coll = $q->from('NestReference')->execute();
+        $this->assertEqual(count($coll), 0);
+    }
+
+    public function testCircularEqualSelfReferencingRelationSaving() 
+    {
+        $n1 = new NestTest();
+        $n1->set('name', 'node1');
+        $n1->save();
+        $n2 = new NestTest();
+        $n2->set('name', 'node2');
+        $n2->save();
+
+        $n1->get('Relatives')->add($n2);
+        $n1->save();
+        $n2->get('Relatives')->add($n1);
+        $n2->save();
+
+        $q = new Doctrine_Query();
+        $coll = $q->from('NestReference')->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+        $this->assertEqual(count($coll), 1);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/ColumnAliasesTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/ColumnAliasesTestCase.php
new file mode 100644
index 000000000..a9c224f1f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/ColumnAliasesTestCase.php
@@ -0,0 +1,66 @@
+<?php
+class Doctrine_Relation_ColumnAliases_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables() 
+    {
+        $this->tables = array(
+            "ColumnAliasTest2", 
+            "ColumnAliasTest3"
+        ); 
+        
+        parent::prepareTables();
+    }
+    
+    public function prepareData()
+    { }
+
+    public function testCompoundSave() {
+        $c2 = new ColumnAliasTest2();
+        $c2->alias1 = 'foo';
+        $c2->ColumnAliasTest3->alias1 = 'bar';
+        $c2->save();
+        
+        $this->assertNotNull($c2->column_alias_test3_id);
+    }
+    
+    
+    public function testHasOneCompoundSave2() {
+        $c3 = new ColumnAliasTest3();
+        $c3->alias1 = 'foo';
+        $c3->ColumnAliasTest2->alias1 = 'bar';
+        $c3->save();
+
+        $this->assertNotNull($c3->id);
+    }
+}
+
+class ColumnAliasTest2 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('column_alias_test2_id as id', 'integer', null, array('autoincrement' => true, 'primary' => true));
+        $this->hasColumn('column1 as alias1', 'string', 200);
+        $this->hasColumn('column2 as alias2', 'integer', 4);
+        $this->hasColumn('relation_id as column_alias_test3_id', 'integer', 4, array('notnull' => true));
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('ColumnAliasTest3', array('local' => 'column_alias_test3_id', 'foreign' => 'id'));
+    }
+}
+
+class ColumnAliasTest3 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('column_alias_test3_id as id', 'integer', null, array('autoincrement' => true, 'primary' => true));
+        $this->hasColumn('column1 as alias1', 'string', 200);
+        $this->hasColumn('column2 as alias2', 'integer', 4);
+    }
+	   
+    public function setUp()
+    {
+        $this->hasOne('ColumnAliasTest2', array('local' => 'id', 'foreign' => 'column_alias_test3_id'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/ManyToMany2TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/ManyToMany2TestCase.php
new file mode 100644
index 000000000..efe63668d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/ManyToMany2TestCase.php
@@ -0,0 +1,134 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Relation_Parser_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Relation_ManyToMany2_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData() 
+    {
+    }
+    
+    public function prepareTables() 
+    {
+        $this->tables = array('TestUser', 'TestMovie', 'TestMovieUserBookmark', 'TestMovieUserVote');
+        parent::prepareTables();
+    }
+    
+    public function testManyToManyCreateSelectAndUpdate() 
+    {
+        $user = new TestUser();
+        $user['name'] = 'tester';
+        $user->save();
+        
+        $data = new TestMovie();
+        $data['name'] = 'movie';
+        $data['User'] =  $user;
+        $data['MovieBookmarks'][0] = $user;
+        $data['MovieVotes'][0] = $user;
+        $data->save(); //All ok here
+        
+        $this->conn->clear();
+
+        $q = new Doctrine_Query();
+        $newdata = $q->select('m.*')
+                      ->from('TestMovie m')
+                      ->execute()
+                      ->getFirst();     
+        $newdata['name'] = 'movie2';    
+        try {
+            $newdata->save(); //big failure here
+            $this->pass();
+        } catch(Doctrine_Exception $e) {
+            $this->fail();
+        }
+        
+    }
+    public function testManyToManyJoinsandSave()
+    {
+        $q = new Doctrine_Query();
+        $newdata = $q->select('d.*, i.*, u.*, c.*')
+                       ->from('TestMovie d, d.MovieBookmarks i, i.UserVotes u, u.User c')
+                       ->execute()
+                       ->getFirst();
+        $newdata['MovieBookmarks'][0]['UserVotes'][0]['User']['name'] = 'user2';
+        try {
+            $newdata->save();
+            $this->pass();
+        } catch(Doctrine_Exception $e) {
+            $this->fail();
+        }
+    }
+
+    public function testInitMoreData()
+    {
+        $user = new TestUser();
+        $user->name = 'test user';
+        $user->save();
+
+        $movie = new TestMovie();
+        $movie->name = 'test movie';
+        $movie->save();
+
+        $movie = new TestMovie();
+        $movie->name = 'test movie 2';
+        $movie->save();
+
+        $this->conn->clear();
+    }
+
+    public function testManyToManyDirectLinksUpdating()
+    {
+        $users = $this->conn->query("FROM TestUser u WHERE u.name = 'test user'");
+
+        $this->assertEqual($users->count(), 1);
+
+        $movies = $this->conn->query("FROM TestMovie m WHERE m.name IN ('test movie', 'test movie 2')");
+
+        $this->assertEqual($movies->count(), 2);
+
+        $profiler = new Doctrine_Connection_Profiler();
+        
+        $this->conn->addListener($profiler);
+
+        $this->assertEqual($users[0]->UserBookmarks->count(), 0);
+        $users[0]->UserBookmarks = $movies;
+        $this->assertEqual($users[0]->UserBookmarks->count(), 2);
+
+        $users[0]->save();
+
+        $this->assertEqual($users[0]->UserBookmarks->count(), 2);
+        /**
+        foreach ($profiler->getAll() as $event) {
+            print $event->getQuery() . "<br>";
+        }
+        */
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/ManyToManyTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/ManyToManyTestCase.php
new file mode 100644
index 000000000..e46dff3a7
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/ManyToManyTestCase.php
@@ -0,0 +1,201 @@
+<?php
+
+class Doctrine_Relation_ManyToMany_TestCase extends Doctrine_UnitTestCase {
+    public function prepareData() { }
+    public function prepareTables() {
+        $this->tables = array('JC1', 'JC2', 'JC3', 'RTC1', 'RTC2', 'M2MTest', 'M2MTest2');
+        parent::prepareTables();
+    }
+
+    public function testManyToManyRelationWithAliasesAndCustomPKs() {
+        $component = new M2MTest2();
+
+        try {
+            $rel = $component->getTable()->getRelation('RTC5');
+            $this->pass();
+        } catch(Doctrine_Exception $e) {
+            $this->fail();
+        }
+        $this->assertTrue($rel instanceof Doctrine_Relation_Association);
+
+        $this->assertTrue($component->RTC5 instanceof Doctrine_Collection);
+
+        try {
+            $rel = $component->getTable()->getRelation('JC3');
+            $this->pass();
+        } catch(Doctrine_Exception $e) {
+            $this->fail();
+        }
+        $this->assertEqual($rel->getLocal(), 'oid');
+    }
+    public function testJoinComponent() {
+        $component = new JC3();
+        
+        try {
+            $rel = $component->getTable()->getRelation('M2MTest2');
+            $this->pass();
+        } catch(Doctrine_Exception $e) {
+            echo $e->getMessage();
+            $this->fail();
+        }
+        $this->assertEqual($rel->getForeign(), 'oid');
+    }
+
+    public function testManyToManyRelationFetchingWithAliasesAndCustomPKs2() {
+        $q = new Doctrine_Query();
+
+        try {
+            $q->from('M2MTest2 m INNER JOIN m.JC3');
+            $this->pass();
+        } catch(Doctrine_Exception $e) {
+            $this->fail();
+        }
+        try {
+            $q->execute();
+            $this->pass();
+        } catch(Doctrine_Exception $e) {
+            $this->fail();
+        }
+    }
+    public function testManyToManyHasRelationWithAliases4() {
+
+        try {
+            $component = new M2MTest();
+
+            $this->pass();
+        } catch(Doctrine_Exception $e) {
+            $this->fail();
+        }
+    }
+
+    public function testManyToManyHasRelationWithAliases3() {
+        $component = new M2MTest();
+
+        try {
+            $rel = $component->getTable()->getRelation('RTC3');
+            $this->pass();
+        } catch(Doctrine_Exception $e) {
+            $this->fail();
+        }
+        $this->assertTrue($rel instanceof Doctrine_Relation_Association);
+        
+        $this->assertTrue($component->RTC3 instanceof Doctrine_Collection);
+    }
+
+
+    public function testManyToManyHasRelationWithAliases() {
+        $component = new M2MTest();
+
+        try {
+            $rel = $component->getTable()->getRelation('RTC1');
+            $this->pass();
+        } catch(Doctrine_Exception $e) {
+            $this->fail();
+        }
+        $this->assertTrue($rel instanceof Doctrine_Relation_Association);
+        
+        $this->assertTrue($component->RTC1 instanceof Doctrine_Collection);
+    }
+
+    public function testManyToManyHasRelationWithAliases2() {
+        $component = new M2MTest();
+
+        try {
+            $rel = $component->getTable()->getRelation('RTC2');
+            $this->pass();
+        } catch(Doctrine_Exception $e) {
+            $this->fail();
+        }
+        $this->assertTrue($rel instanceof Doctrine_Relation_Association);
+        
+        $this->assertTrue($component->RTC1 instanceof Doctrine_Collection);
+    }
+
+
+    public function testManyToManyRelationSaving() {
+        $component = new M2MTest();
+
+        $component->RTC1[0]->name = '1';
+        $component->RTC1[1]->name = '2';
+        $component->name = '2';
+        
+        $count = $this->connection->count();
+
+        $component->save();
+
+        $this->assertEqual($this->connection->count(), ($count + 5));
+        
+        $this->assertEqual($component->RTC1->count(), 2);
+        
+        $component = $component->getTable()->find($component->id);
+        
+        $this->assertEqual($component->RTC1->count(), 2);
+
+        // check that it doesn't matter saving the other M2M components as well
+
+        $component->RTC2[0]->name = '1';
+        $component->RTC2[1]->name = '2';
+
+        $count = $this->connection->count();
+
+        $component->save();
+
+        $this->assertEqual($this->connection->count(), ($count + 4));
+
+        $this->assertEqual($component->RTC2->count(), 2);
+
+        $component = $component->getTable()->find($component->id);
+
+        $this->assertEqual($component->RTC2->count(), 2);
+
+    }
+
+    public function testManyToManyRelationSaving2() {
+        $component = new M2MTest();
+
+        $component->RTC2[0]->name = '1';
+        $component->RTC2[1]->name = '2';
+        $component->name = '2';
+        
+        $count = $this->connection->count();
+
+        $component->save();
+
+        $this->assertEqual($this->connection->count(), ($count + 5));
+        
+        $this->assertEqual($component->RTC2->count(), 2);
+        
+        $component = $component->getTable()->find($component->id);
+
+        $this->assertEqual($component->RTC2->count(), 2);
+
+        // check that it doesn't matter saving the other M2M components as well
+
+        $component->RTC1[0]->name = '1';
+        $component->RTC1[1]->name = '2';
+
+        $count = $this->connection->count();
+
+        $component->save();
+
+        $this->assertEqual($this->connection->count(), ($count + 3));
+        
+        $this->assertEqual($component->RTC1->count(), 2);
+        
+        $component = $component->getTable()->find($component->id);
+        
+        $this->assertEqual($component->RTC1->count(), 2);
+    }
+    
+    public function testManyToManySimpleUpdate() {
+        $component = $this->connection->getTable('M2MTest')->find(1);
+        
+        $this->assertEqual($component->name, 2);
+        
+        $component->name = 'changed name';
+        
+        $component->save();
+        
+        $this->assertEqual($component->name, 'changed name');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/NestTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/NestTestCase.php
new file mode 100644
index 000000000..1251bed35
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/NestTestCase.php
@@ -0,0 +1,254 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Relation_Nest_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Relation_Nest_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData() 
+    { }
+
+    public function prepareTables()
+    {
+        $this->tables = array('NestTest', 'NestReference', 'Entity', 'EntityReference');
+        
+        parent::prepareTables();
+    }
+
+    public function testInitJoinTableSelfReferencingInsertingData() 
+    {
+        $e = new Entity();
+        $e->name = "Entity test";
+
+        $this->assertTrue($e->Entity[0] instanceof Entity);
+        $this->assertTrue($e->Entity[1] instanceof Entity);
+
+        $this->assertEqual($e->Entity[0]->state(), Doctrine_Record::STATE_TCLEAN);
+        $this->assertEqual($e->Entity[1]->state(), Doctrine_Record::STATE_TCLEAN);
+        
+        $e->Entity[0]->name = 'Friend 1';
+        $e->Entity[1]->name = 'Friend 2';
+        
+        $e->Entity[0]->Entity[0]->name = 'Friend 1 1';
+        $e->Entity[0]->Entity[1]->name = 'Friend 1 2';
+
+        $e->Entity[1]->Entity[0]->name = 'Friend 2 1';
+        $e->Entity[1]->Entity[1]->name = 'Friend 2 2';
+
+        $this->assertEqual($e->Entity[0]->name, 'Friend 1');
+        $this->assertEqual($e->Entity[1]->name, 'Friend 2');
+
+        $this->assertEqual($e->Entity[0]->Entity[0]->name, 'Friend 1 1');
+        $this->assertEqual($e->Entity[0]->Entity[1]->name, 'Friend 1 2');
+
+        $this->assertEqual($e->Entity[1]->Entity[0]->name, 'Friend 2 1');
+        $this->assertEqual($e->Entity[1]->Entity[1]->name, 'Friend 2 2');
+
+        $this->assertEqual($e->Entity[0]->state(), Doctrine_Record::STATE_TDIRTY);
+        $this->assertEqual($e->Entity[1]->state(), Doctrine_Record::STATE_TDIRTY);
+
+        $count = count($this->conn);
+
+        $e->save();
+
+        $this->assertEqual(($count + 13), $this->conn->count());
+    }
+
+    public function testNestRelationsFetchingData()
+    {    
+        $this->connection->clear();
+
+        $e = $this->conn->queryOne('FROM Entity e LEFT JOIN e.Entity e2 LEFT JOIN e2.Entity e3 WHERE (e.id = 1) ORDER BY e.name, e2.name, e3.name');
+        $this->assertEqual($e->state(), Doctrine_Record::STATE_CLEAN);
+
+        $this->assertTrue($e->Entity[0] instanceof Entity);
+        $this->assertTrue($e->Entity[1] instanceof Entity);
+        
+        $this->assertEqual($e->Entity[0]->name, 'Friend 1');
+        $this->assertEqual($e->Entity[1]->name, 'Friend 2');
+
+        $this->assertEqual($e->Entity[0]->Entity[0]->name, 'Entity test');
+        $this->assertEqual($e->Entity[0]->Entity[1]->name, 'Friend 1 1');
+        $this->assertEqual($e->Entity[0]->Entity[2]->name, 'Friend 1 2');
+
+        $this->assertEqual($e->Entity[0]->Entity[0]->name, 'Entity test');
+        $this->assertEqual($e->Entity[1]->Entity[1]->name, 'Friend 2 1');
+        $this->assertEqual($e->Entity[1]->Entity[2]->name, 'Friend 2 2');
+
+        $this->assertEqual($e->Entity[0]->state(), Doctrine_Record::STATE_CLEAN);
+        $this->assertEqual($e->Entity[1]->state(), Doctrine_Record::STATE_CLEAN);
+
+        $this->assertTrue(is_numeric($e->id));
+
+        $result = $this->conn->execute('SELECT * FROM entity_reference')->fetchAll(PDO::FETCH_ASSOC);
+
+        $this->assertEqual(count($result), 6);
+
+        //$stmt = $this->dbh->prepare($q);
+
+        //$stmt->execute(array(18));
+        //$result = $stmt->fetchAll(PDO::FETCH_ASSOC);
+
+        //print_r($result);
+
+        $this->connection->clear();
+
+        $e = $e->getTable()->find($e->id);
+
+        $count = count($this->conn);
+
+        $this->assertTrue($e instanceof Entity);
+
+        $this->assertTrue($e->Entity[0] instanceof Entity);
+        $this->assertTrue($e->Entity[1] instanceof Entity);
+
+        $this->assertEqual(count($this->conn), ($count + 1));
+
+        $this->assertEqual($e->Entity[0]->name, "Friend 1");
+        $this->assertEqual($e->Entity[1]->name, "Friend 2");
+
+        $this->assertEqual($e->Entity[0]->Entity[0]->name, "Entity test");
+        $this->assertEqual($e->Entity[0]->Entity[1]->name, "Friend 1 1");
+
+        $this->assertEqual(count($this->conn), ($count + 2));
+
+        $this->assertEqual($e->Entity[1]->Entity[0]->name, "Entity test");
+        $this->assertEqual($e->Entity[1]->Entity[1]->name, "Friend 2 1");
+
+        $this->assertEqual(count($this->conn), ($count + 3));
+
+        $this->assertEqual($e->Entity[0]->state(), Doctrine_Record::STATE_CLEAN);
+        $this->assertEqual($e->Entity[1]->state(), Doctrine_Record::STATE_CLEAN);
+        
+        $coll = $this->connection->query("FROM Entity WHERE Entity.name = 'Friend 1'");
+        $this->assertEqual($coll->count(), 1);
+        $this->assertEqual($coll[0]->state(), Doctrine_Record::STATE_CLEAN);
+        
+        $this->assertEqual($coll[0]->name, "Friend 1");
+        
+        $query = new Doctrine_Query($this->connection);
+
+        $query->from('Entity e LEFT JOIN e.Entity e2')->where("e2.name = 'Friend 1 1'");
+
+        $coll = $query->execute();
+
+        $this->assertEqual($coll->count(), 1);
+    }
+
+    public function testNestRelationsParsing()
+    {
+        $nest = new NestTest();
+        
+        $rel = $nest->getTable()->getRelation('Parents');
+
+        $this->assertTrue($rel instanceof Doctrine_Relation_Nest);
+        
+        $this->assertEqual($rel->getLocal(), 'child_id');
+        $this->assertEqual($rel->getForeign(), 'parent_id');
+    }
+
+    public function testNestRelationsSaving()
+    {
+        $nest = new NestTest();
+        $nest->name = 'n 1';
+        $nest->Parents[0]->name = 'p 1';
+        $nest->Parents[1]->name = 'p 2';
+        $nest->Parents[2]->name = 'p 3';
+        $nest->Children[0]->name = 'c 1';
+        $nest->Children[0]->Children[0]->name = 'c c 1';
+        $nest->Children[0]->Children[1]->name = 'c c 2';
+        $nest->Children[1]->name = 'c 2';
+        $nest->Children[1]->Parents[]->name = 'n 2';
+        $nest->save();
+        
+        $this->connection->clear();
+    }
+
+    public function testNestRelationsLoading()
+    {
+        $nest = $this->conn->queryOne('FROM NestTest n WHERE n.id = 1');
+        
+        $this->assertEqual($nest->Parents->count(), 3);
+        $this->assertEqual($nest->Children->count(), 2);
+        $this->assertEqual($nest->Children[0]->Children->count(), 2);
+        $this->assertEqual($nest->Children[1]->Parents->count(), 2);
+        
+        $this->connection->clear();
+    }
+
+    public function testEqualNestRelationsLoading()
+    {
+        $nest = $this->conn->queryOne('FROM NestTest n WHERE n.id = 1');
+
+        $this->assertEqual($nest->Relatives->count(), 5);
+    }
+
+    public function testNestRelationsQuerying()
+    {
+        $this->connection->clear();
+
+        $q = new Doctrine_Query();
+
+        $q->from('NestTest n')->innerJoin('n.Parents p')->where('n.id = 1');
+
+        $n = $q->execute();
+
+        $this->assertEqual($n[0]->Parents->count(), 3);
+    }
+
+    public function testNestRelationsQuerying2()
+    {
+        $this->connection->clear();
+
+        $q = new Doctrine_Query();
+
+        $q->from('NestTest n')->innerJoin('n.Children c')->where('n.id = 1');
+
+        $n = $q->execute();
+
+        $this->assertEqual($n[0]->Children->count(), 2);
+    }
+
+    public function testEqualNestRelationsQuerying()
+    {
+        $this->connection->clear();
+
+        $q = new Doctrine_Query();
+
+        $q->from('NestTest n')->innerJoin('n.Relatives r')->where('n.id = 1');
+
+        $n = $q->execute();
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT n.id AS n__id, n.name AS n__name, n2.id AS n2__id, n2.name AS n2__name FROM nest_test n INNER JOIN nest_reference n3 ON (n.id = n3.child_id OR n.id = n3.parent_id) INNER JOIN nest_test n2 ON (n2.id = n3.parent_id OR n2.id = n3.child_id) AND n2.id != n.id WHERE (n.id = 1)');
+
+        $this->assertEqual($n[0]->Relatives->count(), 5);
+    }
+
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/OneToManyTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/OneToManyTestCase.php
new file mode 100644
index 000000000..5133f47fd
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/OneToManyTestCase.php
@@ -0,0 +1,118 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Relation_OneToOne_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Relation_OneToMany_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData()
+    { }
+    public function prepareTables()
+    {
+        $this->tables = array('Entity', 'Phonenumber', 'Email', 'Policy', 'PolicyAsset', 'Role', 'Auth');
+        
+        parent::prepareTables();
+    }
+    public function testRelationParsing()
+    {
+        $table = $this->conn->getTable('Entity');
+
+        $rel = $table->getRelation('Phonenumber');
+
+        $this->assertTrue($rel instanceof Doctrine_Relation_ForeignKey);
+
+        $rel = $table->getRelation('Email');
+
+        $this->assertTrue($rel instanceof Doctrine_Relation_LocalKey);
+    }
+
+    public function testRelationParsing2()
+    {
+        $table = $this->conn->getTable('Phonenumber');
+
+        $rel = $table->getRelation('Entity');
+
+        $this->assertTrue($rel instanceof Doctrine_Relation_LocalKey);
+    }
+
+    public function testRelationParsing3()
+    {
+        $table = $this->conn->getTable('Policy');
+
+        $rel = $table->getRelation('PolicyAssets');
+
+        $this->assertTrue($rel instanceof Doctrine_Relation_ForeignKey);
+    }
+    public function testRelationSaving() 
+    {
+        $p = new Policy();
+        $p->policy_number = '123';
+        
+        $a = new PolicyAsset();
+        $a->value = '123.13';
+
+        $p->PolicyAssets[] = $a;
+        $p->save();
+        
+        $this->assertEqual($a->policy_number, '123');
+    }
+    public function testRelationSaving2()
+    {
+        $e = new Entity();
+        $e->name = 'test';
+        $e->save();
+         
+        $nr = new Phonenumber();
+        $nr->phonenumber = '1234556';
+        $nr->save();
+        $nr->Entity = $e;
+    }
+    public function testRelationSaving3() 
+    {
+        // create roles and user with role1 and role2
+        $this->conn->beginTransaction();
+        $role = new Role();
+        $role->name = 'role1';
+        $role->save();
+     
+        $auth = new Auth();
+        $auth->name = 'auth1';
+        $auth->Role = $role;
+        $auth->save();
+        
+        $this->conn->commit();
+     
+        $this->conn->clear();
+
+        $auths = $this->conn->query('FROM Auth a LEFT JOIN a.Role r');
+
+        $this->assertEqual($auths[0]->Role->name, 'role1'); 
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/OneToOneTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/OneToOneTestCase.php
new file mode 100644
index 000000000..b65f9dcf0
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/OneToOneTestCase.php
@@ -0,0 +1,101 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Relation_OneToOne_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Relation_OneToOne_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData() 
+    { }
+    public function prepareTables() 
+    { 
+        $this->tables = array('gnatUser','gnatEmail','Email','Entity','Record_City', 'Record_Country', 'SelfRefTest');
+        
+        parent::prepareTables();
+    }
+
+    public function testOneToOneAggregateRelationWithAliasesIsSupported()
+    {
+        $city = new Record_City();
+        $country = $city->Country;
+
+        $this->assertTrue($country instanceof Record_Country);  
+    }
+    
+    public function testSelfReferentialOneToOneRelationsAreSupported()
+    {
+        $ref = new SelfRefTest();
+        
+        $rel = $ref->getTable()->getRelation('createdBy');
+
+        $this->assertEqual($rel->getForeign(), 'id');
+        $this->assertEqual($rel->getLocal(), 'created_by');
+        
+        $ref->name = 'ref 1';
+        $ref->createdBy->name = 'ref 2';
+        
+        $ref->save();
+    }
+    public function testSelfReferentialOneToOneRelationsAreSupported2()
+    {
+        $this->connection->clear();
+        
+        $ref = $this->conn->queryOne("FROM SelfRefTest s WHERE s.name = 'ref 1'");
+        $this->assertEqual($ref->name, 'ref 1');
+        $this->assertEqual($ref->createdBy->name, 'ref 2');
+    }
+
+    public function testUnsetRelation()
+    {
+        $user = new User();
+        $user->name = 'test';
+        $email = new Email();
+        $email->address = 'test@test.com';
+        $user->Email = $email;
+        $user->save();
+        $this->assertTrue($user->Email instanceOf Email);
+        $user->Email = Email::getNullObject();
+        $user->save();
+        $this->assertTrue($user->Email === null);
+    }
+
+    public function testSavingRelatedObjects()
+    {
+        $user = new gnatUser();
+        $user->name = 'test';
+        $email = new gnatEmail();
+        $email->address = 'test3@test.com';
+        $user->Email = $email;
+        $user->save();
+        $this->assertTrue($user->Email instanceOf gnatEmail);
+        $this->assertEqual($user->foreign_id, $user->Email->id);
+        
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/OrderByTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/OrderByTestCase.php
new file mode 100644
index 000000000..84487c452
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/OrderByTestCase.php
@@ -0,0 +1,290 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Relation_OrderBy_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Relation_OrderBy_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->profiler = new Doctrine_Connection_Profiler();
+    	$this->conn->addListener($this->profiler);
+
+        $this->tables[] = 'OrderByTest_Article';
+        $this->tables[] = 'OrderByTest_Friend';
+        $this->tables[] = 'OrderByTest_Group';
+        $this->tables[] = 'OrderByTest_User';
+        $this->tables[] = 'OrderByTest_UserGroup';
+        $this->tables[] = 'OrderByTest_Category';
+        $this->tables[] = 'OrderByTest_BlogPost';
+        parent::prepareTables();
+    }
+
+    public function testFullDqlQuery()
+    {
+        $userTable = Doctrine_Core::getTable('OrderByTest_User');
+        $q = $userTable
+            ->createQuery('u')
+            ->select('u.id')
+            ->leftJoin('u.Articles a')
+            ->leftJoin('u.Groups g')
+            ->leftJoin('u.Friends f')
+            ->leftJoin('u.ChildrenUsers cu')
+            ->leftJoin('u.ParentUser pu');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT o.id AS o__id FROM order_by_test__user o LEFT JOIN order_by_test__article o2 ON o.id = o2.user_id LEFT JOIN order_by_test__user_group o4 ON (o.id = o4.user_id) LEFT JOIN order_by_test__group o3 ON o3.id = o4.group_id LEFT JOIN order_by_test__friend o6 ON (o.id = o6.user_id1 OR o.id = o6.user_id2) LEFT JOIN order_by_test__user o5 ON (o5.id = o6.user_id2 OR o5.id = o6.user_id1) AND o5.id != o.id LEFT JOIN order_by_test__user o7 ON o.id = o7.parent_user_id LEFT JOIN order_by_test__user o8 ON o.parent_user_id = o8.id ORDER BY o2.title ASC, o3.name ASC, o4.name ASC, o5.login ASC, o6.login ASC, o7.login ASC, o8.id ASC');
+    }
+
+    public function testLazyLoadingQueries()
+    {
+        $userTable = Doctrine_Core::getTable('OrderByTest_User');
+
+        $this->assertEqual($userTable->getRelation('Articles')->getRelationDql(1), 'FROM OrderByTest_Article WHERE OrderByTest_Article.user_id IN (?) ORDER BY OrderByTest_Article.title ASC');
+        $this->assertEqual($userTable->getRelation('Groups')->getRelationDql(1), 'FROM OrderByTest_Group.OrderByTest_UserGroup WHERE OrderByTest_Group.OrderByTest_UserGroup.user_id IN (?) ORDER BY OrderByTest_Group.name ASC');
+        $this->assertEqual($userTable->getRelation('Friends')->getRelationDql(1), 'FROM OrderByTest_User.OrderByTest_Friend WHERE OrderByTest_User.OrderByTest_Friend.user_id1 IN (?) ORDER BY OrderByTest_User.username ASC');
+        $this->assertEqual($userTable->getRelation('ParentUser')->getRelationDql(1), 'FROM OrderByTest_User WHERE OrderByTest_User.id IN (?) ORDER BY OrderByTest_User.id ASC');
+        $this->assertEqual($userTable->getRelation('ChildrenUsers')->getRelationDql(1), 'FROM OrderByTest_User WHERE OrderByTest_User.parent_user_id IN (?) ORDER BY OrderByTest_User.username ASC');
+
+        $user = new OrderByTest_User();
+        $user->username = 'jwage';
+        $user->password = 'changeme';
+
+        $user2 = new OrderByTest_User();
+        $user2->username = 'parent';
+        $user2->password = 'changeme';
+        $user->ParentUser = $user2;
+        $user->save();
+
+        $articles = $user->Articles;
+        $this->assertEqual($this->profiler->pop()->getQuery(), 'SELECT o.id AS o__id, o.title AS o__title, o.content AS o__content, o.user_id AS o__user_id FROM order_by_test__article o WHERE (o.user_id IN (?)) ORDER BY o.title ASC');
+
+        $groups = $user->Groups;
+        $this->assertEqual($this->profiler->pop()->getQuery(), 'SELECT o.id AS o__id, o.name AS o__name, o2.user_id AS o2__user_id, o2.group_id AS o2__group_id FROM order_by_test__group o LEFT JOIN order_by_test__user_group o2 ON o.id = o2.group_id WHERE (o2.user_id IN (?)) ORDER BY o.name ASC');
+
+        $friends = $user->Friends;
+        $this->assertEqual($this->profiler->pop()->getQuery(), 'SELECT order_by_test__user.id AS order_by_test__user__id, order_by_test__user.login AS order_by_test__user__login, order_by_test__user.password AS order_by_test__user__password, order_by_test__user.parent_user_id AS order_by_test__user__parent_user_id, order_by_test__friend.user_id1 AS order_by_test__friend__user_id1, order_by_test__friend.user_id2 AS order_by_test__friend__user_id2 FROM order_by_test__user INNER JOIN order_by_test__friend ON order_by_test__user.id = order_by_test__friend.user_id2 OR order_by_test__user.id = order_by_test__friend.user_id1 WHERE order_by_test__user.id IN (SELECT user_id2 FROM order_by_test__friend WHERE user_id1 = ?) OR order_by_test__user.id IN (SELECT user_id1 FROM order_by_test__friend WHERE user_id2 = ?) ORDER BY order_by_test__user.login ASC');
+
+        $childrenUsers = $user->ChildrenUsers;
+        $this->assertEqual($this->profiler->pop()->getQuery(), 'SELECT o.id AS o__id, o.login AS o__login, o.password AS o__password, o.parent_user_id AS o__parent_user_id FROM order_by_test__user o WHERE (o.parent_user_id IN (?)) ORDER BY o.login ASC');
+
+        $parentUser = $user->ParentUser;
+        $this->assertEqual($this->profiler->pop()->getQuery(), 'SELECT o.id AS o__id, o.login AS o__login, o.password AS o__password, o.parent_user_id AS o__parent_user_id FROM order_by_test__user o WHERE (o.parent_user_id IN (?)) ORDER BY o.login ASC');
+    }
+
+    public function testMasterOrderBy()
+    {
+        $q = Doctrine_Core::getTable('OrderByTest_Category')
+            ->createQuery('c')
+            ->select('c.id, p.id')
+            ->leftJoin('c.Posts p');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT o.id AS o__id, o2.id AS o2__id FROM order_by_test__category o LEFT JOIN order_by_test__blog_post o2 ON o.id = o2.category_id ORDER BY o.name ASC, o2.title ASC, o2.is_first DESC');
+
+        $category = new OrderByTest_Category();
+        $category->name = 'php';
+        $category->save();
+
+        $posts = $category->Posts;
+
+        $this->assertEqual($this->profiler->pop()->getQuery(), 'SELECT o.id AS o__id, o.title AS o__title, o.is_first AS o__is_first, o.category_id AS o__category_id FROM order_by_test__blog_post o WHERE (o.category_id IN (?)) ORDER BY o.title ASC, o.is_first DESC');
+    }
+
+    public function testOrderByFromQueryComesFirst()
+    {
+        $q = Doctrine_Core::getTable('OrderByTest_Category')
+            ->createQuery('c')
+            ->select('c.id, p.id')
+            ->leftJoin('c.Posts p')
+            ->orderBy('p.title ASC');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT o.id AS o__id, o2.id AS o2__id FROM order_by_test__category o LEFT JOIN order_by_test__blog_post o2 ON o.id = o2.category_id ORDER BY o2.title ASC, o.name ASC, o2.is_first DESC');
+    }
+
+    public function testWeirdSort()
+    {
+        $q = Doctrine_Core::getTable('OrderByTest_WeirdSort')
+            ->createQuery('w')
+            ->select('w.id');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT o.id AS o__id FROM order_by_test__weird_sort o ORDER BY RAND()');
+    }
+}
+
+class OrderByTest_Article extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('title', 'string', 255);
+        $this->hasColumn('content', 'clob');
+        $this->hasColumn('user_id', 'integer');
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('OrderByTest_User as User', array(
+             'local' => 'user_id',
+             'foreign' => 'id'));
+    }
+}
+
+class OrderByTest_Friend extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('user_id1', 'integer', null, array(
+             'primary' => true,
+             ));
+        $this->hasColumn('user_id2', 'integer', null, array(
+             'primary' => true,
+             ));
+    }
+}
+
+class OrderByTest_Group extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255, array(
+             'type' => 'string',
+             'length' => '255',
+             ));
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('OrderByTest_User as User', array(
+             'refClass' => 'OrderByTest_UserGroup',
+             'local' => 'group_id',
+             'foreign' => 'user_id'));
+    }
+}
+
+class OrderByTest_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('login AS username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+        $this->hasColumn('parent_user_id', 'integer');
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('OrderByTest_Article as Articles', array(
+             'local' => 'id',
+             'foreign' => 'user_id',
+             'orderBy' => 'title ASC'));
+
+        $this->hasMany('OrderByTest_Group as Groups', array(
+             'refClass' => 'OrderByTest_UserGroup',
+             'local' => 'user_id',
+             'foreign' => 'group_id',
+             'orderBy' => 'name ASC'));
+
+        $this->hasMany('OrderByTest_User as Friends', array(
+             'refClass' => 'OrderByTest_Friend',
+             'local' => 'user_id1',
+             'foreign' => 'user_id2',
+             'equal' => true,
+             'orderBy' => 'username ASC'));
+
+        $this->hasOne('OrderByTest_User as ParentUser', array(
+            'local' => 'parent_user_id',
+            'foreign' => 'id',
+            'orderBy' => 'id ASC'));
+
+        $this->hasMany('OrderByTest_User as ChildrenUsers', array(
+            'local' => 'id',
+            'foreign' => 'parent_user_id',
+            'orderBy' => 'username ASC'));
+    }
+}
+
+class OrderByTest_UserGroup extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('user_id', 'integer', null, array(
+             'primary' => true,
+             ));
+        $this->hasColumn('group_id', 'integer', null, array(
+             'primary' => true,
+             ));
+    }
+}
+
+
+class OrderByTest_Category extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->option('orderBy', 'name ASC');
+
+        $this->hasColumn('name', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('OrderByTest_BlogPost as Posts', array(
+            'local' => 'id',
+            'foreign' => 'category_id'
+        ));
+    }
+}
+
+class OrderByTest_BlogPost extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->option('orderBy', 'title ASC, is_first DESC');
+
+        $this->hasColumn('title', 'string', 255);
+        $this->hasColumn('is_first', 'boolean');
+        $this->hasColumn('category_id', 'integer');
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('OrderByTest_Category', array(
+            'local' => 'category_id',
+            'foreign' => 'id'
+        ));
+    }
+}
+
+class OrderByTest_WeirdSort extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->option('orderBy', 'RAND()');
+
+        $this->hasColumn('title', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/ParserTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/ParserTestCase.php
new file mode 100644
index 000000000..9181843ec
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Relation/ParserTestCase.php
@@ -0,0 +1,200 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Relation_Parser_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Relation_Parser_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testPendingRelations()
+    {
+        $r = new Doctrine_Relation_Parser($this->conn->getTable('User'));
+        
+        $p = array('type' => Doctrine_Relation::ONE, 
+                   'local' => 'email_id');
+
+        $r->bind('Email', $p);
+
+        $this->assertEqual($r->getPendingRelation('Email'), array('type' => Doctrine_Relation::ONE, 
+                                                                  'local' => 'email_id',
+                                                                  'class' => 'Email',
+                                                                  'alias' => 'Email'
+                                                                  ));
+    }
+    public function testBindThrowsExceptionIfTypeNotSet()
+    {
+        $r = new Doctrine_Relation_Parser($this->conn->getTable('User'));
+
+        $p = array('local' => 'email_id');
+        try {
+            $r->bind('Email', $p);
+            $this->fail('should throw exception');
+        } catch(Doctrine_Relation_Exception $e) {
+            $this->pass();
+        }
+    }
+    public function testRelationParserSupportsLocalColumnGuessing()
+    {
+        $r = new Doctrine_Relation_Parser($this->conn->getTable('User'));
+
+        $d = $r->completeDefinition(array('class'   => 'Phonenumber',
+                                          'type'    => Doctrine_Relation::MANY,
+                                          'foreign' => 'entity_id'));
+
+        $this->assertEqual($d['local'], 'id');
+    }
+    public function testRelationParserSupportsLocalColumnGuessing2()
+    {
+        $r = new Doctrine_Relation_Parser($this->conn->getTable('User'));
+
+        $d = $r->completeDefinition(array('class'   => 'Email',
+                                          'type'    => Doctrine_Relation::ONE,
+                                          'foreign' => 'id'));
+
+        $this->assertEqual($d['local'], 'email_id');
+    }
+    public function testRelationParserSupportsForeignColumnGuessing()
+    {
+        $r = new Doctrine_Relation_Parser($this->conn->getTable('User'));
+
+        $d = $r->completeDefinition(array('class' => 'Phonenumber',
+                                          'type'  => Doctrine_Relation::MANY,
+                                          'local' => 'id'));
+
+        $this->assertEqual($d['foreign'], 'entity_id');
+    }
+    public function testRelationParserSupportsForeignColumnGuessing2()
+    {
+        $r = new Doctrine_Relation_Parser($this->conn->getTable('User'));
+
+        $d = $r->completeDefinition(array('class' => 'Email',
+                                          'type'  => Doctrine_Relation::ONE,
+                                          'local' => 'email_id'));
+
+        $this->assertEqual($d['foreign'], 'id');
+    }
+    public function testRelationParserSupportsGuessingOfBothColumns()
+    {
+        $r = new Doctrine_Relation_Parser($this->conn->getTable('User'));
+
+        $d = $r->completeDefinition(array('class' => 'Email',
+                                          'type'  => Doctrine_Relation::ONE));
+
+        $this->assertEqual($d['foreign'], 'id');
+        $this->assertEqual($d['local'], 'email_id');
+    }
+
+    public function testRelationParserSupportsGuessingOfBothColumns2()
+    {
+        $r = new Doctrine_Relation_Parser($this->conn->getTable('User'));
+
+        $d = $r->completeDefinition(array('class' => 'Phonenumber',
+                                          'type'  => Doctrine_Relation::MANY));
+
+        $this->assertEqual($d['foreign'], 'entity_id');
+        $this->assertEqual($d['local'], 'id');
+    }
+    public function testRelationParserSupportsForeignColumnGuessingForAssociations()
+    {
+        $r = new Doctrine_Relation_Parser($this->conn->getTable('User'));
+
+        $d = $r->completeAssocDefinition(array('class'    => 'Group',
+                                               'type'     => Doctrine_Relation::MANY,
+                                               'local'    => 'user_id',
+                                               'refClass' => 'GroupUser'));
+
+        $this->assertEqual($d['foreign'], 'group_id');
+    }
+    public function testRelationParserSupportsLocalColumnGuessingForAssociations()
+    {
+        $r = new Doctrine_Relation_Parser($this->conn->getTable('User'));
+
+        $d = $r->completeAssocDefinition(array('class'    => 'Group',
+                                               'type'     => Doctrine_Relation::MANY,
+                                               'foreign'  => 'group_id',
+                                               'refClass' => 'GroupUser'));
+
+        $this->assertEqual($d['local'], 'user_id');
+    }
+    public function testGetRelationReturnsForeignKeyObjectForOneToOneRelation()
+    {
+        $r = new Doctrine_Relation_Parser($this->conn->getTable('User'));
+        $p = array('type' => Doctrine_Relation::ONE, 
+                   'local' => 'email_id');
+
+        $r->bind('Email', $p);
+
+        $rel = $r->getRelation('Email');
+        
+        $this->assertTrue($rel instanceof Doctrine_Relation_LocalKey);
+    }
+    public function testGetRelationReturnsForeignKeyObjectForOneToManyRelation()
+    {
+        $r = new Doctrine_Relation_Parser($this->conn->getTable('User'));
+        $p = array('type' => Doctrine_Relation::MANY);
+
+        $r->bind('Phonenumber', $p);
+
+        $rel = $r->getRelation('Phonenumber');
+
+        $this->assertTrue($rel instanceof Doctrine_Relation_ForeignKey);
+    }
+    public function testGetRelationReturnsForeignKeyObjectForManytToManyRelation()
+    {
+        $r = new Doctrine_Relation_Parser($this->conn->getTable('User'));
+        $p = array('type' => Doctrine_Relation::MANY,
+                   'refClass' => 'GroupUser');
+
+        $r->bind('Group', $p);
+
+        $rel = $r->getRelation('Group');
+        
+        $this->assertTrue($rel instanceof Doctrine_Relation_Association);
+        $rel = $r->getRelation('GroupUser');
+        $this->assertTrue($rel instanceof Doctrine_Relation_ForeignKey);
+    }
+    public function testGetRelationReturnsForeignKeyObjectForNestRelation()
+    {
+        $r = new Doctrine_Relation_Parser($this->conn->getTable('Entity'));
+        $p = array('type' => Doctrine_Relation::MANY,
+                   'refClass' => 'EntityReference',
+                   'local' => 'entity1',
+                   'foreign' => 'entity2');
+
+        $r->bind('Entity', $p);
+
+        $rel = $r->getRelation('Entity');
+        $this->assertTrue($rel instanceof Doctrine_Relation_Nest);
+
+        $rel = $r->getRelation('EntityReference');
+        $this->assertTrue($rel instanceof Doctrine_Relation_ForeignKey);
+    }
+    
+    // TODO: BETTER ASSOCIATION TABLE GUESSING
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/RelationTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/RelationTestCase.php
new file mode 100644
index 000000000..f7d2e1b59
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/RelationTestCase.php
@@ -0,0 +1,166 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Relation_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Relation_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData() 
+    { }
+    public function prepareTables() 
+    {
+        $this->tables = array('RelationTest', 'RelationTestChild', 'Group', 'Groupuser', 'User', 'Email', 'Account', 'Phonenumber');
+        
+        parent::prepareTables();
+    }
+
+    public function testInitData() 
+    {
+        $user = new User();
+        
+        $user->name = 'zYne';
+        $user->Group[0]->name = 'Some Group';
+        $user->Group[1]->name = 'Other Group';
+        $user->Group[2]->name = 'Third Group';
+        
+        $user->Phonenumber[0]->phonenumber = '123 123';
+        $user->Phonenumber[1]->phonenumber = '234 234';
+        $user->Phonenumber[2]->phonenumber = '456 456';
+        
+        $user->Email->address = 'someone@some.where';
+
+        $user->save();
+    }
+    
+    public function testUnlinkSupportsManyToManyRelations()
+    {
+        $users = Doctrine_Query::create()->from('User u')->where('u.name = ?', array('zYne'))->execute();
+        
+        $user = $users[0];
+        
+        $this->assertEqual($user->Group->count(), 3);
+        
+        $user->unlink('Group', array(2, 3, 4), true);
+        
+        $this->assertEqual($user->Group->count(), 0);
+        
+        $this->conn->clear();
+        
+        $groups = Doctrine_Query::create()->from('Group g')->execute();
+
+        $this->assertEqual($groups->count(), 3);
+
+        $links = Doctrine_Query::create()->from('GroupUser gu')->execute();
+
+        $this->assertEqual($links->count(), 0);
+    }
+
+    public function testUnlinkSupportsOneToManyRelations()
+    {
+        $this->conn->clear();
+
+        $users = Doctrine_Query::create()->from('User u')->where('u.name = ?', array('zYne'))->execute();
+        
+        $user = $users[0];
+        
+        $this->assertEqual($user->Phonenumber->count(), 3);
+        
+        $user->unlink('Phonenumber', array(1, 2, 3), true);
+        
+        $this->assertEqual($user->Phonenumber->count(), 0);
+        
+        $this->conn->clear();
+        
+        $phonenumber = Doctrine_Query::create()->from('Phonenumber p')->execute();
+
+        $this->assertEqual($phonenumber->count(), 3);
+        $this->assertEqual($phonenumber[0]->entity_id, null);
+        $this->assertEqual($phonenumber[1]->entity_id, null);
+        $this->assertEqual($phonenumber[2]->entity_id, null);  
+    }
+
+    public function testOneToManyTreeRelationWithConcreteInheritance() {
+
+        $component = new RelationTestChild();
+
+        try {
+            $rel = $component->getTable()->getRelation('Children');
+
+            $this->pass();
+        } catch(Doctrine_Exception $e) {
+
+            $this->fail();
+        }
+        $this->assertTrue($rel instanceof Doctrine_Relation_ForeignKey);
+
+        $this->assertTrue($component->Children instanceof Doctrine_Collection);
+        $this->assertTrue($component->Children[0] instanceof RelationTestChild);
+    }
+
+    public function testOneToOneTreeRelationWithConcreteInheritance() {
+        $component = new RelationTestChild();
+        
+        try {
+            $rel = $component->getTable()->getRelation('Parent');
+            $this->pass();
+        } catch(Doctrine_Exception $e) {
+            $this->fail();
+        }
+        $this->assertTrue($rel instanceof Doctrine_Relation_LocalKey);
+    }
+    public function testManyToManyRelation() {
+        $user = new User();
+         
+        // test that join table relations can be initialized even before the association have been initialized
+        try {
+            $user->Groupuser;
+            $this->pass();
+        } catch(Doctrine_Exception $e) {
+            $this->fail();
+        }
+        //$this->assertTrue($user->getTable()->getRelation('Groupuser') instanceof Doctrine_Relation_ForeignKey);
+        $this->assertTrue($user->getTable()->getRelation('Group') instanceof Doctrine_Relation_Association);
+    }
+    public function testOneToOneLocalKeyRelation() {
+        $user = new User();
+        
+        $this->assertTrue($user->getTable()->getRelation('Email') instanceof Doctrine_Relation_LocalKey);
+    }
+    public function testOneToOneForeignKeyRelation() {
+        $user = new User();
+        
+        $this->assertTrue($user->getTable()->getRelation('Account') instanceof Doctrine_Relation_ForeignKey);
+    }
+    public function testOneToManyForeignKeyRelation() {
+        $user = new User();
+        
+        $this->assertTrue($user->getTable()->getRelation('Phonenumber') instanceof Doctrine_Relation_ForeignKey);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/RepositoryTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/RepositoryTestCase.php
new file mode 100644
index 000000000..50a873cfc
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/RepositoryTestCase.php
@@ -0,0 +1,5 @@
+<?php
+class Doctrine_RepositoryTestCase extends Doctrine_UnitTestCase {
+    public function testAdd() {
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Search/FileTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Search/FileTestCase.php
new file mode 100644
index 000000000..d592dbe7b
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Search/FileTestCase.php
@@ -0,0 +1,55 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Search_File_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Search_File_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData()
+    { }
+    public function prepareTables()
+    { }
+
+    public function testSearchFileAutoCreatesFileTable()
+    {
+        $this->_search = new Doctrine_Search_File();
+
+        $this->conn->export->exportClasses(array('FileIndex'));
+    }
+
+    public function testIndexDirectoryIndexesAllFiles()
+    {
+        $this->_search->indexDirectory(dirname(__FILE__) . DIRECTORY_SEPARATOR . '_files');
+
+        $resultSet = $this->_search->search('dbms');
+        
+        $this->assertEqual(count($resultSet), 1);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Search/IndexerTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Search/IndexerTestCase.php
new file mode 100644
index 000000000..f24cfbd04
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Search/IndexerTestCase.php
@@ -0,0 +1,68 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Search_Indexer_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Search_Indexer_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData()
+    { }
+    public function prepareTables()
+    {
+        $this->tables = array('Doctrine_File', 'Doctrine_File_Index');
+        
+        parent::prepareTables();
+    }
+
+    public function testIndexexCanRecursivelyIndexDirectories()
+    {
+        $profiler = new Doctrine_Connection_Profiler();
+        $this->conn->addListener($profiler);
+
+        $indexer = new Doctrine_Search_Indexer();
+
+        $indexer->indexDirectory(dirname(__FILE__) . DIRECTORY_SEPARATOR . '_files');
+    }
+    
+    public function testIndexerAddsFiles()
+    {
+        $files = Doctrine_Query::create()->from('Doctrine_File')->execute();
+
+        $this->assertEqual($files->count(), 2);
+    }
+
+    public function testSearchingFiles()
+    {
+        $files = Doctrine_Query::create()->select('DISTINCT i.file_id')->from('Doctrine_File_Index i')
+                 ->where('i.keyword = ?', array('database'))->execute(array(), Doctrine_Hydrate::HYDRATE_ARRAY);
+
+        $this->assertEqual(count($files), 11);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Search/QueryTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Search/QueryTestCase.php
new file mode 100644
index 000000000..cca457435
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Search/QueryTestCase.php
@@ -0,0 +1,328 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Search_Query_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Search_Query_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables = array('SearchTest', 'SearchTestIndex');
+
+        parent::prepareTables();
+    }
+    public function prepareData()
+    { }
+
+    public function testInitData()
+    {
+        $e = new SearchTest();
+
+        $e->title = 'Once there was an ORM framework';
+        $e->content = 'There are many ORM frameworks, but nevertheless we decided to create one.';
+
+        $e->save();
+
+        $e = new SearchTest();
+
+        $e->title = 'Doctrine development continues';
+        $e->content = 'The development has been going well so far.';
+
+        $e->save();
+    }
+
+    public function testParseClauseSupportsAndOperator()
+    {
+        $q = new Doctrine_Search_Query('SearchTestIndex');
+        $ret = $q->parseClause('doctrine AND orm');
+
+        $sql = 'id IN (SELECT id FROM search_test_index WHERE keyword = ?) '
+             . 'AND id IN (SELECT id FROM search_test_index WHERE keyword = ?)';
+
+        $this->assertEqual($ret, $sql);
+    }
+
+    public function testParseClauseSupportsMixingOfOperatorsAndParenthesis()
+    {
+        $q = new Doctrine_Search_Query('SearchTestIndex');
+        $ret = $q->parseClause('((doctrine OR orm) AND dbal) OR database');
+
+        $sql = '(id IN (SELECT id FROM search_test_index WHERE keyword = ? OR keyword = ?) AND id IN (SELECT id FROM search_test_index WHERE keyword = ?)) OR keyword = ?';
+
+        $this->assertEqual($ret, $sql);
+    }
+
+    public function testParseClauseSupportsMixingOfOperators3()
+    {
+        $q = new Doctrine_Search_Query('SearchTestIndex');
+        $ret = $q->parseClause('doctrine OR orm AND dbal');
+
+        $sql = 'keyword = ? OR id IN (SELECT id FROM search_test_index WHERE keyword = ?) AND id IN (SELECT id FROM search_test_index WHERE keyword = ?)';
+
+        $this->assertEqual($ret, $sql);
+    }
+
+    public function testParseClauseSupportsMixingOfOperators()
+    {
+        $q = new Doctrine_Search_Query('SearchTestIndex');
+        $ret = $q->parseClause('(doctrine OR orm) AND dbal');
+
+        $sql = 'id IN (SELECT id FROM search_test_index WHERE keyword = ? OR keyword = ?) AND id IN (SELECT id FROM search_test_index WHERE keyword = ?)';
+
+        $this->assertEqual($ret, $sql);
+    }
+
+    public function testParseClauseSupportsMixingOfOperators2()
+    {
+        $q = new Doctrine_Search_Query('SearchTestIndex');
+        $ret = $q->parseClause('(doctrine OR orm) dbal');
+
+        $sql = 'id IN (SELECT id FROM search_test_index WHERE keyword = ? OR keyword = ?) AND id IN (SELECT id FROM search_test_index WHERE keyword = ?)';
+
+        $this->assertEqual($ret, $sql);
+    }
+
+    public function testParseClauseSupportsMixingOfOperatorsAndDeeplyNestedParenthesis()
+    {
+        $q = new Doctrine_Search_Query('SearchTestIndex');
+        $ret = $q->parseClause('(((doctrine OR orm) AND dbal) OR database) AND rdbms');
+
+        $sql = '((id IN (SELECT id FROM search_test_index WHERE keyword = ? OR keyword = ?) AND id IN (SELECT id FROM search_test_index WHERE keyword = ?)) OR keyword = ?) AND id IN (SELECT id FROM search_test_index WHERE keyword = ?)';
+
+        $this->assertEqual($ret, $sql);
+    }
+
+    public function testParseClauseSupportsMixingOfOperatorsAndParenthesis2()
+    {
+        $q = new Doctrine_Search_Query('SearchTestIndex');
+        $ret = $q->parseClause('rdbms (dbal OR database)');
+
+        $sql = 'id IN (SELECT id FROM search_test_index WHERE keyword = ?) AND id IN (SELECT id FROM search_test_index WHERE keyword = ? OR keyword = ?)';
+
+        $this->assertEqual($ret, $sql);
+    }
+
+    public function testParseClauseSupportsMixingOfOperatorsAndDeeplyNestedParenthesis2()
+    {
+        $q = new Doctrine_Search_Query('SearchTestIndex');
+        $ret = $q->parseClause('rdbms (((doctrine OR orm) AND dbal) OR database)');
+
+        $sql = 'id IN (SELECT id FROM search_test_index WHERE keyword = ?) AND ((id IN (SELECT id FROM search_test_index WHERE keyword = ? OR keyword = ?) AND id IN (SELECT id FROM search_test_index WHERE keyword = ?)) OR keyword = ?)';
+
+        $this->assertEqual($ret, $sql);
+    }
+
+    public function testParseClauseSupportsNegationOperator()
+    {
+        $q = new Doctrine_Search_Query('SearchTestIndex');
+        $ret = $q->parseClause('rdbms -doctrine');
+
+        $sql = 'id IN (SELECT id FROM search_test_index WHERE keyword = ?) AND '
+             . 'id NOT IN (SELECT id FROM search_test_index WHERE keyword = ?)';
+
+        $this->assertEqual($ret, $sql);
+    }
+
+    public function testParseClauseOrOperator2()
+    {
+        $q = new Doctrine_Search_Query('SearchTestIndex');
+        $ret = $q->parseClause('rdbms doctrine OR database');
+
+        $sql = 'id IN (SELECT id FROM search_test_index WHERE keyword = ?) AND '
+             . 'id IN (SELECT id FROM search_test_index WHERE keyword = ?) '
+             . 'OR keyword = ?';
+
+        $this->assertEqual($ret, $sql);
+    }
+
+    public function testParseClauseSupportsNegationOperatorWithOrOperator()
+    {
+        $q = new Doctrine_Search_Query('SearchTestIndex');
+        $ret = $q->parseClause('rdbms -doctrine OR database');
+
+        $sql = 'id IN (SELECT id FROM search_test_index WHERE keyword = ?) AND '
+             . 'id NOT IN (SELECT id FROM search_test_index WHERE keyword = ?) '
+             . 'OR keyword = ?';
+
+        $this->assertEqual($ret, $sql);
+    }
+
+    public function testSearchSupportsAndOperator()
+    {
+        $q = new Doctrine_Search_Query('SearchTestIndex');
+        $q->query('doctrine AND orm');
+
+        $sql = 'SELECT COUNT(keyword) AS relevance, id '
+             . 'FROM search_test_index '
+             . 'WHERE id IN (SELECT id FROM search_test_index WHERE keyword = ?) '
+             . 'AND id IN (SELECT id FROM search_test_index WHERE keyword = ?) '
+             . 'GROUP BY id ORDER BY relevance DESC';
+
+        $this->assertEqual($q->getSqlQuery(), $sql);
+    }
+
+
+    public function testSearchSupportsOrOperator()
+    {
+        $q = new Doctrine_Search_Query('SearchTestIndex');
+        $q->query('doctrine OR orm');
+
+        $sql = 'SELECT COUNT(keyword) AS relevance, id '
+             . 'FROM search_test_index '
+             . 'WHERE keyword = ? OR keyword = ? '
+             . 'GROUP BY id ORDER BY relevance DESC';
+
+        $this->assertEqual($q->getSqlQuery(), $sql);
+    }
+
+
+    public function testQuerySupportsSingleWordquery()
+    {
+        $q = new Doctrine_Search_Query('SearchTestIndex');
+        $q->query('doctrine');
+
+        $sql = 'SELECT COUNT(keyword) AS relevance, id '
+             . 'FROM search_test_index WHERE keyword = ? GROUP BY id ORDER BY relevance DESC';
+
+        $this->assertEqual($q->getParams(), array('doctrine'));
+        $this->assertEqual($q->getSqlQuery(), $sql);
+    }
+
+    public function testSearchSupportsMixingOfOperators()
+    {
+        $q = new Doctrine_Search_Query('SearchTestIndex');
+        $q->query('(doctrine OR orm) AND dbal');
+
+        $sql = 'SELECT COUNT(keyword) AS relevance, id '
+             . 'FROM search_test_index '
+             . 'WHERE id IN (SELECT id FROM search_test_index WHERE keyword = ? OR keyword = ?) '
+             . 'AND id IN (SELECT id FROM search_test_index WHERE keyword = ?) '
+             . 'GROUP BY id ORDER BY relevance DESC';
+
+        $this->assertEqual($q->getParams(), array('doctrine', 'orm', 'dbal'));
+        $this->assertEqual($q->getSqlQuery(), $sql);
+    }
+
+    public function testSearchSupportsSingleTermWithQuotes()
+    {
+        $q = new Doctrine_Search_Query('SearchTestIndex');
+        $q->query("'doctrine orm'");
+
+        $sql = 'SELECT COUNT(keyword) AS relevance, id '
+             . 'FROM search_test_index WHERE keyword = ? '
+             . 'AND (position + 1) IN (SELECT position FROM search_test_index WHERE keyword = ?) '
+             . 'GROUP BY id ORDER BY relevance DESC';
+
+        $this->assertEqual($q->getParams(), array('doctrine', 'orm'));
+        $this->assertEqual($q->getSqlQuery(), $sql);
+    }
+
+    public function testSearchSupportsSingleLongTermWithQuotes()
+    {
+        $q = new Doctrine_Search_Query('SearchTestIndex');
+        $q->query("'doctrine orm dbal'");
+
+        $sql = 'SELECT COUNT(keyword) AS relevance, id '
+             . 'FROM search_test_index WHERE keyword = ? '
+             . 'AND (position + 1) IN (SELECT position FROM search_test_index WHERE keyword = ?) '
+             . 'AND (position + 2) IN (SELECT position FROM search_test_index WHERE keyword = ?) '
+             . 'GROUP BY id ORDER BY relevance DESC';
+
+        $this->assertEqual($q->getParams(), array('doctrine', 'orm', 'dbal'));
+        $this->assertEqual($q->getSqlQuery(), $sql);
+    }
+
+    public function testQuerySupportsMultiWordquery()
+    {
+        $q = new Doctrine_Search_Query('SearchTestIndex');
+        $q->query('doctrine orm');
+
+        $sql = 'SELECT COUNT(keyword) AS relevance, id '
+             . 'FROM search_test_index '
+             . 'WHERE id IN (SELECT id FROM search_test_index WHERE keyword = ?) '
+             . 'AND id IN (SELECT id FROM search_test_index WHERE keyword = ?) '
+             . 'GROUP BY id ORDER BY relevance DESC';
+
+        $this->assertEqual($q->getSqlQuery(), $sql);
+    }
+
+    public function testQuerySupportsMultiWordSearchAndSingleLetterWildcards()
+    {
+        $q = new Doctrine_Search_Query('SearchTestIndex');
+        $q->query('doct?ine orm');
+
+        $sql = 'SELECT COUNT(keyword) AS relevance, id '
+             . 'FROM search_test_index '
+             . 'WHERE id IN (SELECT id FROM search_test_index WHERE keyword LIKE ?) '
+             . 'AND id IN (SELECT id FROM search_test_index WHERE keyword = ?) '
+             . 'GROUP BY id ORDER BY relevance DESC';
+
+        $this->assertEqual($q->getParams(), array('doct?ine', 'orm'));
+        $this->assertEqual($q->getSqlQuery(), $sql);
+    }
+    public function testQuerySupportsMultiWordSearchAndMultiLetterWildcards()
+    {
+        $q = new Doctrine_Search_Query('SearchTestIndex');
+        $q->query('doc* orm');
+
+        $sql = 'SELECT COUNT(keyword) AS relevance, id '
+             . 'FROM search_test_index '
+             . 'WHERE id IN (SELECT id FROM search_test_index WHERE keyword LIKE ?) '
+             . 'AND id IN (SELECT id FROM search_test_index WHERE keyword = ?) '
+             . 'GROUP BY id ORDER BY relevance DESC';
+
+        $this->assertEqual($q->getParams(), array('doc%', 'orm'));
+        $this->assertEqual($q->getSqlQuery(), $sql);
+    }
+    public function testSearchSupportsMultipleTermsWithQuotes()
+    {
+        $q = new Doctrine_Search_Query('SearchTestIndex');
+        $q->query("doctrine 'orm database'");
+
+        $sql = 'SELECT COUNT(keyword) AS relevance, id '
+             . 'FROM search_test_index '
+             . 'WHERE id IN (SELECT id FROM search_test_index WHERE keyword = ?) '
+             . 'AND id IN (SELECT id FROM search_test_index WHERE keyword = ? '
+             . 'AND (position + 1) IN (SELECT position FROM search_test_index WHERE keyword = ?)) '
+             . 'GROUP BY id ORDER BY relevance DESC';
+
+        $this->assertEqual($q->getParams(), array('doctrine', 'orm', 'database'));
+        $this->assertEqual($q->getSqlQuery(), $sql);
+    }
+
+    public function testSearchReturnsFalseForEmptyStrings()
+    {
+        $q = new Doctrine_Search_Query('SearchTestIndex');
+        $result = $q->query(' ');
+
+        $this->assertFalse($result);
+    }
+
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Search/QueryWeightTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Search/QueryWeightTestCase.php
new file mode 100644
index 000000000..de164b382
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Search/QueryWeightTestCase.php
@@ -0,0 +1,129 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Search_QueryWeight_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Search_QueryWeight_TestCase extends Doctrine_UnitTestCase
+{
+    public function testQuerySupportsMultiWordOrOperatorSearchWithQuotes()
+    {
+        $q = new Doctrine_Search_Query('SearchTestIndex');
+        $q->search("doctrine^2 OR 'dbal database'");
+
+        $sql = 'SELECT foreign_id, SUM(relevancy) AS relevancy_sum ' 
+             . 'FROM (SELECT COUNT(keyword) * 2 AS relevancy, foreign_id '
+             . 'FROM search_index '
+             . 'WHERE keyword = ? '
+             . 'GROUP BY foreign_id '
+             . 'UNION '
+             . 'SELECT COUNT(keyword) AS relevancy, foreign_id '
+             . 'FROM search_index) AS query_alias '
+             . 'WHERE keyword = ? AND (position + 1) = (SELECT position FROM search_index WHERE keyword = ?) '
+             . 'GROUP BY foreign_id) '
+             . 'GROUP BY foreign_id '
+             . 'ORDER BY relevancy_sum';
+
+        $this->assertEqual($q->getSqlQuery(), $sql);
+    }
+    
+    public function testSearchSupportsMixingOfOperatorsParenthesisAndWeights()
+    {
+        $q = new Doctrine_Search_Query('SearchTestIndex');
+        $q->search('(doctrine^2 OR orm) AND dbal');
+
+        $sql = "SELECT foreign_id, SUM(relevancy) AS relevancy_sum FROM
+                        (SELECT COUNT(keyword) * 2 AS relevancy, foreign_id
+                            FROM search_index
+                            WHERE keyword = 'doctrine'
+                            GROUP BY foreign_id
+                    UNION
+                        SELECT COUNT(keyword) * 2 AS relevancy, foreign_id
+                            FROM search_index
+                            WHERE keyword = 'orm'
+                            GROUP BY foreign_id
+                    INTERSECT
+                         SELECT COUNT(keyword) AS relevancy, foreign_id
+                            FROM search_index) AS query_alias
+                            WHERE keyword = 'dbal'
+                            GROUP BY foreign_id)
+                GROUP BY foreign_id
+                ORDER BY relevancy_sum";
+
+        $this->assertEqual($q->getSqlQuery(), $sql);
+    }
+
+    public function testQuerySupportsMultiWordAndOperatorSearchWithQuotesAndWeights()
+    {
+        $q = new Doctrine_Search_Query('SearchTestIndex');
+        $q->search("doctrine^2 'dbal database'");
+
+        $sql = "SELECT foreign_id, SUM(relevancy) AS relevancy_sum FROM
+                        (SELECT COUNT(keyword) * 2 AS relevancy, foreign_id
+                            FROM search_index
+                            WHERE keyword = 'doctrine'
+                            GROUP BY foreign_id
+                    INTERSECT
+                         SELECT COUNT(keyword) AS relevancy, foreign_id
+                            FROM search_index) AS query_alias
+                            WHERE keyword = 'dbal' AND (position + 1) = (SELECT position FROM search_index WHERE keyword = 'database')
+                            GROUP BY foreign_id)
+                GROUP BY foreign_id
+                ORDER BY relevancy_sum";
+
+        $this->assertEqual($q->getSqlQuery(), $sql);
+    }
+
+    public function testQuerySupportsMultiWordNegationOperatorSearchWithQuotesWeights()
+    {
+        $q = new Doctrine_Search_Query('SearchTestIndex');
+        $q->search("doctrine^2 'dbal database' -rdbms");
+
+        $sql = "SELECT foreign_id, SUM(relevancy) AS relevancy_sum FROM
+                        (SELECT COUNT(keyword) * 2 AS relevancy, foreign_id
+                            FROM search_index
+                            WHERE keyword = 'doctrine'
+                            GROUP BY foreign_id
+                    INTERSECT
+                         SELECT COUNT(keyword) AS relevancy, foreign_id
+                            FROM search_index) AS query_alias
+                            WHERE keyword = 'dbal' AND (position + 1) = (SELECT position FROM search_index WHERE keyword = 'database')
+                            GROUP BY foreign_id
+                    EXCEPT
+                         SELECT COUNT(keyword) AS relevancy, foreign_id
+                            FROM search_index) AS query_alias
+                            WHERE keyword != 'rdbms'
+                            GROUP BY foreign_id                            
+                            )
+                GROUP BY foreign_id
+                ORDER BY relevancy_sum";
+                
+        $this->assertEqual($q->getSqlQuery(), $sql);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Search/_files/content.html b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Search/_files/content.html
new file mode 100644
index 000000000..0c2f493d3
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Search/_files/content.html
@@ -0,0 +1,7 @@
+Database transaction
+From <b>Wikipedia<b>, the free encyclopedia
+Jump to: navigation, search
+A database transaction is a unit of interaction with a database management system or similar system that is treated in a coherent and reliable way independent of other transactions that must be either entirely completed or aborted. Ideally, a database system will guarantee the properties of Atomicity, Consistency, Isolation and Durability (ACID) for each transaction. In practice, these properties are often relaxed somewhat to provide better performance.
+
+In some systems, transactions are also called <i>LUWs</i> for Logical Units of Work.
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Search/_files/content.txt b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Search/_files/content.txt
new file mode 100644
index 000000000..93fbe8495
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Search/_files/content.txt
@@ -0,0 +1,12 @@
+This file contains only contains some plain text copied from wikipedia.
+
+In database products the ability to handle transactions allows the user to ensure that integrity of a database is maintained.
+
+A single transaction might require several queries, each reading and/or writing information in the database. When this happens it is usually important to be sure that the database is not left with only some of the queries carried out. For example, when doing a money transfer, if the money was debited from one account, it is important that it also be credited to the depositing account. Also, transactions should not interfere with each other. For more information about desirable transaction properties, see ACID.
+
+A simple transaction is usually issued to the database system in a language like SQL in this form:
+
+Begin the transaction 
+Execute several queries (although any updates to the database aren't actually visible to the outside world yet) 
+Commit the transaction (updates become visible if the transaction is successful) 
+If one of the queries fails the database system may rollback either the entire transaction or just the failed query. This behaviour is dependent on the DBMS in use and how it is set up. The transaction can also be rolled back manually at any time before the commit.
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/SearchTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/SearchTestCase.php
new file mode 100644
index 000000000..c73245565
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/SearchTestCase.php
@@ -0,0 +1,239 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * 'AS IS' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Search_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Search_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables = array('SearchTest');
+        
+        parent::prepareTables();
+    }
+    public function prepareData()
+    { }
+
+    public function testBuildingOfSearchRecordDefinition()
+    {
+        $e = new SearchTest();
+        
+        $this->assertTrue($e->SearchTestIndex instanceof Doctrine_Collection);
+        
+        $rel = $e->getTable()->getRelation('SearchTestIndex');
+
+        $this->assertIdentical($rel->getLocal(), 'id');
+        $this->assertIdentical($rel->getForeign(), 'id');
+    }
+    public function testSavingEntriesUpdatesIndex()
+    {
+        $e = new SearchTest();
+
+        $e->title = 'Once there was an ORM framework';
+        $e->content = 'There are many ORM frameworks, but nevertheless we decided to create one.';
+
+        $e->save();
+
+        $e = new SearchTest();
+
+        $e->title = '007';
+        $e->content = 'Awesome movie series';
+
+        $e->save();
+    }
+
+    public function testSearchFromTableObject()
+    {
+        $results = Doctrine_Core::getTable('SearchTest')->search('orm');
+        $this->assertEqual($results[0]['id'], 1);
+        $query = Doctrine_Query::create()
+            ->from('SearchTest s');
+        $query = Doctrine_Core::getTable('SearchTest')->search('orm', $query);
+        $this->assertEqual($query->getSqlQuery(), 'SELECT s.id AS s__id, s.title AS s__title, s.content AS s__content FROM search_test s WHERE (s.id IN (SELECT id FROM search_test_index WHERE keyword = ? GROUP BY id))');
+        $results = $query->fetchArray();
+        $this->assertEqual($results[0]['id'], 1);
+    }
+
+    public function testQuerying()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('t.title')
+          ->from('SearchTest t')
+          ->innerJoin('t.SearchTestIndex i')
+          ->where('i.keyword = ?');
+
+        $array = $q->execute(array('orm'), Doctrine_Core::HYDRATE_ARRAY);
+
+        $this->assertEqual($array[0]['title'], 'Once there was an ORM framework');
+
+        $q = new Doctrine_Query();
+
+        $q->select('t.title')
+          ->from('SearchTest t')
+          ->innerJoin('t.SearchTestIndex i')
+          ->where('i.keyword = ?');
+
+        $array = $q->execute(array('007'), Doctrine_Core::HYDRATE_ARRAY);
+
+        $this->assertEqual($array[0]['title'], '007');
+    }
+    
+    public function testUsingWordRange()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('t.title, i.*')
+          ->from('SearchTest t')
+          ->innerJoin('t.SearchTestIndex i')
+          ->where('i.keyword = ? OR i.keyword = ?');
+
+        $array = $q->execute(array('orm', 'framework'), Doctrine_Core::HYDRATE_ARRAY);
+
+        $this->assertEqual($array[0]['title'], 'Once there was an ORM framework');
+    }
+
+    public function testQueryingReturnsEmptyArrayForStopKeyword()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('t.title')
+          ->from('SearchTest t')
+          ->innerJoin('t.SearchTestIndex i')
+          ->where('i.keyword = ?');
+
+        $array = $q->execute(array('was'), Doctrine_Core::HYDRATE_ARRAY);
+
+        $this->assertEqual(count($array), 0);
+    }
+
+    public function testQueryingReturnsEmptyArrayForUnknownKeyword()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select('t.title')
+          ->from('SearchTest t')
+          ->innerJoin('t.SearchTestIndex i')
+          ->where('i.keyword = ?');
+
+        $array = $q->execute(array('someunknownword'), Doctrine_Core::HYDRATE_ARRAY);
+
+        $this->assertEqual(count($array), 0);
+    }
+
+    public function testUpdateIndexInsertsNullValuesForBatchUpdatedEntries()
+    {
+        $e = new SearchTest();
+        $tpl = $e->getTable()->getTemplate('Doctrine_Template_Searchable');
+        $tpl->getPlugin()->setOption('batchUpdates', true);
+
+        $e->title = 'Some searchable title';
+        $e->content = 'Some searchable content';
+
+        $e->save();
+        
+        $coll = Doctrine_Query::create()
+                ->from('SearchTestIndex s')
+                ->orderby('s.id DESC')
+                ->limit(1)
+                ->setHydrationMode(Doctrine_Core::HYDRATE_ARRAY)
+                ->fetchOne();
+
+        $this->assertEqual($coll['id'], 3);
+        $this->assertEqual($coll['keyword'], null);
+        $this->assertEqual($coll['field'], null);
+        $this->assertEqual($coll['position'], null);
+    }
+
+    public function testBatchUpdatesUpdateAllPendingEntries()
+    {
+        $e = new SearchTest();
+        $e->batchUpdateIndex();
+        
+        $coll = Doctrine_Query::create()
+                ->from('SearchTestIndex s')
+                ->setHydrationMode(Doctrine_Core::HYDRATE_ARRAY)
+                ->execute();
+
+        $coll = $this->conn->fetchAll('SELECT * FROM search_test_index');
+        
+
+    }
+
+    public function testThrowExceptionIfInvalidTable()
+    {
+       try {
+           $oQuery = new Doctrine_Search_Query(new Doctrine_Query());
+           $this->fail('Should throw exception');
+       } catch(Doctrine_Search_Exception $exception) {
+           $this->assertEqual($exception->getMessage(), 'Invalid argument type. Expected instance of Doctrine_Table.');
+       }
+    }
+
+    public function testGenerateSearchQueryForWeightedSearch()
+    {
+        $oQuery = new Doctrine_Search_Query('SearchTest');
+        $oQuery->query('^test');
+        $this->assertEqual($oQuery->getSqlQuery(), 'SELECT SUM(sub_relevance) AS relevance, id FROM search_test WHERE keyword = ? GROUP BY id ORDER BY relevance DESC');
+    }
+
+    public function testStandardAnalyzerCanHandleAccentedCharactersGracefullyWorks()
+    {
+        $analyzer = new Doctrine_Search_Analyzer_Standard();
+
+        $words = $analyzer->analyze('un éléphant ça trompe énormément', 'utf-8');
+        $this->assertEqual($words[1], 'elephant');
+        $this->assertEqual($words[2], 'ca');
+        $this->assertEqual($words[4], 'enormement');
+    }
+    
+    public function testUtf8AnalyzerWorks()
+    {
+        $analyzer = new Doctrine_Search_Analyzer_Utf8(array('encoding' => 'utf-8'));
+
+        $words = $analyzer->analyze('un Éléphant ça trompe énormément');
+        $this->assertEqual($words[1], 'éléphant');
+        $this->assertEqual($words[2], 'ça');
+        $this->assertEqual($words[4], 'énormément');
+    }
+ 
+    public function testUtf8AnalyzerKnowsToHandleOtherEncodingsWorks()
+    {
+        $analyzer = new Doctrine_Search_Analyzer_Utf8();
+
+        // convert our test string to iso8859-15
+        $iso = iconv('UTF-8','ISO8859-15', 'un éléphant ça trompe énormément');
+
+        $words = $analyzer->analyze($iso, 'ISO8859-15');
+        $this->assertEqual($words[1], 'éléphant');
+        $this->assertEqual($words[2], 'ça');
+        $this->assertEqual($words[4], 'énormément');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Sequence/MssqlTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Sequence/MssqlTestCase.php
new file mode 100644
index 000000000..a86abfaa6
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Sequence/MssqlTestCase.php
@@ -0,0 +1,63 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Sequence_Mssql_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Sequence_Mssql_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testCurrIdExecutesSql()
+    {
+        $id = $this->sequence->currId('user');
+
+        $this->assertEqual($this->adapter->pop(), 'DELETE FROM user_seq WHERE id < 0');
+
+        $this->assertEqual($this->adapter->pop(), 'SELECT @@IDENTITY');  
+        $this->assertEqual($this->adapter->pop(), 'SELECT @@VERSION');
+        $this->assertEqual($this->adapter->pop(), 'SET IDENTITY_INSERT user_seq OFF INSERT INTO user_seq DEFAULT VALUES');
+        $this->assertEqual($this->adapter->pop(), 'SELECT COUNT(1) FROM user_seq');
+    }
+    public function testNextIdExecutesSql()
+    {
+        $id = $this->sequence->nextId('user');
+
+        $this->assertEqual($this->adapter->pop(), 'DELETE FROM user_seq WHERE id < 0');
+
+        $this->assertEqual($this->adapter->pop(), 'SELECT @@IDENTITY');  
+        $this->assertEqual($this->adapter->pop(), 'SELECT @@VERSION'); 
+        $this->assertEqual($this->adapter->pop(), 'SET IDENTITY_INSERT user_seq OFF INSERT INTO user_seq DEFAULT VALUES');
+        $this->assertEqual($this->adapter->pop(), 'SELECT COUNT(1) FROM user_seq');
+    }
+    public function testLastInsertIdCallsPdoLevelEquivalent() 
+    {
+        $id = $this->sequence->lastInsertId('user');
+
+        $this->assertEqual($this->adapter->pop(), 'SELECT @@IDENTITY');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Sequence/MysqlTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Sequence/MysqlTestCase.php
new file mode 100644
index 000000000..6713c2c11
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Sequence/MysqlTestCase.php
@@ -0,0 +1,59 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Sequence_Mysql_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Sequence_Mysql_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testCurrIdExecutesSql() 
+    {
+        $this->sequence->currId('user');
+
+        $this->assertEqual($this->adapter->pop(), 'SELECT MAX(id) FROM user');
+    }
+    public function testNextIdExecutesSql() 
+    {
+        $id = $this->sequence->nextId('user');
+        
+        $this->assertEqual($id, 1);
+
+        $this->assertEqual($this->adapter->pop(), 'DELETE FROM user WHERE id < 1');
+        $this->assertEqual($this->adapter->pop(), 'LAST_INSERT_ID()');
+        $this->assertEqual($this->adapter->pop(), 'INSERT INTO user (id) VALUES (NULL)');
+    }
+    public function testLastInsertIdCallsPdoLevelEquivalent() 
+    {
+        $id = $this->sequence->lastInsertId('user');
+        
+        $this->assertEqual($id, 1);
+
+        $this->assertEqual($this->adapter->pop(), 'LAST_INSERT_ID()');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Sequence/OracleTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Sequence/OracleTestCase.php
new file mode 100644
index 000000000..c56233c16
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Sequence/OracleTestCase.php
@@ -0,0 +1,55 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Sequence_Oracle_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Sequence_Oracle_TestCase extends Doctrine_UnitTestCase 
+{
+     public function testCurrIdExecutesSql() 
+     {
+        $this->sequence->currId('user');
+        $q = "SELECT (last_number-1) FROM user_sequences WHERE sequence_name='user_seq' OR sequence_name='USER_SEQ'";
+
+        $this->assertEqual($this->adapter->pop(), $q);
+    }
+    public function testNextIdExecutesSql() 
+    {
+        $id = $this->sequence->nextId('user');
+
+        $this->assertEqual($this->adapter->pop(), 'SELECT user_seq.nextval FROM DUAL');
+
+    }
+    public function testLastInsertIdExecutesSql()
+    {
+        $this->sequence->lastInsertId('user');
+        
+        $this->assertEqual($this->adapter->pop(), 'SELECT user_seq.currval FROM DUAL');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Sequence/PgsqlTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Sequence/PgsqlTestCase.php
new file mode 100644
index 000000000..57d854c2d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Sequence/PgsqlTestCase.php
@@ -0,0 +1,55 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Sequence_Pgsql_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Sequence_Pgsql_TestCase extends Doctrine_UnitTestCase 
+{
+     public function testCurrIdExecutesSql() 
+     {
+        $this->sequence->currId('user');
+        $q = "SELECT last_value FROM user_seq";
+
+        $this->assertEqual($this->adapter->pop(), $q);
+    }
+    public function testNextIdExecutesSql() 
+    {
+        $id = $this->sequence->nextId('user');
+
+        $this->assertEqual($this->adapter->pop(), "SELECT NEXTVAL('user_seq')");
+
+    }
+    public function testLastInsertIdExecutesSql()
+    {
+        $this->sequence->lastInsertId('user');
+        
+        $this->assertEqual($this->adapter->pop(), "SELECT CURRVAL('user_seq')");
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Sequence/SqliteTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Sequence/SqliteTestCase.php
new file mode 100644
index 000000000..8f0c2b10c
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Sequence/SqliteTestCase.php
@@ -0,0 +1,61 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Sequence_Sqlite_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Sequence_Sqlite_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testCurrIdExecutesSql() 
+    {
+         $this->adapter->forceLastInsertIdFail(false);
+
+        $this->sequence->currId('user');
+
+        $this->assertEqual($this->adapter->pop(), 'SELECT MAX(id) FROM user_seq');
+    }
+    public function testNextIdExecutesSql() 
+    {
+        $id = $this->sequence->nextId('user');
+        
+        $this->assertEqual($id, 1);
+
+        $this->assertEqual($this->adapter->pop(), 'DELETE FROM user_seq WHERE id < 1');
+        $this->assertEqual($this->adapter->pop(), 'LAST_INSERT_ID()');
+        $this->assertEqual($this->adapter->pop(), 'INSERT INTO user_seq (id) VALUES (NULL)');
+    }
+    public function testLastInsertIdCallsPdoLevelEquivalent() 
+    {
+        $id = $this->sequence->lastInsertId('user');
+        
+        $this->assertEqual($id, 1);
+
+        $this->assertEqual($this->adapter->pop(), 'LAST_INSERT_ID()');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/SequenceTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/SequenceTestCase.php
new file mode 100644
index 000000000..314373cf6
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/SequenceTestCase.php
@@ -0,0 +1,67 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Sequence_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Sequence_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData() 
+    {
+    }
+    public function prepareTables() 
+    {
+    }
+    public function testSequencesAreSupportedForRecords()
+    {
+        $this->adapter->forceLastInsertIdFail();
+        $r = new CustomSequenceRecord;
+        $r->name = 'custom seq';
+        $r->save();
+        
+                 /**
+        // the last profiled event is transaction commit
+        $this->assertEqual($this->adapter->pop(), 'COMMIT');
+        // query execution                                         
+
+        $this->assertEqual($this->adapter->pop(), 'INSERT INTO custom_sequence_record (name, id) VALUES (?, ?)');
+        // query prepare
+        $this->assertEqual($this->adapter->pop(), 'INSERT INTO custom_sequence_record (name, id) VALUES (?, ?)');
+
+        // sequence generation (first fails)
+        $this->assertEqual($this->adapter->pop(), 'INSERT INTO custom_seq_seq (id) VALUES (1)');
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE custom_seq_seq (id INTEGER PRIMARY KEY DEFAULT 0 NOT NULL)');
+        $this->assertEqual($this->adapter->pop(), 'INSERT INTO custom_seq_seq (id) VALUES (NULL)');
+
+        // transaction begin
+        $this->assertEqual($this->adapter->pop(), 'BEGIN TRANSACTION');
+        $this->assertEqual($this->adapter->pop(), 'CREATE TABLE custom_sequence_record (id INTEGER, name VARCHAR(2147483647), PRIMARY KEY(id))');
+        */
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/SluggableTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/SluggableTestCase.php
new file mode 100644
index 000000000..7d2ae39ad
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/SluggableTestCase.php
@@ -0,0 +1,570 @@
+<?php
+class Doctrine_Sluggable_TestCase extends Doctrine_UnitTestCase 
+{    
+    public function prepareTables()
+    {
+        $this->tables[] = "SluggableItem";
+        $this->tables[] = "SluggableItem1";
+        $this->tables[] = "SluggableItem2";
+        $this->tables[] = "SluggableItem3";
+        $this->tables[] = "SluggableItem4";
+        $this->tables[] = "SluggableItem5";
+        $this->tables[] = "SluggableItem6";
+        $this->tables[] = "SluggableItem7";
+        $this->tables[] = "SluggableItem8";
+        $this->tables[] = "SluggableItem9";
+        $this->tables[] = "SluggableItem10";
+        $this->tables[] = "SluggableItem11";
+        $this->tables[] = "SluggableItem12";
+        $this->tables[] = "SluggableItem13";
+        $this->tables[] = "SluggableItem14";
+        $this->tables[] = "SluggableItem15";
+        $this->tables[] = "SluggableItem16";
+        $this->tables[] = "SluggableItem17";
+        parent::prepareTables();
+    }
+
+    public function testSluggableWithNoFieldsNoGetUniqueSlugMethod()
+    {
+        $item = new SluggableItem();
+        $item->name = 'My item';
+        $item->save();
+        $this->assertEqual($item->slug, 'result-of-to-string');
+    }
+    
+    public function testSSluggableWithNoFieldsOptionButGetUniqueSlugMethod()
+    {
+        $item = new SluggableItem1();
+        $item->name = 'My item';
+        $item->save();
+        $this->assertEqual($item->slug, 'result-of-to-get-unique-slug');
+    }
+
+    public function testSluggableWithFieldsOption()
+    {
+        parent::prepareTables();
+        $item = new SluggableItem2();
+        $item->name = 'My item';
+        $item->save();
+        $this->assertEqual($item->slug, 'my-item');
+        $item = new SluggableItem2();
+        $item->name = 'My item';
+        $item->save();
+        $this->assertEqual($item->slug, 'my-item-1');
+        $itemTable  = Doctrine_Core::getTable('SluggableItem2');
+        $this->assertTrue($index = $itemTable->getIndex('my_item2_sluggable'));
+        $this->assertEqual($index['type'], 'unique');
+        $this->assertEqual($index['fields'], array('slug'));
+    }
+    
+    public function testSluggableUniqueSlugOnUpdate()
+    {
+        parent::prepareTables();
+        $item = new SluggableItem2();
+        $item->name = 'My item';
+        $item->save();
+        $this->assertEqual($item->slug, 'my-item');
+        $item = new SluggableItem2();
+        $item->name = 'My item';
+        $item->save();
+        $this->assertEqual($item->slug, 'my-item-1');
+        $item->slug = 'New slug';
+        $item->save();
+        $this->assertEqual($item->slug, 'New slug');
+    }
+    
+    public function testSluggableWithMultipleFieldsOption()
+    {
+        parent::prepareTables();
+        $item = new SluggableItem4();
+        $item->name = 'My item';
+        $item->ref = 'My ref';
+        $item->save();
+        $this->assertEqual($item->slug, 'my-item-my-ref');
+        $item = new SluggableItem4();
+        $item->name = 'My item';
+        $item->ref = 'My ref';
+        $item->save();
+        $this->assertEqual($item->slug, 'my-item-my-ref-1');
+    }
+    
+    public function testSluggableWithFieldsAndNonUniqueOptions()
+    {
+        parent::prepareTables();
+        $item = new SluggableItem3();
+        $item->name = 'My item';
+        $item->save();
+        $this->assertEqual($item->slug, 'my-item');
+        $item = new SluggableItem3();
+        $item->name = 'My item';
+        $item->save();
+        $this->assertEqual($item->slug, 'my-item');
+    }
+    
+    public function testSluggableWithUniqueByOption()
+    {
+        parent::prepareTables();
+        $item = new SluggableItem5();
+        $item->name = 'My item';
+        $item->user_id = 1;
+        $item->save();
+        $this->assertEqual($item->slug, 'my-item');
+        $item = new SluggableItem5();
+        $item->name = 'My item';
+        $item->user_id = 2;
+        $item->save();
+        $this->assertEqual($item->slug, 'my-item');
+        $item = new SluggableItem5();
+        $item->name = 'My item';
+        $item->user_id = 1;
+        $item->save();
+        $this->assertEqual($item->slug, 'my-item-1');
+        $itemTable  = Doctrine_Core::getTable('SluggableItem5');
+        $this->assertTrue($index = $itemTable->getIndex('my_item5_sluggable'));
+        $this->assertEqual($index['type'], 'unique');
+        $this->assertEqual($index['fields'], array('slug', 'user_id'));
+    }
+    
+    public function testSluggableWithUniqueByOptionAndNullValue()
+    {
+        parent::prepareTables();
+        $item = new SluggableItem5();
+        $item->name = 'My item';
+        $item->save();
+        $this->assertEqual($item->slug, 'my-item');
+        $item = new SluggableItem5();
+        $item->name = 'My item';
+        $item->save();
+        $this->assertEqual($item->slug, 'my-item-1');
+        $item = new SluggableItem5();
+        $item->name = 'My item';
+        $item->user_id = 1;
+        $item->save();
+        $this->assertEqual($item->slug, 'my-item');
+    }
+    
+    public function testSluggableWithMultipleUniqueByOption()
+    {
+        parent::prepareTables();
+        $item = new SluggableItem6();
+        $item->name = 'My item';
+        $item->user_id = 1;
+        $item->account_id = 1;
+        $item->save();
+        $this->assertEqual($item->slug, 'my-item');
+        $item = new SluggableItem6();
+        $item->name = 'My item';
+        $item->user_id = 1;
+        $item->account_id = 2;
+        $item->save();
+        $this->assertEqual($item->slug, 'my-item');
+        $item = new SluggableItem6();
+        $item->name = 'My item';
+        $item->user_id = 1;
+        $item->account_id = 2;
+        $item->save();
+        $this->assertEqual($item->slug, 'my-item-1');
+    }
+    
+    public function testSluggableWithFieldsOptionAndNoIndex()
+    {
+        parent::prepareTables();
+        $itemTable  = Doctrine_Core::getTable('SluggableItem7');
+        $this->assertFalse($itemTable->getIndex('sluggable'));
+    }
+    
+    public function testSluggableUniqueSlugOnUpdateWithOptioncanUpdateSlug ()
+    {
+        parent::prepareTables();
+        $item = new SluggableItem8();
+        $item->name = 'My item';
+        $item->save();
+        $this->assertEqual($item->slug, 'my-item');
+        $item1 = new SluggableItem8();
+        $item1->name = 'My item';
+        $item1->save();
+        $this->assertEqual($item1->slug, 'my-item-1');
+        $item1->slug = 'New slug';
+        $item1->save();
+        $this->assertEqual($item1->slug, 'new-slug');
+        $item1->slug = 'My item';
+        $item1->save();
+        $this->assertEqual($item1->slug, 'my-item-1');
+        $item1->name = 'New name';
+        $item1->save();
+        $this->assertEqual($item1->slug, 'new-name');
+    }
+
+    public function testSluggableWithSoftDeleteFailWithSameSlug()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+
+        parent::prepareTables();
+        $item0 = new SluggableItem9();
+        $item0->name = 'test';
+        $item0->save();
+        $this->assertEqual($item0->slug, 'test');
+
+        // Let's try to blow up Doctrine!
+        $item0->delete(); // muhaha! I don't actually delete it!
+
+        // We must have 0 as total of records
+        
+        $this->assertEqual(Doctrine_Query::create()->from('SluggableItem9')->count(), 0);
+
+        $item1 = new SluggableItem9();
+        $item1->name = 'test';
+        $item1->save();
+        $this->assertEqual($item1->slug, 'test-1');
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+    }
+    
+    public function testSluggableWithColumAggregationInheritance()
+    {
+      parent::prepareTables();
+      $item = new SluggableItem11();
+      $item->name = 'My item';
+      $item->save();
+      $item1 = new SluggableItem12();
+      $item1->name = 'My item';
+      $item1->save();
+      // since this two items resides in the same table, they should not have the same slug
+      $this->assertNotEqual($item1->slug, $item->slug);
+    }
+
+    public function testSluggableWithColumAggregationInheritanceAndUniquByType()
+    {
+      parent::prepareTables();
+      $item = new SluggableItem16();
+      $item->name = 'My item';
+      $item->save();
+      $item1 = new SluggableItem17();
+      $item1->name = 'My item';
+      $item1->save();
+      $this->assertEqual($item1->slug, $item->slug);
+    }
+
+    public function testSluggableWithConcreteInheritance()
+    {
+      parent::prepareTables();
+      $item = new SluggableItem13();
+      $item->name = 'My item';
+      $item->save();
+      $item1 = new SluggableItem14();
+      $item1->name = 'My item';
+      $item1->save();
+      // this two slugs is in different tables so they should be equal
+      $this->assertEqual($item->slug,$item1->slug);
+      $item2 = new SluggableItem14();
+      $item2->name = 'My item';
+      $item2->save();
+      $this->assertNotEqual($item2->slug,$item1->slug);
+    }
+}
+
+// Model with no fields option and no getUniqueSlug, but __toString method
+class SluggableItem extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('my_item');
+        $this->hasColumn('name', 'string', 50);
+    }
+
+    public function setUp()
+    {
+        parent::setUp();
+        $this->actAs('Sluggable', array('unique' => true));
+    }
+
+    public function __toString()
+    {
+        return 'result-of-to-string';
+    }
+}
+
+// Model with no fields option but getUniqueSlug method
+class SluggableItem1 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('my_item1');
+        $this->hasColumn('name', 'string', 50);
+    }
+
+    public function setUp()
+    {
+        parent::setUp();
+        $this->actAs('Sluggable', array('unique' => true));
+    }
+
+    public function __toString()
+    {
+        return 'result-of-to-string';
+    }
+
+    public function getUniqueSlug()
+    {
+        return 'result-of-to-get-unique-slug';
+    }
+}
+
+// Model with fields option
+class SluggableItem2 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('my_item2');
+        $this->hasColumn('name', 'string', 50);
+    }
+
+    public function setUp()
+    { 
+        parent::setUp();
+        $this->actAs('Sluggable', array('unique' => true,
+                                        'fields' => array('name')));
+    }
+}
+
+// Model with fields option and non unique option
+class SluggableItem3 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('my_item3');
+        $this->hasColumn('name', 'string', 50);
+    }
+
+    public function setUp()
+    { 
+        parent::setUp();
+        $this->actAs('Sluggable', array('unique' => false,
+                                        'fields' => array('name')));
+    }
+}
+
+// Model with multiple fields option
+class SluggableItem4 extends Doctrine_Record
+{
+
+    public function setTableDefinition()
+    {
+        $this->setTableName('my_item4');
+        $this->hasColumn('name', 'string', 50);
+        $this->hasColumn('ref', 'string', 50);
+    }
+
+    public function setUp()
+    { 
+        parent::setUp();
+        $this->actAs('Sluggable', array('unique' => true,
+                                        'fields' => array('name', 'ref')));
+    }
+}
+
+// Model with fields and  uniqueBy option
+class SluggableItem5 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('my_item5');
+        $this->hasColumn('name', 'string', 50);
+        $this->hasColumn('user_id', 'string', 50);
+    }
+
+    public function setUp()
+    { 
+        parent::setUp();
+        $this->actAs('Sluggable',   array('fields'      => array('name'),
+                                          'uniqueBy'    => array('user_id'),
+                                          'unique'      => true
+        ));
+    }
+}
+
+// Model with fields and multiple uniqueBy option
+class SluggableItem6 extends Doctrine_Record
+{
+
+    public function setTableDefinition()
+    {
+        $this->setTableName('my_item6');
+        // Make sure this works the same with a column that is not named id
+        $this->hasColumn('iid', 'integer', null, array('primary' => true, 'autoincrement' => true));
+        $this->hasColumn('name', 'string', 50);
+        $this->hasColumn('user_id', 'string', 50);
+        $this->hasColumn('account_id', 'string', 50);
+    }
+
+    public function setUp()
+    { 
+        parent::setUp();
+        $this->actAs('Sluggable',   array('fields'      => array('name'),
+                                          'uniqueBy'    => array('user_id', 'account_id'),
+                                          'unique'      => true
+        ));
+    }
+}
+
+// Model with fields option and no index
+class SluggableItem7 extends Doctrine_Record
+{
+
+    public function setTableDefinition()
+    {
+        $this->setTableName('my_item2');
+        $this->hasColumn('name', 'string', 50);
+    }
+
+    public function setUp()
+    { 
+        parent::setUp();
+        $this->actAs('Sluggable', array('fields'        => array('name'),
+                                        'uniqueIndex'   => false,
+                                        'unique'        => true));
+    }
+}
+
+// Model with fields option and canUpdateSlug option
+class SluggableItem8 extends Doctrine_Record
+{
+
+    public function setTableDefinition()
+    {
+        $this->setTableName('my_item8');
+        $this->hasColumn('name', 'string', 50);
+    }
+
+    public function setUp()
+    { 
+        parent::setUp();
+        $this->actAs('Sluggable', array('unique'    => true,
+                                        'fields'    => array('name'),
+                                        'canUpdate' => true));
+    }
+}
+
+// Model usage with mixing of SoftDelete
+class SluggableItem9 extends Doctrine_Record
+{
+
+    public function setTableDefinition()
+    {
+        $this->setTableName('my_item9');
+        $this->hasColumn('name', 'string', 50);
+    }
+
+    public function setUp()
+    { 
+        parent::setUp();
+
+        $this->actAs('SoftDelete');
+        $this->actAs('Sluggable', array('unique'      => true,
+                                        'uniqueIndex' => true,
+                                        'fields'      => array('name')));
+    }
+}
+
+// A fiew models using column aggerigation inheritance
+// That inherits form an abstract class
+abstract class SluggableItem10Abstract extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('my_item10');
+    $this->hasColumn('name', 'string', 50);
+    $this->hasColumn('type', 'integer',1);
+    $this->setSubclasses(array("SluggableItem11" => array("type" => 0), "SluggableItem12" => array("type" => 1)));
+  }
+  public function setUp()
+  {
+    parent::setUp();
+    
+    $this->actAs('Sluggable', array('unique'      => true,
+                                    'uniqueIndex' => true,
+                                    'fields'      => array('name'),
+                                    ));
+  }
+}
+
+class SluggableItem10 extends SluggableItem10Abstract
+{}
+
+// Two classes that extends SluggableItem10 using column aggregation
+class SluggableItem11 extends SluggableItem10
+{
+  public function setUp()
+  {
+    parent::setUp();
+  }
+}
+
+class SluggableItem12 extends SluggableItem10
+{
+  public function setUp()
+  {
+    parent::setUp();
+  }
+}
+
+// Two classes extending SluggableItem2 using concrete inheritance
+class SluggableItem13 extends SluggableItem2
+{
+  public function setTableDefinition()
+  {
+      parent::setTableDefinition();
+      $this->setTableName('my_item13');
+      $this->hasColumn('content', 'string', 300);
+  }
+}
+
+class SluggableItem14 extends SluggableItem2
+{
+  public function setTableDefinition()
+  {
+      parent::setTableDefinition();
+      $this->setTableName('my_item14');
+      $this->hasColumn('content', 'string', 300);
+  }
+}
+
+// A fiew models using column aggerigation inheritance and uniqueBy type
+class SluggableItem15 extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('my_item15');
+    $this->hasColumn('name', 'string', 50);
+    $this->hasColumn('type', 'integer',1);
+    $this->setSubclasses(array("SluggableItem16" => array("type" => 0), "SluggableItem17" => array("type" => 1)));
+  }
+ 
+  public function setUp()
+  {
+    parent::setUp();
+    
+    $this->actAs('Sluggable', array('unique'      => true,
+                                    'uniqueIndex' => true,
+                                    'uniqueBy'    => array('type'),
+                                    'fields'      => array('name'),
+                                    ));
+  }
+}
+
+// Two classes that extends SluggableItem15 using column aggregation
+class SluggableItem16 extends SluggableItem15
+{
+  public function setUp()
+  {
+    parent::setUp();
+  }
+}
+
+class SluggableItem17 extends SluggableItem15
+{
+  public function setUp()
+  {
+    parent::setUp();
+  }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/SoftDeleteBCTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/SoftDeleteBCTestCase.php
new file mode 100644
index 000000000..830c40de2
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/SoftDeleteBCTestCase.php
@@ -0,0 +1,118 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_SoftDeleteBC_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_SoftDeleteBC_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'SoftDeleteBCTest';
+        parent::prepareTables();
+    }
+
+    public function testDoctrineRecordDeleteSetsFlag()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+        
+        $test = new SoftDeleteBCTest();
+        $test->name = 'test';
+        $test->something = 'test';
+        $test->save();
+        $test->delete();
+        $this->assertTrue($test->deleted);
+        $test->free();
+
+        
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+    }
+
+    public function testDoctrineQueryIsFilteredWithDeleteFlagCondition()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+        
+        $q = Doctrine_Query::create()
+                    ->from('SoftDeleteBCTest s')
+                    ->where('s.name = ?', array('test'));
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT s.name AS s__name, s.something AS s__something, s.deleted AS s__deleted FROM soft_delete_bc_test s WHERE (s.name = ? AND (s.deleted = 0))');
+        $params = $q->getFlattenedParams();
+        $this->assertEqual(count($params), 1);
+        $this->assertEqual($params[0], 'test');
+
+        $test = $q->fetchOne();
+        $this->assertFalse($test);
+        
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+    }
+
+    public function testTicket1132()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+        
+        $test = new SoftDeleteBCTest();
+        $test->name = 'test1';
+        $test->something = 'test2';
+        $test->save();
+
+        $q = Doctrine_Query::create()
+                ->from('SoftDeleteBCTest s')
+                ->addWhere('s.name = ?')
+                ->addWhere('s.something = ?');
+
+        $results = $q->execute(array('test1', 'test2'));
+        $this->assertEqual($q->getSqlQuery(), 'SELECT s.name AS s__name, s.something AS s__something, s.deleted AS s__deleted FROM soft_delete_bc_test s WHERE (s.name = ? AND s.something = ? AND (s.deleted = 0))');
+        $this->assertEqual($q->getFlattenedParams(array('test1', 'test2')), array('test1', 'test2'));
+        $this->assertEqual($results->count(), 1);
+        
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+    }
+
+    // Test Doctrine_Query::count() applies dql hooks
+    public function testTicket1170()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+        
+        Doctrine_Query::create()
+            ->delete()
+            ->from('SoftDeleteBCTest s')
+            ->execute();
+
+        $q = Doctrine_Query::create()
+                ->from('SoftDeleteBCTest s')
+                ->addWhere('s.name = ?', 'test1')
+                ->addWhere('s.something = ?', 'test2');
+
+        $this->assertEqual($q->getCountSqlQuery(), 'SELECT COUNT(*) AS num_results FROM soft_delete_bc_test s WHERE s.name = ? AND s.something = ? AND (s.deleted = 0)');
+        $this->assertEqual($q->count(), 0);
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/SoftDeleteTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/SoftDeleteTestCase.php
new file mode 100644
index 000000000..1bae56e9a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/SoftDeleteTestCase.php
@@ -0,0 +1,111 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_SoftDelete_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_SoftDelete_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'SoftDeleteTest';
+        parent::prepareTables();
+    }
+
+    public function testDoctrineRecordDeleteSetsFlag()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+        $test = new SoftDeleteTest();
+        $test->name = 'test';
+        $test->something = 'test';
+        $test->save();
+        $test->delete();
+        $this->assertTrue(strtotime($test->deleted_at) > 0);
+        $test->free();
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+    }
+
+    public function testDoctrineQueryIsFilteredWithDeleteFlagCondition()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+        $q = Doctrine_Query::create()
+                    ->from('SoftDeleteTest s')
+                    ->where('s.name = ?', array('test'));
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT s.name AS s__name, s.something AS s__something, s.deleted_at AS s__deleted_at FROM soft_delete_test s WHERE (s.name = ? AND (s.deleted_at IS NULL))');
+        $params = $q->getFlattenedParams();
+        $this->assertEqual(count($params), 1);
+        $this->assertEqual($params[0], 'test');
+
+        $test = $q->fetchOne();
+        $this->assertFalse($test);
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+    }
+
+    public function testTicket1132()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+        $test = new SoftDeleteTest();
+        $test->name = 'test1';
+        $test->something = 'test2';
+        $test->save();
+
+        $q = Doctrine_Query::create()
+                ->from('SoftDeleteTest s')
+                ->addWhere('s.name = ?')
+                ->addWhere('s.something = ?');
+
+        $results = $q->execute(array('test1', 'test2'));
+        $this->assertEqual($q->getSqlQuery(), 'SELECT s.name AS s__name, s.something AS s__something, s.deleted_at AS s__deleted_at FROM soft_delete_test s WHERE (s.name = ? AND s.something = ? AND (s.deleted_at IS NULL))');
+        $this->assertEqual($q->getFlattenedParams(array('test1', 'test2')), array('test1', 'test2'));
+        $this->assertEqual($results->count(), 1);
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+    }
+
+    // Test Doctrine_Query::count() applies dql hooks
+    public function testTicket1170()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+
+        Doctrine_Query::create()
+            ->delete()
+            ->from('SoftDeleteTest s')
+            ->execute();
+
+        $q = Doctrine_Query::create()
+                ->from('SoftDeleteTest s')
+                ->addWhere('s.name = ?', 'test1')
+                ->addWhere('s.something = ?', 'test2');
+
+        $this->assertEqual($q->getCountSqlQuery(), 'SELECT COUNT(*) AS num_results FROM soft_delete_test s WHERE s.name = ? AND s.something = ? AND (s.deleted_at IS NULL)');
+        $this->assertEqual($q->count(), 0);
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Table/NamedQueryTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Table/NamedQueryTestCase.php
new file mode 100644
index 000000000..82d105e4f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Table/NamedQueryTestCase.php
@@ -0,0 +1,105 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Query_Registry
+ *
+ * @package     Doctrine
+ * @subpackage  Query
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Table_NamedQuery_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables = array('MyFoo');
+        
+        parent::prepareTables();
+    }
+
+    public function prepareData() {
+        $f1 = new MyFoo();
+        $f1->name = 'jwage';
+        $f1->value0 = 0;
+        $f1->save();
+
+        $f2 = new MyFoo();
+        $f2->name = 'jonwage';
+        $f2->value0 = 1;
+        $f2->save();
+
+        $f3 = new MyFoo();
+        $f3->name = 'jonathanwage';
+        $f3->value0 = 2;
+        $f3->save();
+    }
+    
+    
+    public function testNamedQuerySupport()
+    {
+        $table = Doctrine_Core::getTable('MyFoo');
+
+        $this->assertEqual(
+            $table->createNamedQuery('get.by.id')->getSqlQuery(),
+            'SELECT m.id AS m__id, m.name AS m__name, m.value0 AS m__value0 FROM my_foo m WHERE (m.id = ?)'
+        );
+        
+        $this->assertEqual(
+            $table->createNamedQuery('get.by.similar.names')->getSqlQuery(),
+            'SELECT m.id AS m__id, m.value0 AS m__value0 FROM my_foo m WHERE (LOWER(m.name) LIKE LOWER(?))'
+        );
+        
+        $this->assertEqual($table->createNamedQuery('get.by.similar.names')->count(array('%jon%wage%')), 2);
+        
+        $items = $table->find('get.by.similar.names', array('%jon%wage%'));
+        
+        $this->assertEqual(count($items), 2);
+    }
+}
+
+
+class MyFoo extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+        $this->hasColumn('value0', 'integer', 4);
+    }
+}
+
+
+class MyFooTable extends Doctrine_Table
+{
+    public function construct()
+    {
+        $this->addNamedQuery('get.by.id', 'SELECT f.* FROM MyFoo f WHERE f.id = ?');
+        $this->addNamedQuery(
+            'get.by.similar.names', Doctrine_Query::create()
+                ->select('f.id, f.value0')
+                ->from('MyFoo f')
+                ->where('LOWER(f.name) LIKE LOWER(?)')
+        );
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Table/RemoveColumnTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Table/RemoveColumnTestCase.php
new file mode 100644
index 000000000..ef0c3948a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Table/RemoveColumnTestCase.php
@@ -0,0 +1,86 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_TableRemoveColumn_TestCase
+ *
+ * @package     Doctrine
+ * @author      Dennis Verspuij <dennis.verspuij@gmail.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Table_RemoveColumn_TestCase extends Doctrine_UnitTestCase
+{
+
+    public function prepareTables()
+    {
+        $this->tables[] = 'RemoveColumnTest';
+        parent::prepareTables();
+    }
+
+    protected function _verifyNrColumnsAndFields($table, $nrExpected)
+    {
+        $nrColumns = $table->getColumnCount();
+
+        $this->assertEqual($nrColumns, $nrExpected);
+        $this->assertEqual($nrColumns, count($table->getColumns()));
+
+        $this->assertEqual($nrColumns, count($table->getFieldNames()));
+        foreach($table->getFieldNames() as $field) {
+            $this->assertTrue($table->hasField($field));
+        }
+
+        // the following are trivial because both getColumnNames and
+        // hasColumn use Table::_columns instead of Table::_fieldNames
+        $this->assertEqual($nrColumns, count($table->getColumnNames()));
+        foreach($table->getColumnNames() as $column) {
+            $this->assertTrue($table->hasColumn($column));
+        }
+    }
+
+    public function testAfterDefinition()
+    {
+        $table = $this->connection->getTable('RemoveColumnTest');
+        $this->_verifyNrColumnsAndFields($table, 4);
+    }
+
+    public function testAfterRemoveColumn()
+    {
+        $table = $this->connection->getTable('RemoveColumnTest');
+        $table->removeColumn('bb');
+        $table->removeColumn('CC');
+        $this->_verifyNrColumnsAndFields($table, 2);
+    }
+}
+
+class RemoveColumnTest extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('AA', 'integer', null, array('primary' => true));
+        $this->hasColumn('bb', 'integer');
+        $this->hasColumn('CC', 'string',10);
+        $this->hasColumn('dd', 'string',10);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TableTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TableTestCase.php
new file mode 100644
index 000000000..793e9672e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TableTestCase.php
@@ -0,0 +1,263 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Table_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Table_TestCase extends Doctrine_UnitTestCase
+{
+
+    public function prepareTables()
+    {
+        $this->tables[] = 'FieldNameTest';
+        parent::prepareTables();
+    }
+
+    public function testInitializingNewTableWorksWithoutConnection()
+    {
+        $table = new Doctrine_Table('Test', $this->conn);
+
+        $this->assertEqual($table->getComponentName(), 'Test');
+    }
+
+    public function testSerialize()
+    {
+        $table = new Doctrine_Table('FieldNameTest', $this->conn);
+        $serializedTable = serialize($table);
+
+        $unserializedTable = unserialize($serializedTable);
+        $unserializedTable->initializeFromCache($this->objTable->getConnection());
+
+        $this->assertEqual($table->getColumns(), $unserializedTable->getColumns());
+    }
+
+    public function testFieldConversion()
+    {
+        $this->dbh->setAttribute(PDO::ATTR_CASE, PDO::CASE_UPPER);
+
+        $t = new FieldNameTest();
+
+        $t->someColumn = 'abc';
+        $t->someEnum = 'php';
+        $t->someInt = 1;
+        $t->someArray = array();
+        $obj = new StdClass();
+        $t->someObject = $obj;
+
+        $this->assertEqual($t->someColumn, 'abc');
+        $this->assertEqual($t->someEnum, 'php');
+        $this->assertEqual($t->someInt, 1);
+        $this->assertEqual($t->someArray, array());
+        $this->assertEqual($t->someObject, $obj);
+
+        $t->save();
+
+        $this->assertEqual($t->someColumn, 'abc');
+        $this->assertEqual($t->someEnum, 'php');
+        $this->assertEqual($t->someInt, 1);
+        $this->assertEqual($t->someArray, array());
+        $this->assertEqual($t->someObject, $obj);
+
+        $t->refresh();
+
+        $this->assertEqual($t->someColumn, 'abc');
+        $this->assertEqual($t->someEnum, 'php');
+        $this->assertEqual($t->someInt, 1);
+        $this->assertEqual($t->someArray, array());
+        $this->assertEqual($t->someObject, $obj);
+
+        $this->connection->clear();
+
+        $t = $this->connection->getTable('FieldNameTest')->find(1);
+
+        $this->assertEqual($t->someColumn, 'abc');
+        $this->assertEqual($t->someEnum, 'php');
+        $this->assertEqual($t->someInt, 1);
+        $this->assertEqual($t->someArray, array());
+        $this->assertEqual($t->someObject, $obj);
+
+        $this->dbh->setAttribute(PDO::ATTR_CASE, PDO::CASE_NATURAL);
+    }
+
+    public function testGetForeignKey()
+    {
+        $fk = $this->objTable->getRelation("Group");
+        $this->assertTrue($fk instanceof Doctrine_Relation_Association);
+        $this->assertTrue($fk->getTable() instanceof Doctrine_Table);
+        $this->assertTrue($fk->getType() == Doctrine_Relation::MANY);
+        $this->assertTrue($fk->getLocal() == "user_id");
+        $this->assertTrue($fk->getForeign() == "group_id");
+
+        $fk = $this->objTable->getRelation("Email");
+        $this->assertTrue($fk instanceof Doctrine_Relation_LocalKey);
+        $this->assertTrue($fk->getTable() instanceof Doctrine_Table);
+        $this->assertTrue($fk->getType() == Doctrine_Relation::ONE);
+        $this->assertTrue($fk->getLocal() == "email_id");
+        $this->assertTrue($fk->getForeign() == $fk->getTable()->getIdentifier());
+
+
+        $fk = $this->objTable->getRelation('Phonenumber');
+        $this->assertTrue($fk instanceof Doctrine_Relation_ForeignKey);
+        $this->assertTrue($fk->getTable() instanceof Doctrine_Table);
+        $this->assertTrue($fk->getType() == Doctrine_Relation::MANY);
+        $this->assertTrue($fk->getLocal() == $this->objTable->getIdentifier());
+        $this->assertTrue($fk->getForeign() == 'entity_id');
+
+
+    }
+    public function testGetComponentName()
+    {
+        $this->assertTrue($this->objTable->getComponentName() == 'User');
+    }
+
+    public function testGetTableName()
+    {
+        $this->assertTrue($this->objTable->tableName == 'entity');
+    }
+
+    public function testGetConnection()
+    {
+        $this->assertTrue($this->objTable->getConnection() instanceof Doctrine_Connection);
+    }
+
+    public function testGetData()
+    {
+        $this->assertTrue($this->objTable->getData() == array());
+    }
+
+    public function testSetSequenceName()
+    {
+        $this->objTable->sequenceName = 'test-seq';
+        $this->assertEqual($this->objTable->sequenceName, 'test-seq');
+        $this->objTable->sequenceName = null;
+    }
+
+    public function testCreate()
+    {
+        $record = $this->objTable->create();
+        $this->assertTrue($record instanceof Doctrine_Record);
+        $this->assertTrue($record->state() == Doctrine_Record::STATE_TCLEAN);
+    }
+
+    public function testFind()
+    {
+        $record = $this->objTable->find(4);
+        $this->assertTrue($record instanceof Doctrine_Record);
+
+        try {
+            $record = $this->objTable->find('4');
+            $this->assertTrue($record instanceof Doctrine_Record);
+        } catch(Exception $e) {
+            $this->assertTrue(false);
+        }
+
+        try {
+            $record = $this->objTable->find('4', Doctrine_Core::HYDRATE_ARRAY);
+            $this->assertTrue(is_array($record));
+            $this->assertTrue( ! is_object($record));
+            $this->assertTrue(array_key_exists('id', $record));
+            $this->assertTrue(array_key_exists('name', $record));
+            $this->assertTrue( ! $record instanceof Doctrine_Record);
+        } catch(Exception $e) {
+            $this->assertTrue(false);
+        }
+
+        try {
+            $record = $this->objTable->find(123);
+            $this->assertTrue($record === false);
+        } catch(Exception $e) {
+            $this->assertTrue(false);
+        }
+
+        try {
+            $record = $this->objTable->find(null);
+            $this->assertTrue($record === false);
+        } catch(Exception $e) {
+            $this->assertTrue(false);
+        }
+
+        try {
+            $record = $this->objTable->find(false);
+            $this->assertTrue($record === false);
+        } catch(Exception $e) {
+            $this->assertTrue(false);
+        }
+    }
+
+    public function testFindAll()
+    {
+        $users = $this->objTable->findAll();
+        $this->assertEqual($users->count(), 8);
+        $this->assertTrue($users instanceof Doctrine_Collection);
+
+        $users = $this->objTable->findAll(Doctrine_Core::HYDRATE_ARRAY);
+        $this->assertTrue( ! $users instanceof Doctrine_Collection);
+        $this->assertTrue(is_array($users));
+        $this->assertTrue( ! is_object($users));
+        $this->assertEqual(count($users), 8);
+    }
+
+    public function testFindByDql()
+    {
+        $users = $this->objTable->findByDql("name LIKE '%Arnold%'");
+        $this->assertEqual($users->count(), 1);
+        $this->assertTrue($users instanceof Doctrine_Collection);
+    }
+
+    public function testFindByXXX()
+    {
+        $users = $this->objTable->findByName('zYne');
+        $this->assertEqual($users->count(), 1);
+        $this->assertTrue($users instanceof Doctrine_Collection);
+    }
+
+    public function testGetProxy()
+    {
+        $user = $this->objTable->getProxy(4);
+        $this->assertTrue($user instanceof Doctrine_Record);
+
+        try {
+            $record = $this->objTable->find(123);
+        } catch(Exception $e) {
+            $this->assertTrue($e instanceOf Doctrine_Find_Exception);
+        }
+    }
+
+    public function testGetColumns()
+    {
+        $columns = $this->objTable->getColumns();
+        $this->assertTrue(is_array($columns));
+
+    }
+
+    public function testApplyInheritance()
+    {
+        $this->assertEqual($this->objTable->applyInheritance("id = 3"), "id = 3 AND type = ?");
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TaskTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TaskTestCase.php
new file mode 100644
index 000000000..1ac5d9b37
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TaskTestCase.php
@@ -0,0 +1,157 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Task_TestCase
+ * 
+ * N.B. Invalid task classes are loaded just-in-time to avoid clashes with the CLI tests.  Other test-specific
+ * subclasses are declared at the bottom of this file.
+ *
+ * @package     Doctrine
+ * @author      Dan Bettles <danbettles@yahoo.co.uk>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Task_TestCase extends Doctrine_UnitTestCase 
+{
+    public function setUp() {}
+
+    public function tearDown() {}
+
+    public function testDerivetasknameReturnsTheNameOfATaskFromItsClassName()
+    {
+        $this->assertEqual('migrate', Doctrine_Task::deriveTaskName('Doctrine_Task_Migrate'));
+        $this->assertEqual('create-db', Doctrine_Task::deriveTaskName('Doctrine_Task_CreateDb'));
+        $this->assertEqual('generate-models-db', Doctrine_Task::deriveTaskName('Doctrine_Task_GenerateModelsDb'));
+        $this->assertEqual('custom-task', Doctrine_Task::deriveTaskName('CustomTask'));
+
+        /*
+         * PHP 5.3-specific tests
+         * 
+         * One would hope that authors of custom tasks would name their tasks manually, but since we can't guarantee
+         * anything, we'll have to _try_ to create a sensible name
+         */
+        $this->assertEqual('fully-qualified-custom-task', Doctrine_Task::deriveTaskName('fully\qualified\CustomTask'));
+        //$this->assertEqual('fully-qualified-custom-task', Doctrine_Task::deriveTaskName('fully\qualified\Doctrine_Task_CustomTask'));
+    }
+
+    public function testNameByDefaultIsDerivedFromTheNameOfTheClass()
+    {
+        $oTask = new Doctrine_Task_TestCase_TestTask001();
+        $this->assertEqual('test-case--test-task001', $oTask->taskName);  /*@todo Temporary, maybe*/
+        $this->assertEqual('test-case--test-task001', $oTask->getTaskName());
+    }
+
+    public function testSettasknameSetsTheNameOfTheTask()
+    {
+        $oTask = new Doctrine_Task_TestCase_TestTask002();
+        $this->assertEqual('better-task-name', $oTask->getTaskName());
+    }
+
+    /**
+     * Loads a PHP fixture from the directory for this test case
+     * 
+     * @ignore
+     * @param string $basename
+     */
+    protected function loadPhpFixture($basename)
+    {
+        require_once(dirname(__FILE__) . '/TaskTestCase/' . $basename);
+    }
+
+    public function testSettasknameThrowsAnExceptionIfTheTaskNameIsInvalid()
+    {
+        $this->loadPhpFixture('TestTask006.php');
+
+        try {
+            new Doctrine_Task_TestCase_TestTask006();
+        } catch (InvalidArgumentException $e) {
+            if ($e->getMessage() == 'The task name "invalid_task_name", in Doctrine_Task_TestCase_TestTask006, is invalid') {
+                $this->pass();
+                return;
+            }
+        }
+
+        $this->fail();
+    }
+
+    //This gives us a way to set an alternate task name that's in keeping with how we currently set-up tasks
+    public function testDoesNotAutomaticallySetTheNameOfTheTaskIfItWasSetManually()
+    {
+        $oTask = new Doctrine_Task_TestCase_TestTask003();
+        $this->assertEqual('better-task-name', $oTask->getTaskName());
+    }
+
+    public function testThrowsAnExceptionIfTheTaskNameIsInvalid()
+    {
+        $this->loadPhpFixture('TestTask004.php');
+        $this->loadPhpFixture('TestTask005.php');
+
+        $aClassWithInvalidTaskName = array(
+            'Doctrine_Task_TestCase_TestTask004' => '-invalid-task-name',
+            'Doctrine_Task_TestCase_TestTask005' => 'another invalid task name',
+        );
+
+        $numPasses = 0;
+
+        foreach ($aClassWithInvalidTaskName as $classWithInvalidTaskName => $invalidTaskName) {
+            try {
+                new $classWithInvalidTaskName();
+            } catch (InvalidArgumentException $e) {
+                if ($e->getMessage() == "The task name \"{$invalidTaskName}\", in {$classWithInvalidTaskName}, is invalid") {
+                    $numPasses++;
+                }
+            }
+        }
+
+        if ($numPasses == count($aClassWithInvalidTaskName)) {
+            $this->pass();
+        }
+        else {
+            $this->fail();
+        }
+    }
+}
+
+class Doctrine_Task_TestCase_TestTask001 extends Doctrine_Task
+{
+    public function execute() {}
+}
+
+class Doctrine_Task_TestCase_TestTask002 extends Doctrine_Task
+{
+    public function __construct()
+    {
+        $this->setTaskName('better-task-name');
+    }
+
+    public function execute() {}
+}
+
+class Doctrine_Task_TestCase_TestTask003 extends Doctrine_Task
+{
+    public $taskName = 'better-task-name';
+
+    public function execute() {}
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TaskTestCase/TestTask004.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TaskTestCase/TestTask004.php
new file mode 100644
index 000000000..f6a2282b0
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TaskTestCase/TestTask004.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Fixture for Doctrine_Task_TestCase
+ * 
+ * @author Dan Bettles <danbettles@yahoo.co.uk>
+ */
+
+class Doctrine_Task_TestCase_TestTask004 extends Doctrine_Task
+{
+    public $taskName = '-invalid-task-name';
+
+    public function execute() {}
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TaskTestCase/TestTask005.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TaskTestCase/TestTask005.php
new file mode 100644
index 000000000..a90581965
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TaskTestCase/TestTask005.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Fixture for Doctrine_Task_TestCase
+ * 
+ * @author Dan Bettles <danbettles@yahoo.co.uk>
+ */
+
+class Doctrine_Task_TestCase_TestTask005 extends Doctrine_Task
+{
+    public $taskName = 'another invalid task name';
+
+    public function execute() {}
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TaskTestCase/TestTask006.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TaskTestCase/TestTask006.php
new file mode 100644
index 000000000..4ff1b0b37
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TaskTestCase/TestTask006.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Fixture for Doctrine_Task_TestCase
+ * 
+ * @author Dan Bettles <danbettles@yahoo.co.uk>
+ */
+
+class Doctrine_Task_TestCase_TestTask006 extends Doctrine_Task
+{
+    public function __construct()
+    {
+        $this->setTaskName('invalid_task_name');
+    }
+
+    public function execute() {}
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TemplateTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TemplateTestCase.php
new file mode 100644
index 000000000..78689b89a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TemplateTestCase.php
@@ -0,0 +1,136 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Template_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Template_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    { }
+    public function prepareData() 
+    { }
+
+    public function testAccessingNonExistingImplementationThrowsException()
+    {
+        try {
+            $user = new ConcreteUser();
+            $user->Group;
+            $this->fail();
+        } catch (Doctrine_Relation_Parser_Exception $e) {
+            $this->pass();
+        }
+    }
+    
+    public function testAccessingExistingImplementationSupportsAssociations()
+    {
+        $this->manager->setImpl('UserTemplate', 'ConcreteUser')
+                      ->setImpl('GroupUserTemplate', 'ConcreteGroupUser')
+                      ->setImpl('GroupTemplate', 'ConcreteGroup')
+                      ->setImpl('EmailTemplate', 'ConcreteEmail');
+
+        $user = new ConcreteUser();
+        $group = $user->Group[0];
+
+        $this->assertTrue($group instanceof ConcreteGroup);
+
+        $this->assertTrue($group->User[0] instanceof ConcreteUser);
+    }
+    public function testAccessingExistingImplementationSupportsForeignKeyRelations()
+    {
+
+        $user = new ConcreteUser();
+
+        $this->assertTrue($user->Email[0] instanceof ConcreteEmail);
+    }
+
+    public function testShouldCallMethodInTemplate()
+    {
+        $user = new ConcreteUser();
+        $this->assertEqual("foo", $user->foo());
+    }
+
+}
+
+// move these to ../templates?
+class UserTemplate extends Doctrine_Template
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string');
+        $this->hasColumn('password', 'string');
+    }
+    public function setUp()
+    {
+        $this->hasMany('GroupTemplate as Group', array('local' => 'user_id',
+                                                       'foreign' => 'group_id',
+                                                       'refClass' => 'GroupUserTemplate'));
+        $this->hasMany('EmailTemplate as Email', array('local' => 'id',
+                                                       'foreign' => 'user_id'));
+    }
+    
+    public function foo()
+    {
+        return "foo";
+    }
+}
+class EmailTemplate extends Doctrine_Template
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('address', 'string');
+        $this->hasColumn('user_id', 'integer');
+    }
+    public function setUp()
+    {
+        $this->hasOne('UserTemplate as User', array('local' => 'user_id',
+                                                    'foreign' => 'id'));
+    }
+}
+class GroupTemplate extends Doctrine_Template
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string');
+    }
+    public function setUp()
+    {
+        $this->hasMany('UserTemplate as User', array('local' => 'user_id',
+                                                     'foreign' => 'group_id',
+                                                     'refClass' => 'GroupUserTemplate'));
+    }
+}
+class GroupUserTemplate extends Doctrine_Template
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('user_id', 'integer');
+        $this->hasColumn('group_id', 'integer');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1015TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1015TestCase.php
new file mode 100644
index 000000000..52830698c
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1015TestCase.php
@@ -0,0 +1,115 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1015_TestCase
+ *
+ * @package     Doctrine
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1015_TestCase extends Doctrine_UnitTestCase {
+
+    public function prepareTables() {
+        $this->tables = array();
+        $this->tables[] = 'T1015_Person';
+        $this->tables[] = 'T1015_Points';
+
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+        $person = new T1015_Person();
+        $person['name'] = "James";
+        $person['T1015_Points']['total'] = 15;
+        $person->save();
+    }
+
+
+    public function testDoctrineQueryJoinSelect()
+    {
+
+        $q = new Doctrine_Query();
+        $q->select('person.id, points.total')
+        ->from('T1015_Person person')
+        ->innerJoin('person.T1015_Points points WITH person.id = 1');
+
+        $results = $q->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+        //var_dump($results);
+        $person = $results[0];
+
+        // number of points for person id of 1 should be 15
+        $this->assertEqual(15, $person['T1015_Points']['total']); //THIS WILL FAIL
+         
+    }
+
+    public function testDoctrineRawSQLJoinSelect()
+    {
+        $q = new Doctrine_RawSql();
+        $q->select('{person.id}, {points.total}')
+        ->from('person person INNER JOIN points points ON person.id = points.person_id AND person.id=1')
+        ->addComponent('person', 'T1015_Person person')
+        ->addComponent('points', 'person.T1015_Points points');
+
+        $results = $q->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+        //var_dump($results);
+        $person = $results[0];
+
+        // number of points for person id of 1 should be 15
+        $this->assertEqual(15, $person['T1015_Points']['total']);
+    }
+}
+
+class T1015_Person extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('person');
+        $this->hasColumn('id', 'integer', 15, array('autoincrement' => true, 'unsigned' => true, 'primary' => true, 'notnull' => true));
+        $this->hasColumn('name', 'string', 50);
+    }
+
+    public function setUp()
+    {
+        parent :: setUp();
+        $this->hasOne('T1015_Points', array('local' => 'id', 'foreign' => 'person_id'));
+    }
+}
+
+class T1015_Points extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('points');
+        $this->hasColumn('person_id', 'integer', 15, array('primary' => true, 'notnull' => true));
+        $this->hasColumn('total', 'integer', 3);
+    }
+
+    public function setUp()
+    {
+        parent :: setUp();
+        $this->hasOne('T1015_Person', array('local' => 'person_id', 'foreign' => 'id'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1028TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1028TestCase.php
new file mode 100644
index 000000000..da5a27788
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1028TestCase.php
@@ -0,0 +1,73 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_I18nRelation_TestCase
+ *
+ * @package     Doctrine
+ * @author      Brice Figureau <brice+doctrine@daysofwonder.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1028_TestCase extends Doctrine_UnitTestCase
+{
+
+    public function prepareData()
+    { }
+
+    public function prepareTables()
+    {
+        $this->tables = array('I18nRelationTest','I18nAuthorTest');
+
+        parent::prepareTables();
+    }
+
+    public function testRelationIsNotInOriginalTableAnymore()
+    {
+        $i18n = Doctrine_Core::getTable('I18nRelationTest');
+        $relation = NULL;
+        try {
+            $relation = $i18n->getRelation('I18nAuthorTest');
+            $this->fail();
+        } catch(Doctrine_Exception $e) {
+            $this->pass();
+        }
+    }
+
+
+    public function testRelationsAreMovedToTranslationTable()
+    {
+        $translation = Doctrine_Core::getTable('I18nRelationTestTranslation');
+        $relation = NULL;
+        try {
+            $relation = $translation->getRelation('I18nAuthorTest');
+            $this->pass();
+        } catch(Doctrine_Exception $e) {
+            $this->fail();
+        }
+        $this->assertTrue($relation instanceof Doctrine_Relation_LocalKey);
+    }
+
+   
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1044TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1044TestCase.php
new file mode 100644
index 000000000..5aa9c540b
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1044TestCase.php
@@ -0,0 +1,73 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1044_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1044_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        try {
+            $this->tables[] = 'Ticket_1044_User';
+            $this->tables[] = 'Ticket_1044_UserProfile';
+            parent::prepareTables();
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+}
+
+class Ticket_1044_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+        $this->hasColumn('user_profile_id', 'integer');
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_1044_UserProfile as UserProfile', array('local'   => 'user_profile_id',
+                                                                      'foreign' => 'id'));
+        $this->hasOne('Ticket_1044_UserProfile as UserProfile', array('local'    => 'user_profile_id',
+                                                                      'foreign'  => 'id',
+                                                                      'override' => true));
+    }
+}
+
+class Ticket_1044_UserProfile extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1071TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1071TestCase.php
new file mode 100644
index 000000000..d24763cca
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1071TestCase.php
@@ -0,0 +1,60 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1071_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1071_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1071_TableName';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $versionTable = Doctrine_Core::getTable('Ticket_1071_TableNameVersion');
+        $this->assertEqual($versionTable->getTableName(), 'my_custom_table_name');
+    }
+}
+
+class Ticket_1071_TableName extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('Timestampable');
+        $this->actAs('Versionable', array('tableName' => 'my_custom_table_name'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1072TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1072TestCase.php
new file mode 100644
index 000000000..7451cbda0
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1072TestCase.php
@@ -0,0 +1,137 @@
+<?php
+
+/**
+ * Relation testing (accessing) throws an Doctrine_Record_Exception
+ * with message 'Unknown record property / related component
+ * "payment_detail_id" on "T1072BankTransaction"'.
+ * 
+ * It happens if I access the relation, save the record, and access
+ * the relation column (in this order).
+ * 
+ * UPDATE:
+ * There are three addition checks for the column value type that
+ * must be NULL and not an object which is not true after accessing
+ * the relation.
+ */
+class Doctrine_Ticket_1072_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData()
+    {
+    }
+
+    public function prepareTables()
+    {
+        $this->tables = array();
+        $this->tables[] = 'T1072BankTransaction';
+        $this->tables[] = 'T1072PaymentDetail';
+        parent::prepareTables();
+    }
+
+    public function testTicket()
+    {
+        $bt = new T1072BankTransaction();
+        $bt->name = 'Test Bank Transaction';
+        
+        // (additional check: value must be NULL)
+        $this->assertEqual(gettype($bt->payment_detail_id), gettype(null));
+        
+        // If I access this relation...
+        
+        if ($bt->T1072PaymentDetail) {
+        }
+        
+        // (additional check: value must still be NULL not an object)
+        // [romanb]: This is expected behavior currently. Accessing a related record will create
+        // a new one if there is none yet. This makes it possible to use syntax like:
+        // $record = new Record();
+        // $record->Related->name = 'foo'; // will implicitly create a new Related
+        // In addition the foreign key field is set to a reference to the new record (ugh..).
+        // No way to change this behavior at the moment for BC reasons.
+        $this->assertEqual(gettype($bt->payment_detail_id), gettype(null));
+        
+        // ...save...
+        // [romanb]: Related T1072PaymentDetail will not be saved because its not modified
+        // (isModified() == false)
+        $bt->save();
+        
+        try {
+            // ...and access the relation column it will throw
+            // an exception here but it shouldn't.
+            // [romanb]: This has been fixed now. $bt->payment_detail_id will be an empty
+            // object as before.
+            if ($bt->payment_detail_id) {
+            }
+            
+            // (additional check: value must still be NULL not an object)
+            // [romanb]: See above. This is an empty object now, same as before.
+            $this->assertEqual(gettype($bt->payment_detail_id), gettype(null));
+            
+            $this->pass();
+        } catch (Doctrine_Record_Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+    
+    
+    public function testTicket2()
+    {
+        $bt = new T1072BankTransaction();
+        $bt->name = 'Test Bank Transaction';
+
+        try {
+            // [romanb]: Accessing a related record will create
+            // a new one if there is none yet. This makes it possible to use syntax like:
+            // $record = new Record();
+            // $record->Related->name = 'foo'; // will implicitly create a new Related
+            $bt->T1072PaymentDetail->name = 'foo';
+
+            $this->assertEqual(gettype($bt->T1072PaymentDetail), 'object');
+            $this->assertEqual(gettype($bt->T1072PaymentDetail->name), 'string');
+            $this->assertEqual(gettype($bt->payment_detail_id), gettype(null));
+			
+            $bt->save();
+			
+            // After the object gets saved, the foreign key is finally set
+            $this->assertEqual($bt->payment_detail_id, 1);
+			
+            $this->pass();
+        } catch (Doctrine_Record_Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+}
+
+class T1072BankTransaction extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('t1072_bank_transaction');
+        $this->hasColumn('payment_detail_id', 'integer', null);
+        $this->hasColumn('name', 'string', 255, array('notnull' => true));
+        $this->option('charset', 'utf8');
+    }
+    
+    public function setUp()
+    {
+        parent::setUp();
+        $this->hasOne('T1072PaymentDetail', array('local' => 'payment_detail_id',
+                                                  'foreign' => 'id'));
+    }
+}
+
+class T1072PaymentDetail extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('t1072_payment_detail');
+        $this->hasColumn('name', 'string', 255, array('notnull' => true));
+        $this->option('charset', 'utf8');
+    }
+    
+    public function setUp()
+    {
+        parent::setUp();
+        $this->hasOne('T1072BankTransaction', array('local' => 'id',
+                                                    'foreign' => 'payment_detail_id'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1077TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1077TestCase.php
new file mode 100644
index 000000000..d25cc0b57
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1077TestCase.php
@@ -0,0 +1,149 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1077_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1077_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1077_User';
+        $this->tables[] = 'Ticket_1077_Phonenumber';
+        parent::prepareTables();
+    }
+
+    public function testAutomaticAccessorsAndMutators()
+    {
+        $orig = Doctrine_Manager::getInstance()->getAttribute(Doctrine_Core::ATTR_AUTO_ACCESSOR_OVERRIDE);
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_AUTO_ACCESSOR_OVERRIDE, true);
+        $user = new Ticket_1077_User();
+        $user->username = 'jwage';
+        $user->password = 'changeme';
+        $user->save();
+        $this->assertEqual($user->getPassword(), '4cb9c8a8048fd02294477fcb1a41191a');
+        $this->assertEqual($user->getUsername(), 'Username: jwage');
+        $this->assertEqual($user->username, $user->getUsername());
+
+        try {
+            $phonenumbers = $user->Phonenumbers;
+            $this->fail();
+        } catch (Exception $e) {
+            $this->assertEqual($e->getMessage(), 'Testing that getPhonenumbers() is invoked');
+        }
+
+        $numbers = new Doctrine_Collection('Phonenumber');
+        $user->Phonenumbers = $numbers;
+        
+        $this->assertIdentical($user->phonenumbersTest, $numbers);
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_AUTO_ACCESSOR_OVERRIDE, $orig);
+    }
+
+    public function testDefiningCustomAccessorsAndMutators()
+    {
+        $user = new Ticket_1077_User();
+        $user->username = 'jwage';
+        $user->password = 'changeme';
+        $user->hasAccessor('username', 'usernameAccessor');
+        $user->hasMutator('username', 'usernameMutator');
+        $username = 'test';
+        $user->usernameMutator($username);
+        $this->assertEqual($user->usernameAccessor(), $user->username);
+        $this->assertEqual($user->usernameAccessor(), $username);
+    }
+}
+
+class Ticket_1077_User extends Doctrine_Record
+{
+    public $phonenumbersTest = null;
+
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_1077_Phonenumber as Phonenumbers', array('local'   => 'id',
+                                                                        'foreign' => 'user_id'));
+    }
+
+    public function usernameAccessor()
+    {
+        return $this->_get('username');
+    }
+
+    public function usernameMutator($value)
+    {
+        $this->_set('username', $value);
+    }
+
+    public function getPhonenumbers()
+    {
+        throw new Exception('Testing that getPhonenumbers() is invoked');
+    }
+
+    public function setPhonenumbers($phonenumbers)
+    {
+        $this->phonenumbersTest = $phonenumbers;
+        return $this->_set('Phonenumbers', $phonenumbers);
+    }
+
+    public function getUsername($load = true)
+    {
+        return 'Username: ' . $this->_get('username', $load);
+    }
+
+    public function setPassword($password)
+    {
+        return $this->_set('password', md5($password));
+    }
+
+    public function getPassword($load = true)
+    {
+        return $this->_get('password', $load);
+    }
+}
+
+class Ticket_1077_Phonenumber extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('phonenumber', 'string', 55);
+        $this->hasColumn('user_id', 'integer');
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_1077_User as User', array('local'   => 'user_id',
+                                                        'foreign' => 'id'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1099TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1099TestCase.php
new file mode 100644
index 000000000..ef7447167
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1099TestCase.php
@@ -0,0 +1,57 @@
+<?php
+class Doctrine_Ticket_1099_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables = array();
+        $this->tables[] = 'T1099_Page';
+        $this->tables[] = 'T1099_SubPage';
+
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+        $page = new T1099_Page();
+        $page->type = 'page';
+        $tree = $page->getTable()->getTree();
+        $tree->createRoot($page);
+
+        $subPage = new T1099_SubPage();
+        $subPage->getNode()->insertAsLastChildOf($page);
+    }
+
+    public function testCAINestedSet()
+    {
+        $child = Doctrine_Query::create()
+           ->from('T1099_Page p')
+           ->where('p.type = \'subpage\'')
+           ->fetchOne();
+
+        $this->assertEqual('T1099_SubPage', get_class($child));
+        $this->assertNotEqual(false, $child->getNode()->getParent());
+    }
+}
+
+class T1099_Page extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('pages');
+        $this->hasColumn('id', 'integer', 15, array('autoincrement' => true, 'primary' => true, 'notnull' => true));
+        $this->hasColumn('type', 'string', 10);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('Doctrine_Template_NestedSet');
+        $this->setSubclasses(array(
+        'T1099_SubPage' => array('type' => 'subpage')
+        ));
+        parent::setUp();
+    }
+}
+
+class T1099_SubPage extends T1099_Page
+{
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1106TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1106TestCase.php
new file mode 100644
index 000000000..7468852f4
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1106TestCase.php
@@ -0,0 +1,83 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1106_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1106_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        parent::prepareTables();
+    }
+    
+    public function prepareData()
+    {
+        $user = new User();
+        $user->name = 'John';
+        $user->Group[0]->name = 'Original Group';
+        $user->save();
+        
+        $this->user_id = $user['id'];
+    }
+    
+    public function testAfterOriginalSave()
+    {
+        $user = Doctrine_Query::create()->from('User u, u.Group')->fetchOne();
+        $this->assertEqual($user->name, 'John');
+        $this->assertEqual($user->Group[0]->name, 'Original Group');
+    }
+    
+    public function testModifyRelatedRecord()
+    {
+        $user = Doctrine_Query::create()->from('User u, u.Group')->fetchOne();
+        
+        // Modify Record
+        $user->name = 'Stephen';
+        $user->Group[0]->name = 'New Group';
+        
+        // Test After change and before save
+        $this->assertEqual($user->name, 'Stephen');
+        $this->assertEqual($user->Group[0]->name, 'New Group');
+        
+        $user->save();
+        
+        // Test after save
+        $this->assertEqual($user->name, 'Stephen');
+        $this->assertEqual($user->Group[0]->name, 'New Group');
+    }
+    
+    public function testQueryAfterSave()
+    {
+        $user = Doctrine_Core::getTable('User')->find($this->user_id);
+        $this->assertEqual($user->name, 'Stephen');
+        $this->assertEqual($user->Group[0]->name, 'New Group');
+    }
+
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1113TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1113TestCase.php
new file mode 100644
index 000000000..efb8a9d85
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1113TestCase.php
@@ -0,0 +1,203 @@
+<?php
+class Doctrine_Ticket_1113_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData() 
+    { }
+    public function prepareTables() 
+    {
+        $this->tables = array('VIH_Model_Course', 'VIH_Model_Course_Period', 'VIH_Model_Course_SubjectGroup', 'VIH_Model_Subject', 'VIH_Model_Course_SubjectGroup_Subject', 'VIH_Model_Course_Registration', 'VIH_Model_Course_Registration_Subject');
+        
+        parent::prepareTables();
+    }
+
+    public function testSubjectsCanBeRetrievedWhenReopeningTheRegistrationEvenThoughNoSubjectsWasSavedInitally()
+    {
+        $course1 = new VIH_Model_Course();
+        $course1->navn = 'Course 1';
+        
+        $period1 = new VIH_Model_Course_Period();
+        $period1->name = 'Period 1';
+        $period1->Course = $course1;
+        $period1->save();
+        
+        $group1 = new VIH_Model_Course_SubjectGroup();
+        $group1->name = 'SubjectGroup 1';
+        $group1->Period = $period1;
+        
+        $subject1 = new VIH_Model_Subject();
+        $subject1->identifier = 'Subject 1';
+        
+        $subject2 = new VIH_Model_Subject();
+        $subject2->identifier = 'Subject 2';
+        
+        $group1->Subjects[] = $subject1;
+        $group1->Subjects[] = $subject2;
+        
+        $group1->save();
+                
+        $group1->Subjects[] = $subject1;
+        $group1->Subjects[] = $subject2;
+        $group1->save();
+        
+        $course1->SubjectGroups[] = $group1;
+        
+        $course1->save();
+                
+        // saved without Subjects
+        try {
+            $registrar = new VIH_Model_Course_Registration();
+            $registrar->Course = $course1;
+            // $registrar->Subjects; // if this is uncommented the test will pass
+            $registrar->save();
+        } catch (Doctrine_Record_Exception $e) {
+            $this->fail($e->getMessage());
+        }
+
+        $reopend = Doctrine_Core::getTable('VIH_Model_Course_Registration')->findOneById($registrar->id);
+
+        try {
+            $reopend->Subjects[] = $subject1;
+        } catch (Doctrine_Record_Exception $e) {
+            $this->fail($e->getMessage());
+        }
+
+        $reopend->save();
+      
+        try {
+            $subject = $reopend->Subjects[0];
+            $this->assertTrue(is_object($subject));
+            $this->assertEqual('VIH_Model_Subject', get_class($reopend->Subjects[0]));
+        } catch (Doctrine_Record_Exception $e) {
+            $this->fail($e->getMessage());
+        }
+        
+    }
+}
+
+class VIH_Model_Subject extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('identifier', 'string', 255);
+        $this->hasColumn('navn', 'string', 255);
+        $this->hasColumn('active', 'boolean');
+    }
+
+    public function setUp()
+    {
+        $this->hasMany(
+            'VIH_Model_Course_SubjectGroup as SubjectGroups', 
+            array(
+                'refClass' => 'VIH_Model_Course_SubjectGroup_Subject',
+                'local'    => 'subject_id',
+                'foreign'  => 'subject_group_id'
+            )
+        );
+
+        $this->hasMany(
+            'VIH_Model_Course_Registration as Registrations',
+            array(
+                'refClass' => 'VIH_Model_Course_Registration_Subject',
+                'local'    => 'subject_id',
+                'foreign'  => 'registration_id'
+            )
+        );
+    }
+}
+
+class VIH_Model_Course extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('langtkursus');
+        $this->hasColumn('navn', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('VIH_Model_Course_Period as Periods', array('local' => 'id',
+                                                                   'foreign' => 'course_id'));
+        $this->hasMany('VIH_Model_Course_SubjectGroup as SubjectGroups', array('local' => 'id',
+                                                                               'foreign' => 'course_id'));
+    }
+}
+
+class VIH_Model_Course_Period extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+        $this->hasColumn('course_id', 'integer');
+        $this->hasColumn('date_start', 'date');
+        $this->hasColumn('date_end', 'date');
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('VIH_Model_Course as Course', array('local' => 'course_id', 'foreign' => 'id'));
+    }
+
+}
+
+class VIH_Model_Course_Registration extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('langtkursus_tilmelding');
+        $this->hasColumn('vaerelse', 'integer');
+        $this->hasColumn('kursus_id', 'integer');
+        $this->hasColumn('adresse_id', 'integer');
+        $this->hasColumn('kontakt_adresse_id', 'integer');
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('VIH_Model_Course as Course', array('local'   => 'kursus_id',
+                                                          'foreign' => 'id'));
+
+        $this->hasMany('VIH_Model_Subject as Subjects', array('refClass' => 'VIH_Model_Course_Registration_Subject',
+                                                             'local'    => 'registration_id',
+                                                             'foreign'  => 'subject_id'));
+    }
+}
+
+class VIH_Model_Course_SubjectGroup extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+        $this->hasColumn('period_id', 'integer');
+        $this->hasColumn('course_id', 'integer');
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('VIH_Model_Course_Period as Period', array('local'   => 'period_id',
+                                                                 'foreign' => 'id'));
+
+        $this->hasOne('VIH_Model_Course as Course', array('local'   => 'course_id',
+                                                          'foreign' => 'id'));
+
+        $this->hasMany('VIH_Model_Subject as Subjects', array('refClass' => 'VIH_Model_Course_SubjectGroup_Subject',
+                                                             'local'    => 'subject_group_id',
+                                                             'foreign'  => 'subject_id'));
+    }
+}
+
+class VIH_Model_Course_SubjectGroup_Subject extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('subject_group_id', 'integer', null, array('primary' => true));
+        $this->hasColumn('subject_id', 'integer', null, array('primary' => true));
+    }
+}
+
+class VIH_Model_Course_Registration_Subject extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('registration_id', 'integer', null, array('primary' => true));
+        $this->hasColumn('subject_id', 'integer', null, array('primary' => true));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1116TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1116TestCase.php
new file mode 100644
index 000000000..e91506ec7
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1116TestCase.php
@@ -0,0 +1,90 @@
+<?php
+
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1116_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1116_TestCase extends Doctrine_UnitTestCase 
+{
+	public function setUp()
+	{
+		//switch to a real db to trigger the Exception
+		$this->dbh = new Doctrine_Adapter_Mock('mysql');
+		//$this->dbh = new PDO("mysql:host=localhost;dbname=testing", 'root', 'password');
+
+		$this->conn = Doctrine_Manager::getInstance()->openConnection($this->dbh);
+		$this->conn->export->exportClasses(array('Ticket_1116_User'));
+	}
+
+
+	public function testTicket()
+	{
+	    Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+		$q = new Doctrine_Query();
+		$q->select('s.*')
+		  ->from('Ticket_1116_User s')
+		  ->where('s.username = ?', array('test'));
+
+		// to see the error switch dbh to a real db, the next line will trigger the error
+		$test = $q->fetchOne();  //will only fail with "real" mysql 
+		$this->assertFalse($test);
+
+		$sql    = $q->getSqlQuery(); // just getSql()?!?! and it works ? the params are ok after this call  
+		$params = $q->getFlattenedParams();
+		$this->assertEqual(count($params), 1); // now we have array('test',null) very strange ..... 
+
+		$this->assertEqual($sql, "SELECT u.id AS u__id, u.username AS u__username, u.deleted_at AS u__deleted_at FROM user u WHERE (u.username = ? AND (u.deleted_at IS NULL))");
+		$this->assertEqual($params, array('test'));
+
+		//now also this works! (always works witch mock only fails with mysql)
+		$test = $q->fetchOne();
+		$this->assertFalse($test);
+		Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+	}
+}
+
+
+class Ticket_1116_User extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->setTableName('user');
+		$this->hasColumn('id', 'integer', 4, array('primary' => true, 'autoincrement' => true));
+		$this->hasColumn('username', 'string', 255);
+	}
+
+
+	public function setUp()
+	{
+		parent::setUp();
+		$softdelete0 = new Doctrine_Template_SoftDelete();
+		$this->actAs($softdelete0);
+	}
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1118TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1118TestCase.php
new file mode 100644
index 000000000..44aa90c50
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1118TestCase.php
@@ -0,0 +1,73 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1118_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1118_TestCase extends Doctrine_UnitTestCase 
+{
+    // Test that when a foreign key is detected that it sets the foreign key to the same type and length
+    // of the related table primary key
+    public function testTest()
+    {
+        $yml = <<<END
+---
+detect_relations: true
+Ticket_1118_User:
+  columns:
+    username: string(255)
+    password: string(255)
+    ticket__1118__profile_id: string
+
+Ticket_1118_Profile:
+  columns:
+    id:
+      type: integer(4)
+      autoincrement: true
+      primary: true
+    name: string(255)
+END;
+        try {
+            file_put_contents('test.yml', $yml);
+
+            $import = new Doctrine_Import_Schema();
+            $array = $import->buildSchema('test.yml', 'yml');
+            // Test that ticket__1118__profile_id is changed to to be integer(4) since the primary key of 
+            // the relationship is set to that
+            $this->assertEqual($array['Ticket_1118_User']['columns']['ticket__1118__profile_id']['type'], 'integer');
+            $this->assertEqual($array['Ticket_1118_User']['columns']['ticket__1118__profile_id']['length'], '4');
+
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail();
+        }
+
+        unlink('test.yml');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1121TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1121TestCase.php
new file mode 100644
index 000000000..32f59a459
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1121TestCase.php
@@ -0,0 +1,90 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1121_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1121_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1121_User';
+        $this->tables[] = 'Ticket_1121_Profile';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+        $q = Doctrine_Query::create()
+                ->from('Ticket_1121_User u')
+                // UserProfile has SoftDelete behavior but because it is aliased as Profile, it tries to 
+                // call the dql callbacks for the query on a class named Profile instead of UserProfile
+                // Code responsible for this is in Doctrine_Query_Abstract::_preQuery()
+                ->leftJoin('u.Profile p');
+
+        // The condition and params for UserProfile SoftDelete and are not added properly
+        $this->assertEqual($q->getSqlQuery(), 'SELECT t.id AS t__id, t.username AS t__username, t.password AS t__password, t.profile_id AS t__profile_id, t.deleted_at AS t__deleted_at, t2.id AS t2__id, t2.name AS t2__name, t2.about AS t2__about, t2.deleted_at AS t2__deleted_at FROM ticket_1121__user t LEFT JOIN ticket_1121__profile t2 ON t.profile_id = t2.id AND (t2.deleted_at IS NULL) WHERE (t.deleted_at IS NULL)');
+        $this->assertEqual(count($q->getFlattenedParams()), 0);
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+    }
+}
+
+class Ticket_1121_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+        $this->hasColumn('profile_id', 'integer');
+    }
+
+    public function setUp()
+    {
+        $this->actAs('SoftDelete');
+        $this->hasOne('Ticket_1121_Profile as Profile', array('local'   => 'profile_id',
+                                                              'foreign' => 'id'));
+    }
+}
+
+class Ticket_1121_Profile extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+        $this->hasColumn('about', 'string', 2000);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('SoftDelete');
+        $this->hasOne('Ticket_1121_User as User', array('local'   => 'id',
+                                                        'foreign' => 'profile_id'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1123TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1123TestCase.php
new file mode 100644
index 000000000..a481f4c0e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1123TestCase.php
@@ -0,0 +1,81 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1123_TestCase
+ *
+ * @package     Doctrine
+ * @author      Jfung
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1123_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testInit()
+    {
+        $this->dbh = new Doctrine_Adapter_Mock('mysql');
+        $this->conn = Doctrine_Manager::getInstance()->openConnection($this->dbh);
+    }
+
+    public function testExportSql()
+    {
+        $sql = $this->conn->export->exportClassesSql(array('Ticket_1123_User', 'Ticket_1123_UserReference'));
+        $this->assertEqual(count($sql), 4);
+        $this->assertEqual($sql[0], 'CREATE TABLE ticket_1123__user_reference (user1 BIGINT, user2 BIGINT, PRIMARY KEY(user1, user2)) ENGINE = INNODB');
+        $this->assertEqual($sql[1], 'CREATE TABLE ticket_1123__user (id BIGINT AUTO_INCREMENT, name VARCHAR(30), PRIMARY KEY(id)) ENGINE = INNODB');
+        $this->assertEqual($sql[2], 'ALTER TABLE ticket_1123__user_reference ADD CONSTRAINT ticket_1123__user_reference_user2_ticket_1123__user_id FOREIGN KEY (user2) REFERENCES ticket_1123__user(id) ON DELETE CASCADE');
+        $this->assertEqual($sql[3], 'ALTER TABLE ticket_1123__user_reference ADD CONSTRAINT ticket_1123__user_reference_user1_ticket_1123__user_id FOREIGN KEY (user1) REFERENCES ticket_1123__user(id) ON DELETE CASCADE');
+    }
+}
+
+class Ticket_1123_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 30);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_1123_User as Friend', array('local'    => 'user1',
+                                                           'foreign'  => 'user2',
+                                                           'refClass' => 'Ticket_1123_UserReference',
+                                                           'equal'    => true));
+    }
+}
+
+class Ticket_1123_UserReference extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('user1', 'integer', null, array('primary' => true));
+        $this->hasColumn('user2', 'integer', null, array('primary' => true));
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_1123_User as User1', array('local' => 'user1', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+        $this->hasOne('Ticket_1123_User as User2', array('local' => 'user2', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1124TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1124TestCase.php
new file mode 100644
index 000000000..1d269e3d5
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1124TestCase.php
@@ -0,0 +1,171 @@
+<?php
+
+class Doctrine_Ticket_1124_TestCase extends Doctrine_UnitTestCase
+{
+	const NO_ALIAS			= 5;
+	const SOMETHING_ELSE	= 8;
+	const TABLEIZED_ALIAS	= 27;
+	const CLASSIFIED_ALIAS  = 29;
+	const ANOTHER_ALIAS     = 30;
+
+    public function prepareTables()
+    {
+        $this->tables = array();
+        $this->tables[] = 'Ticket_1124_Record';
+
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+        $record = new Ticket_1124_Record();
+        $record->no_alias		 = self::NO_ALIAS;
+        $record->somethingElse	 = self::SOMETHING_ELSE;
+        $record->tableizedAlias	 = self::TABLEIZED_ALIAS;
+        $record->ClassifiedAlias = self::CLASSIFIED_ALIAS;
+        $record->another_Alias   = self::ANOTHER_ALIAS;
+        $record->save();
+    }
+
+	private function assertIsSampleRecord($record)
+	{
+    	$this->assertNotNull($record);
+    	$this->assertEqual($record->no_alias, self::NO_ALIAS);
+    	$this->assertEqual($record->somethingElse, self::SOMETHING_ELSE);
+    	$this->assertEqual($record->tableizedAlias, self::TABLEIZED_ALIAS);
+    	$this->assertEqual($record->ClassifiedAlias, self::CLASSIFIED_ALIAS);
+	}
+
+    public function testFindByUnaliasedColumnWorks()
+    {
+        try {
+    	    $r = Doctrine_Core::getTable('Ticket_1124_Record')->findOneByNoAlias(self::NO_ALIAS);
+    	    $this->assertIsSampleRecord($r);
+    	    $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+
+    public function testFindByDisjointlyAliasedColumnWorks()
+    {
+        try {
+        	$r = Doctrine_Core::getTable('Ticket_1124_Record')->findOneBysomethingElse(self::SOMETHING_ELSE);	// test currently fails
+    	
+        	$this->assertIsSampleRecord($r);
+    	    $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+
+    public function testFindByDisjointlyAliasedColumnWorks2()
+    {
+        try {
+        	$r = Doctrine_Core::getTable('Ticket_1124_Record')->findOneBydisjoint_alias(self::SOMETHING_ELSE);	// test currently fails
+    	
+        	$this->assertIsSampleRecord($r);
+    	    $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+
+    public function testFindByDisjointlyAliasedColumnWorks3()
+    {
+        try {
+        	$r = Doctrine_Core::getTable('Ticket_1124_Record')->findOneByDisjointAlias(self::SOMETHING_ELSE);	// test currently fails
+    	
+        	$this->assertIsSampleRecord($r);
+    	    $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+
+    public function testFindByTableizedAliasedColumnWorks()
+    {
+        try {
+        	$r = Doctrine_Core::getTable('Ticket_1124_Record')->findOneBytableizedAlias(self::TABLEIZED_ALIAS);	// test currently fails
+    	
+        	$this->assertIsSampleRecord($r);
+    	    $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+
+    public function testFindByTableizedAliasedColumnWorks2()
+    {
+        try {
+        	$r = Doctrine_Core::getTable('Ticket_1124_Record')->findOneBytableized_alias(self::TABLEIZED_ALIAS);	// test currently fails
+    	
+        	$this->assertIsSampleRecord($r);
+    	    $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+
+    public function testFindByClassifiedAliasedColumnWorks()
+    {
+        try {
+        	$r = Doctrine_Core::getTable('Ticket_1124_Record')->findOneByClassifiedAlias(self::CLASSIFIED_ALIAS);	// test currently fails
+    	
+        	$this->assertIsSampleRecord($r);
+    	    $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+
+    public function testFindByAnotherAliasedColumnWorks()
+    {
+        try {
+        	$r = Doctrine_Core::getTable('Ticket_1124_Record')->findOneByTest(self::ANOTHER_ALIAS);	// test currently fails
+    	
+        	$this->assertIsSampleRecord($r);
+    	    $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+
+    public function testFindByAnotherAliasedColumnWorks2()
+    {
+        try {
+        	$r = Doctrine_Core::getTable('Ticket_1124_Record')->findOneBytest(self::ANOTHER_ALIAS);	// test currently fails
+    	
+        	$this->assertIsSampleRecord($r);
+    	    $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+
+    public function testFindByAnotherAliasedColumnWorks3()
+    {
+        try {
+        	$r = Doctrine_Core::getTable('Ticket_1124_Record')->findOneByanother_Alias(self::ANOTHER_ALIAS);	// test currently fails
+    	
+        	$this->assertIsSampleRecord($r);
+    	    $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+}
+
+class Ticket_1124_Record extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('emb1_record');
+        $this->hasColumn('id', 'integer', 15, array('autoincrement' => true, 'unsigned' => true, 'primary' => true, 'notnull' => true));
+        $this->hasColumn('no_alias', 'integer', 4);	// column with no aliasing
+        $this->hasColumn('disjoint_alias as somethingElse', 'integer', 4);	// column whose alias has no relation to the column itself
+        $this->hasColumn('tableized_alias as tableizedAlias', 'integer', 4);	// column whose alias' tableized form is equivalent to the column name itself
+        $this->hasColumn('w00t as ClassifiedAlias', 'integer', 4);
+        $this->hasColumn('test as another_Alias', 'integer', 4);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1125TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1125TestCase.php
new file mode 100644
index 000000000..1afc04928
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1125TestCase.php
@@ -0,0 +1,51 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1125_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1125_TestCase extends Doctrine_UnitTestCase 
+{
+    public function setUp()
+    {
+        $this->dbh = new Doctrine_Adapter_Mock('mysql');
+        $this->conn = Doctrine_Manager::getInstance()->openConnection($this->dbh);
+    }
+
+    public function testTest()
+    {
+        $fields = array('id'    => array('primary'         => true,
+                                         'autoincrement'   => true,
+                                         'type'            => 'integer',
+                                         'length'          => 4),
+                        'name'  => array('type'            => 'string'));
+        $this->conn->export->createTable('test', $fields);
+        $this->assertEqual($this->dbh->pop(), 'CREATE TABLE test (id INT AUTO_INCREMENT, name TEXT, PRIMARY KEY(id)) ENGINE = INNODB');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1131TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1131TestCase.php
new file mode 100644
index 000000000..2a90ebcb3
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1131TestCase.php
@@ -0,0 +1,188 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1280_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1131_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        //$this->tables = array();
+        $this->tables[] = 'Ticket_1131_User';
+        $this->tables[] = 'Ticket_1131_Group';
+        $this->tables[] = 'Ticket_1131_Role';
+        parent::prepareTables();
+    }
+    
+    
+    public function prepareData()
+    {
+        parent::prepareData();
+        
+        $role = new Ticket_1131_Role();
+        $role->name = 'Role One';
+        $role->save();
+        $this->role_one = $role->id;
+        $role->free();
+        
+        $role = new Ticket_1131_Role();
+        $role->name = 'Role Two';
+        $role->save();
+        $this->role_two = $role->id;
+        $role->free();
+        
+        $group = new Ticket_1131_Group();
+        $group->role_id = $this->role_one;
+        $group->name = 'Core Dev';
+        $group->save();
+
+        $user = new Ticket_1131_User();
+        $user->Group = $group;
+        $user->role_id = $this->role_two;
+        $user->name = 'jwage';
+        $user->save();
+
+        $group->free();
+        $user->free();
+    }
+
+    public function testTicket()
+    {
+        $user = Doctrine_Query::create()
+            ->from('Ticket_1131_User u')
+            ->where('u.id = ?')->fetchOne(array(1));
+
+        $this->assertEqual($user->Group->id, 1);
+        $this->assertFalse($user->get('group_id') instanceof Doctrine_Record);
+    }
+    
+    public function testTicketWithOverloadingAndTwoQueries()
+    {
+        $orig = Doctrine_Manager::getInstance()->getAttribute(Doctrine_Core::ATTR_AUTO_ACCESSOR_OVERRIDE);
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_AUTO_ACCESSOR_OVERRIDE, true);
+        
+        $user = Doctrine_Query::create()
+            ->from('Ticket_1131_User u')
+            ->where('u.id = ?')->fetchOne(array(1));
+        
+        $user = Doctrine_Query::create()
+            ->from('Ticket_1131_UserWithOverloading u')
+            ->leftJoin('u.Group g')
+            ->leftJoin('u.Role r')
+            ->addWhere('u.id = ?')->fetchOne(array(1));
+        
+        $this->assertEqual($user->Role->id, 1);
+        $this->assertFalse($user->role_id instanceof Doctrine_Record);
+        
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_AUTO_ACCESSOR_OVERRIDE, $orig);
+    }
+}
+
+class Ticket_1131_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('group_id', 'integer', 20, array(
+            'notnull' => false, 'default' => null
+        ));
+        $this->hasColumn('role_id', 'integer', 20, array(
+            'notnull' => false, 'default' => null
+        ));
+        $this->hasColumn('name', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_1131_Group as Group', array(
+            'local' => 'group_id',
+            'foreign' => 'id'
+        ));
+        
+        $this->hasOne('Ticket_1131_Role as Role', array(
+            'local' => 'role_id',
+            'foreign' => 'id'));
+    }
+}
+
+class Ticket_1131_UserWithOverloading extends Ticket_1131_User
+{
+    public function getRole()
+    {
+        return $this->Group->Role;
+    }
+    
+    public function getRoleId()
+    {
+        return $this->Group->role_id;
+    }
+}
+
+class Ticket_1131_Group extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('role_id', 'integer', 20, array(
+            'notnull' => false, 'default' => null
+        ));
+        $this->hasColumn('name', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_1131_Role as Role', array(
+            'local' => 'role_id',
+            'foreign' => 'id'));
+        
+        $this->hasMany('Ticket_1131_User as Users', array(
+            'local' => 'id',
+            'foreign' => 'group_id'
+        ));
+    }
+}
+
+class Ticket_1131_Role extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_1131_User as Users', array(
+            'local' => 'id',
+            'foreign' => 'role_id'
+        ));
+        $this->hasMany('Ticket_1131_Group as Groups', array(
+            'local' => 'id',
+            'foreign' => 'role_id'
+        ));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1133TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1133TestCase.php
new file mode 100644
index 000000000..ddcf50e28
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1133TestCase.php
@@ -0,0 +1,97 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1133_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1133_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1133_Foo';
+        $this->tables[] = 'Ticket_1133_Bar';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $foo = new Ticket_1133_Foo();
+        $foo->name = 'test';
+        $foo->Bar->name = 'test2';
+        $foo->save();
+
+        $q = Doctrine_Query::create()
+                ->from('Ticket_1133_Foo f')
+                ->innerJoin('f.Bar b ON b.id = ?', $foo->Bar->id)
+                ->addWhere('f.name = ?', 'test');
+
+        $this->assertEqual($q->count(), 1);
+    }
+
+    public function testTest2()
+    {
+        $foo = new Ticket_1133_Foo();
+        $foo->name = 'test';
+        $foo->Bar->name = 'test2';
+        $foo->save();
+
+        $q = Doctrine_Query::create()
+                ->from('Ticket_1133_Foo f')
+                ->innerJoin('f.Bar b')
+                ->addWhere('b.name = ?', 'test2')
+                ->limit(1)
+                ->offset(1);
+
+        $this->assertEqual($q->count(), 2);
+        $this->assertEqual($q->execute()->count(), 1);
+    }
+
+}
+
+class Ticket_1133_Foo extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+        $this->hasColumn('bar_id', 'integer');
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_1133_Bar as Bar', array('local' => 'bar_id', 'foreign' => 'id'));
+    }
+}
+
+class Ticket_1133_Bar extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1134TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1134TestCase.php
new file mode 100644
index 000000000..87f2ddcc6
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1134TestCase.php
@@ -0,0 +1,76 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1134_TestCase
+ *
+ * @package     Doctrine
+ * @author      Jeff Hansen <jhansen@hivalley.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1134_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1134_User';
+        parent::prepareTables();
+    }
+
+
+    public function prepareData()
+    {
+        $user = new Ticket_1134_User();
+		$user->is_pimp = TRUE;
+        $user->save();
+    }
+
+
+    public function testAfterOriginalSave()
+    {
+        $user = Doctrine_Query::create()->from('Ticket_1134_User u')->fetchOne();
+        $this->assertEqual($user->is_pimp, TRUE);
+    
+    }
+
+    public function testAfterModification()
+    {
+        $user = Doctrine_Query::create()->from('Ticket_1134_User u')->fetchOne();
+		$user->is_pimp = "1";
+		$this->assertEqual($user->getModified(), FALSE);    
+    }	
+	
+}
+
+class Ticket_1134_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('is_pimp', 'boolean', TRUE);
+    }
+
+    public function setUp()
+    {
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1160TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1160TestCase.php
new file mode 100644
index 000000000..858cf7560
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1160TestCase.php
@@ -0,0 +1,53 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1160_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1160_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $this->dbh = new Doctrine_Adapter_Mock('mysql');
+        $this->conn = $this->manager->openConnection($this->dbh);
+
+        $sql = $this->conn->export->exportClassesSql(array('Ticket_1160_Test'));
+        $this->assertEqual($sql[0], 'CREATE TABLE ticket_1160__test (id BIGINT AUTO_INCREMENT, name VARCHAR(255), PRIMARY KEY(id)) COLLATE latin1_german2_ci ENGINE = MYISAM');
+    }
+}
+
+class Ticket_1160_Test extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+        $this->option('type', 'MYISAM');
+        $this->option('collate', 'latin1_german2_ci');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1175TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1175TestCase.php
new file mode 100644
index 000000000..10a47e51c
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1175TestCase.php
@@ -0,0 +1,169 @@
+<?php
+/*
+ * Created on Jun 26, 2008
+ *
+ * To change the template for this generated file go to
+ * Window - Preferences - PHPeclipse - PHP - Code Templates
+ */
+
+class Doctrine_Ticket_1175_TestCase extends Doctrine_UnitTestCase
+{
+	public function prepareTables()
+    {
+        $this->tables[] = 'gImage';
+
+        $this->tables[] = 'gUser';
+        $this->tables[] = 'gUserImage';
+        $this->tables[] = 'gUserFile';
+
+        $this->tables[] = 'gBlog';
+        $this->tables[] = 'gBlogImage';
+        $this->tables[] = 'gBlogFile';
+
+        parent::prepareTables();
+    }
+
+    public function testLeftJoinToInheritanceChildTable()
+    {
+        $u = new gUser();
+        $u->first_name = 'Some User';
+
+        $img = new gUserImage();
+        $img->filename = 'user image 1';
+        $u->Images[] = $img;
+        
+        $img = new gUserImage();
+        $img->filename = 'user image 2';
+        $u->Images[] = $img;
+        $u->save();
+
+        $b = new gBlog();
+        $b->title = 'First Blog';
+
+        $img = new gBlogImage();
+        $img->filename = 'blog image 1';
+        $b->Images[] = $img;
+
+        $img = new gBlogFile();
+        $img->filename = 'blog file 1';
+        $b->Files[] = $img;
+
+        $b->save();
+
+        $q = Doctrine_Query::create() 
+                    ->from('gUser u') 
+                    ->leftJoin('u.Images i') 
+                    ->leftJoin('u.Files f') 
+                    ->where('u.id = ?', array(1)); 
+   
+        $this->assertEqual($q->getSqlQuery(), 'SELECT g.id AS g__id, g.first_name AS g__first_name, g.last_name AS g__last_name, g2.id AS g2__id, g2.owner_id AS g2__owner_id, g2.filename AS g2__filename, g2.otype AS g2__otype, g3.id AS g3__id, g3.owner_id AS g3__owner_id, g3.filename AS g3__filename, g3.otype AS g3__otype FROM g_user g LEFT JOIN g_image g2 ON g.id = g2.owner_id AND g2.otype = 1 LEFT JOIN g_file g3 ON g.id = g3.owner_id AND g3.otype = 1 WHERE (g.id = ?)'); 
+     
+        $u = $q->fetchOne(); 
+
+        $this->assertTrue( is_object($u) );
+        if (is_object($u)) {
+            $this->assertEqual(count($u->Images),2);
+        } else {
+            $this->fail();
+        }
+    }
+}
+
+class gImage extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', 4, array('primary' => true, 'autoincrement' => true));
+        $this->hasColumn('owner_id', 'integer', 4);
+        $this->hasColumn('filename', 'string', 64);
+        $this->hasColumn('otype','integer',4);
+        $this->setAttribute(Doctrine_Core::ATTR_EXPORT, Doctrine_Core::EXPORT_ALL ^ Doctrine_Core::EXPORT_CONSTRAINTS);
+
+        $this->setSubClasses(array('gUserImage' => array('otype' => 1),'gBlogImage' => array('otype' => 2)));
+    }
+}
+
+class gUserImage extends gImage
+{
+    public function setUp()
+    {
+        parent::setUp();
+        $this->hasOne('gUser as User', array('local' => 'owner_id','foreign' => 'id'));
+    }
+}
+
+class gBlogImage extends gImage
+{
+    public function setUp()
+    {
+        parent::setUp();
+        $this->hasOne('gBlog as Blog', array('local' => 'owner_id','foreign' => 'id'));
+    }
+	
+}
+
+class gFile extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', 4, array('primary' => true, 'autoincrement' => true));
+        $this->hasColumn('owner_id', 'integer', 4);
+        $this->hasColumn('filename', 'string', 64);
+        $this->hasColumn('otype','integer',4);
+        $this->setAttribute(Doctrine_Core::ATTR_EXPORT, Doctrine_Core::EXPORT_ALL ^ Doctrine_Core::EXPORT_CONSTRAINTS);
+
+        $this->setSubClasses(array('gUserFile' => array('otype' => 1),'gBlogFile' => array('otype' => 2)));
+    }
+}
+
+class gUserFile extends gFile
+{
+    public function setUp()
+    {
+        parent::setUp();
+        $this->hasOne('gUser as User', array('local' => 'owner_id','foreign' => 'id'));
+    }
+}
+
+class gBlogFile extends gFile
+{
+    public function setUp()
+    {
+        parent::setUp();
+        $this->hasOne('gBlog as Blog', array('local' => 'owner_id','foreign' => 'id'));
+    }
+}
+
+class gBlog extends Doctrine_Record
+{
+	public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', 4, array('primary' => true, 'autoincrement' => true));
+        $this->hasColumn('title', 'string', 128);
+    }
+
+    public function setUp()
+    {
+        parent::setUp();
+        $this->hasMany('gBlogImage as Images', array('local' => 'id','foreign' => 'owner_id'));
+        $this->hasMany('gBlogFile as Files', array('local' => 'id','foreign' => 'owner_id'));
+    }
+
+}
+
+class gUser extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', 4, array('primary' => true, 'autoincrement' => true));
+        $this->hasColumn('first_name', 'string', 128);
+        $this->hasColumn('last_name', 'string', 128);
+    }    
+
+    public function setUp()
+    {
+        parent::setUp();
+        $this->hasMany('gUserImage as Images', array('local' => 'id','foreign' => 'owner_id'));
+        $this->hasMany('gUserFile as Files', array('local' => 'id','foreign' => 'owner_id'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1192TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1192TestCase.php
new file mode 100644
index 000000000..303f12a41
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1192TestCase.php
@@ -0,0 +1,80 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1192_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1192_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1192_CPK';
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+        $test1 = new Ticket_1192_CPK();
+        $test1->user_id = 1;
+        $test1->name = 'Test 1';
+        $test1->save();
+
+        $test2 = new Ticket_1192_CPK();
+        $test2->user_id = 2;
+        $test2->name = 'Test 2';
+        $test2->save();
+
+        $test3 = new Ticket_1192_CPK();
+        $test3->user_id = 2;
+        $test3->name = 'Test 3';
+        $test3->save();
+    }
+
+    public function testTest()
+    {
+        $q = Doctrine_Query::create()
+                ->from('Ticket_1192_CPK t')
+                ->groupBy('t.user_id');
+
+        $this->assertEqual($q->getCountSqlQuery(), 'SELECT COUNT(*) AS num_results FROM ticket_1192__c_p_k t GROUP BY t.user_id');
+        $count = $q->count();
+        $this->assertEqual($count, 2);
+        $this->assertEqual($count, $q->execute()->count());
+    }
+}
+
+class Ticket_1192_CPK extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+    $this->hasColumn('id', 'integer', 4, array('primary' => true, 'autoincrement' => true));
+    $this->hasColumn('user_id', 'integer', 4, array('primary' => true));
+    $this->hasColumn('name', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1195TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1195TestCase.php
new file mode 100644
index 000000000..ef77112bb
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1195TestCase.php
@@ -0,0 +1,127 @@
+<?php
+/*
+ * Created on Jul 01, 2008
+ *
+ * by Stefan Klug ( stefan.klug (at) gmail.com )
+ */
+
+class Doctrine_Ticket_1195_TestCase extends Doctrine_UnitTestCase
+{
+	public function prepareTables()
+    {
+    	$this->tables = array();
+    	$this->tables[] = 'T1195_Item';
+    	$this->tables[] = 'T1195_Ref';
+
+    	parent :: prepareTables();
+    }
+
+    public function prepareData()
+    {
+        $item = new T1195_Item();
+        $item->col1 = "a";
+        $item->col2 = "a";
+        $item->save();
+
+        $item = new T1195_Item();
+        $item->col1 = "a";
+        $item->col2 = "b";
+        $item->save();
+
+        $item = new T1195_Item();
+        $item->col1 = "b";
+        $item->col2 = "a";
+        $item->save();
+
+        $item = new T1195_Item();
+        $item->col1 = "b";
+        $item->col2 = "b";
+        $item->save();
+
+        $ref = new T1195_Ref();
+        $ref->Item = $item;
+        $ref->save();
+
+        $ref = new T1195_Ref();
+        $ref->Item = $item;
+        $ref->save();
+
+    }
+
+    public function testRawSQLaddWhere()
+    {
+    	//this checks for an error in parseDqlQueryPart
+
+    	$query = new Doctrine_RawSql();
+        $q = $query->select('{i.*}')
+				->addComponent('i', 'T1195_Item i')
+				->from('items i')
+				->addWhere('i.col1 = ?','a')
+				->addWhere('i.col2 = ?','a');
+
+		$res = $q->execute();
+
+        $this->assertEqual($res->count(), 1);
+    }
+
+    public function testRawSQLDistinct()
+    {
+    	$q = new Doctrine_RawSql();
+        $q = $q->select('{i.*}')
+				->addComponent('i', 'T1195_Item i')
+				->from('ref r')
+				->leftJoin('items i ON r.item_id=i.id');
+
+
+		$res = $q->execute(array(),Doctrine_Core::HYDRATE_ARRAY);
+		$this->assertEqual(sizeof($res), 2);
+
+		$q->distinct();
+		$res = $q->execute(array(),Doctrine_Core::HYDRATE_ARRAY);
+		$this->assertEqual(sizeof($res), 1);
+    }
+
+	public function testRawSQLCount()
+    {
+    	$q = new Doctrine_RawSql();
+        $q = $q->select('{i.*}')
+				->addComponent('i', 'T1195_Item i')
+				->from('items i');
+
+		if ( !method_exists( $q, 'count' ))
+		{
+			$this->fail("The query doesn't have a count() method");
+			return;
+		}
+
+		$res = $q->count();
+		$this->assertEqual($res, 4);
+
+    }
+}
+
+class T1195_Item extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+       	$this->setTableName('items');
+        $this->hasColumn('id', 'integer', null, array('autoincrement' => true, 'primary' => true, 'notnull' => true));
+        $this->hasColumn('col1', 'string', 10);
+        $this->hasColumn('col2', 'string', 10);
+    }
+}
+
+class T1195_Ref extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+       	$this->setTableName('ref');
+        $this->hasColumn('id', 'integer', null, array('autoincrement' => true, 'primary' => true, 'notnull' => true));
+        $this->hasColumn('item_id', 'integer', null);
+    }
+
+    public function setUp()
+    {
+    	$this->hasOne('T1195_Item as Item', array('local' => 'item_id', 'foreign' => 'id'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1205TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1205TestCase.php
new file mode 100644
index 000000000..775870f8f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1205TestCase.php
@@ -0,0 +1,80 @@
+<?php
+class Doctrine_Ticket_1205_TestCase extends Doctrine_UnitTestCase
+{        
+    public function prepareData()
+    { 
+        $user = new Ticket1205TestUser();
+        $user->id = 1;
+        $user->first_name = 'Slick';
+        $user->last_name = 'Rick';
+        $user->save();
+  
+        $address = new Ticket1205TestAddress();
+        $address->id = 1;
+        $address->user_id = 1;
+        $address->city = 'Anywhere';
+        $address->save();    
+    }    
+    
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket1205TestUser';
+        $this->tables[] = 'Ticket1205TestAddress';
+        parent::prepareTables();
+    }    
+    
+    public function testTicket()
+    {
+        try {
+          // Each Address has 1 User
+          $q = Doctrine_Query::create()
+                ->from('Ticket1205TestAddress a')
+                ->innerjoin('a.User u')
+                ->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+          $this->fail();
+        } catch (Exception $e) {
+          $this->pass();
+        }
+    }
+}
+
+class Ticket1205HydrationListener extends Doctrine_Record_Listener
+{
+    public function postHydrate(Doctrine_Event $event)
+    {
+        throw new Exception('This is called so we are successfull!');
+    }
+}
+
+class Ticket1205TestUser extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('ticket1205_user');
+    $this->hasColumn('first_name', 'string', 31);
+    $this->hasColumn('last_name', 'string', 31);
+  }
+
+  public function setUp()
+  {
+    $this->addListener(new Ticket1205HydrationListener());
+    $this->hasMany('Ticket1205TestAddress as Addresses', array('local'   => 'id',
+                                                               'foreign' => 'user_id'));
+  }
+}
+
+class Ticket1205TestAddress extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('ticket1205_address');
+    $this->hasColumn('user_id', 'integer', 4, array('notnull' => true));
+    $this->hasColumn('city', 'string', 31);
+  }
+
+  public function setUp()
+  {    
+    $this->hasOne('Ticket1205TestUser as User', array('local'   => 'user_id',
+                                                      'foreign' => 'id'));
+  }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1206TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1206TestCase.php
new file mode 100644
index 000000000..8e050b377
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1206TestCase.php
@@ -0,0 +1,63 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1206_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1206_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        Doctrine_Manager::connection()->setAttribute(Doctrine_Core::ATTR_TBLNAME_FORMAT, 'prefix_%s');
+        $this->tables[] = 'Ticket_1206_BlogPost';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $this->assertEqual(Doctrine_Core::getTable('Ticket_1206_BlogPost')->getTableName(), 'prefix_ticket_1206__blog_post');
+        $this->assertEqual(Doctrine_Core::getTable('Ticket_1206_BlogPostTranslation')->getTableName(), 'prefix_ticket_1206__blog_post_translation');
+        Doctrine_Manager::connection()->setAttribute(Doctrine_Core::ATTR_TBLNAME_FORMAT, '%s');
+    }
+}
+
+class Ticket_1206_BlogPost extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+        $this->hasColumn('title', 'string', 255);
+        $this->hasColumn('body', 'clob');
+    }
+
+    public function setUp()
+    {
+        $this->actAs('I18n', array('fields' => array('title', 'body')));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1208TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1208TestCase.php
new file mode 100644
index 000000000..26d25107e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1208TestCase.php
@@ -0,0 +1,81 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1208_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1208_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1208_User';
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+        $user = new Ticket_1208_User();
+        $user->username = 'jwage';
+        $user->password = 'changeme';
+        $user->save();
+    }
+
+    public function testTest()
+    {
+        $q = Doctrine_Query::create()
+            ->from('Ticket_1208_User u');
+        $user = $q->fetchOne(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+        $this->assertTrue(isset($user['pre_hydrate']));
+        $this->assertTrue(isset($user['post_hydrate']));
+    }
+}
+
+class Ticket_1208_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+    }
+
+    public function preHydrate($event)
+    {
+        $data = $event->data;
+        $data['pre_hydrate'] = 'pre hydrate value';
+        $event->data = $data;
+    }
+
+    public function postHydrate($event)
+    {
+        $data = $event->data;
+        $data['post_hydrate'] = 'post hydrate value';
+        $event->data = $data;
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1211TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1211TestCase.php
new file mode 100644
index 000000000..fedf557f9
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1211TestCase.php
@@ -0,0 +1,48 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1211_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1211_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $orig = $this->conn->getAttribute(Doctrine_Core::ATTR_PORTABILITY);
+        $this->conn->setAttribute(Doctrine_Core::ATTR_PORTABILITY, Doctrine_Core::PORTABILITY_NONE);
+
+        $q = Doctrine_Query::create()
+                ->select('u.*, COS(12.34) as test')
+                ->from('User u');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id, COS(12.34) AS e__0 FROM entity e WHERE (e.type = 0)');
+
+        $this->conn->setAttribute(Doctrine_Core::ATTR_PORTABILITY, $orig);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1213TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1213TestCase.php
new file mode 100644
index 000000000..4810e71a0
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1213TestCase.php
@@ -0,0 +1,83 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1213_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1213_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Doctrine_Ticket_1213_Person';
+        $this->tables[] = 'Doctrine_Ticket_1213_Birthday';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $guid = md5(microtime());
+        $person = new Doctrine_Ticket_1213_Person();
+        $person->Name	= "Frank Zappa ".time();
+        $person->guid	= $guid;
+        $person->Birthday->Bday = '1940-12-21';
+        $person->Birthday->person_guid = $guid;
+        $person->save();
+        $this->assertEqual($person->guid, $guid);
+        $this->assertEqual($person->Birthday->person_guid, $guid);
+    }
+}
+
+class Doctrine_Ticket_1213_Birthday extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->hasColumn('person_guid', 'string', 32, array('primary' => true));
+		$this->hasColumn('Bday', 'timestamp');
+
+		$this->index('person_guid', array('fields' => array('person_guid')));
+	}
+}
+
+class Doctrine_Ticket_1213_Person extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->hasColumn('guid', 'string', 32, array('primary' => true));
+		$this->hasColumn('Name', 'string', 100);
+
+		$this->index('guid', array('fields' => array('guid')));
+	}
+
+	public function setUp()
+	{
+		$this->hasOne('Doctrine_Ticket_1213_Birthday as Birthday', array('local'    => 'guid',
+		                                                                 'foreign'  => 'person_guid',
+		                                                                 'owningSide' => true));
+	}
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1225TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1225TestCase.php
new file mode 100644
index 000000000..a2e37d6e8
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1225TestCase.php
@@ -0,0 +1,60 @@
+<?php
+class Doctrine_Ticket_1225_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables = array('Ticket_1225_Tree');
+        parent::prepareTables();
+    }
+    
+    public function prepareData()
+    {
+    }
+
+    public function testMoveAsSameNodeThrowsException() 
+    {
+        $root1 = new Ticket_1225_Tree();
+        $tree = $root1->getTable()->getTree();
+
+        $root1->name = 'Name 1';
+        $tree->createRoot($root1);
+
+        try {
+            $root1->getNode()->moveAsPrevSiblingOf($root1);
+            $this->fail();
+        } catch (Doctrine_Tree_Exception $e) {
+            $this->pass();
+        }
+
+        try {
+            $root1->getNode()->moveAsNextSiblingOf($root1);
+            $this->fail();
+        } catch (Doctrine_Tree_Exception $e) {
+            $this->pass();
+        }
+
+        try {
+            $root1->getNode()->moveAsFirstChildOf($root1);
+            $this->fail();
+        } catch (Doctrine_Tree_Exception $e) {
+            $this->pass();
+        }
+
+        try {
+	      $root1->getNode()->moveAsLastChildOf($root1);
+            $this->fail();
+        } catch (Doctrine_Tree_Exception $e) {
+            $this->pass();
+        }
+    }
+}
+
+class Ticket_1225_Tree extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string');
+
+        $this->actAs('NestedSet');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1228TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1228TestCase.php
new file mode 100644
index 000000000..2443e7c4e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1228TestCase.php
@@ -0,0 +1,240 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Template_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1228_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = "RelA";
+        $this->tables[] = "RelB";
+        $this->tables[] = "RelC";
+        $this->tables[] = "RelD";
+        $this->tables[] = "RelE";
+        parent::prepareTables();
+    }
+
+    public function prepareData() 
+    {
+        // first branch of the 'object hierarchy'
+        $e1 = new RelE();
+        $e1->name = "e 1";
+        $e1->save();
+        
+        $d1 = new RelD();
+        $d1->name = "d 1";
+        $d1->rel_e_id = $e1->id;
+        $d1->save();
+
+        $c1 = new RelC();
+        $c1->name = "c 1";
+        $c1->rel_d_id = $d1->id;
+        $c1->save();
+
+        $b1 = new RelB();
+        $b1->name = "b 1";
+        $b1->rel_c_id = $c1->id;
+        $b1->save();
+
+        $a1 = new RelA();
+        $a1->name = "a 1";
+        $a1->rel_b_id = $b1->id;
+        $a1->save();
+
+        // second branch, contains only top level
+        /* uncomment this to make it work
+        $b2 = new RelB();
+        $b2->name = "b 2";
+        $b2->save();
+        */
+        $a2 = new RelA();
+        $a2->name = "a 2";
+        // uncomment this, too
+        // $a2->rel_b_id = $b2->id;
+        $a2->save();
+
+
+        $e2 = new RelE();
+        $e2->name = "e 2";
+        $e2->save();
+
+        // third branch, full depth again
+        $d3 = new RelD();
+        $d3->name = "d 3";
+        $d3->rel_e_id = $e2->id;
+        $d3->save();
+
+        $c3 = new RelC();
+        $c3->name = "c 3";
+        $c3->rel_d_id = $d3->id;
+        $c3->save();
+
+        $b3 = new RelB();
+        $b3->name = "b 3";
+        $b3->rel_c_id = $c3->id;
+        $b3->save();
+
+        $a3 = new RelA();
+        $a3->name = "a 3";
+        $a3->rel_b_id = $b3->id;
+        $a3->save();
+    }
+
+    public function testHydrationSkippingRelationIfNotSetOnSiblingDepth3()
+    {
+        $q = new Doctrine_Query();
+        $q->from('RelA a');
+        $q->leftJoin('a.b ab');
+        $q->leftJoin('ab.c abc');
+        $q->orderBy('a.id ASC');
+        $res = $q->execute();
+        //$res = $q->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+        
+        //var_dump($res/*->toArray(true)*/);
+        
+        $this->assertEqual('a 1', $res->getFirst()->get('name'));
+        $this->assertTrue($res->getFirst()->get('b')->exists());
+        $this->assertTrue($res->getFirst()->get('b')->get('c')->exists());
+        
+    }
+
+    public function testHydrationSkippingRelationIfNotSetOnSiblingDepth4()
+    {
+        $q = new Doctrine_Query();
+        $q->from('RelA a');
+        $q->leftJoin('a.b ab');
+        $q->leftJoin('ab.c abc');
+        $q->leftJoin('abc.d abcd');
+        $q->orderBy('a.id ASC');
+        $res = $q->execute();
+        //$res = $q->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+        
+        //var_dump($res/*->toArray(true)*/);
+        
+        $this->assertEqual('a 1', $res->getFirst()->get('name'));
+        $this->assertTrue($res->getFirst()->get('b')->exists());
+        $this->assertTrue($res->getFirst()->get('b')->get('c')->exists());
+        $this->assertTrue($res->getFirst()->get('b')->get('c')->get('d')->exists());
+        
+    }
+    
+    public function testHydrationSkippingRelationIfNotSetOnSiblingDepth5()
+    {
+        $q = new Doctrine_Query();
+        $q->from('RelA a');
+        $q->leftJoin('a.b ab');
+        $q->leftJoin('ab.c abc');
+        $q->leftJoin('abc.d abcd');
+        $q->leftJoin('abcd.e abcde');
+        $q->orderBy('a.id ASC');
+        $res = $q->execute();
+        //$res = $q->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+        
+        //var_dump($res/*->toArray(true)*/);
+        
+        $this->assertEqual('a 1', $res->getFirst()->get('name'));
+        $this->assertTrue($res->getFirst()->get('b')->exists());
+        $this->assertTrue($res->getFirst()->get('b')->get('c')->exists());
+        $this->assertTrue($res->getFirst()->get('b')->get('c')->get('d')->exists());
+        $this->assertTrue($res->getFirst()->get('b')->get('c')->get('d')->get('e')->exists());
+        
+    }
+    
+}
+
+class RelA extends Doctrine_Record {
+
+  public function setTableDefinition() {
+    $this->setTableName('rel_a');
+    $this->hasColumn('name', 'string', 25, array());
+    $this->hasColumn('rel_b_id', 'integer', 10, array());
+  }
+
+  public function setUp() {
+    $this->HasOne('RelB as b', array('local' => 'rel_b_id', 'foreign' => 'id'));
+  }
+
+}
+
+class RelB extends Doctrine_Record {
+
+  public function setTableDefinition() {
+    $this->setTableName('rel_b');
+    $this->hasColumn('name', 'string', 25, array());
+    $this->hasColumn('rel_c_id', 'integer', 10, array());
+  }
+
+  public function setUp() {
+    $this->HasOne('RelC as c', array('local' => 'rel_c_id', 'foreign' => 'id'));
+  }
+
+}
+
+class RelC extends Doctrine_Record {
+
+  public function setTableDefinition() {
+    $this->setTableName('rel_c');
+    $this->hasColumn('name', 'string', 25, array());
+    $this->hasColumn('rel_d_id', 'integer', 10, array());
+  }
+
+  public function setUp() {
+    $this->HasOne('RelD as d', array('local' => 'rel_d_id', 'foreign' => 'id'));
+  }
+
+}
+
+class RelD extends Doctrine_Record {
+
+  public function setTableDefinition() {
+    $this->setTableName('rel_d');
+    $this->hasColumn('name', 'string', 25, array());
+    $this->hasColumn('rel_e_id', 'integer', 10, array());
+  }
+
+  public function setUp() {
+      $this->HasOne('RelE as e', array('local' => 'rel_e_id', 'foreign' => 'id'));
+  }
+
+}
+
+class RelE extends Doctrine_Record {
+
+  public function setTableDefinition() {
+    $this->setTableName('rel_e');
+    $this->hasColumn('name', 'string', 25, array());
+  }
+
+  public function setUp() {
+
+  }
+
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1230TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1230TestCase.php
new file mode 100644
index 000000000..b9340feb1
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1230TestCase.php
@@ -0,0 +1,74 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1230_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1230_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1230_Category';
+        parent::prepareTables();
+    }
+
+    public function testTicket()
+    {
+        $categoriesTable = Doctrine_Core::getTable('Ticket_1230_Category');
+        $categoriesTreeObject = $categoriesTable->getTree();
+
+        $category = new Ticket_1230_Category();
+        $category->name = 'Testing';
+        $category->save();
+        $categoriesTreeObject->createRoot($category);
+        $category->free();
+
+        $baseQuery = Doctrine_Query::create()
+            ->select('*')
+            ->from('Ticket_1230_Category c')
+            ->setHydrationMode(Doctrine_Core::HYDRATE_ARRAY);
+
+        $categoriesTreeObject->setBaseQuery($baseQuery);
+        $categoriesArray = $categoriesTreeObject->fetchTree();
+        $this->assertEqual($categoriesArray[0]['name'], 'Testing');
+    }
+}
+
+class Ticket_1230_Category extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('NestedSet');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1236TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1236TestCase.php
new file mode 100644
index 000000000..17ad19b68
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1236TestCase.php
@@ -0,0 +1,68 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1236_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1236_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1235_Article';
+        parent::prepareTables();
+    }
+
+    public function testTicket()
+    {
+        $test = new Ticket_1235_Article();
+        $test->author = 'jwage';
+        $test->Translation['en']->title = 'Test';
+        $test->Translation['en']->body = 'testing';
+        $test->save();
+        $this->assertEqual($test->Translation['en']->id, 1);
+        $this->assertEqual($test->Translation['en']->title, 'Test');
+        $this->assertTrue($test->hasRelation('Translation'));
+    }
+}
+
+class Ticket_1235_Article extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('title', 'string', 255);
+        $this->hasColumn('body', 'clob');
+        $this->hasColumn('author', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('I18n', array('fields'          => array('title', 'body'),
+                                   'generateFiles'   => false));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1244TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1244TestCase.php
new file mode 100644
index 000000000..aafcac4d2
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1244TestCase.php
@@ -0,0 +1,65 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1244_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1244_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1244_Test';
+        parent::prepareTables();
+    }
+
+    public function testTicket()
+    {
+        $original = Doctrine_Manager::getInstance()->getAttribute(Doctrine_Core::ATTR_VALIDATE);
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+
+        try {
+            $test = new Ticket_1244_Test();
+            $test->test = null;
+            $test->save();
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, $original);
+    }
+}
+
+class Ticket_1244_Test extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('test', 'integer', 4, array('range' => array(5, 10))); 
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1250TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1250TestCase.php
new file mode 100644
index 000000000..a126fac62
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1250TestCase.php
@@ -0,0 +1,73 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1015_TestCase
+ *
+ * @package     Doctrine
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1250_TestCase extends Doctrine_UnitTestCase {
+  public function prepareTables() {
+    $this->tables[] = 'Doctrine_Ticket_1250_i18n';
+    parent::prepareTables();
+  }
+  
+  public function testTicket()
+  {
+     try {
+        $r = new Doctrine_Ticket_1250_i18n();
+        // This is needed since all fields are internationalized.
+        // Reason for not fixing that is BC. Manual describes this behavior very well
+        $r->state('TDIRTY');
+        $r->Translation['en']->title = 'Title in english';
+        $r->Translation['en']->content = 'Content in english';
+        $r->Translation['fr']->title = 'Titre en français';
+        $r->Translation['en']->content = 'Contenu en français';
+        $r->save();
+      } catch (Exception $e) {
+          $this->fail($e->getMessage());
+      }
+      
+      $this->assertEqual(1, $r->id);
+  }
+}
+
+class Doctrine_Ticket_1250_i18n extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('Doctrine_Ticket_1250_i18n');
+    $this->hasColumn('title', 'string', 255);
+    $this->hasColumn('content', 'string', null);
+  }
+
+  public function setUp()
+  {
+    parent::setUp();
+    $i18n0 = new Doctrine_Template_I18n(array('length' => 5, 'fields' => array(0 => 'title', 1 => 'content')));
+    $this->actAs($i18n0);
+  }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1251TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1251TestCase.php
new file mode 100644
index 000000000..a2c7bcd30
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1251TestCase.php
@@ -0,0 +1,59 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_384_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1251_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1251_Record';
+        parent::prepareTables();
+    }
+    
+    
+    public function testAccessDataNamedField()
+    {
+        $t = new Ticket_1251_Record();
+        $t->data = 'Foo';
+        $t->save();
+        
+        $this->assertEqual($t->data, 'Foo');
+    }
+}
+
+
+class Ticket_1251_Record extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('data', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1253TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1253TestCase.php
new file mode 100644
index 000000000..4d3de0f43
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1253TestCase.php
@@ -0,0 +1,93 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1253_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1253_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1253_User';
+        $this->tables[] = 'Ticket_1253_UserType';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $test2 = new Ticket_1253_UserType();
+        $test2->name = 'one';
+        $test2->save();
+
+        $test3 = new Ticket_1253_UserType();
+        $test3->name = 'two';
+        $test3->save();
+
+        $test = new Ticket_1253_User();
+        $test->name = 'test';
+        $test->type_name = 'one';
+        $test->save();
+
+        $q = Doctrine_Query::create()
+                ->from('Ticket_1253_User u')
+                ->leftJoin('u.Type');
+
+        // This will never work because t.type_name is the emulated enum value and t2.name is the actual name
+        $this->assertEqual($q->getSqlQuery(), 'SELECT t.id AS t__id, t.name AS t__name, t.type_name AS t__type_name, t2.id AS t2__id, t2.name AS t2__name FROM ticket_1253__user t LEFT JOIN ticket_1253__user_type t2 ON t.type_name = t2.name');
+        $results = $q->fetchArray();
+        $this->assertEqual($results[0]['Type']['name'], 'one');
+    }
+}
+
+class Ticket_1253_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string');
+        $this->hasColumn('type_name', 'enum', 9, array('values' => array('one', 'two')));
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_1253_UserType as Type', array('local' => 'type_name', 'foreign' => 'name'));
+    }
+}
+
+class Ticket_1253_UserType extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string');
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_1253_User as User', array('local' => 'name', 'foreign' => 'type_name', 'owningSide' => true));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1254TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1254TestCase.php
new file mode 100644
index 000000000..a50d89d67
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1254TestCase.php
@@ -0,0 +1,116 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1254_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1254_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = "RelX";
+        $this->tables[] = "RelY";
+        parent::prepareTables();
+    }
+
+    public function prepareData() 
+    {
+	    Doctrine_Manager::getInstance()->getCurrentConnection()->beginTransaction();
+
+        $cats = array('cat1', 'cat2');
+	    $now = time();
+
+        for ($i = 0; $i < 10; $i++) {
+		    $age = $now - $i * 1000;
+            $x = new RelX();
+	        $x->name = "x $i";
+		    $x->category = $cats[$i % 2];
+		    $x->set('created_at', strftime("%Y-%m-%d %H:%M:%S", $age));
+	        $x->save();
+        
+	        for ($j = 0; $j < 10; $j++) {
+		        $y = new RelY();
+		        $y->name = "y ".($i * 10 + $j);
+		        $y->rel_x_id = $x->id;
+		        $y->save();
+		    }
+	    }
+        
+        Doctrine_Manager::getInstance()->getCurrentConnection()->commit();
+    }
+
+    public function testSubqueryExtractionUsesWrongAliases()
+    {
+        $q = new Doctrine_Query();
+        $q->from('RelX x');
+    	$q->leftJoin('x.y xy');
+    	$q->where('x.created_at IN (SELECT MAX(x2.created_at) latestInCategory FROM RelX x2 WHERE x.category = x2.category)');
+    	$q->limit(5);
+
+        //echo $sql = $q->getSqlQuery();
+        //	echo $sql;
+
+        $xs = $q->execute();
+
+        // Doctrine_Ticket_1254_TestCase : method testSubqueryExtractionUsesWrongAliases failed on line 76 
+        // This fails sometimes at
+        $this->assertEqual(2, count($xs));
+        
+    }
+
+}
+
+class RelX extends Doctrine_Record {
+
+  public function setTableDefinition() {
+    $this->setTableName('rel_x');
+    $this->hasColumn('name', 'string', 25, array());
+    $this->hasColumn('category', 'string', 25, array());
+    $this->hasColumn('created_at', 'timestamp', null, array());
+  }
+
+  public function setUp() {
+    $this->HasMany('RelY as y', array('local' => 'id', 'foreign' => 'rel_x_id'));
+  }
+
+}
+
+class RelY extends Doctrine_Record {
+
+  public function setTableDefinition() {
+    $this->setTableName('rel_y');
+    $this->hasColumn('name', 'string', 25, array());
+    $this->hasColumn('rel_x_id', 'integer', 10, array());
+  }
+
+  public function setUp() {
+
+  }
+
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1257TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1257TestCase.php
new file mode 100644
index 000000000..29e769e09
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1257TestCase.php
@@ -0,0 +1,88 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1257_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1257_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1257_User';
+        $this->tables[] = 'Ticket_1257_Role';
+        parent::prepareTables();
+    }
+
+    public function testTicket()
+    {
+        $user = new Ticket_1257_User();
+        $user->username = 'jwage';
+        $user->Role->name = 'Developer';
+        $user->Role->description = 'Programmer/Developer';
+        $user->save();
+
+        $q = Doctrine_Query::create()
+                ->select('u.id, u.username')
+                ->from('Ticket_1257_User u')
+                ->leftJoin('u.Role r')
+                ->addSelect('r.id, r.name, r.description');
+        $this->assertEqual($q->getSqlQuery(), 'SELECT t.id AS t__id, t.username AS t__username, t2.id AS t2__id, t2.name AS t2__name, t2.description AS t2__description FROM ticket_1257__user t LEFT JOIN ticket_1257__role t2 ON t.role_id = t2.id');
+        $results = $q->fetchArray();
+        $this->assertEqual($results[0]['Role']['name'], 'Developer');
+    }
+}
+
+class Ticket_1257_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+        $this->hasColumn('role_id', 'integer');
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_1257_Role as Role', array('local' => 'role_id', 'foreign' => 'id'));
+    }
+}
+
+class Ticket_1257_Role extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+        $this->hasColumn('description', 'string');
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_1257_User as Users', array('local' => 'id', 'foreign' => 'role_id'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1276TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1276TestCase.php
new file mode 100644
index 000000000..b56821524
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1276TestCase.php
@@ -0,0 +1,44 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1276_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1276_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_AUTO_FREE_QUERY_OBJECTS, true);
+        $q = Doctrine_Query::create()
+            ->from('User u');
+        $users = $q->fetchArray();
+        $this->assertTrue(is_array($users));
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_AUTO_FREE_QUERY_OBJECTS, false);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1277TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1277TestCase.php
new file mode 100644
index 000000000..54878b933
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1277TestCase.php
@@ -0,0 +1,231 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1277_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1277_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables = array("T1277_User");
+        parent::prepareTables();
+    }
+
+    public function prepareData() 
+    {
+	     $user1 = new T1277_User();
+	     $user1->username = "User1";
+	     $user1->email = null;
+	     $user1->save();
+	     
+	     $user2 = new T1277_User();
+	     $user2->username = "User2";
+	     $user2->email = "some@email";
+	     $user2->save();
+	     
+    }
+
+    /**
+     * Tests that:
+     * 1) a record in PROXY state is switched to CLEAN state when he is queried again with all props.
+     */
+    public function testTicket()
+    {
+        $this->conn->getTable('T1277_User')->clear(); // clear identity map
+        
+        $q = new Doctrine_Query();
+        $u = $q->select('u.id')->from('T1277_User u')->where('u.id=1')->fetchOne();
+
+        $this->assertEqual(1, $u->id);
+        $this->assertEqual(Doctrine_Record::STATE_PROXY, $u->state());        
+        
+        // In some other part of code I will query this table again and start making modifications to found records: 
+        $q = new Doctrine_Query();
+        $users = $q->select('u.*')->from('T1277_User u')->execute();
+        
+        $this->assertEqual(2, count($users));
+
+        foreach ($users as $u) {
+            $this->assertEqual(Doctrine_Record::STATE_CLEAN, $u->state());
+            
+            $u->username = 'new username' . $u->id;
+            $u->email = 'some' . $u->id . '@email';
+            
+            $this->assertEqual("new username" . $u->id, $u->username);
+            $this->assertEqual("some" . $u->id . "@email", $u->email);
+        }
+    }
+    
+    /**
+     * Tests that:
+     * 1) a record in PROXY state is still in PROXY state when he is queries again but not with all props
+     * 2) a record in PROXY state is switched to DIRTY state and all uninitialized props loaded
+     *    if one of the uninitialized properties is accessed and some other (already initialized)
+     *    properties have been modified before.
+     */
+    public function testTicket2()
+    {
+        $this->conn->getTable('T1277_User')->clear(); // clear identity map
+        
+        $q = new Doctrine_Query();
+        $u = $q->select('u.id')->from('T1277_User u')->where('u.id=1')->fetchOne();
+
+        $this->assertEqual(1, $u->id);
+        $this->assertEqual(Doctrine_Record::STATE_PROXY, $u->state());        
+        
+        // In some other part of code I will query this table again and start making modifications to found records: 
+        $q = new Doctrine_Query();
+        $users = $q->select('u.id, u.username')->from('T1277_User u')->execute();
+        
+        $this->assertEqual(2, count($users));
+
+        foreach ($users as $u) {
+            $this->assertEqual(Doctrine_Record::STATE_PROXY, $u->state());
+            
+            $u->username = 'new username' . $u->id; // modify
+            $u->email = 'some' . $u->id . '@email'; // triggers load() to fill uninitialized props
+            
+            $this->assertEqual("new username" . $u->id, $u->username);
+            $this->assertEqual("some" . $u->id . "@email", $u->email);
+            
+            $this->assertEqual(Doctrine_Record::STATE_DIRTY, $u->state());
+        }
+    }
+    
+    /**
+     * Tests that:
+     * 1) a record in PROXY state is still in PROXY state when he is queries again but not with all props
+     * 2) a record in PROXY state is switched to CLEAN state and all uninitialized props loaded
+     *    if one of the uninitialized properties is accessed.
+     */
+    public function testTicket3()
+    {
+        $this->conn->getTable('T1277_User')->clear(); // clear identity map
+        
+        $q = new Doctrine_Query();
+        $u = $q->select('u.id')->from('T1277_User u')->where('u.id=1')->fetchOne();
+
+        $this->assertEqual(1, $u->id);
+        $this->assertEqual(Doctrine_Record::STATE_PROXY, $u->state());        
+        
+        // In some other part of code I will query this table again and start making modifications to found records: 
+        $q = new Doctrine_Query();
+        $users = $q->select('u.id, u.username')->from('T1277_User u')->execute();
+
+        $this->assertEqual(2, count($users));
+
+        foreach ($users as $u) {
+            $this->assertEqual(Doctrine_Record::STATE_PROXY, $u->state());
+            
+            if ($u->id == 1) {
+                $this->assertEqual("User1", $u->username);
+                $u->email; // triggers load()
+            } else {
+                $this->assertEqual("User2", $u->username);
+                $this->assertEqual("some@email", $u->email);
+            }
+            
+            $this->assertEqual(Doctrine_Record::STATE_CLEAN, $u->state());
+        }
+    }
+    
+    /**
+     * Fails due to the PROXY concept being flawed by design.
+     *
+     * Tests that:
+     * 1) a record in PROXY state is switched to DIRTY state when he is queried again with all props,
+     *    but has been modified before.
+     */
+    /*public function testTicket4()
+    {
+        $this->conn->getTable('T1277_User')->clear(); // clear identity map
+        
+        $q = new Doctrine_Query();
+        $u = $q->select('u.id, u.username')->from('T1277_User u')->where('u.id=1')->fetchOne();
+
+        $this->assertEqual(1, $u->id);
+        $this->assertEqual(Doctrine_Record::STATE_PROXY, $u->state());
+        
+        $u->username = "superman";
+
+        // In some other part of code I will query this table again and start making modifications to found records: 
+        $q = new Doctrine_Query();
+        $users = $q->select('u.*')->from('T1277_User u')->execute();
+        
+        $this->assertEqual(2, count($users));
+
+        foreach ($users as $u) {
+            if ($u->id == 1) {
+                $this->assertEqual(Doctrine_Record::STATE_DIRTY, $u->state());
+                $this->assertEqual("superman", $u->username);
+            } else {
+                $this->assertEqual(Doctrine_Record::STATE_CLEAN, $u->state());
+                $this->assertEqual("User2", $u->username);
+                $this->assertEqual("some@email", $u->email);
+            }
+        }
+    }*/
+
+}
+
+// This is the User table where I have 2 records:
+//      ID  USERNAME    EMAIL
+//      #1  User1       NULL
+//      #2  User2       some@email
+class T1277_User extends Doctrine_Record
+{
+    public function setTableDefinition ()
+    {
+        $this->setTableName("t1277_users");
+
+        $this->hasColumns (array(
+
+            'id' => array(
+                    'type'          => 'integer',
+                    'length'        => 4,
+                    'notnull'       => true,
+                    'autoincrement' => true,
+                    'primary'       => true
+            ),
+
+            'username' => array(
+                    'type'          => 'string',
+                    'length'        => 50
+            ),
+
+            'email' => array(
+                    'type'          => 'string',
+                    'length'        => 50,
+                    'default'       => null,
+            ),
+        ));
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1280TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1280TestCase.php
new file mode 100644
index 000000000..b2ba33368
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1280TestCase.php
@@ -0,0 +1,103 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1280_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1280_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        //$this->tables = array();
+        $this->tables[] = 'Ticket_1280_User';
+        $this->tables[] = 'Ticket_1280_Group';
+        parent::prepareTables();
+    }
+
+    public function testTicket()
+    {
+        $group = new Ticket_1280_Group();
+        $group->name = 'Core Dev';
+        $group->save();
+
+        $user = new Ticket_1280_User();
+        $user->Group = $group;
+        $user->name = 'jwage';
+        $user->save();
+
+        $this->assertEqual($user->group_id, $group->id);
+        
+        try {
+            $user->Group = null;
+            $user->save();
+            
+            $this->assertEqual($user->group_id, null);
+
+            $this->pass();
+        } catch (Doctrine_Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+}
+
+class Ticket_1280_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('group_id', 'integer', 20, array(
+            'notnull' => false, 'default' => null
+        ));
+        $this->hasColumn('name', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_1280_Group as Group', array(
+            'local' => 'group_id',
+            'foreign' => 'id'
+        ));
+    }
+}
+
+
+class Ticket_1280_Group extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_1280_User as Users', array(
+            'local' => 'id',
+            'foreign' => 'group_id'
+        ));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1281TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1281TestCase.php
new file mode 100644
index 000000000..d21abbd61
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1281TestCase.php
@@ -0,0 +1,47 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1281_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1281_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $users = Doctrine_Core::getTable('User')->findAll();
+        $user = $users->getFirst();
+        $user->name = 'zYne-';
+
+        // new values
+        $this->assertEqual($user->getModified(), array('name' => 'zYne-'));
+
+        // old values
+        $this->assertEqual($user->getModified(true), array('name' => 'zYne'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1289TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1289TestCase.php
new file mode 100644
index 000000000..789698991
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1289TestCase.php
@@ -0,0 +1,66 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1289_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1289_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1289_User';
+        parent::prepareTables();
+    }
+
+    public function testTicket()
+    {
+        $test = new Ticket_1289_User();
+        $test->username = 'jwage';
+        $test->save();
+        $test->username = 'jonwage';
+        $test->save();
+        $version1 = $test->getAuditLog()->getVersion($test, 1);
+        $version2 = $test->getAuditLog()->getVersion($test, 2);
+        $this->assertEqual($version1[0]['username'], 'jwage');
+        $this->assertEqual($version2[0]['username'], 'jonwage');
+    }
+}
+
+class Ticket_1289_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('login as username', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('Versionable');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1296TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1296TestCase.php
new file mode 100644
index 000000000..b84f94754
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1296TestCase.php
@@ -0,0 +1,162 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1296_TestCase
+ *
+ * @package     Doctrine
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1296_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData() {
+        $org = new NewTicket_Organization();
+        $org->name = 'Inc.';
+        $org->save();
+    }
+    
+    public function prepareTables()
+    {
+        $this->tables = array(
+                'NewTicket_Organization',
+                'NewTicket_Role'
+                );
+        parent::prepareTables();
+    }
+    
+    public function testAddDuplicateOrganisation ()
+    {
+        $this->assertEqual(0, $this->conn->transaction->getTransactionLevel());
+        $this->assertEqual(0, $this->conn->transaction->getInternalTransactionLevel());
+        try {
+            $this->conn->beginTransaction();
+        } catch (Exception $e) {
+            $this->fail("Transaction failed to start.");
+        }
+        
+        $this->assertEqual(1, $this->conn->transaction->getTransactionLevel());
+        $this->assertEqual(0, $this->conn->transaction->getInternalTransactionLevel());
+        
+        $org = new NewTicket_Organization();
+        $org->name = 'Inc.';
+        try {
+            $org->save();
+            $this->fail("Unique violation not reported.");
+        } catch (Exception $e) {
+            $this->assertEqual(1, $this->conn->transaction->getTransactionLevel());
+            $this->assertEqual(0, $this->conn->transaction->getInternalTransactionLevel());
+            $this->conn->rollback();
+        }
+        
+        $this->assertEqual(0, $this->conn->transaction->getTransactionLevel());
+        $this->assertEqual(0, $this->conn->transaction->getInternalTransactionLevel());
+        
+        try {
+            $this->assertEqual(0, $this->conn->transaction->getTransactionLevel());
+            $this->assertEqual(0, $this->conn->transaction->getInternalTransactionLevel());
+            $this->conn->commit();
+            $this->fail();
+        } catch (Exception $e) {
+            // Commit failed, there is no active transaction!
+            $this->pass();
+        }
+        $this->assertEqual(0, $this->conn->transaction->getTransactionLevel());
+        $this->assertEqual(0, $this->conn->transaction->getInternalTransactionLevel());
+    }
+
+    public function testAddRole ()
+    {
+        $this->assertEqual(0, $this->conn->transaction->getTransactionLevel());
+        $this->assertEqual(0, $this->conn->transaction->getInternalTransactionLevel());
+        
+        try {
+            $this->conn->beginTransaction();
+        } catch (Exception $e) {
+            $this->fail("Transaction failed to start.");
+        }
+        
+        $this->assertEqual(1, $this->conn->transaction->getTransactionLevel());
+        $this->assertEqual(0, $this->conn->transaction->getInternalTransactionLevel());
+        
+        $r = new NewTicket_Role();
+        $r->name = 'foo';
+        try {
+            $r->save();
+            $this->assertEqual(1, $this->conn->transaction->getTransactionLevel());
+            $this->assertEqual(0, $this->conn->transaction->getInternalTransactionLevel());
+            $this->assertTrue(is_numeric($r->id));
+        } catch (Exception $e) {
+            $this->fail();
+            $this->conn->rollback();
+        }
+        try {
+            $this->assertEqual(1, $this->conn->transaction->getTransactionLevel());
+            $this->assertEqual(0, $this->conn->transaction->getInternalTransactionLevel());
+            $this->conn->commit();
+            $this->assertEqual(0, $this->conn->transaction->getTransactionLevel());
+            $this->assertEqual(0, $this->conn->transaction->getInternalTransactionLevel());
+        } catch (Exception $e) {
+            $this->fail();
+            $this->conn->rollback();
+        }
+    }
+}
+        
+class NewTicket_Organization extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('id', 'integer', 4, array(
+                'autoincrement' => true,
+                'notnull' => true,
+                'primary' => true
+                ));
+        $this->hasColumn('name', 'string', 255, array(
+                'notnull' => true,
+                'unique' => true
+                ));
+    }
+}
+
+class NewTicket_Role extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('id', 'integer', 4, array(
+                'autoincrement' => true,
+                'notnull' => true,
+                'primary' => true
+                ));
+        $this->hasColumn('name', 'string', 30, array(
+                'notnull' => true,
+                'unique' => true
+                ));
+    }
+}
+
+class NewTicket_User {
+    public function addOrganization ($name)
+    {
+
+    }
+}
+
+    
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1304TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1304TestCase.php
new file mode 100644
index 000000000..3448d7c99
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1304TestCase.php
@@ -0,0 +1,90 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1304_TestCase
+ *
+ * @package     Doctrine
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1304_TestCase extends Doctrine_UnitTestCase {
+  public function prepareTables() {
+    $this->tables[] = 'Doctrine_Ticket_1304_Slug';
+    parent::prepareTables();
+  }
+  
+  public function testTicket()
+  {
+	// run 1
+     try {
+        $r = new Doctrine_Ticket_1304_Slug();
+        $r->Translation['en']->title	= 'Title';
+        $r->Translation['en']->content	= 'Content';
+        $r->save();
+      } catch (Exception $e) {
+          $this->fail($e->getMessage());
+      }
+      $this->assertEqual('title', $r->Translation['en']->slug);
+
+	// run 2
+     try {
+        $r = new Doctrine_Ticket_1304_Slug();
+        $r->Translation['en']->title	= 'Title';
+        $r->Translation['en']->content	= 'Content';
+        $r->save();
+      } catch (Exception $e) {
+          $this->fail($e->getMessage());
+      }
+      $this->assertEqual('title-1', $r->Translation['en']->slug);
+
+	// run 3
+     try {
+        $r = new Doctrine_Ticket_1304_Slug();
+        $r->Translation['en']->title	= 'Title';
+        $r->Translation['en']->content	= 'Content';
+        $r->save();
+      } catch (Exception $e) {
+          $this->fail($e->getMessage());
+      }
+      $this->assertEqual('title-2', $r->Translation['en']->slug);
+  }
+}
+
+class Doctrine_Ticket_1304_Slug extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->hasColumn('title', 'string', 255, array('type' => 'string', 'length' => '255'));
+    $this->hasColumn('content', 'string', null, array('type' => 'string'));
+  }
+
+  public function setUp()
+  {
+    $i18n0 = new Doctrine_Template_I18n(array('fields' => array(0 => 'title', 1 => 'content')));
+    $sluggable1 = new Doctrine_Template_Sluggable(array('fields' => array(0 => 'title'), 'indexName' => 'i18n_sluggable_test'));
+    $i18n0->addChild($sluggable1);
+    $this->actAs($i18n0);
+  }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1305TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1305TestCase.php
new file mode 100644
index 000000000..0b009da44
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1305TestCase.php
@@ -0,0 +1,69 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1305_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1305_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables() 
+    {
+        $this->tables[] = 'Ticket_1305_Record';
+
+        parent::prepareTables();
+    }
+
+
+    public function testTicket()
+    {
+        $t = new Ticket_1305_Record();
+        $t->save();
+        
+        $this->assertEqual($t['name'], 'test');
+
+        $t->name = 'foo';
+        $t->save();
+        
+        $this->assertEqual($t['name'], 'foo');
+
+        $t->name = null;
+        $t->save();
+        
+        $this->assertEqual($t['name'], 'test');
+    }
+}
+
+
+class Ticket_1305_Record extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255, array('notnull' => true, 'default' => 'test'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1307TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1307TestCase.php
new file mode 100644
index 000000000..e8792caf5
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1307TestCase.php
@@ -0,0 +1,56 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1307_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1307_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $charset = 'test_charset';
+        $collate = 'test_collate';
+        $conn = Doctrine_Manager::connection('sqlite::memory:');
+        $conn->setCharset($charset);
+        $conn->setCollate($collate);
+
+        $userTable = Doctrine_Core::getTable('Ticket_1307_User');
+        $this->assertEqual($charset, $userTable->getOption('charset'));
+        $this->assertEqual($collate, $userTable->getOption('collate'));
+    }
+}
+
+class Ticket_1307_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1315TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1315TestCase.php
new file mode 100644
index 000000000..c1cbafe56
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1315TestCase.php
@@ -0,0 +1,73 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1315_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1315_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+        $userTable = Doctrine_Core::getTable('User');
+        $userTable->addRecordListener(new Ticket_1315_Listener());
+
+        try {
+            $q = Doctrine_Query::create()
+                ->from('User u');
+
+            $users = $q->execute();
+            $this->fail();
+        } catch (Exception $e) {
+            $this->pass();
+        }
+
+        $userTable->setAttribute(Doctrine_Core::ATTR_RECORD_LISTENER, null);
+
+        try {
+            $q = Doctrine_Query::create()
+                ->from('User u');
+
+            $users = $q->execute();
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail();
+        }
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+    }
+}
+
+class Ticket_1315_Listener extends Doctrine_Record_Listener
+{
+   public function preDqlSelect(Doctrine_Event $event)
+   {
+       throw new Doctrine_Exception('Test');
+   }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1323TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1323TestCase.php
new file mode 100644
index 000000000..6b9af9581
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1323TestCase.php
@@ -0,0 +1,225 @@
+<?php
+
+class Doctrine_Ticket_1323_TestCase extends Doctrine_UnitTestCase {
+    public function prepareTables() {
+        $this->tables = array();
+        $this->tables[] = "T1323User";
+        $this->tables[] = "T1323UserReference";
+        parent::prepareTables();
+    }
+    
+    public function prepareData() {}
+
+    public function resetData()
+    {
+      $q = Doctrine_Query::create();
+      $q->delete()->from("T1323UserReference")->execute();
+      $q = Doctrine_Query::create();
+      $q->delete()->from("T1323User")->execute();
+
+      $m = new T1323User();
+      $m->name = "Mother";
+      $m->save();
+      $f = new T1323User();
+      $f->name = "Father";
+      $f->save();
+      $s = new T1323User();
+      $s->name = "Son";
+      $s->save();
+      $d = new T1323User();
+      $d->name = "Daughter";
+      $d->save();
+      $gf = new T1323User();
+      $gf->name = "Grandfather";
+      $gf->save();
+      $gm = new T1323User();
+      $gm->name = "Grandmother";
+      $gm->save();
+      
+      $f->Children[] = $s;
+      $f->Children[] = $d;
+      
+      $f->Parents[] = $gf;
+      $f->Parents[] = $gm;
+      
+      $f->save();
+      
+      $m->Children[] = $s;
+      $m->Children[] = $d;
+      
+      $m->save();      
+
+    }
+    
+    public function testRelationsAreCorrect() {
+        $this->resetData();
+        
+        $f = Doctrine_Core::getTable("T1323User")->findOneByName("Father");
+        $childLinks = $f->childLinks;
+        $this->assertEqual(2, count($childLinks));
+        $this->assertEqual($f->id, $childLinks[0]->parent_id);
+        $this->assertEqual($f->id, $childLinks[1]->parent_id);
+        
+        $parentLinks = $f->parentLinks;
+        $this->assertEqual(2, count($parentLinks));
+        $this->assertEqual($f->id, $parentLinks[0]->child_id);
+        $this->assertEqual($f->id, $parentLinks[1]->child_id);
+        
+        $m = Doctrine_Core::getTable("T1323User")->findOneByName("Mother");
+        $childLinks = $m->childLinks;
+        $this->assertEqual(2, count($childLinks));
+        $this->assertEqual($m->id, $childLinks[0]->parent_id);
+        $this->assertEqual($m->id, $childLinks[1]->parent_id);
+        
+        $parentLinks = $m->parentLinks;
+        $this->assertEqual(0, count($parentLinks));
+        
+        $s = Doctrine_Core::getTable("T1323User")->findOneByName("Son");
+        $childLinks = $s->childLinks;
+        $this->assertEqual(0, count($childLinks));
+        $parentLinks = $s->parentLinks;
+        $this->assertEqual(2, count($parentLinks));
+        $this->assertEqual($s->id, $parentLinks[0]->child_id);
+        $this->assertEqual($s->id, $parentLinks[1]->child_id);
+        
+        $d = Doctrine_Core::getTable("T1323User")->findOneByName("Daughter");
+        $childLinks = $d->childLinks;
+        $this->assertEqual(0, count($childLinks));
+        $parentLinks = $d->parentLinks;
+        $this->assertEqual(2, count($parentLinks));
+        $this->assertEqual($d->id, $parentLinks[0]->child_id);
+        $this->assertEqual($d->id, $parentLinks[1]->child_id);
+        
+        $gm = Doctrine_Core::getTable("T1323User")->findOneByName("Grandmother");
+        $childLinks = $gm->childLinks;
+        $this->assertEqual(1, count($childLinks));
+        $this->assertEqual($gm->id, $childLinks[0]->parent_id);
+        $parentLinks = $gm->parentLinks;
+        $this->assertEqual(0, count($parentLinks));
+        
+        $gf = Doctrine_Core::getTable("T1323User")->findOneByName("Grandfather");
+        $childLinks = $gf->childLinks;
+        $this->assertEqual(1, count($childLinks));
+        $this->assertEqual($gf->id, $childLinks[0]->parent_id);
+        $parentLinks = $gf->parentLinks;
+        $this->assertEqual(0, count($parentLinks));
+    }
+
+   /**
+    * this test will fail
+    */       
+   public function testWithShow() {
+      $this->resetData();
+      
+      T1323User::showAllRelations();
+      $this->runTests();
+   }
+
+   /**
+    * this test will pass
+    */       
+   public function testWithoutShow() {
+      $this->resetData();
+      
+      $this->runTests();
+   }
+
+    
+    public function runTests() {
+        
+      // change "Father"'s name...
+      $f = Doctrine_Core::getTable("T1323User")->findOneByName("Father");
+      $f->name = "Dad";
+      $f->save(); 
+      
+      /*  just playing; makes no difference: 
+          remove "Dad"'s relation to "Son"... */
+      //$s = Doctrine_Core::getTable("T1323User")->findOneByName("Son");
+      //$f->unlink("Children", array($s->id));
+      //$f->save();
+      
+      $relations = Doctrine_Core::getTable("T1323UserReference")->findAll();
+      foreach ($relations as $relation) {
+        /*  never directly touched any relation; so no user should have 
+            himself as parent or child */ 
+        $this->assertNotEqual($relation->parent_id, $relation->child_id);
+      }
+    }
+}
+  
+
+  
+class T1323User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 30);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('T1323User as Parents', array('local' => 'child_id',
+                                                'foreign'  => 'parent_id',
+                                                'refClass' => 'T1323UserReference',
+                                                'refClassRelationAlias' => 'childLinks'
+                                                ));
+
+        $this->hasMany('T1323User as Children', array('local' => 'parent_id',
+                                                 'foreign'  => 'child_id',
+                                                 'refClass' => 'T1323UserReference',
+                                                 'refClassRelationAlias' => 'parentLinks'
+                                                 ));
+    }
+    
+    /**
+     * just a little function to show all users and their relations
+     */         
+    public static function showAllRelations() {
+        $users = Doctrine_Core::getTable("T1323User")->findAll();
+        
+        //echo "=========================================<br/>".PHP_EOL;
+        //echo "list of all existing users and their relations:<br/> ".PHP_EOL;
+        //echo "=========================================<br/><br/>".PHP_EOL.PHP_EOL;
+        
+        foreach ($users as $user) {
+            $parents = $user->Parents;
+            $children = $user->Children;
+            
+            /*echo "user: ";
+            echo $user->name;
+            echo PHP_EOL."<br/>";
+            
+            echo "parents:";
+            echo PHP_EOL."<br/>";
+            foreach ($parents as $parent) {
+                echo $parent->name;
+                echo PHP_EOL."<br/>";
+            }
+            echo PHP_EOL."<br/>";
+            
+            echo "children:";
+            echo PHP_EOL."<br/>";
+            foreach ($children as $child) {
+                echo $child->name;
+                echo PHP_EOL."<br/>";
+            }
+            echo PHP_EOL."<br/>";
+            echo "--------------".PHP_EOL."<br/>";
+            echo PHP_EOL."<br/>";*/
+        }
+    }
+}
+
+class T1323UserReference extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        //$this->hasColumn('id', 'integer', null, array('primary' => true, 'autoincrement' => true));
+        $this->hasColumn('parent_id', 'integer', null, array('primary' => true));
+        $this->hasColumn('child_id', 'integer', null, array('primary' => true));
+    }
+}
+
+  
+  
+?>
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1323b2TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1323b2TestCase.php
new file mode 100644
index 000000000..b3db0cf95
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1323b2TestCase.php
@@ -0,0 +1,216 @@
+<?php
+
+class Doctrine_Ticket_1323b2_TestCase extends Doctrine_UnitTestCase {
+    public function prepareTables() {
+    	$this->tables = array();
+        $this->tables[] = "Concept";
+        $this->tables[] = "ConceptRelation";
+        parent::prepareTables();
+    }
+
+    public function prepareData() {}
+    
+    /**
+     * setting some polyhierarchical relations
+     */
+    public function resetData()
+    {
+        $q = Doctrine_Query::create();
+        $q->delete()->from("ConceptRelation")->execute();
+        $q = Doctrine_Query::create();
+        $q->delete()->from("Concept")->execute();
+
+        $concepts = array("Woodworking", "Metalworking",  
+                        "Submetalworking 1", "Submetalworking 2",  
+                        "Subwoodworking 1", "Subwoodworking 2",
+                        "Surfaceworking", 
+                        "drilled", "welded", "turned");
+
+        foreach ($concepts as $concept) { 
+            $c = new Concept();
+            $c->identifier = $concept;
+            $c->status = "approved";
+            $c->source = "test";
+            $c->created = "today";
+            $c->creator = "me";
+            $c->creationIdentifier = "nothing";
+            $c->save();
+        }
+        $w = Doctrine_Core::getTable("Concept")->findOneByIdentifier("Woodworking");
+        $sw1 = Doctrine_Core::getTable("Concept")->findOneByIdentifier("Subwoodworking 1");
+        $sw2 = Doctrine_Core::getTable("Concept")->findOneByIdentifier("Subwoodworking 2");
+        $m = Doctrine_Core::getTable("Concept")->findOneByIdentifier("Metalworking");
+        $sm1 = Doctrine_Core::getTable("Concept")->findOneByIdentifier("Submetalworking 1");
+        $sm2 = Doctrine_Core::getTable("Concept")->findOneByIdentifier("Submetalworking 2");
+        $d = Doctrine_Core::getTable("Concept")->findOneByIdentifier("drilled");
+        $wd = Doctrine_Core::getTable("Concept")->findOneByIdentifier("welded");
+        $t = Doctrine_Core::getTable("Concept")->findOneByIdentifier("turned");
+        $s =  Doctrine_Core::getTable("Concept")->findOneByIdentifier("Surfaceworking");
+        
+        $w->narrowerConcepts[] = $sw1;
+        $w->narrowerConcepts[] = $sw2;
+        $w->save();
+        
+        $sw1->narrowerConcepts[] = $s;
+        $sw1->narrowerConcepts[] = $d;
+        $sw1->narrowerConcepts[] = $t;
+        $sw1->save();
+        
+        $sw2->narrowerConcepts[] = $d;
+        $sw2->save();
+        
+        $m->narrowerConcepts[] = $sm1;
+        $m->narrowerConcepts[] = $sm2;
+        $m->save();
+        
+        $sm1->narrowerConcepts[] = $wd;
+        $sm1->narrowerConcepts[] = $s;
+        $sm1->save();
+        
+        $sm2->narrowerConcepts[] = $t;
+        $sm2->save();
+        
+        $s->narrowerConcepts[] = $t;
+        $s->narrowerConcepts[] = $d;
+        $s->save();
+    }
+
+    /**
+     * this test will fail ... 
+     */       
+    public function testFAIL() {
+        $this->resetData();
+
+        ConceptRelation::showAllRelations();
+        //lets count all relations
+        $relCount = ConceptRelation::countAll();
+        
+        $oRecord = Doctrine_Core::getTable("Concept")->findOneByIdentifier("Surfaceworking");
+        $oRecord->identifier = "MySurfaceworking";
+        $oRecord->save();
+        
+        ConceptRelation::showAllRelations();
+      
+        // we did not change any relations, so we assume this test to be passed
+        $this->assertEqual(ConceptRelation::countAll(), $relCount);
+        // -> where do the additional relations come from ???
+    }
+
+    /*
+     * ... while this test is ok (since we dont save anything)
+     */
+    public function testOK() {
+        $this->resetData();
+        
+        ConceptRelation::showAllRelations();
+        //lets count all relations
+        $relCount = ConceptRelation::countAll();
+        
+        $oRecord = Doctrine_Core::getTable("Concept")->findOneByIdentifier("Surfaceworking");
+        $oRecord->identifier = "MySurfaceworking";
+        // $oRecord->save();  --> only this line differs !!!
+        
+        ConceptRelation::showAllRelations();
+        
+        // we did not change any relations, so we assume this test to be passed
+        $this->assertEqual(ConceptRelation::countAll(), $relCount);
+    }
+}
+  
+
+
+
+
+
+
+
+/**
+ * This class has been auto-generated by the Doctrine ORM Framework
+ */
+class BaseConcept extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('concepts');
+    $this->hasColumn('id', 'integer', 4, array('primary' => true, 'autoincrement' => true, 'type' => 'integer', 'length' => '4'));
+    $this->hasColumn('vok_id as vokId', 'integer', 4, array('type' => 'integer', 'length' => '4'));
+    $this->hasColumn('identifier', 'string', 255, array('notnull' => true, 'type' => 'string', 'length' => '255'));
+    $this->hasColumn('status', 'string', 20, array('notnull' => true, 'type' => 'string', 'length' => '20'));
+    $this->hasColumn('source', 'string', 255, array('notnull' => true, 'type' => 'string', 'length' => '255'));
+    $this->hasColumn('created_on as created', 'string', 255, array('notnull' => true, 'type' => 'string', 'length' => '255'));
+    $this->hasColumn('creator', 'string', 255, array('notnull' => true, 'type' => 'string', 'length' => '255'));
+    $this->hasColumn('creation_identifier as creationIdentifier', 'string', 255, array('notnull' => true, 'type' => 'string', 'length' => '255'));
+
+    $this->option('type', 'INNODB');
+    $this->option('collate', 'utf8_unicode_ci');
+    $this->option('charset', 'utf8');
+  }
+
+  public function setUp()
+  {
+    $this->hasMany('Concept as broaderConcepts', array('refClass' => 'ConceptRelation',
+                                                       'local' => 'concept_id',
+                                                       'foreign' => 'parent_concept_id', 
+                                                       'refClassRelationAlias' => 'broaderLinks'));
+
+
+    $this->hasMany('Concept as narrowerConcepts', array('refClass' => 'ConceptRelation',
+                                                        'local' => 'parent_concept_id',
+                                                        'foreign' => 'concept_id', 
+                                                        'refClassRelationAlias' => 'narrowerLinks'));
+  }
+}
+
+/**
+ * This class has been auto-generated by the Doctrine ORM Framework
+ */
+class BaseConceptRelation extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('concepts_x_concepts');
+    $this->hasColumn('concept_id as conceptId', 'integer', 4, array('type' => 'integer', 'notnull' => true, 'length' => '4', 'primary' => true));
+    $this->hasColumn('parent_concept_id as conceptIdParent', 'integer', 4, array('type' => 'integer', 'notnull' => true, 'length' => '4', 'primary' => true));
+
+    $this->option('type', 'INNODB');
+    $this->option('collate', 'utf8_unicode_ci');
+    $this->option('charset', 'utf8');
+  }
+
+  public function setUp()
+  {
+    $this->hasOne('Concept as concept', array('local' => 'concept_id',
+                                              'foreign' => 'id'));
+
+    $this->hasOne('Concept as broaderConcept', array('local' => 'parent_concept_id',
+                                             'foreign' => 'id'));
+  }
+}
+
+
+/**
+ * This class has been auto-generated by the Doctrine ORM Framework
+ */
+class Concept extends BaseConcept
+{
+
+}
+
+/**
+ * This class has been auto-generated by the Doctrine ORM Framework
+ */
+class ConceptRelation extends BaseConceptRelation
+{
+    public static function showAllRelations() {
+        /*$relations = Doctrine_Core::getTable("ConceptRelation")->findAll();
+        foreach ($relations as $relation) {
+          echo $relation->broaderConcept->identifier."(".$relation->conceptIdParent.")->".$relation->concept->identifier."(".$relation->conceptId.")\n<br/>";
+        }
+        echo "\n\n<br/><br/>";*/
+    }
+    
+    public static function countAll() {
+        return Doctrine_Core::getTable("ConceptRelation")->count();
+    }
+}
+?>
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1325TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1325TestCase.php
new file mode 100644
index 000000000..d1847e46e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1325TestCase.php
@@ -0,0 +1,97 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1325_TestCase
+ *
+ * @package     Doctrine
+ * @author      Andrea Baron <andrea@bhweb.it>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1325_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1325_TableName_NoAlias';
+        $this->tables[] = 'Ticket_1325_TableName_Aliased';
+        parent::prepareTables();
+    }
+
+    public function testShouldInsertWithoutAlias()
+    {
+        $elem = new Ticket_1325_TableName_NoAlias();
+        $elem->id = 1;
+        $elem->save();
+        
+        $res = Doctrine_Query::create()
+            ->from('Ticket_1325_TableName_NoAlias')
+            ->fetchOne(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+        $now = time();
+        $time = strtotime($res['event_date']);
+        $this->assertTrue(($now + 5 >= $time) && ($time >= $now));
+    }
+
+    public function testShouldInsertWithAlias()
+    {
+        $elem = new Ticket_1325_TableName_Aliased();
+        $elem->id = 1;
+        $elem->save();
+        
+        $res = Doctrine_Query::create()
+            ->from('Ticket_1325_TableName_Aliased')
+            ->fetchOne(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+        $now = time();
+        $time = strtotime($res['eventDate']);
+        $this->assertTrue(strtotime($res['eventDate']) > 0);
+    }
+}
+
+class Ticket_1325_TableName_NoAlias extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', 4, array('primary' => true, 'autoincrement' => true));
+    }
+
+    public function setUp()
+    {
+        $this->actAs(new Doctrine_Template_Timestampable(array('created' => array('name' => 'event_date', 'type' => 'timestamp'), 'updated' => array('disabled' => true))));
+    }
+}
+
+class Ticket_1325_TableName_Aliased extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', 4, array('primary' => true, 'autoincrement' => true));
+    }
+
+    public function setUp()
+    {
+        $this->actAs(new Doctrine_Template_Timestampable(array('created' => array('name' => 'event_date', 'alias' => 'eventDate', 'type' => 'timestamp'), 'updated' => array('disabled' => true))));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1326TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1326TestCase.php
new file mode 100644
index 000000000..6fa1240af
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1326TestCase.php
@@ -0,0 +1,64 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1326_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1326_TestCase extends Doctrine_UnitTestCase 
+{
+    public function createTestData()
+    {
+        $user1 = new User();
+        $user1->set('loginname', 'foo2');
+        $user1->save();
+
+        $user2 = new User();
+        $user2->set('loginname', 'foo3');
+        $user2->save();
+    }
+
+    public function testTest()
+    {
+        $this->createTestData();
+        Doctrine_Query::create()->delete()->from('User')->execute();
+
+        $this->createTestData();
+        $this->assertEqual(Doctrine_Query::create()->from('User')->count(), 2);
+
+        $nbDeleted = Doctrine_Query::create()->delete()->from('User')->execute();
+        $this->assertEqual($nbDeleted, 2);
+        $this->assertEqual(Doctrine_Query::create()->from('User')->count(), 0);
+
+        $this->createTestData();
+        $this->assertEqual(Doctrine_Query::create()->from('User')->count(), 2);
+
+        $nbDeleted = Doctrine_Query::create()->delete()->from('User')->where('loginname = ?', array('foo2'))->execute();
+        $this->assertEqual($nbDeleted, 1);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1335TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1335TestCase.php
new file mode 100644
index 000000000..5ad21b0ef
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1335TestCase.php
@@ -0,0 +1,45 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1335_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1335_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        try {
+            $q = Doctrine_Query::create();
+            $results = $q->execute();
+            $this->fail();
+        } catch (Exception $e) {
+            $this->pass();
+        }
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1338TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1338TestCase.php
new file mode 100644
index 000000000..95fe70dc8
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1338TestCase.php
@@ -0,0 +1,53 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1338_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1338_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $q = Doctrine_Query::create()
+            ->from('User u');
+        $users = $q->execute();
+
+        $array = $users->toKeyValueArray('id', 'name');
+        $this->assertEqual($array, array(
+          4 => 'zYne',
+          5 => 'Arnold Schwarzenegger',
+          6 => 'Michael Caine',
+          7 => 'Takeshi Kitano',
+          8 => 'Sylvester Stallone',
+          9 => 'Kurt Russell',
+          10 => 'Jean Reno',
+          11 => 'Edward Furlong',
+        ));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1341TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1341TestCase.php
new file mode 100644
index 000000000..8927d4970
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1341TestCase.php
@@ -0,0 +1,98 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1341_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1341_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1341_User';
+        $this->tables[] = 'Ticket_1341_Profile';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        try {
+            $user = new Ticket_1341_User();
+            $user->username = 'jwage';
+            $user->password = 'changeme';
+            $user->Profile->name = 'Jonathan H. Wage';
+            $user->save();
+            $this->pass();
+            $this->assertEqual($user->toArray(true), array(
+              'id' => '1',
+              'username' => 'jwage',
+              'password' => 'changeme',
+              'Profile' => 
+              array(
+                'id' => '1',
+                'name' => 'Jonathan H. Wage',
+                'user_id' => '1',
+              ),
+            ));
+            $q = Doctrine_Query::create()
+                ->from('Ticket_1341_User u')
+                ->leftJoin('u.Profile p');
+            $this->assertEqual($q->getSqlQuery(), 'SELECT t.id AS t__id, t.username AS t__username, t.password AS t__password, t2.id AS t2__id, t2.name AS t2__name, t2.userid AS t2__userid FROM ticket_1341__user t LEFT JOIN ticket_1341__profile t2 ON t.id = t2.userid');
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+}
+
+class Ticket_1341_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_1341_Profile as Profile', array('local' => 'id', 'foreign' => 'user_id'));
+    }
+}
+
+class Ticket_1341_Profile extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+        $this->hasColumn('userId as user_id', 'integer');
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_1341_User as User', array('local' => 'user_id', 'foreign' => 'id'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1351TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1351TestCase.php
new file mode 100644
index 000000000..8a7a6b27a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1351TestCase.php
@@ -0,0 +1,79 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1351_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1351_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1351_Article';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $yml = <<<END
+Ticket_1351_Article:
+  Ticket_1351_Article_1:
+    Translation:
+      en:
+        title: Test title english
+        body: Test body english
+      fr:
+        title: Test title french
+        body: Test body french
+END;
+        file_put_contents('test.yml', $yml);
+        Doctrine_Core::loadData('test.yml', true);
+        unlink('test.yml');
+        $results = Doctrine_Query::create()
+                    ->from('Ticket_1351_Article a, a.Translation t')
+                    ->fetchArray();
+        $this->assertEqual($results[0]['Translation']['en']['title'], 'Test title english');
+    }
+}
+
+class Ticket_1351_Article extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('title', 'string', 255);
+        $this->hasColumn('body', 'clob');
+    }
+
+    public function setUp()
+    {
+        $i18n0 = new Doctrine_Template_I18n(array('fields' => array(0 => 'title', 1 => 'body')));
+        $searchable1 = new Doctrine_Template_Searchable(array('fields' => array(0 => 'title')));
+        $i18n0->addChild($searchable1);
+        $this->actAs($i18n0);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1365TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1365TestCase.php
new file mode 100644
index 000000000..b2df3b6a3
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1365TestCase.php
@@ -0,0 +1,141 @@
+<?php
+
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1365_TestCase
+ *
+ * @package     Doctrine
+ * @author      David Stendardi <david.stendardi@adenclassifieds.com>
+ * @category    Query
+ * @link        www.doctrine-project.org
+ * @since       0.10.4
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1365_TestCase extends Doctrine_UnitTestCase
+{
+    public function testInit()
+	{
+        $this->dbh = new Doctrine_Adapter_Mock('mysql');
+        $this->conn = Doctrine_Manager::getInstance()->openConnection($this->dbh);
+
+        $this->conn->setCharset('utf8');
+        $this->conn->setAttribute(Doctrine_Core::ATTR_USE_NATIVE_ENUM, true);
+	}
+
+    public function prepareData()
+    {
+    }
+
+    public function prepareTables()
+    {
+        $this->tables = array();
+        $this->tables[] = 'T1365_Person';
+        $this->tables[] = 'T1365_Skill';
+        $this->tables[] = 'T1365_PersonHasSkill';
+
+        parent :: prepareTables();
+    }
+
+    public function testTicket()
+    {
+        $q = Doctrine_Query::create()
+            ->select('s.*, phs.*')
+            ->from('T1365_Skill s')
+            ->leftJoin('s.T1365_PersonHasSkill phs')
+            ->where('phs.value0 > phs.value1');
+
+        $this->assertEqual(
+            $q->getSqlQuery(),
+            'SELECT l.id AS l__id, l.name AS l__name, ' .
+            'l2.id AS l2__id, l2.fk_person_id AS l2__fk_person_id, l2.fk_skill_id AS l2__fk_skill_id, l2.value0 AS l2__value0, l2.value1 AS l2__value1 ' .
+            'FROM la__skill l LEFT JOIN la__person_has_skill l2 ON l.id = l2.fk_skill_id ' .
+            'WHERE (l2.value0 > l2.value1)'
+        );
+    }
+}
+
+
+class T1365_Person extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('la__person');
+        
+        $this->hasColumn('name', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('T1365_PersonHasSkill', array('local' => 'id', 'foreign' => 'fk_person_id'));
+    }
+}
+
+
+class T1365_Skill extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('la__skill');
+        
+        $this->hasColumn('name', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('T1365_PersonHasSkill', array('local' => 'id', 'foreign' => 'fk_skill_id'));
+    }
+}
+
+
+class T1365_PersonHasSkill extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('la__person_has_skill');
+        
+        $this->hasColumn('fk_person_id', 'integer', 8, array(
+            'type' => 'integer', 'length' => '8'
+        ));
+
+        $this->hasColumn('fk_skill_id', 'integer', 8, array(
+            'type' => 'integer', 'length' => '8'
+        ));
+
+        $this->hasColumn('value0', 'enum', 3, array(
+            'type' => 'enum', 'values' => array(
+                0 => '0', 1 => '1', 2 => '2', 3 => '3'
+            ), 'default' => 0, 'notnull' => true, 'length' => '3'
+        ));
+
+        $this->hasColumn('value1', 'enum', 3, array(
+            'type' => 'enum', 'values' => array(
+                0 => '0', 1 => '1', 2 => '2', 3 => '3'
+            ), 'default' => 0, 'notnull' => true, 'length' => '3'
+        ));
+    }
+    
+    public function setUp()
+    {
+        $this->hasOne('T1365_Person', array('local' => 'fk_person_id', 'foreign' => 'id'));
+        $this->hasOne('T1365_Skill', array('local' => 'fk_skill_id', 'foreign' => 'id'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1372TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1372TestCase.php
new file mode 100644
index 000000000..c818141cf
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1372TestCase.php
@@ -0,0 +1,128 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1372_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1372_TestCase extends Doctrine_UnitTestCase 
+{
+    /* Test array of SQL queries to ensure uniqueness of queries */
+    public function testExportSql()
+    {
+        $drivers = array('mysql',
+                         'sqlite',
+                         'pgsql',
+                         'oracle',
+                         'mssql');
+
+        foreach ($drivers as $driver)
+        {
+            $dbh = new Doctrine_Adapter_Mock($driver);
+
+            $conn = Doctrine_Manager::getInstance()->connection($dbh, $driver);
+
+            $sql = $conn->export->exportSortedClassesSql(array('Ticket_1372_ParentClass', 'Ticket_1372_Child_1', 'Ticket_1372_Child_2'), false);
+
+            $this->assertEqual($sql, array_unique($sql));
+
+            $conn = null;
+
+            $dbh = null;
+        }
+    }
+}
+
+/*
+# schema in YAML format
+---
+Ticket_1372_ParentClass:
+  columns:
+    id:
+      primary: true
+      notnull: true
+      autoincrement: true
+      type: integer(4)
+    type:
+      unique: true
+      notnull: true
+      type: integer
+    value_1:
+      type: integer(4)
+    value_2:
+      type: integer(4)
+  indexes:
+    type_idx:
+      fields: [type]
+    values_idx:
+      fields: [value_1, value_2]
+  attributes:
+    export:   [all]
+
+Ticket_1372_Child_1:
+  inheritance:
+    extends: Ticket_1372_ParentClass
+    type: column_aggregation
+    keyField: type
+    keyValue: 1
+
+Ticket_1372_Child_2:
+  inheritance:
+    extends: Ticket_1372_ParentClass
+    type: column_aggregation
+    keyField: type
+    keyValue: 2
+*/
+
+class Ticket_1372_ParentClass extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('parent_class');
+
+        $this->hasColumn('id', 'integer', 4, array('primary' => true, 'autoincrement' => true, 'type' => 'integer', 'length' => '4'));
+        $this->hasColumn('type', 'integer', null, array('unique' => true, 'notnull' => true, 'type' => 'integer'));
+        $this->hasColumn('value_1', 'integer', 4, array('type' => 'integer', 'length' => '4'));
+        $this->hasColumn('value_2', 'integer', 4, array('type' => 'integer', 'length' => '4'));
+
+        $this->index('type_idx', array('fields' => array(0 => 'type')));
+        $this->index('values_idx', array('fields' => array(0 => 'value_1', 1 => 'value_2')));
+
+        $this->setAttribute(Doctrine_Core::ATTR_EXPORT, Doctrine_Core::EXPORT_ALL);
+
+        $this->setSubClasses(array('Child_1' => array('type' => 1), 'Child_2' => array('type' => 2)));
+    }
+}
+
+class Ticket_1372_Child_1 extends Ticket_1372_ParentClass
+{
+}
+
+class Ticket_1372_Child_2 extends Ticket_1372_ParentClass
+{
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1380TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1380TestCase.php
new file mode 100644
index 000000000..ba81cd433
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1380TestCase.php
@@ -0,0 +1,44 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1380_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1380_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $q = Doctrine_Query::create()
+            ->select('u.*, COUNT(p.id) as num_phonenumbers')
+            ->from('User u')
+            ->leftJoin('u.Phonenumber p');
+        $users = $q->fetchArray();
+        $this->assertTrue(isset($users[0]['num_phonenumbers']));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1381TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1381TestCase.php
new file mode 100644
index 000000000..dee34ab11
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1381TestCase.php
@@ -0,0 +1,160 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1381_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1381_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'T1381_Comment';
+        $this->tables[] = 'T1381_Article';
+
+        parent::prepareTables();
+    }
+    
+    
+    public function prepareData()
+    {
+        $a = new T1381_Article();
+        $a->title = 'When cleanData worked as expected!';
+        $a->save();
+        
+        $c = new T1381_Comment();
+        $c->article_id = $a->id;
+        $c->body = 'Yeah! It will work one day.';
+        $c->save();
+
+        $c = new T1381_Comment();
+        $c->article_id = $a->id;
+        $c->body = 'It will!';
+        $c->save();
+        
+        // Cleaning up IdentityMap
+        Doctrine_Core::getTable('T1381_Article')->clear();
+        Doctrine_Core::getTable('T1381_Comment')->clear();
+    }
+    
+    public function testTicket()
+    {
+        try {
+            // Now we fetch with data we want (it seems it overrides calculates columns of already fetched objects)
+            $dql = 'SELECT c.*, a.* FROM T1381_Comment c INNER JOIN c.T1381_Article a';
+            $items = Doctrine_Query::create()->query($dql, array(), Doctrine_Core::HYDRATE_ARRAY);
+
+            // This should result in false, since we didn't fetch for this column
+            $this->assertFalse(array_key_exists('ArticleTitle', $items[0]['T1381_Article']));
+            
+            // We fetch for data including new columns
+            $dql = 'SELECT c.*, a.title as ArticleTitle FROM T1381_Comment c INNER JOIN c.T1381_Article a WHERE c.id = ?';
+            $items = Doctrine_Query::create()->query($dql, array(1), Doctrine_Core::HYDRATE_ARRAY);
+            $comment = $items[0];
+
+            $this->assertTrue(array_key_exists('ArticleTitle', $comment));
+        } catch (Doctrine_Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+
+
+    public function testTicketInverse()
+    {
+        try {
+            // We fetch for data including new columns
+            $dql = 'SELECT c.*, a.title as ArticleTitle FROM T1381_Comment c INNER JOIN c.T1381_Article a WHERE c.id = ?';
+            $items = Doctrine_Query::create()->query($dql, array(1), Doctrine_Core::HYDRATE_ARRAY);
+            $comment = $items[0];
+
+            $this->assertTrue(array_key_exists('ArticleTitle', $comment));
+
+            // Now we fetch with data we want (it seems it overrides calculates columns of already fetched objects)
+            $dql = 'SELECT c.*, a.* FROM T1381_Comment c INNER JOIN c.T1381_Article a';
+            $items = Doctrine_Query::create()->query($dql, array(), Doctrine_Core::HYDRATE_ARRAY);
+
+            // This should result in false, since we didn't fetch for this column
+            $this->assertFalse(array_key_exists('ArticleTitle', $items[0]['T1381_Article']));
+
+            // Assert that our existent component still has the column, even after new hydration on same object
+            $this->assertTrue(array_key_exists('ArticleTitle', $comment));
+
+            // Fetch including new columns again
+            $dql = 'SELECT c.id, a.*, a.id as ArticleTitle FROM T1381_Comment c INNER JOIN c.T1381_Article a';
+            $items = Doctrine_Query::create()->query($dql, array(), Doctrine_Core::HYDRATE_ARRAY);
+
+            // Assert that new calculated column with different content do not override the already fetched one
+            $this->assertTrue(array_key_exists('ArticleTitle', $items[0]));
+            
+            // Assert that our existent component still has the column, even after new hydration on same object
+            $this->assertTrue(array_key_exists('ArticleTitle', $comment));
+            $this->assertTrue($comment, 'When cleanData worked as expected!');
+        } catch (Doctrine_Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+}
+
+
+class T1381_Article extends Doctrine_Record
+{
+    public function setTableDefinition() {
+        $this->hasColumn('id', 'integer', null, array('primary' => true, 'autoincrement' => true));
+        $this->hasColumn('title', 'string', 255, array('notnull' => true));
+    }
+    
+    public function setUp() {
+        $this->hasMany(
+            'T1381_Comment',
+            array(
+                'local' => 'id',
+                'foreign' => 'article_id'
+            )
+        );
+    }
+}
+
+
+class T1381_Comment extends Doctrine_Record
+{
+    public function setTableDefinition() {
+        $this->hasColumn('id', 'integer', null, array('primary' => true, 'autoincrement' => true));
+        $this->hasColumn('body', 'string', null, array('notnull' => true));
+        $this->hasColumn('article_id', 'integer', null, array('notnull' => true));
+    }
+
+    public function setUp() {
+        $this->hasOne(
+            'T1381_Article',
+            array(
+                'local' => 'article_id',
+                'foreign' => 'id'
+            )
+        );
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1383TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1383TestCase.php
new file mode 100644
index 000000000..6c1d7c11b
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1383TestCase.php
@@ -0,0 +1,96 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1383_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1383_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1383_Image';
+        $this->tables[] = 'Ticket_1383_Brand_Image';
+        $this->tables[] = 'Ticket_1383_Brand';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $orig = Doctrine_Manager::getInstance()->getAttribute(Doctrine_Core::ATTR_VALIDATE);
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+        try {
+            $brand = new Ticket_1383_Brand;
+            $brand->name = 'The Great Brand';
+            $brand->Ticket_1383_Brand_Image[0]->name = 'imagename';
+            $brand->Ticket_1383_Brand_Image[0]->owner_id = 1;
+            $brand->Ticket_1383_Brand_Image[0]->owner_type = 0;
+            $brand->save();
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, $orig);
+    }
+}
+
+class Ticket_1383_Image extends Doctrine_Record
+{
+    public function setTableDefinition() {
+        $this->hasColumn('id', 'integer', null, array('primary' => true, 'autoincrement' => true));
+        $this->hasColumn('owner_id', 'integer', null, array('notnull' => true));
+        $this->hasColumn('owner_type', 'integer', 5, array('notnull' => true));
+        $this->hasColumn('name', 'string', 128, array('notnull' => true, 'unique' => true));
+
+        $this->setSubclasses(array(
+            'Ticket_1383_Brand_Image'           => array('owner_type' => 0)
+        ));
+    }
+}
+
+class Ticket_1383_Brand_Image extends Ticket_1383_Image
+{
+}
+
+class Ticket_1383_Brand extends Doctrine_Record
+{
+    public function setTableDefinition() {
+        $this->hasColumn('id', 'integer', null, array('primary' => true, 'autoincrement' => true));
+        $this->hasColumn('name', 'string', 255, array('notnull' => true));
+    }
+    
+    public function setUp() {
+        $this->hasMany(
+            'Ticket_1383_Brand_Image',
+            array(
+                'local' => 'id',
+                'foreign' => 'owner_id'
+            )
+        );
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1385TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1385TestCase.php
new file mode 100644
index 000000000..9914658e3
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1385TestCase.php
@@ -0,0 +1,97 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1385_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1385_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1385_User1';
+        $this->tables[] = 'Ticket_1385_User2';
+        $this->tables[] = 'Ticket_1385_User3';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+
+        $user = new Ticket_1385_User1();
+        $user->username = 'jwage';
+        $user->password = 'changeme';
+        $user->email_address = 'jonwage@ertoihertionerti.com';
+        $this->assertTrue($user->isValid());
+
+        $user = new Ticket_1385_User2();
+        $user->username = 'jwage';
+        $user->password = 'changeme';
+        $user->email_address = 'jonwage@ertoihertionerti.com';
+        $this->assertFalse($user->isValid());
+
+        $user = new Ticket_1385_User3();
+        $user->username = 'jwage';
+        $user->password = 'changeme';
+        $user->email_address = 'jonwage@ertoihertionerti.com';
+        $this->assertFalse($user->isValid());
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+}
+
+class Ticket_1385_User1 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+        $this->hasColumn('email_address', 'string', 255, array('email' => array('check_mx' => false)));
+    }
+}
+
+class Ticket_1385_User2 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+        $this->hasColumn('email_address', 'string', 255, array('email' => array('check_mx' => true)));
+    }
+}
+
+class Ticket_1385_User3 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+        $this->hasColumn('email_address', 'string', 255, array('email'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1390TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1390TestCase.php
new file mode 100644
index 000000000..07c416043
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1390TestCase.php
@@ -0,0 +1,44 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1390_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1390_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $user = new User();
+        
+        $record1 = $user->getTable()->find(4);
+        $record2 = Doctrine_Core::getTable('User')->find(4);
+
+        $this->assertIdentical($record1, $record2);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1395TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1395TestCase.php
new file mode 100644
index 000000000..f20a829a4
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1395TestCase.php
@@ -0,0 +1,97 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1395_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1395_TestCase extends Doctrine_UnitTestCase
+{    
+    public function prepareTables()
+    {
+        $this->tables = array();
+        $this->tables[] = 'T1395_MyModel';
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+	    $myModel = new T1395_MyModel();
+	    $myModel->dt_created = '2005-10-01';
+	    $myModel->id = 0;
+	    $myModel->save();
+    }
+
+    public function testTicket()
+    {
+        try {
+            $myModel = $this->conn->getTable('T1395_MyModel')->find(0);
+            $this->assertTrue(isset($myModel->dt_created));
+            $this->assertTrue(isset($myModel->days_old)); // This is a calculated field from within the T1395_Listener::preHydrate
+            $this->assertTrue(isset($myModel->dt_created_tx)); // This is a calculated field from within the T1395_Listener::preHydrate
+        } catch (Doctrine_Exception $e) {
+            $this->fail($e->getMessage());
+        }
+   }
+}
+
+class T1395_MyModel extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', 4, array('primary' => true, 'notnull' => true));
+        $this->hasColumn('dt_created', 'date');
+    }
+
+    public function setUp()
+    {
+        $this->addListener(new T1395_Listener());
+    }
+
+}
+
+class T1395_Listener extends Doctrine_Record_Listener
+{
+    public function preHydrate(Doctrine_Event $event)
+    {
+        $data = $event->data;
+        
+        // Calculate days since creation
+        $days = (strtotime('now') - strtotime($data['dt_created'])) / (24 * 60 * 60);
+        $data['days_old'] = number_format($days, 2);
+
+        self::addSomeData($data);
+        
+        $event->data = $data;
+    }
+    
+    public static function addSomeData(&$data)
+    {
+        $data['dt_created_tx'] = date('M d, Y', strtotime($data['dt_created']));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1400TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1400TestCase.php
new file mode 100644
index 000000000..5a4fc5bad
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1400TestCase.php
@@ -0,0 +1,45 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1400_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1400_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $q = Doctrine_Query::create()
+                ->from('User u')
+                ->where('u.id IN (SELECT u2.id FROM User u2 GROUP BY u2.id HAVING MAX(u2.version))')
+                ->orderBy('u.loginname asc');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id FROM entity e WHERE (e.id IN (SELECT e2.id AS e2__id FROM entity e2 WHERE (e2.type = 0) GROUP BY e2.id HAVING MAX(e2.version)  ) AND (e.type = 0)) ORDER BY e.loginname asc');
+
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1417TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1417TestCase.php
new file mode 100644
index 000000000..137fe469f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1417TestCase.php
@@ -0,0 +1,55 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1417_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1417_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $user = new User();
+        $user->name = 'jwagejon';
+        $this->assertEqual($user->getModified(), array('name' => 'jwagejon'));
+        $this->assertEqual($user->getModified(true), array('name' => null));
+        $user->save();
+        $this->assertEqual($user->getModified(), array());
+        $this->assertEqual($user->getModified(true), array());
+        $this->assertEqual($user->getLastModified(), array('name' => 'jwagejon', 'type' => 0));
+        $this->assertEqual($user->getLastModified(true), array('name' => null, 'type' => null));
+        $user->name = 'jon';
+        $this->assertEqual($user->getModified(), array('name' => 'jon'));
+        $this->assertEqual($user->getModified(true), array('name' => 'jwagejon'));
+        $user->save();
+        $this->assertEqual($user->getModified(), array());
+        $this->assertEqual($user->getModified(true), array());
+        $this->assertEqual($user->getLastModified(), array('name' => 'jon'));
+        $this->assertEqual($user->getLastModified(true), array('name' => 'jwagejon'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1419TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1419TestCase.php
new file mode 100644
index 000000000..e18b07662
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1419TestCase.php
@@ -0,0 +1,54 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1419_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1419_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $user = Doctrine_Query::create()
+                ->from('User u')
+                ->leftJoin('u.Phonenumber p')
+                ->where('u.id = ?', 4)
+                ->fetchOne();
+        $user->Phonenumber[0]->phonenumber = '6155139185';
+        $user->save();
+        $user->free();
+
+        $user = Doctrine_Query::create()
+                ->from('User u')
+                ->leftJoin('u.Phonenumber p')
+                ->where('u.id = ?', 4)
+                ->fetchOne();
+        $this->assertTrue($user->Phonenumber->getLast()->id);
+        $this->assertEqual($user->Phonenumber->getLast()->phonenumber, '6155139185');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1436TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1436TestCase.php
new file mode 100644
index 000000000..db30bd4b7
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1436TestCase.php
@@ -0,0 +1,132 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1436_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1436_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        parent::prepareTables();
+    }
+    
+    public function prepareData()
+    {
+        $user = new User();
+        $user->name = 'John';
+        $user->save();
+        
+        # Create existing groups
+        $group = new Group();
+        $group->name = 'Group One';
+        $group->save();
+        $this->group_one = $group['id'];
+        
+        $group = new Group();
+        $group->name = 'Group Two';
+        $group->save();
+        $this->group_two = $group['id'];
+        
+        $group = new Group();
+        $group->name = 'Group Three';
+        $group->save();
+        $this->group_three = $group['id'];
+    }
+    
+    public function testSynchronizeAddMNLinks()
+    {
+        $user = Doctrine_Query::create()->from('User u')->fetchOne();
+        $userArray = array(
+            'Group' => array(
+                $this->group_one,
+                $this->group_two
+            )
+        );
+
+        $user->synchronizeWithArray($userArray);
+
+        try {
+          $user->save();
+        } catch (Exception $e ) {
+          $this->fail("Failed saving with " . $e->getMessage());
+        }
+    }
+    public function testSynchronizeAddMNLinksAfterSave()
+    {
+        $user = Doctrine_Query::create()->from('User u, u.Group g')->fetchOne();
+        $this->assertEqual($user->Group[0]->name, 'Group One');
+        $this->assertEqual($user->Group[1]->name, 'Group Two');
+        $this->assertTrue(!isset($user->Group[2]));
+    }
+    public function testSynchronizeChangeMNLinks()
+    {
+        $user = Doctrine_Query::create()->from('User u, u.Group g')->fetchOne();
+        $userArray = array(
+            'Group' => array(
+                $this->group_two,
+                $this->group_three
+            )
+        );
+        
+        $user->synchronizeWithArray($userArray);
+        
+        $this->assertTrue(!isset($user->Groups));
+        
+        try {
+          $user->save();
+        } catch (Exception $e ) {
+          $this->fail("Failed saving with " . $e->getMessage());
+        }
+        
+        $user->refresh();
+        $user->loadReference('Group');
+        
+        $this->assertEqual($user->Group[0]->name, 'Group Two');
+        $this->assertEqual($user->Group[1]->name, 'Group Three');
+        $this->assertTrue(!isset($user->Group[2]));
+    }
+
+    public function testFromArray()
+    {
+        $user = new User();
+        $userArray = array('Group' => array($this->group_two, $this->group_three));
+        $user->fromArray($userArray);
+        $this->assertEqual($user->Group[0]->name, 'Group Two');
+        $this->assertEqual($user->Group[1]->name, 'Group Three');
+    }
+
+    public function testSynchronizeMNRecordsDontDeleteAfterUnlink()
+    {
+        $group = Doctrine_Core::getTable('Group')->find($this->group_one);
+        
+        $this->assertTrue(!empty($group));
+        $this->assertEqual($group->name, 'Group One');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1441TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1441TestCase.php
new file mode 100644
index 000000000..1e5258f20
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1441TestCase.php
@@ -0,0 +1,77 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1441_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1441_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1441_User';
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+        $user = new Ticket_1441_User();
+        $user->username = 'jwage';
+        $user->password = 'changeme';
+        $user->save();
+    }
+
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+        $q = Doctrine_Query::create()
+            ->update('Ticket_1441_User u')
+            ->set('u.password', '?',  'test')
+            ->where('u.username = ?', 'jwage');
+
+        $q->execute();
+
+        $this->assertEqual($q->getDql(), 'UPDATE Ticket_1441_User u SET u.password = ? u.updated_at = ? WHERE u.username = ?');
+        $this->assertEqual($q->getFlattenedParams(), array('test', date('Y-m-d H:i:s', time()), 'jwage'));
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+    }
+}
+
+class Ticket_1441_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('Timestampable');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1449TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1449TestCase.php
new file mode 100644
index 000000000..c62033c88
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1449TestCase.php
@@ -0,0 +1,96 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1449_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1449_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1449_Document';
+        $this->tables[] = 'Ticket_1449_Attachment';
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+        $document = new Ticket_1449_Document();
+        $document->name = 'test';
+        $document->Attachments[]->name = 'test 1';
+        $document->Attachments[]->name = 'test 2';
+        $document->Attachments[]->name = 'test 3';
+        $document->save();
+    }
+
+    public function testTest()
+    {
+        $document = Doctrine_Query::create()
+            ->select('d.id, d.name, a.id, a.document_id')
+            ->from('Ticket_1449_Document d')
+            ->leftJoin('d.Attachments a')
+            ->limit(1)
+            ->fetchOne();
+        $this->assertEqual($document->state(), 4);
+        foreach ($document->Attachments as $attachment)
+        {
+            $this->assertEqual($attachment->state(), 4);
+        }
+    }
+}
+
+class Ticket_1449_Document extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+        $this->hasColumn('test', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_1449_Attachment as Attachments', array('local'   => 'id',
+                                                                      'foreign' => 'document_id'));
+    }
+}
+
+class Ticket_1449_Attachment extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('document_id', 'integer');
+        $this->hasColumn('name', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_1449_Document as Document', array('local'   => 'document_id',
+                                                                'foreign' => 'id'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1452TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1452TestCase.php
new file mode 100644
index 000000000..7e721332f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1452TestCase.php
@@ -0,0 +1,77 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1452_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1452_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Model_Product';
+        parent::prepareTables();
+    }
+
+    public function testFindByIdAutomaticallyLoadsRelationsForInstanceTranslation()
+    {
+        $name = 'New York';
+        $description = 'En dansk beskrivelse';
+
+        try {
+            $item = new Model_Product;
+            $item->name = $name;
+            $item->Translation['DK']->description = $description;
+            $item->Translation['EN']->description = 'Some english description';
+            $item->save();
+
+            $reopened = Doctrine_Core::getTable('Model_Product')->findOneById($item->id);
+            $this->assertEqual($name, $reopened->name);
+            $this->assertEqual($description, $reopened->Translation['DK']->description);
+
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+}
+
+class Model_Product extends Doctrine_Record
+{
+    public function setTableDefinition ()
+    {
+        $this->hasColumn('name', 'string', 30);
+        $this->hasColumn('description', 'string', 65555);
+        $this->hasColumn('price', 'integer', 20);
+    }
+
+    public function setUp ()
+    {
+        $this->actAs('I18n', array('fields' => array('description')));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1454TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1454TestCase.php
new file mode 100644
index 000000000..c5dc4d19d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1454TestCase.php
@@ -0,0 +1,45 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1454_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1454_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $q = Doctrine_Query::create()
+            ->from('User u')
+            ->leftJoin('u.Phonenumber p')
+            ->where('p.id = (SELECT MAX(p2.id) FROM Phonenumber p2 LIMIT 1)')
+            ->orWhere('p.id = (SELECT MIN(p3.id) FROM Phonenumber p3 LIMIT 1)');
+            
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id, p.id AS p__id, p.phonenumber AS p__phonenumber, p.entity_id AS p__entity_id FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (p.id = (SELECT MAX(p2.id) AS p2__0 FROM phonenumber p2 LIMIT 1) OR p.id = (SELECT MIN(p3.id) AS p3__0 FROM phonenumber p3 LIMIT 1) AND (e.type = 0))');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1461TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1461TestCase.php
new file mode 100644
index 000000000..698c4a142
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1461TestCase.php
@@ -0,0 +1,86 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1461_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1461_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testFetchArraySupportsTwoAggregates()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select("u.*, p.*, CONCAT(u.name, '_1') concat1, CONCAT(u.name, '_2') concat2")
+        ->from('User u')
+        ->innerJoin('u.Phonenumber p')
+        ->where("u.name = 'zYne'");
+        
+        $users = $q->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+        $this->assertEqual($users[0]['concat1'], 'zYne_1');
+
+        $this->assertEqual($users[0]['concat2'], 'zYne_2');
+    }
+    
+    public function testFetchArraySupportsTwoAggregatesInRelation()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select("u.*, p.*, CONCAT(p.phonenumber, '_1') concat1, CONCAT(p.phonenumber, '_2') concat2")
+        ->from('User u')
+        ->innerJoin('u.Phonenumber p')
+        ->where("u.name = 'zYne'");
+        
+        $users = $q->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+        $this->assertEqual($users[0]['concat2'], '123 123_2');
+        
+        $this->assertEqual($users[0]['concat1'], '123 123_1');
+    } 
+
+    public function testFetchArraySupportsTwoAggregatesInRelationAndRoot()
+    {
+        $q = new Doctrine_Query();
+
+        $q->select("u.*, p.*, CONCAT(u.name, '_1') concat1, CONCAT(u.name, '_2') concat2, CONCAT(p.phonenumber, '_3') concat3, CONCAT(p.phonenumber, '_3') concat4")
+        ->from('User u')
+        ->innerJoin('u.Phonenumber p')
+        ->where("u.name = 'zYne'");
+        
+        $users = $q->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+        $this->assertEqual($users[0]['concat1'], 'zYne_1');
+
+        $this->assertEqual($users[0]['concat2'], 'zYne_2');
+
+        $this->assertEqual($users[0]['concat3'], '123 123_3');
+        
+        $this->assertTrue(isset($users[0]['concat4']));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1464TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1464TestCase.php
new file mode 100644
index 000000000..92ec63fff
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1464TestCase.php
@@ -0,0 +1,66 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1464_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1464_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1464_User';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+        try {
+            $user = new Ticket_1464_User();
+            $user->username = 'jwage';
+            $user->created_at = '2004-10-14 11:51:17.621832+02';
+            $user->save();
+            $user->created_at = '2004-10-14 11:51:17';
+            $user->save();
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+}
+
+class Ticket_1464_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('created_at', 'timestamp');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1465TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1465TestCase.php
new file mode 100644
index 000000000..01c7fc207
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1465TestCase.php
@@ -0,0 +1,46 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1465_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1465_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        try {
+            $q = Doctrine_Query::create()
+                ->from('User u, Phonenumber p');
+            $users = $q->fetchArray();
+            $this->fail();
+        } catch (Exception $e) {
+            $this->pass();
+        }
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1467TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1467TestCase.php
new file mode 100644
index 000000000..5a7666281
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1467TestCase.php
@@ -0,0 +1,127 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1467_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1467_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTicket()
+    {
+        // SELECT picture_id FROM ItemPicture INNER JOIN Puzzle ON ItemPicture.item_id=ItemPuzzle_item_id
+        $q = Doctrine_Query::create()
+            ->select('pic.id')
+            ->from('T1467_Picture pic')
+            ->innerJoin('pic.Items ite')
+            ->innerJoin('ite.Puzzles puz');
+
+        $this->assertEqual($q->getDql(), 'SELECT pic.id FROM T1467_Picture pic INNER JOIN pic.Items ite INNER JOIN ite.Puzzles puz');
+        $this->assertEqual($q->getSqlQuery(), 'SELECT t.id AS t__id FROM t1467__picture t INNER JOIN t1467__item_picture t3 ON (t.id = t3.picture_id) INNER JOIN t1467__item t2 ON t2.id = t3.item_id INNER JOIN t1467__item_puzzle t5 ON (t2.id = t5.item_id) INNER JOIN t1467__puzzle t4 ON t4.id = t5.puzzle_id');
+    }
+}
+
+
+class T1467_Item extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 50);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('T1467_Picture as Pictures', array(
+            'refClass' => 'T1467_ItemPicture',
+            'local' => 'item_id',
+            'foreign' => 'picture_id'
+        ));
+
+        $this->hasMany('T1467_Puzzle as Puzzles', array(
+            'refClass' => 'T1467_ItemPuzzle',
+            'local' => 'item_id',
+            'foreign' => 'puzzle_id'
+        ));
+    }
+}
+
+
+class T1467_Picture extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 50);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('T1467_Item as Items', array(
+            'refClass' => 'T1467_ItemPicture',
+            'local' => 'picture_id',
+            'foreign' => 'item_id'
+        ));
+    }
+}
+
+
+class T1467_Puzzle extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 50);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('T1467_Item as Items', array(
+            'refClass' => 'T1467_ItemPicture',
+            'local' => 'puzzle_id',
+            'foreign' => 'item_id'
+        ));
+    }
+}
+
+
+class T1467_ItemPicture extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('item_id', 'integer', null, array('primary' => true));
+        $this->hasColumn('picture_id', 'integer', null, array('primary' => true));
+    }
+}
+
+
+class T1467_ItemPuzzle extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('item_id', 'integer', null, array('primary' => true));
+        $this->hasColumn('puzzle_id', 'integer', null, array('primary' => true));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1480TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1480TestCase.php
new file mode 100644
index 000000000..c912e72b1
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1480TestCase.php
@@ -0,0 +1,77 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1480_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1480_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Foo';
+        $this->tables[] = 'Bar';
+        parent::prepareTables();
+    }
+
+    public function testSubQueryWithSoftDeleteTestCase()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+        $q = Doctrine_Query::create()
+            ->from('Foo f')
+            ->addWhere('f.id IN (SELECT b.user_id FROM Bar b)');
+        $this->assertEqual($q->getSqlQuery(), 'SELECT f.id AS f__id, f.name AS f__name, f.password AS f__password, f.deleted_at AS f__deleted_at FROM foo f WHERE (f.id IN (SELECT b.user_id AS b__user_id FROM bar b) AND (f.deleted_at IS NULL))');
+        $this->assertEqual(count($q->getFlattenedParams()), 0);
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+    }
+}
+
+class Foo extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('foo');
+        $this->hasColumn('id', 'integer');
+        $this->hasColumn('name', 'string');
+        $this->hasColumn('password', 'string');
+    }
+
+    public function setUp()
+    {
+        $this->actAs('SoftDelete');
+    }
+}
+
+class Bar extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('bar');
+        $this->hasColumn('user_id', 'integer');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1483TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1483TestCase.php
new file mode 100644
index 000000000..4c963e185
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1483TestCase.php
@@ -0,0 +1,110 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1483_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1483_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $q = Doctrine_Query::create()
+            ->from('Ticket_1483_User u')
+            ->leftJoin('u.Groups g WITH g.id = (SELECT g2.id FROM Ticket_1483_Group g2 WHERE (g2.name = \'Test\' OR g2.name = \'Test2\'))');
+        $this->assertEqual($q->getSqlQuery(), 'SELECT t.id AS t__id, t.username AS t__username, t2.id AS t2__id, t2.name AS t2__name FROM ticket_1483__user t LEFT JOIN ticket_1483__user_group t3 ON (t.id = t3.user_id) LEFT JOIN ticket_1483__group t2 ON t2.id = t3.group_id AND (t2.id = (SELECT t4.id AS t4__id FROM ticket_1483__group t4 WHERE (t4.name = \'Test\' OR t4.name = \'Test2\')))');
+
+    }
+    
+    public function testTest2()
+    {
+        $q = Doctrine_Query::create()
+            ->from('Ticket_1483_User u')
+            ->leftJoin('u.Groups g WITH g.id = (SELECT g2.id FROM Ticket_1483_Group g2 WHERE (g2.name = \'Test\' OR (g2.name = \'Test2\')))');
+        $this->assertEqual($q->getSqlQuery(), 'SELECT t.id AS t__id, t.username AS t__username, t2.id AS t2__id, t2.name AS t2__name FROM ticket_1483__user t LEFT JOIN ticket_1483__user_group t3 ON (t.id = t3.user_id) LEFT JOIN ticket_1483__group t2 ON t2.id = t3.group_id AND (t2.id = (SELECT t4.id AS t4__id FROM ticket_1483__group t4 WHERE (t4.name = \'Test\' OR t4.name = \'Test2\')))');
+
+    }
+    
+    public function testTest3()
+    {
+        $q = Doctrine_Query::create()
+            ->from('Ticket_1483_User u')
+            ->leftJoin('u.Groups g WITH g.id = (SELECT g2.id FROM Ticket_1483_Group g2 WHERE ((g2.name = \'Test\' AND g2.name = \'Test2\') OR (g2.name = \'Test2\')))');
+        $this->assertEqual($q->getSqlQuery(), 'SELECT t.id AS t__id, t.username AS t__username, t2.id AS t2__id, t2.name AS t2__name FROM ticket_1483__user t LEFT JOIN ticket_1483__user_group t3 ON (t.id = t3.user_id) LEFT JOIN ticket_1483__group t2 ON t2.id = t3.group_id AND (t2.id = (SELECT t4.id AS t4__id FROM ticket_1483__group t4 WHERE ((t4.name = \'Test\' AND t4.name = \'Test2\') OR t4.name = \'Test2\')))');
+
+    }
+
+    public function testTest4()
+    {
+        $q = Doctrine_Query::create()
+            ->from('Ticket_1483_User u')
+            ->leftJoin('u.Groups g WITH g.id = (SELECT COUNT(*) FROM Ticket_1483_Group)');
+        $this->assertEqual($q->getSqlQuery(), 'SELECT t.id AS t__id, t.username AS t__username, t2.id AS t2__id, t2.name AS t2__name FROM ticket_1483__user t LEFT JOIN ticket_1483__user_group t3 ON (t.id = t3.user_id) LEFT JOIN ticket_1483__group t2 ON t2.id = t3.group_id AND (t2.id = (SELECT COUNT(*) AS t4__0 FROM ticket_1483__group t4))');
+
+    }
+}
+
+class Ticket_1483_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_1483_Group as Groups', array('local'    => 'user_id',
+                                                            'foreign'  => 'group_id',
+                                                            'refClass' => 'Ticket_1483_UserGroup'));
+    }
+}
+
+class Ticket_1483_Group extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_1483_User as Users', array('local'    => 'group_id',
+                                                          'foreign'  => 'user_id',
+                                                          'refClass' => 'Ticket_1483_UserGroup'));
+    }
+}
+
+
+class Ticket_1483_UserGroup extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('user_id', 'integer');
+        $this->hasColumn('group_id', 'integer');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1488TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1488TestCase.php
new file mode 100644
index 000000000..5207cef81
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1488TestCase.php
@@ -0,0 +1,83 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1488_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1488_TestCase extends Doctrine_UnitTestCase
+{
+    public function testTest()
+    {
+        $q = Doctrine_Query::create()
+            ->from('T1488_Class1 c1')
+            ->leftJoin('c1.Classes2 c2 WITH c2.value BETWEEN c1.min AND c1.max');
+        $this->assertEqual($q->getSqlQuery(), 'SELECT t.id AS t__id, t.min AS t__min, t.max AS t__max, t2.id AS t2__id, t2.value AS t2__value FROM t1488__class1 t LEFT JOIN t1488__relation t3 ON (t.id = t3.c1_id) LEFT JOIN t1488__class2 t2 ON t2.id = t3.c2_id AND (t2.value BETWEEN t.min AND t.max)');
+    }
+}
+
+class T1488_Class1 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('min', 'integer');
+        $this->hasColumn('max', 'integer');
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('T1488_Class2 as Classes2', array('local'    => 'c1_id',
+                                                            'foreign'  => 'c2_id',
+                                                            'refClass' => 'T1488_Relation'));
+    }
+}
+
+class T1488_Class2 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('value', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('T1488_Class1 as Classes1', array('local'    => 'c2_id',
+                                                          'foreign'  => 'c1_id',
+                                                          'refClass' => 'T1488_Relation'));
+    }
+}
+
+
+class T1488_Relation extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('c1_id', 'integer');
+        $this->hasColumn('c2_id', 'integer');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1494TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1494TestCase.php
new file mode 100644
index 000000000..3892252a9
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1494TestCase.php
@@ -0,0 +1,44 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1494_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1494_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $q = Doctrine_Query::create()
+            ->select('u.*, CONCAT(u.id, u.name) as custom')
+            ->from('User u INDEXBY custom');
+        $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id, CONCAT(e.id, e.name) AS e__0 FROM entity e WHERE (e.type = 0)');
+        $results = $q->fetchArray();
+        $this->assertEqual($results['4zYne']['name'], 'zYne');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1500TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1500TestCase.php
new file mode 100644
index 000000000..83fcb96e1
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1500TestCase.php
@@ -0,0 +1,98 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1500_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1500_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'T1500_User';
+        $this->tables[] = 'T1500_Group';
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+        $group = new T1500_Group();
+        $group->name = 'admin';
+        $group->save();
+
+        $user = new T1500_User();
+        $user->groupId = $group->id;
+        $user->name = 'jwage';
+        $user->save();
+
+        $user = new T1500_User();
+        $user->groupId = $group->id;
+        $user->name = 'guilhermeblanco';
+        $user->save();        
+    }
+
+    public function testTicket()
+    {
+        $q = Doctrine_Query::create()
+            ->from('T1500_User u')->innerJoin('u.Group g')->where('u.id = 1');
+        $this->assertEqual($q->getSqlQuery(), 'SELECT t.user_id AS t__user_id, t.group_id AS t__group_id, t.name AS t__name, t2.group_id AS t2__group_id, t2.name AS t2__name FROM t1500__user t INNER JOIN t1500__group t2 ON t.group_id = t2.group_id WHERE (t.user_id = 1)');
+
+        $q = Doctrine_Query::create()
+            ->from('T1500_Group g')->innerJoin('g.Users u')->where('g.id = 1');
+        $this->assertEqual($q->getSqlQuery(), 'SELECT t.group_id AS t__group_id, t.name AS t__name, t2.user_id AS t2__user_id, t2.group_id AS t2__group_id, t2.name AS t2__name FROM t1500__group t INNER JOIN t1500__user t2 ON t.group_id = t2.group_id WHERE (t.group_id = 1)');
+    }
+}
+
+class T1500_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('user_id as id', 'integer', null, array('primary' => true, 'autoincrement' => true));
+        $this->hasColumn('group_id as groupId', 'integer', null);
+        $this->hasColumn('name', 'string', 100);
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('T1500_Group as Group', array('local' => 'groupId', 'foreign' => 'id'));
+    }
+}
+
+class T1500_Group extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('group_id as id', 'integer', null, array('primary' => true, 'autoincrement' => true));
+        $this->hasColumn('name', 'string', 100);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('T1500_User as Users', array('local' => 'id', 'foreign' => 'groupId'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1507TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1507TestCase.php
new file mode 100644
index 000000000..7153cdeeb
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1507TestCase.php
@@ -0,0 +1,95 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1500_TestCase
+ *
+ * @package     Doctrine
+ * @author      David Zülke <david.zuelke@bitextender.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    ?
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1507_TestCase extends Doctrine_UnitTestCase 
+{
+	public function testInitiallyEmpty()
+	{
+		$c = new Doctrine_Ticket_1507_TestCase_TestConfigurable();
+		
+		$this->assertEqual(null, $c->getParam('foo'));
+		$this->assertEqual(null, $c->getParam('foo', 'bar'));
+		$this->assertEqual(null, $c->getParams());
+		$this->assertEqual(null, $c->getParams('bar'));
+		$this->assertEqual(array(), $c->getParamNamespaces());
+	}
+	
+	public function testSetGetParamWithNamespace()
+	{
+		$c = new Doctrine_Ticket_1507_TestCase_TestConfigurable();
+		
+		$c->setParam('foo', 'bar', 'namespace');
+		
+		$this->assertEqual(array('foo' => 'bar'), $c->getParams('namespace'));
+		$this->assertEqual('bar', $c->getParam('foo', 'namespace'));
+		
+		$this->assertEqual(array('namespace'), $c->getParamNamespaces());
+	}
+	
+	public function testSetGetParamWithoutNamespace()
+	{
+		$c = new Doctrine_Ticket_1507_TestCase_TestConfigurable();
+		
+		$c->setParam('foo', 'bar');
+		
+		$this->assertEqual(array('foo' => 'bar'), $c->getParams());
+		$this->assertEqual('bar', $c->getParam('foo'));
+		
+		$this->assertEqual(array($c->getAttribute(Doctrine_Core::ATTR_DEFAULT_PARAM_NAMESPACE)), $c->getParamNamespaces());
+	}
+	
+	public function testSetGetParamWithNamespaceParent()
+	{
+		$p = new Doctrine_Ticket_1507_TestCase_TestConfigurable();
+		$c = new Doctrine_Ticket_1507_TestCase_TestConfigurable();
+		$c->setParent($p);
+		
+		$p->setParam('foo', 'bar', 'namespace');
+		
+		$this->assertEqual('bar', $c->getParam('foo', 'namespace'));
+	}
+	
+	public function testSetGetParamWithoutNamespaceParent()
+	{
+		$p = new Doctrine_Ticket_1507_TestCase_TestConfigurable();
+		$c = new Doctrine_Ticket_1507_TestCase_TestConfigurable();
+		$c->setParent($p);
+		
+		$p->setParam('foo', 'bar');
+		
+		$this->assertEqual('bar', $c->getParam('foo'));
+	}
+}
+
+class Doctrine_Ticket_1507_TestCase_TestConfigurable extends Doctrine_Configurable
+{
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1513TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1513TestCase.php
new file mode 100644
index 000000000..b2d1405bf
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1513TestCase.php
@@ -0,0 +1,83 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1513_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1513_TestCase extends Doctrine_UnitTestCase
+{
+    public function testTest()
+    {
+        $q = Doctrine_Query::create()
+            ->from('T1513_Class2 c2')
+            ->leftJoin('c2.Classes1 c1 WITH (c1.max - c1.min) > 50');
+        $this->assertEqual($q->getSqlQuery(), 'SELECT t.id AS t__id, t.value AS t__value, t2.id AS t2__id, t2.min AS t2__min, t2.max AS t2__max FROM t1513__class2 t LEFT JOIN t1513__relation t3 ON (t.id = t3.c2_id) LEFT JOIN t1513__class1 t2 ON t2.id = t3.c1_id AND ((t2.max - t2.min) > 50)');
+    }
+}
+
+class T1513_Class1 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('min', 'integer');
+        $this->hasColumn('max', 'integer');
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('T1513_Class2 as Classes2', array('local'    => 'c1_id',
+                                                            'foreign'  => 'c2_id',
+                                                            'refClass' => 'T1513_Relation'));
+    }
+}
+
+class T1513_Class2 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('value', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('T1513_Class1 as Classes1', array('local'    => 'c2_id',
+                                                          'foreign'  => 'c1_id',
+                                                          'refClass' => 'T1513_Relation'));
+    }
+}
+
+
+class T1513_Relation extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('c1_id', 'integer');
+        $this->hasColumn('c2_id', 'integer');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1520TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1520TestCase.php
new file mode 100644
index 000000000..95b4cd33b
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1520TestCase.php
@@ -0,0 +1,66 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1520_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1520_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1520_Product';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $profiler = new Doctrine_Connection_Profiler();
+        Doctrine_Manager::connection()->addListener($profiler);
+        $price = 200;
+        $user = new Ticket_1520_Product();
+        $user->title = 'test';
+        $user->price = $price;
+        $user->save();
+        $id = $user->id;
+        $user->free();
+
+        $user = Doctrine_Core::getTable('Ticket_1520_Product')->find($id);
+        $user->price = $price;
+        $this->assertEqual($user->getModified(), array());
+    }
+}
+
+class Ticket_1520_Product extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('title', 'string', 255);
+        $this->hasColumn('price', 'decimal');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1522TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1522TestCase.php
new file mode 100644
index 000000000..4c2b4ea1d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1522TestCase.php
@@ -0,0 +1,57 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1522_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1522_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $user = new Ticket_1522_User();
+        $user->fromArray(array('username' => 'jwage', 'encrypted_password' => 'changeme'));
+        $this->assertEqual($user->toArray(), array('id' => null, 'username' => 'jwage', 'password' => md5('changeme'), 'use_encrypted_password' => true));
+    }
+}
+
+class Ticket_1522_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+        $this->hasColumn('use_encrypted_password', 'boolean');
+    }
+
+    public function setEncryptedPassword($value)
+    {
+        $this->use_encrypted_password = true;
+        return $this->_set('password', md5($value));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1523TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1523TestCase.php
new file mode 100644
index 000000000..62759aa6f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1523TestCase.php
@@ -0,0 +1,79 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1523_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1523_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1523_User';
+        $this->tables[] = 'Ticket_1523_Group';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $q = Doctrine_Query::create()
+			->from('Ticket_1523_User u')
+			->innerJoin('u.Ticket_1523_Group g')
+			->where('EXISTS (SELECT uu.id FROM Ticket_1523_User uu WHERE uu.id = u.id)')
+			->orderBy('u.code ASC');
+
+		$pager = new Doctrine_Pager($q, 1, 10);
+		$pager->execute(array());
+		$this->assertEqual($pager->getQuery()->getSqlQuery(), 'SELECT t.id AS t__id, t.code AS t__code, t2.id AS t2__id, t2.tmp_id AS t2__tmp_id FROM ticket_1523__user t INNER JOIN ticket_1523__group t2 ON t.id = t2.tmp_id WHERE t.id IN (SELECT DISTINCT t3.id FROM ticket_1523__user t3 INNER JOIN ticket_1523__group t4 ON t3.id = t4.tmp_id WHERE EXISTS (SELECT t5.id AS t3__id FROM ticket_1523__user t5 WHERE (t5.id = t3.id)) ORDER BY t3.code ASC LIMIT 10) AND (EXISTS (SELECT t3.id AS t3__id FROM ticket_1523__user t3 WHERE (t3.id = t.id))) ORDER BY t.code ASC');
+    }
+}
+
+class Ticket_1523_User extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+    	$this->hasColumn('id', 'integer', 4, array('type' => 'integer', 'length' => 4, 'primary' => true));
+    	$this->hasColumn('code', 'string', 64, array('type' => 'string', 'length' => '64', 'notnull' => true));
+	}
+	public function setUp()
+	{
+		$this->hasMany('Ticket_1523_Group', array(
+			'local' => 'id',
+			'foreign' => 'tmp_id',
+		));
+	}
+}
+
+class Ticket_1523_Group extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->hasColumn('id', 'integer', 4, array('type' => 'integer', 'length' => 4, 'primary' => true, ));
+		$this->hasColumn('tmp_id', 'integer', 4, array('type' => 'integer', 'length' => 4, 'notnull' => true));
+	}
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1524TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1524TestCase.php
new file mode 100644
index 000000000..0e64df98a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1524TestCase.php
@@ -0,0 +1,49 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1524_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1524_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $manager = Doctrine_Manager::getInstance();
+        $manager->registerValidators('MyValidator');
+        $this->assertTrue(in_array('MyValidator', $manager->getValidators()));
+    }
+}
+
+class MyValidator extends Doctrine_Validator
+{
+    public function validate($value)
+    {
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1527TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1527TestCase.php
new file mode 100644
index 000000000..8751aca90
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1527TestCase.php
@@ -0,0 +1,61 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1527_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1527_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $yml = <<<END
+---
+Ticket_1527_User:
+  columns:
+    username:
+      type: string(255)
+      extra:
+        test: 123
+    password:
+      type: string(255)
+END;
+
+        $import = new Doctrine_Import_Schema();
+        $schema = $import->buildSchema($yml, 'yml');
+        $this->assertEqual($schema['Ticket_1527_User']['columns']['username']['extra']['test'], '123');
+
+        $path = dirname(__FILE__) . '/../tmp';
+        $import->importSchema($yml, 'yml', $path);
+        
+        require_once($path . '/generated/BaseTicket_1527_User.php');
+        require_once($path . '/Ticket_1527_User.php');
+        $username = Doctrine_Core::getTable('Ticket_1527_User')->getDefinitionOf('username');
+        $this->assertEqual($username['extra']['test'], '123');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1537TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1537TestCase.php
new file mode 100644
index 000000000..7f8ce4b8c
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1537TestCase.php
@@ -0,0 +1,76 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1537_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1537_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1537_User';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+        $q = Doctrine_Query::create()
+            ->update('Ticket_1537_User u')
+            ->set('password', '?', 'changeme')
+            ->set('email_address', '?', 'jonwage@gmail.com')
+            ->where('username = ?', 'jwage');
+        $this->assertEqual($q->getSqlQuery(), 'UPDATE ticket_1537__user SET password = ?, email_address = ?, updated_at = ? WHERE (username = ?)');
+        $params = $q->getFlattenedParams();
+
+        // make sure order of params are correct
+        $this->assertEqual(count($params), 4);
+        $this->assertEqual($params[0], 'changeme');
+        $this->assertEqual($params[1], 'jonwage@gmail.com');
+        $this->assertTrue($params[2]);
+        $this->assertEqual($params[3], 'jwage');
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+    }
+}
+
+class Ticket_1537_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('email_address', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('Timestampable');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1540TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1540TestCase.php
new file mode 100644
index 000000000..df133f74d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1540TestCase.php
@@ -0,0 +1,69 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1540_TestCase
+ *
+ * @package     Doctrine
+ * @author      Andrea Baron <andrea@bhweb.it>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0.2
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1540_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1540_TableName';
+        parent::prepareTables();
+    }
+	
+	public function testShouldNotConvertToAmpersandsInSelect()
+    {
+        $q = Doctrine_Query::create()
+			->select('if(1 AND 2, 1, 2)')
+            ->from('Ticket_1540_TableName t');
+        $this->assertEqual($q->getSqlQuery(), 'SELECT if(1 AND 2, 1, 2) AS t__0 FROM ticket_1540__table_name t');
+    }
+	
+    public function testShouldNotConvertToAmpersandsInWhere()
+    {
+        $q = Doctrine_Query::create()
+            ->from('Ticket_1540_TableName t')
+			->where('if(1 AND 2, 1, 2)', 1);
+        $this->assertEqual($q->getSqlQuery(), 'SELECT t.id AS t__id FROM ticket_1540__table_name t WHERE (if(1 AND 2, 1, 2))');
+    }
+}
+
+class Ticket_1540_TableName extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', 4, array('primary' => true, 'autoincrement' => true));
+    }
+
+    public function setUp()
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1543TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1543TestCase.php
new file mode 100644
index 000000000..e380f1522
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1543TestCase.php
@@ -0,0 +1,69 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1543_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1543_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1543_Article';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $article = new Ticket_1543_Article();
+        $article->title = 'test';
+        $article->created_at = '2008-09-01 01:50:20';
+        $article->updated_at = '2008-09-01 01:50:20';
+        $article->save();
+        $a = $article->updated_at;
+
+        $article->title = 'testing';
+        $article->save();
+        $b = $article->updated_at;
+
+        $this->assertNotEqual($a, $b);
+    }
+}
+
+class Ticket_1543_Article extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('title', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('Timestampable');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1545TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1545TestCase.php
new file mode 100644
index 000000000..a0757c835
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1545TestCase.php
@@ -0,0 +1,91 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1545_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1545_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1545_Foo';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        try {
+            $foo = new Ticket_1545_Foo();
+            $foo->a = null;
+            $this->assertEqual($foo->b, null);
+            $foo->custom = 'test';
+            $this->assertEqual($foo->custom, $foo->b);
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+}
+
+class Ticket_1545_Foo extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('a', 'string');
+    }
+
+    public function setUp()
+    {
+        $this->unshiftFilter(new Ticket_1545_FooFilter());
+    }
+}
+
+class Ticket_1545_FooFilter extends Doctrine_Record_Filter
+{
+    public function init()
+    {
+        
+    }
+
+    public function filterGet(Doctrine_Record $record, $name)
+    {
+        if ($name == 'b') {
+            return $record->a;
+        } else if ($name == 'custom') {
+            return $record->a;
+        }
+    }
+
+    public function filterSet(Doctrine_Record $record, $name, $value)
+    {
+        if ($name == 'custom') {
+            return $record->a = $value . '2';
+        }
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1558TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1558TestCase.php
new file mode 100644
index 000000000..a6386ea0e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1558TestCase.php
@@ -0,0 +1,53 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1558_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1558_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        try {
+            $q = Doctrine_Query::create()
+                ->from('User u')
+                ->whereIn('u.id', array(1))
+                ->orWhereIn('u.id', array(1))
+                ->orWhereIn('u.id', array(1))
+                ->andWhereIn('u.id', array(1))
+                ->whereIn('u.id', array())
+                ->orWhereIn('u.id', array());
+            $this->assertEqual($q->getSqlQuery(), 'SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id FROM entity e WHERE (e.id IN (?) OR e.id IN (?) OR e.id IN (?) AND e.id IN (?) AND (e.type = 0))');
+            $results = $q->execute();
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1562TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1562TestCase.php
new file mode 100644
index 000000000..d90376687
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1562TestCase.php
@@ -0,0 +1,103 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1562_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1562_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1562_User';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $table = Doctrine_Core::getTable('Ticket_1562_User');
+        $this->assertEqual(get_class($table), 'Ticket_1562_UserTable');
+        $user = new Ticket_1562_User();
+        $this->assertEqual($user->getTestAccessor(), 'Ticket_1562_Template::getTestAccessor');
+        $this->assertEqual($table->getTestAccessor(), 'Ticket_1562_Template::getTestAccessorTableProxy');
+
+        try {
+            $user->invalidMethod();
+            $this->fail();
+        } catch (Exception $e) {
+            $this->pass();
+        }
+
+        try {
+            $table->getTestAccessor2();
+        } catch (Exception $e) {
+            if ($e->getMessage() == 'Test') {
+                $this->pass();
+            } else {
+                $this->fail('Exception thrown should have had a message of test');
+            }
+        }
+    }
+}
+
+class Ticket_1562_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('Ticket_1562_Template');
+    }
+}
+
+class Ticket_1562_UserTable extends Doctrine_Table
+{
+    
+}
+
+class Ticket_1562_Template extends Doctrine_Template
+{
+    public function getTestAccessor()
+    {
+        return __METHOD__;
+    }
+
+    public function getTestAccessorTableProxy()
+    {
+        return __METHOD__;
+    }
+
+    public function getTestAccessor2TableProxy()
+    {
+        throw new Doctrine_Exception('Test');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1567TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1567TestCase.php
new file mode 100644
index 000000000..6fde50ef7
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1567TestCase.php
@@ -0,0 +1,72 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1567_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1567_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1567_Project';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $project = new Ticket_1567_Project();
+        $project->name = 'test';
+        $project->user_id = 1;
+        $project->deleted = true;
+        $project->save();
+
+        $query = Doctrine_Query::create();
+        $query->from('Ticket_1567_Project p');
+        $query->addWhere('p.user_id = ?', 1);
+        $query->addWhere('p.deleted = ?', true);
+        
+        $this->assertEqual($query->count(), 1);
+        $this->assertEqual($query->execute()->count(), 1);
+    }
+}
+
+class Ticket_1567_Project extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255, array('notnull' => true));
+        $this->hasColumn('user_id', 'integer');
+        $this->hasColumn('deleted', 'boolean', 1, array('notnull' => true, 'default' => 'false'));
+    }
+
+    public function setUp()
+    {
+        $this->actAs('SoftDelete');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1604TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1604TestCase.php
new file mode 100644
index 000000000..f8c8f6ffb
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1604TestCase.php
@@ -0,0 +1,82 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1589_TestCase
+ *
+ * @package     Doctrine
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$ 
+ */
+class Doctrine_Ticket_1604_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testExport()
+    {
+        $conn = Doctrine_Manager::connection('mysql://root@localhost/test');
+        $sql = $conn->export->exportClassesSql(array('Ticket_1604_User', 'Ticket_1604_EmailAdresses'));
+
+        $def = array(
+            "CREATE TABLE ticket_1604__user (id BIGINT AUTO_INCREMENT, name VARCHAR(30), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = INNODB",
+            "CREATE TABLE ticket_1604__email_adresses (id BIGINT AUTO_INCREMENT, user_id BIGINT, address VARCHAR(30), INDEX user_id_idx (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = INNODB",
+            "ALTER TABLE ticket_1604__email_adresses ADD CONSTRAINT ticket_1604__email_adresses_user_id_ticket_1604__user_id FOREIGN KEY (user_id) REFERENCES ticket_1604__user(id)"
+        );
+        
+        $this->assertEqual($sql, $def);
+    }
+}
+    
+class Ticket_1604_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 30);
+        
+        $this->option('type', 'INNODB');
+        $this->option('collate', 'utf8_unicode_ci');
+        $this->option('charset', 'utf8');
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_1604_EmailAdresses as emailAdresses', array('local' => 'id', 'foreign' => 'userId', "onDelete" => "CASCADE")); 
+    }
+}
+
+class Ticket_1604_EmailAdresses extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('user_id as userId', 'integer');
+        $this->hasColumn('address', 'string', 30);
+        
+        $this->option('type', 'INNODB');
+        $this->option('collate', 'utf8_unicode_ci');
+        $this->option('charset', 'utf8');
+    }
+    
+    public function setUp()
+    {
+        $this->hasOne('Ticket_1604_User as user', array('local' => 'userId', 'foreign' => 'id')); 
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1617TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1617TestCase.php
new file mode 100644
index 000000000..fc36a8bd9
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1617TestCase.php
@@ -0,0 +1,41 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1617_TestCase
+ *
+ * @package     Doctrine
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.1
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1617_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testBuildSchema()
+    {
+        $import = new Doctrine_Import_Schema();
+        $array = $import->buildSchema('Ticket/1617_schema.yml', 'yml');
+
+        $this->assertEqual($array['term']['columns']['language']['name'], 'lang as language');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1617_schema.yml b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1617_schema.yml
new file mode 100644
index 000000000..fcb6e6b09
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1617_schema.yml
@@ -0,0 +1,32 @@
+---
+# Column Aggregation Inheritance
+# Single table, all children columns are stored in the parent, parent class has a type method
+# Which is used to determine which child the record in the db belonds to
+term:
+  columns:
+    name: string(255)
+    type: string(255)
+    language: 
+      name: lang as language
+      type: string(2)
+ 
+alternativeTerm:
+  inheritance:
+    type: column_aggregation
+    keyField: type
+    keyValue: 'alt'
+    extends: term
+
+preferdTerm:
+  inheritance:
+    type: column_aggregation
+    keyField: type
+    keyValue: 'pref'
+    extends: term
+
+currentLanguagePreferedTerm:
+  inheritance:
+    type: column_aggregation
+    keyField: language
+    keyValue: 'de'
+    extends: preferdTerm
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1619TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1619TestCase.php
new file mode 100644
index 000000000..e83fb710a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1619TestCase.php
@@ -0,0 +1,77 @@
+<?php
+/*
+ *  $Id: 1619TestCase.php 7490 2010-03-29 19:53:27Z jwage $
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1619_TestCase
+ *
+ * @package     Doctrine
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1619_TestCase extends Doctrine_UnitTestCase {
+	
+	public function prepareTables()
+  {
+    $this->tables[] = 'Ticket_1619_Article';
+    parent::prepareTables();
+  }
+
+	public function testTest()
+  {
+		$a = new Ticket_1619_Article();
+		$a->Translation['fr']->name = 'article';
+		$a->Translation['fr']->description = 'article';
+		$a->Translation['en']->name = 'english article';
+		$a->Translation['en']->description = 'english description';
+		$a->save();
+		
+		$b = new Ticket_1619_Article();
+		$a->Translation['fr']->name = 'maison';
+		$a->Translation['fr']->description = 'habitation';
+		$a->Translation['en']->name = 'english house';
+		$a->Translation['en']->description = 'english big house';
+		$a->save();
+	}
+}
+
+class Ticket_1619_Article extends Doctrine_Record
+{
+	public function setTableDefinition()
+  {
+    $this->setTableName('article');
+    $this->hasColumn('id', 'integer', 3, array('type' => 'integer', 'primary' => true, 'autoincrement' => true, 'length' => '3'));
+    $this->hasColumn('name', 'string', 60, array('type' => 'string', 'length' => '60'));
+    $this->hasColumn('description', 'string', 4000, array('type' => 'string', 'length' => '4000'));
+  }
+
+  public function setUp()
+  {
+    $i18n0 = new Doctrine_Template_I18n(array('fields' => array(0 => 'name', 1 => 'description')));
+    $searchable1 = new Doctrine_Template_Searchable(array('fields' => array(0 => 'name')));
+    $i18n0->addChild($searchable1);
+    $this->actAs($i18n0);
+  }
+}
+	
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1621TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1621TestCase.php
new file mode 100644
index 000000000..532905f60
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1621TestCase.php
@@ -0,0 +1,213 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1621_TestCase
+ *
+ * @package     Doctrine
+ * @author      floriank
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.1
+ * @version     $Revision$ 
+ */
+class Doctrine_Ticket_1621_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables = array();
+        $this->tables[] = 'Ticket_1621_User';
+        $this->tables[] = 'Ticket_1621_UserReference';
+        $this->tables[] = 'Ticket_1621_UserReferenceFriends';
+        $this->tables[] = 'Ticket_1621_EmailAdresses';
+        $this->tables[] = 'Ticket_1621_Group';
+        $this->tables[] = 'Ticket_1621_GroupUser';
+        parent::prepareTables();
+    }
+    
+    public function prepareData()
+    {
+
+    }
+
+    public function testRelationAliases() {
+        // this should go to $this->prepareData(), but i need 
+        // it to fail in a test()-method
+        try {
+            $group = new Ticket_1621_Group();
+            $group->name = 'group1';
+            $group->save();
+            
+            $group2 = new Ticket_1621_Group();
+            $group2->name = 'group2';
+            $group2->save();
+            
+            $user = new Ticket_1621_User();
+            $user->name = "floriank";
+            $user->groups[] = $group;
+            $user->emailAddresses[0]->address = "floriank@localhost";
+            $user->save();
+            
+            $user2 = new Ticket_1621_User();
+            $user2->name = "test2";
+            $user2->emailAddresses[0]->address = "test2@localhost";
+            $user2->save();
+            
+            $user3 = new Ticket_1621_User();
+            $user3->name = "test3";
+            $user3->emailAddresses[0]->address = "test3@localhost";
+            $user3->save();
+    
+            $user4 = new Ticket_1621_User();
+            $user4->name = "test";
+            $user4->groups[] = $group2;
+            $user4->children[] = $user2;
+            $user4->parents[] = $user3;
+            $user4->emailAddresses[0]->address = "test@localhost";
+            $user4->save();
+        } catch (Exception $e) {
+            $this->fail($e);
+        }
+        
+        
+        
+        //here is the testcode
+        try {
+            $user = Doctrine_Core::getTable('Ticket_1621_User')->findOneByName('floriank');
+            $newChild = Doctrine_Core::getTable('Ticket_1621_User')->findOneByName('test');
+            $newFriend = Doctrine_Core::getTable('Ticket_1621_User')->findOneByName('test2');
+            $newGroup = Doctrine_Core::getTable('Ticket_1621_Group')->findOneByName('group2');
+            
+            $user->children[] = $newChild;
+            $user->groups[] = $newGroup;
+            $user->friends[] = $newFriend;
+    
+            $user->save();
+            
+            $this->assertEqual(count($user->children), 1);
+        } catch (Exception $e) {
+            $this->fail($e);
+        }
+    }
+}
+    
+class Ticket_1621_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', null, array('primary' => true, 'autoincrement' => true));
+        $this->hasColumn('name', 'string', 30);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_1621_User as parents', 
+                                                array('local'    => 'parentId',
+                                                'refClass' => 'Ticket_1621_UserReference', 
+                                                'foreign'  => 'childId',
+                                                'refClassRelationAlias' => 'childrenLinks'
+                                                ));
+
+        $this->hasMany('Ticket_1621_User as children', 
+                                                 array('local'    => 'childId',
+                                                 'foreign'  => 'parentId',
+                                                 'refClass' => 'Ticket_1621_UserReference',
+                                                 'refClassRelationAlias' => 'parentLinks'
+                                                 ));
+                                                 
+        $this->hasMany('Ticket_1621_User as friends', 
+                                                 array('local'    => 'leftId',
+                                                 'foreign'  => 'rightId',
+                                                 'equal' => 'true', 
+                                                 'refClass' => 'Ticket_1621_UserReferenceFriends',
+                                                 'refClassRelationAlias' => 'friendLinks'
+                                                 ));
+                                                 
+        $this->hasMany('Ticket_1621_EmailAdresses as emailAddresses', array('local' => 'id', 'foreign' => 'userId'));
+
+        $this->hasMany('Ticket_1621_Group as groups', array('local' => 'userId',    
+                                     'foreign' => 'groupId',     
+                                     'refClass' => 'Ticket_1621_GroupUser')); 
+    }
+}
+
+class Ticket_1621_UserReference extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('parent_id as parentId', 'integer', null, array('primary' => true));
+        $this->hasColumn('child_id as childId', 'integer', null, array('primary' => true));
+    }
+}
+
+class Ticket_1621_UserReferenceFriends extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('left_id as leftId', 'integer', null, array('primary' => true));
+        $this->hasColumn('right_id as rightId', 'integer', null, array('primary' => true));
+    }
+}
+
+class Ticket_1621_EmailAdresses extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('user_id as userId', 'integer', null);
+        $this->hasColumn('address', 'string', 30);
+        
+        $this->option('type', 'INNODB');
+        $this->option('collate', 'utf8_unicode_ci');
+        $this->option('charset', 'utf8');
+    }
+    
+    public function setUp()
+    {
+        $this->hasOne('Ticket_1621_User as user', array('local' => 'userId', 'foreign' => 'id')); 
+    }
+}
+
+class Ticket_1621_Group extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 30);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_1621_User as users', array('local' => 'groupId',    
+                                     'foreign' => 'userId',     
+                                     'refClass' => 'Ticket_1621_GroupUser')); 
+
+        $this->setTableName('my_group');
+    }
+}
+
+class Ticket_1621_GroupUser extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('user_id as userId', 'integer', null, array('primary' => true));
+        $this->hasColumn('group_id as groupId', 'integer', null, array('primary' => true));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1621bTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1621bTestCase.php
new file mode 100644
index 000000000..808289033
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1621bTestCase.php
@@ -0,0 +1,283 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1621b_TestCase
+ *
+ * @package     Doctrine
+ * @author      floriank
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.1
+ * @version     $Revision$ 
+ */
+class Doctrine_Ticket_1621b_TestCase extends Doctrine_UnitTestCase 
+{
+	const LANG = "deu";
+	
+    public function prepareTables()
+    {
+        $this->tables = array();
+        $this->tables[] = 'Ticket_1621b_Term';
+        $this->tables[] = 'Ticket_1621b_AltTerm';
+        $this->tables[] = 'Ticket_1621b_PrefTerm';
+        $this->tables[] = 'Ticket_1621b_CurrentLanguagePrefTerm';
+        $this->tables[] = 'Ticket_1621b_Language';
+        $this->tables[] = 'Ticket_1621b_Concept';
+        $this->tables[] = 'Ticket_1621b_ConceptHierarchicalRelation';
+        parent::prepareTables();
+    }
+    
+    public function prepareData()
+    {
+        $lang = new Ticket_1621b_Language();
+        $lang->id = 'deu';
+        $lang->Translation['de']->display = 'Deutsch';
+        $lang->Translation['de']->description = 'Die Sprache Deutsch';
+        $lang->Translation['en']->display = 'german';
+        $lang->Translation['en']->description = 'The german language';
+        
+        $lang->save(); 
+        
+        $lang = new Ticket_1621b_Language();
+        $lang->id = 'eng';
+        $lang->Translation['de']->display = 'Englisch';
+        $lang->Translation['de']->description = 'Die Sprache Englisch';
+        $lang->Translation['en']->display = 'german';
+        $lang->Translation['en']->description = 'The english language';
+                
+        $lang->save();
+        
+        
+        
+                
+        $plant = new Ticket_1621b_Concept(); 
+        $plant->identifier = "1";
+        
+        $pref_de = new Ticket_1621b_PrefTerm();
+        $pref_de->lexicalValue = "Pflanze";
+        $pref_de->langId = "deu";
+        
+        $pref_en = new Ticket_1621b_PrefTerm();
+        $pref_en->lexicalValue = "plant";
+        $pref_en->langId = "eng";
+        
+        $plant->preferedTerm = $pref_de;
+        $plant->preferedTerms[] = $pref_en;
+        
+        $plant->save();
+        
+        
+        
+        
+        $tree = new Ticket_1621b_Concept(); 
+        $tree->identifier = "1.1";
+        
+        $pref_de = new Ticket_1621b_PrefTerm();
+        $pref_de->lexicalValue = "Baum";
+        $pref_de->langId = "deu";
+        
+        $pref_en = new Ticket_1621b_PrefTerm();
+        $pref_en->lexicalValue = "tree";
+        $pref_en->langId = "eng";
+        
+        $alt = new Ticket_1621b_AltTerm();
+        $alt->lexicalValue = "bush";
+        $alt->langId = "eng";
+        
+        $tree->preferedTerm = $pref_de;
+        $tree->preferedTerms[] = $pref_en;
+        $tree->altTerms[] = $alt;
+        
+        $tree->broaderConcepts[] = $plant;
+        
+        $tree->save();
+             
+        
+        
+        
+        $oak = new Ticket_1621b_Concept(); 
+        $oak->identifier = "1.1";
+        
+        $pref_de = new Ticket_1621b_PrefTerm();
+        $pref_de->lexicalValue = "Eiche";
+        $pref_de->langId = "deu";
+        
+        $pref_en = new Ticket_1621b_PrefTerm();
+        $pref_en->lexicalValue = "oak";
+        $pref_en->langId = "eng";
+        
+        $oak->preferedTerm = $pref_de;
+        $oak->preferedTerms[] = $pref_en;
+        
+        $oak->broaderConcepts[] = $tree;
+        
+        $oak->save();
+    }
+
+    public function testInheritance() 
+    {
+        try {
+	        $q = Doctrine_Query::create()
+	                ->from("Ticket_1621b_Concept c")
+	                ->innerJoin('c.preferedTerm p')
+	                ->leftJoin('c.narrowerConcepts n')
+	                ->where('c.id = ?', 2);
+	        $rs = $q->fetchOne();  
+	        
+	        $this->assertEqual($rs->preferedTerm->lexicalValue, "Baum");
+        } catch (Exception $e) {
+        	$this->fail($e);
+        }
+    }
+}
+    
+
+
+class Ticket_1621b_Concept extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->hasColumn('id', 'integer', 4, array('unsigned' => true, 'primary' => true, 'autoincrement' => true, 'type' => 'integer', 'length' => '4'));
+    $this->hasColumn('identifier', 'string', 255, array('type' => 'string', 'length' => '255'));
+  }
+
+  public function setUp()
+  {
+    $this->hasOne('Ticket_1621b_CurrentLanguagePrefTerm as preferedTerm', array('local' => 'id',
+                                                                          'foreign' => 'conceptId',
+                                                                          'onDelete' => 'CASCADE'));
+
+    $this->hasMany('Ticket_1621b_PrefTerm as preferedTerms', array('local' => 'id',
+                                                             'foreign' => 'conceptId',
+                                                             'onDelete' => 'CASCADE'));
+
+    $this->hasMany('Ticket_1621b_AltTerm as altTerms', array('local' => 'id',
+                                                       'foreign' => 'conceptId',
+                                                       'onDelete' => 'CASCADE'));
+    
+    $this->hasMany('Ticket_1621b_Concept as broaderConcepts', array('refClass' => 'Ticket_1621b_ConceptHierarchicalRelation',
+                                                       'refClassRelationAlias' => 'narrowerLinks',
+                                                       'local' => 'conceptIdSource',
+                                                       'foreign' => 'conceptIdTarget'));
+
+    $this->hasMany('Ticket_1621b_Concept as narrowerConcepts', array('refClass' => 'Ticket_1621b_ConceptHierarchicalRelation',
+                                                        'refClassRelationAlias' => 'broaderLinks',
+                                                        'local' => 'conceptIdTarget',
+                                                        'foreign' => 'conceptIdSource'));
+  }
+}
+
+
+
+class Ticket_1621b_Term extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->hasColumn('id', 'integer', 4, array('unsigned' => true, 'primary' => true, 'autoincrement' => true, 'type' => 'integer', 'length' => '4'));
+    $this->hasColumn('concept_id as conceptId', 'integer', 4, array('type' => 'integer', 'unsigned' => true, 'length' => '4'));
+    $this->hasColumn('lexical_value as lexicalValue', 'string', 255, array('notnull' => true, 'type' => 'string', 'length' => '255'));
+    $this->hasColumn('type', 'string', 20, array('notnull' => true, 'type' => 'string', 'length' => '20'));
+    $this->hasColumn('lang_id as langId', 'string', 3, array('notnull' => true, 'type' => 'string', 'length' => '3'));
+
+    $this->setSubClasses(array('Ticket_1621b_AltTerm' => array('type' => 'alt'), 'Ticket_1621b_PrefTerm' => array('type' => 'pref'), 'Ticket_1621b_CurrentLanguagePrefTerm' => array('langId' => Doctrine_Ticket_1621b_TestCase::LANG)));
+  }
+
+  public function setUp()
+  {
+  	$this->hasOne('Ticket_1621b_Concept as concept', array('local' => 'conceptId',
+                                              'foreign' => 'id'));
+    $this->hasOne('Ticket_1621b_Language as language', array('local' => 'langId',
+                                                'foreign' => 'id'));
+  }
+}
+
+
+class Ticket_1621b_AltTerm extends Ticket_1621b_Term
+{
+  public function setUp()
+  {
+    parent::setUp();
+  }
+}
+
+
+
+class Ticket_1621b_PrefTerm extends Ticket_1621b_Term
+{
+  public function setUp()
+  {
+    parent::setUp();
+  }
+}
+
+
+class Ticket_1621b_CurrentLanguagePrefTerm extends Ticket_1621b_PrefTerm
+{
+  public function setUp()
+  {
+    parent::setUp();
+  }
+}
+
+
+
+class Ticket_1621b_Language extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->hasColumn('id', 'string', 3, array('type' => 'string', 'primary' => true, 'length' => '3'));
+    $this->hasColumn('display', 'string', 50, array('type' => 'string', 'notnull' => true, 'length' => '50'));
+    $this->hasColumn('description', 'string', 50, array('type' => 'string', 'length' => '50'));
+  }
+
+  public function setUp()
+  {
+    $this->hasMany('Ticket_1621b_Term', array('local' => 'id',
+                                        'foreign' => 'langId'));
+
+    $i18n0 = new Doctrine_Template_I18n(array('fields' => array(0 => 'display', 1 => 'description')));
+    $this->actAs($i18n0);
+  }
+}
+
+class Ticket_1621b_ConceptHierarchicalRelation extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->hasColumn('id', 'integer', 4, array('unsigned' => true, 'primary' => true, 'autoincrement' => true, 'type' => 'integer', 'length' => '4'));
+    $this->hasColumn('concept_id_s as conceptIdSource', 'integer', 4, array('type' => 'integer', 'unsigned' => true, 'length' => '4'));
+    $this->hasColumn('concept_id_t as conceptIdTarget', 'integer', 4, array('type' => 'integer', 'unsigned' => true, 'length' => '4'));
+  }
+
+  public function setUp()
+  {
+    $this->hasOne('Ticket_1621b_Concept as hierarchieTarget', array('local' => 'conceptIdTarget',
+                                                       'foreign' => 'id'));
+
+    $this->hasOne('Ticket_1621b_Concept as hierarchieSource', array('local' => 'conceptIdSource',
+                                                       'foreign' => 'id'));
+  }
+}
+
+
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1622TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1622TestCase.php
new file mode 100644
index 000000000..c53a03539
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1622TestCase.php
@@ -0,0 +1,106 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1622_TestCase
+ *
+ * @package     Doctrine
+ * @author      floriank
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.1
+ * @version     $Revision$ 
+ */
+class Doctrine_Ticket_1622_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables = array();
+        $this->tables[] = 'Ticket_1622_User';
+        $this->tables[] = 'Ticket_1622_UserReference';
+        parent::prepareTables();
+    }
+    
+    public function prepareData()
+    {
+            $user = new Ticket_1622_User();
+            $user->name = "floriank";
+            $user->save();
+            
+            $user2 = new Ticket_1622_User();
+            $user2->name = "test";
+            $user2->parents[] = $user;
+            $user2->save();
+    }
+
+    public function testUnlink() {
+        $user = Doctrine_Core::getTable('Ticket_1622_User')->findOneByName('floriank');
+        $child = Doctrine_Core::getTable('Ticket_1622_User')->findOneByName('test');
+        
+        $user->unlink('children', $child->id);
+        
+        $this->assertTrue($user->hasReference('children'));
+        $this->assertTrue($user->hasRelation('children'));
+        $this->assertEqual(count($user->children), 0);
+        
+        $user->save();
+
+        $user->refresh();
+        $user = Doctrine_Core::getTable('Ticket_1622_User')->findOneByName('floriank');
+        $this->assertEqual(count($user->children), 0);
+    }
+}
+    
+class Ticket_1622_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', null, array('primary' => true, 'autoincrement' => true));
+        $this->hasColumn('name', 'string', 30);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_1622_User as parents', 
+                                                array('local'    => 'parent_id',
+                                                'refClass' => 'Ticket_1622_UserReference', 
+                                                'foreign'  => 'child_id',
+                                                'refClassRelationAlias' => 'childrenLinks'
+                                                ));
+                                                
+        $this->hasMany('Ticket_1622_User as children', 
+                                                 array('local'    => 'child_id',
+                                                 'foreign'  => 'parent_id',
+                                                 'refClass' => 'Ticket_1622_UserReference',
+                                                 'refClassRelationAlias' => 'parentLinks'
+                                                 ));
+    }
+}
+
+class Ticket_1622_UserReference extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('parent_id', 'integer', null, array('primary' => true));
+        $this->hasColumn('child_id', 'integer', null, array('primary' => true));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1623TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1623TestCase.php
new file mode 100644
index 000000000..62566505d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1623TestCase.php
@@ -0,0 +1,166 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1623_TestCase
+ *
+ * @package     Doctrine
+ * @author      floriank
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.1
+ * @version     $Revision$ 
+ */
+class Doctrine_Ticket_1623_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables = array();
+        $this->tables[] = 'Ticket_1623_User';
+        $this->tables[] = 'Ticket_1623_UserReference';
+        parent::prepareTables();
+    }
+    
+    public function prepareData()
+    {
+        $firstUser = null;
+        $oldUser = null;
+        
+        for ($i = 1; $i <= 20; $i++) {
+            $userI = $user = new Ticket_1623_User();
+            $userI->name = "test$i";
+            for ($j = 1; $j <= 20; $j++) {
+                $userJ = new Ticket_1623_User();
+                $userJ->name = "test$i-$j";
+                $userI->children[] = $userJ;
+                $userJ->save();
+            }
+            $userI->save();
+            $floriankChilds[] = $userI;
+        }
+
+        $user = new Ticket_1623_User();
+        $user->name = "floriank";
+        foreach ($floriankChilds as $child) {
+            $user->children[] = $child;
+        }
+        $user->save();
+    }
+
+    public function testPerformance()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+        
+        $newChild = new Ticket_1623_User();
+        $newChild->name = 'myChild';
+        $newChild->save();
+        
+        $user = Doctrine_Core::getTable('Ticket_1623_User')->findOneByName('floriank');
+        $user->children[] = $newChild;
+        
+        $start = microtime(true);
+        $user->save();
+        $end = microtime(true);
+        $diff = $end - $start;
+        //assuming save() should not take longer than one second
+        $this->assertTrue($diff < 1);
+    }
+    
+    public function testImplicitSave()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_CASCADE_SAVES, false);
+
+        $newChild = new Ticket_1623_User();
+        $newChild->name = 'myGrandGrandChild';
+        
+        $user = Doctrine_Core::getTable('Ticket_1623_User')->findOneByName('floriank');
+        $user->children[0]->children[0]->children[] = $newChild;
+        
+        $user->save();
+        
+        $user = Doctrine_Core::getTable('Ticket_1623_User')->findByName('myGrandGrandChild');
+        //as of Doctrine's default behaviour $newChild should have 
+        //been implicitly saved with $user->save()  
+        $this->assertEqual($user->count(), 0);
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_CASCADE_SAVES, true);
+    }
+}
+    
+class Ticket_1623_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', null, array('primary' => true, 'autoincrement' => true));
+        $this->hasColumn('name', 'string', 30);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_1623_User as parents', 
+                                                array('local'    => 'parentId',
+                                                'refClass' => 'Ticket_1623_UserReference', 
+                                                'foreign'  => 'childId',
+                                                'refClassRelationAlias' => 'childrenLinks'
+                                                ));
+                                                
+        $this->hasMany('Ticket_1623_User as children', 
+                                                 array('local'    => 'childId',
+                                                 'foreign'  => 'parentId',
+                                                 'refClass' => 'Ticket_1623_UserReference',
+                                                 'refClassRelationAlias' => 'parentLinks'
+                                                 ));
+    }
+    
+    protected function validate()
+    {
+        // lets get some silly load in the validation: 
+        // we do not want any child or parent to have the name 'caesar'
+        $unwantedName = false; 
+        foreach ($this->children as $child) {
+            if ($child->name == 'caesar') {
+                $unwantedName = true;
+            }
+        }
+        
+        foreach ($this->children as $child) {
+            if ($child->name == 'caesar') {
+                $unwantedName = true;
+            }
+        }
+        
+        if ($unwantedName) {
+            $this->errorStack()->add('children', 'no child should have the name \'caesar\'');
+        }
+    }
+}
+
+class Ticket_1623_UserReference extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('parent_id as parentId', 'integer', null, array('primary' => true));
+        $this->hasColumn('child_id as childId', 'integer', null, array('primary' => true));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1628TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1628TestCase.php
new file mode 100644
index 000000000..d2ca7863f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1628TestCase.php
@@ -0,0 +1,55 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1628_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1628_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        // String values for non-constant values
+        $builder = new Doctrine_Import_Builder();
+        $code = trim($builder->buildAttributes(array('coll_key' => 'id')));
+        $this->assertEqual($code, "\$this->setAttribute(Doctrine_Core::ATTR_COLL_KEY, 'id');");
+
+        // Boolean values
+        $code = trim($builder->buildAttributes(array('use_dql_callbacks' => true)));
+        $this->assertEqual($code, "\$this->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);");
+        $code = trim($builder->buildAttributes(array('use_dql_callbacks' => false)));
+        $this->assertEqual($code, "\$this->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);");
+
+        // Constant values
+        $code = trim($builder->buildAttributes(array('model_loading' => 'conservative')));
+        $this->assertEqual($code, "\$this->setAttribute(Doctrine_Core::ATTR_MODEL_LOADING, Doctrine_Core::MODEL_LOADING_CONSERVATIVE);");
+
+        $code = trim($builder->buildAttributes(array('export' => array('all', 'constraints'))));
+        $this->assertEqual($code, "\$this->setAttribute(Doctrine_Core::ATTR_EXPORT, Doctrine_Core::EXPORT_ALL ^ Doctrine_Core::EXPORT_CONSTRAINTS);");
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1629TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1629TestCase.php
new file mode 100644
index 000000000..a31814fbd
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1629TestCase.php
@@ -0,0 +1,95 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1629_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1629_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1629_User';
+        $this->tables[] = 'Ticket_1629_Phonenumber';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+
+        $user = new Ticket_1629_User();
+        $user->username = 'jwage';
+        $user->password = 'changeme';
+        $user->Phonenumbers[0]->phonenumber = '6155139185';
+        $user->save();
+        $user->Phonenumbers[0]->delete();
+
+        $q = Doctrine_Query::create()
+            ->from('Ticket_1629_User u')
+            ->leftJoin('u.Phonenumbers p');
+            
+        $this->assertEqual($q->getSqlQuery(), 'SELECT t.id AS t__id, t.username AS t__username, t.password AS t__password, t.deleted_at AS t__deleted_at, t2.id AS t2__id, t2.user_id AS t2__user_id, t2.phonenumber AS t2__phonenumber, t2.deleted_at AS t2__deleted_at FROM ticket_1629__user t LEFT JOIN ticket_1629__phonenumber t2 ON t.id = t2.user_id AND (t2.deleted_at IS NULL) WHERE (t.deleted_at IS NULL)');
+            
+        $users = $q->fetchArray();
+        $this->assertEqual(count($users), 1);
+        $this->assertEqual(count($users[0]['Phonenumbers']), 0);
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+    }
+}
+
+class Ticket_1629_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('SoftDelete');
+        $this->hasMany('Ticket_1629_Phonenumber as Phonenumbers', array('local' => 'id', 'foreign' => 'user_id'));
+    }
+}
+
+class Ticket_1629_Phonenumber extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('user_id', 'integer');
+        $this->hasColumn('phonenumber', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('SoftDelete');
+        $this->hasOne('Ticket_1629_User as User', array('local' => 'user_id', 'foreign' => 'id'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1630TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1630TestCase.php
new file mode 100644
index 000000000..3acb4bbb3
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1630TestCase.php
@@ -0,0 +1,93 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1630_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1630_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1630_BlogPost';
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+        $test = new Ticket_1630_BlogPost();
+        $test->Translation['en']->title = 'en test';
+        $test->Translation['fr']->title = 'fr test';
+        $test->body = 'test';
+        $test->save();
+
+        $test = new Ticket_1630_BlogPost();
+        $test->Translation['en']->title = 'cool';
+        $test->body = 'very cool';
+        $test->save();
+    }
+
+    public function testTest()
+    {
+        $cacheConn = Doctrine_Manager::getInstance()->openConnection('sqlite::memory:', 'cache', false);
+		$cacheDriver = new Doctrine_Cache_Db(array('tableName' => 'cache', 'connection' => $cacheConn));
+		$cacheDriver->createTable();
+
+        $currentCacheDriver = $this->conn->getAttribute(Doctrine_Core::ATTR_QUERY_CACHE);
+		$this->conn->setAttribute(Doctrine_Core::ATTR_QUERY_CACHE, $cacheDriver);
+
+        try {
+            $q = Doctrine_Query::create()
+                ->from('Ticket_1630_BlogPost p')
+                ->leftJoin('p.Translation t INDEXBY t.lang');
+            $results = $q->execute();
+            $results = $q->execute();
+
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail();
+        }
+
+        $this->conn->setAttribute(Doctrine_Core::ATTR_QUERY_CACHE, $currentCacheDriver);
+    }
+}
+
+class Ticket_1630_BlogPost extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('title', 'string', 255);
+        $this->hasColumn('body', 'clob');
+    }
+
+    public function setUp()
+    {
+        $i18n = new Doctrine_Template_I18n(array('fields' => array('title')));
+        $this->actAs($i18n);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1636TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1636TestCase.php
new file mode 100644
index 000000000..448c268b6
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1636TestCase.php
@@ -0,0 +1,176 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1636_TestCase
+ *
+ * @package     Doctrine
+ * @author      Eugene Janusov <esycat@gmail.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1636_TestCase extends Doctrine_UnitTestCase
+{
+    private $resultCacheLifeSpan = 5;
+
+    public function prepareTables()
+    {
+        $this->tables = array();
+        $this->tables[] = 'Ticket_1636_File';
+        $this->tables[] = 'Ticket_1636_FileType';
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+        for ($i = 1; $i <= 2; $i++) {
+            $fileType = new Ticket_1636_FileType();
+            $fileType->id = $i;
+            $fileType->name = 'Type ' . $i;
+            $fileType->save();
+        }
+
+        for ($i = 1; $i <= 10; $i++) {
+            $file = new Ticket_1636_File();
+            $file->id = $i;
+            $file->type_id = 1;
+            $file->filename = 'File ' . $i;
+            $file->save();
+        }
+    }
+
+    public function testResultCacheShouldStoreRelatedComponentsData()
+    {
+        // Profiler
+        $profiler = new Doctrine_Connection_Profiler();
+        $this->conn->setListener($profiler);
+
+        $cacheDriver = new Doctrine_Cache_Array();
+
+        $query = Doctrine_Query::create()
+            ->useResultCache($cacheDriver, $this->resultCacheLifeSpan)
+            ->from('Ticket_1636_File f')
+            ->innerJoin('f.type t')
+            ->where('f.type_id = ?')
+            ->orderBy('f.id DESC')
+            ->limit(2);
+
+        // Execute query first time.
+        // Results should be placed into memcache.
+        $files = $query->execute(array(1));
+
+        // Execute query second time.
+        // Results should be getted from memcache.
+        $files = $query->execute(array(1));
+
+        if (count($files))
+            foreach ($files as $file)
+                $justForTest = $file->type->id;
+
+        $executeQueryCount = 0;
+
+        foreach ($profiler as $event) {
+            if ($event->getName() == 'execute') {
+                $executeQueryCount++;
+                //echo $event->getQuery(), "\n";
+            }
+        }
+
+        // It should be only one really executed query.
+        $this->assertEqual($executeQueryCount, 1);
+    }
+}
+
+class Ticket_1636_FileType extends Doctrine_Record {
+
+    public function setTableDefinition()
+    {
+        static $columns = array(
+            'id' => array(
+                'type' => 'integer',
+                'length' => 4,
+                'unsigned' => true,
+                'notnull' => true,
+                'primary' => true,
+                'autoinc' => true
+            ),
+            'name' => array(
+                'type' => 'string',
+                'length' => 32,
+                'notnull' => true
+            )
+        );
+
+        $this->setTableName('files_types');
+        $this->hasColumns($columns);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_1636_File as files', array(
+            'local' => 'id',
+            'foreign' => 'type_id'
+        ));
+    }
+
+}
+
+class Ticket_1636_File extends Doctrine_Record {
+
+    public function setTableDefinition()
+    {
+        static $columns = array(
+            'id' => array(
+                'type' => 'integer',
+                'length' => 10,
+                'unsigned' => true,
+                'notnull' => true,
+                'primary' => true,
+                'autoinc' => true
+            ),
+            'type_id' => array(
+                'type' => 'integer',
+                'length' => 4,
+                'notnull' => true
+            ),
+            'filename' => array(
+                'type' => 'string',
+                'length' => 255,
+                'notnull' => true
+            )
+        );
+
+        $this->setTableName('files');
+        $this->hasColumns($columns);
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_1636_FileType as type', array(
+            'local' => 'type_id',
+            'foreign' => 'id'
+        ));
+    }
+
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1641TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1641TestCase.php
new file mode 100644
index 000000000..780d358df
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1641TestCase.php
@@ -0,0 +1,82 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1641_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1641_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'T1641_User';
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+        $user = new T1641_User();
+        $user->name = 'jwage';
+        $user->save();
+
+        $user = new T1641_User();
+        $user->name = 'guilhermeblanco';
+        $user->save();   
+
+        $user->delete();     
+    }
+
+    public function testTicket()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+
+        $table = Doctrine_Core::getTable('T1641_User');
+
+        $this->assertEqual($table->createQuery()->getCountSqlQuery(), 'SELECT COUNT(*) AS num_results FROM t1641__user t WHERE (t.deleted_at IS NULL)');
+	
+        $this->assertEqual($table->count(), 1);
+        $this->assertEqual($table->createQuery()->execute()->count(), 1);
+        $this->assertEqual($table->createQuery()->count(), 1);
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+    }
+}
+
+class T1641_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('user_id as id', 'integer', null, array('primary' => true, 'autoincrement' => true));
+        $this->hasColumn('name', 'string', 100);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('SoftDelete');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1652TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1652TestCase.php
new file mode 100644
index 000000000..783720a13
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1652TestCase.php
@@ -0,0 +1,95 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1652_TestCase
+ *
+ * @package     Doctrine
+ * @author      floriank
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.1
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1652_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables = array();
+        $this->tables[] = 'Ticket_1652_User';
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+            $user = new Ticket_1652_User();
+            $user->id = 1;
+            $user->name = "floriank";
+            $user->save();
+    }
+
+    public function testValidate() {
+        $doctrine = new ReflectionClass('Doctrine_Core');
+        if ($doctrine->hasConstant('VALIDATE_USER')) {
+            Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_USER);
+        } else {
+            //I only want my overridden Record->validate()-methods for validation
+            Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE,
+                                                    Doctrine_Core::VALIDATE_ALL &
+                                                    ~Doctrine_Core::VALIDATE_LENGTHS &
+                                                    ~Doctrine_Core::VALIDATE_CONSTRAINTS &
+                                                    ~Doctrine_Core::VALIDATE_TYPES);
+        }
+
+        $user = Doctrine_Core::getTable('Ticket_1652_User')->findOneById(1);
+        $user->name = "test";
+        if ($user->isValid()) {
+            try {
+                $user->save();
+            } catch (Doctrine_Validator_Exception $dve) {
+                // ignore
+            }
+        }
+
+        $user = Doctrine_Core::getTable('Ticket_1652_User')->findOneById(1);
+
+        $this->assertNotEqual($user->name, 'test');
+        //reset validation to default for further testcases
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+}
+
+class Ticket_1652_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', null, array('primary' => true, 'autoincrement' => true));
+        $this->hasColumn('name', 'string', 30);
+    }
+
+    protected function validate() {
+        if ($this->name == "test") {
+            $this->getErrorStack()->add("badName", "No testnames allowed!");
+            return false;
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1653TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1653TestCase.php
new file mode 100644
index 000000000..fe95c6521
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1653TestCase.php
@@ -0,0 +1,121 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1653_TestCase
+ *
+ * @package     Doctrine
+ * @author      floriank
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.1
+ * @version     $Revision$ 
+ */
+class Doctrine_Ticket_1653_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables = array();
+        $this->tables[] = 'Ticket_1653_User';
+        $this->tables[] = 'Ticket_1653_Email';
+        parent::prepareTables();
+    }
+    
+    public function prepareData()
+    {
+
+    }
+
+    public function testValidate()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+        
+        $user = new Ticket_1653_User();
+        $mail = new Ticket_1653_Email();
+        
+        $user->id = 1;
+        $user->name = "floriank";
+        $user->emails[] = $mail;
+        
+        //explicit call of isValid() should return false since $mail->address is null
+
+        $this->assertFalse($user->isValid(true));
+
+        //reset validation to default for further testcases
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+
+    public function testModified()
+    {
+        $user = new Ticket_1653_User();
+        $mail = new Ticket_1653_Email();
+        $mail->address = 'test';
+        $user->emails[] = $mail;
+
+        // Should return true since one of its relationships is modified
+        $this->assertTrue($user->isModified(true));
+
+        $user = new Ticket_1653_User();
+        $this->assertFalse($user->isModified(true));
+        $user->name = 'floriank';
+        $this->assertTrue($user->isModified(true));
+    }
+}
+
+class Ticket_1653_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+    
+    public function setUp()
+    {
+        $this->hasMany('Ticket_1653_Email as emails', array('local' => 'id',
+                                                  'foreign' => 'user_id',
+                                                  'cascade' => array('delete')));
+    }
+    
+    protected function validate()
+    {
+        if ($this->name == "test") {
+            $this->getErrorStack()->add("badName", "No testnames allowed!");
+            return false;
+        }
+    }
+}
+
+class Ticket_1653_Email extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('user_id', 'integer');
+        $this->hasColumn('address', 'string', 255, array('notnull' => true));
+    }
+    
+    public function setUp()
+    {
+        $this->hasOne('Ticket_1653_User as user', array('local' => 'user_id',
+                                                  'foreign' => 'id',
+                                                  'cascade' => array('delete')));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1658TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1658TestCase.php
new file mode 100644
index 000000000..49cd59b52
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1658TestCase.php
@@ -0,0 +1,77 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1658_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1658_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1658_User';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_AUTO_ACCESSOR_OVERRIDE, true);
+        try {
+            $user = new Ticket_1658_User();
+            $user->password = 'test';
+            $this->fail();
+        } catch (Doctrine_Exception $e) {
+            $this->pass();
+            $this->assertEqual($e->getMessage(), 'Set password called');
+        }
+
+        try {
+            $user = new Ticket_1658_User();
+            $user->fromArray(array('password' => 'test'));
+            $this->fail();
+        } catch (Doctrine_Exception $e) {
+            $this->pass();
+            $this->assertEqual($e->getMessage(), 'Set password called');
+        }
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_AUTO_ACCESSOR_OVERRIDE, false);
+    }
+}
+
+class Ticket_1658_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+    }
+
+    public function setPassword($password)
+    {
+        throw new Doctrine_Exception('Set password called');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1674TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1674TestCase.php
new file mode 100644
index 000000000..981224419
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1674TestCase.php
@@ -0,0 +1,50 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1674_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1674_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $users  = Doctrine_Query::create()
+            ->from('User u')
+            ->leftJoin('u.Phonenumber p')
+            ->having('COUNT(p.id) > 0')
+            ->groupBy('u.id')
+            ->limit(1)
+            ->execute();
+
+        $xml = $users->exportTo('xml'); 
+        $this->assertEqual($xml, '<?xml version="1.0" encoding="utf-8"?>
+<data><User id="4" type="0" email_id="1"><name>zYne</name><loginname/><password/><created/><updated/><Phonenumber><Phonenumber id="2" entity_id="4"><phonenumber>123 123</phonenumber><Entity/></Phonenumber></Phonenumber></User></data>
+');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1703TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1703TestCase.php
new file mode 100644
index 000000000..5fab692db
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1703TestCase.php
@@ -0,0 +1,87 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Template_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1703_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1703_Content';
+        $this->tables[] = 'Ticket_1703_Revision';
+        parent::prepareTables();
+    }
+
+    public function testSerialization()
+    {
+        $revision = new Ticket_1703_Revision();
+        $revision->content_id = 1;
+        $revision->user_name = 'jwage';
+        $foo = serialize($revision);
+        $this->assertEqual(1, $revision->content_id);
+    }
+
+}
+
+class Ticket_1703_Content extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->hasColumn('id', 'integer', 4, array('type' => 'integer', 'autoincrement' => true, 'primary' => true, 'length' => '4'));
+    $this->hasColumn('content', 'string', null, array('type' => 'string'));
+  }
+
+  public function setUp()
+  {
+    $this->hasMany('Ticket_1703_Revision as revision', array('local' => 'id',
+                                                 'foreign' => 'content_id'));
+  }
+}
+
+class Ticket_1703_Revision extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->hasColumn('revision', 'integer', 4, array('type' => 'integer', 'notnull' => true, 'default' => 1, 'length' => '4', 'primary' => true));
+    $this->hasColumn('user_name', 'string', 255, array('type' => 'string', 'notnull' => true, 'length' => '255'));
+    $this->hasColumn('comment', 'string', 255, array('type' => 'string', 'length' => '255'));
+    $this->hasColumn('content_id', 'integer', 4, array('type' => 'integer', 'primary' => true, 'length' => '4'));
+  }
+
+  public function setUp()
+  {
+    $this->hasOne('Ticket_1703_Content as contentStorage', array('local' => 'content_id',
+                                                             'foreign' => 'id',
+                                                             'onDelete' => 'CASCADE'));
+
+    $timestampable0 = new Doctrine_Template_Timestampable(array('update' => array('disabled' => true)));
+    $this->actAs($timestampable0);
+  }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1706TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1706TestCase.php
new file mode 100644
index 000000000..49a0d37f8
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1706TestCase.php
@@ -0,0 +1,92 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1706_TestCase
+ *
+ * @package     Doctrine
+ * @author      David Abdemoulaie <doctrine@hobodave.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1706_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testCachedResultsAreSpecificToDsn()
+    {
+        $cacheDriver = new Doctrine_Cache_Array();
+
+        $conn1 = Doctrine_Manager::connection('sqlite::memory:', 'conn_1');
+        $conn1->setAttribute(Doctrine_Core::ATTR_RESULT_CACHE, $cacheDriver);
+
+        $conn2 = Doctrine_Manager::connection('sqlite::memory:', 'conn_2');
+        $conn2->setAttribute(Doctrine_Core::ATTR_RESULT_CACHE, $cacheDriver);
+        $this->assertNotEqual($conn1, $conn2);
+
+        $manager = Doctrine_Manager::getInstance();
+        $manager->setCurrentConnection('conn_1');
+        $this->assertEqual($conn1, Doctrine_Manager::connection());
+
+        Doctrine_Core::createTablesFromArray(array('Ticket_1706_User'));
+
+        $user = new Ticket_1706_User();
+        $user->name = 'Allen';
+        $user->save();
+
+        $manager->setCurrentConnection('conn_2');
+        $this->assertEqual($conn2, Doctrine_Manager::connection());
+
+        Doctrine_Core::createTablesFromArray(array('Ticket_1706_User'));
+
+        $user = new Ticket_1706_User();
+        $user->name = 'Bob';
+        $user->save();
+        
+        $manager->setCurrentConnection('conn_1');
+        $u1 = Doctrine_Query::create()
+            ->from('Ticket_1706_User u')
+            ->useResultCache()
+            ->execute();
+
+        $this->assertEqual(1, count($u1));
+        $this->assertEqual('Allen', $u1[0]->name);
+
+        $manager->setCurrentConnection('conn_2');
+        $u2 = Doctrine_Query::create()
+            ->from('Ticket_1706_User u')
+            ->useResultCache()
+            ->execute();
+
+        $this->assertEqual(1, count($u2));
+        $this->assertEqual('Bob', $u2[0]->name);
+    }
+}
+
+class Ticket_1706_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string');
+        $this->hasColumn('password', 'string');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1713TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1713TestCase.php
new file mode 100644
index 000000000..142a09742
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1713TestCase.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Doctrine_Ticket_1713_TestCase
+ */
+
+class Doctrine_Ticket_1713_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables = array('Parent1713', 'Child1713A');
+        parent::prepareTables();
+    }
+
+    public function prepareData() 
+    {
+        $record = new Child1713A();
+        $record['title'] = 'Child1713A';
+        $record->save();
+    }
+
+    public function testInheritanceSubclasses()
+    {
+        $records = Doctrine_Query::create()->query('FROM Parent1713 m');
+   	
+   	    foreach ($records as $rec) {
+        	$this->assertEqual(get_class($rec), $rec['title']);
+        }
+    }
+}
+
+class Parent1713 extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('mytable');
+    $this->hasColumn('id', 'integer', 4, array (
+      'primary' => true,
+      'autoincrement' => true,
+      'notnull' => true,
+    ));
+
+    $this->hasColumn('title', 'string', 255, array ());
+    $this->hasColumn('PHP_TYPE as phpType', 'integer', 11, array ());
+
+    $this->setSubclasses(
+    	array('Child1713A' => array('phpType' => 1))
+    );
+  }
+
+  public function setUp()
+  {
+  
+  }
+}
+
+class Child1713A extends Parent1713
+{
+ 
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1716TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1716TestCase.php
new file mode 100644
index 000000000..bbd6d3c96
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1716TestCase.php
@@ -0,0 +1,72 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1716_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1716_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1716_User';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+
+        $user = new Ticket_1716_User();
+        $user->username = 'jwage';
+        $user->password = 'changeme';
+
+        try {
+            $user->save();
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail('Validation should not have failed');
+        }
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+}
+
+class Ticket_1716_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('Timestampable');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1725TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1725TestCase.php
new file mode 100644
index 000000000..2dab9d646
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1725TestCase.php
@@ -0,0 +1,74 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1725_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1725_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1725_User';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+
+        $user = new Ticket_1725_User();
+        $user->username = 'jwage';
+        $user->password = 'changeme';
+        $user->save();
+        $user->delete();
+
+        $version = $user->getAuditLog()->getVersion($user, 2);
+        $this->assertTrue(isset($version[0]['deleted_at']) && $version[0]['deleted_at']);
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+    }
+}
+
+class Ticket_1725_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('Timestampable');
+        $this->actAs('SoftDelete');
+        $this->actAs('Versionable', array(
+        		'generateRelations' => false,
+        		'deleteVersions' => false));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1727/models1/Ticket_1727_Model1.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1727/models1/Ticket_1727_Model1.php
new file mode 100644
index 000000000..f305b7740
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1727/models1/Ticket_1727_Model1.php
@@ -0,0 +1,8 @@
+<?php
+class Ticket_1727_Model1 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1727/models1/Ticket_1727_Model2.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1727/models1/Ticket_1727_Model2.php
new file mode 100644
index 000000000..5e494d45f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1727/models1/Ticket_1727_Model2.php
@@ -0,0 +1,8 @@
+<?php
+class Ticket_1727_Model2 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1727/models2/Ticket_1727_Model3.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1727/models2/Ticket_1727_Model3.php
new file mode 100644
index 000000000..7ef4ea10a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1727/models2/Ticket_1727_Model3.php
@@ -0,0 +1,8 @@
+<?php
+class Ticket_1727_Model3 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1727/models2/Ticket_1727_Model4.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1727/models2/Ticket_1727_Model4.php
new file mode 100644
index 000000000..6fd09f2ec
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1727/models2/Ticket_1727_Model4.php
@@ -0,0 +1,8 @@
+<?php
+class Ticket_1727_Model4 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1727TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1727TestCase.php
new file mode 100644
index 000000000..968de753e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1727TestCase.php
@@ -0,0 +1,69 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1727_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1727_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $models1 = Doctrine_Core::loadModels(dirname(__FILE__) . '/1727/models1', Doctrine_Core::MODEL_LOADING_CONSERVATIVE);
+        $models2 = Doctrine_Core::loadModels(dirname(__FILE__) . '/1727/models1', Doctrine_Core::MODEL_LOADING_CONSERVATIVE);
+        $this->assertEqual($models1, $models2);
+
+        $models1 = Doctrine_Core::loadModels(dirname(__FILE__) . '/1727/models1');
+        $models2 = Doctrine_Core::loadModels(dirname(__FILE__) . '/1727/models1');
+        $this->assertEqual($models1, $models2);
+
+        $models1 = Doctrine_Core::loadModels(dirname(__FILE__) . '/1727/models1', Doctrine_Core::MODEL_LOADING_CONSERVATIVE);
+        $models2 = Doctrine_Core::loadModels(dirname(__FILE__) . '/1727/models1', Doctrine_Core::MODEL_LOADING_CONSERVATIVE);
+        $this->assertEqual($models1, $models2);
+
+        $models1 = Doctrine_Core::loadModels(dirname(__FILE__) . '/1727/models2', Doctrine_Core::MODEL_LOADING_CONSERVATIVE);
+        $models2 = Doctrine_Core::loadModels(dirname(__FILE__) . '/1727/models2', Doctrine_Core::MODEL_LOADING_CONSERVATIVE);
+        $this->assertEqual($models1, $models2);
+
+        $models1 = Doctrine_Core::loadModels(dirname(__FILE__) . '/1727/models2');
+        $models2 = Doctrine_Core::loadModels(dirname(__FILE__) . '/1727/models2');
+        $this->assertEqual($models1, $models2);
+
+        $models1 = Doctrine_Core::loadModels(dirname(__FILE__) . '/1727/models2', Doctrine_Core::MODEL_LOADING_CONSERVATIVE);
+        $models2 = Doctrine_Core::loadModels(dirname(__FILE__) . '/1727/models2', Doctrine_Core::MODEL_LOADING_CONSERVATIVE);
+        $this->assertEqual($models1, $models2);
+
+        $models1 = Doctrine_Core::loadModels(array(dirname(__FILE__) . '/1727/models1', dirname(__FILE__) . '/1727/models2'));
+        $models2 = Doctrine_Core::loadModels(array(dirname(__FILE__) . '/1727/models1', dirname(__FILE__) . '/1727/models2'));
+        $this->assertEqual($models1, $models2);
+
+        $models1 = Doctrine_Core::loadModels(array(dirname(__FILE__) . '/1727/models1', dirname(__FILE__) . '/1727/models2'), Doctrine_Core::MODEL_LOADING_CONSERVATIVE);
+        $models2 = Doctrine_Core::loadModels(array(dirname(__FILE__) . '/1727/models1', dirname(__FILE__) . '/1727/models2'), Doctrine_Core::MODEL_LOADING_CONSERVATIVE);
+        $this->assertEqual($models1, $models2);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1729TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1729TestCase.php
new file mode 100644
index 000000000..6cb39c7aa
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1729TestCase.php
@@ -0,0 +1,80 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1729_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1729_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1729_User';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+
+        $user = new Ticket_1729_User();
+        $user->username = 'jwage';
+        $user->password = 'changeme';
+        $user->save();
+
+        $user = new Ticket_1729_User();
+        $user->username = 'romanb';
+        $user->password = 'changeme';
+        $user->save();
+        $user->delete();
+
+        $q = Doctrine_Query::create()
+            ->select('u.id')
+            ->from('Ticket_1729_User u');
+        $this->assertEqual($q->count(), 1);
+        $results = $q->execute();
+        $this->assertEqual($q->getSqlQuery(), 'SELECT t.id AS t__id FROM ticket_1729__user t WHERE (t.deleted_at IS NULL)');
+        $this->assertEqual(count($results), 1);
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+    }
+}
+
+class Ticket_1729_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('SoftDelete');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1745TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1745TestCase.php
new file mode 100644
index 000000000..057442a0d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1745TestCase.php
@@ -0,0 +1,95 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1745_TestCase
+ *
+ * @package     Doctrine
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1745_TestCase extends Doctrine_UnitTestCase {
+
+    public function prepareTables() {
+        $this->tables = array('locality');
+        
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+        $locality = new Locality();
+        $locality->postal_code = '1920';
+        $locality->city = 'Martigny';
+        $locality->save();
+        
+        $locality = new Locality();
+        $locality->postal_code = '1965';
+        $locality->city = 'Savièse';
+        $locality->save();
+        
+        $locality = new Locality();
+        $locality->postal_code = '2300';
+        $locality->city = 'Neuchâtel';
+        $locality->save();
+    }
+    
+    public function testSearchable()
+    {
+      $query = Doctrine_Query::create()
+          ->from('Locality l');
+      $query = Doctrine_Core::getTable('Locality')->search('martigny', $query);
+      $results = $query->fetchArray();
+      $this->assertEqual($results[0]['city'], 'Martigny');
+      
+      $query = Doctrine_Query::create()
+          ->from('Locality l');
+      $query = Doctrine_Core::getTable('Locality')->search('saviese', $query);
+      $results = $query->fetchArray();
+      $this->assertEqual($results[0]['city'], 'Savièse');
+      
+      $query = Doctrine_Query::create()
+          ->from('Locality l');
+      $query = Doctrine_Core::getTable('Locality')->search('neuchatel', $query);
+      $results = $query->fetchArray();
+      $this->assertEqual($results[0]['city'], 'Neuchâtel');
+    }
+}
+
+class Locality extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+      $this->setTableName('locality');
+      $this->hasColumn('id', 'integer', 4, array('type' => 'integer', 'primary' => true, 'autoincrement' => true, 'length' => '4'));
+      $this->hasColumn('postal_code', 'string', 6, array('type' => 'string', 'notnull' => true, 'length' => '6'));
+      $this->hasColumn('city', 'string', 120, array('type' => 'string', 'notnull' => true, 'length' => '120'));
+    }
+
+    public function setUp()
+    {
+      $searchable0 = new Doctrine_Template_Searchable(array('fields' => array(0 => 'city')));
+      $this->actAs($searchable0);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1762TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1762TestCase.php
new file mode 100644
index 000000000..be14c19c2
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1762TestCase.php
@@ -0,0 +1,94 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1762_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1762_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, true);
+        $adapter = new Doctrine_Adapter_Mock('pgsql');
+        $conn = Doctrine_Manager::connection($adapter);
+        $profiler = new Doctrine_Connection_Profiler();
+        $conn->setListener($profiler);
+
+        $query = Doctrine_Query::create()
+            ->from('User2 u')
+            ->leftJoin('u.Roles')
+            ->orderBy('u.id');
+        $pager = new Doctrine_Pager($query, 1, 20);
+        $records = $pager->execute($conn);
+
+        $queries = $adapter->getAll();
+        $this->assertEqual($queries[0], 'SELECT COUNT(*) AS "num_results" FROM (SELECT "u"."id" FROM "user2" "u" LEFT JOIN "user_role2" "u2" ON ("u"."id" = "u2"."user_id") LEFT JOIN "role2" "r" ON "r"."id" = "u2"."role_id" GROUP BY "u"."id") "dctrn_count_query"');
+        $this->assertEqual($queries[1], 'SELECT "u"."id" AS "u__id", "u"."username" AS "u__username", "r"."id" AS "r__id", "r"."name" AS "r__name" FROM "user2" "u" LEFT JOIN "user_role2" "u2" ON ("u"."id" = "u2"."user_id") LEFT JOIN "role2" "r" ON "r"."id" = "u2"."role_id" WHERE "u"."id" IN (SELECT "doctrine_subquery_alias"."id" FROM (SELECT DISTINCT "u3"."id" FROM "user2" "u3" LEFT JOIN "user_role2" "u4" ON ("u3"."id" = "u4"."user_id") LEFT JOIN "role2" "r2" ON "r2"."id" = "u4"."role_id" ORDER BY "u3"."id" LIMIT 20) AS "doctrine_subquery_alias") ORDER BY "u"."id"');
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, false);
+    }
+}
+
+class User2 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Role2 as Roles', array('refClass' => 'UserRole2', 
+                                                          'local'    => 'user_id',
+                                                          'foreign'  => 'role_id'));
+    }
+}
+
+class Role2 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('User2 as Users', array('refClass' => 'UserRole2', 
+                                                          'local'    => 'role_id',
+                                                          'foreign'  => 'User_id'));
+    }
+}
+
+class UserRole2 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('user_id', 'integer', null, array('primary' => true));
+        $this->hasColumn('role_id', 'integer', null, array('primary' => true));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1763TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1763TestCase.php
new file mode 100644
index 000000000..2f42e7f41
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1763TestCase.php
@@ -0,0 +1,83 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1763_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1763_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1763_User';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+        $user = new Ticket_1763_User();
+        $valid = $user->isValid();
+        $this->assertFalse($valid);
+        $string = $user->getErrorStackAsString();
+        $this->_validateErrorString($string);
+
+        try {
+            $user->save();
+            $this->fail();
+        } catch (Exception $e) {
+            $this->pass();
+            $this->_validateErrorString($e->getMessage());
+        }
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+
+    protected function _validateErrorString($string)
+    {
+        $this->assertTrue(strstr($string, 'Validation failed in class Ticket_1763_User'));
+        $this->assertTrue(strstr($string, '3 fields had validation errors:'));
+        $this->assertTrue(strstr($string, '* 1 validator failed on email_address (notnull)'));
+        $this->assertTrue(strstr($string, '* 1 validator failed on username (notnull)'));
+        $this->assertTrue(strstr($string, '* 1 validator failed on ip_address (notnull)'));
+    }
+}
+
+class Ticket_1763_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('email_address', 'string', 255, array('unique'  => true,
+                                                               'notnull' => true,
+                                                               'email'   => true));
+        $this->hasColumn('username', 'string', 255, array('unique'   => true,
+                                                          'notnull'  => true));
+        $this->hasColumn('password', 'string', 255);
+        $this->hasColumn('ip_address','string', 255, array('notnull' => true, 'ip' => true));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1764TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1764TestCase.php
new file mode 100644
index 000000000..89ccc48cb
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1764TestCase.php
@@ -0,0 +1,66 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1764_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1764_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1764_User';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+
+        $user = new Ticket_1764_User();
+        $user->username = 'jwage';
+        $user->password = 'changeme';
+        $user->rate = 1;
+        $this->assertEqual($user->isValid(), true);
+
+        $sql = Doctrine_Core::generateSqlFromArray(array('Ticket_1764_User'));
+        $this->assertEqual($sql[0], 'CREATE TABLE ticket_1764__user (id INTEGER PRIMARY KEY AUTOINCREMENT, username VARCHAR(255), password VARCHAR(255), rate DECIMAL(18,2) NOT NULL)');
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+}
+
+class Ticket_1764_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+        $this->hasColumn('rate', 'decimal', null, array('notnull' => true));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1768TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1768TestCase.php
new file mode 100644
index 000000000..8423fd07e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1768TestCase.php
@@ -0,0 +1,17 @@
+<?php
+class Doctrine_Ticket_1768_TestCase extends Doctrine_UnitTestCase
+{
+    public function testResultCacheHashShouldProduceDifferentHashesWhenPassingParamsToWhereMethod()
+    {
+        $queryOne = Doctrine_Query::create()
+            ->from('Ticket_1768_Foo f')
+            ->where('f.bar = ?', 1);
+
+        $queryTwo = Doctrine_Query::create()
+            ->from('Ticket_1768_Foo f')
+            ->where('f.bar = ?', 2);
+
+        //Result hashes should be different
+        $this->assertNotEqual($queryOne->calculateResultCacheHash(), $queryTwo->calculateResultCacheHash());
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1783TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1783TestCase.php
new file mode 100644
index 000000000..e6495920e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1783TestCase.php
@@ -0,0 +1,29 @@
+<?php
+class Doctrine_Ticket_1783_TestCase extends Doctrine_UnitTestCase
+{
+	public function prepareTables() 
+    {
+        $this->tables[] = 'Ticket_1783';
+        parent::prepareTables();
+    }
+	
+    public function testValidateLargeIntegers()
+    {
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);        
+
+        $test = new Ticket_1783();
+        $test->bigint = PHP_INT_MAX + 1;
+        
+        $this->assertTrue($test->isValid());
+
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+}
+
+class Ticket_1783 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('bigint', 'integer', null, array('type' => 'integer', 'unsigned' => true));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1793TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1793TestCase.php
new file mode 100644
index 000000000..60c20df5b
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1793TestCase.php
@@ -0,0 +1,138 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1793_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1793_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData()
+    {
+        $order1 = new Ticket_1793_Order;
+        $order1->status = 'new';
+        $order1->save();
+
+        /* The enum column can be changed if the value isn't equal to that of one of the column aggregation's keyValue's: */
+        $order2 = new Ticket_1793_Order;
+        $order2->status = 'shipped'; // 'shipped' isn't one of the column aggregation keyValue's
+        $order2->save();
+
+        // Same as $order2
+        $order3 = new Ticket_1793_Order;
+        $order3->status = 'shipped';
+        $order3->save();
+
+        $order4 = new Ticket_1793_Order;
+        $order4->status = 'new';
+        $order4->save();
+    }
+
+    public function prepareTables()
+    {
+        $this->tables = array('Ticket_1793_Order', 'Ticket_1793_OrdersNew', 'Ticket_1793_OrdersCompleted');
+        parent::prepareTables();
+    }
+
+    public function testTicket()
+    {
+        // Doesn't work:
+        $order1 = Doctrine_Core::getTable('Ticket_1793_Order')->find(1);
+        //echo $order1->status; // 'new'
+        $order1->status = 'completed';
+        $order1->save();
+        $this->assertEqual($order1->status, 'completed');
+
+        // Works because previous status was not one of the column aggregation's keyValue's
+        $order2 = Doctrine_Core::getTable('Ticket_1793_Order')->find(2);
+        //echo $order2->status; // 'shipping'
+        $order2->status = 'new';
+        $order2->save();
+        $this->assertEqual($order2->status, 'new');
+
+        // This works because it reuses $order2 from above:
+        //echo $order2->status; // 'new'
+        $order2->status = 'completed';
+        $order2->save();
+        $this->assertEqual($order2->status, 'completed');
+
+        // Works because previous status was not one of the column aggregation's keyValue's
+        $order3 = Doctrine_Core::getTable('Ticket_1793_Order')->find(3);
+        //echo $order2->status; // 'shipping'
+        $order3->status = 'new';
+        $order3->save();
+        $this->assertEqual($order3->status, 'new');
+
+        // Now this doesn't work because it's re-finding order #3 instead of re-using $order3.
+        $order3 = Doctrine_Core::getTable('Ticket_1793_Order')->find(3);
+        //echo $order3->status; // 'new'
+        $order3->status = 'completed';
+        $order3->save();
+        $this->assertEqual($order3->status, 'completed');
+
+        /* Changing the table name to Ticket_1793_OrdersNew still fails. */
+        $order4 = Doctrine_Core::getTable('Ticket_1793_OrdersNew')->find(4);
+        //echo $order4->status; // 'new'
+        $order4->status = 'completed';
+        $order4->save();
+        $this->assertEqual($order4->status, 'completed');
+
+        // This works.
+        $o1 = Doctrine_Query::create()
+            ->update('Ticket_1793_Order o')
+            ->set('o.status', '?', 'completed')
+            ->where('o.id = ?', 1)
+            ->execute();
+        $order1 = Doctrine_Core::getTable('Ticket_1793_Order')->find(1);
+        $this->assertEqual($order1->status, 'completed');
+    }
+
+}
+
+class Ticket_1793_Order extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('ticket_1793_orders');
+    $this->hasColumn('id', 'integer', 4, array('type' => 'integer', 'unsigned' => '1', 'primary' => true, 'autoincrement' => true, 'length' => '4'));
+    $this->hasColumn('status', 'enum', null, array('type' => 'enum', 'values' => array(0 => 'new', 1 => 'completed', 2 => 'shipped')));
+
+    $this->setSubClasses(array('Ticket_1793_OrdersNew' => array('status' => 'new'), 'Ticket_1793_OrdersCompleted' => array('status' => 'completed')));
+  }
+
+}
+
+class Ticket_1793_OrdersCompleted extends Ticket_1793_Order
+{
+
+}
+
+class Ticket_1793_OrdersNew extends Ticket_1793_Order
+{
+
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1795TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1795TestCase.php
new file mode 100644
index 000000000..28472b773
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1795TestCase.php
@@ -0,0 +1,77 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1795_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1795_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1795_BlogPost';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $test = new Ticket_1795_BlogPost();
+        $test->Translation['en']->title = 'test';
+        try {
+            $value = $test->Translation['en']->customMethod();
+            $this->assertEqual($value, 'custom method');
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail();
+        }
+    }
+}
+
+class Ticket_1795_BlogPost extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('title', 'string', 255);
+        $this->hasColumn('body', 'clob');
+    }
+
+    public function setUp()
+    {
+        $i18n = new Doctrine_Template_I18n(array('fields' => array('title')));
+        $i18n->addChild(new CustomTemplate());
+        $this->actAs($i18n);
+    }
+}
+
+class CustomTemplate extends Doctrine_Template
+{
+    public function customMethod()
+    {
+        return 'custom method';
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1799TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1799TestCase.php
new file mode 100644
index 000000000..0fe8b7945
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1799TestCase.php
@@ -0,0 +1,69 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1799_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1799_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1799_Test';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+        try {
+            $test = new Ticket_1799_Test();
+            $test->name = 'test';
+            $test->latitude = '49.3583848';
+            $test->longitude = '49.3583848';
+            $test->save();
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail();
+        }
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+}
+
+class Ticket_1799_Test extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('Geographical');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1808TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1808TestCase.php
new file mode 100644
index 000000000..384bbb4d2
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1808TestCase.php
@@ -0,0 +1,56 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1808_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1808_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $userTable = Doctrine_Core::getTable('User');
+
+        $this->assertEqual($userTable->buildFindByWhere('NameAndPassword'), 'dctrn_find.name = ? AND dctrn_find.password = ?');
+        $this->assertEqual($userTable->buildFindByWhere('NameOrLoginname'), '(dctrn_find.name = ? OR dctrn_find.loginname = ?)');
+        $this->assertEqual($userTable->buildFindByWhere('NameAndPasswordOrLoginname'), 'dctrn_find.name = ? AND (dctrn_find.password = ? OR dctrn_find.loginname = ?)');
+        $this->assertEqual($userTable->buildFindByWhere('NameAndPasswordOrLoginnameAndName'), 'dctrn_find.name = ? AND (dctrn_find.password = ? OR dctrn_find.loginname = ?) AND dctrn_find.name = ?');
+
+        $user = new User();
+        $user->name = 'bigtest';
+        $user->loginname = 'cooltest';
+        $user->Email->address = 'jonathan.wage@sensio.com';
+        $user->save();
+
+        $user2 = $userTable->findOneByNameAndLoginnameAndEmailId($user->name, $user->loginname, $user->email_id);
+        $this->assertIdentical($user, $user2);
+
+        $test = $userTable->findOneByNameAndLoginnameAndEmailId($user->name, $user->loginname, $user->email_id, Doctrine_Core::HYDRATE_ARRAY);
+        $this->assertTrue(is_array($test));   
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1818TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1818TestCase.php
new file mode 100644
index 000000000..81ceca04f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1818TestCase.php
@@ -0,0 +1,98 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1818_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1818_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1818_Foo';
+        $this->tables[] = 'Ticket_1818_Bar';
+        $this->tables[] = 'Ticket_1818_BarB';
+        $this->tables[] = 'Ticket_1818_BarA';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+        try {
+            $foo = new Ticket_1818_Foo();
+            $foo->Bar = new Ticket_1818_BarA();
+            $foo->Bar->type = 'A';
+            $foo->save();
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail();
+        }
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+}
+
+class Ticket_1818_Foo extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('bar_id', 'integer', null, array('type' => 'integer'));
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_1818_Bar as Bar', array('local' => 'bar_id',
+                                   'foreign' => 'id'));
+    }
+}
+
+class Ticket_1818_BarB extends Ticket_1818_Bar
+{
+
+}
+
+class Ticket_1818_BarA extends Ticket_1818_Bar
+{
+
+}
+
+class Ticket_1818_Bar extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('type', 'string', null, array('type' => 'string'));
+
+        $this->setSubClasses(array('Ticket_1818_BarA' => array('type' => 'A'), 'Ticket_1818_BarB' => array('type' => 'B')));
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_1818_Foo as Foos', array('local' => 'id',
+                                            'foreign' => 'bar_id'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1821TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1821TestCase.php
new file mode 100644
index 000000000..cbe3130d7
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1821TestCase.php
@@ -0,0 +1,148 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1821_TestCase
+ *
+ * @package     Doctrine
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ * @author      Andrea Baron <andrea@bhweb.it>
+ */
+class Doctrine_Ticket_1821_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables = array(
+            'Doctrine_Ticket_1821_Record',
+            'Doctrine_Ticket_1821_Record_ID_Aliased',
+            'Doctrine_Ticket_1821_Record_Column_Aliased',
+            'Doctrine_Ticket_1821_Record_Full_Aliased',
+        );
+        parent::prepareTables();
+    }
+    
+    public function prepareData()
+    {
+        
+    }
+    
+    public function execTest($klass)
+    {
+        //stores old validation setting
+        $validation = Doctrine_Manager::getInstance()->getAttribute(Doctrine_Core::ATTR_VALIDATE);
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+        
+        $record = new $klass();
+		$record->name = 'test';
+		try {
+		    $record->save();
+		}
+		catch(Exception $e) {
+		    $this->fail(
+		        'Failed to execute validation with class = "' . $klass 
+		        . '". Exception message is: ' . $e->getMessage()
+		    );
+		}
+		$this->pass();
+		
+		Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, $validation);
+    }
+    
+    public function testShouldAllowNotUsingAliases()
+    {
+        $this->execTest('Doctrine_Ticket_1821_Record');
+    }
+    
+    public function testShouldAllowUsingAliasesOnId()
+    {
+        $this->execTest('Doctrine_Ticket_1821_Record_ID_Aliased');
+    }
+    
+    public function testShouldAllowUsingAliasesOnColumn()
+    {
+        $this->execTest('Doctrine_Ticket_1821_Record_Column_Aliased');
+    }
+    
+    public function testShouldAllowUsingAliasesOnBoth()
+    {
+        $this->execTest('Doctrine_Ticket_1821_Record_Full_Aliased');
+    }
+}
+        
+class Doctrine_Ticket_1821_Record_Full_Aliased extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('user_id as id', 'integer', 4, array(
+                'autoincrement' => true,
+                'notnull' => true,
+                'primary' => true
+                ));
+        $this->hasColumn('user_name as name', 'string', 255, array(
+                'notnull' => true,
+                'unique' => true
+                ));
+    }
+}
+
+class Doctrine_Ticket_1821_Record_ID_Aliased extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('user_id as id', 'integer', 4, array(
+                'autoincrement' => true,
+                'notnull' => true,
+                'primary' => true
+                ));
+        $this->hasColumn('name', 'string', 255, array(
+                'notnull' => true,
+                'unique' => true
+                ));
+    }
+}
+
+class Doctrine_Ticket_1821_Record_Column_Aliased extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('id', 'integer', 4, array(
+                'autoincrement' => true,
+                'notnull' => true,
+                'primary' => true
+                ));
+        $this->hasColumn('user_name as name', 'string', 255, array(
+                'notnull' => true,
+                'unique' => true
+                ));
+    }
+}
+
+class Doctrine_Ticket_1821_Record extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('id', 'integer', 4, array(
+                'autoincrement' => true,
+                'notnull' => true,
+                'primary' => true
+                ));
+        $this->hasColumn('name', 'string', 255, array(
+                'notnull' => true,
+                'unique' => true
+                ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1824TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1824TestCase.php
new file mode 100644
index 000000000..41fd4e0fc
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1824TestCase.php
@@ -0,0 +1,62 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1824_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1824_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1824_Test';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $test = new Ticket_1824_Test();
+        $test->test1 = 'test';
+        $test->Translation['en']->test = 'test';
+        $test->save();
+    }
+}
+
+class Ticket_1824_Test extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('test1', 'string', 255);
+        $this->hasColumn('test2 as test', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('I18n', array('fields' => array('test')));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1830TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1830TestCase.php
new file mode 100644
index 000000000..b9eacf83e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1830TestCase.php
@@ -0,0 +1,95 @@
+<?php
+
+
+class Doctrine_Ticket_1830_TestCase extends Doctrine_UnitTestCase
+{
+    public function init()
+    {
+        Doctrine_Manager::connection('mysql://root:password@localhost/doctrine', 'Mysql');
+        $this->driverName = 'Mysql';
+        parent::init();
+        Doctrine_Manager::connection('mysql://root:password@localhost/doctrine', 'Mysql');
+        $this->prepareTables();
+        $this->prepareData();
+    }
+
+    public function run(DoctrineTest_Reporter $reporter = null, $filter = null)
+    {
+      parent::run($reporter, $filter);
+      $this->manager->closeConnection($this->connection);
+    }
+
+    public function prepareData() 
+    {
+    }
+    
+    public function prepareTables() 
+    {
+        try {
+            $this->conn->exec('DROP TABLE ticket_1830__article_translation');
+        } catch(Doctrine_Connection_Exception $e) {
+        }
+        $this->tables = array('Ticket_1830_Article');
+        parent::prepareTables();
+    }
+
+    public function testDuplicatedParamsInSubQuery()
+    {
+        $this->connection->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+
+        $article = new Ticket_1830_Article();
+        $article->Translation['en']->title = 'Node1';
+        $article->save($this->connection);
+        $article = new Ticket_1830_Article();
+        $article->Translation['en']->title = 'Node2';
+        $article->save($this->connection);
+        $article = new Ticket_1830_Article();
+        $article->Translation['en']->title = 'Node3';
+        $article->save($this->connection);
+        $article = new Ticket_1830_Article();
+        $article->Translation['en']->title = 'Node4';
+        $article->save($this->connection);
+        $article = new Ticket_1830_Article();
+        $article->Translation['en']->title = 'Node5';
+        $article->save($this->connection);
+
+        try
+        {
+            $q = Doctrine_Core::getTable('Ticket_1830_Article')
+                ->createQuery('a')
+                ->select('a.*, t.*')
+                ->leftJoin('a.Translation t')
+                ->addWhere('a.id = ? OR a.id = ?', array(2, 3))
+                ->orderBy('a.id DESC')
+                ->limit(1);
+            $results = $q->execute();
+            $this->assertEqual(count($results), 1);
+            $this->assertEqual($results[0]->id, 3);
+        }
+        catch (Exception $e)
+        {
+          $this->fail($e->getMessage());
+        }
+
+        $this->connection->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+    }
+}
+
+class Ticket_1830_Article extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('ticket_1830_article');
+        $this->hasColumn('title', 'string', 255, array('type' => 'string', 'length' => '255'));
+
+        $this->option('type', 'InnoDB');
+        $this->option('collate', 'utf8_unicode_ci');
+        $this->option('charset', 'utf8');
+    }
+
+    public function setUp()
+    {
+        $i18n0 = new Doctrine_Template_I18n(array('fields' => array(0 => 'title')));
+        $this->actAs($i18n0);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1841TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1841TestCase.php
new file mode 100644
index 000000000..889ef230a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1841TestCase.php
@@ -0,0 +1,61 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1841_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1841_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1841_User';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $user = new Ticket_1841_User();
+        $user->password = 'changeme';
+        $this->assertEqual($user->username, 'jwage');
+    }
+}
+
+class Ticket_1841_User extends Doctrine_Record
+{
+    public function construct()
+    {
+        $this->username = 'jwage';
+    }
+
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1843TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1843TestCase.php
new file mode 100644
index 000000000..9ecf575ad
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1843TestCase.php
@@ -0,0 +1,129 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1843_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1843_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1843_User';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+        $user = new Ticket_1843_User();
+        $user->username = 'jwage';
+        $user->password = 'changeme';
+
+        $this->assertTrue($user->isValid());
+        $user->save();
+
+        $check = array(
+          'preSave' => 1,
+          'preInsert' => 1,
+          'postInsert' => 1,
+          'postSave' => 1,
+        );
+        $this->assertEqual($check, $user->hooks);
+        $user->hooks = array();
+
+        $check = array(
+          'preSave' => 1,
+          'preUpdate' => 1,
+          'postUpdate' => 1,
+          'postSave' => 1,
+        );
+        $user->username = 'test';
+        $user->save();
+        $this->assertEqual($check, $user->hooks);
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+}
+
+class Ticket_1843_User extends Doctrine_Record
+{
+    public $hooks = array();
+
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+    }
+
+    public function preSave($event)
+    {
+        $num = isset($this->hooks[__FUNCTION__]) ? $this->hooks[__FUNCTION__]:0;
+        $this->hooks[__FUNCTION__] = $num + 1;
+    }
+    public function postSave($event)
+    {
+        $num = isset($this->hooks[__FUNCTION__]) ? $this->hooks[__FUNCTION__]:0;
+        $this->hooks[__FUNCTION__] = $num + 1;
+    }
+    public function preInsert($event)
+    {
+        $num = isset($this->hooks[__FUNCTION__]) ? $this->hooks[__FUNCTION__]:0;
+        $this->hooks[__FUNCTION__] = $num + 1;
+    }
+    public function postInsert($event)
+    {
+        $num = isset($this->hooks[__FUNCTION__]) ? $this->hooks[__FUNCTION__]:0;
+        $this->hooks[__FUNCTION__] = $num + 1;
+    }
+    public function preUpdate($event)
+    {
+        $num = isset($this->hooks[__FUNCTION__]) ? $this->hooks[__FUNCTION__]:0;
+        $this->hooks[__FUNCTION__] = $num + 1;
+    }
+    public function postUpdate($event)
+    {
+        $num = isset($this->hooks[__FUNCTION__]) ? $this->hooks[__FUNCTION__]:0;
+        $this->hooks[__FUNCTION__] = $num + 1;
+    }
+    public function preDelete($event)
+    {
+        $num = isset($this->hooks[__FUNCTION__]) ? $this->hooks[__FUNCTION__]:0;
+        $this->hooks[__FUNCTION__] = $num + 1;
+    }
+    public function postDelete($event)
+    {
+        $num = isset($this->hooks[__FUNCTION__]) ? $this->hooks[__FUNCTION__]:0;
+        $this->hooks[__FUNCTION__] = $num + 1;
+    }
+
+    public function setUp()
+    {
+        $this->actAs('Timestampable');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1858TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1858TestCase.php
new file mode 100644
index 000000000..367786131
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1858TestCase.php
@@ -0,0 +1,66 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1858_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1858_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'T1858_Foo';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $foo_id = 1234; 
+        $adjustment = -3;
+
+        $query = Doctrine_Query::create()
+            ->update('T1858_Foo')
+            ->set(
+            	'quantity','GREATEST(CAST(quantity AS SIGNED) + :adjustment,0)', 
+                array(':adjustment' => $adjustment)
+            )
+            ->where('id = :id', array(':id' => $foo_id));
+            
+        $this->assertEqual($query->getSqlQuery(), 'UPDATE t1858__foo SET quantity = GREATEST(CAST(quantity AS SIGNED + :adjustment,0)) WHERE (id = :id)');
+    }
+}
+
+class T1858_Foo extends Doctrine_Record
+{
+    public $hooks = array();
+
+    public function setTableDefinition()
+    {
+        $this->hasColumn('quantity', 'integer');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1860TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1860TestCase.php
new file mode 100644
index 000000000..4aa16903d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1860TestCase.php
@@ -0,0 +1,96 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1860_TestCase
+ *
+ * @package     Doctrine
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1860_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData()
+    {
+        // Create 10 users and mark them as deleted.
+        for ($i=0; $i<10; $i++) {
+            $user = new Ticket_1860_User;
+            $user->username = 'user' . $i;
+            $user->password = md5('user' . $i);
+            $user->save();
+            $user->delete();
+        }
+    }
+
+    public function prepareTables()
+    {
+        $this->tables = array('Ticket_1860_User');
+        parent::prepareTables();
+    }
+
+    public function testTicket()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+
+        $query1 = Doctrine_Query::create()
+            ->select('u.*')
+            ->from('Ticket_1860_User u');
+
+        $this->assertEqual(count($query1->fetchArray()), 0);
+
+        $query2 = Doctrine_Query::create()
+            ->select('u.*')
+            ->from('Ticket_1860_User u');
+
+        // Defining initial variables
+        $currentPage = 1;
+        $resultsPerPage = 5;
+
+        // Creating pager object
+        $pager = new Doctrine_Pager($query2, $currentPage, $resultsPerPage);
+
+        $this->assertEqual(count($pager->execute()->toArray()), 0);
+        $this->assertEqual($pager->getQuery()->getSqlQuery(), 'SELECT t.id AS t__id, t.username AS t__username, t.password AS t__password, t.deleted_at AS t__deleted_at FROM ticket_1860_users t WHERE (t.deleted_at IS NULL) LIMIT 5');
+        
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+    }
+}
+
+class Ticket_1860_User extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('ticket_1860_users');
+
+    $this->hasColumn('id', 'integer', 4, array('type' => 'integer', 'unsigned' => '1', 'primary' => true, 'autoincrement' => true, 'length' => '4'));
+    $this->hasColumn('username', 'string', 45, array('type' => 'string', 'notnull' => true, 'unique' => true, 'length' => '45'));
+    $this->hasColumn('password', 'string', 45, array('type' => 'string', 'notnull' => true, 'length' => '45'));
+  }
+
+  public function setUp()
+  {
+    $softdelete0 = new Doctrine_Template_SoftDelete();
+    $this->actAs($softdelete0);
+  }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1865TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1865TestCase.php
new file mode 100644
index 000000000..1a7d4a427
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1865TestCase.php
@@ -0,0 +1,104 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1865_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1865_TestCase extends Doctrine_UnitTestCase 
+{
+
+    public function prepareData() 
+    {
+    }
+    public function prepareTables() 
+    {
+        $this->tables[] = 'Ticket_1865_User';
+        $this->tables[] = 'Ticket_1865_Profile';
+        parent::prepareTables();
+    }
+
+    public function testSaveWithRelated()
+    {
+        $user = new Ticket_1865_User();
+        $user->name = 'hello';
+        $user->loginname = 'world';
+        $user->password = '!';
+        $user->Profile;
+        $user->save();
+        
+        $this->assertNotEqual($user->Profile->id, null); // Ticket_1865_Profile is saved
+        $user->delete();
+    }
+    
+    public function testSaveWithRelatedWithPreInsert()
+    {
+        $user = new Ticket_1865_User();
+        $user->name = 'hello';
+        $user->loginname = 'world';
+        $user->password = '!';
+        $user->save(); // $user->Ticket_1865_Profile must be called in Ticket_1865_User::preInsert
+        
+        $this->assertNotEqual($user->Profile->id, null); // Ticket_1865_Profile is NOT saved - test failure
+        $user->delete();
+    }
+}
+
+class Ticket_1865_Profile extends Doctrine_Record 
+{
+    public function setUp() 
+    {
+        $this->hasOne('Ticket_1865_User as User', array('local' => 'id', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+    }
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('id', 'integer',20, array('autoincrement', 'primary'));
+        $this->hasColumn('user_id', 'integer', 20, array('notnull', 'unique'));
+        $this->hasColumn('icq', 'string', 9, array('notnull'));  
+    }
+}
+
+class Ticket_1865_User extends Doctrine_Record 
+{
+    public function setUp() 
+    {
+        $this->hasOne('Ticket_1865_Profile as Profile', array('local' => 'id', 'foreign' => 'user_id'));
+    }
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('id', 'integer',20, array('autoincrement', 'primary'));
+        $this->hasColumn('name', 'string',50);
+        $this->hasColumn('loginname', 'string',20, array('unique'));
+        $this->hasColumn('password', 'string',16);
+    }
+    public function preInsert($event)
+    {
+        $this->Profile;
+        $this->Profile->icq = '';
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1875TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1875TestCase.php
new file mode 100644
index 000000000..bb76ac8ed
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1875TestCase.php
@@ -0,0 +1,61 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1875_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1875_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1875_Account';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+
+        $account = new Ticket_1875_Account();
+        $account->name = 'Test';
+        $account->amount = '25.99';
+        $this->assertTrue($account->isValid());
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+}
+
+class Ticket_1875_Account extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+        $this->hasColumn('amount', 'decimal', 4, array('scale' => 2));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1876TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1876TestCase.php
new file mode 100644
index 000000000..b4d76b04c
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1876TestCase.php
@@ -0,0 +1,137 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1821_TestCase
+ *
+ * @package     Doctrine
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ * @author      Andrea Baron <andrea@bhweb.it>
+ */
+class Doctrine_Ticket_1876_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables = array(
+            'T1876_Recipe',
+        	'T1876_Company',
+        	'T1876_RecipeIngredient',
+        );
+        parent::prepareTables();
+    }
+    
+    public function prepareData()
+    {
+        for ($i = 0; $i < 2; $i++) {
+            $company = new T1876_Company();
+            $company->name = 'Test Company ' . ($i + 1);
+            $company->save();
+        }
+        
+        for ($i = 0; $i < 10; $i++) {
+            $recipe = new T1876_Recipe();
+            
+            $recipe->name = 'test ' . $i;
+            $recipe->company_id = ($i % 3 == 0) ? 1 : 2;
+            $recipe->RecipeIngredients[]->name = 'test';
+            
+            $recipe->save();
+            
+            if ($i % 2 == 0) {
+                $recipe->delete(); 
+            }
+        }
+    }
+    
+    public function testTicket()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+        
+        try {
+            $q = Doctrine_Query::create()
+                ->from('T1876_Recipe r')
+                ->leftJoin('r.Company c')
+                ->leftJoin('r.RecipeIngredients')
+                ->addWhere('c.id = ?', 2);
+            
+            $this->assertEqual(
+                $q->getCountSqlQuery(), 
+                'SELECT COUNT(*) AS num_results ' . 
+                'FROM (SELECT t.id FROM t1876__recipe t ' . 
+                'LEFT JOIN t1876__company t2 ON t.company_id = t2.id AND (t2.deleted_at IS NULL) ' .
+                'LEFT JOIN t1876__recipe_ingredient t3 ON t.id = t3.recipe_id AND (t3.deleted_at IS NULL) ' .
+                'WHERE t2.id = ? AND (t.deleted_at IS NULL) ' .
+                'GROUP BY t.id) dctrn_count_query'
+            );
+            $this->assertEqual($q->count(), 3);
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+        
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+    }
+}
+        
+class T1876_Recipe extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('id', 'integer', null, array('autoincrement' => true, 'primary' => true));
+        $this->hasColumn('company_id', 'integer', null);
+        $this->hasColumn('name', 'string', 255);
+    }
+    
+    public function setUp() {
+        $this->hasOne('T1876_Company as Company', array('local' => 'company_id', 'foreign' => 'id'));
+        $this->hasMany('T1876_RecipeIngredient as RecipeIngredients', array('local' => 'id', 'foreign' => 'recipe_id'));
+        
+        $this->actAs('SoftDelete');
+    }
+}
+
+class T1876_Company extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('id', 'integer', null, array('autoincrement' => true, 'primary' => true));
+        $this->hasColumn('name', 'string', 255);
+    }
+    
+    public function setUp() {
+        $this->hasMany('T1876_Recipe as Recipes', array('local' => 'id', 'foreign' => 'company_id'));
+        
+        $this->actAs('SoftDelete');
+    }
+}
+
+class T1876_RecipeIngredient extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('id', 'integer', null, array('autoincrement' => true, 'primary' => true));
+        $this->hasColumn('recipe_id', 'integer', null);
+        $this->hasColumn('name', 'string', 255);
+    }
+    
+    public function setUp() {
+        $this->hasOne('T1876_Recipe as Recipe', array('local' => 'recipe_id', 'foreign' => 'id'));
+        
+        $this->actAs('SoftDelete');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1876bTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1876bTestCase.php
new file mode 100644
index 000000000..ed16a1a74
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1876bTestCase.php
@@ -0,0 +1,131 @@
+<?php
+
+class Doctrine_Ticket_1876b_TestCase extends Doctrine_UnitTestCase
+{
+    public function init()
+    {
+        Doctrine_Manager::connection('mysql://root:password@localhost/doctrine', 'Mysql');
+        $this->driverName = 'Mysql';
+        parent::init();
+        Doctrine_Manager::connection('mysql://root:password@localhost/doctrine', 'Mysql');
+        $this->prepareTables();
+        $this->prepareData();
+    }
+
+    public function run(DoctrineTest_Reporter $reporter = null, $filter = null)
+    {
+      parent::run($reporter, $filter);
+      $this->manager->closeConnection($this->connection);
+    }
+
+    public function prepareData() 
+    {
+    }
+    
+    public function prepareTables() 
+    {
+        try {
+            $this->conn->exec('DROP TABLE t1876b_recipe_ingredient');
+            $this->conn->exec('DROP TABLE t1876b_recipe');
+            $this->conn->exec('DROP TABLE t1876b_company');
+        } catch(Doctrine_Connection_Exception $e) {
+        }
+        
+        $this->tables = array(
+            'T1876b_Recipe', 'T1876b_Company', 'T1876b_RecipeIngredient'
+        );
+        
+        parent::prepareTables();
+    }
+
+    public function testDuplicatedParamsInSubQuery()
+    {
+        $this->connection->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+
+        for ($i = 0; $i < 2; $i++) {
+            $company = new T1876b_Company();
+            $company->name = 'Test Company ' . ($i + 1);
+            $company->save($this->connection);
+        }
+        
+        for ($i = 0; $i < 10; $i++) {
+            $recipe = new T1876b_Recipe();
+            
+            $recipe->name = 'test ' . $i;
+            $recipe->company_id = ($i % 3 == 0) ? 1 : 2;
+            $recipe->RecipeIngredients[]->name = 'test';
+            
+            $recipe->save($this->connection);
+            
+            if ($i % 2 == 0) {
+                $recipe->delete($this->connection);
+            }
+        }
+
+        try {
+            $q = Doctrine_Query::create()
+                ->from('T1876b_Recipe r')
+                ->leftJoin('r.Company c')
+                ->leftJoin('r.RecipeIngredients')
+                ->addWhere('c.id = ?', 2);
+            
+            $this->assertEqual(
+                $q->getCountSqlQuery(), 
+                'SELECT COUNT(*) AS num_results FROM ('
+                    . 'SELECT t.id FROM t1876b__recipe t '
+                    . 'LEFT JOIN t1876b__company t2 ON t.company_id = t2.id AND t2.deleted_at IS NULL '
+                    . 'LEFT JOIN t1876b__recipe_ingredient t3 ON t.id = t3.recipe_id AND t3.deleted_at IS NULL '
+                    . 'WHERE t2.id = ? AND (t.deleted_at IS NULL) GROUP BY t.id' 
+                . ') dctrn_count_query'
+            );
+            $this->assertEqual($q->count(), 3);
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+
+        $this->connection->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+    }
+}
+
+
+class T1876b_Recipe extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('id', 'integer', null, array('autoincrement' => true, 'primary' => true));
+        $this->hasColumn('company_id', 'integer', null);
+        $this->hasColumn('name', 'string', 255);
+    }
+    
+    public function setUp() {
+        $this->hasOne('T1876b_Company as Company', array('local' => 'company_id', 'foreign' => 'id'));
+        $this->hasMany('T1876b_RecipeIngredient as RecipeIngredients', array('local' => 'id', 'foreign' => 'recipe_id'));
+        
+        $this->actAs('SoftDelete');
+    }
+}
+
+class T1876b_Company extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('id', 'integer', null, array('autoincrement' => true, 'primary' => true));
+        $this->hasColumn('name', 'string', 255);
+    }
+    
+    public function setUp() {
+        $this->hasMany('T1876b_Recipe as Recipes', array('local' => 'id', 'foreign' => 'company_id'));
+        
+        $this->actAs('SoftDelete');
+    }
+}
+
+class T1876b_RecipeIngredient extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('id', 'integer', null, array('autoincrement' => true, 'primary' => true));
+        $this->hasColumn('recipe_id', 'integer', null);
+        $this->hasColumn('name', 'string', 255);
+    }
+    
+    public function setUp() {
+        $this->hasOne('T1876b_Recipe as Recipe', array('local' => 'recipe_id', 'foreign' => 'id'));
+        
+        $this->actAs('SoftDelete');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1923TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1923TestCase.php
new file mode 100644
index 000000000..fbec054fd
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1923TestCase.php
@@ -0,0 +1,73 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1923_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1923_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1923_User';
+        $this->tables[] = 'Ticket_1923_User2';
+
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $sql = Doctrine_Core::generateSqlFromArray(array('Ticket_1923_User'));
+        $this->assertEqual($sql[1], 'CREATE INDEX username_idx ON ticket_1923__user (login)');
+
+        $sql = Doctrine_Core::generateSqlFromArray(array('Ticket_1923_User2'));
+        $this->assertEqual($sql[1], 'CREATE INDEX username2_idx ON ticket_1923__user2 (login DESC)');
+    }
+}
+
+class Ticket_1923_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('login as username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+
+        $this->index('username', array('fields' => array('username')));
+    }
+}
+
+class Ticket_1923_User2 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('login as username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+
+        $this->index('username2', array('fields' => array('username' => array('sorting' => 'DESC'))));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1935TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1935TestCase.php
new file mode 100644
index 000000000..cc8d9470e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1935TestCase.php
@@ -0,0 +1,60 @@
+<?php
+
+class Doctrine_Ticket_1935_TestCase extends Doctrine_UnitTestCase
+{
+    public function init()
+    {
+        Doctrine_Manager::connection('mysql://root:password@localhost/doctrine', 'Mysql');
+        $this->driverName = 'Mysql';
+        parent::init();
+        Doctrine_Manager::connection('mysql://root:password@localhost/doctrine', 'Mysql');
+        $this->prepareTables();
+        $this->prepareData();
+    }
+
+    public function run(DoctrineTest_Reporter $reporter = null, $filter = null)
+    {
+        parent::run($reporter, $filter);
+        $this->manager->closeConnection($this->connection);
+    }
+
+    public function prepareData()
+    {
+    }
+
+    public function prepareTables()
+    {
+        $this->tables = array('Ticket_1935_Article');
+        parent::prepareTables();
+    }
+
+    public function testDuplicatedParamsInSubQuery()
+    {
+        $this->connection->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, true);
+
+        try
+        {
+            $q = Doctrine_Query::create()->select('COUNT(a.id) as num_records')
+                ->from('Ticket_1935_Article a')
+                ->having('num_records > 1')
+                ;
+            //$results = $q->execute();
+            $this->assertEqual($q->getSqlQuery(), 'SELECT COUNT(`t`.`id`) AS `t__0` FROM `ticket_1935_article` `t` HAVING `t__0` > 1');
+        }
+        catch(Exception $e)
+        {
+            $this->fail($e->getMessage());
+        }
+
+        $this->connection->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, false);
+    }
+}
+
+class Ticket_1935_Article extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('ticket_1935_article');
+        $this->hasColumn('title', 'string', 255, array('type' => 'string', 'length' => '255'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1940TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1940TestCase.php
new file mode 100644
index 000000000..c5a9f1cba
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1940TestCase.php
@@ -0,0 +1,88 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1940_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1940_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1940_User';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_AUTO_ACCESSOR_OVERRIDE, true);
+
+        $user = new Ticket_1940_User();
+        $user->fromArray(array('username' => 'jwage', 'password' => 'changeme', 'email_address' => 'jonwage@gmail.com'));
+
+        $userArray = $user->toArray();
+        $this->assertEqual($userArray['username'], 'jwage-modified');
+        $this->assertEqual($userArray['password'], md5('changeme'));
+        $this->assertEqual($userArray['email_address'], 'jonwage@gmail.com-modified-modified');
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_AUTO_ACCESSOR_OVERRIDE, false);
+    }
+}
+
+class Ticket_1940_User extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->hasColumn('username', 'string', 255);
+		$this->hasColumn('password', 'string', 255);
+		$this->hasColumn('email_address', 'string', 255);
+
+		$this->hasMutator('password', 'customSetPassword');
+		$this->hasAccessor('username', 'customGetUsername');
+	}
+
+    public function getEmailAddress()
+    {
+        return $this->_get('email_address') . '-modified';
+    }
+
+    public function setEmailAddress($emailAddress)
+    {
+        $this->_set('email_address', $emailAddress . '-modified');
+    }
+
+	public function customGetUsername()
+	{
+		return $this->_get('username').'-modified';
+	}
+
+	public function customSetPassword($value)
+	{
+		return $this->_set('password', md5($value));
+	}
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1958TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1958TestCase.php
new file mode 100644
index 000000000..45a4d57ae
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1958TestCase.php
@@ -0,0 +1,62 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1958_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1958_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1958_User';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+
+        $user = new Ticket_1958_User();
+        $user->username = 'jwage';
+        $user->password = 'test';
+        $user->save();
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+}
+
+class Ticket_1958_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+        $this->hasColumn('foo', 'integer', 4, array('notnull' => true, 'default' => '0', 'unsigned' => 1));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1986TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1986TestCase.php
new file mode 100644
index 000000000..e92e3cf87
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1986TestCase.php
@@ -0,0 +1,111 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1986_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1986_TestCase extends Doctrine_UnitTestCase 
+{
+	public function prepareData()
+	{
+	}
+
+	public function prepareTables()
+	{
+		$this->tables = array('Testing_Ticket_1986_1','Testing_Ticket_1986_2','Testing_Ticket_1986Link');
+		parent::prepareTables();
+	}
+
+	public function testTicket()
+	{
+		// this works
+		$t1 = new Testing_Ticket_1986_1();
+		$t1->get('others');
+		$t1->save();
+		try {
+			$t1->get('others');
+		} catch(Doctrine_Exception $e) {
+			$this->fail("after save".$e->getMessage());
+		}
+		// this not: relation is not accessed before save and is gone afterwards
+		$t2 = new Testing_Ticket_1986_1();
+		$t2->save();
+		try {
+			$t2->get('others');
+		} catch(Doctrine_Exception $e) {
+			$this->fail($e->getMessage());
+		}
+	}
+	 
+}
+
+class Testing_Ticket_1986_1 extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->setTableName('testing_ticket_1986_1');
+		$this->hasColumn('name', 'string', 64, array());
+	}
+	public function setUp()
+	{
+		$this->hasMany('Testing_Ticket_1986_2 as others', array('refClass' => 'Testing_Ticket_1986Link', 'local' => 'id_1', 'foreign' => 'id_2'));
+	}
+}
+
+class Testing_Ticket_1986_2 extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->setTableName('testing_ticket_1986_2');
+		$this->hasColumn('value', 'string', 64, array());
+	}
+
+	public function setUp()
+	{
+		$this->hasMany('Testing_Ticket_1986_1', array('refClass' => 'Testing_Ticket_1986Link', 'local' => 'id_2', 'foreign' => 'id_1'));
+	}
+}
+
+class Testing_Ticket_1986Link extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->setTableName('testing_ticket_1986_link');
+		$this->hasColumn('id_1', 'integer', null, array());
+		$this->hasColumn('id_2', 'integer', null, array());
+	}
+	
+	public function setUp() {
+		// setup relations
+		$this->hasOne('Testing_Ticket_1986_1 as rel1', array('local' => 'id_1', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+		$this->hasOne('Testing_Ticket_1986_2 as rel2', array('local' => 'id_2', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+	}
+  
+}
+	
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1991TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1991TestCase.php
new file mode 100644
index 000000000..717a516db
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1991TestCase.php
@@ -0,0 +1,73 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1015_TestCase
+ *
+ * @package     Doctrine
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1991_TestCase extends Doctrine_UnitTestCase {
+
+    public function prepareTables() {
+        $this->tables = array();
+        $this->tables[] = 'NewTag';
+
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+        $tag = new NewTag();
+        $tag->name = 'name';
+        $tag->save();
+        
+        $tag = new NewTag();
+        $tag->name = 'foobar';
+        $tag->save();        
+    }
+
+
+    public function testHydratation()
+    {
+        $q = new Doctrine_Query();
+        $q->select('t.name')->from('NewTag t INDEXBY t.name');        
+        try {
+            $results = $q->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+
+}
+
+class NewTag extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('tag');
+        $this->hasColumn('name', 'string', 100, array('type' => 'string', 'length' => '100'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1992TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1992TestCase.php
new file mode 100644
index 000000000..7da049494
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/1992TestCase.php
@@ -0,0 +1,143 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1992_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_1992_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_1992_Person';
+        $this->tables[] = 'Ticket_1992_Profile';
+        $this->tables[] = 'Ticket_1992_PersonProfile';
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+      $this->person = new Ticket_1992_Person();
+      $this->person->nummer = '1';
+      $this->profile1 = new Ticket_1992_Profile();
+      $this->profile1->name = 'test 2';
+      $this->person->Profile[] = $this->profile1;
+      $this->profile2 = new Ticket_1992_Profile();
+      $this->profile2->name = 'test 2';
+      $this->person->Profile[] = $this->profile2;
+      $this->person->save();
+    }
+
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+
+        $person = Doctrine_Query::create()
+            ->from('Ticket_1992_Person p')
+            ->innerJoin('p.Profile pr')
+            ->fetchOne();
+        $this->assertEqual($person['nummer'], 1);
+        $this->assertEqual(count($person['Profile']), 2);
+
+        $this->profile1->delete();
+
+        $person = Doctrine_Query::create()
+            ->from('Ticket_1992_Person p')
+            ->innerJoin('p.Profile pr')
+            ->fetchOne();
+        $this->assertEqual($person['nummer'], 1);
+        $this->assertEqual(count($person['Profile']), 1);
+
+        $this->profile2->delete();
+
+        $person = Doctrine_Query::create()
+            ->from('Ticket_1992_Person p')
+            ->innerJoin('p.Profile pr')
+            ->fetchOne();
+        $this->assertEqual($person, false);
+
+        $person = Doctrine_Query::create()
+            ->from('Ticket_1992_Person p')
+            ->leftJoin('p.Profile pr')
+            ->fetchOne();
+        $this->assertEqual($person['nummer'], 1);
+        $this->assertEqual(count($person['Profile']), 0);
+
+        $this->person->delete();
+
+        $person = Doctrine_Query::create()
+            ->from('Ticket_1992_Person p')
+            ->fetchOne();
+        $this->assertEqual($person, false);
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+    }
+}
+
+class Ticket_1992_Person extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('nummer', 'string', 16, array('type' => 'string', 'length' => 16, 'primary' => true));        
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_1992_Profile as Profile', array('local' => 'person_nummer', 'foreign' => 'profile_id', 'refClass' => 'Ticket_1992_PersonProfile'));
+        $this->actAs('SoftDelete');
+    }
+}
+
+class Ticket_1992_Profile extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', 4, array('type' => 'integer', 'length' => 4, 'unsigned' => 1, 'primary' => true, 'autoincrement' => true));        
+        $this->hasColumn('name', 'string');
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_1992_Person as Person', array('local' => 'profile_id', 'foreign' => 'person_nummer', 'refClass' => 'Ticket_1992_PersonProfile'));
+        $this->actAs('SoftDelete');
+    }
+}
+
+class Ticket_1992_PersonProfile extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('person_nummer', 'string', 16, array('type' => 'string', 'length' => 16, 'notnull' => true));
+        $this->hasColumn('profile_id', 'integer', 4, array('type' => 'integer', 'length' => 4, 'unsigned' => 1, 'notnull' => true));        
+    }
+
+    public function setUp()
+    {
+        $this->actAs('SoftDelete');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2007TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2007TestCase.php
new file mode 100644
index 000000000..27a458dff
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2007TestCase.php
@@ -0,0 +1,86 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_2007_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_2007_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_2007_Faq';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $table = Doctrine_Core::getTable('Ticket_2007_Faq');
+        $table->batchUpdateIndex();
+    }
+}
+
+class Ticket_2007_Faq extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('faq');
+        $this->hasColumn('id_faq', 'integer', 4, array(
+             'primary' => true,
+             'type' => 'integer',
+             'length' => '4',
+             ));
+        $this->hasColumn('n_clicks', 'integer', 4, array(
+             'unsigned' => '1',
+             'notnull' => true,
+             'default' => 0,
+             'type' => 'integer',
+             'length' => '4',
+             ));
+        $this->hasColumn('title', 'string', 255, array(
+             'type' => 'string',
+             'length' => '255',
+             ));
+        $this->hasColumn('description', 'string', null, array(
+             'type' => 'string',
+             ));
+    }
+
+    public function setUp()
+    {
+        $searchable0 = new Doctrine_Template_Searchable(array(
+             'fields' => 
+             array(
+              0 => 'title',
+              1 => 'description',
+             ),
+             'batchUpdates' => true,
+             ));
+        $this->actAs($searchable0);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2015TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2015TestCase.php
new file mode 100644
index 000000000..0597827e0
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2015TestCase.php
@@ -0,0 +1,103 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_2015_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_2015_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData()
+    {
+        $deer = new mkAnimal();
+        $deer->title = 'Cervus Elaphus';
+        $deer->save();
+        
+        $beech = new mkPlant();
+        $beech->title = 'Fagus sylvatica';
+        $beech->save();
+    }
+    
+    public function testColumnAggregation()
+    {
+        $animal = Doctrine_Core::getTable('mkNode')->findOneById(1);
+        $this->assertTrue($animal instanceof mkAnimal);
+        
+        $plant = Doctrine_Core::getTable('mkOrganism')->findOneById(2);
+        $this->assertTrue($plant instanceof mkPlant);
+    }
+    
+    public function prepareTables()
+    {
+        $this->tables = array(
+            'mkNode',
+            'mkOrganism',
+            'mkAnimal'
+        );
+        
+        parent::prepareTables();
+    }
+}
+
+class mkNode extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('mk_node');
+        $this->hasColumn('id', 'integer', 4, array('type' => 'integer', 'autoincrement' => true, 'primary' => true, 'length' => 4));
+        $this->hasColumn('title', 'string', 255);
+        $this->hasColumn('type', 'string', 50);
+        $this->hasColumn('sub_type', 'string', 50);
+        
+        $this->setSubclasses(array(
+            'mkOrganism' => array(
+                'type' => 'organism'
+            ),
+            'mkAnimal' => array(
+                'type'     => 'organism',
+                'sub_type' => 'animal'
+            ),
+            'mkPlant' => array(
+                'type'     => 'organism',
+                'sub_type' => 'plant'
+            )
+        ));
+    }
+}
+
+class mkOrganism extends mkNode
+{
+}
+
+class mkAnimal extends mkOrganism
+{
+}
+
+class mkPlant extends mkOrganism
+{
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2032TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2032TestCase.php
new file mode 100644
index 000000000..8d482a58c
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2032TestCase.php
@@ -0,0 +1,51 @@
+<?php 
+/* 
+ *  $Id$ 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ * 
+ * This software consists of voluntary contributions made by many individuals 
+ * and is licensed under the LGPL. For more information, see 
+ * <http://www.doctrine-project.org>. 
+ */ 
+ 
+/** 
+ * Doctrine_Ticket_2032_TestCase 
+ * 
+ * @package     Doctrine 
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL 
+ * @category    Object Relational Mapping 
+ * @link        www.doctrine-project.org 
+ * @since       1.1 
+ * @version     $Revision$ 
+ */ 
+class Doctrine_Ticket_2032_TestCase extends Doctrine_UnitTestCase 
+{ 
+    /** 
+     * Tests non-spaced orderby parameters 
+     */  
+    public function testNonSpacedOrderByIsParsedCorrectly() 
+    { 
+        $q = Doctrine_Query::create() 
+                ->select('u.*') 
+                ->from('User u') 
+                ->orderby('u.name,u.id,u.password'); 
+ 
+        try { 
+            $u = $q->execute(); 
+            $this->pass(); 
+        } catch (Exception $e) { 
+            $this->fail($e->getMessage()); 
+        } 
+    } 
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2105TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2105TestCase.php
new file mode 100644
index 000000000..54ed879f6
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2105TestCase.php
@@ -0,0 +1,92 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_2105_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_2105_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_2105_Article';
+        parent::prepareTables();
+    }
+
+    public function testQuery()
+    {
+        try {
+            $q = Doctrine_Query::create()
+                ->select('a.id, t.lang')
+                ->from('Ticket_2105_Article a')
+                ->innerJoin('a.Translation t WITH t.name != ?', 'test')
+                ;
+            $q->execute();
+            //echo $q->getSqlQuery().PHP_EOL;
+            
+            $this->assertEqual(
+                $q->getSqlQuery(), 
+                'SELECT t.id AS t__id, t2.id AS t2__id, t2.lang AS t2__lang '.
+                'FROM ticket_2105__article t '.
+                'INNER JOIN ticket_2105__article_translation t2 '.
+                'ON t.id = t2.id AND (t2.name != ?)'
+            );
+            
+            // we need to modify the query here - it can be anything, I've chosen addSelect
+            $q->addSelect('t.name');
+            $q->execute();
+            //echo $q->getSqlQuery().PHP_EOL;
+            
+            $this->assertEqual(
+                $q->getSqlQuery(), 
+                'SELECT t.id AS t__id, t2.id AS t2__id, t2.lang AS t2__lang, t2.name AS t2__name '.
+                'FROM ticket_2105__article t '.
+                'INNER JOIN ticket_2105__article_translation t2 '.
+                'ON t.id = t2.id AND (t2.name != ?)'
+            );
+            
+            //$this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+}
+
+class Ticket_2105_Article extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $i18n = new Doctrine_Template_I18n(array('fields' => array(0 => 'name')));
+        $this->actAs($i18n);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2123TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2123TestCase.php
new file mode 100644
index 000000000..32f22aeeb
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2123TestCase.php
@@ -0,0 +1,61 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_2123_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_2123_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testCheckingRelatedExistsOnCollectionThrowsException()
+    {
+        try {
+            $user = Doctrine_Core::getTable('User')
+                ->createQuery('u')
+                ->fetchOne();
+            $user->relatedExists('Phonenumber');
+        } catch (Exception $e) {
+            $this->pass();
+        }
+    }
+
+    public function testRelatedExistsClearsReference()
+    {
+        $user = new User();
+        $this->assertEqual($user->relatedExists('Email'), false);
+        $this->assertEqual($user->hasReference('Email'), false);
+    }
+
+    public function testClearRelatedReference()
+    {
+        $user = new User();
+        $email = $user->Email;
+        $user->clearRelated('Email');
+        $this->assertEqual($user->hasReference('Email'), false);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2158TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2158TestCase.php
new file mode 100644
index 000000000..7531719c9
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2158TestCase.php
@@ -0,0 +1,56 @@
+<?php
+
+class Doctrine_Ticket_2158_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables[] = "T2158_Model1";
+        $this->tables[] = "T2158_Model2";
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+      $this->myModel = new T2158_Model1();
+      $this->myModel->save();
+    }
+
+    public function testInit()
+    {
+
+    }
+
+    // This produces a failing test
+    public function testTest()
+    {
+      $q = Doctrine_Core::getTable('T2158_Model2')->createQuery('m2')->leftJoin('m2.Relation m1 ON m2.id    = m1.m2_id');
+      $this->assertEqual($q->getSqlQuery(), 'SELECT t.id AS t__id, t2.id AS t2__id, t2.title AS t2__title, t2.m2_id AS t2__m2_id FROM t2158__model2 t LEFT JOIN t2158__model1 t2 ON (t.id = t2.m2_id)');
+      //$rs = $q->execute();
+    }
+}
+
+class T2158_Model1 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('title', 'string');
+        $this->hasColumn('m2_id', 'integer');
+    }
+}
+
+class T2158_Model2 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+    }
+    
+
+    public function setUp()
+    {
+        $this->hasMany('T2158_Model1 as Relation', array(
+                'local' => 'id',
+                'foreign' => 'm2_id'
+            )
+        );
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2159TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2159TestCase.php
new file mode 100644
index 000000000..0f417068a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2159TestCase.php
@@ -0,0 +1,58 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_2159_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_2159_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $q = Doctrine_Core::getTable('User')
+          ->createQuery('u');
+
+        $sql = 'SELECT COUNT(*) AS num_results FROM entity e WHERE (e.type = 0)';
+        $this->assertEqual($q->getCountSqlQuery(), $sql);
+        $results1 = $q->execute();
+        $count1 = $q->count();
+        $this->assertEqual($q->getCountSqlQuery(), $sql);
+        $results2 = $q->execute();
+        $count2 = $q->count();
+        $this->assertEqual($results1, $results2);
+        $this->assertEqual($count1, $count2);
+
+        $q->leftJoin('u.Phonenumber p');
+        $sql = $q->getSqlQuery();
+        $this->assertEqual($sql, 'SELECT e.id AS e__id, e.name AS e__name, e.loginname AS e__loginname, e.password AS e__password, e.type AS e__type, e.created AS e__created, e.updated AS e__updated, e.email_id AS e__email_id, p.id AS p__id, p.phonenumber AS p__phonenumber, p.entity_id AS p__entity_id FROM entity e LEFT JOIN phonenumber p ON e.id = p.entity_id WHERE (e.type = 0)');
+        $results3 = $q->execute();
+        $this->assertEqual($results2, $results3);
+        $count3 = $q->count();
+        $this->assertEqual($count2, $count3);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2160TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2160TestCase.php
new file mode 100644
index 000000000..22d71f3d5
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2160TestCase.php
@@ -0,0 +1,45 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_2160_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_2160_TestCase extends Doctrine_UnitTestCase
+{
+    public function testGermanCharactersAreConvertedCorrectly()
+    {
+        $this->assertEqual(Doctrine_Inflector::urlize('Ästhetik'), 'aesthetik');
+        $this->assertEqual(Doctrine_Inflector::urlize('ästhetisch'), 'aesthetisch');
+        $this->assertEqual(Doctrine_Inflector::urlize('Übung'), 'uebung');
+        $this->assertEqual(Doctrine_Inflector::urlize('über'), 'ueber');
+        $this->assertEqual(Doctrine_Inflector::urlize('Öl'), 'oel');
+        $this->assertEqual(Doctrine_Inflector::urlize('ölig'), 'oelig');
+        $this->assertEqual(Doctrine_Inflector::urlize('Fuß'), 'fuss');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2184TestCase.php
similarity index 76%
rename from lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine.php
rename to lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2184TestCase.php
index de8fb93cd..41cc4ed7d 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/Doctrine.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2184TestCase.php
@@ -1,6 +1,6 @@
 <?php
 /*
- *  $Id: Doctrine.php 7490 2010-03-29 19:53:27Z jwage $
+ *  $Id$
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
@@ -19,20 +19,21 @@
  * <http://www.doctrine-project.org>.
  */
 
-require_once 'Doctrine/Core.php';
-
 /**
- * This class only exists for backwards compatability. All code was moved to 
- * Doctrine_Core and this class extends Doctrine_Core
+ * Doctrine_Ticket_2184_TestCase
  *
  * @package     Doctrine
  * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
- * @author      Lukas Smith <smith@pooteeweet.org> (PEAR MDB2 library)
  * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
  * @link        www.doctrine-project.org
  * @since       1.0
- * @version     $Revision: 7490 $
+ * @version     $Revision$
  */
-class Doctrine extends Doctrine_Core
+class Doctrine_Ticket_2184_TestCase extends Doctrine_UnitTestCase 
 {
+    public function testTest()
+    {
+        $this->assertEqual(Doctrine_Inflector::classify('test_do$llar_sign'), 'TestDollarSign');
+    }
 }
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2190TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2190TestCase.php
new file mode 100644
index 000000000..e5a119493
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2190TestCase.php
@@ -0,0 +1,84 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_2190_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_2190_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_2190_Article';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+
+        $article = new Ticket_2190_Article();
+        $article->name = 'test';
+        $article->body = str_repeat('a', 300);
+        $article->save();
+
+        $article = new Ticket_2190_Article();
+        $article->name = 'test';
+        $article->body = str_repeat('a', 256);
+        $article->save();
+
+        $article = new Ticket_2190_Article();
+        $article->name = 'test';
+        $article->body = str_repeat('a', 257);
+        $article->save();
+
+        for ($i = 1; $i <= 5; $i++) {
+            $article = new Ticket_2190_Article();
+            $article->name = 'test';
+            $article->body = str_repeat('a', 300);
+            $article->save();
+        }
+
+        $this->assertEqual($article->slug, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-7');
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+}
+
+class Ticket_2190_Article extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string');
+        $this->hasColumn('body', 'clob');
+    }
+
+    public function setUp()
+    {
+        $this->actAs('Sluggable', array('indexName' => 'ticket_2190_slug_idx', 'fields' => array('body')));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2204TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2204TestCase.php
new file mode 100644
index 000000000..35f78420c
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2204TestCase.php
@@ -0,0 +1,62 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_2204_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_2204_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_2204_Model';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+        $model = new Ticket_2204_Model();
+        $model->test_decimal = '-123.456789';
+        try {
+            $model->save();
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+}
+
+class Ticket_2204_Model extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('test_decimal', 'decimal', 9, array('scale' => 6));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2229TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2229TestCase.php
new file mode 100644
index 000000000..0912d0852
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2229TestCase.php
@@ -0,0 +1,76 @@
+<?php
+/*
+ *  $Id: 2229TestCase.php 7490 2010-03-29 19:53:27Z jwage $
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_2xxx_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_2229_TestCase extends Doctrine_UnitTestCase 
+{
+  public function prepareTables()
+  {
+    $this->tables[] = 'Ticket_2229_SlugBug';
+    parent::prepareTables();
+  }
+  
+  public function testTicket()
+  {
+    $d = new Ticket_2229_SlugBug();
+    $d->name = 'String with UpperLowerCase';
+    $d->save();
+    $this->assertEqual($d->slug, 'string-with-upperlowercase');
+    
+    $d = new Ticket_2229_SlugBug();
+    $d->name = 'Custom name OPACs';
+    $d->save();
+    $this->assertEqual($d->slug, 'custom-name-opacs');
+    
+    $d = new Ticket_2229_SlugBug();
+    $d->name = 'Présentation unifiée OPACs';
+    $d->save();
+    $this->assertEqual($d->slug, 'presentation-unifiee-opacs');
+  }
+}
+
+
+class Ticket_2229_SlugBug extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('SlugBug');
+        $this->hasColumn('id', 'integer', 11, array('primary' => true, 'notnull' => true, 'autoincrement' => true));
+        $this->hasColumn('name', 'string');
+    }
+    
+    public function setUp()
+    {
+      parent::setUp();
+      $this->actAs('Sluggable', array('unique' => true,
+                                      'fields' => array('name')));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2251TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2251TestCase.php
new file mode 100644
index 000000000..21b6cae6d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2251TestCase.php
@@ -0,0 +1,87 @@
+<?php
+/*
+ *    $Id: 2229TestCase.php 5871 2009-06-10 08:46:00Z Garfield-fr $
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_2251_TestCase
+ *
+ * @package         Doctrine
+ * @author          Daniel Cousineau <dcousineau@gmail.com>
+ * @license         http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category        Object Relational Mapping
+ * @link            www.doctrine-project.org
+ * @since           1.0
+ * @version         $Revision$
+ */
+class Doctrine_Ticket_2251_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_2251_TestStringLength';
+        parent::prepareTables();
+    }
+
+    public function testEmptyStringLengthSQLExport()
+    {
+        $drivers = array(
+            'mysql',
+            'sqlite',
+            'pgsql',
+            'oracle',
+            'mssql'
+        );
+        
+        $expected = array(
+            'mysql'     => 'CREATE TABLE test_string_length (id BIGINT AUTO_INCREMENT, test_string TEXT, PRIMARY KEY(id)) ENGINE = INNODB',
+            'sqlite'    => 'CREATE TABLE test_string_length (id INTEGER PRIMARY KEY AUTOINCREMENT, test_string TEXT)',
+            'pgsql'     => 'CREATE TABLE test_string_length (id BIGSERIAL, test_string TEXT, PRIMARY KEY(id))',
+            'oracle'    => 'CREATE TABLE test_string_length (id NUMBER(20), test_string CLOB, PRIMARY KEY(id))',
+            'mssql'     => 'CREATE TABLE test_string_length (id INT NOT NULL identity, test_string TEXT NULL, PRIMARY KEY([id]))'
+        );
+
+        foreach ($drivers as $driver)
+        {
+            $dbh = new Doctrine_Adapter_Mock($driver);
+
+            $conn = Doctrine_Manager::getInstance()->connection($dbh, $driver);
+
+            list($sql) = $conn->export->exportSortedClassesSql(array('Ticket_2251_TestStringLength'), false);
+
+            $this->assertEqual($sql, $expected[$driver]);
+
+            unset($conn);
+            unset($dbh);
+        }
+    }
+}
+
+class Ticket_2251_TestStringLength extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+            $this->setTableName('test_string_length');
+            $this->hasColumn('test_string', 'string');
+    }
+
+    public function setUp()
+    {
+        parent::setUp();
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2292TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2292TestCase.php
new file mode 100644
index 000000000..a5db98d34
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2292TestCase.php
@@ -0,0 +1,88 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_2292_TestCase
+ *
+ * @package     Doctrine
+ * @author      Miloslav Kmeť <miloslav.kmet@gmail.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_2292_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables = array();
+        $this->tables[] = 'mkArticle';
+        $this->tables[] = 'mkContent';
+        parent::prepareTables();
+    }
+    
+    public function prepareData()
+    {
+    }
+    
+    public function testOwningSideRelationToArray()
+    {
+        $article = new mkArticle();
+        
+        $this->assertEqual($article->content->toArray(false), array('id'=>null, 'body'=>null));
+    }
+}
+
+class mkArticle extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('mk_article');
+        $this->hasColumn('id', 'integer', 4, array('type' => 'integer', 'autoincrement' => true, 'primary' => true, 'length' => 4));
+        $this->hasColumn('title', 'string', 200);
+    }
+    
+    public function setup()
+    {
+        $this->hasOne('mkContent as content', array('local'=>'id', 
+                                                    'foreign'=>'id',
+                                                    'owningSide' => false));
+    }
+}
+
+class mkContent extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('mk_content');
+        $this->hasColumn('id', 'integer', 4, array('type' => 'integer', 'autoincrement' => false, 'primary' => true, 'length' => 4));
+        $this->hasColumn('body', 'string');
+    }
+    
+    public function setup()
+    {
+        $this->hasOne('mkArticle as article', array('local'=>'id', 
+                                                    'foreign'=>'id',
+                                                    'owningSide' => true));
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2295TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2295TestCase.php
new file mode 100644
index 000000000..8dd0a968f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2295TestCase.php
@@ -0,0 +1,56 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_2295_TestCase
+ *
+ * @package     Doctrine
+ * @author      Miloslav Kmeť <miloslav.kmet@gmail.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_2295_TestCase extends Doctrine_UnitTestCase
+{
+    public function testMappedValueFromArray()
+    {
+        $test = new Doctrine_Ticket_2295_Record();
+        $test->fromArray(array('test' => 'mapped value'));
+        $this->assertEqual($test->test, 'mapped value');
+    }
+
+    public function testMappedValueSynchronizeWithArray()
+    {
+        $test = new Doctrine_Ticket_2295_Record();
+        $test->synchronizeWithArray(array('test' => 'mapped value'));
+        $this->assertEqual($test->test, 'mapped value');
+    }
+}
+
+class Doctrine_Ticket_2295_Record extends Doctrine_Record
+{
+    public function construct()
+    {
+        $this->mapValue('test');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2298TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2298TestCase.php
new file mode 100644
index 000000000..7c19d9898
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2298TestCase.php
@@ -0,0 +1,64 @@
+<?php
+
+class Doctrine_Ticket_2298_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTokenizerIgnoresQuotes()
+    {
+        $q = Doctrine_Query::create()
+            ->from('Address a')
+            ->where("a.address = '(a) and c'");
+        $this->assertEqual($q->getSqlQuery(), "SELECT a.id AS a__id, a.address AS a__address FROM address a WHERE (a.address = '(a) and c')");
+
+        $q = Doctrine_Query::create()
+            ->from('Address a')
+            ->where("a.address = ' or what'");
+        $this->assertEqual($q->getSqlQuery(), "SELECT a.id AS a__id, a.address AS a__address FROM address a WHERE (a.address = ' or what')");
+
+        $q = Doctrine_Query::create()
+            ->from('Address a')
+            ->where("a.address = ' or      6spaces'");
+       	$this->assertEqual($q->getSqlQuery(), "SELECT a.id AS a__id, a.address AS a__address FROM address a WHERE (a.address = ' or      6spaces')");
+    }
+
+
+	public function testEscapedQuotes()
+    {
+        $tokenizer = new Doctrine_Query_Tokenizer();
+        $delimiters = array(' ', '+', '-', '*', '/', '<', '>', '=', '>=', '<=', '&', '|');
+
+        $res = $tokenizer->bracketExplode("'a string with AND in the middle'", ' AND ');
+        $this->assertEqual($res, array("'a string with AND in the middle'"));
+
+        $res = $tokenizer->bracketExplode("'o\' AND string'", ' AND ');
+        $this->assertEqual($res, array("'o\' AND string'"));
+
+        $res = $tokenizer->sqlExplode("('John O\'Connor (West) as name'+' ') + 'b'", $delimiters);
+        $this->assertEqual($res, array("('John O\'Connor (West) as name'+' ')", '', '', "'b'"));
+
+        $res = $tokenizer->sqlExplode("'(Word) and' term", $delimiters);
+        $this->assertEqual($res, array("'(Word) and'", 'term'));
+    }
+
+
+	public function testAdditionalTokenizerFeatures()
+    {
+    	// These tests all pass with the old tokenizer, they were developed wile
+    	// working on the patch
+    	$tokenizer = new Doctrine_Query_Tokenizer();
+    	$delimiters = array(' ', '+', '-', '*', '/', '<', '>', '=', '>=', '<=', '&', '|');
+
+    	$res = $tokenizer->bracketExplode("(age < 20 AND age > 18) AND email LIKE 'John@example.com'", ' AND ', '(', ')');
+        $this->assertEqual($res, array("(age < 20 AND age > 18)","email LIKE 'John@example.com'"));
+
+    	$res = $tokenizer->sqlExplode("sentence OR 'term'", ' OR ');
+        $this->assertEqual($res, array("sentence", "'term'"));
+
+        $res = $tokenizer->clauseExplode("'a + b'+c", $delimiters);
+        $this->assertEqual($res, array(array("'a + b'",'+'), array('c', '')));
+
+        $res = $tokenizer->quoteExplode('"a"."b"', ' ');
+        $this->assertEqual($res, array('"a"."b"'));
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2334TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2334TestCase.php
new file mode 100644
index 000000000..ab458797b
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2334TestCase.php
@@ -0,0 +1,67 @@
+<?php
+/*
+ *    $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Ticket_2334_TestMSSQLUnsignedInt
+ *
+ * @package         Doctrine
+ * @author          Daniel Cousineau <dcousineau@gmail.com>
+ * @license         http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category        Object Relational Mapping
+ * @link            www.doctrine-project.org
+ * @since           1.0
+ * @version         $Revision$
+ */
+class Doctrine_Ticket_2334_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_2334_TestMSSQLUnsignedInt';
+        parent::prepareTables();
+    }
+    public function testMSSQLUnsignedInt()
+    {
+        $dbh = new Doctrine_Adapter_Mock('mssql');
+
+        $conn = Doctrine_Manager::getInstance()->connection($dbh, 'mssql');
+
+        list($sql) = $conn->export->exportSortedClassesSql(array('Ticket_2334_TestMSSQLUnsignedInt'), false);
+
+        $this->assertEqual($sql, 'CREATE TABLE test_string_length (id INT NOT NULL identity, test_int BIGINT NULL, PRIMARY KEY([id]))');
+
+        unset($conn);
+        unset($dbh);
+    }
+}
+
+class Ticket_2334_TestMSSQLUnsignedInt extends Doctrine_Record
+{
+        public function setTableDefinition()
+        {
+                $this->setTableName('test_string_length');
+                $this->hasColumn('test_int', 'int', null, array('unsigned' => true));
+        }
+
+        public function setUp()
+        {
+            parent::setUp();
+        }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2355TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2355TestCase.php
new file mode 100644
index 000000000..47c7616b1
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2355TestCase.php
@@ -0,0 +1,297 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_2355_TestCase
+ *
+ * @package     Doctrine
+ * @author      Fabien Pennequin <fabien.pennequin@gmail.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_2355_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'News';
+        $this->tables[] = 'Episode';
+        $this->tables[] = 'Writer';
+        $this->tables[] = 'WriterEpisode';
+        $this->tables[] = 'Director';
+        $this->tables[] = 'DirectorEpisode';
+        parent::prepareTables();
+    }
+
+    public function testImport()
+    {
+        $yml = <<<END
+Director:
+  david_nutter:
+    name: David Nutter
+
+
+Writer:
+  alfred_gough:
+    name: Alfred Gough
+  miles_millar:
+    name: Miles Millar
+
+
+News:
+  News_1:
+    title: Date de retour de Smallville aux Etats-Unis
+
+  News_2:
+    title: Audiences de l'épisode 8.22 Doomsday aux Etats-Unis
+
+
+Episode:
+  Episode_101:
+    season: 1
+    number: 1
+    title_us: Pilot
+    title_fr: Bienvenue sur Terre
+    Directors: [david_nutter]
+    Writers: [alfred_gough, miles_millar]
+END;
+        try {
+            file_put_contents('test.yml', $yml);
+            Doctrine_Core::loadData('test.yml', true);
+
+            $this->conn->clear();
+
+            $query = new Doctrine_Query();
+            $query->from('Episode e, e.Directors, e.Writers');
+
+            $e = $query->execute();
+
+            $this->assertEqual($e->count(), 1);
+            $this->assertEqual($e[0]->season, 1);
+            $this->assertEqual($e[0]->number, 1);
+            $this->assertEqual($e[0]->title_us, 'Pilot');
+            $this->assertEqual($e[0]->title_fr, 'Bienvenue sur Terre');
+            $this->assertEqual($e[0]->Directors->count(), 1);
+            $this->assertEqual($e[0]->Directors[0]->name, 'David Nutter');
+            $this->assertEqual($e[0]->Writers->count(), 2);
+            $this->assertEqual($e[0]->Writers[0]->name, 'Alfred Gough');
+            $this->assertEqual($e[0]->Writers[1]->name, 'Miles Millar');
+
+            $query = new Doctrine_Query();
+            $query->from('News n');
+
+            $n = $query->execute();
+
+            $this->assertEqual($n->count(), 2);
+            $this->assertEqual($n[0]->title, 'Date de retour de Smallville aux Etats-Unis');
+            $this->assertEqual($n[1]->title, 'Audiences de l\'épisode 8.22 Doomsday aux Etats-Unis');
+
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail();
+        }
+
+        unlink('test.yml');
+    }
+}
+
+class News extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('title', 'string', 255, array(
+             'type' => 'string',
+             'notnull' => true,
+             'notblank' => true,
+             'length' => '255',
+             ));
+    }
+}
+
+class Episode extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('season', 'integer', 1, array(
+             'type' => 'integer',
+             'length' => 1,
+             'notnull' => true,
+             'notblank' => true,
+             ));
+        $this->hasColumn('number', 'integer', 1, array(
+             'type' => 'integer',
+             'length' => 1,
+             'notnull' => true,
+             'notblank' => true,
+             ));
+        $this->hasColumn('title_us', 'string', 100, array(
+             'type' => 'string',
+             'notnull' => true,
+             'notblank' => true,
+             'length' => '100',
+             ));
+        $this->hasColumn('title_fr', 'string', 100, array(
+             'type' => 'string',
+             'length' => '100',
+             ));
+
+
+        $this->index('episode', array(
+             'fields' => 
+             array(
+              0 => 'season',
+              1 => 'number',
+             ),
+             'type' => 'unique',
+             ));
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Writer as Writers', array(
+             'refClass' => 'WriterEpisode',
+             'local' => 'episode_id',
+             'foreign' => 'writer_id'));
+
+        $this->hasMany('Director as Directors', array(
+             'refClass' => 'DirectorEpisode',
+             'local' => 'episode_id',
+             'foreign' => 'director_id'));
+
+        $this->hasMany('WriterEpisode', array(
+             'local' => 'id',
+             'foreign' => 'episode_id'));
+
+        $this->hasMany('DirectorEpisode', array(
+             'local' => 'id',
+             'foreign' => 'episode_id'));
+    }
+}
+
+class Writer extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 150, array(
+             'type' => 'string',
+             'notnull' => true,
+             'notblank' => true,
+             'unique' => true,
+             'length' => '150',
+             ));
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Episode', array(
+             'refClass' => 'WriterEpisode',
+             'local' => 'writer_id',
+             'foreign' => 'episode_id'));
+
+        $this->hasMany('WriterEpisode', array(
+             'local' => 'id',
+             'foreign' => 'writer_id'));
+    }
+}
+
+class WriterEpisode extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('episode_id', 'integer', null, array(
+             'type' => 'integer',
+             'primary' => true,
+             ));
+        $this->hasColumn('writer_id', 'integer', null, array(
+             'type' => 'integer',
+             'primary' => true,
+             ));
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Writer', array(
+             'local' => 'writer_id',
+             'foreign' => 'id',
+             'onDelete' => 'CASCADE'));
+
+        $this->hasOne('Episode', array(
+             'local' => 'episode_id',
+             'foreign' => 'id',
+             'onDelete' => 'CASCADE'));
+    }
+}
+
+class Director extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 150, array(
+             'type' => 'string',
+             'notnull' => true,
+             'notblank' => true,
+             'unique' => true,
+             'length' => '150',
+             ));
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Episode', array(
+             'refClass' => 'DirectorEpisode',
+             'local' => 'director_id',
+             'foreign' => 'episode_id'));
+
+        $this->hasMany('DirectorEpisode', array(
+             'local' => 'id',
+             'foreign' => 'director_id'));
+    }
+}
+
+class DirectorEpisode extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('episode_id', 'integer', null, array(
+             'type' => 'integer',
+             'primary' => true,
+             ));
+        $this->hasColumn('director_id', 'integer', null, array(
+             'type' => 'integer',
+             'primary' => true,
+             ));
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Director', array(
+             'local' => 'director_id',
+             'foreign' => 'id',
+             'onDelete' => 'CASCADE'));
+
+        $this->hasOne('Episode', array(
+             'local' => 'episode_id',
+             'foreign' => 'id',
+             'onDelete' => 'CASCADE'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2367TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2367TestCase.php
new file mode 100644
index 000000000..da14a6503
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2367TestCase.php
@@ -0,0 +1,77 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_2367_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_2367_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_2367_Article';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $article = new Ticket_2367_Article();
+        $article->fromArray(array(
+          'Translation' => array(
+              'en' => array(
+                'content' => 'article content',
+              ),
+              'fr' => array(
+                'content' => 'contenu de l\'article'))));
+        $article->save();
+        $article->delete();
+        $check = (bool) Doctrine_Core::getTable('Ticket_2367_ArticleTranslation')->count();
+        $this->assertFalse($check);
+    }
+}
+
+class Ticket_2367_Article extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', 2, array('type' => 'integer', 'primary' => true,
+          'autoincrement' => true, 'unsigned' => true, 'length' => '2'));
+        $this->hasColumn('content', 'string', 100, array('type' => 'string', 'length' => '100'));
+
+        $this->option('type', 'MyISAM');
+    }
+
+    public function setUp()
+    {
+      $i18n0 = new Doctrine_Template_I18n(array(
+        'appLevelDelete' => true,
+        'fields' => array(
+          0 => 'content')));
+      $this->actAs($i18n0);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2375/models1/Ticket_2375_Model1.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2375/models1/Ticket_2375_Model1.php
new file mode 100755
index 000000000..179ab5620
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2375/models1/Ticket_2375_Model1.php
@@ -0,0 +1,8 @@
+<?php
+class Ticket_2375_Model1 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2375/models1/Ticket_2375_Model2.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2375/models1/Ticket_2375_Model2.php
new file mode 100755
index 000000000..43588e5f1
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2375/models1/Ticket_2375_Model2.php
@@ -0,0 +1,9 @@
+<?php
+
+class Ticket_2375_Model2 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2375/models2/Ticket_2375_Model3.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2375/models2/Ticket_2375_Model3.php
new file mode 100755
index 000000000..98b70534f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2375/models2/Ticket_2375_Model3.php
@@ -0,0 +1,8 @@
+<?php
+class Ticket_2375_Model3 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2375/models2/Ticket_2375_Model4.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2375/models2/Ticket_2375_Model4.php
new file mode 100755
index 000000000..ff46e5364
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2375/models2/Ticket_2375_Model4.php
@@ -0,0 +1,9 @@
+<?php
+
+class Ticket_2375_Model4 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2375/models2/Ticket_2375_Model5.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2375/models2/Ticket_2375_Model5.php
new file mode 100755
index 000000000..a5b98514d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2375/models2/Ticket_2375_Model5.php
@@ -0,0 +1,17 @@
+<?php
+
+class Ticket_2375_Model5 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+}
+
+class Ticket_2375_Model6 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2375TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2375TestCase.php
new file mode 100644
index 000000000..8d10be404
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2375TestCase.php
@@ -0,0 +1,99 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_2375_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_2375_TestCase extends Doctrine_UnitTestCase
+{
+    public function testTest()
+    {
+        $models1Dir = dirname(__FILE__) . '/2375/models1';
+        $models2Dir = dirname(__FILE__) . '/2375/models2';
+
+        // try loading a couple initial models
+
+        $models1 = Doctrine_Core::loadModels($models1Dir);
+        //$models2 = Doctrine_Core::loadModels($models2Dir);
+
+        // make sure two models were loaded
+        $this->assertEqual(2, count($models1));
+
+        // make sure the right models were loaded
+        $this->assertTrue(key_exists('Ticket_2375_Model1', $models1));
+        $this->assertTrue(key_exists('Ticket_2375_Model2', $models1));
+
+        // get a list of all models that have been loaded
+        $loadedModels = Doctrine_Core::getLoadedModelFiles();
+
+        // make sure the paths are correct
+        $this->assertEqual($loadedModels['Ticket_2375_Model1'], $models1Dir . DIRECTORY_SEPARATOR . 'Ticket_2375_Model1.php');
+        $this->assertEqual($loadedModels['Ticket_2375_Model2'], $models1Dir . DIRECTORY_SEPARATOR . 'Ticket_2375_Model2.php');
+
+        // try loading a few more models
+
+        $models2 = Doctrine_Core::loadModels($models2Dir);
+
+        // make sure the right models were loaded
+        $this->assertTrue(key_exists('Ticket_2375_Model3', $models2));
+        $this->assertTrue(key_exists('Ticket_2375_Model4', $models2));
+        $this->assertTrue(key_exists('Ticket_2375_Model5', $models2));
+        $this->assertTrue(key_exists('Ticket_2375_Model6', $models2));
+
+        // get a list of all models that have been loaded
+        $loadedModels = Doctrine_Core::getLoadedModelFiles();
+
+        // make sure the paths are correct
+        $this->assertEqual($loadedModels['Ticket_2375_Model1'], $models1Dir . DIRECTORY_SEPARATOR . 'Ticket_2375_Model1.php');
+        $this->assertEqual($loadedModels['Ticket_2375_Model2'], $models1Dir . DIRECTORY_SEPARATOR . 'Ticket_2375_Model2.php');
+        $this->assertEqual($loadedModels['Ticket_2375_Model3'], $models2Dir . DIRECTORY_SEPARATOR . 'Ticket_2375_Model3.php');
+        $this->assertEqual($loadedModels['Ticket_2375_Model4'], $models2Dir . DIRECTORY_SEPARATOR . 'Ticket_2375_Model4.php');
+        $this->assertEqual($loadedModels['Ticket_2375_Model5'], $models2Dir . DIRECTORY_SEPARATOR . 'Ticket_2375_Model5.php');
+        $this->assertEqual($loadedModels['Ticket_2375_Model6'], $models2Dir . DIRECTORY_SEPARATOR . 'Ticket_2375_Model5.php');
+
+        // try loading the first models again
+
+        $models1 = Doctrine_Core::loadModels($models1Dir);
+
+        // make sure the right models were loaded
+        $this->assertTrue(key_exists('Ticket_2375_Model1', $models1));
+        $this->assertTrue(key_exists('Ticket_2375_Model2', $models1));
+
+        // get a list of all models that have been loaded
+        $loadedModels = Doctrine_Core::getLoadedModelFiles();
+
+        // make sure the paths are correct
+        $this->assertEqual($loadedModels['Ticket_2375_Model1'], $models1Dir . DIRECTORY_SEPARATOR . 'Ticket_2375_Model1.php');
+        $this->assertEqual($loadedModels['Ticket_2375_Model2'], $models1Dir . DIRECTORY_SEPARATOR . 'Ticket_2375_Model2.php');
+        $this->assertEqual($loadedModels['Ticket_2375_Model3'], $models2Dir . DIRECTORY_SEPARATOR . 'Ticket_2375_Model3.php');
+        $this->assertEqual($loadedModels['Ticket_2375_Model4'], $models2Dir . DIRECTORY_SEPARATOR . 'Ticket_2375_Model4.php');
+        $this->assertEqual($loadedModels['Ticket_2375_Model5'], $models2Dir . DIRECTORY_SEPARATOR . 'Ticket_2375_Model5.php');
+        $this->assertEqual($loadedModels['Ticket_2375_Model6'], $models2Dir . DIRECTORY_SEPARATOR . 'Ticket_2375_Model5.php');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2377TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2377TestCase.php
new file mode 100644
index 000000000..b60f8affb
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2377TestCase.php
@@ -0,0 +1,97 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_2355_TestCase
+ *
+ * @package     Doctrine
+ * @author      Jacek Dębowczyk <j.debowczyk@diface.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.1
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_2377_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_2377_Author';
+        $this->tables[] = 'Ticket_2377_Article';
+        parent::prepareTables();
+    }
+
+    public function testSynchronize()
+    {
+        try {
+			$author = new Ticket_2377_Author();
+			$article = new Ticket_2377_Article();
+			$article->Author = $author;
+        
+			$array = $article->toArray(true);
+				
+			$article2 = new Ticket_2377_Article();
+			$article2->synchronizeWithArray($array);
+
+			$this->assertTrue($article2->Author instanceof Ticket_2377_Author);
+
+            $this->pass();
+        } catch (Exception $e) {
+			$this->fail();
+        }
+    }
+}
+
+class Ticket_2377_Author extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('author');
+        $this->hasColumn('id', 'integer', 2,
+          array('type' => 'integer', 'primary' => true, 'autoincrement' => true, 'length' => '2'));
+        $this->hasColumn('name', 'string', 2,
+          array('type' => 'string', 'length' => '100'));
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_2377_Article as Article', array('local' => 'id', 'foreign' => 'author_id'));
+    }
+}
+
+class Ticket_2377_Article extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('article');
+        $this->hasColumn('id', 'integer', 2,
+          array('type' => 'integer', 'primary' => true, 'autoincrement' => true, 'length' => '2'));
+        $this->hasColumn('author_id', 'integer', 2,
+          array('type' => 'integer', 'unsigned' => true, 'length' => '2'));
+        $this->hasColumn('content', 'string', 100,
+          array('type' => 'string', 'length' => '100'));
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_2377_Author as Author', array('local' => 'author_id', 'foreign' => 'id'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2398TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2398TestCase.php
new file mode 100644
index 000000000..8689c38bd
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/2398TestCase.php
@@ -0,0 +1,49 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_1015_TestCase
+ *
+ * @package     Doctrine
+ * @author      Russ Flynn <russ@eatmymonkeydust.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_2398_TestCase extends Doctrine_UnitTestCase 
+{
+    // Since this file is the subject of the test, we need to add some utf-8 chars to mess up
+    // the non-binary-safe count.
+    private $randomUtf8 = "øåæØÅÆØÅæøåøæØÅæøåØÆØåøÆØÅøæøåøæøåÅØÆØ";
+  
+    public function testIsValidLength()
+    {
+        $binaryValue = fread(fopen(__FILE__, 'r'), filesize(__FILE__));
+
+        //Should pass with size the same size as maximum size
+        $this->assertTrue(Doctrine_Validator::validateLength($binaryValue, "blob", filesize(__FILE__)));
+        
+        //Should fail with maximum size 1 less than actual file size 
+        $this->assertFalse(Doctrine_Validator::validateLength($binaryValue, "blob", filesize(__FILE__) -1));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/255TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/255TestCase.php
new file mode 100644
index 000000000..d13530d51
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/255TestCase.php
@@ -0,0 +1,84 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_255_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_255_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_255_User';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, true);
+        $user = new Ticket_255_User();
+        $user->username = 'jwage';
+        $user->email_address = 'jonwage@gmail.com';
+        $user->password = 'changeme';
+        $user->save();
+
+        try {
+            $user = new Ticket_255_User();
+            $user->username = 'jwage';
+            $user->email_address = 'jonwage@gmail.com';
+            $user->password = 'changeme';
+            $user->save();
+            $this->fail();
+        } catch (Exception $e) {
+            $this->pass();
+        }
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, false);
+    }
+
+    public function testTest2()
+    {
+        $dbh = new Doctrine_Adapter_Mock('mysql');
+        $conn = Doctrine_Manager::connection($dbh);
+        $sql = $conn->export->exportClassesSql(array('Ticket_255_User'));
+
+        $this->assertEqual($sql[0], 'CREATE TABLE ticket_255__user (id BIGINT AUTO_INCREMENT, username VARCHAR(255), email_address VARCHAR(255), password VARCHAR(255), UNIQUE INDEX username_email_address_unqidx_idx (username, email_address), PRIMARY KEY(id)) ENGINE = INNODB');
+    }
+}
+
+class Ticket_255_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('email_address', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+
+        $this->unique(array('username', 'email_address'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/381TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/381TestCase.php
new file mode 100644
index 000000000..d88ba3b9a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/381TestCase.php
@@ -0,0 +1,59 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket381_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_381_TestCase extends Doctrine_UnitTestCase {
+
+    public function prepareData() 
+    { }
+    public function prepareTables() {
+        $this->tables = array('Book');
+        parent::prepareTables();
+    }
+    
+    public function testTicket()
+    {
+        $obj = new Book();
+        $obj->save();
+        $obj->set('name', 'yes');
+        $obj->save();
+        $this->assertEqual($obj->get('name'), 'yes');
+        $obj->save();
+    }
+    public function testTicket2()
+    {
+        $obj = new Book();
+        $obj->set('name', 'yes2');
+        $obj->save();
+        $this->assertEqual($obj->get('name'), 'yes2');
+        $obj->save();
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/384TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/384TestCase.php
new file mode 100644
index 000000000..35a906d9c
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/384TestCase.php
@@ -0,0 +1,206 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_384_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_384_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData()
+    {
+	    $oResume = new ticket384_Resume;
+	    $oResume->title = 'titre';
+	    $oResume->KnownLanguages[0]->comments = 'foo';
+	    $oResume->KnownLanguages[0]->Language->label = "Enlish";
+	    $oResume->KnownLanguages[0]->Level->label = "Fluent";
+	    $oResume->save();
+    }
+
+    public function prepareTables()
+    {
+    	$this->tables = array();
+    	$this->tables[] = 'ticket384_Resume';
+    	$this->tables[] = 'ticket384_ResumeHasLanguage';
+    	$this->tables[] = 'ticket384_LanguageLevel';
+    	$this->tables[] = 'ticket384_Language';
+    	
+    	parent :: prepareTables();
+    }
+
+    public function testTicket()
+    {
+        $q = new Doctrine_Query();
+
+        // simple query with deep relations
+        $q->addSelect('Resume.id, Level.id, Level.label')
+          ->from('ticket384_Resume Resume')
+          ->leftJoin('Resume.KnownLanguages KnownLanguages')
+          ->leftJoin('KnownLanguages.Level Level')
+          ->leftJoin('KnownLanguages.Language Language');
+        
+        try {
+            // get the wrong resultset
+            $aResult = $q->fetchArray();
+            $this->fail();
+        } catch (Doctrine_Query_Exception $e) {
+            $this->pass();
+        } 
+        $q->free();
+        
+        // now correct
+        // we have to select at least KnownLanguages.id in order to get the Levels,
+        // which are only reachable through the KnownLanguages, hydrated properly.
+        $q = new Doctrine_Query();
+        $q->addSelect('Resume.id, Level.id, Level.label, KnownLanguages.id')
+          ->from('ticket384_Resume Resume')
+          ->leftJoin('Resume.KnownLanguages KnownLanguages')
+          ->leftJoin('KnownLanguages.Level Level')
+          ->leftJoin('KnownLanguages.Language Language');
+        
+        $aResult = $q->fetchArray();
+        // should be setted
+        $bSuccess  = isset($aResult[0]['KnownLanguages'][0]['Level']);
+        $this->assertTrue($bSuccess);
+    	  
+    	  if ( ! $bSuccess)
+    	  {
+    	     $this->fail('fetchArray doesnt hydrate nested child relations, if parent doesnt have a column selected');
+    	  }
+    }
+}
+
+class ticket384_Resume extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('resume');
+    $this->hasColumn('id', 'integer', 8, array (
+		  'primary' => true,
+		  'autoincrement' => true,
+		  'unsigned' => true,
+		  ));
+		  
+    $this->hasColumn('title', 'string', 255);
+  }
+
+  public function setUp()
+  {
+    $this->hasMany('ticket384_ResumeHasLanguage as KnownLanguages', array('local' => 'id', 'foreign' => 'resume_id'));
+  } 
+}
+
+class ticket384_ResumeHasLanguage extends Doctrine_Record
+{	
+  public function setTableDefinition()
+  {
+    $this->setTableName('resume_has_language');
+    $this->hasColumn('id', 'integer', 8, array (
+		  'primary' => true,
+		  'autoincrement' => true,
+		  'unsigned' => true,
+		  ));
+
+    $this->hasColumn('resume_id', 'integer', 8, array (
+		  'notnull' => true,
+		  'unsigned' => true,
+		  ));
+
+    $this->hasColumn('language_id', 'integer', 2, array (
+      'unsigned' => true,
+      ));
+
+    $this->hasColumn('language_level_id', 'integer', 2, array (
+      'unsigned' => true,
+      ));
+    
+    $this->hasColumn('comments', 'string', 4000, array ());
+
+  }
+
+  public function setUp()
+  {
+    $this->hasOne('ticket384_Resume as Resume', array('local' => 'resume_id',
+                                  'foreign' => 'id',
+                                  'onDelete' => 'CASCADE',
+                                  'onUpdate' => 'CASCADE'));
+
+    $this->hasOne('ticket384_Language as Language', array('local' => 'language_id',
+                                    'foreign' => 'id',
+                                    'onDelete' => 'CASCADE',
+                                    'onUpdate' => 'CASCADE'));
+
+    $this->hasOne('ticket384_LanguageLevel as Level', array('local' => 'language_level_id',
+                                                  'foreign' => 'id',
+                                                  'onDelete' => 'SET NULL',
+                                                  'onUpdate' => 'CASCADE'));
+  } 
+}
+
+class ticket384_Language extends Doctrine_Record
+{	
+  public function setTableDefinition()
+  {
+  	$this->setTableName('language');
+    $this->hasColumn('id', 'integer', 2, array(
+      'primary' => true,
+      'autoincrement' => true,
+      'unsigned' => true,
+      ));
+
+    $this->hasColumn('label', 'string', 100, array ('notnull' => true));
+  }
+  
+  public function setUp()
+  {
+    $this->hasMany('ticket384_Resume as Resumes', array('local' => 'id', 'foreign' => 'language_id'));
+    $this->hasMany('ticket384_ResumeHasLanguage as ResumeKnownLanguages', array('local' => 'id', 'foreign' => 'language_id'));
+  } 
+}
+
+class ticket384_LanguageLevel extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('language_level');
+    $this->hasColumn('id', 'integer', 2, array (
+		  'primary' => true,
+		  'autoincrement' => true,
+		  'unsigned' => true,
+		  ));
+
+    $this->hasColumn('label', 'string', 100, array ('notnull' => true));
+  }
+
+  public function setUp()
+  {
+    $this->hasMany('ticket384_ResumeHasLanguage as ResumeKnownLanguages', array(
+      'local'   => 'id',
+      'foreign' => 'language_level_id'));
+  }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/424BTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/424BTestCase.php
new file mode 100644
index 000000000..e1fa22915
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/424BTestCase.php
@@ -0,0 +1,99 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket424B_TestCase
+ *
+ * This test case tests many-many relationship with non-autoincrement primary key
+ *
+ * @package     Doctrine
+ * @author      Tamcy <7am.online@gmail.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_424B_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData() 
+    { }
+
+    public function prepareTables()
+    {
+        $this->tables = array('mmrUser_B', 'mmrGroup_B', 'mmrGroupUser_B');
+
+        parent::prepareTables();
+    }
+
+    protected function newGroup($code, $name)
+    {
+        $group = new mmrGroup_B();
+        $group->id = $code;
+        $group->name = $name;
+        $group->save();
+        return $group;
+    }
+
+    protected function newUser($code, $name, $groups)
+    {
+        $u = new mmrUser_B();
+        $u->id = $code;
+        $u->name = $name;
+
+        foreach ($groups as $idx=>$group) {
+            $u->Group[$idx] = $group;
+        }
+
+        $u->save();
+        return $u;
+    }
+
+    public function testManyManyRelationWithAliasColumns()
+    {
+        $groupA = $this->newGroup(1, 'Group A');
+        $groupB = $this->newGroup(2, 'Group B');
+        $groupC = $this->newGroup(3, 'Group C');
+
+        $john  = $this->newUser(1, 'John',  array($groupA, $groupB));
+        $peter = $this->newUser(2, 'Peter', array($groupA, $groupC));
+        $alan  = $this->newUser(3, 'Alan',  array($groupB, $groupC));
+
+        $q = Doctrine_Query::create();
+        $gu = $q->from('mmrGroupUser_B')->execute();
+        $this->assertEqual(count($gu), 6);
+
+        // Direct query
+        $q = Doctrine_Query::create();
+        $gu = $q->from('mmrGroupUser_B')->where('group_id = ?', $groupA->id)->execute();
+        $this->assertEqual(count($gu), 2);
+
+        // Query by join
+        $q = Doctrine_Query::create()
+            ->from('mmrUser_B u, u.Group g')
+            ->where('g.name = ?', array($groupA->name));
+
+        $userOfGroupAByName = $q->execute();
+
+        $this->assertEqual(count($userOfGroupAByName), 2);
+
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/424CTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/424CTestCase.php
new file mode 100644
index 000000000..f629a1fda
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/424CTestCase.php
@@ -0,0 +1,96 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket424B_TestCase
+ *
+ * This test case tests many-many relationship with non-autoincrement, alias primary key
+ *
+ * @package     Doctrine
+ * @author      Tamcy <7am.online@gmail.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+
+class Doctrine_Ticket_424C_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData()
+    { }
+
+    public function prepareTables()
+    {
+        $this->tables = array('mmrUser_C', 'mmrGroup_C', 'mmrGroupUser_C');
+        parent::prepareTables();
+    }
+
+    protected function newGroup($code, $name)
+    {
+        $group = new mmrGroup_C();
+        $group->id = $code;
+        $group->name = $name;
+        $group->save();
+        return $group;
+    }
+
+    protected function newUser($code, $name, $groups)
+    {
+        $u = new mmrUser_C();
+        $u->id = $code;
+        $u->name = $name;
+        foreach ($groups as $idx=>$group) {
+            $u->Group[$idx] = $group;
+        }
+        $u->save();
+        return $u;
+    }
+
+    public function testManyManyRelationWithAliasColumns()
+    {
+      $groupA = $this->newGroup(1, 'Group A');
+      $groupB = $this->newGroup(2, 'Group B');
+      $groupC = $this->newGroup(3, 'Group C');
+
+      $john  = $this->newUser(1, 'John',  array($groupA, $groupB));
+      $peter = $this->newUser(2, 'Peter', array($groupA, $groupC));
+      $alan  = $this->newUser(3, 'Alan',  array($groupB, $groupC));
+
+      $q = Doctrine_Query::create();
+      $gu = $q->from('mmrGroupUser_C')->execute();
+      $this->assertEqual(count($gu), 6);
+
+      // Direct query
+      $q = Doctrine_Query::create();
+      $gu = $q->from('mmrGroupUser_C')->where('group_id = ?', $groupA->id)->execute();
+      $this->assertEqual(count($gu), 2);
+
+      // Query by join
+      $q = Doctrine_Query::create()
+            ->from('mmrUser_C u, u.Group g')
+            ->where('g.name = ?', array($groupA->name));
+
+      $userOfGroupAByName = $q->execute();
+
+      $this->assertEqual(count($userOfGroupAByName), 2);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/428TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/428TestCase.php
new file mode 100644
index 000000000..4a155d802
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/428TestCase.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * Doctrine_Ticket_428_TestCase
+ *
+ * @package     Doctrine
+ * @author      Tamcy <7am.online@gmail.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_428_TestCase extends Doctrine_UnitTestCase
+{
+    private $_albums;
+    
+    public function prepareData()
+    {
+    }
+
+    public function testInitData() 
+    {
+        // Since the tests do a $this->objTable()->clear() before each method call
+        // using the User model is not recommended for this test
+        $albums = new Doctrine_Collection('Album');
+
+        $albums[0]->name = 'Revolution';
+        $albums[0]->Song[0]->title = 'Revolution';
+        $albums[0]->Song[1]->title = 'Hey Jude';
+        $albums[0]->Song[2]->title = 'Across the Universe';
+        $albums[0]->Song[3]->title = 'Michelle';
+        $albums->save();
+        $this->assertEqual(count($albums[0]->Song), 4);
+        $this->_albums = $albums;
+    }
+
+    public function testAggregateValueMappingSupportsLeftJoins() 
+    {
+        foreach ($this->_albums as $album) {
+            $album->clearRelated();
+        }
+        
+        $q = new Doctrine_Query();
+
+        $q->select('a.name, COUNT(s.id) count')->from('Album a')->leftJoin('a.Song s')->groupby('a.id');
+        $albums = $q->execute();
+
+        try {
+            // Collection[0] should refer to the object with aggregate value
+            $this->assertEqual($albums[0]['count'], 4);
+        } catch (Exception $e) {
+            $this->fail('count aggregate value should be available');
+        }
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/438TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/438TestCase.php
new file mode 100644
index 000000000..71fb3b66f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/438TestCase.php
@@ -0,0 +1,159 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_438_TestCase
+ *
+ * @package     Doctrine
+ * @author      Tamcy <7am.online@gmail.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_438_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData() 
+    { }
+
+    public function prepareTables()
+    {
+      $this->tables = array('T438_Student', 'T438_Course', 'T438_StudentCourse');
+      parent::prepareTables();
+    }
+
+    protected function newCourse($id, $name)
+    {
+      $course = new T438_Course();
+      $course->id = $id;
+      $course->name = $name;
+      $course->save();
+      return $course;
+    }
+
+    protected function newStudent($id, $name)
+    {
+      $u = new T438_Student();
+      $u->id = $id;
+      $u->name = $name;
+      $u->save();
+      return $u;
+    }
+
+    protected function newStudentCourse($student, $course)
+    {
+      $sc = new T438_StudentCourse;
+      $sc->student_id = $student->id;
+      $sc->course_id = $course->id;
+      $sc->save();
+      return $sc;
+    }
+
+    public function testTicket()
+    {
+      $student1 = $this->newStudent('07090002', 'First Student');
+      $course1 = $this->newCourse('MATH001', 'Maths');
+      $course2 = $this->newCourse('ENG002', 'English Literature');
+
+      $this->newStudentCourse($student1, $course1);
+      $this->newStudentCourse($student1, $course2);
+
+
+      // 1. Fetch relationship on demand (multiple queries)
+      $q = new Doctrine_Query();
+      $q->from('T438_StudentCourse sc')
+        ->where('sc.student_id = ? AND sc.course_id = ?',array('07090002', 'MATH001'));
+
+      $record = $q->execute()->getFirst();
+      $this->assertEqual($record->student_id, '07090002');
+      $this->assertEqual($record->course_id,  'MATH001');
+
+      $this->assertEqual($record->get('Student')->id, '07090002');
+      $this->assertEqual($record->get('Course')->id,  'MATH001');
+
+      // 2. Fetch relationship in single query
+      $q = new Doctrine_Query();
+      $coll = $q->select('sc.*, s.*, c.*')
+        ->from('T438_StudentCourse sc, sc.Student s, sc.Course c')
+        ->where('sc.student_id = ? AND sc.course_id = ?',array('07090002', 'MATH001'))
+        ->execute();
+
+      $record = $coll->getFirst();
+      $this->assertEqual($record->student_id, '07090002');
+      $this->assertEqual($record->course_id,  'MATH001');
+
+      $this->assertEqual($record->get('Student')->id, '07090002');
+      $this->assertEqual($record->get('Course')->id,  'MATH001');
+    }
+}
+
+
+class T438_Student extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('t438_student_record');
+
+    $this->hasColumn('s_id as id', 'varchar', 30, array (  'primary' => true,));
+    $this->hasColumn('s_name as name', 'varchar', 50, array ());
+  }
+  
+  public function setUp()
+  {
+    $this->hasMany('T438_Course as StudyCourses', array('refClass' => 'T438_StudentCourse', 'local' => 'sc_student_id', 'foreign' => 'sc_course_id'));
+  }
+}
+
+
+class T438_Course extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('t438_course');
+
+    $this->hasColumn('c_id as id', 'varchar', 20, array (  'primary' => true,));
+    $this->hasColumn('c_name as name', 'varchar', 50, array ());
+  }
+  
+  public function setUp()
+  {
+    $this->hasMany('T438_Student as Students', array('refClass' => 'T438_StudentCourse', 'local' => 'sc_course_id', 'foreign' => 'sc_student_id'));
+  }
+}
+
+class T438_StudentCourse extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('t438_student_course');
+
+    $this->hasColumn('sc_student_id as student_id', 'varchar', 30, array (  'primary' => true,));
+    $this->hasColumn('sc_course_id as course_id', 'varchar', 20, array (  'primary' => true,));
+    $this->hasColumn('sc_remark  as remark', 'varchar', 500, array ());
+  }
+  
+  public function setUp()
+  {
+    $this->hasOne('T438_Student as Student', array('local' => 'sc_student_id', 'foreign' => 's_id'));
+    $this->hasOne('T438_Course as Course', array('local' => 'sc_course_id', 'foreign' => 'c_id'));
+  }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/480TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/480TestCase.php
new file mode 100644
index 000000000..9059a8e7f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/480TestCase.php
@@ -0,0 +1,65 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_480_TestCase
+ *
+ * @package     Doctrine
+ * @author      Miloslav Kmet <adrive-nospam@hip-hop.sk>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+ 
+class stComment extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->setTableName('st_comment');
+		$this->hasColumn('title', 'string', 100, array());
+		$this->hasColumn('body', 'string', 1000, array());
+
+	}
+}
+
+class Doctrine_Ticket_480_TestCase extends Doctrine_UnitTestCase 
+{
+	
+	public function testInit()
+	{
+                $this->dbh = new Doctrine_Adapter_Mock('oracle');
+                $this->conn = Doctrine_Manager::getInstance()->openConnection($this->dbh);
+	}
+	
+	public function testTicket()
+	{
+	    $this->conn->export->exportClasses(array('stComment'));
+	    $queries = $this->dbh->getAll();
+	    
+	    // (2nd|1st except transaction init.) executed query must be CREATE TABLE or CREATE SEQUENCE, not CREATE TRIGGER
+	    // Trigger can be created after both CREATE TABLE and CREATE SEQUENCE
+	    $this->assertFalse(preg_match('~^CREATE TRIGGER.*~', $queries[1]));
+	    $this->assertFalse(preg_match('~^CREATE TRIGGER.*~', $queries[2]));
+
+	}
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/486TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/486TestCase.php
new file mode 100755
index 000000000..5ff54a35e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/486TestCase.php
@@ -0,0 +1,173 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_486_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_486_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables() {
+        $this->tables = array('Country', 'State', 'Resort');
+        parent::prepareTables();
+    }
+
+
+    public function prepareData()
+    {
+        // Countries
+        $c1 = $this->createCountry('Argentina');
+        $c2 = $this->createCountry('Brazil');
+        $c3 = $this->createCountry('England');
+        $c4 = $this->createCountry('Russia');
+
+        // States
+        $s1 = $this->createState($c1, 'Buenos Aires');
+        $s2 = $this->createState($c1, 'Chaco');
+        $s3 = $this->createState($c1, 'Santa Fé');
+
+        $s4 = $this->createState($c2, 'Rio de Janeiro');
+        $s5 = $this->createState($c2, 'São Paulo');
+
+        $s6 = $this->createState($c3, 'Hampshire');
+        $s7 = $this->createState($c3, 'Yorkshire');
+
+        $s8 = $this->createState($c4, 'Yamalia');
+
+        // Resorts
+        $r1 = $this->createResort($s1, 'Punta del Sol');
+        $r2 = $this->createResort($s2, 'Los Chacos');
+        $r3 = $this->createResort($s2, 'Cuesta del Sol');
+
+        $r4 = $this->createResort($s4, 'Copacabana Palace');
+        $r5 = $this->createResort($s5, 'Anacã');
+
+        $r6 = $this->createResort($s7, 'Inn');
+
+        $r7 = $this->createResort($s8, 'Hilton');
+    }
+
+
+    public function testLimitSubqueryQuoteIdentifier()
+    {
+        // Change the quote identifier
+        $curQuoteIdentifier = $this->getConnection()->getAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER);
+        $this->getConnection()->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, true);
+
+        $q = Doctrine_Query::create()
+            ->select('c.id')
+            ->from('Country c, c.State.Resort r')
+            ->where('r.id = 3')
+            ->limit(1);
+
+        $this->assertEqual('SELECT "c"."id" AS "c__id" FROM "country" "c" LEFT JOIN "state" "s" ON "c"."id" = "s"."country_id" LEFT JOIN "resort" "r" ON "s"."id" = "r"."state_id" WHERE "c"."id" IN (SELECT DISTINCT "c2"."id" FROM "country" "c2" LEFT JOIN "state" "s2" ON "c2"."id" = "s2"."country_id" LEFT JOIN "resort" "r2" ON "s2"."id" = "r2"."state_id" WHERE "r2"."id" = 3 LIMIT 1) AND ("r"."id" = 3)', $q->getSqlQuery());
+
+        // Restoring quote identifier
+        $this->getConnection()->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, $curQuoteIdentifier);
+    }
+
+
+    public function createCountry($name)
+    {
+        $tmp = new Country();
+        $tmp->name = $name;
+        $tmp->save();
+
+        return $tmp;
+    }
+
+
+    public function createState($country, $name)
+    {
+        $tmp = new State();
+        $tmp->name = $name;
+        $tmp->Country = $country;
+        $tmp->save();
+
+        return $tmp;
+    }
+
+
+    public function createResort($state, $name)
+    {
+        $tmp = new Resort();
+        $tmp->name = $name;
+        $tmp->State = $state;
+        $tmp->save();
+
+        return $tmp;
+    }
+}
+
+
+class Country extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+
+
+    public function setUp()
+    {
+        $this->hasMany('State', array('local' => 'id', 'foreign' => 'country_id'));
+    }
+}
+
+
+class State extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('country_id', 'integer', 4);
+        $this->hasColumn('name', 'string', 255);
+    }
+
+
+    public function setUp()
+    {
+        $this->hasOne('Country', array('local' => 'country_id', 'foreign' => 'id'));
+        $this->hasMany('Resort', array('local' => 'id', 'foreign' => 'state_id'));
+    }
+}
+
+
+class Resort extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('state_id', 'integer', 4);
+        $this->hasColumn('name', 'string', 255);
+    }
+
+
+    public function setUp()
+    {
+        $this->hasOne('State', array('local' => 'state_id', 'foreign' => 'id'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/565TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/565TestCase.php
new file mode 100644
index 000000000..59da2e972
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/565TestCase.php
@@ -0,0 +1,35 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_565_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_565_TestCase extends Doctrine_UnitTestCase 
+{
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/574TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/574TestCase.php
new file mode 100644
index 000000000..22862171d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/574TestCase.php
@@ -0,0 +1,85 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_574_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_574_TestCase extends Doctrine_UnitTestCase 
+{
+  /**
+   * prepareData
+   */
+    public function prepareData()
+    {
+	    for($i=0; $i < 10; $i++)
+	    {
+	       $oAuthor = new Author;
+	       $oAuthor->book_id = $i;
+	       $oAuthor->name = "Author $i";
+	       $oAuthor->save();
+	    }
+    }
+	
+    /**
+     * prepareTables
+     */
+    
+    public function prepareTables()
+    {
+      $this->tables = array();
+      $this->tables[] = 'Author';
+      $this->tables[] = 'Book';
+      
+      parent :: prepareTables();
+    }
+    
+    
+    /**
+     * Test the existence expected indexes
+     */
+    
+    public function testTicket()
+    {
+        $q = new Doctrine_Query();
+
+        // simple query with 1 column selected
+        $cAuthors = $q->select('book_id')->from('Author')->groupBy('book_id')->where('book_id = 2')->execute();
+        
+        // simple query, with 1 join and all columns selected
+        $cAuthors = $q->from('Author, Author.Book')->execute();
+        
+        foreach($cAuthors as $oAuthor)
+        {
+          if ( ! $oAuthor->name)
+          {
+            $this->fail('Querying the same table multiple times triggers hydration/caching(?) bug');
+          }
+        }   	     
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/576TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/576TestCase.php
new file mode 100644
index 000000000..e10d6f4d0
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/576TestCase.php
@@ -0,0 +1,52 @@
+<?php
+
+/**
+ * Doctrine_Ticket_587_TestCase
+ *
+ * @package     Doctrine
+ * @author      Joaquin Bravo <jackbravo@gmail.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+
+class Doctrine_Ticket_576_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables = array('Entity');
+        parent::prepareTables();
+    }
+
+    public function prepareData() { }
+
+    public function testInit()
+    {
+        $entity = new Entity();
+        $entity->name = 'myname';
+        $entity->loginname = 'test';
+        $entity->save();
+    }
+
+    public function testBug()
+    {
+        // load our user and our collection of pages
+        $user = Doctrine_Query::create()->from('Entity')->fetchOne();
+        $this->assertEqual($user->name, 'myname');
+        $this->assertEqual($user->loginname, 'test');
+
+        $user->name = null;
+        $this->assertEqual($user->name, null);
+
+        $data = Doctrine_Query::create()
+            ->select('name')
+            ->from('Entity')
+            ->fetchOne(array(), Doctrine_Core::HYDRATE_ARRAY);
+
+        $user->hydrate($data);
+        $this->assertEqual($user->name, 'myname');
+        $this->assertEqual($user->loginname, 'test'); // <<----- this is what the bug is about
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/583TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/583TestCase.php
new file mode 100644
index 000000000..13851fcb1
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/583TestCase.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * Doctrine_Ticket_587_TestCase
+ *
+ * @package     Doctrine
+ * @author      Joaquin Bravo <jackbravo@gmail.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+
+class Doctrine_Ticket_583_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables = array('Entity');
+        parent::prepareTables();
+    }
+
+    public function prepareData() { }
+
+    public function testBug()
+    {
+        $entity = new Entity();
+        $entity->name = 'myname';
+        $entity->save();
+
+        // load our user and our collection of pages
+        $user = Doctrine_Query::create()->select('id')->from('Entity')->fetchOne();
+        $this->assertEqual($user->name, 'myname');
+
+        // load our user and our collection of pages
+        $user = Doctrine_Query::create()->select('*')->from('Entity')->fetchOne();
+        $this->assertEqual($user->name, 'myname');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/587TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/587TestCase.php
new file mode 100644
index 000000000..4e2250eff
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/587TestCase.php
@@ -0,0 +1,106 @@
+<?php
+
+/**
+ * Doctrine_Ticket_587_TestCase
+ *
+ * @package     Doctrine
+ * @author      David Brewer <dbrewer@secondstory.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+
+class Doctrine_Ticket_587_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables = array_merge($this->tables, array('BookmarkUser', 'Bookmark', 'Page'));
+        parent::prepareTables();
+    }
+    public function prepareData()
+    {
+        parent::prepareData();
+    }
+
+    public function testInit()
+    {
+        $user = new BookmarkUser();
+        $user['name'] = 'Anonymous';
+        $user->save();
+
+        $pages = new Doctrine_Collection('Page');
+        $pages[0]['name'] = 'Yahoo';
+        $pages[0]['url'] = 'http://www.yahoo.com';
+        $pages->save();
+
+        $this->assertEqual(count($pages), 1);
+    }
+
+    /**
+     * This test case demonstrates an issue with the identity case in the
+     * Doctrine_Table class.  The brief summary is that if you create a
+     * record, then delete it, then create another record with the same
+     * primary keys, the record can get into a state where it is in the
+     * database but may appear to be marked as TCLEAN under certain
+     * circumstances (such as when it comes back as part of a collection).
+     * This makes the $record->exists() method return false, which prevents
+     * the record from being deleted among other things.
+     */
+    public function testIdentityMapAndRecordStatus()
+    {
+        // load our user and our collection of pages
+        $user = Doctrine_Query::create()->query(
+            'SELECT * FROM BookmarkUser u WHERE u.name=?', array('Anonymous')
+        )->getFirst();
+        $pages = Doctrine_Query::create()->query('SELECT * FROM Page');
+
+        // bookmark the pages (manually)
+        foreach ($pages as $page) {
+            $bookmark = new Bookmark();
+            $bookmark['page_id'] = $page['id'];
+            $bookmark['user_id'] = $user['id'];
+            $bookmark->save();
+        }
+
+        // select all bookmarks
+        $bookmarks = Doctrine_Manager::connection()->query(
+            'SELECT * FROM Bookmark b'
+        );
+        $this->assertEqual(count($bookmarks), 1);
+
+        // verify that they all exist
+        foreach ($bookmarks as $bookmark) {
+            $this->assertTrue($bookmark->exists());
+        }
+
+        // now delete them all.
+        $user['Bookmarks']->delete();
+
+        // verify count when accessed directly from database
+        $bookmarks = Doctrine_Query::create()->query(
+            'SELECT * FROM Bookmark'
+        );
+        $this->assertEqual(count($bookmarks), 0);
+
+        // now recreate bookmarks and verify they exist:
+        foreach ($pages as $page) {
+            $bookmark = new Bookmark();
+            $bookmark['page_id'] = $page['id'];
+            $bookmark['user_id'] = $user['id'];
+            $bookmark->save();
+        }
+
+        // select all bookmarks for the user
+        $bookmarks = Doctrine_Manager::connection()->query(
+            'SELECT * FROM Bookmark b'
+        );
+        $this->assertEqual(count($bookmarks), 1);
+
+        // verify that they all exist
+        foreach ($bookmarks as $bookmark) {
+            $this->assertTrue($bookmark->exists());
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/626BTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/626BTestCase.php
new file mode 100644
index 000000000..6f550a493
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/626BTestCase.php
@@ -0,0 +1,159 @@
+<?php
+
+/**
+ * Doctrine_Ticket_626_TestCase
+ *
+ * @package     Doctrine
+ * @author      Tamcy <7am.online@gmail.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+
+class Doctrine_Ticket_626B_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData() 
+    { }
+
+    public function prepareTables()
+    {
+      $this->tables = array('T626_Group', 'T626B_Student', 'T626_Course', 'T626B_StudentCourse');
+      parent::prepareTables();
+    }
+
+    protected function newCourse($id, $name)
+    {
+      $course = new T626_Course();
+      $course->id = $id;
+      $course->name = $name;
+      $course->save();
+      return $course;
+    }
+
+    protected function newGroup($id, $name)
+    {
+      $group = new T626_Group();
+      $group->id = $id;
+      $group->name = $name;
+      $group->save();
+      return $group;
+    }
+
+    protected function newStudent($id, $name, $group)
+    {
+      $u = new T626B_Student();
+      $u->id = $id;
+      $u->name = $name;
+      $u->group_id = $group->id;
+      $u->save();
+      return $u;
+    }
+
+    protected function newStudentCourse($student, $course)
+    {
+      $sc = new T626B_StudentCourse;
+      $sc->student_id = $student->id;
+      $sc->course_id = $course->id;
+      $sc->save();
+      return $sc;
+    }
+
+    public function testTicket()
+    {
+      $group1 = $this->newGroup('1', 'Group 1');
+      $student1 = $this->newStudent('07090002', 'First Student', $group1);
+      $course1 = $this->newCourse('MATH001', 'Maths');
+      $course2 = $this->newCourse('ENG002', 'English Literature');
+
+      $this->newStudentCourse($student1, $course1);
+      $this->newStudentCourse($student1, $course2);
+      
+      try {
+        $group = $student1->get('Group');
+        $this->pass();
+      } catch (Exception $e) {
+        $this->fail($e->__toString());
+      }
+
+      try {
+        $courses = $student1->get('StudyCourses');
+        $this->pass();
+      } catch (Exception $e) {
+        $this->fail($e->__toString());
+      }
+
+    }
+}
+
+
+class T626B_Student extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('T626B_Student_record');
+
+    $this->hasColumn('s_id as id', 'varchar', 30, array (  'primary' => true,));
+    $this->hasColumn('s_g_id as group_id', 'varchar', 30, array ('notnull'=>true));
+    $this->hasColumn('s_name as name', 'varchar', 50, array ());
+  }
+  
+  public function setUp()
+  {
+    $this->hasMany('T626_Course as StudyCourses', array('refClass' => 'T626B_StudentCourse', 'local' => 'sc_student_id', 'foreign' => 'sc_course_id'));
+    $this->hasOne('T626_Group as Group', array('local' => 's_g_id', 'foreign' => 'g_id'));
+  }
+}
+
+class T626_Group extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('T626B_Student_group');
+
+    $this->hasColumn('g_id as id', 'varchar', 30, array (  'primary' => true,));
+    $this->hasColumn('g_name as name', 'varchar', 50, array ());
+  }
+  
+  public function setUp()
+  {
+    $this->hasMany('T626B_Student as Students', 
+      array('local' => 'g_id', 'foreign' => 's_id'));
+  }
+}
+
+
+class T626_Course extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('T626_course');
+
+    $this->hasColumn('c_id as id', 'varchar', 20, array (  'primary' => true,));
+    $this->hasColumn('c_name as name', 'varchar', 50, array ());
+  }
+  
+  public function setUp()
+  {
+    $this->hasMany('T626B_Student as Students', array('refClass' => 'T626B_StudentCourse', 'local' => 'sc_course_id', 'foreign' => 'sc_student_id'));
+  }
+}
+
+class T626B_StudentCourse extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('T626B_Student_course');
+
+    $this->hasColumn('sc_student_id as student_id', 'varchar', 30, array (  'primary' => true,));
+    $this->hasColumn('sc_course_id as course_id', 'varchar', 20, array (  'primary' => true,));
+    $this->hasColumn('sc_remark  as remark', 'varchar', 500, array ());
+  }
+  
+  public function setUp()
+  {
+    $this->hasOne('T626B_Student as Student', array('local' => 'sc_student_id', 'foreign' => 's_id'));
+    $this->hasOne('T626_Course as Course', array('local' => 'sc_course_id', 'foreign' => 'c_id'));
+  }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/626CTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/626CTestCase.php
new file mode 100644
index 000000000..117a785d3
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/626CTestCase.php
@@ -0,0 +1,85 @@
+<?php
+
+/**
+ * Doctrine_Ticket_626_TestCase
+ *
+ * @package     Doctrine
+ * @author      Tamcy <7am.online@gmail.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+
+class Doctrine_Ticket_626C_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData() 
+    { }
+
+    public function prepareTables()
+    {
+      $this->tables = array('T626C_Student1', 'T626C_Student2');
+      parent::prepareTables();
+    }
+
+    protected function newStudent($cls, $id, $name)
+    {
+      $u = new $cls;
+      $u->id = $id;
+      $u->name = $name;
+      $u->save();
+      return $u;
+    }
+
+    public function testFieldNames()
+    {
+      $student1 = $this->newStudent('T626C_Student1', '07090002', 'First Student');
+
+      try {
+        $students = Doctrine_Query::create()
+          ->from('T626C_Student1 s INDEXBY s.id')
+          ->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+        $this->pass();
+      } catch (Exception $e) {
+        $this->fail($e->__toString());
+      }
+    }
+
+    public function testColNames()
+    {
+      $student1 = $this->newStudent('T626C_Student2', '07090002', 'First Student');
+
+      try {
+        $students = Doctrine_Query::create()
+          ->from('T626C_Student2 s INDEXBY s.id')
+          ->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+        $this->pass();
+      } catch (Exception $e) {
+        $this->fail($e->__toString());
+      }
+    }
+}
+
+
+class T626C_Student1 extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('T626C_Student_record_1');
+
+    $this->hasColumn('s_id as id', 'varchar', 30, array (  'primary' => true,));
+    $this->hasColumn('s_name as name', 'varchar', 50, array ());
+  }
+}
+
+class T626C_Student2 extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('T626C_Student_record_2');
+
+    $this->hasColumn('id', 'varchar', 30, array (  'primary' => true,));
+    $this->hasColumn('name', 'varchar', 50, array ());
+  }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/626DTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/626DTestCase.php
new file mode 100644
index 000000000..ab157d00f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/626DTestCase.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * Doctrine_Ticket_626D_TestCase
+ *
+ * @package     Doctrine
+ * @author      Tamcy <7am.online@gmail.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+
+class Doctrine_Ticket_626D_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData() 
+    { }
+
+    public function prepareTables()
+    {
+      $this->tables = array('T626D_Student1');
+      parent::prepareTables();
+    }
+
+    protected function newStudent($cls, $id, $name)
+    {
+      $u = new $cls;
+      $u->id = $id;
+      $u->name = $name;
+      $u->save();
+      return $u;
+    }
+
+    public function testFieldNames()
+    {
+      $student1 = $this->newStudent('T626D_Student1', '07090002', 'First Student');
+
+      try {
+        $student = Doctrine_Core::getTable('T626D_Student1')->find('07090002');
+        $this->pass();
+      } catch (Exception $e) {
+        $this->fail($e->__toString());
+      }
+    }
+}
+
+
+class T626D_Student1 extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('T626D_Student_record_1');
+
+    $this->hasColumn('s_id as id', 'varchar', 30, array (  'primary' => true,));
+    $this->hasColumn('s_name as name', 'varchar', 50, array ());
+  }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/632TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/632TestCase.php
new file mode 100644
index 000000000..ba435f18a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/632TestCase.php
@@ -0,0 +1,119 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_632_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_632_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_632_User';
+        $this->tables[] = 'Ticket_632_Group';
+        $this->tables[] = 'Ticket_632_UserGroup';
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+        $user = new Ticket_632_User();
+        $user->username = 'jwage';
+        $user->password = 'changeme';
+        $user->Groups[]->name = 'Group One';
+        $user->Groups[]->name = 'Group Two';
+        $user->Groups[]->name = 'Group Three';
+        $user->save();
+    }
+
+    public function testTest()
+    {
+        $user = Doctrine_Query::create()
+            ->from('Ticket_632_User u, u.Groups g')
+            ->where('u.username = ?', 'jwage')
+            ->limit(1)
+            ->fetchOne();
+        $this->assertEqual($user->Groups->count(), 3);
+        unset($user->Groups[2]);
+        $this->assertEqual($user->Groups->count(), 2);
+        $user->save(); // This deletes the UserGroup association and the Group record
+
+        // We should still have 3 groups
+        $groups = Doctrine_Core::getTable('Ticket_632_Group')->findAll();
+        $this->assertEqual($groups->count(), 3);
+    }
+}
+
+class Ticket_632_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_632_Group as Groups', array('local'   => 'user_id',
+                                                           'foreign' => 'group_id',
+                                                           'refClass' => 'Ticket_632_UserGroup'));
+    }
+}
+
+class Ticket_632_Group extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_632_User as Users', array('local'   => 'group_id',
+                                                         'foreign' => 'user_id',
+                                                         'refClass' => 'Ticket_632_UserGroup'));
+    }
+}
+
+class Ticket_632_UserGroup extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('user_id', 'integer', 4, array('primary' => true));
+        $this->hasColumn('group_id', 'integer', 4, array('primary' => true));
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_632_User as User', array('local'   => 'user_id',
+                                                       'foreign' => 'id'));
+
+        $this->hasOne('Ticket_632_Group as Group', array('local' => 'group_id',
+                                                         'foreign' => 'id'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/638TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/638TestCase.php
new file mode 100644
index 000000000..49f8684e4
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/638TestCase.php
@@ -0,0 +1,161 @@
+<?php
+
+/**
+ * Doctrine_Ticket_638_TestCase
+ *
+ * @package     Doctrine
+ * @author      Tamcy <7am.online@gmail.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+
+class Doctrine_Ticket_638_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData() 
+    { }
+
+    public function prepareTables()
+    {
+      $this->tables = array('T638_Student', 'T638_Course', 'T638_StudentCourse');
+      parent::prepareTables();
+    }
+
+    protected function newCourse($id, $name)
+    {
+      $course = new T638_Course();
+      $course->id = $id;
+      $course->name = $name;
+      $course->save();
+      return $course;
+    }
+
+    protected function newStudent($id, $name)
+    {
+      $u = new T638_Student();
+      $u->id = $id;
+      $u->name = $name;
+      $u->group_id = 1;
+      $u->save();
+      return $u;
+    }
+
+    protected function newStudentCourse($student, $course)
+    {
+      $sc = new T638_StudentCourse;
+      $sc->student_id = $student->id;
+      $sc->course_id = $course->id;
+      $sc->save();
+      return $sc;
+    }
+
+    public function testTicket()
+    {
+      $student1 = $this->newStudent('07090002', 'First Student');
+      $course1 = $this->newCourse('MATH001', 'Maths');
+      $course2 = $this->newCourse('ENG002', 'English Literature');
+
+      $sc = new T638_StudentCourse;
+      $sc->set('Student', $student1);
+      $sc->set('Course', $course1);
+
+      if ($student1->get('id') instanceof T638_StudentCourse)
+      {
+        $this->fail('Student Id incorrectly replaced!');
+      }
+      else
+      {
+        $this->pass();
+      }
+
+      if ($student1->get('id') != '07090002')
+      {
+        $this->fail('Student Id is not correct after assignment!');
+      }
+      else
+      {
+        $this->pass();
+      }
+
+      if ($course1->get('id') instanceof T638_StudentCourse)
+      {
+        $this->fail('Course Id incorrectly replaced!');
+      }
+      else
+      {
+        $this->pass();
+      }
+
+      if ($course1->get('id') != 'MATH001')
+      {
+        $this->fail('Course Id is not correct after assignment!');
+      }
+      else
+      {
+        $this->pass();
+      }
+
+      $this->assertEqual($sc->get('student_id'), '07090002');
+      $this->assertEqual($sc->get('course_id'), 'MATH001');
+      $this->assertIdentical($sc->get('Student'), $student1);
+      $this->assertIdentical($sc->get('Course'), $course1);
+    }
+}
+
+
+class T638_Student extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('T638_student');
+
+    $this->hasColumn('s_id as id', 'varchar', 30, array (  'primary' => true,));
+    $this->hasColumn('s_g_id as group_id', 'varchar', 30, array ('notnull'=>true));
+    $this->hasColumn('s_name as name', 'varchar', 50, array ('notnull'=>true));
+  }
+  
+  public function setUp()
+  {
+  }
+}
+
+class T638_Course extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('T638_course');
+
+    $this->hasColumn('c_id as id', 'varchar', 20, array (  'primary' => true,));
+    $this->hasColumn('c_name as name', 'varchar', 50, array ('notnull'=>true));
+  }
+  
+  public function setUp()
+  {
+  }
+
+  public function set($fieldName, $value, $load = true)
+  {
+    parent::set($fieldName, $value, $load);
+  }
+}
+
+class T638_StudentCourse extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('T638_Student_course');
+
+    $this->hasColumn('sc_student_id as student_id', 'varchar', 30, array (  'primary' => true,));
+    $this->hasColumn('sc_course_id as course_id', 'varchar', 20, array (  'primary' => true,));
+    $this->hasColumn('sc_remark  as remark', 'varchar', 500, array ('notnull'=>true));
+  }
+  
+  public function setUp()
+  {
+    $this->hasOne('T638_Student as Student', array('local' => 'sc_student_id', 'foreign' => 's_id'));
+    $this->hasOne('T638_Course as Course', array('local' => 'sc_course_id', 'foreign' => 'c_id'));
+  }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/642TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/642TestCase.php
new file mode 100644
index 000000000..10e0dc4df
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/642TestCase.php
@@ -0,0 +1,65 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_642_TestCase
+ *
+ * @package     Doctrine
+ * @author      Guilherme Blanco <guilhermeblanco@hotmail.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_642_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testInit()
+    {
+        $this->dbh = new Doctrine_Adapter_Mock('mysql');
+        $this->conn = Doctrine_Manager::getInstance()->openConnection($this->dbh);
+    }
+
+
+    public function testTest()
+    {
+        $this->conn->export->exportClasses(array('stDummyObj'));
+        $queries = $this->dbh->getAll();
+
+        // Default was not being defined, even if notnull was set
+        $this->assertEqual("CREATE TABLE st_dummy_obj (id BIGINT AUTO_INCREMENT, startdate DATETIME DEFAULT '0000-00-00 00:00:00' NOT NULL, PRIMARY KEY(id)) ENGINE = INNODB", $queries[1]);
+	}
+}
+
+
+class stDummyObj extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('st_dummy_obj');
+        $this->hasColumn('startDate', 'timestamp', null, array(
+            'notnull' => true, 
+            'default' => '0000-00-00 00:00:00'
+        ));
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/668TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/668TestCase.php
new file mode 100755
index 000000000..6c60bdbeb
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/668TestCase.php
@@ -0,0 +1,65 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_668_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_668_TestCase extends Doctrine_UnitTestCase {
+
+    public function prepareTables() {
+      $this->tables = array();
+      $this->tables[] = 'T668_User';
+      parent::prepareTables();
+    }
+
+
+    public function prepareData() {}
+
+
+    public function testTicket()
+    {
+        $query = Doctrine_Query::create()
+                ->select('u.id')
+                ->from('T668_User u')
+                ->where("u.name LIKE '%foo OR bar%'");
+        $this->assertEqual("SELECT u.id FROM T668_User u WHERE u.name LIKE '%foo OR bar%'", $query->getDql());
+        $this->assertEqual($query->getSqlQuery(), "SELECT t.id AS t__id FROM t668_user t WHERE (t.name LIKE '%foo OR bar%')");
+    }
+}
+
+
+class T668_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('t668_user');
+        $this->hasColumn('id', 'integer', 3, array('autoincrement' => true, 'unsigned' => true, 'primary' => true, 'notnull' => true));
+        $this->hasColumn('name', 'string', 100);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/673TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/673TestCase.php
new file mode 100644
index 000000000..452a67654
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/673TestCase.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * Doctrine_Ticket_673_TestCase
+ *
+ * @package     Doctrine
+ * @author      Tamcy <7am.online@gmail.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+
+class Doctrine_Ticket_673_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData() 
+    { }
+
+    public function prepareTables()
+    {
+      $this->tables = array('T673_Student');
+      parent::prepareTables();
+    }
+
+    public function testTicket()
+    {
+      $q = Doctrine_Query::create()
+        ->update('T673_Student s')
+        ->set('s.foo', 's.foo + 1')
+        ->where('s.id = 2');
+      
+      $this->assertTrue(preg_match_all('/(s_foo)/', $q->getSqlQuery(), $m) === 2);
+      $this->assertTrue(preg_match_all('/(s_id)/', $q->getSqlQuery(), $m) === 1);
+      
+      try {
+        $q->execute();
+        $this->pass();
+      } catch (Exception $e) {
+        $this->fail($e->__toString());
+      }
+
+      $q = Doctrine_Query::create()
+        ->delete()
+        ->from('T673_Student s')
+        ->where('s.name = ? AND s.foo < ?', 'foo', 3);
+      
+      $this->assertTrue(preg_match_all('/(s_name)/', $q->getSqlQuery(), $m) === 1);
+      $this->assertTrue(preg_match_all('/(s_foo)/', $q->getSqlQuery(), $m) === 1);
+
+      try {
+        $q->execute();
+        $this->pass();
+      } catch (Exception $e) {
+        $this->fail($e->__toString());
+      }
+    }
+}
+
+
+class T673_Student extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('T673_Student_record');
+
+    $this->hasColumn('s_id as id', 'varchar', 30, array (  'primary' => true,));
+    $this->hasColumn('s_foo as foo', 'integer', 4, array ('notnull'=>true));
+    $this->hasColumn('s_name as name', 'varchar', 50, array ());
+  }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/697TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/697TestCase.php
new file mode 100644
index 000000000..2c9fdcd9c
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/697TestCase.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Doctrine_Ticket_697_TestCase
+ *
+ * @package     Doctrine
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+
+class Doctrine_Ticket_697_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData() 
+    { }
+
+    public function prepareTables()
+    {
+        $this->tables = array('T697_Person', 'T697_User');
+        parent::prepareTables();
+    }
+
+    public function testIdsAreSetWhenSavingSubclassInstancesInCTI()
+    {
+        $p = new T697_Person();
+        $p['name']='Rodrigo';
+        $p->save();
+        $this->assertEqual(1, $p->id);
+
+        $u = new T697_User();
+        $u['name']='Fernandes';
+        $u['password']='Doctrine RULES';
+        $u->save();
+        $this->assertEqual(2, $u->id);
+    }
+}
+
+class T697_Person extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 30);
+    }
+}
+
+//Class table inheritance
+class T697_User extends T697_Person {
+    public function setTableDefinition()
+    {
+        $this->hasColumn('password', 'string', 30);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/736TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/736TestCase.php
new file mode 100644
index 000000000..1b802b9a5
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/736TestCase.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Doctrine_Ticket_736_TestCase
+ *
+ * @package     Doctrine
+ * @author      Peter Petermann <Peter.Petermann@rtl.de>
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_736_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData() 
+    { 
+        $delegate = new T736_ModuleDelegate();
+        $delegate->content = "Lorem Ipsum and so on...";
+        $delegate->save();
+
+        $module = new T736_Module();
+        $module->moduledelegateid = $delegate->id;
+        
+        $delegate->parent = $module;
+        $delegate->save();
+    }
+    
+    public function prepareTables()
+    {
+        $this->tables = array();
+        $this->tables[] = 'T736_Module';
+        $this->tables[] = 'T736_ModuleDelegate';
+        parent::prepareTables();
+    }
+
+    public function testForHydrationOverwrintingLocalInstancesWhenItShouldnt()
+    {
+        $module = Doctrine_Core::getTable("T736_Module")->find(1);
+        $module->moduledata->content = "foo";
+        $module->moduledata->save();
+	    $this->assertTrue($module->moduledata->content == "foo"); // should be "foo" is "Lorem Ipsum and so on..."
+	    
+    }
+}
+
+
+class T736_Module extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('lastchange', 'timestamp');
+        $this->hasColumn('moduledelegateid', 'integer', 4, array('notnull' => true));
+    }
+
+    public function setUp()
+    {
+        $this->addListener(new T736_ModuleLoaderListener());
+    }
+
+}
+
+class T736_ModuleDelegate extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn("moduleid", "integer", 4, array());
+        $this->hasColumn("content", "string", 2000);
+    }
+    
+    public function setUp()
+    {
+        $this->hasOne("T736_Module as parent", array('local' => 'moduleid', 'foreign' => 'id'));
+    }
+    
+    
+    public function preUpdate($event)
+    {
+        $this->parent->lastchange = date('Y-m-d H:i:s', time());
+        $this->parent->save();
+    }
+}
+
+
+class T736_ModuleLoaderListener extends Doctrine_Record_Listener
+{
+    public function postHydrate(Doctrine_Event $event)
+    {
+        $contents = $event->data;
+        $delegate = Doctrine_Core::getTable("T736_ModuleDelegate")->find($contents["moduledelegateid"], ($contents instanceof Doctrine_Record) ? Doctrine_Core::HYDRATE_RECORD :Doctrine_Core::HYDRATE_ARRAY );
+        if ($contents instanceof Doctrine_Record)
+        {
+            $contents->mapValue("moduledata", $delegate);
+            $delegate->parent = $contents;
+        } else {
+            $contents["moduledata"] = $delegate;
+        }
+        $event->data = $contents;
+    }
+}
+?>
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/741TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/741TestCase.php
new file mode 100644
index 000000000..e44221d36
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/741TestCase.php
@@ -0,0 +1,86 @@
+<?php
+
+
+class Doctrine_Ticket_741_TestCase extends Doctrine_UnitTestCase
+{
+
+    public function prepareData() 
+    { }
+
+    public function prepareTables()
+    {
+        $this->tables = array('Parent741', 'Child741');
+        parent::prepareTables();
+    }
+
+    public function testTicket()
+    {
+        $moo = new Parent741();
+        $moo->amount = 1000;
+        $cow = new Child741();
+
+        $moo->Cows[] = $cow;
+        $cow->Moo = $moo;
+        $moo->save();
+        $this->assertEqual($moo->amount, 0);
+    }
+
+}
+
+class Parent741 extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->hasColumn('id', 'integer', 4, array (
+      'primary' => true,
+      'autoincrement' => true,
+      'notnull' => true,
+    ));
+
+    $this->hasColumn('amount', 'integer');
+  }
+
+  public function setUp()
+  {
+    $this->hasMany('Child741 as Cows', array('local' => 'id', 'foreign' => 'moo_id'));
+  }
+}
+
+class Child741 extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->hasColumn('id', 'integer', 4, array (
+      'primary' => true,
+      'autoincrement' => true,
+      'notnull' => true,
+    ));
+
+    $this->hasColumn('moo_id', 'integer');
+  }
+
+  public function setUp()
+  {
+    $this->hasOne('Parent741 as Moo', array('local' => 'moo_id', 'foreign' => 'id'));
+  }
+
+  public function postInsert($e)
+  {
+    $this->Moo->state(Doctrine_Record::STATE_DIRTY);
+    //echo "State: ". $this->Moo->state() . " \t Amount: " . $this->Moo->amount . "\n";
+    $this->Moo->amount = 0;
+    //echo "State: ". $this->Moo->state() . " \t Amount: " . $this->Moo->amount . "\n";
+    $this->Moo->save();
+    //echo "State: ". $this->Moo->state() . " \t Amount: " . $this->Moo->amount . "\n";
+    $this->Moo->refresh();
+    //echo "State: ". $this->Moo->state() . " \t Amount: " . $this->Moo->amount . "\n";
+    /*
+      This outputs the following
+      State: 6         Amount: 1000
+      State: 6         Amount: 0
+      State: 6         Amount: 0
+      State: 3         Amount: 1000
+
+    */
+  }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/749TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/749TestCase.php
new file mode 100644
index 000000000..a25bdac26
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/749TestCase.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Doctrine_Ticket_749_TestCase
+ *
+ * @package     Doctrine
+ * @author      David Brewer <dbrewer@secondstory.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ *
+ * This test case demonstrates a problem with column aggregation inheritance
+ * in Doctrine 0.9. The high level summary is that it is possible to make
+ * it work in general -- if class B is a subclass of class A, you can select
+ * from class A and get back objects of class B.  However, those objects do
+ * not have the related objects of class B, and in fact an exception is
+ * thrown when you try to access those related objects.
+ *
+ * This test case should not probably be applied to trunk and possibly not
+ * to 0.10 branch.  I'm not sure it's even possible to fix in 0.9 but it is
+ * an issue that keeps arising for me so it seemed worth a test case.
+ */
+
+class Doctrine_Ticket_749_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables = array('Parent749', 'Record749', 'RelatedRecord749');
+        parent::prepareTables();
+    }
+
+    public function prepareData() 
+    {
+        $record = new Record749();
+        $record['title'] = 'Test Record 1';
+        $record['Related']['content'] = 'Test Content 1';
+        $record->save();
+
+        $record = new Record749();
+        $record['title'] = 'Test Record 2';
+        $record['Related']['content'] = 'Test Content 2';
+        $record->save();
+    }
+
+    public function testSelectDataFromSubclassAsCollection()
+    {
+        $records = Doctrine_Query::create()->query('FROM Record749 r ORDER BY r.title', array());
+        
+        $this->verifyRecords($records);
+    }
+    
+    public function testSelectDataFromParentClassAsCollection()
+    {
+        
+        $records = Doctrine_Query::create()->query('FROM Parent749 p ORDER BY p.title', array());
+        $this->verifyRecords($records);
+    }
+
+    /**
+     * This method is used by both tests, as the collection of records should
+     * be identical for both of them if things are working properly.
+     */
+    private function verifyRecords ($records) {
+        $expected_values = array(
+            array('title'=>'Test Record 1', 'content'=>'Test Content 1'),
+            array('title'=>'Test Record 2', 'content'=>'Test Content 2'),
+        );
+
+        foreach ($records as $record) {
+            $this->assertTrue($record instanceof Record749);
+            $expected = array_shift($expected_values);
+            $this->assertEqual($record['title'], $expected['title']);
+            try {
+                $this->assertEqual($record['Related']['content'], $expected['content']);
+            } catch (Exception $e) {
+                $this->fail('Caught exception when trying to get related content: ' . $e->getMessage());
+            }
+        }        
+    }
+}
+
+class Parent749 extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('mytable');
+    $this->hasColumn('id', 'integer', 4, array (
+      'primary' => true,
+      'autoincrement' => true,
+      'notnull' => true,
+    ));
+
+    $this->hasColumn('title', 'string', 255, array ());
+    $this->hasColumn('type', 'integer', 11, array ());
+
+    $this->setSubclasses(array('Record749' => array('type' => 1)));
+  }
+
+  public function setUp()
+  {
+  }
+}
+
+class Record749 extends Parent749
+{
+  public function setTableDefinition()
+  {
+    parent::setTableDefinition();
+    $this->setTableName('mytable');
+  }
+
+  public function setUp()
+  {
+    parent::setUp();
+    $this->hasOne('RelatedRecord749 as Related', array('local' => 'id',
+                                                    'foreign' => 'record_id'));
+  }
+}
+
+class RelatedRecord749 extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->hasColumn('id', 'integer', 4, array (
+      'primary' => true,
+      'autoincrement' => true,
+      'notnull' => true,
+    ));
+
+    $this->hasColumn('content', 'string', 255, array ());
+    $this->hasColumn('record_id', 'integer', null, array ('unique' => true,));
+  }
+
+  public function setUp()
+  {
+    $this->hasOne('Record749 as Record', array('local' => 'record_id',
+                                  'foreign' => 'id',
+                                  'onDelete' => 'cascade'));
+  }
+
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/753TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/753TestCase.php
new file mode 100644
index 000000000..42f4ef068
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/753TestCase.php
@@ -0,0 +1,63 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_753_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_753_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $origOptions = $this->conn->getAttribute(Doctrine_Core::ATTR_DEFAULT_COLUMN_OPTIONS);
+        $this->conn->setAttribute(Doctrine_Core::ATTR_DEFAULT_COLUMN_OPTIONS, array('type' => 'string', 'length' => 255, 'notnull' => true));
+
+        $origIdOptions = $this->conn->getAttribute(Doctrine_Core::ATTR_DEFAULT_IDENTIFIER_OPTIONS);
+        $this->conn->setAttribute(Doctrine_Core::ATTR_DEFAULT_IDENTIFIER_OPTIONS, array('name' => '%s_id', 'length' => 25, 'type' => 'string', 'autoincrement' => false));
+
+        $userTable = Doctrine_Core::getTable('Ticket_753_User');
+
+        $definition = $userTable->getDefinitionOf('username');
+        $this->assertEqual($definition, array('type' => 'string', 'length' => 255, 'notnull' => true));
+
+        $definition = $userTable->getDefinitionOf('ticket_753__user_id');
+        $this->assertEqual($definition, array('type' => 'string', 'length' => 25, 'autoincrement' => false, 'primary' => true, 'notnull' => true));
+
+        $this->conn->setAttribute(Doctrine_Core::ATTR_DEFAULT_COLUMN_OPTIONS, $origOptions);
+        $this->conn->setAttribute(Doctrine_Core::ATTR_DEFAULT_IDENTIFIER_OPTIONS, $origIdOptions);
+    }
+}
+
+class Ticket_753_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username');
+        $this->hasColumn('password');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/7745TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/7745TestCase.php
new file mode 100644
index 000000000..5917c8c2d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/7745TestCase.php
@@ -0,0 +1,116 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_7745_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_7745_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'RecordTest1';
+        $this->tables[] = 'RecordTest2';
+        parent::prepareTables();
+    }
+
+    public function testDqlCallbacks()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+
+        $table = Doctrine_Core::getTable('RecordTest2');
+        $table->addRecordListener(new RecordTest2Listener());
+
+        $test2 = new RecordTest2();
+        $test2->name = 'test';
+
+        $test1 = new RecordTest1();
+        $test1->name = 'test';
+        $test1->RecordTest2 = $test2;
+        $test1->save();
+        
+        $id = $test2->id;
+        $test2->free();
+
+        $test2 = Doctrine_Core::getTable('RecordTest2')
+            ->createQuery('a')
+            ->select('a.id')
+            ->where('a.id = ?', $id)
+            ->fetchOne();
+
+        $test2->load();
+
+        $this->assertTrue($test2->RecordTest1 instanceof Doctrine_Collection);
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+    }
+}
+
+class RecordTest1 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string');
+        $this->hasColumn('record_test2_id', 'integer');
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('RecordTest2', array(
+            'local' => 'record_test2_id',
+            'foreign' => 'id'
+        ));
+    }
+}
+
+class RecordTest2 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string');
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('RecordTest1', array(
+            'local' => 'id',
+            'foreign' => 'record_test2_id'
+        ));
+    }
+}
+
+class RecordTest2Listener extends Doctrine_Record_Listener
+{
+    public function preDqlSelect(Doctrine_Event $event)
+    {
+        $params = $event->getParams();
+        $alias = $params['alias'];
+
+        $event->getQuery()->leftJoin($alias . '.RecordTest1');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/786TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/786TestCase.php
new file mode 100644
index 000000000..e328eae53
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/786TestCase.php
@@ -0,0 +1,58 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_786_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_786_TestCase extends Doctrine_UnitTestCase 
+{
+  public function testConflictingQueriesHydration()
+  {
+    // Query for the User with Phonenumbers joined in
+    // So you can access User->Phonenumber instanceof Doctrine_Collection
+    $query = new Doctrine_Query();
+    $query->from('User u, u.Phonenumber p');
+    
+    $user1 = $query->execute()->getFirst();
+    
+    // Now query for the same data, without the Phonenumber
+    $query = new Doctrine_Query();
+    $query->from('User u');
+    
+    $user2 = $query->execute()->getFirst();
+    
+    // Now if we try and see if Phonenumber is present in $user1 after the 2nd query
+    if ( ! isset($user1->Phonenumber))
+    {
+      $this->fail('Phonenumber overwritten by 2nd query hydrating');
+    } else {
+      $this->pass();
+    }
+  }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/832TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/832TestCase.php
new file mode 100644
index 000000000..61123b704
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/832TestCase.php
@@ -0,0 +1,100 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_832_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_832_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $manager = Doctrine_Manager::getInstance();
+        $manager->setImpl('Ticket_832_UserTemplate', 'Ticket_832_User')
+                ->setImpl('Ticket_832_EmailTemplate', 'Ticket_832_Email');
+
+        $this->tables[] = 'Ticket_832_User';
+        $this->tables[] = 'Ticket_832_Email';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        try {
+            $user = new Ticket_832_User();
+            $user->name = 'test';
+            $user->save();
+            $this->assertEqual($user->name, 'test');
+            $this->assertTrue($user->id > 0);
+            $this->pass();
+        } catch (Doctrine_Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+}
+
+class Ticket_832_UserTemplate extends Doctrine_Template
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string');
+    }
+    public function setUp()
+    {
+        $this->hasMany('Ticket_832_EmailTemplate as Email', array('local' => 'id', 'foreign' => 'user_id'));
+    }
+}
+
+class Ticket_832_EmailTemplate extends Doctrine_Template
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('address', 'string');
+        $this->hasColumn('user_id', 'integer');
+    }
+    public function setUp()
+    {
+        $this->hasOne('Ticket_832_UserTemplate as User', array('local' => 'user_id', 'foreign' => 'id'));
+    }
+}
+
+class Ticket_832_User extends Doctrine_Record
+{
+    public function setUp()
+    {
+        $this->actAs('Ticket_832_UserTemplate');
+    }
+}
+
+class Ticket_832_Email extends Doctrine_Record
+{
+    public function setUp()
+    {
+        $this->actAs('Ticket_832_EmailTemplate');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/838TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/838TestCase.php
new file mode 100644
index 000000000..7c7e0e850
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/838TestCase.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Doctrine_Ticket_838_TestCase
+ *
+ * @package     Doctrine
+ * @author      Jani Hartikainen <firstname at codeutopia net>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @version     $Revision$
+ */
+
+class Doctrine_Ticket_838_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'NestedSetTest_SingleRootNode';
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+
+    }
+    
+    /**
+     * Test that the old root is placed correctly under the new root
+     */
+    public function testMoveRoot()
+    {
+        $node = new NestedSetTest_SingleRootNode();
+        $node->name = 'oldroot';
+        $tree = $this->conn->getTable('NestedSetTest_SingleRootNode')->getTree();
+        $tree->createRoot($node);
+        
+        $oldRoot = $node->copy();
+        // detach the node, so that it can be inserted as a new node
+        $oldRoot->getNode()->detach();
+        
+        $node->getNode()->delete();
+        
+        $this->assertTrue($oldRoot !== $node);
+        $this->assertEqual(0, $oldRoot['lft']);
+        $this->assertEqual(0, $oldRoot['rgt']);
+        $this->assertEqual(0, $oldRoot['level']);
+        
+        $newRoot = new NestedSetTest_SingleRootNode();
+        $newRoot->name = 'newroot';
+        $tree->createRoot($newRoot);
+        $this->assertEqual(1, $newRoot['lft']);
+        $this->assertEqual(2, $newRoot['rgt']);
+        $this->assertEqual(0, $newRoot['level']);
+        
+        $oldRoot->getNode()->insertAsFirstChildOf($newRoot);
+        
+        $this->assertEqual(2, $oldRoot['lft']);
+        $this->assertEqual(3, $oldRoot['rgt']);
+        $this->assertEqual(1, $oldRoot['level']);
+        
+        $newRoot->refresh();
+        
+        $this->assertEqual(1, $newRoot['lft']);
+        $this->assertEqual(4, $newRoot['rgt']);
+        $this->assertEqual(0, $newRoot['level']);
+		
+        $children = $newRoot->getNode()->getChildren();
+        $oldRoot = $children[0];
+	
+        $this->assertEqual(2, $oldRoot['lft']);
+        $this->assertEqual(3, $oldRoot['rgt']);
+        $this->assertEqual(1, $oldRoot['level']);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/867TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/867TestCase.php
new file mode 100644
index 000000000..99f174934
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/867TestCase.php
@@ -0,0 +1,85 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_867_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_867_TestCase extends Doctrine_UnitTestCase 
+{
+  public function prepareTables()
+  {
+    $this->tables[] = 'T867_Section';
+    parent::prepareTables();
+  }
+  
+  public function testTicket()
+  {
+      try {
+          $s = new T867_Section();
+          $s->name = 'Test name';
+          $s->Translation['en']->title = 'Test title';
+          $s->Translation['en']->summary = 'Test summary';
+          $s->save();
+          
+          $this->assertTrue($s->id > 0);
+          $this->assertEqual($s->name, 'Test name');
+          $this->assertEqual($s->Translation['en']->title, 'Test title');
+          $this->assertEqual($s->Translation['en']->summary, 'Test summary');
+          $this->assertEqual($s->Translation->getTable()->getOption('type'), $s->getTable()->getOption('type'));
+          $this->assertEqual($s->Translation->getTable()->getOption('collate'), $s->getTable()->getOption('collate'));
+          $this->assertEqual($s->Translation->getTable()->getOption('charset'), $s->getTable()->getOption('charset'));
+          $this->pass();
+      } catch (Exception $e) {
+          $this->fail($e->getMessage());
+      }
+  }
+}
+
+
+class T867_Section extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('section');
+    $this->hasColumn('id', 'integer', 4, array('primary' => true, 'autoincrement' => true));
+    $this->hasColumn('name', 'string', 60, array('notnull' => true));
+    $this->hasColumn('title', 'string', 60, array('notnull' => true));
+    $this->hasColumn('summary', 'string', 255);
+    
+    $this->option('type', 'INNODB');
+    $this->option('collate', 'utf8_unicode_ci');
+    $this->option('charset', 'utf8');
+  }
+  
+  public function setUp()
+  {
+    parent::setUp();
+    $this->actAs('I18n', array('fields' =>  array(  0 => 'title',   1 => 'summary', ), 'className' => '%CLASS%_i18n'));
+  }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/876TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/876TestCase.php
new file mode 100644
index 000000000..0ba4ef10b
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/876TestCase.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Doctrine_Ticket_SegmentationFault_TestCase
+ *
+ * @package     Doctrine
+ * @author      Tiago Ribeiro <tiago.ribeiro@gmail.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ *
+ */
+
+class Doctrine_Ticket_876_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables = array('Profile', 'Person', 'sfGuardUser');
+
+        parent::prepareTables();
+    }
+
+    public function prepareData() 
+    {
+    }
+
+    public function newPerson($name)
+    {
+      // Creating sfGuardUser
+      $guardUser = new sfGuardUser();
+
+      $guardUser->set('name', $name);
+
+      $guardUser->save();
+
+      // Creating the Person
+      $person = new Person();
+
+      $person->set('name', $name);
+      $person->set('sf_guard_user_id', $guardUser['id']);
+
+      $person->save();
+
+      return $person;
+    }
+
+    public function newProfile($name, $person)
+    {
+      $profile = new Profile();
+
+      $profile->set('name', $name);
+      $profile->set('person_id', $person['id']);
+
+      $profile->save();
+
+      return $profile;
+    }
+
+    public function testBug() 
+    {
+      $person = $this->newPerson('Fixe');
+      $profile = $this->newProfile('Work', $person);
+
+      $guardUser = $person->get('sfGuardUser');
+      $id = $guardUser->get('id');
+      
+      $guardUser->free();
+      
+      $query = new Doctrine_Query();
+
+      $query->select('s.*, p.*, ps.*');
+      $query->from('sfGuardUser s');
+      $query->innerJoin('s.Person p');
+      $query->leftJoin('p.Profiles ps');
+      $query->where('s.id = ?', $id);
+
+      $user = $query->fetchOne();
+      $array = $user->toArray(true);
+      
+      $this->assertEqual($array['id'], 1);
+      $this->assertEqual($array['name'], 'Fixe');
+      $this->assertTrue(isset($array['Person']['Profiles'][0]));
+    }
+}
+
+class Person extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('person');
+    $this->hasColumn('id', 'integer', 11, array('primary' => true, 'autoincrement' => true));
+    $this->hasColumn('name', 'string', 255);
+    $this->hasColumn('sf_guard_user_id', 'integer', 4);
+  }
+
+  public function setUp()
+  {
+    parent::setUp();
+    $this->hasMany('Profile as Profiles', array('local' => 'id',
+                                                'foreign' => 'person_id'));
+    $this->hasOne('sfGuardUser', array('local' => 'sf_guard_user_id',
+                                       'foreign' => 'id',
+                                       'onDelete' => 'CASCADE'));
+  }
+}
+
+class Profile extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('profile');
+    $this->hasColumn('id', 'integer', 11, array('primary' => true, 'autoincrement' => true));
+    $this->hasColumn('name', 'string', 150);
+    $this->hasColumn('person_id', 'integer', 11);
+  }
+
+  public function setUp()
+  {
+    parent::setUp();
+    $this->hasOne('Person', array('local' => 'person_id',
+                                'foreign' => 'id'));
+  }
+}
+
+class sfGuardUser extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('sf_guard_user');
+    $this->hasColumn('id', 'integer', 4, array('primary' => true, 'autoincrement' => true));
+    $this->hasColumn('name', 'string', 128, array('notnull' => true, 'unique' => true));
+  }
+
+  public function setUp()
+  {
+    parent::setUp();
+    $this->hasOne('Person', array('local' => 'id',
+                                  'foreign' => 'sf_guard_user_id'));
+  }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/889TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/889TestCase.php
new file mode 100644
index 000000000..ab246b5d8
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/889TestCase.php
@@ -0,0 +1,203 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_889_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_889_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = "Ticket_889";
+        $this->tables[] = "Ticket_889_Relationship";
+        parent::prepareTables();
+    }
+
+	public function prepareData() 
+    { }
+
+	public function testManyTreeRelationWithSelfRelation_Children() {
+
+        $component = new Ticket_889();
+
+        try {
+            $rel = $component->getTable()->getRelation('Children');
+
+            $this->pass();
+        } catch(Doctrine_Exception $e) {
+
+            $this->fail();
+        }
+        $this->assertEqual(get_class($rel), 'Doctrine_Relation_Nest');
+
+        $this->assertTrue($component->Children instanceof Doctrine_Collection);
+        $this->assertTrue($component->Children[0] instanceof Ticket_889);
+    }
+
+	public function testManyTreeRelationWithSelfRelation_Parents() {
+
+        $component = new Ticket_889();
+
+        try {
+            $rel = $component->getTable()->getRelation('Parents');
+
+            $this->pass();
+        } catch(Doctrine_Exception $e) {
+
+            $this->fail();
+        }
+        $this->assertEqual(get_class($rel), 'Doctrine_Relation_Nest');
+
+        $this->assertTrue($component->Parents instanceof Doctrine_Collection);
+        $this->assertTrue($component->Parents[0] instanceof Ticket_889);
+    }
+
+	public function testInitData() 
+    {
+        $test = new Ticket_889();
+		$test->table_name = 'Feature';
+		$test->save();
+		
+		$test3 = new Ticket_889();
+		$test3->table_name = 'Application';
+		$test3->save();
+
+		$test2 = new Ticket_889();
+		$test2->table_name = 'Module';
+		$test2->Children[0] = $test;
+		$test2->Parents[0] = $test3;
+		$test2->save();
+    }
+}
+
+class Ticket_889 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        // set Table Name
+        $this->setTableName('Ticket_889');
+
+        // set table type
+        $this->option('type', 'INNODB');
+
+        // set character set
+    	$this->option('charset', 'utf8');
+
+        // id
+        $this->hasColumn(
+    			'id', 	
+    			'integer', 	
+    			10, 	
+    			array(	'primary' => true,
+    					'unsigned' => true, 	
+    					'autoincrement' => true	
+    			)
+    	);
+
+        // table_name
+        $this->hasColumn(	
+    			'table_name', 
+    			'string', 
+    			100, 
+    			array(	'notnull' => true, 	
+    					'notblank' =>true, 
+    					'unique' => true 
+    			)
+    	);
+
+    }
+
+    public function setUp()
+    {
+        // Ticket_889_Relationship child_id
+       	$this->hasMany(
+			'Ticket_889 as Parents', 
+			array(	'local' => 'child_id',
+					'foreign' => 'parent_id', 
+					'refClass' => 'Ticket_889_Relationship'	
+			) 
+		);
+
+        // Ticket_889_Relationship parent_id
+        $this->hasMany(
+			'Ticket_889 as Children', 
+			array(	'local' => 'parent_id',
+					'foreign' => 'child_id', 
+					'refClass' => 'Ticket_889_Relationship'
+			) 
+		);
+
+       }
+}
+
+class Ticket_889_Relationship extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        // set Table Name
+        $this->setTableName('Ticket_889_Relationship');
+
+        // set table type
+        $this->option('type', 'INNODB');
+
+           // set character set
+    		$this->option('charset', 'utf8');
+
+        // parent_id
+        $this->hasColumn(
+    		'parent_id', 
+    		'integer', 
+    		10,
+    		array( 	'primary' => true, 
+    				'unsigned' => true 
+    		)
+    	);
+
+        // child_id
+        $this->hasColumn(
+    		'child_id', 
+    		'integer', 
+    		10, 
+    		array( 	'primary' => true, 
+    				'unsigned' => true 
+    		)
+    	);
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_889 as Parent', array('local'     => 'parent_id',
+                                                    'foreign'   => 'id',
+                                                    'onDelete'  => 'CASCADE'));
+
+        $this->hasOne('Ticket_889 as Child', array('local'     => 'child_id',
+                                                   'foreign'   => 'id',
+                                                   'onDelete'  => 'CASCADE'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/894TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/894TestCase.php
new file mode 100644
index 000000000..d4b36995f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/894TestCase.php
@@ -0,0 +1,66 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_894_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_894_TestCase extends Doctrine_UnitTestCase {
+
+    public function prepareTables() {
+      $this->tables = array();
+      $this->tables[] = 'T894_Day';
+      parent::prepareTables();
+    }
+
+
+    public function prepareData() {}
+
+
+    public function testTicket()
+    {
+        $beginNumber = 1;
+        $endNumber = 3;
+        $query = Doctrine_Query::create()
+                ->from('T894_Day d')
+                ->where('d.number BETWEEN ? AND ?', array($beginNumber, $endNumber));
+        $this->assertEqual(' FROM T894_Day d WHERE d.number BETWEEN ? AND ?', $query->getDql());
+        $this->assertTrue(strstr($query->getSqlQuery(), 'BETWEEN ? AND ?'));
+    }
+}
+
+
+class T894_Day extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('t894_days');
+        $this->hasColumn('id', 'integer', 3, array('autoincrement' => true, 'unsigned' => true, 'primary' => true, 'notnull' => true));
+        $this->hasColumn('number', 'integer');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/904TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/904TestCase.php
new file mode 100644
index 000000000..292517793
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/904TestCase.php
@@ -0,0 +1,74 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_904_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_904_TestCase extends Doctrine_UnitTestCase 
+{
+  public function prepareTables()
+  {
+    $this->tables[] = 'T904_Section';
+    parent::prepareTables();
+  }
+  
+  public function testTicket()
+  {
+      try {
+          $s = new T904_Section();
+          $s->state('TDIRTY');
+          $s->Translation['en']->title = 'Test title';
+          $s->Translation['en']->summary = 'Test summary';
+          $s->save();
+          
+          $this->assertTrue($s->id > 0);
+          $this->assertEqual($s->Translation['en']->title, 'Test title');
+          $this->assertEqual($s->Translation['en']->summary, 'Test summary');
+          $this->pass();
+      } catch (Exception $e) {
+          $this->fail($e->getMessage());
+      }
+  }
+}
+
+class T904_Section extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->hasColumn('id', 'integer', 4, array('primary' => true, 'autoincrement' => true));
+    $this->hasColumn('title', 'string', 60, array('notnull' => true));
+    $this->hasColumn('summary', 'string', 255);
+  }
+  
+  public function setUp()
+  {
+    parent::setUp();
+    $this->actAs('I18n', array('fields' =>  array(  0 => 'title',   1 => 'summary', ), 'className' => '%CLASS%_i18n'));
+  }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/912TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/912TestCase.php
new file mode 100644
index 000000000..1b940ebb6
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/912TestCase.php
@@ -0,0 +1,283 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_912_TestCase
+ *
+ * @package     Doctrine
+ * @author      David Stendardi <david.stendardi@adenclassifieds.com>
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_912_TestCase extends Doctrine_UnitTestCase {
+
+  /**
+   * prepareData
+   */
+	
+    public function prepareData()
+    {
+	    $oResume = new ticket912_Resume;
+	    $oResume->title = 'titre';
+	    $oResume->Person->name = 'David';
+	    $oResume->KnownLanguages[0]->comments = 'foo';
+	    $oResume->KnownLanguages[0]->Language->label = "Enlish";
+	    $oResume->KnownLanguages[0]->Level->label = "Fluent";
+	    $oResume->save();
+    }
+    
+    /**
+     * prepareTables
+     */
+    
+    public function prepareTables()
+    {
+    	$this->tables = array();
+    	$this->tables[] = 'ticket912_Resume';
+    	$this->tables[] = 'ticket912_Person';
+    	$this->tables[] = 'ticket912_ResumeHasLanguage';
+    	$this->tables[] = 'ticket912_LanguageLevel';
+    	$this->tables[] = 'ticket912_Language';
+    	
+    	parent :: prepareTables();
+    }
+	
+    
+    /**
+     * Test the existence expected indexes
+     */
+    
+    public function testTicket()
+    {
+        $q = new Doctrine_Query();
+
+        // simple query with deep relations
+        $q->addSelect('Resume.id, Person.id, Person.name, KnownLanguages.id, Level.label, Language.label')
+          ->from('ticket912_Resume Resume')
+          ->leftJoin('Resume.Person Person')
+          ->leftJoin('Resume.KnownLanguages KnownLanguages')
+          ->leftJoin('KnownLanguages.Level Level')
+          ->leftJoin('KnownLanguages.Language Language');
+        
+        $aResult = $q->fetchArray();
+
+        // should be setted..
+    	$issetLevel = isset($aResult[0]['KnownLanguages'][0]['Level']);
+        $issetLanguage = isset($aResult[0]['KnownLanguages'][0]['Language']);
+        
+        $this->assertTrue($issetLevel);
+        $this->assertTrue($issetLanguage);
+    
+    }
+}
+
+
+/**
+ * This class has been auto-generated by the Doctrine ORM Framework
+ */
+
+class ticket912_Resume extends Doctrine_Record
+{
+	/**
+   * setTableDefinition
+   */
+	
+  public function setTableDefinition()
+  {
+    $this->setTableName('resume');
+    $this->hasColumn('id', 'integer', 8, array (
+		  'primary' => true,
+		  'autoincrement' => true,
+		  'unsigned' => true,
+		  ));
+
+    $this->hasColumn('person_id', 'integer', 8, array('unsigned' => true));
+    $this->hasColumn('title', 'string', 255);
+  }
+
+  /**
+   * setUp
+   */
+  
+  public function setUp()
+  {
+    $this->hasMany('ticket912_ResumeHasLanguage as KnownLanguages', array('local' => 'id', 'foreign' => 'resume_id'));
+    
+    $this->hasOne('ticket912_Person as Person', array(
+      'local' => 'person_id',
+      'foreign' => 'id',    
+      'onDelete' => 'SET NULL',
+      'onUpdate' => 'CASCADE'
+      ));
+  } 
+}
+
+/**
+ *  First level one to one relation class Language
+ */
+class ticket912_Person extends Doctrine_Record
+{	
+  /**
+   * setTableDefinition
+   */
+ 
+  public function setTableDefinition()
+  {
+    $this->setTableName('person');
+    $this->hasColumn('id', 'integer', 8, array (
+      'primary' => true,
+      'autoincrement' => true,
+      'unsigned' => true,
+      ));
+
+    $this->hasColumn('name', 'string', 255, array ());
+  } 
+}
+
+
+/**
+ *  Second level one to many relation class ResumeHasLanguageLanguage
+ */
+
+class ticket912_ResumeHasLanguage extends Doctrine_Record
+{
+  /**
+   * setTableDefinition
+   */
+	
+  public function setTableDefinition()
+  {
+    $this->setTableName('resume_has_language');
+    $this->hasColumn('id', 'integer', 8, array (
+		  'primary' => true,
+		  'autoincrement' => true,
+		  'unsigned' => true,
+		  ));
+
+    $this->hasColumn('resume_id', 'integer', 8, array (
+		  'notnull' => true,
+		  'unsigned' => true,
+		  ));
+
+    $this->hasColumn('language_id', 'integer', 2, array (
+      'unsigned' => true,
+      ));
+
+    $this->hasColumn('language_level_id', 'integer', 2, array (
+      'unsigned' => true,
+      ));
+    
+    $this->hasColumn('comments', 'string', 4000, array ());
+
+  }
+
+  /**
+   * setUp
+   */  
+  
+  public function setUp()
+  {
+    $this->hasOne('ticket912_Resume as Resume', array('local' => 'resume_id',
+                                  'foreign' => 'id',
+                                  'onDelete' => 'CASCADE',
+                                  'onUpdate' => 'CASCADE'));
+
+    $this->hasOne('ticket912_Language as Language', array('local' => 'language_id',
+                                    'foreign' => 'id',
+                                    'onDelete' => 'CASCADE',
+                                    'onUpdate' => 'CASCADE'));
+
+    $this->hasOne('ticket912_LanguageLevel as Level', array('local' => 'language_level_id',
+                                                  'foreign' => 'id',
+                                                  'onDelete' => 'SET NULL',
+                                                  'onUpdate' => 'CASCADE'));
+  } 
+}
+
+
+
+/**
+ *  Third level one to one relation class Language
+ */
+class ticket912_Language extends Doctrine_Record
+{
+  /**
+   * setTableDefinition
+   */  
+	
+	public function setTableDefinition()
+  {
+  	$this->setTableName('language');
+    $this->hasColumn('id', 'integer', 2, array(
+      'primary' => true,
+      'autoincrement' => true,
+      'unsigned' => true,
+      ));
+
+    $this->hasColumn('label', 'string', 100, array ('notnull' => true));
+  }
+
+  /**
+   * setup
+   */  
+  
+  public function setUp()
+  {
+    $this->hasMany('ticket912_Resume as Resumes', array('local' => 'id', 'foreign' => 'language_id'));
+    $this->hasMany('ticket912_ResumeHasLanguage as ResumeKnownLanguages', array('local' => 'id', 'foreign' => 'language_id'));
+  } 
+}
+
+/**
+ * Third level one to one relation class Language
+ */
+
+class ticket912_LanguageLevel extends Doctrine_Record
+{
+  /**
+   * setTableDefinition
+   */  
+	
+	public function setTableDefinition()
+  {
+    $this->setTableName('language_level');
+    $this->hasColumn('id', 'integer', 2, array (
+		  'primary' => true,
+		  'autoincrement' => true,
+		  'unsigned' => true,
+		  ));
+
+    $this->hasColumn('label', 'string', 100, array ('notnull' => true));
+  }
+
+  /**
+   * setUp
+   */  
+  
+  public function setUp()
+  {
+    $this->hasMany('ticket912_ResumeHasLanguage as ResumeKnownLanguages', array(
+      'local'   => 'id',
+      'foreign' => 'language_level_id'));
+  }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/915TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/915TestCase.php
new file mode 100644
index 000000000..c73ca976a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/915TestCase.php
@@ -0,0 +1,75 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_915_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_915_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData() { }
+    public function prepareTables()
+    {
+        $this->tables[] = 'Account';
+        parent::prepareTables();    
+    }
+
+    public function testBug()
+    {
+        $yml = <<<END
+---
+Account:
+  A1:
+    Amount: 100
+  A2:
+    amount: 200
+  A3:
+    Amount: 300
+  A4:
+    Entity_id: -100
+  A5:
+    entity_id: -200
+  A6:
+    Entity_id: -300
+END;
+
+        file_put_contents('test.yml', $yml);
+        $import = new Doctrine_Data_Import('test.yml');
+        $import->setFormat("yml");
+
+        // try to import garbled records (with incorrect field names,
+        // e.g. "Amount" instead of "amount") and expect that doctrine
+        // will raise an exception.
+        try {
+            $import->doImport();
+            $this->fail('Doctrine did not raise any exceptions when were importing garbled records.');
+        } catch (Exception $e) {
+            $this->pass();
+        }
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/923TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/923TestCase.php
new file mode 100644
index 000000000..f16090e9f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/923TestCase.php
@@ -0,0 +1,102 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket923_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_923_TestCase extends Doctrine_UnitTestCase {
+
+    public function prepareData()
+    {
+        $d = new T923_Diagnostic();
+        $d->id_type = 101;
+        $d->id = 26;
+        $d->diagnostic_id = 75444;
+        $d->diag_timestamp = '2008-03-27 12:00:00';
+        $d->operator_id = 1001;
+        $d->save();
+
+        $d = new T923_Diagnostic();
+        $d->id_type = 101;
+        $d->id = 27;
+        $d->diagnostic_id = 75445;
+        $d->diag_timestamp = '2008-03-27 13:00:00';
+        $d->operator_id = 1001;
+        $d->save();
+
+        $d = new T923_Diagnostic();
+        $d->id_type = 101;
+        $d->id = 28;
+        $d->diagnostic_id = 75445;
+        $d->diag_timestamp = '2008-03-27 14:00:00';
+        $d->operator_id = 1001;
+        $d->save();
+    }
+
+    public function prepareTables() {
+        $this->tables[] = 'T923_Diagnostic';
+        parent::prepareTables();
+    }
+
+    public function testTicket()
+    {
+        try {
+          $q = new Doctrine_Query();
+          $result = $q->select('d.*')
+          ->from('T923_Diagnostic d')
+          ->where('d.diag_timestamp >= ? AND d.diag_timestamp <= ?', array('2008-03-27 00:00:00', '2008-03-27 23:00:00'))
+          ->addWhere('d.id_type = ?', array('101'))
+          ->orderBy('d.diag_timestamp')
+          ->limit(20)
+          ->offset(0)
+          ->execute();
+          
+          $this->assertEqual($result->count(), 3);
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+}
+
+class T923_Diagnostic extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+      $this->setTableName('diagnostics');
+      $this->hasColumn('id_type', 'integer', 4);
+      $this->hasColumn('id', 'integer', 4);
+      $this->hasColumn('diagnostic_id', 'integer', 4);
+      $this->hasColumn('operator_id', 'integer', 4);
+      $this->hasColumn('diag_timestamp', 'timestamp', null);
+  }
+
+  public function setUp()
+  {
+  }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/927TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/927TestCase.php
new file mode 100644
index 000000000..3a485e895
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/927TestCase.php
@@ -0,0 +1,63 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_927_TestCase
+ *
+ * @package     Doctrine
+ * @author      David Stendardi <david.stendardi@adenclassifieds.com>
+ * @category    Query
+ * @link        www.doctrine-project.org
+ * @since       0.10.4
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_927_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData()
+    {
+        $oEmail = new Email;
+        $oEmail->address = 'david.stendardi@adenclassifieds.com';
+        $oEmail->save();
+    }
+
+    public function prepareTables()
+    {
+        $this->tables = array();
+        $this->tables[] = 'Email';
+
+        parent :: prepareTables();
+    }
+
+    public function testTicket()
+    {
+      $q = new Doctrine_Query();
+
+      try {
+          // simple query with deep relations
+          $q->update('Email')
+              ->set('address', '?', 'new@doctrine.org')
+              ->where('address = ?', 'david.stendardi@adenclassifieds.com')
+              ->execute();
+      } catch (Exception $e) {
+        $this->fail('Query :: set do not support values containing dot. Exception: ' . $e->getMessage());
+      }
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/929TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/929TestCase.php
new file mode 100644
index 000000000..30729caa7
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/929TestCase.php
@@ -0,0 +1,175 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_929_TestCase
+ *
+ * @package     Doctrine
+ * @author      David Stendardi <david.stendardi@adenclassifieds.com>
+ * @category    Hydration
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_929_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareData()
+    {	   
+        $oPerson = new T929_Person;
+        $oPerson->name = 'Jonathan';
+        $oPerson->Country->code = 'us';
+        $oPerson->Country->Translation['fr']->name = 'Etats Unis';
+        $oPerson->Country->Translation['en']->name = 'United states';         
+        $oPerson->save();
+
+        parent::prepareData();
+    }
+ 
+    public function prepareTables()
+    {
+        $this->tables = array();
+        $this->tables[] = 'T929_Person';
+        $this->tables[] = 'T929_Country';
+        $this->tables[] = 'T929_JobPosition';
+        $this->tables[] = 'T929_JobCategory';
+
+        parent::prepareTables();
+    }
+  
+    public function testTicket()
+    {
+        try { 
+            $q = new Doctrine_Query();
+            $r = $q
+                ->from('T929_Person P')
+                ->leftJoin('P.Country Ct')
+                ->leftJoin('Ct.Translation T1 WITH T1.lang = ?', 'fr')
+                ->leftJoin('P.JobPositions J')
+                ->leftJoin('J.Category C')
+                ->leftJoin('C.Translation T2 WITH T2.lang = ?', 'fr')
+                ->where('P.name = ?', 'Jonathan')
+                ->fetchOne();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());        
+        }
+    }
+}
+
+class T929_Person extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('T929_person');
+        $this->hasColumn('country_id', 'integer');
+        $this->hasColumn('name', 'string', 200);
+    }
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->hasOne('T929_Country as Country', array(
+            'local' => 'country_id',
+            'foreign' => 'id',
+            'onDelete' => 'CASCADE'
+        ));
+
+        $this->hasMany('T929_JobPosition as JobPositions', array(
+            'local' => 'id',
+            'foreign' => 'person_id',
+            'onDelete' => 'CASCADE'
+        ));
+    }
+}
+
+class T929_Country extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('T929_country');
+        $this->hasColumn('name', 'string', 200);
+        $this->hasColumn('code', 'string', 200);
+    }
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->hasMany('T929_Person as Persons', array(
+            'local' => 'id',
+            'foreign' => 'country_id',
+            'onDelete' => 'CASCADE'
+        ));
+
+        $this->actAs('I18n', array('fields' => array('name')));
+    }
+}
+
+class T929_JobPosition extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('T929_address');
+        $this->hasColumn('name', 'string', 200);
+        $this->hasColumn('person_id', 'integer');
+        $this->hasColumn('job_category_id', 'integer');
+    }
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->hasOne('T929_Person as Person', array(
+            'local' => 'person_id',
+            'foreign' => 'id',
+            'onDelete' => 'CASCADE'
+        ));
+
+        $this->hasOne('T929_JobCategory as Category', array(
+            'local' => 'job_category_id',
+            'foreign' => 'id',
+            'onDelete' => 'CASCADE'
+        ));
+    }
+}
+
+class T929_JobCategory extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('job_category');
+        $this->hasColumn('code', 'integer', 4);
+        $this->hasColumn('name', 'string', 200);
+    }
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->hasMany('T929_JobPosition as Positions', array(
+            'local' => 'id',
+            'foreign' => 'job_category_id',
+            'onDelete' => 'CASCADE'
+        ));
+
+        $this->actAs('I18n', array('fields' => array('name')));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/930TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/930TestCase.php
new file mode 100644
index 000000000..95799c25d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/930TestCase.php
@@ -0,0 +1,171 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_930_TestCase
+ *
+ * @package     Doctrine
+ * @author      David Stendardi <david.stendardi@adenclassifieds.com>
+ * @category    Hydration
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_930_TestCase extends Doctrine_UnitTestCase {
+
+  /**
+   * prepareData
+   */
+
+  public function prepareData()
+  {
+    $oPerson = new T930_Person;
+    $oPerson->name = 'David';
+
+    $oCategory = new T930_JobCategory;
+    $oCategory->code = '1234';
+    $oCategory->Translation['fr']->name = 'Developpement';
+    $oCategory->Translation['en']->name = 'Development';
+     
+    $oPerson->JobPositions[0]->name = 'Webdeveloper';
+    $oPerson->JobPositions[0]->Category = $oCategory;
+     
+    $oPerson->JobPositions[1]->name = 'Webmaster';
+    $oPerson->JobPositions[1]->Category = $oCategory;
+
+    $oPerson->save();
+
+  }
+
+  /**
+   * prepareTables
+   */
+
+  public function prepareTables()
+  {
+    $this->tables = array();
+    $this->tables[] = 'T930_Person';
+    $this->tables[] = 'T930_JobPosition';
+    $this->tables[] = 'T930_JobCategory';
+     
+    parent :: prepareTables();
+  }
+
+
+  /**
+   * Test the existence expected indexes
+   */
+
+  public function testTicket()
+  {
+      $queryCountBefore = $this->conn->count();
+    try {
+      $q = new Doctrine_Query();
+      $r = $q
+      ->select('P.id, J.name, C.code, T.name')
+      ->from('T930_Person P')
+      ->leftJoin('P.JobPositions J')
+      ->leftJoin('J.Category C')
+      ->leftJoin('C.Translation T WITH T.lang = ?', 'fr')
+      ->fetchArray();
+    } catch (Exception $e) {
+      $this->fail($e->getMessage());
+    }
+    $this->assertEqual($queryCountBefore + 1, $this->conn->count());
+    $this->assertTrue(isset($r[0]['JobPositions'][0]['Category']['Translation']['fr']['name']));
+    $this->assertTrue(isset($r[0]['JobPositions'][1]['Category']['Translation']['fr']['name']));
+    $this->assertEqual($queryCountBefore + 1, $this->conn->count());
+  }
+}
+
+class T930_Person extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('T930_person');
+    $this->hasColumn('name', 'string', 200);
+  }
+
+  public function setUp()
+  {
+    parent :: setUp();
+
+    $this->hasMany('T930_JobPosition as JobPositions', array(
+      'local' => 'id',
+      'foreign' => 'person_id',
+      'onDelete' => 'CASCADE'
+      ));
+  }
+}
+
+
+class T930_JobPosition extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('T930_address');
+    $this->hasColumn('name', 'string', 200);
+    $this->hasColumn('person_id', 'integer');
+    $this->hasColumn('job_category_id', 'integer');
+  }
+
+  public function setUp()
+  {
+    parent :: setUp();
+    $this->hasOne('T930_Person as Person', array(
+      'local' => 'person_id',
+      'foreign' => 'id',
+      'onDelete' => 'CASCADE'
+      ));
+
+      $this->hasOne('T930_JobCategory as Category', array(
+      'local' => 'job_category_id',
+      'foreign' => 'id',
+      'onDelete' => 'CASCADE'
+      ));
+  }
+}
+
+class T930_JobCategory extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('job_category');
+    $this->hasColumn('code', 'integer', 4);
+    $this->hasColumn('name', 'string', 200);
+  }
+
+  public function setUp()
+  {
+    parent :: setUp();
+    $this->hasMany('T930_JobPosition as Positions', array(
+      'local' => 'id',
+      'foreign' => 'job_category_id',
+      'onDelete' => 'CASCADE'
+      ));
+
+      $this->actAs('I18n', array('fields' => array('name')));
+  }
+}
+
+
+
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/932TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/932TestCase.php
new file mode 100644
index 000000000..6798947b3
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/932TestCase.php
@@ -0,0 +1,40 @@
+<?php
+
+class Doctrine_Ticket_932_TestCase extends Doctrine_UnitTestCase
+{
+	public function prepareTables()
+	{
+		$this->tables[] = "UserNoAutoIncrement";
+		parent::prepareTables();
+	}
+
+	public function prepareData()
+	{
+	}
+
+	public function testInit()
+	{
+		$this->dbh = new Doctrine_Adapter_Mock('pgsql');
+		$this->conn = Doctrine_Manager::getInstance()->openConnection($this->dbh);
+		$this->assertEqual(Doctrine_Core::IDENTIFIER_NATURAL, $this->conn->getTable('UserNoAutoIncrement')->getIdentifierType());
+	}
+
+	public function testCreateNewUserNoAutoIncrement()
+	{
+		$newUser = new UserNoAutoIncrement();
+		$newUser->id = 1;
+		$newUser->display_name = "Mah Name";
+		$newUser->save();
+		$this->assertEqual(Doctrine_Record::STATE_CLEAN, $newUser->state());
+		$this->assertEqual(1, $newUser->id);
+	}
+}
+
+class UserNoAutoIncrement extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->hasColumn('id', 'integer', 4, array('primary' => true, 'autoincrement' => false, 'notnull' => true));
+		$this->hasColumn('display_name', 'string', 255, array('notnull' => true));
+	}
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/935TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/935TestCase.php
new file mode 100644
index 000000000..ace72df87
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/935TestCase.php
@@ -0,0 +1,83 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket935_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_935_TestCase extends Doctrine_UnitTestCase {
+
+    public function prepareData()
+    {
+        $d = new EnumUpdateBug();
+        $d->id = 1;
+        $d->save();
+    }
+
+    public function prepareTables() {
+        $this->tables[] = 'EnumUpdateBug';
+        parent::prepareTables();
+    }
+
+    public function testTicket()
+    {
+        try {
+          $q = new Doctrine_Query();
+          $q->update('EnumUpdateBug')
+            ->set('bla_id', '?', 5)
+            ->set('separator', '?', 'pipe')
+            ->where('id = 1')
+            ->execute();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+        
+        $q = new Doctrine_Query();
+        $row = $q->select('a.*')
+                 ->from('EnumUpdateBug a')
+                 ->where('a.id = 1')
+                 ->fetchOne();
+        
+        $this->assertEqual($row->bla_id, 5);
+    }
+}
+
+class EnumUpdateBug extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+      $this->setTableName('enumupdatebug');
+      $this->hasColumn('id', 'integer', 3, array('autoincrement' => true, 'unsigned' => true, 'primary' => true, 'notnull' => true));
+      $this->hasColumn('bla_id', 'integer', 2, array('unsigned' => true));
+      $this->hasColumn('separator', 'enum', 1, array('values' =>  array(  0 => 'comma',   1 => 'pipe', )));
+  }
+
+  public function setUp()
+  {
+  }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/941TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/941TestCase.php
new file mode 100644
index 000000000..2a66a147b
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/941TestCase.php
@@ -0,0 +1,194 @@
+<?php
+
+/**
+ * @author Donald Ball
+ */
+class Doctrine_Ticket_941_TestCase extends Doctrine_UnitTestCase
+{
+
+  public function prepareTables()
+  {
+    $this->tables = array('Site', 'Variable', 'SiteVarvalue');
+    parent::prepareTables();
+  }
+
+  public function prepareData()
+  {
+      $site = new Site();     
+      $site->site_id      = 1;
+      $site->site_domain  = 'site1'; 
+      $site->save();
+
+      $site = new Site();     
+      $site->site_id      = 2;
+      $site->site_domain  = 'site2'; 
+      $site->save();
+
+      $var  = new Variable(); 
+      $var->variable_id   = 1;
+      $var->variable_name = 'var1'; 
+      $var->save();
+
+      $var  = new Variable(); 
+      $var->variable_id   = 2;
+      $var->variable_name = 'var2'; 
+      $var->save();
+
+      $varval = new SiteVarvalue();
+      $varval->site_id        = 1;
+      $varval->variable_id    = 1;
+      $varval->varvalue_value = 'val1 dom1 var1';
+      $varval->save();
+
+      $varval = new SiteVarvalue();
+      $varval->site_id        = 1;
+      $varval->variable_id    = 2;
+      $varval->varvalue_value = 'val2 dom1 var2';
+      $varval->save();
+
+      $varval = new SiteVarvalue();
+      $varval->site_id        = 2;
+      $varval->variable_id    = 1;
+      $varval->varvalue_value = 'val3 dom2 var1';
+      $varval->save();
+
+      $varval = new SiteVarvalue();
+      $varval->site_id        = 2;
+      $varval->variable_id    = 2;
+      $varval->varvalue_value = 'val4 dom2 var2';
+      $varval->save();
+  }
+
+  public function testTicket()
+  {
+      $query = new Doctrine_Query();
+      $query = $query->from('Site s LEFT JOIN s.Variables v LEFT JOIN v.Values vv WITH vv.site_id = s.site_id');
+
+      $sites = $query->execute();
+      
+      $this->assertEqual('site1', $sites[0]->site_domain);
+      $this->assertEqual(2, count($sites));
+      
+      // this is important for the understanding of the behavior
+      $this->assertIdentical($sites[0]->Variables[0], $sites[1]->Variables[0]);
+      $this->assertIdentical($sites[0]->Variables[1], $sites[1]->Variables[1]);
+      $this->assertEqual(2, count($sites[0]->Variables[0]->Values));
+      $this->assertEqual(2, count($sites[1]->Variables[0]->Values));
+      $this->assertEqual(2, count($sites[0]->Variables[1]->Values));
+      $this->assertEqual(2, count($sites[1]->Variables[1]->Values));
+      // Here we see that there can be only one Values on each Variable object. Hence
+      // they end up with 2 objects each.
+      $this->assertEqual('val1 dom1 var1', $sites[0]->Variables[0]->Values[0]->varvalue_value);
+      $this->assertEqual('val3 dom2 var1', $sites[0]->Variables[0]->Values[1]->varvalue_value);
+      $this->assertEqual('val2 dom1 var2', $sites[0]->Variables[1]->Values[0]->varvalue_value);
+      $this->assertEqual('val4 dom2 var2', $sites[0]->Variables[1]->Values[1]->varvalue_value);
+      
+      $this->assertEqual('var1', $sites[0]->Variables[0]->variable_name);
+      $this->assertEqual('var1', $sites[1]->Variables[0]->variable_name);
+      
+      $this->assertEqual('var2', $sites[0]->Variables[1]->variable_name);
+      $this->assertEqual('var2', $sites[1]->Variables[1]->variable_name);
+      
+      
+      // now array hydration
+      
+      $sites = $query->fetchArray();
+      
+      $this->assertEqual('site1', $sites[0]['site_domain']);
+      $this->assertEqual('site2', $sites[1]['site_domain']);
+      $this->assertEqual(2, count($sites));
+      
+      // this is important for the understanding of the behavior
+      $this->assertEqual(1, count($sites[0]['Variables'][0]['Values']));
+      $this->assertEqual(1, count($sites[1]['Variables'][0]['Values']));
+      $this->assertEqual(1, count($sites[0]['Variables'][1]['Values']));
+      $this->assertEqual(1, count($sites[1]['Variables'][1]['Values']));
+      // Here we see that the Values collection of the *same* Variable object can have
+      // different contents when hydrating arrays
+      $this->assertEqual('val1 dom1 var1', $sites[0]['Variables'][0]['Values'][0]['varvalue_value']);
+      $this->assertEqual('val3 dom2 var1', $sites[1]['Variables'][0]['Values'][0]['varvalue_value']);
+      // Here we see that the Values collection of the *same* Variable object can have
+      // different contents when hydrating arrays
+      $this->assertEqual('val2 dom1 var2', $sites[0]['Variables'][1]['Values'][0]['varvalue_value']);
+      $this->assertEqual('val4 dom2 var2', $sites[1]['Variables'][1]['Values'][0]['varvalue_value']);
+      
+      $this->assertEqual('var1', $sites[0]['Variables'][0]['variable_name']);
+      $this->assertEqual('var1', $sites[1]['Variables'][0]['variable_name']);
+      
+      $this->assertEqual('var2', $sites[0]['Variables'][1]['variable_name']);
+      $this->assertEqual('var2', $sites[1]['Variables'][1]['variable_name']);
+      
+  }
+
+}
+
+abstract class BaseSite extends Doctrine_Record
+{
+
+  public function setTableDefinition()
+  {
+    $this->setTableName('_site');
+    $this->hasColumn('site_id', 'integer', 4, array('notnull' => true, 'primary' => true, 'autoincrement' => true));
+    $this->hasColumn('site_domain', 'string', 255, array('notnull' => true));
+  }
+
+  public function setUp()
+  {
+    parent::setUp();
+    $this->hasMany('Variable as Variables', array('refClass' => 'SiteVarvalue',
+                                                  'local' => 'site_id',
+                                                  'foreign' => 'variable_id'));
+  }
+
+}
+abstract class BaseVariable extends Doctrine_Record
+{
+
+  public function setTableDefinition()
+  {
+    $this->setTableName('_variable');
+    $this->hasColumn('variable_id', 'integer', 4, array('notnull' => true, 'primary' => true, 'autoincrement' => true));
+    $this->hasColumn('variable_name', 'string', 100, array('notnull' => true));
+  }
+
+  public function setUp()
+  {
+    parent::setUp();
+    $this->hasMany('Site as Sites', array('refClass' => 'SiteVarvalue',
+                                          'local' => 'variable_id',
+                                          'foreign' => 'site_id'));
+
+    $this->hasMany('SiteVarvalue as Values', array('local' => 'variable_id',
+                                                    'foreign' => 'variable_id'));
+  }
+
+}
+abstract class BaseSiteVarvalue extends Doctrine_Record
+{
+
+  public function setTableDefinition()
+  {
+    $this->setTableName('_site_varvalue');
+    $this->hasColumn('varvalue_id', 'integer', 4, array('notnull' => true, 'primary' => true, 'autoincrement' => true));
+    $this->hasColumn('site_id', 'integer', 4, array('notnull' => true));
+    $this->hasColumn('variable_id', 'integer', 4, array('notnull' => true));
+    $this->hasColumn('varvalue_value', 'string', null, array('notnull' => true));
+  }
+
+  public function setUp()
+  {
+    parent::setUp();
+    $this->hasOne('Variable as Variables', array('local' => 'variable_id',
+                                                 'foreign' => 'variable_id'));
+  }
+
+}
+class Site extends BaseSite
+{
+}
+class Variable extends BaseVariable
+{
+}
+class SiteVarvalue extends BaseSiteVarvalue
+{
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/950TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/950TestCase.php
new file mode 100755
index 000000000..fdafb9867
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/950TestCase.php
@@ -0,0 +1,88 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_950_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_950_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testInit()
+    {
+        $this->dbh = new Doctrine_Adapter_Mock('mysql');
+        $this->conn = Doctrine_Manager::getInstance()->openConnection($this->dbh);
+    }
+
+    public function testTest()
+    {
+        $sql = $this->conn->export->exportClassesSql(array('Ticket_950_AdresseRecord','Ticket_950_CountryRecord'));
+        $this->assertEqual(count($sql), 3);
+        $this->assertEqual($sql[0], 'CREATE TABLE country_record (id BIGINT NOT NULL AUTO_INCREMENT, iso VARCHAR(2) NOT NULL, name VARCHAR(80), printable_name VARCHAR(80), iso3 VARCHAR(3), numcode BIGINT, INDEX iso_idx (iso), PRIMARY KEY(id)) ENGINE = INNODB');
+        $this->assertEqual($sql[1], 'CREATE TABLE adresse_record (id BIGINT NOT NULL AUTO_INCREMENT, adresse VARCHAR(255), cp VARCHAR(60), ville VARCHAR(255), pays VARCHAR(2), INDEX pays_idx (pays), PRIMARY KEY(id)) ENGINE = INNODB');
+        $this->assertEqual($sql[2], 'ALTER TABLE adresse_record ADD CONSTRAINT adresse_record_pays_country_record_iso FOREIGN KEY (pays) REFERENCES country_record(iso)');
+    }
+}
+
+class Ticket_950_AdresseRecord extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->setTableName('adresse_record');
+		$this->hasColumn('id', 'integer', 20, array('notnull' => true,
+                                              'primary' => true,
+                                              'autoincrement' => true));
+
+		$this->hasColumn('adresse', 'string', 255);
+		$this->hasColumn('cp', 'string', 60);
+		$this->hasColumn('ville', 'string', 255);
+		$this->hasColumn('pays', 'string', 2);
+	}
+
+	public function setUp()
+	{
+		$this->hasOne('Ticket_950_CountryRecord as Country', array('local' => 'pays', 'foreign' => 'iso'));
+	}
+}
+
+class Ticket_950_CountryRecord extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->setTableName('country_record');
+		$this->hasColumn('id', 'integer', 11, array('notnull' => true,
+                                              'primary' => true,
+                                              'autoincrement' => true));
+
+		$this->hasColumn('iso', 'string', 2, array('notnull' => true));
+
+		$this->hasColumn('name', 'string', 80);
+		$this->hasColumn('printable_name', 'string', 80);
+		$this->hasColumn('iso3', 'string', 3);
+		$this->hasColumn('numcode', 'integer', 10);
+	}
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/952TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/952TestCase.php
new file mode 100644
index 000000000..7b9c220ca
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/952TestCase.php
@@ -0,0 +1,88 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_952_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_952_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_952_Parent';
+        $this->tables[] = 'Ticket_952_Child';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $parent = new Ticket_952_Parent();
+        $parent->name = 'Parent';
+        $parent->Children[0]->name = 'Child 1';
+        $parent->Children[1]->name = 'Child 2';
+        $parent->save();
+        $parent->free(true);
+
+        $profiler = new Doctrine_Connection_Profiler();
+        Doctrine_Manager::connection()->setListener($profiler);
+
+        $q = Doctrine_Query::create()
+                ->from('Ticket_952_Parent p')
+                ->leftJoin('p.Children c');
+        $parents = $q->execute();
+        $this->assertEqual($parents[0]['Children'][0]['Parent']->name, 'Parent'); // Invoked additional queries
+        $this->assertEqual($profiler->count(), 1);
+    }
+}
+
+class Ticket_952_Parent extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_952_Child as Children', array('local' => 'id', 'foreign' => 'parent_id'));
+    }
+}
+
+class Ticket_952_Child extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+        $this->hasColumn('parent_id', 'integer');
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_952_Parent as Parent', array('local' => 'parent_id', 'foreign' => 'id'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/963TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/963TestCase.php
new file mode 100644
index 000000000..88902e872
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/963TestCase.php
@@ -0,0 +1,82 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_963_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_963_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testInit()
+    {
+        $this->dbh = new Doctrine_Adapter_Mock('mysql');
+        $this->conn = Doctrine_Manager::getInstance()->openConnection($this->dbh);
+    }
+
+    public function testExportSql()
+    {
+        $sql = $this->conn->export->exportClassesSql(array('Ticket_963_User', 'Ticket_963_Email'));
+        $this->assertEqual(count($sql), 3);
+        $this->assertEqual($sql[0], 'CREATE TABLE ticket_963__user (id BIGINT AUTO_INCREMENT, username VARCHAR(255), password VARCHAR(255), PRIMARY KEY(id)) ENGINE = INNODB');
+        $this->assertEqual($sql[1], 'CREATE TABLE ticket_963__email (user_id INT, address2 VARCHAR(255), PRIMARY KEY(user_id)) ENGINE = INNODB');
+        $this->assertEqual($test = isset($sql[2]) ? $sql[2]:null, 'ALTER TABLE ticket_963__email ADD CONSTRAINT ticket_963__email_user_id_ticket_963__user_id FOREIGN KEY (user_id) REFERENCES ticket_963__user(id) ON DELETE CASCADE');
+    }
+}
+
+class Ticket_963_User extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->hasColumn('username', 'string', 255);
+    $this->hasColumn('password', 'string', 255);
+  }
+
+  public function setUp()
+  {
+    $this->hasOne('Ticket_963_Email as Email', array('local' => 'id',
+                                 'foreign' => 'user_id'));
+  }
+}
+
+class Ticket_963_Email extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->hasColumn('user_id', 'integer', 4, array('primary' => true));
+    $this->hasColumn('address2', 'string', 255);
+  }
+
+  public function setUp()
+  {
+    $this->hasOne('Ticket_963_User as User', array(
+                                'local' => 'user_id',
+                                'foreign' => 'id',
+                                'owningSide' => true,
+                                'onDelete' => 'CASCADE'));
+  }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/966TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/966TestCase.php
new file mode 100644
index 000000000..2a1d56de2
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/966TestCase.php
@@ -0,0 +1,194 @@
+<?php
+
+/**
+ * @author Donald Ball
+ */
+class Doctrine_Ticket_966_TestCase extends Doctrine_UnitTestCase
+{
+
+  public function prepareTables()
+  {
+    $this->tables = array('Semester', 'Course', 'Weekday', 'CourseWeekday');
+    parent::prepareTables();
+  }
+
+  public function prepareData()
+  {
+    $semester = new Semester();
+    $semester['name'] = 'Semester';
+    $semester->save();
+
+    foreach (array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday') as $name)
+    {
+      $weekday = new Weekday();
+      $weekday['name'] = $name;
+      $weekday->save();
+    }
+
+    for ($i=0; $i<3; $i++)
+    {
+      $course = new Course();
+      $course['name'] = 'Course ' . $i;
+      $course['Semester'] = $semester;
+      $course->save();
+      for ($w = 3; $w <6; $w++)
+      {
+        $cw = new CourseWeekday();
+        $cw['Course'] = $course;
+        $cw['weekday_id'] = $w;
+        $cw->save();
+      }
+    }
+  }
+
+  public function testArrayHydration()
+  {
+    $query = Doctrine_Query::create()
+      ->from('Semester s')
+      ->leftJoin('s.Courses c')
+      ->leftJoin('c.Weekdays cw');
+
+    $semesters = $query->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+    $semester = $semesters[0];    
+    
+    $this->assertAllWeekdaysArePopulated($semester);
+  }
+
+  public function testObjectHydration()
+  {
+    $query = Doctrine_Query::create()
+      ->from('Semester s')
+      ->leftJoin('s.Courses c')
+      ->leftJoin('c.Weekdays cw');
+
+    $semester = $query->execute()->getFirst();
+    
+    $weekdayOids = array();
+    foreach ($semester->Courses as $course) {
+        foreach ($course->Weekdays as $weekday) {
+            if ( ! in_array($weekday->getOid(), $weekdayOids)) {
+                $weekdayOids[] = $weekday->getOid();
+            }
+            $this->assertTrue(is_numeric($weekday->id));
+            $this->assertTrue(is_string($weekday->name));
+        }
+    }
+    // should be only 3 weekday objects in total
+    $this->assertEqual(3, count($weekdayOids));
+    
+    $queryCountBefore = $this->conn->count();
+    $this->assertAllWeekdaysArePopulated($semester);
+    $this->assertEqual($queryCountBefore, $this->conn->count());
+  }
+
+  public function testLazyObjectHydration()
+  {
+      // clear identity maps to make sure we're starting with a clean plate
+    $this->conn->getTable('Course')->clear();
+    $this->conn->getTable('Weekday')->clear();
+    $this->conn->getTable('Semester')->clear();
+    $query = Doctrine_Query::create()->from('Semester s');
+
+    $semester = $query->execute()->getFirst();
+    $queryCountBefore = $this->conn->count();
+    $this->assertAllWeekdaysArePopulated($semester);
+    // expecting 4 additional queries: 1 to fetch the courses for the only semester and
+    // 1 for each weekday collection for each of the three courses.
+    $this->assertEqual($queryCountBefore + 4, $this->conn->count());
+  }
+
+  private function assertAllWeekdaysArePopulated($semester)
+  {
+    foreach ($semester['Courses'] as $course)
+    {
+      foreach ($course['Weekdays'] as $weekday)
+      {
+            $this->assertTrue(is_numeric($weekday['id']));
+            $this->assertTrue(is_string($weekday['name']));
+      }
+    }
+  }
+
+}
+
+class Semester extends Doctrine_Record
+{
+
+  public function setTableDefinition()
+  {
+    $this->setTableName('semester');
+    $this->hasColumn('id', 'integer', 4, array('primary'=>'true', 'autoincrement'=>'true'));
+    $this->hasColumn('name', 'string', 255, array('notnull' => true));
+  }
+
+  public function setUp()
+  {
+    parent::setUp();
+    $this->hasMany('Course as Courses', array('local'=>'id', 'foreign'=>'semester_id'));
+  }
+
+}
+
+class Weekday extends Doctrine_Record
+{
+
+  public function setTableDefinition()
+  {
+    $this->setTableName('weekday');
+    $this->hasColumn('id', 'integer', 4, array('primary' => true, 'autoincrement' => true));
+    $this->hasColumn('name', 'string', 9, array('notnull' => true, 'unique' => true));
+  }
+
+  public function setUp()
+  {
+      // need to make the many-many bidirectional in order for the lazy-loading test to work.
+      // lazy-loading the weekdays ($course['Weekdays']) doesnt work when the relation is
+      // set up unidirectional. this is true for all many-many relations.
+      $this->hasMany('Course as courses', 
+        array('refClass'=>'CourseWeekday', 'local'=>'weekday_id', 'foreign'=>'course_id'));
+  }
+}
+
+class Course extends Doctrine_Record
+{
+
+  public function setTableDefinition()
+  {
+    $this->setTableName('course');
+    $this->hasColumn('id', 'integer', 4, array('primary'=>'true', 'autoincrement'=>'true'));
+    $this->hasColumn('semester_id', 'integer', 4, array('notnull'=>true));
+    $this->hasColumn('name', 'string', 255, array('notnull' => true));
+  }
+
+  public function setUp()
+  {
+    parent::setUp();
+    $this->hasOne('Semester', array('local' => 'semester_id',
+                                    'foreign' => 'id',
+                                    'onDelete' => 'CASCADE'));
+    $this->hasMany('Weekday as Weekdays', 
+      array('refClass'=>'CourseWeekday', 'local'=>'course_id', 'foreign'=>'weekday_id'));
+  }
+
+}
+
+class CourseWeekday extends Doctrine_Record
+{
+
+  public function setTableDefinition()
+  {
+    $this->setTableName('course_weekday');
+    # Poor form to have an id on a join table, but that's what we were doing
+    $this->hasColumn('id', 'integer', 4, array('primary' => true, 'autoincrement' => true));
+    $this->hasColumn('course_id', 'integer', 4, array('notnull' => true));
+    $this->hasColumn('weekday_id', 'integer', 4, array('notnull' => true));
+  }
+
+  public function setUp()
+  {
+    parent::setUp();
+    $this->hasOne('Course', array('local'=>'course_id', 'foreign'=>'id', 'onDelete'=>'CASCADE'));
+    $this->hasOne('Weekday', array('local'=>'weekday_id', 'foreign'=>'id', 'onDelete'=>'CASCADE'));
+  }
+
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/969TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/969TestCase.php
new file mode 100644
index 000000000..fa639f56e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/969TestCase.php
@@ -0,0 +1,156 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_969_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_969_TestCase extends Doctrine_UnitTestCase {
+
+    public function prepareData()
+    {
+      $d = new T1();
+      $d->t1_id = 1;
+      $d->t2_id = 1;
+      $d->save();
+      
+      $d = new T2();
+      $d->t2_id = 1;
+      $d->hello_id = 10;
+      $d->save();
+      
+      for ($i = 0; $i < 10; $i++)
+      {
+        $t3 = new T3();
+        $t3->hello_id = 10;
+        $t3->save();
+      }
+    }
+
+    public function prepareTables() {
+      $this->tables = array();
+      $this->tables[] = 'T1';
+      $this->tables[] = 'T2';
+      $this->tables[] = 'T3';
+      
+      parent::prepareTables();
+    }
+
+    public function testTicket()
+    {
+      $q = new Doctrine_Query;
+      $result = $q->select('a.*, b.*, c.*')
+                ->from('T1 a')
+                ->leftJoin('a.T2 b')
+                ->leftJoin('b.T3 c')
+                ->setHydrationMode(Doctrine_Core::HYDRATE_ARRAY)
+                ->fetchOne();
+      
+      // there are 10 rows in T3, and they all have hello_id = 10, so we should have 10 rows here
+      $this->assertEqual(10, count($result["T2"]["T3"]));
+      
+      // now with object hydration.
+      $q = new Doctrine_Query;
+      $result = $q->select('a.*, b.*, c.*')
+                ->from('T1 a')
+                ->leftJoin('a.T2 b')
+                ->leftJoin('b.T3 c')
+                ->fetchOne();
+      
+      // test that no additional queries are executed when accessing the relations (lazy-loading).
+      $queryCountBefore = $this->conn->count();
+      // there are 10 rows in T3, and they all have hello_id = 10, so we should have 10 rows here
+      $this->assertEqual(10, count($result["T2"]["T3"]));
+      $this->assertEqual($queryCountBefore, $this->conn->count());
+    }
+}
+
+class T1 extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('t1');
+    $this->hasColumn('t1_id', 'integer', 3, array('autoincrement' => true, 'unsigned' => true, 'primary' => true, 'notnull' => true));
+    $this->hasColumn('t2_id', 'integer', 3);
+  }
+
+  public function setUp()
+  {
+    parent :: setUp();
+    $this->hasOne('T2', array('local' => 't2_id', 'foreign' => 't2_id'));
+  }
+}
+
+class T2 extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('t2');
+    $this->hasColumn('t2_id', 'integer', 3, array('autoincrement' => true, 'unsigned' => true, 'primary' => true, 'notnull' => true));
+    $this->hasColumn('hello_id', 'integer', 3);
+  }
+
+  public function setUp()
+  {
+    parent :: setUp();
+    $this->hasMany('T3', array('local' => 'hello_id', 'foreign' => 'hello_id'));
+  }
+}
+
+class T3 extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('t3');
+    $this->hasColumn('t3_id', 'integer', 3, array('autoincrement' => true, 'unsigned' => true, 'primary' => true, 'notnull' => true));
+    $this->hasColumn('hello_id', 'integer', 3);
+  }
+
+  public function setUp()
+  {
+    parent :: setUp();
+  }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/973TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/973TestCase.php
new file mode 100755
index 000000000..231d44084
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/973TestCase.php
@@ -0,0 +1,63 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_973_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_973_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables() {
+        $this->tables = array();
+        $this->tables[] = 'T973_Day';
+
+        parent::prepareTables();
+    }
+
+    public function prepareData() {}
+
+
+    public function testTicket()
+    {
+       $query = Doctrine_Query::create()
+                ->from('T973_Day d')
+                ->where('d.id IN(46)');
+        $this->assertEqual(' FROM T973_Day d WHERE d.id IN(46)', $query->getDql());
+        $this->assertEqual($query->getSqlQuery(), 'SELECT t.id AS t__id, t.number AS t__number FROM t973_days t WHERE (d.id IN(46))');
+    }
+}
+
+class T973_Day extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('t973_days');
+        $this->hasColumn('id', 'integer', 3, array('autoincrement' => true, 'unsigned' => true, 'primary' => true, 'notnull' => true));
+        $this->hasColumn('number', 'integer');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/982TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/982TestCase.php
new file mode 100644
index 000000000..5b44d2a93
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/982TestCase.php
@@ -0,0 +1,79 @@
+<?php
+/*
+ * Test to ensure LocalKey Relations allow 0 for id value
+ */
+class Doctrine_Ticket_982_TestCase extends Doctrine_UnitTestCase
+{    
+    public function prepareTables()
+    {
+        $this->tables = array();
+        $this->tables[] = "T982_MyModel";
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+	  $myModelZero = new T982_MyModel();
+	  $myModelZero->id = 0;
+	  $myModelZero->parentid = 0;
+      $myModelZero->save();
+      $this->assertIdentical(0, $myModelZero->id);
+	  
+      $this->myModelOne = new T982_MyModel();
+	  $this->myModelOne->id = 1;
+	  $this->myModelOne->parentid = 0;
+      $this->myModelOne->save();
+	  
+      $this->myModelTwo = new T982_MyModel();
+	  $this->myModelTwo->id = 2;
+	  $this->myModelTwo->parentid = 1;
+      $this->myModelTwo->save();
+    }
+
+    public function testTicket()
+    {
+        $this->conn->getTable('T982_MyModel')->clear();
+        
+        $myModelZero = $this->conn->getTable('T982_MyModel')->find(0);
+        
+		$this->assertIdentical($myModelZero->id, '0');
+		$this->assertIdentical($myModelZero->parentid, '0');
+		$this->assertTrue($myModelZero->parent->exists());
+		$this->assertTrue(ctype_digit($myModelZero->parent->id));
+		$this->assertIdentical($myModelZero, $myModelZero->parent);
+		$this->assertIdentical($myModelZero->parent->id, '0');
+		$this->assertIdentical($myModelZero->parent->parentid, '0');		
+        
+        $myModelOne = $this->conn->getTable('T982_MyModel')->find(1);
+        
+        $this->assertIdentical($myModelOne->id, '1');
+		$this->assertIdentical($myModelOne->parentid, '0');
+		$this->assertTrue($myModelOne->parent->exists());
+		$this->assertTrue(ctype_digit($myModelOne->parent->id));
+		$this->assertIdentical($myModelOne->parent->id, '0');
+		$this->assertIdentical($myModelOne->parent->parentid, '0');
+		
+		$myModelTwo = $this->conn->getTable('T982_MyModel')->find(2);
+
+        $this->assertIdentical($myModelTwo->id, '2');
+		$this->assertIdentical($myModelTwo->parentid, '1');
+		$this->assertIdentical($myModelTwo->parent->id, '1');
+		$this->assertIdentical($myModelTwo->parent->parentid, '0');
+		
+   }
+}
+
+class T982_MyModel extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', 4, array('primary' => true, 'notnull' => true));
+        $this->hasColumn('parentid', 'integer', 4, array('notnull' => true));
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('T982_MyModel as parent', array('local' => 'parentid', 'foreign' => 'id'));
+    }
+
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/987TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/987TestCase.php
new file mode 100644
index 000000000..c1de260c3
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/987TestCase.php
@@ -0,0 +1,81 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_987_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_987_TestCase extends Doctrine_UnitTestCase 
+{
+  public function prepareTables()
+  {
+    $this->tables[] = 'Ticket_987_Person';
+    parent::prepareTables();
+  }
+
+  public function testTest()
+  {
+    $person = new Ticket_987_Person();
+    $person->gender = 'male';
+    $person->firstname = 'jon';
+    $person->lastname = 'wage';
+    $person->save();
+
+    // creating the query
+    $q = Doctrine_Query::create();
+    $q->from('Ticket_987_Person p');
+
+    // creating the view
+    $view = new Doctrine_View($q, 'view_person2person_type');
+    $view->create();
+
+    // creating the query
+    $q = Doctrine_Query::create();
+    $q->from('Ticket_987_Person p');
+
+    // creating view object for querying
+    $view = new Doctrine_View($q, 'view_person2person_type');
+
+    // executes view
+    $coll = $view->execute();
+
+    $this->assertEqual($coll->count(), 1);
+  }
+}
+
+class Ticket_987_Person extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('person');
+        $this->hasColumn('id', 'integer', 11, array('primary' => true, 'notnull' => true, 'autoincrement' => true) );
+        $this->hasColumn('gender', 'integer', 1, array('notblank' => true, 'primary' => false, 'notnull' => true, 'autoincrement' => false) );
+        $this->hasColumn('firstname', 'string', 30, array('notblank' => true, 'primary' => false, 'notnull' => true, 'autoincrement' => false) );
+        $this->hasColumn('lastname', 'string', 30, array('notblank' => true, 'primary' => false, 'notnull' => true, 'autoincrement' => false) );
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/990TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/990TestCase.php
new file mode 100644
index 000000000..1d150f617
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/990TestCase.php
@@ -0,0 +1,111 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_990_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_990_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_990_Person';
+        parent::prepareTables();
+    }
+
+    public function testOverwriteIdentityMap()
+    {        
+        $person = new Ticket_990_Person();
+        $person->firstname = 'John';
+        $person->save();
+        
+        $person->firstname = 'Alice';
+        
+        $person = Doctrine_Core::getTable('Ticket_990_Person')->find($person->id);
+        
+        $this->assertEqual('John', $person->firstname);
+    }
+
+    public function testDontOverwriteIdentityMap()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_HYDRATE_OVERWRITE, false);
+
+        $user = Doctrine_Core::getTable('User')->createQuery()->fetchOne();
+        $user->name = 'test';
+        $user = Doctrine_Core::getTable('User')->find($user->id);
+        $this->assertEqual($user->name, 'test');
+
+        
+        $person = new Ticket_990_Person();
+        $person->firstname = 'John';
+        $person->save(); 
+        
+        $person->firstname = 'Alice';
+        
+        $this->assertEqual(Doctrine_Record::STATE_DIRTY, $person->state());
+        $this->assertTrue($person->isModified());
+        $this->assertEqual(array('firstname' => 'Alice'), $person->getModified());
+        
+        $person = Doctrine_Core::getTable('Ticket_990_Person')->find($person->id);
+        
+        $this->assertEqual('Alice', $person->firstname);
+        $this->assertEqual(Doctrine_Record::STATE_DIRTY, $person->state());
+        $this->assertTrue($person->isModified());
+        $this->assertEqual(array('firstname' => 'Alice'), $person->getModified());
+        
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_HYDRATE_OVERWRITE, true);
+    }
+
+    public function testRefreshAlwaysOverwrites()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_HYDRATE_OVERWRITE, false);
+        
+        $person = new Ticket_990_Person();
+        $person->firstname = 'John';
+        $person->save();
+        
+        $person->firstname = 'Alice';
+        
+        $person->refresh();
+        
+        $this->assertEqual('John', $person->firstname);
+        
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_HYDRATE_OVERWRITE, true);
+    }
+}
+
+class Ticket_990_Person extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('person');
+        $this->hasColumn('id', 'integer', 11, array('primary' => true, 'notnull' => true, 'autoincrement' => true) );
+        $this->hasColumn('firstname', 'string');
+        $this->hasColumn('lastname', 'string');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/AyoubTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/AyoubTestCase.php
new file mode 100644
index 000000000..ca1f6a5aa
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/AyoubTestCase.php
@@ -0,0 +1,111 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_Ayoub_TestCase
+ *
+ * @package     Doctrine
+ * @author      pascal borreli
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_Ayoub_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_Ayoub_Sura';
+        $this->tables[] = 'Ticket_Ayoub_Place';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $name = 'Sura Name';
+        $placeName = 'Place Name';
+
+        try {
+            $sura = new Ticket_Ayoub_Sura;
+            $sura->Translation['transliteration']->name = $name;
+            $sura->Ticket_Ayoub_Place->Translation['transliteration']->name = $placeName;
+            $sura->Ticket_Ayoub_Place->state('TDIRTY');
+            $sura->save();
+            $reopened = Doctrine_Core::getTable('Ticket_Ayoub_Sura')->findOneById($sura->id);
+            $this->assertEqual($name, $reopened->Translation['transliteration']->name);
+            $this->assertEqual(1, $reopened->place_id);
+            $this->assertEqual($placeName, $reopened->Ticket_Ayoub_Place->Translation['transliteration']->name);
+
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+}
+
+class Ticket_Ayoub_Sura extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('Ticket_Ayoub_Sura');
+    $this->hasColumn('id', 'integer', null, array('type' => 'integer', 'primary' => true, 'autoincrement' => true));
+    $this->hasColumn('name', 'string', 255, array('type' => 'string', 'length' => '255'));
+    $this->hasColumn('revelation_order', 'integer', null, array('type' => 'integer'));
+    $this->hasColumn('is_mekka', 'boolean', null, array('type' => 'boolean'));
+    $this->hasColumn('ayat_number', 'integer', null, array('type' => 'integer'));
+    $this->hasColumn('place_id', 'integer', null, array('type' => 'integer'));
+
+    $this->option('collate', 'utf8_unicode_ci');
+    $this->option('charset', 'utf8');
+  }
+
+  public function setUp()
+  {
+    $this->hasOne('Ticket_Ayoub_Place', array('local' => 'place_id',
+                                 'foreign' => 'id'));
+
+    $i18n0 = new Doctrine_Template_I18n(array('fields' => array(0 => 'name'), 'length' => '20'));
+    $this->actAs($i18n0);
+  }
+}
+
+class Ticket_Ayoub_Place extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('Ticket_Ayoub_Place');
+    $this->hasColumn('id', 'integer', null, array('type' => 'integer', 'primary' => true, 'autoincrement' => true));
+    $this->hasColumn('name', 'string', 255, array('type' => 'string', 'length' => '255'));
+
+    $this->option('collate', 'utf8_unicode_ci');
+    $this->option('charset', 'utf8');
+  }
+
+  public function setUp()
+  {
+    $this->hasMany('Ticket_Ayoub_Sura', array('local' => 'id',
+                                 'foreign' => 'place_id'));
+
+    $i18n0 = new Doctrine_Template_I18n(array('fields' => array(0 => 'name'), 'length' => '20'));
+    $this->actAs($i18n0);
+  }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC101TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC101TestCase.php
new file mode 100644
index 000000000..ad4b700f1
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC101TestCase.php
@@ -0,0 +1,78 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC101_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC101_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $dbh = new Doctrine_Adapter_Mock('mysql');
+
+        $conn = Doctrine_Manager::getInstance()->connection($dbh, 'mysql', false);
+
+        $sql = $conn->export->exportSortedClassesSql(array('Ticket_DC101_User', 'Ticket_DC101_Profile'), false);
+        $this->assertEqual($sql[2], 'ALTER TABLE ticket__d_c101__profile ADD CONSTRAINT user_id_fk FOREIGN KEY (user_id) REFERENCES ticket__d_c101__user(id)');
+    }
+}
+
+class Ticket_DC101_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_DC101_Profile as Profile', array(
+            'local' => 'id',
+            'foreign' => 'user_id'
+        ));
+    }
+}
+
+class Ticket_DC101_Profile extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+        $this->hasColumn('user_id', 'integer');
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_DC101_User as User', array(
+            'local' => 'user_id',
+            'foreign' => 'id',
+            'foreignKeyName' => 'user_id_fk'
+        ));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC112TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC112TestCase.php
new file mode 100644
index 000000000..b480cc839
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC112TestCase.php
@@ -0,0 +1,165 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DDC47_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC112_TestCase extends Doctrine_UnitTestCase
+{
+    public function testResultCacheSetHash()
+    {
+        $cacheDriver = new Doctrine_Cache_Array();
+
+        $q1 = Doctrine_Query::create()
+            ->from('User u')
+            ->useResultCache($cacheDriver, 3600, 'test1');
+
+        $coll = $q1->execute();
+
+        $this->assertTrue($cacheDriver->contains('test1'));
+        $this->assertEqual(count($coll), 8);
+
+        $coll = $q1->execute();
+
+        $this->assertTrue($cacheDriver->contains('test1'));
+        $this->assertEqual(count($coll), 8);
+
+        $q2 = Doctrine_Query::create()
+            ->from('User u')
+            ->useResultCache($cacheDriver, 3600, 'test2');
+
+        $coll = $q2->execute();
+        $this->assertTrue($cacheDriver->contains('test1'));
+        $this->assertTrue($cacheDriver->contains('test2'));
+        $this->assertEqual(count($coll), 8);
+
+        $q2->clearResultCache();
+        $this->assertTrue($cacheDriver->contains('test1'));
+        $this->assertFalse($cacheDriver->contains('test2'));
+
+        $cacheDriver->delete('test1');
+        $this->assertFalse($cacheDriver->contains('test1'));
+
+        $q = Doctrine_Query::create()
+            ->from('User u')
+            ->useResultCache($cacheDriver)
+            ->setResultCacheHash('testing');
+
+        $coll = $q->execute();
+        $this->assertTrue($cacheDriver->contains('testing'));
+
+        $this->assertEqual($q->getResultCacheHash(), 'testing');
+        $q->setResultCacheHash(null);
+        $this->assertEqual($q->getResultCacheHash(), '9b6aafa501ac37b902719cd5061f412d');
+    }
+
+    public function testDeleteByRegex()
+    {
+        $cacheDriver = new Doctrine_Cache_Array(array(
+            'prefix' => 'test_'
+        ));
+
+        Doctrine_Query::create()
+            ->from('User u')
+            ->useResultCache($cacheDriver, 3600, 'doctrine_query_one')
+            ->execute();
+
+        Doctrine_Query::create()
+            ->from('User u')
+            ->useResultCache($cacheDriver, 3600, 'doctrine_query_two')
+            ->execute();
+
+        $count = $cacheDriver->deleteByRegex('/test_doctrine_query_.*/');
+        $this->assertEqual($count, 2);
+        $this->assertFalse($cacheDriver->contains('doctrine_query_one'));
+        $this->assertFalse($cacheDriver->contains('doctrine_query_two'));
+    }
+
+    public function testDeleteByPrefix()
+    {
+        $cacheDriver = new Doctrine_Cache_Array(array(
+            'prefix' => 'test_'
+        ));
+
+        Doctrine_Query::create()
+            ->from('User u')
+            ->useResultCache($cacheDriver, 3600, 'doctrine_query_one')
+            ->execute();
+
+        Doctrine_Query::create()
+            ->from('User u')
+            ->useResultCache($cacheDriver, 3600, 'doctrine_query_two')
+            ->execute();
+
+        $count = $cacheDriver->deleteByPrefix('test_');
+        $this->assertEqual($count, 2);
+        $this->assertFalse($cacheDriver->contains('doctrine_query_one'));
+        $this->assertFalse($cacheDriver->contains('doctrine_query_two'));
+    }
+
+    public function testDeleteBySuffix()
+    {
+        $cacheDriver = new Doctrine_Cache_Array();
+
+        Doctrine_Query::create()
+            ->from('User u')
+            ->useResultCache($cacheDriver, 3600, 'one_query')
+            ->execute();
+
+        Doctrine_Query::create()
+            ->from('User u')
+            ->useResultCache($cacheDriver, 3600, 'two_query')
+            ->execute();
+
+        $count = $cacheDriver->deleteBySuffix('_query');
+        $this->assertEqual($count, 2);
+        $this->assertFalse($cacheDriver->contains('one_query'));
+        $this->assertFalse($cacheDriver->contains('two_query'));
+    }
+
+    public function testDeleteWithWildcard()
+    {
+        $cacheDriver = new Doctrine_Cache_Array();
+
+        Doctrine_Query::create()
+            ->from('User u')
+            ->useResultCache($cacheDriver, 3600, 'user_query_one')
+            ->execute();
+
+        Doctrine_Query::create()
+            ->from('User u')
+            ->useResultCache($cacheDriver, 3600, 'user_query_two')
+            ->execute();
+
+        $count = $cacheDriver->delete('user_query_*');
+        $this->assertEqual($count, 2);
+        $this->assertFalse($cacheDriver->contains('user_query_one'));
+        $this->assertFalse($cacheDriver->contains('user_query_two'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC136TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC136TestCase.php
new file mode 100644
index 000000000..9af22ea8d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC136TestCase.php
@@ -0,0 +1,66 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC136_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC136_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC136_User';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $user = new Ticket_DC136_User();
+        $user->username = 'jwage';
+        $user->password = 'changeme';
+        $user->save();
+        $id = $user->id;
+
+        $table = Doctrine_Core::getTable('Ticket_DC136_User');
+
+        $user1 = $table->find($id);
+        $user1->username = 'jonwage';
+
+        $user2 = $table->find($id);
+        $this->assertEqual($user2->getModified(), array());
+    }
+}
+
+class Ticket_DC136_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC141TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC141TestCase.php
new file mode 100644
index 000000000..7b1fe9543
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC141TestCase.php
@@ -0,0 +1,43 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC141_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC141_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $q = Doctrine_Core::getTable('User')
+            ->createQuery('u')
+            ->where('u.name LIKE :name OR u.email_id = :email_id', array(':email_id' => 2, ':name' => '%zYne%'));
+        $users = $q->fetchArray();
+        $this->assertEqual(count($users), 2);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC147TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC147TestCase.php
new file mode 100644
index 000000000..2b0eb5487
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC147TestCase.php
@@ -0,0 +1,174 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC147_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC147_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'DC147_Product';
+        $this->tables[] = 'DC147_Site';
+        $this->tables[] = 'DC147_Multiple';
+        $this->tables[] = 'DC147_MultipleValue';
+        parent::prepareTables();
+    }
+
+    public function testInlineMultiple()
+    {
+        $yml = <<<END
+---
+DC147_Multiple:
+  ISBN2:
+    name: isbn2
+  ISBN3:
+    name: isbn3
+DC147_Product: 
+  Product_1: 
+    name: book3
+    MultipleValues:
+      Multi_1:
+        value: 123345678
+        Multiple: ISBN2
+      Multi_2:
+        value: 232323233
+        Multiple: ISBN3
+  Product_2: 
+    name: book4
+    MultipleValues:
+      Multi_3:
+        value: 444455555
+        Multiple: ISBN2
+      Multi_4:
+        value: 232323233
+        Multiple: ISBN3
+END;
+        try {
+            file_put_contents('test.yml', $yml);
+            Doctrine_Core::loadData('test.yml', true);
+
+            $this->conn->clear();
+
+            $query = new Doctrine_Query();
+            $query->from('DC147_Product p, p.MultipleValues v, v.Multiple m')
+                ->where('p.name = ?', 'book3');
+
+            $product = $query->fetchOne();
+
+            $this->assertEqual($product->name, 'book3');
+            $this->assertEqual($product->MultipleValues->count(), 2);
+            $this->assertEqual($product->MultipleValues[0]->value, '123345678');
+            $this->assertEqual(is_object($product->MultipleValues[0]->Multiple), true);
+            $this->assertEqual($product->MultipleValues[0]->Multiple->name, 'isbn2');
+
+            $query = new Doctrine_Query();
+            $query->from('DC147_Product p, p.MultipleValues v, v.Multiple m')
+                ->where('p.name = ?', 'book4');
+
+            $product = $query->fetchOne();
+
+            $this->assertEqual($product->name, 'book4');
+            $this->assertEqual($product->MultipleValues->count(), 2);
+            $this->assertEqual($product->MultipleValues[0]->value, '444455555');
+            $this->assertEqual($product->MultipleValues[1]->value, '232323233');
+            $this->assertEqual(is_object($product->MultipleValues[0]->Multiple), true);
+            $this->assertEqual(is_object($product->MultipleValues[1]->Multiple), true);
+            $this->assertEqual($product->MultipleValues[0]->Multiple->name, 'isbn2');
+            $this->assertEqual($product->MultipleValues[1]->Multiple->name, 'isbn3');
+
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail();
+        }
+
+        unlink('test.yml');
+    }
+}
+
+class DC147_Product extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('site_id', 'integer', null, array('type' => 'integer'));
+        $this->hasColumn('name', 'string', 255, array('type' => 'string', 'notnull' => true, 'length' => '255'));
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('DC147_Site as Site', array('local' => 'site_id',
+                                    'foreign' => 'id'));
+        $this->hasMany('DC147_MultipleValue as MultipleValues', array('local' => 'id',
+                                                              'foreign' => 'product_id'));
+    }
+}
+class DC147_Site extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255, array('type' => 'string', 'length' => '255'));
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('DC147_Product as Products', array('local' => 'id',
+                                        'foreign' => 'site_id'));
+    }
+}
+class DC147_Multiple extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255, array('type' => 'string', 'notnull' => true, 'length' => '255'));
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('DC147_MultipleValue as MultipleValues', array('local' => 'id',
+                                                 'foreign' => 'multiple_id'));
+    }
+}
+class DC147_MultipleValue extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('product_id', 'integer', null, array('type' => 'integer', 'primary' => true));
+        $this->hasColumn('multiple_id', 'integer', null, array('type' => 'integer', 'primary' => true));
+        $this->hasColumn('value', 'clob', null, array('type' => 'clob'));
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('DC147_Multiple as Multiple', array('local' => 'multiple_id',
+                                                       'foreign' => 'id'));
+
+        $this->hasOne('DC147_Product as Product', array('local' => 'product_id',
+                                        'foreign' => 'id'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC14TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC14TestCase.php
new file mode 100644
index 000000000..9d9bc1f1e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC14TestCase.php
@@ -0,0 +1,59 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC14_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC14_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC14_Search';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $q = Doctrine_Core::getTable('Ticket_DC14_Search')
+            ->createQuery('s')
+            ->where("? NOT BETWEEN s.date_from AND s.date_to", '1985-09-01 00:00:00');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT t.id AS t__id, t.name AS t__name, t.date_from AS t__date_from, t.date_to AS t__date_to FROM ticket__d_c14__search t WHERE (? NOT BETWEEN t.date_from AND t.date_to)');
+    }
+}
+
+class Ticket_DC14_Search extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+        $this->hasColumn('date_from', 'timestamp');
+        $this->hasColumn('date_to', 'timestamp');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC169TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC169TestCase.php
new file mode 100644
index 000000000..16ef70375
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC169TestCase.php
@@ -0,0 +1,100 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC169_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC169_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC169_User';
+        $this->tables[] = 'Ticket_DC169_Profile';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $user = new Ticket_DC169_User();
+        $user->username = 'jwage';
+        $user->password = 'changeme';
+        $user->Profile->name = 'Jonathan H. Wage';
+        $user->replace();
+
+        $this->assertTrue($user->id > 0);
+        $this->assertTrue(strtotime($user->created_at) > 0);
+        $this->assertTrue(strtotime($user->updated_at) > 0);
+        $this->assertTrue($user->Profile->id > 0);
+        $this->assertEqual($user->id, $user->Profile->user_id);
+
+        $oldDate = $user->updated_at;
+
+        $user->username = 'jonwage';
+        sleep(1);
+        $user->replace();
+
+        $this->assertTrue($user->updated_at != $oldDate);
+    }
+}
+
+class Ticket_DC169_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('Timestampable');
+        
+        $this->hasOne('Ticket_DC169_Profile as Profile', array(
+            'local' => 'id',
+            'foreign' => 'user_id'
+        ));
+    }
+}
+
+class Ticket_DC169_Profile extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('user_id', 'integer');
+        $this->hasColumn('name', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_DC169_User as User', array(
+            'local' => 'user_id',
+            'foreign' => 'id'
+        ));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC171TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC171TestCase.php
new file mode 100644
index 000000000..27fece420
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC171TestCase.php
@@ -0,0 +1,69 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC171_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC171_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC171_User';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $user = new Ticket_DC171_User();
+        $user->username = 'jwage';
+        $user->password = 'changeme';
+        $user->save();
+        $id = $user->id;
+
+        $user->hardDelete();
+        $user->free();
+
+        $user = Doctrine_Core::getTable('Ticket_DC171_User')->find($id);
+        $this->assertFalse($user);
+    }
+}
+
+class Ticket_DC171_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('SoftDelete');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC187TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC187TestCase.php
new file mode 100644
index 000000000..efc02987e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC187TestCase.php
@@ -0,0 +1,97 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC187_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC187_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC187_User';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+
+        $user = new Ticket_DC187_User();
+        $user->username = 'jwage';
+        $user->email = 'jonwage@gmail.com';
+        $user->password = 'changeme';
+        $user->save();
+        $user->delete();
+
+        try {
+            $user = new Ticket_DC187_User();
+            $user->username = 'jwage';
+            $user->email = 'jonwage@gmail.com';
+            $user->password = 'changeme';
+            $user->save();
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+
+        try {
+            $user = new Ticket_DC187_User();
+            $user->username = 'jwage';
+            $user->email = 'jonwage@gmail.com';
+            $user->password = 'changeme';
+            $user->save();
+            $this->fail();
+        } catch (Exception $e) {
+            $this->pass();
+        }
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+}
+
+class Ticket_DC187_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('email', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+
+        $this->unique(
+            array('username', 'email'),
+            array('where' => "deleted_at IS NULL"),
+            false
+        );
+    }
+
+    public function setUp()
+    {
+        $this->actAs('SoftDelete');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC198TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC198TestCase.php
new file mode 100644
index 000000000..94a56687a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC198TestCase.php
@@ -0,0 +1,109 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC198_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC198_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData()
+    {
+        $u = new Ticket_DC198_User();
+        $u->name = 'test';
+        $u->email->address = 'foo@bar.com';
+        $u->save();
+
+        parent::prepareData();
+    }
+
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC198_User';
+        $this->tables[] = 'Ticket_DC198_Email';
+        
+        parent::prepareTables();
+    }
+
+    public function testRemoveEmail()
+    {
+        $u = Doctrine_Query::create()->from('Ticket_DC198_User')->fetchOne();
+        $u->name = 'test2';
+        $u->email->delete();
+        $u->refreshRelated('email');
+
+        // The email should be empty
+        $uArray = $u->toArray();
+
+        $this->assertFalse(isset($uArray['email']));
+
+        // If I fetch the email I shouldn't find any
+        $e = Doctrine_Query::create()->from('Ticket_DC198_Email')->fetchOne();
+        $this->assertFalse($e);
+    }
+
+}
+
+class Ticket_DC198_Email extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('user_id', 'integer', null, array(
+             'type' => 'integer',
+             ));
+        $this->hasColumn('address', 'string', 150, array(
+             'type' => 'string',
+             'length' => '150',
+             ));
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_DC198_User', array(
+             'local' => 'user_id',
+             'foreign' => 'id'));
+    }
+}
+
+class Ticket_DC198_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 150, array(
+             'type' => 'string',
+             'length' => '150',
+             ));
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_DC198_Email as email', array(
+             'local' => 'id',
+             'foreign' => 'user_id'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC217TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC217TestCase.php
new file mode 100644
index 000000000..80408cca8
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC217TestCase.php
@@ -0,0 +1,84 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC217_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC217_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC217_Industry';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $o = new Ticket_DC217_Industry();
+        $o->name = 'test';
+        //$o->parent_id = null;
+        $o->save();
+    }
+}
+
+class Ticket_DC217_Industry extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', 4, array(
+             'type' => 'integer',
+             'primary' => true,
+             'autoincrement' => true,
+             'length' => '4',
+             ));
+
+        $this->hasColumn('parent_id', 'integer', 4, array(
+             'type' => 'integer',
+             'notnull' => false,
+             'length' => '4',
+             ));
+
+        $this->hasColumn('name', 'string', 30, array(
+             'type' => 'string',
+             'notnull' => true,
+             'length' => '30',
+             ));
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_DC217_Industry as ParentIndustry', array(
+             'local' => 'parent_id',
+             'foreign' => 'id'));
+
+        $this->hasMany('Ticket_DC217_Industry as ChildIndustries', array(
+             'local' => 'id',
+             'foreign' => 'parent_id'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC221/TestMigration.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC221/TestMigration.php
new file mode 100644
index 000000000..4bd0fa35d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC221/TestMigration.php
@@ -0,0 +1,8 @@
+<?php
+
+class TestMigration extends Doctrine_Migration_Base
+{
+    public function migrate($direction)
+    {
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC221TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC221TestCase.php
new file mode 100644
index 000000000..6d7c8ca97
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC221TestCase.php
@@ -0,0 +1,41 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC221_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC221_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $migration1 = new Doctrine_Migration(dirname(__FILE__) . '/DC221');
+        $migration2 = new Doctrine_Migration(dirname(__FILE__) . '/DC221');
+        $this->assertEqual($migration1->getMigrationClasses(), $migration2->getMigrationClasses());
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC236TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC236TestCase.php
new file mode 100644
index 000000000..0f6f97fc6
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC236TestCase.php
@@ -0,0 +1,85 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC236_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC236_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC236_File';
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+        $node = new Ticket_DC236_File();
+        $node->name = 'root';
+        $treeMngr = $this->conn->getTable('Ticket_DC236_File')->getTree();
+        $treeMngr->createRoot($node);
+
+        $node2 = new Ticket_DC236_File();
+        $node2->name = 'node2';
+        $node2->getNode()->insertAsLastChildOf($node);
+
+        $node3 = new Ticket_DC236_File();
+        $node3->name = 'node3';
+        $node3->getNode()->insertAsLastChildOf($node2);
+
+        $node4 = new Ticket_DC236_File();
+        $node4->name = 'node4';
+        $node4->getNode()->insertAsLastChildOf($node2);
+    }
+
+    public function testTest()
+    {
+        $treeMngr = $this->conn->getTable('Ticket_DC236_File')->getTree();
+        $root = $treeMngr->fetchRoot();
+        $descendants = $root->getNode()->getDescendants()->toHierarchy();
+        $this->assertEqual(2, count($descendants[0]['__children']));
+    }
+}
+
+class Ticket_DC236_File extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255, array(
+             'type' => 'string',
+             'length' => '255',
+             ));
+    }
+
+    public function setUp()
+    {
+        $nestedset0 = new Doctrine_Template_NestedSet();
+        $this->actAs($nestedset0);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC238TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC238TestCase.php
new file mode 100644
index 000000000..0a782d915
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC238TestCase.php
@@ -0,0 +1,74 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC238_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC238_TestCase extends Doctrine_UnitTestCase
+{
+    public function testTest()
+    {
+        $conn = Doctrine_Manager::connection('sqlite::memory:', 'test', false);
+        $conn->export->exportClasses(array('Ticket_DC238_User'));
+
+        $user = new Ticket_DC238_User();
+        $user->username = 'jwage';
+        $user->password = 'changeme';
+        $user->save();
+
+        $profiler = new Doctrine_Connection_Profiler();
+        $conn->addListener($profiler);
+
+        $cacheDriver = new Doctrine_Cache_Array();
+        $q = Doctrine_Core::getTable('Ticket_DC238_User')
+            ->createQuery('u')
+            ->useResultCache($cacheDriver, 3600, 'user_query');
+
+        $this->assertEqual(0, $profiler->count());
+
+        $this->assertEqual(1, $q->count());
+
+        $this->assertEqual(1, $profiler->count());
+
+        $this->assertEqual(1, $q->count());
+
+        $this->assertEqual(1, $profiler->count());
+
+        $this->assertTrue($cacheDriver->contains('user_query_count'));
+    }
+}
+
+class Ticket_DC238_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC23TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC23TestCase.php
new file mode 100644
index 000000000..20de702d7
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC23TestCase.php
@@ -0,0 +1,199 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC23_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC23_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC23_User';
+        $this->tables[] = 'Ticket_DC23_Contact';
+        $this->tables[] = 'Ticket_DC23_Address';
+        $this->tables[] = 'Ticket_DC23_Phonenumber';
+        $this->tables[] = 'Ticket_DC23_BlogPost';
+
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $yml = <<<END
+---
+Ticket_DC23_BlogPost:
+  BlogPost_1:
+    Translation:
+      en:
+        title: Test
+        body: Testing
+
+Ticket_DC23_User: 
+  User_1: 
+    name: jwage
+    Contact:
+      name: Test Contact
+      Address: Address_1
+      Phonenumbers:
+        Phonenumber_1:
+          name: test1
+        Phonenumber_2:
+          name: test2
+  User_2:
+    name: romanb
+    Contact:
+      name: Roman
+      Address:
+        name: Testing
+      Phonenumbers: [Phonenumber_3]
+
+Ticket_DC23_Phonenumber:
+  Phonenumber_3:
+    name: Testing
+
+Ticket_DC23_Address:
+  Address_1:
+    name: Test Address
+END;
+        try {
+            file_put_contents('test.yml', $yml);
+            Doctrine_Core::loadData('test.yml', true);
+
+            $q = Doctrine_Query::create()
+                ->from('Ticket_DC23_User u')
+                ->leftJoin('u.Contact c')
+                ->leftJoin('c.Phonenumbers p')
+                ->leftJoin('c.Address a');
+            $results = $q->fetchArray();
+
+            $this->assertTrue(isset($results[0]['Contact']['address_id']));
+            $this->assertEqual(count($results[0]['Contact']['Phonenumbers']), 2);
+            $this->assertEqual(count($results[1]['Contact']['Phonenumbers']), 1);
+
+            $q = Doctrine_Query::create()
+                ->from('Ticket_DC23_BlogPost p')
+                ->leftJoin('p.Translation t');
+            $results = $q->fetchArray();
+
+            $this->assertEqual(count($results[0]['Translation']), 1);
+
+            $this->pass();
+        } catch (Exception $e) {
+            echo $e->getTraceAsString();
+            $this->fail($e->getMessage());
+        }
+
+        unlink('test.yml');
+    }
+}
+
+class Ticket_DC23_BlogPost extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('title', 'string', 255);
+        $this->hasColumn('body', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('I18n', array('fields' => array('title', 'body')));
+    }
+}
+
+class Ticket_DC23_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+        $this->hasColumn('contact_id', 'integer');
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_DC23_Contact as Contact', array(
+                'local' => 'contact_id',
+                'foreign' => 'id',
+                'onDelete' => 'CASCADE'
+            )
+        );
+    }
+}
+
+class Ticket_DC23_Contact extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+        $this->hasColumn('address_id', 'integer');
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_DC23_Address as Address', array(
+                'local' => 'address_id',
+                'foreign' => 'id',
+                'onDelete' => 'CASCADE'
+            )
+        );
+
+        $this->hasMany('Ticket_DC23_Phonenumber as Phonenumbers', array(
+                'local' => 'id',
+                'foreign' => 'contact_id'
+            )
+        );
+    }
+}
+
+class Ticket_DC23_Address extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+}
+
+class Ticket_DC23_Phonenumber extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+        $this->hasColumn('contact_id', 'integer');
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_DC23_Contact as Contact', array(
+                'local' => 'contact_id',
+                'foreign' => 'id',
+                'onDelete' => 'CASCADE'
+            )
+        );
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC23bTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC23bTestCase.php
new file mode 100644
index 000000000..682844ff2
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC23bTestCase.php
@@ -0,0 +1,226 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC23b_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC23b_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_Product';
+        $this->tables[] = 'Ticket_Site';
+        $this->tables[] = 'Ticket_Multiple';
+        $this->tables[] = 'Ticket_MultipleValue';
+        parent::prepareTables();
+    }
+
+    public function testInlineSite()
+    {
+        $yml = <<<END
+---
+Ticket_Product: 
+  Product_1: 
+    name: book
+    Site:
+      name: test
+END;
+        try {
+            file_put_contents('test.yml', $yml);
+            Doctrine_Core::loadData('test.yml', true);
+
+            $this->conn->clear();
+
+            $query = new Doctrine_Query();
+            $query->from('Ticket_Product p, p.Site s')
+                ->where('p.name = ?', 'book');
+
+            $product = $query->execute()->getFirst();
+
+            $this->assertEqual($product->name, 'book');
+            $this->assertEqual(is_object($product->Site), true);
+            $this->assertEqual($product->Site->name, 'test');
+
+            $this->pass();
+        } catch (Exception $e) {
+            //echo $e->getMessage();
+            $this->fail();
+        }
+
+        unlink('test.yml');
+    }
+
+    public function testMultiple()
+    {
+        $yml = <<<END
+---
+Ticket_Multiple:
+  ISBN:
+    name: isbn
+
+Ticket_Product: 
+  Product_1: 
+    name: book2
+
+Ticket_MultipleValue:
+  Val_1:
+    value: 123345678
+    Multiple: ISBN
+    Product: Product_1
+END;
+        try {
+            file_put_contents('test.yml', $yml);
+            Doctrine_Core::loadData('test.yml', true);
+
+            $this->conn->clear();
+
+            $query = new Doctrine_Query();
+            $query->from('Ticket_Product p, p.MultipleValues v, v.Multiple m')
+                ->where('p.name = ?', 'book2');
+
+            $product = $query->fetchOne();
+
+            $this->assertEqual($product->name, 'book2');
+            $this->assertEqual($product->MultipleValues->count(), 1);
+            $this->assertEqual($product->MultipleValues[0]->value, '123345678');
+            $this->assertEqual(is_object($product->MultipleValues[0]->Multiple), true);
+            $this->assertEqual($product->MultipleValues[0]->Multiple->name, 'isbn');
+
+            $this->pass();
+        } catch (Exception $e) {
+            echo $e->getMessage();
+            $this->fail();
+        }
+
+        unlink('test.yml');
+    }
+
+    public function testInlineMultiple()
+    {
+        $yml = <<<END
+---
+Ticket_Multiple:
+  ISBN2:
+    name: isbn2
+
+Ticket_Product: 
+  Product_1: 
+    name: book3
+    MultipleValues:
+      Multi_1:
+        value: 123345678
+        Multiple: ISBN2
+END;
+        try {
+            file_put_contents('test.yml', $yml);
+            Doctrine_Core::loadData('test.yml', true);
+
+            $this->conn->clear();
+
+            $query = new Doctrine_Query();
+            $query->from('Ticket_Product p, p.MultipleValues v, v.Multiple m')
+                ->where('p.name = ?', 'book3');
+
+            $product = $query->fetchOne();
+
+            $this->assertEqual($product->name, 'book3');
+            $this->assertEqual($product->MultipleValues->count(), 1);
+            $this->assertEqual($product->MultipleValues[0]->value, '123345678');
+            $this->assertEqual(is_object($product->MultipleValues[0]->Multiple), true);
+            $this->assertEqual($product->MultipleValues[0]->Multiple->name, 'isbn2');
+
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail();
+        }
+
+        unlink('test.yml');
+    }
+}
+
+class Ticket_Product extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('site_id', 'integer', null, array('type' => 'integer'));
+        $this->hasColumn('name', 'string', 255, array('type' => 'string', 'notnull' => true, 'length' => '255'));
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_Site as Site', array('local' => 'site_id',
+                                    'foreign' => 'id'));
+        $this->hasMany('Ticket_MultipleValue as MultipleValues', array('local' => 'id',
+                                                              'foreign' => 'product_id'));
+    }
+}
+class Ticket_Site extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255, array('type' => 'string', 'length' => '255'));
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_Product as Products', array('local' => 'id',
+                                        'foreign' => 'site_id'));
+    }
+}
+class Ticket_Multiple extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255, array('type' => 'string', 'notnull' => true, 'length' => '255'));
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_MultipleValue as MultipleValues', array('local' => 'id',
+                                                 'foreign' => 'multiple_id'));
+    }
+}
+class Ticket_MultipleValue extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('product_id', 'integer', null, array('type' => 'integer', 'primary' => true));
+        $this->hasColumn('multiple_id', 'integer', null, array('type' => 'integer', 'primary' => true));
+        $this->hasColumn('value', 'clob', null, array('type' => 'clob'));
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_Multiple as Multiple', array('local' => 'multiple_id',
+                                                       'foreign' => 'id'));
+
+        $this->hasOne('Ticket_Product as Product', array('local' => 'product_id',
+                                        'foreign' => 'id'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC240TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC240TestCase.php
new file mode 100644
index 000000000..a3458f255
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC240TestCase.php
@@ -0,0 +1,115 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC240_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC240_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC240_User';
+        $this->tables[] = 'Ticket_DC240_Role';
+        $this->tables[] = 'Ticket_DC240_UserRole';
+        $this->tables[] = 'Ticket_DC240_RoleReference';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $q = Doctrine_Query::create()
+        	->from('Ticket_DC240_User u')
+        	->leftJoin('u.Roles r')
+        	->leftJoin('r.Parents p')
+        	->orderBy('username ASC');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT t.id AS t__id, t.username AS t__username, t.password AS t__password, t2.id AS t2__id, t2.name AS t2__name, t4.id AS t4__id, t4.name AS t4__name FROM ticket__d_c240__user t LEFT JOIN ticket__d_c240__user_role t3 ON (t.id = t3.id_user) LEFT JOIN ticket__d_c240__role t2 ON t2.id = t3.id_role LEFT JOIN ticket__d_c240__role_reference t5 ON (t2.id = t5.id_role_child) LEFT JOIN ticket__d_c240__role t4 ON t4.id = t5.id_role_parent ORDER BY t.username ASC, t3.position ASC, t5.position DESC');
+    }
+}
+
+class Ticket_DC240_User extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->hasColumn('username', 'string', 64, array('notnull' => true));
+		$this->hasColumn('password', 'string', 128, array('notnull' => true));
+	}
+	
+	public function setUp()
+	{
+		$this->hasMany('Ticket_DC240_Role as Roles', array('local' => 'id_user', 'foreign' => 'id_role', 'refClass' => 'Ticket_DC240_UserRole', 'orderBy' => 'position ASC'));
+	}
+}
+
+class Ticket_DC240_Role extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->hasColumn('name', 'string', 64);
+	}
+	
+	public function setUp()
+	{
+		$this->hasMany('Ticket_DC240_User as Users', array('local' => 'id_role', 'foreign' => 'id_user', 'refClass' => 'Ticket_DC240_UserRole', 'orderBy' => 'position ASC'));
+		$this->hasMany('Ticket_DC240_Role as Parents', array('local' => 'id_role_child', 'foreign' => 'id_role_parent', 'refClass' => 'Ticket_DC240_RoleReference', 'orderBy' => 'position DESC'));
+		$this->hasMany('Ticket_DC240_Role as Children', array('local' => 'id_role_parent', 'foreign' => 'id_role_child', 'refClass' => 'Ticket_DC240_RoleReference', 'orderBy' => 'position ASC'));
+	}
+}
+
+class Ticket_DC240_UserRole extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->hasColumn('id_user', 'integer', null, array('primary' => true));
+		$this->hasColumn('id_role', 'integer', null, array('primary' => true));
+		$this->hasColumn('position', 'integer', null, array('notnull' => true));
+	}
+	
+	public function setUp()
+	{
+		$this->hasOne('Ticket_DC240_User as User', array('local' => 'id_user', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+		$this->hasOne('Ticket_DC240_Role as Role', array('local' => 'id_role', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+	}
+}
+
+class Ticket_DC240_RoleReference extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->hasColumn('id_role_parent', 'integer', null, array('primary' => true));
+		$this->hasColumn('id_role_child', 'integer', null, array('primary' => true));
+		$this->hasColumn('position', 'integer', null, array('notnull' => true));
+	}
+	
+	public function setUp()
+	{
+		$this->hasOne('Ticket_DC240_Role as Parent', array('local' => 'id_role_parent', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+		$this->hasOne('Ticket_DC240_Role as Child', array('local' => 'id_role_child', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+	}
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC241TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC241TestCase.php
new file mode 100644
index 000000000..c31059c01
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC241TestCase.php
@@ -0,0 +1,96 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC241_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC241_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC241_Poll';
+        $this->tables[] = 'Ticket_DC241_PollAnswer';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $q = Doctrine_Query::create()
+        	->from('Ticket_DC241_Poll p')
+        	->leftJoin('p.Answers pa ON pa.votes = ?', 100)
+        	->addWhere('p.id = ?', 200)
+        	->addWhere('p.id = ?', 300)
+        	->addWhere('p.id = ?', 400)
+        	->addWhere('p.id = ?', 400)
+        	->groupBy('p.id')
+        	->having('p.id > ?', 300)
+        	->limit(10);
+
+        $this->assertEqual($q->getCountSqlQuery(), 'SELECT COUNT(*) AS num_results FROM (SELECT t.id FROM ticket__d_c241__poll t LEFT JOIN module_polls_answers m ON (m.votes = ?) WHERE t.id = ? AND t.id = ? AND t.id = ? AND t.id = ? GROUP BY t.id HAVING t.id > ?) dctrn_count_query');
+
+        try {
+            $q->count();
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+}
+
+class Ticket_DC241_Poll extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->hasColumn('id_category', 'integer', null, array('notnull' => true));
+		$this->hasColumn('question', 'string', 256);
+	}
+	
+	public function setUp()
+	{
+		$this->hasMany('Ticket_DC241_PollAnswer as Answers', array('local' => 'id', 'foreign' => 'id_poll', 'orderBy' => 'position'));
+	}
+}
+
+class Ticket_DC241_PollAnswer extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->setTableName('module_polls_answers');
+		
+		$this->hasColumn('id_poll', 'integer', null, array('notnull' => true));
+		$this->hasColumn('answer', 'string', 256);
+		$this->hasColumn('votes', 'integer', null, array('notnull' => true, 'default' => 0));
+		$this->hasColumn('position', 'integer');
+	}
+	
+	public function setUp()
+	{
+		$this->hasOne('Ticket_DC241_Poll as Poll', array('local' => 'id_poll', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+	}
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC242TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC242TestCase.php
new file mode 100644
index 000000000..d744899c9
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC242TestCase.php
@@ -0,0 +1,134 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC242_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC242_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC242_User';
+        $this->tables[] = 'Ticket_DC242_Role';
+        $this->tables[] = 'Ticket_DC242_UserRole';
+        $this->tables[] = 'Ticket_DC242_RoleReference';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $role = new Ticket_DC242_Role();
+        $role->name = 'publisher';
+        $role->save();
+
+        $role = new Ticket_DC242_Role();
+        $role->name = 'reviewer';
+        $role->save();
+
+        $role = new Ticket_DC242_Role();
+        $role->name = 'mod';
+        $role->save();
+
+        $user = new Ticket_DC242_User();
+        $user->fromArray(array(
+        	'username' => 'test',
+        	'password' => 'test',
+        	'Roles' => array(1, 2, 3),
+        ));
+        $user->save();
+
+        $user->fromArray(array(
+        	'Roles' => array(1, 3),
+        ));
+        $user->save();
+        $user->refresh(true);
+
+        $this->assertEqual($user->Roles[0]->id, 1);
+        $this->assertEqual($user->Roles[1]->id, 3);
+    }
+}
+
+class Ticket_DC242_User extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->hasColumn('username', 'string', 64, array('notnull' => true));
+		$this->hasColumn('password', 'string', 128, array('notnull' => true));
+	}
+
+	public function setUp()
+	{
+		$this->hasMany('Ticket_DC242_Role as Roles', array('local' => 'id_user', 'foreign' => 'id_role', 'refClass' => 'Ticket_DC242_UserRole'));
+	}
+}
+
+class Ticket_DC242_Role extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->hasColumn('name', 'string', 64);
+	}
+
+	public function setUp()
+	{
+		$this->hasMany('Ticket_DC242_User as Users', array('local' => 'id_role', 'foreign' => 'id_user', 'refClass' => 'Ticket_DC242_UserRole'));
+		$this->hasMany('Ticket_DC242_Role as Parents', array('local' => 'id_role_child', 'foreign' => 'id_role_parent', 'refClass' => 'Ticket_DC242_RoleReference'));
+		$this->hasMany('Ticket_DC242_Role as Children', array('local' => 'id_role_parent', 'foreign' => 'id_role_child', 'refClass' => 'Ticket_DC242_RoleReference'));
+	}
+}
+
+class Ticket_DC242_UserRole extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->hasColumn('id_user', 'integer', null, array('primary' => true));
+		$this->hasColumn('id_role', 'integer', null, array('primary' => true));
+	}
+
+	public function setUp()
+	{
+		$this->hasOne('Ticket_DC242_User as User', array('local' => 'id_user', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+		$this->hasOne('Ticket_DC242_Role as Role', array('local' => 'id_role', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+	}
+}
+
+class Ticket_DC242_RoleReference extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->hasColumn('id_role_parent', 'integer', null, array('primary' => true));
+		$this->hasColumn('id_role_child', 'integer', null, array('primary' => true));
+	}
+
+	public function setUp()
+	{
+		$this->hasOne('Ticket_DC242_Role as Parent', array('local' => 'id_role_parent', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+		$this->hasOne('Ticket_DC242_Role as Child', array('local' => 'id_role_child', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+	}
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC24TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC24TestCase.php
new file mode 100644
index 000000000..424443366
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC24TestCase.php
@@ -0,0 +1,139 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC24_TestCase
+ *
+ * @package     Doctrine
+ * @author      Tomasz Jędrzejewski <http://www.zyxist.com/>
+ * @author      Jacek Jędrzejewski <http://www.jacek.jedrzejewski.name/>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.1
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC24_TestCase extends Doctrine_UnitTestCase 
+{
+	
+	public function prepareTables()
+	{
+        $this->tables = array('ticket_DC24_master', 'ticket_DC24_servant');
+        parent::prepareTables();
+	} // end prepareTables();
+	
+	public function prepareData()
+	{
+		$servant = new Ticket_DC24_Servant;
+		$servant->bar = 6;
+		$servant->save();
+		
+		$servantId = $servant->identifier();
+		
+		$master = new Ticket_DC24_Master;
+		$master->foo = 6;
+		$master->servant_id = $servantId['id'];
+		$master->save();
+	} // end prepareData();
+	
+	public function testTest()
+	{
+		try
+		{
+			$master = Doctrine_Query::create()
+				->select('m.*, s.bar AS joe')
+				->from('Ticket_DC24_Master m')
+				->innerJoin('m.Ticket_DC24_Servant s')
+				->where('m.id = 1')
+				->fetchOne();
+                
+			$master->foo = 5;
+			$master->save();
+            
+            $master2 = Doctrine_Query::create()
+				->select('m.*')
+				->from('Ticket_DC24_Master m')
+				->where('m.id = 1')
+				->fetchOne(array(), Doctrine_Core::HYDRATE_ARRAY);
+            $this->assertEqual($master2['servant_id'], 1);
+		}
+		catch(Exception $e)
+		{
+			$this->fail($e->getMessage());
+		}
+	} // end testTest();
+
+} // end Doctrine_Ticket_DC24_TestCase;
+
+class Ticket_DC24_Master extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', 4, array(
+             'type' => 'integer',
+             'primary' => true,
+             'autoincrement' => true,
+             'length' => '4',
+             ));
+        $this->hasColumn('foo', 'integer', 4, array(
+             'type' => 'integer',
+             'notnull' => true,
+             'length' => '4',
+             ));
+        $this->hasColumn('servant_id', 'integer', 4, array(
+             'type' => 'integer',
+             //'notnull' => true,
+             'length' => '4',
+             ));
+    } // end setTableDefinition();
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_DC24_Servant', array(
+             'local' => 'servant_id',
+             'foreign' => 'id'));
+    } // end setUp();
+} // end Ticket_DC24_Master;
+
+class Ticket_DC24_Servant extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', 4, array(
+             'type' => 'integer',
+             'primary' => true,
+             'autoincrement' => true,
+             'length' => '4',
+             ));
+        $this->hasColumn('bar', 'integer', 4, array(
+             'type' => 'integer',
+             'notnull' => true,
+             'length' => '4',
+             ));
+    } // end setTableDefinition();
+	
+	public function setUp()
+	{
+		$this->hasMany('Ticket_DC24_Master as Masters', array(
+             'local' => 'id',
+             'foreign' => 'servant_id'));
+	} // end setUp();
+} // end Ticket_DC24_Servant;
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC25TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC25TestCase.php
new file mode 100644
index 000000000..ed167a9a4
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC25TestCase.php
@@ -0,0 +1,95 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC25_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC25_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC25_Article';
+        $this->tables[] = 'Ticket_DC25_Tag';
+        $this->tables[] = 'Ticket_DC25_ArticleTag';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $q = Doctrine_Core::getTable('Ticket_DC25_Article')
+            ->createQuery('a')
+            ->leftJoin('a.Tags t1')
+            ->leftJoin('a.Tags t2');
+
+        $this->assertEqual($q->getSqlQuery(), 'SELECT t.id AS t__id, t.name AS t__name, t2.id AS t2__id, t2.name AS t2__name, t4.id AS t4__id, t4.name AS t4__name FROM ticket__d_c25__article t LEFT JOIN ticket__d_c25__article_tag t3 ON (t.id = t3.article_id) LEFT JOIN ticket__d_c25__tag t2 ON t2.id = t3.tag_id LEFT JOIN ticket__d_c25__article_tag t5 ON (t.id = t5.article_id) LEFT JOIN ticket__d_c25__tag t4 ON t4.id = t5.tag_id');
+    }
+}
+
+class Ticket_DC25_Article extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_DC25_Tag as Tags', array(
+            'local' => 'article_id',
+            'foreign' => 'tag_id',
+            'refClass' => 'Ticket_DC25_ArticleTag'
+        ));
+    }
+}
+
+class Ticket_DC25_Tag extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_DC25_Article as Article', array(
+            'local' => 'tag_id',
+            'foreign' => 'article_id',
+            'refClass' => 'Ticket_DC25_ArticleTag'
+        ));
+    }
+}
+
+class Ticket_DC25_ArticleTag extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('article_id', 'integer');
+        $this->hasColumn('tag_id', 'integer');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC266TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC266TestCase.php
new file mode 100644
index 000000000..66323dd86
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC266TestCase.php
@@ -0,0 +1,61 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC266_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC266_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC266_Article';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $this->assertEqual('my_table_name_translation', Doctrine_Core::getTable('Ticket_DC266_ArticleTranslation')->getTableName());
+    }
+}
+
+class Ticket_DC266_Article extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('my_table_name');
+        $this->hasColumn('title', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('I18n', array(
+            'fields' => array('title')
+        ));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC267TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC267TestCase.php
new file mode 100644
index 000000000..9c3f63303
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC267TestCase.php
@@ -0,0 +1,57 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC267_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC267_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $q = Doctrine_Query::create()
+            ->select ('u.*, COUNT(e.id) as num_emails')
+            ->from('User u')
+            ->leftJoin('u.Email e')
+            ->groupBy('u.id');
+
+        $res = $q->fetchArray();
+        $this->assertEqual($res[0]['num_emails'], '1');
+
+        $q = Doctrine_Query::create()
+            ->select ('u.*, e.*, e.address as my_address')
+            ->from('User u')
+            ->leftJoin('u.Email e');
+
+        $res = $q->fetchArray();
+
+        $this->assertEqual($res[0]['Email']['my_address'], 'zYne@example.com');
+        $this->assertEqual($res[0]['my_address'], 'zYne@example.com');
+        $this->assertEqual($res[1]['my_address'], 'arnold@example.com');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC276TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC276TestCase.php
new file mode 100644
index 000000000..438b573a7
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC276TestCase.php
@@ -0,0 +1,94 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC276_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC276_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC276_Post';
+        $this->tables[] = 'Ticket_DC276_Comment';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $q = Doctrine_Query::create()
+            ->from('Ticket_DC276_Post p, p.Comments c')
+            ->select('p.*, c.*, COUNT(c.id) AS comment_count')
+            ->groupBy('p.id')
+            ->having('comment_count <= p.max_comments');
+        $this->assertEqual($q->getSqlQuery(), 'SELECT t.id AS t__id, t.content AS t__content, t.max_comments AS t__max_comments, t2.id AS t2__id, t2.post_id AS t2__post_id, t2.content AS t2__content, COUNT(t2.id) AS t2__0 FROM ticket__d_c276__post t LEFT JOIN ticket__d_c276__comment t2 ON t.id = t2.post_id GROUP BY t.id HAVING t2__0 <= t.max_comments');
+        $q->execute();
+    }
+}
+
+class Ticket_DC276_Post extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('content', 'string', 1000, array(
+             'type' => 'string',
+             'length' => '1000',
+             ));
+        $this->hasColumn('max_comments', 'integer', null, array(
+             'type' => 'integer',
+             ));
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Ticket_DC276_Comment as Comments', array(
+             'local' => 'id',
+             'foreign' => 'post_id'));
+    }
+}
+
+class Ticket_DC276_Comment extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('post_id', 'integer', null, array(
+             'type' => 'integer',
+             ));
+        $this->hasColumn('content', 'string', 100, array(
+             'type' => 'string',
+             'length' => '100',
+             ));
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('Ticket_DC276_Post', array(
+             'local' => 'post_id',
+             'foreign' => 'id'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC28TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC28TestCase.php
new file mode 100644
index 000000000..02fed656b
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC28TestCase.php
@@ -0,0 +1,94 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC28_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC28_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC28_Tree';
+        parent::prepareTables();
+    }
+
+    public function testQuery()
+    {
+        try {
+            $q = Doctrine_Query::create()
+                ->select('a.id, t.lang')
+                ->from('Ticket_DC28_Tree a')
+                ->innerJoin('a.Translation t WITH t.name != ?', 'test')
+                ;
+            $q->execute();
+            //echo $q->getSqlQuery().PHP_EOL;
+            
+            $this->assertEqual(
+                $q->getSqlQuery(), 
+                'SELECT t.id AS t__id, t2.id AS t2__id, t2.lang AS t2__lang '.
+                'FROM ticket__d_c28__tree t '.
+                'INNER JOIN ticket__d_c28__tree_translation t2 '.
+                'ON t.id = t2.id AND (t2.name != ?)'
+            );
+            
+            //echo $q->getSqlQuery().PHP_EOL;
+            $tree_table = Doctrine_Core::getTable('Ticket_DC28_Tree');
+            $tree = $tree_table->getTree();
+            $tree->setBaseQuery($q);
+            //echo $q->getSqlQuery().PHP_EOL;
+            
+            $this->assertEqual(
+                $q->getSqlQuery(), 
+                'SELECT t.id AS t__id, t.lft AS t__lft, t.rgt AS t__rgt, t.level AS t__level, t2.id AS t2__id, t2.lang AS t2__lang '.
+                'FROM ticket__d_c28__tree t '.
+                'INNER JOIN ticket__d_c28__tree_translation t2 '.
+                'ON t.id = t2.id AND (t2.name != ?)'
+            );
+            
+            //$this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+    }
+}
+
+class Ticket_DC28_Tree extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $i18n = new Doctrine_Template_I18n(array('fields' => array(0 => 'name')));
+        $this->actAs($i18n);
+        $this->actAs('NestedSet');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC292/from.yml b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC292/from.yml
new file mode 100644
index 000000000..b0368a405
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC292/from.yml
@@ -0,0 +1,4 @@
+Article:
+  columns:
+    title: string(255)
+    body: clob
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC292/to.yml b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC292/to.yml
new file mode 100644
index 000000000..eae65a893
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC292/to.yml
@@ -0,0 +1,5 @@
+Article:
+  actAs: [Timestampable]
+  columns:
+    title: string(255)
+    body: clob
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC292TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC292TestCase.php
new file mode 100644
index 000000000..e0ecb5f14
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC292TestCase.php
@@ -0,0 +1,48 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC292_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC292_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $dir = dirname(__FILE__) . '/DC292/migrations';
+        if ( ! is_dir($dir)) {
+            mkdir($dir, 0777, true);
+        }
+        $migration = new Doctrine_Migration($dir);
+        $diff = new Doctrine_Migration_Diff(dirname(__FILE__) . '/DC292/from.yml', dirname(__FILE__) . '/DC292/to.yml', $migration);
+        $changes = $diff->generateChanges();
+        $this->assertEqual(2, count($changes['created_columns']['article']));
+        $this->assertTrue(isset($changes['created_columns']['article']['created_at']));
+        $this->assertTrue(isset($changes['created_columns']['article']['updated_at']));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC300TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC300TestCase.php
new file mode 100644
index 000000000..c567c4a64
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC300TestCase.php
@@ -0,0 +1,127 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC300_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC300_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData()
+    {
+        $g1 = new Ticket_DC300_Group();
+        $g1['name'] = 'group1';
+        $g1->save();
+
+        $g2 = new Ticket_DC300_Group();
+        $g2['name'] = 'group2';
+        $g2->save();
+
+        $g3 = new Ticket_DC300_Group();
+        $g3['name'] = 'group3';
+        $g3->save();
+
+        $u1 = new Ticket_DC300_User();
+        $u1['name'] = 'user1';
+        $u1['Groups']->add($g1);
+        $u1['Groups']->add($g2);
+        $u1->save();
+    }
+
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC300_Group';
+        $this->tables[] = 'Ticket_DC300_User';
+        $this->tables[] = 'Ticket_DC300_UserGroup';
+        parent::prepareTables();
+    }
+
+    public function testRefTableEntriesOnManyToManyRelationsWithSynchronizeWithArray()
+    {
+		$u1 = Doctrine_Core::getTable('Ticket_DC300_User')->find(1);
+
+		// update the groups user (id 1) is linked to
+		$u1->synchronizeWithArray(array(
+			'Groups' => array(
+				array('name' => 'group1 update'),
+				array('name' => 'group2 update')
+			)
+		));
+		$u1->save();
+
+		// update the user-objects with real data from database
+		$u1->loadReference('Groups');
+
+		// check wether the two database-entries in RefTable exists
+		$this->assertEqual(count($u1->Groups), 2);
+    }
+   
+}
+
+class Ticket_DC300_Group extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->hasColumn('name', 'string', 255);
+	}
+	
+	public function setUp()
+	{
+		$this->hasMany('Ticket_DC300_User as Users', array(
+			'local' => 'group_id',
+			'foreign' => 'user_id',
+			'refClass' => 'Ticket_DC300_UserGroup'
+		));
+	}
+}
+
+class Ticket_DC300_User extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->hasColumn('name', 'string', 255);
+	}
+
+	public function setUp()
+	{
+		$this->hasMany('Ticket_DC300_Group as Groups', array(
+			'local' => 'user_id',
+			'foreign' => 'group_id',
+			'refClass' => 'Ticket_DC300_UserGroup'
+		));
+	}
+}
+
+class Ticket_DC300_UserGroup extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->hasColumn('user_id', 'integer');
+		$this->hasColumn('group_id', 'integer');
+	}
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC302TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC302TestCase.php
new file mode 100644
index 000000000..c71e70752
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC302TestCase.php
@@ -0,0 +1,184 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC302_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC302_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC302_Role';
+        $this->tables[] = 'Ticket_DC302_RoleReference';
+        $this->tables[] = 'Ticket_DC302_User';
+        $this->tables[] = 'Ticket_DC302_UserRole';
+        parent::prepareTables();
+    }
+    
+    public function prepareData()
+    {
+        $role1 = new Ticket_DC302_Role();
+        $role1->name = 'admin'; // id: 1
+        $role1->save();
+        
+        $role2 = new Ticket_DC302_Role();
+        $role2->name = 'publisher'; // id: 2
+        $role2->save();
+        
+        $role3 = new Ticket_DC302_Role();
+        $role3->name = 'reviewer'; // id: 3
+        $role3->save();
+        
+        $role4 = new Ticket_DC302_Role();
+        $role4->name = 'mod'; // id: 4
+        $role4->save();
+        
+        // reviewer inherits from admin, mod, publisher - in that order
+        $role3->Parents[] = $role1;
+        $role3->Parents[] = $role4;
+        $role3->Parents[] = $role2;
+        $role3->save();
+        
+        // update positions
+        $query = Doctrine_Query::create()
+            ->update('Ticket_DC302_RoleReference')
+            ->set('position', '?', 0)
+            ->where('id_role_child = ?', 3)
+            ->andWhere('id_role_parent = ?', 1)
+            ->execute();
+        $query = Doctrine_Query::create()
+            ->update('Ticket_DC302_RoleReference')
+            ->set('position', '?', 1)
+            ->where('id_role_child = ?', 3)
+            ->andWhere('id_role_parent = ?', 4)
+            ->execute();
+        $query = Doctrine_Query::create()
+            ->update('Ticket_DC302_RoleReference')
+            ->set('position', '?', 2)
+            ->where('id_role_child = ?', 3)
+            ->andWhere('id_role_parent = ?', 2)
+            ->execute();
+            
+            
+        $user = new Ticket_DC302_User();
+        $user->username = 'test';
+        $user->password = 'test';
+        $user->fromArray(array('Roles' => array(4, 2)));
+        $user->save();
+        // update positions
+        $query = Doctrine_Query::create()
+            ->update('Ticket_DC302_UserRole')
+            ->set('position', '?', 0)
+            ->where('id_user = ?', 1)
+            ->andWhere('id_role = ?', 4)
+            ->execute();
+        $query = Doctrine_Query::create()
+            ->update('Ticket_DC302_UserRole')
+            ->set('position', '?', 1)
+            ->where('id_user = ?', 1)
+            ->andWhere('id_role = ?', 2)
+            ->execute();
+    }
+    
+    public function testTest()
+    {
+        $profiler = new Doctrine_Connection_Profiler();
+        $this->conn->addListener($profiler);
+
+		$role = Doctrine_Core::getTable('Ticket_DC302_Role')->find(3);
+		$parents = $role->Parents->toArray();
+        
+        $this->assertEqual($parents[1]['Ticket_DC302_RoleReference'][0]['position'], 1);
+
+        $events = $profiler->getAll();
+        $event = array_pop($events);
+        $this->assertEqual($event->getQuery(), 'SELECT ticket__d_c302__role.id AS ticket__d_c302__role__id, ticket__d_c302__role.name AS ticket__d_c302__role__name, ticket__d_c302__role_reference.id_role_parent AS ticket__d_c302__role_reference__id_role_parent, ticket__d_c302__role_reference.id_role_child AS ticket__d_c302__role_reference__id_role_child, ticket__d_c302__role_reference.position AS ticket__d_c302__role_reference__position FROM ticket__d_c302__role INNER JOIN ticket__d_c302__role_reference ON ticket__d_c302__role.id = ticket__d_c302__role_reference.id_role_parent WHERE ticket__d_c302__role.id IN (SELECT id_role_parent FROM ticket__d_c302__role_reference WHERE id_role_child = ?) ORDER BY position');
+    }
+}
+
+class Ticket_DC302_Role extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 64);
+    }
+    
+    public function setUp()
+    {
+        $this->hasMany('Ticket_DC302_User as Users', array('local' => 'id_role', 'foreign' => 'id_user', 'refClass' => 'Ticket_DC302_UserRole'));
+        $this->hasMany('Ticket_DC302_Role as Parents', array('local' => 'id_role_child', 'foreign' => 'id_role_parent', 'refClass' => 'Ticket_DC302_RoleReference', 'orderBy' => 'position'));
+        $this->hasMany('Ticket_DC302_Role as Children', array('local' => 'id_role_parent', 'foreign' => 'id_role_child', 'refClass' => 'Ticket_DC302_RoleReference'));
+    }
+}
+
+class Ticket_DC302_RoleReference extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id_role_parent', 'integer', null, array('primary' => true));
+        $this->hasColumn('id_role_child', 'integer', null, array('primary' => true));
+        $this->hasColumn('position', 'integer', null, array('notnull' => true, 'default' => 0));
+    }
+    
+    public function setUp()
+    {
+        $this->hasOne('Ticket_DC302_Role as Parent', array('local' => 'id_role_parent', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+        $this->hasOne('Ticket_DC302_Role as Child', array('local' => 'id_role_child', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+    }
+}
+
+class Ticket_DC302_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 64, array('notnull' => true));
+        $this->hasColumn('password', 'string', 128, array('notnull' => true));
+    }
+    
+    public function setUp()
+    {
+        $this->hasMany('Ticket_DC302_Role as Roles', array('local' => 'id_user', 'foreign' => 'id_role', 'refClass' => 'Ticket_DC302_UserRole', 'orderBy' => 'position'));
+    }
+}
+
+class Ticket_DC302_UserRole extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id_user', 'integer', null, array('primary' => true));
+        $this->hasColumn('id_role', 'integer', null, array('primary' => true));
+        $this->hasColumn('position', 'integer', null, array('notnull' => true, 'default' => 0));
+    }
+    
+    public function setUp()
+    {
+        $this->hasOne('Ticket_DC302_User as User', array('local' => 'id_user', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+        $this->hasOne('Ticket_DC302_Role as Role', array('local' => 'id_role', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC317TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC317TestCase.php
new file mode 100644
index 000000000..70f33b881
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC317TestCase.php
@@ -0,0 +1,86 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC317_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC317_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC317_Page';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $page = new Ticket_DC317_Page();
+        $page->topic = 'my-topic';
+        $page->title = 'My Title';
+        $page->save();
+
+        $tree = Doctrine_Core::getTable('Ticket_DC317_Page')->getTree();
+        $tree->createRoot( $page );
+
+        $this->assertEqual($page->topic, 'my-topic');
+
+        $tree = $tree->fetchTree(array('root_id' => 'my-topic'));
+        $this->assertTrue($tree instanceof Doctrine_Collection);
+    }
+}
+
+class Ticket_DC317_Page extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('topic', 'string', 32, array(
+             'type' => 'string',
+             'notnull' => true,
+             'length' => '32',
+             ));
+        $this->hasColumn('title', 'string', 255, array(
+             'type' => 'string',
+             'notnull' => true,
+             'length' => '255',
+             ));
+
+        $this->option('type', 'InnoDB');
+        $this->option('collate', 'utf8_unicode_ci');
+        $this->option('charset', 'utf8');
+    }
+
+    public function setUp()
+    {
+        $nestedset0 = new Doctrine_Template_NestedSet(array(
+             'hasManyRoots' => true,
+             'rootColumnName' => 'topic',
+             ));
+        $this->actAs($nestedset0);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC36TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC36TestCase.php
new file mode 100644
index 000000000..e1f9eef12
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC36TestCase.php
@@ -0,0 +1,35 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC36_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC36_TestCase extends Doctrine_UnitTestCase 
+{
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC399TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC399TestCase.php
new file mode 100644
index 000000000..53d0d4c49
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC399TestCase.php
@@ -0,0 +1,65 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.phpdoctrine.org>.
+ */
+
+/**
+ * Doctrine_Template_TestCase
+ *
+ * @package     Doctrine
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.phpdoctrine.org
+ * @since       1.2
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC399_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+      parent::prepareTables();
+    }
+    public function prepareData() 
+    {
+      $user = new User();
+      $user->name = "sacho";
+      $user->Phonenumber[0]->phonenumber = "1234567";
+      $user->Phonenumber[1]->phonenumber = "123123123";
+      $user->Phonenumber[2]->phonenumber = "345345345";
+
+      $user->save();
+    }
+
+    public function testUnlinkCausesDeleteAfterSave()
+    {
+      $user = Doctrine_Core::getTable("User")->findOneByName("sacho");
+      $user->refreshRelated("Phonenumber");
+      
+      //Unlinking(even with now=true) removes the connection between User and Phonenumber, but does not delete the phone number
+      //Only updates phonenumber's user_id to null
+      //However, if we unlink and then save the $user, the phonenumber is deleted from the database
+
+      $phone_id = $user->Phonenumber[0]->id;
+      $user->unlink("Phonenumber", $user->Phonenumber[0]->id);
+      $user->save();
+
+      $phone = Doctrine_Core::getTable("Phonenumber")->find($phone_id);
+      $this->assertEqual($phone_id, $phone->id);
+    }
+
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC39TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC39TestCase.php
new file mode 100644
index 000000000..4467a5445
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC39TestCase.php
@@ -0,0 +1,114 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC39_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC39_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData()
+    {
+        $g1 = new Ticket_DC39_Group();
+        $g1['name'] = 'group1';
+        $g1->save();
+
+        $g2 = new Ticket_DC39_Group();
+        $g2['name'] = 'group2';
+        $g2->save();
+
+        $u1 = new Ticket_DC39_User();
+        $u1['group_id'] = 1;
+        $u1['name'] = 'user1';
+        $u1->save();
+
+        $u2 = new Ticket_DC39_User();
+        $u2['group_id'] = 2;
+        $u2['name'] = 'user2';
+        $u2->save();
+    }
+
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC39_Group';
+        $this->tables[] = 'Ticket_DC39_User';
+        parent::prepareTables();
+    }
+
+    public function testOneToManyRelationsWithSynchronizeWithArray()
+    {
+    		// link group (id 2) with users (id 1,2)
+    		$group = Doctrine_Core::getTable('Ticket_DC39_Group')->find(2);
+    		$group->synchronizeWithArray(array(
+    			'Users' => array(1, 2)
+    		));
+    		$group->save();
+
+    		// update the user-objects with real data from database
+    		$user1 = Doctrine_Core::getTable('Ticket_DC39_User')->find(1);
+    		$user2 = Doctrine_Core::getTable('Ticket_DC39_User')->find(2);
+
+    		// compare the group_id (should be 2) with the group_id set through $group->synchronizeWithArray
+    		$this->assertEqual($group->Users[0]->group_id, 2);
+    		$this->assertEqual($group->Users[1]->group_id, 2);
+    }
+   
+}
+
+class Ticket_DC39_Group extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->hasColumn('name', 'string', 255);
+	}
+	
+	public function setUp()
+	{
+		$this->hasMany('Ticket_DC39_User as Users', array(
+			'local' => 'id',
+			'foreign' => 'group_id'
+		));
+	}
+}
+
+class Ticket_DC39_User extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->hasColumn('group_id', 'integer');
+		$this->hasColumn('name', 'string', 255);
+	}
+
+	public function setUp()
+	{
+		$this->hasOne('Ticket_DC39_Group as Group', array(
+			'local' => 'group_id',
+			'foreign' => 'id'
+		));
+	}
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC437TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC437TestCase.php
new file mode 100644
index 000000000..dfd9daad3
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC437TestCase.php
@@ -0,0 +1,122 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC437_TestCase
+ *
+ * @package     Doctrine
+ * @author      Eugene Janusov <esycat@gmail.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC437_TestCase extends Doctrine_UnitTestCase
+{
+    private function prepareConnections()
+    {
+    	// Establish two new individual connections
+        $dsn = 'sqlite::memory:';
+        $dbh = new PDO($dsn);
+        $this->manager->openConnection($dbh, 'conn1', false);
+
+        $dsn = 'sqlite::memory:';
+        $dbh = new PDO($dsn);
+        $this->manager->openConnection($dbh, 'conn2', false);
+    }
+
+    public function prepareTables()
+    {
+        // Don't see any better place to perform connection preparation
+        $this->prepareConnections();
+
+        $this->tables = array();
+        $this->tables[] = 'Doctrine_Ticket_DC437_Record';
+
+        /* Export classes for each of the existing connections.
+         *
+         * To trick Doctrine_Export::exportClasses() implementation to use
+         * a proper connection, we need to manually re-bind all the components.
+         */
+        foreach (array('conn1', 'conn2') as $dbConnName) {
+            $dbConn = $this->manager->getConnection($dbConnName);
+        	foreach ($this->tables as $componentName) {
+        	    $this->manager->bindComponent($componentName, $dbConn->getName());
+        	}
+        	$dbConn->export->exportClasses($this->tables);
+        }
+    }
+
+    public function prepareData()
+    {
+    	$conn1 = $this->manager->getConnection('conn1');
+        $conn2 = $this->manager->getConnection('conn2');
+
+        // Create 1 record using conn1, and 2 records using conn2
+        $r1 = new Doctrine_Ticket_DC437_Record();
+        $r1->save($conn1);
+
+        $r2 = new Doctrine_Ticket_DC437_Record();
+        $r2->save($conn2);
+        $r3 = new Doctrine_Ticket_DC437_Record();
+        $r3->save($conn2);
+    }
+
+    public function testConnectionQuery()
+    {
+        /* Let's retrieve all the records twice using different connections.
+         *
+         * Since we have created a different number of records for different
+         * connections (databases), we expect to get different values here.
+         *
+         * But due to the bug both queries will be performed using the same
+         * connection.
+         */
+
+    	$conn1 = $this->manager->getConnection('conn1');
+        $conn2 = $this->manager->getConnection('conn2');
+
+        $dql = 'FROM Doctrine_Ticket_DC437_Record';
+
+        $rs1 = $conn1->query($dql);
+        $rs2 = $conn2->query($dql);
+
+        $this->assertNotEqual(count($rs1), count($rs2));
+    }
+}
+
+class Doctrine_Ticket_DC437_Record extends Doctrine_Record {
+
+    public function setTableDefinition()
+    {
+        $this->setTableName('dc437records');
+
+        $this->hasColumn('id', 'integer', 5, array(
+            'unsigned'      => true,
+            'notnull'       => true,
+            'primary'       => true,
+            'autoincrement' => true
+        ));
+
+        $this->hasColumn('test', 'string');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC521TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC521TestCase.php
new file mode 100644
index 000000000..204f984de
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC521TestCase.php
@@ -0,0 +1,142 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+class DC521TestModel extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('dc521_test_model');
+        $this->hasColumn('id', 'integer', null, array(
+             'type' => 'integer',
+             'primary' => true,
+             'autoincrement' => true,
+             ));
+        $this->hasColumn('data', 'string', null, array(
+             'type' => 'string',
+             ));
+    }
+
+    public function setUp()
+    {
+        parent::setUp();
+        
+    }
+}
+
+class DC521IdOnlyTestModel extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('dc521_idonly_test_model');
+        $this->hasColumn('id', 'integer', null, array(
+             'type' => 'integer',
+             'primary' => true,
+             'autoincrement' => true,
+             ));
+    }
+
+    public function setUp()
+    {
+        parent::setUp();
+        
+    }
+}
+
+/**
+ * Doctrine_Ticket_DC521_TestCase
+ *
+ * @package     Doctrine
+ * @author      Gergely Kis <gergely.kis@mattakis.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.2
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC521_TestCase extends Doctrine_UnitTestCase 
+{
+    public function init()
+    {
+        Doctrine_Manager::connection('pgsql://test:test@localhost/doctrine', 'Pgsql');
+    	   $this->driverName = 'Pgsql';
+    	   parent::init();
+        $this->prepareTables();
+    }
+    
+    public function setUp()
+    {
+    	   $this->driverName = 'Pgsql';
+        Doctrine_Manager::connection('pgsql://test:test@localhost/doctrine', 'Pgsql');
+    	   parent::setUp();
+    }
+    
+    public function testEmptyPgsqlAutoIncrementField()
+    {
+        $m = new DC521TestModel();
+        $m->save();
+        $this->assertEqual($m->id, 1);
+    }
+
+    public function testIdOnlyPgsqlAutoIncrementField()
+    {
+        $m = new DC521IdOnlyTestModel();
+        $m->save();
+        $this->assertEqual($m->id, 1);
+    }
+    
+    public function testIdOnlyPgsqlAutoIncrementFieldWithDefinedValue()
+    {
+        $m = new DC521IdOnlyTestModel();
+        $m->id = 9999;
+        $m->save();
+        $this->assertEqual($m->id, 9999);
+    }
+    
+    public function testPgsqlAutoIncrementFieldWithDefinedValue()
+    {
+        $m = new DC521TestModel();
+        $m->id = 9999;
+        $m->save();
+        $this->assertEqual($m->id, 9999);
+    }
+    
+    public function testPgsqlAutoIncrementFieldWithDefinedValueAndData()
+    {
+        $m = new DC521TestModel();
+        $this->assertEqual($m->id, null);
+        $m->id = 111111;
+        $m->data = "testdata";
+        $m->save();
+        $this->assertEqual($m->id, 111111);
+    }
+    
+    public function prepareTables() 
+    {
+        $this->tables = array('DC521TestModel', 'DC521IdOnlyTestModel');
+        parent::prepareTables();
+    }
+    
+    public function tearDown()
+    {
+        Doctrine_Manager::resetInstance();
+    	   $this->driverName = null;
+    	   parent::tearDown();
+    }
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC56TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC56TestCase.php
new file mode 100644
index 000000000..8313b5c9c
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC56TestCase.php
@@ -0,0 +1,69 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC56_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC56_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC56_Location';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $test = new Ticket_DC56_Location();
+        $test->lat = 50;
+        $test->long = 50;
+        $q = $test->getDistanceQuery();
+        $this->assertEqual($q->getSqlQuery(), 'SELECT t.id AS t__id, t.title AS t__title, t.lat AS t__lat, t.long AS t__long, ((ACOS(SIN(50 * PI() / 180) * SIN(t.lat * PI() / 180) + COS(50 * PI() / 180) * COS(t.lat * PI() / 180) * COS((50 - t.long) * PI() / 180)) * 180 / PI()) * 60 * 1.1515) AS t__0, ((ACOS(SIN(50 * PI() / 180) * SIN(t.lat * PI() / 180) + COS(50 * PI() / 180) * COS(t.lat * PI() / 180) * COS((50 - t.long) * PI() / 180)) * 180 / PI()) * 60 * 1.1515 * 1.609344) AS t__1 FROM ticket__d_c56__location t');
+    }
+}
+
+class Ticket_DC56_Location extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('title', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('Geographical', array(
+            'latitude' => array(
+                'name' => 'lat'
+            ),
+            'longitude' => array(
+                'name' => 'long'
+            )
+        ));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC57TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC57TestCase.php
new file mode 100644
index 000000000..f8f3f8023
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC57TestCase.php
@@ -0,0 +1,72 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC57_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC57_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC57_Article';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $test = new Ticket_DC57_Article();
+        $test->date = '1985-09-01';
+        $test->timestamp = '1985-09-01 00:00:00';
+        $test->save();
+
+        $test->date = '1985-09-01';
+        $test->timestamp = '1985-09-01';
+        $this->assertFalse($test->isModified());
+    }
+
+    public function testOldDates()
+    {
+        $test = new Ticket_DC57_Article();
+        $test->timestamp = '1776-07-04';
+        $test->save();
+        
+        $test->timestamp = '1492-09-01';
+        $this->assertTrue($test->isModified());
+    }
+}
+
+class Ticket_DC57_Article extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('title', 'string', 255);
+        $this->hasColumn('date', 'date');
+        $this->hasColumn('timestamp', 'timestamp');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC63TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC63TestCase.php
new file mode 100644
index 000000000..df4b91e73
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC63TestCase.php
@@ -0,0 +1,62 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC63_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC63_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC63_User';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $sql = Doctrine_Core::generateSqlFromArray(array('Ticket_DC63_User'));
+        $this->assertEqual($sql[0], 'CREATE TABLE ticket__d_c63__user (id INTEGER, email_address VARCHAR(255) UNIQUE, username VARCHAR(255) NOT NULL UNIQUE, password VARCHAR(255), PRIMARY KEY(id, username))');
+    }
+}
+
+class Ticket_DC63_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', null, array('primary' => true));
+        $this->hasColumn('email_address', 'string', 255, array('unique' => false));
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255, array('primary' => true));
+
+        $this->setColumnOptions(array('username', 'email_address'), array('unique' => true));
+        $this->setColumnOptions(array('username'), array('primary' => true));
+        $this->setColumnOptions(array('password'), array('primary' => false));
+        $this->setColumnOption('username', 'notnull', true);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC64TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC64TestCase.php
new file mode 100644
index 000000000..e7100456d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC64TestCase.php
@@ -0,0 +1,93 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC64_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC64_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC64_Article';
+        parent::prepareTables();
+    }
+
+    public function testTicket()
+    {
+        $article = new Ticket_DC64_Article();
+        $article->title = 'testing provider';
+        $article->content = 'testing';
+        $article->save();
+        $this->assertEqual($article->slug, 'jwage_testing_provider');
+
+        $article = new Ticket_DC64_Article();
+        $article->title = 'testing provider';
+        $article->content = 'testing';
+        $article->save();
+        $this->assertEqual($article->slug, 'jwage_testing_provider_1');
+
+        $article = new Ticket_DC64_Article();
+        $article->title = 'testing provider';
+        $article->content = 'testing';
+        $article->save();
+        $this->assertEqual($article->slug, 'jwage_testing_provider_2');
+    }
+}
+
+class Ticket_DC64_Article extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('title', 'string', 255);
+        $this->hasColumn('content', 'clob');
+    }
+
+    public function setUp()
+    {
+        $this->actAs('Sluggable', array(
+            'provider' => array($this, 'provideSlug'),
+            'builder' => array($this, 'formatSlug')
+        ));
+    }
+
+    public function __toString()
+    {
+        return $this->title;
+    }
+
+    public static function formatSlug($slug)
+    {
+        return str_replace('-', '_', Doctrine_Inflector::urlize($slug));
+    }
+
+    public static function provideSlug(Doctrine_Record $record)
+    {
+        return 'jwage ' . $record->title;
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC69TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC69TestCase.php
new file mode 100644
index 000000000..bec2ffe0c
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC69TestCase.php
@@ -0,0 +1,50 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC69_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC69_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        try {
+            $user = Doctrine_Core::getTable('User')
+                ->createQuery('u')
+                ->limit(1)
+                ->fetchOne();
+            $user->link('Email', 4);        
+            $user->save();
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail($e->getMessage());
+        }
+        $this->assertEqual($user->Email->id, 4);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC709TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC709TestCase.php
new file mode 100644
index 000000000..d34c0d52e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC709TestCase.php
@@ -0,0 +1,47 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC709_TestCase
+ *
+ * @package     Doctrine
+ * @author      John Kary <john@johnkary.net>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC709_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $dbh = new Doctrine_Adapter_Mock('mysql');
+        
+        $conn = Doctrine_Manager::getInstance()->connection($dbh, 'mysql', false);
+
+        $sql = $conn->export->createTableSql('mytable', array(
+            'name' => array('type' => 'string', 'length' => 255, 'comment' => "This comment isn't breaking")
+        ));
+
+        $this->assertEqual($sql[0], "CREATE TABLE mytable (name VARCHAR(255) COMMENT 'This comment isn''t breaking') ENGINE = INNODB");
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC74TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC74TestCase.php
new file mode 100644
index 000000000..22fc6abd5
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC74TestCase.php
@@ -0,0 +1,83 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC74_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC74_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC74_Test';
+        parent::prepareTables();
+    }
+    
+    public function prepareData()
+    {
+    	$r = new Ticket_DC74_Test();
+    	$r->test1 = 'test1';
+    	$r->test2 = 'test2';
+    	$r->save();
+    	
+    	// following clear should be done automatically, as noted in DC73 ticket
+    	$r->getTable()->clear();
+    }
+
+    public function testTest()
+    {
+		// we are selecting "id" and "test1" fields and ommiting "test2"
+    	$r1 = Doctrine_Query::create()
+    		->select('id, test1')
+    		->from('Ticket_DC74_Test')	
+			->fetchOne();
+			
+    	// so we have object in PROXY state
+    	$this->assertEqual(Doctrine_Record::STATE_PROXY, $r1->state());
+
+		// now we are modifing one of loaded properties "test1"
+    	$r1->test1 = 'testx';
+    	
+    	// so record is in DIRTY state
+    	$this->assertEqual(Doctrine_Record::STATE_DIRTY, $r1->state());
+    	
+    	// when accessing to not loaded field "test2" no additional loading 
+    	// currently such loading is performed is executed only in PROXY state
+    	$this->assertEqual('test2', $r1->test2);
+    }
+}
+
+class Ticket_DC74_Test extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+		$this->hasColumn('id', 'integer', 4, array('primary', 'notnull', 'autoincrement'));
+        $this->hasColumn('test1', 'string', 255);
+        $this->hasColumn('test2', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC794TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC794TestCase.php
new file mode 100644
index 000000000..bab8382f7
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC794TestCase.php
@@ -0,0 +1,65 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC794_TestCase
+ *
+ * @package     Doctrine
+ * @author      Enrico Stahn <mail@enricostahn.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC794_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC794_Model';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        $table = Doctrine_Core::getTable('Ticket_DC794_Model');
+        
+        $this->assertEqual($table->buildFindByWhere('IdOrigenOportunidadClienteOrId'), '(dctrn_find.idOrigenOportunidadCliente = ? OR dctrn_find.id = ?)');
+        $this->assertEqual($table->buildFindByWhere('IdAndIdOrIdOrigenOportunidadCliente'), 'dctrn_find.id = ? AND (dctrn_find.id = ? OR dctrn_find.idOrigenOportunidadCliente = ?)');
+        $this->assertEqual($table->buildFindByWhere('UsernameOrIdOrIdOrigenOportunidadCliente'), '(dctrn_find.Username = ? OR dctrn_find.id = ? OR dctrn_find.idOrigenOportunidadCliente = ?)');
+    }
+}
+
+class Ticket_DC794_Model extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', null, array(
+            'type' => 'integer',
+            'unsigned' => false,
+            'primary' => true,
+            'autoincrement' => true,
+        ));
+        $this->hasColumn('idOrigenOportunidadCliente', 'string', 255);
+        $this->hasColumn('Username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC7TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC7TestCase.php
new file mode 100644
index 000000000..44279e234
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC7TestCase.php
@@ -0,0 +1,75 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC7_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC7_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC7_User';
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+        for ($i = 0; $i < 10; $i++) {
+            $user = new Ticket_DC7_User();
+            $user->username = $i;
+            $user->password = $i;
+            $user->save();
+        }
+    }
+
+    public function testOnDemandHydration()
+    {
+        $q = Doctrine_Core::getTable('Ticket_DC7_User')
+            ->createQuery('u')
+            ->setHydrationMode(Doctrine_Core::HYDRATE_ON_DEMAND);
+
+        $results = $q->execute();
+        $this->assertEqual(get_class($results), 'Doctrine_Collection_OnDemand');
+
+        $count = 0;
+        foreach ($results as $result) {
+            $count++;
+        }
+        $this->assertEqual($count, 10);
+    }
+}
+
+class Ticket_DC7_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC825TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC825TestCase.php
new file mode 100644
index 000000000..3cb04c756
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC825TestCase.php
@@ -0,0 +1,88 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC825_TestCase
+ *
+ * @package     Doctrine
+ * @author      Enrico Stahn <mail@enricostahn.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC825_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC825_Model';
+        parent::prepareTables();
+    }
+
+    public function testTest()
+    {
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+
+        $user = new Ticket_DC825_Model();
+        $user->username = 'jwage';
+        $user->password = 'changeme';
+        $user->save();
+        $user->delete();
+
+        $version = $user->getAuditLog()->getVersion($user, 2, Doctrine_Core::HYDRATE_RECORD);
+	$versionTable = $version[0]->getTable();
+	$versionTableColumns = $versionTable->getColumnNames();
+	$recordTableColumns = $user->getTable()->getColumnNames();
+
+        $this->assertFalse(in_array('id', $versionTableColumns));
+        $this->assertTrue(in_array('model_id', $versionTableColumns));
+        $this->assertTrue(count($versionTableColumns) == count($recordTableColumns));
+        $this->assertTrue(count(array_diff($versionTableColumns, $recordTableColumns)) == 0);
+
+        Doctrine_Manager::getInstance()->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, false);
+    }
+}
+
+class Ticket_DC825_Model extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('model_id as id', 'integer', null, array(
+            'type' => 'integer',
+            'unsigned' => false,
+            'primary' => true,
+            'autoincrement' => true,
+        ));
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->actAs('Timestampable');
+        $this->actAs('SoftDelete');
+        $this->actAs('Versionable', array(
+			'auditLog' => true,
+        		'generateRelations' => false,
+        		'deleteVersions' => false));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC828TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC828TestCase.php
new file mode 100644
index 000000000..8fb370e7a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC828TestCase.php
@@ -0,0 +1,127 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC828_TestCase
+ *
+ * @package     Doctrine
+ * @author      Enrico Stahn <mail@enricostahn.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC828_TestCase extends Doctrine_UnitTestCase
+{
+    private $sqlStackCounter = 0;
+
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC828_Model';
+        parent::prepareTables();
+    }
+
+    public function testInit()
+    {
+        $this->dbh = new Doctrine_Adapter_Mock('mssql');
+        $this->conn = Doctrine_Manager::getInstance()->openConnection($this->dbh, 'DC828');
+    }
+
+    public function testLimit()
+    {
+        Doctrine_Query::create()->select()->from('Ticket_DC828_Model')->limit(10)->execute();
+
+        $expected = 'SELECT TOP 10 [t].[model_id] AS [t__model_id], [t].[username] AS [t__username], [t].[password] AS [t__password] FROM [ticket__d_c828__model] [t]';
+        $sql = current(array_slice($this->dbh->getAll(), $this->sqlStackCounter++, 1));
+
+        $this->assertEqual($expected, $sql);
+    }
+
+    public function testLimitOffsetWithoutOrderBy()
+    {
+        $exception = false;
+
+        try {
+            Doctrine_Query::create()->select()->from('Ticket_DC828_Model')->limit(10)->offset(5)->execute();
+        } catch (Doctrine_Connection_Exception $e) {
+            $exception = true;
+            $this->assertEqual($e->getMessage(), 'OFFSET cannot be used in MSSQL without ORDER BY due to emulation reasons.');
+        }
+
+        $this->assertTrue($exception);
+    }
+
+    public function testOrderBy()
+    {
+        Doctrine_Query::create()->select()->from('Ticket_DC828_Model')->orderBy('username')->execute();
+
+        $expected = 'SELECT [t].[model_id] AS [t__model_id], [t].[username] AS [t__username], [t].[password] AS [t__password] FROM [ticket__d_c828__model] [t] ORDER BY [t].[username]';
+        $sql = current(array_slice($this->dbh->getAll(), $this->sqlStackCounter++, 1));
+
+        $this->assertEqual($expected, $sql);
+    }
+
+    public function testOrderByLimit()
+    {
+        Doctrine_Query::create()->select()->from('Ticket_DC828_Model')->orderBy('username')->limit(10)->execute();
+
+        $expected = 'SELECT TOP 10 [t].[model_id] AS [t__model_id], [t].[username] AS [t__username], [t].[password] AS [t__password] FROM [ticket__d_c828__model] [t] ORDER BY [t].[username]';
+        $sql = current(array_slice($this->dbh->getAll(), $this->sqlStackCounter++, 1));
+
+        $this->assertEqual($expected, $sql);
+    }
+
+    public function testOrderByLimitOffset()
+    {
+        Doctrine_Query::create()->select()->from('Ticket_DC828_Model')->orderBy('username')->limit(10)->offset(5)->execute();
+
+        $expected = 'SELECT * FROM (SELECT ROW_NUMBER() OVER (ORDER BY [t].[username]) AS [DOCTRINE_ROWNUM], [t].[model_id] AS [t__model_id], [t].[username] AS [t__username], [t].[password] AS [t__password] FROM [ticket__d_c828__model] [t] ) AS [doctrine_tbl] WHERE [DOCTRINE_ROWNUM] BETWEEN 6 AND 15';
+        $sql = current(array_slice($this->dbh->getAll(), $this->sqlStackCounter++, 1));
+
+        $this->assertEqual($expected, $sql);
+    }
+
+    public function testMultipleOrderByFields()
+    {
+        Doctrine_Query::create()->select()->from('Ticket_DC828_Model')->orderBy('username, password')->limit(10)->offset(5)->execute();
+
+        $expected = 'SELECT * FROM (SELECT ROW_NUMBER() OVER (ORDER BY [t].[username], [t].[password]) AS [DOCTRINE_ROWNUM], [t].[model_id] AS [t__model_id], [t].[username] AS [t__username], [t].[password] AS [t__password] FROM [ticket__d_c828__model] [t] ) AS [doctrine_tbl] WHERE [DOCTRINE_ROWNUM] BETWEEN 6 AND 15';
+        $sql = current(array_slice($this->dbh->getAll(), $this->sqlStackCounter++, 1));
+
+        $this->assertEqual($expected, $sql);
+    }
+}
+
+class Ticket_DC828_Model extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('model_id as id', 'integer', null, array(
+            'type' => 'integer',
+            'unsigned' => false,
+            'primary' => true,
+            'autoincrement' => true,
+        ));
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC82TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC82TestCase.php
new file mode 100644
index 000000000..72f212a73
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC82TestCase.php
@@ -0,0 +1,56 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC82_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC82_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testTest()
+    {
+        $this->dbh = new Doctrine_Adapter_Mock('pgsql');
+        $this->conn = $this->manager->openConnection($this->dbh);
+        
+        $sql = $this->conn->export->exportClassesSql(array('Ticket_DC82_Article'));
+        $this->assertEqual($sql, array(
+            "CREATE UNIQUE INDEX model_unique_title ON ticket__d_c82__article (title) WHERE deleted = false",
+            "CREATE TABLE ticket__d_c82__article (id BIGSERIAL, title VARCHAR(128) NOT NULL UNIQUE, deleted BOOLEAN DEFAULT 'false' NOT NULL, PRIMARY KEY(id))"
+        ));
+    }
+}
+
+class Ticket_DC82_Article extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('title', 'string', 128, array('notnull', 'unique' => array('where' => 'deleted = false')));
+        $this->hasColumn('deleted', 'boolean', 1, array('notnull', 'default' => false));
+        $this->index('model_unique_title', array('fields' => array('title'), 'where' => 'deleted = false', 'type' => 'unique' ));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC840TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC840TestCase.php
new file mode 100644
index 000000000..89805466e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC840TestCase.php
@@ -0,0 +1,84 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC840_TestCase
+ *
+ * @package     Doctrine
+ * @author      Enrico Stahn <mail@enricostahn.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC840_TestCase extends Doctrine_UnitTestCase 
+{
+    private $sqlStackCounter = 0;
+  
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC840_Model';
+        parent::prepareTables();
+    }
+
+    public function testInit()
+    {
+        $this->dbh = new Doctrine_Adapter_Mock('mssql');
+        $this->conn = Doctrine_Manager::getInstance()->openConnection($this->dbh, 'DC840');
+    }
+
+    public function testTest()
+    {
+        $q = Doctrine_Query::create()
+            ->select('id')
+            ->from('Ticket_DC840_Model')
+            ->andWhere('password = ?', 'abc')
+            ->andWhere('modified_at > ?', '2010-01-01')
+            ->andWhere('modified_at < ?', '2010-01-01')
+            ->andWhere('modified_at <> ?', '2010-01-01')
+            ->andWhere('modified_at <= ?', '2010-01-01')
+            ->andWhere('modified_at >= ?', '2010-01-01')
+        ;
+        $q->execute();
+         
+        $expected = "SELECT [t].[id] AS [t__id] FROM [ticket__d_c840__model] [t] WHERE ([t].[password] = 'abc' AND [t].[modified_at] > '2010-01-01' AND [t].[modified_at] < '2010-01-01' AND [t].[modified_at] <> '2010-01-01' AND [t].[modified_at] <= '2010-01-01' AND [t].[modified_at] >= '2010-01-01')";
+        $sql = current(array_slice($this->dbh->getAll(), $this->sqlStackCounter++, 1));
+
+        $this->assertEqual($expected, $sql);
+    }
+}
+
+class Ticket_DC840_Model extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', null, array(
+            'type' => 'integer',
+            'unsigned' => false,
+            'primary' => true,
+            'autoincrement' => true,
+        ));
+        $this->hasColumn('modified_at', 'timestamp');
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC841TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC841TestCase.php
new file mode 100644
index 000000000..89528b1eb
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC841TestCase.php
@@ -0,0 +1,189 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC841_TestCase
+ *
+ * @package     Doctrine
+ * @author      Enrico Stahn <mail@enricostahn.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC841_TestCase extends Doctrine_UnitTestCase 
+{
+    private $sqlStackCounter = 0;
+    
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC841_Model';
+        parent::prepareTables();
+    }
+
+    public function testInit()
+    {
+        $this->dbh = new Doctrine_Adapter_Mock('mssql');
+        $this->conn = Doctrine_Manager::getInstance()->openConnection($this->dbh, 'DC841');
+    }
+    
+    public function testSelect()
+    {
+        Doctrine_Core::getTable('Ticket_DC841_Model')
+            ->createQuery('t')
+            ->where('t.username <> ?', 'foo')
+            ->andWhere('t.foo = ?', 't.foo = ?')
+            ->andWhere('t.foo <> ?', 'bar')
+            ->andWhere('t.foo LIKE ?', 'foo')
+            ->execute();
+
+        $expected = "SELECT [t].[id] AS [t__id], [t].[username] AS [t__username], [t].[password] AS [t__password], [t].[foo] AS [t__foo] FROM [ticket__d_c841__model] [t] WHERE ([t].[username] <> 'foo' AND [t].[foo] = 't.foo = ?' AND [t].[foo] <> 'bar' AND [t].[foo] LIKE 'foo')";
+        $sql = current(array_slice($this->dbh->getAll(), $this->sqlStackCounter++, 1));
+
+        $this->assertEqual($expected, $sql);
+    }
+    
+    public function testSelectJoinWith()
+    {
+        Doctrine_Core::getTable('Ticket_DC841_Model')
+            ->createQuery('t')
+            ->leftJoin('t.Ticket_DC841_Model WITH t.id = ?', array(30))
+            ->where('t.username = ?', 'foo')
+            ->execute();
+
+        $expected = "SELECT [t].[id] AS [t__id], [t].[username] AS [t__username], [t].[password] AS [t__password], [t].[foo] AS [t__foo], [t2].[id] AS [t2__id], [t2].[username] AS [t2__username], [t2].[password] AS [t2__password], [t2].[foo] AS [t2__foo] FROM [ticket__d_c841__model] [t] LEFT JOIN [ticket__d_c841__model] [t2] ON [t].[id] = [t2].[id] AND ([t].[id] = 30) WHERE ([t].[username] = 'foo')";
+        $sql = current(array_slice($this->dbh->getAll(), $this->sqlStackCounter++, 1));
+
+        $this->assertEqual($expected, $sql);
+    }
+    
+    public function testSelectWithStaticParameter()
+    {
+        return; // doesn't work
+        Doctrine_Core::getTable('Ticket_DC841_Model')
+            ->createQuery('t')
+            ->where('t.username = ?', 'foo')
+            ->andWhere("t.foo = 't.foo = ?'")
+            ->andWhere("t.password = ?", 'test')
+            ->execute();
+
+        $expected = "SELECT [t].[id] AS [t__id], [t].[username] AS [t__username], [t].[password] AS [t__password], [t].[foo] AS [t__foo] FROM [ticket__d_c841__model] [t] WHERE ([t].[username] = 'foo' AND [t].[foo] = 't.foo = ?' AND [t].[password] = 'test')";
+        $sql = current(array_slice($this->dbh->getAll(), $this->sqlStackCounter++, 1));
+
+        $this->assertEqual($expected, $sql);
+    }
+    
+    public function testSelectWithIn()
+    {
+        Doctrine_Core::getTable('Ticket_DC841_Model')
+            ->createQuery('t')
+            ->whereIn('t.username', array('foo', 'bar'))
+            ->execute();
+
+        $expected = "SELECT [t].[id] AS [t__id], [t].[username] AS [t__username], [t].[password] AS [t__password], [t].[foo] AS [t__foo] FROM [ticket__d_c841__model] [t] WHERE ([t].[username] IN ('foo', 'bar'))";
+        $sql = current(array_slice($this->dbh->getAll(), $this->sqlStackCounter++, 1));
+
+        $this->assertEqual($expected, $sql);
+    }
+    
+    public function testInsert()
+    {
+        try {
+          $o = new Ticket_DC841_Model();
+          $o->username = 'abc';
+          $o->password = 'abc';
+          $o->foo = 'abc';
+          $o->save();
+        } catch (Doctrine_Connection_Exception $e) {
+            // Ignore: Couldn't get last insert identifier.
+        }
+
+        $this->sqlStackCounter += 1;
+        
+        $expected = "INSERT INTO [ticket__d_c841__model] ([username], [password], [foo]) VALUES ('abc', 'abc', 'abc')";
+        $sql = current(array_slice($this->dbh->getAll(), $this->sqlStackCounter++, 1));
+
+        $this->assertEqual($expected, $sql);
+    }
+
+    public function testUpdate()
+    {
+        $o = new Ticket_DC841_Model();
+        $o->assignIdentifier(33);
+        $o->username = 'abc';
+        $o->password = 'abc';
+        $o->foo = 'abc';
+        $o->state(Doctrine_Record::STATE_CLEAN);
+
+        $this->sqlStackCounter += 7;
+            
+        $o->password = 'foobar';
+        $o->save();
+
+        $expected = "UPDATE [ticket__d_c841__model] SET [password] = 'foobar' WHERE id = 33";
+        $sql = current(array_slice($this->dbh->getAll(), $this->sqlStackCounter++, 1));
+
+        $this->assertEqual($expected, $sql);
+    }
+
+    public function testDelete()
+    {
+        $o = new Ticket_DC841_Model();
+        $o->assignIdentifier(33);
+        $o->username = 'abc';
+        $o->password = 'abc';
+        $o->foo = 'abc';
+        $o->state(Doctrine_Record::STATE_CLEAN);
+
+        $this->sqlStackCounter += 5;
+            
+        $o->delete();
+
+        $expected = "DELETE FROM [ticket__d_c841__model] WHERE [id] = 33";
+        $sql = current(array_slice($this->dbh->getAll(), $this->sqlStackCounter++, 1));
+
+        $this->assertEqual($expected, $sql);
+    }
+}
+
+class Ticket_DC841_Model extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', null, array(
+            'type' => 'integer',
+            'unsigned' => false,
+            'primary' => true,
+            'autoincrement' => true,
+        ));
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+        $this->hasColumn('foo', 'string', 255);
+    }
+    
+    public function setUp()
+    {
+        $this->hasOne('Ticket_DC841_Model', array(
+             'local' => 'id',
+             'foreign' => 'id'));    
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC843TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC843TestCase.php
new file mode 100644
index 000000000..e51a2cad0
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC843TestCase.php
@@ -0,0 +1,116 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC843_TestCase
+ *
+ * @package     Doctrine
+ * @author      Enrico Stahn <mail@enricostahn.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC843_TestCase extends Doctrine_UnitTestCase
+{
+    private $sqlStackCounter = 0;
+
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC843_Model';
+        parent::prepareTables();
+    }
+
+    public function testInit()
+    {
+        $this->dbh = new Doctrine_Adapter_Mock('mssql');
+        $this->conn = Doctrine_Manager::getInstance()->openConnection($this->dbh, 'DC843');
+    }
+
+    public function testWithMagicMethod()
+    {
+        Doctrine_Core::getTable('Ticket_DC843_Model')->findByUsernameAndFoo('foo', 'bar');
+
+        $expected = "SELECT [t].[model_id] AS [t__model_id], [t].[username] AS [t__username], [t].[password] AS [t__password], [t].[foo] AS [t__foo] FROM [ticket__d_c843__model] [t] WHERE ([t].[username] = 'foo' AND [t].[foo] LIKE 'bar')";
+        $sql = current(array_slice($this->dbh->getAll(), $this->sqlStackCounter++, 1));
+
+        $this->assertEqual($expected, $sql);
+    }
+
+    public function testQuery()
+    {
+        Doctrine_Core::getTable('Ticket_DC843_Model')
+            ->createQuery('t')
+            ->where('t.username = ?', 'foo')
+            ->andWhere('t.foo = ?', 'bar')
+            ->execute();
+
+        $expected = "SELECT [t].[model_id] AS [t__model_id], [t].[username] AS [t__username], [t].[password] AS [t__password], [t].[foo] AS [t__foo] FROM [ticket__d_c843__model] [t] WHERE ([t].[username] = 'foo' AND [t].[foo] LIKE 'bar')";
+        $sql = current(array_slice($this->dbh->getAll(), $this->sqlStackCounter++, 1));
+
+        $this->assertEqual($expected, $sql);
+    }
+
+    public function testQueryWithLike()
+    {
+        Doctrine_Core::getTable('Ticket_DC843_Model')
+            ->createQuery('t')
+            ->where('t.username LIKE ?', 'foo')
+            ->andWhere('t.foo = ?', 'bar')
+            ->execute();
+
+        $expected = "SELECT [t].[model_id] AS [t__model_id], [t].[username] AS [t__username], [t].[password] AS [t__password], [t].[foo] AS [t__foo] FROM [ticket__d_c843__model] [t] WHERE ([t].[username] LIKE 'foo' AND [t].[foo] LIKE 'bar')";
+        $sql = current(array_slice($this->dbh->getAll(), $this->sqlStackCounter++, 1));
+
+        $this->assertEqual($expected, $sql);
+    }
+
+    public function testQueryWithNull()
+    {
+        Doctrine_Core::getTable('Ticket_DC843_Model')
+            ->createQuery('t')
+            ->where('t.username LIKE ?', 'foo')
+            ->andWhere('t.foo IS NULL')
+            ->execute();
+
+        $expected = "SELECT [t].[model_id] AS [t__model_id], [t].[username] AS [t__username], [t].[password] AS [t__password], [t].[foo] AS [t__foo] FROM [ticket__d_c843__model] [t] WHERE ([t].[username] LIKE 'foo' AND [t].[foo] IS NULL)";
+        $sql = current(array_slice($this->dbh->getAll(), $this->sqlStackCounter++, 1));
+
+        $this->assertEqual($expected, $sql);
+    }
+}
+
+class Ticket_DC843_Model extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('model_id as id', 'integer', null, array(
+            'type' => 'integer',
+            'unsigned' => false,
+            'primary' => true,
+            'autoincrement' => true,
+        ));
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+        $this->hasColumn('foo', 'string');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC848TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC848TestCase.php
new file mode 100644
index 000000000..62f33edef
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC848TestCase.php
@@ -0,0 +1,52 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC848_TestCase
+ *
+ * @package     Doctrine
+ * @author      Steffen Zeidler
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.2.4
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC848_TestCase extends Doctrine_UnitTestCase
+{
+    public function testIso8601Timestamp()
+    {
+        $timestamp = '2010-03-02T22:08:56+00:00';
+        $timestampValidator = Doctrine_Validator::getValidator('timestamp');
+
+        $this->assertTrue($timestampValidator->validate($timestamp));
+    }
+
+
+    public function testMysqlTimestamp()
+    {
+        $timestamp = '2010-03-02 22:08:56';
+        $timestampValidator = Doctrine_Validator::getValidator('timestamp');
+
+        $this->assertTrue($timestampValidator->validate($timestamp));
+    }
+
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC86TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC86TestCase.php
new file mode 100644
index 000000000..fda614f28
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC86TestCase.php
@@ -0,0 +1,79 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC86_TestCase
+ *
+ * @package     Doctrine
+ * @author      Jacek Dębowczyk <j.debowczyk@gmail.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC86_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC86_Test';
+        parent::prepareTables();
+    }
+    
+    public function prepareData()
+    {
+    	$r = new Ticket_DC86_Test();
+    	$r->id = 1;
+    	$r->date = date('Y-m-d h:i:s', strtotime("- 10 week"));
+    	$r->save();
+
+    	$r = new Ticket_DC86_Test();
+    	$r->id = 2;
+    	$r->date = date('Y-m-d h:i:s', strtotime("- 5 week"));
+    	$r->save();
+
+    	$r = new Ticket_DC86_Test();
+    	$r->id = 3;
+    	$r->date = date('Y-m-d h:i:s', strtotime("+ 1 week"));
+    	$r->save();
+    }
+
+    public function testTest()
+    {
+    	$past = Doctrine_Query::create()->from('Ticket_DC86_Test')->addWhere('date < now()')->orderBy('date')->execute();
+		$this->assertEqual(2, count($past));
+		$this->assertEqual(1, $past[0]->id);
+		$this->assertEqual(2, $past[1]->id);
+
+    	$future = Doctrine_Query::create()->from('Ticket_DC86_Test')->addWhere('date > now()')->orderBy('date')->execute();
+		$this->assertEqual(1, count($future));
+		$this->assertEqual(3, $future[0]->id);
+    }
+}
+
+class Ticket_DC86_Test extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+		$this->hasColumn('id', 'integer', 4, array('primary', 'notnull'));
+        $this->hasColumn('date', 'timestamp');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC879TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC879TestCase.php
new file mode 100644
index 000000000..22b3430e4
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC879TestCase.php
@@ -0,0 +1,77 @@
+<?php
+/*
+* $Id$
+*
+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* This software consists of voluntary contributions made by many individuals
+* and is licensed under the LGPL. For more information, see
+* <http://www.doctrine-project.org>.
+*/
+
+/**
+* Doctrine_Ticket_DC879_TestCase
+*
+* @package Doctrine
+* @author Enrico Stahn <mail@enricostahn.com>
+* @license http://www.opensource.org/licenses/lgpl-license.php LGPL
+* @category Object Relational Mapping
+* @link www.doctrine-project.org
+* @since 1.0
+* @version $Revision$
+*/
+class Doctrine_Ticket_DC879_TestCase extends Doctrine_UnitTestCase
+{
+    private $sqlStackCounter = 0;
+
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC879_Model';
+        parent::prepareTables();
+    }
+
+    public function testInit()
+    {
+        $this->dbh = new Doctrine_Adapter_Mock('mssql');
+        $this->conn = Doctrine_Manager::getInstance()->openConnection($this->dbh, 'DC879');
+    }
+
+    public function testWhere()
+    {
+        Doctrine_Core::getTable('Ticket_DC879_Model')
+          ->createQuery('t')
+          ->where('foo = DATE_PART("month", foo)')
+          ->execute();
+
+        $expected = "SELECT [t].[model_id] AS [t__model_id], [t].[username] AS [t__username], [t].[password] AS [t__password], [t].[foo] AS [t__foo] FROM [ticket__d_c879__model] [t] WHERE ([t].[foo] = DATEPART(month, [t].[foo]))";
+        $sql = current(array_slice($this->dbh->getAll(), $this->sqlStackCounter++, 1));
+
+        $this->assertEqual($expected, $sql);
+    }
+}
+
+class Ticket_DC879_Model extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('model_id as id', 'integer', null, array(
+            'type' => 'integer',
+            'unsigned' => false,
+            'primary' => true,
+            'autoincrement' => true,
+        ));
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+        $this->hasColumn('foo', 'timestamp');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC95/schema.yml b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC95/schema.yml
new file mode 100644
index 000000000..da14e1568
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC95/schema.yml
@@ -0,0 +1,8 @@
+Article:
+  columns:
+    title: string(255)
+    content: clob
+
+Article_Category:
+  columns:
+    name: string(255)
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC95TestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC95TestCase.php
new file mode 100644
index 000000000..247e0378d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/DC95TestCase.php
@@ -0,0 +1,68 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC95_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC95_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testClassDoesNotExistBeforeImport()
+    {
+        $this->assertFalse(class_exists('Base_DC95_Article'));
+        $this->assertFalse(class_exists('Base_DC95_Article_Category'));
+        $this->assertFalse(class_exists('DC95_Article'));
+        $this->assertFalse(class_exists('DC95_Article_Category'));
+    }
+
+    public function testClassExistsAfterImport()
+    {
+        Doctrine_Core::setModelsDirectory(dirname(__FILE__) . '/DC95/models');
+
+        $import = new Doctrine_Import_Schema();
+        $import->setOptions(array(
+            'pearStyle' => true,
+            'baseClassesDirectory' => null,
+            'baseClassPrefix' => 'Base_',
+            'classPrefix' => 'DC95_',
+            'classPrefixFiles' => true
+        ));
+        $modelsPath = dirname(__FILE__) . '/DC95/models';
+        $import->importSchema(dirname(__FILE__) . '/DC95/schema.yml', 'yml', $modelsPath);
+
+        /*
+        $this->assertTrue(file_exists($modelsPath . '/DC95/Base/Article.php'));
+        $this->assertTrue(file_exists($modelsPath . '/DC95/Base/Article/Category.php'));
+        $this->assertTrue(file_exists($modelsPath . '/DC95/Article.php'));
+        $this->assertTrue(file_exists($modelsPath . '/DC95/Article/Category.php'));
+        */
+
+        Doctrine_Core::setModelsDirectory(null);
+        Doctrine_Lib::removeDirectories(dirname(__FILE__) . '/DC95/models');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/NewTicketTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/NewTicketTestCase.php
new file mode 100644
index 000000000..8e99fc39a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/NewTicketTestCase.php
@@ -0,0 +1,203 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_I18nRelation_TestCase
+ *
+ * @package     Doctrine
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_NewTicket_TestCase extends Doctrine_UnitTestCase
+{
+    private $p1;
+    private $p2;
+
+    public function prepareData()
+    {
+        $ad1 = new Testing_AttributeDefinition();
+        $ad1['name'] = 'price';
+        $ad1->save();
+        $ad2 = new Testing_AttributeDefinition();
+        $ad2['name'] = 'quantity';
+        $ad2->save();
+
+        $a1 = new Testing_Attribute();
+        $a1['Definition'] = $ad1;
+        $a1['value'] = '5.00';
+        $a2 = new Testing_Attribute();
+        $a2['Definition'] = $ad2;
+        $a2['value'] = '500';
+
+        $p1 = new Testing_Product();
+        $p1['name'] = 'Basketball';
+        $p1->save();
+        $this->p1 = $p1;
+        $p2 = new Testing_Product();
+        $p2['name'] = 'Football';
+        $p2->save();
+        $this->p2 = $p2;
+
+        $pa1 = new Testing_ProductAttribute();
+        $pa1['Product'] = $p1;
+        $pa1['Attribute'] = $a1;
+        $pa1->save();
+        $pa2 = new Testing_ProductAttribute();
+        $pa2['Product'] = $p1;
+        $pa2['Attribute'] = $a2;
+        $pa2->save();
+    }
+
+    public function prepareTables()
+    {
+        $this->tables = array('Testing_AttributeDefinition','Testing_Attribute', 'Testing_Product',
+                'Testing_ProductAttribute');
+        parent::prepareTables();
+    }
+
+    public function testTicket()
+    {
+        $q1 = new Doctrine_Query();
+        $q1->select('p.*');
+        $q1->from('Testing_Product p');
+        $q1->where('p.id = ?', $this->p1['id']);
+        $q1->addSelect('a.*, ad.*');
+        $q1->leftJoin('p.Attributes a');
+        $q1->leftJoin('a.Definition ad');
+
+        $q2 = new Doctrine_Query();
+        $q2->select('p.*');
+        $q2->from('Testing_Product p');
+        $q2->where('p.id = ?', $this->p2['id']);
+        $q2->addSelect('a.*, ad.*');
+        $q2->leftJoin('p.Attributes a');
+        $q2->leftJoin('a.Definition ad');
+
+        // This query works perfect
+        $r1 = $q1->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+        //var_dump($r1);
+        // This query throws an exception!!!
+        $r2 = $q2->execute(array(), Doctrine_Core::HYDRATE_ARRAY);
+        //$r2 = $q2->execute();
+        //var_dump($r2);
+    }
+   
+}
+
+class Testing_AttributeDefinition extends Doctrine_Record
+{
+        public function setTableDefinition()
+    {
+        $this->setTableName('testing__attribute_definitions');
+                $this->hasColumn('id', 'integer', 4,
+                    array('primary'=>true,'autoincrement'=>true));
+                $this->hasColumn('name', 'string', 64, array('notnull'=>true));
+    }
+    public function setUp()
+    {
+    }
+}
+
+class Testing_Attribute extends Doctrine_Record
+{
+        public function setTableDefinition()
+    {
+        $this->setTableName('testing__attributes');
+
+                $this->hasColumn('id', 'integer', 4,
+                    array('primary'=>true,'autoincrement'=>true));
+                $this->hasColumn('attribute_definition_id', 'integer', 4,
+                    array('notnull'=>true));
+                $this->hasColumn('value', 'string', 255, array('notnull'=>false));
+    }
+    public function setUp()
+    {
+        $this->hasOne(
+                'Testing_AttributeDefinition as Definition',
+                array(
+                                'local'   => 'attribute_definition_id',
+                                'foreign' => 'id',
+                                'onDelete' => 'CASCADE'
+                )
+        );
+    }
+}
+
+class Testing_Product extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('testing__products');
+                $this->hasColumn('id', 'integer', 4,
+                    array('primary'=>true,'autoincrement'=>true));
+        $this->hasColumn('name', 'string', 40,
+            array('notnull'=>true));
+    }
+    public function setUp()
+    {
+
+                $this->hasMany(
+                'Testing_Attribute as Attributes',
+                array(
+                        'local'    => 'product_id',
+                        'foreign'  => 'attribute_id',
+                        'refClass' => 'Testing_ProductAttribute',
+                                'onDelete' => 'CASCADE',
+                        )
+                );
+    }
+}
+
+class Testing_ProductAttribute extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('testing__products_attributes');
+
+        $this->hasColumn('product_id', 'integer', 4, array('primary'=>true,
+            'notnull'=>true));
+        $this->hasColumn('attribute_id', 'integer', 4,
+            array('primary'=>true, 'notnull'=>true));
+    }
+    public function setUp()
+    {
+        $this->hasOne(
+                'Testing_Product as Product',
+                array(
+                        'local'    => 'product_id',
+                        'foreign'  => 'id',
+                                'onDelete' => 'CASCADE'
+                )
+        );
+        $this->hasOne(
+                'Testing_Attribute as Attribute',
+                array(
+                        'local'    => 'attribute_id',
+                        'foreign'  => 'id',
+                                'onDelete' => 'RESTRICT'
+                )
+        );
+    }
+
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/NjeroTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/NjeroTestCase.php
new file mode 100644
index 000000000..754e3cd55
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Ticket/NjeroTestCase.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Doctrine_Ticket_Njero_TestCase
+ *
+ * @package     Doctrine
+ * @author      Jeff Rafter <lists@jeffrafter.com>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+
+class Doctrine_Ticket_Njero_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData() { }
+    
+    public function prepareTables()
+    {
+        $this->tables[] = 'CoverageCodeN';
+        $this->tables[] = 'PolicyCodeN';
+        $this->tables[] = 'LiabilityCodeN';
+        $this->tables[] = 'PolicyN';
+        $this->tables[] = 'RateN';
+
+        parent::prepareTables();
+    }
+
+    public function testHasOneMultiLevelRelations()
+    {
+      $policy_code = new PolicyCodeN();
+      $policy_code->code = 1;
+      $policy_code->description = "Special Policy";
+      $policy_code->save();
+      
+      $coverage_code = new CoverageCodeN();
+      $coverage_code->code = 1;
+      $coverage_code->description = "Full Coverage";
+      $coverage_code->save();
+      
+      $coverage_code = new CoverageCodeN();
+      $coverage_code->code = 3; # note we skip 2
+      $coverage_code->description = "Partial Coverage";
+      $coverage_code->save();
+
+      $liability_code = new LiabilityCodeN();
+      $liability_code->code = 1;
+      $liability_code->description = "Limited Territory";
+      $liability_code->save();
+
+      $rate = new RateN();
+      $rate->policy_code = 1;
+      $rate->coverage_code = 3;
+      $rate->liability_code = 1;
+      $rate->total_rate = 123.45;
+      $rate->save();
+      
+      $policy = new PolicyN();
+      $policy->rate_id = 1;
+      $policy->policy_number = "123456789";  
+      $policy->save();
+        
+      $q = new Doctrine_Query();
+
+      # If I use
+      # $p = $q->from('PolicyN p')
+      # this test passes, but there is another issue just not reflected in this test yet, see "in my app" note below
+
+      $q->from('PolicyN p, p.RateN r, r.PolicyCodeN y, r.CoverageCodeN c, r.LiabilityCodeN l')
+        ->where('(p.id = ?)', array('1'));
+
+      $p = $q->execute()->getFirst();
+
+      $this->assertEqual($p->rate_id, 1);
+      $this->assertEqual($p->RateN->id, 1);
+      $this->assertEqual($p->RateN->policy_code, 1);
+      $this->assertEqual($p->RateN->coverage_code, 3); # fail
+      $this->assertEqual($p->RateN->liability_code, 1);
+
+      $c = $p->RateN->coverage_code;
+      $c2 = $p->RateN->CoverageCodeN->code;
+      $c3 = $p->RateN->coverage_code;
+
+      $this->assertEqual($c, $c2); # fail
+      $this->assertEqual($c, $c3); # in my app this fails as well, but I can't reproduce this
+      #echo "Values " . serialize(array($c, $c2, $c3));
+
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TokenizerTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TokenizerTestCase.php
new file mode 100644
index 000000000..4e7e7f4d5
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TokenizerTestCase.php
@@ -0,0 +1,146 @@
+<?php
+/*
+ *  $Id: TokenizerTestCase.php 1181 2007-03-20 23:22:51Z gnat $
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Tokenizer_TestCase
+ * This class tests the functinality of Doctrine_Tokenizer component
+ *
+ * @package     Doctrine
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision: 1181 $
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ */
+class Doctrine_Tokenizer_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareData()
+    { }
+    public function prepareTables()
+    { }
+
+    public function testSqlExplode()
+    {
+        $tokenizer = new Doctrine_Query_Tokenizer();
+
+        $str = "word1 word2 word3";
+        $a   = $tokenizer->sqlExplode($str);
+
+        $this->assertEqual($a, array("word1", "word2", "word3"));
+
+        $str = "word1 (word2 word3)";
+        $a   = $tokenizer->sqlExplode($str);
+        $this->assertEqual($a, array("word1", "(word2 word3)"));
+
+        $str = "word1 'word2 word3'";
+        $a   = $tokenizer->sqlExplode($str);
+        $this->assertEqual($a, array("word1", "'word2 word3'"));
+
+        $str = "word1 'word2 word3'";
+        $a   = $tokenizer->sqlExplode($str);
+        $this->assertEqual($a, array("word1", "'word2 word3'"));
+
+        $str = "word1 \"word2 word3\"";
+        $a   = $tokenizer->sqlExplode($str);
+        $this->assertEqual($a, array("word1", "\"word2 word3\""));
+
+        $str = "word1 ((word2) word3)";
+        $a   = $tokenizer->sqlExplode($str);
+        $this->assertEqual($a, array("word1", "((word2) word3)"));
+
+        $str = "word1 ( (word2) 'word3')";
+        $a   = $tokenizer->sqlExplode($str);
+        $this->assertEqual($a, array("word1", "( (word2) 'word3')"));
+
+        $str = "word1 ( \"(word2) 'word3')";
+        $a   = $tokenizer->sqlExplode($str);
+        $this->assertEqual($a, array("word1", "( \"(word2) 'word3')"));
+
+        $str = "word1 ( ''(word2) 'word3')";
+        $a   = $tokenizer->sqlExplode($str);
+        $this->assertEqual($a, array("word1", "( ''(word2) 'word3')"));
+
+        $str = "word1 ( '()()'(word2) 'word3')";
+        $a   = $tokenizer->sqlExplode($str);
+        $this->assertEqual($a, array("word1", "( '()()'(word2) 'word3')"));
+
+        $str = "word1 'word2)() word3'";
+        $a   = $tokenizer->sqlExplode($str);
+        $this->assertEqual($a, array("word1", "'word2)() word3'"));
+
+        $str = "word1 (word2() word3)";
+        $a   = $tokenizer->sqlExplode($str);
+        $this->assertEqual($a, array("word1", "(word2() word3)"));
+
+        $str = "word1 \"word2)() word3\"";
+        $a   = $tokenizer->sqlExplode($str);
+        $this->assertEqual($a, array("word1", "\"word2)() word3\""));
+
+        $str = "something (subquery '')";
+        $a   = $tokenizer->sqlExplode($str);
+        $this->assertEqual($a, array("something", "(subquery '')"));
+
+        $str = "something (( ))";
+        $a   = $tokenizer->sqlExplode($str);
+        $this->assertEqual($a, array("something", "(( ))"));
+    }
+
+    public function testSqlExplode2()
+    {
+        $tokenizer = new Doctrine_Query_Tokenizer();
+        $str = 'rdbms (dbal OR database)';
+        $a   = $tokenizer->sqlExplode($str, ' OR ');
+
+        $this->assertEqual($a, array('rdbms (dbal OR database)'));
+    }
+
+    public function testBracketExplode()
+    {
+        $tokenizer = new Doctrine_Query_Tokenizer();
+
+        $str = 'foo.field AND bar.field';
+        $a   = $tokenizer->bracketExplode($str, array(' \&\& ', ' AND '), '(', ')');
+        $this->assertEqual($a, array('foo.field', 'bar.field'));
+
+        // delimiters should be case insensitive
+        $str = 'foo.field and bar.field';
+        $a   = $tokenizer->bracketExplode($str, array(' \&\& ', ' AND '), '(', ')');
+        $this->assertEqual($a, array('foo.field', 'bar.field'));
+
+        // test the JOIN splitter as used in Doctrine_Query_From::parse()
+        $str = 'foo.field join bar.field';
+        $a   = $tokenizer->bracketExplode($str, 'JOIN');
+        $this->assertEqual($a, array('foo.field', 'bar.field'));
+
+        // test that table names including the split string are unaffected
+        $str = 'foojointable.field join bar.field';
+        $a   = $tokenizer->bracketExplode($str, 'JOIN');
+        $this->assertEqual($a, array('foojointable.field', 'bar.field'));
+    }
+
+    public function testQuoteExplodedShouldQuoteArray()
+    {
+        $tokenizer = new Doctrine_Query_Tokenizer();
+        $term = $tokenizer->quoteExplode("test", array("'test'", "test2"));
+        $this->assertEqual($term[0], "test");
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Transaction/MssqlTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Transaction/MssqlTestCase.php
new file mode 100644
index 000000000..2d1f0ed7b
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Transaction/MssqlTestCase.php
@@ -0,0 +1,62 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Transaction_Mssql_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Transaction_Mssql_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testSetIsolationThrowsExceptionOnUnknownIsolationMode() 
+    {
+        try {
+            $this->transaction->setIsolation('unknown');
+            $this->fail();
+        } catch(Doctrine_Transaction_Exception $e) {
+            $this->pass();
+        }
+    }
+    public function testSetIsolationExecutesSql() 
+    {
+        $this->transaction->setIsolation('READ UNCOMMITTED');
+        $this->transaction->setIsolation('READ COMMITTED');
+        $this->transaction->setIsolation('REPEATABLE READ');
+        $this->transaction->setIsolation('SERIALIZABLE');   
+
+        $this->assertEqual($this->adapter->pop(), 'SET TRANSACTION ISOLATION LEVEL SERIALIZABLE');
+        $this->assertEqual($this->adapter->pop(), 'SET TRANSACTION ISOLATION LEVEL REPEATABLE READ');
+        $this->assertEqual($this->adapter->pop(), 'SET TRANSACTION ISOLATION LEVEL READ COMMITTED');
+        $this->assertEqual($this->adapter->pop(), 'SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED');
+    }
+    public function testSetIsolationSupportsSnapshotMode() 
+    {
+        $this->transaction->setIsolation('SNAPSHOT');
+
+        $this->assertEqual($this->adapter->pop(), 'SET TRANSACTION ISOLATION LEVEL SNAPSHOT');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Transaction/MysqlTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Transaction/MysqlTestCase.php
new file mode 100644
index 000000000..413f6ab61
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Transaction/MysqlTestCase.php
@@ -0,0 +1,75 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Transaction_Mysql_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Transaction_Mysql_TestCase extends Doctrine_UnitTestCase
+{
+    public function testCreateSavePointExecutesSql() 
+    {
+        $this->transaction->beginTransaction('mypoint');
+
+        $this->assertEqual($this->adapter->pop(), 'SAVEPOINT mypoint');
+    }
+    public function testReleaseSavePointExecutesSql() 
+    {
+        $this->transaction->commit('mypoint');
+
+        $this->assertEqual($this->adapter->pop(), 'RELEASE SAVEPOINT mypoint');
+    }
+    public function testRollbackSavePointExecutesSql() 
+    {
+        $this->transaction->beginTransaction('mypoint');
+        $this->transaction->rollback('mypoint');
+
+        $this->assertEqual($this->adapter->pop(), 'ROLLBACK TO SAVEPOINT mypoint');
+    }
+    public function testGetIsolationExecutesSql() 
+    {
+        $this->transaction->getIsolation();
+
+        $this->assertEqual($this->adapter->pop(), 'SELECT @@tx_isolation');
+    }
+    public function testSetIsolationThrowsExceptionOnUnknownIsolationMode() 
+    {
+        try {
+            $this->transaction->setIsolation('unknown');
+            $this->fail();
+        } catch(Doctrine_Transaction_Exception $e) {
+            $this->pass();
+        }
+    }
+    public function testSetIsolationExecutesSql() 
+    {
+        $this->transaction->setIsolation('READ UNCOMMITTED');
+
+        $this->assertEqual($this->adapter->pop(), 'SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Transaction/OracleTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Transaction/OracleTestCase.php
new file mode 100644
index 000000000..97600f5d7
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Transaction/OracleTestCase.php
@@ -0,0 +1,73 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Transaction_Mysql_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Transaction_Oracle_TestCase extends Doctrine_UnitTestCase
+{
+    public function testCreateSavePointExecutesSql() 
+    {
+        $this->transaction->beginTransaction('mypoint');
+        
+        $this->assertEqual($this->adapter->pop(), 'SAVEPOINT mypoint');
+    }
+    public function testReleaseSavePointAlwaysReturnsTrue() 
+    {
+        $this->assertEqual($this->transaction->commit('mypoint'), true);
+    }
+    public function testRollbackSavePointExecutesSql() 
+    {
+        $this->transaction->beginTransaction('mypoint');
+        $this->transaction->rollback('mypoint');
+
+        $this->assertEqual($this->adapter->pop(), 'ROLLBACK TO SAVEPOINT mypoint');
+    }
+    public function testSetIsolationThrowsExceptionOnUnknownIsolationMode() 
+    {
+        try {
+            $this->transaction->setIsolation('unknown');
+            $this->fail();
+        } catch(Doctrine_Transaction_Exception $e) {
+            $this->pass();
+        }
+    }
+    public function testSetIsolationExecutesSql() 
+    {
+        $this->transaction->setIsolation('READ UNCOMMITTED');
+        $this->transaction->setIsolation('READ COMMITTED');
+        $this->transaction->setIsolation('REPEATABLE READ');
+        $this->transaction->setIsolation('SERIALIZABLE');
+
+        $this->assertEqual($this->adapter->pop(), 'ALTER SESSION SET ISOLATION_LEVEL = SERIALIZABLE');
+        $this->assertEqual($this->adapter->pop(), 'ALTER SESSION SET ISOLATION_LEVEL = SERIALIZABLE');
+        $this->assertEqual($this->adapter->pop(), 'ALTER SESSION SET ISOLATION_LEVEL = SERIALIZABLE');
+        $this->assertEqual($this->adapter->pop(), 'ALTER SESSION SET ISOLATION_LEVEL = READ COMMITTED');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Transaction/PgsqlTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Transaction/PgsqlTestCase.php
new file mode 100644
index 000000000..cc7526b67
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Transaction/PgsqlTestCase.php
@@ -0,0 +1,69 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Transaction_Pgsql_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Transaction_Pgsql_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testCreateSavePointExecutesSql() 
+    {
+        $this->transaction->beginTransaction('mypoint');
+        
+        $this->assertEqual($this->adapter->pop(), 'SAVEPOINT mypoint');
+    }
+    public function testReleaseSavePointExecutesSql() 
+    {
+        $this->transaction->commit('mypoint');
+
+        $this->assertEqual($this->adapter->pop(), 'RELEASE SAVEPOINT mypoint');
+    }
+    public function testRollbackSavePointExecutesSql() 
+    {
+        $this->transaction->beginTransaction('mypoint');
+        $this->transaction->rollback('mypoint');
+
+        $this->assertEqual($this->adapter->pop(), 'ROLLBACK TO SAVEPOINT mypoint');
+    }
+    public function testSetIsolationThrowsExceptionOnUnknownIsolationMode() 
+    {
+        try {
+            $this->transaction->setIsolation('unknown');
+            $this->fail();
+        } catch(Doctrine_Transaction_Exception $e) {
+            $this->pass();
+        }
+    }
+    public function testSetIsolationExecutesSql() 
+    {
+        $this->transaction->setIsolation('READ UNCOMMITTED');
+
+        $this->assertEqual($this->adapter->pop(), 'SET SESSION CHARACTERISTICS AS TRANSACTION ISOLATION LEVEL READ UNCOMMITTED');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Transaction/SqliteTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Transaction/SqliteTestCase.php
new file mode 100644
index 000000000..7e68c0aa5
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Transaction/SqliteTestCase.php
@@ -0,0 +1,56 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Transaction_Sqlite_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Transaction_Sqlite_TestCase extends Doctrine_UnitTestCase 
+{
+    public function testSetIsolationThrowsExceptionOnUnknownIsolationMode() 
+    {
+        try {
+            $this->transaction->setIsolation('unknown');
+            $this->fail();
+        } catch(Doctrine_Transaction_Exception $e) {
+            $this->pass();
+        }
+    }
+    public function testSetIsolationExecutesSql() 
+    {
+        $this->transaction->setIsolation('READ UNCOMMITTED');
+        $this->transaction->setIsolation('READ COMMITTED');
+        $this->transaction->setIsolation('REPEATABLE READ');
+        $this->transaction->setIsolation('SERIALIZABLE'); 
+        
+        $this->assertEqual($this->adapter->pop(), 'PRAGMA read_uncommitted = 1');
+        $this->assertEqual($this->adapter->pop(), 'PRAGMA read_uncommitted = 1');
+        $this->assertEqual($this->adapter->pop(), 'PRAGMA read_uncommitted = 1');
+        $this->assertEqual($this->adapter->pop(), 'PRAGMA read_uncommitted = 0');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TransactionTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TransactionTestCase.php
new file mode 100644
index 000000000..f9d8ca2d6
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TransactionTestCase.php
@@ -0,0 +1,358 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Transaction_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Transaction_TestCase extends Doctrine_UnitTestCase
+{
+    public function testInit()
+    {
+        $this->transaction = new Doctrine_Transaction_Mock();
+
+        $this->listener = new TransactionListener();
+
+        $this->conn->setListener($this->listener);
+    }
+
+    public function testCreateSavepointListenersGetInvoked()
+    {
+        try {
+            $this->transaction->beginTransaction('point');
+
+            $this->pass();
+        } catch(Doctrine_Transaction_Exception $e) {
+            $this->fail();
+        }
+
+        $this->assertEqual($this->listener->pop(), 'postSavepointCreate');
+        $this->assertEqual($this->listener->pop(), 'preSavepointCreate');
+    }
+
+    public function testCommitSavepointListenersGetInvoked()
+    {
+        try {
+            $this->transaction->commit('point');
+
+            $this->pass();
+        } catch(Doctrine_Transaction_Exception $e) {
+            $this->fail();
+        }
+
+        $this->assertEqual($this->listener->pop(), 'postSavepointCommit');
+        $this->assertEqual($this->listener->pop(), 'preSavepointCommit');
+        $this->assertEqual($this->transaction->getTransactionLevel(), 0);
+    }
+
+    public function testNestedSavepoints()
+    {
+        $this->assertEqual($this->transaction->getTransactionLevel(), 0);
+        $this->transaction->beginTransaction();
+        $this->assertEqual($this->transaction->getTransactionLevel(), 1);
+        $this->transaction->beginTransaction('point 1');
+        $this->assertEqual($this->transaction->getTransactionLevel(), 2);
+        $this->transaction->beginTransaction('point 2');
+        $this->assertEqual($this->transaction->getTransactionLevel(), 3);
+        $this->transaction->commit('point 2');
+        $this->assertEqual($this->transaction->getTransactionLevel(), 2);
+        $this->transaction->commit('point 1');
+        $this->assertEqual($this->transaction->getTransactionLevel(), 1);
+        $this->transaction->commit();
+        $this->assertEqual($this->transaction->getTransactionLevel(), 0);
+    }
+
+    public function testRollbackSavepointListenersGetInvoked()
+    {
+        try {
+            $this->transaction->beginTransaction('point');
+            $this->transaction->rollback('point');
+
+            $this->pass();
+        } catch(Doctrine_Transaction_Exception $e) {
+            $this->fail();
+        }
+
+        $this->assertEqual($this->listener->pop(), 'postSavepointRollback');
+        $this->assertEqual($this->listener->pop(), 'preSavepointRollback');
+        $this->assertEqual($this->listener->pop(), 'postSavepointCreate');
+        $this->assertEqual($this->listener->pop(), 'preSavepointCreate');
+        $this->assertEqual($this->transaction->getTransactionLevel(), 0);
+
+        $this->listener = new Doctrine_Eventlistener();
+        $this->conn->setListener($this->listener);
+    }
+
+    public function testCreateSavepointIsOnlyImplementedAtDriverLevel() 
+    {
+        try {
+            $this->transaction->beginTransaction('savepoint');
+            $this->fail();
+        } catch(Doctrine_Transaction_Exception $e) {
+            $this->pass();
+        }
+    }
+
+    public function testReleaseSavepointIsOnlyImplementedAtDriverLevel()
+    {
+        try {
+            $this->transaction->commit('savepoint');
+            $this->fail();
+        } catch (Doctrine_Transaction_Exception $e) {
+            $this->pass();
+        }
+    }
+
+    public function testRollbackSavepointIsOnlyImplementedAtDriverLevel() 
+    {
+        try {
+            $this->transaction->rollback('savepoint');
+            $this->fail();
+        } catch(Doctrine_Transaction_Exception $e) {
+            $this->pass();
+        }    
+    }
+
+    public function testSetIsolationIsOnlyImplementedAtDriverLevel() 
+    {
+        try {
+            $this->transaction->setIsolation('READ UNCOMMITTED');
+            $this->fail();
+        } catch(Doctrine_Transaction_Exception $e) {
+            $this->pass();
+        }
+    }
+
+    public function testGetIsolationIsOnlyImplementedAtDriverLevel()
+    {
+        try {
+            $this->transaction->GetIsolation('READ UNCOMMITTED');
+            $this->fail();
+        } catch(Doctrine_Transaction_Exception $e) {
+            $this->pass();
+        }
+    }
+
+    public function testTransactionLevelIsInitiallyZero() 
+    {
+        $this->assertEqual($this->transaction->getTransactionLevel(), 0);
+    }
+    
+    public function testSubsequentTransactionsAfterRollback()
+    {
+        try {
+            $this->assertEqual(0, $this->transaction->getTransactionLevel());
+            $this->assertEqual(0, $this->transaction->getInternalTransactionLevel());
+            $this->transaction->beginTransaction();
+            $this->assertEqual(1, $this->transaction->getTransactionLevel());
+            $this->assertEqual(0, $this->transaction->getInternalTransactionLevel());
+            throw new Exception();
+        } catch (Exception $e) {
+            $this->transaction->rollback();
+            $this->assertEqual(0, $this->transaction->getTransactionLevel());
+            $this->assertEqual(0, $this->transaction->getInternalTransactionLevel());
+            $this->transaction->beginTransaction();
+            $this->assertEqual(1, $this->transaction->getTransactionLevel());
+            $this->assertEqual(0, $this->transaction->getInternalTransactionLevel());
+            $this->transaction->commit();
+            $this->assertEqual(0, $this->transaction->getTransactionLevel());
+            $this->assertEqual(0, $this->transaction->getInternalTransactionLevel());
+        }
+        
+        $i = 0;
+        while ($i < 5) {
+            $this->assertEqual(0, $this->transaction->getTransactionLevel());
+    		$this->transaction->beginTransaction();
+            $this->assertEqual(1, $this->transaction->getTransactionLevel());
+    		try {
+    		    if ($i == 0) {
+    		        throw new Exception();
+    		    }                
+    		    $this->transaction->commit();
+    		}
+    		catch (Exception $e) {
+    			$this->transaction->rollback();
+                $this->assertEqual(0, $this->transaction->getTransactionLevel());
+    		}
+    		++$i;
+    	}
+    }
+
+    public function testGetStateReturnsStateConstant() 
+    {
+        $this->assertEqual($this->transaction->getState(), Doctrine_Transaction::STATE_SLEEP);                                                      
+    }
+
+    public function testCommittingWithNoActiveTransactionThrowsException()
+    {
+        try {
+            $this->transaction->commit();
+            $this->fail();
+        } catch (Doctrine_Transaction_Exception $e) {
+            $this->pass();
+        }
+    }
+
+    public function testExceptionIsThrownWhenUsingRollbackOnNotActiveTransaction() 
+    {
+        try {
+            $this->transaction->rollback();
+            $this->fail();
+        } catch (Doctrine_Transaction_Exception $e) {
+            $this->pass();
+        }
+    }
+
+    public function testBeginTransactionStartsNewTransaction() 
+    {
+        $this->transaction->beginTransaction();  
+
+        $this->assertEqual($this->adapter->pop(), 'BEGIN TRANSACTION');                                                         
+    }
+
+    public function testCommitMethodCommitsCurrentTransaction()
+    {
+        $this->transaction->commit();
+
+        $this->assertEqual($this->adapter->pop(), 'COMMIT');
+    }
+    public function testNestedTransaction()
+    {
+        $conn = Doctrine_Manager::connection();
+        
+        try {
+            $conn->beginTransaction();
+        
+            // Create new client
+            $user = new User();
+            $user->set('name', 'Test User');
+            $user->save();
+
+            // Create new credit card
+            $phonenumber = new Phonenumber();
+            $phonenumber->set('entity_id', $user->get('id'));
+            $phonenumber->set('phonenumber', '123 123');
+            $phonenumber->save();
+
+            $conn->commit();    
+        } catch (Exception $e) {
+            $conn->rollback();
+        }
+        
+        $this->assertTrue($user->id > 0);
+        $this->assertTrue($phonenumber->id > 0);
+    }
+
+    public function testAddDuplicateRecordToTransactionShouldSkipSecond()
+    {
+        $transaction = new Doctrine_Transaction();
+        $user = new User();
+        $transaction->addInvalid($user);
+        $this->assertEqual(1, count($transaction->getInvalid()));
+        $transaction->addInvalid($user);
+        $this->assertEqual(1, count($transaction->getInvalid()));
+    }
+
+}
+class TransactionListener extends Doctrine_EventListener 
+{
+    protected $_messages = array();
+
+    public function preTransactionCommit(Doctrine_Event $event)
+    {
+        $this->_messages[] = __FUNCTION__;
+
+        $event->skipOperation();
+    }
+    public function postTransactionCommit(Doctrine_Event $event)
+    {
+        $this->_messages[] = __FUNCTION__;
+    }
+
+    public function preTransactionRollback(Doctrine_Event $event)
+    {
+        $this->_messages[] = __FUNCTION__;
+
+        $event->skipOperation();
+    }
+    public function postTransactionRollback(Doctrine_Event $event)
+    {
+        $this->_messages[] = __FUNCTION__;
+    }
+
+    public function preTransactionBegin(Doctrine_Event $event)
+    {
+        $this->_messages[] = __FUNCTION__;
+
+        $event->skipOperation();
+    }
+    public function postTransactionBegin(Doctrine_Event $event)
+    { 
+        $this->_messages[] = __FUNCTION__;
+    }
+
+
+    public function preSavepointCommit(Doctrine_Event $event)
+    {           
+        $this->_messages[] = __FUNCTION__;
+
+        $event->skipOperation();
+    }
+    public function postSavepointCommit(Doctrine_Event $event)
+    { 
+        $this->_messages[] = __FUNCTION__;
+    }
+
+    public function preSavepointRollback(Doctrine_Event $event)
+    {
+        $this->_messages[] = __FUNCTION__;
+
+        $event->skipOperation();
+    }
+    public function postSavepointRollback(Doctrine_Event $event)
+    { 
+        $this->_messages[] = __FUNCTION__;
+    }
+
+    public function preSavepointCreate(Doctrine_Event $event)
+    { 
+        $this->_messages[] = __FUNCTION__;
+
+        $event->skipOperation();
+    }
+
+    public function postSavepointCreate(Doctrine_Event $event)
+    { 
+        $this->_messages[] = __FUNCTION__;
+    }
+    
+    public function pop()
+    {
+        return array_pop($this->_messages);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TreeStructureTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TreeStructureTestCase.php
new file mode 100644
index 000000000..c61c42795
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/TreeStructureTestCase.php
@@ -0,0 +1,128 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_TreeStructure_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_TreeStructure_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables() 
+    { 
+        // we don't need the standard tables here
+        $this->tables = array('TreeLeaf');
+        parent::prepareTables();
+    }
+    
+    public function prepareData()
+    {
+
+    }
+
+    public function testSelfReferentialRelationship() 
+    {
+        $component = new TreeLeaf();
+
+        try {
+            $rel = $component->getTable()->getRelation('Parent');
+            $rel = $component->getTable()->getRelation('Children');
+            $this->pass();
+        } catch(Doctrine_Exception $e) {
+            $this->fail();
+        }
+    }
+
+    public function testLocalAndForeignKeysAreSetCorrectly() {
+        $component = new TreeLeaf();
+
+        $rel = $component->getTable()->getRelation('Parent');
+        $this->assertEqual($rel->getLocal(), 'parent_id');
+        $this->assertEqual($rel->getForeign(), 'id');
+
+        $rel = $component->getTable()->getRelation('Children');
+        $this->assertEqual($rel->getLocal(), 'id');
+        $this->assertEqual($rel->getForeign(), 'parent_id');
+    }
+
+    public function testTreeLeafRelationships() 
+    {
+        /* structure:
+         *
+         * o1
+         *  -> o2
+         *  -> o3
+         *
+         * o4
+         *
+         * thus it would be expected that o1 has 2 children and o4 is a
+         * leaf with no parents or children.
+         */
+
+        $o1 = new TreeLeaf();
+        $o1->name = 'o1';
+        $o1->save();
+
+        $o2 = new TreeLeaf();
+        $o2->name   = 'o2';
+        $o2->Parent = $o1;
+        $o2->save();
+
+        $o3 = new TreeLeaf();
+        $o3->name   = 'o3';
+        $o3->Parent = $o1;
+        $o3->save();
+
+        //$o1->refresh();
+
+        $o4 = new TreeLeaf();
+        $o4->name = 'o4';
+        $o4->save();
+
+        $this->assertFalse(isset($o1->Parent));
+        $this->assertTrue(isset($o2->Parent));
+        $this->assertTrue($o2->Parent === $o1);
+        $this->assertFalse(isset($o4->Parent));
+      
+        $this->assertTrue(count($o1->Children) == 2);
+        $this->assertTrue(count($o1->get('Children')) == 2);
+
+        $this->assertTrue(count($o4->Children) == 0);
+    }
+    public function testTreeStructureFetchingWorksWithDql()
+    {
+        $q = new Doctrine_Query();
+        $q->select('l.*, c.*')
+          ->from('TreeLeaf l, l.Children c')
+          ->where('l.parent_id IS NULL')
+          ->groupby('l.id, c.id');
+
+        $coll = $q->execute();
+
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/UnitOfWorkTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/UnitOfWorkTestCase.php
new file mode 100644
index 000000000..b9cf2346a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/UnitOfWorkTestCase.php
@@ -0,0 +1,139 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_UnitOfWork_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_UnitOfWork_TestCase extends Doctrine_UnitTestCase {
+    private $correct  = array('Task', 'ResourceType', 'Resource', 'Assignment', 'ResourceReference');
+    private $correct2 = array (
+              0 => 'Resource',
+              1 => 'Task',
+              2 => 'ResourceType',
+              3 => 'Assignment',
+              4 => 'ResourceReference',
+            );
+    public function testbuildFlushTree() {
+        $task = new Task();
+
+        $tree = $this->unitOfWork->buildFlushTree(array('Task'));
+        $this->assertEqual($tree, array('Task'));
+
+        $tree = $this->unitOfWork->buildFlushTree(array('Task','Resource'));
+        $this->assertEqual($tree, array('Task', 'Resource', 'Assignment'));
+
+        $tree = $this->unitOfWork->buildFlushTree(array('Task', 'Assignment', 'Resource'));
+        $this->assertEqual($tree, array('Task', 'Resource', 'Assignment'));
+
+        $tree = $this->unitOfWork->buildFlushTree(array('Assignment', 'Task', 'Resource'));
+        $this->assertEqual($tree, array('Resource', 'Task', 'Assignment'));
+    }
+    public function testbuildFlushTree2() {
+        $this->correct = array('Forum_Category','Forum_Board','Forum_Thread');
+
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Board'));
+        $this->assertEqual($tree, array('Forum_Board'));
+        
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Category','Forum_Board'));
+        $this->assertEqual($tree, array('Forum_Category', 'Forum_Board'));
+    }
+    public function testBuildFlushTree3() {
+        $this->correct = array('Forum_Category','Forum_Board','Forum_Thread','Forum_Entry');
+
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Entry','Forum_Board'));
+        $this->assertEqual($tree, array('Forum_Entry','Forum_Board'));
+        
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Board','Forum_Entry'));
+        $this->assertEqual($tree, array('Forum_Board','Forum_Entry'));
+    }
+    public function testBuildFlushTree4() {
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Thread','Forum_Board'));
+        $this->assertEqual($tree, array('Forum_Board', 'Forum_Thread'));
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Board','Forum_Thread'));
+        $this->assertEqual($tree, array('Forum_Board','Forum_Thread'));
+    }
+    public function testBuildFlushTree5() {
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Board','Forum_Thread','Forum_Entry'));
+        $this->assertEqual($tree, array('Forum_Board','Forum_Thread','Forum_Entry'));
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Board','Forum_Entry','Forum_Thread'));
+        $this->assertEqual($tree, array('Forum_Board','Forum_Thread','Forum_Entry'));
+    }
+    public function testBuildFlushTree6() {
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Entry','Forum_Board','Forum_Thread'));
+        $this->assertEqual($tree, array('Forum_Board','Forum_Thread','Forum_Entry'));
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Entry','Forum_Thread','Forum_Board'));
+        $this->assertEqual($tree, array('Forum_Board','Forum_Thread','Forum_Entry'));
+    }
+    public function testBuildFlushTree7() {
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Thread','Forum_Board','Forum_Entry'));
+        $this->assertEqual($tree, array('Forum_Board','Forum_Thread','Forum_Entry'));
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Thread','Forum_Entry','Forum_Board'));
+        $this->assertEqual($tree, array('Forum_Board','Forum_Thread','Forum_Entry'));
+    }
+    public function testBuildFlushTree8() {
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Board','Forum_Thread','Forum_Category'));
+        $this->assertEqual($tree, array('Forum_Category','Forum_Board','Forum_Thread'));
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Category','Forum_Thread','Forum_Board'));
+        $this->assertEqual($tree, array('Forum_Category','Forum_Board','Forum_Thread'));
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Thread','Forum_Board','Forum_Category'));
+        $this->assertEqual($tree, array('Forum_Category','Forum_Board','Forum_Thread'));
+    }
+    public function testBuildFlushTree9() {
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Board','Forum_Thread','Forum_Category','Forum_Entry'));
+        $this->assertEqual($tree, $this->correct);
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Board','Forum_Thread','Forum_Entry','Forum_Category'));
+        $this->assertEqual($tree, $this->correct);
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Board','Forum_Category','Forum_Thread','Forum_Entry'));
+        $this->assertEqual($tree, $this->correct);
+    }
+    public function testBuildFlushTree10() {
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Entry','Forum_Thread','Forum_Board','Forum_Category'));
+        $this->assertEqual($tree, $this->correct);
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Entry','Forum_Thread','Forum_Category','Forum_Board'));
+        $this->assertEqual($tree, $this->correct);
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Entry','Forum_Category','Forum_Board','Forum_Thread'));
+        $this->assertEqual($tree, $this->correct);
+    }
+    public function testBuildFlushTree11() {
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Thread','Forum_Category','Forum_Board','Forum_Entry'));
+        $this->assertEqual($tree, $this->correct);
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Thread','Forum_Entry','Forum_Category','Forum_Board'));
+        $this->assertEqual($tree, $this->correct);
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Thread','Forum_Board','Forum_Entry','Forum_Category'));
+        $this->assertEqual($tree, $this->correct);
+    }
+    public function testBuildFlushTree12() {
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Category','Forum_Entry','Forum_Board','Forum_Thread'));
+        $this->assertEqual($tree, $this->correct);
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Category','Forum_Thread','Forum_Entry','Forum_Board'));
+        $this->assertEqual($tree, $this->correct);
+        $tree = $this->unitOfWork->buildFlushTree(array('Forum_Category','Forum_Board','Forum_Thread','Forum_Entry'));
+        $this->assertEqual($tree, $this->correct);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/UnsortedTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/UnsortedTestCase.php
new file mode 100644
index 000000000..097fe42fa
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/UnsortedTestCase.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * Tests in this file are unsorted, and should be placed in an appropriate
+ * test file.  If you are unsure where to put a unit test, place them in here
+ * and hopefully someone else will move them.
+ */
+class Doctrine_UnsortedTestCase extends Doctrine_UnitTestCase {
+  public function testCascadingInsert()
+  {
+      $package = new Package();
+      $package->description = 'Package';
+
+      $packageverison = new PackageVersion();
+      $packageverison->description = 'Version';
+
+      $packageverisonnotes = new PackageVersionNotes();
+      $packageverisonnotes->description = 'Notes';
+
+      $package->Version[0] = $packageverison;
+      $package->Version[0]->Note[0] = $packageverisonnotes;
+
+      $package->save();
+
+      $this->assertNotNull($package->id);
+      $this->assertNotNull($package->Version[0]->id);
+      $this->assertNotNull($package->Version[0]->Note[0]->id);
+  }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Validator/ForeignKeysTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Validator/ForeignKeysTestCase.php
new file mode 100644
index 000000000..c26d12ffc
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Validator/ForeignKeysTestCase.php
@@ -0,0 +1,92 @@
+<?php
+
+class Doctrine_Validator_ForeignKeys_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables()
+    { 
+        $this->tables = array('TestPerson', 'TestAddress');
+        
+        parent::prepareTables();
+    }
+
+    public function testForeignKeyIsValidIfLocalRelationIsSet()
+    {
+        $person = new TestPerson();
+        $address = new TestAddress();
+        
+        $address->Person = $person;
+        
+        $table = $address->getTable();
+        $errors = $table->validateField('person_id', $address->person_id, $address);
+        
+        $this->assertEqual(0, $errors->count());
+    }
+    
+    public function testForeignKeyIsValidIfForeignRelationIsSet()
+    {
+        $person = new TestPerson();
+        $person->Addresses[0] = new TestAddress();
+        
+        $address = $person->Addresses[0];
+        $table = $address->getTable();
+        $errors = $table->validateField('person_id', $address->person_id, $address);
+        
+        $this->assertEqual(0, $errors->count());
+    }
+
+    public function testSynchronizedForeignKeyIsValidIfLocalRelationIsSet()
+    {
+        $person = new TestPerson();
+        $person->synchronizeWithArray(array('Addresses' => array(array())));
+
+        $address = $person->Addresses[0];
+        $table = $address->getTable();
+        
+        $errors = $table->validateField('person_id', $address->person_id, $address);
+        $this->assertEqual(0, $errors->count());
+    }
+
+    public function testSynchronizedForeignKeyIsValidIfForeignRelationIsSet()
+    {
+        $address = new TestAddress();
+        $address->synchronizeWithArray(array('Person' => array()));
+
+        $table = $address->getTable();
+        $errors = $table->validateField('person_id', $address->person_id, $address);
+        $this->assertEqual(0, $errors->count());
+    }
+}
+
+class TestPerson extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', null, array('primary' => true, 'notnull' => true, 'autoincrement' => true));
+        $this->hasColumn('first_name', 'string');
+        $this->hasColumn('last_name', 'string');
+        $this->hasColumn('favorite_color_id', 'integer');
+    }
+    
+    public function setUp()
+    {
+        $this->hasMany('TestAddress as Addresses', array('local' => 'id', 'foreign' => 'person_id'));
+    }
+}
+
+class TestAddress extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', null, array('primary' => true, 'notnull'=> true, 'autoincrement' => true));
+        $this->hasColumn('person_id', 'integer', null, array('notnull' => true));
+        $this->hasColumn('street', 'string');
+        $this->hasColumn('city', 'string');
+        $this->hasColumn('state', 'string');
+        $this->hasColumn('zip', 'string');
+    }
+    
+    public function setUp()
+    {
+        $this->hasOne('TestPerson as Person', array('local' => 'person_id', 'foreign' => 'id'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Validator/FutureTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Validator/FutureTestCase.php
new file mode 100644
index 000000000..a8fffa17d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Validator/FutureTestCase.php
@@ -0,0 +1,84 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Validator_FutureTestCase
+ *
+ * @package     Doctrine
+ * @author      Roman Borschel <roman@code-factory.org>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Validator_Future_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'ValidatorTest_DateModel';
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+        
+    }
+    
+    public function testValidFutureDates()
+    {
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+        
+        // one year ahead
+        $user1 = new ValidatorTest_DateModel();
+        $user1->death = date('Y-m-d', time() + 365 * 24 * 60 * 60);
+        $this->assertTrue($user1->trySave());
+        
+        // one month ahead
+        $user1 = new ValidatorTest_DateModel();
+        $user1->death = date('Y-m-d', time() + 30 * 24 * 60 * 60);
+        $this->assertTrue($user1->trySave());
+        
+        // one day ahead
+        $user1->death = date('Y-m-d', time() + 24 * 60 * 60);
+        $this->assertTrue($user1->trySave());
+        
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+    
+    public function testInvalidFutureDates()
+    {
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+
+        $user1 = new ValidatorTest_DateModel();
+        $user1->death = date('Y-m-d', 42);
+        $this->assertFalse($user1->trySave());
+        
+        $user1->death = date('Y-m-d', time());
+        $this->assertFalse($user1->trySave());
+        
+        $user1->death = date('Y-m-d', time() + 60);
+        $this->assertFalse($user1->trySave());
+        
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Validator/PastTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Validator/PastTestCase.php
new file mode 100644
index 000000000..d14fd7625
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/Validator/PastTestCase.php
@@ -0,0 +1,84 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Validator_FutureTestCase
+ *
+ * @package     Doctrine
+ * @author      Roman Borschel <roman@code-factory.org>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Validator_Past_TestCase extends Doctrine_UnitTestCase
+{
+    public function prepareTables()
+    {
+        $this->tables[] = 'ValidatorTest_DateModel';
+        parent::prepareTables();
+    }
+
+    public function prepareData()
+    {
+        
+    }
+    
+    public function testInvalidPastDates()
+    {
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+        
+        // one year ahead
+        $user1 = new ValidatorTest_DateModel();
+        $user1->birthday = date('Y-m-d', time() + 365 * 24 * 60 * 60);
+        $this->assertFalse($user1->trySave());
+        
+        // one month ahead
+        $user1 = new ValidatorTest_DateModel();
+        $user1->birthday = date('Y-m-d', time() + 30 * 24 * 60 * 60);
+        $this->assertFalse($user1->trySave());
+        
+        // one day ahead
+        $user1->birthday = date('Y-m-d', time() + 24 * 60 * 60);
+        $this->assertFalse($user1->trySave());
+        
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+    
+    public function testValidPastDates()
+    {
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+        
+        $user1 = new ValidatorTest_DateModel();
+        $user1->birthday = date('Y-m-d', 42);
+        $this->assertTrue($user1->trySave());
+        
+        $user1->birthday = date('Y-m-d', mktime(0,0,0,6,3,1981));
+        $this->assertTrue($user1->trySave());
+        
+        $user1->birthday = date('Y-m-d', mktime(0,0,0,3,9,1983));
+        $this->assertTrue($user1->trySave());
+        
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ValidatorTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ValidatorTestCase.php
new file mode 100644
index 000000000..401588afa
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ValidatorTestCase.php
@@ -0,0 +1,487 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Validator_TestCase
+ * TestCase for Doctrine's validation component.
+ * 
+ * @todo More tests to cover the full interface of Doctrine_Validator_ErrorStack.
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Validator_TestCase extends Doctrine_UnitTestCase 
+{
+    public function prepareTables() 
+    {
+        
+        $this->tables[] = 'ValidatorTest';
+        $this->tables[] = 'ValidatorTest_Person';
+        $this->tables[] = 'ValidatorTest_FootballPlayer';
+        $this->tables[] = 'ValidatorTest_ClientModel';
+        $this->tables[] = 'ValidatorTest_ClientToAddressModel';
+        $this->tables[] = 'ValidatorTest_AddressModel';
+        $this->tables[] = 'BooleanTest';
+        $this->tables[] = 'Log_Entry';
+        $this->tables[] = 'Log_Status';
+        parent::prepareTables();
+    }
+
+    public function testIsValidType() 
+    {
+        $var = '123';
+        $this->assertTrue(Doctrine_Validator::isValidType($var, 'string'));
+        $this->assertTrue(Doctrine_Validator::isValidType($var, 'integer'));
+        $this->assertTrue(Doctrine_Validator::isValidType($var, 'float'));
+        $this->assertFalse(Doctrine_Validator::isValidType($var, 'array'));
+        $this->assertFalse(Doctrine_Validator::isValidType($var, 'object'));
+
+        $var = 123;
+        $this->assertTrue(Doctrine_Validator::isValidType($var, 'string'));
+        $this->assertTrue(Doctrine_Validator::isValidType($var, 'integer'));
+        $this->assertTrue(Doctrine_Validator::isValidType($var, 'float'));
+        $this->assertFalse(Doctrine_Validator::isValidType($var, 'array'));
+        $this->assertFalse(Doctrine_Validator::isValidType($var, 'object'));
+
+        $var = 123.12;
+        $this->assertTrue(Doctrine_Validator::isValidType($var, 'string'));
+        $this->assertFalse(Doctrine_Validator::isValidType($var, 'integer'));
+        $this->assertTrue(Doctrine_Validator::isValidType($var, 'float'));
+        $this->assertFalse(Doctrine_Validator::isValidType($var, 'array'));
+        $this->assertFalse(Doctrine_Validator::isValidType($var, 'object'));
+
+        $var = '123.12';
+        $this->assertTrue(Doctrine_Validator::isValidType($var, 'string'));
+        $this->assertFalse(Doctrine_Validator::isValidType($var, 'integer'));
+        $this->assertTrue(Doctrine_Validator::isValidType($var, 'float'));
+        $this->assertFalse(Doctrine_Validator::isValidType($var, 'array'));
+        $this->assertFalse(Doctrine_Validator::isValidType($var, 'object'));
+
+        $var = '';
+        $this->assertTrue(Doctrine_Validator::isValidType($var, 'string'));
+        $this->assertFalse(Doctrine_Validator::isValidType($var, 'integer'));
+        $this->assertFalse(Doctrine_Validator::isValidType($var, 'float'));
+        $this->assertFalse(Doctrine_Validator::isValidType($var, 'array'));
+        $this->assertFalse(Doctrine_Validator::isValidType($var, 'object'));
+
+        $var = null;
+        $this->assertTrue(Doctrine_Validator::isValidType($var, 'string'));
+        $this->assertTrue(Doctrine_Validator::isValidType($var, 'integer'));
+        $this->assertTrue(Doctrine_Validator::isValidType($var, 'float'));
+        $this->assertTrue(Doctrine_Validator::isValidType($var, 'array'));
+        $this->assertTrue(Doctrine_Validator::isValidType($var, 'object'));
+
+        $var = 'str';
+        $this->assertTrue(Doctrine_Validator::isValidType($var, 'string'));
+        $this->assertFalse(Doctrine_Validator::isValidType($var, 'integer'));
+        $this->assertFalse(Doctrine_Validator::isValidType($var, 'float'));
+        $this->assertFalse(Doctrine_Validator::isValidType($var, 'array'));
+        $this->assertFalse(Doctrine_Validator::isValidType($var, 'object'));
+
+        $var = array();
+        $this->assertFalse(Doctrine_Validator::isValidType($var, 'string'));
+        $this->assertFalse(Doctrine_Validator::isValidType($var, 'integer'));
+        $this->assertFalse(Doctrine_Validator::isValidType($var, 'float'));
+        $this->assertTrue(Doctrine_Validator::isValidType($var, 'array'));
+        $this->assertFalse(Doctrine_Validator::isValidType($var, 'object'));
+        
+        $var = new Exception();
+        $this->assertFalse(Doctrine_Validator::isValidType($var, 'string'));
+        $this->assertFalse(Doctrine_Validator::isValidType($var, 'integer'));
+        $this->assertFalse(Doctrine_Validator::isValidType($var, 'float'));
+        $this->assertFalse(Doctrine_Validator::isValidType($var, 'array'));
+        $this->assertTrue(Doctrine_Validator::isValidType($var, 'object'));
+    }
+
+    public function testValidate2() 
+    {
+        $test = new ValidatorTest();
+        $test->mymixed = "message";
+        $test->myrange = 1;
+        $test->myregexp = '123a';
+        
+        $validator = new Doctrine_Validator();
+        $validator->validateRecord($test);
+
+        $stack = $test->errorStack();
+
+        $this->assertTrue($stack instanceof Doctrine_Validator_ErrorStack);
+
+        $this->assertTrue(in_array('notnull', $stack['mystring']));
+        $this->assertTrue(in_array('notblank', $stack['myemail2']));
+        $this->assertTrue(in_array('range', $stack['myrange']));
+        $this->assertTrue(in_array('regexp', $stack['myregexp']));
+        $test->mystring = 'str';
+
+        $test->save();
+    }
+
+    public function testValidate() 
+    {
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+        $user = $this->connection->getTable('User')->find(4);
+
+        $set = array('password' => 'this is an example of too long password',
+                     'loginname' => 'this is an example of too long loginname',
+                     'name' => 'valid name',
+                     'created' => 'invalid');
+        $user->setArray($set);
+        $email = $user->Email;
+        $email->address = 'zYne@invalid';
+
+        $this->assertTrue($user->getModified() == $set);
+
+        $validator = new Doctrine_Validator();
+        $validator->validateRecord($user);
+
+
+        $stack = $user->errorStack();
+
+        $this->assertTrue($stack instanceof Doctrine_Validator_ErrorStack);
+        $this->assertTrue(in_array('length', $stack['loginname']));
+        $this->assertTrue(in_array('length', $stack['password']));
+        $this->assertTrue(in_array('type', $stack['created']));
+
+        $validator->validateRecord($email);
+        $stack = $email->errorStack();
+        $this->assertTrue(in_array('email', $stack['address']));
+        $email->address = 'arnold@example.com';
+
+        $validator->validateRecord($email);
+        $stack = $email->errorStack();
+
+        $this->assertTrue(in_array('unique', $stack['address']));
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+
+    /**
+     * Tests the Email validator. (Doctrine_Validator_Email)
+     */
+    public function testIsValidEmail() 
+    {
+
+        $validator = new Doctrine_Validator_Email();
+
+        $this->assertFalse($validator->validate("example@example"));
+        $this->assertFalse($validator->validate("example@@example"));
+        $this->assertFalse($validator->validate("example@example."));
+        $this->assertFalse($validator->validate("example@e.."));
+
+        $this->assertTrue($validator->validate("null+doctrine@pookey.co.uk"));
+        $this->assertTrue($validator->validate("null@pookey.co.uk"));
+        $this->assertTrue($validator->validate("null@pookey.com"));
+        $this->assertTrue($validator->validate("null@users.doctrine.pengus.net"));
+    }
+
+    /**
+     * Tests saving records with invalid attributes.
+     */
+    public function testSave() 
+    {
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+        $user = $this->connection->getTable("User")->find(4);
+        try {
+            $user->name = "this is an example of too long name not very good example but an example nevertheless";
+            $user->save();
+        } catch(Doctrine_Validator_Exception $e) {
+            $this->assertEqual($e->count(), 1);
+            $invalidRecords = $e->getInvalidRecords();
+            $this->assertEqual(count($invalidRecords), 1);
+            $stack = $invalidRecords[0]->errorStack();
+            $this->assertTrue(in_array('length', $stack['name']));
+        }
+
+        try {
+            $user = $this->connection->create("User");
+            $user->Email->address = "jackdaniels@drinkmore.info...";
+            $user->name = "this is an example of too long user name not very good example but an example nevertheless";
+            $user->save();
+            $this->fail();
+        } catch (Doctrine_Validator_Exception $e) {
+            $this->pass();
+            $a = $e->getInvalidRecords();
+            //var_dump($a[1]->getErrorStack());
+            $this->assertTrue(is_array($a));
+            //var_dump(array_search($user, $a));
+            $emailStack = $user->Email->errorStack();
+            $userStack  = $user->errorStack();            
+            $this->assertTrue(in_array('email', $emailStack['address']));
+            $this->assertTrue(in_array('length', $userStack['name']));
+        }
+        
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+
+    /**
+     * Tests whether the validate() callback works correctly
+     * in descendants of Doctrine_Record.
+     */
+    public function testValidationHooks() 
+    {
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+        
+        // Tests validate() and validateOnInsert()
+        $user = new User();
+         try {
+            $user->name = "I'm not The Saint";
+            $user->password = "1234";
+            $user->save();
+        } catch(Doctrine_Validator_Exception $e) {
+            $this->assertEqual($e->count(), 1);
+            $invalidRecords = $e->getInvalidRecords();
+            $this->assertEqual(count($invalidRecords), 1);
+
+            $stack = $invalidRecords[0]->errorStack();
+
+            $this->assertEqual($stack->count(), 2);
+            $this->assertTrue(in_array('notTheSaint', $stack['name']));  // validate() hook constraint
+            $this->assertTrue(in_array('pwNotTopSecret', $stack['password'])); // validateOnInsert() hook constraint
+        }
+        
+        // Tests validateOnUpdate()
+        $user = $this->connection->getTable("User")->find(4);
+        try {
+            $user->name = "The Saint";  // Set correct name
+            $user->password = "Top Secret"; // Set correct password
+            $user->loginname = "Somebody"; // Wrong login name!
+            $user->save();
+            $this->fail();
+        } catch(Doctrine_Validator_Exception $e) {
+            $invalidRecords = $e->getInvalidRecords();
+            $this->assertEqual(count($invalidRecords), 1);
+            
+            $stack = $invalidRecords[0]->errorStack();
+            
+            $this->assertEqual($stack->count(), 1);
+            $this->assertTrue(in_array('notNobody', $stack['loginname']));  // validateOnUpdate() hook constraint
+        }
+        
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+
+    /**
+     * Tests whether the validateOnInsert() callback works correctly
+     * in descendants of Doctrine_Record.
+     */
+    public function testHookValidateOnInsert() 
+    {
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+        
+        $user = new User();
+        $user->password = "1234";
+        
+        try {
+            $user->save();
+            $this->fail();
+        } catch (Doctrine_Validator_Exception $ex) {
+            $errors = $user->errorStack();
+            $this->assertTrue(in_array('pwNotTopSecret', $errors['password']));
+        }
+        
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+
+    /*
+    public function testIssue()
+    {
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VLD, true);
+        
+        try {
+            $person = new ValidatorTest_Person();
+            $person->name = '';  // will raise a validation exception since name must be 'notblank'
+            $person->is_football_player = true;
+        
+            $person->ValidatorTest_FootballPlayer->team_name = 'liverpool';
+            $person->ValidatorTest_FootballPlayer->goals_count = 2;
+        
+            $person->save();
+        }
+        catch(Doctrine_Validator_Exception $e) {
+            $this->fail("test");
+            //var_dump($person->getErrorStack());
+            //var_dump($person->ValidatorTest_FootballPlayer->getErrorStack());
+        }
+        
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VLD, false);
+    }
+    */
+
+     // @todo move to a separate test file (tests/Validator/UniqueTestCase) .
+
+    public function testSetSameUniqueValueOnSameRecordThrowsNoException()
+    {
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+        
+        $r = new ValidatorTest_Person();
+        $r->identifier = '1234';
+        $r->save();
+        
+        $r = $this->connection->getTable('ValidatorTest_Person')->findAll()->getFirst();
+        $r->identifier = 1234;
+        try {
+           $r->save();
+        }
+        catch (Doctrine_Validator_Exception $e) {
+           $this->fail("Validator exception raised without reason!");
+        }
+        
+        $r->delete(); // clean up
+        
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+    
+    public function testSetSameUniqueValueOnDifferentRecordThrowsException()
+    {
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+        
+        $r = new ValidatorTest_Person();
+        $r->identifier = '1234';
+        $r->save();
+        
+        $r = new ValidatorTest_Person();
+        $r->identifier = 1234;
+        try {
+            $r->save();
+            $this->fail("No validator exception thrown on unique validation.");
+        } catch (Doctrine_Validator_Exception $e) {
+            $this->pass();
+        }
+        
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+    
+    public function testValidationOnManyToManyRelations()
+    {
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+        try {
+            $client = new ValidatorTest_ClientModel();
+            $client->short_name = 'test';
+            $client->ValidatorTest_AddressModel[0]->state = 'az';
+            $client->save();
+            $this->fail();
+        } catch (Doctrine_Validator_Exception $dve) {
+            $s = $dve->getInvalidRecords();
+            $this->assertEqual(1, count($dve->getInvalidRecords()));
+            $invalids = $dve->getInvalidRecords();
+            //var_dump($invalids[0]->getErrorStack());
+            //echo "<br/><br/>";
+            //var_dump($invalids[1]->getErrorStack());
+            $stack = $client->ValidatorTest_AddressModel[0]->getErrorStack();
+
+            $this->assertTrue(in_array('notnull', $stack['address1']));
+            $this->assertTrue(in_array('notblank', $stack['address1']));
+            $this->assertTrue(in_array('notnull', $stack['address2']));
+            $this->assertTrue(in_array('notnull', $stack['city']));
+            $this->assertTrue(in_array('notblank', $stack['city']));
+            $this->assertTrue(in_array('usstate', $stack['state']));
+            $this->assertTrue(in_array('notnull', $stack['zip']));
+            $this->assertTrue(in_array('notblank', $stack['zip']));
+        }
+        
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+    
+    public function testSaveInTransactionThrowsValidatorException()
+    {
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+        try {
+            $this->conn->beginTransaction();
+            $client = new ValidatorTest_ClientModel();
+            $client->short_name = 'test';
+            $client->ValidatorTest_AddressModel[0]->state = 'az';
+            $client->save();
+            $this->fail();
+            $this->conn->commit();
+        } catch (Doctrine_Validator_Exception $dve) {
+            $this->conn->rollback();
+            $s = $dve->getInvalidRecords();
+            $this->assertEqual(1, count($dve->getInvalidRecords()));
+            $stack = $client->ValidatorTest_AddressModel[0]->getErrorStack();
+
+            $this->assertTrue(in_array('notnull', $stack['address1']));
+            $this->assertTrue(in_array('notblank', $stack['address1']));
+            $this->assertTrue(in_array('notnull', $stack['address2']));
+            $this->assertTrue(in_array('notnull', $stack['city']));
+            $this->assertTrue(in_array('notblank', $stack['city']));
+            $this->assertTrue(in_array('usstate', $stack['state']));
+            $this->assertTrue(in_array('notnull', $stack['zip']));
+            $this->assertTrue(in_array('notblank', $stack['zip']));
+        } 
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+
+    public function testSetBooleanWithNumericZeroOrOne()
+    {
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+
+        $test = new BooleanTest();
+        $test->is_working = '1';
+        $test->save();
+
+        $test = new BooleanTest();
+        $test->is_working = '0';
+        $test->save();
+
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+
+    public function testNoValidationOnExpressions()
+    {
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+
+        try {
+            $entry = new Log_Entry();
+            $entry->stamp = new Doctrine_Expression('NOW()');
+            $entry->save();
+            $this->pass();
+        } catch (Exception $e) {
+            $this->fail();
+        }
+
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+    
+    public function testValidationIsTriggeredOnFlush()
+    {
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_ALL);
+        $this->conn->clear();
+
+        $r = new ValidatorTest_Person();
+        $r->identifier = '5678';
+        $r->save();
+
+        $r = new ValidatorTest_Person();
+        $r->identifier = 5678;
+        try {
+            $this->conn->flush();
+            $this->fail("No validator exception thrown on unique validation, triggered by flush().");
+        } catch (Doctrine_Validator_Exception $e) {
+            $this->pass();
+        }
+        $this->manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, Doctrine_Core::VALIDATE_NONE);
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ValueHolderTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ValueHolderTestCase.php
new file mode 100644
index 000000000..88bef702d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ValueHolderTestCase.php
@@ -0,0 +1,60 @@
+<?php
+require_once("UnitTestCase.php");
+
+class Doctrine_ValueHolder_TestCase extends Doctrine_UnitTestCase {
+    public function testGetSet() {
+        $this->valueHolder->data[0] = 'first';
+        
+        $this->assertEqual($this->valueHolder->data[0], 'first');
+        $this->assertEqual($this->valueHolder[0], 'first');
+        $this->assertEqual($this->valueHolder->get(0), 'first');
+
+        $this->valueHolder->data['key'] = 'second';
+        
+        $this->assertEqual($this->valueHolder->data['key'], 'second');
+        $this->assertEqual($this->valueHolder->key, 'second');
+        $this->assertEqual($this->valueHolder['key'], 'second');
+        $this->assertEqual($this->valueHolder->get('key'), 'second');
+    }
+    public function testSimpleQuery() {
+        $q = new Doctrine_Query($this->connection);
+        $q->from("User");
+        $users = $q->execute(array(), Doctrine_Core::FETCH_VHOLDER);
+        $this->assertEqual($users->count(), 8);
+
+
+    }
+    public function testQueryWithOneToManyRelation() {
+        $q = new Doctrine_Query($this->connection);
+        $q->from("User.Phonenumber");
+        $users = $q->execute(array(), Doctrine_Core::FETCH_VHOLDER);
+        $this->assertEqual($users->count(), 8);
+        $this->assertTrue($users[0] instanceof Doctrine_ValueHolder);
+        $this->assertTrue($users[3] instanceof Doctrine_ValueHolder);
+        $this->assertTrue($users[7] instanceof Doctrine_ValueHolder);
+
+        $this->assertEqual(count($users[0]->Phonenumber), 1);
+        $this->assertEqual(count($users[1]->Phonenumber), 3);
+        $this->assertEqual(count($users[2]->Phonenumber), 1);
+        $this->assertEqual(count($users[3]->Phonenumber), 1);
+        $this->assertEqual(count($users[4]->Phonenumber), 3);
+    }
+    public function testDelete() {
+        $f = false;
+        try {
+            $this->valueHolder->delete();
+        } catch(Doctrine_Exception $e) {
+            $f = true;
+        }
+        $this->assertTrue($f);
+    }
+    public function testSave() {
+        $f = false;
+        try {
+            $this->valueHolder->save();
+        } catch(Doctrine_Exception $e) {
+            $f = true;
+        }
+        $this->assertTrue($f);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ViewTestCase.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ViewTestCase.php
new file mode 100644
index 000000000..fe0d53bba
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/ViewTestCase.php
@@ -0,0 +1,78 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_View_TestCase
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_View_TestCase extends Doctrine_UnitTestCase 
+{
+
+    public function testCreateView()
+    {
+        $query = new Doctrine_Query($this->connection);
+        $query->from('User');
+
+        $view = new Doctrine_View($query, 'MyView');
+
+        $this->assertEqual($view->getName(), 'MyView');
+
+        $this->assertTrue($view->getQuery() === $query);
+        $this->assertTrue($view === $query->getView());
+        $this->assertTrue($view->getConnection() instanceof Doctrine_Connection);
+
+        $success = true;
+
+        try {
+            $view->create();
+        } catch(Exception $e) {
+            $success = false;
+        }
+        $this->assertTrue($success);
+
+        $users = $view->execute();
+        $count = $this->conn->count();
+        $this->assertTrue($users instanceof Doctrine_Collection);
+        $this->assertEqual($users->count(), 8);
+        $this->assertEqual($users[0]->name, 'zYne');
+        $this->assertEqual($users[0]->state(), Doctrine_Record::STATE_CLEAN);
+        $this->assertEqual($count, $this->conn->count());
+
+        $success = true;
+        try {
+            $view->drop();
+        } catch(Exception $e) {
+            $success = false;
+        }
+        $this->assertTrue($success);
+    }
+
+    public function testConstructor() 
+    {
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/bootstrap.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/bootstrap.php
new file mode 100755
index 000000000..2bb1704da
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/bootstrap.php
@@ -0,0 +1,22 @@
+<?php
+
+$startTime = time();
+
+// Debug Diagnosic process attacher sleep time needed to link process
+// More info about that: http://bugs.php.net/bugs-generating-backtrace-win32.php
+//sleep(10);
+
+error_reporting(E_ALL | E_STRICT);
+ini_set('max_execution_time', 900);
+ini_set('date.timezone', 'GMT+0');
+
+define('DOCTRINE_DIR', $_SERVER['DOCTRINE_DIR']);
+
+require_once(DOCTRINE_DIR . '/lib/Doctrine/Core.php');
+
+spl_autoload_register(array('Doctrine_Core', 'autoload'));
+spl_autoload_register(array('Doctrine_Core', 'modelsAutoload'));
+
+require_once(DOCTRINE_DIR . '/tests/DoctrineTest.php');
+
+spl_autoload_register(array('DoctrineTest', 'autoload'));
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/index.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/index.php
new file mode 100755
index 000000000..fd3a33263
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/index.php
@@ -0,0 +1,2 @@
+<?php
+require_once('run.php');
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/10_test.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/10_test.class.php
new file mode 100644
index 000000000..afcb348f3
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/10_test.class.php
@@ -0,0 +1,8 @@
+<?php
+
+class Test10 extends Doctrine_Migration_Base
+{
+    public function migrate($direction)
+    {
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/11_test.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/11_test.class.php
new file mode 100644
index 000000000..dd3d9b5b9
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/11_test.class.php
@@ -0,0 +1,8 @@
+<?php
+
+class Test11 extends Doctrine_Migration_Base
+{
+    public function migrate($direction)
+    {
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/1_add_phonenumber.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/1_add_phonenumber.class.php
new file mode 100644
index 000000000..fafb911f4
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/1_add_phonenumber.class.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * This class has been auto-generated by the Doctrine ORM Framework
+ */
+class AddPhonenumber extends Doctrine_Migration_Base
+{
+    public function migrate($direction)
+    {
+        $this->table($direction, 'migration_phonenumber', array('id' => array('type' => 'integer', 'length' => 20, 'autoincrement' => true, 'primary' => true), 'user_id' => array('type' => 'integer', 'length' => 2147483647), 'phonenumber' => array('type' => 'string', 'length' => 2147483647)), array('indexes' => array(), 'primary' => array(0 => 'id')));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/2_add_user.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/2_add_user.class.php
new file mode 100644
index 000000000..cfee4a4fc
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/2_add_user.class.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * This class has been auto-generated by the Doctrine ORM Framework
+ */
+class AddUser extends Doctrine_Migration_Base
+{
+    public function migrate($direction)
+    {
+		$this->table($direction, 'migration_user', array('id' => array('type' => 'integer', 'length' => 20, 'autoincrement' => true, 'primary' => true), 'username' => array('type' => 'string', 'length' => 255), 'password' => array('type' => 'string', 'length' => 255)), array('indexes' => array(), 'primary' => array(0 => 'id')));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/3_add_profile.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/3_add_profile.class.php
new file mode 100644
index 000000000..f29fea186
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/3_add_profile.class.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * This class has been auto-generated by the Doctrine ORM Framework
+ */
+class AddProfile extends Doctrine_Migration_Base
+{
+    public function migrate($direction)
+    {
+		$this->table($direction, 'migration_profile', array('id' => array('type' => 'integer', 'length' => 20, 'autoincrement' => true, 'primary' => true), 'name' => array('type' => 'string', 'length' => 255)), array('indexes' => array(), 'primary' => array(0 => 'id')));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/4_drop_profile.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/4_drop_profile.class.php
new file mode 100644
index 000000000..2cedecc98
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/4_drop_profile.class.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * This class has been auto-generated by the Doctrine ORM Framework
+ */
+class DropProfile extends Doctrine_Migration_Base
+{
+    public function migrate($direction)
+    {
+        $direction = $direction == 'up' ? 'down':'up';
+		$this->table($direction, 'migration_profile', array('id' => array('type' => 'integer', 'length' => 20, 'autoincrement' => true, 'primary' => true), 'name' => array('type' => 'string', 'length' => 255)), array('indexes' => array(), 'primary' => array(0 => 'id')));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/5_test.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/5_test.class.php
new file mode 100644
index 000000000..23046eb28
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/5_test.class.php
@@ -0,0 +1,8 @@
+<?php
+
+class Test5 extends Doctrine_Migration_Base
+{
+    public function migrate($direction)
+    {
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/6_test.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/6_test.class.php
new file mode 100644
index 000000000..c810b9523
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/6_test.class.php
@@ -0,0 +1,8 @@
+<?php
+
+class Test6 extends Doctrine_Migration_Base
+{
+    public function migrate($direction)
+    {
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/7_test.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/7_test.class.php
new file mode 100644
index 000000000..ddb22eb6a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/7_test.class.php
@@ -0,0 +1,8 @@
+<?php
+
+class Test7 extends Doctrine_Migration_Base
+{
+    public function migrate($direction)
+    {
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/8_test.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/8_test.class.php
new file mode 100644
index 000000000..71c01924c
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/8_test.class.php
@@ -0,0 +1,8 @@
+<?php
+
+class Test8 extends Doctrine_Migration_Base
+{
+    public function migrate($direction)
+    {
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/9_test.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/9_test.class.php
new file mode 100644
index 000000000..b02dfef50
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/migration_classes/9_test.class.php
@@ -0,0 +1,8 @@
+<?php
+
+class Test9 extends Doctrine_Migration_Base
+{
+    public function migrate($direction)
+    {
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Account.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Account.php
new file mode 100644
index 000000000..6863cae85
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Account.php
@@ -0,0 +1,10 @@
+<?php
+class Account extends Doctrine_Record 
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('entity_id', 'integer');
+        $this->hasColumn('amount', 'integer');
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Address.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Address.php
new file mode 100644
index 000000000..9d423c30f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Address.php
@@ -0,0 +1,13 @@
+<?php
+class Address extends Doctrine_Record 
+{
+    public function setUp()
+    {
+        $this->hasMany('User', array('local' => 'address_id', 
+                                     'foreign' => 'user_id',
+                                     'refClass' => 'EntityAddress'));
+    }
+    public function setTableDefinition() {
+        $this->hasColumn('address', 'string', 200);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Album.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Album.php
new file mode 100644
index 000000000..65cad1b2d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Album.php
@@ -0,0 +1,17 @@
+<?php
+class Album extends Doctrine_Record
+{
+    public function setUp()
+    {
+        $this->hasMany('Song', array('local' => 'id', 'foreign' => 'album_id'));
+        $this->hasOne('User', array('local' => 'user_id',
+                                    'foreign' => 'id',
+                                    'onDelete' => 'CASCADE'));
+    }
+    public function setTableDefinition()
+    {
+        $this->hasColumn('user_id', 'integer');
+        $this->hasColumn('name', 'string',20);
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/App.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/App.php
new file mode 100644
index 000000000..44f99bbf9
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/App.php
@@ -0,0 +1,19 @@
+<?php
+class App extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('name', 'string', 32);
+        $this->hasColumn('user_id', 'integer', 11);
+        $this->hasColumn('app_category_id', 'integer', 11);
+    }
+    public function setUp() {
+        $this->hasOne('User', array(
+            'local' => 'user_id', 'foreign' => 'id'
+        ));
+
+        $this->hasOne('App_Category as Category', array(
+            'local' => 'app_category_id',
+            'foreign' => 'id'
+        ));
+    }        
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/App_Category.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/App_Category.php
new file mode 100644
index 000000000..4f6ff96f5
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/App_Category.php
@@ -0,0 +1,18 @@
+<?php
+class App_Category extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('name', 'string', 32);
+        $this->hasColumn('parent_id', 'integer');
+    }
+    public function setUp() {
+        $this->hasMany('App', array(
+            'local' => 'id',
+            'foreign' => 'app_category_id'
+        ));
+
+        $this->hasMany('App_Category as Parent', array(
+            'local' => 'parent_id',
+            'foreign' => 'id'
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/App_User.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/App_User.php
new file mode 100644
index 000000000..6642e866f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/App_User.php
@@ -0,0 +1,18 @@
+<?php
+class App_User extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('first_name', 'string', 32);
+        $this->hasColumn('last_name', 'string', 32);
+        $this->hasColumn('email', 'string', 128, 'email');
+        $this->hasColumn('username', 'string', 16, 'unique, nospace');
+        $this->hasColumn('password', 'string', 128, 'notblank');
+        $this->hasColumn('country', 'string', 2, 'country');
+        $this->hasColumn('zipcode', 'string', 9, 'nospace');
+    }
+    public function setUp() {
+        $this->hasMany('App', array(
+            'local' => 'id',
+            'foreign' => 'user_id'
+        ));
+    }    
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Assignment.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Assignment.php
new file mode 100644
index 000000000..3d2f8b722
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Assignment.php
@@ -0,0 +1,8 @@
+<?php
+class Assignment extends Doctrine_Record {
+    public function setTableDefinition() {
+       $this->hasColumn('task_id', 'integer'); 
+       $this->hasColumn('resource_id', 'integer'); 
+    } 
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Auth.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Auth.php
new file mode 100644
index 000000000..23df462ae
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Auth.php
@@ -0,0 +1,14 @@
+<?php
+class Auth extends Doctrine_Record 
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('roleid', 'integer', 10);
+        $this->hasColumn('name', 'string', 50);
+    }
+    public function setUp() 
+    {
+        $this->hasOne('Role', array('local' => 'roleid', 'foreign' => 'id'));
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Author.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Author.php
new file mode 100644
index 000000000..1b48b80a3
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Author.php
@@ -0,0 +1,15 @@
+<?php
+class Author extends Doctrine_Record
+{
+    public function setUp()
+    {
+        $this->hasOne('Book', array('local' => 'book_id',
+                                    'foreign' => 'id',
+                                    'onDelete' => 'CASCADE'));
+    }
+    public function setTableDefinition()
+    {
+        $this->hasColumn('book_id', 'integer');
+        $this->hasColumn('name', 'string',20);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BadlyNamed__Class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BadlyNamed__Class.php
new file mode 100644
index 000000000..75c793370
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BadlyNamed__Class.php
@@ -0,0 +1,8 @@
+<?php
+class BadLyNamed__Class extends Doctrine_Record {
+    public function setTableDefinition() {
+                                         	
+    }
+    public function setUp() { }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BarRecord.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BarRecord.php
new file mode 100644
index 000000000..66074bab2
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BarRecord.php
@@ -0,0 +1,13 @@
+<?php
+class BarRecord extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+    	$this->setTableName('bar');
+    	$this->hasColumn('name', 'string', 200);
+    }
+    public function setUp()
+    {
+        $this->hasMany('FooRecord as Foo', array('local' => 'barId', 'foreign' => 'fooId', 'refClass' => 'FooBarRecord'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BaseSymfonyRecord.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BaseSymfonyRecord.php
new file mode 100644
index 000000000..e8a45d68e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BaseSymfonyRecord.php
@@ -0,0 +1,13 @@
+<?php
+abstract class BaseSymfonyRecord extends Doctrine_Record
+{
+    public function setUp()
+    {
+    }
+
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 30);
+    }
+
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Blog.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Blog.php
new file mode 100644
index 000000000..00acbb1b1
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Blog.php
@@ -0,0 +1,32 @@
+<?php
+class Blog extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+    	
+    }
+    public function setUp()
+    {
+        $this->actAs('Taggable');
+    }
+}
+class Taggable extends Doctrine_Template
+{
+    public function setUp()
+    {
+        //$this->hasMany('[Component]TagTemplate as Tag');
+    }
+}
+class TagTemplate extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 100);
+        $this->hasColumn('description', 'string');
+    }
+
+    public function setUp()
+    {
+        //$this->hasOne('[Component]', array('onDelete' => 'CASCADE'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BlogTag.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BlogTag.php
new file mode 100644
index 000000000..313d80e5c
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BlogTag.php
@@ -0,0 +1,13 @@
+<?php 
+class BlogTag extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 100);
+        $this->hasColumn('description', 'string');
+    }
+    public function setUp()
+    {
+        $this->hasOne('Blog', array('onDelete' => 'CASCADE'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BoardWithPosition.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BoardWithPosition.php
new file mode 100644
index 000000000..e7a201ab4
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BoardWithPosition.php
@@ -0,0 +1,10 @@
+<?php
+class BoardWithPosition extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('position', 'integer');
+        $this->hasColumn('category_id', 'integer');
+    }
+    public function setUp() {
+        $this->hasOne('CategoryWithPosition as Category', array('local' => 'category_id', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Book.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Book.php
new file mode 100644
index 000000000..cb28ec4f8
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Book.php
@@ -0,0 +1,16 @@
+<?php
+class Book extends Doctrine_Record
+{
+    public function setUp()
+    {
+        $this->hasMany('Author', array('local' => 'id', 'foreign' => 'book_id'));
+        $this->hasOne('User', array('local' => 'user_id',
+                                    'foreign' => 'id',
+                                    'onDelete' => 'CASCADE'));
+    }
+    public function setTableDefinition()
+    {
+        $this->hasColumn('user_id', 'integer');
+        $this->hasColumn('name', 'string',20);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Bookmark.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Bookmark.php
new file mode 100644
index 000000000..a4e6437e4
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Bookmark.php
@@ -0,0 +1,9 @@
+<?php
+class Bookmark extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('user_id', 'integer', null, array('primary' => true));
+        $this->hasColumn('page_id', 'integer', null, array('primary' => true));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BookmarkUser.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BookmarkUser.php
new file mode 100644
index 000000000..7759a3e18
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BookmarkUser.php
@@ -0,0 +1,14 @@
+<?php
+class BookmarkUser extends Doctrine_Record
+{
+    public function setUp()
+    {
+    	$this->hasMany('Bookmark as Bookmarks',
+                        array('local' => 'id',
+                              'foreign' => 'user_id'));
+    }
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 30);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BooleanTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BooleanTest.php
new file mode 100644
index 000000000..748a6fa2b
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/BooleanTest.php
@@ -0,0 +1,7 @@
+<?php
+class BooleanTest extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('is_working', 'boolean');
+        $this->hasColumn('is_working_notnull', 'boolean', 1, array('default' => false, 'notnull' => true));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CPK_Association.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CPK_Association.php
new file mode 100644
index 000000000..880512992
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CPK_Association.php
@@ -0,0 +1,7 @@
+<?php
+class CPK_Association extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('test1_id', 'integer', 11, array('primary' => true));
+        $this->hasColumn('test2_id', 'integer', 11, array('primary' => true));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CPK_Test.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CPK_Test.php
new file mode 100644
index 000000000..afb0ac549
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CPK_Test.php
@@ -0,0 +1,13 @@
+<?php
+class CPK_Test extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('name', 'string', 255);
+    }
+    public function setUp() {
+        $this->hasMany('CPK_Test2 as Test', array(
+            'local' => 'test1_id',
+            'foreign' => 'test2_id',
+            'refClass' => 'CPK_Association'
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CPK_Test2.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CPK_Test2.php
new file mode 100644
index 000000000..27d56aeba
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CPK_Test2.php
@@ -0,0 +1,13 @@
+<?php
+class CPK_Test2 extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('name', 'string', 255);
+    }
+    public function setUp() {
+        $this->hasMany('CPK_Test as Test', array(
+            'local' => 'test2_id',
+            'foreign' => 'test1_id',
+            'refClass' => 'CPK_Association'
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CascadeDeleteRelatedTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CascadeDeleteRelatedTest.php
new file mode 100644
index 000000000..15c34f295
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CascadeDeleteRelatedTest.php
@@ -0,0 +1,20 @@
+<?php
+class CascadeDeleteRelatedTest extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string');
+        $this->hasColumn('cscd_id', 'integer');
+    }
+    public function setUp()
+    {
+        $this->hasOne('CascadeDeleteTest', array('local' => 'cscd_id', 
+                                                 'foreign' => 'id',
+                                                 'onDelete' => 'CASCADE',
+                                                 'onUpdate' => 'SET NULL'));
+
+        $this->hasMany('CascadeDeleteRelatedTest2 as Related',
+                        array('local' => 'id',
+                              'foreign' => 'cscd_id'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CascadeDeleteRelatedTest2.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CascadeDeleteRelatedTest2.php
new file mode 100644
index 000000000..46049e104
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CascadeDeleteRelatedTest2.php
@@ -0,0 +1,15 @@
+<?php
+class CascadeDeleteRelatedTest2 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string');
+        $this->hasColumn('cscd_id', 'integer');
+    }
+    public function setUp()
+    {
+        $this->hasOne('CascadeDeleteRelatedTest', array('local' => 'cscd_id',
+                                                        'foreign' => 'id',
+                                                        'onDelete' => 'SET NULL'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CascadeDeleteTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CascadeDeleteTest.php
new file mode 100644
index 000000000..9cd6698d3
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CascadeDeleteTest.php
@@ -0,0 +1,14 @@
+<?php
+class CascadeDeleteTest extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string');
+    }
+    public function setUp()
+    {
+        $this->hasMany('CascadeDeleteRelatedTest as Related', 
+                        array('local' => 'id',
+                              'foreign' => 'cscd_id'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CategoryWithPosition.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CategoryWithPosition.php
new file mode 100644
index 000000000..d205e3922
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CategoryWithPosition.php
@@ -0,0 +1,10 @@
+<?php
+class CategoryWithPosition extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('position', 'integer');
+        $this->hasColumn('name', 'string', 255);
+    }
+    public function setUp() {
+        $this->hasMany('BoardWithPosition as Boards', array('local' => 'id' , 'foreign' => 'category_id')); 
+    }   
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CheckConstraintTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CheckConstraintTest.php
new file mode 100644
index 000000000..a1ed16357
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CheckConstraintTest.php
@@ -0,0 +1,10 @@
+<?php
+class CheckConstraintTest extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('price', 'decimal', 2, array('max' => 5000, 'min' => 100));
+        $this->hasColumn('discounted_price', 'decimal', 2);
+        $this->check('price > discounted_price');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ClientModel.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ClientModel.php
new file mode 100644
index 000000000..d2f39fe39
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ClientModel.php
@@ -0,0 +1,62 @@
+<?php
+class ClientModel extends Doctrine_Record
+{
+	public function setTableDefinition() 
+    {
+		$this->setTableName('clients');
+
+		$this->hasColumn('id', 'integer', 4, array('notnull' => true,
+	                                           'primary' => true,
+	                                           'autoincrement' => true,
+	                                           'unsigned' => true));
+		$this->hasColumn('short_name', 'string', 32, array('notnull' => true, 'notblank', 'unique' => true));
+	}
+
+	public function setUp() 
+    {
+		$this->hasMany('AddressModel', array('local' => 'client_id', 'foreign' => 'address_id', 'refClass' => 'ClientToAddressModel'));
+	}
+}
+
+class ClientToAddressModel extends Doctrine_Record 
+{
+	public function setTableDefinition() 
+    {
+		$this->setTableName('clients_to_addresses');
+
+		$this->hasColumn('client_id', 'integer', 11, array('primary' => true));
+		$this->hasColumn('address_id', 'integer', 11, array('primary' => true));
+	}
+
+	public function construct()
+    {
+	}
+
+	public function setUp() 
+    {
+    	$this->hasOne('ClientModel', array('local' => 'client_id', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+    	$this->hasOne('AddressModel', array('local' => 'address_id', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+	}
+}
+
+class AddressModel extends Doctrine_Record 
+{
+	public function setTableDefinition() 
+    {
+		$this->setTableName('addresses');
+
+		$this->hasColumn('id', 'integer', 11, array('autoincrement' => true,
+													'primary'       => true
+													));
+		$this->hasColumn('address1', 'string', 255, array('notnull' => true, 'notblank'));
+		$this->hasColumn('address2', 'string', 255, array('notnull' => true));
+		$this->hasColumn('city', 'string', 255, array('notnull' => true, 'notblank'));
+		$this->hasColumn('state', 'string', 10, array('notnull' => true, 'notblank', 'usstate'));
+		$this->hasColumn('zip', 'string', 15, array('notnull' => true, 'notblank', 'regexp' => '/^[0-9-]*$/'));
+	}
+
+	public function setUp() 
+    {
+		$this->hasMany('ClientModel', array('local' => 'address_id', 'foreign' => 'client_id', 'refClass' => 'ClientToAddressModel'));
+	}
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ColumnAliasTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ColumnAliasTest.php
new file mode 100644
index 000000000..5f8e96713
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ColumnAliasTest.php
@@ -0,0 +1,15 @@
+<?php
+class ColumnAliasTest extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('column1 as alias1', 'string', 200);
+        $this->hasColumn('column2 as alias2', 'integer', 4);
+        $this->hasColumn('another_column as anotherField', 'string', 50);
+        $this->hasColumn('book_id as bookId', 'integer', 4);
+    }
+    public function setUp()
+    {
+        $this->hasOne('Book as book', array('local' => 'book_id', 'foreign' => 'id'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ConcreteEmail.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ConcreteEmail.php
new file mode 100644
index 000000000..875d794c5
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ConcreteEmail.php
@@ -0,0 +1,8 @@
+<?php
+class ConcreteEmail extends Doctrine_Record
+{
+    public function setUp()
+    {
+        $this->actAs('EmailTemplate');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ConcreteGroup.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ConcreteGroup.php
new file mode 100644
index 000000000..b36ecf495
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ConcreteGroup.php
@@ -0,0 +1,8 @@
+<?php
+class ConcreteGroup extends Doctrine_Record
+{
+    public function setUp()
+    {
+        $this->actAs('GroupTemplate');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ConcreteGroupUser.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ConcreteGroupUser.php
new file mode 100644
index 000000000..bb06ada6b
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ConcreteGroupUser.php
@@ -0,0 +1,8 @@
+<?php
+class ConcreteGroupUser extends Doctrine_Record
+{
+    public function setUp()
+    {
+        $this->actAs('GroupUserTemplate');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ConcreteInheritanceTestParent.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ConcreteInheritanceTestParent.php
new file mode 100644
index 000000000..24a454ac0
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ConcreteInheritanceTestParent.php
@@ -0,0 +1,18 @@
+<?php
+class ConcreteInheritanceTestParent extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string');
+    }
+}
+
+class ConcreteInheritanceTestChild extends ConcreteInheritanceTestParent
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('age', 'integer');
+        
+        parent::setTableDefinition();
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ConcreteUser.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ConcreteUser.php
new file mode 100644
index 000000000..3c0a2f604
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ConcreteUser.php
@@ -0,0 +1,9 @@
+<?php
+class ConcreteUser extends Doctrine_Record
+{
+    public function setUp()
+    {
+        $this->actAs('UserTemplate');
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CoverageCodeN.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CoverageCodeN.php
new file mode 100644
index 000000000..5012fd362
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CoverageCodeN.php
@@ -0,0 +1,11 @@
+<?php
+class CoverageCodeN extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('coverage_codes');
+    $this->hasColumn('id', 'integer', 4, array('notnull' => true, 'primary' => true, 'autoincrement' => true));
+    $this->hasColumn('code', 'integer', 4, array (  'notnull' => true,  'notblank' => true,));
+    $this->hasColumn('description', 'string', 4000, array (  'notnull' => true,  'notblank' => true,));
+  }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CustomPK.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CustomPK.php
new file mode 100644
index 000000000..e136136de
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CustomPK.php
@@ -0,0 +1,7 @@
+<?php
+class CustomPK extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('uid', 'integer',11, 'autoincrement|primary');
+        $this->hasColumn('name', 'string',255);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CustomSequenceRecord.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CustomSequenceRecord.php
new file mode 100644
index 000000000..4dd147fff
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/CustomSequenceRecord.php
@@ -0,0 +1,9 @@
+<?php
+class CustomSequenceRecord extends Doctrine_Record {
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', null, array('primary', 'sequence' => 'custom_seq'));
+        $this->hasColumn('name', 'string');
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Data_File.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Data_File.php
new file mode 100644
index 000000000..2b6c21be1
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Data_File.php
@@ -0,0 +1,10 @@
+<?php
+class Data_File extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('filename', 'string');
+        $this->hasColumn('file_owner_id', 'integer');
+    }
+    public function setUp() {
+        $this->hasOne('File_Owner', array('local' => 'file_owner_id', 'foreign' => 'id'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/DateTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/DateTest.php
new file mode 100644
index 000000000..424664198
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/DateTest.php
@@ -0,0 +1,7 @@
+<?php
+class DateTest extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('date', 'date', 20); 
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Description.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Description.php
new file mode 100644
index 000000000..fd9bada28
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Description.php
@@ -0,0 +1,8 @@
+<?php
+class Description extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('description', 'string',3000);
+        $this->hasColumn('file_md5', 'string',32);
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Element.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Element.php
new file mode 100644
index 000000000..36c49e150
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Element.php
@@ -0,0 +1,14 @@
+<?php
+class Element extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('name', 'string', 100);
+        $this->hasColumn('parent_id', 'integer');
+    }
+    public function setUp() {
+        $this->hasMany('Element as Child', array('local'   => 'id',
+                                                 'foreign' => 'parent_id'));
+        $this->hasOne('Element as Parent', array('local'   => 'parent_id',
+                                                 'foreign' => 'id'));
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Email.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Email.php
new file mode 100644
index 000000000..702f6dc07
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Email.php
@@ -0,0 +1,8 @@
+<?php
+class Email extends Doctrine_Record 
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('address', 'string', 150, 'email|unique');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Entity.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Entity.php
new file mode 100644
index 000000000..1b74263f0
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Entity.php
@@ -0,0 +1,26 @@
+<?php
+class Entity extends Doctrine_Record 
+{
+    public function setUp() 
+    {
+        $this->hasOne('Email', array('local' => 'email_id', 'onDelete' => 'CASCADE'));
+        $this->hasMany('Phonenumber', array('local' => 'id', 'foreign' => 'entity_id'));
+        $this->hasOne('Account', array('foreign' => 'entity_id', 'onDelete' => 'CASCADE'));
+        $this->hasMany('Entity', array('local' => 'entity1', 
+            'refClass' => 'EntityReference',
+            'foreign' => 'entity2',
+            'equal'    => true));
+    }
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('id', 'integer',20, array('autoincrement', 'primary'));
+        $this->hasColumn('name', 'string',50);
+        $this->hasColumn('loginname', 'string',20, array('unique'));
+        $this->hasColumn('password', 'string',16);
+        $this->hasColumn('type', 'integer',1);
+        $this->hasColumn('created', 'integer',11);
+        $this->hasColumn('updated', 'integer',11);
+        $this->hasColumn('email_id', 'integer');
+        $this->setSubclasses(array("User" => array("type" => 0), "Group" => array("type" => 1)));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EntityAddress.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EntityAddress.php
new file mode 100644
index 000000000..c9e7af5a4
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EntityAddress.php
@@ -0,0 +1,9 @@
+<?php
+class EntityAddress extends Doctrine_Record 
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('user_id', 'integer', null, array('primary' => true));
+        $this->hasColumn('address_id', 'integer', null, array('primary' => true));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EntityReference.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EntityReference.php
new file mode 100644
index 000000000..093dd0554
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EntityReference.php
@@ -0,0 +1,11 @@
+<?php
+class EntityReference extends Doctrine_Record 
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('entity1', 'integer', null, 'primary');
+        $this->hasColumn('entity2', 'integer', null, 'primary');
+        //$this->setPrimaryKey(array('entity1', 'entity2'));
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EnumTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EnumTest.php
new file mode 100644
index 000000000..12b12abed
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EnumTest.php
@@ -0,0 +1,12 @@
+<?php
+class EnumTest extends Doctrine_Record 
+{
+    public function setTableDefinition() {
+        $this->hasColumn('status', 'enum', 11, array('values' => array('open', 'verified', 'closed')));
+        $this->hasColumn('text', 'string');
+    }
+    public function setUp() {
+        $this->hasMany('EnumTest2 as Enum2', array('local' => 'id', 'foreign' => 'enum_test_id'));
+        $this->hasMany('EnumTest3 as Enum3', array('local' => 'text', 'foreign' => 'text'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EnumTest2.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EnumTest2.php
new file mode 100644
index 000000000..5c7325921
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EnumTest2.php
@@ -0,0 +1,8 @@
+<?php
+class EnumTest2 extends Doctrine_Record 
+{
+    public function setTableDefinition() {
+        $this->hasColumn('status', 'enum', 11, array('values' => array('open', 'verified', 'closed')));
+        $this->hasColumn('enum_test_id', 'integer');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EnumTest3.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EnumTest3.php
new file mode 100644
index 000000000..0dc93a76e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EnumTest3.php
@@ -0,0 +1,7 @@
+<?php
+class EnumTest3 extends Doctrine_Record 
+{
+    public function setTableDefinition() {
+        $this->hasColumn('text', 'string', 10, array('primary' => true));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EventListenerChainTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EventListenerChainTest.php
new file mode 100644
index 000000000..8a235deba
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EventListenerChainTest.php
@@ -0,0 +1,21 @@
+<?php
+class EventListenerChainTest extends Doctrine_Record 
+{
+    public function setTableDefinition() {
+        $this->hasColumn('name', 'string', 100);
+    }
+    public function setUp() {
+        $chain = new Doctrine_EventListener_Chain();
+        $chain->add(new Doctrine_EventListener_TestA());
+        $chain->add(new Doctrine_EventListener_TestB());
+    }
+}
+
+class Doctrine_EventListener_TestA extends Doctrine_EventListener 
+{
+
+}
+class Doctrine_EventListener_TestB extends Doctrine_EventListener 
+{
+
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EventListenerTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EventListenerTest.php
new file mode 100644
index 000000000..f18e810f6
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/EventListenerTest.php
@@ -0,0 +1,16 @@
+<?php
+class EventListenerTest extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn("name", "string", 100);
+        $this->hasColumn("password", "string", 8);
+    }
+    public function setUp() {
+        //$this->attribute(Doctrine_Core::ATTR_LISTENER, new Doctrine_EventListener_AccessorInvoker());
+    }
+    public function getName($name) {
+        return strtoupper($name);
+    }
+    public function setPassword($password) {
+        return md5($password);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FieldNameTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FieldNameTest.php
new file mode 100644
index 000000000..e8612b707
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FieldNameTest.php
@@ -0,0 +1,12 @@
+<?php
+class FieldNameTest extends Doctrine_Record 
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('someColumn', 'string', 200, array('default' => 'some string'));
+        $this->hasColumn('someEnum', 'enum', 4, array('default' => 'php', 'values' => array('php', 'java', 'python')));
+        $this->hasColumn('someArray', 'array', 100, array('default' => array()));
+        $this->hasColumn('someObject', 'object', 200, array('default' => new stdClass));
+        $this->hasColumn('someInt', 'integer', 20, array('default' => 11));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/File_Owner.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/File_Owner.php
new file mode 100644
index 000000000..707f994a4
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/File_Owner.php
@@ -0,0 +1,9 @@
+<?php
+class File_Owner extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('name', 'string', 255);
+    }
+	public function setUp() {
+        $this->hasOne('Data_File', array('local' => 'id', 'foreign' => 'file_owner_id'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FilterTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FilterTest.php
new file mode 100644
index 000000000..c29a474cd
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FilterTest.php
@@ -0,0 +1,9 @@
+<?php
+class FilterTest extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('name', 'string',100);
+    }
+    public function setUp() {
+        $this->hasMany('FilterTest2 as filtered', array('local' => 'id', 'foreign' => 'test1_id', 'onDelete' => 'CASCADE'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FilterTest2.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FilterTest2.php
new file mode 100644
index 000000000..4ceb5e52d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FilterTest2.php
@@ -0,0 +1,7 @@
+<?php
+class FilterTest2 extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('name', 'string',100);
+        $this->hasColumn('test1_id', 'integer');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FooBarRecord.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FooBarRecord.php
new file mode 100644
index 000000000..d32ec1cd5
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FooBarRecord.php
@@ -0,0 +1,9 @@
+<?php
+class FooBarRecord extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('fooId', 'integer', null, array('primary' => true));
+        $this->hasColumn('barId', 'integer', null, array('primary' => true));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FooForeignlyOwned.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FooForeignlyOwned.php
new file mode 100644
index 000000000..6593d5d4a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FooForeignlyOwned.php
@@ -0,0 +1,9 @@
+<?php
+class FooForeignlyOwned extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 200);
+        $this->hasColumn('fooId', 'integer');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FooForeignlyOwnedWithPK.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FooForeignlyOwnedWithPK.php
new file mode 100644
index 000000000..af34912de
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FooForeignlyOwnedWithPK.php
@@ -0,0 +1,12 @@
+<?php
+class FooForeignlyOwnedWithPk extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 200);
+    }
+    public function setUp()
+    {
+        $this->hasOne('FooRecord', array('local' => 'id', 'foreign' => 'id'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FooLocallyOwned.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FooLocallyOwned.php
new file mode 100644
index 000000000..a30a229f4
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FooLocallyOwned.php
@@ -0,0 +1,9 @@
+<?php
+class FooLocallyOwned extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 200);
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FooRecord.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FooRecord.php
new file mode 100644
index 000000000..2e39dd781
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FooRecord.php
@@ -0,0 +1,43 @@
+<?php
+class FooRecord extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('foo');
+        
+        $this->hasColumn('name', 'string', 200, array('notnull' => true));
+        $this->hasColumn('parent_id', 'integer');
+        $this->hasColumn('local_foo', 'integer');
+    }
+    public function setUp()
+    {
+        $this->hasMany('FooRecord as FooFriend', array('local'    => 'foo1',
+                                                       'foreign'  => 'foo2',
+                                                       'equal'    => true,
+                                                       'refClass' => 'FooReferenceRecord',
+                                                       ));
+
+        $this->hasMany('FooRecord as FooParents', array('local'    => 'foo1',
+                                                        'foreign'  => 'foo2',
+                                                        'refClass' => 'FooReferenceRecord',
+                                                        'onDelete' => 'RESTRICT',
+                                                        ));
+
+        $this->hasMany('FooRecord as FooChildren', array('local'    => 'foo2',
+                                                         'foreign'  => 'foo1',
+                                                         'refClass' => 'FooReferenceRecord',
+                                                         ));
+
+        $this->hasMany('FooRecord as Children', array('local' => 'id', 'foreign' => 'parent_id'));
+
+        $this->hasOne('FooRecord as Parent', array('local' => 'parent_id', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+        $this->hasOne('FooForeignlyOwnedWithPk', array('local' => 'id', 'foreign' => 'id', 'constraint' => true));
+        $this->hasOne('FooLocallyOwned', array('local' => 'local_foo', 'onDelete' => 'RESTRICT'));
+        
+        $this->hasMany('BarRecord as Bar', array('local' => 'fooId',
+                                                 'foreign' => 'barId',
+                                                 'refClass' => 'FooBarRecord',
+                                                 'onUpdate' => 'RESTRICT'));
+
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FooReferenceRecord.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FooReferenceRecord.php
new file mode 100644
index 000000000..fb378065f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/FooReferenceRecord.php
@@ -0,0 +1,11 @@
+<?php
+class FooReferenceRecord extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('foo_reference');
+        
+        $this->hasColumn('foo1', 'integer', null, array('primary' => true));
+        $this->hasColumn('foo2', 'integer', null, array('primary' => true));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ForeignKeyTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ForeignKeyTest.php
new file mode 100644
index 000000000..f6ccb41ee
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ForeignKeyTest.php
@@ -0,0 +1,24 @@
+<?php
+class ForeignKeyTest extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', null);
+        $this->hasColumn('code', 'integer', 4);
+        $this->hasColumn('content', 'string', 4000);
+        $this->hasColumn('parent_id', 'integer');
+
+        $this->hasOne('ForeignKeyTest as Parent',
+                       array('local'    => 'parent_id',
+                             'foreign'  => 'id',
+                             'onDelete' => 'CASCADE',
+                             'onUpdate' => 'RESTRICT')
+                       );
+
+        $this->hasMany('ForeignKeyTest as Children', array(
+                'local' => 'id', 'foreign' => 'parent_id', 'cascade' => array('delete')));
+
+        $this->option('type', 'INNODB');
+
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ForeignKeyTest2.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ForeignKeyTest2.php
new file mode 100644
index 000000000..9a0f0b7ce
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ForeignKeyTest2.php
@@ -0,0 +1,13 @@
+<?php
+class ForeignKeyTest2 extends Doctrine_Record
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('name', 'string', null);
+        $this->hasColumn('foreignkey', 'integer');
+       
+        $this->hasOne('ForeignKeyTest', array(
+            'local' => 'foreignKey', 'foreign' => 'id'
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Forum_Board.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Forum_Board.php
new file mode 100644
index 000000000..6bb679fc9
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Forum_Board.php
@@ -0,0 +1,13 @@
+<?php
+class Forum_Board extends Doctrine_Record { 
+    public function setTableDefinition() {
+        $this->hasColumn('category_id', 'integer', 10);
+        $this->hasColumn('name', 'string', 100);
+        $this->hasColumn('description', 'string', 5000);
+    }
+    public function setUp() {
+        $this->hasOne('Forum_Category as Category', array('local' => 'category_id', 'foreign' => 'id'));
+        $this->hasMany('Forum_Thread as Threads',  array('local' => 'id', 'foreign' => 'board_id'));
+    } 
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Forum_Category.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Forum_Category.php
new file mode 100644
index 000000000..72ec9bf06
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Forum_Category.php
@@ -0,0 +1,25 @@
+<?php
+class Forum_Category extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('root_category_id', 'integer', 10);
+        $this->hasColumn('parent_category_id', 'integer', 10);
+        $this->hasColumn('name', 'string', 50);
+        $this->hasColumn('description', 'string', 99999);
+    }
+    public function setUp() {
+        $this->hasMany('Forum_Category as Subcategory', array(
+            'local' => 'id',
+            'foreign' => 'parent_category_id'
+        ));
+        
+        $this->hasOne('Forum_Category as Parent', array(
+            'local' => 'parent_category_id',
+            'foreign' => 'id'
+        ));
+
+        $this->hasOne('Forum_Category as Rootcategory', array(
+            'local' => 'root_category_id',
+            'foreign' => 'id'
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Forum_Entry.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Forum_Entry.php
new file mode 100644
index 000000000..91817dec0
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Forum_Entry.php
@@ -0,0 +1,16 @@
+<?php
+class Forum_Entry extends Doctrine_Record { 
+    public function setTableDefinition() {
+        $this->hasColumn('author', 'string', 50); 
+        $this->hasColumn('topic', 'string', 100);
+        $this->hasColumn('message', 'string', 99999);
+        $this->hasColumn('parent_entry_id', 'integer', 10);
+        $this->hasColumn('thread_id', 'integer', 10);
+        $this->hasColumn('date', 'integer', 10);
+    }
+    public function setUp() {
+        $this->hasOne('Forum_Entry as Parent',  array('local' => 'id', 'foreign' => 'parent_entry_id'));
+        $this->hasOne('Forum_Thread as Thread', array('local' => 'thread_id', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Forum_Thread.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Forum_Thread.php
new file mode 100644
index 000000000..afac222c7
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Forum_Thread.php
@@ -0,0 +1,13 @@
+<?php
+class Forum_Thread extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('board_id', 'integer', 10);
+        $this->hasColumn('updated', 'integer', 10);
+        $this->hasColumn('closed', 'integer', 1);
+    }
+    public function setUp() {
+        $this->hasOne('Forum_Board as Board', array('local' => 'board_id', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+        $this->hasMany('Forum_Entry as Entries', array('local' => 'id', 'foreign' => 'thread_id'));
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Group.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Group.php
new file mode 100644
index 000000000..07e9dee08
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Group.php
@@ -0,0 +1,21 @@
+<?php
+
+require_once('Entity.php');
+
+// grouptable doesn't extend Doctrine_Table -> Doctrine_Connection
+// won't initialize grouptable when Doctrine_Connection->getTable('Group') is called
+class GroupTable { }
+
+class Group extends Entity
+{
+    public function setUp()
+    {
+        parent::setUp();
+        $this->hasMany('User', array(
+            'local' => 'group_id',
+            'foreign' => 'user_id',
+            'refClass' => 'Groupuser',
+        ));
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/GroupUser.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/GroupUser.php
new file mode 100644
index 000000000..e7acea16c
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/GroupUser.php
@@ -0,0 +1,16 @@
+<?php
+class Groupuser extends Doctrine_Record
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('added', 'integer');
+        $this->hasColumn('group_id', 'integer');
+        $this->hasColumn('user_id', 'integer');
+    }
+    
+    public function setUp()
+    {
+        $this->hasOne('Group', array('local' => 'group_id', 'foreign' => 'id'));
+        $this->hasOne('User', array('local' => 'user_id', 'foreign' => 'id'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/GzipTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/GzipTest.php
new file mode 100644
index 000000000..64dc9996d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/GzipTest.php
@@ -0,0 +1,6 @@
+<?php
+class GzipTest extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('gzip', 'gzip', 100000);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/I18nRelationTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/I18nRelationTest.php
new file mode 100644
index 000000000..95f271f24
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/I18nRelationTest.php
@@ -0,0 +1,28 @@
+<?php
+class I18nRelationTest extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('title', 'string', 200);
+        $this->hasColumn('author_id', 'integer', 4);
+    }
+    public function setUp()
+    {
+        $this->hasOne('I18nAuthorTest', array('local' => 'author_id',
+                                    'foreign' => 'id'));
+        $this->actAs('I18n', array('fields' => array('author_id', 'title')));
+    }
+}
+
+class I18nAuthorTest extends Doctrine_Record 
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', 4, array('primary' => true, 'autoincrement' => true));
+    }
+    public function setUp()
+    {
+        $this->hasMany('I18nRelationTest', array('local' => 'id',
+                                    'foreign' => 'author_id'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/I18nTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/I18nTest.php
new file mode 100644
index 000000000..cb8e579c2
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/I18nTest.php
@@ -0,0 +1,13 @@
+<?php
+class I18nTest extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 200);
+        $this->hasColumn('title', 'string', 200);
+    }
+    public function setUp()
+    {
+        $this->actAs('I18n', array('fields' => array('name', 'title')));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/InheritanceDeal.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/InheritanceDeal.php
new file mode 100644
index 000000000..c1f40e3b6
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/InheritanceDeal.php
@@ -0,0 +1,16 @@
+<?php
+class InheritanceDeal extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('inheritance_deal');
+        
+        $this->hasColumn('id', 'integer', 4, array (  'primary' => true,  'autoincrement' => true,));
+        $this->hasColumn('name', 'string', 255, array ());
+    }
+  
+    public function setUp()
+    {
+        $this->hasMany('InheritanceUser as Users', array('refClass' => 'InheritanceDealUser', 'local' => 'entity_id', 'foreign' => 'user_id'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/InheritanceDealUser.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/InheritanceDealUser.php
new file mode 100644
index 000000000..ba60b8633
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/InheritanceDealUser.php
@@ -0,0 +1,40 @@
+<?php
+class InheritanceEntityUser extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('inheritance_entity_user');
+
+        $this->hasColumn('type', 'integer', 4, array (  'primary' => true,));
+        $this->hasColumn('user_id', 'integer', 4, array (  'primary' => true,));
+        $this->hasColumn('entity_id', 'integer', 4, array (  'primary' => true,));
+    }
+
+    public function setUp()
+    {  
+    }
+}
+
+class InheritanceDealUser extends InheritanceEntityUser
+{
+    public function setTableDefinition()
+    {
+        parent::setTableDefinition();
+
+        $this->setTableName('inheritance_entity_user');
+
+        $this->hasColumn('user_id', 'integer', 4, array (  'primary' => true,));
+        $this->hasColumn('entity_id', 'integer', 4, array (  'primary' => true,));
+    }
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->hasOne('InheritanceUser as User', array('local' => 'user_id', 'foreign' => 'id'));
+        $this->hasOne('InheritanceDeal as Deal', array('local' => 'entity_id', 'foreign' => 'id'));
+        $this->setInheritanceMap(array (
+        'type' => 1,
+        ));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/InheritanceUser.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/InheritanceUser.php
new file mode 100644
index 000000000..fa9dacfe8
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/InheritanceUser.php
@@ -0,0 +1,16 @@
+<?php
+class InheritanceUser extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('inheritance_user');
+
+        $this->hasColumn('id', 'integer', 4, array (  'primary' => true,  'autoincrement' => true,));
+        $this->hasColumn('username', 'string', 128, array (  'notnull' => true,));
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('InheritanceDeal as Deals', array('refClass' => 'InheritanceDealUser', 'local' => 'user_id', 'foreign' => 'entity_id'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/JC1.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/JC1.php
new file mode 100644
index 000000000..6c5183426
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/JC1.php
@@ -0,0 +1,8 @@
+<?php
+class JC1 extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('c1_id', 'integer');
+        $this->hasColumn('c2_id', 'integer');
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/JC2.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/JC2.php
new file mode 100644
index 000000000..7f6c27cc4
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/JC2.php
@@ -0,0 +1,8 @@
+<?php
+class JC2 extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('c1_id', 'integer');
+        $this->hasColumn('c2_id', 'integer');
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/JC3.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/JC3.php
new file mode 100644
index 000000000..a3d68cc5d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/JC3.php
@@ -0,0 +1,8 @@
+<?php
+class JC3 extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('c1_id', 'integer');
+        $this->hasColumn('c2_id', 'integer');
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/LiabilityCodeN.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/LiabilityCodeN.php
new file mode 100644
index 000000000..fc729554e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/LiabilityCodeN.php
@@ -0,0 +1,11 @@
+<?php
+class LiabilityCodeN extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('liability_codes');
+    $this->hasColumn('id', 'integer', 4, array('notnull' => true, 'primary' => true, 'autoincrement' => true));
+    $this->hasColumn('code', 'integer', 4, array (  'notnull' => true,  'notblank' => true,));
+    $this->hasColumn('description', 'string', 4000, array (  'notnull' => true,  'notblank' => true,));
+  }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Location.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Location.php
new file mode 100644
index 000000000..4cd8611d8
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Location.php
@@ -0,0 +1,14 @@
+<?php
+class Location extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('lat', 'double', 10, array ());
+        $this->hasColumn('lon', 'double', 10, array ());
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('LocationI18n as LocationI18n', array('local' => 'id', 'foreign' => 'id'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/LocationI18n.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/LocationI18n.php
new file mode 100644
index 000000000..5703b984f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/LocationI18n.php
@@ -0,0 +1,15 @@
+<?php
+class LocationI18n extends Doctrine_Record
+{ 
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 50, array());
+        $this->hasColumn('id', 'integer', 10, array('primary' => true));
+        $this->hasColumn('culture', 'string', 2);
+    }
+    
+    public function setUp()
+    {
+        $this->hasOne('Location as Location', array('local' => 'id'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Log_Entry.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Log_Entry.php
new file mode 100644
index 000000000..670af073e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Log_Entry.php
@@ -0,0 +1,13 @@
+<?php
+class Log_Entry extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('stamp', 'timestamp');
+        $this->hasColumn('status_id', 'integer');
+    }
+    
+    public function setUp() {
+        $this->hasOne('Log_Status', array(
+            'local' => 'status_id', 'foreign' => 'id'
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Log_Status.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Log_Status.php
new file mode 100644
index 000000000..e8540e858
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Log_Status.php
@@ -0,0 +1,6 @@
+<?php
+class Log_Status extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('name', 'string', 255);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/M2MTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/M2MTest.php
new file mode 100644
index 000000000..63e1f20f8
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/M2MTest.php
@@ -0,0 +1,16 @@
+<?php
+class M2MTest extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('name', 'string', 200);
+        $this->hasColumn('child_id', 'integer');
+    }
+    public function setUp() {
+
+        $this->hasMany('RTC1 as RTC1', array('local' => 'c1_id', 'foreign' => 'c1_id', 'refClass' => 'JC1'));
+        $this->hasMany('RTC2 as RTC2', array('local' => 'c1_id', 'foreign' => 'c1_id', 'refClass' => 'JC1'));
+        $this->hasMany('RTC3 as RTC3', array('local' => 'c1_id', 'foreign' => 'c1_id', 'refClass' => 'JC2'));
+        $this->hasMany('RTC3 as RTC4', array('local' => 'c1_id', 'foreign' => 'c1_id', 'refClass' => 'JC1'));
+
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/M2MTest2.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/M2MTest2.php
new file mode 100644
index 000000000..80d0bef30
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/M2MTest2.php
@@ -0,0 +1,11 @@
+<?php
+class M2MTest2 extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('oid', 'integer', 11, array('autoincrement' => true, 'primary' => true));
+        $this->hasColumn('name', 'string', 20);
+    }
+    public function setUp() {
+        $this->hasMany('RTC4 as RTC5', array('local' => 'c1_id', 'foreign' => 'c1_id', 'refClass' => 'JC3'));
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MigrationTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MigrationTest.php
new file mode 100644
index 000000000..f042df011
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MigrationTest.php
@@ -0,0 +1,8 @@
+<?php
+class MigrationTest extends Doctrine_Record
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('field1', 'string');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyGroup.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyGroup.php
new file mode 100644
index 000000000..dfc6b76ff
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyGroup.php
@@ -0,0 +1,17 @@
+<?php
+class MyGroup extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('my_group');
+
+        $this->hasColumn('id', 'integer', 4, array (  'primary' => true,  'autoincrement' => true,));
+        $this->hasColumn('name', 'string', 255, array (  'notnull' => true,));
+        $this->hasColumn('description', 'string', 4000, array ());
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('MyUser as users', array('refClass' => 'MyUserGroup', 'local' => 'group_id', 'foreign' => 'user_id'));
+    } 
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyOneThing.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyOneThing.php
new file mode 100644
index 000000000..f16866520
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyOneThing.php
@@ -0,0 +1,17 @@
+<?php
+class MyOneThing extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('name', 'string');
+        $this->hasColumn('user_id', 'integer');
+    }
+
+    public function setUp() {
+		$this->hasMany('MyUserOneThing', array(
+            'local' => 'id', 'foreign' => 'one_thing_id'
+        ));
+        
+        $this->hasOne('MyUser', array(
+            'local' => 'user_id', 'foreign' => 'id'
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyOtherThing.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyOtherThing.php
new file mode 100644
index 000000000..5b48c7c3a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyOtherThing.php
@@ -0,0 +1,16 @@
+<?php
+class MyOtherThing extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('name', 'string');
+        $this->hasColumn('user_id', 'integer');
+    }
+    public function setUp() {
+		$this->hasMany('MyUserOtherThing', array(
+            'local' => 'id', 'foreign' => 'other_thing_id'
+        ));
+        
+        $this->hasOne('MyUser', array(
+            'local' => 'user_id', 'foreign' => 'id'
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyUser.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyUser.php
new file mode 100644
index 000000000..6ad34275d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyUser.php
@@ -0,0 +1,19 @@
+<?php
+class MyUser extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string');
+    }
+    
+    public function setUp()
+    {
+		  $this->hasMany('MyOneThing', array(
+            'local' => 'id', 'foreign' => 'user_id'
+          ));
+
+		  $this->hasMany('MyOtherThing', array(
+            'local' => 'id', 'foreign' => 'user_id'
+          ));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyUser2.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyUser2.php
new file mode 100644
index 000000000..8e98a59eb
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyUser2.php
@@ -0,0 +1,23 @@
+<?php
+class MyUser2 extends Doctrine_Record
+{  
+    public function setTableDefinition()
+    {
+        $this->setTableName('my_user');
+
+        $this->hasColumn('id', 'integer', 4, array (  'primary' => true,  'autoincrement' => true,));
+        $this->hasColumn('username', 'string', 128, array (  'notnull' => true,));
+        $this->hasColumn('algorithm', 'string', 128, array (  'default' => 'sha1',  'notnull' => true,));
+        $this->hasColumn('salt', 'string', 128, array (  'notnull' => true,));
+        $this->hasColumn('password', 'string', 128, array (  'notnull' => true,));
+        $this->hasColumn('created_at', 'timestamp', null, array ());
+        $this->hasColumn('last_login', 'timestamp', null, array ());
+        $this->hasColumn('is_active', 'boolean', null, array (  'default' => 1,  'notnull' => true,));
+        $this->hasColumn('is_super_admin', 'boolean', null, array (  'default' => 0,  'notnull' => true,));
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('MyGroup as groups', array('refClass' => 'MyUserGroup', 'local' => 'user_id', 'foreign' => 'group_id'));
+    }  
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyUserGroup.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyUserGroup.php
new file mode 100644
index 000000000..6e33ac875
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyUserGroup.php
@@ -0,0 +1,18 @@
+<?php
+class MyUserGroup extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('my_user_group');
+    
+        $this->hasColumn('id', 'integer', 4, array (  'primary' => true,  'autoincrement' => true,));
+        $this->hasColumn('group_id', 'integer', 4, array ());
+        $this->hasColumn('user_id', 'integer', 4, array ());
+    }
+  
+    public function setUp()
+    {
+        $this->hasOne('MyGroup as MyGroup', array('local' => 'group_id', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+        $this->hasOne('MyUser as MyUser', array('local' => 'user_id', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyUserOneThing.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyUserOneThing.php
new file mode 100644
index 000000000..a6d81a2c6
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyUserOneThing.php
@@ -0,0 +1,19 @@
+<?php
+class MyUserOneThing extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('user_id', 'integer');
+        $this->hasColumn('one_thing_id', 'integer');
+    }
+    
+    
+    public function setUp()
+    {
+        $this->hasOne('MyUser', array(
+            'local' => 'user_id', 'foreign' => 'id'
+        ));
+        
+        $this->hasOne('MyOneThing', array(
+            'local' => 'one_thing_id', 'foreign' => 'id'
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyUserOtherThing.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyUserOtherThing.php
new file mode 100644
index 000000000..788a4b393
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MyUserOtherThing.php
@@ -0,0 +1,19 @@
+<?php
+class MyUserOtherThing extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('user_id', 'integer');
+        $this->hasColumn('other_thing_id', 'integer');
+    }
+    
+    
+    public function setUp()
+    {
+        $this->hasOne('MyUser', array(
+            'local' => 'user_id', 'foreign' => 'id'
+        ));
+        
+        $this->hasOne('MyOtherThing', array(
+            'local' => 'other_thing_id', 'foreign' => 'id'
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MysqlGroup.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MysqlGroup.php
new file mode 100644
index 000000000..d1f0cc5b5
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MysqlGroup.php
@@ -0,0 +1,17 @@
+<?php
+class MysqlGroup extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', null);
+    }
+    
+    public function setUp()
+    {
+        $this->hasMany('MysqlUser', array(
+            'local' => 'group_id', 
+            'foreign' => 'user_id',
+            'refClass' => 'MysqlGroupMember'
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MysqlGroupMember.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MysqlGroupMember.php
new file mode 100644
index 000000000..351994293
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MysqlGroupMember.php
@@ -0,0 +1,10 @@
+<?php
+class MysqlGroupMember extends Doctrine_Record
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('group_id', 'integer', null, array('primary' => true));
+        $this->hasColumn('user_id', 'integer', null, array('primary' => true));
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MysqlIndexTestRecord.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MysqlIndexTestRecord.php
new file mode 100644
index 000000000..ae917d7dd
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MysqlIndexTestRecord.php
@@ -0,0 +1,17 @@
+<?php
+class MysqlIndexTestRecord extends Doctrine_Record
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('name', 'string', null);
+        $this->hasColumn('code', 'integer', 4);
+        $this->hasColumn('content', 'string', 4000);
+
+        $this->index('content',  array('fields' => array('content'), 'type' => 'fulltext'));
+        $this->index('namecode', array('fields' => array('name', 'code'),
+                                       'type'   => 'unique'));
+
+        $this->option('type', 'MYISAM');
+
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MysqlTestRecord.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MysqlTestRecord.php
new file mode 100644
index 000000000..44bd8f582
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MysqlTestRecord.php
@@ -0,0 +1,11 @@
+<?php
+class MysqlTestRecord extends Doctrine_Record 
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('name', 'string', null, 'primary');
+        $this->hasColumn('code', 'integer', null, 'primary');
+
+        $this->option('type', 'INNODB');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MysqlUser.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MysqlUser.php
new file mode 100644
index 000000000..938201c48
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/MysqlUser.php
@@ -0,0 +1,17 @@
+<?php
+class MysqlUser extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', null);
+    }
+    
+    public function setUp()
+    {
+        $this->hasMany('MysqlGroup', array(
+            'local' => 'user_id',
+            'foreign' => 'group_id',
+            'refClass' => 'MysqlGroupMember'
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/NestReference.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/NestReference.php
new file mode 100644
index 000000000..0f2d05888
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/NestReference.php
@@ -0,0 +1,9 @@
+<?php
+class NestReference extends Doctrine_Record 
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('parent_id', 'integer', 4, 'primary');
+        $this->hasColumn('child_id', 'integer', 4, 'primary');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/NestTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/NestTest.php
new file mode 100644
index 000000000..f1bdea67a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/NestTest.php
@@ -0,0 +1,22 @@
+<?php
+class NestTest extends Doctrine_Record
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('name', 'string');
+    }
+    public function setUp()
+    {
+        $this->hasMany('NestTest as Parents', array('local' => 'child_id',
+                                                    'refClass' => 'NestReference',
+                                                    'foreign' => 'parent_id'));
+        $this->hasMany('NestTest as Children', array('local' => 'parent_id',
+                                                     'refClass' => 'NestReference',
+                                                     'foreign' => 'child_id'));
+                                                     
+        $this->hasMany('NestTest as Relatives', array('local' => 'child_id',
+                                                      'refClass' => 'NestReference',
+                                                      'foreign' => 'parent_id',
+                                                      'equal'   => true));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/NestedSetTest_SingleRootNode.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/NestedSetTest_SingleRootNode.php
new file mode 100644
index 000000000..1aea10b8f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/NestedSetTest_SingleRootNode.php
@@ -0,0 +1,9 @@
+<?php
+class NestedSetTest_SingleRootNode extends Doctrine_Record {
+    
+    public function setTableDefinition() {
+        $this->actAs('NestedSet');
+        $this->hasColumn('name', 'string', 50, array('notnull'));
+    }
+    
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/NestedSet_MultiRootNode.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/NestedSet_MultiRootNode.php
new file mode 100644
index 000000000..ca907b6b7
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/NestedSet_MultiRootNode.php
@@ -0,0 +1,10 @@
+<?php
+class NestedSet_MultiRootNode extends Doctrine_Record {
+    
+    public function setTableDefinition() {
+        $this->actAs('NestedSet', array('hasManyRoots' => true, 'rootColumnName' => 'root_id'));
+        $this->hasColumn('name', 'string', 50, array('notnull'));
+        $this->hasColumn('root_id', 'integer', 4);
+    }
+    
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/NestedSet_Timestampable_MultiRootNode.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/NestedSet_Timestampable_MultiRootNode.php
new file mode 100644
index 000000000..995d94c71
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/NestedSet_Timestampable_MultiRootNode.php
@@ -0,0 +1,10 @@
+<?php
+class NestedSet_Timestampable_MultiRootNode extends Doctrine_Record {
+    
+    public function setTableDefinition() {
+        $this->actAs('NestedSet', array('hasManyRoots' => true, 'rootColumnName' => 'root_id'));
+        $this->actAs('Timestampable');
+        $this->hasColumn('name', 'string', 50, array('notnull'));
+        $this->hasColumn('root_id', 'integer', 4);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/NotNullTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/NotNullTest.php
new file mode 100644
index 000000000..786d213a2
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/NotNullTest.php
@@ -0,0 +1,7 @@
+<?php
+class NotNullTest extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('name', 'string', 100, 'notnull');
+        $this->hasColumn('type', 'integer', 11);                                     	
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ORM_AccessControl.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ORM_AccessControl.php
new file mode 100644
index 000000000..4ae702d58
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ORM_AccessControl.php
@@ -0,0 +1,14 @@
+<?php
+class ORM_AccessControl extends Doctrine_Record 
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+    public function setUp() 
+    {
+        $this->hasMany('ORM_AccessGroup as accessGroups', array(
+            'local' => 'accessControlID', 'foreign' => 'accessGroupID', 'refClass' => 'ORM_AccessControlsGroups'
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ORM_AccessControlsGroups.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ORM_AccessControlsGroups.php
new file mode 100644
index 000000000..218b219c3
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ORM_AccessControlsGroups.php
@@ -0,0 +1,9 @@
+<?php
+class ORM_AccessControlsGroups extends Doctrine_Record 
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('accessControlID', 'integer', 11, array('primary' => true)); 
+        $this->hasColumn('accessGroupID', 'integer', 11, array('primary' => true));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ORM_AccessGroup.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ORM_AccessGroup.php
new file mode 100644
index 000000000..ed264e19b
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ORM_AccessGroup.php
@@ -0,0 +1,14 @@
+<?php
+class ORM_AccessGroup extends Doctrine_Record 
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('name', 'string', 255);
+    }
+    public function setUp() 
+    {
+        $this->hasMany('ORM_AccessControl as accessControls', array(
+            'local' => 'accessGroupID', 'foreign' => 'accessControlID', 'refClass' => 'ORM_AccessControlsGroups'
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ORM_TestEntry.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ORM_TestEntry.php
new file mode 100644
index 000000000..b6516e754
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ORM_TestEntry.php
@@ -0,0 +1,17 @@
+<?php
+class ORM_TestEntry extends Doctrine_Record {
+   public function setTableDefinition() {
+        $this->setTableName('test_entries');
+        $this->hasColumn('id', 'integer', 11, 'autoincrement|primary');
+        $this->hasColumn('name', 'string', 255); 
+        $this->hasColumn('stamp', 'timestamp');
+        $this->hasColumn('amount', 'float'); 
+        $this->hasColumn('itemID', 'integer'); 
+   } 
+    
+   public function setUp() {  
+        $this->hasOne('ORM_TestItem', array(
+            'local' => 'itemID', 'foreign' => 'id'
+        ));
+   }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ORM_TestItem.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ORM_TestItem.php
new file mode 100644
index 000000000..c81182ba0
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ORM_TestItem.php
@@ -0,0 +1,15 @@
+<?php
+class ORM_TestItem extends Doctrine_Record {
+   public function setTableDefinition() {
+        $this->setTableName('test_items');
+        $this->hasColumn('id', 'integer', 11, 'autoincrement|primary');
+        $this->hasColumn('name', 'string', 255); 
+   } 
+
+   public function setUp() {
+
+        $this->hasOne('ORM_TestEntry', array(
+            'local' => 'id', 'foreign' => 'itemID'
+        ));
+   } 
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Package.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Package.php
new file mode 100644
index 000000000..56375017f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Package.php
@@ -0,0 +1,11 @@
+<?php
+class Package extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('description', 'string', 255);
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('PackageVersion as Version', array('local' => 'id', 'foreign' => 'package_id', 'onDelete' => 'CASCADE'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PackageVersion.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PackageVersion.php
new file mode 100644
index 000000000..c3684a4c2
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PackageVersion.php
@@ -0,0 +1,14 @@
+<?php
+class PackageVersion extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('package_id', 'integer');
+        $this->hasColumn('description', 'string', 255);
+    }
+    public function setUp()
+    {
+        $this->hasOne('Package', array('local' => 'package_id', 'foreign' => 'id'));
+        $this->hasMany('PackageVersionNotes as Note', array(
+            'local' => 'id', 'foreign' => 'package_version_id'
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PackageVersionNotes.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PackageVersionNotes.php
new file mode 100644
index 000000000..b9325c999
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PackageVersionNotes.php
@@ -0,0 +1,15 @@
+<?php
+class PackageVersionNotes extends Doctrine_Record 
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('package_version_id', 'integer');
+        $this->hasColumn('description', 'string', 255);
+    }
+    public function setUp()
+    {
+        $this->hasOne('PackageVersion', array(
+            'local' => 'package_version_id', 'foreign' => 'id'
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Page.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Page.php
new file mode 100644
index 000000000..02f00fc42
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Page.php
@@ -0,0 +1,17 @@
+<?php
+class Page extends Doctrine_Record
+{
+
+    public function setUp()
+    {
+    	$this->hasMany('Bookmark as Bookmarks',
+                        array('local' => 'id',
+                              'foreign' => 'page_id'));
+    }
+
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', 30);
+        $this->hasColumn('url', 'string', 100);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Phonenumber.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Phonenumber.php
new file mode 100644
index 000000000..23b178dc4
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Phonenumber.php
@@ -0,0 +1,23 @@
+<?php
+class Phonenumber extends Doctrine_Record 
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('phonenumber', 'string',20);
+        $this->hasColumn('entity_id', 'integer');
+    }
+    public function setUp() 
+    {
+        $this->hasOne('Entity', array('local' => 'entity_id', 
+                                      'foreign' => 'id', 
+                                      'onDelete' => 'CASCADE'));
+        
+        $this->hasOne('Group', array('local' => 'entity_id', 
+                                      'foreign' => 'id', 
+                                      'onDelete' => 'CASCADE'));
+          
+        $this->hasOne('User', array('local' => 'entity_id', 
+                                    'foreign' => 'id', 
+                                    'onDelete' => 'CASCADE'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Photo.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Photo.php
new file mode 100644
index 000000000..af2c5023f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Photo.php
@@ -0,0 +1,13 @@
+<?php
+class Photo extends Doctrine_Record {
+    public function setUp() {
+        $this->hasMany('Tag', array(
+            'local' => 'photo_id',
+            'foreign' => 'tag_id',
+            'refClass' => 'Phototag'
+        ));
+    }
+    public function setTableDefinition() {
+        $this->hasColumn('name', 'string', 100);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Phototag.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Phototag.php
new file mode 100644
index 000000000..cfae09360
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Phototag.php
@@ -0,0 +1,7 @@
+<?php
+class Phototag extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('photo_id', 'integer', 11, array('primary' => true));
+        $this->hasColumn('tag_id', 'integer', 11, array('primary' => true));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PluginSymfonyRecord.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PluginSymfonyRecord.php
new file mode 100644
index 000000000..5cd72f599
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PluginSymfonyRecord.php
@@ -0,0 +1,15 @@
+<?php
+require_once('BaseSymfonyRecord.php');
+
+abstract class PluginSymfonyRecord extends BaseSymfonyRecord
+{
+    public function setUp()
+    {
+        parent::setUp();
+    }
+
+    public function setTableDefinition()
+    {
+        parent::setTableDefinition();
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PluginSymfonyRecordTable.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PluginSymfonyRecordTable.php
new file mode 100644
index 000000000..b24d10ddc
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PluginSymfonyRecordTable.php
@@ -0,0 +1,5 @@
+<?php
+class PluginSymfonyRecordTable extends Doctrine_Table
+{
+
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Policy.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Policy.php
new file mode 100644
index 000000000..37385d8b0
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Policy.php
@@ -0,0 +1,15 @@
+<?php
+class Policy extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('policy_number', 'integer', 11, array('unique' => true));
+    }
+  
+    public function setUp()
+    {
+        $this->hasMany('PolicyAsset as PolicyAssets', array('local' => 'policy_number',
+                                                            'foreign' => 'policy_number'));
+        $this->index('policy_number_index', array('fields' => array('policy_number')));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PolicyAsset.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PolicyAsset.php
new file mode 100644
index 000000000..f68da7a02
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PolicyAsset.php
@@ -0,0 +1,16 @@
+<?php
+class PolicyAsset extends Doctrine_Record 
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('policy_number', 'integer', 11);
+        $this->hasColumn('value', 'float', 10, array ('notblank' => true,));
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Policy', array('foreign' => 'policy_number', 
+                                      'local' => 'policy_number'));
+        $this->index('policy_number_index', array('fields' => array('policy_number')));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PolicyCodeN.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PolicyCodeN.php
new file mode 100644
index 000000000..f1fbcc22e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PolicyCodeN.php
@@ -0,0 +1,11 @@
+<?php
+class PolicyCodeN extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('policy_codes');
+    $this->hasColumn('id', 'integer', 4, array('notnull' => true, 'primary' => true, 'autoincrement' => true));
+    $this->hasColumn('code', 'integer', 4, array (  'notnull' => true,  'notblank' => true,));
+    $this->hasColumn('description', 'string', 4000, array (  'notnull' => true,  'notblank' => true,));
+  }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PolicyN.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PolicyN.php
new file mode 100644
index 000000000..a14bdb38a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/PolicyN.php
@@ -0,0 +1,16 @@
+<?php
+class PolicyN extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('policies');
+    $this->hasColumn('id', 'integer', 4, array('notnull' => true, 'primary' => true, 'autoincrement' => true));
+    $this->hasColumn('rate_id', 'integer', 4, array ( ));
+    $this->hasColumn('policy_number', 'integer', 4, array (  'unique' => true, ));
+  }
+  
+  public function setUp()
+  {
+    $this->hasOne('RateN', array('local' => 'rate_id', 'foreign' => 'id' ));
+  }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_Board.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_Board.php
new file mode 100644
index 000000000..339da86d4
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_Board.php
@@ -0,0 +1,32 @@
+<?php
+class QueryTest_Board extends Doctrine_Record
+{
+    /**
+     * Initializes the table definition.
+     */
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', 4, array('primary', 'autoincrement', 'notnull'));
+        $this->hasColumn('categoryId as categoryId', 'integer', 4,
+                array('notnull'));
+        $this->hasColumn('name as name', 'string', 100,
+                array('notnull', 'unique'));
+        $this->hasColumn('lastEntryId as lastEntryId', 'integer', 4,
+                array('default' => 0));
+        $this->hasColumn('position as position', 'integer', 4,
+                array('default' => 0, 'notnull'));
+    }
+
+    /**
+     * Initializes the relations.
+     */
+    public function setUp()
+    {
+        $this->hasOne('QueryTest_Category as category', array(
+            'local' => 'categoryId', 'foreign' => 'id'
+        ));
+        $this->hasOne('QueryTest_Entry as lastEntry', array(
+            'local' => 'lastEntryId', 'foreign' => 'id', 'onDelete' => 'CASCADE'
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_Category.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_Category.php
new file mode 100644
index 000000000..d271224f0
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_Category.php
@@ -0,0 +1,43 @@
+<?php
+class QueryTest_Category extends Doctrine_Record
+{    
+    /**
+     * The depth of the category inside the tree.
+     * Non-persistent field. 
+     * 
+     * @var integer
+     */
+    public $depth;
+
+    /**
+     * Table definition.
+     */
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', 4, array('primary', 'autoincrement', 'notnull'));
+        $this->hasColumn('rootCategoryId as rootCategoryId', 'integer', 4,
+                array('notnull', 'default' => 0));
+        $this->hasColumn('parentCategoryId as parentCategoryId', 'integer', 4,
+                array('notnull', 'default' => 0));
+        $this->hasColumn('name as name', 'string', 50,
+                array('notnull', 'unique'));
+        $this->hasColumn('position as position', 'integer', 4,
+                array('default' => 0, 'notnull'));
+    }
+
+    /**
+     * Relations definition.
+     */
+    public function setUp()
+    {
+        $this->hasMany('QueryTest_Category as subCategories', array(
+            'local' => 'id', 'foreign' => 'parentCategoryId'
+        ));
+        $this->hasOne('QueryTest_Category as rootCategory', array(
+            'local' => 'rootCategoryId', 'foreign' => 'id'
+        ));
+        $this->hasMany('QueryTest_Board as boards', array(
+            'local' => 'id', 'foreign' => 'categoryId', 'onDelete' => 'CASCADE'
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_Entry.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_Entry.php
new file mode 100644
index 000000000..ef61cad93
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_Entry.php
@@ -0,0 +1,25 @@
+<?php
+class QueryTest_Entry extends Doctrine_Record
+{
+    /**
+     * Table structure.
+     */
+    public function setTableDefinition()
+    {        
+        $this->hasColumn('id', 'integer', 4, array('primary', 'autoincrement', 'notnull'));
+        $this->hasColumn('authorId', 'integer', 4,
+                array('notnull'));
+        $this->hasColumn('date', 'integer', 4,
+                array('notnull'));
+    }
+
+    /**
+     * Runtime definition of the relationships to other entities.
+     */
+    public function setUp()
+    {
+        $this->hasOne('QueryTest_User as author', array(
+            'local' => 'authorId', 'foreign' => 'id'
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_Item.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_Item.php
new file mode 100644
index 000000000..797f4c04f
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_Item.php
@@ -0,0 +1,10 @@
+<?php
+class QueryTest_Item extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('price', 'decimal');
+        $this->hasColumn('quantity', 'integer');
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_Rank.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_Rank.php
new file mode 100644
index 000000000..dd74b9844
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_Rank.php
@@ -0,0 +1,23 @@
+<?php
+class QueryTest_Rank extends Doctrine_Record 
+{
+    /**
+     * Initializes the table definition.
+     */
+    public function setTableDefinition()
+    {        
+        $this->hasColumn('title as title', 'string', 100,
+                array('notnull'));
+        $this->hasColumn('color as color', 'string', 20,
+                array('notnull', 'regexp' => '/^[a-zA-Z\-]{3,}|#[0-9a-fA-F]{6}$/D'));
+        $this->hasColumn('icon as icon', 'string', 50,
+                array('notnull', 'default' => ' ', 'regexp' => '/^[a-zA-Z0-9_\-]+\.(jpg|gif|png)$/D'));        
+    }
+
+    public function setUp()
+    {
+        $this->hasMany('QueryTest_User as users', array(
+            'local' => 'rankId', 'foreign' => 'userId', 'refClass' => 'QueryTest_UserRank'
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_Subscription.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_Subscription.php
new file mode 100644
index 000000000..8f4b2058a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_Subscription.php
@@ -0,0 +1,9 @@
+<?php
+class QueryTest_Subscription extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {   $this->hasColumn('id', 'integer', 4, array('primary', 'autoincrement', 'notnull'));     
+        $this->hasColumn('begin', 'date');
+        $this->hasColumn('end', 'date');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_User.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_User.php
new file mode 100644
index 000000000..7ae19eca6
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_User.php
@@ -0,0 +1,30 @@
+<?php
+class QueryTest_User extends Doctrine_Record 
+{   
+
+    public function setTableDefinition()
+    {        
+        $this->hasColumn('username as username', 'string', 50,
+                array('notnull'));
+        $this->hasColumn('visibleRankId', 'integer', 4);
+        $this->hasColumn('subscriptionId', 'integer', 4);
+    }
+
+    /**
+     * Runtime definition of the relationships to other entities.
+     */
+    public function setUp()
+    {
+        $this->hasOne('QueryTest_Rank as visibleRank', array(
+            'local' => 'visibleRankId', 'foreign' => 'id'
+        ));
+        
+        $this->hasOne('QueryTest_Subscription', array(
+            'local' => 'subscriptionId', 'foreign' => 'id'
+        ));
+
+        $this->hasMany('QueryTest_Rank as ranks', array(
+            'local' => 'userId', 'foreign' => 'rankId', 'refClass' => 'QueryTest_UserRank'
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_UserRank.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_UserRank.php
new file mode 100644
index 000000000..3711aff57
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/QueryTest_UserRank.php
@@ -0,0 +1,9 @@
+<?php
+class QueryTest_UserRank extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {        
+        $this->hasColumn('rankId', 'integer', 4, array('primary' => true));
+        $this->hasColumn('userId', 'integer', 4, array('primary' => true));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RTC1.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RTC1.php
new file mode 100644
index 000000000..2c43dd7d4
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RTC1.php
@@ -0,0 +1,10 @@
+<?php
+class RTC1 extends Doctrine_Record {
+    public function setTableDefinition() { 
+        $this->hasColumn('name', 'string', 200);
+    }
+    public function setUp() {
+        $this->hasMany('M2MTest as RTC1', array('local' => 'c1_id', 'foreign' => 'c2_id', 'refClass' => 'JC1'));
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RTC2.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RTC2.php
new file mode 100644
index 000000000..c36ca5c67
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RTC2.php
@@ -0,0 +1,10 @@
+<?php
+class RTC2 extends Doctrine_Record {
+    public function setTableDefinition() { 
+        $this->hasColumn('name', 'string', 200);
+    }
+    public function setUp() {
+        $this->hasMany('M2MTest as RTC2', array('local' => 'c1_id', 'foreign' => 'c2_id', 'refClass' => 'JC1'));
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RTC3.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RTC3.php
new file mode 100644
index 000000000..ca674122d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RTC3.php
@@ -0,0 +1,11 @@
+<?php
+class RTC3 extends Doctrine_Record {
+    public function setTableDefinition() { 
+        $this->hasColumn('name', 'string', 200);
+    }
+    public function setUp() {
+        $this->hasMany('M2MTest as RTC3', array('local' => 'c1_id', 'foreign' => 'c2_id', 'refClass' => 'JC2'));
+        $this->hasMany('M2MTest as RTC4', array('local' => 'c1_id', 'foreign' => 'c2_id', 'refClass' => 'JC1'));
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RTC4.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RTC4.php
new file mode 100644
index 000000000..51df7ae7c
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RTC4.php
@@ -0,0 +1,10 @@
+<?php
+class RTC4 extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('oid', 'integer', 11, array('autoincrement', 'primary'));  
+        $this->hasColumn('name', 'string', 20);
+    }
+    public function setUp() {
+        $this->hasMany('M2MTest2', array('local' => 'c1_id', 'foreign' => 'c2_id', 'refClass' => 'JC3'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RateN.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RateN.php
new file mode 100644
index 000000000..abe7b0956
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RateN.php
@@ -0,0 +1,20 @@
+<?php
+class RateN extends Doctrine_Record
+{
+  public function setTableDefinition()
+  {
+    $this->setTableName('rates');
+    $this->hasColumn('id', 'integer', 4, array('notnull' => true, 'primary' => true, 'autoincrement' => true));
+    $this->hasColumn('policy_code', 'integer', 4, array (  'notnull' => true,  'notblank' => true,));
+    $this->hasColumn('coverage_code', 'integer', 4, array (  'notnull' => true,  'notblank' => true,));
+    $this->hasColumn('liability_code', 'integer', 4, array (  'notnull' => true,  'notblank' => true,));
+    $this->hasColumn('total_rate', 'float', null, array (  'notnull' => true,  'notblank' => true,));
+  }
+  
+  public function setUp()
+  {
+    $this->hasOne('PolicyCodeN', array('local' => 'policy_code', 'foreign' => 'code' ));
+    $this->hasOne('CoverageCodeN', array('local' => 'coverage_code', 'foreign' => 'code' ));
+    $this->hasOne('LiabilityCodeN', array('local' => 'liability_code', 'foreign' => 'code' ));
+  }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Rec1.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Rec1.php
new file mode 100644
index 000000000..29c653b75
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Rec1.php
@@ -0,0 +1,15 @@
+<?php
+class Rec1 extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('first_name', 'string', 128, array ());
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Rec2 as Account', array('local' => 'id', 'foreign' => 'user_id', 'onDelete' => 'CASCADE'));
+    }
+}
+
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Rec2.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Rec2.php
new file mode 100644
index 000000000..317a18ed0
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Rec2.php
@@ -0,0 +1,15 @@
+<?php
+class Rec2  extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('user_id', 'integer', 10, array (  'unique' => true,));
+        $this->hasColumn('address', 'string', 150, array ());
+    }
+
+    public function setUp()
+    {
+        $this->hasOne('Rec1 as User', array('local' => 'id', 'foreign' => 'user_id', 'onDelete' => 'CASCADE'));
+    }
+
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RecordFilterTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RecordFilterTest.php
new file mode 100644
index 000000000..521448d34
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RecordFilterTest.php
@@ -0,0 +1,16 @@
+<?php
+class RecordFilterTest extends Doctrine_Record 
+{
+	public function setTableDefinition()
+    {
+
+        $this->hasColumn("name", "string", 200);
+        $this->hasColumn("password", "string", 32);
+    }
+    public function setPassword($password) {
+        return md5($password);
+    }
+    public function getName($name) {
+        return strtoupper($name);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RecordHookTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RecordHookTest.php
new file mode 100644
index 000000000..b725cb1a4
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RecordHookTest.php
@@ -0,0 +1,46 @@
+<?php
+class RecordHookTest extends Doctrine_Record
+{
+    protected $_messages = array();
+
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', null, array('primary' => true));
+    }
+    public function preSave($event)
+    {
+        $this->_messages[] = __FUNCTION__;
+    }
+    public function postSave($event)
+    {
+        $this->_messages[] = __FUNCTION__;
+    }
+    public function preInsert($event)
+    {
+        $this->_messages[] = __FUNCTION__;
+    }
+    public function postInsert($event)
+    {
+        $this->_messages[] = __FUNCTION__;
+    }
+    public function preUpdate($event)
+    {
+        $this->_messages[] = __FUNCTION__;
+    }
+    public function postUpdate($event)
+    {
+        $this->_messages[] = __FUNCTION__;
+    }
+    public function preDelete($event)
+    {
+        $this->_messages[] = __FUNCTION__;
+    }
+    public function postDelete($event)
+    {
+        $this->_messages[] = __FUNCTION__;
+    }
+    public function pop()
+    {
+        return array_pop($this->_messages);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Record_City.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Record_City.php
new file mode 100644
index 000000000..41ec82d5c
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Record_City.php
@@ -0,0 +1,18 @@
+<?php
+class Record_City extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('name', 'string', 200);
+        $this->hasColumn('country_id', 'integer');
+        $this->hasColumn('district_id', 'integer');
+    }
+    
+    public function setUp() {
+        $this->hasOne('Record_Country as Country', array(
+            'local' => 'country_id', 'foreign' => 'id'
+        ));
+
+        $this->hasOne('Record_District as District', array(
+            'local' => 'district_id', 'foreign' => 'id'
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Record_Country.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Record_Country.php
new file mode 100644
index 000000000..256468c82
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Record_Country.php
@@ -0,0 +1,14 @@
+<?php
+class Record_Country extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('name', 'string', 200);
+    }
+    public function setUp() {
+        $this->hasMany('Record_City as City', array(
+            'local' => 'id',
+            'foreign' => 'country_id'
+        ));
+    }
+}
+
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Record_District.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Record_District.php
new file mode 100644
index 000000000..a56ccf8b3
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Record_District.php
@@ -0,0 +1,6 @@
+<?php
+class Record_District extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('name', 'string', 200);
+    } 
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RelationTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RelationTest.php
new file mode 100644
index 000000000..2932d7ca0
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/RelationTest.php
@@ -0,0 +1,25 @@
+<?php
+class RelationTest extends Doctrine_Record 
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('name', 'string', 200);
+        $this->hasColumn('parent_id', 'integer');
+    }
+}
+
+class RelationTestChild extends RelationTest 
+{
+    public function setUp() 
+    {
+        $this->hasOne('RelationTest as Parent', array(
+            'local' => 'parent_id',
+            'foreign' => 'id',
+            'onDelete' => 'CASCADE',
+        ));
+        $this->hasMany('RelationTestChild as Children', array(
+            'local' => 'id',
+            'foreign' => 'parent_id',
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Resource.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Resource.php
new file mode 100644
index 000000000..fca10fa73
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Resource.php
@@ -0,0 +1,14 @@
+<?php
+class Resource extends Doctrine_Record {
+   public function setUp() {
+      $this->hasMany('Task as TaskAlias', array('local'     =>  'resource_id',
+                                                'foreign'   =>  'task_id',
+                                                'refClass'  =>  'Assignment'));
+      $this->hasMany('ResourceType as Type', array('local'    => 'resource_id',
+                                                   'foreign'  => 'type_id',
+                                                   'refClass' => 'ResourceReference'));
+   }
+   public function setTableDefinition() {
+      $this->hasColumn('name', 'string',100);
+   }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ResourceReference.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ResourceReference.php
new file mode 100644
index 000000000..aec7795b2
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ResourceReference.php
@@ -0,0 +1,8 @@
+<?php
+class ResourceReference extends Doctrine_Record {
+    public function setTableDefinition() {
+       $this->hasColumn('type_id', 'integer');
+       $this->hasColumn('resource_id', 'integer');
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ResourceType.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ResourceType.php
new file mode 100644
index 000000000..5b24e3b8c
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ResourceType.php
@@ -0,0 +1,12 @@
+<?php
+class ResourceType extends Doctrine_Record {
+    public function setUp() {
+        $this->hasMany('Resource as ResourceAlias', array('local'    => 'type_id',
+                                                          'foreign'  => 'resource_id',
+                                                          'refClass' => 'ResourceReference'));
+    }
+    public function setTableDefinition() {
+        $this->hasColumn('type', 'string',100);
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Role.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Role.php
new file mode 100644
index 000000000..44e46e9a6
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Role.php
@@ -0,0 +1,13 @@
+<?php
+class Role extends Doctrine_Record 
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('name', 'string', 20, array('unique' => true));
+    }
+    public function setUp() 
+    {
+        $this->hasMany('Auth', array('local' => 'id', 'foreign' => 'roleid'));
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SearchTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SearchTest.php
new file mode 100644
index 000000000..132c5765e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SearchTest.php
@@ -0,0 +1,16 @@
+<?php
+class SearchTest extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('title', 'string', 100);
+        $this->hasColumn('content', 'string');
+    }
+    public function setUp()
+    {
+    	$options = array('generateFiles' => false,
+                         'fields' => array('title', 'content'));
+
+        $this->actAs('Searchable', $options);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SelfRefTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SelfRefTest.php
new file mode 100644
index 000000000..fdf9dd3e1
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SelfRefTest.php
@@ -0,0 +1,14 @@
+<?php
+class SelfRefTest extends Doctrine_Record
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('name', 'string', 50);
+        $this->hasColumn('created_by', 'integer');
+    }
+    public function setUp()
+    {
+        $this->hasOne('SelfRefTest as createdBy', array('local' => 'created_by'));
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SequenceRecord.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SequenceRecord.php
new file mode 100644
index 000000000..673f133bb
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SequenceRecord.php
@@ -0,0 +1,8 @@
+<?php
+class SequenceRecord extends Doctrine_Record {
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', null, array('primary', 'sequence'));
+        $this->hasColumn('name', 'string');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SerializeTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SerializeTest.php
new file mode 100644
index 000000000..cc16ec4c1
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SerializeTest.php
@@ -0,0 +1,31 @@
+<?php
+class SerializeTest extends Doctrine_Record 
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('serialize_test');
+    
+        $this->hasColumn('booltest', 'boolean');
+        $this->hasColumn('integertest', 'integer', 4, array('unsigned' => true));
+        $this->hasColumn('floattest', 'float');
+        $this->hasColumn('stringtest', 'string', 200, array('fixed' => true));
+        $this->hasColumn('arraytest', 'array', 10000);
+        $this->hasColumn('objecttest', 'object');
+        $this->hasColumn('blobtest', 'blob');
+        $this->hasColumn('clobtest', 'clob');
+        $this->hasColumn('timestamptest', 'timestamp');
+        $this->hasColumn('timetest', 'time');
+        $this->hasColumn('datetest', 'date');
+        $this->hasColumn('enumtest', 'enum', 4, 
+                         array(
+                            'values' => array(
+                                        'php',
+                                        'java',
+                                        'python'
+                                        )
+                               )
+        );
+        $this->hasColumn('gziptest', 'gzip');
+    }
+
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SoftDeleteBCTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SoftDeleteBCTest.php
new file mode 100644
index 000000000..68137e8de
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SoftDeleteBCTest.php
@@ -0,0 +1,16 @@
+<?php
+class SoftDeleteBCTest extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('soft_delete_bc_test');
+    
+        $this->hasColumn('name', 'string', null, array('primary' => true));
+        $this->hasColumn('something', 'string', '25', array('notnull' => true, 'unique' => true));
+    }
+
+    public function setUp()
+    {
+        $this->actAs('SoftDelete', array('name' => 'deleted', 'type' => 'boolean'));
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SoftDeleteTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SoftDeleteTest.php
new file mode 100644
index 000000000..21e432fd0
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SoftDeleteTest.php
@@ -0,0 +1,14 @@
+<?php
+class SoftDeleteTest extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string', null, array('primary' => true));
+        $this->hasColumn('something', 'string', '25', array('notnull' => true, 'unique' => true));
+    }
+
+    public function setUp()
+    {
+        $this->actAs('SoftDelete');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Song.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Song.php
new file mode 100644
index 000000000..b9df96689
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Song.php
@@ -0,0 +1,16 @@
+<?php
+class Song extends Doctrine_Record
+{
+    public function setUp()
+    {
+        $this->hasOne('Album', array('local' => 'album_id',
+                                     'foreign' => 'id',
+                                     'onDelete' => 'CASCADE'));
+    }
+    public function setTableDefinition()
+    {
+        $this->hasColumn('album_id', 'integer');
+        $this->hasColumn('genre', 'string',20);
+        $this->hasColumn('title', 'string',30);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SymfonyRecord.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SymfonyRecord.php
new file mode 100644
index 000000000..782f023d3
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SymfonyRecord.php
@@ -0,0 +1,16 @@
+<?php
+require_once('PluginSymfonyRecord.php');
+
+class SymfonyRecord extends PluginSymfonyRecord
+{
+
+    public function setUp()
+    {
+        parent::setUp();
+    }
+
+    public function setTableDefinition()
+    {
+        parent::setTableDefinition();
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SymfonyRecordTable.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SymfonyRecordTable.php
new file mode 100644
index 000000000..9fb6b7b6d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/SymfonyRecordTable.php
@@ -0,0 +1,7 @@
+<?php
+require_once('PluginSymfonyRecordTable.php');
+
+class SymfonyRecordTable extends PluginSymfonyRecordTable
+{
+
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Tag.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Tag.php
new file mode 100644
index 000000000..5b04e5ed3
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Tag.php
@@ -0,0 +1,13 @@
+<?php
+class Tag extends Doctrine_Record {
+    public function setUp() {
+        $this->hasMany('Photo', array(
+            'local' => 'tag_id',
+            'foreign' => 'photo_id',
+            'refClass' => 'Phototag'
+        ));
+    }
+    public function setTableDefinition() {
+        $this->hasColumn('tag', 'string', 100);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Task.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Task.php
new file mode 100644
index 000000000..3874d4775
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/Task.php
@@ -0,0 +1,13 @@
+<?php
+class Task extends Doctrine_Record {
+   public function setUp() {
+      $this->hasMany('Resource as ResourceAlias', array('local'     =>  'task_id',
+                                                        'foreign'   =>  'resource_id',
+                                                        'refClass'  =>  'Assignment'));
+      $this->hasMany('Task as Subtask', array('local' => 'id', 'foreign' => 'parent_id'));
+   } 
+   public function setTableDefinition() {
+      $this->hasColumn('name', 'string',100); 
+      $this->hasColumn('parent_id', 'integer'); 
+   }
+} 
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TestError.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TestError.php
new file mode 100644
index 000000000..2cf523d53
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TestError.php
@@ -0,0 +1,13 @@
+<?php
+class TestError extends Doctrine_Record {
+    public function setUp() {
+        $this->hasMany('Description', array('local'   => 'file_md5',
+                                            'foreign' => 'file_md5'));
+    }
+    public function setTableDefinition() {
+        $this->hasColumn('message', 'string',200);
+        $this->hasColumn('code', 'integer',11);
+        $this->hasColumn('file_md5', 'string',32, 'primary');
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TestMovie.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TestMovie.php
new file mode 100644
index 000000000..482c6c542
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TestMovie.php
@@ -0,0 +1,27 @@
+<?php
+class TestMovie extends Doctrine_Record
+{
+
+    public function setUp() 
+    {
+    	$this->hasOne('TestUser as User', 
+                        array('local' => 'user_id', 
+                              'foreign' => 'id'));
+
+        $this->hasMany('TestUser as MovieBookmarks', 
+                        array('local' => 'movie_id',
+                              'foreign' => 'user_id',
+                              'refClass' => 'TestMovieUserBookmark'));
+
+        $this->hasMany('TestUser as MovieVotes', 
+                        array('local' => 'movie_id',
+                              'foreign' => 'user_id',
+                              'refClass' => 'TestMovieUserVote'));
+    }
+
+    public function setTableDefinition() 
+    {
+    	$this->hasColumn('user_id', 'integer', null);
+        $this->hasColumn('name', 'string', 30);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TestMovieUserBookmark.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TestMovieUserBookmark.php
new file mode 100644
index 000000000..3d84a036b
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TestMovieUserBookmark.php
@@ -0,0 +1,10 @@
+<?php
+class TestMovieUserBookmark extends Doctrine_Record 
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('user_id', 'integer', null, array('primary' => true));
+        $this->hasColumn('movie_id', 'integer', null, array('primary' => true));
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TestMovieUserVote.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TestMovieUserVote.php
new file mode 100644
index 000000000..244f1f54a
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TestMovieUserVote.php
@@ -0,0 +1,9 @@
+<?php
+class TestMovieUserVote extends Doctrine_Record  
+{    
+    public function setTableDefinition() {
+        $this->hasColumn('vote', 'string', 30);
+        $this->hasColumn('user_id', 'integer', null, array('primary' => true));
+        $this->hasColumn('movie_id', 'integer', null, array('primary' => true));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TestRecord.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TestRecord.php
new file mode 100644
index 000000000..9e1e445e5
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TestRecord.php
@@ -0,0 +1,8 @@
+<?php
+class TestRecord extends Doctrine_Record 
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('test');
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TestUser.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TestUser.php
new file mode 100644
index 000000000..f2e2e6cc6
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TestUser.php
@@ -0,0 +1,21 @@
+<?php
+class TestUser extends Doctrine_Record 
+{
+    public function setUp() 
+    {
+        $this->hasMany('TestMovie as UserBookmarks', 
+                        array('local' => 'user_id',
+                              'foreign' => 'movie_id',
+                              'refClass' => 'TestMovieUserBookmark'));
+
+        $this->hasMany('TestMovie as UserVotes', 
+                        array('local' => 'user_id',
+                              'foreign' => 'movie_id',
+                              'refClass' => 'TestMovieUserVote'));
+
+    }
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('name', 'string', 30);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TreeLeaf.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TreeLeaf.php
new file mode 100644
index 000000000..0c7c0f5a5
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/TreeLeaf.php
@@ -0,0 +1,20 @@
+<?php
+class TreeLeaf extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+    	$this->hasColumn('name', 'string');
+        $this->hasColumn('parent_id', 'integer');
+    }
+
+    public function setUp() 
+    {
+        $this->hasOne('TreeLeaf as Parent', array(
+            'local' => 'parent_id', 'foreign' => 'id'
+        ));
+        
+        $this->hasMany('TreeLeaf as Children', array(
+            'local' => 'id', 'foreign' => 'parent_id'
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/UnderscoreColumn.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/UnderscoreColumn.php
new file mode 100644
index 000000000..93c647452
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/UnderscoreColumn.php
@@ -0,0 +1,9 @@
+<?php
+class UnderscoreColumn extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('_test_');
+        $this->hasColumn('_underscore_', 'string', 255);
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/User.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/User.php
new file mode 100644
index 000000000..9cd73295b
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/User.php
@@ -0,0 +1,54 @@
+<?php
+
+require_once('Entity.php');
+
+// UserTable doesn't extend Doctrine_Table -> Doctrine_Connection
+// won't initialize grouptable when Doctrine_Connection->getTable('User') is called
+class UserTable extends Doctrine_Table { }
+
+class User extends Entity
+{
+    public function setUp() 
+    {
+        parent::setUp();
+        $this->hasMany('Address', array(
+            'local' => 'user_id', 
+            'foreign' => 'address_id',
+            'refClass' => 'EntityAddress',
+        ));
+        $this->hasMany('Address as Addresses', array(
+            'local' => 'user_id', 
+            'foreign' => 'address_id',
+            'refClass' => 'EntityAddress',
+        ));
+        $this->hasMany('Album', array('local' => 'id', 'foreign' => 'user_id'));
+        $this->hasMany('Book', array('local' => 'id', 'foreign' => 'user_id'));
+        $this->hasMany('Group', array(
+            'local' => 'user_id', 
+            'foreign' => 'group_id',
+            'refClass' => 'Groupuser',
+        ));
+    }
+
+    /** Custom validation */
+    public function validate() 
+    {
+        // Allow only one name!
+        if ($this->name !== 'The Saint') {
+            $this->errorStack()->add('name', 'notTheSaint');
+        }
+    }
+    public function validateOnInsert() 
+    {
+        if ($this->password !== 'Top Secret') {
+            $this->errorStack()->add('password', 'pwNotTopSecret');
+        }
+    }
+    public function validateOnUpdate() 
+    {
+        if ($this->loginname !== 'Nobody') {
+            $this->errorStack()->add('loginname', 'notNobody');
+        }
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest.php
new file mode 100644
index 000000000..052d6bc51
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest.php
@@ -0,0 +1,15 @@
+<?php
+class ValidatorTest extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('mymixed', 'string', 100);
+        $this->hasColumn('mystring', 'string', 100, array('notnull', 'unique'));
+        $this->hasColumn('myarray', 'array', 1000);
+        $this->hasColumn('myobject', 'object', 1000);
+        $this->hasColumn('myinteger', 'integer', 11);
+        $this->hasColumn('myrange', 'integer', 11, array('range' => array(4,123)));
+        $this->hasColumn('myregexp', 'string', 5, array('regexp' => '/^[0-9]+$/'));
+
+        $this->hasColumn('myemail', 'string', 100, array('email'));
+        $this->hasColumn('myemail2', 'string', 100, array('email', 'notblank'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest_AddressModel.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest_AddressModel.php
new file mode 100644
index 000000000..bbaab3147
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest_AddressModel.php
@@ -0,0 +1,18 @@
+<?php
+class ValidatorTest_AddressModel extends Doctrine_Record {
+	public function setTableDefinition() {
+
+		$this->hasColumn("id", "integer", 11, array('autoincrement' => true,
+													'primary'       => true
+													));
+		$this->hasColumn('address1', 'string', 255, array('notnull' => true, 'notblank'));
+		$this->hasColumn('address2', 'string', 255, array('notnull' => true));
+		$this->hasColumn('city', 'string', 255, array('notnull' => true, 'notblank'));
+		$this->hasColumn('state', 'string', 10, array('notnull' => true, 'notblank', 'usstate'));
+		$this->hasColumn('zip', 'string', 15, array('notnull' => true, 'notblank', 'regexp' => '/^[0-9-]*$/'));
+	}
+
+	public function setUp() {
+		$this->hasMany('ValidatorTest_ClientModel', array('local' => 'address_id', 'foreign' => 'client_id', 'refClass' => 'ValidatorTest_ClientToAddressModel'));
+	}
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest_ClientModel.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest_ClientModel.php
new file mode 100644
index 000000000..e0e12d716
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest_ClientModel.php
@@ -0,0 +1,15 @@
+<?php
+class ValidatorTest_ClientModel extends Doctrine_Record {
+	public function setTableDefinition() {
+
+		$this->hasColumn('id', 'integer', 4, array('notnull' => true,
+	                                           'primary' => true,
+	                                           'autoincrement' => true,
+	                                           'unsigned' => true));
+		$this->hasColumn('short_name', 'string', 32, array('notnull' => true, 'notblank', 'unique' => true));
+	}
+
+	public function setUp() {
+		$this->hasMany("ValidatorTest_AddressModel", array('local' => 'client_id', 'foreign' => 'address_id', 'refClass' => 'ValidatorTest_ClientToAddressModel'));
+	}
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest_ClientToAddressModel.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest_ClientToAddressModel.php
new file mode 100644
index 000000000..249260f12
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest_ClientToAddressModel.php
@@ -0,0 +1,19 @@
+<?php
+class ValidatorTest_ClientToAddressModel extends Doctrine_Record
+{
+	public function setTableDefinition()
+	{
+		$this->hasColumn("client_id", "integer", 11, array('primary' => true));
+		$this->hasColumn("address_id", "integer", 11, array('primary' => true));
+	}
+
+	public function construct()
+	{
+
+	}
+
+	public function setUp()
+	{
+
+	}
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest_DateModel.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest_DateModel.php
new file mode 100644
index 000000000..0aaf1d5eb
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest_DateModel.php
@@ -0,0 +1,7 @@
+<?php
+class ValidatorTest_DateModel extends Doctrine_Record {
+    public function setTableDefinition() {
+        $this->hasColumn('birthday', 'date', null, array('past'));
+        $this->hasColumn('death', 'date', null, array('future'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest_FootballPlayer.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest_FootballPlayer.php
new file mode 100644
index 000000000..e5a1693d7
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest_FootballPlayer.php
@@ -0,0 +1,8 @@
+<?php
+class ValidatorTest_FootballPlayer extends Doctrine_Record {
+   public function setTableDefinition() {
+      $this->hasColumn('person_id', 'string', 255);     
+      $this->hasColumn('team_name', 'string', 255);
+      $this->hasColumn('goals_count', 'integer', 4);
+   }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest_Person.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest_Person.php
new file mode 100644
index 000000000..4e109bcb0
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ValidatorTest_Person.php
@@ -0,0 +1,13 @@
+<?php
+class ValidatorTest_Person extends Doctrine_Record {
+   public function setTableDefinition() {
+      $this->hasColumn('identifier', 'integer', 4, array('notblank', 'unique'));
+      $this->hasColumn('is_football_player', 'boolean');
+   }
+   
+   public function setUp() {
+      $this->hasOne('ValidatorTest_FootballPlayer', array(
+          'local' => 'id', 'foreign' => 'person_id', 'onDelete' => 'CASCADE'
+      ));
+   }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/VersioningTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/VersioningTest.php
new file mode 100644
index 000000000..8219d1bcf
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/VersioningTest.php
@@ -0,0 +1,42 @@
+<?php
+class VersioningTest extends Doctrine_Record 
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string');
+        $this->hasColumn('version', 'integer');
+    }
+    public function setUp()
+    {
+        $this->actAs('Versionable');
+    }
+}
+
+class VersioningTest2 extends Doctrine_Record 
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string');
+        $this->hasColumn('version', 'integer');
+    }
+    public function setUp()
+    {
+        $this->actAs('Versionable', array('auditLog' => false));
+    }
+}
+
+class VersioningTest3 extends Doctrine_Record 
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('name', 'string');
+        $this->hasColumn('version', 'integer');
+    }
+    public function setUp()
+    {
+    	  
+        $this->actAs('Versionable', array('tableName' =>  'tbl_prefix_comments_version',
+                                          'className' =>  'VersioningTestClass'));
+
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ZeroValueTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ZeroValueTest.php
new file mode 100644
index 000000000..5976148e7
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/ZeroValueTest.php
@@ -0,0 +1,19 @@
+<?php
+class ZeroValueTest extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('id', 'integer', 4, array('primary' => true,  'autoincrement' => true,));
+        $this->hasColumn('username', 'string', 128, array('notnull' => true,));
+        $this->hasColumn('algorithm', 'string', 128, array('default' => 'sha1', 'notnull' => true,));
+        $this->hasColumn('salt', 'string', 128, array('notnull' => true,));
+        $this->hasColumn('password', 'string', 128, array('notnull' => true,));
+        $this->hasColumn('created_at', 'timestamp', null, array());
+        $this->hasColumn('last_login', 'timestamp', null, array());
+        $this->hasColumn('is_active', 'boolean', null, array('default' => true, 'notnull' => true,));
+        $this->hasColumn('is_super_admin', 'boolean', null, array('default' => false, 'notnull' => true,));
+    }
+
+    public function setUp() 
+    { }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/export/Cms_Category.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/export/Cms_Category.php
new file mode 100644
index 000000000..71db71650
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/export/Cms_Category.php
@@ -0,0 +1,21 @@
+<?php
+class Cms_Category extends Doctrine_Record 
+{
+ 
+	public function setUp() 
+    {
+		$this->hasMany('Cms_CategoryLanguages as langs', array('local' => 'id', 'foreign' => 'category_id'));
+	}
+ 
+	public function setTableDefinition() 
+    {
+		$this->hasColumn('created', 'timestamp');
+		$this->hasColumn('parent', 'integer', 11);
+		$this->hasColumn('position', 'integer', 3);
+		$this->hasColumn('active', 'integer', 11);
+		$this->option('collate', 'utf8_unicode_ci');
+		$this->option('charset', 'utf8');
+		$this->option('type', 'INNODB');
+		$this->index('index_parent', array('fields' => array('parent')));
+	}
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/export/Cms_CategoryLanguages.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/export/Cms_CategoryLanguages.php
new file mode 100644
index 000000000..80a5a805e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/export/Cms_CategoryLanguages.php
@@ -0,0 +1,21 @@
+<?php
+class Cms_CategoryLanguages extends Doctrine_Record
+{
+	public function setUp() 
+    {
+		$this->setAttribute(Doctrine_Core::ATTR_COLL_KEY, 'language_id');
+		$this->hasOne('Cms_Category as category', array('local' => 'category_id', 'foreign' => 'id', 'onDelete' => 'CASCADE'));
+	}
+ 
+	public function setTableDefinition() 
+	{
+		$this->hasColumn('name', 'string',256);
+		$this->hasColumn('category_id', 'integer',11);
+		$this->hasColumn('language_id', 'integer',11);
+		$this->option('collate', 'utf8_unicode_ci');
+		$this->option('charset', 'utf8');
+		$this->option('type', 'INNODB');
+		$this->index('index_category', array('fields' => array('category_id')));
+		$this->index('index_language', array('fields' => array('language_id')));
+	}
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/gnatEmail.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/gnatEmail.php
new file mode 100644
index 000000000..209ef6fd3
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/gnatEmail.php
@@ -0,0 +1,10 @@
+<?php
+class gnatEmail extends Doctrine_Record 
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('address', 'string', 150);
+    }
+    
+    
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/gnatUser.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/gnatUser.php
new file mode 100644
index 000000000..e6a66915b
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/gnatUser.php
@@ -0,0 +1,19 @@
+<?php 
+class gnatUserTable { }
+
+class gnatUser extends Doctrine_Record 
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('name', 'string', 150);
+        $this->hasColumn('foreign_id', 'integer', 10, array ('unique' => true,));
+    }
+    
+    public function setUp()
+    {
+        parent::setUp();
+        $this->hasOne('gnatEmail as Email', array('local'=> 'foreign_id', 'foreign'=>'id', 'onDelete'=>'CASCADE'));
+    }
+    
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/mmrGroupUser_B.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/mmrGroupUser_B.php
new file mode 100644
index 000000000..8d246383b
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/mmrGroupUser_B.php
@@ -0,0 +1,9 @@
+<?php
+class mmrGroupUser_B extends Doctrine_Record 
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('user_id', 'string', 30, array('primary' => true));
+        $this->hasColumn('group_id', 'string', 30, array('primary' => true));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/mmrGroupUser_C.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/mmrGroupUser_C.php
new file mode 100644
index 000000000..656e44df1
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/mmrGroupUser_C.php
@@ -0,0 +1,10 @@
+<?php
+
+class mmrGroupUser_C extends Doctrine_Record 
+{
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('user_id', 'string', 30, array('primary' => true));
+        $this->hasColumn('group_id', 'string', 30, array('primary' => true));
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/mmrGroup_B.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/mmrGroup_B.php
new file mode 100644
index 000000000..f45eb8aa7
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/mmrGroup_B.php
@@ -0,0 +1,14 @@
+<?php
+class mmrGroup_B extends Doctrine_Record
+{
+    public function setUp() {
+        $this->hasMany('mmrUser_B', array('local' => 'group_id',
+                                     'foreign' => 'user_id',
+                                     'refClass' => 'mmrGroupUser_B'));
+    }
+    public function setTableDefinition() {
+        // Works when
+        $this->hasColumn('id', 'string', 30, array (  'primary' => true));
+        $this->hasColumn('name', 'string', 30);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/mmrGroup_C.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/mmrGroup_C.php
new file mode 100644
index 000000000..6b8f865ff
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/mmrGroup_C.php
@@ -0,0 +1,15 @@
+<?php
+class mmrGroup_C extends Doctrine_Record
+{
+    public function setUp()
+    {
+        $this->hasMany('mmrUser_C', array('local' => 'group_id',
+                                          'foreign' => 'user_id',
+                                          'refClass' => 'mmrGroupUser_C'));
+    }
+    public function setTableDefinition() 
+    {
+        $this->hasColumn('g_id as id', 'string', 30, array('primary' => true));
+        $this->hasColumn('name', 'string', 30);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/mmrUser_B.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/mmrUser_B.php
new file mode 100644
index 000000000..dcdca013e
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/mmrUser_B.php
@@ -0,0 +1,18 @@
+<?php
+class mmrUser_B extends Doctrine_Record 
+{
+    public function setUp() 
+    {
+        $this->hasMany('mmrGroup_B as Group', array('local' => 'user_id', 
+                                      'foreign' => 'group_id',
+                                      'refClass' => 'mmrGroupUser_B'));
+
+    }
+
+    public function setTableDefinition() 
+    {
+      // Works when 
+        $this->hasColumn('id', 'string', 30, array (  'primary' => true));
+        $this->hasColumn('name', 'string', 30);
+    }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/mmrUser_C.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/mmrUser_C.php
new file mode 100644
index 000000000..ed2671634
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/models/mmrUser_C.php
@@ -0,0 +1,19 @@
+<?php
+class mmrUser_C extends Doctrine_Record 
+{
+    public function setUp() 
+    {
+        $this->hasMany('mmrGroup_C as Group', array('local' => 'user_id', 
+                                                    'foreign' => 'group_id',
+                                                    'refClass' => 'mmrGroupUser_C'));
+
+    }
+
+    public function setTableDefinition()
+    {
+        // Works when
+        $this->hasColumn('u_id as id', 'string', 30, array('primary' => true));
+        $this->hasColumn('name', 'string', 30);
+    }
+}
+
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/mysql_migration_classes/001_mysql_add_table.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/mysql_migration_classes/001_mysql_add_table.php
new file mode 100644
index 000000000..b0a3b8d5d
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/mysql_migration_classes/001_mysql_add_table.php
@@ -0,0 +1,14 @@
+<?php
+class MysqlAddTable extends Doctrine_Migration_Base
+{
+    public function up()
+    {
+        $this->createTable('migration_test', array('field1' => array('type' => 'string')));
+        $this->addColumn('migration_test', 'field2', 'integer');
+    }
+    
+    public function down()
+    {
+        $this->dropTable('migration_test');
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/mysql_migration_classes/002_mysql_change_column.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/mysql_migration_classes/002_mysql_change_column.php
new file mode 100644
index 000000000..abada1416
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/mysql_migration_classes/002_mysql_change_column.php
@@ -0,0 +1,13 @@
+<?php
+class MysqlChangeColumn extends Doctrine_Migration_Base
+{
+    public function up()
+    {
+        $this->renameColumn('migration_test','field2','field3');
+    }
+    
+    public function down()
+    {
+    	$this->renameColumn('migration_test','field3','field2');
+    }  
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/run.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/run.php
new file mode 100644
index 000000000..d6360a114
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/run.php
@@ -0,0 +1,320 @@
+<?php
+
+$_SERVER['DOCTRINE_DIR'] = realpath(dirname(__FILE__).'/../');
+
+require 'bootstrap.php';
+
+$test = new DoctrineTest();
+
+// Ticket Tests
+$tickets = new GroupTest('Tickets Tests', 'tickets');
+
+$excludeTickets = array(
+    '1830', // MySQL specific error
+    '1876b',
+    '1935',
+    '2015',
+    '2292',
+    'DC521' // PostgreSQL specific error
+);
+
+$ticketTestCases = glob(dirname(__FILE__) . '/Ticket/*TestCase.php');
+
+foreach ($ticketTestCases as $testCase)
+{
+    $fileInfo = pathinfo($testCase);
+    $name = str_replace('TestCase', '', $fileInfo['filename']);
+
+    if ( ! in_array($name, $excludeTickets)) {
+        $name = sprintf('Doctrine_Ticket_%s_TestCase', $name);
+        $tickets->addTestCase(new $name());
+    }
+}
+$test->addTestCase($tickets);
+
+// Connection Tests (not yet fully tested)
+$driver = new GroupTest('Driver Tests', 'driver');
+$driver->addTestCase(new Doctrine_Connection_Pgsql_TestCase());
+$driver->addTestCase(new Doctrine_Connection_Oracle_TestCase());
+$driver->addTestCase(new Doctrine_Connection_Sqlite_TestCase());
+$driver->addTestCase(new Doctrine_Connection_Mssql_TestCase());
+$driver->addTestCase(new Doctrine_Connection_Mysql_TestCase());
+$driver->addTestCase(new Doctrine_Connection_Custom_TestCase());
+$test->addTestCase($driver);
+
+// Transaction Tests (FULLY TESTED)
+$transaction = new GroupTest('Transaction Tests', 'transaction');
+$transaction->addTestCase(new Doctrine_Transaction_TestCase());
+$transaction->addTestCase(new Doctrine_Transaction_Mysql_TestCase());
+$transaction->addTestCase(new Doctrine_Transaction_Mssql_TestCase());
+$transaction->addTestCase(new Doctrine_Transaction_Pgsql_TestCase());
+$transaction->addTestCase(new Doctrine_Transaction_Oracle_TestCase());
+$transaction->addTestCase(new Doctrine_Transaction_Sqlite_TestCase());
+$test->addTestCase($transaction);
+
+// DataDict Tests (FULLY TESTED)
+$data_dict = new GroupTest('DataDict Tests', 'data_dict');
+$data_dict->addTestCase(new Doctrine_DataDict_TestCase());
+$data_dict->addTestCase(new Doctrine_DataDict_Mysql_TestCase());
+$data_dict->addTestCase(new Doctrine_DataDict_Mssql_TestCase());
+$data_dict->addTestCase(new Doctrine_DataDict_Pgsql_TestCase());
+$data_dict->addTestCase(new Doctrine_DataDict_Oracle_TestCase());
+$data_dict->addTestCase(new Doctrine_DataDict_Sqlite_TestCase());
+$test->addTestCase($data_dict);
+
+// Sequence Tests (not yet fully tested)
+$sequence = new GroupTest('Sequence Tests', 'sequence');
+$sequence->addTestCase(new Doctrine_Sequence_TestCase());
+$sequence->addTestCase(new Doctrine_Sequence_Mysql_TestCase());
+$sequence->addTestCase(new Doctrine_Sequence_Mssql_TestCase());
+$sequence->addTestCase(new Doctrine_Sequence_Pgsql_TestCase());
+$sequence->addTestCase(new Doctrine_Sequence_Oracle_TestCase());
+$sequence->addTestCase(new Doctrine_Sequence_Sqlite_TestCase());
+$test->addTestCase($sequence);
+
+// Export Tests (not yet fully tested)
+$export = new GroupTest('Export Tests', 'export');
+$export->addTestCase(new Doctrine_Export_CheckConstraint_TestCase());
+$export->addTestCase(new Doctrine_Export_TestCase());
+$export->addTestCase(new Doctrine_Export_Mssql_TestCase());
+$export->addTestCase(new Doctrine_Export_Pgsql_TestCase());
+$export->addTestCase(new Doctrine_Export_Oracle_TestCase());
+$export->addTestCase(new Doctrine_Export_Record_TestCase());
+$export->addTestCase(new Doctrine_Export_Mysql_TestCase());
+$export->addTestCase(new Doctrine_Export_Sqlite_TestCase());
+$export->addTestCase(new Doctrine_Export_Schema_TestCase());
+$test->addTestCase($export);
+
+// Import Tests (not yet fully tested)
+$import = new GroupTest('Import Tests', 'import');
+$import->addTestCase(new Doctrine_Import_TestCase());
+$import->addTestCase(new Doctrine_Import_Mysql_TestCase());
+$import->addTestCase(new Doctrine_Import_Mssql_TestCase());
+$import->addTestCase(new Doctrine_Import_Pgsql_TestCase());
+$import->addTestCase(new Doctrine_Import_Oracle_TestCase());
+$import->addTestCase(new Doctrine_Import_Sqlite_TestCase());
+$import->addTestCase(new Doctrine_Import_Builder_TestCase());
+$import->addTestCase(new Doctrine_Import_Schema_TestCase());
+$import->addTestCase(new Doctrine_Import_PluginHierarchy_TestCase());
+$test->addTestCase($import);
+
+// Expression Tests (not yet fully tested)
+$expression = new GroupTest('Expression Tests', 'expression');
+$expression->addTestCase(new Doctrine_Expression_TestCase());
+$expression->addTestCase(new Doctrine_Expression_Driver_TestCase());
+$expression->addTestCase(new Doctrine_Expression_Mysql_TestCase());
+$expression->addTestCase(new Doctrine_Expression_Mssql_TestCase());
+$expression->addTestCase(new Doctrine_Expression_Pgsql_TestCase());
+$expression->addTestCase(new Doctrine_Expression_Oracle_TestCase());
+$expression->addTestCase(new Doctrine_Expression_Sqlite_TestCase());
+$test->addTestCase($expression);
+
+// Core Tests
+$core = new GroupTest('Core Tests', 'core');
+$core->addTestCase(new Doctrine_Base_TestCase());
+$core->addTestCase(new Doctrine_Access_TestCase());
+$core->addTestCase(new Doctrine_Configurable_TestCase());
+$core->addTestCase(new Doctrine_Manager_TestCase());
+$core->addTestCase(new Doctrine_Connection_TestCase());
+$core->addTestCase(new Doctrine_Table_TestCase());
+$core->addTestCase(new Doctrine_Table_RemoveColumn_TestCase());
+$core->addTestCase(new Doctrine_Table_NamedQuery_TestCase());
+$core->addTestCase(new Doctrine_UnitOfWork_TestCase());
+$core->addTestCase(new Doctrine_Collection_TestCase());
+$core->addTestCase(new Doctrine_Collection_Snapshot_TestCase());
+$core->addTestCase(new Doctrine_Hydrate_FetchMode_TestCase());
+$core->addTestCase(new Doctrine_Hydrate_CollectionInitialization_TestCase());
+$core->addTestCase(new Doctrine_Hydrate_Scalar_TestCase());
+$core->addTestCase(new Doctrine_Hydrate_Driver_TestCase());
+$core->addTestCase(new Doctrine_Tokenizer_TestCase());
+$core->addTestCase(new Doctrine_BatchIterator_TestCase());
+$core->addTestCase(new Doctrine_Hydrate_TestCase());
+$core->addTestCase(new Doctrine_Extension_TestCase());
+$test->addTestCase($core);
+
+// CLI Tests
+$cli = new GroupTest('CLI Tests', 'cli');
+$cli->addTestCase(new Doctrine_Cli_TestCase());
+$cli->addTestCase(new Doctrine_Task_TestCase());
+$test->addTestCase($cli);
+
+// Relation Tests
+$relation = new GroupTest('Relation Tests', 'relation');
+$relation->addTestCase(new Doctrine_TreeStructure_TestCase());
+$relation->addTestCase(new Doctrine_Relation_TestCase());
+$relation->addTestCase(new Doctrine_Relation_Access_TestCase());
+$relation->addTestCase(new Doctrine_Relation_ManyToMany_TestCase());
+$relation->addTestCase(new Doctrine_Relation_ManyToMany2_TestCase());
+$relation->addTestCase(new Doctrine_Relation_OneToMany_TestCase());
+$relation->addTestCase(new Doctrine_Relation_Nest_TestCase());
+$relation->addTestCase(new Doctrine_Relation_OneToOne_TestCase());
+$relation->addTestCase(new Doctrine_Relation_ColumnAliases_TestCase());
+$relation->addTestCase(new Doctrine_Relation_Parser_TestCase());
+$relation->addTestCase(new Doctrine_Relation_OrderBy_TestCase());
+$test->addTestCase($relation);
+
+// Data Types Tests
+$data_types = new GroupTest('Data Types Tests', 'data_types');
+$data_types->addTestCase(new Doctrine_DataType_Enum_TestCase());
+$data_types->addTestCase(new Doctrine_DataType_Boolean_TestCase());
+$test->addTestCase($data_types);
+
+// Behaviors Testing
+$behaviors = new GroupTest('Behaviors Tests', 'behaviors');
+$behaviors->addTestCase(new Doctrine_Plugin_TestCase());
+$behaviors->addTestCase(new Doctrine_View_TestCase());
+$behaviors->addTestCase(new Doctrine_AuditLog_TestCase());
+$behaviors->addTestCase(new Doctrine_Hook_TestCase());
+$behaviors->addTestCase(new Doctrine_I18n_TestCase());
+$behaviors->addTestCase(new Doctrine_Sluggable_TestCase());
+$behaviors->addTestCase(new Doctrine_Record_Generator_TestCase());
+$behaviors->addTestCase(new Doctrine_SoftDelete_TestCase());
+$behaviors->addTestCase(new Doctrine_SoftDeleteBC_TestCase());
+$test->addTestCase($behaviors);
+
+// Validator Testing
+$validators = new GroupTest('Validators Testing', 'validators');
+$validators->addTestCase(new Doctrine_Validator_TestCase());
+$validators->addTestCase(new Doctrine_Validator_Future_TestCase());
+$validators->addTestCase(new Doctrine_Validator_Past_TestCase());
+$validators->addTestCase(new Doctrine_Validator_ForeignKeys_TestCase());
+$test->addTestCase($validators);
+
+// Db Tests
+$db = new GroupTest('Db Tests', 'db');
+$db->addTestCase(new Doctrine_Db_TestCase());
+$db->addTestCase(new Doctrine_Connection_Profiler_TestCase());
+$test->addTestCase($db);
+
+// Event Listener Tests
+$event_listener = new GroupTest('EventListener Tests','event_listener');
+$event_listener->addTestCase(new Doctrine_EventListener_TestCase());
+$event_listener->addTestCase(new Doctrine_EventListener_Chain_TestCase());
+$test->addTestCase($event_listener);
+
+// Query Tests
+$query_tests = new GroupTest('Query Tests','query');
+$query_tests->addTestCase(new Doctrine_Query_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_Condition_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_MultiJoin_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_MultiJoin2_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_ReferenceModel_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_ComponentAlias_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_ShortAliases_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_Expression_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_OneToOneFetching_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_Check_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_Limit_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_IdentifierQuoting_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_Update_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_Delete_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_Join_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_Having_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_Orderby_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_Subquery_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_Driver_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_AggregateValue_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_Where_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_From_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_Select_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_JoinCondition_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_MultipleAggregateValue_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_MysqlSubquery_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_PgsqlSubquery_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_MysqlSubqueryHaving_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_SelectExpression_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_Registry_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_RemoveQueryPart_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_Copy_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_HydrateNone_TestCase());
+$query_tests->addTestCase(new Doctrine_Query_Cache_TestCase());
+$test->addTestCase($query_tests);
+
+// Record Tests
+$record = new GroupTest('Record Tests', 'record');
+$record->addTestCase(new Doctrine_Record_Hook_TestCase());
+$record->addTestCase(new Doctrine_Record_CascadingDelete_TestCase());
+$record->addTestCase(new Doctrine_Record_Filter_TestCase());
+$record->addTestCase(new Doctrine_Record_TestCase());
+$record->addTestCase(new Doctrine_Record_State_TestCase());
+$record->addTestCase(new Doctrine_Record_SerializeUnserialize_TestCase());
+$record->addTestCase(new Doctrine_Record_Lock_TestCase());
+$record->addTestCase(new Doctrine_Record_ZeroValues_TestCase());
+$record->addTestCase(new Doctrine_Record_SaveBlankRecord_TestCase());
+$record->addTestCase(new Doctrine_Record_Inheritance_TestCase());
+$record->addTestCase(new Doctrine_Record_Synchronize_TestCase());
+$record->addTestCase(new Doctrine_Record_FromArray_TestCase());
+$test->addTestCase($record);
+
+// Inheritance Tests
+$inheritance = new GroupTest('Inheritance Tests', 'inheritance');
+$inheritance->addTestCase(new Doctrine_ConcreteInheritance_TestCase());
+$inheritance->addTestCase(new Doctrine_CtiColumnAggregationInheritance_TestCase());
+$inheritance->addTestCase(new Doctrine_ColumnAggregationInheritance_TestCase());
+$inheritance->addTestCase(new Doctrine_ClassTableInheritance_TestCase());
+$inheritance->addTestCase(new Doctrine_Query_ApplyInheritance_TestCase());
+$test->addTestCase($inheritance);
+
+// Search Tests
+$search = new GroupTest('Search Tests', 'search');
+$search->addTestCase(new Doctrine_Search_TestCase());
+$search->addTestCase(new Doctrine_Search_Query_TestCase());
+$search->addTestCase(new Doctrine_Search_File_TestCase());
+$test->addTestCase($search);
+
+// Cache Tests
+$cache = new GroupTest('Cache Tests', 'cache');
+$cache->addTestCase(new Doctrine_Query_Cache_TestCase());
+$cache->addTestCase(new Doctrine_Cache_Apc_TestCase());
+$cache->addTestCase(new Doctrine_Cache_Array_TestCase());
+$cache->addTestCase(new Doctrine_Cache_Db_TestCase());
+$cache->addTestCase(new Doctrine_Cache_Memcache_TestCase());
+$cache->addTestCase(new Doctrine_Cache_Sqlite_TestCase());
+$cache->addTestCase(new Doctrine_Cache_Query_Sqlite_TestCase());
+$cache->addTestCase(new Doctrine_Cache_Sqlite_TestCase());
+$cache->addTestCase(new Doctrine_Cache_Xcache_TestCase());
+$test->addTestCase($cache);
+
+// Migration Tests
+$migration = new GroupTest('Migration Tests', 'migration');
+$migration->addTestCase(new Doctrine_Migration_TestCase());
+$migration->addTestCase(new Doctrine_Migration_Base_TestCase());
+$migration->addTestCase(new Doctrine_Migration_Diff_TestCase());
+$test->addTestCase($migration);
+
+// File Parser Tests
+$parser = new GroupTest('Parser Tests', 'parser');
+$parser->addTestCase(new Doctrine_Parser_TestCase());
+$test->addTestCase($parser);
+
+// Data Fixtures Tests
+$data = new GroupTest('Data exporting/importing fixtures', 'data_fixtures');
+$data->addTestCase(new Doctrine_Data_Import_TestCase());
+$data->addTestCase(new Doctrine_Data_Export_TestCase());
+$test->addTestCase($data);
+
+// Unsorted Tests. These need to be sorted and placed in the appropriate group
+$unsorted = new GroupTest('Unsorted Tests', 'unsorted');
+$unsorted->addTestCase(new Doctrine_CustomPrimaryKey_TestCase());
+$unsorted->addTestCase(new Doctrine_CustomResultSetOrder_TestCase());
+$unsorted->addTestCase(new Doctrine_ColumnAlias_TestCase());
+$unsorted->addTestCase(new Doctrine_RawSql_TestCase());
+$unsorted->addTestCase(new Doctrine_NewCore_TestCase());
+$unsorted->addTestCase(new Doctrine_Template_TestCase());
+$unsorted->addTestCase(new Doctrine_PessimisticLocking_TestCase());
+$test->addTestCase($unsorted);
+
+$nestedSet = new GroupTest('Nested set tests', 'nestedset');
+$nestedSet->addTestCase(new Doctrine_NestedSet_SingleRoot_TestCase());
+$nestedSet->addTestCase(new Doctrine_NestedSet_MultiRoot_TestCase());
+$nestedSet->addTestCase(new Doctrine_NestedSet_TimestampableMultiRoot_TestCase());
+$nestedSet->addTestCase(new Doctrine_NestedSet_Hydration_TestCase());
+$test->addTestCase($nestedSet);
+
+/*
+$unsorted = new GroupTest('Performance', 'performance');
+$unsorted->addTestCase(new Doctrine_Hydrate_Performance_TestCase());
+$test->addTestCase($unsorted);
+*/
+
+exit($test->run() ? 0 : 1);
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/schema.xml b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/schema.xml
new file mode 100755
index 000000000..e12dc7cf5
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/schema.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<data><Account><tableName>account</tableName><className>Account</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><entity_id><type>integer</type><length>2147483647</length><name>entity_id</name></entity_id><amount><type>integer</type><length>2147483647</length><name>amount</name></amount></columns></Account><Address><tableName>address</tableName><className>Address</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><address><type>string</type><length>200</length><name>address</name></address></columns><relations><User><refClass>EntityAddress</refClass><local>address_id</local><foreign>user_id</foreign><type>many</type></User><EntityAddress><local>id</local><foreign>address_id</foreign><type>many</type></EntityAddress></relations></Address><Album><tableName>album</tableName><className>Album</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><user_id><type>integer</type><length>2147483647</length><name>user_id</name></user_id><name><type>string</type><length>20</length><name>name</name></name></columns><relations><Song><local>id</local><foreign>album_id</foreign><type>many</type></Song><User><local>user_id</local><foreign>id</foreign><type>one</type></User></relations></Album><Assignment><tableName>assignment</tableName><className>Assignment</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><task_id><type>integer</type><length>2147483647</length><name>task_id</name></task_id><resource_id><type>integer</type><length>2147483647</length><name>resource_id</name></resource_id></columns><relations><Resource><local>resource_id</local><foreign>id</foreign><type>one</type></Resource><Task><local>task_id</local><foreign>id</foreign><type>one</type></Task></relations></Assignment><Description><tableName>description</tableName><className>Description</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><description><type>string</type><length>3000</length><name>description</name></description><file_md5><type>string</type><length>32</length><name>file_md5</name></file_md5></columns></Description><Element><tableName>element</tableName><className>Element</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><name><type>string</type><length>100</length><name>name</name></name><parent_id><type>integer</type><length>2147483647</length><name>parent_id</name></parent_id></columns><relations><Child><class>Element</class><local>id</local><foreign>parent_id</foreign><type>many</type></Child><Parent><class>Element</class><local>parent_id</local><foreign>id</foreign><type>one</type></Parent></relations></Element><Email><tableName>email</tableName><className>Email</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><address><email>1</email><unique>1</unique><type>string</type><length>150</length><name>address</name></address></columns></Email><Entity><tableName>entity</tableName><className>Entity</className><columns><id><autoincrement>1</autoincrement><primary>1</primary><type>integer</type><length>20</length><name>id</name></id><name><type>string</type><length>50</length><name>name</name></name><loginname><unique>1</unique><type>string</type><length>20</length><name>loginname</name></loginname><password><type>string</type><length>16</length><name>password</name></password><type><type>integer</type><length>1</length><name>type</name></type><created><type>integer</type><length>11</length><name>created</name></created><updated><type>integer</type><length>11</length><name>updated</name></updated><email_id><type>integer</type><length>2147483647</length><name>email_id</name></email_id></columns><relations><Email><local>email_id</local><foreign>id</foreign><type>one</type></Email><Phonenumber><local>id</local><foreign>entity_id</foreign><type>many</type></Phonenumber><Account><local>id</local><foreign>entity_id</foreign><type>one</type></Account><Entity><refClass>EntityReference</refClass><local>entity1</local><foreign>entity2</foreign><type>many</type></Entity><EntityReference><local>id</local><foreign>entity1</foreign><type>many</type></EntityReference></relations></Entity><EntityAddress><tableName>entity_address</tableName><className>EntityAddress</className><columns><user_id><primary>1</primary><type>integer</type><length>2147483647</length><name>user_id</name></user_id><address_id><primary>1</primary><type>integer</type><length>2147483647</length><name>address_id</name></address_id></columns><relations><Address><local>address_id</local><foreign>id</foreign><type>one</type></Address><User><local>user_id</local><foreign>id</foreign><type>one</type></User></relations></EntityAddress><EntityReference><tableName>entity_reference</tableName><className>EntityReference</className><columns><entity1><primary>1</primary><type>integer</type><length>2147483647</length><name>entity1</name></entity1><entity2><primary>1</primary><type>integer</type><length>2147483647</length><name>entity2</name></entity2></columns><relations><Entity><local>entity1</local><foreign>id</foreign><type>one</type></Entity><Group><local>entity1</local><foreign>id</foreign><type>one</type></Group><User><local>entity1</local><foreign>id</foreign><type>one</type></User></relations></EntityReference><TestError><tableName>testerror</tableName><className>TestError</className><columns><message><type>string</type><length>200</length><name>message</name></message><code><type>integer</type><length>11</length><name>code</name></code><file_md5><primary>1</primary><type>string</type><length>32</length><name>file_md5</name></file_md5></columns><relations><Description><local>file_md5</local><foreign>file_md5</foreign><type>one</type></Description></relations></TestError><Group><tableName>entity</tableName><className>Group</className><columns><id><autoincrement>1</autoincrement><primary>1</primary><type>integer</type><length>20</length><name>id</name></id><name><type>string</type><length>50</length><name>name</name></name><loginname><unique>1</unique><type>string</type><length>20</length><name>loginname</name></loginname><password><type>string</type><length>16</length><name>password</name></password><type><type>integer</type><length>1</length><name>type</name></type><created><type>integer</type><length>11</length><name>created</name></created><updated><type>integer</type><length>11</length><name>updated</name></updated><email_id><type>integer</type><length>2147483647</length><name>email_id</name></email_id></columns><relations><Email><local>email_id</local><foreign>id</foreign><type>one</type></Email><Phonenumber><local>id</local><foreign>entity_id</foreign><type>many</type></Phonenumber><Account><local>id</local><foreign>entity_id</foreign><type>one</type></Account><Entity><refClass>EntityReference</refClass><local>entity1</local><foreign>entity2</foreign><type>many</type></Entity><User><refClass>Groupuser</refClass><local>group_id</local><foreign>user_id</foreign><type>many</type></User><EntityReference><local>id</local><foreign>entity1</foreign><type>many</type></EntityReference><Groupuser><local>id</local><foreign>group_id</foreign><type>many</type></Groupuser></relations></Group><Groupuser><tableName>groupuser</tableName><className>Groupuser</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><added><type>integer</type><length>2147483647</length><name>added</name></added><group_id><type>integer</type><length>2147483647</length><name>group_id</name></group_id><user_id><type>integer</type><length>2147483647</length><name>user_id</name></user_id></columns><relations><Group><local>group_id</local><foreign>id</foreign><type>one</type></Group><User><local>user_id</local><foreign>id</foreign><type>one</type></User></relations></Groupuser><Phonenumber><tableName>phonenumber</tableName><className>Phonenumber</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><phonenumber><type>string</type><length>20</length><name>phonenumber</name></phonenumber><entity_id><type>integer</type><length>2147483647</length><name>entity_id</name></entity_id></columns><relations><Entity><local>entity_id</local><foreign>id</foreign><type>one</type></Entity><Group><local>entity_id</local><foreign>id</foreign><type>one</type></Group><User><local>entity_id</local><foreign>id</foreign><type>one</type></User></relations></Phonenumber><ResourceReference><tableName>resource_reference</tableName><className>ResourceReference</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><type_id><type>integer</type><length>2147483647</length><name>type_id</name></type_id><resource_id><type>integer</type><length>2147483647</length><name>resource_id</name></resource_id></columns><relations><Resource><local>resource_id</local><foreign>id</foreign><type>one</type></Resource><ResourceType><local>resourcetype_id</local><foreign>id</foreign><type>one</type></ResourceType></relations></ResourceReference><Resource><tableName>resource</tableName><className>Resource</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><name><type>string</type><length>100</length><name>name</name></name></columns><relations><TaskAlias><refClass>Assignment</refClass><class>Task</class><local>resource_id</local><foreign>task_id</foreign><type>many</type></TaskAlias><Type><refClass>ResourceReference</refClass><class>ResourceType</class><local>resource_id</local><foreign>type_id</foreign><type>many</type></Type><Assignment><local>id</local><foreign>resource_id</foreign><type>many</type></Assignment><ResourceReference><local>id</local><foreign>resource_id</foreign><type>many</type></ResourceReference></relations></Resource><ResourceType><tableName>resource_type</tableName><className>ResourceType</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><type><type>string</type><length>100</length><name>type</name></type></columns><relations><ResourceAlias><refClass>ResourceReference</refClass><class>Resource</class><local>resourcetype_id</local><foreign>resource_id</foreign><type>many</type></ResourceAlias><ResourceReference><local>id</local><foreign>resourcetype_id</foreign><type>many</type></ResourceReference></relations></ResourceType><Song><tableName>song</tableName><className>Song</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><album_id><type>integer</type><length>2147483647</length><name>album_id</name></album_id><genre><type>string</type><length>20</length><name>genre</name></genre><title><type>string</type><length>30</length><name>title</name></title></columns><relations><Album><local>album_id</local><foreign>id</foreign><type>one</type></Album></relations></Song><Task><tableName>task</tableName><className>Task</className><columns><id><type>integer</type><length>20</length><autoincrement>1</autoincrement><primary>1</primary><name>id</name></id><name><type>string</type><length>100</length><name>name</name></name><parent_id><type>integer</type><length>2147483647</length><name>parent_id</name></parent_id></columns><relations><ResourceAlias><refClass>Assignment</refClass><class>Resource</class><local>task_id</local><foreign>resource_id</foreign><type>many</type></ResourceAlias><Subtask><class>Task</class><local>id</local><foreign>parent_id</foreign><type>many</type></Subtask><Assignment><local>id</local><foreign>task_id</foreign><type>many</type></Assignment></relations></Task><User><tableName>entity</tableName><className>User</className><columns><id><autoincrement>1</autoincrement><primary>1</primary><type>integer</type><length>20</length><name>id</name></id><name><type>string</type><length>50</length><name>name</name></name><loginname><unique>1</unique><type>string</type><length>20</length><name>loginname</name></loginname><password><type>string</type><length>16</length><name>password</name></password><type><type>integer</type><length>1</length><name>type</name></type><created><type>integer</type><length>11</length><name>created</name></created><updated><type>integer</type><length>11</length><name>updated</name></updated><email_id><type>integer</type><length>2147483647</length><name>email_id</name></email_id></columns><relations><Email><local>email_id</local><foreign>id</foreign><type>one</type></Email><Phonenumber><local>id</local><foreign>entity_id</foreign><type>many</type></Phonenumber><Account><local>id</local><foreign>entity_id</foreign><type>one</type></Account><Entity><refClass>EntityReference</refClass><local>entity1</local><foreign>entity2</foreign><type>many</type></Entity><Address><refClass>EntityAddress</refClass><local>user_id</local><foreign>address_id</foreign><type>many</type></Address><Addresses><refClass>EntityAddress</refClass><class>Address</class><local>user_id</local><foreign>address_id</foreign><type>many</type></Addresses><Album><local>id</local><foreign>user_id</foreign><type>many</type></Album><Book><local>id</local><foreign>user_id</foreign><type>many</type></Book><Group><refClass>Groupuser</refClass><local>user_id</local><foreign>group_id</foreign><type>many</type></Group><EntityReference><local>id</local><foreign>entity1</foreign><type>many</type></EntityReference><EntityAddress><local>id</local><foreign>user_id</foreign><type>many</type></EntityAddress><Groupuser><local>id</local><foreign>user_id</foreign><type>many</type></Groupuser></relations></User></data>
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/schema.yml b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/schema.yml
new file mode 100644
index 000000000..c03f23fd5
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/schema.yml
@@ -0,0 +1,216 @@
+---
+SchemaTestUser:
+  actAs: [Timestampable]
+  columns:
+    id:
+      type: integer(4)
+      primary: true
+      autoincrement: true
+    username:
+      type: string(255)
+      charset: utf8
+      collation: utf8_general_ci
+    password:
+      type: string(255)
+
+SchemaTestProfile:
+  actAs: [Timestampable]
+  columns:
+    id:
+      type: integer(4)
+      primary: true
+      autoincrement: true
+    schema_test_user_id:
+      type: integer(4)
+    schema_test_contact_id:
+      type: integer(4)
+    first_name:
+      type: string(255)
+    last_name:
+      type: string(255)
+  relations:
+    SchemaTestUser: 
+      foreignType: one
+    SchemaTestContact:
+      foreignType: one
+
+SchemaTestContact:
+  actAs: [Timestampable]
+  columns:
+    id:
+      type: integer(4)
+      primary: true
+      autoincrement: true
+    name:
+      type: string(255)
+
+SchemaTestPhonenumber:
+  actAs: [Timestampable]
+  columns:
+    id:
+      type: integer(4)
+      primary: true
+      autoincrement: true
+    schema_test_contact_id:
+      type: integer(4)
+    phone_number:
+      type: integer(4)
+  relations:
+    SchemaTestContact:
+      foreignAlias: Phonenumbers
+
+SchemaTestInheritanceParent:
+  package: Parent
+  columns:
+    id:
+      type: integer(4)
+      primary: true
+      autoincrement: true
+    name:
+      type: string(255)
+    type:
+      type: string(255)
+
+SchemaTestInheritanceChild1:
+  package: Child1
+  inheritance:
+    extends: SchemaTestInheritanceParent
+    keyField: type
+    keyValue: child1
+
+SchemaTestInheritanceChild2:
+  package: Child2
+  inheritance:
+    extends: SchemaTestInheritanceChild1
+    keyField: type
+    keyValue: child2
+
+# Simple Inheritance
+# All children share the columns of the parent
+SchemaTestSimpleInheritanceParent:
+  columns:
+    name: string(255)
+
+SchemaTestSimpleInheritanceChild:
+  inheritance:
+    type: simple
+    extends: SchemaTestSimpleInheritanceParent
+  columns:
+    description: string(255)
+
+# Class Table Inheritance
+# Individual tables, each model has its own columns, and they share id primary keys
+SchemaTestClassTableInheritanceParent:
+  columns:
+    name: string(255)
+
+SchemaTestClassTableInheritanceChild:
+  inheritance:
+    type: class_table
+    extends: SchemaTestClassTableInheritanceParent
+  columns:
+    title: string(255)
+    description: string(255)
+
+# Concrete Inheritance
+# Individual tables, all children share the columns of its parents
+SchemaTestConcreteInheritanceParent:
+  columns:
+    name: string(255)
+
+SchemaTestConcreteInheritanceChild:
+  inheritance:
+    type: concrete
+    extends: SchemaTestClassTableInheritanceParent
+  columns:
+    title: string(255)
+    description: string(255)
+
+# Column Aggregation Inheritance
+# Single table, all children columns are stored in the parent, parent class has a type method
+# Which is used to determine which child the record in the db belonds to
+SchemaTestColumnAggregationInheritanceParent:
+  columns:
+    name: string(255)
+    type: string(255)
+
+SchemaTestColumnAggregationInheritanceChild:
+  inheritance:
+    type: column_aggregation
+    keyField: type
+    keyValue: SchemaTestColumnAggregationInheritanceChild
+    extends: SchemaTestColumnAggregationInheritanceParent
+  columns:
+    title: string(255)
+    description: string(255)
+
+AliasTest:
+  columns:
+    test_col:
+      name: test_col as test_col_alias
+      type: string(255)
+      
+# App-level cascade delete
+AppCascadeDeleteTest:
+  columns: 
+    id: 
+      primary: true
+      autoincrement: true
+      type: integer(4)
+    alias_id:
+      type: integer(4)
+
+  relations:
+    AliasTest:
+      type: one
+      local: alias_id
+      foreign: id
+      cascade: [delete]
+      
+ListenerTestAsArray:
+  columns:
+    id: 
+      primary: true
+      autoincrement: true
+      type: integer(4)
+    name:
+      type: string(50)
+    slug:
+      type: string(60)
+  listeners: [Doctrine_Template_Listener_Sluggable]
+  
+ListenerTestWithParameters:
+  columns:
+    id: 
+      primary: true
+      autoincrement: true
+      type: integer(4)
+    name:
+      type: string(50)
+    slug:
+      type: string(60)
+  listeners: 
+    Sluggable:
+      useOptions: true
+      class: Doctrine_Template_Listener_Sluggable
+
+# Long identifier test on FK      
+sfUserEmailAddressType:
+  columns:
+    name:
+      type: string
+      length: 20
+
+sfUserEmailAddress:
+  actAs:
+    Timestampable:
+  columns:
+    email_address_type_id: integer
+    address:
+      type: string
+      length: 128
+      email: true
+  relations:
+    EmailAddressType:
+      class: sfUserEmailAddressType
+      local: email_address_type_id
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/template.tpl b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/template.tpl
new file mode 100644
index 000000000..79867bbad
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/template.tpl
@@ -0,0 +1,35 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * %s
+ *
+ * @package     Doctrine
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class %s extends Doctrine_UnitTestCase 
+{
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/tmp/Ticket_1527_User.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/tmp/Ticket_1527_User.php
new file mode 100644
index 000000000..243acef32
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/tmp/Ticket_1527_User.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * Ticket_1527_User
+ * 
+ * This class has been auto-generated by the Doctrine ORM Framework
+ * 
+ * @package    ##PACKAGE##
+ * @subpackage ##SUBPACKAGE##
+ * @author     ##NAME## <##EMAIL##>
+ * @version    SVN: $Id: Builder.php 7490 2010-03-29 19:53:27Z jwage $
+ */
+class Ticket_1527_User extends BaseTicket_1527_User
+{
+
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/tmp/generated/BaseTicket_1527_User.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/tmp/generated/BaseTicket_1527_User.php
new file mode 100644
index 000000000..a12f60801
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/tmp/generated/BaseTicket_1527_User.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * BaseTicket_1527_User
+ * 
+ * This class has been auto-generated by the Doctrine ORM Framework
+ * 
+ * @property string $username
+ * @property string $password
+ * 
+ * @package    ##PACKAGE##
+ * @subpackage ##SUBPACKAGE##
+ * @author     ##NAME## <##EMAIL##>
+ * @version    SVN: $Id: Builder.php 7490 2010-03-29 19:53:27Z jwage $
+ */
+abstract class BaseTicket_1527_User extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->setTableName('ticket_1527__user');
+        $this->hasColumn('username', 'string', 255, array(
+             'type' => 'string',
+             'extra' => 
+             array(
+              'test' => 123,
+             ),
+             'length' => '255',
+             ));
+        $this->hasColumn('password', 'string', 255, array(
+             'type' => 'string',
+             'length' => '255',
+             ));
+    }
+
+    public function setUp()
+    {
+        parent::setUp();
+        
+    }
+}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/unsolved.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/unsolved.php
new file mode 100644
index 000000000..e10461a6b
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tests/unsolved.php
@@ -0,0 +1,38 @@
+<?php
+require_once dirname(__FILE__) . '/../lib/Doctrine/Core.php';
+
+
+error_reporting(E_ALL);
+
+spl_autoload_register(array('Doctrine_Core', 'autoload'));
+require_once 'classes.php';
+require_once dirname(__FILE__) . '/../models/location.php';
+
+print "<pre>";
+
+$manager = Doctrine_Manager::getInstance();
+$dbh = Doctrine_Db::getConnection('sqlite::memory:');
+$conn = $manager->openConnection($dbh);
+/*
+$user = new User();
+$user->name = 'zYne';
+$user->Phonenumber[0]->phonenumber = '123 123';
+if ($user === $user->Phonenumber[0]->entity_id) {
+    print 'case 1 works\n';
+}
+$city = new Record_City();
+$city->name = 'City 1';
+$city->District->name = 'District 1';
+
+if ($city->District === $city->district_id) {
+    print 'case 2 works\n';
+}
+*/
+
+$c = new Record_Country();
+$c->name = 'Some country';
+$city = $c->City[0];
+$city->name = 'City 1';
+$city->District->name = 'District 1';
+
+$c->save();
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tools/sandbox/config.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tools/sandbox/config.php
new file mode 100644
index 000000000..16512e364
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tools/sandbox/config.php
@@ -0,0 +1,59 @@
+<?php
+/*
+ *  $Id: config.php 2753 2007-10-07 20:58:08Z Jonathan.Wage $
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine Configuration File
+ *
+ * This is a sample implementation of Doctrine
+ * 
+ * @package     Doctrine
+ * @subpackage  Config
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision: 2753 $
+ * @author      Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @author      Jonathan H. Wage <jwage@mac.com>
+ */
+
+define('SANDBOX_PATH', dirname(__FILE__));
+define('DOCTRINE_PATH', dirname(dirname(SANDBOX_PATH)) . DIRECTORY_SEPARATOR . 'lib');
+define('DATA_FIXTURES_PATH', SANDBOX_PATH . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR . 'fixtures');
+define('MODELS_PATH', SANDBOX_PATH . DIRECTORY_SEPARATOR . 'models');
+define('MIGRATIONS_PATH', SANDBOX_PATH . DIRECTORY_SEPARATOR . 'migrations');
+define('SQL_PATH', SANDBOX_PATH . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR . 'sql');
+define('YAML_SCHEMA_PATH', SANDBOX_PATH . DIRECTORY_SEPARATOR . 'schema');
+define('DB_PATH', SANDBOX_PATH . DIRECTORY_SEPARATOR . 'sandbox.db');
+define('DSN', 'sqlite:///' . DB_PATH);
+
+require_once(DOCTRINE_PATH . DIRECTORY_SEPARATOR . 'Doctrine.php');
+
+Doctrine_Core::setExtensionsPath(dirname(__FILE__).'/extensions');
+
+spl_autoload_register(array('Doctrine', 'autoload'));
+spl_autoload_register(array('Doctrine', 'modelsAutoload'));
+spl_autoload_register(array('Doctrine', 'extensionsAutoload'));
+
+$manager = Doctrine_Manager::getInstance();
+$manager->openConnection(DSN, 'doctrine');
+$manager->setAttribute(Doctrine_Core::ATTR_MODEL_LOADING, Doctrine_Core::MODEL_LOADING_PEAR);
+
+Doctrine_Core::setModelsDirectory('models');
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tools/sandbox/doctrine b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tools/sandbox/doctrine
new file mode 100755
index 000000000..8edb14848
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tools/sandbox/doctrine
@@ -0,0 +1,4 @@
+#!/usr/bin/env php
+<?php
+chdir(dirname(__FILE__));
+include('doctrine.php');
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tools/sandbox/doctrine.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tools/sandbox/doctrine.php
new file mode 100644
index 000000000..8de175385
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tools/sandbox/doctrine.php
@@ -0,0 +1,21 @@
+<?php
+require_once('config.php');
+
+// Configure Doctrine Cli
+// Normally these are arguments to the cli tasks but if they are set here the arguments will be auto-filled
+$config = array(
+    'data_fixtures_path'  =>  DATA_FIXTURES_PATH,
+    'models_path'         =>  MODELS_PATH,
+    'migrations_path'     =>  MIGRATIONS_PATH,
+    'sql_path'            =>  SQL_PATH,
+    'yaml_schema_path'    =>  YAML_SCHEMA_PATH,
+    'generate_models_options' => array(
+        'pearStyle' => true,
+        'generateTableClasses' => true,
+        'baseClassPrefix' => 'Base',
+        'baseClassesDirectory' => null,
+    )
+);
+
+$cli = new Doctrine_Cli($config);
+$cli->run($_SERVER['argv']);
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tools/sandbox/index.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tools/sandbox/index.php
new file mode 100644
index 000000000..694fa45c5
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/vendor/doctrine/tools/sandbox/index.php
@@ -0,0 +1,5 @@
+<?php
+
+require_once('config.php');
+
+$models = Doctrine_Core::loadModels('models');
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineArrayChoice.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineArrayChoice.class.php
new file mode 100644
index 000000000..7a43456a7
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineArrayChoice.class.php
@@ -0,0 +1,85 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ * (c) Jonathan H. Wage <jonwage@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * sfWidgetFormDoctrineArrayChoice represents a choice widget for a model and table_method.
+ *
+ * @package    symfony
+ * @subpackage doctrine
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ * @author     Jonathan H. Wage <jonwage@gmail.com>
+ * @version    SVN: $Id$
+ */
+class sfWidgetFormDoctrineArrayChoice extends sfWidgetFormChoice
+{
+  /**
+   * @see sfWidget
+   */
+  public function __construct($options = array(), $attributes = array())
+  {
+    $options['choices'] = array();
+
+    parent::__construct($options, $attributes);
+  }
+
+  /**
+   * Constructor.
+   *
+   * Available options:
+   *
+   *  * model:                The model class (required)
+   *  * table_method:         A method to return a formatted array of key => value (required)
+   *  * table_method_params:  An array of parameters to pass to the table_method
+   *  * add_empty:            Whether to add a first empty value or not (false by default)
+   *                          If the option is not a Boolean, the value will be used as the text value
+   *  * multiple:             true if the select tag must allow multiple selections (false by default)
+   *
+   * @see sfWidgetFormChoice
+   */
+  protected function configure($options = array(), $attributes = array())
+  {
+    $this->addRequiredOption('model');
+    $this->addRequiredOption('table_method');
+    $this->addOption('table_method_params', null);
+    $this->addOption('add_empty', false);
+    $this->addOption('multiple', false);
+
+    parent::configure($options, $attributes);
+  }
+
+  /**
+   * Returns the choices builded by the table method of the model.
+   *
+   * @return array An array of choices
+   */
+  public function getChoices()
+  {
+    $choices = array();
+    if (false !== $this->getOption('add_empty'))
+    {
+      $choices[''] = true === $this->getOption('add_empty') ? '' : $this->translate($this->getOption('add_empty'));
+    }
+
+    $tableMethod = $this->getOption('table_method');
+    $table = Doctrine_Core::getTable($this->getOption('model'));
+
+    if (null !== $params = $this->getOption('table_method_params'))
+    {
+      $choices += call_user_func_array(array($table, $tableMethod), (array) $params);
+    }
+    else
+    {
+      $choices += $table->$tableMethod();
+    }
+
+    return $choices;
+  }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineChoice.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineChoice.class.php
index 1a21f82c1..0523f2298 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineChoice.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/lib/widget/sfWidgetFormDoctrineChoice.class.php
@@ -16,7 +16,7 @@
  * @subpackage doctrine
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Jonathan H. Wage <jonwage@gmail.com>
- * @version    SVN: $Id: sfWidgetFormDoctrineChoice.class.php 29679 2010-05-30 14:46:03Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormDoctrineChoice extends sfWidgetFormChoice
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/doctrine_route_test/actions/actions.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/doctrine_route_test/actions/actions.class.php
index c89a1ce8b..92e300891 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/doctrine_route_test/actions/actions.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/doctrine_route_test/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    symfony12
  * @subpackage doctrine_route_test
  * @author     Your name here
- * @version    SVN: $Id: actions.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class doctrine_route_testActions extends sfActions
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/actions/actions.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/actions/actions.class.php
index 80299015a..a9dfe46d8 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/actions/actions.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/actions/actions.class.php
@@ -9,7 +9,7 @@
  * @package    symfony12
  * @subpackage my_articles
  * @author     Your name here
- * @version    SVN: $Id: actions.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class my_articlesActions extends autoMy_articlesActions
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/lib/my_articlesGeneratorConfiguration.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/lib/my_articlesGeneratorConfiguration.class.php
index a11239e1e..e11f8b00d 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/lib/my_articlesGeneratorConfiguration.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/lib/my_articlesGeneratorConfiguration.class.php
@@ -6,7 +6,7 @@
  * @package    symfony12
  * @subpackage my_articles
  * @author     Your name here
- * @version    SVN: $Id: my_articlesGeneratorConfiguration.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class my_articlesGeneratorConfiguration extends BaseMy_articlesGeneratorConfiguration
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/lib/my_articlesGeneratorHelper.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/lib/my_articlesGeneratorHelper.class.php
index b336f69f0..5ed57ef5d 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/lib/my_articlesGeneratorHelper.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/backend/modules/my_articles/lib/my_articlesGeneratorHelper.class.php
@@ -6,7 +6,7 @@
  * @package    symfony12
  * @subpackage my_articles
  * @author     Your name here
- * @version    SVN: $Id: my_articlesGeneratorHelper.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class my_articlesGeneratorHelper extends BaseMy_articlesGeneratorHelper
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/articles/actions/actions.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/articles/actions/actions.class.php
index 0faf39f8b..78e008cfa 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/articles/actions/actions.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/articles/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    symfony12
  * @subpackage articles
  * @author     Your name here
- * @version    SVN: $Id: actions.class.php 30442 2010-07-28 04:13:21Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class articlesActions extends sfActions
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/attachment/actions/actions.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/attachment/actions/actions.class.php
index e037121f1..83ed83ef1 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/attachment/actions/actions.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/apps/frontend/modules/attachment/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    symfony12
  * @subpackage attachment
  * @author     Your name here
- * @version    SVN: $Id: actions.class.php 24971 2009-12-05 15:05:03Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class attachmentActions extends sfActions
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/config/ProjectConfiguration.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/config/ProjectConfiguration.class.php
index 037d169f6..b07bfb851 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/config/ProjectConfiguration.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/config/ProjectConfiguration.class.php
@@ -7,7 +7,11 @@ class ProjectConfiguration extends sfProjectConfiguration
 {
   public function setup()
   {
-    $this->enableAllPluginsExcept(array('sfPropelPlugin'));
+    $this->enableAllPluginsExcept();
+
+    $this->dispatcher->connect('doctrine.configure', array($this, 'configureDoctrine'));
+    $this->dispatcher->connect('doctrine.configure_connection', array($this, 'configureDoctrineConnection'));
+    $this->dispatcher->connect('doctrine.filter_model_builder_options', array($this, 'configureDoctrineModelBuilder'));
   }
 
   public function initializeDoctrine()
@@ -37,20 +41,27 @@ public function loadFixtures($fixtures)
     $task->run(array($path));
   }
 
-  public function configureDoctrine(Doctrine_Manager $manager)
+  public function configureDoctrine(sfEvent $event)
   {
+    $manager = $event->getSubject();
     $manager->setAttribute(Doctrine_Core::ATTR_VALIDATE, true);
 
-    $options = array('baseClassName' => 'myDoctrineRecord');
-    sfConfig::set('doctrine_model_builder_options', $options);
   }
 
-  public function configureDoctrineConnection(Doctrine_Connection $connection)
+  public function configureDoctrineModelBuilder(sfEvent $event, $options)
   {
+    $options['baseClassName'] = 'myDoctrineRecord';
+
+    return $options;
   }
 
-  public function configureDoctrineConnectionDoctrine2(Doctrine_Connection $connection)
+  public function configureDoctrineConnection(sfEvent $event)
   {
-    $connection->setAttribute(Doctrine_Core::ATTR_VALIDATE, false);
+    $parameters = $event->getParameters();
+
+    if ('doctrine2' === $parameters['connection']->getName())
+    {
+      $parameters['connection']->setAttribute(Doctrine_Core::ATTR_VALIDATE, false);
+    }
   }
 }
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/data/linked_schema.yml b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/data/linked_schema.yml
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ArticleFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ArticleFormFilter.class.php
index 88ed1dc1b..865614e16 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ArticleFormFilter.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ArticleFormFilter.class.php
@@ -5,7 +5,7 @@
  *
  * @package    filters
  * @subpackage Article *
- * @version    SVN: $Id: ArticleFormFilter.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class ArticleFormFilter extends BaseArticleFormFilter
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ArticleTranslationFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ArticleTranslationFormFilter.class.php
index c6f1cabd5..a02ae0726 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ArticleTranslationFormFilter.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ArticleTranslationFormFilter.class.php
@@ -5,7 +5,7 @@
  *
  * @package    filters
  * @subpackage ArticleTranslation *
- * @version    SVN: $Id: ArticleTranslationFormFilter.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class ArticleTranslationFormFilter extends BaseArticleTranslationFormFilter
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AttachmentFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AttachmentFormFilter.class.php
index 82eb16a7d..5b8256278 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AttachmentFormFilter.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AttachmentFormFilter.class.php
@@ -6,7 +6,7 @@
  * @package    symfony12
  * @subpackage filter
  * @author     Your name here
- * @version    SVN: $Id: AttachmentFormFilter.class.php 24068 2009-11-17 06:39:35Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class AttachmentFormFilter extends BaseAttachmentFormFilter
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorFormFilter.class.php
index 962d14d67..6552bd2d6 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorFormFilter.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorFormFilter.class.php
@@ -5,7 +5,7 @@
  *
  * @package    filters
  * @subpackage Author *
- * @version    SVN: $Id: AuthorFormFilter.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class AuthorFormFilter extends BaseAuthorFormFilter
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorInheritanceConcreteFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorInheritanceConcreteFormFilter.class.php
index 74f561f34..394c2543b 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorInheritanceConcreteFormFilter.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorInheritanceConcreteFormFilter.class.php
@@ -6,7 +6,7 @@
  * @package    symfony12
  * @subpackage filter
  * @author     Your name here
- * @version    SVN: $Id: AuthorInheritanceConcreteFormFilter.class.php 22748 2009-10-02 23:19:37Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class AuthorInheritanceConcreteFormFilter extends BaseAuthorInheritanceConcreteFormFilter
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorInheritanceFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorInheritanceFormFilter.class.php
index 3a9316f84..27eaad2cf 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorInheritanceFormFilter.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/AuthorInheritanceFormFilter.class.php
@@ -5,7 +5,7 @@
  *
  * @package    filters
  * @subpackage AuthorInheritance *
- * @version    SVN: $Id: AuthorInheritanceFormFilter.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class AuthorInheritanceFormFilter extends BaseAuthorInheritanceFormFilter
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BaseFormFilterDoctrine.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BaseFormFilterDoctrine.class.php
index 3a23d0252..91b99e80e 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BaseFormFilterDoctrine.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BaseFormFilterDoctrine.class.php
@@ -5,7 +5,7 @@
  *
  * @package    filters
  *
- * @version    SVN: $Id: BaseFormFilterDoctrine.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class BaseFormFilterDoctrine extends sfFormFilterDoctrine
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogArticleFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogArticleFormFilter.class.php
index a525c077a..8eafdb84a 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogArticleFormFilter.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogArticleFormFilter.class.php
@@ -6,7 +6,7 @@
  * @package    symfony12
  * @subpackage filter
  * @author     Your name here
- * @version    SVN: $Id: BlogArticleFormFilter.class.php 23668 2009-11-07 12:51:07Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class BlogArticleFormFilter extends BaseBlogArticleFormFilter
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogArticleTranslationFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogArticleTranslationFormFilter.class.php
index 75c26fda6..8004103aa 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogArticleTranslationFormFilter.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogArticleTranslationFormFilter.class.php
@@ -6,7 +6,7 @@
  * @package    symfony12
  * @subpackage filter
  * @author     Your name here
- * @version    SVN: $Id: BlogArticleTranslationFormFilter.class.php 23668 2009-11-07 12:51:07Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class BlogArticleTranslationFormFilter extends BaseBlogArticleTranslationFormFilter
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogAuthorFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogAuthorFormFilter.class.php
index 2080da107..85bd68ec5 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogAuthorFormFilter.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/BlogAuthorFormFilter.class.php
@@ -6,7 +6,7 @@
  * @package    symfony12
  * @subpackage filter
  * @author     Your name here
- * @version    SVN: $Id: BlogAuthorFormFilter.class.php 23668 2009-11-07 12:51:07Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class BlogAuthorFormFilter extends BaseBlogAuthorFormFilter
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/CamelCaseFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/CamelCaseFormFilter.class.php
index baecfb0e4..acb05d4dc 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/CamelCaseFormFilter.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/CamelCaseFormFilter.class.php
@@ -5,7 +5,7 @@
  *
  * @package    filters
  * @subpackage CamelCase *
- * @version    SVN: $Id: CamelCaseFormFilter.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class CamelCaseFormFilter extends BaseCamelCaseFormFilter
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/DefaultValueTestFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/DefaultValueTestFormFilter.class.php
index fababa59d..4cba6206e 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/DefaultValueTestFormFilter.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/DefaultValueTestFormFilter.class.php
@@ -6,7 +6,7 @@
  * @package    symfony12
  * @subpackage filter
  * @author     Your name here
- * @version    SVN: $Id: DefaultValueTestFormFilter.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class DefaultValueTestFormFilter extends BaseDefaultValueTestFormFilter
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/FormGeneratorTest2FormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/FormGeneratorTest2FormFilter.class.php
index ee32af962..ce99a6636 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/FormGeneratorTest2FormFilter.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/FormGeneratorTest2FormFilter.class.php
@@ -5,7 +5,7 @@
  *
  * @package    filters
  * @subpackage FormGeneratorTest2 *
- * @version    SVN: $Id: FormGeneratorTest2FormFilter.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class FormGeneratorTest2FormFilter extends BaseFormGeneratorTest2FormFilter
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/GroupFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/GroupFormFilter.class.php
index 463e7c038..ff981c13d 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/GroupFormFilter.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/GroupFormFilter.class.php
@@ -5,7 +5,7 @@
  *
  * @package    filters
  * @subpackage Group *
- * @version    SVN: $Id: GroupFormFilter.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class GroupFormFilter extends BaseGroupFormFilter
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/PermissionFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/PermissionFormFilter.class.php
index 218175147..ec19fd45a 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/PermissionFormFilter.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/PermissionFormFilter.class.php
@@ -5,7 +5,7 @@
  *
  * @package    filters
  * @subpackage Permission *
- * @version    SVN: $Id: PermissionFormFilter.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class PermissionFormFilter extends BasePermissionFormFilter
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ProfileFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ProfileFormFilter.class.php
index c47f4f538..997c4f8e5 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ProfileFormFilter.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ProfileFormFilter.class.php
@@ -5,7 +5,7 @@
  *
  * @package    filters
  * @subpackage Profile *
- * @version    SVN: $Id: ProfileFormFilter.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class ProfileFormFilter extends BaseProfileFormFilter
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ResourceTypeFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ResourceTypeFormFilter.class.php
index 7bc61f84f..4e780c937 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ResourceTypeFormFilter.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/ResourceTypeFormFilter.class.php
@@ -6,7 +6,7 @@
  * @package    symfony12
  * @subpackage filter
  * @author     Your name here
- * @version    SVN: $Id: ResourceTypeFormFilter.class.php 27742 2010-02-08 15:46:35Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class ResourceTypeFormFilter extends BaseResourceTypeFormFilter
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/SettingsPlugin/SettingFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/SettingsPlugin/SettingFormFilter.class.php
index 4e4e040bb..89c0f4a38 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/SettingsPlugin/SettingFormFilter.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/SettingsPlugin/SettingFormFilter.class.php
@@ -6,7 +6,7 @@
  * @package    symfony12
  * @subpackage filter
  * @author     Your name here
- * @version    SVN: $Id: SettingFormFilter.class.php 28974 2010-04-04 22:59:54Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class SettingFormFilter extends PluginSettingFormFilter
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/SubscriptionFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/SubscriptionFormFilter.class.php
index 6fc3caffe..0f46e995b 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/SubscriptionFormFilter.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/SubscriptionFormFilter.class.php
@@ -5,7 +5,7 @@
  *
  * @package    filters
  * @subpackage Subscription *
- * @version    SVN: $Id: SubscriptionFormFilter.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class SubscriptionFormFilter extends BaseSubscriptionFormFilter
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/UniqueTestFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/UniqueTestFormFilter.class.php
index 573b878d1..c90ac9908 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/UniqueTestFormFilter.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/UniqueTestFormFilter.class.php
@@ -5,7 +5,7 @@
  *
  * @package    filters
  * @subpackage UniqueTest *
- * @version    SVN: $Id: UniqueTestFormFilter.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class UniqueTestFormFilter extends BaseUniqueTestFormFilter
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/UserFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/UserFormFilter.class.php
index 8c4b14223..d65219ff3 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/UserFormFilter.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/filter/doctrine/UserFormFilter.class.php
@@ -5,7 +5,7 @@
  *
  * @package    filters
  * @subpackage User *
- * @version    SVN: $Id: UserFormFilter.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class UserFormFilter extends BaseUserFormFilter
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/BaseForm.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/BaseForm.class.php
index 4e65c3aba..67942ce19 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/BaseForm.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/BaseForm.class.php
@@ -6,7 +6,7 @@
  * @package    symfony12
  * @subpackage form
  * @author     Your name here
- * @version    SVN: $Id: BaseForm.class.php 18331 2009-05-16 11:13:47Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class BaseForm extends sfFormSymfony
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ArticleForm.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ArticleForm.class.php
index 392f44fae..7dbf91612 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ArticleForm.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ArticleForm.class.php
@@ -5,7 +5,7 @@
  *
  * @package    form
  * @subpackage Article
- * @version    SVN: $Id: ArticleForm.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class ArticleForm extends BaseArticleForm
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ArticleTranslationForm.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ArticleTranslationForm.class.php
index 05f22e958..18227272e 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ArticleTranslationForm.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ArticleTranslationForm.class.php
@@ -5,7 +5,7 @@
  *
  * @package    form
  * @subpackage ArticleTranslation
- * @version    SVN: $Id: ArticleTranslationForm.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class ArticleTranslationForm extends BaseArticleTranslationForm
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AttachmentForm.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AttachmentForm.class.php
index 4dff1510c..711c5199b 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AttachmentForm.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AttachmentForm.class.php
@@ -6,7 +6,7 @@
  * @package    symfony12
  * @subpackage form
  * @author     Your name here
- * @version    SVN: $Id: AttachmentForm.class.php 24971 2009-12-05 15:05:03Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class AttachmentForm extends BaseAttachmentForm
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorForm.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorForm.class.php
index e96aa3bd1..d56840dfe 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorForm.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorForm.class.php
@@ -5,7 +5,7 @@
  *
  * @package    form
  * @subpackage Author
- * @version    SVN: $Id: AuthorForm.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class AuthorForm extends BaseAuthorForm
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorInheritanceConcreteForm.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorInheritanceConcreteForm.class.php
index dd7937cdf..d421feda4 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorInheritanceConcreteForm.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorInheritanceConcreteForm.class.php
@@ -6,7 +6,7 @@
  * @package    symfony12
  * @subpackage form
  * @author     Your name here
- * @version    SVN: $Id: AuthorInheritanceConcreteForm.class.php 22748 2009-10-02 23:19:37Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class AuthorInheritanceConcreteForm extends BaseAuthorInheritanceConcreteForm
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorInheritanceForm.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorInheritanceForm.class.php
index 756d23df2..9fffb50aa 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorInheritanceForm.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/AuthorInheritanceForm.class.php
@@ -5,7 +5,7 @@
  *
  * @package    form
  * @subpackage AuthorInheritance
- * @version    SVN: $Id: AuthorInheritanceForm.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class AuthorInheritanceForm extends BaseAuthorInheritanceForm
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BaseFormDoctrine.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BaseFormDoctrine.class.php
index af986c4fd..2417f3efd 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BaseFormDoctrine.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BaseFormDoctrine.class.php
@@ -4,7 +4,7 @@
  * Project form base class.
  *
  * @package    form
- * @version    SVN: $Id: BaseFormDoctrine.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class BaseFormDoctrine extends sfFormDoctrine
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogArticleForm.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogArticleForm.class.php
index 3ea1a6647..46bb99492 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogArticleForm.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogArticleForm.class.php
@@ -6,7 +6,7 @@
  * @package    symfony12
  * @subpackage form
  * @author     Your name here
- * @version    SVN: $Id: BlogArticleForm.class.php 23668 2009-11-07 12:51:07Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class BlogArticleForm extends BaseBlogArticleForm
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogArticleTranslationForm.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogArticleTranslationForm.class.php
index f964b3879..88a9a50f4 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogArticleTranslationForm.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogArticleTranslationForm.class.php
@@ -6,7 +6,7 @@
  * @package    symfony12
  * @subpackage form
  * @author     Your name here
- * @version    SVN: $Id: BlogArticleTranslationForm.class.php 23668 2009-11-07 12:51:07Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class BlogArticleTranslationForm extends BaseBlogArticleTranslationForm
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogAuthorForm.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogAuthorForm.class.php
index 55e194010..efe04aa7f 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogAuthorForm.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/BlogAuthorForm.class.php
@@ -6,7 +6,7 @@
  * @package    symfony12
  * @subpackage form
  * @author     Your name here
- * @version    SVN: $Id: BlogAuthorForm.class.php 23668 2009-11-07 12:51:07Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class BlogAuthorForm extends BaseBlogAuthorForm
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/CamelCaseForm.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/CamelCaseForm.class.php
index f660bf6ee..342d95844 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/CamelCaseForm.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/CamelCaseForm.class.php
@@ -5,7 +5,7 @@
  *
  * @package    form
  * @subpackage CamelCase
- * @version    SVN: $Id: CamelCaseForm.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class CamelCaseForm extends BaseCamelCaseForm
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/DefaultValueTestForm.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/DefaultValueTestForm.class.php
index 96dcb18ea..769380405 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/DefaultValueTestForm.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/DefaultValueTestForm.class.php
@@ -6,7 +6,7 @@
  * @package    symfony12
  * @subpackage form
  * @author     Your name here
- * @version    SVN: $Id: DefaultValueTestForm.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class DefaultValueTestForm extends BaseDefaultValueTestForm
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/FormGeneratorTestForm.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/FormGeneratorTestForm.class.php
index 0164c627d..d8aca492a 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/FormGeneratorTestForm.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/FormGeneratorTestForm.class.php
@@ -5,7 +5,7 @@
  *
  * @package    form
  * @subpackage FormGeneratorTest
- * @version    SVN: $Id: FormGeneratorTestForm.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class FormGeneratorTestForm extends BaseFormGeneratorTestForm
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/GroupForm.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/GroupForm.class.php
index e2ce4046a..86debc27d 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/GroupForm.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/GroupForm.class.php
@@ -5,7 +5,7 @@
  *
  * @package    form
  * @subpackage Group
- * @version    SVN: $Id: GroupForm.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class GroupForm extends BaseGroupForm
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/PermissionForm.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/PermissionForm.class.php
index 128553bfb..875fc00fe 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/PermissionForm.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/PermissionForm.class.php
@@ -5,7 +5,7 @@
  *
  * @package    form
  * @subpackage Permission
- * @version    SVN: $Id: PermissionForm.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class PermissionForm extends BasePermissionForm
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ProfileForm.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ProfileForm.class.php
index 9977bf41b..dc8d9bdfd 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ProfileForm.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ProfileForm.class.php
@@ -5,7 +5,7 @@
  *
  * @package    form
  * @subpackage Profile
- * @version    SVN: $Id: ProfileForm.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class ProfileForm extends BaseProfileForm
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ResourceTypeForm.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ResourceTypeForm.class.php
index a5aec57d4..013e9b6a1 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ResourceTypeForm.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/ResourceTypeForm.class.php
@@ -6,7 +6,7 @@
  * @package    symfony12
  * @subpackage form
  * @author     Your name here
- * @version    SVN: $Id: ResourceTypeForm.class.php 27742 2010-02-08 15:46:35Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class ResourceTypeForm extends BaseResourceTypeForm
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/SettingsPlugin/SettingForm.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/SettingsPlugin/SettingForm.class.php
index 585e4399b..3b0a25d6a 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/SettingsPlugin/SettingForm.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/SettingsPlugin/SettingForm.class.php
@@ -6,7 +6,7 @@
  * @package    symfony12
  * @subpackage form
  * @author     Your name here
- * @version    SVN: $Id: SettingForm.class.php 28974 2010-04-04 22:59:54Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class SettingForm extends PluginSettingForm
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/SubscriptionForm.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/SubscriptionForm.class.php
index 52d02406c..ef11865e7 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/SubscriptionForm.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/SubscriptionForm.class.php
@@ -5,7 +5,7 @@
  *
  * @package    form
  * @subpackage Subscription
- * @version    SVN: $Id: SubscriptionForm.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class SubscriptionForm extends BaseSubscriptionForm
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/UniqueTestForm.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/UniqueTestForm.class.php
index 54674b35b..6d321ffb7 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/UniqueTestForm.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/UniqueTestForm.class.php
@@ -5,7 +5,7 @@
  *
  * @package    form
  * @subpackage UniqueTest
- * @version    SVN: $Id: UniqueTestForm.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class UniqueTestForm extends BaseUniqueTestForm
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/UserForm.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/UserForm.class.php
index 8f14d4c5b..b9c3cbf29 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/UserForm.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/form/doctrine/UserForm.class.php
@@ -5,7 +5,7 @@
  *
  * @package    form
  * @subpackage User
- * @version    SVN: $Id: UserForm.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class UserForm extends BaseUserForm
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Attachment.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Attachment.class.php
index 0ddd4af52..94e187197 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Attachment.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/Attachment.class.php
@@ -8,7 +8,7 @@
  * @package    symfony12
  * @subpackage model
  * @author     Your name here
- * @version    SVN: $Id: Attachment.class.php 24068 2009-11-17 06:39:35Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class Attachment extends BaseAttachment
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritance.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritance.class.php
index 13d3ea625..f4b193cbd 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritance.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritance.class.php
@@ -8,7 +8,7 @@
  * @package    ##PACKAGE##
  * @subpackage ##SUBPACKAGE##
  * @author     ##NAME## <##EMAIL##>
- * @version    SVN: $Id: AuthorInheritance.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class AuthorInheritance extends BaseAuthorInheritance
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritanceConcrete.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritanceConcrete.class.php
index 070b8e7d5..262f02ef1 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritanceConcrete.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorInheritanceConcrete.class.php
@@ -8,7 +8,7 @@
  * @package    ##PACKAGE##
  * @subpackage ##SUBPACKAGE##
  * @author     ##NAME## <##EMAIL##>
- * @version    SVN: $Id: AuthorInheritanceConcrete.class.php 22748 2009-10-02 23:19:37Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class AuthorInheritanceConcrete extends BaseAuthorInheritanceConcrete
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorTable.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorTable.class.php
index af38d8cc4..a1a748dc1 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorTable.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/AuthorTable.class.php
@@ -15,4 +15,21 @@ public function testTableMethod2(Doctrine_Query $q)
     $q->addWhere('a.id > 0');
     return $q;
   }
-}
\ No newline at end of file
+
+  public function getChoices($limit = null)
+  {
+    $q = $this->createQuery('a');
+    if (null !== $limit)
+    {
+      $q->limit($limit);
+    }
+    $choices = array();
+
+    foreach ($q->fetchArray() as $author)
+    {
+      $choices[$author['id']] = $author['name'];
+    }
+
+    return $choices;
+  }
+}
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/BlogArticle.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/BlogArticle.class.php
index 09e8d5a47..3fea774f4 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/BlogArticle.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/BlogArticle.class.php
@@ -8,7 +8,7 @@
  * @package    symfony12
  * @subpackage model
  * @author     Your name here
- * @version    SVN: $Id: BlogArticle.class.php 23668 2009-11-07 12:51:07Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class BlogArticle extends BaseBlogArticle
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/BlogAuthor.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/BlogAuthor.class.php
index 322dc4862..09aacebad 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/BlogAuthor.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/BlogAuthor.class.php
@@ -8,7 +8,7 @@
  * @package    symfony12
  * @subpackage model
  * @author     Your name here
- * @version    SVN: $Id: BlogAuthor.class.php 23668 2009-11-07 12:51:07Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class BlogAuthor extends BaseBlogAuthor
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/CamelCase.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/CamelCase.class.php
index 52642b350..3d9ad974a 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/CamelCase.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/CamelCase.class.php
@@ -8,7 +8,7 @@
  * @package    ##PACKAGE##
  * @subpackage ##SUBPACKAGE##
  * @author     ##NAME## <##EMAIL##>
- * @version    SVN: $Id: CamelCase.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class CamelCase extends BaseCamelCase
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/DefaultValueTest.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/DefaultValueTest.class.php
index 8d9d0a232..0ffc63b28 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/DefaultValueTest.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/DefaultValueTest.class.php
@@ -8,7 +8,7 @@
  * @package    ##PACKAGE##
  * @subpackage ##SUBPACKAGE##
  * @author     ##NAME## <##EMAIL##>
- * @version    SVN: $Id: DefaultValueTest.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class DefaultValueTest extends BaseDefaultValueTest
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest.class.php
index 3493a6275..3bad4305b 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest.class.php
@@ -8,7 +8,7 @@
  * @package    ##PACKAGE##
  * @subpackage ##SUBPACKAGE##
  * @author     ##NAME## <##EMAIL##>
- * @version    SVN: $Id: FormGeneratorTest.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class FormGeneratorTest extends BaseFormGeneratorTest
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest2.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest2.class.php
index 33e4b8a15..384c1d5e1 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest2.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/FormGeneratorTest2.class.php
@@ -8,7 +8,7 @@
  * @package    ##PACKAGE##
  * @subpackage ##SUBPACKAGE##
  * @author     ##NAME## <##EMAIL##>
- * @version    SVN: $Id: FormGeneratorTest2.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class FormGeneratorTest2 extends BaseFormGeneratorTest2
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ModelFromLinkedSchema.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ModelFromLinkedSchema.class.php
index d6a2a4005..457e52031 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ModelFromLinkedSchema.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ModelFromLinkedSchema.class.php
@@ -8,7 +8,7 @@
  * @package    symfony12
  * @subpackage model
  * @author     Your name here
- * @version    SVN: $Id: ModelFromLinkedSchema.class.php 24970 2009-12-05 14:28:15Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class ModelFromLinkedSchema extends BaseModelFromLinkedSchema
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ResourceType.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ResourceType.class.php
index e9f506743..231764297 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ResourceType.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/ResourceType.class.php
@@ -8,7 +8,7 @@
  * @package    symfony12
  * @subpackage model
  * @author     Your name here
- * @version    SVN: $Id: ResourceType.class.php 27742 2010-02-08 15:46:35Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class ResourceType extends BaseResourceType
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/SettingsPlugin/Setting.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/SettingsPlugin/Setting.class.php
index a812b8760..bab303f28 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/SettingsPlugin/Setting.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/lib/model/doctrine/SettingsPlugin/Setting.class.php
@@ -8,7 +8,7 @@
  * @package    symfony12
  * @subpackage model
  * @author     Your name here
- * @version    SVN: $Id: Setting.class.php 28974 2010-04-04 22:59:54Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class Setting extends PluginSetting
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/filter/doctrine/PluginSettingFormFilter.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/filter/doctrine/PluginSettingFormFilter.class.php
index ac1183fe2..b613761f5 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/filter/doctrine/PluginSettingFormFilter.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/filter/doctrine/PluginSettingFormFilter.class.php
@@ -6,7 +6,7 @@
  * @package    ##PROJECT_NAME##
  * @subpackage filter
  * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: PluginSettingFormFilter.class.php 28974 2010-04-04 22:59:54Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class PluginSettingFormFilter extends BaseSettingFormFilter
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/form/doctrine/PluginSettingForm.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/form/doctrine/PluginSettingForm.class.php
index 6a89a8b0a..437dc9ab3 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/form/doctrine/PluginSettingForm.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/form/doctrine/PluginSettingForm.class.php
@@ -6,7 +6,7 @@
  * @package    ##PROJECT_NAME##
  * @subpackage form
  * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: PluginSettingForm.class.php 28974 2010-04-04 22:59:54Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class PluginSettingForm extends BaseSettingForm
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/model/doctrine/PluginSetting.class.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/model/doctrine/PluginSetting.class.php
index 969f74b6b..1ce1702a7 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/model/doctrine/PluginSetting.class.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/plugins/SettingsPlugin/lib/model/doctrine/PluginSetting.class.php
@@ -8,7 +8,7 @@
  * @package    ##PACKAGE##
  * @subpackage ##SUBPACKAGE##
  * @author     ##NAME## <##EMAIL##>
- * @version    SVN: $Id: PluginSetting.class.php 28974 2010-04-04 22:59:54Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class PluginSetting extends BaseSetting
 {
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/sfDoctrineRecordTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/sfDoctrineRecordTest.php
index 68ec06b6e..95273cd39 100644
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/sfDoctrineRecordTest.php
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/sfDoctrineRecordTest.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -68,15 +68,18 @@
 
 // Test getDateTimeObject()
 $dateTime = $article->getDateTimeObject('created_at');
-$t->is($dateTime instanceof DateTime, true);
-$t->is($dateTime->format('m/d/Y'), date('m/d/Y'));
+$t->is($dateTime, null);
 
 try {
   $article->getDateTimeObject('author_id');
   $t->fail();
-} catch (Exception $e) {
+} catch (sfException $e) {
   $t->pass();
 }
 
 $article->setDateTimeObject('created_at', new DateTime('1985-09-01'));
-$t->is($article->getDateTimeObject('created_at')->format('m/d/Y'), '09/01/1985');
\ No newline at end of file
+$t->is($article->getDateTimeObject('created_at')->format('m/d/Y'), '09/01/1985');
+
+$article->setDateTimeObject('created_at', null);
+$dateTime = $article->getDateTimeObject('created_at');
+$t->is($dateTime, null);
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/unit/autoloaderTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/unit/autoloaderTest.php
deleted file mode 100644
index a97d22e93..000000000
--- a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/unit/autoloaderTest.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-include dirname(__FILE__).'/../bootstrap/unit.php';
-
-$t = new lime_test(1);
-
-$t->ok(class_exists('Doctrine'), 'autoloader loads "Doctrine"');
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineArrayChoiceTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineArrayChoiceTest.php
new file mode 100644
index 000000000..bfadec225
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineArrayChoiceTest.php
@@ -0,0 +1,18 @@
+<?php
+
+$app = 'frontend';
+$fixtures = 'fixtures/fixtures.yml';
+include dirname(__FILE__).'/../../bootstrap/functional.php';
+
+$t = new lime_test(2);
+
+// ->getChoices()
+$t->diag('->getChoices()');
+
+$validator = new sfWidgetFormDoctrineArrayChoice(array('model' => 'Author', 'table_method' => 'getChoices'));
+
+$t->is_deeply($validator->getChoices(), array(1 => 'Jonathan H. Wage', 2 => 'Fabien POTENCIER'), '->getChoices() returns choices');
+
+$validator->setOption('table_method_params', array(1));
+
+$t->is_deeply($validator->getChoices(), array(1 => 'Jonathan H. Wage'), '->getChoices() returns limited choices');
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineChoiceTest.php b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineChoiceTest.php
new file mode 100644
index 000000000..c1661a038
--- /dev/null
+++ b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/unit/widget/sfWidgetFormDoctrineChoiceTest.php
@@ -0,0 +1,28 @@
+<?php
+
+$app = 'frontend';
+$fixtures = 'fixtures/fixtures.yml';
+include dirname(__FILE__).'/../../bootstrap/functional.php';
+
+$t = new lime_test(4);
+
+// ->getChoices()
+$t->diag('->getChoices()');
+
+$validator = new sfWidgetFormDoctrineChoice(array('model' => 'Author'));
+
+$author = Doctrine_Core::getTable('Author')->createQuery()->limit(1)->fetchOne();
+
+$t->is_deeply($validator->getChoices(), array(1 => 'Jonathan H. Wage', 2 => 'Fabien POTENCIER'), '->getChoices() returns choices');
+
+$validator->setOption('order_by', array('name', 'asc'));
+
+$t->cmp_ok($validator->getChoices(), '===', array(2 => 'Fabien POTENCIER', 1 => 'Jonathan H. Wage'), '->getChoices() returns ordered choices');
+
+$validator->setOption('table_method', 'testTableMethod');
+
+$t->is_deeply($validator->getChoices(), array(1 => 'Jonathan H. Wage', 2 => 'Fabien POTENCIER'), '->getChoices() returns choices for given "table_method" option');
+
+$validator = new sfWidgetFormDoctrineChoice(array('model' => 'Author', 'query' => Doctrine_Core::getTable('Author')->createQuery()->limit(1)));
+
+$t->is_deeply($validator->getChoices(), array(1 => 'Jonathan H. Wage'), '->getChoices() returns choices for given "query" option');
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/asc.png b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/asc.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/default.png b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/default.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/delete.png b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/delete.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/desc.png b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/desc.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/edit.png b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/edit.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/error.png b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/error.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/first.png b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/first.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/last.png b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/last.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/list.png b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/list.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/new.png b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/new.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/next.png b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/next.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/previous.png b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/previous.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/tick.png b/lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/web/images/tick.png
old mode 100644
new mode 100755
diff --git a/lib/vendor/symfony/lib/request/sfRequest.class.php b/lib/vendor/symfony/lib/request/sfRequest.class.php
index adb01f4e5..5328e61f5 100644
--- a/lib/vendor/symfony/lib/request/sfRequest.class.php
+++ b/lib/vendor/symfony/lib/request/sfRequest.class.php
@@ -18,15 +18,17 @@
  * @subpackage request
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfRequest.class.php 28641 2010-03-21 10:20:44Z fabien $
+ * @version    SVN: $Id$
  */
 abstract class sfRequest implements ArrayAccess
 {
   const GET    = 'GET';
   const POST   = 'POST';
   const PUT    = 'PUT';
+  const PATCH  = 'PATCH';
   const DELETE = 'DELETE';
   const HEAD   = 'HEAD';
+  const OPTIONS = 'OPTIONS';
 
   protected
     $dispatcher      = null,
@@ -81,6 +83,18 @@ public function initialize(sfEventDispatcher $dispatcher, $parameters = array(),
     $this->attributeHolder->add($attributes);
   }
 
+  /**
+   * Return an option value or null if option does not exists
+   *
+   * @param string $name The option name.
+   *
+   * @return mixed The option value
+   */
+  public function getOption($name)
+  {
+    return isset($this->options[$name]) ? $this->options[$name] : null;
+  }
+
   /**
    * Returns the options.
    *
@@ -135,7 +149,7 @@ public function getMethod()
    */
   public function setMethod($method)
   {
-    if (!in_array(strtoupper($method), array(self::GET, self::POST, self::PUT, self::DELETE, self::HEAD)))
+    if (!in_array(strtoupper($method), array(self::GET, self::POST, self::PUT, self::PATCH, self::DELETE, self::HEAD, self::OPTIONS)))
     {
       throw new sfException(sprintf('Invalid request method: %s.', $method));
     }
@@ -288,12 +302,9 @@ public function setParameter($name, $value)
    */
   public function getContent()
   {
-    if (null === $this->content)
+    if (null === $this->content && '' === trim($this->content = file_get_contents('php://input')))
     {
-      if (0 === strlen(trim($this->content = file_get_contents('php://input'))))
-      {
-        $this->content = false;
-      }
+      $this->content = false;
     }
 
     return $this->content;
diff --git a/lib/vendor/symfony/lib/request/sfWebRequest.class.php b/lib/vendor/symfony/lib/request/sfWebRequest.class.php
index a9b255455..7839899ff 100644
--- a/lib/vendor/symfony/lib/request/sfWebRequest.class.php
+++ b/lib/vendor/symfony/lib/request/sfWebRequest.class.php
@@ -18,14 +18,14 @@
  * @subpackage request
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfWebRequest.class.php 32729 2011-07-05 15:23:04Z www-data $
+ * @version    SVN: $Id$
  */
 class sfWebRequest extends sfRequest
 {
   const
     PORT_HTTP  = 80,
     PORT_HTTPS = 443;
-  
+
   protected
     $languages              = null,
     $charsets               = null,
@@ -70,6 +70,7 @@ public function initialize(sfEventDispatcher $dispatcher, $parameters = array(),
       'http_port'       => null,
       'https_port'      => null,
       'default_format'  => null, // to maintain bc
+      'trust_proxy'     => true, // to maintain bc
     ), $options);
     parent::initialize($dispatcher, $parameters, $attributes, $options);
 
@@ -88,15 +89,15 @@ public function initialize(sfEventDispatcher $dispatcher, $parameters = array(),
           break;
 
         case 'POST':
-          if (isset($_POST['sf_method']))
+          if (isset($postParameters['sf_method']))
           {
-            $this->setMethod(strtoupper($_POST['sf_method']));
+            $this->setMethod(strtoupper($postParameters['sf_method']));
             unset($postParameters['sf_method']);
           }
-          elseif (isset($_GET['sf_method']))
+          elseif (isset($this->getParameters['sf_method']))
           {
-            $this->setMethod(strtoupper($_GET['sf_method']));
-            unset($_GET['sf_method']);
+            $this->setMethod(strtoupper($this->getParameters['sf_method']));
+            unset($this->getParameters['sf_method']);
           }
           else
           {
@@ -113,6 +114,14 @@ public function initialize(sfEventDispatcher $dispatcher, $parameters = array(),
           }
           break;
 
+        case 'PATCH':
+          $this->setMethod(self::PATCH);
+          if ('application/x-www-form-urlencoded' === $this->getContentType())
+          {
+            parse_str($this->getContent(), $postParameters);
+          }
+          break;
+
         case 'DELETE':
           $this->setMethod(self::DELETE);
           if ('application/x-www-form-urlencoded' === $this->getContentType())
@@ -125,6 +134,10 @@ public function initialize(sfEventDispatcher $dispatcher, $parameters = array(),
           $this->setMethod(self::HEAD);
           break;
 
+        case 'OPTIONS':
+          $this->setMethod(self::OPTIONS);
+          break;
+
         default:
           $this->setMethod(self::GET);
       }
@@ -138,9 +151,9 @@ public function initialize(sfEventDispatcher $dispatcher, $parameters = array(),
     $this->postParameters = get_magic_quotes_gpc() ? sfToolkit::stripslashesDeep($postParameters) : $postParameters;
     $this->parameterHolder->add($this->postParameters);
 
-    if (isset($this->options['formats']))
+    if ($formats = $this->getOption('formats'))
     {
-      foreach ($this->options['formats'] as $format => $mimeTypes)
+      foreach ($formats as $format => $mimeTypes)
       {
         $this->setFormat($format, $mimeTypes);
       }
@@ -182,7 +195,7 @@ public function getUri()
     $pathArray = $this->getPathInfoArray();
 
     // for IIS with rewrite module (IIFR, ISAPI Rewrite, ...)
-    if ('HTTP_X_REWRITE_URL' == $this->options['path_info_key'])
+    if ('HTTP_X_REWRITE_URL' == $this->getOption('path_info_key'))
     {
       $uri = isset($pathArray['HTTP_X_REWRITE_URL']) ? $pathArray['HTTP_X_REWRITE_URL'] : '';
     }
@@ -203,7 +216,7 @@ public function isAbsUri()
   {
     $pathArray = $this->getPathInfoArray();
 
-    return isset($pathArray['REQUEST_URI']) ? preg_match('/^http/', $pathArray['REQUEST_URI']) : false;
+    return isset($pathArray['REQUEST_URI']) ? 0 === strpos($pathArray['REQUEST_URI'], 'http') : false;
   }
 
   /**
@@ -225,9 +238,9 @@ public function getUriPrefix()
     {
       list($host, $port) = explode(':', $host, 2);
     }
-    else if (isset($this->options[$protocol.'_port']))
+    else if ($protocolPort = $this->getOption($protocol.'_port'))
     {
-      $port = $this->options[$protocol.'_port'];
+      $port = $protocolPort;
     }
     else if (isset($pathArray['SERVER_PORT']))
     {
@@ -238,7 +251,7 @@ public function getUriPrefix()
     // a secure one and whether the introspected port matches the standard one
     if ($this->isForwardedSecure())
     {
-      $port = isset($this->options['https_port']) && self::PORT_HTTPS != $this->options['https_port'] ? $this->options['https_port'] : null;
+      $port = self::PORT_HTTPS != $this->getOption('https_port') ? $this->getOption('https_port') : null;
     }
     elseif (($secure && self::PORT_HTTPS == $port) || (!$secure && self::PORT_HTTP == $port))
     {
@@ -256,11 +269,11 @@ public function getUriPrefix()
   public function getPathInfo()
   {
     $pathInfo = '';
+
     $pathArray = $this->getPathInfoArray();
-    $isIis = (isset($pathArray['SERVER_SOFTWARE']) && false !== stripos($pathArray['SERVER_SOFTWARE'], 'iis'));
 
     // simulate PATH_INFO if needed
-    $sf_path_info_key = $this->options['path_info_key'];
+    $sf_path_info_key = $this->getOption('path_info_key');
     if (!isset($pathArray[$sf_path_info_key]) || !$pathArray[$sf_path_info_key])
     {
       if (isset($pathArray['REQUEST_URI']))
@@ -278,14 +291,14 @@ public function getPathInfo()
     else
     {
       $pathInfo = $pathArray[$sf_path_info_key];
-      if ($isIis && $relativeUrlRoot = $this->getRelativeUrlRoot())
+      if ($relativeUrlRoot = $this->getRelativeUrlRoot())
       {
         $pathInfo = preg_replace('/^'.str_replace('/', '\\/', $relativeUrlRoot).'\//', '', $pathInfo);
       }
     }
 
     // for IIS
-    if ($isIis && $pos = stripos($pathInfo, '.php'))
+    if (isset($_SERVER['SERVER_SOFTWARE']) && false !== stripos($_SERVER['SERVER_SOFTWARE'], 'iis') && $pos = stripos($pathInfo, '.php'))
     {
       $pathInfo = substr($pathInfo, $pos + 4);
     }
@@ -298,11 +311,16 @@ public function getPathInfo()
     return $pathInfo;
   }
 
+  /**
+   * Returns the relative url root if defined computed with script name if defined
+   *
+   * @return string The path info prefix
+   */
   public function getPathInfoPrefix()
   {
     $prefix = $this->getRelativeUrlRoot();
 
-    if (!isset($this->options['no_script_name']) || !$this->options['no_script_name'])
+    if (!$this->getOption('no_script_name'))
     {
       $scriptName = $this->getScriptName();
       $prefix = null === $prefix ? $scriptName : $prefix.'/'.basename($scriptName);
@@ -311,22 +329,42 @@ public function getPathInfoPrefix()
     return $prefix;
   }
 
+  /**
+   * Gets GET parameters from request
+   *
+   * @return array
+   */
   public function getGetParameters()
   {
     return $this->getParameters;
   }
 
+  /**
+   * Gets POST parameters from request
+   *
+   * @return array
+   */
   public function getPostParameters()
   {
     return $this->postParameters;
   }
 
+  /**
+   * Gets REQUEST parameters from request
+   *
+   * @return array
+   */
   public function getRequestParameters()
   {
     return $this->requestParameters;
   }
 
-  public function addRequestParameters($parameters)
+  /**
+   * Add fixed REQUEST parameters
+   *
+   * @param array $parameters
+   */
+  public function addRequestParameters(array $parameters)
   {
     $this->requestParameters = array_merge($this->requestParameters, $parameters);
     $this->getParameterHolder()->add($parameters);
@@ -355,16 +393,14 @@ public function getHost()
   {
     $pathArray = $this->getPathInfoArray();
 
-    if (isset($pathArray['HTTP_X_FORWARDED_HOST']))
+    if ($this->getOption('trust_proxy') && isset($pathArray['HTTP_X_FORWARDED_HOST']))
     {
       $elements = explode(',', $pathArray['HTTP_X_FORWARDED_HOST']);
 
       return trim($elements[count($elements) - 1]);
     }
-    else
-    {
-      return isset($pathArray['HTTP_HOST']) ? $pathArray['HTTP_HOST'] : '';
-    }
+
+    return isset($pathArray['HTTP_HOST']) ? $pathArray['HTTP_HOST'] : '';
   }
 
   /**
@@ -437,7 +473,7 @@ public function getLanguages()
     $languages = $this->splitHttpAcceptHeader($_SERVER['HTTP_ACCEPT_LANGUAGE']);
     foreach ($languages as $lang)
     {
-      if (strstr($lang, '-'))
+      if (false !== strpos($lang, '-'))
       {
         $codes = explode('-', $lang);
         if ($codes[0] == 'i')
@@ -529,6 +565,13 @@ public function isXmlHttpRequest()
     return ($this->getHttpHeader('X_REQUESTED_WITH') == 'XMLHttpRequest');
   }
 
+  /**
+   * Gets the value of HTTP header
+   *
+   * @param string $nameThe HTTP header name
+   * @param string $prefix The HTTP header prefix
+   * @return string The value of HTTP header
+   */
   public function getHttpHeader($name, $prefix = 'http')
   {
     if ($prefix)
@@ -536,7 +579,7 @@ public function getHttpHeader($name, $prefix = 'http')
       $prefix = strtoupper($prefix).'_';
     }
 
-    $name = $prefix.strtoupper(strtr($name, '-', '_'));
+    $name = $prefix.strtoupper(str_replace('-', '_', $name));
 
     $pathArray = $this->getPathInfoArray();
 
@@ -544,12 +587,12 @@ public function getHttpHeader($name, $prefix = 'http')
   }
 
   /**
-   * Gets a cookie value.
+   * Gets the value of a cookie.
    *
    * @param  string $name          Cookie name
    * @param  string $defaultValue  Default value returned when no cookie with given name is found
    *
-   * @return mixed
+   * @return string The cookie value
    */
   public function getCookie($name, $defaultValue = null)
   {
@@ -573,11 +616,11 @@ public function isSecure()
     $pathArray = $this->getPathInfoArray();
 
     return
-      (isset($pathArray['HTTPS']) && ('on' == strtolower($pathArray['HTTPS']) || 1 == $pathArray['HTTPS']))
+      (isset($pathArray['HTTPS']) && (('on' == strtolower($pathArray['HTTPS']) || 1 == $pathArray['HTTPS'])))
       ||
-      (isset($pathArray['HTTP_SSL_HTTPS']) && ('on' == strtolower($pathArray['HTTP_SSL_HTTPS']) || 1 == $pathArray['HTTP_SSL_HTTPS']))
+      ($this->getOption('trust_proxy') && isset($pathArray['HTTP_SSL_HTTPS']) && (('on' == strtolower($pathArray['HTTP_SSL_HTTPS']) || 1 == $pathArray['HTTP_SSL_HTTPS'])))
       ||
-      $this->isForwardedSecure()
+      ($this->getOption('trust_proxy') && $this->isForwardedSecure())
     ;
   }
 
@@ -602,14 +645,10 @@ public function getRelativeUrlRoot()
   {
     if (null === $this->relativeUrlRoot)
     {
-      if (!isset($this->options['relative_url_root']))
+      if (!($this->relativeUrlRoot = $this->getOption('relative_url_root')))
       {
         $this->relativeUrlRoot = preg_replace('#/[^/]+\.php5?$#', '', $this->getScriptName());
       }
-      else
-      {
-        $this->relativeUrlRoot = $this->options['relative_url_root'];
-      }
     }
 
     return $this->relativeUrlRoot;
@@ -633,12 +672,13 @@ public function setRelativeUrlRoot($value)
   public function splitHttpAcceptHeader($header)
   {
     $values = array();
+    $groups = array();
     foreach (array_filter(explode(',', $header)) as $value)
     {
       // Cut off any q-value that might come after a semi-colon
       if ($pos = strpos($value, ';'))
       {
-        $q     = (float) trim(substr($value, strpos($value, '=') + 1));
+        $q     = trim(substr($value, strpos($value, '=') + 1));
         $value = substr($value, 0, $pos);
       }
       else
@@ -646,15 +686,20 @@ public function splitHttpAcceptHeader($header)
         $q = 1;
       }
 
-      if (0 < $q)
-      {
-        $values[trim($value)] = $q;
-      }
+      $groups[$q][] = $value;
     }
 
-    arsort($values);
+    krsort($groups);
 
-    return array_keys($values);
+    foreach ($groups as $q => $items) {
+      if (0 < $q) {
+        foreach ($items as $value) {
+          $values[] = trim($value);
+        }
+      }
+    }
+
+    return $values;
   }
 
   /**
@@ -669,7 +714,7 @@ public function getPathInfoArray()
     if (!$this->pathInfoArray)
     {
       // parse PATH_INFO
-      switch ($this->options['path_info_array'])
+      switch ($this->getOption('path_info_array'))
       {
         case 'SERVER':
           $this->pathInfoArray =& $_SERVER;
@@ -752,7 +797,7 @@ public function getRequestFormat()
   {
     if (null === $this->format)
     {
-      $this->setRequestFormat($this->getParameter('sf_format', $this->options['default_format']));
+      $this->setRequestFormat($this->getParameter('sf_format', $this->getOption('default_format')));
     }
 
     return $this->format;
@@ -794,7 +839,14 @@ static public function convertFileInformation(array $taintedFiles)
     return $files;
   }
 
-  static protected function fixPhpFilesArray($data)
+  /**
+   * Fixes PHP files array
+   *
+   * @param array $data The PHP files
+   *
+   * @return array The fixed PHP files array
+   */
+  static protected function fixPhpFilesArray(array $data)
   {
     $fileKeys = array('error', 'name', 'size', 'tmp_name', 'type');
     $keys = array_keys($data);
@@ -919,6 +971,38 @@ public function getForwardedFor()
     return explode(', ', $pathInfo['HTTP_X_FORWARDED_FOR']);
   }
 
+  /**
+   * Returns the client IP address that made the request.
+   *
+   * @param  boolean $proxy Whether the current request has been made behind a proxy or not
+   *
+   * @return string Client IP(s)
+   */
+  public function getClientIp($proxy = true)
+  {
+    if ($proxy)
+    {
+      $pathInfo = $this->getPathInfoArray();
+
+      if (isset($pathInfo["HTTP_CLIENT_IP"]) && ($ip = $pathInfo["HTTP_CLIENT_IP"]))
+      {
+        return $ip;
+      }
+
+      if ($this->getOption('trust_proxy') && ($ip = $this->getForwardedFor()))
+      {
+        return isset($ip[0]) ? trim($ip[0]) : '';
+      }
+    }
+
+    return $this->getRemoteAddress();
+  }
+
+  /**
+   * Check CSRF protection
+   *
+   * @throws <b>sfValidatorErrorSchema</b> If an error occurs while validating the CRF protection for this sfRequest
+   */
   public function checkCSRFProtection()
   {
     $form = new BaseForm();
@@ -960,9 +1044,11 @@ public function getRequestContext()
     );
   }
 
+  /**
+   * Move symfony parameters to attributes (parameters prefixed with _sf_)
+   */
   protected function fixParameters()
   {
-    // move symfony parameters to attributes (parameters prefixed with _sf_)
     foreach ($this->parameterHolder->getAll() as $key => $value)
     {
       if (0 === stripos($key, '_sf_'))
diff --git a/lib/vendor/symfony/lib/response/sfResponse.class.php b/lib/vendor/symfony/lib/response/sfResponse.class.php
index 44e73b4e8..0525ae584 100644
--- a/lib/vendor/symfony/lib/response/sfResponse.class.php
+++ b/lib/vendor/symfony/lib/response/sfResponse.class.php
@@ -15,7 +15,7 @@
  * @package    symfony
  * @subpackage response
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfResponse.class.php 14598 2009-01-11 09:32:32Z dwhittle $
+ * @version    SVN: $Id$
  */
 abstract class sfResponse implements Serializable
 {
diff --git a/lib/vendor/symfony/lib/response/sfWebResponse.class.php b/lib/vendor/symfony/lib/response/sfWebResponse.class.php
index 627b72236..dcac761d6 100644
--- a/lib/vendor/symfony/lib/response/sfWebResponse.class.php
+++ b/lib/vendor/symfony/lib/response/sfWebResponse.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage response
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWebResponse.class.php 31399 2010-11-15 16:48:22Z fabien $
+ * @version    SVN: $Id$
  */
 class sfWebResponse extends sfResponse
 {
@@ -395,6 +395,12 @@ public function send()
   {
     $this->sendHttpHeaders();
     $this->sendContent();
+
+    if (function_exists('fastcgi_finish_request'))
+    {
+      $this->dispatcher->notify(new sfEvent($this, 'response.fastcgi_finish_request'));
+      fastcgi_finish_request();
+    }
   }
 
   /**
@@ -406,7 +412,7 @@ public function send()
    */
   protected function normalizeHeaderName($name)
   {
-    return preg_replace('/\-(.)/e', "'-'.strtoupper('\\1')", strtr(ucfirst(strtolower($name)), '_', '-'));
+    return strtr(ucwords(strtr(strtolower($name), array('_' => ' ', '-' => ' '))), array(' ' => '-'));
   }
 
   /**
@@ -479,7 +485,7 @@ public function addCacheControlHttpHeader($name, $value = null)
         $currentHeaders[$tmp[0]] = isset($tmp[1]) ? $tmp[1] : null;
       }
     }
-    $currentHeaders[strtr(strtolower($name), '_', '-')] = $value;
+    $currentHeaders[str_replace('_', '-', strtolower($name))] = $value;
 
     $headers = array();
     foreach ($currentHeaders as $key => $value)
@@ -587,6 +593,32 @@ public function getTitle()
     return isset($this->metas['title']) ? $this->metas['title'] : '';
   }
 
+  /**
+   * Preprend title
+   *
+   * @param string  $title      Title name
+   * @param string  $separator  Separator string (default: " - ")
+   * @param boolean $escape     true, for escaping the title
+   */
+  public function prependTitle($title, $separator = ' - ', $escape = true)
+  {
+    if (!isset($this->metas['title']))
+    {
+      $this->setTitle($title);
+
+      return;
+    }
+
+    // FIXME: If you use the i18n layer and escape the data here, it won't work
+    // see include_metas() in AssetHelper
+    if ($escape)
+    {
+      $title = htmlspecialchars($title, ENT_QUOTES, $this->options['charset']);
+    }
+
+    $this->metas['title'] = $title.$separator.$this->metas['title'];
+  }
+
   /**
    * Sets title for the current web response.
    *
@@ -670,6 +702,17 @@ public function removeStylesheet($file)
     }
   }
 
+  /**
+   * Clear all previously added stylesheets
+   */
+  public function clearStylesheets()
+  {
+    foreach (array_keys($this->getStylesheets()) as $file)
+    {
+      $this->removeStylesheet($file);
+    }
+  }
+
   /**
    * Retrieves javascript files from the current web response.
    *
@@ -732,6 +775,17 @@ public function removeJavascript($file)
     }
   }
 
+  /**
+   * Clear all previously added javascripts
+   */
+  public function clearJavascripts()
+  {
+    foreach (array_keys($this->getJavascripts()) as $file)
+    {
+      $this->removeJavascript($file);
+    }
+  }
+
   /**
    * Retrieves slots from the current web response.
    *
@@ -796,7 +850,9 @@ public function copyProperties(sfWebResponse $response)
     $this->javascripts = $response->getJavascripts(self::RAW);
     $this->slots       = $response->getSlots();
 
-    $this->options['http_protocol'] = 'HTTP/1.1';
+    // HTTP protocol must be from the current request
+    // this fix is not nice but that's the only way to fix it and keep BC (see #9254)
+    $this->options['http_protocol'] = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0';
   }
 
   /**
diff --git a/lib/vendor/symfony/lib/routing/sfObjectRoute.class.php b/lib/vendor/symfony/lib/routing/sfObjectRoute.class.php
index 5e5b2bae5..4dc5473ad 100644
--- a/lib/vendor/symfony/lib/routing/sfObjectRoute.class.php
+++ b/lib/vendor/symfony/lib/routing/sfObjectRoute.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage routing
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfObjectRoute.class.php 20784 2009-08-04 20:53:57Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfObjectRoute extends sfRequestRoute
 {
diff --git a/lib/vendor/symfony/lib/routing/sfObjectRouteCollection.class.php b/lib/vendor/symfony/lib/routing/sfObjectRouteCollection.class.php
index 034c41340..3b5d46c8b 100644
--- a/lib/vendor/symfony/lib/routing/sfObjectRouteCollection.class.php
+++ b/lib/vendor/symfony/lib/routing/sfObjectRouteCollection.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage routing
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfObjectRouteCollection.class.php 32654 2011-06-15 18:58:43Z fabien $
+ * @version    SVN: $Id$
  */
 class sfObjectRouteCollection extends sfRouteCollection
 {
@@ -34,7 +34,7 @@ public function __construct(array $options)
     {
       throw new InvalidArgumentException(sprintf('You must pass a "model" option to %s ("%s" route)', get_class($this), $this->options['name']));
     }
-    
+
     $this->options = array_merge(array(
       'actions'              => false,
       'module'               => $this->options['name'],
@@ -47,7 +47,7 @@ public function __construct(array $options)
       'with_wildcard_routes' => false,
       'default_params'   => array(),
     ), $this->options);
-    
+
     $this->options['requirements'] = array_merge(array($this->options['column'] => 'id' == $this->options['column'] ? '\d+' : null), $this->options['requirements']);
     $this->options['model_methods'] = array_merge(array('list' => null, 'object' => null), $this->options['model_methods']);
 
diff --git a/lib/vendor/symfony/lib/routing/sfPatternRouting.class.php b/lib/vendor/symfony/lib/routing/sfPatternRouting.class.php
index d457c1928..3479c7d61 100644
--- a/lib/vendor/symfony/lib/routing/sfPatternRouting.class.php
+++ b/lib/vendor/symfony/lib/routing/sfPatternRouting.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage routing
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPatternRouting.class.php 32845 2011-07-28 11:50:48Z fabien $
+ * @version    SVN: $Id$
  */
 class sfPatternRouting extends sfRouting
 {
@@ -24,7 +24,6 @@ class sfPatternRouting extends sfRouting
     $currentRouteName   = null,
     $currentInternalUri = array(),
     $routes             = array(),
-    $defaultParamsDirty = false,
     $cacheData          = array(),
     $cacheChanged       = false;
 
@@ -77,7 +76,7 @@ public function initialize(sfEventDispatcher $dispatcher, sfCache $cache = null,
    */
   public function loadConfiguration()
   {
-    if ($this->options['load_configuration'] && $config = $this->getConfigFilename())
+    if ($this->options['load_configuration'] && $config = $this->getConfigFileName())
     {
       include($config);
     }
@@ -86,37 +85,35 @@ public function loadConfiguration()
   }
 
   /**
-   * Added for better performance. We need to ensure that changed default parameters
-   * are set, but resetting them everytime wastes many cpu cycles
+   * @see sfRouting
    */
-  protected function ensureDefaultParametersAreSet()
+  public function setDefaultParameter($key, $value)
   {
-    if ($this->defaultParamsDirty)
+    parent::setDefaultParameter($key, $value);
+
+    foreach ($this->routes as $route)
     {
-      foreach ($this->routes as $route)
+      if (is_object($route))
       {
         $route->setDefaultParameters($this->defaultParameters);
       }
-      $this->defaultParamsDirty = false;
     }
   }
 
-  /**
-   * @see sfRouting
-   */
-  public function setDefaultParameter($key, $value)
-  {
-    parent::setDefaultParameter($key, $value);
-    $this->defaultParamsDirty = true;
-  }
-
   /**
    * @see sfRouting
    */
   public function setDefaultParameters($parameters)
   {
     parent::setDefaultParameters($parameters);
-    $this->defaultParamsDirty = true;
+
+    foreach ($this->routes as $route)
+    {
+      if (is_object($route))
+      {
+        $route->setDefaultParameters($this->defaultParameters);
+      }
+    }
   }
 
   protected function getConfigFileName()
@@ -150,6 +147,27 @@ public function getRoutes()
     return $this->routes;
   }
 
+  /**
+   * @see  sfRouting
+   */
+  public function getRoute($name)
+  {
+    if (!array_key_exists($name, $this->routes))
+    {
+      throw new sfException(sprintf('Route "%s" is not defined.', $name));
+    }
+
+    $route = $this->routes[$name];
+
+    if (is_string($route))
+    {
+      $this->routes[$name] = $route = unserialize($route);
+      $route->setDefaultParameters($this->defaultParameters);
+    }
+
+    return $route;
+  }
+
   /**
    * @see sfRouting
    */
@@ -191,7 +209,7 @@ public function clearRoutes()
    */
   public function hasRouteName($name)
   {
-    return isset($this->routes[$name]) ? true : false;
+    return array_key_exists($name, $this->routes);
   }
 
   /**
@@ -294,8 +312,8 @@ public function generate($name, $params = array(), $absolute = false)
     // fetch from cache
     if (null !== $this->cache)
     {
-      $cacheKey = 'generate_'.$name.'_'.md5(serialize(array_merge($this->defaultParameters, $params))).'_'.md5(serialize($this->options['context']));
-      if ($this->options['lookup_cache_dedicated_keys'] && $url = $this->cache->get('symfony.routing.data.'.$cacheKey))
+      $cacheKey = $this->getGenerateCacheKey($name, (array) $params);
+      if ($this->options['lookup_cache_dedicated_keys'] && $url = $this->cache->get($cacheKey))
       {
         return $this->fixGeneratedUrl($url, $absolute);
       }
@@ -307,13 +325,7 @@ public function generate($name, $params = array(), $absolute = false)
 
     if ($name)
     {
-      // named route
-      if (!isset($this->routes[$name]))
-      {
-        throw new sfConfigurationException(sprintf('The route "%s" does not exist.', $name));
-      }
-      $route = $this->routes[$name];
-      $this->ensureDefaultParametersAreSet();
+      $route = $this->getRoute($name);
     }
     else
     {
@@ -331,7 +343,7 @@ public function generate($name, $params = array(), $absolute = false)
     {
       if ($this->options['lookup_cache_dedicated_keys'])
       {
-        $this->cache->set('symfony.routing.data.'.$cacheKey, $url);
+        $this->cache->set($cacheKey, $url);
       }
       else
       {
@@ -343,6 +355,11 @@ public function generate($name, $params = array(), $absolute = false)
     return $this->fixGeneratedUrl($url, $absolute);
   }
 
+  protected function getGenerateCacheKey($name, $params)
+  {
+    return 'generate_'.$name.'_'.md5(serialize(array_merge($this->defaultParameters, $params))).'_'.md5(serialize($this->options['context']));
+  }
+
   /**
    * @see sfRouting
    */
@@ -364,9 +381,7 @@ public function parse($url)
     // store the current internal URI
     $this->updateCurrentInternalUri($info['name'], $info['parameters']);
 
-    $route = $this->routes[$info['name']];
-
-    $this->ensureDefaultParametersAreSet();
+    $route = $this->getRoute($info['name']);
 
     $route->bind($this->options['context'], $info['parameters']);
     $info['parameters']['_sf_route'] = $route;
@@ -418,8 +433,8 @@ public function findRoute($url)
     // fetch from cache
     if (null !== $this->cache)
     {
-      $cacheKey = 'parse_'.$url.'_'.md5(serialize($this->options['context']));
-      if ($this->options['lookup_cache_dedicated_keys'] && $info = $this->cache->get('symfony.routing.data.'.$cacheKey))
+      $cacheKey = $this->getParseCacheKey($url);
+      if ($this->options['lookup_cache_dedicated_keys'] && $info = $this->cache->get($cacheKey))
       {
         return unserialize($info);
       }
@@ -436,7 +451,7 @@ public function findRoute($url)
     {
       if ($this->options['lookup_cache_dedicated_keys'])
       {
-        $this->cache->set('symfony.routing.data.'.$cacheKey, serialize($info));
+        $this->cache->set($cacheKey, serialize($info));
       }
       else
       {
@@ -448,6 +463,11 @@ public function findRoute($url)
     return $info;
   }
 
+  protected function getParseCacheKey($url)
+  {
+    return 'parse_'.$url.'_'.md5(serialize($this->options['context']));
+  }
+
   static public function flattenRoutes($routes)
   {
     $flattenRoutes = array();
@@ -468,9 +488,10 @@ static public function flattenRoutes($routes)
 
   protected function getRouteThatMatchesUrl($url)
   {
-    $this->ensureDefaultParametersAreSet();
     foreach ($this->routes as $name => $route)
     {
+      $route = $this->getRoute($name);
+
       if (false === $parameters = $route->matchesUrl($url, $this->options['context']))
       {
         continue;
@@ -484,9 +505,10 @@ protected function getRouteThatMatchesUrl($url)
 
   protected function getRouteThatMatchesParameters($parameters)
   {
-    $this->ensureDefaultParametersAreSet();
-    foreach ($this->routes as $route)
+    foreach ($this->routes as $name => $route)
     {
+      $route = $this->getRoute($name);
+
       if ($route->matchesParameters($parameters, $this->options['context']))
       {
         return $route;
diff --git a/lib/vendor/symfony/lib/routing/sfRequestRoute.class.php b/lib/vendor/symfony/lib/routing/sfRequestRoute.class.php
index 55d89fb6a..d99559fd8 100644
--- a/lib/vendor/symfony/lib/routing/sfRequestRoute.class.php
+++ b/lib/vendor/symfony/lib/routing/sfRequestRoute.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage routing
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfRequestRoute.class.php 20784 2009-08-04 20:53:57Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfRequestRoute extends sfRoute
 {
diff --git a/lib/vendor/symfony/lib/routing/sfRoute.class.php b/lib/vendor/symfony/lib/routing/sfRoute.class.php
index c86c6b8c5..ae9a1b98e 100644
--- a/lib/vendor/symfony/lib/routing/sfRoute.class.php
+++ b/lib/vendor/symfony/lib/routing/sfRoute.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage routing
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfRoute.class.php 32652 2011-06-15 17:44:19Z fabien $
+ * @version    SVN: $Id$
  */
 class sfRoute implements Serializable
 {
@@ -232,7 +232,7 @@ public function generate($params, $context = array(), $absolute = false)
     {
       // replace variables
       $variables = $this->variables;
-      uasort($variables, create_function('$a, $b', 'return strlen($a) < strlen($b);'));
+      uasort($variables, array('sfRoute', 'generateCompareVarsByStrlen'));
       foreach ($variables as $variable => $value)
       {
         $url = str_replace($value, urlencode($tparams[$variable]), $url);
@@ -259,6 +259,11 @@ public function generate($params, $context = array(), $absolute = false)
     return $url;
   }
 
+  static private function generateCompareVarsByStrlen($a, $b)
+  {
+    return strlen($a) < strlen($b);
+  }
+
   /**
    * Generates a URL for the given parameters by using the route tokens.
    *
diff --git a/lib/vendor/symfony/lib/routing/sfRouteCollection.class.php b/lib/vendor/symfony/lib/routing/sfRouteCollection.class.php
index e332f0f48..ee0117185 100644
--- a/lib/vendor/symfony/lib/routing/sfRouteCollection.class.php
+++ b/lib/vendor/symfony/lib/routing/sfRouteCollection.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage routing
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfRouteCollection.class.php 29491 2010-05-17 13:10:55Z fabien $
+ * @version    SVN: $Id$
  */
 class sfRouteCollection implements Iterator
 {
diff --git a/lib/vendor/symfony/lib/routing/sfRouting.class.php b/lib/vendor/symfony/lib/routing/sfRouting.class.php
index 7bfa7dc85..dde440549 100644
--- a/lib/vendor/symfony/lib/routing/sfRouting.class.php
+++ b/lib/vendor/symfony/lib/routing/sfRouting.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage routing
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfRouting.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class sfRouting
 {
@@ -131,6 +131,15 @@ abstract public function getCurrentInternalUri($with_route_name = false);
    */
   abstract public function getRoutes();
 
+  /**
+   * Gets route from given name
+   *
+   * @param  string $name The route name
+   *
+   * @return sfRoute
+   */
+  abstract public function getRoute($name);
+
   /**
    * Sets the compiled route array.
    *
diff --git a/lib/vendor/symfony/lib/service/sfServiceContainer.class.php b/lib/vendor/symfony/lib/service/sfServiceContainer.class.php
new file mode 100644
index 000000000..83964ea47
--- /dev/null
+++ b/lib/vendor/symfony/lib/service/sfServiceContainer.class.php
@@ -0,0 +1,223 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * sfServiceContainer is a dependency injection container.
+ *
+ * It gives access to object instances (services), and parameters.
+ *
+ * Services and parameters are simple key/pair stores.
+ *
+ * Parameters keys are case insensitive.
+ *
+ * A service id can contain lowercased letters, digits, underscores, and dots.
+ * Underscores are used to separate words, and dots to group services
+ * under namespaces:
+ *
+ * <ul>
+ *   <li>request</li>
+ *   <li>mysql_session_storage</li>
+ *   <li>symfony.mysql_session_storage</li>
+ * </ul>
+ *
+ * A service can also be defined by creating a method named
+ * getXXXService(), where XXX is the camelized version of the id:
+ *
+ * <ul>
+ *   <li>request -> getRequestService()</li>
+ *   <li>mysql_session_storage -> getMysqlSessionStorageService()</li>
+ *   <li>symfony.mysql_session_storage -> getSymfony_MysqlSessionStorageService()</li>
+ * </ul>
+ *
+ * @package    symfony
+ * @subpackage service
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ * @version    SVN: $Id$
+ */
+class sfServiceContainer implements sfServiceContainerInterface
+{
+  protected
+    $serviceIds = array(),
+    $parameters = array(),
+    $services   = array(),
+    $count      = 0;
+
+  /**
+   * Constructor.
+   *
+   * @param array $parameters An array of parameters
+   */
+  public function __construct(array $parameters = array())
+  {
+    $this->setParameters($parameters);
+    $this->setService('service_container', $this);
+  }
+
+  /**
+   * Sets the service container parameters.
+   *
+   * @param array $parameters An array of parameters
+   */
+  public function setParameters(array $parameters)
+  {
+    $this->parameters = array();
+    foreach ($parameters as $key => $value)
+    {
+      $this->parameters[strtolower($key)] = $value;
+    }
+  }
+
+  /**
+   * Adds parameters to the service container parameters.
+   *
+   * @param array $parameters An array of parameters
+   */
+  public function addParameters(array $parameters)
+  {
+    $this->setParameters(array_merge($this->parameters, $parameters));
+  }
+
+  /**
+   * Gets the service container parameters.
+   *
+   * @return array An array of parameters
+   */
+  public function getParameters()
+  {
+    return $this->parameters;
+  }
+
+  /**
+   * Gets a service container parameter.
+   *
+   * @param  string $name The parameter name
+   *
+   * @return mixed  The parameter value
+   *
+   * @throw  InvalidArgumentException if the parameter is not defined
+   */
+  public function getParameter($name)
+  {
+    if ($this->hasParameter($name))
+    {
+      return $this->parameters[strtolower($name)];
+    }
+
+    if (sfConfig::has($name))
+    {
+      return sfConfig::get($name);
+    }
+
+    throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
+  }
+
+  /**
+   * Sets a service container parameter.
+   *
+   * @param string $name       The parameter name
+   * @param mixed  $parameters The parameter value
+   */
+  public function setParameter($name, $value)
+  {
+    $this->parameters[strtolower($name)] = $value;
+  }
+
+  /**
+   * Returns true if a parameter name is defined.
+   *
+   * @param  string  $name       The parameter name
+   *
+   * @return Boolean true if the parameter name is defined, false otherwise
+   */
+  public function hasParameter($name)
+  {
+    return array_key_exists(strtolower($name), $this->parameters);
+  }
+
+  /**
+   * Sets a service.
+   *
+   * @param string $id      The service identifier
+   * @param object $service The service instance
+   */
+  public function setService($id, $service)
+  {
+    $this->services[$id] = $service;
+  }
+
+  /**
+   * Returns true if the given service is defined.
+   *
+   * @param  string  $id      The service identifier
+   *
+   * @return Boolean true if the service is defined, false otherwise
+   */
+  public function hasService($id)
+  {
+    return isset($this->services[$id]) || method_exists($this, 'get'.self::camelize($id).'Service');
+  }
+
+  /**
+   * Gets a service.
+   *
+   * If a service is both defined through a setService() method and
+   * with a set*Service() method, the former has always precedence.
+   *
+   * @param  string $id The service identifier
+   *
+   * @return object The associated service
+   *
+   * @throw InvalidArgumentException if the service is not defined
+   */
+  public function getService($id)
+  {
+    if (isset($this->services[$id]))
+    {
+      return $this->services[$id];
+    }
+
+    if (method_exists($this, $method = 'get'.self::camelize($id).'Service'))
+    {
+      return $this->$method();
+    }
+
+    throw new InvalidArgumentException(sprintf('The service "%s" does not exist.', $id));
+  }
+
+  /**
+   * Gets all service ids.
+   *
+   * @return array An array of all defined service ids
+   */
+  public function getServiceIds()
+  {
+    $ids = array();
+    $r = new ReflectionClass($this);
+    foreach ($r->getMethods() as $method)
+    {
+      if (preg_match('/^get(.+)Service$/', $name = $method->getName(), $match))
+      {
+        $ids[] = self::underscore($match[1]);
+      }
+    }
+
+    return array_merge($ids, array_keys($this->services));
+  }
+
+  static public function camelize($id)
+  {
+    return strtr(ucwords(strtr($id, array('_' => ' ', '-' => ' ', '.' => '_ '))), array(' ' => ''));
+  }
+
+  static public function underscore($id)
+  {
+    return strtolower(preg_replace(array('/_/', '/([A-Z]+)([A-Z][a-z])/', '/([a-z\d])([A-Z])/'), array('.', '\\1_\\2', '\\1_\\2'), $id));
+  }
+}
diff --git a/lib/vendor/symfony/lib/service/sfServiceContainerBuilder.class.php b/lib/vendor/symfony/lib/service/sfServiceContainerBuilder.class.php
new file mode 100644
index 000000000..a87395cbc
--- /dev/null
+++ b/lib/vendor/symfony/lib/service/sfServiceContainerBuilder.class.php
@@ -0,0 +1,338 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * sfServiceContainerBuilder is a DI container that provides an interface to build the services.
+ *
+ * @package    symfony
+ * @subpackage service
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ * @version    SVN: $Id: sfServiceContainerBuilder.php 269 2009-03-26 20:39:16Z fabien $
+ */
+class sfServiceContainerBuilder extends sfServiceContainer
+{
+  protected
+    $definitions = array(),
+    $aliases     = array(),
+    $loading     = array();
+
+  /**
+   * Sets a service.
+   *
+   * @param string $id      The service identifier
+   * @param object $service The service instance
+   */
+  public function setService($id, $service)
+  {
+    unset($this->aliases[$id]);
+
+    parent::setService($id, $service);
+  }
+
+  /**
+   * Returns true if the given service is defined.
+   *
+   * @param  string  $id      The service identifier
+   *
+   * @return Boolean true if the service is defined, false otherwise
+   */
+  public function hasService($id)
+  {
+    return isset($this->definitions[$id]) || isset($this->aliases[$id]) || parent::hasService($id);
+  }
+
+  /**
+   * Gets a service.
+   *
+   * @param  string $id The service identifier
+   *
+   * @return object The associated service
+   *
+   * @throw InvalidArgumentException if the service is not defined
+   * @throw LogicException if the service has a circular reference to itself
+   */
+  public function getService($id)
+  {
+    try
+    {
+      return parent::getService($id);
+    }
+    catch (InvalidArgumentException $e)
+    {
+      if (isset($this->loading[$id]))
+      {
+        throw new LogicException(sprintf('The service "%s" has a circular reference to itself.', $id));
+      }
+
+      if (!$this->hasServiceDefinition($id) && isset($this->aliases[$id]))
+      {
+        return $this->getService($this->aliases[$id]);
+      }
+
+      $definition = $this->getServiceDefinition($id);
+
+      $this->loading[$id] = true;
+
+      if ($definition->isShared())
+      {
+        $service = $this->services[$id] = $this->createService($definition);
+      }
+      else
+      {
+        $service = $this->createService($definition);
+      }
+
+      unset($this->loading[$id]);
+
+      return $service;
+    }
+  }
+
+  /**
+   * Gets all service ids.
+   *
+   * @return array An array of all defined service ids
+   */
+  public function getServiceIds()
+  {
+    return array_unique(array_merge(array_keys($this->getServiceDefinitions()), array_keys($this->aliases), parent::getServiceIds()));
+  }
+
+  /**
+   * Sets an alias for an existing service.
+   *
+   * @param string $alias The alias to create
+   * @param string $id    The service to alias
+   */
+  public function setAlias($alias, $id)
+  {
+    $this->aliases[$alias] = $id;
+  }
+
+  /**
+   * Gets all defined aliases.
+   *
+   * @return array An array of aliases
+   */
+  public function getAliases()
+  {
+    return $this->aliases;
+  }
+
+  /**
+   * Registers a service definition.
+   *
+   * This methods allows for simple registration of service definition
+   * with a fluid interface.
+   *
+   * @param  string $id    The service identifier
+   * @param  string $class The service class
+   *
+   * @return sfServiceDefinition A sfServiceDefinition instance
+   */
+  public function register($id, $class)
+  {
+    return $this->setServiceDefinition($id, new sfServiceDefinition($class));
+  }
+
+  /**
+   * Adds the service definitions.
+   *
+   * @param array $definitions An array of service definitions
+   */
+  public function addServiceDefinitions(array $definitions)
+  {
+    foreach ($definitions as $id => $definition)
+    {
+      $this->setServiceDefinition($id, $definition);
+    }
+  }
+
+  /**
+   * Sets the service definitions.
+   *
+   * @param array $definitions An array of service definitions
+   */
+  public function setServiceDefinitions(array $definitions)
+  {
+    $this->definitions = array();
+    $this->addServiceDefinitions($definitions);
+  }
+
+  /**
+   * Gets all service definitions.
+   *
+   * @return array An array of sfServiceDefinition instances
+   */
+  public function getServiceDefinitions()
+  {
+    return $this->definitions;
+  }
+
+  /**
+   * Sets a service definition.
+   *
+   * @param  string              $id         The service identifier
+   * @param  sfServiceDefinition $definition A sfServiceDefinition instance
+   */
+  public function setServiceDefinition($id, sfServiceDefinition $definition)
+  {
+    unset($this->aliases[$id]);
+
+    return $this->definitions[$id] = $definition;
+  }
+
+  /**
+   * Returns true if a service definition exists under the given identifier.
+   *
+   * @param  string  $id The service identifier
+   *
+   * @return Boolean true if the service definition exists, false otherwise
+   */
+  public function hasServiceDefinition($id)
+  {
+    return array_key_exists($id, $this->definitions);
+  }
+
+  /**
+   * Gets a service definition.
+   *
+   * @param  string  $id The service identifier
+   *
+   * @return sfServiceDefinition A sfServiceDefinition instance
+   *
+   * @throw InvalidArgumentException if the service definition does not exist
+   */
+  public function getServiceDefinition($id)
+  {
+    if (!$this->hasServiceDefinition($id))
+    {
+      throw new InvalidArgumentException(sprintf('The service definition "%s" does not exist.', $id));
+    }
+
+    return $this->definitions[$id];
+  }
+
+  /**
+   * Creates a service for a service definition.
+   *
+   * @param  sfServiceDefinition $definition A service definition instance
+   *
+   * @return object              The service described by the service definition
+   */
+  protected function createService(sfServiceDefinition $definition)
+  {
+    if (null !== $definition->getFile())
+    {
+      require_once $this->resolveValue($definition->getFile());
+    }
+
+    $r = new ReflectionClass($this->resolveValue($definition->getClass()));
+
+    $arguments = $this->resolveServices($this->resolveValue($definition->getArguments()));
+
+    if (null !== $definition->getConstructor())
+    {
+      $service = call_user_func_array(array($this->resolveValue($definition->getClass()), $definition->getConstructor()), $arguments);
+    }
+    else
+    {
+      $service = null === $r->getConstructor() ? $r->newInstance() : $r->newInstanceArgs($arguments);
+    }
+
+    foreach ($definition->getMethodCalls() as $call)
+    {
+      call_user_func_array(array($service, $call[0]), $this->resolveServices($this->resolveValue($call[1])));
+    }
+
+    if ($callable = $definition->getConfigurator())
+    {
+      if (is_array($callable) && is_object($callable[0]) && $callable[0] instanceof sfServiceReference)
+      {
+        $callable[0] = $this->getService((string) $callable[0]);
+      }
+      elseif (is_array($callable))
+      {
+        $callable[0] = $this->resolveValue($callable[0]);
+      }
+
+      if (!is_callable($callable))
+      {
+        throw new InvalidArgumentException(sprintf('The configure callable for class "%s" is not a callable.', get_class($service)));
+      }
+
+      call_user_func($callable, $service);
+    }
+
+    return $service;
+  }
+
+  /**
+   * Replaces parameter placeholders (%name%) by their values.
+   *
+   * @param  mixed $value A value
+   *
+   * @return mixed The same value with all placeholders replaced by their values
+   *
+   * @throw RuntimeException if a placeholder references a parameter that does not exist
+   */
+  public function resolveValue($value)
+  {
+    if (is_array($value))
+    {
+      $args = array();
+      foreach ($value as $k => $v)
+      {
+        $args[$this->resolveValue($k)] = $this->resolveValue($v);
+      }
+
+      $value = $args;
+    }
+    else if (is_string($value))
+    {
+      if (preg_match('/^%([^%]+)%$/', $value, $match))
+      {
+        $value = $this->getParameter($match[1]);
+      }
+      else
+      {
+        $value = str_replace('%%', '%', preg_replace_callback('/(?<!%)(%)([^%]+)\1/', array($this, 'replaceParameter'), $value));
+      }
+    }
+
+    return $value;
+  }
+
+  /**
+   * Replaces service references by the real service instance.
+   *
+   * @param  mixed $value A value
+   *
+   * @return mixed The same value with all service references replaced by the real service instances
+   */
+  public function resolveServices($value)
+  {
+    if (is_array($value))
+    {
+      $value = array_map(array($this, 'resolveServices'), $value);
+    }
+    else if (is_object($value) && $value instanceof sfServiceReference)
+    {
+      $value = $this->getService((string) $value);
+    }
+
+    return $value;
+  }
+
+  protected function replaceParameter($match)
+  {
+    return $this->getParameter($match[2]);
+  }
+}
diff --git a/lib/vendor/symfony/lib/service/sfServiceContainerDumper.class.php b/lib/vendor/symfony/lib/service/sfServiceContainerDumper.class.php
new file mode 100644
index 000000000..a5cbca5b7
--- /dev/null
+++ b/lib/vendor/symfony/lib/service/sfServiceContainerDumper.class.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * sfServiceContainerDumper is the abstract class for all built-in dumpers.
+ *
+ * @package    symfony
+ * @subpackage service
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ * @version    SVN: $Id$
+ */
+abstract class sfServiceContainerDumper implements sfServiceContainerDumperInterface
+{
+  protected $container;
+
+  /**
+   * Constructor.
+   *
+   * @param sfServiceContainerBuilder $container The service container to dump
+   */
+  public function __construct(sfServiceContainerBuilder $container)
+  {
+    $this->container = $container;
+  }
+
+  /**
+   * Dumps the service container.
+   *
+   * @param  array  $options An array of options
+   *
+   * @return string The representation of the service container
+   */
+  public function dump(array $options = array())
+  {
+    throw new LogicException('You must extend this abstract class and implement the dump() method.');
+  }
+}
diff --git a/lib/vendor/symfony/lib/service/sfServiceContainerDumperGraphviz.class.php b/lib/vendor/symfony/lib/service/sfServiceContainerDumperGraphviz.class.php
new file mode 100644
index 000000000..805ec061d
--- /dev/null
+++ b/lib/vendor/symfony/lib/service/sfServiceContainerDumperGraphviz.class.php
@@ -0,0 +1,230 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * sfServiceContainerDumperGraphviz dumps a service container as a graphviz file.
+ *
+ * You can convert the generated dot file with the dot utility (http://www.graphviz.org/):
+ *
+ *   dot -Tpng container.dot > foo.png
+ *
+ * @package    symfony
+ * @subpackage service
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ * @version    SVN: $Id$
+ */
+class sfServiceContainerDumperGraphviz extends sfServiceContainerDumper
+{
+  protected $nodes, $edges;
+
+  /**
+   * Dumps the service container as a graphviz graph.
+   *
+   * Available options:
+   *
+   *  * graph: The default options for the whole graph
+   *  * node: The default options for nodes
+   *  * edge: The default options for edges
+   *  * node.instance: The default options for services that are defined directly by object instances
+   *  * node.definition: The default options for services that are defined via service definition instances
+   *  * node.missing: The default options for missing services
+   *
+   * @param  array  $options An array of options
+   *
+   * @return string The dot representation of the service container
+   */
+  public function dump(array $options = array())
+  {
+    $this->options = array(
+      'graph' => array('ratio' => 'compress'),
+      'node'  => array('fontsize' => 11, 'fontname' => 'Arial', 'shape' => 'record'),
+      'edge'  => array('fontsize' => 9, 'fontname' => 'Arial', 'color' => 'grey', 'arrowhead' => 'open', 'arrowsize' => 0.5),
+      'node.instance' => array('fillcolor' => '#9999ff', 'style' => 'filled'),
+      'node.definition' => array('fillcolor' => '#eeeeee'),
+      'node.missing' => array('fillcolor' => '#ff9999', 'style' => 'filled'),
+    );
+
+    foreach (array('graph', 'node', 'edge', 'node.instance', 'node.definition', 'node.missing') as $key)
+    {
+      if (isset($options[$key]))
+      {
+        $this->options[$key] = array_merge($this->options[$key], $options[$key]);
+      }
+    }
+
+    $this->nodes = $this->findNodes();
+
+    $this->edges = array();
+    foreach ($this->container->getServiceDefinitions() as $id => $definition)
+    {
+      $this->edges[$id] = $this->findEdges($id, $definition->getArguments(), true, '');
+
+      foreach ($definition->getMethodCalls() as $call)
+      {
+        $this->edges[$id] = array_merge(
+          $this->edges[$id],
+          $this->findEdges($id, $call[1], false, $call[0].'()')
+        );
+      }
+    }
+
+    return $this->startDot().$this->addNodes().$this->addEdges().$this->endDot();
+  }
+
+  protected function addNodes()
+  {
+    $code = '';
+    foreach ($this->nodes as $id => $node)
+    {
+      $aliases = $this->getAliases($id);
+
+      $code .= sprintf("  node_%s [label=\"%s\\n%s\\n\", shape=%s%s];\n", $this->dotize($id), $id.($aliases ? ' ('.implode(', ', $aliases).')' : ''), $node['class'], $this->options['node']['shape'], $this->addAttributes($node['attributes']));
+    }
+
+    return $code;
+  }
+
+  protected function addEdges()
+  {
+    $code = '';
+    foreach ($this->edges as $id => $edges)
+    {
+      foreach ($edges as $edge)
+      {
+        $code .= sprintf("  node_%s -> node_%s [label=\"%s\" style=\"%s\"];\n", $this->dotize($id), $this->dotize($edge['to']), $edge['name'], $edge['required'] ? 'filled' : 'dashed');
+      }
+    }
+
+    return $code;
+  }
+
+  protected function findEdges($id, $arguments, $required, $name)
+  {
+    $edges = array();
+    foreach ($arguments as $argument)
+    {
+      if (is_object($argument) && $argument instanceof sfServiceParameter)
+      {
+        $argument = $this->container->hasParameter($argument) ? $this->container->getParameter($argument) : null;
+      }
+      elseif (is_string($argument) && preg_match('/^%([^%]+)%$/', $argument, $match))
+      {
+        $argument = $this->container->hasParameter($match[1]) ? $this->container->getParameter($match[1]) : null;
+      }
+
+      if ($argument instanceof sfServiceReference)
+      {
+        if (!$this->container->hasService((string) $argument))
+        {
+          $this->nodes[(string) $argument] = array('name' => $name, 'required' => $required, 'class' => '', 'attributes' => $this->options['node.missing']);
+        }
+
+        $edges[] = array('name' => $name, 'required' => $required, 'to' => $argument);
+      }
+      elseif (is_array($argument))
+      {
+        $edges = array_merge($edges, $this->findEdges($id, $argument, $required, $name));
+      }
+    }
+
+    return $edges;
+  }
+
+  protected function findNodes()
+  {
+    $nodes = array();
+
+    $container = clone $this->container;
+
+    foreach ($container->getServiceDefinitions() as $id => $definition)
+    {
+      $nodes[$id] = array('class' => $this->getValue($definition->getClass()), 'attributes' => array_merge($this->options['node.definition'], array('style' => $definition->isShared() ? 'filled' : 'dotted')));
+
+      $container->setServiceDefinition($id, new sfServiceDefinition('stdClass'));
+    }
+
+    foreach ($container->getServiceIds() as $id)
+    {
+      if (array_key_exists($id, $container->getAliases()))
+      {
+        continue;
+      }
+
+      if (!$container->hasServiceDefinition($id))
+      {
+        $nodes[$id] = array('class' => get_class($container->getService($id)), 'attributes' => $this->options['node.instance']);
+      }
+    }
+
+    return $nodes;
+  }
+
+  protected function getValue($value, $default = '')
+  {
+    return $this->container->resolveValue($value);
+  }
+
+  protected function startDot()
+  {
+    $parameters = var_export($this->container->getParameters(), true);
+
+    return sprintf("digraph sc {\n  %s\n  node [%s];\n  edge [%s];\n\n",
+      $this->addOptions($this->options['graph']),
+      $this->addOptions($this->options['node']),
+      $this->addOptions($this->options['edge'])
+    );
+  }
+
+  protected function endDot()
+  {
+    return "}\n";
+  }
+
+  protected function addAttributes($attributes)
+  {
+    $code = array();
+    foreach ($attributes as $k => $v)
+    {
+      $code[] = sprintf('%s="%s"', $k, $v);
+    }
+
+    return $code ? ', '.implode(', ', $code) : '';
+  }
+
+  protected function addOptions($options)
+  {
+    $code = array();
+    foreach ($options as $k => $v)
+    {
+      $code[] = sprintf('%s="%s"', $k, $v);
+    }
+
+    return implode(' ', $code);
+  }
+
+  protected function dotize($id)
+  {
+    return strtolower(preg_replace('/\W/i', '_', $id));
+  }
+
+  protected function getAliases($id)
+  {
+    $aliases = array();
+    foreach ($this->container->getAliases() as $alias => $origin)
+    {
+      if ($id == $origin)
+      {
+        $aliases[] = $alias;
+      }
+    }
+
+    return $aliases;
+  }
+}
diff --git a/lib/vendor/symfony/lib/service/sfServiceContainerDumperInterface.class.php b/lib/vendor/symfony/lib/service/sfServiceContainerDumperInterface.class.php
new file mode 100644
index 000000000..6d058f725
--- /dev/null
+++ b/lib/vendor/symfony/lib/service/sfServiceContainerDumperInterface.class.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * sfServiceContainerDumperInterface is the interface implemented by service container dumper classes.
+ *
+ * @package    symfony
+ * @subpackage dependency_injection
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ * @version    SVN: $Id$
+ */
+interface sfServiceContainerDumperInterface
+{
+  function dump(array $options = array());
+}
diff --git a/lib/vendor/symfony/lib/service/sfServiceContainerDumperPhp.class.php b/lib/vendor/symfony/lib/service/sfServiceContainerDumperPhp.class.php
new file mode 100644
index 000000000..ed6a46e13
--- /dev/null
+++ b/lib/vendor/symfony/lib/service/sfServiceContainerDumperPhp.class.php
@@ -0,0 +1,356 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * sfServiceContainerDumperPhp dumps a service container as a PHP class.
+ *
+ * @package    symfony
+ * @subpackage service
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ * @version    SVN: $Id$
+ */
+class sfServiceContainerDumperPhp extends sfServiceContainerDumper
+{
+  /**
+   * Dumps the service container as a PHP class.
+   *
+   * Available options:
+   *
+   *  * class:      The class name
+   *  * base_class: The base class name
+   *
+   * @param  array  $options An array of options
+   *
+   * @return string A PHP class representing of the service container
+   */
+  public function dump(array $options = array())
+  {
+    $options = array_merge(array(
+      'class'      => 'ProjectServiceContainer',
+      'base_class' => 'sfServiceContainer',
+    ), $options);
+
+    return
+      $this->startClass($options['class'], $options['base_class']).
+      $this->addConstructor().
+      $this->addServices().
+      $this->addDefaultParametersMethod().
+      $this->endClass()
+    ;
+  }
+
+  protected function addServiceInclude($id, $definition)
+  {
+    if (null !== $definition->getFile())
+    {
+      return sprintf("    require_once %s;\n\n", $this->dumpValue($definition->getFile()));
+    }
+  }
+
+  protected function addServiceShared($id, $definition)
+  {
+    if ($definition->isShared())
+    {
+      return <<<EOF
+    if (isset(\$this->shared['$id'])) return \$this->shared['$id'];
+
+
+EOF;
+    }
+  }
+
+  protected function addServiceReturn($id, $definition)
+  {
+    if ($definition->isShared())
+    {
+      return <<<EOF
+
+    return \$this->shared['$id'] = \$instance;
+  }
+
+EOF;
+    }
+    else
+    {
+      return <<<EOF
+
+    return \$instance;
+  }
+
+EOF;
+    }
+  }
+
+  protected function addServiceInstance($id, $definition)
+  {
+    $class = $this->dumpValue($definition->getClass());
+
+    $arguments = array();
+    foreach ($definition->getArguments() as $value)
+    {
+      $arguments[] = $this->dumpValue($value);
+    }
+
+    if (null !== $definition->getConstructor())
+    {
+      return sprintf("    \$instance = call_user_func(array(%s, '%s')%s);\n", $class, $definition->getConstructor(), $arguments ? ', '.implode(', ', $arguments) : '');
+    }
+    else
+    {
+      if ($class != "'".$definition->getClass()."'")
+      {
+        return sprintf("    \$class = %s;\n    \$instance = new \$class(%s);\n", $class, implode(', ', $arguments));
+      }
+      else
+      {
+        return sprintf("    \$instance = new %s(%s);\n", $definition->getClass(), implode(', ', $arguments));
+      }
+    }
+  }
+
+  protected function addServiceMethodCalls($id, $definition)
+  {
+    $calls = '';
+    foreach ($definition->getMethodCalls() as $call)
+    {
+      $arguments = array();
+      foreach ($call[1] as $value)
+      {
+        $arguments[] = $this->dumpValue($value);
+      }
+
+      $calls .= sprintf("    \$instance->%s(%s);\n", $call[0], implode(', ', $arguments));
+    }
+
+    return $calls;
+  }
+
+  protected function addServiceConfigurator($id, $definition)
+  {
+    if (!$callable = $definition->getConfigurator())
+    {
+      return '';
+    }
+
+    if (is_array($callable))
+    {
+      if (is_object($callable[0]) && $callable[0] instanceof sfServiceReference)
+      {
+        return sprintf("    %s->%s(\$instance);\n", $this->getServiceCall((string) $callable[0]), $callable[1]);
+      }
+      else
+      {
+        return sprintf("    call_user_func(array(%s, '%s'), \$instance);\n", $this->dumpValue($callable[0]), $callable[1]);
+      }
+    }
+    else
+    {
+      return sprintf("    %s(\$instance);\n", $callable);
+    }
+  }
+
+  protected function addService($id, $definition)
+  {
+    $name = sfServiceContainer::camelize($id);
+
+    $code = <<<EOF
+
+  protected function get{$name}Service()
+  {
+
+EOF;
+
+    $code .=
+      $this->addServiceInclude($id, $definition).
+      $this->addServiceShared($id, $definition).
+      $this->addServiceInstance($id, $definition).
+      $this->addServiceMethodCalls($id, $definition).
+      $this->addServiceConfigurator($id, $definition).
+      $this->addServiceReturn($id, $definition)
+    ;
+
+    return $code;
+  }
+
+  protected function addServiceAlias($alias, $id)
+  {
+    $name = sfServiceContainer::camelize($alias);
+
+    return <<<EOF
+
+  protected function get{$name}Service()
+  {
+    return {$this->getServiceCall($id)};
+  }
+
+EOF;
+  }
+
+  protected function addServices()
+  {
+    $code = '';
+    foreach ($this->container->getServiceDefinitions() as $id => $definition)
+    {
+      $code .= $this->addService($id, $definition);
+    }
+
+    foreach ($this->container->getAliases() as $alias => $id)
+    {
+      $code .= $this->addServiceAlias($alias, $id);
+    }
+
+    return $code;
+  }
+
+  protected function startClass($class, $baseClass)
+  {
+    return <<<EOF
+class $class extends $baseClass
+{
+  protected \$shared = array();
+
+EOF;
+  }
+
+  protected function addConstructor()
+  {
+    if (!$this->container->getParameters())
+    {
+      return '';
+    }
+
+    return <<<EOF
+
+  public function __construct()
+  {
+    parent::__construct(\$this->getDefaultParameters());
+  }
+
+EOF;
+  }
+
+  protected function addDefaultParametersMethod()
+  {
+    if (!$this->container->getParameters())
+    {
+      return '';
+    }
+
+    $parameters = $this->exportParameters($this->container->getParameters());
+
+    return <<<EOF
+
+  protected function getDefaultParameters()
+  {
+    return $parameters;
+  }
+
+EOF;
+  }
+
+  protected function exportParameters($parameters, $indent = 6)
+  {
+    $php = array();
+    foreach ($parameters as $key => $value)
+    {
+      if (is_array($value))
+      {
+        $value = $this->exportParameters($value, $indent + 2);
+      }
+      elseif ($value instanceof sfServiceReference)
+      {
+        $value = sprintf("new sfServiceReference('%s')", $value);
+      }
+      elseif ($value instanceof sfServiceParameter)
+      {
+        $value = sprintf("\$this->getParameter('%s')", $value);
+      }
+      else
+      {
+        $value = var_export($value, true);
+      }
+
+      $php[] = sprintf('%s%s => %s,', str_repeat(' ', $indent), var_export($key, true), $value);
+    }
+
+    return sprintf("array(\n%s\n%s)", implode("\n", $php), str_repeat(' ', $indent - 2));
+  }
+
+  protected function endClass()
+  {
+    return <<<EOF
+}
+
+EOF;
+  }
+
+  protected function dumpValue($value)
+  {
+    if (is_array($value))
+    {
+      $code = array();
+      foreach ($value as $k => $v)
+      {
+        $code[] = sprintf("%s => %s", $this->dumpValue($k), $this->dumpValue($v));
+      }
+
+      return sprintf("array(%s)", implode(', ', $code));
+    }
+    elseif (is_object($value) && $value instanceof sfServiceReference)
+    {
+      return $this->getServiceCall((string) $value);
+    }
+    elseif (is_object($value) && $value instanceof sfServiceParameter)
+    {
+      return sprintf("\$this->getParameter('%s')", strtolower($value));
+    }
+    elseif (is_string($value))
+    {
+      if (preg_match('/^%([^%]+)%$/', $value, $match))
+      {
+        // we do this to deal with non string values (boolean, integer, ...)
+        // the preg_replace_callback converts them to strings
+        return sprintf("\$this->getParameter('%s')", strtolower($match[1]));
+      }
+      else
+      {
+        $code = str_replace('%%', '%', preg_replace_callback('/(?<!%)(%)([^%]+)\1/', array($this, 'replaceParameter'), var_export($value, true)));
+
+        // optimize string
+        $code = preg_replace(array("/^''\./", "/\.''$/", "/\.''\./"), array('', '', '.'), $code);
+
+        return $code;
+      }
+    }
+    elseif (is_object($value) || is_resource($value))
+    {
+      throw new RuntimeException('Unable to dump a service container if a parameter is an object or a resource.');
+    }
+    else
+    {
+      return var_export($value, true);
+    }
+  }
+
+  public function replaceParameter($match)
+  {
+    return sprintf("'.\$this->getParameter('%s').'", strtolower($match[2]));
+  }
+
+  protected function getServiceCall($id)
+  {
+    if ('service_container' == $id)
+    {
+      return '$this';
+    }
+
+    return sprintf('$this->getService(\'%s\')', $id);
+  }
+}
diff --git a/lib/vendor/symfony/lib/service/sfServiceContainerInterface.class.php b/lib/vendor/symfony/lib/service/sfServiceContainerInterface.class.php
new file mode 100644
index 000000000..faea88658
--- /dev/null
+++ b/lib/vendor/symfony/lib/service/sfServiceContainerInterface.class.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * sfServiceContainerInterface is the interface implemented by service container classes.
+ *
+ * @package    symfony
+ * @subpackage service
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ * @version    SVN: $Id$
+ */
+interface sfServiceContainerInterface
+{
+  public function setParameters(array $parameters);
+
+  public function addParameters(array $parameters);
+
+  public function getParameters();
+
+  public function getParameter($name);
+
+  public function setParameter($name, $value);
+
+  public function hasParameter($name);
+
+  public function setService($id, $service);
+
+  public function getService($id);
+
+  public function hasService($name);
+}
diff --git a/lib/vendor/symfony/lib/service/sfServiceContainerLoader.class.php b/lib/vendor/symfony/lib/service/sfServiceContainerLoader.class.php
new file mode 100644
index 000000000..cc46c4cbb
--- /dev/null
+++ b/lib/vendor/symfony/lib/service/sfServiceContainerLoader.class.php
@@ -0,0 +1,112 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * sfServiceContainerLoader is the abstract class used by all built-in loaders.
+ *
+ * @package    symfony
+ * @subpackage service
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ * @version    SVN: $Id: sfServiceContainerLoader.php 267 2009-03-26 19:56:18Z fabien $
+ */
+abstract class sfServiceContainerLoader implements sfServiceContainerLoaderInterface
+{
+  protected $container;
+
+  /**
+   * Constructor.
+   *
+   * @param sfServiceContainerBuilder $container A sfServiceContainerBuilder instance
+   */
+  public function __construct(sfServiceContainerBuilder $container = null)
+  {
+    $this->container = $container;
+  }
+
+  /**
+   * Sets the service container attached to this loader.
+   *
+   * @param sfServiceContainerBuilder $container A sfServiceContainerBuilder instance
+   */
+  public function setServiceContainer(sfServiceContainerBuilder $container)
+  {
+    $this->container = $container;
+  }
+
+  /**
+   * Loads a resource.
+   *
+   * A resource can be anything that can be converted to an array of
+   * definitions and parameters by the doLoad() method.
+   *
+   * Service definitions overrides the current defined ones.
+   *
+   * But for parameters, they are overridden by the current ones. It allows
+   * the parameters passed to the container constructor to have precedence
+   * over the loaded ones.
+   *
+   * $container = new sfServiceContainerBuilder(array('foo' => 'bar'));
+   * $loader = new sfServiceContainerLoaderXXX($container);
+   * $loader->load('resource_name');
+   * $container->register('foo', new stdClass());
+   *
+   * In the above example, even if the loaded resource defines a foo
+   * parameter, the value will still be 'bar' as defined in the builder
+   * constructor.
+   *
+   * You can also pass multiple resource paths to the constructor.
+   *
+   * @param mixed $resource The resource path
+   */
+  public function load($resource)
+  {
+    if (!$this->container)
+    {
+      throw new LogicException('You must attach the loader to a service container.');
+    }
+
+    $resources = func_get_args();
+    foreach ($resources as $resource)
+    {
+      list($definitions, $parameters) = $this->doLoad($resource);
+
+      foreach ($definitions as $id => $definition)
+      {
+        if (is_string($definition))
+        {
+          $this->container->setAlias($id, $definition);
+        }
+        else
+        {
+          $this->container->setServiceDefinition($id, $definition);
+        }
+      }
+
+      $currentParameters = $this->container->getParameters();
+      foreach ($parameters as $key => $value)
+      {
+        $this->container->setParameter($key, $this->container->resolveValue($value));
+      }
+      $this->container->addParameters($currentParameters);
+    }
+  }
+
+  /**
+   * Loads a resource.
+   *
+   * Concrete classes implements this method to convert
+   * the resource to an array of definitions and parameters.
+   *
+   * @param  mixed $resource The resource path
+   *
+   * @return array An array of definitions and parameters
+   */
+  abstract public function doLoad($resource);
+}
diff --git a/lib/vendor/symfony/lib/service/sfServiceContainerLoaderArray.class.php b/lib/vendor/symfony/lib/service/sfServiceContainerLoaderArray.class.php
new file mode 100644
index 000000000..b5c214291
--- /dev/null
+++ b/lib/vendor/symfony/lib/service/sfServiceContainerLoaderArray.class.php
@@ -0,0 +1,133 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * sfServiceContainerLoaderArray loads an array service definitions.
+ *
+ * It does not include import functionnality.
+ *
+ * @package    symfony
+ * @subpackage service
+ * @author     Jerome Macias <jmacias@groupe-exp.com>
+ */
+class sfServiceContainerLoaderArray extends sfServiceContainerLoader
+{
+  public function doLoad($content)
+  {
+    $this->validate($content);
+
+    $parameters = array();
+    $definitions = array();
+
+    // parameters
+    if (isset($content['parameters']))
+    {
+      foreach ($content['parameters'] as $key => $value)
+      {
+        $parameters[strtolower($key)] = $this->resolveServices($value);
+      }
+    }
+
+    // services
+    if (isset($content['services']))
+    {
+      foreach ($content['services'] as $id => $service)
+      {
+        $definitions[$id] = $this->parseDefinition($service);
+      }
+    }
+
+    return array($definitions, $parameters);
+  }
+
+  protected function validate($content)
+  {
+    if (!is_array($content))
+    {
+      throw new InvalidArgumentException('The service definition is not valid.');
+    }
+
+    foreach (array_keys($content) as $key)
+    {
+      if (!in_array($key, array('parameters', 'services')))
+      {
+        throw new InvalidArgumentException(sprintf('The service defintion is not valid ("%s" is not recognized).', $key));
+      }
+    }
+
+    return $content;
+  }
+
+  protected function parseDefinition($service)
+  {
+    if (is_string($service) && 0 === strpos($service, '@'))
+    {
+      return substr($service, 1);
+    }
+
+    $definition = new sfServiceDefinition($service['class']);
+
+    if (isset($service['shared']))
+    {
+      $definition->setShared($service['shared']);
+    }
+
+    if (isset($service['constructor']))
+    {
+      $definition->setConstructor($service['constructor']);
+    }
+
+    if (isset($service['file']))
+    {
+      $definition->setFile($service['file']);
+    }
+
+    if (isset($service['arguments']))
+    {
+      $definition->setArguments($this->resolveServices($service['arguments']));
+    }
+
+    if (isset($service['configurator']))
+    {
+      if (is_string($service['configurator']))
+      {
+        $definition->setConfigurator($service['configurator']);
+      }
+      else
+      {
+        $definition->setConfigurator(array($this->resolveServices($service['configurator'][0]), $service['configurator'][1]));
+      }
+    }
+
+    if (isset($service['calls']))
+    {
+      foreach ($service['calls'] as $call)
+      {
+        $definition->addMethodCall($call[0], $this->resolveServices($call[1]));
+      }
+    }
+
+    return $definition;
+  }
+
+  protected function resolveServices($value)
+  {
+    if (is_array($value))
+    {
+      $value = array_map(array($this, 'resolveServices'), $value);
+    }
+    else if (is_string($value) && 0 === strpos($value, '@'))
+    {
+      $value = new sfServiceReference(substr($value, 1));
+    }
+
+    return $value;
+  }
+}
diff --git a/lib/vendor/symfony/lib/service/sfServiceContainerLoaderInterface.class.php b/lib/vendor/symfony/lib/service/sfServiceContainerLoaderInterface.class.php
new file mode 100644
index 000000000..8e19d63f7
--- /dev/null
+++ b/lib/vendor/symfony/lib/service/sfServiceContainerLoaderInterface.class.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * sfServiceContainerLoaderInterface is the interface implemented by service container loader classes.
+ *
+ * @package    symfony
+ * @subpackage service
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ * @version    SVN: $Id$
+ */
+interface sfServiceContainerLoaderInterface
+{
+  function load($resource);
+}
diff --git a/lib/vendor/symfony/lib/service/sfServiceDefinition.class.php b/lib/vendor/symfony/lib/service/sfServiceDefinition.class.php
new file mode 100644
index 000000000..1090ab924
--- /dev/null
+++ b/lib/vendor/symfony/lib/service/sfServiceDefinition.class.php
@@ -0,0 +1,242 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * sfServiceDefinition represents a service definition.
+ *
+ * @package    symfony
+ * @subpackage service
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ * @version    SVN: $Id: sfServiceDefinition.php 269 2009-03-26 20:39:16Z fabien $
+ */
+class sfServiceDefinition
+{
+  protected
+    $class        = null,
+    $file         = null,
+    $constructor  = null,
+    $shared       = true,
+    $arguments    = array(),
+    $calls        = array(),
+    $configurator = null;
+
+  /**
+   * Constructor.
+   *
+   * @param string $class     The service class
+   * @param array  $arguments An array of arguments to pass to the service constructor
+   */
+  public function __construct($class, array $arguments = array())
+  {
+    $this->class     = $class;
+    $this->arguments = $arguments;
+  }
+
+  /**
+   * Sets the constructor method.
+   *
+   * @param  string              $method The method name
+   *
+   * @return sfServiceDefinition The current instance
+   */
+  public function setConstructor($method)
+  {
+    $this->constructor = $method;
+
+    return $this;
+  }
+
+  /**
+   * Gets the constructor method.
+   *
+   * @return sfServiceDefinition The constructor method name
+   */
+  public function getConstructor()
+  {
+    return $this->constructor;
+  }
+
+  /**
+   * Sets the service class.
+   *
+   * @param  string              $class The service class
+   *
+   * @return sfServiceDefinition The current instance
+   */
+  public function setClass($class)
+  {
+    $this->class = $class;
+
+    return $this;
+  }
+
+  /**
+   * Sets the constructor method.
+   *
+   * @return string The service class
+   */
+  public function getClass()
+  {
+    return $this->class;
+  }
+
+  /**
+   * Sets the constructor arguments to pass to the service constructor.
+   *
+   * @param  array               $arguments An array of arguments
+   *
+   * @return sfServiceDefinition The current instance
+   */
+  public function setArguments(array $arguments)
+  {
+    $this->arguments = $arguments;
+
+    return $this;
+  }
+
+  /**
+   * Adds a constructor argument to pass to the service constructor.
+   *
+   * @param  mixed               $argument An argument
+   *
+   * @return sfServiceDefinition The current instance
+   */
+  public function addArgument($argument)
+  {
+    $this->arguments[] = $argument;
+
+    return $this;
+  }
+
+  /**
+   * Gets the constructor arguments to pass to the service constructor.
+   *
+   * @return array The array of arguments
+   */
+  public function getArguments()
+  {
+    return $this->arguments;
+  }
+
+  /**
+   * Sets the methods to call after service initialization.
+   *
+   * @param  array               $calls An array of method calls
+   *
+   * @return sfServiceDefinition The current instance
+   */
+  public function setMethodCalls(array $calls = array())
+  {
+    $this->calls = array();
+    foreach ($calls as $call)
+    {
+      $this->addMethodCall($call[0], $call[1]);
+    }
+
+    return $this;
+  }
+
+  /**
+   * Adds a method to call after service initialization.
+   *
+   * @param  string              $method    The method name to call
+   * @param  array               $arguments An array of arguments to pass to the method call
+   *
+   * @return sfServiceDefinition The current instance
+   */
+  public function addMethodCall($method, array $arguments = array())
+  {
+    $this->calls[] = array($method, $arguments);
+
+    return $this;
+  }
+
+  /**
+   * Gets the methods to call after service initialization.
+   *
+   * @return  array An array of method calls
+   */
+  public function getMethodCalls()
+  {
+    return $this->calls;
+  }
+
+  /**
+   * Sets a file to require before creating the service.
+   *
+   * @param  string              $file A full pathname to include
+   *
+   * @return sfServiceDefinition The current instance
+   */
+  public function setFile($file)
+  {
+    $this->file = $file;
+
+    return $this;
+  }
+
+  /**
+   * Gets the file to require before creating the service.
+   *
+   * @return string The full pathname to include
+   */
+  public function getFile()
+  {
+    return $this->file;
+  }
+
+  /**
+   * Sets if the service must be shared or not.
+   *
+   * @param  Boolean             $shared Whether the service must be shared or not
+   *
+   * @return sfServiceDefinition The current instance
+   */
+  public function setShared($shared)
+  {
+    $this->shared = (Boolean) $shared;
+
+    return $this;
+  }
+
+  /**
+   * Returns true if the service must be shared.
+   *
+   * @return Boolean true if the service is shared, false otherwise
+   */
+  public function isShared()
+  {
+    return $this->shared;
+  }
+
+  /**
+   * Sets a configurator to call after the service is fully initialized.
+   *
+   * @param  mixed               $callable A PHP callable
+   *
+   * @return sfServiceDefinition The current instance
+   */
+  public function setConfigurator($callable)
+  {
+    $this->configurator = $callable;
+
+    return $this;
+  }
+
+  /**
+   * Gets the configurator to call after the service is fully initialized.
+   *
+   * @return mixed The PHP callable to call
+   */
+  public function getConfigurator()
+  {
+    return $this->configurator;
+  }
+}
diff --git a/lib/vendor/symfony/lib/service/sfServiceParameter.class.php b/lib/vendor/symfony/lib/service/sfServiceParameter.class.php
new file mode 100644
index 000000000..31e0520cd
--- /dev/null
+++ b/lib/vendor/symfony/lib/service/sfServiceParameter.class.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * sfServiceParameter represents a parameter reference.
+ *
+ * @package    symfony
+ * @subpackage service
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ * @version    SVN: $Id: sfServiceReference.php 267 2009-03-26 19:56:18Z fabien $
+ */
+class sfServiceParameter
+{
+  protected
+    $id = null;
+
+  /**
+   * Constructor.
+   *
+   * @param string $id The parameter key
+   */
+  public function __construct($id)
+  {
+    $this->id = $id;
+  }
+
+  /**
+   * __toString.
+   *
+   * @return string The parameter key
+   */
+  public function __toString()
+  {
+    return (string) $this->id;
+  }
+}
diff --git a/lib/vendor/symfony/lib/service/sfServiceReference.class.php b/lib/vendor/symfony/lib/service/sfServiceReference.class.php
new file mode 100644
index 000000000..26824bf3b
--- /dev/null
+++ b/lib/vendor/symfony/lib/service/sfServiceReference.class.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * sfServiceReference represents a service reference.
+ *
+ * @package    symfony
+ * @subpackage service
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ * @version    SVN: $Id: sfServiceReference.php 267 2009-03-26 19:56:18Z fabien $
+ */
+class sfServiceReference
+{
+  protected
+    $id = null;
+
+  /**
+   * Constructor.
+   *
+   * @param string $id The service identifier
+   */
+  public function __construct($id)
+  {
+    $this->id = $id;
+  }
+
+  /**
+   * __toString.
+   *
+   * @return string The service identifier
+   */
+  public function __toString()
+  {
+    return (string) $this->id;
+  }
+}
diff --git a/lib/vendor/symfony/lib/storage/sfCacheSessionStorage.class.php b/lib/vendor/symfony/lib/storage/sfCacheSessionStorage.class.php
index 2c702db55..34fd58597 100644
--- a/lib/vendor/symfony/lib/storage/sfCacheSessionStorage.class.php
+++ b/lib/vendor/symfony/lib/storage/sfCacheSessionStorage.class.php
@@ -40,12 +40,20 @@ class sfCacheSessionStorage extends sfStorage
   public function initialize($options = array())
   {
     // initialize parent
+
+    // bc with a slightly different name formerly used here, let's be
+    // compatible with the base class name for it from here on out
+    if (isset($options['session_cookie_http_only']))
+    {
+      $options['session_cookie_httponly'] = $options['session_cookie_http_only'];
+    }
+
     parent::initialize(array_merge(array('session_name' => 'sfproject',
                                          'session_cookie_lifetime' => '+30 days',
                                          'session_cookie_path' => '/',
                                          'session_cookie_domain' => null,
                                          'session_cookie_secure' => false,
-                                         'session_cookie_http_only' => true,
+                                         'session_cookie_httponly' => true,
                                          'session_cookie_secret' => 'sf$ecret'), $options));
 
     // create cache instance
@@ -94,7 +102,7 @@ public function initialize($options = array())
        $ua = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : 'ua';
 
        // generate new id based on random # / ip / user agent / secret
-       $this->id = md5(rand(0, 999999).$ip.$ua.$this->options['session_cookie_secret']);
+       $this->id = md5(mt_rand(0, 999999).$ip.$ua.$this->options['session_cookie_secret']);
 
        if(sfConfig::get('sf_logging_enabled'))
        {
@@ -108,14 +116,35 @@ public function initialize($options = array())
                                   $this->options['session_cookie_path'],
                                   $this->options['session_cookie_domain'],
                                   $this->options['session_cookie_secure'],
-                                  $this->options['session_cookie_http_only']);
+                                  $this->options['session_cookie_httponly']);
 
        $this->data = array();
     }
     else
     {
-      // load data from cache
-      $this->data = $this->cache->get($this->id, array());
+      // load data from cache. Watch out for the default case. We could
+      // serialize(array()) as the default to the call but that would be a performance hit
+      $raw = $this->cache->get($this->id, null);
+      if (null === $raw)
+      {
+        $this->data = array();
+      }
+      else
+      {
+        $data = @unserialize($raw);
+        // We test 'b:0' special case, because such a string would result
+        // in $data being === false, while raw is serialized
+        // see http://stackoverflow.com/questions/1369936/check-to-see-if-a-string-is-serialized
+        if ( $raw === 'b:0;' || $data !== false)
+        {
+          $this->data = $data;
+        }
+        else
+        {
+          // Probably an old cached value (BC)
+          $this->data = $raw;
+        }
+      }
 
       if(sfConfig::get('sf_logging_enabled'))
       {
@@ -208,10 +237,12 @@ public function regenerate($destroy = false)
     }
 
     // generate session id
-    $this->id = md5(rand(0, 999999).$_SERVER['REMOTE_ADDR'].$_SERVER['HTTP_USER_AGENT'].$this->options['session_cookie_secret']);
+    $ua = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : 'ua';
+
+    $this->id = md5(mt_rand(0, 999999).$_SERVER['REMOTE_ADDR'].$ua.$this->options['session_cookie_secret']);
 
     // save data to cache
-    $this->cache->set($this->id, $this->data);
+    $this->cache->set($this->id, serialize($this->data));
 
     // update session id in signed cookie
     $this->response->setCookie($this->options['session_name'],
@@ -220,7 +251,7 @@ public function regenerate($destroy = false)
                                $this->options['session_cookie_path'],
                                $this->options['session_cookie_domain'],
                                $this->options['session_cookie_secure'],
-                               $this->options['session_cookie_http_only']);
+                               $this->options['session_cookie_httponly']);
     session_id($this->id);
     return true;
   }
@@ -249,11 +280,10 @@ public function shutdown()
     // only update cache if session has changed
     if($this->dataChanged === true)
     {
-      $this->cache->set($this->id, $this->data);
+      $this->cache->set($this->id, serialize($this->data));
       if(sfConfig::get('sf_logging_enabled'))
       {
         $this->dispatcher->notify(new sfEvent($this, 'application.log', array('Storing session to cache')));
-        // $this->dispatcher->notify(new sfEvent($this, 'application.log', array(var_export($this->data, true))));
       }
     }
   }
diff --git a/lib/vendor/symfony/lib/storage/sfDatabaseSessionStorage.class.php b/lib/vendor/symfony/lib/storage/sfDatabaseSessionStorage.class.php
index 2a30b2f45..4e3362b55 100644
--- a/lib/vendor/symfony/lib/storage/sfDatabaseSessionStorage.class.php
+++ b/lib/vendor/symfony/lib/storage/sfDatabaseSessionStorage.class.php
@@ -4,7 +4,7 @@
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
  * (c) 2004-2006 Sean Kerr <sean@code-box.org>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -16,7 +16,7 @@
  * @subpackage storage
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfDatabaseSessionStorage.class.php 22037 2009-09-15 11:00:20Z fabien $
+ * @version    SVN: $Id$
  */
 abstract class sfDatabaseSessionStorage extends sfSessionStorage
 {
@@ -101,7 +101,7 @@ public function sessionOpen($path = null, $name = null)
 
     // get the database and connection
     $databaseClass = get_class($database);
-    if($databaseClass == 'sfPropelDatabase')
+    if ($databaseClass == 'sfPropelDatabase')
     {
       $this->db = Propel::getConnection($database->getParameter('name'));
     }
@@ -113,7 +113,7 @@ public function sessionOpen($path = null, $name = null)
     {
       $this->db = $database->getResource();
     }
-    
+
     $this->con = $database->getConnection();
 
     if (null === $this->db && null === $this->con)
@@ -193,13 +193,4 @@ public function regenerate($destroy = false)
 
     return $this->sessionWrite($newId, $this->sessionRead($currentId));
   }
-
-  /**
-   * Executes the shutdown procedure.
-   *
-   */
-  public function shutdown()
-  {
-    parent::shutdown();
-  }
 }
diff --git a/lib/vendor/symfony/lib/storage/sfMySQLSessionStorage.class.php b/lib/vendor/symfony/lib/storage/sfMySQLSessionStorage.class.php
index 2a635a271..f16815611 100644
--- a/lib/vendor/symfony/lib/storage/sfMySQLSessionStorage.class.php
+++ b/lib/vendor/symfony/lib/storage/sfMySQLSessionStorage.class.php
@@ -19,7 +19,7 @@
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
  * @author     Julien Garand <julien.garand@gmail.com>
- * @version    SVN: $Id: sfMySQLSessionStorage.class.php 24590 2009-11-30 18:28:13Z FabianLange $
+ * @version    SVN: $Id$
  */
 class sfMySQLSessionStorage extends sfDatabaseSessionStorage
 {
diff --git a/lib/vendor/symfony/lib/storage/sfMySQLiSessionStorage.class.php b/lib/vendor/symfony/lib/storage/sfMySQLiSessionStorage.class.php
index adbd115b7..4f7965aee 100644
--- a/lib/vendor/symfony/lib/storage/sfMySQLiSessionStorage.class.php
+++ b/lib/vendor/symfony/lib/storage/sfMySQLiSessionStorage.class.php
@@ -20,7 +20,7 @@
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
  * @author     Julien Garand <julien.garand@gmail.com>
- * @version    SVN: $Id: sfMySQLiSessionStorage.class.php 24590 2009-11-30 18:28:13Z FabianLange $
+ * @version    SVN: $Id$
  */
 class sfMySQLiSessionStorage extends sfMySQLSessionStorage
 {
diff --git a/lib/vendor/symfony/lib/storage/sfNoStorage.class.php b/lib/vendor/symfony/lib/storage/sfNoStorage.class.php
index ac109e0cd..529d1990a 100644
--- a/lib/vendor/symfony/lib/storage/sfNoStorage.class.php
+++ b/lib/vendor/symfony/lib/storage/sfNoStorage.class.php
@@ -19,7 +19,7 @@
  * @package    symfony
  * @subpackage storage
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfNoStorage.class.php 9942 2008-06-27 18:00:49Z fabien $
+ * @version    SVN: $Id$
  */
 class sfNoStorage extends sfStorage
 {
diff --git a/lib/vendor/symfony/lib/storage/sfPDOSessionStorage.class.php b/lib/vendor/symfony/lib/storage/sfPDOSessionStorage.class.php
index ca8af01dd..9f2668e57 100644
--- a/lib/vendor/symfony/lib/storage/sfPDOSessionStorage.class.php
+++ b/lib/vendor/symfony/lib/storage/sfPDOSessionStorage.class.php
@@ -19,7 +19,7 @@
  * @author     Mathew Toth <developer@poetryleague.com>
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfPDOSessionStorage.class.php 13143 2008-11-18 22:22:01Z FabianLange $
+ * @version    SVN: $Id$
  */
 class sfPDOSessionStorage extends sfDatabaseSessionStorage
 {
@@ -115,7 +115,7 @@ public function sessionRead($id)
       $sessionRows = $stmt->fetchAll(PDO::FETCH_NUM);
       if (count($sessionRows) == 1)
       {
-        return $sessionRows[0][0];
+        return is_resource($sessionRows[0][0]) ? stream_get_contents($sessionRows[0][0]) : $sessionRows[0][0];
       }
       else
       {
diff --git a/lib/vendor/symfony/lib/storage/sfPostgreSQLSessionStorage.class.php b/lib/vendor/symfony/lib/storage/sfPostgreSQLSessionStorage.class.php
index 27c6791ae..828d69483 100644
--- a/lib/vendor/symfony/lib/storage/sfPostgreSQLSessionStorage.class.php
+++ b/lib/vendor/symfony/lib/storage/sfPostgreSQLSessionStorage.class.php
@@ -18,7 +18,7 @@
  * @subpackage storage
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfPostgreSQLSessionStorage.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfPostgreSQLSessionStorage extends sfDatabaseSessionStorage
 {
diff --git a/lib/vendor/symfony/lib/storage/sfSessionStorage.class.php b/lib/vendor/symfony/lib/storage/sfSessionStorage.class.php
index 77e3ca0c8..39534098d 100644
--- a/lib/vendor/symfony/lib/storage/sfSessionStorage.class.php
+++ b/lib/vendor/symfony/lib/storage/sfSessionStorage.class.php
@@ -21,7 +21,7 @@
  * @subpackage storage
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfSessionStorage.class.php 31471 2010-11-22 19:32:02Z fabien $
+ * @version    SVN: $Id$
  */
 class sfSessionStorage extends sfStorage
 {
diff --git a/lib/vendor/symfony/lib/storage/sfSessionTestStorage.class.php b/lib/vendor/symfony/lib/storage/sfSessionTestStorage.class.php
index 80c1305a0..5cc6b59d8 100644
--- a/lib/vendor/symfony/lib/storage/sfSessionTestStorage.class.php
+++ b/lib/vendor/symfony/lib/storage/sfSessionTestStorage.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage storage
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfSessionTestStorage.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfSessionTestStorage extends sfStorage
 {
@@ -52,11 +52,11 @@ public function initialize($options = null)
     {
       // we read session data from temp file
       $file = $this->options['session_path'].DIRECTORY_SEPARATOR.$this->sessionId.'.session';
-      $this->sessionData = file_exists($file) ? unserialize(file_get_contents($file)) : array();
+      $this->sessionData = is_file($file) ? unserialize(file_get_contents($file)) : array();
     }
     else
     {
-      $this->sessionId   = md5(uniqid(rand(), true));
+      $this->sessionId   = md5(uniqid(mt_rand(), true));
       $this->sessionData = array();
     }
   }
@@ -158,12 +158,13 @@ public function shutdown()
     if ($this->sessionId)
     {
       $current_umask = umask(0000);
-      if (!is_dir($this->options['session_path']))
+      $sessionsDir   = $this->options['session_path'];
+      if (!is_dir($sessionsDir) && !@mkdir($sessionsDir, 0777, true) && !is_dir($sessionsDir))
       {
-        mkdir($this->options['session_path'], 0777, true);
+        throw new \RuntimeException(sprintf('Logger was not able to create a directory "%s"', $sessionsDir));
       }
       umask($current_umask);
-      file_put_contents($this->options['session_path'].DIRECTORY_SEPARATOR.$this->sessionId.'.session', serialize($this->sessionData));
+      file_put_contents($sessionsDir.DIRECTORY_SEPARATOR.$this->sessionId.'.session', serialize($this->sessionData));
       $this->sessionId   = '';
       $this->sessionData = array();
     }
diff --git a/lib/vendor/symfony/lib/storage/sfStorage.class.php b/lib/vendor/symfony/lib/storage/sfStorage.class.php
index ca896c43b..2de7cb882 100644
--- a/lib/vendor/symfony/lib/storage/sfStorage.class.php
+++ b/lib/vendor/symfony/lib/storage/sfStorage.class.php
@@ -16,7 +16,7 @@
  * @subpackage storage
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfStorage.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class sfStorage
 {
diff --git a/lib/vendor/symfony/lib/task/app/sfAppRoutesTask.class.php b/lib/vendor/symfony/lib/task/app/sfAppRoutesTask.class.php
index 40aecd5ec..7623daf1b 100644
--- a/lib/vendor/symfony/lib/task/app/sfAppRoutesTask.class.php
+++ b/lib/vendor/symfony/lib/task/app/sfAppRoutesTask.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfAppRoutesTask.class.php 23549 2009-11-03 09:10:12Z fabien $
+ * @version    SVN: $Id$
  */
 class sfAppRoutesTask extends sfBaseTask
 {
diff --git a/lib/vendor/symfony/lib/task/cache/sfCacheClearTask.class.php b/lib/vendor/symfony/lib/task/cache/sfCacheClearTask.class.php
index af94f822b..1f2d28cb5 100644
--- a/lib/vendor/symfony/lib/task/cache/sfCacheClearTask.class.php
+++ b/lib/vendor/symfony/lib/task/cache/sfCacheClearTask.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfCacheClearTask.class.php 23922 2009-11-14 14:58:38Z fabien $
+ * @version    SVN: $Id$
  */
 class sfCacheClearTask extends sfBaseTask
 {
@@ -78,7 +78,7 @@ protected function execute($arguments = array(), $options = array())
     }
 
     // finder to find directories (1 level) in a directory
-    $dirFinder = sfFinder::type('dir')->discard('.sf')->maxdepth(0)->relative();
+    $dirFinder = sfFinder::type('dir')->discard('.*')->maxdepth(0)->relative();
 
     // iterate through applications
     $apps = null === $options['app'] ? $dirFinder->in(sfConfig::get('sf_apps_dir')) : array($options['app']);
@@ -125,7 +125,7 @@ protected function execute($arguments = array(), $options = array())
     // clear global cache
     if (null === $options['app'] && 'all' == $options['type'])
     {
-      $this->getFilesystem()->remove(sfFinder::type('file')->discard('.sf')->in(sfConfig::get('sf_cache_dir')));
+      $this->getFilesystem()->remove(sfFinder::type('file')->discard('.*')->in(sfConfig::get('sf_cache_dir')));
     }
   }
 
@@ -150,7 +150,7 @@ protected function clearConfigCache(sfApplicationConfiguration $appConfiguration
     if (is_dir($subDir))
     {
       // remove cache files
-      $this->getFilesystem()->remove(sfFinder::type('file')->discard('.sf')->in($subDir));
+      $this->getFilesystem()->remove(sfFinder::type('file')->discard('.*')->in($subDir));
     }
   }
 
@@ -191,7 +191,7 @@ protected function clearModuleCache(sfApplicationConfiguration $appConfiguration
     if (is_dir($subDir))
     {
       // remove cache files
-      $this->getFilesystem()->remove(sfFinder::type('file')->discard('.sf')->in($subDir));
+      $this->getFilesystem()->remove(sfFinder::type('file')->discard('.*')->in($subDir));
     }
   }
 
@@ -230,8 +230,15 @@ public function cleanCacheFromFactoryConfig($class, $parameters = array())
         }
         $class = $class['class'];
       }
-      $cache = new $class($parameters);
-      $cache->clean();
+      try
+      {
+        $cache = new $class($parameters);
+        $cache->clean();
+      }
+      catch (Exception $e)
+      {
+        $this->logSection('error', $e->getMessage(), 255, 'ERROR');
+      }
     }
   }
 
diff --git a/lib/vendor/symfony/lib/task/configure/sfConfigureAuthorTask.class.php b/lib/vendor/symfony/lib/task/configure/sfConfigureAuthorTask.class.php
index 2d0852248..4eb20d9a1 100644
--- a/lib/vendor/symfony/lib/task/configure/sfConfigureAuthorTask.class.php
+++ b/lib/vendor/symfony/lib/task/configure/sfConfigureAuthorTask.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfConfigureAuthorTask.class.php 6978 2008-01-06 18:53:47Z fabien $
+ * @version    SVN: $Id$
  */
 class sfConfigureAuthorTask extends sfBaseTask
 {
diff --git a/lib/vendor/symfony/lib/task/generator/sfGenerateAppTask.class.php b/lib/vendor/symfony/lib/task/generator/sfGenerateAppTask.class.php
index 4a8615d0d..21f1e3e3e 100644
--- a/lib/vendor/symfony/lib/task/generator/sfGenerateAppTask.class.php
+++ b/lib/vendor/symfony/lib/task/generator/sfGenerateAppTask.class.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfGeneratorBaseTask.class.php');
+require_once(__DIR__.'/sfGeneratorBaseTask.class.php');
 
 /**
  * Generates a new application.
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfGenerateAppTask.class.php 24039 2009-11-16 17:52:14Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfGenerateAppTask extends sfGeneratorBaseTask
 {
@@ -101,7 +101,7 @@ protected function execute($arguments = array(), $options = array())
     }
     else
     {
-      $skeletonDir = dirname(__FILE__).'/skeleton/app';
+      $skeletonDir = __DIR__.'/skeleton/app';
     }
 
     // Create basic application structure
@@ -118,7 +118,7 @@ protected function execute($arguments = array(), $options = array())
 
     if (true === $options['csrf-secret'])
     {
-      $options['csrf-secret'] = sha1(rand(111111111, 99999999).getmypid());
+      $options['csrf-secret'] = sha1(mt_rand(11111111, 99999999).getmypid());
     }
 
     // Set no_script_name value in settings.yml for production environment
diff --git a/lib/vendor/symfony/lib/task/generator/sfGenerateModuleTask.class.php b/lib/vendor/symfony/lib/task/generator/sfGenerateModuleTask.class.php
index 7c04cafac..ba0137367 100644
--- a/lib/vendor/symfony/lib/task/generator/sfGenerateModuleTask.class.php
+++ b/lib/vendor/symfony/lib/task/generator/sfGenerateModuleTask.class.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfGeneratorBaseTask.class.php');
+require_once(__DIR__.'/sfGeneratorBaseTask.class.php');
 
 /**
  * Generates a new module.
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfGenerateModuleTask.class.php 23922 2009-11-14 14:58:38Z fabien $
+ * @version    SVN: $Id$
  */
 class sfGenerateModuleTask extends sfGeneratorBaseTask
 {
@@ -96,7 +96,7 @@ protected function execute($arguments = array(), $options = array())
     }
     else
     {
-      $skeletonDir = dirname(__FILE__).'/skeleton/module';
+      $skeletonDir = __DIR__.'/skeleton/module';
     }
 
     // create basic application structure
diff --git a/lib/vendor/symfony/lib/task/generator/sfGenerateProjectTask.class.php b/lib/vendor/symfony/lib/task/generator/sfGenerateProjectTask.class.php
old mode 100644
new mode 100755
index d3d0da3ca..1cfcb4343
--- a/lib/vendor/symfony/lib/task/generator/sfGenerateProjectTask.class.php
+++ b/lib/vendor/symfony/lib/task/generator/sfGenerateProjectTask.class.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfGeneratorBaseTask.class.php');
+require_once(__DIR__.'/sfGeneratorBaseTask.class.php');
 
 /**
  * Generates a new project.
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfGenerateProjectTask.class.php 30530 2010-08-04 16:38:41Z fabien $
+ * @version    SVN: $Id$
  */
 class sfGenerateProjectTask extends sfGeneratorBaseTask
 {
@@ -59,10 +59,7 @@ protected function configure()
 If the current directory already contains a symfony project,
 it throws a [sfCommandException|COMMENT].
 
-By default, the task configures Doctrine as the ORM. If you want to use
-Propel, use the [--orm|COMMENT] option:
-
-  [./symfony generate:project blog --orm=Propel|INFO]
+By default, the task configures Doctrine as the ORM.
 
 If you don't want to use an ORM, pass [none|COMMENT] to [--orm|COMMENT] option:
 
@@ -90,7 +87,7 @@ protected function execute($arguments = array(), $options = array())
       throw new sfCommandException(sprintf('A symfony project already exists in this directory (%s).', getcwd()));
     }
 
-    if (!in_array(strtolower($options['orm']), array('propel', 'doctrine', 'none')))
+    if (!in_array(strtolower($options['orm']), array('doctrine', 'none')))
     {
       throw new InvalidArgumentException(sprintf('Invalid ORM name "%s".', $options['orm']));
     }
@@ -107,11 +104,11 @@ protected function execute($arguments = array(), $options = array())
     $this->options = $options;
 
     // create basic project structure
-    $this->installDir(dirname(__FILE__).'/skeleton/project');
+    $this->installDir(__DIR__.'/skeleton/project');
 
     // update ProjectConfiguration class (use a relative path when the symfony core is nested within the project)
     $symfonyCoreAutoload = 0 === strpos(sfConfig::get('sf_symfony_lib_dir'), sfConfig::get('sf_root_dir')) ?
-      sprintf('dirname(__FILE__).\'/..%s/autoload/sfCoreAutoload.class.php\'', str_replace(sfConfig::get('sf_root_dir'), '', sfConfig::get('sf_symfony_lib_dir'))) :
+      sprintf('__DIR__.\'/..%s/autoload/sfCoreAutoload.class.php\'', str_replace(sfConfig::get('sf_root_dir'), '', sfConfig::get('sf_symfony_lib_dir'))) :
       var_export(sfConfig::get('sf_symfony_lib_dir').'/autoload/sfCoreAutoload.class.php', true);
 
     $this->replaceTokens(array(sfConfig::get('sf_config_dir')), array('SYMFONY_CORE_AUTOLOAD' => str_replace('\\', '/', $symfonyCoreAutoload)));
@@ -126,9 +123,9 @@ protected function execute($arguments = array(), $options = array())
     $this->replaceTokens();
 
     // execute the choosen ORM installer script
-    if (in_array($options['orm'], array('Doctrine', 'Propel')))
+    if ('Doctrine' === $options['orm'])
     {
-      include dirname(__FILE__).'/../../plugins/sf'.$options['orm'].'Plugin/config/installer.php';
+      include __DIR__.'/../../plugins/sf'.$options['orm'].'Plugin/config/installer.php';
     }
 
     // execute a custom installer
diff --git a/lib/vendor/symfony/lib/task/generator/sfGeneratorBaseTask.class.php b/lib/vendor/symfony/lib/task/generator/sfGeneratorBaseTask.class.php
index 778eb4112..163a39dcd 100644
--- a/lib/vendor/symfony/lib/task/generator/sfGeneratorBaseTask.class.php
+++ b/lib/vendor/symfony/lib/task/generator/sfGeneratorBaseTask.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfGeneratorBaseTask.class.php 6931 2008-01-04 06:31:12Z fabien $
+ * @version    SVN: $Id$
  */
 abstract class sfGeneratorBaseTask extends sfBaseTask
 {
diff --git a/lib/vendor/symfony/lib/task/generator/skeleton/app/web/index.php b/lib/vendor/symfony/lib/task/generator/skeleton/app/web/index.php
index 5b19abdaf..abf55a39c 100644
--- a/lib/vendor/symfony/lib/task/generator/skeleton/app/web/index.php
+++ b/lib/vendor/symfony/lib/task/generator/skeleton/app/web/index.php
@@ -1,7 +1,7 @@
 <?php
 
 ##IP_CHECK##
-require_once(dirname(__FILE__).'/../config/ProjectConfiguration.class.php');
+require_once(__DIR__.'/../config/ProjectConfiguration.class.php');
 
 $configuration = ProjectConfiguration::getApplicationConfiguration('##APP_NAME##', '##ENVIRONMENT##', ##IS_DEBUG##);
 sfContext::createInstance($configuration)->dispatch();
diff --git a/lib/vendor/symfony/lib/task/generator/skeleton/module/module/actions/actions.class.php b/lib/vendor/symfony/lib/task/generator/skeleton/module/module/actions/actions.class.php
index 17e6ba204..3eb7d1c4e 100644
--- a/lib/vendor/symfony/lib/task/generator/skeleton/module/module/actions/actions.class.php
+++ b/lib/vendor/symfony/lib/task/generator/skeleton/module/module/actions/actions.class.php
@@ -6,15 +6,15 @@
  * @package    ##PROJECT_NAME##
  * @subpackage ##MODULE_NAME##
  * @author     ##AUTHOR_NAME##
- * @version    SVN: $Id: actions.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class ##MODULE_NAME##Actions extends sfActions
 {
- /**
-  * Executes index action
-  *
-  * @param sfRequest $request A request object
-  */
+  /**
+   * Executes index action
+   *
+   * @param sfRequest $request A request object
+   */
   public function executeIndex(sfWebRequest $request)
   {
     $this->forward('default', 'module');
diff --git a/lib/vendor/symfony/lib/task/generator/skeleton/module/test/actionsTest.php b/lib/vendor/symfony/lib/task/generator/skeleton/module/test/actionsTest.php
index f487ff8e5..7f70b9558 100644
--- a/lib/vendor/symfony/lib/task/generator/skeleton/module/test/actionsTest.php
+++ b/lib/vendor/symfony/lib/task/generator/skeleton/module/test/actionsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-include(dirname(__FILE__).'/../../bootstrap/functional.php');
+include(__DIR__.'/../../bootstrap/functional.php');
 
 $browser = new sfTestFunctional(new sfBrowser());
 
diff --git a/lib/vendor/symfony/lib/task/generator/skeleton/project/lib/form/BaseForm.class.php b/lib/vendor/symfony/lib/task/generator/skeleton/project/lib/form/BaseForm.class.php
index 96793fed2..2d726089a 100644
--- a/lib/vendor/symfony/lib/task/generator/skeleton/project/lib/form/BaseForm.class.php
+++ b/lib/vendor/symfony/lib/task/generator/skeleton/project/lib/form/BaseForm.class.php
@@ -6,7 +6,7 @@
  * @package    ##PROJECT_NAME##
  * @subpackage form
  * @author     ##AUTHOR_NAME## 
- * @version    SVN: $Id: BaseForm.class.php 20147 2009-07-13 11:46:57Z FabianLange $
+ * @version    SVN: $Id$
  */
 class BaseForm extends sfFormSymfony
 {
diff --git a/lib/vendor/symfony/lib/task/generator/skeleton/project/symfony b/lib/vendor/symfony/lib/task/generator/skeleton/project/symfony
old mode 100755
new mode 100644
index e28569c9c..5ce2281d8
--- a/lib/vendor/symfony/lib/task/generator/skeleton/project/symfony
+++ b/lib/vendor/symfony/lib/task/generator/skeleton/project/symfony
@@ -9,6 +9,6 @@
  * file that was distributed with this source code.
  */
 
-chdir(dirname(__FILE__));
-require_once(dirname(__FILE__).'/config/ProjectConfiguration.class.php');
+chdir(__DIR__);
+require_once(__DIR__.'/config/ProjectConfiguration.class.php');
 include(sfCoreAutoload::getInstance()->getBaseDir().'/command/cli.php');
diff --git a/lib/vendor/symfony/lib/task/generator/skeleton/project/test/bootstrap/functional.php b/lib/vendor/symfony/lib/task/generator/skeleton/project/test/bootstrap/functional.php
index 7e174f88f..72185ae87 100644
--- a/lib/vendor/symfony/lib/task/generator/skeleton/project/test/bootstrap/functional.php
+++ b/lib/vendor/symfony/lib/task/generator/skeleton/project/test/bootstrap/functional.php
@@ -18,7 +18,7 @@
   $app = array_pop($dirPieces);
 }
 
-require_once dirname(__FILE__).'/../../config/ProjectConfiguration.class.php';
+require_once __DIR__.'/../../config/ProjectConfiguration.class.php';
 $configuration = ProjectConfiguration::getApplicationConfiguration($app, 'test', isset($debug) ? $debug : true);
 sfContext::createInstance($configuration);
 
diff --git a/lib/vendor/symfony/lib/task/generator/skeleton/project/test/bootstrap/unit.php b/lib/vendor/symfony/lib/task/generator/skeleton/project/test/bootstrap/unit.php
index 05601159c..74d6e0cfc 100644
--- a/lib/vendor/symfony/lib/task/generator/skeleton/project/test/bootstrap/unit.php
+++ b/lib/vendor/symfony/lib/task/generator/skeleton/project/test/bootstrap/unit.php
@@ -8,10 +8,10 @@
  * file that was distributed with this source code.
  */
 
-$_test_dir = realpath(dirname(__FILE__).'/..');
+$_test_dir = realpath(__DIR__.'/..');
 
 // configuration
-require_once dirname(__FILE__).'/../../config/ProjectConfiguration.class.php';
+require_once __DIR__.'/../../config/ProjectConfiguration.class.php';
 $configuration = ProjectConfiguration::hasActive() ? ProjectConfiguration::getActive() : new ProjectConfiguration(realpath($_test_dir.'/..'));
 
 // autoloader
diff --git a/lib/vendor/symfony/lib/task/help/sfHelpTask.class.php b/lib/vendor/symfony/lib/task/help/sfHelpTask.class.php
index da9c4c0dd..1f4ac9e21 100644
--- a/lib/vendor/symfony/lib/task/help/sfHelpTask.class.php
+++ b/lib/vendor/symfony/lib/task/help/sfHelpTask.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfHelpTask.class.php 23922 2009-11-14 14:58:38Z fabien $
+ * @version    SVN: $Id$
  */
 class sfHelpTask extends sfCommandApplicationTask
 {
diff --git a/lib/vendor/symfony/lib/task/help/sfListTask.class.php b/lib/vendor/symfony/lib/task/help/sfListTask.class.php
index 7d6852bfe..c167ae807 100644
--- a/lib/vendor/symfony/lib/task/help/sfListTask.class.php
+++ b/lib/vendor/symfony/lib/task/help/sfListTask.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfListTask.class.php 21428 2009-08-25 11:24:13Z fabien $
+ * @version    SVN: $Id$
  */
 class sfListTask extends sfCommandApplicationTask
 {
@@ -154,7 +154,7 @@ protected function outputAsXml($namespace, $tasks)
         $currentNamespace = $task->getNamespace();
         $namespacesXML->appendChild($namespaceArrayXML[$task->getNamespace()] = $dom->createElement('namespace'));
 
-        $namespaceArrayXML[$task->getNamespace()]->setAttribute('id', $task->getNamespace() ? $task->getNamespace() : '_global');
+        $namespaceArrayXML[$task->getNamespace()]->setAttribute('id', $task->getNamespace() ?: '_global');
       }
 
       if (!$namespace)
@@ -172,6 +172,6 @@ protected function outputAsXml($namespace, $tasks)
       $tasksXML->appendChild($node);
     }
 
-    echo $dom->saveXml();
+    echo $dom->saveXML();
   }
 }
diff --git a/lib/vendor/symfony/lib/task/i18n/sfI18nExtractTask.class.php b/lib/vendor/symfony/lib/task/i18n/sfI18nExtractTask.class.php
index 84476db98..95f6fa8f6 100644
--- a/lib/vendor/symfony/lib/task/i18n/sfI18nExtractTask.class.php
+++ b/lib/vendor/symfony/lib/task/i18n/sfI18nExtractTask.class.php
@@ -9,7 +9,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -20,7 +20,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfI18nExtractTask.class.php 9883 2008-06-26 09:04:13Z FabianLange $
+ * @version    SVN: $Id$
  */
 class sfI18nExtractTask extends sfBaseTask
 {
@@ -35,6 +35,7 @@ protected function configure()
     ));
 
     $this->addOptions(array(
+      new sfCommandOption('env', null, sfCommandOption::PARAMETER_OPTIONAL, 'The environment', 'dev'),
       new sfCommandOption('display-new', null, sfCommandOption::PARAMETER_NONE, 'Output all new found strings'),
       new sfCommandOption('display-old', null, sfCommandOption::PARAMETER_NONE, 'Output all old strings'),
       new sfCommandOption('auto-save', null, sfCommandOption::PARAMETER_NONE, 'Save the new strings'),
@@ -54,6 +55,10 @@ protected function configure()
 By default, the task only displays the number of new and old strings
 it found in the current project.
 
+You can specify project environment by setting option:
+
+  [./symfony i18n:extract --env=ENVIRONMENT|INFO]
+
 If you want to display the new strings, use the [--display-new|COMMENT] option:
 
   [./symfony i18n:extract --display-new frontend fr|INFO]
@@ -63,7 +68,7 @@ protected function configure()
   [./symfony i18n:extract --auto-save frontend fr|INFO]
 
 If you want to display strings that are present in the i18n messages
-catalogue but are not found in the application, use the 
+catalogue but are not found in the application, use the
 [--display-old|COMMENT] option:
 
   [./symfony i18n:extract --display-old frontend fr|INFO]
@@ -98,7 +103,7 @@ public function execute($arguments = array(), $options = array())
 
     if ($options['display-new'])
     {
-      $this->logSection('i18n', sprintf('display new i18n strings', count($extract->getOldMessages())));
+      $this->logSection('i18n', sprintf('display "%d" new i18n strings', count($extract->getOldMessages())));
       foreach ($extract->getNewMessages() as $message)
       {
         $this->log('               '.$message."\n");
@@ -114,7 +119,7 @@ public function execute($arguments = array(), $options = array())
 
     if ($options['display-old'])
     {
-      $this->logSection('i18n', sprintf('display old i18n strings', count($extract->getOldMessages())));
+      $this->logSection('i18n', sprintf('display "%d" old i18n strings', count($extract->getOldMessages())));
       foreach ($extract->getOldMessages() as $message)
       {
         $this->log('               '.$message."\n");
diff --git a/lib/vendor/symfony/lib/task/i18n/sfI18nFindTask.class.php b/lib/vendor/symfony/lib/task/i18n/sfI18nFindTask.class.php
index 355ed7f0c..f193f00cb 100644
--- a/lib/vendor/symfony/lib/task/i18n/sfI18nFindTask.class.php
+++ b/lib/vendor/symfony/lib/task/i18n/sfI18nFindTask.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfI18nFindTask.class.php 8453 2008-04-14 16:39:14Z fabien $
+ * @version    SVN: $Id$
  */
 class sfI18nFindTask extends sfBaseTask
 {
diff --git a/lib/vendor/symfony/lib/task/log/sfLogClearTask.class.php b/lib/vendor/symfony/lib/task/log/sfLogClearTask.class.php
index 966dcc699..01e9d3de4 100644
--- a/lib/vendor/symfony/lib/task/log/sfLogClearTask.class.php
+++ b/lib/vendor/symfony/lib/task/log/sfLogClearTask.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfLogClearTask.class.php 23922 2009-11-14 14:58:38Z fabien $
+ * @version    SVN: $Id$
  */
 class sfLogClearTask extends sfBaseTask
 {
diff --git a/lib/vendor/symfony/lib/task/log/sfLogRotateTask.class.php b/lib/vendor/symfony/lib/task/log/sfLogRotateTask.class.php
index 6e73bcf33..80ff429f9 100644
--- a/lib/vendor/symfony/lib/task/log/sfLogRotateTask.class.php
+++ b/lib/vendor/symfony/lib/task/log/sfLogRotateTask.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfLogRotateTask.class.php 24331 2009-11-24 13:15:01Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfLogRotateTask extends sfBaseTask
 {
diff --git a/lib/vendor/symfony/lib/task/plugin/sfPluginAddChannelTask.class.php b/lib/vendor/symfony/lib/task/plugin/sfPluginAddChannelTask.class.php
index ded73b0a8..cf330fe87 100644
--- a/lib/vendor/symfony/lib/task/plugin/sfPluginAddChannelTask.class.php
+++ b/lib/vendor/symfony/lib/task/plugin/sfPluginAddChannelTask.class.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfPluginBaseTask.class.php');
+require_once(__DIR__.'/sfPluginBaseTask.class.php');
 
 /**
  * Installs a plugin.
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPluginAddChannelTask.class.php 11750 2008-09-23 18:33:28Z Carl.Vondrick $
+ * @version    SVN: $Id$
  */
 class sfPluginAddChannelTask extends sfPluginBaseTask
 {
diff --git a/lib/vendor/symfony/lib/task/plugin/sfPluginBaseTask.class.php b/lib/vendor/symfony/lib/task/plugin/sfPluginBaseTask.class.php
index abb45dd3f..cb550e651 100644
--- a/lib/vendor/symfony/lib/task/plugin/sfPluginBaseTask.class.php
+++ b/lib/vendor/symfony/lib/task/plugin/sfPluginBaseTask.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPluginBaseTask.class.php 19273 2009-06-15 12:47:22Z fabien $
+ * @version    SVN: $Id$
  */
 abstract class sfPluginBaseTask extends sfBaseTask
 {
diff --git a/lib/vendor/symfony/lib/task/plugin/sfPluginInstallTask.class.php b/lib/vendor/symfony/lib/task/plugin/sfPluginInstallTask.class.php
index b2034a3d0..a6b1fe1f6 100644
--- a/lib/vendor/symfony/lib/task/plugin/sfPluginInstallTask.class.php
+++ b/lib/vendor/symfony/lib/task/plugin/sfPluginInstallTask.class.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfPluginBaseTask.class.php');
+require_once(__DIR__.'/sfPluginBaseTask.class.php');
 
 /**
  * Installs a plugin.
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPluginInstallTask.class.php 23922 2009-11-14 14:58:38Z fabien $
+ * @version    SVN: $Id$
  */
 class sfPluginInstallTask extends sfPluginBaseTask
 {
diff --git a/lib/vendor/symfony/lib/task/plugin/sfPluginListTask.class.php b/lib/vendor/symfony/lib/task/plugin/sfPluginListTask.class.php
index 6deb8b050..97a21efc4 100644
--- a/lib/vendor/symfony/lib/task/plugin/sfPluginListTask.class.php
+++ b/lib/vendor/symfony/lib/task/plugin/sfPluginListTask.class.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfPluginBaseTask.class.php');
+require_once(__DIR__.'/sfPluginBaseTask.class.php');
 
 /**
  * Lists installed plugins.
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPluginListTask.class.php 23922 2009-11-14 14:58:38Z fabien $
+ * @version    SVN: $Id$
  */
 class sfPluginListTask extends sfPluginBaseTask
 {
@@ -49,7 +49,7 @@ protected function execute($arguments = array(), $options = array())
     foreach ($this->getPluginManager()->getInstalledPlugins() as $package)
     {
       $alias = $this->getPluginManager()->getEnvironment()->getRegistry()->getChannel($package->getChannel())->getAlias();
-      $this->log(sprintf(' %-40s %10s-%-6s %s', $this->formatter->format($package->getPackage(), 'INFO'), $package->getVersion(), $package->getState() ? $package->getState() : null, $this->formatter->format(sprintf('# %s (%s)', $package->getChannel(), $alias), 'COMMENT')));
+      $this->log(sprintf(' %-40s %10s-%-6s %s', $this->formatter->format($package->getPackage(), 'INFO'), $package->getVersion(), $package->getState() ?: null, $this->formatter->format(sprintf('# %s (%s)', $package->getChannel(), $alias), 'COMMENT')));
     }
   }
 }
diff --git a/lib/vendor/symfony/lib/task/plugin/sfPluginPublishAssetsTask.class.php b/lib/vendor/symfony/lib/task/plugin/sfPluginPublishAssetsTask.class.php
index 9e0730397..390f632d1 100644
--- a/lib/vendor/symfony/lib/task/plugin/sfPluginPublishAssetsTask.class.php
+++ b/lib/vendor/symfony/lib/task/plugin/sfPluginPublishAssetsTask.class.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfPluginBaseTask.class.php');
+require_once(__DIR__.'/sfPluginBaseTask.class.php');
 
 /**
  * Publishes Web Assets for Core and third party plugins
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabian Lange <fabian.lange@symfony-project.com>
- * @version    SVN: $Id: sfPluginPublishAssetsTask.class.php 23922 2009-11-14 14:58:38Z fabien $
+ * @version    SVN: $Id$
  */
 class sfPluginPublishAssetsTask extends sfPluginBaseTask
 {
@@ -33,6 +33,10 @@ protected function configure()
       new sfCommandOption('core-only', '', sfCommandOption::PARAMETER_NONE, 'If set only core plugins will publish their assets'),
     ));
 
+    $this->addOptions(array(
+      new sfCommandOption('relative', '', sfCommandOption::PARAMETER_NONE, 'If set symlinks will be relative'),
+    ));
+
     $this->namespace = 'plugin';
     $this->name = 'publish-assets';
 
@@ -61,7 +65,7 @@ protected function execute($arguments = array(), $options = array())
 
     if ($diff = array_diff($arguments['plugins'], $enabledPlugins))
     {
-      throw new InvalidArgumentException('Plugin(s) not found: '.join(', ', $diff));
+      throw new InvalidArgumentException('Plugin(s) not found: '.implode(', ', $diff));
     }
 
     if ($options['core-only'])
@@ -79,7 +83,7 @@ protected function execute($arguments = array(), $options = array())
       $pluginConfiguration = $this->configuration->getPluginConfiguration($plugin);
 
       $this->logSection('plugin', 'Configuring plugin - '.$plugin);
-      $this->installPluginAssets($plugin, $pluginConfiguration->getRootDir());
+      $this->installPluginAssets($plugin, $pluginConfiguration->getRootDir(), $options['relative']);
     }
   }
 
@@ -89,13 +93,17 @@ protected function execute($arguments = array(), $options = array())
    * @param string $plugin The plugin name
    * @param string $dir    The plugin directory
    */
-  protected function installPluginAssets($plugin, $dir)
+  protected function installPluginAssets($plugin, $dir, $relative)
   {
     $webDir = $dir.DIRECTORY_SEPARATOR.'web';
 
     if (is_dir($webDir))
     {
-      $this->getFilesystem()->relativeSymlink($webDir, sfConfig::get('sf_web_dir').DIRECTORY_SEPARATOR.$plugin, true);
+    	if($relative) {
+	      $this->getFilesystem()->relativeSymlink($webDir, sfConfig::get('sf_web_dir').DIRECTORY_SEPARATOR.$plugin, true);
+    	} else {
+	      $this->getFilesystem()->symlink($webDir, sfConfig::get('sf_web_dir').DIRECTORY_SEPARATOR.$plugin, true);
+    	}
     }
   }
 }
diff --git a/lib/vendor/symfony/lib/task/plugin/sfPluginUninstallTask.class.php b/lib/vendor/symfony/lib/task/plugin/sfPluginUninstallTask.class.php
index 111b96dc7..6e5d1febb 100644
--- a/lib/vendor/symfony/lib/task/plugin/sfPluginUninstallTask.class.php
+++ b/lib/vendor/symfony/lib/task/plugin/sfPluginUninstallTask.class.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfPluginBaseTask.class.php');
+require_once(__DIR__.'/sfPluginBaseTask.class.php');
 
 /**
  * Uninstall a plugin.
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPluginUninstallTask.class.php 23922 2009-11-14 14:58:38Z fabien $
+ * @version    SVN: $Id$
  */
 class sfPluginUninstallTask extends sfPluginBaseTask
 {
diff --git a/lib/vendor/symfony/lib/task/plugin/sfPluginUpgradeTask.class.php b/lib/vendor/symfony/lib/task/plugin/sfPluginUpgradeTask.class.php
index 361c9822f..a68269274 100644
--- a/lib/vendor/symfony/lib/task/plugin/sfPluginUpgradeTask.class.php
+++ b/lib/vendor/symfony/lib/task/plugin/sfPluginUpgradeTask.class.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfPluginBaseTask.class.php');
+require_once(__DIR__.'/sfPluginBaseTask.class.php');
 
 /**
  * Upgrades a plugin.
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPluginUpgradeTask.class.php 23922 2009-11-14 14:58:38Z fabien $
+ * @version    SVN: $Id$
  */
 class sfPluginUpgradeTask extends sfPluginBaseTask
 {
diff --git a/lib/vendor/symfony/lib/task/project/sfProjectClearControllersTask.class.php b/lib/vendor/symfony/lib/task/project/sfProjectClearControllersTask.class.php
index 5bb345831..287df08bc 100644
--- a/lib/vendor/symfony/lib/task/project/sfProjectClearControllersTask.class.php
+++ b/lib/vendor/symfony/lib/task/project/sfProjectClearControllersTask.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfProjectClearControllersTask.class.php 23922 2009-11-14 14:58:38Z fabien $
+ * @version    SVN: $Id$
  */
 class sfProjectClearControllersTask extends sfBaseTask
 {
diff --git a/lib/vendor/symfony/lib/task/project/sfProjectDeployTask.class.php b/lib/vendor/symfony/lib/task/project/sfProjectDeployTask.class.php
index 4799e6f01..842a84293 100644
--- a/lib/vendor/symfony/lib/task/project/sfProjectDeployTask.class.php
+++ b/lib/vendor/symfony/lib/task/project/sfProjectDeployTask.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfProjectDeployTask.class.php 23922 2009-11-14 14:58:38Z fabien $
+ * @version    SVN: $Id$
  */
 class sfProjectDeployTask extends sfBaseTask
 {
@@ -142,14 +142,14 @@ protected function execute($arguments = array(), $options = array())
     else
     {
       $parameters = $options['rsync-options'];
-      if (file_exists($options['rsync-dir'].'/rsync_exclude.txt'))
+      if (file_exists($options['rsync-dir'].'/rsync_include.txt'))
       {
-        $parameters .= sprintf(' --exclude-from=%s/rsync_exclude.txt', $options['rsync-dir']);
+        $parameters .= sprintf(' --include-from=%s/rsync_include.txt', $options['rsync-dir']);
       }
 
-      if (file_exists($options['rsync-dir'].'/rsync_include.txt'))
+      if (file_exists($options['rsync-dir'].'/rsync_exclude.txt'))
       {
-        $parameters .= sprintf(' --include-from=%s/rsync_include.txt', $options['rsync-dir']);
+        $parameters .= sprintf(' --exclude-from=%s/rsync_exclude.txt', $options['rsync-dir']);
       }
 
       if (file_exists($options['rsync-dir'].'/rsync.txt'))
diff --git a/lib/vendor/symfony/lib/task/project/sfProjectDisableTask.class.php b/lib/vendor/symfony/lib/task/project/sfProjectDisableTask.class.php
index 7ca4788f9..e41179ec5 100644
--- a/lib/vendor/symfony/lib/task/project/sfProjectDisableTask.class.php
+++ b/lib/vendor/symfony/lib/task/project/sfProjectDisableTask.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfProjectDisableTask.class.php 23922 2009-11-14 14:58:38Z fabien $
+ * @version    SVN: $Id$
  */
 class sfProjectDisableTask extends sfBaseTask
 {
diff --git a/lib/vendor/symfony/lib/task/project/sfProjectEnableTask.class.php b/lib/vendor/symfony/lib/task/project/sfProjectEnableTask.class.php
index 1fc9d900a..bb61ef109 100644
--- a/lib/vendor/symfony/lib/task/project/sfProjectEnableTask.class.php
+++ b/lib/vendor/symfony/lib/task/project/sfProjectEnableTask.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfProjectEnableTask.class.php 23922 2009-11-14 14:58:38Z fabien $
+ * @version    SVN: $Id$
  */
 class sfProjectEnableTask extends sfBaseTask
 {
diff --git a/lib/vendor/symfony/lib/task/project/sfProjectOptimizeTask.class.php b/lib/vendor/symfony/lib/task/project/sfProjectOptimizeTask.class.php
index 6c987266d..5726e78bd 100644
--- a/lib/vendor/symfony/lib/task/project/sfProjectOptimizeTask.class.php
+++ b/lib/vendor/symfony/lib/task/project/sfProjectOptimizeTask.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfProjectOptimizeTask.class.php 32707 2011-07-01 12:54:40Z fabien $
+ * @version    SVN: $Id$
  */
 class sfProjectOptimizeTask extends sfBaseTask
 {
@@ -51,6 +51,9 @@ protected function execute($arguments = array(), $options = array())
     $modules = $this->findModules();
     $target = sfConfig::get('sf_cache_dir').'/'.$arguments['application'].'/'.$arguments['env'].'/config/configuration.php';
 
+    $current_umask = umask();
+    umask(0000);
+
     // remove existing optimization file
     if (file_exists($target))
     {
@@ -58,7 +61,7 @@ protected function execute($arguments = array(), $options = array())
     }
 
     // recreate configuration without the cache
-    $this->setConfiguration($this->createConfiguration($this->configuration->getApplication(), $this->configuration->getEnvironment()));
+    $this->setConfiguration($this->createConfiguration($arguments['application'], $arguments['env']));
 
     // initialize the context
     sfContext::createInstance($this->configuration);
@@ -66,7 +69,18 @@ protected function execute($arguments = array(), $options = array())
     // force cache generation for generated modules
     foreach ($modules as $module)
     {
-      $this->configuration->getConfigCache()->import('modules/'.$module.'/config/generator.yml', false, true);
+      $this->logSection('module', $module);
+
+      try
+      {
+        $this->configuration->getConfigCache()->checkConfig('modules/'.$module.'/config/generator.yml',  true);
+      }
+      catch (Exception $e)
+      {
+        $this->dispatcher->notifyUntil(new sfEvent($e, 'application.throw_exception'));
+
+        $this->logSection($module, $e->getMessage(), null, 'ERROR');
+      }
     }
 
     $templates = $this->findTemplates($modules);
@@ -83,6 +97,8 @@ protected function execute($arguments = array(), $options = array())
 
     $this->logSection('file+', $target);
     file_put_contents($target, '<?php return '.var_export($data, true).';');
+
+    umask($current_umask);
   }
 
   protected function optimizeGetControllerDirs($modules)
diff --git a/lib/vendor/symfony/lib/task/project/sfProjectPermissionsTask.class.php b/lib/vendor/symfony/lib/task/project/sfProjectPermissionsTask.class.php
index a0d45a776..5bf442801 100644
--- a/lib/vendor/symfony/lib/task/project/sfProjectPermissionsTask.class.php
+++ b/lib/vendor/symfony/lib/task/project/sfProjectPermissionsTask.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfProjectPermissionsTask.class.php 23922 2009-11-14 14:58:38Z fabien $
+ * @version    SVN: $Id$
  */
 class sfProjectPermissionsTask extends sfBaseTask
 {
diff --git a/lib/vendor/symfony/lib/task/project/sfProjectSendEmailsTask.class.php b/lib/vendor/symfony/lib/task/project/sfProjectSendEmailsTask.class.php
index f85942f9b..83cb92dd2 100644
--- a/lib/vendor/symfony/lib/task/project/sfProjectSendEmailsTask.class.php
+++ b/lib/vendor/symfony/lib/task/project/sfProjectSendEmailsTask.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfProjectSendEmailsTask.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfProjectSendEmailsTask extends sfBaseTask
 {
diff --git a/lib/vendor/symfony/lib/task/project/sfProjectValidateTask.class.php b/lib/vendor/symfony/lib/task/project/sfProjectValidateTask.class.php
index 86c17cb5a..1fd690e7c 100644
--- a/lib/vendor/symfony/lib/task/project/sfProjectValidateTask.class.php
+++ b/lib/vendor/symfony/lib/task/project/sfProjectValidateTask.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfProjectValidateTask.class.php 24610 2009-11-30 22:07:34Z FabianLange $
+ * @version    SVN: $Id$
  */
 class sfValidateTask extends sfBaseTask
 {
@@ -82,7 +82,7 @@ protected function formatFile($file)
 
   protected function getUpgradeClasses()
   {
-    $baseDir = dirname(__FILE__).'/validation/';
+    $baseDir = __DIR__.'/validation/';
     $classes = array();
 
     foreach (glob($baseDir.'*.class.php') as $file)
diff --git a/lib/vendor/symfony/lib/task/project/validation/sfDeprecatedClassesValidation.class.php b/lib/vendor/symfony/lib/task/project/validation/sfDeprecatedClassesValidation.class.php
index 06043d4c8..4da3c729f 100644
--- a/lib/vendor/symfony/lib/task/project/validation/sfDeprecatedClassesValidation.class.php
+++ b/lib/vendor/symfony/lib/task/project/validation/sfDeprecatedClassesValidation.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfDeprecatedClassesValidation.class.php 25411 2009-12-15 15:31:29Z fabien $
+ * @version    SVN: $Id$
  */
 class sfDeprecatedClassesValidation extends sfValidation
 {
diff --git a/lib/vendor/symfony/lib/task/project/validation/sfDeprecatedConfigurationFilesValidation.class.php b/lib/vendor/symfony/lib/task/project/validation/sfDeprecatedConfigurationFilesValidation.class.php
index 5b2d5cf27..c11c707c0 100644
--- a/lib/vendor/symfony/lib/task/project/validation/sfDeprecatedConfigurationFilesValidation.class.php
+++ b/lib/vendor/symfony/lib/task/project/validation/sfDeprecatedConfigurationFilesValidation.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfDeprecatedConfigurationFilesValidation.class.php 24610 2009-11-30 22:07:34Z FabianLange $
+ * @version    SVN: $Id$
  */
 class sfDeprecatedConfigurationFilesValidation extends sfValidation
 {
diff --git a/lib/vendor/symfony/lib/task/project/validation/sfDeprecatedHelpersValidation.class.php b/lib/vendor/symfony/lib/task/project/validation/sfDeprecatedHelpersValidation.class.php
index 7f6ac0be2..f7b458d27 100644
--- a/lib/vendor/symfony/lib/task/project/validation/sfDeprecatedHelpersValidation.class.php
+++ b/lib/vendor/symfony/lib/task/project/validation/sfDeprecatedHelpersValidation.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfDeprecatedHelpersValidation.class.php 25411 2009-12-15 15:31:29Z fabien $
+ * @version    SVN: $Id$
  */
 class sfDeprecatedHelpersValidation extends sfValidation
 {
diff --git a/lib/vendor/symfony/lib/task/project/validation/sfDeprecatedMethodsValidation.class.php b/lib/vendor/symfony/lib/task/project/validation/sfDeprecatedMethodsValidation.class.php
index 3d8b1e9be..fccd77e6f 100644
--- a/lib/vendor/symfony/lib/task/project/validation/sfDeprecatedMethodsValidation.class.php
+++ b/lib/vendor/symfony/lib/task/project/validation/sfDeprecatedMethodsValidation.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfDeprecatedMethodsValidation.class.php 25411 2009-12-15 15:31:29Z fabien $
+ * @version    SVN: $Id$
  */
 class sfDeprecatedMethodsValidation extends sfValidation
 {
diff --git a/lib/vendor/symfony/lib/task/project/validation/sfDeprecatedPluginsValidation.class.php b/lib/vendor/symfony/lib/task/project/validation/sfDeprecatedPluginsValidation.class.php
index a8769526d..18f799fea 100644
--- a/lib/vendor/symfony/lib/task/project/validation/sfDeprecatedPluginsValidation.class.php
+++ b/lib/vendor/symfony/lib/task/project/validation/sfDeprecatedPluginsValidation.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfDeprecatedPluginsValidation.class.php 25410 2009-12-15 15:19:07Z fabien $
+ * @version    SVN: $Id$
  */
 class sfDeprecatedPluginsValidation extends sfValidation
 {
diff --git a/lib/vendor/symfony/lib/task/project/validation/sfDeprecatedSettingsValidation.class.php b/lib/vendor/symfony/lib/task/project/validation/sfDeprecatedSettingsValidation.class.php
index bc098a186..9bab76074 100644
--- a/lib/vendor/symfony/lib/task/project/validation/sfDeprecatedSettingsValidation.class.php
+++ b/lib/vendor/symfony/lib/task/project/validation/sfDeprecatedSettingsValidation.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfDeprecatedSettingsValidation.class.php 25410 2009-12-15 15:19:07Z fabien $
+ * @version    SVN: $Id$
  */
 class sfDeprecatedSettingsValidation extends sfValidation
 {
diff --git a/lib/vendor/symfony/lib/task/project/validation/sfParameterHolderValidation.class.php b/lib/vendor/symfony/lib/task/project/validation/sfParameterHolderValidation.class.php
index 737d035e3..4018e3a04 100644
--- a/lib/vendor/symfony/lib/task/project/validation/sfParameterHolderValidation.class.php
+++ b/lib/vendor/symfony/lib/task/project/validation/sfParameterHolderValidation.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfParameterHolderValidation.class.php 25411 2009-12-15 15:31:29Z fabien $
+ * @version    SVN: $Id$
  */
 class sfParameterHolderValidation extends sfValidation
 {
diff --git a/lib/vendor/symfony/lib/task/project/validation/sfValidation.class.php b/lib/vendor/symfony/lib/task/project/validation/sfValidation.class.php
index 32bfaeac2..06d9aabbf 100644
--- a/lib/vendor/symfony/lib/task/project/validation/sfValidation.class.php
+++ b/lib/vendor/symfony/lib/task/project/validation/sfValidation.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidation.class.php 24610 2009-11-30 22:07:34Z FabianLange $
+ * @version    SVN: $Id$
  */
 abstract class sfValidation extends sfBaseTask
 {
diff --git a/lib/vendor/symfony/lib/task/sfBaseTask.class.php b/lib/vendor/symfony/lib/task/sfBaseTask.class.php
index 774ed2497..5e0a9a212 100644
--- a/lib/vendor/symfony/lib/task/sfBaseTask.class.php
+++ b/lib/vendor/symfony/lib/task/sfBaseTask.class.php
@@ -14,13 +14,14 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfBaseTask.class.php 24341 2009-11-24 15:01:58Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class sfBaseTask extends sfCommandApplicationTask
 {
   protected
-    $configuration = null,
-    $pluginManager = null;
+    $configuration   = null,
+    $pluginManager   = null,
+    $statusStartTime = null;
 
   /**
    * @see sfTask
@@ -60,7 +61,7 @@ protected function doRun(sfCommandManager $commandManager, $options)
       $this->configuration = $this->createConfiguration($application, $env);
     }
 
-    if (null !== $this->commandApplication && !$this->commandApplication->withTrace())
+    if (!$this->withTrace())
     {
       sfConfig::set('sf_logging_enabled', false);
     }
@@ -91,7 +92,7 @@ public function getFilesystem()
   {
     if (!isset($this->filesystem))
     {
-      if (null === $this->commandApplication || $this->commandApplication->isVerbose())
+      if ($this->isVerbose())
       {
         $this->filesystem = new sfFilesystem($this->dispatcher, $this->formatter);
       }
@@ -148,6 +149,51 @@ public function checkModuleExists($app, $module)
     }
   }
 
+  /**
+   * Checks if trace mode is enabled
+   *
+   * @return boolean
+   */
+  protected function withTrace()
+  {
+    if (null !== $this->commandApplication && !$this->commandApplication->withTrace())
+    {
+      return false;
+    }
+
+    return true;
+  }
+
+  /**
+   * Checks if verbose mode is enabled
+   *
+   * @return boolean
+   */
+  protected function isVerbose()
+  {
+    if (null !== $this->commandApplication && !$this->commandApplication->isVerbose())
+    {
+      return false;
+    }
+
+    return true;
+  }
+
+  /**
+   * Checks if debug mode is enabled
+   *
+   * @return boolean
+   */
+  protected function isDebug()
+  {
+    if (null !== $this->commandApplication && !$this->commandApplication->isDebug())
+    {
+      return false;
+    }
+
+    return true;
+  }
+
   /**
    * Creates a configuration object.
    *
@@ -164,7 +210,7 @@ protected function createConfiguration($application, $env)
 
       require_once sfConfig::get('sf_config_dir').'/ProjectConfiguration.class.php';
 
-      $configuration = ProjectConfiguration::getApplicationConfiguration($application, $env, true, null, $this->dispatcher);
+      $configuration = ProjectConfiguration::getApplicationConfiguration($application, $env, $this->isDebug(), null, $this->dispatcher);
     }
     else
     {
@@ -389,4 +435,114 @@ protected function createTask($name)
 
     return $task;
   }
+
+  /**
+   * Show status of task
+   *
+   * @param integer $done
+   * @param integer $total
+   * @param integer $size
+   * @return void
+   */
+  protected function showStatus($done, $total, $size = 30)
+  {
+    // if we go over our bound, just ignore it
+    if ($done > $total)
+    {
+      $this->statusStartTime = null;
+      return;
+    }
+
+    if (null === $this->statusStartTime)
+    {
+      $this->statusStartTime = time();
+    }
+
+    $now = time();
+    $perc = (double)($done / $total);
+    $bar = floor($perc * $size);
+
+    $statusBar = "\r[";
+    $statusBar .= str_repeat('=', $bar);
+    if ($bar < $size)
+    {
+      $statusBar .= '>';
+      $statusBar .= str_repeat(' ', $size - $bar);
+    }
+    else
+    {
+      $statusBar .= "=";
+    }
+
+    $disp = number_format($perc * 100, 0);
+
+    $statusBar .= "] $disp% ($done/$total)";
+
+    $rate = $done ? ($now - $this->statusStartTime) / $done : 0;
+    $left = $total - $done;
+    $eta = round($rate * $left, 2);
+
+    $elapsed = $now - $this->statusStartTime;
+
+    $eta = $this->convertTime($eta);
+    $elapsed = $this->convertTime($elapsed);
+
+    $memory = memory_get_usage(true);
+    if ($memory>1024*1024*1024*10)
+    {
+      $memory = sprintf('%.2fGB', $memory/1024/1024/1024);
+    }
+    elseif ($memory>1024*1024*10)
+    {
+      $memory = sprintf('%.2fMB', $memory/1024/1024);
+    }
+    elseif ($memory>1024*10)
+    {
+      $memory = sprintf('%.2fkB', $memory/1024);
+    }
+    else
+    {
+      $memory = sprintf('%.2fB', $memory);
+    }
+
+    $statusBar .= ' [ remaining: '.$eta.' | elapsed: '.$elapsed.' ] (memory: '.$memory.')     ';
+
+    echo $statusBar;
+
+    // when done, send a newline
+    if ($done == $total)
+    {
+      $this->statusStartTime = null;
+      echo "\n";
+    }
+  }
+
+  /**
+   * Convert time into humain format
+   *
+   * @param integer $time
+   * @return string
+   */
+  private function convertTime($time)
+  {
+    $string = '';
+
+    if ($time > 3600)
+    {
+      $h = (int) abs($time / 3600);
+      $time -= ($h * 3600);
+      $string .= $h. ' h ';
+    }
+
+    if ($time > 60)
+    {
+      $m = (int) abs($time / 60);
+      $time -= ($m * 60);
+      $string .= $m. ' min ';
+    }
+
+    $string .= (int) $time.' sec';
+
+    return $string;
+  }
 }
diff --git a/lib/vendor/symfony/lib/task/sfCommandApplicationTask.class.php b/lib/vendor/symfony/lib/task/sfCommandApplicationTask.class.php
index 2342aee40..e800f1d92 100644
--- a/lib/vendor/symfony/lib/task/sfCommandApplicationTask.class.php
+++ b/lib/vendor/symfony/lib/task/sfCommandApplicationTask.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -14,14 +14,18 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfCommandApplicationTask.class.php 23651 2009-11-06 08:08:54Z fabien $
+ * @version    SVN: $Id$
  */
 abstract class sfCommandApplicationTask extends sfTask
 {
   protected
-    $mailer = null,
-    $routing = null,
-    $commandApplication = null;
+    $commandApplication;
+
+  private
+    $mailer,
+    $routing,
+    $serviceContainer,
+    $factoryConfiguration;
 
   /**
    * Sets the command application instance for this task.
@@ -109,7 +113,7 @@ protected function runTask($name, $arguments = array(), $options = array())
    */
   protected function getMailer()
   {
-    if (!$this->mailer)
+    if (null === $this->mailer)
     {
       $this->mailer = $this->initializeMailer();
     }
@@ -117,13 +121,20 @@ protected function getMailer()
     return $this->mailer;
   }
 
+  /**
+   * Initialize mailer
+   *
+   * @return sfMailer A sfMailer instance
+   */
   protected function initializeMailer()
   {
-    require_once sfConfig::get('sf_symfony_lib_dir').'/vendor/swiftmailer/classes/Swift.php';
-    Swift::registerAutoload();
-    sfMailer::initialize();
+    if (!class_exists('Swift'))
+    {
+      $swift_dir = sfConfig::get('sf_symfony_lib_dir').'/vendor/swiftmailer/lib';
+      require_once $swift_dir.'/swift_required.php';
+    }
 
-    $config = sfFactoryConfigHandler::getConfiguration($this->configuration->getConfigPaths('config/factories.yml'));
+    $config = $this->getFactoryConfiguration();
 
     return new $config['mailer']['class']($this->dispatcher, $config['mailer']['param']);
   }
@@ -140,7 +151,7 @@ protected function initializeMailer()
    */
   protected function getRouting()
   {
-    if (!$this->routing)
+    if (null === $this->routing)
     {
       $this->routing = $this->initializeRouting();
     }
@@ -148,9 +159,14 @@ protected function getRouting()
     return $this->routing;
   }
 
+  /**
+   * Initialize routing
+   *
+   * @return sfRouting A sfRouting instance
+   */
   protected function initializeRouting()
   {
-    $config = sfFactoryConfigHandler::getConfiguration($this->configuration->getConfigPaths('config/factories.yml'));
+    $config = $this->getFactoryConfiguration();
     $params = array_merge($config['routing']['param'], array('load_configuration' => false, 'logging' => false));
 
     $handler = new sfRoutingConfigHandler();
@@ -163,4 +179,56 @@ protected function initializeRouting()
 
     return $routing;
   }
+
+  /**
+   * Returns the service container instance.
+   *
+   * Notice that your task should accept an application option.
+   * The routing configuration is read from the current configuration
+   * instance, which is automatically created according to the current
+   * --application option.
+   *
+   * @return sfServiceContainer An application service container
+   */
+  protected function getServiceContainer()
+  {
+    if (null === $this->serviceContainer)
+    {
+      $class = require $this->configuration->getConfigCache()->checkConfig('config/services.yml', true);
+
+      $this->serviceContainer = new $class();
+      $this->serviceContainer->setService('sf_event_dispatcher', $this->dispatcher);
+      $this->serviceContainer->setService('sf_formatter', $this->formatter);
+      $this->serviceContainer->setService('sf_routing', $this->getRouting());
+    }
+
+    return $this->serviceContainer;
+  }
+
+  /**
+   * Retrieves a service from the service container.
+   *
+   * @param  string $id The service identifier
+   *
+   * @return object The service instance
+   */
+  public function getService($id)
+  {
+    return $this->getServiceContainer()->getService($id);
+  }
+
+  /**
+   * Gets the factory configuration
+   *
+   * @return array
+   */
+  protected function getFactoryConfiguration()
+  {
+    if (null === $this->factoryConfiguration)
+    {
+      $this->factoryConfiguration = sfFactoryConfigHandler::getConfiguration($this->configuration->getConfigPaths('config/factories.yml'));
+    }
+
+    return $this->factoryConfiguration;
+  }
 }
diff --git a/lib/vendor/symfony/lib/task/sfFilesystem.class.php b/lib/vendor/symfony/lib/task/sfFilesystem.class.php
index 44bdb493e..646f72502 100644
--- a/lib/vendor/symfony/lib/task/sfFilesystem.class.php
+++ b/lib/vendor/symfony/lib/task/sfFilesystem.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfFilesystem.class.php 31247 2010-10-26 12:26:15Z fabien $
+ * @version    SVN: $Id$
  */
 class sfFilesystem
 {
@@ -65,14 +65,17 @@ public function copy($originFile, $targetFile, $options = array())
     {
       $statTarget = stat($targetFile);
       $stat_origin = stat($originFile);
-      $mostRecent = ($stat_origin['mtime'] > $statTarget['mtime']) ? true : false;
+      $mostRecent = ($stat_origin['mtime'] > $statTarget['mtime']);
     }
 
     if ($options['override'] || !file_exists($targetFile) || $mostRecent)
     {
       $this->logSection('file+', $targetFile);
-      copy($originFile, $targetFile);
+
+      return copy($originFile, $targetFile);
     }
+
+    return true;
   }
 
   /**
@@ -186,7 +189,8 @@ public function rename($origin, $target)
     }
 
     $this->logSection('rename', $origin.' > '.$target);
-    rename($origin, $target);
+
+    return rename($origin, $target);
   }
 
   /**
@@ -402,7 +406,7 @@ protected function logSection($section, $message, $size = null)
    * @param string $to   The target directory
    *
    * @return string
-   */ 
+   */
   protected function calculateRelativeDir($from, $to)
   {
     $from = $this->canonicalizePath($from);
diff --git a/lib/vendor/symfony/lib/task/sfTask.class.php b/lib/vendor/symfony/lib/task/sfTask.class.php
index 53b7345ae..ce14f153c 100644
--- a/lib/vendor/symfony/lib/task/sfTask.class.php
+++ b/lib/vendor/symfony/lib/task/sfTask.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfTask.class.php 30773 2010-08-27 19:27:41Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class sfTask
 {
@@ -124,7 +124,7 @@ public function run($arguments = array(), $options = array())
         {
           if ($indexArguments[$name]->isArray())
           {
-            $value = join(' ', (array) $value);
+            $value = implode(' ', (array) $value);
             $arguments[$pos] = isset($arguments[$pos]) ? $arguments[$pos].' '.$value : $value;
           }
           else
@@ -157,7 +157,7 @@ public function run($arguments = array(), $options = array())
         }
 
         // convert associative array
-        $value = true === $value ? $name : sprintf('%s=%s', $name, isset($indexedOptions[$name]) && $indexedOptions[$name]->isArray() ? join(' --'.$name.'=', (array) $value) : $value);
+        $value = true === $value ? $name : sprintf('%s=%s', $name, isset($indexedOptions[$name]) && $indexedOptions[$name]->isArray() ? implode(' --'.$name.'=', (array) $value) : $value);
       }
 
       // add -- before each option if needed
@@ -304,7 +304,10 @@ public function getBriefDescription()
    */
   public function getDetailedDescription()
   {
-    return preg_replace('/\[(.+?)\|(\w+)\]/se', '$this->formatter->format("$1", "$2")', $this->detailedDescription);
+    $formatter = $this->getFormatter();
+    return preg_replace_callback('/\[(.+?)\|(\w+)\]/s', function ($match) use ($formatter) {
+      return $formatter->format($match['1'], $match['2']);
+    }, $this->detailedDescription);
   }
 
   /**
@@ -465,7 +468,7 @@ public function ask($question, $style = 'QUESTION', $default = null)
 
     $ret = trim(fgets(STDIN));
 
-    return $ret ? $ret : $default;
+    return $ret ?: $default;
   }
 
   /**
@@ -571,7 +574,7 @@ public function asXml()
     $dom->formatOutput = true;
     $dom->appendChild($taskXML = $dom->createElement('task'));
     $taskXML->setAttribute('id', $this->getFullName());
-    $taskXML->setAttribute('namespace', $this->getNamespace() ? $this->getNamespace() : '_global');
+    $taskXML->setAttribute('namespace', $this->getNamespace() ?: '_global');
     $taskXML->setAttribute('name', $this->getName());
 
     $taskXML->appendChild($usageXML = $dom->createElement('usage'));
@@ -636,7 +639,7 @@ public function asXml()
       }
     }
 
-    return $dom->saveXml();
+    return $dom->saveXML();
   }
 
   /**
@@ -651,6 +654,14 @@ abstract protected function execute($arguments = array(), $options = array());
 
    protected function strlen($string)
    {
-     return function_exists('mb_strlen') ? mb_strlen($string) : strlen($string);
+     if (!function_exists('mb_strlen')) {
+         return strlen($string);
+     }
+
+     if (false === $encoding = mb_detect_encoding($string)) {
+         return strlen($string);
+     }
+
+     return mb_strlen($string, $encoding);
    }
 }
diff --git a/lib/vendor/symfony/lib/task/symfony/lime_symfony.php b/lib/vendor/symfony/lib/task/symfony/lime_symfony.php
index 6c6857560..9506e4a5e 100644
--- a/lib/vendor/symfony/lib/task/symfony/lime_symfony.php
+++ b/lib/vendor/symfony/lib/task/symfony/lime_symfony.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
diff --git a/lib/vendor/symfony/lib/task/symfony/sfSymfonyTestTask.class.php b/lib/vendor/symfony/lib/task/symfony/sfSymfonyTestTask.class.php
index f380fa6c8..db04e26ec 100644
--- a/lib/vendor/symfony/lib/task/symfony/sfSymfonyTestTask.class.php
+++ b/lib/vendor/symfony/lib/task/symfony/sfSymfonyTestTask.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfSymfonyTestTask.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfSymfonyTestTask extends sfTask
 {
@@ -35,9 +35,9 @@ protected function configure()
     $this->briefDescription = 'Launches the symfony test suite';
 
     $this->detailedDescription = <<<EOF
-The [test:all|INFO] task launches the symfony test suite:
+The [{$this->getFullName()}|INFO] task launches the symfony test suite:
 
-  [./symfony symfony:test|INFO]
+  [./symfony {$this->getFullName()}|INFO]
 EOF;
   }
 
@@ -46,11 +46,11 @@ protected function configure()
    */
   protected function execute($arguments = array(), $options = array())
   {
-    require_once(dirname(__FILE__).'/../../vendor/lime/lime.php');
-    require_once(dirname(__FILE__).'/lime_symfony.php');
+    require_once(__DIR__.'/../../vendor/lime/lime.php');
+    require_once(__DIR__.'/lime_symfony.php');
 
     // cleanup
-    require_once(dirname(__FILE__).'/../../util/sfToolkit.class.php');
+    require_once(__DIR__.'/../../util/sfToolkit.class.php');
     if ($files = glob(sys_get_temp_dir().DIRECTORY_SEPARATOR.'/sf_autoload_unit_*'))
     {
       foreach ($files as $file)
@@ -62,12 +62,12 @@ protected function execute($arguments = array(), $options = array())
     // update sfCoreAutoload
     if ($options['update-autoloader'])
     {
-      require_once(dirname(__FILE__).'/../../autoload/sfCoreAutoload.class.php');
+      require_once(__DIR__.'/../../autoload/sfCoreAutoload.class.php');
       sfCoreAutoload::make();
     }
 
     $status = false;
-    $statusFile = sys_get_temp_dir().DIRECTORY_SEPARATOR.sprintf('/.test_symfony_%s_status', md5(dirname(__FILE__)));
+    $statusFile = sys_get_temp_dir().DIRECTORY_SEPARATOR.sprintf('/.test_symfony_%s_status', md5(__DIR__));
     if ($options['only-failed'])
     {
       if (file_exists($statusFile))
@@ -77,7 +77,7 @@ protected function execute($arguments = array(), $options = array())
     }
 
     $h = new lime_symfony(array('force_colors' => $options['color'], 'verbose' => $options['trace']));
-    $h->base_dir = realpath(dirname(__FILE__).'/../../../test');
+    $h->base_dir = realpath(__DIR__.'/../../../test');
 
     // remove generated files
     if ($options['rebuild-all'])
diff --git a/lib/vendor/symfony/lib/task/test/sfLimeHarness.class.php b/lib/vendor/symfony/lib/task/test/sfLimeHarness.class.php
index da4a2c662..d6e76b2a7 100644
--- a/lib/vendor/symfony/lib/task/test/sfLimeHarness.class.php
+++ b/lib/vendor/symfony/lib/task/test/sfLimeHarness.class.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__).'/../../vendor/lime/lime.php';
+require_once __DIR__.'/../../vendor/lime/lime.php';
 
 class sfLimeHarness extends lime_harness
 {
@@ -11,13 +11,26 @@ public function addPlugins($plugins)
   {
     foreach ($plugins as $plugin)
     {
-      $this->plugins[$plugin->getRootDir().DIRECTORY_SEPARATOR.'test'.DIRECTORY_SEPARATOR] = '['.preg_replace('/Plugin$/i', '', $plugin->getName()).'] ';
+      $pluginDir = $plugin->getRootDir().DIRECTORY_SEPARATOR.'test'.DIRECTORY_SEPARATOR;
+
+      $this->plugins[$pluginDir] = '['.preg_replace('/Plugin$/i', '', $plugin->getName()).'] ';
+
+      if (true === $this->full_output)
+      {
+        $this->plugins[$pluginDir] .= $pluginDir;
+      }
     }
   }
 
   protected function get_relative_file($file)
   {
     $file = strtr($file, $this->plugins);
+
+    if (true === $this->full_output)
+    {
+      return $file;
+    }
+
     return str_replace(DIRECTORY_SEPARATOR, '/', str_replace(array(realpath($this->base_dir).DIRECTORY_SEPARATOR, $this->extension), '', $file));
   }
 }
diff --git a/lib/vendor/symfony/lib/task/test/sfTestAllTask.class.php b/lib/vendor/symfony/lib/task/test/sfTestAllTask.class.php
index 3e9fdb293..ba8974734 100644
--- a/lib/vendor/symfony/lib/task/test/sfTestAllTask.class.php
+++ b/lib/vendor/symfony/lib/task/test/sfTestAllTask.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfTestAllTask.class.php 29415 2010-05-12 06:24:54Z fabien $
+ * @version    SVN: $Id$
  */
 class sfTestAllTask extends sfTestBaseTask
 {
@@ -25,6 +25,7 @@ protected function configure()
   {
     $this->addOptions(array(
       new sfCommandOption('only-failed', 'f', sfCommandOption::PARAMETER_NONE, 'Only run tests that failed last time'),
+      new sfCommandOption('full-output', 'o', sfCommandOption::PARAMETER_NONE, 'Display full path for the test'),
       new sfCommandOption('xml', null, sfCommandOption::PARAMETER_REQUIRED, 'The file name for the JUnit compatible XML log file'),
     ));
 
@@ -62,6 +63,11 @@ protected function configure()
 options:
 
   [./symfony test:all --xml=log.xml|INFO]
+
+If you want to display full path for each test in output, add the option
+[--full-output|COMMENT] or [-o|COMMENT] :
+
+  [./symfony test:all --full-output|INFO]
 EOF;
   }
 
@@ -70,12 +76,13 @@ protected function configure()
    */
   protected function execute($arguments = array(), $options = array())
   {
-    require_once dirname(__FILE__).'/sfLimeHarness.class.php';
+    require_once __DIR__.'/sfLimeHarness.class.php';
 
     $h = new sfLimeHarness(array(
       'force_colors' => isset($options['color']) && $options['color'],
       'verbose'      => isset($options['trace']) && $options['trace'],
     ));
+    $h->full_output = $options['full-output'] ? true : false;
     $h->addPlugins(array_map(array($this->configuration, 'getPluginConfiguration'), $this->configuration->getPlugins()));
     $h->base_dir = sfConfig::get('sf_test_dir');
 
diff --git a/lib/vendor/symfony/lib/task/test/sfTestBaseTask.class.php b/lib/vendor/symfony/lib/task/test/sfTestBaseTask.class.php
index 764340f90..99170672c 100644
--- a/lib/vendor/symfony/lib/task/test/sfTestBaseTask.class.php
+++ b/lib/vendor/symfony/lib/task/test/sfTestBaseTask.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -14,17 +14,17 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfTestBaseTask.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class sfTestBaseTask extends sfBaseTask
 {
   /**
    * Filters tests through the "task.test.filter_test_files" event.
-   * 
+   *
    * @param  array $tests     An array of absolute test file paths
    * @param  array $arguments Current task arguments
    * @param  array $options   Current task options
-   * 
+   *
    * @return array The filtered array of test files
    */
   protected function filterTestFiles($tests, $arguments, $options)
@@ -35,4 +35,28 @@ protected function filterTestFiles($tests, $arguments, $options)
 
     return $event->getReturnValue();
   }
+
+  /**
+   * Checks if a plugin exists.
+   *
+   * The plugin directory must exist and have at least one file or folder
+   * inside for that plugin to exist.
+   *
+   * @param   string  $plugin
+   *
+   * @return  boolean True if the plugin exist, false otherwise
+   */
+  protected function checkPluginExists($plugin)
+  {
+    try
+    {
+      sfApplicationConfiguration::getActive()->getPluginConfiguration($plugin);
+
+      return true;
+    }
+    catch (Exception $e)
+    {
+      return false;
+    }
+  }
 }
diff --git a/lib/vendor/symfony/lib/task/test/sfTestCoverageTask.class.php b/lib/vendor/symfony/lib/task/test/sfTestCoverageTask.class.php
index 391f29f91..28d2a313b 100644
--- a/lib/vendor/symfony/lib/task/test/sfTestCoverageTask.class.php
+++ b/lib/vendor/symfony/lib/task/test/sfTestCoverageTask.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfTestCoverageTask.class.php 25036 2009-12-07 19:41:58Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfTestCoverageTask extends sfBaseTask
 {
@@ -73,7 +73,7 @@ protected function execute($arguments = array(), $options = array())
 
   protected function getTestHarness($harnessOptions = array())
   {
-    require_once dirname(__FILE__).'/sfLimeHarness.class.php';
+    require_once __DIR__.'/sfLimeHarness.class.php';
 
     $harness = new sfLimeHarness($harnessOptions);
     $harness->addPlugins(array_map(array($this->configuration, 'getPluginConfiguration'), $this->configuration->getPlugins()));
diff --git a/lib/vendor/symfony/lib/task/test/sfTestFunctionalTask.class.php b/lib/vendor/symfony/lib/task/test/sfTestFunctionalTask.class.php
index 8a1f8be07..1f0b12b03 100644
--- a/lib/vendor/symfony/lib/task/test/sfTestFunctionalTask.class.php
+++ b/lib/vendor/symfony/lib/task/test/sfTestFunctionalTask.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfTestFunctionalTask.class.php 29415 2010-05-12 06:24:54Z fabien $
+ * @version    SVN: $Id$
  */
 class sfTestFunctionalTask extends sfTestBaseTask
 {
@@ -96,7 +96,7 @@ protected function execute($arguments = array(), $options = array())
     }
     else
     {
-      require_once dirname(__FILE__).'/sfLimeHarness.class.php';
+      require_once __DIR__.'/sfLimeHarness.class.php';
 
       $h = new sfLimeHarness(array(
         'force_colors' => isset($options['color']) && $options['color'],
@@ -119,4 +119,4 @@ protected function execute($arguments = array(), $options = array())
       return $ret;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/task/test/sfTestPluginTask.class.php b/lib/vendor/symfony/lib/task/test/sfTestPluginTask.class.php
new file mode 100644
index 000000000..6cdc6cf84
--- /dev/null
+++ b/lib/vendor/symfony/lib/task/test/sfTestPluginTask.class.php
@@ -0,0 +1,75 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Launches a plugin test suite.
+ *
+ * @package     symfony
+ * @subpackage  task
+ * @author      Kris Wallsmith <kris.wallsmith@symfony-project.com>
+ * @version     SVN: $Id$
+ */
+class sfTestPluginTask extends sfTestBaseTask
+{
+  /**
+   * @see sfTask
+   */
+  protected function configure()
+  {
+    $this->addArguments(array(
+      new sfCommandArgument('plugin', sfCommandArgument::REQUIRED, 'The plugin name'),
+    ));
+
+    $this->addOptions(array(
+      new sfCommandOption('only', null, sfCommandOption::PARAMETER_REQUIRED, 'Only run "unit" or "functional" tests'),
+    ));
+
+    $this->namespace = 'test';
+    $this->name = 'plugin';
+
+    $this->briefDescription = 'Launches a plugin test suite';
+
+    $this->detailedDescription = <<<EOF
+The [test:plugin|INFO] task launches a plugin's test suite:
+
+  [./symfony test:plugin sfExamplePlugin|INFO]
+
+You can specify only unit or functional tests with the [--only|COMMENT] option:
+
+  [./symfony test:plugin sfExamplePlugin --only=unit|INFO]
+EOF;
+  }
+
+  /**
+   * @see sfTask
+   */
+  protected function execute($arguments = array(), $options = array())
+  {
+    if (false === $this->checkPluginExists($arguments['plugin']))
+    {
+      throw new sfCommandException(sprintf('The plugin "%s" does not exists', $arguments['plugin']));
+    }
+
+    if ($options['only'] && !in_array($options['only'], array('unit', 'functional')))
+    {
+      throw new sfCommandException(sprintf('The --only option must be either "unit" or "functional" ("%s" given)', $options['only']));
+    }
+
+    require_once sfConfig::get('sf_symfony_lib_dir').'/vendor/lime/lime.php';
+
+    $h = new lime_harness(new lime_output_color());
+    $h->base_dir = sfConfig::get('sf_plugins_dir').'/'.$arguments['plugin'].'/test/'.$options['only'];
+
+    $finder = sfFinder::type('file')->follow_link()->name('*Test.php');
+    $h->register($finder->in($h->base_dir));
+
+    $h->run();
+  }
+}
diff --git a/lib/vendor/symfony/lib/task/test/sfTestUnitTask.class.php b/lib/vendor/symfony/lib/task/test/sfTestUnitTask.class.php
index bdc292c8e..811d71a01 100644
--- a/lib/vendor/symfony/lib/task/test/sfTestUnitTask.class.php
+++ b/lib/vendor/symfony/lib/task/test/sfTestUnitTask.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage task
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfTestUnitTask.class.php 29415 2010-05-12 06:24:54Z fabien $
+ * @version    SVN: $Id$
  */
 class sfTestUnitTask extends sfTestBaseTask
 {
@@ -91,11 +91,12 @@ protected function execute($arguments = array(), $options = array())
     }
     else
     {
-      require_once dirname(__FILE__).'/sfLimeHarness.class.php';
+      require_once __DIR__.'/sfLimeHarness.class.php';
 
       $h = new sfLimeHarness(array(
         'force_colors' => isset($options['color']) && $options['color'],
         'verbose'      => isset($options['trace']) && $options['trace'],
+        'test_path'    => sfConfig::get('sf_cache_dir') . '/lime'
       ));
       $h->addPlugins(array_map(array($this->configuration, 'getPluginConfiguration'), $this->configuration->getPlugins()));
       $h->base_dir = sfConfig::get('sf_test_dir').'/unit';
@@ -114,4 +115,4 @@ protected function execute($arguments = array(), $options = array())
       return $ret;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/lib/test/sfTestBrowser.class.php b/lib/vendor/symfony/lib/test/sfTestBrowser.class.php
index fd0a20969..a63fb430f 100644
--- a/lib/vendor/symfony/lib/test/sfTestBrowser.class.php
+++ b/lib/vendor/symfony/lib/test/sfTestBrowser.class.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once(dirname(__FILE__).'/../vendor/lime/lime.php');
+require_once(__DIR__.'/../vendor/lime/lime.php');
 
 /*
  * This file is part of the symfony package.
@@ -19,7 +19,7 @@
  * @package    symfony
  * @subpackage test
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfTestBrowser.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfTestBrowser extends sfTestFunctional
 {
diff --git a/lib/vendor/symfony/lib/test/sfTestFunctional.class.php b/lib/vendor/symfony/lib/test/sfTestFunctional.class.php
index 797272aa5..9699e7d7f 100644
--- a/lib/vendor/symfony/lib/test/sfTestFunctional.class.php
+++ b/lib/vendor/symfony/lib/test/sfTestFunctional.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage test
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfTestFunctional.class.php 23937 2009-11-14 17:43:12Z fabien $
+ * @version    SVN: $Id$
  */
 class sfTestFunctional extends sfTestFunctionalBase
 {
diff --git a/lib/vendor/symfony/lib/test/sfTestFunctionalBase.class.php b/lib/vendor/symfony/lib/test/sfTestFunctionalBase.class.php
index 335f7af82..47d032a0c 100644
--- a/lib/vendor/symfony/lib/test/sfTestFunctionalBase.class.php
+++ b/lib/vendor/symfony/lib/test/sfTestFunctionalBase.class.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once(dirname(__FILE__).'/../vendor/lime/lime.php');
+require_once(__DIR__.'/../vendor/lime/lime.php');
 
 /*
  * This file is part of the symfony package.
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage test
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfTestFunctionalBase.class.php 28641 2010-03-21 10:20:44Z fabien $
+ * @version    SVN: $Id$
  */
 abstract class sfTestFunctionalBase
 {
diff --git a/lib/vendor/symfony/lib/test/sfTester.class.php b/lib/vendor/symfony/lib/test/sfTester.class.php
index bc5365c9b..a915eb77c 100644
--- a/lib/vendor/symfony/lib/test/sfTester.class.php
+++ b/lib/vendor/symfony/lib/test/sfTester.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage test
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfTester.class.php 13691 2008-12-03 22:17:01Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class sfTester
 {
diff --git a/lib/vendor/symfony/lib/test/sfTesterForm.class.php b/lib/vendor/symfony/lib/test/sfTesterForm.class.php
index ba0b8a731..e1e29371c 100644
--- a/lib/vendor/symfony/lib/test/sfTesterForm.class.php
+++ b/lib/vendor/symfony/lib/test/sfTesterForm.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage test
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfTesterForm.class.php 24217 2009-11-22 06:47:54Z fabien $
+ * @version    SVN: $Id$
  */
 class sfTesterForm extends sfTester
 {
@@ -95,6 +95,16 @@ public function hasErrors($value = true)
       $this->tester->is($this->form->hasErrors(), $value, sprintf('the submitted form %s.', ($value) ? 'has some errors' : 'is valid'));
     }
 
+    if ((false === $value || is_int($value) && $value != count($this->form->getErrorSchema()))
+      && $this->form->hasErrors())
+    {
+      $this->tester->diag(sprintf('%s Errors:', get_class($this->form)));
+      foreach ($this->form->getErrorSchema()->getErrors() as $key => $error)
+      {
+        $this->tester->diag(sprintf('  - %s: %s', $key, $error));
+      }
+    }
+
     return $this->getObjectToReturn();
   }
 
@@ -127,7 +137,11 @@ public function isError($field, $value = true)
 
     if (null === $field)
     {
-      $error = new sfValidatorErrorSchema(new sfValidatorPass(), $this->form->getGlobalErrors());
+      $error = new sfValidatorErrorSchema(new sfValidatorPass());
+      foreach ($this->form->getGlobalErrors() as $globalError)
+      {
+        $error->addError($globalError);
+      }
     }
     else
     {
diff --git a/lib/vendor/symfony/lib/test/sfTesterMailer.class.php b/lib/vendor/symfony/lib/test/sfTesterMailer.class.php
index fd1a5e8a8..c00e47fd3 100644
--- a/lib/vendor/symfony/lib/test/sfTesterMailer.class.php
+++ b/lib/vendor/symfony/lib/test/sfTesterMailer.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage test
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfTesterMailer.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfTesterMailer extends sfTester
 {
diff --git a/lib/vendor/symfony/lib/test/sfTesterRequest.class.php b/lib/vendor/symfony/lib/test/sfTesterRequest.class.php
index 60d4f6e7f..ac52fe094 100644
--- a/lib/vendor/symfony/lib/test/sfTesterRequest.class.php
+++ b/lib/vendor/symfony/lib/test/sfTesterRequest.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage test
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfTesterRequest.class.php 27845 2010-02-10 19:46:03Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfTesterRequest extends sfTester
 {
diff --git a/lib/vendor/symfony/lib/test/sfTesterResponse.class.php b/lib/vendor/symfony/lib/test/sfTesterResponse.class.php
index c621cd41e..4fca01923 100644
--- a/lib/vendor/symfony/lib/test/sfTesterResponse.class.php
+++ b/lib/vendor/symfony/lib/test/sfTesterResponse.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage test
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfTesterResponse.class.php 27061 2010-01-22 17:08:04Z FabianLange $
+ * @version    SVN: $Id$
  */
 class sfTesterResponse extends sfTester
 {
@@ -204,7 +204,7 @@ public function isValid($checkDTD = false)
           $filesystem = new sfFilesystem();
 
           $finder = sfFinder::type('any')->discard('.sf');
-          $filesystem->mirror(dirname(__FILE__).'/w3', $cache, $finder);
+          $filesystem->mirror(__DIR__.'/w3', $cache, $finder);
 
           $finder = sfFinder::type('file');
           $filesystem->replaceTokens($finder->in($cache), '##', '##', array('LOCAL_W3' => $local));
diff --git a/lib/vendor/symfony/lib/test/sfTesterUser.class.php b/lib/vendor/symfony/lib/test/sfTesterUser.class.php
index c24624a41..4a6ebc103 100644
--- a/lib/vendor/symfony/lib/test/sfTesterUser.class.php
+++ b/lib/vendor/symfony/lib/test/sfTesterUser.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage test
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfTesterUser.class.php 21769 2009-09-08 03:01:39Z dwhittle $
+ * @version    SVN: $Id$
  */
 class sfTesterUser extends sfTester
 {
diff --git a/lib/vendor/symfony/lib/test/sfTesterViewCache.class.php b/lib/vendor/symfony/lib/test/sfTesterViewCache.class.php
index 928552bb2..a846b31a3 100644
--- a/lib/vendor/symfony/lib/test/sfTesterViewCache.class.php
+++ b/lib/vendor/symfony/lib/test/sfTesterViewCache.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage test
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfTesterViewCache.class.php 24615 2009-11-30 22:30:46Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfTesterViewCache extends sfTester
 {
diff --git a/lib/vendor/symfony/lib/user/sfBasicSecurityUser.class.php b/lib/vendor/symfony/lib/user/sfBasicSecurityUser.class.php
index 7d394ccaa..d624d3c49 100644
--- a/lib/vendor/symfony/lib/user/sfBasicSecurityUser.class.php
+++ b/lib/vendor/symfony/lib/user/sfBasicSecurityUser.class.php
@@ -16,7 +16,7 @@
  * @subpackage user
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfBasicSecurityUser.class.php 29528 2010-05-19 13:12:27Z fabien $
+ * @version    SVN: $Id$
  */
 class sfBasicSecurityUser extends sfUser implements sfSecurityUser
 {
diff --git a/lib/vendor/symfony/lib/user/sfSecurityUser.class.php b/lib/vendor/symfony/lib/user/sfSecurityUser.class.php
index 754d895e7..87b290968 100644
--- a/lib/vendor/symfony/lib/user/sfSecurityUser.class.php
+++ b/lib/vendor/symfony/lib/user/sfSecurityUser.class.php
@@ -16,7 +16,7 @@
  * @subpackage user
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfSecurityUser.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 interface sfSecurityUser
 {
diff --git a/lib/vendor/symfony/lib/user/sfUser.class.php b/lib/vendor/symfony/lib/user/sfUser.class.php
index 87128040a..0168fca36 100644
--- a/lib/vendor/symfony/lib/user/sfUser.class.php
+++ b/lib/vendor/symfony/lib/user/sfUser.class.php
@@ -20,7 +20,7 @@
  * @subpackage user
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfUser.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfUser implements ArrayAccess
 {
diff --git a/lib/vendor/symfony/lib/util/sfBrowser.class.php b/lib/vendor/symfony/lib/util/sfBrowser.class.php
index dcb4d1157..a4f89691c 100644
--- a/lib/vendor/symfony/lib/util/sfBrowser.class.php
+++ b/lib/vendor/symfony/lib/util/sfBrowser.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfBrowser.class.php 21908 2009-09-11 12:06:21Z fabien $
+ * @version    SVN: $Id$
  */
 class sfBrowser extends sfBrowserBase
 {
diff --git a/lib/vendor/symfony/lib/util/sfBrowserBase.class.php b/lib/vendor/symfony/lib/util/sfBrowserBase.class.php
old mode 100644
new mode 100755
index 338959515..9913b73e0
--- a/lib/vendor/symfony/lib/util/sfBrowserBase.class.php
+++ b/lib/vendor/symfony/lib/util/sfBrowserBase.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfBrowserBase.class.php 28702 2010-03-23 12:02:01Z fabien $
+ * @version    SVN: $Id$
  */
 abstract class sfBrowserBase
 {
@@ -60,8 +60,7 @@ public function __construct($hostname = null, $remote = null, $options = array()
    */
   public function initialize($hostname = null, $remote = null, $options = array())
   {
-    unset($_SERVER['argv']);
-    unset($_SERVER['argc']);
+    unset($_SERVER['argv'], $_SERVER['argc']);
 
     // setup our fake environment
     $this->hostname = null === $hostname ? 'localhost' : $hostname;
@@ -700,7 +699,10 @@ public function doClick($name, $arguments = array(), $options = array())
     $query .= sprintf('|//input[((@type="submit" or @type="button") and @value="%s") or (@type="image" and @alt="%s")]', $name, $name);
     $query .= sprintf('|//button[.="%s" or @id="%s" or @name="%s"]', $name, $name, $name);
 
-    $list = $this->getResponseDomXpath()->query($query);
+    if (!$list = @$this->getResponseDomXpath()->query($query))
+    {
+      throw new InvalidArgumentException(sprintf('The name "%s" is not valid', $name));
+    }
 
     $position = isset($options['position']) ? $options['position'] - 1 : 0;
 
@@ -776,8 +778,11 @@ public function doClickElement(DOMElement $item, $arguments = array(), $options
     }
     else if ('button' == $item->nodeName || ('input' == $item->nodeName && in_array($item->getAttribute('type'), array('submit', 'button', 'image'))))
     {
-      // add the item's value to the arguments
-      $this->parseArgumentAsArray($item->getAttribute('name'), $item->getAttribute('value'), $arguments);
+      // add the item's value to the arguments if name is provided
+      if ($item->getAttribute('name'))
+      {
+        $this->parseArgumentAsArray($item->getAttribute('name'), $item->getAttribute('value'), $arguments);
+      }
 
       // use the ancestor form element
       do
@@ -796,7 +801,7 @@ public function doClickElement(DOMElement $item, $arguments = array(), $options
     {
       $url = $this->stack[$this->stackPosition]['uri'];
     }
-    $method = strtolower(isset($options['method']) ? $options['method'] : ($item->getAttribute('method') ? $item->getAttribute('method') : 'get'));
+    $method = strtolower(isset($options['method']) ? $options['method'] : ($item->getAttribute('method') ?: 'get'));
 
     // merge form default values and arguments
     $defaults = array();
@@ -1015,6 +1020,6 @@ public function fixUri($uri)
    */
   protected function newSession()
   {
-    $this->defaultServerArray['session_id'] = $_SERVER['session_id'] = md5(uniqid(rand(), true));
+    $this->defaultServerArray['session_id'] = $_SERVER['session_id'] = md5(uniqid(mt_rand(), true));
   }
 }
diff --git a/lib/vendor/symfony/lib/util/sfCallable.class.php b/lib/vendor/symfony/lib/util/sfCallable.class.php
index 547e92e37..f540858d7 100644
--- a/lib/vendor/symfony/lib/util/sfCallable.class.php
+++ b/lib/vendor/symfony/lib/util/sfCallable.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfCallable.class.php 21875 2009-09-11 05:54:39Z fabien $
+ * @version    SVN: $Id$
  */
 class sfCallable
 {
diff --git a/lib/vendor/symfony/lib/util/sfClassManipulator.class.php b/lib/vendor/symfony/lib/util/sfClassManipulator.class.php
index 14c71b86a..9f3ade68f 100644
--- a/lib/vendor/symfony/lib/util/sfClassManipulator.class.php
+++ b/lib/vendor/symfony/lib/util/sfClassManipulator.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfClassManipulator.class.php 25063 2009-12-08 06:02:07Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfClassManipulator
 {
diff --git a/lib/vendor/symfony/lib/util/sfContext.class.php b/lib/vendor/symfony/lib/util/sfContext.class.php
index 29e65cb81..c8934a5d3 100644
--- a/lib/vendor/symfony/lib/util/sfContext.class.php
+++ b/lib/vendor/symfony/lib/util/sfContext.class.php
@@ -18,15 +18,17 @@
  * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfContext.class.php 23922 2009-11-14 14:58:38Z fabien $
+ * @version    SVN: $Id$
  */
 class sfContext implements ArrayAccess
 {
   protected
-    $dispatcher          = null,
-    $configuration       = null,
-    $mailerConfiguration = array(),
-    $factories           = array();
+    $dispatcher                     = null,
+    $configuration                  = null,
+    $mailerConfiguration            = array(),
+    $serviceContainerConfiguration  = array(),
+    $factories                      = array(),
+    $hasShutdownUserAndStorage      = false;
 
   protected static
     $instances = array(),
@@ -86,6 +88,7 @@ public function initialize(sfApplicationConfiguration $configuration)
     }
 
     $this->dispatcher->connect('template.filter_parameters', array($this, 'filterTemplateParameters'));
+    $this->dispatcher->connect('response.fastcgi_finish_request', array($this, 'shutdownUserAndStorage'));
 
     // register our shutdown function
     register_shutdown_function(array($this, 'shutdown'));
@@ -240,45 +243,50 @@ public function getActionStack()
    *
    * @return sfController The current sfController implementation instance.
    */
-   public function getController()
-   {
-     return isset($this->factories['controller']) ? $this->factories['controller'] : null;
-   }
-
-   /**
-    * Retrieves the mailer.
-    *
-    * @return sfMailer The current sfMailer implementation instance.
-    */
-   public function getMailer()
-   {
-     if (!isset($this->factories['mailer']))
-     {
-       $this->factories['mailer'] = new $this->mailerConfiguration['class']($this->dispatcher, $this->mailerConfiguration);
-     }
-
-     return $this->factories['mailer'];
-   }
-
-   public function setMailerConfiguration($configuration)
-   {
-     $this->mailerConfiguration = $configuration;
-   }
-
-   /**
-    * Retrieve the logger.
-    *
-    * @return sfLogger The current sfLogger implementation instance.
-    */
-   public function getLogger()
-   {
-     if (!isset($this->factories['logger']))
-     {
-       $this->factories['logger'] = new sfNoLogger($this->dispatcher);
-     }
-
-     return $this->factories['logger'];
-   }
+  public function getController()
+  {
+    return isset($this->factories['controller']) ? $this->factories['controller'] : null;
+  }
+
+  /**
+   * Retrieves the mailer.
+   *
+   * @return sfMailer The current sfMailer implementation instance.
+   */
+  public function getMailer()
+  {
+    if (!isset($this->factories['mailer']))
+    {
+     $this->factories['mailer'] = new $this->mailerConfiguration['class']($this->dispatcher, $this->mailerConfiguration);
+    }
+
+    return $this->factories['mailer'];
+  }
+
+  /**
+   * Set mailer configuration.
+   *
+   * @param array $configuration
+   */
+  public function setMailerConfiguration($configuration)
+  {
+    $this->mailerConfiguration = $configuration;
+  }
+
+  /**
+   * Retrieve the logger.
+   *
+   * @return sfLogger The current sfLogger implementation instance.
+   */
+  public function getLogger()
+  {
+    if (!isset($this->factories['logger']))
+    {
+      $this->factories['logger'] = new sfNoLogger($this->dispatcher);
+    }
+
+    return $this->factories['logger'];
+  }
 
   /**
    * Retrieve a database connection from the database manager.
@@ -431,6 +439,47 @@ public function getUser()
     return isset($this->factories['user']) ? $this->factories['user'] : null;
   }
 
+  /**
+   * Retrieves the service container.
+   *
+   * @return sfServiceContainer The current sfServiceContainer implementation instance.
+   */
+  public function getServiceContainer()
+  {
+    if (!isset($this->factories['serviceContainer']))
+    {
+      $this->factories['serviceContainer'] = new $this->serviceContainerConfiguration['class']();
+      $this->factories['serviceContainer']->setService('sf_event_dispatcher', $this->configuration->getEventDispatcher());
+      $this->factories['serviceContainer']->setService('sf_formatter', new sfFormatter());
+      $this->factories['serviceContainer']->setService('sf_user', $this->getUser());
+      $this->factories['serviceContainer']->setService('sf_routing', $this->getRouting());
+    }
+
+    return $this->factories['serviceContainer'];
+  }
+
+  /**
+   * Set service ontainer configuration
+   *
+   * @param array $config
+   */
+  public function setServiceContainerConfiguration(array $config)
+  {
+    $this->serviceContainerConfiguration = $config;
+  }
+
+  /**
+   * Retrieves a service from the service container.
+   *
+   * @param  string $id The service identifier
+   *
+   * @return object The service instance
+   */
+  public function getService($id)
+  {
+    return $this->getServiceContainer()->getService($id);
+  }
+
   /**
    * Returns the configuration cache.
    *
@@ -440,7 +489,7 @@ public function getConfigCache()
   {
     return $this->configuration->getConfigCache();
   }
-  
+
   /**
    * Returns true if the context object exists (implements the ArrayAccess interface).
    *
@@ -544,7 +593,23 @@ public function filterTemplateParameters(sfEvent $event, $parameters)
 
     return $parameters;
   }
-  
+
+  /**
+   * Shuts the user/storage down.
+   *
+   * @internal Should be called only via invoking "response.fastcgi_finish_request" or context shutting down.
+   */
+  public function shutdownUserAndStorage()
+  {
+    if (!$this->hasShutdownUserAndStorage && $this->has('user'))
+    {
+      $this->getUser()->shutdown();
+      $this->getStorage()->shutdown();
+
+      $this->hasShutdownUserAndStorage = true;
+    }
+  }
+
   /**
    * Calls methods defined via sfEventDispatcher.
    *
@@ -588,12 +653,7 @@ public function __call($method, $arguments)
    */
   public function shutdown()
   {
-    // shutdown all factories
-    if($this->has('user'))
-    {
-      $this->getUser()->shutdown();
-      $this->getStorage()->shutdown();
-    }
+    $this->shutdownUserAndStorage();
 
     if ($this->has('routing'))
     {
diff --git a/lib/vendor/symfony/lib/util/sfDomCssSelector.class.php b/lib/vendor/symfony/lib/util/sfDomCssSelector.class.php
index 1a401d3d0..8a6d2362f 100644
--- a/lib/vendor/symfony/lib/util/sfDomCssSelector.class.php
+++ b/lib/vendor/symfony/lib/util/sfDomCssSelector.class.php
@@ -19,7 +19,7 @@
  * @package    symfony
  * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfDomCssSelector.class.php 31893 2011-01-24 18:11:45Z fabien $
+ * @version    SVN: $Id$
  */
 class sfDomCssSelector implements Countable, Iterator
 {
@@ -161,7 +161,7 @@ protected function getElementsForNode($selector, $root_node)
         // Code to deal with attribute selectors
         if (preg_match('/^(\w+|\*)(\[.+\])$/', $token, $matches))
         {
-          $tagName = $matches[1] ? $matches[1] : '*';
+          $tagName = $matches[1] ?: '*';
           preg_match_all('/
             \[
               ([\w\-]+)             # attribute
@@ -540,7 +540,7 @@ protected function tokenize_custom_selector($selector)
     {
       throw new Exception(sprintf('Unable to parse custom selector "%s".', $selector));
     }
-    return array('selector' => $matches[1], 'parameter' => isset($matches[3]) ? ($matches[3] ? $matches[3] : $matches[4]) : '');
+    return array('selector' => $matches[1], 'parameter' => isset($matches[3]) ? ($matches[3] ?: $matches[4]) : '');
   }
 
   protected function nth($cur, $result = 1, $dir = 'nextSibling')
diff --git a/lib/vendor/symfony/lib/util/sfFinder.class.php b/lib/vendor/symfony/lib/util/sfFinder.class.php
index 8779cbac4..879dd54eb 100644
--- a/lib/vendor/symfony/lib/util/sfFinder.class.php
+++ b/lib/vendor/symfony/lib/util/sfFinder.class.php
@@ -26,7 +26,7 @@
  * @package    symfony
  * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfFinder.class.php 30528 2010-08-04 16:25:14Z fabien $
+ * @version    SVN: $Id$
  */
 class sfFinder
 {
@@ -382,7 +382,7 @@ public function in()
 
       if ($this->relative)
       {
-        $new_files = str_replace(rtrim($dir, '/').'/', '', $new_files);
+        $new_files = preg_replace('#^'.preg_quote(rtrim($dir, '/'), '#').'/#', '', $new_files);
       }
 
       $files = array_merge($files, $new_files);
@@ -617,7 +617,7 @@ public static function isPathAbsolute($path)
  * @author     Richard Clamp <richardc@unixbeard.net> perl version
  * @copyright  2004-2005 Fabien Potencier <fabien.potencier@gmail.com>
  * @copyright  2002 Richard Clamp <richardc@unixbeard.net>
- * @version    SVN: $Id: sfFinder.class.php 30528 2010-08-04 16:25:14Z fabien $
+ * @version    SVN: $Id$
  */
 class sfGlobToRegex
 {
@@ -739,7 +739,7 @@ public static function glob_to_regex($glob)
  * @copyright  2004-2005 Fabien Potencier <fabien.potencier@gmail.com>
  * @copyright  2002 Richard Clamp <richardc@unixbeard.net>
  * @see        http://physics.nist.gov/cuu/Units/binary.html
- * @version    SVN: $Id: sfFinder.class.php 30528 2010-08-04 16:25:14Z fabien $
+ * @version    SVN: $Id$
  */
 class sfNumberCompare
 {
diff --git a/lib/vendor/symfony/lib/util/sfInflector.class.php b/lib/vendor/symfony/lib/util/sfInflector.class.php
index 195fb1e9f..73b7b48e4 100644
--- a/lib/vendor/symfony/lib/util/sfInflector.class.php
+++ b/lib/vendor/symfony/lib/util/sfInflector.class.php
@@ -13,7 +13,7 @@
  * @package    symfony
  * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfInflector.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfInflector
 {
@@ -27,11 +27,8 @@ class sfInflector
    */
   public static function camelize($lower_case_and_underscored_word)
   {
-    $tmp = $lower_case_and_underscored_word;
-    $tmp = sfToolkit::pregtr($tmp, array('#/(.?)#e'    => "'::'.strtoupper('\\1')",
-                                         '/(^|_|-)+(.)/e' => "strtoupper('\\2')"));
 
-    return $tmp;
+    return strtr(ucwords(strtr($lower_case_and_underscored_word, array('/' => ':: ', '_' => ' ', '-' => ' '))), array(' ' => ''));
   }
 
   /**
diff --git a/lib/vendor/symfony/lib/util/sfNamespacedParameterHolder.class.php b/lib/vendor/symfony/lib/util/sfNamespacedParameterHolder.class.php
index 1d551c0c1..3efa783f1 100644
--- a/lib/vendor/symfony/lib/util/sfNamespacedParameterHolder.class.php
+++ b/lib/vendor/symfony/lib/util/sfNamespacedParameterHolder.class.php
@@ -20,7 +20,7 @@
  * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfNamespacedParameterHolder.class.php 29521 2010-05-19 11:47:56Z fabien $
+ * @version    SVN: $Id$
  */
 class sfNamespacedParameterHolder extends sfParameterHolder
 {
diff --git a/lib/vendor/symfony/lib/util/sfParameterHolder.class.php b/lib/vendor/symfony/lib/util/sfParameterHolder.class.php
index f57dbfd63..6f46b64f3 100644
--- a/lib/vendor/symfony/lib/util/sfParameterHolder.class.php
+++ b/lib/vendor/symfony/lib/util/sfParameterHolder.class.php
@@ -19,7 +19,7 @@
  * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfParameterHolder.class.php 23922 2009-11-14 14:58:38Z fabien $
+ * @version    SVN: $Id$
  */
 class sfParameterHolder implements Serializable
 {
diff --git a/lib/vendor/symfony/lib/util/sfToolkit.class.php b/lib/vendor/symfony/lib/util/sfToolkit.class.php
index ae554e6c2..d631cde44 100644
--- a/lib/vendor/symfony/lib/util/sfToolkit.class.php
+++ b/lib/vendor/symfony/lib/util/sfToolkit.class.php
@@ -16,7 +16,7 @@
  * @subpackage util
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfToolkit.class.php 29525 2010-05-19 13:01:43Z fabien $
+ * @version    SVN: $Id$
  */
 class sfToolkit
 {
@@ -274,7 +274,7 @@ public static function arrayDeepMerge()
   public static function stringToArray($string)
   {
     preg_match_all('/
-      \s*(\w+)              # key                               \\1
+      \s*((?:\w+-)*\w+)     # key                               \\1
       \s*=\s*               # =
       (\'|")?               # values may be included in \' or " \\2
       (.*?)                 # value                             \\3
@@ -348,7 +348,14 @@ public static function literalize($value, $quoted = false)
    */
   public static function replaceConstants($value)
   {
-    return is_string($value) ? preg_replace_callback('/%(.+?)%/', create_function('$v', 'return sfConfig::has(strtolower($v[1])) ? sfConfig::get(strtolower($v[1])) : "%{$v[1]}%";'), $value) : $value;
+    if (!is_string($value))
+    {
+      return $value;
+    }
+
+    return preg_replace_callback('/%(.+?)%/', function ($v) {
+      return sfConfig::has(strtolower($v[1])) ? sfConfig::get(strtolower($v[1])) : '%'.$v[1].'%';
+    }, $value);
   }
 
   /**
@@ -373,7 +380,7 @@ public static function isArrayValuesEmpty($array)
     static $isEmpty = true;
     foreach ($array as $value)
     {
-      $isEmpty = (is_array($value)) ? self::isArrayValuesEmpty($value) : (strlen($value) == 0);
+      $isEmpty = is_array($value) ? self::isArrayValuesEmpty($value) : '' === (string)$value;
       if (!$isEmpty)
       {
         break;
@@ -501,7 +508,7 @@ public static function getArrayValueForPath($values, $name, $default = null)
    */
   public static function getPhpCli()
   {
-    $path = getenv('PATH') ? getenv('PATH') : getenv('Path');
+    $path = getenv('PATH') ?: getenv('Path');
     $suffixes = DIRECTORY_SEPARATOR == '\\' ? (getenv('PATHEXT') ? explode(PATH_SEPARATOR, getenv('PATHEXT')) : array('.exe', '.bat', '.cmd', '.com')) : array('');
     foreach (array('php5', 'php') as $phpCli)
     {
@@ -606,6 +613,6 @@ static public function addIncludePath($path, $position = 'front')
         throw new InvalidArgumentException(sprintf('Unrecognized position: "%s"', $position));
     }
 
-    return set_include_path(join(PATH_SEPARATOR, $paths));
+    return set_include_path(implode(PATH_SEPARATOR, $paths));
   }
 }
diff --git a/lib/vendor/symfony/lib/validator/i18n/sfValidatorI18nChoiceCountry.class.php b/lib/vendor/symfony/lib/validator/i18n/sfValidatorI18nChoiceCountry.class.php
index 84bcc99b7..3bf1a3f4f 100644
--- a/lib/vendor/symfony/lib/validator/i18n/sfValidatorI18nChoiceCountry.class.php
+++ b/lib/vendor/symfony/lib/validator/i18n/sfValidatorI18nChoiceCountry.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorI18nChoiceCountry.class.php 23940 2009-11-14 17:58:19Z fabien $
+ * @version    SVN: $Id$
  */
 class sfValidatorI18nChoiceCountry extends sfValidatorChoice
 {
diff --git a/lib/vendor/symfony/lib/validator/i18n/sfValidatorI18nChoiceLanguage.class.php b/lib/vendor/symfony/lib/validator/i18n/sfValidatorI18nChoiceLanguage.class.php
index 83d03badb..f89431e47 100644
--- a/lib/vendor/symfony/lib/validator/i18n/sfValidatorI18nChoiceLanguage.class.php
+++ b/lib/vendor/symfony/lib/validator/i18n/sfValidatorI18nChoiceLanguage.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorI18nChoiceLanguage.class.php 23940 2009-11-14 17:58:19Z fabien $
+ * @version    SVN: $Id$
  */
 class sfValidatorI18nChoiceLanguage extends sfValidatorChoice
 {
diff --git a/lib/vendor/symfony/lib/validator/i18n/sfValidatorI18nChoiceTimezone.class.php b/lib/vendor/symfony/lib/validator/i18n/sfValidatorI18nChoiceTimezone.class.php
index 57b8246bd..5e1bad4e4 100644
--- a/lib/vendor/symfony/lib/validator/i18n/sfValidatorI18nChoiceTimezone.class.php
+++ b/lib/vendor/symfony/lib/validator/i18n/sfValidatorI18nChoiceTimezone.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorI18nChoiceTimezone.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfValidatorI18nChoiceTimezone extends sfValidatorChoice
 {
diff --git a/lib/vendor/symfony/lib/validator/sfValidatedFile.class.php b/lib/vendor/symfony/lib/validator/sfValidatedFile.class.php
index c7d90b4e3..a6959f016 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatedFile.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatedFile.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatedFile.class.php 30915 2010-09-15 17:10:37Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfValidatedFile
 {
@@ -91,10 +91,10 @@ public function save($file = null, $fileMode = 0666, $create = true, $dirMode =
 
     if (!is_readable($directory))
     {
-      if ($create && !@mkdir($directory, $dirMode, true))
+      if ($create && !@mkdir($directory, $dirMode, true) && !is_dir($directory))
       {
         // failed to create the directory
-        throw new Exception(sprintf('Failed to create file upload directory "%s".', $directory));
+        throw new \Exception(sprintf('Failed to create file upload directory "%s".', $directory));
       }
 
       // chmod the directory since it doesn't seem to work on recursive paths
@@ -131,7 +131,7 @@ public function save($file = null, $fileMode = 0666, $create = true, $dirMode =
    */
   public function generateFilename()
   {
-    return sha1($this->getOriginalName().rand(11111, 99999)).$this->getExtension($this->getOriginalExtension());
+    return sha1($this->getOriginalName().mt_rand(11111, 99999)).$this->getExtension($this->getOriginalExtension());
   }
 
   /**
@@ -218,6 +218,19 @@ public function getType()
     return $this->type;
   }
 
+  /**
+   * Reset type
+   *
+   * @param string $type
+   * @return sfValidatedFile
+   */
+  public function resetType($type)
+  {
+    $this->type = $type;
+
+    return $this;
+  }
+
   /**
    * Returns the size of the uploaded file.
    *
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorAnd.class.php b/lib/vendor/symfony/lib/validator/sfValidatorAnd.class.php
index 1dc2ee42f..1b9f6f33d 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatorAnd.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatorAnd.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorAnd.class.php 21908 2009-09-11 12:06:21Z fabien $
+ * @version    SVN: $Id$
  */
 class sfValidatorAnd extends sfValidatorBase
 {
@@ -53,7 +53,7 @@ public function __construct($validators = null, $options = array(), $messages =
     {
       throw new InvalidArgumentException('sfValidatorAnd constructor takes a sfValidatorBase object, or a sfValidatorBase array.');
     }
-    
+
     parent::__construct($options, $messages);
   }
 
@@ -102,7 +102,7 @@ public function getValidators()
   protected function doClean($value)
   {
     $clean = $value;
-    $errors = array();
+    $errors = new sfValidatorErrorSchema($this);
     foreach ($this->validators as $validator)
     {
       try
@@ -111,7 +111,7 @@ protected function doClean($value)
       }
       catch (sfValidatorError $e)
       {
-        $errors[] = $e;
+        $errors->addError($e);
 
         if ($this->getOption('halt_on_error'))
         {
@@ -120,14 +120,14 @@ protected function doClean($value)
       }
     }
 
-    if (count($errors))
+    if ($errors->count())
     {
       if ($this->getMessage('invalid'))
       {
         throw new sfValidatorError($this, 'invalid', array('value' => $value));
       }
 
-      throw new sfValidatorErrorSchema($this, $errors);
+      throw $errors;
     }
 
     return $clean;
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorBase.class.php b/lib/vendor/symfony/lib/validator/sfValidatorBase.class.php
index 3ac0e2fe7..831db16f9 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatorBase.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatorBase.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorBase.class.php 32653 2011-06-15 18:32:02Z fabien $
+ * @version    SVN: $Id$
  */
 abstract class sfValidatorBase
 {
@@ -50,7 +50,7 @@ abstract class sfValidatorBase
    */
   public function __construct($options = array(), $messages = array())
   {
-    $this->options  = array_merge(array('required' => true, 'trim' => false, 'empty_value' => null), $this->options);
+    $this->options  = array_merge(array('required' => true, 'trim' => true, 'empty_value' => null), $this->options);
     $this->messages = array_merge(array('required' => self::$globalDefaultMessages['required'], 'invalid' => self::$globalDefaultMessages['invalid']), $this->messages);
 
     $this->configure($options, $messages);
@@ -139,7 +139,7 @@ public function addMessage($name, $value)
    */
   public function setMessage($name, $value)
   {
-    if (!in_array($name, array_keys($this->messages)))
+    if (!array_key_exists($name, $this->messages))
     {
       throw new InvalidArgumentException(sprintf('%s does not support the following error code: \'%s\'.', get_class($this), $name));
     }
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorBoolean.class.php b/lib/vendor/symfony/lib/validator/sfValidatorBoolean.class.php
index 607034592..43e476ef4 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatorBoolean.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatorBoolean.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorBoolean.class.php 10306 2008-07-15 22:12:35Z Carl.Vondrick $
+ * @version    SVN: $Id$
  */
 class sfValidatorBoolean extends sfValidatorBase
 {
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorCSRFToken.class.php b/lib/vendor/symfony/lib/validator/sfValidatorCSRFToken.class.php
index 8f5c3c7cc..51d893e70 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatorCSRFToken.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatorCSRFToken.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorCSRFToken.class.php 7902 2008-03-15 13:17:33Z fabien $
+ * @version    SVN: $Id$
  */
 class sfValidatorCSRFToken extends sfValidatorBase
 {
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorCallback.class.php b/lib/vendor/symfony/lib/validator/sfValidatorCallback.class.php
index 8e57313fb..ec631d9ef 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatorCallback.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatorCallback.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorCallback.class.php 9048 2008-05-19 09:11:23Z FabianLange $
+ * @version    SVN: $Id$
  */
 class sfValidatorCallback extends sfValidatorBase
 {
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorChoice.class.php b/lib/vendor/symfony/lib/validator/sfValidatorChoice.class.php
index 9992384e0..6280c258f 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatorChoice.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatorChoice.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorChoice.class.php 22264 2009-09-23 05:54:32Z fabien $
+ * @version    SVN: $Id$
  */
 class sfValidatorChoice extends sfValidatorBase
 {
@@ -66,6 +66,11 @@ protected function doClean($value)
     return $value;
   }
 
+  /**
+   * Get choices
+   *
+   * @return array
+   */
   public function getChoices()
   {
     $choices = $this->getOption('choices');
@@ -114,6 +119,39 @@ protected function cleanMultiple($value, $choices)
     return $value;
   }
 
+  /**
+   * Returns true if the value is empty.
+   *
+   * @param  mixed $value  The input value
+   *
+   * @return bool true if the value is empty, false otherwise
+   */
+  protected function isEmpty($value)
+  {
+    if (parent::isEmpty($value))
+    {
+      return true;
+    }
+
+    if (is_array($value))
+    {
+      $isEmpty = true;
+      foreach ($value as $v)
+      {
+        if (!parent::isEmpty($v))
+        {
+          $isEmpty = false;
+
+          break;
+        }
+      }
+
+      return $isEmpty;
+    }
+
+    return false;
+  }
+
   /**
    * Checks if a value is part of given choices (see bug #4212)
    *
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorDate.class.php b/lib/vendor/symfony/lib/validator/sfValidatorDate.class.php
index cf818ecf5..1b03cb6f8 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatorDate.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatorDate.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorDate.class.php 28959 2010-04-01 14:10:24Z fabien $
+ * @version    SVN: $Id$
  */
 class sfValidatorDate extends sfValidatorBase
 {
@@ -71,7 +71,7 @@ protected function doClean($value)
     {
       if (!preg_match($regex, $value, $match))
       {
-        throw new sfValidatorError($this, 'bad_format', array('value' => $value, 'date_format' => $this->getOption('date_format_error') ? $this->getOption('date_format_error') : $this->getOption('date_format')));
+        throw new sfValidatorError($this, 'bad_format', array('value' => $value, 'date_format' => $this->getOption('date_format_error') ?: $this->getOption('date_format')));
       }
 
       $value = $match;
@@ -174,7 +174,7 @@ protected function convertDateArrayToString($value)
     // all elements must be empty or a number
     foreach (array('year', 'month', 'day', 'hour', 'minute', 'second') as $key)
     {
-      if (isset($value[$key]) && !preg_match('#^\d+$#', $value[$key]) && !empty($value[$key]))
+      if (isset($value[$key]) && !ctype_digit((string)$value[$key]) && !empty($value[$key]))
       {
         throw new sfValidatorError($this, 'invalid', array('value' => $value));
       }
@@ -195,7 +195,7 @@ protected function convertDateArrayToString($value)
       return $this->getEmptyValue();
     }
 
-    if (!checkdate(intval($value['month']), intval($value['day']), intval($value['year'])))
+    if (!checkdate((int) $value['month'], (int) $value['day'], (int) $value['year']))
     {
       throw new sfValidatorError($this, 'invalid', array('value' => $value));
     }
@@ -215,21 +215,21 @@ protected function convertDateArrayToString($value)
 
       $clean = sprintf(
         "%04d-%02d-%02d %02d:%02d:%02d",
-        intval($value['year']),
-        intval($value['month']),
-        intval($value['day']),
-        isset($value['hour']) ? intval($value['hour']) : 0,
-        isset($value['minute']) ? intval($value['minute']) : 0,
-        isset($value['second']) ? intval($value['second']) : 0
+        (int) $value['year'],
+        (int) $value['month'],
+        (int) $value['day'],
+        isset($value['hour']) ? (int) $value['hour'] : 0,
+        isset($value['minute']) ? (int) $value['minute'] : 0,
+        isset($value['second']) ? (int) $value['second'] : 0
       );
     }
     else
     {
       $clean = sprintf(
         "%04d-%02d-%02d %02d:%02d:%02d",
-        intval($value['year']),
-        intval($value['month']),
-        intval($value['day']),
+        (int) $value['year'],
+        (int) $value['month'],
+        (int) $value['day'],
         0,
         0,
         0
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorDateRange.class.php b/lib/vendor/symfony/lib/validator/sfValidatorDateRange.class.php
index d3f638222..3758c0127 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatorDateRange.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatorDateRange.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorDateRange.class.php 32810 2011-07-21 05:18:56Z fabien $
+ * @version    SVN: $Id$
  */
 class sfValidatorDateRange extends sfValidatorBase
 {
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorDateTime.class.php b/lib/vendor/symfony/lib/validator/sfValidatorDateTime.class.php
index cb7eaaa98..7d62ace48 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatorDateTime.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatorDateTime.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorDateTime.class.php 5581 2007-10-18 13:56:14Z fabien $
+ * @version    SVN: $Id$
  */
 class sfValidatorDateTime extends sfValidatorDate
 {
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorDecorator.class.php b/lib/vendor/symfony/lib/validator/sfValidatorDecorator.class.php
index f9824b345..d4ada141a 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatorDecorator.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatorDecorator.class.php
@@ -18,7 +18,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorDecorator.class.php 7902 2008-03-15 13:17:33Z fabien $
+ * @version    SVN: $Id$
  */
 abstract class sfValidatorDecorator extends sfValidatorBase
 {
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorEmail.class.php b/lib/vendor/symfony/lib/validator/sfValidatorEmail.class.php
index 9ee4cf6b3..6de05b581 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatorEmail.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatorEmail.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorEmail.class.php 22149 2009-09-18 14:09:53Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfValidatorEmail extends sfValidatorRegex
 {
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorEqual.class.php b/lib/vendor/symfony/lib/validator/sfValidatorEqual.class.php
new file mode 100644
index 000000000..ea82435ae
--- /dev/null
+++ b/lib/vendor/symfony/lib/validator/sfValidatorEqual.class.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * sfValidatorEqual validates a value compared to another value.
+ *
+ * @package    symfony
+ * @subpackage validator
+ * @author     Yvann Boucher <yboucher@groupe-exp.com>
+ * @version    SVN: $Id$
+ */
+class sfValidatorEqual extends sfValidatorBase
+{
+  /**
+   * Configures the current validator.
+   *
+   * Available options:
+   *
+   *  * strict: If it's equal strictly or not
+   *  * value: The value to compare
+   *
+   * Available error codes:
+   *
+   *  * not_equal
+   *  * not_strictly_equal
+   *
+   * @param array $options   An array of options
+   * @param array $messages  An array of error messages
+   *
+   * @see sfValidatorBase
+   */
+  protected function configure($options = array(), $messages = array())
+  {
+    $this->addRequiredOption('value');
+    $this->addOption('strict', false);
+
+    $this->addMessage('not_equal', '%value% is not equal to %compared_value%');
+    $this->addMessage('not_strictly_equal', '%value% is not strictly equal to %compared_value%');
+  }
+
+  /**
+   * @see sfValidatorBase
+   */
+  protected function doClean($value)
+  {
+    $isStrict = $this->getOption('strict');
+
+    if (($isStrict && $value !== $this->getOption('value')) || (!$isStrict && $value != $this->getOption('value')))
+    {
+      throw new sfValidatorError($this, $isStrict ? 'not_strictly_equal' : 'not_equal', array(
+        'value'          => $value,
+        'compared_value' => $this->getOption('value'),
+      ));
+    }
+
+    return $value;
+  }
+}
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorError.class.php b/lib/vendor/symfony/lib/validator/sfValidatorError.class.php
index 24326b2da..5eab900ae 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatorError.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatorError.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorError.class.php 15393 2009-02-10 12:58:49Z fabien $
+ * @version    SVN: $Id$
  */
 class sfValidatorError extends Exception implements Serializable
 {
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorErrorSchema.class.php b/lib/vendor/symfony/lib/validator/sfValidatorErrorSchema.class.php
index d8ed13429..ca02019ab 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatorErrorSchema.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatorErrorSchema.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorErrorSchema.class.php 22446 2009-09-26 07:55:47Z fabien $
+ * @version    SVN: $Id$
  */
 class sfValidatorErrorSchema extends sfValidatorError implements ArrayAccess, Iterator, Countable
 {
@@ -28,7 +28,7 @@ class sfValidatorErrorSchema extends sfValidatorError implements ArrayAccess, It
    * Constructor.
    *
    * @param sfValidatorBase $validator  An sfValidatorBase instance
-   * @param array           $errors     An array of errors
+   * @param array           $errors     An array of errors, depreciated
    */
   public function __construct(sfValidatorBase $validator, $errors = array())
   {
@@ -39,7 +39,10 @@ public function __construct(sfValidatorBase $validator, $errors = array())
     $this->code    = '';
     $this->message = '';
 
-    $this->addErrors($errors);
+    foreach ($errors as $name => $error)
+    {
+      $this->addError($error, is_numeric($name) ? null : $name);
+    }
   }
 
   /**
@@ -54,7 +57,7 @@ public function __construct(sfValidatorBase $validator, $errors = array())
    */
   public function addError(sfValidatorError $error, $name = null)
   {
-    if (null === $name || is_integer($name))
+    if (null === $name)
     {
       if ($error instanceof sfValidatorErrorSchema)
       {
@@ -66,35 +69,24 @@ public function addError(sfValidatorError $error, $name = null)
         $this->errors[] = $error;
       }
     }
-    else
+    else if (isset($this->namedErrors[$name]))
     {
-      if (!isset($this->namedErrors[$name]) && !$error instanceof sfValidatorErrorSchema)
-      {
-        $this->namedErrors[$name] = $error;
-        $this->errors[$name] = $error;
-      }
-      else
+      if (!$this->namedErrors[$name] instanceof sfValidatorErrorSchema)
       {
-        if (!isset($this->namedErrors[$name]))
-        {
-          $this->namedErrors[$name] = new sfValidatorErrorSchema($error->getValidator());
-          $this->errors[$name] = new sfValidatorErrorSchema($error->getValidator());
-        }
-        else if (!$this->namedErrors[$name] instanceof sfValidatorErrorSchema)
-        {
-          $current = $this->namedErrors[$name];
-          $this->namedErrors[$name] = new sfValidatorErrorSchema($current->getValidator());
-          $this->errors[$name] = new sfValidatorErrorSchema($current->getValidator());
-
-          $method = $current instanceof sfValidatorErrorSchema ? 'addErrors' : 'addError';
-          $this->namedErrors[$name]->$method($current);
-          $this->errors[$name]->$method($current);
-        }
-
-        $method = $error instanceof sfValidatorErrorSchema ? 'addErrors' : 'addError';
-        $this->namedErrors[$name]->$method($error);
-        $this->errors[$name]->$method($error);
+        $current = $this->namedErrors[$name];
+        $this->namedErrors[$name] = new sfValidatorErrorSchema($current->getValidator());
+        $this->namedErrors[$name]->addError($current);
       }
+
+      $method = $error instanceof sfValidatorErrorSchema ? 'addErrors' : 'addError';
+      $this->namedErrors[$name]->$method($error);
+
+      $this->errors[$name] = $this->namedErrors[$name];
+    }
+    else
+    {
+      $this->namedErrors[$name] = $error;
+      $this->errors[$name] = $error;
     }
 
     $this->updateCode();
@@ -104,32 +96,22 @@ public function addError(sfValidatorError $error, $name = null)
   }
 
   /**
-   * Adds an array of errors.
+   * Adds a collection of errors.
    *
-   * @param array $errors  An array of sfValidatorError instances
+   * @param sfValidatorErrorSchema $errorsAn sfValidatorErrorSchema instance
    *
    * @return sfValidatorErrorSchema The current error schema instance
    */
-  public function addErrors($errors)
+  public function addErrors(sfValidatorErrorSchema $errors)
   {
-    if ($errors instanceof sfValidatorErrorSchema)
+    foreach ($errors->getGlobalErrors() as $error)
     {
-      foreach ($errors->getGlobalErrors() as $error)
-      {
-        $this->addError($error);
-      }
-
-      foreach ($errors->getNamedErrors() as $name => $error)
-      {
-        $this->addError($error, (string) $name);
-      }
+      $this->addError($error);
     }
-    else
+
+    foreach ($errors->getNamedErrors() as $name => $error)
     {
-      foreach ($errors as $name => $error)
-      {
-        $this->addError($error, $name);
-      }
+      $this->addError($error, $name);
     }
 
     return $this;
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorFile.class.php b/lib/vendor/symfony/lib/validator/sfValidatorFile.class.php
index ae6808f02..be76f67a2 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatorFile.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatorFile.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorFile.class.php 32836 2011-07-27 07:15:58Z fabien $
+ * @version    SVN: $Id$
  */
 class sfValidatorFile extends sfValidatorBase
 {
@@ -75,7 +75,7 @@ protected function configure($options = array(), $messages = array())
     $this->addOption('validated_file_class', 'sfValidatedFile');
     $this->addOption('path', null);
 
-    $this->addMessage('max_size', 'File is too large (maximum is %max_size% bytes).');
+    $this->addMessage('max_size', 'File is too large (maximum is %max_size% kilobytes).');
     $this->addMessage('mime_types', 'Invalid mime type (%mime_type%).');
     $this->addMessage('partial', 'The uploaded file was only partially uploaded.');
     $this->addMessage('no_tmp_dir', 'Missing a temporary folder.');
@@ -126,14 +126,20 @@ protected function doClean($value)
     switch ($value['error'])
     {
       case UPLOAD_ERR_INI_SIZE:
-        $max = ini_get('upload_max_filesize');
+        $max = $this->getMaxFilesize();
         if ($this->getOption('max_size'))
         {
           $max = min($max, $this->getOption('max_size'));
         }
-        throw new sfValidatorError($this, 'max_size', array('max_size' => $max, 'size' => (int) $value['size']));
+        throw new sfValidatorError($this, 'max_size', array(
+          'max_size' => round($max / 1024, 0), 
+          'size' => (int) $value['size']
+        ));
       case UPLOAD_ERR_FORM_SIZE:
-        throw new sfValidatorError($this, 'max_size', array('max_size' => 0, 'size' => (int) $value['size']));
+        throw new sfValidatorError($this, 'max_size', array(
+          'max_size' => 0,
+          'size' => (int) $value['size']
+        ));
       case UPLOAD_ERR_PARTIAL:
         throw new sfValidatorError($this, 'partial');
       case UPLOAD_ERR_NO_TMP_DIR:
@@ -147,7 +153,10 @@ protected function doClean($value)
     // check file size
     if ($this->hasOption('max_size') && $this->getOption('max_size') < (int) $value['size'])
     {
-      throw new sfValidatorError($this, 'max_size', array('max_size' => $this->getOption('max_size'), 'size' => (int) $value['size']));
+      throw new sfValidatorError($this, 'max_size', array(
+        'max_size' => round($this->getOption('max_size') / 1024, 0), 
+        'size' => (int) $value['size']
+      ));
     }
 
     $mimeType = $this->getMimeType((string) $value['tmp_name'], (string) $value['type']);
@@ -296,4 +305,31 @@ protected function isEmpty($value)
         ||
       (is_array($value) && isset($value['error']) && UPLOAD_ERR_NO_FILE === $value['error']);
   }
+
+  /**
+   * Returns the maximum size of an uploaded file as configured in php.ini
+   *
+   * @return type The maximum size of an uploaded file in bytes
+   */
+  protected function getMaxFilesize()
+  {
+    $max = trim(ini_get('upload_max_filesize'));
+
+    if ('' === $max)
+    {
+      return PHP_INT_MAX;
+    }
+
+    switch (strtolower(substr($max, -1)))
+    {
+      case 'g':
+        $max *= 1024;
+      case 'm':
+        $max *= 1024;
+      case 'k':
+        $max *= 1024;
+    }
+
+    return (integer) $max;
+  }
 }
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorFileMulti.class.php b/lib/vendor/symfony/lib/validator/sfValidatorFileMulti.class.php
new file mode 100644
index 000000000..2f551ea5c
--- /dev/null
+++ b/lib/vendor/symfony/lib/validator/sfValidatorFileMulti.class.php
@@ -0,0 +1,20 @@
+<?php
+
+class sfValidatorFileMulti extends sfValidatorFile
+{
+
+  /**
+   * @see sfValidatorBase
+   */
+  protected function doClean($value)
+  {
+    $clean = array();
+
+    foreach ($value as $file)
+    {
+      $clean[] = parent::doClean($file);
+    }
+
+    return $clean;
+  }
+}
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorFromDescription.class.php b/lib/vendor/symfony/lib/validator/sfValidatorFromDescription.class.php
index d50086e14..91a85a4ee 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatorFromDescription.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatorFromDescription.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorFromDescription.class.php 28700 2010-03-23 11:57:16Z fabien $
+ * @version    SVN: $Id$
  */
 class sfValidatorFromDescription extends sfValidatorDecorator
 {
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorInteger.class.php b/lib/vendor/symfony/lib/validator/sfValidatorInteger.class.php
index f5a303e62..047a49d91 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatorInteger.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatorInteger.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorInteger.class.php 22018 2009-09-14 16:56:28Z fabien $
+ * @version    SVN: $Id$
  */
 class sfValidatorInteger extends sfValidatorBase
 {
@@ -52,9 +52,9 @@ protected function configure($options = array(), $messages = array())
    */
   protected function doClean($value)
   {
-    $clean = intval($value);
+    $clean = (int) $value;
 
-    if (strval($clean) != $value)
+    if ((string) $clean != $value)
     {
       throw new sfValidatorError($this, 'invalid', array('value' => $value));
     }
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorIp.class.php b/lib/vendor/symfony/lib/validator/sfValidatorIp.class.php
new file mode 100644
index 000000000..dd44f238c
--- /dev/null
+++ b/lib/vendor/symfony/lib/validator/sfValidatorIp.class.php
@@ -0,0 +1,111 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * sfValidatorIp validate an IP address.
+ *
+ * @package    symfony
+ * @subpackage validator
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ * @version    SVN: $Id$
+ */
+class sfValidatorIp extends sfValidatorString
+{
+  const IP_V4 = '4';
+  const IP_V6 = '6';
+  const IP_ALL = 'all';
+
+  // adds FILTER_FLAG_NO_PRIV_RANGE flag (skip private ranges)
+  const IP_V4_NO_PRIV = '4_no_priv';
+  const IP_V6_NO_PRIV = '6_no_priv';
+  const IP_ALL_NO_PRIV = 'all_no_priv';
+
+  // adds FILTER_FLAG_NO_RES_RANGE flag (skip reserved ranges)
+  const IP_V4_NO_RES = '4_no_res';
+  const IP_V6_NO_RES = '6_no_res';
+  const IP_ALL_NO_RES = 'all_no_res';
+
+  // adds FILTER_FLAG_NO_PRIV_RANGE and FILTER_FLAG_NO_RES_RANGE flags (skip both)
+  const IP_V4_ONLY_PUBLIC = '4_public';
+  const IP_V6_ONLY_PUBLIC = '6_public';
+  const IP_ALL_ONLY_PUBLIC = 'all_public';
+
+  public function configure($options = array(), $messages = array())
+  {
+    $this->addOption('version', self::IP_ALL);
+
+    parent::configure($options, $messages);
+
+    $this->setMessage('invalid', 'Ip address is invalid');
+  }
+
+  protected function doClean($value)
+  {
+    $value = parent::doClean($value);
+
+    switch ($this->getOption('version'))
+    {
+      case self::IP_V4:
+        $flag = FILTER_FLAG_IPV4;
+        break;
+
+      case self::IP_V6:
+        $flag = FILTER_FLAG_IPV6;
+        break;
+
+      case self::IP_V4_NO_PRIV:
+        $flag = FILTER_FLAG_IPV4 | FILTER_FLAG_NO_PRIV_RANGE;
+        break;
+
+      case self::IP_V6_NO_PRIV:
+        $flag = FILTER_FLAG_IPV6 | FILTER_FLAG_NO_PRIV_RANGE;
+        break;
+
+      case self::IP_ALL_NO_PRIV:
+        $flag = FILTER_FLAG_NO_PRIV_RANGE;
+        break;
+
+      case self::IP_V4_NO_RES:
+        $flag = FILTER_FLAG_IPV4 | FILTER_FLAG_NO_RES_RANGE;
+        break;
+
+      case self::IP_V6_NO_RES:
+        $flag = FILTER_FLAG_IPV6 | FILTER_FLAG_NO_RES_RANGE;
+        break;
+
+      case self::IP_ALL_NO_RES:
+        $flag = FILTER_FLAG_NO_RES_RANGE;
+        break;
+
+      case self::IP_V4_ONLY_PUBLIC:
+        $flag = FILTER_FLAG_IPV4 | FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE;
+        break;
+
+      case self::IP_V6_ONLY_PUBLIC:
+        $flag = FILTER_FLAG_IPV6 | FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE;
+        break;
+
+      case self::IP_ALL_ONLY_PUBLIC:
+        $flag = FILTER_FLAG_NO_PRIV_RANGE | FILTER_FLAG_NO_RES_RANGE;
+        break;
+
+      default:
+        $flag = null;
+        break;
+    }
+
+    if (!filter_var($value, FILTER_VALIDATE_IP, $flag))
+    {
+      throw new sfValidatorError($this, 'invalid', array('value' => $value));
+    }
+
+    return $value;
+  }
+}
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorNumber.class.php b/lib/vendor/symfony/lib/validator/sfValidatorNumber.class.php
index 88187f848..24150b088 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatorNumber.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatorNumber.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorNumber.class.php 22018 2009-09-14 16:56:28Z fabien $
+ * @version    SVN: $Id$
  */
 class sfValidatorNumber extends sfValidatorBase
 {
@@ -57,7 +57,7 @@ protected function doClean($value)
       throw new sfValidatorError($this, 'invalid', array('value' => $value));
     }
 
-    $clean = floatval($value);
+    $clean = (float) $value;
 
     if ($this->hasOption('max') && $clean > $this->getOption('max'))
     {
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorOr.class.php b/lib/vendor/symfony/lib/validator/sfValidatorOr.class.php
index 6f13fa860..f88e0ce2d 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatorOr.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatorOr.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorOr.class.php 21908 2009-09-11 12:06:21Z fabien $
+ * @version    SVN: $Id$
  */
 class sfValidatorOr extends sfValidatorBase
 {
@@ -53,7 +53,7 @@ public function __construct($validators = null, $options = array(), $messages =
     {
       throw new InvalidArgumentException('sfValidatorOr constructor takes a sfValidatorBase object, or a sfValidatorBase array.');
     }
-    
+
     parent::__construct($options, $messages);
   }
 
@@ -90,7 +90,7 @@ public function getValidators()
    */
   protected function doClean($value)
   {
-    $errors = array();
+    $errors = new sfValidatorErrorSchema($this);
     foreach ($this->validators as $validator)
     {
       try
@@ -99,7 +99,7 @@ protected function doClean($value)
       }
       catch (sfValidatorError $e)
       {
-        $errors[] = $e;
+        $errors->addError($e);
       }
     }
 
@@ -108,7 +108,7 @@ protected function doClean($value)
       throw new sfValidatorError($this, 'invalid', array('value' => $value));
     }
 
-    throw new sfValidatorErrorSchema($this, $errors);
+    throw $errors;
   }
 
   /**
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorPass.class.php b/lib/vendor/symfony/lib/validator/sfValidatorPass.class.php
index e39567917..e3b1a14e7 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatorPass.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatorPass.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorPass.class.php 7902 2008-03-15 13:17:33Z fabien $
+ * @version    SVN: $Id$
  */
 class sfValidatorPass extends sfValidatorBase
 {
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorRegex.class.php b/lib/vendor/symfony/lib/validator/sfValidatorRegex.class.php
index 15ae0d4a1..f8308ba64 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatorRegex.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatorRegex.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorRegex.class.php 22149 2009-09-18 14:09:53Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfValidatorRegex extends sfValidatorString
 {
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorSchema.class.php b/lib/vendor/symfony/lib/validator/sfValidatorSchema.class.php
index e8fbac7c6..25508d384 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatorSchema.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatorSchema.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorSchema.class.php 22446 2009-09-26 07:55:47Z fabien $
+ * @version    SVN: $Id$
  */
 class sfValidatorSchema extends sfValidatorBase implements ArrayAccess
 {
@@ -110,7 +110,7 @@ protected function doClean($values)
     $errorSchema = new sfValidatorErrorSchema($this);
 
     // check that post_max_size has not been reached
-    if (isset($_SERVER['CONTENT_LENGTH']) && (int) $_SERVER['CONTENT_LENGTH'] > $this->getBytes(ini_get('post_max_size')))
+    if (isset($_SERVER['CONTENT_LENGTH']) && (int) $_SERVER['CONTENT_LENGTH'] > $this->getBytes(ini_get('post_max_size')) && ini_get('post_max_size') != 0)
     {
       $errorSchema->addError(new sfValidatorError($this, 'post_max_size'));
 
@@ -120,7 +120,7 @@ protected function doClean($values)
     // pre validator
     try
     {
-      $this->preClean($values);
+      $values = $this->preClean($values);
     }
     catch (sfValidatorErrorSchema $e)
     {
@@ -162,6 +162,12 @@ protected function doClean($values)
 
         $errorSchema->addError($e, (string) $name);
       }
+      catch (Exception $e)
+      {
+        $class = get_class($e);
+
+        throw new $class($e->getMessage().' of "'.$name.'" field');
+      }
     }
 
     // are non given values required?
@@ -212,16 +218,18 @@ protected function doClean($values)
    *
    * @param  array $values  The input values
    *
+   * @return array The cleaned values
+   *
    * @throws sfValidatorError
    */
   public function preClean($values)
   {
     if (null === $validator = $this->getPreValidator())
     {
-      return;
+      return $values;
     }
 
-    $validator->clean($values);
+    return $validator->clean($values);
   }
 
   /**
@@ -328,7 +336,7 @@ public function offsetSet($name, $validator)
   {
     if (!$validator instanceof sfValidatorBase)
     {
-      throw new InvalidArgumentException('A field must be an instance of sfValidatorBase.');
+      throw new InvalidArgumentException('A validator must be an instance of sfValidatorBase.');
     }
 
     $this->fields[$name] = clone $validator;
@@ -382,18 +390,21 @@ public function __clone()
 
   protected function getBytes($value)
   {
-    $value = trim($value);
-    switch (strtolower($value[strlen($value) - 1]))
-    {
-      // The 'G' modifier is available since PHP 5.1.0
-      case 'g':
-        $value *= 1024;
-      case 'm':
-        $value *= 1024;
-      case 'k':
-        $value *= 1024;
+    $value    = trim($value);
+    $number   = (float) $value;
+    $modifier = strtolower($value[strlen($value) - 1]);
+
+    $exp_by_modifier = array(
+      'k' => 1,
+      'm' => 2,
+      'g' => 3,
+    );
+
+    if (array_key_exists($modifier, $exp_by_modifier)) {
+      $exp    = $exp_by_modifier[$modifier];
+      $number = $number * pow(1024, $exp);
     }
 
-    return $value;
+    return $number;
   }
 }
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorSchemaCompare.class.php b/lib/vendor/symfony/lib/validator/sfValidatorSchemaCompare.class.php
index a0b17c3b9..a41d651cd 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatorSchemaCompare.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatorSchemaCompare.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorSchemaCompare.class.php 21908 2009-09-11 12:06:21Z fabien $
+ * @version    SVN: $Id$
  */
 class sfValidatorSchemaCompare extends sfValidatorSchema
 {
@@ -124,7 +124,10 @@ protected function doClean($values)
         throw $error;
       }
 
-      throw new sfValidatorErrorSchema($this, array($this->getOption('left_field') => $error));
+      $errorSchema = new sfValidatorErrorSchema($this);
+      $errorSchema->addError($error, $this->getOption('left_field'));
+
+      throw $errorSchema;
     }
 
     return $values;
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorSchemaFilter.class.php b/lib/vendor/symfony/lib/validator/sfValidatorSchemaFilter.class.php
index 22697f0a3..14de5b7cb 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatorSchemaFilter.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatorSchemaFilter.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorSchemaFilter.class.php 21908 2009-09-11 12:06:21Z fabien $
+ * @version    SVN: $Id$
  */
 class sfValidatorSchemaFilter extends sfValidatorSchema
 {
@@ -48,7 +48,10 @@ protected function doClean($values)
 
     if (!is_array($values))
     {
-      throw new InvalidArgumentException('You must pass an array parameter to the clean() method');
+      throw new InvalidArgumentException(sprintf(
+        'You must pass an array parameter to the clean() method for filter field "%s"',
+        $this->getOption('field')
+      ));
     }
 
     $value = isset($values[$this->getOption('field')]) ? $values[$this->getOption('field')] : null;
@@ -59,7 +62,10 @@ protected function doClean($values)
     }
     catch (sfValidatorError $error)
     {
-      throw new sfValidatorErrorSchema($this, array($this->getOption('field') => $error));
+      $errorSchema = new sfValidatorErrorSchema($this);
+      $errorSchema->addError($error, $this->getOption('field'));
+
+      throw $errorSchema;
     }
 
     return $values;
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorSchemaForEach.class.php b/lib/vendor/symfony/lib/validator/sfValidatorSchemaForEach.class.php
deleted file mode 100644
index 449f3083e..000000000
--- a/lib/vendor/symfony/lib/validator/sfValidatorSchemaForEach.class.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * sfValidatorSchemaForEach wraps a validator multiple times in a single validator.
- *
- * @package    symfony
- * @subpackage validator
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorSchemaForEach.class.php 9048 2008-05-19 09:11:23Z FabianLange $
- */
-class sfValidatorSchemaForEach extends sfValidatorSchema
-{
-  /**
-   * Constructor.
-   *
-   * @param sfValidatorBase $validator  Initial validator
-   * @param integer         $count      The number of times to replicate the validator
-   * @param array           $options    An array of options
-   * @param array           $messages   An array of error messages
-   *
-   * @see sfValidatorBase
-   */
-  public function __construct(sfValidatorBase $validator, $count, $options = array(), $messages = array())
-  {
-    $fields = array();
-    for ($i = 0; $i < $count; $i++)
-    {
-      $fields[$i] = clone $validator;
-    }
-
-    parent::__construct($fields, $options, $messages);
-  }
-
-  /**
-   * @see sfValidatorBase
-   */
-  public function asString($indent = 0)
-  {
-    throw new Exception('Unable to convert a sfValidatorSchemaForEach to string.');
-  }
-}
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorString.class.php b/lib/vendor/symfony/lib/validator/sfValidatorString.class.php
index e5076af62..faefca7c5 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatorString.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatorString.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorString.class.php 12641 2008-11-04 18:22:00Z fabien $
+ * @version    SVN: $Id$
  */
 class sfValidatorString extends sfValidatorBase
 {
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorTime.class.php b/lib/vendor/symfony/lib/validator/sfValidatorTime.class.php
index 671a3c1ed..bc18924fc 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatorTime.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatorTime.class.php
@@ -15,7 +15,7 @@
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Fabian Lange <fabian.lange@symfony-project.com>
- * @version    SVN: $Id: sfValidatorTime.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfValidatorTime extends sfValidatorBase
 {
@@ -59,7 +59,7 @@ protected function doClean($value)
     {
       if (!preg_match($regex, $value, $match))
       {
-        throw new sfValidatorError($this, 'bad_format', array('value' => $value, 'time_format' => $this->getOption('time_format_error') ? $this->getOption('time_format_error') : $this->getOption('time_format')));
+        throw new sfValidatorError($this, 'bad_format', array('value' => $value, 'time_format' => $this->getOption('time_format_error') ?: $this->getOption('time_format')));
       }
 
       $clean = $this->convertTimeArrayToTimestamp($match);
@@ -94,7 +94,7 @@ protected function convertTimeArrayToTimestamp($value)
     // all elements must be empty or a number
     foreach (array('hour', 'minute', 'second') as $key)
     {
-      if (isset($value[$key]) && !preg_match('#^\d+$#', $value[$key]) && !empty($value[$key]))
+      if (isset($value[$key]) && !ctype_digit((string)$value[$key]) && !empty($value[$key]))
       {
         throw new sfValidatorError($this, 'invalid', array('value' => $value));
       }
@@ -112,9 +112,9 @@ protected function convertTimeArrayToTimestamp($value)
     }
 
     $clean = mktime(
-      isset($value['hour']) ? intval($value['hour']) : 0,
-      isset($value['minute']) ? intval($value['minute']) : 0,
-      isset($value['second']) ? intval($value['second']) : 0
+      isset($value['hour']) ? (int) $value['hour'] : 0,
+      isset($value['minute']) ? (int) $value['minute'] : 0,
+      isset($value['second']) ? (int) $value['second'] : 0
     );
 
     if (false === $clean)
diff --git a/lib/vendor/symfony/lib/validator/sfValidatorUrl.class.php b/lib/vendor/symfony/lib/validator/sfValidatorUrl.class.php
index b10f17934..b39f23632 100644
--- a/lib/vendor/symfony/lib/validator/sfValidatorUrl.class.php
+++ b/lib/vendor/symfony/lib/validator/sfValidatorUrl.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage validator
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfValidatorUrl.class.php 22149 2009-09-18 14:09:53Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfValidatorUrl extends sfValidatorRegex
 {
diff --git a/lib/vendor/symfony/lib/vendor/lime/lime.php b/lib/vendor/symfony/lib/vendor/lime/lime.php
index 360f2cda4..7734736ea 100644
--- a/lib/vendor/symfony/lib/vendor/lime/lime.php
+++ b/lib/vendor/symfony/lib/vendor/lime/lime.php
@@ -104,7 +104,7 @@ static public function to_xml($results = null)
       foreach ($result['tests'] as $test)
       {
         $testsuite->appendChild($testcase = $dom->createElement('testcase'));
-        $testcase->setAttribute('name', $test['message']);
+        $testcase->setAttribute('name', utf8_encode($test['message']));
         $testcase->setAttribute('file', $test['file']);
         $testcase->setAttribute('line', $test['line']);
         $testcase->setAttribute('assertions', 1);
@@ -530,13 +530,18 @@ protected function set_last_test_errors(array $errors)
     $this->results['tests'][$this->test_nb]['error'] = implode("\n", $errors);
   }
 
+  private function is_test_object($object)
+  {
+    return $object instanceof lime_test || $object instanceof sfTestFunctionalBase || $object instanceof sfTester;
+  }
+
   protected function find_caller($traces)
   {
     // find the first call to a method of an object that is an instance of lime_test
     $t = array_reverse($traces);
     foreach ($t as $trace)
     {
-      if (isset($trace['object']) && $trace['object'] instanceof lime_test)
+      if (isset($trace['object']) && $this->is_test_object($trace['object']))
       {
         return array($trace['file'], $trace['line']);
       }
@@ -570,7 +575,7 @@ public function handle_error($code, $message, $file, $line, $context)
     $this->error($type.': '.$message, $file, $line, $trace);
   }
 
-  public function handle_exception(Exception $exception)
+  public function handle_exception(Throwable $exception)
   {
     $this->error(get_class($exception).': '.$exception->getMessage(), $exception->getFile(), $exception->getLine(), $exception->getTrace());
 
@@ -684,10 +689,35 @@ public function echoln($message, $colorizer_parameter = null, $colorize = true)
   {
     if ($colorize)
     {
-      $message = preg_replace('/(?:^|\.)((?:not ok|dubious|errors) *\d*)\b/e', '$this->colorizer->colorize(\'$1\', \'ERROR\')', $message);
-      $message = preg_replace('/(?:^|\.)(ok *\d*)\b/e', '$this->colorizer->colorize(\'$1\', \'INFO\')', $message);
-      $message = preg_replace('/"(.+?)"/e', '$this->colorizer->colorize(\'$1\', \'PARAMETER\')', $message);
-      $message = preg_replace('/(\->|\:\:)?([a-zA-Z0-9_]+?)\(\)/e', '$this->colorizer->colorize(\'$1$2()\', \'PARAMETER\')', $message);
+      $colorizer = $this->colorizer;
+      $message = preg_replace_callback(
+        '/(?:^|\.)((?:not ok|dubious|errors) *\d*)\b/',
+        function ($match) use ($colorizer) {
+          return $colorizer->colorize($match[1], 'ERROR');
+        },
+        $message
+      );
+      $message = preg_replace_callback(
+        '/(?:^|\.)(ok *\d*)\b/',
+        function ($match) use ($colorizer) {
+          return $colorizer->colorize($match[1], 'INFO');
+        },
+        $message
+      );
+      $message = preg_replace_callback(
+        '/"(.+?)"/',
+        function ($match) use ($colorizer) {
+          return $colorizer->colorize($match[1], 'PARAMETER');
+        },
+        $message
+      );
+      $message = preg_replace_callback(
+        '/(\->|\:\:)?([a-zA-Z0-9_]+?)\(\)/',
+        function ($match) use ($colorizer) {
+          return $colorizer->colorize($match[1].$match[2].'()', 'PARAMETER');
+        },
+        $message
+      );
     }
 
     echo ($colorizer_parameter ? $this->colorizer->colorize($message, $colorizer_parameter) : $message)."\n";
@@ -786,6 +816,7 @@ class lime_harness extends lime_registration
   public $php_cli = null;
   public $stats   = array();
   public $output  = null;
+  public $full_output = false;
 
   public function __construct($options = array())
   {
@@ -800,6 +831,7 @@ public function __construct($options = array())
       'force_colors' => false,
       'output'       => null,
       'verbose'      => false,
+      'test_path'    => sys_get_temp_dir(),
     ), $options);
 
     $this->php_cli = $this->find_php_cli($this->options['php_cli']);
@@ -890,8 +922,8 @@ public function run()
 
       $relative_file = $this->get_relative_file($file);
 
-      $test_file = tempnam(sys_get_temp_dir(), 'lime');
-      $result_file = tempnam(sys_get_temp_dir(), 'lime');
+      $test_file = tempnam($this->options['test_path'], 'lime_test').'.php';
+      $result_file = tempnam($this->options['test_path'], 'lime_result');
       file_put_contents($test_file, <<<EOF
 <?php
 function lime_shutdown()
@@ -947,7 +979,14 @@ function lime_shutdown()
         }
       }
 
-      $this->output->echoln(sprintf('%s%s%s', substr($relative_file, -min(67, strlen($relative_file))), str_repeat('.', 70 - min(67, strlen($relative_file))), $stats['status']));
+      if (true === $this->full_output)
+      {
+        $this->output->echoln(sprintf('%s%s%s', $relative_file, '.....', $stats['status']));
+      }
+      else
+      {
+        $this->output->echoln(sprintf('%s%s%s', substr($relative_file, -min(67, strlen($relative_file))), str_repeat('.', 70 - min(67, strlen($relative_file))), $stats['status']));
+      }
 
       if ('dubious' == $stats['status'])
       {
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/.gitattributes b/lib/vendor/symfony/lib/vendor/swiftmailer/.gitattributes
new file mode 100644
index 000000000..33b8efdb8
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/.gitattributes
@@ -0,0 +1,9 @@
+*.crt -crlf
+*.key -crlf
+*.srl -crlf
+*.pub -crlf
+*.priv -crlf
+*.txt -crlf
+
+# ignore /notes in the git-generated distributed .zip archive
+/notes export-ignore
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/.gitignore b/lib/vendor/symfony/lib/vendor/swiftmailer/.gitignore
new file mode 100644
index 000000000..9a23ffe6d
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/.gitignore
@@ -0,0 +1,4 @@
+/tests/acceptance.conf.php
+/tests/smoke.conf.php
+/build/*
+/vendor/
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/.travis.yml b/lib/vendor/symfony/lib/vendor/swiftmailer/.travis.yml
new file mode 100644
index 000000000..0adf8d54c
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/.travis.yml
@@ -0,0 +1,27 @@
+language: php
+
+sudo: false
+
+before_script:
+    - cp tests/acceptance.conf.php.default tests/acceptance.conf.php
+    - cp tests/smoke.conf.php.default tests/smoke.conf.php
+    - composer self-update
+    - composer update --no-interaction --prefer-source
+    - gem install mime-types -v 2.99.1
+    - gem install mailcatcher
+    - mailcatcher --smtp-port 4456
+
+script:
+    - phpunit --verbose
+
+matrix:
+    include:
+        - php: 5.3
+        - php: 5.4
+        - php: 5.5
+        - php: 5.6
+        - php: 7.0
+        - php: hhvm
+    allow_failures:
+        - php: hhvm
+    fast_finish: true
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/CHANGES b/lib/vendor/symfony/lib/vendor/swiftmailer/CHANGES
new file mode 100644
index 000000000..46d072ac9
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/CHANGES
@@ -0,0 +1,230 @@
+Changelog
+=========
+
+5.4.3 (2016-07-08)
+------------------
+
+ * fixed SimpleHeaderSet::has()/get() when the 0 index is removed
+ * removed the need to have mcrypt installed
+ * fixed broken MIME header encoding with quotes/colons and non-ascii chars
+ * allowed mail transport send for messages without To header
+ * fixed PHP 7 support
+
+5.4.2 (2016-05-01)
+------------------
+
+ * fixed support for IPv6 sockets
+ * added auto-retry when sending messages from the memory spool
+ * fixed consecutive read calls in Swift_ByteStream_FileByteStream
+ * added support for iso-8859-15 encoding
+ * fixed PHP mail extra params on missing reversePath
+ * added methods to set custom stream context options
+ * fixed charset changes in QpContentEncoderProxy
+ * added return-path header to the ignoredHeaders list of DKIMSigner
+ * fixed crlf for subject using mail
+ * fixed add soft line break only when necessary
+ * fixed escaping command-line args to Sendmail
+
+5.4.1 (2015-06-06)
+------------------
+
+ * made Swiftmailer exceptions confirm to PHP base exception constructor signature
+ * fixed MAIL FROM & RCPT TO headers to be RFC compliant
+
+5.4.0 (2015-03-14)
+------------------
+
+ * added the possibility to add extra certs to PKCS#7 signature
+ * fix base64 encoding with streams
+ * added a new RESULT_SPOOLED status for SpoolTransport
+ * fixed getBody() on attachments when called more than once
+ * removed dots from generated filenames in filespool
+
+5.3.1 (2014-12-05)
+------------------
+
+ * fixed cloning of messages with attachments
+
+5.3.0 (2014-10-04)
+------------------
+
+ * fixed cloning when using signers
+ * reverted removal of Swift_Encoding
+ * drop support for PHP 5.2.x
+
+5.2.2 (2014-09-20)
+------------------
+
+ * fixed Japanese support
+ * fixed the memory spool when the message changes when in the pool
+ * added support for cloning messages
+ * fixed PHP warning in the redirect plugin
+ * changed the way to and cc-ed email are sent to only use one transaction
+
+5.2.1 (2014-06-13)
+------------------
+
+ * SECURITY FIX: fixed CLI escaping when using sendmail as a transport
+
+   Prior to 5.2.1, the sendmail transport (Swift_Transport_SendmailTransport)
+   was vulnerable to an arbitrary shell execution if the "From" header came
+   from a non-trusted source and no "Return-Path" is configured.
+
+ * fixed parameter in DKIMSigner
+ * fixed compatibility with PHP < 5.4
+
+5.2.0 (2014-05-08)
+------------------
+
+ * fixed Swift_ByteStream_FileByteStream::read() to match to the specification
+ * fixed from-charset and to-charset arguments in mbstring_convert_encoding() usages
+ * fixed infinite loop in StreamBuffer
+ * fixed NullTransport to return the number of ignored emails instead of 0
+ * Use phpunit and mockery for unit testing (realityking)
+
+5.1.0 (2014-03-18)
+------------------
+
+ * fixed data writing to stream when sending large messages
+ * added support for libopendkim (https://github.com/xdecock/php-opendkim)
+ * merged SignedMessage and Message
+ * added Gmail XOAuth2 authentication
+ * updated the list of known mime types
+ * added NTLM authentication
+
+5.0.3 (2013-12-03)
+------------------
+
+ * fixed double-dot bug
+ * fixed DKIM signer
+
+5.0.2 (2013-08-30)
+------------------
+
+ * handled correct exception type while reading IoBuffer output
+
+5.0.1 (2013-06-17)
+------------------
+
+ * changed the spool to only start the transport when a mail has to be sent
+ * fixed compatibility with PHP 5.2
+ * fixed LICENSE file
+
+5.0.0 (2013-04-30)
+------------------
+
+ * changed the license from LGPL to MIT
+
+4.3.1 (2013-04-11)
+------------------
+
+ * removed usage of the native QP encoder when the charset is not UTF-8
+ * fixed usage of uniqid to avoid collisions
+ * made a performance improvement when tokenizing large headers
+ * fixed usage of the PHP native QP encoder on PHP 5.4.7+
+
+4.3.0 (2013-01-08)
+------------------
+
+ * made the temporary directory configurable via the TMPDIR env variable
+ * added S/MIME signer and encryption support
+
+4.2.2 (2012-10-25)
+------------------
+
+ * added the possibility to throttle messages per second in ThrottlerPlugin (mostly for Amazon SES)
+ * switched mime.qpcontentencoder to automatically use the PHP native encoder on PHP 5.4.7+
+ * allowed specifying a whitelist with regular expressions in RedirectingPlugin
+
+4.2.1 (2012-07-13)
+------------------
+
+ * changed the coding standards to PSR-1/2
+ * fixed issue with autoloading
+ * added NativeQpContentEncoder to enhance performance (for PHP 5.3+)
+
+4.2.0 (2012-06-29)
+------------------
+
+ * added documentation about how to use the Japanese support introduced in 4.1.8
+ * added a way to override the default configuration in a lazy way
+ * changed the PEAR init script to lazy-load the initialization
+ * fixed a bug when calling Swift_Preferences before anything else (regression introduced in 4.1.8)
+
+4.1.8 (2012-06-17)
+------------------
+
+ * added Japanese iso-2022-jp support
+ * changed the init script to lazy-load the initialization
+ * fixed docblocks (@id) which caused some problems with libraries parsing the dobclocks
+ * fixed Swift_Mime_Headers_IdentificationHeader::setId() when passed an array of ids
+ * fixed encoding of email addresses in headers
+ * added replacements setter to the Decorator plugin
+
+4.1.7 (2012-04-26)
+------------------
+
+ * fixed QpEncoder safeMapShareId property
+
+4.1.6 (2012-03-23)
+------------------
+
+ * reduced the size of serialized Messages
+
+4.1.5 (2012-01-04)
+------------------
+
+ * enforced Swift_Spool::queueMessage() to return a Boolean
+ * made an optimization to the memory spool: start the transport only when required
+ * prevented stream_socket_client() from generating an error and throw a Swift_TransportException instead
+ * fixed a PHP warning when calling to mail() when safe_mode is off
+ * many doc tweaks
+
+4.1.4 (2011-12-16)
+------------------
+
+ * added a memory spool (Swift_MemorySpool)
+ * fixed too many opened files when sending emails with attachments
+
+4.1.3 (2011-10-27)
+------------------
+
+ * added STARTTLS support
+ * added missing @return tags on fluent methods
+ * added a MessageLogger plugin that logs all sent messages
+ * added composer.json
+
+4.1.2 (2011-09-13)
+------------------
+
+ * fixed wrong detection of magic_quotes_runtime
+ * fixed fatal errors when no To or Subject header has been set
+ * fixed charset on parameter header continuations
+ * added documentation about how to install Swiftmailer from the PEAR channel
+ * fixed various typos and markup problem in the documentation
+ * fixed warning when cache directory does not exist
+ * fixed "slashes are escaped" bug
+ * changed require_once() to require() in autoload
+
+4.1.1 (2011-07-04)
+------------------
+
+ * added missing file in PEAR package
+
+4.1.0 (2011-06-30)
+------------------
+
+ * documentation has been converted to ReST
+
+4.1.0 RC1 (2011-06-17)
+----------------------
+
+New features:
+
+ * changed the Decorator Plugin to allow replacements in all headers
+ * added Swift_Mime_Grammar and Swift_Validate to validate an email address
+ * modified the autoloader to lazy-initialize Swiftmailer
+ * removed Swift_Mailer::batchSend()
+ * added NullTransport
+ * added new plugins: RedirectingPlugin and ImpersonatePlugin
+ * added a way to send messages asynchronously (Spool)
diff --git a/lib/vendor/symfony/LICENSE b/lib/vendor/symfony/lib/vendor/swiftmailer/LICENSE
similarity index 96%
rename from lib/vendor/symfony/LICENSE
rename to lib/vendor/symfony/lib/vendor/swiftmailer/LICENSE
index 89c135de5..485f1d6d6 100644
--- a/lib/vendor/symfony/LICENSE
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2010 Fabien Potencier
+Copyright (c) 2013-2016 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/README b/lib/vendor/symfony/lib/vendor/swiftmailer/README
new file mode 100644
index 000000000..c3bf03185
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/README
@@ -0,0 +1,15 @@
+Swift Mailer
+------------
+
+Swift Mailer is a component based mailing solution for PHP 5.
+It is released under the MIT license.
+
+Homepage:      http://swiftmailer.org
+Documentation: http://swiftmailer.org/docs
+Bugs:          https://github.com/swiftmailer/swiftmailer/issues
+Repository:    https://github.com/swiftmailer/swiftmailer
+
+Swift Mailer is highly object-oriented by design and lends itself
+to use in complex web application with a great deal of flexibility.
+
+For full details on usage, see the documentation.
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/VERSION b/lib/vendor/symfony/lib/vendor/swiftmailer/VERSION
new file mode 100644
index 000000000..5bc5f9cb3
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/VERSION
@@ -0,0 +1 @@
+Swift-5.4.3
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift.php
deleted file mode 100644
index 7d251d34c..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * General utility class in Swift Mailer, not to be instantiated.
- * 
- * @package Swift
- * 
- * @author Chris Corbyn
- */
-abstract class Swift
-{
-  
-  /** Swift Mailer Version number generated during dist release process */
-  const VERSION = '4.1.0-DEV';
-  
-  /**
-   * Internal autoloader for spl_autoload_register().
-   * 
-   * @param string $class
-   */
-  public static function autoload($class)
-  {
-    //Don't interfere with other autoloaders
-    if (0 !== strpos($class, 'Swift'))
-    {
-      return false;
-    }
-
-    $path = dirname(__FILE__).'/'.str_replace('_', '/', $class).'.php';
-
-    if (!file_exists($path))
-    {
-      return false;
-    }
-
-    require_once $path;
-  }
-  
-  /**
-   * Configure autoloading using Swift Mailer.
-   * 
-   * This is designed to play nicely with other autoloaders.
-   */
-  public static function registerAutoload()
-  {
-    spl_autoload_register(array('Swift', 'autoload'));
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Attachment.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Attachment.php
deleted file mode 100644
index d3779bfe9..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Attachment.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/Attachment.php';
-//@require 'Swift/ByteStream/FileByteStream.php';
-//@require 'Swift/DependencyContainer.php';
-
-/**
- * Attachment class for attaching files to a {@link Swift_Mime_Message}.
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-class Swift_Attachment extends Swift_Mime_Attachment
-{
-  
-  /**
-   * Create a new Attachment.
-   * Details may be optionally provided to the constructor.
-   * @param string|Swift_OutputByteStream $data
-   * @param string $filename
-   * @param string $contentType
-   */
-  public function __construct($data = null, $filename = null,
-    $contentType = null)
-  {
-    call_user_func_array(
-      array($this, 'Swift_Mime_Attachment::__construct'),
-      Swift_DependencyContainer::getInstance()
-        ->createDependenciesFor('mime.attachment')
-      );
-    
-    $this->setBody($data);
-    $this->setFilename($filename);
-    if ($contentType)
-    {
-      $this->setContentType($contentType);
-    }
-  }
-  
-  /**
-   * Create a new Attachment.
-   * @param string|Swift_OutputByteStream $data
-   * @param string $filename
-   * @param string $contentType
-   * @return Swift_Mime_Attachment
-   */
-  public static function newInstance($data = null, $filename = null,
-    $contentType = null)
-  {
-    return new self($data, $filename, $contentType);
-  }
-  
-  /**
-   * Create a new Attachment from a filesystem path.
-   * @param string $path
-   * @param string $contentType optional
-   * @return Swift_Mime_Attachment
-   */
-  public static function fromPath($path, $contentType = null)
-  {
-    return self::newInstance()->setFile(
-      new Swift_ByteStream_FileByteStream($path),
-      $contentType
-      );
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/ByteStream/AbstractFilterableInputStream.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/ByteStream/AbstractFilterableInputStream.php
deleted file mode 100644
index 71bc3f1b8..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/ByteStream/AbstractFilterableInputStream.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/InputByteStream.php';
-//@require 'Swift/Filterable.php';
-//@require 'Swift/StreamFilter.php';
-
-/**
- * Provides the base functionality for an InputStream supporting filters.
- * @package Swift
- * @subpackage ByteStream
- * @author Chris Corbyn
- */
-abstract class Swift_ByteStream_AbstractFilterableInputStream
-  implements Swift_InputByteStream, Swift_Filterable
-{
-  
-  /** Write sequence */
-  private $_sequence = 0;
-  
-  /** StreamFilters */
-  private $_filters = array();
-  
-  /** A buffer for writing */
-  private $_writeBuffer = '';
-  
-  /** Bound streams */
-  private $_mirrors = array();
-  
-  /**
-   * Commit the given bytes to the storage medium immediately.
-   * @param string $bytes
-   * @access protected
-   */
-  abstract protected function _commit($bytes);
-  
-  /**
-   * Flush any buffers/content with immediate effect.
-   * @access protected
-   */
-  abstract protected function _flush();
-  
-  /**
-   * Add a StreamFilter to this InputByteStream.
-   * @param Swift_StreamFilter $filter
-   * @param string $key
-   */
-  public function addFilter(Swift_StreamFilter $filter, $key)
-  {
-    $this->_filters[$key] = $filter;
-  }
-  
-  /**
-   * Remove an already present StreamFilter based on its $key.
-   * @param string $key
-   */
-  public function removeFilter($key)
-  {
-    unset($this->_filters[$key]);
-  }
-  
-  /**
-   * Writes $bytes to the end of the stream.
-   * @param string $bytes
-   * @throws Swift_IoException
-   */
-  public function write($bytes)
-  {
-    $this->_writeBuffer .= $bytes;
-    foreach ($this->_filters as $filter)
-    {
-      if ($filter->shouldBuffer($this->_writeBuffer))
-      {
-        return;
-      }
-    }
-    $this->_doWrite($this->_writeBuffer);
-    return ++$this->_sequence;
-  }
-  
-  /**
-   * For any bytes that are currently buffered inside the stream, force them
-   * off the buffer.
-   * 
-   * @throws Swift_IoException
-   */
-  public function commit()
-  {
-    $this->_doWrite($this->_writeBuffer);
-  }
-  
-  /**
-   * Attach $is to this stream.
-   * The stream acts as an observer, receiving all data that is written.
-   * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-   * 
-   * @param Swift_InputByteStream $is
-   */
-  public function bind(Swift_InputByteStream $is)
-  {
-    $this->_mirrors[] = $is;
-  }
-  
-  /**
-   * Remove an already bound stream.
-   * If $is is not bound, no errors will be raised.
-   * If the stream currently has any buffered data it will be written to $is
-   * before unbinding occurs.
-   * 
-   * @param Swift_InputByteStream $is
-   */
-  public function unbind(Swift_InputByteStream $is)
-  {
-    foreach ($this->_mirrors as $k => $stream)
-    {
-      if ($is === $stream)
-      {
-        if ($this->_writeBuffer !== '')
-        {
-          $stream->write($this->_filter($this->_writeBuffer));
-        }
-        unset($this->_mirrors[$k]);
-      }
-    }
-  }
-  
-  /**
-   * Flush the contents of the stream (empty it) and set the internal pointer
-   * to the beginning.
-   * @throws Swift_IoException
-   */
-  public function flushBuffers()
-  {
-    if ($this->_writeBuffer !== '')
-    {
-      $this->_doWrite($this->_writeBuffer);
-    }
-    $this->_flush();
-    
-    foreach ($this->_mirrors as $stream)
-    {
-      $stream->flushBuffers();
-    }
-  }
-  
-  // -- Private methods
-  
-  /** Run $bytes through all filters */
-  private function _filter($bytes)
-  {
-    foreach ($this->_filters as $filter)
-    {
-      $bytes = $filter->filter($bytes);
-    }
-    return $bytes;
-  }
-  
-  /** Just write the bytes to the stream */
-  private function _doWrite($bytes)
-  {
-    $this->_commit($this->_filter($bytes));
-    
-    foreach ($this->_mirrors as $stream)
-    {
-      $stream->write($bytes);
-    }
-    
-    $this->_writeBuffer = '';
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/ByteStream/ArrayByteStream.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/ByteStream/ArrayByteStream.php
deleted file mode 100644
index f91888946..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/ByteStream/ArrayByteStream.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/InputByteStream.php';
-//@require 'Swift/OutputByteStream.php';
-
-/**
- * Allows reading and writing of bytes to and from an array.
- * @package Swift
- * @subpackage ByteStream
- * @author Chris Corbyn
- */
-class Swift_ByteStream_ArrayByteStream
-  implements Swift_InputByteStream, Swift_OutputByteStream
-{
-
-  /**
-   * The internal stack of bytes.
-   * @var string[]
-   * @access private
-   */
-  private $_array = array();
-
-  /**
-   * The size of the stack
-   * @var int
-   * @access private
-   */
-  private $_arraySize = 0;
-
-  /**
-   * The internal pointer offset.
-   * @var int
-   * @access private
-   */
-  private $_offset = 0;
-  
-  /** Bound streams */
-  private $_mirrors = array();
-  
-  /**
-   * Create a new ArrayByteStream.
-   * If $stack is given the stream will be populated with the bytes it contains.
-   * @param mixed $stack of bytes in string or array form, optional
-   */
-  public function __construct($stack = null)
-  {
-    if (is_array($stack))
-    {
-      $this->_array = $stack;
-      $this->_arraySize = count($stack);
-    }
-    elseif (is_string($stack))
-    {
-      $this->write($stack);
-    }
-    else
-    {
-      $this->_array = array();
-    }
-  }
-
-  /**
-   * Reads $length bytes from the stream into a string and moves the pointer
-   * through the stream by $length. If less bytes exist than are requested the
-   * remaining bytes are given instead. If no bytes are remaining at all, boolean
-   * false is returned.
-   * @param int $length
-   * @return string
-   */
-  public function read($length)
-  {
-    if ($this->_offset == $this->_arraySize)
-    {
-      return false;
-    }
-
-    // Don't use array slice
-    $end = $length + $this->_offset;
-    $end = $this->_arraySize<$end
-      ?$this->_arraySize
-      :$end;
-    $ret = '';
-    for (; $this->_offset < $end; ++$this->_offset)
-    {
-      $ret .= $this->_array[$this->_offset];
-    }
-    return $ret;
-  }
-
-  /**
-   * Writes $bytes to the end of the stream.
-   * @param string $bytes
-   */
-  public function write($bytes)
-  {
-    $to_add = str_split($bytes);
-    foreach ($to_add as $value)
-    {
-      $this->_array[] = $value;
-    }
-    $this->_arraySize = count($this->_array);
-    
-    foreach ($this->_mirrors as $stream)
-    {
-      $stream->write($bytes);
-    }
-  }
-  
-  /**
-   * Not used.
-   */
-  public function commit()
-  {
-  }
-  
-  /**
-   * Attach $is to this stream.
-   * The stream acts as an observer, receiving all data that is written.
-   * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-   *
-   * @param Swift_InputByteStream $is
-   */
-  public function bind(Swift_InputByteStream $is)
-  {
-    $this->_mirrors[] = $is;
-  }
-  
-  /**
-   * Remove an already bound stream.
-   * If $is is not bound, no errors will be raised.
-   * If the stream currently has any buffered data it will be written to $is
-   * before unbinding occurs.
-   *
-   * @param Swift_InputByteStream $is
-   */
-  public function unbind(Swift_InputByteStream $is)
-  {
-    foreach ($this->_mirrors as $k => $stream)
-    {
-      if ($is === $stream)
-      {
-        unset($this->_mirrors[$k]);
-      }
-    }
-  }
-
-  /**
-   * Move the internal read pointer to $byteOffset in the stream.
-   * @param int $byteOffset
-   * @return boolean
-   */
-  public function setReadPointer($byteOffset)
-  {
-    if ($byteOffset > $this->_arraySize)
-    {
-      $byteOffset = $this->_arraySize;
-    }
-    elseif ($byteOffset < 0)
-    {
-      $byteOffset = 0;
-    }
-
-    $this->_offset = $byteOffset;
-  }
-
-  /**
-   * Flush the contents of the stream (empty it) and set the internal pointer
-   * to the beginning.
-   */
-  public function flushBuffers()
-  {
-    $this->_offset = 0;
-    $this->_array = array();
-    $this->_arraySize = 0;
-    
-    foreach ($this->_mirrors as $stream)
-    {
-      $stream->flushBuffers();
-    }
-  }
-
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/ByteStream/FileByteStream.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/ByteStream/FileByteStream.php
deleted file mode 100644
index 14773c2f5..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/ByteStream/FileByteStream.php
+++ /dev/null
@@ -1,177 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/ByteStream/AbstractFilterableInputStream.php';
-//@require 'Swift/InputByteStream.php';
-//@require 'Swift/FileStream.php';
-//@require 'Swift/IoException.php';
-
-/**
- * Allows reading and writing of bytes to and from a file.
- * @package Swift
- * @subpackage ByteStream
- * @author Chris Corbyn
- */
-class Swift_ByteStream_FileByteStream
-  extends Swift_ByteStream_AbstractFilterableInputStream
-  implements Swift_FileStream
-{
-  
-  /** The internal pointer offset */
-  private $_offset = 0;
-  
-  /** The path to the file */
-  private $_path;
-  
-  /** The mode this file is opened in for writing */
-  private $_mode;
-  
-  /** A lazy-loaded resource handle for reading the file */
-  private $_reader;
-  
-  /** A lazy-loaded resource handle for writing the file */
-  private $_writer;
-  
-  /** If magic_quotes_runtime is on, this will be true */
-  private $_quotes = false;
-  
-  /**
-   * Create a new FileByteStream for $path.
-   * @param string $path
-   * @param string $writable if true
-   */
-  public function __construct($path, $writable = false)
-  {
-    $this->_path = $path;
-    $this->_mode = $writable ? 'w+b' : 'rb';
-    $this->_quotes = get_magic_quotes_runtime();
-  }
-  
-  /**
-   * Get the complete path to the file.
-   * @return string
-   */
-  public function getPath()
-  {
-    return $this->_path;
-  }
-  
-  /**
-   * Reads $length bytes from the stream into a string and moves the pointer
-   * through the stream by $length. If less bytes exist than are requested the
-   * remaining bytes are given instead. If no bytes are remaining at all, boolean
-   * false is returned.
-   * @param int $length
-   * @return string
-   * @throws Swift_IoException
-   */
-  public function read($length)
-  {
-    $fp = $this->_getReadHandle();
-    if (!feof($fp))
-    {
-      if ($this->_quotes)
-      {
-        set_magic_quotes_runtime(0);
-      }
-      $bytes = fread($fp, $length);
-      if ($this->_quotes)
-      {
-        set_magic_quotes_runtime(1);
-      }
-      $this->_offset = ftell($fp);
-      return $bytes;
-    }
-    else
-    {
-      return false;
-    }
-  }
-  
-  /**
-   * Move the internal read pointer to $byteOffset in the stream.
-   * @param int $byteOffset
-   * @return boolean
-   */
-  public function setReadPointer($byteOffset)
-  {
-    if (isset($this->_reader))
-    {
-      fseek($this->_reader, $byteOffset, SEEK_SET);
-    }
-    $this->_offset = $byteOffset;
-  }
-  
-  // -- Private methods
-  
-  /** Just write the bytes to the file */
-  protected function _commit($bytes)
-  {
-    fwrite($this->_getWriteHandle(), $bytes);
-    $this->_resetReadHandle();
-  }
-  
-  /** Not used */
-  protected function _flush()
-  {
-  }
-  
-  /** Get the resource for reading */
-  private function _getReadHandle()
-  {
-    if (!isset($this->_reader))
-    {
-      if (!$this->_reader = fopen($this->_path, 'rb'))
-      {
-        throw new Swift_IoException(
-          'Unable to open file for reading [' . $this->_path . ']'
-          );
-      }
-      fseek($this->_reader, $this->_offset, SEEK_SET);
-    }
-    return $this->_reader;
-  }
-  
-  /** Get the resource for writing */
-  private function _getWriteHandle()
-  {
-    if (!isset($this->_writer))
-    {
-      if (!$this->_writer = fopen($this->_path, $this->_mode))
-      {
-        throw new Swift_IoException(
-          'Unable to open file for writing [' . $this->_path . ']'
-          );
-      }
-    }
-    return $this->_writer;
-  }
-  
-  /** Force a reload of the resource for writing */
-  private function _resetWriteHandle()
-  {
-    if (isset($this->_writer))
-    {
-      fclose($this->_writer);
-      $this->_writer = null;
-    }
-  }
-  
-  /** Force a reload of the resource for reading */
-  private function _resetReadHandle()
-  {
-    if (isset($this->_reader))
-    {
-      fclose($this->_reader);
-      $this->_reader = null;
-    }
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterReader.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterReader.php
deleted file mode 100644
index 53d39ece9..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterReader.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Analyzes characters for a specific character set.
- * @package Swift
- * @subpackage Encoder
- * @author Chris Corbyn
- * @author Xavier De Cock <xdecock@gmail.com>
- */
-interface Swift_CharacterReader
-{
-  const MAP_TYPE_INVALID = 0x01;
-  const MAP_TYPE_FIXED_LEN = 0x02;
-  const MAP_TYPE_POSITIONS = 0x03;
-  
-  /**
-   * Returns the complete charactermap
-   *
-   * @param string $string
-   * @param int $startOffset
-   * @param array $currentMap
-   * @param mixed $ignoredChars
-   * @return int
-   */
-  public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars);
-  
-  /**
-   * Returns mapType
-   * @int mapType
-   */
-  public function getMapType();
-  
-  /**
-   * Returns an integer which specifies how many more bytes to read.
-   * A positive integer indicates the number of more bytes to fetch before invoking
-   * this method again.
-   * A value of zero means this is already a valid character.
-   * A value of -1 means this cannot possibly be a valid character.
-   * @param int[] $bytes
-   * @return int
-   */
-  public function validateByteSequence($bytes, $size);
-
-  /**
-   * Returns the number of bytes which should be read to start each character.
-   * For fixed width character sets this should be the number of
-   * octets-per-character. For multibyte character sets this will probably be 1.
-   * @return int
-   */
-  public function getInitialByteSize();
-
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterReader/GenericFixedWidthReader.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterReader/GenericFixedWidthReader.php
deleted file mode 100644
index 26b13ff42..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterReader/GenericFixedWidthReader.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/CharacterReader.php';
-
-/**
- * Provides fixed-width byte sizes for reading fixed-width character sets.
- * @package Swift
- * @subpackage Encoder
- * @author Chris Corbyn
- * @author Xavier De Cock <xdecock@gmail.com>
- */
-class Swift_CharacterReader_GenericFixedWidthReader
-  implements Swift_CharacterReader
-{
-   
-  /**
-   * The number of bytes in a single character.
-   * @var int
-   * @access private
-   */
-  private $_width;
-	
-  /**
-   * Creates a new GenericFixedWidthReader using $width bytes per character.
-   * @param int $width
-   */
-  public function __construct($width)
-  {
-    $this->_width = $width;
-  }
-
-  /**
-   * Returns the complete charactermap
-   *
-   * @param string $string
-   * @param int $startOffset
-   * @param array $currentMap
-   * @param mixed $ignoredChars
-   * @return $int
-   */
-  public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
-  {
-  	$strlen = strlen($string);
-  	// % and / are CPU intensive, so, maybe find a better way
-  	$ignored = $strlen%$this->_width;
-  	$ignoredChars = substr($string, - $ignored);
-  	$currentMap = $this->_width;
-  	return ($strlen - $ignored)/$this->_width;
-  	
-  }
-  
-  /**
-   * Returns mapType
-   * @int mapType
-   */
-  public function getMapType()
-  {
-  	return self::MAP_TYPE_FIXED_LEN;
-  }
-
-  /**
-   * Returns an integer which specifies how many more bytes to read.
-   * A positive integer indicates the number of more bytes to fetch before invoking
-   * this method again.
-   * A value of zero means this is already a valid character.
-   * A value of -1 means this cannot possibly be a valid character.
-   * @param string $bytes
-   * @return int
-   */
-  public function validateByteSequence($bytes, $size)
-  {
-    $needed = $this->_width - $size;
-    return ($needed > -1)
-      ? $needed
-      : -1
-      ;
-  }
-
-  /**
-   * Returns the number of bytes which should be read to start each character.
-   * @return int
-   */
-  public function getInitialByteSize()
-  {
-    return $this->_width;
-  }
-
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterReader/UsAsciiReader.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterReader/UsAsciiReader.php
deleted file mode 100644
index 3e0228a37..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterReader/UsAsciiReader.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/CharacterReader.php';
-
-/**
- * Analyzes US-ASCII characters.
- * @package Swift
- * @subpackage Encoder
- * @author Chris Corbyn
- */
-class Swift_CharacterReader_UsAsciiReader
-  implements Swift_CharacterReader
-{
-  /**
-   * Returns the complete charactermap
-   *
-   * @param string $string
-   * @param int $startOffset
-   * @param string $ignoredChars
-   */
-  public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
-  {
-  	$strlen=strlen($string);
-  	$ignoredChars='';
-  	for( $i = 0; $i < $strlen; ++$i)
-  	{
-  	  if ($string[$i]>"\x07F")
-  	  { // Invalid char
-  	  	$currentMap[$i+$startOffset]=$string[$i];
-  	  }
-  	}
-  	return $strlen;
-  }
-  
-  /**
-   * Returns mapType
-   * @int mapType
-   */
-  public function getMapType()
-  {
-  	return self::MAP_TYPE_INVALID;
-  }
- 
-  /**
-   * Returns an integer which specifies how many more bytes to read.
-   * A positive integer indicates the number of more bytes to fetch before invoking
-   * this method again.
-   * A value of zero means this is already a valid character.
-   * A value of -1 means this cannot possibly be a valid character.
-   * @param string $bytes
-   * @return int
-   */
-  public function validateByteSequence($bytes, $size)
-  {
-    $byte = reset($bytes);
-    if (1 == count($bytes) && $byte >= 0x00 && $byte <= 0x7F)
-    {
-      return 0;
-    }
-    else
-    {
-      return -1;
-    }
-  }
-
-  /**
-   * Returns the number of bytes which should be read to start each character.
-   * @return int
-   */
-  public function getInitialByteSize()
-  {
-    return 1;
-  }
-
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterReader/Utf8Reader.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterReader/Utf8Reader.php
deleted file mode 100644
index 54ea9a462..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterReader/Utf8Reader.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/CharacterReader.php';
-
-/**
- * Analyzes UTF-8 characters.
- * @package Swift
- * @subpackage Encoder
- * @author Chris Corbyn
- * @author Xavier De Cock <xdecock@gmail.com>
- */
-class Swift_CharacterReader_Utf8Reader
-  implements Swift_CharacterReader
-{
-
-  /** Pre-computed for optimization */
-  private static $length_map=array(
-//N=0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F,
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, //0x0N
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, //0x1N
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, //0x2N
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, //0x3N
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, //0x4N
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, //0x5N
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, //0x6N
-    1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, //0x7N
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, //0x8N
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, //0x9N
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, //0xAN
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, //0xBN
-    2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, //0xCN
-    2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, //0xDN
-    3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, //0xEN
-    4,4,4,4,4,4,4,4,5,5,5,5,6,6,0,0  //0xFN
- );
-  private static $s_length_map=array(
-  "\x00"=>1, "\x01"=>1, "\x02"=>1, "\x03"=>1, "\x04"=>1, "\x05"=>1, "\x06"=>1, "\x07"=>1,
-  "\x08"=>1, "\x09"=>1, "\x0a"=>1, "\x0b"=>1, "\x0c"=>1, "\x0d"=>1, "\x0e"=>1, "\x0f"=>1,
-  "\x10"=>1, "\x11"=>1, "\x12"=>1, "\x13"=>1, "\x14"=>1, "\x15"=>1, "\x16"=>1, "\x17"=>1,
-  "\x18"=>1, "\x19"=>1, "\x1a"=>1, "\x1b"=>1, "\x1c"=>1, "\x1d"=>1, "\x1e"=>1, "\x1f"=>1,
-  "\x20"=>1, "\x21"=>1, "\x22"=>1, "\x23"=>1, "\x24"=>1, "\x25"=>1, "\x26"=>1, "\x27"=>1,
-  "\x28"=>1, "\x29"=>1, "\x2a"=>1, "\x2b"=>1, "\x2c"=>1, "\x2d"=>1, "\x2e"=>1, "\x2f"=>1,
-  "\x30"=>1, "\x31"=>1, "\x32"=>1, "\x33"=>1, "\x34"=>1, "\x35"=>1, "\x36"=>1, "\x37"=>1,
-  "\x38"=>1, "\x39"=>1, "\x3a"=>1, "\x3b"=>1, "\x3c"=>1, "\x3d"=>1, "\x3e"=>1, "\x3f"=>1,
-  "\x40"=>1, "\x41"=>1, "\x42"=>1, "\x43"=>1, "\x44"=>1, "\x45"=>1, "\x46"=>1, "\x47"=>1,
-  "\x48"=>1, "\x49"=>1, "\x4a"=>1, "\x4b"=>1, "\x4c"=>1, "\x4d"=>1, "\x4e"=>1, "\x4f"=>1,
-  "\x50"=>1, "\x51"=>1, "\x52"=>1, "\x53"=>1, "\x54"=>1, "\x55"=>1, "\x56"=>1, "\x57"=>1,
-  "\x58"=>1, "\x59"=>1, "\x5a"=>1, "\x5b"=>1, "\x5c"=>1, "\x5d"=>1, "\x5e"=>1, "\x5f"=>1,
-  "\x60"=>1, "\x61"=>1, "\x62"=>1, "\x63"=>1, "\x64"=>1, "\x65"=>1, "\x66"=>1, "\x67"=>1,
-  "\x68"=>1, "\x69"=>1, "\x6a"=>1, "\x6b"=>1, "\x6c"=>1, "\x6d"=>1, "\x6e"=>1, "\x6f"=>1,
-  "\x70"=>1, "\x71"=>1, "\x72"=>1, "\x73"=>1, "\x74"=>1, "\x75"=>1, "\x76"=>1, "\x77"=>1,
-  "\x78"=>1, "\x79"=>1, "\x7a"=>1, "\x7b"=>1, "\x7c"=>1, "\x7d"=>1, "\x7e"=>1, "\x7f"=>1,
-  "\x80"=>0, "\x81"=>0, "\x82"=>0, "\x83"=>0, "\x84"=>0, "\x85"=>0, "\x86"=>0, "\x87"=>0,
-  "\x88"=>0, "\x89"=>0, "\x8a"=>0, "\x8b"=>0, "\x8c"=>0, "\x8d"=>0, "\x8e"=>0, "\x8f"=>0,
-  "\x90"=>0, "\x91"=>0, "\x92"=>0, "\x93"=>0, "\x94"=>0, "\x95"=>0, "\x96"=>0, "\x97"=>0,
-  "\x98"=>0, "\x99"=>0, "\x9a"=>0, "\x9b"=>0, "\x9c"=>0, "\x9d"=>0, "\x9e"=>0, "\x9f"=>0,
-  "\xa0"=>0, "\xa1"=>0, "\xa2"=>0, "\xa3"=>0, "\xa4"=>0, "\xa5"=>0, "\xa6"=>0, "\xa7"=>0,
-  "\xa8"=>0, "\xa9"=>0, "\xaa"=>0, "\xab"=>0, "\xac"=>0, "\xad"=>0, "\xae"=>0, "\xaf"=>0,
-  "\xb0"=>0, "\xb1"=>0, "\xb2"=>0, "\xb3"=>0, "\xb4"=>0, "\xb5"=>0, "\xb6"=>0, "\xb7"=>0,
-  "\xb8"=>0, "\xb9"=>0, "\xba"=>0, "\xbb"=>0, "\xbc"=>0, "\xbd"=>0, "\xbe"=>0, "\xbf"=>0,
-  "\xc0"=>2, "\xc1"=>2, "\xc2"=>2, "\xc3"=>2, "\xc4"=>2, "\xc5"=>2, "\xc6"=>2, "\xc7"=>2,
-  "\xc8"=>2, "\xc9"=>2, "\xca"=>2, "\xcb"=>2, "\xcc"=>2, "\xcd"=>2, "\xce"=>2, "\xcf"=>2,
-  "\xd0"=>2, "\xd1"=>2, "\xd2"=>2, "\xd3"=>2, "\xd4"=>2, "\xd5"=>2, "\xd6"=>2, "\xd7"=>2,
-  "\xd8"=>2, "\xd9"=>2, "\xda"=>2, "\xdb"=>2, "\xdc"=>2, "\xdd"=>2, "\xde"=>2, "\xdf"=>2,
-  "\xe0"=>3, "\xe1"=>3, "\xe2"=>3, "\xe3"=>3, "\xe4"=>3, "\xe5"=>3, "\xe6"=>3, "\xe7"=>3,
-  "\xe8"=>3, "\xe9"=>3, "\xea"=>3, "\xeb"=>3, "\xec"=>3, "\xed"=>3, "\xee"=>3, "\xef"=>3,
-  "\xf0"=>4, "\xf1"=>4, "\xf2"=>4, "\xf3"=>4, "\xf4"=>4, "\xf5"=>4, "\xf6"=>4, "\xf7"=>4,
-  "\xf8"=>5, "\xf9"=>5, "\xfa"=>5, "\xfb"=>5, "\xfc"=>6, "\xfd"=>6, "\xfe"=>0, "\xff"=>0,
- );
-
-  /**
-   * Returns the complete charactermap
-   *
-   * @param string $string
-   * @param int $startOffset
-   * @param array $currentMap
-   * @param mixed $ignoredChars
-   */
-  public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
-  {
-  	if (!isset($currentMap['i']) || !isset($currentMap['p']))
-  	{
-  	  $currentMap['p'] = $currentMap['i'] = array();
-   	}
-  	$strlen=strlen($string);
-  	$charPos=count($currentMap['p']);
-  	$foundChars=0;
-  	$invalid=false;
-  	for ($i=0; $i<$strlen; ++$i)
-  	{
-  	  $char=$string[$i];
-  	  $size=self::$s_length_map[$char];
-  	  if ($size==0)
-  	  {
-  	    /* char is invalid, we must wait for a resync */
-  	  	$invalid=true;
-  	  	continue;
-   	  }
-   	  else
-   	  {
-   	  	if ($invalid==true)
-   	  	{
-   	  	  /* We mark the chars as invalid and start a new char */
-   	  	  $currentMap['p'][$charPos+$foundChars]=$startOffset+$i;
-   	      $currentMap['i'][$charPos+$foundChars]=true;
-   	      ++$foundChars;
-   	      $invalid=false;
-   	  	}
-   	  	if (($i+$size) > $strlen){
-   	  		$ignoredChars=substr($string, $i);
-   	  		break;
-   	  	}
-   	  	for ($j=1; $j<$size; ++$j)
-   	  	{
-          $char=$string[$i+$j];
-          if ($char>"\x7F" && $char<"\xC0")
-          {
-            // Valid - continue parsing
-          }
-          else
-          {
-            /* char is invalid, we must wait for a resync */
-            $invalid=true;
-            continue 2;
-          }
-   	  	}
-   	  	/* Ok we got a complete char here */
-   	  	$lastChar=$currentMap['p'][$charPos+$foundChars]=$startOffset+$i+$size;
-   	  	$i+=$j-1;
-   	    ++$foundChars;
-   	  }
-  	}
-  	return $foundChars;
-  }
-  
-  /**
-   * Returns mapType
-   * @int mapType
-   */
-  public function getMapType()
-  {
-  	return self::MAP_TYPE_POSITIONS;
-  }
- 
-  /**
-   * Returns an integer which specifies how many more bytes to read.
-   * A positive integer indicates the number of more bytes to fetch before invoking
-   * this method again.
-   * A value of zero means this is already a valid character.
-   * A value of -1 means this cannot possibly be a valid character.
-   * @param string $bytes
-   * @return int
-   */
-  public function validateByteSequence($bytes, $size)
-  {
-    if ($size<1){
-      return -1;
-    }
-    $needed = self::$length_map[$bytes[0]] - $size;
-    return ($needed > -1)
-      ? $needed
-      : -1
-      ;
-  }
-
-  /**
-   * Returns the number of bytes which should be read to start each character.
-   * @return int
-   */
-  public function getInitialByteSize()
-  {
-    return 1;
-  }
-
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
deleted file mode 100644
index a6f9f9487..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/CharacterReaderFactory.php';
-
-/**
- * Standard factory for creating CharacterReaders.
- * @package Swift
- * @subpackage Encoder
- * @author Chris Corbyn
- */
-class Swift_CharacterReaderFactory_SimpleCharacterReaderFactory
-  implements Swift_CharacterReaderFactory
-{
-
-  /**
-   * A map of charset patterns to their implementation classes.
-   * @var array
-   * @access private
-   */
-  private $_map = array();
-  
-  /**
-   * Factories which have already been loaded.
-   * @var Swift_CharacterReaderFactory[]
-   * @access private
-   */
-  private $_loaded = array();
-  
-  /**
-   * Creates a new CharacterReaderFactory.
-   */
-  public function __construct()
-  {
-    $prefix = 'Swift_CharacterReader_';
-    
-    $singleByte = array(
-      'class' => $prefix . 'GenericFixedWidthReader',
-      'constructor' => array(1)
-      );
-    
-    $doubleByte = array(
-      'class' => $prefix . 'GenericFixedWidthReader',
-      'constructor' => array(2)
-      );
-      
-    $fourBytes = array(
-      'class' => $prefix . 'GenericFixedWidthReader',
-      'constructor' => array(4)
-      );
-    
-    //Utf-8
-    $this->_map['utf-?8'] = array(
-      'class' => $prefix . 'Utf8Reader',
-      'constructor' => array()
-      );
-    
-    //7-8 bit charsets
-    $this->_map['(us-)?ascii'] = $singleByte;
-    $this->_map['(iso|iec)-?8859-?[0-9]+'] = $singleByte;
-    $this->_map['windows-?125[0-9]'] = $singleByte;
-    $this->_map['cp-?[0-9]+'] = $singleByte;
-    $this->_map['ansi'] = $singleByte;
-    $this->_map['macintosh'] = $singleByte;
-    $this->_map['koi-?7'] = $singleByte;
-    $this->_map['koi-?8-?.+'] = $singleByte;
-    $this->_map['mik'] = $singleByte;
-    $this->_map['(cork|t1)'] = $singleByte;
-    $this->_map['v?iscii'] = $singleByte;
-    
-    //16 bits
-    $this->_map['(ucs-?2|utf-?16)'] = $doubleByte;
-    
-    //32 bits
-    $this->_map['(ucs-?4|utf-?32)'] = $fourBytes;
-    
-    //Fallback
-    $this->_map['.*'] = $singleByte;
-  }
-  
-  /**
-   * Returns a CharacterReader suitable for the charset applied.
-   * @param string $charset
-   * @return Swift_CharacterReader
-   */
-  public function getReaderFor($charset)
-  {
-    $charset = trim(strtolower($charset));
-    foreach ($this->_map as $pattern => $spec)
-    {
-      $re = '/^' . $pattern . '$/D';
-      if (preg_match($re, $charset))
-      {
-        if (!array_key_exists($pattern, $this->_loaded))
-        {
-          $reflector = new ReflectionClass($spec['class']);
-          if ($reflector->getConstructor())
-          {
-            $reader = $reflector->newInstanceArgs($spec['constructor']);
-          }
-          else
-          {
-            $reader = $reflector->newInstance();
-          }
-          $this->_loaded[$pattern] = $reader;
-        }
-        return $this->_loaded[$pattern];
-      }
-    }
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterStream.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterStream.php
deleted file mode 100644
index bf9152822..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterStream.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once dirname(__FILE__) . '/OutputByteStream.php';
-require_once dirname(__FILE__) . '/CharacterReaderFactory.php';
-
-
-/**
- * An abstract means of reading and writing data in terms of characters as opposed
- * to bytes.
- * Classes implementing this interface may use a subsystem which requires less
- * memory than working with large strings of data.
- * @package Swift
- * @subpackage CharacterStream
- * @author Chris Corbyn
- */
-interface Swift_CharacterStream
-{
-
-  /**
-   * Set the character set used in this CharacterStream.
-   * @param string $charset
-   */
-  public function setCharacterSet($charset);
-  
-  /**
-   * Set the CharacterReaderFactory for multi charset support.
-   * @param Swift_CharacterReaderFactory $factory
-   */
-  public function setCharacterReaderFactory(
-    Swift_CharacterReaderFactory $factory);
-  
-  /**
-   * Overwrite this character stream using the byte sequence in the byte stream.
-   * @param Swift_OutputByteStream $os output stream to read from
-   */
-  public function importByteStream(Swift_OutputByteStream $os);
-  
-  /**
-   * Import a string a bytes into this CharacterStream, overwriting any existing
-   * data in the stream.
-   * @param string $string
-   */
-  public function importString($string);
-  
-  /**
-   * Read $length characters from the stream and move the internal pointer
-   * $length further into the stream.
-   * @param int $length
-   * @return string
-   */
-  public function read($length);
-  
-  /**
-   * Read $length characters from the stream and return a 1-dimensional array
-   * containing there octet values.
-   * @param int $length
-   * @return int[]
-   */
-  public function readBytes($length);
-  
-  /**
-   * Write $chars to the end of the stream.
-   * @param string $chars
-   */
-  public function write($chars);
-  
-  /**
-   * Move the internal pointer to $charOffset in the stream.
-   * @param int $charOffset
-   */
-  public function setPointer($charOffset);
-  
-  /**
-   * Empty the stream and reset the internal pointer.
-   */
-  public function flushContents();
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterStream/ArrayCharacterStream.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterStream/ArrayCharacterStream.php
deleted file mode 100644
index 9612365a7..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterStream/ArrayCharacterStream.php
+++ /dev/null
@@ -1,319 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/CharacterStream.php';
-//@require 'Swift/OutputByteStream.php';
-
-
-/**
- * A CharacterStream implementation which stores characters in an internal array.
- * @package Swift
- * @subpackage CharacterStream
- * @author Chris Corbyn
- */
-class Swift_CharacterStream_ArrayCharacterStream
-  implements Swift_CharacterStream
-{
-  
-  /** A map of byte values and their respective characters */
-  private static $_charMap;
-  
-  /** A map of characters and their derivative byte values */
-  private static $_byteMap;
-  
-  /** The char reader (lazy-loaded) for the current charset */
-  private $_charReader;
-
-  /** A factory for creatiing CharacterReader instances */
-  private $_charReaderFactory;
-
-  /** The character set this stream is using */
-  private $_charset;
-
-  /** Array of characters */
-  private $_array = array();
-
-  /** Size of the array of character */
-  private $_array_size = array();
-
-  /** The current character offset in the stream */
-  private $_offset = 0;
-
-  /**
-   * Create a new CharacterStream with the given $chars, if set.
-   * @param Swift_CharacterReaderFactory $factory for loading validators
-   * @param string $charset used in the stream
-   */
-  public function __construct(Swift_CharacterReaderFactory $factory,
-    $charset)
-  {
-    self::_initializeMaps();
-    $this->setCharacterReaderFactory($factory);
-    $this->setCharacterSet($charset);
-  }
-
-  /**
-   * Set the character set used in this CharacterStream.
-   * @param string $charset
-   */
-  public function setCharacterSet($charset)
-  {
-    $this->_charset = $charset;
-    $this->_charReader = null;
-  }
-
-  /**
-   * Set the CharacterReaderFactory for multi charset support.
-   * @param Swift_CharacterReaderFactory $factory
-   */
-  public function setCharacterReaderFactory(
-    Swift_CharacterReaderFactory $factory)
-  {
-    $this->_charReaderFactory = $factory;
-  }
-
-  /**
-   * Overwrite this character stream using the byte sequence in the byte stream.
-   * @param Swift_OutputByteStream $os output stream to read from
-   */
-  public function importByteStream(Swift_OutputByteStream $os)
-  {
-    if (!isset($this->_charReader))
-    {
-      $this->_charReader = $this->_charReaderFactory
-        ->getReaderFor($this->_charset);
-    }
-
-    $startLength = $this->_charReader->getInitialByteSize();
-    while (false !== $bytes = $os->read($startLength))
-    {
-      $c = array();
-      for ($i = 0, $len = strlen($bytes); $i < $len; ++$i)
-      {
-        $c[] = self::$_byteMap[$bytes[$i]];
-      }
-      $size = count($c);
-      $need = $this->_charReader
-        ->validateByteSequence($c, $size);
-      if ($need > 0 &&
-        false !== $bytes = $os->read($need))
-      {
-        for ($i = 0, $len = strlen($bytes); $i < $len; ++$i)
-        {
-          $c[] = self::$_byteMap[$bytes[$i]];
-        }
-      }
-      $this->_array[] = $c;
-      ++$this->_array_size;
-    }
-  }
-
-  /**
-   * Import a string a bytes into this CharacterStream, overwriting any existing
-   * data in the stream.
-   * @param string $string
-   */
-  public function importString($string)
-  {
-    $this->flushContents();
-    $this->write($string);
-  }
-
-  /**
-   * Read $length characters from the stream and move the internal pointer
-   * $length further into the stream.
-   * @param int $length
-   * @return string
-   */
-  public function read($length)
-  {
-    if ($this->_offset == $this->_array_size)
-    {
-      return false;
-    }
-
-    // Don't use array slice
-    $arrays = array();
-    $end = $length + $this->_offset;
-    for ($i = $this->_offset; $i < $end; ++$i)
-    {
-      if (!isset($this->_array[$i]))
-      {
-        break;
-      }
-      $arrays[] = $this->_array[$i];
-    }
-    $this->_offset += $i - $this->_offset; // Limit function calls
-    $chars = false;
-    foreach ($arrays as $array)
-    {
-      $chars .= implode('', array_map('chr', $array));
-    }
-    return $chars;
-  }
-
-  /**
-   * Read $length characters from the stream and return a 1-dimensional array
-   * containing there octet values.
-   * @param int $length
-   * @return int[]
-   */
-  public function readBytes($length)
-  {
-    if ($this->_offset == $this->_array_size)
-    {
-      return false;
-    }
-    $arrays = array();
-    $end = $length + $this->_offset;
-    for ($i = $this->_offset; $i < $end; ++$i)
-    {
-      if (!isset($this->_array[$i]))
-      {
-        break;
-      }
-      $arrays[] = $this->_array[$i];
-    }
-    $this->_offset += ($i - $this->_offset); // Limit function calls
-    return call_user_func_array('array_merge', $arrays);
-  }
-
-  /**
-   * Write $chars to the end of the stream.
-   * @param string $chars
-   */
-  public function write($chars)
-  {
-    if (!isset($this->_charReader))
-    {
-      $this->_charReader = $this->_charReaderFactory->getReaderFor(
-        $this->_charset);
-    }
-
-    $startLength = $this->_charReader->getInitialByteSize();
-
-    $fp = fopen('php://memory', 'w+b');
-    fwrite($fp, $chars);
-    unset($chars);
-    fseek($fp, 0, SEEK_SET);
-
-    $buffer = array(0);
-    $buf_pos = 1;
-    $buf_len = 1;
-    $has_datas = true;
-    do
-    {
-      $bytes = array();
-      // Buffer Filing
-      if ($buf_len - $buf_pos < $startLength)
-      {
-        $buf = array_splice($buffer, $buf_pos);
-        $new = $this->_reloadBuffer($fp, 100);
-        if ($new)
-        {
-          $buffer = array_merge($buf, $new);
-          $buf_len = count($buffer);
-          $buf_pos = 0;
-        }
-        else
-        {
-          $has_datas = false;
-        }
-      }
-      if ($buf_len - $buf_pos > 0)
-      {
-        $size = 0;
-        for ($i = 0; $i < $startLength && isset($buffer[$buf_pos]); ++$i)
-        {
-          ++$size;
-          $bytes[] = $buffer[$buf_pos++];
-        }
-        $need = $this->_charReader->validateByteSequence(
-          $bytes, $size);
-        if ($need > 0)
-        {
-          if ($buf_len - $buf_pos < $need)
-          {
-            $new = $this->_reloadBuffer($fp, $need);
-            
-            if ($new)
-            {
-              $buffer = array_merge($buffer, $new);
-              $buf_len = count($buffer);
-            }
-          }
-          for ($i = 0; $i < $need && isset($buffer[$buf_pos]); ++$i)
-          {
-            $bytes[] = $buffer[$buf_pos++];
-          }
-        }
-        $this->_array[] = $bytes;
-        ++$this->_array_size;
-      }
-    }
-    while ($has_datas);
-    
-    fclose($fp);
-  }
-
-  /**
-   * Move the internal pointer to $charOffset in the stream.
-   * @param int $charOffset
-   */
-  public function setPointer($charOffset)
-  {
-    if ($charOffset > $this->_array_size)
-    {
-      $charOffset = $this->_array_size;
-    }
-    elseif ($charOffset < 0)
-    {
-      $charOffset = 0;
-    }
-    $this->_offset = $charOffset;
-  }
-
-  /**
-   * Empty the stream and reset the internal pointer.
-   */
-  public function flushContents()
-  {
-    $this->_offset = 0;
-    $this->_array = array();
-    $this->_array_size = 0;
-  }
-  
-  private function _reloadBuffer($fp, $len)
-  {
-    if (!feof($fp) && ($bytes = fread($fp, $len)) !== false)
-    {
-      $buf = array();
-      for ($i = 0, $len = strlen($bytes); $i < $len; ++$i)
-      {
-        $buf[] = self::$_byteMap[$bytes[$i]];
-      }
-      return $buf;
-    }
-    return false;
-  }
-  
-  private static function _initializeMaps()
-  {
-    if (!isset(self::$_charMap))
-    {
-      self::$_charMap = array();
-      for ($byte = 0; $byte < 256; ++$byte)
-      {
-        self::$_charMap[$byte] = chr($byte);
-      }
-      self::$_byteMap = array_flip(self::$_charMap);
-    }
-  }
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterStream/NgCharacterStream.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterStream/NgCharacterStream.php
deleted file mode 100644
index f090aa7d3..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterStream/NgCharacterStream.php
+++ /dev/null
@@ -1,300 +0,0 @@
-<?php
-
-/*
- CharacterStream implementation using an array in Swift Mailer.
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
- */
-
-//@require 'Swift/CharacterStream.php';
-//@require 'Swift/OutputByteStream.php';
-
-
-/**
- * A CharacterStream implementation which stores characters in an internal array.
- * @package Swift
- * @subpackage CharacterStream
- * @author Xavier De Cock <xdecock@gmail.com>
- */
-
-Class Swift_CharacterStream_NgCharacterStream
-  implements Swift_CharacterStream
-{
-
-  /**
-   * The char reader (lazy-loaded) for the current charset.
-   * @var Swift_CharacterReader
-   * @access private
-   */
-  private $_charReader;
-
-  /**
-   * A factory for creatiing CharacterReader instances.
-   * @var Swift_CharacterReaderFactory
-   * @access private
-   */
-  private $_charReaderFactory;
-
-  /**
-   * The character set this stream is using.
-   * @var string
-   * @access private
-   */
-  private $_charset;
-  
-  /**
-   * The datas stored as is
-   *
-   * @var string
-   */
-  private $_datas = "";
-  
-  /**
-   * Number of bytes in the stream
-   *
-   * @var int
-   */
-  private $_datasSize = 0;
-  
-  /**
-   * Map
-   *
-   * @var mixed
-   */
-  private $_map;
-  
-  /**
-   * Map Type
-   *
-   * @var int
-   */
-  private $_mapType = 0;
-  
-  /**
-   * Number of characters in the stream
-   *
-   * @var int
-   */
-  private $_charCount = 0;
-  
-  /**
-   * Position in the stream
-   *
-   * @var unknown_type
-   */
-  private $_currentPos = 0;
-  
-  /**
-   * The constructor
-   *
-   * @param Swift_CharacterReaderFactory $factory
-   * @param unknown_type $charset
-   */
-  public function __construct(Swift_CharacterReaderFactory $factory,
-    $charset)
-  {
-    $this->setCharacterReaderFactory($factory);
-    $this->setCharacterSet($charset);
-  }
-  
-  /* -- Changing parameters of the stream -- */
-
-  /**
-   * Set the character set used in this CharacterStream.
-   * @param string $charset
-   */
-  public function setCharacterSet($charset)
-  {
-    $this->_charset = $charset;
-    $this->_charReader = null;
-  	$this->_mapType = 0;
-  }
-
-  /**
-   * Set the CharacterReaderFactory for multi charset support.
-   * @param Swift_CharacterReaderFactory $factory
-   */
-  public function setCharacterReaderFactory(
-    Swift_CharacterReaderFactory $factory)
-  {
-    $this->_charReaderFactory = $factory;
-  }
-
-  /**
-   * @see Swift_CharacterStream::flushContents()
-   *
-   */
-  public function flushContents()
-  {
-  	$this->_datas = null;
-  	$this->_map = null;
-  	$this->_charCount = 0;
-  	$this->_currentPos = 0;
-  	$this->_datasSize = 0;
-  }
-  
-  /**
-   * @see Swift_CharacterStream::importByteStream()
-   *
-   * @param Swift_OutputByteStream $os
-   */
-  public function importByteStream(Swift_OutputByteStream $os)
-  {
-    $this->flushContents();
-    $blocks=512;
-    $os->setReadPointer(0);
-    while(false!==($read = $os->read($blocks)))
-      $this->write($read);
-  }
-  
-  /**
-   * @see Swift_CharacterStream::importString()
-   *
-   * @param string $string
-   */
-  public function importString($string)
-  {
-    $this->flushContents();
-    $this->write($string);
-  }
-  
-  /**
-   * @see Swift_CharacterStream::read()
-   *
-   * @param int $length
-   * @return string
-   */
-  public function read($length)
-  {
-  	if ($this->_currentPos>=$this->_charCount)
-  	{
-  	  return false;
-  	}
-  	$ret=false;
-  	$length = ($this->_currentPos+$length > $this->_charCount)
-  	  ? $this->_charCount - $this->_currentPos
-  	  : $length;
-  	  switch ($this->_mapType)
-  	{
-      case Swift_CharacterReader::MAP_TYPE_FIXED_LEN:
-        $len = $length*$this->_map;
-        $ret = substr($this->_datas,
-            $this->_currentPos * $this->_map,
-            $len);
-        $this->_currentPos += $length;
-        break;
-      
-      case Swift_CharacterReader::MAP_TYPE_INVALID:
-        $end = $this->_currentPos + $length;
-        $end = $end > $this->_charCount
-          ?$this->_charCount
-          :$end;
-        $ret = '';
-        for (; $this->_currentPos < $length; ++$this->_currentPos)
-        {
-          if (isset ($this->_map[$this->_currentPos]))
-          {
-            $ret .= '?';
-          }
-          else
-          {
-            $ret .= $this->_datas[$this->_currentPos];
-          }
-        }
-        break;
-      
-      case Swift_CharacterReader::MAP_TYPE_POSITIONS:
-        $end = $this->_currentPos + $length;
-        $end = $end > $this->_charCount
-          ?$this->_charCount
-          :$end;
-        $ret = '';
-        $start = 0;
-        if ($this->_currentPos>0)
-        {
-          $start = $this->_map['p'][$this->_currentPos-1];
-        }
-        $to = $start;
-        for (; $this->_currentPos < $end; ++$this->_currentPos)
-        {
-          if (isset($this->_map['i'][$this->_currentPos])) {
-          	$ret .= substr($this->_datas, $start, $to - $start).'?';
-          	$start = $this->_map['p'][$this->_currentPos];
-          } else {
-          	$to = $this->_map['p'][$this->_currentPos];
-          }
-        }
-        $ret .= substr($this->_datas, $start, $to - $start);
-        break;
-  	}
-  	return $ret;
-  }
-  
-  /**
-   * @see Swift_CharacterStream::readBytes()
-   *
-   * @param int $length
-   * @return int[]
-   */
-  public function readBytes($length)
-  {
-    $read=$this->read($length);
-  	if ($read!==false)
-  	{
-      $ret = array_map('ord', str_split($read, 1));
-      return $ret;
-  	}
-  	return false;
-  }
-  
-  /**
-   * @see Swift_CharacterStream::setPointer()
-   *
-   * @param int $charOffset
-   */
-  public function setPointer($charOffset)
-  {
-  	if ($this->_charCount<$charOffset){
-  		$charOffset=$this->_charCount;
-  	}
-  	$this->_currentPos = $charOffset;
-  }
-  
-  /**
-   * @see Swift_CharacterStream::write()
-   *
-   * @param string $chars
-   */
-  public function write($chars)
-  {
-  	if (!isset($this->_charReader))
-    {
-      $this->_charReader = $this->_charReaderFactory->getReaderFor(
-        $this->_charset);
-      $this->_map = array();
-      $this->_mapType = $this->_charReader->getMapType();
-    }
-  	$ignored='';
-  	$this->_datas .= $chars;
-    $this->_charCount += $this->_charReader->getCharPositions(substr($this->_datas, $this->_datasSize), $this->_datasSize, $this->_map, $ignored);
-    if ($ignored!==false) {
-      $this->_datasSize=strlen($this->_datas)-strlen($ignored);
-    }
-    else
-    {
-      $this->_datasSize=strlen($this->_datas);
-    }
-  }
-}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/ConfigurableSpool.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/ConfigurableSpool.php
deleted file mode 100644
index 27a9b6c91..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/ConfigurableSpool.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2009 Fabien Potencier <fabien.potencier@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Base class for Spools (implements time and message limits).
- * @package Swift
- * @author  Fabien Potencier
- */
-abstract class Swift_ConfigurableSpool implements Swift_Spool
-{
-  /** The maximum number of messages to send per flush */
-  private $_message_limit;
-  
-  /** The time limit per flush */
-  private $_time_limit;
-  
-  /**
-   * Sets the maximum number of messages to send per flush.
-   * @param int $limit The limit
-   */
-  public function setMessageLimit($limit)
-  {
-    $this->_message_limit = (int) $limit;
-  }
-  
-  /**
-   * Gets the maximum number of messages to send per flush.
-   * @return int The limit
-   */
-  public function getMessageLimit()
-  {
-    return $this->_message_limit;
-  }
-  
-  /**
-   * Sets the time limit (in seconds) per flush.
-   * @param int $limit The limit
-   */
-  public function setTimeLimit($limit)
-  {
-    $this->_time_limit = (int) $limit;
-  }
-  
-  /**
-   * Gets the time limit (in seconds) per flush.
-   * @return int The limit
-   */
-  public function getTimeLimit()
-  {
-    return $this->_time_limit;
-  }
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/DependencyContainer.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/DependencyContainer.php
deleted file mode 100644
index b6ba554e6..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/DependencyContainer.php
+++ /dev/null
@@ -1,349 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/DependencyException.php';
-
-/**
- * Dependency Injection container.
- * @package Swift
- * @author Chris Corbyn
- */
-class Swift_DependencyContainer
-{
-  
-  /** Constant for literal value types */
-  const TYPE_VALUE = 0x0001;
-  
-  /** Constant for new instance types */
-  const TYPE_INSTANCE = 0x0010;
-  
-  /** Constant for shared instance types */
-  const TYPE_SHARED = 0x0100;
-  
-  /** Constant for aliases */
-  const TYPE_ALIAS = 0x1000;
-  
-  /** Singleton instance */
-  private static $_instance = null;
-  
-  /** The data container */
-  private $_store = array();
-  
-  /** The current endpoint in the data container */
-  private $_endPoint;
-  
-  /**
-   * Constructor should not be used.
-   * Use {@link getInstance()} instead.
-   */
-  public function __construct() { }
-  
-  /**
-   * Returns a singleton of the DependencyContainer.
-   * @return Swift_DependencyContainer
-   */
-  public static function getInstance()
-  {
-    if (!isset(self::$_instance))
-    {
-      self::$_instance = new self();
-    }
-    return self::$_instance;
-  }
-  
-  /**
-   * List the names of all items stored in the Container.
-   * @return array
-   */
-  public function listItems()
-  {
-    return array_keys($this->_store);
-  }
-  
-  /**
-   * Test if an item is registered in this container with the given name.
-   * @param string $itemName
-   * @return boolean
-   * @see register()
-   */
-  public function has($itemName)
-  {
-    return array_key_exists($itemName, $this->_store)
-      && isset($this->_store[$itemName]['lookupType']);
-  }
-  
-  /**
-   * Lookup the item with the given $itemName.
-   * @param string $itemName
-   * @return mixed
-   * @throws Swift_DependencyException If the dependency is not found
-   * @see register()
-   */
-  public function lookup($itemName)
-  {
-    if (!$this->has($itemName))
-    {
-      throw new Swift_DependencyException(
-        'Cannot lookup dependency "' . $itemName . '" since it is not registered.'
-        );
-    }
-    
-    switch ($this->_store[$itemName]['lookupType'])
-    {
-      case self::TYPE_ALIAS:
-        return $this->_createAlias($itemName);
-      case self::TYPE_VALUE:
-        return $this->_getValue($itemName);
-      case self::TYPE_INSTANCE:
-        return $this->_createNewInstance($itemName);
-      case self::TYPE_SHARED:
-        return $this->_createSharedInstance($itemName);
-    }
-  }
-  
-  /**
-   * Create an array of arguments passed to the constructor of $itemName.
-   * @param string $itemName
-   * @return array
-   */
-  public function createDependenciesFor($itemName)
-  {
-    $args = array();
-    if (isset($this->_store[$itemName]['args']))
-    {
-      $args = $this->_resolveArgs($this->_store[$itemName]['args']);
-    }
-    return $args;
-  }
-  
-  /**
-   * Register a new dependency with $itemName.
-   * This method returns the current DependencyContainer instance because it
-   * requires the use of the fluid interface to set the specific details for the
-   * dependency.
-   *
-   * @param string $itemName
-   * @return Swift_DependencyContainer
-   * @see asNewInstanceOf(), asSharedInstanceOf(), asValue()
-   */
-  public function register($itemName)
-  {
-    $this->_store[$itemName] = array();
-    $this->_endPoint =& $this->_store[$itemName];
-    return $this;
-  }
-  
-  /**
-   * Specify the previously registered item as a literal value.
-   * {@link register()} must be called before this will work.
-   *
-   * @param mixed $value
-   * @return Swift_DependencyContainer
-   */
-  public function asValue($value)
-  {
-    $endPoint =& $this->_getEndPoint();
-    $endPoint['lookupType'] = self::TYPE_VALUE;
-    $endPoint['value'] = $value;
-    return $this;
-  }
-  
-  /**
-   * Specify the previously registered item as an alias of another item.
-   * @param string $lookup
-   * @return Swift_DependencyContainer
-   */
-  public function asAliasOf($lookup)
-  {
-    $endPoint =& $this->_getEndPoint();
-    $endPoint['lookupType'] = self::TYPE_ALIAS;
-    $endPoint['ref'] = $lookup;
-    return $this;
-  }
-  
-  /**
-   * Specify the previously registered item as a new instance of $className.
-   * {@link register()} must be called before this will work.
-   * Any arguments can be set with {@link withDependencies()},
-   * {@link addConstructorValue()} or {@link addConstructorLookup()}.
-   *
-   * @param string $className
-   * @return Swift_DependencyContainer
-   * @see withDependencies(), addConstructorValue(), addConstructorLookup()
-   */
-  public function asNewInstanceOf($className)
-  {
-    $endPoint =& $this->_getEndPoint();
-    $endPoint['lookupType'] = self::TYPE_INSTANCE;
-    $endPoint['className'] = $className;
-    return $this;
-  }
-  
-  /**
-   * Specify the previously registered item as a shared instance of $className.
-   * {@link register()} must be called before this will work.
-   * @param string $className
-   * @return Swift_DependencyContainer
-   */
-  public function asSharedInstanceOf($className)
-  {
-    $endPoint =& $this->_getEndPoint();
-    $endPoint['lookupType'] = self::TYPE_SHARED;
-    $endPoint['className'] = $className;
-    return $this;
-  }
-  
-  /**
-   * Specify a list of injected dependencies for the previously registered item.
-   * This method takes an array of lookup names.
-   * 
-   * @param array $lookups
-   * @return Swift_DependencyContainer
-   * @see addConstructorValue(), addConstructorLookup()
-   */
-  public function withDependencies(array $lookups)
-  {
-    $endPoint =& $this->_getEndPoint();
-    $endPoint['args'] = array();
-    foreach ($lookups as $lookup)
-    {
-      $this->addConstructorLookup($lookup);
-    }
-    return $this;
-  }
-  
-  /**
-   * Specify a literal (non looked up) value for the constructor of the
-   * previously registered item.
-   * 
-   * @param mixed $value
-   * @return Swift_DependencyContainer
-   * @see withDependencies(), addConstructorLookup()
-   */
-  public function addConstructorValue($value)
-  {
-    $endPoint =& $this->_getEndPoint();
-    if (!isset($endPoint['args']))
-    {
-      $endPoint['args'] = array();
-    }
-    $endPoint['args'][] = array('type' => 'value', 'item' => $value);
-    return $this;
-  }
-  
-  /**
-   * Specify a dependency lookup for the constructor of the previously
-   * registered item.
-   * 
-   * @param string $lookup
-   * @return Swift_DependencyContainer
-   * @see withDependencies(), addConstructorValue()
-   */
-  public function addConstructorLookup($lookup)
-  {
-    $endPoint =& $this->_getEndPoint();
-    if (!isset($this->_endPoint['args']))
-    {
-      $endPoint['args'] = array();
-    }
-    $endPoint['args'][] = array('type' => 'lookup', 'item' => $lookup);
-    return $this;
-  }
-  
-  // -- Private methods
-  
-  /** Get the literal value with $itemName */
-  private function _getValue($itemName)
-  {
-    return $this->_store[$itemName]['value'];
-  }
-  
-  /** Resolve an alias to another item */
-  private function _createAlias($itemName)
-  {
-    return $this->lookup($this->_store[$itemName]['ref']);
-  }
-  
-  /** Create a fresh instance of $itemName */
-  private function _createNewInstance($itemName)
-  {
-    $reflector = new ReflectionClass($this->_store[$itemName]['className']);
-    if ($reflector->getConstructor())
-    {
-      return $reflector->newInstanceArgs(
-        $this->createDependenciesFor($itemName)
-        );
-    }
-    else
-    {
-      return $reflector->newInstance();
-    }
-  }
-  
-  /** Create and register a shared instance of $itemName */
-  private function _createSharedInstance($itemName)
-  {
-    if (!isset($this->_store[$itemName]['instance']))
-    {
-      $this->_store[$itemName]['instance'] = $this->_createNewInstance($itemName);
-    }
-    return $this->_store[$itemName]['instance'];
-  }
-  
-  /** Get the current endpoint in the store */
-  private function &_getEndPoint()
-  {
-    if (!isset($this->_endPoint))
-    {
-      throw new BadMethodCallException(
-        'Component must first be registered by calling register()'
-        );
-    }
-    return $this->_endPoint;
-  }
-  
-  /** Get an argument list with dependencies resolved */
-  private function _resolveArgs(array $args)
-  {
-    $resolved = array();
-    foreach ($args as $argDefinition)
-    {
-      switch ($argDefinition['type'])
-      {
-        case 'lookup':
-          $resolved[] = $this->_lookupRecursive($argDefinition['item']);
-          break;
-        case 'value':
-          $resolved[] = $argDefinition['item'];
-          break;
-      }
-    }
-    return $resolved;
-  }
-  
-  /** Resolve a single dependency with an collections */
-  private function _lookupRecursive($item)
-  {
-    if (is_array($item))
-    {
-      $collection = array();
-      foreach ($item as $k => $v)
-      {
-        $collection[$k] = $this->_lookupRecursive($v);
-      }
-      return $collection;
-    }
-    else
-    {
-      return $this->lookup($item);
-    }
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/EmbeddedFile.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/EmbeddedFile.php
deleted file mode 100644
index 34d096c6c..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/EmbeddedFile.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/Attachment.php';
-//@require 'Swift/DependencyContainer.php';
-//@require 'Swift/ByteStream/FileByteStream.php';
-
-/**
- * An embedded file, in a multipart message.
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-class Swift_EmbeddedFile extends Swift_Mime_EmbeddedFile
-{
-  
-  /**
-   * Create a new EmbeddedFile.
-   * Details may be optionally provided to the constructor.
-   * @param string|Swift_OutputByteStream $data
-   * @param string $filename
-   * @param string $contentType
-   */
-  public function __construct($data = null, $filename = null,
-    $contentType = null)
-  {
-    call_user_func_array(
-      array($this, 'Swift_Mime_EmbeddedFile::__construct'),
-      Swift_DependencyContainer::getInstance()
-        ->createDependenciesFor('mime.embeddedfile')
-      );
-    
-    $this->setBody($data);
-    $this->setFilename($filename);
-    if ($contentType)
-    {
-      $this->setContentType($contentType);
-    }
-  }
-  
-  /**
-   * Create a new EmbeddedFile.
-   * @param string|Swift_OutputByteStream $data
-   * @param string $filename
-   * @param string $contentType
-   * @return Swift_Mime_EmbeddedFile
-   */
-  public static function newInstance($data = null, $filename = null,
-    $contentType = null)
-  {
-    return new self($data, $filename, $contentType);
-  }
-  
-  /**
-   * Create a new EmbeddedFile from a filesystem path.
-   * @param string $path
-   * @return Swift_Mime_EmbeddedFile
-   */
-  public static function fromPath($path)
-  {
-    return self::newInstance()->setFile(
-      new Swift_ByteStream_FileByteStream($path)
-      );
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Encoder.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Encoder.php
deleted file mode 100644
index 32aa96a00..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Encoder.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/CharsetObserver.php';
-
-/**
- * Interface for all Encoder schemes.
- * @package Swift
- * @subpackage Encoder
- * @author Chris Corbyn
- */
-interface Swift_Encoder extends Swift_Mime_CharsetObserver
-{
-  
-  /**
-   * Encode a given string to produce an encoded string.
-   * @param string $string
-   * @param int $firstLineOffset if first line needs to be shorter
-   * @param int $maxLineLength - 0 indicates the default length for this encoding
-   * @return string
-   */
-  public function encodeString($string, $firstLineOffset = 0,
-    $maxLineLength = 0);
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Encoder/Base64Encoder.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Encoder/Base64Encoder.php
deleted file mode 100644
index 09c71baf4..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Encoder/Base64Encoder.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Encoder.php';
-
-/**
- * Handles Base 64 Encoding in Swift Mailer.
- * @package Swift
- * @subpackage Encoder
- * @author Chris Corbyn
- */
-class Swift_Encoder_Base64Encoder implements Swift_Encoder
-{
-  
-  /**
-   * Takes an unencoded string and produces a Base64 encoded string from it.
-   * Base64 encoded strings have a maximum line length of 76 characters.
-   * If the first line needs to be shorter, indicate the difference with
-   * $firstLineOffset.
-   * @param string $string to encode
-   * @param int $firstLineOffset
-   * @param int $maxLineLength, optional, 0 indicates the default of 76 bytes
-   * @return string
-   */
-  public function encodeString($string, $firstLineOffset = 0,
-    $maxLineLength = 0)
-  {
-    if (0 >= $maxLineLength || 76 < $maxLineLength)
-    {
-      $maxLineLength = 76;
-    }
-    
-    $encodedString = base64_encode($string);
-    $firstLine = '';
-    
-    if (0 != $firstLineOffset)
-    {
-      $firstLine = substr(
-        $encodedString, 0, $maxLineLength - $firstLineOffset
-        ) . "\r\n";
-      $encodedString = substr(
-        $encodedString, $maxLineLength - $firstLineOffset
-        );
-    }
-    
-    return $firstLine . trim(chunk_split($encodedString, $maxLineLength, "\r\n"));
-  }
-  
-  /**
-   * Does nothing.
-   */
-  public function charsetChanged($charset)
-  {
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Encoder/QpEncoder.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Encoder/QpEncoder.php
deleted file mode 100644
index 6914f6c4f..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Encoder/QpEncoder.php
+++ /dev/null
@@ -1,263 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Encoder.php';
-//@require 'Swift/CharacterStream.php';
-
-/**
- * Handles Quoted Printable (QP) Encoding in Swift Mailer.
- * Possibly the most accurate RFC 2045 QP implementation found in PHP.
- * @package Swift
- * @subpackage Encoder
- * @author Chris Corbyn
- */
-class Swift_Encoder_QpEncoder implements Swift_Encoder
-{
-
-  /**
-   * The CharacterStream used for reading characters (as opposed to bytes).
-   * @var Swift_CharacterStream
-   * @access protected
-   */
-  protected $_charStream;
-
-  /**
-   * A filter used if input should be canonicalized.
-   * @var Swift_StreamFilter
-   * @access protected
-   */
-  protected $_filter;
-
-  /**
-   * Pre-computed QP for HUGE optmization.
-   * @var string[]
-   * @access protected
-   */
-  protected static $_qpMap = array(
-    0   => '=00', 1   => '=01', 2   => '=02', 3   => '=03', 4   => '=04',
-    5   => '=05', 6   => '=06', 7   => '=07', 8   => '=08', 9   => '=09',
-    10  => '=0A', 11  => '=0B', 12  => '=0C', 13  => '=0D', 14  => '=0E',
-    15  => '=0F', 16  => '=10', 17  => '=11', 18  => '=12', 19  => '=13',
-    20  => '=14', 21  => '=15', 22  => '=16', 23  => '=17', 24  => '=18',
-    25  => '=19', 26  => '=1A', 27  => '=1B', 28  => '=1C', 29  => '=1D',
-    30  => '=1E', 31  => '=1F', 32  => '=20', 33  => '=21', 34  => '=22',
-    35  => '=23', 36  => '=24', 37  => '=25', 38  => '=26', 39  => '=27',
-    40  => '=28', 41  => '=29', 42  => '=2A', 43  => '=2B', 44  => '=2C',
-    45  => '=2D', 46  => '=2E', 47  => '=2F', 48  => '=30', 49  => '=31',
-    50  => '=32', 51  => '=33', 52  => '=34', 53  => '=35', 54  => '=36',
-    55  => '=37', 56  => '=38', 57  => '=39', 58  => '=3A', 59  => '=3B',
-    60  => '=3C', 61  => '=3D', 62  => '=3E', 63  => '=3F', 64  => '=40',
-    65  => '=41', 66  => '=42', 67  => '=43', 68  => '=44', 69  => '=45',
-    70  => '=46', 71  => '=47', 72  => '=48', 73  => '=49', 74  => '=4A',
-    75  => '=4B', 76  => '=4C', 77  => '=4D', 78  => '=4E', 79  => '=4F',
-    80  => '=50', 81  => '=51', 82  => '=52', 83  => '=53', 84  => '=54',
-    85  => '=55', 86  => '=56', 87  => '=57', 88  => '=58', 89  => '=59',
-    90  => '=5A', 91  => '=5B', 92  => '=5C', 93  => '=5D', 94  => '=5E',
-    95  => '=5F', 96  => '=60', 97  => '=61', 98  => '=62', 99  => '=63',
-    100 => '=64', 101 => '=65', 102 => '=66', 103 => '=67', 104 => '=68',
-    105 => '=69', 106 => '=6A', 107 => '=6B', 108 => '=6C', 109 => '=6D',
-    110 => '=6E', 111 => '=6F', 112 => '=70', 113 => '=71', 114 => '=72',
-    115 => '=73', 116 => '=74', 117 => '=75', 118 => '=76', 119 => '=77',
-    120 => '=78', 121 => '=79', 122 => '=7A', 123 => '=7B', 124 => '=7C',
-    125 => '=7D', 126 => '=7E', 127 => '=7F', 128 => '=80', 129 => '=81',
-    130 => '=82', 131 => '=83', 132 => '=84', 133 => '=85', 134 => '=86',
-    135 => '=87', 136 => '=88', 137 => '=89', 138 => '=8A', 139 => '=8B',
-    140 => '=8C', 141 => '=8D', 142 => '=8E', 143 => '=8F', 144 => '=90',
-    145 => '=91', 146 => '=92', 147 => '=93', 148 => '=94', 149 => '=95',
-    150 => '=96', 151 => '=97', 152 => '=98', 153 => '=99', 154 => '=9A',
-    155 => '=9B', 156 => '=9C', 157 => '=9D', 158 => '=9E', 159 => '=9F',
-    160 => '=A0', 161 => '=A1', 162 => '=A2', 163 => '=A3', 164 => '=A4',
-    165 => '=A5', 166 => '=A6', 167 => '=A7', 168 => '=A8', 169 => '=A9',
-    170 => '=AA', 171 => '=AB', 172 => '=AC', 173 => '=AD', 174 => '=AE',
-    175 => '=AF', 176 => '=B0', 177 => '=B1', 178 => '=B2', 179 => '=B3',
-    180 => '=B4', 181 => '=B5', 182 => '=B6', 183 => '=B7', 184 => '=B8',
-    185 => '=B9', 186 => '=BA', 187 => '=BB', 188 => '=BC', 189 => '=BD',
-    190 => '=BE', 191 => '=BF', 192 => '=C0', 193 => '=C1', 194 => '=C2',
-    195 => '=C3', 196 => '=C4', 197 => '=C5', 198 => '=C6', 199 => '=C7',
-    200 => '=C8', 201 => '=C9', 202 => '=CA', 203 => '=CB', 204 => '=CC',
-    205 => '=CD', 206 => '=CE', 207 => '=CF', 208 => '=D0', 209 => '=D1',
-    210 => '=D2', 211 => '=D3', 212 => '=D4', 213 => '=D5', 214 => '=D6',
-    215 => '=D7', 216 => '=D8', 217 => '=D9', 218 => '=DA', 219 => '=DB',
-    220 => '=DC', 221 => '=DD', 222 => '=DE', 223 => '=DF', 224 => '=E0',
-    225 => '=E1', 226 => '=E2', 227 => '=E3', 228 => '=E4', 229 => '=E5',
-    230 => '=E6', 231 => '=E7', 232 => '=E8', 233 => '=E9', 234 => '=EA',
-    235 => '=EB', 236 => '=EC', 237 => '=ED', 238 => '=EE', 239 => '=EF',
-    240 => '=F0', 241 => '=F1', 242 => '=F2', 243 => '=F3', 244 => '=F4',
-    245 => '=F5', 246 => '=F6', 247 => '=F7', 248 => '=F8', 249 => '=F9',
-    250 => '=FA', 251 => '=FB', 252 => '=FC', 253 => '=FD', 254 => '=FE',
-    255 => '=FF'
-    );
-
-  /**
-   * A map of non-encoded ascii characters.
-   * @var string[]
-   * @access protected
-   */
-  protected static $_safeMap = array();
-
-  /**
-   * Creates a new QpEncoder for the given CharacterStream.
-   * @param Swift_CharacterStream $charStream to use for reading characters
-   * @param Swift_StreamFilter $filter if input should be canonicalized
-   */
-  public function __construct(Swift_CharacterStream $charStream,
-    Swift_StreamFilter $filter = null)
-  {
-    $this->_charStream = $charStream;
-    if (empty(self::$_safeMap))
-    {
-      foreach (array_merge(
-        array(0x09, 0x20), range(0x21, 0x3C), range(0x3E, 0x7E)) as $byte)
-      {
-        self::$_safeMap[$byte] = chr($byte);
-      }
-    }
-    $this->_filter = $filter;
-  }
-
-  /**
-   * Takes an unencoded string and produces a QP encoded string from it.
-   * QP encoded strings have a maximum line length of 76 characters.
-   * If the first line needs to be shorter, indicate the difference with
-   * $firstLineOffset.
-   * @param string $string to encode
-   * @param int $firstLineOffset, optional
-   * @param int $maxLineLength, optional, 0 indicates the default of 76 chars
-   * @return string
-   */
-  public function encodeString($string, $firstLineOffset = 0,
-    $maxLineLength = 0)
-  {
-    if ($maxLineLength > 76 || $maxLineLength <= 0)
-    {
-      $maxLineLength = 76;
-    }
-
-    $thisLineLength = $maxLineLength - $firstLineOffset;
-
-    $lines = array();
-    $lNo = 0;
-    $lines[$lNo] = '';
-    $currentLine =& $lines[$lNo++];
-    $size=$lineLen=0;
-
-    $this->_charStream->flushContents();
-    $this->_charStream->importString($string);
-
-    //Fetching more than 4 chars at one is slower, as is fetching fewer bytes
-    // Conveniently 4 chars is the UTF-8 safe number since UTF-8 has up to 6
-    // bytes per char and (6 * 4 * 3 = 72 chars per line) * =NN is 3 bytes
-    while (false !== $bytes = $this->_nextSequence())
-    {
-      //If we're filtering the input
-      if (isset($this->_filter))
-      {
-        //If we can't filter because we need more bytes
-        while ($this->_filter->shouldBuffer($bytes))
-        {
-          //Then collect bytes into the buffer
-          if (false === $moreBytes = $this->_nextSequence(1))
-          {
-            break;
-          }
-
-          foreach ($moreBytes as $b)
-          {
-            $bytes[] = $b;
-          }
-        }
-        //And filter them
-        $bytes = $this->_filter->filter($bytes);
-      }
-
-      $enc = $this->_encodeByteSequence($bytes, $size);
-      if ($currentLine && $lineLen+$size >= $thisLineLength)
-      {
-        $lines[$lNo] = '';
-        $currentLine =& $lines[$lNo++];
-        $thisLineLength = $maxLineLength;
-        $lineLen=0;
-      }
-      $lineLen+=$size;
-      $currentLine .= $enc;
-    }
-
-    return $this->_standardize(implode("=\r\n", $lines));
-  }
-
-  /**
-   * Updates the charset used.
-   * @param string $charset
-   */
-  public function charsetChanged($charset)
-  {
-    $this->_charStream->setCharacterSet($charset);
-  }
-
-  // -- Protected methods
-
-  /**
-   * Encode the given byte array into a verbatim QP form.
-   * @param int[] $bytes
-   * @return string
-   * @access protected
-   */
-  protected function _encodeByteSequence(array $bytes, &$size)
-  {
-    $ret = '';
-    $size=0;
-    foreach ($bytes as $b)
-    {
-      if (isset(self::$_safeMap[$b]))
-      {
-        $ret .= self::$_safeMap[$b];
-        ++$size;
-      }
-      else
-      {
-        $ret .= self::$_qpMap[$b];
-        $size+=3;
-      }
-    }
-    return $ret;
-  }
-
-  /**
-   * Get the next sequence of bytes to read from the char stream.
-   * @param int $size number of bytes to read
-   * @return int[]
-   * @access protected
-   */
-  protected function _nextSequence($size = 4)
-  {
-    return $this->_charStream->readBytes($size);
-  }
-
-  /**
-   * Make sure CRLF is correct and HT/SPACE are in valid places.
-   * @param string $string
-   * @return string
-   * @access protected
-   */
-  protected function _standardize($string)
-  {
-    $string = str_replace(array("\t=0D=0A", " =0D=0A", "=0D=0A"),
-      array("=09\r\n", "=20\r\n", "\r\n"), $string
-      );
-    switch ($end = ord(substr($string, -1)))
-    {
-      case 0x09:
-      case 0x20:
-        $string = substr_replace($string, self::$_qpMap[$end], -1);
-    }
-    return $string;
-  }
-
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Encoder/Rfc2231Encoder.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Encoder/Rfc2231Encoder.php
deleted file mode 100644
index febc6ba83..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Encoder/Rfc2231Encoder.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Encoder.php';
-//@require 'Swift/CharacterStream.php';
-
-/**
- * Handles RFC 2231 specified Encoding in Swift Mailer.
- * @package Swift
- * @subpackage Encoder
- * @author Chris Corbyn
- */
-class Swift_Encoder_Rfc2231Encoder implements Swift_Encoder
-{
-  
-  /**
-   * A character stream to use when reading a string as characters instead of bytes.
-   * @var Swift_CharacterStream
-   * @access private
-   */
-  private $_charStream;
-  
-  /**
-   * Creates a new Rfc2231Encoder using the given character stream instance.
-   * @param Swift_CharacterStream
-   */
-  public function __construct(Swift_CharacterStream $charStream)
-  {
-    $this->_charStream = $charStream;
-  }
-  
-  /**
-   * Takes an unencoded string and produces a string encoded according to
-   * RFC 2231 from it.
-   * @param string $string to encode
-   * @param int $firstLineOffset
-   * @param int $maxLineLength, optional, 0 indicates the default of 75 bytes
-   * @return string
-   */
-  public function encodeString($string, $firstLineOffset = 0,
-    $maxLineLength = 0)
-  {
-    $lines = array(); $lineCount = 0;
-    $lines[] = '';
-    $currentLine =& $lines[$lineCount++];
-    
-    if (0 >= $maxLineLength)
-    {
-      $maxLineLength = 75;
-    }
-    
-    $this->_charStream->flushContents();
-    $this->_charStream->importString($string);
-    
-    $thisLineLength = $maxLineLength - $firstLineOffset;
-    
-    while (false !== $char = $this->_charStream->read(4))
-    {
-      $encodedChar = rawurlencode($char);
-      if (0 != strlen($currentLine)
-        && strlen($currentLine . $encodedChar) > $thisLineLength)
-      {
-        $lines[] = '';
-        $currentLine =& $lines[$lineCount++];
-        $thisLineLength = $maxLineLength;
-      }
-      $currentLine .= $encodedChar;
-    }
-    
-    return implode("\r\n", $lines);
-  }
-  
-  /**
-   * Updates the charset used.
-   * @param string $charset
-   */
-  public function charsetChanged($charset)
-  {
-    $this->_charStream->setCharacterSet($charset);
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Encoding.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Encoding.php
deleted file mode 100644
index 1849a8295..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Encoding.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/DependencyContainer.php';
-
-/**
- * Provides quick access to each encoding type.
- * 
- * @package Swift
- * @subpackage Encoder
- * @author Chris Corbyn
- */
-class Swift_Encoding
-{
-  
-  /**
-   * Get the Encoder that provides 7-bit encoding.
-   * 
-   * @return Swift_Mime_ContentEncoder
-   */
-  public static function get7BitEncoding()
-  {
-    return self::_lookup('mime.7bitcontentencoder');
-  }
-  
-  /**
-   * Get the Encoder that provides 8-bit encoding.
-   * 
-   * @return Swift_Mime_ContentEncoder
-   */
-  public static function get8BitEncoding()
-  {
-    return self::_lookup('mime.8bitcontentencoder');
-  }
-  
-  /**
-   * Get the Encoder that provides Quoted-Printable (QP) encoding.
-   * 
-   * @return Swift_Mime_ContentEncoder
-   */
-  public static function getQpEncoding()
-  {
-    return self::_lookup('mime.qpcontentencoder');
-  }
-  
-  /**
-   * Get the Encoder that provides Base64 encoding.
-   * 
-   * @return Swift_Mime_ContentEncoder
-   */
-  public static function getBase64Encoding()
-  {
-    return self::_lookup('mime.base64contentencoder');
-  }
-  
-  // -- Private Static Methods
-  
-  private static function _lookup($key)
-  {
-    return Swift_DependencyContainer::getInstance()->lookup($key);
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/CommandEvent.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/CommandEvent.php
deleted file mode 100644
index 73eb5850f..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/CommandEvent.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Events/EventObject.php';
-//@require 'Swift/Transport.php';
-
-/**
- * Generated when a command is sent over an SMTP connection.
- * @package Swift
- * @subpackage Events
- * @author Chris Corbyn
- */
-class Swift_Events_CommandEvent extends Swift_Events_EventObject
-{
-  
-  /**
-   * The command sent to the server.
-   * @var string
-   */
-  private $_command;
-  
-  /**
-   * An array of codes which a successful response will contain.
-   * @var int[]
-   */
-  private $_successCodes = array();
-  
-  /**
-   * Create a new CommandEvent for $source with $command.
-   * @param Swift_Transport $source
-   * @param string $command
-   * @param array $successCodes
-   */
-  public function __construct(Swift_Transport $source,
-    $command, $successCodes = array())
-  {
-    parent::__construct($source);
-    $this->_command = $command;
-    $this->_successCodes = $successCodes;
-  }
-  
-  /**
-   * Get the command which was sent to the server.
-   * @return string
-   */
-  public function getCommand()
-  {
-    return $this->_command;
-  }
-  
-  /**
-   * Get the numeric response codes which indicate success for this command.
-   * @return int[]
-   */
-  public function getSuccessCodes()
-  {
-    return $this->_successCodes;
-  }
-  
-}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/Event.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/Event.php
deleted file mode 100644
index c6726a75f..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/Event.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * The minimum interface for an Event.
- * 
- * @package Swift
- * @subpackage Events
- * @author Chris Corbyn
- */
-interface Swift_Events_Event
-{
-  
-  /**
-   * Get the source object of this event.
-   * @return object
-   */
-  public function getSource();
-  
-  /**
-   * Prevent this Event from bubbling any further up the stack.
-   * @param boolean $cancel, optional
-   */
-  public function cancelBubble($cancel = true);
-  
-  /**
-   * Returns true if this Event will not bubble any further up the stack.
-   * @return boolean
-   */
-  public function bubbleCancelled();
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/EventDispatcher.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/EventDispatcher.php
deleted file mode 100644
index aaf12117e..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/EventDispatcher.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Events/EventListener.php';
-//@require 'Swift/Event.php';
-
-/**
- * Interface for the EventDispatcher which handles the event dispatching layer.
- * @package Swift
- * @subpackage Events
- * @author Chris Corbyn
- */
-interface Swift_Events_EventDispatcher
-{
-  
-  /**
-   * Create a new SendEvent for $source and $message.
-   * @param Swift_Transport $source
-   * @param Swift_Mime_Message
-   * @return Swift_Events_SendEvent
-   */
-  public function createSendEvent(Swift_Transport $source,
-    Swift_Mime_Message $message);
-  
-  /**
-   * Create a new CommandEvent for $source and $command.
-   * @param Swift_Transport $source
-   * @param string $command That will be executed
-   * @param array $successCodes That are needed
-   * @return Swift_Events_CommandEvent
-   */
-  public function createCommandEvent(Swift_Transport $source,
-    $command, $successCodes = array());
-  
-  /**
-   * Create a new ResponseEvent for $source and $response.
-   * @param Swift_Transport $source
-   * @param string $response
-   * @param boolean $valid If the response is valid
-   * @return Swift_Events_ResponseEvent
-   */
-  public function createResponseEvent(Swift_Transport $source,
-    $response, $valid);
-  
-  /**
-   * Create a new TransportChangeEvent for $source.
-   * @param Swift_Transport $source
-   * @return Swift_Events_TransportChangeEvent
-   */
-  public function createTransportChangeEvent(Swift_Transport $source);
-  
-  /**
-   * Create a new TransportExceptionEvent for $source.
-   * @param Swift_Transport $source
-   * @param Swift_TransportException $ex
-   * @return Swift_Events_TransportExceptionEvent
-   */
-  public function createTransportExceptionEvent(Swift_Transport $source,
-    Swift_TransportException $ex);
-  
-  /**
-   * Bind an event listener to this dispatcher.
-   * @param Swift_Events_EventListener $listener
-   */
-  public function bindEventListener(Swift_Events_EventListener $listener);
-  
-  /**
-   * Dispatch the given Event to all suitable listeners.
-   * @param Swift_Events_EventObject $evt
-   * @param string $target method
-   */
-  public function dispatchEvent(Swift_Events_EventObject $evt, $target);
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/EventObject.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/EventObject.php
deleted file mode 100644
index 5d494fe89..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/EventObject.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Events/Event.php';
-
-/**
- * A base Event which all Event classes inherit from.
- * 
- * @package Swift
- * @subpackage Events
- * @author Chris Corbyn
- */
-class Swift_Events_EventObject implements Swift_Events_Event
-{
-  
-  /** The source of this Event */
-  private $_source;
-  
-  /** The state of this Event (should it bubble up the stack?) */
-  private $_bubbleCancelled = false;
-  
-  /**
-   * Create a new EventObject originating at $source.
-   * @param object $source
-   */
-  public function __construct($source)
-  {
-    $this->_source = $source;
-  }
-  
-  /**
-   * Get the source object of this event.
-   * @return object
-   */
-  public function getSource()
-  {
-    return $this->_source;
-  }
-  
-  /**
-   * Prevent this Event from bubbling any further up the stack.
-   * @param boolean $cancel, optional
-   */
-  public function cancelBubble($cancel = true)
-  {
-    $this->_bubbleCancelled = $cancel;
-  }
-  
-  /**
-   * Returns true if this Event will not bubble any further up the stack.
-   * @return boolean
-   */
-  public function bubbleCancelled()
-  {
-    return $this->_bubbleCancelled;
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/ResponseEvent.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/ResponseEvent.php
deleted file mode 100644
index addf9e7a8..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/ResponseEvent.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Events/EventObject.php';
-
-/**
- * Generated when a response is received on a SMTP connection.
- * @package Swift
- * @subpackage Events
- * @author Chris Corbyn
- */
-class Swift_Events_ResponseEvent extends Swift_Events_EventObject
-{
-  
-  /**
-   * The overall result.
-   * @var boolean
-   */
-  private $_valid;
-  
-  /**
-   * The response received from the server.
-   * @var string
-   */
-  private $_response;
-  
-  /**
-   * Create a new ResponseEvent for $source and $response.
-   * @param Swift_Transport $source
-   * @param string $response
-   * @param boolean $valid
-   */
-  public function __construct(Swift_Transport $source, $response, $valid = false)
-  {
-    parent::__construct($source);
-    $this->_response = $response;
-    $this->_valid = $valid;
-  }
-  
-  /**
-   * Get the response which was received from the server.
-   * @return string
-   */
-  public function getResponse()
-  {
-    return $this->_response;
-  }
-  
-  /**
-   * Get the success status of this Event.
-   * @return boolean
-   */
-  public function isValid()
-  {
-    return $this->_valid;
-  }
-  
-}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/SendEvent.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/SendEvent.php
deleted file mode 100644
index 49a835135..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/SendEvent.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Events/EventObject.php';
-
-/**
- * Generated when a message is being sent.
- * @package Swift
- * @subpackage Events
- * @author Chris Corbyn
- */
-class Swift_Events_SendEvent extends Swift_Events_EventObject
-{
-  
-  /** Sending has yet to occur */
-  const RESULT_PENDING = 0x0001;
-  
-  /** Sending was successful */
-  const RESULT_SUCCESS = 0x0010;
-  
-  /** Sending worked, but there were some failures */
-  const RESULT_TENTATIVE = 0x0100;
-  
-  /** Sending failed */
-  const RESULT_FAILED = 0x1000;
-  
-  /**
-   * The Message being sent.
-   * @var Swift_Mime_Message
-   */
-  private $_message;
-  
-  /**
-   * The Transport used in sending.
-   * @var Swift_Transport
-   */
-  private $_transport;
-  
-  /**
-   * Any recipients which failed after sending.
-   * @var string[]
-   */
-  private $failedRecipients = array();
-  
-  /**
-   * The overall result as a bitmask from the class constants.
-   * @var int
-   */
-  private $result;
-  
-  /**
-   * Create a new SendEvent for $source and $message.
-   * @param Swift_Transport $source
-   * @param Swift_Mime_Message $message
-   */
-  public function __construct(Swift_Transport $source,
-    Swift_Mime_Message $message)
-  {
-    parent::__construct($source);
-    $this->_message = $message;
-    $this->_result = self::RESULT_PENDING;
-  }
-  
-  /**
-   * Get the Transport used to send the Message.
-   * @return Swift_Transport
-   */
-  public function getTransport()
-  {
-    return $this->getSource();
-  }
-  
-  /**
-   * Get the Message being sent.
-   * @return Swift_Mime_Message
-   */
-  public function getMessage()
-  {
-    return $this->_message;
-  }
-  
-  /**
-   * Set the array of addresses that failed in sending.
-   * @param array $recipients
-   */
-  public function setFailedRecipients($recipients)
-  {
-    $this->_failedRecipients = $recipients;
-  }
-  
-  /**
-   * Get an recipient addresses which were not accepted for delivery.
-   * @return string[]
-   */
-  public function getFailedRecipients()
-  {
-    return $this->_failedRecipients;
-  }
-  
-  /**
-   * Set the result of sending.
-   * @return int
-   */
-  public function setResult($result)
-  {
-    $this->_result = $result;
-  }
-  
-  /**
-   * Get the result of this Event.
-   * The return value is a bitmask from
-   * {@link RESULT_PENDING, RESULT_SUCCESS, RESULT_TENTATIVE, RESULT_FAILED}
-   * @return int
-   */
-  public function getResult()
-  {
-    return $this->_result;
-  }
-  
-}
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/SendListener.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/SendListener.php
deleted file mode 100644
index a8f0cc33d..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/SendListener.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Events/EventListener.php';
-//@require 'Swift/Events/SendEvent.php';
-
-/**
- * Listens for Messages being sent from within the Transport system.
- * @package Swift
- * @subpackage Events
- * @author Chris Corbyn
- */
-interface Swift_Events_SendListener extends Swift_Events_EventListener
-{
-  
-  /**
-   * Invoked immediately before the Message is sent.
-   * @param Swift_Events_SendEvent $evt
-   */
-  public function beforeSendPerformed(Swift_Events_SendEvent $evt);
-  
-  /**
-   * Invoked immediately after the Message is sent.
-   * @param Swift_Events_SendEvent $evt
-   */
-  public function sendPerformed(Swift_Events_SendEvent $evt);
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/SimpleEventDispatcher.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/SimpleEventDispatcher.php
deleted file mode 100644
index 3e6c0beb3..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/SimpleEventDispatcher.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Events/EventDispatcher.php';
-//@require 'Swift/Events/EventListener.php';
-//@require 'Swift/Events/EventObject.php';
-//@require 'Swift/Events/CommandEvent.php';
-//@require 'Swift/Events/ResponseEvent.php';
-//@require 'Swift/Events/SendEvent.php';
-//@require 'Swift/Events/TransportChangeEvent.php';
-//@require 'Swift/Events/TransportExceptionEvent.php';
-
-/**
- * The EventDispatcher which handles the event dispatching layer.
- * 
- * @package Swift
- * @subpackage Events
- * @author Chris Corbyn
- */
-class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
-{
-  
-  /** A map of event types to their associated listener types */
-  private $_eventMap = array();
-  
-  /** Event listeners bound to this dispatcher */
-  private $_listeners = array();
-  
-  /** Listeners queued to have an Event bubbled up the stack to them */
-  private $_bubbleQueue = array();
-  
-  /**
-   * Create a new EventDispatcher.
-   */
-  public function __construct()
-  {
-    $this->_eventMap = array(
-      'Swift_Events_CommandEvent' => 'Swift_Events_CommandListener',
-      'Swift_Events_ResponseEvent' => 'Swift_Events_ResponseListener',
-      'Swift_Events_SendEvent' => 'Swift_Events_SendListener',
-      'Swift_Events_TransportChangeEvent' => 'Swift_Events_TransportChangeListener',
-      'Swift_Events_TransportExceptionEvent' => 'Swift_Events_TransportExceptionListener'
-      );
-  }
-  
-  /**
-   * Create a new SendEvent for $source and $message.
-   * 
-   * @param Swift_Transport $source
-   * @param Swift_Mime_Message
-   * @return Swift_Events_SendEvent
-   */
-  public function createSendEvent(Swift_Transport $source,
-    Swift_Mime_Message $message)
-  {
-    return new Swift_Events_SendEvent($source, $message);
-  }
-  
-  /**
-   * Create a new CommandEvent for $source and $command.
-   * 
-   * @param Swift_Transport $source
-   * @param string $command That will be executed
-   * @param array $successCodes That are needed
-   * @return Swift_Events_CommandEvent
-   */
-  public function createCommandEvent(Swift_Transport $source,
-    $command, $successCodes = array())
-  {
-    return new Swift_Events_CommandEvent($source, $command, $successCodes);
-  }
-  
-  /**
-   * Create a new ResponseEvent for $source and $response.
-   * 
-   * @param Swift_Transport $source
-   * @param string $response
-   * @param boolean $valid If the response is valid
-   * @return Swift_Events_ResponseEvent
-   */
-  public function createResponseEvent(Swift_Transport $source,
-    $response, $valid)
-  {
-    return new Swift_Events_ResponseEvent($source, $response, $valid);
-  }
-  
-  /**
-   * Create a new TransportChangeEvent for $source.
-   * 
-   * @param Swift_Transport $source
-   * @return Swift_Events_TransportChangeEvent
-   */
-  public function createTransportChangeEvent(Swift_Transport $source)
-  {
-    return new Swift_Events_TransportChangeEvent($source);
-  }
-  
-  /**
-   * Create a new TransportExceptionEvent for $source.
-   * 
-   * @param Swift_Transport $source
-   * @param Swift_TransportException $ex
-   * @return Swift_Events_TransportExceptionEvent
-   */
-  public function createTransportExceptionEvent(Swift_Transport $source,
-    Swift_TransportException $ex)
-  {
-    return new Swift_Events_TransportExceptionEvent($source, $ex);
-  }
-  
-  /**
-   * Bind an event listener to this dispatcher.
-   * 
-   * @param Swift_Events_EventListener $listener
-   */
-  public function bindEventListener(Swift_Events_EventListener $listener)
-  {
-    foreach ($this->_listeners as $l)
-    {
-      //Already loaded
-      if ($l === $listener)
-      {
-        return;
-      }
-    }
-    $this->_listeners[] = $listener;
-  }
-  
-  /**
-   * Dispatch the given Event to all suitable listeners.
-   * 
-   * @param Swift_Events_EventObject $evt
-   * @param string $target method
-   */
-  public function dispatchEvent(Swift_Events_EventObject $evt, $target)
-  {
-    $this->_prepareBubbleQueue($evt);
-    $this->_bubble($evt, $target);
-  }
-  
-  // -- Private methods
-  
-  /** Queue listeners on a stack ready for $evt to be bubbled up it */
-  private function _prepareBubbleQueue(Swift_Events_EventObject $evt)
-  {
-    $this->_bubbleQueue = array();
-    $evtClass = get_class($evt);
-    foreach ($this->_listeners as $listener)
-    {
-      if (array_key_exists($evtClass, $this->_eventMap)
-        && ($listener instanceof $this->_eventMap[$evtClass]))
-      {
-        $this->_bubbleQueue[] = $listener;
-      }
-    }
-  }
-  
-  /** Bubble $evt up the stack calling $target() on each listener */
-  private function _bubble(Swift_Events_EventObject $evt, $target)
-  {
-    if (!$evt->bubbleCancelled() && $listener = array_shift($this->_bubbleQueue))
-    {
-      $listener->$target($evt);
-      $this->_bubble($evt, $target);
-    }
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/TransportChangeListener.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/TransportChangeListener.php
deleted file mode 100644
index ba729d010..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/TransportChangeListener.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Events/EventListener.php';
-//@require 'Swift/Events/TransportChangeEvent.php';
-
-/**
- * Listens for changes within the Transport system.
- * 
- * @package Swift
- * @subpackage Events
- * 
- * @author Chris Corbyn
- */
-interface Swift_Events_TransportChangeListener extends Swift_Events_EventListener
-{
-  
-  /**
-   * Invoked just before a Transport is started.
-   * 
-   * @param Swift_Events_TransportChangeEvent $evt
-   */
-  public function beforeTransportStarted(Swift_Events_TransportChangeEvent $evt);
-  
-  /**
-   * Invoked immediately after the Transport is started.
-   * 
-   * @param Swift_Events_TransportChangeEvent $evt
-   */
-  public function transportStarted(Swift_Events_TransportChangeEvent $evt);
-  
-  /**
-   * Invoked just before a Transport is stopped.
-   * 
-   * @param Swift_Events_TransportChangeEvent $evt
-   */
-  public function beforeTransportStopped(Swift_Events_TransportChangeEvent $evt);
-  
-  /**
-   * Invoked immediately after the Transport is stopped.
-   * 
-   * @param Swift_Events_TransportChangeEvent $evt
-   */
-  public function transportStopped(Swift_Events_TransportChangeEvent $evt);
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/TransportExceptionEvent.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/TransportExceptionEvent.php
deleted file mode 100644
index a1bf7d278..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/TransportExceptionEvent.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Events/EventObject.php';
-//@require 'Swift/TransportException.php';
-
-/**
- * Generated when a TransportException is thrown from the Transport system.
- * @package Swift
- * @subpackage Events
- * @author Chris Corbyn
- */
-class Swift_Events_TransportExceptionEvent extends Swift_Events_EventObject
-{
-  
-  /**
-   * The Exception thrown.
-   * @var Swift_TransportException
-   */
-  private $_exception;
-  
-  /**
-   * Create a new TransportExceptionEvent for $transport.
-   * @param Swift_Transport $transport
-   * @param Swift_TransportException $ex
-   */
-  public function __construct(Swift_Transport $transport,
-    Swift_TransportException $ex)
-  {
-    parent::__construct($transport);
-    $this->_exception = $ex;
-  }
-  
-  /**
-   * Get the TransportException thrown.
-   * @return Swift_TransportException
-   */
-  public function getException()
-  {
-    return $this->_exception;
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/TransportExceptionListener.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/TransportExceptionListener.php
deleted file mode 100644
index d6dce94f5..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/TransportExceptionListener.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Events/EventListener.php';
-//@require 'Swift/Events/TransportExceptionEvent.php';
-
-/**
- * Listens for Exceptions thrown from within the Transport system.
- * @package Swift
- * @subpackage Events
- * @author Chris Corbyn
- */
-interface Swift_Events_TransportExceptionListener
-  extends Swift_Events_EventListener
-{
-  
-  /**
-   * Invoked as a TransportException is thrown in the Transport system.
-   * @param Swift_Events_TransportExceptionEvent $evt
-   */
-  public function exceptionThrown(Swift_Events_TransportExceptionEvent $evt);
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/FailoverTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/FailoverTransport.php
deleted file mode 100644
index 6e6b7a8bd..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/FailoverTransport.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Transport/FailoverTransport.php';
-//@require 'Swift/DependencyContainer.php';
-
-/**
- * Contains a list of redundant Transports so when one fails, the next is used.
- * @package Swift
- * @subpackage Transport
- * @author Chris Corbyn
- */
-class Swift_FailoverTransport extends Swift_Transport_FailoverTransport
-{
-  
-  /**
-   * Creates a new FailoverTransport with $transports.
-   * @param array $transports
-   */
-  public function __construct($transports = array())
-  {
-    call_user_func_array(
-      array($this, 'Swift_Transport_FailoverTransport::__construct'),
-      Swift_DependencyContainer::getInstance()
-        ->createDependenciesFor('transport.failover')
-      );
-    
-    $this->setTransports($transports);
-  }
-  
-  /**
-   * Create a new FailoverTransport instance.
-   * @param string $transports
-   * @return Swift_FailoverTransport
-   */
-  public static function newInstance($transports = array())
-  {
-    return new self($transports);
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/FileSpool.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/FileSpool.php
deleted file mode 100644
index 28c679612..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/FileSpool.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2009 Fabien Potencier <fabien.potencier@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Stores Messages on the filesystem.
- * @package Swift
- * @author  Fabien Potencier
- */
-class Swift_FileSpool extends Swift_ConfigurableSpool
-{
-  /** The spool directory */
-  private $_path;
-  
-  /**
-   * Create a new FileSpool.
-   * @param string $path
-   */
-  public function __construct($path)
-  {
-    $this->_path = $path;
-    
-    if (!file_exists($this->_path))
-    {
-      mkdir($this->_path, 0777, true);
-    }
-  }
-  
-  /**
-   * Tests if this Spool mechanism has started.
-   *
-   * @return boolean
-   */
-  public function isStarted()
-  {
-    return true;
-  }
-  
-  /**
-   * Starts this Spool mechanism.
-   */
-  public function start()
-  {
-  }
-  
-  /**
-   * Stops this Spool mechanism.
-   */
-  public function stop()
-  {
-  }
-  
-  /**
-   * Queues a message.
-   * @param Swift_Mime_Message $message The message to store
-   */
-  public function queueMessage(Swift_Mime_Message $message)
-  {
-    $ser = serialize($message);
-    
-    file_put_contents($this->_path.'/'.md5($ser.uniqid()).'.message', $ser);
-  }
-  
-  /**
-   * Sends messages using the given transport instance.
-   *
-   * @param Swift_Transport $transport         A transport instance
-   * @param string[]        &$failedRecipients An array of failures by-reference
-   *
-   * @return int The number of sent emails
-   */
-  public function flushQueue(Swift_Transport $transport, &$failedRecipients = null)
-  {
-    if (!$transport->isStarted())
-    {
-      $transport->start();
-    }
-
-    $failedRecipients = (array) $failedRecipients;
-    $count = 0;
-    $time = time();
-    foreach (new DirectoryIterator($this->_path) as $file)
-    {
-      $file = $file->getRealPath();
-
-      if (!strpos($file, '.message'))
-      {
-        continue;
-      }
-
-      $message = unserialize(file_get_contents($file));
-
-      $count += $transport->send($message, $failedRecipients);
-
-      unlink($file);
-
-      if ($this->getMessageLimit() && $count >= $this->getMessageLimit())
-      {
-        break;
-      }
-
-      if ($this->getTimeLimit() && (time() - $time) >= $this->getTimeLimit())
-      {
-        break;
-      }
-    }
-
-    return $count;
-  }
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Filterable.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Filterable.php
deleted file mode 100644
index c0479671c..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Filterable.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/StreamFilter.php';
-
-/**
- * Allows StreamFilters to operate on a stream.
- * @package Swift
- * @author Chris Corbyn
- */
-interface Swift_Filterable
-{
-  
-  /**
-   * Add a new StreamFilter, referenced by $key.
-   * @param Swift_StreamFilter $filter
-   * @param string $key
-   */
-  public function addFilter(Swift_StreamFilter $filter, $key);
-  
-  /**
-   * Remove an existing filter using $key.
-   * @param string $key
-   */
-  public function removeFilter($key);
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Image.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Image.php
deleted file mode 100644
index c161d7a62..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Image.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Image.php';
-//@require 'Swift/ByteStream/FileByteStream.php';
-
-/**
- * An image, embedded in a multipart message.
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-class Swift_Image extends Swift_EmbeddedFile
-{
-  
-  /**
-   * Create a new EmbeddedFile.
-   * Details may be optionally provided to the constructor.
-   * @param string|Swift_OutputByteStream $data
-   * @param string $filename
-   * @param string $contentType
-   */
-  public function __construct($data = null, $filename = null,
-    $contentType = null)
-  {
-    parent::__construct($data, $filename, $contentType);
-  }
-  
-  /**
-   * Create a new Image.
-   * @param string|Swift_OutputByteStream $data
-   * @param string $filename
-   * @param string $contentType
-   * @return Swift_Mime_EmbeddedFile
-   */
-  public static function newInstance($data = null, $filename = null,
-    $contentType = null)
-  {
-    return new self($data, $filename, $contentType);
-  }
-  
-  /**
-   * Create a new Image from a filesystem path.
-   * @param string $path
-   * @return Swift_Mime_EmbeddedFile
-   */
-  public static function fromPath($path)
-  {
-    $image = self::newInstance()->setFile(
-      new Swift_ByteStream_FileByteStream($path)
-      );
-    return $image;
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/InputByteStream.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/InputByteStream.php
deleted file mode 100644
index e8f45f4a3..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/InputByteStream.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * An abstract means of writing data.
- * Classes implementing this interface may use a subsystem which requires less
- * memory than working with large strings of data.
- * @package Swift
- * @subpackage ByteStream
- * @author Chris Corbyn
- */
-interface Swift_InputByteStream
-{
-  
-  /**
-   * Writes $bytes to the end of the stream.
-   * 
-   * Writing may not happen immediately if the stream chooses to buffer.  If
-   * you want to write these bytes with immediate effect, call {@link commit()}
-   * after calling write().
-   * 
-   * This method returns the sequence ID of the write (i.e. 1 for first, 2 for
-   * second, etc etc).
-   *
-   * @param string $bytes
-   * @return int
-   * @throws Swift_IoException
-   */
-  public function write($bytes);
-  
-  /**
-   * For any bytes that are currently buffered inside the stream, force them
-   * off the buffer.
-   * 
-   * @throws Swift_IoException
-   */
-  public function commit();
-  
-  /**
-   * Attach $is to this stream.
-   * The stream acts as an observer, receiving all data that is written.
-   * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-   * 
-   * @param Swift_InputByteStream $is
-   */
-  public function bind(Swift_InputByteStream $is);
-  
-  /**
-   * Remove an already bound stream.
-   * If $is is not bound, no errors will be raised.
-   * If the stream currently has any buffered data it will be written to $is
-   * before unbinding occurs.
-   * 
-   * @param Swift_InputByteStream $is
-   */
-  public function unbind(Swift_InputByteStream $is);
-  
-  /**
-   * Flush the contents of the stream (empty it) and set the internal pointer
-   * to the beginning.
-   * @throws Swift_IoException
-   */
-  public function flushBuffers();
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/KeyCache.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/KeyCache.php
deleted file mode 100644
index b942663a5..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/KeyCache.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/InputByteStream.php';
-//@require 'Swift/OutputByteStream.php';
-
-/**
- * Provides a mechanism for storing data using two keys.
- * @package Swift
- * @subpackage KeyCache
- * @author Chris Corbyn
- */
-interface Swift_KeyCache
-{
-  
-  /** Mode for replacing existing cached data */
-  const MODE_WRITE = 1;
-  
-  /** Mode for appending data to the end of existing cached data */
-  const MODE_APPEND = 2;
-  
-  /**
-   * Set a string into the cache under $itemKey for the namespace $nsKey.
-   * @param string $nsKey
-   * @param string $itemKey
-   * @param string $string
-   * @param int $mode
-   * @see MODE_WRITE, MODE_APPEND
-   */
-  public function setString($nsKey, $itemKey, $string, $mode);
-  
-  /**
-   * Set a ByteStream into the cache under $itemKey for the namespace $nsKey.
-   * @param string $nsKey
-   * @param string $itemKey
-   * @param Swift_OutputByteStream $os
-   * @param int $mode
-   * @see MODE_WRITE, MODE_APPEND
-   */
-  public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os,
-    $mode);
-  
-  /**
-   * Provides a ByteStream which when written to, writes data to $itemKey.
-   * NOTE: The stream will always write in append mode.
-   * If the optional third parameter is passed all writes will go through $is.
-   * @param string $nsKey
-   * @param string $itemKey
-   * @param Swift_InputByteStream $is, optional
-   * @return Swift_InputByteStream
-   */
-  public function getInputByteStream($nsKey, $itemKey,
-    Swift_InputByteStream $is = null);
-  
-  /**
-   * Get data back out of the cache as a string.
-   * @param string $nsKey
-   * @param string $itemKey
-   * @return string
-   */
-  public function getString($nsKey, $itemKey);
-  
-  /**
-   * Get data back out of the cache as a ByteStream.
-   * @param string $nsKey
-   * @param string $itemKey
-   * @param Swift_InputByteStream $is to write the data to
-   */
-  public function exportToByteStream($nsKey, $itemKey, Swift_InputByteStream $is);
-  
-  /**
-   * Check if the given $itemKey exists in the namespace $nsKey.
-   * @param string $nsKey
-   * @param string $itemKey
-   * @return boolean
-   */
-  public function hasKey($nsKey, $itemKey);
-  
-  /**
-   * Clear data for $itemKey in the namespace $nsKey if it exists.
-   * @param string $nsKey
-   * @param string $itemKey
-   */
-  public function clearKey($nsKey, $itemKey);
-  
-  /**
-   * Clear all data in the namespace $nsKey if it exists.
-   * @param string $nsKey
-   */
-  public function clearAll($nsKey);
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/KeyCache/ArrayKeyCache.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/KeyCache/ArrayKeyCache.php
deleted file mode 100644
index fe3b7c992..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/KeyCache/ArrayKeyCache.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/KeyCache.php';
-//@require 'Swift/KeyCacheInputStream.php';
-//@require 'Swift/InputByteStream.php';
-//@require 'Swift/OutputByteStrean.php';
-//@require 'Swift/SwiftException.php';
-
-/**
- * A basic KeyCache backed by an array.
- * @package Swift
- * @subpackage KeyCache
- * @author Chris Corbyn
- */
-class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
-{
-  
-  /**
-   * Cache contents.
-   * @var array
-   * @access private
-   */
-  private $_contents = array();
-  
-  /**
-   * An InputStream for cloning.
-   * @var Swift_KeyCache_KeyCacheInputStream
-   * @access private
-   */
-  private $_stream;
-  
-  /**
-   * Create a new ArrayKeyCache with the given $stream for cloning to make
-   * InputByteStreams.
-   * @param Swift_KeyCache_KeyCacheInputStream $stream
-   */
-  public function __construct(Swift_KeyCache_KeyCacheInputStream $stream)
-  {
-    $this->_stream = $stream;
-  }
-  
-  /**
-   * Set a string into the cache under $itemKey for the namespace $nsKey.
-   * @param string $nsKey
-   * @param string $itemKey
-   * @param string $string
-   * @param int $mode
-   * @see MODE_WRITE, MODE_APPEND
-   */
-  public function setString($nsKey, $itemKey, $string, $mode)
-  {
-    $this->_prepareCache($nsKey);
-    switch ($mode)
-    {
-      case self::MODE_WRITE:
-        $this->_contents[$nsKey][$itemKey] = $string;
-        break;
-      case self::MODE_APPEND:
-        if (!$this->hasKey($nsKey, $itemKey))
-        {
-          $this->_contents[$nsKey][$itemKey] = '';
-        }
-        $this->_contents[$nsKey][$itemKey] .= $string;
-        break;
-      default:
-        throw new Swift_SwiftException(
-          'Invalid mode [' . $mode . '] used to set nsKey='.
-          $nsKey . ', itemKey=' . $itemKey
-          );
-    }
-  }
-  
-  /**
-   * Set a ByteStream into the cache under $itemKey for the namespace $nsKey.
-   * @param string $nsKey
-   * @param string $itemKey
-   * @param Swift_OutputByteStream $os
-   * @param int $mode
-   * @see MODE_WRITE, MODE_APPEND
-   */
-  public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os,
-    $mode)
-  {
-    $this->_prepareCache($nsKey);
-    switch ($mode)
-    {
-      case self::MODE_WRITE:
-        $this->clearKey($nsKey, $itemKey);
-      case self::MODE_APPEND:
-        if (!$this->hasKey($nsKey, $itemKey))
-        {
-          $this->_contents[$nsKey][$itemKey] = '';
-        }
-        while (false !== $bytes = $os->read(8192))
-        {
-          $this->_contents[$nsKey][$itemKey] .= $bytes;
-        }
-        break;
-      default:
-        throw new Swift_SwiftException(
-          'Invalid mode [' . $mode . '] used to set nsKey='.
-          $nsKey . ', itemKey=' . $itemKey
-          );
-    }
-  }
-  
-  /**
-   * Provides a ByteStream which when written to, writes data to $itemKey.
-   * NOTE: The stream will always write in append mode.
-   * @param string $nsKey
-   * @param string $itemKey
-   * @return Swift_InputByteStream
-   */
-  public function getInputByteStream($nsKey, $itemKey,
-    Swift_InputByteStream $writeThrough = null)
-  {
-    $is = clone $this->_stream;
-    $is->setKeyCache($this);
-    $is->setNsKey($nsKey);
-    $is->setItemKey($itemKey);
-    if (isset($writeThrough))
-    {
-      $is->setWriteThroughStream($writeThrough);
-    }
-    return $is;
-  }
-  
-  /**
-   * Get data back out of the cache as a string.
-   * @param string $nsKey
-   * @param string $itemKey
-   * @return string
-   */
-  public function getString($nsKey, $itemKey)
-  {
-    $this->_prepareCache($nsKey);
-    if ($this->hasKey($nsKey, $itemKey))
-    {
-      return $this->_contents[$nsKey][$itemKey];
-    }
-  }
-  
-  /**
-   * Get data back out of the cache as a ByteStream.
-   * @param string $nsKey
-   * @param string $itemKey
-   * @param Swift_InputByteStream $is to write the data to
-   */
-  public function exportToByteStream($nsKey, $itemKey, Swift_InputByteStream $is)
-  {
-    $this->_prepareCache($nsKey);
-    $is->write($this->getString($nsKey, $itemKey));
-  }
-  
-  /**
-   * Check if the given $itemKey exists in the namespace $nsKey.
-   * @param string $nsKey
-   * @param string $itemKey
-   * @return boolean
-   */
-  public function hasKey($nsKey, $itemKey)
-  {
-    $this->_prepareCache($nsKey);
-    return array_key_exists($itemKey, $this->_contents[$nsKey]);
-  }
-  
-  /**
-   * Clear data for $itemKey in the namespace $nsKey if it exists.
-   * @param string $nsKey
-   * @param string $itemKey
-   */
-  public function clearKey($nsKey, $itemKey)
-  {
-    unset($this->_contents[$nsKey][$itemKey]);
-  }
-  
-  /**
-   * Clear all data in the namespace $nsKey if it exists.
-   * @param string $nsKey
-   */
-  public function clearAll($nsKey)
-  {
-    unset($this->_contents[$nsKey]);
-  }
-  
-  // -- Private methods
-  
-  /**
-   * Initialize the namespace of $nsKey if needed.
-   * @param string $nsKey
-   * @access private
-   */
-  private function _prepareCache($nsKey)
-  {
-    if (!array_key_exists($nsKey, $this->_contents))
-    {
-      $this->_contents[$nsKey] = array();
-    }
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/KeyCache/DiskKeyCache.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/KeyCache/DiskKeyCache.php
deleted file mode 100644
index 599fd6c7c..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/KeyCache/DiskKeyCache.php
+++ /dev/null
@@ -1,316 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/KeyCache.php';
-//@require 'Swift/KeyCacheInputStream.php';
-//@require 'Swift/InputByteStream.php';
-//@require 'Swift/OutputByteStrean.php';
-//@require 'Swift/SwiftException.php';
-//@require 'Swift/IoException.php';
-
-/**
- * A KeyCache which streams to and from disk.
- * @package Swift
- * @subpackage KeyCache
- * @author Chris Corbyn
- */
-class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
-{
-
-  /** Signal to place pointer at start of file */
-  const POSITION_START = 0;
-
-  /** Signal to place pointer at end of file */
-  const POSITION_END = 1;
-
-  /**
-   * An InputStream for cloning.
-   * @var Swift_KeyCache_KeyCacheInputStream
-   * @access private
-   */
-  private $_stream;
-
-  /**
-   * A path to write to.
-   * @var string
-   * @access private
-   */
-  private $_path;
-
-  /**
-   * Stored keys.
-   * @var array
-   * @access private
-   */
-  private $_keys = array();
-
-  /**
-   * Will be true if magic_quotes_runtime is turned on.
-   * @var boolean
-   * @access private
-   */
-  private $_quotes = false;
-
-  /**
-   * Create a new DiskKeyCache with the given $stream for cloning to make
-   * InputByteStreams, and the given $path to save to.
-   * @param Swift_KeyCache_KeyCacheInputStream $stream
-   * @param string $path to save to
-   */
-  public function __construct(Swift_KeyCache_KeyCacheInputStream $stream, $path)
-  {
-    $this->_stream = $stream;
-    $this->_path = $path;
-    $this->_quotes = get_magic_quotes_runtime();
-  }
-
-  /**
-   * Set a string into the cache under $itemKey for the namespace $nsKey.
-   * @param string $nsKey
-   * @param string $itemKey
-   * @param string $string
-   * @param int $mode
-   * @throws Swift_IoException
-   * @see MODE_WRITE, MODE_APPEND
-   */
-  public function setString($nsKey, $itemKey, $string, $mode)
-  {
-    $this->_prepareCache($nsKey);
-    switch ($mode)
-    {
-      case self::MODE_WRITE:
-        $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_START);
-        break;
-      case self::MODE_APPEND:
-        $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_END);
-        break;
-      default:
-        throw new Swift_SwiftException(
-          'Invalid mode [' . $mode . '] used to set nsKey='.
-          $nsKey . ', itemKey=' . $itemKey
-          );
-        break;
-    }
-    fwrite($fp, $string);
-  }
-
-  /**
-   * Set a ByteStream into the cache under $itemKey for the namespace $nsKey.
-   * @param string $nsKey
-   * @param string $itemKey
-   * @param Swift_OutputByteStream $os
-   * @param int $mode
-   * @see MODE_WRITE, MODE_APPEND
-   * @throws Swift_IoException
-   */
-  public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os,
-    $mode)
-  {
-    $this->_prepareCache($nsKey);
-    switch ($mode)
-    {
-      case self::MODE_WRITE:
-        $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_START);
-        break;
-      case self::MODE_APPEND:
-        $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_END);
-        break;
-      default:
-        throw new Swift_SwiftException(
-          'Invalid mode [' . $mode . '] used to set nsKey='.
-          $nsKey . ', itemKey=' . $itemKey
-          );
-        break;
-    }
-    while (false !== $bytes = $os->read(8192))
-    {
-      fwrite($fp, $bytes);
-    }
-  }
-
-  /**
-   * Provides a ByteStream which when written to, writes data to $itemKey.
-   * NOTE: The stream will always write in append mode.
-   * @param string $nsKey
-   * @param string $itemKey
-   * @return Swift_InputByteStream
-   */
-  public function getInputByteStream($nsKey, $itemKey,
-    Swift_InputByteStream $writeThrough = null)
-  {
-    $is = clone $this->_stream;
-    $is->setKeyCache($this);
-    $is->setNsKey($nsKey);
-    $is->setItemKey($itemKey);
-    if (isset($writeThrough))
-    {
-      $is->setWriteThroughStream($writeThrough);
-    }
-    return $is;
-  }
-
-  /**
-   * Get data back out of the cache as a string.
-   * @param string $nsKey
-   * @param string $itemKey
-   * @return string
-   * @throws Swift_IoException
-   */
-  public function getString($nsKey, $itemKey)
-  {
-    $this->_prepareCache($nsKey);
-    if ($this->hasKey($nsKey, $itemKey))
-    {
-      $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_START);
-      if ($this->_quotes)
-      {
-        set_magic_quotes_runtime(0);
-      }
-      $str = '';
-      while (!feof($fp) && false !== $bytes = fread($fp, 8192))
-      {
-        $str .= $bytes;
-      }
-      if ($this->_quotes)
-      {
-        set_magic_quotes_runtime(1);
-      }
-      return $str;
-    }
-  }
-
-  /**
-   * Get data back out of the cache as a ByteStream.
-   * @param string $nsKey
-   * @param string $itemKey
-   * @param Swift_InputByteStream $is to write the data to
-   */
-  public function exportToByteStream($nsKey, $itemKey, Swift_InputByteStream $is)
-  {
-    if ($this->hasKey($nsKey, $itemKey))
-    {
-      $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_START);
-      if ($this->_quotes)
-      {
-        set_magic_quotes_runtime(0);
-      }
-      while (!feof($fp) && false !== $bytes = fread($fp, 8192))
-      {
-        $is->write($bytes);
-      }
-      if ($this->_quotes)
-      {
-        set_magic_quotes_runtime(1);
-      }
-    }
-  }
-
-  /**
-   * Check if the given $itemKey exists in the namespace $nsKey.
-   * @param string $nsKey
-   * @param string $itemKey
-   * @return boolean
-   */
-  public function hasKey($nsKey, $itemKey)
-  {
-    return is_file($this->_path . '/' . $nsKey . '/' . $itemKey);
-  }
-
-  /**
-   * Clear data for $itemKey in the namespace $nsKey if it exists.
-   * @param string $nsKey
-   * @param string $itemKey
-   */
-  public function clearKey($nsKey, $itemKey)
-  {
-    if ($this->hasKey($nsKey, $itemKey))
-    {
-      $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_END);
-      fclose($fp);
-      unlink($this->_path . '/' . $nsKey . '/' . $itemKey);
-    }
-    unset($this->_keys[$nsKey][$itemKey]);
-  }
-
-  /**
-   * Clear all data in the namespace $nsKey if it exists.
-   * @param string $nsKey
-   */
-  public function clearAll($nsKey)
-  {
-    if (array_key_exists($nsKey, $this->_keys))
-    {
-      foreach ($this->_keys[$nsKey] as $itemKey=>$null)
-      {
-        $this->clearKey($nsKey, $itemKey);
-      }
-      rmdir($this->_path . '/' . $nsKey);
-      unset($this->_keys[$nsKey]);
-    }
-  }
-
-  // -- Private methods
-
-  /**
-   * Initialize the namespace of $nsKey if needed.
-   * @param string $nsKey
-   * @access private
-   */
-  private function _prepareCache($nsKey)
-  {
-    $cacheDir = $this->_path . '/' . $nsKey;
-    if (!is_dir($cacheDir))
-    {
-      if (!mkdir($cacheDir))
-      {
-        throw new Swift_IoException('Failed to create cache directory ' . $cacheDir);
-      }
-      $this->_keys[$nsKey] = array();
-    }
-  }
-
-  /**
-   * Get a file handle on the cache item.
-   * @param string $nsKey
-   * @param string $itemKey
-   * @param int $position
-   * @return resource
-   * @access private
-   */
-  private function _getHandle($nsKey, $itemKey, $position)
-  {
-    if (!isset($this->_keys[$nsKey]) || !array_key_exists($itemKey, $this->_keys[$nsKey]))
-    {
-      $fp = fopen($this->_path . '/' . $nsKey . '/' . $itemKey, 'w+b');
-      $this->_keys[$nsKey][$itemKey] = $fp;
-    }
-    if (self::POSITION_START == $position)
-    {
-      fseek($this->_keys[$nsKey][$itemKey], 0, SEEK_SET);
-    }
-    else
-    {
-      fseek($this->_keys[$nsKey][$itemKey], 0, SEEK_END);
-    }
-    return $this->_keys[$nsKey][$itemKey];
-  }
-
-  /**
-   * Destructor.
-   */
-  public function __destruct()
-  {
-    foreach ($this->_keys as $nsKey=>$null)
-    {
-      $this->clearAll($nsKey);
-    }
-  }
-
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/KeyCache/KeyCacheInputStream.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/KeyCache/KeyCacheInputStream.php
deleted file mode 100644
index a1f4440c1..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/KeyCache/KeyCacheInputStream.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/KeyCache.php';
-//@require 'Swift/InputByteStream.php';
-
-/**
- * Writes data to a KeyCache using a stream.
- * @package Swift
- * @subpackage KeyCache
- * @author Chris Corbyn
- */
-interface Swift_KeyCache_KeyCacheInputStream extends Swift_InputByteStream
-{
-  
-  /**
-   * Set the KeyCache to wrap.
-   * @param Swift_KeyCache $keyCache
-   */
-  public function setKeyCache(Swift_KeyCache $keyCache);
-  
-  /**
-   * Set the nsKey which will be written to.
-   * @param string $nsKey
-   */
-  public function setNsKey($nsKey);
-  
-  /**
-   * Set the itemKey which will be written to.
-   * @param string $itemKey
-   */
-  public function setItemKey($itemKey);
-  
-  /**
-   * Specify a stream to write through for each write().
-   * @param Swift_InputByteStream $is
-   */
-  public function setWriteThroughStream(Swift_InputByteStream $is);
-  
-  /**
-   * Any implementation should be cloneable, allowing the clone to access a
-   * separate $nsKey and $itemKey.
-   */
-  public function __clone();
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/KeyCache/NullKeyCache.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/KeyCache/NullKeyCache.php
deleted file mode 100644
index 2646522e7..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/KeyCache/NullKeyCache.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/KeyCache.php';
-//@require 'Swift/KeyCacheInputStream.php';
-//@require 'Swift/InputByteStream.php';
-//@require 'Swift/OutputByteStrean.php';
-
-/**
- * A null KeyCache that does not cache at all.
- * @package Swift
- * @subpackage KeyCache
- * @author Chris Corbyn
- */
-class Swift_KeyCache_NullKeyCache implements Swift_KeyCache
-{
-  
-  /**
-   * Set a string into the cache under $itemKey for the namespace $nsKey.
-   * @param string $nsKey
-   * @param string $itemKey
-   * @param string $string
-   * @param int $mode
-   * @see MODE_WRITE, MODE_APPEND
-   */
-  public function setString($nsKey, $itemKey, $string, $mode)
-  {
-  }
-  
-  /**
-   * Set a ByteStream into the cache under $itemKey for the namespace $nsKey.
-   * @param string $nsKey
-   * @param string $itemKey
-   * @param Swift_OutputByteStream $os
-   * @param int $mode
-   * @see MODE_WRITE, MODE_APPEND
-   */
-  public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os,
-    $mode)
-  {
-  }
-  
-  /**
-   * Provides a ByteStream which when written to, writes data to $itemKey.
-   * NOTE: The stream will always write in append mode.
-   * @param string $nsKey
-   * @param string $itemKey
-   * @return Swift_InputByteStream
-   */
-  public function getInputByteStream($nsKey, $itemKey,
-    Swift_InputByteStream $writeThrough = null)
-  {
-  }
-  
-  /**
-   * Get data back out of the cache as a string.
-   * @param string $nsKey
-   * @param string $itemKey
-   * @return string
-   */
-  public function getString($nsKey, $itemKey)
-  {
-  }
-  
-  /**
-   * Get data back out of the cache as a ByteStream.
-   * @param string $nsKey
-   * @param string $itemKey
-   * @param Swift_InputByteStream $is to write the data to
-   */
-  public function exportToByteStream($nsKey, $itemKey, Swift_InputByteStream $is)
-  {
-  }
-  
-  /**
-   * Check if the given $itemKey exists in the namespace $nsKey.
-   * @param string $nsKey
-   * @param string $itemKey
-   * @return boolean
-   */
-  public function hasKey($nsKey, $itemKey)
-  {
-    return false;
-  }
-  
-  /**
-   * Clear data for $itemKey in the namespace $nsKey if it exists.
-   * @param string $nsKey
-   * @param string $itemKey
-   */
-  public function clearKey($nsKey, $itemKey)
-  {
-  }
-  
-  /**
-   * Clear all data in the namespace $nsKey if it exists.
-   * @param string $nsKey
-   */
-  public function clearAll($nsKey)
-  {
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
deleted file mode 100644
index 87cdced81..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/KeyCache.php';
-//@require 'Swift/KeyCacheInputStream.php';
-
-/**
- * Writes data to a KeyCache using a stream.
- * @package Swift
- * @subpackage KeyCache
- * @author Chris Corbyn
- */
-class Swift_KeyCache_SimpleKeyCacheInputStream
-  implements Swift_KeyCache_KeyCacheInputStream
-{
-  
-  /** The KeyCache being written to */
-  private $_keyCache;
-  
-  /** The nsKey of the KeyCache being written to */
-  private $_nsKey;
-  
-  /** The itemKey of the KeyCache being written to */
-  private $_itemKey;
-  
-  /** A stream to write through on each write() */
-  private $_writeThrough = null;
-  
-  /**
-   * Set the KeyCache to wrap.
-   * @param Swift_KeyCache $keyCache
-   */
-  public function setKeyCache(Swift_KeyCache $keyCache)
-  {
-    $this->_keyCache = $keyCache;
-  }
-  
-  /**
-   * Specify a stream to write through for each write().
-   * @param Swift_InputByteStream $is
-   */
-  public function setWriteThroughStream(Swift_InputByteStream $is)
-  {
-    $this->_writeThrough = $is;
-  }
-  
-  /**
-   * Writes $bytes to the end of the stream.
-   * @param string $bytes
-   * @param Swift_InputByteStream $is, optional
-   */
-  public function write($bytes, Swift_InputByteStream $is = null)
-  {
-    $this->_keyCache->setString(
-      $this->_nsKey, $this->_itemKey, $bytes, Swift_KeyCache::MODE_APPEND
-      );
-    if (isset($is))
-    {
-      $is->write($bytes);
-    }
-    if (isset($this->_writeThrough))
-    {
-      $this->_writeThrough->write($bytes);
-    }
-  }
-  
-  /**
-   * Not used.
-   */
-  public function commit()
-  {
-  }
-  
-  /**
-   * Not used.
-   */
-  public function bind(Swift_InputByteStream $is)
-  {
-  }
-  
-  /**
-   * Not used.
-   */
-  public function unbind(Swift_InputByteStream $is)
-  {
-  }
-  
-  /**
-   * Flush the contents of the stream (empty it) and set the internal pointer
-   * to the beginning.
-   */
-  public function flushBuffers()
-  {
-    $this->_keyCache->clearKey($this->_nsKey, $this->_itemKey);
-  }
-  
-  /**
-   * Set the nsKey which will be written to.
-   * @param string $nsKey
-   */
-  public function setNsKey($nsKey)
-  {
-    $this->_nsKey = $nsKey;
-  }
-  
-  /**
-   * Set the itemKey which will be written to.
-   * @param string $itemKey
-   */
-  public function setItemKey($itemKey)
-  {
-    $this->_itemKey = $itemKey;
-  }
-  
-  /**
-   * Any implementation should be cloneable, allowing the clone to access a
-   * separate $nsKey and $itemKey.
-   */
-  public function __clone()
-  {
-    $this->_writeThrough = null;
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/LoadBalancedTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/LoadBalancedTransport.php
deleted file mode 100644
index 14ae2928b..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/LoadBalancedTransport.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Transport/LoadBalancedTransport.php';
-//@require 'Swift/DependencyContainer.php';
-
-/**
- * Redudantly and rotationally uses several Transport implementations when sending.
- * @package Swift
- * @subpackage Transport
- * @author Chris Corbyn
- */
-class Swift_LoadBalancedTransport extends Swift_Transport_LoadBalancedTransport
-{
-  
-  /**
-   * Creates a new LoadBalancedTransport with $transports.
-   * @param array $transports
-   */
-  public function __construct($transports = array())
-  {
-    call_user_func_array(
-      array($this, 'Swift_Transport_LoadBalancedTransport::__construct'),
-      Swift_DependencyContainer::getInstance()
-        ->createDependenciesFor('transport.loadbalanced')
-      );
-    
-    $this->setTransports($transports);
-  }
-  
-  /**
-   * Create a new LoadBalancedTransport instance.
-   * @param string $transports
-   * @return Swift_LoadBalancedTransport
-   */
-  public static function newInstance($transports = array())
-  {
-    return new self($transports);
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/MailTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/MailTransport.php
deleted file mode 100644
index afe29c6ff..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/MailTransport.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Transport/MailTransport.php';
-//@require 'Swift/DependencyContainer.php';
-
-/**
- * Sends Messages using the mail() function.
- * @package Swift
- * @subpackage Transport
- * @author Chris Corbyn
- */
-class Swift_MailTransport extends Swift_Transport_MailTransport
-{
-  
-  /**
-   * Create a new MailTransport, optionally specifying $extraParams.
-   * @param string $extraParams
-   */
-  public function __construct($extraParams = '-f%s')
-  {
-    call_user_func_array(
-      array($this, 'Swift_Transport_MailTransport::__construct'),
-      Swift_DependencyContainer::getInstance()
-        ->createDependenciesFor('transport.mail')
-      );
-    
-    $this->setExtraParams($extraParams);
-  }
-  
-  /**
-   * Create a new MailTransport instance.
-   * @param string $extraParams To be passed to mail()
-   * @return Swift_MailTransport
-   */
-  public static function newInstance($extraParams = '-f%s')
-  {
-    return new self($extraParams);
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mailer.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mailer.php
deleted file mode 100644
index c92feb41b..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mailer.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Transport.php';
-//@require 'Swift/Mime/Message.php';
-//@require 'Swift/Mailer/RecipientIterator.php';
-//@require 'Swift/Events/EventListener.php';
-
-/**
- * Swift Mailer class.
- * 
- * @package Swift
- * @author Chris Corbyn
- */
-class Swift_Mailer
-{
-  
-  /** The Transport used to send messages */
-  private $_transport;
-  
-  /**
-   * Create a new Mailer using $transport for delivery.
-   * 
-   * @param Swift_Transport $transport
-   */
-  public function __construct(Swift_Transport $transport)
-  {
-    $this->_transport = $transport;
-  }
-
-  /**
-   * Create a new Mailer instance.
-   * 
-   * @param Swift_Transport $transport
-   * @return Swift_Mailer
-   */
-  public static function newInstance(Swift_Transport $transport)
-  {
-    return new self($transport);
-  }
-  
-  /**
-   * Send the given Message like it would be sent in a mail client.
-   * 
-   * All recipients (with the exception of Bcc) will be able to see the other
-   * recipients this message was sent to.
-   * 
-   * If you need to send to each recipient without disclosing details about the
-   * other recipients see {@link batchSend()}.
-   * 
-   * Recipient/sender data will be retreived from the Message object.
-   * 
-   * The return value is the number of recipients who were accepted for
-   * delivery.
-   * 
-   * @param Swift_Mime_Message $message
-   * @param array &$failedRecipients, optional
-   * @return int
-   * @see batchSend()
-   */
-  public function send(Swift_Mime_Message $message, &$failedRecipients = null)
-  {
-    $failedRecipients = (array) $failedRecipients;
-    
-    if (!$this->_transport->isStarted())
-    {
-      $this->_transport->start();
-    }
-    
-    return $this->_transport->send($message, $failedRecipients);
-  }
-  
-  /**
-   * Send the given Message to all recipients individually.
-   * 
-   * This differs from {@link send()} in the way headers are presented to the
-   * recipient.  The only recipient in the "To:" field will be the individual
-   * recipient it was sent to.
-   * 
-   * If an iterator is provided, recipients will be read from the iterator
-   * one-by-one, otherwise recipient data will be retreived from the Message
-   * object.
-   * 
-   * Sender information is always read from the Message object.
-   * 
-   * The return value is the number of recipients who were accepted for
-   * delivery.
-   * 
-   * @param Swift_Mime_Message $message
-   * @param array &$failedRecipients, optional
-   * @param Swift_Mailer_RecipientIterator $it, optional
-   * @return int
-   * @see send()
-   */
-  public function batchSend(Swift_Mime_Message $message,
-    &$failedRecipients = null,
-    Swift_Mailer_RecipientIterator $it = null)
-  {
-    $failedRecipients = (array) $failedRecipients;
-    
-    $sent = 0;
-    $to = $message->getTo();
-    $cc = $message->getCc();
-    $bcc = $message->getBcc();
-    
-    if (!empty($cc))
-    {
-      $message->setCc(array());
-    }
-    if (!empty($bcc))
-    {
-      $message->setBcc(array());
-    }
-    
-    //Use an iterator if set
-    if (isset($it))
-    {
-      while ($it->hasNext())
-      {
-        $message->setTo($it->nextRecipient());
-        $sent += $this->send($message, $failedRecipients);
-      }
-    }
-    else
-    {
-      foreach ($to as $address => $name)
-      {
-        $message->setTo(array($address => $name));
-        $sent += $this->send($message, $failedRecipients);
-      }
-    }
-    
-    $message->setTo($to);
-    
-    if (!empty($cc))
-    {
-      $message->setCc($cc);
-    }
-    if (!empty($bcc))
-    {
-      $message->setBcc($bcc);
-    }
-    
-    return $sent;
-  }
-  
-  /**
-   * Register a plugin using a known unique key (e.g. myPlugin).
-   * 
-   * @param Swift_Events_EventListener $plugin
-   * @param string $key
-   */
-  public function registerPlugin(Swift_Events_EventListener $plugin)
-  {
-    $this->_transport->registerPlugin($plugin);
-  }
-  
-  /**
-   * The Transport used to send messages.
-   * @return Swift_Transport
-   */
-  public function getTransport()
-  {
-    return $this->_transport;
-  }
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mailer/ArrayRecipientIterator.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mailer/ArrayRecipientIterator.php
deleted file mode 100644
index 65d60c187..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mailer/ArrayRecipientIterator.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mailer/RecipientIterator.php';
-
-/**
- * Wraps a standard PHP array in an interator.
- * @package Swift
- * @subpackage Mailer
- * @author Chris Corbyn
- */
-class Swift_Mailer_ArrayRecipientIterator
-  implements Swift_Mailer_RecipientIterator
-{
-  
-  /**
-   * The list of recipients.
-   * @var array
-   * @access private
-   */
-  private $_recipients = array();
-  
-  /**
-   * Create a new ArrayRecipientIterator from $recipients.
-   * @param array $recipients
-   */
-  public function __construct(array $recipients)
-  {
-    $this->_recipients = $recipients;
-  }
-  
-  /**
-   * Returns true only if there are more recipients to send to.
-   * @return boolean
-   */
-  public function hasNext()
-  {
-    return !empty($this->_recipients);
-  }
-  
-  /**
-   * Returns an array where the keys are the addresses of recipients and the
-   * values are the names.
-   * e.g. ('foo@bar' => 'Foo') or ('foo@bar' => NULL)
-   * @return array
-   */
-  public function nextRecipient()
-  {
-    return array_splice($this->_recipients, 0, 1);
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mailer/RecipientIterator.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mailer/RecipientIterator.php
deleted file mode 100644
index 271384166..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mailer/RecipientIterator.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Provides an abstract way of specifying recipients for batch sending.
- * @package Swift
- * @subpackage Mailer
- * @author Chris Corbyn
- */
-interface Swift_Mailer_RecipientIterator
-{
-  
-  /**
-   * Returns true only if there are more recipients to send to.
-   * @return boolean
-   */
-  public function hasNext();
-  
-  /**
-   * Returns an array where the keys are the addresses of recipients and the
-   * values are the names.
-   * e.g. ('foo@bar' => 'Foo') or ('foo@bar' => NULL)
-   * @return array
-   */
-  public function nextRecipient();
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Message.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Message.php
deleted file mode 100644
index e7d610e67..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Message.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/SimpleMessage.php';
-//@require 'Swift/MimePart.php';
-//@require 'Swift/DependencyContainer.php';
-
-/**
- * The Message class for building emails.
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-class Swift_Message extends Swift_Mime_SimpleMessage
-{
-  
-  /**
-   * Create a new Message.
-   * Details may be optionally passed into the constructor.
-   * @param string $subject
-   * @param string $body
-   * @param string $contentType
-   * @param string $charset
-   */
-  public function __construct($subject = null, $body = null,
-    $contentType = null, $charset = null)
-  {
-    call_user_func_array(
-      array($this, 'Swift_Mime_SimpleMessage::__construct'),
-      Swift_DependencyContainer::getInstance()
-        ->createDependenciesFor('mime.message')
-      );
-    
-    if (!isset($charset))
-    {
-      $charset = Swift_DependencyContainer::getInstance()
-        ->lookup('properties.charset');
-    }
-    $this->setSubject($subject);
-    $this->setBody($body);
-    $this->setCharset($charset);
-    if ($contentType)
-    {
-      $this->setContentType($contentType);
-    }
-  }
-  
-  /**
-   * Create a new Message.
-   * @param string $subject
-   * @param string $body
-   * @param string $contentType
-   * @param string $charset
-   * @return Swift_Mime_Message
-   */
-  public static function newInstance($subject = null, $body = null,
-    $contentType = null, $charset = null)
-  {
-    return new self($subject, $body, $contentType, $charset);
-  }
-  
-  /**
-   * Add a MimePart to this Message.
-   * @param string|Swift_OutputByteStream $body
-   * @param string $contentType
-   * @param string $charset
-   */
-  public function addPart($body, $contentType = null, $charset = null)
-  {
-    return $this->attach(Swift_MimePart::newInstance(
-      $body, $contentType, $charset
-      ));
-  }
-  
-  public function __wakeup()
-  {
-    Swift_DependencyContainer::getInstance()->createDependenciesFor('mime.message');
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Attachment.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Attachment.php
deleted file mode 100644
index 25ef68b3a..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Attachment.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/SimpleMimeEntity.php';
-//@require 'Swift/Mime/ContentEncoder.php';
-//@require 'Swift/Mime/HeaderSet.php';
-//@require 'Swift/FileStream.php';
-//@require 'Swift/KeyCache.php';
-
-/**
- * An attachment, in a multipart message.
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
-{
-  
-  /** Recognized MIME types */
-  private $_mimeTypes = array();
-  
-  /**
-   * Create a new Attachment with $headers, $encoder and $cache.
-   * @param Swift_Mime_HeaderSet $headers
-   * @param Swift_Mime_ContentEncoder $encoder
-   * @param Swift_KeyCache $cache
-   * @param array $mimeTypes optional
-   */
-  public function __construct(Swift_Mime_HeaderSet $headers,
-    Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache,
-    $mimeTypes = array())
-  {
-    parent::__construct($headers, $encoder, $cache);
-    $this->setDisposition('attachment');
-    $this->setContentType('application/octet-stream');
-    $this->_mimeTypes = $mimeTypes;
-  }
-  
-  /**
-   * Get the nesting level used for this attachment.
-   * Always returns {@link LEVEL_MIXED}.
-   * @return int
-   */
-  public function getNestingLevel()
-  {
-    return self::LEVEL_MIXED;
-  }
-  
-  /**
-   * Get the Content-Disposition of this attachment.
-   * By default attachments have a disposition of "attachment".
-   * @return string
-   */
-  public function getDisposition()
-  {
-    return $this->_getHeaderFieldModel('Content-Disposition');
-  }
-  
-  /**
-   * Set the Content-Disposition of this attachment.
-   * @param string $disposition
-   */
-  public function setDisposition($disposition)
-  {
-    if (!$this->_setHeaderFieldModel('Content-Disposition', $disposition))
-    {
-      $this->getHeaders()->addParameterizedHeader(
-        'Content-Disposition', $disposition
-        );
-    }
-    return $this;
-  }
-  
-  /**
-   * Get the filename of this attachment when downloaded.
-   * @return string
-   */
-  public function getFilename()
-  {
-    return $this->_getHeaderParameter('Content-Disposition', 'filename');
-  }
-  
-  /**
-   * Set the filename of this attachment.
-   * @param string $filename
-   */
-  public function setFilename($filename)
-  {
-    $this->_setHeaderParameter('Content-Disposition', 'filename', $filename);
-    $this->_setHeaderParameter('Content-Type', 'name', $filename);
-    return $this;
-  }
-  
-  /**
-   * Get the file size of this attachment.
-   * @return int
-   */
-  public function getSize()
-  {
-    return $this->_getHeaderParameter('Content-Disposition', 'size');
-  }
-  
-  /**
-   * Set the file size of this attachment.
-   * @param int $size
-   */
-  public function setSize($size)
-  {
-    $this->_setHeaderParameter('Content-Disposition', 'size', $size);
-    return $this;
-  }
-  
-  /**
-   * Set the file that this attachment is for.
-   * @param Swift_FileStream $file
-   * @param string $contentType optional
-   */
-  public function setFile(Swift_FileStream $file, $contentType = null)
-  {
-    $this->setFilename(basename($file->getPath()));
-    $this->setBody($file, $contentType);
-    if (!isset($contentType))
-    {
-      $extension = strtolower(substr(
-        $file->getPath(), strrpos($file->getPath(), '.') + 1
-        ));
-      
-      if (array_key_exists($extension, $this->_mimeTypes))
-      {
-        $this->setContentType($this->_mimeTypes[$extension]);
-      }
-    }
-    return $this;
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/ContentEncoder.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/ContentEncoder.php
deleted file mode 100644
index e1c99c590..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/ContentEncoder.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Encoder.php';
-//@require 'Swift/InputByteStream.php';
-//@require 'Swift/OutputByteStream.php';
-
-/**
- * Interface for all Transfer Encoding schemes.
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-interface Swift_Mime_ContentEncoder extends Swift_Encoder
-{
-  
-  /**
-   * Encode $in to $out.
-   * @param Swift_OutputByteStream $os to read from
-   * @param Swift_InputByteStream $is to write to
-   * @param int $firstLineOffset
-   * @param int $maxLineLength - 0 indicates the default length for this encoding
-   */
-  public function encodeByteStream(
-    Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0,
-    $maxLineLength = 0);
-  
-  /**
-   * Get the MIME name of this content encoding scheme.
-   * @return string
-   */
-  public function getName();
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
deleted file mode 100644
index e89938ef8..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/ContentEncoder.php';
-//@require 'Swift/Encoder/Base64Encoder.php';
-//@require 'Swift/InputByteStream.php';
-//@require 'Swift/OutputByteStream.php';
-
-/**
- * Handles Base 64 Transfer Encoding in Swift Mailer.
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-class Swift_Mime_ContentEncoder_Base64ContentEncoder
-  extends Swift_Encoder_Base64Encoder
-  implements Swift_Mime_ContentEncoder
-{
-  
-  /**
-   * Encode stream $in to stream $out.
-   * @param Swift_OutputByteStream $in
-   * @param Swift_InputByteStream $out
-   * @param int $firstLineOffset
-   * @param int $maxLineLength, optional, 0 indicates the default of 76 bytes
-   */
-  public function encodeByteStream(
-    Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0,
-    $maxLineLength = 0)
-  {
-    if (0 >= $maxLineLength || 76 < $maxLineLength)
-    {
-      $maxLineLength = 76;
-    }
-    
-    $remainder = 0;
-    
-    while (false !== $bytes = $os->read(8190))
-    {
-      $encoded = base64_encode($bytes);
-      $encodedTransformed = '';
-      $thisMaxLineLength = $maxLineLength - $remainder - $firstLineOffset;
-      
-      while ($thisMaxLineLength < strlen($encoded))
-      {
-        $encodedTransformed .= substr($encoded, 0, $thisMaxLineLength) . "\r\n";
-        $firstLineOffset = 0;
-        $encoded = substr($encoded, $thisMaxLineLength);
-        $thisMaxLineLength = $maxLineLength;
-        $remainder = 0;
-      }
-      
-      if (0 < $remainingLength = strlen($encoded))
-      {
-        $remainder += $remainingLength;
-        $encodedTransformed .= $encoded;
-        $encoded = null;
-      }
-      
-      $is->write($encodedTransformed);
-    }
-  }
-  
-  /**
-   * Get the name of this encoding scheme.
-   * Returns the string 'base64'.
-   * @return string
-   */
-  public function getName()
-  {
-    return 'base64';
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
deleted file mode 100644
index 4a725d856..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/ContentEncoder.php';
-//@require 'Swift/InputByteStream.php';
-//@require 'Swift/OutputByteStream.php';
-
-/**
- * Handles binary/7/8-bit Transfer Encoding in Swift Mailer.
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-class Swift_Mime_ContentEncoder_PlainContentEncoder
-  implements Swift_Mime_ContentEncoder
-{
-  
-  /**
-   * The name of this encoding scheme (probably 7bit or 8bit).
-   * @var string
-   * @access private
-   */
-  private $_name;
-  
-  /**
-   * True if canonical transformations should be done.
-   * @var boolean
-   * @access private
-   */
-  private $_canonical;
-  
-  /**
-   * Creates a new PlainContentEncoder with $name (probably 7bit or 8bit).
-   * @param string $name
-   * @param boolean $canonical If canonicalization transformation should be done.
-   */
-  public function __construct($name, $canonical = false)
-  {
-    $this->_name = $name;
-    $this->_canonical = $canonical;
-  }
-  
-  /**
-   * Encode a given string to produce an encoded string.
-   * @param string $string
-   * @param int $firstLineOffset, ignored
-   * @param int $maxLineLength - 0 means no wrapping will occur
-   * @return string
-   */
-  public function encodeString($string, $firstLineOffset = 0,
-    $maxLineLength = 0)
-  {
-    if ($this->_canonical)
-    {
-      $string = $this->_canonicalize($string);
-    }
-    return $this->_safeWordWrap($string, $maxLineLength, "\r\n");
-  }
-  
-  /**
-   * Encode stream $in to stream $out.
-   * @param Swift_OutputByteStream $in
-   * @param Swift_InputByteStream $out
-   * @param int $firstLineOffset, ignored
-   * @param int $maxLineLength, optional, 0 means no wrapping will occur
-   */
-  public function encodeByteStream(
-    Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0,
-    $maxLineLength = 0)
-  {
-    $leftOver = '';
-    while (false !== $bytes = $os->read(8192))
-    {
-      $toencode = $leftOver . $bytes;
-      if ($this->_canonical)
-      {
-        $toencode = $this->_canonicalize($toencode);
-      }
-      $wrapped = $this->_safeWordWrap($toencode, $maxLineLength, "\r\n");
-      $lastLinePos = strrpos($wrapped, "\r\n");
-      $leftOver = substr($wrapped, $lastLinePos);
-      $wrapped = substr($wrapped, 0, $lastLinePos);
-      
-      $is->write($wrapped);
-    }
-    if (strlen($leftOver))
-    {
-      $is->write($leftOver);
-    }
-  }
-  
-  /**
-   * Get the name of this encoding scheme.
-   * @return string
-   */
-  public function getName()
-  {
-    return $this->_name;
-  }
-  
-  /**
-   * Not used.
-   */
-  public function charsetChanged($charset)
-  {
-  }
-  
-  // -- Private methods
-  
-  /**
-   * A safer (but weaker) wordwrap for unicode.
-   * @param string $string
-   * @param int $length
-   * @param string $le
-   * @return string
-   * @access private
-   */
-  private function _safeWordwrap($string, $length = 75, $le = "\r\n")
-  {
-    if (0 >= $length)
-    {
-      return $string;
-    }
-    
-    $originalLines = explode($le, $string);
-    
-    $lines = array();
-    $lineCount = 0;
-    
-    foreach ($originalLines as $originalLine)
-    {
-      $lines[] = '';
-      $currentLine =& $lines[$lineCount++];
-      
-      //$chunks = preg_split('/(?<=[\ \t,\.!\?\-&\+\/])/', $originalLine);
-      $chunks = preg_split('/(?<=\s)/', $originalLine);
-      
-      foreach ($chunks as $chunk)
-      {
-        if (0 != strlen($currentLine)
-          && strlen($currentLine . $chunk) > $length)
-        {
-          $lines[] = '';
-          $currentLine =& $lines[$lineCount++];
-        }
-        $currentLine .= $chunk;
-      }
-    }
-    
-    return implode("\r\n", $lines);
-  }
-  
-  /**
-   * Canonicalize string input (fix CRLF).
-   * @param string $string
-   * @return string
-   * @access private
-   */
-  private function _canonicalize($string)
-  {
-    return str_replace(
-      array("\r\n", "\r", "\n"),
-      array("\n", "\n", "\r\n"),
-      $string
-      );
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
deleted file mode 100644
index 3beeb635e..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/ContentEncoder.php';
-//@require 'Swift/Encoder/QpEncoder.php';
-//@require 'Swift/InputByteStrean.php';
-//@require 'Swift/OutputByteStream.php';
-//@require 'Swift/CharacterStream.php';
-
-/**
- * Handles Quoted Printable (QP) Transfer Encoding in Swift Mailer.
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder
-  implements Swift_Mime_ContentEncoder
-{
-
-  /**
-   * Creates a new QpContentEncoder for the given CharacterStream.
-   * @param Swift_CharacterStream $charStream to use for reading characters
-   * @param Swift_StreamFilter $filter if canonicalization should occur
-   */
-  public function __construct(Swift_CharacterStream $charStream,
-    Swift_StreamFilter $filter = null)
-  {
-    parent::__construct($charStream, $filter);
-  }
-
-  /**
-   * Encode stream $in to stream $out.
-   * QP encoded strings have a maximum line length of 76 characters.
-   * If the first line needs to be shorter, indicate the difference with
-   * $firstLineOffset.
-   * @param Swift_OutputByteStream $os output stream
-   * @param Swift_InputByteStream $is input stream
-   * @param int $firstLineOffset
-   * @param int $maxLineLength
-   */
-  public function encodeByteStream(
-    Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0,
-    $maxLineLength = 0)
-  {
-    if ($maxLineLength > 76 || $maxLineLength <= 0)
-    {
-      $maxLineLength = 76;
-    }
-
-    $thisLineLength = $maxLineLength - $firstLineOffset;
-
-    $this->_charStream->flushContents();
-    $this->_charStream->importByteStream($os);
-    
-    $currentLine = '';
-    $prepend = '';
-    $size=$lineLen=0;
-
-    while (false !== $bytes = $this->_nextSequence())
-    {
-      //If we're filtering the input
-      if (isset($this->_filter))
-      {
-        //If we can't filter because we need more bytes
-        while ($this->_filter->shouldBuffer($bytes))
-        {
-          //Then collect bytes into the buffer
-          if (false === $moreBytes = $this->_nextSequence(1))
-          {
-            break;
-          }
-
-          foreach ($moreBytes as $b)
-          {
-            $bytes[] = $b;
-          }
-        }
-        //And filter them
-        $bytes = $this->_filter->filter($bytes);
-      }
-
-      $enc = $this->_encodeByteSequence($bytes, $size);
-      if ($currentLine && $lineLen+$size >= $thisLineLength)
-      {
-        $is->write($prepend . $this->_standardize($currentLine));
-        $currentLine = '';
-        $prepend = "=\r\n";
-        $thisLineLength = $maxLineLength;
-        $lineLen=0;
-      }
-      $lineLen+=$size;
-      $currentLine .= $enc;
-    }
-    if (strlen($currentLine))
-    {
-      $is->write($prepend . $this->_standardize($currentLine));
-    }
-  }
-
-  /**
-   * Get the name of this encoding scheme.
-   * Returns the string 'quoted-printable'.
-   * @return string
-   */
-  public function getName()
-  {
-    return 'quoted-printable';
-  }
-
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/EmbeddedFile.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/EmbeddedFile.php
deleted file mode 100644
index 983b78dac..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/EmbeddedFile.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/Attachment.php';
-//@require 'Swift/Mime/ContentEncoder.php';
-//@require 'Swift/KeyCache.php';
-//@require
-
-/**
- * An embedded file, in a multipart message.
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-class Swift_Mime_EmbeddedFile extends Swift_Mime_Attachment
-{
-  
-  /**
-   * Creates a new Attachment with $headers and $encoder.
-   * @param Swift_Mime_HeaderSet $headers
-   * @param Swift_Mime_ContentEncoder $encoder
-   * @param Swift_KeyCache $cache
-   * @param array $mimeTypes optional
-   */
-  public function __construct(Swift_Mime_HeaderSet $headers,
-    Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache,
-    $mimeTypes = array())
-  {
-    parent::__construct($headers, $encoder, $cache, $mimeTypes);
-    $this->setDisposition('inline');
-    $this->setId($this->getId());
-  }
-  
-  /**
-   * Get the nesting level of this EmbeddedFile.
-   * Returns {@link LEVEL_RELATED}.
-   * @return int
-   */
-  public function getNestingLevel()
-  {
-    return self::LEVEL_RELATED;
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Header.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Header.php
deleted file mode 100644
index 38fc40cde..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Header.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A MIME Header.
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-interface Swift_Mime_Header
-{
-  
-  /** Text headers */
-  const TYPE_TEXT = 2;
-  
-  /** Parameterized headers (text + params) */
-  const TYPE_PARAMETERIZED = 6;
-
-  /** Mailbox and address headers */
-  const TYPE_MAILBOX = 8;
-  
-  /** Date and time headers */
-  const TYPE_DATE = 16;
-  
-  /** Identification headers */
-  const TYPE_ID = 32;
-  
-  /** Address path headers */
-  const TYPE_PATH = 64;
-  
-  /**
-   * Get the type of Header that this instance represents.
-   * @return int
-   * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
-   * @see TYPE_DATE, TYPE_ID, TYPE_PATH
-   */
-  public function getFieldType();
-  
-  /**
-   * Set the model for the field body.
-   * The actual types needed will vary depending upon the type of Header.
-   * @param mixed $model
-   */
-  public function setFieldBodyModel($model);
-  
-  /**
-   * Set the charset used when rendering the Header.
-   * @param string $charset
-   */
-  public function setCharset($charset);
-  
-  /**
-   * Get the model for the field body.
-   * The return type depends on the specifics of the Header.
-   * @return mixed
-   */
-  public function getFieldBodyModel();
-  
-  /**
-   * Get the name of this header (e.g. Subject).
-   * The name is an identifier and as such will be immutable.
-   * @return string
-   */
-  public function getFieldName();
-  
-  /**
-   * Get the field body, prepared for folding into a final header value.
-   * @return string
-   */
-  public function getFieldBody();
-  
-  /**
-   * Get this Header rendered as a compliant string.
-   * @return string
-   */
-  public function toString();
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
deleted file mode 100644
index feaba981c..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once dirname(__FILE__) . '/../HeaderEncoder.php';
-require_once dirname(__FILE__) . '/../../Encoder/Base64Encoder.php';
-
-
-/**
- * Handles Base64 (B) Header Encoding in Swift Mailer.
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-class Swift_Mime_HeaderEncoder_Base64HeaderEncoder
-  extends Swift_Encoder_Base64Encoder
-  implements Swift_Mime_HeaderEncoder
-{
-  
-  /**
-   * Get the name of this encoding scheme.
-   * Returns the string 'B'.
-   * @return string
-   */
-  public function getName()
-  {
-    return 'B';
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
deleted file mode 100644
index d727da027..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once dirname(__FILE__) . '/../HeaderEncoder.php';
-require_once dirname(__FILE__) . '/../../Encoder/QpEncoder.php';
-require_once dirname(__FILE__) . '/../../CharacterStream.php';
-
-/**
- * Handles Quoted Printable (Q) Header Encoding in Swift Mailer.
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-class Swift_Mime_HeaderEncoder_QpHeaderEncoder extends Swift_Encoder_QpEncoder
-  implements Swift_Mime_HeaderEncoder
-{
-
-  private static $_headerSafeMap = array();
-
-  /**
-   * Creates a new QpHeaderEncoder for the given CharacterStream.
-   * @param Swift_CharacterStream $charStream to use for reading characters
-   */
-  public function __construct(Swift_CharacterStream $charStream)
-  {
-    parent::__construct($charStream);
-    if (empty(self::$_headerSafeMap))
-    {
-      foreach (array_merge(
-        range(0x61, 0x7A), range(0x41, 0x5A),
-        range(0x30, 0x39), array(0x20, 0x21, 0x2A, 0x2B, 0x2D, 0x2F)
-        ) as $byte)
-      {
-        self::$_headerSafeMap[$byte] = chr($byte);
-      }
-    }
-  }
-
-  /**
-   * Get the name of this encoding scheme.
-   * Returns the string 'Q'.
-   * @return string
-   */
-  public function getName()
-  {
-    return 'Q';
-  }
-
-  /**
-   * Takes an unencoded string and produces a Q encoded string from it.
-   * @param string $string to encode
-   * @param int $firstLineOffset, optional
-   * @param int $maxLineLength, optional, 0 indicates the default of 76 chars
-   * @return string
-   */
-  public function encodeString($string, $firstLineOffset = 0,
-    $maxLineLength = 0)
-  {
-    return str_replace(array(' ', '=20', "=\r\n"), array('_', '_', "\r\n"),
-      parent::encodeString($string, $firstLineOffset, $maxLineLength)
-      );
-  }
-
-  // -- Overridden points of extension
-
-  /**
-   * Encode the given byte array into a verbatim QP form.
-   * @param int[] $bytes
-   * @return string
-   * @access protected
-   */
-  protected function _encodeByteSequence(array $bytes, &$size)
-  {
-    $ret = '';
-    $size=0;
-    foreach ($bytes as $b)
-    {
-      if (isset(self::$_headerSafeMap[$b]))
-      {
-        $ret .= self::$_headerSafeMap[$b];
-        ++$size;
-      }
-      else
-      {
-        $ret .= self::$_qpMap[$b];
-        $size+=3;
-      }
-    }
-    return $ret;
-  }
-
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/HeaderFactory.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/HeaderFactory.php
deleted file mode 100644
index 83bb35ad6..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/HeaderFactory.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/CharsetObserver.php';
-
-/**
- * Creates MIME headers.
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-interface Swift_Mime_HeaderFactory extends Swift_Mime_CharsetObserver
-{
-  
-  /**
-   * Create a new Mailbox Header with a list of $addresses.
-   * @param string $name
-   * @param array|string $addresses
-   * @return Swift_Mime_Header
-   */
-  public function createMailboxHeader($name, $addresses = null);
-  
-  /**
-   * Create a new Date header using $timestamp (UNIX time).
-   * @param string $name
-   * @param int $timestamp
-   * @return Swift_Mime_Header
-   */
-  public function createDateHeader($name, $timestamp = null);
-  
-  /**
-   * Create a new basic text header with $name and $value.
-   * @param string $name
-   * @param string $value
-   * @return Swift_Mime_Header
-   */
-  public function createTextHeader($name, $value = null);
-  
-  /**
-   * Create a new ParameterizedHeader with $name, $value and $params.
-   * @param string $name
-   * @param string $value
-   * @param array $params
-   * @return Swift_Mime_ParameterizedHeader
-   */
-  public function createParameterizedHeader($name, $value = null,
-    $params = array());
-  
-  /**
-   * Create a new ID header for Message-ID or Content-ID.
-   * @param string $name
-   * @param string|array $ids
-   * @return Swift_Mime_Header
-   */
-  public function createIdHeader($name, $ids = null);
-  
-  /**
-   * Create a new Path header with an address (path) in it.
-   * @param string $name
-   * @param string $path
-   * @return Swift_Mime_Header
-   */
-  public function createPathHeader($name, $path = null);
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/HeaderSet.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/HeaderSet.php
deleted file mode 100644
index 81e7a979b..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/HeaderSet.php
+++ /dev/null
@@ -1,170 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/CharsetObserver.php';
-
-/**
- * A collection of MIME headers.
- * 
- * @package Swift
- * @subpackage Mime
- * 
- * @author Chris Corbyn
- */
-interface Swift_Mime_HeaderSet extends Swift_Mime_CharsetObserver
-{
-  
-  /**
-   * Add a new Mailbox Header with a list of $addresses.
-   * 
-   * @param string $name
-   * @param array|string $addresses
-   */
-  public function addMailboxHeader($name, $addresses = null);
-  
-  /**
-   * Add a new Date header using $timestamp (UNIX time).
-   * 
-   * @param string $name
-   * @param int $timestamp
-   */
-  public function addDateHeader($name, $timestamp = null);
-  
-  /**
-   * Add a new basic text header with $name and $value.
-   * 
-   * @param string $name
-   * @param string $value
-   */
-  public function addTextHeader($name, $value = null);
-  
-  /**
-   * Add a new ParameterizedHeader with $name, $value and $params.
-   * 
-   * @param string $name
-   * @param string $value
-   * @param array $params
-   */
-  public function addParameterizedHeader($name, $value = null,
-    $params = array());
-  
-  /**
-   * Add a new ID header for Message-ID or Content-ID.
-   * 
-   * @param string $name
-   * @param string|array $ids
-   */
-  public function addIdHeader($name, $ids = null);
-  
-  /**
-   * Add a new Path header with an address (path) in it.
-   * 
-   * @param string $name
-   * @param string $path
-   */
-  public function addPathHeader($name, $path = null);
-  
-  /**
-   * Returns true if at least one header with the given $name exists.
-   * 
-   * If multiple headers match, the actual one may be specified by $index.
-   * 
-   * @param string $name
-   * @param int $index
-   * 
-   * @return boolean
-   */
-  public function has($name, $index = 0);
-  
-  /**
-   * Set a header in the HeaderSet.
-   * 
-   * The header may be a previously fetched header via {@link get()} or it may
-   * be one that has been created separately.
-   * 
-   * If $index is specified, the header will be inserted into the set at this
-   * offset.
-   * 
-   * @param Swift_Mime_Header $header
-   * @param int $index
-   */
-  public function set(Swift_Mime_Header $header, $index = 0);
-  
-  /**
-   * Get the header with the given $name.
-   * If multiple headers match, the actual one may be specified by $index.
-   * Returns NULL if none present.
-   * 
-   * @param string $name
-   * @param int $index
-   * 
-   * @return Swift_Mime_Header
-   */
-  public function get($name, $index = 0);
-  
-  /**
-   * Get all headers with the given $name.
-   * 
-   * @param string $name
-   * 
-   * @return array
-   */
-  public function getAll($name = null);
-  
-  /**
-   * Remove the header with the given $name if it's set.
-   * 
-   * If multiple headers match, the actual one may be specified by $index.
-   * 
-   * @param string $name
-   * @param int $index
-   */
-  public function remove($name, $index = 0);
-  
-  /**
-   * Remove all headers with the given $name.
-   * 
-   * @param string $name
-   */
-  public function removeAll($name);
-  
-  /**
-   * Create a new instance of this HeaderSet.
-   * 
-   * @return Swift_Mime_HeaderSet
-   */
-  public function newInstance();
-  
-  /**
-   * Define a list of Header names as an array in the correct order.
-   * 
-   * These Headers will be output in the given order where present.
-   * 
-   * @param array $sequence
-   */
-  public function defineOrdering(array $sequence);
-  
-  /**
-   * Set a list of header names which must always be displayed when set.
-   * 
-   * Usually headers without a field value won't be output unless set here.
-   * 
-   * @param array $names
-   */
-  public function setAlwaysDisplayed(array $names);
-  
-  /**
-   * Returns a string with a representation of all headers.
-   * 
-   * @return string
-   */
-  public function toString();
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/AbstractHeader.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/AbstractHeader.php
deleted file mode 100644
index c3049c25c..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/AbstractHeader.php
+++ /dev/null
@@ -1,596 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/Header.php';
-//@require 'Swift/Mime/HeaderEncoder.php';
-//@require 'Swift/RfcComplianceException.php';
-
-/**
- * An abstract base MIME Header.
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
-{
-  
-  /**
-   * Special characters used in the syntax which need to be escaped.
-   * @var string[]
-   * @access private
-   */
-  private $_specials = array();
-  
-  /**
-   * Tokens defined in RFC 2822 (and some related RFCs).
-   * @var string[]
-   * @access private
-   */
-  private $_grammar = array();
-  
-  /**
-   * The name of this Header.
-   * @var string
-   * @access private
-   */
-  private $_name;
-  
-  /**
-   * The Encoder used to encode this Header.
-   * @var Swift_Encoder
-   * @access private
-   */
-  private $_encoder;
-  
-  /**
-   * The maximum length of a line in the header.
-   * @var int
-   * @access private
-   */
-  private $_lineLength = 78;
-  
-  /**
-   * The language used in this Header.
-   * @var string
-   */
-  private $_lang;
-  
-  /**
-   * The character set of the text in this Header.
-   * @var string
-   * @access private
-   */
-  private $_charset = 'utf-8';
-  
-  /**
-   * The value of this Header, cached.
-   * @var string
-   * @access private
-   */
-  private $_cachedValue = null;
-  
-  /**
-   * Set the character set used in this Header.
-   * @param string $charset
-   */
-  public function setCharset($charset)
-  {
-    $this->clearCachedValueIf($charset != $this->_charset);
-    $this->_charset = $charset;
-    if (isset($this->_encoder))
-    {
-      $this->_encoder->charsetChanged($charset);
-    }
-  }
-  
-  /**
-   * Get the character set used in this Header.
-   * @return string
-   */
-  public function getCharset()
-  {
-    return $this->_charset;
-  }
-  
-  /**
-   * Set the language used in this Header.
-   * For example, for US English, 'en-us'.
-   * This can be unspecified.
-   * @param string $lang
-   */
-  public function setLanguage($lang)
-  {
-    $this->clearCachedValueIf($this->_lang != $lang);
-    $this->_lang = $lang;
-  }
-  
-  /**
-   * Get the language used in this Header.
-   * @return string
-   */
-  public function getLanguage()
-  {
-    return $this->_lang;
-  }
-  
-  /**
-   * Set the encoder used for encoding the header.
-   * @param Swift_Mime_HeaderEncoder $encoder
-   */
-  public function setEncoder(Swift_Mime_HeaderEncoder $encoder)
-  {
-    $this->_encoder = $encoder;
-    $this->setCachedValue(null);
-  }
-  
-  /**
-   * Get the encoder used for encoding this Header.
-   * @return Swift_Mime_HeaderEncoder
-   */
-  public function getEncoder()
-  {
-    return $this->_encoder;
-  }
-  
-  /**
-   * Get the name of this header (e.g. charset).
-   * @return string
-   */
-  public function getFieldName()
-  {
-    return $this->_name;
-  }
-  
-  /**
-   * Set the maximum length of lines in the header (excluding EOL).
-   * @param int $lineLength
-   */
-  public function setMaxLineLength($lineLength)
-  {
-    $this->clearCachedValueIf($this->_lineLength != $lineLength);
-    $this->_lineLength = $lineLength;
-  }
-  
-  /**
-   * Get the maximum permitted length of lines in this Header.
-   * @return int
-   */
-  public function getMaxLineLength()
-  {
-    return $this->_lineLength;
-  }
-  
-  /**
-   * Get this Header rendered as a RFC 2822 compliant string.
-   * @return string
-   * @throws Swift_RfcComplianceException
-   */
-  public function toString()
-  {
-    return $this->_tokensToString($this->toTokens());
-  }
-  
-  /**
-   * Returns a string representation of this object.
-   *
-   * @return string
-   *
-   * @see toString()
-   */
-  public function __toString()
-  {
-    return $this->toString();
-  }
-  
-  // -- Points of extension
-  
-  /**
-   * Set the name of this Header field.
-   * @param string $name
-   * @access protected
-   */
-  protected function setFieldName($name)
-  {
-    $this->_name = $name;
-  }
-  
-  /**
-   * Initialize some RFC 2822 (and friends) ABNF grammar definitions.
-   * @access protected
-   */
-  protected function initializeGrammar()
-  {
-    $this->_specials = array(
-      '(', ')', '<', '>', '[', ']',
-      ':', ';', '@', ',', '.', '"'
-      );
-    
-    /*** Refer to RFC 2822 for ABNF grammar ***/
-    
-    //All basic building blocks
-    $this->_grammar['NO-WS-CTL'] = '[\x01-\x08\x0B\x0C\x0E-\x19\x7F]';
-    $this->_grammar['WSP'] = '[ \t]';
-    $this->_grammar['CRLF'] = '(?:\r\n)';
-    $this->_grammar['FWS'] = '(?:(?:' . $this->_grammar['WSP'] . '*' .
-        $this->_grammar['CRLF'] . ')?' . $this->_grammar['WSP'] . ')';
-    $this->_grammar['text'] = '[\x00-\x08\x0B\x0C\x0E-\x7F]';
-    $this->_grammar['quoted-pair'] = '(?:\\\\' . $this->_grammar['text'] . ')';
-    $this->_grammar['ctext'] = '(?:' . $this->_grammar['NO-WS-CTL'] .
-        '|[\x21-\x27\x2A-\x5B\x5D-\x7E])';
-    //Uses recursive PCRE (?1) -- could be a weak point??
-    $this->_grammar['ccontent'] = '(?:' . $this->_grammar['ctext'] . '|' .
-        $this->_grammar['quoted-pair'] . '|(?1))';
-    $this->_grammar['comment'] = '(\((?:' . $this->_grammar['FWS'] . '|' .
-        $this->_grammar['ccontent']. ')*' . $this->_grammar['FWS'] . '?\))';
-    $this->_grammar['CFWS'] = '(?:(?:' . $this->_grammar['FWS'] . '?' .
-        $this->_grammar['comment'] . ')*(?:(?:' . $this->_grammar['FWS'] . '?' .
-        $this->_grammar['comment'] . ')|' . $this->_grammar['FWS'] . '))';
-    $this->_grammar['qtext'] = '(?:' . $this->_grammar['NO-WS-CTL'] .
-        '|[\x21\x23-\x5B\x5D-\x7E])';
-    $this->_grammar['qcontent'] = '(?:' . $this->_grammar['qtext'] . '|' .
-        $this->_grammar['quoted-pair'] . ')';
-    $this->_grammar['quoted-string'] = '(?:' . $this->_grammar['CFWS'] . '?"' .
-        '(' . $this->_grammar['FWS'] . '?' . $this->_grammar['qcontent'] . ')*' .
-        $this->_grammar['FWS'] . '?"' . $this->_grammar['CFWS'] . '?)';
-    $this->_grammar['atext'] = '[a-zA-Z0-9!#\$%&\'\*\+\-\/=\?\^_`\{\}\|~]';
-    $this->_grammar['atom'] = '(?:' . $this->_grammar['CFWS'] . '?' .
-        $this->_grammar['atext'] . '+' . $this->_grammar['CFWS'] . '?)';
-    $this->_grammar['dot-atom-text'] = '(?:' . $this->_grammar['atext'] . '+' .
-        '(\.' . $this->_grammar['atext'] . '+)*)';
-    $this->_grammar['dot-atom'] = '(?:' . $this->_grammar['CFWS'] . '?' .
-        $this->_grammar['dot-atom-text'] . '+' . $this->_grammar['CFWS'] . '?)';
-    $this->_grammar['word'] = '(?:' . $this->_grammar['atom'] . '|' .
-        $this->_grammar['quoted-string'] . ')';
-    $this->_grammar['phrase'] = '(?:' . $this->_grammar['word'] . '+?)';
-    $this->_grammar['no-fold-quote'] = '(?:"(?:' . $this->_grammar['qtext'] .
-        '|' . $this->_grammar['quoted-pair'] . ')*")';
-    $this->_grammar['dtext'] = '(?:' . $this->_grammar['NO-WS-CTL'] .
-        '|[\x21-\x5A\x5E-\x7E])';
-    $this->_grammar['no-fold-literal'] = '(?:\[(?:' . $this->_grammar['dtext'] .
-        '|' . $this->_grammar['quoted-pair'] . ')*\])';
-    
-    //Message IDs
-    $this->_grammar['id-left'] = '(?:' . $this->_grammar['dot-atom-text'] . '|' .
-        $this->_grammar['no-fold-quote'] . ')';
-    $this->_grammar['id-right'] = '(?:' . $this->_grammar['dot-atom-text'] . '|' .
-        $this->_grammar['no-fold-literal'] . ')';
-    
-    //Addresses, mailboxes and paths
-    $this->_grammar['local-part'] = '(?:' . $this->_grammar['dot-atom'] . '|' .
-        $this->_grammar['quoted-string'] . ')';
-    $this->_grammar['dcontent'] = '(?:' . $this->_grammar['dtext'] . '|' .
-        $this->_grammar['quoted-pair'] . ')';
-    $this->_grammar['domain-literal'] = '(?:' . $this->_grammar['CFWS'] . '?\[(' .
-        $this->_grammar['FWS'] . '?' . $this->_grammar['dcontent'] . ')*?' .
-        $this->_grammar['FWS'] . '?\]' . $this->_grammar['CFWS'] . '?)';
-    $this->_grammar['domain'] = '(?:' . $this->_grammar['dot-atom'] . '|' .
-        $this->_grammar['domain-literal'] . ')';
-    $this->_grammar['addr-spec'] = '(?:' . $this->_grammar['local-part'] . '@' .
-        $this->_grammar['domain'] . ')';
-  }
-  
-  /**
-   * Get the grammar defined for $name token.
-   * @param string $name execatly as written in the RFC
-   * @return string
-   */
-  protected function getGrammar($name)
-  {
-    if (array_key_exists($name, $this->_grammar))
-    {
-      return $this->_grammar[$name];
-    }
-    else
-    {
-      throw new Swift_RfcComplianceException(
-        "No such grammar '" . $name . "' defined."
-        );
-    }
-  }
-  
-  /**
-   * Escape special characters in a string (convert to quoted-pairs).
-   * @param string $token
-   * @param string[] $include additonal chars to escape
-   * @param string[] $exclude chars from escaping
-   * @return string
-   */
-  protected function escapeSpecials($token, $include = array(),
-    $exclude = array())
-  {
-    foreach (
-      array_merge(array('\\'), array_diff($this->_specials, $exclude), $include) as $char)
-    {
-      $token = str_replace($char, '\\' . $char, $token);
-    }
-    return $token;
-  }
-  
-  /**
-   * Produces a compliant, formatted RFC 2822 'phrase' based on the string given.
-   * @param Swift_Mime_Header $header
-   * @param string $string as displayed
-   * @param string $charset of the text
-   * @param Swift_Mime_HeaderEncoder $encoder
-   * @param boolean $shorten the first line to make remove for header name
-   * @return string
-   */
-  protected function createPhrase(Swift_Mime_Header $header, $string, $charset,
-    Swift_Mime_HeaderEncoder $encoder = null, $shorten = false)
-  {
-    //Treat token as exactly what was given
-    $phraseStr = $string;
-    //If it's not valid
-    if (!preg_match('/^' . $this->_grammar['phrase'] . '$/D', $phraseStr))
-    {
-      // .. but it is just ascii text, try escaping some characters
-      // and make it a quoted-string
-      if (preg_match('/^' . $this->_grammar['text'] . '*$/D', $phraseStr))
-      {
-        $phraseStr = $this->escapeSpecials(
-          $phraseStr, array('"'), $this->_specials
-          );
-        $phraseStr = '"' . $phraseStr . '"';
-      }
-      else // ... otherwise it needs encoding
-      {
-        //Determine space remaining on line if first line
-        if ($shorten)
-        {
-          $usedLength = strlen($header->getFieldName() . ': ');
-        }
-        else
-        {
-          $usedLength = 0;
-        }
-        $phraseStr = $this->encodeWords($header, $string, $usedLength);
-      }
-    }
-    
-    return $phraseStr;
-  }
-  
-  /**
-   * Encode needed word tokens within a string of input.
-   * @param string $input
-   * @param string $usedLength, optional
-   * @return string
-   */
-  protected function encodeWords(Swift_Mime_Header $header, $input,
-    $usedLength = -1)
-  {
-    $value = '';
-    
-    $tokens = $this->getEncodableWordTokens($input);
-    
-    foreach ($tokens as $token)
-    {
-      //See RFC 2822, Sect 2.2 (really 2.2 ??)
-      if ($this->tokenNeedsEncoding($token))
-      {
-        //Don't encode starting WSP
-        $firstChar = substr($token, 0, 1);
-        switch($firstChar)
-        {
-          case ' ':
-          case "\t":
-            $value .= $firstChar;
-            $token = substr($token, 1);
-        }
-        
-        if (-1 == $usedLength)
-        {
-          $usedLength = strlen($header->getFieldName() . ': ') + strlen($value);
-        }
-        $value .= $this->getTokenAsEncodedWord($token, $usedLength);
-        
-        $header->setMaxLineLength(76); //Forefully override
-      }
-      else
-      {
-        $value .= $token;
-      }
-    }
-    
-    return $value;
-  }
-  
-  /**
-   * Test if a token needs to be encoded or not.
-   * @param string $token
-   * @return boolean
-   */
-  protected function tokenNeedsEncoding($token)
-  {
-    return preg_match('~[\x00-\x08\x10-\x19\x7F-\xFF\r\n]~', $token);
-  }
-  
-  /**
-   * Splits a string into tokens in blocks of words which can be encoded quickly.
-   * @param string $string
-   * @return string[]
-   */
-  protected function getEncodableWordTokens($string)
-  {
-    $tokens = array();
-    
-    $encodedToken = '';
-    //Split at all whitespace boundaries
-    foreach (preg_split('~(?=[\t ])~', $string) as $token)
-    {
-      if ($this->tokenNeedsEncoding($token))
-      {
-        $encodedToken .= $token;
-      }
-      else
-      {
-        if (strlen($encodedToken) > 0)
-        {
-          $tokens[] = $encodedToken;
-          $encodedToken = '';
-        }
-        $tokens[] = $token;
-      }
-    }
-    if (strlen($encodedToken))
-    {
-      $tokens[] = $encodedToken;
-    }
-    
-    return $tokens;
-  }
-  
-  /**
-   * Get a token as an encoded word for safe insertion into headers.
-   * @param string $token to encode
-   * @param int $firstLineOffset, optional
-   * @return string
-   */
-  protected function getTokenAsEncodedWord($token, $firstLineOffset = 0)
-  {
-    //Adjust $firstLineOffset to account for space needed for syntax
-    $charsetDecl = $this->_charset;
-    if (isset($this->_lang))
-    {
-      $charsetDecl .= '*' . $this->_lang;
-    }
-    $encodingWrapperLength = strlen(
-      '=?' . $charsetDecl . '?' . $this->_encoder->getName() . '??='
-      );
-    
-    if ($firstLineOffset >= 75) //Does this logic need to be here?
-    {
-      $firstLineOffset = 0;
-    }
-    
-    $encodedTextLines = explode("\r\n",
-      $this->_encoder->encodeString(
-        $token, $firstLineOffset, 75 - $encodingWrapperLength
-        )
-      );
-    
-    foreach ($encodedTextLines as $lineNum => $line)
-    {
-      $encodedTextLines[$lineNum] = '=?' . $charsetDecl .
-        '?' . $this->_encoder->getName() .
-        '?' . $line . '?=';
-    }
-    
-    return implode("\r\n ", $encodedTextLines);
-  }
-  
-  /**
-   * Generates tokens from the given string which include CRLF as individual tokens.
-   * @param string $token
-   * @return string[]
-   * @access protected
-   */
-  protected function generateTokenLines($token)
-  {
-    return preg_split('~(\r\n)~', $token, -1, PREG_SPLIT_DELIM_CAPTURE);
-  }
-  
-  /**
-   * Set a value into the cache.
-   * @param string $value
-   * @access protected
-   */
-  protected function setCachedValue($value)
-  {
-    $this->_cachedValue = $value;
-  }
-  
-  /**
-   * Get the value in the cache.
-   * @return string
-   * @access protected
-   */
-  protected function getCachedValue()
-  {
-    return $this->_cachedValue;
-  }
-  
-  /**
-   * Clear the cached value if $condition is met.
-   * @param boolean $condition
-   * @access protected
-   */
-  protected function clearCachedValueIf($condition)
-  {
-    if ($condition)
-    {
-      $this->setCachedValue(null);
-    }
-  }
-  
-  // -- Private methods
-  
-  /**
-   * Generate a list of all tokens in the final header.
-   * @param string $string input, optional
-   * @return string[]
-   * @access private
-   */
-  protected function toTokens($string = null)
-  {
-    if (is_null($string))
-    {
-      $string = $this->getFieldBody();
-    }
-    
-    $tokens = array();
-    
-    //Generate atoms; split at all invisible boundaries followed by WSP
-    foreach (preg_split('~(?=[ \t])~', $string) as $token)
-    {
-      $tokens = array_merge($tokens, $this->generateTokenLines($token));
-    }
-    
-    return $tokens;
-  }
-  
-  /**
-   * Takes an array of tokens which appear in the header and turns them into
-   * an RFC 2822 compliant string, adding FWSP where needed.
-   * @param string[] $tokens
-   * @return string
-   * @access private
-   */
-  private function _tokensToString(array $tokens)
-  {
-    $lineCount = 0;
-    $headerLines = array();
-    $headerLines[] = $this->_name . ': ';
-    $currentLine =& $headerLines[$lineCount++];
-    
-    //Build all tokens back into compliant header
-    foreach ($tokens as $i => $token)
-    {
-      //Line longer than specified maximum or token was just a new line
-      if (("\r\n" == $token) ||
-        ($i > 0 && strlen($currentLine . $token) > $this->_lineLength)
-        && 0 < strlen($currentLine))
-      {
-        $headerLines[] = '';
-        $currentLine =& $headerLines[$lineCount++];
-      }
-      
-      //Append token to the line
-      if ("\r\n" != $token)
-      {
-        $currentLine .= $token;
-      }
-    }
-    
-    //Implode with FWS (RFC 2822, 2.2.3)
-    return implode("\r\n", $headerLines) . "\r\n";
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/DateHeader.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/DateHeader.php
deleted file mode 100644
index 598c0c5a9..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/DateHeader.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/Headers/AbstractHeader.php';
-
-
-/**
- * A Date MIME Header for Swift Mailer.
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-class Swift_Mime_Headers_DateHeader extends Swift_Mime_Headers_AbstractHeader
-{
-  
-  /**
-   * The UNIX timestamp value of this Header.
-   * @var int
-   * @access private
-   */
-  private $_timestamp;
-  
-  /**
-   * Creates a new DateHeader with $name and $timestamp.
-   * Example:
-   * <code>
-   * <?php
-   * $header = new Swift_Mime_Headers_DateHeader('Date', time());
-   * ?>
-   * </code>
-   * @param string $name of Header
-   */
-  public function __construct($name)
-  {
-    $this->setFieldName($name);
-  }
-  
-  /**
-   * Get the type of Header that this instance represents.
-   * @return int
-   * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
-   * @see TYPE_DATE, TYPE_ID, TYPE_PATH
-   */
-  public function getFieldType()
-  {
-    return self::TYPE_DATE;
-  }
-  
-  /**
-   * Set the model for the field body.
-   * This method takes a UNIX timestamp.
-   * @param int $model
-   */
-  public function setFieldBodyModel($model)
-  {
-    $this->setTimestamp($model);
-  }
-  
-  /**
-   * Get the model for the field body.
-   * This method returns a UNIX timestamp.
-   * @return mixed
-   */
-  public function getFieldBodyModel()
-  {
-    return $this->getTimestamp();
-  }
-  
-  /**
-   * Get the UNIX timestamp of the Date in this Header.
-   * @return int
-   */
-  public function getTimestamp()
-  {
-    return $this->_timestamp;
-  }
-  
-  /**
-   * Set the UNIX timestamp of the Date in this Header.
-   * @param int $timestamp
-   */
-  public function setTimestamp($timestamp)
-  {
-    if (!is_null($timestamp))
-    {
-      $timestamp = (int) $timestamp;
-    }
-    $this->clearCachedValueIf($this->_timestamp != $timestamp);
-    $this->_timestamp = $timestamp;
-  }
-  
-  /**
-   * Get the string value of the body in this Header.
-   * This is not necessarily RFC 2822 compliant since folding white space will
-   * not be added at this stage (see {@link toString()} for that).
-   * @return string
-   * @see toString()
-   */
-  public function getFieldBody()
-  {
-    if (!$this->getCachedValue())
-    {
-      if (isset($this->_timestamp))
-      {
-        $this->setCachedValue(date('r', $this->_timestamp));
-      }
-    }
-    return $this->getCachedValue();
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/IdentificationHeader.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/IdentificationHeader.php
deleted file mode 100644
index 55ff73730..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/IdentificationHeader.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/Headers/AbstractHeader.php';
-//@require 'Swift/RfcComplianceException.php';
-
-/**
- * An ID MIME Header for something like Message-ID or Content-ID.
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-class Swift_Mime_Headers_IdentificationHeader
-  extends Swift_Mime_Headers_AbstractHeader
-{
-  
-  /**
-   * The IDs used in the value of this Header.
-   * This may hold multiple IDs or just a single ID.
-   * @var string[]
-   * @access private
-   */
-  private $_ids = array();
-  
-  /**
-   * Creates a new IdentificationHeader with the given $name and $id.
-   * @param string $name
-   */
-  public function __construct($name)
-  {
-    $this->setFieldName($name);
-    $this->initializeGrammar();
-  }
-  
-  /**
-   * Get the type of Header that this instance represents.
-   * @return int
-   * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
-   * @see TYPE_DATE, TYPE_ID, TYPE_PATH
-   */
-  public function getFieldType()
-  {
-    return self::TYPE_ID;
-  }
-  
-  /**
-   * Set the model for the field body.
-   * This method takes a string ID, or an array of IDs
-   * @param mixed $model
-   * @throws Swift_RfcComplianceException
-   */
-  public function setFieldBodyModel($model)
-  {
-    $this->setId($model);
-  }
-  
-  /**
-   * Get the model for the field body.
-   * This method returns an array of IDs
-   * @return array
-   */
-  public function getFieldBodyModel()
-  {
-    return $this->getIds();
-  }
-  
-  /**
-   * Set the ID used in the value of this header.
-   * @param string $id
-   * @throws Swift_RfcComplianceException
-   */
-  public function setId($id)
-  {
-    return $this->setIds(array($id));
-  }
-  
-  /**
-   * Get the ID used in the value of this Header.
-   * If multiple IDs are set only the first is returned.
-   * @return string
-   */
-  public function getId()
-  {
-    if (count($this->_ids) > 0)
-    {
-      return $this->_ids[0];
-    }
-  }
-  
-  /**
-   * Set a collection of IDs to use in the value of this Header.
-   * @param string[] $ids
-   * @throws Swift_RfcComplianceException
-   */
-  public function setIds(array $ids)
-  {
-    $actualIds = array();
-    
-    foreach ($ids as $k => $id)
-    {
-      if (preg_match(
-        '/^' . $this->getGrammar('id-left') . '@' .
-        $this->getGrammar('id-right') . '$/D',
-        $id
-        ))
-      {
-        $actualIds[] = $id;
-      }
-      else
-      {
-        throw new Swift_RfcComplianceException(
-          'Invalid ID given <' . $id . '>'
-          );
-      }
-    }
-    
-    $this->clearCachedValueIf($this->_ids != $actualIds);
-    $this->_ids = $actualIds;
-  }
-  
-  /**
-   * Get the list of IDs used in this Header.
-   * @return string[]
-   */
-  public function getIds()
-  {
-    return $this->_ids;
-  }
-  
-  /**
-   * Get the string value of the body in this Header.
-   * This is not necessarily RFC 2822 compliant since folding white space will
-   * not be added at this stage (see {@link toString()} for that).
-   * @return string
-   * @see toString()
-   * @throws Swift_RfcComplianceException
-   */
-  public function getFieldBody()
-  {
-    if (!$this->getCachedValue())
-    {
-      $angleAddrs = array();
-    
-      foreach ($this->_ids as $id)
-      {
-        $angleAddrs[] = '<' . $id . '>';
-      }
-    
-      $this->setCachedValue(implode(' ', $angleAddrs));
-    }
-    return $this->getCachedValue();
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/MailboxHeader.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/MailboxHeader.php
deleted file mode 100644
index 77d3bba22..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/MailboxHeader.php
+++ /dev/null
@@ -1,316 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/Headers/AbstractHeader.php';
-//@require 'Swift/Mime/HeaderEncoder.php';
-
-/**
- * A Mailbox Address MIME Header for something like From or Sender.
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
-{
-  
-  /**
-   * The mailboxes used in this Header.
-   * @var string[]
-   * @access private
-   */
-  private $_mailboxes = array();
-  
-  /**
-   * Creates a new MailboxHeader with $name.
-   * @param string $name of Header
-   * @param Swift_Mime_HeaderEncoder $encoder
-   */
-  public function __construct($name, Swift_Mime_HeaderEncoder $encoder)
-  {
-    $this->setFieldName($name);
-    $this->setEncoder($encoder);
-    $this->initializeGrammar();
-  }
-  
-  /**
-   * Get the type of Header that this instance represents.
-   * @return int
-   * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
-   * @see TYPE_DATE, TYPE_ID, TYPE_PATH
-   */
-  public function getFieldType()
-  {
-    return self::TYPE_MAILBOX;
-  }
-  
-  /**
-   * Set the model for the field body.
-   * This method takes a string, or an array of addresses.
-   * @param mixed $model
-   * @throws Swift_RfcComplianceException
-   */
-  public function setFieldBodyModel($model)
-  {
-    $this->setNameAddresses($model);
-  }
-  
-  /**
-   * Get the model for the field body.
-   * This method returns an associative array like {@link getNameAddresses()}
-   * @return array
-   * @throws Swift_RfcComplianceException
-   */
-  public function getFieldBodyModel()
-  {
-    return $this->getNameAddresses();
-  }
-  
-  /**
-   * Set a list of mailboxes to be shown in this Header.
-   * The mailboxes can be a simple array of addresses, or an array of
-   * key=>value pairs where (email => personalName).
-   * Example:
-   * <code>
-   * <?php
-   * //Sets two mailboxes in the Header, one with a personal name
-   * $header->setNameAddresses(array(
-   *  'chris@swiftmailer.org' => 'Chris Corbyn',
-   *  'mark@swiftmailer.org' //No associated personal name
-   *  ));
-   * ?>
-   * </code>
-   * @param string|string[] $mailboxes
-   * @throws Swift_RfcComplianceException
-   * @see __construct()
-   * @see setAddresses()
-   * @see setValue()
-   */
-  public function setNameAddresses($mailboxes)
-  {
-    $this->_mailboxes = $this->normalizeMailboxes((array) $mailboxes);
-    $this->setCachedValue(null); //Clear any cached value
-  }
-  
-  /**
-   * Get the full mailbox list of this Header as an array of valid RFC 2822 strings.
-   * Example:
-   * <code>
-   * <?php
-   * $header = new Swift_Mime_Headers_MailboxHeader('From',
-   *  array('chris@swiftmailer.org' => 'Chris Corbyn',
-   *  'mark@swiftmailer.org' => 'Mark Corbyn')
-   *  );
-   * print_r($header->getNameAddressStrings());
-   * // array (
-   * // 0 => Chris Corbyn <chris@swiftmailer.org>,
-   * // 1 => Mark Corbyn <mark@swiftmailer.org>
-   * // )
-   * ?>
-   * </code>
-   * @return string[]
-   * @throws Swift_RfcComplianceException
-   * @see getNameAddresses()
-   * @see toString()
-   */
-  public function getNameAddressStrings()
-  {
-    return $this->_createNameAddressStrings($this->getNameAddresses());
-  }
-  
-  /**
-   * Get all mailboxes in this Header as key=>value pairs.
-   * The key is the address and the value is the name (or null if none set).
-   * Example:
-   * <code>
-   * <?php
-   * $header = new Swift_Mime_Headers_MailboxHeader('From',
-   *  array('chris@swiftmailer.org' => 'Chris Corbyn',
-   *  'mark@swiftmailer.org' => 'Mark Corbyn')
-   *  );
-   * print_r($header->getNameAddresses());
-   * // array (
-   * // chris@swiftmailer.org => Chris Corbyn,
-   * // mark@swiftmailer.org => Mark Corbyn
-   * // )
-   * ?>
-   * </code>
-   * @return string[]
-   * @see getAddresses()
-   * @see getNameAddressStrings()
-   */
-  public function getNameAddresses()
-  {
-    return $this->_mailboxes;
-  }
-  
-  /**
-   * Makes this Header represent a list of plain email addresses with no names.
-   * Example:
-   * <code>
-   * <?php
-   * //Sets three email addresses as the Header data
-   * $header->setAddresses(
-   *  array('one@domain.tld', 'two@domain.tld', 'three@domain.tld')
-   *  );
-   * ?>
-   * </code>
-   * @param string[] $addresses
-   * @throws Swift_RfcComplianceException
-   * @see setNameAddresses()
-   * @see setValue()
-   */
-  public function setAddresses($addresses)
-  {
-    return $this->setNameAddresses(array_values((array) $addresses));
-  }
-  
-  /**
-   * Get all email addresses in this Header.
-   * @return string[]
-   * @see getNameAddresses()
-   */
-  public function getAddresses()
-  {
-    return array_keys($this->_mailboxes);
-  }
-  
-  /**
-   * Remove one or more addresses from this Header.
-   * @param string|string[] $addresses
-   */
-  public function removeAddresses($addresses)
-  {
-    $this->setCachedValue(null);
-    foreach ((array) $addresses as $address)
-    {
-      unset($this->_mailboxes[$address]);
-    }
-  }
-  
-  /**
-   * Get the string value of the body in this Header.
-   * This is not necessarily RFC 2822 compliant since folding white space will
-   * not be added at this stage (see {@link toString()} for that).
-   * @return string
-   * @throws Swift_RfcComplianceException
-   * @see toString()
-   */
-  public function getFieldBody()
-  {
-    //Compute the string value of the header only if needed
-    if (is_null($this->getCachedValue()))
-    {
-      $this->setCachedValue($this->createMailboxListString($this->_mailboxes));
-    }
-    return $this->getCachedValue();
-  }
-  
-  // -- Points of extension
-  
-  /**
-   * Normalizes a user-input list of mailboxes into consistent key=>value pairs.
-   * @param string[] $mailboxes
-   * @return string[]
-   * @access protected
-   */
-  protected function normalizeMailboxes(array $mailboxes)
-  {
-    $actualMailboxes = array();
-    
-    foreach ($mailboxes as $key => $value)
-    {
-      if (is_string($key)) //key is email addr
-      {
-        $address = $key;
-        $name = $value;
-      }
-      else
-      {
-        $address = $value;
-        $name = null;
-      }
-      $this->_assertValidAddress($address);
-      $actualMailboxes[$address] = $name;
-    }
-    
-    return $actualMailboxes;
-  }
-  
-  /**
-   * Produces a compliant, formatted display-name based on the string given.
-   * @param string $displayName as displayed
-   * @param boolean $shorten the first line to make remove for header name
-   * @return string
-   * @access protected
-   */
-  protected function createDisplayNameString($displayName, $shorten = false)
-  {
-    return $this->createPhrase($this, $displayName,
-      $this->getCharset(), $this->getEncoder(), $shorten
-      );
-  }
-  
-  /**
-   * Creates a string form of all the mailboxes in the passed array.
-   * @param string[] $mailboxes
-   * @return string
-   * @throws Swift_RfcComplianceException
-   * @access protected
-   */
-  protected function createMailboxListString(array $mailboxes)
-  {
-    return implode(', ', $this->_createNameAddressStrings($mailboxes));
-  }
-  
-  // -- Private methods
-  
-  /**
-   * Return an array of strings conforming the the name-addr spec of RFC 2822.
-   * @param string[] $mailboxes
-   * @return string[]
-   * @access private
-   */
-  private function _createNameAddressStrings(array $mailboxes)
-  {
-    $strings = array();
-    
-    foreach ($mailboxes as $email => $name)
-    {
-      $mailboxStr = $email;
-      if (!is_null($name))
-      {
-        $nameStr = $this->createDisplayNameString($name, empty($strings));
-        $mailboxStr = $nameStr . ' <' . $mailboxStr . '>';
-      }
-      $strings[] = $mailboxStr;
-    }
-    
-    return $strings;
-  }
-  
-  /**
-   * Throws an Exception if the address passed does not comply with RFC 2822.
-   * @param string $address
-   * @throws Exception If invalid.
-   * @access protected
-   */
-  private function _assertValidAddress($address)
-  {
-    if (!preg_match('/^' . $this->getGrammar('addr-spec') . '$/D',
-      $address))
-    {
-      throw new Swift_RfcComplianceException(
-        'Address in mailbox given [' . $address .
-        '] does not comply with RFC 2822, 3.6.2.'
-        );
-    }
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/ParameterizedHeader.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/ParameterizedHeader.php
deleted file mode 100644
index 974b44e2b..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/ParameterizedHeader.php
+++ /dev/null
@@ -1,274 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/Headers/UnstructuredHeader.php';
-//@require 'Swift/Mime/HeaderEncoder.php';
-//@require 'Swift/Mime/ParameterizedHeader.php';
-//@require 'Swift/Encoder.php';
-
-/**
- * An abstract base MIME Header.
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-class Swift_Mime_Headers_ParameterizedHeader
-  extends Swift_Mime_Headers_UnstructuredHeader
-  implements Swift_Mime_ParameterizedHeader
-{
-  
-  /**
-   * The Encoder used to encode the parameters.
-   * @var Swift_Encoder
-   * @access private
-   */
-  private $_paramEncoder;
-  
-  /**
-   * The parameters as an associative array.
-   * @var string[]
-   * @access private
-   */
-  private $_params = array();
-  
-  /**
-   * RFC 2231's definition of a token.
-   * @var string
-   * @access private
-   */
-  private $_tokenRe;
-  
-  /**
-   * Creates a new ParameterizedHeader with $name.
-   * @param string $name
-   * @param Swift_Mime_HeaderEncoder $encoder
-   * @param Swift_Encoder $paramEncoder, optional
-   */ 
-  public function __construct($name, Swift_Mime_HeaderEncoder $encoder,
-    Swift_Encoder $paramEncoder = null)
-  {
-    $this->setFieldName($name);
-    $this->setEncoder($encoder);
-    $this->_paramEncoder = $paramEncoder;
-    $this->initializeGrammar();
-    $this->_tokenRe = '(?:[\x21\x23-\x27\x2A\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7E]+)';
-  }
-  
-  /**
-   * Get the type of Header that this instance represents.
-   * @return int
-   * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
-   * @see TYPE_DATE, TYPE_ID, TYPE_PATH
-   */
-  public function getFieldType()
-  {
-    return self::TYPE_PARAMETERIZED;
-  }
-  
-  /**
-   * Set the character set used in this Header.
-   * @param string $charset
-   */
-  public function setCharset($charset)
-  {
-    parent::setCharset($charset);
-    if (isset($this->_paramEncoder))
-    {
-      $this->_paramEncoder->charsetChanged($charset);
-    }
-  }
-  
-  /**
-   * Set the value of $parameter.
-   * @param string $parameter
-   * @param string $value
-   */
-  public function setParameter($parameter, $value)
-  {
-    $this->setParameters(array_merge($this->getParameters(), array($parameter => $value)));
-  }
-  
-  /**
-   * Get the value of $parameter.
-   * @return string
-   */
-  public function getParameter($parameter)
-  {
-    $params = $this->getParameters();
-    return array_key_exists($parameter, $params)
-      ? $params[$parameter]
-      : null;
-  }
-  
-  /**
-   * Set an associative array of parameter names mapped to values.
-   * @param string[]
-   */
-  public function setParameters(array $parameters)
-  {
-    $this->clearCachedValueIf($this->_params != $parameters);
-    $this->_params = $parameters;
-  }
-  
-  /**
-   * Returns an associative array of parameter names mapped to values.
-   * @return string[]
-   */
-  public function getParameters()
-  {
-    return $this->_params;
-  }
-  
-  /**
-   * Get the value of this header prepared for rendering.
-   * @return string
-   */
-  public function getFieldBody() //TODO: Check caching here
-  {
-    $body = parent::getFieldBody();
-    foreach ($this->_params as $name => $value)
-    {
-      if (!is_null($value))
-      {
-        //Add the parameter
-        $body .= '; ' . $this->_createParameter($name, $value);
-      }
-    }
-    return $body;
-  }
-  
-  // -- Protected methods
-  
-  /**
-   * Generate a list of all tokens in the final header.
-   * This doesn't need to be overridden in theory, but it is for implementation
-   * reasons to prevent potential breakage of attributes.
-   * @return string[]
-   * @access protected
-   */
-  protected function toTokens($string = null)
-  {
-    $tokens = parent::toTokens(parent::getFieldBody());
-    
-    //Try creating any parameters
-    foreach ($this->_params as $name => $value)
-    {
-      if (!is_null($value))
-      {
-        //Add the semi-colon separator
-        $tokens[count($tokens)-1] .= ';';
-        $tokens = array_merge($tokens, $this->generateTokenLines(
-          ' ' . $this->_createParameter($name, $value)
-          ));
-      }
-    }
-    
-    return $tokens;
-  }
-  
-  // -- Private methods
-  
-  /**
-   * Render a RFC 2047 compliant header parameter from the $name and $value.
-   * @param string $name
-   * @param string $value
-   * @return string
-   * @access private
-   */
-  private function _createParameter($name, $value)
-  {
-    $origValue = $value;
-    
-    $encoded = false;
-    //Allow room for parameter name, indices, "=" and DQUOTEs
-    $maxValueLength = $this->getMaxLineLength() - strlen($name . '=*N"";') - 1;
-    $firstLineOffset = 0;
-    
-    //If it's not already a valid parameter value...
-    if (!preg_match('/^' . $this->_tokenRe . '$/D', $value))
-    {
-      //TODO: text, or something else??
-      //... and it's not ascii
-      if (!preg_match('/^' . $this->getGrammar('text') . '*$/D', $value))
-      {
-        $encoded = true;
-        //Allow space for the indices, charset and language
-        $maxValueLength = $this->getMaxLineLength() - strlen($name . '*N*="";') - 1;
-        $firstLineOffset = strlen(
-          $this->getCharset() . "'" . $this->getLanguage() . "'"
-          );
-      }
-    }
-    
-    //Encode if we need to
-    if ($encoded || strlen($value) > $maxValueLength)
-    {
-      if (isset($this->_paramEncoder))
-      {
-        $value = $this->_paramEncoder->encodeString(
-          $origValue, $firstLineOffset, $maxValueLength
-          );
-      }
-      else //We have to go against RFC 2183/2231 in some areas for interoperability
-      {
-        $value = $this->getTokenAsEncodedWord($origValue);
-        $encoded = false;
-      }
-    }
-    
-    $valueLines = isset($this->_paramEncoder) ? explode("\r\n", $value) : array($value);
-    
-    //Need to add indices
-    if (count($valueLines) > 1)
-    {
-      $paramLines = array();
-      foreach ($valueLines as $i => $line)
-      {
-        $paramLines[] = $name . '*' . $i .
-          $this->_getEndOfParameterValue($line, $encoded, $i == 0);
-      }
-      return implode(";\r\n ", $paramLines);
-    }
-    else
-    {
-      return $name . $this->_getEndOfParameterValue(
-        $valueLines[0], $encoded, true
-        );
-    }
-  }
-  
-  /**
-   * Returns the parameter value from the "=" and beyond.
-   * @param string $value to append
-   * @param boolean $encoded
-   * @param boolean $firstLine
-   * @return string
-   * @access private
-   */
-  private function _getEndOfParameterValue($value, $encoded = false, $firstLine = false)
-  {
-    if (!preg_match('/^' . $this->_tokenRe . '$/D', $value))
-    {
-      $value = '"' . $value . '"';
-    }
-    $prepend = '=';
-    if ($encoded)
-    {
-      $prepend = '*=';
-      if ($firstLine)
-      {
-        $prepend = '*=' . $this->getCharset() . "'" . $this->getLanguage() .
-          "'";
-      }
-    }
-    return $prepend . $value;
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/PathHeader.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/PathHeader.php
deleted file mode 100644
index 0a8a100a8..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/PathHeader.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/Headers/AbstractHeader.php';
-//@require 'Swift/RfcComplianceException.php';
-
-/**
- * A Path Header in Swift Mailer, such a Return-Path.
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-class Swift_Mime_Headers_PathHeader extends Swift_Mime_Headers_AbstractHeader
-{
-  
-  /**
-   * The address in this Header (if specified).
-   * @var string
-   * @access private
-   */
-  private $_address;
-  
-  /**
-   * Creates a new PathHeader with the given $name.
-   * @param string $name
-   */
-  public function __construct($name)
-  {
-    $this->setFieldName($name);
-    $this->initializeGrammar();
-  }
-  
-  /**
-   * Get the type of Header that this instance represents.
-   * @return int
-   * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
-   * @see TYPE_DATE, TYPE_ID, TYPE_PATH
-   */
-  public function getFieldType()
-  {
-    return self::TYPE_PATH;
-  }
-  
-  /**
-   * Set the model for the field body.
-   * This method takes a string for an address.
-   * @param string $model
-   * @throws Swift_RfcComplianceException
-   */
-  public function setFieldBodyModel($model)
-  {
-    $this->setAddress($model);
-  }
-  
-  /**
-   * Get the model for the field body.
-   * This method returns a string email address.
-   * @return mixed
-   */
-  public function getFieldBodyModel()
-  {
-    return $this->getAddress();
-  }
-  
-  /**
-   * Set the Address which should appear in this Header.
-   * @param string $address
-   * @throws Swift_RfcComplianceException
-   */
-  public function setAddress($address)
-  {
-    if (is_null($address))
-    {
-      $this->_address = null;
-    }
-    elseif ('' == $address
-      || preg_match('/^' . $this->getGrammar('addr-spec') . '$/D', $address))
-    {
-      $this->_address = $address;
-    }
-    else
-    {
-      throw new Swift_RfcComplianceException(
-        'Address set in PathHeader does not comply with addr-spec of RFC 2822.'
-        );
-    }
-    $this->setCachedValue(null);
-  }
-  
-  /**
-   * Get the address which is used in this Header (if any).
-   * Null is returned if no address is set.
-   * @return string
-   */
-  public function getAddress()
-  {
-    return $this->_address;
-  }
-  
-  /**
-   * Get the string value of the body in this Header.
-   * This is not necessarily RFC 2822 compliant since folding white space will
-   * not be added at this stage (see {@link toString()} for that).
-   * @return string
-   * @see toString()
-   */
-  public function getFieldBody()
-  {
-    if (!$this->getCachedValue())
-    {
-      if (isset($this->_address))
-      {
-        $this->setCachedValue('<' . $this->_address . '>');
-      }
-    }
-    return $this->getCachedValue();
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/UnstructuredHeader.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/UnstructuredHeader.php
deleted file mode 100644
index fdcc21ed1..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Headers/UnstructuredHeader.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/Headers/AbstractHeader.php';
-//@require 'Swift/Mime/HeaderEncoder.php';
-
-/**
- * A Simple MIME Header.
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-class Swift_Mime_Headers_UnstructuredHeader
-  extends Swift_Mime_Headers_AbstractHeader
-{
-  
-  /**
-   * The value of this Header.
-   * @var string
-   * @access private
-   */
-  private $_value;
-  
-  /**
-   * Creates a new SimpleHeader with $name.
-   * @param string $name
-   * @param Swift_Mime_HeaderEncoder $encoder
-   */
-  public function __construct($name, Swift_Mime_HeaderEncoder $encoder)
-  {
-    $this->setFieldName($name);
-    $this->setEncoder($encoder);
-  }
-  /**
-   * Get the type of Header that this instance represents.
-   * @return int
-   * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
-   * @see TYPE_DATE, TYPE_ID, TYPE_PATH
-   */
-  public function getFieldType()
-  {
-    return self::TYPE_TEXT;
-  }
-  
-  /**
-   * Set the model for the field body.
-   * This method takes a string for the field value.
-   * @param string $model
-   */
-  public function setFieldBodyModel($model)
-  {
-    $this->setValue($model);
-  }
-  
-  /**
-   * Get the model for the field body.
-   * This method returns a string.
-   * @return string
-   */
-  public function getFieldBodyModel()
-  {
-    return $this->getValue();
-  }
-  
-  /**
-   * Get the (unencoded) value of this header.
-   * @return string
-   */
-  public function getValue()
-  {
-    return $this->_value;
-  }
-  
-  /**
-   * Set the (unencoded) value of this header.
-   * @param string $value
-   */
-  public function setValue($value)
-  {
-    $this->clearCachedValueIf($this->_value != $value);
-    $this->_value = $value;
-  }
-  
-  /**
-   * Get the value of this header prepared for rendering.
-   * @return string
-   */
-  public function getFieldBody()
-  {
-    if (!$this->getCachedValue())
-    {
-      $this->setCachedValue(
-        str_replace('\\', '\\\\', $this->encodeWords(
-          $this, $this->_value, -1, $this->getCharset(), $this->getEncoder()
-          ))
-        );
-    }
-    return $this->getCachedValue();
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Message.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Message.php
deleted file mode 100644
index 0496c0877..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/Message.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/MimeEntity.php';
-
-/**
- * A Message (RFC 2822) object.
- * 
- * @package Swift
- * @subpackage Mime
- * 
- * @author Chris Corbyn
- */
-interface Swift_Mime_Message extends Swift_Mime_MimeEntity
-{
-  
-  /**
-   * Generates a valid Message-ID and switches to it.
-   * 
-   * @return string
-   */
-  public function generateId();
-  
-  /**
-   * Set the subject of the message.
-   * 
-   * @param string $subject
-   */
-  public function setSubject($subject);
-  
-  /**
-   * Get the subject of the message.
-   * 
-   * @return string
-   */
-  public function getSubject();
-  
-  /**
-   * Set the origination date of the message as a UNIX timestamp.
-   * 
-   * @param int $date
-   */
-  public function setDate($date);
-  
-  /**
-   * Get the origination date of the message as a UNIX timestamp.
-   * 
-   * @return int
-   */
-  public function getDate();
-  
-  /**
-   * Set the return-path (bounce-detect) address.
-   * 
-   * @param string $address
-   */
-  public function setReturnPath($address);
-  
-  /**
-   * Get the return-path (bounce-detect) address.
-   * 
-   * @return string
-   */
-  public function getReturnPath();
-  
-  /**
-   * Set the sender of this message.
-   * 
-   * If multiple addresses are present in the From field, this SHOULD be set.
-   * 
-   * According to RFC 2822 it is a requirement when there are multiple From
-   * addresses, but Swift itself does not require it directly.
-   * 
-   * An associative array (with one element!) can be used to provide a display-
-   * name: i.e. array('email@address' => 'Real Name').
-   * 
-   * If the second parameter is provided and the first is a string, then $name
-   * is associated with the address.
-   * 
-   * @param mixed $address
-   * @param string $name optional
-   */
-  public function setSender($address, $name = null);
-  
-  /**
-   * Get the sender address for this message.
-   * 
-   * This has a higher significance than the From address.
-   * 
-   * @return string
-   */
-  public function getSender();
-  
-  /**
-   * Set the From address of this message.
-   * 
-   * It is permissible for multiple From addresses to be set using an array.
-   * 
-   * If multiple From addresses are used, you SHOULD set the Sender address and
-   * according to RFC 2822, MUST set the sender address.
-   * 
-   * An array can be used if display names are to be provided: i.e.
-   * array('email@address.com' => 'Real Name').
-   * 
-   * If the second parameter is provided and the first is a string, then $name
-   * is associated with the address.
-   *
-   * @param mixed $addresses
-   * @param string $name optional
-   */
-  public function setFrom($addresses, $name = null);
-  
-  /**
-   * Get the From address(es) of this message.
-   * 
-   * This method always returns an associative array where the keys are the
-   * addresses.
-   * 
-   * @return string[]
-   */
-  public function getFrom();
-  
-  /**
-   * Set the Reply-To address(es).
-   * 
-   * Any replies from the receiver will be sent to this address.
-   * 
-   * It is permissible for multiple reply-to addresses to be set using an array.
-   * 
-   * This method has the same synopsis as {@link setFrom()} and {@link setTo()}.
-   * 
-   * If the second parameter is provided and the first is a string, then $name
-   * is associated with the address.
-   * 
-   * @param mixed $addresses
-   * @param string $name optional
-   */
-  public function setReplyTo($addresses, $name = null);
-  
-  /**
-   * Get the Reply-To addresses for this message.
-   * 
-   * This method always returns an associative array where the keys provide the
-   * email addresses.
-   * 
-   * @return string[]
-   */
-  public function getReplyTo();
-  
-  /**
-   * Set the To address(es).
-   * 
-   * Recipients set in this field will receive a copy of this message.
-   * 
-   * This method has the same synopsis as {@link setFrom()} and {@link setCc()}.
-   * 
-   * If the second parameter is provided and the first is a string, then $name
-   * is associated with the address.
-   * 
-   * @param mixed $addresses
-   * @param string $name optional
-   */
-  public function setTo($addresses, $name = null);
-  
-  /**
-   * Get the To addresses for this message.
-   * 
-   * This method always returns an associative array, whereby the keys provide
-   * the actual email addresses.
-   * 
-   * @return string[]
-   */
-  public function getTo();
-  
-  /**
-   * Set the Cc address(es).
-   * 
-   * Recipients set in this field will receive a 'carbon-copy' of this message.
-   * 
-   * This method has the same synopsis as {@link setFrom()} and {@link setTo()}.
-   * 
-   * @param mixed $addresses
-   * @param string $name optional
-   */
-  public function setCc($addresses, $name = null);
-  
-  /**
-   * Get the Cc addresses for this message.
-   * 
-   * This method always returns an associative array, whereby the keys provide
-   * the actual email addresses.
-   * 
-   * @return string[]
-   */
-  public function getCc();
-  
-  /**
-   * Set the Bcc address(es).
-   * 
-   * Recipients set in this field will receive a 'blind-carbon-copy' of this
-   * message.
-   * 
-   * In other words, they will get the message, but any other recipients of the
-   * message will have no such knowledge of their receipt of it.
-   * 
-   * This method has the same synopsis as {@link setFrom()} and {@link setTo()}.
-   * 
-   * @param mixed $addresses
-   * @param string $name optional
-   */
-  public function setBcc($addresses, $name = null);
-  
-  /**
-   * Get the Bcc addresses for this message.
-   * 
-   * This method always returns an associative array, whereby the keys provide
-   * the actual email addresses.
-   * 
-   * @return string[]
-   */
-  public function getBcc();
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/MimeEntity.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/MimeEntity.php
deleted file mode 100644
index 2b08009d9..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/MimeEntity.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/InputByteStream.php';
-//@require 'Swift/Mime/EncodingObserver.php';
-//@require 'Swift/Mime/CharsetObserver.php';
-
-/**
- * A MIME entity, such as an attachment.
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-interface Swift_Mime_MimeEntity
-  extends Swift_Mime_CharsetObserver, Swift_Mime_EncodingObserver
-{
-  
-  /** Main message document; there can only be one of these */
-  const LEVEL_TOP = 16;
-  
-  /** An entity which nests with the same precedence as an attachment */
-  const LEVEL_MIXED = 256;
-  
-  /** An entity which nests with the same precedence as a mime part */
-  const LEVEL_ALTERNATIVE = 4096;
-  
-  /** An entity which nests with the same precedence as embedded content */
-  const LEVEL_RELATED = 65536;
-  
-  /**
-   * Get the level at which this entity shall be nested in final document.
-   * The lower the value, the more outermost the entity will be nested.
-   * @return int
-   * @see LEVEL_TOP, LEVEL_MIXED, LEVEL_RELATED, LEVEL_ALTERNATIVE
-   */
-  public function getNestingLevel();
-  
-  /**
-   * Get the qualified content-type of this mime entity.
-   * @return string
-   */
-  public function getContentType();
-  
-  /**
-   * Returns a unique ID for this entity.
-   * For most entities this will likely be the Content-ID, though it has
-   * no explicit semantic meaning and can be considered an identifier for
-   * programming logic purposes.
-   * If a Content-ID header is present, this value SHOULD match the value of
-   * the header.
-   * @return string
-   */
-  public function getId();
-  
-  /**
-   * Get all children nested inside this entity.
-   * These are not just the immediate children, but all children.
-   * @return Swift_Mime_MimeEntity[]
-   */
-  public function getChildren();
-  
-  /**
-   * Set all children nested inside this entity.
-   * This includes grandchildren.
-   * @param Swift_Mime_MimeEntity[] $children
-   */
-  public function setChildren(array $children);
-  
-  /**
-   * Get the collection of Headers in this Mime entity.
-   * @return Swift_Mime_Header[]
-   */
-  public function getHeaders();
-  
-  /**
-   * Get the body content of this entity as a string.
-   * Returns NULL if no body has been set.
-   * @return string
-   */
-  public function getBody();
-  
-  /**
-   * Set the body content of this entity as a string.
-   * @param string $body
-   * @param string $contentType optional
-   */
-  public function setBody($body, $contentType = null);
-  
-  /**
-   * Get this entire entity in its string form.
-   * @return string
-   */
-  public function toString();
-  
-  /**
-   * Get this entire entity as a ByteStream.
-   * @param Swift_InputByteStream $is to write to
-   */
-  public function toByteStream(Swift_InputByteStream $is);
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/MimePart.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/MimePart.php
deleted file mode 100644
index 78c6fe09f..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/MimePart.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/SimpleMimeEntity.php';
-//@require 'Swift/Mime/ContentEncoder.php';
-//@require 'Swift/Mime/HeaderSet.php';
-//@require 'Swift/KeyCache.php';
-
-/**
- * A MIME part, in a multipart message.
- * 
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
-{
-  
-  /** The format parameter last specified by the user */
-  protected $_userFormat;
-  
-  /** The charset last specified by the user */
-  protected $_userCharset;
-  
-  /** The delsp parameter last specified by the user */
-  protected $_userDelSp;
-  
-  /** The nesting level of this MimePart */
-  private $_nestingLevel = self::LEVEL_ALTERNATIVE;
-  
-  /**
-   * Create a new MimePart with $headers, $encoder and $cache.
-   * 
-   * @param Swift_Mime_HeaderSet $headers
-   * @param Swift_Mime_ContentEncoder $encoder
-   * @param Swift_KeyCache $cache
-   * @param string $charset
-   */
-  public function __construct(Swift_Mime_HeaderSet $headers,
-    Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, $charset = null)
-  {
-    parent::__construct($headers, $encoder, $cache);
-    $this->setContentType('text/plain');
-    if (!is_null($charset))
-    {
-      $this->setCharset($charset);
-    }
-  }
-  
-  /**
-   * Set the body of this entity, either as a string, or as an instance of
-   * {@link Swift_OutputByteStream}.
-   * 
-   * @param mixed $body
-   * @param string $contentType optional
-   * @param string $charset optional
-   */
-  public function setBody($body, $contentType = null, $charset = null)
-  {
-    parent::setBody($body, $contentType);
-    if (isset($charset))
-    {
-      $this->setCharset($charset);
-    }
-    return $this;
-  }
-  
-  /**
-   * Get the character set of this entity.
-   * 
-   * @return string
-   */
-  public function getCharset()
-  {
-    return $this->_getHeaderParameter('Content-Type', 'charset');
-  }
-  
-  /**
-   * Set the character set of this entity.
-   * 
-   * @param string $charset
-   */
-  public function setCharset($charset)
-  {
-    $this->_setHeaderParameter('Content-Type', 'charset', $charset);
-    if ($charset !== $this->_userCharset)
-    {
-      $this->_clearCache();
-    }
-    $this->_userCharset = $charset;
-    parent::charsetChanged($charset);
-    return $this;
-  }
-  
-  /**
-   * Get the format of this entity (i.e. flowed or fixed).
-   * 
-   * @return string
-   */
-  public function getFormat()
-  {
-    return $this->_getHeaderParameter('Content-Type', 'format');
-  }
-  
-  /**
-   * Set the format of this entity (flowed or fixed).
-   * 
-   * @param string $format
-   */
-  public function setFormat($format)
-  {
-    $this->_setHeaderParameter('Content-Type', 'format', $format);
-    $this->_userFormat = $format;
-    return $this;
-  }
-  
-  /**
-   * Test if delsp is being used for this entity.
-   * 
-   * @return boolean
-   */
-  public function getDelSp()
-  {
-    return ($this->_getHeaderParameter('Content-Type', 'delsp') == 'yes')
-      ? true
-      : false;
-  }
-  
-  /**
-   * Turn delsp on or off for this entity.
-   * 
-   * @param boolean $delsp
-   */
-  public function setDelSp($delsp = true)
-  {
-    $this->_setHeaderParameter('Content-Type', 'delsp', $delsp ? 'yes' : null);
-    $this->_userDelSp = $delsp;
-    return $this;
-  }
-  
-  /**
-   * Get the nesting level of this entity.
-   * 
-   * @return int
-   * @see LEVEL_TOP, LEVEL_ALTERNATIVE, LEVEL_MIXED, LEVEL_RELATED
-   */
-  public function getNestingLevel()
-  {
-    return $this->_nestingLevel;
-  }
-  
-  /**
-   * Receive notification that the charset has changed on this document, or a
-   * parent document.
-   * 
-   * @param string $charset
-   */
-  public function charsetChanged($charset)
-  {
-    $this->setCharset($charset);
-  }
-  
-  // -- Protected methods
-  
-  /** Fix the content-type and encoding of this entity */
-  protected function _fixHeaders()
-  {
-    parent::_fixHeaders();
-    if (count($this->getChildren()))
-    {
-      $this->_setHeaderParameter('Content-Type', 'charset', null);
-      $this->_setHeaderParameter('Content-Type', 'format', null);
-      $this->_setHeaderParameter('Content-Type', 'delsp', null);
-    }
-    else
-    {
-      $this->setCharset($this->_userCharset);
-      $this->setFormat($this->_userFormat);
-      $this->setDelSp($this->_userDelSp);
-    }
-  }
-  
-  /** Set the nesting level of this entity */
-  protected function _setNestingLevel($level)
-  {
-    $this->_nestingLevel = $level;
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/SimpleHeaderFactory.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/SimpleHeaderFactory.php
deleted file mode 100644
index 6954ac5c0..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/SimpleHeaderFactory.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/HeaderFactory.php';
-//@require 'Swift/Mime/HeaderEncoder.php';
-//@require 'Swift/Encoder.php';
-//@require 'Swift/Mime/Headers/MailboxHeader.php';
-//@require 'Swift/Mime/Headers/DateHeader.php';
-//@require 'Swift/Mime/Headers/UnstructuredHeader.php';
-//@require 'Swift/Mime/Headers/ParameterizedHeader.php';
-//@require 'Swift/Mime/Headers/IdentificationHeader.php';
-//@require 'Swift/Mime/Headers/PathHeader.php';
-
-/**
- * Creates MIME headers.
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_HeaderFactory
-{
-
-  /** The HeaderEncoder used by these headers */
-  private $_encoder;
-  
-  /** The Encoder used by parameters */
-  private $_paramEncoder;
-  
-  /** The charset of created Headers */
-  private $_charset;
-  
-  /**
-   * Creates a new SimpleHeaderFactory using $encoder and $paramEncoder.
-   * @param Swift_Mime_HeaderEncoder $encoder
-   * @param Swift_Encoder $paramEncoder
-   * @param string $charset
-   */
-  public function __construct(Swift_Mime_HeaderEncoder $encoder,
-    Swift_Encoder $paramEncoder, $charset = null)
-  {
-    $this->_encoder = $encoder;
-    $this->_paramEncoder = $paramEncoder;
-    $this->_charset = $charset;
-  }
-  
-  /**
-   * Create a new Mailbox Header with a list of $addresses.
-   * @param string $name
-   * @param array|string $addresses
-   * @return Swift_Mime_Header
-   */
-  public function createMailboxHeader($name, $addresses = null)
-  {
-    $header = new Swift_Mime_Headers_MailboxHeader($name, $this->_encoder);
-    if (isset($addresses))
-    {
-      $header->setFieldBodyModel($addresses);
-    }
-    $this->_setHeaderCharset($header);
-    return $header;
-  }
-  
-  /**
-   * Create a new Date header using $timestamp (UNIX time).
-   * @param string $name
-   * @param int $timestamp
-   * @return Swift_Mime_Header
-   */
-  public function createDateHeader($name, $timestamp = null)
-  {
-    $header = new Swift_Mime_Headers_DateHeader($name);
-    if (isset($timestamp))
-    {
-      $header->setFieldBodyModel($timestamp);
-    }
-    $this->_setHeaderCharset($header);
-    return $header;
-  }
-  
-  /**
-   * Create a new basic text header with $name and $value.
-   * @param string $name
-   * @param string $value
-   * @return Swift_Mime_Header
-   */
-  public function createTextHeader($name, $value = null)
-  {
-    $header = new Swift_Mime_Headers_UnstructuredHeader($name, $this->_encoder);
-    if (isset($value))
-    {
-      $header->setFieldBodyModel($value);
-    }
-    $this->_setHeaderCharset($header);
-    return $header;
-  }
-  
-  /**
-   * Create a new ParameterizedHeader with $name, $value and $params.
-   * @param string $name
-   * @param string $value
-   * @param array $params
-   * @return Swift_Mime_ParameterizedHeader
-   */
-  public function createParameterizedHeader($name, $value = null,
-    $params = array())
-  {
-    $header = new Swift_Mime_Headers_ParameterizedHeader($name,
-      $this->_encoder, (strtolower($name) == 'content-disposition')
-        ? $this->_paramEncoder
-        : null
-      );
-    if (isset($value))
-    {
-      $header->setFieldBodyModel($value);
-    }
-    foreach ($params as $k => $v)
-    {
-      $header->setParameter($k, $v);
-    }
-    $this->_setHeaderCharset($header);
-    return $header;
-  }
-  
-  /**
-   * Create a new ID header for Message-ID or Content-ID.
-   * @param string $name
-   * @param string|array $ids
-   * @return Swift_Mime_Header
-   */
-  public function createIdHeader($name, $ids = null)
-  {
-    $header = new Swift_Mime_Headers_IdentificationHeader($name);
-    if (isset($ids))
-    {
-      $header->setFieldBodyModel($ids);
-    }
-    $this->_setHeaderCharset($header);
-    return $header;
-  }
-  
-  /**
-   * Create a new Path header with an address (path) in it.
-   * @param string $name
-   * @param string $path
-   * @return Swift_Mime_Header
-   */
-  public function createPathHeader($name, $path = null)
-  {
-    $header = new Swift_Mime_Headers_PathHeader($name);
-    if (isset($path))
-    {
-      $header->setFieldBodyModel($path);
-    }
-    $this->_setHeaderCharset($header);
-    return $header;
-  }
-  
-  /**
-   * Notify this observer that the entity's charset has changed.
-   * @param string $charset
-   */
-  public function charsetChanged($charset)
-  {
-    $this->_charset = $charset;
-    $this->_encoder->charsetChanged($charset);
-    $this->_paramEncoder->charsetChanged($charset);
-  }
-  
-  // -- Private methods
-  
-  /** Apply the charset to the Header */
-  private function _setHeaderCharset(Swift_Mime_Header $header)
-  {
-    if (isset($this->_charset))
-    {
-      $header->setCharset($this->_charset);
-    }
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/SimpleHeaderSet.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/SimpleHeaderSet.php
deleted file mode 100644
index eeb0221bb..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/SimpleHeaderSet.php
+++ /dev/null
@@ -1,396 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/HeaderSet.php';
-//@require 'Swift/Mime/HeaderFactory.php';
-
-/**
- * A collection of MIME headers.
- * 
- * @package Swift
- * @subpackage Mime
- * 
- * @author Chris Corbyn
- */
-class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
-{
-  
-  /** HeaderFactory */
-  private $_factory;
-  
-  /** Collection of set Headers */
-  private $_headers = array();
-  
-  /** Field ordering details */
-  private $_order = array();
-  
-  /** List of fields which are required to be displayed */
-  private $_required = array();
-  
-  /** The charset used by Headers */
-  private $_charset;
-  
-  /**
-   * Create a new SimpleHeaderSet with the given $factory.
-   * 
-   * @param Swift_Mime_HeaderFactory $factory
-   * @param string $charset
-   */
-  public function __construct(Swift_Mime_HeaderFactory $factory,
-    $charset = null)
-  {
-    $this->_factory = $factory;
-    if (isset($charset))
-    {
-      $this->setCharset($charset);
-    }
-  }
-  
-  /**
-   * Set the charset used by these headers.
-   * 
-   * @param string $charset
-   */
-  public function setCharset($charset)
-  {
-    $this->_charset = $charset;
-    $this->_factory->charsetChanged($charset);
-    $this->_notifyHeadersOfCharset($charset);
-  }
-  
-  /**
-   * Add a new Mailbox Header with a list of $addresses.
-   * 
-   * @param string $name
-   * @param array|string $addresses
-   */
-  public function addMailboxHeader($name, $addresses = null)
-  {
-    $this->_storeHeader($name,
-      $this->_factory->createMailboxHeader($name, $addresses));
-  }
-  
-  /**
-   * Add a new Date header using $timestamp (UNIX time).
-   * 
-   * @param string $name
-   * @param int $timestamp
-   */
-  public function addDateHeader($name, $timestamp = null)
-  {
-    $this->_storeHeader($name,
-      $this->_factory->createDateHeader($name, $timestamp));
-  }
-  
-  /**
-   * Add a new basic text header with $name and $value.
-   * 
-   * @param string $name
-   * @param string $value
-   */
-  public function addTextHeader($name, $value = null)
-  {
-    $this->_storeHeader($name,
-      $this->_factory->createTextHeader($name, $value));
-  }
-  
-  /**
-   * Add a new ParameterizedHeader with $name, $value and $params.
-   * 
-   * @param string $name
-   * @param string $value
-   * @param array $params
-   */
-  public function addParameterizedHeader($name, $value = null,
-    $params = array())
-  {
-    $this->_storeHeader($name,
-      $this->_factory->createParameterizedHeader($name, $value,
-      $params));
-  }
-  
-  /**
-   * Add a new ID header for Message-ID or Content-ID.
-   * 
-   * @param string $name
-   * @param string|array $ids
-   */
-  public function addIdHeader($name, $ids = null)
-  {
-    $this->_storeHeader($name, $this->_factory->createIdHeader($name, $ids));
-  }
-  
-  /**
-   * Add a new Path header with an address (path) in it.
-   * 
-   * @param string $name
-   * @param string $path
-   */
-  public function addPathHeader($name, $path = null)
-  {
-    $this->_storeHeader($name, $this->_factory->createPathHeader($name, $path));
-  }
-  
-  /**
-   * Returns true if at least one header with the given $name exists.
-   * 
-   * If multiple headers match, the actual one may be specified by $index.
-   * 
-   * @param string $name
-   * @param int $index
-   * 
-   * @return boolean
-   */
-  public function has($name, $index = 0)
-  {
-    $lowerName = strtolower($name);
-    return array_key_exists($lowerName, $this->_headers)
-      && array_key_exists($index, $this->_headers[$lowerName]);
-  }
-  
-  /**
-   * Set a header in the HeaderSet.
-   * 
-   * The header may be a previously fetched header via {@link get()} or it may
-   * be one that has been created separately.
-   * 
-   * If $index is specified, the header will be inserted into the set at this
-   * offset.
-   * 
-   * @param Swift_Mime_Header $header
-   * @param int $index
-   */
-  public function set(Swift_Mime_Header $header, $index = 0)
-  {
-    $this->_storeHeader($header->getFieldName(), $header, $index);
-  }
-  
-  /**
-   * Get the header with the given $name.
-   * 
-   * If multiple headers match, the actual one may be specified by $index.
-   * Returns NULL if none present.
-   * 
-   * @param string $name
-   * @param int $index
-   * 
-   * @return Swift_Mime_Header
-   */
-  public function get($name, $index = 0)
-  {
-    if ($this->has($name, $index))
-    {
-      $lowerName = strtolower($name);
-      return $this->_headers[$lowerName][$index];
-    }
-  }
-  
-  /**
-   * Get all headers with the given $name.
-   * 
-   * @param string $name
-   * 
-   * @return array
-   */
-  public function getAll($name = null)
-  {
-    if (!isset($name))
-    {
-      $headers = array();
-      foreach ($this->_headers as $collection)
-      {
-        $headers = array_merge($headers, $collection);
-      }
-      return $headers;
-    }
-    
-    $lowerName = strtolower($name);
-    if (!array_key_exists($lowerName, $this->_headers))
-    {
-      return array();
-    }
-    return $this->_headers[$lowerName];
-  }
-  
-  /**
-   * Remove the header with the given $name if it's set.
-   * 
-   * If multiple headers match, the actual one may be specified by $index.
-   * 
-   * @param string $name
-   * @param int $index
-   */
-  public function remove($name, $index = 0)
-  {
-    $lowerName = strtolower($name);
-    unset($this->_headers[$lowerName][$index]);
-  }
-  
-  /**
-   * Remove all headers with the given $name.
-   * 
-   * @param string $name
-   */
-  public function removeAll($name)
-  {
-    $lowerName = strtolower($name);
-    unset($this->_headers[$lowerName]);
-  }
-  
-  /**
-   * Create a new instance of this HeaderSet.
-   * 
-   * @return Swift_Mime_HeaderSet
-   */
-  public function newInstance()
-  {
-    return new self($this->_factory);
-  }
-  
-  /**
-   * Define a list of Header names as an array in the correct order.
-   * 
-   * These Headers will be output in the given order where present.
-   * 
-   * @param array $sequence
-   */
-  public function defineOrdering(array $sequence)
-  {
-    $this->_order = array_flip(array_map('strtolower', $sequence));
-  }
-  
-  /**
-   * Set a list of header names which must always be displayed when set.
-   * 
-   * Usually headers without a field value won't be output unless set here.
-   * 
-   * @param array $names
-   */
-  public function setAlwaysDisplayed(array $names)
-  {
-    $this->_required = array_flip(array_map('strtolower', $names));
-  }
-
-  /**
-   * Notify this observer that the entity's charset has changed.
-   * 
-   * @param string $charset
-   */
-  public function charsetChanged($charset)
-  {
-    $this->setCharset($charset);
-  }
-  
-  /**
-   * Returns a string with a representation of all headers.
-   * 
-   * @return string
-   */
-  public function toString()
-  {
-    $string = '';
-    $headers = $this->_headers;
-    if ($this->_canSort())
-    {
-      uksort($headers, array($this, '_sortHeaders'));
-    }
-    foreach ($headers as $collection)
-    {
-      foreach ($collection as $header)
-      {
-        if ($this->_isDisplayed($header) || $header->getFieldBody() != '')
-        {
-          $string .= $header->toString();
-        }
-      }
-    }
-    return $string;
-  }
-  
-  /**
-   * Returns a string representation of this object.
-   *
-   * @return string
-   *
-   * @see toString()
-   */
-  public function __toString()
-  {
-    return $this->toString();
-  }
-  
-  // -- Private methods
-  
-  /** Save a Header to the internal collection */
-  private function _storeHeader($name, Swift_Mime_Header $header, $offset = null)
-  {
-    if (!isset($this->_headers[strtolower($name)]))
-    {
-      $this->_headers[strtolower($name)] = array();
-    }
-    if (!isset($offset))
-    {
-      $this->_headers[strtolower($name)][] = $header;
-    }
-    else
-    {
-      $this->_headers[strtolower($name)][$offset] = $header;
-    }
-  }
-  
-  /** Test if the headers can be sorted */
-  private function _canSort()
-  {
-    return count($this->_order) > 0;
-  }
-  
-  /** uksort() algorithm for Header ordering */
-  private function _sortHeaders($a, $b)
-  {
-    $lowerA = strtolower($a);
-    $lowerB = strtolower($b);
-    $aPos = array_key_exists($lowerA, $this->_order)
-      ? $this->_order[$lowerA]
-      : -1;
-    $bPos = array_key_exists($lowerB, $this->_order)
-      ? $this->_order[$lowerB]
-      : -1;
-      
-    if ($aPos == -1)
-    {
-      return 1;
-    }
-    elseif ($bPos == -1)
-    {
-      return -1;
-    }
-    
-    return ($aPos < $bPos) ? -1 : 1;
-  }
-  
-  /** Test if the given Header is always displayed */
-  private function _isDisplayed(Swift_Mime_Header $header)
-  {
-    return array_key_exists(strtolower($header->getFieldName()), $this->_required);
-  }
-  
-  /** Notify all Headers of the new charset */
-  private function _notifyHeadersOfCharset($charset)
-  {
-    foreach ($this->_headers as $headerGroup)
-    {
-      foreach ($headerGroup as $header)
-      {
-        $header->setCharset($charset);
-      }
-    }
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/SimpleMessage.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/SimpleMessage.php
deleted file mode 100644
index bbe1e8fc5..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/SimpleMessage.php
+++ /dev/null
@@ -1,609 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/Message.php';
-//@require 'Swift/Mime/MimePart.php';
-//@require 'Swift/Mime/MimeEntity.php';
-//@require 'Swift/Mime/HeaderSet.php';
-//@require 'Swift/Mime/ContentEncoder.php';
-
-/**
- * The default email message class.
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
-  implements Swift_Mime_Message
-{
-  
-  /**
-   * Create a new SimpleMessage with $headers, $encoder and $cache.
-   * @param Swift_Mime_HeaderSet $headers
-   * @param Swift_Mime_ContentEncoder $encoder
-   * @param Swift_KeyCache $cache
-   * @param string $charset
-   */
-  public function __construct(Swift_Mime_HeaderSet $headers,
-    Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, $charset = null)
-  {
-    parent::__construct($headers, $encoder, $cache, $charset);
-    $this->getHeaders()->defineOrdering(array(
-      'Return-Path',
-      'Sender',
-      'Message-ID',
-      'Date',
-      'Subject',
-      'From',
-      'Reply-To',
-      'To',
-      'Cc',
-      'Bcc',
-      'MIME-Version',
-      'Content-Type',
-      'Content-Transfer-Encoding'
-      ));
-    $this->getHeaders()->setAlwaysDisplayed(
-      array('Date', 'Message-ID', 'From')
-      );
-    $this->getHeaders()->addTextHeader('MIME-Version', '1.0');
-    $this->setDate(time());
-    $this->setId($this->getId());
-    $this->getHeaders()->addMailboxHeader('From');
-  }
-  
-  /**
-   * Always returns {@link LEVEL_TOP} for a message instance.
-   * @return int
-   */
-  public function getNestingLevel()
-  {
-    return self::LEVEL_TOP;
-  }
-  
-  /**
-   * Set the subject of this message.
-   * @param string $subject
-   */
-  public function setSubject($subject)
-  {
-    if (!$this->_setHeaderFieldModel('Subject', $subject))
-    {
-      $this->getHeaders()->addTextHeader('Subject', $subject);
-    }
-    return $this;
-  }
-  
-  /**
-   * Get the subject of this message.
-   * @return string
-   */
-  public function getSubject()
-  {
-    return $this->_getHeaderFieldModel('Subject');
-  }
-  
-  /**
-   * Set the date at which this message was created.
-   * @param int $date
-   */
-  public function setDate($date)
-  {
-    if (!$this->_setHeaderFieldModel('Date', $date))
-    {
-      $this->getHeaders()->addDateHeader('Date', $date);
-    }
-    return $this;
-  }
-  
-  /**
-   * Get the date at which this message was created.
-   * @return int
-   */
-  public function getDate()
-  {
-    return $this->_getHeaderFieldModel('Date');
-  }
-  
-  /**
-   * Set the return-path (the bounce address) of this message.
-   * @param string $address
-   */
-  public function setReturnPath($address)
-  {
-    if (!$this->_setHeaderFieldModel('Return-Path', $address))
-    {
-      $this->getHeaders()->addPathHeader('Return-Path', $address);
-    }
-    return $this;
-  }
-  
-  /**
-   * Get the return-path (bounce address) of this message.
-   * @return string
-   */
-  public function getReturnPath()
-  {
-    return $this->_getHeaderFieldModel('Return-Path');
-  }
-  
-  /**
-   * Set the sender of this message.
-   * This does not override the From field, but it has a higher significance.
-   * @param string $sender
-   * @param string $name optional
-   */
-  public function setSender($address, $name = null)
-  {
-    if (!is_array($address) && isset($name))
-    {
-      $address = array($address => $name);
-    }
-    
-    if (!$this->_setHeaderFieldModel('Sender', (array) $address))
-    {
-      $this->getHeaders()->addMailboxHeader('Sender', (array) $address);
-    }
-    return $this;
-  }
-  
-  /**
-   * Get the sender of this message.
-   * @return string
-   */
-  public function getSender()
-  {
-    return $this->_getHeaderFieldModel('Sender');
-  }
-  
-  /**
-   * Add a From: address to this message.
-   * 
-   * If $name is passed this name will be associated with the address.
-   * 
-   * @param string $address
-   * @param string $name optional
-   */
-  public function addFrom($address, $name = null)
-  {
-    $current = $this->getFrom();
-    $current[$address] = $name;
-    return $this->setFrom($current);
-  }
-  
-  /**
-   * Set the from address of this message.
-   * 
-   * You may pass an array of addresses if this message is from multiple people.
-   * 
-   * If $name is passed and the first parameter is a string, this name will be
-   * associated with the address.
-   * 
-   * @param string $addresses
-   * @param string $name optional
-   */
-  public function setFrom($addresses, $name = null)
-  {
-    if (!is_array($addresses) && isset($name))
-    {
-      $addresses = array($addresses => $name);
-    }
-    
-    if (!$this->_setHeaderFieldModel('From', (array) $addresses))
-    {
-      $this->getHeaders()->addMailboxHeader('From', (array) $addresses);
-    }
-    return $this;
-  }
-  
-  /**
-   * Get the from address of this message.
-   * 
-   * @return string
-   */
-  public function getFrom()
-  {
-    return $this->_getHeaderFieldModel('From');
-  }
-  
-  /**
-   * Add a Reply-To: address to this message.
-   * 
-   * If $name is passed this name will be associated with the address.
-   * 
-   * @param string $address
-   * @param string $name optional
-   */
-  public function addReplyTo($address, $name = null)
-  {
-    $current = $this->getReplyTo();
-    $current[$address] = $name;
-    return $this->setReplyTo($current);
-  }
-  
-  /**
-   * Set the reply-to address of this message.
-   * 
-   * You may pass an array of addresses if replies will go to multiple people.
-   * 
-   * If $name is passed and the first parameter is a string, this name will be
-   * associated with the address.
-   *
-   * @param string $addresses
-   * @param string $name optional
-   */
-  public function setReplyTo($addresses, $name = null)
-  {
-    if (!is_array($addresses) && isset($name))
-    {
-      $addresses = array($addresses => $name);
-    }
-    
-    if (!$this->_setHeaderFieldModel('Reply-To', (array) $addresses))
-    {
-      $this->getHeaders()->addMailboxHeader('Reply-To', (array) $addresses);
-    }
-    return $this;
-  }
-  
-  /**
-   * Get the reply-to address of this message.
-   * 
-   * @return string
-   */
-  public function getReplyTo()
-  {
-    return $this->_getHeaderFieldModel('Reply-To');
-  }
-  
-  /**
-   * Add a To: address to this message.
-   * 
-   * If $name is passed this name will be associated with the address.
-   * 
-   * @param string $address
-   * @param string $name optional
-   */
-  public function addTo($address, $name = null)
-  {
-    $current = $this->getTo();
-    $current[$address] = $name;
-    return $this->setTo($current);
-  }
-  
-  /**
-   * Set the to addresses of this message.
-   * 
-   * If multiple recipients will receive the message and array should be used.
-   * 
-   * If $name is passed and the first parameter is a string, this name will be
-   * associated with the address.
-   * 
-   * @param array $addresses
-   * @param string $name optional
-   */
-  public function setTo($addresses, $name = null)
-  {
-    if (!is_array($addresses) && isset($name))
-    {
-      $addresses = array($addresses => $name);
-    }
-    
-    if (!$this->_setHeaderFieldModel('To', (array) $addresses))
-    {
-      $this->getHeaders()->addMailboxHeader('To', (array) $addresses);
-    }
-    return $this;
-  }
-  
-  /**
-   * Get the To addresses of this message.
-   * 
-   * @return array
-   */
-  public function getTo()
-  {
-    return $this->_getHeaderFieldModel('To');
-  }
-  
-  /**
-   * Add a Cc: address to this message.
-   * 
-   * If $name is passed this name will be associated with the address.
-   * 
-   * @param string $address
-   * @param string $name optional
-   */
-  public function addCc($address, $name = null)
-  {
-    $current = $this->getCc();
-    $current[$address] = $name;
-    return $this->setCc($current);
-  }
-  
-  /**
-   * Set the Cc addresses of this message.
-   * 
-   * If $name is passed and the first parameter is a string, this name will be
-   * associated with the address.
-   *
-   * @param array $addresses
-   * @param string $name optional
-   */
-  public function setCc($addresses, $name = null)
-  {
-    if (!is_array($addresses) && isset($name))
-    {
-      $addresses = array($addresses => $name);
-    }
-    
-    if (!$this->_setHeaderFieldModel('Cc', (array) $addresses))
-    {
-      $this->getHeaders()->addMailboxHeader('Cc', (array) $addresses);
-    }
-    return $this;
-  }
-  
-  /**
-   * Get the Cc address of this message.
-   * 
-   * @return array
-   */
-  public function getCc()
-  {
-    return $this->_getHeaderFieldModel('Cc');
-  }
-  
-  /**
-   * Add a Bcc: address to this message.
-   * 
-   * If $name is passed this name will be associated with the address.
-   * 
-   * @param string $address
-   * @param string $name optional
-   */
-  public function addBcc($address, $name = null)
-  {
-    $current = $this->getBcc();
-    $current[$address] = $name;
-    return $this->setBcc($current);
-  }
-  
-  /**
-   * Set the Bcc addresses of this message.
-   * 
-   * If $name is passed and the first parameter is a string, this name will be
-   * associated with the address.
-   * 
-   * @param array $addresses
-   * @param string $name optional
-   */
-  public function setBcc($addresses, $name = null)
-  {
-    if (!is_array($addresses) && isset($name))
-    {
-      $addresses = array($addresses => $name);
-    }
-    
-    if (!$this->_setHeaderFieldModel('Bcc', (array) $addresses))
-    {
-      $this->getHeaders()->addMailboxHeader('Bcc', (array) $addresses);
-    }
-    return $this;
-  }
-  
-  /**
-   * Get the Bcc addresses of this message.
-   * 
-   * @return array
-   */
-  public function getBcc()
-  {
-    return $this->_getHeaderFieldModel('Bcc');
-  }
-  
-  /**
-   * Set the priority of this message.
-   * The value is an integer where 1 is the highest priority and 5 is the lowest.
-   * @param int $priority
-   */
-  public function setPriority($priority)
-  {
-    $priorityMap = array(
-      1 => 'Highest',
-      2 => 'High',
-      3 => 'Normal',
-      4 => 'Low',
-      5 => 'Lowest'
-      );
-    $pMapKeys = array_keys($priorityMap);
-    if ($priority > max($pMapKeys))
-    {
-      $priority = max($pMapKeys);
-    }
-    elseif ($priority < min($pMapKeys))
-    {
-      $priority = min($pMapKeys);
-    }
-    if (!$this->_setHeaderFieldModel('X-Priority',
-      sprintf('%d (%s)', $priority, $priorityMap[$priority])))
-    {
-      $this->getHeaders()->addTextHeader('X-Priority',
-        sprintf('%d (%s)', $priority, $priorityMap[$priority]));
-    }
-    return $this;
-  }
-  
-  /**
-   * Get the priority of this message.
-   * The returned value is an integer where 1 is the highest priority and 5
-   * is the lowest.
-   * @return int
-   */
-  public function getPriority()
-  {
-    list($priority) = sscanf($this->_getHeaderFieldModel('X-Priority'),
-      '%[1-5]'
-      );
-    return isset($priority) ? $priority : 3;
-  }
-  
-  /**
-   * Ask for a delivery receipt from the recipient to be sent to $addresses
-   * @param array $addresses
-   */
-  public function setReadReceiptTo($addresses)
-  {
-    if (!$this->_setHeaderFieldModel('Disposition-Notification-To', $addresses))
-    {
-      $this->getHeaders()
-        ->addMailboxHeader('Disposition-Notification-To', $addresses);
-    }
-    return $this;
-  }
-  
-  /**
-   * Get the addresses to which a read-receipt will be sent.
-   * @return string
-   */
-  public function getReadReceiptTo()
-  {
-    return $this->_getHeaderFieldModel('Disposition-Notification-To');
-  }
-  
-  /**
-   * Attach a {@link Swift_Mime_MimeEntity} such as an Attachment or MimePart.
-   * @param Swift_Mime_MimeEntity $entity
-   */
-  public function attach(Swift_Mime_MimeEntity $entity)
-  {
-    $this->setChildren(array_merge($this->getChildren(), array($entity)));
-    return $this;
-  }
-  
-  /**
-   * Remove an already attached entity.
-   * @param Swift_Mime_MimeEntity $entity
-   */
-  public function detach(Swift_Mime_MimeEntity $entity)
-  {
-    $newChildren = array();
-    foreach ($this->getChildren() as $child)
-    {
-      if ($entity !== $child)
-      {
-        $newChildren[] = $child;
-      }
-    }
-    $this->setChildren($newChildren);
-    return $this;
-  }
-  
-  /**
-   * Attach a {@link Swift_Mime_MimeEntity} and return it's CID source.
-   * This method should be used when embedding images or other data in a message.
-   * @param Swift_Mime_MimeEntity $entity
-   * @return string
-   */
-  public function embed(Swift_Mime_MimeEntity $entity)
-  {
-    $this->attach($entity);
-    return 'cid:' . $entity->getId();
-  }
-  
-  /**
-   * Get this message as a complete string.
-   * @return string
-   */
-  public function toString()
-  {
-    if (count($children = $this->getChildren()) > 0 && $this->getBody() != '')
-    {
-      $this->setChildren(array_merge(array($this->_becomeMimePart()), $children));
-      $string = parent::toString();
-      $this->setChildren($children);
-    }
-    else
-    {
-      $string = parent::toString();
-    }
-    return $string;
-  }
-  
-  /**
-   * Returns a string representation of this object.
-   *
-   * @return string
-   *
-   * @see toString()
-   */
-  public function __toString()
-  {
-    return $this->toString();
-  }
-  
-  /**
-   * Write this message to a {@link Swift_InputByteStream}.
-   * @param Swift_InputByteStream $is
-   */
-  public function toByteStream(Swift_InputByteStream $is)
-  {
-    if (count($children = $this->getChildren()) > 0 && $this->getBody() != '')
-    {
-      $this->setChildren(array_merge(array($this->_becomeMimePart()), $children));
-      parent::toByteStream($is);
-      $this->setChildren($children);
-    }
-    else
-    {
-      parent::toByteStream($is);
-    }
-  }
-  
-  // -- Protected methods
-  
-  /** @see Swift_Mime_SimpleMimeEntity::_getIdField() */
-  protected function _getIdField()
-  {
-    return 'Message-ID';
-  }
-  
-  // -- Private methods
-  
-  /** Turn the body of this message into a child of itself if needed */
-  private function _becomeMimePart()
-  {
-    $part = new parent($this->getHeaders()->newInstance(), $this->getEncoder(),
-      $this->_getCache(), $this->_userCharset
-      );
-    $part->setContentType($this->_userContentType);
-    $part->setBody($this->getBody());
-    $part->setFormat($this->_userFormat);
-    $part->setDelSp($this->_userDelSp);
-    $part->_setNestingLevel($this->_getTopNestingLevel());
-    return $part;
-  }
-  
-  /** Get the highest nesting level nested inside this message */
-  private function _getTopNestingLevel()
-  {
-    $highestLevel = $this->getNestingLevel();
-    foreach ($this->getChildren() as $child)
-    {
-      $childLevel = $child->getNestingLevel();
-      if ($highestLevel < $childLevel)
-      {
-        $highestLevel = $childLevel;
-      }
-    }
-    return $highestLevel;
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/SimpleMimeEntity.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/SimpleMimeEntity.php
deleted file mode 100644
index a392145cb..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/SimpleMimeEntity.php
+++ /dev/null
@@ -1,793 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/HeaderSet.php';
-//@require 'Swift/OutputByteStream.php';
-//@require 'Swift/Mime/ContentEncoder.php';
-//@require 'Swift/KeyCache.php';
-
-/**
- * A MIME entity, in a multipart message.
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
-{
-  
-  /** A collection of Headers for this mime entity */
-  private $_headers;
-  
-  /** The body as a string, or a stream */
-  private $_body;
-  
-  /** The encoder that encodes the body into a streamable format */
-  private $_encoder;
-  
-  /** A mime bounary, if any is used */
-  private $_boundary;
-  
-  /** Mime types to be used based on the nesting level */
-  private $_compositeRanges = array(
-    'multipart/mixed' => array(self::LEVEL_TOP, self::LEVEL_MIXED),
-    'multipart/alternative' => array(self::LEVEL_MIXED, self::LEVEL_ALTERNATIVE),
-    'multipart/related' => array(self::LEVEL_ALTERNATIVE, self::LEVEL_RELATED)
-    );
-  
-  /** A set of filter rules to define what level an entity should be nested at */
-  private $_compoundLevelFilters = array();
-    
-  /** The nesting level of this entity */
-  private $_nestingLevel = self::LEVEL_ALTERNATIVE;
-  
-  /** A KeyCache instance used during encoding and streaming */
-  private $_cache;
-  
-  /** Direct descendants of this entity */
-  private $_immediateChildren = array();
-  
-  /** All descendants of this entity */
-  private $_children = array();
-  
-  /** The maximum line length of the body of this entity */
-  private $_maxLineLength = 78;
-  
-  /** The order in which alternative mime types should appear */
-  private $_alternativePartOrder = array(
-    'text/plain' => 1,
-    'text/html' => 2,
-    'multipart/related' => 3
-    );
-  
-  /** The CID of this entity */
-  private $_id;
-  
-  /** The key used for accessing the cache */
-  private $_cacheKey;
-  
-  protected $_userContentType;
-  
-  /**
-   * Create a new SimpleMimeEntity with $headers, $encoder and $cache.
-   * @param Swift_Mime_HeaderSet $headers
-   * @param Swift_Mime_ContentEncoder $encoder
-   * @param Swift_KeyCache $cache
-   */
-  public function __construct(Swift_Mime_HeaderSet $headers,
-    Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache)
-  {
-    $this->_cacheKey = uniqid();
-    $this->_cache = $cache;
-    $this->_headers = $headers;
-    $this->setEncoder($encoder);
-    $this->_headers->defineOrdering(
-      array('Content-Type', 'Content-Transfer-Encoding')
-      );
-    
-    // This array specifies that, when the entire MIME document contains
-    // $compoundLevel, then for each child within $level, if its Content-Type
-    // is $contentType then it should be treated as if it's level is
-    // $neededLevel instead.  I tried to write that unambiguously! :-\
-    // Data Structure:
-    // array (
-    //   $compoundLevel => array(
-    //     $level => array(
-    //       $contentType => $neededLevel
-    //     )
-    //   )
-    // )
-    
-    $this->_compoundLevelFilters = array(
-      (self::LEVEL_ALTERNATIVE + self::LEVEL_RELATED) => array(
-        self::LEVEL_ALTERNATIVE => array(
-          'text/plain' => self::LEVEL_ALTERNATIVE,
-          'text/html' => self::LEVEL_RELATED
-          )
-        )
-      );
-    $this->generateId();
-  }
-  
-  /**
-   * Generate a new Content-ID or Message-ID for this MIME entity.
-   * @return string
-   */
-  public function generateId()
-  {
-    $idLeft = time() . '.' . uniqid();
-    $idRight = !empty($_SERVER['SERVER_NAME'])
-      ? $_SERVER['SERVER_NAME']
-      : 'swift.generated';
-    $this->_id = $idLeft . '@' . $idRight;
-    return $this->getId();
-  }
-  
-  /**
-   * Get the {@link Swift_Mime_HeaderSet} for this entity.
-   * @return Swift_Mime_HeaderSet
-   */
-  public function getHeaders()
-  {
-    return $this->_headers;
-  }
-  
-  /**
-   * Get the nesting level of this entity.
-   * @return int
-   * @see LEVEL_TOP, LEVEL_MIXED, LEVEL_RELATED, LEVEL_ALTERNATIVE
-   */
-  public function getNestingLevel()
-  {
-    return $this->_nestingLevel;
-  }
-  
-  /**
-   * Get the Content-type of this entity.
-   * @return string
-   */
-  public function getContentType()
-  {
-    return $this->_getHeaderFieldModel('Content-Type');
-  }
-  
-  /**
-   * Set the Content-type of this entity.
-   * @param string $type
-   */
-  public function setContentType($type)
-  {
-    $this->_setContentTypeInHeaders($type);
-    // Keep track of the value so that if the content-type changes automatically
-    // due to added child entities, it can be restored if they are later removed
-    $this->_userContentType = $type;
-    return $this;
-  }
-  
-  /**
-   * Get the CID of this entity.
-   * The CID will only be present in headers if a Content-ID header is present.
-   * @return string
-   */
-  public function getId()
-  {
-    return $this->_headers->has($this->_getIdField())
-      ? current((array) $this->_getHeaderFieldModel($this->_getIdField()))
-      : $this->_id;
-  }
-  
-  /**
-   * Set the CID of this entity.
-   * @param string $id
-   */
-  public function setId($id)
-  {
-    if (!$this->_setHeaderFieldModel($this->_getIdField(), $id))
-    {
-      $this->_headers->addIdHeader($this->_getIdField(), $id);
-    }
-    $this->_id = $id;
-    return $this;
-  }
-  
-  /**
-   * Get the description of this entity.
-   * This value comes from the Content-Description header if set.
-   * @return string
-   */
-  public function getDescription()
-  {
-    return $this->_getHeaderFieldModel('Content-Description');
-  }
-  
-  /**
-   * Set the description of this entity.
-   * This method sets a value in the Content-ID header.
-   * @param string $description
-   */
-  public function setDescription($description)
-  {
-    if (!$this->_setHeaderFieldModel('Content-Description', $description))
-    {
-      $this->_headers->addTextHeader('Content-Description', $description);
-    }
-    return $this;
-  }
-  
-  /**
-   * Get the maximum line length of the body of this entity.
-   * @return int
-   */
-  public function getMaxLineLength()
-  {
-    return $this->_maxLineLength;
-  }
-  
-  /**
-   * Set the maximum line length of lines in this body.
-   * Though not enforced by the library, lines should not exceed 1000 chars.
-   * @param int $length
-   */
-  public function setMaxLineLength($length)
-  {
-    $this->_maxLineLength = $length;
-    return $this;
-  }
-  
-  /**
-   * Get all children added to this entity.
-   * @return array of Swift_Mime_Entity
-   */
-  public function getChildren()
-  {
-    return $this->_children;
-  }
-  
-  /**
-   * Set all children of this entity.
-   * @param array $children Swiift_Mime_Entity instances
-   * @param int $compoundLevel For internal use only
-   */
-  public function setChildren(array $children, $compoundLevel = null)
-  {
-    //TODO: Try to refactor this logic
-    
-    $compoundLevel = isset($compoundLevel)
-      ? $compoundLevel
-      : $this->_getCompoundLevel($children)
-      ;
-    
-    $immediateChildren = array();
-    $grandchildren = array();
-    $newContentType = $this->_userContentType;
-    
-    foreach ($children as $child)
-    {
-      $level = $this->_getNeededChildLevel($child, $compoundLevel);
-      if (empty($immediateChildren)) //first iteration
-      {
-        $immediateChildren = array($child);
-      }
-      else
-      {
-        $nextLevel = $this->_getNeededChildLevel($immediateChildren[0], $compoundLevel);
-        if ($nextLevel == $level)
-        {
-          $immediateChildren[] = $child;
-        }
-        elseif ($level < $nextLevel)
-        {
-          //Re-assign immediateChildren to grandchilden
-          $grandchildren = array_merge($grandchildren, $immediateChildren);
-          //Set new children
-          $immediateChildren = array($child);
-        }
-        else
-        {
-          $grandchildren[] = $child;
-        }
-      }
-    }
-    
-    if (!empty($immediateChildren))
-    {
-      $lowestLevel = $this->_getNeededChildLevel($immediateChildren[0], $compoundLevel);
-      
-      //Determine which composite media type is needed to accomodate the
-      // immediate children
-      foreach ($this->_compositeRanges as $mediaType => $range)
-      {
-        if ($lowestLevel > $range[0]
-          && $lowestLevel <= $range[1])
-        {
-          $newContentType = $mediaType;
-          break;
-        }
-      }
-      
-      //Put any grandchildren in a subpart
-      if (!empty($grandchildren))
-      {
-        $subentity = $this->_createChild();
-        $subentity->_setNestingLevel($lowestLevel);
-        $subentity->setChildren($grandchildren, $compoundLevel);
-        array_unshift($immediateChildren, $subentity);
-      }
-    }
-    
-    $this->_immediateChildren = $immediateChildren;
-    $this->_children = $children;
-    $this->_setContentTypeInHeaders($newContentType);
-    $this->_fixHeaders();
-    $this->_sortChildren();
-    
-    return $this;
-  }
-  
-  /**
-   * Get the body of this entity as a string.
-   * @return string
-   */
-  public function getBody()
-  {
-    return ($this->_body instanceof Swift_OutputByteStream)
-      ? $this->_readStream($this->_body)
-      : $this->_body;
-  }
-  
-  /**
-   * Set the body of this entity, either as a string, or as an instance of
-   * {@link Swift_OutputByteStream}.
-   * @param mixed $body
-   * @param string $contentType optional
-   */
-  public function setBody($body, $contentType = null)
-  {
-    if ($body !== $this->_body)
-    {
-      $this->_clearCache();
-    }
-    
-    $this->_body = $body;
-    if (isset($contentType))
-    {
-      $this->setContentType($contentType);
-    }
-    return $this;
-  }
-  
-  /**
-   * Get the encoder used for the body of this entity.
-   * @return Swift_Mime_ContentEncoder
-   */
-  public function getEncoder()
-  {
-    return $this->_encoder;
-  }
-  
-  /**
-   * Set the encoder used for the body of this entity.
-   * @param Swift_Mime_ContentEncoder $encoder
-   */
-  public function setEncoder(Swift_Mime_ContentEncoder $encoder)
-  {
-    if ($encoder !== $this->_encoder)
-    {
-      $this->_clearCache();
-    }
-    
-    $this->_encoder = $encoder;
-    $this->_setEncoding($encoder->getName());
-    $this->_notifyEncoderChanged($encoder);
-    return $this;
-  }
-  
-  /**
-   * Get the boundary used to separate children in this entity.
-   * @return string
-   */
-  public function getBoundary()
-  {
-    if (!isset($this->_boundary))
-    {
-      $this->_boundary = '_=_swift_v4_' . time() . uniqid() . '_=_';
-    }
-    return $this->_boundary;
-  }
-  
-  /**
-   * Set the boundary used to separate children in this entity.
-   * @param string $boundary
-   * @throws Swift_RfcComplianceException
-   */
-  public function setBoundary($boundary)
-  {
-    $this->_assertValidBoundary($boundary);
-    $this->_boundary = $boundary;
-    return $this;
-  }
-  
-  /**
-   * Receive notification that the charset of this entity, or a parent entity
-   * has changed.
-   * @param string $charset
-   */
-  public function charsetChanged($charset)
-  {
-    $this->_notifyCharsetChanged($charset);
-  }
-  
-  /**
-   * Receive notification that the encoder of this entity or a parent entity
-   * has changed.
-   * @param Swift_Mime_ContentEncoder $encoder
-   */
-  public function encoderChanged(Swift_Mime_ContentEncoder $encoder)
-  {
-    $this->_notifyEncoderChanged($encoder);
-  }
-  
-  /**
-   * Get this entire entity as a string.
-   * @return string
-   */
-  public function toString()
-  {
-    $string = $this->_headers->toString();
-    if (isset($this->_body) && empty($this->_immediateChildren))
-    {
-      if ($this->_cache->hasKey($this->_cacheKey, 'body'))
-      {
-        $body = $this->_cache->getString($this->_cacheKey, 'body');
-      }
-      else
-      {
-        $body = "\r\n" . $this->_encoder->encodeString($this->getBody(), 0,
-          $this->getMaxLineLength()
-          );
-        $this->_cache->setString($this->_cacheKey, 'body', $body,
-          Swift_KeyCache::MODE_WRITE
-          );
-      }
-      $string .= $body;
-    }
-    
-    if (!empty($this->_immediateChildren))
-    {
-      foreach ($this->_immediateChildren as $child)
-      {
-        $string .= "\r\n\r\n--" . $this->getBoundary() . "\r\n";
-        $string .= $child->toString();
-      }
-      $string .= "\r\n\r\n--" . $this->getBoundary() . "--\r\n";
-    }
-    
-    return $string;
-  }
-  
-  /**
-   * Returns a string representation of this object.
-   *
-   * @return string
-   *
-   * @see toString()
-   */
-  public function __toString()
-  {
-    return $this->toString();
-  }
-  
-  /**
-   * Write this entire entity to a {@link Swift_InputByteStream}.
-   * @param Swift_InputByteStream
-   */
-  public function toByteStream(Swift_InputByteStream $is)
-  {
-    $is->write($this->_headers->toString());
-    $is->commit();
-    
-    if (empty($this->_immediateChildren))
-    {
-      if (isset($this->_body))
-      {
-        if ($this->_cache->hasKey($this->_cacheKey, 'body'))
-        {
-          $this->_cache->exportToByteStream($this->_cacheKey, 'body', $is);
-        }
-        else
-        {
-          $cacheIs = $this->_cache->getInputByteStream($this->_cacheKey, 'body');
-          if ($cacheIs)
-          {
-            $is->bind($cacheIs);
-          }
-          
-          $is->write("\r\n");
-          
-          if ($this->_body instanceof Swift_OutputByteStream)
-          {
-            $this->_body->setReadPointer(0);
-            
-            $this->_encoder->encodeByteStream($this->_body, $is, 0,
-              $this->getMaxLineLength()
-              );
-          }
-          else
-          {
-            $is->write($this->_encoder->encodeString(
-              $this->getBody(), 0, $this->getMaxLineLength()
-              ));
-          }
-          
-          if ($cacheIs)
-          {
-            $is->unbind($cacheIs);
-          }
-        }
-      }
-    }
-    
-    if (!empty($this->_immediateChildren))
-    {
-      foreach ($this->_immediateChildren as $child)
-      {
-        $is->write("\r\n\r\n--" . $this->getBoundary() . "\r\n");
-        $child->toByteStream($is);
-      }
-      $is->write("\r\n\r\n--" . $this->getBoundary() . "--\r\n");
-    }
-  }
-  
-  // -- Protected methods
-  
-  /**
-   * Get the name of the header that provides the ID of this entity */
-  protected function _getIdField()
-  {
-    return 'Content-ID';
-  }
-  
-  /**
-   * Get the model data (usually an array or a string) for $field.
-   */
-  protected function _getHeaderFieldModel($field)
-  {
-    if ($this->_headers->has($field))
-    {
-      return $this->_headers->get($field)->getFieldBodyModel();
-    }
-  }
-  
-  /**
-   * Set the model data for $field.
-   */
-  protected function _setHeaderFieldModel($field, $model)
-  {
-    if ($this->_headers->has($field))
-    {
-      $this->_headers->get($field)->setFieldBodyModel($model);
-      return true;
-    }
-    else
-    {
-      return false;
-    }
-  }
-  
-  /**
-   * Get the parameter value of $parameter on $field header.
-   */
-  protected function _getHeaderParameter($field, $parameter)
-  {
-    if ($this->_headers->has($field))
-    {
-      return $this->_headers->get($field)->getParameter($parameter);
-    }
-  }
-  
-  /**
-   * Set the parameter value of $parameter on $field header.
-   */
-  protected function _setHeaderParameter($field, $parameter, $value)
-  {
-    if ($this->_headers->has($field))
-    {
-      $this->_headers->get($field)->setParameter($parameter, $value);
-      return true;
-    }
-    else
-    {
-      return false;
-    }
-  }
-  
-  /**
-   * Re-evaluate what content type and encoding should be used on this entity.
-   */
-  protected function _fixHeaders()
-  {
-    if (count($this->_immediateChildren))
-    {
-      $this->_setHeaderParameter('Content-Type', 'boundary',
-        $this->getBoundary()
-        );
-      $this->_headers->remove('Content-Transfer-Encoding');
-    }
-    else
-    {
-      $this->_setHeaderParameter('Content-Type', 'boundary', null);
-      $this->_setEncoding($this->_encoder->getName());
-    }
-  }
-  
-  /**
-   * Get the KeyCache used in this entity.
-   */
-  protected function _getCache()
-  {
-    return $this->_cache;
-  }
-  
-  /**
-   * Empty the KeyCache for this entity.
-   */
-  protected function _clearCache()
-  {
-    $this->_cache->clearKey($this->_cacheKey, 'body');
-  }
-  
-  // -- Private methods
-  
-  private function _readStream(Swift_OutputByteStream $os)
-  {
-    $string = '';
-    while (false !== $bytes = $os->read(8192))
-    {
-      $string .= $bytes;
-    }
-    return $string;
-  }
-  
-  private function _setEncoding($encoding)
-  {
-    if (!$this->_setHeaderFieldModel('Content-Transfer-Encoding', $encoding))
-    {
-      $this->_headers->addTextHeader('Content-Transfer-Encoding', $encoding);
-    }
-  }
-  
-  private function _assertValidBoundary($boundary)
-  {
-    if (!preg_match(
-      '/^[a-z0-9\'\(\)\+_\-,\.\/:=\?\ ]{0,69}[a-z0-9\'\(\)\+_\-,\.\/:=\?]$/Di',
-      $boundary))
-    {
-      throw new Exception('Mime boundary set is not RFC 2046 compliant.');
-    }
-  }
-  
-  private function _setContentTypeInHeaders($type)
-  {
-    if (!$this->_setHeaderFieldModel('Content-Type', $type))
-    {
-      $this->_headers->addParameterizedHeader('Content-Type', $type);
-    }
-  }
-  
-  private function _setNestingLevel($level)
-  {
-    $this->_nestingLevel = $level;
-  }
-  
-  private function _getCompoundLevel($children)
-  {
-    $level = 0;
-    foreach ($children as $child)
-    {
-      $level |= $child->getNestingLevel();
-    }
-    return $level;
-  }
-  
-  private function _getNeededChildLevel($child, $compoundLevel)
-  {
-    $filter = array();
-    foreach ($this->_compoundLevelFilters as $bitmask => $rules)
-    {
-      if (($compoundLevel & $bitmask) === $bitmask)
-      {
-        $filter = $rules + $filter;
-      }
-    }
-    
-    $realLevel = $child->getNestingLevel();
-    $lowercaseType = strtolower($child->getContentType());
-    
-    if (isset($filter[$realLevel])
-      && isset($filter[$realLevel][$lowercaseType]))
-    {
-      return $filter[$realLevel][$lowercaseType];
-    }
-    else
-    {
-      return $realLevel;
-    }
-  }
-  
-  private function _createChild()
-  {
-    return new self($this->_headers->newInstance(),
-      $this->_encoder, $this->_cache);
-  }
-  
-  private function _notifyEncoderChanged(Swift_Mime_ContentEncoder $encoder)
-  {
-    foreach ($this->_immediateChildren as $child)
-    {
-      $child->encoderChanged($encoder);
-    }
-  }
-  
-  private function _notifyCharsetChanged($charset)
-  {
-    $this->_encoder->charsetChanged($charset);
-    $this->_headers->charsetChanged($charset);
-    foreach ($this->_immediateChildren as $child)
-    {
-      $child->charsetChanged($charset);
-    }
-  }
-  
-  private function _sortChildren()
-  {
-    $shouldSort = false;
-    foreach ($this->_immediateChildren as $child)
-    {
-      //NOTE: This include alternative parts moved into a related part
-      if ($child->getNestingLevel() == self::LEVEL_ALTERNATIVE)
-      {
-        $shouldSort = true;
-        break;
-      }
-    }
-    
-    //Sort in order of preference, if there is one
-    if ($shouldSort)
-    {
-      usort($this->_immediateChildren, array($this, '_childSortAlgorithm'));
-    }
-  }
-  
-  private function _childSortAlgorithm($a, $b)
-  {
-    $typePrefs = array();
-    $types = array(
-      strtolower($a->getContentType()),
-      strtolower($b->getContentType())
-      );
-    foreach ($types as $type)
-    {
-      $typePrefs[] = (array_key_exists($type, $this->_alternativePartOrder))
-        ? $this->_alternativePartOrder[$type]
-        : (max($this->_alternativePartOrder) + 1);
-    }
-    return ($typePrefs[0] >= $typePrefs[1]) ? 1 : -1;
-  }
-  
-  // -- Destructor
-  
-  /**
-   * Empties it's own contents from the cache.
-   */
-  public function __destruct()
-  {
-    $this->_cache->clearAll($this->_cacheKey);
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/MimePart.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/MimePart.php
deleted file mode 100644
index 60b6d5699..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/MimePart.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/MimePart.php';
-//@require 'Swift/DependencyContainer.php';
-
-/**
- * A MIME part, in a multipart message.
- * @package Swift
- * @subpackage Mime
- * @author Chris Corbyn
- */
-class Swift_MimePart extends Swift_Mime_MimePart
-{
-  
-  /**
-   * Create a new MimePart.
-   * Details may be optionally passed into the constructor.
-   * @param string $body
-   * @param string $contentType
-   * @param string $charset
-   */
-  public function __construct($body = null, $contentType = null,
-    $charset = null)
-  {
-    call_user_func_array(
-      array($this, 'Swift_Mime_MimePart::__construct'),
-      Swift_DependencyContainer::getInstance()
-        ->createDependenciesFor('mime.part')
-      );
-    
-    if (!isset($charset))
-    {
-      $charset = Swift_DependencyContainer::getInstance()
-        ->lookup('properties.charset');
-    }
-    $this->setBody($body);
-    $this->setCharset($charset);
-    if ($contentType)
-    {
-      $this->setContentType($contentType);
-    }
-  }
-  
-  /**
-   * Create a new MimePart.
-   * @param string $body
-   * @param string $contentType
-   * @param string $charset
-   * @return Swift_Mime_MimePart
-   */
-  public static function newInstance($body = null, $contentType = null,
-    $charset = null)
-  {
-    return new self($body, $contentType, $charset);
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/NullTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/NullTransport.php
deleted file mode 100644
index 8c82ee282..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/NullTransport.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2009 Fabien Potencier <fabien.potencier@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Pretends messages have been sent, but just ignores them.
- * @package Swift
- * @author  Fabien Potencier
- */
-class Swift_NullTransport extends Swift_Transport_NullTransport
-{
-  /**
-   * Create a new NullTransport.
-   */
-  public function __construct()
-  {
-    call_user_func_array(
-      array($this, 'Swift_Transport_NullTransport::__construct'),
-      Swift_DependencyContainer::getInstance()
-        ->createDependenciesFor('transport.null')
-    );
-  }
-  
-  /**
-   * Create a new NullTransport instance.
-   * @return Swift_NullTransport
-   */
-  public static function newInstance()
-  {
-    return new self();
-  }
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/OutputByteStream.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/OutputByteStream.php
deleted file mode 100644
index 951b83834..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/OutputByteStream.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * An abstract means of reading data.
- * Classes implementing this interface may use a subsystem which requires less
- * memory than working with large strings of data.
- * @package Swift
- * @subpackage ByteStream
- * @author Chris Corbyn
- */
-interface Swift_OutputByteStream
-{
-  
-  /**
-   * Reads $length bytes from the stream into a string and moves the pointer
-   * through the stream by $length. If less bytes exist than are requested the
-   * remaining bytes are given instead. If no bytes are remaining at all, boolean
-   * false is returned.
-   * @param int $length
-   * @return string
-   * @throws Swift_IoException
-   */
-  public function read($length);
-  
-  /**
-   * Move the internal read pointer to $byteOffset in the stream.
-   * @param int $byteOffset
-   * @return boolean
-   * @throws Swift_IoException
-   */
-  public function setReadPointer($byteOffset);
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/AntiFloodPlugin.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/AntiFloodPlugin.php
deleted file mode 100644
index 46a7f4481..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/AntiFloodPlugin.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Events/SendListener.php';
-//@require 'Swift/Events/SendEvent.php';
-//@require 'Swift/Plugins/Sleeper.php';
-
-/**
- * Reduces network flooding when sending large amounts of mail.
- * @package Swift
- * @subpackage Plugins
- * @author Chris Corbyn
- */
-class Swift_Plugins_AntiFloodPlugin
-  implements Swift_Events_SendListener, Swift_Plugins_Sleeper
-{
-  
-  /**
-   * The number of emails to send before restarting Transport.
-   * @var int
-   * @access private
-   */
-  private $_threshold;
-  
-  /**
-   * The number of seconds to sleep for during a restart.
-   * @var int
-   * @access private
-   */
-  private $_sleep;
-  
-  /**
-   * The internal counter.
-   * @var int
-   * @access private
-   */
-  private $_counter = 0;
-  
-  /**
-   * The Sleeper instance for sleeping.
-   * @var Swift_Plugins_Sleeper
-   * @access private
-   */
-  private $_sleeper;
-  
-  /**
-   * Create a new AntiFloodPlugin with $threshold and $sleep time.
-   * @param int $threshold
-   * @param int $sleep time
-   * @param Swift_Plugins_Sleeper $sleeper (not needed really)
-   */
-  public function __construct($threshold = 99, $sleep = 0,
-    Swift_Plugins_Sleeper $sleeper = null)
-  {
-    $this->setThreshold($threshold);
-    $this->setSleepTime($sleep);
-    $this->_sleeper = $sleeper;
-  }
-  
-  /**
-   * Set the number of emails to send before restarting.
-   * @param int $threshold
-   */
-  public function setThreshold($threshold)
-  {
-    $this->_threshold = $threshold;
-  }
-  
-  /**
-   * Get the number of emails to send before restarting.
-   * @return int
-   */
-  public function getThreshold()
-  {
-    return $this->_threshold;
-  }
-  
-  /**
-   * Set the number of seconds to sleep for during a restart.
-   * @param int $sleep time
-   */
-  public function setSleepTime($sleep)
-  {
-    $this->_sleep = $sleep;
-  }
-  
-  /**
-   * Get the number of seconds to sleep for during a restart.
-   * @return int
-   */
-  public function getSleepTime()
-  {
-    return $this->_sleep;
-  }
-  
-  /**
-   * Invoked immediately before the Message is sent.
-   * @param Swift_Events_SendEvent $evt
-   */
-  public function beforeSendPerformed(Swift_Events_SendEvent $evt)
-  {
-  }
-  
-  /**
-   * Invoked immediately after the Message is sent.
-   * @param Swift_Events_SendEvent $evt
-   */
-  public function sendPerformed(Swift_Events_SendEvent $evt)
-  {
-    ++$this->_counter;
-    if ($this->_counter >= $this->_threshold)
-    {
-      $transport = $evt->getTransport();
-      $transport->stop();
-      if ($this->_sleep)
-      {
-        $this->sleep($this->_sleep);
-      }
-      $transport->start();
-      $this->_counter = 0;
-    }
-  }
-  
-  /**
-   * Sleep for $seconds.
-   * @param int $seconds
-   */
-  public function sleep($seconds)
-  {
-    if (isset($this->_sleeper))
-    {
-      $this->_sleeper->sleep($seconds);
-    }
-    else
-    {
-      sleep($seconds);
-    }
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/BandwidthMonitorPlugin.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/BandwidthMonitorPlugin.php
deleted file mode 100644
index 501cd809a..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/BandwidthMonitorPlugin.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Events/SendListener.php';
-//@require 'Swift/Events/SendEvent.php';
-//@require 'Swift/Events/CommandListener.php';
-//@require 'Swift/Events/CommandEvent.php';
-//@require 'Swift/Events/ResponseListener.php';
-//@require 'Swift/Events/ResponseEvent.php';
-//@require 'Swift/InputByteStream.php';
-
-/**
- * Reduces network flooding when sending large amounts of mail.
- * @package Swift
- * @subpackage Plugins
- * @author Chris Corbyn
- */
-class Swift_Plugins_BandwidthMonitorPlugin
-  implements Swift_Events_SendListener, Swift_Events_CommandListener,
-  Swift_Events_ResponseListener, Swift_InputByteStream
-{
-  
-  /**
-   * The outgoing traffic counter.
-   * @var int
-   * @access private
-   */
-  private $_out = 0;
-  
-  /**
-   * The incoming traffic counter.
-   * @var int
-   * @access private
-   */
-  private $_in = 0;
-  
-  /** Bound byte streams */
-  private $_mirrors = array();
-  
-  /**
-   * Not used.
-   */
-  public function beforeSendPerformed(Swift_Events_SendEvent $evt)
-  {
-  }
-  
-  /**
-   * Invoked immediately after the Message is sent.
-   * @param Swift_Events_SendEvent $evt
-   */
-  public function sendPerformed(Swift_Events_SendEvent $evt)
-  {
-    $message = $evt->getMessage();
-    $message->toByteStream($this);
-  }
-  
-  /**
-   * Invoked immediately following a command being sent.
-   * @param Swift_Events_ResponseEvent $evt
-   */
-  public function commandSent(Swift_Events_CommandEvent $evt)
-  {
-    $command = $evt->getCommand();
-    $this->_out += strlen($command);
-  }
-  
-  /**
-   * Invoked immediately following a response coming back.
-   * @param Swift_Events_ResponseEvent $evt
-   */
-  public function responseReceived(Swift_Events_ResponseEvent $evt)
-  {
-    $response = $evt->getResponse();
-    $this->_in += strlen($response);
-  }
-  
-  /**
-   * Called when a message is sent so that the outgoing counter can be increased.
-   * @param string $bytes
-   */
-  public function write($bytes)
-  {
-    $this->_out += strlen($bytes);
-    foreach ($this->_mirrors as $stream)
-    {
-      $stream->write($bytes);
-    }
-  }
-  
-  /**
-   * Not used.
-   */
-  public function commit()
-  {
-  }
-  
-  /**
-   * Attach $is to this stream.
-   * The stream acts as an observer, receiving all data that is written.
-   * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-   * 
-   * @param Swift_InputByteStream $is
-   */
-  public function bind(Swift_InputByteStream $is)
-  {
-    $this->_mirrors[] = $is;
-  }
-  
-  /**
-   * Remove an already bound stream.
-   * If $is is not bound, no errors will be raised.
-   * If the stream currently has any buffered data it will be written to $is
-   * before unbinding occurs.
-   * 
-   * @param Swift_InputByteStream $is
-   */
-  public function unbind(Swift_InputByteStream $is)
-  {
-    foreach ($this->_mirrors as $k => $stream)
-    {
-      if ($is === $stream)
-      {
-        unset($this->_mirrors[$k]);
-      }
-    }
-  }
-  
-  /**
-   * Not used.
-   */
-  public function flushBuffers()
-  {
-    foreach ($this->_mirrors as $stream)
-    {
-      $stream->flushBuffers();
-    }
-  }
-  
-  /**
-   * Get the total number of bytes sent to the server.
-   * @return int
-   */
-  public function getBytesOut()
-  {
-    return $this->_out;
-  }
-  
-  /**
-   * Get the total number of bytes received from the server.
-   * @return int
-   */
-  public function getBytesIn()
-  {
-    return $this->_in;
-  }
-  
-  /**
-   * Reset the internal counters to zero.
-   */
-  public function reset()
-  {
-    $this->_out = 0;
-    $this->_in = 0;
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/BlackholePlugin.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/BlackholePlugin.php
deleted file mode 100644
index 64dcc644d..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/BlackholePlugin.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Ignores messages.
- * @package Swift
- * @subpackage Plugins
- * @author Fabien Potencier
- */
-class Swift_Plugins_BlackholePlugin
-  implements Swift_Events_SendListener
-{
-  /**
-   * Invoked immediately before the Message is sent.
-   * @param Swift_Events_SendEvent $evt
-   */
-  public function beforeSendPerformed(Swift_Events_SendEvent $evt)
-  {
-    $evt->cancelBubble();
-  }
-  
-  /**
-   * Invoked immediately after the Message is sent.
-   * 
-   * @param Swift_Events_SendEvent $evt
-   */
-  public function sendPerformed(Swift_Events_SendEvent $evt)
-  {
-  }
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Decorator/Replacements.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Decorator/Replacements.php
deleted file mode 100644
index 9735d0a04..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Decorator/Replacements.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Allows customization of Messages on-the-fly.
- * 
- * @package Swift
- * @subpackage Plugins
- * 
- * @author Chris Corbyn
- */
-interface Swift_Plugins_Decorator_Replacements
-{
-  
-  /**
-   * Return the array of replacements for $address.
-   * 
-   * This method is invoked once for every single recipient of a message.
-   * 
-   * If no replacements can be found, an empty value (NULL) should be returned
-   * and no replacements will then be made on the message.
-   * 
-   * @param string $address
-   * 
-   * @return array
-   */
-  public function getReplacementsFor($address);
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/DecoratorPlugin.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/DecoratorPlugin.php
deleted file mode 100644
index da1a3079e..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/DecoratorPlugin.php
+++ /dev/null
@@ -1,201 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Events/SendListener.php';
-//@require 'Swift/Events/SendEvent.php';
-//@require 'Swift/Plugins/Decorator/Replacements.php';
-
-/**
- * Allows customization of Messages on-the-fly.
- * 
- * @package Swift
- * @subpackage Plugins
- * 
- * @author Chris Corbyn
- */
-class Swift_Plugins_DecoratorPlugin
-  implements Swift_Events_SendListener, Swift_Plugins_Decorator_Replacements
-{
-
-  /** The replacement map */
-  private $_replacements;
-  
-  /** The body as it was before replacements */
-  private $_orginalBody;
-
-  /** The original subject of the message, before replacements */
-  private $_originalSubject;
-
-  /** Bodies of children before they are replaced */
-  private $_originalChildBodies = array();
-
-  /** The Message that was last replaced */
-  private $_lastMessage;
-
-  /**
-   * Create a new DecoratorPlugin with $replacements.
-   * 
-   * The $replacements can either be an associative array, or an implementation
-   * of {@link Swift_Plugins_Decorator_Replacements}.
-   * 
-   * When using an array, it should be of the form:
-   * <code>
-   * $replacements = array(
-   *  "address1@domain.tld" => array("{a}" => "b", "{c}" => "d"),
-   *  "address2@domain.tld" => array("{a}" => "x", "{c}" => "y")
-   * )
-   * </code>
-   * 
-   * When using an instance of {@link Swift_Plugins_Decorator_Replacements},
-   * the object should return just the array of replacements for the address
-   * given to {@link Swift_Plugins_Decorator_Replacements::getReplacementsFor()}.
-   * 
-   * @param mixed $replacements
-   */
-  public function __construct($replacements)
-  {
-    if (!($replacements instanceof Swift_Plugins_Decorator_Replacements))
-    {
-      $this->_replacements = (array) $replacements;
-    }
-    else
-    {
-      $this->_replacements = $replacements;
-    }
-  }
-
-  /**
-   * Invoked immediately before the Message is sent.
-   * 
-   * @param Swift_Events_SendEvent $evt
-   */
-  public function beforeSendPerformed(Swift_Events_SendEvent $evt)
-  {
-    $message = $evt->getMessage();
-    $this->_restoreMessage($message);
-    $to = array_keys($message->getTo());
-    $address = array_shift($to);
-    if ($replacements = $this->getReplacementsFor($address))
-    {
-      $body = $message->getBody();
-      $search = array_keys($replacements);
-      $replace = array_values($replacements);
-      $bodyReplaced = str_replace(
-        $search, $replace, $body
-        );
-      if ($body != $bodyReplaced)
-      {
-        $this->_originalBody = $body;
-        $message->setBody($bodyReplaced);
-      }
-      $subject = $message->getSubject();
-      $subjectReplaced = str_replace(
-        $search, $replace, $subject
-        );
-      if ($subject != $subjectReplaced)
-      {
-        $this->_originalSubject = $subject;
-        $message->setSubject($subjectReplaced);
-      }
-      $children = (array) $message->getChildren();
-      foreach ($children as $child)
-      {
-        list($type, ) = sscanf($child->getContentType(), '%[^/]/%s');
-        if ('text' == $type)
-        {
-          $body = $child->getBody();
-          $bodyReplaced = str_replace(
-            $search, $replace, $body
-            );
-          if ($body != $bodyReplaced)
-          {
-            $child->setBody($bodyReplaced);
-            $this->_originalChildBodies[$child->getId()] = $body;
-          }
-        }
-      }
-      $this->_lastMessage = $message;
-    }
-  }
-  
-  /**
-   * Find a map of replacements for the address.
-   * 
-   * If this plugin was provided with a delegate instance of
-   * {@link Swift_Plugins_Decorator_Replacements} then the call will be
-   * delegated to it.  Otherwise, it will attempt to find the replacements
-   * from the array provided in the constructor.
-   * 
-   * If no replacements can be found, an empty value (NULL) is returned.
-   * 
-   * @param string $address
-   * 
-   * @return array
-   */
-  public function getReplacementsFor($address)
-  {
-    if ($this->_replacements instanceof Swift_Plugins_Decorator_Replacements)
-    {
-      return $this->_replacements->getReplacementsFor($address);
-    }
-    else
-    {
-      return isset($this->_replacements[$address])
-        ? $this->_replacements[$address]
-        : null
-        ;
-    }
-  }
-
-  /**
-   * Invoked immediately after the Message is sent.
-   * 
-   * @param Swift_Events_SendEvent $evt
-   */
-  public function sendPerformed(Swift_Events_SendEvent $evt)
-  {
-    $this->_restoreMessage($evt->getMessage());
-  }
-
-  // -- Private methods
-
-  /** Restore a changed message back to its original state */
-  private function _restoreMessage(Swift_Mime_Message $message)
-  {
-    if ($this->_lastMessage === $message)
-    {
-      if (isset($this->_originalBody))
-      {
-        $message->setBody($this->_originalBody);
-        $this->_originalBody = null;
-      }
-      if (isset($this->_originalSubject))
-      {
-        $message->setSubject($this->_originalSubject);
-        $this->_originalSubject = null;
-      }
-      if (!empty($this->_originalChildBodies))
-      {
-        $children = (array) $message->getChildren();
-        foreach ($children as $child)
-        {
-          $id = $child->getId();
-          if (array_key_exists($id, $this->_originalChildBodies))
-          {
-            $child->setBody($this->_originalChildBodies[$id]);
-          }
-        }
-        $this->_originalChildBodies = array();
-      }
-      $this->_lastMessage = null;
-    }
-  }
-
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/LoggerPlugin.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/LoggerPlugin.php
deleted file mode 100644
index d595f2645..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/LoggerPlugin.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Events/CommandListener.php';
-//@require 'Swift/Events/CommandEvent.php';
-//@require 'Swift/Events/ResponseListener.php';
-//@require 'Swift/Events/ResponseEvent.php';
-//@require 'Swift/Events/TransportChangeListener.php';
-//@require 'Swift/Events/TransportChangeEvent.php';
-//@require 'Swift/Events/TransportExceptionEvent.php';
-//@require 'Swift/Events/TransportExceptionListener.php';
-//@require 'Swift/Events/TransportException.php';
-//@require 'Swift/Plugins/Logger.php';
-
-/**
- * Does real time logging of Transport level information.
- * 
- * @package Swift
- * @subpackage Plugins
- * 
- * @author Chris Corbyn
- */
-class Swift_Plugins_LoggerPlugin
-  implements Swift_Events_CommandListener, Swift_Events_ResponseListener,
-  Swift_Events_TransportChangeListener, Swift_Events_TransportExceptionListener,
-  Swift_Plugins_Logger
-{
-  
-  /** The logger which is delegated to */
-  private $_logger;
-  
-  /**
-   * Create a new LoggerPlugin using $logger.
-   * 
-   * @param Swift_Plugins_Logger $logger
-   */
-  public function __construct(Swift_Plugins_Logger $logger)
-  {
-    $this->_logger = $logger;
-  }
-  
-  /**
-   * Add a log entry.
-   * 
-   * @param string $entry
-   */
-  public function add($entry)
-  {
-    $this->_logger->add($entry);
-  }
-  
-  /**
-   * Clear the log contents.
-   */
-  public function clear()
-  {
-    $this->_logger->clear();
-  }
-  
-  /**
-   * Get this log as a string.
-   * 
-   * @return string
-   */
-  public function dump()
-  {
-    return $this->_logger->dump();
-  }
-  
-  /**
-   * Invoked immediately following a command being sent.
-   * 
-   * @param Swift_Events_ResponseEvent $evt
-   */
-  public function commandSent(Swift_Events_CommandEvent $evt)
-  {
-    $command = $evt->getCommand();
-    $this->_logger->add(sprintf(">> %s", $command));
-  }
-  
-  /**
-   * Invoked immediately following a response coming back.
-   * 
-   * @param Swift_Events_ResponseEvent $evt
-   */
-  public function responseReceived(Swift_Events_ResponseEvent $evt)
-  {
-    $response = $evt->getResponse();
-    $this->_logger->add(sprintf("<< %s", $response));
-  }
-  
-  /**
-   * Invoked just before a Transport is started.
-   * 
-   * @param Swift_Events_TransportChangeEvent $evt
-   */
-  public function beforeTransportStarted(Swift_Events_TransportChangeEvent $evt)
-  {
-    $transportName = get_class($evt->getSource());
-    $this->_logger->add(sprintf("++ Starting %s", $transportName));
-  }
-  
-  /**
-   * Invoked immediately after the Transport is started.
-   * 
-   * @param Swift_Events_TransportChangeEvent $evt
-   */
-  public function transportStarted(Swift_Events_TransportChangeEvent $evt)
-  {
-    $transportName = get_class($evt->getSource());
-    $this->_logger->add(sprintf("++ %s started", $transportName));
-  }
-  
-  /**
-   * Invoked just before a Transport is stopped.
-   * 
-   * @param Swift_Events_TransportChangeEvent $evt
-   */
-  public function beforeTransportStopped(Swift_Events_TransportChangeEvent $evt)
-  {
-    $transportName = get_class($evt->getSource());
-    $this->_logger->add(sprintf("++ Stopping %s", $transportName));
-  }
-  
-  /**
-   * Invoked immediately after the Transport is stopped.
-   * 
-   * @param Swift_Events_TransportChangeEvent $evt
-   */
-  public function transportStopped(Swift_Events_TransportChangeEvent $evt)
-  {
-    $transportName = get_class($evt->getSource());
-    $this->_logger->add(sprintf("++ %s stopped", $transportName));
-  }
-  
-  /**
-   * Invoked as a TransportException is thrown in the Transport system.
-   * 
-   * @param Swift_Events_TransportExceptionEvent $evt
-   */
-  public function exceptionThrown(Swift_Events_TransportExceptionEvent $evt)
-  {
-    $e = $evt->getException();
-    $message = $e->getMessage();
-    $this->_logger->add(sprintf("!! %s", $message));
-    $message .= PHP_EOL;
-    $message .= 'Log data:' . PHP_EOL;
-    $message .= $this->_logger->dump();
-    $evt->cancelBubble();
-    throw new Swift_TransportException($message);
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Loggers/ArrayLogger.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Loggers/ArrayLogger.php
deleted file mode 100644
index 930eca25f..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Loggers/ArrayLogger.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Logs to an Array backend.
- * @package Swift
- * @subpackage Transport
- * @author Chris Corbyn
- */
-class Swift_Plugins_Loggers_ArrayLogger implements Swift_Plugins_Logger
-{
-  
-  /**
-   * The log contents.
-   * @var array
-   * @access private
-   */
-  private $_log = array();
-  
-  /**
-   * Max size of the log.
-   * @var int
-   * @access private
-   */
-  private $_size = 0;
-  
-  /**
-   * Create a new ArrayLogger with a maximum of $size entries.
-   * @var int $size
-   */
-  public function __construct($size = 50)
-  {
-    $this->_size = $size;
-  }
-  
-  /**
-   * Add a log entry.
-   * @param string $entry
-   */
-  public function add($entry)
-  {
-    $this->_log[] = $entry;
-    while (count($this->_log) > $this->_size)
-    {
-      array_shift($this->_log);
-    }
-  }
-  
-  /**
-   * Clear the log contents.
-   */
-  public function clear()
-  {
-    $this->_log = array();
-  }
-  
-  /**
-   * Get this log as a string.
-   * @return string
-   */
-  public function dump()
-  {
-    return implode(PHP_EOL, $this->_log);
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Loggers/EchoLogger.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Loggers/EchoLogger.php
deleted file mode 100644
index 83dd54b5f..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Loggers/EchoLogger.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Prints all log messages in real time.
- * 
- * @package Swift
- * @subpackage Transport
- * @author Chris Corbyn
- */
-class Swift_Plugins_Loggers_EchoLogger implements Swift_Plugins_Logger
-{
-  
-  /** Whether or not HTML should be output */
-  private $_isHtml;
-  
-  /**
-   * Create a new EchoLogger.
-   * 
-   * @param boolean $isHtml
-   */
-  public function __construct($isHtml = true)
-  {
-    $this->_isHtml = $isHtml;
-  }
-  
-  /**
-   * Add a log entry.
-   * @param string $entry
-   */
-  public function add($entry)
-  {
-    if ($this->_isHtml)
-    {
-      printf('%s%s%s', htmlspecialchars($entry, ENT_QUOTES), '<br />', PHP_EOL);
-    }
-    else
-    {
-      printf('%s%s', $entry, PHP_EOL);
-    }
-  }
-  
-  /**
-   * Not implemented.
-   */
-  public function clear()
-  {
-  }
-  
-  /**
-   * Not implemented.
-   */
-  public function dump()
-  {
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Pop/Pop3Connection.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Pop/Pop3Connection.php
deleted file mode 100644
index 1c96dcfaf..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Pop/Pop3Connection.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Pop3Connection interface for connecting and disconnecting to a POP3 host.
- * 
- * @package Swift
- * @subpackage Plugins
- * 
- * @author Chris Corbyn
- */
-interface Swift_Plugins_Pop_Pop3Connection
-{
-  
-  /**
-   * Connect to the POP3 host and throw an Exception if it fails.
-   * 
-   * @throws Swift_Plugins_Pop_Pop3Exception
-   */
-  public function connect();
-  
-  /**
-   * Disconnect from the POP3 host and throw an Exception if it fails.
-   * 
-   * @throws Swift_Plugins_Pop_Pop3Exception
-   */
-  public function disconnect();
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/PopBeforeSmtpPlugin.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
deleted file mode 100644
index fd1cf467f..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Events/TransportChangeListener.php';
-//@require 'Swift/Events/TransportChangeEvent.php';
-
-/**
- * Makes sure a connection to a POP3 host has been established prior to connecting to SMTP.
- * 
- * @package Swift
- * @subpackage Plugins
- * 
- * @author Chris Corbyn
- */
-class Swift_Plugins_PopBeforeSmtpPlugin
-  implements Swift_Events_TransportChangeListener, Swift_Plugins_Pop_Pop3Connection
-{
-  
-  /** A delegate connection to use (mostly a test hook) */
-  private $_connection;
-  
-  /** Hostname of the POP3 server */
-  private $_host;
-  
-  /** Port number to connect on */
-  private $_port;
-  
-  /** Encryption type to use (if any) */
-  private $_crypto;
-  
-  /** Username to use (if any) */
-  private $_username;
-  
-  /** Password to use (if any) */
-  private $_password;
-  
-  /** Established connection via TCP socket */
-  private $_socket;
-  
-  /** Connect timeout in seconds */
-  private $_timeout = 10;
-  
-  /** SMTP Transport to bind to */
-  private $_transport;
-  
-  /**
-   * Create a new PopBeforeSmtpPlugin for $host and $port.
-   * 
-   * @param string $host
-   * @param int $port
-   * @param string $cypto as "tls" or "ssl"
-   */
-  public function __construct($host, $port = 110, $crypto = null)
-  {
-    $this->_host = $host;
-    $this->_port = $port;
-    $this->_crypto = $crypto;
-  }
-  
-  /**
-   * Create a new PopBeforeSmtpPlugin for $host and $port.
-   * 
-   * @param string $host
-   * @param int $port
-   * @param string $cypto as "tls" or "ssl"
-   * 
-   * @return Swift_Plugins_PopBeforeSmtpPlugin
-   */
-  public static function newInstance($host, $port = 110, $crypto = null)
-  {
-    return new self($host, $port, $crypto);
-  }
-  
-  /**
-   * Set a Pop3Connection to delegate to instead of connecting directly.
-   * 
-   * @param Swift_Plugins_Pop_Pop3Connection $connection
-   */
-  public function setConnection(Swift_Plugins_Pop_Pop3Connection $connection)
-  {
-    $this->_connection = $connection;
-    return $this;
-  }
-  
-  /**
-   * Bind this plugin to a specific SMTP transport instance.
-   * 
-   * @param Swift_Transport
-   */
-  public function bindSmtp(Swift_Transport $smtp)
-  {
-    $this->_transport = $smtp;
-  }
-  
-  /**
-   * Set the connection timeout in seconds (default 10).
-   * 
-   * @param int $timeout
-   */
-  public function setTimeout($timeout)
-  {
-    $this->_timeout = (int) $timeout;
-    return $this;
-  }
-  
-  /**
-   * Set the username to use when connecting (if needed).
-   * 
-   * @param string $username
-   */
-  public function setUsername($username)
-  {
-    $this->_username = $username;
-    return $this;
-  }
-  
-  /**
-   * Set the password to use when connecting (if needed).
-   * 
-   * @param string $password
-   */
-  public function setPassword($password)
-  {
-    $this->_password = $password;
-    return $this;
-  }
-  
-  /**
-   * Connect to the POP3 host and authenticate.
-   * 
-   * @throws Swift_Plugins_Pop_Pop3Exception if connection fails
-   */
-  public function connect()
-  {
-    if (isset($this->_connection))
-    {
-      $this->_connection->connect();
-    }
-    else
-    {
-      if (!isset($this->_socket))
-      {
-        if (!$socket = fsockopen(
-          $this->_getHostString(), $this->_port, $errno, $errstr, $this->_timeout))
-        {
-          throw new Swift_Plugins_Pop_Pop3Exception(
-            sprintf('Failed to connect to POP3 host [%s]: %s', $this->_host, $errstr)
-          );
-        }
-        $this->_socket = $socket;
-        
-        if (false === $greeting = fgets($this->_socket))
-        {
-          throw new Swift_Plugins_Pop_Pop3Exception(
-            sprintf('Failed to connect to POP3 host [%s]', trim($greeting))
-          );
-        }
-        
-        $this->_assertOk($greeting);
-        
-        if ($this->_username)
-        {
-          $this->_command(sprintf("USER %s\r\n", $this->_username));
-          $this->_command(sprintf("PASS %s\r\n", $this->_password));
-        }
-      }
-    }
-  }
-  
-  /**
-   * Disconnect from the POP3 host.
-   */
-  public function disconnect()
-  {
-    if (isset($this->_connection))
-    {
-      $this->_connection->disconnect();
-    }
-    else
-    {
-      $this->_command("QUIT\r\n");
-      if (!fclose($this->_socket))
-      {
-        throw new Swift_Plugins_Pop_Pop3Exception(
-          sprintf('POP3 host [%s] connection could not be stopped', $this->_host)
-        );
-      }
-      $this->_socket = null;
-    }
-  }
-  
-  /**
-   * Invoked just before a Transport is started.
-   * 
-   * @param Swift_Events_TransportChangeEvent $evt
-   */
-  public function beforeTransportStarted(Swift_Events_TransportChangeEvent $evt)
-  {
-    if (isset($this->_transport))
-    {
-      if ($this->_transport !== $evt->getTransport())
-      {
-        return;
-      }
-    }
-    
-    $this->connect();
-    $this->disconnect();
-  }
-  
-  /**
-   * Not used.
-   */
-  public function transportStarted(Swift_Events_TransportChangeEvent $evt)
-  {
-  }
-  
-  /**
-   * Not used.
-   */
-  public function beforeTransportStopped(Swift_Events_TransportChangeEvent $evt)
-  {
-  }
-  
-  /**
-   * Not used.
-   */
-  public function transportStopped(Swift_Events_TransportChangeEvent $evt)
-  {
-  }
-  
-  // -- Private Methods
-  
-  private function _command($command)
-  {
-    if (!fwrite($this->_socket, $command))
-    {
-      throw new Swift_Plugins_Pop_Pop3Exception(
-        sprintf('Failed to write command [%s] to POP3 host', trim($command))
-      );
-    }
-    
-    if (false === $response = fgets($this->_socket))
-    {
-      throw new Swift_Plugins_Pop_Pop3Exception(
-        sprintf('Failed to read from POP3 host after command [%s]', trim($command))
-      );
-    }
-    
-    $this->_assertOk($response);
-    
-    return $response;
-  }
-  
-  private function _assertOk($response)
-  {
-    if (substr($response, 0, 3) != '+OK')
-    {
-      throw new Swift_Plugins_Pop_Pop3Exception(
-        sprintf('POP3 command failed [%s]', trim($response))
-      );
-    }
-  }
-  
-  private function _getHostString()
-  {
-    $host = $this->_host;
-    switch (strtolower($this->_crypto))
-    {
-      case 'ssl':
-        $host = 'ssl://' . $host;
-        break;
-      
-      case 'tls':
-        $host = 'tls://' . $host;
-        break;
-    }
-    return $host;
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/RedirectingPlugin.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/RedirectingPlugin.php
deleted file mode 100644
index 71a3e6094..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/RedirectingPlugin.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2009 Fabien Potencier
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Redirects all email to a single recipient.
- * @package Swift
- * @subpackage Plugins
- * @author Fabien Potencier
- */
-class Swift_Plugins_RedirectingPlugin
-  implements Swift_Events_SendListener
-{
-  /**
-   * The recipient who will receive all messages.
-   * @var string
-   * @access private
-   */
-  private $_recipient;
-  
-  /**
-   * Create a new RedirectingPlugin.
-   * @param int $recipient
-   */
-  public function __construct($recipient)
-  {
-    $this->_recipient = $recipient;
-  }
-  
-  /**
-   * Set the recipient of all messages.
-   * @param int $threshold
-   */
-  public function setRecipient($recipient)
-  {
-    $this->_recipient = $recipient;
-  }
-  
-  /**
-   * Get the recipient of all messages.
-   * @return int
-   */
-  public function getRecipient()
-  {
-    return $this->_recipient;
-  }
-  
-  /**
-   * Invoked immediately before the Message is sent.
-   * @param Swift_Events_SendEvent $evt
-   */
-  public function beforeSendPerformed(Swift_Events_SendEvent $evt)
-  {
-    $message = $evt->getMessage();
-    $headers = $message->getHeaders();
-
-    // save current recipients
-    $headers->addMailboxHeader('X-Swift-To', $message->getTo());
-    $headers->addMailboxHeader('X-Swift-Cc', $message->getCc());
-    $headers->addMailboxHeader('X-Swift-Bcc', $message->getBcc());
-
-    // replace them with the one to send to
-    $message->setTo($this->_recipient);
-    $headers->removeAll('Cc');
-    $headers->removeAll('Bcc');
-  }
-  
-  /**
-   * Invoked immediately after the Message is sent.
-   * 
-   * @param Swift_Events_SendEvent $evt
-   */
-  public function sendPerformed(Swift_Events_SendEvent $evt)
-  {
-    $this->_restoreMessage($evt->getMessage());
-  }
-  
-  // -- Private methods
-  
-  private function _restoreMessage(Swift_Mime_Message $message)
-  {
-    // restore original headers
-    $headers = $message->getHeaders();
-
-    if ($headers->has('X-Swift-To'))
-    {
-      $message->setTo($headers->get('X-Swift-To')->getNameAddresses());
-      $headers->removeAll('X-Swift-To');
-    }
-
-    if ($headers->has('X-Swift-Cc'))
-    {
-      $message->setCc($headers->get('X-Swift-Cc')->getNameAddresses());
-      $headers->removeAll('X-Swift-Cc');
-    }
-
-    if ($headers->has('X-Swift-Bcc'))
-    {
-      $message->setBcc($headers->get('X-Swift-Bcc')->getNameAddresses());
-      $headers->removeAll('X-Swift-Bcc');
-    }
-  }
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Reporter.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Reporter.php
deleted file mode 100644
index 00d5765d7..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Reporter.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/Message.php';
-
-/**
- * The Reporter plugin sends pass/fail notification to a Reporter.
- * @package Swift
- * @subpackage Plugins
- * @author Chris Corbyn
- */
-interface Swift_Plugins_Reporter
-{
-  
-  /** The recipient was accepted for delivery */
-  const RESULT_PASS = 0x01;
-  
-  /** The recipient could not be accepted */
-  const RESULT_FAIL = 0x10;
-  
-  /**
-   * Notifies this ReportNotifier that $address failed or succeeded.
-   * @param Swift_Mime_Message $message
-   * @param string $address
-   * @param int $result from {@link RESULT_PASS, RESULT_FAIL}
-   */
-  public function notify(Swift_Mime_Message $message, $address, $result);
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/ReporterPlugin.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/ReporterPlugin.php
deleted file mode 100644
index 1beac5b9f..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/ReporterPlugin.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Events/SendListener.php';
-//@require 'Swift/Events/SendEvent.php';
-//@require 'Swift/Plugins/Reporter.php';
-
-/**
- * Does real time reporting of pass/fail for each recipient.
- * @package Swift
- * @subpackage Plugins
- * @author Chris Corbyn
- */
-class Swift_Plugins_ReporterPlugin
-  implements Swift_Events_SendListener
-{
-  
-  /**
-   * The reporter backend which takes notifications.
-   * @var Swift_Plugin_Reporter
-   * @access private
-   */
-  private $_reporter;
-  
-  /**
-   * Create a new ReporterPlugin using $reporter.
-   * @param Swift_Plugins_Reporter $reporter
-   */
-  public function __construct(Swift_Plugins_Reporter $reporter)
-  {
-    $this->_reporter = $reporter;
-  }
-  
-  /**
-   * Not used.
-   */
-  public function beforeSendPerformed(Swift_Events_SendEvent $evt)
-  {
-  }
-  
-  /**
-   * Invoked immediately after the Message is sent.
-   * @param Swift_Events_SendEvent $evt
-   */
-  public function sendPerformed(Swift_Events_SendEvent $evt)
-  {
-    $message = $evt->getMessage();
-    $failures = array_flip($evt->getFailedRecipients());
-    foreach ((array) $message->getTo() as $address => $null)
-    {
-      $this->_reporter->notify(
-        $message, $address, (array_key_exists($address, $failures)
-        ? Swift_Plugins_Reporter::RESULT_FAIL
-        : Swift_Plugins_Reporter::RESULT_PASS)
-        );
-    }
-    foreach ((array) $message->getCc() as $address => $null)
-    {
-      $this->_reporter->notify(
-        $message, $address, (array_key_exists($address, $failures)
-        ? Swift_Plugins_Reporter::RESULT_FAIL
-        : Swift_Plugins_Reporter::RESULT_PASS)
-        );
-    }
-    foreach ((array) $message->getBcc() as $address => $null)
-    {
-      $this->_reporter->notify(
-        $message, $address, (array_key_exists($address, $failures)
-        ? Swift_Plugins_Reporter::RESULT_FAIL
-        : Swift_Plugins_Reporter::RESULT_PASS)
-        );
-    }
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Reporters/HitReporter.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Reporters/HitReporter.php
deleted file mode 100644
index 0022f5e65..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Reporters/HitReporter.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Plugins/Reporter.php';
-//@require 'Swift/Mime/Message.php';
-
-/**
- * A reporter which "collects" failures for the Reporter plugin.
- * @package Swift
- * @subpackage Plugins
- * @author Chris Corbyn
- */
-class Swift_Plugins_Reporters_HitReporter implements Swift_Plugins_Reporter
-{
-  
-  /**
-   * The list of failures.
-   * @var array
-   * @access private
-   */
-  private $_failures = array();
-  private $_failures_cache = array();
-  
-  /**
-   * Notifies this ReportNotifier that $address failed or succeeded.
-   * @param Swift_Mime_Message $message
-   * @param string $address
-   * @param int $result from {@link RESULT_PASS, RESULT_FAIL}
-   */
-  public function notify(Swift_Mime_Message $message, $address, $result)
-  {
-    if (self::RESULT_FAIL == $result && !isset($this->_failures_cache[$address]))
-    {
-      $this->_failures[] = $address;
-      $this->_failures_cache[$address] = true;
-    }
-  }
-  
-  /**
-   * Get an array of addresses for which delivery failed.
-   * @return array
-   */
-  public function getFailedRecipients()
-  {
-    return $this->_failures;
-  }
-  
-  /**
-   * Clear the buffer (empty the list).
-   */
-  public function clear()
-  {
-    $this->_failures = $this->_failures_cache = array();
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Reporters/HtmlReporter.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Reporters/HtmlReporter.php
deleted file mode 100644
index 73700780e..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Reporters/HtmlReporter.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Plugins/Reporter.php';
-//@require 'Swift/Mime/Message.php';
-
-/**
- * A HTML output reporter for the Reporter plugin.
- * @package Swift
- * @subpackage Plugins
- * @author Chris Corbyn
- */
-class Swift_Plugins_Reporters_HtmlReporter implements Swift_Plugins_Reporter
-{
-  
-  /**
-   * Notifies this ReportNotifier that $address failed or succeeded.
-   * @param Swift_Mime_Message $message
-   * @param string $address
-   * @param int $result from {@link RESULT_PASS, RESULT_FAIL}
-   */
-  public function notify(Swift_Mime_Message $message, $address, $result)
-  {
-    if (self::RESULT_PASS == $result)
-    {
-      echo "<div style=\"color: #fff; background: #006600; padding: 2px; margin: 2px;\">" . PHP_EOL;
-      echo "PASS " . $address . PHP_EOL;
-      echo "</div>" . PHP_EOL;
-      flush();
-    }
-    else
-    {
-      echo "<div style=\"color: #fff; background: #880000; padding: 2px; margin: 2px;\">" . PHP_EOL;
-      echo "FAIL " . $address . PHP_EOL;
-      echo "</div>" . PHP_EOL;
-      flush();
-    }
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/ThrottlerPlugin.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/ThrottlerPlugin.php
deleted file mode 100644
index 43bb1f48c..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/ThrottlerPlugin.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Events/SendEvent.php';
-//@require 'Swift/Plugins/BandwidthMonitorPlugin.php';
-//@require 'Swift/Plugins/Sleeper.php';
-//@require 'Swift/Plugins/Timer.php';
-
-/**
- * Throttles the rate at which emails are sent.
- * @package Swift
- * @subpackage Plugins
- * @author Chris Corbyn
- */
-class Swift_Plugins_ThrottlerPlugin
-  extends Swift_Plugins_BandwidthMonitorPlugin
-  implements Swift_Plugins_Sleeper, Swift_Plugins_Timer
-{
-  
-  /** Flag for throttling in bytes per minute */
-  const BYTES_PER_MINUTE = 0x01;
-  
-  /** Flag for throttling in emails per minute */
-  const MESSAGES_PER_MINUTE = 0x10;
-  
-  /**
-   * The Sleeper instance for sleeping.
-   * @var Swift_Plugins_Sleeper
-   * @access private
-   */
-  private $_sleeper;
-  
-  /**
-   * The Timer instance which provides the timestamp.
-   * @var Swift_Plugins_Timer
-   * @access private
-   */
-  private $_timer;
-  
-  /**
-   * The time at which the first email was sent.
-   * @var int
-   * @access private
-   */
-  private $_start;
-  
-  /**
-   * The rate at which messages should be sent.
-   * @var int
-   * @access private
-   */
-  private $_rate;
-  
-  /**
-   * The mode for throttling.
-   * This is {@link BYTES_PER_MINUTE} or {@link MESSAGES_PER_MINUTE}
-   * @var int
-   * @access private
-   */
-  private $_mode;
-  
-  /**
-   * An internal counter of the number of messages sent.
-   * @var int
-   * @access private
-   */
-  private $_messages = 0;
-  
-  /**
-   * Create a new ThrottlerPlugin.
-   * @param int $rate
-   * @param int $mode, defaults to {@link BYTES_PER_MINUTE}
-   * @param Swift_Plugins_Sleeper $sleeper (only needed in testing)
-   * @param Swift_Plugins_Timer $timer (only needed in testing)
-   */
-  public function __construct($rate, $mode = self::BYTES_PER_MINUTE,
-    Swift_Plugins_Sleeper $sleeper = null, Swift_Plugins_Timer $timer = null)
-  {
-    $this->_rate = $rate;
-    $this->_mode = $mode;
-    $this->_sleeper = $sleeper;
-    $this->_timer = $timer;
-  }
-  
-  /**
-   * Invoked immediately before the Message is sent.
-   * @param Swift_Events_SendEvent $evt
-   */
-  public function beforeSendPerformed(Swift_Events_SendEvent $evt)
-  {
-    $time = $this->getTimestamp();
-    if (!isset($this->_start))
-    {
-      $this->_start = $time;
-    }
-    $duration = $time - $this->_start;
-    
-    if (self::BYTES_PER_MINUTE == $this->_mode)
-    {
-      $sleep = $this->_throttleBytesPerMinute($duration);
-    }
-    else
-    {
-      $sleep = $this->_throttleMessagesPerMinute($duration);
-    }
-    
-    if ($sleep > 0)
-    {
-      $this->sleep($sleep);
-    }
-  }
-  
-  /**
-   * Invoked when a Message is sent.
-   * @param Swift_Events_SendEvent $evt
-   */
-  public function sendPerformed(Swift_Events_SendEvent $evt)
-  {
-    parent::sendPerformed($evt);
-    ++$this->_messages;
-  }
-  
-  /**
-   * Sleep for $seconds.
-   * @param int $seconds
-   */
-  public function sleep($seconds)
-  {
-    if (isset($this->_sleeper))
-    {
-      $this->_sleeper->sleep($seconds);
-    }
-    else
-    {
-      sleep($seconds);
-    }
-  }
-  
-  /**
-   * Get the current UNIX timestamp
-   * @return int
-   */
-  public function getTimestamp()
-  {
-    if (isset($this->_timer))
-    {
-      return $this->_timer->getTimestamp();
-    }
-    else
-    {
-      return time();
-    }
-  }
-  
-  // -- Private methods
-  
-  /**
-   * Get a number of seconds to sleep for.
-   * @param int $timePassed
-   * @return int
-   * @access private
-   */
-  private function _throttleBytesPerMinute($timePassed)
-  {
-    $expectedDuration = $this->getBytesOut() / ($this->_rate / 60);
-    return (int) ceil($expectedDuration - $timePassed);
-  }
-  
-  /**
-   * Get a number of seconds to sleep for.
-   * @param int $timePassed
-   * @return int
-   * @access private
-   */
-  private function _throttleMessagesPerMinute($timePassed)
-  {
-    $expectedDuration = $this->_messages / ($this->_rate / 60);
-    return (int) ceil($expectedDuration - $timePassed);
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Preferences.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Preferences.php
deleted file mode 100644
index 20a2e5f18..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Preferences.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/DependencyContainer.php';
-
-/**
- * Changes some global preference settings in Swift Mailer.
- * @package Swift
- * @author Chris Corbyn
- */
-class Swift_Preferences
-{
-  
-  /** Singleton instance */
-  private static $_instance = null;
-  
-  /** Constructor not to be used */
-  private function __construct() { }
-  
-  /**
-   * Get a new instance of Preferences.
-   * @return Swift_Preferences
-   */
-  public static function getInstance()
-  {
-    if (!isset(self::$_instance))
-    {
-      self::$_instance = new self();
-    }
-    return self::$_instance;
-  }
-  
-  /**
-   * Set the default charset used.
-   * @param string
-   * @return Swift_Preferences
-   */
-  public function setCharset($charset)
-  {
-    Swift_DependencyContainer::getInstance()
-      ->register('properties.charset')->asValue($charset);
-    return $this;
-  }
-  
-  /**
-   * Set the directory where temporary files can be saved.
-   * @param string $dir
-   * @return Swift_Preferences
-   */
-  public function setTempDir($dir)
-  {
-    Swift_DependencyContainer::getInstance()
-      ->register('tempdir')->asValue($dir);
-    return $this;
-  }
-  
-  /**
-   * Set the type of cache to use (i.e. "disk" or "array").
-   * @param string $type
-   * @return Swift_Preferences
-   */
-  public function setCacheType($type)
-  {
-    Swift_DependencyContainer::getInstance()
-      ->register('cache')->asAliasOf(sprintf('cache.%s', $type));
-    return $this;
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/SendmailTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/SendmailTransport.php
deleted file mode 100644
index 60a700076..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/SendmailTransport.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Transport/SendmailTransport.php';
-//@require 'Swift/DependencyContainer.php';
-
-/**
- * SendmailTransport for sending mail through a sendmail/postfix (etc..) binary.
- * @package Swift
- * @subpackage Transport
- * @author Chris Corbyn
- */
-class Swift_SendmailTransport extends Swift_Transport_SendmailTransport
-{
-  
-  /**
-   * Create a new SendmailTransport, optionally using $command for sending.
-   * @param string $command
-   */
-  public function __construct($command = '/usr/sbin/sendmail -bs')
-  {
-    call_user_func_array(
-      array($this, 'Swift_Transport_SendmailTransport::__construct'),
-      Swift_DependencyContainer::getInstance()
-        ->createDependenciesFor('transport.sendmail')
-      );
-    
-    $this->setCommand($command);
-  }
-  
-  /**
-   * Create a new SendmailTransport instance.
-   * @param string $command
-   * @return Swift_SendmailTransport
-   */
-  public static function newInstance($command = '/usr/sbin/sendmail -bs')
-  {
-    return new self($command);
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/SmtpTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/SmtpTransport.php
deleted file mode 100644
index 65180d587..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/SmtpTransport.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Transport/EsmtpTransport.php';
-//@require 'Swift/DependencyContainer.php';
-
-/**
- * Sends Messages over SMTP with ESMTP support.
- * @package Swift
- * @subpackage Transport
- * @author Chris Corbyn
- */
-class Swift_SmtpTransport extends Swift_Transport_EsmtpTransport
-{
-  
-  /**
-   * Create a new SmtpTransport, optionally with $host, $port and $security.
-   * @param string $host
-   * @param int $port
-   * @param int $security
-   */
-  public function __construct($host = 'localhost', $port = 25,
-    $security = null)
-  {
-    call_user_func_array(
-      array($this, 'Swift_Transport_EsmtpTransport::__construct'),
-      Swift_DependencyContainer::getInstance()
-        ->createDependenciesFor('transport.smtp')
-      );
-    
-    $this->setHost($host);
-    $this->setPort($port);
-    $this->setEncryption($security);
-  }
-  
-  /**
-   * Create a new SmtpTransport instance.
-   * @param string $host
-   * @param int $port
-   * @param int $security
-   * @return Swift_SmtpTransport
-   */
-  public static function newInstance($host = 'localhost', $port = 25,
-    $security = null)
-  {
-    return new self($host, $port, $security);
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Spool.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Spool.php
deleted file mode 100644
index 6d0670975..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Spool.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2009 Fabien Potencier <fabien.potencier@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Interface for spools.
- * @package Swift
- * @author  Fabien Potencier
- */
-interface Swift_Spool
-{
-  /**
-   * Starts this Spool mechanism.
-   */
-  public function start();
-
-  /**
-   * Stops this Spool mechanism.
-   */
-  public function stop();
-
-  /**
-   * Tests if this Spool mechanism has started.
-   *
-   * @return boolean
-   */
-  public function isStarted();
-
-  /**
-   * Queues a message.
-   * @param Swift_Mime_Message $message The message to store
-   */
-  public function queueMessage(Swift_Mime_Message $message);
-
-  /**
-   * Sends messages using the given transport instance.
-   *
-   * @param Swift_Transport $transport         A transport instance
-   * @param string[]        &$failedRecipients An array of failures by-reference
-   *
-   * @return int The number of sent emails
-   */
-  public function flushQueue(Swift_Transport $transport, &$failedRecipients = null);
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/SpoolTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/SpoolTransport.php
deleted file mode 100644
index 156f9b6a8..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/SpoolTransport.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2009 Fabien Potencier <fabien.potencier@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Stores Messages in a queue.
- * @package Swift
- * @author  Fabien Potencier
- */
-class Swift_SpoolTransport extends Swift_Transport_SpoolTransport
-{
-  /**
-   * Create a new SpoolTransport.
-   * @param Swift_Spool $spool
-   */
-  public function __construct(Swift_Spool $spool)
-  {
-    $arguments = Swift_DependencyContainer::getInstance()
-      ->createDependenciesFor('transport.spool');
-
-    $arguments[] = $spool;
-
-    call_user_func_array(
-      array($this, 'Swift_Transport_SpoolTransport::__construct'),
-      $arguments
-    );
-  }
-  
-  /**
-   * Create a new SpoolTransport instance.
-   * @param Swift_Spool $spool
-   * @return Swift_SpoolTransport
-   */
-  public static function newInstance(Swift_Spool $spool)
-  {
-    return new self($spool);
-  }
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/StreamFilter.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/StreamFilter.php
deleted file mode 100644
index 6c262ce3a..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/StreamFilter.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Processes bytes as they pass through a stream and performs filtering.
- * @package Swift
- * @author Chris Corbyn
- */
-interface Swift_StreamFilter
-{
-  
-  /**
-   * Based on the buffer given, this returns true if more buffering is needed.
-   * @param mixed $buffer
-   * @return boolean
-   */
-  public function shouldBuffer($buffer);
-  
-  /**
-   * Filters $buffer and returns the changes.
-   * @param mixed $buffer
-   * @return mixed
-   */
-  public function filter($buffer);
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
deleted file mode 100644
index 2df52be1b..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/StreamFilter.php';
-
-/**
- * Processes bytes as they pass through a buffer and replaces sequences in it.
- * This stream filter deals with Byte arrays rather than simple strings.
- * @package Swift
- * @author Chris Corbyn
- */
-class Swift_StreamFilters_ByteArrayReplacementFilter
-  implements Swift_StreamFilter
-{
-
-  /** The needle(s) to search for */
-  private $_search;
-
-  /** The replacement(s) to make */
-  private $_replace;
-
-  /** The Index for searching */
-  private $_index;
-
-  /** The Search Tree */
-  private $_tree = array();
-
-  /**  Gives the size of the largest search */
-  private $_treeMaxLen = 0;
-  
-  private $_repSize;
-
-  /**
-   * Create a new ByteArrayReplacementFilter with $search and $replace.
-   * @param array $search
-   * @param array $replace
-   */
-  public function __construct($search, $replace)
-  {
-    $this->_search = $search;
-    $this->_index = array();
-    $this->_tree = array();
-    $this->_replace = array();
-    $this->_repSize = array();
-    
-    $tree = null;
-    $i = null;
-    $last_size = $size = 0;
-    foreach ($search as $i => $search_element)
-    {
-      if ($tree !== null)
-      {
-        $tree[-1] = min (count($replace) - 1, $i - 1);
-        $tree[-2] = $last_size;
-      }
-      $tree = &$this->_tree;
-      if (is_array ($search_element))
-      {
-        foreach ($search_element as $k => $char)
-        {
-          $this->_index[$char] = true;
-          if (!isset($tree[$char]))
-          {
-            $tree[$char] = array();
-          }
-          $tree = &$tree[$char];
-        }
-        $last_size = $k+1;
-        $size = max($size, $last_size);
-      }
-      else
-      {
-        $last_size = 1;
-        if (!isset($tree[$search_element]))
-        {
-          $tree[$search_element] = array();
-        }
-        $tree = &$tree[$search_element];
-        $size = max($last_size, $size);
-        $this->_index[$search_element] = true;
-      }
-    }
-    if ($i !== null)
-    {
-      $tree[-1] = min (count ($replace) - 1, $i);
-      $tree[-2] = $last_size;
-      $this->_treeMaxLen = $size;
-    }
-    foreach ($replace as $rep)
-    {
-      if (!is_array($rep))
-      {
-        $rep = array ($rep);
-      }
-      $this->_replace[] = $rep;
-    }
-    for ($i = count($this->_replace) - 1; $i >= 0; --$i)
-    {
-      $this->_replace[$i] = $rep = $this->filter($this->_replace[$i], $i);
-      $this->_repSize[$i] = count($rep);
-    }
-  }
-
-  /**
-   * Returns true if based on the buffer passed more bytes should be buffered.
-   * @param array $buffer
-   * @return boolean
-   */
-  public function shouldBuffer($buffer)
-  {
-    $endOfBuffer = end($buffer);
-    return isset ($this->_index[$endOfBuffer]);
-  }
-
-  /**
-   * Perform the actual replacements on $buffer and return the result.
-   * @param array $buffer
-   * @return array
-   */
-  public function filter($buffer, $_minReplaces = -1)
-  {
-    if ($this->_treeMaxLen == 0)
-    {
-      return $buffer;
-    }
-    
-    $newBuffer = array();
-    $buf_size = count($buffer);
-    for ($i = 0; $i < $buf_size; ++$i)
-    {
-      $search_pos = $this->_tree;
-      $last_found = PHP_INT_MAX;
-      // We try to find if the next byte is part of a search pattern
-      for ($j = 0; $j <= $this->_treeMaxLen; ++$j)
-      {
-        // We have a new byte for a search pattern
-        if (isset ($buffer [$p = $i + $j]) && isset($search_pos[$buffer[$p]]))
-        {
-          $search_pos = $search_pos[$buffer[$p]];
-          // We have a complete pattern, save, in case we don't find a better match later
-          if (isset($search_pos[- 1]) && $search_pos[-1] < $last_found
-            && $search_pos[-1] > $_minReplaces)
-          {
-            $last_found = $search_pos[-1];
-            $last_size = $search_pos[-2];
-          }
-        }
-        // We got a complete pattern
-        elseif ($last_found !== PHP_INT_MAX)
-        {
-          // Adding replacement datas to output buffer
-          $rep_size = $this->_repSize[$last_found];
-          for ($j = 0; $j < $rep_size; ++$j)
-          {
-            $newBuffer[] = $this->_replace[$last_found][$j];
-          }
-          // We Move cursor forward
-          $i += $last_size - 1;
-          // Edge Case, last position in buffer
-          if ($i >= $buf_size)
-          {
-            $newBuffer[] = $buffer[$i];
-          }
-          
-          // We start the next loop
-          continue 2;
-        }
-        else
-        {
-          // this byte is not in a pattern and we haven't found another pattern
-          break;
-        }
-      }
-      // Normal byte, move it to output buffer
-      $newBuffer[] = $buffer[$i];
-    }
-    
-    return $newBuffer;
-  }
-
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/StreamFilters/StringReplacementFilter.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/StreamFilters/StringReplacementFilter.php
deleted file mode 100644
index 9ab6c3085..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/StreamFilters/StringReplacementFilter.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/StreamFilter.php';
-
-/**
- * Processes bytes as they pass through a buffer and replaces sequences in it.
- * @package Swift
- * @author Chris Corbyn
- */
-class Swift_StreamFilters_StringReplacementFilter implements Swift_StreamFilter
-{
-  
-  /** The needle(s) to search for */
-  private $_search;
-  
-  /** The replacement(s) to make */
-  private $_replace;
-  
-  /**
-   * Create a new StringReplacementFilter with $search and $replace.
-   * @param string|array $search
-   * @param string|array $replace
-   */
-  public function __construct($search, $replace)
-  {
-    $this->_search = $search;
-    $this->_replace = $replace;
-  }
-  
-  /**
-   * Returns true if based on the buffer passed more bytes should be buffered.
-   * @param string $buffer
-   * @return boolean
-   */
-  public function shouldBuffer($buffer)
-  {
-    $endOfBuffer = substr($buffer, -1);
-    foreach ((array) $this->_search as $needle)
-    {
-      if (false !== strpos($needle, $endOfBuffer))
-      {
-        return true;
-      }
-    }
-    return false;
-  }
-  
-  /**
-   * Perform the actual replacements on $buffer and return the result.
-   * @param string $buffer
-   * @return string
-   */
-  public function filter($buffer)
-  {
-    return str_replace($this->_search, $this->_replace, $buffer);
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/StreamFilters/StringReplacementFilterFactory.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
deleted file mode 100644
index fcd4b830c..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/StreamFilters/StringReplacementFilter.php';
-//@require 'Swift/StreamFilterFactory.php';
-
-/**
- * Creates filters for replacing needles in a string buffer.
- * @package Swift
- * @author Chris Corbyn
- */
-class Swift_StreamFilters_StringReplacementFilterFactory
-  implements Swift_ReplacementFilterFactory
-{
-  
-  /** Lazy-loaded filters */
-  private $_filters = array();
-  
-  /**
-   * Create a new StreamFilter to replace $search with $replace in a string.
-   * @param string $search
-   * @param string $replace
-   * @return Swift_StreamFilter
-   */
-  public function createFilter($search, $replace)
-  {
-    if (!isset($this->_filters[$search][$replace]))
-    {
-      if (!isset($this->_filters[$search]))
-      {
-        $this->_filters[$search] = array();
-      }
-      
-      if (!isset($this->_filters[$search][$replace]))
-      {
-        $this->_filters[$search][$replace] = array();
-      }
-      
-      $this->_filters[$search][$replace]
-        = new Swift_StreamFilters_StringReplacementFilter($search, $replace);
-    }
-    
-    return $this->_filters[$search][$replace];
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/SwiftException.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/SwiftException.php
deleted file mode 100644
index bd3b656a5..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/SwiftException.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Base Exception class.
- * @package Swift
- * @author Chris Corbyn
- */
-class Swift_SwiftException extends Exception
-{
-  
-  /**
-   * Create a new SwiftException with $message.
-   * @param string $message
-   */
-  public function __construct($message)
-  {
-    parent::__construct($message);
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport.php
deleted file mode 100644
index 9b54752fb..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Mime/Message.php';
-//@require 'Swift/Events/EventListener.php';
-
-/**
- * Sends Messages via an abstract Transport subsystem.
- * 
- * @package Swift
- * @subpackage Transport
- * @author Chris Corbyn
- */
-interface Swift_Transport
-{
-
-  /**
-   * Test if this Transport mechanism has started.
-   * 
-   * @return boolean
-   */
-  public function isStarted();
-  
-  /**
-   * Start this Transport mechanism.
-   */
-  public function start();
-  
-  /**
-   * Stop this Transport mechanism.
-   */
-  public function stop();
-  
-  /**
-   * Send the given Message.
-   * 
-   * Recipient/sender data will be retreived from the Message API.
-   * The return value is the number of recipients who were accepted for delivery.
-   * 
-   * @param Swift_Mime_Message $message
-   * @param string[] &$failedRecipients to collect failures by-reference
-   * @return int
-   */
-  public function send(Swift_Mime_Message $message, &$failedRecipients = null);
-  
-  /**
-   * Register a plugin in the Transport.
-   * 
-   * @param Swift_Events_EventListener $plugin
-   */
-  public function registerPlugin(Swift_Events_EventListener $plugin);
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/AbstractSmtpTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/AbstractSmtpTransport.php
deleted file mode 100644
index 3329d34f7..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/AbstractSmtpTransport.php
+++ /dev/null
@@ -1,543 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Transport.php';
-//@require 'Swift/Transport/IoBuffer.php';
-//@require 'Swift/Transport/CommandSentException.php';
-//@require 'Swift/TransportException.php';
-//@require 'Swift/Mime/Message.php';
-//@require 'Swift/Events/EventDispatcher.php';
-//@require 'Swift/Events/EventListener.php';
-
-/**
- * Sends Messages over SMTP.
- * 
- * @package Swift
- * @subpackage Transport
- * @author Chris Corbyn
- */
-abstract class Swift_Transport_AbstractSmtpTransport
-  implements Swift_Transport
-{
-  
-  /** Input-Output buffer for sending/receiving SMTP commands and responses */
-  protected $_buffer;
-  
-  /** Connection status */
-  protected $_started = false;
-  
-  /** The domain name to use in HELO command */
-  protected $_domain = '[127.0.0.1]';
-  
-  /** The event dispatching layer */
-  protected $_eventDispatcher;
-  
-  /** Return an array of params for the Buffer */
-  abstract protected function _getBufferParams();
-  
-  /**
-   * Creates a new EsmtpTransport using the given I/O buffer.
-   * 
-   * @param Swift_Transport_IoBuffer $buf
-   * @param Swift_Events_EventDispatcher $dispatcher
-   */
-  public function __construct(Swift_Transport_IoBuffer $buf,
-    Swift_Events_EventDispatcher $dispatcher)
-  {
-    $this->_eventDispatcher = $dispatcher;
-    $this->_buffer = $buf;
-    $this->_lookupHostname();
-  }
-  
-  /**
-   * Set the name of the local domain which Swift will identify itself as.
-   * This should be a fully-qualified domain name and should be truly the domain
-   * you're using.  If your server doesn't have a domain name, use the IP in square
-   * brackets (i.e. [127.0.0.1]).
-   * 
-   * @param string $domain
-   */
-  public function setLocalDomain($domain)
-  {
-    $this->_domain = $domain;
-    return $this;
-  }
-  
-  /**
-   * Get the name of the domain Swift will identify as.
-   * 
-   * @return string
-   */
-  public function getLocalDomain()
-  {
-    return $this->_domain;
-  }
-  
-  /**
-   * Start the SMTP connection.
-   */
-  public function start()
-  {
-    if (!$this->_started)
-    {
-      if ($evt = $this->_eventDispatcher->createTransportChangeEvent($this))
-      {
-        $this->_eventDispatcher->dispatchEvent($evt, 'beforeTransportStarted');
-        if ($evt->bubbleCancelled())
-        {
-          return;
-        }
-      }
-      
-      try
-      {
-        $this->_buffer->initialize($this->_getBufferParams());
-      }
-      catch (Swift_TransportException $e)
-      {
-        $this->_throwException($e);
-      }
-      $this->_readGreeting();
-      $this->_doHeloCommand();
-      
-      if ($evt)
-      {
-        $this->_eventDispatcher->dispatchEvent($evt, 'transportStarted');
-      }
-      
-      $this->_started = true;
-    }
-  }
-  
-  /**
-   * Test if an SMTP connection has been established.
-   * 
-   * @return boolean
-   */
-  public function isStarted()
-  {
-    return $this->_started;
-  }
-  
-  /**
-   * Send the given Message.
-   * 
-   * Recipient/sender data will be retreived from the Message API.
-   * The return value is the number of recipients who were accepted for delivery.
-   * 
-   * @param Swift_Mime_Message $message
-   * @param string[] &$failedRecipients to collect failures by-reference
-   * @return int
-   */
-  public function send(Swift_Mime_Message $message, &$failedRecipients = null)
-  {
-    $sent = 0;
-    $failedRecipients = (array) $failedRecipients;
-    
-    if (!$reversePath = $this->_getReversePath($message))
-    {
-      throw new Swift_TransportException(
-        'Cannot send message without a sender address'
-        );
-    }
-    
-    if ($evt = $this->_eventDispatcher->createSendEvent($this, $message))
-    {
-      $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
-      if ($evt->bubbleCancelled())
-      {
-        return 0;
-      }
-    }
-    
-    $to = (array) $message->getTo();
-    $cc = (array) $message->getCc();
-    $bcc = (array) $message->getBcc();
-    
-    $message->setBcc(array());
-    
-    try
-    {
-      $sent += $this->_sendTo($message, $reversePath, $to, $failedRecipients);
-      $sent += $this->_sendCc($message, $reversePath, $cc, $failedRecipients);
-      $sent += $this->_sendBcc($message, $reversePath, $bcc, $failedRecipients);
-    }
-    catch (Exception $e)
-    {
-      $message->setBcc($bcc);
-      throw $e;
-    }
-    
-    $message->setBcc($bcc);
-    
-    if ($evt)
-    {
-      if ($sent == count($to) + count($cc) + count($bcc))
-      {
-        $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
-      }
-      elseif ($sent > 0)
-      {
-        $evt->setResult(Swift_Events_SendEvent::RESULT_TENTATIVE);
-      }
-      else
-      {
-        $evt->setResult(Swift_Events_SendEvent::RESULT_FAILED);
-      }
-      $evt->setFailedRecipients($failedRecipients);
-      $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
-    }
-    
-    $message->generateId(); //Make sure a new Message ID is used
-    
-    return $sent;
-  }
-  
-  /**
-   * Stop the SMTP connection.
-   */
-  public function stop()
-  {
-    if ($this->_started)
-    {
-      if ($evt = $this->_eventDispatcher->createTransportChangeEvent($this))
-      {
-        $this->_eventDispatcher->dispatchEvent($evt, 'beforeTransportStopped');
-        if ($evt->bubbleCancelled())
-        {
-          return;
-        }
-      }
-      
-      try
-      {
-        $this->executeCommand("QUIT\r\n", array(221));
-      }
-      catch (Swift_TransportException $e) {}
-      
-      try
-      {
-        $this->_buffer->terminate();
-      
-        if ($evt)
-        {
-          $this->_eventDispatcher->dispatchEvent($evt, 'transportStopped');
-        }
-      }
-      catch (Swift_TransportException $e)
-      {
-        $this->_throwException($e);
-      }
-    }
-    $this->_started = false;
-  }
-  
-  /**
-   * Register a plugin.
-   * 
-   * @param Swift_Events_EventListener $plugin
-   */
-  public function registerPlugin(Swift_Events_EventListener $plugin)
-  {
-    $this->_eventDispatcher->bindEventListener($plugin);
-  }
-  
-  /**
-   * Reset the current mail transaction.
-   */
-  public function reset()
-  {
-    $this->executeCommand("RSET\r\n", array(250));
-  }
-  
-  /**
-   * Get the IoBuffer where read/writes are occurring.
-   * 
-   * @return Swift_Transport_IoBuffer
-   */
-  public function getBuffer()
-  {
-    return $this->_buffer;
-  }
-  
-  /**
-   * Run a command against the buffer, expecting the given response codes.
-   * 
-   * If no response codes are given, the response will not be validated.
-   * If codes are given, an exception will be thrown on an invalid response.
-   * 
-   * @param string $command
-   * @param int[] $codes
-   * @param string[] &$failures
-   * @return string
-   */
-  public function executeCommand($command, $codes = array(), &$failures = null)
-  {
-    $failures = (array) $failures;
-    $seq = $this->_buffer->write($command);
-    $response = $this->_getFullResponse($seq);
-    if ($evt = $this->_eventDispatcher->createCommandEvent($this, $command, $codes))
-    {
-      $this->_eventDispatcher->dispatchEvent($evt, 'commandSent');
-    }
-    $this->_assertResponseCode($response, $codes);
-    return $response;
-  }
-  
-  // -- Protected methods
-  
-  /** Read the opening SMTP greeting */
-  protected function _readGreeting()
-  {
-    $this->_assertResponseCode($this->_getFullResponse(0), array(220));
-  }
-  
-  /** Send the HELO welcome */
-  protected function _doHeloCommand()
-  {
-    $this->executeCommand(
-      sprintf("HELO %s\r\n", $this->_domain), array(250)
-      );
-  }
-  
-  /** Send the MAIL FROM command */
-  protected function _doMailFromCommand($address)
-  {
-    $this->executeCommand(
-      sprintf("MAIL FROM: <%s>\r\n", $address), array(250)
-      );
-  }
-  
-  /** Send the RCPT TO command */
-  protected function _doRcptToCommand($address)
-  {
-    $this->executeCommand(
-      sprintf("RCPT TO: <%s>\r\n", $address), array(250, 251, 252)
-      );
-  }
-  
-  /** Send the DATA command */
-  protected function _doDataCommand()
-  {
-    $this->executeCommand("DATA\r\n", array(354));
-  }
-  
-  /** Stream the contents of the message over the buffer */
-  protected function _streamMessage(Swift_Mime_Message $message)
-  {
-    $this->_buffer->setWriteTranslations(array("\r\n." => "\r\n.."));
-    try
-    {
-      $message->toByteStream($this->_buffer);
-      $this->_buffer->flushBuffers();
-    }
-    catch (Swift_TransportException $e)
-    {
-      $this->_throwException($e);
-    }
-    $this->_buffer->setWriteTranslations(array());
-    $this->executeCommand("\r\n.\r\n", array(250));
-  }
-  
-  /** Determine the best-use reverse path for this message */
-  protected function _getReversePath(Swift_Mime_Message $message)
-  {
-    $return = $message->getReturnPath();
-    $sender = $message->getSender();
-    $from = $message->getFrom();
-    $path = null;
-    if (!empty($return))
-    {
-      $path = $return;
-    }
-    elseif (!empty($sender))
-    {
-      // Don't use array_keys
-      reset($sender); // Reset Pointer to first pos
-      $path = key($sender); // Get key
-    }
-    elseif (!empty($from))
-    {
-      reset($from); // Reset Pointer to first pos
-      $path = key($from); // Get key
-    }
-    return $path;
-  }
-  
-  /** Throw a TransportException, first sending it to any listeners */
-  protected function _throwException(Swift_TransportException $e)
-  {
-    if ($evt = $this->_eventDispatcher->createTransportExceptionEvent($this, $e))
-    {
-      $this->_eventDispatcher->dispatchEvent($evt, 'exceptionThrown');
-      if (!$evt->bubbleCancelled())
-      {
-        throw $e;
-      }
-    }
-    else
-    {
-      throw $e;
-    }
-  }
-  
-  /** Throws an Exception if a response code is incorrect */
-  protected function _assertResponseCode($response, $wanted)
-  {
-    list($code, $separator, $text) = sscanf($response, '%3d%[ -]%s');
-    $valid = (empty($wanted) || in_array($code, $wanted));
-    
-    if ($evt = $this->_eventDispatcher->createResponseEvent($this, $response,
-      $valid))
-    {
-      $this->_eventDispatcher->dispatchEvent($evt, 'responseReceived');
-    }
-    
-    if (!$valid)
-    {
-      $this->_throwException(
-        new Swift_TransportException(
-          'Expected response code ' . implode('/', $wanted) . ' but got code ' .
-          '"' . $code . '", with message "' . $response . '"'
-          )
-        );
-    }
-  }
-  
-  /** Get an entire multi-line response using its sequence number */
-  protected function _getFullResponse($seq)
-  {
-    $response = '';
-    try
-    {
-      do
-      {
-        $line = $this->_buffer->readLine($seq);
-        $response .= $line;
-      }
-      while (null !== $line && false !== $line && ' ' != $line{3});
-    }
-    catch (Swift_TransportException $e)
-    {
-      $this->_throwException($e);
-    }
-    return $response;
-  }
-  
-  // -- Private methods
-  
-  /** Send an email to the given recipients from the given reverse path */
-  private function _doMailTransaction($message, $reversePath,
-    array $recipients, array &$failedRecipients)
-  {
-    $sent = 0;
-    $this->_doMailFromCommand($reversePath);
-    foreach ($recipients as $forwardPath)
-    {
-      try
-      {
-        $this->_doRcptToCommand($forwardPath);
-        $sent++;
-      }
-      catch (Swift_TransportException $e)
-      {
-        $failedRecipients[] = $forwardPath;
-      }
-    }
-    
-    if ($sent != 0)
-    {
-      $this->_doDataCommand();
-      $this->_streamMessage($message);
-    }
-    else
-    {
-      $this->reset();
-    }
-    
-    return $sent;
-  }
-  
-  /** Send a message to the given To: recipients */
-  private function _sendTo(Swift_Mime_Message $message, $reversePath,
-    array $to, array &$failedRecipients)
-  {
-    if (empty($to))
-    {
-      return 0;
-    }
-    return $this->_doMailTransaction($message, $reversePath, array_keys($to),
-      $failedRecipients);
-  }
-  
-  /** Send a message to the given Cc: recipients */
-  private function _sendCc(Swift_Mime_Message $message, $reversePath,
-    array $cc, array &$failedRecipients)
-  {
-    if (empty($cc))
-    {
-      return 0;
-    }
-    return $this->_doMailTransaction($message, $reversePath, array_keys($cc),
-      $failedRecipients);
-  }
-  
-  /** Send a message to all Bcc: recipients */
-  private function _sendBcc(Swift_Mime_Message $message, $reversePath,
-    array $bcc, array &$failedRecipients)
-  {
-    $sent = 0;
-    foreach ($bcc as $forwardPath => $name)
-    {
-      $message->setBcc(array($forwardPath => $name));
-      $sent += $this->_doMailTransaction(
-        $message, $reversePath, array($forwardPath), $failedRecipients
-        );
-    }
-    return $sent;
-  }
-  
-  /** Try to determine the hostname of the server this is run on */
-  private function _lookupHostname()
-  {
-    if (!empty($_SERVER['SERVER_NAME'])
-      && $this->_isFqdn($_SERVER['SERVER_NAME']))
-    {
-      $this->_domain = $_SERVER['SERVER_NAME'];
-    }
-    elseif (!empty($_SERVER['SERVER_ADDR']))
-    {
-      $this->_domain = sprintf('[%s]', $_SERVER['SERVER_ADDR']);
-    }
-  }
-  
-  /** Determine is the $hostname is a fully-qualified name */
-  private function _isFqdn($hostname)
-  {
-    //We could do a really thorough check, but there's really no point
-    if (false !== $dotPos = strpos($hostname, '.'))
-    {
-      return ($dotPos > 0) && ($dotPos != strlen($hostname) - 1);
-    }
-    else
-    {
-      return false;
-    }
-  }
-  
-  /**
-   * Destructor.
-   */
-  public function __destruct()
-  {
-    $this->stop();
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
deleted file mode 100644
index 4c7e0f2ec..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Transport/Esmtp/Authenticator.php';
-//@require 'Swift/Transport/SmtpAgent.php';
-//@require 'Swift/TransportException.php';
-
-/**
- * Handles CRAM-MD5 authentication.
- * @package Swift
- * @subpackage Transport
- * @author Chris Corbyn
- */
-class Swift_Transport_Esmtp_Auth_CramMd5Authenticator
-  implements Swift_Transport_Esmtp_Authenticator
-{
-  
-  /**
-   * Get the name of the AUTH mechanism this Authenticator handles.
-   * @return string
-   */
-  public function getAuthKeyword()
-  {
-    return 'CRAM-MD5';
-  }
-  
-  /**
-   * Try to authenticate the user with $username and $password.
-   * @param Swift_Transport_SmtpAgent $agent
-   * @param string $username
-   * @param string $password
-   * @return boolean
-   */
-  public function authenticate(Swift_Transport_SmtpAgent $agent,
-    $username, $password)
-  {
-    try
-    {
-      $challenge = $agent->executeCommand("AUTH CRAM-MD5\r\n", array(334));
-      $challenge = base64_decode(substr($challenge, 4));
-      $message = base64_encode(
-        $username . ' ' . $this->_getResponse($password, $challenge)
-        );
-      $agent->executeCommand(sprintf("%s\r\n", $message), array(235));
-      return true;
-    }
-    catch (Swift_TransportException $e)
-    {
-      $agent->executeCommand("RSET\r\n", array(250));
-      return false;
-    }
-  }
-  
-  /**
-   * Generate a CRAM-MD5 response from a server challenge.
-   * @param string $secret
-   * @param string $challenge
-   * @return string
-   */
-  private function _getResponse($secret, $challenge)
-  {
-    if (strlen($secret) > 64)
-    {
-      $secret = pack('H32', md5($secret));
-    }
-    
-    if (strlen($secret) < 64)
-    {
-      $secret = str_pad($secret, 64, chr(0));
-    }
-    
-    $k_ipad = substr($secret, 0, 64) ^ str_repeat(chr(0x36), 64);
-    $k_opad = substr($secret, 0, 64) ^ str_repeat(chr(0x5C), 64);
-
-    $inner  = pack('H32', md5($k_ipad . $challenge));
-    $digest = md5($k_opad . $inner);
-
-    return $digest;
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
deleted file mode 100644
index bd226174e..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Transport/Esmtp/Authenticator.php';
-//@require 'Swift/Transport/SmtpAgent.php';
-//@require 'Swift/TransportException.php';
-
-/**
- * Handles LOGIN authentication.
- * @package Swift
- * @subpackage Transport
- * @author Chris Corbyn
- */
-class Swift_Transport_Esmtp_Auth_LoginAuthenticator
-  implements Swift_Transport_Esmtp_Authenticator
-{
-  
-  /**
-   * Get the name of the AUTH mechanism this Authenticator handles.
-   * @return string
-   */
-  public function getAuthKeyword()
-  {
-    return 'LOGIN';
-  }
-  
-  /**
-   * Try to authenticate the user with $username and $password.
-   * @param Swift_Transport_SmtpAgent $agent
-   * @param string $username
-   * @param string $password
-   * @return boolean
-   */
-  public function authenticate(Swift_Transport_SmtpAgent $agent,
-    $username, $password)
-  {
-    try
-    {
-      $agent->executeCommand("AUTH LOGIN\r\n", array(334));
-      $agent->executeCommand(sprintf("%s\r\n", base64_encode($username)), array(334));
-      $agent->executeCommand(sprintf("%s\r\n", base64_encode($password)), array(235));
-      return true;
-    }
-    catch (Swift_TransportException $e)
-    {
-      $agent->executeCommand("RSET\r\n", array(250));
-      return false;
-    }
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
deleted file mode 100644
index ddd80942f..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Transport/Esmtp/Authenticator.php';
-//@require 'Swift/Transport/SmtpAgent.php';
-//@require 'Swift/TransportException.php';
-
-/**
- * Handles PLAIN authentication.
- * @package Swift
- * @subpackage Transport
- * @author Chris Corbyn
- */
-class Swift_Transport_Esmtp_Auth_PlainAuthenticator
-  implements Swift_Transport_Esmtp_Authenticator
-{
-  
-  /**
-   * Get the name of the AUTH mechanism this Authenticator handles.
-   * @return string
-   */
-  public function getAuthKeyword()
-  {
-    return 'PLAIN';
-  }
-  
-  /**
-   * Try to authenticate the user with $username and $password.
-   * @param Swift_Transport_SmtpAgent $agent
-   * @param string $username
-   * @param string $password
-   * @return boolean
-   */
-  public function authenticate(Swift_Transport_SmtpAgent $agent,
-    $username, $password)
-  {
-    try
-    {
-      $message = base64_encode($username . chr(0) . $username . chr(0) . $password);
-      $agent->executeCommand(sprintf("AUTH PLAIN %s\r\n", $message), array(235));
-      return true;
-    }
-    catch (Swift_TransportException $e)
-    {
-      $agent->executeCommand("RSET\r\n", array(250));
-      return false;
-    }
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/Esmtp/AuthHandler.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/Esmtp/AuthHandler.php
deleted file mode 100644
index a223169b7..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/Esmtp/AuthHandler.php
+++ /dev/null
@@ -1,262 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/TransportException.php';
-//@require 'Swift/Transport/EsmtpHandler.php';
-//@require 'Swift/Transport/SmtpAgent.php';
-
-/**
- * An ESMTP handler for AUTH support.
- * @package Swift
- * @subpackage Transport
- * @author Chris Corbyn
- */
-class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
-{
-  
-  /**
-   * Authenticators available to process the request.
-   * @var Swift_Transport_Esmtp_Authenticator[]
-   * @access private
-   */
-  private $_authenticators = array();
-  
-  /**
-   * The username for authentication.
-   * @var string
-   * @access private
-   */
-  private $_username;
-  
-  /**
-   * The password for authentication.
-   * @var string
-   * @access private
-   */
-  private $_password;
-  
-  /**
-   * The auth mode for authentication.
-   * @var string
-   * @access private
-   */
-  private $_auth_mode;
-  
-  /**
-   * The ESMTP AUTH parameters available.
-   * @var string[]
-   * @access private
-   */
-  private $_esmtpParams = array();
-  
-  /**
-   * Create a new AuthHandler with $authenticators for support.
-   * @param Swift_Transport_Esmtp_Authenticator[] $authenticators
-   */
-  public function __construct(array $authenticators)
-  {
-    $this->setAuthenticators($authenticators);
-  }
-  
-  /**
-   * Set the Authenticators which can process a login request.
-   * @param Swift_Transport_Esmtp_Authenticator[] $authenticators
-   */
-  public function setAuthenticators(array $authenticators)
-  {
-    $this->_authenticators = $authenticators;
-  }
-  
-  /**
-   * Get the Authenticators which can process a login request.
-   * @return Swift_Transport_Esmtp_Authenticator[]
-   */
-  public function getAuthenticators()
-  {
-    return $this->_authenticators;
-  }
-  
-  /**
-   * Set the username to authenticate with.
-   * @param string $username
-   */
-  public function setUsername($username)
-  {
-    $this->_username = $username;
-  }
-  
-  /**
-   * Get the username to authenticate with.
-   * @return string
-   */
-  public function getUsername()
-  {
-    return $this->_username;
-  }
-  
-  /**
-   * Set the password to authenticate with.
-   * @param string $password
-   */
-  public function setPassword($password)
-  {
-    $this->_password = $password;
-  }
-  
-  /**
-   * Get the password to authenticate with.
-   * @return string
-   */
-  public function getPassword()
-  {
-    return $this->_password;
-  }
-  
-  /**
-   * Set the auth mode to use to authenticate.
-   * @param string $mode
-   */
-  public function setAuthMode($mode)
-  {
-    $this->_auth_mode = $mode;
-  }
-  
-  /**
-   * Get the auth mode to use to authenticate.
-   * @return string
-   */
-  public function getAuthMode()
-  {
-    return $this->_auth_mode;
-  }
-  
-  /**
-   * Get the name of the ESMTP extension this handles.
-   * @return boolean
-   */
-  public function getHandledKeyword()
-  {
-    return 'AUTH';
-  }
-  
-  /**
-   * Set the parameters which the EHLO greeting indicated.
-   * @param string[] $parameters
-   */
-  public function setKeywordParams(array $parameters)
-  {
-    $this->_esmtpParams = $parameters;
-  }
-  
-  /**
-   * Runs immediately after a EHLO has been issued.
-   * @param Swift_Transport_SmtpAgent $agent to read/write
-   */
-  public function afterEhlo(Swift_Transport_SmtpAgent $agent)
-  {
-    if ($this->_username)
-    {
-      $count = 0;
-      foreach ($this->_getAuthenticatorsForAgent() as $authenticator)
-      {
-        if (in_array(strtolower($authenticator->getAuthKeyword()),
-          array_map('strtolower', $this->_esmtpParams)))
-        {
-          $count++;
-          if ($authenticator->authenticate($agent, $this->_username, $this->_password))
-          {
-            return;
-          }
-        }
-      }
-      throw new Swift_TransportException(
-        'Failed to authenticate on SMTP server with username "' .
-        $this->_username . '" using ' . $count . ' possible authenticators'
-        );
-    }
-  }
-  
-  /**
-   * Not used.
-   */
-  public function getMailParams()
-  {
-    return array();
-  }
-  
-  /**
-   * Not used.
-   */
-  public function getRcptParams()
-  {
-    return array();
-  }
-  
-  /**
-   * Not used.
-   */
-  public function onCommand(Swift_Transport_SmtpAgent $agent,
-    $command, $codes = array(), &$failedRecipients = null, &$stop = false)
-  {
-  }
-    
-  /**
-   * Returns +1, -1 or 0 according to the rules for usort().
-   * This method is called to ensure extensions can be execute in an appropriate order.
-   * @param string $esmtpKeyword to compare with
-   * @return int
-   */
-  public function getPriorityOver($esmtpKeyword)
-  {
-    return 0;
-  }
-  
-  /**
-   * Returns an array of method names which are exposed to the Esmtp class.
-   * @return string[]
-   */
-  public function exposeMixinMethods()
-  {
-    return array('setUsername', 'getUsername', 'setPassword', 'getPassword', 'setAuthMode', 'getAuthMode');
-  }
-  
-  /**
-   * Not used.
-   */
-  public function resetState()
-  {
-  }
-  
-  // -- Protected methods
-  
-  /**
-   * Returns the authenticator list for the given agent.
-   * @param  Swift_Transport_SmtpAgent $agent
-   * @return array
-   * @access protected
-   */
-  protected function _getAuthenticatorsForAgent()
-  {
-    if (!$mode = strtolower($this->_auth_mode))
-    {
-      return $this->_authenticators;
-    }
-
-    foreach ($this->_authenticators as $authenticator)
-    {
-      if (strtolower($authenticator->getAuthKeyword()) == $mode)
-      {
-        return array($authenticator);
-      }
-    }
-
-    throw new Swift_TransportException('Auth mode '.$mode.' is invalid');
-  }
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/Esmtp/Authenticator.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/Esmtp/Authenticator.php
deleted file mode 100644
index bf166d324..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/Esmtp/Authenticator.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Transport/SmtpAgent.php';
-
-/**
- * An Authentication mechanism.
- * @package Swift
- * @subpackage Transport
- * @author Chris Corbyn
- */
-interface Swift_Transport_Esmtp_Authenticator
-{
-  
-  /**
-   * Get the name of the AUTH mechanism this Authenticator handles.
-   * @return string
-   */
-  public function getAuthKeyword();
-  
-  /**
-   * Try to authenticate the user with $username and $password.
-   * @param Swift_Transport_SmtpAgent $agent
-   * @param string $username
-   * @param string $password
-   * @return boolean
-   */
-  public function authenticate(Swift_Transport_SmtpAgent $agent,
-    $username, $password);
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/EsmtpHandler.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/EsmtpHandler.php
deleted file mode 100644
index e96f95f61..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/EsmtpHandler.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Transport/EsmtpBufferWrapper.php';
-
-/**
- * An ESMTP handler.
- * @package Swift
- * @subpackage Transport
- * @author Chris Corbyn
- */
-interface Swift_Transport_EsmtpHandler
-{
-  
-  /**
-   * Get the name of the ESMTP extension this handles.
-   * @return boolean
-   */
-  public function getHandledKeyword();
-  
-  /**
-   * Set the parameters which the EHLO greeting indicated.
-   * @param string[] $parameters
-   */
-  public function setKeywordParams(array $parameters);
-  
-  /**
-   * Runs immediately after a EHLO has been issued.
-   * @param Swift_Transport_SmtpAgent $agent to read/write
-   */
-  public function afterEhlo(Swift_Transport_SmtpAgent $agent);
-  
-  /**
-   * Get params which are appended to MAIL FROM:<>.
-   * @return string[]
-   */
-  public function getMailParams();
-  
-  /**
-   * Get params which are appended to RCPT TO:<>.
-   * @return string[]
-   */
-  public function getRcptParams();
-  
-  /**
-   * Runs when a command is due to be sent.
-   * @param Swift_Transport_SmtpAgent $agent to read/write
-   * @param string $command to send
-   * @param int[] $codes expected in response
-   * @param string[] &$failedRecipients
-   * @param boolean &$stop to be set true if the command is now sent
-   */
-  public function onCommand(Swift_Transport_SmtpAgent $agent,
-    $command, $codes = array(), &$failedRecipients = null, &$stop = false);
-    
-  /**
-   * Returns +1, -1 or 0 according to the rules for usort().
-   * This method is called to ensure extensions can be execute in an appropriate order.
-   * @param string $esmtpKeyword to compare with
-   * @return int
-   */
-  public function getPriorityOver($esmtpKeyword);
-  
-  /**
-   * Returns an array of method names which are exposed to the Esmtp class.
-   * @return string[]
-   */
-  public function exposeMixinMethods();
-  
-  /**
-   * Tells this handler to clear any buffers and reset its state.
-   */
-  public function resetState();
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/EsmtpTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/EsmtpTransport.php
deleted file mode 100644
index fc10ba870..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/EsmtpTransport.php
+++ /dev/null
@@ -1,339 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Transport/AbstractSmtpTransport.php';
-//@require 'Swift/Transport/EsmtpHandler.php';
-//@require 'Swift/Transport/IoBuffer.php';
-//@require 'Swift/Transport/SmtpAgent.php';
-//@require 'Swift/TransportException.php';
-//@require 'Swift/Mime/Message.php';
-//@require 'Swift/Events/EventDispatcher.php';
-
-/**
- * Sends Messages over SMTP with ESMTP support.
- * @package Swift
- * @subpackage Transport
- * @author Chris Corbyn
- */
-class Swift_Transport_EsmtpTransport
-  extends Swift_Transport_AbstractSmtpTransport
-  implements Swift_Transport_SmtpAgent
-{
-  
-  /**
-   * ESMTP extension handlers.
-   * @var Swift_Transport_EsmtpHandler[]
-   * @access private
-   */
-  private $_handlers = array();
-  
-  /**
-   * ESMTP capabilities.
-   * @var string[]
-   * @access private
-   */
-  private $_capabilities = array();
-  
-  /**
-   * Connection buffer parameters.
-   * @var array
-   * @access protected
-   */
-  private $_params = array(
-    'protocol' => 'tcp',
-    'host' => 'localhost',
-    'port' => 25,
-    'timeout' => 30,
-    'blocking' => 1,
-    'type' => Swift_Transport_IoBuffer::TYPE_SOCKET
-    );
-  
-  /**
-   * Creates a new EsmtpTransport using the given I/O buffer.
-   * @param Swift_Transport_IoBuffer $buf
-   * @param Swift_Transport_EsmtpHandler[] $extensionHandlers
-   * @param Swift_Events_EventDispatcher $dispatcher
-   */
-  public function __construct(Swift_Transport_IoBuffer $buf,
-    array $extensionHandlers, Swift_Events_EventDispatcher $dispatcher)
-  {
-    parent::__construct($buf, $dispatcher);
-    $this->setExtensionHandlers($extensionHandlers);
-  }
-  
-  /**
-   * Set the host to connect to.
-   * @param string $host
-   */
-  public function setHost($host)
-  {
-    $this->_params['host'] = $host;
-    return $this;
-  }
-  
-  /**
-   * Get the host to connect to.
-   * @return string
-   */
-  public function getHost()
-  {
-    return $this->_params['host'];
-  }
-  
-  /**
-   * Set the port to connect to.
-   * @param int $port
-   */
-  public function setPort($port)
-  {
-    $this->_params['port'] = (int) $port;
-    return $this;
-  }
-  
-  /**
-   * Get the port to connect to.
-   * @return int
-   */
-  public function getPort()
-  {
-    return $this->_params['port'];
-  }
-  
-  /**
-   * Set the connection timeout.
-   * @param int $timeout seconds
-   */
-  public function setTimeout($timeout)
-  {
-    $this->_params['timeout'] = (int) $timeout;
-    return $this;
-  }
-  
-  /**
-   * Get the connection timeout.
-   * @return int
-   */
-  public function getTimeout()
-  {
-    return $this->_params['timeout'];
-  }
-  
-  /**
-   * Set the encryption type (tls or ssl)
-   * @param string $encryption
-   */
-  public function setEncryption($enc)
-  {
-    $this->_params['protocol'] = $enc;
-    return $this;
-  }
-  
-  /**
-   * Get the encryption type.
-   * @return string
-   */
-  public function getEncryption()
-  {
-    return $this->_params['protocol'];
-  }
-  
-  /**
-   * Set ESMTP extension handlers.
-   * @param Swift_Transport_EsmtpHandler[] $handlers
-   */
-  public function setExtensionHandlers(array $handlers)
-  {
-    $assoc = array();
-    foreach ($handlers as $handler)
-    {
-      $assoc[$handler->getHandledKeyword()] = $handler;
-    }
-    uasort($assoc, array($this, '_sortHandlers'));
-    $this->_handlers = $assoc;
-    $this->_setHandlerParams();
-    return $this;
-  }
-  
-  /**
-   * Get ESMTP extension handlers.
-   * @return Swift_Transport_EsmtpHandler[]
-   */
-  public function getExtensionHandlers()
-  {
-    return array_values($this->_handlers);
-  }
-  
-  /**
-   * Run a command against the buffer, expecting the given response codes.
-   * If no response codes are given, the response will not be validated.
-   * If codes are given, an exception will be thrown on an invalid response.
-   * @param string $command
-   * @param int[] $codes
-   * @param string[] &$failures
-   * @return string
-   */
-  public function executeCommand($command, $codes = array(), &$failures = null)
-  {
-    $failures = (array) $failures;
-    $stopSignal = false;
-    $response = null;
-    foreach ($this->_getActiveHandlers() as $handler)
-    {
-      $response = $handler->onCommand(
-        $this, $command, $codes, $failures, $stopSignal
-        );
-      if ($stopSignal)
-      {
-        return $response;
-      }
-    }
-    return parent::executeCommand($command, $codes, $failures);
-  }
-  
-  // -- Mixin invocation code
-  
-  /** Mixin handling method for ESMTP handlers */
-  public function __call($method, $args)
-  {
-    foreach ($this->_handlers as $handler)
-    {
-      if (in_array(strtolower($method),
-        array_map('strtolower', (array) $handler->exposeMixinMethods())
-        ))
-      {
-        $return = call_user_func_array(array($handler, $method), $args);
-        //Allow fluid method calls
-        if (is_null($return) && substr($method, 0, 3) == 'set')
-        {
-          return $this;
-        }
-        else
-        {
-          return $return;
-        }
-      }
-    }
-    trigger_error('Call to undefined method ' . $method, E_USER_ERROR);
-  }
-  
-  // -- Protected methods
-  
-  /** Get the params to initialize the buffer */
-  protected function _getBufferParams()
-  {
-    return $this->_params;
-  }
-  
-  /** Overridden to perform EHLO instead */
-  protected function _doHeloCommand()
-  {
-    try
-    {
-      $response = $this->executeCommand(
-        sprintf("EHLO %s\r\n", $this->_domain), array(250)
-        );
-      $this->_capabilities = $this->_getCapabilities($response);
-      $this->_setHandlerParams();
-      foreach ($this->_getActiveHandlers() as $handler)
-      {
-        $handler->afterEhlo($this);
-      }
-    }
-    catch (Swift_TransportException $e)
-    {
-      parent::_doHeloCommand();
-    }
-  }
-  
-  /** Overridden to add Extension support */
-  protected function _doMailFromCommand($address)
-  {
-    $handlers = $this->_getActiveHandlers();
-    $params = array();
-    foreach ($handlers as $handler)
-    {
-      $params = array_merge($params, (array) $handler->getMailParams());
-    }
-    $paramStr = !empty($params) ? ' ' . implode(' ', $params) : '';
-    $this->executeCommand(
-      sprintf("MAIL FROM: <%s>%s\r\n", $address, $paramStr), array(250)
-      );
-  }
-  
-  /** Overridden to add Extension support */
-  protected function _doRcptToCommand($address)
-  {
-    $handlers = $this->_getActiveHandlers();
-    $params = array();
-    foreach ($handlers as $handler)
-    {
-      $params = array_merge($params, (array) $handler->getRcptParams());
-    }
-    $paramStr = !empty($params) ? ' ' . implode(' ', $params) : '';
-    $this->executeCommand(
-      sprintf("RCPT TO: <%s>%s\r\n", $address, $paramStr), array(250, 251, 252)
-      );
-  }
-  
-  // -- Private methods
-  
-  /** Determine ESMTP capabilities by function group */
-  private function _getCapabilities($ehloResponse)
-  {
-    $capabilities = array();
-    $ehloResponse = trim($ehloResponse);
-    $lines = explode("\r\n", $ehloResponse);
-    array_shift($lines);
-    foreach ($lines as $line)
-    {
-      if (preg_match('/^[0-9]{3}[ -]([A-Z0-9-]+)((?:[ =].*)?)$/Di', $line, $matches))
-      {
-        $keyword = strtoupper($matches[1]);
-        $paramStr = strtoupper(ltrim($matches[2], ' ='));
-        $params = !empty($paramStr) ? explode(' ', $paramStr) : array();
-        $capabilities[$keyword] = $params;
-      }
-    }
-    return $capabilities;
-  }
-  
-  /** Set parameters which are used by each extension handler */
-  private function _setHandlerParams()
-  {
-    foreach ($this->_handlers as $keyword => $handler)
-    {
-      if (array_key_exists($keyword, $this->_capabilities))
-      {
-        $handler->setKeywordParams($this->_capabilities[$keyword]);
-      }
-    }
-  }
-  
-  /** Get ESMTP handlers which are currently ok to use */
-  private function _getActiveHandlers()
-  {
-    $handlers = array();
-    foreach ($this->_handlers as $keyword => $handler)
-    {
-      if (array_key_exists($keyword, $this->_capabilities))
-      {
-        $handlers[] = $handler;
-      }
-    }
-    return $handlers;
-  }
-  
-  /** Custom sort for extension handler ordering */
-  private function _sortHandlers($a, $b)
-  {
-    return $a->getPriorityOver($b->getHandledKeyword());
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/FailoverTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/FailoverTransport.php
deleted file mode 100644
index e62491c20..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/FailoverTransport.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Transport/LoadBalancedTransport.php';
-//@require 'Swift/Mime/Message.php';
-
-/**
- * Contains a list of redundant Transports so when one fails, the next is used.
- * @package Swift
- * @subpackage Transport
- * @author Chris Corbyn
- */
-class Swift_Transport_FailoverTransport
-  extends Swift_Transport_LoadBalancedTransport
-{
-  
-  /**
-   * Registered transport curently used.
-   * @var Swift_Transport
-   * @access private
-   */
-  private $_currentTransport;
-  
-  /**
-   * Creates a new FailoverTransport.
-   */
-  public function __construct()
-  {
-    parent::__construct();
-  }
-  
-  /**
-   * Send the given Message.
-   * Recipient/sender data will be retreived from the Message API.
-   * The return value is the number of recipients who were accepted for delivery.
-   * @param Swift_Mime_Message $message
-   * @param string[] &$failedRecipients to collect failures by-reference
-   * @return int
-   */
-  public function send(Swift_Mime_Message $message, &$failedRecipients = null)
-  {
-    $maxTransports = count($this->_transports);
-    $sent = 0;
-    
-    for ($i = 0; $i < $maxTransports
-      && $transport = $this->_getNextTransport(); ++$i)
-    {
-      try
-      {
-        if (!$transport->isStarted())
-        {
-          $transport->start();
-        }
-        
-        return $transport->send($message, $failedRecipients);
-      }
-      catch (Swift_TransportException $e)
-      {
-        $this->_killCurrentTransport();
-      }
-    }
-    
-    if (count($this->_transports) == 0)
-    {
-      throw new Swift_TransportException(
-        'All Transports in FailoverTransport failed, or no Transports available'
-        );
-    }
-    
-    return $sent;
-  }
-  
-  // -- Protected methods
-  
-  protected function _getNextTransport()
-  {
-    if (!isset($this->_currentTransport))
-    {
-      $this->_currentTransport = parent::_getNextTransport();
-    }
-    return $this->_currentTransport;
-  }
-  
-  protected function _killCurrentTransport()
-  {
-    $this->_currentTransport = null;
-    parent::_killCurrentTransport();
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/IoBuffer.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/IoBuffer.php
deleted file mode 100644
index ac66ef03d..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/IoBuffer.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/InputByteStream.php';
-//@require 'Swift/OutputByteStream.php';
-
-/**
- * Buffers input and output to a resource.
- * @package Swift
- * @subpackage Transport
- * @author Chris Corbyn
- */
-interface Swift_Transport_IoBuffer
-  extends Swift_InputByteStream, Swift_OutputByteStream
-{
-  
-  /** A socket buffer over TCP */
-  const TYPE_SOCKET = 0x0001;
-  
-  /** A process buffer with I/O support */
-  const TYPE_PROCESS = 0x0010;
-  
-  /**
-   * Perform any initialization needed, using the given $params.
-   * Parameters will vary depending upon the type of IoBuffer used.
-   * @param array $params
-   */
-  public function initialize(array $params);
-  
-  /**
-   * Set an individual param on the buffer (e.g. switching to SSL).
-   * @param string $param
-   * @param mixed $value
-   */
-  public function setParam($param, $value);
-  
-  /**
-   * Perform any shutdown logic needed.
-   */
-  public function terminate();
-  
-  /**
-   * Set an array of string replacements which should be made on data written
-   * to the buffer.  This could replace LF with CRLF for example.
-   * @param string[] $replacements
-   */
-  public function setWriteTranslations(array $replacements);
-  
-  /**
-   * Get a line of output (including any CRLF).
-   * The $sequence number comes from any writes and may or may not be used
-   * depending upon the implementation.
-   * @param int $sequence of last write to scan from
-   * @return string
-   */
-  public function readLine($sequence);
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/LoadBalancedTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/LoadBalancedTransport.php
deleted file mode 100644
index 367981b1f..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/LoadBalancedTransport.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Transport.php';
-//@require 'Swift/Mime/Message.php';
-//@require 'Swift/Events/EventListener.php';
-
-/**
- * Redudantly and rotationally uses several Transports when sending.
- * 
- * @package Swift
- * @subpackage Transport
- * @author Chris Corbyn
- */
-class Swift_Transport_LoadBalancedTransport implements Swift_Transport
-{
-  
-  /** Transports which are deemed useless */
-  private $_deadTransports = array();
-  
-  /**
-   * The Transports which are used in rotation.
-   * 
-   * @var array Swift_Transport
-   * @access protected
-   */
-  protected $_transports = array();
-  
-  /**
-   * Creates a new LoadBalancedTransport.
-   */
-  public function __construct()
-  {
-  }
-  
-  /**
-   * Set $transports to delegate to.
-   * 
-   * @param array $transports Swift_Transport
-   */
-  public function setTransports(array $transports)
-  {
-    $this->_transports = $transports;
-    $this->_deadTransports = array();
-  }
-  
-  /**
-   * Get $transports to delegate to.
-   * 
-   * @return array Swift_Transport
-   */
-  public function getTransports(array $transports)
-  {
-    return array_merge($this->_transports, $this->_deadTransports);
-  }
-  
-  /**
-   * Test if this Transport mechanism has started.
-   * 
-   * @return boolean
-   */
-  public function isStarted()
-  {
-    return count($this->_transports) > 0;
-  }
-  
-  /**
-   * Start this Transport mechanism.
-   */
-  public function start()
-  {
-    $this->_transports = array_merge($this->_transports, $this->_deadTransports);
-  }
-  
-  /**
-   * Stop this Transport mechanism.
-   */
-  public function stop()
-  {
-    foreach ($this->_transports as $transport)
-    {
-      $transport->stop();
-    }
-  }
-  
-  /**
-   * Send the given Message.
-   * 
-   * Recipient/sender data will be retreived from the Message API.
-   * The return value is the number of recipients who were accepted for delivery.
-   * 
-   * @param Swift_Mime_Message $message
-   * @param string[] &$failedRecipients to collect failures by-reference
-   * @return int
-   */
-  public function send(Swift_Mime_Message $message, &$failedRecipients = null)
-  {
-    $maxTransports = count($this->_transports);
-    $sent = 0;
-    
-    for ($i = 0; $i < $maxTransports
-      && $transport = $this->_getNextTransport(); ++$i)
-    {
-      try
-      {
-        if (!$transport->isStarted())
-        {
-          $transport->start();
-        }
-        if ($sent = $transport->send($message, $failedRecipients))
-        {
-          break;
-        }
-      }
-      catch (Swift_TransportException $e)
-      {
-        $this->_killCurrentTransport();
-      }
-    }
-    
-    if (count($this->_transports) == 0)
-    {
-      throw new Swift_TransportException(
-        'All Transports in LoadBalancedTransport failed, or no Transports available'
-        );
-    }
-    
-    return $sent;
-  }
-  
-  /**
-   * Register a plugin.
-   * 
-   * @param Swift_Events_EventListener $plugin
-   */
-  public function registerPlugin(Swift_Events_EventListener $plugin)
-  {
-    foreach ($this->_transports as $transport)
-    {
-      $transport->registerPlugin($plugin);
-    }
-  }
-  
-  // -- Protected methods
-  
-  /**
-   * Rotates the transport list around and returns the first instance.
-   * 
-   * @return Swift_Transport
-   * @access protected
-   */
-  protected function _getNextTransport()
-  {
-    if ($next = array_shift($this->_transports))
-    {
-      $this->_transports[] = $next;
-    }
-    return $next;
-  }
-  
-  /**
-   * Tag the currently used (top of stack) transport as dead/useless.
-   * 
-   * @access protected
-   */
-  protected function _killCurrentTransport()
-  {
-    if ($transport = array_pop($this->_transports))
-    {
-      try
-      {
-        $transport->stop();
-      }
-      catch (Exception $e)
-      {
-      }
-      $this->_deadTransports[] = $transport;
-    }
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/MailInvoker.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/MailInvoker.php
deleted file mode 100644
index dda882fd1..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/MailInvoker.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * This interface intercepts calls to the mail() function.
- * 
- * @package Swift
- * @subpackage Transport
- * @author Chris Corbyn
- */
-interface Swift_Transport_MailInvoker
-{
-  
-  /**
-   * Send mail via the mail() function.
-   * 
-   * This method takes the same arguments as PHP mail().
-   * 
-   * @param string $to
-   * @param string $subject
-   * @param string $body
-   * @param string $headers
-   * @param string $extraParams
-   * 
-   * @return boolean
-   */
-  public function mail($to, $subject, $body, $headers = null, $extraParams = null);
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/MailTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/MailTransport.php
deleted file mode 100644
index eca59e169..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/MailTransport.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Transport.php';
-//@require 'Swift/Transport/MailInvoker.php';
-//@require 'Swift/Mime/Message.php';
-//@require 'Swift/Events/EventListener.php';
-
-/**
- * Sends Messages using the mail() function.
- * 
- * It is advised that users do not use this transport if at all possible
- * since a number of plugin features cannot be used in conjunction with this
- * transport due to the internal interface in PHP itself.
- * 
- * The level of error reporting with this transport is incredibly weak, again
- * due to limitations of PHP's internal mail() function.  You'll get an
- * all-or-nothing result from sending.
- * 
- * @package Swift
- * @subpackage Transport
- * @author Chris Corbyn
- */
-class Swift_Transport_MailTransport implements Swift_Transport
-{
-
-  /** Addtional parameters to pass to mail() */
-  private $_extraParams = '-f%s';
-  
-  /** The event dispatcher from the plugin API */
-  private $_eventDispatcher;
-  
-  /** An invoker that calls the mail() function */
-  private $_invoker;
-  
-  /**
-   * Create a new MailTransport with the $log.
-   * @param Swift_Transport_Log $log
-   */
-  public function __construct(Swift_Transport_MailInvoker $invoker,
-    Swift_Events_EventDispatcher $eventDispatcher)
-  {
-    $this->_invoker = $invoker;
-    $this->_eventDispatcher = $eventDispatcher;
-  }
-  
-  /**
-   * Not used.
-   */
-  public function isStarted()
-  {
-    return false;
-  }
-  
-  /**
-   * Not used.
-   */
-  public function start()
-  {
-  }
-  
-  /**
-   * Not used.
-   */
-  public function stop()
-  {
-  }
-  
-  /**
-   * Set the additional parameters used on the mail() function.
-   * 
-   * This string is formatted for sprintf() where %s is the sender address.
-   * 
-   * @param string $params
-   */
-  public function setExtraParams($params)
-  {
-    $this->_extraParams = $params;
-    return $this;
-  }
-  
-  /**
-   * Get the additional parameters used on the mail() function.
-   * 
-   * This string is formatted for sprintf() where %s is the sender address.
-   * 
-   * @return string
-   */
-  public function getExtraParams()
-  {
-    return $this->_extraParams;
-  }
-  
-  /**
-   * Send the given Message.
-   * 
-   * Recipient/sender data will be retreived from the Message API.
-   * The return value is the number of recipients who were accepted for delivery.
-   * 
-   * @param Swift_Mime_Message $message
-   * @param string[] &$failedRecipients to collect failures by-reference
-   * @return int
-   */
-  public function send(Swift_Mime_Message $message, &$failedRecipients = null)
-  {
-    $failedRecipients = (array) $failedRecipients;
-    
-    if ($evt = $this->_eventDispatcher->createSendEvent($this, $message))
-    {
-      $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
-      if ($evt->bubbleCancelled())
-      {
-        return 0;
-      }
-    }
-    
-    $count = (
-      count((array) $message->getTo())
-      + count((array) $message->getCc())
-      + count((array) $message->getBcc())
-      );
-    
-    $toHeader = $message->getHeaders()->get('To');
-    $subjectHeader = $message->getHeaders()->get('Subject');
-    
-    $to = $toHeader->getFieldBody();
-    $subject = $subjectHeader->getFieldBody();
-    
-    $reversePath = $this->_getReversePath($message);
-    
-    //Remove headers that would otherwise be duplicated
-    $message->getHeaders()->remove('To');
-    $message->getHeaders()->remove('Subject');
-    
-    $messageStr = $message->toString();
-    
-    $message->getHeaders()->set($toHeader);
-    $message->getHeaders()->set($subjectHeader);
-    
-    //Separate headers from body
-    if (false !== $endHeaders = strpos($messageStr, "\r\n\r\n"))
-    {
-      $headers = substr($messageStr, 0, $endHeaders) . "\r\n"; //Keep last EOL
-      $body = substr($messageStr, $endHeaders + 4);
-    }
-    else
-    {
-      $headers = $messageStr . "\r\n";
-      $body = '';
-    }
-    
-    unset($messageStr);
-    
-    if ("\r\n" != PHP_EOL) //Non-windows (not using SMTP)
-    {
-      $headers = str_replace("\r\n", PHP_EOL, $headers);
-      $body = str_replace("\r\n", PHP_EOL, $body);
-    }
-    else //Windows, using SMTP
-    {
-      $headers = str_replace("\r\n.", "\r\n..", $headers);
-      $body = str_replace("\r\n.", "\r\n..", $body);
-    }
-    
-    if ($this->_invoker->mail($to, $subject, $body, $headers,
-      sprintf($this->_extraParams, $reversePath)))
-    {
-      if ($evt)
-      {
-        $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
-        $evt->setFailedRecipients($failedRecipients);
-        $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
-      }
-    }
-    else
-    {
-      $failedRecipients = array_merge(
-        $failedRecipients,
-        array_keys((array) $message->getTo()),
-        array_keys((array) $message->getCc()),
-        array_keys((array) $message->getBcc())
-        );
-      
-      if ($evt)
-      {
-        $evt->setResult(Swift_Events_SendEvent::RESULT_FAILED);
-        $evt->setFailedRecipients($failedRecipients);
-        $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
-      }
-      
-      $message->generateId();
-      
-      $count = 0;
-    }
-    
-    return $count;
-  }
-  
-  /**
-   * Register a plugin.
-   * 
-   * @param Swift_Events_EventListener $plugin
-   */
-  public function registerPlugin(Swift_Events_EventListener $plugin)
-  {
-    $this->_eventDispatcher->bindEventListener($plugin);
-  }
-  
-  // -- Private methods
-  
-  /** Determine the best-use reverse path for this message */
-  private function _getReversePath(Swift_Mime_Message $message)
-  {
-    $return = $message->getReturnPath();
-    $sender = $message->getSender();
-    $from = $message->getFrom();
-    $path = null;
-    if (!empty($return))
-    {
-      $path = $return;
-    }
-    elseif (!empty($sender))
-    {
-      $keys = array_keys($sender);
-      $path = array_shift($keys);
-    }
-    elseif (!empty($from))
-    {
-      $keys = array_keys($from);
-      $path = array_shift($keys);
-    }
-    return $path;
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/NullTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/NullTransport.php
deleted file mode 100644
index c60d93881..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/NullTransport.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2009 Fabien Potencier <fabien.potencier@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Pretends messages have been sent, but just ignores them.
- * @package Swift
- * @author  Fabien Potencier
- */
-class Swift_Transport_NullTransport implements Swift_Transport
-{
-  /** The event dispatcher from the plugin API */
-  private $_eventDispatcher;
-
-  /**
-   * Constructor.
-   */
-  public function __construct(Swift_Events_EventDispatcher $eventDispatcher)
-  {
-    $this->_eventDispatcher = $eventDispatcher;
-  }
-  
-  /**
-   * Tests if this Transport mechanism has started.
-   *
-   * @return boolean
-   */
-  public function isStarted()
-  {
-    return true;
-  }
-  
-  /**
-   * Starts this Transport mechanism.
-   */
-  public function start()
-  {
-  }
-  
-  /**
-   * Stops this Transport mechanism.
-   */
-  public function stop()
-  {
-  }
-  
-  /**
-   * Sends the given message.
-   *
-   * @param Swift_Mime_Message $message
-   * @param string[] &$failedRecipients to collect failures by-reference
-   *
-   * @return int The number of sent emails
-   */
-  public function send(Swift_Mime_Message $message, &$failedRecipients = null)
-  {
-    if ($evt = $this->_eventDispatcher->createSendEvent($this, $message))
-    {
-      $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
-      if ($evt->bubbleCancelled())
-      {
-        return 0;
-      }
-    }
-    
-    if ($evt)
-    {
-      $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
-      $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
-    }
-    
-    return 0;
-  }
-  
-  /**
-   * Register a plugin.
-   *
-   * @param Swift_Events_EventListener $plugin
-   */
-  public function registerPlugin(Swift_Events_EventListener $plugin)
-  {
-    $this->_eventDispatcher->bindEventListener($plugin);
-  }
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/SendmailTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/SendmailTransport.php
deleted file mode 100644
index aae8bde4e..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/SendmailTransport.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/Transport/EsmtpTransport.php';
-//@require 'Swift/Transport/IoBuffer.php';
-//@require 'Swift/Transport/Log.php';
-//@require 'Swift/Events/EventDispatcher.php';
-
-/**
- * SendmailTransport for sending mail through a sendmail/postfix (etc..) binary.
- * 
- * Supported modes are -bs and -t, with any additional flags desired.
- * It is advised to use -bs mode since error reporting with -t mode is not
- * possible.
- * 
- * @package Swift
- * @subpackage Transport
- * @author Chris Corbyn
- */
-class Swift_Transport_SendmailTransport
-  extends Swift_Transport_AbstractSmtpTransport
-{
-  
-  /**
-   * Connection buffer parameters.
-   * @var array
-   * @access protected
-   */
-  private $_params = array(
-    'timeout' => 30,
-    'blocking' => 1,
-    'command' => '/usr/sbin/sendmail -bs',
-    'type' => Swift_Transport_IoBuffer::TYPE_PROCESS
-    );
-  
-  /**
-   * Create a new SendmailTransport with $buf for I/O.
-   * @param Swift_Transport_IoBuffer $buf
-   * @param Swift_Events_EventDispatcher $dispatcher
-   */
-  public function __construct(Swift_Transport_IoBuffer $buf,
-    Swift_Events_EventDispatcher $dispatcher)
-  {
-    parent::__construct($buf, $dispatcher);
-  }
-  
-  /**
-   * Start the standalone SMTP session if running in -bs mode.
-   */
-  public function start()
-  {
-    if (false !== strpos($this->getCommand(), ' -bs'))
-    {
-      parent::start();
-    }
-  }
-  
-  /**
-   * Set the command to invoke.
-   * If using -t mode you are strongly advised to include -oi or -i in the
-   * flags. For example: /usr/sbin/sendmail -oi -t
-   * Swift will append a -f<sender> flag if one is not present.
-   * The recommended mode is "-bs" since it is interactive and failure notifications
-   * are hence possible.
-   * @param string $command
-   */
-  public function setCommand($command)
-  {
-    $this->_params['command'] = $command;
-    return $this;
-  }
-  
-  /**
-   * Get the sendmail command which will be invoked.
-   * @return string
-   */
-  public function getCommand()
-  {
-    return $this->_params['command'];
-  }
-  
-  /**
-   * Send the given Message.
-   * Recipient/sender data will be retreived from the Message API.
-   * The return value is the number of recipients who were accepted for delivery.
-   * NOTE: If using 'sendmail -t' you will not be aware of any failures until
-   * they bounce (i.e. send() will always return 100% success).
-   * @param Swift_Mime_Message $message
-   * @param string[] &$failedRecipients to collect failures by-reference
-   * @return int
-   */
-  public function send(Swift_Mime_Message $message, &$failedRecipients = null)
-  {
-    $failedRecipients = (array) $failedRecipients;
-    $command = $this->getCommand();
-    $buffer = $this->getBuffer();
-    
-    if (false !== strpos($command, ' -t'))
-    {
-      if ($evt = $this->_eventDispatcher->createSendEvent($this, $message))
-      {
-        $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
-        if ($evt->bubbleCancelled())
-        {
-          return 0;
-        }
-      }
-      
-      if (false === strpos($command, ' -f'))
-      {
-        $command .= ' -f' . $this->_getReversePath($message);
-      }
-      
-      $buffer->initialize(array_merge($this->_params, array('command' => $command)));
-      
-      if (false === strpos($command, ' -i') && false === strpos($command, ' -oi'))
-      {
-        $buffer->setWriteTranslations(array("\r\n" => "\n", "\n." => "\n.."));
-      }
-      else
-      {
-        $buffer->setWriteTranslations(array("\r\n"=>"\n"));
-      }
-      
-      $count = count((array) $message->getTo())
-        + count((array) $message->getCc())
-        + count((array) $message->getBcc())
-        ;
-      $message->toByteStream($buffer);
-      $buffer->flushBuffers();
-      $buffer->setWriteTranslations(array());
-      $buffer->terminate();
-      
-      if ($evt)
-      {
-        $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
-        $evt->setFailedRecipients($failedRecipients);
-        $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
-      }
-      
-      $message->generateId();
-    }
-    elseif (false !== strpos($command, ' -bs'))
-    {
-      $count = parent::send($message, $failedRecipients);
-    }
-    else
-    {
-      $this->_throwException(new Swift_TransportException(
-        'Unsupported sendmail command flags [' . $command . ']. ' .
-        'Must be one of "-bs" or "-t" but can include additional flags.'
-        ));
-    }
-    
-    return $count;
-  }
-  
-  // -- Protected methods
-  
-  /** Get the params to initialize the buffer */
-  protected function _getBufferParams()
-  {
-    return $this->_params;
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/SimpleMailInvoker.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/SimpleMailInvoker.php
deleted file mode 100644
index 271ba8483..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/SimpleMailInvoker.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/*
- Invokes the mail() function in Swift Mailer.
- 
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- 
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.
- 
- */
- 
-//@require 'Swift/Transport/MailInvoker.php';
-
-/**
- * This is the implementation class for {@link Swift_Transport_MailInvoker}.
- * 
- * @package Swift
- * @subpackage Transport
- * @author Chris Corbyn
- */
-class Swift_Transport_SimpleMailInvoker implements Swift_Transport_MailInvoker
-{
-  
-  /**
-   * Send mail via the mail() function.
-   * 
-   * This method takes the same arguments as PHP mail().
-   * 
-   * @param string $to
-   * @param string $subject
-   * @param string $body
-   * @param string $headers
-   * @param string $extraParams
-   * 
-   * @return boolean
-   */
-  public function mail($to, $subject, $body, $headers = null, $extraParams = null)
-  {
-    if (!ini_get('safe_mode'))
-    {
-      return mail($to, $subject, $body, $headers, $extraParams);
-    }
-    else
-    {
-      return mail($to, $subject, $body, $headers);      
-    }
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/SmtpAgent.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/SmtpAgent.php
deleted file mode 100644
index ee9b8ed51..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/SmtpAgent.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Wraps an IoBuffer to send/receive SMTP commands/responses.
- * @package Swift
- * @subpackage Transport
- * @author Chris Corbyn
- */
-interface Swift_Transport_SmtpAgent
-{
-  
-  /**
-   * Get the IoBuffer where read/writes are occurring.
-   * @return Swift_Transport_IoBuffer
-   */
-  public function getBuffer();
-  
-  /**
-   * Run a command against the buffer, expecting the given response codes.
-   * If no response codes are given, the response will not be validated.
-   * If codes are given, an exception will be thrown on an invalid response.
-   * @param string $command
-   * @param int[] $codes
-   * @param string[] &$failures
-   */
-  public function executeCommand($command, $codes = array(), &$failures = null);
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/SpoolTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/SpoolTransport.php
deleted file mode 100644
index 61a148497..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/SpoolTransport.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2009 Fabien Potencier <fabien.potencier@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Stores Messages in a queue.
- * @package Swift
- * @author  Fabien Potencier
- */
-class Swift_Transport_SpoolTransport implements Swift_Transport
-{
-  /** The spool instance */
-  private $_spool;
-
-  /** The event dispatcher from the plugin API */
-  private $_eventDispatcher;
-
-  /**
-   * Constructor.
-   */
-  public function __construct(Swift_Events_EventDispatcher $eventDispatcher, Swift_Spool $spool = null)
-  {
-    $this->_eventDispatcher = $eventDispatcher;
-    $this->_spool = $spool;
-  }
-  
-  /**
-   * Sets the spool object.
-   * @param Swift_Spool $spool
-   */
-  public function setSpool(Swift_Spool $spool)
-  {
-    $this->_spool = $spool;
-    return $this;
-  }
-  
-  /**
-   * Get the spool object.
-   * @return Swift_Spool
-   */
-  public function getSpool()
-  {
-    return $this->_spool;
-  }
-  
-  /**
-   * Tests if this Transport mechanism has started.
-   *
-   * @return boolean
-   */
-  public function isStarted()
-  {
-    return true;
-  }
-  
-  /**
-   * Starts this Transport mechanism.
-   */
-  public function start()
-  {
-  }
-  
-  /**
-   * Stops this Transport mechanism.
-   */
-  public function stop()
-  {
-  }
-  
-  /**
-   * Sends the given message.
-   *
-   * @param Swift_Mime_Message $message
-   * @param string[] &$failedRecipients to collect failures by-reference
-   *
-   * @return int The number of sent emails
-   */
-  public function send(Swift_Mime_Message $message, &$failedRecipients = null)
-  {
-    if ($evt = $this->_eventDispatcher->createSendEvent($this, $message))
-    {
-      $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
-      if ($evt->bubbleCancelled())
-      {
-        return 0;
-      }
-    }
-    
-    $success = $this->_spool->queueMessage($message);
-    
-    if ($evt)
-    {
-      $evt->setResult($success ? Swift_Events_SendEvent::RESULT_SUCCESS : Swift_Events_SendEvent::RESULT_FAILED);
-      $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
-    }
-    
-    return 1;
-  }
-  
-  /**
-   * Register a plugin.
-   *
-   * @param Swift_Events_EventListener $plugin
-   */
-  public function registerPlugin(Swift_Events_EventListener $plugin)
-  {
-    $this->_eventDispatcher->bindEventListener($plugin);
-  }
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/StreamBuffer.php b/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/StreamBuffer.php
deleted file mode 100644
index 01ae8a593..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Transport/StreamBuffer.php
+++ /dev/null
@@ -1,276 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-//@require 'Swift/ByteStream/AbstractFilterableInputStream.php';
-//@require 'Swift/ReplacementFilterFactory.php';
-//@require 'Swift/Transport/IoBuffer.php';
-//@require 'Swift/TransportException.php';
-
-/**
- * A generic IoBuffer implementation supporting remote sockets and local processes.
- * @package Swift
- * @subpackage Transport
- * @author Chris Corbyn
- */
-class Swift_Transport_StreamBuffer
-  extends Swift_ByteStream_AbstractFilterableInputStream
-  implements Swift_Transport_IoBuffer
-{
-  
-  /** A primary socket */
-  private $_stream;
-  
-  /** The input stream */
-  private $_in;
-  
-  /** The output stream */
-  private $_out;
-  
-  /** Buffer initialization parameters */
-  private $_params = array();
-  
-  /** The ReplacementFilterFactory */
-  private $_replacementFactory;
-  
-  /** Translations performed on data being streamed into the buffer */
-  private $_translations = array();
-  
-  /**
-   * Create a new StreamBuffer using $replacementFactory for transformations.
-   * @param Swift_ReplacementFilterFactory $replacementFactory
-   */
-  public function __construct(
-    Swift_ReplacementFilterFactory $replacementFactory)
-  {
-    $this->_replacementFactory = $replacementFactory;
-  }
-  
-  /**
-   * Perform any initialization needed, using the given $params.
-   * Parameters will vary depending upon the type of IoBuffer used.
-   * @param array $params
-   */
-  public function initialize(array $params)
-  {
-    $this->_params = $params;
-    switch ($params['type'])
-    {
-      case self::TYPE_PROCESS:
-        $this->_establishProcessConnection();
-        break;
-      case self::TYPE_SOCKET:
-      default:
-        $this->_establishSocketConnection();
-        break;
-    }
-  }
-  
-  /**
-   * Set an individual param on the buffer (e.g. switching to SSL).
-   * @param string $param
-   * @param mixed $value
-   */
-  public function setParam($param, $value)
-  {
-    if (isset($this->_stream))
-    {
-      switch ($param)
-      {
-        case 'protocol':
-          if (!array_key_exists('protocol', $this->_params)
-            || $value != $this->_params['protocol'])
-          {
-            if ('tls' == $value)
-            {
-              stream_socket_enable_crypto(
-                $this->_stream, true, STREAM_CRYPTO_METHOD_TLS_CLIENT
-                );
-            }
-          }
-          break;
-      }
-    }
-    $this->_params[$param] = $value;
-  }
-  
-  /**
-   * Perform any shutdown logic needed.
-   */
-  public function terminate()
-  {
-    if (isset($this->_stream))
-    {
-      switch ($this->_params['type'])
-      {
-        case self::TYPE_PROCESS:
-          fclose($this->_in);
-          fclose($this->_out);
-          proc_close($this->_stream);
-          break;
-        case self::TYPE_SOCKET:
-        default:
-          fclose($this->_stream);
-          break;
-      }
-    }
-    $this->_stream = null;
-    $this->_out = null;
-    $this->_in = null;
-  }
-  
-  /**
-   * Set an array of string replacements which should be made on data written
-   * to the buffer.  This could replace LF with CRLF for example.
-   * @param string[] $replacements
-   */
-  public function setWriteTranslations(array $replacements)
-  {
-    foreach ($this->_translations as $search => $replace)
-    {
-      if (!isset($replacements[$search]))
-      {
-        $this->removeFilter($search);
-        unset($this->_translations[$search]);
-      }
-    }
-    
-    foreach ($replacements as $search => $replace)
-    {
-      if (!isset($this->_translations[$search]))
-      {
-        $this->addFilter(
-          $this->_replacementFactory->createFilter($search, $replace), $search
-          );
-        $this->_translations[$search] = true;
-      }
-    }
-  }
-  
-  /**
-   * Get a line of output (including any CRLF).
-   * The $sequence number comes from any writes and may or may not be used
-   * depending upon the implementation.
-   * @param int $sequence of last write to scan from
-   * @return string
-   */
-  public function readLine($sequence)
-  {
-    if (isset($this->_out) && !feof($this->_out))
-    {
-      $line = fgets($this->_out);
-      return $line;
-    }
-  }
-  
-  /**
-   * Reads $length bytes from the stream into a string and moves the pointer
-   * through the stream by $length. If less bytes exist than are requested the
-   * remaining bytes are given instead. If no bytes are remaining at all, boolean
-   * false is returned.
-   * @param int $length
-   * @return string
-   */
-  public function read($length)
-  {
-    if (isset($this->_out) && !feof($this->_out))
-    {
-      $ret = fread($this->_out, $length);
-      return $ret;
-    }
-  }
-  
-  /** Not implemented */
-  public function setReadPointer($byteOffset)
-  {
-  }
-  
-  // -- Protected methods
-  
-  /** Flush the stream contents */
-  protected function _flush()
-  {
-    if (isset($this->_in))
-    {
-      fflush($this->_in);
-    }
-  }
-  
-  /** Write this bytes to the stream */
-  protected function _commit($bytes)
-  {
-    if (isset($this->_in)
-      && fwrite($this->_in, $bytes))
-    {
-      return ++$this->_sequence;
-    }
-  }
-  
-  // -- Private methods
-  
-  /**
-   * Establishes a connection to a remote server.
-   * @access private
-   */
-  private function _establishSocketConnection()
-  {
-    $host = $this->_params['host'];
-    if (!empty($this->_params['protocol']))
-    {
-      $host = $this->_params['protocol'] . '://' . $host;
-    }
-    $timeout = 15;
-    if (!empty($this->_params['timeout']))
-    {
-      $timeout = $this->_params['timeout'];
-    }
-    if (!$this->_stream = fsockopen($host, $this->_params['port'], $errno, $errstr, $timeout))
-    {
-      throw new Swift_TransportException(
-        'Connection could not be established with host ' . $this->_params['host'] .
-        ' [' . $errstr . ' #' . $errno . ']'
-        );
-    }
-    if (!empty($this->_params['blocking']))
-    {
-      stream_set_blocking($this->_stream, 1);
-    }
-    else
-    {
-      stream_set_blocking($this->_stream, 0);
-    }
-    $this->_in =& $this->_stream;
-    $this->_out =& $this->_stream;
-  }
-  
-  /**
-   * Opens a process for input/output.
-   * @access private
-   */
-  private function _establishProcessConnection()
-  {
-    $command = $this->_params['command'];
-    $descriptorSpec = array(
-      0 => array('pipe', 'r'),
-      1 => array('pipe', 'w'),
-      2 => array('pipe', 'w')
-      );
-    $this->_stream = proc_open($command, $descriptorSpec, $pipes);
-    stream_set_blocking($pipes[2], 0);
-    if ($err = stream_get_contents($pipes[2]))
-    {
-      throw new Swift_TransportException(
-        'Process could not be started [' . $err . ']'
-        );
-    }
-    $this->_in =& $pipes[0];
-    $this->_out =& $pipes[1];
-  }
-  
-}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/composer.json b/lib/vendor/symfony/lib/vendor/swiftmailer/composer.json
new file mode 100644
index 000000000..86691bdb2
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/composer.json
@@ -0,0 +1,36 @@
+{
+    "name": "swiftmailer/swiftmailer",
+    "type": "library",
+    "description": "Swiftmailer, free feature-rich PHP mailer",
+    "keywords": ["mail","mailer","email"],
+    "homepage": "http://swiftmailer.org",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Chris Corbyn"
+        },
+        {
+            "name": "Fabien Potencier",
+            "email": "fabien@symfony.com"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.3"
+    },
+    "require-dev": {
+        "mockery/mockery": "~0.9.1"
+    },
+    "autoload": {
+        "files": ["lib/swift_required.php"]
+    },
+    "autoload-dev": {
+        "psr-0": {
+            "Swift_": "tests/unit"
+        }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "5.4-dev"
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/dependency_maps/cache_deps.php b/lib/vendor/symfony/lib/vendor/swiftmailer/dependency_maps/cache_deps.php
deleted file mode 100644
index 605820646..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/dependency_maps/cache_deps.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-Swift_DependencyContainer::getInstance()
-  
-  -> register('cache')
-  -> asAliasOf('cache.array')
-  
-  -> register('tempdir')
-  -> asValue('/tmp')
-  
-  -> register('cache.null')
-  -> asSharedInstanceOf('Swift_KeyCache_NullKeyCache')
-  
-  -> register('cache.array')
-  -> asSharedInstanceOf('Swift_KeyCache_ArrayKeyCache')
-  -> withDependencies(array('cache.inputstream'))
-  
-  -> register('cache.disk')
-  -> asSharedInstanceOf('Swift_KeyCache_DiskKeyCache')
-  -> withDependencies(array('cache.inputstream', 'tempdir'))
-  
-  -> register('cache.inputstream')
-  -> asNewInstanceOf('Swift_KeyCache_SimpleKeyCacheInputStream')
-  
-  ;
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/dependency_maps/mime_deps.php b/lib/vendor/symfony/lib/vendor/swiftmailer/dependency_maps/mime_deps.php
deleted file mode 100644
index e03927a3c..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/dependency_maps/mime_deps.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-require_once dirname(__FILE__) . '/../mime_types.php';
-
-Swift_DependencyContainer::getInstance()
-    
-  -> register('properties.charset')
-  -> asValue('utf-8')
-  
-  -> register('mime.message')
-  -> asNewInstanceOf('Swift_Mime_SimpleMessage')
-  -> withDependencies(array(
-    'mime.headerset',
-    'mime.qpcontentencoder',
-    'cache',
-    'properties.charset'
-  ))
-  
-  -> register('mime.part')
-  -> asNewInstanceOf('Swift_Mime_MimePart')
-  -> withDependencies(array(
-    'mime.headerset',
-    'mime.qpcontentencoder',
-    'cache',
-    'properties.charset'
-  ))
-  
-  -> register('mime.attachment')
-  -> asNewInstanceOf('Swift_Mime_Attachment')
-  -> withDependencies(array(
-    'mime.headerset',
-    'mime.base64contentencoder',
-    'cache'
-  ))
-  -> addConstructorValue($swift_mime_types)
-  
-  -> register('mime.embeddedfile')
-  -> asNewInstanceOf('Swift_Mime_EmbeddedFile')
-  -> withDependencies(array(
-    'mime.headerset',
-    'mime.base64contentencoder',
-    'cache'
-  ))
-  -> addConstructorValue($swift_mime_types)
-  
-  -> register('mime.headerfactory')
-  -> asNewInstanceOf('Swift_Mime_SimpleHeaderFactory')
-  -> withDependencies(array(
-      'mime.qpheaderencoder',
-      'mime.rfc2231encoder',
-      'properties.charset'
-    ))
-  
-  -> register('mime.headerset')
-  -> asNewInstanceOf('Swift_Mime_SimpleHeaderSet')
-  -> withDependencies(array('mime.headerfactory', 'properties.charset'))
-  
-  -> register('mime.qpheaderencoder')
-  -> asNewInstanceOf('Swift_Mime_HeaderEncoder_QpHeaderEncoder')
-  -> withDependencies(array('mime.charstream'))
-  
-  -> register('mime.charstream')
-  -> asNewInstanceOf('Swift_CharacterStream_NgCharacterStream')
-  -> withDependencies(array('mime.characterreaderfactory', 'properties.charset'))
-  
-  -> register('mime.bytecanonicalizer')
-  -> asSharedInstanceOf('Swift_StreamFilters_ByteArrayReplacementFilter')
-  -> addConstructorValue(array(array(0x0D, 0x0A), array(0x0D), array(0x0A)))
-  -> addConstructorValue(array(array(0x0A), array(0x0A), array(0x0D, 0x0A)))
-  
-  -> register('mime.characterreaderfactory')
-  -> asSharedInstanceOf('Swift_CharacterReaderFactory_SimpleCharacterReaderFactory')
-  
-  -> register('mime.qpcontentencoder')
-  -> asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoder')
-  -> withDependencies(array('mime.charstream', 'mime.bytecanonicalizer'))
-  
-  -> register('mime.7bitcontentencoder')
-  -> asNewInstanceOf('Swift_Mime_ContentEncoder_PlainContentEncoder')
-  -> addConstructorValue('7bit')
-  -> addConstructorValue(true)
-  
-  -> register('mime.8bitcontentencoder')
-  -> asNewInstanceOf('Swift_Mime_ContentEncoder_PlainContentEncoder')
-  -> addConstructorValue('8bit')
-  -> addConstructorValue(true)
-  
-  -> register('mime.base64contentencoder')
-  -> asSharedInstanceOf('Swift_Mime_ContentEncoder_Base64ContentEncoder')
-  
-  -> register('mime.rfc2231encoder')
-  -> asNewInstanceOf('Swift_Encoder_Rfc2231Encoder')
-  -> withDependencies(array('mime.charstream'))
-  
-  ;
-  
-unset($swift_mime_types);
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/dependency_maps/transport_deps.php b/lib/vendor/symfony/lib/vendor/swiftmailer/dependency_maps/transport_deps.php
deleted file mode 100644
index 52c334165..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/dependency_maps/transport_deps.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-Swift_DependencyContainer::getInstance()
-  
-  -> register('transport.smtp')
-  -> asNewInstanceOf('Swift_Transport_EsmtpTransport')
-  -> withDependencies(array(
-    'transport.buffer',
-    array('transport.authhandler'),
-    'transport.eventdispatcher'
-  ))
-  
-  -> register('transport.sendmail')
-  -> asNewInstanceOf('Swift_Transport_SendmailTransport')
-  -> withDependencies(array(
-    'transport.buffer',
-    'transport.eventdispatcher'
-  ))
-  
-  -> register('transport.mail')
-  -> asNewInstanceOf('Swift_Transport_MailTransport')
-  -> withDependencies(array('transport.mailinvoker', 'transport.eventdispatcher'))
-  
-  -> register('transport.loadbalanced')
-  -> asNewInstanceOf('Swift_Transport_LoadBalancedTransport')
-  
-  -> register('transport.failover')
-  -> asNewInstanceOf('Swift_Transport_FailoverTransport')
-  
-  -> register('transport.spool')
-  -> asNewInstanceOf('Swift_Transport_SpoolTransport')
-  -> withDependencies(array('transport.eventdispatcher'))
-  
-  -> register('transport.null')
-  -> asNewInstanceOf('Swift_Transport_NullTransport')
-  -> withDependencies(array('transport.eventdispatcher'))
-  
-  -> register('transport.mailinvoker')
-  -> asSharedInstanceOf('Swift_Transport_SimpleMailInvoker')
-  
-  -> register('transport.buffer')
-  -> asNewInstanceOf('Swift_Transport_StreamBuffer')
-  -> withDependencies(array('transport.replacementfactory'))
-  
-  -> register('transport.authhandler')
-  -> asNewInstanceOf('Swift_Transport_Esmtp_AuthHandler')
-  -> withDependencies(array(
-    array(
-      'transport.crammd5auth',
-      'transport.loginauth',
-      'transport.plainauth'
-    )
-  ))
-  
-  -> register('transport.crammd5auth')
-  -> asNewInstanceOf('Swift_Transport_Esmtp_Auth_CramMd5Authenticator')
-  
-  -> register('transport.loginauth')
-  -> asNewInstanceOf('Swift_Transport_Esmtp_Auth_LoginAuthenticator')
-  
-  -> register('transport.plainauth')
-  -> asNewInstanceOf('Swift_Transport_Esmtp_Auth_PlainAuthenticator')
-  
-  -> register('transport.eventdispatcher')
-  -> asNewInstanceOf('Swift_Events_SimpleEventDispatcher')
-  
-  -> register('transport.replacementfactory')
-  -> asSharedInstanceOf('Swift_StreamFilters_StringReplacementFilterFactory')
-  
-  ;
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/doc/headers.rst b/lib/vendor/symfony/lib/vendor/swiftmailer/doc/headers.rst
new file mode 100644
index 000000000..6aec23ff3
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/doc/headers.rst
@@ -0,0 +1,742 @@
+Message Headers
+===============
+
+Sometimes you'll want to add your own headers to a message or modify/remove
+headers that are already present. You work with the message's HeaderSet to do
+this.
+
+Header Basics
+-------------
+
+All MIME entities in Swift Mailer -- including the message itself --
+store their headers in a single object called a HeaderSet. This HeaderSet is
+retrieved with the ``getHeaders()`` method.
+
+As mentioned in the previous chapter, everything that forms a part of a message
+in Swift Mailer is a MIME entity that is represented by an instance of
+``Swift_Mime_MimeEntity``. This includes -- most notably -- the message object
+itself, attachments, MIME parts and embedded images. Each of these MIME entities
+consists of a body and a set of headers that describe the body.
+
+For all of the "standard" headers in these MIME entities, such as the
+``Content-Type``, there are named methods for working with them, such as
+``setContentType()`` and ``getContentType()``. This is because headers are a
+moderately complex area of the library. Each header has a slightly different
+required structure that it must meet in order to comply with the standards that
+govern email (and that are checked by spam blockers etc).
+
+You fetch the HeaderSet from a MIME entity like so:
+
+.. code-block:: php
+
+    $message = Swift_Message::newInstance();
+
+    // Fetch the HeaderSet from a Message object
+    $headers = $message->getHeaders();
+
+    $attachment = Swift_Attachment::fromPath('document.pdf');
+
+    // Fetch the HeaderSet from an attachment object
+    $headers = $attachment->getHeaders();
+
+The job of the HeaderSet is to contain and manage instances of Header objects.
+Depending upon the MIME entity the HeaderSet came from, the contents of the
+HeaderSet will be different, since an attachment for example has a different
+set of headers to those in a message.
+
+You can find out what the HeaderSet contains with a quick loop, dumping out
+the names of the headers:
+
+.. code-block:: php
+
+    foreach ($headers->getAll() as $header) {
+      printf("%s<br />\n", $header->getFieldName());
+    }
+
+    /*
+    Content-Transfer-Encoding
+    Content-Type
+    MIME-Version
+    Date
+    Message-ID
+    From
+    Subject
+    To
+    */
+
+You can also dump out the rendered HeaderSet by calling its ``toString()``
+method:
+
+.. code-block:: php
+
+    echo $headers->toString();
+
+    /*
+    Message-ID: <1234869991.499a9ee7f1d5e@swift.generated>
+    Date: Tue, 17 Feb 2009 22:26:31 +1100
+    Subject: Awesome subject!
+    From: sender@example.org
+    To: recipient@example.org
+    MIME-Version: 1.0
+    Content-Type: text/plain; charset=utf-8
+    Content-Transfer-Encoding: quoted-printable
+    */
+
+Where the complexity comes in is when you want to modify an existing header.
+This complexity comes from the fact that each header can be of a slightly
+different type (such as a Date header, or a header that contains email
+addresses, or a header that has key-value parameters on it!). Each header in the
+HeaderSet is an instance of ``Swift_Mime_Header``. They all have common
+functionality, but knowing exactly what type of header you're working with will
+allow you a little more control.
+
+You can determine the type of header by comparing the return value of its
+``getFieldType()`` method with the constants ``TYPE_TEXT``,
+``TYPE_PARAMETERIZED``, ``TYPE_DATE``, ``TYPE_MAILBOX``, ``TYPE_ID`` and
+``TYPE_PATH`` which are defined in ``Swift_Mime_Header``.
+
+
+.. code-block:: php
+
+    foreach ($headers->getAll() as $header) {
+      switch ($header->getFieldType()) {
+        case Swift_Mime_Header::TYPE_TEXT: $type = 'text';
+          break;
+        case Swift_Mime_Header::TYPE_PARAMETERIZED: $type = 'parameterized';
+          break;
+        case Swift_Mime_Header::TYPE_MAILBOX: $type = 'mailbox';
+          break;
+        case Swift_Mime_Header::TYPE_DATE: $type = 'date';
+          break;
+        case Swift_Mime_Header::TYPE_ID: $type = 'ID';
+          break;
+        case Swift_Mime_Header::TYPE_PATH: $type = 'path';
+          break;
+      }
+      printf("%s: is a %s header<br />\n", $header->getFieldName(), $type);
+    }
+
+    /*
+    Content-Transfer-Encoding: is a text header
+    Content-Type: is a parameterized header
+    MIME-Version: is a text header
+    Date: is a date header
+    Message-ID: is a ID header
+    From: is a mailbox header
+    Subject: is a text header
+    To: is a mailbox header
+    */
+
+Headers can be removed from the set, modified within the set, or added to the
+set.
+
+The following sections show you how to work with the HeaderSet and explain the
+details of each implementation of ``Swift_Mime_Header`` that may
+exist within the HeaderSet.
+
+Header Types
+------------
+
+Because all headers are modeled on different data (dates, addresses, text!)
+there are different types of Header in Swift Mailer. Swift Mailer attempts to
+categorize all possible MIME headers into more general groups, defined by a
+small number of classes.
+
+Text Headers
+~~~~~~~~~~~~
+
+Text headers are the simplest type of Header. They contain textual information
+with no special information included within it -- for example the Subject
+header in a message.
+
+There's nothing particularly interesting about a text header, though it is
+probably the one you'd opt to use if you need to add a custom header to a
+message. It represents text just like you'd think it does. If the text
+contains characters that are not permitted in a message header (such as new
+lines, or non-ascii characters) then the header takes care of encoding the
+text so that it can be used.
+
+No header -- including text headers -- in Swift Mailer is vulnerable to
+header-injection attacks. Swift Mailer breaks any attempt at header injection by
+encoding the dangerous data into a non-dangerous form.
+
+It's easy to add a new text header to a HeaderSet. You do this by calling the
+HeaderSet's ``addTextHeader()`` method.
+
+.. code-block:: php
+
+    $message = Swift_Message::newInstance();
+
+    $headers = $message->getHeaders();
+
+    $headers->addTextHeader('Your-Header-Name', 'the header value');
+
+Changing the value of an existing text header is done by calling it's
+``setValue()`` method.
+
+.. code-block:: php
+
+    $subject = $message->getHeaders()->get('Subject');
+
+    $subject->setValue('new subject');
+
+When output via ``toString()``, a text header produces something like the
+following:
+
+.. code-block:: php
+
+    $subject = $message->getHeaders()->get('Subject');
+
+    $subject->setValue('amazing subject line');
+
+    echo $subject->toString();
+
+    /*
+
+    Subject: amazing subject line
+
+    */
+
+If the header contains any characters that are outside of the US-ASCII range
+however, they will be encoded. This is nothing to be concerned about since
+mail clients will decode them back.
+
+.. code-block:: php
+
+    $subject = $message->getHeaders()->get('Subject');
+
+    $subject->setValue('contains – dash');
+
+    echo $subject->toString();
+
+    /*
+
+    Subject: contains =?utf-8?Q?=E2=80=93?= dash
+
+    */
+
+Parameterized Headers
+~~~~~~~~~~~~~~~~~~~~~
+
+Parameterized headers are text headers that contain key-value parameters
+following the textual content. The Content-Type header of a message is a
+parameterized header since it contains charset information after the content
+type.
+
+The parameterized header type is a special type of text header. It extends the
+text header by allowing additional information to follow it. All of the methods
+from text headers are available in addition to the methods described here.
+
+Adding a parameterized header to a HeaderSet is done by using the
+``addParameterizedHeader()`` method which takes a text value like
+``addTextHeader()`` but it also accepts an associative array of
+key-value parameters.
+
+.. code-block:: php
+
+    $message = Swift_Message::newInstance();
+
+    $headers = $message->getHeaders();
+
+    $headers->addParameterizedHeader(
+      'Header-Name', 'header value',
+      array('foo' => 'bar')
+      );
+
+To change the text value of the header, call it's ``setValue()`` method just as
+you do with text headers.
+
+To change the parameters in the header, call the header's ``setParameters()``
+method or the ``setParameter()`` method (note the pluralization).
+
+.. code-block:: php
+
+    $type = $message->getHeaders()->get('Content-Type');
+
+    // setParameters() takes an associative array
+    $type->setParameters(array(
+      'name' => 'file.txt',
+      'charset' => 'iso-8859-1'
+      ));
+
+    // setParameter() takes two args for $key and $value
+    $type->setParameter('charset', 'iso-8859-1');
+
+When output via ``toString()``, a parameterized header produces something like
+the following:
+
+.. code-block:: php
+
+    $type = $message->getHeaders()->get('Content-Type');
+
+    $type->setValue('text/html');
+    $type->setParameter('charset', 'utf-8');
+
+    echo $type->toString();
+
+    /*
+
+    Content-Type: text/html; charset=utf-8
+
+    */
+
+If the header contains any characters that are outside of the US-ASCII range
+however, they will be encoded, just like they are for text headers. This is
+nothing to be concerned about since mail clients will decode them back.
+Likewise, if the parameters contain any non-ascii characters they will be
+encoded so that they can be transmitted safely.
+
+.. code-block:: php
+
+    $attachment = Swift_Attachment::newInstance();
+
+    $disp = $attachment->getHeaders()->get('Content-Disposition');
+
+    $disp->setValue('attachment');
+    $disp->setParameter('filename', 'report–may.pdf');
+
+    echo $disp->toString();
+
+    /*
+
+    Content-Disposition: attachment; filename*=utf-8''report%E2%80%93may.pdf
+
+    */
+
+Date Headers
+~~~~~~~~~~~~
+
+Date headers contains an RFC 2822 formatted date (i.e. what PHP's ``date('r')``
+returns). They are used anywhere a date or time is needed to be presented as a
+message header.
+
+The data on which a date header is modeled is simply a UNIX timestamp such as
+that returned by ``time()`` or ``strtotime()``.  The timestamp is used to create
+a correctly structured RFC 2822 formatted date such as
+``Tue, 17 Feb 2009 22:26:31 +1100``.
+
+The obvious place this header type is used is in the ``Date:`` header of the
+message itself.
+
+It's easy to add a new date header to a HeaderSet.  You do this by calling
+the HeaderSet's ``addDateHeader()`` method.
+
+.. code-block:: php
+
+    $message = Swift_Message::newInstance();
+
+    $headers = $message->getHeaders();
+
+    $headers->addDateHeader('Your-Header-Name', strtotime('3 days ago'));
+
+Changing the value of an existing date header is done by calling it's
+``setTimestamp()`` method.
+
+.. code-block:: php
+
+    $date = $message->getHeaders()->get('Date');
+
+    $date->setTimestamp(time());
+
+When output via ``toString()``, a date header produces something like the
+following:
+
+.. code-block:: php
+
+    $date = $message->getHeaders()->get('Date');
+
+    echo $date->toString();
+
+    /*
+
+    Date: Wed, 18 Feb 2009 13:35:02 +1100
+
+    */
+
+Mailbox (e-mail address) Headers
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Mailbox headers contain one or more email addresses, possibly with
+personalized names attached to them. The data on which they are modeled is
+represented by an associative array of email addresses and names.
+
+Mailbox headers are probably the most complex header type to understand in
+Swift Mailer because they accept their input as an array which can take various
+forms, as described in the previous chapter.
+
+All of the headers that contain e-mail addresses in a message -- with the
+exception of ``Return-Path:`` which has a stricter syntax -- use this header
+type. That is, ``To:``, ``From:`` etc.
+
+You add a new mailbox header to a HeaderSet by calling the HeaderSet's
+``addMailboxHeader()`` method.
+
+.. code-block:: php
+
+    $message = Swift_Message::newInstance();
+
+    $headers = $message->getHeaders();
+
+    $headers->addMailboxHeader('Your-Header-Name', array(
+      'person1@example.org' => 'Person Name One',
+      'person2@example.org',
+      'person3@example.org',
+      'person4@example.org' => 'Another named person'
+      ));
+
+Changing the value of an existing mailbox header is done by calling it's
+``setNameAddresses()`` method.
+
+.. code-block:: php
+
+    $to = $message->getHeaders()->get('To');
+
+    $to->setNameAddresses(array(
+      'joe@example.org' => 'Joe Bloggs',
+      'john@example.org' => 'John Doe',
+      'no-name@example.org'
+      ));
+
+If you don't wish to concern yourself with the complicated accepted input
+formats accepted by ``setNameAddresses()`` as described in the previous chapter
+and you only want to set one or more addresses (not names) then you can just
+use the ``setAddresses()`` method instead.
+
+.. code-block:: php
+
+    $to = $message->getHeaders()->get('To');
+
+    $to->setAddresses(array(
+      'joe@example.org',
+      'john@example.org',
+      'no-name@example.org'
+      ));
+
+.. note::
+
+    Both methods will accept the above input format in practice.
+
+If all you want to do is set a single address in the header, you can use a
+string as the input parameter to ``setAddresses()`` and/or
+``setNameAddresses()``.
+
+.. code-block:: php
+
+    $to = $message->getHeaders()->get('To');
+
+    $to->setAddresses('joe-bloggs@example.org');
+
+When output via ``toString()``, a mailbox header produces something like the
+following:
+
+.. code-block:: php
+
+    $to = $message->getHeaders()->get('To');
+
+    $to->setNameAddresses(array(
+      'person1@example.org' => 'Name of Person',
+      'person2@example.org',
+      'person3@example.org' => 'Another Person'
+    ));
+
+    echo $to->toString();
+
+    /*
+
+    To: Name of Person <person1@example.org>, person2@example.org, Another Person
+     <person3@example.org>
+
+    */
+
+ID Headers
+~~~~~~~~~~
+
+ID headers contain identifiers for the entity (or the message). The most
+notable ID header is the Message-ID header on the message itself.
+
+An ID that exists inside an ID header looks more-or-less less like an email
+address.  For example, ``<1234955437.499becad62ec2@example.org>``.
+The part to the left of the @ sign is usually unique, based on the current time
+and some random factor. The part on the right is usually a domain name.
+
+Any ID passed to the header's ``setId()`` method absolutely MUST conform to
+this structure, otherwise you'll get an Exception thrown at you by Swift Mailer
+(a ``Swift_RfcComplianceException``).  This is to ensure that the generated
+email complies with relevant RFC documents and therefore is less likely to be
+blocked as spam.
+
+It's easy to add a new ID header to a HeaderSet.  You do this by calling
+the HeaderSet's ``addIdHeader()`` method.
+
+.. code-block:: php
+
+    $message = Swift_Message::newInstance();
+
+    $headers = $message->getHeaders();
+
+    $headers->addIdHeader('Your-Header-Name', '123456.unqiue@example.org');
+
+Changing the value of an existing date header is done by calling its
+``setId()`` method.
+
+.. code-block:: php
+
+    $msgId = $message->getHeaders()->get('Message-ID');
+
+    $msgId->setId(time() . '.' . uniqid('thing') . '@example.org');
+
+When output via ``toString()``, an ID header produces something like the
+following:
+
+.. code-block:: php
+
+    $msgId = $message->getHeaders()->get('Message-ID');
+
+    echo $msgId->toString();
+
+    /*
+
+    Message-ID: <1234955437.499becad62ec2@example.org>
+
+    */
+
+Path Headers
+~~~~~~~~~~~~
+
+Path headers are like very-restricted mailbox headers. They contain a single
+email address with no associated name. The Return-Path header of a message is
+a path header.
+
+You add a new path header to a HeaderSet by calling the HeaderSet's
+``addPathHeader()`` method.
+
+.. code-block:: php
+
+    $message = Swift_Message::newInstance();
+
+    $headers = $message->getHeaders();
+
+    $headers->addPathHeader('Your-Header-Name', 'person@example.org');
+
+
+Changing the value of an existing path header is done by calling its
+``setAddress()`` method.
+
+.. code-block:: php
+
+    $return = $message->getHeaders()->get('Return-Path');
+
+    $return->setAddress('my-address@example.org');
+
+When output via ``toString()``, a path header produces something like the
+following:
+
+.. code-block:: php
+
+    $return = $message->getHeaders()->get('Return-Path');
+
+    $return->setAddress('person@example.org');
+
+    echo $return->toString();
+
+    /*
+
+    Return-Path: <person@example.org>
+
+    */
+
+Header Operations
+-----------------
+
+Working with the headers in a message involves knowing how to use the methods
+on the HeaderSet and on the individual Headers within the HeaderSet.
+
+Adding new Headers
+~~~~~~~~~~~~~~~~~~
+
+New headers can be added to the HeaderSet by using one of the provided
+``add..Header()`` methods.
+
+To add a header to a MIME entity (such as the message):
+
+Get the HeaderSet from the entity by via its ``getHeaders()`` method.
+
+* Add the header to the HeaderSet by calling one of the ``add..Header()``
+  methods.
+
+The added header will appear in the message when it is sent.
+
+.. code-block:: php
+
+    // Adding a custom header to a message
+    $message = Swift_Message::newInstance();
+    $headers = $message->getHeaders();
+    $headers->addTextHeader('X-Mine', 'something here');
+
+    // Adding a custom header to an attachment
+    $attachment = Swift_Attachment::fromPath('/path/to/doc.pdf');
+    $attachment->getHeaders()->addDateHeader('X-Created-Time', time());
+
+Retrieving Headers
+~~~~~~~~~~~~~~~~~~
+
+Headers are retrieved through the HeaderSet's ``get()`` and ``getAll()``
+methods.
+
+To get a header, or several headers from a MIME entity:
+
+* Get the HeaderSet from the entity by via its ``getHeaders()`` method.
+
+* Get the header(s) from the HeaderSet by calling either ``get()`` or
+  ``getAll()``.
+
+When using ``get()`` a single header is returned that matches the name (case
+insensitive) that is passed to it. When using ``getAll()`` with a header name,
+an array of headers with that name are returned. Calling ``getAll()`` with no
+arguments returns an array of all headers present in the entity.
+
+.. note::
+
+    It's valid for some headers to appear more than once in a message (e.g.
+    the Received header). For this reason ``getAll()`` exists to fetch all
+    headers with a specified name. In addition, ``get()`` accepts an optional
+    numerical index, starting from zero to specify which header you want more
+    specifically.
+
+.. note::
+
+    If you want to modify the contents of the header and you don't know for
+    sure what type of header it is then you may need to check the type by
+    calling its ``getFieldType()`` method.
+
+    .. code-block:: php
+
+        $headers = $message->getHeaders();
+
+        // Get the To: header
+        $toHeader = $headers->get('To');
+
+        // Get all headers named "X-Foo"
+        $fooHeaders = $headers->getAll('X-Foo');
+
+        // Get the second header named "X-Foo"
+        $foo = $headers->get('X-Foo', 1);
+
+        // Get all headers that are present
+        $all = $headers->getAll();
+
+Check if a Header Exists
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+You can check if a named header is present in a HeaderSet by calling its
+``has()`` method.
+
+To check if a header exists:
+
+* Get the HeaderSet from the entity by via its ``getHeaders()`` method.
+
+* Call the HeaderSet's ``has()`` method specifying the header you're looking
+  for.
+
+If the header exists, ``true`` will be returned or ``false`` if not.
+
+.. note::
+
+    It's valid for some headers to appear more than once in a message (e.g.
+    the Received header). For this reason ``has()`` accepts an optional
+    numerical index, starting from zero to specify which header you want to
+    check more specifically.
+
+    .. code-block:: php
+
+        $headers = $message->getHeaders();
+
+        // Check if the To: header exists
+        if ($headers->has('To')) {
+          echo 'To: exists';
+        }
+
+        // Check if an X-Foo header exists twice (i.e. check for the 2nd one)
+        if ($headers->has('X-Foo', 1)) {
+          echo 'Second X-Foo header exists';
+        }
+
+Removing Headers
+~~~~~~~~~~~~~~~~
+
+Removing a Header from the HeaderSet is done by calling the HeaderSet's
+``remove()`` or ``removeAll()`` methods.
+
+To remove an existing header:
+
+* Get the HeaderSet from the entity by via its ``getHeaders()`` method.
+
+* Call the HeaderSet's ``remove()`` or ``removeAll()`` methods specifying the
+  header you want to remove.
+
+When calling ``remove()`` a single header will be removed. When calling
+``removeAll()`` all headers with the given name will be removed. If no headers
+exist with the given name, no errors will occur.
+
+.. note::
+
+    It's valid for some headers to appear more than once in a message (e.g.
+    the Received header). For this reason ``remove()`` accepts an optional
+    numerical index, starting from zero to specify which header you want to
+    check more specifically. For the same reason, ``removeAll()`` exists to
+    remove all headers that have the given name.
+
+    .. code-block:: php
+
+        $headers = $message->getHeaders();
+
+        // Remove the Subject: header
+        $headers->remove('Subject');
+
+        // Remove all X-Foo headers
+        $headers->removeAll('X-Foo');
+
+        // Remove only the second X-Foo header
+        $headers->remove('X-Foo', 1);
+
+Modifying a Header's Content
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To change a Header's content you should know what type of header it is and then
+call it's appropriate setter method. All headers also have a
+``setFieldBodyModel()`` method that accepts a mixed parameter and delegates to
+the correct setter.
+
+To modify an existing header:
+
+* Get the HeaderSet from the entity by via its ``getHeaders()`` method.
+
+* Get the Header by using the HeaderSet's ``get()``.
+
+* Call the Header's appropriate setter method or call the header's
+  ``setFieldBodyModel()`` method.
+
+The header will be updated inside the HeaderSet and the changes will be seen
+when the message is sent.
+
+.. code-block:: php
+
+    $headers = $message->getHeaders();
+
+    // Change the Subject: header
+    $subj = $headers->get('Subject');
+    $subj->setValue('new subject here');
+
+    // Change the To: header
+    $to = $headers->get('To');
+    $to->setNameAddresses(array(
+      'person@example.org' => 'Person',
+      'thing@example.org'
+    ));
+
+    // Using the setFieldBodyModel() just delegates to the correct method
+    // So here to calls setNameAddresses()
+    $to->setFieldBodyModel(array(
+      'person@example.org' => 'Person',
+      'thing@example.org'
+    ));
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/doc/help-resources.rst b/lib/vendor/symfony/lib/vendor/swiftmailer/doc/help-resources.rst
new file mode 100644
index 000000000..420893590
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/doc/help-resources.rst
@@ -0,0 +1,44 @@
+Getting Help
+============
+
+There are a number of ways you can get help when using Swift Mailer, depending
+upon the nature of your problem. For bug reports and feature requests create a
+new ticket in GitHub. For general advice ask on the Google Group
+(swiftmailer).
+
+Submitting Bugs & Feature Requests
+----------------------------------
+
+Bugs and feature requests should be posted on GitHub.
+
+If you post a bug or request a feature in the forum, or on the Google Group
+you will most likely be asked to create a ticket in `GitHub`_ since it is
+simply not feasible to manage such requests from a number of a different
+sources.
+
+When you go to GitHub you will be asked to create a username and password
+before you can create a ticket. This is free and takes very little time.
+
+When you create your ticket, do not assign it to any milestones. A developer
+will assess your ticket and re-assign it as needed.
+
+If your ticket is reporting a bug present in the current version, which was
+not present in the previous version please include the tag "regression" in
+your ticket.
+
+GitHub will update you when work is performed on your ticket.
+
+Ask on the Google Group
+-----------------------
+
+You can seek advice at Google Groups, within the "swiftmailer" `group`_.
+
+You can post messages to this group if you want help, or there's something you
+wish to discuss with the developers and with other users.
+
+This is probably the fastest way to get help since it is primarily email-based
+for most users, though bug reports should not be posted here since they may
+not be resolved.
+
+.. _`GitHub`: https://github.com/swiftmailer/swiftmailer/issues
+.. _`group`:  http://groups.google.com/group/swiftmailer
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/doc/including-the-files.rst b/lib/vendor/symfony/lib/vendor/swiftmailer/doc/including-the-files.rst
new file mode 100644
index 000000000..978dca206
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/doc/including-the-files.rst
@@ -0,0 +1,46 @@
+Including Swift Mailer (Autoloading)
+====================================
+
+If you are using Composer, Swift Mailer will be automatically autoloaded.
+
+If not, you can use the built-in autoloader by requiring the
+``swift_required.php`` file::
+
+    require_once '/path/to/swift-mailer/lib/swift_required.php';
+
+    /* rest of code goes here */
+
+If you want to override the default Swift Mailer configuration, call the
+``init()`` method on the ``Swift`` class and pass it a valid PHP callable (a
+PHP function name, a PHP 5.3 anonymous function, ...)::
+
+    require_once '/path/to/swift-mailer/lib/swift_required.php';
+
+    function swiftmailer_configurator() {
+        // configure Swift Mailer
+
+        Swift_DependencyContainer::getInstance()->...
+        Swift_Preferences::getInstance()->...
+    }
+
+    Swift::init('swiftmailer_configurator');
+
+    /* rest of code goes here */
+
+The advantage of using the ``init()`` method is that your code will be
+executed only if you use Swift Mailer in your script.
+
+.. note::
+
+    While Swift Mailer's autoloader is designed to play nicely with other
+    autoloaders, sometimes you may have a need to avoid using Swift Mailer's
+    autoloader and use your own instead. Include the ``swift_init.php``
+    instead of the ``swift_required.php`` if you need to do this. The very
+    minimum include is the ``swift_init.php`` file since Swift Mailer will not
+    work without the dependency injection this file sets up:
+
+    .. code-block:: php
+
+        require_once '/path/to/swift-mailer/lib/swift_init.php';
+
+        /* rest of code goes here */
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/doc/index.rst b/lib/vendor/symfony/lib/vendor/swiftmailer/doc/index.rst
new file mode 100644
index 000000000..a1a0a9246
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/doc/index.rst
@@ -0,0 +1,16 @@
+Swiftmailer
+===========
+
+.. toctree::
+    :maxdepth: 2
+
+    introduction
+    overview
+    installing
+    help-resources
+    including-the-files
+    messages
+    headers
+    sending
+    plugins
+    japanese
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/doc/installing.rst b/lib/vendor/symfony/lib/vendor/swiftmailer/doc/installing.rst
new file mode 100644
index 000000000..557211d48
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/doc/installing.rst
@@ -0,0 +1,89 @@
+Installing the Library
+======================
+
+Installing with Composer
+------------------------
+
+The recommended way to install Swiftmailer is via Composer:
+
+.. code-block:: bash
+
+    $ php composer.phar require swiftmailer/swiftmailer @stable
+
+Installing from Git
+-------------------
+
+It's possible to download and install Swift Mailer directly from github.com if
+you want to keep up-to-date with ease.
+
+Swift Mailer's source code is kept in a git repository at github.com so you
+can get the source directly from the repository.
+
+.. note::
+
+    You do not need to have git installed to use Swift Mailer from GitHub. If
+    you don't have git installed, go to `GitHub`_ and click the "Download"
+    button.
+
+Cloning the Repository
+~~~~~~~~~~~~~~~~~~~~~~
+
+The repository can be cloned from git://github.com/swiftmailer/swiftmailer.git
+using the ``git clone`` command.
+
+You will need to have ``git`` installed before you can use the
+``git clone`` command.
+
+To clone the repository:
+
+* Open your favorite terminal environment (command line).
+
+* Move to the directory you want to clone to.
+
+* Run the command ``git clone git://github.com/swiftmailer/swiftmailer.git
+  swiftmailer``.
+
+The source code will be downloaded into a directory called "swiftmailer".
+
+The example shows the process on a UNIX-like system such as Linux, BSD or Mac
+OS X.
+
+.. code-block:: bash
+
+    $ cd source_code/
+    $ git clone git://github.com/swiftmailer/swiftmailer.git swiftmailer
+    Initialized empty Git repository in /Users/chris/source_code/swiftmailer/.git/
+    remote: Counting objects: 6815, done.
+    remote: Compressing objects: 100% (2761/2761), done.
+    remote: Total 6815 (delta 3641), reused 6326 (delta 3286)
+    Receiving objects: 100% (6815/6815), 4.35 MiB | 162 KiB/s, done.
+    Resolving deltas: 100% (3641/3641), done.
+    Checking out files: 100% (1847/1847), done.
+    $ cd swiftmailer/
+    $ ls
+    CHANGES LICENSE ...
+    $
+
+Troubleshooting
+---------------
+
+Swift Mailer does not work when used with function overloading as implemented
+by ``mbstring`` (``mbstring.func_overload`` set to ``2``). A workaround is to
+temporarily change the internal encoding to ``ASCII`` when sending an email:
+
+.. code-block:: php
+
+    if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2)
+    {
+      $mbEncoding = mb_internal_encoding();
+      mb_internal_encoding('ASCII');
+    }
+
+    // Create your message and send it with Swift Mailer
+
+    if (isset($mbEncoding))
+    {
+      mb_internal_encoding($mbEncoding);
+    }
+
+.. _`GitHub`: http://github.com/swiftmailer/swiftmailer
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/doc/introduction.rst b/lib/vendor/symfony/lib/vendor/swiftmailer/doc/introduction.rst
new file mode 100644
index 000000000..a85336b7c
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/doc/introduction.rst
@@ -0,0 +1,135 @@
+Introduction
+============
+
+Swift Mailer is a component-based library for sending e-mails from PHP
+applications.
+
+Organization of this Book
+-------------------------
+
+This book has been written so that those who need information quickly are able
+to find what they need, and those who wish to learn more advanced topics can
+read deeper into each chapter.
+
+The book begins with an overview of Swift Mailer, discussing what's included
+in the package and preparing you for the remainder of the book.
+
+It is possible to read this user guide just like any other book (from
+beginning to end). Each chapter begins with a discussion of the contents it
+contains, followed by a short code sample designed to give you a head start.
+As you get further into a chapter you will learn more about Swift Mailer's
+capabilities, but often you will be able to head directly to the topic you
+wish to learn about.
+
+Throughout this book you will be presented with code samples, which most
+people should find ample to implement Swift Mailer appropriately in their own
+projects. We will also use diagrams where appropriate, and where we believe
+readers may find it helpful we will discuss some related theory, including
+reference to certain documents you are able to find online.
+
+Code Samples
+------------
+
+Code samples presented in this book will be displayed on a different colored
+background in a monospaced font. Samples are not to be taken as copy & paste
+code snippets.
+
+Code examples are used through the book to clarify what is written in text.
+They will sometimes be usable as-is, but they should always be taken as
+outline/pseudo code only.
+
+A code sample will look like this::
+
+    class AClass
+    {
+      ...
+    }
+
+    // A Comment
+    $obj = new AClass($arg1, $arg2, ... );
+
+    /* A note about another way of doing something
+    $obj = AClass::newInstance($arg1, $arg2, ... );
+
+    */
+
+The presence of 3 dots ``...`` in a code sample indicates that we have left
+out a chunk of the code for brevity, they are not actually part of the code.
+
+We will often place multi-line comments ``/* ... */`` in the code so that we
+can show alternative ways of achieving the same result.
+
+You should read the code examples given and try to understand them. They are
+kept concise so that you are not overwhelmed with information.
+
+History of Swift Mailer
+-----------------------
+
+Swift Mailer began back in 2005 as a one-class project for sending mail over
+SMTP. It has since grown into the flexible component-based library that is in
+development today.
+
+Chris Corbyn first posted Swift Mailer on a web forum asking for comments from
+other developers. It was never intended as a fully supported open source
+project, but members of the forum began to adopt it and make use of it.
+
+Very quickly feature requests were coming for the ability to add attachments
+and use SMTP authentication, along with a number of other "obvious" missing
+features. Considering the only alternative was PHPMailer it seemed like a good
+time to bring some fresh tools to the table. Chris began working towards a
+more component based, PHP5-like approach unlike the existing single-class,
+legacy PHP4 approach taken by PHPMailer.
+
+Members of the forum offered a lot of advice and critique on the code as he
+worked through this project and released versions 2 and 3 of the library in
+2005 and 2006, which by then had been broken down into smaller classes
+offering more flexibility and supporting plugins. To this day the Swift Mailer
+team still receive a lot of feature requests from users both on the forum and
+in by email.
+
+Until 2008 Chris was the sole developer of Swift Mailer, but entering 2009 he
+gained the support of two experienced developers well-known to him: Paul
+Annesley and Christopher Thompson. This has been an extremely welcome change.
+
+As of September 2009, Chris handed over the maintenance of Swift Mailer to
+Fabien Potencier.
+
+Now 2009 and in its fourth major version Swift Mailer is more object-oriented
+and flexible than ever, both from a usability standpoint and from a
+development standpoint.
+
+By no means is Swift Mailer ready to call "finished". There are still many
+features that can be added to the library along with the constant refactoring
+that happens behind the scenes.
+
+It's a Library!
+---------------
+
+Swift Mailer is not an application - it's a library.
+
+To most experienced developers this is probably an obvious point to make, but
+it's certainly worth mentioning. Many people often contact us having gotten
+the completely wrong end of the stick in terms of what Swift Mailer is
+actually for.
+
+It's not an application. It does not have a graphical user interface. It
+cannot be opened in your web browser directly.
+
+It's a library (or a framework if you like). It provides a whole lot of
+classes that do some very complicated things, so that you don't have to. You
+"use" Swift Mailer within an application so that your application can have the
+ability to send emails.
+
+The component-based structure of the library means that you are free to
+implement it in a number of different ways and that you can pick and choose
+what you want to use.
+
+An application on the other hand (such as a blog or a forum) is already "put
+together" in a particular way, (usually) provides a graphical user interface
+and most likely doesn't offer a great deal of integration with your own
+application.
+
+Embrace the structure of the library and use the components it offers to your
+advantage. Learning what the components do, rather than blindly copying and
+pasting existing code will put you in a great position to build a powerful
+application!
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/doc/japanese.rst b/lib/vendor/symfony/lib/vendor/swiftmailer/doc/japanese.rst
new file mode 100644
index 000000000..34afa7b8f
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/doc/japanese.rst
@@ -0,0 +1,22 @@
+Using Swift Mailer for Japanese Emails
+======================================
+
+To send emails in Japanese, you need to tweak the default configuration.
+
+After requiring the Swift Mailer autoloader (by including the
+``swift_required.php`` file), call the ``Swift::init()`` method with the
+following code::
+
+    require_once '/path/to/swift-mailer/lib/swift_required.php';
+
+    Swift::init(function () {
+        Swift_DependencyContainer::getInstance()
+            ->register('mime.qpheaderencoder')
+            ->asAliasOf('mime.base64headerencoder');
+
+        Swift_Preferences::getInstance()->setCharset('iso-2022-jp');
+    });
+
+    /* rest of code goes here */
+
+That's all!
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/doc/messages.rst b/lib/vendor/symfony/lib/vendor/swiftmailer/doc/messages.rst
new file mode 100644
index 000000000..7a1925364
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/doc/messages.rst
@@ -0,0 +1,1057 @@
+Creating Messages
+=================
+
+Creating messages in Swift Mailer is done by making use of the various MIME
+entities provided with the library.  Complex messages can be quickly created
+with very little effort.
+
+Quick Reference for Creating a Message
+---------------------------------------
+
+You can think of creating a Message as being similar to the steps you perform
+when you click the Compose button in your mail client.  You give it a subject,
+specify some recipients, add any attachments and write your message.
+
+To create a Message:
+
+* Call the ``newInstance()`` method of ``Swift_Message``.
+
+* Set your sender address (``From:``) with ``setFrom()`` or ``setSender()``.
+
+* Set a subject line with ``setSubject()``.
+
+* Set recipients with ``setTo()``, ``setCc()`` and/or ``setBcc()``.
+
+* Set a body with ``setBody()``.
+
+* Add attachments with ``attach()``.
+
+.. code-block:: php
+
+    require_once 'lib/swift_required.php';
+
+    // Create the message
+    $message = Swift_Message::newInstance()
+
+      // Give the message a subject
+      ->setSubject('Your subject')
+
+      // Set the From address with an associative array
+      ->setFrom(array('john@doe.com' => 'John Doe'))
+
+      // Set the To addresses with an associative array
+      ->setTo(array('receiver@domain.org', 'other@domain.org' => 'A name'))
+
+      // Give it a body
+      ->setBody('Here is the message itself')
+
+      // And optionally an alternative body
+      ->addPart('<q>Here is the message itself</q>', 'text/html')
+
+      // Optionally add any attachments
+      ->attach(Swift_Attachment::fromPath('my-document.pdf'))
+      ;
+
+Message Basics
+--------------
+
+A message is a container for anything you want to send to somebody else. There
+are several basic aspects of a message that you should know.
+
+An e-mail message is made up of several relatively simple entities that are
+combined in different ways to achieve different results. All of these entities
+have the same fundamental outline but serve a different purpose. The Message
+itself can be defined as a MIME entity, an Attachment is a MIME entity, all
+MIME parts are MIME entities -- and so on!
+
+The basic units of each MIME entity -- be it the Message itself, or an
+Attachment -- are its Headers and its body:
+
+.. code-block:: text
+
+    Header-Name: A header value
+    Other-Header: Another value
+
+    The body content itself
+
+The Headers of a MIME entity, and its body must conform to some strict
+standards defined by various RFC documents. Swift Mailer ensures that these
+specifications are followed by using various types of object, including
+Encoders and different Header types to generate the entity.
+
+The Structure of a Message
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Of all of the MIME entities, a message -- ``Swift_Message``
+is the largest and most complex. It has many properties that can be updated
+and it can contain other MIME entities -- attachments for example --
+nested inside it.
+
+A Message has a lot of different Headers which are there to present
+information about the message to the recipients' mail client. Most of these
+headers will be familiar to the majority of users, but we'll list the basic
+ones. Although it's possible to work directly with the Headers of a Message
+(or other MIME entity), the standard Headers have accessor methods provided to
+abstract away the complex details for you. For example, although the Date on a
+message is written with a strict format, you only need to pass a UNIX
+timestamp to ``setDate()``.
+
++-------------------------------+------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------+
+| Header                        | Description                                                                                                                        | Accessors                                   |
++===============================+====================================================================================================================================+=============================================+
+| ``Message-ID``                | Identifies this message with a unique ID, usually containing the domain name and time generated                                    | ``getId()`` / ``setId()``                   |
++-------------------------------+------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------+
+| ``Return-Path``               | Specifies where bounces should go (Swift Mailer reads this for other uses)                                                         | ``getReturnPath()`` / ``setReturnPath()``   |
++-------------------------------+------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------+
+| ``From``                      | Specifies the address of the person who the message is from. This can be multiple addresses if multiple people wrote the message.  | ``getFrom()`` / ``setFrom()``               |
++-------------------------------+------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------+
+| ``Sender``                    | Specifies the address of the person who physically sent the message (higher precedence than ``From:``)                             | ``getSender()`` / ``setSender()``           |
++-------------------------------+------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------+
+| ``To``                        | Specifies the addresses of the intended recipients                                                                                 | ``getTo()`` / ``setTo()``                   |
++-------------------------------+------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------+
+| ``Cc``                        | Specifies the addresses of recipients who will be copied in on the message                                                         | ``getCc()`` / ``setCc()``                   |
++-------------------------------+------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------+
+| ``Bcc``                       | Specifies the addresses of recipients who the message will be blind-copied to. Other recipients will not be aware of these copies. | ``getBcc()`` / ``setBcc()``                 |
++-------------------------------+------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------+
+| ``Reply-To``                  | Specifies the address where replies are sent to                                                                                    | ``getReplyTo()`` / ``setReplyTo()``         |
++-------------------------------+------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------+
+| ``Subject``                   | Specifies the subject line that is displayed in the recipients' mail client                                                        | ``getSubject()`` / ``setSubject()``         |
++-------------------------------+------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------+
+| ``Date``                      | Specifies the date at which the message was sent                                                                                   | ``getDate()`` / ``setDate()``               |
++-------------------------------+------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------+
+| ``Content-Type``              | Specifies the format of the message (usually text/plain or text/html)                                                              | ``getContentType()`` / ``setContentType()`` |
++-------------------------------+------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------+
+| ``Content-Transfer-Encoding`` | Specifies the encoding scheme in the message                                                                                       | ``getEncoder()`` / ``setEncoder()``         |
++-------------------------------+------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------------+
+
+Working with a Message Object
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Although there are a lot of available methods on a message object, you only
+need to make use of a small subset of them. Usually you'll use
+``setSubject()``, ``setTo()`` and
+``setFrom()`` before setting the body of your message with
+``setBody()``.
+
+Calling methods is simple. You just call them like functions, but using the
+object operator "``->``" to do so. If you've created
+a message object and called it ``$message`` then you'd set a
+subject on it like so:
+
+.. code-block:: php
+
+    require_once 'lib/swift_required.php';
+
+    $message = Swift_Message::newInstance();
+    $message->setSubject('My subject');
+
+All MIME entities (including a message) have a ``toString()``
+method that you can call if you want to take a look at what is going to be
+sent. For example, if you ``echo
+$message->toString();`` you would see something like this:
+
+.. code-block:: bash
+
+    Message-ID: <1230173678.4952f5eeb1432@swift.generated>
+    Date: Thu, 25 Dec 2008 13:54:38 +1100
+    Subject: Example subject
+    From: Chris Corbyn <chris@w3style.co.uk>
+    To: Receiver Name <recipient@example.org>
+    MIME-Version: 1.0
+    Content-Type: text/plain; charset=utf-8
+    Content-Transfer-Encoding: quoted-printable
+
+    Here is the message
+
+We'll take a closer look at the methods you use to create your message in the
+following sections.
+
+Adding Content to Your Message
+------------------------------
+
+Rich content can be added to messages in Swift Mailer with relative ease by
+calling methods such as ``setSubject()``, ``setBody()``, ``addPart()`` and
+``attach()``.
+
+Setting the Subject Line
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+The subject line, displayed in the recipients' mail client can be set with the
+``setSubject()`` method, or as a parameter to ``Swift_Message::newInstance()``.
+
+To set the subject of your Message:
+
+* Call the ``setSubject()`` method of the Message, or specify it at the time
+  you create the message.
+
+  .. code-block:: php
+
+    // Pass it as a parameter when you create the message
+    $message = Swift_Message::newInstance('My amazing subject');
+
+    // Or set it after like this
+    $message->setSubject('My amazing subject');
+
+Setting the Body Content
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+The body of the message -- seen when the user opens the message --
+is specified by calling the ``setBody()`` method. If an alternative body is to
+be included ``addPart()`` can be used.
+
+The body of a message is the main part that is read by the user. Often people
+want to send a message in HTML format (``text/html``), other
+times people want to send in plain text (``text/plain``), or
+sometimes people want to send both versions and allow the recipient to choose
+how they view the message.
+
+As a rule of thumb, if you're going to send a HTML email, always include a
+plain-text equivalent of the same content so that users who prefer to read
+plain text can do so.
+
+To set the body of your Message:
+
+* Call the ``setBody()`` method of the Message, or specify it at the time you
+  create the message.
+
+* Add any alternative bodies with ``addPart()``.
+
+If the recipient's mail client offers preferences for displaying text vs. HTML
+then the mail client will present that part to the user where available.  In
+other cases the mail client will display the "best" part it can - usually HTML
+if you've included HTML.
+
+.. code-block:: php
+
+    // Pass it as a parameter when you create the message
+    $message = Swift_Message::newInstance('Subject here', 'My amazing body');
+
+    // Or set it after like this
+    $message->setBody('My <em>amazing</em> body', 'text/html');
+
+    // Add alternative parts with addPart()
+    $message->addPart('My amazing body in plain text', 'text/plain');
+
+Attaching Files
+---------------
+
+Attachments are downloadable parts of a message and can be added by calling
+the ``attach()`` method on the message. You can add attachments that exist on
+disk, or you can create attachments on-the-fly.
+
+Attachments are actually an interesting area of Swift Mailer and something
+that could put a lot of power at your fingertips if you grasp the concept
+behind the way a message is held together.
+
+Although we refer to files sent over e-mails as "attachments" -- because
+they're attached to the message -- lots of other parts of the message are
+actually "attached" even if we don't refer to these parts as attachments.
+
+File attachments are created by the ``Swift_Attachment`` class
+and then attached to the message via the ``attach()`` method on
+it. For all of the "every day" MIME types such as all image formats, word
+documents, PDFs and spreadsheets you don't need to explicitly set the
+content-type of the attachment, though it would do no harm to do so. For less
+common formats you should set the content-type -- which we'll cover in a
+moment.
+
+Attaching Existing Files
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+Files that already exist, either on disk or at a URL can be attached to a
+message with just one line of code, using ``Swift_Attachment::fromPath()``.
+
+You can attach files that exist locally, or if your PHP installation has
+``allow_url_fopen`` turned on you can attach files from other
+websites.
+
+To attach an existing file:
+
+* Create an attachment with ``Swift_Attachment::fromPath()``.
+
+* Add the attachment to the message with ``attach()``.
+
+The attachment will be presented to the recipient as a downloadable file with
+the same filename as the one you attached.
+
+.. code-block:: php
+
+    // Create the attachment
+    // * Note that you can technically leave the content-type parameter out
+    $attachment = Swift_Attachment::fromPath('/path/to/image.jpg', 'image/jpeg');
+
+    // Attach it to the message
+    $message->attach($attachment);
+
+
+    // The two statements above could be written in one line instead
+    $message->attach(Swift_Attachment::fromPath('/path/to/image.jpg'));
+
+
+    // You can attach files from a URL if allow_url_fopen is on in php.ini
+    $message->attach(Swift_Attachment::fromPath('http://site.tld/logo.png'));
+
+Setting the Filename
+~~~~~~~~~~~~~~~~~~~~
+
+Usually you don't need to explicitly set the filename of an attachment because
+the name of the attached file will be used by default, but if you want to set
+the filename you use the ``setFilename()`` method of the Attachment.
+
+To change the filename of an attachment:
+
+* Call its ``setFilename()`` method.
+
+The attachment will be attached in the normal way, but meta-data sent inside
+the email will rename the file to something else.
+
+.. code-block:: php
+
+    // Create the attachment and call its setFilename() method
+    $attachment = Swift_Attachment::fromPath('/path/to/image.jpg')
+      ->setFilename('cool.jpg');
+
+
+    // Because there's a fluid interface, you can do this in one statement
+    $message->attach(
+      Swift_Attachment::fromPath('/path/to/image.jpg')->setFilename('cool.jpg')
+    );
+
+Attaching Dynamic Content
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Files that are generated at runtime, such as PDF documents or images created
+via GD can be attached directly to a message without writing them out to disk.
+Use the standard ``Swift_Attachment::newInstance()`` method.
+
+To attach dynamically created content:
+
+* Create your content as you normally would.
+
+* Create an attachment with ``Swift_Attachment::newInstance()``, specifying
+  the source data of your content along with a name and the content-type.
+
+* Add the attachment to the message with ``attach()``.
+
+The attachment will be presented to the recipient as a downloadable file
+with the filename and content-type you specify.
+
+.. note::
+
+    If you would usually write the file to disk anyway you should just attach
+    it with ``Swift_Attachment::fromPath()`` since this will use less memory:
+
+    .. code-block:: php
+
+        // Create your file contents in the normal way, but don't write them to disk
+        $data = create_my_pdf_data();
+
+        // Create the attachment with your data
+        $attachment = Swift_Attachment::newInstance($data, 'my-file.pdf', 'application/pdf');
+
+        // Attach it to the message
+        $message->attach($attachment);
+
+
+        // You can alternatively use method chaining to build the attachment
+        $attachment = Swift_Attachment::newInstance()
+          ->setFilename('my-file.pdf')
+          ->setContentType('application/pdf')
+          ->setBody($data)
+          ;
+
+Changing the Disposition
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+Attachments just appear as files that can be saved to the Desktop if desired.
+You can make attachment appear inline where possible by using the
+``setDisposition()`` method of an attachment.
+
+To make an attachment appear inline:
+
+* Call its ``setDisposition()`` method.
+
+The attachment will be displayed within the email viewing window if the mail
+client knows how to display it.
+
+.. note::
+
+    If you try to create an inline attachment for a non-displayable file type
+    such as a ZIP file, the mail client should just present the attachment as
+    normal:
+
+    .. code-block:: php
+
+        // Create the attachment and call its setDisposition() method
+        $attachment = Swift_Attachment::fromPath('/path/to/image.jpg')
+          ->setDisposition('inline');
+
+
+        // Because there's a fluid interface, you can do this in one statement
+        $message->attach(
+          Swift_Attachment::fromPath('/path/to/image.jpg')->setDisposition('inline')
+        );
+
+Embedding Inline Media Files
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Often people want to include an image or other content inline with a HTML
+message. It's easy to do this with HTML linking to remote resources, but this
+approach is usually blocked by mail clients. Swift Mailer allows you to embed
+your media directly into the message.
+
+Mail clients usually block downloads from remote resources because this
+technique was often abused as a mean of tracking who opened an email. If
+you're sending a HTML email and you want to include an image in the message
+another approach you can take is to embed the image directly.
+
+Swift Mailer makes embedding files into messages extremely streamlined. You
+embed a file by calling the ``embed()`` method of the message,
+which returns a value you can use in a ``src`` or
+``href`` attribute in your HTML.
+
+Just like with attachments, it's possible to embed dynamically generated
+content without having an existing file available.
+
+The embedded files are sent in the email as a special type of attachment that
+has a unique ID used to reference them within your HTML attributes. On mail
+clients that do not support embedded files they may appear as attachments.
+
+Although this is commonly done for images, in theory it will work for any
+displayable (or playable) media type. Support for other media types (such as
+video) is dependent on the mail client however.
+
+Embedding Existing Files
+........................
+
+Files that already exist, either on disk or at a URL can be embedded in a
+message with just one line of code, using ``Swift_EmbeddedFile::fromPath()``.
+
+You can embed files that exist locally, or if your PHP installation has
+``allow_url_fopen`` turned on you can embed files from other websites.
+
+To embed an existing file:
+
+* Create a message object with ``Swift_Message::newInstance()``.
+
+* Set the body as HTML, and embed a file at the correct point in the message with ``embed()``.
+
+The file will be displayed with the message inline with the HTML wherever its ID
+is used as a ``src`` attribute.
+
+.. note::
+
+    ``Swift_Image`` and ``Swift_EmbeddedFile`` are just aliases of one
+    another. ``Swift_Image`` exists for semantic purposes.
+
+.. note::
+
+    You can embed files in two stages if you prefer. Just capture the return
+    value of ``embed()`` in a variable and use that as the ``src`` attribute.
+
+    .. code-block:: php
+
+        // Create the message
+        $message = Swift_Message::newInstance('My subject');
+
+        // Set the body
+        $message->setBody(
+        '<html>' .
+        ' <head></head>' .
+        ' <body>' .
+        '  Here is an image <img src="' . // Embed the file
+             $message->embed(Swift_Image::fromPath('image.png')) .
+           '" alt="Image" />' .
+        '  Rest of message' .
+        ' </body>' .
+        '</html>',
+          'text/html' // Mark the content-type as HTML
+        );
+
+        // You can embed files from a URL if allow_url_fopen is on in php.ini
+        $message->setBody(
+        '<html>' .
+        ' <head></head>' .
+        ' <body>' .
+        '  Here is an image <img src="' .
+             $message->embed(Swift_Image::fromPath('http://site.tld/logo.png')) .
+           '" alt="Image" />' .
+        '  Rest of message' .
+        ' </body>' .
+        '</html>',
+          'text/html'
+        );
+
+
+        // If placing the embed() code inline becomes cumbersome
+        // it's easy to do this in two steps
+        $cid = $message->embed(Swift_Image::fromPath('image.png'));
+
+        $message->setBody(
+        '<html>' .
+        ' <head></head>' .
+        ' <body>' .
+        '  Here is an image <img src="' . $cid . '" alt="Image" />' .
+        '  Rest of message' .
+        ' </body>' .
+        '</html>',
+          'text/html' // Mark the content-type as HTML
+        );
+
+Embedding Dynamic Content
+.........................
+
+Images that are generated at runtime, such as images created via GD can be
+embedded directly to a message without writing them out to disk. Use the
+standard ``Swift_Image::newInstance()`` method.
+
+To embed dynamically created content:
+
+* Create a message object with ``Swift_Message::newInstance()``.
+
+* Set the body as HTML, and embed a file at the correct point in the message
+  with ``embed()``. You will need to specify a filename and a content-type.
+
+The file will be displayed with the message inline with the HTML wherever its ID
+is used as a ``src`` attribute.
+
+.. note::
+
+    ``Swift_Image`` and ``Swift_EmbeddedFile`` are just aliases of one
+    another. ``Swift_Image`` exists for semantic purposes.
+
+.. note::
+
+    You can embed files in two stages if you prefer. Just capture the return
+    value of ``embed()`` in a variable and use that as the ``src`` attribute.
+
+    .. code-block:: php
+
+        // Create your file contents in the normal way, but don't write them to disk
+        $img_data = create_my_image_data();
+
+        // Create the message
+        $message = Swift_Message::newInstance('My subject');
+
+        // Set the body
+        $message->setBody(
+        '<html>' .
+        ' <head></head>' .
+        ' <body>' .
+        '  Here is an image <img src="' . // Embed the file
+             $message->embed(Swift_Image::newInstance($img_data, 'image.jpg', 'image/jpeg')) .
+           '" alt="Image" />' .
+        '  Rest of message' .
+        ' </body>' .
+        '</html>',
+          'text/html' // Mark the content-type as HTML
+        );
+
+
+        // If placing the embed() code inline becomes cumbersome
+        // it's easy to do this in two steps
+        $cid = $message->embed(Swift_Image::newInstance($img_data, 'image.jpg', 'image/jpeg'));
+
+        $message->setBody(
+        '<html>' .
+        ' <head></head>' .
+        ' <body>' .
+        '  Here is an image <img src="' . $cid . '" alt="Image" />' .
+        '  Rest of message' .
+        ' </body>' .
+        '</html>',
+          'text/html' // Mark the content-type as HTML
+        );
+
+Adding Recipients to Your Message
+---------------------------------
+
+Recipients are specified within the message itself via ``setTo()``, ``setCc()``
+and ``setBcc()``. Swift Mailer reads these recipients from the message when it
+gets sent so that it knows where to send the message to.
+
+Message recipients are one of three types:
+
+* ``To:`` recipients -- the primary recipients (required)
+
+* ``Cc:`` recipients -- receive a copy of the message (optional)
+
+* ``Bcc:`` recipients -- hidden from other recipients (optional)
+
+Each type can contain one, or several addresses. It's possible to list only
+the addresses of the recipients, or you can personalize the address by
+providing the real name of the recipient.
+
+Make sure to add only valid email addresses as recipients. If you try to add an
+invalid email address with ``setTo()``, ``setCc()`` or ``setBcc()``, Swift
+Mailer will throw a ``Swift_RfcComplianceException``.
+
+If you add recipients automatically based on a data source that may contain
+invalid email addresses, you can prevent possible exceptions by validating the
+addresses using ``Swift_Validate::email($email)`` and only adding addresses
+that validate. Another way would be to wrap your ``setTo()``, ``setCc()`` and
+``setBcc()`` calls in a try-catch block and handle the
+``Swift_RfcComplianceException`` in the catch block.
+
+.. sidebar:: Syntax for Addresses
+
+    If you only wish to refer to a single email address (for example your
+    ``From:`` address) then you can just use a string.
+
+    .. code-block:: php
+
+          $message->setFrom('some@address.tld');
+
+    If you want to include a name then you must use an associative array.
+
+    .. code-block:: php
+
+         $message->setFrom(array('some@address.tld' => 'The Name'));
+
+    If you want to include multiple addresses then you must use an array.
+
+    .. code-block:: php
+
+         $message->setTo(array('some@address.tld', 'other@address.tld'));
+
+    You can mix personalized (addresses with a name) and non-personalized
+    addresses in the same list by mixing the use of associative and
+    non-associative array syntax.
+
+    .. code-block:: php
+
+         $message->setTo(array(
+           'recipient-with-name@example.org' => 'Recipient Name One',
+           'no-name@example.org', // Note that this is not a key-value pair
+           'named-recipient@example.org' => 'Recipient Name Two'
+         ));
+
+Setting ``To:`` Recipients
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``To:`` recipients are required in a message and are set with the
+``setTo()`` or ``addTo()`` methods of the message.
+
+To set ``To:`` recipients, create the message object using either
+``new Swift_Message( ... )`` or ``Swift_Message::newInstance( ... )``,
+then call the ``setTo()`` method with a complete array of addresses, or use the
+``addTo()`` method to iteratively add recipients.
+
+The ``setTo()`` method accepts input in various formats as described earlier in
+this chapter. The ``addTo()`` method takes either one or two parameters. The
+first being the email address and the second optional parameter being the name
+of the recipient.
+
+``To:`` recipients are visible in the message headers and will be
+seen by the other recipients.
+
+.. note::
+
+    Multiple calls to ``setTo()`` will not add new recipients -- each
+    call overrides the previous calls. If you want to iteratively add
+    recipients, use the ``addTo()`` method.
+
+    .. code-block:: php
+
+        // Using setTo() to set all recipients in one go
+        $message->setTo(array(
+          'person1@example.org',
+          'person2@otherdomain.org' => 'Person 2 Name',
+          'person3@example.org',
+          'person4@example.org',
+          'person5@example.org' => 'Person 5 Name'
+        ));
+
+        // Using addTo() to add recipients iteratively
+        $message->addTo('person1@example.org');
+        $message->addTo('person2@example.org', 'Person 2 Name');
+
+Setting ``Cc:`` Recipients
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``Cc:`` recipients are set with the ``setCc()`` or ``addCc()`` methods of the
+message.
+
+To set ``Cc:`` recipients, create the message object using either
+``new Swift_Message( ... )`` or ``Swift_Message::newInstance( ... )``, then call
+the ``setCc()`` method with a complete array of addresses, or use the
+``addCc()`` method to iteratively add recipients.
+
+The ``setCc()`` method accepts input in various formats as described earlier in
+this chapter. The ``addCc()`` method takes either one or two parameters. The
+first being the email address and the second optional parameter being the name
+of the recipient.
+
+``Cc:`` recipients are visible in the message headers and will be
+seen by the other recipients.
+
+.. note::
+
+    Multiple calls to ``setCc()`` will not add new recipients -- each
+    call overrides the previous calls. If you want to iteratively add Cc:
+    recipients, use the ``addCc()`` method.
+
+    .. code-block:: php
+
+        // Using setCc() to set all recipients in one go
+        $message->setCc(array(
+          'person1@example.org',
+          'person2@otherdomain.org' => 'Person 2 Name',
+          'person3@example.org',
+          'person4@example.org',
+          'person5@example.org' => 'Person 5 Name'
+        ));
+
+        // Using addCc() to add recipients iteratively
+        $message->addCc('person1@example.org');
+        $message->addCc('person2@example.org', 'Person 2 Name');
+
+Setting ``Bcc:`` Recipients
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``Bcc:`` recipients receive a copy of the message without anybody else knowing
+it, and are set with the ``setBcc()`` or ``addBcc()`` methods of the message.
+
+To set ``Bcc:`` recipients, create the message object using either ``new
+Swift_Message( ... )`` or ``Swift_Message::newInstance( ... )``, then call the
+``setBcc()`` method with a complete array of addresses, or use
+the ``addBcc()`` method to iteratively add recipients.
+
+The ``setBcc()`` method accepts input in various formats as described earlier in
+this chapter. The ``addBcc()`` method takes either one or two parameters. The
+first being the email address and the second optional parameter being the name
+of the recipient.
+
+Only the individual ``Bcc:`` recipient will see their address in the message
+headers. Other recipients (including other ``Bcc:`` recipients) will not see the
+address.
+
+.. note::
+
+    Multiple calls to ``setBcc()`` will not add new recipients -- each
+    call overrides the previous calls. If you want to iteratively add Bcc:
+    recipients, use the ``addBcc()`` method.
+
+    .. code-block:: php
+
+        // Using setBcc() to set all recipients in one go
+        $message->setBcc(array(
+          'person1@example.org',
+          'person2@otherdomain.org' => 'Person 2 Name',
+          'person3@example.org',
+          'person4@example.org',
+          'person5@example.org' => 'Person 5 Name'
+        ));
+
+        // Using addBcc() to add recipients iteratively
+        $message->addBcc('person1@example.org');
+        $message->addBcc('person2@example.org', 'Person 2 Name');
+
+Specifying Sender Details
+-------------------------
+
+An email must include information about who sent it. Usually this is managed
+by the ``From:`` address, however there are other options.
+
+The sender information is contained in three possible places:
+
+* ``From:`` -- the address(es) of who wrote the message (required)
+
+* ``Sender:`` -- the address of the single person who sent the message
+  (optional)
+
+* ``Return-Path:`` -- the address where bounces should go to (optional)
+
+You must always include a ``From:`` address by using ``setFrom()`` on the
+message. Swift Mailer will use this as the default ``Return-Path:`` unless
+otherwise specified.
+
+The ``Sender:`` address exists because the person who actually sent the email
+may not be the person who wrote the email. It has a higher precedence than the
+``From:`` address and will be used as the ``Return-Path:`` unless otherwise
+specified.
+
+Setting the ``From:`` Address
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+A ``From:`` address is required and is set with the ``setFrom()`` method of the
+message. ``From:`` addresses specify who actually wrote the email, and usually who sent it.
+
+What most people probably don't realise is that you can have more than one
+``From:`` address if more than one person wrote the email -- for example if an
+email was put together by a committee.
+
+To set the ``From:`` address(es):
+
+* Call the ``setFrom()`` method on the Message.
+
+The ``From:`` address(es) are visible in the message headers and
+will be seen by the recipients.
+
+.. note::
+
+    If you set multiple ``From:`` addresses then you absolutely must set a
+    ``Sender:`` address to indicate who physically sent the message.
+
+    .. code-block:: php
+
+        // Set a single From: address
+        $message->setFrom('your@address.tld');
+
+        // Set a From: address including a name
+        $message->setFrom(array('your@address.tld' => 'Your Name'));
+
+        // Set multiple From: addresses if multiple people wrote the email
+        $message->setFrom(array(
+          'person1@example.org' => 'Sender One',
+          'person2@example.org' => 'Sender Two'
+        ));
+
+Setting the ``Sender:`` Address
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+A ``Sender:`` address specifies who sent the message and is set with the
+``setSender()`` method of the message.
+
+To set the ``Sender:`` address:
+
+* Call the ``setSender()`` method on the Message.
+
+The ``Sender:`` address is visible in the message headers and will be seen by
+the recipients.
+
+This address will be used as the ``Return-Path:`` unless otherwise specified.
+
+.. note::
+
+    If you set multiple ``From:`` addresses then you absolutely must set a
+    ``Sender:`` address to indicate who physically sent the message.
+
+You must not set more than one sender address on a message because it's not
+possible for more than one person to send a single message.
+
+.. code-block:: php
+
+    $message->setSender('your@address.tld');
+
+Setting the ``Return-Path:`` (Bounce) Address
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The ``Return-Path:`` address specifies where bounce notifications should
+be sent and is set with the ``setReturnPath()`` method of the message.
+
+You can only have one ``Return-Path:`` and it must not include
+a personal name.
+
+To set the ``Return-Path:`` address:
+
+* Call the ``setReturnPath()`` method on the Message.
+
+Bounce notifications will be sent to this address.
+
+.. code-block:: php
+
+    $message->setReturnPath('bounces@address.tld');
+
+
+Signed/Encrypted Message
+------------------------
+
+To increase the integrity/security of a message it is possible to sign and/or
+encrypt an message using one or multiple signers.
+
+S/MIME
+~~~~~~
+
+S/MIME can sign and/or encrypt a message using the OpenSSL extension.
+
+When signing a message, the signer creates a signature of the entire content of the message (including attachments).
+
+The certificate and private key must be PEM encoded, and can be either created using for example OpenSSL or
+obtained at an official Certificate Authority (CA).
+
+**The recipient must have the CA certificate in the list of trusted issuers in order to verify the signature.**
+
+**Make sure the certificate supports emailProtection.**
+
+When using OpenSSL this can done by the including the *-addtrust emailProtection* parameter when creating the certificate.
+
+.. code-block:: php
+
+    $message = Swift_Message::newInstance();
+
+    $smimeSigner = Swift_Signers_SMimeSigner::newInstance();
+    $smimeSigner->setSignCertificate('/path/to/certificate.pem', '/path/to/private-key.pem');
+    $message->attachSigner($smimeSigner);
+
+When the private key is secured using a passphrase use the following instead.
+
+.. code-block:: php
+
+    $message = Swift_Message::newInstance();
+
+    $smimeSigner = Swift_Signers_SMimeSigner::newInstance();
+    $smimeSigner->setSignCertificate('/path/to/certificate.pem', array('/path/to/private-key.pem', 'passphrase'));
+    $message->attachSigner($smimeSigner);
+
+By default the signature is added as attachment,
+making the message still readable for mailing agents not supporting signed messages.
+
+Storing the message as binary is also possible but not recommended.
+
+.. code-block:: php
+
+    $smimeSigner->setSignCertificate('/path/to/certificate.pem', '/path/to/private-key.pem', PKCS7_BINARY);
+
+When encrypting the message (also known as enveloping), the entire message (including attachments)
+is encrypted using a certificate, and the recipient can then decrypt the message using corresponding private key.
+
+Encrypting ensures nobody can read the contents of the message without the private key.
+
+Normally the recipient provides a certificate for encrypting and keeping the decryption key private.
+
+Using both signing and encrypting is also possible.
+
+.. code-block:: php
+
+    $message = Swift_Message::newInstance();
+
+    $smimeSigner = Swift_Signers_SMimeSigner::newInstance();
+    $smimeSigner->setSignCertificate('/path/to/sign-certificate.pem', '/path/to/private-key.pem');
+    $smimeSigner->setEncryptCertificate('/path/to/encrypt-certificate.pem');
+    $message->attachSigner($smimeSigner);
+
+The used encryption cipher can be set as the second parameter of setEncryptCertificate()
+
+See http://php.net/manual/openssl.ciphers for a list of supported ciphers.
+
+By default the message is first signed and then encrypted, this can be changed by adding.
+
+.. code-block:: php
+
+    $smimeSigner->setSignThenEncrypt(false);
+
+**Changing this is not recommended as most mail agents don't support this none-standard way.**
+
+Only when having trouble with sign then encrypt method, this should be changed.
+
+Requesting a Read Receipt
+-------------------------
+
+It is possible to request a read-receipt to be sent to an address when the
+email is opened. To request a read receipt set the address with
+``setReadReceiptTo()``.
+
+To request a read receipt:
+
+* Set the address you want the receipt to be sent to with the
+  ``setReadReceiptTo()`` method on the Message.
+
+When the email is opened, if the mail client supports it a notification will be sent to this address.
+
+.. note::
+
+    Read receipts won't work for the majority of recipients since many mail
+    clients auto-disable them. Those clients that will send a read receipt
+    will make the user aware that one has been requested.
+
+    .. code-block:: php
+
+        $message->setReadReceiptTo('your@address.tld');
+
+Setting the Character Set
+-------------------------
+
+The character set of the message (and it's MIME parts) is set with the
+``setCharset()`` method. You can also change the global default of UTF-8 by
+working with the ``Swift_Preferences`` class.
+
+Swift Mailer will default to the UTF-8 character set unless otherwise
+overridden. UTF-8 will work in most instances since it includes all of the
+standard US keyboard characters in addition to most international characters.
+
+It is absolutely vital however that you know what character set your message
+(or it's MIME parts) are written in otherwise your message may be received
+completely garbled.
+
+There are two places in Swift Mailer where you can change the character set:
+
+* In the ``Swift_Preferences`` class
+
+* On each individual message and/or MIME part
+
+To set the character set of your Message:
+
+* Change the global UTF-8 setting by calling
+  ``Swift_Preferences::setCharset()``; or
+
+* Call the ``setCharset()`` method on the message or the MIME part.
+
+   .. code-block:: php
+
+    // Approach 1: Change the global setting (suggested)
+    Swift_Preferences::getInstance()->setCharset('iso-8859-2');
+
+    // Approach 2: Call the setCharset() method of the message
+    $message = Swift_Message::newInstance()
+      ->setCharset('iso-8859-2');
+
+    // Approach 3: Specify the charset when setting the body
+    $message->setBody('My body', 'text/html', 'iso-8859-2');
+
+    // Approach 4: Specify the charset for each part added
+    $message->addPart('My part', 'text/plain', 'iso-8859-2');
+
+Setting the Line Length
+-----------------------
+
+The length of lines in a message can be changed by using the ``setMaxLineLength()`` method on the message. It should be kept to less than
+1000 characters.
+
+Swift Mailer defaults to using 78 characters per line in a message. This is
+done for historical reasons and so that the message can be easily viewed in
+plain-text terminals.
+
+To change the maximum length of lines in your Message:
+
+* Call the ``setMaxLineLength()`` method on the Message.
+
+Lines that are longer than the line length specified will be wrapped between
+words.
+
+.. note::
+
+    You should never set a maximum length longer than 1000 characters
+    according to RFC 2822. Doing so could have unspecified side-effects such
+    as truncating parts of your message when it is transported between SMTP
+    servers.
+
+    .. code-block:: php
+
+        $message->setMaxLineLength(1000);
+
+Setting the Message Priority
+----------------------------
+
+You can change the priority of the message with ``setPriority()``. Setting the
+priority will not change the way your email is sent -- it is purely an
+indicative setting for the recipient.
+
+The priority of a message is an indication to the recipient what significance
+it has. Swift Mailer allows you to set the priority by calling the ``setPriority`` method. This method takes an integer value between 1 and 5:
+
+* Highest
+* High
+* Normal
+* Low
+* Lowest
+
+To set the message priority:
+
+* Set the priority as an integer between 1 and 5 with the ``setPriority()``
+  method on the Message.
+
+.. code-block:: php
+
+    // Indicate "High" priority
+    $message->setPriority(2);
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/doc/overview.rst b/lib/vendor/symfony/lib/vendor/swiftmailer/doc/overview.rst
new file mode 100644
index 000000000..b6dd296b1
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/doc/overview.rst
@@ -0,0 +1,161 @@
+Library Overview
+================
+
+Most features (and more) of your every day mail client software are provided
+by Swift Mailer, using object-oriented PHP code as the interface.
+
+In this chapter we will take a short tour of the various components, which put
+together form the Swift Mailer library as a whole. You will learn key
+terminology used throughout the rest of this book and you will gain a little
+understanding of the classes you will work with as you integrate Swift Mailer
+into your application.
+
+This chapter is intended to prepare you for the information contained in the
+subsequent chapters of this book. You may choose to skip this chapter if you
+are fairly technically minded, though it is likely to save you some time in
+the long run if you at least read between the lines here.
+
+System Requirements
+-------------------
+
+The basic requirements to operate Swift Mailer are extremely minimal and
+easily achieved. Historically, Swift Mailer has supported both PHP 4 and PHP 5
+by following a parallel development workflow. Now in it's fourth major
+version, and Swift Mailer operates on servers running PHP 5.3.3 or higher.
+
+The library aims to work with as many PHP 5 projects as possible:
+
+* PHP 5.3.3 or higher, with the SPL extension (standard)
+
+* Limited network access to connect to remote SMTP servers
+
+* 8 MB or more memory limit (Swift Mailer uses around 2 MB)
+
+Component Breakdown
+-------------------
+
+Swift Mailer is made up of many classes. Each of these classes can be grouped
+into a general "component" group which describes the task it is designed to
+perform.
+
+We'll take a brief look at the components which form Swift Mailer in this
+section of the book.
+
+The Mailer
+~~~~~~~~~~
+
+The mailer class, ``Swift_Mailer`` is the central class in the library where
+all of the other components meet one another. ``Swift_Mailer`` acts as a sort
+of message dispatcher, communicating with the underlying Transport to deliver
+your Message to all intended recipients.
+
+If you were to dig around in the source code for Swift Mailer you'd notice
+that ``Swift_Mailer`` itself is pretty bare. It delegates to other objects for
+most tasks and in theory, if you knew the internals of Swift Mailer well you
+could by-pass this class entirely. We wouldn't advise doing such a thing
+however -- there are reasons this class exists:
+
+* for consistency, regardless of the Transport used
+
+* to provide abstraction from the internals in the event internal API changes
+  are made
+
+* to provide convenience wrappers around aspects of the internal API
+
+An instance of ``Swift_Mailer`` is created by the developer before sending any
+Messages.
+
+Transports
+~~~~~~~~~~
+
+Transports are the classes in Swift Mailer that are responsible for
+communicating with a service in order to deliver a Message. There are several
+types of Transport in Swift Mailer, all of which implement the Swift_Transport
+interface and offer underlying start(), stop() and send() methods.
+
+Typically you will not need to know how a Transport works under-the-surface,
+you will only need to know how to create an instance of one, and which one to
+use for your environment.
+
++---------------------------------+---------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
+| Class                           | Features                                                                                    | Pros/cons                                                                                                                                     |
++=================================+=============================================================================================+===============================================================================================================================================+
+| ``Swift_SmtpTransport``         | Sends messages over SMTP; Supports Authentication; Supports Encryption                      | Very portable; Pleasingly predictable results; Provides good feedback                                                                         |
++---------------------------------+---------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
+| ``Swift_SendmailTransport``     | Communicates with a locally installed ``sendmail`` executable (Linux/UNIX)                  | Quick time-to-run;  Provides less-accurate feedback than SMTP; Requires ``sendmail`` installation                                             |
++---------------------------------+---------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
+| ``Swift_MailTransport``         | Uses PHP's built-in ``mail()`` function                                                     | Very portable; Potentially unpredictable results; Provides extremely weak feedback                                                            |
++---------------------------------+---------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
+| ``Swift_LoadBalancedTransport`` | Cycles through a collection of the other Transports to manage load-reduction                | Provides graceful fallback if one Transport fails (e.g. an SMTP server is down); Keeps the load on remote services down by spreading the work |
++---------------------------------+---------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
+| ``Swift_FailoverTransport``     | Works in conjunction with a collection of the other Transports to provide high-availability | Provides graceful fallback if one Transport fails (e.g. an SMTP server is down)                                                               |
++---------------------------------+---------------------------------------------------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------+
+
+MIME Entities
+~~~~~~~~~~~~~
+
+Everything that forms part of a Message is called a MIME Entity. All MIME
+entities in Swift Mailer share a common set of features. There are various
+types of MIME entity that serve different purposes such as Attachments and
+MIME parts.
+
+An e-mail message is made up of several relatively simple entities that are
+combined in different ways to achieve different results. All of these entities
+have the same fundamental outline but serve a different purpose. The Message
+itself can be defined as a MIME entity, an Attachment is a MIME entity, all
+MIME parts are MIME entities -- and so on!
+
+The basic units of each MIME entity -- be it the Message itself, or an
+Attachment -- are its Headers and its body:
+
+.. code-block:: text
+
+    Other-Header: Another value
+
+    The body content itself
+
+The Headers of a MIME entity, and its body must conform to some strict
+standards defined by various RFC documents. Swift Mailer ensures that these
+specifications are followed by using various types of object, including
+Encoders and different Header types to generate the entity.
+
+Each MIME component implements the base ``Swift_Mime_MimeEntity`` interface,
+which offers methods for retrieving Headers, adding new Headers, changing the
+Encoder, updating the body and so on!
+
+All MIME entities have one Header in common -- the Content-Type Header,
+updated with the entity's ``setContentType()`` method.
+
+Encoders
+~~~~~~~~
+
+Encoders are used to transform the content of Messages generated in Swift
+Mailer into a format that is safe to send across the internet and that
+conforms to RFC specifications.
+
+Generally speaking you will not need to interact with the Encoders in Swift
+Mailer -- the correct settings will be handled by the library itself.
+However they are probably worth a brief mention in the event that you do want
+to play with them.
+
+Both the Headers and the body of all MIME entities (including the Message
+itself) use Encoders to ensure the data they contain can be sent over the
+internet without becoming corrupted or misinterpreted.
+
+There are two types of Encoder: Base64 and Quoted-Printable.
+
+Plugins
+~~~~~~~
+
+Plugins exist to extend, or modify the behaviour of Swift Mailer. They respond
+to Events that are fired within the Transports during sending.
+
+There are a number of Plugins provided as part of the base Swift Mailer
+package and they all follow a common interface to respond to Events fired
+within the library. Interfaces are provided to "listen" to each type of Event
+fired and to act as desired when a listened-to Event occurs.
+
+Although several plugins are provided with Swift Mailer out-of-the-box, the
+Events system has been specifically designed to make it easy for experienced
+object-oriented developers to write their own plugins in order to achieve
+goals that may not be possible with the base library.
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/doc/plugins.rst b/lib/vendor/symfony/lib/vendor/swiftmailer/doc/plugins.rst
new file mode 100644
index 000000000..16ae3356f
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/doc/plugins.rst
@@ -0,0 +1,385 @@
+Plugins
+=======
+
+Plugins are provided with Swift Mailer and can be used to extend the behavior
+of the library in situations where using simple class inheritance would be more complex.
+
+AntiFlood Plugin
+----------------
+
+Many SMTP servers have limits on the number of messages that may be sent
+during any single SMTP connection. The AntiFlood plugin provides a way to stay
+within this limit while still managing a large number of emails.
+
+A typical limit for a single connection is 100 emails. If the server you
+connect to imposes such a limit, it expects you to disconnect after that
+number of emails has been sent. You could manage this manually within a loop,
+but the AntiFlood plugin provides the necessary wrapper code so that you don't
+need to worry about this logic.
+
+Regardless of limits imposed by the server, it's usually a good idea to be
+conservative with the resources of the SMTP server. Sending will become
+sluggish if the server is being over-used so using the AntiFlood plugin will
+not be a bad idea even if no limits exist.
+
+The AntiFlood plugin's logic is basically to disconnect and the immediately
+re-connect with the SMTP server every X number of emails sent, where X is a
+number you specify to the plugin.
+
+You can also specify a time period in seconds that Swift Mailer should pause
+for between the disconnect/re-connect process. It's a good idea to pause for a
+short time (say 30 seconds every 100 emails) simply to give the SMTP server a
+chance to process its queue and recover some resources.
+
+Using the AntiFlood Plugin
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The AntiFlood Plugin -- like all plugins -- is added with the Mailer class's
+``registerPlugin()`` method. It takes two constructor parameters: the number of
+emails to pause after, and optionally the number of seconds to pause for.
+
+To use the AntiFlood plugin:
+
+* Create an instance of the Mailer using any Transport you choose.
+
+* Create an instance of the ``Swift_Plugins_AntiFloodPlugin`` class, passing
+  in one or two constructor parameters.
+
+* Register the plugin using the Mailer's ``registerPlugin()`` method.
+
+* Continue using Swift Mailer to send messages as normal.
+
+When Swift Mailer sends messages it will count the number of messages that
+have been sent since the last re-connect. Once the number hits your specified
+threshold it will disconnect and re-connect, optionally pausing for a
+specified amount of time.
+
+.. code-block:: php
+
+    require_once 'lib/swift_required.php';
+
+    // Create the Mailer using any Transport
+    $mailer = Swift_Mailer::newInstance(
+      Swift_SmtpTransport::newInstance('smtp.example.org', 25)
+    );
+
+    // Use AntiFlood to re-connect after 100 emails
+    $mailer->registerPlugin(new Swift_Plugins_AntiFloodPlugin(100));
+
+    // And specify a time in seconds to pause for (30 secs)
+    $mailer->registerPlugin(new Swift_Plugins_AntiFloodPlugin(100, 30));
+
+    // Continue sending as normal
+    for ($lotsOfRecipients as $recipient) {
+      ...
+
+      $mailer->send( ... );
+    }
+
+Throttler Plugin
+----------------
+
+If your SMTP server has restrictions in place to limit the rate at which you
+send emails, then your code will need to be aware of this rate-limiting. The
+Throttler plugin makes Swift Mailer run at a rate-limited speed.
+
+Many shared hosts don't open their SMTP servers as a free-for-all. Usually
+they have policies in place (probably to discourage spammers) that only allow
+you to send a fixed number of emails per-hour/day.
+
+The Throttler plugin supports two modes of rate-limiting and with each, you
+will need to do that math to figure out the values you want. The plugin can
+limit based on the number of emails per minute, or the number of
+bytes-transferred per-minute.
+
+Using the Throttler Plugin
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The Throttler Plugin -- like all plugins -- is added with the Mailer class'
+``registerPlugin()`` method. It has two required constructor parameters that
+tell it how to do its rate-limiting.
+
+To use the Throttler plugin:
+
+* Create an instance of the Mailer using any Transport you choose.
+
+* Create an instance of the ``Swift_Plugins_ThrottlerPlugin`` class, passing
+  the number of emails, or bytes you wish to limit by, along with the mode
+  you're using.
+
+* Register the plugin using the Mailer's ``registerPlugin()`` method.
+
+* Continue using Swift Mailer to send messages as normal.
+
+When Swift Mailer sends messages it will keep track of the rate at which sending
+messages is occurring. If it realises that sending is happening too fast, it
+will cause your program to ``sleep()`` for enough time to average out the rate.
+
+.. code-block:: php
+
+    require_once 'lib/swift_required.php';
+
+    // Create the Mailer using any Transport
+    $mailer = Swift_Mailer::newInstance(
+      Swift_SmtpTransport::newInstance('smtp.example.org', 25)
+    );
+
+    // Rate limit to 100 emails per-minute
+    $mailer->registerPlugin(new Swift_Plugins_ThrottlerPlugin(
+      100, Swift_Plugins_ThrottlerPlugin::MESSAGES_PER_MINUTE
+    ));
+
+    // Rate limit to 10MB per-minute
+    $mailer->registerPlugin(new Swift_Plugins_ThrottlerPlugin(
+      1024 * 1024 * 10, Swift_Plugins_ThrottlerPlugin::BYTES_PER_MINUTE
+    ));
+
+    // Continue sending as normal
+    for ($lotsOfRecipients as $recipient) {
+      ...
+
+      $mailer->send( ... );
+    }
+
+Logger Plugin
+-------------
+
+The Logger plugins helps with debugging during the process of sending. It can
+help to identify why an SMTP server is rejecting addresses, or any other
+hard-to-find problems that may arise.
+
+The Logger plugin comes in two parts. There's the plugin itself, along with
+one of a number of possible Loggers that you may choose to use. For example,
+the logger may output messages directly in realtime, or it may capture
+messages in an array.
+
+One other notable feature is the way in which the Logger plugin changes
+Exception messages. If Exceptions are being thrown but the error message does
+not provide conclusive information as to the source of the problem (such as an
+ambiguous SMTP error) the Logger plugin includes the entire SMTP transcript in
+the error message so that debugging becomes a simpler task.
+
+There are a few available Loggers included with Swift Mailer, but writing your
+own implementation is incredibly simple and is achieved by creating a short
+class that implements the ``Swift_Plugins_Logger`` interface.
+
+* ``Swift_Plugins_Loggers_ArrayLogger``: Keeps a collection of log messages
+  inside an array. The array content can be cleared or dumped out to the
+  screen.
+
+* ``Swift_Plugins_Loggers_EchoLogger``: Prints output to the screen in
+  realtime. Handy for very rudimentary debug output.
+
+Using the Logger Plugin
+~~~~~~~~~~~~~~~~~~~~~~~
+
+The Logger Plugin -- like all plugins -- is added with the Mailer class'
+``registerPlugin()`` method. It accepts an instance of ``Swift_Plugins_Logger``
+in its constructor.
+
+To use the Logger plugin:
+
+* Create an instance of the Mailer using any Transport you choose.
+
+* Create an instance of the a Logger implementation of
+  ``Swift_Plugins_Logger``.
+
+* Create an instance of the ``Swift_Plugins_LoggerPlugin`` class, passing the
+  created Logger instance to its constructor.
+
+* Register the plugin using the Mailer's ``registerPlugin()`` method.
+
+* Continue using Swift Mailer to send messages as normal.
+
+* Dump the contents of the log with the logger's ``dump()`` method.
+
+When Swift Mailer sends messages it will keep a log of all the interactions
+with the underlying Transport being used. Depending upon the Logger that has
+been used the behaviour will differ, but all implementations offer a way to
+get the contents of the log.
+
+.. code-block:: php
+
+    require_once 'lib/swift_required.php';
+
+    // Create the Mailer using any Transport
+    $mailer = Swift_Mailer::newInstance(
+     Swift_SmtpTransport::newInstance('smtp.example.org', 25)
+    );
+
+    // To use the ArrayLogger
+    $logger = new Swift_Plugins_Loggers_ArrayLogger();
+    $mailer->registerPlugin(new Swift_Plugins_LoggerPlugin($logger));
+
+    // Or to use the Echo Logger
+    $logger = new Swift_Plugins_Loggers_EchoLogger();
+    $mailer->registerPlugin(new Swift_Plugins_LoggerPlugin($logger));
+
+    // Continue sending as normal
+    for ($lotsOfRecipients as $recipient) {
+     ...
+
+     $mailer->send( ... );
+    }
+
+    // Dump the log contents
+    // NOTE: The EchoLogger dumps in realtime so dump() does nothing for it
+    echo $logger->dump();
+
+Decorator Plugin
+----------------
+
+Often there's a need to send the same message to multiple recipients, but with
+tiny variations such as the recipient's name being used inside the message
+body. The Decorator plugin aims to provide a solution for allowing these small
+differences.
+
+The decorator plugin works by intercepting the sending process of Swift
+Mailer, reading the email address in the To: field and then looking up a set
+of replacements for a template.
+
+While the use of this plugin is simple, it is probably the most commonly
+misunderstood plugin due to the way in which it works. The typical mistake
+users make is to try registering the plugin multiple times (once for each
+recipient) -- inside a loop for example. This is incorrect.
+
+The Decorator plugin should be registered just once, but containing the list
+of all recipients prior to sending. It will use this list of recipients to
+find the required replacements during sending.
+
+Using the Decorator Plugin
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To use the Decorator plugin, simply create an associative array of replacements
+based on email addresses and then use the mailer's ``registerPlugin()`` method
+to add the plugin.
+
+First create an associative array of replacements based on the email addresses
+you'll be sending the message to.
+
+.. note::
+
+    The replacements array becomes a 2-dimensional array whose keys are the
+    email addresses and whose values are an associative array of replacements
+    for that email address. The curly braces used in this example can be any
+    type of syntax you choose, provided they match the placeholders in your
+    email template.
+
+    .. code-block:: php
+
+        $replacements = array();
+        foreach ($users as $user) {
+          $replacements[$user['email']] = array(
+            '{username}'=>$user['username'],
+            '{password}'=>$user['password']
+          );
+        }
+
+Now create an instance of the Decorator plugin using this array of replacements
+and then register it with the Mailer. Do this only once!
+
+.. code-block:: php
+
+    $decorator = new Swift_Plugins_DecoratorPlugin($replacements);
+
+    $mailer->registerPlugin($decorator);
+
+When you create your message, replace elements in the body (and/or the subject
+line) with your placeholders.
+
+.. code-block:: php
+
+    $message = Swift_Message::newInstance()
+      ->setSubject('Important notice for {username}')
+      ->setBody(
+        "Hello {username}, we have reset your password to {password}\n" .
+        "Please log in and change it at your earliest convenience."
+      )
+      ;
+
+    foreach ($users as $user) {
+      $message->addTo($user['email']);
+    }
+
+When you send this message to each of your recipients listed in your
+``$replacements`` array they will receive a message customized for just
+themselves. For example, the message used above when received may appear like
+this to one user:
+
+.. code-block:: text
+
+    Subject: Important notice for smilingsunshine2009
+
+    Hello smilingsunshine2009, we have reset your password to rainyDays
+    Please log in and change it at your earliest convenience.
+
+While another use may receive the message as:
+
+.. code-block:: text
+
+    Subject: Important notice for billy-bo-bob
+
+    Hello billy-bo-bob, we have reset your password to dancingOctopus
+    Please log in and change it at your earliest convenience.
+
+While the decorator plugin provides a means to solve this problem, there are
+various ways you could tackle this problem without the need for a plugin.
+We're trying to come up with a better way ourselves and while we have several
+(obvious) ideas we don't quite have the perfect solution to go ahead and
+implement it. Watch this space.
+
+Providing Your Own Replacements Lookup for the Decorator
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Filling an array with replacements may not be the best solution for providing
+replacement information to the decorator. If you have a more elegant algorithm
+that performs replacement lookups on-the-fly you may provide your own
+implementation.
+
+Providing your own replacements lookup implementation for the Decorator is
+simply a matter of passing an instance of ``Swift_Plugins_Decorator_Replacements`` to the decorator plugin's constructor,
+rather than passing in an array.
+
+The Replacements interface is very simple to implement since it has just one
+method: ``getReplacementsFor($address)``.
+
+Imagine you want to look up replacements from a database on-the-fly, you might
+provide an implementation that does this. You need to create a small class.
+
+.. code-block:: php
+
+    class DbReplacements implements Swift_Plugins_Decorator_Replacements {
+      public function getReplacementsFor($address) {
+        $sql = sprintf(
+          "SELECT * FROM user WHERE email = '%s'",
+          mysql_real_escape_string($address)
+        );
+
+        $result = mysql_query($sql);
+
+        if ($row = mysql_fetch_assoc($result)) {
+          return array(
+            '{username}'=>$row['username'],
+            '{password}'=>$row['password']
+          );
+        }
+      }
+    }
+
+Now all you need to do is pass an instance of your class into the Decorator
+plugin's constructor instead of passing an array.
+
+.. code-block:: php
+
+    $decorator = new Swift_Plugins_DecoratorPlugin(new DbReplacements());
+
+    $mailer->registerPlugin($decorator);
+
+For each message sent, the plugin will call your class' ``getReplacementsFor()``
+method to find the array of replacements it needs.
+
+.. note::
+
+    If your lookup algorithm is case sensitive, you should transform the
+    ``$address`` argument as appropriate -- for example by passing it
+    through ``strtolower()``.
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/doc/sending.rst b/lib/vendor/symfony/lib/vendor/swiftmailer/doc/sending.rst
new file mode 100644
index 000000000..44608455d
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/doc/sending.rst
@@ -0,0 +1,607 @@
+Sending Messages
+================
+
+Quick Reference for Sending a Message
+-------------------------------------
+
+Sending a message is very straightforward. You create a Transport, use it to
+create the Mailer, then you use the Mailer to send the message.
+
+To send a Message:
+
+* Create a Transport from one of the provided Transports --
+  ``Swift_SmtpTransport``, ``Swift_SendmailTransport``, ``Swift_MailTransport``
+  or one of the aggregate Transports.
+
+* Create an instance of the ``Swift_Mailer`` class, using the Transport as
+  it's constructor parameter.
+
+* Create a Message.
+
+* Send the message via the ``send()`` method on the Mailer object.
+
+.. caution::
+
+    The ``Swift_SmtpTransport`` and ``Swift_SendmailTransport`` transports use
+    ``proc_*`` PHP functions, which might not be available on your PHP
+    installation. You can easily check if that's the case by running the
+    following PHP script: ``<?php echo function_exists('proc_open') ? "Yep,
+    that will work" : "Sorry, that won't work";``
+
+When using ``send()`` the message will be sent just like it would be sent if you
+used your mail client. An integer is returned which includes the number of
+successful recipients. If none of the recipients could be sent to then zero will
+be returned, which equates to a boolean ``false``. If you set two ``To:``
+recipients and three ``Bcc:`` recipients in the message and all of the
+recipients are delivered to successfully then the value 5 will be returned.
+
+.. code-block:: php
+
+    require_once 'lib/swift_required.php';
+
+    // Create the Transport
+    $transport = Swift_SmtpTransport::newInstance('smtp.example.org', 25)
+      ->setUsername('your username')
+      ->setPassword('your password')
+      ;
+
+    /*
+    You could alternatively use a different transport such as Sendmail or Mail:
+
+    // Sendmail
+    $transport = Swift_SendmailTransport::newInstance('/usr/sbin/sendmail -bs');
+
+    // Mail
+    $transport = Swift_MailTransport::newInstance();
+    */
+
+    // Create the Mailer using your created Transport
+    $mailer = Swift_Mailer::newInstance($transport);
+
+    // Create a message
+    $message = Swift_Message::newInstance('Wonderful Subject')
+      ->setFrom(array('john@doe.com' => 'John Doe'))
+      ->setTo(array('receiver@domain.org', 'other@domain.org' => 'A name'))
+      ->setBody('Here is the message itself')
+      ;
+
+    // Send the message
+    $result = $mailer->send($message);
+
+Transport Types
+~~~~~~~~~~~~~~~
+
+A Transport is the component which actually does the sending. You need to
+provide a Transport object to the Mailer class and there are several possible
+options.
+
+Typically you will not need to know how a Transport works under-the-surface,
+you will only need to know how to create an instance of one, and which one to
+use for your environment.
+
+The SMTP Transport
+..................
+
+The SMTP Transport sends messages over the (standardized) Simple Message
+Transfer Protocol.  It can deal with encryption and authentication.
+
+The SMTP Transport, ``Swift_SmtpTransport`` is without doubt the most commonly
+used Transport because it will work on 99% of web servers (I just made that
+number up, but you get the idea). All the server needs is the ability to
+connect to a remote (or even local) SMTP server on the correct port number
+(usually 25).
+
+SMTP servers often require users to authenticate with a username and password
+before any mail can be sent to other domains. This is easily achieved using
+Swift Mailer with the SMTP Transport.
+
+SMTP is a protocol -- in other words it's a "way" of communicating a job
+to be done (i.e. sending a message). The SMTP protocol is the fundamental
+basis on which messages are delivered all over the internet 7 days a week, 365
+days a year. For this reason it's the most "direct" method of sending messages
+you can use and it's the one that will give you the most power and feedback
+(such as delivery failures) when using Swift Mailer.
+
+Because SMTP is generally run as a remote service (i.e. you connect to it over
+the network/internet) it's extremely portable from server-to-server. You can
+easily store the SMTP server address and port number in a configuration file
+within your application and adjust the settings accordingly if the code is
+moved or if the SMTP server is changed.
+
+Some SMTP servers -- Google for example -- use encryption for security reasons.
+Swift Mailer supports using both SSL and TLS encryption settings.
+
+Using the SMTP Transport
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+The SMTP Transport is easy to use. Most configuration options can be set with
+the constructor.
+
+To use the SMTP Transport you need to know which SMTP server your code needs
+to connect to. Ask your web host if you're not sure. Lots of people ask me who
+to connect to -- I really can't answer that since it's a setting that's
+extremely specific to your hosting environment.
+
+To use the SMTP Transport:
+
+* Call ``Swift_SmtpTransport::newInstance()`` with the SMTP server name and
+  optionally with a port number (defaults to 25).
+
+* Use the returned object to create the Mailer.
+
+A connection to the SMTP server will be established upon the first call to
+``send()``.
+
+.. code-block:: php
+
+    require_once 'lib/swift_required.php';
+
+    // Create the Transport
+    $transport = Swift_SmtpTransport::newInstance('smtp.example.org', 25);
+
+    // Create the Mailer using your created Transport
+    $mailer = Swift_Mailer::newInstance($transport);
+
+    /*
+    It's also possible to use multiple method calls
+
+    $transport = Swift_SmtpTransport::newInstance()
+      ->setHost('smtp.example.org')
+      ->setPort(25)
+      ;
+    */
+
+Encrypted SMTP
+^^^^^^^^^^^^^^
+
+You can use SSL or TLS encryption with the SMTP Transport by specifying it as
+a parameter or with a method call.
+
+To use encryption with the SMTP Transport:
+
+* Pass the encryption setting as a third parameter to
+  ``Swift_SmtpTransport::newInstance()``; or
+
+* Call the ``setEncryption()`` method on the Transport.
+
+A connection to the SMTP server will be established upon the first call to
+``send()``. The connection will be initiated with the correct encryption
+settings.
+
+.. note::
+
+    For SSL or TLS encryption to work your PHP installation must have
+    appropriate OpenSSL transports wrappers. You can check if "tls" and/or
+    "ssl" are present in your PHP installation by using the PHP function
+    ``stream_get_transports()``
+
+    .. code-block:: php
+
+        require_once 'lib/swift_required.php';
+
+        // Create the Transport
+        $transport = Swift_SmtpTransport::newInstance('smtp.example.org', 587, 'ssl');
+
+        // Create the Mailer using your created Transport
+        $mailer = Swift_Mailer::newInstance($transport);
+
+        /*
+        It's also possible to use multiple method calls
+
+        $transport = Swift_SmtpTransport::newInstance()
+          ->setHost('smtp.example.org')
+          ->setPort(587)
+          ->setEncryption('ssl')
+          ;
+        */
+
+SMTP with a Username and Password
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Some servers require authentication. You can provide a username and password
+with ``setUsername()`` and ``setPassword()`` methods.
+
+To use a username and password with the SMTP Transport:
+
+* Create the Transport with ``Swift_SmtpTransport::newInstance()``.
+
+* Call the ``setUsername()`` and ``setPassword()`` methods on the Transport.
+
+Your username and password will be used to authenticate upon first connect
+when ``send()`` are first used on the Mailer.
+
+If authentication fails, an Exception of type ``Swift_TransportException`` will
+be thrown.
+
+.. note::
+
+    If you need to know early whether or not authentication has failed and an
+    Exception is going to be thrown, call the ``start()`` method on the
+    created Transport.
+
+    .. code-block:: php
+
+        require_once 'lib/swift_required.php';
+
+        // Create the Transport the call setUsername() and setPassword()
+        $transport = Swift_SmtpTransport::newInstance('smtp.example.org', 25)
+          ->setUsername('username')
+          ->setPassword('password')
+          ;
+
+        // Create the Mailer using your created Transport
+        $mailer = Swift_Mailer::newInstance($transport);
+
+The Sendmail Transport
+......................
+
+The Sendmail Transport sends messages by communicating with a locally
+installed MTA -- such as ``sendmail``.
+
+The Sendmail Transport, ``Swift_SendmailTransport`` does not directly connect to
+any remote services. It is designed for Linux servers that have ``sendmail``
+installed. The Transport starts a local ``sendmail`` process and sends messages
+to it. Usually the ``sendmail`` process will respond quickly as it spools your
+messages to disk before sending them.
+
+The Transport is named the Sendmail Transport for historical reasons
+(``sendmail`` was the "standard" UNIX tool for sending e-mail for years). It
+will send messages using other transfer agents such as Exim or Postfix despite
+its name, provided they have the relevant sendmail wrappers so that they can be
+started with the correct command-line flags.
+
+It's a common misconception that because the Sendmail Transport returns a
+result very quickly it must therefore deliver messages to recipients quickly
+-- this is not true. It's not slow by any means, but it's certainly not
+faster than SMTP when it comes to getting messages to the intended recipients.
+This is because sendmail itself sends the messages over SMTP once they have
+been quickly spooled to disk.
+
+The Sendmail Transport has the potential to be just as smart of the SMTP
+Transport when it comes to notifying Swift Mailer about which recipients were
+rejected, but in reality the majority of locally installed ``sendmail``
+instances are not configured well enough to provide any useful feedback. As such
+Swift Mailer may report successful deliveries where they did in fact fail before
+they even left your server.
+
+You can run the Sendmail Transport in two different modes specified by command
+line flags:
+
+* "``-bs``" runs in SMTP mode so theoretically it will act like the SMTP
+  Transport
+
+* "``-t``" runs in piped mode with no feedback, but theoretically faster,
+  though not advised
+
+You can think of the Sendmail Transport as a sort of asynchronous SMTP Transport
+-- though if you have problems with delivery failures you should try using the
+SMTP Transport instead. Swift Mailer isn't doing the work here, it's simply
+passing the work to somebody else (i.e. ``sendmail``).
+
+Using the Sendmail Transport
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+To use the Sendmail Transport you simply need to call
+``Swift_SendmailTransport::newInstance()`` with the command as a parameter.
+
+To use the Sendmail Transport you need to know where ``sendmail`` or another MTA
+exists on the server. Swift Mailer uses a default value of
+``/usr/sbin/sendmail``, which should work on most systems.
+
+You specify the entire command as a parameter (i.e. including the command line
+flags). Swift Mailer supports operational modes of "``-bs``" (default) and
+"``-t``".
+
+.. note::
+
+    If you run sendmail in "``-t``" mode you will get no feedback as to whether
+    or not sending has succeeded. Use "``-bs``" unless you have a reason not to.
+
+To use the Sendmail Transport:
+
+* Call ``Swift_SendmailTransport::newInstance()`` with the command, including
+  the correct command line flags. The default is to use ``/usr/sbin/sendmail
+  -bs`` if this is not specified.
+
+* Use the returned object to create the Mailer.
+
+A sendmail process will be started upon the first call to ``send()``. If the
+process cannot be started successfully an Exception of type
+``Swift_TransportException`` will be thrown.
+
+.. code-block:: php
+
+    require_once 'lib/swift_required.php';
+
+    // Create the Transport
+    $transport = Swift_SendmailTransport::newInstance('/usr/sbin/exim -bs');
+
+    // Create the Mailer using your created Transport
+    $mailer = Swift_Mailer::newInstance($transport);
+
+The Mail Transport
+..................
+
+The Mail Transport sends messages by delegating to PHP's internal
+``mail()`` function.
+
+In my experience -- and others' -- the ``mail()`` function is not particularly
+predictable, or helpful.
+
+Quite notably, the ``mail()`` function behaves entirely differently between
+Linux and Windows servers. On linux it uses ``sendmail``, but on Windows it uses
+SMTP.
+
+In order for the ``mail()`` function to even work at all ``php.ini`` needs to be
+configured correctly, specifying the location of sendmail or of an SMTP server.
+
+The problem with ``mail()`` is that it "tries" to simplify things to the point
+that it actually makes things more complex due to poor interface design. The
+developers of Swift Mailer have gone to a lot of effort to make the Mail
+Transport work with a reasonable degree of consistency.
+
+Serious drawbacks when using this Transport are:
+
+* Unpredictable message headers
+
+* Lack of feedback regarding delivery failures
+
+* Lack of support for several plugins that require real-time delivery feedback
+
+It's a last resort, and we say that with a passion!
+
+Using the Mail Transport
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+To use the Mail Transport you simply need to call
+``Swift_MailTransport::newInstance()``. It's unlikely you'll need to configure
+the Transport.
+
+To use the Mail Transport:
+
+* Call ``Swift_MailTransport::newInstance()``.
+
+* Use the returned object to create the Mailer.
+
+Messages will be sent using the ``mail()`` function.
+
+.. note::
+
+    The ``mail()`` function can take a ``$additional_parameters`` parameter.
+    Swift Mailer sets this to "``-f%s``" by default, where the "``%s``" is
+    substituted with the address of the sender (via a ``sprintf()``) at send
+    time. You may override this default by passing an argument to
+    ``newInstance()``.
+
+    .. code-block:: php
+
+        require_once 'lib/swift_required.php';
+
+        // Create the Transport
+        $transport = Swift_MailTransport::newInstance();
+
+        // Create the Mailer using your created Transport
+        $mailer = Swift_Mailer::newInstance($transport);
+
+Available Methods for Sending Messages
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The Mailer class offers two methods for sending Messages -- ``send()``.
+Each behaves in a slightly different way.
+
+When a message is sent in Swift Mailer, the Mailer class communicates with
+whichever Transport class you have chosen to use.
+
+Each recipient in the message should either be accepted or rejected by the
+Transport. For example, if the domain name on the email address is not
+reachable the SMTP Transport may reject the address because it cannot process
+it. Whichever method you use -- ``send()`` -- Swift Mailer will return
+an integer indicating the number of accepted recipients.
+
+.. note::
+
+    It's possible to find out which recipients were rejected -- we'll cover that
+    later in this chapter.
+
+Using the ``send()`` Method
+...........................
+
+The ``send()`` method of the ``Swift_Mailer`` class sends a message using
+exactly the same logic as your Desktop mail client would use. Just pass it a
+Message and get a result.
+
+To send a Message with ``send()``:
+
+* Create a Transport from one of the provided Transports --
+  ``Swift_SmtpTransport``, ``Swift_SendmailTransport``,
+  ``Swift_MailTransport`` or one of the aggregate Transports.
+
+* Create an instance of the ``Swift_Mailer`` class, using the Transport as
+  it's constructor parameter.
+
+* Create a Message.
+
+* Send the message via the ``send()`` method on the Mailer object.
+
+The message will be sent just like it would be sent if you used your mail
+client. An integer is returned which includes the number of successful
+recipients. If none of the recipients could be sent to then zero will be
+returned, which equates to a boolean ``false``. If you set two
+``To:`` recipients and three ``Bcc:`` recipients in the message and all of the
+recipients are delivered to successfully then the value 5 will be returned.
+
+.. code-block:: php
+
+    require_once 'lib/swift_required.php';
+
+    // Create the Transport
+    $transport = Swift_SmtpTransport::newInstance('localhost', 25);
+
+    // Create the Mailer using your created Transport
+    $mailer = Swift_Mailer::newInstance($transport);
+
+    // Create a message
+    $message = Swift_Message::newInstance('Wonderful Subject')
+      ->setFrom(array('john@doe.com' => 'John Doe'))
+      ->setTo(array('receiver@domain.org', 'other@domain.org' => 'A name'))
+      ->setBody('Here is the message itself')
+      ;
+
+    // Send the message
+    $numSent = $mailer->send($message);
+
+    printf("Sent %d messages\n", $numSent);
+
+    /* Note that often that only the boolean equivalent of the
+       return value is of concern (zero indicates FALSE)
+
+    if ($mailer->send($message))
+    {
+      echo "Sent\n";
+    }
+    else
+    {
+      echo "Failed\n";
+    }
+
+    */
+
+Sending Emails in Batch
+.......................
+
+If you want to send a separate message to each recipient so that only their
+own address shows up in the ``To:`` field, follow the following recipe:
+
+* Create a Transport from one of the provided Transports --
+  ``Swift_SmtpTransport``, ``Swift_SendmailTransport``,
+  ``Swift_MailTransport`` or one of the aggregate Transports.
+
+* Create an instance of the ``Swift_Mailer`` class, using the Transport as
+  it's constructor parameter.
+
+* Create a Message.
+
+* Iterate over the recipients and send message via the ``send()`` method on
+  the Mailer object.
+
+Each recipient of the messages receives a different copy with only their own
+email address on the ``To:`` field.
+
+Make sure to add only valid email addresses as recipients. If you try to add an
+invalid email address with ``setTo()``, ``setCc()`` or ``setBcc()``, Swift
+Mailer will throw a ``Swift_RfcComplianceException``.
+
+If you add recipients automatically based on a data source that may contain
+invalid email addresses, you can prevent possible exceptions by validating the
+addresses using ``Swift_Validate::email($email)`` and only adding addresses
+that validate. Another way would be to wrap your ``setTo()``, ``setCc()`` and
+``setBcc()`` calls in a try-catch block and handle the
+``Swift_RfcComplianceException`` in the catch block.
+
+Handling invalid addresses properly is especially important when sending emails
+in large batches since a single invalid address might cause an unhandled
+exception and stop the execution or your script early.
+
+.. note::
+
+    In the following example, two emails are sent. One to each of
+    ``receiver@domain.org`` and ``other@domain.org``. These recipients will
+    not be aware of each other.
+
+    .. code-block:: php
+
+        require_once 'lib/swift_required.php';
+
+        // Create the Transport
+        $transport = Swift_SmtpTransport::newInstance('localhost', 25);
+
+        // Create the Mailer using your created Transport
+        $mailer = Swift_Mailer::newInstance($transport);
+
+        // Create a message
+        $message = Swift_Message::newInstance('Wonderful Subject')
+          ->setFrom(array('john@doe.com' => 'John Doe'))
+          ->setBody('Here is the message itself')
+          ;
+
+        // Send the message
+        $failedRecipients = array();
+        $numSent = 0;
+        $to = array('receiver@domain.org', 'other@domain.org' => 'A name');
+
+        foreach ($to as $address => $name)
+        {
+          if (is_int($address)) {
+            $message->setTo($name);
+          } else {
+            $message->setTo(array($address => $name));
+          }
+
+          $numSent += $mailer->send($message, $failedRecipients);
+        }
+
+        printf("Sent %d messages\n", $numSent);
+
+Finding out Rejected Addresses
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+It's possible to get a list of addresses that were rejected by the Transport
+by using a by-reference parameter to ``send()``.
+
+As Swift Mailer attempts to send the message to each address given to it, if a
+recipient is rejected it will be added to the array. You can pass an existing
+array, otherwise one will be created by-reference.
+
+Collecting the list of recipients that were rejected can be useful in
+circumstances where you need to "prune" a mailing list for example when some
+addresses cannot be delivered to.
+
+Getting Failures By-reference
+.............................
+
+Collecting delivery failures by-reference with the ``send()`` method is as
+simple as passing a variable name to the method call.
+
+To get failed recipients by-reference:
+
+* Pass a by-reference variable name to the ``send()`` method of the Mailer
+  class.
+
+If the Transport rejects any of the recipients, the culprit addresses will be
+added to the array provided by-reference.
+
+.. note::
+
+    If the variable name does not yet exist, it will be initialized as an
+    empty array and then failures will be added to that array. If the variable
+    already exists it will be type-cast to an array and failures will be added
+    to it.
+
+    .. code-block:: php
+
+        $mailer = Swift_Mailer::newInstance( ... );
+
+        $message = Swift_Message::newInstance( ... )
+          ->setFrom( ... )
+          ->setTo(array(
+            'receiver@bad-domain.org' => 'Receiver Name',
+            'other@domain.org' => 'A name',
+            'other-receiver@bad-domain.org' => 'Other Name'
+          ))
+          ->setBody( ... )
+          ;
+
+        // Pass a variable name to the send() method
+        if (!$mailer->send($message, $failures))
+        {
+          echo "Failures:";
+          print_r($failures);
+        }
+
+        /*
+        Failures:
+        Array (
+          0 => receiver@bad-domain.org,
+          1 => other-receiver@bad-domain.org
+        )
+        */
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/doc/uml/Encoders.graffle b/lib/vendor/symfony/lib/vendor/swiftmailer/doc/uml/Encoders.graffle
new file mode 100644
index 0000000000000000000000000000000000000000..f895752b70947592db74b6a3b8a6bd135a9fd150
GIT binary patch
literal 3503
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

literal 0
HcmV?d00001

diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/doc/uml/Mime.graffle b/lib/vendor/symfony/lib/vendor/swiftmailer/doc/uml/Mime.graffle
new file mode 100644
index 0000000000000000000000000000000000000000..e1e33cbf16ea45d29ad48eb9b2f37959292881b2
GIT binary patch
literal 5575
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
VzxW)xOdDSB{SO2kTt$6+0RTlqtKk3u

literal 0
HcmV?d00001

diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/doc/uml/Transports.graffle b/lib/vendor/symfony/lib/vendor/swiftmailer/doc/uml/Transports.graffle
new file mode 100644
index 0000000000000000000000000000000000000000..5670e2b65ada6e01406334a4b462f58e8f48f4fd
GIT binary patch
literal 3061
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
D6q4x9

literal 0
HcmV?d00001

diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift.php
new file mode 100644
index 000000000..82c381b73
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift.php
@@ -0,0 +1,80 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * General utility class in Swift Mailer, not to be instantiated.
+ *
+ *
+ * @author Chris Corbyn
+ */
+abstract class Swift
+{
+    /** Swift Mailer Version number generated during dist release process */
+    const VERSION = '@SWIFT_VERSION_NUMBER@';
+
+    public static $initialized = false;
+    public static $inits = array();
+
+    /**
+     * Registers an initializer callable that will be called the first time
+     * a SwiftMailer class is autoloaded.
+     *
+     * This enables you to tweak the default configuration in a lazy way.
+     *
+     * @param mixed $callable A valid PHP callable that will be called when autoloading the first Swift class
+     */
+    public static function init($callable)
+    {
+        self::$inits[] = $callable;
+    }
+
+    /**
+     * Internal autoloader for spl_autoload_register().
+     *
+     * @param string $class
+     */
+    public static function autoload($class)
+    {
+        // Don't interfere with other autoloaders
+        if (0 !== strpos($class, 'Swift_')) {
+            return;
+        }
+
+        $path = __DIR__.'/'.str_replace('_', '/', $class).'.php';
+
+        if (!file_exists($path)) {
+            return;
+        }
+
+        require $path;
+
+        if (self::$inits && !self::$initialized) {
+            self::$initialized = true;
+            foreach (self::$inits as $init) {
+                call_user_func($init);
+            }
+        }
+    }
+
+    /**
+     * Configure autoloading using Swift Mailer.
+     *
+     * This is designed to play nicely with other autoloaders.
+     *
+     * @param mixed $callable A valid PHP callable that will be called when autoloading the first Swift class
+     */
+    public static function registerAutoload($callable = null)
+    {
+        if (null !== $callable) {
+            self::$inits[] = $callable;
+        }
+        spl_autoload_register(array('Swift', 'autoload'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Attachment.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Attachment.php
new file mode 100644
index 000000000..a95bccfdf
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Attachment.php
@@ -0,0 +1,71 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Attachment class for attaching files to a {@link Swift_Mime_Message}.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Attachment extends Swift_Mime_Attachment
+{
+    /**
+     * Create a new Attachment.
+     *
+     * Details may be optionally provided to the constructor.
+     *
+     * @param string|Swift_OutputByteStream $data
+     * @param string                        $filename
+     * @param string                        $contentType
+     */
+    public function __construct($data = null, $filename = null, $contentType = null)
+    {
+        call_user_func_array(
+            array($this, 'Swift_Mime_Attachment::__construct'),
+            Swift_DependencyContainer::getInstance()
+                ->createDependenciesFor('mime.attachment')
+            );
+
+        $this->setBody($data);
+        $this->setFilename($filename);
+        if ($contentType) {
+            $this->setContentType($contentType);
+        }
+    }
+
+    /**
+     * Create a new Attachment.
+     *
+     * @param string|Swift_OutputByteStream $data
+     * @param string                        $filename
+     * @param string                        $contentType
+     *
+     * @return Swift_Mime_Attachment
+     */
+    public static function newInstance($data = null, $filename = null, $contentType = null)
+    {
+        return new self($data, $filename, $contentType);
+    }
+
+    /**
+     * Create a new Attachment from a filesystem path.
+     *
+     * @param string $path
+     * @param string $contentType optional
+     *
+     * @return Swift_Mime_Attachment
+     */
+    public static function fromPath($path, $contentType = null)
+    {
+        return self::newInstance()->setFile(
+            new Swift_ByteStream_FileByteStream($path),
+            $contentType
+            );
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
new file mode 100644
index 000000000..a7b0e3a62
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
@@ -0,0 +1,181 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Provides the base functionality for an InputStream supporting filters.
+ *
+ * @author Chris Corbyn
+ */
+abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_InputByteStream, Swift_Filterable
+{
+    /**
+     * Write sequence.
+     */
+    protected $_sequence = 0;
+
+    /**
+     * StreamFilters.
+     *
+     * @var Swift_StreamFilter[]
+     */
+    private $_filters = array();
+
+    /**
+     * A buffer for writing.
+     */
+    private $_writeBuffer = '';
+
+    /**
+     * Bound streams.
+     *
+     * @var Swift_InputByteStream[]
+     */
+    private $_mirrors = array();
+
+    /**
+     * Commit the given bytes to the storage medium immediately.
+     *
+     * @param string $bytes
+     */
+    abstract protected function _commit($bytes);
+
+    /**
+     * Flush any buffers/content with immediate effect.
+     */
+    abstract protected function _flush();
+
+    /**
+     * Add a StreamFilter to this InputByteStream.
+     *
+     * @param Swift_StreamFilter $filter
+     * @param string             $key
+     */
+    public function addFilter(Swift_StreamFilter $filter, $key)
+    {
+        $this->_filters[$key] = $filter;
+    }
+
+    /**
+     * Remove an already present StreamFilter based on its $key.
+     *
+     * @param string $key
+     */
+    public function removeFilter($key)
+    {
+        unset($this->_filters[$key]);
+    }
+
+    /**
+     * Writes $bytes to the end of the stream.
+     *
+     * @param string $bytes
+     *
+     * @throws Swift_IoException
+     *
+     * @return int
+     */
+    public function write($bytes)
+    {
+        $this->_writeBuffer .= $bytes;
+        foreach ($this->_filters as $filter) {
+            if ($filter->shouldBuffer($this->_writeBuffer)) {
+                return;
+            }
+        }
+        $this->_doWrite($this->_writeBuffer);
+
+        return ++$this->_sequence;
+    }
+
+    /**
+     * For any bytes that are currently buffered inside the stream, force them
+     * off the buffer.
+     *
+     * @throws Swift_IoException
+     */
+    public function commit()
+    {
+        $this->_doWrite($this->_writeBuffer);
+    }
+
+    /**
+     * Attach $is to this stream.
+     *
+     * The stream acts as an observer, receiving all data that is written.
+     * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
+     *
+     * @param Swift_InputByteStream $is
+     */
+    public function bind(Swift_InputByteStream $is)
+    {
+        $this->_mirrors[] = $is;
+    }
+
+    /**
+     * Remove an already bound stream.
+     *
+     * If $is is not bound, no errors will be raised.
+     * If the stream currently has any buffered data it will be written to $is
+     * before unbinding occurs.
+     *
+     * @param Swift_InputByteStream $is
+     */
+    public function unbind(Swift_InputByteStream $is)
+    {
+        foreach ($this->_mirrors as $k => $stream) {
+            if ($is === $stream) {
+                if ($this->_writeBuffer !== '') {
+                    $stream->write($this->_writeBuffer);
+                }
+                unset($this->_mirrors[$k]);
+            }
+        }
+    }
+
+    /**
+     * Flush the contents of the stream (empty it) and set the internal pointer
+     * to the beginning.
+     *
+     * @throws Swift_IoException
+     */
+    public function flushBuffers()
+    {
+        if ($this->_writeBuffer !== '') {
+            $this->_doWrite($this->_writeBuffer);
+        }
+        $this->_flush();
+
+        foreach ($this->_mirrors as $stream) {
+            $stream->flushBuffers();
+        }
+    }
+
+    /** Run $bytes through all filters */
+    private function _filter($bytes)
+    {
+        foreach ($this->_filters as $filter) {
+            $bytes = $filter->filter($bytes);
+        }
+
+        return $bytes;
+    }
+
+    /** Just write the bytes to the stream */
+    private function _doWrite($bytes)
+    {
+        $this->_commit($this->_filter($bytes));
+
+        foreach ($this->_mirrors as $stream) {
+            $stream->write($bytes);
+        }
+
+        $this->_writeBuffer = '';
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
new file mode 100644
index 000000000..ef05a6d5e
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
@@ -0,0 +1,182 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Allows reading and writing of bytes to and from an array.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_OutputByteStream
+{
+    /**
+     * The internal stack of bytes.
+     *
+     * @var string[]
+     */
+    private $_array = array();
+
+    /**
+     * The size of the stack.
+     *
+     * @var int
+     */
+    private $_arraySize = 0;
+
+    /**
+     * The internal pointer offset.
+     *
+     * @var int
+     */
+    private $_offset = 0;
+
+    /**
+     * Bound streams.
+     *
+     * @var Swift_InputByteStream[]
+     */
+    private $_mirrors = array();
+
+    /**
+     * Create a new ArrayByteStream.
+     *
+     * If $stack is given the stream will be populated with the bytes it contains.
+     *
+     * @param mixed $stack of bytes in string or array form, optional
+     */
+    public function __construct($stack = null)
+    {
+        if (is_array($stack)) {
+            $this->_array = $stack;
+            $this->_arraySize = count($stack);
+        } elseif (is_string($stack)) {
+            $this->write($stack);
+        } else {
+            $this->_array = array();
+        }
+    }
+
+    /**
+     * Reads $length bytes from the stream into a string and moves the pointer
+     * through the stream by $length.
+     *
+     * If less bytes exist than are requested the
+     * remaining bytes are given instead. If no bytes are remaining at all, boolean
+     * false is returned.
+     *
+     * @param int $length
+     *
+     * @return string
+     */
+    public function read($length)
+    {
+        if ($this->_offset == $this->_arraySize) {
+            return false;
+        }
+
+        // Don't use array slice
+        $end = $length + $this->_offset;
+        $end = $this->_arraySize < $end ? $this->_arraySize : $end;
+        $ret = '';
+        for (; $this->_offset < $end; ++$this->_offset) {
+            $ret .= $this->_array[$this->_offset];
+        }
+
+        return $ret;
+    }
+
+    /**
+     * Writes $bytes to the end of the stream.
+     *
+     * @param string $bytes
+     */
+    public function write($bytes)
+    {
+        $to_add = str_split($bytes);
+        foreach ($to_add as $value) {
+            $this->_array[] = $value;
+        }
+        $this->_arraySize = count($this->_array);
+
+        foreach ($this->_mirrors as $stream) {
+            $stream->write($bytes);
+        }
+    }
+
+    /**
+     * Not used.
+     */
+    public function commit()
+    {
+    }
+
+    /**
+     * Attach $is to this stream.
+     *
+     * The stream acts as an observer, receiving all data that is written.
+     * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
+     *
+     * @param Swift_InputByteStream $is
+     */
+    public function bind(Swift_InputByteStream $is)
+    {
+        $this->_mirrors[] = $is;
+    }
+
+    /**
+     * Remove an already bound stream.
+     *
+     * If $is is not bound, no errors will be raised.
+     * If the stream currently has any buffered data it will be written to $is
+     * before unbinding occurs.
+     *
+     * @param Swift_InputByteStream $is
+     */
+    public function unbind(Swift_InputByteStream $is)
+    {
+        foreach ($this->_mirrors as $k => $stream) {
+            if ($is === $stream) {
+                unset($this->_mirrors[$k]);
+            }
+        }
+    }
+
+    /**
+     * Move the internal read pointer to $byteOffset in the stream.
+     *
+     * @param int $byteOffset
+     *
+     * @return bool
+     */
+    public function setReadPointer($byteOffset)
+    {
+        if ($byteOffset > $this->_arraySize) {
+            $byteOffset = $this->_arraySize;
+        } elseif ($byteOffset < 0) {
+            $byteOffset = 0;
+        }
+
+        $this->_offset = $byteOffset;
+    }
+
+    /**
+     * Flush the contents of the stream (empty it) and set the internal pointer
+     * to the beginning.
+     */
+    public function flushBuffers()
+    {
+        $this->_offset = 0;
+        $this->_array = array();
+        $this->_arraySize = 0;
+
+        foreach ($this->_mirrors as $stream) {
+            $stream->flushBuffers();
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
new file mode 100644
index 000000000..9ed852310
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
@@ -0,0 +1,231 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Allows reading and writing of bytes to and from a file.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterableInputStream implements Swift_FileStream
+{
+    /** The internal pointer offset */
+    private $_offset = 0;
+
+    /** The path to the file */
+    private $_path;
+
+    /** The mode this file is opened in for writing */
+    private $_mode;
+
+    /** A lazy-loaded resource handle for reading the file */
+    private $_reader;
+
+    /** A lazy-loaded resource handle for writing the file */
+    private $_writer;
+
+    /** If magic_quotes_runtime is on, this will be true */
+    private $_quotes = false;
+
+    /** If stream is seekable true/false, or null if not known */
+    private $_seekable = null;
+
+    /**
+     * Create a new FileByteStream for $path.
+     *
+     * @param string $path
+     * @param bool   $writable if true
+     */
+    public function __construct($path, $writable = false)
+    {
+        if (empty($path)) {
+            throw new Swift_IoException('The path cannot be empty');
+        }
+        $this->_path = $path;
+        $this->_mode = $writable ? 'w+b' : 'rb';
+
+        if (function_exists('get_magic_quotes_runtime') && @get_magic_quotes_runtime() == 1) {
+            $this->_quotes = true;
+        }
+    }
+
+    /**
+     * Get the complete path to the file.
+     *
+     * @return string
+     */
+    public function getPath()
+    {
+        return $this->_path;
+    }
+
+    /**
+     * Reads $length bytes from the stream into a string and moves the pointer
+     * through the stream by $length.
+     *
+     * If less bytes exist than are requested the
+     * remaining bytes are given instead. If no bytes are remaining at all, boolean
+     * false is returned.
+     *
+     * @param int $length
+     *
+     * @throws Swift_IoException
+     *
+     * @return string|bool
+     */
+    public function read($length)
+    {
+        $fp = $this->_getReadHandle();
+        if (!feof($fp)) {
+            if ($this->_quotes) {
+                ini_set('magic_quotes_runtime', 0);
+            }
+            $bytes = fread($fp, $length);
+            if ($this->_quotes) {
+                ini_set('magic_quotes_runtime', 1);
+            }
+            $this->_offset = ftell($fp);
+
+            // If we read one byte after reaching the end of the file
+            // feof() will return false and an empty string is returned
+            if ($bytes === '' && feof($fp)) {
+                $this->_resetReadHandle();
+
+                return false;
+            }
+
+            return $bytes;
+        }
+
+        $this->_resetReadHandle();
+
+        return false;
+    }
+
+    /**
+     * Move the internal read pointer to $byteOffset in the stream.
+     *
+     * @param int $byteOffset
+     *
+     * @return bool
+     */
+    public function setReadPointer($byteOffset)
+    {
+        if (isset($this->_reader)) {
+            $this->_seekReadStreamToPosition($byteOffset);
+        }
+        $this->_offset = $byteOffset;
+    }
+
+    /** Just write the bytes to the file */
+    protected function _commit($bytes)
+    {
+        fwrite($this->_getWriteHandle(), $bytes);
+        $this->_resetReadHandle();
+    }
+
+    /** Not used */
+    protected function _flush()
+    {
+    }
+
+    /** Get the resource for reading */
+    private function _getReadHandle()
+    {
+        if (!isset($this->_reader)) {
+            $pointer = @fopen($this->_path, 'rb');
+            if (!$pointer) {
+                throw new Swift_IoException(
+                    'Unable to open file for reading ['.$this->_path.']'
+                );
+            }
+            $this->_reader = $pointer;
+            if ($this->_offset != 0) {
+                $this->_getReadStreamSeekableStatus();
+                $this->_seekReadStreamToPosition($this->_offset);
+            }
+        }
+
+        return $this->_reader;
+    }
+
+    /** Get the resource for writing */
+    private function _getWriteHandle()
+    {
+        if (!isset($this->_writer)) {
+            if (!$this->_writer = fopen($this->_path, $this->_mode)) {
+                throw new Swift_IoException(
+                    'Unable to open file for writing ['.$this->_path.']'
+                );
+            }
+        }
+
+        return $this->_writer;
+    }
+
+    /** Force a reload of the resource for reading */
+    private function _resetReadHandle()
+    {
+        if (isset($this->_reader)) {
+            fclose($this->_reader);
+            $this->_reader = null;
+        }
+    }
+
+    /** Check if ReadOnly Stream is seekable */
+    private function _getReadStreamSeekableStatus()
+    {
+        $metas = stream_get_meta_data($this->_reader);
+        $this->_seekable = $metas['seekable'];
+    }
+
+    /** Streams in a readOnly stream ensuring copy if needed */
+    private function _seekReadStreamToPosition($offset)
+    {
+        if ($this->_seekable === null) {
+            $this->_getReadStreamSeekableStatus();
+        }
+        if ($this->_seekable === false) {
+            $currentPos = ftell($this->_reader);
+            if ($currentPos < $offset) {
+                $toDiscard = $offset - $currentPos;
+                fread($this->_reader, $toDiscard);
+
+                return;
+            }
+            $this->_copyReadStream();
+        }
+        fseek($this->_reader, $offset, SEEK_SET);
+    }
+
+    /** Copy a readOnly Stream to ensure seekability */
+    private function _copyReadStream()
+    {
+        if ($tmpFile = fopen('php://temp/maxmemory:4096', 'w+b')) {
+            /* We have opened a php:// Stream Should work without problem */
+        } elseif (function_exists('sys_get_temp_dir') && is_writable(sys_get_temp_dir()) && ($tmpFile = tmpfile())) {
+            /* We have opened a tmpfile */
+        } else {
+            throw new Swift_IoException('Unable to copy the file to make it seekable, sys_temp_dir is not writable, php://memory not available');
+        }
+        $currentPos = ftell($this->_reader);
+        fclose($this->_reader);
+        $source = fopen($this->_path, 'rb');
+        if (!$source) {
+            throw new Swift_IoException('Unable to open file for copying ['.$this->_path.']');
+        }
+        fseek($tmpFile, 0, SEEK_SET);
+        while (!feof($source)) {
+            fwrite($tmpFile, fread($source, 4096));
+        }
+        fseek($tmpFile, $currentPos, SEEK_SET);
+        fclose($source);
+        $this->_reader = $tmpFile;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
new file mode 100644
index 000000000..1c9a80c03
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+* This file is part of SwiftMailer.
+* (c) 2004-2009 Chris Corbyn
+*
+* For the full copyright and license information, please view the LICENSE
+* file that was distributed with this source code.
+*/
+
+/**
+ * @author Romain-Geissler
+ */
+class Swift_ByteStream_TemporaryFileByteStream extends Swift_ByteStream_FileByteStream
+{
+    public function __construct()
+    {
+        $filePath = tempnam(sys_get_temp_dir(), 'FileByteStream');
+
+        if ($filePath === false) {
+            throw new Swift_IoException('Failed to retrieve temporary file name.');
+        }
+
+        parent::__construct($filePath, true);
+    }
+
+    public function getContent()
+    {
+        if (($content = file_get_contents($this->getPath())) === false) {
+            throw new Swift_IoException('Failed to get temporary file content.');
+        }
+
+        return $content;
+    }
+
+    public function __destruct()
+    {
+        if (file_exists($this->getPath())) {
+            @unlink($this->getPath());
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterReader.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterReader.php
new file mode 100644
index 000000000..3d5e854a8
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterReader.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Analyzes characters for a specific character set.
+ *
+ * @author Chris Corbyn
+ * @author Xavier De Cock <xdecock@gmail.com>
+ */
+interface Swift_CharacterReader
+{
+    const MAP_TYPE_INVALID = 0x01;
+    const MAP_TYPE_FIXED_LEN = 0x02;
+    const MAP_TYPE_POSITIONS = 0x03;
+
+    /**
+     * Returns the complete character map.
+     *
+     * @param string $string
+     * @param int    $startOffset
+     * @param array  $currentMap
+     * @param mixed  $ignoredChars
+     *
+     * @return int
+     */
+    public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars);
+
+    /**
+     * Returns the mapType, see constants.
+     *
+     * @return int
+     */
+    public function getMapType();
+
+    /**
+     * Returns an integer which specifies how many more bytes to read.
+     *
+     * A positive integer indicates the number of more bytes to fetch before invoking
+     * this method again.
+     *
+     * A value of zero means this is already a valid character.
+     * A value of -1 means this cannot possibly be a valid character.
+     *
+     * @param integer[] $bytes
+     * @param int       $size
+     *
+     * @return int
+     */
+    public function validateByteSequence($bytes, $size);
+
+    /**
+     * Returns the number of bytes which should be read to start each character.
+     *
+     * For fixed width character sets this should be the number of octets-per-character.
+     * For multibyte character sets this will probably be 1.
+     *
+     * @return int
+     */
+    public function getInitialByteSize();
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
new file mode 100644
index 000000000..6a18e1dd1
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
@@ -0,0 +1,97 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Provides fixed-width byte sizes for reading fixed-width character sets.
+ *
+ * @author Chris Corbyn
+ * @author Xavier De Cock <xdecock@gmail.com>
+ */
+class Swift_CharacterReader_GenericFixedWidthReader implements Swift_CharacterReader
+{
+    /**
+     * The number of bytes in a single character.
+     *
+     * @var int
+     */
+    private $_width;
+
+    /**
+     * Creates a new GenericFixedWidthReader using $width bytes per character.
+     *
+     * @param int $width
+     */
+    public function __construct($width)
+    {
+        $this->_width = $width;
+    }
+
+    /**
+     * Returns the complete character map.
+     *
+     * @param string $string
+     * @param int    $startOffset
+     * @param array  $currentMap
+     * @param mixed  $ignoredChars
+     *
+     * @return int
+     */
+    public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
+    {
+        $strlen = strlen($string);
+        // % and / are CPU intensive, so, maybe find a better way
+        $ignored = $strlen % $this->_width;
+        $ignoredChars = $ignored ? substr($string, -$ignored) : '';
+        $currentMap = $this->_width;
+
+        return ($strlen - $ignored) / $this->_width;
+    }
+
+    /**
+     * Returns the mapType.
+     *
+     * @return int
+     */
+    public function getMapType()
+    {
+        return self::MAP_TYPE_FIXED_LEN;
+    }
+
+    /**
+     * Returns an integer which specifies how many more bytes to read.
+     *
+     * A positive integer indicates the number of more bytes to fetch before invoking
+     * this method again.
+     *
+     * A value of zero means this is already a valid character.
+     * A value of -1 means this cannot possibly be a valid character.
+     *
+     * @param string $bytes
+     * @param int    $size
+     *
+     * @return int
+     */
+    public function validateByteSequence($bytes, $size)
+    {
+        $needed = $this->_width - $size;
+
+        return $needed > -1 ? $needed : -1;
+    }
+
+    /**
+     * Returns the number of bytes which should be read to start each character.
+     *
+     * @return int
+     */
+    public function getInitialByteSize()
+    {
+        return $this->_width;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php
new file mode 100644
index 000000000..67da48f6c
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php
@@ -0,0 +1,84 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Analyzes US-ASCII characters.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_CharacterReader_UsAsciiReader implements Swift_CharacterReader
+{
+    /**
+     * Returns the complete character map.
+     *
+     * @param string $string
+     * @param int    $startOffset
+     * @param array  $currentMap
+     * @param string $ignoredChars
+     *
+     * @return int
+     */
+    public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
+    {
+        $strlen = strlen($string);
+        $ignoredChars = '';
+        for ($i = 0; $i < $strlen; ++$i) {
+            if ($string[$i] > "\x07F") {
+                // Invalid char
+                $currentMap[$i + $startOffset] = $string[$i];
+            }
+        }
+
+        return $strlen;
+    }
+
+    /**
+     * Returns mapType.
+     *
+     * @return int mapType
+     */
+    public function getMapType()
+    {
+        return self::MAP_TYPE_INVALID;
+    }
+
+    /**
+     * Returns an integer which specifies how many more bytes to read.
+     *
+     * A positive integer indicates the number of more bytes to fetch before invoking
+     * this method again.
+     * A value of zero means this is already a valid character.
+     * A value of -1 means this cannot possibly be a valid character.
+     *
+     * @param string $bytes
+     * @param int    $size
+     *
+     * @return int
+     */
+    public function validateByteSequence($bytes, $size)
+    {
+        $byte = reset($bytes);
+        if (1 == count($bytes) && $byte >= 0x00 && $byte <= 0x7F) {
+            return 0;
+        }
+
+        return -1;
+    }
+
+    /**
+     * Returns the number of bytes which should be read to start each character.
+     *
+     * @return int
+     */
+    public function getInitialByteSize()
+    {
+        return 1;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
new file mode 100644
index 000000000..7379bda25
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
@@ -0,0 +1,176 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Analyzes UTF-8 characters.
+ *
+ * @author Chris Corbyn
+ * @author Xavier De Cock <xdecock@gmail.com>
+ */
+class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
+{
+    /** Pre-computed for optimization */
+    private static $length_map = array(
+        // N=0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F,
+        1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x0N
+        1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x1N
+        1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x2N
+        1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x3N
+        1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x4N
+        1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x5N
+        1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x6N
+        1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 0x7N
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 0x8N
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 0x9N
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 0xAN
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 0xBN
+        2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, // 0xCN
+        2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, // 0xDN
+        3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, // 0xEN
+        4,4,4,4,4,4,4,4,5,5,5,5,6,6,0,0,  // 0xFN
+    );
+
+    private static $s_length_map = array(
+        "\x00" => 1, "\x01" => 1, "\x02" => 1, "\x03" => 1, "\x04" => 1, "\x05" => 1, "\x06" => 1, "\x07" => 1,
+        "\x08" => 1, "\x09" => 1, "\x0a" => 1, "\x0b" => 1, "\x0c" => 1, "\x0d" => 1, "\x0e" => 1, "\x0f" => 1,
+        "\x10" => 1, "\x11" => 1, "\x12" => 1, "\x13" => 1, "\x14" => 1, "\x15" => 1, "\x16" => 1, "\x17" => 1,
+        "\x18" => 1, "\x19" => 1, "\x1a" => 1, "\x1b" => 1, "\x1c" => 1, "\x1d" => 1, "\x1e" => 1, "\x1f" => 1,
+        "\x20" => 1, "\x21" => 1, "\x22" => 1, "\x23" => 1, "\x24" => 1, "\x25" => 1, "\x26" => 1, "\x27" => 1,
+        "\x28" => 1, "\x29" => 1, "\x2a" => 1, "\x2b" => 1, "\x2c" => 1, "\x2d" => 1, "\x2e" => 1, "\x2f" => 1,
+        "\x30" => 1, "\x31" => 1, "\x32" => 1, "\x33" => 1, "\x34" => 1, "\x35" => 1, "\x36" => 1, "\x37" => 1,
+        "\x38" => 1, "\x39" => 1, "\x3a" => 1, "\x3b" => 1, "\x3c" => 1, "\x3d" => 1, "\x3e" => 1, "\x3f" => 1,
+        "\x40" => 1, "\x41" => 1, "\x42" => 1, "\x43" => 1, "\x44" => 1, "\x45" => 1, "\x46" => 1, "\x47" => 1,
+        "\x48" => 1, "\x49" => 1, "\x4a" => 1, "\x4b" => 1, "\x4c" => 1, "\x4d" => 1, "\x4e" => 1, "\x4f" => 1,
+        "\x50" => 1, "\x51" => 1, "\x52" => 1, "\x53" => 1, "\x54" => 1, "\x55" => 1, "\x56" => 1, "\x57" => 1,
+        "\x58" => 1, "\x59" => 1, "\x5a" => 1, "\x5b" => 1, "\x5c" => 1, "\x5d" => 1, "\x5e" => 1, "\x5f" => 1,
+        "\x60" => 1, "\x61" => 1, "\x62" => 1, "\x63" => 1, "\x64" => 1, "\x65" => 1, "\x66" => 1, "\x67" => 1,
+        "\x68" => 1, "\x69" => 1, "\x6a" => 1, "\x6b" => 1, "\x6c" => 1, "\x6d" => 1, "\x6e" => 1, "\x6f" => 1,
+        "\x70" => 1, "\x71" => 1, "\x72" => 1, "\x73" => 1, "\x74" => 1, "\x75" => 1, "\x76" => 1, "\x77" => 1,
+        "\x78" => 1, "\x79" => 1, "\x7a" => 1, "\x7b" => 1, "\x7c" => 1, "\x7d" => 1, "\x7e" => 1, "\x7f" => 1,
+        "\x80" => 0, "\x81" => 0, "\x82" => 0, "\x83" => 0, "\x84" => 0, "\x85" => 0, "\x86" => 0, "\x87" => 0,
+        "\x88" => 0, "\x89" => 0, "\x8a" => 0, "\x8b" => 0, "\x8c" => 0, "\x8d" => 0, "\x8e" => 0, "\x8f" => 0,
+        "\x90" => 0, "\x91" => 0, "\x92" => 0, "\x93" => 0, "\x94" => 0, "\x95" => 0, "\x96" => 0, "\x97" => 0,
+        "\x98" => 0, "\x99" => 0, "\x9a" => 0, "\x9b" => 0, "\x9c" => 0, "\x9d" => 0, "\x9e" => 0, "\x9f" => 0,
+        "\xa0" => 0, "\xa1" => 0, "\xa2" => 0, "\xa3" => 0, "\xa4" => 0, "\xa5" => 0, "\xa6" => 0, "\xa7" => 0,
+        "\xa8" => 0, "\xa9" => 0, "\xaa" => 0, "\xab" => 0, "\xac" => 0, "\xad" => 0, "\xae" => 0, "\xaf" => 0,
+        "\xb0" => 0, "\xb1" => 0, "\xb2" => 0, "\xb3" => 0, "\xb4" => 0, "\xb5" => 0, "\xb6" => 0, "\xb7" => 0,
+        "\xb8" => 0, "\xb9" => 0, "\xba" => 0, "\xbb" => 0, "\xbc" => 0, "\xbd" => 0, "\xbe" => 0, "\xbf" => 0,
+        "\xc0" => 2, "\xc1" => 2, "\xc2" => 2, "\xc3" => 2, "\xc4" => 2, "\xc5" => 2, "\xc6" => 2, "\xc7" => 2,
+        "\xc8" => 2, "\xc9" => 2, "\xca" => 2, "\xcb" => 2, "\xcc" => 2, "\xcd" => 2, "\xce" => 2, "\xcf" => 2,
+        "\xd0" => 2, "\xd1" => 2, "\xd2" => 2, "\xd3" => 2, "\xd4" => 2, "\xd5" => 2, "\xd6" => 2, "\xd7" => 2,
+        "\xd8" => 2, "\xd9" => 2, "\xda" => 2, "\xdb" => 2, "\xdc" => 2, "\xdd" => 2, "\xde" => 2, "\xdf" => 2,
+        "\xe0" => 3, "\xe1" => 3, "\xe2" => 3, "\xe3" => 3, "\xe4" => 3, "\xe5" => 3, "\xe6" => 3, "\xe7" => 3,
+        "\xe8" => 3, "\xe9" => 3, "\xea" => 3, "\xeb" => 3, "\xec" => 3, "\xed" => 3, "\xee" => 3, "\xef" => 3,
+        "\xf0" => 4, "\xf1" => 4, "\xf2" => 4, "\xf3" => 4, "\xf4" => 4, "\xf5" => 4, "\xf6" => 4, "\xf7" => 4,
+        "\xf8" => 5, "\xf9" => 5, "\xfa" => 5, "\xfb" => 5, "\xfc" => 6, "\xfd" => 6, "\xfe" => 0, "\xff" => 0,
+     );
+
+    /**
+     * Returns the complete character map.
+     *
+     * @param string $string
+     * @param int    $startOffset
+     * @param array  $currentMap
+     * @param mixed  $ignoredChars
+     *
+     * @return int
+     */
+    public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
+    {
+        if (!isset($currentMap['i']) || !isset($currentMap['p'])) {
+            $currentMap['p'] = $currentMap['i'] = array();
+        }
+
+        $strlen = strlen($string);
+        $charPos = count($currentMap['p']);
+        $foundChars = 0;
+        $invalid = false;
+        for ($i = 0; $i < $strlen; ++$i) {
+            $char = $string[$i];
+            $size = self::$s_length_map[$char];
+            if ($size == 0) {
+                /* char is invalid, we must wait for a resync */
+                $invalid = true;
+                continue;
+            } else {
+                if ($invalid == true) {
+                    /* We mark the chars as invalid and start a new char */
+                    $currentMap['p'][$charPos + $foundChars] = $startOffset + $i;
+                    $currentMap['i'][$charPos + $foundChars] = true;
+                    ++$foundChars;
+                    $invalid = false;
+                }
+                if (($i + $size) > $strlen) {
+                    $ignoredChars = substr($string, $i);
+                    break;
+                }
+                for ($j = 1; $j < $size; ++$j) {
+                    $char = $string[$i + $j];
+                    if ($char > "\x7F" && $char < "\xC0") {
+                        // Valid - continue parsing
+                    } else {
+                        /* char is invalid, we must wait for a resync */
+                        $invalid = true;
+                        continue 2;
+                    }
+                }
+                /* Ok we got a complete char here */
+                $currentMap['p'][$charPos + $foundChars] = $startOffset + $i + $size;
+                $i += $j - 1;
+                ++$foundChars;
+            }
+        }
+
+        return $foundChars;
+    }
+
+    /**
+     * Returns mapType.
+     *
+     * @return int mapType
+     */
+    public function getMapType()
+    {
+        return self::MAP_TYPE_POSITIONS;
+    }
+
+    /**
+     * Returns an integer which specifies how many more bytes to read.
+     *
+     * A positive integer indicates the number of more bytes to fetch before invoking
+     * this method again.
+     * A value of zero means this is already a valid character.
+     * A value of -1 means this cannot possibly be a valid character.
+     *
+     * @param string $bytes
+     * @param int    $size
+     *
+     * @return int
+     */
+    public function validateByteSequence($bytes, $size)
+    {
+        if ($size < 1) {
+            return -1;
+        }
+        $needed = self::$length_map[$bytes[0]] - $size;
+
+        return $needed > -1 ? $needed : -1;
+    }
+
+    /**
+     * Returns the number of bytes which should be read to start each character.
+     *
+     * @return int
+     */
+    public function getInitialByteSize()
+    {
+        return 1;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterReaderFactory.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterReaderFactory.php
similarity index 55%
rename from lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterReaderFactory.php
rename to lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterReaderFactory.php
index 9e01de17e..15b6c6920 100644
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/CharacterReaderFactory.php
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterReaderFactory.php
@@ -8,22 +8,19 @@
  * file that was distributed with this source code.
  */
 
-//@require 'Swift/CharacterReader.php';
-
 /**
  * A factory for creating CharacterReaders.
- * @package Swift
- * @subpackage Encoder
+ *
  * @author Chris Corbyn
  */
 interface Swift_CharacterReaderFactory
 {
-
-  /**
-   * Returns a CharacterReader suitable for the charset applied.
-   * @param string $charset
-   * @return Swift_CharacterReader
-   */
-  public function getReaderFor($charset);
-  
+    /**
+     * Returns a CharacterReader suitable for the charset applied.
+     *
+     * @param string $charset
+     *
+     * @return Swift_CharacterReader
+     */
+    public function getReaderFor($charset);
 }
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
new file mode 100644
index 000000000..9171a0bac
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
@@ -0,0 +1,124 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Standard factory for creating CharacterReaders.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_CharacterReaderFactory_SimpleCharacterReaderFactory implements Swift_CharacterReaderFactory
+{
+    /**
+     * A map of charset patterns to their implementation classes.
+     *
+     * @var array
+     */
+    private static $_map = array();
+
+    /**
+     * Factories which have already been loaded.
+     *
+     * @var Swift_CharacterReaderFactory[]
+     */
+    private static $_loaded = array();
+
+    /**
+     * Creates a new CharacterReaderFactory.
+     */
+    public function __construct()
+    {
+        $this->init();
+    }
+
+    public function __wakeup()
+    {
+        $this->init();
+    }
+
+    public function init()
+    {
+        if (count(self::$_map) > 0) {
+            return;
+        }
+
+        $prefix = 'Swift_CharacterReader_';
+
+        $singleByte = array(
+            'class' => $prefix.'GenericFixedWidthReader',
+            'constructor' => array(1),
+            );
+
+        $doubleByte = array(
+            'class' => $prefix.'GenericFixedWidthReader',
+            'constructor' => array(2),
+            );
+
+        $fourBytes = array(
+            'class' => $prefix.'GenericFixedWidthReader',
+            'constructor' => array(4),
+            );
+
+        // Utf-8
+        self::$_map['utf-?8'] = array(
+            'class' => $prefix.'Utf8Reader',
+            'constructor' => array(),
+            );
+
+        //7-8 bit charsets
+        self::$_map['(us-)?ascii'] = $singleByte;
+        self::$_map['(iso|iec)-?8859-?[0-9]+'] = $singleByte;
+        self::$_map['windows-?125[0-9]'] = $singleByte;
+        self::$_map['cp-?[0-9]+'] = $singleByte;
+        self::$_map['ansi'] = $singleByte;
+        self::$_map['macintosh'] = $singleByte;
+        self::$_map['koi-?7'] = $singleByte;
+        self::$_map['koi-?8-?.+'] = $singleByte;
+        self::$_map['mik'] = $singleByte;
+        self::$_map['(cork|t1)'] = $singleByte;
+        self::$_map['v?iscii'] = $singleByte;
+
+        //16 bits
+        self::$_map['(ucs-?2|utf-?16)'] = $doubleByte;
+
+        //32 bits
+        self::$_map['(ucs-?4|utf-?32)'] = $fourBytes;
+
+        // Fallback
+        self::$_map['.*'] = $singleByte;
+    }
+
+    /**
+     * Returns a CharacterReader suitable for the charset applied.
+     *
+     * @param string $charset
+     *
+     * @return Swift_CharacterReader
+     */
+    public function getReaderFor($charset)
+    {
+        $charset = trim(strtolower($charset));
+        foreach (self::$_map as $pattern => $spec) {
+            $re = '/^'.$pattern.'$/D';
+            if (preg_match($re, $charset)) {
+                if (!array_key_exists($pattern, self::$_loaded)) {
+                    $reflector = new ReflectionClass($spec['class']);
+                    if ($reflector->getConstructor()) {
+                        $reader = $reflector->newInstanceArgs($spec['constructor']);
+                    } else {
+                        $reader = $reflector->newInstance();
+                    }
+                    self::$_loaded[$pattern] = $reader;
+                }
+
+                return self::$_loaded[$pattern];
+            }
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterStream.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterStream.php
new file mode 100644
index 000000000..717924f5d
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterStream.php
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An abstract means of reading and writing data in terms of characters as opposed
+ * to bytes.
+ *
+ * Classes implementing this interface may use a subsystem which requires less
+ * memory than working with large strings of data.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_CharacterStream
+{
+    /**
+     * Set the character set used in this CharacterStream.
+     *
+     * @param string $charset
+     */
+    public function setCharacterSet($charset);
+
+    /**
+     * Set the CharacterReaderFactory for multi charset support.
+     *
+     * @param Swift_CharacterReaderFactory $factory
+     */
+    public function setCharacterReaderFactory(Swift_CharacterReaderFactory $factory);
+
+    /**
+     * Overwrite this character stream using the byte sequence in the byte stream.
+     *
+     * @param Swift_OutputByteStream $os output stream to read from
+     */
+    public function importByteStream(Swift_OutputByteStream $os);
+
+    /**
+     * Import a string a bytes into this CharacterStream, overwriting any existing
+     * data in the stream.
+     *
+     * @param string $string
+     */
+    public function importString($string);
+
+    /**
+     * Read $length characters from the stream and move the internal pointer
+     * $length further into the stream.
+     *
+     * @param int $length
+     *
+     * @return string
+     */
+    public function read($length);
+
+    /**
+     * Read $length characters from the stream and return a 1-dimensional array
+     * containing there octet values.
+     *
+     * @param int $length
+     *
+     * @return int[]
+     */
+    public function readBytes($length);
+
+    /**
+     * Write $chars to the end of the stream.
+     *
+     * @param string $chars
+     */
+    public function write($chars);
+
+    /**
+     * Move the internal pointer to $charOffset in the stream.
+     *
+     * @param int $charOffset
+     */
+    public function setPointer($charOffset);
+
+    /**
+     * Empty the stream and reset the internal pointer.
+     */
+    public function flushContents();
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
new file mode 100644
index 000000000..d695a6e17
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
@@ -0,0 +1,293 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A CharacterStream implementation which stores characters in an internal array.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStream
+{
+    /** A map of byte values and their respective characters */
+    private static $_charMap;
+
+    /** A map of characters and their derivative byte values */
+    private static $_byteMap;
+
+    /** The char reader (lazy-loaded) for the current charset */
+    private $_charReader;
+
+    /** A factory for creating CharacterReader instances */
+    private $_charReaderFactory;
+
+    /** The character set this stream is using */
+    private $_charset;
+
+    /** Array of characters */
+    private $_array = array();
+
+    /** Size of the array of character */
+    private $_array_size = array();
+
+    /** The current character offset in the stream */
+    private $_offset = 0;
+
+    /**
+     * Create a new CharacterStream with the given $chars, if set.
+     *
+     * @param Swift_CharacterReaderFactory $factory for loading validators
+     * @param string                       $charset used in the stream
+     */
+    public function __construct(Swift_CharacterReaderFactory $factory, $charset)
+    {
+        self::_initializeMaps();
+        $this->setCharacterReaderFactory($factory);
+        $this->setCharacterSet($charset);
+    }
+
+    /**
+     * Set the character set used in this CharacterStream.
+     *
+     * @param string $charset
+     */
+    public function setCharacterSet($charset)
+    {
+        $this->_charset = $charset;
+        $this->_charReader = null;
+    }
+
+    /**
+     * Set the CharacterReaderFactory for multi charset support.
+     *
+     * @param Swift_CharacterReaderFactory $factory
+     */
+    public function setCharacterReaderFactory(Swift_CharacterReaderFactory $factory)
+    {
+        $this->_charReaderFactory = $factory;
+    }
+
+    /**
+     * Overwrite this character stream using the byte sequence in the byte stream.
+     *
+     * @param Swift_OutputByteStream $os output stream to read from
+     */
+    public function importByteStream(Swift_OutputByteStream $os)
+    {
+        if (!isset($this->_charReader)) {
+            $this->_charReader = $this->_charReaderFactory
+                ->getReaderFor($this->_charset);
+        }
+
+        $startLength = $this->_charReader->getInitialByteSize();
+        while (false !== $bytes = $os->read($startLength)) {
+            $c = array();
+            for ($i = 0, $len = strlen($bytes); $i < $len; ++$i) {
+                $c[] = self::$_byteMap[$bytes[$i]];
+            }
+            $size = count($c);
+            $need = $this->_charReader
+                ->validateByteSequence($c, $size);
+            if ($need > 0 &&
+                false !== $bytes = $os->read($need)) {
+                for ($i = 0, $len = strlen($bytes); $i < $len; ++$i) {
+                    $c[] = self::$_byteMap[$bytes[$i]];
+                }
+            }
+            $this->_array[] = $c;
+            ++$this->_array_size;
+        }
+    }
+
+    /**
+     * Import a string a bytes into this CharacterStream, overwriting any existing
+     * data in the stream.
+     *
+     * @param string $string
+     */
+    public function importString($string)
+    {
+        $this->flushContents();
+        $this->write($string);
+    }
+
+    /**
+     * Read $length characters from the stream and move the internal pointer
+     * $length further into the stream.
+     *
+     * @param int $length
+     *
+     * @return string
+     */
+    public function read($length)
+    {
+        if ($this->_offset == $this->_array_size) {
+            return false;
+        }
+
+        // Don't use array slice
+        $arrays = array();
+        $end = $length + $this->_offset;
+        for ($i = $this->_offset; $i < $end; ++$i) {
+            if (!isset($this->_array[$i])) {
+                break;
+            }
+            $arrays[] = $this->_array[$i];
+        }
+        $this->_offset += $i - $this->_offset; // Limit function calls
+        $chars = false;
+        foreach ($arrays as $array) {
+            $chars .= implode('', array_map('chr', $array));
+        }
+
+        return $chars;
+    }
+
+    /**
+     * Read $length characters from the stream and return a 1-dimensional array
+     * containing there octet values.
+     *
+     * @param int $length
+     *
+     * @return integer[]
+     */
+    public function readBytes($length)
+    {
+        if ($this->_offset == $this->_array_size) {
+            return false;
+        }
+        $arrays = array();
+        $end = $length + $this->_offset;
+        for ($i = $this->_offset; $i < $end; ++$i) {
+            if (!isset($this->_array[$i])) {
+                break;
+            }
+            $arrays[] = $this->_array[$i];
+        }
+        $this->_offset += ($i - $this->_offset); // Limit function calls
+
+        return call_user_func_array('array_merge', $arrays);
+    }
+
+    /**
+     * Write $chars to the end of the stream.
+     *
+     * @param string $chars
+     */
+    public function write($chars)
+    {
+        if (!isset($this->_charReader)) {
+            $this->_charReader = $this->_charReaderFactory->getReaderFor(
+                $this->_charset);
+        }
+
+        $startLength = $this->_charReader->getInitialByteSize();
+
+        $fp = fopen('php://memory', 'w+b');
+        fwrite($fp, $chars);
+        unset($chars);
+        fseek($fp, 0, SEEK_SET);
+
+        $buffer = array(0);
+        $buf_pos = 1;
+        $buf_len = 1;
+        $has_datas = true;
+        do {
+            $bytes = array();
+            // Buffer Filing
+            if ($buf_len - $buf_pos < $startLength) {
+                $buf = array_splice($buffer, $buf_pos);
+                $new = $this->_reloadBuffer($fp, 100);
+                if ($new) {
+                    $buffer = array_merge($buf, $new);
+                    $buf_len = count($buffer);
+                    $buf_pos = 0;
+                } else {
+                    $has_datas = false;
+                }
+            }
+            if ($buf_len - $buf_pos > 0) {
+                $size = 0;
+                for ($i = 0; $i < $startLength && isset($buffer[$buf_pos]); ++$i) {
+                    ++$size;
+                    $bytes[] = $buffer[$buf_pos++];
+                }
+                $need = $this->_charReader->validateByteSequence(
+                    $bytes, $size);
+                if ($need > 0) {
+                    if ($buf_len - $buf_pos < $need) {
+                        $new = $this->_reloadBuffer($fp, $need);
+
+                        if ($new) {
+                            $buffer = array_merge($buffer, $new);
+                            $buf_len = count($buffer);
+                        }
+                    }
+                    for ($i = 0; $i < $need && isset($buffer[$buf_pos]); ++$i) {
+                        $bytes[] = $buffer[$buf_pos++];
+                    }
+                }
+                $this->_array[] = $bytes;
+                ++$this->_array_size;
+            }
+        } while ($has_datas);
+
+        fclose($fp);
+    }
+
+    /**
+     * Move the internal pointer to $charOffset in the stream.
+     *
+     * @param int $charOffset
+     */
+    public function setPointer($charOffset)
+    {
+        if ($charOffset > $this->_array_size) {
+            $charOffset = $this->_array_size;
+        } elseif ($charOffset < 0) {
+            $charOffset = 0;
+        }
+        $this->_offset = $charOffset;
+    }
+
+    /**
+     * Empty the stream and reset the internal pointer.
+     */
+    public function flushContents()
+    {
+        $this->_offset = 0;
+        $this->_array = array();
+        $this->_array_size = 0;
+    }
+
+    private function _reloadBuffer($fp, $len)
+    {
+        if (!feof($fp) && ($bytes = fread($fp, $len)) !== false) {
+            $buf = array();
+            for ($i = 0, $len = strlen($bytes); $i < $len; ++$i) {
+                $buf[] = self::$_byteMap[$bytes[$i]];
+            }
+
+            return $buf;
+        }
+
+        return false;
+    }
+
+    private static function _initializeMaps()
+    {
+        if (!isset(self::$_charMap)) {
+            self::$_charMap = array();
+            for ($byte = 0; $byte < 256; ++$byte) {
+                self::$_charMap[$byte] = chr($byte);
+            }
+            self::$_byteMap = array_flip(self::$_charMap);
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
new file mode 100644
index 000000000..58bd140fd
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
@@ -0,0 +1,267 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A CharacterStream implementation which stores characters in an internal array.
+ *
+ * @author Xavier De Cock <xdecock@gmail.com>
+ */
+class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
+{
+    /**
+     * The char reader (lazy-loaded) for the current charset.
+     *
+     * @var Swift_CharacterReader
+     */
+    private $_charReader;
+
+    /**
+     * A factory for creating CharacterReader instances.
+     *
+     * @var Swift_CharacterReaderFactory
+     */
+    private $_charReaderFactory;
+
+    /**
+     * The character set this stream is using.
+     *
+     * @var string
+     */
+    private $_charset;
+
+    /**
+     * The data's stored as-is.
+     *
+     * @var string
+     */
+    private $_datas = '';
+
+    /**
+     * Number of bytes in the stream.
+     *
+     * @var int
+     */
+    private $_datasSize = 0;
+
+    /**
+     * Map.
+     *
+     * @var mixed
+     */
+    private $_map;
+
+    /**
+     * Map Type.
+     *
+     * @var int
+     */
+    private $_mapType = 0;
+
+    /**
+     * Number of characters in the stream.
+     *
+     * @var int
+     */
+    private $_charCount = 0;
+
+    /**
+     * Position in the stream.
+     *
+     * @var int
+     */
+    private $_currentPos = 0;
+
+    /**
+     * Constructor.
+     *
+     * @param Swift_CharacterReaderFactory $factory
+     * @param string                       $charset
+     */
+    public function __construct(Swift_CharacterReaderFactory $factory, $charset)
+    {
+        $this->setCharacterReaderFactory($factory);
+        $this->setCharacterSet($charset);
+    }
+
+    /* -- Changing parameters of the stream -- */
+
+    /**
+     * Set the character set used in this CharacterStream.
+     *
+     * @param string $charset
+     */
+    public function setCharacterSet($charset)
+    {
+        $this->_charset = $charset;
+        $this->_charReader = null;
+        $this->_mapType = 0;
+    }
+
+    /**
+     * Set the CharacterReaderFactory for multi charset support.
+     *
+     * @param Swift_CharacterReaderFactory $factory
+     */
+    public function setCharacterReaderFactory(Swift_CharacterReaderFactory $factory)
+    {
+        $this->_charReaderFactory = $factory;
+    }
+
+    /**
+     * @see Swift_CharacterStream::flushContents()
+     */
+    public function flushContents()
+    {
+        $this->_datas = null;
+        $this->_map = null;
+        $this->_charCount = 0;
+        $this->_currentPos = 0;
+        $this->_datasSize = 0;
+    }
+
+    /**
+     * @see Swift_CharacterStream::importByteStream()
+     *
+     * @param Swift_OutputByteStream $os
+     */
+    public function importByteStream(Swift_OutputByteStream $os)
+    {
+        $this->flushContents();
+        $blocks = 512;
+        $os->setReadPointer(0);
+        while (false !== ($read = $os->read($blocks))) {
+            $this->write($read);
+        }
+    }
+
+    /**
+     * @see Swift_CharacterStream::importString()
+     *
+     * @param string $string
+     */
+    public function importString($string)
+    {
+        $this->flushContents();
+        $this->write($string);
+    }
+
+    /**
+     * @see Swift_CharacterStream::read()
+     *
+     * @param int $length
+     *
+     * @return string
+     */
+    public function read($length)
+    {
+        if ($this->_currentPos >= $this->_charCount) {
+            return false;
+        }
+        $ret = false;
+        $length = $this->_currentPos + $length > $this->_charCount ? $this->_charCount - $this->_currentPos : $length;
+        switch ($this->_mapType) {
+            case Swift_CharacterReader::MAP_TYPE_FIXED_LEN:
+                $len = $length * $this->_map;
+                $ret = substr($this->_datas,
+                        $this->_currentPos * $this->_map,
+                        $len);
+                $this->_currentPos += $length;
+                break;
+
+            case Swift_CharacterReader::MAP_TYPE_INVALID:
+                $ret = '';
+                for (; $this->_currentPos < $length; ++$this->_currentPos) {
+                    if (isset($this->_map[$this->_currentPos])) {
+                        $ret .= '?';
+                    } else {
+                        $ret .= $this->_datas[$this->_currentPos];
+                    }
+                }
+                break;
+
+            case Swift_CharacterReader::MAP_TYPE_POSITIONS:
+                $end = $this->_currentPos + $length;
+                $end = $end > $this->_charCount ? $this->_charCount : $end;
+                $ret = '';
+                $start = 0;
+                if ($this->_currentPos > 0) {
+                    $start = $this->_map['p'][$this->_currentPos - 1];
+                }
+                $to = $start;
+                for (; $this->_currentPos < $end; ++$this->_currentPos) {
+                    if (isset($this->_map['i'][$this->_currentPos])) {
+                        $ret .= substr($this->_datas, $start, $to - $start).'?';
+                        $start = $this->_map['p'][$this->_currentPos];
+                    } else {
+                        $to = $this->_map['p'][$this->_currentPos];
+                    }
+                }
+                $ret .= substr($this->_datas, $start, $to - $start);
+                break;
+        }
+
+        return $ret;
+    }
+
+    /**
+     * @see Swift_CharacterStream::readBytes()
+     *
+     * @param int $length
+     *
+     * @return int[]
+     */
+    public function readBytes($length)
+    {
+        $read = $this->read($length);
+        if ($read !== false) {
+            $ret = array_map('ord', str_split($read, 1));
+
+            return $ret;
+        }
+
+        return false;
+    }
+
+    /**
+     * @see Swift_CharacterStream::setPointer()
+     *
+     * @param int $charOffset
+     */
+    public function setPointer($charOffset)
+    {
+        if ($this->_charCount < $charOffset) {
+            $charOffset = $this->_charCount;
+        }
+        $this->_currentPos = $charOffset;
+    }
+
+    /**
+     * @see Swift_CharacterStream::write()
+     *
+     * @param string $chars
+     */
+    public function write($chars)
+    {
+        if (!isset($this->_charReader)) {
+            $this->_charReader = $this->_charReaderFactory->getReaderFor(
+                $this->_charset);
+            $this->_map = array();
+            $this->_mapType = $this->_charReader->getMapType();
+        }
+        $ignored = '';
+        $this->_datas .= $chars;
+        $this->_charCount += $this->_charReader->getCharPositions(substr($this->_datas, $this->_datasSize), $this->_datasSize, $this->_map, $ignored);
+        if ($ignored !== false) {
+            $this->_datasSize = strlen($this->_datas) - strlen($ignored);
+        } else {
+            $this->_datasSize = strlen($this->_datas);
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/ConfigurableSpool.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/ConfigurableSpool.php
new file mode 100644
index 000000000..4ae5bacfc
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/ConfigurableSpool.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2009 Fabien Potencier <fabien.potencier@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Base class for Spools (implements time and message limits).
+ *
+ * @author Fabien Potencier
+ */
+abstract class Swift_ConfigurableSpool implements Swift_Spool
+{
+    /** The maximum number of messages to send per flush */
+    private $_message_limit;
+
+    /** The time limit per flush */
+    private $_time_limit;
+
+    /**
+     * Sets the maximum number of messages to send per flush.
+     *
+     * @param int $limit
+     */
+    public function setMessageLimit($limit)
+    {
+        $this->_message_limit = (int) $limit;
+    }
+
+    /**
+     * Gets the maximum number of messages to send per flush.
+     *
+     * @return int The limit
+     */
+    public function getMessageLimit()
+    {
+        return $this->_message_limit;
+    }
+
+    /**
+     * Sets the time limit (in seconds) per flush.
+     *
+     * @param int $limit The limit
+     */
+    public function setTimeLimit($limit)
+    {
+        $this->_time_limit = (int) $limit;
+    }
+
+    /**
+     * Gets the time limit (in seconds) per flush.
+     *
+     * @return int The limit
+     */
+    public function getTimeLimit()
+    {
+        return $this->_time_limit;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/DependencyContainer.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/DependencyContainer.php
new file mode 100644
index 000000000..8c1074a3a
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/DependencyContainer.php
@@ -0,0 +1,373 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Dependency Injection container.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_DependencyContainer
+{
+    /** Constant for literal value types */
+    const TYPE_VALUE = 0x0001;
+
+    /** Constant for new instance types */
+    const TYPE_INSTANCE = 0x0010;
+
+    /** Constant for shared instance types */
+    const TYPE_SHARED = 0x0100;
+
+    /** Constant for aliases */
+    const TYPE_ALIAS = 0x1000;
+
+    /** Singleton instance */
+    private static $_instance = null;
+
+    /** The data container */
+    private $_store = array();
+
+    /** The current endpoint in the data container */
+    private $_endPoint;
+
+    /**
+     * Constructor should not be used.
+     *
+     * Use {@link getInstance()} instead.
+     */
+    public function __construct()
+    {
+    }
+
+    /**
+     * Returns a singleton of the DependencyContainer.
+     *
+     * @return Swift_DependencyContainer
+     */
+    public static function getInstance()
+    {
+        if (!isset(self::$_instance)) {
+            self::$_instance = new self();
+        }
+
+        return self::$_instance;
+    }
+
+    /**
+     * List the names of all items stored in the Container.
+     *
+     * @return array
+     */
+    public function listItems()
+    {
+        return array_keys($this->_store);
+    }
+
+    /**
+     * Test if an item is registered in this container with the given name.
+     *
+     * @see register()
+     *
+     * @param string $itemName
+     *
+     * @return bool
+     */
+    public function has($itemName)
+    {
+        return array_key_exists($itemName, $this->_store)
+            && isset($this->_store[$itemName]['lookupType']);
+    }
+
+    /**
+     * Lookup the item with the given $itemName.
+     *
+     * @see register()
+     *
+     * @param string $itemName
+     *
+     * @throws Swift_DependencyException If the dependency is not found
+     *
+     * @return mixed
+     */
+    public function lookup($itemName)
+    {
+        if (!$this->has($itemName)) {
+            throw new Swift_DependencyException(
+                'Cannot lookup dependency "'.$itemName.'" since it is not registered.'
+                );
+        }
+
+        switch ($this->_store[$itemName]['lookupType']) {
+            case self::TYPE_ALIAS:
+                return $this->_createAlias($itemName);
+            case self::TYPE_VALUE:
+                return $this->_getValue($itemName);
+            case self::TYPE_INSTANCE:
+                return $this->_createNewInstance($itemName);
+            case self::TYPE_SHARED:
+                return $this->_createSharedInstance($itemName);
+        }
+    }
+
+    /**
+     * Create an array of arguments passed to the constructor of $itemName.
+     *
+     * @param string $itemName
+     *
+     * @return array
+     */
+    public function createDependenciesFor($itemName)
+    {
+        $args = array();
+        if (isset($this->_store[$itemName]['args'])) {
+            $args = $this->_resolveArgs($this->_store[$itemName]['args']);
+        }
+
+        return $args;
+    }
+
+    /**
+     * Register a new dependency with $itemName.
+     *
+     * This method returns the current DependencyContainer instance because it
+     * requires the use of the fluid interface to set the specific details for the
+     * dependency.
+     *
+     * @see asNewInstanceOf(), asSharedInstanceOf(), asValue()
+     *
+     * @param string $itemName
+     *
+     * @return Swift_DependencyContainer
+     */
+    public function register($itemName)
+    {
+        $this->_store[$itemName] = array();
+        $this->_endPoint = &$this->_store[$itemName];
+
+        return $this;
+    }
+
+    /**
+     * Specify the previously registered item as a literal value.
+     *
+     * {@link register()} must be called before this will work.
+     *
+     * @param mixed $value
+     *
+     * @return Swift_DependencyContainer
+     */
+    public function asValue($value)
+    {
+        $endPoint = &$this->_getEndPoint();
+        $endPoint['lookupType'] = self::TYPE_VALUE;
+        $endPoint['value'] = $value;
+
+        return $this;
+    }
+
+    /**
+     * Specify the previously registered item as an alias of another item.
+     *
+     * @param string $lookup
+     *
+     * @return Swift_DependencyContainer
+     */
+    public function asAliasOf($lookup)
+    {
+        $endPoint = &$this->_getEndPoint();
+        $endPoint['lookupType'] = self::TYPE_ALIAS;
+        $endPoint['ref'] = $lookup;
+
+        return $this;
+    }
+
+    /**
+     * Specify the previously registered item as a new instance of $className.
+     *
+     * {@link register()} must be called before this will work.
+     * Any arguments can be set with {@link withDependencies()},
+     * {@link addConstructorValue()} or {@link addConstructorLookup()}.
+     *
+     * @see withDependencies(), addConstructorValue(), addConstructorLookup()
+     *
+     * @param string $className
+     *
+     * @return Swift_DependencyContainer
+     */
+    public function asNewInstanceOf($className)
+    {
+        $endPoint = &$this->_getEndPoint();
+        $endPoint['lookupType'] = self::TYPE_INSTANCE;
+        $endPoint['className'] = $className;
+
+        return $this;
+    }
+
+    /**
+     * Specify the previously registered item as a shared instance of $className.
+     *
+     * {@link register()} must be called before this will work.
+     *
+     * @param string $className
+     *
+     * @return Swift_DependencyContainer
+     */
+    public function asSharedInstanceOf($className)
+    {
+        $endPoint = &$this->_getEndPoint();
+        $endPoint['lookupType'] = self::TYPE_SHARED;
+        $endPoint['className'] = $className;
+
+        return $this;
+    }
+
+    /**
+     * Specify a list of injected dependencies for the previously registered item.
+     *
+     * This method takes an array of lookup names.
+     *
+     * @see addConstructorValue(), addConstructorLookup()
+     *
+     * @param array $lookups
+     *
+     * @return Swift_DependencyContainer
+     */
+    public function withDependencies(array $lookups)
+    {
+        $endPoint = &$this->_getEndPoint();
+        $endPoint['args'] = array();
+        foreach ($lookups as $lookup) {
+            $this->addConstructorLookup($lookup);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Specify a literal (non looked up) value for the constructor of the
+     * previously registered item.
+     *
+     * @see withDependencies(), addConstructorLookup()
+     *
+     * @param mixed $value
+     *
+     * @return Swift_DependencyContainer
+     */
+    public function addConstructorValue($value)
+    {
+        $endPoint = &$this->_getEndPoint();
+        if (!isset($endPoint['args'])) {
+            $endPoint['args'] = array();
+        }
+        $endPoint['args'][] = array('type' => 'value', 'item' => $value);
+
+        return $this;
+    }
+
+    /**
+     * Specify a dependency lookup for the constructor of the previously
+     * registered item.
+     *
+     * @see withDependencies(), addConstructorValue()
+     *
+     * @param string $lookup
+     *
+     * @return Swift_DependencyContainer
+     */
+    public function addConstructorLookup($lookup)
+    {
+        $endPoint = &$this->_getEndPoint();
+        if (!isset($this->_endPoint['args'])) {
+            $endPoint['args'] = array();
+        }
+        $endPoint['args'][] = array('type' => 'lookup', 'item' => $lookup);
+
+        return $this;
+    }
+
+    /** Get the literal value with $itemName */
+    private function _getValue($itemName)
+    {
+        return $this->_store[$itemName]['value'];
+    }
+
+    /** Resolve an alias to another item */
+    private function _createAlias($itemName)
+    {
+        return $this->lookup($this->_store[$itemName]['ref']);
+    }
+
+    /** Create a fresh instance of $itemName */
+    private function _createNewInstance($itemName)
+    {
+        $reflector = new ReflectionClass($this->_store[$itemName]['className']);
+        if ($reflector->getConstructor()) {
+            return $reflector->newInstanceArgs(
+                $this->createDependenciesFor($itemName)
+                );
+        }
+
+        return $reflector->newInstance();
+    }
+
+    /** Create and register a shared instance of $itemName */
+    private function _createSharedInstance($itemName)
+    {
+        if (!isset($this->_store[$itemName]['instance'])) {
+            $this->_store[$itemName]['instance'] = $this->_createNewInstance($itemName);
+        }
+
+        return $this->_store[$itemName]['instance'];
+    }
+
+    /** Get the current endpoint in the store */
+    private function &_getEndPoint()
+    {
+        if (!isset($this->_endPoint)) {
+            throw new BadMethodCallException(
+                'Component must first be registered by calling register()'
+                );
+        }
+
+        return $this->_endPoint;
+    }
+
+    /** Get an argument list with dependencies resolved */
+    private function _resolveArgs(array $args)
+    {
+        $resolved = array();
+        foreach ($args as $argDefinition) {
+            switch ($argDefinition['type']) {
+                case 'lookup':
+                    $resolved[] = $this->_lookupRecursive($argDefinition['item']);
+                    break;
+                case 'value':
+                    $resolved[] = $argDefinition['item'];
+                    break;
+            }
+        }
+
+        return $resolved;
+    }
+
+    /** Resolve a single dependency with an collections */
+    private function _lookupRecursive($item)
+    {
+        if (is_array($item)) {
+            $collection = array();
+            foreach ($item as $k => $v) {
+                $collection[$k] = $this->_lookupRecursive($v);
+            }
+
+            return $collection;
+        }
+
+        return $this->lookup($item);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/DependencyException.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/DependencyException.php
similarity index 50%
rename from lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/DependencyException.php
rename to lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/DependencyException.php
index bb1681ce1..799d38d83 100644
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/DependencyException.php
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/DependencyException.php
@@ -8,23 +8,20 @@
  * file that was distributed with this source code.
  */
 
-//@require 'Swift/SwiftException.php';
-
 /**
- * DependencyException thrown when a requested dependeny is missing.
- * @package Swift
+ * DependencyException gets thrown when a requested dependency is missing.
+ *
  * @author Chris Corbyn
  */
 class Swift_DependencyException extends Swift_SwiftException
 {
-  
-  /**
-   * Create a new DependencyException with $message.
-   * @param string $message
-   */
-  public function __construct($message)
-  {
-    parent::__construct($message);
-  }
-  
+    /**
+     * Create a new DependencyException with $message.
+     *
+     * @param string $message
+     */
+    public function __construct($message)
+    {
+        parent::__construct($message);
+    }
 }
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/EmbeddedFile.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/EmbeddedFile.php
new file mode 100644
index 000000000..d8c72ad4d
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/EmbeddedFile.php
@@ -0,0 +1,69 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An embedded file, in a multipart message.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_EmbeddedFile extends Swift_Mime_EmbeddedFile
+{
+    /**
+     * Create a new EmbeddedFile.
+     *
+     * Details may be optionally provided to the constructor.
+     *
+     * @param string|Swift_OutputByteStream $data
+     * @param string                        $filename
+     * @param string                        $contentType
+     */
+    public function __construct($data = null, $filename = null, $contentType = null)
+    {
+        call_user_func_array(
+            array($this, 'Swift_Mime_EmbeddedFile::__construct'),
+            Swift_DependencyContainer::getInstance()
+                ->createDependenciesFor('mime.embeddedfile')
+            );
+
+        $this->setBody($data);
+        $this->setFilename($filename);
+        if ($contentType) {
+            $this->setContentType($contentType);
+        }
+    }
+
+    /**
+     * Create a new EmbeddedFile.
+     *
+     * @param string|Swift_OutputByteStream $data
+     * @param string                        $filename
+     * @param string                        $contentType
+     *
+     * @return Swift_Mime_EmbeddedFile
+     */
+    public static function newInstance($data = null, $filename = null, $contentType = null)
+    {
+        return new self($data, $filename, $contentType);
+    }
+
+    /**
+     * Create a new EmbeddedFile from a filesystem path.
+     *
+     * @param string $path
+     *
+     * @return Swift_Mime_EmbeddedFile
+     */
+    public static function fromPath($path)
+    {
+        return self::newInstance()->setFile(
+            new Swift_ByteStream_FileByteStream($path)
+            );
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Encoder.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Encoder.php
new file mode 100644
index 000000000..2073abca1
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Encoder.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Interface for all Encoder schemes.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_Encoder extends Swift_Mime_CharsetObserver
+{
+    /**
+     * Encode a given string to produce an encoded string.
+     *
+     * @param string $string
+     * @param int    $firstLineOffset if first line needs to be shorter
+     * @param int    $maxLineLength   - 0 indicates the default length for this encoding
+     *
+     * @return string
+     */
+    public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0);
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
new file mode 100644
index 000000000..0e7b2a1b0
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
@@ -0,0 +1,58 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Handles Base 64 Encoding in Swift Mailer.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Encoder_Base64Encoder implements Swift_Encoder
+{
+    /**
+     * Takes an unencoded string and produces a Base64 encoded string from it.
+     *
+     * Base64 encoded strings have a maximum line length of 76 characters.
+     * If the first line needs to be shorter, indicate the difference with
+     * $firstLineOffset.
+     *
+     * @param string $string          to encode
+     * @param int    $firstLineOffset
+     * @param int    $maxLineLength   optional, 0 indicates the default of 76 bytes
+     *
+     * @return string
+     */
+    public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
+    {
+        if (0 >= $maxLineLength || 76 < $maxLineLength) {
+            $maxLineLength = 76;
+        }
+
+        $encodedString = base64_encode($string);
+        $firstLine = '';
+
+        if (0 != $firstLineOffset) {
+            $firstLine = substr(
+                $encodedString, 0, $maxLineLength - $firstLineOffset
+                )."\r\n";
+            $encodedString = substr(
+                $encodedString, $maxLineLength - $firstLineOffset
+                );
+        }
+
+        return $firstLine.trim(chunk_split($encodedString, $maxLineLength, "\r\n"));
+    }
+
+    /**
+     * Does nothing.
+     */
+    public function charsetChanged($charset)
+    {
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
new file mode 100644
index 000000000..8a81fe397
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
@@ -0,0 +1,300 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Handles Quoted Printable (QP) Encoding in Swift Mailer.
+ *
+ * Possibly the most accurate RFC 2045 QP implementation found in PHP.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Encoder_QpEncoder implements Swift_Encoder
+{
+    /**
+     * The CharacterStream used for reading characters (as opposed to bytes).
+     *
+     * @var Swift_CharacterStream
+     */
+    protected $_charStream;
+
+    /**
+     * A filter used if input should be canonicalized.
+     *
+     * @var Swift_StreamFilter
+     */
+    protected $_filter;
+
+    /**
+     * Pre-computed QP for HUGE optimization.
+     *
+     * @var string[]
+     */
+    protected static $_qpMap = array(
+        0 => '=00', 1 => '=01', 2 => '=02', 3 => '=03', 4 => '=04',
+        5 => '=05', 6 => '=06', 7 => '=07', 8 => '=08', 9 => '=09',
+        10 => '=0A', 11 => '=0B', 12 => '=0C', 13 => '=0D', 14 => '=0E',
+        15 => '=0F', 16 => '=10', 17 => '=11', 18 => '=12', 19 => '=13',
+        20 => '=14', 21 => '=15', 22 => '=16', 23 => '=17', 24 => '=18',
+        25 => '=19', 26 => '=1A', 27 => '=1B', 28 => '=1C', 29 => '=1D',
+        30 => '=1E', 31 => '=1F', 32 => '=20', 33 => '=21', 34 => '=22',
+        35 => '=23', 36 => '=24', 37 => '=25', 38 => '=26', 39 => '=27',
+        40 => '=28', 41 => '=29', 42 => '=2A', 43 => '=2B', 44 => '=2C',
+        45 => '=2D', 46 => '=2E', 47 => '=2F', 48 => '=30', 49 => '=31',
+        50 => '=32', 51 => '=33', 52 => '=34', 53 => '=35', 54 => '=36',
+        55 => '=37', 56 => '=38', 57 => '=39', 58 => '=3A', 59 => '=3B',
+        60 => '=3C', 61 => '=3D', 62 => '=3E', 63 => '=3F', 64 => '=40',
+        65 => '=41', 66 => '=42', 67 => '=43', 68 => '=44', 69 => '=45',
+        70 => '=46', 71 => '=47', 72 => '=48', 73 => '=49', 74 => '=4A',
+        75 => '=4B', 76 => '=4C', 77 => '=4D', 78 => '=4E', 79 => '=4F',
+        80 => '=50', 81 => '=51', 82 => '=52', 83 => '=53', 84 => '=54',
+        85 => '=55', 86 => '=56', 87 => '=57', 88 => '=58', 89 => '=59',
+        90 => '=5A', 91 => '=5B', 92 => '=5C', 93 => '=5D', 94 => '=5E',
+        95 => '=5F', 96 => '=60', 97 => '=61', 98 => '=62', 99 => '=63',
+        100 => '=64', 101 => '=65', 102 => '=66', 103 => '=67', 104 => '=68',
+        105 => '=69', 106 => '=6A', 107 => '=6B', 108 => '=6C', 109 => '=6D',
+        110 => '=6E', 111 => '=6F', 112 => '=70', 113 => '=71', 114 => '=72',
+        115 => '=73', 116 => '=74', 117 => '=75', 118 => '=76', 119 => '=77',
+        120 => '=78', 121 => '=79', 122 => '=7A', 123 => '=7B', 124 => '=7C',
+        125 => '=7D', 126 => '=7E', 127 => '=7F', 128 => '=80', 129 => '=81',
+        130 => '=82', 131 => '=83', 132 => '=84', 133 => '=85', 134 => '=86',
+        135 => '=87', 136 => '=88', 137 => '=89', 138 => '=8A', 139 => '=8B',
+        140 => '=8C', 141 => '=8D', 142 => '=8E', 143 => '=8F', 144 => '=90',
+        145 => '=91', 146 => '=92', 147 => '=93', 148 => '=94', 149 => '=95',
+        150 => '=96', 151 => '=97', 152 => '=98', 153 => '=99', 154 => '=9A',
+        155 => '=9B', 156 => '=9C', 157 => '=9D', 158 => '=9E', 159 => '=9F',
+        160 => '=A0', 161 => '=A1', 162 => '=A2', 163 => '=A3', 164 => '=A4',
+        165 => '=A5', 166 => '=A6', 167 => '=A7', 168 => '=A8', 169 => '=A9',
+        170 => '=AA', 171 => '=AB', 172 => '=AC', 173 => '=AD', 174 => '=AE',
+        175 => '=AF', 176 => '=B0', 177 => '=B1', 178 => '=B2', 179 => '=B3',
+        180 => '=B4', 181 => '=B5', 182 => '=B6', 183 => '=B7', 184 => '=B8',
+        185 => '=B9', 186 => '=BA', 187 => '=BB', 188 => '=BC', 189 => '=BD',
+        190 => '=BE', 191 => '=BF', 192 => '=C0', 193 => '=C1', 194 => '=C2',
+        195 => '=C3', 196 => '=C4', 197 => '=C5', 198 => '=C6', 199 => '=C7',
+        200 => '=C8', 201 => '=C9', 202 => '=CA', 203 => '=CB', 204 => '=CC',
+        205 => '=CD', 206 => '=CE', 207 => '=CF', 208 => '=D0', 209 => '=D1',
+        210 => '=D2', 211 => '=D3', 212 => '=D4', 213 => '=D5', 214 => '=D6',
+        215 => '=D7', 216 => '=D8', 217 => '=D9', 218 => '=DA', 219 => '=DB',
+        220 => '=DC', 221 => '=DD', 222 => '=DE', 223 => '=DF', 224 => '=E0',
+        225 => '=E1', 226 => '=E2', 227 => '=E3', 228 => '=E4', 229 => '=E5',
+        230 => '=E6', 231 => '=E7', 232 => '=E8', 233 => '=E9', 234 => '=EA',
+        235 => '=EB', 236 => '=EC', 237 => '=ED', 238 => '=EE', 239 => '=EF',
+        240 => '=F0', 241 => '=F1', 242 => '=F2', 243 => '=F3', 244 => '=F4',
+        245 => '=F5', 246 => '=F6', 247 => '=F7', 248 => '=F8', 249 => '=F9',
+        250 => '=FA', 251 => '=FB', 252 => '=FC', 253 => '=FD', 254 => '=FE',
+        255 => '=FF',
+        );
+
+    protected static $_safeMapShare = array();
+
+    /**
+     * A map of non-encoded ascii characters.
+     *
+     * @var string[]
+     */
+    protected $_safeMap = array();
+
+    /**
+     * Creates a new QpEncoder for the given CharacterStream.
+     *
+     * @param Swift_CharacterStream $charStream to use for reading characters
+     * @param Swift_StreamFilter    $filter     if input should be canonicalized
+     */
+    public function __construct(Swift_CharacterStream $charStream, Swift_StreamFilter $filter = null)
+    {
+        $this->_charStream = $charStream;
+        if (!isset(self::$_safeMapShare[$this->getSafeMapShareId()])) {
+            $this->initSafeMap();
+            self::$_safeMapShare[$this->getSafeMapShareId()] = $this->_safeMap;
+        } else {
+            $this->_safeMap = self::$_safeMapShare[$this->getSafeMapShareId()];
+        }
+        $this->_filter = $filter;
+    }
+
+    public function __sleep()
+    {
+        return array('_charStream', '_filter');
+    }
+
+    public function __wakeup()
+    {
+        if (!isset(self::$_safeMapShare[$this->getSafeMapShareId()])) {
+            $this->initSafeMap();
+            self::$_safeMapShare[$this->getSafeMapShareId()] = $this->_safeMap;
+        } else {
+            $this->_safeMap = self::$_safeMapShare[$this->getSafeMapShareId()];
+        }
+    }
+
+    protected function getSafeMapShareId()
+    {
+        return get_class($this);
+    }
+
+    protected function initSafeMap()
+    {
+        foreach (array_merge(
+            array(0x09, 0x20), range(0x21, 0x3C), range(0x3E, 0x7E)) as $byte) {
+            $this->_safeMap[$byte] = chr($byte);
+        }
+    }
+
+    /**
+     * Takes an unencoded string and produces a QP encoded string from it.
+     *
+     * QP encoded strings have a maximum line length of 76 characters.
+     * If the first line needs to be shorter, indicate the difference with
+     * $firstLineOffset.
+     *
+     * @param string $string           to encode
+     * @param int    $firstLineOffset, optional
+     * @param int    $maxLineLength,   optional 0 indicates the default of 76 chars
+     *
+     * @return string
+     */
+    public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
+    {
+        if ($maxLineLength > 76 || $maxLineLength <= 0) {
+            $maxLineLength = 76;
+        }
+
+        $thisLineLength = $maxLineLength - $firstLineOffset;
+
+        $lines = array();
+        $lNo = 0;
+        $lines[$lNo] = '';
+        $currentLine = &$lines[$lNo++];
+        $size = $lineLen = 0;
+
+        $this->_charStream->flushContents();
+        $this->_charStream->importString($string);
+
+        // Fetching more than 4 chars at one is slower, as is fetching fewer bytes
+        // Conveniently 4 chars is the UTF-8 safe number since UTF-8 has up to 6
+        // bytes per char and (6 * 4 * 3 = 72 chars per line) * =NN is 3 bytes
+        while (false !== $bytes = $this->_nextSequence()) {
+            // If we're filtering the input
+            if (isset($this->_filter)) {
+                // If we can't filter because we need more bytes
+                while ($this->_filter->shouldBuffer($bytes)) {
+                    // Then collect bytes into the buffer
+                    if (false === $moreBytes = $this->_nextSequence(1)) {
+                        break;
+                    }
+
+                    foreach ($moreBytes as $b) {
+                        $bytes[] = $b;
+                    }
+                }
+                // And filter them
+                $bytes = $this->_filter->filter($bytes);
+            }
+
+            $enc = $this->_encodeByteSequence($bytes, $size);
+
+            $i = strpos($enc, '=0D=0A');
+            $newLineLength = $lineLen + ($i === false ? $size : $i);
+
+            if ($currentLine && $newLineLength >= $thisLineLength) {
+                $lines[$lNo] = '';
+                $currentLine = &$lines[$lNo++];
+                $thisLineLength = $maxLineLength;
+                $lineLen = 0;
+            }
+
+            $currentLine .= $enc;
+
+            if ($i === false) {
+                $lineLen += $size;
+            } else {
+                // 6 is the length of '=0D=0A'.
+                $lineLen = $size - strrpos($enc, '=0D=0A') - 6;
+            }
+        }
+
+        return $this->_standardize(implode("=\r\n", $lines));
+    }
+
+    /**
+     * Updates the charset used.
+     *
+     * @param string $charset
+     */
+    public function charsetChanged($charset)
+    {
+        $this->_charStream->setCharacterSet($charset);
+    }
+
+    /**
+     * Encode the given byte array into a verbatim QP form.
+     *
+     * @param integer[] $bytes
+     * @param int       $size
+     *
+     * @return string
+     */
+    protected function _encodeByteSequence(array $bytes, &$size)
+    {
+        $ret = '';
+        $size = 0;
+        foreach ($bytes as $b) {
+            if (isset($this->_safeMap[$b])) {
+                $ret .= $this->_safeMap[$b];
+                ++$size;
+            } else {
+                $ret .= self::$_qpMap[$b];
+                $size += 3;
+            }
+        }
+
+        return $ret;
+    }
+
+    /**
+     * Get the next sequence of bytes to read from the char stream.
+     *
+     * @param int $size number of bytes to read
+     *
+     * @return integer[]
+     */
+    protected function _nextSequence($size = 4)
+    {
+        return $this->_charStream->readBytes($size);
+    }
+
+    /**
+     * Make sure CRLF is correct and HT/SPACE are in valid places.
+     *
+     * @param string $string
+     *
+     * @return string
+     */
+    protected function _standardize($string)
+    {
+        $string = str_replace(array("\t=0D=0A", ' =0D=0A', '=0D=0A'),
+            array("=09\r\n", "=20\r\n", "\r\n"), $string
+            );
+        switch ($end = ord(substr($string, -1))) {
+            case 0x09:
+            case 0x20:
+                $string = substr_replace($string, self::$_qpMap[$end], -1);
+        }
+
+        return $string;
+    }
+
+    /**
+     * Make a deep copy of object.
+     */
+    public function __clone()
+    {
+        $this->_charStream = clone $this->_charStream;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
new file mode 100644
index 000000000..b0215e883
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
@@ -0,0 +1,92 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Handles RFC 2231 specified Encoding in Swift Mailer.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Encoder_Rfc2231Encoder implements Swift_Encoder
+{
+    /**
+     * A character stream to use when reading a string as characters instead of bytes.
+     *
+     * @var Swift_CharacterStream
+     */
+    private $_charStream;
+
+    /**
+     * Creates a new Rfc2231Encoder using the given character stream instance.
+     *
+     * @param Swift_CharacterStream
+     */
+    public function __construct(Swift_CharacterStream $charStream)
+    {
+        $this->_charStream = $charStream;
+    }
+
+    /**
+     * Takes an unencoded string and produces a string encoded according to
+     * RFC 2231 from it.
+     *
+     * @param string $string
+     * @param int    $firstLineOffset
+     * @param int    $maxLineLength   optional, 0 indicates the default of 75 bytes
+     *
+     * @return string
+     */
+    public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
+    {
+        $lines = array();
+        $lineCount = 0;
+        $lines[] = '';
+        $currentLine = &$lines[$lineCount++];
+
+        if (0 >= $maxLineLength) {
+            $maxLineLength = 75;
+        }
+
+        $this->_charStream->flushContents();
+        $this->_charStream->importString($string);
+
+        $thisLineLength = $maxLineLength - $firstLineOffset;
+
+        while (false !== $char = $this->_charStream->read(4)) {
+            $encodedChar = rawurlencode($char);
+            if (0 != strlen($currentLine)
+                && strlen($currentLine.$encodedChar) > $thisLineLength) {
+                $lines[] = '';
+                $currentLine = &$lines[$lineCount++];
+                $thisLineLength = $maxLineLength;
+            }
+            $currentLine .= $encodedChar;
+        }
+
+        return implode("\r\n", $lines);
+    }
+
+    /**
+     * Updates the charset used.
+     *
+     * @param string $charset
+     */
+    public function charsetChanged($charset)
+    {
+        $this->_charStream->setCharacterSet($charset);
+    }
+
+    /**
+     * Make a deep copy of object.
+     */
+    public function __clone()
+    {
+        $this->_charStream = clone $this->_charStream;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Encoding.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Encoding.php
new file mode 100644
index 000000000..253977b60
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Encoding.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Provides quick access to each encoding type.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Encoding
+{
+    /**
+     * Get the Encoder that provides 7-bit encoding.
+     *
+     * @return Swift_Mime_ContentEncoder
+     */
+    public static function get7BitEncoding()
+    {
+        return self::_lookup('mime.7bitcontentencoder');
+    }
+
+    /**
+     * Get the Encoder that provides 8-bit encoding.
+     *
+     * @return Swift_Mime_ContentEncoder
+     */
+    public static function get8BitEncoding()
+    {
+        return self::_lookup('mime.8bitcontentencoder');
+    }
+
+    /**
+     * Get the Encoder that provides Quoted-Printable (QP) encoding.
+     *
+     * @return Swift_Mime_ContentEncoder
+     */
+    public static function getQpEncoding()
+    {
+        return self::_lookup('mime.qpcontentencoder');
+    }
+
+    /**
+     * Get the Encoder that provides Base64 encoding.
+     *
+     * @return Swift_Mime_ContentEncoder
+     */
+    public static function getBase64Encoding()
+    {
+        return self::_lookup('mime.base64contentencoder');
+    }
+
+    // -- Private Static Methods
+
+    private static function _lookup($key)
+    {
+        return Swift_DependencyContainer::getInstance()->lookup($key);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/CommandEvent.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
new file mode 100644
index 000000000..7dc381d98
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Generated when a command is sent over an SMTP connection.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Events_CommandEvent extends Swift_Events_EventObject
+{
+    /**
+     * The command sent to the server.
+     *
+     * @var string
+     */
+    private $_command;
+
+    /**
+     * An array of codes which a successful response will contain.
+     *
+     * @var integer[]
+     */
+    private $_successCodes = array();
+
+    /**
+     * Create a new CommandEvent for $source with $command.
+     *
+     * @param Swift_Transport $source
+     * @param string          $command
+     * @param array           $successCodes
+     */
+    public function __construct(Swift_Transport $source, $command, $successCodes = array())
+    {
+        parent::__construct($source);
+        $this->_command = $command;
+        $this->_successCodes = $successCodes;
+    }
+
+    /**
+     * Get the command which was sent to the server.
+     *
+     * @return string
+     */
+    public function getCommand()
+    {
+        return $this->_command;
+    }
+
+    /**
+     * Get the numeric response codes which indicate success for this command.
+     *
+     * @return integer[]
+     */
+    public function getSuccessCodes()
+    {
+        return $this->_successCodes;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/CommandListener.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/CommandListener.php
similarity index 55%
rename from lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/CommandListener.php
rename to lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/CommandListener.php
index 2fd71172f..7545404e7 100644
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/CommandListener.php
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/CommandListener.php
@@ -8,22 +8,17 @@
  * file that was distributed with this source code.
  */
 
-//@require 'Swift/Events/EventListener.php';
-//@require 'Swift/Events/CommandEvent.php';
-
 /**
  * Listens for Transports to send commands to the server.
- * @package Swift
- * @subpackage Events
+ *
  * @author Chris Corbyn
  */
 interface Swift_Events_CommandListener extends Swift_Events_EventListener
 {
-  
-  /**
-   * Invoked immediately following a command being sent.
-   * @param Swift_Events_ResponseEvent $evt
-   */
-  public function commandSent(Swift_Events_CommandEvent $evt);
-  
+    /**
+     * Invoked immediately following a command being sent.
+     *
+     * @param Swift_Events_CommandEvent $evt
+     */
+    public function commandSent(Swift_Events_CommandEvent $evt);
 }
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/Event.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/Event.php
new file mode 100644
index 000000000..720b15637
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/Event.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * The minimum interface for an Event.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_Events_Event
+{
+    /**
+     * Get the source object of this event.
+     *
+     * @return object
+     */
+    public function getSource();
+
+    /**
+     * Prevent this Event from bubbling any further up the stack.
+     *
+     * @param bool $cancel, optional
+     */
+    public function cancelBubble($cancel = true);
+
+    /**
+     * Returns true if this Event will not bubble any further up the stack.
+     *
+     * @return bool
+     */
+    public function bubbleCancelled();
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
new file mode 100644
index 000000000..aac36aaa7
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
@@ -0,0 +1,83 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Interface for the EventDispatcher which handles the event dispatching layer.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_Events_EventDispatcher
+{
+    /**
+     * Create a new SendEvent for $source and $message.
+     *
+     * @param Swift_Transport $source
+     * @param Swift_Mime_Message
+     *
+     * @return Swift_Events_SendEvent
+     */
+    public function createSendEvent(Swift_Transport $source, Swift_Mime_Message $message);
+
+    /**
+     * Create a new CommandEvent for $source and $command.
+     *
+     * @param Swift_Transport $source
+     * @param string          $command      That will be executed
+     * @param array           $successCodes That are needed
+     *
+     * @return Swift_Events_CommandEvent
+     */
+    public function createCommandEvent(Swift_Transport $source, $command, $successCodes = array());
+
+    /**
+     * Create a new ResponseEvent for $source and $response.
+     *
+     * @param Swift_Transport $source
+     * @param string          $response
+     * @param bool            $valid    If the response is valid
+     *
+     * @return Swift_Events_ResponseEvent
+     */
+    public function createResponseEvent(Swift_Transport $source, $response, $valid);
+
+    /**
+     * Create a new TransportChangeEvent for $source.
+     *
+     * @param Swift_Transport $source
+     *
+     * @return Swift_Events_TransportChangeEvent
+     */
+    public function createTransportChangeEvent(Swift_Transport $source);
+
+    /**
+     * Create a new TransportExceptionEvent for $source.
+     *
+     * @param Swift_Transport          $source
+     * @param Swift_TransportException $ex
+     *
+     * @return Swift_Events_TransportExceptionEvent
+     */
+    public function createTransportExceptionEvent(Swift_Transport $source, Swift_TransportException $ex);
+
+    /**
+     * Bind an event listener to this dispatcher.
+     *
+     * @param Swift_Events_EventListener $listener
+     */
+    public function bindEventListener(Swift_Events_EventListener $listener);
+
+    /**
+     * Dispatch the given Event to all suitable listeners.
+     *
+     * @param Swift_Events_EventObject $evt
+     * @param string                   $target method
+     */
+    public function dispatchEvent(Swift_Events_EventObject $evt, $target);
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/EventListener.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/EventListener.php
similarity index 88%
rename from lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/EventListener.php
rename to lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/EventListener.php
index 00fb799dc..512909541 100644
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/EventListener.php
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/EventListener.php
@@ -10,10 +10,9 @@
 
 /**
  * An identity interface which all EventListeners must extend.
- * @package Swift
- * @subpackage Events
+ *
  * @author Chris Corbyn
  */
 interface Swift_Events_EventListener
-{  
+{
 }
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/EventObject.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/EventObject.php
new file mode 100644
index 000000000..90694a9a6
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/EventObject.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A base Event which all Event classes inherit from.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Events_EventObject implements Swift_Events_Event
+{
+    /** The source of this Event */
+    private $_source;
+
+    /** The state of this Event (should it bubble up the stack?) */
+    private $_bubbleCancelled = false;
+
+    /**
+     * Create a new EventObject originating at $source.
+     *
+     * @param object $source
+     */
+    public function __construct($source)
+    {
+        $this->_source = $source;
+    }
+
+    /**
+     * Get the source object of this event.
+     *
+     * @return object
+     */
+    public function getSource()
+    {
+        return $this->_source;
+    }
+
+    /**
+     * Prevent this Event from bubbling any further up the stack.
+     *
+     * @param bool $cancel, optional
+     */
+    public function cancelBubble($cancel = true)
+    {
+        $this->_bubbleCancelled = $cancel;
+    }
+
+    /**
+     * Returns true if this Event will not bubble any further up the stack.
+     *
+     * @return bool
+     */
+    public function bubbleCancelled()
+    {
+        return $this->_bubbleCancelled;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
new file mode 100644
index 000000000..2e92ba940
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Generated when a response is received on a SMTP connection.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Events_ResponseEvent extends Swift_Events_EventObject
+{
+    /**
+     * The overall result.
+     *
+     * @var bool
+     */
+    private $_valid;
+
+    /**
+     * The response received from the server.
+     *
+     * @var string
+     */
+    private $_response;
+
+    /**
+     * Create a new ResponseEvent for $source and $response.
+     *
+     * @param Swift_Transport $source
+     * @param string          $response
+     * @param bool            $valid
+     */
+    public function __construct(Swift_Transport $source, $response, $valid = false)
+    {
+        parent::__construct($source);
+        $this->_response = $response;
+        $this->_valid = $valid;
+    }
+
+    /**
+     * Get the response which was received from the server.
+     *
+     * @return string
+     */
+    public function getResponse()
+    {
+        return $this->_response;
+    }
+
+    /**
+     * Get the success status of this Event.
+     *
+     * @return bool
+     */
+    public function isValid()
+    {
+        return $this->_valid;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/ResponseListener.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/ResponseListener.php
similarity index 53%
rename from lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/ResponseListener.php
rename to lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/ResponseListener.php
index 092385b28..c40919d21 100644
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/ResponseListener.php
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/ResponseListener.php
@@ -8,22 +8,17 @@
  * file that was distributed with this source code.
  */
 
-//@require 'Swift/Events/EventListener.php';
-//@require 'Swift/Events/ResponseEvent.php';
-
 /**
  * Listens for responses from a remote SMTP server.
- * @package Swift
- * @subpackage Events
+ *
  * @author Chris Corbyn
  */
 interface Swift_Events_ResponseListener extends Swift_Events_EventListener
 {
-  
-  /**
-   * Invoked immediately following a response coming back.
-   * @param Swift_Events_ResponseEvent $evt
-   */
-  public function responseReceived(Swift_Events_ResponseEvent $evt);
-  
+    /**
+     * Invoked immediately following a response coming back.
+     *
+     * @param Swift_Events_ResponseEvent $evt
+     */
+    public function responseReceived(Swift_Events_ResponseEvent $evt);
 }
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/SendEvent.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/SendEvent.php
new file mode 100644
index 000000000..10da8080f
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/SendEvent.php
@@ -0,0 +1,129 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Generated when a message is being sent.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Events_SendEvent extends Swift_Events_EventObject
+{
+    /** Sending has yet to occur */
+    const RESULT_PENDING = 0x0001;
+
+    /** Email is spooled, ready to be sent */
+    const RESULT_SPOOLED = 0x0011;
+
+    /** Sending was successful */
+    const RESULT_SUCCESS = 0x0010;
+
+    /** Sending worked, but there were some failures */
+    const RESULT_TENTATIVE = 0x0100;
+
+    /** Sending failed */
+    const RESULT_FAILED = 0x1000;
+
+    /**
+     * The Message being sent.
+     *
+     * @var Swift_Mime_Message
+     */
+    private $_message;
+
+    /**
+     * Any recipients which failed after sending.
+     *
+     * @var string[]
+     */
+    private $_failedRecipients = array();
+
+    /**
+     * The overall result as a bitmask from the class constants.
+     *
+     * @var int
+     */
+    private $_result;
+
+    /**
+     * Create a new SendEvent for $source and $message.
+     *
+     * @param Swift_Transport    $source
+     * @param Swift_Mime_Message $message
+     */
+    public function __construct(Swift_Transport $source, Swift_Mime_Message $message)
+    {
+        parent::__construct($source);
+        $this->_message = $message;
+        $this->_result = self::RESULT_PENDING;
+    }
+
+    /**
+     * Get the Transport used to send the Message.
+     *
+     * @return Swift_Transport
+     */
+    public function getTransport()
+    {
+        return $this->getSource();
+    }
+
+    /**
+     * Get the Message being sent.
+     *
+     * @return Swift_Mime_Message
+     */
+    public function getMessage()
+    {
+        return $this->_message;
+    }
+
+    /**
+     * Set the array of addresses that failed in sending.
+     *
+     * @param array $recipients
+     */
+    public function setFailedRecipients($recipients)
+    {
+        $this->_failedRecipients = $recipients;
+    }
+
+    /**
+     * Get an recipient addresses which were not accepted for delivery.
+     *
+     * @return string[]
+     */
+    public function getFailedRecipients()
+    {
+        return $this->_failedRecipients;
+    }
+
+    /**
+     * Set the result of sending.
+     *
+     * @param int $result
+     */
+    public function setResult($result)
+    {
+        $this->_result = $result;
+    }
+
+    /**
+     * Get the result of this Event.
+     *
+     * The return value is a bitmask from
+     * {@see RESULT_PENDING, RESULT_SUCCESS, RESULT_TENTATIVE, RESULT_FAILED}
+     *
+     * @return int
+     */
+    public function getResult()
+    {
+        return $this->_result;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/SendListener.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/SendListener.php
new file mode 100644
index 000000000..d922e1bfa
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/SendListener.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Listens for Messages being sent from within the Transport system.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_Events_SendListener extends Swift_Events_EventListener
+{
+    /**
+     * Invoked immediately before the Message is sent.
+     *
+     * @param Swift_Events_SendEvent $evt
+     */
+    public function beforeSendPerformed(Swift_Events_SendEvent $evt);
+
+    /**
+     * Invoked immediately after the Message is sent.
+     *
+     * @param Swift_Events_SendEvent $evt
+     */
+    public function sendPerformed(Swift_Events_SendEvent $evt);
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
new file mode 100644
index 000000000..e8aca752f
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
@@ -0,0 +1,156 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * The EventDispatcher which handles the event dispatching layer.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
+{
+    /** A map of event types to their associated listener types */
+    private $_eventMap = array();
+
+    /** Event listeners bound to this dispatcher */
+    private $_listeners = array();
+
+    /** Listeners queued to have an Event bubbled up the stack to them */
+    private $_bubbleQueue = array();
+
+    /**
+     * Create a new EventDispatcher.
+     */
+    public function __construct()
+    {
+        $this->_eventMap = array(
+            'Swift_Events_CommandEvent' => 'Swift_Events_CommandListener',
+            'Swift_Events_ResponseEvent' => 'Swift_Events_ResponseListener',
+            'Swift_Events_SendEvent' => 'Swift_Events_SendListener',
+            'Swift_Events_TransportChangeEvent' => 'Swift_Events_TransportChangeListener',
+            'Swift_Events_TransportExceptionEvent' => 'Swift_Events_TransportExceptionListener',
+            );
+    }
+
+    /**
+     * Create a new SendEvent for $source and $message.
+     *
+     * @param Swift_Transport $source
+     * @param Swift_Mime_Message
+     *
+     * @return Swift_Events_SendEvent
+     */
+    public function createSendEvent(Swift_Transport $source, Swift_Mime_Message $message)
+    {
+        return new Swift_Events_SendEvent($source, $message);
+    }
+
+    /**
+     * Create a new CommandEvent for $source and $command.
+     *
+     * @param Swift_Transport $source
+     * @param string          $command      That will be executed
+     * @param array           $successCodes That are needed
+     *
+     * @return Swift_Events_CommandEvent
+     */
+    public function createCommandEvent(Swift_Transport $source, $command, $successCodes = array())
+    {
+        return new Swift_Events_CommandEvent($source, $command, $successCodes);
+    }
+
+    /**
+     * Create a new ResponseEvent for $source and $response.
+     *
+     * @param Swift_Transport $source
+     * @param string          $response
+     * @param bool            $valid    If the response is valid
+     *
+     * @return Swift_Events_ResponseEvent
+     */
+    public function createResponseEvent(Swift_Transport $source, $response, $valid)
+    {
+        return new Swift_Events_ResponseEvent($source, $response, $valid);
+    }
+
+    /**
+     * Create a new TransportChangeEvent for $source.
+     *
+     * @param Swift_Transport $source
+     *
+     * @return Swift_Events_TransportChangeEvent
+     */
+    public function createTransportChangeEvent(Swift_Transport $source)
+    {
+        return new Swift_Events_TransportChangeEvent($source);
+    }
+
+    /**
+     * Create a new TransportExceptionEvent for $source.
+     *
+     * @param Swift_Transport          $source
+     * @param Swift_TransportException $ex
+     *
+     * @return Swift_Events_TransportExceptionEvent
+     */
+    public function createTransportExceptionEvent(Swift_Transport $source, Swift_TransportException $ex)
+    {
+        return new Swift_Events_TransportExceptionEvent($source, $ex);
+    }
+
+    /**
+     * Bind an event listener to this dispatcher.
+     *
+     * @param Swift_Events_EventListener $listener
+     */
+    public function bindEventListener(Swift_Events_EventListener $listener)
+    {
+        foreach ($this->_listeners as $l) {
+            // Already loaded
+            if ($l === $listener) {
+                return;
+            }
+        }
+        $this->_listeners[] = $listener;
+    }
+
+    /**
+     * Dispatch the given Event to all suitable listeners.
+     *
+     * @param Swift_Events_EventObject $evt
+     * @param string                   $target method
+     */
+    public function dispatchEvent(Swift_Events_EventObject $evt, $target)
+    {
+        $this->_prepareBubbleQueue($evt);
+        $this->_bubble($evt, $target);
+    }
+
+    /** Queue listeners on a stack ready for $evt to be bubbled up it */
+    private function _prepareBubbleQueue(Swift_Events_EventObject $evt)
+    {
+        $this->_bubbleQueue = array();
+        $evtClass = get_class($evt);
+        foreach ($this->_listeners as $listener) {
+            if (array_key_exists($evtClass, $this->_eventMap)
+                && ($listener instanceof $this->_eventMap[$evtClass])) {
+                $this->_bubbleQueue[] = $listener;
+            }
+        }
+    }
+
+    /** Bubble $evt up the stack calling $target() on each listener */
+    private function _bubble(Swift_Events_EventObject $evt, $target)
+    {
+        if (!$evt->bubbleCancelled() && $listener = array_shift($this->_bubbleQueue)) {
+            $listener->$target($evt);
+            $this->_bubble($evt, $target);
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/TransportChangeEvent.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/TransportChangeEvent.php
similarity index 63%
rename from lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/TransportChangeEvent.php
rename to lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/TransportChangeEvent.php
index f069a4c17..a8972fda9 100644
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Events/TransportChangeEvent.php
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/TransportChangeEvent.php
@@ -8,24 +8,20 @@
  * file that was distributed with this source code.
  */
 
-//@require 'Swift/Events/EventObject.php';
-
 /**
  * Generated when the state of a Transport is changed (i.e. stopped/started).
- * @package Swift
- * @subpackage Events
+ *
  * @author Chris Corbyn
  */
 class Swift_Events_TransportChangeEvent extends Swift_Events_EventObject
 {
-  
-  /**
-   * Get the Transport.
-   * @return Swift_Transport
-   */
-  public function getTransport()
-  {
-    return $this->getSource();
-  }
-  
-}
\ No newline at end of file
+    /**
+     * Get the Transport.
+     *
+     * @return Swift_Transport
+     */
+    public function getTransport()
+    {
+        return $this->getSource();
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php
new file mode 100644
index 000000000..253165de8
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Listens for changes within the Transport system.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_Events_TransportChangeListener extends Swift_Events_EventListener
+{
+    /**
+     * Invoked just before a Transport is started.
+     *
+     * @param Swift_Events_TransportChangeEvent $evt
+     */
+    public function beforeTransportStarted(Swift_Events_TransportChangeEvent $evt);
+
+    /**
+     * Invoked immediately after the Transport is started.
+     *
+     * @param Swift_Events_TransportChangeEvent $evt
+     */
+    public function transportStarted(Swift_Events_TransportChangeEvent $evt);
+
+    /**
+     * Invoked just before a Transport is stopped.
+     *
+     * @param Swift_Events_TransportChangeEvent $evt
+     */
+    public function beforeTransportStopped(Swift_Events_TransportChangeEvent $evt);
+
+    /**
+     * Invoked immediately after the Transport is stopped.
+     *
+     * @param Swift_Events_TransportChangeEvent $evt
+     */
+    public function transportStopped(Swift_Events_TransportChangeEvent $evt);
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php
new file mode 100644
index 000000000..f87154fb9
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Generated when a TransportException is thrown from the Transport system.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Events_TransportExceptionEvent extends Swift_Events_EventObject
+{
+    /**
+     * The Exception thrown.
+     *
+     * @var Swift_TransportException
+     */
+    private $_exception;
+
+    /**
+     * Create a new TransportExceptionEvent for $transport.
+     *
+     * @param Swift_Transport          $transport
+     * @param Swift_TransportException $ex
+     */
+    public function __construct(Swift_Transport $transport, Swift_TransportException $ex)
+    {
+        parent::__construct($transport);
+        $this->_exception = $ex;
+    }
+
+    /**
+     * Get the TransportException thrown.
+     *
+     * @return Swift_TransportException
+     */
+    public function getException()
+    {
+        return $this->_exception;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php
new file mode 100644
index 000000000..cc3c09937
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Listens for Exceptions thrown from within the Transport system.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_Events_TransportExceptionListener extends Swift_Events_EventListener
+{
+    /**
+     * Invoked as a TransportException is thrown in the Transport system.
+     *
+     * @param Swift_Events_TransportExceptionEvent $evt
+     */
+    public function exceptionThrown(Swift_Events_TransportExceptionEvent $evt);
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/FailoverTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/FailoverTransport.php
new file mode 100644
index 000000000..53f277da0
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/FailoverTransport.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Contains a list of redundant Transports so when one fails, the next is used.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_FailoverTransport extends Swift_Transport_FailoverTransport
+{
+    /**
+     * Creates a new FailoverTransport with $transports.
+     *
+     * @param Swift_Transport[] $transports
+     */
+    public function __construct($transports = array())
+    {
+        call_user_func_array(
+            array($this, 'Swift_Transport_FailoverTransport::__construct'),
+            Swift_DependencyContainer::getInstance()
+                ->createDependenciesFor('transport.failover')
+            );
+
+        $this->setTransports($transports);
+    }
+
+    /**
+     * Create a new FailoverTransport instance.
+     *
+     * @param Swift_Transport[] $transports
+     *
+     * @return Swift_FailoverTransport
+     */
+    public static function newInstance($transports = array())
+    {
+        return new self($transports);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/FileSpool.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/FileSpool.php
new file mode 100644
index 000000000..c82c5dbf1
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/FileSpool.php
@@ -0,0 +1,208 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2009 Fabien Potencier <fabien.potencier@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Stores Messages on the filesystem.
+ *
+ * @author Fabien Potencier
+ * @author Xavier De Cock <xdecock@gmail.com>
+ */
+class Swift_FileSpool extends Swift_ConfigurableSpool
+{
+    /** The spool directory */
+    private $_path;
+
+    /**
+     * File WriteRetry Limit.
+     *
+     * @var int
+     */
+    private $_retryLimit = 10;
+
+    /**
+     * Create a new FileSpool.
+     *
+     * @param string $path
+     *
+     * @throws Swift_IoException
+     */
+    public function __construct($path)
+    {
+        $this->_path = $path;
+
+        if (!file_exists($this->_path)) {
+            if (!mkdir($this->_path, 0777, true)) {
+                throw new Swift_IoException(sprintf('Unable to create path "%s".', $this->_path));
+            }
+        }
+    }
+
+    /**
+     * Tests if this Spool mechanism has started.
+     *
+     * @return bool
+     */
+    public function isStarted()
+    {
+        return true;
+    }
+
+    /**
+     * Starts this Spool mechanism.
+     */
+    public function start()
+    {
+    }
+
+    /**
+     * Stops this Spool mechanism.
+     */
+    public function stop()
+    {
+    }
+
+    /**
+     * Allow to manage the enqueuing retry limit.
+     *
+     * Default, is ten and allows over 64^20 different fileNames
+     *
+     * @param int $limit
+     */
+    public function setRetryLimit($limit)
+    {
+        $this->_retryLimit = $limit;
+    }
+
+    /**
+     * Queues a message.
+     *
+     * @param Swift_Mime_Message $message The message to store
+     *
+     * @throws Swift_IoException
+     *
+     * @return bool
+     */
+    public function queueMessage(Swift_Mime_Message $message)
+    {
+        $ser = serialize($message);
+        $fileName = $this->_path.'/'.$this->getRandomString(10);
+        for ($i = 0; $i < $this->_retryLimit; ++$i) {
+            /* We try an exclusive creation of the file. This is an atomic operation, it avoid locking mechanism */
+            $fp = @fopen($fileName.'.message', 'x');
+            if (false !== $fp) {
+                if (false === fwrite($fp, $ser)) {
+                    return false;
+                }
+
+                return fclose($fp);
+            } else {
+                /* The file already exists, we try a longer fileName */
+                $fileName .= $this->getRandomString(1);
+            }
+        }
+
+        throw new Swift_IoException(sprintf('Unable to create a file for enqueuing Message in "%s".', $this->_path));
+    }
+
+    /**
+     * Execute a recovery if for any reason a process is sending for too long.
+     *
+     * @param int $timeout in second Defaults is for very slow smtp responses
+     */
+    public function recover($timeout = 900)
+    {
+        foreach (new DirectoryIterator($this->_path) as $file) {
+            $file = $file->getRealPath();
+
+            if (substr($file, -16) == '.message.sending') {
+                $lockedtime = filectime($file);
+                if ((time() - $lockedtime) > $timeout) {
+                    rename($file, substr($file, 0, -8));
+                }
+            }
+        }
+    }
+
+    /**
+     * Sends messages using the given transport instance.
+     *
+     * @param Swift_Transport $transport        A transport instance
+     * @param string[]        $failedRecipients An array of failures by-reference
+     *
+     * @return int The number of sent e-mail's
+     */
+    public function flushQueue(Swift_Transport $transport, &$failedRecipients = null)
+    {
+        $directoryIterator = new DirectoryIterator($this->_path);
+
+        /* Start the transport only if there are queued files to send */
+        if (!$transport->isStarted()) {
+            foreach ($directoryIterator as $file) {
+                if (substr($file->getRealPath(), -8) == '.message') {
+                    $transport->start();
+                    break;
+                }
+            }
+        }
+
+        $failedRecipients = (array) $failedRecipients;
+        $count = 0;
+        $time = time();
+        foreach ($directoryIterator as $file) {
+            $file = $file->getRealPath();
+
+            if (substr($file, -8) != '.message') {
+                continue;
+            }
+
+            /* We try a rename, it's an atomic operation, and avoid locking the file */
+            if (rename($file, $file.'.sending')) {
+                $message = unserialize(file_get_contents($file.'.sending'));
+
+                $count += $transport->send($message, $failedRecipients);
+
+                unlink($file.'.sending');
+            } else {
+                /* This message has just been catched by another process */
+                continue;
+            }
+
+            if ($this->getMessageLimit() && $count >= $this->getMessageLimit()) {
+                break;
+            }
+
+            if ($this->getTimeLimit() && (time() - $time) >= $this->getTimeLimit()) {
+                break;
+            }
+        }
+
+        return $count;
+    }
+
+    /**
+     * Returns a random string needed to generate a fileName for the queue.
+     *
+     * @param int $count
+     *
+     * @return string
+     */
+    protected function getRandomString($count)
+    {
+        // This string MUST stay FS safe, avoid special chars
+        $base = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-';
+        $ret = '';
+        $strlen = strlen($base);
+        for ($i = 0; $i < $count; ++$i) {
+            $ret .= $base[((int) rand(0, $strlen - 1))];
+        }
+
+        return $ret;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/FileStream.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/FileStream.php
similarity index 65%
rename from lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/FileStream.php
rename to lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/FileStream.php
index a7f894dcd..0b24db1ce 100644
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/FileStream.php
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/FileStream.php
@@ -8,21 +8,17 @@
  * file that was distributed with this source code.
  */
 
-//@require 'Swift/OutputByteStream.php';
-
 /**
  * An OutputByteStream which specifically reads from a file.
- * @package Swift
- * @subpackage ByteStream
+ *
  * @author Chris Corbyn
  */
 interface Swift_FileStream extends Swift_OutputByteStream
 {
-  
-  /**
-   * Get the complete path to the file.
-   * @return string
-   */
-  public function getPath();
-  
+    /**
+     * Get the complete path to the file.
+     *
+     * @return string
+     */
+    public function getPath();
 }
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Filterable.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Filterable.php
new file mode 100644
index 000000000..6b75b5274
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Filterable.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Allows StreamFilters to operate on a stream.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_Filterable
+{
+    /**
+     * Add a new StreamFilter, referenced by $key.
+     *
+     * @param Swift_StreamFilter $filter
+     * @param string             $key
+     */
+    public function addFilter(Swift_StreamFilter $filter, $key);
+
+    /**
+     * Remove an existing filter using $key.
+     *
+     * @param string $key
+     */
+    public function removeFilter($key);
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Image.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Image.php
new file mode 100644
index 000000000..25f5f1b61
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Image.php
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An image, embedded in a multipart message.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Image extends Swift_EmbeddedFile
+{
+    /**
+     * Create a new EmbeddedFile.
+     *
+     * Details may be optionally provided to the constructor.
+     *
+     * @param string|Swift_OutputByteStream $data
+     * @param string                        $filename
+     * @param string                        $contentType
+     */
+    public function __construct($data = null, $filename = null, $contentType = null)
+    {
+        parent::__construct($data, $filename, $contentType);
+    }
+
+    /**
+     * Create a new Image.
+     *
+     * @param string|Swift_OutputByteStream $data
+     * @param string                        $filename
+     * @param string                        $contentType
+     *
+     * @return Swift_Image
+     */
+    public static function newInstance($data = null, $filename = null, $contentType = null)
+    {
+        return new self($data, $filename, $contentType);
+    }
+
+    /**
+     * Create a new Image from a filesystem path.
+     *
+     * @param string $path
+     *
+     * @return Swift_Image
+     */
+    public static function fromPath($path)
+    {
+        $image = self::newInstance()->setFile(
+            new Swift_ByteStream_FileByteStream($path)
+            );
+
+        return $image;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/InputByteStream.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/InputByteStream.php
new file mode 100644
index 000000000..56efc7593
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/InputByteStream.php
@@ -0,0 +1,75 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An abstract means of writing data.
+ *
+ * Classes implementing this interface may use a subsystem which requires less
+ * memory than working with large strings of data.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_InputByteStream
+{
+    /**
+     * Writes $bytes to the end of the stream.
+     *
+     * Writing may not happen immediately if the stream chooses to buffer.  If
+     * you want to write these bytes with immediate effect, call {@link commit()}
+     * after calling write().
+     *
+     * This method returns the sequence ID of the write (i.e. 1 for first, 2 for
+     * second, etc etc).
+     *
+     * @param string $bytes
+     *
+     * @throws Swift_IoException
+     *
+     * @return int
+     */
+    public function write($bytes);
+
+    /**
+     * For any bytes that are currently buffered inside the stream, force them
+     * off the buffer.
+     *
+     * @throws Swift_IoException
+     */
+    public function commit();
+
+    /**
+     * Attach $is to this stream.
+     *
+     * The stream acts as an observer, receiving all data that is written.
+     * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
+     *
+     * @param Swift_InputByteStream $is
+     */
+    public function bind(Swift_InputByteStream $is);
+
+    /**
+     * Remove an already bound stream.
+     *
+     * If $is is not bound, no errors will be raised.
+     * If the stream currently has any buffered data it will be written to $is
+     * before unbinding occurs.
+     *
+     * @param Swift_InputByteStream $is
+     */
+    public function unbind(Swift_InputByteStream $is);
+
+    /**
+     * Flush the contents of the stream (empty it) and set the internal pointer
+     * to the beginning.
+     *
+     * @throws Swift_IoException
+     */
+    public function flushBuffers();
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/IoException.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/IoException.php
similarity index 50%
rename from lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/IoException.php
rename to lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/IoException.php
index 88a5b0dd6..c405f352b 100644
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/IoException.php
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/IoException.php
@@ -8,23 +8,22 @@
  * file that was distributed with this source code.
  */
 
-//@require 'Swift/SwiftException.php';
-
 /**
  * I/O Exception class.
- * @package Swift
+ *
  * @author Chris Corbyn
  */
 class Swift_IoException extends Swift_SwiftException
 {
-  
-  /**
-   * Create a new IoException with $message.
-   * @param string $message
-   */
-  public function __construct($message)
-  {
-    parent::__construct($message);
-  }
-  
+    /**
+     * Create a new IoException with $message.
+     *
+     * @param string    $message
+     * @param int       $code
+     * @param Exception $previous
+     */
+    public function __construct($message, $code = 0, Exception $previous = null)
+    {
+        parent::__construct($message, $code, $previous);
+    }
 }
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/KeyCache.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/KeyCache.php
new file mode 100644
index 000000000..cd6f786df
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/KeyCache.php
@@ -0,0 +1,105 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Provides a mechanism for storing data using two keys.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_KeyCache
+{
+    /** Mode for replacing existing cached data */
+    const MODE_WRITE = 1;
+
+    /** Mode for appending data to the end of existing cached data */
+    const MODE_APPEND = 2;
+
+    /**
+     * Set a string into the cache under $itemKey for the namespace $nsKey.
+     *
+     * @see MODE_WRITE, MODE_APPEND
+     *
+     * @param string $nsKey
+     * @param string $itemKey
+     * @param string $string
+     * @param int    $mode
+     */
+    public function setString($nsKey, $itemKey, $string, $mode);
+
+    /**
+     * Set a ByteStream into the cache under $itemKey for the namespace $nsKey.
+     *
+     * @see MODE_WRITE, MODE_APPEND
+     *
+     * @param string                 $nsKey
+     * @param string                 $itemKey
+     * @param Swift_OutputByteStream $os
+     * @param int                    $mode
+     */
+    public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os, $mode);
+
+    /**
+     * Provides a ByteStream which when written to, writes data to $itemKey.
+     *
+     * NOTE: The stream will always write in append mode.
+     * If the optional third parameter is passed all writes will go through $is.
+     *
+     * @param string                $nsKey
+     * @param string                $itemKey
+     * @param Swift_InputByteStream $is      optional input stream
+     *
+     * @return Swift_InputByteStream
+     */
+    public function getInputByteStream($nsKey, $itemKey, Swift_InputByteStream $is = null);
+
+    /**
+     * Get data back out of the cache as a string.
+     *
+     * @param string $nsKey
+     * @param string $itemKey
+     *
+     * @return string
+     */
+    public function getString($nsKey, $itemKey);
+
+    /**
+     * Get data back out of the cache as a ByteStream.
+     *
+     * @param string                $nsKey
+     * @param string                $itemKey
+     * @param Swift_InputByteStream $is      stream to write the data to
+     */
+    public function exportToByteStream($nsKey, $itemKey, Swift_InputByteStream $is);
+
+    /**
+     * Check if the given $itemKey exists in the namespace $nsKey.
+     *
+     * @param string $nsKey
+     * @param string $itemKey
+     *
+     * @return bool
+     */
+    public function hasKey($nsKey, $itemKey);
+
+    /**
+     * Clear data for $itemKey in the namespace $nsKey if it exists.
+     *
+     * @param string $nsKey
+     * @param string $itemKey
+     */
+    public function clearKey($nsKey, $itemKey);
+
+    /**
+     * Clear all data in the namespace $nsKey if it exists.
+     *
+     * @param string $nsKey
+     */
+    public function clearAll($nsKey);
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
new file mode 100644
index 000000000..b37f07f74
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
@@ -0,0 +1,206 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A basic KeyCache backed by an array.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
+{
+    /**
+     * Cache contents.
+     *
+     * @var array
+     */
+    private $_contents = array();
+
+    /**
+     * An InputStream for cloning.
+     *
+     * @var Swift_KeyCache_KeyCacheInputStream
+     */
+    private $_stream;
+
+    /**
+     * Create a new ArrayKeyCache with the given $stream for cloning to make
+     * InputByteStreams.
+     *
+     * @param Swift_KeyCache_KeyCacheInputStream $stream
+     */
+    public function __construct(Swift_KeyCache_KeyCacheInputStream $stream)
+    {
+        $this->_stream = $stream;
+    }
+
+    /**
+     * Set a string into the cache under $itemKey for the namespace $nsKey.
+     *
+     * @see MODE_WRITE, MODE_APPEND
+     *
+     * @param string $nsKey
+     * @param string $itemKey
+     * @param string $string
+     * @param int    $mode
+     */
+    public function setString($nsKey, $itemKey, $string, $mode)
+    {
+        $this->_prepareCache($nsKey);
+        switch ($mode) {
+            case self::MODE_WRITE:
+                $this->_contents[$nsKey][$itemKey] = $string;
+                break;
+            case self::MODE_APPEND:
+                if (!$this->hasKey($nsKey, $itemKey)) {
+                    $this->_contents[$nsKey][$itemKey] = '';
+                }
+                $this->_contents[$nsKey][$itemKey] .= $string;
+                break;
+            default:
+                throw new Swift_SwiftException(
+                    'Invalid mode ['.$mode.'] used to set nsKey='.
+                    $nsKey.', itemKey='.$itemKey
+                    );
+        }
+    }
+
+    /**
+     * Set a ByteStream into the cache under $itemKey for the namespace $nsKey.
+     *
+     * @see MODE_WRITE, MODE_APPEND
+     *
+     * @param string                 $nsKey
+     * @param string                 $itemKey
+     * @param Swift_OutputByteStream $os
+     * @param int                    $mode
+     */
+    public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os, $mode)
+    {
+        $this->_prepareCache($nsKey);
+        switch ($mode) {
+            case self::MODE_WRITE:
+                $this->clearKey($nsKey, $itemKey);
+            case self::MODE_APPEND:
+                if (!$this->hasKey($nsKey, $itemKey)) {
+                    $this->_contents[$nsKey][$itemKey] = '';
+                }
+                while (false !== $bytes = $os->read(8192)) {
+                    $this->_contents[$nsKey][$itemKey] .= $bytes;
+                }
+                break;
+            default:
+                throw new Swift_SwiftException(
+                    'Invalid mode ['.$mode.'] used to set nsKey='.
+                    $nsKey.', itemKey='.$itemKey
+                    );
+        }
+    }
+
+    /**
+     * Provides a ByteStream which when written to, writes data to $itemKey.
+     *
+     * NOTE: The stream will always write in append mode.
+     *
+     * @param string                $nsKey
+     * @param string                $itemKey
+     * @param Swift_InputByteStream $writeThrough
+     *
+     * @return Swift_InputByteStream
+     */
+    public function getInputByteStream($nsKey, $itemKey, Swift_InputByteStream $writeThrough = null)
+    {
+        $is = clone $this->_stream;
+        $is->setKeyCache($this);
+        $is->setNsKey($nsKey);
+        $is->setItemKey($itemKey);
+        if (isset($writeThrough)) {
+            $is->setWriteThroughStream($writeThrough);
+        }
+
+        return $is;
+    }
+
+    /**
+     * Get data back out of the cache as a string.
+     *
+     * @param string $nsKey
+     * @param string $itemKey
+     *
+     * @return string
+     */
+    public function getString($nsKey, $itemKey)
+    {
+        $this->_prepareCache($nsKey);
+        if ($this->hasKey($nsKey, $itemKey)) {
+            return $this->_contents[$nsKey][$itemKey];
+        }
+    }
+
+    /**
+     * Get data back out of the cache as a ByteStream.
+     *
+     * @param string                $nsKey
+     * @param string                $itemKey
+     * @param Swift_InputByteStream $is      to write the data to
+     */
+    public function exportToByteStream($nsKey, $itemKey, Swift_InputByteStream $is)
+    {
+        $this->_prepareCache($nsKey);
+        $is->write($this->getString($nsKey, $itemKey));
+    }
+
+    /**
+     * Check if the given $itemKey exists in the namespace $nsKey.
+     *
+     * @param string $nsKey
+     * @param string $itemKey
+     *
+     * @return bool
+     */
+    public function hasKey($nsKey, $itemKey)
+    {
+        $this->_prepareCache($nsKey);
+
+        return array_key_exists($itemKey, $this->_contents[$nsKey]);
+    }
+
+    /**
+     * Clear data for $itemKey in the namespace $nsKey if it exists.
+     *
+     * @param string $nsKey
+     * @param string $itemKey
+     */
+    public function clearKey($nsKey, $itemKey)
+    {
+        unset($this->_contents[$nsKey][$itemKey]);
+    }
+
+    /**
+     * Clear all data in the namespace $nsKey if it exists.
+     *
+     * @param string $nsKey
+     */
+    public function clearAll($nsKey)
+    {
+        unset($this->_contents[$nsKey]);
+    }
+
+    /**
+     * Initialize the namespace of $nsKey if needed.
+     *
+     * @param string $nsKey
+     */
+    private function _prepareCache($nsKey)
+    {
+        if (!array_key_exists($nsKey, $this->_contents)) {
+            $this->_contents[$nsKey] = array();
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
new file mode 100644
index 000000000..453f50a15
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
@@ -0,0 +1,321 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A KeyCache which streams to and from disk.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
+{
+    /** Signal to place pointer at start of file */
+    const POSITION_START = 0;
+
+    /** Signal to place pointer at end of file */
+    const POSITION_END = 1;
+
+    /** Signal to leave pointer in whatever position it currently is */
+    const POSITION_CURRENT = 2;
+
+    /**
+     * An InputStream for cloning.
+     *
+     * @var Swift_KeyCache_KeyCacheInputStream
+     */
+    private $_stream;
+
+    /**
+     * A path to write to.
+     *
+     * @var string
+     */
+    private $_path;
+
+    /**
+     * Stored keys.
+     *
+     * @var array
+     */
+    private $_keys = array();
+
+    /**
+     * Will be true if magic_quotes_runtime is turned on.
+     *
+     * @var bool
+     */
+    private $_quotes = false;
+
+    /**
+     * Create a new DiskKeyCache with the given $stream for cloning to make
+     * InputByteStreams, and the given $path to save to.
+     *
+     * @param Swift_KeyCache_KeyCacheInputStream $stream
+     * @param string                             $path   to save to
+     */
+    public function __construct(Swift_KeyCache_KeyCacheInputStream $stream, $path)
+    {
+        $this->_stream = $stream;
+        $this->_path = $path;
+
+        if (function_exists('get_magic_quotes_runtime') && @get_magic_quotes_runtime() == 1) {
+            $this->_quotes = true;
+        }
+    }
+
+    /**
+     * Set a string into the cache under $itemKey for the namespace $nsKey.
+     *
+     * @see MODE_WRITE, MODE_APPEND
+     *
+     * @param string $nsKey
+     * @param string $itemKey
+     * @param string $string
+     * @param int    $mode
+     *
+     * @throws Swift_IoException
+     */
+    public function setString($nsKey, $itemKey, $string, $mode)
+    {
+        $this->_prepareCache($nsKey);
+        switch ($mode) {
+            case self::MODE_WRITE:
+                $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_START);
+                break;
+            case self::MODE_APPEND:
+                $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_END);
+                break;
+            default:
+                throw new Swift_SwiftException(
+                    'Invalid mode ['.$mode.'] used to set nsKey='.
+                    $nsKey.', itemKey='.$itemKey
+                    );
+                break;
+        }
+        fwrite($fp, $string);
+        $this->_freeHandle($nsKey, $itemKey);
+    }
+
+    /**
+     * Set a ByteStream into the cache under $itemKey for the namespace $nsKey.
+     *
+     * @see MODE_WRITE, MODE_APPEND
+     *
+     * @param string                 $nsKey
+     * @param string                 $itemKey
+     * @param Swift_OutputByteStream $os
+     * @param int                    $mode
+     *
+     * @throws Swift_IoException
+     */
+    public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os, $mode)
+    {
+        $this->_prepareCache($nsKey);
+        switch ($mode) {
+            case self::MODE_WRITE:
+                $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_START);
+                break;
+            case self::MODE_APPEND:
+                $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_END);
+                break;
+            default:
+                throw new Swift_SwiftException(
+                    'Invalid mode ['.$mode.'] used to set nsKey='.
+                    $nsKey.', itemKey='.$itemKey
+                    );
+                break;
+        }
+        while (false !== $bytes = $os->read(8192)) {
+            fwrite($fp, $bytes);
+        }
+        $this->_freeHandle($nsKey, $itemKey);
+    }
+
+    /**
+     * Provides a ByteStream which when written to, writes data to $itemKey.
+     *
+     * NOTE: The stream will always write in append mode.
+     *
+     * @param string                $nsKey
+     * @param string                $itemKey
+     * @param Swift_InputByteStream $writeThrough
+     *
+     * @return Swift_InputByteStream
+     */
+    public function getInputByteStream($nsKey, $itemKey, Swift_InputByteStream $writeThrough = null)
+    {
+        $is = clone $this->_stream;
+        $is->setKeyCache($this);
+        $is->setNsKey($nsKey);
+        $is->setItemKey($itemKey);
+        if (isset($writeThrough)) {
+            $is->setWriteThroughStream($writeThrough);
+        }
+
+        return $is;
+    }
+
+    /**
+     * Get data back out of the cache as a string.
+     *
+     * @param string $nsKey
+     * @param string $itemKey
+     *
+     * @throws Swift_IoException
+     *
+     * @return string
+     */
+    public function getString($nsKey, $itemKey)
+    {
+        $this->_prepareCache($nsKey);
+        if ($this->hasKey($nsKey, $itemKey)) {
+            $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_START);
+            if ($this->_quotes) {
+                ini_set('magic_quotes_runtime', 0);
+            }
+            $str = '';
+            while (!feof($fp) && false !== $bytes = fread($fp, 8192)) {
+                $str .= $bytes;
+            }
+            if ($this->_quotes) {
+                ini_set('magic_quotes_runtime', 1);
+            }
+            $this->_freeHandle($nsKey, $itemKey);
+
+            return $str;
+        }
+    }
+
+    /**
+     * Get data back out of the cache as a ByteStream.
+     *
+     * @param string                $nsKey
+     * @param string                $itemKey
+     * @param Swift_InputByteStream $is      to write the data to
+     */
+    public function exportToByteStream($nsKey, $itemKey, Swift_InputByteStream $is)
+    {
+        if ($this->hasKey($nsKey, $itemKey)) {
+            $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_START);
+            if ($this->_quotes) {
+                ini_set('magic_quotes_runtime', 0);
+            }
+            while (!feof($fp) && false !== $bytes = fread($fp, 8192)) {
+                $is->write($bytes);
+            }
+            if ($this->_quotes) {
+                ini_set('magic_quotes_runtime', 1);
+            }
+            $this->_freeHandle($nsKey, $itemKey);
+        }
+    }
+
+    /**
+     * Check if the given $itemKey exists in the namespace $nsKey.
+     *
+     * @param string $nsKey
+     * @param string $itemKey
+     *
+     * @return bool
+     */
+    public function hasKey($nsKey, $itemKey)
+    {
+        return is_file($this->_path.'/'.$nsKey.'/'.$itemKey);
+    }
+
+    /**
+     * Clear data for $itemKey in the namespace $nsKey if it exists.
+     *
+     * @param string $nsKey
+     * @param string $itemKey
+     */
+    public function clearKey($nsKey, $itemKey)
+    {
+        if ($this->hasKey($nsKey, $itemKey)) {
+            $this->_freeHandle($nsKey, $itemKey);
+            unlink($this->_path.'/'.$nsKey.'/'.$itemKey);
+        }
+    }
+
+    /**
+     * Clear all data in the namespace $nsKey if it exists.
+     *
+     * @param string $nsKey
+     */
+    public function clearAll($nsKey)
+    {
+        if (array_key_exists($nsKey, $this->_keys)) {
+            foreach ($this->_keys[$nsKey] as $itemKey => $null) {
+                $this->clearKey($nsKey, $itemKey);
+            }
+            if (is_dir($this->_path.'/'.$nsKey)) {
+                rmdir($this->_path.'/'.$nsKey);
+            }
+            unset($this->_keys[$nsKey]);
+        }
+    }
+
+    /**
+     * Initialize the namespace of $nsKey if needed.
+     *
+     * @param string $nsKey
+     */
+    private function _prepareCache($nsKey)
+    {
+        $cacheDir = $this->_path.'/'.$nsKey;
+        if (!is_dir($cacheDir)) {
+            if (!mkdir($cacheDir)) {
+                throw new Swift_IoException('Failed to create cache directory '.$cacheDir);
+            }
+            $this->_keys[$nsKey] = array();
+        }
+    }
+
+    /**
+     * Get a file handle on the cache item.
+     *
+     * @param string $nsKey
+     * @param string $itemKey
+     * @param int    $position
+     *
+     * @return resource
+     */
+    private function _getHandle($nsKey, $itemKey, $position)
+    {
+        if (!isset($this->_keys[$nsKey][$itemKey])) {
+            $openMode = $this->hasKey($nsKey, $itemKey) ? 'r+b' : 'w+b';
+            $fp = fopen($this->_path.'/'.$nsKey.'/'.$itemKey, $openMode);
+            $this->_keys[$nsKey][$itemKey] = $fp;
+        }
+        if (self::POSITION_START == $position) {
+            fseek($this->_keys[$nsKey][$itemKey], 0, SEEK_SET);
+        } elseif (self::POSITION_END == $position) {
+            fseek($this->_keys[$nsKey][$itemKey], 0, SEEK_END);
+        }
+
+        return $this->_keys[$nsKey][$itemKey];
+    }
+
+    private function _freeHandle($nsKey, $itemKey)
+    {
+        $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_CURRENT);
+        fclose($fp);
+        $this->_keys[$nsKey][$itemKey] = null;
+    }
+
+    /**
+     * Destructor.
+     */
+    public function __destruct()
+    {
+        foreach ($this->_keys as $nsKey => $null) {
+            $this->clearAll($nsKey);
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php
new file mode 100644
index 000000000..af80bdca6
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Writes data to a KeyCache using a stream.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_KeyCache_KeyCacheInputStream extends Swift_InputByteStream
+{
+    /**
+     * Set the KeyCache to wrap.
+     *
+     * @param Swift_KeyCache $keyCache
+     */
+    public function setKeyCache(Swift_KeyCache $keyCache);
+
+    /**
+     * Set the nsKey which will be written to.
+     *
+     * @param string $nsKey
+     */
+    public function setNsKey($nsKey);
+
+    /**
+     * Set the itemKey which will be written to.
+     *
+     * @param string $itemKey
+     */
+    public function setItemKey($itemKey);
+
+    /**
+     * Specify a stream to write through for each write().
+     *
+     * @param Swift_InputByteStream $is
+     */
+    public function setWriteThroughStream(Swift_InputByteStream $is);
+
+    /**
+     * Any implementation should be cloneable, allowing the clone to access a
+     * separate $nsKey and $itemKey.
+     */
+    public function __clone();
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
new file mode 100644
index 000000000..4efe78564
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
@@ -0,0 +1,115 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A null KeyCache that does not cache at all.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_KeyCache_NullKeyCache implements Swift_KeyCache
+{
+    /**
+     * Set a string into the cache under $itemKey for the namespace $nsKey.
+     *
+     * @see MODE_WRITE, MODE_APPEND
+     *
+     * @param string $nsKey
+     * @param string $itemKey
+     * @param string $string
+     * @param int    $mode
+     */
+    public function setString($nsKey, $itemKey, $string, $mode)
+    {
+    }
+
+    /**
+     * Set a ByteStream into the cache under $itemKey for the namespace $nsKey.
+     *
+     * @see MODE_WRITE, MODE_APPEND
+     *
+     * @param string                 $nsKey
+     * @param string                 $itemKey
+     * @param Swift_OutputByteStream $os
+     * @param int                    $mode
+     */
+    public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os, $mode)
+    {
+    }
+
+    /**
+     * Provides a ByteStream which when written to, writes data to $itemKey.
+     *
+     * NOTE: The stream will always write in append mode.
+     *
+     * @param string                $nsKey
+     * @param string                $itemKey
+     * @param Swift_InputByteStream $writeThrough
+     *
+     * @return Swift_InputByteStream
+     */
+    public function getInputByteStream($nsKey, $itemKey, Swift_InputByteStream $writeThrough = null)
+    {
+    }
+
+    /**
+     * Get data back out of the cache as a string.
+     *
+     * @param string $nsKey
+     * @param string $itemKey
+     *
+     * @return string
+     */
+    public function getString($nsKey, $itemKey)
+    {
+    }
+
+    /**
+     * Get data back out of the cache as a ByteStream.
+     *
+     * @param string                $nsKey
+     * @param string                $itemKey
+     * @param Swift_InputByteStream $is      to write the data to
+     */
+    public function exportToByteStream($nsKey, $itemKey, Swift_InputByteStream $is)
+    {
+    }
+
+    /**
+     * Check if the given $itemKey exists in the namespace $nsKey.
+     *
+     * @param string $nsKey
+     * @param string $itemKey
+     *
+     * @return bool
+     */
+    public function hasKey($nsKey, $itemKey)
+    {
+        return false;
+    }
+
+    /**
+     * Clear data for $itemKey in the namespace $nsKey if it exists.
+     *
+     * @param string $nsKey
+     * @param string $itemKey
+     */
+    public function clearKey($nsKey, $itemKey)
+    {
+    }
+
+    /**
+     * Clear all data in the namespace $nsKey if it exists.
+     *
+     * @param string $nsKey
+     */
+    public function clearAll($nsKey)
+    {
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
new file mode 100644
index 000000000..b00d458a6
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
@@ -0,0 +1,127 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Writes data to a KeyCache using a stream.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_KeyCache_SimpleKeyCacheInputStream implements Swift_KeyCache_KeyCacheInputStream
+{
+    /** The KeyCache being written to */
+    private $_keyCache;
+
+    /** The nsKey of the KeyCache being written to */
+    private $_nsKey;
+
+    /** The itemKey of the KeyCache being written to */
+    private $_itemKey;
+
+    /** A stream to write through on each write() */
+    private $_writeThrough = null;
+
+    /**
+     * Set the KeyCache to wrap.
+     *
+     * @param Swift_KeyCache $keyCache
+     */
+    public function setKeyCache(Swift_KeyCache $keyCache)
+    {
+        $this->_keyCache = $keyCache;
+    }
+
+    /**
+     * Specify a stream to write through for each write().
+     *
+     * @param Swift_InputByteStream $is
+     */
+    public function setWriteThroughStream(Swift_InputByteStream $is)
+    {
+        $this->_writeThrough = $is;
+    }
+
+    /**
+     * Writes $bytes to the end of the stream.
+     *
+     * @param string                $bytes
+     * @param Swift_InputByteStream $is    optional
+     */
+    public function write($bytes, Swift_InputByteStream $is = null)
+    {
+        $this->_keyCache->setString(
+            $this->_nsKey, $this->_itemKey, $bytes, Swift_KeyCache::MODE_APPEND
+            );
+        if (isset($is)) {
+            $is->write($bytes);
+        }
+        if (isset($this->_writeThrough)) {
+            $this->_writeThrough->write($bytes);
+        }
+    }
+
+    /**
+     * Not used.
+     */
+    public function commit()
+    {
+    }
+
+    /**
+     * Not used.
+     */
+    public function bind(Swift_InputByteStream $is)
+    {
+    }
+
+    /**
+     * Not used.
+     */
+    public function unbind(Swift_InputByteStream $is)
+    {
+    }
+
+    /**
+     * Flush the contents of the stream (empty it) and set the internal pointer
+     * to the beginning.
+     */
+    public function flushBuffers()
+    {
+        $this->_keyCache->clearKey($this->_nsKey, $this->_itemKey);
+    }
+
+    /**
+     * Set the nsKey which will be written to.
+     *
+     * @param string $nsKey
+     */
+    public function setNsKey($nsKey)
+    {
+        $this->_nsKey = $nsKey;
+    }
+
+    /**
+     * Set the itemKey which will be written to.
+     *
+     * @param string $itemKey
+     */
+    public function setItemKey($itemKey)
+    {
+        $this->_itemKey = $itemKey;
+    }
+
+    /**
+     * Any implementation should be cloneable, allowing the clone to access a
+     * separate $nsKey and $itemKey.
+     */
+    public function __clone()
+    {
+        $this->_writeThrough = null;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
new file mode 100644
index 000000000..fdba9df50
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Redundantly and rotationally uses several Transport implementations when sending.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_LoadBalancedTransport extends Swift_Transport_LoadBalancedTransport
+{
+    /**
+     * Creates a new LoadBalancedTransport with $transports.
+     *
+     * @param array $transports
+     */
+    public function __construct($transports = array())
+    {
+        call_user_func_array(
+            array($this, 'Swift_Transport_LoadBalancedTransport::__construct'),
+            Swift_DependencyContainer::getInstance()
+                ->createDependenciesFor('transport.loadbalanced')
+            );
+
+        $this->setTransports($transports);
+    }
+
+    /**
+     * Create a new LoadBalancedTransport instance.
+     *
+     * @param array $transports
+     *
+     * @return Swift_LoadBalancedTransport
+     */
+    public static function newInstance($transports = array())
+    {
+        return new self($transports);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/MailTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/MailTransport.php
new file mode 100644
index 000000000..858ca8147
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/MailTransport.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Sends Messages using the mail() function.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_MailTransport extends Swift_Transport_MailTransport
+{
+    /**
+     * Create a new MailTransport, optionally specifying $extraParams.
+     *
+     * @param string $extraParams
+     */
+    public function __construct($extraParams = '-f%s')
+    {
+        call_user_func_array(
+            array($this, 'Swift_Transport_MailTransport::__construct'),
+            Swift_DependencyContainer::getInstance()
+                ->createDependenciesFor('transport.mail')
+            );
+
+        $this->setExtraParams($extraParams);
+    }
+
+    /**
+     * Create a new MailTransport instance.
+     *
+     * @param string $extraParams To be passed to mail()
+     *
+     * @return Swift_MailTransport
+     */
+    public static function newInstance($extraParams = '-f%s')
+    {
+        return new self($extraParams);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mailer.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mailer.php
new file mode 100644
index 000000000..641154627
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mailer.php
@@ -0,0 +1,114 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Swift Mailer class.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Mailer
+{
+    /** The Transport used to send messages */
+    private $_transport;
+
+    /**
+     * Create a new Mailer using $transport for delivery.
+     *
+     * @param Swift_Transport $transport
+     */
+    public function __construct(Swift_Transport $transport)
+    {
+        $this->_transport = $transport;
+    }
+
+    /**
+     * Create a new Mailer instance.
+     *
+     * @param Swift_Transport $transport
+     *
+     * @return Swift_Mailer
+     */
+    public static function newInstance(Swift_Transport $transport)
+    {
+        return new self($transport);
+    }
+
+    /**
+     * Create a new class instance of one of the message services.
+     *
+     * For example 'mimepart' would create a 'message.mimepart' instance
+     *
+     * @param string $service
+     *
+     * @return object
+     */
+    public function createMessage($service = 'message')
+    {
+        return Swift_DependencyContainer::getInstance()
+            ->lookup('message.'.$service);
+    }
+
+    /**
+     * Send the given Message like it would be sent in a mail client.
+     *
+     * All recipients (with the exception of Bcc) will be able to see the other
+     * recipients this message was sent to.
+     *
+     * Recipient/sender data will be retrieved from the Message object.
+     *
+     * The return value is the number of recipients who were accepted for
+     * delivery.
+     *
+     * @param Swift_Mime_Message $message
+     * @param array              $failedRecipients An array of failures by-reference
+     *
+     * @return int The number of successful recipients. Can be 0 which indicates failure
+     */
+    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    {
+        $failedRecipients = (array) $failedRecipients;
+
+        if (!$this->_transport->isStarted()) {
+            $this->_transport->start();
+        }
+
+        $sent = 0;
+
+        try {
+            $sent = $this->_transport->send($message, $failedRecipients);
+        } catch (Swift_RfcComplianceException $e) {
+            foreach ($message->getTo() as $address => $name) {
+                $failedRecipients[] = $address;
+            }
+        }
+
+        return $sent;
+    }
+
+    /**
+     * Register a plugin using a known unique key (e.g. myPlugin).
+     *
+     * @param Swift_Events_EventListener $plugin
+     */
+    public function registerPlugin(Swift_Events_EventListener $plugin)
+    {
+        $this->_transport->registerPlugin($plugin);
+    }
+
+    /**
+     * The Transport used to send messages.
+     *
+     * @return Swift_Transport
+     */
+    public function getTransport()
+    {
+        return $this->_transport;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
new file mode 100644
index 000000000..e3e6cad05
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Wraps a standard PHP array in an iterator.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Mailer_ArrayRecipientIterator implements Swift_Mailer_RecipientIterator
+{
+    /**
+     * The list of recipients.
+     *
+     * @var array
+     */
+    private $_recipients = array();
+
+    /**
+     * Create a new ArrayRecipientIterator from $recipients.
+     *
+     * @param array $recipients
+     */
+    public function __construct(array $recipients)
+    {
+        $this->_recipients = $recipients;
+    }
+
+    /**
+     * Returns true only if there are more recipients to send to.
+     *
+     * @return bool
+     */
+    public function hasNext()
+    {
+        return !empty($this->_recipients);
+    }
+
+    /**
+     * Returns an array where the keys are the addresses of recipients and the
+     * values are the names. e.g. ('foo@bar' => 'Foo') or ('foo@bar' => NULL).
+     *
+     * @return array
+     */
+    public function nextRecipient()
+    {
+        return array_splice($this->_recipients, 0, 1);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mailer/RecipientIterator.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mailer/RecipientIterator.php
new file mode 100644
index 000000000..650f3ec3d
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mailer/RecipientIterator.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Provides an abstract way of specifying recipients for batch sending.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_Mailer_RecipientIterator
+{
+    /**
+     * Returns true only if there are more recipients to send to.
+     *
+     * @return bool
+     */
+    public function hasNext();
+
+    /**
+     * Returns an array where the keys are the addresses of recipients and the
+     * values are the names. e.g. ('foo@bar' => 'Foo') or ('foo@bar' => NULL).
+     *
+     * @return array
+     */
+    public function nextRecipient();
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/MemorySpool.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/MemorySpool.php
new file mode 100644
index 000000000..2cafb6751
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/MemorySpool.php
@@ -0,0 +1,110 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2011 Fabien Potencier <fabien.potencier@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Stores Messages in memory.
+ *
+ * @author Fabien Potencier
+ */
+class Swift_MemorySpool implements Swift_Spool
+{
+    protected $messages = array();
+    private $flushRetries = 3;
+
+    /**
+     * Tests if this Transport mechanism has started.
+     *
+     * @return bool
+     */
+    public function isStarted()
+    {
+        return true;
+    }
+
+    /**
+     * Starts this Transport mechanism.
+     */
+    public function start()
+    {
+    }
+
+    /**
+     * Stops this Transport mechanism.
+     */
+    public function stop()
+    {
+    }
+
+    /**
+     * @param int $retries
+     */
+    public function setFlushRetries($retries)
+    {
+        $this->flushRetries = $retries;
+    }
+
+    /**
+     * Stores a message in the queue.
+     *
+     * @param Swift_Mime_Message $message The message to store
+     *
+     * @return bool Whether the operation has succeeded
+     */
+    public function queueMessage(Swift_Mime_Message $message)
+    {
+        //clone the message to make sure it is not changed while in the queue
+        $this->messages[] = clone $message;
+
+        return true;
+    }
+
+    /**
+     * Sends messages using the given transport instance.
+     *
+     * @param Swift_Transport $transport        A transport instance
+     * @param string[]        $failedRecipients An array of failures by-reference
+     *
+     * @return int The number of sent emails
+     */
+    public function flushQueue(Swift_Transport $transport, &$failedRecipients = null)
+    {
+        if (!$this->messages) {
+            return 0;
+        }
+
+        if (!$transport->isStarted()) {
+            $transport->start();
+        }
+
+        $count = 0;
+        $retries = $this->flushRetries;
+        while ($retries--) {
+            try {
+                while ($message = array_pop($this->messages)) {
+                    $count += $transport->send($message, $failedRecipients);
+                }
+            } catch (Swift_TransportException $exception) {
+                if ($retries) {
+                    // re-queue the message at the end of the queue to give a chance
+                    // to the other messages to be sent, in case the failure was due to
+                    // this message and not just the transport failing
+                    array_unshift($this->messages, $message);
+
+                    // wait half a second before we try again
+                    usleep(500000);
+                } else {
+                    throw $exception;
+                }
+            }
+        }
+
+        return $count;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Message.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Message.php
new file mode 100644
index 000000000..11aa5a9a0
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Message.php
@@ -0,0 +1,291 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * The Message class for building emails.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Message extends Swift_Mime_SimpleMessage
+{
+    /**
+     * @var Swift_Signers_HeaderSigner[]
+     */
+    private $headerSigners = array();
+
+    /**
+     * @var Swift_Signers_BodySigner[]
+     */
+    private $bodySigners = array();
+
+    /**
+     * @var array
+     */
+    private $savedMessage = array();
+
+    /**
+     * Create a new Message.
+     *
+     * Details may be optionally passed into the constructor.
+     *
+     * @param string $subject
+     * @param string $body
+     * @param string $contentType
+     * @param string $charset
+     */
+    public function __construct($subject = null, $body = null, $contentType = null, $charset = null)
+    {
+        call_user_func_array(
+            array($this, 'Swift_Mime_SimpleMessage::__construct'),
+            Swift_DependencyContainer::getInstance()
+                ->createDependenciesFor('mime.message')
+            );
+
+        if (!isset($charset)) {
+            $charset = Swift_DependencyContainer::getInstance()
+                ->lookup('properties.charset');
+        }
+        $this->setSubject($subject);
+        $this->setBody($body);
+        $this->setCharset($charset);
+        if ($contentType) {
+            $this->setContentType($contentType);
+        }
+    }
+
+    /**
+     * Create a new Message.
+     *
+     * @param string $subject
+     * @param string $body
+     * @param string $contentType
+     * @param string $charset
+     *
+     * @return Swift_Message
+     */
+    public static function newInstance($subject = null, $body = null, $contentType = null, $charset = null)
+    {
+        return new self($subject, $body, $contentType, $charset);
+    }
+
+    /**
+     * Add a MimePart to this Message.
+     *
+     * @param string|Swift_OutputByteStream $body
+     * @param string                        $contentType
+     * @param string                        $charset
+     *
+     * @return Swift_Mime_SimpleMessage
+     */
+    public function addPart($body, $contentType = null, $charset = null)
+    {
+        return $this->attach(Swift_MimePart::newInstance(
+            $body, $contentType, $charset
+            ));
+    }
+
+    /**
+     * Attach a new signature handler to the message.
+     *
+     * @param Swift_Signer $signer
+     *
+     * @return Swift_Message
+     */
+    public function attachSigner(Swift_Signer $signer)
+    {
+        if ($signer instanceof Swift_Signers_HeaderSigner) {
+            $this->headerSigners[] = $signer;
+        } elseif ($signer instanceof Swift_Signers_BodySigner) {
+            $this->bodySigners[] = $signer;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Attach a new signature handler to the message.
+     *
+     * @param Swift_Signer $signer
+     *
+     * @return Swift_Message
+     */
+    public function detachSigner(Swift_Signer $signer)
+    {
+        if ($signer instanceof Swift_Signers_HeaderSigner) {
+            foreach ($this->headerSigners as $k => $headerSigner) {
+                if ($headerSigner === $signer) {
+                    unset($this->headerSigners[$k]);
+
+                    return $this;
+                }
+            }
+        } elseif ($signer instanceof Swift_Signers_BodySigner) {
+            foreach ($this->bodySigners as $k => $bodySigner) {
+                if ($bodySigner === $signer) {
+                    unset($this->bodySigners[$k]);
+
+                    return $this;
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get this message as a complete string.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        if (empty($this->headerSigners) && empty($this->bodySigners)) {
+            return parent::toString();
+        }
+
+        $this->saveMessage();
+
+        $this->doSign();
+
+        $string = parent::toString();
+
+        $this->restoreMessage();
+
+        return $string;
+    }
+
+    /**
+     * Write this message to a {@link Swift_InputByteStream}.
+     *
+     * @param Swift_InputByteStream $is
+     */
+    public function toByteStream(Swift_InputByteStream $is)
+    {
+        if (empty($this->headerSigners) && empty($this->bodySigners)) {
+            parent::toByteStream($is);
+
+            return;
+        }
+
+        $this->saveMessage();
+
+        $this->doSign();
+
+        parent::toByteStream($is);
+
+        $this->restoreMessage();
+    }
+
+    public function __wakeup()
+    {
+        Swift_DependencyContainer::getInstance()->createDependenciesFor('mime.message');
+    }
+
+    /**
+     * loops through signers and apply the signatures.
+     */
+    protected function doSign()
+    {
+        foreach ($this->bodySigners as $signer) {
+            $altered = $signer->getAlteredHeaders();
+            $this->saveHeaders($altered);
+            $signer->signMessage($this);
+        }
+
+        foreach ($this->headerSigners as $signer) {
+            $altered = $signer->getAlteredHeaders();
+            $this->saveHeaders($altered);
+            $signer->reset();
+
+            $signer->setHeaders($this->getHeaders());
+
+            $signer->startBody();
+            $this->_bodyToByteStream($signer);
+            $signer->endBody();
+
+            $signer->addSignature($this->getHeaders());
+        }
+    }
+
+    /**
+     * save the message before any signature is applied.
+     */
+    protected function saveMessage()
+    {
+        $this->savedMessage = array('headers' => array());
+        $this->savedMessage['body'] = $this->getBody();
+        $this->savedMessage['children'] = $this->getChildren();
+        if (count($this->savedMessage['children']) > 0 && $this->getBody() != '') {
+            $this->setChildren(array_merge(array($this->_becomeMimePart()), $this->savedMessage['children']));
+            $this->setBody('');
+        }
+    }
+
+    /**
+     * save the original headers.
+     *
+     * @param array $altered
+     */
+    protected function saveHeaders(array $altered)
+    {
+        foreach ($altered as $head) {
+            $lc = strtolower($head);
+
+            if (!isset($this->savedMessage['headers'][$lc])) {
+                $this->savedMessage['headers'][$lc] = $this->getHeaders()->getAll($head);
+            }
+        }
+    }
+
+    /**
+     * Remove or restore altered headers.
+     */
+    protected function restoreHeaders()
+    {
+        foreach ($this->savedMessage['headers'] as $name => $savedValue) {
+            $headers = $this->getHeaders()->getAll($name);
+
+            foreach ($headers as $key => $value) {
+                if (!isset($savedValue[$key])) {
+                    $this->getHeaders()->remove($name, $key);
+                }
+            }
+        }
+    }
+
+    /**
+     * Restore message body.
+     */
+    protected function restoreMessage()
+    {
+        $this->setBody($this->savedMessage['body']);
+        $this->setChildren($this->savedMessage['children']);
+
+        $this->restoreHeaders();
+        $this->savedMessage = array();
+    }
+
+    /**
+     * Clone Message Signers.
+     *
+     * @see Swift_Mime_SimpleMimeEntity::__clone()
+     */
+    public function __clone()
+    {
+        parent::__clone();
+        foreach ($this->bodySigners as $key => $bodySigner) {
+            $this->bodySigners[$key] = clone($bodySigner);
+        }
+
+        foreach ($this->headerSigners as $key => $headerSigner) {
+            $this->headerSigners[$key] = clone($headerSigner);
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Attachment.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Attachment.php
new file mode 100644
index 000000000..46a5e8da9
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Attachment.php
@@ -0,0 +1,149 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An attachment, in a multipart message.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
+{
+    /** Recognized MIME types */
+    private $_mimeTypes = array();
+
+    /**
+     * Create a new Attachment with $headers, $encoder and $cache.
+     *
+     * @param Swift_Mime_HeaderSet      $headers
+     * @param Swift_Mime_ContentEncoder $encoder
+     * @param Swift_KeyCache            $cache
+     * @param Swift_Mime_Grammar        $grammar
+     * @param array                     $mimeTypes optional
+     */
+    public function __construct(Swift_Mime_HeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_Mime_Grammar $grammar, $mimeTypes = array())
+    {
+        parent::__construct($headers, $encoder, $cache, $grammar);
+        $this->setDisposition('attachment');
+        $this->setContentType('application/octet-stream');
+        $this->_mimeTypes = $mimeTypes;
+    }
+
+    /**
+     * Get the nesting level used for this attachment.
+     *
+     * Always returns {@link LEVEL_MIXED}.
+     *
+     * @return int
+     */
+    public function getNestingLevel()
+    {
+        return self::LEVEL_MIXED;
+    }
+
+    /**
+     * Get the Content-Disposition of this attachment.
+     *
+     * By default attachments have a disposition of "attachment".
+     *
+     * @return string
+     */
+    public function getDisposition()
+    {
+        return $this->_getHeaderFieldModel('Content-Disposition');
+    }
+
+    /**
+     * Set the Content-Disposition of this attachment.
+     *
+     * @param string $disposition
+     *
+     * @return Swift_Mime_Attachment
+     */
+    public function setDisposition($disposition)
+    {
+        if (!$this->_setHeaderFieldModel('Content-Disposition', $disposition)) {
+            $this->getHeaders()->addParameterizedHeader('Content-Disposition', $disposition);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the filename of this attachment when downloaded.
+     *
+     * @return string
+     */
+    public function getFilename()
+    {
+        return $this->_getHeaderParameter('Content-Disposition', 'filename');
+    }
+
+    /**
+     * Set the filename of this attachment.
+     *
+     * @param string $filename
+     *
+     * @return Swift_Mime_Attachment
+     */
+    public function setFilename($filename)
+    {
+        $this->_setHeaderParameter('Content-Disposition', 'filename', $filename);
+        $this->_setHeaderParameter('Content-Type', 'name', $filename);
+
+        return $this;
+    }
+
+    /**
+     * Get the file size of this attachment.
+     *
+     * @return int
+     */
+    public function getSize()
+    {
+        return $this->_getHeaderParameter('Content-Disposition', 'size');
+    }
+
+    /**
+     * Set the file size of this attachment.
+     *
+     * @param int $size
+     *
+     * @return Swift_Mime_Attachment
+     */
+    public function setSize($size)
+    {
+        $this->_setHeaderParameter('Content-Disposition', 'size', $size);
+
+        return $this;
+    }
+
+    /**
+     * Set the file that this attachment is for.
+     *
+     * @param Swift_FileStream $file
+     * @param string           $contentType optional
+     *
+     * @return Swift_Mime_Attachment
+     */
+    public function setFile(Swift_FileStream $file, $contentType = null)
+    {
+        $this->setFilename(basename($file->getPath()));
+        $this->setBody($file, $contentType);
+        if (!isset($contentType)) {
+            $extension = strtolower(substr($file->getPath(), strrpos($file->getPath(), '.') + 1));
+
+            if (array_key_exists($extension, $this->_mimeTypes)) {
+                $this->setContentType($this->_mimeTypes[$extension]);
+            }
+        }
+
+        return $this;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/CharsetObserver.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/CharsetObserver.php
similarity index 63%
rename from lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/CharsetObserver.php
rename to lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/CharsetObserver.php
index c26009f73..b49c3a873 100644
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/CharsetObserver.php
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/CharsetObserver.php
@@ -10,17 +10,15 @@
 
 /**
  * Observes changes in an Mime entity's character set.
- * @package Swift
- * @subpackage Mime
+ *
  * @author Chris Corbyn
  */
 interface Swift_Mime_CharsetObserver
 {
-  
-  /**
-   * Notify this observer that the entity's charset has changed.
-   * @param string $charset
-   */
-  public function charsetChanged($charset);
-  
+    /**
+     * Notify this observer that the entity's charset has changed.
+     *
+     * @param string $charset
+     */
+    public function charsetChanged($charset);
 }
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder.php
new file mode 100644
index 000000000..d43ea9f40
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Interface for all Transfer Encoding schemes.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_Mime_ContentEncoder extends Swift_Encoder
+{
+    /**
+     * Encode $in to $out.
+     *
+     * @param Swift_OutputByteStream $os              to read from
+     * @param Swift_InputByteStream  $is              to write to
+     * @param int                    $firstLineOffset
+     * @param int                    $maxLineLength   - 0 indicates the default length for this encoding
+     */
+    public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0);
+
+    /**
+     * Get the MIME name of this content encoding scheme.
+     *
+     * @return string
+     */
+    public function getName();
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
new file mode 100644
index 000000000..8f76d70f3
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
@@ -0,0 +1,104 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Handles Base 64 Transfer Encoding in Swift Mailer.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base64Encoder implements Swift_Mime_ContentEncoder
+{
+    /**
+     * Encode stream $in to stream $out.
+     *
+     * @param Swift_OutputByteStream $os
+     * @param Swift_InputByteStream  $is
+     * @param int                    $firstLineOffset
+     * @param int                    $maxLineLength,  optional, 0 indicates the default of 76 bytes
+     */
+    public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
+    {
+        if (0 >= $maxLineLength || 76 < $maxLineLength) {
+            $maxLineLength = 76;
+        }
+
+        $remainder = 0;
+        $base64ReadBufferRemainderBytes = null;
+
+        // To reduce memory usage, the output buffer is streamed to the input buffer like so:
+        //   Output Stream => base64encode => wrap line length => Input Stream
+        // HOWEVER it's important to note that base64_encode() should only be passed whole triplets of data (except for the final chunk of data)
+        // otherwise it will assume the input data has *ended* and it will incorrectly pad/terminate the base64 data mid-stream.
+        // We use $base64ReadBufferRemainderBytes to carry over 1-2 "remainder" bytes from the each chunk from OutputStream and pre-pend those onto the
+        // chunk of bytes read in the next iteration.
+        // When the OutputStream is empty, we must flush any remainder bytes.
+        while (true) {
+            $readBytes = $os->read(8192);
+            $atEOF = ($readBytes === false);
+
+            if ($atEOF) {
+                $streamTheseBytes = $base64ReadBufferRemainderBytes;
+            } else {
+                $streamTheseBytes = $base64ReadBufferRemainderBytes.$readBytes;
+            }
+            $base64ReadBufferRemainderBytes = null;
+            $bytesLength = strlen($streamTheseBytes);
+
+            if ($bytesLength === 0) { // no data left to encode
+                break;
+            }
+
+            // if we're not on the last block of the ouput stream, make sure $streamTheseBytes ends with a complete triplet of data
+            // and carry over remainder 1-2 bytes to the next loop iteration
+            if (!$atEOF) {
+                $excessBytes = $bytesLength % 3;
+                if ($excessBytes !== 0) {
+                    $base64ReadBufferRemainderBytes = substr($streamTheseBytes, -$excessBytes);
+                    $streamTheseBytes = substr($streamTheseBytes, 0, $bytesLength - $excessBytes);
+                }
+            }
+
+            $encoded = base64_encode($streamTheseBytes);
+            $encodedTransformed = '';
+            $thisMaxLineLength = $maxLineLength - $remainder - $firstLineOffset;
+
+            while ($thisMaxLineLength < strlen($encoded)) {
+                $encodedTransformed .= substr($encoded, 0, $thisMaxLineLength)."\r\n";
+                $firstLineOffset = 0;
+                $encoded = substr($encoded, $thisMaxLineLength);
+                $thisMaxLineLength = $maxLineLength;
+                $remainder = 0;
+            }
+
+            if (0 < $remainingLength = strlen($encoded)) {
+                $remainder += $remainingLength;
+                $encodedTransformed .= $encoded;
+                $encoded = null;
+            }
+
+            $is->write($encodedTransformed);
+
+            if ($atEOF) {
+                break;
+            }
+        }
+    }
+
+    /**
+     * Get the name of this encoding scheme.
+     * Returns the string 'base64'.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return 'base64';
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
new file mode 100644
index 000000000..710b5ac9e
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
@@ -0,0 +1,123 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Handles Quoted Printable (QP) Transfer Encoding in Swift Mailer using the PHP core function.
+ *
+ * @author Lars Strojny
+ */
+class Swift_Mime_ContentEncoder_NativeQpContentEncoder implements Swift_Mime_ContentEncoder
+{
+    /**
+     * @var null|string
+     */
+    private $charset;
+
+    /**
+     * @param null|string $charset
+     */
+    public function __construct($charset = null)
+    {
+        $this->charset = $charset ? $charset : 'utf-8';
+    }
+
+    /**
+     * Notify this observer that the entity's charset has changed.
+     *
+     * @param string $charset
+     */
+    public function charsetChanged($charset)
+    {
+        $this->charset = $charset;
+    }
+
+    /**
+     * Encode $in to $out.
+     *
+     * @param Swift_OutputByteStream $os              to read from
+     * @param Swift_InputByteStream  $is              to write to
+     * @param int                    $firstLineOffset
+     * @param int                    $maxLineLength   0 indicates the default length for this encoding
+     *
+     * @throws RuntimeException
+     */
+    public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
+    {
+        if ($this->charset !== 'utf-8') {
+            throw new RuntimeException(
+                sprintf('Charset "%s" not supported. NativeQpContentEncoder only supports "utf-8"', $this->charset));
+        }
+
+        $string = '';
+
+        while (false !== $bytes = $os->read(8192)) {
+            $string .= $bytes;
+        }
+
+        $is->write($this->encodeString($string));
+    }
+
+    /**
+     * Get the MIME name of this content encoding scheme.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return 'quoted-printable';
+    }
+
+    /**
+     * Encode a given string to produce an encoded string.
+     *
+     * @param string $string
+     * @param int    $firstLineOffset if first line needs to be shorter
+     * @param int    $maxLineLength   0 indicates the default length for this encoding
+     *
+     * @throws RuntimeException
+     *
+     * @return string
+     */
+    public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
+    {
+        if ($this->charset !== 'utf-8') {
+            throw new RuntimeException(
+                sprintf('Charset "%s" not supported. NativeQpContentEncoder only supports "utf-8"', $this->charset));
+        }
+
+        return $this->_standardize(quoted_printable_encode($string));
+    }
+
+    /**
+     * Make sure CRLF is correct and HT/SPACE are in valid places.
+     *
+     * @param string $string
+     *
+     * @return string
+     */
+    protected function _standardize($string)
+    {
+        // transform CR or LF to CRLF
+        $string = preg_replace('~=0D(?!=0A)|(?<!=0D)=0A~', '=0D=0A', $string);
+        // transform =0D=0A to CRLF
+        $string = str_replace(array("\t=0D=0A", ' =0D=0A', '=0D=0A'), array("=09\r\n", "=20\r\n", "\r\n"), $string);
+
+        switch ($end = ord(substr($string, -1))) {
+            case 0x09:
+                $string = substr_replace($string, '=09', -1);
+                break;
+            case 0x20:
+                $string = substr_replace($string, '=20', -1);
+                break;
+        }
+
+        return $string;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
new file mode 100644
index 000000000..219f482ce
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
@@ -0,0 +1,162 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Handles binary/7/8-bit Transfer Encoding in Swift Mailer.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_ContentEncoder
+{
+    /**
+     * The name of this encoding scheme (probably 7bit or 8bit).
+     *
+     * @var string
+     */
+    private $_name;
+
+    /**
+     * True if canonical transformations should be done.
+     *
+     * @var bool
+     */
+    private $_canonical;
+
+    /**
+     * Creates a new PlainContentEncoder with $name (probably 7bit or 8bit).
+     *
+     * @param string $name
+     * @param bool   $canonical If canonicalization transformation should be done.
+     */
+    public function __construct($name, $canonical = false)
+    {
+        $this->_name = $name;
+        $this->_canonical = $canonical;
+    }
+
+    /**
+     * Encode a given string to produce an encoded string.
+     *
+     * @param string $string
+     * @param int    $firstLineOffset ignored
+     * @param int    $maxLineLength   - 0 means no wrapping will occur
+     *
+     * @return string
+     */
+    public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
+    {
+        if ($this->_canonical) {
+            $string = $this->_canonicalize($string);
+        }
+
+        return $this->_safeWordWrap($string, $maxLineLength, "\r\n");
+    }
+
+    /**
+     * Encode stream $in to stream $out.
+     *
+     * @param Swift_OutputByteStream $os
+     * @param Swift_InputByteStream  $is
+     * @param int                    $firstLineOffset ignored
+     * @param int                    $maxLineLength   optional, 0 means no wrapping will occur
+     */
+    public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
+    {
+        $leftOver = '';
+        while (false !== $bytes = $os->read(8192)) {
+            $toencode = $leftOver.$bytes;
+            if ($this->_canonical) {
+                $toencode = $this->_canonicalize($toencode);
+            }
+            $wrapped = $this->_safeWordWrap($toencode, $maxLineLength, "\r\n");
+            $lastLinePos = strrpos($wrapped, "\r\n");
+            $leftOver = substr($wrapped, $lastLinePos);
+            $wrapped = substr($wrapped, 0, $lastLinePos);
+
+            $is->write($wrapped);
+        }
+        if (strlen($leftOver)) {
+            $is->write($leftOver);
+        }
+    }
+
+    /**
+     * Get the name of this encoding scheme.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->_name;
+    }
+
+    /**
+     * Not used.
+     */
+    public function charsetChanged($charset)
+    {
+    }
+
+    /**
+     * A safer (but weaker) wordwrap for unicode.
+     *
+     * @param string $string
+     * @param int    $length
+     * @param string $le
+     *
+     * @return string
+     */
+    private function _safeWordwrap($string, $length = 75, $le = "\r\n")
+    {
+        if (0 >= $length) {
+            return $string;
+        }
+
+        $originalLines = explode($le, $string);
+
+        $lines = array();
+        $lineCount = 0;
+
+        foreach ($originalLines as $originalLine) {
+            $lines[] = '';
+            $currentLine = &$lines[$lineCount++];
+
+            //$chunks = preg_split('/(?<=[\ \t,\.!\?\-&\+\/])/', $originalLine);
+            $chunks = preg_split('/(?<=\s)/', $originalLine);
+
+            foreach ($chunks as $chunk) {
+                if (0 != strlen($currentLine)
+                    && strlen($currentLine.$chunk) > $length) {
+                    $lines[] = '';
+                    $currentLine = &$lines[$lineCount++];
+                }
+                $currentLine .= $chunk;
+            }
+        }
+
+        return implode("\r\n", $lines);
+    }
+
+    /**
+     * Canonicalize string input (fix CRLF).
+     *
+     * @param string $string
+     *
+     * @return string
+     */
+    private function _canonicalize($string)
+    {
+        return str_replace(
+            array("\r\n", "\r", "\n"),
+            array("\n", "\n", "\r\n"),
+            $string
+            );
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
new file mode 100644
index 000000000..5cc907b8e
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
@@ -0,0 +1,134 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Handles Quoted Printable (QP) Transfer Encoding in Swift Mailer.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder implements Swift_Mime_ContentEncoder
+{
+    protected $_dotEscape;
+
+    /**
+     * Creates a new QpContentEncoder for the given CharacterStream.
+     *
+     * @param Swift_CharacterStream $charStream to use for reading characters
+     * @param Swift_StreamFilter    $filter     if canonicalization should occur
+     * @param bool                  $dotEscape  if dot stuffing workaround must be enabled
+     */
+    public function __construct(Swift_CharacterStream $charStream, Swift_StreamFilter $filter = null, $dotEscape = false)
+    {
+        $this->_dotEscape = $dotEscape;
+        parent::__construct($charStream, $filter);
+    }
+
+    public function __sleep()
+    {
+        return array('_charStream', '_filter', '_dotEscape');
+    }
+
+    protected function getSafeMapShareId()
+    {
+        return get_class($this).($this->_dotEscape ? '.dotEscape' : '');
+    }
+
+    protected function initSafeMap()
+    {
+        parent::initSafeMap();
+        if ($this->_dotEscape) {
+            /* Encode . as =2e for buggy remote servers */
+            unset($this->_safeMap[0x2e]);
+        }
+    }
+
+    /**
+     * Encode stream $in to stream $out.
+     *
+     * QP encoded strings have a maximum line length of 76 characters.
+     * If the first line needs to be shorter, indicate the difference with
+     * $firstLineOffset.
+     *
+     * @param Swift_OutputByteStream $os              output stream
+     * @param Swift_InputByteStream  $is              input stream
+     * @param int                    $firstLineOffset
+     * @param int                    $maxLineLength
+     */
+    public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
+    {
+        if ($maxLineLength > 76 || $maxLineLength <= 0) {
+            $maxLineLength = 76;
+        }
+
+        $thisLineLength = $maxLineLength - $firstLineOffset;
+
+        $this->_charStream->flushContents();
+        $this->_charStream->importByteStream($os);
+
+        $currentLine = '';
+        $prepend = '';
+        $size = $lineLen = 0;
+
+        while (false !== $bytes = $this->_nextSequence()) {
+            // If we're filtering the input
+            if (isset($this->_filter)) {
+                // If we can't filter because we need more bytes
+                while ($this->_filter->shouldBuffer($bytes)) {
+                    // Then collect bytes into the buffer
+                    if (false === $moreBytes = $this->_nextSequence(1)) {
+                        break;
+                    }
+
+                    foreach ($moreBytes as $b) {
+                        $bytes[] = $b;
+                    }
+                }
+                // And filter them
+                $bytes = $this->_filter->filter($bytes);
+            }
+
+            $enc = $this->_encodeByteSequence($bytes, $size);
+
+            $i = strpos($enc, '=0D=0A');
+            $newLineLength = $lineLen + ($i === false ? $size : $i);
+
+            if ($currentLine && $newLineLength >= $thisLineLength) {
+                $is->write($prepend.$this->_standardize($currentLine));
+                $currentLine = '';
+                $prepend = "=\r\n";
+                $thisLineLength = $maxLineLength;
+                $lineLen = 0;
+            }
+
+            $currentLine .= $enc;
+
+            if ($i === false) {
+                $lineLen += $size;
+            } else {
+                // 6 is the length of '=0D=0A'.
+                $lineLen = $size - strrpos($enc, '=0D=0A') - 6;
+            }
+        }
+        if (strlen($currentLine)) {
+            $is->write($prepend.$this->_standardize($currentLine));
+        }
+    }
+
+    /**
+     * Get the name of this encoding scheme.
+     * Returns the string 'quoted-printable'.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return 'quoted-printable';
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
new file mode 100644
index 000000000..3214e1cf3
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
@@ -0,0 +1,98 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Proxy for quoted-printable content encoders.
+ *
+ * Switches on the best QP encoder implementation for current charset.
+ *
+ * @author Jean-François Simon <jeanfrancois.simon@sensiolabs.com>
+ */
+class Swift_Mime_ContentEncoder_QpContentEncoderProxy implements Swift_Mime_ContentEncoder
+{
+    /**
+     * @var Swift_Mime_ContentEncoder_QpContentEncoder
+     */
+    private $safeEncoder;
+
+    /**
+     * @var Swift_Mime_ContentEncoder_NativeQpContentEncoder
+     */
+    private $nativeEncoder;
+
+    /**
+     * @var null|string
+     */
+    private $charset;
+
+    /**
+     * Constructor.
+     *
+     * @param Swift_Mime_ContentEncoder_QpContentEncoder       $safeEncoder
+     * @param Swift_Mime_ContentEncoder_NativeQpContentEncoder $nativeEncoder
+     * @param string|null                                      $charset
+     */
+    public function __construct(Swift_Mime_ContentEncoder_QpContentEncoder $safeEncoder, Swift_Mime_ContentEncoder_NativeQpContentEncoder $nativeEncoder, $charset)
+    {
+        $this->safeEncoder = $safeEncoder;
+        $this->nativeEncoder = $nativeEncoder;
+        $this->charset = $charset;
+    }
+
+    /**
+     * Make a deep copy of object.
+     */
+    public function __clone()
+    {
+        $this->safeEncoder = clone $this->safeEncoder;
+        $this->nativeEncoder = clone $this->nativeEncoder;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function charsetChanged($charset)
+    {
+        $this->charset = $charset;
+        $this->safeEncoder->charsetChanged($charset);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
+    {
+        $this->getEncoder()->encodeByteStream($os, $is, $firstLineOffset, $maxLineLength);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return 'quoted-printable';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
+    {
+        return $this->getEncoder()->encodeString($string, $firstLineOffset, $maxLineLength);
+    }
+
+    /**
+     * @return Swift_Mime_ContentEncoder
+     */
+    private function getEncoder()
+    {
+        return 'utf-8' === $this->charset ? $this->nativeEncoder : $this->safeEncoder;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
new file mode 100644
index 000000000..0b8526e38
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Handles raw Transfer Encoding in Swift Mailer.
+ *
+ *
+ * @author Sebastiaan Stok <s.stok@rollerscapes.net>
+ */
+class Swift_Mime_ContentEncoder_RawContentEncoder implements Swift_Mime_ContentEncoder
+{
+    /**
+     * Encode a given string to produce an encoded string.
+     *
+     * @param string $string
+     * @param int    $firstLineOffset ignored
+     * @param int    $maxLineLength   ignored
+     *
+     * @return string
+     */
+    public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
+    {
+        return $string;
+    }
+
+    /**
+     * Encode stream $in to stream $out.
+     *
+     * @param Swift_OutputByteStream $in
+     * @param Swift_InputByteStream  $out
+     * @param int                    $firstLineOffset ignored
+     * @param int                    $maxLineLength   ignored
+     */
+    public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
+    {
+        while (false !== ($bytes = $os->read(8192))) {
+            $is->write($bytes);
+        }
+    }
+
+    /**
+     * Get the name of this encoding scheme.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return 'raw';
+    }
+
+    /**
+     * Not used.
+     */
+    public function charsetChanged($charset)
+    {
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
new file mode 100644
index 000000000..6af757124
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An embedded file, in a multipart message.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Mime_EmbeddedFile extends Swift_Mime_Attachment
+{
+    /**
+     * Creates a new Attachment with $headers and $encoder.
+     *
+     * @param Swift_Mime_HeaderSet      $headers
+     * @param Swift_Mime_ContentEncoder $encoder
+     * @param Swift_KeyCache            $cache
+     * @param Swift_Mime_Grammar        $grammar
+     * @param array                     $mimeTypes optional
+     */
+    public function __construct(Swift_Mime_HeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_Mime_Grammar $grammar, $mimeTypes = array())
+    {
+        parent::__construct($headers, $encoder, $cache, $grammar, $mimeTypes);
+        $this->setDisposition('inline');
+        $this->setId($this->getId());
+    }
+
+    /**
+     * Get the nesting level of this EmbeddedFile.
+     *
+     * Returns {@see LEVEL_RELATED}.
+     *
+     * @return int
+     */
+    public function getNestingLevel()
+    {
+        return self::LEVEL_RELATED;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/EncodingObserver.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php
similarity index 53%
rename from lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/EncodingObserver.php
rename to lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php
index 50472db6c..cc44a6efb 100644
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/EncodingObserver.php
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php
@@ -8,21 +8,17 @@
  * file that was distributed with this source code.
  */
 
-//@require 'Swift/Mime/ContentEncoder.php';
-
 /**
  * Observes changes for a Mime entity's ContentEncoder.
- * @package Swift
- * @subpackage Mime
+ *
  * @author Chris Corbyn
  */
 interface Swift_Mime_EncodingObserver
 {
-  
-  /**
-   * Notify this observer that the observed entity's ContentEncoder has changed.
-   * @param Swift_Mime_ContentEncoder $encoder
-   */
-  public function encoderChanged(Swift_Mime_ContentEncoder $encoder);
-  
+    /**
+     * Notify this observer that the observed entity's ContentEncoder has changed.
+     *
+     * @param Swift_Mime_ContentEncoder $encoder
+     */
+    public function encoderChanged(Swift_Mime_ContentEncoder $encoder);
 }
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Grammar.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Grammar.php
new file mode 100644
index 000000000..a09f33831
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Grammar.php
@@ -0,0 +1,176 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Defines the grammar to use for validation, implements the RFC 2822 (and friends) ABNF grammar definitions.
+ *
+ * @author     Fabien Potencier
+ * @author     Chris Corbyn
+ */
+class Swift_Mime_Grammar
+{
+    /**
+     * Special characters used in the syntax which need to be escaped.
+     *
+     * @var string[]
+     */
+    private static $_specials = array();
+
+    /**
+     * Tokens defined in RFC 2822 (and some related RFCs).
+     *
+     * @var string[]
+     */
+    private static $_grammar = array();
+
+    /**
+     * Initialize some RFC 2822 (and friends) ABNF grammar definitions.
+     */
+    public function __construct()
+    {
+        $this->init();
+    }
+
+    public function __wakeup()
+    {
+        $this->init();
+    }
+
+    protected function init()
+    {
+        if (count(self::$_specials) > 0) {
+            return;
+        }
+
+        self::$_specials = array(
+            '(', ')', '<', '>', '[', ']',
+            ':', ';', '@', ',', '.', '"',
+            );
+
+        /*** Refer to RFC 2822 for ABNF grammar ***/
+
+        // All basic building blocks
+        self::$_grammar['NO-WS-CTL'] = '[\x01-\x08\x0B\x0C\x0E-\x19\x7F]';
+        self::$_grammar['WSP'] = '[ \t]';
+        self::$_grammar['CRLF'] = '(?:\r\n)';
+        self::$_grammar['FWS'] = '(?:(?:'.self::$_grammar['WSP'].'*'.
+                self::$_grammar['CRLF'].')?'.self::$_grammar['WSP'].')';
+        self::$_grammar['text'] = '[\x00-\x08\x0B\x0C\x0E-\x7F]';
+        self::$_grammar['quoted-pair'] = '(?:\\\\'.self::$_grammar['text'].')';
+        self::$_grammar['ctext'] = '(?:'.self::$_grammar['NO-WS-CTL'].
+                '|[\x21-\x27\x2A-\x5B\x5D-\x7E])';
+        // Uses recursive PCRE (?1) -- could be a weak point??
+        self::$_grammar['ccontent'] = '(?:'.self::$_grammar['ctext'].'|'.
+                self::$_grammar['quoted-pair'].'|(?1))';
+        self::$_grammar['comment'] = '(\((?:'.self::$_grammar['FWS'].'|'.
+                self::$_grammar['ccontent'].')*'.self::$_grammar['FWS'].'?\))';
+        self::$_grammar['CFWS'] = '(?:(?:'.self::$_grammar['FWS'].'?'.
+                self::$_grammar['comment'].')*(?:(?:'.self::$_grammar['FWS'].'?'.
+                self::$_grammar['comment'].')|'.self::$_grammar['FWS'].'))';
+        self::$_grammar['qtext'] = '(?:'.self::$_grammar['NO-WS-CTL'].
+                '|[\x21\x23-\x5B\x5D-\x7E])';
+        self::$_grammar['qcontent'] = '(?:'.self::$_grammar['qtext'].'|'.
+                self::$_grammar['quoted-pair'].')';
+        self::$_grammar['quoted-string'] = '(?:'.self::$_grammar['CFWS'].'?"'.
+                '('.self::$_grammar['FWS'].'?'.self::$_grammar['qcontent'].')*'.
+                self::$_grammar['FWS'].'?"'.self::$_grammar['CFWS'].'?)';
+        self::$_grammar['atext'] = '[a-zA-Z0-9!#\$%&\'\*\+\-\/=\?\^_`\{\}\|~]';
+        self::$_grammar['atom'] = '(?:'.self::$_grammar['CFWS'].'?'.
+                self::$_grammar['atext'].'+'.self::$_grammar['CFWS'].'?)';
+        self::$_grammar['dot-atom-text'] = '(?:'.self::$_grammar['atext'].'+'.
+                '(\.'.self::$_grammar['atext'].'+)*)';
+        self::$_grammar['dot-atom'] = '(?:'.self::$_grammar['CFWS'].'?'.
+                self::$_grammar['dot-atom-text'].'+'.self::$_grammar['CFWS'].'?)';
+        self::$_grammar['word'] = '(?:'.self::$_grammar['atom'].'|'.
+                self::$_grammar['quoted-string'].')';
+        self::$_grammar['phrase'] = '(?:'.self::$_grammar['word'].'+?)';
+        self::$_grammar['no-fold-quote'] = '(?:"(?:'.self::$_grammar['qtext'].
+                '|'.self::$_grammar['quoted-pair'].')*")';
+        self::$_grammar['dtext'] = '(?:'.self::$_grammar['NO-WS-CTL'].
+                '|[\x21-\x5A\x5E-\x7E])';
+        self::$_grammar['no-fold-literal'] = '(?:\[(?:'.self::$_grammar['dtext'].
+                '|'.self::$_grammar['quoted-pair'].')*\])';
+
+        // Message IDs
+        self::$_grammar['id-left'] = '(?:'.self::$_grammar['dot-atom-text'].'|'.
+                self::$_grammar['no-fold-quote'].')';
+        self::$_grammar['id-right'] = '(?:'.self::$_grammar['dot-atom-text'].'|'.
+                self::$_grammar['no-fold-literal'].')';
+
+        // Addresses, mailboxes and paths
+        self::$_grammar['local-part'] = '(?:'.self::$_grammar['dot-atom'].'|'.
+                self::$_grammar['quoted-string'].')';
+        self::$_grammar['dcontent'] = '(?:'.self::$_grammar['dtext'].'|'.
+                self::$_grammar['quoted-pair'].')';
+        self::$_grammar['domain-literal'] = '(?:'.self::$_grammar['CFWS'].'?\[('.
+                self::$_grammar['FWS'].'?'.self::$_grammar['dcontent'].')*?'.
+                self::$_grammar['FWS'].'?\]'.self::$_grammar['CFWS'].'?)';
+        self::$_grammar['domain'] = '(?:'.self::$_grammar['dot-atom'].'|'.
+                self::$_grammar['domain-literal'].')';
+        self::$_grammar['addr-spec'] = '(?:'.self::$_grammar['local-part'].'@'.
+                self::$_grammar['domain'].')';
+    }
+
+    /**
+     * Get the grammar defined for $name token.
+     *
+     * @param string $name exactly as written in the RFC
+     *
+     * @return string
+     */
+    public function getDefinition($name)
+    {
+        if (array_key_exists($name, self::$_grammar)) {
+            return self::$_grammar[$name];
+        }
+
+        throw new Swift_RfcComplianceException(
+            "No such grammar '".$name."' defined."
+        );
+    }
+
+    /**
+     * Returns the tokens defined in RFC 2822 (and some related RFCs).
+     *
+     * @return array
+     */
+    public function getGrammarDefinitions()
+    {
+        return self::$_grammar;
+    }
+
+    /**
+     * Returns the current special characters used in the syntax which need to be escaped.
+     *
+     * @return array
+     */
+    public function getSpecials()
+    {
+        return self::$_specials;
+    }
+
+    /**
+     * Escape special characters in a string (convert to quoted-pairs).
+     *
+     * @param string   $token
+     * @param string[] $include additional chars to escape
+     * @param string[] $exclude chars from escaping
+     *
+     * @return string
+     */
+    public function escapeSpecials($token, $include = array(), $exclude = array())
+    {
+        foreach (array_merge(array('\\'), array_diff(self::$_specials, $exclude), $include) as $char) {
+            $token = str_replace($char, '\\'.$char, $token);
+        }
+
+        return $token;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Header.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Header.php
new file mode 100644
index 000000000..a8ddd2721
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Header.php
@@ -0,0 +1,93 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A MIME Header.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_Mime_Header
+{
+    /** Text headers */
+    const TYPE_TEXT = 2;
+
+    /**  headers (text + params) */
+    const TYPE_PARAMETERIZED = 6;
+
+    /** Mailbox and address headers */
+    const TYPE_MAILBOX = 8;
+
+    /** Date and time headers */
+    const TYPE_DATE = 16;
+
+    /** Identification headers */
+    const TYPE_ID = 32;
+
+    /** Address path headers */
+    const TYPE_PATH = 64;
+
+    /**
+     * Get the type of Header that this instance represents.
+     *
+     * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
+     * @see TYPE_DATE, TYPE_ID, TYPE_PATH
+     *
+     * @return int
+     */
+    public function getFieldType();
+
+    /**
+     * Set the model for the field body.
+     *
+     * The actual types needed will vary depending upon the type of Header.
+     *
+     * @param mixed $model
+     */
+    public function setFieldBodyModel($model);
+
+    /**
+     * Set the charset used when rendering the Header.
+     *
+     * @param string $charset
+     */
+    public function setCharset($charset);
+
+    /**
+     * Get the model for the field body.
+     *
+     * The return type depends on the specifics of the Header.
+     *
+     * @return mixed
+     */
+    public function getFieldBodyModel();
+
+    /**
+     * Get the name of this header (e.g. Subject).
+     *
+     * The name is an identifier and as such will be immutable.
+     *
+     * @return string
+     */
+    public function getFieldName();
+
+    /**
+     * Get the field body, prepared for folding into a final header value.
+     *
+     * @return string
+     */
+    public function getFieldBody();
+
+    /**
+     * Get this Header rendered as a compliant string.
+     *
+     * @return string
+     */
+    public function toString();
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/HeaderEncoder.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder.php
similarity index 64%
rename from lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/HeaderEncoder.php
rename to lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder.php
index cc70c5f6c..08fd453d6 100644
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/HeaderEncoder.php
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder.php
@@ -8,21 +8,17 @@
  * file that was distributed with this source code.
  */
 
-//@require 'Swift/Encoder.php';
-
 /**
  * Interface for all Header Encoding schemes.
- * @package Swift
- * @subpackage Mime
+ *
  * @author Chris Corbyn
  */
 interface Swift_Mime_HeaderEncoder extends Swift_Encoder
 {
-  
-  /**
-   * Get the MIME name of this content encoding scheme.
-   * @return string
-   */
-  public function getName();
-  
+    /**
+     * Get the MIME name of this content encoding scheme.
+     *
+     * @return string
+     */
+    public function getName();
 }
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
new file mode 100644
index 000000000..83a4f2f3b
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Handles Base64 (B) Header Encoding in Swift Mailer.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Mime_HeaderEncoder_Base64HeaderEncoder extends Swift_Encoder_Base64Encoder implements Swift_Mime_HeaderEncoder
+{
+    /**
+     * Get the name of this encoding scheme.
+     * Returns the string 'B'.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return 'B';
+    }
+
+    /**
+     * Takes an unencoded string and produces a Base64 encoded string from it.
+     *
+     * If the charset is iso-2022-jp, it uses mb_encode_mimeheader instead of
+     * default encodeString, otherwise pass to the parent method.
+     *
+     * @param string $string          string to encode
+     * @param int    $firstLineOffset
+     * @param int    $maxLineLength   optional, 0 indicates the default of 76 bytes
+     * @param string $charset
+     *
+     * @return string
+     */
+    public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0, $charset = 'utf-8')
+    {
+        if (strtolower($charset) === 'iso-2022-jp') {
+            $old = mb_internal_encoding();
+            mb_internal_encoding('utf-8');
+            $newstring = mb_encode_mimeheader($string, $charset, $this->getName(), "\r\n");
+            mb_internal_encoding($old);
+
+            return $newstring;
+        }
+
+        return parent::encodeString($string, $firstLineOffset, $maxLineLength);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
new file mode 100644
index 000000000..510dd6637
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Handles Quoted Printable (Q) Header Encoding in Swift Mailer.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Mime_HeaderEncoder_QpHeaderEncoder extends Swift_Encoder_QpEncoder implements Swift_Mime_HeaderEncoder
+{
+    /**
+     * Creates a new QpHeaderEncoder for the given CharacterStream.
+     *
+     * @param Swift_CharacterStream $charStream to use for reading characters
+     */
+    public function __construct(Swift_CharacterStream $charStream)
+    {
+        parent::__construct($charStream);
+    }
+
+    protected function initSafeMap()
+    {
+        foreach (array_merge(
+            range(0x61, 0x7A), range(0x41, 0x5A),
+            range(0x30, 0x39), array(0x20, 0x21, 0x2A, 0x2B, 0x2D, 0x2F)
+        ) as $byte) {
+            $this->_safeMap[$byte] = chr($byte);
+        }
+    }
+
+    /**
+     * Get the name of this encoding scheme.
+     *
+     * Returns the string 'Q'.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return 'Q';
+    }
+
+    /**
+     * Takes an unencoded string and produces a QP encoded string from it.
+     *
+     * @param string $string          string to encode
+     * @param int    $firstLineOffset optional
+     * @param int    $maxLineLength   optional, 0 indicates the default of 76 chars
+     *
+     * @return string
+     */
+    public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
+    {
+        return str_replace(array(' ', '=20', "=\r\n"), array('_', '_', "\r\n"),
+            parent::encodeString($string, $firstLineOffset, $maxLineLength)
+        );
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php
new file mode 100644
index 000000000..c65f26d72
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php
@@ -0,0 +1,78 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Creates MIME headers.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_Mime_HeaderFactory extends Swift_Mime_CharsetObserver
+{
+    /**
+     * Create a new Mailbox Header with a list of $addresses.
+     *
+     * @param string       $name
+     * @param array|string $addresses
+     *
+     * @return Swift_Mime_Header
+     */
+    public function createMailboxHeader($name, $addresses = null);
+
+    /**
+     * Create a new Date header using $timestamp (UNIX time).
+     *
+     * @param string $name
+     * @param int    $timestamp
+     *
+     * @return Swift_Mime_Header
+     */
+    public function createDateHeader($name, $timestamp = null);
+
+    /**
+     * Create a new basic text header with $name and $value.
+     *
+     * @param string $name
+     * @param string $value
+     *
+     * @return Swift_Mime_Header
+     */
+    public function createTextHeader($name, $value = null);
+
+    /**
+     * Create a new ParameterizedHeader with $name, $value and $params.
+     *
+     * @param string $name
+     * @param string $value
+     * @param array  $params
+     *
+     * @return Swift_Mime_ParameterizedHeader
+     */
+    public function createParameterizedHeader($name, $value = null, $params = array());
+
+    /**
+     * Create a new ID header for Message-ID or Content-ID.
+     *
+     * @param string       $name
+     * @param string|array $ids
+     *
+     * @return Swift_Mime_Header
+     */
+    public function createIdHeader($name, $ids = null);
+
+    /**
+     * Create a new Path header with an address (path) in it.
+     *
+     * @param string $name
+     * @param string $path
+     *
+     * @return Swift_Mime_Header
+     */
+    public function createPathHeader($name, $path = null);
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php
new file mode 100644
index 000000000..7390d2c8a
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php
@@ -0,0 +1,169 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A collection of MIME headers.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_Mime_HeaderSet extends Swift_Mime_CharsetObserver
+{
+    /**
+     * Add a new Mailbox Header with a list of $addresses.
+     *
+     * @param string       $name
+     * @param array|string $addresses
+     */
+    public function addMailboxHeader($name, $addresses = null);
+
+    /**
+     * Add a new Date header using $timestamp (UNIX time).
+     *
+     * @param string $name
+     * @param int    $timestamp
+     */
+    public function addDateHeader($name, $timestamp = null);
+
+    /**
+     * Add a new basic text header with $name and $value.
+     *
+     * @param string $name
+     * @param string $value
+     */
+    public function addTextHeader($name, $value = null);
+
+    /**
+     * Add a new ParameterizedHeader with $name, $value and $params.
+     *
+     * @param string $name
+     * @param string $value
+     * @param array  $params
+     */
+    public function addParameterizedHeader($name, $value = null, $params = array());
+
+    /**
+     * Add a new ID header for Message-ID or Content-ID.
+     *
+     * @param string       $name
+     * @param string|array $ids
+     */
+    public function addIdHeader($name, $ids = null);
+
+    /**
+     * Add a new Path header with an address (path) in it.
+     *
+     * @param string $name
+     * @param string $path
+     */
+    public function addPathHeader($name, $path = null);
+
+    /**
+     * Returns true if at least one header with the given $name exists.
+     *
+     * If multiple headers match, the actual one may be specified by $index.
+     *
+     * @param string $name
+     * @param int    $index
+     *
+     * @return bool
+     */
+    public function has($name, $index = 0);
+
+    /**
+     * Set a header in the HeaderSet.
+     *
+     * The header may be a previously fetched header via {@link get()} or it may
+     * be one that has been created separately.
+     *
+     * If $index is specified, the header will be inserted into the set at this
+     * offset.
+     *
+     * @param Swift_Mime_Header $header
+     * @param int               $index
+     */
+    public function set(Swift_Mime_Header $header, $index = 0);
+
+    /**
+     * Get the header with the given $name.
+     * If multiple headers match, the actual one may be specified by $index.
+     * Returns NULL if none present.
+     *
+     * @param string $name
+     * @param int    $index
+     *
+     * @return Swift_Mime_Header
+     */
+    public function get($name, $index = 0);
+
+    /**
+     * Get all headers with the given $name.
+     *
+     * @param string $name
+     *
+     * @return array
+     */
+    public function getAll($name = null);
+
+    /**
+     * Return the name of all Headers.
+     *
+     * @return array
+     */
+    public function listAll();
+
+    /**
+     * Remove the header with the given $name if it's set.
+     *
+     * If multiple headers match, the actual one may be specified by $index.
+     *
+     * @param string $name
+     * @param int    $index
+     */
+    public function remove($name, $index = 0);
+
+    /**
+     * Remove all headers with the given $name.
+     *
+     * @param string $name
+     */
+    public function removeAll($name);
+
+    /**
+     * Create a new instance of this HeaderSet.
+     *
+     * @return Swift_Mime_HeaderSet
+     */
+    public function newInstance();
+
+    /**
+     * Define a list of Header names as an array in the correct order.
+     *
+     * These Headers will be output in the given order where present.
+     *
+     * @param array $sequence
+     */
+    public function defineOrdering(array $sequence);
+
+    /**
+     * Set a list of header names which must always be displayed when set.
+     *
+     * Usually headers without a field value won't be output unless set here.
+     *
+     * @param array $names
+     */
+    public function setAlwaysDisplayed(array $names);
+
+    /**
+     * Returns a string with a representation of all headers.
+     *
+     * @return string
+     */
+    public function toString();
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
new file mode 100644
index 000000000..fbd9258a3
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
@@ -0,0 +1,503 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An abstract base MIME Header.
+ *
+ * @author Chris Corbyn
+ */
+abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
+{
+    /**
+     * The name of this Header.
+     *
+     * @var string
+     */
+    private $_name;
+
+    /**
+     * The Grammar used for this Header.
+     *
+     * @var Swift_Mime_Grammar
+     */
+    private $_grammar;
+
+    /**
+     * The Encoder used to encode this Header.
+     *
+     * @var Swift_Encoder
+     */
+    private $_encoder;
+
+    /**
+     * The maximum length of a line in the header.
+     *
+     * @var int
+     */
+    private $_lineLength = 78;
+
+    /**
+     * The language used in this Header.
+     *
+     * @var string
+     */
+    private $_lang;
+
+    /**
+     * The character set of the text in this Header.
+     *
+     * @var string
+     */
+    private $_charset = 'utf-8';
+
+    /**
+     * The value of this Header, cached.
+     *
+     * @var string
+     */
+    private $_cachedValue = null;
+
+    /**
+     * Creates a new Header.
+     *
+     * @param Swift_Mime_Grammar $grammar
+     */
+    public function __construct(Swift_Mime_Grammar $grammar)
+    {
+        $this->setGrammar($grammar);
+    }
+
+    /**
+     * Set the character set used in this Header.
+     *
+     * @param string $charset
+     */
+    public function setCharset($charset)
+    {
+        $this->clearCachedValueIf($charset != $this->_charset);
+        $this->_charset = $charset;
+        if (isset($this->_encoder)) {
+            $this->_encoder->charsetChanged($charset);
+        }
+    }
+
+    /**
+     * Get the character set used in this Header.
+     *
+     * @return string
+     */
+    public function getCharset()
+    {
+        return $this->_charset;
+    }
+
+    /**
+     * Set the language used in this Header.
+     *
+     * For example, for US English, 'en-us'.
+     * This can be unspecified.
+     *
+     * @param string $lang
+     */
+    public function setLanguage($lang)
+    {
+        $this->clearCachedValueIf($this->_lang != $lang);
+        $this->_lang = $lang;
+    }
+
+    /**
+     * Get the language used in this Header.
+     *
+     * @return string
+     */
+    public function getLanguage()
+    {
+        return $this->_lang;
+    }
+
+    /**
+     * Set the encoder used for encoding the header.
+     *
+     * @param Swift_Mime_HeaderEncoder $encoder
+     */
+    public function setEncoder(Swift_Mime_HeaderEncoder $encoder)
+    {
+        $this->_encoder = $encoder;
+        $this->setCachedValue(null);
+    }
+
+    /**
+     * Get the encoder used for encoding this Header.
+     *
+     * @return Swift_Mime_HeaderEncoder
+     */
+    public function getEncoder()
+    {
+        return $this->_encoder;
+    }
+
+    /**
+     * Set the grammar used for the header.
+     *
+     * @param Swift_Mime_Grammar $grammar
+     */
+    public function setGrammar(Swift_Mime_Grammar $grammar)
+    {
+        $this->_grammar = $grammar;
+        $this->setCachedValue(null);
+    }
+
+    /**
+     * Get the grammar used for this Header.
+     *
+     * @return Swift_Mime_Grammar
+     */
+    public function getGrammar()
+    {
+        return $this->_grammar;
+    }
+
+    /**
+     * Get the name of this header (e.g. charset).
+     *
+     * @return string
+     */
+    public function getFieldName()
+    {
+        return $this->_name;
+    }
+
+    /**
+     * Set the maximum length of lines in the header (excluding EOL).
+     *
+     * @param int $lineLength
+     */
+    public function setMaxLineLength($lineLength)
+    {
+        $this->clearCachedValueIf($this->_lineLength != $lineLength);
+        $this->_lineLength = $lineLength;
+    }
+
+    /**
+     * Get the maximum permitted length of lines in this Header.
+     *
+     * @return int
+     */
+    public function getMaxLineLength()
+    {
+        return $this->_lineLength;
+    }
+
+    /**
+     * Get this Header rendered as a RFC 2822 compliant string.
+     *
+     * @throws Swift_RfcComplianceException
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return $this->_tokensToString($this->toTokens());
+    }
+
+    /**
+     * Returns a string representation of this object.
+     *
+     * @return string
+     *
+     * @see toString()
+     */
+    public function __toString()
+    {
+        return $this->toString();
+    }
+
+    // -- Points of extension
+
+    /**
+     * Set the name of this Header field.
+     *
+     * @param string $name
+     */
+    protected function setFieldName($name)
+    {
+        $this->_name = $name;
+    }
+
+    /**
+     * Produces a compliant, formatted RFC 2822 'phrase' based on the string given.
+     *
+     * @param Swift_Mime_Header        $header
+     * @param string                   $string  as displayed
+     * @param string                   $charset of the text
+     * @param Swift_Mime_HeaderEncoder $encoder
+     * @param bool                     $shorten the first line to make remove for header name
+     *
+     * @return string
+     */
+    protected function createPhrase(Swift_Mime_Header $header, $string, $charset, Swift_Mime_HeaderEncoder $encoder = null, $shorten = false)
+    {
+        // Treat token as exactly what was given
+        $phraseStr = $string;
+        // If it's not valid
+        if (!preg_match('/^'.$this->getGrammar()->getDefinition('phrase').'$/D', $phraseStr)) {
+            // .. but it is just ascii text, try escaping some characters
+            // and make it a quoted-string
+            if (preg_match('/^'.$this->getGrammar()->getDefinition('text').'*$/D', $phraseStr)) {
+                $phraseStr = $this->getGrammar()->escapeSpecials(
+                    $phraseStr, array('"'), $this->getGrammar()->getSpecials()
+                    );
+                $phraseStr = '"'.$phraseStr.'"';
+            } else {
+                // ... otherwise it needs encoding
+                // Determine space remaining on line if first line
+                if ($shorten) {
+                    $usedLength = strlen($header->getFieldName().': ');
+                } else {
+                    $usedLength = 0;
+                }
+                $phraseStr = $this->encodeWords($header, $string, $usedLength);
+            }
+        }
+
+        return $phraseStr;
+    }
+
+    /**
+     * Encode needed word tokens within a string of input.
+     *
+     * @param Swift_Mime_Header $header
+     * @param string            $input
+     * @param string            $usedLength optional
+     *
+     * @return string
+     */
+    protected function encodeWords(Swift_Mime_Header $header, $input, $usedLength = -1)
+    {
+        $value = '';
+
+        $tokens = $this->getEncodableWordTokens($input);
+
+        foreach ($tokens as $token) {
+            // See RFC 2822, Sect 2.2 (really 2.2 ??)
+            if ($this->tokenNeedsEncoding($token)) {
+                // Don't encode starting WSP
+                $firstChar = substr($token, 0, 1);
+                switch ($firstChar) {
+                    case ' ':
+                    case "\t":
+                        $value .= $firstChar;
+                        $token = substr($token, 1);
+                }
+
+                if (-1 == $usedLength) {
+                    $usedLength = strlen($header->getFieldName().': ') + strlen($value);
+                }
+                $value .= $this->getTokenAsEncodedWord($token, $usedLength);
+
+                $header->setMaxLineLength(76); // Forcefully override
+            } else {
+                $value .= $token;
+            }
+        }
+
+        return $value;
+    }
+
+    /**
+     * Test if a token needs to be encoded or not.
+     *
+     * @param string $token
+     *
+     * @return bool
+     */
+    protected function tokenNeedsEncoding($token)
+    {
+        return preg_match('~[\x00-\x08\x10-\x19\x7F-\xFF\r\n]~', $token);
+    }
+
+    /**
+     * Splits a string into tokens in blocks of words which can be encoded quickly.
+     *
+     * @param string $string
+     *
+     * @return string[]
+     */
+    protected function getEncodableWordTokens($string)
+    {
+        $tokens = array();
+
+        $encodedToken = '';
+        // Split at all whitespace boundaries
+        foreach (preg_split('~(?=[\t ])~', $string) as $token) {
+            if ($this->tokenNeedsEncoding($token)) {
+                $encodedToken .= $token;
+            } else {
+                if (strlen($encodedToken) > 0) {
+                    $tokens[] = $encodedToken;
+                    $encodedToken = '';
+                }
+                $tokens[] = $token;
+            }
+        }
+        if (strlen($encodedToken)) {
+            $tokens[] = $encodedToken;
+        }
+
+        return $tokens;
+    }
+
+    /**
+     * Get a token as an encoded word for safe insertion into headers.
+     *
+     * @param string $token           token to encode
+     * @param int    $firstLineOffset optional
+     *
+     * @return string
+     */
+    protected function getTokenAsEncodedWord($token, $firstLineOffset = 0)
+    {
+        // Adjust $firstLineOffset to account for space needed for syntax
+        $charsetDecl = $this->_charset;
+        if (isset($this->_lang)) {
+            $charsetDecl .= '*'.$this->_lang;
+        }
+        $encodingWrapperLength = strlen(
+            '=?'.$charsetDecl.'?'.$this->_encoder->getName().'??='
+            );
+
+        if ($firstLineOffset >= 75) {
+            //Does this logic need to be here?
+            $firstLineOffset = 0;
+        }
+
+        $encodedTextLines = explode("\r\n",
+            $this->_encoder->encodeString(
+                $token, $firstLineOffset, 75 - $encodingWrapperLength, $this->_charset
+                )
+        );
+
+        if (strtolower($this->_charset) !== 'iso-2022-jp') {
+            // special encoding for iso-2022-jp using mb_encode_mimeheader
+            foreach ($encodedTextLines as $lineNum => $line) {
+                $encodedTextLines[$lineNum] = '=?'.$charsetDecl.
+                    '?'.$this->_encoder->getName().
+                    '?'.$line.'?=';
+            }
+        }
+
+        return implode("\r\n ", $encodedTextLines);
+    }
+
+    /**
+     * Generates tokens from the given string which include CRLF as individual tokens.
+     *
+     * @param string $token
+     *
+     * @return string[]
+     */
+    protected function generateTokenLines($token)
+    {
+        return preg_split('~(\r\n)~', $token, -1, PREG_SPLIT_DELIM_CAPTURE);
+    }
+
+    /**
+     * Set a value into the cache.
+     *
+     * @param string $value
+     */
+    protected function setCachedValue($value)
+    {
+        $this->_cachedValue = $value;
+    }
+
+    /**
+     * Get the value in the cache.
+     *
+     * @return string
+     */
+    protected function getCachedValue()
+    {
+        return $this->_cachedValue;
+    }
+
+    /**
+     * Clear the cached value if $condition is met.
+     *
+     * @param bool $condition
+     */
+    protected function clearCachedValueIf($condition)
+    {
+        if ($condition) {
+            $this->setCachedValue(null);
+        }
+    }
+
+    /**
+     * Generate a list of all tokens in the final header.
+     *
+     * @param string $string The string to tokenize
+     *
+     * @return array An array of tokens as strings
+     */
+    protected function toTokens($string = null)
+    {
+        if (is_null($string)) {
+            $string = $this->getFieldBody();
+        }
+
+        $tokens = array();
+
+        // Generate atoms; split at all invisible boundaries followed by WSP
+        foreach (preg_split('~(?=[ \t])~', $string) as $token) {
+            $newTokens = $this->generateTokenLines($token);
+            foreach ($newTokens as $newToken) {
+                $tokens[] = $newToken;
+            }
+        }
+
+        return $tokens;
+    }
+
+    /**
+     * Takes an array of tokens which appear in the header and turns them into
+     * an RFC 2822 compliant string, adding FWSP where needed.
+     *
+     * @param string[] $tokens
+     *
+     * @return string
+     */
+    private function _tokensToString(array $tokens)
+    {
+        $lineCount = 0;
+        $headerLines = array();
+        $headerLines[] = $this->_name.': ';
+        $currentLine = &$headerLines[$lineCount++];
+
+        // Build all tokens back into compliant header
+        foreach ($tokens as $i => $token) {
+            // Line longer than specified maximum or token was just a new line
+            if (("\r\n" == $token) ||
+                ($i > 0 && strlen($currentLine.$token) > $this->_lineLength)
+                && 0 < strlen($currentLine)) {
+                $headerLines[] = '';
+                $currentLine = &$headerLines[$lineCount++];
+            }
+
+            // Append token to the line
+            if ("\r\n" != $token) {
+                $currentLine .= $token;
+            }
+        }
+
+        // Implode with FWS (RFC 2822, 2.2.3)
+        return implode("\r\n", $headerLines)."\r\n";
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
new file mode 100644
index 000000000..4fd667429
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
@@ -0,0 +1,125 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A Date MIME Header for Swift Mailer.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Mime_Headers_DateHeader extends Swift_Mime_Headers_AbstractHeader
+{
+    /**
+     * The UNIX timestamp value of this Header.
+     *
+     * @var int
+     */
+    private $_timestamp;
+
+    /**
+     * Creates a new DateHeader with $name and $timestamp.
+     *
+     * Example:
+     * <code>
+     * <?php
+     * $header = new Swift_Mime_Headers_DateHeader('Date', time());
+     * ?>
+     * </code>
+     *
+     * @param string             $name    of Header
+     * @param Swift_Mime_Grammar $grammar
+     */
+    public function __construct($name, Swift_Mime_Grammar $grammar)
+    {
+        $this->setFieldName($name);
+        parent::__construct($grammar);
+    }
+
+    /**
+     * Get the type of Header that this instance represents.
+     *
+     * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
+     * @see TYPE_DATE, TYPE_ID, TYPE_PATH
+     *
+     * @return int
+     */
+    public function getFieldType()
+    {
+        return self::TYPE_DATE;
+    }
+
+    /**
+     * Set the model for the field body.
+     *
+     * This method takes a UNIX timestamp.
+     *
+     * @param int $model
+     */
+    public function setFieldBodyModel($model)
+    {
+        $this->setTimestamp($model);
+    }
+
+    /**
+     * Get the model for the field body.
+     *
+     * This method returns a UNIX timestamp.
+     *
+     * @return mixed
+     */
+    public function getFieldBodyModel()
+    {
+        return $this->getTimestamp();
+    }
+
+    /**
+     * Get the UNIX timestamp of the Date in this Header.
+     *
+     * @return int
+     */
+    public function getTimestamp()
+    {
+        return $this->_timestamp;
+    }
+
+    /**
+     * Set the UNIX timestamp of the Date in this Header.
+     *
+     * @param int $timestamp
+     */
+    public function setTimestamp($timestamp)
+    {
+        if (!is_null($timestamp)) {
+            $timestamp = (int) $timestamp;
+        }
+        $this->clearCachedValueIf($this->_timestamp != $timestamp);
+        $this->_timestamp = $timestamp;
+    }
+
+    /**
+     * Get the string value of the body in this Header.
+     *
+     * This is not necessarily RFC 2822 compliant since folding white space will
+     * not be added at this stage (see {@link toString()} for that).
+     *
+     * @see toString()
+     *
+     * @return string
+     */
+    public function getFieldBody()
+    {
+        if (!$this->getCachedValue()) {
+            if (isset($this->_timestamp)) {
+                $this->setCachedValue(date('r', $this->_timestamp));
+            }
+        }
+
+        return $this->getCachedValue();
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
new file mode 100644
index 000000000..b114506b4
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
@@ -0,0 +1,180 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An ID MIME Header for something like Message-ID or Content-ID.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_AbstractHeader
+{
+    /**
+     * The IDs used in the value of this Header.
+     *
+     * This may hold multiple IDs or just a single ID.
+     *
+     * @var string[]
+     */
+    private $_ids = array();
+
+    /**
+     * Creates a new IdentificationHeader with the given $name and $id.
+     *
+     * @param string             $name
+     * @param Swift_Mime_Grammar $grammar
+     */
+    public function __construct($name, Swift_Mime_Grammar $grammar)
+    {
+        $this->setFieldName($name);
+        parent::__construct($grammar);
+    }
+
+    /**
+     * Get the type of Header that this instance represents.
+     *
+     * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
+     * @see TYPE_DATE, TYPE_ID, TYPE_PATH
+     *
+     * @return int
+     */
+    public function getFieldType()
+    {
+        return self::TYPE_ID;
+    }
+
+    /**
+     * Set the model for the field body.
+     *
+     * This method takes a string ID, or an array of IDs.
+     *
+     * @param mixed $model
+     *
+     * @throws Swift_RfcComplianceException
+     */
+    public function setFieldBodyModel($model)
+    {
+        $this->setId($model);
+    }
+
+    /**
+     * Get the model for the field body.
+     *
+     * This method returns an array of IDs
+     *
+     * @return array
+     */
+    public function getFieldBodyModel()
+    {
+        return $this->getIds();
+    }
+
+    /**
+     * Set the ID used in the value of this header.
+     *
+     * @param string|array $id
+     *
+     * @throws Swift_RfcComplianceException
+     */
+    public function setId($id)
+    {
+        $this->setIds(is_array($id) ? $id : array($id));
+    }
+
+    /**
+     * Get the ID used in the value of this Header.
+     *
+     * If multiple IDs are set only the first is returned.
+     *
+     * @return string
+     */
+    public function getId()
+    {
+        if (count($this->_ids) > 0) {
+            return $this->_ids[0];
+        }
+    }
+
+    /**
+     * Set a collection of IDs to use in the value of this Header.
+     *
+     * @param string[] $ids
+     *
+     * @throws Swift_RfcComplianceException
+     */
+    public function setIds(array $ids)
+    {
+        $actualIds = array();
+
+        foreach ($ids as $id) {
+            $this->_assertValidId($id);
+            $actualIds[] = $id;
+        }
+
+        $this->clearCachedValueIf($this->_ids != $actualIds);
+        $this->_ids = $actualIds;
+    }
+
+    /**
+     * Get the list of IDs used in this Header.
+     *
+     * @return string[]
+     */
+    public function getIds()
+    {
+        return $this->_ids;
+    }
+
+    /**
+     * Get the string value of the body in this Header.
+     *
+     * This is not necessarily RFC 2822 compliant since folding white space will
+     * not be added at this stage (see {@see toString()} for that).
+     *
+     * @see toString()
+     *
+     * @throws Swift_RfcComplianceException
+     *
+     * @return string
+     */
+    public function getFieldBody()
+    {
+        if (!$this->getCachedValue()) {
+            $angleAddrs = array();
+
+            foreach ($this->_ids as $id) {
+                $angleAddrs[] = '<'.$id.'>';
+            }
+
+            $this->setCachedValue(implode(' ', $angleAddrs));
+        }
+
+        return $this->getCachedValue();
+    }
+
+    /**
+     * Throws an Exception if the id passed does not comply with RFC 2822.
+     *
+     * @param string $id
+     *
+     * @throws Swift_RfcComplianceException
+     */
+    private function _assertValidId($id)
+    {
+        if (!preg_match(
+            '/^'.$this->getGrammar()->getDefinition('id-left').'@'.
+            $this->getGrammar()->getDefinition('id-right').'$/D',
+            $id
+            )) {
+            throw new Swift_RfcComplianceException(
+                'Invalid ID given <'.$id.'>'
+                );
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
new file mode 100644
index 000000000..222a57c43
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
@@ -0,0 +1,353 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A Mailbox Address MIME Header for something like From or Sender.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
+{
+    /**
+     * The mailboxes used in this Header.
+     *
+     * @var string[]
+     */
+    private $_mailboxes = array();
+
+    /**
+     * Creates a new MailboxHeader with $name.
+     *
+     * @param string                   $name    of Header
+     * @param Swift_Mime_HeaderEncoder $encoder
+     * @param Swift_Mime_Grammar       $grammar
+     */
+    public function __construct($name, Swift_Mime_HeaderEncoder $encoder, Swift_Mime_Grammar $grammar)
+    {
+        $this->setFieldName($name);
+        $this->setEncoder($encoder);
+        parent::__construct($grammar);
+    }
+
+    /**
+     * Get the type of Header that this instance represents.
+     *
+     * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
+     * @see TYPE_DATE, TYPE_ID, TYPE_PATH
+     *
+     * @return int
+     */
+    public function getFieldType()
+    {
+        return self::TYPE_MAILBOX;
+    }
+
+    /**
+     * Set the model for the field body.
+     *
+     * This method takes a string, or an array of addresses.
+     *
+     * @param mixed $model
+     *
+     * @throws Swift_RfcComplianceException
+     */
+    public function setFieldBodyModel($model)
+    {
+        $this->setNameAddresses($model);
+    }
+
+    /**
+     * Get the model for the field body.
+     *
+     * This method returns an associative array like {@link getNameAddresses()}
+     *
+     * @throws Swift_RfcComplianceException
+     *
+     * @return array
+     */
+    public function getFieldBodyModel()
+    {
+        return $this->getNameAddresses();
+    }
+
+    /**
+     * Set a list of mailboxes to be shown in this Header.
+     *
+     * The mailboxes can be a simple array of addresses, or an array of
+     * key=>value pairs where (email => personalName).
+     * Example:
+     * <code>
+     * <?php
+     * //Sets two mailboxes in the Header, one with a personal name
+     * $header->setNameAddresses(array(
+     *  'chris@swiftmailer.org' => 'Chris Corbyn',
+     *  'mark@swiftmailer.org' //No associated personal name
+     *  ));
+     * ?>
+     * </code>
+     *
+     * @see __construct()
+     * @see setAddresses()
+     * @see setValue()
+     *
+     * @param string|string[] $mailboxes
+     *
+     * @throws Swift_RfcComplianceException
+     */
+    public function setNameAddresses($mailboxes)
+    {
+        $this->_mailboxes = $this->normalizeMailboxes((array) $mailboxes);
+        $this->setCachedValue(null); //Clear any cached value
+    }
+
+    /**
+     * Get the full mailbox list of this Header as an array of valid RFC 2822 strings.
+     *
+     * Example:
+     * <code>
+     * <?php
+     * $header = new Swift_Mime_Headers_MailboxHeader('From',
+     *  array('chris@swiftmailer.org' => 'Chris Corbyn',
+     *  'mark@swiftmailer.org' => 'Mark Corbyn')
+     *  );
+     * print_r($header->getNameAddressStrings());
+     * // array (
+     * // 0 => Chris Corbyn <chris@swiftmailer.org>,
+     * // 1 => Mark Corbyn <mark@swiftmailer.org>
+     * // )
+     * ?>
+     * </code>
+     *
+     * @see getNameAddresses()
+     * @see toString()
+     *
+     * @throws Swift_RfcComplianceException
+     *
+     * @return string[]
+     */
+    public function getNameAddressStrings()
+    {
+        return $this->_createNameAddressStrings($this->getNameAddresses());
+    }
+
+    /**
+     * Get all mailboxes in this Header as key=>value pairs.
+     *
+     * The key is the address and the value is the name (or null if none set).
+     * Example:
+     * <code>
+     * <?php
+     * $header = new Swift_Mime_Headers_MailboxHeader('From',
+     *  array('chris@swiftmailer.org' => 'Chris Corbyn',
+     *  'mark@swiftmailer.org' => 'Mark Corbyn')
+     *  );
+     * print_r($header->getNameAddresses());
+     * // array (
+     * // chris@swiftmailer.org => Chris Corbyn,
+     * // mark@swiftmailer.org => Mark Corbyn
+     * // )
+     * ?>
+     * </code>
+     *
+     * @see getAddresses()
+     * @see getNameAddressStrings()
+     *
+     * @return string[]
+     */
+    public function getNameAddresses()
+    {
+        return $this->_mailboxes;
+    }
+
+    /**
+     * Makes this Header represent a list of plain email addresses with no names.
+     *
+     * Example:
+     * <code>
+     * <?php
+     * //Sets three email addresses as the Header data
+     * $header->setAddresses(
+     *  array('one@domain.tld', 'two@domain.tld', 'three@domain.tld')
+     *  );
+     * ?>
+     * </code>
+     *
+     * @see setNameAddresses()
+     * @see setValue()
+     *
+     * @param string[] $addresses
+     *
+     * @throws Swift_RfcComplianceException
+     */
+    public function setAddresses($addresses)
+    {
+        $this->setNameAddresses(array_values((array) $addresses));
+    }
+
+    /**
+     * Get all email addresses in this Header.
+     *
+     * @see getNameAddresses()
+     *
+     * @return string[]
+     */
+    public function getAddresses()
+    {
+        return array_keys($this->_mailboxes);
+    }
+
+    /**
+     * Remove one or more addresses from this Header.
+     *
+     * @param string|string[] $addresses
+     */
+    public function removeAddresses($addresses)
+    {
+        $this->setCachedValue(null);
+        foreach ((array) $addresses as $address) {
+            unset($this->_mailboxes[$address]);
+        }
+    }
+
+    /**
+     * Get the string value of the body in this Header.
+     *
+     * This is not necessarily RFC 2822 compliant since folding white space will
+     * not be added at this stage (see {@link toString()} for that).
+     *
+     * @see toString()
+     *
+     * @throws Swift_RfcComplianceException
+     *
+     * @return string
+     */
+    public function getFieldBody()
+    {
+        // Compute the string value of the header only if needed
+        if (is_null($this->getCachedValue())) {
+            $this->setCachedValue($this->createMailboxListString($this->_mailboxes));
+        }
+
+        return $this->getCachedValue();
+    }
+
+    // -- Points of extension
+
+    /**
+     * Normalizes a user-input list of mailboxes into consistent key=>value pairs.
+     *
+     * @param string[] $mailboxes
+     *
+     * @return string[]
+     */
+    protected function normalizeMailboxes(array $mailboxes)
+    {
+        $actualMailboxes = array();
+
+        foreach ($mailboxes as $key => $value) {
+            if (is_string($key)) {
+                //key is email addr
+                $address = $key;
+                $name = $value;
+            } else {
+                $address = $value;
+                $name = null;
+            }
+            $this->_assertValidAddress($address);
+            $actualMailboxes[$address] = $name;
+        }
+
+        return $actualMailboxes;
+    }
+
+    /**
+     * Produces a compliant, formatted display-name based on the string given.
+     *
+     * @param string $displayName as displayed
+     * @param bool   $shorten     the first line to make remove for header name
+     *
+     * @return string
+     */
+    protected function createDisplayNameString($displayName, $shorten = false)
+    {
+        return $this->createPhrase($this, $displayName, $this->getCharset(), $this->getEncoder(), $shorten);
+    }
+
+    /**
+     * Creates a string form of all the mailboxes in the passed array.
+     *
+     * @param string[] $mailboxes
+     *
+     * @throws Swift_RfcComplianceException
+     *
+     * @return string
+     */
+    protected function createMailboxListString(array $mailboxes)
+    {
+        return implode(', ', $this->_createNameAddressStrings($mailboxes));
+    }
+
+    /**
+     * Redefine the encoding requirements for mailboxes.
+     *
+     * All "specials" must be encoded as the full header value will not be quoted
+     * 
+     * @see RFC 2822 3.2.1
+     *
+     * @param string $token
+     *
+     * @return bool
+     */
+    protected function tokenNeedsEncoding($token)
+    {
+        return preg_match('/[()<>\[\]:;@\,."]/', $token) || parent::tokenNeedsEncoding($token);
+    }
+
+    /**
+     * Return an array of strings conforming the the name-addr spec of RFC 2822.
+     *
+     * @param string[] $mailboxes
+     *
+     * @return string[]
+     */
+    private function _createNameAddressStrings(array $mailboxes)
+    {
+        $strings = array();
+
+        foreach ($mailboxes as $email => $name) {
+            $mailboxStr = $email;
+            if (!is_null($name)) {
+                $nameStr = $this->createDisplayNameString($name, empty($strings));
+                $mailboxStr = $nameStr.' <'.$mailboxStr.'>';
+            }
+            $strings[] = $mailboxStr;
+        }
+
+        return $strings;
+    }
+
+    /**
+     * Throws an Exception if the address passed does not comply with RFC 2822.
+     *
+     * @param string $address
+     *
+     * @throws Swift_RfcComplianceException If invalid.
+     */
+    private function _assertValidAddress($address)
+    {
+        if (!preg_match('/^'.$this->getGrammar()->getDefinition('addr-spec').'$/D',
+            $address)) {
+            throw new Swift_RfcComplianceException(
+                'Address in mailbox given ['.$address.
+                '] does not comply with RFC 2822, 3.6.2.'
+                );
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
new file mode 100644
index 000000000..b52b964b7
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
@@ -0,0 +1,137 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An OpenDKIM Specific Header using only raw header datas without encoding.
+ *
+ * @author De Cock Xavier <xdecock@gmail.com>
+ */
+class Swift_Mime_Headers_OpenDKIMHeader implements Swift_Mime_Header
+{
+    /**
+     * The value of this Header.
+     *
+     * @var string
+     */
+    private $_value;
+
+    /**
+     * The name of this Header.
+     *
+     * @var string
+     */
+    private $_fieldName;
+
+    /**
+     * Creates a new SimpleHeader with $name.
+     *
+     * @param string                   $name
+     * @param Swift_Mime_HeaderEncoder $encoder
+     * @param Swift_Mime_Grammar       $grammar
+     */
+    public function __construct($name)
+    {
+        $this->_fieldName = $name;
+    }
+
+    /**
+     * Get the type of Header that this instance represents.
+     *
+     * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
+     * @see TYPE_DATE, TYPE_ID, TYPE_PATH
+     *
+     * @return int
+     */
+    public function getFieldType()
+    {
+        return self::TYPE_TEXT;
+    }
+
+    /**
+     * Set the model for the field body.
+     *
+     * This method takes a string for the field value.
+     *
+     * @param string $model
+     */
+    public function setFieldBodyModel($model)
+    {
+        $this->setValue($model);
+    }
+
+    /**
+     * Get the model for the field body.
+     *
+     * This method returns a string.
+     *
+     * @return string
+     */
+    public function getFieldBodyModel()
+    {
+        return $this->getValue();
+    }
+
+    /**
+     * Get the (unencoded) value of this header.
+     *
+     * @return string
+     */
+    public function getValue()
+    {
+        return $this->_value;
+    }
+
+    /**
+     * Set the (unencoded) value of this header.
+     *
+     * @param string $value
+     */
+    public function setValue($value)
+    {
+        $this->_value = $value;
+    }
+
+    /**
+     * Get the value of this header prepared for rendering.
+     *
+     * @return string
+     */
+    public function getFieldBody()
+    {
+        return $this->_value;
+    }
+
+    /**
+     * Get this Header rendered as a RFC 2822 compliant string.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return $this->_fieldName.': '.$this->_value;
+    }
+
+    /**
+     * Set the Header FieldName.
+     *
+     * @see Swift_Mime_Header::getFieldName()
+     */
+    public function getFieldName()
+    {
+        return $this->_fieldName;
+    }
+
+    /**
+     * Ignored.
+     */
+    public function setCharset($charset)
+    {
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
new file mode 100644
index 000000000..c506daec1
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
@@ -0,0 +1,258 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An abstract base MIME Header.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_UnstructuredHeader implements Swift_Mime_ParameterizedHeader
+{
+    /**
+     * RFC 2231's definition of a token.
+     *
+     * @var string
+     */
+    const TOKEN_REGEX = '(?:[\x21\x23-\x27\x2A\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7E]+)';
+
+    /**
+     * The Encoder used to encode the parameters.
+     *
+     * @var Swift_Encoder
+     */
+    private $_paramEncoder;
+
+    /**
+     * The parameters as an associative array.
+     *
+     * @var string[]
+     */
+    private $_params = array();
+
+    /**
+     * Creates a new ParameterizedHeader with $name.
+     *
+     * @param string                   $name
+     * @param Swift_Mime_HeaderEncoder $encoder
+     * @param Swift_Encoder            $paramEncoder, optional
+     * @param Swift_Mime_Grammar       $grammar
+     */
+    public function __construct($name, Swift_Mime_HeaderEncoder $encoder, Swift_Encoder $paramEncoder = null, Swift_Mime_Grammar $grammar)
+    {
+        parent::__construct($name, $encoder, $grammar);
+        $this->_paramEncoder = $paramEncoder;
+    }
+
+    /**
+     * Get the type of Header that this instance represents.
+     *
+     * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
+     * @see TYPE_DATE, TYPE_ID, TYPE_PATH
+     *
+     * @return int
+     */
+    public function getFieldType()
+    {
+        return self::TYPE_PARAMETERIZED;
+    }
+
+    /**
+     * Set the character set used in this Header.
+     *
+     * @param string $charset
+     */
+    public function setCharset($charset)
+    {
+        parent::setCharset($charset);
+        if (isset($this->_paramEncoder)) {
+            $this->_paramEncoder->charsetChanged($charset);
+        }
+    }
+
+    /**
+     * Set the value of $parameter.
+     *
+     * @param string $parameter
+     * @param string $value
+     */
+    public function setParameter($parameter, $value)
+    {
+        $this->setParameters(array_merge($this->getParameters(), array($parameter => $value)));
+    }
+
+    /**
+     * Get the value of $parameter.
+     *
+     * @param string $parameter
+     *
+     * @return string
+     */
+    public function getParameter($parameter)
+    {
+        $params = $this->getParameters();
+
+        return array_key_exists($parameter, $params) ? $params[$parameter] : null;
+    }
+
+    /**
+     * Set an associative array of parameter names mapped to values.
+     *
+     * @param string[] $parameters
+     */
+    public function setParameters(array $parameters)
+    {
+        $this->clearCachedValueIf($this->_params != $parameters);
+        $this->_params = $parameters;
+    }
+
+    /**
+     * Returns an associative array of parameter names mapped to values.
+     *
+     * @return string[]
+     */
+    public function getParameters()
+    {
+        return $this->_params;
+    }
+
+    /**
+     * Get the value of this header prepared for rendering.
+     *
+     * @return string
+     */
+    public function getFieldBody() //TODO: Check caching here
+    {
+        $body = parent::getFieldBody();
+        foreach ($this->_params as $name => $value) {
+            if (!is_null($value)) {
+                // Add the parameter
+                $body .= '; '.$this->_createParameter($name, $value);
+            }
+        }
+
+        return $body;
+    }
+
+    /**
+     * Generate a list of all tokens in the final header.
+     *
+     * This doesn't need to be overridden in theory, but it is for implementation
+     * reasons to prevent potential breakage of attributes.
+     *
+     * @param string $string The string to tokenize
+     *
+     * @return array An array of tokens as strings
+     */
+    protected function toTokens($string = null)
+    {
+        $tokens = parent::toTokens(parent::getFieldBody());
+
+        // Try creating any parameters
+        foreach ($this->_params as $name => $value) {
+            if (!is_null($value)) {
+                // Add the semi-colon separator
+                $tokens[count($tokens) - 1] .= ';';
+                $tokens = array_merge($tokens, $this->generateTokenLines(
+                    ' '.$this->_createParameter($name, $value)
+                    ));
+            }
+        }
+
+        return $tokens;
+    }
+
+    /**
+     * Render a RFC 2047 compliant header parameter from the $name and $value.
+     *
+     * @param string $name
+     * @param string $value
+     *
+     * @return string
+     */
+    private function _createParameter($name, $value)
+    {
+        $origValue = $value;
+
+        $encoded = false;
+        // Allow room for parameter name, indices, "=" and DQUOTEs
+        $maxValueLength = $this->getMaxLineLength() - strlen($name.'=*N"";') - 1;
+        $firstLineOffset = 0;
+
+        // If it's not already a valid parameter value...
+        if (!preg_match('/^'.self::TOKEN_REGEX.'$/D', $value)) {
+            // TODO: text, or something else??
+            // ... and it's not ascii
+            if (!preg_match('/^'.$this->getGrammar()->getDefinition('text').'*$/D', $value)) {
+                $encoded = true;
+                // Allow space for the indices, charset and language
+                $maxValueLength = $this->getMaxLineLength() - strlen($name.'*N*="";') - 1;
+                $firstLineOffset = strlen(
+                    $this->getCharset()."'".$this->getLanguage()."'"
+                    );
+            }
+        }
+
+        // Encode if we need to
+        if ($encoded || strlen($value) > $maxValueLength) {
+            if (isset($this->_paramEncoder)) {
+                $value = $this->_paramEncoder->encodeString(
+                    $origValue, $firstLineOffset, $maxValueLength, $this->getCharset()
+                    );
+            } else {
+                // We have to go against RFC 2183/2231 in some areas for interoperability
+                $value = $this->getTokenAsEncodedWord($origValue);
+                $encoded = false;
+            }
+        }
+
+        $valueLines = isset($this->_paramEncoder) ? explode("\r\n", $value) : array($value);
+
+        // Need to add indices
+        if (count($valueLines) > 1) {
+            $paramLines = array();
+            foreach ($valueLines as $i => $line) {
+                $paramLines[] = $name.'*'.$i.
+                    $this->_getEndOfParameterValue($line, true, $i == 0);
+            }
+
+            return implode(";\r\n ", $paramLines);
+        } else {
+            return $name.$this->_getEndOfParameterValue(
+                $valueLines[0], $encoded, true
+                );
+        }
+    }
+
+    /**
+     * Returns the parameter value from the "=" and beyond.
+     *
+     * @param string $value     to append
+     * @param bool   $encoded
+     * @param bool   $firstLine
+     *
+     * @return string
+     */
+    private function _getEndOfParameterValue($value, $encoded = false, $firstLine = false)
+    {
+        if (!preg_match('/^'.self::TOKEN_REGEX.'$/D', $value)) {
+            $value = '"'.$value.'"';
+        }
+        $prepend = '=';
+        if ($encoded) {
+            $prepend = '*=';
+            if ($firstLine) {
+                $prepend = '*='.$this->getCharset()."'".$this->getLanguage().
+                    "'";
+            }
+        }
+
+        return $prepend.$value;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
new file mode 100644
index 000000000..2fffc7b4a
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
@@ -0,0 +1,143 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A Path Header in Swift Mailer, such a Return-Path.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Mime_Headers_PathHeader extends Swift_Mime_Headers_AbstractHeader
+{
+    /**
+     * The address in this Header (if specified).
+     *
+     * @var string
+     */
+    private $_address;
+
+    /**
+     * Creates a new PathHeader with the given $name.
+     *
+     * @param string             $name
+     * @param Swift_Mime_Grammar $grammar
+     */
+    public function __construct($name, Swift_Mime_Grammar $grammar)
+    {
+        $this->setFieldName($name);
+        parent::__construct($grammar);
+    }
+
+    /**
+     * Get the type of Header that this instance represents.
+     *
+     * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
+     * @see TYPE_DATE, TYPE_ID, TYPE_PATH
+     *
+     * @return int
+     */
+    public function getFieldType()
+    {
+        return self::TYPE_PATH;
+    }
+
+    /**
+     * Set the model for the field body.
+     * This method takes a string for an address.
+     *
+     * @param string $model
+     *
+     * @throws Swift_RfcComplianceException
+     */
+    public function setFieldBodyModel($model)
+    {
+        $this->setAddress($model);
+    }
+
+    /**
+     * Get the model for the field body.
+     * This method returns a string email address.
+     *
+     * @return mixed
+     */
+    public function getFieldBodyModel()
+    {
+        return $this->getAddress();
+    }
+
+    /**
+     * Set the Address which should appear in this Header.
+     *
+     * @param string $address
+     *
+     * @throws Swift_RfcComplianceException
+     */
+    public function setAddress($address)
+    {
+        if (is_null($address)) {
+            $this->_address = null;
+        } elseif ('' == $address) {
+            $this->_address = '';
+        } else {
+            $this->_assertValidAddress($address);
+            $this->_address = $address;
+        }
+        $this->setCachedValue(null);
+    }
+
+    /**
+     * Get the address which is used in this Header (if any).
+     *
+     * Null is returned if no address is set.
+     *
+     * @return string
+     */
+    public function getAddress()
+    {
+        return $this->_address;
+    }
+
+    /**
+     * Get the string value of the body in this Header.
+     *
+     * This is not necessarily RFC 2822 compliant since folding white space will
+     * not be added at this stage (see {@link toString()} for that).
+     *
+     * @see toString()
+     *
+     * @return string
+     */
+    public function getFieldBody()
+    {
+        if (!$this->getCachedValue()) {
+            if (isset($this->_address)) {
+                $this->setCachedValue('<'.$this->_address.'>');
+            }
+        }
+
+        return $this->getCachedValue();
+    }
+
+    /**
+     * Throws an Exception if the address passed does not comply with RFC 2822.
+     *
+     * @param string $address
+     *
+     * @throws Swift_RfcComplianceException If address is invalid
+     */
+    private function _assertValidAddress($address)
+    {
+        if (!preg_match('/^'.$this->getGrammar()->getDefinition('addr-spec').'$/D',
+            $address)) {
+            throw new Swift_RfcComplianceException(
+                'Address set in PathHeader does not comply with addr-spec of RFC 2822.'
+                );
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
new file mode 100644
index 000000000..86177f14a
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
@@ -0,0 +1,112 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A Simple MIME Header.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Mime_Headers_UnstructuredHeader extends Swift_Mime_Headers_AbstractHeader
+{
+    /**
+     * The value of this Header.
+     *
+     * @var string
+     */
+    private $_value;
+
+    /**
+     * Creates a new SimpleHeader with $name.
+     *
+     * @param string                   $name
+     * @param Swift_Mime_HeaderEncoder $encoder
+     * @param Swift_Mime_Grammar       $grammar
+     */
+    public function __construct($name, Swift_Mime_HeaderEncoder $encoder, Swift_Mime_Grammar $grammar)
+    {
+        $this->setFieldName($name);
+        $this->setEncoder($encoder);
+        parent::__construct($grammar);
+    }
+
+    /**
+     * Get the type of Header that this instance represents.
+     *
+     * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
+     * @see TYPE_DATE, TYPE_ID, TYPE_PATH
+     *
+     * @return int
+     */
+    public function getFieldType()
+    {
+        return self::TYPE_TEXT;
+    }
+
+    /**
+     * Set the model for the field body.
+     *
+     * This method takes a string for the field value.
+     *
+     * @param string $model
+     */
+    public function setFieldBodyModel($model)
+    {
+        $this->setValue($model);
+    }
+
+    /**
+     * Get the model for the field body.
+     *
+     * This method returns a string.
+     *
+     * @return string
+     */
+    public function getFieldBodyModel()
+    {
+        return $this->getValue();
+    }
+
+    /**
+     * Get the (unencoded) value of this header.
+     *
+     * @return string
+     */
+    public function getValue()
+    {
+        return $this->_value;
+    }
+
+    /**
+     * Set the (unencoded) value of this header.
+     *
+     * @param string $value
+     */
+    public function setValue($value)
+    {
+        $this->clearCachedValueIf($this->_value != $value);
+        $this->_value = $value;
+    }
+
+    /**
+     * Get the value of this header prepared for rendering.
+     *
+     * @return string
+     */
+    public function getFieldBody()
+    {
+        if (!$this->getCachedValue()) {
+            $this->setCachedValue(
+                $this->encodeWords($this, $this->_value)
+                );
+        }
+
+        return $this->getCachedValue();
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Message.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Message.php
new file mode 100644
index 000000000..9b36d2162
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/Message.php
@@ -0,0 +1,223 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A Message (RFC 2822) object.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_Mime_Message extends Swift_Mime_MimeEntity
+{
+    /**
+     * Generates a valid Message-ID and switches to it.
+     *
+     * @return string
+     */
+    public function generateId();
+
+    /**
+     * Set the subject of the message.
+     *
+     * @param string $subject
+     */
+    public function setSubject($subject);
+
+    /**
+     * Get the subject of the message.
+     *
+     * @return string
+     */
+    public function getSubject();
+
+    /**
+     * Set the origination date of the message as a UNIX timestamp.
+     *
+     * @param int $date
+     */
+    public function setDate($date);
+
+    /**
+     * Get the origination date of the message as a UNIX timestamp.
+     *
+     * @return int
+     */
+    public function getDate();
+
+    /**
+     * Set the return-path (bounce-detect) address.
+     *
+     * @param string $address
+     */
+    public function setReturnPath($address);
+
+    /**
+     * Get the return-path (bounce-detect) address.
+     *
+     * @return string
+     */
+    public function getReturnPath();
+
+    /**
+     * Set the sender of this message.
+     *
+     * If multiple addresses are present in the From field, this SHOULD be set.
+     *
+     * According to RFC 2822 it is a requirement when there are multiple From
+     * addresses, but Swift itself does not require it directly.
+     *
+     * An associative array (with one element!) can be used to provide a display-
+     * name: i.e. array('email@address' => 'Real Name').
+     *
+     * If the second parameter is provided and the first is a string, then $name
+     * is associated with the address.
+     *
+     * @param mixed  $address
+     * @param string $name    optional
+     */
+    public function setSender($address, $name = null);
+
+    /**
+     * Get the sender address for this message.
+     *
+     * This has a higher significance than the From address.
+     *
+     * @return string
+     */
+    public function getSender();
+
+    /**
+     * Set the From address of this message.
+     *
+     * It is permissible for multiple From addresses to be set using an array.
+     *
+     * If multiple From addresses are used, you SHOULD set the Sender address and
+     * according to RFC 2822, MUST set the sender address.
+     *
+     * An array can be used if display names are to be provided: i.e.
+     * array('email@address.com' => 'Real Name').
+     *
+     * If the second parameter is provided and the first is a string, then $name
+     * is associated with the address.
+     *
+     * @param mixed  $addresses
+     * @param string $name      optional
+     */
+    public function setFrom($addresses, $name = null);
+
+    /**
+     * Get the From address(es) of this message.
+     *
+     * This method always returns an associative array where the keys are the
+     * addresses.
+     *
+     * @return string[]
+     */
+    public function getFrom();
+
+    /**
+     * Set the Reply-To address(es).
+     *
+     * Any replies from the receiver will be sent to this address.
+     *
+     * It is permissible for multiple reply-to addresses to be set using an array.
+     *
+     * This method has the same synopsis as {@link setFrom()} and {@link setTo()}.
+     *
+     * If the second parameter is provided and the first is a string, then $name
+     * is associated with the address.
+     *
+     * @param mixed  $addresses
+     * @param string $name      optional
+     */
+    public function setReplyTo($addresses, $name = null);
+
+    /**
+     * Get the Reply-To addresses for this message.
+     *
+     * This method always returns an associative array where the keys provide the
+     * email addresses.
+     *
+     * @return string[]
+     */
+    public function getReplyTo();
+
+    /**
+     * Set the To address(es).
+     *
+     * Recipients set in this field will receive a copy of this message.
+     *
+     * This method has the same synopsis as {@link setFrom()} and {@link setCc()}.
+     *
+     * If the second parameter is provided and the first is a string, then $name
+     * is associated with the address.
+     *
+     * @param mixed  $addresses
+     * @param string $name      optional
+     */
+    public function setTo($addresses, $name = null);
+
+    /**
+     * Get the To addresses for this message.
+     *
+     * This method always returns an associative array, whereby the keys provide
+     * the actual email addresses.
+     *
+     * @return string[]
+     */
+    public function getTo();
+
+    /**
+     * Set the Cc address(es).
+     *
+     * Recipients set in this field will receive a 'carbon-copy' of this message.
+     *
+     * This method has the same synopsis as {@link setFrom()} and {@link setTo()}.
+     *
+     * @param mixed  $addresses
+     * @param string $name      optional
+     */
+    public function setCc($addresses, $name = null);
+
+    /**
+     * Get the Cc addresses for this message.
+     *
+     * This method always returns an associative array, whereby the keys provide
+     * the actual email addresses.
+     *
+     * @return string[]
+     */
+    public function getCc();
+
+    /**
+     * Set the Bcc address(es).
+     *
+     * Recipients set in this field will receive a 'blind-carbon-copy' of this
+     * message.
+     *
+     * In other words, they will get the message, but any other recipients of the
+     * message will have no such knowledge of their receipt of it.
+     *
+     * This method has the same synopsis as {@link setFrom()} and {@link setTo()}.
+     *
+     * @param mixed  $addresses
+     * @param string $name      optional
+     */
+    public function setBcc($addresses, $name = null);
+
+    /**
+     * Get the Bcc addresses for this message.
+     *
+     * This method always returns an associative array, whereby the keys provide
+     * the actual email addresses.
+     *
+     * @return string[]
+     */
+    public function getBcc();
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php
new file mode 100644
index 000000000..30f460cdc
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php
@@ -0,0 +1,117 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A MIME entity, such as an attachment.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_Mime_MimeEntity extends Swift_Mime_CharsetObserver, Swift_Mime_EncodingObserver
+{
+    /** Main message document; there can only be one of these */
+    const LEVEL_TOP = 16;
+
+    /** An entity which nests with the same precedence as an attachment */
+    const LEVEL_MIXED = 256;
+
+    /** An entity which nests with the same precedence as a mime part */
+    const LEVEL_ALTERNATIVE = 4096;
+
+    /** An entity which nests with the same precedence as embedded content */
+    const LEVEL_RELATED = 65536;
+
+    /**
+     * Get the level at which this entity shall be nested in final document.
+     *
+     * The lower the value, the more outermost the entity will be nested.
+     *
+     * @see LEVEL_TOP, LEVEL_MIXED, LEVEL_RELATED, LEVEL_ALTERNATIVE
+     *
+     * @return int
+     */
+    public function getNestingLevel();
+
+    /**
+     * Get the qualified content-type of this mime entity.
+     *
+     * @return string
+     */
+    public function getContentType();
+
+    /**
+     * Returns a unique ID for this entity.
+     *
+     * For most entities this will likely be the Content-ID, though it has
+     * no explicit semantic meaning and can be considered an identifier for
+     * programming logic purposes.
+     *
+     * If a Content-ID header is present, this value SHOULD match the value of
+     * the header.
+     *
+     * @return string
+     */
+    public function getId();
+
+    /**
+     * Get all children nested inside this entity.
+     *
+     * These are not just the immediate children, but all children.
+     *
+     * @return Swift_Mime_MimeEntity[]
+     */
+    public function getChildren();
+
+    /**
+     * Set all children nested inside this entity.
+     *
+     * This includes grandchildren.
+     *
+     * @param Swift_Mime_MimeEntity[] $children
+     */
+    public function setChildren(array $children);
+
+    /**
+     * Get the collection of Headers in this Mime entity.
+     *
+     * @return Swift_Mime_HeaderSet
+     */
+    public function getHeaders();
+
+    /**
+     * Get the body content of this entity as a string.
+     *
+     * Returns NULL if no body has been set.
+     *
+     * @return string|null
+     */
+    public function getBody();
+
+    /**
+     * Set the body content of this entity as a string.
+     *
+     * @param string $body
+     * @param string $contentType optional
+     */
+    public function setBody($body, $contentType = null);
+
+    /**
+     * Get this entire entity in its string form.
+     *
+     * @return string
+     */
+    public function toString();
+
+    /**
+     * Get this entire entity as a ByteStream.
+     *
+     * @param Swift_InputByteStream $is to write to
+     */
+    public function toByteStream(Swift_InputByteStream $is);
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/MimePart.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/MimePart.php
new file mode 100644
index 000000000..50fadfb7a
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/MimePart.php
@@ -0,0 +1,212 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A MIME part, in a multipart message.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
+{
+    /** The format parameter last specified by the user */
+    protected $_userFormat;
+
+    /** The charset last specified by the user */
+    protected $_userCharset;
+
+    /** The delsp parameter last specified by the user */
+    protected $_userDelSp;
+
+    /** The nesting level of this MimePart */
+    private $_nestingLevel = self::LEVEL_ALTERNATIVE;
+
+    /**
+     * Create a new MimePart with $headers, $encoder and $cache.
+     *
+     * @param Swift_Mime_HeaderSet      $headers
+     * @param Swift_Mime_ContentEncoder $encoder
+     * @param Swift_KeyCache            $cache
+     * @param Swift_Mime_Grammar        $grammar
+     * @param string                    $charset
+     */
+    public function __construct(Swift_Mime_HeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_Mime_Grammar $grammar, $charset = null)
+    {
+        parent::__construct($headers, $encoder, $cache, $grammar);
+        $this->setContentType('text/plain');
+        if (!is_null($charset)) {
+            $this->setCharset($charset);
+        }
+    }
+
+    /**
+     * Set the body of this entity, either as a string, or as an instance of
+     * {@link Swift_OutputByteStream}.
+     *
+     * @param mixed  $body
+     * @param string $contentType optional
+     * @param string $charset     optional
+     *
+     * @return Swift_Mime_MimePart
+     */
+    public function setBody($body, $contentType = null, $charset = null)
+    {
+        if (isset($charset)) {
+            $this->setCharset($charset);
+        }
+        $body = $this->_convertString($body);
+
+        parent::setBody($body, $contentType);
+
+        return $this;
+    }
+
+    /**
+     * Get the character set of this entity.
+     *
+     * @return string
+     */
+    public function getCharset()
+    {
+        return $this->_getHeaderParameter('Content-Type', 'charset');
+    }
+
+    /**
+     * Set the character set of this entity.
+     *
+     * @param string $charset
+     *
+     * @return Swift_Mime_MimePart
+     */
+    public function setCharset($charset)
+    {
+        $this->_setHeaderParameter('Content-Type', 'charset', $charset);
+        if ($charset !== $this->_userCharset) {
+            $this->_clearCache();
+        }
+        $this->_userCharset = $charset;
+        parent::charsetChanged($charset);
+
+        return $this;
+    }
+
+    /**
+     * Get the format of this entity (i.e. flowed or fixed).
+     *
+     * @return string
+     */
+    public function getFormat()
+    {
+        return $this->_getHeaderParameter('Content-Type', 'format');
+    }
+
+    /**
+     * Set the format of this entity (flowed or fixed).
+     *
+     * @param string $format
+     *
+     * @return Swift_Mime_MimePart
+     */
+    public function setFormat($format)
+    {
+        $this->_setHeaderParameter('Content-Type', 'format', $format);
+        $this->_userFormat = $format;
+
+        return $this;
+    }
+
+    /**
+     * Test if delsp is being used for this entity.
+     *
+     * @return bool
+     */
+    public function getDelSp()
+    {
+        return 'yes' == $this->_getHeaderParameter('Content-Type', 'delsp') ? true : false;
+    }
+
+    /**
+     * Turn delsp on or off for this entity.
+     *
+     * @param bool $delsp
+     *
+     * @return Swift_Mime_MimePart
+     */
+    public function setDelSp($delsp = true)
+    {
+        $this->_setHeaderParameter('Content-Type', 'delsp', $delsp ? 'yes' : null);
+        $this->_userDelSp = $delsp;
+
+        return $this;
+    }
+
+    /**
+     * Get the nesting level of this entity.
+     *
+     * @see LEVEL_TOP, LEVEL_ALTERNATIVE, LEVEL_MIXED, LEVEL_RELATED
+     *
+     * @return int
+     */
+    public function getNestingLevel()
+    {
+        return $this->_nestingLevel;
+    }
+
+    /**
+     * Receive notification that the charset has changed on this document, or a
+     * parent document.
+     *
+     * @param string $charset
+     */
+    public function charsetChanged($charset)
+    {
+        $this->setCharset($charset);
+    }
+
+    /** Fix the content-type and encoding of this entity */
+    protected function _fixHeaders()
+    {
+        parent::_fixHeaders();
+        if (count($this->getChildren())) {
+            $this->_setHeaderParameter('Content-Type', 'charset', null);
+            $this->_setHeaderParameter('Content-Type', 'format', null);
+            $this->_setHeaderParameter('Content-Type', 'delsp', null);
+        } else {
+            $this->setCharset($this->_userCharset);
+            $this->setFormat($this->_userFormat);
+            $this->setDelSp($this->_userDelSp);
+        }
+    }
+
+    /** Set the nesting level of this entity */
+    protected function _setNestingLevel($level)
+    {
+        $this->_nestingLevel = $level;
+    }
+
+    /** Encode charset when charset is not utf-8 */
+    protected function _convertString($string)
+    {
+        $charset = strtolower($this->getCharset());
+        if (!in_array($charset, array('utf-8', 'iso-8859-1', 'iso-8859-15', ''))) {
+            // mb_convert_encoding must be the first one to check, since iconv cannot convert some words.
+            if (function_exists('mb_convert_encoding')) {
+                $string = mb_convert_encoding($string, $charset, 'utf-8');
+            } elseif (function_exists('iconv')) {
+                $string = iconv('utf-8//TRANSLIT//IGNORE', $charset, $string);
+            } else {
+                throw new Swift_SwiftException('No suitable convert encoding function (use UTF-8 as your charset or install the mbstring or iconv extension).');
+            }
+
+            return $string;
+        }
+
+        return $string;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/ParameterizedHeader.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ParameterizedHeader.php
similarity index 50%
rename from lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/ParameterizedHeader.php
rename to lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ParameterizedHeader.php
index da65ca98c..e15c6ef95 100644
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Mime/ParameterizedHeader.php
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/ParameterizedHeader.php
@@ -8,28 +8,27 @@
  * file that was distributed with this source code.
  */
 
-//@require 'Swift/Mime/Header.php';
-
 /**
  * A MIME Header with parameters.
- * @package Swift
- * @subpackage Mime
+ *
  * @author Chris Corbyn
  */
 interface Swift_Mime_ParameterizedHeader extends Swift_Mime_Header
 {
-  
-  /**
-   * Set the value of $parameter.
-   * @param string $parameter
-   * @param string $value
-   */
-  public function setParameter($parameter, $value);
-  
-  /**
-   * Get the value of $parameter.
-   * @return string
-   */
-  public function getParameter($parameter);
-  
+    /**
+     * Set the value of $parameter.
+     *
+     * @param string $parameter
+     * @param string $value
+     */
+    public function setParameter($parameter, $value);
+
+    /**
+     * Get the value of $parameter.
+     *
+     * @param string $parameter
+     *
+     * @return string
+     */
+    public function getParameter($parameter);
 }
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
new file mode 100644
index 000000000..1ca504e75
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
@@ -0,0 +1,193 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Creates MIME headers.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_HeaderFactory
+{
+    /** The HeaderEncoder used by these headers */
+    private $_encoder;
+
+    /** The Encoder used by parameters */
+    private $_paramEncoder;
+
+    /** The Grammar */
+    private $_grammar;
+
+    /** The charset of created Headers */
+    private $_charset;
+
+    /**
+     * Creates a new SimpleHeaderFactory using $encoder and $paramEncoder.
+     *
+     * @param Swift_Mime_HeaderEncoder $encoder
+     * @param Swift_Encoder            $paramEncoder
+     * @param Swift_Mime_Grammar       $grammar
+     * @param string|null              $charset
+     */
+    public function __construct(Swift_Mime_HeaderEncoder $encoder, Swift_Encoder $paramEncoder, Swift_Mime_Grammar $grammar, $charset = null)
+    {
+        $this->_encoder = $encoder;
+        $this->_paramEncoder = $paramEncoder;
+        $this->_grammar = $grammar;
+        $this->_charset = $charset;
+    }
+
+    /**
+     * Create a new Mailbox Header with a list of $addresses.
+     *
+     * @param string            $name
+     * @param array|string|null $addresses
+     *
+     * @return Swift_Mime_Header
+     */
+    public function createMailboxHeader($name, $addresses = null)
+    {
+        $header = new Swift_Mime_Headers_MailboxHeader($name, $this->_encoder, $this->_grammar);
+        if (isset($addresses)) {
+            $header->setFieldBodyModel($addresses);
+        }
+        $this->_setHeaderCharset($header);
+
+        return $header;
+    }
+
+    /**
+     * Create a new Date header using $timestamp (UNIX time).
+     *
+     * @param string   $name
+     * @param int|null $timestamp
+     *
+     * @return Swift_Mime_Header
+     */
+    public function createDateHeader($name, $timestamp = null)
+    {
+        $header = new Swift_Mime_Headers_DateHeader($name, $this->_grammar);
+        if (isset($timestamp)) {
+            $header->setFieldBodyModel($timestamp);
+        }
+        $this->_setHeaderCharset($header);
+
+        return $header;
+    }
+
+    /**
+     * Create a new basic text header with $name and $value.
+     *
+     * @param string $name
+     * @param string $value
+     *
+     * @return Swift_Mime_Header
+     */
+    public function createTextHeader($name, $value = null)
+    {
+        $header = new Swift_Mime_Headers_UnstructuredHeader($name, $this->_encoder, $this->_grammar);
+        if (isset($value)) {
+            $header->setFieldBodyModel($value);
+        }
+        $this->_setHeaderCharset($header);
+
+        return $header;
+    }
+
+    /**
+     * Create a new ParameterizedHeader with $name, $value and $params.
+     *
+     * @param string $name
+     * @param string $value
+     * @param array  $params
+     *
+     * @return Swift_Mime_ParameterizedHeader
+     */
+    public function createParameterizedHeader($name, $value = null,
+        $params = array())
+    {
+        $header = new Swift_Mime_Headers_ParameterizedHeader($name, $this->_encoder, strtolower($name) == 'content-disposition' ? $this->_paramEncoder : null, $this->_grammar);
+        if (isset($value)) {
+            $header->setFieldBodyModel($value);
+        }
+        foreach ($params as $k => $v) {
+            $header->setParameter($k, $v);
+        }
+        $this->_setHeaderCharset($header);
+
+        return $header;
+    }
+
+    /**
+     * Create a new ID header for Message-ID or Content-ID.
+     *
+     * @param string       $name
+     * @param string|array $ids
+     *
+     * @return Swift_Mime_Header
+     */
+    public function createIdHeader($name, $ids = null)
+    {
+        $header = new Swift_Mime_Headers_IdentificationHeader($name, $this->_grammar);
+        if (isset($ids)) {
+            $header->setFieldBodyModel($ids);
+        }
+        $this->_setHeaderCharset($header);
+
+        return $header;
+    }
+
+    /**
+     * Create a new Path header with an address (path) in it.
+     *
+     * @param string $name
+     * @param string $path
+     *
+     * @return Swift_Mime_Header
+     */
+    public function createPathHeader($name, $path = null)
+    {
+        $header = new Swift_Mime_Headers_PathHeader($name, $this->_grammar);
+        if (isset($path)) {
+            $header->setFieldBodyModel($path);
+        }
+        $this->_setHeaderCharset($header);
+
+        return $header;
+    }
+
+    /**
+     * Notify this observer that the entity's charset has changed.
+     *
+     * @param string $charset
+     */
+    public function charsetChanged($charset)
+    {
+        $this->_charset = $charset;
+        $this->_encoder->charsetChanged($charset);
+        $this->_paramEncoder->charsetChanged($charset);
+    }
+
+    /**
+     * Make a deep copy of object.
+     */
+    public function __clone()
+    {
+        $this->_encoder = clone $this->_encoder;
+        $this->_paramEncoder = clone $this->_paramEncoder;
+    }
+
+    /** Apply the charset to the Header */
+    private function _setHeaderCharset(Swift_Mime_Header $header)
+    {
+        if (isset($this->_charset)) {
+            $header->setCharset($this->_charset);
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
new file mode 100644
index 000000000..e2d0e8746
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
@@ -0,0 +1,414 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A collection of MIME headers.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
+{
+    /** HeaderFactory */
+    private $_factory;
+
+    /** Collection of set Headers */
+    private $_headers = array();
+
+    /** Field ordering details */
+    private $_order = array();
+
+    /** List of fields which are required to be displayed */
+    private $_required = array();
+
+    /** The charset used by Headers */
+    private $_charset;
+
+    /**
+     * Create a new SimpleHeaderSet with the given $factory.
+     *
+     * @param Swift_Mime_HeaderFactory $factory
+     * @param string                   $charset
+     */
+    public function __construct(Swift_Mime_HeaderFactory $factory, $charset = null)
+    {
+        $this->_factory = $factory;
+        if (isset($charset)) {
+            $this->setCharset($charset);
+        }
+    }
+
+    /**
+     * Set the charset used by these headers.
+     *
+     * @param string $charset
+     */
+    public function setCharset($charset)
+    {
+        $this->_charset = $charset;
+        $this->_factory->charsetChanged($charset);
+        $this->_notifyHeadersOfCharset($charset);
+    }
+
+    /**
+     * Add a new Mailbox Header with a list of $addresses.
+     *
+     * @param string       $name
+     * @param array|string $addresses
+     */
+    public function addMailboxHeader($name, $addresses = null)
+    {
+        $this->_storeHeader($name,
+        $this->_factory->createMailboxHeader($name, $addresses));
+    }
+
+    /**
+     * Add a new Date header using $timestamp (UNIX time).
+     *
+     * @param string $name
+     * @param int    $timestamp
+     */
+    public function addDateHeader($name, $timestamp = null)
+    {
+        $this->_storeHeader($name,
+        $this->_factory->createDateHeader($name, $timestamp));
+    }
+
+    /**
+     * Add a new basic text header with $name and $value.
+     *
+     * @param string $name
+     * @param string $value
+     */
+    public function addTextHeader($name, $value = null)
+    {
+        $this->_storeHeader($name,
+        $this->_factory->createTextHeader($name, $value));
+    }
+
+    /**
+     * Add a new ParameterizedHeader with $name, $value and $params.
+     *
+     * @param string $name
+     * @param string $value
+     * @param array  $params
+     */
+    public function addParameterizedHeader($name, $value = null, $params = array())
+    {
+        $this->_storeHeader($name, $this->_factory->createParameterizedHeader($name, $value, $params));
+    }
+
+    /**
+     * Add a new ID header for Message-ID or Content-ID.
+     *
+     * @param string       $name
+     * @param string|array $ids
+     */
+    public function addIdHeader($name, $ids = null)
+    {
+        $this->_storeHeader($name, $this->_factory->createIdHeader($name, $ids));
+    }
+
+    /**
+     * Add a new Path header with an address (path) in it.
+     *
+     * @param string $name
+     * @param string $path
+     */
+    public function addPathHeader($name, $path = null)
+    {
+        $this->_storeHeader($name, $this->_factory->createPathHeader($name, $path));
+    }
+
+    /**
+     * Returns true if at least one header with the given $name exists.
+     *
+     * If multiple headers match, the actual one may be specified by $index.
+     *
+     * @param string $name
+     * @param int    $index
+     *
+     * @return bool
+     */
+    public function has($name, $index = 0)
+    {
+        $lowerName = strtolower($name);
+
+        if (!array_key_exists($lowerName, $this->_headers)) {
+            return false;
+        }
+
+        if (func_num_args() < 2) {
+            // index was not specified, so we only need to check that there is at least one header value set
+            return (bool) count($this->_headers[$lowerName]);
+        }
+
+        return array_key_exists($index, $this->_headers[$lowerName]);
+    }
+
+    /**
+     * Set a header in the HeaderSet.
+     *
+     * The header may be a previously fetched header via {@link get()} or it may
+     * be one that has been created separately.
+     *
+     * If $index is specified, the header will be inserted into the set at this
+     * offset.
+     *
+     * @param Swift_Mime_Header $header
+     * @param int               $index
+     */
+    public function set(Swift_Mime_Header $header, $index = 0)
+    {
+        $this->_storeHeader($header->getFieldName(), $header, $index);
+    }
+
+    /**
+     * Get the header with the given $name.
+     *
+     * If multiple headers match, the actual one may be specified by $index.
+     * Returns NULL if none present.
+     *
+     * @param string $name
+     * @param int    $index
+     *
+     * @return Swift_Mime_Header
+     */
+    public function get($name, $index = 0)
+    {
+        $name = strtolower($name);
+
+        if (func_num_args() < 2) {
+            if ($this->has($name)) {
+                $values = array_values($this->_headers[$name]);
+
+                return array_shift($values);
+            }
+        } else {
+            if ($this->has($name, $index)) {
+                return $this->_headers[$name][$index];
+            }
+        }
+    }
+
+    /**
+     * Get all headers with the given $name.
+     *
+     * @param string $name
+     *
+     * @return array
+     */
+    public function getAll($name = null)
+    {
+        if (!isset($name)) {
+            $headers = array();
+            foreach ($this->_headers as $collection) {
+                $headers = array_merge($headers, $collection);
+            }
+
+            return $headers;
+        }
+
+        $lowerName = strtolower($name);
+        if (!array_key_exists($lowerName, $this->_headers)) {
+            return array();
+        }
+
+        return $this->_headers[$lowerName];
+    }
+
+    /**
+     * Return the name of all Headers.
+     *
+     * @return array
+     */
+    public function listAll()
+    {
+        $headers = $this->_headers;
+        if ($this->_canSort()) {
+            uksort($headers, array($this, '_sortHeaders'));
+        }
+
+        return array_keys($headers);
+    }
+
+    /**
+     * Remove the header with the given $name if it's set.
+     *
+     * If multiple headers match, the actual one may be specified by $index.
+     *
+     * @param string $name
+     * @param int    $index
+     */
+    public function remove($name, $index = 0)
+    {
+        $lowerName = strtolower($name);
+        unset($this->_headers[$lowerName][$index]);
+    }
+
+    /**
+     * Remove all headers with the given $name.
+     *
+     * @param string $name
+     */
+    public function removeAll($name)
+    {
+        $lowerName = strtolower($name);
+        unset($this->_headers[$lowerName]);
+    }
+
+    /**
+     * Create a new instance of this HeaderSet.
+     *
+     * @return Swift_Mime_HeaderSet
+     */
+    public function newInstance()
+    {
+        return new self($this->_factory);
+    }
+
+    /**
+     * Define a list of Header names as an array in the correct order.
+     *
+     * These Headers will be output in the given order where present.
+     *
+     * @param array $sequence
+     */
+    public function defineOrdering(array $sequence)
+    {
+        $this->_order = array_flip(array_map('strtolower', $sequence));
+    }
+
+    /**
+     * Set a list of header names which must always be displayed when set.
+     *
+     * Usually headers without a field value won't be output unless set here.
+     *
+     * @param array $names
+     */
+    public function setAlwaysDisplayed(array $names)
+    {
+        $this->_required = array_flip(array_map('strtolower', $names));
+    }
+
+    /**
+     * Notify this observer that the entity's charset has changed.
+     *
+     * @param string $charset
+     */
+    public function charsetChanged($charset)
+    {
+        $this->setCharset($charset);
+    }
+
+    /**
+     * Returns a string with a representation of all headers.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        $string = '';
+        $headers = $this->_headers;
+        if ($this->_canSort()) {
+            uksort($headers, array($this, '_sortHeaders'));
+        }
+        foreach ($headers as $collection) {
+            foreach ($collection as $header) {
+                if ($this->_isDisplayed($header) || $header->getFieldBody() != '') {
+                    $string .= $header->toString();
+                }
+            }
+        }
+
+        return $string;
+    }
+
+    /**
+     * Returns a string representation of this object.
+     *
+     * @return string
+     *
+     * @see toString()
+     */
+    public function __toString()
+    {
+        return $this->toString();
+    }
+
+    /** Save a Header to the internal collection */
+    private function _storeHeader($name, Swift_Mime_Header $header, $offset = null)
+    {
+        if (!isset($this->_headers[strtolower($name)])) {
+            $this->_headers[strtolower($name)] = array();
+        }
+        if (!isset($offset)) {
+            $this->_headers[strtolower($name)][] = $header;
+        } else {
+            $this->_headers[strtolower($name)][$offset] = $header;
+        }
+    }
+
+    /** Test if the headers can be sorted */
+    private function _canSort()
+    {
+        return count($this->_order) > 0;
+    }
+
+    /** uksort() algorithm for Header ordering */
+    private function _sortHeaders($a, $b)
+    {
+        $lowerA = strtolower($a);
+        $lowerB = strtolower($b);
+        $aPos = array_key_exists($lowerA, $this->_order) ? $this->_order[$lowerA] : -1;
+        $bPos = array_key_exists($lowerB, $this->_order) ? $this->_order[$lowerB] : -1;
+
+        if (-1 === $aPos && -1 === $bPos) {
+            // just be sure to be determinist here
+            return $a > $b ? -1 : 1;
+        }
+
+        if ($aPos == -1) {
+            return 1;
+        } elseif ($bPos == -1) {
+            return -1;
+        }
+
+        return $aPos < $bPos ? -1 : 1;
+    }
+
+    /** Test if the given Header is always displayed */
+    private function _isDisplayed(Swift_Mime_Header $header)
+    {
+        return array_key_exists(strtolower($header->getFieldName()), $this->_required);
+    }
+
+    /** Notify all Headers of the new charset */
+    private function _notifyHeadersOfCharset($charset)
+    {
+        foreach ($this->_headers as $headerGroup) {
+            foreach ($headerGroup as $header) {
+                $header->setCharset($charset);
+            }
+        }
+    }
+
+    /**
+     * Make a deep copy of object.
+     */
+    public function __clone()
+    {
+        $this->_factory = clone $this->_factory;
+        foreach ($this->_headers as $groupKey => $headerGroup) {
+            foreach ($headerGroup as $key => $header) {
+                $this->_headers[$groupKey][$key] = clone $header;
+            }
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
new file mode 100644
index 000000000..124644b5a
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
@@ -0,0 +1,649 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * The default email message class.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime_Message
+{
+    /**
+     * Create a new SimpleMessage with $headers, $encoder and $cache.
+     *
+     * @param Swift_Mime_HeaderSet      $headers
+     * @param Swift_Mime_ContentEncoder $encoder
+     * @param Swift_KeyCache            $cache
+     * @param Swift_Mime_Grammar        $grammar
+     * @param string                    $charset
+     */
+    public function __construct(Swift_Mime_HeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_Mime_Grammar $grammar, $charset = null)
+    {
+        parent::__construct($headers, $encoder, $cache, $grammar, $charset);
+        $this->getHeaders()->defineOrdering(array(
+            'Return-Path',
+            'Received',
+            'DKIM-Signature',
+            'DomainKey-Signature',
+            'Sender',
+            'Message-ID',
+            'Date',
+            'Subject',
+            'From',
+            'Reply-To',
+            'To',
+            'Cc',
+            'Bcc',
+            'MIME-Version',
+            'Content-Type',
+            'Content-Transfer-Encoding',
+            ));
+        $this->getHeaders()->setAlwaysDisplayed(array('Date', 'Message-ID', 'From'));
+        $this->getHeaders()->addTextHeader('MIME-Version', '1.0');
+        $this->setDate(time());
+        $this->setId($this->getId());
+        $this->getHeaders()->addMailboxHeader('From');
+    }
+
+    /**
+     * Always returns {@link LEVEL_TOP} for a message instance.
+     *
+     * @return int
+     */
+    public function getNestingLevel()
+    {
+        return self::LEVEL_TOP;
+    }
+
+    /**
+     * Set the subject of this message.
+     *
+     * @param string $subject
+     *
+     * @return Swift_Mime_SimpleMessage
+     */
+    public function setSubject($subject)
+    {
+        if (!$this->_setHeaderFieldModel('Subject', $subject)) {
+            $this->getHeaders()->addTextHeader('Subject', $subject);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the subject of this message.
+     *
+     * @return string
+     */
+    public function getSubject()
+    {
+        return $this->_getHeaderFieldModel('Subject');
+    }
+
+    /**
+     * Set the date at which this message was created.
+     *
+     * @param int $date
+     *
+     * @return Swift_Mime_SimpleMessage
+     */
+    public function setDate($date)
+    {
+        if (!$this->_setHeaderFieldModel('Date', $date)) {
+            $this->getHeaders()->addDateHeader('Date', $date);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the date at which this message was created.
+     *
+     * @return int
+     */
+    public function getDate()
+    {
+        return $this->_getHeaderFieldModel('Date');
+    }
+
+    /**
+     * Set the return-path (the bounce address) of this message.
+     *
+     * @param string $address
+     *
+     * @return Swift_Mime_SimpleMessage
+     */
+    public function setReturnPath($address)
+    {
+        if (!$this->_setHeaderFieldModel('Return-Path', $address)) {
+            $this->getHeaders()->addPathHeader('Return-Path', $address);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the return-path (bounce address) of this message.
+     *
+     * @return string
+     */
+    public function getReturnPath()
+    {
+        return $this->_getHeaderFieldModel('Return-Path');
+    }
+
+    /**
+     * Set the sender of this message.
+     *
+     * This does not override the From field, but it has a higher significance.
+     *
+     * @param string $address
+     * @param string $name    optional
+     *
+     * @return Swift_Mime_SimpleMessage
+     */
+    public function setSender($address, $name = null)
+    {
+        if (!is_array($address) && isset($name)) {
+            $address = array($address => $name);
+        }
+
+        if (!$this->_setHeaderFieldModel('Sender', (array) $address)) {
+            $this->getHeaders()->addMailboxHeader('Sender', (array) $address);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the sender of this message.
+     *
+     * @return string
+     */
+    public function getSender()
+    {
+        return $this->_getHeaderFieldModel('Sender');
+    }
+
+    /**
+     * Add a From: address to this message.
+     *
+     * If $name is passed this name will be associated with the address.
+     *
+     * @param string $address
+     * @param string $name    optional
+     *
+     * @return Swift_Mime_SimpleMessage
+     */
+    public function addFrom($address, $name = null)
+    {
+        $current = $this->getFrom();
+        $current[$address] = $name;
+
+        return $this->setFrom($current);
+    }
+
+    /**
+     * Set the from address of this message.
+     *
+     * You may pass an array of addresses if this message is from multiple people.
+     *
+     * If $name is passed and the first parameter is a string, this name will be
+     * associated with the address.
+     *
+     * @param string|array $addresses
+     * @param string       $name      optional
+     *
+     * @return Swift_Mime_SimpleMessage
+     */
+    public function setFrom($addresses, $name = null)
+    {
+        if (!is_array($addresses) && isset($name)) {
+            $addresses = array($addresses => $name);
+        }
+
+        if (!$this->_setHeaderFieldModel('From', (array) $addresses)) {
+            $this->getHeaders()->addMailboxHeader('From', (array) $addresses);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the from address of this message.
+     *
+     * @return mixed
+     */
+    public function getFrom()
+    {
+        return $this->_getHeaderFieldModel('From');
+    }
+
+    /**
+     * Add a Reply-To: address to this message.
+     *
+     * If $name is passed this name will be associated with the address.
+     *
+     * @param string $address
+     * @param string $name    optional
+     *
+     * @return Swift_Mime_SimpleMessage
+     */
+    public function addReplyTo($address, $name = null)
+    {
+        $current = $this->getReplyTo();
+        $current[$address] = $name;
+
+        return $this->setReplyTo($current);
+    }
+
+    /**
+     * Set the reply-to address of this message.
+     *
+     * You may pass an array of addresses if replies will go to multiple people.
+     *
+     * If $name is passed and the first parameter is a string, this name will be
+     * associated with the address.
+     *
+     * @param mixed  $addresses
+     * @param string $name      optional
+     *
+     * @return Swift_Mime_SimpleMessage
+     */
+    public function setReplyTo($addresses, $name = null)
+    {
+        if (!is_array($addresses) && isset($name)) {
+            $addresses = array($addresses => $name);
+        }
+
+        if (!$this->_setHeaderFieldModel('Reply-To', (array) $addresses)) {
+            $this->getHeaders()->addMailboxHeader('Reply-To', (array) $addresses);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the reply-to address of this message.
+     *
+     * @return string
+     */
+    public function getReplyTo()
+    {
+        return $this->_getHeaderFieldModel('Reply-To');
+    }
+
+    /**
+     * Add a To: address to this message.
+     *
+     * If $name is passed this name will be associated with the address.
+     *
+     * @param string $address
+     * @param string $name    optional
+     *
+     * @return Swift_Mime_SimpleMessage
+     */
+    public function addTo($address, $name = null)
+    {
+        $current = $this->getTo();
+        $current[$address] = $name;
+
+        return $this->setTo($current);
+    }
+
+    /**
+     * Set the to addresses of this message.
+     *
+     * If multiple recipients will receive the message an array should be used.
+     * Example: array('receiver@domain.org', 'other@domain.org' => 'A name')
+     *
+     * If $name is passed and the first parameter is a string, this name will be
+     * associated with the address.
+     *
+     * @param mixed  $addresses
+     * @param string $name      optional
+     *
+     * @return Swift_Mime_SimpleMessage
+     */
+    public function setTo($addresses, $name = null)
+    {
+        if (!is_array($addresses) && isset($name)) {
+            $addresses = array($addresses => $name);
+        }
+
+        if (!$this->_setHeaderFieldModel('To', (array) $addresses)) {
+            $this->getHeaders()->addMailboxHeader('To', (array) $addresses);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the To addresses of this message.
+     *
+     * @return array
+     */
+    public function getTo()
+    {
+        return $this->_getHeaderFieldModel('To');
+    }
+
+    /**
+     * Add a Cc: address to this message.
+     *
+     * If $name is passed this name will be associated with the address.
+     *
+     * @param string $address
+     * @param string $name    optional
+     *
+     * @return Swift_Mime_SimpleMessage
+     */
+    public function addCc($address, $name = null)
+    {
+        $current = $this->getCc();
+        $current[$address] = $name;
+
+        return $this->setCc($current);
+    }
+
+    /**
+     * Set the Cc addresses of this message.
+     *
+     * If $name is passed and the first parameter is a string, this name will be
+     * associated with the address.
+     *
+     * @param mixed  $addresses
+     * @param string $name      optional
+     *
+     * @return Swift_Mime_SimpleMessage
+     */
+    public function setCc($addresses, $name = null)
+    {
+        if (!is_array($addresses) && isset($name)) {
+            $addresses = array($addresses => $name);
+        }
+
+        if (!$this->_setHeaderFieldModel('Cc', (array) $addresses)) {
+            $this->getHeaders()->addMailboxHeader('Cc', (array) $addresses);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the Cc address of this message.
+     *
+     * @return array
+     */
+    public function getCc()
+    {
+        return $this->_getHeaderFieldModel('Cc');
+    }
+
+    /**
+     * Add a Bcc: address to this message.
+     *
+     * If $name is passed this name will be associated with the address.
+     *
+     * @param string $address
+     * @param string $name    optional
+     *
+     * @return Swift_Mime_SimpleMessage
+     */
+    public function addBcc($address, $name = null)
+    {
+        $current = $this->getBcc();
+        $current[$address] = $name;
+
+        return $this->setBcc($current);
+    }
+
+    /**
+     * Set the Bcc addresses of this message.
+     *
+     * If $name is passed and the first parameter is a string, this name will be
+     * associated with the address.
+     *
+     * @param mixed  $addresses
+     * @param string $name      optional
+     *
+     * @return Swift_Mime_SimpleMessage
+     */
+    public function setBcc($addresses, $name = null)
+    {
+        if (!is_array($addresses) && isset($name)) {
+            $addresses = array($addresses => $name);
+        }
+
+        if (!$this->_setHeaderFieldModel('Bcc', (array) $addresses)) {
+            $this->getHeaders()->addMailboxHeader('Bcc', (array) $addresses);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the Bcc addresses of this message.
+     *
+     * @return array
+     */
+    public function getBcc()
+    {
+        return $this->_getHeaderFieldModel('Bcc');
+    }
+
+    /**
+     * Set the priority of this message.
+     *
+     * The value is an integer where 1 is the highest priority and 5 is the lowest.
+     *
+     * @param int $priority
+     *
+     * @return Swift_Mime_SimpleMessage
+     */
+    public function setPriority($priority)
+    {
+        $priorityMap = array(
+            1 => 'Highest',
+            2 => 'High',
+            3 => 'Normal',
+            4 => 'Low',
+            5 => 'Lowest',
+            );
+        $pMapKeys = array_keys($priorityMap);
+        if ($priority > max($pMapKeys)) {
+            $priority = max($pMapKeys);
+        } elseif ($priority < min($pMapKeys)) {
+            $priority = min($pMapKeys);
+        }
+        if (!$this->_setHeaderFieldModel('X-Priority',
+            sprintf('%d (%s)', $priority, $priorityMap[$priority]))) {
+            $this->getHeaders()->addTextHeader('X-Priority',
+                sprintf('%d (%s)', $priority, $priorityMap[$priority]));
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the priority of this message.
+     *
+     * The returned value is an integer where 1 is the highest priority and 5
+     * is the lowest.
+     *
+     * @return int
+     */
+    public function getPriority()
+    {
+        list($priority) = sscanf($this->_getHeaderFieldModel('X-Priority'),
+            '%[1-5]'
+            );
+
+        return isset($priority) ? $priority : 3;
+    }
+
+    /**
+     * Ask for a delivery receipt from the recipient to be sent to $addresses.
+     *
+     * @param array $addresses
+     *
+     * @return Swift_Mime_SimpleMessage
+     */
+    public function setReadReceiptTo($addresses)
+    {
+        if (!$this->_setHeaderFieldModel('Disposition-Notification-To', $addresses)) {
+            $this->getHeaders()
+                ->addMailboxHeader('Disposition-Notification-To', $addresses);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the addresses to which a read-receipt will be sent.
+     *
+     * @return string
+     */
+    public function getReadReceiptTo()
+    {
+        return $this->_getHeaderFieldModel('Disposition-Notification-To');
+    }
+
+    /**
+     * Attach a {@link Swift_Mime_MimeEntity} such as an Attachment or MimePart.
+     *
+     * @param Swift_Mime_MimeEntity $entity
+     *
+     * @return Swift_Mime_SimpleMessage
+     */
+    public function attach(Swift_Mime_MimeEntity $entity)
+    {
+        $this->setChildren(array_merge($this->getChildren(), array($entity)));
+
+        return $this;
+    }
+
+    /**
+     * Remove an already attached entity.
+     *
+     * @param Swift_Mime_MimeEntity $entity
+     *
+     * @return Swift_Mime_SimpleMessage
+     */
+    public function detach(Swift_Mime_MimeEntity $entity)
+    {
+        $newChildren = array();
+        foreach ($this->getChildren() as $child) {
+            if ($entity !== $child) {
+                $newChildren[] = $child;
+            }
+        }
+        $this->setChildren($newChildren);
+
+        return $this;
+    }
+
+    /**
+     * Attach a {@link Swift_Mime_MimeEntity} and return it's CID source.
+     * This method should be used when embedding images or other data in a message.
+     *
+     * @param Swift_Mime_MimeEntity $entity
+     *
+     * @return string
+     */
+    public function embed(Swift_Mime_MimeEntity $entity)
+    {
+        $this->attach($entity);
+
+        return 'cid:'.$entity->getId();
+    }
+
+    /**
+     * Get this message as a complete string.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        if (count($children = $this->getChildren()) > 0 && $this->getBody() != '') {
+            $this->setChildren(array_merge(array($this->_becomeMimePart()), $children));
+            $string = parent::toString();
+            $this->setChildren($children);
+        } else {
+            $string = parent::toString();
+        }
+
+        return $string;
+    }
+
+    /**
+     * Returns a string representation of this object.
+     *
+     * @see toString()
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->toString();
+    }
+
+    /**
+     * Write this message to a {@link Swift_InputByteStream}.
+     *
+     * @param Swift_InputByteStream $is
+     */
+    public function toByteStream(Swift_InputByteStream $is)
+    {
+        if (count($children = $this->getChildren()) > 0 && $this->getBody() != '') {
+            $this->setChildren(array_merge(array($this->_becomeMimePart()), $children));
+            parent::toByteStream($is);
+            $this->setChildren($children);
+        } else {
+            parent::toByteStream($is);
+        }
+    }
+
+    /** @see Swift_Mime_SimpleMimeEntity::_getIdField() */
+    protected function _getIdField()
+    {
+        return 'Message-ID';
+    }
+
+    /** Turn the body of this message into a child of itself if needed */
+    protected function _becomeMimePart()
+    {
+        $part = new parent($this->getHeaders()->newInstance(), $this->getEncoder(),
+            $this->_getCache(), $this->_getGrammar(), $this->_userCharset
+            );
+        $part->setContentType($this->_userContentType);
+        $part->setBody($this->getBody());
+        $part->setFormat($this->_userFormat);
+        $part->setDelSp($this->_userDelSp);
+        $part->_setNestingLevel($this->_getTopNestingLevel());
+
+        return $part;
+    }
+
+    /** Get the highest nesting level nested inside this message */
+    private function _getTopNestingLevel()
+    {
+        $highestLevel = $this->getNestingLevel();
+        foreach ($this->getChildren() as $child) {
+            $childLevel = $child->getNestingLevel();
+            if ($highestLevel < $childLevel) {
+                $highestLevel = $childLevel;
+            }
+        }
+
+        return $highestLevel;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
new file mode 100644
index 000000000..0694ee1b8
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
@@ -0,0 +1,843 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A MIME entity, in a multipart message.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
+{
+    /** A collection of Headers for this mime entity */
+    private $_headers;
+
+    /** The body as a string, or a stream */
+    private $_body;
+
+    /** The encoder that encodes the body into a streamable format */
+    private $_encoder;
+
+    /** The grammar to use for id validation */
+    private $_grammar;
+
+    /** A mime boundary, if any is used */
+    private $_boundary;
+
+    /** Mime types to be used based on the nesting level */
+    private $_compositeRanges = array(
+        'multipart/mixed' => array(self::LEVEL_TOP, self::LEVEL_MIXED),
+        'multipart/alternative' => array(self::LEVEL_MIXED, self::LEVEL_ALTERNATIVE),
+        'multipart/related' => array(self::LEVEL_ALTERNATIVE, self::LEVEL_RELATED),
+    );
+
+    /** A set of filter rules to define what level an entity should be nested at */
+    private $_compoundLevelFilters = array();
+
+    /** The nesting level of this entity */
+    private $_nestingLevel = self::LEVEL_ALTERNATIVE;
+
+    /** A KeyCache instance used during encoding and streaming */
+    private $_cache;
+
+    /** Direct descendants of this entity */
+    private $_immediateChildren = array();
+
+    /** All descendants of this entity */
+    private $_children = array();
+
+    /** The maximum line length of the body of this entity */
+    private $_maxLineLength = 78;
+
+    /** The order in which alternative mime types should appear */
+    private $_alternativePartOrder = array(
+        'text/plain' => 1,
+        'text/html' => 2,
+        'multipart/related' => 3,
+    );
+
+    /** The CID of this entity */
+    private $_id;
+
+    /** The key used for accessing the cache */
+    private $_cacheKey;
+
+    protected $_userContentType;
+
+    /**
+     * Create a new SimpleMimeEntity with $headers, $encoder and $cache.
+     *
+     * @param Swift_Mime_HeaderSet      $headers
+     * @param Swift_Mime_ContentEncoder $encoder
+     * @param Swift_KeyCache            $cache
+     * @param Swift_Mime_Grammar        $grammar
+     */
+    public function __construct(Swift_Mime_HeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_Mime_Grammar $grammar)
+    {
+        $this->_cacheKey = md5(uniqid(getmypid().mt_rand(), true));
+        $this->_cache = $cache;
+        $this->_headers = $headers;
+        $this->_grammar = $grammar;
+        $this->setEncoder($encoder);
+        $this->_headers->defineOrdering(array('Content-Type', 'Content-Transfer-Encoding'));
+
+        // This array specifies that, when the entire MIME document contains
+        // $compoundLevel, then for each child within $level, if its Content-Type
+        // is $contentType then it should be treated as if it's level is
+        // $neededLevel instead.  I tried to write that unambiguously! :-\
+        // Data Structure:
+        // array (
+        //   $compoundLevel => array(
+        //     $level => array(
+        //       $contentType => $neededLevel
+        //     )
+        //   )
+        // )
+
+        $this->_compoundLevelFilters = array(
+            (self::LEVEL_ALTERNATIVE + self::LEVEL_RELATED) => array(
+                self::LEVEL_ALTERNATIVE => array(
+                    'text/plain' => self::LEVEL_ALTERNATIVE,
+                    'text/html' => self::LEVEL_RELATED,
+                    ),
+                ),
+            );
+
+        $this->_id = $this->getRandomId();
+    }
+
+    /**
+     * Generate a new Content-ID or Message-ID for this MIME entity.
+     *
+     * @return string
+     */
+    public function generateId()
+    {
+        $this->setId($this->getRandomId());
+
+        return $this->_id;
+    }
+
+    /**
+     * Get the {@link Swift_Mime_HeaderSet} for this entity.
+     *
+     * @return Swift_Mime_HeaderSet
+     */
+    public function getHeaders()
+    {
+        return $this->_headers;
+    }
+
+    /**
+     * Get the nesting level of this entity.
+     *
+     * @see LEVEL_TOP, LEVEL_MIXED, LEVEL_RELATED, LEVEL_ALTERNATIVE
+     *
+     * @return int
+     */
+    public function getNestingLevel()
+    {
+        return $this->_nestingLevel;
+    }
+
+    /**
+     * Get the Content-type of this entity.
+     *
+     * @return string
+     */
+    public function getContentType()
+    {
+        return $this->_getHeaderFieldModel('Content-Type');
+    }
+
+    /**
+     * Set the Content-type of this entity.
+     *
+     * @param string $type
+     *
+     * @return Swift_Mime_SimpleMimeEntity
+     */
+    public function setContentType($type)
+    {
+        $this->_setContentTypeInHeaders($type);
+        // Keep track of the value so that if the content-type changes automatically
+        // due to added child entities, it can be restored if they are later removed
+        $this->_userContentType = $type;
+
+        return $this;
+    }
+
+    /**
+     * Get the CID of this entity.
+     *
+     * The CID will only be present in headers if a Content-ID header is present.
+     *
+     * @return string
+     */
+    public function getId()
+    {
+        $tmp = (array) $this->_getHeaderFieldModel($this->_getIdField());
+
+        return $this->_headers->has($this->_getIdField()) ? current($tmp) : $this->_id;
+    }
+
+    /**
+     * Set the CID of this entity.
+     *
+     * @param string $id
+     *
+     * @return Swift_Mime_SimpleMimeEntity
+     */
+    public function setId($id)
+    {
+        if (!$this->_setHeaderFieldModel($this->_getIdField(), $id)) {
+            $this->_headers->addIdHeader($this->_getIdField(), $id);
+        }
+        $this->_id = $id;
+
+        return $this;
+    }
+
+    /**
+     * Get the description of this entity.
+     *
+     * This value comes from the Content-Description header if set.
+     *
+     * @return string
+     */
+    public function getDescription()
+    {
+        return $this->_getHeaderFieldModel('Content-Description');
+    }
+
+    /**
+     * Set the description of this entity.
+     *
+     * This method sets a value in the Content-ID header.
+     *
+     * @param string $description
+     *
+     * @return Swift_Mime_SimpleMimeEntity
+     */
+    public function setDescription($description)
+    {
+        if (!$this->_setHeaderFieldModel('Content-Description', $description)) {
+            $this->_headers->addTextHeader('Content-Description', $description);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the maximum line length of the body of this entity.
+     *
+     * @return int
+     */
+    public function getMaxLineLength()
+    {
+        return $this->_maxLineLength;
+    }
+
+    /**
+     * Set the maximum line length of lines in this body.
+     *
+     * Though not enforced by the library, lines should not exceed 1000 chars.
+     *
+     * @param int $length
+     *
+     * @return Swift_Mime_SimpleMimeEntity
+     */
+    public function setMaxLineLength($length)
+    {
+        $this->_maxLineLength = $length;
+
+        return $this;
+    }
+
+    /**
+     * Get all children added to this entity.
+     *
+     * @return Swift_Mime_MimeEntity[]
+     */
+    public function getChildren()
+    {
+        return $this->_children;
+    }
+
+    /**
+     * Set all children of this entity.
+     *
+     * @param Swift_Mime_MimeEntity[] $children
+     * @param int                     $compoundLevel For internal use only
+     *
+     * @return Swift_Mime_SimpleMimeEntity
+     */
+    public function setChildren(array $children, $compoundLevel = null)
+    {
+        // TODO: Try to refactor this logic
+
+        $compoundLevel = isset($compoundLevel) ? $compoundLevel : $this->_getCompoundLevel($children);
+        $immediateChildren = array();
+        $grandchildren = array();
+        $newContentType = $this->_userContentType;
+
+        foreach ($children as $child) {
+            $level = $this->_getNeededChildLevel($child, $compoundLevel);
+            if (empty($immediateChildren)) {
+                //first iteration
+                $immediateChildren = array($child);
+            } else {
+                $nextLevel = $this->_getNeededChildLevel($immediateChildren[0], $compoundLevel);
+                if ($nextLevel == $level) {
+                    $immediateChildren[] = $child;
+                } elseif ($level < $nextLevel) {
+                    // Re-assign immediateChildren to grandchildren
+                    $grandchildren = array_merge($grandchildren, $immediateChildren);
+                    // Set new children
+                    $immediateChildren = array($child);
+                } else {
+                    $grandchildren[] = $child;
+                }
+            }
+        }
+
+        if ($immediateChildren) {
+            $lowestLevel = $this->_getNeededChildLevel($immediateChildren[0], $compoundLevel);
+
+            // Determine which composite media type is needed to accommodate the
+            // immediate children
+            foreach ($this->_compositeRanges as $mediaType => $range) {
+                if ($lowestLevel > $range[0] && $lowestLevel <= $range[1]) {
+                    $newContentType = $mediaType;
+
+                    break;
+                }
+            }
+
+            // Put any grandchildren in a subpart
+            if (!empty($grandchildren)) {
+                $subentity = $this->_createChild();
+                $subentity->_setNestingLevel($lowestLevel);
+                $subentity->setChildren($grandchildren, $compoundLevel);
+                array_unshift($immediateChildren, $subentity);
+            }
+        }
+
+        $this->_immediateChildren = $immediateChildren;
+        $this->_children = $children;
+        $this->_setContentTypeInHeaders($newContentType);
+        $this->_fixHeaders();
+        $this->_sortChildren();
+
+        return $this;
+    }
+
+    /**
+     * Get the body of this entity as a string.
+     *
+     * @return string
+     */
+    public function getBody()
+    {
+        return $this->_body instanceof Swift_OutputByteStream ? $this->_readStream($this->_body) : $this->_body;
+    }
+
+    /**
+     * Set the body of this entity, either as a string, or as an instance of
+     * {@link Swift_OutputByteStream}.
+     *
+     * @param mixed  $body
+     * @param string $contentType optional
+     *
+     * @return Swift_Mime_SimpleMimeEntity
+     */
+    public function setBody($body, $contentType = null)
+    {
+        if ($body !== $this->_body) {
+            $this->_clearCache();
+        }
+
+        $this->_body = $body;
+        if (isset($contentType)) {
+            $this->setContentType($contentType);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the encoder used for the body of this entity.
+     *
+     * @return Swift_Mime_ContentEncoder
+     */
+    public function getEncoder()
+    {
+        return $this->_encoder;
+    }
+
+    /**
+     * Set the encoder used for the body of this entity.
+     *
+     * @param Swift_Mime_ContentEncoder $encoder
+     *
+     * @return Swift_Mime_SimpleMimeEntity
+     */
+    public function setEncoder(Swift_Mime_ContentEncoder $encoder)
+    {
+        if ($encoder !== $this->_encoder) {
+            $this->_clearCache();
+        }
+
+        $this->_encoder = $encoder;
+        $this->_setEncoding($encoder->getName());
+        $this->_notifyEncoderChanged($encoder);
+
+        return $this;
+    }
+
+    /**
+     * Get the boundary used to separate children in this entity.
+     *
+     * @return string
+     */
+    public function getBoundary()
+    {
+        if (!isset($this->_boundary)) {
+            $this->_boundary = '_=_swift_v4_'.time().'_'.md5(getmypid().mt_rand().uniqid('', true)).'_=_';
+        }
+
+        return $this->_boundary;
+    }
+
+    /**
+     * Set the boundary used to separate children in this entity.
+     *
+     * @param string $boundary
+     *
+     * @throws Swift_RfcComplianceException
+     *
+     * @return Swift_Mime_SimpleMimeEntity
+     */
+    public function setBoundary($boundary)
+    {
+        $this->_assertValidBoundary($boundary);
+        $this->_boundary = $boundary;
+
+        return $this;
+    }
+
+    /**
+     * Receive notification that the charset of this entity, or a parent entity
+     * has changed.
+     *
+     * @param string $charset
+     */
+    public function charsetChanged($charset)
+    {
+        $this->_notifyCharsetChanged($charset);
+    }
+
+    /**
+     * Receive notification that the encoder of this entity or a parent entity
+     * has changed.
+     *
+     * @param Swift_Mime_ContentEncoder $encoder
+     */
+    public function encoderChanged(Swift_Mime_ContentEncoder $encoder)
+    {
+        $this->_notifyEncoderChanged($encoder);
+    }
+
+    /**
+     * Get this entire entity as a string.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        $string = $this->_headers->toString();
+        $string .= $this->_bodyToString();
+
+        return $string;
+    }
+
+    /**
+     * Get this entire entity as a string.
+     *
+     * @return string
+     */
+    protected function _bodyToString()
+    {
+        $string = '';
+
+        if (isset($this->_body) && empty($this->_immediateChildren)) {
+            if ($this->_cache->hasKey($this->_cacheKey, 'body')) {
+                $body = $this->_cache->getString($this->_cacheKey, 'body');
+            } else {
+                $body = "\r\n".$this->_encoder->encodeString($this->getBody(), 0, $this->getMaxLineLength());
+                $this->_cache->setString($this->_cacheKey, 'body', $body, Swift_KeyCache::MODE_WRITE);
+            }
+            $string .= $body;
+        }
+
+        if (!empty($this->_immediateChildren)) {
+            foreach ($this->_immediateChildren as $child) {
+                $string .= "\r\n\r\n--".$this->getBoundary()."\r\n";
+                $string .= $child->toString();
+            }
+            $string .= "\r\n\r\n--".$this->getBoundary()."--\r\n";
+        }
+
+        return $string;
+    }
+
+    /**
+     * Returns a string representation of this object.
+     *
+     * @see toString()
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->toString();
+    }
+
+    /**
+     * Write this entire entity to a {@see Swift_InputByteStream}.
+     *
+     * @param Swift_InputByteStream
+     */
+    public function toByteStream(Swift_InputByteStream $is)
+    {
+        $is->write($this->_headers->toString());
+        $is->commit();
+
+        $this->_bodyToByteStream($is);
+    }
+
+    /**
+     * Write this entire entity to a {@link Swift_InputByteStream}.
+     *
+     * @param Swift_InputByteStream
+     */
+    protected function _bodyToByteStream(Swift_InputByteStream $is)
+    {
+        if (empty($this->_immediateChildren)) {
+            if (isset($this->_body)) {
+                if ($this->_cache->hasKey($this->_cacheKey, 'body')) {
+                    $this->_cache->exportToByteStream($this->_cacheKey, 'body', $is);
+                } else {
+                    $cacheIs = $this->_cache->getInputByteStream($this->_cacheKey, 'body');
+                    if ($cacheIs) {
+                        $is->bind($cacheIs);
+                    }
+
+                    $is->write("\r\n");
+
+                    if ($this->_body instanceof Swift_OutputByteStream) {
+                        $this->_body->setReadPointer(0);
+
+                        $this->_encoder->encodeByteStream($this->_body, $is, 0, $this->getMaxLineLength());
+                    } else {
+                        $is->write($this->_encoder->encodeString($this->getBody(), 0, $this->getMaxLineLength()));
+                    }
+
+                    if ($cacheIs) {
+                        $is->unbind($cacheIs);
+                    }
+                }
+            }
+        }
+
+        if (!empty($this->_immediateChildren)) {
+            foreach ($this->_immediateChildren as $child) {
+                $is->write("\r\n\r\n--".$this->getBoundary()."\r\n");
+                $child->toByteStream($is);
+            }
+            $is->write("\r\n\r\n--".$this->getBoundary()."--\r\n");
+        }
+    }
+
+    /**
+     * Get the name of the header that provides the ID of this entity.
+     */
+    protected function _getIdField()
+    {
+        return 'Content-ID';
+    }
+
+    /**
+     * Get the model data (usually an array or a string) for $field.
+     */
+    protected function _getHeaderFieldModel($field)
+    {
+        if ($this->_headers->has($field)) {
+            return $this->_headers->get($field)->getFieldBodyModel();
+        }
+    }
+
+    /**
+     * Set the model data for $field.
+     */
+    protected function _setHeaderFieldModel($field, $model)
+    {
+        if ($this->_headers->has($field)) {
+            $this->_headers->get($field)->setFieldBodyModel($model);
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the parameter value of $parameter on $field header.
+     */
+    protected function _getHeaderParameter($field, $parameter)
+    {
+        if ($this->_headers->has($field)) {
+            return $this->_headers->get($field)->getParameter($parameter);
+        }
+    }
+
+    /**
+     * Set the parameter value of $parameter on $field header.
+     */
+    protected function _setHeaderParameter($field, $parameter, $value)
+    {
+        if ($this->_headers->has($field)) {
+            $this->_headers->get($field)->setParameter($parameter, $value);
+
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Re-evaluate what content type and encoding should be used on this entity.
+     */
+    protected function _fixHeaders()
+    {
+        if (count($this->_immediateChildren)) {
+            $this->_setHeaderParameter('Content-Type', 'boundary',
+                $this->getBoundary()
+                );
+            $this->_headers->remove('Content-Transfer-Encoding');
+        } else {
+            $this->_setHeaderParameter('Content-Type', 'boundary', null);
+            $this->_setEncoding($this->_encoder->getName());
+        }
+    }
+
+    /**
+     * Get the KeyCache used in this entity.
+     *
+     * @return Swift_KeyCache
+     */
+    protected function _getCache()
+    {
+        return $this->_cache;
+    }
+
+    /**
+     * Get the grammar used for validation.
+     *
+     * @return Swift_Mime_Grammar
+     */
+    protected function _getGrammar()
+    {
+        return $this->_grammar;
+    }
+
+    /**
+     * Empty the KeyCache for this entity.
+     */
+    protected function _clearCache()
+    {
+        $this->_cache->clearKey($this->_cacheKey, 'body');
+    }
+
+    /**
+     * Returns a random Content-ID or Message-ID.
+     *
+     * @return string
+     */
+    protected function getRandomId()
+    {
+        $idLeft = md5(getmypid().'.'.time().'.'.uniqid(mt_rand(), true));
+        $idRight = !empty($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : 'swift.generated';
+        $id = $idLeft.'@'.$idRight;
+
+        try {
+            $this->_assertValidId($id);
+        } catch (Swift_RfcComplianceException $e) {
+            $id = $idLeft.'@swift.generated';
+        }
+
+        return $id;
+    }
+
+    private function _readStream(Swift_OutputByteStream $os)
+    {
+        $string = '';
+        while (false !== $bytes = $os->read(8192)) {
+            $string .= $bytes;
+        }
+
+        $os->setReadPointer(0);
+
+        return $string;
+    }
+
+    private function _setEncoding($encoding)
+    {
+        if (!$this->_setHeaderFieldModel('Content-Transfer-Encoding', $encoding)) {
+            $this->_headers->addTextHeader('Content-Transfer-Encoding', $encoding);
+        }
+    }
+
+    private function _assertValidBoundary($boundary)
+    {
+        if (!preg_match('/^[a-z0-9\'\(\)\+_\-,\.\/:=\?\ ]{0,69}[a-z0-9\'\(\)\+_\-,\.\/:=\?]$/Di', $boundary)) {
+            throw new Swift_RfcComplianceException('Mime boundary set is not RFC 2046 compliant.');
+        }
+    }
+
+    private function _setContentTypeInHeaders($type)
+    {
+        if (!$this->_setHeaderFieldModel('Content-Type', $type)) {
+            $this->_headers->addParameterizedHeader('Content-Type', $type);
+        }
+    }
+
+    private function _setNestingLevel($level)
+    {
+        $this->_nestingLevel = $level;
+    }
+
+    private function _getCompoundLevel($children)
+    {
+        $level = 0;
+        foreach ($children as $child) {
+            $level |= $child->getNestingLevel();
+        }
+
+        return $level;
+    }
+
+    private function _getNeededChildLevel($child, $compoundLevel)
+    {
+        $filter = array();
+        foreach ($this->_compoundLevelFilters as $bitmask => $rules) {
+            if (($compoundLevel & $bitmask) === $bitmask) {
+                $filter = $rules + $filter;
+            }
+        }
+
+        $realLevel = $child->getNestingLevel();
+        $lowercaseType = strtolower($child->getContentType());
+
+        if (isset($filter[$realLevel]) && isset($filter[$realLevel][$lowercaseType])) {
+            return $filter[$realLevel][$lowercaseType];
+        }
+
+        return $realLevel;
+    }
+
+    private function _createChild()
+    {
+        return new self($this->_headers->newInstance(), $this->_encoder, $this->_cache, $this->_grammar);
+    }
+
+    private function _notifyEncoderChanged(Swift_Mime_ContentEncoder $encoder)
+    {
+        foreach ($this->_immediateChildren as $child) {
+            $child->encoderChanged($encoder);
+        }
+    }
+
+    private function _notifyCharsetChanged($charset)
+    {
+        $this->_encoder->charsetChanged($charset);
+        $this->_headers->charsetChanged($charset);
+        foreach ($this->_immediateChildren as $child) {
+            $child->charsetChanged($charset);
+        }
+    }
+
+    private function _sortChildren()
+    {
+        $shouldSort = false;
+        foreach ($this->_immediateChildren as $child) {
+            // NOTE: This include alternative parts moved into a related part
+            if ($child->getNestingLevel() == self::LEVEL_ALTERNATIVE) {
+                $shouldSort = true;
+                break;
+            }
+        }
+
+        // Sort in order of preference, if there is one
+        if ($shouldSort) {
+            usort($this->_immediateChildren, array($this, '_childSortAlgorithm'));
+        }
+    }
+
+    private function _childSortAlgorithm($a, $b)
+    {
+        $typePrefs = array();
+        $types = array(strtolower($a->getContentType()), strtolower($b->getContentType()));
+
+        foreach ($types as $type) {
+            $typePrefs[] = array_key_exists($type, $this->_alternativePartOrder) ? $this->_alternativePartOrder[$type] : max($this->_alternativePartOrder) + 1;
+        }
+
+        return $typePrefs[0] >= $typePrefs[1] ? 1 : -1;
+    }
+
+    // -- Destructor
+
+    /**
+     * Empties it's own contents from the cache.
+     */
+    public function __destruct()
+    {
+        $this->_cache->clearAll($this->_cacheKey);
+    }
+
+    /**
+     * Throws an Exception if the id passed does not comply with RFC 2822.
+     *
+     * @param string $id
+     *
+     * @throws Swift_RfcComplianceException
+     */
+    private function _assertValidId($id)
+    {
+        if (!preg_match('/^'.$this->_grammar->getDefinition('id-left').'@'.$this->_grammar->getDefinition('id-right').'$/D', $id)) {
+            throw new Swift_RfcComplianceException('Invalid ID given <'.$id.'>');
+        }
+    }
+
+    /**
+     * Make a deep copy of object.
+     */
+    public function __clone()
+    {
+        $this->_headers = clone $this->_headers;
+        $this->_encoder = clone $this->_encoder;
+        $this->_cacheKey = md5(uniqid(getmypid().mt_rand(), true));
+        $children = array();
+        foreach ($this->_children as $pos => $child) {
+            $children[$pos] = clone $child;
+        }
+        $this->setChildren($children);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/MimePart.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/MimePart.php
new file mode 100644
index 000000000..215f8db34
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/MimePart.php
@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A MIME part, in a multipart message.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_MimePart extends Swift_Mime_MimePart
+{
+    /**
+     * Create a new MimePart.
+     *
+     * Details may be optionally passed into the constructor.
+     *
+     * @param string $body
+     * @param string $contentType
+     * @param string $charset
+     */
+    public function __construct($body = null, $contentType = null, $charset = null)
+    {
+        call_user_func_array(
+            array($this, 'Swift_Mime_MimePart::__construct'),
+            Swift_DependencyContainer::getInstance()
+                ->createDependenciesFor('mime.part')
+            );
+
+        if (!isset($charset)) {
+            $charset = Swift_DependencyContainer::getInstance()
+                ->lookup('properties.charset');
+        }
+        $this->setBody($body);
+        $this->setCharset($charset);
+        if ($contentType) {
+            $this->setContentType($contentType);
+        }
+    }
+
+    /**
+     * Create a new MimePart.
+     *
+     * @param string $body
+     * @param string $contentType
+     * @param string $charset
+     *
+     * @return Swift_Mime_MimePart
+     */
+    public static function newInstance($body = null, $contentType = null, $charset = null)
+    {
+        return new self($body, $contentType, $charset);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/NullTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/NullTransport.php
new file mode 100644
index 000000000..b38e1cf76
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/NullTransport.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2009 Fabien Potencier <fabien.potencier@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Pretends messages have been sent, but just ignores them.
+ *
+ * @author Fabien Potencier
+ */
+class Swift_NullTransport extends Swift_Transport_NullTransport
+{
+    /**
+     * Create a new NullTransport.
+     */
+    public function __construct()
+    {
+        call_user_func_array(
+            array($this, 'Swift_Transport_NullTransport::__construct'),
+            Swift_DependencyContainer::getInstance()
+                ->createDependenciesFor('transport.null')
+        );
+    }
+
+    /**
+     * Create a new NullTransport instance.
+     *
+     * @return Swift_NullTransport
+     */
+    public static function newInstance()
+    {
+        return new self();
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/OutputByteStream.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/OutputByteStream.php
new file mode 100644
index 000000000..1f26f9be5
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/OutputByteStream.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An abstract means of reading data.
+ *
+ * Classes implementing this interface may use a subsystem which requires less
+ * memory than working with large strings of data.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_OutputByteStream
+{
+    /**
+     * Reads $length bytes from the stream into a string and moves the pointer
+     * through the stream by $length.
+     *
+     * If less bytes exist than are requested the remaining bytes are given instead.
+     * If no bytes are remaining at all, boolean false is returned.
+     *
+     * @param int $length
+     *
+     * @throws Swift_IoException
+     *
+     * @return string|bool
+     */
+    public function read($length);
+
+    /**
+     * Move the internal read pointer to $byteOffset in the stream.
+     *
+     * @param int $byteOffset
+     *
+     * @throws Swift_IoException
+     *
+     * @return bool
+     */
+    public function setReadPointer($byteOffset);
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
new file mode 100644
index 000000000..a2ec2abcd
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
@@ -0,0 +1,141 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Reduces network flooding when sending large amounts of mail.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Plugins_AntiFloodPlugin implements Swift_Events_SendListener, Swift_Plugins_Sleeper
+{
+    /**
+     * The number of emails to send before restarting Transport.
+     *
+     * @var int
+     */
+    private $_threshold;
+
+    /**
+     * The number of seconds to sleep for during a restart.
+     *
+     * @var int
+     */
+    private $_sleep;
+
+    /**
+     * The internal counter.
+     *
+     * @var int
+     */
+    private $_counter = 0;
+
+    /**
+     * The Sleeper instance for sleeping.
+     *
+     * @var Swift_Plugins_Sleeper
+     */
+    private $_sleeper;
+
+    /**
+     * Create a new AntiFloodPlugin with $threshold and $sleep time.
+     *
+     * @param int                   $threshold
+     * @param int                   $sleep     time
+     * @param Swift_Plugins_Sleeper $sleeper   (not needed really)
+     */
+    public function __construct($threshold = 99, $sleep = 0, Swift_Plugins_Sleeper $sleeper = null)
+    {
+        $this->setThreshold($threshold);
+        $this->setSleepTime($sleep);
+        $this->_sleeper = $sleeper;
+    }
+
+    /**
+     * Set the number of emails to send before restarting.
+     *
+     * @param int $threshold
+     */
+    public function setThreshold($threshold)
+    {
+        $this->_threshold = $threshold;
+    }
+
+    /**
+     * Get the number of emails to send before restarting.
+     *
+     * @return int
+     */
+    public function getThreshold()
+    {
+        return $this->_threshold;
+    }
+
+    /**
+     * Set the number of seconds to sleep for during a restart.
+     *
+     * @param int $sleep time
+     */
+    public function setSleepTime($sleep)
+    {
+        $this->_sleep = $sleep;
+    }
+
+    /**
+     * Get the number of seconds to sleep for during a restart.
+     *
+     * @return int
+     */
+    public function getSleepTime()
+    {
+        return $this->_sleep;
+    }
+
+    /**
+     * Invoked immediately before the Message is sent.
+     *
+     * @param Swift_Events_SendEvent $evt
+     */
+    public function beforeSendPerformed(Swift_Events_SendEvent $evt)
+    {
+    }
+
+    /**
+     * Invoked immediately after the Message is sent.
+     *
+     * @param Swift_Events_SendEvent $evt
+     */
+    public function sendPerformed(Swift_Events_SendEvent $evt)
+    {
+        ++$this->_counter;
+        if ($this->_counter >= $this->_threshold) {
+            $transport = $evt->getTransport();
+            $transport->stop();
+            if ($this->_sleep) {
+                $this->sleep($this->_sleep);
+            }
+            $transport->start();
+            $this->_counter = 0;
+        }
+    }
+
+    /**
+     * Sleep for $seconds.
+     *
+     * @param int $seconds
+     */
+    public function sleep($seconds)
+    {
+        if (isset($this->_sleeper)) {
+            $this->_sleeper->sleep($seconds);
+        } else {
+            sleep($seconds);
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
new file mode 100644
index 000000000..f7e18d0eb
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
@@ -0,0 +1,164 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Reduces network flooding when sending large amounts of mail.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener, Swift_Events_CommandListener, Swift_Events_ResponseListener, Swift_InputByteStream
+{
+    /**
+     * The outgoing traffic counter.
+     *
+     * @var int
+     */
+    private $_out = 0;
+
+    /**
+     * The incoming traffic counter.
+     *
+     * @var int
+     */
+    private $_in = 0;
+
+    /** Bound byte streams */
+    private $_mirrors = array();
+
+    /**
+     * Not used.
+     */
+    public function beforeSendPerformed(Swift_Events_SendEvent $evt)
+    {
+    }
+
+    /**
+     * Invoked immediately after the Message is sent.
+     *
+     * @param Swift_Events_SendEvent $evt
+     */
+    public function sendPerformed(Swift_Events_SendEvent $evt)
+    {
+        $message = $evt->getMessage();
+        $message->toByteStream($this);
+    }
+
+    /**
+     * Invoked immediately following a command being sent.
+     *
+     * @param Swift_Events_CommandEvent $evt
+     */
+    public function commandSent(Swift_Events_CommandEvent $evt)
+    {
+        $command = $evt->getCommand();
+        $this->_out += strlen($command);
+    }
+
+    /**
+     * Invoked immediately following a response coming back.
+     *
+     * @param Swift_Events_ResponseEvent $evt
+     */
+    public function responseReceived(Swift_Events_ResponseEvent $evt)
+    {
+        $response = $evt->getResponse();
+        $this->_in += strlen($response);
+    }
+
+    /**
+     * Called when a message is sent so that the outgoing counter can be increased.
+     *
+     * @param string $bytes
+     */
+    public function write($bytes)
+    {
+        $this->_out += strlen($bytes);
+        foreach ($this->_mirrors as $stream) {
+            $stream->write($bytes);
+        }
+    }
+
+    /**
+     * Not used.
+     */
+    public function commit()
+    {
+    }
+
+    /**
+     * Attach $is to this stream.
+     *
+     * The stream acts as an observer, receiving all data that is written.
+     * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
+     *
+     * @param Swift_InputByteStream $is
+     */
+    public function bind(Swift_InputByteStream $is)
+    {
+        $this->_mirrors[] = $is;
+    }
+
+    /**
+     * Remove an already bound stream.
+     *
+     * If $is is not bound, no errors will be raised.
+     * If the stream currently has any buffered data it will be written to $is
+     * before unbinding occurs.
+     *
+     * @param Swift_InputByteStream $is
+     */
+    public function unbind(Swift_InputByteStream $is)
+    {
+        foreach ($this->_mirrors as $k => $stream) {
+            if ($is === $stream) {
+                unset($this->_mirrors[$k]);
+            }
+        }
+    }
+
+    /**
+     * Not used.
+     */
+    public function flushBuffers()
+    {
+        foreach ($this->_mirrors as $stream) {
+            $stream->flushBuffers();
+        }
+    }
+
+    /**
+     * Get the total number of bytes sent to the server.
+     *
+     * @return int
+     */
+    public function getBytesOut()
+    {
+        return $this->_out;
+    }
+
+    /**
+     * Get the total number of bytes received from the server.
+     *
+     * @return int
+     */
+    public function getBytesIn()
+    {
+        return $this->_in;
+    }
+
+    /**
+     * Reset the internal counters to zero.
+     */
+    public function reset()
+    {
+        $this->_out = 0;
+        $this->_in = 0;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Decorator/Replacements.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Decorator/Replacements.php
new file mode 100644
index 000000000..9f9f08b56
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Decorator/Replacements.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Allows customization of Messages on-the-fly.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_Plugins_Decorator_Replacements
+{
+    /**
+     * Return the array of replacements for $address.
+     *
+     * This method is invoked once for every single recipient of a message.
+     *
+     * If no replacements can be found, an empty value (NULL) should be returned
+     * and no replacements will then be made on the message.
+     *
+     * @param string $address
+     *
+     * @return array
+     */
+    public function getReplacementsFor($address);
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php
new file mode 100644
index 000000000..0762b36d2
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php
@@ -0,0 +1,204 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Allows customization of Messages on-the-fly.
+ *
+ * @author Chris Corbyn
+ * @author Fabien Potencier
+ */
+class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_Plugins_Decorator_Replacements
+{
+    /** The replacement map */
+    private $_replacements;
+
+    /** The body as it was before replacements */
+    private $_originalBody;
+
+    /** The original headers of the message, before replacements */
+    private $_originalHeaders = array();
+
+    /** Bodies of children before they are replaced */
+    private $_originalChildBodies = array();
+
+    /** The Message that was last replaced */
+    private $_lastMessage;
+
+    /**
+     * Create a new DecoratorPlugin with $replacements.
+     *
+     * The $replacements can either be an associative array, or an implementation
+     * of {@link Swift_Plugins_Decorator_Replacements}.
+     *
+     * When using an array, it should be of the form:
+     * <code>
+     * $replacements = array(
+     *  "address1@domain.tld" => array("{a}" => "b", "{c}" => "d"),
+     *  "address2@domain.tld" => array("{a}" => "x", "{c}" => "y")
+     * )
+     * </code>
+     *
+     * When using an instance of {@link Swift_Plugins_Decorator_Replacements},
+     * the object should return just the array of replacements for the address
+     * given to {@link Swift_Plugins_Decorator_Replacements::getReplacementsFor()}.
+     *
+     * @param mixed $replacements Array or Swift_Plugins_Decorator_Replacements
+     */
+    public function __construct($replacements)
+    {
+        $this->setReplacements($replacements);
+    }
+
+    /**
+     * Sets replacements.
+     *
+     * @param mixed $replacements Array or Swift_Plugins_Decorator_Replacements
+     *
+     * @see __construct()
+     */
+    public function setReplacements($replacements)
+    {
+        if (!($replacements instanceof Swift_Plugins_Decorator_Replacements)) {
+            $this->_replacements = (array) $replacements;
+        } else {
+            $this->_replacements = $replacements;
+        }
+    }
+
+    /**
+     * Invoked immediately before the Message is sent.
+     *
+     * @param Swift_Events_SendEvent $evt
+     */
+    public function beforeSendPerformed(Swift_Events_SendEvent $evt)
+    {
+        $message = $evt->getMessage();
+        $this->_restoreMessage($message);
+        $to = array_keys($message->getTo());
+        $address = array_shift($to);
+        if ($replacements = $this->getReplacementsFor($address)) {
+            $body = $message->getBody();
+            $search = array_keys($replacements);
+            $replace = array_values($replacements);
+            $bodyReplaced = str_replace(
+                $search, $replace, $body
+                );
+            if ($body != $bodyReplaced) {
+                $this->_originalBody = $body;
+                $message->setBody($bodyReplaced);
+            }
+
+            foreach ($message->getHeaders()->getAll() as $header) {
+                $body = $header->getFieldBodyModel();
+                $count = 0;
+                if (is_array($body)) {
+                    $bodyReplaced = array();
+                    foreach ($body as $key => $value) {
+                        $count1 = 0;
+                        $count2 = 0;
+                        $key = is_string($key) ? str_replace($search, $replace, $key, $count1) : $key;
+                        $value = is_string($value) ? str_replace($search, $replace, $value, $count2) : $value;
+                        $bodyReplaced[$key] = $value;
+
+                        if (!$count && ($count1 || $count2)) {
+                            $count = 1;
+                        }
+                    }
+                } else {
+                    $bodyReplaced = str_replace($search, $replace, $body, $count);
+                }
+
+                if ($count) {
+                    $this->_originalHeaders[$header->getFieldName()] = $body;
+                    $header->setFieldBodyModel($bodyReplaced);
+                }
+            }
+
+            $children = (array) $message->getChildren();
+            foreach ($children as $child) {
+                list($type) = sscanf($child->getContentType(), '%[^/]/%s');
+                if ('text' == $type) {
+                    $body = $child->getBody();
+                    $bodyReplaced = str_replace(
+                        $search, $replace, $body
+                        );
+                    if ($body != $bodyReplaced) {
+                        $child->setBody($bodyReplaced);
+                        $this->_originalChildBodies[$child->getId()] = $body;
+                    }
+                }
+            }
+            $this->_lastMessage = $message;
+        }
+    }
+
+    /**
+     * Find a map of replacements for the address.
+     *
+     * If this plugin was provided with a delegate instance of
+     * {@link Swift_Plugins_Decorator_Replacements} then the call will be
+     * delegated to it.  Otherwise, it will attempt to find the replacements
+     * from the array provided in the constructor.
+     *
+     * If no replacements can be found, an empty value (NULL) is returned.
+     *
+     * @param string $address
+     *
+     * @return array
+     */
+    public function getReplacementsFor($address)
+    {
+        if ($this->_replacements instanceof Swift_Plugins_Decorator_Replacements) {
+            return $this->_replacements->getReplacementsFor($address);
+        }
+
+        return isset($this->_replacements[$address]) ? $this->_replacements[$address] : null;
+    }
+
+    /**
+     * Invoked immediately after the Message is sent.
+     *
+     * @param Swift_Events_SendEvent $evt
+     */
+    public function sendPerformed(Swift_Events_SendEvent $evt)
+    {
+        $this->_restoreMessage($evt->getMessage());
+    }
+
+    /** Restore a changed message back to its original state */
+    private function _restoreMessage(Swift_Mime_Message $message)
+    {
+        if ($this->_lastMessage === $message) {
+            if (isset($this->_originalBody)) {
+                $message->setBody($this->_originalBody);
+                $this->_originalBody = null;
+            }
+            if (!empty($this->_originalHeaders)) {
+                foreach ($message->getHeaders()->getAll() as $header) {
+                    if (array_key_exists($header->getFieldName(), $this->_originalHeaders)) {
+                        $header->setFieldBodyModel($this->_originalHeaders[$header->getFieldName()]);
+                    }
+                }
+                $this->_originalHeaders = array();
+            }
+            if (!empty($this->_originalChildBodies)) {
+                $children = (array) $message->getChildren();
+                foreach ($children as $child) {
+                    $id = $child->getId();
+                    if (array_key_exists($id, $this->_originalChildBodies)) {
+                        $child->setBody($this->_originalChildBodies[$id]);
+                    }
+                }
+                $this->_originalChildBodies = array();
+            }
+            $this->_lastMessage = null;
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
new file mode 100644
index 000000000..7552b67a2
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
@@ -0,0 +1,69 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2009 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Replaces the sender of a message.
+ *
+ * @author Arjen Brouwer
+ */
+class Swift_Plugins_ImpersonatePlugin implements Swift_Events_SendListener
+{
+    /**
+     * The sender to impersonate.
+     *
+     * @var String
+     */
+    private $_sender;
+
+    /**
+     * Create a new ImpersonatePlugin to impersonate $sender.
+     *
+     * @param string $sender address
+     */
+    public function __construct($sender)
+    {
+        $this->_sender = $sender;
+    }
+
+    /**
+     * Invoked immediately before the Message is sent.
+     *
+     * @param Swift_Events_SendEvent $evt
+     */
+    public function beforeSendPerformed(Swift_Events_SendEvent $evt)
+    {
+        $message = $evt->getMessage();
+        $headers = $message->getHeaders();
+
+        // save current recipients
+        $headers->addPathHeader('X-Swift-Return-Path', $message->getReturnPath());
+
+        // replace them with the one to send to
+        $message->setReturnPath($this->_sender);
+    }
+
+    /**
+     * Invoked immediately after the Message is sent.
+     *
+     * @param Swift_Events_SendEvent $evt
+     */
+    public function sendPerformed(Swift_Events_SendEvent $evt)
+    {
+        $message = $evt->getMessage();
+
+        // restore original headers
+        $headers = $message->getHeaders();
+
+        if ($headers->has('X-Swift-Return-Path')) {
+            $message->setReturnPath($headers->get('X-Swift-Return-Path')->getAddress());
+            $headers->removeAll('X-Swift-Return-Path');
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Logger.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Logger.php
similarity index 51%
rename from lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Logger.php
rename to lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Logger.php
index 9864da0dd..d9bce8935 100644
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Logger.php
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Logger.php
@@ -10,28 +10,27 @@
 
 /**
  * Logs events in the Transport system.
- * @package Swift
- * @subpackage Transport
+ *
  * @author Chris Corbyn
  */
 interface Swift_Plugins_Logger
 {
-  
-  /**
-   * Add a log entry.
-   * @param string $entry
-   */
-  public function add($entry);
-  
-  /**
-   * Clear the log contents.
-   */
-  public function clear();
-  
-  /**
-   * Get this log as a string.
-   * @return string
-   */
-  public function dump();
-  
+    /**
+     * Add a log entry.
+     *
+     * @param string $entry
+     */
+    public function add($entry);
+
+    /**
+     * Clear the log contents.
+     */
+    public function clear();
+
+    /**
+     * Get this log as a string.
+     *
+     * @return string
+     */
+    public function dump();
 }
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php
new file mode 100644
index 000000000..64db43846
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php
@@ -0,0 +1,142 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Does real time logging of Transport level information.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Plugins_LoggerPlugin implements Swift_Events_CommandListener, Swift_Events_ResponseListener, Swift_Events_TransportChangeListener, Swift_Events_TransportExceptionListener, Swift_Plugins_Logger
+{
+    /** The logger which is delegated to */
+    private $_logger;
+
+    /**
+     * Create a new LoggerPlugin using $logger.
+     *
+     * @param Swift_Plugins_Logger $logger
+     */
+    public function __construct(Swift_Plugins_Logger $logger)
+    {
+        $this->_logger = $logger;
+    }
+
+    /**
+     * Add a log entry.
+     *
+     * @param string $entry
+     */
+    public function add($entry)
+    {
+        $this->_logger->add($entry);
+    }
+
+    /**
+     * Clear the log contents.
+     */
+    public function clear()
+    {
+        $this->_logger->clear();
+    }
+
+    /**
+     * Get this log as a string.
+     *
+     * @return string
+     */
+    public function dump()
+    {
+        return $this->_logger->dump();
+    }
+
+    /**
+     * Invoked immediately following a command being sent.
+     *
+     * @param Swift_Events_CommandEvent $evt
+     */
+    public function commandSent(Swift_Events_CommandEvent $evt)
+    {
+        $command = $evt->getCommand();
+        $this->_logger->add(sprintf('>> %s', $command));
+    }
+
+    /**
+     * Invoked immediately following a response coming back.
+     *
+     * @param Swift_Events_ResponseEvent $evt
+     */
+    public function responseReceived(Swift_Events_ResponseEvent $evt)
+    {
+        $response = $evt->getResponse();
+        $this->_logger->add(sprintf('<< %s', $response));
+    }
+
+    /**
+     * Invoked just before a Transport is started.
+     *
+     * @param Swift_Events_TransportChangeEvent $evt
+     */
+    public function beforeTransportStarted(Swift_Events_TransportChangeEvent $evt)
+    {
+        $transportName = get_class($evt->getSource());
+        $this->_logger->add(sprintf('++ Starting %s', $transportName));
+    }
+
+    /**
+     * Invoked immediately after the Transport is started.
+     *
+     * @param Swift_Events_TransportChangeEvent $evt
+     */
+    public function transportStarted(Swift_Events_TransportChangeEvent $evt)
+    {
+        $transportName = get_class($evt->getSource());
+        $this->_logger->add(sprintf('++ %s started', $transportName));
+    }
+
+    /**
+     * Invoked just before a Transport is stopped.
+     *
+     * @param Swift_Events_TransportChangeEvent $evt
+     */
+    public function beforeTransportStopped(Swift_Events_TransportChangeEvent $evt)
+    {
+        $transportName = get_class($evt->getSource());
+        $this->_logger->add(sprintf('++ Stopping %s', $transportName));
+    }
+
+    /**
+     * Invoked immediately after the Transport is stopped.
+     *
+     * @param Swift_Events_TransportChangeEvent $evt
+     */
+    public function transportStopped(Swift_Events_TransportChangeEvent $evt)
+    {
+        $transportName = get_class($evt->getSource());
+        $this->_logger->add(sprintf('++ %s stopped', $transportName));
+    }
+
+    /**
+     * Invoked as a TransportException is thrown in the Transport system.
+     *
+     * @param Swift_Events_TransportExceptionEvent $evt
+     */
+    public function exceptionThrown(Swift_Events_TransportExceptionEvent $evt)
+    {
+        $e = $evt->getException();
+        $message = $e->getMessage();
+        $code = $e->getCode();
+        $this->_logger->add(sprintf('!! %s (code: %s)', $message, $code));
+        $message .= PHP_EOL;
+        $message .= 'Log data:'.PHP_EOL;
+        $message .= $this->_logger->dump();
+        $evt->cancelBubble();
+        throw new Swift_TransportException($message, $code, $e->getPrevious());
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
new file mode 100644
index 000000000..865bb0aa3
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Logs to an Array backend.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Plugins_Loggers_ArrayLogger implements Swift_Plugins_Logger
+{
+    /**
+     * The log contents.
+     *
+     * @var array
+     */
+    private $_log = array();
+
+    /**
+     * Max size of the log.
+     *
+     * @var int
+     */
+    private $_size = 0;
+
+    /**
+     * Create a new ArrayLogger with a maximum of $size entries.
+     *
+     * @var int
+     */
+    public function __construct($size = 50)
+    {
+        $this->_size = $size;
+    }
+
+    /**
+     * Add a log entry.
+     *
+     * @param string $entry
+     */
+    public function add($entry)
+    {
+        $this->_log[] = $entry;
+        while (count($this->_log) > $this->_size) {
+            array_shift($this->_log);
+        }
+    }
+
+    /**
+     * Clear the log contents.
+     */
+    public function clear()
+    {
+        $this->_log = array();
+    }
+
+    /**
+     * Get this log as a string.
+     *
+     * @return string
+     */
+    public function dump()
+    {
+        return implode(PHP_EOL, $this->_log);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php
new file mode 100644
index 000000000..3583297ab
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php
@@ -0,0 +1,58 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Prints all log messages in real time.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Plugins_Loggers_EchoLogger implements Swift_Plugins_Logger
+{
+    /** Whether or not HTML should be output */
+    private $_isHtml;
+
+    /**
+     * Create a new EchoLogger.
+     *
+     * @param bool $isHtml
+     */
+    public function __construct($isHtml = true)
+    {
+        $this->_isHtml = $isHtml;
+    }
+
+    /**
+     * Add a log entry.
+     *
+     * @param string $entry
+     */
+    public function add($entry)
+    {
+        if ($this->_isHtml) {
+            printf('%s%s%s', htmlspecialchars($entry, ENT_QUOTES), '<br />', PHP_EOL);
+        } else {
+            printf('%s%s', $entry, PHP_EOL);
+        }
+    }
+
+    /**
+     * Not implemented.
+     */
+    public function clear()
+    {
+    }
+
+    /**
+     * Not implemented.
+     */
+    public function dump()
+    {
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
new file mode 100644
index 000000000..e622cb37d
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
@@ -0,0 +1,74 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2011 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Stores all sent emails for further usage.
+ *
+ * @author Fabien Potencier
+ */
+class Swift_Plugins_MessageLogger implements Swift_Events_SendListener
+{
+    /**
+     * @var array
+     */
+    private $messages;
+
+    public function __construct()
+    {
+        $this->messages = array();
+    }
+
+    /**
+     * Get the message list.
+     *
+     * @return array
+     */
+    public function getMessages()
+    {
+        return $this->messages;
+    }
+
+    /**
+     * Get the message count.
+     *
+     * @return int count
+     */
+    public function countMessages()
+    {
+        return count($this->messages);
+    }
+
+    /**
+     * Empty the message list.
+     */
+    public function clear()
+    {
+        $this->messages = array();
+    }
+
+    /**
+     * Invoked immediately before the Message is sent.
+     *
+     * @param Swift_Events_SendEvent $evt
+     */
+    public function beforeSendPerformed(Swift_Events_SendEvent $evt)
+    {
+        $this->messages[] = clone $evt->getMessage();
+    }
+
+    /**
+     * Invoked immediately after the Message is sent.
+     *
+     * @param Swift_Events_SendEvent $evt
+     */
+    public function sendPerformed(Swift_Events_SendEvent $evt)
+    {
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Connection.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Connection.php
new file mode 100644
index 000000000..fb99e4c94
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Connection.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Pop3Connection interface for connecting and disconnecting to a POP3 host.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_Plugins_Pop_Pop3Connection
+{
+    /**
+     * Connect to the POP3 host and throw an Exception if it fails.
+     *
+     * @throws Swift_Plugins_Pop_Pop3Exception
+     */
+    public function connect();
+
+    /**
+     * Disconnect from the POP3 host and throw an Exception if it fails.
+     *
+     * @throws Swift_Plugins_Pop_Pop3Exception
+     */
+    public function disconnect();
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Pop/Pop3Exception.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Exception.php
similarity index 58%
rename from lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Pop/Pop3Exception.php
rename to lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Exception.php
index e0205f44d..dc7be0c4e 100644
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Pop/Pop3Exception.php
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Pop/Pop3Exception.php
@@ -8,27 +8,20 @@
  * file that was distributed with this source code.
  */
 
-//@require 'Swift/IoException.php';
-
 /**
  * Pop3Exception thrown when an error occurs connecting to a POP3 host.
- * 
- * @package Swift
- * @subpackage Transport
- * 
+ *
  * @author Chris Corbyn
  */
 class Swift_Plugins_Pop_Pop3Exception extends Swift_IoException
 {
-  
-  /**
-   * Create a new Pop3Exception with $message.
-   * 
-   * @param string $message
-   */
-  public function __construct($message)
-  {
-    parent::__construct($message);
-  }
-  
+    /**
+     * Create a new Pop3Exception with $message.
+     *
+     * @param string $message
+     */
+    public function __construct($message)
+    {
+        parent::__construct($message);
+    }
 }
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
new file mode 100644
index 000000000..18abb7706
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
@@ -0,0 +1,273 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Makes sure a connection to a POP3 host has been established prior to connecting to SMTP.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeListener, Swift_Plugins_Pop_Pop3Connection
+{
+    /** A delegate connection to use (mostly a test hook) */
+    private $_connection;
+
+    /** Hostname of the POP3 server */
+    private $_host;
+
+    /** Port number to connect on */
+    private $_port;
+
+    /** Encryption type to use (if any) */
+    private $_crypto;
+
+    /** Username to use (if any) */
+    private $_username;
+
+    /** Password to use (if any) */
+    private $_password;
+
+    /** Established connection via TCP socket */
+    private $_socket;
+
+    /** Connect timeout in seconds */
+    private $_timeout = 10;
+
+    /** SMTP Transport to bind to */
+    private $_transport;
+
+    /**
+     * Create a new PopBeforeSmtpPlugin for $host and $port.
+     *
+     * @param string $host
+     * @param int    $port
+     * @param string $crypto as "tls" or "ssl"
+     */
+    public function __construct($host, $port = 110, $crypto = null)
+    {
+        $this->_host = $host;
+        $this->_port = $port;
+        $this->_crypto = $crypto;
+    }
+
+    /**
+     * Create a new PopBeforeSmtpPlugin for $host and $port.
+     *
+     * @param string $host
+     * @param int    $port
+     * @param string $crypto as "tls" or "ssl"
+     *
+     * @return Swift_Plugins_PopBeforeSmtpPlugin
+     */
+    public static function newInstance($host, $port = 110, $crypto = null)
+    {
+        return new self($host, $port, $crypto);
+    }
+
+    /**
+     * Set a Pop3Connection to delegate to instead of connecting directly.
+     *
+     * @param Swift_Plugins_Pop_Pop3Connection $connection
+     *
+     * @return Swift_Plugins_PopBeforeSmtpPlugin
+     */
+    public function setConnection(Swift_Plugins_Pop_Pop3Connection $connection)
+    {
+        $this->_connection = $connection;
+
+        return $this;
+    }
+
+    /**
+     * Bind this plugin to a specific SMTP transport instance.
+     *
+     * @param Swift_Transport
+     */
+    public function bindSmtp(Swift_Transport $smtp)
+    {
+        $this->_transport = $smtp;
+    }
+
+    /**
+     * Set the connection timeout in seconds (default 10).
+     *
+     * @param int $timeout
+     *
+     * @return Swift_Plugins_PopBeforeSmtpPlugin
+     */
+    public function setTimeout($timeout)
+    {
+        $this->_timeout = (int) $timeout;
+
+        return $this;
+    }
+
+    /**
+     * Set the username to use when connecting (if needed).
+     *
+     * @param string $username
+     *
+     * @return Swift_Plugins_PopBeforeSmtpPlugin
+     */
+    public function setUsername($username)
+    {
+        $this->_username = $username;
+
+        return $this;
+    }
+
+    /**
+     * Set the password to use when connecting (if needed).
+     *
+     * @param string $password
+     *
+     * @return Swift_Plugins_PopBeforeSmtpPlugin
+     */
+    public function setPassword($password)
+    {
+        $this->_password = $password;
+
+        return $this;
+    }
+
+    /**
+     * Connect to the POP3 host and authenticate.
+     *
+     * @throws Swift_Plugins_Pop_Pop3Exception if connection fails
+     */
+    public function connect()
+    {
+        if (isset($this->_connection)) {
+            $this->_connection->connect();
+        } else {
+            if (!isset($this->_socket)) {
+                if (!$socket = fsockopen(
+                    $this->_getHostString(), $this->_port, $errno, $errstr, $this->_timeout)) {
+                    throw new Swift_Plugins_Pop_Pop3Exception(
+                        sprintf('Failed to connect to POP3 host [%s]: %s', $this->_host, $errstr)
+                    );
+                }
+                $this->_socket = $socket;
+
+                if (false === $greeting = fgets($this->_socket)) {
+                    throw new Swift_Plugins_Pop_Pop3Exception(
+                        sprintf('Failed to connect to POP3 host [%s]', trim($greeting))
+                    );
+                }
+
+                $this->_assertOk($greeting);
+
+                if ($this->_username) {
+                    $this->_command(sprintf("USER %s\r\n", $this->_username));
+                    $this->_command(sprintf("PASS %s\r\n", $this->_password));
+                }
+            }
+        }
+    }
+
+    /**
+     * Disconnect from the POP3 host.
+     */
+    public function disconnect()
+    {
+        if (isset($this->_connection)) {
+            $this->_connection->disconnect();
+        } else {
+            $this->_command("QUIT\r\n");
+            if (!fclose($this->_socket)) {
+                throw new Swift_Plugins_Pop_Pop3Exception(
+                    sprintf('POP3 host [%s] connection could not be stopped', $this->_host)
+                );
+            }
+            $this->_socket = null;
+        }
+    }
+
+    /**
+     * Invoked just before a Transport is started.
+     *
+     * @param Swift_Events_TransportChangeEvent $evt
+     */
+    public function beforeTransportStarted(Swift_Events_TransportChangeEvent $evt)
+    {
+        if (isset($this->_transport)) {
+            if ($this->_transport !== $evt->getTransport()) {
+                return;
+            }
+        }
+
+        $this->connect();
+        $this->disconnect();
+    }
+
+    /**
+     * Not used.
+     */
+    public function transportStarted(Swift_Events_TransportChangeEvent $evt)
+    {
+    }
+
+    /**
+     * Not used.
+     */
+    public function beforeTransportStopped(Swift_Events_TransportChangeEvent $evt)
+    {
+    }
+
+    /**
+     * Not used.
+     */
+    public function transportStopped(Swift_Events_TransportChangeEvent $evt)
+    {
+    }
+
+    private function _command($command)
+    {
+        if (!fwrite($this->_socket, $command)) {
+            throw new Swift_Plugins_Pop_Pop3Exception(
+                sprintf('Failed to write command [%s] to POP3 host', trim($command))
+            );
+        }
+
+        if (false === $response = fgets($this->_socket)) {
+            throw new Swift_Plugins_Pop_Pop3Exception(
+                sprintf('Failed to read from POP3 host after command [%s]', trim($command))
+            );
+        }
+
+        $this->_assertOk($response);
+
+        return $response;
+    }
+
+    private function _assertOk($response)
+    {
+        if (substr($response, 0, 3) != '+OK') {
+            throw new Swift_Plugins_Pop_Pop3Exception(
+                sprintf('POP3 command failed [%s]', trim($response))
+            );
+        }
+    }
+
+    private function _getHostString()
+    {
+        $host = $this->_host;
+        switch (strtolower($this->_crypto)) {
+            case 'ssl':
+                $host = 'ssl://'.$host;
+                break;
+
+            case 'tls':
+                $host = 'tls://'.$host;
+                break;
+        }
+
+        return $host;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php
new file mode 100644
index 000000000..c3a1f8685
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php
@@ -0,0 +1,213 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2009 Fabien Potencier
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Redirects all email to a single recipient.
+ *
+ * @author Fabien Potencier
+ */
+class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
+{
+    /**
+     * The recipient who will receive all messages.
+     *
+     * @var mixed
+     */
+    private $_recipient;
+
+    /**
+     * List of regular expression for recipient whitelisting.
+     *
+     * @var array
+     */
+    private $_whitelist = array();
+
+    /**
+     * Create a new RedirectingPlugin.
+     *
+     * @param mixed $recipient
+     * @param array $whitelist
+     */
+    public function __construct($recipient, array $whitelist = array())
+    {
+        $this->_recipient = $recipient;
+        $this->_whitelist = $whitelist;
+    }
+
+    /**
+     * Set the recipient of all messages.
+     *
+     * @param mixed $recipient
+     */
+    public function setRecipient($recipient)
+    {
+        $this->_recipient = $recipient;
+    }
+
+    /**
+     * Get the recipient of all messages.
+     *
+     * @return mixed
+     */
+    public function getRecipient()
+    {
+        return $this->_recipient;
+    }
+
+    /**
+     * Set a list of regular expressions to whitelist certain recipients.
+     *
+     * @param array $whitelist
+     */
+    public function setWhitelist(array $whitelist)
+    {
+        $this->_whitelist = $whitelist;
+    }
+
+    /**
+     * Get the whitelist.
+     *
+     * @return array
+     */
+    public function getWhitelist()
+    {
+        return $this->_whitelist;
+    }
+
+    /**
+     * Invoked immediately before the Message is sent.
+     *
+     * @param Swift_Events_SendEvent $evt
+     */
+    public function beforeSendPerformed(Swift_Events_SendEvent $evt)
+    {
+        $message = $evt->getMessage();
+        $headers = $message->getHeaders();
+
+        // conditionally save current recipients
+
+        if ($headers->has('to')) {
+            $headers->addMailboxHeader('X-Swift-To', $message->getTo());
+        }
+
+        if ($headers->has('cc')) {
+            $headers->addMailboxHeader('X-Swift-Cc', $message->getCc());
+        }
+
+        if ($headers->has('bcc')) {
+            $headers->addMailboxHeader('X-Swift-Bcc', $message->getBcc());
+        }
+
+        // Filter remaining headers against whitelist
+        $this->_filterHeaderSet($headers, 'To');
+        $this->_filterHeaderSet($headers, 'Cc');
+        $this->_filterHeaderSet($headers, 'Bcc');
+
+        // Add each hard coded recipient
+        $to = $message->getTo();
+        if (null === $to) {
+            $to = array();
+        }
+
+        foreach ((array) $this->_recipient as $recipient) {
+            if (!array_key_exists($recipient, $to)) {
+                $message->addTo($recipient);
+            }
+        }
+    }
+
+    /**
+     * Filter header set against a whitelist of regular expressions.
+     *
+     * @param Swift_Mime_HeaderSet $headerSet
+     * @param string               $type
+     */
+    private function _filterHeaderSet(Swift_Mime_HeaderSet $headerSet, $type)
+    {
+        foreach ($headerSet->getAll($type) as $headers) {
+            $headers->setNameAddresses($this->_filterNameAddresses($headers->getNameAddresses()));
+        }
+    }
+
+    /**
+     * Filtered list of addresses => name pairs.
+     *
+     * @param array $recipients
+     *
+     * @return array
+     */
+    private function _filterNameAddresses(array $recipients)
+    {
+        $filtered = array();
+
+        foreach ($recipients as $address => $name) {
+            if ($this->_isWhitelisted($address)) {
+                $filtered[$address] = $name;
+            }
+        }
+
+        return $filtered;
+    }
+
+    /**
+     * Matches address against whitelist of regular expressions.
+     *
+     * @param $recipient
+     *
+     * @return bool
+     */
+    protected function _isWhitelisted($recipient)
+    {
+        if (in_array($recipient, (array) $this->_recipient)) {
+            return true;
+        }
+
+        foreach ($this->_whitelist as $pattern) {
+            if (preg_match($pattern, $recipient)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Invoked immediately after the Message is sent.
+     *
+     * @param Swift_Events_SendEvent $evt
+     */
+    public function sendPerformed(Swift_Events_SendEvent $evt)
+    {
+        $this->_restoreMessage($evt->getMessage());
+    }
+
+    private function _restoreMessage(Swift_Mime_Message $message)
+    {
+        // restore original headers
+        $headers = $message->getHeaders();
+
+        if ($headers->has('X-Swift-To')) {
+            $message->setTo($headers->get('X-Swift-To')->getNameAddresses());
+            $headers->removeAll('X-Swift-To');
+        } else {
+            $message->setTo(null);
+        }
+
+        if ($headers->has('X-Swift-Cc')) {
+            $message->setCc($headers->get('X-Swift-Cc')->getNameAddresses());
+            $headers->removeAll('X-Swift-Cc');
+        }
+
+        if ($headers->has('X-Swift-Bcc')) {
+            $message->setBcc($headers->get('X-Swift-Bcc')->getNameAddresses());
+            $headers->removeAll('X-Swift-Bcc');
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Reporter.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Reporter.php
new file mode 100644
index 000000000..0f21b7d60
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Reporter.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * The Reporter plugin sends pass/fail notification to a Reporter.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_Plugins_Reporter
+{
+    /** The recipient was accepted for delivery */
+    const RESULT_PASS = 0x01;
+
+    /** The recipient could not be accepted */
+    const RESULT_FAIL = 0x10;
+
+    /**
+     * Notifies this ReportNotifier that $address failed or succeeded.
+     *
+     * @param Swift_Mime_Message $message
+     * @param string             $address
+     * @param int                $result  from {@link RESULT_PASS, RESULT_FAIL}
+     */
+    public function notify(Swift_Mime_Message $message, $address, $result);
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php
new file mode 100644
index 000000000..a37901ff0
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Does real time reporting of pass/fail for each recipient.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Plugins_ReporterPlugin implements Swift_Events_SendListener
+{
+    /**
+     * The reporter backend which takes notifications.
+     *
+     * @var Swift_Plugins_Reporter
+     */
+    private $_reporter;
+
+    /**
+     * Create a new ReporterPlugin using $reporter.
+     *
+     * @param Swift_Plugins_Reporter $reporter
+     */
+    public function __construct(Swift_Plugins_Reporter $reporter)
+    {
+        $this->_reporter = $reporter;
+    }
+
+    /**
+     * Not used.
+     */
+    public function beforeSendPerformed(Swift_Events_SendEvent $evt)
+    {
+    }
+
+    /**
+     * Invoked immediately after the Message is sent.
+     *
+     * @param Swift_Events_SendEvent $evt
+     */
+    public function sendPerformed(Swift_Events_SendEvent $evt)
+    {
+        $message = $evt->getMessage();
+        $failures = array_flip($evt->getFailedRecipients());
+        foreach ((array) $message->getTo() as $address => $null) {
+            $this->_reporter->notify($message, $address, array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS);
+        }
+        foreach ((array) $message->getCc() as $address => $null) {
+            $this->_reporter->notify($message, $address, array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS);
+        }
+        foreach ((array) $message->getBcc() as $address => $null) {
+            $this->_reporter->notify($message, $address, array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS);
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
new file mode 100644
index 000000000..cad9d168e
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A reporter which "collects" failures for the Reporter plugin.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Plugins_Reporters_HitReporter implements Swift_Plugins_Reporter
+{
+    /**
+     * The list of failures.
+     *
+     * @var array
+     */
+    private $_failures = array();
+
+    private $_failures_cache = array();
+
+    /**
+     * Notifies this ReportNotifier that $address failed or succeeded.
+     *
+     * @param Swift_Mime_Message $message
+     * @param string             $address
+     * @param int                $result  from {@link RESULT_PASS, RESULT_FAIL}
+     */
+    public function notify(Swift_Mime_Message $message, $address, $result)
+    {
+        if (self::RESULT_FAIL == $result && !isset($this->_failures_cache[$address])) {
+            $this->_failures[] = $address;
+            $this->_failures_cache[$address] = true;
+        }
+    }
+
+    /**
+     * Get an array of addresses for which delivery failed.
+     *
+     * @return array
+     */
+    public function getFailedRecipients()
+    {
+        return $this->_failures;
+    }
+
+    /**
+     * Clear the buffer (empty the list).
+     */
+    public function clear()
+    {
+        $this->_failures = $this->_failures_cache = array();
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
new file mode 100644
index 000000000..c62593557
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A HTML output reporter for the Reporter plugin.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Plugins_Reporters_HtmlReporter implements Swift_Plugins_Reporter
+{
+    /**
+     * Notifies this ReportNotifier that $address failed or succeeded.
+     *
+     * @param Swift_Mime_Message $message
+     * @param string             $address
+     * @param int                $result  from {@see RESULT_PASS, RESULT_FAIL}
+     */
+    public function notify(Swift_Mime_Message $message, $address, $result)
+    {
+        if (self::RESULT_PASS == $result) {
+            echo '<div style="color: #fff; background: #006600; padding: 2px; margin: 2px;">'.PHP_EOL;
+            echo 'PASS '.$address.PHP_EOL;
+            echo '</div>'.PHP_EOL;
+            flush();
+        } else {
+            echo '<div style="color: #fff; background: #880000; padding: 2px; margin: 2px;">'.PHP_EOL;
+            echo 'FAIL '.$address.PHP_EOL;
+            echo '</div>'.PHP_EOL;
+            flush();
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Sleeper.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Sleeper.php
similarity index 68%
rename from lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Sleeper.php
rename to lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Sleeper.php
index 148cbd3e8..595c0f603 100644
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Sleeper.php
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Sleeper.php
@@ -10,17 +10,15 @@
 
 /**
  * Sleeps for a duration of time.
- * @package Swift
- * @subpackage Plugins
+ *
  * @author Chris Corbyn
  */
 interface Swift_Plugins_Sleeper
 {
-  
-  /**
-   * Sleep for $seconds.
-   * @param int $seconds
-   */
-  public function sleep($seconds);
-  
+    /**
+     * Sleep for $seconds.
+     *
+     * @param int $seconds
+     */
+    public function sleep($seconds);
 }
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
new file mode 100644
index 000000000..24bc929ee
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
@@ -0,0 +1,200 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Throttles the rate at which emails are sent.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin implements Swift_Plugins_Sleeper, Swift_Plugins_Timer
+{
+    /** Flag for throttling in bytes per minute */
+    const BYTES_PER_MINUTE = 0x01;
+
+    /** Flag for throttling in emails per second (Amazon SES) */
+    const MESSAGES_PER_SECOND = 0x11;
+
+    /** Flag for throttling in emails per minute */
+    const MESSAGES_PER_MINUTE = 0x10;
+
+    /**
+     * The Sleeper instance for sleeping.
+     *
+     * @var Swift_Plugins_Sleeper
+     */
+    private $_sleeper;
+
+    /**
+     * The Timer instance which provides the timestamp.
+     *
+     * @var Swift_Plugins_Timer
+     */
+    private $_timer;
+
+    /**
+     * The time at which the first email was sent.
+     *
+     * @var int
+     */
+    private $_start;
+
+    /**
+     * The rate at which messages should be sent.
+     *
+     * @var int
+     */
+    private $_rate;
+
+    /**
+     * The mode for throttling.
+     *
+     * This is {@link BYTES_PER_MINUTE} or {@link MESSAGES_PER_MINUTE}
+     *
+     * @var int
+     */
+    private $_mode;
+
+    /**
+     * An internal counter of the number of messages sent.
+     *
+     * @var int
+     */
+    private $_messages = 0;
+
+    /**
+     * Create a new ThrottlerPlugin.
+     *
+     * @param int                   $rate
+     * @param int                   $mode,   defaults to {@link BYTES_PER_MINUTE}
+     * @param Swift_Plugins_Sleeper $sleeper (only needed in testing)
+     * @param Swift_Plugins_Timer   $timer   (only needed in testing)
+     */
+    public function __construct($rate, $mode = self::BYTES_PER_MINUTE, Swift_Plugins_Sleeper $sleeper = null, Swift_Plugins_Timer $timer = null)
+    {
+        $this->_rate = $rate;
+        $this->_mode = $mode;
+        $this->_sleeper = $sleeper;
+        $this->_timer = $timer;
+    }
+
+    /**
+     * Invoked immediately before the Message is sent.
+     *
+     * @param Swift_Events_SendEvent $evt
+     */
+    public function beforeSendPerformed(Swift_Events_SendEvent $evt)
+    {
+        $time = $this->getTimestamp();
+        if (!isset($this->_start)) {
+            $this->_start = $time;
+        }
+        $duration = $time - $this->_start;
+
+        switch ($this->_mode) {
+            case self::BYTES_PER_MINUTE :
+                $sleep = $this->_throttleBytesPerMinute($duration);
+                break;
+            case self::MESSAGES_PER_SECOND :
+                $sleep = $this->_throttleMessagesPerSecond($duration);
+                break;
+            case self::MESSAGES_PER_MINUTE :
+                $sleep = $this->_throttleMessagesPerMinute($duration);
+                break;
+            default :
+                $sleep = 0;
+                break;
+        }
+
+        if ($sleep > 0) {
+            $this->sleep($sleep);
+        }
+    }
+
+    /**
+     * Invoked when a Message is sent.
+     *
+     * @param Swift_Events_SendEvent $evt
+     */
+    public function sendPerformed(Swift_Events_SendEvent $evt)
+    {
+        parent::sendPerformed($evt);
+        ++$this->_messages;
+    }
+
+    /**
+     * Sleep for $seconds.
+     *
+     * @param int $seconds
+     */
+    public function sleep($seconds)
+    {
+        if (isset($this->_sleeper)) {
+            $this->_sleeper->sleep($seconds);
+        } else {
+            sleep($seconds);
+        }
+    }
+
+    /**
+     * Get the current UNIX timestamp.
+     *
+     * @return int
+     */
+    public function getTimestamp()
+    {
+        if (isset($this->_timer)) {
+            return $this->_timer->getTimestamp();
+        }
+
+        return time();
+    }
+
+    /**
+     * Get a number of seconds to sleep for.
+     *
+     * @param int $timePassed
+     *
+     * @return int
+     */
+    private function _throttleBytesPerMinute($timePassed)
+    {
+        $expectedDuration = $this->getBytesOut() / ($this->_rate / 60);
+
+        return (int) ceil($expectedDuration - $timePassed);
+    }
+
+    /**
+     * Get a number of seconds to sleep for.
+     *
+     * @param int $timePassed
+     *
+     * @return int
+     */
+    private function _throttleMessagesPerSecond($timePassed)
+    {
+        $expectedDuration = $this->_messages / ($this->_rate);
+
+        return (int) ceil($expectedDuration - $timePassed);
+    }
+
+    /**
+     * Get a number of seconds to sleep for.
+     *
+     * @param int $timePassed
+     *
+     * @return int
+     */
+    private function _throttleMessagesPerMinute($timePassed)
+    {
+        $expectedDuration = $this->_messages / ($this->_rate / 60);
+
+        return (int) ceil($expectedDuration - $timePassed);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Timer.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Timer.php
similarity index 67%
rename from lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Timer.php
rename to lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Timer.php
index 92207bff9..9c8deb38a 100644
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/Plugins/Timer.php
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Plugins/Timer.php
@@ -10,17 +10,15 @@
 
 /**
  * Provides timestamp data.
- * @package Swift
- * @subpackage Plugins
+ *
  * @author Chris Corbyn
  */
 interface Swift_Plugins_Timer
 {
-  
-  /**
-   * Get the current UNIX timestamp.
-   * @return int
-   */
-  public function getTimestamp();
-  
+    /**
+     * Get the current UNIX timestamp.
+     *
+     * @return int
+     */
+    public function getTimestamp();
 }
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Preferences.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Preferences.php
new file mode 100644
index 000000000..503db84d8
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Preferences.php
@@ -0,0 +1,103 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Changes some global preference settings in Swift Mailer.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Preferences
+{
+    /** Singleton instance */
+    private static $_instance = null;
+
+    /** Constructor not to be used */
+    private function __construct()
+    {
+    }
+
+    /**
+     * Gets the instance of Preferences.
+     *
+     * @return Swift_Preferences
+     */
+    public static function getInstance()
+    {
+        if (!isset(self::$_instance)) {
+            self::$_instance = new self();
+        }
+
+        return self::$_instance;
+    }
+
+    /**
+     * Set the default charset used.
+     *
+     * @param string $charset
+     *
+     * @return Swift_Preferences
+     */
+    public function setCharset($charset)
+    {
+        Swift_DependencyContainer::getInstance()
+            ->register('properties.charset')->asValue($charset);
+
+        return $this;
+    }
+
+    /**
+     * Set the directory where temporary files can be saved.
+     *
+     * @param string $dir
+     *
+     * @return Swift_Preferences
+     */
+    public function setTempDir($dir)
+    {
+        Swift_DependencyContainer::getInstance()
+            ->register('tempdir')->asValue($dir);
+
+        return $this;
+    }
+
+    /**
+     * Set the type of cache to use (i.e. "disk" or "array").
+     *
+     * @param string $type
+     *
+     * @return Swift_Preferences
+     */
+    public function setCacheType($type)
+    {
+        Swift_DependencyContainer::getInstance()
+            ->register('cache')->asAliasOf(sprintf('cache.%s', $type));
+
+        return $this;
+    }
+
+    /**
+     * Set the QuotedPrintable dot escaper preference.
+     *
+     * @param bool $dotEscape
+     *
+     * @return Swift_Preferences
+     */
+    public function setQPDotEscape($dotEscape)
+    {
+        $dotEscape = !empty($dotEscape);
+        Swift_DependencyContainer::getInstance()
+            ->register('mime.qpcontentencoder')
+            ->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoder')
+            ->withDependencies(array('mime.charstream', 'mime.bytecanonicalizer'))
+            ->addConstructorValue($dotEscape);
+
+        return $this;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/ReplacementFilterFactory.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/ReplacementFilterFactory.php
similarity index 57%
rename from lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/ReplacementFilterFactory.php
rename to lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/ReplacementFilterFactory.php
index db29e6dba..2897474e7 100644
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/ReplacementFilterFactory.php
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/ReplacementFilterFactory.php
@@ -10,18 +10,18 @@
 
 /**
  * Creates StreamFilters.
- * @package Swift
+ *
  * @author Chris Corbyn
  */
 interface Swift_ReplacementFilterFactory
 {
-  
-  /**
-   * Create a filter to replace $search with $replace.
-   * @param mixed $search
-   * @param mixed $replace
-   * @return Swift_StreamFilter
-   */
-  public function createFilter($search, $replace);
-  
+    /**
+     * Create a filter to replace $search with $replace.
+     *
+     * @param mixed $search
+     * @param mixed $replace
+     *
+     * @return Swift_StreamFilter
+     */
+    public function createFilter($search, $replace);
 }
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/RfcComplianceException.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/RfcComplianceException.php
similarity index 58%
rename from lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/RfcComplianceException.php
rename to lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/RfcComplianceException.php
index 5bb394b58..81bc4031e 100644
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/RfcComplianceException.php
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/RfcComplianceException.php
@@ -8,23 +8,20 @@
  * file that was distributed with this source code.
  */
 
-//@require 'Swift/SwiftException.php';
-
 /**
  * RFC Compliance Exception class.
- * @package Swift
+ *
  * @author Chris Corbyn
  */
 class Swift_RfcComplianceException extends Swift_SwiftException
 {
-  
-  /**
-   * Create a new RfcComplianceException with $message.
-   * @param string $message
-   */
-  public function __construct($message)
-  {
-    parent::__construct($message);
-  }
-  
+    /**
+     * Create a new RfcComplianceException with $message.
+     *
+     * @param string $message
+     */
+    public function __construct($message)
+    {
+        parent::__construct($message);
+    }
 }
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/SendmailTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/SendmailTransport.php
new file mode 100644
index 000000000..974b24f27
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/SendmailTransport.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * SendmailTransport for sending mail through a Sendmail/Postfix (etc..) binary.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_SendmailTransport extends Swift_Transport_SendmailTransport
+{
+    /**
+     * Create a new SendmailTransport, optionally using $command for sending.
+     *
+     * @param string $command
+     */
+    public function __construct($command = '/usr/sbin/sendmail -bs')
+    {
+        call_user_func_array(
+            array($this, 'Swift_Transport_SendmailTransport::__construct'),
+            Swift_DependencyContainer::getInstance()
+                ->createDependenciesFor('transport.sendmail')
+            );
+
+        $this->setCommand($command);
+    }
+
+    /**
+     * Create a new SendmailTransport instance.
+     *
+     * @param string $command
+     *
+     * @return Swift_SendmailTransport
+     */
+    public static function newInstance($command = '/usr/sbin/sendmail -bs')
+    {
+        return new self($command);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/SignedMessage.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/SignedMessage.php
new file mode 100644
index 000000000..2e7a8726d
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/SignedMessage.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Signed Message, message that can be signed using a signer.
+ *
+ * This class is only kept for compatibility
+ *
+ *
+ * @author     Xavier De Cock <xdecock@gmail.com>
+ *
+ * @deprecated
+ */
+class Swift_SignedMessage extends Swift_Message
+{
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signer.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signer.php
new file mode 100644
index 000000000..2d8176d90
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signer.php
@@ -0,0 +1,20 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Base Class of Signer Infrastructure.
+ *
+ *
+ * @author Xavier De Cock <xdecock@gmail.com>
+ */
+interface Swift_Signer
+{
+    public function reset();
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signers/BodySigner.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signers/BodySigner.php
new file mode 100644
index 000000000..9ffcef39c
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signers/BodySigner.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Body Signer Interface used to apply Body-Based Signature to a message.
+ *
+ * @author Xavier De Cock <xdecock@gmail.com>
+ */
+interface Swift_Signers_BodySigner extends Swift_Signer
+{
+    /**
+     * Change the Swift_Signed_Message to apply the singing.
+     *
+     * @param Swift_Message $message
+     *
+     * @return Swift_Signers_BodySigner
+     */
+    public function signMessage(Swift_Message $message);
+
+    /**
+     * Return the list of header a signer might tamper.
+     *
+     * @return array
+     */
+    public function getAlteredHeaders();
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
new file mode 100644
index 000000000..b7a620910
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
@@ -0,0 +1,698 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * DKIM Signer used to apply DKIM Signature to a message.
+ *
+ * @author Xavier De Cock <xdecock@gmail.com>
+ */
+class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
+{
+    /**
+     * PrivateKey.
+     *
+     * @var string
+     */
+    protected $_privateKey;
+
+    /**
+     * DomainName.
+     *
+     * @var string
+     */
+    protected $_domainName;
+
+    /**
+     * Selector.
+     *
+     * @var string
+     */
+    protected $_selector;
+
+    /**
+     * Hash algorithm used.
+     *
+     * @var string
+     */
+    protected $_hashAlgorithm = 'rsa-sha1';
+
+    /**
+     * Body canon method.
+     *
+     * @var string
+     */
+    protected $_bodyCanon = 'simple';
+
+    /**
+     * Header canon method.
+     *
+     * @var string
+     */
+    protected $_headerCanon = 'simple';
+
+    /**
+     * Headers not being signed.
+     *
+     * @var array
+     */
+    protected $_ignoredHeaders = array('return-path' => true);
+
+    /**
+     * Signer identity.
+     *
+     * @var string
+     */
+    protected $_signerIdentity;
+
+    /**
+     * BodyLength.
+     *
+     * @var int
+     */
+    protected $_bodyLen = 0;
+
+    /**
+     * Maximum signedLen.
+     *
+     * @var int
+     */
+    protected $_maxLen = PHP_INT_MAX;
+
+    /**
+     * Embbed bodyLen in signature.
+     *
+     * @var bool
+     */
+    protected $_showLen = false;
+
+    /**
+     * When the signature has been applied (true means time()), false means not embedded.
+     *
+     * @var mixed
+     */
+    protected $_signatureTimestamp = true;
+
+    /**
+     * When will the signature expires false means not embedded, if sigTimestamp is auto
+     * Expiration is relative, otherwhise it's absolute.
+     *
+     * @var int
+     */
+    protected $_signatureExpiration = false;
+
+    /**
+     * Must we embed signed headers?
+     *
+     * @var bool
+     */
+    protected $_debugHeaders = false;
+
+    // work variables
+    /**
+     * Headers used to generate hash.
+     *
+     * @var array
+     */
+    protected $_signedHeaders = array();
+
+    /**
+     * If debugHeaders is set store debugDatas here.
+     *
+     * @var string
+     */
+    private $_debugHeadersData = '';
+
+    /**
+     * Stores the bodyHash.
+     *
+     * @var string
+     */
+    private $_bodyHash = '';
+
+    /**
+     * Stores the signature header.
+     *
+     * @var Swift_Mime_Headers_ParameterizedHeader
+     */
+    protected $_dkimHeader;
+
+    private $_bodyHashHandler;
+
+    private $_headerHash;
+
+    private $_headerCanonData = '';
+
+    private $_bodyCanonEmptyCounter = 0;
+
+    private $_bodyCanonIgnoreStart = 2;
+
+    private $_bodyCanonSpace = false;
+
+    private $_bodyCanonLastChar = null;
+
+    private $_bodyCanonLine = '';
+
+    private $_bound = array();
+
+    /**
+     * Constructor.
+     *
+     * @param string $privateKey
+     * @param string $domainName
+     * @param string $selector
+     */
+    public function __construct($privateKey, $domainName, $selector)
+    {
+        $this->_privateKey = $privateKey;
+        $this->_domainName = $domainName;
+        $this->_signerIdentity = '@'.$domainName;
+        $this->_selector = $selector;
+    }
+
+    /**
+     * Instanciate DKIMSigner.
+     *
+     * @param string $privateKey
+     * @param string $domainName
+     * @param string $selector
+     *
+     * @return Swift_Signers_DKIMSigner
+     */
+    public static function newInstance($privateKey, $domainName, $selector)
+    {
+        return new static($privateKey, $domainName, $selector);
+    }
+
+    /**
+     * Reset the Signer.
+     *
+     * @see Swift_Signer::reset()
+     */
+    public function reset()
+    {
+        $this->_headerHash = null;
+        $this->_signedHeaders = array();
+        $this->_bodyHash = null;
+        $this->_bodyHashHandler = null;
+        $this->_bodyCanonIgnoreStart = 2;
+        $this->_bodyCanonEmptyCounter = 0;
+        $this->_bodyCanonLastChar = null;
+        $this->_bodyCanonSpace = false;
+    }
+
+    /**
+     * Writes $bytes to the end of the stream.
+     *
+     * Writing may not happen immediately if the stream chooses to buffer.  If
+     * you want to write these bytes with immediate effect, call {@link commit()}
+     * after calling write().
+     *
+     * This method returns the sequence ID of the write (i.e. 1 for first, 2 for
+     * second, etc etc).
+     *
+     * @param string $bytes
+     *
+     * @throws Swift_IoException
+     *
+     * @return int
+     */
+    public function write($bytes)
+    {
+        $this->_canonicalizeBody($bytes);
+        foreach ($this->_bound as $is) {
+            $is->write($bytes);
+        }
+    }
+
+    /**
+     * For any bytes that are currently buffered inside the stream, force them
+     * off the buffer.
+     *
+     * @throws Swift_IoException
+     */
+    public function commit()
+    {
+        // Nothing to do
+        return;
+    }
+
+    /**
+     * Attach $is to this stream.
+     * The stream acts as an observer, receiving all data that is written.
+     * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
+     *
+     * @param Swift_InputByteStream $is
+     */
+    public function bind(Swift_InputByteStream $is)
+    {
+        // Don't have to mirror anything
+        $this->_bound[] = $is;
+
+        return;
+    }
+
+    /**
+     * Remove an already bound stream.
+     * If $is is not bound, no errors will be raised.
+     * If the stream currently has any buffered data it will be written to $is
+     * before unbinding occurs.
+     *
+     * @param Swift_InputByteStream $is
+     */
+    public function unbind(Swift_InputByteStream $is)
+    {
+        // Don't have to mirror anything
+        foreach ($this->_bound as $k => $stream) {
+            if ($stream === $is) {
+                unset($this->_bound[$k]);
+
+                return;
+            }
+        }
+
+        return;
+    }
+
+    /**
+     * Flush the contents of the stream (empty it) and set the internal pointer
+     * to the beginning.
+     *
+     * @throws Swift_IoException
+     */
+    public function flushBuffers()
+    {
+        $this->reset();
+    }
+
+    /**
+     * Set hash_algorithm, must be one of rsa-sha256 | rsa-sha1 defaults to rsa-sha256.
+     *
+     * @param string $hash
+     *
+     * @return Swift_Signers_DKIMSigner
+     */
+    public function setHashAlgorithm($hash)
+    {
+        // Unable to sign with rsa-sha256
+        if ($hash == 'rsa-sha1') {
+            $this->_hashAlgorithm = 'rsa-sha1';
+        } else {
+            $this->_hashAlgorithm = 'rsa-sha256';
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set the body canonicalization algorithm.
+     *
+     * @param string $canon
+     *
+     * @return Swift_Signers_DKIMSigner
+     */
+    public function setBodyCanon($canon)
+    {
+        if ($canon == 'relaxed') {
+            $this->_bodyCanon = 'relaxed';
+        } else {
+            $this->_bodyCanon = 'simple';
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set the header canonicalization algorithm.
+     *
+     * @param string $canon
+     *
+     * @return Swift_Signers_DKIMSigner
+     */
+    public function setHeaderCanon($canon)
+    {
+        if ($canon == 'relaxed') {
+            $this->_headerCanon = 'relaxed';
+        } else {
+            $this->_headerCanon = 'simple';
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set the signer identity.
+     *
+     * @param string $identity
+     *
+     * @return Swift_Signers_DKIMSigner
+     */
+    public function setSignerIdentity($identity)
+    {
+        $this->_signerIdentity = $identity;
+
+        return $this;
+    }
+
+    /**
+     * Set the length of the body to sign.
+     *
+     * @param mixed $len (bool or int)
+     *
+     * @return Swift_Signers_DKIMSigner
+     */
+    public function setBodySignedLen($len)
+    {
+        if ($len === true) {
+            $this->_showLen = true;
+            $this->_maxLen = PHP_INT_MAX;
+        } elseif ($len === false) {
+            $this->_showLen = false;
+            $this->_maxLen = PHP_INT_MAX;
+        } else {
+            $this->_showLen = true;
+            $this->_maxLen = (int) $len;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set the signature timestamp.
+     *
+     * @param int $time A timestamp
+     *
+     * @return Swift_Signers_DKIMSigner
+     */
+    public function setSignatureTimestamp($time)
+    {
+        $this->_signatureTimestamp = $time;
+
+        return $this;
+    }
+
+    /**
+     * Set the signature expiration timestamp.
+     *
+     * @param int $time A timestamp
+     *
+     * @return Swift_Signers_DKIMSigner
+     */
+    public function setSignatureExpiration($time)
+    {
+        $this->_signatureExpiration = $time;
+
+        return $this;
+    }
+
+    /**
+     * Enable / disable the DebugHeaders.
+     *
+     * @param bool $debug
+     *
+     * @return Swift_Signers_DKIMSigner
+     */
+    public function setDebugHeaders($debug)
+    {
+        $this->_debugHeaders = (bool) $debug;
+
+        return $this;
+    }
+
+    /**
+     * Start Body.
+     */
+    public function startBody()
+    {
+        // Init
+        switch ($this->_hashAlgorithm) {
+            case 'rsa-sha256' :
+                $this->_bodyHashHandler = hash_init('sha256');
+                break;
+            case 'rsa-sha1' :
+                $this->_bodyHashHandler = hash_init('sha1');
+                break;
+        }
+        $this->_bodyCanonLine = '';
+    }
+
+    /**
+     * End Body.
+     */
+    public function endBody()
+    {
+        $this->_endOfBody();
+    }
+
+    /**
+     * Returns the list of Headers Tampered by this plugin.
+     *
+     * @return array
+     */
+    public function getAlteredHeaders()
+    {
+        if ($this->_debugHeaders) {
+            return array('DKIM-Signature', 'X-DebugHash');
+        } else {
+            return array('DKIM-Signature');
+        }
+    }
+
+    /**
+     * Adds an ignored Header.
+     *
+     * @param string $header_name
+     *
+     * @return Swift_Signers_DKIMSigner
+     */
+    public function ignoreHeader($header_name)
+    {
+        $this->_ignoredHeaders[strtolower($header_name)] = true;
+
+        return $this;
+    }
+
+    /**
+     * Set the headers to sign.
+     *
+     * @param Swift_Mime_HeaderSet $headers
+     *
+     * @return Swift_Signers_DKIMSigner
+     */
+    public function setHeaders(Swift_Mime_HeaderSet $headers)
+    {
+        $this->_headerCanonData = '';
+        // Loop through Headers
+        $listHeaders = $headers->listAll();
+        foreach ($listHeaders as $hName) {
+            // Check if we need to ignore Header
+            if (!isset($this->_ignoredHeaders[strtolower($hName)])) {
+                if ($headers->has($hName)) {
+                    $tmp = $headers->getAll($hName);
+                    foreach ($tmp as $header) {
+                        if ($header->getFieldBody() != '') {
+                            $this->_addHeader($header->toString());
+                            $this->_signedHeaders[] = $header->getFieldName();
+                        }
+                    }
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Add the signature to the given Headers.
+     *
+     * @param Swift_Mime_HeaderSet $headers
+     *
+     * @return Swift_Signers_DKIMSigner
+     */
+    public function addSignature(Swift_Mime_HeaderSet $headers)
+    {
+        // Prepare the DKIM-Signature
+        $params = array('v' => '1', 'a' => $this->_hashAlgorithm, 'bh' => base64_encode($this->_bodyHash), 'd' => $this->_domainName, 'h' => implode(': ', $this->_signedHeaders), 'i' => $this->_signerIdentity, 's' => $this->_selector);
+        if ($this->_bodyCanon != 'simple') {
+            $params['c'] = $this->_headerCanon.'/'.$this->_bodyCanon;
+        } elseif ($this->_headerCanon != 'simple') {
+            $params['c'] = $this->_headerCanon;
+        }
+        if ($this->_showLen) {
+            $params['l'] = $this->_bodyLen;
+        }
+        if ($this->_signatureTimestamp === true) {
+            $params['t'] = time();
+            if ($this->_signatureExpiration !== false) {
+                $params['x'] = $params['t'] + $this->_signatureExpiration;
+            }
+        } else {
+            if ($this->_signatureTimestamp !== false) {
+                $params['t'] = $this->_signatureTimestamp;
+            }
+            if ($this->_signatureExpiration !== false) {
+                $params['x'] = $this->_signatureExpiration;
+            }
+        }
+        if ($this->_debugHeaders) {
+            $params['z'] = implode('|', $this->_debugHeadersData);
+        }
+        $string = '';
+        foreach ($params as $k => $v) {
+            $string .= $k.'='.$v.'; ';
+        }
+        $string = trim($string);
+        $headers->addTextHeader('DKIM-Signature', $string);
+        // Add the last DKIM-Signature
+        $tmp = $headers->getAll('DKIM-Signature');
+        $this->_dkimHeader = end($tmp);
+        $this->_addHeader(trim($this->_dkimHeader->toString())."\r\n b=", true);
+        $this->_endOfHeaders();
+        if ($this->_debugHeaders) {
+            $headers->addTextHeader('X-DebugHash', base64_encode($this->_headerHash));
+        }
+        $this->_dkimHeader->setValue($string.' b='.trim(chunk_split(base64_encode($this->_getEncryptedHash()), 73, ' ')));
+
+        return $this;
+    }
+
+    /* Private helpers */
+
+    protected function _addHeader($header, $is_sig = false)
+    {
+        switch ($this->_headerCanon) {
+            case 'relaxed' :
+                // Prepare Header and cascade
+                $exploded = explode(':', $header, 2);
+                $name = strtolower(trim($exploded[0]));
+                $value = str_replace("\r\n", '', $exploded[1]);
+                $value = preg_replace("/[ \t][ \t]+/", ' ', $value);
+                $header = $name.':'.trim($value).($is_sig ? '' : "\r\n");
+            case 'simple' :
+                // Nothing to do
+        }
+        $this->_addToHeaderHash($header);
+    }
+
+    /**
+     * @deprecated This method is currently useless in this class but it must be
+     *             kept for BC reasons due to its "protected" scope. This method
+     *             might be overriden by custom client code.
+     */
+    protected function _endOfHeaders()
+    {
+    }
+
+    protected function _canonicalizeBody($string)
+    {
+        $len = strlen($string);
+        $canon = '';
+        $method = ($this->_bodyCanon == 'relaxed');
+        for ($i = 0; $i < $len; ++$i) {
+            if ($this->_bodyCanonIgnoreStart > 0) {
+                --$this->_bodyCanonIgnoreStart;
+                continue;
+            }
+            switch ($string[$i]) {
+                case "\r" :
+                    $this->_bodyCanonLastChar = "\r";
+                    break;
+                case "\n" :
+                    if ($this->_bodyCanonLastChar == "\r") {
+                        if ($method) {
+                            $this->_bodyCanonSpace = false;
+                        }
+                        if ($this->_bodyCanonLine == '') {
+                            ++$this->_bodyCanonEmptyCounter;
+                        } else {
+                            $this->_bodyCanonLine = '';
+                            $canon .= "\r\n";
+                        }
+                    } else {
+                        // Wooops Error
+                        // todo handle it but should never happen
+                    }
+                    break;
+                case ' ' :
+                case "\t" :
+                    if ($method) {
+                        $this->_bodyCanonSpace = true;
+                        break;
+                    }
+                default :
+                    if ($this->_bodyCanonEmptyCounter > 0) {
+                        $canon .= str_repeat("\r\n", $this->_bodyCanonEmptyCounter);
+                        $this->_bodyCanonEmptyCounter = 0;
+                    }
+                    if ($this->_bodyCanonSpace) {
+                        $this->_bodyCanonLine .= ' ';
+                        $canon .= ' ';
+                        $this->_bodyCanonSpace = false;
+                    }
+                    $this->_bodyCanonLine .= $string[$i];
+                    $canon .= $string[$i];
+            }
+        }
+        $this->_addToBodyHash($canon);
+    }
+
+    protected function _endOfBody()
+    {
+        // Add trailing Line return if last line is non empty
+        if (strlen($this->_bodyCanonLine) > 0) {
+            $this->_addToBodyHash("\r\n");
+        }
+        $this->_bodyHash = hash_final($this->_bodyHashHandler, true);
+    }
+
+    private function _addToBodyHash($string)
+    {
+        $len = strlen($string);
+        if ($len > ($new_len = ($this->_maxLen - $this->_bodyLen))) {
+            $string = substr($string, 0, $new_len);
+            $len = $new_len;
+        }
+        hash_update($this->_bodyHashHandler, $string);
+        $this->_bodyLen += $len;
+    }
+
+    private function _addToHeaderHash($header)
+    {
+        if ($this->_debugHeaders) {
+            $this->_debugHeadersData[] = trim($header);
+        }
+        $this->_headerCanonData .= $header;
+    }
+
+    /**
+     * @throws Swift_SwiftException
+     *
+     * @return string
+     */
+    private function _getEncryptedHash()
+    {
+        $signature = '';
+        switch ($this->_hashAlgorithm) {
+            case 'rsa-sha1':
+                $algorithm = OPENSSL_ALGO_SHA1;
+                break;
+            case 'rsa-sha256':
+                $algorithm = OPENSSL_ALGO_SHA256;
+                break;
+        }
+        $pkeyId = openssl_get_privatekey($this->_privateKey);
+        if (!$pkeyId) {
+            throw new Swift_SwiftException('Unable to load DKIM Private Key ['.openssl_error_string().']');
+        }
+        if (openssl_sign($this->_headerCanonData, $signature, $pkeyId, $algorithm)) {
+            return $signature;
+        }
+        throw new Swift_SwiftException('Unable to sign DKIM Hash ['.openssl_error_string().']');
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
new file mode 100644
index 000000000..43210f073
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
@@ -0,0 +1,525 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * DomainKey Signer used to apply DomainKeys Signature to a message.
+ *
+ * @author Xavier De Cock <xdecock@gmail.com>
+ */
+class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
+{
+    /**
+     * PrivateKey.
+     *
+     * @var string
+     */
+    protected $_privateKey;
+
+    /**
+     * DomainName.
+     *
+     * @var string
+     */
+    protected $_domainName;
+
+    /**
+     * Selector.
+     *
+     * @var string
+     */
+    protected $_selector;
+
+    /**
+     * Hash algorithm used.
+     *
+     * @var string
+     */
+    protected $_hashAlgorithm = 'rsa-sha1';
+
+    /**
+     * Canonisation method.
+     *
+     * @var string
+     */
+    protected $_canon = 'simple';
+
+    /**
+     * Headers not being signed.
+     *
+     * @var array
+     */
+    protected $_ignoredHeaders = array();
+
+    /**
+     * Signer identity.
+     *
+     * @var string
+     */
+    protected $_signerIdentity;
+
+    /**
+     * Must we embed signed headers?
+     *
+     * @var bool
+     */
+    protected $_debugHeaders = false;
+
+    // work variables
+    /**
+     * Headers used to generate hash.
+     *
+     * @var array
+     */
+    private $_signedHeaders = array();
+
+    /**
+     * Stores the signature header.
+     *
+     * @var Swift_Mime_Headers_ParameterizedHeader
+     */
+    protected $_domainKeyHeader;
+
+    /**
+     * Hash Handler.
+     *
+     * @var resource|null
+     */
+    private $_hashHandler;
+
+    private $_hash;
+
+    private $_canonData = '';
+
+    private $_bodyCanonEmptyCounter = 0;
+
+    private $_bodyCanonIgnoreStart = 2;
+
+    private $_bodyCanonSpace = false;
+
+    private $_bodyCanonLastChar = null;
+
+    private $_bodyCanonLine = '';
+
+    private $_bound = array();
+
+    /**
+     * Constructor.
+     *
+     * @param string $privateKey
+     * @param string $domainName
+     * @param string $selector
+     */
+    public function __construct($privateKey, $domainName, $selector)
+    {
+        $this->_privateKey = $privateKey;
+        $this->_domainName = $domainName;
+        $this->_signerIdentity = '@'.$domainName;
+        $this->_selector = $selector;
+    }
+
+    /**
+     * Instanciate DomainKeySigner.
+     *
+     * @param string $privateKey
+     * @param string $domainName
+     * @param string $selector
+     *
+     * @return Swift_Signers_DomainKeySigner
+     */
+    public static function newInstance($privateKey, $domainName, $selector)
+    {
+        return new static($privateKey, $domainName, $selector);
+    }
+
+    /**
+     * Resets internal states.
+     *
+     * @return Swift_Signers_DomainKeySigner
+     */
+    public function reset()
+    {
+        $this->_hash = null;
+        $this->_hashHandler = null;
+        $this->_bodyCanonIgnoreStart = 2;
+        $this->_bodyCanonEmptyCounter = 0;
+        $this->_bodyCanonLastChar = null;
+        $this->_bodyCanonSpace = false;
+
+        return $this;
+    }
+
+    /**
+     * Writes $bytes to the end of the stream.
+     *
+     * Writing may not happen immediately if the stream chooses to buffer.  If
+     * you want to write these bytes with immediate effect, call {@link commit()}
+     * after calling write().
+     *
+     * This method returns the sequence ID of the write (i.e. 1 for first, 2 for
+     * second, etc etc).
+     *
+     * @param string $bytes
+     *
+     * @throws Swift_IoException
+     *
+     * @return int
+     * @return Swift_Signers_DomainKeySigner
+     */
+    public function write($bytes)
+    {
+        $this->_canonicalizeBody($bytes);
+        foreach ($this->_bound as $is) {
+            $is->write($bytes);
+        }
+
+        return $this;
+    }
+
+    /**
+     * For any bytes that are currently buffered inside the stream, force them
+     * off the buffer.
+     *
+     * @throws Swift_IoException
+     *
+     * @return Swift_Signers_DomainKeySigner
+     */
+    public function commit()
+    {
+        // Nothing to do
+        return $this;
+    }
+
+    /**
+     * Attach $is to this stream.
+     * The stream acts as an observer, receiving all data that is written.
+     * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
+     *
+     * @param Swift_InputByteStream $is
+     *
+     * @return Swift_Signers_DomainKeySigner
+     */
+    public function bind(Swift_InputByteStream $is)
+    {
+        // Don't have to mirror anything
+        $this->_bound[] = $is;
+
+        return $this;
+    }
+
+    /**
+     * Remove an already bound stream.
+     * If $is is not bound, no errors will be raised.
+     * If the stream currently has any buffered data it will be written to $is
+     * before unbinding occurs.
+     *
+     * @param Swift_InputByteStream $is
+     *
+     * @return Swift_Signers_DomainKeySigner
+     */
+    public function unbind(Swift_InputByteStream $is)
+    {
+        // Don't have to mirror anything
+        foreach ($this->_bound as $k => $stream) {
+            if ($stream === $is) {
+                unset($this->_bound[$k]);
+
+                return;
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Flush the contents of the stream (empty it) and set the internal pointer
+     * to the beginning.
+     *
+     * @throws Swift_IoException
+     *
+     * @return Swift_Signers_DomainKeySigner
+     */
+    public function flushBuffers()
+    {
+        $this->reset();
+
+        return $this;
+    }
+
+    /**
+     * Set hash_algorithm, must be one of rsa-sha256 | rsa-sha1 defaults to rsa-sha256.
+     *
+     * @param string $hash
+     *
+     * @return Swift_Signers_DomainKeySigner
+     */
+    public function setHashAlgorithm($hash)
+    {
+        $this->_hashAlgorithm = 'rsa-sha1';
+
+        return $this;
+    }
+
+    /**
+     * Set the canonicalization algorithm.
+     *
+     * @param string $canon simple | nofws defaults to simple
+     *
+     * @return Swift_Signers_DomainKeySigner
+     */
+    public function setCanon($canon)
+    {
+        if ($canon == 'nofws') {
+            $this->_canon = 'nofws';
+        } else {
+            $this->_canon = 'simple';
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set the signer identity.
+     *
+     * @param string $identity
+     *
+     * @return Swift_Signers_DomainKeySigner
+     */
+    public function setSignerIdentity($identity)
+    {
+        $this->_signerIdentity = $identity;
+
+        return $this;
+    }
+
+    /**
+     * Enable / disable the DebugHeaders.
+     *
+     * @param bool $debug
+     *
+     * @return Swift_Signers_DomainKeySigner
+     */
+    public function setDebugHeaders($debug)
+    {
+        $this->_debugHeaders = (bool) $debug;
+
+        return $this;
+    }
+
+    /**
+     * Start Body.
+     */
+    public function startBody()
+    {
+    }
+
+    /**
+     * End Body.
+     */
+    public function endBody()
+    {
+        $this->_endOfBody();
+    }
+
+    /**
+     * Returns the list of Headers Tampered by this plugin.
+     *
+     * @return array
+     */
+    public function getAlteredHeaders()
+    {
+        if ($this->_debugHeaders) {
+            return array('DomainKey-Signature', 'X-DebugHash');
+        }
+
+        return array('DomainKey-Signature');
+    }
+
+    /**
+     * Adds an ignored Header.
+     *
+     * @param string $header_name
+     *
+     * @return Swift_Signers_DomainKeySigner
+     */
+    public function ignoreHeader($header_name)
+    {
+        $this->_ignoredHeaders[strtolower($header_name)] = true;
+
+        return $this;
+    }
+
+    /**
+     * Set the headers to sign.
+     *
+     * @param Swift_Mime_HeaderSet $headers
+     *
+     * @return Swift_Signers_DomainKeySigner
+     */
+    public function setHeaders(Swift_Mime_HeaderSet $headers)
+    {
+        $this->_startHash();
+        $this->_canonData = '';
+        // Loop through Headers
+        $listHeaders = $headers->listAll();
+        foreach ($listHeaders as $hName) {
+            // Check if we need to ignore Header
+            if (!isset($this->_ignoredHeaders[strtolower($hName)])) {
+                if ($headers->has($hName)) {
+                    $tmp = $headers->getAll($hName);
+                    foreach ($tmp as $header) {
+                        if ($header->getFieldBody() != '') {
+                            $this->_addHeader($header->toString());
+                            $this->_signedHeaders[] = $header->getFieldName();
+                        }
+                    }
+                }
+            }
+        }
+        $this->_endOfHeaders();
+
+        return $this;
+    }
+
+    /**
+     * Add the signature to the given Headers.
+     *
+     * @param Swift_Mime_HeaderSet $headers
+     *
+     * @return Swift_Signers_DomainKeySigner
+     */
+    public function addSignature(Swift_Mime_HeaderSet $headers)
+    {
+        // Prepare the DomainKey-Signature Header
+        $params = array('a' => $this->_hashAlgorithm, 'b' => chunk_split(base64_encode($this->_getEncryptedHash()), 73, ' '), 'c' => $this->_canon, 'd' => $this->_domainName, 'h' => implode(': ', $this->_signedHeaders), 'q' => 'dns', 's' => $this->_selector);
+        $string = '';
+        foreach ($params as $k => $v) {
+            $string .= $k.'='.$v.'; ';
+        }
+        $string = trim($string);
+        $headers->addTextHeader('DomainKey-Signature', $string);
+
+        return $this;
+    }
+
+    /* Private helpers */
+
+    protected function _addHeader($header)
+    {
+        switch ($this->_canon) {
+            case 'nofws' :
+                // Prepare Header and cascade
+                $exploded = explode(':', $header, 2);
+                $name = strtolower(trim($exploded[0]));
+                $value = str_replace("\r\n", '', $exploded[1]);
+                $value = preg_replace("/[ \t][ \t]+/", ' ', $value);
+                $header = $name.':'.trim($value)."\r\n";
+            case 'simple' :
+                // Nothing to do
+        }
+        $this->_addToHash($header);
+    }
+
+    protected function _endOfHeaders()
+    {
+        $this->_bodyCanonEmptyCounter = 1;
+    }
+
+    protected function _canonicalizeBody($string)
+    {
+        $len = strlen($string);
+        $canon = '';
+        $nofws = ($this->_canon == 'nofws');
+        for ($i = 0; $i < $len; ++$i) {
+            if ($this->_bodyCanonIgnoreStart > 0) {
+                --$this->_bodyCanonIgnoreStart;
+                continue;
+            }
+            switch ($string[$i]) {
+                case "\r" :
+                    $this->_bodyCanonLastChar = "\r";
+                    break;
+                case "\n" :
+                    if ($this->_bodyCanonLastChar == "\r") {
+                        if ($nofws) {
+                            $this->_bodyCanonSpace = false;
+                        }
+                        if ($this->_bodyCanonLine == '') {
+                            ++$this->_bodyCanonEmptyCounter;
+                        } else {
+                            $this->_bodyCanonLine = '';
+                            $canon .= "\r\n";
+                        }
+                    } else {
+                        // Wooops Error
+                        throw new Swift_SwiftException('Invalid new line sequence in mail found \n without preceding \r');
+                    }
+                    break;
+                case ' ' :
+                case "\t" :
+                case "\x09": //HTAB
+                    if ($nofws) {
+                        $this->_bodyCanonSpace = true;
+                        break;
+                    }
+                default :
+                    if ($this->_bodyCanonEmptyCounter > 0) {
+                        $canon .= str_repeat("\r\n", $this->_bodyCanonEmptyCounter);
+                        $this->_bodyCanonEmptyCounter = 0;
+                    }
+                    $this->_bodyCanonLine .= $string[$i];
+                    $canon .= $string[$i];
+            }
+        }
+        $this->_addToHash($canon);
+    }
+
+    protected function _endOfBody()
+    {
+        if (strlen($this->_bodyCanonLine) > 0) {
+            $this->_addToHash("\r\n");
+        }
+        $this->_hash = hash_final($this->_hashHandler, true);
+    }
+
+    private function _addToHash($string)
+    {
+        $this->_canonData .= $string;
+        hash_update($this->_hashHandler, $string);
+    }
+
+    private function _startHash()
+    {
+        // Init
+        switch ($this->_hashAlgorithm) {
+            case 'rsa-sha1' :
+                $this->_hashHandler = hash_init('sha1');
+                break;
+        }
+        $this->_bodyCanonLine = '';
+    }
+
+    /**
+     * @throws Swift_SwiftException
+     *
+     * @return string
+     */
+    private function _getEncryptedHash()
+    {
+        $signature = '';
+        $pkeyId = openssl_get_privatekey($this->_privateKey);
+        if (!$pkeyId) {
+            throw new Swift_SwiftException('Unable to load DomainKey Private Key ['.openssl_error_string().']');
+        }
+        if (openssl_sign($this->_canonData, $signature, $pkeyId, OPENSSL_ALGO_SHA1)) {
+            return $signature;
+        }
+        throw new Swift_SwiftException('Unable to sign DomainKey Hash  ['.openssl_error_string().']');
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php
new file mode 100644
index 000000000..c75cb08a5
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php
@@ -0,0 +1,65 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Header Signer Interface used to apply Header-Based Signature to a message.
+ *
+ * @author Xavier De Cock <xdecock@gmail.com>
+ */
+interface Swift_Signers_HeaderSigner extends Swift_Signer, Swift_InputByteStream
+{
+    /**
+     * Exclude an header from the signed headers.
+     *
+     * @param string $header_name
+     *
+     * @return Swift_Signers_HeaderSigner
+     */
+    public function ignoreHeader($header_name);
+
+    /**
+     * Prepare the Signer to get a new Body.
+     *
+     * @return Swift_Signers_HeaderSigner
+     */
+    public function startBody();
+
+    /**
+     * Give the signal that the body has finished streaming.
+     *
+     * @return Swift_Signers_HeaderSigner
+     */
+    public function endBody();
+
+    /**
+     * Give the headers already given.
+     *
+     * @param Swift_Mime_SimpleHeaderSet $headers
+     *
+     * @return Swift_Signers_HeaderSigner
+     */
+    public function setHeaders(Swift_Mime_HeaderSet $headers);
+
+    /**
+     * Add the header(s) to the headerSet.
+     *
+     * @param Swift_Mime_HeaderSet $headers
+     *
+     * @return Swift_Signers_HeaderSigner
+     */
+    public function addSignature(Swift_Mime_HeaderSet $headers);
+
+    /**
+     * Return the list of header a signer might tamper.
+     *
+     * @return array
+     */
+    public function getAlteredHeaders();
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
new file mode 100644
index 000000000..3a35ad55d
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
@@ -0,0 +1,190 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * DKIM Signer used to apply DKIM Signature to a message
+ * Takes advantage of pecl extension.
+ *
+ * @author Xavier De Cock <xdecock@gmail.com>
+ */
+class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
+{
+    private $_peclLoaded = false;
+
+    private $_dkimHandler = null;
+
+    private $dropFirstLF = true;
+
+    const CANON_RELAXED = 1;
+    const CANON_SIMPLE = 2;
+    const SIG_RSA_SHA1 = 3;
+    const SIG_RSA_SHA256 = 4;
+
+    public function __construct($privateKey, $domainName, $selector)
+    {
+        if (!extension_loaded('opendkim')) {
+            throw new Swift_SwiftException('php-opendkim extension not found');
+        }
+
+        $this->_peclLoaded = true;
+
+        parent::__construct($privateKey, $domainName, $selector);
+    }
+
+    public static function newInstance($privateKey, $domainName, $selector)
+    {
+        return new static($privateKey, $domainName, $selector);
+    }
+
+    public function addSignature(Swift_Mime_HeaderSet $headers)
+    {
+        $header = new Swift_Mime_Headers_OpenDKIMHeader('DKIM-Signature');
+        $headerVal = $this->_dkimHandler->getSignatureHeader();
+        if (!$headerVal) {
+            throw new Swift_SwiftException('OpenDKIM Error: '.$this->_dkimHandler->getError());
+        }
+        $header->setValue($headerVal);
+        $headers->set($header);
+
+        return $this;
+    }
+
+    public function setHeaders(Swift_Mime_HeaderSet $headers)
+    {
+        $bodyLen = $this->_bodyLen;
+        if (is_bool($bodyLen)) {
+            $bodyLen = -1;
+        }
+        $hash = $this->_hashAlgorithm == 'rsa-sha1' ? OpenDKIMSign::ALG_RSASHA1 : OpenDKIMSign::ALG_RSASHA256;
+        $bodyCanon = $this->_bodyCanon == 'simple' ? OpenDKIMSign::CANON_SIMPLE : OpenDKIMSign::CANON_RELAXED;
+        $headerCanon = $this->_headerCanon == 'simple' ? OpenDKIMSign::CANON_SIMPLE : OpenDKIMSign::CANON_RELAXED;
+        $this->_dkimHandler = new OpenDKIMSign($this->_privateKey, $this->_selector, $this->_domainName, $headerCanon, $bodyCanon, $hash, $bodyLen);
+        // Hardcode signature Margin for now
+        $this->_dkimHandler->setMargin(78);
+
+        if (!is_numeric($this->_signatureTimestamp)) {
+            OpenDKIM::setOption(OpenDKIM::OPTS_FIXEDTIME, time());
+        } else {
+            if (!OpenDKIM::setOption(OpenDKIM::OPTS_FIXEDTIME, $this->_signatureTimestamp)) {
+                throw new Swift_SwiftException('Unable to force signature timestamp ['.openssl_error_string().']');
+            }
+        }
+        if (isset($this->_signerIdentity)) {
+            $this->_dkimHandler->setSigner($this->_signerIdentity);
+        }
+        $listHeaders = $headers->listAll();
+        foreach ($listHeaders as $hName) {
+            // Check if we need to ignore Header
+            if (!isset($this->_ignoredHeaders[strtolower($hName)])) {
+                $tmp = $headers->getAll($hName);
+                if ($headers->has($hName)) {
+                    foreach ($tmp as $header) {
+                        if ($header->getFieldBody() != '') {
+                            $htosign = $header->toString();
+                            $this->_dkimHandler->header($htosign);
+                            $this->_signedHeaders[] = $header->getFieldName();
+                        }
+                    }
+                }
+            }
+        }
+
+        return $this;
+    }
+
+    public function startBody()
+    {
+        if (!$this->_peclLoaded) {
+            return parent::startBody();
+        }
+        $this->dropFirstLF = true;
+        $this->_dkimHandler->eoh();
+
+        return $this;
+    }
+
+    public function endBody()
+    {
+        if (!$this->_peclLoaded) {
+            return parent::endBody();
+        }
+        $this->_dkimHandler->eom();
+
+        return $this;
+    }
+
+    public function reset()
+    {
+        $this->_dkimHandler = null;
+        parent::reset();
+
+        return $this;
+    }
+
+    /**
+     * Set the signature timestamp.
+     *
+     * @param int $time
+     *
+     * @return Swift_Signers_DKIMSigner
+     */
+    public function setSignatureTimestamp($time)
+    {
+        $this->_signatureTimestamp = $time;
+
+        return $this;
+    }
+
+    /**
+     * Set the signature expiration timestamp.
+     *
+     * @param int $time
+     *
+     * @return Swift_Signers_DKIMSigner
+     */
+    public function setSignatureExpiration($time)
+    {
+        $this->_signatureExpiration = $time;
+
+        return $this;
+    }
+
+    /**
+     * Enable / disable the DebugHeaders.
+     *
+     * @param bool $debug
+     *
+     * @return Swift_Signers_DKIMSigner
+     */
+    public function setDebugHeaders($debug)
+    {
+        $this->_debugHeaders = (bool) $debug;
+
+        return $this;
+    }
+
+    // Protected
+
+    protected function _canonicalizeBody($string)
+    {
+        if (!$this->_peclLoaded) {
+            return parent::_canonicalizeBody($string);
+        }
+        if (false && $this->dropFirstLF === true) {
+            if ($string[0] == "\r" && $string[1] == "\n") {
+                $string = substr($string, 2);
+            }
+        }
+        $this->dropFirstLF = false;
+        if (strlen($string)) {
+            $this->_dkimHandler->body($string);
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
new file mode 100644
index 000000000..b267099a8
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
@@ -0,0 +1,436 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * MIME Message Signer used to apply S/MIME Signature/Encryption to a message.
+ *
+ *
+ * @author Romain-Geissler
+ * @author Sebastiaan Stok <s.stok@rollerscapes.net>
+ */
+class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
+{
+    protected $signCertificate;
+    protected $signPrivateKey;
+    protected $encryptCert;
+    protected $signThenEncrypt = true;
+    protected $signLevel;
+    protected $encryptLevel;
+    protected $signOptions;
+    protected $encryptOptions;
+    protected $encryptCipher;
+    protected $extraCerts = null;
+
+    /**
+     * @var Swift_StreamFilters_StringReplacementFilterFactory
+     */
+    protected $replacementFactory;
+
+    /**
+     * @var Swift_Mime_HeaderFactory
+     */
+    protected $headerFactory;
+
+    /**
+     * Constructor.
+     *
+     * @param string|null $signCertificate
+     * @param string|null $signPrivateKey
+     * @param string|null $encryptCertificate
+     */
+    public function __construct($signCertificate = null, $signPrivateKey = null, $encryptCertificate = null)
+    {
+        if (null !== $signPrivateKey) {
+            $this->setSignCertificate($signCertificate, $signPrivateKey);
+        }
+
+        if (null !== $encryptCertificate) {
+            $this->setEncryptCertificate($encryptCertificate);
+        }
+
+        $this->replacementFactory = Swift_DependencyContainer::getInstance()
+            ->lookup('transport.replacementfactory');
+
+        $this->signOptions = PKCS7_DETACHED;
+
+        // Supported since php5.4
+        if (defined('OPENSSL_CIPHER_AES_128_CBC')) {
+            $this->encryptCipher = OPENSSL_CIPHER_AES_128_CBC;
+        } else {
+            $this->encryptCipher = OPENSSL_CIPHER_RC2_128;
+        }
+    }
+
+    /**
+     * Returns an new Swift_Signers_SMimeSigner instance.
+     *
+     * @param string $certificate
+     * @param string $privateKey
+     *
+     * @return Swift_Signers_SMimeSigner
+     */
+    public static function newInstance($certificate = null, $privateKey = null)
+    {
+        return new self($certificate, $privateKey);
+    }
+
+    /**
+     * Set the certificate location to use for signing.
+     *
+     * @link http://www.php.net/manual/en/openssl.pkcs7.flags.php
+     *
+     * @param string       $certificate
+     * @param string|array $privateKey  If the key needs an passphrase use array('file-location', 'passphrase') instead
+     * @param int          $signOptions Bitwise operator options for openssl_pkcs7_sign()
+     * @param string       $extraCerts  A file containing intermediate certificates needed by the signing certificate
+     *
+     * @return Swift_Signers_SMimeSigner
+     */
+    public function setSignCertificate($certificate, $privateKey = null, $signOptions = PKCS7_DETACHED, $extraCerts = null)
+    {
+        $this->signCertificate = 'file://'.str_replace('\\', '/', realpath($certificate));
+
+        if (null !== $privateKey) {
+            if (is_array($privateKey)) {
+                $this->signPrivateKey = $privateKey;
+                $this->signPrivateKey[0] = 'file://'.str_replace('\\', '/', realpath($privateKey[0]));
+            } else {
+                $this->signPrivateKey = 'file://'.str_replace('\\', '/', realpath($privateKey));
+            }
+        }
+
+        $this->signOptions = $signOptions;
+        if (null !== $extraCerts) {
+            $this->extraCerts = str_replace('\\', '/', realpath($extraCerts));
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set the certificate location to use for encryption.
+     *
+     * @link http://www.php.net/manual/en/openssl.pkcs7.flags.php
+     * @link http://nl3.php.net/manual/en/openssl.ciphers.php
+     *
+     * @param string|array $recipientCerts Either an single X.509 certificate, or an assoc array of X.509 certificates.
+     * @param int          $cipher
+     *
+     * @return Swift_Signers_SMimeSigner
+     */
+    public function setEncryptCertificate($recipientCerts, $cipher = null)
+    {
+        if (is_array($recipientCerts)) {
+            $this->encryptCert = array();
+
+            foreach ($recipientCerts as $cert) {
+                $this->encryptCert[] = 'file://'.str_replace('\\', '/', realpath($cert));
+            }
+        } else {
+            $this->encryptCert = 'file://'.str_replace('\\', '/', realpath($recipientCerts));
+        }
+
+        if (null !== $cipher) {
+            $this->encryptCipher = $cipher;
+        }
+
+        return $this;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSignCertificate()
+    {
+        return $this->signCertificate;
+    }
+
+    /**
+     * @return string
+     */
+    public function getSignPrivateKey()
+    {
+        return $this->signPrivateKey;
+    }
+
+    /**
+     * Set perform signing before encryption.
+     *
+     * The default is to first sign the message and then encrypt.
+     * But some older mail clients, namely Microsoft Outlook 2000 will work when the message first encrypted.
+     * As this goes against the official specs, its recommended to only use 'encryption -> signing' when specifically targeting these 'broken' clients.
+     *
+     * @param bool $signThenEncrypt
+     *
+     * @return Swift_Signers_SMimeSigner
+     */
+    public function setSignThenEncrypt($signThenEncrypt = true)
+    {
+        $this->signThenEncrypt = $signThenEncrypt;
+
+        return $this;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isSignThenEncrypt()
+    {
+        return $this->signThenEncrypt;
+    }
+
+    /**
+     * Resets internal states.
+     *
+     * @return Swift_Signers_SMimeSigner
+     */
+    public function reset()
+    {
+        return $this;
+    }
+
+    /**
+     * Change the Swift_Message to apply the signing.
+     *
+     * @param Swift_Message $message
+     *
+     * @return Swift_Signers_SMimeSigner
+     */
+    public function signMessage(Swift_Message $message)
+    {
+        if (null === $this->signCertificate && null === $this->encryptCert) {
+            return $this;
+        }
+
+        // Store the message using ByteStream to a file{1}
+        // Remove all Children
+        // Sign file{1}, parse the new MIME headers and set them on the primary MimeEntity
+        // Set the singed-body as the new body (without boundary)
+
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $this->toSMimeByteStream($messageStream, $message);
+        $message->setEncoder(Swift_DependencyContainer::getInstance()->lookup('mime.rawcontentencoder'));
+
+        $message->setChildren(array());
+        $this->streamToMime($messageStream, $message);
+    }
+
+    /**
+     * Return the list of header a signer might tamper.
+     *
+     * @return array
+     */
+    public function getAlteredHeaders()
+    {
+        return array('Content-Type', 'Content-Transfer-Encoding', 'Content-Disposition');
+    }
+
+    /**
+     * @param Swift_InputByteStream $inputStream
+     * @param Swift_Message         $mimeEntity
+     */
+    protected function toSMimeByteStream(Swift_InputByteStream $inputStream, Swift_Message $message)
+    {
+        $mimeEntity = $this->createMessage($message);
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+
+        $mimeEntity->toByteStream($messageStream);
+        $messageStream->commit();
+
+        if (null !== $this->signCertificate && null !== $this->encryptCert) {
+            $temporaryStream = new Swift_ByteStream_TemporaryFileByteStream();
+
+            if ($this->signThenEncrypt) {
+                $this->messageStreamToSignedByteStream($messageStream, $temporaryStream);
+                $this->messageStreamToEncryptedByteStream($temporaryStream, $inputStream);
+            } else {
+                $this->messageStreamToEncryptedByteStream($messageStream, $temporaryStream);
+                $this->messageStreamToSignedByteStream($temporaryStream, $inputStream);
+            }
+        } elseif ($this->signCertificate !== null) {
+            $this->messageStreamToSignedByteStream($messageStream, $inputStream);
+        } else {
+            $this->messageStreamToEncryptedByteStream($messageStream, $inputStream);
+        }
+    }
+
+    /**
+     * @param Swift_Message $message
+     *
+     * @return Swift_Message
+     */
+    protected function createMessage(Swift_Message $message)
+    {
+        $mimeEntity = new Swift_Message('', $message->getBody(), $message->getContentType(), $message->getCharset());
+        $mimeEntity->setChildren($message->getChildren());
+
+        $messageHeaders = $mimeEntity->getHeaders();
+        $messageHeaders->remove('Message-ID');
+        $messageHeaders->remove('Date');
+        $messageHeaders->remove('Subject');
+        $messageHeaders->remove('MIME-Version');
+        $messageHeaders->remove('To');
+        $messageHeaders->remove('From');
+
+        return $mimeEntity;
+    }
+
+    /**
+     * @param Swift_FileStream      $outputStream
+     * @param Swift_InputByteStream $inputStream
+     *
+     * @throws Swift_IoException
+     */
+    protected function messageStreamToSignedByteStream(Swift_FileStream $outputStream, Swift_InputByteStream $inputStream)
+    {
+        $signedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
+
+        $args = array($outputStream->getPath(), $signedMessageStream->getPath(), $this->signCertificate, $this->signPrivateKey, array(), $this->signOptions);
+        if (null !== $this->extraCerts) {
+            $args[] = $this->extraCerts;
+        }
+
+        if (!call_user_func_array('openssl_pkcs7_sign', $args)) {
+            throw new Swift_IoException(sprintf('Failed to sign S/Mime message. Error: "%s".', openssl_error_string()));
+        }
+
+        $this->copyFromOpenSSLOutput($signedMessageStream, $inputStream);
+    }
+
+    /**
+     * @param Swift_FileStream      $outputStream
+     * @param Swift_InputByteStream $is
+     *
+     * @throws Swift_IoException
+     */
+    protected function messageStreamToEncryptedByteStream(Swift_FileStream $outputStream, Swift_InputByteStream $is)
+    {
+        $encryptedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
+
+        if (!openssl_pkcs7_encrypt($outputStream->getPath(), $encryptedMessageStream->getPath(), $this->encryptCert, array(), 0, $this->encryptCipher)) {
+            throw new Swift_IoException(sprintf('Failed to encrypt S/Mime message. Error: "%s".', openssl_error_string()));
+        }
+
+        $this->copyFromOpenSSLOutput($encryptedMessageStream, $is);
+    }
+
+    /**
+     * @param Swift_OutputByteStream $fromStream
+     * @param Swift_InputByteStream  $toStream
+     */
+    protected function copyFromOpenSSLOutput(Swift_OutputByteStream $fromStream, Swift_InputByteStream $toStream)
+    {
+        $bufferLength = 4096;
+        $filteredStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $filteredStream->addFilter($this->replacementFactory->createFilter("\r\n", "\n"), 'CRLF to LF');
+        $filteredStream->addFilter($this->replacementFactory->createFilter("\n", "\r\n"), 'LF to CRLF');
+
+        while (false !== ($buffer = $fromStream->read($bufferLength))) {
+            $filteredStream->write($buffer);
+        }
+
+        $filteredStream->flushBuffers();
+
+        while (false !== ($buffer = $filteredStream->read($bufferLength))) {
+            $toStream->write($buffer);
+        }
+
+        $toStream->commit();
+    }
+
+    /**
+     * Merges an OutputByteStream to Swift_Message.
+     *
+     * @param Swift_OutputByteStream $fromStream
+     * @param Swift_Message          $message
+     */
+    protected function streamToMime(Swift_OutputByteStream $fromStream, Swift_Message $message)
+    {
+        $bufferLength = 78;
+        $headerData = '';
+
+        $fromStream->setReadPointer(0);
+
+        while (($buffer = $fromStream->read($bufferLength)) !== false) {
+            $headerData .= $buffer;
+
+            if (false !== strpos($buffer, "\r\n\r\n")) {
+                break;
+            }
+        }
+
+        $headersPosEnd = strpos($headerData, "\r\n\r\n");
+        $headerData = trim($headerData);
+        $headerData = substr($headerData, 0, $headersPosEnd);
+        $headerLines = explode("\r\n", $headerData);
+        unset($headerData);
+
+        $headers = array();
+        $currentHeaderName = '';
+
+        foreach ($headerLines as $headerLine) {
+            // Line separated
+            if (ctype_space($headerLines[0]) || false === strpos($headerLine, ':')) {
+                $headers[$currentHeaderName] .= ' '.trim($headerLine);
+                continue;
+            }
+
+            $header = explode(':', $headerLine, 2);
+            $currentHeaderName = strtolower($header[0]);
+            $headers[$currentHeaderName] = trim($header[1]);
+        }
+
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $messageStream->addFilter($this->replacementFactory->createFilter("\r\n", "\n"), 'CRLF to LF');
+        $messageStream->addFilter($this->replacementFactory->createFilter("\n", "\r\n"), 'LF to CRLF');
+
+        $messageHeaders = $message->getHeaders();
+
+        // No need to check for 'application/pkcs7-mime', as this is always base64
+        if ('multipart/signed;' === substr($headers['content-type'], 0, 17)) {
+            if (!preg_match('/boundary=("[^"]+"|(?:[^\s]+|$))/is', $headers['content-type'], $contentTypeData)) {
+                throw new Swift_SwiftException('Failed to find Boundary parameter');
+            }
+
+            $boundary = trim($contentTypeData['1'], '"');
+
+            // Skip the header and CRLF CRLF
+            $fromStream->setReadPointer($headersPosEnd + 4);
+
+            while (false !== ($buffer = $fromStream->read($bufferLength))) {
+                $messageStream->write($buffer);
+            }
+
+            $messageStream->commit();
+
+            $messageHeaders->remove('Content-Transfer-Encoding');
+            $message->setContentType($headers['content-type']);
+            $message->setBoundary($boundary);
+            $message->setBody($messageStream);
+        } else {
+            $fromStream->setReadPointer($headersPosEnd + 4);
+
+            if (null === $this->headerFactory) {
+                $this->headerFactory = Swift_DependencyContainer::getInstance()->lookup('mime.headerfactory');
+            }
+
+            $message->setContentType($headers['content-type']);
+            $messageHeaders->set($this->headerFactory->createTextHeader('Content-Transfer-Encoding', $headers['content-transfer-encoding']));
+            $messageHeaders->set($this->headerFactory->createTextHeader('Content-Disposition', $headers['content-disposition']));
+
+            while (false !== ($buffer = $fromStream->read($bufferLength))) {
+                $messageStream->write($buffer);
+            }
+
+            $messageStream->commit();
+            $message->setBody($messageStream);
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/SmtpTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/SmtpTransport.php
new file mode 100644
index 000000000..625161140
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/SmtpTransport.php
@@ -0,0 +1,58 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Sends Messages over SMTP with ESMTP support.
+ *
+ * @author Chris Corbyn
+ *
+ * @method Swift_SmtpTransport setUsername(string $username) Set the username to authenticate with.
+ * @method string              getUsername()                 Get the username to authenticate with.
+ * @method Swift_SmtpTransport setPassword(string $password) Set the password to authenticate with.
+ * @method string              getPassword()                 Get the password to authenticate with.
+ * @method Swift_SmtpTransport setAuthMode(string $mode)     Set the auth mode to use to authenticate.
+ * @method string              getAuthMode()                 Get the auth mode to use to authenticate.
+ */
+class Swift_SmtpTransport extends Swift_Transport_EsmtpTransport
+{
+    /**
+     * Create a new SmtpTransport, optionally with $host, $port and $security.
+     *
+     * @param string $host
+     * @param int    $port
+     * @param string $security
+     */
+    public function __construct($host = 'localhost', $port = 25, $security = null)
+    {
+        call_user_func_array(
+            array($this, 'Swift_Transport_EsmtpTransport::__construct'),
+            Swift_DependencyContainer::getInstance()
+                ->createDependenciesFor('transport.smtp')
+            );
+
+        $this->setHost($host);
+        $this->setPort($port);
+        $this->setEncryption($security);
+    }
+
+    /**
+     * Create a new SmtpTransport instance.
+     *
+     * @param string $host
+     * @param int    $port
+     * @param string $security
+     *
+     * @return Swift_SmtpTransport
+     */
+    public static function newInstance($host = 'localhost', $port = 25, $security = null)
+    {
+        return new self($host, $port, $security);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Spool.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Spool.php
new file mode 100644
index 000000000..c16ab4b38
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Spool.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2009 Fabien Potencier <fabien.potencier@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Interface for spools.
+ *
+ * @author Fabien Potencier
+ */
+interface Swift_Spool
+{
+    /**
+     * Starts this Spool mechanism.
+     */
+    public function start();
+
+    /**
+     * Stops this Spool mechanism.
+     */
+    public function stop();
+
+    /**
+     * Tests if this Spool mechanism has started.
+     *
+     * @return bool
+     */
+    public function isStarted();
+
+    /**
+     * Queues a message.
+     *
+     * @param Swift_Mime_Message $message The message to store
+     *
+     * @return bool Whether the operation has succeeded
+     */
+    public function queueMessage(Swift_Mime_Message $message);
+
+    /**
+     * Sends messages using the given transport instance.
+     *
+     * @param Swift_Transport $transport        A transport instance
+     * @param string[]        $failedRecipients An array of failures by-reference
+     *
+     * @return int The number of sent emails
+     */
+    public function flushQueue(Swift_Transport $transport, &$failedRecipients = null);
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/SpoolTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/SpoolTransport.php
new file mode 100644
index 000000000..cf9bf78fb
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/SpoolTransport.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2009 Fabien Potencier <fabien.potencier@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Stores Messages in a queue.
+ *
+ * @author Fabien Potencier
+ */
+class Swift_SpoolTransport extends Swift_Transport_SpoolTransport
+{
+    /**
+     * Create a new SpoolTransport.
+     *
+     * @param Swift_Spool $spool
+     */
+    public function __construct(Swift_Spool $spool)
+    {
+        $arguments = Swift_DependencyContainer::getInstance()
+            ->createDependenciesFor('transport.spool');
+
+        $arguments[] = $spool;
+
+        call_user_func_array(
+            array($this, 'Swift_Transport_SpoolTransport::__construct'),
+            $arguments
+        );
+    }
+
+    /**
+     * Create a new SpoolTransport instance.
+     *
+     * @param Swift_Spool $spool
+     *
+     * @return Swift_SpoolTransport
+     */
+    public static function newInstance(Swift_Spool $spool)
+    {
+        return new self($spool);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/StreamFilter.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/StreamFilter.php
new file mode 100644
index 000000000..362be2e8d
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/StreamFilter.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Processes bytes as they pass through a stream and performs filtering.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_StreamFilter
+{
+    /**
+     * Based on the buffer given, this returns true if more buffering is needed.
+     *
+     * @param mixed $buffer
+     *
+     * @return bool
+     */
+    public function shouldBuffer($buffer);
+
+    /**
+     * Filters $buffer and returns the changes.
+     *
+     * @param mixed $buffer
+     *
+     * @return mixed
+     */
+    public function filter($buffer);
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
new file mode 100644
index 000000000..d5735667b
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
@@ -0,0 +1,169 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Processes bytes as they pass through a buffer and replaces sequences in it.
+ *
+ * This stream filter deals with Byte arrays rather than simple strings.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilter
+{
+    /** The needle(s) to search for */
+    private $_search;
+
+    /** The replacement(s) to make */
+    private $_replace;
+
+    /** The Index for searching */
+    private $_index;
+
+    /** The Search Tree */
+    private $_tree = array();
+
+    /**  Gives the size of the largest search */
+    private $_treeMaxLen = 0;
+
+    private $_repSize;
+
+    /**
+     * Create a new ByteArrayReplacementFilter with $search and $replace.
+     *
+     * @param array $search
+     * @param array $replace
+     */
+    public function __construct($search, $replace)
+    {
+        $this->_search = $search;
+        $this->_index = array();
+        $this->_tree = array();
+        $this->_replace = array();
+        $this->_repSize = array();
+
+        $tree = null;
+        $i = null;
+        $last_size = $size = 0;
+        foreach ($search as $i => $search_element) {
+            if ($tree !== null) {
+                $tree[-1] = min(count($replace) - 1, $i - 1);
+                $tree[-2] = $last_size;
+            }
+            $tree = &$this->_tree;
+            if (is_array($search_element)) {
+                foreach ($search_element as $k => $char) {
+                    $this->_index[$char] = true;
+                    if (!isset($tree[$char])) {
+                        $tree[$char] = array();
+                    }
+                    $tree = &$tree[$char];
+                }
+                $last_size = $k + 1;
+                $size = max($size, $last_size);
+            } else {
+                $last_size = 1;
+                if (!isset($tree[$search_element])) {
+                    $tree[$search_element] = array();
+                }
+                $tree = &$tree[$search_element];
+                $size = max($last_size, $size);
+                $this->_index[$search_element] = true;
+            }
+        }
+        if ($i !== null) {
+            $tree[-1] = min(count($replace) - 1, $i);
+            $tree[-2] = $last_size;
+            $this->_treeMaxLen = $size;
+        }
+        foreach ($replace as $rep) {
+            if (!is_array($rep)) {
+                $rep = array($rep);
+            }
+            $this->_replace[] = $rep;
+        }
+        for ($i = count($this->_replace) - 1; $i >= 0; --$i) {
+            $this->_replace[$i] = $rep = $this->filter($this->_replace[$i], $i);
+            $this->_repSize[$i] = count($rep);
+        }
+    }
+
+    /**
+     * Returns true if based on the buffer passed more bytes should be buffered.
+     *
+     * @param array $buffer
+     *
+     * @return bool
+     */
+    public function shouldBuffer($buffer)
+    {
+        $endOfBuffer = end($buffer);
+
+        return isset($this->_index[$endOfBuffer]);
+    }
+
+    /**
+     * Perform the actual replacements on $buffer and return the result.
+     *
+     * @param array $buffer
+     * @param int   $_minReplaces
+     *
+     * @return array
+     */
+    public function filter($buffer, $_minReplaces = -1)
+    {
+        if ($this->_treeMaxLen == 0) {
+            return $buffer;
+        }
+
+        $newBuffer = array();
+        $buf_size = count($buffer);
+        for ($i = 0; $i < $buf_size; ++$i) {
+            $search_pos = $this->_tree;
+            $last_found = PHP_INT_MAX;
+            // We try to find if the next byte is part of a search pattern
+            for ($j = 0; $j <= $this->_treeMaxLen; ++$j) {
+                // We have a new byte for a search pattern
+                if (isset($buffer [$p = $i + $j]) && isset($search_pos[$buffer[$p]])) {
+                    $search_pos = $search_pos[$buffer[$p]];
+                    // We have a complete pattern, save, in case we don't find a better match later
+                    if (isset($search_pos[-1]) && $search_pos[-1] < $last_found
+                        && $search_pos[-1] > $_minReplaces) {
+                        $last_found = $search_pos[-1];
+                        $last_size = $search_pos[-2];
+                    }
+                }
+                // We got a complete pattern
+                elseif ($last_found !== PHP_INT_MAX) {
+                    // Adding replacement datas to output buffer
+                    $rep_size = $this->_repSize[$last_found];
+                    for ($j = 0; $j < $rep_size; ++$j) {
+                        $newBuffer[] = $this->_replace[$last_found][$j];
+                    }
+                    // We Move cursor forward
+                    $i += $last_size - 1;
+                    // Edge Case, last position in buffer
+                    if ($i >= $buf_size) {
+                        $newBuffer[] = $buffer[$i];
+                    }
+
+                    // We start the next loop
+                    continue 2;
+                } else {
+                    // this byte is not in a pattern and we haven't found another pattern
+                    break;
+                }
+            }
+            // Normal byte, move it to output buffer
+            $newBuffer[] = $buffer[$i];
+        }
+
+        return $newBuffer;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
new file mode 100644
index 000000000..d0db8b961
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Processes bytes as they pass through a buffer and replaces sequences in it.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_StreamFilters_StringReplacementFilter implements Swift_StreamFilter
+{
+    /** The needle(s) to search for */
+    private $_search;
+
+    /** The replacement(s) to make */
+    private $_replace;
+
+    /**
+     * Create a new StringReplacementFilter with $search and $replace.
+     *
+     * @param string|array $search
+     * @param string|array $replace
+     */
+    public function __construct($search, $replace)
+    {
+        $this->_search = $search;
+        $this->_replace = $replace;
+    }
+
+    /**
+     * Returns true if based on the buffer passed more bytes should be buffered.
+     *
+     * @param string $buffer
+     *
+     * @return bool
+     */
+    public function shouldBuffer($buffer)
+    {
+        $endOfBuffer = substr($buffer, -1);
+        foreach ((array) $this->_search as $needle) {
+            if (false !== strpos($needle, $endOfBuffer)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Perform the actual replacements on $buffer and return the result.
+     *
+     * @param string $buffer
+     *
+     * @return string
+     */
+    public function filter($buffer)
+    {
+        return str_replace($this->_search, $this->_replace, $buffer);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
new file mode 100644
index 000000000..e98240b5b
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Creates filters for replacing needles in a string buffer.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_StreamFilters_StringReplacementFilterFactory implements Swift_ReplacementFilterFactory
+{
+    /** Lazy-loaded filters */
+    private $_filters = array();
+
+    /**
+     * Create a new StreamFilter to replace $search with $replace in a string.
+     *
+     * @param string $search
+     * @param string $replace
+     *
+     * @return Swift_StreamFilter
+     */
+    public function createFilter($search, $replace)
+    {
+        if (!isset($this->_filters[$search][$replace])) {
+            if (!isset($this->_filters[$search])) {
+                $this->_filters[$search] = array();
+            }
+
+            if (!isset($this->_filters[$search][$replace])) {
+                $this->_filters[$search][$replace] = array();
+            }
+
+            $this->_filters[$search][$replace] = new Swift_StreamFilters_StringReplacementFilter($search, $replace);
+        }
+
+        return $this->_filters[$search][$replace];
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/SwiftException.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/SwiftException.php
new file mode 100644
index 000000000..db3d31093
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/SwiftException.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Base Exception class.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_SwiftException extends Exception
+{
+    /**
+     * Create a new SwiftException with $message.
+     *
+     * @param string    $message
+     * @param int       $code
+     * @param Exception $previous
+     */
+    public function __construct($message, $code = 0, Exception $previous = null)
+    {
+        parent::__construct($message, $code, $previous);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport.php
new file mode 100644
index 000000000..6535eadf2
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Sends Messages via an abstract Transport subsystem.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_Transport
+{
+    /**
+     * Test if this Transport mechanism has started.
+     *
+     * @return bool
+     */
+    public function isStarted();
+
+    /**
+     * Start this Transport mechanism.
+     */
+    public function start();
+
+    /**
+     * Stop this Transport mechanism.
+     */
+    public function stop();
+
+    /**
+     * Send the given Message.
+     *
+     * Recipient/sender data will be retrieved from the Message API.
+     * The return value is the number of recipients who were accepted for delivery.
+     *
+     * @param Swift_Mime_Message $message
+     * @param string[]           $failedRecipients An array of failures by-reference
+     *
+     * @return int
+     */
+    public function send(Swift_Mime_Message $message, &$failedRecipients = null);
+
+    /**
+     * Register a plugin in the Transport.
+     *
+     * @param Swift_Events_EventListener $plugin
+     */
+    public function registerPlugin(Swift_Events_EventListener $plugin);
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
new file mode 100644
index 000000000..f4d9967a5
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
@@ -0,0 +1,496 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Sends Messages over SMTP.
+ *
+ * @author Chris Corbyn
+ */
+abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
+{
+    /** Input-Output buffer for sending/receiving SMTP commands and responses */
+    protected $_buffer;
+
+    /** Connection status */
+    protected $_started = false;
+
+    /** The domain name to use in HELO command */
+    protected $_domain = '[127.0.0.1]';
+
+    /** The event dispatching layer */
+    protected $_eventDispatcher;
+
+    /** Source Ip */
+    protected $_sourceIp;
+
+    /** Return an array of params for the Buffer */
+    abstract protected function _getBufferParams();
+
+    /**
+     * Creates a new EsmtpTransport using the given I/O buffer.
+     *
+     * @param Swift_Transport_IoBuffer     $buf
+     * @param Swift_Events_EventDispatcher $dispatcher
+     */
+    public function __construct(Swift_Transport_IoBuffer $buf, Swift_Events_EventDispatcher $dispatcher)
+    {
+        $this->_eventDispatcher = $dispatcher;
+        $this->_buffer = $buf;
+        $this->_lookupHostname();
+    }
+
+    /**
+     * Set the name of the local domain which Swift will identify itself as.
+     *
+     * This should be a fully-qualified domain name and should be truly the domain
+     * you're using.
+     *
+     * If your server doesn't have a domain name, use the IP in square
+     * brackets (i.e. [127.0.0.1]).
+     *
+     * @param string $domain
+     *
+     * @return Swift_Transport_AbstractSmtpTransport
+     */
+    public function setLocalDomain($domain)
+    {
+        $this->_domain = $domain;
+
+        return $this;
+    }
+
+    /**
+     * Get the name of the domain Swift will identify as.
+     *
+     * @return string
+     */
+    public function getLocalDomain()
+    {
+        return $this->_domain;
+    }
+
+    /**
+     * Sets the source IP.
+     *
+     * @param string $source
+     */
+    public function setSourceIp($source)
+    {
+        $this->_sourceIp = $source;
+    }
+
+    /**
+     * Returns the IP used to connect to the destination.
+     *
+     * @return string
+     */
+    public function getSourceIp()
+    {
+        return $this->_sourceIp;
+    }
+
+    /**
+     * Start the SMTP connection.
+     */
+    public function start()
+    {
+        if (!$this->_started) {
+            if ($evt = $this->_eventDispatcher->createTransportChangeEvent($this)) {
+                $this->_eventDispatcher->dispatchEvent($evt, 'beforeTransportStarted');
+                if ($evt->bubbleCancelled()) {
+                    return;
+                }
+            }
+
+            try {
+                $this->_buffer->initialize($this->_getBufferParams());
+            } catch (Swift_TransportException $e) {
+                $this->_throwException($e);
+            }
+            $this->_readGreeting();
+            $this->_doHeloCommand();
+
+            if ($evt) {
+                $this->_eventDispatcher->dispatchEvent($evt, 'transportStarted');
+            }
+
+            $this->_started = true;
+        }
+    }
+
+    /**
+     * Test if an SMTP connection has been established.
+     *
+     * @return bool
+     */
+    public function isStarted()
+    {
+        return $this->_started;
+    }
+
+    /**
+     * Send the given Message.
+     *
+     * Recipient/sender data will be retrieved from the Message API.
+     * The return value is the number of recipients who were accepted for delivery.
+     *
+     * @param Swift_Mime_Message $message
+     * @param string[]           $failedRecipients An array of failures by-reference
+     *
+     * @return int
+     */
+    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    {
+        $sent = 0;
+        $failedRecipients = (array) $failedRecipients;
+
+        if ($evt = $this->_eventDispatcher->createSendEvent($this, $message)) {
+            $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
+            if ($evt->bubbleCancelled()) {
+                return 0;
+            }
+        }
+
+        if (!$reversePath = $this->_getReversePath($message)) {
+            $this->_throwException(new Swift_TransportException(
+                'Cannot send message without a sender address'
+                )
+            );
+        }
+
+        $to = (array) $message->getTo();
+        $cc = (array) $message->getCc();
+        $tos = array_merge($to, $cc);
+        $bcc = (array) $message->getBcc();
+
+        $message->setBcc(array());
+
+        try {
+            $sent += $this->_sendTo($message, $reversePath, $tos, $failedRecipients);
+            $sent += $this->_sendBcc($message, $reversePath, $bcc, $failedRecipients);
+        } catch (Exception $e) {
+            $message->setBcc($bcc);
+            throw $e;
+        }
+
+        $message->setBcc($bcc);
+
+        if ($evt) {
+            if ($sent == count($to) + count($cc) + count($bcc)) {
+                $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
+            } elseif ($sent > 0) {
+                $evt->setResult(Swift_Events_SendEvent::RESULT_TENTATIVE);
+            } else {
+                $evt->setResult(Swift_Events_SendEvent::RESULT_FAILED);
+            }
+            $evt->setFailedRecipients($failedRecipients);
+            $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
+        }
+
+        $message->generateId(); //Make sure a new Message ID is used
+
+        return $sent;
+    }
+
+    /**
+     * Stop the SMTP connection.
+     */
+    public function stop()
+    {
+        if ($this->_started) {
+            if ($evt = $this->_eventDispatcher->createTransportChangeEvent($this)) {
+                $this->_eventDispatcher->dispatchEvent($evt, 'beforeTransportStopped');
+                if ($evt->bubbleCancelled()) {
+                    return;
+                }
+            }
+
+            try {
+                $this->executeCommand("QUIT\r\n", array(221));
+            } catch (Swift_TransportException $e) {
+            }
+
+            try {
+                $this->_buffer->terminate();
+
+                if ($evt) {
+                    $this->_eventDispatcher->dispatchEvent($evt, 'transportStopped');
+                }
+            } catch (Swift_TransportException $e) {
+                $this->_throwException($e);
+            }
+        }
+        $this->_started = false;
+    }
+
+    /**
+     * Register a plugin.
+     *
+     * @param Swift_Events_EventListener $plugin
+     */
+    public function registerPlugin(Swift_Events_EventListener $plugin)
+    {
+        $this->_eventDispatcher->bindEventListener($plugin);
+    }
+
+    /**
+     * Reset the current mail transaction.
+     */
+    public function reset()
+    {
+        $this->executeCommand("RSET\r\n", array(250));
+    }
+
+    /**
+     * Get the IoBuffer where read/writes are occurring.
+     *
+     * @return Swift_Transport_IoBuffer
+     */
+    public function getBuffer()
+    {
+        return $this->_buffer;
+    }
+
+    /**
+     * Run a command against the buffer, expecting the given response codes.
+     *
+     * If no response codes are given, the response will not be validated.
+     * If codes are given, an exception will be thrown on an invalid response.
+     *
+     * @param string   $command
+     * @param int[]    $codes
+     * @param string[] $failures An array of failures by-reference
+     *
+     * @return string
+     */
+    public function executeCommand($command, $codes = array(), &$failures = null)
+    {
+        $failures = (array) $failures;
+        $seq = $this->_buffer->write($command);
+        $response = $this->_getFullResponse($seq);
+        if ($evt = $this->_eventDispatcher->createCommandEvent($this, $command, $codes)) {
+            $this->_eventDispatcher->dispatchEvent($evt, 'commandSent');
+        }
+        $this->_assertResponseCode($response, $codes);
+
+        return $response;
+    }
+
+    /** Read the opening SMTP greeting */
+    protected function _readGreeting()
+    {
+        $this->_assertResponseCode($this->_getFullResponse(0), array(220));
+    }
+
+    /** Send the HELO welcome */
+    protected function _doHeloCommand()
+    {
+        $this->executeCommand(
+            sprintf("HELO %s\r\n", $this->_domain), array(250)
+            );
+    }
+
+    /** Send the MAIL FROM command */
+    protected function _doMailFromCommand($address)
+    {
+        $this->executeCommand(
+            sprintf("MAIL FROM:<%s>\r\n", $address), array(250)
+            );
+    }
+
+    /** Send the RCPT TO command */
+    protected function _doRcptToCommand($address)
+    {
+        $this->executeCommand(
+            sprintf("RCPT TO:<%s>\r\n", $address), array(250, 251, 252)
+            );
+    }
+
+    /** Send the DATA command */
+    protected function _doDataCommand()
+    {
+        $this->executeCommand("DATA\r\n", array(354));
+    }
+
+    /** Stream the contents of the message over the buffer */
+    protected function _streamMessage(Swift_Mime_Message $message)
+    {
+        $this->_buffer->setWriteTranslations(array("\r\n." => "\r\n.."));
+        try {
+            $message->toByteStream($this->_buffer);
+            $this->_buffer->flushBuffers();
+        } catch (Swift_TransportException $e) {
+            $this->_throwException($e);
+        }
+        $this->_buffer->setWriteTranslations(array());
+        $this->executeCommand("\r\n.\r\n", array(250));
+    }
+
+    /** Determine the best-use reverse path for this message */
+    protected function _getReversePath(Swift_Mime_Message $message)
+    {
+        $return = $message->getReturnPath();
+        $sender = $message->getSender();
+        $from = $message->getFrom();
+        $path = null;
+        if (!empty($return)) {
+            $path = $return;
+        } elseif (!empty($sender)) {
+            // Don't use array_keys
+            reset($sender); // Reset Pointer to first pos
+            $path = key($sender); // Get key
+        } elseif (!empty($from)) {
+            reset($from); // Reset Pointer to first pos
+            $path = key($from); // Get key
+        }
+
+        return $path;
+    }
+
+    /** Throw a TransportException, first sending it to any listeners */
+    protected function _throwException(Swift_TransportException $e)
+    {
+        if ($evt = $this->_eventDispatcher->createTransportExceptionEvent($this, $e)) {
+            $this->_eventDispatcher->dispatchEvent($evt, 'exceptionThrown');
+            if (!$evt->bubbleCancelled()) {
+                throw $e;
+            }
+        } else {
+            throw $e;
+        }
+    }
+
+    /** Throws an Exception if a response code is incorrect */
+    protected function _assertResponseCode($response, $wanted)
+    {
+        list($code) = sscanf($response, '%3d');
+        $valid = (empty($wanted) || in_array($code, $wanted));
+
+        if ($evt = $this->_eventDispatcher->createResponseEvent($this, $response,
+            $valid)) {
+            $this->_eventDispatcher->dispatchEvent($evt, 'responseReceived');
+        }
+
+        if (!$valid) {
+            $this->_throwException(
+                new Swift_TransportException(
+                    'Expected response code '.implode('/', $wanted).' but got code '.
+                    '"'.$code.'", with message "'.$response.'"',
+                    $code)
+                );
+        }
+    }
+
+    /** Get an entire multi-line response using its sequence number */
+    protected function _getFullResponse($seq)
+    {
+        $response = '';
+        try {
+            do {
+                $line = $this->_buffer->readLine($seq);
+                $response .= $line;
+            } while (null !== $line && false !== $line && ' ' != $line{3});
+        } catch (Swift_TransportException $e) {
+            $this->_throwException($e);
+        } catch (Swift_IoException $e) {
+            $this->_throwException(
+                new Swift_TransportException(
+                    $e->getMessage())
+                );
+        }
+
+        return $response;
+    }
+
+    /** Send an email to the given recipients from the given reverse path */
+    private function _doMailTransaction($message, $reversePath, array $recipients, array &$failedRecipients)
+    {
+        $sent = 0;
+        $this->_doMailFromCommand($reversePath);
+        foreach ($recipients as $forwardPath) {
+            try {
+                $this->_doRcptToCommand($forwardPath);
+                ++$sent;
+            } catch (Swift_TransportException $e) {
+                $failedRecipients[] = $forwardPath;
+            }
+        }
+
+        if ($sent != 0) {
+            $this->_doDataCommand();
+            $this->_streamMessage($message);
+        } else {
+            $this->reset();
+        }
+
+        return $sent;
+    }
+
+    /** Send a message to the given To: recipients */
+    private function _sendTo(Swift_Mime_Message $message, $reversePath, array $to, array &$failedRecipients)
+    {
+        if (empty($to)) {
+            return 0;
+        }
+
+        return $this->_doMailTransaction($message, $reversePath, array_keys($to),
+            $failedRecipients);
+    }
+
+    /** Send a message to all Bcc: recipients */
+    private function _sendBcc(Swift_Mime_Message $message, $reversePath, array $bcc, array &$failedRecipients)
+    {
+        $sent = 0;
+        foreach ($bcc as $forwardPath => $name) {
+            $message->setBcc(array($forwardPath => $name));
+            $sent += $this->_doMailTransaction(
+                $message, $reversePath, array($forwardPath), $failedRecipients
+                );
+        }
+
+        return $sent;
+    }
+
+    /** Try to determine the hostname of the server this is run on */
+    private function _lookupHostname()
+    {
+        if (!empty($_SERVER['SERVER_NAME']) && $this->_isFqdn($_SERVER['SERVER_NAME'])) {
+            $this->_domain = $_SERVER['SERVER_NAME'];
+        } elseif (!empty($_SERVER['SERVER_ADDR'])) {
+            // Set the address literal tag (See RFC 5321, section: 4.1.3)
+            if (false === strpos($_SERVER['SERVER_ADDR'], ':')) {
+                $prefix = ''; // IPv4 addresses are not tagged.
+            } else {
+                $prefix = 'IPv6:'; // Adding prefix in case of IPv6.
+            }
+
+            $this->_domain = sprintf('[%s%s]', $prefix, $_SERVER['SERVER_ADDR']);
+        }
+    }
+
+    /** Determine is the $hostname is a fully-qualified name */
+    private function _isFqdn($hostname)
+    {
+        // We could do a really thorough check, but there's really no point
+        if (false !== $dotPos = strpos($hostname, '.')) {
+            return ($dotPos > 0) && ($dotPos != strlen($hostname) - 1);
+        }
+
+        return false;
+    }
+
+    /**
+     * Destructor.
+     */
+    public function __destruct()
+    {
+        $this->stop();
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
new file mode 100644
index 000000000..53f721d03
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Handles CRAM-MD5 authentication.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Transport_Esmtp_Auth_CramMd5Authenticator implements Swift_Transport_Esmtp_Authenticator
+{
+    /**
+     * Get the name of the AUTH mechanism this Authenticator handles.
+     *
+     * @return string
+     */
+    public function getAuthKeyword()
+    {
+        return 'CRAM-MD5';
+    }
+
+    /**
+     * Try to authenticate the user with $username and $password.
+     *
+     * @param Swift_Transport_SmtpAgent $agent
+     * @param string                    $username
+     * @param string                    $password
+     *
+     * @return bool
+     */
+    public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
+    {
+        try {
+            $challenge = $agent->executeCommand("AUTH CRAM-MD5\r\n", array(334));
+            $challenge = base64_decode(substr($challenge, 4));
+            $message = base64_encode(
+                $username.' '.$this->_getResponse($password, $challenge)
+                );
+            $agent->executeCommand(sprintf("%s\r\n", $message), array(235));
+
+            return true;
+        } catch (Swift_TransportException $e) {
+            $agent->executeCommand("RSET\r\n", array(250));
+
+            return false;
+        }
+    }
+
+    /**
+     * Generate a CRAM-MD5 response from a server challenge.
+     *
+     * @param string $secret
+     * @param string $challenge
+     *
+     * @return string
+     */
+    private function _getResponse($secret, $challenge)
+    {
+        if (strlen($secret) > 64) {
+            $secret = pack('H32', md5($secret));
+        }
+
+        if (strlen($secret) < 64) {
+            $secret = str_pad($secret, 64, chr(0));
+        }
+
+        $k_ipad = substr($secret, 0, 64) ^ str_repeat(chr(0x36), 64);
+        $k_opad = substr($secret, 0, 64) ^ str_repeat(chr(0x5C), 64);
+
+        $inner = pack('H32', md5($k_ipad.$challenge));
+        $digest = md5($k_opad.$inner);
+
+        return $digest;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
new file mode 100644
index 000000000..6ab6e3337
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Handles LOGIN authentication.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Transport_Esmtp_Auth_LoginAuthenticator implements Swift_Transport_Esmtp_Authenticator
+{
+    /**
+     * Get the name of the AUTH mechanism this Authenticator handles.
+     *
+     * @return string
+     */
+    public function getAuthKeyword()
+    {
+        return 'LOGIN';
+    }
+
+    /**
+     * Try to authenticate the user with $username and $password.
+     *
+     * @param Swift_Transport_SmtpAgent $agent
+     * @param string                    $username
+     * @param string                    $password
+     *
+     * @return bool
+     */
+    public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
+    {
+        try {
+            $agent->executeCommand("AUTH LOGIN\r\n", array(334));
+            $agent->executeCommand(sprintf("%s\r\n", base64_encode($username)), array(334));
+            $agent->executeCommand(sprintf("%s\r\n", base64_encode($password)), array(235));
+
+            return true;
+        } catch (Swift_TransportException $e) {
+            $agent->executeCommand("RSET\r\n", array(250));
+
+            return false;
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
new file mode 100644
index 000000000..dbdece53e
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
@@ -0,0 +1,720 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * This authentication is for Exchange servers. We support version 1 & 2.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Handles NTLM authentication.
+ *
+ * @author Ward Peeters <ward@coding-tech.com>
+ */
+class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Esmtp_Authenticator
+{
+    const NTLMSIG = "NTLMSSP\x00";
+    const DESCONST = 'KGS!@#$%';
+
+    /**
+     * Get the name of the AUTH mechanism this Authenticator handles.
+     *
+     * @return string
+     */
+    public function getAuthKeyword()
+    {
+        return 'NTLM';
+    }
+
+    /**
+     * Try to authenticate the user with $username and $password.
+     *
+     * @param Swift_Transport_SmtpAgent $agent
+     * @param string                    $username
+     * @param string                    $password
+     *
+     * @return bool
+     */
+    public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
+    {
+        if (!function_exists('openssl_random_pseudo_bytes') || !function_exists('openssl_encrypt')) {
+            throw new LogicException('The OpenSSL extension must be enabled to use the NTLM authenticator.');
+        }
+
+        if (!function_exists('bcmul')) {
+            throw new LogicException('The BCMatch functions must be enabled to use the NTLM authenticator.');
+        }
+
+        try {
+            // execute AUTH command and filter out the code at the beginning
+            // AUTH NTLM xxxx
+            $response = base64_decode(substr(trim($this->sendMessage1($agent)), 4));
+
+            // extra parameters for our unit cases
+            $timestamp = func_num_args() > 3 ? func_get_arg(3) : $this->getCorrectTimestamp(bcmul(microtime(true), '1000'));
+            $client = func_num_args() > 4 ? func_get_arg(4) : $this->getRandomBytes(8);
+
+            // Message 3 response
+            $this->sendMessage3($response, $username, $password, $timestamp, $client, $agent);
+
+            return true;
+        } catch (Swift_TransportException $e) {
+            $agent->executeCommand("RSET\r\n", array(250));
+
+            return false;
+        }
+    }
+
+    protected function si2bin($si, $bits = 32)
+    {
+        $bin = null;
+        if ($si >= -pow(2, $bits - 1) && ($si <= pow(2, $bits - 1))) {
+            // positive or zero
+            if ($si >= 0) {
+                $bin = base_convert($si, 10, 2);
+                // pad to $bits bit
+                $bin_length = strlen($bin);
+                if ($bin_length < $bits) {
+                    $bin = str_repeat('0', $bits - $bin_length).$bin;
+                }
+            } else {
+                // negative
+                $si = -$si - pow(2, $bits);
+                $bin = base_convert($si, 10, 2);
+                $bin_length = strlen($bin);
+                if ($bin_length > $bits) {
+                    $bin = str_repeat('1', $bits - $bin_length).$bin;
+                }
+            }
+        }
+
+        return $bin;
+    }
+
+    /**
+     * Send our auth message and returns the response.
+     *
+     * @param Swift_Transport_SmtpAgent $agent
+     *
+     * @return string SMTP Response
+     */
+    protected function sendMessage1(Swift_Transport_SmtpAgent $agent)
+    {
+        $message = $this->createMessage1();
+
+        return $agent->executeCommand(sprintf("AUTH %s %s\r\n", $this->getAuthKeyword(), base64_encode($message)), array(334));
+    }
+
+    /**
+     * Fetch all details of our response (message 2).
+     *
+     * @param string $response
+     *
+     * @return array our response parsed
+     */
+    protected function parseMessage2($response)
+    {
+        $responseHex = bin2hex($response);
+        $length = floor(hexdec(substr($responseHex, 28, 4)) / 256) * 2;
+        $offset = floor(hexdec(substr($responseHex, 32, 4)) / 256) * 2;
+        $challenge = $this->hex2bin(substr($responseHex, 48, 16));
+        $context = $this->hex2bin(substr($responseHex, 64, 16));
+        $targetInfoH = $this->hex2bin(substr($responseHex, 80, 16));
+        $targetName = $this->hex2bin(substr($responseHex, $offset, $length));
+        $offset = floor(hexdec(substr($responseHex, 88, 4)) / 256) * 2;
+        $targetInfoBlock = substr($responseHex, $offset);
+        list($domainName, $serverName, $DNSDomainName, $DNSServerName, $terminatorByte) = $this->readSubBlock($targetInfoBlock);
+
+        return array(
+            $challenge,
+            $context,
+            $targetInfoH,
+            $targetName,
+            $domainName,
+            $serverName,
+            $DNSDomainName,
+            $DNSServerName,
+            $this->hex2bin($targetInfoBlock),
+            $terminatorByte,
+        );
+    }
+
+    /**
+     * Read the blob information in from message2.
+     *
+     * @param $block
+     *
+     * @return array
+     */
+    protected function readSubBlock($block)
+    {
+        // remove terminatorByte cause it's always the same
+        $block = substr($block, 0, -8);
+
+        $length = strlen($block);
+        $offset = 0;
+        $data = array();
+        while ($offset < $length) {
+            $blockLength = hexdec(substr(substr($block, $offset, 8), -4)) / 256;
+            $offset += 8;
+            $data[] = $this->hex2bin(substr($block, $offset, $blockLength * 2));
+            $offset += $blockLength * 2;
+        }
+
+        if (count($data) == 3) {
+            $data[] = $data[2];
+            $data[2] = '';
+        }
+
+        $data[] = $this->createByte('00');
+
+        return $data;
+    }
+
+    /**
+     * Send our final message with all our data.
+     *
+     * @param string                    $response  Message 1 response (message 2)
+     * @param string                    $username
+     * @param string                    $password
+     * @param string                    $timestamp
+     * @param string                    $client
+     * @param Swift_Transport_SmtpAgent $agent
+     * @param bool                      $v2        Use version2 of the protocol
+     *
+     * @return string
+     */
+    protected function sendMessage3($response, $username, $password, $timestamp, $client, Swift_Transport_SmtpAgent $agent, $v2 = true)
+    {
+        list($domain, $username) = $this->getDomainAndUsername($username);
+        //$challenge, $context, $targetInfoH, $targetName, $domainName, $workstation, $DNSDomainName, $DNSServerName, $blob, $ter
+        list($challenge, , , , , $workstation, , , $blob) = $this->parseMessage2($response);
+
+        if (!$v2) {
+            // LMv1
+            $lmResponse = $this->createLMPassword($password, $challenge);
+            // NTLMv1
+            $ntlmResponse = $this->createNTLMPassword($password, $challenge);
+        } else {
+            // LMv2
+            $lmResponse = $this->createLMv2Password($password, $username, $domain, $challenge, $client);
+            // NTLMv2
+            $ntlmResponse = $this->createNTLMv2Hash($password, $username, $domain, $challenge, $blob, $timestamp, $client);
+        }
+
+        $message = $this->createMessage3($domain, $username, $workstation, $lmResponse, $ntlmResponse);
+
+        return $agent->executeCommand(sprintf("%s\r\n", base64_encode($message)), array(235));
+    }
+
+    /**
+     * Create our message 1.
+     *
+     * @return string
+     */
+    protected function createMessage1()
+    {
+        return self::NTLMSIG
+        .$this->createByte('01') // Message 1
+.$this->createByte('0702'); // Flags
+    }
+
+    /**
+     * Create our message 3.
+     *
+     * @param string $domain
+     * @param string $username
+     * @param string $workstation
+     * @param string $lmResponse
+     * @param string $ntlmResponse
+     *
+     * @return string
+     */
+    protected function createMessage3($domain, $username, $workstation, $lmResponse, $ntlmResponse)
+    {
+        // Create security buffers
+        $domainSec = $this->createSecurityBuffer($domain, 64);
+        $domainInfo = $this->readSecurityBuffer(bin2hex($domainSec));
+        $userSec = $this->createSecurityBuffer($username, ($domainInfo[0] + $domainInfo[1]) / 2);
+        $userInfo = $this->readSecurityBuffer(bin2hex($userSec));
+        $workSec = $this->createSecurityBuffer($workstation, ($userInfo[0] + $userInfo[1]) / 2);
+        $workInfo = $this->readSecurityBuffer(bin2hex($workSec));
+        $lmSec = $this->createSecurityBuffer($lmResponse, ($workInfo[0] + $workInfo[1]) / 2, true);
+        $lmInfo = $this->readSecurityBuffer(bin2hex($lmSec));
+        $ntlmSec = $this->createSecurityBuffer($ntlmResponse, ($lmInfo[0] + $lmInfo[1]) / 2, true);
+
+        return self::NTLMSIG
+        .$this->createByte('03') // TYPE 3 message
+.$lmSec // LM response header
+.$ntlmSec // NTLM response header
+.$domainSec // Domain header
+.$userSec // User header
+.$workSec // Workstation header
+.$this->createByte('000000009a', 8) // session key header (empty)
+.$this->createByte('01020000') // FLAGS
+.$this->convertTo16bit($domain) // domain name
+.$this->convertTo16bit($username) // username
+.$this->convertTo16bit($workstation) // workstation
+.$lmResponse
+        .$ntlmResponse;
+    }
+
+    /**
+     * @param string $timestamp  Epoch timestamp in microseconds
+     * @param string $client     Random bytes
+     * @param string $targetInfo
+     *
+     * @return string
+     */
+    protected function createBlob($timestamp, $client, $targetInfo)
+    {
+        return $this->createByte('0101')
+        .$this->createByte('00')
+        .$timestamp
+        .$client
+        .$this->createByte('00')
+        .$targetInfo
+        .$this->createByte('00');
+    }
+
+    /**
+     * Get domain and username from our username.
+     *
+     * @example DOMAIN\username
+     *
+     * @param string $name
+     *
+     * @return array
+     */
+    protected function getDomainAndUsername($name)
+    {
+        if (strpos($name, '\\') !== false) {
+            return explode('\\', $name);
+        }
+
+        list($user, $domain) = explode('@', $name);
+
+        return array($domain, $user);
+    }
+
+    /**
+     * Create LMv1 response.
+     *
+     * @param string $password
+     * @param string $challenge
+     *
+     * @return string
+     */
+    protected function createLMPassword($password, $challenge)
+    {
+        // FIRST PART
+        $password = $this->createByte(strtoupper($password), 14, false);
+        list($key1, $key2) = str_split($password, 7);
+
+        $desKey1 = $this->createDesKey($key1);
+        $desKey2 = $this->createDesKey($key2);
+
+        $constantDecrypt = $this->createByte($this->desEncrypt(self::DESCONST, $desKey1).$this->desEncrypt(self::DESCONST, $desKey2), 21, false);
+
+        // SECOND PART
+        list($key1, $key2, $key3) = str_split($constantDecrypt, 7);
+
+        $desKey1 = $this->createDesKey($key1);
+        $desKey2 = $this->createDesKey($key2);
+        $desKey3 = $this->createDesKey($key3);
+
+        return $this->desEncrypt($challenge, $desKey1).$this->desEncrypt($challenge, $desKey2).$this->desEncrypt($challenge, $desKey3);
+    }
+
+    /**
+     * Create NTLMv1 response.
+     *
+     * @param string $password
+     * @param string $challenge
+     *
+     * @return string
+     */
+    protected function createNTLMPassword($password, $challenge)
+    {
+        // FIRST PART
+        $ntlmHash = $this->createByte($this->md4Encrypt($password), 21, false);
+        list($key1, $key2, $key3) = str_split($ntlmHash, 7);
+
+        $desKey1 = $this->createDesKey($key1);
+        $desKey2 = $this->createDesKey($key2);
+        $desKey3 = $this->createDesKey($key3);
+
+        return $this->desEncrypt($challenge, $desKey1).$this->desEncrypt($challenge, $desKey2).$this->desEncrypt($challenge, $desKey3);
+    }
+
+    /**
+     * Convert a normal timestamp to a tenth of a microtime epoch time.
+     *
+     * @param string $time
+     *
+     * @return string
+     */
+    protected function getCorrectTimestamp($time)
+    {
+        // Get our timestamp (tricky!)
+        bcscale(0);
+
+        $time = number_format($time, 0, '.', ''); // save microtime to string
+        $time = bcadd($time, '11644473600000'); // add epoch time
+        $time = bcmul($time, 10000); // tenths of a microsecond.
+
+        $binary = $this->si2bin($time, 64); // create 64 bit binary string
+        $timestamp = '';
+        for ($i = 0; $i < 8; ++$i) {
+            $timestamp .= chr(bindec(substr($binary, -(($i + 1) * 8), 8)));
+        }
+
+        return $timestamp;
+    }
+
+    /**
+     * Create LMv2 response.
+     *
+     * @param string $password
+     * @param string $username
+     * @param string $domain
+     * @param string $challenge NTLM Challenge
+     * @param string $client    Random string
+     *
+     * @return string
+     */
+    protected function createLMv2Password($password, $username, $domain, $challenge, $client)
+    {
+        $lmPass = '00'; // by default 00
+        // if $password > 15 than we can't use this method
+        if (strlen($password) <= 15) {
+            $ntlmHash = $this->md4Encrypt($password);
+            $ntml2Hash = $this->md5Encrypt($ntlmHash, $this->convertTo16bit(strtoupper($username).$domain));
+
+            $lmPass = bin2hex($this->md5Encrypt($ntml2Hash, $challenge.$client).$client);
+        }
+
+        return $this->createByte($lmPass, 24);
+    }
+
+    /**
+     * Create NTLMv2 response.
+     *
+     * @param string $password
+     * @param string $username
+     * @param string $domain
+     * @param string $challenge  Hex values
+     * @param string $targetInfo Hex values
+     * @param string $timestamp
+     * @param string $client     Random bytes
+     *
+     * @return string
+     *
+     * @see http://davenport.sourceforge.net/ntlm.html#theNtlmResponse
+     */
+    protected function createNTLMv2Hash($password, $username, $domain, $challenge, $targetInfo, $timestamp, $client)
+    {
+        $ntlmHash = $this->md4Encrypt($password);
+        $ntml2Hash = $this->md5Encrypt($ntlmHash, $this->convertTo16bit(strtoupper($username).$domain));
+
+        // create blob
+        $blob = $this->createBlob($timestamp, $client, $targetInfo);
+
+        $ntlmv2Response = $this->md5Encrypt($ntml2Hash, $challenge.$blob);
+
+        return $ntlmv2Response.$blob;
+    }
+
+    protected function createDesKey($key)
+    {
+        $material = array(bin2hex($key[0]));
+        $len = strlen($key);
+        for ($i = 1; $i < $len; ++$i) {
+            list($high, $low) = str_split(bin2hex($key[$i]));
+            $v = $this->castToByte(ord($key[$i - 1]) << (7 + 1 - $i) | $this->uRShift(hexdec(dechex(hexdec($high) & 0xf).dechex(hexdec($low) & 0xf)), $i));
+            $material[] = str_pad(substr(dechex($v), -2), 2, '0', STR_PAD_LEFT); // cast to byte
+        }
+        $material[] = str_pad(substr(dechex($this->castToByte(ord($key[6]) << 1)), -2), 2, '0');
+
+        // odd parity
+        foreach ($material as $k => $v) {
+            $b = $this->castToByte(hexdec($v));
+            $needsParity = (($this->uRShift($b, 7) ^ $this->uRShift($b, 6) ^ $this->uRShift($b, 5)
+                        ^ $this->uRShift($b, 4) ^ $this->uRShift($b, 3) ^ $this->uRShift($b, 2)
+                        ^ $this->uRShift($b, 1)) & 0x01) == 0;
+
+            list($high, $low) = str_split($v);
+            if ($needsParity) {
+                $material[$k] = dechex(hexdec($high) | 0x0).dechex(hexdec($low) | 0x1);
+            } else {
+                $material[$k] = dechex(hexdec($high) & 0xf).dechex(hexdec($low) & 0xe);
+            }
+        }
+
+        return $this->hex2bin(implode('', $material));
+    }
+
+    /** HELPER FUNCTIONS */
+    /**
+     * Create our security buffer depending on length and offset.
+     *
+     * @param string $value  Value we want to put in
+     * @param int    $offset start of value
+     * @param bool   $is16   Do we 16bit string or not?
+     *
+     * @return string
+     */
+    protected function createSecurityBuffer($value, $offset, $is16 = false)
+    {
+        $length = strlen(bin2hex($value));
+        $length = $is16 ? $length / 2 : $length;
+        $length = $this->createByte(str_pad(dechex($length), 2, '0', STR_PAD_LEFT), 2);
+
+        return $length.$length.$this->createByte(dechex($offset), 4);
+    }
+
+    /**
+     * Read our security buffer to fetch length and offset of our value.
+     *
+     * @param string $value Securitybuffer in hex
+     *
+     * @return array array with length and offset
+     */
+    protected function readSecurityBuffer($value)
+    {
+        $length = floor(hexdec(substr($value, 0, 4)) / 256) * 2;
+        $offset = floor(hexdec(substr($value, 8, 4)) / 256) * 2;
+
+        return array($length, $offset);
+    }
+
+    /**
+     * Cast to byte java equivalent to (byte).
+     *
+     * @param int $v
+     *
+     * @return int
+     */
+    protected function castToByte($v)
+    {
+        return (($v + 128) % 256) - 128;
+    }
+
+    /**
+     * Java unsigned right bitwise
+     * $a >>> $b.
+     *
+     * @param int $a
+     * @param int $b
+     *
+     * @return int
+     */
+    protected function uRShift($a, $b)
+    {
+        if ($b == 0) {
+            return $a;
+        }
+
+        return ($a >> $b) & ~(1 << (8 * PHP_INT_SIZE - 1) >> ($b - 1));
+    }
+
+    /**
+     * Right padding with 0 to certain length.
+     *
+     * @param string $input
+     * @param int    $bytes Length of bytes
+     * @param bool   $isHex Did we provided hex value
+     *
+     * @return string
+     */
+    protected function createByte($input, $bytes = 4, $isHex = true)
+    {
+        if ($isHex) {
+            $byte = $this->hex2bin(str_pad($input, $bytes * 2, '00'));
+        } else {
+            $byte = str_pad($input, $bytes, "\x00");
+        }
+
+        return $byte;
+    }
+
+    /**
+     * Create random bytes.
+     *
+     * @param $length
+     *
+     * @return string
+     */
+    protected function getRandomBytes($length)
+    {
+        $bytes = openssl_random_pseudo_bytes($length, $strong);
+
+        if (false !== $bytes && true === $strong) {
+            return $bytes;
+        }
+
+        throw new RuntimeException('OpenSSL did not produce a secure random number.');
+    }
+
+    /** ENCRYPTION ALGORITHMS */
+    /**
+     * DES Encryption.
+     *
+     * @param string $value An 8-byte string
+     * @param string $key
+     *
+     * @return string
+     */
+    protected function desEncrypt($value, $key)
+    {
+        // 1 == OPENSSL_RAW_DATA - but constant is only available as of PHP 5.4.
+        return substr(openssl_encrypt($value, 'DES-ECB', $key, 1), 0, 8);
+    }
+
+    /**
+     * MD5 Encryption.
+     *
+     * @param string $key Encryption key
+     * @param string $msg Message to encrypt
+     *
+     * @return string
+     */
+    protected function md5Encrypt($key, $msg)
+    {
+        $blocksize = 64;
+        if (strlen($key) > $blocksize) {
+            $key = pack('H*', md5($key));
+        }
+
+        $key = str_pad($key, $blocksize, "\0");
+        $ipadk = $key ^ str_repeat("\x36", $blocksize);
+        $opadk = $key ^ str_repeat("\x5c", $blocksize);
+
+        return pack('H*', md5($opadk.pack('H*', md5($ipadk.$msg))));
+    }
+
+    /**
+     * MD4 Encryption.
+     *
+     * @param string $input
+     *
+     * @return string
+     *
+     * @see http://php.net/manual/en/ref.hash.php
+     */
+    protected function md4Encrypt($input)
+    {
+        $input = $this->convertTo16bit($input);
+
+        return function_exists('hash') ? $this->hex2bin(hash('md4', $input)) : mhash(MHASH_MD4, $input);
+    }
+
+    /**
+     * Convert UTF-8 to UTF-16.
+     *
+     * @param string $input
+     *
+     * @return string
+     */
+    protected function convertTo16bit($input)
+    {
+        return iconv('UTF-8', 'UTF-16LE', $input);
+    }
+
+    /**
+     * Hex2bin replacement for < PHP 5.4.
+     *
+     * @param string $hex
+     *
+     * @return string Binary
+     */
+    protected function hex2bin($hex)
+    {
+        if (function_exists('hex2bin')) {
+            return hex2bin($hex);
+        } else {
+            return pack('H*', $hex);
+        }
+    }
+
+    /**
+     * @param string $message
+     */
+    protected function debug($message)
+    {
+        $message = bin2hex($message);
+        $messageId = substr($message, 16, 8);
+        echo substr($message, 0, 16)." NTLMSSP Signature<br />\n";
+        echo $messageId." Type Indicator<br />\n";
+
+        if ($messageId == '02000000') {
+            $map = array(
+                'Challenge',
+                'Context',
+                'Target Information Security Buffer',
+                'Target Name Data',
+                'NetBIOS Domain Name',
+                'NetBIOS Server Name',
+                'DNS Domain Name',
+                'DNS Server Name',
+                'BLOB',
+                'Target Information Terminator',
+            );
+
+            $data = $this->parseMessage2($this->hex2bin($message));
+
+            foreach ($map as $key => $value) {
+                echo bin2hex($data[$key]).' - '.$data[$key].' ||| '.$value."<br />\n";
+            }
+        } elseif ($messageId == '03000000') {
+            $i = 0;
+            $data[$i++] = substr($message, 24, 16);
+            list($lmLength, $lmOffset) = $this->readSecurityBuffer($data[$i - 1]);
+
+            $data[$i++] = substr($message, 40, 16);
+            list($ntmlLength, $ntmlOffset) = $this->readSecurityBuffer($data[$i - 1]);
+
+            $data[$i++] = substr($message, 56, 16);
+            list($targetLength, $targetOffset) = $this->readSecurityBuffer($data[$i - 1]);
+
+            $data[$i++] = substr($message, 72, 16);
+            list($userLength, $userOffset) = $this->readSecurityBuffer($data[$i - 1]);
+
+            $data[$i++] = substr($message, 88, 16);
+            list($workLength, $workOffset) = $this->readSecurityBuffer($data[$i - 1]);
+
+            $data[$i++] = substr($message, 104, 16);
+            $data[$i++] = substr($message, 120, 8);
+            $data[$i++] = substr($message, $targetOffset, $targetLength);
+            $data[$i++] = substr($message, $userOffset, $userLength);
+            $data[$i++] = substr($message, $workOffset, $workLength);
+            $data[$i++] = substr($message, $lmOffset, $lmLength);
+            $data[$i] = substr($message, $ntmlOffset, $ntmlLength);
+
+            $map = array(
+                'LM Response Security Buffer',
+                'NTLM Response Security Buffer',
+                'Target Name Security Buffer',
+                'User Name Security Buffer',
+                'Workstation Name Security Buffer',
+                'Session Key Security Buffer',
+                'Flags',
+                'Target Name Data',
+                'User Name Data',
+                'Workstation Name Data',
+                'LM Response Data',
+                'NTLM Response Data',
+            );
+
+            foreach ($map as $key => $value) {
+                echo $data[$key].' - '.$this->hex2bin($data[$key]).' ||| '.$value."<br />\n";
+            }
+        }
+
+        echo '<br /><br />';
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
new file mode 100644
index 000000000..43219f934
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Handles PLAIN authentication.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Transport_Esmtp_Auth_PlainAuthenticator implements Swift_Transport_Esmtp_Authenticator
+{
+    /**
+     * Get the name of the AUTH mechanism this Authenticator handles.
+     *
+     * @return string
+     */
+    public function getAuthKeyword()
+    {
+        return 'PLAIN';
+    }
+
+    /**
+     * Try to authenticate the user with $username and $password.
+     *
+     * @param Swift_Transport_SmtpAgent $agent
+     * @param string                    $username
+     * @param string                    $password
+     *
+     * @return bool
+     */
+    public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
+    {
+        try {
+            $message = base64_encode($username.chr(0).$username.chr(0).$password);
+            $agent->executeCommand(sprintf("AUTH PLAIN %s\r\n", $message), array(235));
+
+            return true;
+        } catch (Swift_TransportException $e) {
+            $agent->executeCommand("RSET\r\n", array(250));
+
+            return false;
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
new file mode 100644
index 000000000..ca35e7b83
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
@@ -0,0 +1,70 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Handles XOAUTH2 authentication.
+ *
+ * Example:
+ * <code>
+ * $transport = Swift_SmtpTransport::newInstance('smtp.gmail.com', 587, 'tls')
+ *   ->setAuthMode('XOAUTH2')
+ *   ->setUsername('YOUR_EMAIL_ADDRESS')
+ *   ->setPassword('YOUR_ACCESS_TOKEN');
+ * </code>
+ *
+ * @author xu.li<AthenaLightenedMyPath@gmail.com>
+ *
+ * @see        https://developers.google.com/google-apps/gmail/xoauth2_protocol
+ */
+class Swift_Transport_Esmtp_Auth_XOAuth2Authenticator implements Swift_Transport_Esmtp_Authenticator
+{
+    /**
+     * Get the name of the AUTH mechanism this Authenticator handles.
+     *
+     * @return string
+     */
+    public function getAuthKeyword()
+    {
+        return 'XOAUTH2';
+    }
+
+    /**
+     * Try to authenticate the user with $email and $token.
+     *
+     * @param Swift_Transport_SmtpAgent $agent
+     * @param string                    $email
+     * @param string                    $token
+     *
+     * @return bool
+     */
+    public function authenticate(Swift_Transport_SmtpAgent $agent, $email, $token)
+    {
+        try {
+            $param = $this->constructXOAuth2Params($email, $token);
+            $agent->executeCommand('AUTH XOAUTH2 '.$param."\r\n", array(235));
+
+            return true;
+        } catch (Swift_TransportException $e) {
+            $agent->executeCommand("RSET\r\n", array(250));
+
+            return false;
+        }
+    }
+
+    /**
+     * Construct the auth parameter.
+     *
+     * @see https://developers.google.com/google-apps/gmail/xoauth2_protocol#the_sasl_xoauth2_mechanism
+     */
+    protected function constructXOAuth2Params($email, $token)
+    {
+        return base64_encode("user=$email\1auth=Bearer $token\1\1");
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
new file mode 100644
index 000000000..cb36133c9
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
@@ -0,0 +1,263 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An ESMTP handler for AUTH support.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
+{
+    /**
+     * Authenticators available to process the request.
+     *
+     * @var Swift_Transport_Esmtp_Authenticator[]
+     */
+    private $_authenticators = array();
+
+    /**
+     * The username for authentication.
+     *
+     * @var string
+     */
+    private $_username;
+
+    /**
+     * The password for authentication.
+     *
+     * @var string
+     */
+    private $_password;
+
+    /**
+     * The auth mode for authentication.
+     *
+     * @var string
+     */
+    private $_auth_mode;
+
+    /**
+     * The ESMTP AUTH parameters available.
+     *
+     * @var string[]
+     */
+    private $_esmtpParams = array();
+
+    /**
+     * Create a new AuthHandler with $authenticators for support.
+     *
+     * @param Swift_Transport_Esmtp_Authenticator[] $authenticators
+     */
+    public function __construct(array $authenticators)
+    {
+        $this->setAuthenticators($authenticators);
+    }
+
+    /**
+     * Set the Authenticators which can process a login request.
+     *
+     * @param Swift_Transport_Esmtp_Authenticator[] $authenticators
+     */
+    public function setAuthenticators(array $authenticators)
+    {
+        $this->_authenticators = $authenticators;
+    }
+
+    /**
+     * Get the Authenticators which can process a login request.
+     *
+     * @return Swift_Transport_Esmtp_Authenticator[]
+     */
+    public function getAuthenticators()
+    {
+        return $this->_authenticators;
+    }
+
+    /**
+     * Set the username to authenticate with.
+     *
+     * @param string $username
+     */
+    public function setUsername($username)
+    {
+        $this->_username = $username;
+    }
+
+    /**
+     * Get the username to authenticate with.
+     *
+     * @return string
+     */
+    public function getUsername()
+    {
+        return $this->_username;
+    }
+
+    /**
+     * Set the password to authenticate with.
+     *
+     * @param string $password
+     */
+    public function setPassword($password)
+    {
+        $this->_password = $password;
+    }
+
+    /**
+     * Get the password to authenticate with.
+     *
+     * @return string
+     */
+    public function getPassword()
+    {
+        return $this->_password;
+    }
+
+    /**
+     * Set the auth mode to use to authenticate.
+     *
+     * @param string $mode
+     */
+    public function setAuthMode($mode)
+    {
+        $this->_auth_mode = $mode;
+    }
+
+    /**
+     * Get the auth mode to use to authenticate.
+     *
+     * @return string
+     */
+    public function getAuthMode()
+    {
+        return $this->_auth_mode;
+    }
+
+    /**
+     * Get the name of the ESMTP extension this handles.
+     *
+     * @return bool
+     */
+    public function getHandledKeyword()
+    {
+        return 'AUTH';
+    }
+
+    /**
+     * Set the parameters which the EHLO greeting indicated.
+     *
+     * @param string[] $parameters
+     */
+    public function setKeywordParams(array $parameters)
+    {
+        $this->_esmtpParams = $parameters;
+    }
+
+    /**
+     * Runs immediately after a EHLO has been issued.
+     *
+     * @param Swift_Transport_SmtpAgent $agent to read/write
+     */
+    public function afterEhlo(Swift_Transport_SmtpAgent $agent)
+    {
+        if ($this->_username) {
+            $count = 0;
+            foreach ($this->_getAuthenticatorsForAgent() as $authenticator) {
+                if (in_array(strtolower($authenticator->getAuthKeyword()),
+                    array_map('strtolower', $this->_esmtpParams))) {
+                    ++$count;
+                    if ($authenticator->authenticate($agent, $this->_username, $this->_password)) {
+                        return;
+                    }
+                }
+            }
+            throw new Swift_TransportException(
+                'Failed to authenticate on SMTP server with username "'.
+                $this->_username.'" using '.$count.' possible authenticators'
+                );
+        }
+    }
+
+    /**
+     * Not used.
+     */
+    public function getMailParams()
+    {
+        return array();
+    }
+
+    /**
+     * Not used.
+     */
+    public function getRcptParams()
+    {
+        return array();
+    }
+
+    /**
+     * Not used.
+     */
+    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = array(), &$failedRecipients = null, &$stop = false)
+    {
+    }
+
+    /**
+     * Returns +1, -1 or 0 according to the rules for usort().
+     *
+     * This method is called to ensure extensions can be execute in an appropriate order.
+     *
+     * @param string $esmtpKeyword to compare with
+     *
+     * @return int
+     */
+    public function getPriorityOver($esmtpKeyword)
+    {
+        return 0;
+    }
+
+    /**
+     * Returns an array of method names which are exposed to the Esmtp class.
+     *
+     * @return string[]
+     */
+    public function exposeMixinMethods()
+    {
+        return array('setUsername', 'getUsername', 'setPassword', 'getPassword', 'setAuthMode', 'getAuthMode');
+    }
+
+    /**
+     * Not used.
+     */
+    public function resetState()
+    {
+    }
+
+    /**
+     * Returns the authenticator list for the given agent.
+     *
+     * @param Swift_Transport_SmtpAgent $agent
+     *
+     * @return array
+     */
+    protected function _getAuthenticatorsForAgent()
+    {
+        if (!$mode = strtolower($this->_auth_mode)) {
+            return $this->_authenticators;
+        }
+
+        foreach ($this->_authenticators as $authenticator) {
+            if (strtolower($authenticator->getAuthKeyword()) == $mode) {
+                return array($authenticator);
+            }
+        }
+
+        throw new Swift_TransportException('Auth mode '.$mode.' is invalid');
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
new file mode 100644
index 000000000..12a9abf81
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An Authentication mechanism.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_Transport_Esmtp_Authenticator
+{
+    /**
+     * Get the name of the AUTH mechanism this Authenticator handles.
+     *
+     * @return string
+     */
+    public function getAuthKeyword();
+
+    /**
+     * Try to authenticate the user with $username and $password.
+     *
+     * @param Swift_Transport_SmtpAgent $agent
+     * @param string                    $username
+     * @param string                    $password
+     *
+     * @return bool
+     */
+    public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password);
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
new file mode 100644
index 000000000..c17ef8feb
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
@@ -0,0 +1,86 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An ESMTP handler.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_Transport_EsmtpHandler
+{
+    /**
+     * Get the name of the ESMTP extension this handles.
+     *
+     * @return bool
+     */
+    public function getHandledKeyword();
+
+    /**
+     * Set the parameters which the EHLO greeting indicated.
+     *
+     * @param string[] $parameters
+     */
+    public function setKeywordParams(array $parameters);
+
+    /**
+     * Runs immediately after a EHLO has been issued.
+     *
+     * @param Swift_Transport_SmtpAgent $agent to read/write
+     */
+    public function afterEhlo(Swift_Transport_SmtpAgent $agent);
+
+    /**
+     * Get params which are appended to MAIL FROM:<>.
+     *
+     * @return string[]
+     */
+    public function getMailParams();
+
+    /**
+     * Get params which are appended to RCPT TO:<>.
+     *
+     * @return string[]
+     */
+    public function getRcptParams();
+
+    /**
+     * Runs when a command is due to be sent.
+     *
+     * @param Swift_Transport_SmtpAgent $agent            to read/write
+     * @param string                    $command          to send
+     * @param int[]                     $codes            expected in response
+     * @param string[]                  $failedRecipients to collect failures
+     * @param bool                      $stop             to be set true  by-reference if the command is now sent
+     */
+    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = array(), &$failedRecipients = null, &$stop = false);
+
+    /**
+     * Returns +1, -1 or 0 according to the rules for usort().
+     *
+     * This method is called to ensure extensions can be execute in an appropriate order.
+     *
+     * @param string $esmtpKeyword to compare with
+     *
+     * @return int
+     */
+    public function getPriorityOver($esmtpKeyword);
+
+    /**
+     * Returns an array of method names which are exposed to the Esmtp class.
+     *
+     * @return string[]
+     */
+    public function exposeMixinMethods();
+
+    /**
+     * Tells this handler to clear any buffers and reset its state.
+     */
+    public function resetState();
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
new file mode 100644
index 000000000..a220e6fa3
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
@@ -0,0 +1,413 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Sends Messages over SMTP with ESMTP support.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTransport implements Swift_Transport_SmtpAgent
+{
+    /**
+     * ESMTP extension handlers.
+     *
+     * @var Swift_Transport_EsmtpHandler[]
+     */
+    private $_handlers = array();
+
+    /**
+     * ESMTP capabilities.
+     *
+     * @var string[]
+     */
+    private $_capabilities = array();
+
+    /**
+     * Connection buffer parameters.
+     *
+     * @var array
+     */
+    private $_params = array(
+        'protocol' => 'tcp',
+        'host' => 'localhost',
+        'port' => 25,
+        'timeout' => 30,
+        'blocking' => 1,
+        'tls' => false,
+        'type' => Swift_Transport_IoBuffer::TYPE_SOCKET,
+        'stream_context_options' => array(),
+        );
+
+    /**
+     * Creates a new EsmtpTransport using the given I/O buffer.
+     *
+     * @param Swift_Transport_IoBuffer       $buf
+     * @param Swift_Transport_EsmtpHandler[] $extensionHandlers
+     * @param Swift_Events_EventDispatcher   $dispatcher
+     */
+    public function __construct(Swift_Transport_IoBuffer $buf, array $extensionHandlers, Swift_Events_EventDispatcher $dispatcher)
+    {
+        parent::__construct($buf, $dispatcher);
+        $this->setExtensionHandlers($extensionHandlers);
+    }
+
+    /**
+     * Set the host to connect to.
+     *
+     * @param string $host
+     *
+     * @return Swift_Transport_EsmtpTransport
+     */
+    public function setHost($host)
+    {
+        $this->_params['host'] = $host;
+
+        return $this;
+    }
+
+    /**
+     * Get the host to connect to.
+     *
+     * @return string
+     */
+    public function getHost()
+    {
+        return $this->_params['host'];
+    }
+
+    /**
+     * Set the port to connect to.
+     *
+     * @param int $port
+     *
+     * @return Swift_Transport_EsmtpTransport
+     */
+    public function setPort($port)
+    {
+        $this->_params['port'] = (int) $port;
+
+        return $this;
+    }
+
+    /**
+     * Get the port to connect to.
+     *
+     * @return int
+     */
+    public function getPort()
+    {
+        return $this->_params['port'];
+    }
+
+    /**
+     * Set the connection timeout.
+     *
+     * @param int $timeout seconds
+     *
+     * @return Swift_Transport_EsmtpTransport
+     */
+    public function setTimeout($timeout)
+    {
+        $this->_params['timeout'] = (int) $timeout;
+        $this->_buffer->setParam('timeout', (int) $timeout);
+
+        return $this;
+    }
+
+    /**
+     * Get the connection timeout.
+     *
+     * @return int
+     */
+    public function getTimeout()
+    {
+        return $this->_params['timeout'];
+    }
+
+    /**
+     * Set the encryption type (tls or ssl).
+     *
+     * @param string $encryption
+     *
+     * @return Swift_Transport_EsmtpTransport
+     */
+    public function setEncryption($encryption)
+    {
+        $encryption = strtolower($encryption);    
+        if ('tls' == $encryption) {
+            $this->_params['protocol'] = 'tcp';
+            $this->_params['tls'] = true;
+        } else {
+            $this->_params['protocol'] = $encryption;
+            $this->_params['tls'] = false;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Get the encryption type.
+     *
+     * @return string
+     */
+    public function getEncryption()
+    {
+        return $this->_params['tls'] ? 'tls' : $this->_params['protocol'];
+    }
+
+    /**
+     * Sets the stream context options.
+     *
+     * @param array $options
+     *
+     * @return Swift_Transport_EsmtpTransport
+     */
+    public function setStreamOptions($options)
+    {
+        $this->_params['stream_context_options'] = $options;
+
+        return $this;
+    }
+
+    /**
+     * Returns the stream context options.
+     *
+     * @return array
+     */
+    public function getStreamOptions()
+    {
+        return $this->_params['stream_context_options'];
+    }
+
+    /**
+     * Sets the source IP.
+     *
+     * @param string $source
+     *
+     * @return Swift_Transport_EsmtpTransport
+     */
+    public function setSourceIp($source)
+    {
+        $this->_params['sourceIp'] = $source;
+
+        return $this;
+    }
+
+    /**
+     * Returns the IP used to connect to the destination.
+     *
+     * @return string
+     */
+    public function getSourceIp()
+    {
+        return isset($this->_params['sourceIp']) ? $this->_params['sourceIp'] : null;
+    }
+
+    /**
+     * Set ESMTP extension handlers.
+     *
+     * @param Swift_Transport_EsmtpHandler[] $handlers
+     *
+     * @return Swift_Transport_EsmtpTransport
+     */
+    public function setExtensionHandlers(array $handlers)
+    {
+        $assoc = array();
+        foreach ($handlers as $handler) {
+            $assoc[$handler->getHandledKeyword()] = $handler;
+        }
+
+        @uasort($assoc, array($this, '_sortHandlers'));
+        $this->_handlers = $assoc;
+        $this->_setHandlerParams();
+
+        return $this;
+    }
+
+    /**
+     * Get ESMTP extension handlers.
+     *
+     * @return Swift_Transport_EsmtpHandler[]
+     */
+    public function getExtensionHandlers()
+    {
+        return array_values($this->_handlers);
+    }
+
+    /**
+     * Run a command against the buffer, expecting the given response codes.
+     *
+     * If no response codes are given, the response will not be validated.
+     * If codes are given, an exception will be thrown on an invalid response.
+     *
+     * @param string   $command
+     * @param int[]    $codes
+     * @param string[] $failures An array of failures by-reference
+     *
+     * @return string
+     */
+    public function executeCommand($command, $codes = array(), &$failures = null)
+    {
+        $failures = (array) $failures;
+        $stopSignal = false;
+        $response = null;
+        foreach ($this->_getActiveHandlers() as $handler) {
+            $response = $handler->onCommand(
+                $this, $command, $codes, $failures, $stopSignal
+                );
+            if ($stopSignal) {
+                return $response;
+            }
+        }
+
+        return parent::executeCommand($command, $codes, $failures);
+    }
+
+    // -- Mixin invocation code
+
+    /** Mixin handling method for ESMTP handlers */
+    public function __call($method, $args)
+    {
+        foreach ($this->_handlers as $handler) {
+            if (in_array(strtolower($method),
+                array_map('strtolower', (array) $handler->exposeMixinMethods())
+                )) {
+                $return = call_user_func_array(array($handler, $method), $args);
+                // Allow fluid method calls
+                if (is_null($return) && substr($method, 0, 3) == 'set') {
+                    return $this;
+                } else {
+                    return $return;
+                }
+            }
+        }
+        trigger_error('Call to undefined method '.$method, E_USER_ERROR);
+    }
+
+    /** Get the params to initialize the buffer */
+    protected function _getBufferParams()
+    {
+        return $this->_params;
+    }
+
+    /** Overridden to perform EHLO instead */
+    protected function _doHeloCommand()
+    {
+        try {
+            $response = $this->executeCommand(
+                sprintf("EHLO %s\r\n", $this->_domain), array(250)
+                );
+        } catch (Swift_TransportException $e) {
+            return parent::_doHeloCommand();
+        }
+
+        if ($this->_params['tls']) {
+            try {
+                $this->executeCommand("STARTTLS\r\n", array(220));
+
+                if (!$this->_buffer->startTLS()) {
+                    throw new Swift_TransportException('Unable to connect with TLS encryption');
+                }
+
+                try {
+                    $response = $this->executeCommand(
+                        sprintf("EHLO %s\r\n", $this->_domain), array(250)
+                        );
+                } catch (Swift_TransportException $e) {
+                    return parent::_doHeloCommand();
+                }
+            } catch (Swift_TransportException $e) {
+                $this->_throwException($e);
+            }
+        }
+
+        $this->_capabilities = $this->_getCapabilities($response);
+        $this->_setHandlerParams();
+        foreach ($this->_getActiveHandlers() as $handler) {
+            $handler->afterEhlo($this);
+        }
+    }
+
+    /** Overridden to add Extension support */
+    protected function _doMailFromCommand($address)
+    {
+        $handlers = $this->_getActiveHandlers();
+        $params = array();
+        foreach ($handlers as $handler) {
+            $params = array_merge($params, (array) $handler->getMailParams());
+        }
+        $paramStr = !empty($params) ? ' '.implode(' ', $params) : '';
+        $this->executeCommand(
+            sprintf("MAIL FROM:<%s>%s\r\n", $address, $paramStr), array(250)
+            );
+    }
+
+    /** Overridden to add Extension support */
+    protected function _doRcptToCommand($address)
+    {
+        $handlers = $this->_getActiveHandlers();
+        $params = array();
+        foreach ($handlers as $handler) {
+            $params = array_merge($params, (array) $handler->getRcptParams());
+        }
+        $paramStr = !empty($params) ? ' '.implode(' ', $params) : '';
+        $this->executeCommand(
+            sprintf("RCPT TO:<%s>%s\r\n", $address, $paramStr), array(250, 251, 252)
+            );
+    }
+
+    /** Determine ESMTP capabilities by function group */
+    private function _getCapabilities($ehloResponse)
+    {
+        $capabilities = array();
+        $ehloResponse = trim($ehloResponse);
+        $lines = explode("\r\n", $ehloResponse);
+        array_shift($lines);
+        foreach ($lines as $line) {
+            if (preg_match('/^[0-9]{3}[ -]([A-Z0-9-]+)((?:[ =].*)?)$/Di', $line, $matches)) {
+                $keyword = strtoupper($matches[1]);
+                $paramStr = strtoupper(ltrim($matches[2], ' ='));
+                $params = !empty($paramStr) ? explode(' ', $paramStr) : array();
+                $capabilities[$keyword] = $params;
+            }
+        }
+
+        return $capabilities;
+    }
+
+    /** Set parameters which are used by each extension handler */
+    private function _setHandlerParams()
+    {
+        foreach ($this->_handlers as $keyword => $handler) {
+            if (array_key_exists($keyword, $this->_capabilities)) {
+                $handler->setKeywordParams($this->_capabilities[$keyword]);
+            }
+        }
+    }
+
+    /** Get ESMTP handlers which are currently ok to use */
+    private function _getActiveHandlers()
+    {
+        $handlers = array();
+        foreach ($this->_handlers as $keyword => $handler) {
+            if (array_key_exists($keyword, $this->_capabilities)) {
+                $handlers[] = $handler;
+            }
+        }
+
+        return $handlers;
+    }
+
+    /** Custom sort for extension handler ordering */
+    private function _sortHandlers($a, $b)
+    {
+        return $a->getPriorityOver($b->getHandledKeyword());
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php
new file mode 100644
index 000000000..311a0f2ad
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php
@@ -0,0 +1,88 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Contains a list of redundant Transports so when one fails, the next is used.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Transport_FailoverTransport extends Swift_Transport_LoadBalancedTransport
+{
+    /**
+     * Registered transport currently used.
+     *
+     * @var Swift_Transport
+     */
+    private $_currentTransport;
+
+    // needed as __construct is called from elsewhere explicitly
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Send the given Message.
+     *
+     * Recipient/sender data will be retrieved from the Message API.
+     * The return value is the number of recipients who were accepted for delivery.
+     *
+     * @param Swift_Mime_Message $message
+     * @param string[]           $failedRecipients An array of failures by-reference
+     *
+     * @return int
+     */
+    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    {
+        $maxTransports = count($this->_transports);
+        $sent = 0;
+        $this->_lastUsedTransport = null;
+
+        for ($i = 0; $i < $maxTransports
+            && $transport = $this->_getNextTransport(); ++$i) {
+            try {
+                if (!$transport->isStarted()) {
+                    $transport->start();
+                }
+
+                if ($sent = $transport->send($message, $failedRecipients)) {
+                    $this->_lastUsedTransport = $transport;
+
+                    return $sent;
+                }
+            } catch (Swift_TransportException $e) {
+                $this->_killCurrentTransport();
+            }
+        }
+
+        if (count($this->_transports) == 0) {
+            throw new Swift_TransportException(
+                'All Transports in FailoverTransport failed, or no Transports available'
+                );
+        }
+
+        return $sent;
+    }
+
+    protected function _getNextTransport()
+    {
+        if (!isset($this->_currentTransport)) {
+            $this->_currentTransport = parent::_getNextTransport();
+        }
+
+        return $this->_currentTransport;
+    }
+
+    protected function _killCurrentTransport()
+    {
+        $this->_currentTransport = null;
+        parent::_killCurrentTransport();
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php
new file mode 100644
index 000000000..af97adf1f
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Buffers input and output to a resource.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_Transport_IoBuffer extends Swift_InputByteStream, Swift_OutputByteStream
+{
+    /** A socket buffer over TCP */
+    const TYPE_SOCKET = 0x0001;
+
+    /** A process buffer with I/O support */
+    const TYPE_PROCESS = 0x0010;
+
+    /**
+     * Perform any initialization needed, using the given $params.
+     *
+     * Parameters will vary depending upon the type of IoBuffer used.
+     *
+     * @param array $params
+     */
+    public function initialize(array $params);
+
+    /**
+     * Set an individual param on the buffer (e.g. switching to SSL).
+     *
+     * @param string $param
+     * @param mixed  $value
+     */
+    public function setParam($param, $value);
+
+    /**
+     * Perform any shutdown logic needed.
+     */
+    public function terminate();
+
+    /**
+     * Set an array of string replacements which should be made on data written
+     * to the buffer.
+     *
+     * This could replace LF with CRLF for example.
+     *
+     * @param string[] $replacements
+     */
+    public function setWriteTranslations(array $replacements);
+
+    /**
+     * Get a line of output (including any CRLF).
+     *
+     * The $sequence number comes from any writes and may or may not be used
+     * depending upon the implementation.
+     *
+     * @param int $sequence of last write to scan from
+     *
+     * @return string
+     */
+    public function readLine($sequence);
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
new file mode 100644
index 000000000..e2adc567e
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
@@ -0,0 +1,183 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Redundantly and rotationally uses several Transports when sending.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Transport_LoadBalancedTransport implements Swift_Transport
+{
+    /**
+     * Transports which are deemed useless.
+     *
+     * @var Swift_Transport[]
+     */
+    private $_deadTransports = array();
+
+    /**
+     * The Transports which are used in rotation.
+     *
+     * @var Swift_Transport[]
+     */
+    protected $_transports = array();
+
+    /**
+     * The Transport used in the last successful send operation.
+     *
+     * @var Swift_Transport
+     */
+    protected $_lastUsedTransport = null;
+
+    // needed as __construct is called from elsewhere explicitly
+    public function __construct()
+    {
+    }
+
+    /**
+     * Set $transports to delegate to.
+     *
+     * @param Swift_Transport[] $transports
+     */
+    public function setTransports(array $transports)
+    {
+        $this->_transports = $transports;
+        $this->_deadTransports = array();
+    }
+
+    /**
+     * Get $transports to delegate to.
+     *
+     * @return Swift_Transport[]
+     */
+    public function getTransports()
+    {
+        return array_merge($this->_transports, $this->_deadTransports);
+    }
+
+    /**
+     * Get the Transport used in the last successful send operation.
+     *
+     * @return Swift_Transport
+     */
+    public function getLastUsedTransport()
+    {
+        return $this->_lastUsedTransport;
+    }
+
+    /**
+     * Test if this Transport mechanism has started.
+     *
+     * @return bool
+     */
+    public function isStarted()
+    {
+        return count($this->_transports) > 0;
+    }
+
+    /**
+     * Start this Transport mechanism.
+     */
+    public function start()
+    {
+        $this->_transports = array_merge($this->_transports, $this->_deadTransports);
+    }
+
+    /**
+     * Stop this Transport mechanism.
+     */
+    public function stop()
+    {
+        foreach ($this->_transports as $transport) {
+            $transport->stop();
+        }
+    }
+
+    /**
+     * Send the given Message.
+     *
+     * Recipient/sender data will be retrieved from the Message API.
+     * The return value is the number of recipients who were accepted for delivery.
+     *
+     * @param Swift_Mime_Message $message
+     * @param string[]           $failedRecipients An array of failures by-reference
+     *
+     * @return int
+     */
+    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    {
+        $maxTransports = count($this->_transports);
+        $sent = 0;
+        $this->_lastUsedTransport = null;
+
+        for ($i = 0; $i < $maxTransports
+            && $transport = $this->_getNextTransport(); ++$i) {
+            try {
+                if (!$transport->isStarted()) {
+                    $transport->start();
+                }
+                if ($sent = $transport->send($message, $failedRecipients)) {
+                    $this->_lastUsedTransport = $transport;
+                    break;
+                }
+            } catch (Swift_TransportException $e) {
+                $this->_killCurrentTransport();
+            }
+        }
+
+        if (count($this->_transports) == 0) {
+            throw new Swift_TransportException(
+                'All Transports in LoadBalancedTransport failed, or no Transports available'
+                );
+        }
+
+        return $sent;
+    }
+
+    /**
+     * Register a plugin.
+     *
+     * @param Swift_Events_EventListener $plugin
+     */
+    public function registerPlugin(Swift_Events_EventListener $plugin)
+    {
+        foreach ($this->_transports as $transport) {
+            $transport->registerPlugin($plugin);
+        }
+    }
+
+    /**
+     * Rotates the transport list around and returns the first instance.
+     *
+     * @return Swift_Transport
+     */
+    protected function _getNextTransport()
+    {
+        if ($next = array_shift($this->_transports)) {
+            $this->_transports[] = $next;
+        }
+
+        return $next;
+    }
+
+    /**
+     * Tag the currently used (top of stack) transport as dead/useless.
+     */
+    protected function _killCurrentTransport()
+    {
+        if ($transport = array_pop($this->_transports)) {
+            try {
+                $transport->stop();
+            } catch (Exception $e) {
+            }
+            $this->_deadTransports[] = $transport;
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php
new file mode 100644
index 000000000..77489cedc
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * This interface intercepts calls to the mail() function.
+ *
+ * @author     Chris Corbyn
+ */
+interface Swift_Transport_MailInvoker
+{
+    /**
+     * Send mail via the mail() function.
+     *
+     * This method takes the same arguments as PHP mail().
+     *
+     * @param string $to
+     * @param string $subject
+     * @param string $body
+     * @param string $headers
+     * @param string $extraParams
+     *
+     * @return bool
+     */
+    public function mail($to, $subject, $body, $headers = null, $extraParams = null);
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/MailTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/MailTransport.php
new file mode 100644
index 000000000..351936d8b
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/MailTransport.php
@@ -0,0 +1,257 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Sends Messages using the mail() function.
+ *
+ * It is advised that users do not use this transport if at all possible
+ * since a number of plugin features cannot be used in conjunction with this
+ * transport due to the internal interface in PHP itself.
+ *
+ * The level of error reporting with this transport is incredibly weak, again
+ * due to limitations of PHP's internal mail() function.  You'll get an
+ * all-or-nothing result from sending.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Transport_MailTransport implements Swift_Transport
+{
+    /** Additional parameters to pass to mail() */
+    private $_extraParams = '-f%s';
+
+    /** The event dispatcher from the plugin API */
+    private $_eventDispatcher;
+
+    /** An invoker that calls the mail() function */
+    private $_invoker;
+
+    /**
+     * Create a new MailTransport with the $log.
+     *
+     * @param Swift_Transport_MailInvoker  $invoker
+     * @param Swift_Events_EventDispatcher $eventDispatcher
+     */
+    public function __construct(Swift_Transport_MailInvoker $invoker, Swift_Events_EventDispatcher $eventDispatcher)
+    {
+        $this->_invoker = $invoker;
+        $this->_eventDispatcher = $eventDispatcher;
+    }
+
+    /**
+     * Not used.
+     */
+    public function isStarted()
+    {
+        return false;
+    }
+
+    /**
+     * Not used.
+     */
+    public function start()
+    {
+    }
+
+    /**
+     * Not used.
+     */
+    public function stop()
+    {
+    }
+
+    /**
+     * Set the additional parameters used on the mail() function.
+     *
+     * This string is formatted for sprintf() where %s is the sender address.
+     *
+     * @param string $params
+     *
+     * @return Swift_Transport_MailTransport
+     */
+    public function setExtraParams($params)
+    {
+        $this->_extraParams = $params;
+
+        return $this;
+    }
+
+    /**
+     * Get the additional parameters used on the mail() function.
+     *
+     * This string is formatted for sprintf() where %s is the sender address.
+     *
+     * @return string
+     */
+    public function getExtraParams()
+    {
+        return $this->_extraParams;
+    }
+
+    /**
+     * Send the given Message.
+     *
+     * Recipient/sender data will be retrieved from the Message API.
+     * The return value is the number of recipients who were accepted for delivery.
+     *
+     * @param Swift_Mime_Message $message
+     * @param string[]           $failedRecipients An array of failures by-reference
+     *
+     * @return int
+     */
+    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    {
+        $failedRecipients = (array) $failedRecipients;
+
+        if ($evt = $this->_eventDispatcher->createSendEvent($this, $message)) {
+            $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
+            if ($evt->bubbleCancelled()) {
+                return 0;
+            }
+        }
+
+        $count = (
+            count((array) $message->getTo())
+            + count((array) $message->getCc())
+            + count((array) $message->getBcc())
+            );
+
+        $toHeader = $message->getHeaders()->get('To');
+        $subjectHeader = $message->getHeaders()->get('Subject');
+
+        if (0 === $count) {
+            $this->_throwException(new Swift_TransportException('Cannot send message without a recipient'));
+        }
+        $to = $toHeader ? $toHeader->getFieldBody() : '';
+        $subject = $subjectHeader ? $subjectHeader->getFieldBody() : '';
+
+        $reversePath = $this->_getReversePath($message);
+
+        // Remove headers that would otherwise be duplicated
+        $message->getHeaders()->remove('To');
+        $message->getHeaders()->remove('Subject');
+
+        $messageStr = $message->toString();
+
+        if ($toHeader) {
+            $message->getHeaders()->set($toHeader);
+        }
+        $message->getHeaders()->set($subjectHeader);
+
+        // Separate headers from body
+        if (false !== $endHeaders = strpos($messageStr, "\r\n\r\n")) {
+            $headers = substr($messageStr, 0, $endHeaders)."\r\n"; //Keep last EOL
+            $body = substr($messageStr, $endHeaders + 4);
+        } else {
+            $headers = $messageStr."\r\n";
+            $body = '';
+        }
+
+        unset($messageStr);
+
+        if ("\r\n" != PHP_EOL) {
+            // Non-windows (not using SMTP)
+            $headers = str_replace("\r\n", PHP_EOL, $headers);
+            $subject = str_replace("\r\n", PHP_EOL, $subject);
+            $body = str_replace("\r\n", PHP_EOL, $body);
+        } else {
+            // Windows, using SMTP
+            $headers = str_replace("\r\n.", "\r\n..", $headers);
+            $subject = str_replace("\r\n.", "\r\n..", $subject);
+            $body = str_replace("\r\n.", "\r\n..", $body);
+        }
+
+        if ($this->_invoker->mail($to, $subject, $body, $headers, $this->_formatExtraParams($this->_extraParams, $reversePath))) {
+            if ($evt) {
+                $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
+                $evt->setFailedRecipients($failedRecipients);
+                $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
+            }
+        } else {
+            $failedRecipients = array_merge(
+                $failedRecipients,
+                array_keys((array) $message->getTo()),
+                array_keys((array) $message->getCc()),
+                array_keys((array) $message->getBcc())
+                );
+
+            if ($evt) {
+                $evt->setResult(Swift_Events_SendEvent::RESULT_FAILED);
+                $evt->setFailedRecipients($failedRecipients);
+                $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
+            }
+
+            $message->generateId();
+
+            $count = 0;
+        }
+
+        return $count;
+    }
+
+    /**
+     * Register a plugin.
+     *
+     * @param Swift_Events_EventListener $plugin
+     */
+    public function registerPlugin(Swift_Events_EventListener $plugin)
+    {
+        $this->_eventDispatcher->bindEventListener($plugin);
+    }
+
+    /** Throw a TransportException, first sending it to any listeners */
+    protected function _throwException(Swift_TransportException $e)
+    {
+        if ($evt = $this->_eventDispatcher->createTransportExceptionEvent($this, $e)) {
+            $this->_eventDispatcher->dispatchEvent($evt, 'exceptionThrown');
+            if (!$evt->bubbleCancelled()) {
+                throw $e;
+            }
+        } else {
+            throw $e;
+        }
+    }
+
+    /** Determine the best-use reverse path for this message */
+    private function _getReversePath(Swift_Mime_Message $message)
+    {
+        $return = $message->getReturnPath();
+        $sender = $message->getSender();
+        $from = $message->getFrom();
+        $path = null;
+        if (!empty($return)) {
+            $path = $return;
+        } elseif (!empty($sender)) {
+            $keys = array_keys($sender);
+            $path = array_shift($keys);
+        } elseif (!empty($from)) {
+            $keys = array_keys($from);
+            $path = array_shift($keys);
+        }
+
+        return $path;
+    }
+
+    /**
+     * Return php mail extra params to use for invoker->mail.
+     *
+     * @param $extraParams
+     * @param $reversePath
+     *
+     * @return string|null
+     */
+    private function _formatExtraParams($extraParams, $reversePath)
+    {
+        if (false !== strpos($extraParams, '-f%s')) {
+            $extraParams = empty($reversePath) ? str_replace('-f%s', '', $extraParams) : sprintf($extraParams, escapeshellarg($reversePath));
+        }
+
+        return !empty($extraParams) ? $extraParams : null;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/NullTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
new file mode 100644
index 000000000..ad20e0e53
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
@@ -0,0 +1,93 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2009 Fabien Potencier <fabien.potencier@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Pretends messages have been sent, but just ignores them.
+ *
+ * @author Fabien Potencier
+ */
+class Swift_Transport_NullTransport implements Swift_Transport
+{
+    /** The event dispatcher from the plugin API */
+    private $_eventDispatcher;
+
+    /**
+     * Constructor.
+     */
+    public function __construct(Swift_Events_EventDispatcher $eventDispatcher)
+    {
+        $this->_eventDispatcher = $eventDispatcher;
+    }
+
+    /**
+     * Tests if this Transport mechanism has started.
+     *
+     * @return bool
+     */
+    public function isStarted()
+    {
+        return true;
+    }
+
+    /**
+     * Starts this Transport mechanism.
+     */
+    public function start()
+    {
+    }
+
+    /**
+     * Stops this Transport mechanism.
+     */
+    public function stop()
+    {
+    }
+
+    /**
+     * Sends the given message.
+     *
+     * @param Swift_Mime_Message $message
+     * @param string[]           $failedRecipients An array of failures by-reference
+     *
+     * @return int The number of sent emails
+     */
+    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    {
+        if ($evt = $this->_eventDispatcher->createSendEvent($this, $message)) {
+            $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
+            if ($evt->bubbleCancelled()) {
+                return 0;
+            }
+        }
+
+        if ($evt) {
+            $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
+            $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
+        }
+
+        $count = (
+            count((array) $message->getTo())
+            + count((array) $message->getCc())
+            + count((array) $message->getBcc())
+            );
+
+        return $count;
+    }
+
+    /**
+     * Register a plugin.
+     *
+     * @param Swift_Events_EventListener $plugin
+     */
+    public function registerPlugin(Swift_Events_EventListener $plugin)
+    {
+        $this->_eventDispatcher->bindEventListener($plugin);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
new file mode 100644
index 000000000..34ac4ce3a
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
@@ -0,0 +1,160 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * SendmailTransport for sending mail through a Sendmail/Postfix (etc..) binary.
+ *
+ * Supported modes are -bs and -t, with any additional flags desired.
+ * It is advised to use -bs mode since error reporting with -t mode is not
+ * possible.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTransport
+{
+    /**
+     * Connection buffer parameters.
+     *
+     * @var array
+     */
+    private $_params = array(
+        'timeout' => 30,
+        'blocking' => 1,
+        'command' => '/usr/sbin/sendmail -bs',
+        'type' => Swift_Transport_IoBuffer::TYPE_PROCESS,
+        );
+
+    /**
+     * Create a new SendmailTransport with $buf for I/O.
+     *
+     * @param Swift_Transport_IoBuffer     $buf
+     * @param Swift_Events_EventDispatcher $dispatcher
+     */
+    public function __construct(Swift_Transport_IoBuffer $buf, Swift_Events_EventDispatcher $dispatcher)
+    {
+        parent::__construct($buf, $dispatcher);
+    }
+
+    /**
+     * Start the standalone SMTP session if running in -bs mode.
+     */
+    public function start()
+    {
+        if (false !== strpos($this->getCommand(), ' -bs')) {
+            parent::start();
+        }
+    }
+
+    /**
+     * Set the command to invoke.
+     *
+     * If using -t mode you are strongly advised to include -oi or -i in the flags.
+     * For example: /usr/sbin/sendmail -oi -t
+     * Swift will append a -f<sender> flag if one is not present.
+     *
+     * The recommended mode is "-bs" since it is interactive and failure notifications
+     * are hence possible.
+     *
+     * @param string $command
+     *
+     * @return Swift_Transport_SendmailTransport
+     */
+    public function setCommand($command)
+    {
+        $this->_params['command'] = $command;
+
+        return $this;
+    }
+
+    /**
+     * Get the sendmail command which will be invoked.
+     *
+     * @return string
+     */
+    public function getCommand()
+    {
+        return $this->_params['command'];
+    }
+
+    /**
+     * Send the given Message.
+     *
+     * Recipient/sender data will be retrieved from the Message API.
+     *
+     * The return value is the number of recipients who were accepted for delivery.
+     * NOTE: If using 'sendmail -t' you will not be aware of any failures until
+     * they bounce (i.e. send() will always return 100% success).
+     *
+     * @param Swift_Mime_Message $message
+     * @param string[]           $failedRecipients An array of failures by-reference
+     *
+     * @return int
+     */
+    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    {
+        $failedRecipients = (array) $failedRecipients;
+        $command = $this->getCommand();
+        $buffer = $this->getBuffer();
+        $count = 0;
+
+        if (false !== strpos($command, ' -t')) {
+            if ($evt = $this->_eventDispatcher->createSendEvent($this, $message)) {
+                $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
+                if ($evt->bubbleCancelled()) {
+                    return 0;
+                }
+            }
+
+            if (false === strpos($command, ' -f')) {
+                $command .= ' -f'.escapeshellarg($this->_getReversePath($message));
+            }
+
+            $buffer->initialize(array_merge($this->_params, array('command' => $command)));
+
+            if (false === strpos($command, ' -i') && false === strpos($command, ' -oi')) {
+                $buffer->setWriteTranslations(array("\r\n" => "\n", "\n." => "\n.."));
+            } else {
+                $buffer->setWriteTranslations(array("\r\n" => "\n"));
+            }
+
+            $count = count((array) $message->getTo())
+                + count((array) $message->getCc())
+                + count((array) $message->getBcc())
+                ;
+            $message->toByteStream($buffer);
+            $buffer->flushBuffers();
+            $buffer->setWriteTranslations(array());
+            $buffer->terminate();
+
+            if ($evt) {
+                $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
+                $evt->setFailedRecipients($failedRecipients);
+                $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
+            }
+
+            $message->generateId();
+        } elseif (false !== strpos($command, ' -bs')) {
+            $count = parent::send($message, $failedRecipients);
+        } else {
+            $this->_throwException(new Swift_TransportException(
+                'Unsupported sendmail command flags ['.$command.']. '.
+                'Must be one of "-bs" or "-t" but can include additional flags.'
+                ));
+        }
+
+        return $count;
+    }
+
+    /** Get the params to initialize the buffer */
+    protected function _getBufferParams()
+    {
+        return $this->_params;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php
new file mode 100644
index 000000000..4cab66bd6
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * This is the implementation class for {@link Swift_Transport_MailInvoker}.
+ *
+ * @author     Chris Corbyn
+ */
+class Swift_Transport_SimpleMailInvoker implements Swift_Transport_MailInvoker
+{
+    /**
+     * Send mail via the mail() function.
+     *
+     * This method takes the same arguments as PHP mail().
+     *
+     * @param string $to
+     * @param string $subject
+     * @param string $body
+     * @param string $headers
+     * @param string $extraParams
+     *
+     * @return bool
+     */
+    public function mail($to, $subject, $body, $headers = null, $extraParams = null)
+    {
+        if (!ini_get('safe_mode')) {
+            return @mail($to, $subject, $body, $headers, $extraParams);
+        }
+
+        return @mail($to, $subject, $body, $headers);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php
new file mode 100644
index 000000000..90e913f8e
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Wraps an IoBuffer to send/receive SMTP commands/responses.
+ *
+ * @author Chris Corbyn
+ */
+interface Swift_Transport_SmtpAgent
+{
+    /**
+     * Get the IoBuffer where read/writes are occurring.
+     *
+     * @return Swift_Transport_IoBuffer
+     */
+    public function getBuffer();
+
+    /**
+     * Run a command against the buffer, expecting the given response codes.
+     *
+     * If no response codes are given, the response will not be validated.
+     * If codes are given, an exception will be thrown on an invalid response.
+     *
+     * @param string   $command
+     * @param int[]    $codes
+     * @param string[] $failures An array of failures by-reference
+     */
+    public function executeCommand($command, $codes = array(), &$failures = null);
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
new file mode 100644
index 000000000..55a799245
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
@@ -0,0 +1,117 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2009 Fabien Potencier <fabien.potencier@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Stores Messages in a queue.
+ *
+ * @author Fabien Potencier
+ */
+class Swift_Transport_SpoolTransport implements Swift_Transport
+{
+    /** The spool instance */
+    private $_spool;
+
+    /** The event dispatcher from the plugin API */
+    private $_eventDispatcher;
+
+    /**
+     * Constructor.
+     */
+    public function __construct(Swift_Events_EventDispatcher $eventDispatcher, Swift_Spool $spool = null)
+    {
+        $this->_eventDispatcher = $eventDispatcher;
+        $this->_spool = $spool;
+    }
+
+    /**
+     * Sets the spool object.
+     *
+     * @param Swift_Spool $spool
+     *
+     * @return Swift_Transport_SpoolTransport
+     */
+    public function setSpool(Swift_Spool $spool)
+    {
+        $this->_spool = $spool;
+
+        return $this;
+    }
+
+    /**
+     * Get the spool object.
+     *
+     * @return Swift_Spool
+     */
+    public function getSpool()
+    {
+        return $this->_spool;
+    }
+
+    /**
+     * Tests if this Transport mechanism has started.
+     *
+     * @return bool
+     */
+    public function isStarted()
+    {
+        return true;
+    }
+
+    /**
+     * Starts this Transport mechanism.
+     */
+    public function start()
+    {
+    }
+
+    /**
+     * Stops this Transport mechanism.
+     */
+    public function stop()
+    {
+    }
+
+    /**
+     * Sends the given message.
+     *
+     * @param Swift_Mime_Message $message
+     * @param string[]           $failedRecipients An array of failures by-reference
+     *
+     * @return int The number of sent e-mail's
+     */
+    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    {
+        if ($evt = $this->_eventDispatcher->createSendEvent($this, $message)) {
+            $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
+            if ($evt->bubbleCancelled()) {
+                return 0;
+            }
+        }
+
+        $success = $this->_spool->queueMessage($message);
+
+        if ($evt) {
+            $evt->setResult($success ? Swift_Events_SendEvent::RESULT_SPOOLED : Swift_Events_SendEvent::RESULT_FAILED);
+            $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
+        }
+
+        return 1;
+    }
+
+    /**
+     * Register a plugin.
+     *
+     * @param Swift_Events_EventListener $plugin
+     */
+    public function registerPlugin(Swift_Events_EventListener $plugin)
+    {
+        $this->_eventDispatcher->bindEventListener($plugin);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
new file mode 100644
index 000000000..5134ea48a
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
@@ -0,0 +1,325 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A generic IoBuffer implementation supporting remote sockets and local processes.
+ *
+ * @author Chris Corbyn
+ */
+class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableInputStream implements Swift_Transport_IoBuffer
+{
+    /** A primary socket */
+    private $_stream;
+
+    /** The input stream */
+    private $_in;
+
+    /** The output stream */
+    private $_out;
+
+    /** Buffer initialization parameters */
+    private $_params = array();
+
+    /** The ReplacementFilterFactory */
+    private $_replacementFactory;
+
+    /** Translations performed on data being streamed into the buffer */
+    private $_translations = array();
+
+    /**
+     * Create a new StreamBuffer using $replacementFactory for transformations.
+     *
+     * @param Swift_ReplacementFilterFactory $replacementFactory
+     */
+    public function __construct(Swift_ReplacementFilterFactory $replacementFactory)
+    {
+        $this->_replacementFactory = $replacementFactory;
+    }
+
+    /**
+     * Perform any initialization needed, using the given $params.
+     *
+     * Parameters will vary depending upon the type of IoBuffer used.
+     *
+     * @param array $params
+     */
+    public function initialize(array $params)
+    {
+        $this->_params = $params;
+        switch ($params['type']) {
+            case self::TYPE_PROCESS:
+                $this->_establishProcessConnection();
+                break;
+            case self::TYPE_SOCKET:
+            default:
+                $this->_establishSocketConnection();
+                break;
+        }
+    }
+
+    /**
+     * Set an individual param on the buffer (e.g. switching to SSL).
+     *
+     * @param string $param
+     * @param mixed  $value
+     */
+    public function setParam($param, $value)
+    {
+        if (isset($this->_stream)) {
+            switch ($param) {
+                case 'timeout':
+                    if ($this->_stream) {
+                        stream_set_timeout($this->_stream, $value);
+                    }
+                    break;
+
+                case 'blocking':
+                    if ($this->_stream) {
+                        stream_set_blocking($this->_stream, 1);
+                    }
+
+            }
+        }
+        $this->_params[$param] = $value;
+    }
+
+    public function startTLS()
+    {
+        return stream_socket_enable_crypto($this->_stream, true, STREAM_CRYPTO_METHOD_TLS_CLIENT);
+    }
+
+    /**
+     * Perform any shutdown logic needed.
+     */
+    public function terminate()
+    {
+        if (isset($this->_stream)) {
+            switch ($this->_params['type']) {
+                case self::TYPE_PROCESS:
+                    fclose($this->_in);
+                    fclose($this->_out);
+                    proc_close($this->_stream);
+                    break;
+                case self::TYPE_SOCKET:
+                default:
+                    fclose($this->_stream);
+                    break;
+            }
+        }
+        $this->_stream = null;
+        $this->_out = null;
+        $this->_in = null;
+    }
+
+    /**
+     * Set an array of string replacements which should be made on data written
+     * to the buffer.
+     *
+     * This could replace LF with CRLF for example.
+     *
+     * @param string[] $replacements
+     */
+    public function setWriteTranslations(array $replacements)
+    {
+        foreach ($this->_translations as $search => $replace) {
+            if (!isset($replacements[$search])) {
+                $this->removeFilter($search);
+                unset($this->_translations[$search]);
+            }
+        }
+
+        foreach ($replacements as $search => $replace) {
+            if (!isset($this->_translations[$search])) {
+                $this->addFilter(
+                    $this->_replacementFactory->createFilter($search, $replace), $search
+                    );
+                $this->_translations[$search] = true;
+            }
+        }
+    }
+
+    /**
+     * Get a line of output (including any CRLF).
+     *
+     * The $sequence number comes from any writes and may or may not be used
+     * depending upon the implementation.
+     *
+     * @param int $sequence of last write to scan from
+     *
+     * @throws Swift_IoException
+     *
+     * @return string
+     */
+    public function readLine($sequence)
+    {
+        if (isset($this->_out) && !feof($this->_out)) {
+            $line = fgets($this->_out);
+            if (strlen($line) == 0) {
+                $metas = stream_get_meta_data($this->_out);
+                if ($metas['timed_out']) {
+                    throw new Swift_IoException(
+                        'Connection to '.
+                            $this->_getReadConnectionDescription().
+                        ' Timed Out'
+                    );
+                }
+            }
+
+            return $line;
+        }
+    }
+
+    /**
+     * Reads $length bytes from the stream into a string and moves the pointer
+     * through the stream by $length.
+     *
+     * If less bytes exist than are requested the remaining bytes are given instead.
+     * If no bytes are remaining at all, boolean false is returned.
+     *
+     * @param int $length
+     *
+     * @throws Swift_IoException
+     *
+     * @return string|bool
+     */
+    public function read($length)
+    {
+        if (isset($this->_out) && !feof($this->_out)) {
+            $ret = fread($this->_out, $length);
+            if (strlen($ret) == 0) {
+                $metas = stream_get_meta_data($this->_out);
+                if ($metas['timed_out']) {
+                    throw new Swift_IoException(
+                        'Connection to '.
+                            $this->_getReadConnectionDescription().
+                        ' Timed Out'
+                    );
+                }
+            }
+
+            return $ret;
+        }
+    }
+
+    /** Not implemented */
+    public function setReadPointer($byteOffset)
+    {
+    }
+
+    /** Flush the stream contents */
+    protected function _flush()
+    {
+        if (isset($this->_in)) {
+            fflush($this->_in);
+        }
+    }
+
+    /** Write this bytes to the stream */
+    protected function _commit($bytes)
+    {
+        if (isset($this->_in)) {
+            $bytesToWrite = strlen($bytes);
+            $totalBytesWritten = 0;
+
+            while ($totalBytesWritten < $bytesToWrite) {
+                $bytesWritten = fwrite($this->_in, substr($bytes, $totalBytesWritten));
+                if (false === $bytesWritten || 0 === $bytesWritten) {
+                    break;
+                }
+
+                $totalBytesWritten += $bytesWritten;
+            }
+
+            if ($totalBytesWritten > 0) {
+                return ++$this->_sequence;
+            }
+        }
+    }
+
+    /**
+     * Establishes a connection to a remote server.
+     */
+    private function _establishSocketConnection()
+    {
+        $host = $this->_params['host'];
+        if (!empty($this->_params['protocol'])) {
+            $host = $this->_params['protocol'].'://'.$host;
+        }
+        $timeout = 15;
+        if (!empty($this->_params['timeout'])) {
+            $timeout = $this->_params['timeout'];
+        }
+        $options = array();
+        if (!empty($this->_params['sourceIp'])) {
+            $options['socket']['bindto'] = $this->_params['sourceIp'].':0';
+        }
+        if (isset($this->_params['stream_context_options'])) {
+            $options = array_merge($options, $this->_params['stream_context_options']);
+        }
+        $streamContext = stream_context_create($options);
+        $this->_stream = @stream_socket_client($host.':'.$this->_params['port'], $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $streamContext);
+        if (false === $this->_stream) {
+            throw new Swift_TransportException(
+                'Connection could not be established with host '.$this->_params['host'].
+                ' ['.$errstr.' #'.$errno.']'
+                );
+        }
+        if (!empty($this->_params['blocking'])) {
+            stream_set_blocking($this->_stream, 1);
+        } else {
+            stream_set_blocking($this->_stream, 0);
+        }
+        stream_set_timeout($this->_stream, $timeout);
+        $this->_in = &$this->_stream;
+        $this->_out = &$this->_stream;
+    }
+
+    /**
+     * Opens a process for input/output.
+     */
+    private function _establishProcessConnection()
+    {
+        $command = $this->_params['command'];
+        $descriptorSpec = array(
+            0 => array('pipe', 'r'),
+            1 => array('pipe', 'w'),
+            2 => array('pipe', 'w'),
+            );
+        $this->_stream = proc_open($command, $descriptorSpec, $pipes);
+        stream_set_blocking($pipes[2], 0);
+        if ($err = stream_get_contents($pipes[2])) {
+            throw new Swift_TransportException(
+                'Process could not be started ['.$err.']'
+                );
+        }
+        $this->_in = &$pipes[0];
+        $this->_out = &$pipes[1];
+    }
+
+    private function _getReadConnectionDescription()
+    {
+        switch ($this->_params['type']) {
+            case self::TYPE_PROCESS:
+                return 'Process '.$this->_params['command'];
+                break;
+
+            case self::TYPE_SOCKET:
+            default:
+                $host = $this->_params['host'];
+                if (!empty($this->_params['protocol'])) {
+                    $host = $this->_params['protocol'].'://'.$host;
+                }
+                $host .= ':'.$this->_params['port'];
+
+                return $host;
+                break;
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/TransportException.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/TransportException.php
similarity index 53%
rename from lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/TransportException.php
rename to lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/TransportException.php
index b7cd6589b..4ae2412e6 100644
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/classes/Swift/TransportException.php
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/TransportException.php
@@ -8,24 +8,22 @@
  * file that was distributed with this source code.
  */
 
-//@require 'Swift/IoException.php';
-
 /**
  * TransportException thrown when an error occurs in the Transport subsystem.
- * @package Swift
- * @subpackage Transport
+ *
  * @author Chris Corbyn
  */
 class Swift_TransportException extends Swift_IoException
 {
-  
-  /**
-   * Create a new TransportException with $message.
-   * @param string $message
-   */
-  public function __construct($message)
-  {
-    parent::__construct($message);
-  }
-  
+    /**
+     * Create a new TransportException with $message.
+     *
+     * @param string    $message
+     * @param int       $code
+     * @param Exception $previous
+     */
+    public function __construct($message, $code = 0, Exception $previous = null)
+    {
+        parent::__construct($message, $code, $previous);
+    }
 }
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Validate.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Validate.php
new file mode 100644
index 000000000..e16c212c4
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/classes/Swift/Validate.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Utility Class allowing users to simply check expressions again Swift Grammar.
+ *
+ * @author  Xavier De Cock <xdecock@gmail.com>
+ */
+class Swift_Validate
+{
+    /**
+     * Grammar Object.
+     *
+     * @var Swift_Mime_Grammar
+     */
+    private static $grammar = null;
+
+    /**
+     * Checks if an e-mail address matches the current grammars.
+     *
+     * @param string $email
+     *
+     * @return bool
+     */
+    public static function email($email)
+    {
+        if (self::$grammar === null) {
+            self::$grammar = Swift_DependencyContainer::getInstance()
+                ->lookup('mime.grammar');
+        }
+
+        return (bool) preg_match(
+                '/^'.self::$grammar->getDefinition('addr-spec').'$/D',
+                $email
+            );
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/dependency_maps/cache_deps.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/dependency_maps/cache_deps.php
new file mode 100644
index 000000000..6023448e8
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/dependency_maps/cache_deps.php
@@ -0,0 +1,23 @@
+<?php
+
+Swift_DependencyContainer::getInstance()
+    ->register('cache')
+    ->asAliasOf('cache.array')
+
+    ->register('tempdir')
+    ->asValue('/tmp')
+
+    ->register('cache.null')
+    ->asSharedInstanceOf('Swift_KeyCache_NullKeyCache')
+
+    ->register('cache.array')
+    ->asSharedInstanceOf('Swift_KeyCache_ArrayKeyCache')
+    ->withDependencies(array('cache.inputstream'))
+
+    ->register('cache.disk')
+    ->asSharedInstanceOf('Swift_KeyCache_DiskKeyCache')
+    ->withDependencies(array('cache.inputstream', 'tempdir'))
+
+    ->register('cache.inputstream')
+    ->asNewInstanceOf('Swift_KeyCache_SimpleKeyCacheInputStream')
+;
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/dependency_maps/message_deps.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/dependency_maps/message_deps.php
new file mode 100644
index 000000000..64d69d215
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/dependency_maps/message_deps.php
@@ -0,0 +1,9 @@
+<?php
+
+Swift_DependencyContainer::getInstance()
+    ->register('message.message')
+    ->asNewInstanceOf('Swift_Message')
+
+    ->register('message.mimepart')
+    ->asNewInstanceOf('Swift_MimePart')
+;
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/dependency_maps/mime_deps.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/dependency_maps/mime_deps.php
new file mode 100644
index 000000000..56169c928
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/dependency_maps/mime_deps.php
@@ -0,0 +1,123 @@
+<?php
+
+require __DIR__.'/../mime_types.php';
+
+Swift_DependencyContainer::getInstance()
+    ->register('properties.charset')
+    ->asValue('utf-8')
+
+    ->register('mime.grammar')
+    ->asSharedInstanceOf('Swift_Mime_Grammar')
+
+    ->register('mime.message')
+    ->asNewInstanceOf('Swift_Mime_SimpleMessage')
+    ->withDependencies(array(
+        'mime.headerset',
+        'mime.qpcontentencoder',
+        'cache',
+        'mime.grammar',
+        'properties.charset',
+    ))
+
+    ->register('mime.part')
+    ->asNewInstanceOf('Swift_Mime_MimePart')
+    ->withDependencies(array(
+        'mime.headerset',
+        'mime.qpcontentencoder',
+        'cache',
+        'mime.grammar',
+        'properties.charset',
+    ))
+
+    ->register('mime.attachment')
+    ->asNewInstanceOf('Swift_Mime_Attachment')
+    ->withDependencies(array(
+        'mime.headerset',
+        'mime.base64contentencoder',
+        'cache',
+        'mime.grammar',
+    ))
+    ->addConstructorValue($swift_mime_types)
+
+    ->register('mime.embeddedfile')
+    ->asNewInstanceOf('Swift_Mime_EmbeddedFile')
+    ->withDependencies(array(
+        'mime.headerset',
+        'mime.base64contentencoder',
+        'cache',
+        'mime.grammar',
+    ))
+    ->addConstructorValue($swift_mime_types)
+
+    ->register('mime.headerfactory')
+    ->asNewInstanceOf('Swift_Mime_SimpleHeaderFactory')
+    ->withDependencies(array(
+            'mime.qpheaderencoder',
+            'mime.rfc2231encoder',
+            'mime.grammar',
+            'properties.charset',
+        ))
+
+    ->register('mime.headerset')
+    ->asNewInstanceOf('Swift_Mime_SimpleHeaderSet')
+    ->withDependencies(array('mime.headerfactory', 'properties.charset'))
+
+    ->register('mime.qpheaderencoder')
+    ->asNewInstanceOf('Swift_Mime_HeaderEncoder_QpHeaderEncoder')
+    ->withDependencies(array('mime.charstream'))
+
+    ->register('mime.base64headerencoder')
+    ->asNewInstanceOf('Swift_Mime_HeaderEncoder_Base64HeaderEncoder')
+    ->withDependencies(array('mime.charstream'))
+
+    ->register('mime.charstream')
+    ->asNewInstanceOf('Swift_CharacterStream_NgCharacterStream')
+    ->withDependencies(array('mime.characterreaderfactory', 'properties.charset'))
+
+    ->register('mime.bytecanonicalizer')
+    ->asSharedInstanceOf('Swift_StreamFilters_ByteArrayReplacementFilter')
+    ->addConstructorValue(array(array(0x0D, 0x0A), array(0x0D), array(0x0A)))
+    ->addConstructorValue(array(array(0x0A), array(0x0A), array(0x0D, 0x0A)))
+
+    ->register('mime.characterreaderfactory')
+    ->asSharedInstanceOf('Swift_CharacterReaderFactory_SimpleCharacterReaderFactory')
+
+    ->register('mime.safeqpcontentencoder')
+    ->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoder')
+    ->withDependencies(array('mime.charstream', 'mime.bytecanonicalizer'))
+
+    ->register('mime.rawcontentencoder')
+    ->asNewInstanceOf('Swift_Mime_ContentEncoder_RawContentEncoder')
+
+    ->register('mime.nativeqpcontentencoder')
+    ->withDependencies(array('properties.charset'))
+    ->asNewInstanceOf('Swift_Mime_ContentEncoder_NativeQpContentEncoder')
+
+    ->register('mime.qpcontentencoderproxy')
+    ->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoderProxy')
+    ->withDependencies(array('mime.safeqpcontentencoder', 'mime.nativeqpcontentencoder', 'properties.charset'))
+
+    ->register('mime.7bitcontentencoder')
+    ->asNewInstanceOf('Swift_Mime_ContentEncoder_PlainContentEncoder')
+    ->addConstructorValue('7bit')
+    ->addConstructorValue(true)
+
+    ->register('mime.8bitcontentencoder')
+    ->asNewInstanceOf('Swift_Mime_ContentEncoder_PlainContentEncoder')
+    ->addConstructorValue('8bit')
+    ->addConstructorValue(true)
+
+    ->register('mime.base64contentencoder')
+    ->asSharedInstanceOf('Swift_Mime_ContentEncoder_Base64ContentEncoder')
+
+    ->register('mime.rfc2231encoder')
+    ->asNewInstanceOf('Swift_Encoder_Rfc2231Encoder')
+    ->withDependencies(array('mime.charstream'))
+
+    // As of PHP 5.4.7, the quoted_printable_encode() function behaves correctly.
+    // see https://github.com/php/php-src/commit/18bb426587d62f93c54c40bf8535eb8416603629
+    ->register('mime.qpcontentencoder')
+    ->asAliasOf(version_compare(phpversion(), '5.4.7', '>=') ? 'mime.qpcontentencoderproxy' : 'mime.safeqpcontentencoder')
+;
+
+unset($swift_mime_types);
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/dependency_maps/transport_deps.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/dependency_maps/transport_deps.php
new file mode 100644
index 000000000..77e432cfa
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/dependency_maps/transport_deps.php
@@ -0,0 +1,76 @@
+<?php
+
+Swift_DependencyContainer::getInstance()
+    ->register('transport.smtp')
+    ->asNewInstanceOf('Swift_Transport_EsmtpTransport')
+    ->withDependencies(array(
+        'transport.buffer',
+        array('transport.authhandler'),
+        'transport.eventdispatcher',
+    ))
+
+    ->register('transport.sendmail')
+    ->asNewInstanceOf('Swift_Transport_SendmailTransport')
+    ->withDependencies(array(
+        'transport.buffer',
+        'transport.eventdispatcher',
+    ))
+
+    ->register('transport.mail')
+    ->asNewInstanceOf('Swift_Transport_MailTransport')
+    ->withDependencies(array('transport.mailinvoker', 'transport.eventdispatcher'))
+
+    ->register('transport.loadbalanced')
+    ->asNewInstanceOf('Swift_Transport_LoadBalancedTransport')
+
+    ->register('transport.failover')
+    ->asNewInstanceOf('Swift_Transport_FailoverTransport')
+
+    ->register('transport.spool')
+    ->asNewInstanceOf('Swift_Transport_SpoolTransport')
+    ->withDependencies(array('transport.eventdispatcher'))
+
+    ->register('transport.null')
+    ->asNewInstanceOf('Swift_Transport_NullTransport')
+    ->withDependencies(array('transport.eventdispatcher'))
+
+    ->register('transport.mailinvoker')
+    ->asSharedInstanceOf('Swift_Transport_SimpleMailInvoker')
+
+    ->register('transport.buffer')
+    ->asNewInstanceOf('Swift_Transport_StreamBuffer')
+    ->withDependencies(array('transport.replacementfactory'))
+
+    ->register('transport.authhandler')
+    ->asNewInstanceOf('Swift_Transport_Esmtp_AuthHandler')
+    ->withDependencies(array(
+        array(
+            'transport.crammd5auth',
+            'transport.loginauth',
+            'transport.plainauth',
+            'transport.ntlmauth',
+            'transport.xoauth2auth',
+        ),
+    ))
+
+    ->register('transport.crammd5auth')
+    ->asNewInstanceOf('Swift_Transport_Esmtp_Auth_CramMd5Authenticator')
+
+    ->register('transport.loginauth')
+    ->asNewInstanceOf('Swift_Transport_Esmtp_Auth_LoginAuthenticator')
+
+    ->register('transport.plainauth')
+    ->asNewInstanceOf('Swift_Transport_Esmtp_Auth_PlainAuthenticator')
+
+    ->register('transport.xoauth2auth')
+    ->asNewInstanceOf('Swift_Transport_Esmtp_Auth_XOAuth2Authenticator')
+
+    ->register('transport.ntlmauth')
+    ->asNewInstanceOf('Swift_Transport_Esmtp_Auth_NTLMAuthenticator')
+
+    ->register('transport.eventdispatcher')
+    ->asNewInstanceOf('Swift_Events_SimpleEventDispatcher')
+
+    ->register('transport.replacementfactory')
+    ->asSharedInstanceOf('Swift_StreamFilters_StringReplacementFilterFactory')
+;
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/mime_types.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/mime_types.php
new file mode 100644
index 000000000..2d7b98dc1
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/mime_types.php
@@ -0,0 +1,1007 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * autogenerated using http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
+ * and https://raw.github.com/minad/mimemagic/master/script/freedesktop.org.xml
+ */
+
+/*
+ * List of MIME type automatically detected in Swift Mailer.
+ */
+
+// You may add or take away what you like (lowercase required)
+
+$swift_mime_types = array(
+    '3dml' => 'text/vnd.in3d.3dml',
+    '3ds' => 'image/x-3ds',
+    '3g2' => 'video/3gpp2',
+    '3gp' => 'video/3gpp',
+    '7z' => 'application/x-7z-compressed',
+    'aab' => 'application/x-authorware-bin',
+    'aac' => 'audio/x-aac',
+    'aam' => 'application/x-authorware-map',
+    'aas' => 'application/x-authorware-seg',
+    'abw' => 'application/x-abiword',
+    'ac' => 'application/pkix-attr-cert',
+    'acc' => 'application/vnd.americandynamics.acc',
+    'ace' => 'application/x-ace-compressed',
+    'acu' => 'application/vnd.acucobol',
+    'acutc' => 'application/vnd.acucorp',
+    'adp' => 'audio/adpcm',
+    'aep' => 'application/vnd.audiograph',
+    'afm' => 'application/x-font-type1',
+    'afp' => 'application/vnd.ibm.modcap',
+    'ahead' => 'application/vnd.ahead.space',
+    'ai' => 'application/postscript',
+    'aif' => 'audio/x-aiff',
+    'aifc' => 'audio/x-aiff',
+    'aiff' => 'audio/x-aiff',
+    'air' => 'application/vnd.adobe.air-application-installer-package+zip',
+    'ait' => 'application/vnd.dvb.ait',
+    'ami' => 'application/vnd.amiga.ami',
+    'apk' => 'application/vnd.android.package-archive',
+    'appcache' => 'text/cache-manifest',
+    'apr' => 'application/vnd.lotus-approach',
+    'aps' => 'application/postscript',
+    'arc' => 'application/x-freearc',
+    'asc' => 'application/pgp-signature',
+    'asf' => 'video/x-ms-asf',
+    'asm' => 'text/x-asm',
+    'aso' => 'application/vnd.accpac.simply.aso',
+    'asx' => 'video/x-ms-asf',
+    'atc' => 'application/vnd.acucorp',
+    'atom' => 'application/atom+xml',
+    'atomcat' => 'application/atomcat+xml',
+    'atomsvc' => 'application/atomsvc+xml',
+    'atx' => 'application/vnd.antix.game-component',
+    'au' => 'audio/basic',
+    'avi' => 'video/x-msvideo',
+    'aw' => 'application/applixware',
+    'azf' => 'application/vnd.airzip.filesecure.azf',
+    'azs' => 'application/vnd.airzip.filesecure.azs',
+    'azw' => 'application/vnd.amazon.ebook',
+    'bat' => 'application/x-msdownload',
+    'bcpio' => 'application/x-bcpio',
+    'bdf' => 'application/x-font-bdf',
+    'bdm' => 'application/vnd.syncml.dm+wbxml',
+    'bed' => 'application/vnd.realvnc.bed',
+    'bh2' => 'application/vnd.fujitsu.oasysprs',
+    'bin' => 'application/octet-stream',
+    'blb' => 'application/x-blorb',
+    'blorb' => 'application/x-blorb',
+    'bmi' => 'application/vnd.bmi',
+    'bmp' => 'image/bmp',
+    'book' => 'application/vnd.framemaker',
+    'box' => 'application/vnd.previewsystems.box',
+    'boz' => 'application/x-bzip2',
+    'bpk' => 'application/octet-stream',
+    'btif' => 'image/prs.btif',
+    'bz' => 'application/x-bzip',
+    'bz2' => 'application/x-bzip2',
+    'c' => 'text/x-c',
+    'c11amc' => 'application/vnd.cluetrust.cartomobile-config',
+    'c11amz' => 'application/vnd.cluetrust.cartomobile-config-pkg',
+    'c4d' => 'application/vnd.clonk.c4group',
+    'c4f' => 'application/vnd.clonk.c4group',
+    'c4g' => 'application/vnd.clonk.c4group',
+    'c4p' => 'application/vnd.clonk.c4group',
+    'c4u' => 'application/vnd.clonk.c4group',
+    'cab' => 'application/vnd.ms-cab-compressed',
+    'caf' => 'audio/x-caf',
+    'cap' => 'application/vnd.tcpdump.pcap',
+    'car' => 'application/vnd.curl.car',
+    'cat' => 'application/vnd.ms-pki.seccat',
+    'cb7' => 'application/x-cbr',
+    'cba' => 'application/x-cbr',
+    'cbr' => 'application/x-cbr',
+    'cbt' => 'application/x-cbr',
+    'cbz' => 'application/x-cbr',
+    'cc' => 'text/x-c',
+    'cct' => 'application/x-director',
+    'ccxml' => 'application/ccxml+xml',
+    'cdbcmsg' => 'application/vnd.contact.cmsg',
+    'cdf' => 'application/x-netcdf',
+    'cdkey' => 'application/vnd.mediastation.cdkey',
+    'cdmia' => 'application/cdmi-capability',
+    'cdmic' => 'application/cdmi-container',
+    'cdmid' => 'application/cdmi-domain',
+    'cdmio' => 'application/cdmi-object',
+    'cdmiq' => 'application/cdmi-queue',
+    'cdx' => 'chemical/x-cdx',
+    'cdxml' => 'application/vnd.chemdraw+xml',
+    'cdy' => 'application/vnd.cinderella',
+    'cer' => 'application/pkix-cert',
+    'cfs' => 'application/x-cfs-compressed',
+    'cgm' => 'image/cgm',
+    'chat' => 'application/x-chat',
+    'chm' => 'application/vnd.ms-htmlhelp',
+    'chrt' => 'application/vnd.kde.kchart',
+    'cif' => 'chemical/x-cif',
+    'cii' => 'application/vnd.anser-web-certificate-issue-initiation',
+    'cil' => 'application/vnd.ms-artgalry',
+    'cla' => 'application/vnd.claymore',
+    'class' => 'application/java-vm',
+    'clkk' => 'application/vnd.crick.clicker.keyboard',
+    'clkp' => 'application/vnd.crick.clicker.palette',
+    'clkt' => 'application/vnd.crick.clicker.template',
+    'clkw' => 'application/vnd.crick.clicker.wordbank',
+    'clkx' => 'application/vnd.crick.clicker',
+    'clp' => 'application/x-msclip',
+    'cmc' => 'application/vnd.cosmocaller',
+    'cmdf' => 'chemical/x-cmdf',
+    'cml' => 'chemical/x-cml',
+    'cmp' => 'application/vnd.yellowriver-custom-menu',
+    'cmx' => 'image/x-cmx',
+    'cod' => 'application/vnd.rim.cod',
+    'com' => 'application/x-msdownload',
+    'conf' => 'text/plain',
+    'cpio' => 'application/x-cpio',
+    'cpp' => 'text/x-c',
+    'cpt' => 'application/mac-compactpro',
+    'crd' => 'application/x-mscardfile',
+    'crl' => 'application/pkix-crl',
+    'crt' => 'application/x-x509-ca-cert',
+    'csh' => 'application/x-csh',
+    'csml' => 'chemical/x-csml',
+    'csp' => 'application/vnd.commonspace',
+    'css' => 'text/css',
+    'cst' => 'application/x-director',
+    'csv' => 'text/csv',
+    'cu' => 'application/cu-seeme',
+    'curl' => 'text/vnd.curl',
+    'cww' => 'application/prs.cww',
+    'cxt' => 'application/x-director',
+    'cxx' => 'text/x-c',
+    'dae' => 'model/vnd.collada+xml',
+    'daf' => 'application/vnd.mobius.daf',
+    'dart' => 'application/vnd.dart',
+    'dataless' => 'application/vnd.fdsn.seed',
+    'davmount' => 'application/davmount+xml',
+    'dbk' => 'application/docbook+xml',
+    'dcr' => 'application/x-director',
+    'dcurl' => 'text/vnd.curl.dcurl',
+    'dd2' => 'application/vnd.oma.dd2+xml',
+    'ddd' => 'application/vnd.fujixerox.ddd',
+    'deb' => 'application/x-debian-package',
+    'def' => 'text/plain',
+    'deploy' => 'application/octet-stream',
+    'der' => 'application/x-x509-ca-cert',
+    'dfac' => 'application/vnd.dreamfactory',
+    'dgc' => 'application/x-dgc-compressed',
+    'dic' => 'text/x-c',
+    'dir' => 'application/x-director',
+    'dis' => 'application/vnd.mobius.dis',
+    'dist' => 'application/octet-stream',
+    'distz' => 'application/octet-stream',
+    'djv' => 'image/vnd.djvu',
+    'djvu' => 'image/vnd.djvu',
+    'dll' => 'application/x-msdownload',
+    'dmg' => 'application/x-apple-diskimage',
+    'dmp' => 'application/vnd.tcpdump.pcap',
+    'dms' => 'application/octet-stream',
+    'dna' => 'application/vnd.dna',
+    'doc' => 'application/msword',
+    'docm' => 'application/vnd.ms-word.document.macroenabled.12',
+    'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+    'dot' => 'application/msword',
+    'dotm' => 'application/vnd.ms-word.template.macroenabled.12',
+    'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+    'dp' => 'application/vnd.osgi.dp',
+    'dpg' => 'application/vnd.dpgraph',
+    'dra' => 'audio/vnd.dra',
+    'dsc' => 'text/prs.lines.tag',
+    'dssc' => 'application/dssc+der',
+    'dtb' => 'application/x-dtbook+xml',
+    'dtd' => 'application/xml-dtd',
+    'dts' => 'audio/vnd.dts',
+    'dtshd' => 'audio/vnd.dts.hd',
+    'dump' => 'application/octet-stream',
+    'dvb' => 'video/vnd.dvb.file',
+    'dvi' => 'application/x-dvi',
+    'dwf' => 'model/vnd.dwf',
+    'dwg' => 'image/vnd.dwg',
+    'dxf' => 'image/vnd.dxf',
+    'dxp' => 'application/vnd.spotfire.dxp',
+    'dxr' => 'application/x-director',
+    'ecelp4800' => 'audio/vnd.nuera.ecelp4800',
+    'ecelp7470' => 'audio/vnd.nuera.ecelp7470',
+    'ecelp9600' => 'audio/vnd.nuera.ecelp9600',
+    'ecma' => 'application/ecmascript',
+    'edm' => 'application/vnd.novadigm.edm',
+    'edx' => 'application/vnd.novadigm.edx',
+    'efif' => 'application/vnd.picsel',
+    'ei6' => 'application/vnd.pg.osasli',
+    'elc' => 'application/octet-stream',
+    'emf' => 'application/x-msmetafile',
+    'eml' => 'message/rfc822',
+    'emma' => 'application/emma+xml',
+    'emz' => 'application/x-msmetafile',
+    'eol' => 'audio/vnd.digital-winds',
+    'eot' => 'application/vnd.ms-fontobject',
+    'eps' => 'application/postscript',
+    'epub' => 'application/epub+zip',
+    'es3' => 'application/vnd.eszigno3+xml',
+    'esa' => 'application/vnd.osgi.subsystem',
+    'esf' => 'application/vnd.epson.esf',
+    'et3' => 'application/vnd.eszigno3+xml',
+    'etx' => 'text/x-setext',
+    'eva' => 'application/x-eva',
+    'evy' => 'application/x-envoy',
+    'exe' => 'application/x-msdownload',
+    'exi' => 'application/exi',
+    'ext' => 'application/vnd.novadigm.ext',
+    'ez' => 'application/andrew-inset',
+    'ez2' => 'application/vnd.ezpix-album',
+    'ez3' => 'application/vnd.ezpix-package',
+    'f' => 'text/x-fortran',
+    'f4v' => 'video/x-f4v',
+    'f77' => 'text/x-fortran',
+    'f90' => 'text/x-fortran',
+    'fbs' => 'image/vnd.fastbidsheet',
+    'fcdt' => 'application/vnd.adobe.formscentral.fcdt',
+    'fcs' => 'application/vnd.isac.fcs',
+    'fdf' => 'application/vnd.fdf',
+    'fe_launch' => 'application/vnd.denovo.fcselayout-link',
+    'fg5' => 'application/vnd.fujitsu.oasysgp',
+    'fgd' => 'application/x-director',
+    'fh' => 'image/x-freehand',
+    'fh4' => 'image/x-freehand',
+    'fh5' => 'image/x-freehand',
+    'fh7' => 'image/x-freehand',
+    'fhc' => 'image/x-freehand',
+    'fig' => 'application/x-xfig',
+    'flac' => 'audio/x-flac',
+    'fli' => 'video/x-fli',
+    'flo' => 'application/vnd.micrografx.flo',
+    'flv' => 'video/x-flv',
+    'flw' => 'application/vnd.kde.kivio',
+    'flx' => 'text/vnd.fmi.flexstor',
+    'fly' => 'text/vnd.fly',
+    'fm' => 'application/vnd.framemaker',
+    'fnc' => 'application/vnd.frogans.fnc',
+    'for' => 'text/x-fortran',
+    'fpx' => 'image/vnd.fpx',
+    'frame' => 'application/vnd.framemaker',
+    'fsc' => 'application/vnd.fsc.weblaunch',
+    'fst' => 'image/vnd.fst',
+    'ftc' => 'application/vnd.fluxtime.clip',
+    'fti' => 'application/vnd.anser-web-funds-transfer-initiation',
+    'fvt' => 'video/vnd.fvt',
+    'fxp' => 'application/vnd.adobe.fxp',
+    'fxpl' => 'application/vnd.adobe.fxp',
+    'fzs' => 'application/vnd.fuzzysheet',
+    'g2w' => 'application/vnd.geoplan',
+    'g3' => 'image/g3fax',
+    'g3w' => 'application/vnd.geospace',
+    'gac' => 'application/vnd.groove-account',
+    'gam' => 'application/x-tads',
+    'gbr' => 'application/rpki-ghostbusters',
+    'gca' => 'application/x-gca-compressed',
+    'gdl' => 'model/vnd.gdl',
+    'geo' => 'application/vnd.dynageo',
+    'gex' => 'application/vnd.geometry-explorer',
+    'ggb' => 'application/vnd.geogebra.file',
+    'ggt' => 'application/vnd.geogebra.tool',
+    'ghf' => 'application/vnd.groove-help',
+    'gif' => 'image/gif',
+    'gim' => 'application/vnd.groove-identity-message',
+    'gml' => 'application/gml+xml',
+    'gmx' => 'application/vnd.gmx',
+    'gnumeric' => 'application/x-gnumeric',
+    'gph' => 'application/vnd.flographit',
+    'gpx' => 'application/gpx+xml',
+    'gqf' => 'application/vnd.grafeq',
+    'gqs' => 'application/vnd.grafeq',
+    'gram' => 'application/srgs',
+    'gramps' => 'application/x-gramps-xml',
+    'gre' => 'application/vnd.geometry-explorer',
+    'grv' => 'application/vnd.groove-injector',
+    'grxml' => 'application/srgs+xml',
+    'gsf' => 'application/x-font-ghostscript',
+    'gtar' => 'application/x-gtar',
+    'gtm' => 'application/vnd.groove-tool-message',
+    'gtw' => 'model/vnd.gtw',
+    'gv' => 'text/vnd.graphviz',
+    'gxf' => 'application/gxf',
+    'gxt' => 'application/vnd.geonext',
+    'gz' => 'application/x-gzip',
+    'h' => 'text/x-c',
+    'h261' => 'video/h261',
+    'h263' => 'video/h263',
+    'h264' => 'video/h264',
+    'hal' => 'application/vnd.hal+xml',
+    'hbci' => 'application/vnd.hbci',
+    'hdf' => 'application/x-hdf',
+    'hh' => 'text/x-c',
+    'hlp' => 'application/winhlp',
+    'hpgl' => 'application/vnd.hp-hpgl',
+    'hpid' => 'application/vnd.hp-hpid',
+    'hps' => 'application/vnd.hp-hps',
+    'hqx' => 'application/mac-binhex40',
+    'htke' => 'application/vnd.kenameaapp',
+    'htm' => 'text/html',
+    'html' => 'text/html',
+    'hvd' => 'application/vnd.yamaha.hv-dic',
+    'hvp' => 'application/vnd.yamaha.hv-voice',
+    'hvs' => 'application/vnd.yamaha.hv-script',
+    'i2g' => 'application/vnd.intergeo',
+    'icc' => 'application/vnd.iccprofile',
+    'ice' => 'x-conference/x-cooltalk',
+    'icm' => 'application/vnd.iccprofile',
+    'ico' => 'image/x-icon',
+    'ics' => 'text/calendar',
+    'ief' => 'image/ief',
+    'ifb' => 'text/calendar',
+    'ifm' => 'application/vnd.shana.informed.formdata',
+    'iges' => 'model/iges',
+    'igl' => 'application/vnd.igloader',
+    'igm' => 'application/vnd.insors.igm',
+    'igs' => 'model/iges',
+    'igx' => 'application/vnd.micrografx.igx',
+    'iif' => 'application/vnd.shana.informed.interchange',
+    'imp' => 'application/vnd.accpac.simply.imp',
+    'ims' => 'application/vnd.ms-ims',
+    'in' => 'text/plain',
+    'ink' => 'application/inkml+xml',
+    'inkml' => 'application/inkml+xml',
+    'install' => 'application/x-install-instructions',
+    'iota' => 'application/vnd.astraea-software.iota',
+    'ipfix' => 'application/ipfix',
+    'ipk' => 'application/vnd.shana.informed.package',
+    'irm' => 'application/vnd.ibm.rights-management',
+    'irp' => 'application/vnd.irepository.package+xml',
+    'iso' => 'application/x-iso9660-image',
+    'itp' => 'application/vnd.shana.informed.formtemplate',
+    'ivp' => 'application/vnd.immervision-ivp',
+    'ivu' => 'application/vnd.immervision-ivu',
+    'jad' => 'text/vnd.sun.j2me.app-descriptor',
+    'jam' => 'application/vnd.jam',
+    'jar' => 'application/java-archive',
+    'java' => 'text/x-java-source',
+    'jisp' => 'application/vnd.jisp',
+    'jlt' => 'application/vnd.hp-jlyt',
+    'jnlp' => 'application/x-java-jnlp-file',
+    'joda' => 'application/vnd.joost.joda-archive',
+    'jpe' => 'image/jpeg',
+    'jpeg' => 'image/jpeg',
+    'jpg' => 'image/jpeg',
+    'jpgm' => 'video/jpm',
+    'jpgv' => 'video/jpeg',
+    'jpm' => 'video/jpm',
+    'js' => 'application/javascript',
+    'json' => 'application/json',
+    'jsonml' => 'application/jsonml+json',
+    'kar' => 'audio/midi',
+    'karbon' => 'application/vnd.kde.karbon',
+    'kfo' => 'application/vnd.kde.kformula',
+    'kia' => 'application/vnd.kidspiration',
+    'kml' => 'application/vnd.google-earth.kml+xml',
+    'kmz' => 'application/vnd.google-earth.kmz',
+    'kne' => 'application/vnd.kinar',
+    'knp' => 'application/vnd.kinar',
+    'kon' => 'application/vnd.kde.kontour',
+    'kpr' => 'application/vnd.kde.kpresenter',
+    'kpt' => 'application/vnd.kde.kpresenter',
+    'kpxx' => 'application/vnd.ds-keypoint',
+    'ksp' => 'application/vnd.kde.kspread',
+    'ktr' => 'application/vnd.kahootz',
+    'ktx' => 'image/ktx',
+    'ktz' => 'application/vnd.kahootz',
+    'kwd' => 'application/vnd.kde.kword',
+    'kwt' => 'application/vnd.kde.kword',
+    'lasxml' => 'application/vnd.las.las+xml',
+    'latex' => 'application/x-latex',
+    'lbd' => 'application/vnd.llamagraphics.life-balance.desktop',
+    'lbe' => 'application/vnd.llamagraphics.life-balance.exchange+xml',
+    'les' => 'application/vnd.hhe.lesson-player',
+    'lha' => 'application/x-lzh-compressed',
+    'link66' => 'application/vnd.route66.link66+xml',
+    'list' => 'text/plain',
+    'list3820' => 'application/vnd.ibm.modcap',
+    'listafp' => 'application/vnd.ibm.modcap',
+    'lnk' => 'application/x-ms-shortcut',
+    'log' => 'text/plain',
+    'lostxml' => 'application/lost+xml',
+    'lrf' => 'application/octet-stream',
+    'lrm' => 'application/vnd.ms-lrm',
+    'ltf' => 'application/vnd.frogans.ltf',
+    'lvp' => 'audio/vnd.lucent.voice',
+    'lwp' => 'application/vnd.lotus-wordpro',
+    'lzh' => 'application/x-lzh-compressed',
+    'm13' => 'application/x-msmediaview',
+    'm14' => 'application/x-msmediaview',
+    'm1v' => 'video/mpeg',
+    'm21' => 'application/mp21',
+    'm2a' => 'audio/mpeg',
+    'm2v' => 'video/mpeg',
+    'm3a' => 'audio/mpeg',
+    'm3u' => 'audio/x-mpegurl',
+    'm3u8' => 'application/vnd.apple.mpegurl',
+    'm4a' => 'audio/mp4',
+    'm4u' => 'video/vnd.mpegurl',
+    'm4v' => 'video/x-m4v',
+    'ma' => 'application/mathematica',
+    'mads' => 'application/mads+xml',
+    'mag' => 'application/vnd.ecowin.chart',
+    'maker' => 'application/vnd.framemaker',
+    'man' => 'text/troff',
+    'mar' => 'application/octet-stream',
+    'mathml' => 'application/mathml+xml',
+    'mb' => 'application/mathematica',
+    'mbk' => 'application/vnd.mobius.mbk',
+    'mbox' => 'application/mbox',
+    'mc1' => 'application/vnd.medcalcdata',
+    'mcd' => 'application/vnd.mcd',
+    'mcurl' => 'text/vnd.curl.mcurl',
+    'mdb' => 'application/x-msaccess',
+    'mdi' => 'image/vnd.ms-modi',
+    'me' => 'text/troff',
+    'mesh' => 'model/mesh',
+    'meta4' => 'application/metalink4+xml',
+    'metalink' => 'application/metalink+xml',
+    'mets' => 'application/mets+xml',
+    'mfm' => 'application/vnd.mfmp',
+    'mft' => 'application/rpki-manifest',
+    'mgp' => 'application/vnd.osgeo.mapguide.package',
+    'mgz' => 'application/vnd.proteus.magazine',
+    'mid' => 'audio/midi',
+    'midi' => 'audio/midi',
+    'mie' => 'application/x-mie',
+    'mif' => 'application/vnd.mif',
+    'mime' => 'message/rfc822',
+    'mj2' => 'video/mj2',
+    'mjp2' => 'video/mj2',
+    'mk3d' => 'video/x-matroska',
+    'mka' => 'audio/x-matroska',
+    'mks' => 'video/x-matroska',
+    'mkv' => 'video/x-matroska',
+    'mlp' => 'application/vnd.dolby.mlp',
+    'mmd' => 'application/vnd.chipnuts.karaoke-mmd',
+    'mmf' => 'application/vnd.smaf',
+    'mmr' => 'image/vnd.fujixerox.edmics-mmr',
+    'mng' => 'video/x-mng',
+    'mny' => 'application/x-msmoney',
+    'mobi' => 'application/x-mobipocket-ebook',
+    'mods' => 'application/mods+xml',
+    'mov' => 'video/quicktime',
+    'movie' => 'video/x-sgi-movie',
+    'mp2' => 'audio/mpeg',
+    'mp21' => 'application/mp21',
+    'mp2a' => 'audio/mpeg',
+    'mp3' => 'audio/mpeg',
+    'mp4' => 'video/mp4',
+    'mp4a' => 'audio/mp4',
+    'mp4s' => 'application/mp4',
+    'mp4v' => 'video/mp4',
+    'mpc' => 'application/vnd.mophun.certificate',
+    'mpe' => 'video/mpeg',
+    'mpeg' => 'video/mpeg',
+    'mpg' => 'video/mpeg',
+    'mpg4' => 'video/mp4',
+    'mpga' => 'audio/mpeg',
+    'mpkg' => 'application/vnd.apple.installer+xml',
+    'mpm' => 'application/vnd.blueice.multipass',
+    'mpn' => 'application/vnd.mophun.application',
+    'mpp' => 'application/vnd.ms-project',
+    'mpt' => 'application/vnd.ms-project',
+    'mpy' => 'application/vnd.ibm.minipay',
+    'mqy' => 'application/vnd.mobius.mqy',
+    'mrc' => 'application/marc',
+    'mrcx' => 'application/marcxml+xml',
+    'ms' => 'text/troff',
+    'mscml' => 'application/mediaservercontrol+xml',
+    'mseed' => 'application/vnd.fdsn.mseed',
+    'mseq' => 'application/vnd.mseq',
+    'msf' => 'application/vnd.epson.msf',
+    'msh' => 'model/mesh',
+    'msi' => 'application/x-msdownload',
+    'msl' => 'application/vnd.mobius.msl',
+    'msty' => 'application/vnd.muvee.style',
+    'mts' => 'model/vnd.mts',
+    'mus' => 'application/vnd.musician',
+    'musicxml' => 'application/vnd.recordare.musicxml+xml',
+    'mvb' => 'application/x-msmediaview',
+    'mwf' => 'application/vnd.mfer',
+    'mxf' => 'application/mxf',
+    'mxl' => 'application/vnd.recordare.musicxml',
+    'mxml' => 'application/xv+xml',
+    'mxs' => 'application/vnd.triscape.mxs',
+    'mxu' => 'video/vnd.mpegurl',
+    'n-gage' => 'application/vnd.nokia.n-gage.symbian.install',
+    'n3' => 'text/n3',
+    'nb' => 'application/mathematica',
+    'nbp' => 'application/vnd.wolfram.player',
+    'nc' => 'application/x-netcdf',
+    'ncx' => 'application/x-dtbncx+xml',
+    'nfo' => 'text/x-nfo',
+    'ngdat' => 'application/vnd.nokia.n-gage.data',
+    'nitf' => 'application/vnd.nitf',
+    'nlu' => 'application/vnd.neurolanguage.nlu',
+    'nml' => 'application/vnd.enliven',
+    'nnd' => 'application/vnd.noblenet-directory',
+    'nns' => 'application/vnd.noblenet-sealer',
+    'nnw' => 'application/vnd.noblenet-web',
+    'npx' => 'image/vnd.net-fpx',
+    'nsc' => 'application/x-conference',
+    'nsf' => 'application/vnd.lotus-notes',
+    'ntf' => 'application/vnd.nitf',
+    'nzb' => 'application/x-nzb',
+    'oa2' => 'application/vnd.fujitsu.oasys2',
+    'oa3' => 'application/vnd.fujitsu.oasys3',
+    'oas' => 'application/vnd.fujitsu.oasys',
+    'obd' => 'application/x-msbinder',
+    'obj' => 'application/x-tgif',
+    'oda' => 'application/oda',
+    'odb' => 'application/vnd.oasis.opendocument.database',
+    'odc' => 'application/vnd.oasis.opendocument.chart',
+    'odf' => 'application/vnd.oasis.opendocument.formula',
+    'odft' => 'application/vnd.oasis.opendocument.formula-template',
+    'odg' => 'application/vnd.oasis.opendocument.graphics',
+    'odi' => 'application/vnd.oasis.opendocument.image',
+    'odm' => 'application/vnd.oasis.opendocument.text-master',
+    'odp' => 'application/vnd.oasis.opendocument.presentation',
+    'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
+    'odt' => 'application/vnd.oasis.opendocument.text',
+    'oga' => 'audio/ogg',
+    'ogg' => 'audio/ogg',
+    'ogv' => 'video/ogg',
+    'ogx' => 'application/ogg',
+    'omdoc' => 'application/omdoc+xml',
+    'onepkg' => 'application/onenote',
+    'onetmp' => 'application/onenote',
+    'onetoc' => 'application/onenote',
+    'onetoc2' => 'application/onenote',
+    'opf' => 'application/oebps-package+xml',
+    'opml' => 'text/x-opml',
+    'oprc' => 'application/vnd.palm',
+    'org' => 'application/vnd.lotus-organizer',
+    'osf' => 'application/vnd.yamaha.openscoreformat',
+    'osfpvg' => 'application/vnd.yamaha.openscoreformat.osfpvg+xml',
+    'otc' => 'application/vnd.oasis.opendocument.chart-template',
+    'otf' => 'application/x-font-otf',
+    'otg' => 'application/vnd.oasis.opendocument.graphics-template',
+    'oth' => 'application/vnd.oasis.opendocument.text-web',
+    'oti' => 'application/vnd.oasis.opendocument.image-template',
+    'otp' => 'application/vnd.oasis.opendocument.presentation-template',
+    'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template',
+    'ott' => 'application/vnd.oasis.opendocument.text-template',
+    'oxps' => 'application/oxps',
+    'oxt' => 'application/vnd.openofficeorg.extension',
+    'p' => 'text/x-pascal',
+    'p10' => 'application/pkcs10',
+    'p12' => 'application/x-pkcs12',
+    'p7b' => 'application/x-pkcs7-certificates',
+    'p7c' => 'application/pkcs7-mime',
+    'p7m' => 'application/pkcs7-mime',
+    'p7r' => 'application/x-pkcs7-certreqresp',
+    'p7s' => 'application/pkcs7-signature',
+    'p8' => 'application/pkcs8',
+    'pas' => 'text/x-pascal',
+    'paw' => 'application/vnd.pawaafile',
+    'pbd' => 'application/vnd.powerbuilder6',
+    'pbm' => 'image/x-portable-bitmap',
+    'pcap' => 'application/vnd.tcpdump.pcap',
+    'pcf' => 'application/x-font-pcf',
+    'pcl' => 'application/vnd.hp-pcl',
+    'pclxl' => 'application/vnd.hp-pclxl',
+    'pct' => 'image/x-pict',
+    'pcurl' => 'application/vnd.curl.pcurl',
+    'pcx' => 'image/x-pcx',
+    'pdb' => 'application/vnd.palm',
+    'pdf' => 'application/pdf',
+    'pfa' => 'application/x-font-type1',
+    'pfb' => 'application/x-font-type1',
+    'pfm' => 'application/x-font-type1',
+    'pfr' => 'application/font-tdpfr',
+    'pfx' => 'application/x-pkcs12',
+    'pgm' => 'image/x-portable-graymap',
+    'pgn' => 'application/x-chess-pgn',
+    'pgp' => 'application/pgp-encrypted',
+    'php' => 'application/x-php',
+    'php3' => 'application/x-php',
+    'php4' => 'application/x-php',
+    'php5' => 'application/x-php',
+    'pic' => 'image/x-pict',
+    'pkg' => 'application/octet-stream',
+    'pki' => 'application/pkixcmp',
+    'pkipath' => 'application/pkix-pkipath',
+    'plb' => 'application/vnd.3gpp.pic-bw-large',
+    'plc' => 'application/vnd.mobius.plc',
+    'plf' => 'application/vnd.pocketlearn',
+    'pls' => 'application/pls+xml',
+    'pml' => 'application/vnd.ctc-posml',
+    'png' => 'image/png',
+    'pnm' => 'image/x-portable-anymap',
+    'portpkg' => 'application/vnd.macports.portpkg',
+    'pot' => 'application/vnd.ms-powerpoint',
+    'potm' => 'application/vnd.ms-powerpoint.template.macroenabled.12',
+    'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
+    'ppam' => 'application/vnd.ms-powerpoint.addin.macroenabled.12',
+    'ppd' => 'application/vnd.cups-ppd',
+    'ppm' => 'image/x-portable-pixmap',
+    'pps' => 'application/vnd.ms-powerpoint',
+    'ppsm' => 'application/vnd.ms-powerpoint.slideshow.macroenabled.12',
+    'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+    'ppt' => 'application/vnd.ms-powerpoint',
+    'pptm' => 'application/vnd.ms-powerpoint.presentation.macroenabled.12',
+    'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+    'pqa' => 'application/vnd.palm',
+    'prc' => 'application/x-mobipocket-ebook',
+    'pre' => 'application/vnd.lotus-freelance',
+    'prf' => 'application/pics-rules',
+    'ps' => 'application/postscript',
+    'psb' => 'application/vnd.3gpp.pic-bw-small',
+    'psd' => 'image/vnd.adobe.photoshop',
+    'psf' => 'application/x-font-linux-psf',
+    'pskcxml' => 'application/pskc+xml',
+    'ptid' => 'application/vnd.pvi.ptid1',
+    'pub' => 'application/x-mspublisher',
+    'pvb' => 'application/vnd.3gpp.pic-bw-var',
+    'pwn' => 'application/vnd.3m.post-it-notes',
+    'pya' => 'audio/vnd.ms-playready.media.pya',
+    'pyv' => 'video/vnd.ms-playready.media.pyv',
+    'qam' => 'application/vnd.epson.quickanime',
+    'qbo' => 'application/vnd.intu.qbo',
+    'qfx' => 'application/vnd.intu.qfx',
+    'qps' => 'application/vnd.publishare-delta-tree',
+    'qt' => 'video/quicktime',
+    'qwd' => 'application/vnd.quark.quarkxpress',
+    'qwt' => 'application/vnd.quark.quarkxpress',
+    'qxb' => 'application/vnd.quark.quarkxpress',
+    'qxd' => 'application/vnd.quark.quarkxpress',
+    'qxl' => 'application/vnd.quark.quarkxpress',
+    'qxt' => 'application/vnd.quark.quarkxpress',
+    'ra' => 'audio/x-pn-realaudio',
+    'ram' => 'audio/x-pn-realaudio',
+    'rar' => 'application/x-rar-compressed',
+    'ras' => 'image/x-cmu-raster',
+    'rcprofile' => 'application/vnd.ipunplugged.rcprofile',
+    'rdf' => 'application/rdf+xml',
+    'rdz' => 'application/vnd.data-vision.rdz',
+    'rep' => 'application/vnd.businessobjects',
+    'res' => 'application/x-dtbresource+xml',
+    'rgb' => 'image/x-rgb',
+    'rif' => 'application/reginfo+xml',
+    'rip' => 'audio/vnd.rip',
+    'ris' => 'application/x-research-info-systems',
+    'rl' => 'application/resource-lists+xml',
+    'rlc' => 'image/vnd.fujixerox.edmics-rlc',
+    'rld' => 'application/resource-lists-diff+xml',
+    'rm' => 'application/vnd.rn-realmedia',
+    'rmi' => 'audio/midi',
+    'rmp' => 'audio/x-pn-realaudio-plugin',
+    'rms' => 'application/vnd.jcp.javame.midlet-rms',
+    'rmvb' => 'application/vnd.rn-realmedia-vbr',
+    'rnc' => 'application/relax-ng-compact-syntax',
+    'roa' => 'application/rpki-roa',
+    'roff' => 'text/troff',
+    'rp9' => 'application/vnd.cloanto.rp9',
+    'rpss' => 'application/vnd.nokia.radio-presets',
+    'rpst' => 'application/vnd.nokia.radio-preset',
+    'rq' => 'application/sparql-query',
+    'rs' => 'application/rls-services+xml',
+    'rsd' => 'application/rsd+xml',
+    'rss' => 'application/rss+xml',
+    'rtf' => 'application/rtf',
+    'rtx' => 'text/richtext',
+    's' => 'text/x-asm',
+    's3m' => 'audio/s3m',
+    'saf' => 'application/vnd.yamaha.smaf-audio',
+    'sbml' => 'application/sbml+xml',
+    'sc' => 'application/vnd.ibm.secure-container',
+    'scd' => 'application/x-msschedule',
+    'scm' => 'application/vnd.lotus-screencam',
+    'scq' => 'application/scvp-cv-request',
+    'scs' => 'application/scvp-cv-response',
+    'scurl' => 'text/vnd.curl.scurl',
+    'sda' => 'application/vnd.stardivision.draw',
+    'sdc' => 'application/vnd.stardivision.calc',
+    'sdd' => 'application/vnd.stardivision.impress',
+    'sdkd' => 'application/vnd.solent.sdkm+xml',
+    'sdkm' => 'application/vnd.solent.sdkm+xml',
+    'sdp' => 'application/sdp',
+    'sdw' => 'application/vnd.stardivision.writer',
+    'see' => 'application/vnd.seemail',
+    'seed' => 'application/vnd.fdsn.seed',
+    'sema' => 'application/vnd.sema',
+    'semd' => 'application/vnd.semd',
+    'semf' => 'application/vnd.semf',
+    'ser' => 'application/java-serialized-object',
+    'setpay' => 'application/set-payment-initiation',
+    'setreg' => 'application/set-registration-initiation',
+    'sfd-hdstx' => 'application/vnd.hydrostatix.sof-data',
+    'sfs' => 'application/vnd.spotfire.sfs',
+    'sfv' => 'text/x-sfv',
+    'sgi' => 'image/sgi',
+    'sgl' => 'application/vnd.stardivision.writer-global',
+    'sgm' => 'text/sgml',
+    'sgml' => 'text/sgml',
+    'sh' => 'application/x-sh',
+    'shar' => 'application/x-shar',
+    'shf' => 'application/shf+xml',
+    'sid' => 'image/x-mrsid-image',
+    'sig' => 'application/pgp-signature',
+    'sil' => 'audio/silk',
+    'silo' => 'model/mesh',
+    'sis' => 'application/vnd.symbian.install',
+    'sisx' => 'application/vnd.symbian.install',
+    'sit' => 'application/x-stuffit',
+    'sitx' => 'application/x-stuffitx',
+    'skd' => 'application/vnd.koan',
+    'skm' => 'application/vnd.koan',
+    'skp' => 'application/vnd.koan',
+    'skt' => 'application/vnd.koan',
+    'sldm' => 'application/vnd.ms-powerpoint.slide.macroenabled.12',
+    'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
+    'slt' => 'application/vnd.epson.salt',
+    'sm' => 'application/vnd.stepmania.stepchart',
+    'smf' => 'application/vnd.stardivision.math',
+    'smi' => 'application/smil+xml',
+    'smil' => 'application/smil+xml',
+    'smv' => 'video/x-smv',
+    'smzip' => 'application/vnd.stepmania.package',
+    'snd' => 'audio/basic',
+    'snf' => 'application/x-font-snf',
+    'so' => 'application/octet-stream',
+    'spc' => 'application/x-pkcs7-certificates',
+    'spf' => 'application/vnd.yamaha.smaf-phrase',
+    'spl' => 'application/x-futuresplash',
+    'spot' => 'text/vnd.in3d.spot',
+    'spp' => 'application/scvp-vp-response',
+    'spq' => 'application/scvp-vp-request',
+    'spx' => 'audio/ogg',
+    'sql' => 'application/x-sql',
+    'src' => 'application/x-wais-source',
+    'srt' => 'application/x-subrip',
+    'sru' => 'application/sru+xml',
+    'srx' => 'application/sparql-results+xml',
+    'ssdl' => 'application/ssdl+xml',
+    'sse' => 'application/vnd.kodak-descriptor',
+    'ssf' => 'application/vnd.epson.ssf',
+    'ssml' => 'application/ssml+xml',
+    'st' => 'application/vnd.sailingtracker.track',
+    'stc' => 'application/vnd.sun.xml.calc.template',
+    'std' => 'application/vnd.sun.xml.draw.template',
+    'stf' => 'application/vnd.wt.stf',
+    'sti' => 'application/vnd.sun.xml.impress.template',
+    'stk' => 'application/hyperstudio',
+    'stl' => 'application/vnd.ms-pki.stl',
+    'str' => 'application/vnd.pg.format',
+    'stw' => 'application/vnd.sun.xml.writer.template',
+    'sub' => 'text/vnd.dvb.subtitle',
+    'sus' => 'application/vnd.sus-calendar',
+    'susp' => 'application/vnd.sus-calendar',
+    'sv4cpio' => 'application/x-sv4cpio',
+    'sv4crc' => 'application/x-sv4crc',
+    'svc' => 'application/vnd.dvb.service',
+    'svd' => 'application/vnd.svd',
+    'svg' => 'image/svg+xml',
+    'svgz' => 'image/svg+xml',
+    'swa' => 'application/x-director',
+    'swf' => 'application/x-shockwave-flash',
+    'swi' => 'application/vnd.aristanetworks.swi',
+    'sxc' => 'application/vnd.sun.xml.calc',
+    'sxd' => 'application/vnd.sun.xml.draw',
+    'sxg' => 'application/vnd.sun.xml.writer.global',
+    'sxi' => 'application/vnd.sun.xml.impress',
+    'sxm' => 'application/vnd.sun.xml.math',
+    'sxw' => 'application/vnd.sun.xml.writer',
+    't' => 'text/troff',
+    't3' => 'application/x-t3vm-image',
+    'taglet' => 'application/vnd.mynfc',
+    'tao' => 'application/vnd.tao.intent-module-archive',
+    'tar' => 'application/x-tar',
+    'tcap' => 'application/vnd.3gpp2.tcap',
+    'tcl' => 'application/x-tcl',
+    'teacher' => 'application/vnd.smart.teacher',
+    'tei' => 'application/tei+xml',
+    'teicorpus' => 'application/tei+xml',
+    'tex' => 'application/x-tex',
+    'texi' => 'application/x-texinfo',
+    'texinfo' => 'application/x-texinfo',
+    'text' => 'text/plain',
+    'tfi' => 'application/thraud+xml',
+    'tfm' => 'application/x-tex-tfm',
+    'tga' => 'image/x-tga',
+    'thmx' => 'application/vnd.ms-officetheme',
+    'tif' => 'image/tiff',
+    'tiff' => 'image/tiff',
+    'tmo' => 'application/vnd.tmobile-livetv',
+    'torrent' => 'application/x-bittorrent',
+    'tpl' => 'application/vnd.groove-tool-template',
+    'tpt' => 'application/vnd.trid.tpt',
+    'tr' => 'text/troff',
+    'tra' => 'application/vnd.trueapp',
+    'trm' => 'application/x-msterminal',
+    'tsd' => 'application/timestamped-data',
+    'tsv' => 'text/tab-separated-values',
+    'ttc' => 'application/x-font-ttf',
+    'ttf' => 'application/x-font-ttf',
+    'ttl' => 'text/turtle',
+    'twd' => 'application/vnd.simtech-mindmapper',
+    'twds' => 'application/vnd.simtech-mindmapper',
+    'txd' => 'application/vnd.genomatix.tuxedo',
+    'txf' => 'application/vnd.mobius.txf',
+    'txt' => 'text/plain',
+    'u32' => 'application/x-authorware-bin',
+    'udeb' => 'application/x-debian-package',
+    'ufd' => 'application/vnd.ufdl',
+    'ufdl' => 'application/vnd.ufdl',
+    'ulx' => 'application/x-glulx',
+    'umj' => 'application/vnd.umajin',
+    'unityweb' => 'application/vnd.unity',
+    'uoml' => 'application/vnd.uoml+xml',
+    'uri' => 'text/uri-list',
+    'uris' => 'text/uri-list',
+    'urls' => 'text/uri-list',
+    'ustar' => 'application/x-ustar',
+    'utz' => 'application/vnd.uiq.theme',
+    'uu' => 'text/x-uuencode',
+    'uva' => 'audio/vnd.dece.audio',
+    'uvd' => 'application/vnd.dece.data',
+    'uvf' => 'application/vnd.dece.data',
+    'uvg' => 'image/vnd.dece.graphic',
+    'uvh' => 'video/vnd.dece.hd',
+    'uvi' => 'image/vnd.dece.graphic',
+    'uvm' => 'video/vnd.dece.mobile',
+    'uvp' => 'video/vnd.dece.pd',
+    'uvs' => 'video/vnd.dece.sd',
+    'uvt' => 'application/vnd.dece.ttml+xml',
+    'uvu' => 'video/vnd.uvvu.mp4',
+    'uvv' => 'video/vnd.dece.video',
+    'uvva' => 'audio/vnd.dece.audio',
+    'uvvd' => 'application/vnd.dece.data',
+    'uvvf' => 'application/vnd.dece.data',
+    'uvvg' => 'image/vnd.dece.graphic',
+    'uvvh' => 'video/vnd.dece.hd',
+    'uvvi' => 'image/vnd.dece.graphic',
+    'uvvm' => 'video/vnd.dece.mobile',
+    'uvvp' => 'video/vnd.dece.pd',
+    'uvvs' => 'video/vnd.dece.sd',
+    'uvvt' => 'application/vnd.dece.ttml+xml',
+    'uvvu' => 'video/vnd.uvvu.mp4',
+    'uvvv' => 'video/vnd.dece.video',
+    'uvvx' => 'application/vnd.dece.unspecified',
+    'uvvz' => 'application/vnd.dece.zip',
+    'uvx' => 'application/vnd.dece.unspecified',
+    'uvz' => 'application/vnd.dece.zip',
+    'vcard' => 'text/vcard',
+    'vcd' => 'application/x-cdlink',
+    'vcf' => 'text/x-vcard',
+    'vcg' => 'application/vnd.groove-vcard',
+    'vcs' => 'text/x-vcalendar',
+    'vcx' => 'application/vnd.vcx',
+    'vis' => 'application/vnd.visionary',
+    'viv' => 'video/vnd.vivo',
+    'vob' => 'video/x-ms-vob',
+    'vor' => 'application/vnd.stardivision.writer',
+    'vox' => 'application/x-authorware-bin',
+    'vrml' => 'model/vrml',
+    'vsd' => 'application/vnd.visio',
+    'vsf' => 'application/vnd.vsf',
+    'vss' => 'application/vnd.visio',
+    'vst' => 'application/vnd.visio',
+    'vsw' => 'application/vnd.visio',
+    'vtu' => 'model/vnd.vtu',
+    'vxml' => 'application/voicexml+xml',
+    'w3d' => 'application/x-director',
+    'wad' => 'application/x-doom',
+    'wav' => 'audio/x-wav',
+    'wax' => 'audio/x-ms-wax',
+    'wbmp' => 'image/vnd.wap.wbmp',
+    'wbs' => 'application/vnd.criticaltools.wbs+xml',
+    'wbxml' => 'application/vnd.wap.wbxml',
+    'wcm' => 'application/vnd.ms-works',
+    'wdb' => 'application/vnd.ms-works',
+    'wdp' => 'image/vnd.ms-photo',
+    'weba' => 'audio/webm',
+    'webm' => 'video/webm',
+    'webp' => 'image/webp',
+    'wg' => 'application/vnd.pmi.widget',
+    'wgt' => 'application/widget',
+    'wks' => 'application/vnd.ms-works',
+    'wm' => 'video/x-ms-wm',
+    'wma' => 'audio/x-ms-wma',
+    'wmd' => 'application/x-ms-wmd',
+    'wmf' => 'application/x-msmetafile',
+    'wml' => 'text/vnd.wap.wml',
+    'wmlc' => 'application/vnd.wap.wmlc',
+    'wmls' => 'text/vnd.wap.wmlscript',
+    'wmlsc' => 'application/vnd.wap.wmlscriptc',
+    'wmv' => 'video/x-ms-wmv',
+    'wmx' => 'video/x-ms-wmx',
+    'wmz' => 'application/x-msmetafile',
+    'woff' => 'application/font-woff',
+    'wpd' => 'application/vnd.wordperfect',
+    'wpl' => 'application/vnd.ms-wpl',
+    'wps' => 'application/vnd.ms-works',
+    'wqd' => 'application/vnd.wqd',
+    'wri' => 'application/x-mswrite',
+    'wrl' => 'model/vrml',
+    'wsdl' => 'application/wsdl+xml',
+    'wspolicy' => 'application/wspolicy+xml',
+    'wtb' => 'application/vnd.webturbo',
+    'wvx' => 'video/x-ms-wvx',
+    'x32' => 'application/x-authorware-bin',
+    'x3d' => 'model/x3d+xml',
+    'x3db' => 'model/x3d+binary',
+    'x3dbz' => 'model/x3d+binary',
+    'x3dv' => 'model/x3d+vrml',
+    'x3dvz' => 'model/x3d+vrml',
+    'x3dz' => 'model/x3d+xml',
+    'xaml' => 'application/xaml+xml',
+    'xap' => 'application/x-silverlight-app',
+    'xar' => 'application/vnd.xara',
+    'xbap' => 'application/x-ms-xbap',
+    'xbd' => 'application/vnd.fujixerox.docuworks.binder',
+    'xbm' => 'image/x-xbitmap',
+    'xdf' => 'application/xcap-diff+xml',
+    'xdm' => 'application/vnd.syncml.dm+xml',
+    'xdp' => 'application/vnd.adobe.xdp+xml',
+    'xdssc' => 'application/dssc+xml',
+    'xdw' => 'application/vnd.fujixerox.docuworks',
+    'xenc' => 'application/xenc+xml',
+    'xer' => 'application/patch-ops-error+xml',
+    'xfdf' => 'application/vnd.adobe.xfdf',
+    'xfdl' => 'application/vnd.xfdl',
+    'xht' => 'application/xhtml+xml',
+    'xhtml' => 'application/xhtml+xml',
+    'xhvml' => 'application/xv+xml',
+    'xif' => 'image/vnd.xiff',
+    'xla' => 'application/vnd.ms-excel',
+    'xlam' => 'application/vnd.ms-excel.addin.macroenabled.12',
+    'xlc' => 'application/vnd.ms-excel',
+    'xlf' => 'application/x-xliff+xml',
+    'xlm' => 'application/vnd.ms-excel',
+    'xls' => 'application/vnd.ms-excel',
+    'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroenabled.12',
+    'xlsm' => 'application/vnd.ms-excel.sheet.macroenabled.12',
+    'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+    'xlt' => 'application/vnd.ms-excel',
+    'xltm' => 'application/vnd.ms-excel.template.macroenabled.12',
+    'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+    'xlw' => 'application/vnd.ms-excel',
+    'xm' => 'audio/xm',
+    'xml' => 'application/xml',
+    'xo' => 'application/vnd.olpc-sugar',
+    'xop' => 'application/xop+xml',
+    'xpi' => 'application/x-xpinstall',
+    'xpl' => 'application/xproc+xml',
+    'xpm' => 'image/x-xpixmap',
+    'xpr' => 'application/vnd.is-xpr',
+    'xps' => 'application/vnd.ms-xpsdocument',
+    'xpw' => 'application/vnd.intercon.formnet',
+    'xpx' => 'application/vnd.intercon.formnet',
+    'xsl' => 'application/xml',
+    'xslt' => 'application/xslt+xml',
+    'xsm' => 'application/vnd.syncml+xml',
+    'xspf' => 'application/xspf+xml',
+    'xul' => 'application/vnd.mozilla.xul+xml',
+    'xvm' => 'application/xv+xml',
+    'xvml' => 'application/xv+xml',
+    'xwd' => 'image/x-xwindowdump',
+    'xyz' => 'chemical/x-xyz',
+    'xz' => 'application/x-xz',
+    'yang' => 'application/yang',
+    'yin' => 'application/yin+xml',
+    'z1' => 'application/x-zmachine',
+    'z2' => 'application/x-zmachine',
+    'z3' => 'application/x-zmachine',
+    'z4' => 'application/x-zmachine',
+    'z5' => 'application/x-zmachine',
+    'z6' => 'application/x-zmachine',
+    'z7' => 'application/x-zmachine',
+    'z8' => 'application/x-zmachine',
+    'zaz' => 'application/vnd.zzazz.deck+xml',
+    'zip' => 'application/zip',
+    'zir' => 'application/vnd.zul',
+    'zirz' => 'application/vnd.zul',
+    'zmm' => 'application/vnd.handheld-entertainment+xml',
+    '123' => 'application/vnd.lotus-1-2-3',
+);
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/preferences.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/preferences.php
similarity index 53%
rename from lib/vendor/symfony/lib/vendor/swiftmailer/preferences.php
rename to lib/vendor/symfony/lib/vendor/swiftmailer/lib/preferences.php
index 0b9e4b1ff..e51950148 100644
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/preferences.php
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/preferences.php
@@ -6,15 +6,20 @@
 /*                                                                          */
 /****************************************************************************/
 
+$preferences = Swift_Preferences::getInstance();
+
 // Sets the default charset so that setCharset() is not needed elsewhere
-Swift_Preferences::getInstance()->setCharset('utf-8');
+$preferences->setCharset('utf-8');
+
+// Without these lines the default caching mechanism is "array" but this uses a lot of memory.
+// If possible, use a disk cache to enable attaching large attachments etc.
+// You can override the default temporary directory by setting the TMPDIR environment variable.
+if (@is_writable($tmpDir = sys_get_temp_dir())) {
+    $preferences->setTempDir($tmpDir)->setCacheType('disk');
+}
 
-// Without these lines the default caching mechanism is "array" but this uses
-// a lot of memory.
-// If possible, use a disk cache to enable attaching large attachments etc
-if (function_exists('sys_get_temp_dir') && is_writable(sys_get_temp_dir()))
-{
-  Swift_Preferences::getInstance()
-    -> setTempDir(sys_get_temp_dir())
-    -> setCacheType('disk');
+// this should only be done when Swiftmailer won't use the native QP content encoder
+// see mime_deps.php
+if (version_compare(phpversion(), '5.4.7', '<')) {
+    $preferences->setQPDotEscape(false);
 }
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/swift_init.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/swift_init.php
new file mode 100644
index 000000000..ff7196344
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/swift_init.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/*
+ * Dependency injection initialization for Swift Mailer.
+ */
+
+if (defined('SWIFT_INIT_LOADED')) {
+    return;
+}
+
+define('SWIFT_INIT_LOADED', true);
+
+// Load in dependency maps
+require __DIR__.'/dependency_maps/cache_deps.php';
+require __DIR__.'/dependency_maps/mime_deps.php';
+require __DIR__.'/dependency_maps/message_deps.php';
+require __DIR__.'/dependency_maps/transport_deps.php';
+
+// Load in global library preferences
+require __DIR__.'/preferences.php';
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/swift_required.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/swift_required.php
new file mode 100644
index 000000000..03a72ceae
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/swift_required.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/*
+ * Autoloader and dependency injection initialization for Swift Mailer.
+ */
+
+if (class_exists('Swift', false)) {
+    return;
+}
+
+// Load Swift utility class
+require __DIR__.'/classes/Swift.php';
+
+if (!function_exists('_swiftmailer_init')) {
+    function _swiftmailer_init()
+    {
+        require __DIR__.'/swift_init.php';
+    }
+}
+
+// Start the autoloader and lazy-load the init script to set up dependency injection
+Swift::registerAutoload('_swiftmailer_init');
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/swift_required_pear.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/swift_required_pear.php
new file mode 100644
index 000000000..2b5181a93
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/swift_required_pear.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/*
+ * Autoloader and dependency injection initialization for Swift Mailer.
+ */
+
+if (class_exists('Swift', false)) {
+    return;
+}
+
+// Load Swift utility class
+require __DIR__.'/Swift.php';
+
+if (!function_exists('_swiftmailer_init')) {
+    function _swiftmailer_init()
+    {
+        require __DIR__.'/swift_init.php';
+    }
+}
+
+// Start the autoloader and lazy-load the init script to set up dependency injection
+Swift::registerAutoload('_swiftmailer_init');
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/lib/swiftmailer_generate_mimes_config.php b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/swiftmailer_generate_mimes_config.php
new file mode 100755
index 000000000..3bb878072
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/lib/swiftmailer_generate_mimes_config.php
@@ -0,0 +1,193 @@
+#!/usr/bin/php
+
+<?php
+define('APACHE_MIME_TYPES_URL', 'http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types');
+define('FREEDESKTOP_XML_URL', 'https://raw2.github.com/minad/mimemagic/master/script/freedesktop.org.xml');
+
+function generateUpToDateMimeArray()
+{
+    $preamble = "<?php\n\n";
+    $preamble .= "/*\n";
+    $preamble .= " * This file is part of SwiftMailer.\n";
+    $preamble .= " * (c) 2004-2009 Chris Corbyn\n *\n";
+    $preamble .= " * For the full copyright and license information, please view the LICENSE\n";
+    $preamble .= " * file that was distributed with this source code.\n *\n";
+    $preamble .= " * autogenerated using http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types\n";
+    $preamble .= " * and https://raw.github.com/minad/mimemagic/master/script/freedesktop.org.xml\n";
+    $preamble .= " */\n\n";
+    $preamble .= "/*\n";
+    $preamble .= " * List of MIME type automatically detected in Swift Mailer.\n";
+    $preamble .= " */\n\n";
+    $preamble .= "// You may add or take away what you like (lowercase required)\n\n";
+
+    // get current mime types files
+    $mime_types = @file_get_contents(APACHE_MIME_TYPES_URL);
+    $mime_xml = @file_get_contents(FREEDESKTOP_XML_URL);
+
+    // prepare valid mime types
+    $valid_mime_types = array();
+
+    // split mime type and extensions eg. "video/x-matroska        mkv mk3d mks"
+    if (preg_match_all('/^#?([a-z0-9\-\+\/\.]+)[\t]+(.*)$/miu', $mime_types, $matches) !== false) {
+        // collection of predefined mimetypes (bugfix for wrong resolved or missing mime types)
+        $valid_mime_types_preset = array(
+            'php' => 'application/x-php',
+            'php3' => 'application/x-php',
+            'php4' => 'application/x-php',
+            'php5' => 'application/x-php',
+            'zip' => 'application/zip',
+            'gif' => 'image/gif',
+            'png' => 'image/png',
+            'css' => 'text/css',
+            'js' => 'text/javascript',
+            'txt' => 'text/plain',
+            'aif' => 'audio/x-aiff',
+            'aiff' => 'audio/x-aiff',
+            'avi' => 'video/avi',
+            'bmp' => 'image/bmp',
+            'bz2' => 'application/x-bz2',
+            'csv' => 'text/csv',
+            'dmg' => 'application/x-apple-diskimage',
+            'doc' => 'application/msword',
+            'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+            'eml' => 'message/rfc822',
+            'aps' => 'application/postscript',
+            'exe' => 'application/x-ms-dos-executable',
+            'flv' => 'video/x-flv',
+            'gz' => 'application/x-gzip',
+            'hqx' => 'application/stuffit',
+            'htm' => 'text/html',
+            'html' => 'text/html',
+            'jar' => 'application/x-java-archive',
+            'jpeg' => 'image/jpeg',
+            'jpg' => 'image/jpeg',
+            'm3u' => 'audio/x-mpegurl',
+            'm4a' => 'audio/mp4',
+            'mdb' => 'application/x-msaccess',
+            'mid' => 'audio/midi',
+            'midi' => 'audio/midi',
+            'mov' => 'video/quicktime',
+            'mp3' => 'audio/mpeg',
+            'mp4' => 'video/mp4',
+            'mpeg' => 'video/mpeg',
+            'mpg' => 'video/mpeg',
+            'odg' => 'vnd.oasis.opendocument.graphics',
+            'odp' => 'vnd.oasis.opendocument.presentation',
+            'odt' => 'vnd.oasis.opendocument.text',
+            'ods' => 'vnd.oasis.opendocument.spreadsheet',
+            'ogg' => 'audio/ogg',
+            'pdf' => 'application/pdf',
+            'ppt' => 'application/vnd.ms-powerpoint',
+            'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+            'ps' => 'application/postscript',
+            'rar' => 'application/x-rar-compressed',
+            'rtf' => 'application/rtf',
+            'tar' => 'application/x-tar',
+            'sit' => 'application/x-stuffit',
+            'svg' => 'image/svg+xml',
+            'tif' => 'image/tiff',
+            'tiff' => 'image/tiff',
+            'ttf' => 'application/x-font-truetype',
+            'vcf' => 'text/x-vcard',
+            'wav' => 'audio/wav',
+            'wma' => 'audio/x-ms-wma',
+            'wmv' => 'audio/x-ms-wmv',
+            'xls' => 'application/excel',
+            'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+            'xml' => 'application/xml',
+        );
+
+        // wrap array for generating file
+        foreach ($valid_mime_types_preset as $extension => $mime_type) {
+            // generate array for mimetype to extension resolver (only first match)
+            $valid_mime_types[$extension] = "'{$extension}' => '{$mime_type}'";
+        }
+
+        // collect extensions
+        $valid_extensions = array();
+
+        // all extensions from second match
+        foreach ($matches[2] as $i => $extensions) {
+            // explode multiple extensions from string
+            $extensions = explode(' ', strtolower($extensions));
+
+            // force array for foreach
+            if (!is_array($extensions)) {
+                $extensions = array($extensions);
+            }
+
+            foreach ($extensions as $extension) {
+                // get mime type
+                $mime_type = $matches[1][$i];
+
+                // check if string length lower than 10
+                if (strlen($extension) < 10) {
+                    // add extension
+                    $valid_extensions[] = $extension;
+
+                    if (!isset($valid_mime_types[$mime_type])) {
+                        // generate array for mimetype to extension resolver (only first match)
+                        $valid_mime_types[$extension] = "'{$extension}' => '{$mime_type}'";
+                    }
+                }
+            }
+        }
+    }
+
+    $xml = simplexml_load_string($mime_xml);
+
+    foreach ($xml as $node) {
+        // check if there is no pattern
+        if (!isset($node->glob['pattern'])) {
+            continue;
+        }
+
+        // get all matching extensions from match
+        foreach ((array) $node->glob['pattern'] as $extension) {
+            // skip none glob extensions
+            if (strpos($extension, '.') === false) {
+                continue;
+            }
+
+            // remove get only last part
+            $extension = explode('.', strtolower($extension));
+            $extension = end($extension);
+
+            // maximum length in database column
+            if (strlen($extension) <= 9) {
+                $valid_extensions[] = $extension;
+            }
+        }
+
+        if (isset($node->glob['pattern'][0])) {
+            // mime type
+            $mime_type = strtolower((string) $node['type']);
+
+            // get first extension
+            $extension = strtolower(trim($node->glob['ddpattern'][0], '*.'));
+
+            // skip none glob extensions and check if string length between 1 and 10
+            if (strpos($extension, '.') !== false || strlen($extension) < 1 || strlen($extension) > 9) {
+                continue;
+            }
+
+            // check if string length lower than 10
+            if (!isset($valid_mime_types[$mime_type])) {
+                // generate array for mimetype to extension resolver (only first match)
+                $valid_mime_types[$extension] = "'{$extension}' => '{$mime_type}'";
+            }
+        }
+    }
+
+    // full list of valid extensions only
+    $valid_mime_types = array_unique($valid_mime_types);
+    ksort($valid_mime_types);
+
+    // combine mime types and extensions array
+    $output = "$preamble\$swift_mime_types = array(\n    ".implode($valid_mime_types, ",\n    ")."\n);";
+
+    // write mime_types.php config file
+    @file_put_contents('./mime_types.php', $output);
+}
+
+generateUpToDateMimeArray();
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/mime_types.php b/lib/vendor/symfony/lib/vendor/swiftmailer/mime_types.php
deleted file mode 100644
index 65c9aa077..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/mime_types.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/*
- * List of MIME type automatically detected in Swift Mailer.
- */
-
-//You may add or take away what you like (lowercase required)
-
-$swift_mime_types = array(
-  'aif'  => 'audio/x-aiff',
-  'aiff' => 'audio/x-aiff',
-  'avi'  => 'video/avi',
-  'bmp'  => 'image/bmp',
-  'bz2'  => 'application/x-bz2',
-  'csv'  => 'text/csv',
-  'dmg'  => 'application/x-apple-diskimage',
-  'doc'  => 'application/msword',
-  'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-  'eml'  => 'message/rfc822',
-  'aps'  => 'application/postscript',
-  'exe'  => 'application/x-ms-dos-executable',
-  'flv'  => 'video/x-flv',
-  'gif'  => 'image/gif',
-  'gz'   => 'application/x-gzip',
-  'hqx'  => 'application/stuffit',
-  'htm'  => 'text/html',
-  'html' => 'text/html',
-  'jar'  => 'application/x-java-archive',
-  'jpeg' => 'image/jpeg',
-  'jpg'  => 'image/jpeg',
-  'm3u'  => 'audio/x-mpegurl',
-  'm4a'  => 'audio/mp4',
-  'mdb'  => 'application/x-msaccess',
-  'mid'  => 'audio/midi',
-  'midi' => 'audio/midi',
-  'mov'  => 'video/quicktime',
-  'mp3'  => 'audio/mpeg',
-  'mp4'  => 'video/mp4',
-  'mpeg' => 'video/mpeg',
-  'mpg'  => 'video/mpeg',
-  'odg'  => 'vnd.oasis.opendocument.graphics',
-  'odp'  => 'vnd.oasis.opendocument.presentation',
-  'odt'  => 'vnd.oasis.opendocument.text',
-  'ods'  => 'vnd.oasis.opendocument.spreadsheet',
-  'ogg'  => 'audio/ogg',
-  'pdf'  => 'application/pdf',
-  'png'  => 'image/png',
-  'ppt'  => 'application/vnd.ms-powerpoint',
-  'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-  'ps'   => 'application/postscript',
-  'rar'  => 'application/x-rar-compressed',
-  'rtf'  => 'application/rtf',
-  'tar'  => 'application/x-tar',
-  'sit'  => 'application/x-stuffit',
-  'svg'  => 'image/svg+xml',
-  'tif'  => 'image/tiff',
-  'tiff' => 'image/tiff',
-  'ttf'  => 'application/x-font-truetype',
-  'txt'  => 'text/plain',
-  'vcf'  => 'text/x-vcard',
-  'wav'  => 'audio/wav',
-  'wma'  => 'audio/x-ms-wma',
-  'wmv'  => 'audio/x-ms-wmv',
-  'xls'  => 'application/excel',
-  'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-  'xml'  => 'application/xml',
-  'zip'  => 'application/zip'
-);
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/APPS b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/APPS
new file mode 100644
index 000000000..b06b4cc03
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/APPS
@@ -0,0 +1,15 @@
+Applications I need to test with
+---------------------------------
+
+Standalone (can read .eml files):
+---------------------------------
+Microsoft Entourage (can assume same as outlook)
+Mozilla Thunderbird
+Apple Mail
+
+Web-based:
+----------
+Hotmail
+Gmail
+Yahoo!
+Mail2Web
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/CHARSETS b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/CHARSETS
new file mode 100644
index 000000000..6a97a89c4
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/CHARSETS
@@ -0,0 +1,46 @@
+Following is a list of character sets along with their widths:
+--------------------------------------------------------------
+
+1 Octet 8bit:
+-------------
+Windows 125* (CP125*)
+CP*
+ANSI
+ISO-8859-* (IEC-8859-*)
+Macintosh (Mac OS Roman)
+KOI8-U (potentially KOI*8-*)
+KOI8-R
+MIK
+Cork (T1)
+ISCII
+VISCII
+
+
+1 Octet 7bit:
+-------------
+US-ASCII
+K0I7
+
+2 octets 16 bit:
+----------------
+UCS-2
+UTF-16* (UTF-16BE etc)
+
+4-octets 32 bit:
+----------------
+UCS-4
+UTF-32
+
+Variable-width:
+----------------------------
+Big5 - http://en.wikipedia.org/wiki/Big5 (1-2 bytes: 00-7f=1, 81-fe=2)
+HKSCS - http://en.wikipedia.org/wiki/HKSCS (a big5 variant, but some variants use 10646)
+ISO-10646 (IEC-10646) - http://en.wikipedia.org/wiki/ISO_10646 (unicode)
+UTF-8 (1-5 bytes)
+ISO-2022 (IEC-2022) - http://en.wikipedia.org/wiki/ISO_2022
+Shift-JIS - http://en.wikipedia.org/wiki/Shift-JIS
+
+A good resource:
+----------------
+http://en.wikipedia.org/wiki/Character_encoding#Simple_character_sets
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/message.xml b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/message.xml
new file mode 100644
index 000000000..1183ecaab
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/message.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<message>
+  <subject>Some test message</subject>
+  <to name="Chris Corbyn">chris@w3style.co.uk</to>
+  <to name="Mark Corbyn">mark@swiftmailer.org</to>
+  <from>chris.corbyn@sitepoint.com</from>
+  <content-type>text/plain</content-type>
+  <body>
+    Here's a recipe for beef stifado
+  </body>
+  <part>
+    <content-type>text/html</content-type>
+    <body>
+      This is the other part
+    </body>
+  </part>
+  <attachment>
+    <content-type>application/pdf</content-type>
+    <filename>stifado.pdf</filename>
+    <body type="file">/path/to/stifado.pdf</body>
+  </attachment>
+</message>
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc0821.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc0821.txt
new file mode 100644
index 000000000..d877b72cf
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc0821.txt
@@ -0,0 +1,4050 @@
+
+                                                                        
+
+   RFC 821
+                                    
+                                    
+                                    
+                                    
+                                    
+                     SIMPLE MAIL TRANSFER PROTOCOL
+                                    
+                                    
+                                    
+                           Jonathan B. Postel
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+                              August 1982
+                                    
+                                    
+                                    
+                     Information Sciences Institute
+                   University of Southern California
+                           4676 Admiralty Way
+                   Marina del Rey, California  90291
+
+                             (213) 822-1511
+
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+                           TABLE OF CONTENTS
+
+   1.  INTRODUCTION .................................................. 1
+
+   2.  THE SMTP MODEL ................................................ 2
+
+   3.  THE SMTP PROCEDURE ............................................ 4
+
+      3.1.  Mail ..................................................... 4
+      3.2.  Forwarding ............................................... 7
+      3.3.  Verifying and Expanding .................................. 8
+      3.4.  Sending and Mailing ..................................... 11
+      3.5.  Opening and Closing ..................................... 13
+      3.6.  Relaying ................................................ 14
+      3.7.  Domains ................................................. 17
+      3.8.  Changing Roles .......................................... 18
+
+   4.  THE SMTP SPECIFICATIONS ...................................... 19
+
+      4.1.  SMTP Commands ........................................... 19
+      4.1.1.  Command Semantics ..................................... 19
+      4.1.2.  Command Syntax ........................................ 27
+      4.2.  SMTP Replies ............................................ 34
+      4.2.1.  Reply Codes by Function Group ......................... 35
+      4.2.2.  Reply Codes in Numeric Order .......................... 36
+      4.3.  Sequencing of Commands and Replies ...................... 37
+      4.4.  State Diagrams .......................................... 39
+      4.5.  Details ................................................. 41
+      4.5.1.  Minimum Implementation ................................ 41
+      4.5.2.  Transparency .......................................... 41
+      4.5.3.  Sizes ................................................. 42
+
+   APPENDIX A:  TCP ................................................. 44
+   APPENDIX B:  NCP ................................................. 45
+   APPENDIX C:  NITS ................................................ 46
+   APPENDIX D:  X.25 ................................................ 47
+   APPENDIX E:  Theory of Reply Codes ............................... 48
+   APPENDIX F:  Scenarios ........................................... 51
+
+   GLOSSARY ......................................................... 64
+
+   REFERENCES ....................................................... 67
+
+
+
+
+Network Working Group                                          J. Postel
+Request for Comments: DRAFT                                          ISI
+Replaces: RFC 788, 780, 772                                  August 1982
+
+                     SIMPLE MAIL TRANSFER PROTOCOL
+
+
+1.  INTRODUCTION
+
+   The objective of Simple Mail Transfer Protocol (SMTP) is to transfer
+   mail reliably and efficiently.
+
+   SMTP is independent of the particular transmission subsystem and
+   requires only a reliable ordered data stream channel.  Appendices A,
+   B, C, and D describe the use of SMTP with various transport services.
+   A Glossary provides the definitions of terms as used in this
+   document.
+
+   An important feature of SMTP is its capability to relay mail across
+   transport service environments.  A transport service provides an
+   interprocess communication environment (IPCE).  An IPCE may cover one
+   network, several networks, or a subset of a network.  It is important
+   to realize that transport systems (or IPCEs) are not one-to-one with
+   networks.  A process can communicate directly with another process
+   through any mutually known IPCE.  Mail is an application or use of
+   interprocess communication.  Mail can be communicated between
+   processes in different IPCEs by relaying through a process connected
+   to two (or more) IPCEs.  More specifically, mail can be relayed
+   between hosts on different transport systems by a host on both
+   transport systems.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Postel                                                          [Page 1]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+2.  THE SMTP MODEL
+
+   The SMTP design is based on the following model of communication:  as
+   the result of a user mail request, the sender-SMTP establishes a
+   two-way transmission channel to a receiver-SMTP.  The receiver-SMTP
+   may be either the ultimate destination or an intermediate.  SMTP
+   commands are generated by the sender-SMTP and sent to the
+   receiver-SMTP.  SMTP replies are sent from the receiver-SMTP to the
+   sender-SMTP in response to the commands.
+
+   Once the transmission channel is established, the SMTP-sender sends a
+   MAIL command indicating the sender of the mail.  If the SMTP-receiver
+   can accept mail it responds with an OK reply.  The SMTP-sender then
+   sends a RCPT command identifying a recipient of the mail.  If the
+   SMTP-receiver can accept mail for that recipient it responds with an
+   OK reply; if not, it responds with a reply rejecting that recipient
+   (but not the whole mail transaction).  The SMTP-sender and
+   SMTP-receiver may negotiate several recipients.  When the recipients
+   have been negotiated the SMTP-sender sends the mail data, terminating
+   with a special sequence.  If the SMTP-receiver successfully processes
+   the mail data it responds with an OK reply.  The dialog is purposely
+   lock-step, one-at-a-time.
+
+     -------------------------------------------------------------
+
+   
+               +----------+                +----------+
+   +------+    |          |                |          |
+   | User |<-->|          |      SMTP      |          |
+   +------+    |  Sender- |Commands/Replies| Receiver-|
+   +------+    |   SMTP   |<-------------->|    SMTP  |    +------+
+   | File |<-->|          |    and Mail    |          |<-->| File |
+   |System|    |          |                |          |    |System|
+   +------+    +----------+                +----------+    +------+
+   
+
+                Sender-SMTP                Receiver-SMTP
+
+                           Model for SMTP Use
+
+                                Figure 1
+
+     -------------------------------------------------------------
+
+   The SMTP provides mechanisms for the transmission of mail; directly
+   from the sending user's host to the receiving user's host when the
+
+
+
+[Page 2]                                                          Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+   two host are connected to the same transport service, or via one or
+   more relay SMTP-servers when the source and destination hosts are not
+   connected to the same transport service.
+
+   To be able to provide the relay capability the SMTP-server must be
+   supplied with the name of the ultimate destination host as well as
+   the destination mailbox name.
+
+   The argument to the MAIL command is a reverse-path, which specifies
+   who the mail is from.  The argument to the RCPT command is a
+   forward-path, which specifies who the mail is to.  The forward-path
+   is a source route, while the reverse-path is a return route (which
+   may be used to return a message to the sender when an error occurs
+   with a relayed message).
+
+   When the same message is sent to multiple recipients the SMTP
+   encourages the transmission of only one copy of the data for all the
+   recipients at the same destination host.
+
+   The mail commands and replies have a rigid syntax.  Replies also have
+   a numeric code.  In the following, examples appear which use actual
+   commands and replies.  The complete lists of commands and replies
+   appears in Section 4 on specifications.
+
+   Commands and replies are not case sensitive.  That is, a command or
+   reply word may be upper case, lower case, or any mixture of upper and
+   lower case.  Note that this is not true of mailbox user names.  For
+   some hosts the user name is case sensitive, and SMTP implementations
+   must take case to preserve the case of user names as they appear in
+   mailbox arguments.  Host names are not case sensitive.
+
+   Commands and replies are composed of characters from the ASCII
+   character set [1].  When the transport service provides an 8-bit byte
+   (octet) transmission channel, each 7-bit character is transmitted
+   right justified in an octet with the high order bit cleared to zero.
+
+   When specifying the general form of a command or reply, an argument
+   (or special symbol) will be denoted by a meta-linguistic variable (or
+   constant), for example, "<string>" or "<reverse-path>".  Here the
+   angle brackets indicate these are meta-linguistic variables.
+   However, some arguments use the angle brackets literally.  For
+   example, an actual reverse-path is enclosed in angle brackets, i.e.,
+   "<John.Smith@USC-ISI.ARPA>" is an instance of <reverse-path> (the
+   angle brackets are actually transmitted in the command or reply).
+
+
+
+
+
+Postel                                                          [Page 3]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+3.  THE SMTP PROCEDURES
+
+   This section presents the procedures used in SMTP in several parts.
+   First comes the basic mail procedure defined as a mail transaction.
+   Following this are descriptions of forwarding mail, verifying mailbox
+   names and expanding mailing lists, sending to terminals instead of or
+   in combination with mailboxes, and the opening and closing exchanges.
+   At the end of this section are comments on relaying, a note on mail
+   domains, and a discussion of changing roles.  Throughout this section
+   are examples of partial command and reply sequences, several complete
+   scenarios are presented in Appendix F.
+
+   3.1.  MAIL
+
+      There are three steps to SMTP mail transactions.  The transaction
+      is started with a MAIL command which gives the sender
+      identification.  A series of one or more RCPT commands follows
+      giving the receiver information.  Then a DATA command gives the
+      mail data.  And finally, the end of mail data indicator confirms
+      the transaction.
+
+         The first step in the procedure is the MAIL command.  The
+         <reverse-path> contains the source mailbox.
+
+            MAIL <SP> FROM:<reverse-path> <CRLF>
+
+         This command tells the SMTP-receiver that a new mail
+         transaction is starting and to reset all its state tables and
+         buffers, including any recipients or mail data.  It gives the
+         reverse-path which can be used to report errors.  If accepted,
+         the receiver-SMTP returns a 250 OK reply.
+
+         The <reverse-path> can contain more than just a mailbox.  The
+         <reverse-path> is a reverse source routing list of hosts and
+         source mailbox.  The first host in the <reverse-path> should be
+         the host sending this command.
+
+         The second step in the procedure is the RCPT command.
+
+            RCPT <SP> TO:<forward-path> <CRLF>
+
+         This command gives a forward-path identifying one recipient.
+         If accepted, the receiver-SMTP returns a 250 OK reply, and
+         stores the forward-path.  If the recipient is unknown the
+         receiver-SMTP returns a 550 Failure reply.  This second step of
+         the procedure can be repeated any number of times.
+
+
+
+[Page 4]                                                          Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+         The <forward-path> can contain more than just a mailbox.  The
+         <forward-path> is a source routing list of hosts and the
+         destination mailbox.  The first host in the <forward-path>
+         should be the host receiving this command.
+
+         The third step in the procedure is the DATA command.
+
+            DATA <CRLF>
+
+         If accepted, the receiver-SMTP returns a 354 Intermediate reply
+         and considers all succeeding lines to be the message text.
+         When the end of text is received and stored the SMTP-receiver
+         sends a 250 OK reply.
+
+         Since the mail data is sent on the transmission channel the end
+         of the mail data must be indicated so that the command and
+         reply dialog can be resumed.  SMTP indicates the end of the
+         mail data by sending a line containing only a period.  A
+         transparency procedure is used to prevent this from interfering
+         with the user's text (see Section 4.5.2).
+
+            Please note that the mail data includes the memo header
+            items such as Date, Subject, To, Cc, From [2].
+
+         The end of mail data indicator also confirms the mail
+         transaction and tells the receiver-SMTP to now process the
+         stored recipients and mail data.  If accepted, the
+         receiver-SMTP returns a 250 OK reply.  The DATA command should
+         fail only if the mail transaction was incomplete (for example,
+         no recipients), or if resources are not available.
+
+      The above procedure is an example of a mail transaction.  These
+      commands must be used only in the order discussed above.
+      Example 1 (below) illustrates the use of these commands in a mail
+      transaction.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Postel                                                          [Page 5]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+      -------------------------------------------------------------
+
+                     Example of the SMTP Procedure
+
+         This SMTP example shows mail sent by Smith at host Alpha.ARPA,
+         to Jones, Green, and Brown at host Beta.ARPA.  Here we assume
+         that host Alpha contacts host Beta directly.
+
+            S: MAIL FROM:<Smith@Alpha.ARPA>
+            R: 250 OK
+
+            S: RCPT TO:<Jones@Beta.ARPA>
+            R: 250 OK
+
+            S: RCPT TO:<Green@Beta.ARPA>
+            R: 550 No such user here
+
+            S: RCPT TO:<Brown@Beta.ARPA>
+            R: 250 OK
+
+            S: DATA
+            R: 354 Start mail input; end with <CRLF>.<CRLF>
+            S: Blah blah blah...
+            S: ...etc. etc. etc.
+            S: <CRLF>.<CRLF>
+            R: 250 OK
+
+         The mail has now been accepted for Jones and Brown.  Green did
+         not have a mailbox at host Beta.
+
+                               Example 1
+
+      -------------------------------------------------------------
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+[Page 6]                                                          Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+   3.2.  FORWARDING
+
+      There are some cases where the destination information in the
+      <forward-path> is incorrect, but the receiver-SMTP knows the
+      correct destination.  In such cases, one of the following replies
+      should be used to allow the sender to contact the correct
+      destination.
+
+         251 User not local; will forward to <forward-path>
+
+            This reply indicates that the receiver-SMTP knows the user's
+            mailbox is on another host and indicates the correct
+            forward-path to use in the future.  Note that either the
+            host or user or both may be different.  The receiver takes
+            responsibility for delivering the message.
+
+         551 User not local; please try <forward-path>
+
+            This reply indicates that the receiver-SMTP knows the user's
+            mailbox is on another host and indicates the correct
+            forward-path to use.  Note that either the host or user or
+            both may be different.  The receiver refuses to accept mail
+            for this user, and the sender must either redirect the mail
+            according to the information provided or return an error
+            response to the originating user.
+
+      Example 2 illustrates the use of these responses.
+
+      -------------------------------------------------------------
+
+                         Example of Forwarding
+
+      Either
+
+      S: RCPT TO:<Postel@USC-ISI.ARPA>
+      R: 251 User not local; will forward to <Postel@USC-ISIF.ARPA>
+
+      Or
+
+      S: RCPT TO:<Paul@USC-ISIB.ARPA>
+      R: 551 User not local; please try <Mockapetris@USC-ISIF.ARPA>
+
+                               Example 2
+
+      -------------------------------------------------------------
+
+
+
+
+Postel                                                          [Page 7]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+   3.3.  VERIFYING AND EXPANDING
+
+      SMTP provides as additional features, commands to verify a user
+      name or expand a mailing list.  This is done with the VRFY and
+      EXPN commands, which have character string arguments.  For the
+      VRFY command, the string is a user name, and the response may
+      include the full name of the user and must include the mailbox of
+      the user.  For the EXPN command, the string identifies a mailing
+      list, and the multiline response may include the full name of the
+      users and must give the mailboxes on the mailing list.
+
+      "User name" is a fuzzy term and used purposely.  If a host
+      implements the VRFY or EXPN commands then at least local mailboxes
+      must be recognized as "user names".  If a host chooses to
+      recognize other strings as "user names" that is allowed.
+
+      In some hosts the distinction between a mailing list and an alias
+      for a single mailbox is a bit fuzzy, since a common data structure
+      may hold both types of entries, and it is possible to have mailing
+      lists of one mailbox.  If a request is made to verify a mailing
+      list a positive response can be given if on receipt of a message
+      so addressed it will be delivered to everyone on the list,
+      otherwise an error should be reported (e.g., "550 That is a
+      mailing list, not a user").  If a request is made to expand a user
+      name a positive response can be formed by returning a list
+      containing one name, or an error can be reported (e.g., "550 That
+      is a user name, not a mailing list").
+
+      In the case of a multiline reply (normal for EXPN) exactly one
+      mailbox is to be specified on each line of the reply.  In the case
+      of an ambiguous request, for example, "VRFY Smith", where there
+      are two Smith's the response must be "553 User ambiguous".
+
+      The case of verifying a user name is straightforward as shown in
+      example 3.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+[Page 8]                                                          Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+      -------------------------------------------------------------
+
+                    Example of Verifying a User Name
+
+         Either
+
+            S: VRFY Smith
+            R: 250 Fred Smith <Smith@USC-ISIF.ARPA>
+
+         Or
+
+            S: VRFY Smith
+            R: 251 User not local; will forward to <Smith@USC-ISIQ.ARPA>
+
+         Or
+
+            S: VRFY Jones
+            R: 550 String does not match anything.
+
+         Or
+
+            S: VRFY Jones
+            R: 551 User not local; please try <Jones@USC-ISIQ.ARPA>
+
+         Or
+
+            S: VRFY Gourzenkyinplatz
+            R: 553 User ambiguous.
+
+                               Example 3
+
+      -------------------------------------------------------------
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Postel                                                          [Page 9]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+      The case of expanding a mailbox list requires a multiline reply as
+      shown in example 4.
+
+      -------------------------------------------------------------
+
+                  Example of Expanding a Mailing List
+
+         Either
+
+            S: EXPN Example-People
+            R: 250-Jon Postel <Postel@USC-ISIF.ARPA>
+            R: 250-Fred Fonebone <Fonebone@USC-ISIQ.ARPA>
+            R: 250-Sam Q. Smith <SQSmith@USC-ISIQ.ARPA>
+            R: 250-Quincy Smith <@USC-ISIF.ARPA:Q-Smith@ISI-VAXA.ARPA>
+            R: 250-<joe@foo-unix.ARPA>
+            R: 250 <xyz@bar-unix.ARPA>
+
+         Or
+
+            S: EXPN Executive-Washroom-List
+            R: 550 Access Denied to You.
+
+                               Example 4
+
+      -------------------------------------------------------------
+
+      The character string arguments of the VRFY and EXPN commands
+      cannot be further restricted due to the variety of implementations
+      of the user name and mailbox list concepts.  On some systems it
+      may be appropriate for the argument of the EXPN command to be a
+      file name for a file containing a mailing list, but again there is
+      a variety of file naming conventions in the Internet.
+
+      The VRFY and EXPN commands are not included in the minimum
+      implementation (Section 4.5.1), and are not required to work
+      across relays when they are implemented.
+
+
+
+
+
+
+
+
+
+
+
+
+
+[Page 10]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+   3.4.  SENDING AND MAILING
+
+      The main purpose of SMTP is to deliver messages to user's
+      mailboxes.  A very similar service provided by some hosts is to
+      deliver messages to user's terminals (provided the user is active
+      on the host).  The delivery to the user's mailbox is called
+      "mailing", the delivery to the user's terminal is called
+      "sending".  Because in many hosts the implementation of sending is
+      nearly identical to the implementation of mailing these two
+      functions are combined in SMTP.  However the sending commands are
+      not included in the required minimum implementation
+      (Section 4.5.1).  Users should have the ability to control the
+      writing of messages on their terminals.  Most hosts permit the
+      users to accept or refuse such messages.
+
+      The following three command are defined to support the sending
+      options.  These are used in the mail transaction instead of the
+      MAIL command and inform the receiver-SMTP of the special semantics
+      of this transaction:
+
+         SEND <SP> FROM:<reverse-path> <CRLF>
+
+            The SEND command requires that the mail data be delivered to
+            the user's terminal.  If the user is not active (or not
+            accepting terminal messages) on the host a 450 reply may
+            returned to a RCPT command.  The mail transaction is
+            successful if the message is delivered the terminal.
+
+         SOML <SP> FROM:<reverse-path> <CRLF>
+
+            The Send Or MaiL command requires that the mail data be
+            delivered to the user's terminal if the user is active (and
+            accepting terminal messages) on the host.  If the user is
+            not active (or not accepting terminal messages) then the
+            mail data is entered into the user's mailbox.  The mail
+            transaction is successful if the message is delivered either
+            to the terminal or the mailbox.
+
+         SAML <SP> FROM:<reverse-path> <CRLF>
+
+            The Send And MaiL command requires that the mail data be
+            delivered to the user's terminal if the user is active (and
+            accepting terminal messages) on the host.  In any case the
+            mail data is entered into the user's mailbox.  The mail
+            transaction is successful if the message is delivered the
+            mailbox.
+
+
+
+Postel                                                         [Page 11]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+      The same reply codes that are used for the MAIL commands are used
+      for these commands.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+[Page 12]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+   3.5.  OPENING AND CLOSING
+
+      At the time the transmission channel is opened there is an
+      exchange to ensure that the hosts are communicating with the hosts
+      they think they are.
+
+      The following two commands are used in transmission channel
+      opening and closing:
+
+         HELO <SP> <domain> <CRLF>
+
+         QUIT <CRLF>
+
+      In the HELO command the host sending the command identifies
+      itself; the command may be interpreted as saying "Hello, I am
+      <domain>".
+
+      -------------------------------------------------------------
+
+                     Example of Connection Opening
+
+         R: 220 BBN-UNIX.ARPA Simple Mail Transfer Service Ready
+         S: HELO USC-ISIF.ARPA
+         R: 250 BBN-UNIX.ARPA
+
+                               Example 5
+
+      -------------------------------------------------------------
+
+      -------------------------------------------------------------
+
+                     Example of Connection Closing
+
+         S: QUIT
+         R: 221 BBN-UNIX.ARPA Service closing transmission channel
+
+                               Example 6
+
+      -------------------------------------------------------------
+
+
+
+
+
+
+
+
+
+
+Postel                                                         [Page 13]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+   3.6.  RELAYING
+
+      The forward-path may be a source route of the form
+      "@ONE,@TWO:JOE@THREE", where ONE, TWO, and THREE are hosts.  This
+      form is used to emphasize the distinction between an address and a
+      route.  The mailbox is an absolute address, and the route is
+      information about how to get there.  The two concepts should not
+      be confused.
+
+      Conceptually the elements of the forward-path are moved to the
+      reverse-path as the message is relayed from one server-SMTP to
+      another.  The reverse-path is a reverse source route, (i.e., a
+      source route from the current location of the message to the
+      originator of the message).  When a server-SMTP deletes its
+      identifier from the forward-path and inserts it into the
+      reverse-path, it must use the name it is known by in the
+      environment it is sending into, not the environment the mail came
+      from, in case the server-SMTP is known by different names in
+      different environments.
+
+      If when the message arrives at an SMTP the first element of the
+      forward-path is not the identifier of that SMTP the element is not
+      deleted from the forward-path and is used to determine the next
+      SMTP to send the message to.  In any case, the SMTP adds its own
+      identifier to the reverse-path.
+
+      Using source routing the receiver-SMTP receives mail to be relayed
+      to another server-SMTP  The receiver-SMTP may accept or reject the
+      task of relaying the mail in the same way it accepts or rejects
+      mail for a local user.  The receiver-SMTP transforms the command
+      arguments by moving its own identifier from the forward-path to
+      the beginning of the reverse-path.  The receiver-SMTP then becomes
+      a sender-SMTP, establishes a transmission channel to the next SMTP
+      in the forward-path, and sends it the mail.
+
+      The first host in the reverse-path should be the host sending the
+      SMTP commands, and the first host in the forward-path should be
+      the host receiving the SMTP commands.
+
+      Notice that the forward-path and reverse-path appear in the SMTP
+      commands and replies, but not necessarily in the message.  That
+      is, there is no need for these paths and especially this syntax to
+      appear in the "To:" , "From:", "CC:", etc. fields of the message
+      header.
+
+      If a server-SMTP has accepted the task of relaying the mail and
+
+
+
+[Page 14]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+      later finds that the forward-path is incorrect or that the mail
+      cannot be delivered for whatever reason, then it must construct an
+      "undeliverable mail" notification message and send it to the
+      originator of the undeliverable mail (as indicated by the
+      reverse-path).
+
+      This notification message must be from the server-SMTP at this
+      host.  Of course, server-SMTPs should not send notification
+      messages about problems with notification messages.  One way to
+      prevent loops in error reporting is to specify a null reverse-path
+      in the MAIL command of a notification message.  When such a
+      message is relayed it is permissible to leave the reverse-path
+      null.  A MAIL command with a null reverse-path appears as follows:
+
+         MAIL FROM:<>
+
+      An undeliverable mail notification message is shown in example 7.
+      This notification is in response to a message originated by JOE at
+      HOSTW and sent via HOSTX to HOSTY with instructions to relay it on
+      to HOSTZ.  What we see in the example is the transaction between
+      HOSTY and HOSTX, which is the first step in the return of the
+      notification message.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Postel                                                         [Page 15]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+      -------------------------------------------------------------
+
+            Example Undeliverable Mail Notification Message
+
+         S: MAIL FROM:<>
+         R: 250 ok
+         S: RCPT TO:<@HOSTX.ARPA:JOE@HOSTW.ARPA>
+         R: 250 ok
+         S: DATA
+         R: 354 send the mail data, end with .
+         S: Date: 23 Oct 81 11:22:33
+         S: From: SMTP@HOSTY.ARPA
+         S: To: JOE@HOSTW.ARPA
+         S: Subject: Mail System Problem
+         S:
+         S:   Sorry JOE, your message to SAM@HOSTZ.ARPA lost.
+         S:   HOSTZ.ARPA said this:
+         S:    "550 No Such User"
+         S: .
+         R: 250 ok
+
+                               Example 7
+
+      -------------------------------------------------------------
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+[Page 16]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+   3.7.  DOMAINS
+
+      Domains are a recently introduced concept in the ARPA Internet
+      mail system.  The use of domains changes the address space from a
+      flat global space of simple character string host names to a
+      hierarchically structured rooted tree of global addresses.  The
+      host name is replaced by a domain and host designator which is a
+      sequence of domain element strings separated by periods with the
+      understanding that the domain elements are ordered from the most
+      specific to the most general.
+
+      For example, "USC-ISIF.ARPA", "Fred.Cambridge.UK", and
+      "PC7.LCS.MIT.ARPA" might be host-and-domain identifiers.
+
+      Whenever domain names are used in SMTP only the official names are
+      used, the use of nicknames or aliases is not allowed.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Postel                                                         [Page 17]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+   3.8.  CHANGING ROLES
+
+      The TURN command may be used to reverse the roles of the two
+      programs communicating over the transmission channel.
+
+      If program-A is currently the sender-SMTP and it sends the TURN
+      command and receives an ok reply (250) then program-A becomes the
+      receiver-SMTP.
+
+      If program-B is currently the receiver-SMTP and it receives the
+      TURN command and sends an ok reply (250) then program-B becomes
+      the sender-SMTP.
+
+      To refuse to change roles the receiver sends the 502 reply.
+
+      Please note that this command is optional.  It would not normally
+      be used in situations where the transmission channel is TCP.
+      However, when the cost of establishing the transmission channel is
+      high, this command may be quite useful.  For example, this command
+      may be useful in supporting be mail exchange using the public
+      switched telephone system as a transmission channel, especially if
+      some hosts poll other hosts for mail exchanges.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+[Page 18]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+4.  THE SMTP SPECIFICATIONS
+
+   4.1.  SMTP COMMANDS
+
+      4.1.1.  COMMAND SEMANTICS
+
+         The SMTP commands define the mail transfer or the mail system
+         function requested by the user.  SMTP commands are character
+         strings terminated by <CRLF>.  The command codes themselves are
+         alphabetic characters terminated by <SP> if parameters follow
+         and <CRLF> otherwise.  The syntax of mailboxes must conform to
+         receiver site conventions.  The SMTP commands are discussed
+         below.  The SMTP replies are discussed in the Section 4.2.
+
+         A mail transaction involves several data objects which are
+         communicated as arguments to different commands.  The
+         reverse-path is the argument of the MAIL command, the
+         forward-path is the argument of the RCPT command, and the mail
+         data is the argument of the DATA command.  These arguments or
+         data objects must be transmitted and held pending the
+         confirmation communicated by the end of mail data indication
+         which finalizes the transaction.  The model for this is that
+         distinct buffers are provided to hold the types of data
+         objects, that is, there is a reverse-path buffer, a
+         forward-path buffer, and a mail data buffer.  Specific commands
+         cause information to be appended to a specific buffer, or cause
+         one or more buffers to be cleared.
+
+         HELLO (HELO)
+
+            This command is used to identify the sender-SMTP to the
+            receiver-SMTP.  The argument field contains the host name of
+            the sender-SMTP.
+
+            The receiver-SMTP identifies itself to the sender-SMTP in
+            the connection greeting reply, and in the response to this
+            command.
+
+            This command and an OK reply to it confirm that both the
+            sender-SMTP and the receiver-SMTP are in the initial state,
+            that is, there is no transaction in progress and all state
+            tables and buffers are cleared.
+
+
+
+
+
+
+
+Postel                                                         [Page 19]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+         MAIL (MAIL)
+
+            This command is used to initiate a mail transaction in which
+            the mail data is delivered to one or more mailboxes.  The
+            argument field contains a reverse-path.
+
+            The reverse-path consists of an optional list of hosts and
+            the sender mailbox.  When the list of hosts is present, it
+            is a "reverse" source route and indicates that the mail was
+            relayed through each host on the list (the first host in the
+            list was the most recent relay).  This list is used as a
+            source route to return non-delivery notices to the sender.
+            As each relay host adds itself to the beginning of the list,
+            it must use its name as known in the IPCE to which it is
+            relaying the mail rather than the IPCE from which the mail
+            came (if they are different).  In some types of error
+            reporting messages (for example, undeliverable mail
+            notifications) the reverse-path may be null (see Example 7).
+
+            This command clears the reverse-path buffer, the
+            forward-path buffer, and the mail data buffer; and inserts
+            the reverse-path information from this command into the
+            reverse-path buffer.
+
+         RECIPIENT (RCPT)
+
+            This command is used to identify an individual recipient of
+            the mail data; multiple recipients are specified by multiple
+            use of this command.
+
+            The forward-path consists of an optional list of hosts and a
+            required destination mailbox.  When the list of hosts is
+            present, it is a source route and indicates that the mail
+            must be relayed to the next host on the list.  If the
+            receiver-SMTP does not implement the relay function it may
+            user the same reply it would for an unknown local user
+            (550).
+
+            When mail is relayed, the relay host must remove itself from
+            the beginning forward-path and put itself at the beginning
+            of the reverse-path.  When mail reaches its ultimate
+            destination (the forward-path contains only a destination
+            mailbox), the receiver-SMTP inserts it into the destination
+            mailbox in accordance with its host mail conventions.
+
+
+
+
+
+[Page 20]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+               For example, mail received at relay host A with arguments
+
+                  FROM:<USERX@HOSTY.ARPA>
+                  TO:<@HOSTA.ARPA,@HOSTB.ARPA:USERC@HOSTD.ARPA>
+
+               will be relayed on to host B with arguments
+
+                  FROM:<@HOSTA.ARPA:USERX@HOSTY.ARPA>
+                  TO:<@HOSTB.ARPA:USERC@HOSTD.ARPA>.
+
+            This command causes its forward-path argument to be appended
+            to the forward-path buffer.
+
+         DATA (DATA)
+
+            The receiver treats the lines following the command as mail
+            data from the sender.  This command causes the mail data
+            from this command to be appended to the mail data buffer.
+            The mail data may contain any of the 128 ASCII character
+            codes.
+
+            The mail data is terminated by a line containing only a
+            period, that is the character sequence "<CRLF>.<CRLF>" (see
+            Section 4.5.2 on Transparency).  This is the end of mail
+            data indication.
+
+            The end of mail data indication requires that the receiver
+            must now process the stored mail transaction information.
+            This processing consumes the information in the reverse-path
+            buffer, the forward-path buffer, and the mail data buffer,
+            and on the completion of this command these buffers are
+            cleared.  If the processing is successful the receiver must
+            send an OK reply.  If the processing fails completely the
+            receiver must send a failure reply.
+
+            When the receiver-SMTP accepts a message either for relaying
+            or for final delivery it inserts at the beginning of the
+            mail data a time stamp line.  The time stamp line indicates
+            the identity of the host that sent the message, and the
+            identity of the host that received the message (and is
+            inserting this time stamp), and the date and time the
+            message was received.  Relayed messages will have multiple
+            time stamp lines.
+
+            When the receiver-SMTP makes the "final delivery" of a
+            message it inserts at the beginning of the mail data a
+
+
+
+Postel                                                         [Page 21]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+            return path line.  The return path line preserves the
+            information in the <reverse-path> from the MAIL command.
+            Here, final delivery means the message leaves the SMTP
+            world.  Normally, this would mean it has been delivered to
+            the destination user, but in some cases it may be further
+            processed and transmitted by another mail system.
+
+               It is possible for the mailbox in the return path be
+               different from the actual sender's mailbox, for example,
+               if error responses are to be delivered a special error
+               handling mailbox rather than the message senders.
+
+            The preceding two paragraphs imply that the final mail data
+            will begin with a  return path line, followed by one or more
+            time stamp lines.  These lines will be followed by the mail
+            data header and body [2].  See Example 8.
+
+            Special mention is needed of the response and further action
+            required when the processing following the end of mail data
+            indication is partially successful.  This could arise if
+            after accepting several recipients and the mail data, the
+            receiver-SMTP finds that the mail data can be successfully
+            delivered to some of the recipients, but it cannot be to
+            others (for example, due to mailbox space allocation
+            problems).  In such a situation, the response to the DATA
+            command must be an OK reply.  But, the receiver-SMTP must
+            compose and send an "undeliverable mail" notification
+            message to the originator of the message.  Either a single
+            notification which lists all of the recipients that failed
+            to get the message, or separate notification messages must
+            be sent for each failed recipient (see Example 7).  All
+            undeliverable mail notification messages are sent using the
+            MAIL command (even if they result from processing a SEND,
+            SOML, or SAML command).
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+[Page 22]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+     -------------------------------------------------------------
+
+            Example of Return Path and Received Time Stamps
+
+      Return-Path: <@GHI.ARPA,@DEF.ARPA,@ABC.ARPA:JOE@ABC.ARPA>   
+      Received: from GHI.ARPA by JKL.ARPA ; 27 Oct 81 15:27:39 PST
+      Received: from DEF.ARPA by GHI.ARPA ; 27 Oct 81 15:15:13 PST
+      Received: from ABC.ARPA by DEF.ARPA ; 27 Oct 81 15:01:59 PST
+      Date: 27 Oct 81 15:01:01 PST                                
+      From: JOE@ABC.ARPA                                          
+      Subject: Improved Mailing System Installed                  
+      To: SAM@JKL.ARPA                                            
+                                    
+      This is to inform you that ...                              
+
+                               Example 8
+
+     -------------------------------------------------------------
+
+         SEND (SEND)
+
+            This command is used to initiate a mail transaction in which
+            the mail data is delivered to one or more terminals.  The
+            argument field contains a reverse-path.  This command is
+            successful if the message is delivered to a terminal.
+
+            The reverse-path consists of an optional list of hosts and
+            the sender mailbox.  When the list of hosts is present, it
+            is a "reverse" source route and indicates that the mail was
+            relayed through each host on the list (the first host in the
+            list was the most recent relay).  This list is used as a
+            source route to return non-delivery notices to the sender.
+            As each relay host adds itself to the beginning of the list,
+            it must use its name as known in the IPCE to which it is
+            relaying the mail rather than the IPCE from which the mail
+            came (if they are different).
+
+            This command clears the reverse-path buffer, the
+            forward-path buffer, and the mail data buffer; and inserts
+            the reverse-path information from this command into the
+            reverse-path buffer.
+
+         SEND OR MAIL (SOML)
+
+            This command is used to initiate a mail transaction in which
+            the mail data is delivered to one or more terminals or
+
+
+
+Postel                                                         [Page 23]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+            mailboxes. For each recipient the mail data is delivered to
+            the recipient's terminal if the recipient is active on the
+            host (and accepting terminal messages), otherwise to the
+            recipient's mailbox.  The argument field contains a
+            reverse-path.  This command is successful if the message is
+            delivered to a terminal or the mailbox.
+
+            The reverse-path consists of an optional list of hosts and
+            the sender mailbox.  When the list of hosts is present, it
+            is a "reverse" source route and indicates that the mail was
+            relayed through each host on the list (the first host in the
+            list was the most recent relay).  This list is used as a
+            source route to return non-delivery notices to the sender.
+            As each relay host adds itself to the beginning of the list,
+            it must use its name as known in the IPCE to which it is
+            relaying the mail rather than the IPCE from which the mail
+            came (if they are different).
+
+            This command clears the reverse-path buffer, the
+            forward-path buffer, and the mail data buffer; and inserts
+            the reverse-path information from this command into the
+            reverse-path buffer.
+
+         SEND AND MAIL (SAML)
+
+            This command is used to initiate a mail transaction in which
+            the mail data is delivered to one or more terminals and
+            mailboxes. For each recipient the mail data is delivered to
+            the recipient's terminal if the recipient is active on the
+            host (and accepting terminal messages), and for all
+            recipients to the recipient's mailbox.  The argument field
+            contains a reverse-path.  This command is successful if the
+            message is delivered to the mailbox.
+
+            The reverse-path consists of an optional list of hosts and
+            the sender mailbox.  When the list of hosts is present, it
+            is a "reverse" source route and indicates that the mail was
+            relayed through each host on the list (the first host in the
+            list was the most recent relay).  This list is used as a
+            source route to return non-delivery notices to the sender.
+            As each relay host adds itself to the beginning of the list,
+            it must use its name as known in the IPCE to which it is
+            relaying the mail rather than the IPCE from which the mail
+            came (if they are different).
+
+            This command clears the reverse-path buffer, the
+
+
+
+[Page 24]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+            forward-path buffer, and the mail data buffer; and inserts
+            the reverse-path information from this command into the
+            reverse-path buffer.
+
+         RESET (RSET)
+
+            This command specifies that the current mail transaction is
+            to be aborted.  Any stored sender, recipients, and mail data
+            must be discarded, and all buffers and state tables cleared.
+            The receiver must send an OK reply.
+
+         VERIFY (VRFY)
+
+            This command asks the receiver to confirm that the argument
+            identifies a user.  If it is a user name, the full name of
+            the user (if known) and the fully specified mailbox are
+            returned.
+
+            This command has no effect on any of the reverse-path
+            buffer, the forward-path buffer, or the mail data buffer.
+
+         EXPAND (EXPN)
+
+            This command asks the receiver to confirm that the argument
+            identifies a mailing list, and if so, to return the
+            membership of that list.  The full name of the users (if
+            known) and the fully specified mailboxes are returned in a
+            multiline reply.
+
+            This command has no effect on any of the reverse-path
+            buffer, the forward-path buffer, or the mail data buffer.
+
+         HELP (HELP)
+
+            This command causes the receiver to send helpful information
+            to the sender of the HELP command.  The command may take an
+            argument (e.g., any command name) and return more specific
+            information as a response.
+
+            This command has no effect on any of the reverse-path
+            buffer, the forward-path buffer, or the mail data buffer.
+
+
+
+
+
+
+
+
+Postel                                                         [Page 25]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+         NOOP (NOOP)
+
+            This command does not affect any parameters or previously
+            entered commands.  It specifies no action other than that
+            the receiver send an OK reply.
+
+            This command has no effect on any of the reverse-path
+            buffer, the forward-path buffer, or the mail data buffer.
+
+         QUIT (QUIT)
+
+            This command specifies that the receiver must send an OK
+            reply, and then close the transmission channel.
+
+            The receiver should not close the transmission channel until
+            it receives and replies to a QUIT command (even if there was
+            an error).  The sender should not close the transmission
+            channel until it send a QUIT command and receives the reply
+            (even if there was an error response to a previous command).
+            If the connection is closed prematurely the receiver should
+            act as if a RSET command had been received (canceling any
+            pending transaction, but not undoing any previously
+            completed transaction), the sender should act as if the
+            command or transaction in progress had received a temporary
+            error (4xx).
+
+         TURN (TURN)
+
+            This command specifies that the receiver must either (1)
+            send an OK reply and then take on the role of the
+            sender-SMTP, or (2) send a refusal reply and retain the role
+            of the receiver-SMTP.
+
+            If program-A is currently the sender-SMTP and it sends the
+            TURN command and receives an OK reply (250) then program-A
+            becomes the receiver-SMTP.  Program-A is then in the initial
+            state as if the transmission channel just opened, and it
+            then sends the 220 service ready greeting.
+
+            If program-B is currently the receiver-SMTP and it receives
+            the TURN command and sends an OK reply (250) then program-B
+            becomes the sender-SMTP.  Program-B is then in the initial
+            state as if the transmission channel just opened, and it
+            then expects to receive the 220 service ready greeting.
+
+            To refuse to change roles the receiver sends the 502 reply.
+
+
+
+[Page 26]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+         There are restrictions on the order in which these command may
+         be used.
+
+            The first command in a session must be the HELO command.
+            The HELO command may be used later in a session as well.  If
+            the HELO command argument is not acceptable a 501 failure
+            reply must be returned and the receiver-SMTP must stay in
+            the same state.
+
+            The NOOP, HELP, EXPN, and VRFY commands can be used at any
+            time during a session.
+
+            The MAIL, SEND, SOML, or SAML commands begin a mail
+            transaction.  Once started a mail transaction consists of
+            one of the transaction beginning commands, one or more RCPT
+            commands, and a DATA command, in that order.  A mail
+            transaction may be aborted by the RSET command.  There may
+            be zero or more transactions in a session.
+
+            If the transaction beginning command argument is not
+            acceptable a 501 failure reply must be returned and the
+            receiver-SMTP must stay in the same state.  If the commands
+            in a transaction are out of order a 503 failure reply must
+            be returned and the receiver-SMTP must stay in the same
+            state.
+
+            The last command in a session must be the QUIT command.  The
+            QUIT command can not be used at any other time in a session.
+
+      4.1.2.  COMMAND SYNTAX
+
+         The commands consist of a command code followed by an argument
+         field.  Command codes are four alphabetic characters.  Upper
+         and lower case alphabetic characters are to be treated
+         identically.  Thus, any of the following may represent the mail
+         command:
+
+            MAIL    Mail    mail    MaIl    mAIl
+
+         This also applies to any symbols representing parameter values,
+         such as "TO" or "to" for the forward-path.  Command codes and
+         the argument fields are separated by one or more spaces.
+         However, within the reverse-path and forward-path arguments
+         case is important.  In particular, in some hosts the user
+         "smith" is different from the user "Smith".
+
+
+
+
+Postel                                                         [Page 27]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+         The argument field consists of a variable length character
+         string ending with the character sequence <CRLF>.  The receiver
+         is to take no action until this sequence is received.
+
+         Square brackets denote an optional argument field.  If the
+         option is not taken, the appropriate default is implied.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+[Page 28]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+         The following are the SMTP commands:
+
+            HELO <SP> <domain> <CRLF>
+
+            MAIL <SP> FROM:<reverse-path> <CRLF>
+
+            RCPT <SP> TO:<forward-path> <CRLF>
+
+            DATA <CRLF>
+
+            RSET <CRLF>
+
+            SEND <SP> FROM:<reverse-path> <CRLF>
+
+            SOML <SP> FROM:<reverse-path> <CRLF>
+
+            SAML <SP> FROM:<reverse-path> <CRLF>
+
+            VRFY <SP> <string> <CRLF>
+
+            EXPN <SP> <string> <CRLF>
+
+            HELP [<SP> <string>] <CRLF>
+
+            NOOP <CRLF>
+
+            QUIT <CRLF>
+
+            TURN <CRLF>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Postel                                                         [Page 29]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+         The syntax of the above argument fields (using BNF notation
+         where applicable) is given below.  The "..." notation indicates
+         that a field may be repeated one or more times.
+
+            <reverse-path> ::= <path>
+
+            <forward-path> ::= <path>
+
+            <path> ::= "<" [ <a-d-l> ":" ] <mailbox> ">"
+
+            <a-d-l> ::= <at-domain> | <at-domain> "," <a-d-l>
+
+            <at-domain> ::= "@" <domain>
+
+            <domain> ::=  <element> | <element> "." <domain>
+
+            <element> ::= <name> | "#" <number> | "[" <dotnum> "]"
+
+            <mailbox> ::= <local-part> "@" <domain>
+
+            <local-part> ::= <dot-string> | <quoted-string>
+
+            <name> ::= <a> <ldh-str> <let-dig>
+
+            <ldh-str> ::= <let-dig-hyp> | <let-dig-hyp> <ldh-str>
+
+            <let-dig> ::= <a> | <d>
+
+            <let-dig-hyp> ::= <a> | <d> | "-"
+
+            <dot-string> ::= <string> | <string> "." <dot-string>
+
+            <string> ::= <char> | <char> <string>
+
+            <quoted-string> ::=  """ <qtext> """
+
+            <qtext> ::=  "\" <x> | "\" <x> <qtext> | <q> | <q> <qtext>
+
+            <char> ::= <c> | "\" <x>
+
+            <dotnum> ::= <snum> "." <snum> "." <snum> "." <snum>
+
+            <number> ::= <d> | <d> <number>
+
+            <CRLF> ::= <CR> <LF>
+
+
+
+
+[Page 30]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+            <CR> ::= the carriage return character (ASCII code 13)
+
+            <LF> ::= the line feed character (ASCII code 10)
+
+            <SP> ::= the space character (ASCII code 32)
+
+            <snum> ::= one, two, or three digits representing a decimal
+                      integer value in the range 0 through 255
+
+            <a> ::= any one of the 52 alphabetic characters A through Z
+                      in upper case and a through z in lower case
+
+            <c> ::= any one of the 128 ASCII characters, but not any
+                      <special> or <SP>
+
+            <d> ::= any one of the ten digits 0 through 9
+
+            <q> ::= any one of the 128 ASCII characters except <CR>,
+                      <LF>, quote ("), or backslash (\)
+
+            <x> ::= any one of the 128 ASCII characters (no exceptions)
+
+            <special> ::= "<" | ">" | "(" | ")" | "[" | "]" | "\" | "."
+                      | "," | ";" | ":" | "@"  """ | the control
+                      characters (ASCII codes 0 through 31 inclusive and
+                      127)
+
+         Note that the backslash, "\", is a quote character, which is
+         used to indicate that the next character is to be used
+         literally (instead of its normal interpretation).  For example,
+         "Joe\,Smith" could be used to indicate a single nine character
+         user field with comma being the fourth character of the field.
+
+         Hosts are generally known by names which are translated to
+         addresses in each host.  Note that the name elements of domains
+         are the official names -- no use of nicknames or aliases is
+         allowed.
+
+         Sometimes a host is not known to the translation function and
+         communication is blocked.  To bypass this barrier two numeric
+         forms are also allowed for host "names".  One form is a decimal
+         integer prefixed by a pound sign, "#", which indicates the
+         number is the address of the host.  Another form is four small
+         decimal integers separated by dots and enclosed by brackets,
+         e.g., "[123.255.37.2]", which indicates a 32-bit ARPA Internet
+         Address in four 8-bit fields.
+
+
+
+Postel                                                         [Page 31]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+         The time stamp line and the return path line are formally
+         defined as follows:
+
+         <return-path-line> ::= "Return-Path:" <SP><reverse-path><CRLF>
+
+         <time-stamp-line> ::= "Received:" <SP> <stamp> <CRLF>
+
+            <stamp> ::= <from-domain> <by-domain> <opt-info> ";"
+                      <daytime>
+
+            <from-domain> ::= "FROM" <SP> <domain> <SP>
+
+            <by-domain> ::= "BY" <SP> <domain> <SP>
+
+            <opt-info> ::= [<via>] [<with>] [<id>] [<for>]
+
+            <via> ::= "VIA" <SP> <link> <SP>
+
+            <with> ::= "WITH" <SP> <protocol> <SP>
+
+            <id> ::= "ID" <SP> <string> <SP>
+
+            <for> ::= "FOR" <SP> <path> <SP>
+
+            <link> ::= The standard names for links are registered with
+                      the Network Information Center.
+
+            <protocol> ::= The standard names for protocols are
+                      registered with the Network Information Center.
+
+            <daytime> ::= <SP> <date> <SP> <time>
+
+            <date> ::= <dd> <SP> <mon> <SP> <yy>
+
+            <time> ::= <hh> ":" <mm> ":" <ss> <SP> <zone>
+
+            <dd> ::= the one or two decimal integer day of the month in
+                      the range 1 to 31.
+
+            <mon> ::= "JAN" | "FEB" | "MAR" | "APR" | "MAY" | "JUN" |
+                      "JUL" | "AUG" | "SEP" | "OCT" | "NOV" | "DEC"
+
+            <yy> ::= the two decimal integer year of the century in the
+                      range 00 to 99.
+
+
+
+
+
+[Page 32]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+            <hh> ::= the two decimal integer hour of the day in the
+                      range 00 to 24.
+
+            <mm> ::= the two decimal integer minute of the hour in the
+                      range 00 to 59.
+
+            <ss> ::= the two decimal integer second of the minute in the
+                      range 00 to 59.
+
+            <zone> ::= "UT" for Universal Time (the default) or other
+                      time zone designator (as in [2]).
+
+            
+
+     -------------------------------------------------------------
+
+                          Return Path Example
+
+         Return-Path: <@CHARLIE.ARPA,@BAKER.ARPA:JOE@ABLE.ARPA>
+
+                               Example 9
+
+     -------------------------------------------------------------
+
+     -------------------------------------------------------------
+
+                        Time Stamp Line Example
+
+      Received: FROM ABC.ARPA BY XYZ.ARPA ; 22 OCT 81 09:23:59 PDT
+
+         Received: from ABC.ARPA by XYZ.ARPA via TELENET with X25
+                   id M12345 for Smith@PDQ.ARPA ; 22 OCT 81 09:23:59 PDT
+
+                               Example 10
+
+      -------------------------------------------------------------
+
+
+
+
+
+
+
+
+
+
+
+
+
+Postel                                                         [Page 33]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+   4.2.  SMTP REPLIES
+
+      Replies to SMTP commands are devised to ensure the synchronization
+      of requests and actions in the process of mail transfer, and to
+      guarantee that the sender-SMTP always knows the state of the
+      receiver-SMTP.  Every command must generate exactly one reply.
+
+         The details of the command-reply sequence are made explicit in
+         Section 5.3 on Sequencing and Section 5.4 State Diagrams.
+
+      An SMTP reply consists of a three digit number (transmitted as
+      three alphanumeric characters) followed by some text.  The number
+      is intended for use by automata to determine what state to enter
+      next; the text is meant for the human user.  It is intended that
+      the three digits contain enough encoded information that the
+      sender-SMTP need not examine the text and may either discard it or
+      pass it on to the user, as appropriate.  In particular, the text
+      may be receiver-dependent and context dependent, so there are
+      likely to be varying texts for each reply code.  A discussion of
+      the theory of reply codes is given in Appendix E.  Formally, a
+      reply is defined to be the sequence:  a three-digit code, <SP>,
+      one line of text, and <CRLF>, or a multiline reply (as defined in
+      Appendix E).  Only the EXPN and HELP commands are expected to
+      result in multiline replies in normal circumstances, however
+      multiline replies are allowed for any command.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+[Page 34]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+      4.2.1.  REPLY CODES BY FUNCTION GROUPS
+
+         500 Syntax error, command unrecognized
+            [This may include errors such as command line too long]
+         501 Syntax error in parameters or arguments
+         502 Command not implemented
+         503 Bad sequence of commands
+         504 Command parameter not implemented
+          
+         211 System status, or system help reply
+         214 Help message
+            [Information on how to use the receiver or the meaning of a
+            particular non-standard command; this reply is useful only
+            to the human user]
+          
+         220 <domain> Service ready
+         221 <domain> Service closing transmission channel
+         421 <domain> Service not available,
+             closing transmission channel
+            [This may be a reply to any command if the service knows it
+            must shut down]
+          
+         250 Requested mail action okay, completed
+         251 User not local; will forward to <forward-path>
+         450 Requested mail action not taken: mailbox unavailable
+            [E.g., mailbox busy]
+         550 Requested action not taken: mailbox unavailable
+            [E.g., mailbox not found, no access]
+         451 Requested action aborted: error in processing
+         551 User not local; please try <forward-path>
+         452 Requested action not taken: insufficient system storage
+         552 Requested mail action aborted: exceeded storage allocation
+         553 Requested action not taken: mailbox name not allowed
+            [E.g., mailbox syntax incorrect]
+         354 Start mail input; end with <CRLF>.<CRLF>
+         554 Transaction failed
+         
+
+
+
+
+
+
+
+
+
+
+
+
+Postel                                                         [Page 35]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+      4.2.2.  NUMERIC ORDER LIST OF REPLY CODES
+
+         211 System status, or system help reply
+         214 Help message
+            [Information on how to use the receiver or the meaning of a
+            particular non-standard command; this reply is useful only
+            to the human user]
+         220 <domain> Service ready
+         221 <domain> Service closing transmission channel
+         250 Requested mail action okay, completed
+         251 User not local; will forward to <forward-path>
+          
+         354 Start mail input; end with <CRLF>.<CRLF>
+          
+         421 <domain> Service not available,
+             closing transmission channel
+            [This may be a reply to any command if the service knows it
+            must shut down]
+         450 Requested mail action not taken: mailbox unavailable
+            [E.g., mailbox busy]
+         451 Requested action aborted: local error in processing
+         452 Requested action not taken: insufficient system storage
+          
+         500 Syntax error, command unrecognized
+            [This may include errors such as command line too long]
+         501 Syntax error in parameters or arguments
+         502 Command not implemented
+         503 Bad sequence of commands
+         504 Command parameter not implemented
+         550 Requested action not taken: mailbox unavailable
+            [E.g., mailbox not found, no access]
+         551 User not local; please try <forward-path>
+         552 Requested mail action aborted: exceeded storage allocation
+         553 Requested action not taken: mailbox name not allowed
+            [E.g., mailbox syntax incorrect]
+         554 Transaction failed
+         
+
+
+
+
+
+
+
+
+
+
+
+
+[Page 36]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+   4.3.  SEQUENCING OF COMMANDS AND REPLIES
+
+      The communication between the sender and receiver is intended to
+      be an alternating dialogue, controlled by the sender.  As such,
+      the sender issues a command and the receiver responds with a
+      reply.  The sender must wait for this response before sending
+      further commands.
+
+      One important reply is the connection greeting.  Normally, a
+      receiver will send a 220 "Service ready" reply when the connection
+      is completed.  The sender should wait for this greeting message
+      before sending any commands.
+
+         Note: all the greeting type replies have the official name of
+         the server host as the first word following the reply code.
+
+            For example,
+
+               220 <SP> USC-ISIF.ARPA <SP> Service ready <CRLF>
+
+      The table below lists alternative success and failure replies for
+      each command.  These must be strictly adhered to; a receiver may
+      substitute text in the replies, but the meaning and action implied
+      by the code numbers and by the specific command reply sequence
+      cannot be altered.
+
+      COMMAND-REPLY SEQUENCES
+
+         Each command is listed with its possible replies.  The prefixes
+         used before the possible replies are "P" for preliminary (not
+         used in SMTP), "I" for intermediate, "S" for success, "F" for
+         failure, and "E" for error.  The 421 reply (service not
+         available, closing transmission channel) may be given to any
+         command if the SMTP-receiver knows it must shut down.  This
+         listing forms the basis for the State Diagrams in Section 4.4.
+
+            CONNECTION ESTABLISHMENT
+               S: 220
+               F: 421
+            HELO
+               S: 250
+               E: 500, 501, 504, 421
+            MAIL
+               S: 250
+               F: 552, 451, 452
+               E: 500, 501, 421
+
+
+
+Postel                                                         [Page 37]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+            RCPT
+               S: 250, 251
+               F: 550, 551, 552, 553, 450, 451, 452
+               E: 500, 501, 503, 421
+            DATA
+               I: 354 -> data -> S: 250
+                                 F: 552, 554, 451, 452
+               F: 451, 554
+               E: 500, 501, 503, 421
+            RSET
+               S: 250
+               E: 500, 501, 504, 421
+            SEND
+               S: 250
+               F: 552, 451, 452
+               E: 500, 501, 502, 421
+            SOML
+               S: 250
+               F: 552, 451, 452
+               E: 500, 501, 502, 421
+            SAML
+               S: 250
+               F: 552, 451, 452
+               E: 500, 501, 502, 421
+            VRFY
+               S: 250, 251
+               F: 550, 551, 553
+               E: 500, 501, 502, 504, 421
+            EXPN
+               S: 250
+               F: 550
+               E: 500, 501, 502, 504, 421
+            HELP
+               S: 211, 214
+               E: 500, 501, 502, 504, 421
+            NOOP
+               S: 250
+               E: 500, 421
+            QUIT
+               S: 221
+               E: 500
+            TURN
+               S: 250
+               F: 502
+               E: 500, 503
+
+
+
+
+[Page 38]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+   4.4.  STATE DIAGRAMS
+
+      Following are state diagrams for a simple-minded SMTP
+      implementation.  Only the first digit of the reply codes is used.
+      There is one state diagram for each group of SMTP commands.  The
+      command groupings were determined by constructing a model for each
+      command and then collecting together the commands with
+      structurally identical models.
+
+      For each command there are three possible outcomes:  "success"
+      (S), "failure" (F), and "error" (E). In the state diagrams below
+      we use the symbol B for "begin", and the symbol W for "wait for
+      reply".
+
+      First, the diagram that represents most of the SMTP commands:
+
+         
+                                  1,3    +---+
+                             ----------->| E |
+                            |            +---+
+                            |
+         +---+    cmd    +---+    2      +---+
+         | B |---------->| W |---------->| S |
+         +---+           +---+           +---+
+                            |
+                            |     4,5    +---+
+                             ----------->| F |
+                                         +---+
+         
+
+         This diagram models the commands:
+
+            HELO, MAIL, RCPT, RSET, SEND, SOML, SAML, VRFY, EXPN, HELP,
+            NOOP, QUIT, TURN.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Postel                                                         [Page 39]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+      A more complex diagram models the DATA command:
+
+         
+         +---+   DATA    +---+ 1,2                 +---+
+         | B |---------->| W |-------------------->| E |
+         +---+           +---+        ------------>+---+
+                         3| |4,5     |
+                          | |        |
+            --------------   -----   |
+           |                      |  |             +---+
+           |               ----------     -------->| S |
+           |              |       |      |         +---+
+           |              |  ------------
+           |              | |     |
+           V           1,3| |2    |
+         +---+   data    +---+     --------------->+---+
+         |   |---------->| W |                     | F |
+         +---+           +---+-------------------->+---+
+                              4,5
+
+
+         Note that the "data" here is a series of lines sent from the
+         sender to the receiver with no response expected until the last
+         line is sent.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+[Page 40]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+   4.5.  DETAILS
+
+      4.5.1.  MINIMUM IMPLEMENTATION
+
+         In order to make SMTP workable, the following minimum
+         implementation is required for all receivers:
+
+            COMMANDS -- HELO
+                        MAIL
+                        RCPT
+                        DATA
+                        RSET
+                        NOOP
+                        QUIT
+
+      4.5.2.  TRANSPARENCY
+
+         Without some provision for data transparency the character
+         sequence "<CRLF>.<CRLF>" ends the mail text and cannot be sent
+         by the user.  In general, users are not aware of such
+         "forbidden" sequences.  To allow all user composed text to be
+         transmitted transparently the following procedures are used.
+
+            1. Before sending a line of mail text the sender-SMTP checks
+            the first character of the line.  If it is a period, one
+            additional period is inserted at the beginning of the line.
+
+            2. When a line of mail text is received by the receiver-SMTP
+            it checks the line.  If the line is composed of a single
+            period it is the end of mail.  If the first character is a
+            period and there are other characters on the line, the first
+            character is deleted.
+
+         The mail data may contain any of the 128 ASCII characters.  All
+         characters are to be delivered to the recipient's mailbox
+         including format effectors and other control characters.  If
+         the transmission channel provides an 8-bit byte (octets) data
+         stream, the 7-bit ASCII codes are transmitted right justified
+         in the octets with the high order bits cleared to zero.
+
+            In some systems it may be necessary to transform the data as
+            it is received and stored.  This may be necessary for hosts
+            that use a different character set than ASCII as their local
+            character set, or that store data in records rather than
+
+
+
+
+
+Postel                                                         [Page 41]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+            strings.  If such transforms are necessary, they must be
+            reversible -- especially if such transforms are applied to
+            mail being relayed.
+
+      4.5.3.  SIZES
+
+         There are several objects that have required minimum maximum
+         sizes.  That is, every implementation must be able to receive
+         objects of at least these sizes, but must not send objects
+         larger than these sizes.
+
+                                    
+          ****************************************************
+          *                                                  *
+          *  TO THE MAXIMUM EXTENT POSSIBLE, IMPLEMENTATION  *
+          *  TECHNIQUES WHICH IMPOSE NO LIMITS ON THE LENGTH *
+          *  OF THESE OBJECTS SHOULD BE USED.                *
+          *                                                  *
+          ****************************************************
+
+            user
+
+               The maximum total length of a user name is 64 characters.
+
+            domain
+
+               The maximum total length of a domain name or number is 64
+               characters.
+
+            path
+
+               The maximum total length of a reverse-path or
+               forward-path is 256 characters (including the punctuation
+               and element separators).
+
+            command line
+
+               The maximum total length of a command line including the
+               command word and the <CRLF> is 512 characters.
+
+            reply line
+
+               The maximum total length of a reply line including the
+               reply code and the <CRLF> is 512 characters.
+
+
+
+
+
+[Page 42]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+            text line
+
+               The maximum total length of a text line including the
+               <CRLF> is 1000 characters (but not counting the leading
+               dot duplicated for transparency).
+
+            recipients buffer
+
+               The maximum total number of recipients that must be
+               buffered is 100 recipients.
+
+                                    
+          ****************************************************
+          *                                                  *
+          *  TO THE MAXIMUM EXTENT POSSIBLE, IMPLEMENTATION  *
+          *  TECHNIQUES WHICH IMPOSE NO LIMITS ON THE LENGTH *
+          *  OF THESE OBJECTS SHOULD BE USED.                *
+          *                                                  *
+          ****************************************************
+
+         Errors due to exceeding these limits may be reported by using
+         the reply codes, for example:
+
+            500 Line too long.
+
+            501 Path too long
+
+            552 Too many recipients.
+
+            552 Too much mail data.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Postel                                                         [Page 43]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+APPENDIX A
+
+   TCP Transport service
+
+      The Transmission Control Protocol [3] is used in the ARPA
+      Internet, and in any network following the US DoD standards for
+      internetwork protocols.
+
+      Connection Establishment
+
+         The SMTP transmission channel is a TCP connection established
+         between the sender process port U and the receiver process port
+         L.  This single full duplex connection is used as the
+         transmission channel.  This protocol is assigned the service
+         port 25 (31 octal), that is L=25.
+
+      Data Transfer
+
+         The TCP connection supports the transmission of 8-bit bytes.
+         The SMTP data is 7-bit ASCII characters.  Each character is
+         transmitted as an 8-bit byte with the high-order bit cleared to
+         zero.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+[Page 44]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+APPENDIX B
+
+   NCP Transport service
+
+      The ARPANET Host-to-Host Protocol [4] (implemented by the Network
+      Control Program) may be used in the ARPANET.
+
+      Connection Establishment
+
+         The SMTP transmission channel is established via NCP between
+         the sender process socket U and receiver process socket L.  The
+         Initial Connection Protocol [5] is followed resulting in a pair
+         of simplex connections.  This pair of connections is used as
+         the transmission channel.  This protocol is assigned the
+         contact socket 25 (31 octal), that is L=25.
+
+      Data Transfer
+
+         The NCP data connections are established in 8-bit byte mode.
+         The SMTP data is 7-bit ASCII characters.  Each character is
+         transmitted as an 8-bit byte with the high-order bit cleared to
+         zero.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Postel                                                         [Page 45]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+APPENDIX C
+
+   NITS
+
+      The Network Independent Transport Service [6] may be used.
+
+      Connection Establishment
+
+         The SMTP transmission channel is established via NITS between
+         the sender process and receiver process.  The sender process
+         executes the CONNECT primitive, and the waiting receiver
+         process executes the ACCEPT primitive.
+
+      Data Transfer
+
+         The NITS connection supports the transmission of 8-bit bytes.
+         The SMTP data is 7-bit ASCII characters.  Each character is
+         transmitted as an 8-bit byte with the high-order bit cleared to
+         zero.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+[Page 46]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+APPENDIX D
+
+   X.25 Transport service
+
+      It may be possible to use the X.25 service [7] as provided by the
+      Public Data Networks directly, however, it is suggested that a
+      reliable end-to-end protocol such as TCP be used on top of X.25
+      connections.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Postel                                                         [Page 47]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+APPENDIX E
+
+   Theory of Reply Codes
+
+      The three digits of the reply each have a special significance.
+      The first digit denotes whether the response is good, bad or
+      incomplete.  An unsophisticated sender-SMTP will be able to
+      determine its next action (proceed as planned, redo, retrench,
+      etc.) by simply examining this first digit.  A sender-SMTP that
+      wants to know approximately what kind of error occurred (e.g.,
+      mail system error, command syntax error) may examine the second
+      digit, reserving the third digit for the finest gradation of
+      information.
+
+         There are five values for the first digit of the reply code:
+
+            1yz   Positive Preliminary reply
+
+               The command has been accepted, but the requested action
+               is being held in abeyance, pending confirmation of the
+               information in this reply.  The sender-SMTP should send
+               another command specifying whether to continue or abort
+               the action.
+
+                  [Note: SMTP does not have any commands that allow this
+                  type of reply, and so does not have the continue or
+                  abort commands.]
+
+            2yz   Positive Completion reply
+
+               The requested action has been successfully completed.  A
+               new request may be initiated.
+
+            3yz   Positive Intermediate reply
+
+               The command has been accepted, but the requested action
+               is being held in abeyance, pending receipt of further
+               information.  The sender-SMTP should send another command
+               specifying this information.  This reply is used in
+               command sequence groups.
+
+            4yz   Transient Negative Completion reply
+
+               The command was not accepted and the requested action did
+               not occur.  However, the error condition is temporary and
+               the action may be requested again.  The sender should
+
+
+
+[Page 48]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+               return to the beginning of the command sequence (if any).
+               It is difficult to assign a meaning to "transient" when
+               two different sites (receiver- and sender- SMTPs) must
+               agree on the interpretation.  Each reply in this category
+               might have a different time value, but the sender-SMTP is
+               encouraged to try again.  A rule of thumb to determine if
+               a reply fits into the 4yz or the 5yz category (see below)
+               is that replies are 4yz if they can be repeated without
+               any change in command form or in properties of the sender
+               or receiver.  (E.g., the command is repeated identically
+               and the receiver does not put up a new implementation.)
+
+            5yz   Permanent Negative Completion reply
+
+               The command was not accepted and the requested action did
+               not occur.  The sender-SMTP is discouraged from repeating
+               the exact request (in the same sequence).  Even some
+               "permanent" error conditions can be corrected, so the
+               human user may want to direct the sender-SMTP to
+               reinitiate the command sequence by direct action at some
+               point in the future (e.g., after the spelling has been
+               changed, or the user has altered the account status).
+
+         The second digit encodes responses in specific categories:
+
+            x0z   Syntax -- These replies refer to syntax errors,
+                  syntactically correct commands that don't fit any
+                  functional category, and unimplemented or superfluous
+                  commands.
+
+            x1z   Information --  These are replies to requests for
+                  information, such as status or help.
+
+            x2z   Connections -- These are replies referring to the
+                  transmission channel.
+
+            x3z   Unspecified as yet.
+
+            x4z   Unspecified as yet.
+
+            x5z   Mail system -- These replies indicate the status of
+                  the receiver mail system vis-a-vis the requested
+                  transfer or other mail system action.
+
+         The third digit gives a finer gradation of meaning in each
+         category specified by the second digit.  The list of replies
+
+
+
+Postel                                                         [Page 49]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+         illustrates this.  Each reply text is recommended rather than
+         mandatory, and may even change according to the command with
+         which it is associated.  On the other hand, the reply codes
+         must strictly follow the specifications in this section.
+         Receiver implementations should not invent new codes for
+         slightly different situations from the ones described here, but
+         rather adapt codes already defined.
+
+         For example, a command such as NOOP whose successful execution
+         does not offer the sender-SMTP any new information will return
+         a 250 reply.  The response is 502 when the command requests an
+         unimplemented non-site-specific action.  A refinement of that
+         is the 504 reply for a command that is implemented, but that
+         requests an unimplemented parameter.
+
+      The reply text may be longer than a single line; in these cases
+      the complete text must be marked so the sender-SMTP knows when it
+      can stop reading the reply.  This requires a special format to
+      indicate a multiple line reply.
+
+         The format for multiline replies requires that every line,
+         except the last, begin with the reply code, followed
+         immediately by a hyphen, "-" (also known as minus), followed by
+         text.  The last line will begin with the reply code, followed
+         immediately by <SP>, optionally some text, and <CRLF>.
+
+            For example:
+                                123-First line
+                                123-Second line
+                                123-234 text beginning with numbers
+                                123 The last line
+
+         In many cases the sender-SMTP then simply needs to search for
+         the reply code followed by <SP> at the beginning of a line, and
+         ignore all preceding lines.  In a few cases, there is important
+         data for the sender in the reply "text".  The sender will know
+         these cases from the current context.
+
+
+
+
+
+
+
+
+
+
+
+
+[Page 50]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+APPENDIX F
+
+   Scenarios
+
+      This section presents complete scenarios of several types of SMTP
+      sessions.
+
+   A Typical SMTP Transaction Scenario
+
+      This SMTP example shows mail sent by Smith at host USC-ISIF, to
+      Jones, Green, and Brown at host BBN-UNIX.  Here we assume that
+      host USC-ISIF contacts host BBN-UNIX directly.  The mail is
+      accepted for Jones and Brown.  Green does not have a mailbox at
+      host BBN-UNIX.
+
+      -------------------------------------------------------------
+
+         R: 220 BBN-UNIX.ARPA Simple Mail Transfer Service Ready
+         S: HELO USC-ISIF.ARPA
+         R: 250 BBN-UNIX.ARPA
+
+         S: MAIL FROM:<Smith@USC-ISIF.ARPA>
+         R: 250 OK
+
+         S: RCPT TO:<Jones@BBN-UNIX.ARPA>
+         R: 250 OK
+
+         S: RCPT TO:<Green@BBN-UNIX.ARPA>
+         R: 550 No such user here
+
+         S: RCPT TO:<Brown@BBN-UNIX.ARPA>
+         R: 250 OK
+
+         S: DATA
+         R: 354 Start mail input; end with <CRLF>.<CRLF>
+         S: Blah blah blah...
+         S: ...etc. etc. etc.
+         S: .
+         R: 250 OK
+
+         S: QUIT
+         R: 221 BBN-UNIX.ARPA Service closing transmission channel
+
+                               Scenario 1
+
+      -------------------------------------------------------------
+
+
+
+Postel                                                         [Page 51]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+   Aborted SMTP Transaction Scenario
+
+      -------------------------------------------------------------
+
+         R: 220 MIT-Multics.ARPA Simple Mail Transfer Service Ready
+         S: HELO ISI-VAXA.ARPA
+         R: 250 MIT-Multics.ARPA
+
+         S: MAIL FROM:<Smith@ISI-VAXA.ARPA>
+         R: 250 OK
+
+         S: RCPT TO:<Jones@MIT-Multics.ARPA>
+         R: 250 OK
+
+         S: RCPT TO:<Green@MIT-Multics.ARPA>
+         R: 550 No such user here
+
+         S: RSET
+         R: 250 OK
+
+         S: QUIT
+         R: 221 MIT-Multics.ARPA Service closing transmission channel
+
+                               Scenario 2
+
+      -------------------------------------------------------------
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+[Page 52]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+   Relayed Mail Scenario
+
+      -------------------------------------------------------------
+
+         Step 1  --  Source Host to Relay Host
+
+            R: 220 USC-ISIE.ARPA Simple Mail Transfer Service Ready
+            S: HELO MIT-AI.ARPA
+            R: 250 USC-ISIE.ARPA
+
+            S: MAIL FROM:<JQP@MIT-AI.ARPA>
+            R: 250 OK
+
+            S: RCPT TO:<@USC-ISIE.ARPA:Jones@BBN-VAX.ARPA>
+            R: 250 OK
+
+            S: DATA
+            R: 354 Start mail input; end with <CRLF>.<CRLF>
+            S: Date: 2 Nov 81 22:33:44
+            S: From: John Q. Public <JQP@MIT-AI.ARPA>
+            S: Subject:  The Next Meeting of the Board
+            S: To: Jones@BBN-Vax.ARPA
+            S:
+            S: Bill:
+            S: The next meeting of the board of directors will be
+            S: on Tuesday.
+            S:                                              John.
+            S: .
+            R: 250 OK
+
+            S: QUIT
+            R: 221 USC-ISIE.ARPA Service closing transmission channel
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Postel                                                         [Page 53]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+         Step 2  --  Relay Host to Destination Host
+
+            R: 220 BBN-VAX.ARPA Simple Mail Transfer Service Ready
+            S: HELO USC-ISIE.ARPA
+            R: 250 BBN-VAX.ARPA
+
+            S: MAIL FROM:<@USC-ISIE.ARPA:JQP@MIT-AI.ARPA>
+            R: 250 OK
+
+            S: RCPT TO:<Jones@BBN-VAX.ARPA>
+            R: 250 OK
+
+            S: DATA
+            R: 354 Start mail input; end with <CRLF>.<CRLF>
+            S: Received: from MIT-AI.ARPA by USC-ISIE.ARPA ;
+               2 Nov 81 22:40:10 UT
+            S: Date: 2 Nov 81 22:33:44
+            S: From: John Q. Public <JQP@MIT-AI.ARPA>
+            S: Subject:  The Next Meeting of the Board
+            S: To: Jones@BBN-Vax.ARPA
+            S:
+            S: Bill:
+            S: The next meeting of the board of directors will be
+            S: on Tuesday.
+            S:                                              John.
+            S: .
+            R: 250 OK
+
+            S: QUIT
+            R: 221 USC-ISIE.ARPA Service closing transmission channel
+
+                               Scenario 3
+
+      -------------------------------------------------------------
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+[Page 54]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+   Verifying and Sending Scenario
+
+      -------------------------------------------------------------
+
+         R: 220 SU-SCORE.ARPA Simple Mail Transfer Service Ready
+         S: HELO MIT-MC.ARPA
+         R: 250 SU-SCORE.ARPA
+
+         S: VRFY Crispin
+         R: 250 Mark Crispin <Admin.MRC@SU-SCORE.ARPA>
+
+         S: SEND FROM:<EAK@MIT-MC.ARPA>
+         R: 250 OK
+
+         S: RCPT TO:<Admin.MRC@SU-SCORE.ARPA>
+         R: 250 OK
+
+         S: DATA
+         R: 354 Start mail input; end with <CRLF>.<CRLF>
+         S: Blah blah blah...
+         S: ...etc. etc. etc.
+         S: .
+         R: 250 OK
+
+         S: QUIT
+         R: 221 SU-SCORE.ARPA Service closing transmission channel
+
+                               Scenario 4
+
+      -------------------------------------------------------------
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Postel                                                         [Page 55]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+   Sending and Mailing Scenarios
+
+      First the user's name is verified, then  an attempt is made to
+      send to the user's terminal.  When that fails, the messages is
+      mailed to the user's mailbox.
+
+      -------------------------------------------------------------
+
+         R: 220 SU-SCORE.ARPA Simple Mail Transfer Service Ready
+         S: HELO MIT-MC.ARPA
+         R: 250 SU-SCORE.ARPA
+
+         S: VRFY Crispin
+         R: 250 Mark Crispin <Admin.MRC@SU-SCORE.ARPA>
+
+         S: SEND FROM:<EAK@MIT-MC.ARPA>
+         R: 250 OK
+
+         S: RCPT TO:<Admin.MRC@SU-SCORE.ARPA>
+         R: 450 User not active now
+
+         S: RSET
+         R: 250 OK
+
+         S: MAIL FROM:<EAK@MIT-MC.ARPA>
+         R: 250 OK
+
+         S: RCPT TO:<Admin.MRC@SU-SCORE.ARPA>
+         R: 250 OK
+
+         S: DATA
+         R: 354 Start mail input; end with <CRLF>.<CRLF>
+         S: Blah blah blah...
+         S: ...etc. etc. etc.
+         S: .
+         R: 250 OK
+
+         S: QUIT
+         R: 221 SU-SCORE.ARPA Service closing transmission channel
+
+                               Scenario 5
+
+      -------------------------------------------------------------
+
+
+
+
+
+
+[Page 56]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+      Doing the preceding scenario more efficiently.
+
+      -------------------------------------------------------------
+
+         R: 220 SU-SCORE.ARPA Simple Mail Transfer Service Ready
+         S: HELO MIT-MC.ARPA
+         R: 250 SU-SCORE.ARPA
+
+         S: VRFY Crispin
+         R: 250 Mark Crispin <Admin.MRC@SU-SCORE.ARPA>
+
+         S: SOML FROM:<EAK@MIT-MC.ARPA>
+         R: 250 OK
+
+         S: RCPT TO:<Admin.MRC@SU-SCORE.ARPA>
+         R: 250 User not active now, so will do mail.
+
+         S: DATA
+         R: 354 Start mail input; end with <CRLF>.<CRLF>
+         S: Blah blah blah...
+         S: ...etc. etc. etc.
+         S: .
+         R: 250 OK
+
+         S: QUIT
+         R: 221 SU-SCORE.ARPA Service closing transmission channel
+
+                               Scenario 6
+
+      -------------------------------------------------------------
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Postel                                                         [Page 57]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+   Mailing List Scenario
+
+      First each of two mailing lists are expanded in separate sessions
+      with different hosts.  Then the message is sent to everyone that
+      appeared on either list (but no duplicates) via a relay host.
+
+      -------------------------------------------------------------
+
+         Step 1  --  Expanding the First List
+
+            R: 220 MIT-AI.ARPA Simple Mail Transfer Service Ready
+            S: HELO SU-SCORE.ARPA
+            R: 250 MIT-AI.ARPA
+
+            S: EXPN Example-People
+            R: 250-<ABC@MIT-MC.ARPA>
+            R: 250-Fred Fonebone <Fonebone@USC-ISIQ.ARPA>
+            R: 250-Xenon Y. Zither <XYZ@MIT-AI.ARPA>
+            R: 250-Quincy Smith <@USC-ISIF.ARPA:Q-Smith@ISI-VAXA.ARPA>
+            R: 250-<joe@foo-unix.ARPA>
+            R: 250 <xyz@bar-unix.ARPA>
+
+            S: QUIT
+            R: 221 MIT-AI.ARPA Service closing transmission channel
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+[Page 58]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+         Step 2  --  Expanding the Second List
+
+            R: 220 MIT-MC.ARPA Simple Mail Transfer Service Ready
+            S: HELO SU-SCORE.ARPA
+            R: 250 MIT-MC.ARPA
+
+            S: EXPN Interested-Parties
+            R: 250-Al Calico <ABC@MIT-MC.ARPA>
+            R: 250-<XYZ@MIT-AI.ARPA>
+            R: 250-Quincy Smith <@USC-ISIF.ARPA:Q-Smith@ISI-VAXA.ARPA>
+            R: 250-<fred@BBN-UNIX.ARPA>
+            R: 250 <xyz@bar-unix.ARPA>
+
+            S: QUIT
+            R: 221 MIT-MC.ARPA Service closing transmission channel
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Postel                                                         [Page 59]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+         Step 3  --  Mailing to All via a Relay Host
+
+            R: 220 USC-ISIE.ARPA Simple Mail Transfer Service Ready
+            S: HELO SU-SCORE.ARPA
+            R: 250 USC-ISIE.ARPA
+
+            S: MAIL FROM:<Account.Person@SU-SCORE.ARPA>
+            R: 250 OK
+            S: RCPT TO:<@USC-ISIE.ARPA:ABC@MIT-MC.ARPA>
+            R: 250 OK
+            S: RCPT TO:<@USC-ISIE.ARPA:Fonebone@USC-ISIQA.ARPA>
+            R: 250 OK
+            S: RCPT TO:<@USC-ISIE.ARPA:XYZ@MIT-AI.ARPA>
+            R: 250 OK
+            S: RCPT
+                TO:<@USC-ISIE.ARPA,@USC-ISIF.ARPA:Q-Smith@ISI-VAXA.ARPA>
+            R: 250 OK
+            S: RCPT TO:<@USC-ISIE.ARPA:joe@FOO-UNIX.ARPA>
+            R: 250 OK
+            S: RCPT TO:<@USC-ISIE.ARPA:xyz@BAR-UNIX.ARPA>
+            R: 250 OK
+            S: RCPT TO:<@USC-ISIE.ARPA:fred@BBN-UNIX.ARPA>
+            R: 250 OK
+
+            S: DATA
+            R: 354 Start mail input; end with <CRLF>.<CRLF>
+            S: Blah blah blah...
+            S: ...etc. etc. etc.
+            S: .
+            R: 250 OK
+
+            S: QUIT
+            R: 221 USC-ISIE.ARPA Service closing transmission channel
+
+                               Scenario 7
+
+      -------------------------------------------------------------
+
+
+
+
+
+
+
+
+
+
+
+
+[Page 60]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+   Forwarding Scenarios
+
+      -------------------------------------------------------------
+
+         R: 220 USC-ISIF.ARPA Simple Mail Transfer Service Ready
+         S: HELO LBL-UNIX.ARPA
+         R: 250 USC-ISIF.ARPA
+
+         S: MAIL FROM:<mo@LBL-UNIX.ARPA>
+         R: 250 OK
+
+         S: RCPT TO:<fred@USC-ISIF.ARPA>
+         R: 251 User not local; will forward to <Jones@USC-ISI.ARPA>
+
+         S: DATA
+         R: 354 Start mail input; end with <CRLF>.<CRLF>
+         S: Blah blah blah...
+         S: ...etc. etc. etc.
+         S: .
+         R: 250 OK
+
+         S: QUIT
+         R: 221 USC-ISIF.ARPA Service closing transmission channel
+
+                               Scenario 8
+
+      -------------------------------------------------------------
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Postel                                                         [Page 61]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+      -------------------------------------------------------------
+
+         Step 1  --  Trying the Mailbox at the First Host
+
+            R: 220 USC-ISIF.ARPA Simple Mail Transfer Service Ready
+            S: HELO LBL-UNIX.ARPA
+            R: 250 USC-ISIF.ARPA
+
+            S: MAIL FROM:<mo@LBL-UNIX.ARPA>
+            R: 250 OK
+
+            S: RCPT TO:<fred@USC-ISIF.ARPA>
+            R: 251 User not local; will forward to <Jones@USC-ISI.ARPA>
+
+            S: RSET
+            R: 250 OK
+
+            S: QUIT
+            R: 221 USC-ISIF.ARPA Service closing transmission channel
+
+         Step 2  --  Delivering the Mail at the Second Host
+
+            R: 220 USC-ISI.ARPA Simple Mail Transfer Service Ready
+            S: HELO LBL-UNIX.ARPA
+            R: 250 USC-ISI.ARPA
+
+            S: MAIL FROM:<mo@LBL-UNIX.ARPA>
+            R: 250 OK
+
+            S: RCPT TO:<Jones@USC-ISI.ARPA>
+            R: OK
+
+            S: DATA
+            R: 354 Start mail input; end with <CRLF>.<CRLF>
+            S: Blah blah blah...
+            S: ...etc. etc. etc.
+            S: .
+            R: 250 OK
+
+            S: QUIT
+            R: 221 USC-ISI.ARPA Service closing transmission channel
+
+                               Scenario 9
+
+      -------------------------------------------------------------
+
+
+
+
+[Page 62]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+   Too Many Recipients Scenario
+
+      -------------------------------------------------------------
+
+         R: 220 BERKELEY.ARPA Simple Mail Transfer Service Ready
+         S: HELO USC-ISIF.ARPA
+         R: 250 BERKELEY.ARPA
+
+         S: MAIL FROM:<Postel@USC-ISIF.ARPA>
+         R: 250 OK
+
+         S: RCPT TO:<fabry@BERKELEY.ARPA>
+         R: 250 OK
+
+         S: RCPT TO:<eric@BERKELEY.ARPA>
+         R: 552 Recipient storage full, try again in another transaction
+
+         S: DATA
+         R: 354 Start mail input; end with <CRLF>.<CRLF>
+         S: Blah blah blah...
+         S: ...etc. etc. etc.
+         S: .
+         R: 250 OK
+
+         S: MAIL FROM:<Postel@USC-ISIF.ARPA>
+         R: 250 OK
+
+         S: RCPT TO:<eric@BERKELEY.ARPA>
+         R: 250 OK
+
+         S: DATA
+         R: 354 Start mail input; end with <CRLF>.<CRLF>
+         S: Blah blah blah...
+         S: ...etc. etc. etc.
+         S: .
+         R: 250 OK
+
+         S: QUIT
+         R: 221 BERKELEY.ARPA Service closing transmission channel
+
+                              Scenario 10
+
+      -------------------------------------------------------------
+
+      Note that a real implementation must handle many recipients as
+      specified in Section 4.5.3.
+
+
+
+Postel                                                         [Page 63]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+GLOSSARY
+
+   ASCII
+
+      American Standard Code for Information Interchange [1].
+
+   command
+
+      A request for a mail service action sent by the sender-SMTP to the
+      receiver-SMTP.
+
+   domain
+
+      The hierarchially structured global character string address of a
+      host computer in the mail system.
+
+   end of mail data indication
+
+      A special sequence of characters that indicates the end of the
+      mail data.  In particular, the five characters carriage return,
+      line feed, period, carriage return, line feed, in that order.
+
+   host
+
+      A computer in the internetwork environment on which mailboxes or
+      SMTP processes reside.
+
+   line
+
+      A a sequence of ASCII characters ending with a <CRLF>.
+
+   mail data
+
+      A sequence of ASCII characters of arbitrary length, which conforms
+      to the standard set in the Standard for the Format of ARPA
+      Internet Text Messages (RFC 822 [2]).
+
+   mailbox
+
+      A character string (address) which identifies a user to whom mail
+      is to be sent.  Mailbox normally consists of the host and user
+      specifications.  The standard mailbox naming convention is defined
+      to be "user@domain".  Additionally, the "container" in which mail
+      is stored.
+
+
+
+
+
+[Page 64]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+   receiver-SMTP process
+
+      A process which transfers mail in cooperation with a sender-SMTP
+      process.  It waits for a connection to be established via the
+      transport service.  It receives SMTP commands from the
+      sender-SMTP, sends replies, and performs the specified operations.
+
+   reply
+
+      A reply is an acknowledgment (positive or negative) sent from
+      receiver to sender via the transmission channel in response to a
+      command.  The general form of a reply is a completion code
+      (including error codes) followed by a text string.  The codes are
+      for use by programs and the text is usually intended for human
+      users.
+
+   sender-SMTP process
+
+      A process which transfers mail in cooperation with a receiver-SMTP
+      process.  A local language may be used in the user interface
+      command/reply dialogue.  The sender-SMTP initiates the transport
+      service connection.  It initiates SMTP commands, receives replies,
+      and governs the transfer of mail.
+
+   session
+
+      The set of exchanges that occur while the transmission channel is
+      open.
+
+   transaction
+
+      The set of exchanges required for one message to be transmitted
+      for one or more recipients.
+
+   transmission channel
+
+      A full-duplex communication path between a sender-SMTP and a
+      receiver-SMTP for the exchange of commands, replies, and mail
+      text.
+
+   transport service
+
+      Any reliable stream-oriented data communication services.  For
+      example, NCP, TCP, NITS.
+
+
+
+
+
+Postel                                                         [Page 65]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+   user
+
+      A human being (or a process on behalf of a human being) wishing to
+      obtain mail transfer service.  In addition, a recipient of
+      computer mail.
+
+   word
+
+      A sequence of printing characters.
+
+   <CRLF>
+
+      The characters carriage return and line feed (in that order).
+
+   <SP>
+
+      The space character.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+[Page 66]                                                         Postel
+
+
+                                                                        
+RFC 821                                                      August 1982
+                                           Simple Mail Transfer Protocol
+
+
+
+REFERENCES
+
+   [1]  ASCII
+
+      ASCII, "USA Code for Information Interchange", United States of
+      America Standards Institute, X3.4, 1968.  Also in:  Feinler, E.
+      and J. Postel, eds., "ARPANET Protocol Handbook", NIC 7104, for
+      the Defense Communications Agency by SRI International, Menlo
+      Park, California, Revised January 1978.
+
+   [2]  RFC 822
+
+      Crocker, D., "Standard for the Format of ARPA Internet Text
+      Messages," RFC 822, Department of Electrical Engineering,
+      University of Delaware, August 1982.
+
+   [3]  TCP
+
+      Postel, J., ed., "Transmission Control Protocol - DARPA Internet
+      Program Protocol Specification", RFC 793, USC/Information Sciences
+      Institute, NTIS AD Number A111091, September 1981.  Also in:
+      Feinler, E. and J. Postel, eds., "Internet Protocol Transition
+      Workbook", SRI International, Menlo Park, California, March 1982.
+
+   [4]  NCP
+
+      McKenzie,A., "Host/Host Protocol for the ARPA Network", NIC 8246,
+      January 1972.  Also in:  Feinler, E. and J. Postel, eds., "ARPANET
+      Protocol Handbook", NIC 7104, for the Defense Communications
+      Agency by SRI International, Menlo Park, California, Revised
+      January 1978.
+
+   [5]  Initial Connection Protocol
+
+      Postel, J., "Official Initial Connection Protocol", NIC 7101,
+      11 June 1971.  Also in:  Feinler, E. and J. Postel, eds., "ARPANET
+      Protocol Handbook", NIC 7104, for the Defense Communications
+      Agency by SRI International, Menlo Park, California, Revised
+      January 1978.
+
+   [6]  NITS
+
+      PSS/SG3, "A Network Independent Transport Service", Study Group 3,
+      The Post Office PSS Users Group, February 1980.  Available from
+      the DCPU, National Physical Laboratory, Teddington, UK.
+
+
+
+
+Postel                                                         [Page 67]
+
+
+                                                                        
+August 1982                                                      RFC 821
+Simple Mail Transfer Protocol                                           
+
+
+
+   [7]  X.25
+
+      CCITT, "Recommendation X.25 - Interface Between Data Terminal
+      Equipment (DTE) and Data Circuit-terminating Equipment (DCE) for
+      Terminals Operating in the Packet Mode on Public Data Networks,"
+      CCITT Orange Book, Vol. VIII.2, International Telephone and
+      Telegraph Consultative Committee, Geneva, 1976.
+
+         
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+[Page 68]                                                         Postel
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc0822.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc0822.txt
new file mode 100644
index 000000000..35b09a3cb
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc0822.txt
@@ -0,0 +1,2901 @@
+
+ 
+
+
+
+
+     RFC #  822
+
+     Obsoletes:  RFC #733  (NIC #41952)
+
+
+
+
+
+
+
+
+
+
+
+
+                        STANDARD FOR THE FORMAT OF
+
+                        ARPA INTERNET TEXT MESSAGES
+
+
+
+
+
+
+                              August 13, 1982
+
+
+
+
+
+
+                                Revised by
+
+                             David H. Crocker
+
+
+                      Dept. of Electrical Engineering
+                 University of Delaware, Newark, DE  19711
+                      Network:  DCrocker @ UDel-Relay
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+                             TABLE OF CONTENTS
+
+
+     PREFACE ....................................................   ii
+
+     1.  INTRODUCTION ...........................................    1
+
+         1.1.  Scope ............................................    1
+         1.2.  Communication Framework ..........................    2
+
+     2.  NOTATIONAL CONVENTIONS .................................    3
+
+     3.  LEXICAL ANALYSIS OF MESSAGES ...........................    5
+
+         3.1.  General Description ..............................    5
+         3.2.  Header Field Definitions .........................    9
+         3.3.  Lexical Tokens ...................................   10
+         3.4.  Clarifications ...................................   11
+
+     4.  MESSAGE SPECIFICATION ..................................   17
+
+         4.1.  Syntax ...........................................   17
+         4.2.  Forwarding .......................................   19
+         4.3.  Trace Fields .....................................   20
+         4.4.  Originator Fields ................................   21
+         4.5.  Receiver Fields ..................................   23
+         4.6.  Reference Fields .................................   23
+         4.7.  Other Fields .....................................   24
+
+     5.  DATE AND TIME SPECIFICATION ............................   26
+
+         5.1.  Syntax ...........................................   26
+         5.2.  Semantics ........................................   26
+
+     6.  ADDRESS SPECIFICATION ..................................   27
+
+         6.1.  Syntax ...........................................   27
+         6.2.  Semantics ........................................   27
+         6.3.  Reserved Address .................................   33
+
+     7.  BIBLIOGRAPHY ...........................................   34
+
+
+                             APPENDIX
+
+     A.  EXAMPLES ...............................................   36
+     B.  SIMPLE FIELD PARSING ...................................   40
+     C.  DIFFERENCES FROM RFC #733 ..............................   41
+     D.  ALPHABETICAL LISTING OF SYNTAX RULES ...................   44
+
+
+     August 13, 1982               - i -                      RFC #822
+
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+                                  PREFACE
+
+
+          By 1977, the Arpanet employed several informal standards for
+     the  text  messages (mail) sent among its host computers.  It was
+     felt necessary to codify these practices and  provide  for  those
+     features  that  seemed  imminent.   The result of that effort was
+     Request for Comments (RFC) #733, "Standard for the Format of ARPA
+     Network Text Message", by Crocker, Vittal, Pogran, and Henderson.
+     The specification attempted to avoid major  changes  in  existing
+     software, while permitting several new features.
+
+          This document revises the specifications  in  RFC  #733,  in
+     order  to  serve  the  needs  of the larger and more complex ARPA
+     Internet.  Some of RFC #733's features failed  to  gain  adequate
+     acceptance.   In  order to simplify the standard and the software
+     that follows it, these features have been removed.   A  different
+     addressing  scheme  is  used, to handle the case of inter-network
+     mail; and the concept of re-transmission has been introduced.
+
+          This specification is intended for use in the ARPA Internet.
+     However, an attempt has been made to free it of any dependence on
+     that environment, so that it can be applied to other network text
+     message systems.
+
+          The specification of RFC #733 took place over the course  of
+     one  year, using the ARPANET mail environment, itself, to provide
+     an on-going forum for discussing the capabilities to be included.
+     More  than  twenty individuals, from across the country, partici-
+     pated in  the  original  discussion.   The  development  of  this
+     revised specification has, similarly, utilized network mail-based
+     group discussion.  Both specification efforts  greatly  benefited
+     from the comments and ideas of the participants.
+
+          The syntax of the standard,  in  RFC  #733,  was  originally
+     specified  in  the  Backus-Naur Form (BNF) meta-language.  Ken L.
+     Harrenstien, of SRI International, was responsible for  re-coding
+     the  BNF  into  an  augmented  BNF  that makes the representation
+     smaller and easier to understand.
+
+
+
+
+
+
+
+
+
+
+
+
+     August 13, 1982              - ii -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+     1.  INTRODUCTION
+
+     1.1.  SCOPE
+
+          This standard specifies a syntax for text messages that  are
+     sent  among  computer  users, within the framework of "electronic
+     mail".  The standard supersedes  the  one  specified  in  ARPANET
+     Request  for Comments #733, "Standard for the Format of ARPA Net-
+     work Text Messages".
+
+          In this context, messages are viewed as having  an  envelope
+     and  contents.   The  envelope  contains  whatever information is
+     needed to accomplish transmission  and  delivery.   The  contents
+     compose  the object to be delivered to the recipient.  This stan-
+     dard applies only to the format and some of the semantics of mes-
+     sage  contents.   It contains no specification of the information
+     in the envelope.
+
+          However, some message systems may use information  from  the
+     contents  to create the envelope.  It is intended that this stan-
+     dard facilitate the acquisition of such information by programs.
+
+          Some message systems may  store  messages  in  formats  that
+     differ  from the one specified in this standard.  This specifica-
+     tion is intended strictly as a definition of what message content
+     format is to be passed BETWEEN hosts.
+
+     Note:  This standard is NOT intended to dictate the internal for-
+            mats  used  by sites, the specific message system features
+            that they are expected to support, or any of  the  charac-
+            teristics  of  user interface programs that create or read
+            messages.
+
+          A distinction should be made between what the  specification
+     REQUIRES  and  what  it ALLOWS.  Messages can be made complex and
+     rich with formally-structured components of information or can be
+     kept small and simple, with a minimum of such information.  Also,
+     the standard simplifies the interpretation  of  differing  visual
+     formats  in  messages;  only  the  visual  aspect of a message is
+     affected and not the interpretation  of  information  within  it.
+     Implementors may choose to retain such visual distinctions.
+
+          The formal definition is divided into four levels.  The bot-
+     tom level describes the meta-notation used in this document.  The
+     second level describes basic lexical analyzers that  feed  tokens
+     to  higher-level  parsers.   Next is an overall specification for
+     messages; it permits distinguishing individual fields.   Finally,
+     there is definition of the contents of several structured fields.
+
+
+
+     August 13, 1982               - 1 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+     1.2.  COMMUNICATION FRAMEWORK
+
+          Messages consist of lines of text.   No  special  provisions
+     are  made for encoding drawings, facsimile, speech, or structured
+     text.  No significant consideration has been given  to  questions
+     of  data  compression  or to transmission and storage efficiency,
+     and the standard tends to be free with the number  of  bits  con-
+     sumed.   For  example,  field  names  are specified as free text,
+     rather than special terse codes.
+
+          A general "memo" framework is used.  That is, a message con-
+     sists of some information in a rigid format, followed by the main
+     part of the message, with a format that is not specified in  this
+     document.   The  syntax of several fields of the rigidly-formated
+     ("headers") section is defined in  this  specification;  some  of
+     these fields must be included in all messages.
+
+          The syntax  that  distinguishes  between  header  fields  is
+     specified  separately  from  the  internal  syntax for particular
+     fields.  This separation is intended to allow simple  parsers  to
+     operate on the general structure of messages, without concern for
+     the detailed structure of individual header fields.   Appendix  B
+     is provided to facilitate construction of these parsers.
+
+          In addition to the fields specified in this document, it  is
+     expected  that  other fields will gain common use.  As necessary,
+     the specifications for these "extension-fields" will be published
+     through  the same mechanism used to publish this document.  Users
+     may also  wish  to  extend  the  set  of  fields  that  they  use
+     privately.  Such "user-defined fields" are permitted.
+
+          The framework severely constrains document tone and  appear-
+     ance and is primarily useful for most intra-organization communi-
+     cations and  well-structured   inter-organization  communication.
+     It  also  can  be used for some types of inter-process communica-
+     tion, such as simple file transfer and remote job entry.  A  more
+     robust  framework might allow for multi-font, multi-color, multi-
+     dimension encoding of information.  A  less  robust  one,  as  is
+     present  in  most  single-machine  message  systems,  would  more
+     severely constrain the ability to add fields and the decision  to
+     include specific fields.  In contrast with paper-based communica-
+     tion, it is interesting to note that the RECEIVER  of  a  message
+     can   exercise  an  extraordinary  amount  of  control  over  the
+     message's appearance.  The amount of actual control available  to
+     message  receivers  is  contingent upon the capabilities of their
+     individual message systems.
+
+
+
+
+
+     August 13, 1982               - 2 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+     2.  NOTATIONAL CONVENTIONS
+
+          This specification uses an augmented Backus-Naur Form  (BNF)
+     notation.  The differences from standard BNF involve naming rules
+     and indicating repetition and "local" alternatives.
+
+     2.1.  RULE NAMING
+
+          Angle brackets ("<", ">") are not  used,  in  general.   The
+     name  of  a rule is simply the name itself, rather than "<name>".
+     Quotation-marks enclose literal text (which may be  upper  and/or
+     lower  case).   Certain  basic  rules  are  in uppercase, such as
+     SPACE, TAB, CRLF, DIGIT, ALPHA, etc.  Angle brackets are used  in
+     rule  definitions,  and  in  the rest of this  document, whenever
+     their presence will facilitate discerning the use of rule names.
+
+     2.2.  RULE1 / RULE2:  ALTERNATIVES
+
+          Elements separated by slash ("/") are alternatives.   There-
+     fore "foo / bar" will accept foo or bar.
+
+     2.3.  (RULE1 RULE2):  LOCAL ALTERNATIVES
+
+          Elements enclosed in parentheses are  treated  as  a  single
+     element.   Thus,  "(elem  (foo  /  bar)  elem)"  allows the token
+     sequences "elem foo elem" and "elem bar elem".
+
+     2.4.  *RULE:  REPETITION
+
+          The character "*" preceding an element indicates repetition.
+     The full form is:
+
+                              <l>*<m>element
+
+     indicating at least <l> and at most <m> occurrences  of  element.
+     Default values are 0 and infinity so that "*(element)" allows any
+     number, including zero; "1*element" requires at  least  one;  and
+     "1*2element" allows one or two.
+
+     2.5.  [RULE]:  OPTIONAL
+
+          Square brackets enclose optional elements; "[foo  bar]"   is
+     equivalent to "*1(foo bar)".
+
+     2.6.  NRULE:  SPECIFIC REPETITION
+
+          "<n>(element)" is equivalent to "<n>*<n>(element)"; that is,
+     exactly  <n>  occurrences  of (element). Thus 2DIGIT is a 2-digit
+     number, and 3ALPHA is a string of three alphabetic characters.
+
+
+     August 13, 1982               - 3 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+     2.7.  #RULE:  LISTS
+
+          A construct "#" is defined, similar to "*", as follows:
+
+                              <l>#<m>element
+
+     indicating at least <l> and at most <m> elements, each  separated
+     by  one  or more commas (","). This makes the usual form of lists
+     very easy; a rule such as '(element *("," element))' can be shown
+     as  "1#element".   Wherever this construct is used, null elements
+     are allowed, but do not  contribute  to  the  count  of  elements
+     present.   That  is,  "(element),,(element)"  is  permitted,  but
+     counts as only two elements.  Therefore, where at least one  ele-
+     ment  is required, at least one non-null element must be present.
+     Default values are 0 and infinity so that "#(element)" allows any
+     number,  including  zero;  "1#element" requires at least one; and
+     "1#2element" allows one or two.
+
+     2.8.  ; COMMENTS
+
+          A semi-colon, set off some distance to  the  right  of  rule
+     text,  starts  a comment that continues to the end of line.  This
+     is a simple way of including useful notes in  parallel  with  the
+     specifications.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+     August 13, 1982               - 4 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+     3.  LEXICAL ANALYSIS OF MESSAGES
+
+     3.1.  GENERAL DESCRIPTION
+
+          A message consists of header fields and, optionally, a body.
+     The  body  is simply a sequence of lines containing ASCII charac-
+     ters.  It is separated from the headers by a null line  (i.e.,  a
+     line with nothing preceding the CRLF).
+
+     3.1.1.  LONG HEADER FIELDS
+
+        Each header field can be viewed as a single, logical  line  of
+        ASCII  characters,  comprising  a field-name and a field-body.
+        For convenience, the field-body  portion  of  this  conceptual
+        entity  can be split into a multiple-line representation; this
+        is called "folding".  The general rule is that wherever  there
+        may  be  linear-white-space  (NOT  simply  LWSP-chars), a CRLF
+        immediately followed by AT LEAST one LWSP-char may instead  be
+        inserted.  Thus, the single line
+
+            To:  "Joe & J. Harvey" <ddd @Org>, JJV @ BBN
+
+        can be represented as:
+
+            To:  "Joe & J. Harvey" <ddd @ Org>,
+                    JJV@BBN
+
+        and
+
+            To:  "Joe & J. Harvey"
+                            <ddd@ Org>, JJV
+             @BBN
+
+        and
+
+            To:  "Joe &
+             J. Harvey" <ddd @ Org>, JJV @ BBN
+
+             The process of moving  from  this  folded   multiple-line
+        representation  of a header field to its single line represen-
+        tation is called "unfolding".  Unfolding  is  accomplished  by
+        regarding   CRLF   immediately  followed  by  a  LWSP-char  as
+        equivalent to the LWSP-char.
+
+        Note:  While the standard  permits  folding  wherever  linear-
+               white-space is permitted, it is recommended that struc-
+               tured fields, such as those containing addresses, limit
+               folding  to higher-level syntactic breaks.  For address
+               fields, it  is  recommended  that  such  folding  occur
+
+
+     August 13, 1982               - 5 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+               between addresses, after the separating comma.
+
+     3.1.2.  STRUCTURE OF HEADER FIELDS
+
+        Once a field has been unfolded, it may be viewed as being com-
+        posed of a field-name followed by a colon (":"), followed by a
+        field-body, and  terminated  by  a  carriage-return/line-feed.
+        The  field-name must be composed of printable ASCII characters
+        (i.e., characters that  have  values  between  33.  and  126.,
+        decimal, except colon).  The field-body may be composed of any
+        ASCII characters, except CR or LF.  (While CR and/or LF may be
+        present  in the actual text, they are removed by the action of
+        unfolding the field.)
+
+        Certain field-bodies of headers may be  interpreted  according
+        to  an  internal  syntax  that some systems may wish to parse.
+        These  fields  are  called  "structured   fields".    Examples
+        include  fields containing dates and addresses.  Other fields,
+        such as "Subject"  and  "Comments",  are  regarded  simply  as
+        strings of text.
+
+        Note:  Any field which has a field-body  that  is  defined  as
+               other  than  simply <text> is to be treated as a struc-
+               tured field.
+
+               Field-names, unstructured field bodies  and  structured
+               field bodies each are scanned by their own, independent
+               "lexical" analyzers.
+
+     3.1.3.  UNSTRUCTURED FIELD BODIES
+
+        For some fields, such as "Subject" and "Comments",  no  struc-
+        turing  is assumed, and they are treated simply as <text>s, as
+        in the message body.  Rules of folding apply to these  fields,
+        so  that  such  field  bodies  which occupy several lines must
+        therefore have the second and successive lines indented by  at
+        least one LWSP-char.
+
+     3.1.4.  STRUCTURED FIELD BODIES
+
+        To aid in the creation and reading of structured  fields,  the
+        free  insertion   of linear-white-space (which permits folding
+        by inclusion of CRLFs)  is  allowed  between  lexical  tokens.
+        Rather  than  obscuring  the  syntax  specifications for these
+        structured fields with explicit syntax for this  linear-white-
+        space, the existence of another "lexical" analyzer is assumed.
+        This analyzer does not apply  for  unstructured  field  bodies
+        that  are  simply  strings  of  text, as described above.  The
+        analyzer provides  an  interpretation  of  the  unfolded  text
+
+
+     August 13, 1982               - 6 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+        composing  the body of the field as a sequence of lexical sym-
+        bols.
+
+        These symbols are:
+
+                     -  individual special characters
+                     -  quoted-strings
+                     -  domain-literals
+                     -  comments
+                     -  atoms
+
+        The first four of these symbols  are  self-delimiting.   Atoms
+        are not; they are delimited by the self-delimiting symbols and
+        by  linear-white-space.   For  the  purposes  of  regenerating
+        sequences  of  atoms  and quoted-strings, exactly one SPACE is
+        assumed to exist, and should be used, between them.  (Also, in
+        the "Clarifications" section on "White Space", below, note the
+        rules about treatment of multiple contiguous LWSP-chars.)
+
+        So, for example, the folded body of an address field
+
+            ":sysmail"@  Some-Group. Some-Org,
+            Muhammed.(I am  the greatest) Ali @(the)Vegas.WBA
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+     August 13, 1982               - 7 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+        is analyzed into the following lexical symbols and types:
+
+                    :sysmail              quoted string
+                    @                     special
+                    Some-Group            atom
+                    .                     special
+                    Some-Org              atom
+                    ,                     special
+                    Muhammed              atom
+                    .                     special
+                    (I am  the greatest)  comment
+                    Ali                   atom
+                    @                     atom
+                    (the)                 comment
+                    Vegas                 atom
+                    .                     special
+                    WBA                   atom
+
+        The canonical representations for the data in these  addresses
+        are the following strings:
+
+                        ":sysmail"@Some-Group.Some-Org
+
+        and
+
+                            Muhammed.Ali@Vegas.WBA
+
+        Note:  For purposes of display, and when passing  such  struc-
+               tured information to other systems, such as mail proto-
+               col  services,  there  must  be  NO  linear-white-space
+               between  <word>s  that are separated by period (".") or
+               at-sign ("@") and exactly one SPACE between  all  other
+               <word>s.  Also, headers should be in a folded form.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+     August 13, 1982               - 8 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+     3.2.  HEADER FIELD DEFINITIONS
+
+          These rules show a field meta-syntax, without regard for the
+     particular  type  or internal syntax.  Their purpose is to permit
+     detection of fields; also, they present to  higher-level  parsers
+     an image of each field as fitting on one line.
+
+     field       =  field-name ":" [ field-body ] CRLF
+
+     field-name  =  1*<any CHAR, excluding CTLs, SPACE, and ":">
+
+     field-body  =  field-body-contents
+                    [CRLF LWSP-char field-body]
+
+     field-body-contents =
+                   <the ASCII characters making up the field-body, as
+                    defined in the following sections, and consisting
+                    of combinations of atom, quoted-string, and
+                    specials tokens, or else consisting of texts>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+     August 13, 1982               - 9 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+     3.3.  LEXICAL TOKENS
+
+          The following rules are used to define an underlying lexical
+     analyzer,  which  feeds  tokens to higher level parsers.  See the
+     ANSI references, in the Bibliography.
+
+                                                 ; (  Octal, Decimal.)
+     CHAR        =  <any ASCII character>        ; (  0-177,  0.-127.)
+     ALPHA       =  <any ASCII alphabetic character>
+                                                 ; (101-132, 65.- 90.)
+                                                 ; (141-172, 97.-122.)
+     DIGIT       =  <any ASCII decimal digit>    ; ( 60- 71, 48.- 57.)
+     CTL         =  <any ASCII control           ; (  0- 37,  0.- 31.)
+                     character and DEL>          ; (    177,     127.)
+     CR          =  <ASCII CR, carriage return>  ; (     15,      13.)
+     LF          =  <ASCII LF, linefeed>         ; (     12,      10.)
+     SPACE       =  <ASCII SP, space>            ; (     40,      32.)
+     HTAB        =  <ASCII HT, horizontal-tab>   ; (     11,       9.)
+     <">         =  <ASCII quote mark>           ; (     42,      34.)
+     CRLF        =  CR LF
+
+     LWSP-char   =  SPACE / HTAB                 ; semantics = SPACE
+
+     linear-white-space =  1*([CRLF] LWSP-char)  ; semantics = SPACE
+                                                 ; CRLF => folding
+
+     specials    =  "(" / ")" / "<" / ">" / "@"  ; Must be in quoted-
+                 /  "," / ";" / ":" / "\" / <">  ;  string, to use
+                 /  "." / "[" / "]"              ;  within a word.
+
+     delimiters  =  specials / linear-white-space / comment
+
+     text        =  <any CHAR, including bare    ; => atoms, specials,
+                     CR & bare LF, but NOT       ;  comments and
+                     including CRLF>             ;  quoted-strings are
+                                                 ;  NOT recognized.
+
+     atom        =  1*<any CHAR except specials, SPACE and CTLs>
+
+     quoted-string = <"> *(qtext/quoted-pair) <">; Regular qtext or
+                                                 ;   quoted chars.
+
+     qtext       =  <any CHAR excepting <">,     ; => may be folded
+                     "\" & CR, and including
+                     linear-white-space>
+
+     domain-literal =  "[" *(dtext / quoted-pair) "]"
+
+
+
+
+     August 13, 1982              - 10 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+     dtext       =  <any CHAR excluding "[",     ; => may be folded
+                     "]", "\" & CR, & including
+                     linear-white-space>
+
+     comment     =  "(" *(ctext / quoted-pair / comment) ")"
+
+     ctext       =  <any CHAR excluding "(",     ; => may be folded
+                     ")", "\" & CR, & including
+                     linear-white-space>
+
+     quoted-pair =  "\" CHAR                     ; may quote any char
+
+     phrase      =  1*word                       ; Sequence of words
+
+     word        =  atom / quoted-string
+
+
+     3.4.  CLARIFICATIONS
+
+     3.4.1.  QUOTING
+
+        Some characters are reserved for special interpretation,  such
+        as  delimiting lexical tokens.  To permit use of these charac-
+        ters as uninterpreted data, a quoting mechanism  is  provided.
+        To quote a character, precede it with a backslash ("\").
+
+        This mechanism is not fully general.  Characters may be quoted
+        only  within  a subset of the lexical constructs.  In particu-
+        lar, quoting is limited to use within:
+
+                             -  quoted-string
+                             -  domain-literal
+                             -  comment
+
+        Within these constructs, quoting is REQUIRED for  CR  and  "\"
+        and for the character(s) that delimit the token (e.g., "(" and
+        ")" for a comment).  However, quoting  is  PERMITTED  for  any
+        character.
+
+        Note:  In particular, quoting is NOT permitted  within  atoms.
+               For  example  when  the local-part of an addr-spec must
+               contain a special character, a quoted  string  must  be
+               used.  Therefore, a specification such as:
+
+                            Full\ Name@Domain
+
+               is not legal and must be specified as:
+
+                            "Full Name"@Domain
+
+
+     August 13, 1982              - 11 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+     3.4.2.  WHITE SPACE
+
+        Note:  In structured field bodies, multiple linear space ASCII
+               characters  (namely  HTABs  and  SPACEs) are treated as
+               single spaces and may freely surround any  symbol.   In
+               all header fields, the only place in which at least one
+               LWSP-char is REQUIRED is at the beginning of  continua-
+               tion lines in a folded field.
+
+        When passing text to processes  that  do  not  interpret  text
+        according to this standard (e.g., mail protocol servers), then
+        NO linear-white-space characters should occur between a period
+        (".") or at-sign ("@") and a <word>.  Exactly ONE SPACE should
+        be used in place of arbitrary linear-white-space  and  comment
+        sequences.
+
+        Note:  Within systems conforming to this standard, wherever  a
+               member of the list of delimiters is allowed, LWSP-chars
+               may also occur before and/or after it.
+
+        Writers of  mail-sending  (i.e.,  header-generating)  programs
+        should realize that there is no network-wide definition of the
+        effect of ASCII HT (horizontal-tab) characters on the  appear-
+        ance  of  text  at another network host; therefore, the use of
+        tabs in message headers, though permitted, is discouraged.
+
+     3.4.3.  COMMENTS
+
+        A comment is a set of ASCII characters, which is  enclosed  in
+        matching  parentheses  and which is not within a quoted-string
+        The comment construct permits message originators to add  text
+        which  will  be  useful  for  human readers, but which will be
+        ignored by the formal semantics.  Comments should be  retained
+        while  the  message  is subject to interpretation according to
+        this standard.  However, comments  must  NOT  be  included  in
+        other  cases,  such  as  during  protocol  exchanges with mail
+        servers.
+
+        Comments nest, so that if an unquoted left parenthesis  occurs
+        in  a  comment  string,  there  must  also be a matching right
+        parenthesis.  When a comment acts as the delimiter  between  a
+        sequence of two lexical symbols, such as two atoms, it is lex-
+        ically equivalent with a single SPACE,  for  the  purposes  of
+        regenerating  the  sequence, such as when passing the sequence
+        onto a mail protocol server.  Comments are  detected  as  such
+        only within field-bodies of structured fields.
+
+        If a comment is to be "folded" onto multiple lines,  then  the
+        syntax  for  folding  must  be  adhered to.  (See the "Lexical
+
+
+     August 13, 1982              - 12 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+        Analysis of Messages" section on "Folding Long Header  Fields"
+        above,  and  the  section on "Case Independence" below.)  Note
+        that  the  official  semantics  therefore  do  not  "see"  any
+        unquoted CRLFs that are in comments, although particular pars-
+        ing programs may wish to note their presence.  For these  pro-
+        grams,  it would be reasonable to interpret a "CRLF LWSP-char"
+        as being a CRLF that is part of the comment; i.e., the CRLF is
+        kept  and  the  LWSP-char is discarded.  Quoted CRLFs (i.e., a
+        backslash followed by a CR followed by a  LF)  still  must  be
+        followed by at least one LWSP-char.
+
+     3.4.4.  DELIMITING AND QUOTING CHARACTERS
+
+        The quote character (backslash) and  characters  that  delimit
+        syntactic  units  are not, generally, to be taken as data that
+        are part of the delimited or quoted unit(s).   In  particular,
+        the   quotation-marks   that   define   a  quoted-string,  the
+        parentheses that define  a  comment  and  the  backslash  that
+        quotes  a  following  character  are  NOT  part of the quoted-
+        string, comment or quoted character.  A quotation-mark that is
+        to  be  part  of  a quoted-string, a parenthesis that is to be
+        part of a comment and a backslash that is to be part of either
+        must  each be preceded by the quote-character backslash ("\").
+        Note that the syntax allows any character to be quoted  within
+        a  quoted-string  or  comment; however only certain characters
+        MUST be quoted to be included as data.  These  characters  are
+        the  ones that are not part of the alternate text group (i.e.,
+        ctext or qtext).
+
+        The one exception to this rule  is  that  a  single  SPACE  is
+        assumed  to  exist  between  contiguous words in a phrase, and
+        this interpretation is independent of  the  actual  number  of
+        LWSP-chars  that  the  creator  places  between the words.  To
+        include more than one SPACE, the creator must make  the  LWSP-
+        chars be part of a quoted-string.
+
+        Quotation marks that delimit a quoted string  and  backslashes
+        that  quote  the  following character should NOT accompany the
+        quoted-string when the string is passed to processes  that  do
+        not interpret data according to this specification (e.g., mail
+        protocol servers).
+
+     3.4.5.  QUOTED-STRINGS
+
+        Where permitted (i.e., in words in structured fields)  quoted-
+        strings  are  treated  as a single symbol.  That is, a quoted-
+        string is equivalent to an atom, syntactically.  If a  quoted-
+        string  is to be "folded" onto multiple lines, then the syntax
+        for folding must be adhered to.  (See the "Lexical Analysis of
+
+
+     August 13, 1982              - 13 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+        Messages"  section  on "Folding Long Header Fields" above, and
+        the section on "Case  Independence"  below.)   Therefore,  the
+        official  semantics  do  not  "see" any bare CRLFs that are in
+        quoted-strings; however particular parsing programs  may  wish
+        to  note  their presence.  For such programs, it would be rea-
+        sonable to interpret a "CRLF LWSP-char" as being a CRLF  which
+        is  part  of the quoted-string; i.e., the CRLF is kept and the
+        LWSP-char is discarded.  Quoted CRLFs (i.e., a backslash  fol-
+        lowed  by  a CR followed by a LF) are also subject to rules of
+        folding, but the presence of the quoting character (backslash)
+        explicitly  indicates  that  the  CRLF  is  data to the quoted
+        string.  Stripping off the first following LWSP-char  is  also
+        appropriate when parsing quoted CRLFs.
+
+     3.4.6.  BRACKETING CHARACTERS
+
+        There is one type of bracket which must occur in matched pairs
+        and may have pairs nested within each other:
+
+            o   Parentheses ("(" and ")") are used  to  indicate  com-
+                ments.
+
+        There are three types of brackets which must occur in  matched
+        pairs, and which may NOT be nested:
+
+            o   Colon/semi-colon (":" and ";") are   used  in  address
+                specifications  to  indicate that the included list of
+                addresses are to be treated as a group.
+
+            o   Angle brackets ("<" and ">")  are  generally  used  to
+                indicate  the  presence of a one machine-usable refer-
+                ence (e.g., delimiting mailboxes), possibly  including
+                source-routing to the machine.
+
+            o   Square brackets ("[" and "]") are used to indicate the
+                presence  of  a  domain-literal, which the appropriate
+                name-domain  is  to  use  directly,  bypassing  normal
+                name-resolution mechanisms.
+
+     3.4.7.  CASE INDEPENDENCE
+
+        Except as noted, alphabetic strings may be represented in  any
+        combination of upper and lower case.  The only syntactic units
+
+
+
+
+
+
+
+
+     August 13, 1982              - 14 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+        which requires preservation of case information are:
+
+                    -  text
+                    -  qtext
+                    -  dtext
+                    -  ctext
+                    -  quoted-pair
+                    -  local-part, except "Postmaster"
+
+        When matching any other syntactic unit, case is to be ignored.
+        For  example, the field-names "From", "FROM", "from", and even
+        "FroM" are semantically equal and should all be treated ident-
+        ically.
+
+        When generating these units, any mix of upper and  lower  case
+        alphabetic  characters  may  be  used.  The case shown in this
+        specification is suggested for message-creating processes.
+
+        Note:  The reserved local-part address unit, "Postmaster",  is
+               an  exception.   When  the  value "Postmaster" is being
+               interpreted, it must be  accepted  in  any  mixture  of
+               case, including "POSTMASTER", and "postmaster".
+
+     3.4.8.  FOLDING LONG HEADER FIELDS
+
+        Each header field may be represented on exactly one line  con-
+        sisting  of the name of the field and its body, and terminated
+        by a CRLF; this is what the parser sees.  For readability, the
+        field-body  portion of long header fields may be "folded" onto
+        multiple lines of the actual field.  "Long" is commonly inter-
+        preted  to  mean greater than 65 or 72 characters.  The former
+        length serves as a limit, when the message is to be viewed  on
+        most  simple terminals which use simple display software; how-
+        ever, the limit is not imposed by this standard.
+
+        Note:  Some display software often can selectively fold lines,
+               to  suit  the display terminal.  In such cases, sender-
+               provided  folding  can  interfere  with   the   display
+               software.
+
+     3.4.9.  BACKSPACE CHARACTERS
+
+        ASCII BS characters (Backspace, decimal 8) may be included  in
+        texts and quoted-strings to effect overstriking.  However, any
+        use of backspaces which effects an overstrike to the  left  of
+        the beginning of the text or quoted-string is prohibited.
+
+
+
+
+
+     August 13, 1982              - 15 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+     3.4.10.  NETWORK-SPECIFIC TRANSFORMATIONS
+
+        During transmission through heterogeneous networks, it may  be
+        necessary  to  force data to conform to a network's local con-
+        ventions.  For example, it may be required that a CR  be  fol-
+        lowed  either by LF, making a CRLF, or by <null>, if the CR is
+        to stand alone).  Such transformations are reversed, when  the
+        message exits that network.
+
+        When  crossing  network  boundaries,  the  message  should  be
+        treated  as  passing  through  two modules.  It will enter the
+        first module containing whatever network-specific  transforma-
+        tions  that  were  necessary  to  permit migration through the
+        "current" network.  It then passes through the modules:
+
+            o   Transformation Reversal
+
+                The "current" network's idiosyncracies are removed and
+                the  message  is returned to the canonical form speci-
+                fied in this standard.
+
+            o   Transformation
+
+                The "next" network's local idiosyncracies are  imposed
+                on the message.
+
+                                ------------------
+                    From   ==>  | Remove Net-A   |
+                    Net-A       | idiosyncracies |
+                                ------------------
+                                       ||
+                                       \/
+                                  Conformance
+                                  with standard
+                                       ||
+                                       \/
+                                ------------------
+                                | Impose Net-B   |  ==>  To
+                                | idiosyncracies |       Net-B
+                                ------------------
+
+
+
+
+
+
+
+
+
+
+
+     August 13, 1982              - 16 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+     4.  MESSAGE SPECIFICATION
+
+     4.1.  SYNTAX
+
+     Note:  Due to an artifact of the notational conventions, the syn-
+            tax  indicates that, when present, some fields, must be in
+            a particular order.  Header fields  are  NOT  required  to
+            occur  in  any  particular  order, except that the message
+            body must occur AFTER  the  headers.   It  is  recommended
+            that,  if  present,  headers be sent in the order "Return-
+            Path", "Received", "Date",  "From",  "Subject",  "Sender",
+            "To", "cc", etc.
+
+            This specification permits multiple  occurrences  of  most
+            fields.   Except  as  noted,  their  interpretation is not
+            specified here, and their use is discouraged.
+
+          The following syntax for the bodies of various fields should
+     be  thought  of  as  describing  each field body as a single long
+     string (or line).  The "Lexical Analysis of Message"  section  on
+     "Long  Header Fields", above, indicates how such long strings can
+     be represented on more than one line in  the  actual  transmitted
+     message.
+
+     message     =  fields *( CRLF *text )       ; Everything after
+                                                 ;  first null line
+                                                 ;  is message body
+
+     fields      =    dates                      ; Creation time,
+                      source                     ;  author id & one
+                    1*destination                ;  address required
+                     *optional-field             ;  others optional
+
+     source      = [  trace ]                    ; net traversals
+                      originator                 ; original mail
+                   [  resent ]                   ; forwarded
+
+     trace       =    return                     ; path to sender
+                    1*received                   ; receipt tags
+
+     return      =  "Return-path" ":" route-addr ; return address
+
+     received    =  "Received"    ":"            ; one per relay
+                       ["from" domain]           ; sending host
+                       ["by"   domain]           ; receiving host
+                       ["via"  atom]             ; physical path
+                      *("with" atom)             ; link/mail protocol
+                       ["id"   msg-id]           ; receiver msg id
+                       ["for"  addr-spec]        ; initial form
+
+
+     August 13, 1982              - 17 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+                        ";"    date-time         ; time received
+
+     originator  =   authentic                   ; authenticated addr
+                   [ "Reply-To"   ":" 1#address] )
+
+     authentic   =   "From"       ":"   mailbox  ; Single author
+                 / ( "Sender"     ":"   mailbox  ; Actual submittor
+                     "From"       ":" 1#mailbox) ; Multiple authors
+                                                 ;  or not sender
+
+     resent      =   resent-authentic
+                   [ "Resent-Reply-To"  ":" 1#address] )
+
+     resent-authentic =
+                 =   "Resent-From"      ":"   mailbox
+                 / ( "Resent-Sender"    ":"   mailbox
+                     "Resent-From"      ":" 1#mailbox  )
+
+     dates       =   orig-date                   ; Original
+                   [ resent-date ]               ; Forwarded
+
+     orig-date   =  "Date"        ":"   date-time
+
+     resent-date =  "Resent-Date" ":"   date-time
+
+     destination =  "To"          ":" 1#address  ; Primary
+                 /  "Resent-To"   ":" 1#address
+                 /  "cc"          ":" 1#address  ; Secondary
+                 /  "Resent-cc"   ":" 1#address
+                 /  "bcc"         ":"  #address  ; Blind carbon
+                 /  "Resent-bcc"  ":"  #address
+
+     optional-field =
+                 /  "Message-ID"        ":"   msg-id
+                 /  "Resent-Message-ID" ":"   msg-id
+                 /  "In-Reply-To"       ":"  *(phrase / msg-id)
+                 /  "References"        ":"  *(phrase / msg-id)
+                 /  "Keywords"          ":"  #phrase
+                 /  "Subject"           ":"  *text
+                 /  "Comments"          ":"  *text
+                 /  "Encrypted"         ":" 1#2word
+                 /  extension-field              ; To be defined
+                 /  user-defined-field           ; May be pre-empted
+
+     msg-id      =  "<" addr-spec ">"            ; Unique message id
+
+
+
+
+
+
+     August 13, 1982              - 18 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+     extension-field =
+                   <Any field which is defined in a document
+                    published as a formal extension to this
+                    specification; none will have names beginning
+                    with the string "X-">
+
+     user-defined-field =
+                   <Any field which has not been defined
+                    in this specification or published as an
+                    extension to this specification; names for
+                    such fields must be unique and may be
+                    pre-empted by published extensions>
+
+     4.2.  FORWARDING
+
+          Some systems permit mail recipients to  forward  a  message,
+     retaining  the original headers, by adding some new fields.  This
+     standard supports such a service, through the "Resent-" prefix to
+     field names.
+
+          Whenever the string "Resent-" begins a field name, the field
+     has  the  same  semantics as a field whose name does not have the
+     prefix.  However, the message is assumed to have  been  forwarded
+     by  an original recipient who attached the "Resent-" field.  This
+     new field is treated as being more recent  than  the  equivalent,
+     original  field.   For  example, the "Resent-From", indicates the
+     person that forwarded the message, whereas the "From" field indi-
+     cates the original author.
+
+          Use of such precedence  information  depends  upon  partici-
+     pants'  communication needs.  For example, this standard does not
+     dictate when a "Resent-From:" address should receive replies,  in
+     lieu of sending them to the "From:" address.
+
+     Note:  In general, the "Resent-" fields should be treated as con-
+            taining  a  set  of information that is independent of the
+            set of original fields.  Information for  one  set  should
+            not  automatically be taken from the other.  The interpre-
+            tation of multiple "Resent-" fields, of the same type,  is
+            undefined.
+
+          In the remainder of this specification, occurrence of  legal
+     "Resent-"  fields  are treated identically with the occurrence of
+
+
+
+
+
+
+
+
+     August 13, 1982              - 19 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+     fields whose names do not contain this prefix.
+
+     4.3.  TRACE FIELDS
+
+          Trace information is used to provide an audit trail of  mes-
+     sage  handling.   In  addition,  it indicates a route back to the
+     sender of the message.
+
+          The list of known "via" and  "with"  values  are  registered
+     with  the  Network  Information  Center, SRI International, Menlo
+     Park, California.
+
+     4.3.1.  RETURN-PATH
+
+        This field  is  added  by  the  final  transport  system  that
+        delivers  the message to its recipient.  The field is intended
+        to contain definitive information about the address and  route
+        back to the message's originator.
+
+        Note:  The "Reply-To" field is added  by  the  originator  and
+               serves  to  direct  replies,  whereas the "Return-Path"
+               field is used to identify a path back to  the  origina-
+               tor.
+
+        While the syntax  indicates  that  a  route  specification  is
+        optional,  every attempt should be made to provide that infor-
+        mation in this field.
+
+     4.3.2.  RECEIVED
+
+        A copy of this field is added by each transport  service  that
+        relays the message.  The information in the field can be quite
+        useful for tracing transport problems.
+
+        The names of the sending  and  receiving  hosts  and  time-of-
+        receipt may be specified.  The "via" parameter may be used, to
+        indicate what physical mechanism the message  was  sent  over,
+        such  as  Arpanet or Phonenet, and the "with" parameter may be
+        used to indicate the mail-,  or  connection-,  level  protocol
+        that  was  used, such as the SMTP mail protocol, or X.25 tran-
+        sport protocol.
+
+        Note:  Several "with" parameters may  be  included,  to  fully
+               specify the set of protocols that were used.
+
+        Some transport services queue mail; the internal message iden-
+        tifier that is assigned to the message may be noted, using the
+        "id" parameter.  When the  sending  host  uses  a  destination
+        address specification that the receiving host reinterprets, by
+
+
+     August 13, 1982              - 20 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+        expansion or transformation, the receiving host  may  wish  to
+        record  the original specification, using the "for" parameter.
+        For example, when a copy of mail is sent to the  member  of  a
+        distribution  list,  this  parameter may be used to record the
+        original address that was used to specify the list.
+
+     4.4.  ORIGINATOR FIELDS
+
+          The standard allows only a subset of the combinations possi-
+     ble  with the From, Sender, Reply-To, Resent-From, Resent-Sender,
+     and Resent-Reply-To fields.  The limitation is intentional.
+
+     4.4.1.  FROM / RESENT-FROM
+
+        This field contains the identity of the person(s)  who  wished
+        this  message to be sent.  The message-creation process should
+        default this field  to  be  a  single,  authenticated  machine
+        address,  indicating  the  AGENT  (person,  system or process)
+        entering the message.  If this is not done, the "Sender" field
+        MUST  be  present.  If the "From" field IS defaulted this way,
+        the "Sender" field is  optional  and  is  redundant  with  the
+        "From"  field.   In  all  cases, addresses in the "From" field
+        must be machine-usable (addr-specs) and may not contain  named
+        lists (groups).
+
+     4.4.2.  SENDER / RESENT-SENDER
+
+        This field contains the authenticated identity  of  the  AGENT
+        (person,  system  or  process)  that sends the message.  It is
+        intended for use when the sender is not the author of the mes-
+        sage,  or  to  indicate  who among a group of authors actually
+        sent the message.  If the contents of the "Sender" field would
+        be  completely  redundant  with  the  "From"  field,  then the
+        "Sender" field need not be present and its use is  discouraged
+        (though  still legal).  In particular, the "Sender" field MUST
+        be present if it is NOT the same as the "From" Field.
+
+        The Sender mailbox  specification  includes  a  word  sequence
+        which  must correspond to a specific agent (i.e., a human user
+        or a computer program) rather than a standard  address.   This
+        indicates  the  expectation  that  the field will identify the
+        single AGENT (person,  system,  or  process)  responsible  for
+        sending  the mail and not simply include the name of a mailbox
+        from which the mail was sent.  For example in the  case  of  a
+        shared login name, the name, by itself, would not be adequate.
+        The local-part address unit, which refers to  this  agent,  is
+        expected to be a computer system term, and not (for example) a
+        generalized person reference which can  be  used  outside  the
+        network text message context.
+
+
+     August 13, 1982              - 21 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+        Since the critical function served by the  "Sender"  field  is
+        identification  of  the agent responsible for sending mail and
+        since computer programs cannot be held accountable  for  their
+        behavior, it is strongly recommended that when a computer pro-
+        gram generates a message, the HUMAN  who  is  responsible  for
+        that program be referenced as part of the "Sender" field mail-
+        box specification.
+
+     4.4.3.  REPLY-TO / RESENT-REPLY-TO
+
+        This field provides a general  mechanism  for  indicating  any
+        mailbox(es)  to which responses are to be sent.  Three typical
+        uses for this feature can  be  distinguished.   In  the  first
+        case,  the  author(s) may not have regular machine-based mail-
+        boxes and therefore wish(es) to indicate an alternate  machine
+        address.   In  the  second case, an author may wish additional
+        persons to be made aware of, or responsible for,  replies.   A
+        somewhat  different  use  may be of some help to "text message
+        teleconferencing" groups equipped with automatic  distribution
+        services:   include the address of that service in the "Reply-
+        To" field of all messages  submitted  to  the  teleconference;
+        then  participants  can  "reply"  to conference submissions to
+        guarantee the correct distribution of any submission of  their
+        own.
+
+        Note:  The "Return-Path" field is added by the mail  transport
+               service,  at the time of final deliver.  It is intended
+               to identify a path back to the orginator  of  the  mes-
+               sage.   The  "Reply-To"  field  is added by the message
+               originator and is intended to direct replies.
+
+     4.4.4.  AUTOMATIC USE OF FROM / SENDER / REPLY-TO
+
+        For systems which automatically  generate  address  lists  for
+        replies to messages, the following recommendations are made:
+
+            o   The "Sender" field mailbox should be sent  notices  of
+                any  problems in transport or delivery of the original
+                messages.  If there is no  "Sender"  field,  then  the
+                "From" field mailbox should be used.
+
+            o   The  "Sender"  field  mailbox  should  NEVER  be  used
+                automatically, in a recipient's reply message.
+
+            o   If the "Reply-To" field exists, then the reply  should
+                go to the addresses indicated in that field and not to
+                the address(es) indicated in the "From" field.
+
+
+
+
+     August 13, 1982              - 22 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+            o   If there is a "From" field, but no  "Reply-To"  field,
+                the  reply should be sent to the address(es) indicated
+                in the "From" field.
+
+        Sometimes, a recipient may actually wish to  communicate  with
+        the  person  that  initiated  the  message  transfer.  In such
+        cases, it is reasonable to use the "Sender" address.
+
+        This recommendation is intended  only  for  automated  use  of
+        originator-fields  and is not intended to suggest that replies
+        may not also be sent to other recipients of messages.   It  is
+        up  to  the  respective  mail-handling programs to decide what
+        additional facilities will be provided.
+
+        Examples are provided in Appendix A.
+
+     4.5.  RECEIVER FIELDS
+
+     4.5.1.  TO / RESENT-TO
+
+        This field contains the identity of the primary recipients  of
+        the message.
+
+     4.5.2.  CC / RESENT-CC
+
+        This field contains the identity of  the  secondary  (informa-
+        tional) recipients of the message.
+
+     4.5.3.  BCC / RESENT-BCC
+
+        This field contains the identity of additional  recipients  of
+        the  message.   The contents of this field are not included in
+        copies of the message sent to the primary and secondary  reci-
+        pients.   Some  systems  may choose to include the text of the
+        "Bcc" field only in the author(s)'s  copy,  while  others  may
+        also include it in the text sent to all those indicated in the
+        "Bcc" list.
+
+     4.6.  REFERENCE FIELDS
+
+     4.6.1.  MESSAGE-ID / RESENT-MESSAGE-ID
+
+             This field contains a unique identifier  (the  local-part
+        address  unit)  which  refers to THIS version of THIS message.
+        The uniqueness of the message identifier is guaranteed by  the
+        host  which  generates  it.  This identifier is intended to be
+        machine readable and not necessarily meaningful to humans.   A
+        message  identifier pertains to exactly one instantiation of a
+        particular message; subsequent revisions to the message should
+
+
+     August 13, 1982              - 23 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+        each receive new message identifiers.
+
+     4.6.2.  IN-REPLY-TO
+
+             The contents of this field identify  previous  correspon-
+        dence  which this message answers.  Note that if message iden-
+        tifiers are used in this  field,  they  must  use  the  msg-id
+        specification format.
+
+     4.6.3.  REFERENCES
+
+             The contents of this field identify other  correspondence
+        which  this message references.  Note that if message identif-
+        iers are used, they must use the msg-id specification format.
+
+     4.6.4.  KEYWORDS
+
+             This field contains keywords  or  phrases,  separated  by
+        commas.
+
+     4.7.  OTHER FIELDS
+
+     4.7.1.  SUBJECT
+
+             This is intended to provide a summary,  or  indicate  the
+        nature, of the message.
+
+     4.7.2.  COMMENTS
+
+             Permits adding text comments  onto  the  message  without
+        disturbing the contents of the message's body.
+
+     4.7.3.  ENCRYPTED
+
+             Sometimes,  data  encryption  is  used  to  increase  the
+        privacy  of  message  contents.   If the body of a message has
+        been encrypted, to keep its contents private, the  "Encrypted"
+        field  can be used to note the fact and to indicate the nature
+        of the encryption.  The first <word> parameter  indicates  the
+        software  used  to  encrypt the body, and the second, optional
+        <word> is intended to  aid  the  recipient  in  selecting  the
+        proper  decryption  key.   This  code word may be viewed as an
+        index to a table of keys held by the recipient.
+
+        Note:  Unfortunately, headers must contain envelope,  as  well
+               as  contents,  information.  Consequently, it is neces-
+               sary that they remain unencrypted, so that  mail  tran-
+               sport   services   may   access   them.   Since  names,
+               addresses, and "Subject"  field  contents  may  contain
+
+
+     August 13, 1982              - 24 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+               sensitive  information,  this  requirement limits total
+               message privacy.
+
+             Names of encryption software are registered with the Net-
+        work  Information Center, SRI International, Menlo Park, Cali-
+        fornia.
+
+     4.7.4.  EXTENSION-FIELD
+
+             A limited number of common fields have  been  defined  in
+        this  document.   As  network mail requirements dictate, addi-
+        tional fields may be standardized.   To  provide  user-defined
+        fields  with  a  measure  of  safety,  in name selection, such
+        extension-fields will never have names  that  begin  with  the
+        string "X-".
+
+             Names of Extension-fields are registered with the Network
+        Information Center, SRI International, Menlo Park, California.
+
+     4.7.5.  USER-DEFINED-FIELD
+
+             Individual users of network mail are free to  define  and
+        use  additional  header  fields.   Such fields must have names
+        which are not already used in the current specification or  in
+        any definitions of extension-fields, and the overall syntax of
+        these user-defined-fields must conform to this specification's
+        rules   for   delimiting  and  folding  fields.   Due  to  the
+        extension-field  publishing  process,  the  name  of  a  user-
+        defined-field may be pre-empted
+
+        Note:  The prefatory string "X-" will never  be  used  in  the
+               names  of Extension-fields.  This provides user-defined
+               fields with a protected set of names.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+     August 13, 1982              - 25 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+     5.  DATE AND TIME SPECIFICATION
+
+     5.1.  SYNTAX
+
+     date-time   =  [ day "," ] date time        ; dd mm yy
+                                                 ;  hh:mm:ss zzz
+
+     day         =  "Mon"  / "Tue" /  "Wed"  / "Thu"
+                 /  "Fri"  / "Sat" /  "Sun"
+
+     date        =  1*2DIGIT month 2DIGIT        ; day month year
+                                                 ;  e.g. 20 Jun 82
+
+     month       =  "Jan"  /  "Feb" /  "Mar"  /  "Apr"
+                 /  "May"  /  "Jun" /  "Jul"  /  "Aug"
+                 /  "Sep"  /  "Oct" /  "Nov"  /  "Dec"
+
+     time        =  hour zone                    ; ANSI and Military
+
+     hour        =  2DIGIT ":" 2DIGIT [":" 2DIGIT]
+                                                 ; 00:00:00 - 23:59:59
+
+     zone        =  "UT"  / "GMT"                ; Universal Time
+                                                 ; North American : UT
+                 /  "EST" / "EDT"                ;  Eastern:  - 5/ - 4
+                 /  "CST" / "CDT"                ;  Central:  - 6/ - 5
+                 /  "MST" / "MDT"                ;  Mountain: - 7/ - 6
+                 /  "PST" / "PDT"                ;  Pacific:  - 8/ - 7
+                 /  1ALPHA                       ; Military: Z = UT;
+                                                 ;  A:-1; (J not used)
+                                                 ;  M:-12; N:+1; Y:+12
+                 / ( ("+" / "-") 4DIGIT )        ; Local differential
+                                                 ;  hours+min. (HHMM)
+
+     5.2.  SEMANTICS
+
+          If included, day-of-week must be the day implied by the date
+     specification.
+
+          Time zone may be indicated in several ways.  "UT" is Univer-
+     sal  Time  (formerly called "Greenwich Mean Time"); "GMT" is per-
+     mitted as a reference to Universal Time.  The  military  standard
+     uses  a  single  character for each zone.  "Z" is Universal Time.
+     "A" indicates one hour earlier, and "M" indicates 12  hours  ear-
+     lier;  "N"  is  one  hour  later, and "Y" is 12 hours later.  The
+     letter "J" is not used.  The other remaining two forms are  taken
+     from ANSI standard X3.51-1975.  One allows explicit indication of
+     the amount of offset from UT; the other uses  common  3-character
+     strings for indicating time zones in North America.
+
+
+     August 13, 1982              - 26 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+     6.  ADDRESS SPECIFICATION
+
+     6.1.  SYNTAX
+
+     address     =  mailbox                      ; one addressee
+                 /  group                        ; named list
+
+     group       =  phrase ":" [#mailbox] ";"
+
+     mailbox     =  addr-spec                    ; simple address
+                 /  phrase route-addr            ; name & addr-spec
+
+     route-addr  =  "<" [route] addr-spec ">"
+
+     route       =  1#("@" domain) ":"           ; path-relative
+
+     addr-spec   =  local-part "@" domain        ; global address
+
+     local-part  =  word *("." word)             ; uninterpreted
+                                                 ; case-preserved
+
+     domain      =  sub-domain *("." sub-domain)
+
+     sub-domain  =  domain-ref / domain-literal
+
+     domain-ref  =  atom                         ; symbolic reference
+
+     6.2.  SEMANTICS
+
+          A mailbox receives mail.  It is a  conceptual  entity  which
+     does  not necessarily pertain to file storage.  For example, some
+     sites may choose to print mail on their line printer and  deliver
+     the output to the addressee's desk.
+
+          A mailbox specification comprises a person, system  or  pro-
+     cess name reference, a domain-dependent string, and a name-domain
+     reference.  The name reference is optional and is usually used to
+     indicate  the  human name of a recipient.  The name-domain refer-
+     ence specifies a sequence of sub-domains.   The  domain-dependent
+     string is uninterpreted, except by the final sub-domain; the rest
+     of the mail service merely transmits it as a literal string.
+
+     6.2.1.  DOMAINS
+
+        A name-domain is a set of registered (mail)  names.   A  name-
+        domain  specification  resolves  to  a subordinate name-domain
+        specification  or  to  a  terminal  domain-dependent   string.
+        Hence,  domain  specification  is  extensible,  permitting any
+        number of registration levels.
+
+
+     August 13, 1982              - 27 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+        Name-domains model a global, logical, hierarchical  addressing
+        scheme.   The  model is logical, in that an address specifica-
+        tion is related to name registration and  is  not  necessarily
+        tied  to  transmission  path.   The  model's  hierarchy  is  a
+        directed graph, called an in-tree, such that there is a single
+        path  from  the root of the tree to any node in the hierarchy.
+        If more than one path actually exists, they are considered  to
+        be different addresses.
+
+        The root node is common to all addresses; consequently, it  is
+        not  referenced.   Its  children  constitute "top-level" name-
+        domains.  Usually, a service has access to its own full domain
+        specification and to the names of all top-level name-domains.
+
+        The "top" of the domain addressing hierarchy -- a child of the
+        root  --  is  indicated  by  the right-most field, in a domain
+        specification.  Its child is specified to the left, its  child
+        to the left, and so on.
+
+        Some groups provide formal registration services;  these  con-
+        stitute   name-domains   that  are  independent  logically  of
+        specific machines.  In addition, networks and machines  impli-
+        citly  compose name-domains, since their membership usually is
+        registered in name tables.
+
+        In the case of formal registration, an organization implements
+        a  (distributed)  data base which provides an address-to-route
+        mapping service for addresses of the form:
+
+                         person@registry.organization
+
+        Note that "organization" is a logical  entity,  separate  from
+        any particular communication network.
+
+        A mechanism for accessing "organization" is universally avail-
+        able.   That mechanism, in turn, seeks an instantiation of the
+        registry; its location is not indicated in the address specif-
+        ication.   It  is assumed that the system which operates under
+        the name "organization" knows how to find a subordinate regis-
+        try.  The registry will then use the "person" string to deter-
+        mine where to send the mail specification.
+
+        The latter,  network-oriented  case  permits  simple,  direct,
+        attachment-related address specification, such as:
+
+                              user@host.network
+
+        Once the network is accessed, it is expected  that  a  message
+        will  go  directly  to the host and that the host will resolve
+
+
+     August 13, 1982              - 28 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+        the user name, placing the message in the user's mailbox.
+
+     6.2.2.  ABBREVIATED DOMAIN SPECIFICATION
+
+        Since any number of  levels  is  possible  within  the  domain
+        hierarchy,  specification  of  a  fully  qualified address can
+        become inconvenient.  This standard permits abbreviated domain
+        specification, in a special case:
+
+            For the address of  the  sender,  call  the  left-most
+            sub-domain  Level  N.   In a header address, if all of
+            the sub-domains above (i.e., to the right of) Level  N
+            are  the same as those of the sender, then they do not
+            have to appear in the specification.   Otherwise,  the
+            address must be fully qualified.
+
+            This feature is subject  to  approval  by  local  sub-
+            domains.   Individual  sub-domains  may  require their
+            member systems, which originate mail, to provide  full
+            domain  specification only.  When permitted, abbrevia-
+            tions may be present  only  while  the  message  stays
+            within the sub-domain of the sender.
+
+            Use of this mechanism requires the sender's sub-domain
+            to reserve the names of all top-level domains, so that
+            full specifications can be distinguished from abbrevi-
+            ated specifications.
+
+        For example, if a sender's address is:
+
+                 sender@registry-A.registry-1.organization-X
+
+        and one recipient's address is:
+
+                recipient@registry-B.registry-1.organization-X
+
+        and another's is:
+
+                recipient@registry-C.registry-2.organization-X
+
+        then ".registry-1.organization-X" need not be specified in the
+        the  message,  but  "registry-C.registry-2"  DOES  have  to be
+        specified.  That is, the first two addresses may  be  abbrevi-
+        ated, but the third address must be fully specified.
+
+        When a message crosses a domain boundary, all  addresses  must
+        be  specified  in  the  full format, ending with the top-level
+        name-domain in the right-most field.  It is the responsibility
+        of  mail  forwarding services to ensure that addresses conform
+
+
+     August 13, 1982              - 29 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+        with this requirement.  In the case of abbreviated  addresses,
+        the  relaying  service must make the necessary expansions.  It
+        should be noted that it often is difficult for such a  service
+        to locate all occurrences of address abbreviations.  For exam-
+        ple, it will not be possible to find such abbreviations within
+        the  body  of  the  message.   The "Return-Path" field can aid
+        recipients in recovering from these errors.
+
+        Note:  When passing any portion of an addr-spec onto a process
+               which  does  not interpret data according to this stan-
+               dard (e.g., mail protocol servers).  There must  be  NO
+               LWSP-chars  preceding  or  following the at-sign or any
+               delimiting period ("."), such as  shown  in  the  above
+               examples,   and   only  ONE  SPACE  between  contiguous
+               <word>s.
+
+     6.2.3.  DOMAIN TERMS
+
+        A domain-ref must be THE official name of a registry, network,
+        or  host.   It  is  a  symbolic  reference, within a name sub-
+        domain.  At times, it is necessary to bypass standard  mechan-
+        isms  for  resolving  such  references,  using  more primitive
+        information, such as a network host address  rather  than  its
+        associated host name.
+
+        To permit such references, this standard provides the  domain-
+        literal  construct.   Its contents must conform with the needs
+        of the sub-domain in which it is interpreted.
+
+        Domain-literals which refer to domains within the ARPA  Inter-
+        net  specify  32-bit  Internet addresses, in four 8-bit fields
+        noted in decimal, as described in Request for  Comments  #820,
+        "Assigned Numbers."  For example:
+
+                                 [10.0.3.19]
+
+        Note:  THE USE OF DOMAIN-LITERALS IS STRONGLY DISCOURAGED.  It
+               is  permitted  only  as  a means of bypassing temporary
+               system limitations, such as name tables which  are  not
+               complete.
+
+        The names of "top-level" domains, and  the  names  of  domains
+        under  in  the  ARPA Internet, are registered with the Network
+        Information Center, SRI International, Menlo Park, California.
+
+     6.2.4.  DOMAIN-DEPENDENT LOCAL STRING
+
+        The local-part of an  addr-spec  in  a  mailbox  specification
+        (i.e.,  the  host's  name for the mailbox) is understood to be
+
+
+     August 13, 1982              - 30 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+        whatever the receiving mail protocol server allows.  For exam-
+        ple,  some systems do not understand mailbox references of the
+        form "P. D. Q. Bach", but others do.
+
+        This specification treats periods (".") as lexical separators.
+        Hence,  their  presence  in  local-parts which are not quoted-
+        strings, is detected.   However,  such  occurrences  carry  NO
+        semantics.  That is, if a local-part has periods within it, an
+        address parser will divide the local-part into several tokens,
+        but  the  sequence  of  tokens will be treated as one uninter-
+        preted unit.  The sequence  will  be  re-assembled,  when  the
+        address is passed outside of the system such as to a mail pro-
+        tocol service.
+
+        For example, the address:
+
+                           First.Last@Registry.Org
+
+        is legal and does not require the local-part to be  surrounded
+        with  quotation-marks.   (However,  "First  Last" DOES require
+        quoting.)  The local-part of the address, when passed  outside
+        of  the  mail  system,  within  the  Registry.Org  domain,  is
+        "First.Last", again without quotation marks.
+
+     6.2.5.  BALANCING LOCAL-PART AND DOMAIN
+
+        In some cases, the boundary between local-part and domain  can
+        be  flexible.  The local-part may be a simple string, which is
+        used for the final determination of the  recipient's  mailbox.
+        All  other  levels  of  reference  are, therefore, part of the
+        domain.
+
+        For some systems, in the case of abbreviated reference to  the
+        local  and  subordinate  sub-domains,  it  may  be possible to
+        specify only one reference within the domain  part  and  place
+        the  other,  subordinate  name-domain  references  within  the
+        local-part.  This would appear as:
+
+                        mailbox.sub1.sub2@this-domain
+
+        Such a specification would be acceptable  to  address  parsers
+        which  conform  to  RFC  #733,  but  do not support this newer
+        Internet standard.  While contrary to the intent of this stan-
+        dard, the form is legal.
+
+        Also, some sub-domains have a specification syntax which  does
+        not conform to this standard.  For example:
+
+                      sub-net.mailbox@sub-domain.domain
+
+
+     August 13, 1982              - 31 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+        uses a different parsing  sequence  for  local-part  than  for
+        domain.
+
+        Note:  As a rule,  the  domain  specification  should  contain
+               fields  which  are  encoded  according to the syntax of
+               this standard and which contain  generally-standardized
+               information.   The local-part specification should con-
+               tain only that portion of the  address  which  deviates
+               from the form or intention of the domain field.
+
+     6.2.6.  MULTIPLE MAILBOXES
+
+        An individual may have several mailboxes and wish  to  receive
+        mail  at  whatever  mailbox  is  convenient  for the sender to
+        access.  This standard does not provide a means of  specifying
+        "any member of" a list of mailboxes.
+
+        A set of individuals may wish to receive mail as a single unit
+        (i.e.,  a  distribution  list).  The <group> construct permits
+        specification of such a list.  Recipient mailboxes are  speci-
+        fied  within  the  bracketed  part (":" - ";").  A copy of the
+        transmitted message is to be  sent  to  each  mailbox  listed.
+        This  standard  does  not  permit  recursive  specification of
+        groups within groups.
+
+        While a list must be named, it is not required that  the  con-
+        tents  of  the  list be included.  In this case, the <address>
+        serves only as an indication of group distribution  and  would
+        appear in the form:
+
+                                    name:;
+
+        Some mail  services  may  provide  a  group-list  distribution
+        facility,  accepting  a single mailbox reference, expanding it
+        to the full distribution list, and relaying the  mail  to  the
+        list's  members.   This standard provides no additional syntax
+        for indicating such a  service.   Using  the  <group>  address
+        alternative,  while listing one mailbox in it, can mean either
+        that the mailbox reference will be expanded to a list or  that
+        there is a group with one member.
+
+     6.2.7.  EXPLICIT PATH SPECIFICATION
+
+        At times, a  message  originator  may  wish  to  indicate  the
+        transmission  path  that  a  message  should  follow.  This is
+        called source routing.  The normal addressing scheme, used  in
+        an  addr-spec,  is  carefully separated from such information;
+        the <route> portion of a route-addr is provided for such occa-
+        sions.  It specifies the sequence of hosts and/or transmission
+
+
+     August 13, 1982              - 32 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+        services that are  to  be  traversed.   Both  domain-refs  and
+        domain-literals may be used.
+
+        Note:  The use of source routing is discouraged.   Unless  the
+               sender has special need of path restriction, the choice
+               of transmission route should be left to the mail  tran-
+               sport service.
+
+     6.3.  RESERVED ADDRESS
+
+          It often is necessary to send mail to a site, without  know-
+     ing  any  of its valid addresses.  For example, there may be mail
+     system dysfunctions, or a user may wish to find  out  a  person's
+     correct address, at that site.
+
+          This standard specifies a single, reserved  mailbox  address
+     (local-part)  which  is  to  be valid at each site.  Mail sent to
+     that address is to be routed to  a  person  responsible  for  the
+     site's mail system or to a person with responsibility for general
+     site operation.  The name of the reserved local-part address is:
+
+                                Postmaster
+
+     so that "Postmaster@domain" is required to be valid.
+
+     Note:  This reserved local-part must be  matched  without  sensi-
+            tivity to alphabetic case, so that "POSTMASTER", "postmas-
+            ter", and even "poStmASteR" is to be accepted.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+     August 13, 1982              - 33 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+     7.  BIBLIOGRAPHY
+
+
+     ANSI.  "USA Standard Code  for  Information  Interchange,"  X3.4.
+        American  National Standards Institute: New York (1968).  Also
+        in:  Feinler, E.  and J. Postel, eds., "ARPANET Protocol Hand-
+        book", NIC 7104.
+
+     ANSI.  "Representations of Universal Time, Local  Time  Differen-
+        tials,  and United States Time Zone References for Information
+        Interchange," X3.51-1975.  American National Standards  Insti-
+        tute:  New York (1975).
+
+     Bemer, R.W., "Time and the Computer."  In:  Interface  Age  (Feb.
+        1979).
+
+     Bennett, C.J.  "JNT Mail Protocol".  Joint Network Team,  Ruther-
+        ford and Appleton Laboratory:  Didcot, England.
+
+     Bhushan, A.K., Pogran, K.T., Tomlinson,  R.S.,  and  White,  J.E.
+        "Standardizing  Network  Mail  Headers,"   ARPANET Request for
+        Comments No. 561, Network Information Center  No.  18516;  SRI
+        International:  Menlo Park (September 1973).
+
+     Birrell, A.D., Levin, R.,  Needham,  R.M.,  and  Schroeder,  M.D.
+        "Grapevine:  An Exercise in Distributed Computing," Communica-
+        tions of the ACM 25, 4 (April 1982), 260-274.
+
+     Crocker,  D.H.,  Vittal,  J.J.,  Pogran,  K.T.,  Henderson,  D.A.
+        "Standard  for  the  Format  of  ARPA  Network  Text Message,"
+        ARPANET Request for  Comments  No.  733,  Network  Information
+        Center  No.  41952.   SRI International:  Menlo Park (November
+        1977).
+
+     Feinler, E.J. and Postel, J.B.  ARPANET Protocol  Handbook,  Net-
+        work  Information  Center  No.  7104   (NTIS AD A003890).  SRI
+        International:  Menlo Park (April 1976).
+
+     Harary, F.   "Graph  Theory".   Addison-Wesley:   Reading,  Mass.
+        (1969).
+
+     Levin, R. and Schroeder, M.  "Transport  of  Electronic  Messages
+        through  a  Network,"   TeleInformatics  79, pp. 29-33.  North
+        Holland (1979).  Also  as  Xerox  Palo  Alto  Research  Center
+        Technical Report CSL-79-4.
+
+     Myer, T.H. and Henderson, D.A.  "Message Transmission  Protocol,"
+        ARPANET  Request  for  Comments,  No. 680, Network Information
+        Center No. 32116.  SRI International:  Menlo Park (1975).
+
+
+     August 13, 1982              - 34 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+     NBS.  "Specification of Message Format for Computer Based Message
+        Systems, Recommended Federal Information Processing Standard."
+        National  Bureau   of   Standards:    Gaithersburg,   Maryland
+        (October 1981).
+
+     NIC.  Internet Protocol Transition Workbook.  Network Information
+        Center,   SRI-International,  Menlo  Park,  California  (March
+        1982).
+
+     Oppen, D.C. and Dalal, Y.K.  "The Clearinghouse:  A Decentralized
+        Agent  for  Locating  Named  Objects in a Distributed Environ-
+        ment," OPD-T8103.  Xerox Office Products Division:  Palo Alto,
+        CA. (October 1981).
+
+     Postel, J.B.  "Assigned Numbers,"  ARPANET Request for  Comments,
+        No. 820.  SRI International:  Menlo Park (August 1982).
+
+     Postel, J.B.  "Simple Mail Transfer  Protocol,"  ARPANET  Request
+        for Comments, No. 821.  SRI International:  Menlo Park (August
+        1982).
+
+     Shoch, J.F.  "Internetwork naming, addressing  and  routing,"  in
+        Proc. 17th IEEE Computer Society International Conference, pp.
+        72-79, Sept. 1978, IEEE Cat. No. 78 CH 1388-8C.
+
+     Su, Z. and Postel, J.  "The Domain Naming Convention for Internet
+        User  Applications,"  ARPANET  Request  for Comments, No. 819.
+        SRI International:  Menlo Park (August 1982).
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+     August 13, 1982              - 35 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+                                 APPENDIX
+
+
+     A.  EXAMPLES
+
+     A.1.  ADDRESSES
+
+     A.1.1.  Alfred Neuman <Neuman@BBN-TENEXA>
+
+     A.1.2.  Neuman@BBN-TENEXA
+
+             These two "Alfred Neuman" examples have identical  seman-
+        tics, as far as the operation of the local host's mail sending
+        (distribution) program (also sometimes  called  its  "mailer")
+        and  the remote host's mail protocol server are concerned.  In
+        the first example, the  "Alfred  Neuman"  is  ignored  by  the
+        mailer,  as "Neuman@BBN-TENEXA" completely specifies the reci-
+        pient.  The second example contains  no  superfluous  informa-
+        tion,  and,  again,  "Neuman@BBN-TENEXA" is the intended reci-
+        pient.
+
+        Note:  When the message crosses name-domain  boundaries,  then
+               these specifications must be changed, so as to indicate
+               the remainder of the hierarchy, starting with  the  top
+               level.
+
+     A.1.3.  "George, Ted" <Shared@Group.Arpanet>
+
+             This form might be used to indicate that a single mailbox
+        is  shared  by several users.  The quoted string is ignored by
+        the originating host's mailer, because  "Shared@Group.Arpanet"
+        completely specifies the destination mailbox.
+
+     A.1.4.  Wilt . (the  Stilt) Chamberlain@NBA.US
+
+             The "(the  Stilt)" is a comment, which is NOT included in
+        the  destination  mailbox  address  handed  to the originating
+        system's mailer.  The local-part of the address is the  string
+        "Wilt.Chamberlain", with NO space between the first and second
+        words.
+
+     A.1.5.  Address Lists
+
+     Gourmets:  Pompous Person <WhoZiWhatZit@Cordon-Bleu>,
+                Childs@WGBH.Boston, Galloping Gourmet@
+                ANT.Down-Under (Australian National Television),
+                Cheapie@Discount-Liquors;,
+       Cruisers:  Port@Portugal, Jones@SEA;,
+         Another@Somewhere.SomeOrg
+
+
+     August 13, 1982              - 36 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+        This group list example points out the use of comments and the
+        mixing of addresses and groups.
+
+     A.2.  ORIGINATOR ITEMS
+
+     A.2.1.  Author-sent
+
+             George Jones logs into his host  as  "Jones".   He  sends
+        mail himself.
+
+            From:  Jones@Group.Org
+
+        or
+
+            From:  George Jones <Jones@Group.Org>
+
+     A.2.2.  Secretary-sent
+
+             George Jones logs in as Jones on his  host.   His  secre-
+        tary,  who logs in as Secy sends mail for him.  Replies to the
+        mail should go to George.
+
+            From:    George Jones <Jones@Group>
+            Sender:  Secy@Other-Group
+
+     A.2.3.  Secretary-sent, for user of shared directory
+
+             George Jones' secretary sends mail  for  George.  Replies
+        should go to George.
+
+            From:     George Jones<Shared@Group.Org>
+            Sender:   Secy@Other-Group
+
+        Note that there need not be a space between  "Jones"  and  the
+        "<",  but  adding a space enhances readability (as is the case
+        in other examples.
+
+     A.2.4.  Committee activity, with one author
+
+             George is a member of a committee.  He wishes to have any
+        replies to his message go to all committee members.
+
+            From:     George Jones <Jones@Host.Net>
+            Sender:   Jones@Host
+            Reply-To: The Committee: Jones@Host.Net,
+                                     Smith@Other.Org,
+                                     Doe@Somewhere-Else;
+
+        Note  that  if  George  had  not  included  himself   in   the
+
+
+     August 13, 1982              - 37 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+        enumeration  of  The  Committee,  he  would not have gotten an
+        implicit reply; the presence of the  "Reply-to"  field  SUPER-
+        SEDES the sending of a reply to the person named in the "From"
+        field.
+
+     A.2.5.  Secretary acting as full agent of author
+
+             George Jones asks his secretary  (Secy@Host)  to  send  a
+        message for him in his capacity as Group.  He wants his secre-
+        tary to handle all replies.
+
+            From:     George Jones <Group@Host>
+            Sender:   Secy@Host
+            Reply-To: Secy@Host
+
+     A.2.6.  Agent for user without online mailbox
+
+             A friend  of  George's,  Sarah,  is  visiting.   George's
+        secretary  sends  some  mail to a friend of Sarah in computer-
+        land.  Replies should go to George, whose mailbox is Jones  at
+        Registry.
+
+            From:     Sarah Friendly <Secy@Registry>
+            Sender:   Secy-Name <Secy@Registry>
+            Reply-To: Jones@Registry.
+
+     A.2.7.  Agent for member of a committee
+
+             George's secretary sends out a message which was authored
+        jointly by all the members of a committee.  Note that the name
+        of the committee cannot be specified, since <group> names  are
+        not permitted in the From field.
+
+            From:   Jones@Host,
+                    Smith@Other-Host,
+                    Doe@Somewhere-Else
+            Sender: Secy@SHost
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+     August 13, 1982              - 38 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+     A.3.  COMPLETE HEADERS
+
+     A.3.1.  Minimum required
+
+     Date:     26 Aug 76 1429 EDT        Date:     26 Aug 76 1429 EDT
+     From:     Jones@Registry.Org   or   From:     Jones@Registry.Org
+     Bcc:                                To:       Smith@Registry.Org
+
+        Note that the "Bcc" field may be empty, while the  "To"  field
+        is required to have at least one address.
+
+     A.3.2.  Using some of the additional fields
+
+     Date:     26 Aug 76 1430 EDT
+     From:     George Jones<Group@Host>
+     Sender:   Secy@SHOST
+     To:       "Al Neuman"@Mad-Host,
+               Sam.Irving@Other-Host
+     Message-ID:  <some.string@SHOST>
+
+     A.3.3.  About as complex as you're going to get
+
+     Date     :  27 Aug 76 0932 PDT
+     From     :  Ken Davis <KDavis@This-Host.This-net>
+     Subject  :  Re: The Syntax in the RFC
+     Sender   :  KSecy@Other-Host
+     Reply-To :  Sam.Irving@Reg.Organization
+     To       :  George Jones <Group@Some-Reg.An-Org>,
+                 Al.Neuman@MAD.Publisher
+     cc       :  Important folk:
+                   Tom Softwood <Balsa@Tree.Root>,
+                   "Sam Irving"@Other-Host;,
+                 Standard Distribution:
+                   /main/davis/people/standard@Other-Host,
+                   "<Jones>standard.dist.3"@Tops-20-Host>;
+     Comment  :  Sam is away on business. He asked me to handle
+                 his mail for him.  He'll be able to provide  a
+                 more  accurate  explanation  when  he  returns
+                 next week.
+     In-Reply-To: <some.string@DBM.Group>, George's message
+     X-Special-action:  This is a sample of user-defined field-
+                 names.  There could also be a field-name
+                 "Special-action", but its name might later be
+                 preempted
+     Message-ID: <4231.629.XYzi-What@Other-Host>
+
+
+
+
+
+
+     August 13, 1982              - 39 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+     B.  SIMPLE FIELD PARSING
+
+          Some mail-reading software systems may wish to perform  only
+     minimal  processing,  ignoring  the internal syntax of structured
+     field-bodies and treating them the  same  as  unstructured-field-
+     bodies.  Such software will need only to distinguish:
+
+         o   Header fields from the message body,
+
+         o   Beginnings of fields from lines which continue fields,
+
+         o   Field-names from field-contents.
+
+          The abbreviated set of syntactic rules  which  follows  will
+     suffice  for  this  purpose.  It describes a limited view of mes-
+     sages and is a subset of the syntactic rules provided in the main
+     part of this specification.  One small exception is that the con-
+     tents of field-bodies consist only of text:
+
+     B.1.  SYNTAX
+
+
+     message         =   *field *(CRLF *text)
+
+     field           =    field-name ":" [field-body] CRLF
+
+     field-name      =  1*<any CHAR, excluding CTLs, SPACE, and ":">
+
+     field-body      =   *text [CRLF LWSP-char field-body]
+
+
+     B.2.  SEMANTICS
+
+          Headers occur before the message body and are terminated  by
+     a null line (i.e., two contiguous CRLFs).
+
+          A line which continues a header field begins with a SPACE or
+     HTAB  character,  while  a  line  beginning a field starts with a
+     printable character which is not a colon.
+
+          A field-name consists of one or  more  printable  characters
+     (excluding  colon,  space, and control-characters).  A field-name
+     MUST be contained on one line.  Upper and lower case are not dis-
+     tinguished when comparing field-names.
+
+
+
+
+
+
+
+     August 13, 1982              - 40 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+     C.  DIFFERENCES FROM RFC #733
+
+          The following summarizes the differences between this  stan-
+     dard  and the one specified in Arpanet Request for Comments #733,
+     "Standard for the Format of ARPA  Network  Text  Messages".   The
+     differences  are  listed  in the order of their occurrence in the
+     current specification.
+
+     C.1.  FIELD DEFINITIONS
+
+     C.1.1.  FIELD NAMES
+
+        These now must be a sequence of  printable  characters.   They
+        may not contain any LWSP-chars.
+
+     C.2.  LEXICAL TOKENS
+
+     C.2.1.  SPECIALS
+
+        The characters period ("."), left-square  bracket  ("["),  and
+        right-square  bracket ("]") have been added.  For presentation
+        purposes, and when passing a specification to  a  system  that
+        does  not conform to this standard, periods are to be contigu-
+        ous with their surrounding lexical tokens.   No  linear-white-
+        space  is  permitted  between them.  The presence of one LWSP-
+        char between other tokens is still directed.
+
+     C.2.2.  ATOM
+
+        Atoms may not contain SPACE.
+
+     C.2.3.  SPECIAL TEXT
+
+        ctext and qtext have had backslash ("\") added to the list  of
+        prohibited characters.
+
+     C.2.4.  DOMAINS
+
+        The lexical tokens  <domain-literal>  and  <dtext>  have  been
+        added.
+
+     C.3.  MESSAGE SPECIFICATION
+
+     C.3.1.  TRACE
+
+        The "Return-path:" and "Received:" fields have been specified.
+
+
+
+
+
+     August 13, 1982              - 41 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+     C.3.2.  FROM
+
+        The "From" field must contain machine-usable addresses  (addr-
+        spec).   Multiple  addresses may be specified, but named-lists
+        (groups) may not.
+
+     C.3.3.  RESENT
+
+        The meta-construct of prefacing field names  with  the  string
+        "Resent-"  has been added, to indicate that a message has been
+        forwarded by an intermediate recipient.
+
+     C.3.4.  DESTINATION
+
+        A message must contain at least one destination address field.
+        "To" and "CC" are required to contain at least one address.
+
+     C.3.5.  IN-REPLY-TO
+
+        The field-body is no longer a comma-separated list, although a
+        sequence is still permitted.
+
+     C.3.6.  REFERENCE
+
+        The field-body is no longer a comma-separated list, although a
+        sequence is still permitted.
+
+     C.3.7.  ENCRYPTED
+
+        A field has been specified that permits  senders  to  indicate
+        that the body of a message has been encrypted.
+
+     C.3.8.  EXTENSION-FIELD
+
+        Extension fields are prohibited from beginning with the  char-
+        acters "X-".
+
+     C.4.  DATE AND TIME SPECIFICATION
+
+     C.4.1.  SIMPLIFICATION
+
+        Fewer optional forms are permitted  and  the  list  of  three-
+        letter time zones has been shortened.
+
+     C.5.  ADDRESS SPECIFICATION
+
+
+
+
+
+
+     August 13, 1982              - 42 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+     C.5.1.  ADDRESS
+
+        The use of quoted-string, and the ":"-atom-":" construct, have
+        been  removed.   An  address  now  is  either a single mailbox
+        reference or is a named list of addresses.  The  latter  indi-
+        cates a group distribution.
+
+     C.5.2.  GROUPS
+
+        Group lists are now required to to have a name.   Group  lists
+        may not be nested.
+
+     C.5.3.  MAILBOX
+
+        A mailbox specification  may  indicate  a  person's  name,  as
+        before.   Such  a  named  list  no longer may specify multiple
+        mailboxes and may not be nested.
+
+     C.5.4.  ROUTE ADDRESSING
+
+        Addresses now are taken to be absolute, global specifications,
+        independent  of transmission paths.  The <route> construct has
+        been provided, to permit explicit specification  of  transmis-
+        sion  path.   RFC  #733's  use  of multiple at-signs ("@") was
+        intended as a general syntax  for  indicating  routing  and/or
+        hierarchical addressing.  The current standard separates these
+        specifications and only one at-sign is permitted.
+
+     C.5.5.  AT-SIGN
+
+        The string " at " no longer is used as an  address  delimiter.
+        Only at-sign ("@") serves the function.
+
+     C.5.6.  DOMAINS
+
+        Hierarchical, logical name-domains have been added.
+
+     C.6.  RESERVED ADDRESS
+
+     The local-part "Postmaster" has been reserved, so that users  can
+     be guaranteed at least one valid address at a site.
+
+
+
+
+
+
+
+
+
+
+     August 13, 1982              - 43 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+     D.  ALPHABETICAL LISTING OF SYNTAX RULES
+
+     address     =  mailbox                      ; one addressee
+                 /  group                        ; named list
+     addr-spec   =  local-part "@" domain        ; global address
+     ALPHA       =  <any ASCII alphabetic character>
+                                                 ; (101-132, 65.- 90.)
+                                                 ; (141-172, 97.-122.)
+     atom        =  1*<any CHAR except specials, SPACE and CTLs>
+     authentic   =   "From"       ":"   mailbox  ; Single author
+                 / ( "Sender"     ":"   mailbox  ; Actual submittor
+                     "From"       ":" 1#mailbox) ; Multiple authors
+                                                 ;  or not sender
+     CHAR        =  <any ASCII character>        ; (  0-177,  0.-127.)
+     comment     =  "(" *(ctext / quoted-pair / comment) ")"
+     CR          =  <ASCII CR, carriage return>  ; (     15,      13.)
+     CRLF        =  CR LF
+     ctext       =  <any CHAR excluding "(",     ; => may be folded
+                     ")", "\" & CR, & including
+                     linear-white-space>
+     CTL         =  <any ASCII control           ; (  0- 37,  0.- 31.)
+                     character and DEL>          ; (    177,     127.)
+     date        =  1*2DIGIT month 2DIGIT        ; day month year
+                                                 ;  e.g. 20 Jun 82
+     dates       =   orig-date                   ; Original
+                   [ resent-date ]               ; Forwarded
+     date-time   =  [ day "," ] date time        ; dd mm yy
+                                                 ;  hh:mm:ss zzz
+     day         =  "Mon"  / "Tue" /  "Wed"  / "Thu"
+                 /  "Fri"  / "Sat" /  "Sun"
+     delimiters  =  specials / linear-white-space / comment
+     destination =  "To"          ":" 1#address  ; Primary
+                 /  "Resent-To"   ":" 1#address
+                 /  "cc"          ":" 1#address  ; Secondary
+                 /  "Resent-cc"   ":" 1#address
+                 /  "bcc"         ":"  #address  ; Blind carbon
+                 /  "Resent-bcc"  ":"  #address
+     DIGIT       =  <any ASCII decimal digit>    ; ( 60- 71, 48.- 57.)
+     domain      =  sub-domain *("." sub-domain)
+     domain-literal =  "[" *(dtext / quoted-pair) "]"
+     domain-ref  =  atom                         ; symbolic reference
+     dtext       =  <any CHAR excluding "[",     ; => may be folded
+                     "]", "\" & CR, & including
+                     linear-white-space>
+     extension-field =
+                   <Any field which is defined in a document
+                    published as a formal extension to this
+                    specification; none will have names beginning
+                    with the string "X-">
+
+
+     August 13, 1982              - 44 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+     field       =  field-name ":" [ field-body ] CRLF
+     fields      =    dates                      ; Creation time,
+                      source                     ;  author id & one
+                    1*destination                ;  address required
+                     *optional-field             ;  others optional
+     field-body  =  field-body-contents
+                    [CRLF LWSP-char field-body]
+     field-body-contents =
+                   <the ASCII characters making up the field-body, as
+                    defined in the following sections, and consisting
+                    of combinations of atom, quoted-string, and
+                    specials tokens, or else consisting of texts>
+     field-name  =  1*<any CHAR, excluding CTLs, SPACE, and ":">
+     group       =  phrase ":" [#mailbox] ";"
+     hour        =  2DIGIT ":" 2DIGIT [":" 2DIGIT]
+                                                 ; 00:00:00 - 23:59:59
+     HTAB        =  <ASCII HT, horizontal-tab>   ; (     11,       9.)
+     LF          =  <ASCII LF, linefeed>         ; (     12,      10.)
+     linear-white-space =  1*([CRLF] LWSP-char)  ; semantics = SPACE
+                                                 ; CRLF => folding
+     local-part  =  word *("." word)             ; uninterpreted
+                                                 ; case-preserved
+     LWSP-char   =  SPACE / HTAB                 ; semantics = SPACE
+     mailbox     =  addr-spec                    ; simple address
+                 /  phrase route-addr            ; name & addr-spec
+     message     =  fields *( CRLF *text )       ; Everything after
+                                                 ;  first null line
+                                                 ;  is message body
+     month       =  "Jan"  /  "Feb" /  "Mar"  /  "Apr"
+                 /  "May"  /  "Jun" /  "Jul"  /  "Aug"
+                 /  "Sep"  /  "Oct" /  "Nov"  /  "Dec"
+     msg-id      =  "<" addr-spec ">"            ; Unique message id
+     optional-field =
+                 /  "Message-ID"        ":"   msg-id
+                 /  "Resent-Message-ID" ":"   msg-id
+                 /  "In-Reply-To"       ":"  *(phrase / msg-id)
+                 /  "References"        ":"  *(phrase / msg-id)
+                 /  "Keywords"          ":"  #phrase
+                 /  "Subject"           ":"  *text
+                 /  "Comments"          ":"  *text
+                 /  "Encrypted"         ":" 1#2word
+                 /  extension-field              ; To be defined
+                 /  user-defined-field           ; May be pre-empted
+     orig-date   =  "Date"        ":"   date-time
+     originator  =   authentic                   ; authenticated addr
+                   [ "Reply-To"   ":" 1#address] )
+     phrase      =  1*word                       ; Sequence of words
+
+
+
+
+     August 13, 1982              - 45 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+     qtext       =  <any CHAR excepting <">,     ; => may be folded
+                     "\" & CR, and including
+                     linear-white-space>
+     quoted-pair =  "\" CHAR                     ; may quote any char
+     quoted-string = <"> *(qtext/quoted-pair) <">; Regular qtext or
+                                                 ;   quoted chars.
+     received    =  "Received"    ":"            ; one per relay
+                       ["from" domain]           ; sending host
+                       ["by"   domain]           ; receiving host
+                       ["via"  atom]             ; physical path
+                      *("with" atom)             ; link/mail protocol
+                       ["id"   msg-id]           ; receiver msg id
+                       ["for"  addr-spec]        ; initial form
+                        ";"    date-time         ; time received
+
+     resent      =   resent-authentic
+                   [ "Resent-Reply-To"  ":" 1#address] )
+     resent-authentic =
+                 =   "Resent-From"      ":"   mailbox
+                 / ( "Resent-Sender"    ":"   mailbox
+                     "Resent-From"      ":" 1#mailbox  )
+     resent-date =  "Resent-Date" ":"   date-time
+     return      =  "Return-path" ":" route-addr ; return address
+     route       =  1#("@" domain) ":"           ; path-relative
+     route-addr  =  "<" [route] addr-spec ">"
+     source      = [  trace ]                    ; net traversals
+                      originator                 ; original mail
+                   [  resent ]                   ; forwarded
+     SPACE       =  <ASCII SP, space>            ; (     40,      32.)
+     specials    =  "(" / ")" / "<" / ">" / "@"  ; Must be in quoted-
+                 /  "," / ";" / ":" / "\" / <">  ;  string, to use
+                 /  "." / "[" / "]"              ;  within a word.
+     sub-domain  =  domain-ref / domain-literal
+     text        =  <any CHAR, including bare    ; => atoms, specials,
+                     CR & bare LF, but NOT       ;  comments and
+                     including CRLF>             ;  quoted-strings are
+                                                 ;  NOT recognized.
+     time        =  hour zone                    ; ANSI and Military
+     trace       =    return                     ; path to sender
+                    1*received                   ; receipt tags
+     user-defined-field =
+                   <Any field which has not been defined
+                    in this specification or published as an
+                    extension to this specification; names for
+                    such fields must be unique and may be
+                    pre-empted by published extensions>
+     word        =  atom / quoted-string
+
+
+
+
+     August 13, 1982              - 46 -                      RFC #822
+
+
+ 
+     Standard for ARPA Internet Text Messages
+
+
+     zone        =  "UT"  / "GMT"                ; Universal Time
+                                                 ; North American : UT
+                 /  "EST" / "EDT"                ;  Eastern:  - 5/ - 4
+                 /  "CST" / "CDT"                ;  Central:  - 6/ - 5
+                 /  "MST" / "MDT"                ;  Mountain: - 7/ - 6
+                 /  "PST" / "PDT"                ;  Pacific:  - 8/ - 7
+                 /  1ALPHA                       ; Military: Z = UT;
+     <">         =  <ASCII quote mark>           ; (     42,      34.)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+     August 13, 1982              - 47 -                      RFC #822
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc1341.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc1341.txt
new file mode 100644
index 000000000..1be6f7d6c
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc1341.txt
@@ -0,0 +1,5265 @@
+
+
+
+
+
+
+            Network Working Group               N. Borenstein, Bellcore
+            Request for Comments: 1341               N. Freed, Innosoft
+                                                              June 1992
+
+
+
+                   MIME  (Multipurpose Internet Mail Extensions):
+
+
+                      Mechanisms for Specifying and Describing
+                       the Format of Internet Message Bodies
+
+
+          Status of this Memo
+
+            This RFC specifies an IAB standards track protocol  for  the
+            Internet  community, and requests discussion and suggestions
+            for improvements.  Please refer to the  current  edition  of
+            the    "IAB    Official    Protocol   Standards"   for   the
+            standardization  state  and   status   of   this   protocol.
+            Distribution of this memo is unlimited.
+
+          Abstract
+
+            RFC 822 defines  a  message  representation  protocol  which
+            specifies  considerable  detail  about  message headers, but
+            which leaves the message content, or message body,  as  flat
+            ASCII  text.   This document redefines the format of message
+            bodies to allow multi-part textual and  non-textual  message
+            bodies  to  be  represented  and  exchanged  without loss of
+            information.   This is based on earlier work  documented  in
+            RFC  934  and  RFC  1049, but extends and revises that work.
+            Because RFC 822 said so little about  message  bodies,  this
+            document  is  largely  orthogonal to (rather than a revision
+            of) RFC 822.
+
+            In  particular,  this  document  is  designed   to   provide
+            facilities  to include multiple objects in a single message,
+            to represent body text in  character  sets  other  than  US-
+            ASCII,  to  represent formatted multi-font text messages, to
+            represent non-textual material  such  as  images  and  audio
+            fragments,  and  generally  to  facilitate  later extensions
+            defining new types of Internet mail for use  by  cooperating
+            mail agents.
+
+            This document does NOT extend Internet mail header fields to
+            permit  anything  other  than  US-ASCII  text  data.   It is
+            recognized that such extensions are necessary, and they  are
+            the subject of a companion document [RFC -1342].
+
+            A table of contents appears at the end of this document.
+
+
+
+
+
+
+            Borenstein & Freed                                  [Page i]
+
+
+
+
+
+
+
+            1    Introduction
+
+            Since its publication in 1982, RFC 822 [RFC-822] has defined
+            the   standard  format  of  textual  mail  messages  on  the
+            Internet.  Its success has been such that the RFC 822 format
+            has  been  adopted,  wholly  or  partially,  well beyond the
+            confines of the Internet and  the  Internet  SMTP  transport
+            defined  by RFC 821 [RFC-821].  As the format has seen wider
+            use,  a  number  of  limitations  have  proven  increasingly
+            restrictive for the user community.
+
+            RFC 822 was intended to specify a format for text  messages.
+            As such, non-text messages, such as multimedia messages that
+            might include audio or images,  are  simply  not  mentioned.
+            Even in the case of text, however, RFC 822 is inadequate for
+            the needs of mail users whose languages require the  use  of
+            character  sets  richer  than US ASCII [US-ASCII]. Since RFC
+            822 does not specify mechanisms for mail  containing  audio,
+            video,  Asian  language  text, or even text in most European
+            languages, additional specifications are needed
+
+            One of the notable limitations of  RFC  821/822  based  mail
+            systems  is  the  fact  that  they  limit  the  contents  of
+            electronic  mail  messages  to  relatively  short  lines  of
+            seven-bit  ASCII.   This  forces  users  to convert any non-
+            textual data that they may wish to send into seven-bit bytes
+            representable  as printable ASCII characters before invoking
+            a local mail UA (User Agent,  a  program  with  which  human
+            users  send  and  receive  mail). Examples of such encodings
+            currently used in the  Internet  include  pure  hexadecimal,
+            uuencode,  the  3-in-4 base 64 scheme specified in RFC 1113,
+            the Andrew Toolkit Representation [ATK], and many others.
+
+            The limitations of RFC 822 mail become even more apparent as
+            gateways  are  designed  to  allow  for the exchange of mail
+            messages between RFC 822 hosts and X.400 hosts. X.400 [X400]
+            specifies  mechanisms  for the inclusion of non-textual body
+            parts  within  electronic  mail   messages.    The   current
+            standards  for  the  mapping  of  X.400  messages to RFC 822
+            messages specify that either X.400  non-textual  body  parts
+            should  be converted to (not encoded in) an ASCII format, or
+            that they should be discarded, notifying the  RFC  822  user
+            that  discarding has occurred.  This is clearly undesirable,
+            as information that a user may  wish  to  receive  is  lost.
+            Even  though  a  user's  UA  may  not have the capability of
+            dealing with the non-textual body part, the user might  have
+            some  mechanism  external  to the UA that can extract useful
+            information from the body part.  Moreover, it does not allow
+            for  the  fact  that the message may eventually be gatewayed
+            back into an X.400 message handling system (i.e., the  X.400
+            message  is  "tunneled"  through  Internet  mail), where the
+            non-textual  information  would  definitely  become   useful
+            again.
+
+
+
+
+            Borenstein & Freed                                  [Page 1]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            This document describes several mechanisms that  combine  to
+            solve most of these problems without introducing any serious
+            incompatibilities with the existing world of RFC  822  mail.
+            In particular, it describes:
+
+            1.  A MIME-Version header field, which uses a version number
+                 to  declare  a  message  to  be  conformant  with  this
+                 specification and  allows  mail  processing  agents  to
+                 distinguish  between  such messages and those generated
+                 by older or non-conformant software, which is  presumed
+                 to lack such a field.
+
+            2.  A Content-Type header field, generalized from  RFC  1049
+                 [RFC-1049],  which  can be used to specify the type and
+                 subtype of data in the body of a message and  to  fully
+                 specify  the  native  representation (encoding) of such
+                 data.
+
+                 2.a.  A "text" Content-Type value, which can be used to
+                      represent  textual  information  in  a  number  of
+                      character  sets  and  formatted  text  description
+                      languages in a standardized manner.
+
+                 2.b.  A "multipart" Content-Type value,  which  can  be
+                      used  to  combine  several body parts, possibly of
+                      differing types of data, into a single message.
+
+                 2.c.  An "application" Content-Type value, which can be
+                      used  to transmit application data or binary data,
+                      and hence,  among  other  uses,  to  implement  an
+                      electronic mail file transfer service.
+
+                 2.d.  A "message" Content-Type value, for encapsulating
+                      a mail message.
+
+                 2.e  An "image"  Content-Type value,  for  transmitting
+                      still image (picture) data.
+
+                 2.f.  An "audio"  Content-Type value, for  transmitting
+                      audio or voice data.
+
+                 2.g.  A "video"  Content-Type value,  for  transmitting
+                      video or moving image data, possibly with audio as
+                      part of the composite video data format.
+
+            3.  A Content-Transfer-Encoding header field, which  can  be
+                 used  to specify an auxiliary encoding that was applied
+                 to the data in order to allow it to pass  through  mail
+                 transport  mechanisms  which may have data or character
+                 set limitations.
+
+            4.  Two optional header fields that can be used  to  further
+                 describe the data in a message body, the Content-ID and
+                 Content-Description header fields.
+
+
+
+            Borenstein & Freed                                  [Page 2]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            MIME has been carefully designed as an extensible mechanism,
+            and  it  is  expected  that  the set of content-type/subtype
+            pairs   and   their   associated   parameters   will    grow
+            significantly with time.  Several other MIME fields, notably
+            including character set names, are likely to have new values
+            defined  over time.  In order to ensure that the set of such
+            values is  developed  in  an  orderly,  well-specified,  and
+            public  manner,  MIME  defines  a registration process which
+            uses the Internet Assigned Numbers  Authority  (IANA)  as  a
+            central  registry  for  such  values.   Appendix  F provides
+            details about how IANA registration is accomplished.
+
+            Finally, to specify and promote interoperability, Appendix A
+            of  this  document  provides a basic applicability statement
+            for a subset of the above mechanisms that defines a  minimal
+            level of "conformance" with this document.
+
+            HISTORICAL NOTE:  Several of  the  mechanisms  described  in
+            this  document  may seem somewhat strange or even baroque at
+            first reading.  It is important to note  that  compatibility
+            with  existing  standards  AND  robustness  across  existing
+            practice were two of the highest priorities of  the  working
+            group   that   developed   this  document.   In  particular,
+            compatibility was always favored over elegance.
+
+            2    Notations, Conventions, and Generic BNF Grammar
+
+            This document is being published in  two  versions,  one  as
+            plain  ASCII  text  and  one  as  PostScript.  The latter is
+            recommended, though the textual contents are  identical.  An
+            Andrew-format  copy  of this document is also available from
+            the first author (Borenstein).
+
+            Although the mechanisms specified in this document  are  all
+            described  in prose, most are also described formally in the
+            modified BNF notation of RFC 822.  Implementors will need to
+            be  familiar  with this notation in order to understand this
+            specification, and are referred to RFC 822  for  a  complete
+            explanation of the modified BNF notation.
+
+            Some of the modified BNF in this document makes reference to
+            syntactic  entities  that  are defined in RFC 822 and not in
+            this document.  A complete formal grammar, then, is obtained
+            by combining the collected grammar appendix of this document
+            with that of RFC 822.
+
+            The term CRLF, in this document, refers to the  sequence  of
+            the  two  ASCII  characters CR (13) and LF (10) which, taken
+            together, in this order, denote a  line  break  in  RFC  822
+            mail.
+
+            The term "character  set",  wherever  it  is  used  in  this
+            document,  refers  to a coded character set, in the sense of
+            ISO character set standardization  work,  and  must  not  be
+
+
+
+            Borenstein & Freed                                  [Page 3]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            misinterpreted as meaning "a set of characters."
+
+            The term "message", when not further qualified, means either
+            the (complete or "top-level") message being transferred on a
+            network, or  a  message  encapsulated  in  a  body  of  type
+            "message".
+
+            The term "body part", in this document,  means  one  of  the
+            parts  of  the body of a multipart entity. A body part has a
+            header and a body, so it makes sense to speak about the body
+            of a body part.
+
+            The term "entity", in this document, means either a  message
+            or  a  body  part.  All kinds of entities share the property
+            that they have a header and a body.
+
+            The term "body", when not further qualified, means the  body
+            of  an  entity, that is the body of either a message or of a
+            body part.
+
+            Note : the previous four definitions are  clearly  circular.
+            This  is  unavoidable,  since the overal structure of a MIME
+            message is indeed recursive.
+
+            In this document, all numeric and octet values are given  in
+            decimal notation.
+
+            It must be noted that  Content-Type  values,  subtypes,  and
+            parameter  names  as  defined  in  this  document  are case-
+            insensitive.  However, parameter values  are  case-sensitive
+            unless otherwise specified for the specific parameter.
+
+            FORMATTING NOTE:  This document has been carefully formatted
+            for   ease  of  reading.  The  PostScript  version  of  this
+            document, in particular, places notes like this  one,  which
+            may  be  skipped  by  the  reader, in a smaller, italicized,
+            font, and indents it as well.  In the text version, only the
+            indentation  is  preserved,  so  if you are reading the text
+            version of this you  might  consider  using  the  PostScript
+            version  instead.  However,  all such notes will be indented
+            and preceded by "NOTE:" or some similar  introduction,  even
+            in the text version.
+
+            The primary purpose  of  these  non-essential  notes  is  to
+            convey  information about the rationale of this document, or
+            to  place  this  document  in  the  proper   historical   or
+            evolutionary  context.   Such  information may be skipped by
+            those who are  focused  entirely  on  building  a  compliant
+            implementation,  but  may  be  of  use  to those who wish to
+            understand why this document is written as it is.
+
+            For ease of  recognition,  all  BNF  definitions  have  been
+            placed  in  a  fixed-width font in the PostScript version of
+            this document.
+
+
+
+            Borenstein & Freed                                  [Page 4]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            3    The MIME-Version Header Field
+
+            Since RFC 822 was published in 1982, there has  really  been
+            only  one  format  standard for Internet messages, and there
+            has  been  little  perceived  need  to  declare  the  format
+            standard  in  use.  This document is an independent document
+            that complements RFC 822. Although the  extensions  in  this
+            document have been defined in such a way as to be compatible
+            with RFC 822, there are  still  circumstances  in  which  it
+            might  be  desirable  for  a  mail-processing  agent to know
+            whether a message was composed  with  the  new  standard  in
+            mind.
+
+            Therefore, this document defines a new header field,  "MIME-
+            Version",  which is to be used to declare the version of the
+            Internet message body format standard in use.
+
+            Messages composed in  accordance  with  this  document  MUST
+            include  such  a  header  field, with the following verbatim
+            text:
+
+            MIME-Version: 1.0
+
+            The presence of this header field is an assertion  that  the
+            message has been composed in compliance with this document.
+
+            Since it is possible that a future document might extend the
+            message format standard again, a formal BNF is given for the
+            content of the MIME-Version field:
+
+            MIME-Version := text
+
+            Thus, future  format  specifiers,  which  might  replace  or
+            extend  "1.0", are (minimally) constrained by the definition
+            of "text", which appears in RFC 822.
+
+            Note that the MIME-Version header field is required  at  the
+            top  level  of  a  message. It is not required for each body
+            part of a multipart entity.  It is required for the embedded
+            headers  of  a  body  of  type  "message" if and only if the
+            embedded message is itself claimed to be MIME-compliant.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            Borenstein & Freed                                  [Page 5]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            4    The Content-Type Header Field
+
+            The purpose of the Content-Type field  is  to  describe  the
+            data  contained  in the body fully enough that the receiving
+            user agent can pick an appropriate  agent  or  mechanism  to
+            present  the  data  to the user, or  otherwise deal with the
+            data in an appropriate manner.
+
+            HISTORICAL NOTE:  The Content-Type header  field  was  first
+            defined  in RFC 1049.  RFC 1049 Content-types used a simpler
+            and less powerful syntax, but one that is largely compatible
+            with the mechanism given here.
+
+            The Content-Type  header field is used to specify the nature
+            of  the  data  in  the body of an entity, by giving type and
+            subtype identifiers, and by providing auxiliary  information
+            that may be required for certain types.   After the type and
+            subtype names, the remainder of the header field is simply a
+            set of parameters, specified in an attribute/value notation.
+            The set of meaningful parameters differs for  the  different
+            types.   The  ordering  of  parameters  is  not significant.
+            Among the defined parameters is  a  "charset"  parameter  by
+            which  the  character  set used in the body may be declared.
+            Comments are allowed in accordance with RFC  822  rules  for
+            structured header fields.
+
+            In general, the top-level Content-Type is  used  to  declare
+            the  general  type  of  data,  while the subtype specifies a
+            specific format for that type of data.  Thus, a Content-Type
+            of  "image/xyz" is enough to tell a user agent that the data
+            is an image, even if the user agent has no knowledge of  the
+            specific  image format "xyz".  Such information can be used,
+            for example, to decide whether or not to show a user the raw
+            data from an unrecognized subtype -- such an action might be
+            reasonable for unrecognized subtypes of text,  but  not  for
+            unrecognized  subtypes  of image or audio.  For this reason,
+            registered subtypes of audio, image, text, and video, should
+            not  contain  embedded  information  that  is  really  of  a
+            different type.  Such compound types should  be  represented
+            using the "multipart" or "application" types.
+
+            Parameters are modifiers of the content-subtype, and do  not
+            fundamentally  affect  the  requirements of the host system.
+            Although  most  parameters  make  sense  only  with  certain
+            content-types,  others  are  "global" in the sense that they
+            might apply to any  subtype.  For  example,  the  "boundary"
+            parameter makes sense only for the "multipart" content-type,
+            but the "charset" parameter might make  sense  with  several
+            content-types.
+
+            An initial set of seven Content-Types  is  defined  by  this
+            document.   This  set  of  top-level names is intended to be
+            substantially complete.  It is expected  that  additions  to
+            the   larger   set  of  supported  types  can  generally  be
+
+
+
+            Borenstein & Freed                                  [Page 6]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            accomplished by  the  creation  of  new  subtypes  of  these
+            initial  types.   In the future, more top-level types may be
+            defined only by an extension to this standard.   If  another
+            primary  type is to be used for any reason, it must be given
+            a name starting  with  "X-"  to  indicate  its  non-standard
+            status  and  to  avoid  a  potential  conflict with a future
+            official name.
+
+            In the Extended BNF notation  of  RFC  822,  a  Content-Type
+            header field value is defined as follows:
+
+            Content-Type := type "/" subtype *[";" parameter]
+
+            type :=          "application"     / "audio"
+                      / "image"           / "message"
+                      / "multipart"  / "text"
+                      / "video"           / x-token
+
+            x-token := <The two characters "X-" followed, with no
+                       intervening white space, by any token>
+
+            subtype := token
+
+            parameter := attribute "=" value
+
+            attribute := token
+
+            value := token / quoted-string
+
+            token := 1*<any CHAR except SPACE, CTLs, or tspecials>
+
+            tspecials :=  "(" / ")" / "<" / ">" / "@"  ; Must be in
+                       /  "," / ";" / ":" / "\" / <">  ; quoted-string,
+                       /  "/" / "[" / "]" / "?" / "."  ; to use within
+                       /  "="                        ; parameter values
+
+            Note that the definition of "tspecials" is the same  as  the
+            RFC  822  definition  of "specials" with the addition of the
+            three characters "/", "?", and "=".
+
+            Note also that a subtype specification is MANDATORY.   There
+            are no default subtypes.
+
+            The  type,  subtype,  and  parameter  names  are  not   case
+            sensitive.   For  example,  TEXT,  Text,  and  TeXt  are all
+            equivalent.  Parameter values are normally  case  sensitive,
+            but   certain   parameters   are  interpreted  to  be  case-
+            insensitive, depending on the intended use.   (For  example,
+            multipart  boundaries  are  case-sensitive, but the "access-
+            type" for message/External-body is not case-sensitive.)
+
+            Beyond this syntax, the only constraint on the definition of
+            subtype  names  is  the  desire  that  their  uses  must not
+            conflict.  That is, it would  be  undesirable  to  have  two
+
+
+
+            Borenstein & Freed                                  [Page 7]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            different       communities       using       "Content-Type:
+            application/foobar"  to  mean  two  different  things.   The
+            process  of  defining  new  content-subtypes,  then,  is not
+            intended to be a mechanism for  imposing  restrictions,  but
+            simply  a  mechanism  for publicizing the usages. There are,
+            therefore,  two  acceptable  mechanisms  for  defining   new
+            Content-Type subtypes:
+
+                 1.  Private values (starting  with  "X-")  may  be
+                      defined  bilaterally  between two cooperating
+                      agents  without   outside   registration   or
+                      standardization.
+
+                 2.   New  standard  values  must  be   documented,
+                      registered  with,  and  approved  by IANA, as
+                      described in Appendix F.  Where intended  for
+                      public  use,  the  formats they refer to must
+                      also be defined by a published specification,
+                      and possibly offered for standardization.
+
+            The seven  standard  initial  predefined  Content-Types  are
+            detailed in the bulk of this document.  They are:
+
+                 text --  textual  information.   The  primary  subtype,
+                      "plain",  indicates plain (unformatted) text.   No
+                      special software  is  required  to  get  the  full
+                      meaning  of  the  text, aside from support for the
+                      indicated character set.  Subtypes are to be  used
+                      for  enriched  text  in  forms  where  application
+                      software may enhance the appearance of  the  text,
+                      but such software must not be required in order to
+                      get the general  idea  of  the  content.  Possible
+                      subtypes  thus include any readable word processor
+                      format.   A  very  simple  and  portable  subtype,
+                      richtext, is defined in this document.
+                 multipart --  data  consisting  of  multiple  parts  of
+                      independent  data  types.   Four  initial subtypes
+                      are  defined,  including   the   primary   "mixed"
+                      subtype,  "alternative"  for representing the same
+                      data in multiple  formats,  "parallel"  for  parts
+                      intended to be viewed simultaneously, and "digest"
+                      for multipart entities in which each  part  is  of
+                      type "message".
+                 message  --  an  encapsulated  message.   A   body   of
+                      Content-Type "message" is itself a fully formatted
+                      RFC 822 conformant message which may  contain  its
+                      own  different  Content-Type  header  field.   The
+                      primary  subtype  is  "rfc822".    The   "partial"
+                      subtype is defined for partial messages, to permit
+                      the fragmented transmission  of  bodies  that  are
+                      thought  to be too large to be passed through mail
+                      transport    facilities.      Another     subtype,
+                      "External-body",  is  defined for specifying large
+                      bodies by reference to an external data source.
+
+
+
+            Borenstein & Freed                                  [Page 8]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+                 image --  image data.  Image requires a display  device
+                      (such  as a graphical display, a printer, or a FAX
+                      machine)  to  view   the   information.    Initial
+                      subtypes  are  defined  for  two widely-used image
+                      formats, jpeg and gif.
+                 audio --  audio data,  with  initial  subtype  "basic".
+                      Audio  requires  an audio output device (such as a
+                      speaker or a telephone) to "display" the contents.
+                 video --  video data.  Video requires the capability to
+                      display   moving   images,   typically   including
+                      specialized hardware and  software.   The  initial
+                      subtype is "mpeg".
+                 application --  some  other  kind  of  data,  typically
+                      either uninterpreted binary data or information to
+                      be processed by  a  mail-based  application.   The
+                      primary  subtype, "octet-stream", is to be used in
+                      the case of uninterpreted binary  data,  in  which
+                      case  the  simplest recommended action is to offer
+                      to write the information into a file for the user.
+                      Two  additional  subtypes, "ODA" and "PostScript",
+                      are defined for transporting  ODA  and  PostScript
+                      documents  in  bodies.   Other  expected  uses for
+                      "application"  include  spreadsheets,   data   for
+                      mail-based  scheduling  systems, and languages for
+                      "active" (computational) email.  (Note that active
+                      email   entails   several  securityconsiderations,
+                      which  are   discussed   later   in   this   memo,
+                      particularly      in      the      context      of
+                      application/PostScript.)
+
+            Default RFC 822 messages are typed by this protocol as plain
+            text  in the US-ASCII character set, which can be explicitly
+            specified as "Content-type:  text/plain;  charset=us-ascii".
+            If  no  Content-Type  is specified, either by error or by an
+            older user agent, this default is assumed.   In the presence
+            of  a  MIME-Version header field, a receiving User Agent can
+            also assume  that  plain  US-ASCII  text  was  the  sender's
+            intent.   In  the  absence  of a MIME-Version specification,
+            plain US-ASCII text must still be assumed, but the  sender's
+            intent might have been otherwise.
+
+            RATIONALE:  In the absence of any Content-Type header  field
+            or MIME-Version header field, it is impossible to be certain
+            that a message is actually text in  the  US-ASCII  character
+            set,  since  it  might  well  be  a  message that, using the
+            conventions that predate this  document,  includes  text  in
+            another  character  set or non-textual data in a manner that
+            cannot  be  automatically  recognized  (e.g.,  a   uuencoded
+            compressed  UNIX  tar  file).  Although  there  is  no fully
+            acceptable alternative to treating such untyped messages  as
+            "text/plain;  charset=us-ascii",  implementors should remain
+            aware that if a message lacks both the MIME-Version and  the
+            Content-Type  header  fields,  it  may  in  practice contain
+            almost anything.
+
+
+
+            Borenstein & Freed                                  [Page 9]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            It should be noted that  the  list  of  Content-Type  values
+            given  here  may  be  augmented  in time, via the mechanisms
+            described above, and that the set of subtypes is expected to
+            grow substantially.
+
+            When a mail reader encounters mail with an unknown  Content-
+            type  value,  it  should generally treat it as equivalent to
+            "application/octet-stream",  as  described  later  in   this
+            document.
+
+            5    The Content-Transfer-Encoding Header Field
+
+            Many Content-Types which could usefully be  transported  via
+            email  are  represented, in their "natural" format, as 8-bit
+            character or binary data.  Such data cannot  be  transmitted
+            over   some  transport  protocols.   For  example,  RFC  821
+            restricts mail messages to 7-bit  US-ASCII  data  with  1000
+            character lines.
+
+            It is necessary, therefore, to define a  standard  mechanism
+            for  re-encoding  such  data into a 7-bit short-line format.
+            This  document  specifies  that  such  encodings   will   be
+            indicated by a new "Content-Transfer-Encoding" header field.
+            The Content-Transfer-Encoding field is used to indicate  the
+            type  of  transformation  that  has  been  used  in order to
+            represent the body in an acceptable manner for transport.
+
+            Unlike Content-Types, a proliferation  of  Content-Transfer-
+            Encoding  values  is  undesirable and unnecessary.  However,
+            establishing   only   a   single   Content-Transfer-Encoding
+            mechanism  does  not  seem  possible.    There is a tradeoff
+            between the desire for a compact and efficient  encoding  of
+            largely-binary  data  and the desire for a readable encoding
+            of data that is mostly, but not entirely, 7-bit  data.   For
+            this reason, at least two encoding mechanisms are necessary:
+            a "readable" encoding and a "dense" encoding.
+
+            The Content-Transfer-Encoding field is designed  to  specify
+            an invertible mapping between the "native" representation of
+            a type of data and a  representation  that  can  be  readily
+            exchanged  using  7  bit  mail  transport protocols, such as
+            those defined by RFC 821 (SMTP). This  field  has  not  been
+            defined  by  any  previous  standard. The field's value is a
+            single token specifying the type of encoding, as  enumerated
+            below.  Formally:
+
+            Content-Transfer-Encoding := "BASE64" / "QUOTED-PRINTABLE" /
+                                         "8BIT"   / "7BIT" /
+                                         "BINARY" / x-token
+
+            These values are not case sensitive.  That  is,  Base64  and
+            BASE64  and  bAsE64 are all equivalent.  An encoding type of
+            7BIT requires that the body is already in a seven-bit  mail-
+            ready representation.  This is the default value -- that is,
+
+
+
+            Borenstein & Freed                                 [Page 10]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            "Content-Transfer-Encoding:  7BIT"   is   assumed   if   the
+            Content-Transfer-Encoding header field is not present.
+
+            The values "8bit", "7bit", and "binary" all  imply  that  NO
+            encoding  has  been performed. However, they are potentially
+            useful as indications of the kind of data contained  in  the
+            object,  and  therefore  of  the kind of encoding that might
+            need to be performed for transmission in a  given  transport
+            system.   "7bit"  means  that the data is all represented as
+            short lines of US-ASCII data.  "8bit" means that  the  lines
+            are  short,  but  there  may be non-ASCII characters (octets
+            with the high-order bit set).  "Binary" means that not  only
+            may non-ASCII characters be present, but also that the lines
+            are not necessarily short enough for SMTP transport.
+
+            The difference between  "8bit"  (or  any  other  conceivable
+            bit-width  token)  and  the  "binary" token is that "binary"
+            does not require adherence to any limits on line  length  or
+            to  the  SMTP  CRLF semantics, while the bit-width tokens do
+            require such adherence.  If the body contains  data  in  any
+            bit-width   other  than  7-bit,  the  appropriate  bit-width
+            Content-Transfer-Encoding token must be used  (e.g.,  "8bit"
+            for unencoded 8 bit wide data).  If the body contains binary
+            data, the "binary" Content-Transfer-Encoding token  must  be
+            used.
+
+            NOTE:  The distinction between the Content-Transfer-Encoding
+            values  of  "binary,"  "8bit," etc. may seem unimportant, in
+            that all of them really mean "none" -- that  is,  there  has
+            been  no encoding of the data for transport.  However, clear
+            labeling will be  of  enormous  value  to  gateways  between
+            future mail transport systems with differing capabilities in
+            transporting data that do not meet the restrictions  of  RFC
+            821 transport.
+
+            As of  the  publication  of  this  document,  there  are  no
+            standardized  Internet transports for which it is legitimate
+            to include unencoded 8-bit or binary data  in  mail  bodies.
+            Thus  there  are  no  circumstances  in  which the "8bit" or
+            "binary" Content-Transfer-Encoding is actually legal on  the
+            Internet.   However,  in the event that 8-bit or binary mail
+            transport becomes a reality in Internet mail, or  when  this
+            document  is  used  in  conjunction  with any other 8-bit or
+            binary-capable transport mechanism, 8-bit or  binary  bodies
+            should be labeled as such using this mechanism.
+
+            NOTE:  The five values  defined  for  the  Content-Transfer-
+            Encoding  field  imply  nothing about the Content-Type other
+            than the algorithm by which it was encoded or the  transport
+            system requirements if unencoded.
+
+            Implementors  may,  if  necessary,   define   new   Content-
+            Transfer-Encoding  values, but must use an x-token, which is
+            a name prefixed by "X-" to indicate its non-standard status,
+
+
+
+            Borenstein & Freed                                 [Page 11]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            e.g.,    "Content-Transfer-Encoding:     x-my-new-encoding".
+            However, unlike Content-Types and subtypes, the creation  of
+            new   Content-Transfer-Encoding  values  is  explicitly  and
+            strongly  discouraged,  as  it  seems   likely   to   hinder
+            interoperability  with  little potential benefit.  Their use
+            is allowed only  as  the  result  of  an  agreement  between
+            cooperating user agents.
+
+            If a Content-Transfer-Encoding header field appears as  part
+            of  a  message header, it applies to the entire body of that
+            message.   If  a  Content-Transfer-Encoding   header   field
+            appears as part of a body part's headers, it applies only to
+            the body of that  body  part.   If  an  entity  is  of  type
+            "multipart"  or  "message", the Content-Transfer-Encoding is
+            not permitted to have any  value  other  than  a  bit  width
+            (e.g., "7bit", "8bit", etc.) or "binary".
+
+            It should be noted that email is character-oriented, so that
+            the  mechanisms  described  here are mechanisms for encoding
+            arbitrary byte streams, not bit streams.  If a bit stream is
+            to  be encoded via one of these mechanisms, it must first be
+            converted to an 8-bit byte stream using the network standard
+            bit  order  ("big-endian"),  in  which the earlier bits in a
+            stream become the higher-order bits in a byte.  A bit stream
+            not  ending at an 8-bit boundary must be padded with zeroes.
+            This document provides a mechanism for noting  the  addition
+            of such padding in the case of the application Content-Type,
+            which has a "padding" parameter.
+
+            The encoding mechanisms defined here explicitly  encode  all
+            data  in  ASCII.   Thus,  for example, suppose an entity has
+            header fields such as:
+
+                 Content-Type: text/plain; charset=ISO-8859-1
+                 Content-transfer-encoding: base64
+
+            This should be interpreted to mean that the body is a base64
+            ASCII  encoding  of  data that was originally in ISO-8859-1,
+            and will be in that character set again after decoding.
+
+            The following sections will define the two standard encoding
+            mechanisms.    The   definition   of  new  content-transfer-
+            encodings is explicitly discouraged and  should  only  occur
+            when  absolutely  necessary.   All content-transfer-encoding
+            namespace except that  beginning  with  "X-"  is  explicitly
+            reserved  to  the  IANA  for future use.  Private agreements
+            about   content-transfer-encodings   are   also   explicitly
+            discouraged.
+
+            Certain Content-Transfer-Encoding values may only be used on
+            certain  Content-Types.   In  particular,  it  is  expressly
+            forbidden to use any encodings other than "7bit", "8bit", or
+            "binary"  with  any  Content-Type  that recursively includes
+            other Content-Type  fields,   notably  the  "multipart"  and
+
+
+
+            Borenstein & Freed                                 [Page 12]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            "message" Content-Types.  All encodings that are desired for
+            bodies of type multipart or message  must  be  done  at  the
+            innermost  level,  by encoding the actual body that needs to
+            be encoded.
+
+            NOTE  ON  ENCODING  RESTRICTIONS:   Though  the  prohibition
+            against  using  content-transfer-encodings  on  data of type
+            multipart or message may  seem  overly  restrictive,  it  is
+            necessary  to  prevent  nested  encodings, in which data are
+            passed through an encoding  algorithm  multiple  times,  and
+            must  be  decoded  multiple  times  in  order to be properly
+            viewed.  Nested encodings  add  considerable  complexity  to
+            user  agents:   aside  from  the obvious efficiency problems
+            with such multiple encodings, they  can  obscure  the  basic
+            structure  of a message.  In particular, they can imply that
+            several decoding operations are necessary simply to find out
+            what  types  of  objects a message contains.  Banning nested
+            encodings may complicate the job of certain  mail  gateways,
+            but  this  seems less of a problem than the effect of nested
+            encodings on user agents.
+
+            NOTE ON THE RELATIONSHIP BETWEEN CONTENT-TYPE  AND  CONTENT-
+            TRANSFER-ENCODING:   It  may seem that the Content-Transfer-
+            Encoding could be inferred from the characteristics  of  the
+            Content-Type  that  is to be encoded, or, at the very least,
+            that certain Content-Transfer-Encodings  could  be  mandated
+            for  use  with  specific  Content-Types.  There  are several
+            reasons why this is not the case. First, given  the  varying
+            types  of  transports  used  for mail, some encodings may be
+            appropriate for some Content-Type/transport combinations and
+            not  for  others.  (For  example, in an  8-bit transport, no
+            encoding would be required for  text  in  certain  character
+            sets,  while  such  encodings are clearly required for 7-bit
+            SMTP.)  Second, certain Content-Types may require  different
+            types  of  transfer  encoding under different circumstances.
+            For example, many PostScript bodies might  consist  entirely
+            of  short lines of 7-bit data and hence require little or no
+            encoding. Other PostScript bodies  (especially  those  using
+            Level  2 PostScript's binary encoding mechanism) may only be
+            reasonably represented using a  binary  transport  encoding.
+            Finally,  since Content-Type is intended to be an open-ended
+            specification  mechanism,   strict   specification   of   an
+            association  between Content-Types and encodings effectively
+            couples the specification of an application protocol with  a
+            specific  lower-level transport. This is not desirable since
+            the developers of a Content-Type should not have to be aware
+            of all the transports in use and what their limitations are.
+
+            NOTE ON TRANSLATING  ENCODINGS:   The  quoted-printable  and
+            base64  encodings  are  designed  so that conversion between
+            them is possible. The only  issue  that  arises  in  such  a
+            conversion  is  the handling of line breaks. When converting
+            from  quoted-printable  to  base64  a  line  break  must  be
+            converted  into  a CRLF sequence. Similarly, a CRLF sequence
+
+
+
+            Borenstein & Freed                                 [Page 13]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            in base64 data should be  converted  to  a  quoted-printable
+            line break, but ONLY when converting text data.
+
+            NOTE  ON  CANONICAL  ENCODING  MODEL:     There   was   some
+            confusion,  in  earlier  drafts  of this memo, regarding the
+            model for when email data was to be converted  to  canonical
+            form  and  encoded, and in particular how this process would
+            affect the treatment of CRLFs, given that the representation
+            of  newlines  varies greatly from system to system. For this
+            reason, a canonical  model  for  encoding  is  presented  as
+            Appendix H.
+
+            5.1  Quoted-Printable Content-Transfer-Encoding
+
+            The Quoted-Printable encoding is intended to represent  data
+            that largely consists of octets that correspond to printable
+            characters in the ASCII character set.  It encodes the  data
+            in  such  a way that the resulting octets are unlikely to be
+            modified by mail transport.  If the data being  encoded  are
+            mostly  ASCII  text,  the  encoded  form of the data remains
+            largely recognizable by humans.  A body  which  is  entirely
+            ASCII  may also be encoded in Quoted-Printable to ensure the
+            integrity of the data should  the  message  pass  through  a
+            character-translating, and/or line-wrapping gateway.
+
+            In this encoding, octets are to be represented as determined
+            by the following rules:
+
+                 Rule #1:  (General  8-bit  representation)  Any  octet,
+                 except  those  indicating a line break according to the
+                 newline convention of the canonical form  of  the  data
+                 being encoded, may be represented by an "=" followed by
+                 a two digit hexadecimal representation of  the  octet's
+                 value. The digits of the hexadecimal alphabet, for this
+                 purpose, are "0123456789ABCDEF". Uppercase letters must
+                 be
+                 used when sending hexadecimal  data,  though  a  robust
+                 implementation   may   choose  to  recognize  lowercase
+                 letters on receipt. Thus, for  example,  the  value  12
+                 (ASCII  form feed) can be represented by "=0C", and the
+                 value 61 (ASCII  EQUAL  SIGN)  can  be  represented  by
+                 "=3D".   Except  when  the  following  rules  allow  an
+                 alternative encoding, this rule is mandatory.
+
+                 Rule #2: (Literal representation) Octets  with  decimal
+                 values  of 33 through 60 inclusive, and 62 through 126,
+                 inclusive, MAY be represented as the  ASCII  characters
+                 which  correspond  to  those  octets (EXCLAMATION POINT
+                 through LESS THAN,  and  GREATER  THAN  through  TILDE,
+                 respectively).
+
+                 Rule #3: (White Space): Octets with values of 9 and  32
+                 MAY   be  represented  as  ASCII  TAB  (HT)  and  SPACE
+                 characters,  respectively,   but   MUST   NOT   be   so
+
+
+
+            Borenstein & Freed                                 [Page 14]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+                 represented at the end of an encoded line. Any TAB (HT)
+                 or SPACE characters on an encoded  line  MUST  thus  be
+                 followed  on  that  line  by a printable character.  In
+                 particular, an "=" at  the  end  of  an  encoded  line,
+                 indicating  a  soft line break (see rule #5) may follow
+                 one or more TAB (HT) or SPACE characters.   It  follows
+                 that  an  octet with value 9 or 32 appearing at the end
+                 of an encoded line must  be  represented  according  to
+                 Rule  #1.  This  rule  is  necessary  because some MTAs
+                 (Message Transport  Agents,  programs  which  transport
+                 messages from one user to another, or perform a part of
+                 such transfers) are known to pad  lines  of  text  with
+                 SPACEs,  and  others  are known to remove "white space"
+                 characters from the end  of  a  line.  Therefore,  when
+                 decoding  a  Quoted-Printable  body, any trailing white
+                 space on a line must be deleted, as it will necessarily
+                 have been added by intermediate transport agents.
+
+                 Rule #4 (Line Breaks): A line  break  in  a  text  body
+                 part,   independent   of  what  its  representation  is
+                 following the  canonical  representation  of  the  data
+                 being  encoded, must be represented by a (RFC 822) line
+                 break,  which  is  a  CRLF  sequence,  in  the  Quoted-
+                 Printable  encoding.  If isolated CRs and LFs, or LF CR
+                 and CR LF sequences are allowed  to  appear  in  binary
+                 data  according  to  the  canonical  form, they must be
+                 represented   using  the  "=0D",  "=0A",  "=0A=0D"  and
+                 "=0D=0A" notations respectively.
+
+                 Note that many implementation may elect to  encode  the
+                 local representation of various content types directly.
+                 In particular, this may apply to plain text material on
+                 systems  that  use  newline conventions other than CRLF
+                 delimiters. Such an implementation is permissible,  but
+                 the  generation  of  line breaks must be generalized to
+                 account for the case where alternate representations of
+                 newline sequences are used.
+
+                 Rule  #5  (Soft  Line  Breaks):  The   Quoted-Printable
+                 encoding REQUIRES that encoded lines be no more than 76
+                 characters long. If longer lines are to be encoded with
+                 the  Quoted-Printable encoding, 'soft' line breaks must
+                 be used. An equal sign  as  the  last  character  on  a
+                 encoded  line indicates such a non-significant ('soft')
+                 line break in the encoded text. Thus if the "raw"  form
+                 of the line is a single unencoded line that says:
+
+                      Now's the time for all folk to come to the aid of
+                      their country.
+
+                 This  can  be  represented,  in  the   Quoted-Printable
+                 encoding, as
+
+
+
+
+
+            Borenstein & Freed                                 [Page 15]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+                      Now's the time =
+                      for all folk to come=
+                       to the aid of their country.
+
+                 This provides a mechanism with  which  long  lines  are
+                 encoded  in  such  a  way as to be restored by the user
+                 agent.  The 76  character  limit  does  not  count  the
+                 trailing   CRLF,   but  counts  all  other  characters,
+                 including any equal signs.
+
+            Since the hyphen character ("-") is represented as itself in
+            the  Quoted-Printable  encoding,  care  must  be taken, when
+            encapsulating a quoted-printable encoded body in a multipart
+            entity,  to  ensure that the encapsulation boundary does not
+            appear anywhere in the encoded body.  (A good strategy is to
+            choose a boundary that includes a character sequence such as
+            "=_" which can never appear in a quoted-printable body.  See
+            the   definition   of   multipart  messages  later  in  this
+            document.)
+
+            NOTE:  The quoted-printable encoding represents something of
+            a   compromise   between   readability  and  reliability  in
+            transport.   Bodies  encoded   with   the   quoted-printable
+            encoding will work reliably over most mail gateways, but may
+            not work  perfectly  over  a  few  gateways,  notably  those
+            involving  translation  into  EBCDIC.  (In theory, an EBCDIC
+            gateway could decode a quoted-printable body  and  re-encode
+            it  using  base64,  but  such gateways do not yet exist.)  A
+            higher  level  of  confidence  is  offered  by  the   base64
+            Content-Transfer-Encoding.  A way to get reasonably reliable
+            transport through EBCDIC gateways is to also quote the ASCII
+            characters
+
+                 !"#$@[\]^`{|}~
+
+            according to rule #1.  See Appendix B for more information.
+
+            Because quoted-printable data is  generally  assumed  to  be
+            line-oriented,  it is to be expected that the breaks between
+            the lines  of  quoted  printable  data  may  be  altered  in
+            transport,  in  the  same  manner  that  plain text mail has
+            always been altered in Internet mail  when  passing  between
+            systems   with   differing  newline  conventions.   If  such
+            alterations are likely to constitute  a  corruption  of  the
+            data,  it  is  probably  more  sensible  to  use  the base64
+            encoding rather than the quoted-printable encoding.
+
+
+
+
+
+
+
+
+
+
+
+            Borenstein & Freed                                 [Page 16]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            5.2  Base64 Content-Transfer-Encoding
+
+            The  Base64   Content-Transfer-Encoding   is   designed   to
+            represent  arbitrary  sequences  of octets in a form that is
+            not humanly readable.  The encoding and decoding  algorithms
+            are simple, but the encoded data are consistently only about
+            33 percent larger than the unencoded data.  This encoding is
+            based on the one used in Privacy Enhanced Mail applications,
+            as defined in RFC 1113.   The  base64  encoding  is  adapted
+            from  RFC  1113, with one change:  base64 eliminates the "*"
+            mechanism for embedded clear text.
+
+            A 65-character subset of US-ASCII is used, enabling  6  bits
+            to  be  represented per printable character. (The extra 65th
+            character, "=", is used  to  signify  a  special  processing
+            function.)
+
+            NOTE:  This subset has the important  property  that  it  is
+            represented   identically   in  all  versions  of  ISO  646,
+            including US ASCII, and all characters  in  the  subset  are
+            also  represented  identically  in  all  versions of EBCDIC.
+            Other popular encodings, such as the encoding  used  by  the
+            UUENCODE  utility  and the base85 encoding specified as part
+            of Level 2 PostScript, do not share  these  properties,  and
+            thus  do  not  fulfill the portability requirements a binary
+            transport encoding for mail must meet.
+
+            The encoding process represents 24-bit groups of input  bits
+            as  output  strings of 4 encoded characters. Proceeding from
+            left  to  right,  a  24-bit  input  group   is   formed   by
+            concatenating  3  8-bit input groups. These 24 bits are then
+            treated as 4 concatenated 6-bit groups,  each  of  which  is
+            translated  into a single digit in the base64 alphabet. When
+            encoding a bit stream  via  the  base64  encoding,  the  bit
+            stream  must  be  presumed  to  be  ordered  with  the most-
+            significant-bit first.  That is, the first bit in the stream
+            will be the high-order bit in the first byte, and the eighth
+            bit will be the low-order bit in the first byte, and so on.
+
+            Each 6-bit group is used as an index into  an  array  of  64
+            printable  characters. The character referenced by the index
+            is placed in the output string. These characters, identified
+            in  Table  1,  below,  are  selected so as to be universally
+            representable,  and  the  set   excludes   characters   with
+            particular  significance to SMTP (e.g., ".", "CR", "LF") and
+            to the encapsulation boundaries  defined  in  this  document
+            (e.g., "-").
+
+
+
+
+
+
+
+
+
+
+            Borenstein & Freed                                 [Page 17]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+                            Table 1: The Base64 Alphabet
+
+               Value Encoding  Value  Encoding   Value  Encoding   Value
+            Encoding
+                   0 A            17 R            34 i            51 z
+                   1 B            18 S            35 j            52 0
+                   2 C            19 T            36 k            53 1
+                   3 D            20 U            37 l            54 2
+                   4 E            21 V            38 m            55 3
+                   5 F            22 W            39 n            56 4
+                   6 G            23 X            40 o            57 5
+                   7 H            24 Y            41 p            58 6
+                   8 I            25 Z            42 q            59 7
+                   9 J            26 a            43 r            60 8
+                  10 K            27 b            44 s            61 9
+                  11 L            28 c            45 t            62 +
+                  12 M            29 d            46 u            63 /
+                  13 N            30 e            47 v
+                  14 O            31 f            48 w         (pad) =
+                  15 P            32 g            49 x
+                  16 Q            33 h            50 y
+
+            The output stream (encoded bytes)  must  be  represented  in
+            lines  of  no more than 76 characters each.  All line breaks
+            or other characters not found in Table 1 must be ignored  by
+            decoding  software.   In  base64 data, characters other than
+            those in  Table  1,  line  breaks,  and  other  white  space
+            probably  indicate  a  transmission  error,  about  which  a
+            warning  message  or  even  a  message  rejection  might  be
+            appropriate under some circumstances.
+
+            Special processing is performed if fewer than  24  bits  are
+            available  at  the  end  of  the data being encoded.  A full
+            encoding quantum is always completed at the end of  a  body.
+            When  fewer  than  24  input  bits are available in an input
+            group, zero bits  are  added  (on  the  right)  to  form  an
+            integral number of 6-bit groups.  Output character positions
+            which are not required to represent actual  input  data  are
+            set  to  the  character  "=".   Since all base64 input is an
+            integral number of octets,  only  the  following  cases  can
+            arise:  (1)  the  final  quantum  of  encoding  input  is an
+            integral multiple of  24  bits;  here,  the  final  unit  of
+            encoded  output will be an integral multiple of 4 characters
+            with no "=" padding, (2) the final quantum of encoding input
+            is  exactly  8  bits; here, the final unit of encoded output
+            will  be  two  characters  followed  by  two   "="   padding
+            characters,  or  (3)  the final quantum of encoding input is
+            exactly 16 bits; here, the final unit of encoded output will
+            be three characters followed by one "=" padding character.
+
+            Care must be taken to use the proper octets for line  breaks
+            if base64 encoding is applied directly to text material that
+            has not been converted to  canonical  form.  In  particular,
+            text  line  breaks  should  be converted into CRLF sequences
+
+
+
+            Borenstein & Freed                                 [Page 18]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            prior to base64 encoding. The important  thing  to  note  is
+            that this may be done directly by the encoder rather than in
+            a prior canonicalization step in some implementations.
+
+            NOTE: There is no  need  to  worry  about  quoting  apparent
+            encapsulation  boundaries  within  base64-encoded  parts  of
+            multipart entities because no hyphen characters are used  in
+            the base64 encoding.
+
+            6    Additional Optional Content- Header Fields
+
+            6.1  Optional Content-ID Header Field
+
+            In constructing a high-level user agent, it may be desirable
+            to   allow   one   body   to   make  reference  to  another.
+            Accordingly, bodies may be labeled  using  the  "Content-ID"
+            header  field,  which  is  syntactically  identical  to  the
+            "Message-ID" header field:
+
+            Content-ID := msg-id
+
+            Like  the  Message-ID  values,  Content-ID  values  must  be
+            generated to be as unique as possible.
+
+            6.2  Optional Content-Description Header Field
+
+            The ability to associate some descriptive information with a
+            given body is often desirable. For example, it may be useful
+            to mark an "image" body as "a picture of the  Space  Shuttle
+            Endeavor."    Such  text  may  be  placed  in  the  Content-
+            Description header field.
+
+            Content-Description := *text
+
+            The description is presumed to  be  given  in  the  US-ASCII
+            character  set,  although  the  mechanism specified in [RFC-
+            1342]  may  be  used  for  non-US-ASCII  Content-Description
+            values.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            Borenstein & Freed                                 [Page 19]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            7    The Predefined Content-Type Values
+
+            This document defines seven initial Content-Type values  and
+            an  extension  mechanism  for private or experimental types.
+            Further standard types must  be  defined  by  new  published
+            specifications.   It is expected that most innovation in new
+            types of mail will take place as subtypes of the seven types
+            defined  here.   The  most  essential characteristics of the
+            seven content-types are summarized in Appendix G.
+
+            7.1  The Text Content-Type
+
+            The text Content-Type is intended for sending material which
+            is  principally textual in form.  It is the default Content-
+            Type.  A "charset" parameter may be  used  to  indicate  the
+            character set of the body text.  The primary subtype of text
+            is "plain".  This indicates plain (unformatted)  text.   The
+            default  Content-Type  for  Internet  mail  is  "text/plain;
+            charset=us-ascii".
+
+            Beyond plain text, there are many formats  for  representing
+            what might be known as "extended text" -- text with embedded
+            formatting and  presentation  information.   An  interesting
+            characteristic of many such representations is that they are
+            to some extent  readable  even  without  the  software  that
+            interprets  them.   It is useful, then, to distinguish them,
+            at the highest level, from such unreadable data  as  images,
+            audio,  or  text  represented in an unreadable form.  In the
+            absence  of  appropriate  interpretation  software,  it   is
+            reasonable to show subtypes of text to the user, while it is
+            not reasonable to do so with most nontextual data.
+
+            Such formatted textual  data  should  be  represented  using
+            subtypes  of text.  Plausible subtypes of text are typically
+            given by the common name of the representation format, e.g.,
+            "text/richtext".
+
+            7.1.1     The charset parameter
+
+            A critical parameter that may be specified in  the  Content-
+            Type  field  for  text  data  is the character set.  This is
+            specified with a "charset" parameter, as in:
+
+                 Content-type: text/plain; charset=us-ascii
+
+            Unlike some  other  parameter  values,  the  values  of  the
+            charset  parameter  are  NOT  case  sensitive.   The default
+            character set, which must be assumed in  the  absence  of  a
+            charset parameter, is US-ASCII.
+
+            An initial list of predefined character  set  names  can  be
+            found at the end of this section.  Additional character sets
+            may be registered with IANA  as  described  in  Appendix  F,
+            although the standardization of their use requires the usual
+
+
+
+            Borenstein & Freed                                 [Page 20]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            IAB  review  and  approval.  Note  that  if  the   specified
+            character  set  includes  8-bit  data,  a  Content-Transfer-
+            Encoding header field and a corresponding  encoding  on  the
+            data  are  required  in  order to transmit the body via some
+            mail transfer protocols, such as SMTP.
+
+            The default character set, US-ASCII, has been the subject of
+            some  confusion  and  ambiguity  in the past.  Not only were
+            there some ambiguities in the definition,  there  have  been
+            wide  variations  in  practice.   In order to eliminate such
+            ambiguity and variations  in  the  future,  it  is  strongly
+            recommended  that  new  user  agents  explicitly  specify  a
+            character set via the Content-Type header field.  "US-ASCII"
+            does not indicate an arbitrary seven-bit character code, but
+            specifies that the body uses character coding that uses  the
+            exact  correspondence  of  codes  to characters specified in
+            ASCII.  National use variations of ISO 646 [ISO-646] are NOT
+            ASCII   and   their  use  in  Internet  mail  is  explicitly
+            discouraged. The omission of the ISO 646  character  set  is
+            deliberate  in  this regard.  The character set name of "US-
+            ASCII" explicitly refers  to ANSI X3.4-1986 [US-ASCII] only.
+            The  character  set name "ASCII" is reserved and must not be
+            used for any purpose.
+
+            NOTE: RFC 821 explicitly specifies "ASCII",  and  references
+            an earlier version of the American Standard.  Insofar as one
+            of the purposes of specifying a Content-Type  and  character
+            set is to permit the receiver to unambiguously determine how
+            the sender intended the coded  message  to  be  interpreted,
+            assuming  anything  other than "strict ASCII" as the default
+            would risk unintentional and  incompatible  changes  to  the
+            semantics  of  messages  now being transmitted.    This also
+            implies that messages containing characters coded  according
+            to  national  variations on ISO 646, or using code-switching
+            procedures (e.g., those of ISO 2022), as well  as  8-bit  or
+            multiple   octet character encodings MUST use an appropriate
+            character set  specification  to  be  consistent  with  this
+            specification.
+
+            The complete US-ASCII character set is listed in [US-ASCII].
+            Note  that  the control characters including DEL (0-31, 127)
+            have no defined meaning  apart  from  the  combination  CRLF
+            (ASCII  values 13 and 10) indicating a new line.  Two of the
+            characters have de facto meanings in wide use: FF (12) often
+            means  "start  subsequent  text  on  the  beginning of a new
+            page"; and TAB or HT (9) often  (though  not  always)  means
+            "move  the  cursor  to  the  next available column after the
+            current position where the column number is a multiple of  8
+            (counting  the  first column as column 0)." Apart from this,
+            any use of the control characters or DEL in a body  must  be
+            part   of   a  private  agreement  between  the  sender  and
+            recipient.  Such  private  agreements  are  discouraged  and
+            should  be  replaced  by  the  other  capabilities  of  this
+            document.
+
+
+
+            Borenstein & Freed                                 [Page 21]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            NOTE:   Beyond  US-ASCII,  an  enormous   proliferation   of
+            character  sets  is  possible. It is the opinion of the IETF
+            working group that a large number of character sets is NOT a
+            good  thing.   We would prefer to specify a single character
+            set that can be used universally for representing all of the
+            world's   languages   in  electronic  mail.   Unfortunately,
+            existing practice in several communities seems to  point  to
+            the  continued  use  of  multiple character sets in the near
+            future.  For this reason, we define names for a small number
+            of  character  sets  for  which  a  strong  constituent base
+            exists.    It is our hope  that  ISO  10646  or  some  other
+            effort  will  eventually define a single world character set
+            which can then be specified for use in Internet mail, but in
+            the  advance of that definition we cannot specify the use of
+            ISO  10646,  Unicode,  or  any  other  character  set  whose
+            definition is, as of this writing, incomplete.
+
+            The defined charset values are:
+
+                 US-ASCII -- as defined in [US-ASCII].
+
+                 ISO-8859-X -- where "X"  is  to  be  replaced,  as
+                      necessary,  for  the  parts of ISO-8859 [ISO-
+                      8859].  Note that the ISO 646 character  sets
+                      have  deliberately  been  omitted in favor of
+                      their  8859  replacements,  which   are   the
+                      designated  character sets for Internet mail.
+                      As of the publication of this  document,  the
+                      legitimate  values  for  "X" are the digits 1
+                      through 9.
+
+            Note that the character set used,  if  anything  other  than
+            US-ASCII,   must  always  be  explicitly  specified  in  the
+            Content-Type field.
+
+            No other character set name may be  used  in  Internet  mail
+            without  the  publication  of a formal specification and its
+            registration with IANA as described in  Appendix  F,  or  by
+            private agreement, in which case the character set name must
+            begin with "X-".
+
+            Implementors are discouraged  from  defining  new  character
+            sets for mail use unless absolutely necessary.
+
+            The "charset" parameter has been defined primarily  for  the
+            purpose  of  textual  data, and is described in this section
+            for that reason.   However,  it  is  conceivable  that  non-
+            textual  data might also wish to specify a charset value for
+            some purpose, in which  case  the  same  syntax  and  values
+            should be used.
+
+            In general, mail-sending  software  should  always  use  the
+            "lowest  common  denominator"  character  set possible.  For
+            example, if a body contains  only  US-ASCII  characters,  it
+
+
+
+            Borenstein & Freed                                 [Page 22]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            should be marked as being in the US-ASCII character set, not
+            ISO-8859-1, which, like all the ISO-8859 family of character
+            sets,  is  a  superset  of  US-ASCII.   More generally, if a
+            widely-used character set is a subset of  another  character
+            set,  and a body contains only characters in the widely-used
+            subset, it should be labeled as being in that  subset.  This
+            will increase the chances that the recipient will be able to
+            view the mail correctly.
+
+            7.1.2     The Text/plain subtype
+
+            The primary subtype of text   is  "plain".   This  indicates
+            plain  (unformatted)  text.  The  default  Content-Type  for
+            Internet  mail,  "text/plain;  charset=us-ascii",  describes
+            existing  Internet practice, that is, it is the type of body
+            defined by RFC 822.
+
+            7.1.3     The Text/richtext subtype
+
+            In order to promote the  wider  interoperability  of  simple
+            formatted  text,  this  document defines an extremely simple
+            subtype of "text", the "richtext" subtype.  This subtype was
+            designed to meet the following criteria:
+
+                 1.  The syntax must be extremely simple to  parse,
+                 so  that  even  teletype-oriented mail systems can
+                 easily strip away the formatting  information  and
+                 leave only the readable text.
+
+                 2.  The syntax must be extensible to allow for new
+                 formatting commands that are deemed essential.
+
+                 3.  The capabilities must be extremely limited, to
+                 ensure  that  it  can  represent  no  more than is
+                 likely to be representable by the  user's  primary
+                 word  processor.   While  this  limits what can be
+                 sent, it increases the  likelihood  that  what  is
+                 sent can be properly displayed.
+
+                 4.  The syntax must be compatible  with  SGML,  so
+                 that,  with  an  appropriate  DTD  (Document  Type
+                 Definition, the standard mechanism for defining  a
+                 document  type  using SGML), a general SGML parser
+                 could be made to parse richtext.  However, despite
+                 this  compatibility,  the  syntax  should  be  far
+                 simpler than full SGML, so that no SGML  knowledge
+                 is required in order to implement it.
+
+            The syntax of "richtext" is very simple.  It is assumed,  at
+            the  top-level,  to be in the US-ASCII character set, unless
+            of course a different charset parameter was specified in the
+            Content-type  field.   All  characters represent themselves,
+            with the exception of the "<" character (ASCII 60), which is
+            used   to  mark  the  beginning  of  a  formatting  command.
+
+
+
+            Borenstein & Freed                                 [Page 23]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            Formatting  instructions  consist  of  formatting   commands
+            surrounded  by angle brackets ("<>", ASCII 60 and 62).  Each
+            formatting command may be no  more  than  40  characters  in
+            length,  all in US-ASCII, restricted to the alphanumeric and
+            hyphen ("-") characters. Formatting commands may be preceded
+            by  a  forward slash or solidus ("/", ASCII 47), making them
+            negations, and such negations must always exist  to  balance
+            the  initial opening commands, except as noted below.  Thus,
+            if the formatting command "<bold>" appears  at  some  point,
+            there  must  later  be a "</bold>" to balance it.  There are
+            only three exceptions to this "balancing" rule:  First,  the
+            command "<lt>" is used to represent a literal "<" character.
+            Second, the command "<nl>" is used to represent  a  required
+            line  break.   (Otherwise,  CRLFs in the data are treated as
+            equivalent to  a  single  SPACE  character.)   Finally,  the
+            command  "<np>"  is  used to represent a page break.  (NOTE:
+            The 40 character  limit  on  formatting  commands  does  not
+            include  the  "<",  ">",  or  "/"  characters  that might be
+            attached to such commands.)
+
+            Initially defined formatting commands, not all of which will
+            be implemented by all richtext implementations, include:
+
+                 Bold -- causes the subsequent text  to  be  in  a  bold
+                      font.
+                 Italic -- causes the subsequent text to be in an italic
+                      font.
+                 Fixed -- causes the subsequent text to be  in  a  fixed
+                      width font.
+                 Smaller -- causes  the  subsequent  text  to  be  in  a
+                      smaller font.
+                 Bigger -- causes the subsequent text to be in a  bigger
+                      font.
+                 Underline  --  causes  the  subsequent   text   to   be
+                      underlined.
+                 Center -- causes the subsequent text to be centered.
+                 FlushLeft -- causes the  subsequent  text  to  be  left
+                      justified.
+                 FlushRight -- causes the subsequent text  to  be  right
+                      justified.
+                 Indent -- causes the subsequent text to be indented  at
+                      the left margin.
+                 IndentRight  --  causes  the  subsequent  text  to   be
+                      indented at the right margin.
+                 Outdent -- causes the subsequent text to  be  outdented
+                      at the left margin.
+                 OutdentRight  --  causes  the  subsequent  text  to  be
+                      outdented at the right margin.
+                 SamePage -- causes the subsequent text to  be  grouped,
+                      if possible, on one page.
+                 Subscript  --  causes  the  subsequent   text   to   be
+                      interpreted as a subscript.
+
+
+
+
+
+            Borenstein & Freed                                 [Page 24]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+                 Superscript  --  causes  the  subsequent  text  to   be
+                      interpreted as a superscript.
+                 Heading -- causes the subsequent text to be interpreted
+                      as a page heading.
+                 Footing -- causes the subsequent text to be interpreted
+                      as a page footing.
+                 ISO-8859-X  (for any value of X  that  is  legal  as  a
+                      "charset" parameter) -- causes the subsequent text
+                      to be  interpreted  as  text  in  the  appropriate
+                      character set.
+                 US-ASCII  --  causes  the   subsequent   text   to   be
+                      interpreted as text in the US-ASCII character set.
+                 Excerpt -- causes the subsequent text to be interpreted
+                      as   a   textual   excerpt  from  another  source.
+                      Typically this will be displayed using indentation
+                      and  an  alternate font, but such decisions are up
+                      to the viewer.
+                 Paragraph  --  causes  the  subsequent   text   to   be
+                      interpreted    as   a   single   paragraph,   with
+                      appropriate  paragraph  breaks  (typically   blank
+                      space) before and after.
+                 Signature  --  causes  the  subsequent   text   to   be
+                      interpreted  as  a  "signature".  Some systems may
+                      wish to display signatures in a  smaller  font  or
+                      otherwise set them apart from the main text of the
+                      message.
+                 Comment -- causes the subsequent text to be interpreted
+                      as a comment, and hence not shown to the reader.
+                 No-op -- has no effect on the subsequent text.
+                 lt -- <lt> is replaced by a literal "<" character.   No
+                      balancing </lt> is allowed.
+                 nl -- <nl> causes a line break.  No balancing </nl>  is
+                      allowed.
+                 np -- <np> causes a page break.  No balancing </np>  is
+                      allowed.
+
+            Each positive formatting command affects all subsequent text
+            until  the matching negative formatting command.  Such pairs
+            of formatting commands must be properly balanced and nested.
+            Thus, a proper way to describe text in bold italics is:
+
+                      <bold><italic>the-text</italic></bold>
+
+                 or, alternately,
+
+                      <italic><bold>the-text</bold></italic>
+
+                 but,  in  particular,  the  following  is  illegal
+                 richtext:
+
+                      <bold><italic>the-text</bold></italic>
+
+            NOTE:   The  nesting  requirement  for  formatting  commands
+            imposes  a  slightly  higher  burden  upon  the composers of
+
+
+
+            Borenstein & Freed                                 [Page 25]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            richtext  bodies,  but   potentially   simplifies   richtext
+            displayers  by  allowing  them  to be stack-based.  The main
+            goal of richtext is to be simple enough to  make  multifont,
+            formatted  email  widely  readable,  so  that those with the
+            capability of  sending  it  will  be  able  to  do  so  with
+            confidence.   Thus  slightly  increased  complexity  in  the
+            composing software was  deemed  a  reasonable  tradeoff  for
+            simplified  reading  software.  Nonetheless, implementors of
+            richtext  readers  are  encouraged  to  follow  the  general
+            Internet  guidelines  of being conservative in what you send
+            and liberal in what you accept.  Those implementations  that
+            can  do so are encouraged to deal reasonably with improperly
+            nested richtext.
+
+            Implementations  must  regard  any  unrecognized  formatting
+            command  as  equivalent to "No-op", thus facilitating future
+            extensions to "richtext".  Private extensions may be defined
+            using  formatting  commands that begin with "X-", by analogy
+            to Internet mail header field names.
+
+            It is worth noting that no special behavior is required  for
+            the TAB (HT) character. It is recommended, however, that, at
+            least  when  fixed-width  fonts  are  in  use,  the   common
+            semantics  of  the  TAB  (HT)  character should be observed,
+            namely that it moves to the next column position that  is  a
+            multiple  of  8.   (In  other words, if a TAB (HT) occurs in
+            column n, where the leftmost column is column 0,  then  that
+            TAB   (HT)   should   be  replaced  by  8-(n  mod  8)  SPACE
+            characters.)
+
+            Richtext also differentiates between "hard" and "soft"  line
+            breaks.   A line break (CRLF) in the richtext data stream is
+            interpreted as a "soft" line break,  one  that  is  included
+            only for purposes of mail transport, and is to be treated as
+            white space by richtext interpreters.  To include  a  "hard"
+            line  break (one that must be displayed as such), the "<nl>"
+            or "<paragraph> formatting constructs  should  be  used.  In
+            general, a soft line break should be treated as white space,
+            but when soft line breaks immediately follow  a  <nl>  or  a
+            </paragraph>  tag they should be ignored rather than treated
+            as white space.
+
+            Putting all this  together,  the  following  "text/richtext"
+            body fragment:
+
+                      <bold>Now</bold> is the time for
+                      <italic>all</italic> good men
+                       <smaller>(and <lt>women>)</smaller> to
+                      <ignoreme></ignoreme> come
+
+                      to the aid of their
+                      <nl>
+
+
+
+
+
+            Borenstein & Freed                                 [Page 26]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+                      beloved <nl><nl>country. <comment> Stupid
+                      quote! </comment> -- the end
+
+            represents the following  formatted  text  (which  will,  no
+            doubt,  look  cryptic  in  the  text-only  version  of  this
+            document):
+
+                 Now is the time for all good men (and <women>)  to
+                 come to the aid of their
+                 beloved
+
+                 country. -- the end
+
+            Richtext conformance:  A minimal richtext implementation  is
+            one  that  simply  converts "<lt>" to "<", converts CRLFs to
+            SPACE, converts <nl> to a newline according to local newline
+            convention,  removes  everything between a <comment> command
+            and the next balancing </comment> command, and  removes  all
+            other  formatting  commands  (all  text  enclosed  in  angle
+            brackets).
+
+            NOTE ON THE RELATIONSHIP OF RICHTEXT TO SGML:   Richtext  is
+            decidedly  not  SGML,  and  must  not  be  used to transport
+            arbitrary SGML  documents.   Those  who  wish  to  use  SGML
+            document  types as a mail transport format must define a new
+            text or application subtype, e.g.,  "text/sgml-dtd-whatever"
+            or   "application/sgml-dtd-whatever",   depending   on   the
+            perceived readability  of  the  DTD  in  use.   Richtext  is
+            designed  to  be  compatible  with SGML, and specifically so
+            that it will be possible to define a richtext DTD if one  is
+            needed.   However,  this  does not imply that arbitrary SGML
+            can be called richtext, nor that richtext implementors  have
+            any  need  to  understand  SGML;  the  description  in  this
+            document is a complete definition of richtext, which is  far
+            simpler than complete SGML.
+
+            NOTE ON THE INTENDED USE OF RICHTEXT:  It is recognized that
+            implementors  of  future  mail  systems  will want rich text
+            functionality  far  beyond  that   currently   defined   for
+            richtext.   The  intent  of  richtext is to provide a common
+            format for expressing that functionality in a form in  which
+            much  of  it, at least, will be understood by interoperating
+            software.  Thus,  in  particular,  software  with  a  richer
+            notion  of  formatted  text  than  richtext  can  still  use
+            richtext as its basic representation, but can extend it with
+            new  formatting  commands and by hiding information specific
+            to that software  system  in  richtext  comments.   As  such
+            systems  evolve,  it  is  expected  that  the  definition of
+            richtext  will  be  further  refined  by  future   published
+            specifications,  but  richtext  as  defined  here provides a
+            platform on which evolutionary refinements can be based.
+
+            IMPLEMENTATION NOTE:  In  some  environments,  it  might  be
+            impossible  to combine certain richtext formatting commands,
+
+
+
+            Borenstein & Freed                                 [Page 27]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            whereas in  others  they  might  be  combined  easily.   For
+            example,  the  combination  of  <bold>  and  <italic>  might
+            produce bold italics on systems that support such fonts, but
+            there  exist  systems that can make text bold or italicized,
+            but not both.  In  such  cases,  the  most  recently  issued
+            recognized formatting command should be preferred.
+
+            One of the major goals in the design of richtext was to make
+            it  so  simple  that  even  text-only mailers will implement
+            richtext-to-plain-text  translators,  thus  increasing   the
+            likelihood  that  multifont  text  will become "safe" to use
+            very widely.  To demonstrate this simplicity,  an  extremely
+            simple  35-line  C program that converts richtext input into
+            plain text output is included in Appendix D.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            Borenstein & Freed                                 [Page 28]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            7.2  The Multipart Content-Type
+
+            In the case of multiple part messages, in which one or  more
+            different  sets  of  data  are  combined in a single body, a
+            "multipart" Content-Type field must appear in  the  entity's
+            header. The body must then contain one or more "body parts,"
+            each preceded by an encapsulation boundary, and the last one
+            followed  by  a  closing boundary.  Each part starts with an
+            encapsulation  boundary,  and  then  contains  a  body  part
+            consisting  of   header area, a blank line, and a body area.
+            Thus a body part is similar to an RFC 822 message in syntax,
+            but different in meaning.
+
+            A body part is NOT to be interpreted as  actually  being  an
+            RFC  822  message.   To  begin  with,  NO  header fields are
+            actually required in body parts.  A body  part  that  starts
+            with  a blank line, therefore, is allowed and is a body part
+            for which all default values are to be assumed.  In  such  a
+            case,  the  absence  of  a Content-Type header field implies
+            that the encapsulation is plain  US-ASCII  text.   The  only
+            header  fields  that have defined meaning for body parts are
+            those the names of which begin with "Content-".   All  other
+            header  fields  are  generally  to be ignored in body parts.
+            Although  they  should  generally  be   retained   in   mail
+            processing,  they may be discarded by gateways if necessary.
+            Such other fields are permitted to appear in body parts  but
+            should  not  be  depended on. "X-" fields may be created for
+            experimental or private purposes, with the recognition  that
+            the information they contain may be lost at some gateways.
+
+            The distinction between an RFC 822 message and a  body  part
+            is  subtle,  but  important.  A gateway between Internet and
+            X.400 mail, for example, must be able to tell the difference
+            between  a  body part that contains an image and a body part
+            that contains an encapsulated message, the body of which  is
+            an  image.   In order to represent the latter, the body part
+            must have "Content-Type: message", and its body  (after  the
+            blank  line)  must be the encapsulated message, with its own
+            "Content-Type: image" header  field.   The  use  of  similar
+            syntax facilitates the conversion of messages to body parts,
+            and vice versa, but the distinction between the two must  be
+            understood  by implementors.  (For the special case in which
+            all parts actually are messages, a "digest" subtype is  also
+            defined.)
+
+            As stated previously, each  body  part  is  preceded  by  an
+            encapsulation boundary.  The encapsulation boundary MUST NOT
+            appear inside any of the encapsulated parts.   Thus,  it  is
+            crucial  that  the  composing  agent  be  able to choose and
+            specify the unique boundary that will separate the parts.
+
+            All present and future subtypes of the "multipart" type must
+            use  an  identical  syntax.  Subtypes  may  differ  in their
+            semantics, and may impose additional restrictions on syntax,
+
+
+
+            Borenstein & Freed                                 [Page 29]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            but  must  conform  to the required syntax for the multipart
+            type.  This requirement ensures  that  all  conformant  user
+            agents  will  at least be able to recognize and separate the
+            parts of any  multipart  entity,  even  of  an  unrecognized
+            subtype.
+
+            As stated in the definition of the Content-Transfer-Encoding
+            field, no encoding other than "7bit", "8bit", or "binary" is
+            permitted for entities of type "multipart".   The  multipart
+            delimiters  and  header fields are always 7-bit ASCII in any
+            case, and data within the body parts can  be  encoded  on  a
+            part-by-part  basis,  with  Content-Transfer-Encoding fields
+            for each appropriate body part.
+
+            Mail gateways, relays, and other mail  handling  agents  are
+            commonly  known  to alter the top-level header of an RFC 822
+            message.   In particular, they frequently  add,  remove,  or
+            reorder  header  fields.   Such  alterations  are explicitly
+            forbidden for the body part headers embedded in  the  bodies
+            of messages of type "multipart."
+
+            7.2.1     Multipart:  The common syntax
+
+            All subtypes of "multipart" share a common  syntax,  defined
+            in  this  section.   A simple example of a multipart message
+            also appears in this section.  An example of a more  complex
+            multipart message is given in Appendix C.
+
+            The Content-Type field for multipart  entities requires  one
+            parameter,   "boundary",   which  is  used  to  specify  the
+            encapsulation  boundary.   The  encapsulation  boundary   is
+            defined   as  a  line  consisting  entirely  of  two  hyphen
+            characters ("-", decimal code 45) followed by  the  boundary
+            parameter value from the Content-Type header field.
+
+            NOTE:  The hyphens are  for  rough  compatibility  with  the
+            earlier  RFC  934  method  of message encapsulation, and for
+            ease   of   searching   for   the   boundaries    in    some
+            implementations.  However, it should be noted that multipart
+            messages  are  NOT  completely  compatible  with   RFC   934
+            encapsulations;  in  particular,  they  do  not obey RFC 934
+            quoting conventions  for  embedded  lines  that  begin  with
+            hyphens.   This  mechanism  was  chosen  over  the  RFC  934
+            mechanism because the latter causes lines to grow with  each
+            level  of  quoting.  The combination of this growth with the
+            fact that SMTP implementations  sometimes  wrap  long  lines
+            made  the  RFC 934 mechanism unsuitable for use in the event
+            that deeply-nested multipart structuring is ever desired.
+
+            Thus, a typical multipart Content-Type  header  field  might
+            look like this:
+
+                 Content-Type: multipart/mixed;
+
+
+
+
+            Borenstein & Freed                                 [Page 30]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+                      boundary=gc0p4Jq0M2Yt08jU534c0p
+
+            This indicates that the entity consists  of  several  parts,
+            each itself with a structure that is syntactically identical
+            to an RFC 822 message, except that the header area might  be
+            completely  empty,  and  that the parts are each preceded by
+            the line
+
+                 --gc0p4Jq0M2Yt08jU534c0p
+
+            Note that the  encapsulation  boundary  must  occur  at  the
+            beginning  of  a line, i.e., following a CRLF, and that that
+            initial CRLF is considered to be part of  the  encapsulation
+            boundary  rather  than  part  of  the preceding part.    The
+            boundary must be followed immediately either by another CRLF
+            and the header fields for the next part, or by two CRLFs, in
+            which case there are no header fields for the next part (and
+            it is therefore assumed to be of Content-Type text/plain).
+
+            NOTE:   The  CRLF  preceding  the  encapsulation   line   is
+            considered  part  of  the boundary so that it is possible to
+            have a part that does not end with  a  CRLF  (line   break).
+            Body  parts that must be considered to end with line breaks,
+            therefore, should have two CRLFs preceding the encapsulation
+            line, the first of which is part of the preceding body part,
+            and the  second  of  which  is  part  of  the  encapsulation
+            boundary.
+
+            The requirement that the encapsulation boundary begins  with
+            a  CRLF  implies  that  the  body of a multipart entity must
+            itself begin with a CRLF before the first encapsulation line
+            --  that  is, if the "preamble" area is not used, the entity
+            headers must be followed by TWO CRLFs.  This is  indeed  how
+            such  entities  should be composed.  A tolerant mail reading
+            program, however, may interpret a  body  of  type  multipart
+            that  begins  with  an encapsulation line NOT initiated by a
+            CRLF  as  also  being  an  encapsulation  boundary,  but   a
+            compliant  mail  sending  program  must  not  generate  such
+            entities.
+
+            Encapsulation  boundaries  must  not   appear   within   the
+            encapsulations,  and  must  be no longer than 70 characters,
+            not counting the two leading hyphens.
+
+            The encapsulation boundary following the last body part is a
+            distinguished  delimiter that indicates that no further body
+            parts will follow.  Such a delimiter  is  identical  to  the
+            previous  delimiters,  with the addition of two more hyphens
+            at the end of the line:
+
+                 --gc0p4Jq0M2Yt08jU534c0p--
+
+            There appears to be room for additional information prior to
+            the  first  encapsulation  boundary  and following the final
+
+
+
+            Borenstein & Freed                                 [Page 31]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            boundary.  These areas should generally be left  blank,  and
+            implementations  should  ignore anything that appears before
+            the first boundary or after the last one.
+
+            NOTE:  These "preamble" and "epilogue" areas  are  not  used
+            because  of the lack of proper typing of these parts and the
+            lack  of  clear  semantics  for  handling  these  areas   at
+            gateways, particularly X.400 gateways.
+
+            NOTE:  Because encapsulation boundaries must not  appear  in
+            the  body  parts  being  encapsulated,  a  user  agent  must
+            exercise care to choose a unique boundary.  The boundary  in
+            the example above could have been the result of an algorithm
+            designed to produce boundaries with a very  low  probability
+            of  already  existing in the data to be encapsulated without
+            having to prescan  the  data.   Alternate  algorithms  might
+            result in more 'readable' boundaries for a recipient with an
+            old user agent, but would  require  more  attention  to  the
+            possibility   that   the   boundary   might  appear  in  the
+            encapsulated  part.   The  simplest  boundary  possible   is
+            something like "---", with a closing boundary of "-----".
+
+            As a very simple example, the  following  multipart  message
+            has  two  parts,  both  of  them  plain  text,  one  of them
+            explicitly typed and one of them implicitly typed:
+
+                 From: Nathaniel Borenstein <nsb@bellcore.com>
+                 To:  Ned Freed <ned@innosoft.com>
+                 Subject: Sample message
+                 MIME-Version: 1.0
+                 Content-type: multipart/mixed; boundary="simple
+                 boundary"
+
+                 This is the preamble.  It is to be ignored, though it
+                 is a handy place for mail composers to include an
+                 explanatory note to non-MIME compliant readers.
+                 --simple boundary
+
+                 This is implicitly typed plain ASCII text.
+                 It does NOT end with a linebreak.
+                 --simple boundary
+                 Content-type: text/plain; charset=us-ascii
+
+                 This is explicitly typed plain ASCII text.
+                 It DOES end with a linebreak.
+
+                 --simple boundary--
+                 This is the epilogue.  It is also to be ignored.
+
+            The use of a Content-Type of multipart in a body part within
+            another  multipart  entity  is explicitly allowed.   In such
+            cases, for obvious reasons, care must  be  taken  to  ensure
+            that  each  nested  multipart  entity  must  use a different
+            boundary delimiter. See Appendix C for an example of  nested
+
+
+
+            Borenstein & Freed                                 [Page 32]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            multipart entities.
+
+            The use of the multipart Content-Type  with  only  a  single
+            body  part  may  be  useful  in  certain  contexts,  and  is
+            explicitly permitted.
+
+            The only mandatory parameter for the multipart  Content-Type
+            is  the  boundary  parameter,  which  consists  of  1  to 70
+            characters from a set of characters known to be very  robust
+            through  email  gateways,  and  NOT ending with white space.
+            (If a boundary appears to end with white  space,  the  white
+            space  must be presumed to have been added by a gateway, and
+            should  be  deleted.)   It  is  formally  specified  by  the
+            following BNF:
+
+            boundary := 0*69<bchars> bcharsnospace
+
+            bchars := bcharsnospace / " "
+
+            bcharsnospace :=    DIGIT / ALPHA / "'" / "(" / ")" / "+"  /
+            "_"
+                           / "," / "-" / "." / "/" / ":" / "=" / "?"
+
+            Overall, the body of a multipart entity may be specified  as
+            follows:
+
+            multipart-body := preamble 1*encapsulation
+                           close-delimiter epilogue
+
+            encapsulation := delimiter CRLF body-part
+
+            delimiter := CRLF "--" boundary   ; taken from  Content-Type
+            field.
+                                           ;   when   content-type    is
+            multipart
+                                         ; There must be no space
+                                         ; between "--" and boundary.
+
+            close-delimiter := delimiter "--" ; Again, no  space  before
+            "--"
+
+            preamble :=  *text                  ;  to  be  ignored  upon
+            receipt.
+
+            epilogue :=  *text                  ;  to  be  ignored  upon
+            receipt.
+
+            body-part = <"message" as defined in RFC 822,
+                     with all header fields optional, and with the
+                     specified delimiter not occurring anywhere in
+                     the message body, either on a line by itself
+                     or as a substring anywhere.  Note that the
+
+
+
+
+
+            Borenstein & Freed                                 [Page 33]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+                     semantics of a part differ from the semantics
+                     of a message, as described in the text.>
+
+            NOTE:  Conspicuously missing from the multipart  type  is  a
+            notion  of  structured,  related body parts.  In general, it
+            seems premature to try to  standardize  interpart  structure
+            yet.  It is recommended that those wishing to provide a more
+            structured or integrated multipart messaging facility should
+            define   a   subtype  of  multipart  that  is  syntactically
+            identical, but  that  always  expects  the  inclusion  of  a
+            distinguished part that can be used to specify the structure
+            and integration of the other parts,  probably  referring  to
+            them  by  their Content-ID field.  If this approach is used,
+            other implementations will not recognize  the  new  subtype,
+            but  will  treat it as the primary subtype (multipart/mixed)
+            and will thus be able to show the user the  parts  that  are
+            recognized.
+
+            7.2.2     The Multipart/mixed (primary) subtype
+
+            The primary subtype for multipart, "mixed", is intended  for
+            use  when  the body parts are independent and intended to be
+            displayed  serially.   Any  multipart   subtypes   that   an
+            implementation does not recognize should be treated as being
+            of subtype "mixed".
+
+            7.2.3     The Multipart/alternative subtype
+
+            The multipart/alternative type is syntactically identical to
+            multipart/mixed,   but  the  semantics  are  different.   In
+            particular, each of the parts is an "alternative" version of
+            the same information.  User agents should recognize that the
+            content of the various parts are interchangeable.  The  user
+            agent  should  either  choose  the  "best" type based on the
+            user's environment and preferences, or offer  the  user  the
+            available  alternatives.  In general, choosing the best type
+            means displaying only the LAST part that can  be  displayed.
+            This  may be used, for example, to send mail in a fancy text
+            format in such  a  way  that  it  can  easily  be  displayed
+            anywhere:
+
+            From:  Nathaniel Borenstein <nsb@bellcore.com>
+            To: Ned Freed <ned@innosoft.com>
+            Subject: Formatted text mail
+            MIME-Version: 1.0
+            Content-Type: multipart/alternative; boundary=boundary42
+
+
+            --boundary42
+            Content-Type: text/plain; charset=us-ascii
+
+            ...plain text version of message goes here....
+
+
+
+
+
+            Borenstein & Freed                                 [Page 34]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            --boundary42
+            Content-Type: text/richtext
+
+            .... richtext version of same message goes here ...
+            --boundary42
+            Content-Type: text/x-whatever
+
+            .... fanciest formatted version of same  message  goes  here
+            ...
+            --boundary42--
+
+            In this example, users  whose  mail  system  understood  the
+            "text/x-whatever"  format  would see only the fancy version,
+            while other users would see only the richtext or plain  text
+            version, depending on the capabilities of their system.
+
+            In general, user agents that  compose  multipart/alternative
+            entities  should place the body parts in increasing order of
+            preference, that is, with the  preferred  format  last.  For
+            fancy  text,  the sending user agent should put the plainest
+            format first and the richest format  last.   Receiving  user
+            agents  should  pick  and  display  the last format they are
+            capable of  displaying.   In  the  case  where  one  of  the
+            alternatives  is  itself  of  type  "multipart" and contains
+            unrecognized sub-parts, the user agent may choose either  to
+            show that alternative, an earlier alternative, or both.
+
+            NOTE:  From an implementor's perspective, it might seem more
+            sensible  to  reverse  this  ordering, and have the plainest
+            alternative last.  However, placing the plainest alternative
+            first    is    the    friendliest   possible   option   when
+            mutlipart/alternative entities are viewed using a  non-MIME-
+            compliant mail reader.  While this approach does impose some
+            burden on  compliant  mail  readers,  interoperability  with
+            older  mail  readers was deemed to be more important in this
+            case.
+
+            It may be the case  that  some  user  agents,  if  they  can
+            recognize more than one of the formats, will prefer to offer
+            the user the choice of which format  to  view.   This  makes
+            sense, for example, if mail includes both a nicely-formatted
+            image version and an easily-edited text  version.   What  is
+            most  critical,  however, is that the user not automatically
+            be shown multiple versions of the  same  data.   Either  the
+            user  should  be shown the last recognized version or should
+            explicitly be given the choice.
+
+
+
+
+
+
+
+
+
+
+
+            Borenstein & Freed                                 [Page 35]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            7.2.4     The Multipart/digest subtype
+
+            This document defines a "digest" subtype  of  the  multipart
+            Content-Type.   This  type  is  syntactically  identical  to
+            multipart/mixed,  but  the  semantics  are  different.    In
+            particular,  in a digest, the default Content-Type value for
+            a   body   part   is   changed    from    "text/plain"    to
+            "message/rfc822".   This  is  done  to allow a more readable
+            digest format that is largely  compatible  (except  for  the
+            quoting convention) with RFC 934.
+
+            A digest in this format might,  then,  look  something  like
+            this:
+
+            From: Moderator-Address
+            MIME-Version: 1.0
+            Subject:  Internet Digest, volume 42
+            Content-Type: multipart/digest;
+                 boundary="---- next message ----"
+
+
+            ------ next message ----
+
+            From: someone-else
+            Subject: my opinion
+
+            ...body goes here ...
+
+            ------ next message ----
+
+            From: someone-else-again
+            Subject: my different opinion
+
+            ... another body goes here...
+
+            ------ next message ------
+
+            7.2.5     The Multipart/parallel subtype
+
+            This document defines a "parallel" subtype of the  multipart
+            Content-Type.   This  type  is  syntactically  identical  to
+            multipart/mixed,  but  the  semantics  are  different.    In
+            particular,  in  a  parallel  entity,  all  of the parts are
+            intended to be presented in parallel, i.e.,  simultaneously,
+            on  hardware  and  software  that  are  capable of doing so.
+            Composing agents should be aware that many mail readers will
+            lack this capability and will show the parts serially in any
+            event.
+
+
+
+
+
+
+
+
+
+            Borenstein & Freed                                 [Page 36]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            7.3  The Message Content-Type
+
+            It is frequently desirable, in sending mail, to  encapsulate
+            another  mail  message. For this common operation, a special
+            Content-Type, "message", is defined.  The  primary  subtype,
+            message/rfc822,  has  no required parameters in the Content-
+            Type field.  Additional subtypes, "partial"  and  "External-
+            body",  do  have  required  parameters.   These subtypes are
+            explained below.
+
+            NOTE:  It has been suggested that subtypes of message  might
+            be  defined  for  forwarded  or rejected messages.  However,
+            forwarded and rejected messages can be handled as  multipart
+            messages  in  which  the  first part contains any control or
+            descriptive  information,  and  a  second  part,   of   type
+            message/rfc822,   is  the  forwarded  or  rejected  message.
+            Composing rejection and forwarding messages in  this  manner
+            will  preserve  the type information on the original message
+            and allow it to be correctly presented to the recipient, and
+            hence is strongly encouraged.
+
+            As stated in the definition of the Content-Transfer-Encoding
+            field, no encoding other than "7bit", "8bit", or "binary" is
+            permitted for messages  or  parts  of  type  "message".  The
+            message  header  fields are always US-ASCII in any case, and
+            data within the body can still be encoded, in which case the
+            Content-Transfer-Encoding  header  field in the encapsulated
+            message will reflect this.  Non-ASCII text in the headers of
+            an   encapsulated   message   can  be  specified  using  the
+            mechanisms described in [RFC-1342].
+
+            Mail gateways, relays, and other mail  handling  agents  are
+            commonly  known  to alter the top-level header of an RFC 822
+            message.   In particular, they frequently  add,  remove,  or
+            reorder  header  fields.   Such  alterations  are explicitly
+            forbidden for  the  encapsulated  headers  embedded  in  the
+            bodies of messages of type "message."
+
+            7.3.1     The Message/rfc822 (primary) subtype
+
+            A Content-Type of "message/rfc822" indicates that  the  body
+            contains  an encapsulated message, with the syntax of an RFC
+            822 message.
+
+            7.3.2     The Message/Partial subtype
+
+            A subtype of message, "partial",  is  defined  in  order  to
+            allow  large  objects  to  be  delivered as several separate
+            pieces  of  mail  and  automatically  reassembled   by   the
+            receiving  user  agent.   (The  concept  is  similar  to  IP
+            fragmentation/reassembly in the basic  Internet  Protocols.)
+            This  mechanism  can  be  used  when  intermediate transport
+            agents limit the size of individual  messages  that  can  be
+            sent.   Content-Type  "message/partial"  thus indicates that
+
+
+
+            Borenstein & Freed                                 [Page 37]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            the body contains a fragment of a larger message.
+
+            Three parameters must be specified in the Content-Type field
+            of  type  message/partial:  The  first,  "id",  is  a unique
+            identifier,  as  close  to  a  world-unique  identifier   as
+            possible,  to  be  used  to  match  the parts together.  (In
+            general, the identifier  is  essentially  a  message-id;  if
+            placed  in  double  quotes,  it  can  be  any message-id, in
+            accordance with the BNF for  "parameter"  given  earlier  in
+            this  specification.)   The second, "number", an integer, is
+            the part number, which indicates where this part  fits  into
+            the  sequence  of  fragments.   The  third, "total", another
+            integer, is the total number of parts. This  third  subfield
+            is  required  on  the  final  part,  and  is optional on the
+            earlier parts. Note also that these parameters may be  given
+            in any order.
+
+            Thus, part 2 of a 3-part message  may  have  either  of  the
+            following header fields:
+
+                 Content-Type: Message/Partial;
+                      number=2; total=3;
+                      id="oc=jpbe0M2Yt4s@thumper.bellcore.com";
+
+                 Content-Type: Message/Partial;
+                      id="oc=jpbe0M2Yt4s@thumper.bellcore.com";
+                      number=2
+
+            But part 3 MUST specify the total number of parts:
+
+                 Content-Type: Message/Partial;
+                      number=3; total=3;
+                      id="oc=jpbe0M2Yt4s@thumper.bellcore.com";
+
+            Note that part numbering begins with 1, not 0.
+
+            When the parts of a message broken up in this manner are put
+            together,  the  result is a complete RFC 822 format message,
+            which may have its own Content-Type header field,  and  thus
+            may contain any other data type.
+
+            Message fragmentation and reassembly:  The  semantics  of  a
+            reassembled  partial  message  must  be those of the "inner"
+            message, rather than  of  a  message  containing  the  inner
+            message.   This  makes  it  possible, for example, to send a
+            large audio message as several partial messages,  and  still
+            have  it  appear  to the recipient as a simple audio message
+            rather than as an encapsulated message containing  an  audio
+            message.   That  is,  the  encapsulation  of  the message is
+            considered to be "transparent".
+
+            When  generating   and   reassembling   the   parts   of   a
+            message/partial  message,  the  headers  of the encapsulated
+            message must be merged with the  headers  of  the  enclosing
+
+
+
+            Borenstein & Freed                                 [Page 38]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            entities.  In  this  process  the  following  rules  must be
+            observed:
+
+                 (1) All of the headers from the initial  enclosing
+                 entity  (part  one),  except those that start with
+                 "Content-" and "Message-ID", must  be  copied,  in
+                 order, to the new message.
+
+                 (2) Only those headers  in  the  enclosed  message
+                 which  start with "Content-" and "Message-ID" must
+                 be appended, in order, to the headers of  the  new
+                 message.   Any  headers  in  the  enclosed message
+                 which do not start  with  "Content-"  (except  for
+                 "Message-ID") will be ignored.
+
+                 (3) All of the headers from  the  second  and  any
+                 subsequent messages will be ignored.
+
+            For example, if an audio message is broken into  two  parts,
+            the first part might look something like this:
+
+                 X-Weird-Header-1: Foo
+                 From: Bill@host.com
+                 To: joe@otherhost.com
+                 Subject: Audio mail
+                 Message-ID: id1@host.com
+                 MIME-Version: 1.0
+                 Content-type: message/partial;
+                      id="ABC@host.com";
+                      number=1; total=2
+
+                 X-Weird-Header-1: Bar
+                 X-Weird-Header-2: Hello
+                 Message-ID: anotherid@foo.com
+                 Content-type: audio/basic
+                 Content-transfer-encoding: base64
+
+                 ... first half of encoded audio data goes here...
+
+            and the second half might look something like this:
+
+                 From: Bill@host.com
+                 To: joe@otherhost.com
+                 Subject: Audio mail
+                 MIME-Version: 1.0
+                 Message-ID: id2@host.com
+                 Content-type: message/partial;
+                      id="ABC@host.com"; number=2; total=2
+
+                 ... second half of encoded audio data goes here...
+
+            Then,  when  the  fragmented  message  is  reassembled,  the
+            resulting  message  to  be displayed to the user should look
+            something like this:
+
+
+
+            Borenstein & Freed                                 [Page 39]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+                 X-Weird-Header-1: Foo
+                 From: Bill@host.com
+                 To: joe@otherhost.com
+                 Subject: Audio mail
+                 Message-ID: anotherid@foo.com
+                 MIME-Version: 1.0
+                 Content-type: audio/basic
+                 Content-transfer-encoding: base64
+
+                 ... first half of encoded audio data goes here...
+                 ... second half of encoded audio data goes here...
+
+            It should be  noted  that,  because  some  message  transfer
+            agents  may choose to automatically fragment large messages,
+            and because such  agents  may  use  different  fragmentation
+            thresholds,  it  is  possible  that  the pieces of a partial
+            message, upon reassembly, may prove themselves to comprise a
+            partial message.  This is explicitly permitted.
+
+            It should also be noted that the inclusion of a "References"
+            field  in the headers of the second and subsequent pieces of
+            a fragmented message that references the Message-Id  on  the
+            previous  piece  may  be  of  benefit  to  mail readers that
+            understand and track references. However, the generation  of
+            such "References" fields is entirely optional.
+
+            7.3.3     The Message/External-Body subtype
+
+            The external-body subtype indicates  that  the  actual  body
+            data are not included, but merely referenced.  In this case,
+            the  parameters  describe  a  mechanism  for  accessing  the
+            external data.
+
+            When  a   message   body   or   body   part   is   of   type
+            "message/external-body",   it  consists  of  a  header,  two
+            consecutive  CRLFs,  and  the   message   header   for   the
+            encapsulated  message.  If another pair of consecutive CRLFs
+            appears, this of course ends  the  message  header  for  the
+            encapsulated   message.   However,  since  the  encapsulated
+            message's body is itself external, it does NOT appear in the
+            area  that  follows.   For  example,  consider the following
+            message:
+
+                 Content-type: message/external-body; access-
+                 type=local-file;
+                      name=/u/nsb/Me.gif
+
+                 Content-type:  image/gif
+
+                 THIS IS NOT REALLY THE BODY!
+
+            The area at the end, which  might  be  called  the  "phantom
+            body", is ignored for most external-body messages.  However,
+            it may be used to contain auxilliary  information  for  some
+
+
+
+            Borenstein & Freed                                 [Page 40]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            such  messages,  as  indeed  it  is  when the access-type is
+            "mail-server".   Of  the  access-types   defined   by   this
+            document, the phantom body is used only when the access-type
+            is "mail-server".  In all other cases, the phantom  body  is
+            ignored.
+
+            The only always-mandatory  parameter  for  message/external-
+            body  is  "access-type";  all of the other parameters may be
+            mandatory or optional depending on the value of access-type.
+
+                 ACCESS-TYPE -- One or more case-insensitive words,
+                 comma-separated,   indicating   supported   access
+                 mechanisms by  which  the  file  or  data  may  be
+                 obtained.  Values include, but are not limited to,
+                 "FTP", "ANON-FTP",  "TFTP",  "AFS",  "LOCAL-FILE",
+                 and   "MAIL-SERVER".  Future  values,  except  for
+                 experimental values beginning with "X-",  must  be
+                 registered with IANA, as described in Appendix F .
+
+            In addition, the following two parameters are  optional  for
+            ALL access-types:
+
+                 EXPIRATION -- The date (in the RFC 822 "date-time"
+                 syntax, as extended by RFC 1123 to permit 4 digits
+                 in the date field) after which  the  existence  of
+                 the external data is not guaranteed.
+
+                 SIZE -- The size (in octets)  of  the  data.   The
+                 intent  of this parameter is to help the recipient
+                 decide whether or  not  to  expend  the  necessary
+                 resources to retrieve the external data.
+
+                 PERMISSION -- A field that  indicates  whether  or
+                 not it is expected that clients might also attempt
+                 to  overwrite  the  data.   By  default,   or   if
+                 permission  is "read", the assumption is that they
+                 are not, and that if the data is  retrieved  once,
+                 it  is never needed again. If PERMISSION is "read-
+                 write", this assumption is invalid, and any  local
+                 copy  must  be  considered  no  more than a cache.
+                 "Read"  and  "Read-write"  are  the  only  defined
+                 values of permission.
+
+            The precise semantics of the access-types defined  here  are
+            described in the sections that follow.
+
+            7.3.3.1  The "ftp" and "tftp" access-types
+
+            An access-type of FTP or TFTP  indicates  that  the  message
+            body is accessible as a file using the FTP [RFC-959] or TFTP
+            [RFC-783] protocols, respectively.  For these  access-types,
+            the following additional parameters are mandatory:
+
+
+
+
+
+            Borenstein & Freed                                 [Page 41]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+                 NAME -- The name of the  file  that  contains  the
+                 actual body data.
+
+                 SITE -- A machine  from  which  the  file  may  be
+                 obtained, using the given protocol
+
+            Before the data is retrieved,  using  these  protocols,  the
+            user  will  generally need to be asked to provide a login id
+            and a password for the machine named by the site parameter.
+
+            In addition, the  following  optional  parameters  may  also
+            appear when the access-type is FTP or ANON-FTP:
+
+                 DIRECTORY -- A directory from which the data named
+                 by NAME should be retrieved.
+
+                 MODE  --  A  transfer  mode  for  retrieving   the
+                 information, e.g. "image".
+
+            7.3.3.2  The "anon-ftp" access-type
+
+            The "anon-ftp" access-type is identical to the "ftp"  access
+            type,  except  that  the user need not be asked to provide a
+            name and password for the specified site.  Instead, the  ftp
+            protocol  will be used with login "anonymous" and a password
+            that corresponds to the user's email address.
+
+            7.3.3.3  The "local-file" and "afs" access-types
+
+            An access-type of "local-file"  indicates  that  the  actual
+            body  is  accessible  as  a  file  on the local machine.  An
+            access-type of "afs" indicates that the file  is  accessible
+            via  the  global  AFS  file  system.   In both cases, only a
+            single parameter is required:
+
+                 NAME -- The name of the  file  that  contains  the
+                 actual body data.
+
+            The following optional parameter may be used to describe the
+            locality  of  reference  for  the data, that is, the site or
+            sites at which the file is expected to be visible:
+
+                 SITE -- A domain specifier for a machine or set of
+                 machines that are known to have access to the data
+                 file.  Asterisks may be used for wildcard matching
+                 to   a   part   of   a   domain   name,   such  as
+                 "*.bellcore.com", to indicate a set of machines on
+                 which the data should be directly visible, while a
+                 single asterisk may be used  to  indicate  a  file
+                 that  is  expected  to  be  universally available,
+                 e.g., via a global file system.
+
+            7.3.3.4  The "mail-server" access-type
+
+
+
+
+            Borenstein & Freed                                 [Page 42]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            The "mail-server" access-type indicates that the actual body
+            is  available  from  a mail server.  The mandatory parameter
+            for this access-type is:
+
+                 SERVER -- The email address  of  the  mail  server
+                 from which the actual body data can be obtained.
+
+            Because mail servers accept a variety  of  syntax,  some  of
+            which  is  multiline,  the full command to be sent to a mail
+            server is not included as a parameter  on  the  content-type
+            line.   Instead,  it  may  be provided as the "phantom body"
+            when  the  content-type  is  message/external-body  and  the
+            access-type is mail-server.
+
+            Note that  MIME  does  not  define  a  mail  server  syntax.
+            Rather,  it  allows  the  inclusion of arbitrary mail server
+            commands  in  the  phantom  body.   Implementations   should
+            include the phantom body in the body of the message it sends
+            to the mail server address to retrieve the relevant data.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            Borenstein & Freed                                 [Page 43]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            7.3.3.5  Examples and Further Explanations
+
+            With  the  emerging  possibility  of  very  wide-area   file
+            systems,  it becomes very hard to know in advance the set of
+            machines where a  file  will  and  will  not  be  accessible
+            directly  from the file system.  Therefore it may make sense
+            to provide both a file name, to be tried directly,  and  the
+            name of one or more sites from which the file is known to be
+            accessible.  An implementation can try  to  retrieve  remote
+            files  using FTP or any other protocol, using anonymous file
+            retrieval or prompting the user for the necessary  name  and
+            password.   If  an  external body is accessible via multiple
+            mechanisms, the sender may include multiple  parts  of  type
+            message/external-body    within    an    entity    of   type
+            multipart/alternative.
+
+            However, the external-body mechanism is not intended  to  be
+            limited  to  file  retrieval,  as  shown  by the mail-server
+            access-type.  Beyond this, one  can  imagine,  for  example,
+            using a video server for external references to video clips.
+
+            If an entity is of type  "message/external-body",  then  the
+            body  of  the  entity  will contain the header fields of the
+            encapsulated message.  The body itself is to be found in the
+            external  location.   This  means  that  if  the body of the
+            "message/external-body"  message  contains  two  consecutive
+            CRLFs,  everything  after  those  pairs  is  NOT part of the
+            message itself.  For  most  message/external-body  messages,
+            this trailing area must simply be ignored.  However, it is a
+            convenient place for additional data that cannot be included
+            in  the  content-type  header field.   In particular, if the
+            "access-type" value is "mail-server", then the trailing area
+            must  contain  commands to be sent to the mail server at the
+            address given by NAME@SITE, where  NAME  and  SITE  are  the
+            values of the NAME and SITE parameters, respectively.
+
+            The embedded message header fields which appear in the  body
+            of the message/external-body data can be used to declare the
+            Content-type  of  the  external  body.   Thus   a   complete
+            message/external-body  message,  referring  to a document in
+            PostScript format, might look like this:
+
+                 From: Whomever
+                 Subject: whatever
+                 MIME-Version: 1.0
+                 Message-ID: id1@host.com
+                 Content-Type: multipart/alternative; boundary=42
+
+
+                 --42
+                 Content-Type: message/external-body;
+                      name="BodyFormats.ps";
+
+
+
+
+
+            Borenstein & Freed                                 [Page 44]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+                      site="thumper.bellcore.com";
+                      access-type=ANON-FTP;
+                      directory="pub";
+                      mode="image";
+                      expiration="Fri, 14 Jun 1991 19:13:14 -0400 (EDT)"
+
+                 Content-type: application/postscript
+
+                 --42
+                 Content-Type: message/external-body;
+                      name="/u/nsb/writing/rfcs/RFC-XXXX.ps";
+                      site="thumper.bellcore.com";
+                      access-type=AFS
+                      expiration="Fri, 14 Jun 1991 19:13:14 -0400 (EDT)"
+
+                 Content-type: application/postscript
+
+                 --42
+                 Content-Type: message/external-body;
+                      access-type=mail-server
+                      server="listserv@bogus.bitnet";
+                      expiration="Fri, 14 Jun 1991 19:13:14 -0400 (EDT)"
+
+                 Content-type: application/postscript
+
+                 get rfc-xxxx doc
+
+                 --42--
+
+            Like the  message/partial  type,  the  message/external-body
+            type  is  intended to be transparent, that is, to convey the
+            data type in the external  body  rather  than  to  convey  a
+            message  with  a body of that type.  Thus the headers on the
+            outer and inner parts must be merged using the same rules as
+            for  message/partial.   In  particular,  this means that the
+            Content-type header is overridden, but the From and  Subject
+            headers are preserved.
+
+            Note that since the external bodies are not  transported  as
+            mail,  they  need  not  conform to the 7-bit and line length
+            requirements, but might in fact be  binary  files.   Thus  a
+            Content-Transfer-Encoding is not generally necessary, though
+            it is permitted.
+
+            Note that the body of a message of  type  "message/external-
+            body"  is  governed  by  the  basic  syntax  for  an RFC 822
+            message.   In  particular,   anything   before   the   first
+            consecutive  pair  of  CRLFs  is  header  information, while
+            anything after it is body information, which is ignored  for
+            most access-types.
+
+
+
+
+
+
+
+            Borenstein & Freed                                 [Page 45]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            7.4  The Application Content-Type
+
+            The "application" Content-Type is to be used for data  which
+            do  not fit in any of the other categories, and particularly
+            for data to be processed by mail-based uses  of  application
+            programs.  This is information which must be processed by an
+            application before it is  viewable  or  usable  to  a  user.
+            Expected  uses  for  Content-Type  application include mail-
+            based  file  transfer,  spreadsheets,  data  for  mail-based
+            scheduling    systems,    and    languages    for   "active"
+            (computational) email.  (The latter, in particular, can pose
+            security    problems   which   should   be   understood   by
+            implementors, and are considered in detail in the discussion
+            of the application/PostScript content-type.)
+
+            For example, a meeting scheduler  might  define  a  standard
+            representation for information about proposed meeting dates.
+            An intelligent user agent  would  use  this  information  to
+            conduct  a dialog with the user, and might then send further
+            mail based on that dialog. More generally, there  have  been
+            several  "active"  messaging  languages  developed  in which
+            programs in a suitably specialized language are sent through
+            the   mail   and   automatically   run  in  the  recipient's
+            environment.
+
+            Such  applications  may  be  defined  as  subtypes  of   the
+            "application"  Content-Type.   This  document  defines three
+            subtypes: octet-stream, ODA, and PostScript.
+
+            In general, the subtype of application  will  often  be  the
+            name  of  the  application  for which the data are intended.
+            This does not mean, however, that  any  application  program
+            name  may  be used freely as a subtype of application.  Such
+            usages  must  be  registered  with  IANA,  as  described  in
+            Appendix F.
+
+            7.4.1     The Application/Octet-Stream (primary) subtype
+
+            The primary subtype of application, "octet-stream",  may  be
+            used  to indicate that a body contains binary data.  The set
+            of possible parameters includes, but is not limited to:
+
+                 NAME -- a suggested name for the  binary  data  if
+                 stored as a file.
+
+                 TYPE -- the general type  or  category  of  binary
+                 data.   This  is  intended  as information for the
+                 human recipient  rather  than  for  any  automatic
+                 processing.
+
+                 CONVERSIONS -- the set  of  operations  that  have
+                 been  performed  on  the data before putting it in
+                 the mail (and before any Content-Transfer-Encoding
+                 that   might   have  been  applied).  If  multiple
+
+
+
+            Borenstein & Freed                                 [Page 46]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+                 conversions have occurred, they must be  separated
+                 by  commas  and  specified  in the order they were
+                 applied -- that is, the leftmost conversion   must
+                 have  occurred  first,  and conversions are undone
+                 from right  to  left.   Note  that  NO  conversion
+                 values   are   defined   by  this  document.   Any
+                 conversion values that that do not begin with "X-"
+                 must  be preceded by a published specification and
+                 by  registration  with  IANA,  as   described   in
+                 Appendix F.
+
+                 PADDING -- the number of bits of padding that were
+                 appended  to  the  bitstream comprising the actual
+                 contents to  produce  the  enclosed  byte-oriented
+                 data.  This is useful for enclosing a bitstream in
+                 a body when the total number  of  bits  is  not  a
+                 multiple of the byte size.
+
+            The values  for  these  attributes  are  left  undefined  at
+            present,  but  may  require specification in the future.  An
+            example of a common (though UNIX-specific) usage might be:
+
+                 Content-Type:  application/octet-stream;
+                      name=foo.tar.Z; type=tar;
+                      conversions="x-encrypt,x-compress"
+
+            However, it should be noted that the use of such conversions
+            is  explicitly  discouraged due to a lack of portability and
+            standardization.   The  use  of  uuencode  is   particularly
+            discouraged,   in  favor  of  the  Content-Transfer-Encoding
+            mechanism, which is both more standardized and more portable
+            across mail boundaries.
+
+            The recommended action for an implementation  that  receives
+            application/octet-stream  mail is to simply offer to put the
+            data in a file, with any  Content-Transfer-Encoding  undone,
+            or perhaps to use it as input to a user-specified process.
+
+            To reduce the danger of transmitting rogue programs  through
+            the  mail,  it  is strongly recommended that implementations
+            NOT implement a path-search mechanism whereby  an  arbitrary
+            program  named  in  the  Content-Type  parameter  (e.g.,  an
+            "interpreter=" parameter) is found and  executed  using  the
+            mail body as input.
+
+            7.4.2     The Application/PostScript subtype
+
+            A  Content-Type  of  "application/postscript"  indicates   a
+            PostScript    program.    The   language   is   defined   in
+            [POSTSCRIPT].  It is recommended  that  Postscript  as  sent
+            through  email  should  use  Postscript document structuring
+            conventions if at all possible, and correctly.
+
+
+
+
+
+            Borenstein & Freed                                 [Page 47]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            The execution  of  general-purpose  PostScript  interpreters
+            entails   serious   security  risks,  and  implementors  are
+            discouraged from simply sending PostScript email  bodies  to
+            "off-the-shelf"  interpreters.   While it is usually safe to
+            send PostScript to a printer, where the potential  for  harm
+            is  greatly constrained, implementors should consider all of
+            the  following  before  they  add  interactive  display   of
+            PostScript bodies to their mail readers.
+
+            The remainder of this section outlines some, though probably
+            not  all,  of  the possible problems with sending PostScript
+            through the mail.
+
+            Dangerous operations in the PostScript language include, but
+            may  not be limited to, the PostScript operators deletefile,
+            renamefile,  filenameforall,  and  file.    File   is   only
+            dangerous  when  applied  to  something  other than standard
+            input or output. Implementations may also define  additional
+            nonstandard  file operators; these may also pose a threat to
+            security.     Filenameforall,  the  wildcard   file   search
+            operator,  may  appear at first glance to be harmless. Note,
+            however, that this operator  has  the  potential  to  reveal
+            information  about  what  files the recipient has access to,
+            and this  information  may  itself  be  sensitive.   Message
+            senders  should  avoid the use of potentially dangerous file
+            operators, since these operators  are  quite  likely  to  be
+            unavailable  in secure PostScript implementations.  Message-
+            receiving and -displaying software should either  completely
+            disable  all  potentially  dangerous  file operators or take
+            special care not to delegate any special authority to  their
+            operation. These operators should be viewed as being done by
+            an outside agency when  interpreting  PostScript  documents.
+            Such  disabling  and/or  checking  should be done completely
+            outside of the reach of the PostScript language itself; care
+            should  be  taken  to  insure  that  no  method  exists  for
+            reenabling full-function versions of these operators.
+
+            The PostScript language provides facilities for exiting  the
+            normal  interpreter,  or  server, loop. Changes made in this
+            "outer"  environment   are   customarily   retained   across
+            documents, and may in some cases be retained semipermanently
+            in nonvolatile memory. The operators associated with exiting
+            the  interpreter  loop  have the potential to interfere with
+            subsequent document processing. As such, their  unrestrained
+            use  constitutes  a  threat  of  service denial.  PostScript
+            operators that exit the interpreter loop  include,  but  may
+            not  be  limited  to, the exitserver and startjob operators.
+            Message-sending software should not generate PostScript that
+            depends  on  exiting  the  interpreter  loop to operate. The
+            ability to exit  will  probably  be  unavailable  in  secure
+            PostScript     implementations.     Message-receiving    and
+            -displaying  software  should,  if  possible,  disable   the
+            ability   to   make   retained  changes  to  the  PostScript
+            environment. Eliminate the startjob and exitserver commands.
+
+
+
+            Borenstein & Freed                                 [Page 48]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            If  these  commands  cannot  be eliminated, at least set the
+            password associated with them to a hard-to-guess value.
+
+            PostScript provides operators for  setting  system-wide  and
+            device-specific  parameters. These parameter settings may be
+            retained across jobs and may potentially pose  a  threat  to
+            the  correct  operation  of the interpreter.  The PostScript
+            operators that set system and device parameters include, but
+            may  not be limited to, the setsystemparams and setdevparams
+            operators.  Message-sending  software  should  not  generate
+            PostScript  that  depends on the setting of system or device
+            parameters to operate correctly. The ability  to  set  these
+            parameters will probably be unavailable in secure PostScript
+            implementations. Message-receiving and -displaying  software
+            should,  if  possible,  disable the ability to change system
+            and  device  parameters.  If  these  operators   cannot   be
+            disabled,  at least set the password associated with them to
+            a hard-to-guess value.
+
+            Some   PostScript   implementations   provide    nonstandard
+            facilities  for  the direct loading and execution of machine
+            code.  Such  facilities  are  quite    obviously   open   to
+            substantial  abuse.    Message-sending  software  should not
+            make use of such features. Besides being  totally  hardware-
+            specific,  they  are also likely to be unavailable in secure
+            implementations  of  PostScript.     Message-receiving   and
+            -displaying  software  should not allow such operators to be
+            used if they exist.
+
+            PostScript is an extensible language, and many, if not most,
+            implementations   of  it  provide  a  number  of  their  own
+            extensions. This document does not deal with such extensions
+            explicitly   since   they   constitute  an  unknown  factor.
+            Message-sending software should not make use of  nonstandard
+            extensions;   they  are  likely  to  be  missing  from  some
+            implementations. Message-receiving and -displaying  software
+            should  make  sure that any nonstandard PostScript operators
+            are secure and don't present any kind of threat.
+
+            It is  possible  to  write  PostScript  that  consumes  huge
+            amounts  of various system resources. It is also possible to
+            write PostScript programs that loop infinitely.  Both  types
+            of  programs  have  the potential to cause damage if sent to
+            unsuspecting recipients.   Message-sending  software  should
+            avoid  the  construction and dissemination of such programs,
+            which  is  antisocial.   Message-receiving  and  -displaying
+            software  should  provide  appropriate  mechanisms  to abort
+            processing of a document after a reasonable amount  of  time
+            has  elapsed. In addition, PostScript interpreters should be
+            limited to the consumption of only a  reasonable  amount  of
+            any given system resource.
+
+            Finally, bugs may  exist  in  some  PostScript  interpreters
+            which  could  possibly  be  exploited  to  gain unauthorized
+
+
+
+            Borenstein & Freed                                 [Page 49]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            access to a  recipient's  system.  Apart  from  noting  this
+            possibility,  there is no specific action to take to prevent
+            this, apart from the timely correction of such bugs  if  any
+            are found.
+
+            7.4.3     The Application/ODA subtype
+
+            The "ODA" subtype of application is used to indicate that  a
+            body  contains  information  encoded according to the Office
+            Document  Architecture  [ODA]   standards,  using  the  ODIF
+            representation  format.   For  application/oda, the Content-
+            Type line should also specify an attribute/value  pair  that
+            indicates  the document application profile (DAP), using the
+            key word "profile".  Thus an appropriate header field  might
+            look like this:
+
+            Content-Type:  application/oda; profile=Q112
+
+            Consult the ODA standard [ODA] for further information.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            Borenstein & Freed                                 [Page 50]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            7.5  The Image Content-Type
+
+            A Content-Type of "image" indicates that the bodycontains an
+            image.   The subtype names the specific image format.  These
+            names are case insensitive.  Two initial subtypes are "jpeg"
+            for the JPEG format, JFIF encoding, and "gif" for GIF format
+            [GIF].
+
+            The list of image subtypes given here is  neither  exclusive
+            nor  exhaustive,  and  is expected to grow as more types are
+            registered with IANA, as described in Appendix F.
+
+            7.6  The Audio Content-Type
+
+            A Content-Type of "audio" indicates that the  body  contains
+            audio  data.   Although  there  is not yet a consensus on an
+            "ideal" audio format for use  with  computers,  there  is  a
+            pressing   need   for   a   format   capable   of  providing
+            interoperable behavior.
+
+            The initial subtype of "basic" is  specified  to  meet  this
+            requirement by providing an absolutely minimal lowest common
+            denominator  audio  format.   It  is  expected  that  richer
+            formats for higher quality and/or lower bandwidth audio will
+            be defined by a later document.
+
+            The content of the "audio/basic" subtype  is  audio  encoded
+            using  8-bit ISDN u-law [PCM]. When this subtype is present,
+            a sample rate of 8000 Hz and a single channel is assumed.
+
+            7.7  The Video Content-Type
+
+            A Content-Type of "video" indicates that the body contains a
+            time-varying-picture   image,   possibly   with   color  and
+            coordinated sound.   The  term  "video"  is  used  extremely
+            generically,  rather  than  with reference to any particular
+            technology or format, and is not meant to preclude  subtypes
+            such  as animated drawings encoded compactly.    The subtype
+            "mpeg" refers to video coded according to the MPEG  standard
+            [MPEG].
+
+            Note  that  although  in  general  this  document   strongly
+            discourages  the  mixing of multiple media in a single body,
+            it is recognized that many so-called "video" formats include
+            a   representation  for  synchronized  audio,  and  this  is
+            explicitly permitted for subtypes of "video".
+
+            7.8  Experimental Content-Type Values
+
+            A Content-Type value beginning with the characters "X-" is a
+            private  value,  to  be  used  by consenting mail systems by
+            mutual agreement.  Any format without a rigorous and  public
+            definition  must  be named with an "X-" prefix, and publicly
+            specified  values  shall  never  begin  with  "X-".   (Older
+
+
+
+            Borenstein & Freed                                 [Page 51]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            versions  of  the  widely-used Andrew system use the "X-BE2"
+            name, so new systems  should  probably  choose  a  different
+            name.)
+
+            In general, the use of  "X-"  top-level  types  is  strongly
+            discouraged.   Implementors  should  invent  subtypes of the
+            existing types whenever  possible.   The  invention  of  new
+            types   is  intended  to  be  restricted  primarily  to  the
+            development of new media types for email,  such  as  digital
+            odors  or  holography,  and  not  for  new  data  formats in
+            general. In many cases, a subtype  of  application  will  be
+            more appropriate than a new top-level type.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            Borenstein & Freed                                 [Page 52]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            Summary
+
+            Using the MIME-Version, Content-Type, and  Content-Transfer-
+            Encoding  header  fields,  it  is  possible to include, in a
+            standardized way, arbitrary types of data objects  with  RFC
+            822  conformant  mail  messages.  No restrictions imposed by
+            either RFC 821 or RFC 822 are violated, and  care  has  been
+            taken  to  avoid  problems caused by additional restrictions
+            imposed  by  the  characteristics  of  some  Internet   mail
+            transport  mechanisms  (see Appendix B). The "multipart" and
+            "message"  Content-Types  allow  mixing   and   hierarchical
+            structuring  of  objects  of  different  types  in  a single
+            message.  Further  Content-Types  provide   a   standardized
+            mechanism  for  tagging  messages  or  body  parts as audio,
+            image, or several other  kinds  of  data.   A  distinguished
+            parameter syntax allows further specification of data format
+            details,  particularly  the   specification   of   alternate
+            character  sets.  Additional  optional header fields provide
+            mechanisms for certain extensions deemed desirable  by  many
+            implementors.  Finally, a number of useful Content-Types are
+            defined for general use by consenting user  agents,  notably
+            text/richtext, message/partial, and message/external-body.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            Borenstein & Freed                                 [Page 53]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            Acknowledgements
+
+            This document is the result of the collective  effort  of  a
+            large  number  of  people,  at several IETF meetings, on the
+            IETF-SMTP  and  IETF-822  mailing  lists,   and   elsewhere.
+            Although   any  enumeration  seems  doomed  to  suffer  from
+            egregious  omissions,  the  following  are  among  the  many
+            contributors to this effort:
+
+            Harald Tveit Alvestrand       Timo Lehtinen
+            Randall Atkinson              John R. MacMillan
+            Philippe Brandon              Rick McGowan
+            Kevin Carosso                 Leo Mclaughlin
+            Uhhyung Choi                  Goli Montaser-Kohsari
+            Cristian Constantinof         Keith Moore
+            Mark Crispin                  Tom Moore
+            Dave Crocker                  Erik Naggum
+            Terry Crowley                 Mark Needleman
+            Walt Daniels                  John Noerenberg
+            Frank Dawson                  Mats Ohrman
+            Hitoshi Doi                   Julian Onions
+            Kevin Donnelly                Michael Patton
+            Keith Edwards                 David J. Pepper
+            Chris Eich                    Blake C. Ramsdell
+            Johnny Eriksson               Luc Rooijakkers
+            Craig Everhart                Marshall T. Rose
+            Patrik Faeltstroem              Jonathan Rosenberg
+            Erik E. Fair                  Jan Rynning
+            Roger Fajman                  Harri Salminen
+            Alain Fontaine                Michael Sanderson
+            James M. Galvin               Masahiro Sekiguchi
+            Philip Gladstone              Mark Sherman
+            Thomas Gordon                 Keld Simonsen
+            Phill Gross                   Bob Smart
+            James Hamilton                Peter Speck
+            Steve Hardcastle-Kille        Henry Spencer
+            David Herron                  Einar Stefferud
+            Bruce Howard                  Michael Stein
+            Bill Janssen                  Klaus Steinberger
+            Olle Jaernefors                Peter Svanberg
+            Risto Kankkunen               James Thompson
+            Phil Karn                     Steve Uhler
+            Alan Katz                     Stuart Vance
+            Tim Kehres                    Erik van der Poel
+            Neil Katin                    Guido van Rossum
+            Kyuho Kim                     Peter Vanderbilt
+            Anders Klemets                Greg Vaudreuil
+            John Klensin                  Ed Vielmetti
+            Valdis Kletniek               Ryan Waldron
+            Jim Knowles                   Wally Wedel
+            Stev Knowles                  Sven-Ove Westberg
+            Bob Kummerfeld                Brian Wideen
+
+
+
+
+
+            Borenstein & Freed                                 [Page 54]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            Pekka Kytolaakso              John Wobus
+            Stellan Lagerstr.m            Glenn Wright
+            Vincent Lau                   Rayan Zachariassen
+            Donald Lindsay                David Zimmerman
+            The authors apologize for  any  omissions  from  this  list,
+            which are certainly unintentional.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            Borenstein & Freed                                 [Page 55]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            Appendix A -- Minimal MIME-Conformance
+
+            The mechanisms described in this  document  are  open-ended.
+            It  is definitely not expected that all implementations will
+            support all of the Content-Types described,  nor  that  they
+            will  all  share  the  same extensions.  In order to promote
+            interoperability,  however,  it  is  useful  to  define  the
+            concept  of  "MIME-conformance" to define a certain level of
+            implementation  that  allows  the  useful  interworking   of
+            messages  with  content that differs from US ASCII text.  In
+            this  section,  we  specify  the   requirements   for   such
+            conformance.
+
+            A mail user agent that is MIME-conformant MUST:
+
+                 1.  Always generate a "MIME-Version:  1.0"  header
+                 field.
+
+                 2.  Recognize the Content-Transfer-Encoding header
+                 field,  and  decode all received data encoded with
+                 either    the    quoted-printable    or     base64
+                 implementations.    Encode  any  data sent that is
+                 not in seven-bit mail-ready  representation  using
+                 one  of  these  transformations  and  include  the
+                 appropriate    Content-Transfer-Encoding    header
+                 field,  unless  the underlying transport mechanism
+                 supports non-seven-bit data, as SMTP does not.
+
+                 3.   Recognize  and  interpret  the   Content-Type
+                 header  field,  and  avoid  showing users raw data
+                 with a Content-Type field  other  than  text.   Be
+                 able  to  send  at least text/plain messages, with
+                 the character set specified as a parameter  if  it
+                 is not US-ASCII.
+
+                 4.  Explicitly handle the  following  Content-Type
+                 values, to at least the following extents:
+
+                 Text:
+                      -- Recognize  and  display  "text"  mail
+                           with the character set "US-ASCII."
+                      -- Recognize  other  character  sets  at
+                           least  to  the extent of being able
+                           to  inform  the  user  about   what
+                           character set the message uses.
+                      -- Recognize the "ISO-8859-*"  character
+                           sets to the extent of being able to
+                           display those characters  that  are
+                           common  to ISO-8859-* and US-ASCII,
+                           namely all  characters  represented
+                           by octet values 0-127.
+                      -- For unrecognized  subtypes,  show  or
+                           offer  to  show  the user the "raw"
+                           version of the data.  An ability at
+
+
+
+            Borenstein & Freed                                 [Page 56]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+                           least to convert "text/richtext" to
+                           plain text, as shown in Appendix D,
+                           is encouraged, but not required for
+                           conformance.
+                 Message:
+                      --Recognize and  display  at  least  the
+                           primary (822) encapsulation.
+                 Multipart:
+                      --   Recognize   the   primary   (mixed)
+                           subtype.    Display   all  relevant
+                           information on  the  message  level
+                           and  the body part header level and
+                           then display or  offer  to  display
+                           each     of    the    body    parts
+                           individually.
+                      -- Recognize the "alternative"  subtype,
+                           and    avoid   showing   the   user
+                           redundant         parts          of
+                           multipart/alternative mail.
+                      -- Treat any unrecognized subtypes as if
+                           they were "mixed".
+                 Application:
+                      -- Offer the ability to remove either of
+                           the  two types of Content-Transfer-
+                           Encoding defined in  this  document
+                           and  put  the resulting information
+                           in a user file.
+
+                 5.  Upon encountering  any  unrecognized  Content-
+                 Type, an implementation must treat it as if it had
+                 a Content-Type of "application/octet-stream"  with
+                 no  parameter  sub-arguments.  How  such  data are
+                 handled is up to  an  implementation,  but  likely
+                 options   for   handling  such  unrecognized  data
+                 include offering the user to write it into a  file
+                 (decoded   from  its  mail  transport  format)  or
+                 offering the user to name a program to  which  the
+                 decoded   data   should   be   passed   as  input.
+                 Unrecognized predefined types, which  in  a  MIME-
+                 conformant   mailer  might  still  include  audio,
+                 image, or video, should also be  treated  in  this
+                 way.
+
+            A user agent that meets the above conditions is said  to  be
+            MIME-conformant.   The  meaning of this phrase is that it is
+            assumed  to  be  "safe"  to  send  virtually  any  kind   of
+            properly-marked  data to users of such mail systems, because
+            such systems will at least be able  to  treat  the  data  as
+            undifferentiated  binary, and will not simply splash it onto
+            the screen of unsuspecting users.   There is  another  sense
+            in  which  it is always "safe" to send data in a format that
+            is MIME-conformant, which is that such data will  not  break
+            or  be  broken by any known systems that are conformant with
+            RFC 821 and RFC 822.  User agents that  are  MIME-conformant
+
+
+
+            Borenstein & Freed                                 [Page 57]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            have  the  additional  guarantee  that  the user will not be
+            shown data that were never intended to be viewed as text.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            Borenstein & Freed                                 [Page 58]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            Appendix B -- General Guidelines For Sending Email Data
+
+            Internet email is not a perfect, homogeneous  system.   Mail
+            may  become  corrupted  at several stages in its travel to a
+            final destination. Specifically, email sent  throughout  the
+            Internet  may  travel  across  many networking technologies.
+            Many networking and mail technologies  do  not  support  the
+            full   functionality   possible   in   the   SMTP  transport
+            environment. Mail traversing these systems is likely  to  be
+            modified in such a way that it can be transported.
+
+            There exist many widely-deployed non-conformant MTAs in  the
+            Internet.  These  MTAs,  speaking  the  SMTP protocol, alter
+            messages on the fly to take advantage of the  internal  data
+            structure  of the hosts they are implemented on, or are just
+            plain broken.
+
+            The following guidelines may be useful to anyone devising  a
+            data  format  (Content-Type)  that  will  survive the widest
+            range of  networking  technologies  and  known  broken  MTAs
+            unscathed.    Note  that  anything  encoded  in  the  base64
+            encoding will satisfy these rules, but that some  well-known
+            mechanisms,  notably  the  UNIX uuencode facility, will not.
+            Note also that  anything  encoded  in  the  Quoted-Printable
+            encoding will survive most gateways intact, but possibly not
+            some gateways to systems that use the EBCDIC character set.
+
+                 (1) Under some circumstances the encoding used for
+                 data  may change as part of normal gateway or user
+                 agent operation. In  particular,  conversion  from
+                 base64  to  quoted-printable and vice versa may be
+                 necessary. This may result  in  the  confusion  of
+                 CRLF  sequences  with  line  breaks  in  text body
+                 parts.  As  such,  the  persistence  of  CRLF   as
+                 something  other  than  a line break should not be
+                 relied on.
+
+                 (2) Many systems may elect to represent and  store
+                 text  data  using local newline conventions. Local
+                 newline conventions may not match the RFC822  CRLF
+                 convention -- systems are known that use plain CR,
+                 plain LF, CRLF, or counted records.  The result is
+                 that isolated CR and LF characters  are  not  well
+                 tolerated  in    general;  they  may  be  lost  or
+                 converted to delimiters on some systems, and hence
+                 should not be relied on.
+
+                 (3) TAB (HT) characters may be  misinterpreted  or
+                 may be automatically converted to variable numbers
+                 of  spaces.    This   is   unavoidable   in   some
+                 environments, notably those not based on the ASCII
+                 character  set.  Such   conversion   is   STRONGLY
+                 DISCOURAGED,  but  it  may occur, and mail formats
+                 should not rely on the  persistence  of  TAB  (HT)
+
+
+
+            Borenstein & Freed                                 [Page 59]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+                 characters.
+
+                 (4) Lines longer than 76 characters may be wrapped
+                 or  truncated  in some environments. Line wrapping
+                 and line truncation are STRONGLY DISCOURAGED,  but
+                 unavoidable  in  some  cases.  Applications  which
+                 require long lines  should  somehow  differentiate
+                 between  soft and hard line breaks.  (A simple way
+                 to  do  this  is  to  use   the   quoted-printable
+                 encoding.)
+
+                 (5)  Trailing "white space" characters (SPACE, TAB
+                 (HT)) on a line may be discarded by some transport
+                 agents, while other transport agents may pad lines
+                 with  these characters so that all lines in a mail
+                 file are of equal  length.    The  persistence  of
+                 trailing  white  space,  therefore,  should not be
+                 relied on.
+
+                 (6)  Many mail domains use variations on the ASCII
+                 character  set,  or  use  character  sets  such as
+                 EBCDIC which contain most but not all of  the  US-
+                 ASCII  characters.   The  correct  translation  of
+                 characters not in the "invariant"  set  cannot  be
+                 depended  on across character converting gateways.
+                 For example, this  situation  is  a  problem  when
+                 sending  uuencoded  information  across BITNET, an
+                 EBCDIC system.  Similar problems can occur without
+                 crossing  a gateway, since many Internet hosts use
+                 character sets other than ASCII  internally.   The
+                 definition  of  Printable  Strings  in  X.400 adds
+                 further restrictions in certain special cases.  In
+                 particular,  the only characters that are known to
+                 be consistent  across  all  gateways  are  the  73
+                 characters  that correspond to the upper and lower
+                 case letters A-Z and a-z, the 10 digits  0-9,  and
+                 the following eleven special characters:
+
+                                "'"  (ASCII code 39)
+                                "("  (ASCII code 40)
+                                ")"  (ASCII code 41)
+                                "+"  (ASCII code 43)
+                                ","  (ASCII code 44)
+                                "-"  (ASCII code 45)
+                                "."  (ASCII code 46)
+                                "/"  (ASCII code 47)
+                                ":"  (ASCII code 58)
+                                "="  (ASCII code 61)
+                                "?"  (ASCII code 63)
+
+                 A maximally portable mail representation, such  as
+                 the   base64  encoding,  will  confine  itself  to
+                 relatively short lines of text in which  the  only
+                 meaningful  characters  are taken from this set of
+
+
+
+            Borenstein & Freed                                 [Page 60]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+                 73 characters.
+
+            Please note that the above list is NOT a list of recommended
+            practices  for  MTAs.  RFC  821  MTAs  are  prohibited  from
+            altering the character  of  white  space  or  wrapping  long
+            lines.   These  BAD and illegal practices are known to occur
+            on established networks, and implementions should be  robust
+            in dealing with the bad effects they can cause.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            Borenstein & Freed                                 [Page 61]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            Appendix C -- A Complex Multipart Example
+
+            What follows is the outline of a complex multipart  message.
+            This  message  has five parts to be displayed serially:  two
+            introductory  plain  text  parts,  an   embedded   multipart
+            message,  a  richtext  part, and a closing encapsulated text
+            message  in  a  non-ASCII  character  set.    The   embedded
+            multipart message has two parts to be displayed in parallel,
+            a picture and an audio fragment.
+
+                 MIME-Version: 1.0
+                 From: Nathaniel Borenstein <nsb@bellcore.com>
+                 Subject: A multipart example
+                 Content-Type: multipart/mixed;
+                      boundary=unique-boundary-1
+
+                 This is the preamble area of a multipart message.
+                 Mail readers that understand multipart format
+                 should ignore this preamble.
+                 If you are reading this text, you might want to
+                 consider changing to a mail reader that understands
+                 how to properly display multipart messages.
+                 --unique-boundary-1
+
+                 ...Some text appears here...
+                 [Note that the preceding blank line means
+                 no header fields were given and this is text,
+                 with charset US ASCII.  It could have been
+                 done with explicit typing as in the next part.]
+
+                 --unique-boundary-1
+                 Content-type: text/plain; charset=US-ASCII
+
+                 This could have been part of the previous part,
+                 but illustrates explicit versus implicit
+                 typing of body parts.
+
+                 --unique-boundary-1
+                 Content-Type: multipart/parallel;
+                      boundary=unique-boundary-2
+
+
+                 --unique-boundary-2
+                 Content-Type: audio/basic
+                 Content-Transfer-Encoding: base64
+
+                 ... base64-encoded 8000 Hz single-channel
+                     u-law-format audio data goes here....
+
+                 --unique-boundary-2
+                 Content-Type: image/gif
+                 Content-Transfer-Encoding: Base64
+
+
+
+
+
+            Borenstein & Freed                                 [Page 62]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+                 ... base64-encoded image data goes here....
+
+                 --unique-boundary-2--
+
+                 --unique-boundary-1
+                 Content-type: text/richtext
+
+                 This is <bold><italic>richtext.</italic></bold>
+                 <nl><nl>Isn't it
+                 <bigger><bigger>cool?</bigger></bigger>
+
+                 --unique-boundary-1
+                 Content-Type: message/rfc822
+
+                 From: (name in US-ASCII)
+                 Subject: (subject in US-ASCII)
+                 Content-Type: Text/plain; charset=ISO-8859-1
+                 Content-Transfer-Encoding: Quoted-printable
+
+                 ... Additional text in ISO-8859-1 goes here ...
+
+                 --unique-boundary-1--
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            Borenstein & Freed                                 [Page 63]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            Appendix D -- A Simple Richtext-to-Text Translator in C
+
+            One of the major goals in the design of the richtext subtype
+            of the text Content-Type is to make formatted text so simple
+            that even  text-only  mailers  will  implement  richtext-to-
+            plain-text  translators, thus increasing the likelihood that
+            multifont text will become "safe" to use  very  widely.   To
+            demonstrate  this  simplicity,  what follows is an extremely
+            simple 44-line C program that converts richtext  input  into
+            plain text output:
+
+                 #include <stdio.h>
+                 #include <ctype.h>
+                 main() {
+                     int c, i;
+                     char token[50];
+
+                     while((c = getc(stdin)) != EOF) {
+                         if (c == '<') {
+                             for (i=0; (i<49 && (c = getc(stdin)) != '>'
+                                       && c != EOF); ++i) {
+                                 token[i] = isupper(c) ? tolower(c) : c;
+                             }
+                             if (c == EOF) break;
+                             if (c != '>') while ((c = getc(stdin)) !=
+                 '>'
+                                       && c != EOF) {;}
+                             if (c == EOF) break;
+                             token[i] = '\0';
+                             if (!strcmp(token, "lt")) {
+                                 putc('<', stdout);
+                             } else if (!strcmp(token, "nl")) {
+                                 putc('\n', stdout);
+                             } else if (!strcmp(token, "/paragraph")) {
+                                 fputs("\n\n", stdout);
+                             } else if (!strcmp(token, "comment")) {
+                                 int commct=1;
+                                 while (commct > 0) {
+                                     while ((c = getc(stdin)) != '<'
+                                      && c != EOF) ;
+                                     if (c == EOF) break;
+                                     for (i=0; (c = getc(stdin)) != '>'
+                                        && c != EOF; ++i) {
+                                         token[i] = isupper(c) ?
+                                          tolower(c) : c;
+                                     }
+                                     if (c== EOF) break;
+                                     token[i] = NULL;
+                                     if (!strcmp(token, "/comment")) --
+                 commct;
+                                     if (!strcmp(token, "comment"))
+                 ++commct;
+
+
+
+
+
+            Borenstein & Freed                                 [Page 64]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+                                 }
+                             } /* Ignore all other tokens */
+                         } else if (c != '\n') putc(c, stdout);
+                     }
+                     putc('\n', stdout); /* for good measure */
+                 }
+            It should be noted that one can do considerably better  than
+            this  in  displaying  richtext  data on a dumb terminal.  In
+            particular, one can replace font information such as  "bold"
+            with textual emphasis (like *this* or   _T_H_I_S_).  One can
+            also  properly  handle  the  richtext  formatting   commands
+            regarding  indentation, justification, and others.  However,
+            the above program is all  that  is  necessary  in  order  to
+            present richtext on a dumb terminal.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            Borenstein & Freed                                 [Page 65]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            Appendix E -- Collected Grammar
+
+            This appendix contains the complete BNF grammar for all  the
+            syntax specified by this document.
+
+            By itself, however, this grammar is incomplete.   It  refers
+            to  several  entities  that  are defined by RFC 822.  Rather
+            than   reproduce   those   definitions   here,   and    risk
+            unintentional  differences  between  the  two, this document
+            simply refers the  reader  to  RFC  822  for  the  remaining
+            definitions.  Wherever a term is undefined, it refers to the
+            RFC 822 definition.
+
+            attribute := token
+
+            body-part = <"message" as defined in RFC 822,
+                     with all header fields optional, and with the
+                     specified delimiter not occurring anywhere in
+                     the message body, either on a line by itself
+                     or as a substring anywhere.>
+
+            boundary := 0*69<bchars> bcharsnospace
+
+            bchars := bcharsnospace / " "
+
+            bcharsnospace :=    DIGIT / ALPHA / "'" / "(" / ")" / "+"  /
+            "_"
+                           / "," / "-" / "." / "/" / ":" / "=" / "?"
+
+            close-delimiter := delimiter "--"
+
+            Content-Description := *text
+
+            Content-ID := msg-id
+
+            Content-Transfer-Encoding  :=      "BASE64"     /   "QUOTED-
+            PRINTABLE" /
+                                            "8BIT"  / "7BIT" /
+                                            "BINARY"     / x-token
+
+            Content-Type := type "/" subtype *[";" parameter]
+
+            delimiter := CRLF "--" boundary   ; taken from  Content-Type
+            field.
+                                           ;   when   content-type    is
+            multipart
+                                         ; There should be no space
+                                         ; between "--" and boundary.
+
+            encapsulation := delimiter CRLF body-part
+
+            epilogue :=  *text                  ;  to  be  ignored  upon
+            receipt.
+
+
+
+
+            Borenstein & Freed                                 [Page 66]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            MIME-Version := 1*text
+
+            multipart-body := preamble  1*encapsulation  close-delimiter
+            epilogue
+
+            parameter := attribute "=" value
+
+            preamble :=  *text                  ;  to  be  ignored  upon
+            receipt.
+
+            subtype := token
+
+            token := 1*<any CHAR except SPACE, CTLs, or tspecials>
+
+            tspecials :=  "(" / ")" / "<" / ">" / "@"  ; Must be in
+                       /  "," / ";" / ":" / "\" / <">  ; quoted-string,
+                       /  "/" / "[" / "]" / "?" / "."  ; to use within
+                       /  "="                        ; parameter values
+
+
+            type :=            "application"     /  "audio"     ;  case-
+            insensitive
+                      / "image"           / "message"
+                      / "multipart"  / "text"
+                      / "video"           / x-token
+
+            value := token / quoted-string
+
+            x-token := <The two characters "X-" followed, with no
+                       intervening white space, by any token>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            Borenstein & Freed                                 [Page 67]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            Appendix F -- IANA Registration Procedures
+
+            MIME  has  been  carefully  designed  to   have   extensible
+            mechanisms,  and  it  is  expected  that the set of content-
+            type/subtype pairs and their associated parameters will grow
+            significantly with time.  Several other MIME fields, notably
+            character  set  names,  access-type   parameters   for   the
+            message/external-body  type,  conversions parameters for the
+            application  type,  and  possibly   even   Content-Transfer-
+            Encoding  values, are likely to have new values defined over
+            time.  In order to ensure that the set  of  such  values  is
+            developed  in an orderly, well-specified, and public manner,
+            MIME defines a registration process which uses the  Internet
+            Assigned  Numbers Authority (IANA) as a central registry for
+            such values.
+
+            In general, parameters in the content-type header field  are
+            used  to convey supplemental information for various content
+            types, and their use is defined when  the  content-type  and
+            subtype  are  defined.  New parameters should not be defined
+            as a way to introduce new functionality.
+
+            In  order  to  simplify  and  standardize  the  registration
+            process,  this appendix gives templates for the registration
+            of new values with IANA.  Each of these is given in the form
+            of  an  email  message  template,  to  be  filled  in by the
+            registering party.
+
+            F.1  Registration of New Content-type/subtype Values
+
+            Note that MIME is  generally  expected  to  be  extended  by
+            subtypes.   If  a  new fundamental top-level type is needed,
+            its  specification  should  be  published  as  an   RFC   or
+            submitted  in  a  form   suitable  to  become an RFC, and be
+            subject to the Internet standards process.
+
+                 To:  IANA@isi.edu
+                 Subject:  Registration of new MIME content-type/subtype
+
+                 MIME type name:
+
+                 (If the above is not an existing top-level MIME type,
+                 please explain why an existing type cannot be used.)
+
+                 MIME subtype name:
+
+                 Required parameters:
+
+                 Optional parameters:
+
+                 Encoding considerations:
+
+                 Security considerations:
+
+
+
+
+            Borenstein & Freed                                 [Page 68]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+                 Published specification:
+
+                 (The published specification must be an Internet RFC or
+                 RFC-to-be if a new top-level type is being defined, and
+                 must be a publicly available specification in any
+                 case.)
+
+                 Person & email address to contact for further
+                 information:
+            F.2  Registration of New Character Set Values
+
+                 To:  IANA@isi.edu
+                 Subject:  Registration of new MIME character set value
+
+                 MIME character set name:
+
+                 Published specification:
+
+                 (The published specification must be an Internet RFC or
+                 RFC-to-be or an international standard.)
+
+                 Person & email address to contact for further
+                 information:
+
+            F.3  Registration of New Access-type Values for
+            Message/external-body
+
+                 To:  IANA@isi.edu
+                 Subject:  Registration of new MIME Access-type for
+                      Message/external-body content-type
+
+                 MIME access-type name:
+
+                 Required parameters:
+
+                 Optional parameters:
+
+                 Published specification:
+
+                 (The published specification must be an Internet RFC or
+                 RFC-to-be.)
+
+                 Person & email address to contact for further
+                 information:
+
+
+            F.4  Registration of New Conversions Values for Application
+
+                 To:  IANA@isi.edu
+                 Subject:  Registration of new MIME Conversions value
+                 for Application content-type
+
+                 MIME Conversions name:
+
+
+
+
+            Borenstein & Freed                                 [Page 69]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+                 Published specification:
+
+                 (The published specification must be an Internet RFC or
+                 RFC-to-be.)
+
+                 Person & email address to contact for further
+                 information:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            Borenstein & Freed                                 [Page 70]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            Appendix G -- Summary of the Seven Content-types
+
+            Content-type: text
+
+            Subtypes defined by this document:  plain, richtext
+
+            Important Parameters: charset
+
+            Encoding notes: quoted-printable generally preferred  if  an
+                 encoding  is  needed and the character set is mostly an
+                 ASCII superset.
+
+            Security considerations:  Rich text formats such as TeX  and
+                 Troff  often contain mechanisms for executing arbitrary
+                 commands or file system operations, and should  not  be
+                 used  automatically unless these security problems have
+                 been addressed.  Even plain text  may  contain  control
+                 characters that can be used to exploit the capabilities
+                 of   "intelligent"   terminals   and   cause   security
+                 violations.   User  interfaces  designed to run on such
+                 terminals should be aware of and try  to  prevent  such
+                 problems.
+            ________________________________________________________________
+
+            Content-type: multipart
+
+            Subtypes defined by  this  document:    mixed,  alternative,
+                 digest, parallel.
+
+            Important Parameters: boundary
+
+            Encoding notes: No content-transfer-encoding is permitted.
+
+            ________________________________________________________________
+
+            Content-type: message
+
+            Subtypes  defined  by  this  document:    rfc822,   partial,
+                 external-body
+
+            Important Parameters: id, number, total
+
+            Encoding notes: No content-transfer-encoding is permitted.
+
+            ________________________________________________________________
+
+            Content-type: application
+
+            Subtypes  defined   by   this   document:      octet-stream,
+                 postscript, oda
+
+            Important Parameters: profile
+
+
+
+
+
+            Borenstein & Freed                                 [Page 71]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            Encoding notes: base64 generally preferred for  octet-stream
+                 or other unreadable subtypes.
+
+            Security considerations:  This  type  is  intended  for  the
+            transmission  of data to be interpreted by locally-installed
+            programs.  If used,  for  example,  to  transmit  executable
+            binary  programs  or programs in general-purpose interpreted
+            languages, such as LISP programs or  shell  scripts,  severe
+            security  problems  could  result.   In  general, authors of
+            mail-reading  agents  are  cautioned  against  giving  their
+            systems  the  power  to  execute mail-based application data
+            without carefully  considering  the  security  implications.
+            While  it  is  certainly possible to define safe application
+            formats and even safe interpreters for unsafe formats,  each
+            interpreter  should  be  evaluated  separately  for possible
+            security problems.
+            ________________________________________________________________
+
+            Content-type: image
+
+            Subtypes defined by this document:  jpeg, gif
+
+            Important Parameters: none
+
+            Encoding notes: base64 generally preferred
+
+            ________________________________________________________________
+
+            Content-type: audio
+
+            Subtypes defined by this document:  basic
+
+            Important Parameters: none
+
+            Encoding notes: base64 generally preferred
+
+            ________________________________________________________________
+
+            Content-type: video
+
+            Subtypes defined by this document:  mpeg
+
+            Important Parameters: none
+
+            Encoding notes: base64 generally preferred
+
+
+
+
+
+
+
+
+
+
+
+
+            Borenstein & Freed                                 [Page 72]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            Appendix H -- Canonical Encoding Model
+
+
+
+            There was some confusion, in earlier drafts  of  this  memo,
+            regarding  the model for when email data was to be converted
+            to canonical form and encoded, and in  particular  how  this
+            process  would affect the treatment of CRLFs, given that the
+            representation of newlines varies  greatly  from  system  to
+            system.   For this reason, a canonical model for encoding is
+            presented below.
+
+            The process of composing a MIME message part can be modelled
+            as  being  done in a number of steps.  Note that these steps
+            are roughly similar to those steps used in RFC1113:
+
+            Step 1.  Creation of local form.
+
+            The body part to be transmitted is created in  the  system's
+            native format.   The native character set is used, and where
+            appropriate local end of line conventions are used as  well.
+            The may be a UNIX-style text file, or a Sun raster image, or
+            a VMS indexed file, or  audio  data  in  a  system-dependent
+            format   stored  only  in  memory,  or  anything  else  that
+            corresponds to the local model  for  the  representation  of
+            some form of information.
+
+            Step 2.  Conversion to canonical form.
+
+            The entire body part,  including  "out-of-band"  information
+            such   as   record   lengths  and  possibly  file  attribute
+            information, is converted to  a  universal  canonical  form.
+            The  specific  content  type of the body part as well as its
+            associated attributes dictate the nature  of  the  canonical
+            form  that is used.  Conversion to the proper canonical form
+            may involve  character  set  conversion,  transformation  of
+            audio   data,   compression,  or  various  other  operations
+            specific to the various content types.
+
+            For example, in the case of text/plain data, the  text  must
+            be  converted to a supported character set and lines must be
+            delimited with CRLF delimiters in  accordance  with  RFC822.
+            Note  that the restriction on line lengths implied by RFC822
+            is eliminated  if  the  next  step  employs  either  quoted-
+            printable or base64 encoding.
+
+            Step 3.  Apply transfer encoding.
+
+            A Content-Transfer-Encoding appropriate for this  body  part
+            is  applied.   Note  that  there  is  no  fixed relationship
+            between the content  type  and  the  transfer  encoding.  In
+            particular,  it  may  be  appropriate  to base the choice of
+            base64 or quoted-printable  on  character  frequency  counts
+            which are specific to a given instance of body part.
+
+
+
+            Borenstein & Freed                                 [Page 73]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            Step 4.  Insertion into message.
+
+            The encoded object is inserted  into  a  MIME  message  with
+            appropriate body part headers and boundary markers.
+
+            It is vital to note that these steps are only a model;  they
+            are  specifically  NOT  a blueprint for how an actual system
+            would be built.  In particular, the model fails  to  account
+            for two common designs:
+
+                 1.  In many cases the conversion  to  a  canonical
+                 form  prior  to encoding will be subsumed into the
+                 encoder itself, which  understands  local  formats
+                 directly.    For   example,   the   local  newline
+                 convention for text  bodyparts  might  be  carried
+                 through to the encoder itself along with knowledge
+                 of what that format is.
+
+                 2.  The output of the encoders may  have  to  pass
+                 through  one  or  more  additional  steps prior to
+                 being transmitted as  a  message.   As  such,  the
+                 output  of  the  encoder may not be compliant with
+                 the formats specified by RFC822.   In  particular,
+                 once   again   it   may  be  appropriate  for  the
+                 converter's output to  be  expressed  using  local
+                 newline conventions rather than using the standard
+                 RFC822 CRLF delimiters.
+
+            Other implementation variations  are  conceivable  as  well.
+            The  only  important  aspect  of this discussion is that the
+            resulting messages are consistent with those produced by the
+            model described here.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            Borenstein & Freed                                 [Page 74]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            References
+
+            [US-ASCII] Coded Character Set--7-Bit American Standard Code
+            for Information Interchange, ANSI X3.4-1986.
+
+            [ATK]  Borenstein,  Nathaniel  S.,  Multimedia  Applications
+            Development with the Andrew Toolkit, Prentice-Hall, 1990.
+
+            [GIF] Graphics Interchange Format (Version 89a), Compuserve,
+            Inc., Columbus, Ohio, 1990.
+
+            [ISO-2022] International Standard--Information  Processing--
+            ISO  7-bit  and  8-bit  coded character sets--Code extension
+            techniques, ISO 2022:1986.
+
+            [ISO-8859] Information Processing -- 8-bit Single-Byte Coded
+            Graphic  Character Sets -- Part 1: Latin Alphabet No. 1, ISO
+            8859-1:1987.  Part 2: Latin  alphabet  No.  2,  ISO  8859-2,
+            1987.  Part 3: Latin alphabet No. 3, ISO 8859-3, 1988.  Part
+            4:  Latin  alphabet  No.  4,  ISO  8859-4,  1988.   Part  5:
+            Latin/Cyrillic   alphabet,  ISO  8859-5,  1988.     Part  6:
+            Latin/Arabic  alphabet,  ISO  8859-6,   1987.      Part   7:
+            Latin/Greek   alphabet,   ISO   8859-7,   1987.     Part  8:
+            Latin/Hebrew alphabet, ISO 8859-8, 1988.     Part  9:  Latin
+            alphabet No. 5, ISO 8859-9, 1990.
+
+            [ISO-646] International  Standard--Information  Processing--
+            ISO  7-bit coded  character set for information interchange,
+            ISO 646:1983.
+
+            [MPEG]  Video  Coding  Draft  Standard  ISO  11172  CD,  ISO
+            IEC/TJC1/SC2/WG11 (Motion Picture Experts Group), May, 1991.
+
+            [ODA] ISO 8613;  Information  Processing:  Text  and  Office
+            System;  Office  Document Architecture (ODA) and Interchange
+            Format (ODIF), Part 1-8, 1989.
+
+            [PCM] CCITT, Fascicle III.4 - Recommendation G.711,  Geneva,
+            1972, "Pulse Code Modulation (PCM) of Voice Frequencies".
+
+            [POSTSCRIPT]  Adobe  Systems,  Inc.,   PostScript   Language
+            Reference Manual,  Addison-Wesley, 1985.
+
+            [X400]  Schicker, Pietro, "Message Handling Systems, X.400",
+            Message  Handling  Systems  and Distributed Applications, E.
+            Stefferud, O-j. Jacobsen,  and  P.  Schicker,  eds.,  North-
+            Holland, 1989, pp. 3-41.
+
+            [RFC-783]  Sollins, K.R.  TFTP Protocol (revision 2).  June,
+            1981, MIT, RFC-783.
+
+            [RFC-821]  Postel,  J.B.   Simple  Mail  Transfer  Protocol.
+            August, 1982, USC/Information Sciences Institute, RFC-821.
+
+
+
+
+            Borenstein & Freed                                 [Page 75]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            [RFC-822]   Crocker, D.  Standard for  the  format  of  ARPA
+            Internet  text  messages. August, 1982, UDEL, RFC-822.
+
+            [RFC-934]   Rose, M.T.; Stefferud, E.A.   Proposed  standard
+            for    message     encapsulation.  January,   1985, Delaware
+            and NMA, RFC-934.
+
+            [RFC-959]   Postel,  J.B.;  Reynolds,  J.K.   File  Transfer
+            Protocol.      October,   1985,   USC/Information   Sciences
+            Institute, RFC-959.
+
+            [RFC-1049]   Sirbu,  M.A.   Content-Type  header  field  for
+            Internet messages.  March, 1988, CMU,  RFC-1049.
+
+            [RFC-1113]   Linn,  J.   Privacy  enhancement  for  Internet
+            electronic    mail:  Part    I  -  message  encipherment and
+            authentication procedures.   August,  1989, IAB Privacy Task
+            Force, RFC-1113.
+
+            [RFC-1154]  Robinson, D.; Ullmann, R.  Encoding header field
+            for   Internet   messages.  April,   1990,   Prime Computer,
+            Inc., RFC-1154.
+
+            [RFC-1342] Moore, Keith, Representation of Non-Ascii Text in
+            Internet   Message   Headers.   June,  1992,  University  of
+            Tennessee, RFC-1342.
+
+            Security Considerations
+
+            Security issues  are  discussed  in  Section  7.4.2  and  in
+            Appendix  G.   Implementors should pay special attention  to
+            the security implications of any mail content-types that can
+            cause the remote execution of any actions in the recipient's
+            environment.   In  such  cases,  the   discussion   of   the
+            applicaton/postscript   content-type  in  Section  7.4.2 may
+            serve as a model for considering  other  content-types  with
+            remote execution capabilities.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            Borenstein & Freed                                 [Page 76]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+            Authors' Addresses
+
+            For more information, the authors of this  document  may  be
+            contacted via Internet mail:
+
+                                Nathaniel S. Borenstein
+                                 MRE 2D-296, Bellcore
+                                     445 South St.
+                               Morristown, NJ 07962-1910
+
+                                Phone: +1 201 829 4270
+                                 Fax:  +1 201 829 7019
+                                Email: nsb@bellcore.com
+
+
+                                       Ned Freed
+                             Innosoft International, Inc.
+                                 250 West First Street
+                                       Suite 240
+                                  Claremont, CA 91711
+
+                                Phone:  +1 714 624 7907
+                                 Fax: +1 714 621 5319
+                                Email: ned@innosoft.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            Borenstein & Freed                                 [Page 77]
+
+
+
+
+            RFC 1341MIME: Multipurpose Internet Mail ExtensionsJune 1992
+
+
+
+
+
+            THIS PAGE INTENTIONALLY LEFT BLANK.
+
+            Please discard this page and place the  following  table  of
+            contents after the title page.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            Borenstein & Freed                                  [Page i]
+
+
+
+
+
+
+
+
+                               Table of Contents
+
+
+            1     Introduction.......................................  1
+            2     Notations, Conventions, and Generic BNF Grammar....  3
+            3     The MIME-Version Header Field......................  5
+            4     The Content-Type Header Field......................  6
+            5     The Content-Transfer-Encoding Header Field......... 10
+            5.1   Quoted-Printable Content-Transfer-Encoding......... 14
+            5.2   Base64 Content-Transfer-Encoding................... 17
+            6     Additional Optional Content- Header Fields......... 19
+            6.1   Optional Content-ID Header Field................... 19
+            6.2   Optional Content-Description Header Field.......... 19
+            7     The Predefined Content-Type Values................. 20
+            7.1   The Text Content-Type.............................. 20
+            7.1.1 The charset parameter.............................. 20
+            7.1.2 The Text/plain subtype............................. 23
+            7.1.3 The Text/richtext subtype.......................... 23
+            7.2   The Multipart Content-Type......................... 29
+            7.2.1 Multipart:  The common syntax...................... 30
+            7.2.2 The Multipart/mixed (primary) subtype.............. 34
+            7.2.3 The Multipart/alternative subtype.................. 34
+            7.2.4 The Multipart/digest subtype....................... 36
+            7.2.5 The Multipart/parallel subtype..................... 36
+            7.3   The Message Content-Type........................... 37
+            7.3.1 The Message/rfc822 (primary) subtype............... 37
+            7.3.2 The Message/Partial subtype........................ 37
+            7.3.3 The Message/External-Body subtype.................. 40
+            7.4   The Application Content-Type....................... 46
+            7.4.1 The Application/Octet-Stream (primary) subtype..... 46
+            7.4.2 The Application/PostScript subtype................. 47
+            7.4.3 The Application/ODA subtype........................ 50
+            7.5   The Image Content-Type............................. 51
+            7.6   The Audio Content-Type............................. 51
+            7.7   The Video Content-Type............................. 51
+            7.8   Experimental Content-Type Values................... 51
+                  Summary............................................ 53
+                  Acknowledgements................................... 54
+                  Appendix A -- Minimal MIME-Conformance............. 56
+                  Appendix B -- General Guidelines For Sending Email Data59
+                  Appendix C -- A Complex Multipart Example.......... 62
+                  Appendix D -- A Simple Richtext-to-Text Translator in C64
+                  Appendix E -- Collected Grammar.................... 66
+                  Appendix F -- IANA Registration Procedures......... 68
+                  F.1  Registration of New Content-type/subtype Values..68
+                  F.2  Registration of New Character Set Values...... 69
+                  F.3  Registration of New Access-type Values for Message/external-body69
+                  F.4  Registration of New Conversions Values for Application69
+                  Appendix G -- Summary of the Seven Content-types... 71
+                  Appendix H -- Canonical Encoding Model............. 73
+                  References......................................... 75
+                  Security Considerations............................ 76
+                  Authors' Addresses................................. 77
+
+
+
+            Borenstein & Freed                                 [Page ii]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+            Borenstein & Freed                                [Page iii]
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc1521.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc1521.txt
new file mode 100644
index 000000000..074ba415b
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc1521.txt
@@ -0,0 +1,4539 @@
+
+
+
+
+
+
+Network Working Group                                      N. Borenstein
+Request for Comments: 1521                                      Bellcore
+Obsoletes: 1341                                                 N. Freed
+Category: Standards Track                                       Innosoft
+                                                          September 1993
+
+
+         MIME (Multipurpose Internet Mail Extensions) Part One:
+                Mechanisms for Specifying and Describing
+                 the Format of Internet Message Bodies
+
+Status of this Memo
+
+   This RFC specifies an Internet standards track protocol for the
+   Internet community, and requests discussion and suggestions for
+   improvements.  Please refer to the current edition of the "Internet
+   Official Protocol Standards" for the standardization state and status
+   of this protocol.  Distribution of this memo is unlimited.
+
+Abstract
+
+   STD 11, RFC 822 defines a message representation protocol which
+   specifies considerable detail about message headers, but which leaves
+   the message content, or message body, as flat ASCII text.  This
+   document redefines the format of message bodies to allow multi-part
+   textual and non-textual message bodies to be represented and
+   exchanged without loss of information.  This is based on earlier work
+   documented in RFC 934 and STD 11, RFC 1049, but extends and revises
+   that work.  Because RFC 822 said so little about message bodies, this
+   document is largely orthogonal to (rather than a revision of) RFC
+   822.
+
+   In particular, this document is designed to provide facilities to
+   include multiple objects in a single message, to represent body text
+   in character sets other than US-ASCII, to represent formatted multi-
+   font text messages, to represent non-textual material such as images
+   and audio fragments, and generally to facilitate later extensions
+   defining new types of Internet mail for use by cooperating mail
+   agents.
+
+   This document does NOT extend Internet mail header fields to permit
+   anything other than US-ASCII text data.  Such extensions are the
+   subject of a companion document [RFC-1522].
+
+   This document is a revision of RFC 1341.  Significant differences
+   from RFC 1341 are summarized in Appendix H.
+
+
+
+
+
+Borenstein & Freed                                              [Page 1]
+
+RFC 1521                          MIME                    September 1993
+
+
+Table of Contents
+
+   1.     Introduction.......................................  3
+   2.     Notations, Conventions, and Generic BNF Grammar....  6
+   3.     The MIME-Version Header Field......................  7
+   4.     The Content-Type Header Field......................  9
+   5.     The Content-Transfer-Encoding Header Field......... 13
+   5.1.   Quoted-Printable Content-Transfer-Encoding......... 18
+   5.2.   Base64 Content-Transfer-Encoding................... 21
+   6.     Additional Content-Header Fields................... 23
+   6.1.   Optional Content-ID Header Field................... 23
+   6.2.   Optional Content-Description Header Field.......... 24
+   7.     The Predefined Content-Type Values................. 24
+   7.1.   The Text Content-Type.............................. 24
+   7.1.1. The charset parameter.............................. 25
+   7.1.2. The Text/plain subtype............................. 28
+   7.2.   The Multipart Content-Type......................... 28
+   7.2.1. Multipart:  The common syntax...................... 29
+   7.2.2. The Multipart/mixed (primary) subtype.............. 34
+   7.2.3. The Multipart/alternative subtype.................. 34
+   7.2.4. The Multipart/digest subtype....................... 36
+   7.2.5. The Multipart/parallel subtype..................... 37
+   7.2.6. Other Multipart subtypes........................... 37
+   7.3.   The Message Content-Type........................... 38
+   7.3.1. The Message/rfc822 (primary) subtype............... 38
+   7.3.2. The Message/Partial subtype........................ 39
+   7.3.3. The Message/External-Body subtype.................. 42
+   7.3.3.1.  The "ftp" and "tftp" access-types............... 44
+   7.3.3.2.  The "anon-ftp" access-type...................... 45
+   7.3.3.3.  The "local-file" and "afs" access-types......... 45
+   7.3.3.4.  The "mail-server" access-type................... 45
+   7.3.3.5.  Examples and Further Explanations............... 46
+   7.4.   The Application Content-Type....................... 49
+   7.4.1. The Application/Octet-Stream (primary) subtype..... 50
+   7.4.2. The Application/PostScript subtype................. 50
+   7.4.3. Other Application subtypes......................... 53
+   7.5.   The Image Content-Type............................. 53
+   7.6.   The Audio Content-Type............................. 54
+   7.7.   The Video Content-Type............................. 54
+   7.8.   Experimental Content-Type Values................... 54
+   8.     Summary............................................ 56
+   9.     Security Considerations............................ 56
+   10.    Authors' Addresses................................. 57
+   11.    Acknowledgements................................... 58
+   Appendix A -- Minimal MIME-Conformance.................... 60
+   Appendix B -- General Guidelines For Sending Email Data... 63
+   Appendix C -- A Complex Multipart Example................. 66
+   Appendix D -- Collected Grammar........................... 68
+
+
+
+Borenstein & Freed                                              [Page 2]
+
+RFC 1521                          MIME                    September 1993
+
+
+   Appendix E -- IANA Registration Procedures................ 72
+   E.1  Registration of New Content-type/subtype Values...... 72
+   E.2  Registration of New Access-type Values
+        for Message/external-body............................ 73
+   Appendix F -- Summary of the Seven Content-types.......... 74
+   Appendix G -- Canonical Encoding Model.................... 76
+   Appendix H -- Changes from RFC 1341....................... 78
+   References................................................ 80
+
+1.    Introduction
+
+   Since its publication in 1982, STD 11, RFC 822 [RFC-822] has defined
+   the standard format of textual mail messages on the Internet.  Its
+   success has been such that the RFC 822 format has been adopted,
+   wholly or partially, well beyond the confines of the Internet and the
+   Internet SMTP transport defined by STD 10, RFC 821 [RFC-821].  As the
+   format has seen wider use, a number of limitations have proven
+   increasingly restrictive for the user community.
+
+   RFC 822 was intended to specify a format for text messages.  As such,
+   non-text messages, such as multimedia messages that might include
+   audio or images, are simply not mentioned.  Even in the case of text,
+   however, RFC 822 is inadequate for the needs of mail users whose
+   languages require the use of character sets richer than US ASCII
+   [US-ASCII]. Since RFC 822 does not specify mechanisms for mail
+   containing audio, video, Asian language text, or even text in most
+   European languages, additional specifications are needed.
+
+   One of the notable limitations of RFC 821/822 based mail systems is
+   the fact that they limit the contents of electronic mail messages to
+   relatively short lines of seven-bit ASCII.  This forces users to
+   convert any non-textual data that they may wish to send into seven-
+   bit bytes representable as printable ASCII characters before invoking
+   a local mail UA (User Agent, a program with which human users send
+   and receive mail). Examples of such encodings currently used in the
+   Internet include pure hexadecimal, uuencode, the 3-in-4 base 64
+   scheme specified in RFC 1421, the Andrew Toolkit Representation
+   [ATK], and many others.
+
+   The limitations of RFC 822 mail become even more apparent as gateways
+   are designed to allow for the exchange of mail messages between RFC
+   822 hosts and X.400 hosts. X.400 [X400] specifies mechanisms for the
+   inclusion of non-textual body parts within electronic mail messages.
+   The current standards for the mapping of X.400 messages to RFC 822
+   messages specify either that X.400 non-textual body parts must be
+   converted to (not encoded in) an ASCII format, or that they must be
+   discarded, notifying the RFC 822 user that discarding has occurred.
+   This is clearly undesirable, as information that a user may wish to
+
+
+
+Borenstein & Freed                                              [Page 3]
+
+RFC 1521                          MIME                    September 1993
+
+
+   receive is lost.  Even though a user's UA may not have the capability
+   of dealing with the non-textual body part, the user might have some
+   mechanism external to the UA that can extract useful information from
+   the body part.  Moreover, it does not allow for the fact that the
+   message may eventually be gatewayed back into an X.400 message
+   handling system (i.e., the X.400 message is "tunneled" through
+   Internet mail), where the non-textual information would definitely
+   become useful again.
+
+   This document describes several mechanisms that combine to solve most
+   of these problems without introducing any serious incompatibilities
+   with the existing world of RFC 822 mail.  In particular, it
+   describes:
+
+   1. A MIME-Version header field, which uses a version number to
+       declare a message to be conformant with this specification and
+       allows mail processing agents to distinguish between such
+       messages and those generated by older or non-conformant software,
+       which is presumed to lack such a field.
+
+   2. A Content-Type header field, generalized from RFC 1049 [RFC-1049],
+       which can be used to specify the type and subtype of data in the
+       body of a message and to fully specify the native representation
+       (encoding) of such data.
+
+       2.a. A "text" Content-Type value, which can be used to represent
+            textual information in a number of character sets and
+            formatted text description languages in a standardized
+            manner.
+
+       2.b. A "multipart" Content-Type value, which can be used to
+            combine several body parts, possibly of differing types of
+            data, into a single message.
+
+       2.c. An "application" Content-Type value, which can be used to
+            transmit application data or binary data, and hence, among
+            other uses, to implement an electronic mail file transfer
+            service.
+
+       2.d. A "message" Content-Type value, for encapsulating another
+            mail message.
+
+       2.e An "image" Content-Type value, for transmitting still image
+            (picture) data.
+
+       2.f. An "audio" Content-Type value, for transmitting audio or
+            voice data.
+
+
+
+
+Borenstein & Freed                                              [Page 4]
+
+RFC 1521                          MIME                    September 1993
+
+
+       2.g. A "video" Content-Type value, for transmitting video or
+            moving image data, possibly with audio as part of the
+            composite video data format.
+
+   3. A Content-Transfer-Encoding header field, which can be used to
+       specify an auxiliary encoding that was applied to the data in
+       order to allow it to pass through mail transport mechanisms which
+       may have data or character set limitations.
+
+   4. Two additional header fields that can be used to further describe
+       the data in a message body, the Content-ID and Content-
+       Description header fields.
+
+   MIME has been carefully designed as an extensible mechanism, and it
+   is expected that the set of content-type/subtype pairs and their
+   associated parameters will grow significantly with time.  Several
+   other MIME fields, notably including character set names, are likely
+   to have new values defined over time.  In order to ensure that the
+   set of such values is developed in an orderly, well-specified, and
+   public manner, MIME defines a registration process which uses the
+   Internet Assigned Numbers Authority (IANA) as a central registry for
+   such values.  Appendix E provides details about how IANA registration
+   is accomplished.
+
+   Finally, to specify and promote interoperability, Appendix A of this
+   document provides a basic applicability statement for a subset of the
+   above mechanisms that defines a minimal level of "conformance" with
+   this document.
+
+      HISTORICAL NOTE: Several of the mechanisms described in this
+      document may seem somewhat strange or even baroque at first
+      reading.  It is important to note that compatibility with existing
+      standards AND robustness across existing practice were two of the
+      highest priorities of the working group that developed this
+      document.  In particular, compatibility was always favored over
+      elegance.
+
+   MIME was first defined and published as RFCs 1341 and 1342 [RFC-1341]
+   [RFC-1342].  This document is a relatively minor updating of RFC
+   1341, and is intended to supersede it.  The differences between this
+   document and RFC 1341 are summarized in Appendix H.  Please refer to
+   the current edition of the "IAB Official Protocol Standards" for the
+   standardization state and status of this protocol.  Several other RFC
+   documents will be of interest to the MIME implementor, in particular
+   [RFC 1343], [RFC-1344], and [RFC-1345].
+
+
+
+
+
+
+Borenstein & Freed                                              [Page 5]
+
+RFC 1521                          MIME                    September 1993
+
+
+2.    Notations, Conventions, and Generic BNF Grammar
+
+   This document is being published in two versions, one as plain ASCII
+   text and one as PostScript (PostScript is a trademark of Adobe
+   Systems Incorporated.).  While the text version is the official
+   specification, some will find the PostScript version easier to read.
+   The textual contents are identical.  An Andrew-format copy of this
+   document is also available from the first author (Borenstein).
+
+   Although the mechanisms specified in this document are all described
+   in prose, most are also described formally in the modified BNF
+   notation of RFC 822.  Implementors will need to be familiar with this
+   notation in order to understand this specification, and are referred
+   to RFC 822 for a complete explanation of the modified BNF notation.
+
+   Some of the modified BNF in this document makes reference to
+   syntactic entities that are defined in RFC 822 and not in this
+   document.  A complete formal grammar, then, is obtained by combining
+   the collected grammar appendix of this document with that of RFC 822
+   plus the modifications to RFC 822 defined in RFC 1123, which
+   specifically changes the syntax for `return', `date' and `mailbox'.
+
+   The term CRLF, in this document, refers to the sequence of the two
+   ASCII characters CR (13) and LF (10) which, taken together, in this
+   order, denote a line break in RFC 822 mail.
+
+   The term "character set" is used in this document to refer to a
+   method used with one or more tables to convert encoded text to a
+   series of octets.  This definition is intended to allow various kinds
+   of text encodings, from simple single-table mappings such as ASCII to
+   complex table switching methods such as those that use ISO 2022's
+   techniques.  However, a MIME character set name must fully specify
+   the mapping to be performed.
+
+   The term "message", when not further qualified, means either the
+   (complete or "top-level") message being transferred on a network, or
+   a message encapsulated in a body of type "message".
+
+   The term "body part", in this document, means one of the parts of the
+   body of a multipart entity. A body part has a header and a body, so
+   it makes sense to speak about the body of a body part.
+
+   The term "entity", in this document, means either a message or a body
+   part.  All kinds of entities share the property that they have a
+   header and a body.
+
+   The term "body", when not further qualified, means the body of an
+   entity, that is the body of either a message or of a body part.
+
+
+
+Borenstein & Freed                                              [Page 6]
+
+RFC 1521                          MIME                    September 1993
+
+
+      NOTE: The previous four definitions are clearly circular.  This is
+      unavoidable, since the overall structure of a MIME message is
+      indeed recursive.
+
+   In this document, all numeric and octet values are given in decimal
+   notation.
+
+   It must be noted that Content-Type values, subtypes, and parameter
+   names as defined in this document are case-insensitive.  However,
+   parameter values are case-sensitive unless otherwise specified for
+   the specific parameter.
+
+      FORMATTING NOTE: This document has been carefully formatted for
+      ease of reading.  The PostScript version of this document, in
+      particular, places notes like this one, which may be skipped by
+      the reader, in a smaller, italicized, font, and indents it as
+      well.  In the text version, only the indentation is preserved, so
+      if you are reading the text version of this you might consider
+      using the PostScript version instead. However, all such notes will
+      be indented and preceded by "NOTE:" or some similar introduction,
+      even in the text version.
+
+      The primary purpose of these non-essential notes is to convey
+      information about the rationale of this document, or to place this
+      document in the proper historical or evolutionary context.  Such
+      information may be skipped by those who are focused entirely on
+      building a conformant implementation, but may be of use to those
+      who wish to understand why this document is written as it is.
+
+      For ease of recognition, all BNF definitions have been placed in a
+      fixed-width font in the PostScript version of this document.
+
+3.    The MIME-Version Header Field
+
+   Since RFC 822 was published in 1982, there has really been only one
+   format standard for Internet messages, and there has been little
+   perceived need to declare the format standard in use.  This document
+   is an independent document that complements RFC 822. Although the
+   extensions in this document have been defined in such a way as to be
+   compatible with RFC 822, there are still circumstances in which it
+   might be desirable for a mail-processing agent to know whether a
+   message was composed with the new standard in mind.
+
+   Therefore, this document defines a new header field, "MIME-Version",
+   which is to be used to declare the version of the Internet message
+   body format standard in use.
+
+   Messages composed in accordance with this document MUST include such
+
+
+
+Borenstein & Freed                                              [Page 7]
+
+RFC 1521                          MIME                    September 1993
+
+
+   a header field, with the following verbatim text:
+
+   MIME-Version: 1.0
+
+   The presence of this header field is an assertion that the message
+   has been composed in compliance with this document.
+
+   Since it is possible that a future document might extend the message
+   format standard again, a formal BNF is given for the content of the
+   MIME-Version field:
+
+   version := "MIME-Version" ":" 1*DIGIT "." 1*DIGIT
+
+   Thus, future format specifiers, which might replace or extend "1.0",
+   are constrained to be two integer fields, separated by a period.  If
+   a message is received with a MIME-version value other than "1.0", it
+   cannot be assumed to conform with this specification.
+
+   Note that the MIME-Version header field is required at the top level
+   of a message. It is not required for each body part of a multipart
+   entity.  It is required for the embedded headers of a body of type
+   "message" if and only if the embedded message is itself claimed to be
+   MIME-conformant.
+
+   It is not possible to fully specify how a mail reader that conforms
+   with MIME as defined in this document should treat a message that
+   might arrive in the future with some value of MIME-Version other than
+   "1.0".  However, conformant software is encouraged to check the
+   version number and at least warn the user if an unrecognized MIME-
+   version is encountered.
+
+   It is also worth noting that version control for specific content-
+   types is not accomplished using the MIME-Version mechanism.  In
+   particular, some formats (such as application/postscript) have
+   version numbering conventions that are internal to the document
+   format.  Where such conventions exist, MIME does nothing to supersede
+   them.  Where no such conventions exist, a MIME type might use a
+   "version" parameter in the content-type field if necessary.
+
+   NOTE TO IMPLEMENTORS: All header fields defined in this document,
+   including MIME-Version, Content-type, etc., are subject to the
+   general syntactic rules for header fields specified in RFC 822.  In
+   particular, all can include comments, which means that the following
+   two MIME-Version fields are equivalent:
+
+                    MIME-Version: 1.0
+                    MIME-Version: 1.0 (Generated by GBD-killer 3.7)
+
+
+
+
+Borenstein & Freed                                              [Page 8]
+
+RFC 1521                          MIME                    September 1993
+
+
+4.    The Content-Type Header Field
+
+   The purpose of the Content-Type field is to describe the data
+   contained in the body fully enough that the receiving user agent can
+   pick an appropriate agent or mechanism to present the data to the
+   user, or otherwise deal with the data in an appropriate manner.
+
+   HISTORICAL NOTE: The Content-Type header field was first defined in
+   RFC 1049.  RFC 1049 Content-types used a simpler and less powerful
+   syntax, but one that is largely compatible with the mechanism given
+   here.
+
+   The Content-Type header field is used to specify the nature of the
+   data in the body of an entity, by giving type and subtype
+   identifiers, and by providing auxiliary information that may be
+   required for certain types.  After the type and subtype names, the
+   remainder of the header field is simply a set of parameters,
+   specified in an attribute/value notation.  The set of meaningful
+   parameters differs for the different types.  In particular, there are
+   NO globally-meaningful parameters that apply to all content-types.
+   Global mechanisms are best addressed, in the MIME model, by the
+   definition of additional Content-* header fields.  The ordering of
+   parameters is not significant.  Among the defined parameters is a
+   "charset" parameter by which the character set used in the body may
+   be declared. Comments are allowed in accordance with RFC 822 rules
+   for structured header fields.
+
+   In general, the top-level Content-Type is used to declare the general
+   type of data, while the subtype specifies a specific format for that
+   type of data.  Thus, a Content-Type of "image/xyz" is enough to tell
+   a user agent that the data is an image, even if the user agent has no
+   knowledge of the specific image format "xyz".  Such information can
+   be used, for example, to decide whether or not to show a user the raw
+   data from an unrecognized subtype -- such an action might be
+   reasonable for unrecognized subtypes of text, but not for
+   unrecognized subtypes of image or audio.  For this reason, registered
+   subtypes of audio, image, text, and video, should not contain
+   embedded information that is really of a different type.  Such
+   compound types should be represented using the "multipart" or
+   "application" types.
+
+   Parameters are modifiers of the content-subtype, and do not
+   fundamentally affect the requirements of the host system.  Although
+   most parameters make sense only with certain content-types, others
+   are "global" in the sense that they might apply to any subtype.  For
+   example, the "boundary" parameter makes sense only for the
+   "multipart" content-type, but the "charset" parameter might make
+   sense with several content-types.
+
+
+
+Borenstein & Freed                                              [Page 9]
+
+RFC 1521                          MIME                    September 1993
+
+
+   An initial set of seven Content-Types is defined by this document.
+   This set of top-level names is intended to be substantially complete.
+   It is expected that additions to the larger set of supported types
+   can generally be accomplished by the creation of new subtypes of
+   these initial types.  In the future, more top-level types may be
+   defined only by an extension to this standard.  If another primary
+   type is to be used for any reason, it must be given a name starting
+   with "X-" to indicate its non-standard status and to avoid a
+   potential conflict with a future official name.
+
+   In the Augmented BNF notation of RFC 822, a Content-Type header field
+   value is defined as follows:
+
+     content  :=   "Content-Type"  ":"  type  "/"  subtype  *(";"
+     parameter)
+               ; case-insensitive matching of type and subtype
+
+     type :=          "application"     / "audio"
+               / "image"           / "message"
+               / "multipart"  / "text"
+               / "video"           / extension-token
+               ; All values case-insensitive
+
+     extension-token :=  x-token / iana-token
+
+     iana-token := <a publicly-defined extension token,
+               registered with IANA, as specified in
+               appendix E>
+
+     x-token := <The two characters "X-" or "x-" followed, with
+                 no intervening white space, by any token>
+
+     subtype := token ; case-insensitive
+
+     parameter := attribute "=" value
+
+     attribute := token   ; case-insensitive
+
+     value := token / quoted-string
+
+     token  :=  1*<any (ASCII) CHAR except SPACE, CTLs,
+                   or tspecials>
+
+     tspecials :=  "(" / ")" / "<" / ">" / "@"
+                /  "," / ";" / ":" / "\" / <">
+                /  "/" / "[" / "]" / "?" / "="
+               ; Must be in quoted-string,
+               ; to use within parameter values
+
+
+
+Borenstein & Freed                                             [Page 10]
+
+RFC 1521                          MIME                    September 1993
+
+
+   Note that the definition of "tspecials" is the same as the RFC 822
+   definition of "specials" with the addition of the three characters
+   "/", "?", and "=", and the removal of ".".
+
+   Note also that a subtype specification is MANDATORY.  There are no
+   default subtypes.
+
+   The type, subtype, and parameter names are not case sensitive.  For
+   example, TEXT, Text, and TeXt are all equivalent.  Parameter values
+   are normally case sensitive, but certain parameters are interpreted
+   to be case-insensitive, depending on the intended use.  (For example,
+   multipart boundaries are case-sensitive, but the "access-type" for
+   message/External-body is not case-sensitive.)
+
+   Beyond this syntax, the only constraint on the definition of subtype
+   names is the desire that their uses must not conflict.  That is, it
+   would be undesirable to have two different communities using
+   "Content-Type: application/foobar" to mean two different things.  The
+   process of defining new content-subtypes, then, is not intended to be
+   a mechanism for imposing restrictions, but simply a mechanism for
+   publicizing the usages. There are, therefore, two acceptable
+   mechanisms for defining new Content-Type subtypes:
+
+            1.  Private values (starting with "X-") may be
+                defined bilaterally between two cooperating
+                agents without outside registration or
+                standardization.
+
+            2.  New standard values must be documented,
+                registered with, and approved by IANA, as
+                described in Appendix E.  Where intended for
+                public use, the formats they refer to must
+                also be defined by a published specification,
+                and possibly offered for standardization.
+
+   The seven standard initial predefined Content-Types are detailed in
+   the bulk of this document.  They are:
+
+    text -- textual information.  The primary subtype,
+         "plain", indicates plain (unformatted) text.  No
+         special software is required to get the full
+         meaning of the text, aside from support for the
+         indicated character set.  Subtypes are to be used
+         for enriched text in forms where application
+         software may enhance the appearance of the text,
+         but such software must not be required in order to
+         get the general idea of the content.  Possible
+         subtypes thus include any readable word processor
+
+
+
+Borenstein & Freed                                             [Page 11]
+
+RFC 1521                          MIME                    September 1993
+
+
+         format.  A very simple and portable subtype,
+         richtext, was defined in RFC 1341, with a future
+         revision expected.
+
+    multipart -- data consisting of multiple parts of
+         independent data types.  Four initial subtypes
+         are defined, including the primary "mixed"
+         subtype, "alternative" for representing the same
+         data in multiple formats, "parallel" for parts
+         intended to be viewed simultaneously, and "digest"
+         for multipart entities in which each part is of
+         type "message".
+
+    message -- an encapsulated message.  A body of
+         Content-Type "message" is itself all or part of a
+         fully formatted RFC 822 conformant message which
+         may contain its own different Content-Type header
+         field.  The primary subtype is "rfc822".  The
+         "partial" subtype is defined for partial messages,
+         to permit the fragmented transmission of bodies
+         that are thought to be too large to be passed
+         through mail transport facilities.  Another
+         subtype, "External-body", is defined for
+         specifying large bodies by reference to an
+         external data source.
+
+    image -- image data.  Image requires a display device
+         (such as a graphical display, a printer, or a FAX
+         machine) to view the information.  Initial
+         subtypes are defined for two widely-used image
+         formats, jpeg and gif.
+
+    audio -- audio data, with initial subtype "basic".
+         Audio requires an audio output device (such as a
+         speaker or a telephone) to "display" the contents.
+
+    video -- video data.  Video requires the capability to
+         display moving images, typically including
+         specialized hardware and software.  The initial
+         subtype is "mpeg".
+
+    application -- some other kind of data, typically
+         either uninterpreted binary data or information to
+         be processed by a mail-based application.  The
+         primary subtype, "octet-stream", is to be used in
+         the case of uninterpreted binary data, in which
+         case the simplest recommended action is to offer
+         to write the information into a file for the user.
+
+
+
+Borenstein & Freed                                             [Page 12]
+
+RFC 1521                          MIME                    September 1993
+
+
+         An additional subtype, "PostScript", is defined
+         for transporting PostScript documents in bodies.
+         Other expected uses for "application" include
+         spreadsheets, data for mail-based scheduling
+         systems, and languages for "active"
+         (computational) email.  (Note that active email
+         and other application data may entail several
+         security considerations, which are discussed later
+         in this memo, particularly in the context of
+         application/PostScript.)
+
+   Default RFC 822 messages are typed by this protocol as plain text in
+   the US-ASCII character set, which can be explicitly specified as
+   "Content-type: text/plain; charset=us-ascii".  If no Content-Type is
+   specified, this default is assumed.  In the presence of a MIME-
+   Version header field, a receiving User Agent can also assume that
+   plain US-ASCII text was the sender's intent.  In the absence of a
+   MIME-Version specification, plain US-ASCII text must still be
+   assumed, but the sender's intent might have been otherwise.
+
+      RATIONALE: In the absence of any Content-Type header field or
+      MIME-Version header field, it is impossible to be certain that a
+      message is actually text in the US-ASCII character set, since it
+      might well be a message that, using the conventions that predate
+      this document, includes text in another character set or non-
+      textual data in a manner that cannot be automatically recognized
+      (e.g., a uuencoded compressed UNIX tar file).  Although there is
+      no fully acceptable alternative to treating such untyped messages
+      as "text/plain; charset=us-ascii", implementors should remain
+      aware that if a message lacks both the MIME-Version and the
+      Content-Type header fields, it may in practice contain almost
+      anything.
+
+   It should be noted that the list of Content-Type values given here
+   may be augmented in time, via the mechanisms described above, and
+   that the set of subtypes is expected to grow substantially.
+
+   When a mail reader encounters mail with an unknown Content-type
+   value, it should generally treat it as equivalent to
+   "application/octet-stream", as described later in this document.
+
+5.    The Content-Transfer-Encoding Header Field
+
+   Many Content-Types which could usefully be transported via email are
+   represented, in their "natural" format, as 8-bit character or binary
+   data.  Such data cannot be transmitted over some transport protocols.
+   For example, RFC 821 restricts mail messages to 7-bit US-ASCII data
+   with lines no longer than 1000 characters.
+
+
+
+Borenstein & Freed                                             [Page 13]
+
+RFC 1521                          MIME                    September 1993
+
+
+   It is necessary, therefore, to define a standard mechanism for re-
+   encoding such data into a 7-bit short-line format.  This document
+   specifies that such encodings will be indicated by a new "Content-
+   Transfer-Encoding" header field.  The Content-Transfer-Encoding field
+   is used to indicate the type of transformation that has been used in
+   order to represent the body in an acceptable manner for transport.
+
+   Unlike Content-Types, a proliferation of Content-Transfer-Encoding
+   values is undesirable and unnecessary.  However, establishing only a
+   single Content-Transfer-Encoding mechanism does not seem possible.
+   There is a tradeoff between the desire for a compact and efficient
+   encoding of largely-binary data and the desire for a readable
+   encoding of data that is mostly, but not entirely, 7-bit data.  For
+   this reason, at least two encoding mechanisms are necessary: a
+   "readable" encoding and a "dense" encoding.
+
+   The Content-Transfer-Encoding field is designed to specify an
+   invertible mapping between the "native" representation of a type of
+   data and a representation that can be readily exchanged using 7 bit
+   mail transport protocols, such as those defined by RFC 821 (SMTP).
+   This field has not been defined by any previous standard. The field's
+   value is a single token specifying the type of encoding, as
+   enumerated below.  Formally:
+
+   encoding := "Content-Transfer-Encoding" ":" mechanism
+
+   mechanism :=     "7bit"  ;  case-insensitive
+                  / "quoted-printable"
+                  / "base64"
+                  / "8bit"
+                  / "binary"
+                  / x-token
+
+   These values are not case sensitive.  That is, Base64 and BASE64 and
+   bAsE64 are all equivalent.  An encoding type of 7BIT requires that
+   the body is already in a seven-bit mail-ready representation.  This
+   is the default value -- that is, "Content-Transfer-Encoding: 7BIT" is
+   assumed if the Content-Transfer-Encoding header field is not present.
+
+   The values "8bit", "7bit", and "binary" all mean that NO encoding has
+   been performed. However, they are potentially useful as indications
+   of the kind of data contained in the object, and therefore of the
+   kind of encoding that might need to be performed for transmission in
+   a given transport system.  In particular:
+
+       "7bit" means that the data is all represented as short
+            lines of US-ASCII data.
+
+
+
+
+Borenstein & Freed                                             [Page 14]
+
+RFC 1521                          MIME                    September 1993
+
+
+       "8bit" means that the lines are short, but there may be
+            non-ASCII characters (octets with the high-order
+            bit set).
+
+       "Binary" means that not only may non-ASCII characters
+            be present, but also that the lines are not
+            necessarily short enough for SMTP transport.
+
+   The difference between "8bit" (or any other conceivable bit-width
+   token) and the "binary" token is that "binary" does not require
+   adherence to any limits on line length or to the SMTP CRLF semantics,
+   while the bit-width tokens do require such adherence.  If the body
+   contains data in any bit-width other than 7-bit, the appropriate
+   bit-width Content-Transfer-Encoding token must be used (e.g., "8bit"
+   for unencoded 8 bit wide data).  If the body contains binary data,
+   the "binary" Content-Transfer-Encoding token must be used.
+
+      NOTE: The distinction between the Content-Transfer-Encoding values
+      of "binary", "8bit", etc.  may seem unimportant, in that all of
+      them really mean "none" -- that is, there has been no encoding of
+      the data for transport.  However, clear labeling will be of
+      enormous value to gateways between future mail transport systems
+      with differing capabilities in transporting data that do not meet
+      the restrictions of RFC 821 transport.
+
+      Mail transport for unencoded 8-bit data is defined in RFC-1426
+      [RFC-1426].  As of the publication of this document, there are no
+      standardized Internet mail transports for which it is legitimate
+      to include unencoded binary data in mail bodies.  Thus there are
+      no circumstances in which the "binary" Content-Transfer-Encoding
+      is actually legal on the Internet.  However, in the event that
+      binary mail transport becomes a reality in Internet mail, or when
+      this document is used in conjunction with any other binary-capable
+      transport mechanism, binary bodies should be labeled as such using
+      this mechanism.
+
+      NOTE: The five values defined for the Content-Transfer-Encoding
+      field imply nothing about the Content-Type other than the
+      algorithm by which it was encoded or the transport system
+      requirements if unencoded.
+
+   Implementors may, if necessary, define new Content-Transfer-Encoding
+   values, but must use an x-token, which is a name prefixed by "X-" to
+   indicate its non-standard status, e.g., "Content-Transfer-Encoding:
+   x-my-new-encoding".  However, unlike Content-Types and subtypes, the
+   creation of new Content-Transfer-Encoding values is explicitly and
+   strongly discouraged, as it seems likely to hinder interoperability
+   with little potential benefit.  Their use is allowed only as the
+
+
+
+Borenstein & Freed                                             [Page 15]
+
+RFC 1521                          MIME                    September 1993
+
+
+   result of an agreement between cooperating user agents.
+
+   If a Content-Transfer-Encoding header field appears as part of a
+   message header, it applies to the entire body of that message.  If a
+   Content-Transfer-Encoding header field appears as part of a body
+   part's headers, it applies only to the body of that body part.  If an
+   entity is of type "multipart" or "message", the Content-Transfer-
+   Encoding is not permitted to have any value other than a bit width
+   (e.g., "7bit", "8bit", etc.) or "binary".
+
+   It should be noted that email is character-oriented, so that the
+   mechanisms described here are mechanisms for encoding arbitrary octet
+   streams, not bit streams.  If a bit stream is to be encoded via one
+   of these mechanisms, it must first be converted to an 8-bit byte
+   stream using the network standard bit order ("big-endian"), in which
+   the earlier bits in a stream become the higher-order bits in a byte.
+   A bit stream not ending at an 8-bit boundary must be padded with
+   zeroes.  This document provides a mechanism for noting the addition
+   of such padding in the case of the application Content-Type, which
+   has a "padding" parameter.
+
+   The encoding mechanisms defined here explicitly encode all data in
+   ASCII.  Thus, for example, suppose an entity has header fields such
+   as:
+
+        Content-Type: text/plain; charset=ISO-8859-1
+        Content-transfer-encoding: base64
+
+   This must be interpreted to mean that the body is a base64 ASCII
+   encoding of data that was originally in ISO-8859-1, and will be in
+   that character set again after decoding.
+
+   The following sections will define the two standard encoding
+   mechanisms.  The definition of new content-transfer-encodings is
+   explicitly discouraged and should only occur when absolutely
+   necessary.  All content-transfer-encoding namespace except that
+   beginning with "X-" is explicitly reserved to the IANA for future
+   use.  Private agreements about content-transfer-encodings are also
+   explicitly discouraged.
+
+   Certain Content-Transfer-Encoding values may only be used on certain
+   Content-Types.  In particular, it is expressly forbidden to use any
+   encodings other than "7bit", "8bit", or "binary" with any Content-
+   Type that recursively includes other Content-Type fields, notably the
+   "multipart" and "message" Content-Types.  All encodings that are
+   desired for bodies of type multipart or message must be done at the
+   innermost level, by encoding the actual body that needs to be
+   encoded.
+
+
+
+Borenstein & Freed                                             [Page 16]
+
+RFC 1521                          MIME                    September 1993
+
+
+      NOTE ON ENCODING RESTRICTIONS: Though the prohibition against
+      using content-transfer-encodings on data of type multipart or
+      message may seem overly restrictive, it is necessary to prevent
+      nested encodings, in which data are passed through an encoding
+      algorithm multiple times, and must be decoded multiple times in
+      order to be properly viewed.  Nested encodings add considerable
+      complexity to user agents: aside from the obvious efficiency
+      problems with such multiple encodings, they can obscure the basic
+      structure of a message.  In particular, they can imply that
+      several decoding operations are necessary simply to find out what
+      types of objects a message contains.  Banning nested encodings may
+      complicate the job of certain mail gateways, but this seems less
+      of a problem than the effect of nested encodings on user agents.
+
+      NOTE ON THE RELATIONSHIP BETWEEN CONTENT-TYPE AND CONTENT-
+      TRANSFER-ENCODING: It may seem that the Content-Transfer-Encoding
+      could be inferred from the characteristics of the Content-Type
+      that is to be encoded, or, at the very least, that certain
+      Content-Transfer-Encodings could be mandated for use with specific
+      Content-Types. There are several reasons why this is not the case.
+      First, given the varying types of transports used for mail, some
+      encodings may be appropriate for some Content-Type/transport
+      combinations and not for others.  (For example, in an 8-bit
+      transport, no encoding would be required for text in certain
+      character sets, while such encodings are clearly required for 7-
+      bit SMTP.)  Second, certain Content-Types may require different
+      types of transfer encoding under different circumstances. For
+      example, many PostScript bodies might consist entirely of short
+      lines of 7-bit data and hence require little or no encoding.
+      Other PostScript bodies (especially those using Level 2
+      PostScript's binary encoding mechanism) may only be reasonably
+      represented using a binary transport encoding. Finally, since
+      Content-Type is intended to be an open-ended specification
+      mechanism, strict specification of an association between
+      Content-Types and encodings effectively couples the specification
+      of an application protocol with a specific lower-level transport.
+      This is not desirable since the developers of a Content-Type
+      should not have to be aware of all the transports in use and what
+      their limitations are.
+
+      NOTE ON TRANSLATING ENCODINGS: The quoted-printable and base64
+      encodings are designed so that conversion between them is
+      possible.  The only issue that arises in such a conversion is the
+      handling of line breaks.  When converting from quoted-printable to
+      base64 a line break must be converted into a CRLF sequence.
+      Similarly, a CRLF sequence in base64 data must be converted to a
+      quoted-printable line break, but ONLY when converting text data.
+
+
+
+
+Borenstein & Freed                                             [Page 17]
+
+RFC 1521                          MIME                    September 1993
+
+
+      NOTE ON CANONICAL ENCODING MODEL: There was some confusion, in
+      earlier drafts of this memo, regarding the model for when email
+      data was to be converted to canonical form and encoded, and in
+      particular how this process would affect the treatment of CRLFs,
+      given that the representation of newlines varies greatly from
+      system to system, and the relationship between content-transfer-
+      encodings and character sets.  For this reason, a canonical model
+      for encoding is presented as Appendix G.
+
+5.1.  Quoted-Printable Content-Transfer-Encoding
+
+   The Quoted-Printable encoding is intended to represent data that
+   largely consists of octets that correspond to printable characters in
+   the ASCII character set.  It encodes the data in such a way that the
+   resulting octets are unlikely to be modified by mail transport.  If
+   the data being encoded are mostly ASCII text, the encoded form of the
+   data remains largely recognizable by humans.  A body which is
+   entirely ASCII may also be encoded in Quoted-Printable to ensure the
+   integrity of the data should the message pass through a character-
+   translating, and/or line-wrapping gateway.
+
+   In this encoding, octets are to be represented as determined by the
+   following rules:
+
+      Rule #1: (General 8-bit representation) Any octet, except those
+      indicating a line break according to the newline convention of the
+      canonical (standard) form of the data being encoded, may be
+      represented by an "=" followed by a two digit hexadecimal
+      representation of the octet's value.  The digits of the
+      hexadecimal alphabet, for this purpose, are "0123456789ABCDEF".
+      Uppercase letters must be used when sending hexadecimal data,
+      though a robust implementation may choose to recognize lowercase
+      letters on receipt.  Thus, for example, the value 12 (ASCII form
+      feed) can be represented by "=0C", and the value 61 (ASCII EQUAL
+      SIGN) can be represented by "=3D".  Except when the following
+      rules allow an alternative encoding, this rule is mandatory.
+
+      Rule #2: (Literal representation) Octets with decimal values of 33
+      through 60 inclusive, and 62 through 126, inclusive, MAY be
+      represented as the ASCII characters which correspond to those
+      octets (EXCLAMATION POINT through LESS THAN, and GREATER THAN
+      through TILDE, respectively).
+
+      Rule #3: (White Space): Octets with values of 9 and 32 MAY be
+      represented as ASCII TAB (HT) and SPACE characters, respectively,
+      but MUST NOT be so represented at the end of an encoded line. Any
+      TAB (HT) or SPACE characters on an encoded line MUST thus be
+      followed on that line by a printable character.  In particular, an
+
+
+
+Borenstein & Freed                                             [Page 18]
+
+RFC 1521                          MIME                    September 1993
+
+
+      "=" at the end of an encoded line, indicating a soft line break
+      (see rule #5) may follow one or more TAB (HT) or SPACE characters.
+      It follows that an octet with value 9 or 32 appearing at the end
+      of an encoded line must be represented according to Rule #1.  This
+      rule is necessary because some MTAs (Message Transport Agents,
+      programs which transport messages from one user to another, or
+      perform a part of such transfers) are known to pad lines of text
+      with SPACEs, and others are known to remove "white space"
+      characters from the end of a line.  Therefore, when decoding a
+      Quoted-Printable body, any trailing white space on a line must be
+      deleted, as it will necessarily have been added by intermediate
+      transport agents.
+
+      Rule #4 (Line Breaks): A line break in a text body, independent of
+      what its representation is following the canonical representation
+      of the data being encoded, must be represented by a (RFC 822) line
+      break, which is a CRLF sequence, in the Quoted-Printable encoding.
+      Since the canonical representation of types other than text do not
+      generally include the representation of line breaks, no hard line
+      breaks (i.e.  line breaks that are intended to be meaningful and
+      to be displayed to the user) should occur in the quoted-printable
+      encoding of such types.  Of course, occurrences of "=0D", "=0A",
+      "0A=0D" and "=0D=0A" will eventually be encountered.  In general,
+      however, base64 is preferred over quoted-printable for binary
+      data.
+
+      Note that many implementations may elect to encode the local
+      representation of various content types directly, as described in
+      Appendix G.  In particular, this may apply to plain text material
+      on systems that use newline conventions other than CRLF
+      delimiters. Such an implementation is permissible, but the
+      generation of line breaks must be generalized to account for the
+      case where alternate representations of newline sequences are
+      used.
+
+      Rule #5 (Soft Line Breaks): The Quoted-Printable encoding REQUIRES
+      that encoded lines be no more than 76 characters long. If longer
+      lines are to be encoded with the Quoted-Printable encoding, 'soft'
+      line breaks must be used. An equal sign as the last character on a
+      encoded line indicates such a non-significant ('soft') line break
+      in the encoded text. Thus if the "raw" form of the line is a
+      single unencoded line that says:
+
+          Now's the time for all folk to come to the aid of
+          their country.
+
+      This can be represented, in the Quoted-Printable encoding, as
+
+
+
+
+Borenstein & Freed                                             [Page 19]
+
+RFC 1521                          MIME                    September 1993
+
+
+          Now's the time =
+          for all folk to come=
+           to the aid of their country.
+
+      This provides a mechanism with which long lines are encoded in
+      such a way as to be restored by the user agent.  The 76 character
+      limit does not count the trailing CRLF, but counts all other
+      characters, including any equal signs.
+
+   Since the hyphen character ("-") is represented as itself in the
+   Quoted-Printable encoding, care must be taken, when encapsulating a
+   quoted-printable encoded body in a multipart entity, to ensure that
+   the encapsulation boundary does not appear anywhere in the encoded
+   body.  (A good strategy is to choose a boundary that includes a
+   character sequence such as "=_" which can never appear in a quoted-
+   printable body.  See the definition of multipart messages later in
+   this document.)
+
+      NOTE: The quoted-printable encoding represents something of a
+      compromise between readability and reliability in transport.
+      Bodies encoded with the quoted-printable encoding will work
+      reliably over most mail gateways, but may not work perfectly over
+      a few gateways, notably those involving translation into EBCDIC.
+      (In theory, an EBCDIC gateway could decode a quoted-printable body
+      and re-encode it using base64, but such gateways do not yet
+      exist.)  A higher level of confidence is offered by the base64
+      Content-Transfer-Encoding.  A way to get reasonably reliable
+      transport through EBCDIC gateways is to also quote the ASCII
+      characters
+
+             !"#$@[\]^`{|}~
+
+      according to rule #1.  See Appendix B for more information.
+
+   Because quoted-printable data is generally assumed to be line-
+   oriented, it is to be expected that the representation of the breaks
+   between the lines of quoted printable data may be altered in
+   transport, in the same manner that plain text mail has always been
+   altered in Internet mail when passing between systems with differing
+   newline conventions.  If such alterations are likely to constitute a
+   corruption of the data, it is probably more sensible to use the
+   base64 encoding rather than the quoted-printable encoding.
+
+   WARNING TO IMPLEMENTORS: If binary data are encoded in quoted-
+   printable, care must be taken to encode CR and LF characters as "=0D"
+   and "=0A", respectively.  In particular, a CRLF sequence in binary
+   data should be encoded as "=0D=0A".  Otherwise, if CRLF were
+   represented as a hard line break, it might be incorrectly decoded on
+
+
+
+Borenstein & Freed                                             [Page 20]
+
+RFC 1521                          MIME                    September 1993
+
+
+   platforms with different line break conventions.
+
+   For formalists, the syntax of quoted-printable data is described by
+   the following grammar:
+
+   quoted-printable := ([*(ptext / SPACE / TAB) ptext] ["="] CRLF)
+        ; Maximum line length of 76 characters excluding CRLF
+
+   ptext := octet /<any ASCII character except "=", SPACE, or TAB>
+        ; characters not listed as "mail-safe" in Appendix B
+        ; are also not recommended.
+
+   octet := "=" 2(DIGIT / "A" / "B" / "C" / "D" / "E" / "F")
+        ; octet must be used for characters > 127, =, SPACE, or TAB,
+        ; and is recommended for any characters not listed in
+        ; Appendix B as "mail-safe".
+
+5.2.  Base64 Content-Transfer-Encoding
+
+   The Base64 Content-Transfer-Encoding is designed to represent
+   arbitrary sequences of octets in a form that need not be humanly
+   readable.  The encoding and decoding algorithms are simple, but the
+   encoded data are consistently only about 33 percent larger than the
+   unencoded data.  This encoding is virtually identical to the one used
+   in Privacy Enhanced Mail (PEM) applications, as defined in RFC 1421.
+   The base64 encoding is adapted from RFC 1421, with one change: base64
+   eliminates the "*" mechanism for embedded clear text.
+
+   A 65-character subset of US-ASCII is used, enabling 6 bits to be
+   represented per printable character. (The extra 65th character, "=",
+   is used to signify a special processing function.)
+
+      NOTE: This subset has the important property that it is
+      represented identically in all versions of ISO 646, including US
+      ASCII, and all characters in the subset are also represented
+      identically in all versions of EBCDIC.  Other popular encodings,
+      such as the encoding used by the uuencode utility and the base85
+      encoding specified as part of Level 2 PostScript, do not share
+      these properties, and thus do not fulfill the portability
+      requirements a binary transport encoding for mail must meet.
+
+   The encoding process represents 24-bit groups of input bits as output
+   strings of 4 encoded characters. Proceeding from left to right, a
+   24-bit input group is formed by concatenating 3 8-bit input groups.
+   These 24 bits are then treated as 4 concatenated 6-bit groups, each
+   of which is translated into a single digit in the base64 alphabet.
+   When encoding a bit stream via the base64 encoding, the bit stream
+   must be presumed to be ordered with the most-significant-bit first.
+
+
+
+Borenstein & Freed                                             [Page 21]
+
+RFC 1521                          MIME                    September 1993
+
+
+   That is, the first bit in the stream will be the high-order bit in
+   the first byte, and the eighth bit will be the low-order bit in the
+   first byte, and so on.
+
+   Each 6-bit group is used as an index into an array of 64 printable
+   characters. The character referenced by the index is placed in the
+   output string. These characters, identified in Table 1, below, are
+   selected so as to be universally representable, and the set excludes
+   characters with particular significance to SMTP (e.g., ".", CR, LF)
+   and to the encapsulation boundaries defined in this document (e.g.,
+   "-").
+
+                            Table 1: The Base64 Alphabet
+
+      Value Encoding  Value Encoding  Value Encoding  Value Encoding
+           0 A            17 R            34 i            51 z
+           1 B            18 S            35 j            52 0
+           2 C            19 T            36 k            53 1
+           3 D            20 U            37 l            54 2
+           4 E            21 V            38 m            55 3
+           5 F            22 W            39 n            56 4
+           6 G            23 X            40 o            57 5
+           7 H            24 Y            41 p            58 6
+           8 I            25 Z            42 q            59 7
+           9 J            26 a            43 r            60 8
+          10 K            27 b            44 s            61 9
+          11 L            28 c            45 t            62 +
+          12 M            29 d            46 u            63 /
+          13 N            30 e            47 v
+          14 O            31 f            48 w         (pad) =
+          15 P            32 g            49 x
+          16 Q            33 h            50 y
+
+   The output stream (encoded bytes) must be represented in lines of no
+   more than 76 characters each.  All line breaks or other characters
+   not found in Table 1 must be ignored by decoding software.  In base64
+   data, characters other than those in Table 1, line breaks, and other
+   white space probably indicate a transmission error, about which a
+   warning message or even a message rejection might be appropriate
+   under some circumstances.
+
+   Special processing is performed if fewer than 24 bits are available
+   at the end of the data being encoded.  A full encoding quantum is
+   always completed at the end of a body.  When fewer than 24 input bits
+   are available in an input group, zero bits are added (on the right)
+   to form an integral number of 6-bit groups.  Padding at the end of
+   the data is performed using the '=' character.  Since all base64
+   input is an integral number of octets, only the following cases can
+
+
+
+Borenstein & Freed                                             [Page 22]
+
+RFC 1521                          MIME                    September 1993
+
+
+   arise: (1) the final quantum of encoding input is an integral
+   multiple of 24 bits; here, the final unit of encoded output will be
+   an integral multiple of 4 characters with no "=" padding, (2) the
+   final quantum of encoding input is exactly 8 bits; here, the final
+   unit of encoded output will be two characters followed by two "="
+   padding characters, or (3) the final quantum of encoding input is
+   exactly 16 bits; here, the final unit of encoded output will be three
+   characters followed by one "=" padding character.
+
+   Because it is used only for padding at the end of the data, the
+   occurrence of any '=' characters may be taken as evidence that the
+   end of the data has been reached (without truncation in transit).  No
+   such assurance is possible, however, when the number of octets
+   transmitted was a multiple of three.
+
+   Any characters outside of the base64 alphabet are to be ignored in
+   base64-encoded data.  The same applies to any illegal sequence of
+   characters in the base64 encoding, such as "====="
+
+   Care must be taken to use the proper octets for line breaks if base64
+   encoding is applied directly to text material that has not been
+   converted to canonical form.  In particular, text line breaks must be
+   converted into CRLF sequences prior to base64 encoding. The important
+   thing to note is that this may be done directly by the encoder rather
+   than in a prior canonicalization step in some implementations.
+
+      NOTE: There is no need to worry about quoting apparent
+      encapsulation boundaries within base64-encoded parts of multipart
+      entities because no hyphen characters are used in the base64
+      encoding.
+
+6.    Additional Content-Header Fields
+
+6.1.  Optional Content-ID Header Field
+
+   In constructing a high-level user agent, it may be desirable to allow
+   one body to make reference to another.  Accordingly, bodies may be
+   labeled using the "Content-ID" header field, which is syntactically
+   identical to the "Message-ID" header field:
+
+   id :=  "Content-ID" ":" msg-id
+   Like the Message-ID values, Content-ID values must be generated to be
+   world-unique.
+
+   The Content-ID value may be used for uniquely identifying MIME
+   entities in several contexts, particularly for cacheing data
+   referenced by the message/external-body mechanism.  Although the
+   Content-ID header is generally optional, its use is mandatory in
+
+
+
+Borenstein & Freed                                             [Page 23]
+
+RFC 1521                          MIME                    September 1993
+
+
+   implementations which generate data of the optional MIME Content-type
+   "message/external-body".  That is, each message/external-body entity
+   must have a Content-ID field to permit cacheing of such data.
+
+   It is also worth noting that the Content-ID value has special
+   semantics in the case of the multipart/alternative content-type.
+   This is explained in the section of this document dealing with
+   multipart/alternative.
+
+6.2.  Optional Content-Description Header Field
+
+   The ability to associate some descriptive information with a given
+   body is often desirable. For example, it may be useful to mark an
+   "image" body as "a picture of the Space Shuttle Endeavor."  Such text
+   may be placed in the Content-Description header field.
+
+   description := "Content-Description" ":" *text
+
+   The description is presumed to be given in the US-ASCII character
+   set, although the mechanism specified in [RFC-1522] may be used for
+   non-US-ASCII Content-Description values.
+
+7.    The Predefined Content-Type Values
+
+   This document defines seven initial Content-Type values and an
+   extension mechanism for private or experimental types.  Further
+   standard types must be defined by new published specifications.  It
+   is expected that most innovation in new types of mail will take place
+   as subtypes of the seven types defined here.  The most essential
+   characteristics of the seven content-types are summarized in Appendix
+   F.
+
+7.1  The Text Content-Type
+
+   The text Content-Type is intended for sending material which is
+   principally textual in form.  It is the default Content-Type.  A
+   "charset" parameter may be used to indicate the character set of the
+   body text for some text subtypes, notably including the primary
+   subtype, "text/plain", which indicates plain (unformatted) text.  The
+   default Content-Type for Internet mail is "text/plain; charset=us-
+   ascii".
+
+   Beyond plain text, there are many formats for representing what might
+   be known as "extended text" -- text with embedded formatting and
+   presentation information.  An interesting characteristic of many such
+   representations is that they are to some extent readable even without
+   the software that interprets them.  It is useful, then, to
+   distinguish them, at the highest level, from such unreadable data as
+
+
+
+Borenstein & Freed                                             [Page 24]
+
+RFC 1521                          MIME                    September 1993
+
+
+   images, audio, or text represented in an unreadable form.  In the
+   absence of appropriate interpretation software, it is reasonable to
+   show subtypes of text to the user, while it is not reasonable to do
+   so with most nontextual data.
+
+   Such formatted textual data should be represented using subtypes of
+   text.  Plausible subtypes of text are typically given by the common
+   name of the representation format, e.g., "text/richtext" [RFC-1341].
+
+7.1.1.     The charset parameter
+
+   A critical parameter that may be specified in the Content-Type field
+   for text/plain data is the character set.  This is specified with a
+   "charset" parameter, as in:
+
+        Content-type: text/plain; charset=us-ascii
+
+   Unlike some other parameter values, the values of the charset
+   parameter are NOT case sensitive.  The default character set, which
+   must be assumed in the absence of a charset parameter, is US-ASCII.
+
+   The specification for any future subtypes of "text" must specify
+   whether or not they will also utilize a "charset" parameter, and may
+   possibly restrict its values as well.  When used with a particular
+   body, the semantics of the "charset" parameter should be identical to
+   those specified here for "text/plain", i.e., the body consists
+   entirely of characters in the given charset.  In particular, definers
+   of future text subtypes should pay close attention the the
+   implications of multibyte character sets for their subtype
+   definitions.
+
+   This RFC specifies the definition of the charset parameter for the
+   purposes of MIME to be a unique mapping of a byte stream to glyphs, a
+   mapping which does not require external profiling information.
+
+   An initial list of predefined character set names can be found at the
+   end of this section.  Additional character sets may be registered
+   with IANA, although the standardization of their use requires the
+   usual IESG [RFC-1340] review and approval.  Note that if the
+   specified character set includes 8-bit data, a Content-Transfer-
+   Encoding header field and a corresponding encoding on the data are
+   required in order to transmit the body via some mail transfer
+   protocols, such as SMTP.
+
+   The default character set, US-ASCII, has been the subject of some
+   confusion and ambiguity in the past.  Not only were there some
+   ambiguities in the definition, there have been wide variations in
+   practice.  In order to eliminate such ambiguity and variations in the
+
+
+
+Borenstein & Freed                                             [Page 25]
+
+RFC 1521                          MIME                    September 1993
+
+
+   future, it is strongly recommended that new user agents explicitly
+   specify a character set via the Content-Type header field.  "US-
+   ASCII" does not indicate an arbitrary seven-bit character code, but
+   specifies that the body uses character coding that uses the exact
+   correspondence of codes to characters specified in ASCII.  National
+   use variations of ISO 646 [ISO-646] are NOT ASCII and their use in
+   Internet mail is explicitly discouraged. The omission of the ISO 646
+   character set is deliberate in this regard.  The character set name
+   of "US-ASCII" explicitly refers to ANSI X3.4-1986 [US-ASCII] only.
+   The character set name "ASCII" is reserved and must not be used for
+   any purpose.
+
+      NOTE: RFC 821 explicitly specifies "ASCII", and references an
+      earlier version of the American Standard.  Insofar as one of the
+      purposes of specifying a Content-Type and character set is to
+      permit the receiver to unambiguously determine how the sender
+      intended the coded message to be interpreted, assuming anything
+      other than "strict ASCII" as the default would risk unintentional
+      and incompatible changes to the semantics of messages now being
+      transmitted.  This also implies that messages containing
+      characters coded according to national variations on ISO 646, or
+      using code-switching procedures (e.g., those of ISO 2022), as well
+      as 8-bit or multiple octet character encodings MUST use an
+      appropriate character set specification to be consistent with this
+      specification.
+
+   The complete US-ASCII character set is listed in [US-ASCII].  Note
+   that the control characters including DEL (0-31, 127) have no defined
+   meaning apart from the combination CRLF (ASCII values 13 and 10)
+   indicating a new line.  Two of the characters have de facto meanings
+   in wide use: FF (12) often means "start subsequent text on the
+   beginning of a new page"; and TAB or HT (9) often (though not always)
+   means "move the cursor to the next available column after the current
+   position where the column number is a multiple of 8 (counting the
+   first column as column 0)." Apart from this, any use of the control
+   characters or DEL in a body must be part of a private agreement
+   between the sender and recipient.  Such private agreements are
+   discouraged and should be replaced by the other capabilities of this
+   document.
+
+      NOTE: Beyond US-ASCII, an enormous proliferation of character sets
+      is possible. It is the opinion of the IETF working group that a
+      large number of character sets is NOT a good thing.  We would
+      prefer to specify a single character set that can be used
+      universally for representing all of the world's languages in
+      electronic mail.  Unfortunately, existing practice in several
+      communities seems to point to the continued use of multiple
+      character sets in the near future.  For this reason, we define
+
+
+
+Borenstein & Freed                                             [Page 26]
+
+RFC 1521                          MIME                    September 1993
+
+
+      names for a small number of character sets for which a strong
+      constituent base exists.
+
+   The defined charset values are:
+
+   US-ASCII -- as defined in [US-ASCII].
+
+        ISO-8859-X -- where "X" is to be replaced, as necessary, for the
+             parts of ISO-8859 [ISO-8859].  Note that the ISO 646
+             character sets have deliberately been omitted in favor of
+             their 8859 replacements, which are the designated character
+             sets for Internet mail.  As of the publication of this
+             document, the legitimate values for "X" are the digits 1
+             through 9.
+
+   The character sets specified above are the ones that were relatively
+   uncontroversial during the drafting of MIME.  This document does not
+   endorse the use of any particular character set other than US-ASCII,
+   and recognizes that the future evolution of world character sets
+   remains unclear.  It is expected that in the future, additional
+   character sets will be registered for use in MIME.
+
+   Note that the character set used, if anything other than US-ASCII,
+   must always be explicitly specified in the Content-Type field.
+
+   No other character set name may be used in Internet mail without the
+   publication of a formal specification and its registration with IANA,
+   or by private agreement, in which case the character set name must
+   begin with "X-".
+
+   Implementors are discouraged from defining new character sets for
+   mail use unless absolutely necessary.
+
+   The "charset" parameter has been defined primarily for the purpose of
+   textual data, and is described in this section for that reason.
+   However, it is conceivable that non-textual data might also wish to
+   specify a charset value for some purpose, in which case the same
+   syntax and values should be used.
+
+   In general, mail-sending software must always use the "lowest common
+   denominator" character set possible.  For example, if a body contains
+   only US-ASCII characters, it must be marked as being in the US-ASCII
+   character set, not ISO-8859-1, which, like all the ISO-8859 family of
+   character sets, is a superset of US-ASCII.  More generally, if a
+   widely-used character set is a subset of another character set, and a
+   body contains only characters in the widely-used subset, it must be
+   labeled as being in that subset.  This will increase the chances that
+   the recipient will be able to view the mail correctly.
+
+
+
+Borenstein & Freed                                             [Page 27]
+
+RFC 1521                          MIME                    September 1993
+
+
+7.1.2.     The Text/plain subtype
+
+   The primary subtype of text is "plain".  This indicates plain
+   (unformatted) text.  The default Content-Type for Internet mail,
+   "text/plain; charset=us-ascii", describes existing Internet practice.
+   That is, it is the type of body defined by RFC 822.
+
+   No other text subtype is defined by this document.
+
+   The formal grammar for the content-type header field for text is as
+   follows:
+
+   text-type := "text" "/" text-subtype [";" "charset" "=" charset]
+
+   text-subtype := "plain" / extension-token
+
+   charset := "us-ascii"/ "iso-8859-1"/ "iso-8859-2"/ "iso-8859-3"
+          / "iso-8859-4"/ "iso-8859-5"/ "iso-8859-6"/ "iso-8859-7"
+          / "iso-8859-8" / "iso-8859-9" / extension-token
+                    ; case insensitive
+
+7.2.  The Multipart Content-Type
+
+   In the case of multiple part entities, in which one or more different
+   sets of data are combined in a single body, a "multipart" Content-
+   Type field must appear in the entity's header. The body must then
+   contain one or more "body parts," each preceded by an encapsulation
+   boundary, and the last one followed by a closing boundary.  Each part
+   starts with an encapsulation boundary, and then contains a body part
+   consisting of header area, a blank line, and a body area.  Thus a
+   body part is similar to an RFC 822 message in syntax, but different
+   in meaning.
+
+   A body part is NOT to be interpreted as actually being an RFC 822
+   message.  To begin with, NO header fields are actually required in
+   body parts.  A body part that starts with a blank line, therefore, is
+   allowed and is a body part for which all default values are to be
+   assumed.  In such a case, the absence of a Content-Type header field
+   implies that the corresponding body is plain US-ASCII text.  The only
+   header fields that have defined meaning for body parts are those the
+   names of which begin with "Content-".  All other header fields are
+   generally to be ignored in body parts.  Although they should
+   generally be retained in mail processing, they may be discarded by
+   gateways if necessary.  Such other fields are permitted to appear in
+   body parts but must not be depended on.  "X-" fields may be created
+   for experimental or private purposes, with the recognition that the
+   information they contain may be lost at some gateways.
+
+
+
+
+Borenstein & Freed                                             [Page 28]
+
+RFC 1521                          MIME                    September 1993
+
+
+      NOTE: The distinction between an RFC 822 message and a body part
+      is subtle, but important. A gateway between Internet and X.400
+      mail, for example, must be able to tell the difference between a
+      body part that contains an image and a body part that contains an
+      encapsulated message, the body of which is an image.  In order to
+      represent the latter, the body part must have "Content-Type:
+      message", and its body (after the blank line) must be the
+      encapsulated message, with its own "Content-Type: image" header
+      field.  The use of similar syntax facilitates the conversion of
+      messages to body parts, and vice versa, but the distinction
+      between the two must be understood by implementors.  (For the
+      special case in which all parts actually are messages, a "digest"
+      subtype is also defined.)
+
+   As stated previously, each body part is preceded by an encapsulation
+   boundary.  The encapsulation boundary MUST NOT appear inside any of
+   the encapsulated parts.  Thus, it is crucial that the composing agent
+   be able to choose and specify the unique boundary that will separate
+   the parts.
+
+   All present and future subtypes of the "multipart" type must use an
+   identical syntax.  Subtypes may differ in their semantics, and may
+   impose additional restrictions on syntax, but must conform to the
+   required syntax for the multipart type.  This requirement ensures
+   that all conformant user agents will at least be able to recognize
+   and separate the parts of any multipart entity, even of an
+   unrecognized subtype.
+
+   As stated in the definition of the Content-Transfer-Encoding field,
+   no encoding other than "7bit", "8bit", or "binary" is permitted for
+   entities of type "multipart".  The multipart delimiters and header
+   fields are always represented as 7-bit ASCII in any case (though the
+   header fields may encode non-ASCII header text as per [RFC-1522]),
+   and data within the body parts can be encoded on a part-by-part
+   basis, with Content-Transfer-Encoding fields for each appropriate
+   body part.
+
+   Mail gateways, relays, and other mail handling agents are commonly
+   known to alter the top-level header of an RFC 822 message.  In
+   particular, they frequently add, remove, or reorder header fields.
+   Such alterations are explicitly forbidden for the body part headers
+   embedded in the bodies of messages of type "multipart."
+
+7.2.1.     Multipart:  The common syntax
+
+   All subtypes of "multipart" share a common syntax, defined in this
+   section.  A simple example of a multipart message also appears in
+   this section.  An example of a more complex multipart message is
+
+
+
+Borenstein & Freed                                             [Page 29]
+
+RFC 1521                          MIME                    September 1993
+
+
+   given in Appendix C.
+
+   The Content-Type field for multipart entities requires one parameter,
+   "boundary", which is used to specify the encapsulation boundary.  The
+   encapsulation boundary is defined as a line consisting entirely of
+   two hyphen characters ("-", decimal code 45) followed by the boundary
+   parameter value from the Content-Type header field.
+
+      NOTE: The hyphens are for rough compatibility with the earlier RFC
+      934 method of message encapsulation, and for ease of searching for
+      the boundaries in some implementations. However, it should be
+      noted that multipart messages are NOT completely compatible with
+      RFC 934 encapsulations; in particular, they do not obey RFC 934
+      quoting conventions for embedded lines that begin with hyphens.
+      This mechanism was chosen over the RFC 934 mechanism because the
+      latter causes lines to grow with each level of quoting.  The
+      combination of this growth with the fact that SMTP implementations
+      sometimes wrap long lines made the RFC 934 mechanism unsuitable
+      for use in the event that deeply-nested multipart structuring is
+      ever desired.
+
+   WARNING TO IMPLEMENTORS: The grammar for parameters on the Content-
+   type field is such that it is often necessary to enclose the
+   boundaries in quotes on the Content-type line.  This is not always
+   necessary, but never hurts.  Implementors should be sure to study the
+   grammar carefully in order to avoid producing illegal Content-type
+   fields. Thus, a typical multipart Content-Type header field might
+   look like this:
+
+                 Content-Type: multipart/mixed;
+                      boundary=gc0p4Jq0M2Yt08jU534c0p
+
+   But the following is illegal:
+
+                 Content-Type: multipart/mixed;
+                      boundary=gc0p4Jq0M:2Yt08jU534c0p
+
+   (because of the colon) and must instead be represented as
+
+                 Content-Type: multipart/mixed;
+                      boundary="gc0p4Jq0M:2Yt08jU534c0p"
+
+   This indicates that the entity consists of several parts, each itself
+   with a structure that is syntactically identical to an RFC 822
+   message, except that the header area might be completely empty, and
+   that the parts are each preceded by the line
+
+                 --gc0p4Jq0M:2Yt08jU534c0p
+
+
+
+Borenstein & Freed                                             [Page 30]
+
+RFC 1521                          MIME                    September 1993
+
+
+   Note that the encapsulation boundary must occur at the beginning of a
+   line, i.e., following a CRLF, and that the initial CRLF is considered
+   to be attached to the encapsulation boundary rather than part of the
+   preceding part.  The boundary must be followed immediately either by
+   another CRLF and the header fields for the next part, or by two
+   CRLFs, in which case there are no header fields for the next part
+   (and it is therefore assumed to be of Content-Type text/plain).
+
+      NOTE: The CRLF preceding the encapsulation line is conceptually
+      attached to the boundary so that it is possible to have a part
+      that does not end with a CRLF (line break). Body parts that must
+      be considered to end with line breaks, therefore, must have two
+      CRLFs preceding the encapsulation line, the first of which is part
+      of the preceding body part, and the second of which is part of the
+      encapsulation boundary.
+
+   Encapsulation boundaries must not appear within the encapsulations,
+   and must be no longer than 70 characters, not counting the two
+   leading hyphens.
+
+   The encapsulation boundary following the last body part is a
+   distinguished delimiter that indicates that no further body parts
+   will follow.  Such a delimiter is identical to the previous
+   delimiters, with the addition of two more hyphens at the end of the
+   line:
+
+                 --gc0p4Jq0M2Yt08jU534c0p--
+
+   There appears to be room for additional information prior to the
+   first encapsulation boundary and following the final boundary.  These
+   areas should generally be left blank, and implementations must ignore
+   anything that appears before the first boundary or after the last
+   one.
+
+      NOTE: These "preamble" and "epilogue" areas are generally not used
+      because of the lack of proper typing of these parts and the lack
+      of clear semantics for handling these areas at gateways,
+      particularly X.400 gateways.  However, rather than leaving the
+      preamble area blank, many MIME implementations have found this to
+      be a convenient place to insert an explanatory note for recipients
+      who read the message with pre-MIME software, since such notes will
+      be ignored by MIME-compliant software.
+
+      NOTE: Because encapsulation boundaries must not appear in the body
+      parts being encapsulated, a user agent must exercise care to
+      choose a unique boundary.  The boundary in the example above could
+      have been the result of an algorithm designed to produce
+      boundaries with a very low probability of already existing in the
+
+
+
+Borenstein & Freed                                             [Page 31]
+
+RFC 1521                          MIME                    September 1993
+
+
+      data to be encapsulated without having to prescan the data.
+      Alternate algorithms might result in more 'readable' boundaries
+      for a recipient with an old user agent, but would require more
+      attention to the possibility that the boundary might appear in the
+      encapsulated part.  The simplest boundary possible is something
+      like "---", with a closing boundary of "-----".
+
+   As a very simple example, the following multipart message has two
+   parts, both of them plain text, one of them explicitly typed and one
+   of them implicitly typed:
+
+      From: Nathaniel Borenstein <nsb@bellcore.com>
+      To:  Ned Freed <ned@innosoft.com>
+      Subject: Sample message
+      MIME-Version: 1.0
+      Content-type: multipart/mixed; boundary="simple
+      boundary"
+
+      This is the preamble.  It is to be ignored, though it
+      is a handy place for mail composers to include an
+      explanatory note to non-MIME conformant readers.
+      --simple boundary
+
+      This is implicitly typed plain ASCII text.
+      It does NOT end with a linebreak.
+      --simple boundary
+      Content-type: text/plain; charset=us-ascii
+
+      This is explicitly typed plain ASCII text.
+      It DOES end with a linebreak.
+
+      --simple boundary--
+      This is the epilogue.  It is also to be ignored.
+
+   The use of a Content-Type of multipart in a body part within another
+   multipart entity is explicitly allowed.  In such cases, for obvious
+   reasons, care must be taken to ensure that each nested multipart
+   entity must use a different boundary delimiter. See Appendix C for an
+   example of nested multipart entities.
+
+   The use of the multipart Content-Type with only a single body part
+   may be useful in certain contexts, and is explicitly permitted.
+
+   The only mandatory parameter for the multipart Content-Type is the
+   boundary parameter, which consists of 1 to 70 characters from a set
+   of characters known to be very robust through email gateways, and NOT
+   ending with white space.  (If a boundary appears to end with white
+   space, the white space must be presumed to have been added by a
+
+
+
+Borenstein & Freed                                             [Page 32]
+
+RFC 1521                          MIME                    September 1993
+
+
+   gateway, and must be deleted.)  It is formally specified by the
+   following BNF:
+
+   boundary := 0*69<bchars> bcharsnospace
+
+   bchars := bcharsnospace / " "
+
+   bcharsnospace :=    DIGIT / ALPHA / "'" / "(" / ")" / "+" /"_"
+                 / "," / "-" / "." / "/" / ":" / "=" / "?"
+
+   Overall, the body of a multipart entity may be specified  as
+   follows:
+
+   multipart-body := preamble 1*encapsulation
+                  close-delimiter epilogue
+
+   encapsulation := delimiter body-part CRLF
+
+   delimiter := "--" boundary CRLF ; taken from Content-Type field.
+                                   ; There must be no space
+                                   ; between "--" and boundary.
+
+   close-delimiter := "--" boundary "--" CRLF ; Again, no space
+   by "--",
+
+   preamble := discard-text   ;  to  be  ignored upon receipt.
+
+   epilogue := discard-text   ;  to  be  ignored upon receipt.
+
+   discard-text := *(*text CRLF)
+
+   body-part := <"message" as defined in RFC 822,
+             with all header fields optional, and with the
+             specified delimiter not occurring anywhere in
+             the message body, either on a line by itself
+             or as a substring anywhere.  Note that the
+             semantics of a part differ from the semantics
+             of a message, as described in the text.>
+
+      NOTE: In certain transport enclaves, RFC 822 restrictions such as
+      the one that limits bodies to printable ASCII characters may not
+      be in force.  (That is, the transport domains may resemble
+      standard Internet mail transport as specified in RFC821 and
+      assumed by RFC822, but without certain restrictions.)  The
+      relaxation of these restrictions should be construed as locally
+      extending the definition of bodies, for example to include octets
+      outside of the ASCII range, as long as these extensions are
+      supported by the transport and adequately documented in the
+
+
+
+Borenstein & Freed                                             [Page 33]
+
+RFC 1521                          MIME                    September 1993
+
+
+      Content-Transfer-Encoding header field. However, in no event are
+      headers (either message headers or body-part headers) allowed to
+      contain anything other than ASCII characters.
+
+      NOTE: Conspicuously missing from the multipart type is a notion of
+      structured, related body parts.  In general, it seems premature to
+      try to standardize interpart structure yet.  It is recommended
+      that those wishing to provide a more structured or integrated
+      multipart messaging facility should define a subtype of multipart
+      that is syntactically identical, but that always expects the
+      inclusion of a distinguished part that can be used to specify the
+      structure and integration of the other parts, probably referring
+      to them by their Content-ID field.  If this approach is used,
+      other implementations will not recognize the new subtype, but will
+      treat it as the primary subtype (multipart/mixed) and will thus be
+      able to show the user the parts that are recognized.
+
+7.2.2.     The Multipart/mixed (primary) subtype
+
+   The primary subtype for multipart, "mixed", is intended for use when
+   the body parts are independent and need to be bundled in a particular
+   order.  Any multipart subtypes that an implementation does not
+   recognize must be treated as being of subtype "mixed".
+
+7.2.3.     The Multipart/alternative subtype
+
+   The multipart/alternative type is syntactically identical to
+   multipart/mixed, but the semantics are different.  In particular,
+   each of the parts is an "alternative" version of the same
+   information.
+
+   Systems should recognize that the content of the various parts are
+   interchangeable.  Systems should choose the "best" type based on the
+   local environment and preferences, in some cases even through user
+   interaction.  As with multipart/mixed, the order of body parts is
+   significant.  In this case, the alternatives appear in an order of
+   increasing faithfulness to the original content. In general, the best
+   choice is the LAST part of a type supported by the recipient system's
+   local environment.
+
+   Multipart/alternative may be used, for example, to send mail in a
+   fancy text format in such a way that it can easily be displayed
+   anywhere:
+
+
+
+
+
+
+
+
+Borenstein & Freed                                             [Page 34]
+
+RFC 1521                          MIME                    September 1993
+
+
+   From:  Nathaniel Borenstein <nsb@bellcore.com>
+   To: Ned Freed <ned@innosoft.com>
+   Subject: Formatted text mail
+   MIME-Version: 1.0
+   Content-Type: multipart/alternative; boundary=boundary42
+
+   --boundary42
+
+   Content-Type: text/plain; charset=us-ascii
+
+      ...plain text version of message goes here....
+   --boundary42
+   Content-Type: text/richtext
+
+      .... RFC 1341 richtext version of same message goes here ...
+   --boundary42
+   Content-Type: text/x-whatever
+
+      .... fanciest formatted version of same  message  goes  here
+      ...
+   --boundary42--
+
+   In this example, users whose mail system understood the "text/x-
+   whatever" format would see only the fancy version, while other users
+   would see only the richtext or plain text version, depending on the
+   capabilities of their system.
+
+   In general, user agents that compose multipart/alternative entities
+   must place the body parts in increasing order of preference, that is,
+   with the preferred format last.  For fancy text, the sending user
+   agent should put the plainest format first and the richest format
+   last.  Receiving user agents should pick and display the last format
+   they are capable of displaying.  In the case where one of the
+   alternatives is itself of type "multipart" and contains unrecognized
+   sub-parts, the user agent may choose either to show that alternative,
+   an earlier alternative, or both.
+
+      NOTE: From an implementor's perspective, it might seem more
+      sensible to reverse this ordering, and have the plainest
+      alternative last.  However, placing the plainest alternative first
+      is the friendliest possible option when multipart/alternative
+      entities are viewed using a non-MIME-conformant mail reader.
+      While this approach does impose some burden on conformant mail
+      readers, interoperability with older mail readers was deemed to be
+      more important in this case.
+
+   It may be the case that some user agents, if they can recognize more
+   than one of the formats, will prefer to offer the user the choice of
+
+
+
+Borenstein & Freed                                             [Page 35]
+
+RFC 1521                          MIME                    September 1993
+
+
+   which format to view.  This makes sense, for example, if mail
+   includes both a nicely-formatted image version and an easily-edited
+   text version.  What is most critical, however, is that the user not
+   automatically be shown multiple versions of the same data.  Either
+   the user should be shown the last recognized version or should be
+   given the choice.
+
+   NOTE ON THE SEMANTICS OF CONTENT-ID IN MULTIPART/ALTERNATIVE: Each
+   part of a multipart/alternative entity represents the same data, but
+   the mappings between the two are not necessarily without information
+   loss.  For example, information is lost when translating ODA to
+   PostScript or plain text.  It is recommended that each part should
+   have a different Content-ID value in the case where the information
+   content of the two parts is not identical.  However, where the
+   information content is identical -- for example, where several parts
+   of type "application/external- body" specify alternate ways to access
+   the identical data -- the same Content-ID field value should be used,
+   to optimize any cacheing mechanisms that might be present on the
+   recipient's end.  However, it is recommended that the Content-ID
+   values used by the parts should not be the same Content-ID value that
+   describes the multipart/alternative as a whole, if there is any such
+   Content-ID field.  That is, one Content-ID value will refer to the
+   multipart/alternative entity, while one or more other Content-ID
+   values will refer to the parts inside it.
+
+7.2.4.     The Multipart/digest subtype
+
+   This document defines a "digest" subtype of the multipart Content-
+   Type.  This type is syntactically identical to multipart/mixed, but
+   the semantics are different.  In particular, in a digest, the default
+   Content-Type value for a body part is changed from "text/plain" to
+   "message/rfc822".  This is done to allow a more readable digest
+   format that is largely compatible (except for the quoting convention)
+   with RFC 934.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Borenstein & Freed                                             [Page 36]
+
+RFC 1521                          MIME                    September 1993
+
+
+   A digest in this format might, then, look something like this:
+
+   From: Moderator-Address
+   To: Recipient-List
+   MIME-Version: 1.0
+   Subject:  Internet Digest, volume 42
+   Content-Type: multipart/digest;
+        boundary="---- next message ----"
+
+   ------ next message ----
+
+   From: someone-else
+   Subject: my opinion
+
+      ...body goes here ...
+
+   ------ next message ----
+
+   From: someone-else-again
+   Subject: my different opinion
+
+      ... another body goes here...
+
+   ------ next message ------
+
+7.2.5.     The Multipart/parallel subtype
+
+   This document defines a "parallel" subtype of the multipart Content-
+   Type.  This type is syntactically identical to multipart/mixed, but
+   the semantics are different.  In particular, in a parallel entity,
+   the order of body parts is not significant.
+
+   A common presentation of this type is to display all of the parts
+   simultaneously on hardware and software that are capable of doing so.
+   However, composing agents should be aware that many mail readers will
+   lack this capability and will show the parts serially in any event.
+
+7.2.6.     Other Multipart subtypes
+
+   Other multipart subtypes are expected in the future.  MIME
+   implementations must in general treat unrecognized subtypes of
+   multipart as being equivalent to "multipart/mixed".
+
+   The formal grammar for content-type header fields for multipart data
+   is given by:
+
+   multipart-type := "multipart" "/" multipart-subtype
+                  ";" "boundary" "=" boundary
+
+
+
+Borenstein & Freed                                             [Page 37]
+
+RFC 1521                          MIME                    September 1993
+
+
+   multipart-subtype := "mixed" / "parallel" / "digest"
+                  / "alternative" / extension-token
+
+7.3.  The Message Content-Type
+
+   It is frequently desirable, in sending mail, to encapsulate another
+   mail message. For this common operation, a special Content-Type,
+   "message", is defined.  The primary subtype, message/rfc822, has no
+   required parameters in the Content-Type field.  Additional subtypes,
+   "partial" and "External-body", do have required parameters.  These
+   subtypes are explained below.
+
+      NOTE: It has been suggested that subtypes of message might be
+      defined for forwarded or rejected messages.  However, forwarded
+      and rejected messages can be handled as multipart messages in
+      which the first part contains any control or descriptive
+      information, and a second part, of type message/rfc822, is the
+      forwarded or rejected message.  Composing rejection and forwarding
+      messages in this manner will preserve the type information on the
+      original message and allow it to be correctly presented to the
+      recipient, and hence is strongly encouraged.
+
+   As stated in the definition of the Content-Transfer-Encoding field,
+   no encoding other than "7bit", "8bit", or "binary" is permitted for
+   messages or parts of type "message".  Even stronger restrictions
+   apply to the subtypes "message/partial" and "message/external-body",
+   as specified below.  The message header fields are always US-ASCII in
+   any case, and data within the body can still be encoded, in which
+   case the Content-Transfer-Encoding header field in the encapsulated
+   message will reflect this.  Non-ASCII text in the headers of an
+   encapsulated message can be specified using the mechanisms described
+   in [RFC-1522].
+
+   Mail gateways, relays, and other mail handling agents are commonly
+   known to alter the top-level header of an RFC 822 message.  In
+   particular, they frequently add, remove, or reorder header fields.
+   Such alterations are explicitly forbidden for the encapsulated
+   headers embedded in the bodies of messages of type "message."
+
+7.3.1.     The Message/rfc822 (primary) subtype
+
+   A Content-Type of "message/rfc822" indicates that the body contains
+   an encapsulated message, with the syntax of an RFC 822 message.
+   However, unlike top-level RFC 822 messages, it is not required that
+   each message/rfc822 body must include a "From", "Subject", and at
+   least one destination header.
+
+   It should be noted that, despite the use of the numbers "822", a
+
+
+
+Borenstein & Freed                                             [Page 38]
+
+RFC 1521                          MIME                    September 1993
+
+
+   message/rfc822 entity can include enhanced information as defined in
+   this document.  In other words, a message/rfc822 message may be a
+   MIME message.
+
+7.3.2.     The Message/Partial subtype
+
+   A subtype of message, "partial", is defined in order to allow large
+   objects to be delivered as several separate pieces of mail and
+   automatically reassembled by the receiving user agent.  (The concept
+   is similar to IP fragmentation/reassembly in the basic Internet
+   Protocols.)  This mechanism can be used when intermediate transport
+   agents limit the size of individual messages that can be sent.
+   Content-Type "message/partial" thus indicates that the body contains
+   a fragment of a larger message.
+
+   Three parameters must be specified in the Content-Type field of type
+   message/partial: The first, "id", is a unique identifier, as close to
+   a world-unique identifier as possible, to be used to match the parts
+   together.  (In general, the identifier is essentially a message-id;
+   if placed in double quotes, it can be any message-id, in accordance
+   with the BNF for "parameter" given earlier in this specification.)
+   The second, "number", an integer, is the part number, which indicates
+   where this part fits into the sequence of fragments.  The third,
+   "total", another integer, is the total number of parts. This third
+   subfield is required on the final part, and is optional (though
+   encouraged) on the earlier parts.  Note also that these parameters
+   may be given in any order.
+
+   Thus, part 2 of a 3-part message may have either of the following
+   header fields:
+
+                Content-Type: Message/Partial;
+                     number=2; total=3;
+                     id="oc=jpbe0M2Yt4s@thumper.bellcore.com"
+
+                Content-Type: Message/Partial;
+                     id="oc=jpbe0M2Yt4s@thumper.bellcore.com";
+                     number=2
+
+   But part 3 MUST specify the total number of parts:
+
+                Content-Type: Message/Partial;
+                     number=3; total=3;
+                     id="oc=jpbe0M2Yt4s@thumper.bellcore.com"
+
+   Note that part numbering begins with 1, not 0.
+
+   When the parts of a message broken up in this manner are put
+
+
+
+Borenstein & Freed                                             [Page 39]
+
+RFC 1521                          MIME                    September 1993
+
+
+   together, the result is a complete MIME entity, which may have its
+   own Content-Type header field, and thus may contain any other data
+   type.
+
+   Message fragmentation and reassembly: The semantics of a reassembled
+   partial message must be those of the "inner" message, rather than of
+   a message containing the inner message.  This makes it possible, for
+   example, to send a large audio message as several partial messages,
+   and still have it appear to the recipient as a simple audio message
+   rather than as an encapsulated message containing an audio message.
+   That is, the encapsulation of the message is considered to be
+   "transparent".
+
+   When generating and reassembling the parts of a message/partial
+   message, the headers of the encapsulated message must be merged with
+   the headers of the enclosing entities.  In this process the following
+   rules must be observed:
+
+      (1) All of the header fields from the initial enclosing entity
+      (part one), except those that start with "Content-" and the
+      specific header fields "Message-ID", "Encrypted", and "MIME-
+      Version", must be copied, in order, to the new message.
+
+      (2) Only those header fields in the enclosed message which start
+      with "Content-" and "Message-ID", "Encrypted", and "MIME-Version"
+      must be appended, in order, to the header fields of the new
+      message.  Any header fields in the enclosed message which do not
+      start with "Content-" (except for "Message-ID", "Encrypted", and
+      "MIME-Version") will be ignored.
+
+      (3) All of the header fields from the second and any subsequent
+      messages will be ignored.
+
+   For example, if an audio message is broken into two parts, the first
+   part might look something like this:
+
+      X-Weird-Header-1: Foo
+      From: Bill@host.com
+      To: joe@otherhost.com
+      Subject: Audio mail
+      Message-ID: <id1@host.com>
+      MIME-Version: 1.0
+      Content-type: message/partial;
+           id="ABC@host.com";
+           number=1; total=2
+
+      X-Weird-Header-1: Bar
+      X-Weird-Header-2: Hello
+
+
+
+Borenstein & Freed                                             [Page 40]
+
+RFC 1521                          MIME                    September 1993
+
+
+      Message-ID: <anotherid@foo.com>
+      MIME-Version: 1.0
+      Content-type: audio/basic
+      Content-transfer-encoding: base64
+
+         ... first half of encoded audio data goes here...
+
+   and the second half might look something like this:
+
+      From: Bill@host.com
+      To: joe@otherhost.com
+      Subject: Audio mail
+      MIME-Version: 1.0
+      Message-ID: <id2@host.com>
+      Content-type: message/partial;
+           id="ABC@host.com"; number=2; total=2
+
+         ... second half of encoded audio data goes here...
+
+   Then, when the fragmented message is reassembled, the resulting
+   message to be displayed to the user should look something like this:
+
+      X-Weird-Header-1: Foo
+      From: Bill@host.com
+      To: joe@otherhost.com
+      Subject: Audio mail
+      Message-ID: <anotherid@foo.com>
+      MIME-Version: 1.0
+      Content-type: audio/basic
+      Content-transfer-encoding: base64
+
+         ... first half of encoded audio data goes here...
+         ... second half of encoded audio data goes here...
+
+   Note on encoding of MIME entities encapsulated inside message/partial
+   entities: Because data of type "message" may never be encoded in
+   base64 or quoted-printable, a problem might arise if message/partial
+   entities are constructed in an environment that supports binary or
+   8-bit transport.  The problem is that the binary data would be split
+   into multiple message/partial objects, each of them requiring binary
+   transport.  If such objects were encountered at a gateway into a 7-
+   bit transport environment, there would be no way to properly encode
+   them for the 7-bit world, aside from waiting for all of the parts,
+   reassembling the message, and then encoding the reassembled data in
+   base64 or quoted-printable.  Since it is possible that different
+   parts might go through different gateways, even this is not an
+   acceptable solution.  For this reason, it is specified that MIME
+   entities of type message/partial must always have a content-
+
+
+
+Borenstein & Freed                                             [Page 41]
+
+RFC 1521                          MIME                    September 1993
+
+
+   transfer-encoding of 7-bit (the default).  In particular, even in
+   environments that support binary or 8-bit transport, the use of a
+   content-transfer-encoding of "8bit" or "binary" is explicitly
+   prohibited for entities of type message/partial.
+
+   It should be noted that, because some message transfer agents may
+   choose to automatically fragment large messages, and because such
+   agents may use different fragmentation thresholds, it is possible
+   that the pieces of a partial message, upon reassembly, may prove
+   themselves to comprise a partial message.  This is explicitly
+   permitted.
+
+   It should also be noted that the inclusion of a "References" field in
+   the headers of the second and subsequent pieces of a fragmented
+   message that references the Message-Id on the previous piece may be
+   of benefit to mail readers that understand and track references.
+   However, the generation of such "References" fields is entirely
+   optional.
+
+   Finally, it should be noted that the "Encrypted" header field has
+   been made obsolete by Privacy Enhanced Messaging (PEM), but the rules
+   above are believed to describe the correct way to treat it if it is
+   encountered in the context of conversion to and from message/partial
+   fragments.
+
+7.3.3.     The Message/External-Body subtype
+
+   The external-body subtype indicates that the actual body data are not
+   included, but merely referenced.  In this case, the parameters
+   describe a mechanism for accessing the external data.
+
+   When an entity is of type "message/external-body", it consists of a
+   header, two consecutive CRLFs, and the message header for the
+   encapsulated message.  If another pair of consecutive CRLFs appears,
+   this of course ends the message header for the encapsulated message.
+   However, since the encapsulated message's body is itself external, it
+   does NOT appear in the area that follows.  For example, consider the
+   following message:
+
+      Content-type: message/external-body; access-
+      type=local-file;
+
+           name="/u/nsb/Me.gif"
+
+      Content-type:  image/gif
+      Content-ID: <id42@guppylake.bellcore.com>
+      Content-Transfer-Encoding: binary
+
+
+
+
+Borenstein & Freed                                             [Page 42]
+
+RFC 1521                          MIME                    September 1993
+
+
+      THIS IS NOT REALLY THE BODY!
+
+   The area at the end, which might be called the "phantom body", is
+   ignored for most external-body messages.  However, it may be used to
+   contain auxiliary information for some such messages, as indeed it is
+   when the access-type is "mail-server".  Of the access-types defined
+   by this document, the phantom body is used only when the access-type
+   is "mail-server".  In all other cases, the phantom body is ignored.
+
+   The only always-mandatory parameter for message/external-body is
+   "access-type"; all of the other parameters may be mandatory or
+   optional depending on the value of access-type.
+
+      ACCESS-TYPE -- A case-insensitive word, indicating the supported
+      access mechanism by which the file or data may be obtained.
+      Values include, but are not limited to, "FTP", "ANON-FTP", "TFTP",
+      "AFS", "LOCAL-FILE", and "MAIL-SERVER".  Future values, except for
+      experimental values beginning with "X-" must be registered with
+      IANA, as described in Appendix E .
+
+   In addition, the following three parameters are optional for ALL
+   access-types:
+
+      EXPIRATION -- The date (in the RFC 822 "date-time" syntax, as
+      extended by RFC 1123 to permit 4 digits in the year field) after
+      which the existence of the external data is not guaranteed.
+
+      SIZE -- The size (in octets) of the data.  The intent of this
+      parameter is to help the recipient decide whether or not to expend
+      the necessary resources to retrieve the external data.  Note that
+      this describes the size of the data in its canonical form, that
+      is, before any Content- Transfer-Encoding has been applied or
+      after the data have been decoded.
+
+      PERMISSION -- A case-insensitive field that indicates whether or
+      not it is expected that clients might also attempt to overwrite
+      the data.  By default, or if permission is "read", the assumption
+      is that they are not, and that if the data is retrieved once, it
+      is never needed again.  If PERMISSION is "read-write", this
+      assumption is invalid, and any local copy must be considered no
+      more than a cache.  "Read" and "Read-write" are the only defined
+      values of permission.
+
+   The precise semantics of the access-types defined here are described
+   in the sections that follow.
+
+   The encapsulated headers in ALL message/external-body entities MUST
+   include a Content-ID header field to give a unique identifier by
+
+
+
+Borenstein & Freed                                             [Page 43]
+
+RFC 1521                          MIME                    September 1993
+
+
+   which to reference the data.  This identifier may be used for
+   cacheing mechanisms, and for recognizing the receipt of the data when
+   the access-type is "mail-server".
+
+   Note that, as specified here, the tokens that describe external-body
+   data, such as file names and mail server commands, are required to be
+   in the US-ASCII character set.  If this proves problematic in
+   practice, a new mechanism may be required as a future extension to
+   MIME, either as newly defined access-types for message/external-body
+   or by some other mechanism.
+
+   As with message/partial, it is specified that MIME entities of type
+   message/external-body must always have a content-transfer-encoding of
+   7-bit (the default).  In particular, even in environments that
+   support binary or 8-bit transport, the use of a content-transfer-
+   encoding of "8bit" or "binary" is explicitly prohibited for entities
+   of type message/external-body.
+
+7.3.3.1.  The "ftp" and "tftp" access-types
+
+   An access-type of FTP or TFTP indicates that the message body is
+   accessible as a file using the FTP [RFC-959] or TFTP [RFC-783]
+   protocols, respectively.  For these access-types, the following
+   additional parameters are mandatory:
+
+      NAME -- The name of the file that contains the actual body data.
+
+      SITE -- A machine from which the file may be obtained, using the
+      given protocol. This must be a fully qualified domain name, not a
+      nickname.
+
+   Before any data are retrieved, using FTP, the user will generally
+   need to be asked to provide a login id and a password for the machine
+   named by the site parameter.  For security reasons, such an id and
+   password are not specified as content-type parameters, but must be
+   obtained from the user.
+
+   In addition, the following parameters are optional:
+
+      DIRECTORY -- A directory from which the data named by NAME should
+      be retrieved.
+
+      MODE -- A case-insensitive string indicating the mode to be used
+      when retrieving the information.  The legal values for access-type
+      "TFTP" are "NETASCII", "OCTET", and "MAIL", as specified by the
+      TFTP protocol [RFC-783].  The legal values for access-type "FTP"
+      are "ASCII", "EBCDIC", "IMAGE", and "LOCALn" where "n" is a
+      decimal integer, typically 8.  These correspond to the
+
+
+
+Borenstein & Freed                                             [Page 44]
+
+RFC 1521                          MIME                    September 1993
+
+
+      representation types "A" "E" "I" and "L n" as specified by the FTP
+      protocol [RFC-959].  Note that "BINARY" and "TENEX" are not valid
+      values for MODE, but that "OCTET" or "IMAGE" or "LOCAL8" should be
+      used instead.  IF MODE is not specified, the default value is
+      "NETASCII" for TFTP and "ASCII" otherwise.
+
+7.3.3.2.  The "anon-ftp" access-type
+
+   The "anon-ftp" access-type is identical to the "ftp" access type,
+   except that the user need not be asked to provide a name and password
+   for the specified site.  Instead, the ftp protocol will be used with
+   login "anonymous" and a password that corresponds to the user's email
+   address.
+
+7.3.3.3.  The "local-file" and "afs" access-types
+
+   An access-type of "local-file" indicates that the actual body is
+   accessible as a file on the local machine.  An access-type of "afs"
+   indicates that the file is accessible via the global AFS file system.
+   In both cases, only a single parameter is required:
+
+      NAME -- The name of the file that contains the actual body data.
+
+   The following optional parameter may be used to describe the locality
+   of reference for the data, that is, the site or sites at which the
+   file is expected to be visible:
+
+      SITE -- A domain specifier for a machine or set of machines that
+      are known to have access to the data file.  Asterisks may be used
+      for wildcard matching to a part of a domain name, such as
+      "*.bellcore.com", to indicate a set of machines on which the data
+      should be directly visible, while a single asterisk may be used to
+      indicate a file that is expected to be universally available,
+      e.g., via a global file system.
+
+7.3.3.4.  The "mail-server" access-type
+
+   The "mail-server" access-type indicates that the actual body is
+   available from a mail server.  The mandatory parameter for this
+   access-type is:
+
+      SERVER -- The email address of the mail server from which the
+      actual body data can be obtained.
+
+   Because mail servers accept a variety of syntaxes, some of which is
+   multiline, the full command to be sent to a mail server is not
+   included as a parameter on the content-type line.  Instead, it is
+   provided as the "phantom body" when the content-type is
+
+
+
+Borenstein & Freed                                             [Page 45]
+
+RFC 1521                          MIME                    September 1993
+
+
+   message/external-body and the access- type is mail-server.
+
+   An optional parameter for this access-type is:
+
+      SUBJECT -- The subject that is to be used in the mail that is sent
+      to obtain the data. Note that keying mail servers on Subject lines
+      is NOT recommended, but such mail servers are known to exist.
+
+   Note that MIME does not define a mail server syntax.  Rather, it
+   allows the inclusion of arbitrary mail server commands in the phantom
+   body.  Implementations must include the phantom body in the body of
+   the message it sends to the mail server address to retrieve the
+   relevant data.
+
+   It is worth noting that, unlike other access-types, mail-server
+   access is asynchronous and will happen at an unpredictable time in
+   the future.  For this reason, it is important that there be a
+   mechanism by which the returned data can be matched up with the
+   original message/external-body entity.  MIME mailservers must use the
+   same Content-ID field on the returned message that was used in the
+   original message/external-body entity, to facilitate such matching.
+
+7.3.3.5.  Examples and Further Explanations
+
+   With the emerging possibility of very wide-area file systems, it
+   becomes very hard to know in advance the set of machines where a file
+   will and will not be accessible directly from the file system.
+   Therefore it may make sense to provide both a file name, to be tried
+   directly, and the name of one or more sites from which the file is
+   known to be accessible.  An implementation can try to retrieve remote
+   files using FTP or any other protocol, using anonymous file retrieval
+   or prompting the user for the necessary name and password.  If an
+   external body is accessible via multiple mechanisms, the sender may
+   include multiple parts of type message/external-body within an entity
+   of type multipart/alternative.
+
+   However, the external-body mechanism is not intended to be limited to
+   file retrieval, as shown by the mail-server access-type.  Beyond
+   this, one can imagine, for example, using a video server for external
+   references to video clips.
+
+   If an entity is of type "message/external-body", then the body of the
+   entity will contain the header fields of the encapsulated message.
+   The body itself is to be found in the external location.  This means
+   that if the body of the "message/external-body" message contains two
+   consecutive CRLFs, everything after those pairs is NOT part of the
+   message itself.  For most message/external-body messages, this
+   trailing area must simply be ignored.  However, it is a convenient
+
+
+
+Borenstein & Freed                                             [Page 46]
+
+RFC 1521                          MIME                    September 1993
+
+
+   place for additional data that cannot be included in the content-type
+   header field.  In particular, if the "access-type" value is "mail-
+   server", then the trailing area must contain commands to be sent to
+   the mail server at the address given by the value of the SERVER
+   parameter.
+
+   The embedded message header fields which appear in the body of the
+   message/external-body data must be used to declare the Content-type
+   of the external body if it is anything other than plain ASCII text,
+   since the external body does not have a header section to declare its
+   type.  Similarly, any Content-transfer-encoding other than "7bit"
+   must also be declared here.  Thus a complete message/external-body
+   message, referring to a document in PostScript format, might look
+   like this:
+
+      From: Whomever
+      To: Someone
+      Subject: whatever
+      MIME-Version: 1.0
+      Message-ID: <id1@host.com>
+      Content-Type: multipart/alternative; boundary=42
+      Content-ID: <id001@guppylake.bellcore.com>
+
+      --42
+      Content-Type: message/external-body;
+           name="BodyFormats.ps";
+           site="thumper.bellcore.com";
+           access-type=ANON-FTP;
+           directory="pub";
+           mode="image";
+           expiration="Fri, 14 Jun 1991 19:13:14 -0400 (EDT)"
+
+      Content-type: application/postscript
+      Content-ID: <id42@guppylake.bellcore.com>
+
+      --42
+      Content-Type: message/external-body;
+           name="/u/nsb/writing/rfcs/RFC-MIME.ps";
+           site="thumper.bellcore.com";
+           access-type=AFS
+           expiration="Fri, 14 Jun 1991 19:13:14 -0400 (EDT)"
+
+      Content-type: application/postscript
+      Content-ID: <id42@guppylake.bellcore.com>
+
+      --42
+      Content-Type: message/external-body;
+           access-type=mail-server
+
+
+
+Borenstein & Freed                                             [Page 47]
+
+RFC 1521                          MIME                    September 1993
+
+
+           server="listserv@bogus.bitnet";
+           expiration="Fri, 14 Jun 1991 19:13:14 -0400 (EDT)"
+
+      Content-type: application/postscript
+      Content-ID: <id42@guppylake.bellcore.com>
+
+      get RFC-MIME.DOC
+
+      --42--
+
+   Note that in the above examples, the default Content-transfer-
+   encoding of "7bit" is assumed for the external postscript data.
+
+   Like the message/partial type, the message/external-body type is
+   intended to be transparent, that is, to convey the data type in the
+   external body rather than to convey a message with a body of that
+   type.  Thus the headers on the outer and inner parts must be merged
+   using the same rules as for message/partial.  In particular, this
+   means that the Content-type header is overridden, but the From and
+   Subject headers are preserved.
+
+   Note that since the external bodies are not transported as mail, they
+   need not conform to the 7-bit and line length requirements, but might
+   in fact be binary files.  Thus a Content-Transfer-Encoding is not
+   generally necessary, though it is permitted.
+
+   Note that the body of a message of type "message/external-body" is
+   governed by the basic syntax for an RFC 822 message.  In particular,
+   anything before the first consecutive pair of CRLFs is header
+   information, while anything after it is body information, which is
+   ignored for most access-types.
+
+   The formal grammar for content-type header fields for data of type
+   message is given by:
+
+   message-type := "message" "/" message-subtype
+
+   message-subtype := "rfc822"
+                   / "partial" 2#3partial-param
+                   / "external-body" 1*external-param
+                   / extension-token
+
+   partial-param :=     (";" "id" "=" value)
+              /  (";" "number" "=" 1*DIGIT)
+              /  (";" "total" "=" 1*DIGIT)
+         ; id & number required; total  required  for  last part
+
+   external-param :=   (";" "access-type" "=" atype)
+
+
+
+Borenstein & Freed                                             [Page 48]
+
+RFC 1521                          MIME                    September 1993
+
+
+              / (";" "expiration" "=" date-time)
+                   ; Note that date-time is quoted
+              / (";" "size" "=" 1*DIGIT)
+              / (";"  "permission"  "="  ("read"  /  "read-write"))
+                   ; Permission is case-insensitive
+              / (";" "name" "="  value)
+              / (";" "site" "=" value)
+              / (";" "dir" "=" value)
+              / (";" "mode" "=" value)
+              / (";" "server" "=" value)
+              / (";" "subject" "=" value)
+          ; access-type required;others required based on access-type
+
+   atype := "ftp" / "anon-ftp" / "tftp" / "local-file"
+                  / "afs" / "mail-server" / extension-token
+                  ; Case-insensitive
+
+7.4.  The Application Content-Type
+
+   The "application" Content-Type is to be used for data which do not
+   fit in any of the other categories, and particularly for data to be
+   processed by mail-based uses of application programs.  This is
+   information which must be processed by an application before it is
+   viewable or usable to a user.  Expected uses for Content-Type
+   application include mail-based file transfer, spreadsheets, data for
+   mail-based scheduling systems, and languages for "active"
+   (computational) email.  (The latter, in particular, can pose security
+   problems which must be understood by implementors, and are considered
+   in detail in the discussion of the application/PostScript content-
+   type.)
+
+   For example, a meeting scheduler might define a standard
+   representation for information about proposed meeting dates.  An
+   intelligent user agent would use this information to conduct a dialog
+   with the user, and might then send further mail based on that dialog.
+   More generally, there have been several "active" messaging languages
+   developed in which programs in a suitably specialized language are
+   sent through the mail and automatically run in the recipient's
+   environment.
+
+   Such applications may be defined as subtypes of the "application"
+   Content-Type.  This document defines two subtypes: octet-stream, and
+   PostScript.
+
+   In general, the subtype of application will often be the name of the
+   application for which the data are intended.  This does not mean,
+   however, that any application program name may be used freely as a
+   subtype of application.  Such usages (other than subtypes beginning
+
+
+
+Borenstein & Freed                                             [Page 49]
+
+RFC 1521                          MIME                    September 1993
+
+
+   with "x-") must be registered with IANA, as described in Appendix E.
+
+7.4.1.     The Application/Octet-Stream (primary) subtype
+
+   The primary subtype of application, "octet-stream", may be used to
+   indicate that a body contains binary data.  The set of possible
+   parameters includes, but is not limited to:
+
+      TYPE -- the general type or category of binary data.  This is
+      intended as information for the human recipient rather than for
+      any automatic processing.
+
+      PADDING -- the number of bits of padding that were appended to the
+      bit-stream comprising the actual contents to produce the enclosed
+      byte-oriented data.  This is useful for enclosing a bit-stream in
+      a body when the total number of bits is not a multiple of the byte
+      size.
+
+   An additional parameter, "conversions", was defined in [RFC-1341] but
+   has been removed.
+
+   RFC 1341 also defined the use of a "NAME" parameter which gave a
+   suggested file name to be used if the data were to be written to a
+   file.  This has been deprecated in anticipation of a separate
+   Content-Disposition header field, to be defined in a subsequent RFC.
+
+   The recommended action for an implementation that receives
+   application/octet-stream mail is to simply offer to put the data in a
+   file, with any Content-Transfer-Encoding undone, or perhaps to use it
+   as input to a user-specified process.
+
+   To reduce the danger of transmitting rogue programs through the mail,
+   it is strongly recommended that implementations NOT implement a
+   path-search mechanism whereby an arbitrary program named in the
+   Content-Type parameter (e.g., an "interpreter=" parameter) is found
+   and executed using the mail body as input.
+
+7.4.2.     The Application/PostScript subtype
+
+   A Content-Type of "application/postscript" indicates a PostScript
+   program.  Currently two variants of the PostScript language are
+   allowed; the original level 1 variant is described in [POSTSCRIPT]
+   and the more recent level 2 variant is described in [POSTSCRIPT2].
+
+   PostScript is a registered trademark of Adobe Systems, Inc.  Use of
+   the MIME content-type "application/postscript" implies recognition of
+   that trademark and all the rights it entails.
+
+
+
+
+Borenstein & Freed                                             [Page 50]
+
+RFC 1521                          MIME                    September 1993
+
+
+   The PostScript language definition provides facilities for internal
+   labeling of the specific language features a given program uses. This
+   labeling, called the PostScript document structuring conventions, is
+   very general and provides substantially more information than just
+   the language level.
+
+   The use of document structuring conventions, while not required, is
+   strongly recommended as an aid to interoperability.  Documents which
+   lack proper structuring conventions cannot be tested to see whether
+   or not they will work in a given environment.  As such, some systems
+   may assume the worst and refuse to process unstructured documents.
+
+   The execution of general-purpose PostScript interpreters entails
+   serious security risks, and implementors are discouraged from simply
+   sending PostScript email bodies to "off-the-shelf" interpreters.
+   While it is usually safe to send PostScript to a printer, where the
+   potential for harm is greatly constrained, implementors should
+   consider all of the following before they add interactive display of
+   PostScript bodies to their mail readers.
+
+   The remainder of this section outlines some, though probably not all,
+   of the possible problems with sending PostScript through the mail.
+
+   Dangerous operations in the PostScript language include, but may not
+   be limited to, the PostScript operators deletefile, renamefile,
+   filenameforall, and file.  File is only dangerous when applied to
+   something other than standard input or output. Implementations may
+   also define additional nonstandard file operators; these may also
+   pose a threat to security.  Filenameforall, the wildcard file search
+   operator, may appear at first glance to be harmless. Note, however,
+   that this operator has the potential to reveal information about what
+   files the recipient has access to, and this information may itself be
+   sensitive.  Message senders should avoid the use of potentially
+   dangerous file operators, since these operators are quite likely to
+   be unavailable in secure PostScript implementations.  Message-
+   receiving and -displaying software should either completely disable
+   all potentially dangerous file operators or take special care not to
+   delegate any special authority to their operation. These operators
+   should be viewed as being done by an outside agency when interpreting
+   PostScript documents.  Such disabling and/or checking should be done
+   completely outside of the reach of the PostScript language itself;
+   care should be taken to insure that no method exists for re-enabling
+   full-function versions of these operators.
+
+   The PostScript language provides facilities for exiting the normal
+   interpreter, or server, loop. Changes made in this "outer"
+   environment are customarily retained across documents, and may in
+   some cases be retained semipermanently in nonvolatile memory. The
+
+
+
+Borenstein & Freed                                             [Page 51]
+
+RFC 1521                          MIME                    September 1993
+
+
+   operators associated with exiting the interpreter loop have the
+   potential to interfere with subsequent document processing. As such,
+   their unrestrained use constitutes a threat of service denial.
+   PostScript operators that exit the interpreter loop include, but may
+   not be limited to, the exitserver and startjob operators.  Message-
+   sending software should not generate PostScript that depends on
+   exiting the interpreter loop to operate. The ability to exit will
+   probably be unavailable in secure PostScript implementations.
+   Message-receiving and -displaying software should, if possible,
+   disable the ability to make retained changes to the PostScript
+   environment, and eliminate the startjob and exitserver commands.  If
+   these commands cannot be eliminated, the password associated with
+   them should at least be set to a hard-to-guess value.
+
+   PostScript provides operators for setting system-wide and device-
+   specific parameters. These parameter settings may be retained across
+   jobs and may potentially pose a threat to the correct operation of
+   the interpreter.  The PostScript operators that set system and device
+   parameters include, but may not be limited to, the setsystemparams
+   and setdevparams operators.  Message-sending software should not
+   generate PostScript that depends on the setting of system or device
+   parameters to operate correctly. The ability to set these parameters
+   will probably be unavailable in secure PostScript implementations.
+   Message-receiving and -displaying software should, if possible,
+   disable the ability to change system and device parameters.  If these
+   operators cannot be disabled, the password associated with them
+   should at least be set to a hard-to-guess value.
+
+   Some PostScript implementations provide nonstandard facilities for
+   the direct loading and execution of machine code.  Such facilities
+   are quite obviously open to substantial abuse.  Message-sending
+   software should not make use of such features. Besides being totally
+   hardware- specific, they are also likely to be unavailable in secure
+   implementations of PostScript.  Message-receiving and -displaying
+   software should not allow such operators to be used if they exist.
+
+   PostScript is an extensible language, and many, if not most,
+   implementations of it provide a number of their own extensions. This
+   document does not deal with such extensions explicitly since they
+   constitute an unknown factor.  Message-sending software should not
+   make use of nonstandard extensions; they are likely to be missing
+   from some implementations. Message-receiving and -displaying software
+   should make sure that any nonstandard PostScript operators are secure
+   and don't present any kind of threat.
+
+   It is possible to write PostScript that consumes huge amounts of
+   various system resources. It is also possible to write PostScript
+   programs that loop infinitely.  Both types of programs have the
+
+
+
+Borenstein & Freed                                             [Page 52]
+
+RFC 1521                          MIME                    September 1993
+
+
+   potential to cause damage if sent to unsuspecting recipients.
+   Message-sending software should avoid the construction and
+   dissemination of such programs, which is antisocial.  Message-
+   receiving and -displaying software should provide appropriate
+   mechanisms to abort processing of a document after a reasonable
+   amount of time has elapsed. In addition, PostScript interpreters
+   should be limited to the consumption of only a reasonable amount of
+   any given system resource.
+
+   Finally, bugs may exist in some PostScript interpreters which could
+   possibly be exploited to gain unauthorized access to a recipient's
+   system.  Apart from noting this possibility, there is no specific
+   action to take to prevent this, apart from the timely correction of
+   such bugs if any are found.
+
+7.4.3.     Other Application subtypes
+
+   It is expected that many other subtypes of application will be
+   defined in the future.  MIME implementations must generally treat any
+   unrecognized subtypes as being equivalent to application/octet-
+   stream.
+
+   The formal grammar for content-type header fields for application
+   data is given by:
+
+   application-type :=  "application" "/" application-subtype
+
+   application-subtype := ("octet-stream" *stream-param)
+                       / "postscript" / extension-token
+
+   stream-param :=  (";" "type" "=" value)
+                       / (";" "padding" "=" padding)
+
+   padding := "0" / "1" /  "2" /  "3" / "4" / "5" / "6" / "7"
+
+7.5.  The Image Content-Type
+
+   A Content-Type of "image" indicates that the body contains an image.
+   The subtype names the specific image format.  These names are case
+   insensitive.  Two initial subtypes are "jpeg" for the JPEG format,
+   JFIF encoding, and "gif" for GIF format [GIF].
+
+   The list of image subtypes given here is neither exclusive nor
+   exhaustive, and is expected to grow as more types are registered with
+   IANA, as described in Appendix E.
+
+   The formal grammar for the content-type header field for data of type
+   image is given by:
+
+
+
+Borenstein & Freed                                             [Page 53]
+
+RFC 1521                          MIME                    September 1993
+
+
+   image-type := "image" "/" ("gif" / "jpeg" / extension-token)
+
+7.6.  The Audio Content-Type
+
+   A Content-Type of "audio" indicates that the body contains audio
+   data.  Although there is not yet a consensus on an "ideal" audio
+   format for use with computers, there is a pressing need for a format
+   capable of providing interoperable behavior.
+
+   The initial subtype of "basic" is specified to meet this requirement
+   by providing an absolutely minimal lowest common denominator audio
+   format.  It is expected that richer formats for higher quality and/or
+   lower bandwidth audio will be defined by a later document.
+
+   The content of the "audio/basic" subtype is audio encoded using 8-bit
+   ISDN mu-law [PCM].  When this subtype is present, a sample rate of
+   8000 Hz and a single channel is assumed.
+
+   The formal grammar for the content-type header field for data of type
+   audio is given by:
+
+   audio-type := "audio" "/" ("basic" / extension-token)
+
+7.7.  The Video Content-Type
+
+   A Content-Type of "video" indicates that the body contains a time-
+   varying-picture image, possibly with color and coordinated sound.
+   The term "video" is used extremely generically, rather than with
+   reference to any particular technology or format, and is not meant to
+   preclude subtypes such as animated drawings encoded compactly.  The
+   subtype "mpeg" refers to video coded according to the MPEG standard
+   [MPEG].
+
+   Note that although in general this document strongly discourages the
+   mixing of multiple media in a single body, it is recognized that many
+   so-called "video" formats include a representation for synchronized
+   audio, and this is explicitly permitted for subtypes of "video".
+
+   The formal grammar for the content-type header field for data of type
+   video is given by:
+
+   video-type := "video" "/" ("mpeg" / extension-token)
+
+7.8.  Experimental Content-Type Values
+
+   A Content-Type value beginning with the characters "X-" is a private
+   value, to be used by consenting mail systems by mutual agreement.
+   Any format without a rigorous and public definition must be named
+
+
+
+Borenstein & Freed                                             [Page 54]
+
+RFC 1521                          MIME                    September 1993
+
+
+   with an "X-" prefix, and publicly specified values shall never begin
+   with "X-".  (Older versions of the widely-used Andrew system use the
+   "X-BE2" name, so new systems should probably choose a different
+   name.)
+
+   In general, the use of "X-" top-level types is strongly discouraged.
+   Implementors should invent subtypes of the existing types whenever
+   possible.  The invention of new types is intended to be restricted
+   primarily to the development of new media types for email, such as
+   digital odors or holography, and not for new data formats in general.
+   In many cases, a subtype of application will be more appropriate than
+   a new top-level type.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Borenstein & Freed                                             [Page 55]
+
+RFC 1521                          MIME                    September 1993
+
+
+8. Summary
+
+   Using the MIME-Version, Content-Type, and Content-Transfer-Encoding
+   header fields, it is possible to include, in a standardized way,
+   arbitrary types of data objects with RFC 822 conformant mail
+   messages.  No restrictions imposed by either RFC 821 or RFC 822 are
+   violated, and care has been taken to avoid problems caused by
+   additional restrictions imposed by the characteristics of some
+   Internet mail transport mechanisms (see Appendix B). The "multipart"
+   and "message" Content-Types allow mixing and hierarchical structuring
+   of objects of different types in a single message.  Further Content-
+   Types provide a standardized mechanism for tagging messages or body
+   parts as audio, image, or several other kinds of data.  A
+   distinguished parameter syntax allows further specification of data
+   format details, particularly the specification of alternate character
+   sets.  Additional optional header fields provide mechanisms for
+   certain extensions deemed desirable by many implementors.  Finally, a
+   number of useful Content-Types are defined for general use by
+   consenting user agents, notably message/partial, and
+   message/external-body.
+
+9. Security Considerations
+
+   Security issues are discussed in Section 7.4.2 and in Appendix F.
+   Implementors should pay special attention to the security
+   implications of any mail content-types that can cause the remote
+   execution of any actions in the recipient's environment.  In such
+   cases, the discussion of the application/postscript content-type in
+   Section 7.4.2 may serve as a model for considering other content-
+   types with remote execution capabilities.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Borenstein & Freed                                             [Page 56]
+
+RFC 1521                          MIME                    September 1993
+
+
+10. Authors' Addresses
+
+   For more information, the authors of this document may be contacted
+   via Internet mail:
+
+   Nathaniel S. Borenstein
+   MRE 2D-296, Bellcore
+   445 South St.
+   Morristown, NJ 07962-1910
+
+   Phone: +1 201 829 4270
+   Fax:  +1 201 829 7019
+   Email: nsb@bellcore.com
+
+
+   Ned Freed
+   Innosoft International, Inc.
+   250 West First Street
+   Suite 240
+   Claremont, CA 91711
+
+   Phone:  +1 909 624 7907
+   Fax: +1 909 621 5319
+   Email: ned@innosoft.com
+
+   MIME is a result of the work of the Internet Engineering Task Force
+   Working Group on Email Extensions. The chairman of that group, Greg
+   Vaudreuil, may be reached at:
+
+   Gregory M. Vaudreuil
+   Tigon Corporation
+   17060 Dallas Parkway
+   Dallas Texas, 75248
+
+   Phone:    +1 214-733-2722
+   EMail: gvaudre@cnri.reston.va.us
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Borenstein & Freed                                             [Page 57]
+
+RFC 1521                          MIME                    September 1993
+
+
+11. Acknowledgements
+
+   This document is the result of the collective effort of a large
+   number of people, at several IETF meetings, on the IETF-SMTP and
+   IETF-822 mailing lists, and elsewhere.  Although any enumeration
+   seems doomed to suffer from egregious omissions, the following are
+   among the many contributors to this effort:
+
+            Harald Tveit Alvestrand       Timo Lehtinen
+            Randall Atkinson              John R. MacMillan
+            Philippe Brandon              Rick McGowan
+            Kevin Carosso                 Leo Mclaughlin
+            Uhhyung Choi                  Goli Montaser-Kohsari
+            Cristian Constantinof         Keith Moore
+            Mark Crispin                  Tom Moore
+            Dave Crocker                  Erik Naggum
+            Terry Crowley                 Mark Needleman
+            Walt Daniels                  John Noerenberg
+            Frank Dawson                  Mats Ohrman
+            Hitoshi Doi                   Julian Onions
+            Kevin Donnelly                Michael Patton
+            Keith Edwards                 David J. Pepper
+            Chris Eich                    Blake C. Ramsdell
+            Johnny Eriksson               Luc Rooijakkers
+            Craig Everhart                Marshall T. Rose
+            Patrik Faeltstroem            Jonathan Rosenberg
+            Erik E. Fair                  Jan Rynning
+            Roger Fajman                  Harri Salminen
+            Alain Fontaine                Michael Sanderson
+            James M. Galvin               Masahiro Sekiguchi
+            Philip Gladstone              Mark Sherman
+            Thomas Gordon                 Keld Simonsen
+            Phill Gross                   Bob Smart
+            James Hamilton                Peter Speck
+            Steve Hardcastle-Kille        Henry Spencer
+            David Herron                  Einar Stefferud
+            Bruce Howard                  Michael Stein
+            Bill Janssen                  Klaus Steinberger
+            Olle Jaernefors               Peter Svanberg
+            Risto Kankkunen               James Thompson
+            Phil Karn                     Steve Uhler
+            Alan Katz                     Stuart Vance
+            Tim Kehres                    Erik van der Poel
+            Neil Katin                    Guido van Rossum
+            Kyuho Kim                     Peter Vanderbilt
+            Anders Klemets                Greg Vaudreuil
+            John Klensin                  Ed Vielmetti
+            Valdis Kletniek               Ryan Waldron
+
+
+
+Borenstein & Freed                                             [Page 58]
+
+RFC 1521                          MIME                    September 1993
+
+
+            Jim Knowles                   Wally Wedel
+            Stev Knowles                  Sven-Ove Westberg
+            Bob Kummerfeld                Brian Wideen
+            Pekka Kytolaakso              John Wobus
+            Stellan Lagerstrom            Glenn Wright
+            Vincent Lau                   Rayan Zachariassen
+            Donald Lindsay                David Zimmerman
+            Marc Andreessen               Bob Braden
+            Brian Capouch                 Peter Clitherow
+            Dave Collier-Brown            John Coonrod
+            Stephen Crocker               Jim Davis
+            Axel Deininger                Dana S Emery
+            Martin Forssen                Stephen Gildea
+            Terry Gray                    Mark Horton
+            Warner Losh                   Carlyn Lowery
+            Laurence Lundblade            Charles Lynn
+            Larry Masinter                Michael J. McInerny
+            Jon Postel                    Christer Romson
+            Yutaka Sato                   Markku Savela
+            Richard Alan Schafer          Larry W. Virden
+            Rhys Weatherly                Jay Weber
+            Dave Wecker
+
+The authors apologize for any omissions from this list, which are
+certainly unintentional.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Borenstein & Freed                                             [Page 59]
+
+RFC 1521                          MIME                    September 1993
+
+
+Appendix A -- Minimal MIME-Conformance
+
+   The mechanisms described in this document are open-ended.  It is
+   definitely not expected that all implementations will support all of
+   the Content-Types described, nor that they will all share the same
+   extensions.  In order to promote interoperability, however, it is
+   useful to define the concept of "MIME-conformance" to define a
+   certain level of implementation that allows the useful interworking
+   of messages with content that differs from US ASCII text.  In this
+   section, we specify the requirements for such conformance.
+
+   A mail user agent that is MIME-conformant MUST:
+
+      1.  Always generate a "MIME-Version: 1.0" header field.
+
+      2.  Recognize the Content-Transfer-Encoding header field, and
+      decode all received data encoded with either the quoted-printable
+      or base64 implementations.  Encode any data sent that is not in
+      seven-bit mail-ready representation using one of these
+      transformations and include the appropriate Content-Transfer-
+      Encoding header field, unless the underlying transport mechanism
+      supports non-seven-bit data, as SMTP does not.
+
+      3.  Recognize and interpret the Content-Type header field, and
+      avoid showing users raw data with a Content-Type field other than
+      text.  Be able to send at least text/plain messages, with the
+      character set specified as a parameter if it is not US-ASCII.
+
+      4.  Explicitly handle the following Content-Type values, to at
+      least the following extents:
+
+      Text:
+
+            -- Recognize and display "text" mail
+                 with the character set "US-ASCII."
+
+            -- Recognize other character sets at
+                 least to the extent of being able
+                 to inform the user about what
+                 character set the message uses.
+
+            -- Recognize the "ISO-8859-*" character
+                 sets to the extent of being able to
+                 display those characters that are
+                 common to ISO-8859-* and US-ASCII,
+                 namely all characters represented
+                 by octet values 0-127.
+
+
+
+
+Borenstein & Freed                                             [Page 60]
+
+RFC 1521                          MIME                    September 1993
+
+
+            -- For unrecognized subtypes, show or
+                 offer to show the user the "raw"
+                 version of the data after
+                 conversion of the content from
+                 canonical form to local form.
+
+       Message:
+
+            -- Recognize and display at least the
+                 primary (822) encapsulation.
+
+       Multipart:
+
+            -- Recognize the primary (mixed)
+                 subtype.  Display all relevant
+                 information on the message level
+                 and the body part header level and
+                 then display or offer to display
+                 each of the body parts individually.
+
+            -- Recognize the "alternative" subtype,
+                 and avoid showing the user
+                 redundant parts of
+                 multipart/alternative mail.
+
+            -- Treat any unrecognized subtypes as if
+                 they were "mixed".
+
+       Application:
+
+            -- Offer the ability to remove either of
+                 the two types of Content-Transfer-
+                 Encoding defined in this document
+                 and put the resulting information
+                 in a user file.
+
+      5.  Upon encountering any unrecognized Content- Type, an
+      implementation must treat it as if it had a Content-Type of
+      "application/octet-stream" with no parameter sub-arguments.  How
+      such data are handled is up to an implementation, but likely
+      options for handling such unrecognized data include offering the
+      user to write it into a file (decoded from its mail transport
+      format) or offering the user to name a program to which the
+      decoded data should be passed as input.  Unrecognized predefined
+      types, which in a MIME-conformant mailer might still include
+      audio, image, or video, should also be treated in this way.
+
+   A user agent that meets the above conditions is said to be MIME-
+
+
+
+Borenstein & Freed                                             [Page 61]
+
+RFC 1521                          MIME                    September 1993
+
+
+   conformant.  The meaning of this phrase is that it is assumed to be
+   "safe" to send virtually any kind of properly-marked data to users of
+   such mail systems, because such systems will at least be able to
+   treat the data as undifferentiated binary, and will not simply splash
+   it onto the screen of unsuspecting users.  There is another sense in
+   which it is always "safe" to send data in a format that is MIME-
+   conformant, which is that such data will not break or be broken by
+   any known systems that are conformant with RFC 821 and RFC 822.  User
+   agents that are MIME-conformant have the additional guarantee that
+   the user will not be shown data that were never intended to be viewed
+   as text.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Borenstein & Freed                                             [Page 62]
+
+RFC 1521                          MIME                    September 1993
+
+
+Appendix B -- General Guidelines For Sending Email Data
+
+   Internet email is not a perfect, homogeneous system.  Mail may become
+   corrupted at several stages in its travel to a final destination.
+   Specifically, email sent throughout the Internet may travel across
+   many networking technologies.  Many networking and mail technologies
+   do not support the full functionality possible in the SMTP transport
+   environment. Mail traversing these systems is likely to be modified
+   in such a way that it can be transported.
+
+   There exist many widely-deployed non-conformant MTAs in the Internet.
+   These MTAs, speaking the SMTP protocol, alter messages on the fly to
+   take advantage of the internal data structure of the hosts they are
+   implemented on, or are just plain broken.
+
+   The following guidelines may be useful to anyone devising a data
+   format (Content-Type) that will survive the widest range of
+   networking technologies and known broken MTAs unscathed.  Note that
+   anything encoded in the base64 encoding will satisfy these rules, but
+   that some well-known mechanisms, notably the UNIX uuencode facility,
+   will not.  Note also that anything encoded in the Quoted-Printable
+   encoding will survive most gateways intact, but possibly not some
+   gateways to systems that use the EBCDIC character set.
+
+      (1) Under some circumstances the encoding used for data may change
+      as part of normal gateway or user agent operation. In particular,
+      conversion from base64 to quoted-printable and vice versa may be
+      necessary. This may result in the confusion of CRLF sequences with
+      line breaks in text bodies. As such, the persistence of CRLF as
+      something other than a line break must not be relied on.
+
+      (2) Many systems may elect to represent and store text data using
+      local newline conventions. Local newline conventions may not match
+      the RFC822 CRLF convention -- systems are known that use plain CR,
+      plain LF, CRLF, or counted records.  The result is that isolated
+      CR and LF characters are not well tolerated in general; they may
+      be lost or converted to delimiters on some systems, and hence must
+      not be relied on.
+
+      (3) TAB (HT) characters may be misinterpreted or may be
+      automatically converted to variable numbers of spaces.  This is
+      unavoidable in some environments, notably those not based on the
+      ASCII character set. Such conversion is STRONGLY DISCOURAGED, but
+      it may occur, and mail formats must not rely on the persistence of
+      TAB (HT) characters.
+
+      (4) Lines longer than 76 characters may be wrapped or truncated in
+      some environments. Line wrapping and line truncation are STRONGLY
+
+
+
+Borenstein & Freed                                             [Page 63]
+
+RFC 1521                          MIME                    September 1993
+
+
+      DISCOURAGED, but unavoidable in some cases. Applications which
+      require long lines must somehow differentiate between soft and
+      hard line breaks.  (A simple way to do this is to use the quoted-
+      printable encoding.)
+
+      (5) Trailing "white space" characters (SPACE, TAB (HT)) on a line
+      may be discarded by some transport agents, while other transport
+      agents may pad lines with these characters so that all lines in a
+      mail file are of equal length.  The persistence of trailing white
+      space, therefore, must not be relied on.
+
+      (6) Many mail domains use variations on the ASCII character set,
+      or use character sets such as EBCDIC which contain most but not
+      all of the US-ASCII characters.  The correct translation of
+      characters not in the "invariant" set cannot be depended on across
+      character converting gateways.  For example, this situation is a
+      problem when sending uuencoded information across BITNET, an
+      EBCDIC system.  Similar problems can occur without crossing a
+      gateway, since many Internet hosts use character sets other than
+      ASCII internally.  The definition of Printable Strings in X.400
+      adds further restrictions in certain special cases.  In
+      particular, the only characters that are known to be consistent
+      across all gateways are the 73 characters that correspond to the
+      upper and lower case letters A-Z and a-z, the 10 digits 0-9, and
+      the following eleven special characters:
+
+                        "'"  (ASCII code 39)
+                        "("  (ASCII code 40)
+                        ")"  (ASCII code 41)
+                        "+"  (ASCII code 43)
+                        ","  (ASCII code 44)
+                        "-"  (ASCII code 45)
+                        "."  (ASCII code 46)
+                        "/"  (ASCII code 47)
+                        ":"  (ASCII code 58)
+                        "="  (ASCII code 61)
+                        "?"  (ASCII code 63)
+
+      A maximally portable mail representation, such as the base64
+      encoding, will confine itself to relatively short lines of text in
+      which the only meaningful characters are taken from this set of 73
+      characters.
+
+      (7) Some mail transport agents will corrupt data that includes
+      certain literal strings.  In particular, a period (".") alone on a
+      line is known to be corrupted by some (incorrect) SMTP
+      implementations, and a line that starts with the five characters
+      "From " (the fifth character is a SPACE) are commonly corrupted as
+
+
+
+Borenstein & Freed                                             [Page 64]
+
+RFC 1521                          MIME                    September 1993
+
+
+      well.  A careful composition agent can prevent these corruptions
+      by encoding the data (e.g., in the quoted-printable encoding,
+      "=46rom " in place of "From " at the start of a line, and "=2E" in
+      place of "." alone on a line.
+
+   Please note that the above list is NOT a list of recommended
+   practices for MTAs.  RFC 821 MTAs are prohibited from altering the
+   character of white space or wrapping long lines.  These BAD and
+   illegal practices are known to occur on established networks, and
+   implementations should be robust in dealing with the bad effects they
+   can cause.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Borenstein & Freed                                             [Page 65]
+
+RFC 1521                          MIME                    September 1993
+
+
+Appendix C -- A Complex Multipart Example
+
+   What follows is the outline of a complex multipart message.  This
+   message has five parts to be displayed serially: two introductory
+   plain text parts, an embedded multipart message, a richtext part, and
+   a closing encapsulated text message in a non-ASCII character set.
+   The embedded multipart message has two parts to be displayed in
+   parallel, a picture and an audio fragment.
+
+      MIME-Version: 1.0
+      From: Nathaniel Borenstein <nsb@bellcore.com>
+      To: Ned Freed <ned@innosoft.com>
+      Subject: A multipart example
+      Content-Type: multipart/mixed;
+           boundary=unique-boundary-1
+
+      This is the preamble area of a multipart message.
+      Mail readers that understand multipart format
+      should ignore this preamble.
+      If you are reading this text, you might want to
+      consider changing to a mail reader that understands
+      how to properly display multipart messages.
+      --unique-boundary-1
+
+         ...Some text appears here...
+      [Note that the preceding blank line means
+      no header fields were given and this is text,
+      with charset US ASCII.  It could have been
+      done with explicit typing as in the next part.]
+
+      --unique-boundary-1
+      Content-type: text/plain; charset=US-ASCII
+
+      This could have been part of the previous part,
+      but illustrates explicit versus implicit
+      typing of body parts.
+
+      --unique-boundary-1
+      Content-Type: multipart/parallel;
+           boundary=unique-boundary-2
+
+
+      --unique-boundary-2
+      Content-Type: audio/basic
+      Content-Transfer-Encoding: base64
+
+         ... base64-encoded 8000 Hz single-channel
+             mu-law-format audio data goes here....
+
+
+
+Borenstein & Freed                                             [Page 66]
+
+RFC 1521                          MIME                    September 1993
+
+
+      --unique-boundary-2
+      Content-Type: image/gif
+      Content-Transfer-Encoding: base64
+
+         ... base64-encoded image data goes here....
+
+      --unique-boundary-2--
+
+      --unique-boundary-1
+      Content-type: text/richtext
+
+      This is <bold><italic>richtext.</italic></bold>
+      <smaller>as defined in RFC 1341</smaller>
+      <nl><nl>Isn't it
+      <bigger><bigger>cool?</bigger></bigger>
+
+      --unique-boundary-1
+      Content-Type: message/rfc822
+
+      From: (mailbox in US-ASCII)
+      To: (address in US-ASCII)
+      Subject: (subject in US-ASCII)
+      Content-Type: Text/plain; charset=ISO-8859-1
+      Content-Transfer-Encoding: Quoted-printable
+
+         ... Additional text in ISO-8859-1 goes here ...
+
+      --unique-boundary-1--
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Borenstein & Freed                                             [Page 67]
+
+RFC 1521                          MIME                    September 1993
+
+
+Appendix D -- Collected Grammar
+
+   This appendix contains the complete BNF grammar for all the syntax
+   specified by this document.
+
+   By itself, however, this grammar is incomplete.  It refers to several
+   entities that are defined by RFC 822.  Rather than reproduce those
+   definitions here, and risk unintentional differences between the two,
+   this document simply refers the reader to RFC 822 for the remaining
+   definitions.  Wherever a term is undefined, it refers to the RFC 822
+   definition.
+
+   application-subtype := ("octet-stream" *stream-param)
+                       / "postscript" / extension-token
+
+   application-type :=  "application" "/" application-subtype
+
+   attribute := token    ; case-insensitive
+
+   atype := "ftp" / "anon-ftp" / "tftp" / "local-file"
+                  / "afs" / "mail-server" / extension-token
+                  ; Case-insensitive
+
+   audio-type := "audio" "/" ("basic" / extension-token)
+
+   body-part := <"message" as defined in RFC 822,
+            with all header fields optional, and with the
+            specified delimiter not occurring anywhere in
+            the message body, either on a line by itself
+            or as a substring anywhere.>
+
+      NOTE: In certain transport enclaves, RFC 822 restrictions such as
+      the one that limits bodies to printable ASCII characters may not
+      be in force.  (That is, the transport domains may resemble
+      standard Internet mail transport as specified in RFC821 and
+      assumed by RFC822, but without certain restrictions.)  The
+      relaxation of these restrictions should be construed as locally
+      extending the definition of bodies, for example to include octets
+      outside of the ASCII range, as long as these extensions are
+      supported by the transport and adequately documented in the
+      Content-Transfer-Encoding header field. However, in no event are
+      headers (either message headers or body-part headers) allowed to
+      contain anything other than ASCII characters.
+
+
+
+
+
+
+
+
+Borenstein & Freed                                             [Page 68]
+
+RFC 1521                          MIME                    September 1993
+
+
+   boundary := 0*69<bchars> bcharsnospace
+
+   bchars := bcharsnospace / " "
+
+   bcharsnospace :=    DIGIT / ALPHA / "'" / "(" / ")" / "+"  / "_"
+                  / "," / "-" / "." / "/" / ":" / "=" / "?"
+
+   charset := "us-ascii" / "iso-8859-1" / "iso-8859-2"/ "iso-8859-3"
+        / "iso-8859-4" / "iso-8859-5" /  "iso-8859-6" / "iso-8859-7"
+        / "iso-8859-8" / "iso-8859-9" / extension-token
+        ; case insensitive
+
+   close-delimiter := "--" boundary "--" CRLF;Again,no space by "--",
+
+   content  := "Content-Type"  ":" type "/" subtype  *(";" parameter)
+             ; case-insensitive matching of type and subtype
+
+   delimiter := "--" boundary CRLF  ;taken from Content-Type field.
+                                ; There must be no space
+                                ; between "--" and boundary.
+
+   description := "Content-Description" ":" *text
+
+   discard-text := *(*text CRLF)
+
+   encapsulation := delimiter body-part CRLF
+
+   encoding := "Content-Transfer-Encoding" ":" mechanism
+
+   epilogue := discard-text        ;  to  be  ignored upon receipt.
+
+   extension-token :=  x-token / iana-token
+
+   external-param :=   (";" "access-type" "=" atype)
+                  / (";" "expiration" "=" date-time)
+
+                       ; Note that date-time is quoted
+                  / (";" "size" "=" 1*DIGIT)
+                  / (";"  "permission"  "="  ("read" / "read-write"))
+                       ; Permission is case-insensitive
+                  / (";" "name" "="  value)
+                  / (";" "site" "=" value)
+                  / (";" "dir" "=" value)
+                  / (";" "mode" "=" value)
+                  / (";" "server" "=" value)
+                  / (";" "subject" "=" value)
+           ;access-type required; others required based on access-type
+
+
+
+
+Borenstein & Freed                                             [Page 69]
+
+RFC 1521                          MIME                    September 1993
+
+
+   iana-token := <a publicly-defined extension token,
+             registered with IANA, as specified in
+             appendix E>
+
+   id :=  "Content-ID" ":" msg-id
+
+   image-type := "image" "/" ("gif" / "jpeg" / extension-token)
+
+   mechanism :=     "7bit"    ;  case-insensitive
+                  / "quoted-printable"
+                  / "base64"
+                  / "8bit"
+                  / "binary"
+                  / x-token
+
+   message-subtype := "rfc822"
+                  / "partial" 2#3partial-param
+                  / "external-body" 1*external-param
+                  / extension-token
+
+   message-type := "message" "/" message-subtype
+
+   multipart-body :=preamble 1*encapsulation close-delimiter epilogue
+
+   multipart-subtype := "mixed" / "parallel" / "digest"
+                  / "alternative" / extension-token
+
+   multipart-type := "multipart" "/" multipart-subtype
+                  ";" "boundary" "=" boundary
+
+   octet := "=" 2(DIGIT / "A" / "B" / "C" / "D" / "E" / "F")
+        ; octet must be used for characters > 127, =, SPACE, or
+   TAB,
+        ; and is recommended for any characters not listed in
+        ; Appendix B as "mail-safe".
+
+   padding := "0" / "1" /  "2" /  "3" / "4" / "5" / "6" / "7"
+
+   parameter := attribute "=" value
+
+   partial-param :=     (";" "id" "=" value)
+                  /  (";" "number" "=" 1*DIGIT)
+                  /  (";" "total" "=" 1*DIGIT)
+             ; id & number required;total required for last part
+
+   preamble := discard-text       ;  to  be  ignored upon receipt.
+
+   ptext := octet / <any ASCII character except "=", SPACE,  or TAB>
+
+
+
+Borenstein & Freed                                             [Page 70]
+
+RFC 1521                          MIME                    September 1993
+
+
+        ; characters not listed as "mail-safe" in Appendix B
+        ; are also not recommended.
+
+   quoted-printable := ([*(ptext / SPACE /  TAB)  ptext]  ["="] CRLF)
+        ; Maximum line length of 76 characters excluding CRLF
+
+   stream-param :=  (";" "type" "=" value)
+                / (";" "padding" "=" padding)
+
+   subtype := token  ; case-insensitive
+
+   text-subtype := "plain" / extension-token
+
+   text-type := "text" "/" text-subtype [";" "charset" "=" charset]
+
+   token  :=  1*<any  (ASCII) CHAR except SPACE, CTLs, or tspecials>
+
+   tspecials :=  "(" / ")" / "<" / ">" / "@"
+              /  "," / ";" / ":" / "\" / <">
+              /  "/" / "[" / "]" / "?" / "="
+             ; Must be in quoted-string,
+             ; to use within parameter values
+
+
+   type :=     "application"     /  "audio"   ; case-insensitive
+             / "image"           / "message"
+             / "multipart"  / "text"
+             / "video"           / extension-token
+             ; All values case-insensitive
+
+   value := token / quoted-string
+
+   version := "MIME-Version" ":" 1*DIGIT "." 1*DIGIT
+
+   video-type := "video" "/" ("mpeg" / extension-token)
+
+   x-token := <The two characters "X-" or "x-" followed, with no
+              intervening white space, by any token>
+
+
+
+
+
+
+
+
+
+
+
+
+
+Borenstein & Freed                                             [Page 71]
+
+RFC 1521                          MIME                    September 1993
+
+
+Appendix E -- IANA Registration Procedures
+
+   MIME has been carefully designed to have extensible mechanisms, and
+   it is expected that the set of content-type/subtype pairs and their
+   associated parameters will grow significantly with time.  Several
+   other MIME fields, notably character set names, access-type
+   parameters for the message/external-body type, and possibly even
+   Content-Transfer-Encoding values, are likely to have new values
+   defined over time.  In order to ensure that the set of such values is
+   developed in an orderly, well-specified, and public manner, MIME
+   defines a registration process which uses the Internet Assigned
+   Numbers Authority (IANA) as a central registry for such values.
+
+   In general, parameters in the content-type header field are used to
+   convey supplemental information for various content types, and their
+   use is defined when the content-type and subtype are defined.  New
+   parameters should not be defined as a way to introduce new
+   functionality.
+
+   In order to simplify and standardize the registration process, this
+   appendix gives templates for the registration of new values with
+   IANA.  Each of these is given in the form of an email message
+   template, to be filled in by the registering party.
+
+   E.1  Registration of New Content-type/subtype Values
+
+   Note that MIME is generally expected to be extended by subtypes.  If
+   a new fundamental top-level type is needed, its specification must be
+   published as an RFC or submitted in a form suitable to become an RFC,
+   and be subject to the Internet standards process.
+
+      To:  IANA@isi.edu
+      Subject:  Registration of new MIME
+           content-type/subtype
+
+      MIME type name:
+
+      (If the above is not an existing top-level MIME type,
+      please explain why an existing type cannot be used.)
+
+      MIME subtype name:
+
+      Required parameters:
+
+      Optional parameters:
+
+      Encoding considerations:
+
+
+
+
+Borenstein & Freed                                             [Page 72]
+
+RFC 1521                          MIME                    September 1993
+
+
+      Security considerations:
+
+      Published specification:
+
+      (The published specification must be an Internet RFC or
+      RFC-to-be if a new top-level type is being defined, and
+      must be a publicly available specification in any
+      case.)
+
+      Person & email address to contact for further information:
+
+   E.2  Registration of New Access-type Values
+           for Message/external-body
+
+      To:  IANA@isi.edu
+      Subject:  Registration of new MIME Access-type for
+           Message/external-body content-type
+
+      MIME access-type name:
+
+      Required parameters:
+
+      Optional parameters:
+
+      Published specification:
+
+      (The published specification must be an Internet RFC or
+      RFC-to-be.)
+
+      Person & email address to contact for further information:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Borenstein & Freed                                             [Page 73]
+
+RFC 1521                          MIME                    September 1993
+
+
+Appendix F -- Summary of the Seven Content-types
+
+   Content-type: text
+
+   Subtypes defined by this document:  plain
+
+   Important Parameters: charset
+
+   Encoding notes: quoted-printable generally preferred if an encoding
+      is needed and the character set is mostly an ASCII superset.
+
+   Security considerations: Rich text formats such as TeX and Troff
+      often contain mechanisms for executing arbitrary commands or file
+      system operations, and should not be used automatically unless
+      these security problems have been addressed.  Even plain text may
+      contain control characters that can be used to exploit the
+      capabilities of "intelligent" terminals and cause security
+      violations.  User interfaces designed to run on such terminals
+      should be aware of and try to prevent such problems.
+
+   ________________________________________________________
+   Content-type: multipart
+
+   Subtypes defined by  this  document: mixed, alternative,
+        digest, parallel.
+
+   Important Parameters: boundary
+
+   Encoding notes: No content-transfer-encoding is permitted.
+
+   ________________________________________________________
+   Content-type: message
+
+   Subtypes defined by this document: rfc822, partial, external-body
+
+   Important Parameters: id, number, total, access-type, expiration,
+      size, permission, name, site, directory, mode, server, subject
+
+   Encoding notes: No content-transfer-encoding is permitted.
+      Specifically, only "7bit" is permitted for "message/partial" or
+      "message/external-body", and only "7bit", "8bit", or "binary" are
+      permitted for other subtypes of "message".
+   ______________________________________________________________
+   Content-type: application
+
+   Subtypes defined by this document:  octet-stream, postscript
+
+   Important Parameters:  type, padding
+
+
+
+Borenstein & Freed                                             [Page 74]
+
+RFC 1521                          MIME                    September 1993
+
+
+   Deprecated Parameters: name and conversions were
+                          defined in RFC 1341.
+
+   Encoding notes: base64 preferred for unreadable subtypes.
+
+   Security considerations:  This  type  is  intended  for  the
+   transmission  of data to be interpreted by locally-installed
+   programs.  If used,  for  example,  to  transmit  executable
+   binary  programs  or programs in general-purpose interpreted
+   languages, such as LISP programs or  shell  scripts,  severe
+   security  problems  could  result.   Authors of mail-reading
+   agents are cautioned against giving their systems the  power
+   to  execute  mail-based  application  data without carefully
+   considering  the  security  implications.    While   it   is
+   certainly  possible  to  define safe application formats and
+   even safe interpreters for unsafe formats, each  interpreter
+   should   be   evaluated  separately  for  possible  security
+   problems.
+   ________________________________________________________________
+   Content-type: image
+
+   Subtypes defined by this document:  jpeg, gif
+
+   Important Parameters: none
+
+   Encoding notes: base64 generally preferred
+   ________________________________________________________________
+   Content-type: audio
+
+   Subtypes defined by this document:  basic
+
+   Important Parameters: none
+
+   Encoding notes: base64 generally preferred
+   ________________________________________________________________
+   Content-type: video
+
+   Subtypes defined by this document:  mpeg
+
+   Important Parameters: none
+
+   Encoding notes: base64 generally preferred
+
+
+
+
+
+
+
+
+
+Borenstein & Freed                                             [Page 75]
+
+RFC 1521                          MIME                    September 1993
+
+
+Appendix G -- Canonical Encoding Model
+
+   There was some confusion, in earlier drafts of this memo, regarding
+   the model for when email data was to be converted to canonical form
+   and encoded, and in particular how this process would affect the
+   treatment of CRLFs, given that the representation of newlines varies
+   greatly from system to system.  For this reason, a canonical model
+   for encoding is presented below.
+
+   The process of composing a MIME entity can be modeled as being done
+   in a number of steps.  Note that these steps are roughly similar to
+   those steps used in RFC 1421 and are performed for each 'innermost
+   level' body:
+
+   Step 1.  Creation of local form.
+
+   The body to be transmitted is created in the system's native format.
+   The native character set is used, and where appropriate local end of
+   line conventions are used as well.  The body may be a UNIX-style text
+   file, or a Sun raster image, or a VMS indexed file, or audio data in
+   a system-dependent format stored only in memory, or anything else
+   that corresponds to the local model for the representation of some
+   form of information.  Fundamentally, the data is created in the
+   "native" form specified by the type/subtype information.
+
+   Step 2.  Conversion to canonical form.
+
+   The entire body, including "out-of-band" information such as record
+   lengths and possibly file attribute information, is converted to a
+   universal canonical form.  The specific content type of the body as
+   well as its associated attributes dictate the nature of the canonical
+   form that is used.  Conversion to the proper canonical form may
+   involve character set conversion, transformation of audio data,
+   compression, or various other operations specific to the various
+   content types.  If character set conversion is involved, however,
+   care must be taken to understand the semantics of the content-type,
+   which may have strong implications for any character set conversion,
+   e.g.  with regard to syntactically meaningful characters in a text
+   subtype other than "plain".
+
+   For example, in the case of text/plain data, the text must be
+   converted to a supported character set and lines must be delimited
+   with CRLF delimiters in accordance with RFC822.  Note that the
+   restriction on line lengths implied by RFC822 is eliminated if the
+   next step employs either quoted-printable or base64 encoding.
+
+
+
+
+
+
+Borenstein & Freed                                             [Page 76]
+
+RFC 1521                          MIME                    September 1993
+
+
+   Step 3.  Apply transfer encoding.
+
+   A Content-Transfer-Encoding appropriate for this body is applied.
+   Note that there is no fixed relationship between the content type and
+   the transfer encoding.  In particular, it may be appropriate to base
+   the choice of base64 or quoted-printable on character frequency
+   counts which are specific to a given instance of a body.
+
+   Step 4.  Insertion into entity.
+
+   The encoded object is inserted into a MIME entity with appropriate
+   headers.  The entity is then inserted into the body of a higher-level
+   entity (message or multipart) if needed.
+
+   It is vital to note that these steps are only a model; they are
+   specifically NOT a blueprint for how an actual system would be built.
+   In particular, the model fails to account for two common designs:
+
+      1.  In many cases the conversion to a canonical form prior to
+      encoding will be subsumed into the encoder itself, which
+      understands local formats directly.  For example, the local
+      newline convention for text bodies might be carried through to the
+      encoder itself along with knowledge of what that format is.
+
+      2.  The output of the encoders may have to pass through one or
+      more additional steps prior to being transmitted as a message.  As
+      such, the output of the encoder may not be conformant with the
+      formats specified by RFC822.  In particular, once again it may be
+      appropriate for the converter's output to be expressed using local
+      newline conventions rather than using the standard RFC822 CRLF
+      delimiters.
+
+   Other implementation variations are conceivable as well.  The vital
+   aspect of this discussion is that, in spite of any optimizations,
+   collapsings of required steps, or insertion of additional processing,
+   the resulting messages must be consistent with those produced by the
+   model described here.  For example, a message with the following
+   header fields:
+
+        Content-type: text/foo; charset=bar
+        Content-Transfer-Encoding: base64
+
+   must be first represented in the text/foo form, then (if necessary)
+   represented in the "bar" character set, and finally transformed via
+   the base64 algorithm into a mail-safe form.
+
+
+
+
+
+
+Borenstein & Freed                                             [Page 77]
+
+RFC 1521                          MIME                    September 1993
+
+
+Appendix H -- Changes from RFC 1341
+
+   This document is a relatively minor revision  of  RFC  1341.  For
+   the  convenience  of  those familiar with RFC 1341, the technical
+   changes from that document are summarized in  this appendix.
+
+   1.  The definition of "tspecials" has been changed to no longer
+   include ".".
+
+   2.  The Content-ID field is now mandatory for message/external-body
+   parts.
+
+   3.  The text/richtext type (including the old Section 7.1.3 and
+   Appendix D) has been moved to a separate document.
+
+   4.  The rules on header merging for message/partial data have been
+   changed to treat the Encrypted and MIME-Version headers as special
+   cases.
+
+   5.  The definition of the external-body access-type parameter has
+   been changed so that it can only indicate a single access method
+   (which was all that made sense).
+
+   6.  There is a new "Subject" parameter for message/external-body,
+   access-type mail-server, to permit MIME-based use of mail servers
+   that rely on Subject field information.
+
+   7.  The "conversions" parameter for application/octet-stream has been
+   removed.
+
+   8.  Section 7.4.1 now deprecates the use of the "name" parameter for
+   application/octet-stream, as this will be superseded in the future by
+   a Content-Disposition header.
+
+   9.  The formal grammar for multipart bodies has been changed so that
+   a CRLF is no longer required before the first boundary line.
+
+   10.  MIME entities of type "message/partial" and "message/external-
+   body" are now required to use only the "7bit" transfer-encoding.
+   (Specifically, "binary" and "8bit" are not permitted.)
+
+   11.  The "application/oda" content-type has been removed.
+
+   12.  A note has been added to the end of section 7.2.3, explaining
+   the semantics of Content-ID in a multipart/alternative MIME entity.
+
+   13.  The formal syntax for the "MIME-Version" field has been
+   tightened, but in a way that is completely compatible with the only
+
+
+
+Borenstein & Freed                                             [Page 78]
+
+RFC 1521                          MIME                    September 1993
+
+
+   version number defined in RFC 1341.
+
+   14.  In Section 7.3.1, the definition of message/rfc822 has been
+   relaxed regarding mandatory fields.
+
+   All other changes from RFC 1341 were editorial changes and do not
+   affect the technical content of MIME.  Considerable formal grammar
+   has been added, but this reflects the prose specification that was
+   already in place.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Borenstein & Freed                                             [Page 79]
+
+RFC 1521                          MIME                    September 1993
+
+
+References
+
+   [US-ASCII] Coded Character Set--7-Bit American Standard Code for
+   Information Interchange, ANSI X3.4-1986.
+
+   [ATK] Borenstein, Nathaniel S., Multimedia Applications Development
+   with the Andrew Toolkit, Prentice-Hall, 1990.
+
+   [GIF] Graphics Interchange Format (Version 89a), Compuserve, Inc.,
+   Columbus, Ohio, 1990.
+
+   [ISO-2022] International Standard--Information Processing--ISO 7-bit
+   and 8-bit coded character sets--Code extension techniques, ISO
+   2022:1986.
+
+   [ISO-8859] Information Processing -- 8-bit Single-Byte Coded Graphic
+   Character Sets -- Part 1: Latin Alphabet No. 1, ISO 8859-1:1987.  Part
+   2: Latin alphabet No.  2, ISO 8859-2, 1987.  Part 3: Latin alphabet
+   No. 3, ISO 8859-3, 1988.  Part 4: Latin alphabet No.  4, ISO 8859-4,
+   1988.  Part 5: Latin/Cyrillic alphabet, ISO 8859-5, 1988.  Part 6:
+   Latin/Arabic alphabet, ISO 8859-6, 1987.  Part 7: Latin/Greek
+   alphabet, ISO 8859-7, 1987.  Part 8: Latin/Hebrew alphabet, ISO
+   8859-8, 1988.  Part 9: Latin alphabet No. 5, ISO 8859-9, 1990.
+
+   [ISO-646] International Standard--Information Processing--ISO 7-bit
+   coded character set for information interchange, ISO 646:1983.
+
+   [MPEG] Video Coding Draft Standard ISO 11172 CD, ISO IEC/TJC1/SC2/WG11
+   (Motion Picture Experts Group), May, 1991.
+
+   [PCM] CCITT, Fascicle III.4 - Recommendation G.711, Geneva, 1972,
+   "Pulse Code Modulation (PCM) of Voice Frequencies".
+
+   [POSTSCRIPT] Adobe Systems, Inc., PostScript Language Reference
+   Manual, Addison-Wesley, 1985.
+
+   [POSTSCRIPT2] Adobe Systems, Inc., PostScript Language Reference
+   Manual, Addison-Wesley, Second Edition, 1990.
+
+   [X400] Schicker, Pietro, "Message Handling Systems, X.400", Message
+   Handling Systems and Distributed Applications, E.  Stefferud, O-j.
+   Jacobsen, and P.  Schicker, eds., North-Holland, 1989, pp. 3-41.
+
+   [RFC-783] Sollins, K., "TFTP Protocol (revision 2)", RFC 783, MIT,
+   June 1981.
+
+   [RFC-821] Postel, J., "Simple Mail Transfer Protocol", STD 10, RFC
+   821, USC/Information Sciences Institute, August 1982.
+
+
+
+Borenstein & Freed                                             [Page 80]
+
+RFC 1521                          MIME                    September 1993
+
+
+   [RFC-822] Crocker, D., "Standard for the Format of ARPA Internet Text
+   Messages", STD 11, RFC 822, UDEL, August 1982.
+
+   [RFC-934] Rose, M., and E. Stefferud, "Proposed Standard for Message
+   Encapsulation", RFC 934, Delaware and NMA, January 1985.
+
+   [RFC-959] Postel, J. and J. Reynolds, "File Transfer Protocol",
+   STD 9, RFC 959, USC/Information Sciences Institute, October 1985.
+
+   [RFC-1049] Sirbu, M., "Content-Type Header Field for Internet
+   Messages", STD 11, RFC 1049, CMU, March 1988.
+
+   [RFC-1421] Linn, J., "Privacy Enhancement for Internet Electronic Mail:
+   Part I - Message Encryption and Authentication Procedures", RFC
+   1421, IAB IRTF PSRG, IETF PEM WG, February 1993.
+
+   [RFC-1154] Robinson, D. and R. Ullmann, "Encoding Header Field for
+   Internet Messages", RFC 1154, Prime Computer, Inc., April 1990.
+
+   [RFC-1341] Borenstein, N., and N.  Freed, "MIME (Multipurpose Internet
+   Mail Extensions): Mechanisms for Specifying and Describing the Format
+   of Internet Message Bodies", RFC 1341, Bellcore, Innosoft, June 1992.
+
+   [RFC-1342] Moore, K., "Representation of Non-Ascii Text in Internet
+   Message Headers", RFC 1342, University of Tennessee, June 1992.
+
+   [RFC-1343] Borenstein, N., "A User Agent Configuration Mechanism
+   for Multimedia Mail Format Information", RFC 1343, Bellcore, June
+   1992.
+
+   [RFC-1344] Borenstein, N., "Implications of MIME for Internet
+   Mail Gateways", RFC 1344, Bellcore, June 1992.
+
+   [RFC-1345] Simonsen, K., "Character Mnemonics & Character Sets",
+   RFC 1345, Rationel Almen Planlaegning, June 1992.
+
+   [RFC-1426] Klensin, J., (WG Chair), Freed, N., (Editor), Rose, M.,
+   Stefferud, E., and D. Crocker, "SMTP Service Extension for 8bit-MIME
+   transport", RFC 1426, United Nations Universit, Innosoft, Dover Beach
+   Consulting, Inc., Network Management Associates, Inc., The Branch
+   Office, February 1993.
+
+   [RFC-1522] Moore, K., "Representation of Non-Ascii Text in Internet
+   Message Headers" RFC 1522, University of Tennessee, September 1993.
+
+   [RFC-1340] Reynolds, J., and J. Postel, "Assigned Numbers", STD 2, RFC
+   1340, USC/Information Sciences Institute, July 1992.
+
+
+
+
+Borenstein & Freed                                             [Page 81]
+
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc1854.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc1854.txt
new file mode 100644
index 000000000..7b1a97517
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc1854.txt
@@ -0,0 +1,395 @@
+
+
+
+
+
+
+Network Working Group                                           N. Freed
+Request For Comments: 1854                  Innosoft International, Inc.
+Category: Standards Track                          A. Cargille, WG Chair
+                                                            October 1995
+
+
+                         SMTP Service Extension
+                         for Command Pipelining
+
+Status of this Memo
+
+   This document specifies an Internet standards track protocol for the
+   Internet community, and requests discussion and suggestions for
+   improvements.  Please refer to the current edition of the "Internet
+   Official Protocol Standards" (STD 1) for the standardization state
+   and status of this protocol.  Distribution of this memo is unlimited.
+
+Abstract
+
+   This memo defines an extension to the SMTP service whereby a server
+   can indicate the extent of its ability to accept multiple commands in
+   a single TCP send operation. Using a single TCP send operation for
+   multiple commands can improve SMTP performance significantly.
+
+Introduction
+
+   Although SMTP is widely and robustly deployed, certain extensions may
+   nevertheless prove useful. In particular, many parts of the Internet
+   make use of high latency network links.
+
+   SMTP's intrinsic one command-one response structure is significantly
+   penalized by high latency links, often to the point where the factors
+   contributing to overall connection time are dominated by the time
+   spent waiting for responses to individual commands (turnaround time).
+
+   In the best of all worlds it would be possible to simply deploy SMTP
+   client software that makes use of command pipelining: batching up
+   multiple commands into single TCP send operations. Unfortunately, the
+   original SMTP specification [1] did not explicitly state that SMTP
+   servers must support this.  As a result a non-trivial number of
+   Internet SMTP servers cannot adequately handle command pipelining.
+   Flaws known to exist in deployed servers include:
+
+ (1)   Connection handoff and buffer flushes in the middle of
+       the SMTP dialogue.  Creation of server processes for
+       incoming SMTP connections is a useful, obvious, and
+       harmless implementation technique. However, some SMTP
+       servers defer process forking and connection handoff
+
+
+
+Freed & Cargille            Standards Track                     [Page 1]
+
+RFC 1854                    SMTP Pipelining                 October 1995
+
+
+       until some intermediate point in the SMTP dialogue.
+       When this is done material read from the TCP connection
+       and kept in process buffers can be lost.
+
+ (2)   Flushing the TCP input buffer when an SMTP command
+       fails. SMTP commands often fail but there is no reason
+       to flush the TCP input buffer when this happens.
+       Nevertheless, some SMTP servers do this.
+
+ (3)   Improper processing and promulgation of SMTP command
+       failures. For example, some SMTP servers will refuse to
+       accept a DATA command if the last RCPT TO command
+       fails, paying no attention to the success or failure of
+       prior RCPT TO command results. Other servers will
+       accept a DATA command even when all previous RCPT TO
+       commands have failed. Although it is possible to
+       accommodate this sort of behavior in a client that
+       employs command pipelining, it does complicate the
+       construction of the client unnecessarily.
+
+   This memo uses the mechanism described in [2] to define an extension
+   to the SMTP service whereby an SMTP server can declare that it is
+   capable of handling pipelined commands. The SMTP client can then
+   check for this declaration and use pipelining only when the server
+   declares itself capable of handling it.
+
+1.  Framework for the Command Pipelining Extension
+
+   The Command Pipelining extension is defined as follows:
+
+    (1)   the name of the SMTP service extension is Pipelining;
+
+    (2)   the EHLO keyword value associated with the extension is
+          PIPELINING;
+
+    (3)   no parameter is used with the PIPELINING EHLO keyword;
+
+    (4)   no additional parameters are added to either the MAIL
+          FROM or RCPT TO commands.
+
+    (5)   no additional SMTP verbs are defined by this extension;
+          and,
+
+    (6)   the next section specifies how support for the
+          extension affects the behavior of a server and client
+          SMTP.
+
+
+
+
+
+Freed & Cargille            Standards Track                     [Page 2]
+
+RFC 1854                    SMTP Pipelining                 October 1995
+
+
+2.  The Pipelining Service Extension
+
+   When a client SMTP wishes to employ command pipelining, it first
+   issues the EHLO command to the server SMTP. If the server SMTP
+   responds with code 250 to the EHLO command, and the response includes
+   the EHLO keyword value PIPELINING, then the server SMTP has indicated
+   that it can accommodate SMTP command pipelining.
+
+2.1.  Client use of pipelining
+
+   Once the client SMTP has confirmed that support exists for the
+   pipelining extension, the client SMTP may then elect to transmit
+   groups of SMTP commands in batches without waiting for a response to
+   each individual command. In particular, the commands RSET, MAIL FROM,
+   SEND FROM, SOML FROM, SAML FROM, and RCPT TO can all appear anywhere
+   in a pipelined command group.  The EHLO, DATA, VRFY, EXPN, TURN,
+   QUIT, and NOOP commands can only appear as the last command in a
+   group since their success or failure produces a change of state which
+   the client SMTP must accommodate. (NOOP is included in this group so
+   it can be used as a synchronization point.)
+
+   Additional commands added by other SMTP extensions may only appear as
+   the last command in a group unless otherwise specified by the
+   extensions that define the commands.
+
+   The actual transfer of message content is explicitly allowed to be
+   the first "command" in a group. That is, the RSET/MAIL FROM sequence
+   necessary to initiate a new message transaction can be placed in the
+   same group as the final transfer of the headers and body of the
+   previous message.
+
+   Client SMTP implementations that employ pipelining MUST check ALL
+   statuses associated with each command in a group. For example, if
+   none of the RCPT TO recipient addresses were accepted the client must
+   then check the response to the DATA command -- the client cannot
+   assume that the DATA command will be rejected just because none of
+   the RCPT TO commands worked.  If the DATA command was properly
+   rejected the client SMTP can just issue RSET, but if the DATA command
+   was accepted the client SMTP should send a single dot.
+
+   Command statuses MUST be coordinated with responses by counting each
+   separate response and correlating that count with the number of
+   commands known to have been issued.  Multiline responses MUST be
+   supported. Matching on the basis of either the error code value or
+   associated text is expressly forbidden.
+
+   Client SMTP implementations MAY elect to operate in a nonblocking
+   fashion, processing server responses immediately upon receipt, even
+
+
+
+Freed & Cargille            Standards Track                     [Page 3]
+
+RFC 1854                    SMTP Pipelining                 October 1995
+
+
+   if there is still data pending transmission from the client's
+   previous TCP send operation. If nonblocking operation is not
+   supported, however, client SMTP implementations MUST also check the
+   TCP window size and make sure that each group of commands fits
+   entirely within the window. The window size is usually, but not
+   always, 4K octets.  Failure to perform this check can lead to
+   deadlock conditions.
+
+   Clients MUST NOT confuse responses to multiple commands with
+   multiline responses. Each command requires one or more lines of
+   response, the last line not containing a dash between the response
+   code and the response string.
+
+2.2.  Server support of pipelining
+
+   A server SMTP implementation that offers the pipelining extension:
+
+    (1)   MUST NOT flush or otherwise lose the contents of the
+          TCP input buffer under any circumstances whatsoever.
+
+    (2)   SHOULD issue a positive response to the DATA command if
+          and only if one or more valid RCPT TO addresses have
+          been previously received.
+
+    (3)   MUST NOT, after issuing a positive response to a DATA
+          command with no valid recipients and subsequently
+          receiving an empty message, send any message whatsoever
+          to anybody.
+
+    (4)   SHOULD elect to store responses to grouped RSET, MAIL
+          FROM, SEND FROM, SOML FROM, SAML FROM, and RCPT TO
+          commands in an internal buffer so they can sent as a
+          unit.
+
+    (5)   MUST NOT buffer responses to EHLO, DATA, VRFY, EXPN,
+          TURN, QUIT, and NOOP.
+
+    (6)   MUST NOT buffer responses to unrecognized commands.
+
+    (7)   MUST send all pending responses immediately whenever
+          the local TCP input buffer is emptied.
+
+    (8)   MUST NOT make assumptions about commands that are yet
+          to be received.
+
+    (9)   SHOULD issue response text that indicates, either
+          implicitly or explicitly, what command the response
+          matches.
+
+
+
+Freed & Cargille            Standards Track                     [Page 4]
+
+RFC 1854                    SMTP Pipelining                 October 1995
+
+
+   The overriding intent of these server requirements is to make it as
+   easy as possible for servers to conform to these pipelining
+   extensions.
+
+3.  Examples
+
+   Consider the following SMTP dialogue that does not use pipelining:
+
+   S: <wait for open connection>
+   C: <open connection to server>
+   S: 220 innosoft.com SMTP service ready
+   C: HELO dbc.mtview.ca.us
+   S: 250 innosoft.com
+   C: MAIL FROM:<mrose@dbc.mtview.ca.us>
+   S: 250 sender <mrose@dbc.mtview.ca.us> OK
+   C: RCPT TO:<ned@innosoft.com>
+   S: 250 recipient <ned@innosoft.com> OK
+   C: RCPT TO:<dan@innosoft.com>
+   S: 250 recipient <dan@innosoft.com> OK
+   C: RCPT TO:<kvc@innosoft.com>
+   S: 250 recipient <kvc@innosoft.com> OK
+   C: DATA
+   S: 354 enter mail, end with line containing only "."
+    ...
+   C: .
+   S: 250 message sent
+   C: QUIT
+   S: 221 goodbye
+
+   The client waits for a server response a total of 9 times in this
+   simple example. But if pipelining is employed the following dialogue
+   is possible:
+
+   S: <wait for open connection>
+   C: <open connection to server>
+   S: 220 innosoft.com SMTP service ready
+   C: EHLO dbc.mtview.ca.us
+   S: 250-innosoft.com
+   S: 250 PIPELINING
+   C: MAIL FROM:<mrose@dbc.mtview.ca.us>
+   C: RCPT TO:<ned@innosoft.com>
+   C: RCPT TO:<dan@innosoft.com>
+   C: RCPT TO:<kvc@innosoft.com>
+   C: DATA
+   S: 250 sender <mrose@dbc.mtview.ca.us> OK
+   S: 250 recipient <ned@innosoft.com> OK
+   S: 250 recipient <dan@innosoft.com> OK
+   S: 250 recipient <kvc@innosoft.com> OK
+
+
+
+Freed & Cargille            Standards Track                     [Page 5]
+
+RFC 1854                    SMTP Pipelining                 October 1995
+
+
+   S: 354 enter mail, end with line containing only "."
+    ...
+   C: .
+   C: QUIT
+   S: 250 message sent
+   S: 221 goodbye
+
+   The total number of turnarounds has been reduced from 9 to 4.
+
+   The next example illustrates one possible form of behavior when
+   pipelining is used and all recipients are rejected:
+
+   S: <wait for open connection>
+   C: <open connection to server>
+   S: 220 innosoft.com SMTP service ready
+   C: EHLO dbc.mtview.ca.us
+   S: 250-innosoft.com
+   S: 250 PIPELINING
+   C: MAIL FROM:<mrose@dbc.mtview.ca.us>
+   C: RCPT TO:<nsb@thumper.bellcore.com>
+   C: RCPT TO:<galvin@tis.com>
+   C: DATA
+   S: 250 sender <mrose@dbc.mtview.ca.us> OK
+   S: 550 remote mail to <nsb@thumper.bellore.com> not allowed
+   S: 550 remote mail to <galvin@tis.com> not allowed
+   S: 554 no valid recipients given
+   C: QUIT
+   S: 221 goodbye
+
+   The client SMTP waits for the server 4 times here as well. If the
+   server SMTP does not check for at least one valid recipient prior to
+   accepting the DATA command, the following dialogue would result:
+
+   S: <wait for open connection>
+   C: <open connection to server>
+   S: 220 innosoft.com SMTP service ready
+   C: EHLO dbc.mtview.ca.us
+   S: 250-innosoft.com
+   S: 250 PIPELINING
+   C: MAIL FROM:<mrose@dbc.mtview.ca.us>
+   C: RCPT TO:<nsb@thumper.bellcore.com>
+   C: RCPT TO:<galvin@tis.com>
+   C: DATA
+   S: 250 sender <mrose@dbc.mtview.ca.us> OK
+   S: 550 remote mail to <nsb@thumper.bellore.com> not allowed
+   S: 550 remote mail to <galvin@tis.com> not allowed
+   S: 354 enter mail, end with line containing only "."
+   C: .
+
+
+
+Freed & Cargille            Standards Track                     [Page 6]
+
+RFC 1854                    SMTP Pipelining                 October 1995
+
+
+   C: QUIT
+   S: 554 no valid recipients
+   S: 221 goodbye
+
+4.  Security Considerations
+
+   This RFC does not discuss security issues and is not believed to
+   raise any security issues not endemic in electronic mail and present
+   in fully conforming implementations of [1].
+
+5.  Acknowledgements
+
+   This document is based on the SMTP service extension model presented
+   in RFC 1425. Marshall Rose's description of SMTP command pipelining
+   in his book "The Internet Message" also served as a source of
+   inspiration for this extension.
+
+6.  References
+
+   [1]  Postel, J., "Simple Mail Transfer Protocol", STD 10
+        RFC 821, USC/Information Sciences Institute, August
+        1982.
+
+   [2]  Klensin, J., Freed, N., Rose, M., Stefferud, E.,
+        and D. Crocker, "SMTP Service Extensions", RFC 1651,
+        MCI, Innosoft, Dover Beach Consulting, Inc.,
+        Network Management Associates, Inc., Silicon Graphics,
+        Inc., July 1994.
+
+7.  Author's Address
+
+   Ned Freed
+   Innosoft International, Inc.
+   1050 East Garvey Avenue South
+   West Covina, CA 91790
+   USA
+
+   Phone: +1 818 919 3600
+   Fax: +1 818 919 3614
+   EMail: ned@innosoft.com
+
+
+
+
+
+
+
+
+
+
+
+Freed & Cargille            Standards Track                     [Page 7]
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2015.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2015.txt
new file mode 100644
index 000000000..d075983f3
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2015.txt
@@ -0,0 +1,450 @@
+
+
+
+
+
+Network Working Group                                          M. Elkins
+Request for Comments: 2015                     The Aerospace Corporation
+Category: Standards Track                                   October 1996
+
+
+              MIME Security with Pretty Good Privacy (PGP)
+
+Status of this Memo
+
+   This document specifies an Internet standards track protocol for the
+   Internet community, and requests discussion and suggestions for
+   improvements.  Please refer to the current edition of the "Internet
+   Official Protocol Standards" (STD 1) for the standardization state
+   and status of this protocol.  Distribution of this memo is unlimited.
+
+Abstract
+
+   This document describes how Pretty Good Privacy (PGP) can be used to
+   provide privacy and authentication using the Multipurpose Internet
+   Mail Extensions (MIME) security content types described in RFC1847.
+
+1.  Introduction
+
+   Previous work on integrating PGP with MIME (including the since
+   withdrawn application/pgp content type) has suffered from a number of
+   problems, the most significant of which is the inability to recover
+   signed message bodies without parsing data structures specific to
+   PGP.  This work makes use of the elegant solution proposed in
+   RFC1847, which defines security multipart formats for MIME. The
+   security multiparts clearly separate the signed message body from the
+   signature, and have a number of other desirable properties. This
+   document is styled after RFC 1848, which defines MIME Object Security
+   Services (MOSS) for providing security and authentication.
+
+   This document defines three new content types for implementing
+   security and privacy with PGP: application/pgp-encrypted,
+   application/pgp-signature and application/pgp-keys.
+
+1.1  Compliance
+
+   In order for an implementation to be compliant with this
+   specification, is it absolutely necessary for it to obey all items
+   labeled as MUST or REQUIRED.
+
+
+
+
+
+
+
+
+Elkins                      Standards Track                     [Page 1]
+
+RFC 2015                 MIME Security with PGP             October 1996
+
+
+2.  PGP data formats
+
+   PGP can generate either ASCII armor (described in [3]) or 8-bit
+   binary output when encrypting data, generating a digital signature,
+   or extracting public key data.  The ASCII armor output is the
+   REQUIRED method for data transfer.  This allows those users who do
+   not have the means to interpret the formats described in this
+   document to be able extract and use the PGP information in the
+   message.
+
+   When the amount of data to be transmitted requires that it be sent in
+   many parts, the MIME message/partial mechanism should be used rather
+   than the multipart ASCII armor PGP format.
+
+3.  Content-Transfer-Encoding restrictions
+
+   Multipart/signed and multipart/encrypted are to be treated by agents
+   as opaque, meaning that the data is not to be altered in any way [1].
+   However, many existing mail gateways will detect if the next hop does
+   not support MIME or 8-bit data and perform conversion to either
+   Quoted-Printable or Base64.  This presents serious problems for
+   multipart/signed, in particular, where the signature is invalidated
+   when such an operation occurs.  For this reason all data signed
+   according to this protocol MUST be constrained to 7 bits (8- bit data
+   should be encoded using either Quoted-Printable or Base64).  Note
+   that this also includes the case where a signed object is also
+   encrypted (see section 6).  This restriction will increase the
+   likelihood that the signature will be valid upon receipt.
+
+   Data that is ONLY to be encrypted is allowed to contain 8-bit
+   characters and therefore need not be converted to a 7-bit format.
+
+     Implementor's note: It cannot be stressed enough that applications
+     using this standard should follow MIME's suggestion that you "be
+     conservative in what you generate, and liberal in what you accept."
+     In this particular case it means it would be wise for an
+     implementation to accept messages with any content-transfer-
+     encoding, but restrict generation to the 7-bit format required by
+     this memo.  This will allow future compatibility in the event the
+     Internet SMTP framework becomes 8-bit friendly.
+
+4.  PGP encrypted data
+
+   Before encryption with PGP, the data should be written in MIME
+   canonical format (body and headers).
+
+   PGP encrypted data is denoted by the "multipart/encrypted" content
+   type, described in [1], and MUST have a "protocol" parameter value of
+
+
+
+Elkins                      Standards Track                     [Page 2]
+
+RFC 2015                 MIME Security with PGP             October 1996
+
+
+   "application/pgp-encrypted".  Note that the value of the parameter
+   MUST be enclosed in quotes.
+
+   The multipart/encrypted MUST consist of exactly two parts.  The first
+   MIME body part must have a content type of "application/pgp-
+   encrypted".  This body contains the control information.  A message
+   complying with this standard MUST contain a "Version: 1" field in
+   this body.  Since the PGP packet format contains all other
+   information necessary for decrypting, no other information is
+   required here.
+
+   The second MIME body part MUST contain the actual encrypted data.  It
+   must be labeled with a content type of "application/octet- stream".
+
+   Example message:
+
+     From: Michael Elkins <elkins@aero.org>
+     To: Michael Elkins <elkins@aero.org>
+     Mime-Version: 1.0
+     Content-Type: multipart/encrypted; boundary=foo;
+        protocol="application/pgp-encrypted"
+
+     --foo
+     Content-Type: application/pgp-encrypted
+
+     Version: 1
+
+     --foo
+     Content-Type: application/octet-stream
+
+     -----BEGIN PGP MESSAGE-----
+     Version: 2.6.2
+
+     hIwDY32hYGCE8MkBA/wOu7d45aUxF4Q0RKJprD3v5Z9K1YcRJ2fve87lMlDlx4Oj
+     eW4GDdBfLbJE7VUpp13N19GL8e/AqbyyjHH4aS0YoTk10QQ9nnRvjY8nZL3MPXSZ
+     g9VGQxFeGqzykzmykU6A26MSMexR4ApeeON6xzZWfo+0yOqAq6lb46wsvldZ96YA
+     AABH78hyX7YX4uT1tNCWEIIBoqqvCeIMpp7UQ2IzBrXg6GtukS8NxbukLeamqVW3
+     1yt21DYOjuLzcMNe/JNsD9vDVCvOOG3OCi8=
+     =zzaA
+     -----END PGP MESSAGE-----
+
+     --foo--
+
+5.  PGP signed data
+
+   PGP signed messages are denoted by the "multipart/signed" content
+   type, described in [1], with a "protocol" parameter which MUST have a
+   value of "application/pgp-signature" (MUST be quoted).  The "micalg"
+
+
+
+Elkins                      Standards Track                     [Page 3]
+
+RFC 2015                 MIME Security with PGP             October 1996
+
+
+   parameter MUST have a value of "pgp-<hash-symbol>", where <hash-
+   symbol> identifies the message integrity check (MIC) used to generate
+   the signature.  The currently defined values for <hash-symbol> are
+   "md5" for the MD5 checksum, and "sha1" for the SHA.1 algorithm.
+
+   The multipart/signed body MUST consist of exactly two parts.  The
+   first part contains the signed data in MIME canonical format,
+   including a set of appropriate content headers describing the data.
+
+   The second body MUST contain the PGP digital signature.  It MUST be
+   labeled with a content type of "application/pgp-signature".
+
+   When the PGP digital signature is generated:
+
+   (1)  The data to be signed must first be converted to its
+        type/subtype specific canonical form.  For text/plain, this
+        means conversion to an appropriate character set and conversion
+        of line endings to the canonical <CR><LF> sequence.
+
+   (2)  An appropriate Content-Transfer-Encoding is then applied. Each
+        line of the encoded data MUST end with the canonical <CR><LF>
+        sequence.
+
+   (3)  MIME content headers are then added to the body, each ending
+        with the canonical <CR><LF> sequence.
+
+   (4)  As described in [1], the digital signature MUST be calculated
+        over both the data to be signed and its set of content headers.
+
+   (5)  The signature MUST be generated detached from the signed data
+        so that the process does not alter the signed data in any way.
+
+   Example message:
+
+     From: Michael Elkins <elkins@aero.org>
+     To: Michael Elkins <elkins@aero.org>
+     Mime-Version: 1.0
+     Content-Type: multipart/signed; boundary=bar; micalg=pgp-md5;
+     protocol="application/pgp-signature"
+
+     --bar
+     & Content-Type: text/plain; charset=iso-8859-1
+     & Content-Transfer-Encoding: quoted-printable
+     &
+     & =A1Hola!
+     &
+     & Did you know that talking to yourself is a sign of senility?
+     &
+
+
+
+Elkins                      Standards Track                     [Page 4]
+
+RFC 2015                 MIME Security with PGP             October 1996
+
+
+     & It's generally a good idea to encode lines that begin with
+     & From=20because some mail transport agents will insert a greater-
+     & than (>) sign, thus invalidating the signature.
+     &
+     & Also, in some cases it might be desirable to encode any   =20
+     &railing whitespace that occurs on lines in order to ensure  =20
+     & that the message signature is not invalidated when passing =20
+     & a gateway that modifies such whitespace (like BITNET). =20
+     &
+     & me
+
+     --bar
+     Content-Type: application/pgp-signature
+
+    -----BEGIN PGP MESSAGE-----
+   Version: 2.6.2
+
+   iQCVAwUBMJrRF2N9oWBghPDJAQE9UQQAtl7LuRVndBjrk4EqYBIb3h5QXIX/LC//
+   jJV5bNvkZIGPIcEmI5iFd9boEgvpirHtIREEqLQRkYNoBActFBZmh9GC3C041WGq
+   uMbrbxc+nIs1TIKlA08rVi9ig/2Yh7LFrK5Ein57U/W72vgSxLhe/zhdfolT9Brn
+   HOxEa44b+EI=
+   =ndaj
+   -----END PGP MESSAGE-----
+
+   --bar--
+
+   The "&"s in the previous example indicate the portion of the data
+   over which the signature was calculated.
+
+   Though not required, it is generally a good idea to use Quoted-
+   Printable encoding in the first step (writing out the data to be
+   signed in MIME canonical format) if any of the lines in the data
+   begin with "From ", and encode the "F".  This will avoid an MTA
+   inserting a ">" in front of the line, thus invalidating the
+   signature!
+
+   Upon receipt of a signed message, an application MUST:
+
+   (1)  Convert line endings to the canonical <CR><LF> sequence before
+        the signature can be verified.  This is necessary since the
+        local MTA may have converted to a local end of line convention.
+
+   (2)  Pass both the signed data and its associated content headers
+        along with the PGP signature to the signature verification
+        service.
+
+
+
+
+
+
+Elkins                      Standards Track                     [Page 5]
+
+RFC 2015                 MIME Security with PGP             October 1996
+
+
+6.  Encrypted and Signed Data
+
+   Sometimes it is desirable to both digitally sign and then encrypt a
+   message to be sent.  This protocol allows for two methods of
+   accomplishing this task.
+
+6.1  RFC1847 Encapsulation
+
+   [1], it is stated that the data should first be signed as a
+   multipart/signature body, and then encrypted to form the final
+   multipart/encrypted body, i.e.,
+
+    Content-Type: multipart/encrypted;
+       protocol="application/pgp-encrypted"; boundary=foo
+
+    --foo
+    Content-Type: application/pgp-encrypted
+
+    Version: 1
+
+    --foo
+    Content-Type: application/octet-stream
+
+    -----BEGIN PGP MESSAGE-----
+    & Content-Type: multipart/signed; micalg=pgp-md5
+    &     protocol="application/pgp-signature"; boundary=bar
+    &
+    & --bar
+    & Content-Type: text/plain; charset=us-ascii
+    &
+    & This message was first signed, and then encrypted.
+    &
+    & --bar
+    & Content-Type: application/pgp-signature
+    &
+    & -----BEGIN PGP MESSAGE-----
+    & Version: 2.6.2
+    &
+    & iQCVAwUBMJrRF2N9oWBghPDJAQE9UQQAtl7LuRVndBjrk4EqYBIb3h5QXIX/LC//
+    & jJV5bNvkZIGPIcEmI5iFd9boEgvpirHtIREEqLQRkYNoBActFBZmh9GC3C041WGq
+    & uMbrbxc+nIs1TIKlA08rVi9ig/2Yh7LFrK5Ein57U/W72vgSxLhe/zhdfolT9Brn
+    & HOxEa44b+EI=
+    & =ndaj
+    & -----END PGP MESSAGE-----
+    &
+    & --bar--
+    -----END PGP MESSAGE-----
+
+
+
+
+Elkins                      Standards Track                     [Page 6]
+
+RFC 2015                 MIME Security with PGP             October 1996
+
+
+    --foo--
+
+    (The text preceded by '&' indicates that it is really
+    encrypted, but presented as text for clarity.)
+
+6.2  Combined method
+
+   Versions 2.x of PGP also allow data to be signed and encrypted in one
+   operation.  This method is an acceptable shortcut, and has the
+   benefit of less overhead.  The resulting data should be formed as a
+   "multipart/encrypted" object as described above.
+
+   Messages which are encrypted and signed in this combined fashion are
+   REQUIRED to follow the same canonicalization rules as for
+   multipart/signed objects.
+
+   It is explicitly allowed for an agent to decrypt a combined message
+   and rewrite it as a multipart/signed object using the signature data
+   embedded in the encrypted version.
+
+7.  Distribution of PGP public keys
+
+   Content-Type: application/pgp-keys
+   Required parameters: none
+   Optional parameters: none
+
+   This is the content type which should be used for relaying public key
+   blocks.
+
+8.  Notes
+
+   PGP and Pretty Good Privacy are trademarks of Philip Zimmermann.
+
+9.  Security Considerations
+
+   Use of this protocol has the same security considerations as PGP, and
+   is not known to either increase or decrease the security of messages
+   using it; see [3] for more information.
+
+10.  Author's Address
+
+        Michael Elkins
+        P.O. Box 92957 - M1/102
+        Los Angeles, CA 90009-2957
+
+        Phone: +1 310 336 8040
+        Fax: +1 310 336 4402
+
+
+
+
+Elkins                      Standards Track                     [Page 7]
+
+RFC 2015                 MIME Security with PGP             October 1996
+
+
+References
+
+   [1]  Galvin, J., Murphy, G., Crocker, S., and N. Freed, "Security
+        Multiparts for MIME: Multipart/Signed and Multipart/Encrypted",
+        RFC 1847, October 1995.
+
+   [2]  Galvin, J., Murphy, G., Crocker, S., and N. Freed, "MIME Object
+        Security Services", RFC 1848, October 1995.
+
+   [3]  Atkins, D., Stallings, W., and P. Zimmermann, "PGP Message
+        Exchange Formats", RFC 1991, August 1996.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Elkins                      Standards Track                     [Page 8]
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2045.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2045.txt
new file mode 100644
index 000000000..9f286b1a9
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2045.txt
@@ -0,0 +1,1739 @@
+
+
+
+
+
+
+Network Working Group                                          N. Freed
+Request for Comments: 2045                                     Innosoft
+Obsoletes: 1521, 1522, 1590                               N. Borenstein
+Category: Standards Track                                 First Virtual
+                                                          November 1996
+
+
+                 Multipurpose Internet Mail Extensions
+                            (MIME) Part One:
+                   Format of Internet Message Bodies
+
+Status of this Memo
+
+   This document specifies an Internet standards track protocol for the
+   Internet community, and requests discussion and suggestions for
+   improvements.  Please refer to the current edition of the "Internet
+   Official Protocol Standards" (STD 1) for the standardization state
+   and status of this protocol.  Distribution of this memo is unlimited.
+
+Abstract
+
+   STD 11, RFC 822, defines a message representation protocol specifying
+   considerable detail about US-ASCII message headers, and leaves the
+   message content, or message body, as flat US-ASCII text.  This set of
+   documents, collectively called the Multipurpose Internet Mail
+   Extensions, or MIME, redefines the format of messages to allow for
+
+    (1)   textual message bodies in character sets other than
+          US-ASCII,
+
+    (2)   an extensible set of different formats for non-textual
+          message bodies,
+
+    (3)   multi-part message bodies, and
+
+    (4)   textual header information in character sets other than
+          US-ASCII.
+
+   These documents are based on earlier work documented in RFC 934, STD
+   11, and RFC 1049, but extends and revises them.  Because RFC 822 said
+   so little about message bodies, these documents are largely
+   orthogonal to (rather than a revision of) RFC 822.
+
+   This initial document specifies the various headers used to describe
+   the structure of MIME messages. The second document, RFC 2046,
+   defines the general structure of the MIME media typing system and
+   defines an initial set of media types. The third document, RFC 2047,
+   describes extensions to RFC 822 to allow non-US-ASCII text data in
+
+
+
+Freed & Borenstein          Standards Track                     [Page 1]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+   Internet mail header fields. The fourth document, RFC 2048, specifies
+   various IANA registration procedures for MIME-related facilities. The
+   fifth and final document, RFC 2049, describes MIME conformance
+   criteria as well as providing some illustrative examples of MIME
+   message formats, acknowledgements, and the bibliography.
+
+   These documents are revisions of RFCs 1521, 1522, and 1590, which
+   themselves were revisions of RFCs 1341 and 1342.  An appendix in RFC
+   2049 describes differences and changes from previous versions.
+
+Table of Contents
+
+   1. Introduction .........................................    3
+   2. Definitions, Conventions, and Generic BNF Grammar ....    5
+   2.1 CRLF ................................................    5
+   2.2 Character Set .......................................    6
+   2.3 Message .............................................    6
+   2.4 Entity ..............................................    6
+   2.5 Body Part ...........................................    7
+   2.6 Body ................................................    7
+   2.7 7bit Data ...........................................    7
+   2.8 8bit Data ...........................................    7
+   2.9 Binary Data .........................................    7
+   2.10 Lines ..............................................    7
+   3. MIME Header Fields ...................................    8
+   4. MIME-Version Header Field ............................    8
+   5. Content-Type Header Field ............................   10
+   5.1 Syntax of the Content-Type Header Field .............   12
+   5.2 Content-Type Defaults ...............................   14
+   6. Content-Transfer-Encoding Header Field ...............   14
+   6.1 Content-Transfer-Encoding Syntax ....................   14
+   6.2 Content-Transfer-Encodings Semantics ................   15
+   6.3 New Content-Transfer-Encodings ......................   16
+   6.4 Interpretation and Use ..............................   16
+   6.5 Translating Encodings ...............................   18
+   6.6 Canonical Encoding Model ............................   19
+   6.7 Quoted-Printable Content-Transfer-Encoding ..........   19
+   6.8 Base64 Content-Transfer-Encoding ....................   24
+   7. Content-ID Header Field ..............................   26
+   8. Content-Description Header Field .....................   27
+   9. Additional MIME Header Fields ........................   27
+   10. Summary .............................................   27
+   11. Security Considerations .............................   27
+   12. Authors' Addresses ..................................   28
+   A. Collected Grammar ....................................   29
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                     [Page 2]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+1.  Introduction
+
+   Since its publication in 1982, RFC 822 has defined the standard
+   format of textual mail messages on the Internet.  Its success has
+   been such that the RFC 822 format has been adopted, wholly or
+   partially, well beyond the confines of the Internet and the Internet
+   SMTP transport defined by RFC 821.  As the format has seen wider use,
+   a number of limitations have proven increasingly restrictive for the
+   user community.
+
+   RFC 822 was intended to specify a format for text messages.  As such,
+   non-text messages, such as multimedia messages that might include
+   audio or images, are simply not mentioned.  Even in the case of text,
+   however, RFC 822 is inadequate for the needs of mail users whose
+   languages require the use of character sets richer than US-ASCII.
+   Since RFC 822 does not specify mechanisms for mail containing audio,
+   video, Asian language text, or even text in most European languages,
+   additional specifications are needed.
+
+   One of the notable limitations of RFC 821/822 based mail systems is
+   the fact that they limit the contents of electronic mail messages to
+   relatively short lines (e.g. 1000 characters or less [RFC-821]) of
+   7bit US-ASCII.  This forces users to convert any non-textual data
+   that they may wish to send into seven-bit bytes representable as
+   printable US-ASCII characters before invoking a local mail UA (User
+   Agent, a program with which human users send and receive mail).
+   Examples of such encodings currently used in the Internet include
+   pure hexadecimal, uuencode, the 3-in-4 base 64 scheme specified in
+   RFC 1421, the Andrew Toolkit Representation [ATK], and many others.
+
+   The limitations of RFC 822 mail become even more apparent as gateways
+   are designed to allow for the exchange of mail messages between RFC
+   822 hosts and X.400 hosts.  X.400 [X400] specifies mechanisms for the
+   inclusion of non-textual material within electronic mail messages.
+   The current standards for the mapping of X.400 messages to RFC 822
+   messages specify either that X.400 non-textual material must be
+   converted to (not encoded in) IA5Text format, or that they must be
+   discarded, notifying the RFC 822 user that discarding has occurred.
+   This is clearly undesirable, as information that a user may wish to
+   receive is lost.  Even though a user agent may not have the
+   capability of dealing with the non-textual material, the user might
+   have some mechanism external to the UA that can extract useful
+   information from the material.  Moreover, it does not allow for the
+   fact that the message may eventually be gatewayed back into an X.400
+   message handling system (i.e., the X.400 message is "tunneled"
+   through Internet mail), where the non-textual information would
+   definitely become useful again.
+
+
+
+
+Freed & Borenstein          Standards Track                     [Page 3]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+   This document describes several mechanisms that combine to solve most
+   of these problems without introducing any serious incompatibilities
+   with the existing world of RFC 822 mail.  In particular, it
+   describes:
+
+    (1)   A MIME-Version header field, which uses a version
+          number to declare a message to be conformant with MIME
+          and allows mail processing agents to distinguish
+          between such messages and those generated by older or
+          non-conformant software, which are presumed to lack
+          such a field.
+
+    (2)   A Content-Type header field, generalized from RFC 1049,
+          which can be used to specify the media type and subtype
+          of data in the body of a message and to fully specify
+          the native representation (canonical form) of such
+          data.
+
+    (3)   A Content-Transfer-Encoding header field, which can be
+          used to specify both the encoding transformation that
+          was applied to the body and the domain of the result.
+          Encoding transformations other than the identity
+          transformation are usually applied to data in order to
+          allow it to pass through mail transport mechanisms
+          which may have data or character set limitations.
+
+    (4)   Two additional header fields that can be used to
+          further describe the data in a body, the Content-ID and
+          Content-Description header fields.
+
+   All of the header fields defined in this document are subject to the
+   general syntactic rules for header fields specified in RFC 822.  In
+   particular, all of these header fields except for Content-Disposition
+   can include RFC 822 comments, which have no semantic content and
+   should be ignored during MIME processing.
+
+   Finally, to specify and promote interoperability, RFC 2049 provides a
+   basic applicability statement for a subset of the above mechanisms
+   that defines a minimal level of "conformance" with this document.
+
+   HISTORICAL NOTE:  Several of the mechanisms described in this set of
+   documents may seem somewhat strange or even baroque at first reading.
+   It is important to note that compatibility with existing standards
+   AND robustness across existing practice were two of the highest
+   priorities of the working group that developed this set of documents.
+   In particular, compatibility was always favored over elegance.
+
+
+
+
+
+Freed & Borenstein          Standards Track                     [Page 4]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+   Please refer to the current edition of the "Internet Official
+   Protocol Standards" for the standardization state and status of this
+   protocol.  RFC 822 and STD 3, RFC 1123 also provide essential
+   background for MIME since no conforming implementation of MIME can
+   violate them.  In addition, several other informational RFC documents
+   will be of interest to the MIME implementor, in particular RFC 1344,
+   RFC 1345, and RFC 1524.
+
+2.  Definitions, Conventions, and Generic BNF Grammar
+
+   Although the mechanisms specified in this set of documents are all
+   described in prose, most are also described formally in the augmented
+   BNF notation of RFC 822. Implementors will need to be familiar with
+   this notation in order to understand this set of documents, and are
+   referred to RFC 822 for a complete explanation of the augmented BNF
+   notation.
+
+   Some of the augmented BNF in this set of documents makes named
+   references to syntax rules defined in RFC 822.  A complete formal
+   grammar, then, is obtained by combining the collected grammar
+   appendices in each document in this set with the BNF of RFC 822 plus
+   the modifications to RFC 822 defined in RFC 1123 (which specifically
+   changes the syntax for `return', `date' and `mailbox').
+
+   All numeric and octet values are given in decimal notation in this
+   set of documents. All media type values, subtype values, and
+   parameter names as defined are case-insensitive.  However, parameter
+   values are case-sensitive unless otherwise specified for the specific
+   parameter.
+
+   FORMATTING NOTE:  Notes, such at this one, provide additional
+   nonessential information which may be skipped by the reader without
+   missing anything essential.  The primary purpose of these non-
+   essential notes is to convey information about the rationale of this
+   set of documents, or to place these documents in the proper
+   historical or evolutionary context.  Such information may in
+   particular be skipped by those who are focused entirely on building a
+   conformant implementation, but may be of use to those who wish to
+   understand why certain design choices were made.
+
+2.1.  CRLF
+
+   The term CRLF, in this set of documents, refers to the sequence of
+   octets corresponding to the two US-ASCII characters CR (decimal value
+   13) and LF (decimal value 10) which, taken together, in this order,
+   denote a line break in RFC 822 mail.
+
+
+
+
+
+Freed & Borenstein          Standards Track                     [Page 5]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+2.2.  Character Set
+
+   The term "character set" is used in MIME to refer to a method of
+   converting a sequence of octets into a sequence of characters.  Note
+   that unconditional and unambiguous conversion in the other direction
+   is not required, in that not all characters may be representable by a
+   given character set and a character set may provide more than one
+   sequence of octets to represent a particular sequence of characters.
+
+   This definition is intended to allow various kinds of character
+   encodings, from simple single-table mappings such as US-ASCII to
+   complex table switching methods such as those that use ISO 2022's
+   techniques, to be used as character sets.  However, the definition
+   associated with a MIME character set name must fully specify the
+   mapping to be performed.  In particular, use of external profiling
+   information to determine the exact mapping is not permitted.
+
+   NOTE: The term "character set" was originally to describe such
+   straightforward schemes as US-ASCII and ISO-8859-1 which have a
+   simple one-to-one mapping from single octets to single characters.
+   Multi-octet coded character sets and switching techniques make the
+   situation more complex. For example, some communities use the term
+   "character encoding" for what MIME calls a "character set", while
+   using the phrase "coded character set" to denote an abstract mapping
+   from integers (not octets) to characters.
+
+2.3.  Message
+
+   The term "message", when not further qualified, means either a
+   (complete or "top-level") RFC 822 message being transferred on a
+   network, or a message encapsulated in a body of type "message/rfc822"
+   or "message/partial".
+
+2.4.  Entity
+
+   The term "entity", refers specifically to the MIME-defined header
+   fields and contents of either a message or one of the parts in the
+   body of a multipart entity.  The specification of such entities is
+   the essence of MIME.  Since the contents of an entity are often
+   called the "body", it makes sense to speak about the body of an
+   entity.  Any sort of field may be present in the header of an entity,
+   but only those fields whose names begin with "content-" actually have
+   any MIME-related meaning.  Note that this does NOT imply thay they
+   have no meaning at all -- an entity that is also a message has non-
+   MIME header fields whose meanings are defined by RFC 822.
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                     [Page 6]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+2.5.  Body Part
+
+   The term "body part" refers to an entity inside of a multipart
+   entity.
+
+2.6.  Body
+
+   The term "body", when not further qualified, means the body of an
+   entity, that is, the body of either a message or of a body part.
+
+   NOTE:  The previous four definitions are clearly circular.  This is
+   unavoidable, since the overall structure of a MIME message is indeed
+   recursive.
+
+2.7.  7bit Data
+
+   "7bit data" refers to data that is all represented as relatively
+   short lines with 998 octets or less between CRLF line separation
+   sequences [RFC-821].  No octets with decimal values greater than 127
+   are allowed and neither are NULs (octets with decimal value 0).  CR
+   (decimal value 13) and LF (decimal value 10) octets only occur as
+   part of CRLF line separation sequences.
+
+2.8.  8bit Data
+
+   "8bit data" refers to data that is all represented as relatively
+   short lines with 998 octets or less between CRLF line separation
+   sequences [RFC-821]), but octets with decimal values greater than 127
+   may be used.  As with "7bit data" CR and LF octets only occur as part
+   of CRLF line separation sequences and no NULs are allowed.
+
+2.9.  Binary Data
+
+   "Binary data" refers to data where any sequence of octets whatsoever
+   is allowed.
+
+2.10.  Lines
+
+   "Lines" are defined as sequences of octets separated by a CRLF
+   sequences.  This is consistent with both RFC 821 and RFC 822.
+   "Lines" only refers to a unit of data in a message, which may or may
+   not correspond to something that is actually displayed by a user
+   agent.
+
+
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                     [Page 7]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+3.  MIME Header Fields
+
+   MIME defines a number of new RFC 822 header fields that are used to
+   describe the content of a MIME entity.  These header fields occur in
+   at least two contexts:
+
+    (1)   As part of a regular RFC 822 message header.
+
+    (2)   In a MIME body part header within a multipart
+          construct.
+
+   The formal definition of these header fields is as follows:
+
+     entity-headers := [ content CRLF ]
+                       [ encoding CRLF ]
+                       [ id CRLF ]
+                       [ description CRLF ]
+                       *( MIME-extension-field CRLF )
+
+     MIME-message-headers := entity-headers
+                             fields
+                             version CRLF
+                             ; The ordering of the header
+                             ; fields implied by this BNF
+                             ; definition should be ignored.
+
+     MIME-part-headers := entity-headers
+                          [ fields ]
+                          ; Any field not beginning with
+                          ; "content-" can have no defined
+                          ; meaning and may be ignored.
+                          ; The ordering of the header
+                          ; fields implied by this BNF
+                          ; definition should be ignored.
+
+   The syntax of the various specific MIME header fields will be
+   described in the following sections.
+
+4.  MIME-Version Header Field
+
+   Since RFC 822 was published in 1982, there has really been only one
+   format standard for Internet messages, and there has been little
+   perceived need to declare the format standard in use.  This document
+   is an independent specification that complements RFC 822.  Although
+   the extensions in this document have been defined in such a way as to
+   be compatible with RFC 822, there are still circumstances in which it
+   might be desirable for a mail-processing agent to know whether a
+   message was composed with the new standard in mind.
+
+
+
+Freed & Borenstein          Standards Track                     [Page 8]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+   Therefore, this document defines a new header field, "MIME-Version",
+   which is to be used to declare the version of the Internet message
+   body format standard in use.
+
+   Messages composed in accordance with this document MUST include such
+   a header field, with the following verbatim text:
+
+     MIME-Version: 1.0
+
+   The presence of this header field is an assertion that the message
+   has been composed in compliance with this document.
+
+   Since it is possible that a future document might extend the message
+   format standard again, a formal BNF is given for the content of the
+   MIME-Version field:
+
+     version := "MIME-Version" ":" 1*DIGIT "." 1*DIGIT
+
+   Thus, future format specifiers, which might replace or extend "1.0",
+   are constrained to be two integer fields, separated by a period.  If
+   a message is received with a MIME-version value other than "1.0", it
+   cannot be assumed to conform with this document.
+
+   Note that the MIME-Version header field is required at the top level
+   of a message.  It is not required for each body part of a multipart
+   entity.  It is required for the embedded headers of a body of type
+   "message/rfc822" or "message/partial" if and only if the embedded
+   message is itself claimed to be MIME-conformant.
+
+   It is not possible to fully specify how a mail reader that conforms
+   with MIME as defined in this document should treat a message that
+   might arrive in the future with some value of MIME-Version other than
+   "1.0".
+
+   It is also worth noting that version control for specific media types
+   is not accomplished using the MIME-Version mechanism.  In particular,
+   some formats (such as application/postscript) have version numbering
+   conventions that are internal to the media format.  Where such
+   conventions exist, MIME does nothing to supersede them.  Where no
+   such conventions exist, a MIME media type might use a "version"
+   parameter in the content-type field if necessary.
+
+
+
+
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                     [Page 9]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+   NOTE TO IMPLEMENTORS:  When checking MIME-Version values any RFC 822
+   comment strings that are present must be ignored.  In particular, the
+   following four MIME-Version fields are equivalent:
+
+     MIME-Version: 1.0
+
+     MIME-Version: 1.0 (produced by MetaSend Vx.x)
+
+     MIME-Version: (produced by MetaSend Vx.x) 1.0
+
+     MIME-Version: 1.(produced by MetaSend Vx.x)0
+
+   In the absence of a MIME-Version field, a receiving mail user agent
+   (whether conforming to MIME requirements or not) may optionally
+   choose to interpret the body of the message according to local
+   conventions.  Many such conventions are currently in use and it
+   should be noted that in practice non-MIME messages can contain just
+   about anything.
+
+   It is impossible to be certain that a non-MIME mail message is
+   actually plain text in the US-ASCII character set since it might well
+   be a message that, using some set of nonstandard local conventions
+   that predate MIME, includes text in another character set or non-
+   textual data presented in a manner that cannot be automatically
+   recognized (e.g., a uuencoded compressed UNIX tar file).
+
+5.  Content-Type Header Field
+
+   The purpose of the Content-Type field is to describe the data
+   contained in the body fully enough that the receiving user agent can
+   pick an appropriate agent or mechanism to present the data to the
+   user, or otherwise deal with the data in an appropriate manner. The
+   value in this field is called a media type.
+
+   HISTORICAL NOTE:  The Content-Type header field was first defined in
+   RFC 1049.  RFC 1049 used a simpler and less powerful syntax, but one
+   that is largely compatible with the mechanism given here.
+
+   The Content-Type header field specifies the nature of the data in the
+   body of an entity by giving media type and subtype identifiers, and
+   by providing auxiliary information that may be required for certain
+   media types.  After the media type and subtype names, the remainder
+   of the header field is simply a set of parameters, specified in an
+   attribute=value notation.  The ordering of parameters is not
+   significant.
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 10]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+   In general, the top-level media type is used to declare the general
+   type of data, while the subtype specifies a specific format for that
+   type of data.  Thus, a media type of "image/xyz" is enough to tell a
+   user agent that the data is an image, even if the user agent has no
+   knowledge of the specific image format "xyz".  Such information can
+   be used, for example, to decide whether or not to show a user the raw
+   data from an unrecognized subtype -- such an action might be
+   reasonable for unrecognized subtypes of text, but not for
+   unrecognized subtypes of image or audio.  For this reason, registered
+   subtypes of text, image, audio, and video should not contain embedded
+   information that is really of a different type.  Such compound
+   formats should be represented using the "multipart" or "application"
+   types.
+
+   Parameters are modifiers of the media subtype, and as such do not
+   fundamentally affect the nature of the content.  The set of
+   meaningful parameters depends on the media type and subtype.  Most
+   parameters are associated with a single specific subtype.  However, a
+   given top-level media type may define parameters which are applicable
+   to any subtype of that type.  Parameters may be required by their
+   defining content type or subtype or they may be optional. MIME
+   implementations must ignore any parameters whose names they do not
+   recognize.
+
+   For example, the "charset" parameter is applicable to any subtype of
+   "text", while the "boundary" parameter is required for any subtype of
+   the "multipart" media type.
+
+   There are NO globally-meaningful parameters that apply to all media
+   types.  Truly global mechanisms are best addressed, in the MIME
+   model, by the definition of additional Content-* header fields.
+
+   An initial set of seven top-level media types is defined in RFC 2046.
+   Five of these are discrete types whose content is essentially opaque
+   as far as MIME processing is concerned.  The remaining two are
+   composite types whose contents require additional handling by MIME
+   processors.
+
+   This set of top-level media types is intended to be substantially
+   complete.  It is expected that additions to the larger set of
+   supported types can generally be accomplished by the creation of new
+   subtypes of these initial types.  In the future, more top-level types
+   may be defined only by a standards-track extension to this standard.
+   If another top-level type is to be used for any reason, it must be
+   given a name starting with "X-" to indicate its non-standard status
+   and to avoid a potential conflict with a future official name.
+
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 11]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+5.1.  Syntax of the Content-Type Header Field
+
+   In the Augmented BNF notation of RFC 822, a Content-Type header field
+   value is defined as follows:
+
+     content := "Content-Type" ":" type "/" subtype
+                *(";" parameter)
+                ; Matching of media type and subtype
+                ; is ALWAYS case-insensitive.
+
+     type := discrete-type / composite-type
+
+     discrete-type := "text" / "image" / "audio" / "video" /
+                      "application" / extension-token
+
+     composite-type := "message" / "multipart" / extension-token
+
+     extension-token := ietf-token / x-token
+
+     ietf-token := <An extension token defined by a
+                    standards-track RFC and registered
+                    with IANA.>
+
+     x-token := <The two characters "X-" or "x-" followed, with
+                 no intervening white space, by any token>
+
+     subtype := extension-token / iana-token
+
+     iana-token := <A publicly-defined extension token. Tokens
+                    of this form must be registered with IANA
+                    as specified in RFC 2048.>
+
+     parameter := attribute "=" value
+
+     attribute := token
+                  ; Matching of attributes
+                  ; is ALWAYS case-insensitive.
+
+     value := token / quoted-string
+
+     token := 1*<any (US-ASCII) CHAR except SPACE, CTLs,
+                 or tspecials>
+
+     tspecials :=  "(" / ")" / "<" / ">" / "@" /
+                   "," / ";" / ":" / "\" / <">
+                   "/" / "[" / "]" / "?" / "="
+                   ; Must be in quoted-string,
+                   ; to use within parameter values
+
+
+
+Freed & Borenstein          Standards Track                    [Page 12]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+   Note that the definition of "tspecials" is the same as the RFC 822
+   definition of "specials" with the addition of the three characters
+   "/", "?", and "=", and the removal of ".".
+
+   Note also that a subtype specification is MANDATORY -- it may not be
+   omitted from a Content-Type header field.  As such, there are no
+   default subtypes.
+
+   The type, subtype, and parameter names are not case sensitive.  For
+   example, TEXT, Text, and TeXt are all equivalent top-level media
+   types.  Parameter values are normally case sensitive, but sometimes
+   are interpreted in a case-insensitive fashion, depending on the
+   intended use.  (For example, multipart boundaries are case-sensitive,
+   but the "access-type" parameter for message/External-body is not
+   case-sensitive.)
+
+   Note that the value of a quoted string parameter does not include the
+   quotes.  That is, the quotation marks in a quoted-string are not a
+   part of the value of the parameter, but are merely used to delimit
+   that parameter value.  In addition, comments are allowed in
+   accordance with RFC 822 rules for structured header fields.  Thus the
+   following two forms
+
+     Content-type: text/plain; charset=us-ascii (Plain text)
+
+     Content-type: text/plain; charset="us-ascii"
+
+   are completely equivalent.
+
+   Beyond this syntax, the only syntactic constraint on the definition
+   of subtype names is the desire that their uses must not conflict.
+   That is, it would be undesirable to have two different communities
+   using "Content-Type: application/foobar" to mean two different
+   things.  The process of defining new media subtypes, then, is not
+   intended to be a mechanism for imposing restrictions, but simply a
+   mechanism for publicizing their definition and usage.  There are,
+   therefore, two acceptable mechanisms for defining new media subtypes:
+
+    (1)   Private values (starting with "X-") may be defined
+          bilaterally between two cooperating agents without
+          outside registration or standardization. Such values
+          cannot be registered or standardized.
+
+    (2)   New standard values should be registered with IANA as
+          described in RFC 2048.
+
+   The second document in this set, RFC 2046, defines the initial set of
+   media types for MIME.
+
+
+
+Freed & Borenstein          Standards Track                    [Page 13]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+5.2.  Content-Type Defaults
+
+   Default RFC 822 messages without a MIME Content-Type header are taken
+   by this protocol to be plain text in the US-ASCII character set,
+   which can be explicitly specified as:
+
+     Content-type: text/plain; charset=us-ascii
+
+   This default is assumed if no Content-Type header field is specified.
+   It is also recommend that this default be assumed when a
+   syntactically invalid Content-Type header field is encountered. In
+   the presence of a MIME-Version header field and the absence of any
+   Content-Type header field, a receiving User Agent can also assume
+   that plain US-ASCII text was the sender's intent.  Plain US-ASCII
+   text may still be assumed in the absence of a MIME-Version or the
+   presence of an syntactically invalid Content-Type header field, but
+   the sender's intent might have been otherwise.
+
+6.  Content-Transfer-Encoding Header Field
+
+   Many media types which could be usefully transported via email are
+   represented, in their "natural" format, as 8bit character or binary
+   data.  Such data cannot be transmitted over some transfer protocols.
+   For example, RFC 821 (SMTP) restricts mail messages to 7bit US-ASCII
+   data with lines no longer than 1000 characters including any trailing
+   CRLF line separator.
+
+   It is necessary, therefore, to define a standard mechanism for
+   encoding such data into a 7bit short line format.  Proper labelling
+   of unencoded material in less restrictive formats for direct use over
+   less restrictive transports is also desireable.  This document
+   specifies that such encodings will be indicated by a new "Content-
+   Transfer-Encoding" header field.  This field has not been defined by
+   any previous standard.
+
+6.1.  Content-Transfer-Encoding Syntax
+
+   The Content-Transfer-Encoding field's value is a single token
+   specifying the type of encoding, as enumerated below.  Formally:
+
+     encoding := "Content-Transfer-Encoding" ":" mechanism
+
+     mechanism := "7bit" / "8bit" / "binary" /
+                  "quoted-printable" / "base64" /
+                  ietf-token / x-token
+
+   These values are not case sensitive -- Base64 and BASE64 and bAsE64
+   are all equivalent.  An encoding type of 7BIT requires that the body
+
+
+
+Freed & Borenstein          Standards Track                    [Page 14]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+   is already in a 7bit mail-ready representation.  This is the default
+   value -- that is, "Content-Transfer-Encoding: 7BIT" is assumed if the
+   Content-Transfer-Encoding header field is not present.
+
+6.2.  Content-Transfer-Encodings Semantics
+
+   This single Content-Transfer-Encoding token actually provides two
+   pieces of information.  It specifies what sort of encoding
+   transformation the body was subjected to and hence what decoding
+   operation must be used to restore it to its original form, and it
+   specifies what the domain of the result is.
+
+   The transformation part of any Content-Transfer-Encodings specifies,
+   either explicitly or implicitly, a single, well-defined decoding
+   algorithm, which for any sequence of encoded octets either transforms
+   it to the original sequence of octets which was encoded, or shows
+   that it is illegal as an encoded sequence.  Content-Transfer-
+   Encodings transformations never depend on any additional external
+   profile information for proper operation. Note that while decoders
+   must produce a single, well-defined output for a valid encoding no
+   such restrictions exist for encoders: Encoding a given sequence of
+   octets to different, equivalent encoded sequences is perfectly legal.
+
+   Three transformations are currently defined: identity, the "quoted-
+   printable" encoding, and the "base64" encoding.  The domains are
+   "binary", "8bit" and "7bit".
+
+   The Content-Transfer-Encoding values "7bit", "8bit", and "binary" all
+   mean that the identity (i.e. NO) encoding transformation has been
+   performed.  As such, they serve simply as indicators of the domain of
+   the body data, and provide useful information about the sort of
+   encoding that might be needed for transmission in a given transport
+   system.  The terms "7bit data", "8bit data", and "binary data" are
+   all defined in Section 2.
+
+   The quoted-printable and base64 encodings transform their input from
+   an arbitrary domain into material in the "7bit" range, thus making it
+   safe to carry over restricted transports.  The specific definition of
+   the transformations are given below.
+
+   The proper Content-Transfer-Encoding label must always be used.
+   Labelling unencoded data containing 8bit characters as "7bit" is not
+   allowed, nor is labelling unencoded non-line-oriented data as
+   anything other than "binary" allowed.
+
+   Unlike media subtypes, a proliferation of Content-Transfer-Encoding
+   values is both undesirable and unnecessary.  However, establishing
+   only a single transformation into the "7bit" domain does not seem
+
+
+
+Freed & Borenstein          Standards Track                    [Page 15]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+   possible.  There is a tradeoff between the desire for a compact and
+   efficient encoding of largely- binary data and the desire for a
+   somewhat readable encoding of data that is mostly, but not entirely,
+   7bit.  For this reason, at least two encoding mechanisms are
+   necessary: a more or less readable encoding (quoted-printable) and a
+   "dense" or "uniform" encoding (base64).
+
+   Mail transport for unencoded 8bit data is defined in RFC 1652.  As of
+   the initial publication of this document, there are no standardized
+   Internet mail transports for which it is legitimate to include
+   unencoded binary data in mail bodies.  Thus there are no
+   circumstances in which the "binary" Content-Transfer-Encoding is
+   actually valid in Internet mail.  However, in the event that binary
+   mail transport becomes a reality in Internet mail, or when MIME is
+   used in conjunction with any other binary-capable mail transport
+   mechanism, binary bodies must be labelled as such using this
+   mechanism.
+
+   NOTE: The five values defined for the Content-Transfer-Encoding field
+   imply nothing about the media type other than the algorithm by which
+   it was encoded or the transport system requirements if unencoded.
+
+6.3.  New Content-Transfer-Encodings
+
+   Implementors may, if necessary, define private Content-Transfer-
+   Encoding values, but must use an x-token, which is a name prefixed by
+   "X-", to indicate its non-standard status, e.g., "Content-Transfer-
+   Encoding: x-my-new-encoding".  Additional standardized Content-
+   Transfer-Encoding values must be specified by a standards-track RFC.
+   The requirements such specifications must meet are given in RFC 2048.
+   As such, all content-transfer-encoding namespace except that
+   beginning with "X-" is explicitly reserved to the IETF for future
+   use.
+
+   Unlike media types and subtypes, the creation of new Content-
+   Transfer-Encoding values is STRONGLY discouraged, as it seems likely
+   to hinder interoperability with little potential benefit
+
+6.4.  Interpretation and Use
+
+   If a Content-Transfer-Encoding header field appears as part of a
+   message header, it applies to the entire body of that message.  If a
+   Content-Transfer-Encoding header field appears as part of an entity's
+   headers, it applies only to the body of that entity.  If an entity is
+   of type "multipart" the Content-Transfer-Encoding is not permitted to
+   have any value other than "7bit", "8bit" or "binary".  Even more
+   severe restrictions apply to some subtypes of the "message" type.
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 16]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+   It should be noted that most media types are defined in terms of
+   octets rather than bits, so that the mechanisms described here are
+   mechanisms for encoding arbitrary octet streams, not bit streams.  If
+   a bit stream is to be encoded via one of these mechanisms, it must
+   first be converted to an 8bit byte stream using the network standard
+   bit order ("big-endian"), in which the earlier bits in a stream
+   become the higher-order bits in a 8bit byte.  A bit stream not ending
+   at an 8bit boundary must be padded with zeroes. RFC 2046 provides a
+   mechanism for noting the addition of such padding in the case of the
+   application/octet-stream media type, which has a "padding" parameter.
+
+   The encoding mechanisms defined here explicitly encode all data in
+   US-ASCII.  Thus, for example, suppose an entity has header fields
+   such as:
+
+     Content-Type: text/plain; charset=ISO-8859-1
+     Content-transfer-encoding: base64
+
+   This must be interpreted to mean that the body is a base64 US-ASCII
+   encoding of data that was originally in ISO-8859-1, and will be in
+   that character set again after decoding.
+
+   Certain Content-Transfer-Encoding values may only be used on certain
+   media types.  In particular, it is EXPRESSLY FORBIDDEN to use any
+   encodings other than "7bit", "8bit", or "binary" with any composite
+   media type, i.e. one that recursively includes other Content-Type
+   fields.  Currently the only composite media types are "multipart" and
+   "message".  All encodings that are desired for bodies of type
+   multipart or message must be done at the innermost level, by encoding
+   the actual body that needs to be encoded.
+
+   It should also be noted that, by definition, if a composite entity
+   has a transfer-encoding value such as "7bit", but one of the enclosed
+   entities has a less restrictive value such as "8bit", then either the
+   outer "7bit" labelling is in error, because 8bit data are included,
+   or the inner "8bit" labelling placed an unnecessarily high demand on
+   the transport system because the actual included data were actually
+   7bit-safe.
+
+   NOTE ON ENCODING RESTRICTIONS:  Though the prohibition against using
+   content-transfer-encodings on composite body data may seem overly
+   restrictive, it is necessary to prevent nested encodings, in which
+   data are passed through an encoding algorithm multiple times, and
+   must be decoded multiple times in order to be properly viewed.
+   Nested encodings add considerable complexity to user agents:  Aside
+   from the obvious efficiency problems with such multiple encodings,
+   they can obscure the basic structure of a message.  In particular,
+   they can imply that several decoding operations are necessary simply
+
+
+
+Freed & Borenstein          Standards Track                    [Page 17]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+   to find out what types of bodies a message contains.  Banning nested
+   encodings may complicate the job of certain mail gateways, but this
+   seems less of a problem than the effect of nested encodings on user
+   agents.
+
+   Any entity with an unrecognized Content-Transfer-Encoding must be
+   treated as if it has a Content-Type of "application/octet-stream",
+   regardless of what the Content-Type header field actually says.
+
+   NOTE ON THE RELATIONSHIP BETWEEN CONTENT-TYPE AND CONTENT-TRANSFER-
+   ENCODING: It may seem that the Content-Transfer-Encoding could be
+   inferred from the characteristics of the media that is to be encoded,
+   or, at the very least, that certain Content-Transfer-Encodings could
+   be mandated for use with specific media types.  There are several
+   reasons why this is not the case. First, given the varying types of
+   transports used for mail, some encodings may be appropriate for some
+   combinations of media types and transports but not for others.  (For
+   example, in an 8bit transport, no encoding would be required for text
+   in certain character sets, while such encodings are clearly required
+   for 7bit SMTP.)
+
+   Second, certain media types may require different types of transfer
+   encoding under different circumstances.  For example, many PostScript
+   bodies might consist entirely of short lines of 7bit data and hence
+   require no encoding at all.  Other PostScript bodies (especially
+   those using Level 2 PostScript's binary encoding mechanism) may only
+   be reasonably represented using a binary transport encoding.
+   Finally, since the Content-Type field is intended to be an open-ended
+   specification mechanism, strict specification of an association
+   between media types and encodings effectively couples the
+   specification of an application protocol with a specific lower-level
+   transport.  This is not desirable since the developers of a media
+   type should not have to be aware of all the transports in use and
+   what their limitations are.
+
+6.5.  Translating Encodings
+
+   The quoted-printable and base64 encodings are designed so that
+   conversion between them is possible.  The only issue that arises in
+   such a conversion is the handling of hard line breaks in quoted-
+   printable encoding output. When converting from quoted-printable to
+   base64 a hard line break in the quoted-printable form represents a
+   CRLF sequence in the canonical form of the data. It must therefore be
+   converted to a corresponding encoded CRLF in the base64 form of the
+   data.  Similarly, a CRLF sequence in the canonical form of the data
+   obtained after base64 decoding must be converted to a quoted-
+   printable hard line break, but ONLY when converting text data.
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 18]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+6.6.  Canonical Encoding Model
+
+   There was some confusion, in the previous versions of this RFC,
+   regarding the model for when email data was to be converted to
+   canonical form and encoded, and in particular how this process would
+   affect the treatment of CRLFs, given that the representation of
+   newlines varies greatly from system to system, and the relationship
+   between content-transfer-encodings and character sets.  A canonical
+   model for encoding is presented in RFC 2049 for this reason.
+
+6.7.  Quoted-Printable Content-Transfer-Encoding
+
+   The Quoted-Printable encoding is intended to represent data that
+   largely consists of octets that correspond to printable characters in
+   the US-ASCII character set.  It encodes the data in such a way that
+   the resulting octets are unlikely to be modified by mail transport.
+   If the data being encoded are mostly US-ASCII text, the encoded form
+   of the data remains largely recognizable by humans.  A body which is
+   entirely US-ASCII may also be encoded in Quoted-Printable to ensure
+   the integrity of the data should the message pass through a
+   character-translating, and/or line-wrapping gateway.
+
+   In this encoding, octets are to be represented as determined by the
+   following rules:
+
+    (1)   (General 8bit representation) Any octet, except a CR or
+          LF that is part of a CRLF line break of the canonical
+          (standard) form of the data being encoded, may be
+          represented by an "=" followed by a two digit
+          hexadecimal representation of the octet's value.  The
+          digits of the hexadecimal alphabet, for this purpose,
+          are "0123456789ABCDEF".  Uppercase letters must be
+          used; lowercase letters are not allowed.  Thus, for
+          example, the decimal value 12 (US-ASCII form feed) can
+          be represented by "=0C", and the decimal value 61 (US-
+          ASCII EQUAL SIGN) can be represented by "=3D".  This
+          rule must be followed except when the following rules
+          allow an alternative encoding.
+
+    (2)   (Literal representation) Octets with decimal values of
+          33 through 60 inclusive, and 62 through 126, inclusive,
+          MAY be represented as the US-ASCII characters which
+          correspond to those octets (EXCLAMATION POINT through
+          LESS THAN, and GREATER THAN through TILDE,
+          respectively).
+
+    (3)   (White Space) Octets with values of 9 and 32 MAY be
+          represented as US-ASCII TAB (HT) and SPACE characters,
+
+
+
+Freed & Borenstein          Standards Track                    [Page 19]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+          respectively, but MUST NOT be so represented at the end
+          of an encoded line.  Any TAB (HT) or SPACE characters
+          on an encoded line MUST thus be followed on that line
+          by a printable character.  In particular, an "=" at the
+          end of an encoded line, indicating a soft line break
+          (see rule #5) may follow one or more TAB (HT) or SPACE
+          characters.  It follows that an octet with decimal
+          value 9 or 32 appearing at the end of an encoded line
+          must be represented according to Rule #1.  This rule is
+          necessary because some MTAs (Message Transport Agents,
+          programs which transport messages from one user to
+          another, or perform a portion of such transfers) are
+          known to pad lines of text with SPACEs, and others are
+          known to remove "white space" characters from the end
+          of a line.  Therefore, when decoding a Quoted-Printable
+          body, any trailing white space on a line must be
+          deleted, as it will necessarily have been added by
+          intermediate transport agents.
+
+    (4)   (Line Breaks) A line break in a text body, represented
+          as a CRLF sequence in the text canonical form, must be
+          represented by a (RFC 822) line break, which is also a
+          CRLF sequence, in the Quoted-Printable encoding.  Since
+          the canonical representation of media types other than
+          text do not generally include the representation of
+          line breaks as CRLF sequences, no hard line breaks
+          (i.e. line breaks that are intended to be meaningful
+          and to be displayed to the user) can occur in the
+          quoted-printable encoding of such types.  Sequences
+          like "=0D", "=0A", "=0A=0D" and "=0D=0A" will routinely
+          appear in non-text data represented in quoted-
+          printable, of course.
+
+          Note that many implementations may elect to encode the
+          local representation of various content types directly
+          rather than converting to canonical form first,
+          encoding, and then converting back to local
+          representation.  In particular, this may apply to plain
+          text material on systems that use newline conventions
+          other than a CRLF terminator sequence.  Such an
+          implementation optimization is permissible, but only
+          when the combined canonicalization-encoding step is
+          equivalent to performing the three steps separately.
+
+    (5)   (Soft Line Breaks) The Quoted-Printable encoding
+          REQUIRES that encoded lines be no more than 76
+          characters long.  If longer lines are to be encoded
+          with the Quoted-Printable encoding, "soft" line breaks
+
+
+
+Freed & Borenstein          Standards Track                    [Page 20]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+          must be used.  An equal sign as the last character on a
+          encoded line indicates such a non-significant ("soft")
+          line break in the encoded text.
+
+   Thus if the "raw" form of the line is a single unencoded line that
+   says:
+
+     Now's the time for all folk to come to the aid of their country.
+
+   This can be represented, in the Quoted-Printable encoding, as:
+
+     Now's the time =
+     for all folk to come=
+      to the aid of their country.
+
+   This provides a mechanism with which long lines are encoded in such a
+   way as to be restored by the user agent.  The 76 character limit does
+   not count the trailing CRLF, but counts all other characters,
+   including any equal signs.
+
+   Since the hyphen character ("-") may be represented as itself in the
+   Quoted-Printable encoding, care must be taken, when encapsulating a
+   quoted-printable encoded body inside one or more multipart entities,
+   to ensure that the boundary delimiter does not appear anywhere in the
+   encoded body.  (A good strategy is to choose a boundary that includes
+   a character sequence such as "=_" which can never appear in a
+   quoted-printable body.  See the definition of multipart messages in
+   RFC 2046.)
+
+   NOTE: The quoted-printable encoding represents something of a
+   compromise between readability and reliability in transport.  Bodies
+   encoded with the quoted-printable encoding will work reliably over
+   most mail gateways, but may not work perfectly over a few gateways,
+   notably those involving translation into EBCDIC.  A higher level of
+   confidence is offered by the base64 Content-Transfer-Encoding.  A way
+   to get reasonably reliable transport through EBCDIC gateways is to
+   also quote the US-ASCII characters
+
+     !"#$@[\]^`{|}~
+
+   according to rule #1.
+
+   Because quoted-printable data is generally assumed to be line-
+   oriented, it is to be expected that the representation of the breaks
+   between the lines of quoted-printable data may be altered in
+   transport, in the same manner that plain text mail has always been
+   altered in Internet mail when passing between systems with differing
+   newline conventions.  If such alterations are likely to constitute a
+
+
+
+Freed & Borenstein          Standards Track                    [Page 21]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+   corruption of the data, it is probably more sensible to use the
+   base64 encoding rather than the quoted-printable encoding.
+
+   NOTE: Several kinds of substrings cannot be generated according to
+   the encoding rules for the quoted-printable content-transfer-
+   encoding, and hence are formally illegal if they appear in the output
+   of a quoted-printable encoder. This note enumerates these cases and
+   suggests ways to handle such illegal substrings if any are
+   encountered in quoted-printable data that is to be decoded.
+
+    (1)   An "=" followed by two hexadecimal digits, one or both
+          of which are lowercase letters in "abcdef", is formally
+          illegal. A robust implementation might choose to
+          recognize them as the corresponding uppercase letters.
+
+    (2)   An "=" followed by a character that is neither a
+          hexadecimal digit (including "abcdef") nor the CR
+          character of a CRLF pair is illegal.  This case can be
+          the result of US-ASCII text having been included in a
+          quoted-printable part of a message without itself
+          having been subjected to quoted-printable encoding.  A
+          reasonable approach by a robust implementation might be
+          to include the "=" character and the following
+          character in the decoded data without any
+          transformation and, if possible, indicate to the user
+          that proper decoding was not possible at this point in
+          the data.
+
+    (3)   An "=" cannot be the ultimate or penultimate character
+          in an encoded object.  This could be handled as in case
+          (2) above.
+
+    (4)   Control characters other than TAB, or CR and LF as
+          parts of CRLF pairs, must not appear. The same is true
+          for octets with decimal values greater than 126.  If
+          found in incoming quoted-printable data by a decoder, a
+          robust implementation might exclude them from the
+          decoded data and warn the user that illegal characters
+          were discovered.
+
+    (5)   Encoded lines must not be longer than 76 characters,
+          not counting the trailing CRLF. If longer lines are
+          found in incoming, encoded data, a robust
+          implementation might nevertheless decode the lines, and
+          might report the erroneous encoding to the user.
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 22]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+   WARNING TO IMPLEMENTORS:  If binary data is encoded in quoted-
+   printable, care must be taken to encode CR and LF characters as "=0D"
+   and "=0A", respectively.  In particular, a CRLF sequence in binary
+   data should be encoded as "=0D=0A".  Otherwise, if CRLF were
+   represented as a hard line break, it might be incorrectly decoded on
+   platforms with different line break conventions.
+
+   For formalists, the syntax of quoted-printable data is described by
+   the following grammar:
+
+     quoted-printable := qp-line *(CRLF qp-line)
+
+     qp-line := *(qp-segment transport-padding CRLF)
+                qp-part transport-padding
+
+     qp-part := qp-section
+                ; Maximum length of 76 characters
+
+     qp-segment := qp-section *(SPACE / TAB) "="
+                   ; Maximum length of 76 characters
+
+     qp-section := [*(ptext / SPACE / TAB) ptext]
+
+     ptext := hex-octet / safe-char
+
+     safe-char := <any octet with decimal value of 33 through
+                  60 inclusive, and 62 through 126>
+                  ; Characters not listed as "mail-safe" in
+                  ; RFC 2049 are also not recommended.
+
+     hex-octet := "=" 2(DIGIT / "A" / "B" / "C" / "D" / "E" / "F")
+                  ; Octet must be used for characters > 127, =,
+                  ; SPACEs or TABs at the ends of lines, and is
+                  ; recommended for any character not listed in
+                  ; RFC 2049 as "mail-safe".
+
+     transport-padding := *LWSP-char
+                          ; Composers MUST NOT generate
+                          ; non-zero length transport
+                          ; padding, but receivers MUST
+                          ; be able to handle padding
+                          ; added by message transports.
+
+   IMPORTANT:  The addition of LWSP between the elements shown in this
+   BNF is NOT allowed since this BNF does not specify a structured
+   header field.
+
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 23]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+6.8.  Base64 Content-Transfer-Encoding
+
+   The Base64 Content-Transfer-Encoding is designed to represent
+   arbitrary sequences of octets in a form that need not be humanly
+   readable.  The encoding and decoding algorithms are simple, but the
+   encoded data are consistently only about 33 percent larger than the
+   unencoded data.  This encoding is virtually identical to the one used
+   in Privacy Enhanced Mail (PEM) applications, as defined in RFC 1421.
+
+   A 65-character subset of US-ASCII is used, enabling 6 bits to be
+   represented per printable character. (The extra 65th character, "=",
+   is used to signify a special processing function.)
+
+   NOTE:  This subset has the important property that it is represented
+   identically in all versions of ISO 646, including US-ASCII, and all
+   characters in the subset are also represented identically in all
+   versions of EBCDIC. Other popular encodings, such as the encoding
+   used by the uuencode utility, Macintosh binhex 4.0 [RFC-1741], and
+   the base85 encoding specified as part of Level 2 PostScript, do not
+   share these properties, and thus do not fulfill the portability
+   requirements a binary transport encoding for mail must meet.
+
+   The encoding process represents 24-bit groups of input bits as output
+   strings of 4 encoded characters.  Proceeding from left to right, a
+   24-bit input group is formed by concatenating 3 8bit input groups.
+   These 24 bits are then treated as 4 concatenated 6-bit groups, each
+   of which is translated into a single digit in the base64 alphabet.
+   When encoding a bit stream via the base64 encoding, the bit stream
+   must be presumed to be ordered with the most-significant-bit first.
+   That is, the first bit in the stream will be the high-order bit in
+   the first 8bit byte, and the eighth bit will be the low-order bit in
+   the first 8bit byte, and so on.
+
+   Each 6-bit group is used as an index into an array of 64 printable
+   characters.  The character referenced by the index is placed in the
+   output string.  These characters, identified in Table 1, below, are
+   selected so as to be universally representable, and the set excludes
+   characters with particular significance to SMTP (e.g., ".", CR, LF)
+   and to the multipart boundary delimiters defined in RFC 2046 (e.g.,
+   "-").
+
+
+
+
+
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 24]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+                    Table 1: The Base64 Alphabet
+
+     Value Encoding  Value Encoding  Value Encoding  Value Encoding
+         0 A            17 R            34 i            51 z
+         1 B            18 S            35 j            52 0
+         2 C            19 T            36 k            53 1
+         3 D            20 U            37 l            54 2
+         4 E            21 V            38 m            55 3
+         5 F            22 W            39 n            56 4
+         6 G            23 X            40 o            57 5
+         7 H            24 Y            41 p            58 6
+         8 I            25 Z            42 q            59 7
+         9 J            26 a            43 r            60 8
+        10 K            27 b            44 s            61 9
+        11 L            28 c            45 t            62 +
+        12 M            29 d            46 u            63 /
+        13 N            30 e            47 v
+        14 O            31 f            48 w         (pad) =
+        15 P            32 g            49 x
+        16 Q            33 h            50 y
+
+   The encoded output stream must be represented in lines of no more
+   than 76 characters each.  All line breaks or other characters not
+   found in Table 1 must be ignored by decoding software.  In base64
+   data, characters other than those in Table 1, line breaks, and other
+   white space probably indicate a transmission error, about which a
+   warning message or even a message rejection might be appropriate
+   under some circumstances.
+
+   Special processing is performed if fewer than 24 bits are available
+   at the end of the data being encoded.  A full encoding quantum is
+   always completed at the end of a body.  When fewer than 24 input bits
+   are available in an input group, zero bits are added (on the right)
+   to form an integral number of 6-bit groups.  Padding at the end of
+   the data is performed using the "=" character.  Since all base64
+   input is an integral number of octets, only the following cases can
+   arise: (1) the final quantum of encoding input is an integral
+   multiple of 24 bits; here, the final unit of encoded output will be
+   an integral multiple of 4 characters with no "=" padding, (2) the
+   final quantum of encoding input is exactly 8 bits; here, the final
+   unit of encoded output will be two characters followed by two "="
+   padding characters, or (3) the final quantum of encoding input is
+   exactly 16 bits; here, the final unit of encoded output will be three
+   characters followed by one "=" padding character.
+
+   Because it is used only for padding at the end of the data, the
+   occurrence of any "=" characters may be taken as evidence that the
+   end of the data has been reached (without truncation in transit).  No
+
+
+
+Freed & Borenstein          Standards Track                    [Page 25]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+   such assurance is possible, however, when the number of octets
+   transmitted was a multiple of three and no "=" characters are
+   present.
+
+   Any characters outside of the base64 alphabet are to be ignored in
+   base64-encoded data.
+
+   Care must be taken to use the proper octets for line breaks if base64
+   encoding is applied directly to text material that has not been
+   converted to canonical form.  In particular, text line breaks must be
+   converted into CRLF sequences prior to base64 encoding.  The
+   important thing to note is that this may be done directly by the
+   encoder rather than in a prior canonicalization step in some
+   implementations.
+
+   NOTE: There is no need to worry about quoting potential boundary
+   delimiters within base64-encoded bodies within multipart entities
+   because no hyphen characters are used in the base64 encoding.
+
+7.  Content-ID Header Field
+
+   In constructing a high-level user agent, it may be desirable to allow
+   one body to make reference to another.  Accordingly, bodies may be
+   labelled using the "Content-ID" header field, which is syntactically
+   identical to the "Message-ID" header field:
+
+     id := "Content-ID" ":" msg-id
+
+   Like the Message-ID values, Content-ID values must be generated to be
+   world-unique.
+
+   The Content-ID value may be used for uniquely identifying MIME
+   entities in several contexts, particularly for caching data
+   referenced by the message/external-body mechanism.  Although the
+   Content-ID header is generally optional, its use is MANDATORY in
+   implementations which generate data of the optional MIME media type
+   "message/external-body".  That is, each message/external-body entity
+   must have a Content-ID field to permit caching of such data.
+
+   It is also worth noting that the Content-ID value has special
+   semantics in the case of the multipart/alternative media type.  This
+   is explained in the section of RFC 2046 dealing with
+   multipart/alternative.
+
+
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 26]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+8.  Content-Description Header Field
+
+   The ability to associate some descriptive information with a given
+   body is often desirable.  For example, it may be useful to mark an
+   "image" body as "a picture of the Space Shuttle Endeavor."  Such text
+   may be placed in the Content-Description header field.  This header
+   field is always optional.
+
+     description := "Content-Description" ":" *text
+
+   The description is presumed to be given in the US-ASCII character
+   set, although the mechanism specified in RFC 2047 may be used for
+   non-US-ASCII Content-Description values.
+
+9.  Additional MIME Header Fields
+
+   Future documents may elect to define additional MIME header fields
+   for various purposes.  Any new header field that further describes
+   the content of a message should begin with the string "Content-" to
+   allow such fields which appear in a message header to be
+   distinguished from ordinary RFC 822 message header fields.
+
+     MIME-extension-field := <Any RFC 822 header field which
+                              begins with the string
+                              "Content-">
+
+10.  Summary
+
+   Using the MIME-Version, Content-Type, and Content-Transfer-Encoding
+   header fields, it is possible to include, in a standardized way,
+   arbitrary types of data with RFC 822 conformant mail messages.  No
+   restrictions imposed by either RFC 821 or RFC 822 are violated, and
+   care has been taken to avoid problems caused by additional
+   restrictions imposed by the characteristics of some Internet mail
+   transport mechanisms (see RFC 2049).
+
+   The next document in this set, RFC 2046, specifies the initial set of
+   media types that can be labelled and transported using these headers.
+
+11.  Security Considerations
+
+   Security issues are discussed in the second document in this set, RFC
+   2046.
+
+
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 27]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+12.  Authors' Addresses
+
+   For more information, the authors of this document are best contacted
+   via Internet mail:
+
+   Ned Freed
+   Innosoft International, Inc.
+   1050 East Garvey Avenue South
+   West Covina, CA 91790
+   USA
+
+   Phone: +1 818 919 3600
+   Fax:   +1 818 919 3614
+   EMail: ned@innosoft.com
+
+
+   Nathaniel S. Borenstein
+   First Virtual Holdings
+   25 Washington Avenue
+   Morristown, NJ 07960
+   USA
+
+   Phone: +1 201 540 8967
+   Fax:   +1 201 993 3032
+   EMail: nsb@nsb.fv.com
+
+
+   MIME is a result of the work of the Internet Engineering Task Force
+   Working Group on RFC 822 Extensions.  The chairman of that group,
+   Greg Vaudreuil, may be reached at:
+
+   Gregory M. Vaudreuil
+   Octel Network Services
+   17080 Dallas Parkway
+   Dallas, TX 75248-1905
+   USA
+
+   EMail: Greg.Vaudreuil@Octel.Com
+
+
+
+
+
+
+
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 28]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+Appendix A -- Collected Grammar
+
+   This appendix contains the complete BNF grammar for all the syntax
+   specified by this document.
+
+   By itself, however, this grammar is incomplete.  It refers by name to
+   several syntax rules that are defined by RFC 822.  Rather than
+   reproduce those definitions here, and risk unintentional differences
+   between the two, this document simply refers the reader to RFC 822
+   for the remaining definitions. Wherever a term is undefined, it
+   refers to the RFC 822 definition.
+
+  attribute := token
+               ; Matching of attributes
+               ; is ALWAYS case-insensitive.
+
+  composite-type := "message" / "multipart" / extension-token
+
+  content := "Content-Type" ":" type "/" subtype
+             *(";" parameter)
+             ; Matching of media type and subtype
+             ; is ALWAYS case-insensitive.
+
+  description := "Content-Description" ":" *text
+
+  discrete-type := "text" / "image" / "audio" / "video" /
+                   "application" / extension-token
+
+  encoding := "Content-Transfer-Encoding" ":" mechanism
+
+  entity-headers := [ content CRLF ]
+                    [ encoding CRLF ]
+                    [ id CRLF ]
+                    [ description CRLF ]
+                    *( MIME-extension-field CRLF )
+
+  extension-token := ietf-token / x-token
+
+  hex-octet := "=" 2(DIGIT / "A" / "B" / "C" / "D" / "E" / "F")
+               ; Octet must be used for characters > 127, =,
+               ; SPACEs or TABs at the ends of lines, and is
+               ; recommended for any character not listed in
+               ; RFC 2049 as "mail-safe".
+
+  iana-token := <A publicly-defined extension token. Tokens
+                 of this form must be registered with IANA
+                 as specified in RFC 2048.>
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 29]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+  ietf-token := <An extension token defined by a
+                 standards-track RFC and registered
+                 with IANA.>
+
+  id := "Content-ID" ":" msg-id
+
+  mechanism := "7bit" / "8bit" / "binary" /
+               "quoted-printable" / "base64" /
+               ietf-token / x-token
+
+  MIME-extension-field := <Any RFC 822 header field which
+                           begins with the string
+                           "Content-">
+
+  MIME-message-headers := entity-headers
+                          fields
+                          version CRLF
+                          ; The ordering of the header
+                          ; fields implied by this BNF
+                          ; definition should be ignored.
+
+  MIME-part-headers := entity-headers
+                       [fields]
+                       ; Any field not beginning with
+                       ; "content-" can have no defined
+                       ; meaning and may be ignored.
+                       ; The ordering of the header
+                       ; fields implied by this BNF
+                       ; definition should be ignored.
+
+  parameter := attribute "=" value
+
+  ptext := hex-octet / safe-char
+
+  qp-line := *(qp-segment transport-padding CRLF)
+             qp-part transport-padding
+
+  qp-part := qp-section
+             ; Maximum length of 76 characters
+
+  qp-section := [*(ptext / SPACE / TAB) ptext]
+
+  qp-segment := qp-section *(SPACE / TAB) "="
+                ; Maximum length of 76 characters
+
+  quoted-printable := qp-line *(CRLF qp-line)
+
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 30]
+
+RFC 2045                Internet Message Bodies            November 1996
+
+
+  safe-char := <any octet with decimal value of 33 through
+               60 inclusive, and 62 through 126>
+               ; Characters not listed as "mail-safe" in
+               ; RFC 2049 are also not recommended.
+
+  subtype := extension-token / iana-token
+
+  token := 1*<any (US-ASCII) CHAR except SPACE, CTLs,
+              or tspecials>
+
+  transport-padding := *LWSP-char
+                       ; Composers MUST NOT generate
+                       ; non-zero length transport
+                       ; padding, but receivers MUST
+                       ; be able to handle padding
+                       ; added by message transports.
+
+  tspecials :=  "(" / ")" / "<" / ">" / "@" /
+                "," / ";" / ":" / "\" / <">
+                "/" / "[" / "]" / "?" / "="
+                ; Must be in quoted-string,
+                ; to use within parameter values
+
+  type := discrete-type / composite-type
+
+  value := token / quoted-string
+
+  version := "MIME-Version" ":" 1*DIGIT "." 1*DIGIT
+
+  x-token := <The two characters "X-" or "x-" followed, with
+              no  intervening white space, by any token>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 31]
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2046.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2046.txt
new file mode 100644
index 000000000..84d90c109
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2046.txt
@@ -0,0 +1,2467 @@
+
+
+
+
+
+
+Network Working Group                                          N. Freed
+Request for Comments: 2046                                     Innosoft
+Obsoletes: 1521, 1522, 1590                               N. Borenstein
+Category: Standards Track                                 First Virtual
+                                                          November 1996
+
+
+                 Multipurpose Internet Mail Extensions
+                            (MIME) Part Two:
+                              Media Types
+
+Status of this Memo
+
+   This document specifies an Internet standards track protocol for the
+   Internet community, and requests discussion and suggestions for
+   improvements.  Please refer to the current edition of the "Internet
+   Official Protocol Standards" (STD 1) for the standardization state
+   and status of this protocol.  Distribution of this memo is unlimited.
+
+Abstract
+
+   STD 11, RFC 822 defines a message representation protocol specifying
+   considerable detail about US-ASCII message headers, but which leaves
+   the message content, or message body, as flat US-ASCII text.  This
+   set of documents, collectively called the Multipurpose Internet Mail
+   Extensions, or MIME, redefines the format of messages to allow for
+
+    (1)   textual message bodies in character sets other than
+          US-ASCII,
+
+    (2)   an extensible set of different formats for non-textual
+          message bodies,
+
+    (3)   multi-part message bodies, and
+
+    (4)   textual header information in character sets other than
+          US-ASCII.
+
+   These documents are based on earlier work documented in RFC 934, STD
+   11, and RFC 1049, but extends and revises them.  Because RFC 822 said
+   so little about message bodies, these documents are largely
+   orthogonal to (rather than a revision of) RFC 822.
+
+   The initial document in this set, RFC 2045, specifies the various
+   headers used to describe the structure of MIME messages. This second
+   document defines the general structure of the MIME media typing
+   system and defines an initial set of media types. The third document,
+   RFC 2047, describes extensions to RFC 822 to allow non-US-ASCII text
+
+
+
+Freed & Borenstein          Standards Track                     [Page 1]
+
+RFC 2046                      Media Types                  November 1996
+
+
+   data in Internet mail header fields. The fourth document, RFC 2048,
+   specifies various IANA registration procedures for MIME-related
+   facilities.  The fifth and final document, RFC 2049, describes MIME
+   conformance criteria as well as providing some illustrative examples
+   of MIME message formats, acknowledgements, and the bibliography.
+
+   These documents are revisions of RFCs 1521 and 1522, which themselves
+   were revisions of RFCs 1341 and 1342.  An appendix in RFC 2049
+   describes differences and changes from previous versions.
+
+Table of Contents
+
+   1. Introduction .........................................    3
+   2. Definition of a Top-Level Media Type .................    4
+   3. Overview Of The Initial Top-Level Media Types ........    4
+   4. Discrete Media Type Values ...........................    6
+   4.1 Text Media Type .....................................    6
+   4.1.1 Representation of Line Breaks .....................    7
+   4.1.2 Charset Parameter .................................    7
+   4.1.3 Plain Subtype .....................................   11
+   4.1.4 Unrecognized Subtypes .............................   11
+   4.2 Image Media Type ....................................   11
+   4.3 Audio Media Type ....................................   11
+   4.4 Video Media Type ....................................   12
+   4.5 Application Media Type ..............................   12
+   4.5.1 Octet-Stream Subtype ..............................   13
+   4.5.2 PostScript Subtype ................................   14
+   4.5.3 Other Application Subtypes ........................   17
+   5. Composite Media Type Values ..........................   17
+   5.1 Multipart Media Type ................................   17
+   5.1.1 Common Syntax .....................................   19
+   5.1.2 Handling Nested Messages and Multiparts ...........   24
+   5.1.3 Mixed Subtype .....................................   24
+   5.1.4 Alternative Subtype ...............................   24
+   5.1.5 Digest Subtype ....................................   26
+   5.1.6 Parallel Subtype ..................................   27
+   5.1.7 Other Multipart Subtypes ..........................   28
+   5.2 Message Media Type ..................................   28
+   5.2.1 RFC822 Subtype ....................................   28
+   5.2.2 Partial Subtype ...................................   29
+   5.2.2.1 Message Fragmentation and Reassembly ............   30
+   5.2.2.2 Fragmentation and Reassembly Example ............   31
+   5.2.3 External-Body Subtype .............................   33
+   5.2.4 Other Message Subtypes ............................   40
+   6. Experimental Media Type Values .......................   40
+   7. Summary ..............................................   41
+   8. Security Considerations ..............................   41
+   9. Authors' Addresses ...................................   42
+
+
+
+Freed & Borenstein          Standards Track                     [Page 2]
+
+RFC 2046                      Media Types                  November 1996
+
+
+   A. Collected Grammar ....................................   43
+
+1.  Introduction
+
+   The first document in this set, RFC 2045, defines a number of header
+   fields, including Content-Type. The Content-Type field is used to
+   specify the nature of the data in the body of a MIME entity, by
+   giving media type and subtype identifiers, and by providing auxiliary
+   information that may be required for certain media types.  After the
+   type and subtype names, the remainder of the header field is simply a
+   set of parameters, specified in an attribute/value notation.  The
+   ordering of parameters is not significant.
+
+   In general, the top-level media type is used to declare the general
+   type of data, while the subtype specifies a specific format for that
+   type of data.  Thus, a media type of "image/xyz" is enough to tell a
+   user agent that the data is an image, even if the user agent has no
+   knowledge of the specific image format "xyz".  Such information can
+   be used, for example, to decide whether or not to show a user the raw
+   data from an unrecognized subtype -- such an action might be
+   reasonable for unrecognized subtypes of "text", but not for
+   unrecognized subtypes of "image" or "audio".  For this reason,
+   registered subtypes of "text", "image", "audio", and "video" should
+   not contain embedded information that is really of a different type.
+   Such compound formats should be represented using the "multipart" or
+   "application" types.
+
+   Parameters are modifiers of the media subtype, and as such do not
+   fundamentally affect the nature of the content.  The set of
+   meaningful parameters depends on the media type and subtype.  Most
+   parameters are associated with a single specific subtype.  However, a
+   given top-level media type may define parameters which are applicable
+   to any subtype of that type.  Parameters may be required by their
+   defining media type or subtype or they may be optional.  MIME
+   implementations must also ignore any parameters whose names they do
+   not recognize.
+
+   MIME's Content-Type header field and media type mechanism has been
+   carefully designed to be extensible, and it is expected that the set
+   of media type/subtype pairs and their associated parameters will grow
+   significantly over time.  Several other MIME facilities, such as
+   transfer encodings and "message/external-body" access types, are
+   likely to have new values defined over time.  In order to ensure that
+   the set of such values is developed in an orderly, well-specified,
+   and public manner, MIME sets up a registration process which uses the
+   Internet Assigned Numbers Authority (IANA) as a central registry for
+   MIME's various areas of extensibility.  The registration process for
+   these areas is described in a companion document, RFC 2048.
+
+
+
+Freed & Borenstein          Standards Track                     [Page 3]
+
+RFC 2046                      Media Types                  November 1996
+
+
+   The initial seven standard top-level media type are defined and
+   described in the remainder of this document.
+
+2.  Definition of a Top-Level Media Type
+
+   The definition of a top-level media type consists of:
+
+    (1)   a name and a description of the type, including
+          criteria for whether a particular type would qualify
+          under that type,
+
+    (2)   the names and definitions of parameters, if any, which
+          are defined for all subtypes of that type (including
+          whether such parameters are required or optional),
+
+    (3)   how a user agent and/or gateway should handle unknown
+          subtypes of this type,
+
+    (4)   general considerations on gatewaying entities of this
+          top-level type, if any, and
+
+    (5)   any restrictions on content-transfer-encodings for
+          entities of this top-level type.
+
+3.  Overview Of The Initial Top-Level Media Types
+
+   The five discrete top-level media types are:
+
+    (1)   text -- textual information.  The subtype "plain" in
+          particular indicates plain text containing no
+          formatting commands or directives of any sort. Plain
+          text is intended to be displayed "as-is". No special
+          software is required to get the full meaning of the
+          text, aside from support for the indicated character
+          set. Other subtypes are to be used for enriched text in
+          forms where application software may enhance the
+          appearance of the text, but such software must not be
+          required in order to get the general idea of the
+          content.  Possible subtypes of "text" thus include any
+          word processor format that can be read without
+          resorting to software that understands the format.  In
+          particular, formats that employ embeddded binary
+          formatting information are not considered directly
+          readable. A very simple and portable subtype,
+          "richtext", was defined in RFC 1341, with a further
+          revision in RFC 1896 under the name "enriched".
+
+
+
+
+
+Freed & Borenstein          Standards Track                     [Page 4]
+
+RFC 2046                      Media Types                  November 1996
+
+
+    (2)   image -- image data.  "Image" requires a display device
+          (such as a graphical display, a graphics printer, or a
+          FAX machine) to view the information. An initial
+          subtype is defined for the widely-used image format
+          JPEG. .  subtypes are defined for two widely-used image
+          formats, jpeg and gif.
+
+    (3)   audio -- audio data.  "Audio" requires an audio output
+          device (such as a speaker or a telephone) to "display"
+          the contents.  An initial subtype "basic" is defined in
+          this document.
+
+    (4)   video -- video data.  "Video" requires the capability
+          to display moving images, typically including
+          specialized hardware and software.  An initial subtype
+          "mpeg" is defined in this document.
+
+    (5)   application -- some other kind of data, typically
+          either uninterpreted binary data or information to be
+          processed by an application.  The subtype "octet-
+          stream" is to be used in the case of uninterpreted
+          binary data, in which case the simplest recommended
+          action is to offer to write the information into a file
+          for the user.  The "PostScript" subtype is also defined
+          for the transport of PostScript material.  Other
+          expected uses for "application" include spreadsheets,
+          data for mail-based scheduling systems, and languages
+          for "active" (computational) messaging, and word
+          processing formats that are not directly readable.
+          Note that security considerations may exist for some
+          types of application data, most notably
+          "application/PostScript" and any form of active
+          messaging.  These issues are discussed later in this
+          document.
+
+   The two composite top-level media types are:
+
+    (1)   multipart -- data consisting of multiple entities of
+          independent data types.  Four subtypes are initially
+          defined, including the basic "mixed" subtype specifying
+          a generic mixed set of parts, "alternative" for
+          representing the same data in multiple formats,
+          "parallel" for parts intended to be viewed
+          simultaneously, and "digest" for multipart entities in
+          which each part has a default type of "message/rfc822".
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                     [Page 5]
+
+RFC 2046                      Media Types                  November 1996
+
+
+    (2)   message -- an encapsulated message.  A body of media
+          type "message" is itself all or a portion of some kind
+          of message object.  Such objects may or may not in turn
+          contain other entities.  The "rfc822" subtype is used
+          when the encapsulated content is itself an RFC 822
+          message.  The "partial" subtype is defined for partial
+          RFC 822 messages, to permit the fragmented transmission
+          of bodies that are thought to be too large to be passed
+          through transport facilities in one piece.  Another
+          subtype, "external-body", is defined for specifying
+          large bodies by reference to an external data source.
+
+   It should be noted that the list of media type values given here may
+   be augmented in time, via the mechanisms described above, and that
+   the set of subtypes is expected to grow substantially.
+
+4.  Discrete Media Type Values
+
+   Five of the seven initial media type values refer to discrete bodies.
+   The content of these types must be handled by non-MIME mechanisms;
+   they are opaque to MIME processors.
+
+4.1.  Text Media Type
+
+   The "text" media type is intended for sending material which is
+   principally textual in form.  A "charset" parameter may be used to
+   indicate the character set of the body text for "text" subtypes,
+   notably including the subtype "text/plain", which is a generic
+   subtype for plain text.  Plain text does not provide for or allow
+   formatting commands, font attribute specifications, processing
+   instructions, interpretation directives, or content markup.  Plain
+   text is seen simply as a linear sequence of characters, possibly
+   interrupted by line breaks or page breaks.  Plain text may allow the
+   stacking of several characters in the same position in the text.
+   Plain text in scripts like Arabic and Hebrew may also include
+   facilitites that allow the arbitrary mixing of text segments with
+   opposite writing directions.
+
+   Beyond plain text, there are many formats for representing what might
+   be known as "rich text".  An interesting characteristic of many such
+   representations is that they are to some extent readable even without
+   the software that interprets them.  It is useful, then, to
+   distinguish them, at the highest level, from such unreadable data as
+   images, audio, or text represented in an unreadable form. In the
+   absence of appropriate interpretation software, it is reasonable to
+   show subtypes of "text" to the user, while it is not reasonable to do
+   so with most nontextual data. Such formatted textual data should be
+   represented using subtypes of "text".
+
+
+
+Freed & Borenstein          Standards Track                     [Page 6]
+
+RFC 2046                      Media Types                  November 1996
+
+
+4.1.1.  Representation of Line Breaks
+
+   The canonical form of any MIME "text" subtype MUST always represent a
+   line break as a CRLF sequence.  Similarly, any occurrence of CRLF in
+   MIME "text" MUST represent a line break.  Use of CR and LF outside of
+   line break sequences is also forbidden.
+
+   This rule applies regardless of format or character set or sets
+   involved.
+
+   NOTE: The proper interpretation of line breaks when a body is
+   displayed depends on the media type. In particular, while it is
+   appropriate to treat a line break as a transition to a new line when
+   displaying a "text/plain" body, this treatment is actually incorrect
+   for other subtypes of "text" like "text/enriched" [RFC-1896].
+   Similarly, whether or not line breaks should be added during display
+   operations is also a function of the media type. It should not be
+   necessary to add any line breaks to display "text/plain" correctly,
+   whereas proper display of "text/enriched" requires the appropriate
+   addition of line breaks.
+
+   NOTE: Some protocols defines a maximum line length.  E.g. SMTP [RFC-
+   821] allows a maximum of 998 octets before the next CRLF sequence.
+   To be transported by such protocols, data which includes too long
+   segments without CRLF sequences must be encoded with a suitable
+   content-transfer-encoding.
+
+4.1.2.  Charset Parameter
+
+   A critical parameter that may be specified in the Content-Type field
+   for "text/plain" data is the character set.  This is specified with a
+   "charset" parameter, as in:
+
+     Content-type: text/plain; charset=iso-8859-1
+
+   Unlike some other parameter values, the values of the charset
+   parameter are NOT case sensitive.  The default character set, which
+   must be assumed in the absence of a charset parameter, is US-ASCII.
+
+   The specification for any future subtypes of "text" must specify
+   whether or not they will also utilize a "charset" parameter, and may
+   possibly restrict its values as well.  For other subtypes of "text"
+   than "text/plain", the semantics of the "charset" parameter should be
+   defined to be identical to those specified here for "text/plain",
+   i.e., the body consists entirely of characters in the given charset.
+   In particular, definers of future "text" subtypes should pay close
+   attention to the implications of multioctet character sets for their
+   subtype definitions.
+
+
+
+Freed & Borenstein          Standards Track                     [Page 7]
+
+RFC 2046                      Media Types                  November 1996
+
+
+   The charset parameter for subtypes of "text" gives a name of a
+   character set, as "character set" is defined in RFC 2045.  The rules
+   regarding line breaks detailed in the previous section must also be
+   observed -- a character set whose definition does not conform to
+   these rules cannot be used in a MIME "text" subtype.
+
+   An initial list of predefined character set names can be found at the
+   end of this section.  Additional character sets may be registered
+   with IANA.
+
+   Other media types than subtypes of "text" might choose to employ the
+   charset parameter as defined here, but with the CRLF/line break
+   restriction removed.  Therefore, all character sets that conform to
+   the general definition of "character set" in RFC 2045 can be
+   registered for MIME use.
+
+   Note that if the specified character set includes 8-bit characters
+   and such characters are used in the body, a Content-Transfer-Encoding
+   header field and a corresponding encoding on the data are required in
+   order to transmit the body via some mail transfer protocols, such as
+   SMTP [RFC-821].
+
+   The default character set, US-ASCII, has been the subject of some
+   confusion and ambiguity in the past.  Not only were there some
+   ambiguities in the definition, there have been wide variations in
+   practice.  In order to eliminate such ambiguity and variations in the
+   future, it is strongly recommended that new user agents explicitly
+   specify a character set as a media type parameter in the Content-Type
+   header field. "US-ASCII" does not indicate an arbitrary 7-bit
+   character set, but specifies that all octets in the body must be
+   interpreted as characters according to the US-ASCII character set.
+   National and application-oriented versions of ISO 646 [ISO-646] are
+   usually NOT identical to US-ASCII, and in that case their use in
+   Internet mail is explicitly discouraged.  The omission of the ISO 646
+   character set from this document is deliberate in this regard.  The
+   character set name of "US-ASCII" explicitly refers to the character
+   set defined in ANSI X3.4-1986 [US- ASCII].  The new international
+   reference version (IRV) of the 1991 edition of ISO 646 is identical
+   to US-ASCII.  The character set name "ASCII" is reserved and must not
+   be used for any purpose.
+
+   NOTE: RFC 821 explicitly specifies "ASCII", and references an earlier
+   version of the American Standard.  Insofar as one of the purposes of
+   specifying a media type and character set is to permit the receiver
+   to unambiguously determine how the sender intended the coded message
+   to be interpreted, assuming anything other than "strict ASCII" as the
+   default would risk unintentional and incompatible changes to the
+   semantics of messages now being transmitted.  This also implies that
+
+
+
+Freed & Borenstein          Standards Track                     [Page 8]
+
+RFC 2046                      Media Types                  November 1996
+
+
+   messages containing characters coded according to other versions of
+   ISO 646 than US-ASCII and the 1991 IRV, or using code-switching
+   procedures (e.g., those of ISO 2022), as well as 8bit or multiple
+   octet character encodings MUST use an appropriate character set
+   specification to be consistent with MIME.
+
+   The complete US-ASCII character set is listed in ANSI X3.4- 1986.
+   Note that the control characters including DEL (0-31, 127) have no
+   defined meaning in apart from the combination CRLF (US-ASCII values
+   13 and 10) indicating a new line.  Two of the characters have de
+   facto meanings in wide use: FF (12) often means "start subsequent
+   text on the beginning of a new page"; and TAB or HT (9) often (though
+   not always) means "move the cursor to the next available column after
+   the current position where the column number is a multiple of 8
+   (counting the first column as column 0)."  Aside from these
+   conventions, any use of the control characters or DEL in a body must
+   either occur
+
+    (1)   because a subtype of text other than "plain"
+          specifically assigns some additional meaning, or
+
+    (2)   within the context of a private agreement between the
+          sender and recipient. Such private agreements are
+          discouraged and should be replaced by the other
+          capabilities of this document.
+
+   NOTE: An enormous proliferation of character sets exist beyond US-
+   ASCII.  A large number of partially or totally overlapping character
+   sets is NOT a good thing.  A SINGLE character set that can be used
+   universally for representing all of the world's languages in Internet
+   mail would be preferrable.  Unfortunately, existing practice in
+   several communities seems to point to the continued use of multiple
+   character sets in the near future.  A small number of standard
+   character sets are, therefore, defined for Internet use in this
+   document.
+
+   The defined charset values are:
+
+    (1)   US-ASCII -- as defined in ANSI X3.4-1986 [US-ASCII].
+
+    (2)   ISO-8859-X -- where "X" is to be replaced, as
+          necessary, for the parts of ISO-8859 [ISO-8859].  Note
+          that the ISO 646 character sets have deliberately been
+          omitted in favor of their 8859 replacements, which are
+          the designated character sets for Internet mail.  As of
+          the publication of this document, the legitimate values
+          for "X" are the digits 1 through 10.
+
+
+
+
+Freed & Borenstein          Standards Track                     [Page 9]
+
+RFC 2046                      Media Types                  November 1996
+
+
+   Characters in the range 128-159 has no assigned meaning in ISO-8859-
+   X.  Characters with values below 128 in ISO-8859-X have the same
+   assigned meaning as they do in US-ASCII.
+
+   Part 6 of ISO 8859 (Latin/Arabic alphabet) and part 8 (Latin/Hebrew
+   alphabet) includes both characters for which the normal writing
+   direction is right to left and characters for which it is left to
+   right, but do not define a canonical ordering method for representing
+   bi-directional text.  The charset values "ISO-8859-6" and "ISO-8859-
+   8", however, specify that the visual method is used [RFC-1556].
+
+   All of these character sets are used as pure 7bit or 8bit sets
+   without any shift or escape functions.  The meaning of shift and
+   escape sequences in these character sets is not defined.
+
+   The character sets specified above are the ones that were relatively
+   uncontroversial during the drafting of MIME.  This document does not
+   endorse the use of any particular character set other than US-ASCII,
+   and recognizes that the future evolution of world character sets
+   remains unclear.
+
+   Note that the character set used, if anything other than US- ASCII,
+   must always be explicitly specified in the Content-Type field.
+
+   No character set name other than those defined above may be used in
+   Internet mail without the publication of a formal specification and
+   its registration with IANA, or by private agreement, in which case
+   the character set name must begin with "X-".
+
+   Implementors are discouraged from defining new character sets unless
+   absolutely necessary.
+
+   The "charset" parameter has been defined primarily for the purpose of
+   textual data, and is described in this section for that reason.
+   However, it is conceivable that non-textual data might also wish to
+   specify a charset value for some purpose, in which case the same
+   syntax and values should be used.
+
+   In general, composition software should always use the "lowest common
+   denominator" character set possible.  For example, if a body contains
+   only US-ASCII characters, it SHOULD be marked as being in the US-
+   ASCII character set, not ISO-8859-1, which, like all the ISO-8859
+   family of character sets, is a superset of US-ASCII.  More generally,
+   if a widely-used character set is a subset of another character set,
+   and a body contains only characters in the widely-used subset, it
+   should be labelled as being in that subset.  This will increase the
+   chances that the recipient will be able to view the resulting entity
+   correctly.
+
+
+
+Freed & Borenstein          Standards Track                    [Page 10]
+
+RFC 2046                      Media Types                  November 1996
+
+
+4.1.3.  Plain Subtype
+
+   The simplest and most important subtype of "text" is "plain".  This
+   indicates plain text that does not contain any formatting commands or
+   directives. Plain text is intended to be displayed "as-is", that is,
+   no interpretation of embedded formatting commands, font attribute
+   specifications, processing instructions, interpretation directives,
+   or content markup should be necessary for proper display.  The
+   default media type of "text/plain; charset=us-ascii" for Internet
+   mail describes existing Internet practice.  That is, it is the type
+   of body defined by RFC 822.
+
+   No other "text" subtype is defined by this document.
+
+4.1.4.  Unrecognized Subtypes
+
+   Unrecognized subtypes of "text" should be treated as subtype "plain"
+   as long as the MIME implementation knows how to handle the charset.
+   Unrecognized subtypes which also specify an unrecognized charset
+   should be treated as "application/octet- stream".
+
+4.2.  Image Media Type
+
+   A media type of "image" indicates that the body contains an image.
+   The subtype names the specific image format.  These names are not
+   case sensitive. An initial subtype is "jpeg" for the JPEG format
+   using JFIF encoding [JPEG].
+
+   The list of "image" subtypes given here is neither exclusive nor
+   exhaustive, and is expected to grow as more types are registered with
+   IANA, as described in RFC 2048.
+
+   Unrecognized subtypes of "image" should at a miniumum be treated as
+   "application/octet-stream".  Implementations may optionally elect to
+   pass subtypes of "image" that they do not specifically recognize to a
+   secure and robust general-purpose image viewing application, if such
+   an application is available.
+
+   NOTE: Using of a generic-purpose image viewing application this way
+   inherits the security problems of the most dangerous type supported
+   by the application.
+
+4.3.  Audio Media Type
+
+   A media type of "audio" indicates that the body contains audio data.
+   Although there is not yet a consensus on an "ideal" audio format for
+   use with computers, there is a pressing need for a format capable of
+   providing interoperable behavior.
+
+
+
+Freed & Borenstein          Standards Track                    [Page 11]
+
+RFC 2046                      Media Types                  November 1996
+
+
+   The initial subtype of "basic" is specified to meet this requirement
+   by providing an absolutely minimal lowest common denominator audio
+   format.  It is expected that richer formats for higher quality and/or
+   lower bandwidth audio will be defined by a later document.
+
+   The content of the "audio/basic" subtype is single channel audio
+   encoded using 8bit ISDN mu-law [PCM] at a sample rate of 8000 Hz.
+
+   Unrecognized subtypes of "audio" should at a miniumum be treated as
+   "application/octet-stream".  Implementations may optionally elect to
+   pass subtypes of "audio" that they do not specifically recognize to a
+   robust general-purpose audio playing application, if such an
+   application is available.
+
+4.4.  Video Media Type
+
+   A media type of "video" indicates that the body contains a time-
+   varying-picture image, possibly with color and coordinated sound.
+   The term 'video' is used in its most generic sense, rather than with
+   reference to any particular technology or format, and is not meant to
+   preclude subtypes such as animated drawings encoded compactly.  The
+   subtype "mpeg" refers to video coded according to the MPEG standard
+   [MPEG].
+
+   Note that although in general this document strongly discourages the
+   mixing of multiple media in a single body, it is recognized that many
+   so-called video formats include a representation for synchronized
+   audio, and this is explicitly permitted for subtypes of "video".
+
+   Unrecognized subtypes of "video" should at a minumum be treated as
+   "application/octet-stream".  Implementations may optionally elect to
+   pass subtypes of "video" that they do not specifically recognize to a
+   robust general-purpose video display application, if such an
+   application is available.
+
+4.5.  Application Media Type
+
+   The "application" media type is to be used for discrete data which do
+   not fit in any of the other categories, and particularly for data to
+   be processed by some type of application program.  This is
+   information which must be processed by an application before it is
+   viewable or usable by a user.  Expected uses for the "application"
+   media type include file transfer, spreadsheets, data for mail-based
+   scheduling systems, and languages for "active" (computational)
+   material.  (The latter, in particular, can pose security problems
+   which must be understood by implementors, and are considered in
+   detail in the discussion of the "application/PostScript" media type.)
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 12]
+
+RFC 2046                      Media Types                  November 1996
+
+
+   For example, a meeting scheduler might define a standard
+   representation for information about proposed meeting dates.  An
+   intelligent user agent would use this information to conduct a dialog
+   with the user, and might then send additional material based on that
+   dialog.  More generally, there have been several "active" messaging
+   languages developed in which programs in a suitably specialized
+   language are transported to a remote location and automatically run
+   in the recipient's environment.
+
+   Such applications may be defined as subtypes of the "application"
+   media type. This document defines two subtypes:
+
+   octet-stream, and PostScript.
+
+   The subtype of "application" will often be either the name or include
+   part of the name of the application for which the data are intended.
+   This does not mean, however, that any application program name may be
+   used freely as a subtype of "application".
+
+4.5.1.  Octet-Stream Subtype
+
+   The "octet-stream" subtype is used to indicate that a body contains
+   arbitrary binary data.  The set of currently defined parameters is:
+
+    (1)   TYPE -- the general type or category of binary data.
+          This is intended as information for the human recipient
+          rather than for any automatic processing.
+
+    (2)   PADDING -- the number of bits of padding that were
+          appended to the bit-stream comprising the actual
+          contents to produce the enclosed 8bit byte-oriented
+          data.  This is useful for enclosing a bit-stream in a
+          body when the total number of bits is not a multiple of
+          8.
+
+   Both of these parameters are optional.
+
+   An additional parameter, "CONVERSIONS", was defined in RFC 1341 but
+   has since been removed.  RFC 1341 also defined the use of a "NAME"
+   parameter which gave a suggested file name to be used if the data
+   were to be written to a file.  This has been deprecated in
+   anticipation of a separate Content-Disposition header field, to be
+   defined in a subsequent RFC.
+
+   The recommended action for an implementation that receives an
+   "application/octet-stream" entity is to simply offer to put the data
+   in a file, with any Content-Transfer-Encoding undone, or perhaps to
+   use it as input to a user-specified process.
+
+
+
+Freed & Borenstein          Standards Track                    [Page 13]
+
+RFC 2046                      Media Types                  November 1996
+
+
+   To reduce the danger of transmitting rogue programs, it is strongly
+   recommended that implementations NOT implement a path-search
+   mechanism whereby an arbitrary program named in the Content-Type
+   parameter (e.g., an "interpreter=" parameter) is found and executed
+   using the message body as input.
+
+4.5.2.  PostScript Subtype
+
+   A media type of "application/postscript" indicates a PostScript
+   program.  Currently two variants of the PostScript language are
+   allowed; the original level 1 variant is described in [POSTSCRIPT]
+   and the more recent level 2 variant is described in [POSTSCRIPT2].
+
+   PostScript is a registered trademark of Adobe Systems, Inc.  Use of
+   the MIME media type "application/postscript" implies recognition of
+   that trademark and all the rights it entails.
+
+   The PostScript language definition provides facilities for internal
+   labelling of the specific language features a given program uses.
+   This labelling, called the PostScript document structuring
+   conventions, or DSC, is very general and provides substantially more
+   information than just the language level.  The use of document
+   structuring conventions, while not required, is strongly recommended
+   as an aid to interoperability.  Documents which lack proper
+   structuring conventions cannot be tested to see whether or not they
+   will work in a given environment.  As such, some systems may assume
+   the worst and refuse to process unstructured documents.
+
+   The execution of general-purpose PostScript interpreters entails
+   serious security risks, and implementors are discouraged from simply
+   sending PostScript bodies to "off- the-shelf" interpreters.  While it
+   is usually safe to send PostScript to a printer, where the potential
+   for harm is greatly constrained by typical printer environments,
+   implementors should consider all of the following before they add
+   interactive display of PostScript bodies to their MIME readers.
+
+   The remainder of this section outlines some, though probably not all,
+   of the possible problems with the transport of PostScript entities.
+
+    (1)   Dangerous operations in the PostScript language
+          include, but may not be limited to, the PostScript
+          operators "deletefile", "renamefile", "filenameforall",
+          and "file".  "File" is only dangerous when applied to
+          something other than standard input or output.
+          Implementations may also define additional nonstandard
+          file operators; these may also pose a threat to
+          security. "Filenameforall", the wildcard file search
+          operator, may appear at first glance to be harmless.
+
+
+
+Freed & Borenstein          Standards Track                    [Page 14]
+
+RFC 2046                      Media Types                  November 1996
+
+
+          Note, however, that this operator has the potential to
+          reveal information about what files the recipient has
+          access to, and this information may itself be
+          sensitive.  Message senders should avoid the use of
+          potentially dangerous file operators, since these
+          operators are quite likely to be unavailable in secure
+          PostScript implementations.  Message receiving and
+          displaying software should either completely disable
+          all potentially dangerous file operators or take
+          special care not to delegate any special authority to
+          their operation.  These operators should be viewed as
+          being done by an outside agency when interpreting
+          PostScript documents.  Such disabling and/or checking
+          should be done completely outside of the reach of the
+          PostScript language itself; care should be taken to
+          insure that no method exists for re-enabling full-
+          function versions of these operators.
+
+    (2)   The PostScript language provides facilities for exiting
+          the normal interpreter, or server, loop.  Changes made
+          in this "outer" environment are customarily retained
+          across documents, and may in some cases be retained
+          semipermanently in nonvolatile memory.  The operators
+          associated with exiting the interpreter loop have the
+          potential to interfere with subsequent document
+          processing.  As such, their unrestrained use
+          constitutes a threat of service denial.  PostScript
+          operators that exit the interpreter loop include, but
+          may not be limited to, the exitserver and startjob
+          operators.  Message sending software should not
+          generate PostScript that depends on exiting the
+          interpreter loop to operate, since the ability to exit
+          will probably be unavailable in secure PostScript
+          implementations.  Message receiving and displaying
+          software should completely disable the ability to make
+          retained changes to the PostScript environment by
+          eliminating or disabling the "startjob" and
+          "exitserver" operations.  If these operations cannot be
+          eliminated or completely disabled the password
+          associated with them should at least be set to a hard-
+          to-guess value.
+
+    (3)   PostScript provides operators for setting system-wide
+          and device-specific parameters.  These parameter
+          settings may be retained across jobs and may
+          potentially pose a threat to the correct operation of
+          the interpreter.  The PostScript operators that set
+          system and device parameters include, but may not be
+
+
+
+Freed & Borenstein          Standards Track                    [Page 15]
+
+RFC 2046                      Media Types                  November 1996
+
+
+          limited to, the "setsystemparams" and "setdevparams"
+          operators.  Message sending software should not
+          generate PostScript that depends on the setting of
+          system or device parameters to operate correctly.  The
+          ability to set these parameters will probably be
+          unavailable in secure PostScript implementations.
+          Message receiving and displaying software should
+          disable the ability to change system and device
+          parameters.  If these operators cannot be completely
+          disabled the password associated with them should at
+          least be set to a hard-to-guess value.
+
+    (4)   Some PostScript implementations provide nonstandard
+          facilities for the direct loading and execution of
+          machine code.  Such facilities are quite obviously open
+          to substantial abuse.  Message sending software should
+          not make use of such features.  Besides being totally
+          hardware-specific, they are also likely to be
+          unavailable in secure implementations of PostScript.
+          Message receiving and displaying software should not
+          allow such operators to be used if they exist.
+
+    (5)   PostScript is an extensible language, and many, if not
+          most, implementations of it provide a number of their
+          own extensions.  This document does not deal with such
+          extensions explicitly since they constitute an unknown
+          factor.  Message sending software should not make use
+          of nonstandard extensions; they are likely to be
+          missing from some implementations.  Message receiving
+          and displaying software should make sure that any
+          nonstandard PostScript operators are secure and don't
+          present any kind of threat.
+
+    (6)   It is possible to write PostScript that consumes huge
+          amounts of various system resources.  It is also
+          possible to write PostScript programs that loop
+          indefinitely.  Both types of programs have the
+          potential to cause damage if sent to unsuspecting
+          recipients.  Message-sending software should avoid the
+          construction and dissemination of such programs, which
+          is antisocial.  Message receiving and displaying
+          software should provide appropriate mechanisms to abort
+          processing after a reasonable amount of time has
+          elapsed. In addition, PostScript interpreters should be
+          limited to the consumption of only a reasonable amount
+          of any given system resource.
+
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 16]
+
+RFC 2046                      Media Types                  November 1996
+
+
+    (7)   It is possible to include raw binary information inside
+          PostScript in various forms.  This is not recommended
+          for use in Internet mail, both because it is not
+          supported by all PostScript interpreters and because it
+          significantly complicates the use of a MIME Content-
+          Transfer-Encoding.  (Without such binary, PostScript
+          may typically be viewed as line-oriented data.  The
+          treatment of CRLF sequences becomes extremely
+          problematic if binary and line-oriented data are mixed
+          in a single Postscript data stream.)
+
+    (8)   Finally, bugs may exist in some PostScript interpreters
+          which could possibly be exploited to gain unauthorized
+          access to a recipient's system.  Apart from noting this
+          possibility, there is no specific action to take to
+          prevent this, apart from the timely correction of such
+          bugs if any are found.
+
+4.5.3.  Other Application Subtypes
+
+   It is expected that many other subtypes of "application" will be
+   defined in the future.  MIME implementations must at a minimum treat
+   any unrecognized subtypes as being equivalent to "application/octet-
+   stream".
+
+5.  Composite Media Type Values
+
+   The remaining two of the seven initial Content-Type values refer to
+   composite entities.  Composite entities are handled using MIME
+   mechanisms -- a MIME processor typically handles the body directly.
+
+5.1.  Multipart Media Type
+
+   In the case of multipart entities, in which one or more different
+   sets of data are combined in a single body, a "multipart" media type
+   field must appear in the entity's header.  The body must then contain
+   one or more body parts, each preceded by a boundary delimiter line,
+   and the last one followed by a closing boundary delimiter line.
+   After its boundary delimiter line, each body part then consists of a
+   header area, a blank line, and a body area.  Thus a body part is
+   similar to an RFC 822 message in syntax, but different in meaning.
+
+   A body part is an entity and hence is NOT to be interpreted as
+   actually being an RFC 822 message.  To begin with, NO header fields
+   are actually required in body parts.  A body part that starts with a
+   blank line, therefore, is allowed and is a body part for which all
+   default values are to be assumed.  In such a case, the absence of a
+   Content-Type header usually indicates that the corresponding body has
+
+
+
+Freed & Borenstein          Standards Track                    [Page 17]
+
+RFC 2046                      Media Types                  November 1996
+
+
+   a content-type of "text/plain; charset=US-ASCII".
+
+   The only header fields that have defined meaning for body parts are
+   those the names of which begin with "Content-".  All other header
+   fields may be ignored in body parts.  Although they should generally
+   be retained if at all possible, they may be discarded by gateways if
+   necessary.  Such other fields are permitted to appear in body parts
+   but must not be depended on.  "X-" fields may be created for
+   experimental or private purposes, with the recognition that the
+   information they contain may be lost at some gateways.
+
+   NOTE:  The distinction between an RFC 822 message and a body part is
+   subtle, but important.  A gateway between Internet and X.400 mail,
+   for example, must be able to tell the difference between a body part
+   that contains an image and a body part that contains an encapsulated
+   message, the body of which is a JPEG image.  In order to represent
+   the latter, the body part must have "Content-Type: message/rfc822",
+   and its body (after the blank line) must be the encapsulated message,
+   with its own "Content-Type: image/jpeg" header field.  The use of
+   similar syntax facilitates the conversion of messages to body parts,
+   and vice versa, but the distinction between the two must be
+   understood by implementors.  (For the special case in which parts
+   actually are messages, a "digest" subtype is also defined.)
+
+   As stated previously, each body part is preceded by a boundary
+   delimiter line that contains the boundary delimiter.  The boundary
+   delimiter MUST NOT appear inside any of the encapsulated parts, on a
+   line by itself or as the prefix of any line.  This implies that it is
+   crucial that the composing agent be able to choose and specify a
+   unique boundary parameter value that does not contain the boundary
+   parameter value of an enclosing multipart as a prefix.
+
+   All present and future subtypes of the "multipart" type must use an
+   identical syntax.  Subtypes may differ in their semantics, and may
+   impose additional restrictions on syntax, but must conform to the
+   required syntax for the "multipart" type.  This requirement ensures
+   that all conformant user agents will at least be able to recognize
+   and separate the parts of any multipart entity, even those of an
+   unrecognized subtype.
+
+   As stated in the definition of the Content-Transfer-Encoding field
+   [RFC 2045], no encoding other than "7bit", "8bit", or "binary" is
+   permitted for entities of type "multipart".  The "multipart" boundary
+   delimiters and header fields are always represented as 7bit US-ASCII
+   in any case (though the header fields may encode non-US-ASCII header
+   text as per RFC 2047) and data within the body parts can be encoded
+   on a part-by-part basis, with Content-Transfer-Encoding fields for
+   each appropriate body part.
+
+
+
+Freed & Borenstein          Standards Track                    [Page 18]
+
+RFC 2046                      Media Types                  November 1996
+
+
+5.1.1.  Common Syntax
+
+   This section defines a common syntax for subtypes of "multipart".
+   All subtypes of "multipart" must use this syntax.  A simple example
+   of a multipart message also appears in this section.  An example of a
+   more complex multipart message is given in RFC 2049.
+
+   The Content-Type field for multipart entities requires one parameter,
+   "boundary". The boundary delimiter line is then defined as a line
+   consisting entirely of two hyphen characters ("-", decimal value 45)
+   followed by the boundary parameter value from the Content-Type header
+   field, optional linear whitespace, and a terminating CRLF.
+
+   NOTE:  The hyphens are for rough compatibility with the earlier RFC
+   934 method of message encapsulation, and for ease of searching for
+   the boundaries in some implementations.  However, it should be noted
+   that multipart messages are NOT completely compatible with RFC 934
+   encapsulations; in particular, they do not obey RFC 934 quoting
+   conventions for embedded lines that begin with hyphens.  This
+   mechanism was chosen over the RFC 934 mechanism because the latter
+   causes lines to grow with each level of quoting.  The combination of
+   this growth with the fact that SMTP implementations sometimes wrap
+   long lines made the RFC 934 mechanism unsuitable for use in the event
+   that deeply-nested multipart structuring is ever desired.
+
+   WARNING TO IMPLEMENTORS:  The grammar for parameters on the Content-
+   type field is such that it is often necessary to enclose the boundary
+   parameter values in quotes on the Content-type line.  This is not
+   always necessary, but never hurts. Implementors should be sure to
+   study the grammar carefully in order to avoid producing invalid
+   Content-type fields.  Thus, a typical "multipart" Content-Type header
+   field might look like this:
+
+     Content-Type: multipart/mixed; boundary=gc0p4Jq0M2Yt08j34c0p
+
+   But the following is not valid:
+
+     Content-Type: multipart/mixed; boundary=gc0pJq0M:08jU534c0p
+
+   (because of the colon) and must instead be represented as
+
+     Content-Type: multipart/mixed; boundary="gc0pJq0M:08jU534c0p"
+
+   This Content-Type value indicates that the content consists of one or
+   more parts, each with a structure that is syntactically identical to
+   an RFC 822 message, except that the header area is allowed to be
+   completely empty, and that the parts are each preceded by the line
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 19]
+
+RFC 2046                      Media Types                  November 1996
+
+
+     --gc0pJq0M:08jU534c0p
+
+   The boundary delimiter MUST occur at the beginning of a line, i.e.,
+   following a CRLF, and the initial CRLF is considered to be attached
+   to the boundary delimiter line rather than part of the preceding
+   part.  The boundary may be followed by zero or more characters of
+   linear whitespace. It is then terminated by either another CRLF and
+   the header fields for the next part, or by two CRLFs, in which case
+   there are no header fields for the next part.  If no Content-Type
+   field is present it is assumed to be "message/rfc822" in a
+   "multipart/digest" and "text/plain" otherwise.
+
+   NOTE:  The CRLF preceding the boundary delimiter line is conceptually
+   attached to the boundary so that it is possible to have a part that
+   does not end with a CRLF (line  break).  Body parts that must be
+   considered to end with line breaks, therefore, must have two CRLFs
+   preceding the boundary delimiter line, the first of which is part of
+   the preceding body part, and the second of which is part of the
+   encapsulation boundary.
+
+   Boundary delimiters must not appear within the encapsulated material,
+   and must be no longer than 70 characters, not counting the two
+   leading hyphens.
+
+   The boundary delimiter line following the last body part is a
+   distinguished delimiter that indicates that no further body parts
+   will follow.  Such a delimiter line is identical to the previous
+   delimiter lines, with the addition of two more hyphens after the
+   boundary parameter value.
+
+     --gc0pJq0M:08jU534c0p--
+
+   NOTE TO IMPLEMENTORS:  Boundary string comparisons must compare the
+   boundary value with the beginning of each candidate line.  An exact
+   match of the entire candidate line is not required; it is sufficient
+   that the boundary appear in its entirety following the CRLF.
+
+   There appears to be room for additional information prior to the
+   first boundary delimiter line and following the final boundary
+   delimiter line.  These areas should generally be left blank, and
+   implementations must ignore anything that appears before the first
+   boundary delimiter line or after the last one.
+
+   NOTE:  These "preamble" and "epilogue" areas are generally not used
+   because of the lack of proper typing of these parts and the lack of
+   clear semantics for handling these areas at gateways, particularly
+   X.400 gateways.  However, rather than leaving the preamble area
+   blank, many MIME implementations have found this to be a convenient
+
+
+
+Freed & Borenstein          Standards Track                    [Page 20]
+
+RFC 2046                      Media Types                  November 1996
+
+
+   place to insert an explanatory note for recipients who read the
+   message with pre-MIME software, since such notes will be ignored by
+   MIME-compliant software.
+
+   NOTE:  Because boundary delimiters must not appear in the body parts
+   being encapsulated, a user agent must exercise care to choose a
+   unique boundary parameter value.  The boundary parameter value in the
+   example above could have been the result of an algorithm designed to
+   produce boundary delimiters with a very low probability of already
+   existing in the data to be encapsulated without having to prescan the
+   data.  Alternate algorithms might result in more "readable" boundary
+   delimiters for a recipient with an old user agent, but would require
+   more attention to the possibility that the boundary delimiter might
+   appear at the beginning of some line in the encapsulated part.  The
+   simplest boundary delimiter line possible is something like "---",
+   with a closing boundary delimiter line of "-----".
+
+   As a very simple example, the following multipart message has two
+   parts, both of them plain text, one of them explicitly typed and one
+   of them implicitly typed:
+
+     From: Nathaniel Borenstein <nsb@bellcore.com>
+     To: Ned Freed <ned@innosoft.com>
+     Date: Sun, 21 Mar 1993 23:56:48 -0800 (PST)
+     Subject: Sample message
+     MIME-Version: 1.0
+     Content-type: multipart/mixed; boundary="simple boundary"
+
+     This is the preamble.  It is to be ignored, though it
+     is a handy place for composition agents to include an
+     explanatory note to non-MIME conformant readers.
+
+     --simple boundary
+
+     This is implicitly typed plain US-ASCII text.
+     It does NOT end with a linebreak.
+     --simple boundary
+     Content-type: text/plain; charset=us-ascii
+
+     This is explicitly typed plain US-ASCII text.
+     It DOES end with a linebreak.
+
+     --simple boundary--
+
+     This is the epilogue.  It is also to be ignored.
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 21]
+
+RFC 2046                      Media Types                  November 1996
+
+
+   The use of a media type of "multipart" in a body part within another
+   "multipart" entity is explicitly allowed.  In such cases, for obvious
+   reasons, care must be taken to ensure that each nested "multipart"
+   entity uses a different boundary delimiter.  See RFC 2049 for an
+   example of nested "multipart" entities.
+
+   The use of the "multipart" media type with only a single body part
+   may be useful in certain contexts, and is explicitly permitted.
+
+   NOTE: Experience has shown that a "multipart" media type with a
+   single body part is useful for sending non-text media types.  It has
+   the advantage of providing the preamble as a place to include
+   decoding instructions.  In addition, a number of SMTP gateways move
+   or remove the MIME headers, and a clever MIME decoder can take a good
+   guess at multipart boundaries even in the absence of the Content-Type
+   header and thereby successfully decode the message.
+
+   The only mandatory global parameter for the "multipart" media type is
+   the boundary parameter, which consists of 1 to 70 characters from a
+   set of characters known to be very robust through mail gateways, and
+   NOT ending with white space. (If a boundary delimiter line appears to
+   end with white space, the white space must be presumed to have been
+   added by a gateway, and must be deleted.)  It is formally specified
+   by the following BNF:
+
+     boundary := 0*69<bchars> bcharsnospace
+
+     bchars := bcharsnospace / " "
+
+     bcharsnospace := DIGIT / ALPHA / "'" / "(" / ")" /
+                      "+" / "_" / "," / "-" / "." /
+                      "/" / ":" / "=" / "?"
+
+   Overall, the body of a "multipart" entity may be specified as
+   follows:
+
+     dash-boundary := "--" boundary
+                      ; boundary taken from the value of
+                      ; boundary parameter of the
+                      ; Content-Type field.
+
+     multipart-body := [preamble CRLF]
+                       dash-boundary transport-padding CRLF
+                       body-part *encapsulation
+                       close-delimiter transport-padding
+                       [CRLF epilogue]
+
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 22]
+
+RFC 2046                      Media Types                  November 1996
+
+
+     transport-padding := *LWSP-char
+                          ; Composers MUST NOT generate
+                          ; non-zero length transport
+                          ; padding, but receivers MUST
+                          ; be able to handle padding
+                          ; added by message transports.
+
+     encapsulation := delimiter transport-padding
+                      CRLF body-part
+
+     delimiter := CRLF dash-boundary
+
+     close-delimiter := delimiter "--"
+
+     preamble := discard-text
+
+     epilogue := discard-text
+
+     discard-text := *(*text CRLF) *text
+                     ; May be ignored or discarded.
+
+     body-part := MIME-part-headers [CRLF *OCTET]
+                  ; Lines in a body-part must not start
+                  ; with the specified dash-boundary and
+                  ; the delimiter must not appear anywhere
+                  ; in the body part.  Note that the
+                  ; semantics of a body-part differ from
+                  ; the semantics of a message, as
+                  ; described in the text.
+
+     OCTET := <any 0-255 octet value>
+
+   IMPORTANT:  The free insertion of linear-white-space and RFC 822
+   comments between the elements shown in this BNF is NOT allowed since
+   this BNF does not specify a structured header field.
+
+   NOTE:  In certain transport enclaves, RFC 822 restrictions such as
+   the one that limits bodies to printable US-ASCII characters may not
+   be in force. (That is, the transport domains may exist that resemble
+   standard Internet mail transport as specified in RFC 821 and assumed
+   by RFC 822, but without certain restrictions.) The relaxation of
+   these restrictions should be construed as locally extending the
+   definition of bodies, for example to include octets outside of the
+   US-ASCII range, as long as these extensions are supported by the
+   transport and adequately documented in the Content- Transfer-Encoding
+   header field.  However, in no event are headers (either message
+   headers or body part headers) allowed to contain anything other than
+   US-ASCII characters.
+
+
+
+Freed & Borenstein          Standards Track                    [Page 23]
+
+RFC 2046                      Media Types                  November 1996
+
+
+   NOTE:  Conspicuously missing from the "multipart" type is a notion of
+   structured, related body parts. It is recommended that those wishing
+   to provide more structured or integrated multipart messaging
+   facilities should define subtypes of multipart that are syntactically
+   identical but define relationships between the various parts. For
+   example, subtypes of multipart could be defined that include a
+   distinguished part which in turn is used to specify the relationships
+   between the other parts, probably referring to them by their
+   Content-ID field.  Old implementations will not recognize the new
+   subtype if this approach is used, but will treat it as
+   multipart/mixed and will thus be able to show the user the parts that
+   are recognized.
+
+5.1.2.  Handling Nested Messages and Multiparts
+
+   The "message/rfc822" subtype defined in a subsequent section of this
+   document has no terminating condition other than running out of data.
+   Similarly, an improperly truncated "multipart" entity may not have
+   any terminating boundary marker, and can turn up operationally due to
+   mail system malfunctions.
+
+   It is essential that such entities be handled correctly when they are
+   themselves imbedded inside of another "multipart" structure.  MIME
+   implementations are therefore required to recognize outer level
+   boundary markers at ANY level of inner nesting.  It is not sufficient
+   to only check for the next expected marker or other terminating
+   condition.
+
+5.1.3.  Mixed Subtype
+
+   The "mixed" subtype of "multipart" is intended for use when the body
+   parts are independent and need to be bundled in a particular order.
+   Any "multipart" subtypes that an implementation does not recognize
+   must be treated as being of subtype "mixed".
+
+5.1.4.  Alternative Subtype
+
+   The "multipart/alternative" type is syntactically identical to
+   "multipart/mixed", but the semantics are different.  In particular,
+   each of the body parts is an "alternative" version of the same
+   information.
+
+   Systems should recognize that the content of the various parts are
+   interchangeable.  Systems should choose the "best" type based on the
+   local environment and references, in some cases even through user
+   interaction.  As with "multipart/mixed", the order of body parts is
+   significant.  In this case, the alternatives appear in an order of
+   increasing faithfulness to the original content.  In general, the
+
+
+
+Freed & Borenstein          Standards Track                    [Page 24]
+
+RFC 2046                      Media Types                  November 1996
+
+
+   best choice is the LAST part of a type supported by the recipient
+   system's local environment.
+
+   "Multipart/alternative" may be used, for example, to send a message
+   in a fancy text format in such a way that it can easily be displayed
+   anywhere:
+
+     From: Nathaniel Borenstein <nsb@bellcore.com>
+     To: Ned Freed <ned@innosoft.com>
+     Date: Mon, 22 Mar 1993 09:41:09 -0800 (PST)
+     Subject: Formatted text mail
+     MIME-Version: 1.0
+     Content-Type: multipart/alternative; boundary=boundary42
+
+     --boundary42
+     Content-Type: text/plain; charset=us-ascii
+
+       ... plain text version of message goes here ...
+
+     --boundary42
+     Content-Type: text/enriched
+
+       ... RFC 1896 text/enriched version of same message
+           goes here ...
+
+     --boundary42
+     Content-Type: application/x-whatever
+
+       ... fanciest version of same message goes here ...
+
+     --boundary42--
+
+   In this example, users whose mail systems understood the
+   "application/x-whatever" format would see only the fancy version,
+   while other users would see only the enriched or plain text version,
+   depending on the capabilities of their system.
+
+   In general, user agents that compose "multipart/alternative" entities
+   must place the body parts in increasing order of preference, that is,
+   with the preferred format last.  For fancy text, the sending user
+   agent should put the plainest format first and the richest format
+   last.  Receiving user agents should pick and display the last format
+   they are capable of displaying.  In the case where one of the
+   alternatives is itself of type "multipart" and contains unrecognized
+   sub-parts, the user agent may choose either to show that alternative,
+   an earlier alternative, or both.
+
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 25]
+
+RFC 2046                      Media Types                  November 1996
+
+
+   NOTE: From an implementor's perspective, it might seem more sensible
+   to reverse this ordering, and have the plainest alternative last.
+   However, placing the plainest alternative first is the friendliest
+   possible option when "multipart/alternative" entities are viewed
+   using a non-MIME-conformant viewer.  While this approach does impose
+   some burden on conformant MIME viewers, interoperability with older
+   mail readers was deemed to be more important in this case.
+
+   It may be the case that some user agents, if they can recognize more
+   than one of the formats, will prefer to offer the user the choice of
+   which format to view.  This makes sense, for example, if a message
+   includes both a nicely- formatted image version and an easily-edited
+   text version.  What is most critical, however, is that the user not
+   automatically be shown multiple versions of the same data.  Either
+   the user should be shown the last recognized version or should be
+   given the choice.
+
+   THE SEMANTICS OF CONTENT-ID IN MULTIPART/ALTERNATIVE:  Each part of a
+   "multipart/alternative" entity represents the same data, but the
+   mappings between the two are not necessarily without information
+   loss.  For example, information is lost when translating ODA to
+   PostScript or plain text.  It is recommended that each part should
+   have a different Content-ID value in the case where the information
+   content of the two parts is not identical.  And when the information
+   content is identical -- for example, where several parts of type
+   "message/external-body" specify alternate ways to access the
+   identical data -- the same Content-ID field value should be used, to
+   optimize any caching mechanisms that might be present on the
+   recipient's end.  However, the Content-ID values used by the parts
+   should NOT be the same Content-ID value that describes the
+   "multipart/alternative" as a whole, if there is any such Content-ID
+   field.  That is, one Content-ID value will refer to the
+   "multipart/alternative" entity, while one or more other Content-ID
+   values will refer to the parts inside it.
+
+5.1.5.  Digest Subtype
+
+   This document defines a "digest" subtype of the "multipart" Content-
+   Type.  This type is syntactically identical to "multipart/mixed", but
+   the semantics are different.  In particular, in a digest, the default
+   Content-Type value for a body part is changed from "text/plain" to
+   "message/rfc822".  This is done to allow a more readable digest
+   format that is largely compatible (except for the quoting convention)
+   with RFC 934.
+
+   Note: Though it is possible to specify a Content-Type value for a
+   body part in a digest which is other than "message/rfc822", such as a
+   "text/plain" part containing a description of the material in the
+
+
+
+Freed & Borenstein          Standards Track                    [Page 26]
+
+RFC 2046                      Media Types                  November 1996
+
+
+   digest, actually doing so is undesireble. The "multipart/digest"
+   Content-Type is intended to be used to send collections of messages.
+   If a "text/plain" part is needed, it should be included as a seperate
+   part of a "multipart/mixed" message.
+
+   A digest in this format might, then, look something like this:
+
+     From: Moderator-Address
+     To: Recipient-List
+     Date: Mon, 22 Mar 1994 13:34:51 +0000
+     Subject: Internet Digest, volume 42
+     MIME-Version: 1.0
+     Content-Type: multipart/mixed;
+                   boundary="---- main boundary ----"
+
+     ------ main boundary ----
+
+       ...Introductory text or table of contents...
+
+     ------ main boundary ----
+     Content-Type: multipart/digest;
+                   boundary="---- next message ----"
+
+     ------ next message ----
+
+     From: someone-else
+     Date: Fri, 26 Mar 1993 11:13:32 +0200
+     Subject: my opinion
+
+       ...body goes here ...
+
+     ------ next message ----
+
+     From: someone-else-again
+     Date: Fri, 26 Mar 1993 10:07:13 -0500
+     Subject: my different opinion
+
+       ... another body goes here ...
+
+     ------ next message ------
+
+     ------ main boundary ------
+
+5.1.6.  Parallel Subtype
+
+   This document defines a "parallel" subtype of the "multipart"
+   Content-Type.  This type is syntactically identical to
+   "multipart/mixed", but the semantics are different.  In particular,
+
+
+
+Freed & Borenstein          Standards Track                    [Page 27]
+
+RFC 2046                      Media Types                  November 1996
+
+
+   in a parallel entity, the order of body parts is not significant.
+
+   A common presentation of this type is to display all of the parts
+   simultaneously on hardware and software that are capable of doing so.
+   However, composing agents should be aware that many mail readers will
+   lack this capability and will show the parts serially in any event.
+
+5.1.7.  Other Multipart Subtypes
+
+   Other "multipart" subtypes are expected in the future.  MIME
+   implementations must in general treat unrecognized subtypes of
+   "multipart" as being equivalent to "multipart/mixed".
+
+5.2.  Message Media Type
+
+   It is frequently desirable, in sending mail, to encapsulate another
+   mail message.  A special media type, "message", is defined to
+   facilitate this.  In particular, the "rfc822" subtype of "message" is
+   used to encapsulate RFC 822 messages.
+
+   NOTE:  It has been suggested that subtypes of "message" might be
+   defined for forwarded or rejected messages.  However, forwarded and
+   rejected messages can be handled as multipart messages in which the
+   first part contains any control or descriptive information, and a
+   second part, of type "message/rfc822", is the forwarded or rejected
+   message.  Composing rejection and forwarding messages in this manner
+   will preserve the type information on the original message and allow
+   it to be correctly presented to the recipient, and hence is strongly
+   encouraged.
+
+   Subtypes of "message" often impose restrictions on what encodings are
+   allowed.  These restrictions are described in conjunction with each
+   specific subtype.
+
+   Mail gateways, relays, and other mail handling agents are commonly
+   known to alter the top-level header of an RFC 822 message.  In
+   particular, they frequently add, remove, or reorder header fields.
+   These operations are explicitly forbidden for the encapsulated
+   headers embedded in the bodies of messages of type "message."
+
+5.2.1.  RFC822 Subtype
+
+   A media type of "message/rfc822" indicates that the body contains an
+   encapsulated message, with the syntax of an RFC 822 message.
+   However, unlike top-level RFC 822 messages, the restriction that each
+   "message/rfc822" body must include a "From", "Date", and at least one
+   destination header is removed and replaced with the requirement that
+   at least one of "From", "Subject", or "Date" must be present.
+
+
+
+Freed & Borenstein          Standards Track                    [Page 28]
+
+RFC 2046                      Media Types                  November 1996
+
+
+   It should be noted that, despite the use of the numbers "822", a
+   "message/rfc822" entity isn't restricted to material in strict
+   conformance to RFC822, nor are the semantics of "message/rfc822"
+   objects restricted to the semantics defined in RFC822. More
+   specifically, a "message/rfc822" message could well be a News article
+   or a MIME message.
+
+   No encoding other than "7bit", "8bit", or "binary" is permitted for
+   the body of a "message/rfc822" entity.  The message header fields are
+   always US-ASCII in any case, and data within the body can still be
+   encoded, in which case the Content-Transfer-Encoding header field in
+   the encapsulated message will reflect this.  Non-US-ASCII text in the
+   headers of an encapsulated message can be specified using the
+   mechanisms described in RFC 2047.
+
+5.2.2.  Partial Subtype
+
+   The "partial" subtype is defined to allow large entities to be
+   delivered as several separate pieces of mail and automatically
+   reassembled by a receiving user agent.  (The concept is similar to IP
+   fragmentation and reassembly in the basic Internet Protocols.)  This
+   mechanism can be used when intermediate transport agents limit the
+   size of individual messages that can be sent.  The media type
+   "message/partial" thus indicates that the body contains a fragment of
+   a larger entity.
+
+   Because data of type "message" may never be encoded in base64 or
+   quoted-printable, a problem might arise if "message/partial" entities
+   are constructed in an environment that supports binary or 8bit
+   transport.  The problem is that the binary data would be split into
+   multiple "message/partial" messages, each of them requiring binary
+   transport.  If such messages were encountered at a gateway into a
+   7bit transport environment, there would be no way to properly encode
+   them for the 7bit world, aside from waiting for all of the fragments,
+   reassembling the inner message, and then encoding the reassembled
+   data in base64 or quoted-printable.  Since it is possible that
+   different fragments might go through different gateways, even this is
+   not an acceptable solution.  For this reason, it is specified that
+   entities of type "message/partial" must always have a content-
+   transfer-encoding of 7bit (the default).  In particular, even in
+   environments that support binary or 8bit transport, the use of a
+   content- transfer-encoding of "8bit" or "binary" is explicitly
+   prohibited for MIME entities of type "message/partial". This in turn
+   implies that the inner message must not use "8bit" or "binary"
+   encoding.
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 29]
+
+RFC 2046                      Media Types                  November 1996
+
+
+   Because some message transfer agents may choose to automatically
+   fragment large messages, and because such agents may use very
+   different fragmentation thresholds, it is possible that the pieces of
+   a partial message, upon reassembly, may prove themselves to comprise
+   a partial message.  This is explicitly permitted.
+
+   Three parameters must be specified in the Content-Type field of type
+   "message/partial":  The first, "id", is a unique identifier, as close
+   to a world-unique identifier as possible, to be used to match the
+   fragments together. (In general, the identifier is essentially a
+   message-id; if placed in double quotes, it can be ANY message-id, in
+   accordance with the BNF for "parameter" given in RFC 2045.)  The
+   second, "number", an integer, is the fragment number, which indicates
+   where this fragment fits into the sequence of fragments.  The third,
+   "total", another integer, is the total number of fragments.  This
+   third subfield is required on the final fragment, and is optional
+   (though encouraged) on the earlier fragments.  Note also that these
+   parameters may be given in any order.
+
+   Thus, the second piece of a 3-piece message may have either of the
+   following header fields:
+
+     Content-Type: Message/Partial; number=2; total=3;
+                   id="oc=jpbe0M2Yt4s@thumper.bellcore.com"
+
+     Content-Type: Message/Partial;
+                   id="oc=jpbe0M2Yt4s@thumper.bellcore.com";
+                   number=2
+
+   But the third piece MUST specify the total number of fragments:
+
+     Content-Type: Message/Partial; number=3; total=3;
+                   id="oc=jpbe0M2Yt4s@thumper.bellcore.com"
+
+   Note that fragment numbering begins with 1, not 0.
+
+   When the fragments of an entity broken up in this manner are put
+   together, the result is always a complete MIME entity, which may have
+   its own Content-Type header field, and thus may contain any other
+   data type.
+
+5.2.2.1.  Message Fragmentation and Reassembly
+
+   The semantics of a reassembled partial message must be those of the
+   "inner" message, rather than of a message containing the inner
+   message.  This makes it possible, for example, to send a large audio
+   message as several partial messages, and still have it appear to the
+   recipient as a simple audio message rather than as an encapsulated
+
+
+
+Freed & Borenstein          Standards Track                    [Page 30]
+
+RFC 2046                      Media Types                  November 1996
+
+
+   message containing an audio message.  That is, the encapsulation of
+   the message is considered to be "transparent".
+
+   When generating and reassembling the pieces of a "message/partial"
+   message, the headers of the encapsulated message must be merged with
+   the headers of the enclosing entities.  In this process the following
+   rules must be observed:
+
+    (1)   Fragmentation agents must split messages at line
+          boundaries only. This restriction is imposed because
+          splits at points other than the ends of lines in turn
+          depends on message transports being able to preserve
+          the semantics of messages that don't end with a CRLF
+          sequence. Many transports are incapable of preserving
+          such semantics.
+
+    (2)   All of the header fields from the initial enclosing
+          message, except those that start with "Content-" and
+          the specific header fields "Subject", "Message-ID",
+          "Encrypted", and "MIME-Version", must be copied, in
+          order, to the new message.
+
+    (3)   The header fields in the enclosed message which start
+          with "Content-", plus the "Subject", "Message-ID",
+          "Encrypted", and "MIME-Version" fields, must be
+          appended, in order, to the header fields of the new
+          message.  Any header fields in the enclosed message
+          which do not start with "Content-" (except for the
+          "Subject", "Message-ID", "Encrypted", and "MIME-
+          Version" fields) will be ignored and dropped.
+
+    (4)   All of the header fields from the second and any
+          subsequent enclosing messages are discarded by the
+          reassembly process.
+
+5.2.2.2.  Fragmentation and Reassembly Example
+
+   If an audio message is broken into two pieces, the first piece might
+   look something like this:
+
+     X-Weird-Header-1: Foo
+     From: Bill@host.com
+     To: joe@otherhost.com
+     Date: Fri, 26 Mar 1993 12:59:38 -0500 (EST)
+     Subject: Audio mail (part 1 of 2)
+     Message-ID: <id1@host.com>
+     MIME-Version: 1.0
+     Content-type: message/partial; id="ABC@host.com";
+
+
+
+Freed & Borenstein          Standards Track                    [Page 31]
+
+RFC 2046                      Media Types                  November 1996
+
+
+                   number=1; total=2
+
+     X-Weird-Header-1: Bar
+     X-Weird-Header-2: Hello
+     Message-ID: <anotherid@foo.com>
+     Subject: Audio mail
+     MIME-Version: 1.0
+     Content-type: audio/basic
+     Content-transfer-encoding: base64
+
+       ... first half of encoded audio data goes here ...
+
+   and the second half might look something like this:
+
+     From: Bill@host.com
+     To: joe@otherhost.com
+     Date: Fri, 26 Mar 1993 12:59:38 -0500 (EST)
+     Subject: Audio mail (part 2 of 2)
+     MIME-Version: 1.0
+     Message-ID: <id2@host.com>
+     Content-type: message/partial;
+                   id="ABC@host.com"; number=2; total=2
+
+       ... second half of encoded audio data goes here ...
+
+   Then, when the fragmented message is reassembled, the resulting
+   message to be displayed to the user should look something like this:
+
+     X-Weird-Header-1: Foo
+     From: Bill@host.com
+     To: joe@otherhost.com
+     Date: Fri, 26 Mar 1993 12:59:38 -0500 (EST)
+     Subject: Audio mail
+     Message-ID: <anotherid@foo.com>
+     MIME-Version: 1.0
+     Content-type: audio/basic
+     Content-transfer-encoding: base64
+
+       ... first half of encoded audio data goes here ...
+       ... second half of encoded audio data goes here ...
+
+   The inclusion of a "References" field in the headers of the second
+   and subsequent pieces of a fragmented message that references the
+   Message-Id on the previous piece may be of benefit to mail readers
+   that understand and track references.  However, the generation of
+   such "References" fields is entirely optional.
+
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 32]
+
+RFC 2046                      Media Types                  November 1996
+
+
+   Finally, it should be noted that the "Encrypted" header field has
+   been made obsolete by Privacy Enhanced Messaging (PEM) [RFC-1421,
+   RFC-1422, RFC-1423, RFC-1424], but the rules above are nevertheless
+   believed to describe the correct way to treat it if it is encountered
+   in the context of conversion to and from "message/partial" fragments.
+
+5.2.3.  External-Body Subtype
+
+   The external-body subtype indicates that the actual body data are not
+   included, but merely referenced.  In this case, the parameters
+   describe a mechanism for accessing the external data.
+
+   When a MIME entity is of type "message/external-body", it consists of
+   a header, two consecutive CRLFs, and the message header for the
+   encapsulated message.  If another pair of consecutive CRLFs appears,
+   this of course ends the message header for the encapsulated message.
+   However, since the encapsulated message's body is itself external, it
+   does NOT appear in the area that follows.  For example, consider the
+   following message:
+
+     Content-type: message/external-body;
+                   access-type=local-file;
+                   name="/u/nsb/Me.jpeg"
+
+     Content-type: image/jpeg
+     Content-ID: <id42@guppylake.bellcore.com>
+     Content-Transfer-Encoding: binary
+
+     THIS IS NOT REALLY THE BODY!
+
+   The area at the end, which might be called the "phantom body", is
+   ignored for most external-body messages.  However, it may be used to
+   contain auxiliary information for some such messages, as indeed it is
+   when the access-type is "mail- server".  The only access-type defined
+   in this document that uses the phantom body is "mail-server", but
+   other access-types may be defined in the future in other
+   specifications that use this area.
+
+   The encapsulated headers in ALL "message/external-body" entities MUST
+   include a Content-ID header field to give a unique identifier by
+   which to reference the data.  This identifier may be used for caching
+   mechanisms, and for recognizing the receipt of the data when the
+   access-type is "mail-server".
+
+   Note that, as specified here, the tokens that describe external-body
+   data, such as file names and mail server commands, are required to be
+   in the US-ASCII character set.
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 33]
+
+RFC 2046                      Media Types                  November 1996
+
+
+   If this proves problematic in practice, a new mechanism may be
+   required as a future extension to MIME, either as newly defined
+   access-types for "message/external-body" or by some other mechanism.
+
+   As with "message/partial", MIME entities of type "message/external-
+   body" MUST have a content-transfer-encoding of 7bit (the default).
+   In particular, even in environments that support binary or 8bit
+   transport, the use of a content- transfer-encoding of "8bit" or
+   "binary" is explicitly prohibited for entities of type
+   "message/external-body".
+
+5.2.3.1.  General External-Body Parameters
+
+   The parameters that may be used with any "message/external- body"
+   are:
+
+    (1)   ACCESS-TYPE -- A word indicating the supported access
+          mechanism by which the file or data may be obtained.
+          This word is not case sensitive.  Values include, but
+          are not limited to, "FTP", "ANON-FTP", "TFTP", "LOCAL-
+          FILE", and "MAIL-SERVER".  Future values, except for
+          experimental values beginning with "X-", must be
+          registered with IANA, as described in RFC 2048.
+          This parameter is unconditionally mandatory and MUST be
+          present on EVERY "message/external-body".
+
+    (2)   EXPIRATION -- The date (in the RFC 822 "date-time"
+          syntax, as extended by RFC 1123 to permit 4 digits in
+          the year field) after which the existence of the
+          external data is not guaranteed.  This parameter may be
+          used with ANY access-type and is ALWAYS optional.
+
+    (3)   SIZE -- The size (in octets) of the data.  The intent
+          of this parameter is to help the recipient decide
+          whether or not to expend the necessary resources to
+          retrieve the external data.  Note that this describes
+          the size of the data in its canonical form, that is,
+          before any Content-Transfer-Encoding has been applied
+          or after the data have been decoded.  This parameter
+          may be used with ANY access-type and is ALWAYS
+          optional.
+
+    (4)   PERMISSION -- A case-insensitive field that indicates
+          whether or not it is expected that clients might also
+          attempt to overwrite the data.  By default, or if
+          permission is "read", the assumption is that they are
+          not, and that if the data is retrieved once, it is
+          never needed again.  If PERMISSION is "read-write",
+
+
+
+Freed & Borenstein          Standards Track                    [Page 34]
+
+RFC 2046                      Media Types                  November 1996
+
+
+          this assumption is invalid, and any local copy must be
+          considered no more than a cache.  "Read" and "Read-
+          write" are the only defined values of permission.  This
+          parameter may be used with ANY access-type and is
+          ALWAYS optional.
+
+   The precise semantics of the access-types defined here are described
+   in the sections that follow.
+
+5.2.3.2.  The 'ftp' and 'tftp' Access-Types
+
+   An access-type of FTP or TFTP indicates that the message body is
+   accessible as a file using the FTP [RFC-959] or TFTP [RFC- 783]
+   protocols, respectively.  For these access-types, the following
+   additional parameters are mandatory:
+
+    (1)   NAME -- The name of the file that contains the actual
+          body data.
+
+    (2)   SITE -- A machine from which the file may be obtained,
+          using the given protocol.  This must be a fully
+          qualified domain name, not a nickname.
+
+    (3)   Before any data are retrieved, using FTP, the user will
+          generally need to be asked to provide a login id and a
+          password for the machine named by the site parameter.
+          For security reasons, such an id and password are not
+          specified as content-type parameters, but must be
+          obtained from the user.
+
+   In addition, the following parameters are optional:
+
+    (1)   DIRECTORY -- A directory from which the data named by
+          NAME should be retrieved.
+
+    (2)   MODE -- A case-insensitive string indicating the mode
+          to be used when retrieving the information.  The valid
+          values for access-type "TFTP" are "NETASCII", "OCTET",
+          and "MAIL", as specified by the TFTP protocol [RFC-
+          783].  The valid values for access-type "FTP" are
+          "ASCII", "EBCDIC", "IMAGE", and "LOCALn" where "n" is a
+          decimal integer, typically 8.  These correspond to the
+          representation types "A" "E" "I" and "L n" as specified
+          by the FTP protocol [RFC-959].  Note that "BINARY" and
+          "TENEX" are not valid values for MODE and that "OCTET"
+          or "IMAGE" or "LOCAL8" should be used instead.  IF MODE
+          is not specified, the  default value is "NETASCII" for
+          TFTP and "ASCII" otherwise.
+
+
+
+Freed & Borenstein          Standards Track                    [Page 35]
+
+RFC 2046                      Media Types                  November 1996
+
+
+5.2.3.3.  The 'anon-ftp' Access-Type
+
+   The "anon-ftp" access-type is identical to the "ftp" access type,
+   except that the user need not be asked to provide a name and password
+   for the specified site.  Instead, the ftp protocol will be used with
+   login "anonymous" and a password that corresponds to the user's mail
+   address.
+
+5.2.3.4.  The 'local-file' Access-Type
+
+   An access-type of "local-file" indicates that the actual body is
+   accessible as a file on the local machine.  Two additional parameters
+   are defined for this access type:
+
+    (1)   NAME -- The name of the file that contains the actual
+          body data.  This parameter is mandatory for the
+          "local-file" access-type.
+
+    (2)   SITE -- A domain specifier for a machine or set of
+          machines that are known to have access to the data
+          file.  This optional parameter is used to describe the
+          locality of reference for the data, that is, the site
+          or sites at which the file is expected to be visible.
+          Asterisks may be used for wildcard matching to a part
+          of a domain name, such as "*.bellcore.com", to indicate
+          a set of machines on which the data should be directly
+          visible, while a single asterisk may be used to
+          indicate a file that is expected to be universally
+          available, e.g., via a global file system.
+
+5.2.3.5.  The 'mail-server' Access-Type
+
+   The "mail-server" access-type indicates that the actual body is
+   available from a mail server.  Two additional parameters are defined
+   for this access-type:
+
+    (1)   SERVER -- The addr-spec of the mail server from which
+          the actual body data can be obtained.  This parameter
+          is mandatory for the "mail-server" access-type.
+
+    (2)   SUBJECT -- The subject that is to be used in the mail
+          that is sent to obtain the data.  Note that keying mail
+          servers on Subject lines is NOT recommended, but such
+          mail servers are known to exist.  This is an optional
+          parameter.
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 36]
+
+RFC 2046                      Media Types                  November 1996
+
+
+   Because mail servers accept a variety of syntaxes, some of which is
+   multiline, the full command to be sent to a mail server is not
+   included as a parameter in the content-type header field.  Instead,
+   it is provided as the "phantom body" when the media type is
+   "message/external-body" and the access-type is mail-server.
+
+   Note that MIME does not define a mail server syntax.  Rather, it
+   allows the inclusion of arbitrary mail server commands in the phantom
+   body.  Implementations must include the phantom body in the body of
+   the message it sends to the mail server address to retrieve the
+   relevant data.
+
+   Unlike other access-types, mail-server access is asynchronous and
+   will happen at an unpredictable time in the future.  For this reason,
+   it is important that there be a mechanism by which the returned data
+   can be matched up with the original "message/external-body" entity.
+   MIME mail servers must use the same Content-ID field on the returned
+   message that was used in the original "message/external-body"
+   entities, to facilitate such matching.
+
+5.2.3.6.  External-Body Security Issues
+
+   "Message/external-body" entities give rise to two important security
+   issues:
+
+    (1)   Accessing data via a "message/external-body" reference
+          effectively results in the message recipient performing
+          an operation that was specified by the message
+          originator.  It is therefore possible for the message
+          originator to trick a recipient into doing something
+          they would not have done otherwise.  For example, an
+          originator could specify a action that attempts
+          retrieval of material that the recipient is not
+          authorized to obtain, causing the recipient to
+          unwittingly violate some security policy.  For this
+          reason, user agents capable of resolving external
+          references must always take steps to describe the
+          action they are to take to the recipient and ask for
+          explicit permisssion prior to performing it.
+
+          The 'mail-server' access-type is particularly
+          vulnerable, in that it causes the recipient to send a
+          new message whose contents are specified by the
+          original message's originator.  Given the potential for
+          abuse, any such request messages that are constructed
+          should contain a clear indication that they were
+          generated automatically (e.g. in a Comments: header
+          field) in an attempt to resolve a MIME
+
+
+
+Freed & Borenstein          Standards Track                    [Page 37]
+
+RFC 2046                      Media Types                  November 1996
+
+
+          "message/external-body" reference.
+
+    (2)   MIME will sometimes be used in environments that
+          provide some guarantee of message integrity and
+          authenticity.  If present, such guarantees may apply
+          only to the actual direct content of messages -- they
+          may or may not apply to data accessed through MIME's
+          "message/external-body" mechanism.  In particular, it
+          may be possible to subvert certain access mechanisms
+          even when the messaging system itself is secure.
+
+          It should be noted that this problem exists either with
+          or without the availabilty of MIME mechanisms.  A
+          casual reference to an FTP site containing a document
+          in the text of a secure message brings up similar
+          issues -- the only difference is that MIME provides for
+          automatic retrieval of such material, and users may
+          place unwarranted trust is such automatic retrieval
+          mechanisms.
+
+5.2.3.7.  Examples and Further Explanations
+
+   When the external-body mechanism is used in conjunction with the
+   "multipart/alternative" media type it extends the functionality of
+   "multipart/alternative" to include the case where the same entity is
+   provided in the same format but via different accces mechanisms.
+   When this is done the originator of the message must order the parts
+   first in terms of preferred formats and then by preferred access
+   mechanisms.  The recipient's viewer should then evaluate the list
+   both in terms of format and access mechanisms.
+
+   With the emerging possibility of very wide-area file systems, it
+   becomes very hard to know in advance the set of machines where a file
+   will and will not be accessible directly from the file system.
+   Therefore it may make sense to provide both a file name, to be tried
+   directly, and the name of one or more sites from which the file is
+   known to be accessible.  An implementation can try to retrieve remote
+   files using FTP or any other protocol, using anonymous file retrieval
+   or prompting the user for the necessary name and password.  If an
+   external body is accessible via multiple mechanisms, the sender may
+   include multiple entities of type "message/external-body" within the
+   body parts of an enclosing "multipart/alternative" entity.
+
+   However, the external-body mechanism is not intended to be limited to
+   file retrieval, as shown by the mail-server access-type.  Beyond
+   this, one can imagine, for example, using a video server for external
+   references to video clips.
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 38]
+
+RFC 2046                      Media Types                  November 1996
+
+
+   The embedded message header fields which appear in the body of the
+   "message/external-body" data must be used to declare the media type
+   of the external body if it is anything other than plain US-ASCII
+   text, since the external body does not have a header section to
+   declare its type.  Similarly, any Content-transfer-encoding other
+   than "7bit" must also be declared here.  Thus a complete
+   "message/external-body" message, referring to an object in PostScript
+   format, might look like this:
+
+     From: Whomever
+     To: Someone
+     Date: Whenever
+     Subject: whatever
+     MIME-Version: 1.0
+     Message-ID: <id1@host.com>
+     Content-Type: multipart/alternative; boundary=42
+     Content-ID: <id001@guppylake.bellcore.com>
+
+     --42
+     Content-Type: message/external-body; name="BodyFormats.ps";
+                   site="thumper.bellcore.com"; mode="image";
+                   access-type=ANON-FTP; directory="pub";
+                   expiration="Fri, 14 Jun 1991 19:13:14 -0400 (EDT)"
+
+     Content-type: application/postscript
+     Content-ID: <id42@guppylake.bellcore.com>
+
+     --42
+     Content-Type: message/external-body; access-type=local-file;
+                   name="/u/nsb/writing/rfcs/RFC-MIME.ps";
+                   site="thumper.bellcore.com";
+                   expiration="Fri, 14 Jun 1991 19:13:14 -0400 (EDT)"
+
+     Content-type: application/postscript
+     Content-ID: <id42@guppylake.bellcore.com>
+
+     --42
+     Content-Type: message/external-body;
+                   access-type=mail-server
+                   server="listserv@bogus.bitnet";
+                   expiration="Fri, 14 Jun 1991 19:13:14 -0400 (EDT)"
+
+     Content-type: application/postscript
+     Content-ID: <id42@guppylake.bellcore.com>
+
+     get RFC-MIME.DOC
+
+     --42--
+
+
+
+Freed & Borenstein          Standards Track                    [Page 39]
+
+RFC 2046                      Media Types                  November 1996
+
+
+   Note that in the above examples, the default Content-transfer-
+   encoding of "7bit" is assumed for the external postscript data.
+
+   Like the "message/partial" type, the "message/external-body" media
+   type is intended to be transparent, that is, to convey the data type
+   in the external body rather than to convey a message with a body of
+   that type.  Thus the headers on the outer and inner parts must be
+   merged using the same rules as for "message/partial".  In particular,
+   this means that the Content-type and Subject fields are overridden,
+   but the From field is preserved.
+
+   Note that since the external bodies are not transported along with
+   the external body reference, they need not conform to transport
+   limitations that apply to the reference itself. In particular,
+   Internet mail transports may impose 7bit and line length limits, but
+   these do not automatically apply to binary external body references.
+   Thus a Content-Transfer-Encoding is not generally necessary, though
+   it is permitted.
+
+   Note that the body of a message of type "message/external-body" is
+   governed by the basic syntax for an RFC 822 message.  In particular,
+   anything before the first consecutive pair of CRLFs is header
+   information, while anything after it is body information, which is
+   ignored for most access-types.
+
+5.2.4.  Other Message Subtypes
+
+   MIME implementations must in general treat unrecognized subtypes of
+   "message" as being equivalent to "application/octet-stream".
+
+   Future subtypes of "message" intended for use with email should be
+   restricted to "7bit" encoding. A type other than "message" should be
+   used if restriction to "7bit" is not possible.
+
+6.  Experimental Media Type Values
+
+   A media type value beginning with the characters "X-" is a private
+   value, to be used by consenting systems by mutual agreement.  Any
+   format without a rigorous and public definition must be named with an
+   "X-" prefix, and publicly specified values shall never begin with
+   "X-".  (Older versions of the widely used Andrew system use the "X-
+   BE2" name, so new systems should probably choose a different name.)
+
+   In general, the use of "X-" top-level types is strongly discouraged.
+   Implementors should invent subtypes of the existing types whenever
+   possible. In many cases, a subtype of "application" will be more
+   appropriate than a new top-level type.
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 40]
+
+RFC 2046                      Media Types                  November 1996
+
+
+7.  Summary
+
+   The five discrete media types provide provide a standardized
+   mechanism for tagging entities as "audio", "image", or several other
+   kinds of data. The composite "multipart" and "message" media types
+   allow mixing and hierarchical structuring of entities of different
+   types in a single message. A distinguished parameter syntax allows
+   further specification of data format details, particularly the
+   specification of alternate character sets.  Additional optional
+   header fields provide mechanisms for certain extensions deemed
+   desirable by many implementors. Finally, a number of useful media
+   types are defined for general use by consenting user agents, notably
+   "message/partial" and "message/external-body".
+
+9.  Security Considerations
+
+   Security issues are discussed in the context of the
+   "application/postscript" type, the "message/external-body" type, and
+   in RFC 2048.  Implementors should pay special attention to the
+   security implications of any media types that can cause the remote
+   execution of any actions in the recipient's environment.  In such
+   cases, the discussion of the "application/postscript" type may serve
+   as a model for considering other media types with remote execution
+   capabilities.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 41]
+
+RFC 2046                      Media Types                  November 1996
+
+
+9.  Authors' Addresses
+
+   For more information, the authors of this document are best contacted
+   via Internet mail:
+
+   Ned Freed
+   Innosoft International, Inc.
+   1050 East Garvey Avenue South
+   West Covina, CA 91790
+   USA
+
+   Phone: +1 818 919 3600
+   Fax:   +1 818 919 3614
+   EMail: ned@innosoft.com
+
+
+   Nathaniel S. Borenstein
+   First Virtual Holdings
+   25 Washington Avenue
+   Morristown, NJ 07960
+   USA
+
+   Phone: +1 201 540 8967
+   Fax:   +1 201 993 3032
+   EMail: nsb@nsb.fv.com
+
+
+   MIME is a result of the work of the Internet Engineering Task Force
+   Working Group on RFC 822 Extensions.  The chairman of that group,
+   Greg Vaudreuil, may be reached at:
+
+   Gregory M. Vaudreuil
+   Octel Network Services
+   17080 Dallas Parkway
+   Dallas, TX 75248-1905
+   USA
+
+   EMail: Greg.Vaudreuil@Octel.Com
+
+
+
+
+
+
+
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 42]
+
+RFC 2046                      Media Types                  November 1996
+
+
+Appendix A -- Collected Grammar
+
+   This appendix contains the complete BNF grammar for all the syntax
+   specified by this document.
+
+   By itself, however, this grammar is incomplete.  It refers by name to
+   several syntax rules that are defined by RFC 822.  Rather than
+   reproduce those definitions here, and risk unintentional differences
+   between the two, this document simply refers the reader to RFC 822
+   for the remaining definitions. Wherever a term is undefined, it
+   refers to the RFC 822 definition.
+
+     boundary := 0*69<bchars> bcharsnospace
+
+     bchars := bcharsnospace / " "
+
+     bcharsnospace := DIGIT / ALPHA / "'" / "(" / ")" /
+                      "+" / "_" / "," / "-" / "." /
+                      "/" / ":" / "=" / "?"
+
+     body-part := <"message" as defined in RFC 822, with all
+                   header fields optional, not starting with the
+                   specified dash-boundary, and with the
+                   delimiter not occurring anywhere in the
+                   body part.  Note that the semantics of a
+                   part differ from the semantics of a message,
+                   as described in the text.>
+
+     close-delimiter := delimiter "--"
+
+     dash-boundary := "--" boundary
+                      ; boundary taken from the value of
+                      ; boundary parameter of the
+                      ; Content-Type field.
+
+     delimiter := CRLF dash-boundary
+
+     discard-text := *(*text CRLF)
+                     ; May be ignored or discarded.
+
+     encapsulation := delimiter transport-padding
+                      CRLF body-part
+
+     epilogue := discard-text
+
+     multipart-body := [preamble CRLF]
+                       dash-boundary transport-padding CRLF
+                       body-part *encapsulation
+
+
+
+Freed & Borenstein          Standards Track                    [Page 43]
+
+RFC 2046                      Media Types                  November 1996
+
+
+                       close-delimiter transport-padding
+                       [CRLF epilogue]
+
+     preamble := discard-text
+
+     transport-padding := *LWSP-char
+                          ; Composers MUST NOT generate
+                          ; non-zero length transport
+                          ; padding, but receivers MUST
+                          ; be able to handle padding
+                          ; added by message transports.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 44]
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2047.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2047.txt
new file mode 100644
index 000000000..ff9a744bf
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2047.txt
@@ -0,0 +1,843 @@
+
+
+
+
+
+
+Network Working Group                                           K. Moore
+Request for Comments: 2047                       University of Tennessee
+Obsoletes: 1521, 1522, 1590                                November 1996
+Category: Standards Track
+
+
+        MIME (Multipurpose Internet Mail Extensions) Part Three:
+              Message Header Extensions for Non-ASCII Text
+
+Status of this Memo
+
+   This document specifies an Internet standards track protocol for the
+   Internet community, and requests discussion and suggestions for
+   improvements.  Please refer to the current edition of the "Internet
+   Official Protocol Standards" (STD 1) for the standardization state
+   and status of this protocol.  Distribution of this memo is unlimited.
+
+Abstract
+
+   STD 11, RFC 822, defines a message representation protocol specifying
+   considerable detail about US-ASCII message headers, and leaves the
+   message content, or message body, as flat US-ASCII text.  This set of
+   documents, collectively called the Multipurpose Internet Mail
+   Extensions, or MIME, redefines the format of messages to allow for
+
+   (1) textual message bodies in character sets other than US-ASCII,
+
+   (2) an extensible set of different formats for non-textual message
+       bodies,
+
+   (3) multi-part message bodies, and
+
+   (4) textual header information in character sets other than US-ASCII.
+
+   These documents are based on earlier work documented in RFC 934, STD
+   11, and RFC 1049, but extends and revises them.  Because RFC 822 said
+   so little about message bodies, these documents are largely
+   orthogonal to (rather than a revision of) RFC 822.
+
+   This particular document is the third document in the series.  It
+   describes extensions to RFC 822 to allow non-US-ASCII text data in
+   Internet mail header fields.
+
+
+
+
+
+
+
+
+
+Moore                       Standards Track                     [Page 1]
+
+RFC 2047               Message Header Extensions           November 1996
+
+
+   Other documents in this series include:
+
+   + RFC 2045, which specifies the various headers used to describe
+     the structure of MIME messages.
+
+   + RFC 2046, which defines the general structure of the MIME media
+     typing system and defines an initial set of media types,
+
+   + RFC 2048, which specifies various IANA registration procedures
+     for MIME-related facilities, and
+
+   + RFC 2049, which describes MIME conformance criteria and
+     provides some illustrative examples of MIME message formats,
+     acknowledgements, and the bibliography.
+
+   These documents are revisions of RFCs 1521, 1522, and 1590, which
+   themselves were revisions of RFCs 1341 and 1342.  An appendix in RFC
+   2049 describes differences and changes from previous versions.
+
+1. Introduction
+
+   RFC 2045 describes a mechanism for denoting textual body parts which
+   are coded in various character sets, as well as methods for encoding
+   such body parts as sequences of printable US-ASCII characters.  This
+   memo describes similar techniques to allow the encoding of non-ASCII
+   text in various portions of a RFC 822 [2] message header, in a manner
+   which is unlikely to confuse existing message handling software.
+
+   Like the encoding techniques described in RFC 2045, the techniques
+   outlined here were designed to allow the use of non-ASCII characters
+   in message headers in a way which is unlikely to be disturbed by the
+   quirks of existing Internet mail handling programs.  In particular,
+   some mail relaying programs are known to (a) delete some message
+   header fields while retaining others, (b) rearrange the order of
+   addresses in To or Cc fields, (c) rearrange the (vertical) order of
+   header fields, and/or (d) "wrap" message headers at different places
+   than those in the original message.  In addition, some mail reading
+   programs are known to have difficulty correctly parsing message
+   headers which, while legal according to RFC 822, make use of
+   backslash-quoting to "hide" special characters such as "<", ",", or
+   ":", or which exploit other infrequently-used features of that
+   specification.
+
+   While it is unfortunate that these programs do not correctly
+   interpret RFC 822 headers, to "break" these programs would cause
+   severe operational problems for the Internet mail system.  The
+   extensions described in this memo therefore do not rely on little-
+   used features of RFC 822.
+
+
+
+Moore                       Standards Track                     [Page 2]
+
+RFC 2047               Message Header Extensions           November 1996
+
+
+   Instead, certain sequences of "ordinary" printable ASCII characters
+   (known as "encoded-words") are reserved for use as encoded data.  The
+   syntax of encoded-words is such that they are unlikely to
+   "accidentally" appear as normal text in message headers.
+   Furthermore, the characters used in encoded-words are restricted to
+   those which do not have special meanings in the context in which the
+   encoded-word appears.
+
+   Generally, an "encoded-word" is a sequence of printable ASCII
+   characters that begins with "=?", ends with "?=", and has two "?"s in
+   between.  It specifies a character set and an encoding method, and
+   also includes the original text encoded as graphic ASCII characters,
+   according to the rules for that encoding method.
+
+   A mail composer that implements this specification will provide a
+   means of inputting non-ASCII text in header fields, but will
+   translate these fields (or appropriate portions of these fields) into
+   encoded-words before inserting them into the message header.
+
+   A mail reader that implements this specification will recognize
+   encoded-words when they appear in certain portions of the message
+   header.  Instead of displaying the encoded-word "as is", it will
+   reverse the encoding and display the original text in the designated
+   character set.
+
+NOTES
+
+   This memo relies heavily on notation and terms defined RFC 822 and
+   RFC 2045.  In particular, the syntax for the ABNF used in this memo
+   is defined in RFC 822, as well as many of the terminal or nonterminal
+   symbols from RFC 822 are used in the grammar for the header
+   extensions defined here.  Among the symbols defined in RFC 822 and
+   referenced in this memo are: 'addr-spec', 'atom', 'CHAR', 'comment',
+   'CTLs', 'ctext', 'linear-white-space', 'phrase', 'quoted-pair'.
+   'quoted-string', 'SPACE', and 'word'.  Successful implementation of
+   this protocol extension requires careful attention to the RFC 822
+   definitions of these terms.
+
+   When the term "ASCII" appears in this memo, it refers to the "7-Bit
+   American Standard Code for Information Interchange", ANSI X3.4-1986.
+   The MIME charset name for this character set is "US-ASCII".  When not
+   specifically referring to the MIME charset name, this document uses
+   the term "ASCII", both for brevity and for consistency with RFC 822.
+   However, implementors are warned that the character set name must be
+   spelled "US-ASCII" in MIME message and body part headers.
+
+
+
+
+
+
+Moore                       Standards Track                     [Page 3]
+
+RFC 2047               Message Header Extensions           November 1996
+
+
+   This memo specifies a protocol for the representation of non-ASCII
+   text in message headers.  It specifically DOES NOT define any
+   translation between "8-bit headers" and pure ASCII headers, nor is
+   any such translation assumed to be possible.
+
+2. Syntax of encoded-words
+
+   An 'encoded-word' is defined by the following ABNF grammar.  The
+   notation of RFC 822 is used, with the exception that white space
+   characters MUST NOT appear between components of an 'encoded-word'.
+
+   encoded-word = "=?" charset "?" encoding "?" encoded-text "?="
+
+   charset = token    ; see section 3
+
+   encoding = token   ; see section 4
+
+   token = 1*<Any CHAR except SPACE, CTLs, and especials>
+
+   especials = "(" / ")" / "<" / ">" / "@" / "," / ";" / ":" / "
+               <"> / "/" / "[" / "]" / "?" / "." / "="
+
+   encoded-text = 1*<Any printable ASCII character other than "?"
+                     or SPACE>
+                  ; (but see "Use of encoded-words in message
+                  ; headers", section 5)
+
+   Both 'encoding' and 'charset' names are case-independent.  Thus the
+   charset name "ISO-8859-1" is equivalent to "iso-8859-1", and the
+   encoding named "Q" may be spelled either "Q" or "q".
+
+   An 'encoded-word' may not be more than 75 characters long, including
+   'charset', 'encoding', 'encoded-text', and delimiters.  If it is
+   desirable to encode more text than will fit in an 'encoded-word' of
+   75 characters, multiple 'encoded-word's (separated by CRLF SPACE) may
+   be used.
+
+   While there is no limit to the length of a multiple-line header
+   field, each line of a header field that contains one or more
+   'encoded-word's is limited to 76 characters.
+
+   The length restrictions are included both to ease interoperability
+   through internetwork mail gateways, and to impose a limit on the
+   amount of lookahead a header parser must employ (while looking for a
+   final ?= delimiter) before it can decide whether a token is an
+   "encoded-word" or something else.
+
+
+
+
+
+Moore                       Standards Track                     [Page 4]
+
+RFC 2047               Message Header Extensions           November 1996
+
+
+   IMPORTANT: 'encoded-word's are designed to be recognized as 'atom's
+   by an RFC 822 parser.  As a consequence, unencoded white space
+   characters (such as SPACE and HTAB) are FORBIDDEN within an
+   'encoded-word'.  For example, the character sequence
+
+      =?iso-8859-1?q?this is some text?=
+
+   would be parsed as four 'atom's, rather than as a single 'atom' (by
+   an RFC 822 parser) or 'encoded-word' (by a parser which understands
+   'encoded-words').  The correct way to encode the string "this is some
+   text" is to encode the SPACE characters as well, e.g.
+
+      =?iso-8859-1?q?this=20is=20some=20text?=
+
+   The characters which may appear in 'encoded-text' are further
+   restricted by the rules in section 5.
+
+3. Character sets
+
+   The 'charset' portion of an 'encoded-word' specifies the character
+   set associated with the unencoded text.  A 'charset' can be any of
+   the character set names allowed in an MIME "charset" parameter of a
+   "text/plain" body part, or any character set name registered with
+   IANA for use with the MIME text/plain content-type.
+
+   Some character sets use code-switching techniques to switch between
+   "ASCII mode" and other modes.  If unencoded text in an 'encoded-word'
+   contains a sequence which causes the charset interpreter to switch
+   out of ASCII mode, it MUST contain additional control codes such that
+   ASCII mode is again selected at the end of the 'encoded-word'.  (This
+   rule applies separately to each 'encoded-word', including adjacent
+   'encoded-word's within a single header field.)
+
+   When there is a possibility of using more than one character set to
+   represent the text in an 'encoded-word', and in the absence of
+   private agreements between sender and recipients of a message, it is
+   recommended that members of the ISO-8859-* series be used in
+   preference to other character sets.
+
+4. Encodings
+
+   Initially, the legal values for "encoding" are "Q" and "B".  These
+   encodings are described below.  The "Q" encoding is recommended for
+   use when most of the characters to be encoded are in the ASCII
+   character set; otherwise, the "B" encoding should be used.
+   Nevertheless, a mail reader which claims to recognize 'encoded-word's
+   MUST be able to accept either encoding for any character set which it
+   supports.
+
+
+
+Moore                       Standards Track                     [Page 5]
+
+RFC 2047               Message Header Extensions           November 1996
+
+
+   Only a subset of the printable ASCII characters may be used in
+   'encoded-text'.  Space and tab characters are not allowed, so that
+   the beginning and end of an 'encoded-word' are obvious.  The "?"
+   character is used within an 'encoded-word' to separate the various
+   portions of the 'encoded-word' from one another, and thus cannot
+   appear in the 'encoded-text' portion.  Other characters are also
+   illegal in certain contexts.  For example, an 'encoded-word' in a
+   'phrase' preceding an address in a From header field may not contain
+   any of the "specials" defined in RFC 822.  Finally, certain other
+   characters are disallowed in some contexts, to ensure reliability for
+   messages that pass through internetwork mail gateways.
+
+   The "B" encoding automatically meets these requirements.  The "Q"
+   encoding allows a wide range of printable characters to be used in
+   non-critical locations in the message header (e.g., Subject), with
+   fewer characters available for use in other locations.
+
+4.1. The "B" encoding
+
+   The "B" encoding is identical to the "BASE64" encoding defined by RFC
+   2045.
+
+4.2. The "Q" encoding
+
+   The "Q" encoding is similar to the "Quoted-Printable" content-
+   transfer-encoding defined in RFC 2045.  It is designed to allow text
+   containing mostly ASCII characters to be decipherable on an ASCII
+   terminal without decoding.
+
+   (1) Any 8-bit value may be represented by a "=" followed by two
+       hexadecimal digits.  For example, if the character set in use
+       were ISO-8859-1, the "=" character would thus be encoded as
+       "=3D", and a SPACE by "=20".  (Upper case should be used for
+       hexadecimal digits "A" through "F".)
+
+   (2) The 8-bit hexadecimal value 20 (e.g., ISO-8859-1 SPACE) may be
+       represented as "_" (underscore, ASCII 95.).  (This character may
+       not pass through some internetwork mail gateways, but its use
+       will greatly enhance readability of "Q" encoded data with mail
+       readers that do not support this encoding.)  Note that the "_"
+       always represents hexadecimal 20, even if the SPACE character
+       occupies a different code position in the character set in use.
+
+   (3) 8-bit values which correspond to printable ASCII characters other
+       than "=", "?", and "_" (underscore), MAY be represented as those
+       characters.  (But see section 5 for restrictions.)  In
+       particular, SPACE and TAB MUST NOT be represented as themselves
+       within encoded words.
+
+
+
+Moore                       Standards Track                     [Page 6]
+
+RFC 2047               Message Header Extensions           November 1996
+
+
+5. Use of encoded-words in message headers
+
+   An 'encoded-word' may appear in a message header or body part header
+   according to the following rules:
+
+(1) An 'encoded-word' may replace a 'text' token (as defined by RFC 822)
+    in any Subject or Comments header field, any extension message
+    header field, or any MIME body part field for which the field body
+    is defined as '*text'.  An 'encoded-word' may also appear in any
+    user-defined ("X-") message or body part header field.
+
+    Ordinary ASCII text and 'encoded-word's may appear together in the
+    same header field.  However, an 'encoded-word' that appears in a
+    header field defined as '*text' MUST be separated from any adjacent
+    'encoded-word' or 'text' by 'linear-white-space'.
+
+(2) An 'encoded-word' may appear within a 'comment' delimited by "(" and
+    ")", i.e., wherever a 'ctext' is allowed.  More precisely, the RFC
+    822 ABNF definition for 'comment' is amended as follows:
+
+    comment = "(" *(ctext / quoted-pair / comment / encoded-word) ")"
+
+    A "Q"-encoded 'encoded-word' which appears in a 'comment' MUST NOT
+    contain the characters "(", ")" or "
+    'encoded-word' that appears in a 'comment' MUST be separated from
+    any adjacent 'encoded-word' or 'ctext' by 'linear-white-space'.
+
+    It is important to note that 'comment's are only recognized inside
+    "structured" field bodies.  In fields whose bodies are defined as
+    '*text', "(" and ")" are treated as ordinary characters rather than
+    comment delimiters, and rule (1) of this section applies.  (See RFC
+    822, sections 3.1.2 and 3.1.3)
+
+(3) As a replacement for a 'word' entity within a 'phrase', for example,
+    one that precedes an address in a From, To, or Cc header.  The ABNF
+    definition for 'phrase' from RFC 822 thus becomes:
+
+    phrase = 1*( encoded-word / word )
+
+    In this case the set of characters that may be used in a "Q"-encoded
+    'encoded-word' is restricted to: <upper and lower case ASCII
+    letters, decimal digits, "!", "*", "+", "-", "/", "=", and "_"
+    (underscore, ASCII 95.)>.  An 'encoded-word' that appears within a
+    'phrase' MUST be separated from any adjacent 'word', 'text' or
+    'special' by 'linear-white-space'.
+
+
+
+
+
+
+Moore                       Standards Track                     [Page 7]
+
+RFC 2047               Message Header Extensions           November 1996
+
+
+   These are the ONLY locations where an 'encoded-word' may appear.  In
+   particular:
+
+   + An 'encoded-word' MUST NOT appear in any portion of an 'addr-spec'.
+
+   + An 'encoded-word' MUST NOT appear within a 'quoted-string'.
+
+   + An 'encoded-word' MUST NOT be used in a Received header field.
+
+   + An 'encoded-word' MUST NOT be used in parameter of a MIME
+     Content-Type or Content-Disposition field, or in any structured
+     field body except within a 'comment' or 'phrase'.
+
+   The 'encoded-text' in an 'encoded-word' must be self-contained;
+   'encoded-text' MUST NOT be continued from one 'encoded-word' to
+   another.  This implies that the 'encoded-text' portion of a "B"
+   'encoded-word' will be a multiple of 4 characters long; for a "Q"
+   'encoded-word', any "=" character that appears in the 'encoded-text'
+   portion will be followed by two hexadecimal characters.
+
+   Each 'encoded-word' MUST encode an integral number of octets.  The
+   'encoded-text' in each 'encoded-word' must be well-formed according
+   to the encoding specified; the 'encoded-text' may not be continued in
+   the next 'encoded-word'.  (For example, "=?charset?Q?=?=
+   =?charset?Q?AB?=" would be illegal, because the two hex digits "AB"
+   must follow the "=" in the same 'encoded-word'.)
+
+   Each 'encoded-word' MUST represent an integral number of characters.
+   A multi-octet character may not be split across adjacent 'encoded-
+   word's.
+
+   Only printable and white space character data should be encoded using
+   this scheme.  However, since these encoding schemes allow the
+   encoding of arbitrary octet values, mail readers that implement this
+   decoding should also ensure that display of the decoded data on the
+   recipient's terminal will not cause unwanted side-effects.
+
+   Use of these methods to encode non-textual data (e.g., pictures or
+   sounds) is not defined by this memo.  Use of 'encoded-word's to
+   represent strings of purely ASCII characters is allowed, but
+   discouraged.  In rare cases it may be necessary to encode ordinary
+   text that looks like an 'encoded-word'.
+
+
+
+
+
+
+
+
+
+Moore                       Standards Track                     [Page 8]
+
+RFC 2047               Message Header Extensions           November 1996
+
+
+6. Support of 'encoded-word's by mail readers
+
+6.1. Recognition of 'encoded-word's in message headers
+
+   A mail reader must parse the message and body part headers according
+   to the rules in RFC 822 to correctly recognize 'encoded-word's.
+
+   'encoded-word's are to be recognized as follows:
+
+   (1) Any message or body part header field defined as '*text', or any
+       user-defined header field, should be parsed as follows: Beginning
+       at the start of the field-body and immediately following each
+       occurrence of 'linear-white-space', each sequence of up to 75
+       printable characters (not containing any 'linear-white-space')
+       should be examined to see if it is an 'encoded-word' according to
+       the syntax rules in section 2.  Any other sequence of printable
+       characters should be treated as ordinary ASCII text.
+
+   (2) Any header field not defined as '*text' should be parsed
+       according to the syntax rules for that header field.  However,
+       any 'word' that appears within a 'phrase' should be treated as an
+       'encoded-word' if it meets the syntax rules in section 2.
+       Otherwise it should be treated as an ordinary 'word'.
+
+   (3) Within a 'comment', any sequence of up to 75 printable characters
+       (not containing 'linear-white-space'), that meets the syntax
+       rules in section 2, should be treated as an 'encoded-word'.
+       Otherwise it should be treated as normal comment text.
+
+   (4) A MIME-Version header field is NOT required to be present for
+       'encoded-word's to be interpreted according to this
+       specification.  One reason for this is that the mail reader is
+       not expected to parse the entire message header before displaying
+       lines that may contain 'encoded-word's.
+
+6.2. Display of 'encoded-word's
+
+   Any 'encoded-word's so recognized are decoded, and if possible, the
+   resulting unencoded text is displayed in the original character set.
+
+   NOTE: Decoding and display of encoded-words occurs *after* a
+   structured field body is parsed into tokens.  It is therefore
+   possible to hide 'special' characters in encoded-words which, when
+   displayed, will be indistinguishable from 'special' characters in the
+   surrounding text.  For this and other reasons, it is NOT generally
+   possible to translate a message header containing 'encoded-word's to
+   an unencoded form which can be parsed by an RFC 822 mail reader.
+
+
+
+
+Moore                       Standards Track                     [Page 9]
+
+RFC 2047               Message Header Extensions           November 1996
+
+
+   When displaying a particular header field that contains multiple
+   'encoded-word's, any 'linear-white-space' that separates a pair of
+   adjacent 'encoded-word's is ignored.  (This is to allow the use of
+   multiple 'encoded-word's to represent long strings of unencoded text,
+   without having to separate 'encoded-word's where spaces occur in the
+   unencoded text.)
+
+   In the event other encodings are defined in the future, and the mail
+   reader does not support the encoding used, it may either (a) display
+   the 'encoded-word' as ordinary text, or (b) substitute an appropriate
+   message indicating that the text could not be decoded.
+
+   If the mail reader does not support the character set used, it may
+   (a) display the 'encoded-word' as ordinary text (i.e., as it appears
+   in the header), (b) make a "best effort" to display using such
+   characters as are available, or (c) substitute an appropriate message
+   indicating that the decoded text could not be displayed.
+
+   If the character set being used employs code-switching techniques,
+   display of the encoded text implicitly begins in "ASCII mode".  In
+   addition, the mail reader must ensure that the output device is once
+   again in "ASCII mode" after the 'encoded-word' is displayed.
+
+6.3. Mail reader handling of incorrectly formed 'encoded-word's
+
+   It is possible that an 'encoded-word' that is legal according to the
+   syntax defined in section 2, is incorrectly formed according to the
+   rules for the encoding being used.   For example:
+
+   (1) An 'encoded-word' which contains characters which are not legal
+       for a particular encoding (for example, a "-" in the "B"
+       encoding, or a SPACE or HTAB in either the "B" or "Q" encoding),
+       is incorrectly formed.
+
+   (2) Any 'encoded-word' which encodes a non-integral number of
+       characters or octets is incorrectly formed.
+
+   A mail reader need not attempt to display the text associated with an
+   'encoded-word' that is incorrectly formed.  However, a mail reader
+   MUST NOT prevent the display or handling of a message because an
+   'encoded-word' is incorrectly formed.
+
+7. Conformance
+
+   A mail composing program claiming compliance with this specification
+   MUST ensure that any string of non-white-space printable ASCII
+   characters within a '*text' or '*ctext' that begins with "=?" and
+   ends with "?=" be a valid 'encoded-word'.  ("begins" means: at the
+
+
+
+Moore                       Standards Track                    [Page 10]
+
+RFC 2047               Message Header Extensions           November 1996
+
+
+   start of the field-body, immediately following 'linear-white-space',
+   or immediately following a "(" for an 'encoded-word' within '*ctext';
+   "ends" means: at the end of the field-body, immediately preceding
+   'linear-white-space', or immediately preceding a ")" for an
+   'encoded-word' within '*ctext'.)  In addition, any 'word' within a
+   'phrase' that begins with "=?" and ends with "?=" must be a valid
+   'encoded-word'.
+
+   A mail reading program claiming compliance with this specification
+   must be able to distinguish 'encoded-word's from 'text', 'ctext', or
+   'word's, according to the rules in section 6, anytime they appear in
+   appropriate places in message headers.  It must support both the "B"
+   and "Q" encodings for any character set which it supports.  The
+   program must be able to display the unencoded text if the character
+   set is "US-ASCII".  For the ISO-8859-* character sets, the mail
+   reading program must at least be able to display the characters which
+   are also in the ASCII set.
+
+8. Examples
+
+   The following are examples of message headers containing 'encoded-
+   word's:
+
+   From: =?US-ASCII?Q?Keith_Moore?= <moore@cs.utk.edu>
+   To: =?ISO-8859-1?Q?Keld_J=F8rn_Simonsen?= <keld@dkuug.dk>
+   CC: =?ISO-8859-1?Q?Andr=E9?= Pirard <PIRARD@vm1.ulg.ac.be>
+   Subject: =?ISO-8859-1?B?SWYgeW91IGNhbiByZWFkIHRoaXMgeW8=?=
+    =?ISO-8859-2?B?dSB1bmRlcnN0YW5kIHRoZSBleGFtcGxlLg==?=
+
+      Note: In the first 'encoded-word' of the Subject field above, the
+      last "=" at the end of the 'encoded-text' is necessary because each
+      'encoded-word' must be self-contained (the "=" character completes a
+      group of 4 base64 characters representing 2 octets).  An additional
+      octet could have been encoded in the first 'encoded-word' (so that
+      the encoded-word would contain an exact multiple of 3 encoded
+      octets), except that the second 'encoded-word' uses a different
+      'charset' than the first one.
+
+   From: =?ISO-8859-1?Q?Olle_J=E4rnefors?= <ojarnef@admin.kth.se>
+   To: ietf-822@dimacs.rutgers.edu, ojarnef@admin.kth.se
+   Subject: Time for ISO 10646?
+
+   To: Dave Crocker <dcrocker@mordor.stanford.edu>
+   Cc: ietf-822@dimacs.rutgers.edu, paf@comsol.se
+   From: =?ISO-8859-1?Q?Patrik_F=E4ltstr=F6m?= <paf@nada.kth.se>
+   Subject: Re: RFC-HDR care and feeding
+
+
+
+
+
+Moore                       Standards Track                    [Page 11]
+
+RFC 2047               Message Header Extensions           November 1996
+
+
+   From: Nathaniel Borenstein <nsb@thumper.bellcore.com>
+         (=?iso-8859-8?b?7eXs+SDv4SDp7Oj08A==?=)
+   To: Greg Vaudreuil <gvaudre@NRI.Reston.VA.US>, Ned Freed
+      <ned@innosoft.com>, Keith Moore <moore@cs.utk.edu>
+   Subject: Test of new header generator
+   MIME-Version: 1.0
+   Content-type: text/plain; charset=ISO-8859-1
+
+   The following examples illustrate how text containing 'encoded-word's
+   which appear in a structured field body.  The rules are slightly
+   different for fields defined as '*text' because "(" and ")" are not
+   recognized as 'comment' delimiters.  [Section 5, paragraph (1)].
+
+   In each of the following examples, if the same sequence were to occur
+   in a '*text' field, the "displayed as" form would NOT be treated as
+   encoded words, but be identical to the "encoded form".  This is
+   because each of the encoded-words in the following examples is
+   adjacent to a "(" or ")" character.
+
+   encoded form                                displayed as
+   ---------------------------------------------------------------------
+   (=?ISO-8859-1?Q?a?=)                        (a)
+
+   (=?ISO-8859-1?Q?a?= b)                      (a b)
+
+           Within a 'comment', white space MUST appear between an
+           'encoded-word' and surrounding text.  [Section 5,
+           paragraph (2)].  However, white space is not needed between
+           the initial "(" that begins the 'comment', and the
+           'encoded-word'.
+
+
+   (=?ISO-8859-1?Q?a?= =?ISO-8859-1?Q?b?=)     (ab)
+
+           White space between adjacent 'encoded-word's is not
+           displayed.
+
+   (=?ISO-8859-1?Q?a?=  =?ISO-8859-1?Q?b?=)    (ab)
+
+        Even multiple SPACEs between 'encoded-word's are ignored
+        for the purpose of display.
+
+   (=?ISO-8859-1?Q?a?=                         (ab)
+       =?ISO-8859-1?Q?b?=)
+
+           Any amount of linear-space-white between 'encoded-word's,
+           even if it includes a CRLF followed by one or more SPACEs,
+           is ignored for the purposes of display.
+
+
+
+Moore                       Standards Track                    [Page 12]
+
+RFC 2047               Message Header Extensions           November 1996
+
+
+   (=?ISO-8859-1?Q?a_b?=)                      (a b)
+
+           In order to cause a SPACE to be displayed within a portion
+           of encoded text, the SPACE MUST be encoded as part of the
+           'encoded-word'.
+
+   (=?ISO-8859-1?Q?a?= =?ISO-8859-2?Q?_b?=)    (a b)
+
+           In order to cause a SPACE to be displayed between two strings
+           of encoded text, the SPACE MAY be encoded as part of one of
+           the 'encoded-word's.
+
+9. References
+
+   [RFC 822] Crocker, D., "Standard for the Format of ARPA Internet Text
+       Messages", STD 11, RFC 822, UDEL, August 1982.
+
+   [RFC 2049] Borenstein, N., and N. Freed, "Multipurpose Internet Mail
+       Extensions (MIME) Part Five: Conformance Criteria and Examples",
+       RFC 2049, November 1996.
+
+   [RFC 2045] Borenstein, N., and N. Freed, "Multipurpose Internet Mail
+       Extensions (MIME) Part One: Format of Internet Message Bodies",
+       RFC 2045, November 1996.
+
+   [RFC 2046] Borenstein N., and N. Freed, "Multipurpose Internet Mail
+       Extensions (MIME) Part Two: Media Types", RFC 2046,
+       November 1996.
+
+   [RFC 2048] Freed, N., Klensin, J., and J. Postel, "Multipurpose
+       Internet Mail Extensions (MIME) Part Four: Registration
+       Procedures", RFC 2048, November 1996.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Moore                       Standards Track                    [Page 13]
+
+RFC 2047               Message Header Extensions           November 1996
+
+
+10. Security Considerations
+
+   Security issues are not discussed in this memo.
+
+11. Acknowledgements
+
+   The author wishes to thank Nathaniel Borenstein, Issac Chan, Lutz
+   Donnerhacke, Paul Eggert, Ned Freed, Andreas M. Kirchwitz, Olle
+   Jarnefors, Mike Rosin, Yutaka Sato, Bart Schaefer, and Kazuhiko
+   Yamamoto, for their helpful advice, insightful comments, and
+   illuminating questions in response to earlier versions of this
+   specification.
+
+12. Author's Address
+
+   Keith Moore
+   University of Tennessee
+   107 Ayres Hall
+   Knoxville TN 37996-1301
+
+   EMail: moore@cs.utk.edu
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Moore                       Standards Track                    [Page 14]
+
+RFC 2047               Message Header Extensions           November 1996
+
+
+Appendix - changes since RFC 1522 (in no particular order)
+
+   + explicitly state that the MIME-Version is not requried to use
+     'encoded-word's.
+
+   + add explicit note that SPACEs and TABs are not allowed within
+     'encoded-word's, explaining that an 'encoded-word' must look like an
+     'atom' to an RFC822 parser.values, to be precise).
+
+   + add examples from Olle Jarnefors (thanks!) which illustrate how
+     encoded-words with adjacent linear-white-space are displayed.
+
+   + explicitly list terms defined in RFC822 and referenced in this memo
+
+   + fix transcription typos that caused one or two lines and a couple of
+     characters to disappear in the resulting text, due to nroff quirks.
+
+   + clarify that encoded-words are allowed in '*text' fields in both
+     RFC822 headers and MIME body part headers, but NOT as parameter
+     values.
+
+   + clarify the requirement to switch back to ASCII within the encoded
+     portion of an 'encoded-word', for any charset that uses code switching
+     sequences.
+
+   + add a note about 'encoded-word's being delimited by "(" and ")"
+     within a comment, but not in a *text (how bizarre!).
+
+   + fix the Andre Pirard example to get rid of the trailing "_" after
+     the =E9.  (no longer needed post-1342).
+
+   + clarification: an 'encoded-word' may appear immediately following
+     the initial "(" or immediately before the final ")" that delimits a
+     comment, not just adjacent to "(" and ")" *within* *ctext.
+
+   + add a note to explain that a "B" 'encoded-word' will always have a
+     multiple of 4 characters in the 'encoded-text' portion.
+
+   + add note about the "=" in the examples
+
+   + note that processing of 'encoded-word's occurs *after* parsing, and
+     some of the implications thereof.
+
+   + explicitly state that you can't expect to translate between
+     1522 and either vanilla 822 or so-called "8-bit headers".
+
+   + explicitly state that 'encoded-word's are not valid within a
+     'quoted-string'.
+
+
+
+Moore                       Standards Track                    [Page 15]
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2048.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2048.txt
new file mode 100644
index 000000000..a3b18b31e
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2048.txt
@@ -0,0 +1,1180 @@
+
+
+
+
+
+
+Network Working Group                                           N. Freed
+Request for Comments: 2048                                      Innosoft
+BCP: 13                                                       J. Klensin
+Obsoletes: 1521, 1522, 1590                                          MCI
+Category: Best Current Practice                                J. Postel
+                                                                     ISI
+                                                           November 1996
+
+
+                 Multipurpose Internet Mail Extensions
+                           (MIME) Part Four:
+                        Registration Procedures
+
+Status of this Memo
+
+   This document specifies an Internet Best Current Practices for the
+   Internet Community, and requests discussion and suggestions for
+   improvements.  Distribution of this memo is unlimited.
+
+Abstract
+
+   STD 11, RFC 822, defines a message representation protocol specifying
+   considerable detail about US-ASCII message headers, and leaves the
+   message content, or message body, as flat US-ASCII text.  This set of
+   documents, collectively called the Multipurpose Internet Mail
+   Extensions, or MIME, redefines the format of messages to allow for
+
+    (1)   textual message bodies in character sets other than
+          US-ASCII,
+
+    (2)   an extensible set of different formats for non-textual
+          message bodies,
+
+    (3)   multi-part message bodies, and
+
+    (4)   textual header information in character sets other than
+          US-ASCII.
+
+   These documents are based on earlier work documented in RFC 934, STD
+   11, and RFC 1049, but extends and revises them.  Because RFC 822 said
+   so little about message bodies, these documents are largely
+   orthogonal to (rather than a revision of) RFC 822.
+
+
+
+
+
+
+
+
+
+Freed, et. al.           Best Current Practice                  [Page 1]
+
+RFC 2048              MIME Registration Procedures         November 1996
+
+
+   This fourth document, RFC 2048, specifies various IANA registration
+   procedures for the following MIME facilities:
+
+    (1)   media types,
+
+    (2)   external body access types,
+
+    (3)   content-transfer-encodings.
+
+   Registration of character sets for use in MIME is covered elsewhere
+   and is no longer addressed by this document.
+
+   These documents are revisions of RFCs 1521 and 1522, which themselves
+   were revisions of RFCs 1341 and 1342.  An appendix in RFC 2049
+   describes differences and changes from previous versions.
+
+Table of Contents
+
+   1. Introduction .........................................    3
+   2. Media Type Registration ..............................    4
+   2.1 Registration Trees and Subtype Names ................    4
+   2.1.1 IETF Tree .........................................    4
+   2.1.2 Vendor Tree .......................................    4
+   2.1.3 Personal or Vanity Tree ...........................    5
+   2.1.4 Special `x.' Tree .................................    5
+   2.1.5 Additional Registration Trees .....................    6
+   2.2 Registration Requirements ...........................    6
+   2.2.1 Functionality Requirement .........................    6
+   2.2.2 Naming Requirements ...............................    6
+   2.2.3 Parameter Requirements ............................    7
+   2.2.4 Canonicalization and Format Requirements ..........    7
+   2.2.5 Interchange Recommendations .......................    8
+   2.2.6 Security Requirements .............................    8
+   2.2.7 Usage and Implementation Non-requirements .........    9
+   2.2.8 Publication Requirements ..........................   10
+   2.2.9 Additional Information ............................   10
+   2.3 Registration Procedure ..............................   11
+   2.3.1 Present the Media Type to the Community for  Review   11
+   2.3.2 IESG Approval .....................................   12
+   2.3.3 IANA Registration .................................   12
+   2.4 Comments on Media Type Registrations ................   12
+   2.5 Location of Registered Media Type List ..............   12
+   2.6 IANA Procedures for Registering Media Types .........   12
+   2.7 Change Control ......................................   13
+   2.8 Registration Template ...............................   14
+   3. External Body Access Types ...........................   14
+   3.1 Registration Requirements ...........................   15
+   3.1.1 Naming Requirements ...............................   15
+
+
+
+Freed, et. al.           Best Current Practice                  [Page 2]
+
+RFC 2048              MIME Registration Procedures         November 1996
+
+
+   3.1.2 Mechanism Specification Requirements ..............   15
+   3.1.3 Publication Requirements ..........................   15
+   3.1.4 Security Requirements .............................   15
+   3.2 Registration Procedure ..............................   15
+   3.2.1 Present the Access Type to the Community ..........   16
+   3.2.2 Access Type Reviewer ..............................   16
+   3.2.3 IANA Registration .................................   16
+   3.3 Location of Registered Access Type List .............   16
+   3.4 IANA Procedures for Registering Access Types ........   16
+   4. Transfer Encodings ...................................   17
+   4.1 Transfer Encoding Requirements ......................   17
+   4.1.1 Naming Requirements ...............................   17
+   4.1.2 Algorithm Specification Requirements ..............   18
+   4.1.3 Input Domain Requirements .........................   18
+   4.1.4 Output Range Requirements .........................   18
+   4.1.5 Data Integrity and Generality Requirements ........   18
+   4.1.6 New Functionality Requirements ....................   18
+   4.2 Transfer Encoding Definition Procedure ..............   19
+   4.3 IANA Procedures for Transfer Encoding Registration...   19
+   4.4 Location of Registered Transfer Encodings List ......   19
+   5. Authors' Addresses ...................................   20
+   A. Grandfathered Media Types ............................   21
+
+1.  Introduction
+
+   Recent Internet protocols have been carefully designed to be easily
+   extensible in certain areas.  In particular, MIME [RFC 2045] is an
+   open-ended framework and can accommodate additional object types,
+   character sets, and access methods without any changes to the basic
+   protocol.  A registration process is needed, however, to ensure that
+   the set of such values is developed in an orderly, well-specified,
+   and public manner.
+
+   This document defines registration procedures which use the Internet
+   Assigned Numbers Authority (IANA) as a central registry for such
+   values.
+
+   Historical Note: The registration process for media types was
+   initially defined in the context of the asynchronous Internet mail
+   environment.  In this mail environment there is a need to limit the
+   number of possible media types to increase the likelihood of
+   interoperability when the capabilities of the remote mail system are
+   not known.  As media types are used in new environments, where the
+   proliferation of media types is not a hindrance to interoperability,
+   the original procedure was excessively restrictive and had to be
+   generalized.
+
+
+
+
+
+Freed, et. al.           Best Current Practice                  [Page 3]
+
+RFC 2048              MIME Registration Procedures         November 1996
+
+
+2.  Media Type Registration
+
+   Registration of a new media type or types starts with the
+   construction of a registration proposal.  Registration may occur in
+   several different registration trees, which have different
+   requirements as discussed below.  In general, the new registration
+   proposal is circulated and reviewed in a fashion appropriate to the
+   tree involved.  The media type is then registered if the proposal is
+   acceptable.  The following sections describe the requirements and
+   procedures used for each of the different registration trees.
+
+2.1.  Registration Trees and Subtype Names
+
+   In order to increase the efficiency and flexibility of the
+   registration process, different structures of subtype names may be
+   registered to accomodate the different natural requirements for,
+   e.g., a subtype that will be recommended for wide support and
+   implementation by the Internet Community or a subtype that is used to
+   move files associated with proprietary software.  The following
+   subsections define registration "trees", distinguished by the use of
+   faceted names (e.g., names of the form "tree.subtree...type").  Note
+   that some media types defined prior to this document do not conform
+   to the naming conventions described below.  See Appendix A for a
+   discussion of them.
+
+2.1.1.  IETF Tree
+
+   The IETF tree is intended for types of general interest to the
+   Internet Community. Registration in the IETF tree requires approval
+   by the IESG and publication of the media type registration as some
+   form of RFC.
+
+   Media types in the IETF tree are normally denoted by names that are
+   not explicitly faceted, i.e., do not contain period (".", full stop)
+   characters.
+
+   The "owner" of a media type registration in the IETF tree is assumed
+   to be the IETF itself.  Modification or alteration of the
+   specification requires the same level of processing (e.g.  standards
+   track) required for the initial registration.
+
+2.1.2.  Vendor Tree
+
+   The vendor tree is used for media types associated with commercially
+   available products.  "Vendor" or "producer" are construed as
+   equivalent and very broadly in this context.
+
+
+
+
+
+Freed, et. al.           Best Current Practice                  [Page 4]
+
+RFC 2048              MIME Registration Procedures         November 1996
+
+
+   A registration may be placed in the vendor tree by anyone who has
+   need to interchange files associated with the particular product.
+   However, the registration formally belongs to the vendor or
+   organization producing the software or file format.  Changes to the
+   specification will be made at their request, as discussed in
+   subsequent sections.
+
+   Registrations in the vendor tree will be distinguished by the leading
+   facet "vnd.".  That may be followed, at the discretion of the
+   registration, by either a media type name from a well-known producer
+   (e.g., "vnd.mudpie") or by an IANA-approved designation of the
+   producer's name which is then followed by a media type or product
+   designation (e.g., vnd.bigcompany.funnypictures).
+
+   While public exposure and review of media types to be registered in
+   the vendor tree is not required, using the ietf-types list for review
+   is strongly encouraged to improve the quality of those
+   specifications. Registrations in the vendor tree may be submitted
+   directly to the IANA.
+
+2.1.3.  Personal or Vanity Tree
+
+   Registrations for media types created experimentally or as part of
+   products that are not distributed commercially may be registered in
+   the personal or vanity tree.  The registrations are distinguished by
+   the leading facet "prs.".
+
+   The owner of "personal" registrations and associated specifications
+   is the person or entity making the registration, or one to whom
+   responsibility has been transferred as described below.
+
+   While public exposure and review of media types to be registered in
+   the personal tree is not required, using the ietf-types list for
+   review is strongly encouraged to improve the quality of those
+   specifications.  Registrations in the personl tree may be submitted
+   directly to the IANA.
+
+2.1.4.  Special `x.' Tree
+
+   For convenience and symmetry with this registration scheme, media
+   type names with "x." as the first facet may be used for the same
+   purposes for which names starting in "x-" are normally used.  These
+   types are unregistered, experimental, and should be used only with
+   the active agreement of the parties exchanging them.
+
+
+
+
+
+
+
+Freed, et. al.           Best Current Practice                  [Page 5]
+
+RFC 2048              MIME Registration Procedures         November 1996
+
+
+   However, with the simplified registration procedures described above
+   for vendor and personal trees, it should rarely, if ever, be
+   necessary to use unregistered experimental types, and as such use of
+   both "x-" and "x." forms is discouraged.
+
+2.1.5.  Additional Registration Trees
+
+   From time to time and as required by the community, the IANA may,
+   with the advice and consent of the IESG, create new top-level
+   registration trees.  It is explicitly assumed that these trees may be
+   created for external registration and management by well-known
+   permanent bodies, such as scientific societies for media types
+   specific to the sciences they cover.  In general, the quality of
+   review of specifications for one of these additional registration
+   trees is expected to be equivalent to that which IETF would give to
+   registrations in its own tree. Establishment of these new trees will
+   be announced through RFC publication approved by the IESG.
+
+2.2.  Registration Requirements
+
+   Media type registration proposals are all expected to conform to
+   various requirements laid out in the following sections.  Note that
+   requirement specifics sometimes vary depending on the registration
+   tree, again as detailed in the following sections.
+
+2.2.1.  Functionality Requirement
+
+   Media types must function as an actual media format: Registration of
+   things that are better thought of as a transfer encoding, as a
+   character set, or as a collection of separate entities of another
+   type, is not allowed.  For example, although applications exist to
+   decode the base64 transfer encoding [RFC 2045], base64 cannot be
+   registered as a media type.
+
+   This requirement applies regardless of the registration tree
+   involved.
+
+2.2.2.  Naming Requirements
+
+   All registered media types must be assigned MIME type and subtype
+   names. The combination of these names then serves to uniquely
+   identify the media type and the format of the subtype name identifies
+   the registration tree.
+
+   The choice of top-level type name must take the nature of media type
+   involved into account. For example, media normally used for
+   representing still images should be a subtype of the image content
+   type, whereas media capable of representing audio information belongs
+
+
+
+Freed, et. al.           Best Current Practice                  [Page 6]
+
+RFC 2048              MIME Registration Procedures         November 1996
+
+
+   under the audio content type. See RFC 2046 for additional information
+   on the basic set of top-level types and their characteristics.
+
+   New subtypes of top-level types must conform to the restrictions of
+   the top-level type, if any. For example, all subtypes of the
+   multipart content type must use the same encapsulation syntax.
+
+   In some cases a new media type may not "fit" under any currently
+   defined top-level content type. Such cases are expected to be quite
+   rare. However, if such a case arises a new top-level type can be
+   defined to accommodate it. Such a definition must be done via
+   standards-track RFC; no other mechanism can be used to define
+   additional top-level content types.
+
+   These requirements apply regardless of the registration tree
+   involved.
+
+2.2.3.  Parameter Requirements
+
+   Media types may elect to use one or more MIME content type
+   parameters, or some parameters may be automatically made available to
+   the media type by virtue of being a subtype of a content type that
+   defines a set of parameters applicable to any of its subtypes.  In
+   either case, the names, values, and meanings of any parameters must
+   be fully specified when a media type is registered in the IETF tree,
+   and should be specified as completely as possible when media types
+   are registered in the vendor or personal trees.
+
+   New parameters must not be defined as a way to introduce new
+   functionality in types registered in the IETF tree, although new
+   parameters may be added to convey additional information that does
+   not otherwise change existing functionality.  An example of this
+   would be a "revision" parameter to indicate a revision level of an
+   external specification such as JPEG.  Similar behavior is encouraged
+   for media types registered in the vendor or personal trees but is not
+   required.
+
+2.2.4.  Canonicalization and Format Requirements
+
+   All registered media types must employ a single, canonical data
+   format, regardless of registration tree.
+
+   A precise and openly available specification of the format of each
+   media type is required for all types registered in the IETF tree and
+   must at a minimum be referenced by, if it isn't actually included in,
+   the media type registration proposal itself.
+
+
+
+
+
+Freed, et. al.           Best Current Practice                  [Page 7]
+
+RFC 2048              MIME Registration Procedures         November 1996
+
+
+   The specifications of format and processing particulars may or may
+   not be publically available for media types registered in the vendor
+   tree, and such registration proposals are explicitly permitted to
+   include only a specification of which software and version produce or
+   process such media types.  References to or inclusion of format
+   specifications in registration proposals is encouraged but not
+   required.
+
+   Format specifications are still required for registration in the
+   personal tree, but may be either published as RFCs or otherwise
+   deposited with IANA. The deposited specifications will meet the same
+   criteria as those required to register a well-known TCP port and, in
+   particular, need not be made public.
+
+   Some media types involve the use of patented technology.  The
+   registration of media types involving patented technology is
+   specifically permitted.  However, the restrictions set forth in RFC
+   1602 on the use of patented technology in standards-track protocols
+   must be respected when the specification of a media type is part of a
+   standards-track protocol.
+
+2.2.5.  Interchange Recommendations
+
+   Media types should, whenever possible, interoperate across as many
+   systems and applications as possible. However, some media types will
+   inevitably have problems interoperating across different platforms.
+   Problems with different versions, byte ordering, and specifics of
+   gateway handling can and will arise.
+
+   Universal interoperability of media types is not required, but known
+   interoperability issues should be identified whenever possible.
+   Publication of a media type does not require an exhaustive review of
+   interoperability, and the interoperability considerations section is
+   subject to continuing evaluation.
+
+   These recommendations apply regardless of the registration tree
+   involved.
+
+2.2.6.  Security Requirements
+
+   An analysis of security issues is required for for all types
+   registered in the IETF Tree.  (This is in accordance with the basic
+   requirements for all IETF protocols.) A similar analysis for media
+   types registered in the vendor or personal trees is encouraged but
+   not required.  However, regardless of what security analysis has or
+   has not been done, all descriptions of security issues must be as
+   accurate as possible regardless of registration tree.  In particular,
+   a statement that there are "no security issues associated with this
+
+
+
+Freed, et. al.           Best Current Practice                  [Page 8]
+
+RFC 2048              MIME Registration Procedures         November 1996
+
+
+   type" must not be confused with "the security issues associates with
+   this type have not been assessed".
+
+   There is absolutely no requirement that media types registered in any
+   tree be secure or completely free from risks.  Nevertheless, all
+   known security risks must be identified in the registration of a
+   media type, again regardless of registration tree.
+
+   The security considerations section of all registrations is subject
+   to continuing evaluation and modification, and in particular may be
+   extended by use of the "comments on media types" mechanism described
+   in subsequent sections.
+
+   Some of the issues that should be looked at in a security analysis of
+   a media type are:
+
+    (1)   Complex media types may include provisions for
+          directives that institute actions on a recipient's
+          files or other resources.  In many cases provision is
+          made for originators to specify arbitrary actions in an
+          unrestricted fashion which may then have devastating
+          effects.  See the registration of the
+          application/postscript media type in RFC 2046 for
+          an example of such directives and how to handle them.
+
+    (2)   Complex media types may include provisions for
+          directives that institute actions which, while not
+          directly harmful to the recipient, may result in
+          disclosure of information that either facilitates a
+          subsequent attack or else violates a recipient's
+          privacy in some way.  Again, the registration of the
+          application/postscript media type illustrates how such
+          directives can be handled.
+
+    (3)   A media type might be targeted for applications that
+          require some sort of security assurance but not provide
+          the necessary security mechanisms themselves. For
+          example, a media type could be defined for storage of
+          confidential medical information which in turn requires
+          an external confidentiality service.
+
+2.2.7.  Usage and Implementation Non-requirements
+
+   In the asynchronous mail environment, where information on the
+   capabilities of the remote mail agent is frequently not available to
+   the sender, maximum interoperability is attained by restricting the
+   number of media types used to those "common" formats expected to be
+   widely implemented.  This was asserted in the past as a reason to
+
+
+
+Freed, et. al.           Best Current Practice                  [Page 9]
+
+RFC 2048              MIME Registration Procedures         November 1996
+
+
+   limit the number of possible media types and resulted in a
+   registration process with a significant hurdle and delay for those
+   registering media types.
+
+   However, the need for "common" media types does not require limiting
+   the registration of new media types. If a limited set of media types
+   is recommended for a particular application, that should be asserted
+   by a separate applicability statement specific for the application
+   and/or environment.
+
+   As such, universal support and implementation of a media type is NOT
+   a requirement for registration.  If, however, a media type is
+   explicitly intended for limited use, this should be noted in its
+   registration.
+
+2.2.8.  Publication Requirements
+
+   Proposals for media types registered in the IETF tree must be
+   published as RFCs. RFC publication of vendor and personal media type
+   proposals is encouraged but not required. In all cases IANA will
+   retain copies of all media type proposals and "publish" them as part
+   of the media types registration tree itself.
+
+   Other than in the IETF tree, the registration of a data type does not
+   imply endorsement, approval, or recommendation by IANA or IETF or
+   even certification that the specification is adequate.  To become
+   Internet Standards, protocol, data objects, or whatever must go
+   through the IETF standards process.  This is too difficult and too
+   lengthy a process for the convenient registration of media types.
+
+   The IETF tree exists for media types that do require require a
+   substantive review and approval process with the vendor and personal
+   trees exist for those that do not. It is expected that applicability
+   statements for particular applications will be published from time to
+   time that recommend implementation of, and support for, media types
+   that have proven particularly useful in those contexts.
+
+   As discussed above, registration of a top-level type requires
+   standards-track processing and, hence, RFC publication.
+
+2.2.9.  Additional Information
+
+   Various sorts of optional information may be included in the
+   specification of a media type if it is available:
+
+    (1)   Magic number(s) (length, octet values). Magic numbers
+          are byte sequences that are always present and thus can
+          be used to identify entities as being of a given media
+
+
+
+Freed, et. al.           Best Current Practice                 [Page 10]
+
+RFC 2048              MIME Registration Procedures         November 1996
+
+
+          type.
+
+    (2)   File extension(s) commonly used on one or more
+          platforms to indicate that some file containing a given
+          type of media.
+
+    (3)   Macintosh File Type code(s) (4 octets) used to label
+          files containing a given type of media.
+
+   Such information is often quite useful to implementors and if
+   available should be provided.
+
+2.3.  Registration Procedure
+
+   The following procedure has been implemented by the IANA for review
+   and approval of new media types.  This is not a formal standards
+   process, but rather an administrative procedure intended to allow
+   community comment and sanity checking without excessive time delay.
+   For registration in the IETF tree, the normal IETF processes should
+   be followed, treating posting of an internet-draft and announcement
+   on the ietf-types list (as described in the next subsection) as a
+   first step.  For registrations in the vendor or personal tree, the
+   initial review step described below may be omitted and the type
+   registered directly by submitting the template and an explanation
+   directly to IANA (at iana@iana.org).  However, authors of vendor or
+   personal media type specifications are encouraged to seek community
+   review and comment whenever that is feasible.
+
+2.3.1.  Present the Media Type to the Community for Review
+
+   Send a proposed media type registration to the "ietf-types@iana.org"
+   mailing list for a two week review period.  This mailing list has
+   been established for the purpose of reviewing proposed media and
+   access types. Proposed media types are not formally registered and
+   must not be used; the "x-" prefix specified in RFC 2045 can be used
+   until registration is complete.
+
+   The intent of the public posting is to solicit comments and feedback
+   on the choice of type/subtype name, the unambiguity of the references
+   with respect to versions and external profiling information, and a
+   review of any interoperability or security considerations. The
+   submitter may submit a revised registration, or withdraw the
+   registration completely, at any time.
+
+
+
+
+
+
+
+
+Freed, et. al.           Best Current Practice                 [Page 11]
+
+RFC 2048              MIME Registration Procedures         November 1996
+
+
+2.3.2.  IESG Approval
+
+   Media types registered in the IETF tree must be submitted to the IESG
+   for approval.
+
+2.3.3.  IANA Registration
+
+   Provided that the media type meets the requirements for media types
+   and has obtained approval that is necessary, the author may submit
+   the registration request to the IANA, which will register the media
+   type and make the media type registration available to the community.
+
+2.4.  Comments on Media Type Registrations
+
+   Comments on registered media types may be submitted by members of the
+   community to IANA.  These comments will be passed on to the "owner"
+   of the media type if possible.  Submitters of comments may request
+   that their comment be attached to the media type registration itself,
+   and if IANA approves of this the comment will be made accessible in
+   conjunction with the type registration itself.
+
+2.5.  Location of Registered Media Type List
+
+   Media type registrations will be posted in the anonymous FTP
+   directory "ftp://ftp.isi.edu/in-notes/iana/assignments/media-types/"
+   and all registered media types will be listed in the periodically
+   issued "Assigned Numbers" RFC [currently STD 2, RFC 1700].  The media
+   type description and other supporting material may also be published
+   as an Informational RFC by sending it to "rfc-editor@isi.edu" (please
+   follow the instructions to RFC authors [RFC-1543]).
+
+2.6.  IANA Procedures for Registering Media Types
+
+   The IANA will only register media types in the IETF tree in response
+   to a communication from the IESG stating that a given registration
+   has been approved. Vendor and personal types will be registered by
+   the IANA automatically and without any formal review as long as the
+   following minimal conditions are met:
+
+    (1)   Media types must function as an actual media format.
+          In particular, character sets and transfer encodings
+          may not be registered as media types.
+
+    (2)   All media types must have properly formed type and
+          subtype names. All type names must be defined by a
+          standards-track RFC. All subtype names must be unique,
+          must conform to the MIME grammar for such names, and
+          must contain the proper tree prefix.
+
+
+
+Freed, et. al.           Best Current Practice                 [Page 12]
+
+RFC 2048              MIME Registration Procedures         November 1996
+
+
+    (3)   Types registered in the personal tree must either
+          provide a format specification or a pointer to one.
+
+    (4)   Any security considerations given must not be obviously
+          bogus. (It is neither possible nor necessary for the
+          IANA to conduct a comprehensive security review of
+          media type registrations.  Nevertheless, IANA has the
+          authority to identify obviously incompetent material
+          and exclude it.)
+
+2.7.  Change Control
+
+   Once a media type has been published by IANA, the author may request
+   a change to its definition. The descriptions of the different
+   registration trees above designate the "owners" of each type of
+   registration. The change request follows the same procedure as the
+   registration request:
+
+    (1)   Publish the revised template on the ietf-types list.
+
+    (2)   Leave at least two weeks for comments.
+
+    (3)   Publish using IANA after formal review if required.
+
+   Changes should be requested only when there are serious omission or
+   errors in the published specification. When review is required, a
+   change request may be denied if it renders entities that were valid
+   under the previous definition invalid under the new definition.
+
+   The owner of a content type may pass responsibility for the content
+   type to another person or agency by informing IANA and the ietf-types
+   list; this can be done without discussion or review.
+
+   The IESG may reassign responsibility for a media type. The most
+   common case of this will be to enable changes to be made to types
+   where the author of the registration has died, moved out of contact
+   or is otherwise unable to make changes that are important to the
+   community.
+
+   Media type registrations may not be deleted; media types which are no
+   longer believed appropriate for use can be declared OBSOLETE by a
+   change to their "intended use" field; such media types will be
+   clearly marked in the lists published by IANA.
+
+
+
+
+
+
+
+
+Freed, et. al.           Best Current Practice                 [Page 13]
+
+RFC 2048              MIME Registration Procedures         November 1996
+
+
+2.8.  Registration Template
+
+     To: ietf-types@iana.org
+     Subject: Registration of MIME media type XXX/YYY
+
+     MIME media type name:
+
+     MIME subtype name:
+
+     Required parameters:
+
+     Optional parameters:
+
+     Encoding considerations:
+
+     Security considerations:
+
+     Interoperability considerations:
+
+     Published specification:
+
+     Applications which use this media type:
+
+     Additional information:
+
+       Magic number(s):
+       File extension(s):
+       Macintosh File Type Code(s):
+
+     Person & email address to contact for further information:
+
+     Intended usage:
+
+     (One of COMMON, LIMITED USE or OBSOLETE)
+
+     Author/Change controller:
+
+     (Any other information that the author deems interesting may be
+     added below this line.)
+
+3.  External Body Access Types
+
+   RFC 2046 defines the message/external-body media type, whereby a MIME
+   entity can act as pointer to the actual body data in lieu of
+   including the data directly in the entity body. Each
+   message/external-body reference specifies an access type, which
+   determines the mechanism used to retrieve the actual body data. RFC
+   2046 defines an initial set of access types, but allows for the
+
+
+
+Freed, et. al.           Best Current Practice                 [Page 14]
+
+RFC 2048              MIME Registration Procedures         November 1996
+
+
+   registration of additional access types to accommodate new retrieval
+   mechanisms.
+
+3.1.  Registration Requirements
+
+   New access type specifications must conform to a number of
+   requirements as described below.
+
+3.1.1.  Naming Requirements
+
+   Each access type must have a unique name.  This name appears in the
+   access-type parameter in the message/external-body content-type
+   header field, and must conform to MIME content type parameter syntax.
+
+3.1.2.  Mechanism Specification Requirements
+
+   All of the protocols, transports, and procedures used by a given
+   access type must be described, either in the specification of the
+   access type itself or in some other publicly available specification,
+   in sufficient detail for the access type to be implemented by any
+   competent implementor.  Use of secret and/or proprietary methods in
+   access types are expressly prohibited. The restrictions imposed by
+   RFC 1602 on the standardization of patented algorithms must be
+   respected as well.
+
+3.1.3.  Publication Requirements
+
+   All access types must be described by an RFC. The RFC may be
+   informational rather than standards-track, although standard-track
+   review and approval are encouraged for all access types.
+
+3.1.4.  Security Requirements
+
+   Any known security issues that arise from the use of the access type
+   must be completely and fully described. It is not required that the
+   access type be secure or that it be free from risks, but that the
+   known risks be identified.  Publication of a new access type does not
+   require an exhaustive security review, and the security
+   considerations section is subject to continuing evaluation.
+   Additional security considerations should be addressed by publishing
+   revised versions of the access type specification.
+
+3.2.  Registration Procedure
+
+   Registration of a new access type starts with the construction of a
+   draft of an RFC.
+
+
+
+
+
+Freed, et. al.           Best Current Practice                 [Page 15]
+
+RFC 2048              MIME Registration Procedures         November 1996
+
+
+3.2.1.  Present the Access Type to the Community
+
+   Send a proposed access type specification to the "ietf-
+   types@iana.org" mailing list for a two week review period.  This
+   mailing list has been established for the purpose of reviewing
+   proposed access and media types.  Proposed access types are not
+   formally registered and must not be used.
+
+   The intent of the public posting is to solicit comments and feedback
+   on the access type specification and a review of any security
+   considerations.
+
+3.2.2.  Access Type Reviewer
+
+   When the two week period has passed, the access type reviewer, who is
+   appointed by the IETF Applications Area Director, either forwards the
+   request to iana@isi.edu, or rejects it because of significant
+   objections raised on the list.
+
+   Decisions made by the reviewer must be posted to the ietf-types
+   mailing list within 14 days. Decisions made by the reviewer may be
+   appealed to the IESG.
+
+3.2.3.  IANA Registration
+
+   Provided that the access type has either passed review or has been
+   successfully appealed to the IESG, the IANA will register the access
+   type and make the registration available to the community. The
+   specification of the access type must also be published as an RFC.
+   Informational RFCs are published by sending them to "rfc-
+   editor@isi.edu" (please follow the instructions to RFC authors [RFC-
+   1543]).
+
+3.3.  Location of Registered Access Type List
+
+   Access type registrations will be posted in the anonymous FTP
+   directory "ftp://ftp.isi.edu/in-notes/iana/assignments/access-types/"
+   and all registered access types will be listed in the periodically
+   issued "Assigned Numbers" RFC [currently RFC-1700].
+
+3.4.  IANA Procedures for Registering Access Types
+
+   The identity of the access type reviewer is communicated to the IANA
+   by the IESG.  The IANA then only acts in response to access type
+   definitions that either are approved by the access type reviewer and
+   forwarded by the reviewer to the IANA for registration, or in
+   response to a communication from the IESG that an access type
+   definition appeal has overturned the access type reviewer's ruling.
+
+
+
+Freed, et. al.           Best Current Practice                 [Page 16]
+
+RFC 2048              MIME Registration Procedures         November 1996
+
+
+4.  Transfer Encodings
+
+   Transfer encodings are tranformations applied to MIME media types
+   after conversion to the media type's canonical form.  Transfer
+   encodings are used for several purposes:
+
+    (1)   Many transports, especially message transports, can
+          only handle data consisting of relatively short lines
+          of text. There can also be severe restrictions on what
+          characters can be used in these lines of text -- some
+          transports are restricted to a small subset of US-ASCII
+          and others cannot handle certain character sequences.
+          Transfer encodings are used to transform binary data
+          into textual form that can survive such transports.
+          Examples of this sort of transfer encoding include the
+          base64 and quoted-printable transfer encodings defined
+          in RFC 2045.
+
+    (2)   Image, audio, video, and even application entities are
+          sometimes quite large. Compression algorithms are often
+          quite effective in reducing the size of large entities.
+          Transfer encodings can be used to apply general-purpose
+          non-lossy compression algorithms to MIME entities.
+
+    (3)   Transport encodings can be defined as a means of
+          representing existing encoding formats in a MIME
+          context.
+
+   IMPORTANT:  The standardization of a large numbers of different
+   transfer encodings is seen as a significant barrier to widespread
+   interoperability and is expressely discouraged.  Nevertheless, the
+   following procedure has been defined to provide a means of defining
+   additional transfer encodings, should standardization actually be
+   justified.
+
+4.1.  Transfer Encoding Requirements
+
+   Transfer encoding specifications must conform to a number of
+   requirements as described below.
+
+4.1.1.  Naming Requirements
+
+   Each transfer encoding must have a unique name.  This name appears in
+   the Content-Transfer-Encoding header field and must conform to the
+   syntax of that field.
+
+
+
+
+
+
+Freed, et. al.           Best Current Practice                 [Page 17]
+
+RFC 2048              MIME Registration Procedures         November 1996
+
+
+4.1.2.  Algorithm Specification Requirements
+
+   All of the algorithms used in a transfer encoding (e.g.  conversion
+   to printable form, compression) must be described in their entirety
+   in the transfer encoding specification.  Use of secret and/or
+   proprietary algorithms in standardized transfer encodings are
+   expressly prohibited. The restrictions imposed by RFC 1602 on the
+   standardization of patented algorithms must be respected as well.
+
+4.1.3.  Input Domain Requirements
+
+   All transfer encodings must be applicable to an arbitrary sequence of
+   octets of any length.  Dependence on particular input forms is not
+   allowed.
+
+   It should be noted that the 7bit and 8bit encodings do not conform to
+   this requirement. Aside from the undesireability of having
+   specialized encodings, the intent here is to forbid the addition of
+   additional encodings along the lines of 7bit and 8bit.
+
+4.1.4.  Output Range Requirements
+
+   There is no requirement that a particular tranfer encoding produce a
+   particular form of encoded output.  However, the output format for
+   each transfer encoding must be fully and completely documented.  In
+   particular, each specification must clearly state whether the output
+   format always lies within the confines of 7bit data, 8bit data, or is
+   simply pure binary data.
+
+4.1.5.  Data Integrity and Generality Requirements
+
+   All transfer encodings must be fully invertible on any platform; it
+   must be possible for anyone to recover the original data by
+   performing the corresponding decoding operation.  Note that this
+   requirement effectively excludes all forms of lossy compression as
+   well as all forms of encryption from use as a transfer encoding.
+
+4.1.6.  New Functionality Requirements
+
+   All transfer encodings must provide some sort of new functionality.
+   Some degree of functionality overlap with previously defined transfer
+   encodings is acceptable, but any new transfer encoding must also
+   offer something no other transfer encoding provides.
+
+
+
+
+
+
+
+
+Freed, et. al.           Best Current Practice                 [Page 18]
+
+RFC 2048              MIME Registration Procedures         November 1996
+
+
+4.2.  Transfer Encoding Definition Procedure
+
+   Definition of a new transfer encoding starts with the construction of
+   a draft of a standards-track RFC.  The RFC must define the transfer
+   encoding precisely and completely, and must also provide substantial
+   justification for defining and standardizing a new transfer encoding.
+   This specification must then be presented to the IESG for
+   consideration.  The IESG can
+
+    (1)   reject the specification outright as being
+          inappropriate for standardization,
+
+    (2)   approve the formation of an IETF working group to work
+          on the specification in accordance with IETF
+          procedures, or,
+
+    (3)   accept the specification as-is and put it directly on
+          the standards track.
+
+   Transfer encoding specifications on the standards track follow normal
+   IETF rules for standards track documents.  A transfer encoding is
+   considered to be defined and available for use once it is on the
+   standards track.
+
+4.3.  IANA Procedures for Transfer Encoding Registration
+
+   There is no need for a special procedure for registering Transfer
+   Encodings with the IANA. All legitimate transfer encoding
+   registrations must appear as a standards-track RFC, so it is the
+   IESG's responsibility to notify the IANA when a new transfer encoding
+   has been approved.
+
+4.4.  Location of Registered Transfer Encodings List
+
+   Transfer encoding registrations will be posted in the anonymous FTP
+   directory "ftp://ftp.isi.edu/in-notes/iana/assignments/transfer-
+   encodings/" and all registered transfer encodings will be listed in
+   the periodically issued "Assigned Numbers" RFC [currently RFC-1700].
+
+
+
+
+
+
+
+
+
+
+
+
+
+Freed, et. al.           Best Current Practice                 [Page 19]
+
+RFC 2048              MIME Registration Procedures         November 1996
+
+
+5.  Authors' Addresses
+
+   For more information, the authors of this document are best
+   contacted via Internet mail:
+
+   Ned Freed
+   Innosoft International, Inc.
+   1050 East Garvey Avenue South
+   West Covina, CA 91790
+   USA
+
+   Phone: +1 818 919 3600
+   Fax:   +1 818 919 3614
+   EMail: ned@innosoft.com
+
+
+   John Klensin
+   MCI
+   2100 Reston Parkway
+   Reston, VA 22091
+
+   Phone: +1 703 715-7361
+   Fax:   +1 703 715-7436
+   EMail: klensin@mci.net
+
+
+   Jon Postel
+   USC/Information Sciences Institute
+   4676 Admiralty Way
+   Marina del Rey, CA  90292
+   USA
+
+
+   Phone: +1 310 822 1511
+   Fax:   +1 310 823 6714
+   EMail: Postel@ISI.EDU
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Freed, et. al.           Best Current Practice                 [Page 20]
+
+RFC 2048              MIME Registration Procedures         November 1996
+
+
+Appendix A -- Grandfathered Media Types
+
+   A number of media types, registered prior to 1996, would, if
+   registered under the guidelines in this document, be placed into
+   either the vendor or personal trees.  Reregistration of those types
+   to reflect the appropriate trees is encouraged, but not required.
+   Ownership and change control principles outlined in this document
+   apply to those types as if they had been registered in the trees
+   described above.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Freed, et. al.           Best Current Practice                 [Page 21]
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2049.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2049.txt
new file mode 100644
index 000000000..99f174b95
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2049.txt
@@ -0,0 +1,1347 @@
+
+
+
+
+
+
+Network Working Group                                          N. Freed
+Request for Comments: 2049                                     Innosoft
+Obsoletes: 1521, 1522, 1590                               N. Borenstein
+Category: Standards Track                                 First Virtual
+                                                          November 1996
+
+
+                 Multipurpose Internet Mail Extensions
+                           (MIME) Part Five:
+                   Conformance Criteria and Examples
+
+Status of this Memo
+
+   This document specifies an Internet standards track protocol for the
+   Internet community, and requests discussion and suggestions for
+   improvements.  Please refer to the current edition of the "Internet
+   Official Protocol Standards" (STD 1) for the standardization state
+   and status of this protocol.  Distribution of this memo is unlimited.
+
+Abstract
+
+   STD 11, RFC 822, defines a message representation protocol specifying
+   considerable detail about US-ASCII message headers, and leaves the
+   message content, or message body, as flat US-ASCII text.  This set of
+   documents, collectively called the Multipurpose Internet Mail
+   Extensions, or MIME, redefines the format of messages to allow for
+
+    (1)   textual message bodies in character sets other than
+          US-ASCII,
+
+    (2)   an extensible set of different formats for non-textual
+          message bodies,
+
+    (3)   multi-part message bodies, and
+
+    (4)   textual header information in character sets other than
+          US-ASCII.
+
+   These documents are based on earlier work documented in RFC 934, STD
+   11, and RFC 1049, but extends and revises them.  Because RFC 822 said
+   so little about message bodies, these documents are largely
+   orthogonal to (rather than a revision of) RFC 822.
+
+   The initial document in this set, RFC 2045, specifies the various
+   headers used to describe the structure of MIME messages. The second
+   document defines the general structure of the MIME media typing
+   system and defines an initial set of media types.  The third
+   document, RFC 2047, describes extensions to RFC 822 to allow non-US-
+
+
+
+Freed & Borenstein          Standards Track                     [Page 1]
+
+RFC 2049                    MIME Conformance               November 1996
+
+
+   ASCII text data in Internet mail header fields. The fourth document,
+   RFC 2048, specifies various IANA registration procedures for MIME-
+   related facilities. This fifth and final document describes MIME
+   conformance criteria as well as providing some illustrative examples
+   of MIME message formats, acknowledgements, and the bibliography.
+
+   These documents are revisions of RFCs 1521, 1522, and 1590, which
+   themselves were revisions of RFCs 1341 and 1342.  Appendix B of this
+   document describes differences and changes from previous versions.
+
+Table of Contents
+
+   1. Introduction ..........................................    2
+   2. MIME Conformance ......................................    2
+   3. Guidelines for Sending Email Data .....................    6
+   4. Canonical Encoding Model ..............................    9
+   5. Summary ...............................................   12
+   6. Security Considerations ...............................   12
+   7. Authors' Addresses ....................................   12
+   8. Acknowledgements ......................................   13
+   A. A Complex Multipart Example ...........................   15
+   B. Changes from RFC 1521, 1522, and 1590 .................   16
+   C. References ............................................   20
+
+1.  Introduction
+
+   The first and second documents in this set define MIME header fields
+   and the initial set of MIME media types.  The third document
+   describes extensions to RFC822 formats to allow for character sets
+   other than US-ASCII.  This document describes what portions  of MIME
+   must be supported by a conformant MIME implementation. It also
+   describes various pitfalls of contemporary messaging systems as well
+   as the canonical encoding model MIME is based on.
+
+2.  MIME Conformance
+
+   The mechanisms described in these documents are open-ended.  It is
+   definitely not expected that all implementations will support all
+   available media types, nor that they will all share the same
+   extensions.  In order to promote interoperability, however, it is
+   useful to define the concept of "MIME-conformance" to define a
+   certain level of implementation that allows the useful interworking
+   of messages with content that differs from US-ASCII text.  In this
+   section, we specify the requirements for such conformance.
+
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                     [Page 2]
+
+RFC 2049                    MIME Conformance               November 1996
+
+
+   A mail user agent that is MIME-conformant MUST:
+
+    (1)   Always generate a "MIME-Version: 1.0" header field in
+          any message it creates.
+
+    (2)   Recognize the Content-Transfer-Encoding header field
+          and decode all received data encoded by either quoted-
+          printable or base64 implementations.  The identity
+          transformations 7bit, 8bit, and binary must also be
+          recognized.
+
+          Any non-7bit data that is sent without encoding must be
+          properly labelled with a content-transfer-encoding of
+          8bit or binary, as appropriate.  If the underlying
+          transport does not support 8bit or binary (as SMTP
+          [RFC-821] does not), the sender is required to both
+          encode and label data using an appropriate Content-
+          Transfer-Encoding such as quoted-printable or base64.
+
+    (3)   Must treat any unrecognized Content-Transfer-Encoding
+          as if it had a Content-Type of "application/octet-
+          stream", regardless of whether or not the actual
+          Content-Type is recognized.
+
+    (4)   Recognize and interpret the Content-Type header field,
+          and avoid showing users raw data with a Content-Type
+          field other than text.  Implementations  must be able
+          to send at least text/plain messages, with the
+          character set specified with the charset parameter if
+          it is not US-ASCII.
+
+    (5)   Ignore any content type parameters whose names they do
+          not recognize.
+
+    (6)   Explicitly handle the following media type values, to
+          at least the following extents:
+
+          Text:
+
+            -- Recognize and display "text" mail with the
+            character set "US-ASCII."
+
+            -- Recognize other character sets at least to the
+            extent of being able to inform the user about what
+            character set the message uses.
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                     [Page 3]
+
+RFC 2049                    MIME Conformance               November 1996
+
+
+            -- Recognize the "ISO-8859-*" character sets to the
+            extent of being able to display those characters that
+            are common to ISO-8859-* and US-ASCII, namely all
+            characters represented by octet values 1-127.
+
+            -- For unrecognized subtypes in a known character
+            set, show or offer to show the user the "raw" version
+            of the data after conversion of the content from
+            canonical form to local form.
+
+            -- Treat material in an unknown character set as if
+            it were "application/octet-stream".
+
+          Image, audio, and video:
+
+            -- At a minumum provide facilities to treat any
+            unrecognized subtypes as if they were
+            "application/octet-stream".
+
+          Application:
+
+            -- Offer the ability to remove either of the quoted-
+            printable or base64 encodings defined in this
+            document if they were used and put the resulting
+            information in a user file.
+
+          Multipart:
+
+            -- Recognize the mixed subtype.  Display all relevant
+            information on the message level and the body part
+            header level and then display or offer to display
+            each of the body parts individually.
+
+            -- Recognize the "alternative" subtype, and avoid
+            showing the user redundant parts of
+            multipart/alternative mail.
+
+            -- Recognize the "multipart/digest" subtype,
+            specifically using "message/rfc822" rather than
+            "text/plain" as the default media type for body parts
+            inside "multipart/digest" entities.
+
+            -- Treat any unrecognized subtypes as if they were
+            "mixed".
+
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                     [Page 4]
+
+RFC 2049                    MIME Conformance               November 1996
+
+
+          Message:
+
+            -- Recognize and display at least the RFC822 message
+            encapsulation (message/rfc822) in such a way as to
+            preserve any recursive structure, that is, displaying
+            or offering to display the encapsulated data in
+            accordance with its media type.
+
+            -- Treat any unrecognized subtypes as if they were
+            "application/octet-stream".
+
+    (7)   Upon encountering any unrecognized Content-Type field,
+          an implementation must treat it as if it had a media
+          type of "application/octet-stream" with no parameter
+          sub-arguments.  How such data are handled is up to an
+          implementation, but likely options for handling such
+          unrecognized data include offering the user to write it
+          into a file (decoded from its mail transport format) or
+          offering the user to name a program to which the
+          decoded data should be passed as input.
+
+    (8)   Conformant user agents are required, if they provide
+          non-standard support for non-MIME messages employing
+          character sets other than US-ASCII, to do so on
+          received messages only. Conforming user agents must not
+          send non-MIME messages containing anything other than
+          US-ASCII text.
+
+          In particular, the use of non-US-ASCII text in mail
+          messages without a MIME-Version field is strongly
+          discouraged as it impedes interoperability when sending
+          messages between regions with different localization
+          conventions. Conforming user agents MUST include proper
+          MIME labelling when sending anything other than plain
+          text in the US-ASCII character set.
+
+          In addition, non-MIME user agents should be upgraded if
+          at all possible to include appropriate MIME header
+          information in the messages they send even if nothing
+          else in MIME is supported.  This upgrade will have
+          little, if any, effect on non-MIME recipients and will
+          aid MIME in correctly displaying such messages.  It
+          also provides a smooth transition path to eventual
+          adoption of other MIME capabilities.
+
+    (9)   Conforming user agents must ensure that any string of
+          non-white-space printable US-ASCII characters within a
+          "*text" or "*ctext" that begins with "=?" and ends with
+
+
+
+Freed & Borenstein          Standards Track                     [Page 5]
+
+RFC 2049                    MIME Conformance               November 1996
+
+
+          "?=" be a valid encoded-word.  ("begins" means: At the
+          start of the field-body or immediately following
+          linear-white-space; "ends" means: At the end of the
+          field-body or immediately preceding linear-white-
+          space.) In addition, any "word" within a "phrase" that
+          begins with "=?" and ends with "?=" must be a valid
+          encoded-word.
+
+    (10)  Conforming user agents must be able to distinguish
+          encoded-words from "text", "ctext", or "word"s,
+          according to the rules in section 4, anytime they
+          appear in appropriate places in message headers.  It
+          must support both the "B" and "Q" encodings for any
+          character set which it supports.  The program must be
+          able to display the unencoded text if the character set
+          is "US-ASCII".  For the ISO-8859-* character sets, the
+          mail reading program must at least be able to display
+          the characters which are also in the US-ASCII set.
+
+   A user agent that meets the above conditions is said to be MIME-
+   conformant.  The meaning of this phrase is that it is assumed to be
+   "safe" to send virtually any kind of properly-marked data to users of
+   such mail systems, because such systems will at least be able to
+   treat the data as undifferentiated binary, and will not simply splash
+   it onto the screen of unsuspecting users.
+
+   There is another sense in which it is always "safe" to send data in a
+   format that is MIME-conformant, which is that such data will not
+   break or be broken by any known systems that are conformant with RFC
+   821 and RFC 822.  User agents that are MIME-conformant have the
+   additional guarantee that the user will not be shown data that were
+   never intended to be viewed as text.
+
+3.  Guidelines for Sending Email Data
+
+   Internet email is not a perfect, homogeneous system.  Mail may become
+   corrupted at several stages in its travel to a final destination.
+   Specifically, email sent throughout the Internet may travel across
+   many networking technologies. Many networking and mail technologies
+   do not support the full functionality possible in the SMTP transport
+   environment.  Mail traversing these systems is likely to be modified
+   in order that it can be transported.
+
+   There exist many widely-deployed non-conformant MTAs in the Internet.
+   These MTAs, speaking the SMTP protocol, alter messages on the fly to
+   take advantage of the internal data structure of the hosts they are
+   implemented on, or are just plain broken.
+
+
+
+
+Freed & Borenstein          Standards Track                     [Page 6]
+
+RFC 2049                    MIME Conformance               November 1996
+
+
+   The following guidelines may be useful to anyone devising a data
+   format (media type) that is supposed to survive the widest range of
+   networking technologies and known broken MTAs unscathed.  Note that
+   anything encoded in the base64 encoding will satisfy these rules, but
+   that some well-known mechanisms, notably the UNIX uuencode facility,
+   will not.  Note also that anything encoded in the Quoted-Printable
+   encoding will survive most gateways intact, but possibly not some
+   gateways to systems that use the EBCDIC character set.
+
+    (1)   Under some circumstances the encoding used for data may
+          change as part of normal gateway or user agent
+          operation.  In particular, conversion from base64 to
+          quoted-printable and vice versa may be necessary.  This
+          may result in the confusion of CRLF sequences with line
+          breaks in text bodies.  As such, the persistence of
+          CRLF as something other than a line break must not be
+          relied on.
+
+    (2)   Many systems may elect to represent and store text data
+          using local newline conventions.  Local newline
+          conventions may not match the RFC822 CRLF convention --
+          systems are known that use plain CR, plain LF, CRLF, or
+          counted records.  The result is that isolated CR and LF
+          characters are not well tolerated in general; they may
+          be lost or converted to delimiters on some systems, and
+          hence must not be relied on.
+
+    (3)   The transmission of NULs (US-ASCII value 0) is
+          problematic in Internet mail.  (This is largely the
+          result of NULs being used as a termination character by
+          many of the standard runtime library routines in the C
+          programming language.) The practice of using NULs as
+          termination characters is so entrenched now that
+          messages should not rely on them being preserved.
+
+    (4)   TAB (HT) characters may be misinterpreted or may be
+          automatically converted to variable numbers of spaces.
+          This is unavoidable in some environments, notably those
+          not based on the US-ASCII character set.  Such
+          conversion is STRONGLY DISCOURAGED, but it may occur,
+          and mail formats must not rely on the persistence of
+          TAB (HT) characters.
+
+    (5)   Lines longer than 76 characters may be wrapped or
+          truncated in some environments.  Line wrapping or line
+          truncation imposed by mail transports is STRONGLY
+          DISCOURAGED, but unavoidable in some cases.
+          Applications which require long lines must somehow
+
+
+
+Freed & Borenstein          Standards Track                     [Page 7]
+
+RFC 2049                    MIME Conformance               November 1996
+
+
+          differentiate between soft and hard line breaks.  (A
+          simple way to do this is to use the quoted-printable
+          encoding.)
+
+    (6)   Trailing "white space" characters (SPACE, TAB (HT)) on
+          a line may be discarded by some transport agents, while
+          other transport agents may pad lines with these
+          characters so that all lines in a mail file are of
+          equal length.  The persistence of trailing white space,
+          therefore, must not be relied on.
+
+    (7)   Many mail domains use variations on the US-ASCII
+          character set, or use character sets such as EBCDIC
+          which contain most but not all of the US-ASCII
+          characters.  The correct translation of characters not
+          in the "invariant" set cannot be depended on across
+          character converting gateways.  For example, this
+          situation is a problem when sending uuencoded
+          information across BITNET, an EBCDIC system.  Similar
+          problems can occur without crossing a gateway, since
+          many Internet hosts use character sets other than US-
+          ASCII internally.  The definition of Printable Strings
+          in X.400 adds further restrictions in certain special
+          cases.  In particular, the only characters that are
+          known to be consistent across all gateways are the 73
+          characters that correspond to the upper and lower case
+          letters A-Z and a-z, the 10 digits 0-9, and the
+          following eleven special characters:
+
+            "'"  (US-ASCII decimal value 39)
+            "("  (US-ASCII decimal value 40)
+            ")"  (US-ASCII decimal value 41)
+            "+"  (US-ASCII decimal value 43)
+            ","  (US-ASCII decimal value 44)
+            "-"  (US-ASCII decimal value 45)
+            "."  (US-ASCII decimal value 46)
+            "/"  (US-ASCII decimal value 47)
+            ":"  (US-ASCII decimal value 58)
+            "="  (US-ASCII decimal value 61)
+            "?"  (US-ASCII decimal value 63)
+
+          A maximally portable mail representation will confine
+          itself to relatively short lines of text in which the
+          only meaningful characters are taken from this set of
+          73 characters.  The base64 encoding follows this rule.
+
+    (8)   Some mail transport agents will corrupt data that
+          includes certain literal strings.  In particular, a
+
+
+
+Freed & Borenstein          Standards Track                     [Page 8]
+
+RFC 2049                    MIME Conformance               November 1996
+
+
+          period (".") alone on a line is known to be corrupted
+          by some (incorrect) SMTP implementations, and a line
+          that starts with the five characters "From " (the fifth
+          character is a SPACE) are commonly corrupted as well.
+          A careful composition agent can prevent these
+          corruptions by encoding the data (e.g., in the quoted-
+          printable encoding using "=46rom " in place of "From "
+          at the start of a line, and "=2E" in place of "." alone
+          on a line).
+
+   Please note that the above list is NOT a list of recommended
+   practices for MTAs.  RFC 821 MTAs are prohibited from altering the
+   character of white space or wrapping long lines.  These BAD and
+   invalid practices are known to occur on established networks, and
+   implementations should be robust in dealing with the bad effects they
+   can cause.
+
+4.  Canonical Encoding Model
+
+   There was some confusion, in earlier versions of these documents,
+   regarding the model for when email data was to be converted to
+   canonical form and encoded, and in particular how this process would
+   affect the treatment of CRLFs, given that the representation of
+   newlines varies greatly from system to system.  For this reason, a
+   canonical model for encoding is presented below.
+
+   The process of composing a MIME entity can be modeled as being done
+   in a number of steps.  Note that these steps are roughly similar to
+   those steps used in PEM [RFC-1421] and are performed for each
+   "innermost level" body:
+
+    (1)   Creation of local form.
+
+          The body to be transmitted is created in the system's
+          native format.  The native character set is used and,
+          where appropriate, local end of line conventions are
+          used as well.  The body may be a UNIX-style text file,
+          or a Sun raster image, or a VMS indexed file, or audio
+          data in a system-dependent format stored only in
+          memory, or anything else that corresponds to the local
+          model for the representation of some form of
+          information.  Fundamentally, the data is created in the
+          "native" form that corresponds to the type specified by
+          the media type.
+
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                     [Page 9]
+
+RFC 2049                    MIME Conformance               November 1996
+
+
+    (2)   Conversion to canonical form.
+
+          The entire body, including "out-of-band" information
+          such as record lengths and possibly file attribute
+          information, is converted to a universal canonical
+          form.  The specific media type of the body as well as
+          its associated attributes dictate the nature of the
+          canonical form that is used.  Conversion to the proper
+          canonical form may involve character set conversion,
+          transformation of audio data, compression, or various
+          other operations specific to the various media types.
+          If character set conversion is involved, however, care
+          must be taken to understand the semantics of the media
+          type, which may have strong implications for any
+          character set conversion, e.g. with regard to
+          syntactically meaningful characters in a text subtype
+          other than "plain".
+
+          For example, in the case of text/plain data, the text
+          must be converted to a supported character set and
+          lines must be delimited with CRLF delimiters in
+          accordance with RFC 822.  Note that the restriction on
+          line lengths implied by RFC 822 is eliminated if the
+          next step employs either quoted-printable or base64
+          encoding.
+
+    (3)   Apply transfer encoding.
+
+          A Content-Transfer-Encoding appropriate for this body
+          is applied.  Note that there is no fixed relationship
+          between the media type and the transfer encoding.  In
+          particular, it may be appropriate to base the choice of
+          base64 or quoted-printable on character frequency
+          counts which are specific to a given instance of a
+          body.
+
+    (4)   Insertion into entity.
+
+          The encoded body is inserted into a MIME entity with
+          appropriate headers. The entity is then inserted into
+          the body of a higher-level entity (message or
+          multipart) as needed.
+
+   Conversion from entity form to local form is accomplished by
+   reversing these steps. Note that reversal of these steps may produce
+   differing results since there is no guarantee that the original and
+   final local forms are the same.
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 10]
+
+RFC 2049                    MIME Conformance               November 1996
+
+
+   It is vital to note that these steps are only a model; they are
+   specifically NOT a blueprint for how an actual system would be built.
+   In particular, the model fails to account for two common designs:
+
+    (1)   In many cases the conversion to a canonical form prior
+          to encoding will be subsumed into the encoder itself,
+          which understands local formats directly.  For example,
+          the local newline convention for text bodies might be
+          carried through to the encoder itself along with
+          knowledge of what that format is.
+
+    (2)   The output of the encoders may have to pass through one
+          or more additional steps prior to being transmitted as
+          a message.  As such, the output of the encoder may not
+          be conformant with the formats specified by RFC 822.
+          In particular, once again it may be appropriate for the
+          converter's output to be expressed using local newline
+          conventions rather than using the standard RFC 822 CRLF
+          delimiters.
+
+   Other implementation variations are conceivable as well.  The vital
+   aspect of this discussion is that, in spite of any optimizations,
+   collapsings of required steps, or insertion of additional processing,
+   the resulting messages must be consistent with those produced by the
+   model described here.  For example, a message with the following
+   header fields:
+
+     Content-type: text/foo; charset=bar
+     Content-Transfer-Encoding: base64
+
+   must be first represented in the text/foo form, then (if necessary)
+   represented in the "bar" character set, and finally transformed via
+   the base64 algorithm into a mail-safe form.
+
+   NOTE: Some confusion has been caused by systems that represent
+   messages in a format which uses local newline conventions which
+   differ from the RFC822 CRLF convention.  It is important to note that
+   these formats are not canonical RFC822/MIME.  These formats are
+   instead *encodings* of RFC822, where CRLF sequences in the canonical
+   representation of the message are encoded as the local newline
+   convention.  Note that formats which encode CRLF sequences as, for
+   example, LF are not capable of representing MIME messages containing
+   binary data which contains LF octets not part of CRLF line separation
+   sequences.
+
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 11]
+
+RFC 2049                    MIME Conformance               November 1996
+
+
+5.  Summary
+
+   This document defines what is meant by MIME Conformance. It also
+   details various problems known to exist in the Internet email system
+   and how to use MIME to overcome them. Finally, it describes MIME's
+   canonical encoding model.
+
+6.  Security Considerations
+
+   Security issues are discussed in the second document in this set, RFC
+   2046.
+
+7.  Authors' Addresses
+
+   For more information, the authors of this document are best contacted
+   via Internet mail:
+
+   Ned Freed
+   Innosoft International, Inc.
+   1050 East Garvey Avenue South
+   West Covina, CA 91790
+   USA
+
+   Phone: +1 818 919 3600
+   Fax:   +1 818 919 3614
+   EMail: ned@innosoft.com
+
+   Nathaniel S. Borenstein
+   First Virtual Holdings
+   25 Washington Avenue
+   Morristown, NJ 07960
+   USA
+
+   Phone: +1 201 540 8967
+   Fax:   +1 201 993 3032
+   EMail: nsb@nsb.fv.com
+
+   MIME is a result of the work of the Internet Engineering Task Force
+   Working Group on RFC 822 Extensions.  The chairman of that group,
+   Greg Vaudreuil, may be reached at:
+
+   Gregory M. Vaudreuil
+   Octel Network Services
+   17080 Dallas Parkway
+   Dallas, TX 75248-1905
+   USA
+
+   EMail: Greg.Vaudreuil@Octel.Com
+
+
+
+Freed & Borenstein          Standards Track                    [Page 12]
+
+RFC 2049                    MIME Conformance               November 1996
+
+
+8.  Acknowledgements
+
+   This document is the result of the collective effort of a large
+   number of people, at several IETF meetings, on the IETF-SMTP and
+   IETF-822 mailing lists, and elsewhere.  Although any enumeration
+   seems doomed to suffer from egregious omissions, the following are
+   among the many contributors to this effort:
+
+     Harald Tveit Alvestrand       Marc Andreessen
+     Randall Atkinson              Bob Braden
+     Philippe Brandon              Brian Capouch
+     Kevin Carosso                 Uhhyung Choi
+     Peter Clitherow               Dave Collier-Brown
+     Cristian Constantinof         John Coonrod
+     Mark Crispin                  Dave Crocker
+     Stephen Crocker               Terry Crowley
+     Walt Daniels                  Jim Davis
+     Frank Dawson                  Axel Deininger
+     Hitoshi Doi                   Kevin Donnelly
+     Steve Dorner                  Keith Edwards
+     Chris Eich                    Dana S. Emery
+     Johnny Eriksson               Craig Everhart
+     Patrik Faltstrom              Erik E. Fair
+     Roger Fajman                  Alain Fontaine
+     Martin Forssen                James M. Galvin
+     Stephen Gildea                Philip Gladstone
+     Thomas Gordon                 Keld Simonsen
+     Terry Gray                    Phill Gross
+     James Hamilton                David Herron
+     Mark Horton                   Bruce Howard
+     Bill Janssen                  Olle Jarnefors
+     Risto Kankkunen               Phil Karn
+     Alan Katz                     Tim Kehres
+     Neil Katin                    Steve Kille
+     Kyuho Kim                     Anders Klemets
+     John Klensin                  Valdis Kletniek
+     Jim Knowles                   Stev Knowles
+     Bob Kummerfeld                Pekka Kytolaakso
+     Stellan Lagerstrom            Vincent Lau
+     Timo Lehtinen                 Donald Lindsay
+     Warner Losh                   Carlyn Lowery
+     Laurence Lundblade            Charles Lynn
+     John R. MacMillan             Larry Masinter
+     Rick McGowan                  Michael J. McInerny
+     Leo Mclaughlin                Goli Montaser-Kohsari
+     Tom Moore                     John Gardiner Myers
+     Erik Naggum                   Mark Needleman
+     Chris Newman                  John Noerenberg
+
+
+
+Freed & Borenstein          Standards Track                    [Page 13]
+
+RFC 2049                    MIME Conformance               November 1996
+
+
+     Mats Ohrman                   Julian Onions
+     Michael Patton                David J. Pepper
+     Erik van der Poel             Blake C. Ramsdell
+     Christer Romson               Luc Rooijakkers
+     Marshall T. Rose              Jonathan Rosenberg
+     Guido van Rossum              Jan Rynning
+     Harri Salminen                Michael Sanderson
+     Yutaka Sato                   Markku Savela
+     Richard Alan Schafer          Masahiro Sekiguchi
+     Mark Sherman                  Bob Smart
+     Peter Speck                   Henry Spencer
+     Einar Stefferud               Michael Stein
+     Klaus Steinberger             Peter Svanberg
+     James Thompson                Steve Uhler
+     Stuart Vance                  Peter Vanderbilt
+     Greg Vaudreuil                Ed Vielmetti
+     Larry W. Virden               Ryan Waldron
+     Rhys Weatherly                Jay Weber
+     Dave Wecker                   Wally Wedel
+     Sven-Ove Westberg             Brian Wideen
+     John Wobus                    Glenn Wright
+     Rayan Zachariassen            David Zimmerman
+
+   The authors apologize for any omissions from this list, which are
+   certainly unintentional.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 14]
+
+RFC 2049                    MIME Conformance               November 1996
+
+
+Appendix A -- A Complex Multipart Example
+
+   What follows is the outline of a complex multipart message.  This
+   message contains five parts that are to be displayed serially:  two
+   introductory plain text objects, an embedded multipart message, a
+   text/enriched object, and a closing encapsulated text message in a
+   non-ASCII character set.  The embedded multipart message itself
+   contains two objects to be displayed in parallel, a picture and an
+   audio fragment.
+
+     MIME-Version: 1.0
+     From: Nathaniel Borenstein <nsb@nsb.fv.com>
+     To: Ned Freed <ned@innosoft.com>
+     Date: Fri, 07 Oct 1994 16:15:05 -0700 (PDT)
+     Subject: A multipart example
+     Content-Type: multipart/mixed;
+                   boundary=unique-boundary-1
+
+     This is the preamble area of a multipart message.
+     Mail readers that understand multipart format
+     should ignore this preamble.
+
+     If you are reading this text, you might want to
+     consider changing to a mail reader that understands
+     how to properly display multipart messages.
+
+     --unique-boundary-1
+
+       ... Some text appears here ...
+
+     [Note that the blank between the boundary and the start
+      of the text in this part means no header fields were
+      given and this is text in the US-ASCII character set.
+      It could have been done with explicit typing as in the
+      next part.]
+
+     --unique-boundary-1
+     Content-type: text/plain; charset=US-ASCII
+
+     This could have been part of the previous part, but
+     illustrates explicit versus implicit typing of body
+     parts.
+
+     --unique-boundary-1
+     Content-Type: multipart/parallel; boundary=unique-boundary-2
+
+     --unique-boundary-2
+     Content-Type: audio/basic
+
+
+
+Freed & Borenstein          Standards Track                    [Page 15]
+
+RFC 2049                    MIME Conformance               November 1996
+
+
+     Content-Transfer-Encoding: base64
+
+       ... base64-encoded 8000 Hz single-channel
+           mu-law-format audio data goes here ...
+
+     --unique-boundary-2
+     Content-Type: image/jpeg
+     Content-Transfer-Encoding: base64
+
+       ... base64-encoded image data goes here ...
+
+     --unique-boundary-2--
+
+     --unique-boundary-1
+     Content-type: text/enriched
+
+     This is <bold><italic>enriched.</italic></bold>
+     <smaller>as defined in RFC 1896</smaller>
+
+     Isn't it
+     <bigger><bigger>cool?</bigger></bigger>
+
+     --unique-boundary-1
+     Content-Type: message/rfc822
+
+     From: (mailbox in US-ASCII)
+     To: (address in US-ASCII)
+     Subject: (subject in US-ASCII)
+     Content-Type: Text/plain; charset=ISO-8859-1
+     Content-Transfer-Encoding: Quoted-printable
+
+       ... Additional text in ISO-8859-1 goes here ...
+
+     --unique-boundary-1--
+
+Appendix B -- Changes from RFC 1521, 1522, and 1590
+
+   These documents are a revision of RFC 1521, 1522, and 1590.  For the
+   convenience of those familiar with the earlier documents, the changes
+   from those documents are summarized in this appendix.  For further
+   history, note that Appendix H in RFC 1521 specified how that document
+   differed from its predecessor, RFC 1341.
+
+    (1)   This document has been completely reformatted and split
+          into multiple documents.  This was done to improve the
+          quality of the plain text version of this document,
+          which is required to be the reference copy.
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 16]
+
+RFC 2049                    MIME Conformance               November 1996
+
+
+    (2)   BNF describing the overall structure of MIME object
+          headers has been added. This is a documentation change
+          only -- the underlying syntax has not changed in any
+          way.
+
+    (3)   The specific BNF for the seven media types in MIME has
+          been removed.  This BNF was incorrect, incomplete, amd
+          inconsistent with the type-indendependent BNF.  And
+          since the type-independent BNF already fully specifies
+          the syntax of the various MIME headers, the type-
+          specific BNF was, in the final analysis, completely
+          unnecessary and caused more problems than it solved.
+
+    (4)   The more specific "US-ASCII" character set name has
+          replaced the use of the informal term ASCII in many
+          parts of these documents.
+
+    (5)   The informal concept of a primary subtype has been
+          removed.
+
+    (6)   The term "object" was being used inconsistently.  The
+          definition of this term has been clarified, along with
+          the related terms "body", "body part", and "entity",
+          and usage has been corrected where appropriate.
+
+    (7)   The BNF for the multipart media type has been
+          rearranged to make it clear that the CRLF preceeding
+          the boundary marker is actually part of the marker
+          itself rather than the preceeding body part.
+
+    (8)   The prose and BNF describing the multipart media type
+          have been changed to make it clear that the body parts
+          within a multipart object MUST NOT contain any lines
+          beginning with the boundary parameter string.
+
+    (9)   In the rules on reassembling "message/partial" MIME
+          entities, "Subject" is added to the list of headers to
+          take from the inner message, and the example is
+          modified to clarify this point.
+
+    (10)  "Message/partial" fragmenters are restricted to
+          splitting MIME objects only at line boundaries.
+
+    (11)  In the discussion of the application/postscript type,
+          an additional paragraph has been added warning about
+          possible interoperability problems caused by embedding
+          of binary data inside a PostScript MIME entity.
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 17]
+
+RFC 2049                    MIME Conformance               November 1996
+
+
+    (12)  Added a clarifying note to the basic syntax rules for
+          the Content-Type header field to make it clear that the
+          following two forms:
+
+            Content-type: text/plain; charset=us-ascii (comment)
+
+            Content-type: text/plain; charset="us-ascii"
+
+          are completely equivalent.
+
+    (13)  The following sentence has been removed from the
+          discussion of the MIME-Version header: "However,
+          conformant software is encouraged to check the version
+          number and at least warn the user if an unrecognized
+          MIME-version is encountered."
+
+    (14)  A typo was fixed that said "application/external-body"
+          instead of "message/external-body".
+
+    (15)  The definition of a character set has been reorganized
+          to make the requirements clearer.
+
+    (16)  The definition of the "image/gif" media type has been
+          moved to a separate document. This change was made
+          because of potential conflicts with IETF rules
+          governing the standardization of patented technology.
+
+    (17)  The definitions of "7bit" and "8bit" have been
+          tightened so that use of bare CR, LF can only be used
+          as end-of-line sequences.  The document also no longer
+          requires that NUL characters be preserved, which brings
+          MIME into alignment with real-world implementations.
+
+    (18)  The definition of canonical text in MIME has been
+          tightened so that line breaks must be represented by a
+          CRLF sequence.  CR and LF characters are not allowed
+          outside of this usage.  The definition of quoted-
+          printable encoding has been altered accordingly.
+
+    (19)  The definition of the quoted-printable encoding now
+          includes a number of suggestions for how quoted-
+          printable encoders might best handle improperly encoded
+          material.
+
+    (20)  Prose was added to clarify the use of the "7bit",
+          "8bit", and "binary" transfer-encodings on multipart or
+          message entities encapsulating "8bit" or "binary" data.
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 18]
+
+RFC 2049                    MIME Conformance               November 1996
+
+
+    (21)  In the section on MIME Conformance, "multipart/digest"
+          support was added to the list of requirements for
+          minimal MIME conformance.  Also, the requirement for
+          "message/rfc822" support were strengthened to clarify
+          the importance of recognizing recursive structure.
+
+    (22)  The various restrictions on subtypes of "message" are
+          now specified entirely on a subtype by subtype basis.
+
+    (23)  The definition of "message/rfc822" was changed to
+          indicate that at least one of the "From", "Subject", or
+          "Date" headers must be present.
+
+    (24)  The required handling of unrecognized subtypes as
+          "application/octet-stream" has been made more explicit
+          in both the type definitions sections and the
+          conformance guidelines.
+
+    (25)  Examples using text/richtext were changed to
+          text/enriched.
+
+    (26)  The BNF definition of subtype has been changed to make
+          it clear that either an IANA registered subtype or a
+          nonstandard "X-" subtype must be used in a Content-Type
+          header field.
+
+    (27)  MIME media types that are simply registered for use and
+          those that are standardized by the IETF are now
+          distinguished in the MIME BNF.
+
+    (28)  All of the various MIME registration procedures have
+          been extensively revised. IANA registration procedures
+          for character sets have been moved to a separate
+          document that is no included in this set of documents.
+
+    (29)  The use of escape and shift mechanisms in the US-ASCII
+          and ISO-8859-X character sets these documents define
+          have been clarified: Such mechanisms should never be
+          used in conjunction with these character sets and their
+          effect if they are used is undefined.
+
+    (30)  The definition of the AFS access-type for
+          message/external-body has been removed.
+
+    (31)  The handling of the combination of
+          multipart/alternative and message/external-body is now
+          specifically addressed.
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 19]
+
+RFC 2049                    MIME Conformance               November 1996
+
+
+    (32)  Security issues specific to message/external-body are
+          now discussed in some detail.
+
+Appendix C -- References
+
+   [ATK]
+        Borenstein, Nathaniel S., Multimedia Applications
+        Development with the Andrew Toolkit, Prentice-Hall, 1990.
+
+   [ISO-2022]
+        International Standard -- Information Processing --
+        Character Code Structure and Extension Techniques,
+        ISO/IEC 2022:1994, 4th ed.
+
+   [ISO-8859]
+        International Standard -- Information Processing -- 8-bit
+        Single-Byte Coded Graphic Character Sets
+        - Part 1: Latin Alphabet No. 1, ISO 8859-1:1987, 1st ed.
+        - Part 2: Latin Alphabet No. 2, ISO 8859-2:1987, 1st ed.
+        - Part 3: Latin Alphabet No. 3, ISO 8859-3:1988, 1st ed.
+        - Part 4: Latin Alphabet No. 4, ISO 8859-4:1988, 1st ed.
+        - Part 5: Latin/Cyrillic Alphabet, ISO 8859-5:1988, 1st
+        ed.
+        - Part 6: Latin/Arabic Alphabet, ISO 8859-6:1987, 1st ed.
+        - Part 7: Latin/Greek Alphabet, ISO 8859-7:1987, 1st ed.
+        - Part 8: Latin/Hebrew Alphabet, ISO 8859-8:1988, 1st ed.
+        - Part 9: Latin Alphabet No. 5, ISO/IEC 8859-9:1989, 1st
+        ed.
+        International Standard -- Information Technology -- 8-bit
+        Single-Byte Coded Graphic Character Sets
+        - Part 10: Latin Alphabet No. 6, ISO/IEC 8859-10:1992,
+        1st ed.
+
+   [ISO-646]
+        International Standard -- Information Technology -- ISO
+        7-bit Coded Character Set for Information Interchange,
+        ISO 646:1991, 3rd ed..
+
+   [JPEG]
+        JPEG Draft Standard ISO 10918-1 CD.
+
+   [MPEG]
+        Video Coding Draft Standard ISO 11172 CD, ISO
+        IEC/JTC1/SC2/WG11 (Motion Picture Experts Group), May,
+        1991.
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 20]
+
+RFC 2049                    MIME Conformance               November 1996
+
+
+   [PCM]
+        CCITT, Fascicle III.4 - Recommendation G.711, "Pulse Code
+        Modulation (PCM) of Voice Frequencies", Geneva, 1972.
+
+   [POSTSCRIPT]
+        Adobe Systems, Inc., PostScript Language Reference
+        Manual, Addison-Wesley, 1985.
+
+   [POSTSCRIPT2]
+        Adobe Systems, Inc., PostScript Language Reference
+        Manual, Addison-Wesley, Second Ed., 1990.
+
+   [RFC-783]
+        Sollins, K.R., "TFTP Protocol (revision 2)", RFC-783,
+        MIT, June 1981.
+
+   [RFC-821]
+        Postel, J.B., "Simple Mail Transfer Protocol", STD 10,
+        RFC 821, USC/Information Sciences Institute, August 1982.
+
+   [RFC-822]
+        Crocker, D., "Standard for the Format of ARPA Internet
+        Text Messages", STD 11, RFC 822, UDEL, August 1982.
+
+   [RFC-934]
+        Rose, M. and E. Stefferud, "Proposed Standard for Message
+        Encapsulation", RFC 934, Delaware and NMA, January 1985.
+
+   [RFC-959]
+        Postel, J. and J. Reynolds, "File Transfer Protocol", STD
+        9, RFC 959, USC/Information Sciences Institute, October
+        1985.
+
+   [RFC-1049]
+        Sirbu, M., "Content-Type Header Field for Internet
+        Messages", RFC 1049, CMU, March 1988.
+
+   [RFC-1154]
+        Robinson, D., and R. Ullmann, "Encoding Header Field for
+        Internet Messages", RFC 1154, Prime Computer, Inc., April
+        1990.
+
+   [RFC-1341]
+        Borenstein, N., and N.  Freed, "MIME (Multipurpose
+        Internet Mail Extensions): Mechanisms for Specifying and
+        Describing the Format of Internet Message Bodies", RFC
+        1341, Bellcore, Innosoft, June 1992.
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 21]
+
+RFC 2049                    MIME Conformance               November 1996
+
+
+   [RFC-1342]
+        Moore, K., "Representation of Non-Ascii Text in Internet
+        Message Headers", RFC 1342, University of Tennessee, June
+        1992.
+
+   [RFC-1344]
+        Borenstein, N., "Implications of MIME for Internet Mail
+        Gateways", RFC 1344, Bellcore, June 1992.
+
+   [RFC-1345]
+        Simonsen, K., "Character Mnemonics & Character Sets", RFC
+        1345, Rationel Almen Planlaegning, June 1992.
+
+   [RFC-1421]
+        Linn, J., "Privacy Enhancement for Internet Electronic
+        Mail:  Part I -- Message Encryption and Authentication
+        Procedures", RFC 1421, IAB IRTF PSRG, IETF PEM WG,
+        February 1993.
+
+   [RFC-1422]
+        Kent, S., "Privacy Enhancement for Internet Electronic
+        Mail:  Part II -- Certificate-Based Key Management", RFC
+        1422, IAB IRTF PSRG, IETF PEM WG, February 1993.
+
+   [RFC-1423]
+        Balenson, D., "Privacy Enhancement for Internet
+        Electronic Mail:  Part III -- Algorithms, Modes, and
+        Identifiers",  IAB IRTF PSRG, IETF PEM WG, February 1993.
+
+   [RFC-1424]
+        Kaliski, B., "Privacy Enhancement for Internet Electronic
+        Mail:  Part IV -- Key Certification and Related
+        Services", IAB IRTF PSRG, IETF PEM WG, February 1993.
+
+   [RFC-1521]
+        Borenstein, N., and Freed, N., "MIME (Multipurpose
+        Internet Mail Extensions): Mechanisms for Specifying and
+        Describing the Format of Internet Message Bodies", RFC
+        1521, Bellcore, Innosoft, September, 1993.
+
+   [RFC-1522]
+        Moore, K., "Representation of Non-ASCII Text in Internet
+        Message Headers", RFC 1522, University of Tennessee,
+        September 1993.
+
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 22]
+
+RFC 2049                    MIME Conformance               November 1996
+
+
+   [RFC-1524]
+        Borenstein, N., "A User Agent Configuration Mechanism for
+        Multimedia Mail Format Information", RFC 1524, Bellcore,
+        September 1993.
+
+   [RFC-1543]
+        Postel, J., "Instructions to RFC Authors", RFC 1543,
+        USC/Information Sciences Institute, October 1993.
+
+   [RFC-1556]
+        Nussbacher, H., "Handling of Bi-directional Texts in
+        MIME", RFC 1556, Israeli Inter-University Computer
+        Center, December 1993.
+
+   [RFC-1590]
+        Postel, J., "Media Type Registration Procedure", RFC
+        1590, USC/Information Sciences Institute, March 1994.
+
+   [RFC-1602]
+        Internet Architecture Board, Internet Engineering
+        Steering Group, Huitema, C., Gross, P., "The Internet
+        Standards Process -- Revision 2", March 1994.
+
+   [RFC-1652]
+        Klensin, J., (WG Chair), Freed, N., (Editor), Rose, M.,
+        Stefferud, E., and Crocker, D., "SMTP Service Extension
+        for 8bit-MIME transport", RFC 1652, United Nations
+        University, Innosoft, Dover Beach Consulting, Inc.,
+        Network Management Associates, Inc., The Branch Office,
+        March 1994.
+
+   [RFC-1700]
+        Reynolds, J. and J. Postel, "Assigned Numbers", STD 2,
+        RFC 1700, USC/Information Sciences Institute, October
+        1994.
+
+   [RFC-1741]
+        Faltstrom, P., Crocker, D., and Fair, E., "MIME Content
+        Type for BinHex Encoded Files", December 1994.
+
+   [RFC-1896]
+        Resnick, P., and A. Walker, "The text/enriched MIME
+        Content-type", RFC 1896, February, 1996.
+
+
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 23]
+
+RFC 2049                    MIME Conformance               November 1996
+
+
+   [RFC-2045]
+        Freed, N., and and N. Borenstein, "Multipurpose Internet Mail
+        Extensions (MIME) Part One: Format of Internet Message
+        Bodies", RFC 2045, Innosoft, First Virtual Holdings,
+        November 1996.
+
+   [RFC-2046]
+        Freed, N., and N. Borenstein, "Multipurpose Internet Mail
+        Extensions (MIME) Part Two: Media Types", RFC 2046,
+        Innosoft, First Virtual Holdings, November 1996.
+
+   [RFC-2047]
+        Moore, K., "Multipurpose Internet Mail Extensions (MIME)
+        Part Three: Representation of Non-ASCII Text in Internet
+        Message Headers", RFC 2047, University of
+        Tennessee, November 1996.
+
+   [RFC-2048]
+        Freed, N., Klensin, J., and J. Postel, "Multipurpose
+        Internet Mail Extensions (MIME) Part Four: MIME
+        Registration Procedures", RFC 2048, Innosoft, MCI,
+        ISI, November 1996.
+
+   [RFC-2049]
+        Freed, N. and N. Borenstein, "Multipurpose Internet Mail
+        Extensions (MIME) Part Five: Conformance Criteria and
+        Examples", RFC 2049 (this document), Innosoft, First
+        Virtual Holdings, November 1996.
+
+   [US-ASCII]
+        Coded Character Set -- 7-Bit American Standard Code for
+        Information Interchange, ANSI X3.4-1986.
+
+   [X400]
+        Schicker, Pietro, "Message Handling Systems, X.400",
+        Message Handling Systems and Distributed Applications, E.
+        Stefferud, O-j. Jacobsen, and P. Schicker, eds., North-
+        Holland, 1989, pp. 3-41.
+
+
+
+
+
+
+
+
+
+
+
+
+
+Freed & Borenstein          Standards Track                    [Page 24]
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2183.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2183.txt
new file mode 100644
index 000000000..f16f127e0
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2183.txt
@@ -0,0 +1,675 @@
+
+
+
+
+
+
+Network Working Group                                          R. Troost
+Request for Comments: 2183                           New Century Systems
+Updates: 1806                                                  S. Dorner
+Category: Standards Track                          QUALCOMM Incorporated
+                                                        K. Moore, Editor
+                                                 University of Tennessee
+                                                             August 1997
+
+
+               Communicating Presentation Information in
+                           Internet Messages:
+                  The Content-Disposition Header Field
+
+Status of this Memo
+
+   This document specifies an Internet standards track protocol for the
+   Internet community, and requests discussion and suggestions for
+   improvements.  Please refer to the current edition of the "Internet
+   Official Protocol Standards" (STD 1) for the standardization state
+   and status of this protocol.  Distribution of this memo is unlimited.
+
+Abstract
+
+   This memo provides a mechanism whereby messages conforming to the
+   MIME specifications [RFC 2045, RFC 2046, RFC 2047, RFC 2048, RFC
+   2049] can convey presentational information.  It specifies the
+   "Content-Disposition" header field, which is optional and valid for
+   any MIME entity ("message" or "body part").  Two values for this
+   header field are described in this memo; one for the ordinary linear
+   presentation of the body part, and another to facilitate the use of
+   mail to transfer files.  It is expected that more values will be
+   defined in the future, and procedures are defined for extending this
+    set of values.
+
+   This document is intended as an extension to MIME.  As such, the
+   reader is assumed to be familiar with the MIME specifications, and
+   [RFC 822].  The information presented herein supplements but does not
+   replace that found in those documents.
+
+   This document is a revision to the Experimental protocol defined in
+   RFC 1806.  As compared to RFC 1806, this document contains minor
+   editorial updates, adds new parameters needed to support the File
+   Transfer Body Part, and references a separate specification for the
+   handling of non-ASCII and/or very long parameter values.
+
+
+
+
+
+
+
+Troost, et. al.             Standards Track                     [Page 1]
+
+RFC 2183                  Content-Disposition                August 1997
+
+
+1.  Introduction
+
+   MIME specifies a standard format for encapsulating multiple pieces of
+   data into a single Internet message. That document does not address
+   the issue of presentation styles; it provides a framework for the
+   interchange of message content, but leaves presentation issues solely
+   in the hands of mail user agent (MUA) implementors.
+
+   Two common ways of presenting multipart electronic messages are as a
+   main document with a list of separate attachments, and as a single
+   document with the various parts expanded (displayed) inline. The
+   display of an attachment is generally construed to require positive
+   action on the part of the recipient, while inline message components
+   are displayed automatically when the message is viewed. A mechanism
+   is needed to allow the sender to transmit this sort of presentational
+   information to the recipient; the Content-Disposition header provides
+   this mechanism, allowing each component of a message to be tagged
+   with an indication of its desired presentation semantics.
+
+   Tagging messages in this manner will often be sufficient for basic
+   message formatting. However, in many cases a more powerful and
+   flexible approach will be necessary. The definition of such
+   approaches is beyond the scope of this memo; however, such approaches
+   can benefit from additional Content-Disposition values and
+   parameters, to be defined at a later date.
+
+   In addition to allowing the sender to specify the presentational
+   disposition of a message component, it is desirable to allow her to
+   indicate a default archival disposition; a filename. The optional
+   "filename" parameter provides for this.  Further, the creation-date,
+   modification-date, and read-date parameters allow preservation of
+   those file attributes when the file is transmitted over MIME email.
+
+   NB: The keywords MUST, MUST NOT, REQUIRED, SHALL, SHALL NOT, SHOULD,
+   SHOULD NOT, RECOMMENDED, MAY, and OPTIONAL, when they appear in this
+   document, are to be interpreted as described in [RFC 2119].
+
+2.  The Content-Disposition Header Field
+
+   Content-Disposition is an optional header field. In its absence, the
+   MUA may use whatever presentation method it deems suitable.
+
+   It is desirable to keep the set of possible disposition types small
+   and well defined, to avoid needless complexity. Even so, evolving
+   usage will likely require the definition of additional disposition
+   types or parameters, so the set of disposition values is extensible;
+   see below.
+
+
+
+
+Troost, et. al.             Standards Track                     [Page 2]
+
+RFC 2183                  Content-Disposition                August 1997
+
+
+   In the extended BNF notation of [RFC 822], the Content-Disposition
+   header field is defined as follows:
+
+     disposition := "Content-Disposition" ":"
+                    disposition-type
+                    *(";" disposition-parm)
+
+     disposition-type := "inline"
+                       / "attachment"
+                       / extension-token
+                       ; values are not case-sensitive
+
+     disposition-parm := filename-parm
+                       / creation-date-parm
+                       / modification-date-parm
+                       / read-date-parm
+                       / size-parm
+                       / parameter
+
+     filename-parm := "filename" "=" value
+
+     creation-date-parm := "creation-date" "=" quoted-date-time
+
+     modification-date-parm := "modification-date" "=" quoted-date-time
+
+     read-date-parm := "read-date" "=" quoted-date-time
+
+     size-parm := "size" "=" 1*DIGIT
+
+     quoted-date-time := quoted-string
+                      ; contents MUST be an RFC 822 `date-time'
+                      ; numeric timezones (+HHMM or -HHMM) MUST be used
+
+
+
+   NOTE ON PARAMETER VALUE LENGHTS: A short (length <= 78 characters)
+   parameter value containing only non-`tspecials' characters SHOULD be
+   represented as a single `token'.  A short parameter value containing
+   only ASCII characters, but including `tspecials' characters, SHOULD
+   be represented as `quoted-string'.  Parameter values longer than 78
+   characters, or which contain non-ASCII characters, MUST be encoded as
+   specified in [RFC 2184].
+
+   `Extension-token', `parameter', `tspecials' and `value' are defined
+   according to [RFC 2045] (which references [RFC 822] in the definition
+   of some of these tokens).  `quoted-string' and `DIGIT' are defined in
+   [RFC 822].
+
+
+
+
+Troost, et. al.             Standards Track                     [Page 3]
+
+RFC 2183                  Content-Disposition                August 1997
+
+
+2.1  The Inline Disposition Type
+
+   A bodypart should be marked `inline' if it is intended to be
+   displayed automatically upon display of the message.  Inline
+   bodyparts should be presented in the order in which they occur,
+   subject to the normal semantics of multipart messages.
+
+2.2  The Attachment Disposition Type
+
+   Bodyparts can be designated `attachment' to indicate that they are
+   separate from the main body of the mail message, and that their
+   display should not be automatic, but contingent upon some further
+   action of the user.  The MUA might instead present the user of a
+   bitmap terminal with an iconic representation of the attachments, or,
+   on character terminals, with a list of attachments from which the
+   user could select for viewing or storage.
+
+2.3  The Filename Parameter
+
+   The sender may want to suggest a filename to be used if the entity is
+   detached and stored in a separate file. If the receiving MUA writes
+   the entity to a file, the suggested filename should be used as a
+   basis for the actual filename, where possible.
+
+   It is important that the receiving MUA not blindly use the suggested
+   filename.  The suggested filename SHOULD be checked (and possibly
+   changed) to see that it conforms to local filesystem conventions,
+   does not overwrite an existing file, and does not present a security
+   problem (see Security Considerations below).
+
+   The receiving MUA SHOULD NOT respect any directory path information
+   that may seem to be present in the filename parameter.  The filename
+   should be treated as a terminal component only.  Portable
+   specification of directory paths might possibly be done in the future
+   via a separate Content-Disposition parameter, but no provision is
+   made for it in this draft.
+
+   Current [RFC 2045] grammar restricts parameter values (and hence
+   Content-Disposition filenames) to US-ASCII.  We recognize the great
+   desirability of allowing arbitrary character sets in filenames, but
+   it is beyond the scope of this document to define the necessary
+   mechanisms.  We expect that the basic [RFC 1521] `value'
+   specification will someday be amended to allow use of non-US-ASCII
+   characters, at which time the same mechanism should be used in the
+   Content-Disposition filename parameter.
+
+
+
+
+
+
+Troost, et. al.             Standards Track                     [Page 4]
+
+RFC 2183                  Content-Disposition                August 1997
+
+
+   Beyond the limitation to US-ASCII, the sending MUA may wish to bear
+   in mind the limitations of common filesystems.  Many have severe
+   length and character set restrictions.  Short alphanumeric filenames
+   are least likely to require modification by the receiving system.
+
+   The presence of the filename parameter does not force an
+   implementation to write the entity to a separate file. It is
+   perfectly acceptable for implementations to leave the entity as part
+   of the normal mail stream unless the user requests otherwise. As a
+   consequence, the parameter may be used on any MIME entity, even
+   `inline' ones. These will not normally be written to files, but the
+   parameter could be used to provide a filename if the receiving user
+   should choose to write the part to a file.
+
+2.4 The Creation-Date parameter
+
+   The creation-date parameter MAY be used to indicate the date at which
+   the file was created.  If this parameter is included, the paramter
+   value MUST be a quoted-string which contains a representation of the
+   creation date of the file in [RFC 822] `date-time' format.
+
+   UNIX and POSIX implementors are cautioned that the `st_ctime' file
+   attribute of the `stat' structure is not the creation time of the
+   file; it is thus not appropriate as a source for the creation-date
+   parameter value.
+
+2.5 The Modification-Date parameter
+
+   The modification-date parameter MAY be used to indicate the date at
+   which the file was last modified.  If the modification-date parameter
+   is included, the paramter value MUST be a quoted-string which
+   contains a representation of the last modification date of the file
+   in [RFC 822] `date-time' format.
+
+2.6 The Read-Date parameter
+
+   The read-date parameter MAY be used to indicate the date at which the
+   file was last read.  If the read-date parameter is included, the
+   parameter value MUST be a quoted-string which contains a
+   representation of the last-read date of the file in [RFC 822] `date-
+   time' format.
+
+2.7 The Size parameter
+
+   The size parameter indicates an approximate size of the file in
+   octets.  It can be used, for example, to pre-allocate space before
+   attempting to store the file, or to determine whether enough space
+   exists.
+
+
+
+Troost, et. al.             Standards Track                     [Page 5]
+
+RFC 2183                  Content-Disposition                August 1997
+
+
+2.8  Future Extensions and Unrecognized Disposition Types
+
+   In the likely event that new parameters or disposition types are
+   needed, they should be registered with the Internet Assigned Numbers
+   Authority (IANA), in the manner specified in Section 9 of this memo.
+
+   Once new disposition types and parameters are defined, there is of
+   course the likelihood that implementations will see disposition types
+   and parameters they do not understand.  Furthermore, since x-tokens
+   are allowed, implementations may also see entirely unregistered
+   disposition types and parameters.
+
+   Unrecognized parameters should be ignored. Unrecognized disposition
+   types should be treated as `attachment'. The choice of `attachment'
+   for unrecognized types is made because a sender who goes to the
+   trouble of producing a Content-Disposition header with a new
+   disposition type is more likely aiming for something more elaborate
+   than inline presentation.
+
+   Unless noted otherwise in the definition of a parameter, Content-
+   Disposition parameters are valid for all dispositions.  (In contrast
+   to MIME content-type parameters, which are defined on a per-content-
+   type basis.) Thus, for example, the `filename' parameter still means
+   the name of the file to which the part should be written, even if the
+   disposition itself is unrecognized.
+
+2.9  Content-Disposition and Multipart
+
+   If a Content-Disposition header is used on a multipart body part, it
+   applies to the multipart as a whole, not the individual subparts.
+   The disposition types of the subparts do not need to be consulted
+   until the multipart itself is presented.  When the multipart is
+   displayed, then the dispositions of the subparts should be respected.
+
+   If the `inline' disposition is used, the multipart should be
+   displayed as normal; however, an `attachment' subpart should require
+   action from the user to display.
+
+   If the `attachment' disposition is used, presentation of the
+   multipart should not proceed without explicit user action.  Once the
+   user has chosen to display the multipart, the individual subpart
+   dispositions should be consulted to determine how to present the
+   subparts.
+
+
+
+
+
+
+
+
+Troost, et. al.             Standards Track                     [Page 6]
+
+RFC 2183                  Content-Disposition                August 1997
+
+
+2.10  Content-Disposition and the Main Message
+
+   It is permissible to use Content-Disposition on the main body of an
+   [RFC 822] message.
+
+3.  Examples
+
+   Here is a an example of a body part containing a JPEG image that is
+   intended to be viewed by the user immediately:
+
+        Content-Type: image/jpeg
+        Content-Disposition: inline
+        Content-Description: just a small picture of me
+
+         <jpeg data>
+
+   The following body part contains a JPEG image that should be
+   displayed to the user only if the user requests it. If the JPEG is
+   written to a file, the file should be named "genome.jpg".  The
+   recipient's user might also choose to set the last-modified date of
+   the stored file to date in the modification-date parameter:
+
+        Content-Type: image/jpeg
+        Content-Disposition: attachment; filename=genome.jpeg;
+          modification-date="Wed, 12 Feb 1997 16:29:51 -0500";
+        Content-Description: a complete map of the human genome
+
+        <jpeg data>
+
+   The following is an example of the use of the `attachment'
+   disposition with a multipart body part.  The user should see text-
+   part-1 immediately, then take some action to view multipart-2.  After
+   taking action to view multipart-2, the user will see text-part-2
+   right away, and be required to take action to view jpeg-1.  Subparts
+   are indented for clarity; they would not be so indented in a real
+   message.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Troost, et. al.             Standards Track                     [Page 7]
+
+RFC 2183                  Content-Disposition                August 1997
+
+
+        Content-Type: multipart/mixed; boundary=outer
+        Content-Description: multipart-1
+
+        --outer
+          Content-Type: text/plain
+          Content-Disposition: inline
+          Content-Description: text-part-1
+
+          Some text goes here
+
+        --outer
+          Content-Type: multipart/mixed; boundary=inner
+          Content-Disposition: attachment
+          Content-Description: multipart-2
+
+          --inner
+            Content-Type: text/plain
+            Content-Disposition: inline
+            Content-Description: text-part-2
+
+            Some more text here.
+
+          --inner
+            Content-Type: image/jpeg
+            Content-Disposition: attachment
+            Content-Description: jpeg-1
+
+            <jpeg data>
+          --inner--
+        --outer--
+
+4.  Summary
+
+   Content-Disposition takes one of two values, `inline' and
+   `attachment'.  `Inline' indicates that the entity should be
+   immediately displayed to the user, whereas `attachment' means that
+   the user should take additional action to view the entity.
+
+   The `filename' parameter can be used to suggest a filename for
+   storing the bodypart, if the user wishes to store it in an external
+   file.
+
+
+
+
+
+
+
+
+
+
+Troost, et. al.             Standards Track                     [Page 8]
+
+RFC 2183                  Content-Disposition                August 1997
+
+
+5.  Security Considerations
+
+   There are security issues involved any time users exchange data.
+   While these are not to be minimized, neither does this memo change
+   the status quo in that regard, except in one instance.
+
+   Since this memo provides a way for the sender to suggest a filename,
+   a receiving MUA must take care that the sender's suggested filename
+   does not represent a hazard. Using UNIX as an example, some hazards
+   would be:
+
+   +    Creating startup files (e.g., ".login").
+
+   +    Creating or overwriting system files (e.g., "/etc/passwd").
+
+   +    Overwriting any existing file.
+
+   +    Placing executable files into any command search path
+        (e.g., "~/bin/more").
+
+   +    Sending the file to a pipe (e.g., "| sh").
+
+   In general, the receiving MUA should not name or place the file such
+   that it will get interpreted or executed without the user explicitly
+   initiating the action.
+
+   It is very important to note that this is not an exhaustive list; it
+   is intended as a small set of examples only.  Implementors must be
+   alert to the potential hazards on their target systems.
+
+6.  References
+
+   [RFC 2119]
+        Bradner, S., "Key words for use in RFCs to Indicate Requirement
+        Levels", RFC 2119, March 1997.
+
+   [RFC 2184]
+        Freed, N. and K. Moore, "MIME Parameter value and Encoded Words:
+        Character Sets, Lanaguage, and Continuations", RFC 2184, August
+        1997.
+
+   [RFC 2045]
+        Freed, N. and N. Borenstein, "MIME (Multipurpose Internet Mail
+        Extensions) Part One: Format of Internet Message Bodies", RFC
+        2045, December 1996.
+
+
+
+
+
+
+Troost, et. al.             Standards Track                     [Page 9]
+
+RFC 2183                  Content-Disposition                August 1997
+
+
+   [RFC 2046]
+        Freed, N. and N. Borenstein, "MIME (Multipurpose Internet Mail
+        Extensions) Part Two: Media Types", RFC 2046, December 1996.
+
+   [RFC 2047]
+        Moore, K., "MIME (Multipurpose Internet Mail Extensions) Part
+        Three: Message Header Extensions for non-ASCII Text", RFC 2047,
+        December 1996.
+
+   [RFC 2048]
+        Freed, N., Klensin, J. and J. Postel, "MIME (Multipurpose
+        Internet Mail Extensions) Part Four: Registration Procedures",
+        RFC 2048, December 1996.
+
+   [RFC 2049]
+        Freed, N. and N. Borenstein, "MIME (Multipurpose Internet Mail
+        Extensions) Part Five: Conformance Criteria and Examples", RFC
+        2049, December 1996.
+
+   [RFC 822]
+        Crocker, D., "Standard for the Format of ARPA Internet Text
+        Messages", STD 11, RFC 822, UDEL, August 1982.
+
+7.  Acknowledgements
+
+   We gratefully acknowledge the help these people provided during the
+   preparation of this draft:
+
+        Nathaniel Borenstein
+        Ned Freed
+        Keith Moore
+        Dave Crocker
+        Dan Pritchett
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Troost, et. al.             Standards Track                    [Page 10]
+
+RFC 2183                  Content-Disposition                August 1997
+
+
+8.  Authors' Addresses
+
+   You should blame the editor of this version of the document for any
+   changes since RFC 1806:
+
+        Keith Moore
+        Department of Computer Science
+        University of Tennessee, Knoxville
+        107 Ayres Hall
+        Knoxville TN  37996-1301
+        USA
+
+        Phone: +1 (423) 974-5067
+        Fax: +1 (423) 974-8296
+        Email: moore@cs.utk.edu
+
+
+        The authors of RFC 1806 are:
+
+        Rens Troost
+        New Century Systems
+        324 East 41st Street #804
+        New York, NY, 10017 USA
+
+        Phone: +1 (212) 557-2050
+        Fax: +1 (212) 557-2049
+        EMail: rens@century.com
+
+
+        Steve Dorner
+        QUALCOMM Incorporated
+        6455 Lusk Boulevard
+        San Diego, CA 92121
+        USA
+
+        EMail: sdorner@qualcomm.com
+
+
+9. Registration of New Content-Disposition Values and Parameters
+
+   New Content-Disposition values (besides "inline" and "attachment")
+   may be defined only by Internet standards-track documents, or in
+   Experimental documents approved by the Internet Engineering Steering
+   Group.
+
+
+
+
+
+
+
+Troost, et. al.             Standards Track                    [Page 11]
+
+RFC 2183                  Content-Disposition                August 1997
+
+
+   New content-disposition parameters may be registered by supplying the
+   information in the following template and sending it via electronic
+   mail to IANA@IANA.ORG:
+
+     To: IANA@IANA.ORG
+     Subject: Registration of new Content-Disposition parameter
+
+     Content-Disposition parameter name:
+
+     Allowable values for this parameter:
+          (If the parameter can only assume a small number of values,
+          list each of those values.  Otherwise, describe the values
+          that the parameter can assume.)
+     Description:
+          (What is the purpose of this parameter and how is it used?)
+
+10. Changes since RFC 1806
+
+   The following changes have been made since the earlier version of
+   this document, published in RFC 1806 as an Experimental protocol:
+
+   +    Updated references to MIME documents.  In some cases this
+        involved substituting a reference to one of the current MIME
+        RFCs for a reference to RFC 1521; in other cases, a reference to
+        RFC 1521 was simply replaced with the word "MIME".
+
+   +    Added  a section on registration procedures, since none of the
+        procedures in RFC 2048 seemed to be appropriate.
+
+   +    Added new parameter types: creation-date, modification-date,
+        read-date, and size.
+
+
+   +    Incorporated a reference to draft-freed-pvcsc-* for encoding
+        long or non-ASCII parameter values.
+
+   +    Added reference to RFC 2119 to define MUST, SHOULD, etc.
+        keywords.
+
+
+
+
+
+
+
+
+
+
+
+
+
+Troost, et. al.             Standards Track                    [Page 12]
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2222.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2222.txt
new file mode 100644
index 000000000..2b0a2abc1
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2222.txt
@@ -0,0 +1,899 @@
+
+
+
+
+
+
+Network Working Group                                           J. Myers
+Request for Comments: 2222                       Netscape Communications
+Category: Standards Track                                   October 1997
+
+
+            Simple Authentication and Security Layer (SASL)
+
+Status of this Memo
+
+   This document specifies an Internet standards track protocol for the
+   Internet community, and requests discussion and suggestions for
+   improvements.  Please refer to the current edition of the "Internet
+   Official Protocol Standards" (STD 1) for the standardization state
+   and status of this protocol.  Distribution of this memo is unlimited.
+
+Copyright Notice
+
+   Copyright (C) The Internet Society (1997).  All Rights Reserved.
+
+Table of Contents
+
+   1.    Abstract ..............................................    2
+   2.    Organization of this Document .........................    2
+   2.1.  How to Read This Document .............................    2
+   2.2.  Conventions Used in this Document .....................    2
+   2.3.  Examples ..............................................    3
+   3.    Introduction and Overview .............................    3
+   4.    Profiling requirements ................................    4
+   5.    Specific issues .......................................    5
+   5.1.  Client sends data first ...............................    5
+   5.2.  Server returns success with additional data ...........    5
+   5.3.  Multiple authentications ..............................    5
+   6.    Registration procedures ...............................    6
+   6.1.  Comments on SASL mechanism registrations ..............    6
+   6.2.  Location of Registered SASL Mechanism List ............    6
+   6.3.  Change Control ........................................    7
+   6.4.  Registration Template .................................    7
+   7.    Mechanism definitions .................................    8
+   7.1.  Kerberos version 4 mechanism ..........................    8
+   7.2.  GSSAPI mechanism ......................................    9
+   7.2.1 Client side of authentication protocol exchange .......    9
+   7.2.2 Server side of authentication protocol exchange .......   10
+   7.2.3 Security layer ........................................   11
+   7.3.  S/Key mechanism .......................................   11
+   7.4.  External mechanism ....................................   12
+   8.    References ............................................   13
+   9.    Security Considerations ...............................   13
+   10.   Author's Address ......................................   14
+
+
+
+Myers                       Standards Track                     [Page 1]
+
+RFC 2222                          SASL                      October 1997
+
+
+   Appendix A. Relation of SASL to Transport Security ..........   15
+   Full Copyright Statement ....................................   16
+
+1.    Abstract
+
+   This document describes a method for adding authentication support to
+   connection-based protocols.  To use this specification, a protocol
+   includes a command for identifying and authenticating a user to a
+   server and for optionally negotiating protection of subsequent
+   protocol interactions.  If its use is negotiated, a security layer is
+   inserted between the protocol and the connection.  This document
+   describes how a protocol specifies such a command, defines several
+   mechanisms for use by the command, and defines the protocol used for
+   carrying a negotiated security layer over the connection.
+
+2.    Organization of this Document
+
+2.1.  How to Read This Document
+
+   This document is written to serve two different audiences, protocol
+   designers using this specification to support authentication in their
+   protocol, and implementors of clients or servers for those protocols
+   using this specification.
+
+   The sections "Introduction and Overview", "Profiling requirements",
+   and "Security Considerations" cover issues that protocol designers
+   need to understand and address in profiling this specification for
+   use in a specific protocol.
+
+   Implementors of a protocol using this specification need the
+   protocol-specific profiling information in addition to the
+   information in this document.
+
+2.2.  Conventions Used in this Document
+
+   In examples, "C:" and "S:" indicate lines sent by the client and
+   server respectively.
+
+   The key words "MUST", "MUST NOT", "SHOULD", "SHOULD NOT", and "MAY"
+   in this document are to be interpreted as defined in "Key words for
+   use in RFCs to Indicate Requirement Levels" [RFC 2119].
+
+
+
+
+
+
+
+
+
+
+Myers                       Standards Track                     [Page 2]
+
+RFC 2222                          SASL                      October 1997
+
+
+2.3.  Examples
+
+   Examples in this document are for the IMAP profile [RFC 2060] of this
+   specification.  The base64 encoding of challenges and responses, as
+   well as the "+ " preceding the responses are part of the IMAP4
+   profile, not part of the SASL specification itself.
+
+3.    Introduction and Overview
+
+   The Simple Authentication and Security Layer (SASL) is a method for
+   adding authentication support to connection-based protocols.  To use
+   this specification, a protocol includes a command for identifying and
+   authenticating a user to a server and for optionally negotiating a
+   security layer for subsequent protocol interactions.
+
+   The command has a required argument identifying a SASL mechanism.
+   SASL mechanisms are named by strings, from 1 to 20 characters in
+   length, consisting of upper-case letters, digits, hyphens, and/or
+   underscores.  SASL mechanism names must be registered with the IANA.
+   Procedures for registering new SASL mechanisms are given in the
+   section "Registration procedures"
+
+   If a server supports the requested mechanism, it initiates an
+   authentication protocol exchange.  This consists of a series of
+   server challenges and client responses that are specific to the
+   requested mechanism.  The challenges and responses are defined by the
+   mechanisms as binary tokens of arbitrary length.  The protocol's
+   profile then specifies how these binary tokens are then encoded for
+   transfer over the connection.
+
+   After receiving the authentication command or any client response, a
+   server may issue a challenge, indicate failure, or indicate
+   completion.  The protocol's profile specifies how the server
+   indicates which of the above it is doing.
+
+   After receiving a challenge, a client may issue a response or abort
+   the exchange.  The protocol's profile specifies how the client
+   indicates which of the above it is doing.
+
+   During the authentication protocol exchange, the mechanism performs
+   authentication, transmits an authorization identity (frequently known
+   as a userid) from the client to server, and negotiates the use of a
+   mechanism-specific security layer.  If the use of a security layer is
+   agreed upon, then the mechanism must also define or negotiate the
+   maximum cipher-text buffer size that each side is able to receive.
+
+
+
+
+
+
+Myers                       Standards Track                     [Page 3]
+
+RFC 2222                          SASL                      October 1997
+
+
+   The transmitted authorization identity may be different than the
+   identity in the client's authentication credentials.  This permits
+   agents such as proxy servers to authenticate using their own
+   credentials, yet request the access privileges of the identity for
+   which they are proxying.  With any mechanism, transmitting an
+   authorization identity of the empty string directs the server to
+   derive an authorization identity from the client's authentication
+   credentials.
+
+   If use of a security layer is negotiated, it is applied to all
+   subsequent data sent over the connection.  The security layer takes
+   effect immediately following the last response of the authentication
+   exchange for data sent by the client and the completion indication
+   for data sent by the server.  Once the security layer is in effect,
+   the protocol stream is processed by the security layer into buffers
+   of cipher-text.  Each buffer is transferred over the connection as a
+   stream of octets prepended with a four octet field in network byte
+   order that represents the length of the following buffer.  The length
+   of the cipher-text buffer must be no larger than the maximum size
+   that was defined or negotiated by the other side.
+
+4.    Profiling requirements
+
+   In order to use this specification, a protocol definition must supply
+   the following information:
+
+   1. A service name, to be selected from the IANA registry of "service"
+      elements for the GSSAPI host-based service name form [RFC 2078].
+
+   2. A definition of the command to initiate the authentication
+      protocol exchange.  This command must have as a parameter the
+      mechanism name being selected by the client.
+
+      The command SHOULD have an optional parameter giving an initial
+      response.  This optional parameter allows the client to avoid a
+      round trip when using a mechanism which is defined to have the
+      client send data first.  When this initial response is sent by the
+      client and the selected mechanism is defined to have the server
+      start with an initial challenge, the command fails.  See section
+      5.1 of this document for further information.
+
+   3. A definition of the method by which the authentication protocol
+      exchange is carried out, including how the challenges and
+      responses are encoded, how the server indicates completion or
+      failure of the exchange, how the client aborts an exchange, and
+      how the exchange method interacts with any line length limits in
+      the protocol.
+
+
+
+
+Myers                       Standards Track                     [Page 4]
+
+RFC 2222                          SASL                      October 1997
+
+
+   4. Identification of the octet where any negotiated security layer
+      starts to take effect, in both directions.
+
+   5. A specification of how the authorization identity passed from the
+      client to the server is to be interpreted.
+
+5.    Specific issues
+
+5.1.  Client sends data first
+
+   Some mechanisms specify that the first data sent in the
+   authentication protocol exchange is from the client to the server.
+
+   If a protocol's profile permits the command which initiates an
+   authentication protocol exchange to contain an initial client
+   response, this parameter SHOULD be used with such mechanisms.
+
+   If the initial client response parameter is not given, or if a
+   protocol's profile does not permit the command which initiates an
+   authentication protocol exchange to contain an initial client
+   response, then the server issues a challenge with no data.  The
+   client's response to this challenge is then used as the initial
+   client response.  (The server then proceeds to send the next
+   challenge, indicates completion, or indicates failure.)
+
+5.2.  Server returns success with additional data
+
+   Some mechanisms may specify that server challenge data be sent to the
+   client along with an indication of successful completion of the
+   exchange.  This data would, for example, authenticate the server to
+   the client.
+
+   If a protocol's profile does not permit this server challenge to be
+   returned with a success indication, then the server issues the server
+   challenge without an indication of successful completion.  The client
+   then responds with no data.  After receiving this empty response, the
+   server then indicates successful completion.
+
+5.3.  Multiple authentications
+
+   Unless otherwise stated by the protocol's profile, only one
+   successful SASL negotiation may occur in a protocol session.  In this
+   case, once an authentication protocol exchange has successfully
+   completed, further attempts to initiate an authentication protocol
+   exchange fail.
+
+
+
+
+
+
+Myers                       Standards Track                     [Page 5]
+
+RFC 2222                          SASL                      October 1997
+
+
+   In the case that a profile explicitly permits multiple successful
+   SASL negotiations to occur, then in no case may multiple security
+   layers be simultaneously in effect.  If a security layer is in effect
+   and a subsequent SASL negotiation selects no security layer, the
+   original security layer remains in effect.  If a security layer is in
+   effect and a subsequent SASL negotiation selects a second security
+   layer, then the second security layer replaces the first.
+
+6.    Registration procedures
+
+   Registration of a SASL mechanism is done by filling in the template
+   in section 6.4 and sending it in to iana@isi.edu.  IANA has the right
+   to reject obviously bogus registrations, but will perform no review
+   of clams made in the registration form.
+
+   There is no naming convention for SASL mechanisms; any name that
+   conforms to the syntax of a SASL mechanism name can be registered.
+
+   While the registration procedures do not require it, authors of SASL
+   mechanisms are encouraged to seek community review and comment
+   whenever that is feasible.  Authors may seek community review by
+   posting a specification of their proposed mechanism as an internet-
+   draft.  SASL mechanisms intended for widespread use should be
+   standardized through the normal IETF process, when appropriate.
+
+6.1.  Comments on SASL mechanism registrations
+
+   Comments on registered SASL mechanisms should first be sent to the
+   "owner" of the mechanism.  Submitters of comments may, after a
+   reasonable attempt to contact the owner, request IANA to attach their
+   comment to the SASL mechanism registration itself.  If IANA approves
+   of this the comment will be made accessible in conjunction with the
+   SASL mechanism registration itself.
+
+6.2.  Location of Registered SASL Mechanism List
+
+   SASL mechanism registrations will be posted in the anonymous FTP
+   directory "ftp://ftp.isi.edu/in-notes/iana/assignments/sasl-
+   mechanisms/" and all registered SASL mechanisms will be listed in the
+   periodically issued "Assigned Numbers" RFC [currently STD 2, RFC
+   1700].  The SASL mechanism description and other supporting material
+   may also be published as an Informational RFC by sending it to "rfc-
+   editor@isi.edu" (please follow the instructions to RFC authors [RFC
+   2223]).
+
+
+
+
+
+
+
+Myers                       Standards Track                     [Page 6]
+
+RFC 2222                          SASL                      October 1997
+
+
+6.3.  Change Control
+
+   Once a SASL mechanism registration has been published by IANA, the
+   author may request a change to its definition.  The change request
+   follows the same procedure as the registration request.
+
+   The owner of a SASL mechanism may pass responsibility for the SASL
+   mechanism to another person or agency by informing IANA; this can be
+   done without discussion or review.
+
+   The IESG may reassign responsibility for a SASL mechanism. The most
+   common case of this will be to enable changes to be made to
+   mechanisms where the author of the registration has died, moved out
+   of contact or is otherwise unable to make changes that are important
+   to the community.
+
+   SASL mechanism registrations may not be deleted; mechanisms which are
+   no longer believed appropriate for use can be declared OBSOLETE by a
+   change to their "intended use" field; such SASL mechanisms will be
+   clearly marked in the lists published by IANA.
+
+   The IESG is considered to be the owner of all SASL mechanisms which
+   are on the IETF standards track.
+
+6.4.  Registration Template
+
+   To: iana@iana.org
+   Subject: Registration of SASL mechanism X
+
+   SASL mechanism name:
+
+   Security considerations:
+
+   Published specification (optional, recommended):
+
+   Person & email address to contact for further information:
+
+   Intended usage:
+
+   (One of COMMON, LIMITED USE or OBSOLETE)
+
+   Author/Change controller:
+
+   (Any other information that the author deems interesting may be
+   added below this line.)
+
+
+
+
+
+
+Myers                       Standards Track                     [Page 7]
+
+RFC 2222                          SASL                      October 1997
+
+
+7.    Mechanism definitions
+
+   The following mechanisms are hereby defined.
+
+7.1.  Kerberos version 4 mechanism
+
+   The mechanism name associated with Kerberos version 4 is
+   "KERBEROS_V4".
+
+   The first challenge consists of a random 32-bit number in network
+   byte order.  The client responds with a Kerberos ticket and an
+   authenticator for the principal "service.hostname@realm", where
+   "service" is the service name specified in the protocol's profile,
+   "hostname" is the first component of the host name of the server with
+   all letters in lower case, and where "realm" is the Kerberos realm of
+   the server.  The encrypted checksum field included within the
+   Kerberos authenticator contains the server provided challenge in
+   network byte order.
+
+   Upon decrypting and verifying the ticket and authenticator, the
+   server verifies that the contained checksum field equals the original
+   server provided random 32-bit number.  Should the verification be
+   successful, the server must add one to the checksum and construct 8
+   octets of data, with the first four octets containing the incremented
+   checksum in network byte order, the fifth octet containing a bit-mask
+   specifying the security layers supported by the server, and the sixth
+   through eighth octets containing, in network byte order, the maximum
+   cipher-text buffer size the server is able to receive.  The server
+   must encrypt using DES ECB mode the 8 octets of data in the session
+   key and issue that encrypted data in a second challenge.  The client
+   considers the server authenticated if the first four octets of the
+   un-encrypted data is equal to one plus the checksum it previously
+   sent.
+
+   The client must construct data with the first four octets containing
+   the original server-issued checksum in network byte order, the fifth
+   octet containing the bit-mask specifying the selected security layer,
+   the sixth through eighth octets containing in network byte order the
+   maximum cipher-text buffer size the client is able to receive, and
+   the following octets containing the authorization identity.  The
+   client must then append from one to eight zero-valued octets so that
+   the length of the data is a multiple of eight octets. The client must
+   then encrypt using DES PCBC mode the data with the session key and
+   respond with the encrypted data.  The server decrypts the data and
+   verifies the contained checksum.  The server must verify that the
+   principal identified in the Kerberos ticket is authorized to connect
+   as that authorization identity.  After this verification, the
+   authentication process is complete.
+
+
+
+Myers                       Standards Track                     [Page 8]
+
+RFC 2222                          SASL                      October 1997
+
+
+   The security layers and their corresponding bit-masks are as follows:
+
+      1 No security layer
+      2 Integrity (krb_mk_safe) protection
+      4 Privacy (krb_mk_priv) protection
+
+   Other bit-masks may be defined in the future; bits which are not
+   understood must be negotiated off.
+
+   EXAMPLE: The following are two Kerberos version 4 login scenarios to
+   the IMAP4 protocol (note that the line breaks in the sample
+   authenticators are for editorial clarity and are not in real
+   authenticators)
+
+     S: * OK IMAP4 Server
+     C: A001 AUTHENTICATE KERBEROS_V4
+     S: + AmFYig==
+     C: BAcAQU5EUkVXLkNNVS5FRFUAOCAsho84kLN3/IJmrMG+25a4DT
+        +nZImJjnTNHJUtxAA+o0KPKfHEcAFs9a3CL5Oebe/ydHJUwYFd
+        WwuQ1MWiy6IesKvjL5rL9WjXUb9MwT9bpObYLGOKi1Qh
+     S: + or//EoAADZI=
+     C: DiAF5A4gA+oOIALuBkAAmw==
+     S: A001 OK Kerberos V4 authentication successful
+
+
+     S: * OK IMAP4 Server
+     C: A001 AUTHENTICATE KERBEROS_V4
+     S: + gcfgCA==
+     C: BAcAQU5EUkVXLkNNVS5FRFUAOCAsho84kLN3/IJmrMG+25a4DT
+        +nZImJjnTNHJUtxAA+o0KPKfHEcAFs9a3CL5Oebe/ydHJUwYFd
+        WwuQ1MWiy6IesKvjL5rL9WjXUb9MwT9bpObYLGOKi1Qh
+     S: A001 NO Kerberos V4 authentication failed
+
+7.2.  GSSAPI mechanism
+
+   The mechanism name associated with all mechanisms employing the
+   GSSAPI [RFC 2078] is "GSSAPI".
+
+7.2.1 Client side of authentication protocol exchange
+
+   The client calls GSS_Init_sec_context, passing in 0 for
+   input_context_handle (initially) and a targ_name equal to output_name
+   from GSS_Import_Name called with input_name_type of
+   GSS_C_NT_HOSTBASED_SERVICE and input_name_string of
+   "service@hostname" where "service" is the service name specified in
+   the protocol's profile, and "hostname" is the fully qualified host
+   name of the server.  The client then responds with the resulting
+   output_token.  If GSS_Init_sec_context returns GSS_S_CONTINUE_NEEDED,
+
+
+
+Myers                       Standards Track                     [Page 9]
+
+RFC 2222                          SASL                      October 1997
+
+
+   then the client should expect the server to issue a token in a
+   subsequent challenge.  The client must pass the token to another call
+   to GSS_Init_sec_context, repeating the actions in this paragraph.
+
+   When GSS_Init_sec_context returns GSS_S_COMPLETE, the client takes
+   the following actions: If the last call to GSS_Init_sec_context
+   returned an output_token, then the client responds with the
+   output_token, otherwise the client responds with no data.  The client
+   should then expect the server to issue a token in a subsequent
+   challenge.  The client passes this token to GSS_Unwrap and interprets
+   the first octet of resulting cleartext as a bit-mask specifying the
+   security layers supported by the server and the second through fourth
+   octets as the maximum size output_message to send to the server.  The
+   client then constructs data, with the first octet containing the
+   bit-mask specifying the selected security layer, the second through
+   fourth octets containing in network byte order the maximum size
+   output_message the client is able to receive, and the remaining
+   octets containing the authorization identity.  The client passes the
+   data to GSS_Wrap with conf_flag set to FALSE, and responds with the
+   generated output_message.  The client can then consider the server
+   authenticated.
+
+7.2.2 Server side of authentication protocol exchange
+
+   The server passes the initial client response to
+   GSS_Accept_sec_context as input_token, setting input_context_handle
+   to 0 (initially).  If GSS_Accept_sec_context returns
+   GSS_S_CONTINUE_NEEDED, the server returns the generated output_token
+   to the client in challenge and passes the resulting response to
+   another call to GSS_Accept_sec_context, repeating the actions in this
+   paragraph.
+
+   When GSS_Accept_sec_context returns GSS_S_COMPLETE, the client takes
+   the following actions: If the last call to GSS_Accept_sec_context
+   returned an output_token, the server returns it to the client in a
+   challenge and expects a reply from the client with no data.  Whether
+   or not an output_token was returned (and after receipt of any
+   response from the client to such an output_token), the server then
+   constructs 4 octets of data, with the first octet containing a bit-
+   mask specifying the security layers supported by the server and the
+   second through fourth octets containing in network byte order the
+   maximum size output_token the server is able to receive.  The server
+   must then pass the plaintext to GSS_Wrap with conf_flag set to FALSE
+   and issue the generated output_message to the client in a challenge.
+   The server must then pass the resulting response to GSS_Unwrap and
+   interpret the first octet of resulting cleartext as the bit-mask for
+   the selected security layer, the second through fourth octets as the
+   maximum size output_message to send to the client, and the remaining
+
+
+
+Myers                       Standards Track                    [Page 10]
+
+RFC 2222                          SASL                      October 1997
+
+
+   octets as the authorization identity.  The server must verify that
+   the src_name is authorized to authenticate as the authorization
+   identity.  After these verifications, the authentication process is
+   complete.
+
+7.2.3 Security layer
+
+   The security layers and their corresponding bit-masks are as follows:
+
+     1 No security layer
+     2 Integrity protection.
+       Sender calls GSS_Wrap with conf_flag set to FALSE
+     4 Privacy protection.
+       Sender calls GSS_Wrap with conf_flag set to TRUE
+
+   Other bit-masks may be defined in the future; bits which are not
+   understood must be negotiated off.
+
+7.3.  S/Key mechanism
+
+   The mechanism name associated with S/Key [RFC 1760] using the MD4
+   digest algorithm is "SKEY".
+
+   The client sends an initial response with the authorization identity.
+
+   The server then issues a challenge which contains the decimal
+   sequence number followed by a single space and the seed string for
+   the indicated authorization identity.  The client responds with the
+   one-time-password, as either a 64-bit value in network byte order or
+   encoded in the "six English words" format.
+
+   The server must verify the one-time-password.  After this
+   verification, the authentication process is complete.
+
+   S/Key authentication does not provide for any security layers.
+
+   EXAMPLE: The following are two S/Key login scenarios in the IMAP4
+   protocol.
+
+     S: * OK IMAP4 Server
+     C: A001 AUTHENTICATE SKEY
+     S: +
+     C: bW9yZ2Fu
+     S: + OTUgUWE1ODMwOA==
+     C: Rk9VUiBNQU5OIFNPT04gRklSIFZBUlkgTUFTSA==
+     S: A001 OK S/Key authentication successful
+
+
+
+
+
+Myers                       Standards Track                    [Page 11]
+
+RFC 2222                          SASL                      October 1997
+
+
+     S: * OK IMAP4 Server
+     C: A001 AUTHENTICATE SKEY
+     S: +
+     C: c21pdGg=
+     S: + OTUgUWE1ODMwOA==
+     C: BsAY3g4gBNo=
+     S: A001 NO S/Key authentication failed
+
+   The following is an S/Key login scenario in an IMAP4-like protocol
+   which has an optional "initial response" argument to the AUTHENTICATE
+   command.
+
+     S: * OK IMAP4-Like Server
+     C: A001 AUTHENTICATE SKEY bW9yZ2Fu
+     S: + OTUgUWE1ODMwOA==
+     C: Rk9VUiBNQU5OIFNPT04gRklSIFZBUlkgTUFTSA==
+     S: A001 OK S/Key authentication successful
+
+7.4.  External mechanism
+
+   The mechanism name associated with external authentication is
+   "EXTERNAL".
+
+   The client sends an initial response with the authorization identity.
+
+   The server uses information, external to SASL, to determine whether
+   the client is authorized to authenticate as the authorization
+   identity.  If the client is so authorized, the server indicates
+   successful completion of the authentication exchange; otherwise the
+   server indicates failure.
+
+   The system providing this external information may be, for example,
+   IPsec or TLS.
+
+   If the client sends the empty string as the authorization identity
+   (thus requesting the authorization identity be derived from the
+   client's authentication credentials), the authorization identity is
+   to be derived from authentication credentials which exist in the
+   system which is providing the external authentication.
+
+
+
+
+
+
+
+
+
+
+
+
+Myers                       Standards Track                    [Page 12]
+
+RFC 2222                          SASL                      October 1997
+
+
+8.    References
+
+   [RFC 2060] Crispin, M., "Internet Message Access Protocol - Version
+              4rev1", RFC 2060, December 1996.
+
+   [RFC 2078] Linn, J., "Generic Security Service Application Program
+              Interface, Version 2", RFC 2078, January 1997.
+
+   [RFC 2119] Bradner, S., "Key words for use in RFCs to Indicate
+              Requirement Levels", RFC 2119, March 1997.
+
+   [RFC 2223] Postel, J., and J. Reynolds, "Instructions to RFC
+              Authors", RFC 2223, October 1997.
+
+   [RFC 1760] Haller, N., "The S/Key One-Time Password System", RFC
+              1760, February 1995.
+
+   [RFC 1700] Reynolds, J., and J. Postel, "Assigned Numbers", STD 2,
+              RFC 1700, October 1994.
+
+9.    Security Considerations
+
+   Security issues are discussed throughout this memo.
+
+   The mechanisms that support integrity protection are designed such
+   that the negotiation of the security layer and authorization identity
+   is integrity protected.  When the client selects a security layer
+   with at least integrity protection, this protects against an active
+   attacker hijacking the connection and modifying the authentication
+   exchange to negotiate a plaintext connection.
+
+   When a server or client supports multiple authentication mechanisms,
+   each of which has a different security strength, it is possible for
+   an active attacker to cause a party to use the least secure mechanism
+   supported.  To protect against this sort of attack, a client or
+   server which supports mechanisms of different strengths should have a
+   configurable minimum strength that it will use.  It is not sufficient
+   for this minimum strength check to only be on the server, since an
+   active attacker can change which mechanisms the client sees as being
+   supported, causing the client to send authentication credentials for
+   its weakest supported mechanism.
+
+
+
+
+
+
+
+
+
+
+Myers                       Standards Track                    [Page 13]
+
+RFC 2222                          SASL                      October 1997
+
+
+   The client's selection of a SASL mechanism is done in the clear and
+   may be modified by an active attacker.  It is important for any new
+   SASL mechanisms to be designed such that an active attacker cannot
+   obtain an authentication with weaker security properties by modifying
+   the SASL mechanism name and/or the challenges and responses.
+
+   Any protocol interactions prior to authentication are performed in
+   the clear and may be modified by an active attacker.  In the case
+   where a client selects integrity protection, it is important that any
+   security-sensitive protocol negotiations be performed after
+   authentication is complete.  Protocols should be designed such that
+   negotiations performed prior to authentication should be either
+   ignored or revalidated once authentication is complete.
+
+10.   Author's Address
+
+   John G. Myers
+   Netscape Communications
+   501 E. Middlefield Road
+   Mail Stop MV-029
+   Mountain View, CA 94043-4042
+
+   EMail: jgmyers@netscape.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Myers                       Standards Track                    [Page 14]
+
+RFC 2222                          SASL                      October 1997
+
+
+Appendix A. Relation of SASL to Transport Security
+
+   Questions have been raised about the relationship between SASL and
+   various services (such as IPsec and TLS) which provide a secured
+   connection.
+
+   Two of the key features of SASL are:
+
+   1. The separation of the authorization identity from the identity in
+      the client's credentials.  This permits agents such as proxy
+      servers to authenticate using their own credentials, yet request
+      the access privileges of the identity for which they are proxying.
+
+   2. Upon successful completion of an authentication exchange, the
+      server knows the authorization identity the client wishes to use.
+      This allows servers to move to a "user is authenticated" state in
+      the protocol.
+
+   These features are extremely important to some application protocols,
+   yet Transport Security services do not always provide them.  To
+   define SASL mechanisms based on these services would be a very messy
+   task, as the framing of these services would be redundant with the
+   framing of SASL and some method of providing these important SASL
+   features would have to be devised.
+
+   Sometimes it is desired to enable within an existing connection the
+   use of a security service which does not fit the SASL model.  (TLS is
+   an example of such a service.)  This can be done by adding a command,
+   for example "STARTTLS", to the protocol.  Such a command is outside
+   the scope of SASL, and should be different from the command which
+   starts a SASL authentication protocol exchange.
+
+   In certain situations, it is reasonable to use SASL underneath one of
+   these Transport Security services.  The transport service would
+   secure the connection, either service would authenticate the client,
+   and SASL would negotiate the authorization identity.  The SASL
+   negotiation would be what moves the protocol from "unauthenticated"
+   to "authenticated" state.  The "EXTERNAL" SASL mechanism is
+   explicitly intended to handle the case where the transport service
+   secures the connection and authenticates the client and SASL
+   negotiates the authorization identity.
+
+   When using SASL underneath a sufficiently strong Transport Security
+   service, a SASL security layer would most likely be redundant.  The
+   client and server would thus probably want to negotiate off the use
+   of a SASL security layer.
+
+
+
+
+
+Myers                       Standards Track                    [Page 15]
+
+RFC 2222                          SASL                      October 1997
+
+
+Full Copyright Statement
+
+   Copyright (C) The Internet Society (1997).  All Rights Reserved.
+
+   This document and translations of it may be copied and furnished to
+   others, and derivative works that comment on or otherwise explain it
+   or assist in its implmentation may be prepared, copied, published
+   andand distributed, in whole or in part, without restriction of any
+   kind, provided that the above copyright notice and this paragraph are
+   included on all such copies and derivative works.  However, this
+   document itself may not be modified in any way, such as by removing
+   the copyright notice or references to the Internet Society or other
+   Internet organizations, except as needed for the purpose of
+   developing Internet standards in which case the procedures for
+   copyrights defined in the Internet Standards process must be
+   followed, or as required to translate it into languages other than
+   English.
+
+   The limited permissions granted above are perpetual and will not be
+   revoked by the Internet Society or its successors or assigns.
+
+   This document and the information contained herein is provided on an
+   "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
+   TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+   BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
+   HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
+   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Myers                       Standards Track                    [Page 16]
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2231.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2231.txt
new file mode 100644
index 000000000..120f98f85
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2231.txt
@@ -0,0 +1,563 @@
+
+
+
+
+
+
+Network Working Group                                         N. Freed
+Request for Comments: 2231                                    Innosoft
+Updates: 2045, 2047, 2183                                     K. Moore
+Obsoletes: 2184                                University of Tennessee
+Category: Standards Track                                November 1997
+
+
+           MIME Parameter Value and Encoded Word Extensions:
+              Character Sets, Languages, and Continuations
+
+
+Status of this Memo
+
+   This document specifies an Internet standards track protocol for the
+   Internet community, and requests discussion and suggestions for
+   improvements.  Please refer to the current edition of the "Internet
+   Official Protocol Standards" (STD 1) for the standardization state
+   and status of this protocol.  Distribution of this memo is unlimited.
+
+Copyright Notice
+
+   Copyright (C) The Internet Society (1997).  All Rights Reserved.
+
+1.  Abstract
+
+   This memo defines extensions to the RFC 2045 media type and RFC 2183
+   disposition parameter value mechanisms to provide
+
+    (1)   a means to specify parameter values in character sets
+          other than US-ASCII,
+
+    (2)   to specify the language to be used should the value be
+          displayed, and
+
+    (3)   a continuation mechanism for long parameter values to
+          avoid problems with header line wrapping.
+
+   This memo also defines an extension to the encoded words defined in
+   RFC 2047 to allow the specification of the language to be used for
+   display as well as the character set.
+
+2.  Introduction
+
+   The Multipurpose Internet Mail Extensions, or MIME [RFC-2045, RFC-
+   2046, RFC-2047, RFC-2048, RFC-2049], define a message format that
+   allows for:
+
+
+
+
+
+Freed & Moore               Standards Track                     [Page 1]
+
+RFC 2231         MIME Value and Encoded Word Extensions    November 1997
+
+
+    (1)   textual message bodies in character sets other than
+          US-ASCII,
+
+    (2)   non-textual message bodies,
+
+    (3)   multi-part message bodies, and
+
+    (4)   textual header information in character sets other than
+          US-ASCII.
+
+   MIME is now widely deployed and is used by a variety of Internet
+   protocols, including, of course, Internet email.  However, MIME's
+   success has resulted in the need for additional mechanisms that were
+   not provided in the original protocol specification.
+
+   In particular, existing MIME mechanisms provide for named media type
+   (content-type field) parameters as well as named disposition
+   (content-disposition field).  A MIME media type may specify any
+   number of parameters associated with all of its subtypes, and any
+   specific subtype may specify additional parameters for its own use. A
+   MIME disposition value may specify any number of associated
+   parameters, the most important of which is probably the attachment
+   disposition's filename parameter.
+
+   These parameter names and values end up appearing in the content-type
+   and content-disposition header fields in Internet email.  This
+   inherently imposes three crucial limitations:
+
+    (1)   Lines in Internet email header fields are folded
+          according to RFC 822 folding rules.  This makes long
+          parameter values problematic.
+
+    (2)   MIME headers, like the RFC 822 headers they often
+          appear in, are limited to 7bit US-ASCII, and the
+          encoded-word mechanisms of RFC 2047 are not available
+          to parameter values.  This makes it impossible to have
+          parameter values in character sets other than US-ASCII
+          without specifying some sort of private per-parameter
+          encoding.
+
+    (3)   It has recently become clear that character set
+          information is not sufficient to properly display some
+          sorts of information -- language information is also
+          needed [RFC-2130].  For example, support for
+          handicapped users may require reading text string
+
+
+
+
+
+
+Freed & Moore               Standards Track                     [Page 2]
+
+RFC 2231         MIME Value and Encoded Word Extensions    November 1997
+
+
+          aloud. The language the text is written in is needed
+          for this to be done correctly.  Some parameter values
+          may need to be displayed, hence there is a need to
+          allow for the inclusion of language information.
+
+   The last problem on this list is also an issue for the encoded words
+   defined by RFC 2047, as encoded words are intended primarily for
+   display purposes.
+
+   This document defines extensions that address all of these
+   limitations. All of these extensions are implemented in a fashion
+   that is completely compatible at a syntactic level with existing MIME
+   implementations. In addition, the extensions are designed to have as
+   little impact as possible on existing uses of MIME.
+
+   IMPORTANT NOTE:  These mechanisms end up being somewhat gibbous when
+   they actually are used. As such, these mechanisms should not be used
+   lightly; they should be reserved for situations where a real need for
+   them exists.
+
+2.1.  Requirements notation
+
+   This document occasionally uses terms that appear in capital letters.
+   When the terms "MUST", "SHOULD", "MUST NOT", "SHOULD NOT", and "MAY"
+   appear capitalized, they are being used to indicate particular
+   requirements of this specification. A discussion of the meanings of
+   these terms appears in [RFC- 2119].
+
+3.  Parameter Value Continuations
+
+   Long MIME media type or disposition parameter values do not interact
+   well with header line wrapping conventions.  In particular, proper
+   header line wrapping depends on there being places where linear
+   whitespace (LWSP) is allowed, which may or may not be present in a
+   parameter value, and even if present may not be recognizable as such
+   since specific knowledge of parameter value syntax may not be
+   available to the agent doing the line wrapping. The result is that
+   long parameter values may end up getting truncated or otherwise
+   damaged by incorrect line wrapping implementations.
+
+   A mechanism is therefore needed to break up parameter values into
+   smaller units that are amenable to line wrapping. Any such mechanism
+   MUST be compatible with existing MIME processors. This means that
+
+    (1)   the mechanism MUST NOT change the syntax of MIME media
+          type and disposition lines, and
+
+
+
+
+
+Freed & Moore               Standards Track                     [Page 3]
+
+RFC 2231         MIME Value and Encoded Word Extensions    November 1997
+
+
+    (2)   the mechanism MUST NOT depend on parameter ordering
+          since MIME states that parameters are not order
+          sensitive.  Note that while MIME does prohibit
+          modification of MIME headers during transport, it is
+          still possible that parameters will be reordered when
+          user agent level processing is done.
+
+   The obvious solution, then, is to use multiple parameters to contain
+   a single parameter value and to use some kind of distinguished name
+   to indicate when this is being done.  And this obvious solution is
+   exactly what is specified here: The asterisk character ("*") followed
+   by a decimal count is employed to indicate that multiple parameters
+   are being used to encapsulate a single parameter value.  The count
+   starts at 0 and increments by 1 for each subsequent section of the
+   parameter value.  Decimal values are used and neither leading zeroes
+   nor gaps in the sequence are allowed.
+
+   The original parameter value is recovered by concatenating the
+   various sections of the parameter, in order.  For example, the
+   content-type field
+
+        Content-Type: message/external-body; access-type=URL;
+         URL*0="ftp://";
+         URL*1="cs.utk.edu/pub/moore/bulk-mailer/bulk-mailer.tar"
+
+   is semantically identical to
+
+        Content-Type: message/external-body; access-type=URL;
+          URL="ftp://cs.utk.edu/pub/moore/bulk-mailer/bulk-mailer.tar"
+
+   Note that quotes around parameter values are part of the value
+   syntax; they are NOT part of the value itself.  Furthermore, it is
+   explicitly permitted to have a mixture of quoted and unquoted
+   continuation fields.
+
+4.  Parameter Value Character Set and Language Information
+
+   Some parameter values may need to be qualified with character set or
+   language information.  It is clear that a distinguished parameter
+   name is needed to identify when this information is present along
+   with a specific syntax for the information in the value itself.  In
+   addition, a lightweight encoding mechanism is needed to accommodate 8
+   bit information in parameter values.
+
+
+
+
+
+
+
+
+Freed & Moore               Standards Track                     [Page 4]
+
+RFC 2231         MIME Value and Encoded Word Extensions    November 1997
+
+
+   Asterisks ("*") are reused to provide the indicator that language and
+   character set information is present and encoding is being used. A
+   single quote ("'") is used to delimit the character set and language
+   information at the beginning of the parameter value. Percent signs
+   ("%") are used as the encoding flag, which agrees with RFC 2047.
+
+   Specifically, an asterisk at the end of a parameter name acts as an
+   indicator that character set and language information may appear at
+   the beginning of the parameter value. A single quote is used to
+   separate the character set, language, and actual value information in
+   the parameter value string, and an percent sign is used to flag
+   octets encoded in hexadecimal.  For example:
+
+        Content-Type: application/x-stuff;
+         title*=us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A
+
+   Note that it is perfectly permissible to leave either the character
+   set or language field blank.  Note also that the single quote
+   delimiters MUST be present even when one of the field values is
+   omitted.  This is done when either character set, language, or both
+   are not relevant to the parameter value at hand.  This MUST NOT be
+   done in order to indicate a default character set or language --
+   parameter field definitions MUST NOT assign a default character set
+   or language.
+
+4.1.  Combining Character Set, Language, and Parameter Continuations
+
+   Character set and language information may be combined with the
+   parameter continuation mechanism. For example:
+
+   Content-Type: application/x-stuff
+    title*0*=us-ascii'en'This%20is%20even%20more%20
+    title*1*=%2A%2A%2Afun%2A%2A%2A%20
+    title*2="isn't it!"
+
+   Note that:
+
+    (1)   Language and character set information only appear at
+          the beginning of a given parameter value.
+
+    (2)   Continuations do not provide a facility for using more
+          than one character set or language in the same
+          parameter value.
+
+    (3)   A value presented using multiple continuations may
+          contain a mixture of encoded and unencoded segments.
+
+
+
+
+
+Freed & Moore               Standards Track                     [Page 5]
+
+RFC 2231         MIME Value and Encoded Word Extensions    November 1997
+
+
+    (4)   The first segment of a continuation MUST be encoded if
+          language and character set information are given.
+
+    (5)   If the first segment of a continued parameter value is
+          encoded the language and character set field delimiters
+          MUST be present even when the fields are left blank.
+
+5.  Language specification in Encoded Words
+
+   RFC 2047 provides support for non-US-ASCII character sets in RFC 822
+   message header comments, phrases, and any unstructured text field.
+   This is done by defining an encoded word construct which can appear
+   in any of these places.  Given that these are fields intended for
+   display, it is sometimes necessary to associate language information
+   with encoded words as well as just the character set.  This
+   specification extends the definition of an encoded word to allow the
+   inclusion of such information.  This is simply done by suffixing the
+   character set specification with an asterisk followed by the language
+   tag.  For example:
+
+          From: =?US-ASCII*EN?Q?Keith_Moore?= <moore@cs.utk.edu>
+
+6.  IMAP4 Handling of Parameter Values
+
+   IMAP4 [RFC-2060] servers SHOULD decode parameter value continuations
+   when generating the BODY and BODYSTRUCTURE fetch attributes.
+
+7.  Modifications to MIME ABNF
+
+   The ABNF for MIME parameter values given in RFC 2045 is:
+
+   parameter := attribute "=" value
+
+   attribute := token
+                ; Matching of attributes
+                ; is ALWAYS case-insensitive.
+
+   This specification changes this ABNF to:
+
+   parameter := regular-parameter / extended-parameter
+
+   regular-parameter := regular-parameter-name "=" value
+
+   regular-parameter-name := attribute [section]
+
+   attribute := 1*attribute-char
+
+
+
+
+
+Freed & Moore               Standards Track                     [Page 6]
+
+RFC 2231         MIME Value and Encoded Word Extensions    November 1997
+
+
+   attribute-char := <any (US-ASCII) CHAR except SPACE, CTLs,
+                     "*", "'", "%", or tspecials>
+
+   section := initial-section / other-sections
+
+   initial-section := "*0"
+
+   other-sections := "*" ("1" / "2" / "3" / "4" / "5" /
+                          "6" / "7" / "8" / "9") *DIGIT)
+
+   extended-parameter := (extended-initial-name "="
+                          extended-value) /
+                         (extended-other-names "="
+                          extended-other-values)
+
+   extended-initial-name := attribute [initial-section] "*"
+
+   extended-other-names := attribute other-sections "*"
+
+   extended-initial-value := [charset] "'" [language] "'"
+                             extended-other-values
+
+   extended-other-values := *(ext-octet / attribute-char)
+
+   ext-octet := "%" 2(DIGIT / "A" / "B" / "C" / "D" / "E" / "F")
+
+   charset := <registered character set name>
+
+   language := <registered language tag [RFC-1766]>
+
+   The ABNF given in RFC 2047 for encoded-words is:
+
+   encoded-word := "=?" charset "?" encoding "?" encoded-text "?="
+
+   This specification changes this ABNF to:
+
+   encoded-word := "=?" charset ["*" language] "?" encoded-text "?="
+
+8.  Character sets which allow specification of language
+
+   In the future it is likely that some character sets will provide
+   facilities for inline language labeling. Such facilities are
+   inherently more flexible than those defined here as they allow for
+   language switching in the middle of a string.
+
+
+
+
+
+
+
+Freed & Moore               Standards Track                     [Page 7]
+
+RFC 2231         MIME Value and Encoded Word Extensions    November 1997
+
+
+   If and when such facilities are developed they SHOULD be used in
+   preference to the language labeling facilities specified here. Note
+   that all the mechanisms defined here allow for the omission of
+   language labels so as to be able to accommodate this possible future
+   usage.
+
+9.  Security Considerations
+
+   This RFC does not discuss security issues and is not believed to
+   raise any security issues not already endemic in electronic mail and
+   present in fully conforming implementations of MIME.
+
+10.  References
+
+   [RFC-822]
+        Crocker, D., "Standard for the Format of ARPA Internet
+        Text Messages", STD 11, RFC 822 August 1982.
+
+   [RFC-1766]
+        Alvestrand, H., "Tags for the Identification of
+        Languages", RFC 1766, March 1995.
+
+   [RFC-2045]
+        Freed, N., and N. Borenstein, "Multipurpose Internet Mail
+        Extensions (MIME) Part One: Format of Internet Message
+        Bodies", RFC 2045, December 1996.
+
+   [RFC-2046]
+        Freed, N. and N. Borenstein, "Multipurpose Internet Mail
+        Extensions (MIME) Part Two: Media Types", RFC 2046,
+        December 1996.
+
+   [RFC-2047]
+        Moore, K., "Multipurpose Internet Mail Extensions (MIME)
+        Part Three: Representation of Non-ASCII Text in Internet
+        Message Headers", RFC 2047, December 1996.
+
+   [RFC-2048]
+        Freed, N., Klensin, J. and J. Postel, "Multipurpose
+        Internet Mail Extensions (MIME) Part Four: MIME
+        Registration Procedures", RFC 2048, December 1996.
+
+   [RFC-2049]
+        Freed, N. and N. Borenstein, "Multipurpose Internet Mail
+        Extensions (MIME) Part Five: Conformance Criteria and
+        Examples", RFC 2049, December 1996.
+
+
+
+
+
+Freed & Moore               Standards Track                     [Page 8]
+
+RFC 2231         MIME Value and Encoded Word Extensions    November 1997
+
+
+   [RFC-2060]
+        Crispin, M., "Internet Message Access Protocol - Version
+        4rev1", RFC 2060, December 1996.
+
+   [RFC-2119]
+        Bradner, S., "Key words for use in RFCs to Indicate
+        Requirement Levels", RFC 2119, March 1997.
+
+   [RFC-2130]
+        Weider, C., Preston, C., Simonsen, K., Alvestrand, H.,
+        Atkinson, R., Crispin, M., and P. Svanberg, "Report from the
+        IAB Character Set Workshop", RFC 2130, April 1997.
+
+   [RFC-2183]
+        Troost, R., Dorner, S. and K. Moore, "Communicating
+        Presentation Information in Internet Messages:  The
+        Content-Disposition Header", RFC 2183, August 1997.
+
+11.  Authors' Addresses
+
+   Ned Freed
+   Innosoft International, Inc.
+   1050 Lakes Drive
+   West Covina, CA 91790
+   USA
+
+   Phone: +1 626 919 3600
+   Fax:   +1 626 919 3614
+   EMail: ned.freed@innosoft.com
+
+
+   Keith Moore
+   Computer Science Dept.
+   University of Tennessee
+   107 Ayres Hall
+   Knoxville, TN 37996-1301
+   USA
+
+   EMail: moore@cs.utk.edu
+
+
+
+
+
+
+
+
+
+
+
+
+Freed & Moore               Standards Track                     [Page 9]
+
+RFC 2231         MIME Value and Encoded Word Extensions    November 1997
+
+
+12.  Full Copyright Statement
+
+   Copyright (C) The Internet Society (1997).  All Rights Reserved.
+
+   This document and translations of it may be copied and furnished to
+   others, and derivative works that comment on or otherwise explain it
+   or assist in its implementation may be prepared, copied, published
+   and distributed, in whole or in part, without restriction of any
+   kind, provided that the above copyright notice and this paragraph are
+   included on all such copies and derivative works.  However, this
+   document itself may not be modified in any way, such as by removing
+   the copyright notice or references to the Internet Society or other
+   Internet organizations, except as needed for the purpose of
+   developing Internet standards in which case the procedures for
+   copyrights defined in the Internet Standards process must be
+   followed, or as required to translate it into languages other than
+   English.
+
+   The limited permissions granted above are perpetual and will not be
+   revoked by the Internet Society or its successors or assigns.
+
+   This document and the information contained herein is provided on an
+   "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
+   TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+   BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
+   HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
+   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Freed & Moore               Standards Track                    [Page 10]
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2234.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2234.txt
new file mode 100644
index 000000000..edea302fb
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2234.txt
@@ -0,0 +1,787 @@
+
+
+
+
+
+
+Network Working Group                                     D. Crocker, Ed.
+Request for Comments: 2234                       Internet Mail Consortium
+Category: Standards Track                                      P. Overell
+                                                      Demon Internet Ltd.
+                                                            November 1997
+
+
+             Augmented BNF for Syntax Specifications: ABNF
+
+
+Status of this Memo
+
+   This document specifies an Internet standards track protocol for the
+   Internet community, and requests discussion and suggestions for
+   improvements.  Please refer to the current edition of the "Internet
+   Official Protocol Standards" (STD 1) for the standardization state
+   and status of this protocol.  Distribution of this memo is unlimited.
+
+Copyright Notice
+
+   Copyright (C) The Internet Society (1997).  All Rights Reserved.
+
+TABLE OF CONTENTS
+
+   1. INTRODUCTION ..................................................  2
+
+   2. RULE DEFINITION ...............................................  2
+   2.1 RULE NAMING ..................................................  2
+   2.2 RULE FORM ....................................................  3
+   2.3 TERMINAL VALUES ..............................................  3
+   2.4 EXTERNAL ENCODINGS ...........................................  5
+
+   3. OPERATORS .....................................................  5
+   3.1 CONCATENATION    RULE1     RULE2 .............................  5
+   3.2 ALTERNATIVES RULE1 / RULE2 ...................................  6
+   3.3 INCREMENTAL ALTERNATIVES   RULE1 =/ RULE2 ....................  6
+   3.4 VALUE RANGE ALTERNATIVES   %C##-## ...........................  7
+   3.5 SEQUENCE GROUP (RULE1 RULE2) .................................  7
+   3.6 VARIABLE REPETITION *RULE ....................................  8
+   3.7 SPECIFIC REPETITION NRULE ....................................  8
+   3.8 OPTIONAL SEQUENCE [RULE] .....................................  8
+   3.9 ; COMMENT ....................................................  8
+   3.10 OPERATOR PRECEDENCE .........................................  9
+
+   4. ABNF DEFINITION OF ABNF .......................................  9
+
+   5. SECURITY CONSIDERATIONS ....................................... 10
+
+
+
+
+Crocker & Overell           Standards Track                     [Page 1]
+
+RFC 2234             ABNF for Syntax Specifications        November 1997
+
+
+   6. APPENDIX A - CORE ............................................. 11
+   6.1 CORE RULES ................................................... 11
+   6.2 COMMON ENCODING .............................................. 12
+
+   7. ACKNOWLEDGMENTS ............................................... 12
+
+   8. REFERENCES .................................................... 13
+
+   9. CONTACT ....................................................... 13
+
+   10. FULL COPYRIGHT STATEMENT ..................................... 14
+
+1.   INTRODUCTION
+
+   Internet technical specifications often need to define a format
+   syntax and are free to employ whatever notation their authors deem
+   useful.  Over the years, a modified version of Backus-Naur Form
+   (BNF), called Augmented BNF (ABNF), has been popular among many
+   Internet specifications.  It balances compactness and simplicity,
+   with reasonable representational power.  In the early days of the
+   Arpanet, each specification contained its own definition of ABNF.
+   This included the email specifications, RFC733 and then RFC822 which
+   have come to be the common citations for defining ABNF.  The current
+   document separates out that definition, to permit selective
+   reference.  Predictably, it also provides some modifications and
+   enhancements.
+
+   The differences between standard BNF and ABNF involve naming rules,
+   repetition, alternatives, order-independence, and value ranges.
+   Appendix A (Core) supplies rule definitions and encoding for a core
+   lexical analyzer of the type common to several Internet
+   specifications.  It is provided as a convenience and is otherwise
+   separate from the meta language defined in the body of this document,
+   and separate from its formal status.
+
+2.   RULE DEFINITION
+
+2.1  Rule Naming
+
+   The name of a rule is simply the name itself; that is, a sequence of
+   characters, beginning with  an alphabetic character, and followed by
+   a combination of alphabetics, digits and hyphens (dashes).
+
+        NOTE:     Rule names are case-insensitive
+
+   The names <rulename>, <Rulename>, <RULENAME> and <rUlENamE> all refer
+   to the same rule.
+
+
+
+
+Crocker & Overell           Standards Track                     [Page 2]
+
+RFC 2234             ABNF for Syntax Specifications        November 1997
+
+
+   Unlike original BNF, angle brackets ("<", ">") are not  required.
+   However, angle brackets may be used around a rule name whenever their
+   presence will facilitate discerning the use of  a rule name.  This is
+   typically restricted to rule name references in free-form prose, or
+   to distinguish partial rules that combine into a string not separated
+   by white space, such as shown in the discussion about repetition,
+   below.
+
+2.2  Rule Form
+
+   A rule is defined by the following sequence:
+
+        name =  elements crlf
+
+   where <name> is the name of the rule, <elements> is one or more rule
+   names or terminal specifications and <crlf> is the end-of- line
+   indicator, carriage return followed by line feed.  The equal sign
+   separates the name from the definition of the rule.  The elements
+   form a sequence of one or more rule names and/or value definitions,
+   combined according to the various operators, defined in this
+   document, such as alternative and repetition.
+
+   For visual ease, rule definitions are left aligned.  When a rule
+   requires multiple lines, the continuation lines are indented.  The
+   left alignment and indentation are relative to the first lines of the
+   ABNF rules and need not match the left margin of the document.
+
+2.3  Terminal Values
+
+   Rules resolve into a string of terminal values, sometimes called
+   characters.  In ABNF a character is merely a non-negative integer.
+   In certain contexts a specific mapping (encoding) of values into a
+   character set (such as ASCII) will be specified.
+
+   Terminals are specified by one or more numeric characters with the
+   base interpretation of those characters indicated explicitly.  The
+   following bases are currently defined:
+
+        b           =  binary
+
+        d           =  decimal
+
+        x           =  hexadecimal
+
+
+
+
+
+
+
+
+Crocker & Overell           Standards Track                     [Page 3]
+
+RFC 2234             ABNF for Syntax Specifications        November 1997
+
+
+   Hence:
+
+        CR          =  %d13
+
+        CR          =  %x0D
+
+   respectively specify the decimal and hexadecimal representation of
+   [US-ASCII] for carriage return.
+
+   A concatenated string of such values is specified compactly, using a
+   period (".") to indicate separation of characters within that value.
+   Hence:
+
+        CRLF        =  %d13.10
+
+   ABNF permits specifying literal text string directly, enclosed in
+   quotation-marks.  Hence:
+
+        command     =  "command string"
+
+   Literal text strings are interpreted as a concatenated set of
+   printable characters.
+
+        NOTE:     ABNF strings are case-insensitive and
+                  the character set for these strings is us-ascii.
+
+   Hence:
+
+        rulename = "abc"
+
+   and:
+
+        rulename = "aBc"
+
+   will match "abc", "Abc", "aBc", "abC", "ABc", "aBC", "AbC" and "ABC".
+
+                To specify a rule which IS case SENSITIVE,
+                   specify the characters individually.
+
+   For example:
+
+        rulename    =  %d97 %d98 %d99
+
+   or
+
+        rulename    =  %d97.98.99
+
+
+
+
+
+Crocker & Overell           Standards Track                     [Page 4]
+
+RFC 2234             ABNF for Syntax Specifications        November 1997
+
+
+   will match only the string which comprises only lowercased
+   characters, abc.
+
+2.4  External Encodings
+
+   External representations of terminal value characters will vary
+   according to constraints in the storage or transmission environment.
+   Hence, the same ABNF-based grammar may have multiple external
+   encodings, such as one for a 7-bit US-ASCII environment, another for
+   a binary octet environment and still a different one when 16-bit
+   Unicode is used.  Encoding details are beyond the scope of ABNF,
+   although Appendix A (Core) provides definitions for a 7-bit US-ASCII
+   environment as has been common to much of the Internet.
+
+   By separating external encoding from the syntax, it is intended that
+   alternate encoding environments can be used for the same syntax.
+
+3.   OPERATORS
+
+3.1  Concatenation                                  Rule1 Rule2
+
+   A rule can define a simple, ordered string of values -- i.e., a
+   concatenation of contiguous characters -- by listing a sequence of
+   rule names.  For example:
+
+        foo         =  %x61           ; a
+
+        bar         =  %x62           ; b
+
+        mumble      =  foo bar foo
+
+        So that the rule <mumble> matches the lowercase string "aba".
+
+        LINEAR WHITE SPACE:  Concatenation is at the core of the ABNF
+        parsing model.  A string of contiguous characters (values) is
+        parsed according to the rules defined in ABNF.  For Internet
+        specifications, there is some history of permitting linear white
+        space (space and horizontal tab) to be freelyPand
+        implicitlyPinterspersed around major constructs, such as
+        delimiting special characters or atomic strings.
+
+        NOTE:     This specification for ABNF does not
+                  provide for implicit specification of linear white
+                  space.
+
+   Any grammar which wishes to permit linear white space around
+   delimiters or string segments must specify it explicitly.  It is
+   often useful to provide for such white space in "core" rules that are
+
+
+
+Crocker & Overell           Standards Track                     [Page 5]
+
+RFC 2234             ABNF for Syntax Specifications        November 1997
+
+
+   then used variously among higher-level rules.  The "core" rules might
+   be formed into a lexical analyzer or simply be part of the main
+   ruleset.
+
+3.2  Alternatives                               Rule1 / Rule2
+
+   Elements separated by forward slash ("/") are alternatives.
+   Therefore,
+
+        foo / bar
+
+   will accept <foo> or <bar>.
+
+        NOTE:     A quoted string containing alphabetic
+                  characters is special form for specifying alternative
+                  characters and is interpreted as a non-terminal
+                  representing the set of combinatorial strings with the
+                  contained characters, in the specified order but with
+                  any mixture of upper and lower case..
+
+3.3  Incremental Alternatives                    Rule1 =/ Rule2
+
+   It is sometimes convenient to specify a list of alternatives in
+   fragments.  That is, an initial rule may match one or more
+   alternatives, with later rule definitions adding to the set of
+   alternatives.  This is particularly useful for otherwise- independent
+   specifications which derive from the same parent rule set, such as
+   often occurs with parameter lists.  ABNF permits this incremental
+   definition through the construct:
+
+        oldrule     =/ additional-alternatives
+
+   So that the rule set
+
+        ruleset     =  alt1 / alt2
+
+        ruleset     =/ alt3
+
+        ruleset     =/ alt4 / alt5
+
+   is the same as specifying
+
+        ruleset     =  alt1 / alt2 / alt3 / alt4 / alt5
+
+
+
+
+
+
+
+
+Crocker & Overell           Standards Track                     [Page 6]
+
+RFC 2234             ABNF for Syntax Specifications        November 1997
+
+
+3.4  Value Range Alternatives                           %c##-##
+
+   A range of alternative numeric values can be specified compactly,
+   using dash ("-") to indicate the range of alternative values.  Hence:
+
+        DIGIT       =  %x30-39
+
+   is equivalent to:
+
+        DIGIT       =  "0" / "1" / "2" / "3" / "4" / "5" / "6" /
+
+                           "7" / "8" / "9"
+
+   Concatenated numeric values and numeric value ranges can not be
+   specified in the same string.  A numeric value may use the dotted
+   notation for concatenation or it may use the dash notation to specify
+   one value range.  Hence, to specify one printable character, between
+   end of line sequences, the specification could be:
+
+        char-line = %x0D.0A %x20-7E %x0D.0A
+
+3.5  Sequence Group                             (Rule1 Rule2)
+
+   Elements enclosed in parentheses are treated as a single element,
+   whose contents are STRICTLY ORDERED.   Thus,
+
+        elem (foo / bar) blat
+
+   which matches (elem foo blat) or (elem bar blat).
+
+        elem foo / bar blat
+
+   matches (elem foo) or (bar blat).
+
+        NOTE:     It is strongly advised to use grouping
+                  notation, rather than to rely on proper reading of
+                  "bare" alternations, when alternatives consist of
+                  multiple rule names or literals.
+
+   Hence it is recommended that instead of the above form, the form:
+
+        (elem foo) / (bar blat)
+
+   be used.  It will avoid misinterpretation by casual readers.
+
+   The sequence group notation is also used within free text to set off
+   an element sequence from the prose.
+
+
+
+
+Crocker & Overell           Standards Track                     [Page 7]
+
+RFC 2234             ABNF for Syntax Specifications        November 1997
+
+
+3.6  Variable Repetition                                *Rule
+
+   The operator "*" preceding an element indicates repetition. The full
+   form is:
+
+        <a>*<b>element
+
+   where <a> and <b> are optional decimal values, indicating at least
+   <a> and at most <b> occurrences of element.
+
+   Default values are 0 and infinity so that *<element> allows any
+   number, including zero; 1*<element> requires at  least  one;
+   3*3<element> allows exactly 3 and 1*2<element> allows one or two.
+
+3.7  Specific Repetition                                  nRule
+
+   A rule of the form:
+
+        <n>element
+
+   is equivalent to
+
+        <n>*<n>element
+
+   That is, exactly  <N>  occurrences  of <element>. Thus 2DIGIT is a
+   2-digit number, and 3ALPHA is a string of three alphabetic
+   characters.
+
+3.8  Optional Sequence                                   [RULE]
+
+   Square brackets enclose an optional element sequence:
+
+        [foo bar]
+
+   is equivalent to
+
+        *1(foo bar).
+
+3.9  ; Comment
+
+   A semi-colon starts a comment that continues to the end of line.
+   This is a simple way of including useful notes in parallel with the
+   specifications.
+
+
+
+
+
+
+
+
+Crocker & Overell           Standards Track                     [Page 8]
+
+RFC 2234             ABNF for Syntax Specifications        November 1997
+
+
+3.10 Operator Precedence
+
+   The various mechanisms described above have the following precedence,
+   from highest (binding tightest) at the top, to lowest and loosest at
+   the bottom:
+
+        Strings, Names formation
+        Comment
+        Value range
+        Repetition
+        Grouping, Optional
+        Concatenation
+        Alternative
+
+   Use of the alternative operator, freely mixed with concatenations can
+   be confusing.
+
+        Again, it is recommended that the grouping operator be used to
+        make explicit concatenation groups.
+
+4.   ABNF DEFINITION OF ABNF
+
+   This syntax uses the rules provided in Appendix A (Core).
+
+        rulelist       =  1*( rule / (*c-wsp c-nl) )
+
+        rule           =  rulename defined-as elements c-nl
+                               ; continues if next line starts
+                               ;  with white space
+
+        rulename       =  ALPHA *(ALPHA / DIGIT / "-")
+
+        defined-as     =  *c-wsp ("=" / "=/") *c-wsp
+                               ; basic rules definition and
+                               ;  incremental alternatives
+
+        elements       =  alternation *c-wsp
+
+        c-wsp          =  WSP / (c-nl WSP)
+
+        c-nl           =  comment / CRLF
+                               ; comment or newline
+
+        comment        =  ";" *(WSP / VCHAR) CRLF
+
+        alternation    =  concatenation
+                          *(*c-wsp "/" *c-wsp concatenation)
+
+
+
+
+Crocker & Overell           Standards Track                     [Page 9]
+
+RFC 2234             ABNF for Syntax Specifications        November 1997
+
+
+        concatenation  =  repetition *(1*c-wsp repetition)
+
+        repetition     =  [repeat] element
+
+        repeat         =  1*DIGIT / (*DIGIT "*" *DIGIT)
+
+        element        =  rulename / group / option /
+                          char-val / num-val / prose-val
+
+        group          =  "(" *c-wsp alternation *c-wsp ")"
+
+        option         =  "[" *c-wsp alternation *c-wsp "]"
+
+        char-val       =  DQUOTE *(%x20-21 / %x23-7E) DQUOTE
+                               ; quoted string of SP and VCHAR
+                                  without DQUOTE
+
+        num-val        =  "%" (bin-val / dec-val / hex-val)
+
+        bin-val        =  "b" 1*BIT
+                          [ 1*("." 1*BIT) / ("-" 1*BIT) ]
+                               ; series of concatenated bit values
+                               ; or single ONEOF range
+
+        dec-val        =  "d" 1*DIGIT
+                          [ 1*("." 1*DIGIT) / ("-" 1*DIGIT) ]
+
+        hex-val        =  "x" 1*HEXDIG
+                          [ 1*("." 1*HEXDIG) / ("-" 1*HEXDIG) ]
+
+        prose-val      =  "<" *(%x20-3D / %x3F-7E) ">"
+                               ; bracketed string of SP and VCHAR
+                                  without angles
+                               ; prose description, to be used as
+                                  last resort
+
+
+5.   SECURITY CONSIDERATIONS
+
+   Security is truly believed to be irrelevant to this document.
+
+
+
+
+
+
+
+
+
+
+
+Crocker & Overell           Standards Track                    [Page 10]
+
+RFC 2234             ABNF for Syntax Specifications        November 1997
+
+
+6.   APPENDIX A - CORE
+
+   This Appendix is provided as a convenient core for specific grammars.
+   The definitions may be used as a core set of rules.
+
+6.1  Core Rules
+
+   Certain  basic  rules  are  in uppercase, such as SP, HTAB, CRLF,
+   DIGIT, ALPHA, etc.
+
+        ALPHA          =  %x41-5A / %x61-7A   ; A-Z / a-z
+
+        BIT            =  "0" / "1"
+
+        CHAR           =  %x01-7F
+                               ; any 7-bit US-ASCII character,
+                                  excluding NUL
+
+        CR             =  %x0D
+                               ; carriage return
+
+        CRLF           =  CR LF
+                               ; Internet standard newline
+
+        CTL            =  %x00-1F / %x7F
+                               ; controls
+
+        DIGIT          =  %x30-39
+                               ; 0-9
+
+        DQUOTE         =  %x22
+                               ; " (Double Quote)
+
+        HEXDIG         =  DIGIT / "A" / "B" / "C" / "D" / "E" / "F"
+
+        HTAB           =  %x09
+                               ; horizontal tab
+
+        LF             =  %x0A
+                               ; linefeed
+
+        LWSP           =  *(WSP / CRLF WSP)
+                               ; linear white space (past newline)
+
+        OCTET          =  %x00-FF
+                               ; 8 bits of data
+
+        SP             =  %x20
+
+
+
+Crocker & Overell           Standards Track                    [Page 11]
+
+RFC 2234             ABNF for Syntax Specifications        November 1997
+
+
+                               ; space
+
+        VCHAR          =  %x21-7E
+                               ; visible (printing) characters
+
+        WSP            =  SP / HTAB
+                               ; white space
+
+6.2  Common Encoding
+
+   Externally, data are represented as "network virtual ASCII", namely
+   7-bit US-ASCII in an 8-bit field, with the high (8th) bit set to
+   zero.  A string of values is in "network byte order" with the
+   higher-valued bytes represented on the left-hand side and being sent
+   over the network first.
+
+7.   ACKNOWLEDGMENTS
+
+   The syntax for ABNF was originally specified in RFC 733.  Ken L.
+   Harrenstien, of SRI International, was responsible for re-coding the
+   BNF into an augmented BNF that makes the representation smaller and
+   easier to understand.
+
+   This recent project began as a simple effort to cull out the portion
+   of RFC 822 which has been repeatedly cited by non-email specification
+   writers, namely the description of augmented BNF.  Rather than simply
+   and blindly converting the existing text into a separate document,
+   the working group chose to give careful consideration to the
+   deficiencies, as well as benefits, of the existing specification and
+   related specifications available over the last 15 years and therefore
+   to pursue enhancement.  This turned the project into something rather
+   more ambitious than first intended.  Interestingly the result is not
+   massively different from that original, although decisions such as
+   removing the list notation came as a surprise.
+
+   The current round of specification was part of the DRUMS working
+   group, with significant contributions from Jerome Abela , Harald
+   Alvestrand, Robert Elz, Roger Fajman, Aviva Garrett, Tom Harsch, Dan
+   Kohn, Bill McQuillan, Keith Moore, Chris Newman , Pete Resnick and
+   Henning Schulzrinne.
+
+
+
+
+
+
+
+
+
+
+
+Crocker & Overell           Standards Track                    [Page 12]
+
+RFC 2234             ABNF for Syntax Specifications        November 1997
+
+
+8.   REFERENCES
+
+   [US-ASCII]     Coded Character Set--7-Bit American Standard Code for
+   Information Interchange, ANSI X3.4-1986.
+
+   [RFC733]  Crocker, D., Vittal, J., Pogran, K., and D. Henderson,
+   "Standard for the Format of ARPA Network Text Message," RFC 733,
+   November 1977.
+
+   [RFC822]  Crocker, D., "Standard for the Format of ARPA Internet Text
+   Messages", STD 11, RFC 822, August 1982.
+
+9.   CONTACT
+
+   David H. Crocker                 Paul Overell
+
+   Internet Mail Consortium         Demon Internet Ltd
+   675 Spruce Dr.                   Dorking Business Park
+   Sunnyvale, CA 94086 USA          Dorking
+                                    Surrey, RH4 1HN
+                                    UK
+
+   Phone:    +1 408 246 8253
+   Fax:      +1 408 249 6205
+   EMail:    dcrocker@imc.org       paulo@turnpike.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Crocker & Overell           Standards Track                    [Page 13]
+
+RFC 2234             ABNF for Syntax Specifications        November 1997
+
+
+10.  Full Copyright Statement
+
+   Copyright (C) The Internet Society (1997).  All Rights Reserved.
+
+   This document and translations of it may be copied and furnished to
+   others, and derivative works that comment on or otherwise explain it
+   or assist in its implementation may be prepared, copied, published
+   and distributed, in whole or in part, without restriction of any
+   kind, provided that the above copyright notice and this paragraph are
+   included on all such copies and derivative works.  However, this
+   document itself may not be modified in any way, such as by removing
+   the copyright notice or references to the Internet Society or other
+   Internet organizations, except as needed for the purpose of
+   developing Internet standards in which case the procedures for
+   copyrights defined in the Internet Standards process must be
+   followed, or as required to translate it into languages other than
+   English.
+
+   The limited permissions granted above are perpetual and will not be
+   revoked by the Internet Society or its successors or assigns.
+
+   This document and the information contained herein is provided on an
+   "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
+   TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+   BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
+   HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
+   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Crocker & Overell           Standards Track                    [Page 14]
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2440.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2440.txt
new file mode 100644
index 000000000..902ecee4a
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2440.txt
@@ -0,0 +1,3642 @@
+
+
+
+
+
+Network Working Group                                         J. Callas
+Request for Comments: 2440                           Network Associates
+Category: Standards Track                                L. Donnerhacke
+                                     IN-Root-CA Individual Network e.V.
+                                                              H. Finney
+                                                     Network Associates
+                                                              R. Thayer
+                                                        EIS Corporation
+                                                          November 1998
+
+
+                         OpenPGP Message Format
+
+Status of this Memo
+
+   This document specifies an Internet standards track protocol for the
+   Internet community, and requests discussion and suggestions for
+   improvements.  Please refer to the current edition of the "Internet
+   Official Protocol Standards" (STD 1) for the standardization state
+   and status of this protocol.  Distribution of this memo is unlimited.
+
+Copyright Notice
+
+   Copyright (C) The Internet Society (1998).  All Rights Reserved.
+
+IESG Note
+
+   This document defines many tag values, yet it doesn't describe a
+   mechanism for adding new tags (for new features).  Traditionally the
+   Internet Assigned Numbers Authority (IANA) handles the allocation of
+   new values for future expansion and RFCs usually define the procedure
+   to be used by the IANA.  However, there are subtle (and not so
+   subtle) interactions that may occur in this protocol between new
+   features and existing features which result in a significant
+   reduction in over all security.  Therefore, this document does not
+   define an extension procedure.  Instead requests to define new tag
+   values (say for new encryption algorithms for example) should be
+   forwarded to the IESG Security Area Directors for consideration or
+   forwarding to the appropriate IETF Working Group for consideration.
+
+Abstract
+
+   This document is maintained in order to publish all necessary
+   information needed to develop interoperable applications based on the
+   OpenPGP format. It is not a step-by-step cookbook for writing an
+   application. It describes only the format and methods needed to read,
+   check, generate, and write conforming packets crossing any network.
+   It does not deal with storage and implementation questions.  It does,
+
+
+
+Callas, et. al.             Standards Track                     [Page 1]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   however, discuss implementation issues necessary to avoid security
+   flaws.
+
+   Open-PGP software uses a combination of strong public-key and
+   symmetric cryptography to provide security services for electronic
+   communications and data storage.  These services include
+   confidentiality, key management, authentication, and digital
+   signatures. This document specifies the message formats used in
+   OpenPGP.
+
+Table of Contents
+
+            Status of this Memo                                       1
+            IESG Note                                                 1
+            Abstract                                                  1
+            Table of Contents                                         2
+   1.       Introduction                                              4
+   1.1.     Terms                                                     5
+   2.       General functions                                         5
+   2.1.     Confidentiality via Encryption                            5
+   2.2.     Authentication via Digital signature                      6
+   2.3.     Compression                                               7
+   2.4.     Conversion to Radix-64                                    7
+   2.5.     Signature-Only Applications                               7
+   3.       Data Element Formats                                      7
+   3.1.     Scalar numbers                                            8
+   3.2.     Multi-Precision Integers                                  8
+   3.3.     Key IDs                                                   8
+   3.4.     Text                                                      8
+   3.5.     Time fields                                               9
+   3.6.     String-to-key (S2K) specifiers                            9
+   3.6.1.   String-to-key (S2k) specifier types                       9
+   3.6.1.1. Simple S2K                                                9
+   3.6.1.2. Salted S2K                                               10
+   3.6.1.3. Iterated and Salted S2K                                  10
+   3.6.2.   String-to-key usage                                      11
+   3.6.2.1. Secret key encryption                                    11
+   3.6.2.2. Symmetric-key message encryption                         11
+   4.       Packet Syntax                                            12
+   4.1.     Overview                                                 12
+   4.2.     Packet Headers                                           12
+   4.2.1.   Old-Format Packet Lengths                                13
+   4.2.2.   New-Format Packet Lengths                                13
+   4.2.2.1. One-Octet Lengths                                        14
+   4.2.2.2. Two-Octet Lengths                                        14
+   4.2.2.3. Five-Octet Lengths                                       14
+   4.2.2.4. Partial Body Lengths                                     14
+   4.2.3.   Packet Length Examples                                   14
+
+
+
+Callas, et. al.             Standards Track                     [Page 2]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   4.3.     Packet Tags                                              15
+   5.       Packet Types                                             16
+   5.1.     Public-Key Encrypted Session Key Packets (Tag 1)         16
+   5.2.     Signature Packet (Tag 2)                                 17
+   5.2.1.   Signature Types                                          17
+   5.2.2.   Version 3 Signature Packet Format                        19
+   5.2.3.   Version 4 Signature Packet Format                        21
+   5.2.3.1. Signature Subpacket Specification                        22
+   5.2.3.2. Signature Subpacket Types                                24
+   5.2.3.3. Signature creation time                                  25
+   5.2.3.4. Issuer                                                   25
+   5.2.3.5. Key expiration time                                      25
+   5.2.3.6. Preferred symmetric algorithms                           25
+   5.2.3.7. Preferred hash algorithms                                25
+   5.2.3.8. Preferred compression algorithms                         26
+   5.2.3.9. Signature expiration time                                26
+   5.2.3.10.Exportable Certification                                 26
+   5.2.3.11.Revocable                                                27
+   5.2.3.12.Trust signature                                          27
+   5.2.3.13.Regular expression                                       27
+   5.2.3.14.Revocation key                                           27
+   5.2.3.15.Notation Data                                            28
+   5.2.3.16.Key server preferences                                   28
+   5.2.3.17.Preferred key server                                     29
+   5.2.3.18.Primary user id                                          29
+   5.2.3.19.Policy URL                                               29
+   5.2.3.20.Key Flags                                                29
+   5.2.3.21.Signer's User ID                                         30
+   5.2.3.22.Reason for Revocation                                    30
+   5.2.4.   Computing Signatures                                     31
+   5.2.4.1. Subpacket Hints                                          32
+   5.3.     Symmetric-Key Encrypted Session-Key Packets (Tag 3)      32
+   5.4.     One-Pass Signature Packets (Tag 4)                       33
+   5.5.     Key Material Packet                                      34
+   5.5.1.   Key Packet Variants                                      34
+   5.5.1.1. Public Key Packet (Tag 6)                                34
+   5.5.1.2. Public Subkey Packet (Tag 14)                            34
+   5.5.1.3. Secret Key Packet (Tag 5)                                35
+   5.5.1.4. Secret Subkey Packet (Tag 7)                             35
+   5.5.2.   Public Key Packet Formats                                35
+   5.5.3.   Secret Key Packet Formats                                37
+   5.6.     Compressed Data Packet (Tag 8)                           38
+   5.7.     Symmetrically Encrypted Data Packet (Tag 9)              39
+   5.8.     Marker Packet (Obsolete Literal Packet) (Tag 10)         39
+   5.9.     Literal Data Packet (Tag 11)                             40
+   5.10.    Trust Packet (Tag 12)                                    40
+   5.11.    User ID Packet (Tag 13)                                  41
+   6.       Radix-64 Conversions                                     41
+
+
+
+Callas, et. al.             Standards Track                     [Page 3]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   6.1.     An Implementation of the CRC-24 in "C"                   42
+   6.2.     Forming ASCII Armor                                      42
+   6.3.     Encoding Binary in Radix-64                              44
+   6.4.     Decoding Radix-64                                        46
+   6.5.     Examples of Radix-64                                     46
+   6.6.     Example of an ASCII Armored Message                      47
+   7.       Cleartext signature framework                            47
+   7.1.     Dash-Escaped Text                                        47
+   8.       Regular Expressions                                      48
+   9.       Constants                                                49
+   9.1.     Public Key Algorithms                                    49
+   9.2.     Symmetric Key Algorithms                                 49
+   9.3.     Compression Algorithms                                   50
+   9.4.     Hash Algorithms                                          50
+   10.      Packet Composition                                       50
+   10.1.    Transferable Public Keys                                 50
+   10.2.    OpenPGP Messages                                         52
+   10.3.    Detached Signatures                                      52
+   11.      Enhanced Key Formats                                     52
+   11.1.    Key Structures                                           52
+   11.2.    Key IDs and Fingerprints                                 53
+   12.      Notes on Algorithms                                      54
+   12.1.    Symmetric Algorithm Preferences                          54
+   12.2.    Other Algorithm Preferences                              55
+   12.2.1.  Compression Preferences                                  56
+   12.2.2.  Hash Algorithm Preferences                               56
+   12.3.    Plaintext                                                56
+   12.4.    RSA                                                      56
+   12.5.    Elgamal                                                  57
+   12.6.    DSA                                                      58
+   12.7.    Reserved Algorithm Numbers                               58
+   12.8.    OpenPGP CFB mode                                         58
+   13.      Security Considerations                                  59
+   14.      Implementation Nits                                      60
+   15.      Authors and Working Group Chair                          62
+   16.      References                                               63
+   17.      Full Copyright Statement                                 65
+
+1. Introduction
+
+   This document provides information on the message-exchange packet
+   formats used by OpenPGP to provide encryption, decryption, signing,
+   and key management functions. It builds on the foundation provided in
+   RFC 1991 "PGP Message Exchange Formats."
+
+
+
+
+
+
+
+Callas, et. al.             Standards Track                     [Page 4]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+1.1. Terms
+
+     * OpenPGP - This is a definition for security software that uses
+       PGP 5.x as a basis.
+
+     * PGP - Pretty Good Privacy. PGP is a family of software systems
+       developed by Philip R. Zimmermann from which OpenPGP is based.
+
+     * PGP 2.6.x - This version of PGP has many variants, hence the term
+       PGP 2.6.x. It used only RSA, MD5, and IDEA for its cryptographic
+       transforms. An informational RFC, RFC 1991, was written
+       describing this version of PGP.
+
+     * PGP 5.x - This version of PGP is formerly known as "PGP 3" in the
+       community and also in the predecessor of this document, RFC 1991.
+       It has new formats and corrects a number of problems in the PGP
+       2.6.x design. It is referred to here as PGP 5.x because that
+       software was the first release of the "PGP 3" code base.
+
+   "PGP", "Pretty Good", and "Pretty Good Privacy" are trademarks of
+   Network Associates, Inc. and are used with permission.
+
+   This document uses the terms "MUST", "SHOULD", and "MAY" as defined
+   in RFC 2119, along with the negated forms of those terms.
+
+2. General functions
+
+   OpenPGP provides data integrity services for messages and data files
+   by using these core technologies:
+
+     - digital signatures
+
+     - encryption
+
+     - compression
+
+     - radix-64 conversion
+
+   In addition, OpenPGP provides key management and certificate
+   services, but many of these are beyond the scope of this document.
+
+2.1. Confidentiality via Encryption
+
+   OpenPGP uses two encryption methods to provide confidentiality:
+   symmetric-key encryption and public key encryption. With public-key
+   encryption, the object is encrypted using a symmetric encryption
+   algorithm.  Each symmetric key is used only once. A new "session key"
+   is generated as a random number for each message. Since it is used
+
+
+
+Callas, et. al.             Standards Track                     [Page 5]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   only once, the session key is bound to the message and transmitted
+   with it.  To protect the key, it is encrypted with the receiver's
+   public key. The sequence is as follows:
+
+   1.  The sender creates a message.
+
+   2.  The sending OpenPGP generates a random number to be used as a
+       session key for this message only.
+
+   3.  The session key is encrypted using each recipient's public key.
+       These "encrypted session keys" start the message.
+
+   4.  The sending OpenPGP encrypts the message using the session key,
+       which forms the remainder of the message. Note that the message
+       is also usually compressed.
+
+   5.  The receiving OpenPGP decrypts the session key using the
+       recipient's private key.
+
+   6.  The receiving OpenPGP decrypts the message using the session key.
+       If the message was compressed, it will be decompressed.
+
+   With symmetric-key encryption, an object may be encrypted with a
+   symmetric key derived from a passphrase (or other shared secret), or
+   a two-stage mechanism similar to the public-key method described
+   above in which a session key is itself encrypted with a symmetric
+   algorithm keyed from a shared secret.
+
+   Both digital signature and confidentiality services may be applied to
+   the same message. First, a signature is generated for the message and
+   attached to the message. Then, the message plus signature is
+   encrypted using a symmetric session key. Finally, the session key is
+   encrypted using public-key encryption and prefixed to the encrypted
+   block.
+
+2.2. Authentication via Digital signature
+
+   The digital signature uses a hash code or message digest algorithm,
+   and a public-key signature algorithm. The sequence is as follows:
+
+   1.  The sender creates a message.
+
+   2.  The sending software generates a hash code of the message.
+
+   3.  The sending software generates a signature from the hash code
+       using the sender's private key.
+
+   4.  The binary signature is attached to the message.
+
+
+
+Callas, et. al.             Standards Track                     [Page 6]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   5.  The receiving software keeps a copy of the message signature.
+
+   6.  The receiving software generates a new hash code for the
+       received message and verifies it using the message's signature.
+       If the verification is successful, the message is accepted as
+       authentic.
+
+2.3. Compression
+
+   OpenPGP implementations MAY compress the message after applying the
+   signature but before encryption.
+
+2.4. Conversion to Radix-64
+
+   OpenPGP's underlying native representation for encrypted messages,
+   signature certificates, and keys is a stream of arbitrary octets.
+   Some systems only permit the use of blocks consisting of seven-bit,
+   printable text. For transporting OpenPGP's native raw binary octets
+   through channels that are not safe to raw binary data, a printable
+   encoding of these binary octets is needed.  OpenPGP provides the
+   service of converting the raw 8-bit binary octet stream to a stream
+   of printable ASCII characters, called Radix-64 encoding or ASCII
+   Armor.
+
+   Implementations SHOULD provide Radix-64 conversions.
+
+   Note that many applications, particularly messaging applications,
+   will want more advanced features as described in the OpenPGP-MIME
+   document, RFC 2015. An application that implements OpenPGP for
+   messaging SHOULD implement OpenPGP-MIME.
+
+2.5. Signature-Only Applications
+
+   OpenPGP is designed for applications that use both encryption and
+   signatures, but there are a number of problems that are solved by a
+   signature-only implementation. Although this specification requires
+   both encryption and signatures, it is reasonable for there to be
+   subset implementations that are non-comformant only in that they omit
+   encryption.
+
+3. Data Element Formats
+
+   This section describes the data elements used by OpenPGP.
+
+
+
+
+
+
+
+
+Callas, et. al.             Standards Track                     [Page 7]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+3.1. Scalar numbers
+
+   Scalar numbers are unsigned, and are always stored in big-endian
+   format. Using n[k] to refer to the kth octet being interpreted, the
+   value of a two-octet scalar is ((n[0] << 8) + n[1]). The value of a
+   four-octet scalar is ((n[0] << 24) + (n[1] << 16) + (n[2] << 8) +
+   n[3]).
+
+3.2. Multi-Precision Integers
+
+   Multi-Precision Integers (also called MPIs) are unsigned integers
+   used to hold large integers such as the ones used in cryptographic
+   calculations.
+
+   An MPI consists of two pieces: a two-octet scalar that is the length
+   of the MPI in bits followed by a string of octets that contain the
+   actual integer.
+
+   These octets form a big-endian number; a big-endian number can be
+   made into an MPI by prefixing it with the appropriate length.
+
+   Examples:
+
+   (all numbers are in hexadecimal)
+
+   The string of octets [00 01 01] forms an MPI with the value 1. The
+   string [00 09 01 FF] forms an MPI with the value of 511.
+
+   Additional rules:
+
+   The size of an MPI is ((MPI.length + 7) / 8) + 2 octets.
+
+   The length field of an MPI describes the length starting from its
+   most significant non-zero bit. Thus, the MPI [00 02 01] is not formed
+   correctly. It should be [00 01 01].
+
+3.3. Key IDs
+
+   A Key ID is an eight-octet scalar that identifies a key.
+   Implementations SHOULD NOT assume that Key IDs are unique. The
+   section, "Enhanced Key Formats" below describes how Key IDs are
+   formed.
+
+3.4. Text
+
+   The default character set for text is the UTF-8 [RFC2279] encoding of
+   Unicode [ISO10646].
+
+
+
+
+Callas, et. al.             Standards Track                     [Page 8]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+3.5. Time fields
+
+   A time field is an unsigned four-octet number containing the number
+   of seconds elapsed since midnight, 1 January 1970 UTC.
+
+3.6. String-to-key (S2K) specifiers
+
+   String-to-key (S2K) specifiers are used to convert passphrase strings
+   into symmetric-key encryption/decryption keys.  They are used in two
+   places, currently: to encrypt the secret part of private keys in the
+   private keyring, and to convert passphrases to encryption keys for
+   symmetrically encrypted messages.
+
+3.6.1. String-to-key (S2k) specifier types
+
+   There are three types of S2K specifiers currently supported, as
+   follows:
+
+3.6.1.1. Simple S2K
+
+   This directly hashes the string to produce the key data.  See below
+   for how this hashing is done.
+
+       Octet 0:        0x00
+       Octet 1:        hash algorithm
+
+   Simple S2K hashes the passphrase to produce the session key.  The
+   manner in which this is done depends on the size of the session key
+   (which will depend on the cipher used) and the size of the hash
+   algorithm's output. If the hash size is greater than or equal to the
+   session key size, the high-order (leftmost) octets of the hash are
+   used as the key.
+
+   If the hash size is less than the key size, multiple instances of the
+   hash context are created -- enough to produce the required key data.
+   These instances are preloaded with 0, 1, 2, ... octets of zeros (that
+   is to say, the first instance has no preloading, the second gets
+   preloaded with 1 octet of zero, the third is preloaded with two
+   octets of zeros, and so forth).
+
+   As the data is hashed, it is given independently to each hash
+   context. Since the contexts have been initialized differently, they
+   will each produce different hash output.  Once the passphrase is
+   hashed, the output data from the multiple hashes is concatenated,
+   first hash leftmost, to produce the key data, with any excess octets
+   on the right discarded.
+
+
+
+
+
+Callas, et. al.             Standards Track                     [Page 9]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+3.6.1.2. Salted S2K
+
+   This includes a "salt" value in the S2K specifier -- some arbitrary
+   data -- that gets hashed along with the passphrase string, to help
+   prevent dictionary attacks.
+
+       Octet 0:        0x01
+       Octet 1:        hash algorithm
+       Octets 2-9:     8-octet salt value
+
+   Salted S2K is exactly like Simple S2K, except that the input to the
+   hash function(s) consists of the 8 octets of salt from the S2K
+   specifier, followed by the passphrase.
+
+3.6.1.3. Iterated and Salted S2K
+
+   This includes both a salt and an octet count.  The salt is combined
+   with the passphrase and the resulting value is hashed repeatedly.
+   This further increases the amount of work an attacker must do to try
+   dictionary attacks.
+
+       Octet  0:        0x03
+       Octet  1:        hash algorithm
+       Octets 2-9:      8-octet salt value
+       Octet  10:       count, a one-octet, coded value
+
+   The count is coded into a one-octet number using the following
+   formula:
+
+       #define EXPBIAS 6
+           count = ((Int32)16 + (c & 15)) << ((c >> 4) + EXPBIAS);
+
+   The above formula is in C, where "Int32" is a type for a 32-bit
+   integer, and the variable "c" is the coded count, Octet 10.
+
+   Iterated-Salted S2K hashes the passphrase and salt data multiple
+   times. The total number of octets to be hashed is specified in the
+   encoded count in the S2K specifier.  Note that the resulting count
+   value is an octet count of how many octets will be hashed, not an
+   iteration count.
+
+   Initially, one or more hash contexts are set up as with the other S2K
+   algorithms, depending on how many octets of key data are needed.
+   Then the salt, followed by the passphrase data is repeatedly hashed
+   until the number of octets specified by the octet count has been
+   hashed.  The one exception is that if the octet count is less than
+   the size of the salt plus passphrase, the full salt plus passphrase
+   will be hashed even though that is greater than the octet count.
+
+
+
+Callas, et. al.             Standards Track                    [Page 10]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   After the hashing is done the data is unloaded from the hash
+   context(s) as with the other S2K algorithms.
+
+3.6.2. String-to-key usage
+
+   Implementations SHOULD use salted or iterated-and-salted S2K
+   specifiers, as simple S2K specifiers are more vulnerable to
+   dictionary attacks.
+
+3.6.2.1. Secret key encryption
+
+   An S2K specifier can be stored in the secret keyring to specify how
+   to convert the passphrase to a key that unlocks the secret data.
+   Older versions of PGP just stored a cipher algorithm octet preceding
+   the secret data or a zero to indicate that the secret data was
+   unencrypted. The MD5 hash function was always used to convert the
+   passphrase to a key for the specified cipher algorithm.
+
+   For compatibility, when an S2K specifier is used, the special value
+   255 is stored in the position where the hash algorithm octet would
+   have been in the old data structure.  This is then followed
+   immediately by a one-octet algorithm identifier, and then by the S2K
+   specifier as encoded above.
+
+   Therefore, preceding the secret data there will be one of these
+   possibilities:
+
+       0:           secret data is unencrypted (no pass phrase)
+       255:         followed by algorithm octet and S2K specifier
+       Cipher alg:  use Simple S2K algorithm using MD5 hash
+
+   This last possibility, the cipher algorithm number with an implicit
+   use of MD5 and IDEA, is provided for backward compatibility; it MAY
+   be understood, but SHOULD NOT be generated, and is deprecated.
+
+   These are followed by an 8-octet Initial Vector for the decryption of
+   the secret values, if they are encrypted, and then the secret key
+   values themselves.
+
+3.6.2.2. Symmetric-key message encryption
+
+   OpenPGP can create a Symmetric-key Encrypted Session Key (ESK) packet
+   at the front of a message.  This is used to allow S2K specifiers to
+   be used for the passphrase conversion or to create messages with a
+   mix of symmetric-key ESKs and public-key ESKs. This allows a message
+   to be decrypted either with a passphrase or a public key.
+
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 11]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   PGP 2.X always used IDEA with Simple string-to-key conversion when
+   encrypting a message with a symmetric algorithm. This is deprecated,
+   but MAY be used for backward-compatibility.
+
+4. Packet Syntax
+
+   This section describes the packets used by OpenPGP.
+
+4.1. Overview
+
+   An OpenPGP message is constructed from a number of records that are
+   traditionally called packets. A packet is a chunk of data that has a
+   tag specifying its meaning. An OpenPGP message, keyring, certificate,
+   and so forth consists of a number of packets. Some of those packets
+   may contain other OpenPGP packets (for example, a compressed data
+   packet, when uncompressed, contains OpenPGP packets).
+
+   Each packet consists of a packet header, followed by the packet body.
+   The packet header is of variable length.
+
+4.2. Packet Headers
+
+   The first octet of the packet header is called the "Packet Tag." It
+   determines the format of the header and denotes the packet contents.
+   The remainder of the packet header is the length of the packet.
+
+   Note that the most significant bit is the left-most bit, called bit
+   7. A mask for this bit is 0x80 in hexadecimal.
+
+              +---------------+
+         PTag |7 6 5 4 3 2 1 0|
+              +---------------+
+         Bit 7 -- Always one
+         Bit 6 -- New packet format if set
+
+   PGP 2.6.x only uses old format packets. Thus, software that
+   interoperates with those versions of PGP must only use old format
+   packets. If interoperability is not an issue, either format may be
+   used. Note that old format packets have four bits of content tags,
+   and new format packets have six; some features cannot be used and
+   still be backward-compatible.
+
+   Old format packets contain:
+
+         Bits 5-2 -- content tag
+         Bits 1-0 - length-type
+
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 12]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   New format packets contain:
+
+         Bits 5-0 -- content tag
+
+4.2.1. Old-Format Packet Lengths
+
+   The meaning of the length-type in old-format packets is:
+
+   0 - The packet has a one-octet length. The header is 2 octets long.
+
+   1 - The packet has a two-octet length. The header is 3 octets long.
+
+   2 - The packet has a four-octet length. The header is 5 octets long.
+
+   3 - The packet is of indeterminate length.  The header is 1 octet
+       long, and the implementation must determine how long the packet
+       is. If the packet is in a file, this means that the packet
+       extends until the end of the file. In general, an implementation
+       SHOULD NOT use indeterminate length packets except where the end
+       of the data will be clear from the context, and even then it is
+       better to use a definite length, or a new-format header. The
+       new-format headers described below have a mechanism for precisely
+       encoding data of indeterminate length.
+
+4.2.2. New-Format Packet Lengths
+
+   New format packets have four possible ways of encoding length:
+
+    1. A one-octet Body Length header encodes packet lengths of up to
+       191 octets.
+
+   2. A two-octet Body Length header encodes packet lengths of 192 to
+       8383 octets.
+
+    3. A five-octet Body Length header encodes packet lengths of up to
+       4,294,967,295 (0xFFFFFFFF) octets in length. (This actually
+       encodes a four-octet scalar number.)
+
+    4. When the length of the packet body is not known in advance by the
+       issuer, Partial Body Length headers encode a packet of
+       indeterminate length, effectively making it a stream.
+
+
+
+
+
+
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 13]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+4.2.2.1. One-Octet Lengths
+
+   A one-octet Body Length header encodes a length of from 0 to 191
+   octets. This type of length header is recognized because the one
+   octet value is less than 192.  The body length is equal to:
+
+       bodyLen = 1st_octet;
+
+4.2.2.2. Two-Octet Lengths
+
+   A two-octet Body Length header encodes a length of from 192 to 8383
+   octets.  It is recognized because its first octet is in the range 192
+   to 223.  The body length is equal to:
+
+       bodyLen = ((1st_octet - 192) << 8) + (2nd_octet) + 192
+
+4.2.2.3. Five-Octet Lengths
+
+   A five-octet Body Length header consists of a single octet holding
+   the value 255, followed by a four-octet scalar. The body length is
+   equal to:
+
+       bodyLen = (2nd_octet << 24) | (3rd_octet << 16) |
+                 (4th_octet << 8)  | 5th_octet
+
+4.2.2.4. Partial Body Lengths
+
+   A Partial Body Length header is one octet long and encodes the length
+   of only part of the data packet. This length is a power of 2, from 1
+   to 1,073,741,824 (2 to the 30th power).  It is recognized by its one
+   octet value that is greater than or equal to 224, and less than 255.
+   The partial body length is equal to:
+
+       partialBodyLen = 1 << (1st_octet & 0x1f);
+
+   Each Partial Body Length header is followed by a portion of the
+   packet body data. The Partial Body Length header specifies this
+   portion's length. Another length header (of one of the three types --
+   one octet, two-octet, or partial) follows that portion. The last
+   length header in the packet MUST NOT be a partial Body Length header.
+   Partial Body Length headers may only be used for the non-final parts
+   of the packet.
+
+4.2.3. Packet Length Examples
+
+   These examples show ways that new-format packets might encode the
+   packet lengths.
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 14]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   A packet with length 100 may have its length encoded in one octet:
+   0x64. This is followed by 100 octets of data.
+
+   A packet with length 1723 may have its length coded in two octets:
+   0xC5, 0xFB.  This header is followed by the 1723 octets of data.
+
+   A packet with length 100000 may have its length encoded in five
+   octets: 0xFF, 0x00, 0x01, 0x86, 0xA0.
+
+   It might also be encoded in the following octet stream: 0xEF, first
+   32768 octets of data; 0xE1, next two octets of data; 0xE0, next one
+   octet of data; 0xF0, next 65536 octets of data; 0xC5, 0xDD, last 1693
+   octets of data.  This is just one possible encoding, and many
+   variations are possible on the size of the Partial Body Length
+   headers, as long as a regular Body Length header encodes the last
+   portion of the data. Note also that the last Body Length header can
+   be a zero-length header.
+
+   An implementation MAY use Partial Body Lengths for data packets, be
+   they literal, compressed, or encrypted. The first partial length MUST
+   be at least 512 octets long. Partial Body Lengths MUST NOT be used
+   for any other packet types.
+
+   Please note that in all of these explanations, the total length of
+   the packet is the length of the header(s) plus the length of the
+   body.
+
+4.3. Packet Tags
+
+   The packet tag denotes what type of packet the body holds. Note that
+   old format headers can only have tags less than 16, whereas new
+   format headers can have tags as great as 63. The defined tags (in
+   decimal) are:
+
+       0        -- Reserved - a packet tag must not have this value
+       1        -- Public-Key Encrypted Session Key Packet
+       2        -- Signature Packet
+       3        -- Symmetric-Key Encrypted Session Key Packet
+       4        -- One-Pass Signature Packet
+       5        -- Secret Key Packet
+       6        -- Public Key Packet
+       7        -- Secret Subkey Packet
+       8        -- Compressed Data Packet
+       9        -- Symmetrically Encrypted Data Packet
+       10       -- Marker Packet
+       11       -- Literal Data Packet
+       12       -- Trust Packet
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 15]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+       13       -- User ID Packet
+       14       -- Public Subkey Packet
+       60 to 63 -- Private or Experimental Values
+
+5. Packet Types
+
+5.1. Public-Key Encrypted Session Key Packets (Tag 1)
+
+   A Public-Key Encrypted Session Key packet holds the session key used
+   to encrypt a message. Zero or more Encrypted Session Key packets
+   (either Public-Key or Symmetric-Key) may precede a Symmetrically
+   Encrypted Data Packet, which holds an encrypted message.  The message
+   is encrypted with the session key, and the session key is itself
+   encrypted and stored in the Encrypted Session Key packet(s).  The
+   Symmetrically Encrypted Data Packet is preceded by one Public-Key
+   Encrypted Session Key packet for each OpenPGP key to which the
+   message is encrypted.  The recipient of the message finds a session
+   key that is encrypted to their public key, decrypts the session key,
+   and then uses the session key to decrypt the message.
+
+   The body of this packet consists of:
+
+     - A one-octet number giving the version number of the packet type.
+       The currently defined value for packet version is 3. An
+       implementation should accept, but not generate a version of 2,
+       which is equivalent to V3 in all other respects.
+
+     - An eight-octet number that gives the key ID of the public key
+       that the session key is encrypted to.
+
+     - A one-octet number giving the public key algorithm used.
+
+     - A string of octets that is the encrypted session key. This string
+       takes up the remainder of the packet, and its contents are
+       dependent on the public key algorithm used.
+
+   Algorithm Specific Fields for RSA encryption
+
+     - multiprecision integer (MPI) of RSA encrypted value m**e mod n.
+
+   Algorithm Specific Fields for Elgamal encryption:
+
+     - MPI of Elgamal (Diffie-Hellman) value g**k mod p.
+
+     - MPI of Elgamal (Diffie-Hellman) value m * y**k mod p.
+
+
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 16]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   The value "m" in the above formulas is derived from the session key
+   as follows.  First the session key is prefixed with a one-octet
+   algorithm identifier that specifies the symmetric encryption
+   algorithm used to encrypt the following Symmetrically Encrypted Data
+   Packet.  Then a two-octet checksum is appended which is equal to the
+   sum of the preceding session key octets, not including the algorithm
+   identifier, modulo 65536.  This value is then padded as described in
+   PKCS-1 block type 02 [RFC2313] to form the "m" value used in the
+   formulas above.
+
+   Note that when an implementation forms several PKESKs with one
+   session key, forming a message that can be decrypted by several keys,
+   the implementation MUST make new PKCS-1 padding for each key.
+
+   An implementation MAY accept or use a Key ID of zero as a "wild card"
+   or "speculative" Key ID. In this case, the receiving implementation
+   would try all available private keys, checking for a valid decrypted
+   session key. This format helps reduce traffic analysis of messages.
+
+5.2. Signature Packet (Tag 2)
+
+   A signature packet describes a binding between some public key and
+   some data. The most common signatures are a signature of a file or a
+   block of text, and a signature that is a certification of a user ID.
+
+   Two versions of signature packets are defined.  Version 3 provides
+   basic signature information, while version 4 provides an expandable
+   format with subpackets that can specify more information about the
+   signature. PGP 2.6.x only accepts version 3 signatures.
+
+   Implementations MUST accept V3 signatures. Implementations SHOULD
+   generate V4 signatures.  Implementations MAY generate a V3 signature
+   that can be verified by PGP 2.6.x.
+
+   Note that if an implementation is creating an encrypted and signed
+   message that is encrypted to a V3 key, it is reasonable to create a
+   V3 signature.
+
+5.2.1. Signature Types
+
+   There are a number of possible meanings for a signature, which are
+   specified in a signature type octet in any given signature. These
+   meanings are:
+
+   0x00: Signature of a binary document.
+         Typically, this means the signer owns it, created it, or
+         certifies that it has not been modified.
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 17]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   0x01: Signature of a canonical text document.
+         Typically, this means the signer owns it, created it, or
+         certifies that it has not been modified.  The signature is
+         calculated over the text data with its line endings converted
+         to <CR><LF> and trailing blanks removed.
+
+   0x02: Standalone signature.
+         This signature is a signature of only its own subpacket
+         contents. It is calculated identically to a signature over a
+         zero-length binary document. Note that it doesn't make sense to
+         have a V3 standalone signature.
+
+   0x10: Generic certification of a User ID and Public Key packet.
+         The issuer of this certification does not make any particular
+         assertion as to how well the certifier has checked that the
+         owner of the key is in fact the person described by the user
+         ID.  Note that all PGP "key signatures" are this type of
+         certification.
+
+   0x11: Persona certification of a User ID and Public Key packet.
+         The issuer of this certification has not done any verification
+         of the claim that the owner of this key is the user ID
+         specified.
+
+   0x12: Casual certification of a User ID and Public Key packet.
+         The issuer of this certification has done some casual
+         verification of the claim of identity.
+
+   0x13: Positive certification of a User ID and Public Key packet.
+         The issuer of this certification has done substantial
+         verification of the claim of identity.
+
+         Please note that the vagueness of these certification claims is
+         not a flaw, but a feature of the system. Because PGP places
+         final authority for validity upon the receiver of a
+         certification, it may be that one authority's casual
+         certification might be more rigorous than some other
+         authority's positive certification. These classifications allow
+         a certification authority to issue fine-grained claims.
+
+   0x18: Subkey Binding Signature
+         This signature is a statement by the top-level signing key
+         indicates that it owns the subkey. This signature is calculated
+         directly on the subkey itself, not on any User ID or other
+         packets.
+
+
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 18]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   0x1F: Signature directly on a key
+         This signature is calculated directly on a key.  It binds the
+         information in the signature subpackets to the key, and is
+         appropriate to be used for subpackets that provide information
+         about the key, such as the revocation key subpacket. It is also
+         appropriate for statements that non-self certifiers want to
+         make about the key itself, rather than the binding between a
+         key and a name.
+
+   0x20: Key revocation signature
+         The signature is calculated directly on the key being revoked.
+         A revoked key is not to be used.  Only revocation signatures by
+         the key being revoked, or by an authorized revocation key,
+         should be considered valid revocation signatures.
+
+   0x28: Subkey revocation signature
+         The signature is calculated directly on the subkey being
+         revoked.  A revoked subkey is not to be used.  Only revocation
+         signatures by the top-level signature key that is bound to this
+         subkey, or by an authorized revocation key, should be
+         considered valid revocation signatures.
+
+   0x30: Certification revocation signature
+         This signature revokes an earlier user ID certification
+         signature (signature class 0x10 through 0x13). It should be
+         issued by the same key that issued the revoked signature or an
+         authorized revocation key The signature should have a later
+         creation date than the signature it revokes.
+
+   0x40: Timestamp signature.
+         This signature is only meaningful for the timestamp contained
+         in it.
+
+5.2.2. Version 3 Signature Packet Format
+
+   The body of a version 3 Signature Packet contains:
+
+     - One-octet version number (3).
+
+     - One-octet length of following hashed material.  MUST be 5.
+
+         - One-octet signature type.
+
+         - Four-octet creation time.
+
+     - Eight-octet key ID of signer.
+
+     - One-octet public key algorithm.
+
+
+
+Callas, et. al.             Standards Track                    [Page 19]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+     - One-octet hash algorithm.
+
+     - Two-octet field holding left 16 bits of signed hash value.
+
+     - One or more multi-precision integers comprising the signature.
+       This portion is algorithm specific, as described below.
+
+   The data being signed is hashed, and then the signature type and
+   creation time from the signature packet are hashed (5 additional
+   octets).  The resulting hash value is used in the signature
+   algorithm. The high 16 bits (first two octets) of the hash are
+   included in the signature packet to provide a quick test to reject
+   some invalid signatures.
+
+   Algorithm Specific Fields for RSA signatures:
+
+     - multiprecision integer (MPI) of RSA signature value m**d.
+
+   Algorithm Specific Fields for DSA signatures:
+
+     - MPI of DSA value r.
+
+     - MPI of DSA value s.
+
+   The signature calculation is based on a hash of the signed data, as
+   described above.  The details of the calculation are different for
+   DSA signature than for RSA signatures.
+
+   With RSA signatures, the hash value is encoded as described in PKCS-1
+   section 10.1.2, "Data encoding", producing an ASN.1 value of type
+   DigestInfo, and then padded using PKCS-1 block type 01 [RFC2313].
+   This requires inserting the hash value as an octet string into an
+   ASN.1 structure. The object identifier for the type of hash being
+   used is included in the structure.  The hexadecimal representations
+   for the currently defined hash algorithms are:
+
+     - MD2:        0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x02, 0x02
+
+     - MD5:        0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x02, 0x05
+
+     - RIPEMD-160: 0x2B, 0x24, 0x03, 0x02, 0x01
+
+     - SHA-1:      0x2B, 0x0E, 0x03, 0x02, 0x1A
+
+
+
+
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 20]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   The ASN.1 OIDs are:
+
+     - MD2:        1.2.840.113549.2.2
+
+     - MD5:        1.2.840.113549.2.5
+
+     - RIPEMD-160: 1.3.36.3.2.1
+
+     - SHA-1:      1.3.14.3.2.26
+
+   The full hash prefixes for these are:
+
+       MD2:        0x30, 0x20, 0x30, 0x0C, 0x06, 0x08, 0x2A, 0x86,
+                   0x48, 0x86, 0xF7, 0x0D, 0x02, 0x02, 0x05, 0x00,
+                   0x04, 0x10
+
+       MD5:        0x30, 0x20, 0x30, 0x0C, 0x06, 0x08, 0x2A, 0x86,
+                   0x48, 0x86, 0xF7, 0x0D, 0x02, 0x05, 0x05, 0x00,
+                   0x04, 0x10
+
+       RIPEMD-160: 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2B, 0x24,
+                   0x03, 0x02, 0x01, 0x05, 0x00, 0x04, 0x14
+
+       SHA-1:      0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0E,
+                   0x03, 0x02, 0x1A, 0x05, 0x00, 0x04, 0x14
+
+   DSA signatures MUST use hashes with a size of 160 bits, to match q,
+   the size of the group generated by the DSA key's generator value.
+   The hash function result is treated as a 160 bit number and used
+   directly in the DSA signature algorithm.
+
+5.2.3. Version 4 Signature Packet Format
+
+   The body of a version 4 Signature Packet contains:
+
+     - One-octet version number (4).
+
+     - One-octet signature type.
+
+     - One-octet public key algorithm.
+
+     - One-octet hash algorithm.
+
+     - Two-octet scalar octet count for following hashed subpacket
+       data. Note that this is the length in octets of all of the hashed
+       subpackets; a pointer incremented by this number will skip over
+       the hashed subpackets.
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 21]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+     - Hashed subpacket data. (zero or more subpackets)
+
+     - Two-octet scalar octet count for following unhashed subpacket
+       data. Note that this is the length in octets of all of the
+       unhashed subpackets; a pointer incremented by this number will
+       skip over the unhashed subpackets.
+
+     - Unhashed subpacket data. (zero or more subpackets)
+
+     - Two-octet field holding left 16 bits of signed hash value.
+
+     - One or more multi-precision integers comprising the signature.
+       This portion is algorithm specific, as described above.
+
+   The data being signed is hashed, and then the signature data from the
+   version number through the hashed subpacket data (inclusive) is
+   hashed. The resulting hash value is what is signed.  The left 16 bits
+   of the hash are included in the signature packet to provide a quick
+   test to reject some invalid signatures.
+
+   There are two fields consisting of signature subpackets.  The first
+   field is hashed with the rest of the signature data, while the second
+   is unhashed.  The second set of subpackets is not cryptographically
+   protected by the signature and should include only advisory
+   information.
+
+   The algorithms for converting the hash function result to a signature
+   are described in a section below.
+
+5.2.3.1. Signature Subpacket Specification
+
+   The subpacket fields consist of zero or more signature subpackets.
+   Each set of subpackets is preceded by a two-octet scalar count of the
+   length of the set of subpackets.
+
+   Each subpacket consists of a subpacket header and a body.  The header
+   consists of:
+
+     - the subpacket length (1,  2, or 5 octets)
+
+     - the subpacket type (1 octet)
+
+   and is followed by the subpacket specific data.
+
+   The length includes the type octet but not this length. Its format is
+   similar to the "new" format packet header lengths, but cannot have
+   partial body lengths. That is:
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 22]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+       if the 1st octet <  192, then
+           lengthOfLength = 1
+           subpacketLen = 1st_octet
+
+       if the 1st octet >= 192 and < 255, then
+           lengthOfLength = 2
+           subpacketLen = ((1st_octet - 192) << 8) + (2nd_octet) + 192
+
+       if the 1st octet = 255, then
+           lengthOfLength = 5
+           subpacket length = [four-octet scalar starting at 2nd_octet]
+
+   The value of the subpacket type octet may be:
+
+       2 = signature creation time
+       3 = signature expiration time
+       4 = exportable certification
+       5 = trust signature
+       6 = regular expression
+       7 = revocable
+       9 = key expiration time
+       10 = placeholder for backward compatibility
+       11 = preferred symmetric algorithms
+       12 = revocation key
+       16 = issuer key ID
+       20 = notation data
+       21 = preferred hash algorithms
+       22 = preferred compression algorithms
+       23 = key server preferences
+       24 = preferred key server
+       25 = primary user id
+       26 = policy URL
+       27 = key flags
+       28 = signer's user id
+       29 = reason for revocation
+       100 to 110 = internal or user-defined
+
+   An implementation SHOULD ignore any subpacket of a type that it does
+   not recognize.
+
+   Bit 7 of the subpacket type is the "critical" bit.  If set, it
+   denotes that the subpacket is one that is critical for the evaluator
+   of the signature to recognize.  If a subpacket is encountered that is
+   marked critical but is unknown to the evaluating software, the
+   evaluator SHOULD consider the signature to be in error.
+
+
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 23]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   An evaluator may "recognize" a subpacket, but not implement it. The
+   purpose of the critical bit is to allow the signer to tell an
+   evaluator that it would prefer a new, unknown feature to generate an
+   error than be ignored.
+
+   Implementations SHOULD implement "preferences".
+
+5.2.3.2. Signature Subpacket Types
+
+   A number of subpackets are currently defined.  Some subpackets apply
+   to the signature itself and some are attributes of the key.
+   Subpackets that are found on a self-signature are placed on a user id
+   certification made by the key itself. Note that a key may have more
+   than one user id, and thus may have more than one self-signature, and
+   differing subpackets.
+
+   A self-signature is a binding signature made by the key the signature
+   refers to. There are three types of self-signatures, the
+   certification signatures (types 0x10-0x13), the direct-key signature
+   (type 0x1f), and the subkey binding signature (type 0x18). For
+   certification self-signatures, each user ID may have a self-
+   signature, and thus different subpackets in those self-signatures.
+   For subkey binding signatures, each subkey in fact has a self-
+   signature. Subpackets that appear in a certification self-signature
+   apply to the username, and subpackets that appear in the subkey
+   self-signature apply to the subkey. Lastly, subpackets on the direct
+   key signature apply to the entire key.
+
+   Implementing software should interpret a self-signature's preference
+   subpackets as narrowly as possible. For example, suppose a key has
+   two usernames, Alice and Bob. Suppose that Alice prefers the
+   symmetric algorithm CAST5, and Bob prefers IDEA or Triple-DES. If the
+   software locates this key via Alice's name, then the preferred
+   algorithm is CAST5, if software locates the key via Bob's name, then
+   the preferred algorithm is IDEA. If the key is located by key id,
+   then algorithm of the default user id of the key provides the default
+   symmetric algorithm.
+
+   A subpacket may be found either in the hashed or unhashed subpacket
+   sections of a signature. If a subpacket is not hashed, then the
+   information in it cannot be considered definitive because it is not
+   part of the signature proper.
+
+
+
+
+
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 24]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+5.2.3.3. Signature creation time
+
+   (4 octet time field)
+
+   The time the signature was made.
+
+   MUST be present in the hashed area.
+
+5.2.3.4. Issuer
+
+   (8 octet key ID)
+
+   The OpenPGP key ID of the key issuing the signature.
+
+5.2.3.5. Key expiration time
+
+   (4 octet time field)
+
+   The validity period of the key.  This is the number of seconds after
+   the key creation time that the key expires.  If this is not present
+   or has a value of zero, the key never expires. This is found only on
+   a self-signature.
+
+5.2.3.6. Preferred symmetric algorithms
+
+   (sequence of one-octet values)
+
+   Symmetric algorithm numbers that indicate which algorithms the key
+   holder prefers to use.  The subpacket body is an ordered list of
+   octets with the most preferred listed first. It is assumed that only
+   algorithms listed are supported by the recipient's software.
+   Algorithm numbers in section 9. This is only found on a self-
+   signature.
+
+5.2.3.7. Preferred hash algorithms
+
+   (array of one-octet values)
+
+   Message digest algorithm numbers that indicate which algorithms the
+   key holder prefers to receive. Like the preferred symmetric
+   algorithms, the list is ordered. Algorithm numbers are in section 6.
+   This is only found on a self-signature.
+
+
+
+
+
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 25]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+5.2.3.8. Preferred compression algorithms
+
+   (array of one-octet values)
+
+   Compression algorithm numbers that indicate which algorithms the key
+   holder prefers to use. Like the preferred symmetric algorithms, the
+   list is ordered. Algorithm numbers are in section 6. If this
+   subpacket is not included, ZIP is preferred. A zero denotes that
+   uncompressed data is preferred; the key holder's software might have
+   no compression software in that implementation. This is only found on
+   a self-signature.
+
+5.2.3.9. Signature expiration time
+
+   (4 octet time field)
+
+   The validity period of the signature.  This is the number of seconds
+   after the signature creation time that the signature expires. If this
+   is not present or has a value of zero, it never expires.
+
+5.2.3.10. Exportable Certification
+
+   (1 octet of exportability, 0 for not, 1 for exportable)
+
+   This subpacket denotes whether a certification signature is
+   "exportable", to be used by other users than the signature's issuer.
+   The packet body contains a boolean flag indicating whether the
+   signature is exportable. If this packet is not present, the
+   certification is exportable; it is equivalent to a flag containing a
+   1.
+
+   Non-exportable, or "local", certifications are signatures made by a
+   user to mark a key as valid within that user's implementation only.
+   Thus, when an implementation prepares a user's copy of a key for
+   transport to another user (this is the process of "exporting" the
+   key), any local certification signatures are deleted from the key.
+
+   The receiver of a transported key "imports" it, and likewise trims
+   any local certifications. In normal operation, there won't be any,
+   assuming the import is performed on an exported key. However, there
+   are instances where this can reasonably happen. For example, if an
+   implementation allows keys to be imported from a key database in
+   addition to an exported key, then this situation can arise.
+
+   Some implementations do not represent the interest of a single user
+   (for example, a key server). Such implementations always trim local
+   certifications from any key they handle.
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 26]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+5.2.3.11. Revocable
+
+   (1 octet of revocability, 0 for not, 1 for revocable)
+
+   Signature's revocability status.  Packet body contains a boolean flag
+   indicating whether the signature is revocable.  Signatures that are
+   not revocable have any later revocation signatures ignored.  They
+   represent a commitment by the signer that he cannot revoke his
+   signature for the life of his key.  If this packet is not present,
+   the signature is revocable.
+
+5.2.3.12. Trust signature
+
+   (1 octet "level" (depth), 1 octet of trust amount)
+
+   Signer asserts that the key is not only valid, but also trustworthy,
+   at the specified level.  Level 0 has the same meaning as an ordinary
+   validity signature.  Level 1 means that the signed key is asserted to
+   be a valid trusted introducer, with the 2nd octet of the body
+   specifying the degree of trust. Level 2 means that the signed key is
+   asserted to be trusted to issue level 1 trust signatures, i.e. that
+   it is a "meta introducer". Generally, a level n trust signature
+   asserts that a key is trusted to issue level n-1 trust signatures.
+   The trust amount is in a range from 0-255, interpreted such that
+   values less than 120 indicate partial trust and values of 120 or
+   greater indicate complete trust.  Implementations SHOULD emit values
+   of 60 for partial trust and 120 for complete trust.
+
+5.2.3.13. Regular expression
+
+   (null-terminated regular expression)
+
+   Used in conjunction with trust signature packets (of level > 0) to
+   limit the scope of trust that is extended.  Only signatures by the
+   target key on user IDs that match the regular expression in the body
+   of this packet have trust extended by the trust signature subpacket.
+   The regular expression uses the same syntax as the Henry Spencer's
+   "almost public domain" regular expression package. A description of
+   the syntax is found in a section below.
+
+5.2.3.14. Revocation key
+
+   (1 octet of class, 1 octet of algid, 20 octets of fingerprint)
+
+   Authorizes the specified key to issue revocation signatures for this
+   key.  Class octet must have bit 0x80 set. If the bit 0x40 is set,
+   then this means that the revocation information is sensitive.  Other
+   bits are for future expansion to other kinds of authorizations. This
+
+
+
+Callas, et. al.             Standards Track                    [Page 27]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   is found on a self-signature.
+
+   If the "sensitive" flag is set, the keyholder feels this subpacket
+   contains private trust information that describes a real-world
+   sensitive relationship. If this flag is set, implementations SHOULD
+   NOT export this signature to other users except in cases where the
+   data needs to be available: when the signature is being sent to the
+   designated revoker, or when it is accompanied by a revocation
+   signature from that revoker.  Note that it may be appropriate to
+   isolate this subpacket within a separate signature so that it is not
+   combined with other subpackets that need to be exported.
+
+5.2.3.15. Notation Data
+
+       (4 octets of flags, 2 octets of name length (M),
+                           2 octets of value length (N),
+                           M octets of name data,
+                           N octets of value data)
+
+   This subpacket describes a "notation" on the signature that the
+   issuer wishes to make. The notation has a name and a value, each of
+   which are strings of octets. There may be more than one notation in a
+   signature. Notations can be used for any extension the issuer of the
+   signature cares to make. The "flags" field holds four octets of
+   flags.
+
+   All undefined flags MUST be zero. Defined flags are:
+
+       First octet: 0x80 = human-readable. This note is text, a note
+                           from one person to another, and has no
+                           meaning to software.
+       Other octets: none.
+
+5.2.3.16. Key server preferences
+
+   (N octets of flags)
+
+   This is a list of flags that indicate preferences that the key holder
+   has about how the key is handled on a key server. All undefined flags
+   MUST be zero.
+
+   First octet: 0x80 = No-modify
+       the key holder requests that this key only be modified or updated
+       by the key holder or an administrator of the key server.
+
+   This is found only on a self-signature.
+
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 28]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+5.2.3.17. Preferred key server
+
+   (String)
+
+   This is a URL of a key server that the key holder prefers be used for
+   updates. Note that keys with multiple user ids can have a preferred
+   key server for each user id. Note also that since this is a URL, the
+   key server can actually be a copy of the key retrieved by ftp, http,
+   finger, etc.
+
+5.2.3.18. Primary user id
+
+   (1 octet, boolean)
+
+   This is a flag in a user id's self signature that states whether this
+   user id is the main user id for this key. It is reasonable for an
+   implementation to resolve ambiguities in preferences, etc. by
+   referring to the primary user id. If this flag is absent, its value
+   is zero. If more than one user id in a key is marked as primary, the
+   implementation may resolve the ambiguity in any way it sees fit.
+
+5.2.3.19. Policy URL
+
+   (String)
+
+   This subpacket contains a URL of a document that describes the policy
+   that the signature was issued under.
+
+5.2.3.20. Key Flags
+
+   (Octet string)
+
+   This subpacket contains a list of binary flags that hold information
+   about a key. It is a string of octets, and an implementation MUST NOT
+   assume a fixed size. This is so it can grow over time. If a list is
+   shorter than an implementation expects, the unstated flags are
+   considered to be zero. The defined flags are:
+
+       First octet:
+
+       0x01 - This key may be used to certify other keys.
+
+       0x02 - This key may be used to sign data.
+
+       0x04 - This key may be used to encrypt communications.
+
+       0x08 - This key may be used to encrypt storage.
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 29]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+       0x10 - The private component of this key may have been split by a
+       secret-sharing mechanism.
+
+       0x80 - The private component of this key may be in the possession
+       of more than one person.
+
+   Usage notes:
+
+   The flags in this packet may appear in self-signatures or in
+   certification signatures. They mean different things depending on who
+   is making the statement -- for example, a certification signature
+   that has the "sign data" flag is stating that the certification is
+   for that use. On the other hand, the "communications encryption" flag
+   in a self-signature is stating a preference that a given key be used
+   for communications. Note however, that it is a thorny issue to
+   determine what is "communications" and what is "storage." This
+   decision is left wholly up to the implementation; the authors of this
+   document do not claim any special wisdom on the issue, and realize
+   that accepted opinion may change.
+
+   The "split key" (0x10) and "group key" (0x80) flags are placed on a
+   self-signature only; they are meaningless on a certification
+   signature. They SHOULD be placed only on a direct-key signature (type
+   0x1f) or a subkey signature (type 0x18), one that refers to the key
+   the flag applies to.
+
+5.2.3.21. Signer's User ID
+
+   This subpacket allows a keyholder to state which user id is
+   responsible for the signing. Many keyholders use a single key for
+   different purposes, such as business communications as well as
+   personal communications. This subpacket allows such a keyholder to
+   state which of their roles is making a signature.
+
+5.2.3.22. Reason for Revocation
+
+   (1 octet of revocation code, N octets of reason string)
+
+   This subpacket is used only in key revocation and certification
+   revocation signatures. It describes the reason why the key or
+   certificate was revoked.
+
+   The first octet contains a machine-readable code that denotes the
+   reason for the revocation:
+
+
+
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 30]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+       0x00 - No reason specified (key revocations or cert revocations)
+       0x01 - Key is superceded (key revocations)
+       0x02 - Key material has been compromised (key revocations)
+       0x03 - Key is no longer used (key revocations)
+       0x20 - User id information is no longer valid (cert revocations)
+
+   Following the revocation code is a string of octets which gives
+   information about the reason for revocation in human-readable form
+   (UTF-8). The string may be null, that is, of zero length. The length
+   of the subpacket is the length of the reason string plus one.
+
+5.2.4. Computing Signatures
+
+   All signatures are formed by producing a hash over the signature
+   data, and then using the resulting hash in the signature algorithm.
+
+   The signature data is simple to compute for document signatures
+   (types 0x00 and 0x01), for which the document itself is the data.
+   For standalone signatures, this is a null string.
+
+   When a signature is made over a key, the hash data starts with the
+   octet 0x99, followed by a two-octet length of the key, and then body
+   of the key packet. (Note that this is an old-style packet header for
+   a key packet with two-octet length.) A subkey signature (type 0x18)
+   then hashes the subkey, using the same format as the main key. Key
+   revocation signatures (types 0x20 and 0x28) hash only the key being
+   revoked.
+
+   A certification signature (type 0x10 through 0x13) hashes the user id
+   being bound to the key into the hash context after the above data. A
+   V3 certification hashes the contents of the name packet, without any
+   header. A V4 certification hashes the constant 0xb4 (which is an
+   old-style packet header with the length-of-length set to zero), a
+   four-octet number giving the length of the username, and then the
+   username data.
+
+   Once the data body is hashed, then a trailer is hashed. A V3
+   signature hashes five octets of the packet body, starting from the
+   signature type field. This data is the signature type, followed by
+   the four-octet signature time. A V4 signature hashes the packet body
+   starting from its first field, the version number, through the end of
+   the hashed subpacket data. Thus, the fields hashed are the signature
+   version, the signature type, the public key algorithm, the hash
+   algorithm, the hashed subpacket length, and the hashed subpacket
+   body.
+
+
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 31]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   V4 signatures also hash in a final trailer of six octets: the version
+   of the signature packet, i.e. 0x04; 0xFF; a four-octet, big-endian
+   number that is the length of the hashed data from the signature
+   packet (note that this number does not include these final six
+   octets.
+
+   After all this has been hashed, the resulting hash field is used in
+   the signature algorithm, and placed at the end of the signature
+   packet.
+
+5.2.4.1. Subpacket Hints
+
+   An implementation SHOULD put the two mandatory subpackets, creation
+   time and issuer, as the first subpackets in the subpacket list,
+   simply to make it easier for the implementer to find them.
+
+   It is certainly possible for a signature to contain conflicting
+   information in subpackets. For example, a signature may contain
+   multiple copies of a preference or multiple expiration times. In most
+   cases, an implementation SHOULD use the last subpacket in the
+   signature, but MAY use any conflict resolution scheme that makes more
+   sense. Please note that we are intentionally leaving conflict
+   resolution to the implementer; most conflicts are simply syntax
+   errors, and the wishy-washy language here allows a receiver to be
+   generous in what they accept, while putting pressure on a creator to
+   be stingy in what they generate.
+
+   Some apparent conflicts may actually make sense -- for example,
+   suppose a keyholder has an V3 key and a V4 key that share the same
+   RSA key material. Either of these keys can verify a signature created
+   by the other, and it may be reasonable for a signature to contain an
+   issuer subpacket for each key, as a way of explicitly tying those
+   keys to the signature.
+
+5.3. Symmetric-Key Encrypted Session-Key Packets (Tag 3)
+
+   The Symmetric-Key Encrypted Session Key packet holds the symmetric-
+   key encryption of a session key used to encrypt a message.  Zero or
+   more Encrypted Session Key packets and/or Symmetric-Key Encrypted
+   Session Key packets may precede a Symmetrically Encrypted Data Packet
+   that holds an encrypted message.  The message is encrypted with a
+   session key, and the session key is itself encrypted and stored in
+   the Encrypted Session Key packet or the Symmetric-Key Encrypted
+   Session Key packet.
+
+   If the Symmetrically Encrypted Data Packet is preceded by one or more
+   Symmetric-Key Encrypted Session Key packets, each specifies a
+   passphrase that may be used to decrypt the message.  This allows a
+
+
+
+Callas, et. al.             Standards Track                    [Page 32]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   message to be encrypted to a number of public keys, and also to one
+   or more pass phrases. This packet type is new, and is not generated
+   by PGP 2.x or PGP 5.0.
+
+   The body of this packet consists of:
+
+     - A one-octet version number. The only currently defined version
+       is 4.
+
+     - A one-octet number describing the symmetric algorithm used.
+
+     - A string-to-key (S2K) specifier, length as defined above.
+
+     - Optionally, the encrypted session key itself, which is decrypted
+       with the string-to-key object.
+
+   If the encrypted session key is not present (which can be detected on
+   the basis of packet length and S2K specifier size), then the S2K
+   algorithm applied to the passphrase produces the session key for
+   decrypting the file, using the symmetric cipher algorithm from the
+   Symmetric-Key Encrypted Session Key packet.
+
+   If the encrypted session key is present, the result of applying the
+   S2K algorithm to the passphrase is used to decrypt just that
+   encrypted session key field, using CFB mode with an IV of all zeros.
+    The decryption result consists of a one-octet algorithm identifier
+   that specifies the symmetric-key encryption algorithm used to encrypt
+   the following Symmetrically Encrypted Data Packet, followed by the
+   session key octets themselves.
+
+   Note: because an all-zero IV is used for this decryption, the S2K
+   specifier MUST use a salt value, either a Salted S2K or an Iterated-
+   Salted S2K.  The salt value will insure that the decryption key is
+   not repeated even if the passphrase is reused.
+
+5.4. One-Pass Signature Packets (Tag 4)
+
+   The One-Pass Signature packet precedes the signed data and contains
+   enough information to allow the receiver to begin calculating any
+   hashes needed to verify the signature.  It allows the Signature
+   Packet to be placed at the end of the message, so that the signer can
+   compute the entire signed message in one pass.
+
+   A One-Pass Signature does not interoperate with PGP 2.6.x or earlier.
+
+   The body of this packet consists of:
+
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 33]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+     - A one-octet version number. The current version is 3.
+
+     - A one-octet signature type. Signature types are described in
+       section 5.2.1.
+
+     - A one-octet number describing the hash algorithm used.
+
+     - A one-octet number describing the public key algorithm used.
+
+     - An eight-octet number holding the key ID of the signing key.
+
+     - A one-octet number holding a flag showing whether the signature
+       is nested.  A zero value indicates that the next packet is
+       another One-Pass Signature packet that describes another
+       signature to be applied to the same message data.
+
+   Note that if a message contains more than one one-pass signature,
+   then the signature packets bracket the message; that is, the first
+   signature packet after the message corresponds to the last one-pass
+   packet and the final signature packet corresponds to the first one-
+   pass packet.
+
+5.5. Key Material Packet
+
+   A key material packet contains all the information about a public or
+   private key.  There are four variants of this packet type, and two
+   major versions. Consequently, this section is complex.
+
+5.5.1. Key Packet Variants
+
+5.5.1.1. Public Key Packet (Tag 6)
+
+   A Public Key packet starts a series of packets that forms an OpenPGP
+   key (sometimes called an OpenPGP certificate).
+
+5.5.1.2. Public Subkey Packet (Tag 14)
+
+   A Public Subkey packet (tag 14) has exactly the same format as a
+   Public Key packet, but denotes a subkey. One or more subkeys may be
+   associated with a top-level key.  By convention, the top-level key
+   provides signature services, and the subkeys provide encryption
+   services.
+
+   Note: in PGP 2.6.x, tag 14 was intended to indicate a comment packet.
+   This tag was selected for reuse because no previous version of PGP
+   ever emitted comment packets but they did properly ignore them.
+   Public Subkey packets are ignored by PGP 2.6.x and do not cause it to
+   fail, providing a limited degree of backward compatibility.
+
+
+
+Callas, et. al.             Standards Track                    [Page 34]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+5.5.1.3. Secret Key Packet (Tag 5)
+
+   A Secret Key packet contains all the information that is found in a
+   Public Key packet, including the public key material, but also
+   includes the secret key material after all the public key fields.
+
+5.5.1.4. Secret Subkey Packet (Tag 7)
+
+   A Secret Subkey packet (tag 7) is the subkey analog of the Secret Key
+   packet, and has exactly the same format.
+
+5.5.2. Public Key Packet Formats
+
+   There are two versions of key-material packets. Version 3 packets
+   were first generated by PGP 2.6. Version 2 packets are identical in
+   format to Version 3 packets, but are generated by PGP 2.5 or before.
+   V2 packets are deprecated and they MUST NOT be generated.  PGP 5.0
+   introduced version 4 packets, with new fields and semantics.  PGP
+   2.6.x will not accept key-material packets with versions greater than
+   3.
+
+   OpenPGP implementations SHOULD create keys with version 4 format. An
+   implementation MAY generate a V3 key to ensure interoperability with
+   old software; note, however, that V4 keys correct some security
+   deficiencies in V3 keys. These deficiencies are described below. An
+   implementation MUST NOT create a V3 key with a public key algorithm
+   other than RSA.
+
+   A version 3 public key or public subkey packet contains:
+
+     - A one-octet version number (3).
+
+     - A four-octet number denoting the time that the key was created.
+
+     - A two-octet number denoting the time in days that this key is
+       valid. If this number is zero, then it does not expire.
+
+     - A one-octet number denoting the public key algorithm of this key
+
+     - A series of multi-precision integers comprising the key
+       material:
+
+         - a multiprecision integer (MPI) of RSA public modulus n;
+
+         - an MPI of RSA public encryption exponent e.
+
+
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 35]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   V3 keys SHOULD only be used for backward compatibility because of
+   three weaknesses in them. First, it is relatively easy to construct a
+   V3 key that has the same key ID as any other key because the key ID
+   is simply the low 64 bits of the public modulus. Secondly, because
+   the fingerprint of a V3 key hashes the key material, but not its
+   length, which increases the opportunity for fingerprint collisions.
+   Third, there are minor weaknesses in the MD5 hash algorithm that make
+   developers prefer other algorithms. See below for a fuller discussion
+   of key IDs and fingerprints.
+
+   The version 4 format is similar to the version 3 format except for
+   the absence of a validity period.  This has been moved to the
+   signature packet.  In addition, fingerprints of version 4 keys are
+   calculated differently from version 3 keys, as described in section
+   "Enhanced Key Formats."
+
+   A version 4 packet contains:
+
+     - A one-octet version number (4).
+
+     - A four-octet number denoting the time that the key was created.
+
+     - A one-octet number denoting the public key algorithm of this key
+
+     - A series of multi-precision integers comprising the key
+       material.  This algorithm-specific portion is:
+
+       Algorithm Specific Fields for RSA public keys:
+
+         - multiprecision integer (MPI) of RSA public modulus n;
+
+         - MPI of RSA public encryption exponent e.
+
+       Algorithm Specific Fields for DSA public keys:
+
+         - MPI of DSA prime p;
+
+         - MPI of DSA group order q (q is a prime divisor of p-1);
+
+         - MPI of DSA group generator g;
+
+         - MPI of DSA public key value y (= g**x where x is secret).
+
+       Algorithm Specific Fields for Elgamal public keys:
+
+         - MPI of Elgamal prime p;
+
+         - MPI of Elgamal group generator g;
+
+
+
+Callas, et. al.             Standards Track                    [Page 36]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+         - MPI of Elgamal public key value y (= g**x where x is
+           secret).
+
+5.5.3. Secret Key Packet Formats
+
+   The Secret Key and Secret Subkey packets contain all the data of the
+   Public Key and Public Subkey packets, with additional algorithm-
+   specific secret key data appended, in encrypted form.
+
+   The packet contains:
+
+     - A Public Key or Public Subkey packet, as described above
+
+     - One octet indicating string-to-key usage conventions.  0
+       indicates that the secret key data is not encrypted.  255
+       indicates that a string-to-key specifier is being given.  Any
+       other value is a symmetric-key encryption algorithm specifier.
+
+     - [Optional] If string-to-key usage octet was 255, a one-octet
+       symmetric encryption algorithm.
+
+     - [Optional] If string-to-key usage octet was 255, a string-to-key
+       specifier.  The length of the string-to-key specifier is implied
+       by its type, as described above.
+
+     - [Optional] If secret data is encrypted, eight-octet Initial
+       Vector (IV).
+
+     - Encrypted multi-precision integers comprising the secret key
+       data. These algorithm-specific fields are as described below.
+
+     - Two-octet checksum of the plaintext of the algorithm-specific
+       portion (sum of all octets, mod 65536).
+
+       Algorithm Specific Fields for RSA secret keys:
+
+       - multiprecision integer (MPI) of RSA secret exponent d.
+
+       - MPI of RSA secret prime value p.
+
+       - MPI of RSA secret prime value q (p < q).
+
+       - MPI of u, the multiplicative inverse of p, mod q.
+
+       Algorithm Specific Fields for DSA secret keys:
+
+       - MPI of DSA secret exponent x.
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 37]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+       Algorithm Specific Fields for Elgamal secret keys:
+
+       - MPI of Elgamal secret exponent x.
+
+   Secret MPI values can be encrypted using a passphrase.  If a string-
+   to-key specifier is given, that describes the algorithm for
+   converting the passphrase to a key, else a simple MD5 hash of the
+   passphrase is used.  Implementations SHOULD use a string-to-key
+   specifier; the simple hash is for backward compatibility. The cipher
+   for encrypting the MPIs is specified in the secret key packet.
+
+   Encryption/decryption of the secret data is done in CFB mode using
+   the key created from the passphrase and the Initial Vector from the
+   packet. A different mode is used with V3 keys (which are only RSA)
+   than with other key formats. With V3 keys, the MPI bit count prefix
+   (i.e., the first two octets) is not encrypted.  Only the MPI non-
+   prefix data is encrypted.  Furthermore, the CFB state is
+   resynchronized at the beginning of each new MPI value, so that the
+   CFB block boundary is aligned with the start of the MPI data.
+
+   With V4 keys, a simpler method is used.  All secret MPI values are
+   encrypted in CFB mode, including the MPI bitcount prefix.
+
+   The 16-bit checksum that follows the algorithm-specific portion is
+   the algebraic sum, mod 65536, of the plaintext of all the algorithm-
+   specific octets (including MPI prefix and data).  With V3 keys, the
+   checksum is stored in the clear.  With V4 keys, the checksum is
+   encrypted like the algorithm-specific data.  This value is used to
+   check that the passphrase was correct.
+
+5.6. Compressed Data Packet (Tag 8)
+
+   The Compressed Data packet contains compressed data. Typically, this
+   packet is found as the contents of an encrypted packet, or following
+   a Signature or One-Pass Signature packet, and contains literal data
+   packets.
+
+   The body of this packet consists of:
+
+     - One octet that gives the algorithm used to compress the packet.
+
+     - The remainder of the packet is compressed data.
+
+   A Compressed Data Packet's body contains an block that compresses
+   some set of packets. See section "Packet Composition" for details on
+   how messages are formed.
+
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 38]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   ZIP-compressed packets are compressed with raw RFC 1951 DEFLATE
+   blocks. Note that PGP V2.6 uses 13 bits of compression. If an
+   implementation uses more bits of compression, PGP V2.6 cannot
+   decompress it.
+
+   ZLIB-compressed packets are compressed with RFC 1950 ZLIB-style
+   blocks.
+
+5.7. Symmetrically Encrypted Data Packet (Tag 9)
+
+   The Symmetrically Encrypted Data packet contains data encrypted with
+   a symmetric-key algorithm. When it has been decrypted, it will
+   typically contain other packets (often literal data packets or
+   compressed data packets).
+
+   The body of this packet consists of:
+
+     - Encrypted data, the output of the selected symmetric-key cipher
+       operating in PGP's variant of Cipher Feedback (CFB) mode.
+
+   The symmetric cipher used may be specified in an Public-Key or
+   Symmetric-Key Encrypted Session Key packet that precedes the
+   Symmetrically Encrypted Data Packet.  In that case, the cipher
+   algorithm octet is prefixed to the session key before it is
+   encrypted.  If no packets of these types precede the encrypted data,
+   the IDEA algorithm is used with the session key calculated as the MD5
+   hash of the passphrase.
+
+   The data is encrypted in CFB mode, with a CFB shift size equal to the
+   cipher's block size.  The Initial Vector (IV) is specified as all
+   zeros.  Instead of using an IV, OpenPGP prefixes a 10-octet string to
+   the data before it is encrypted.  The first eight octets are random,
+   and the 9th and 10th octets are copies of the 7th and 8th octets,
+   respectively. After encrypting the first 10 octets, the CFB state is
+   resynchronized if the cipher block size is 8 octets or less.  The
+   last 8 octets of ciphertext are passed through the cipher and the
+   block boundary is reset.
+
+   The repetition of 16 bits in the 80 bits of random data prefixed to
+   the message allows the receiver to immediately check whether the
+   session key is incorrect.
+
+5.8. Marker Packet (Obsolete Literal Packet) (Tag 10)
+
+   An experimental version of PGP used this packet as the Literal
+   packet, but no released version of PGP generated Literal packets with
+   this tag. With PGP 5.x, this packet has been re-assigned and is
+   reserved for use as the Marker packet.
+
+
+
+Callas, et. al.             Standards Track                    [Page 39]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   The body of this packet consists of:
+
+     - The three octets 0x50, 0x47, 0x50 (which spell "PGP" in UTF-8).
+
+   Such a packet MUST be ignored when received.  It may be placed at the
+   beginning of a message that uses features not available in PGP 2.6.x
+   in order to cause that version to report that newer software is
+   necessary to process the message.
+
+5.9. Literal Data Packet (Tag 11)
+
+   A Literal Data packet contains the body of a message; data that is
+   not to be further interpreted.
+
+   The body of this packet consists of:
+
+     - A one-octet field that describes how the data is formatted.
+
+   If it is a 'b' (0x62), then the literal packet contains binary data.
+   If it is a 't' (0x74), then it contains text data, and thus may need
+   line ends converted to local form, or other text-mode changes.  RFC
+   1991 also defined a value of 'l' as a 'local' mode for machine-local
+   conversions.  This use is now deprecated.
+
+     - File name as a string (one-octet length, followed by file name),
+       if the encrypted data should be saved as a file.
+
+   If the special name "_CONSOLE" is used, the message is considered to
+   be "for your eyes only".  This advises that the message data is
+   unusually sensitive, and the receiving program should process it more
+   carefully, perhaps avoiding storing the received data to disk, for
+   example.
+
+     - A four-octet number that indicates the modification date of the
+       file, or the creation time of the packet, or a zero that
+       indicates the present time.
+
+     - The remainder of the packet is literal data.
+
+   Text data is stored with <CR><LF> text endings (i.e. network-normal
+   line endings).  These should be converted to native line endings by
+   the receiving software.
+
+5.10. Trust Packet (Tag 12)
+
+   The Trust packet is used only within keyrings and is not normally
+   exported.  Trust packets contain data that record the user's
+   specifications of which key holders are trustworthy introducers,
+
+
+
+Callas, et. al.             Standards Track                    [Page 40]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   along with other information that implementing software uses for
+   trust information.
+
+   Trust packets SHOULD NOT be emitted to output streams that are
+   transferred to other users, and they SHOULD be ignored on any input
+   other than local keyring files.
+
+5.11. User ID Packet (Tag 13)
+
+   A User ID packet consists of data that is intended to represent the
+   name and email address of the key holder.  By convention, it includes
+   an RFC 822 mail name, but there are no restrictions on its content.
+   The packet length in the header specifies the length of the user id.
+   If it is text, it is encoded in UTF-8.
+
+6. Radix-64 Conversions
+
+   As stated in the introduction, OpenPGP's underlying native
+   representation for objects is a stream of arbitrary octets, and some
+   systems desire these objects to be immune to damage caused by
+   character set translation, data conversions, etc.
+
+   In principle, any printable encoding scheme that met the requirements
+   of the unsafe channel would suffice, since it would not change the
+   underlying binary bit streams of the native OpenPGP data structures.
+   The OpenPGP standard specifies one such printable encoding scheme to
+   ensure interoperability.
+
+   OpenPGP's Radix-64 encoding is composed of two parts: a base64
+   encoding of the binary data, and a checksum.  The base64 encoding is
+   identical to the MIME base64 content-transfer-encoding [RFC2231,
+   Section 6.8]. An OpenPGP implementation MAY use ASCII Armor to
+   protect the raw binary data.
+
+   The checksum is a 24-bit CRC converted to four characters of radix-64
+   encoding by the same MIME base64 transformation, preceded by an
+   equals sign (=).  The CRC is computed by using the generator 0x864CFB
+   and an initialization of 0xB704CE.  The accumulation is done on the
+   data before it is converted to radix-64, rather than on the converted
+   data.  A sample implementation of this algorithm is in the next
+   section.
+
+   The checksum with its leading equal sign MAY appear on the first line
+   after the Base64 encoded data.
+
+   Rationale for CRC-24: The size of 24 bits fits evenly into printable
+   base64.  The nonzero initialization can detect more errors than a
+   zero initialization.
+
+
+
+Callas, et. al.             Standards Track                    [Page 41]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+6.1. An Implementation of the CRC-24 in "C"
+
+       #define CRC24_INIT 0xb704ceL
+       #define CRC24_POLY 0x1864cfbL
+
+       typedef long crc24;
+       crc24 crc_octets(unsigned char *octets, size_t len)
+       {
+           crc24 crc = CRC24_INIT;
+           int i;
+
+           while (len--) {
+               crc ^= (*octets++) << 16;
+               for (i = 0; i < 8; i++) {
+                   crc <<= 1;
+                   if (crc & 0x1000000)
+                       crc ^= CRC24_POLY;
+               }
+           }
+           return crc & 0xffffffL;
+       }
+
+6.2. Forming ASCII Armor
+
+   When OpenPGP encodes data into ASCII Armor, it puts specific headers
+   around the data, so OpenPGP can reconstruct the data later. OpenPGP
+   informs the user what kind of data is encoded in the ASCII armor
+   through the use of the headers.
+
+   Concatenating the following data creates ASCII Armor:
+
+     - An Armor Header Line, appropriate for the type of data
+
+     - Armor Headers
+
+     - A blank (zero-length, or containing only whitespace) line
+
+     - The ASCII-Armored data
+
+     - An Armor Checksum
+
+     - The Armor Tail, which depends on the Armor Header Line.
+
+   An Armor Header Line consists of the appropriate header line text
+   surrounded by five (5) dashes ('-', 0x2D) on either side of the
+   header line text.  The header line text is chosen based upon the type
+   of data that is being encoded in Armor, and how it is being encoded.
+   Header line texts include the following strings:
+
+
+
+Callas, et. al.             Standards Track                    [Page 42]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   BEGIN PGP MESSAGE
+       Used for signed, encrypted, or compressed files.
+
+   BEGIN PGP PUBLIC KEY BLOCK
+       Used for armoring public keys
+
+   BEGIN PGP PRIVATE KEY BLOCK
+       Used for armoring private keys
+
+   BEGIN PGP MESSAGE, PART X/Y
+       Used for multi-part messages, where the armor is split amongst Y
+       parts, and this is the Xth part out of Y.
+
+   BEGIN PGP MESSAGE, PART X
+       Used for multi-part messages, where this is the Xth part of an
+       unspecified number of parts. Requires the MESSAGE-ID Armor Header
+       to be used.
+
+   BEGIN PGP SIGNATURE
+       Used for detached signatures, OpenPGP/MIME signatures, and
+       natures following clearsigned messages. Note that PGP 2.x s BEGIN
+       PGP MESSAGE for detached signatures.
+
+   The Armor Headers are pairs of strings that can give the user or the
+   receiving OpenPGP implementation some information about how to decode
+   or use the message.  The Armor Headers are a part of the armor, not a
+   part of the message, and hence are not protected by any signatures
+   applied to the message.
+
+   The format of an Armor Header is that of a key-value pair.  A colon
+   (':' 0x38) and a single space (0x20) separate the key and value.
+   OpenPGP should consider improperly formatted Armor Headers to be
+   corruption of the ASCII Armor.  Unknown keys should be reported to
+   the user, but OpenPGP should continue to process the message.
+
+   Currently defined Armor Header Keys are:
+
+     - "Version", that states the OpenPGP Version used to encode the
+       message.
+
+     - "Comment", a user-defined comment.
+
+     - "MessageID", a 32-character string of printable characters.  The
+       string must be the same for all parts of a multi-part message
+       that uses the "PART X" Armor Header.  MessageID strings should be
+
+
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 43]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+       unique enough that the recipient of the mail can associate all
+       the parts of a message with each other. A good checksum or
+       cryptographic hash function is sufficient.
+
+     - "Hash", a comma-separated list of hash algorithms used in this
+       message. This is used only in clear-signed messages.
+
+     - "Charset", a description of the character set that the plaintext
+       is in. Please note that OpenPGP defines text to be in UTF-8 by
+       default. An implementation will get best results by translating
+       into and out of UTF-8. However, there are many instances where
+       this is easier said than done. Also, there are communities of
+       users who have no need for UTF-8 because they are all happy with
+       a character set like ISO Latin-5 or a Japanese character set. In
+       such instances, an implementation MAY override the UTF-8 default
+       by using this header key. An implementation MAY implement this
+       key and any translations it cares to; an implementation MAY
+       ignore it and assume all text is UTF-8.
+
+       The MessageID SHOULD NOT appear unless it is in a multi-part
+       message. If it appears at all, it MUST be computed from the
+       finished (encrypted, signed, etc.) message in a deterministic
+       fashion, rather than contain a purely random value.  This is to
+       allow the legitimate recipient to determine that the MessageID
+       cannot serve as a covert means of leaking cryptographic key
+       information.
+
+   The Armor Tail Line is composed in the same manner as the Armor
+   Header Line, except the string "BEGIN" is replaced by the string
+   "END."
+
+6.3. Encoding Binary in Radix-64
+
+   The encoding process represents 24-bit groups of input bits as output
+   strings of 4 encoded characters. Proceeding from left to right, a
+   24-bit input group is formed by concatenating three 8-bit input
+   groups. These 24 bits are then treated as four concatenated 6-bit
+   groups, each of which is translated into a single digit in the
+   Radix-64 alphabet. When encoding a bit stream with the Radix-64
+   encoding, the bit stream must be presumed to be ordered with the
+   most-significant-bit first. That is, the first bit in the stream will
+   be the high-order bit in the first 8-bit octet, and the eighth bit
+   will be the low-order bit in the first 8-bit octet, and so on.
+
+
+
+
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 44]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+         +--first octet--+-second octet--+--third octet--+
+         |7 6 5 4 3 2 1 0|7 6 5 4 3 2 1 0|7 6 5 4 3 2 1 0|
+         +-----------+---+-------+-------+---+-----------+
+         |5 4 3 2 1 0|5 4 3 2 1 0|5 4 3 2 1 0|5 4 3 2 1 0|
+         +--1.index--+--2.index--+--3.index--+--4.index--+
+
+   Each 6-bit group is used as an index into an array of 64 printable
+   characters from the table below. The character referenced by the
+   index is placed in the output string.
+
+     Value Encoding  Value Encoding  Value Encoding  Value Encoding
+         0 A            17 R            34 i            51 z
+         1 B            18 S            35 j            52 0
+         2 C            19 T            36 k            53 1
+         3 D            20 U            37 l            54 2
+         4 E            21 V            38 m            55 3
+         5 F            22 W            39 n            56 4
+         6 G            23 X            40 o            57 5
+         7 H            24 Y            41 p            58 6
+         8 I            25 Z            42 q            59 7
+         9 J            26 a            43 r            60 8
+        10 K            27 b            44 s            61 9
+        11 L            28 c            45 t            62 +
+        12 M            29 d            46 u            63 /
+        13 N            30 e            47 v
+        14 O            31 f            48 w         (pad) =
+        15 P            32 g            49 x
+        16 Q            33 h            50 y
+
+   The encoded output stream must be represented in lines of no more
+   than 76 characters each.
+
+   Special processing is performed if fewer than 24 bits are available
+   at the end of the data being encoded. There are three possibilities:
+
+    1. The last data group has 24 bits (3 octets). No special
+       processing is needed.
+
+    2. The last data group has 16 bits (2 octets). The first two 6-bit
+       groups are processed as above. The third (incomplete) data group
+       has two zero-value bits added to it, and is processed as above.
+       A pad character (=) is added to the output.
+
+    3. The last data group has 8 bits (1 octet). The first 6-bit group
+       is processed as above. The second (incomplete) data group has
+       four zero-value bits added to it, and is processed as above. Two
+       pad characters (=) are added to the output.
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 45]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+6.4. Decoding Radix-64
+
+   Any characters outside of the base64 alphabet are ignored in Radix-64
+   data. Decoding software must ignore all line breaks or other
+   characters not found in the table above.
+
+   In Radix-64 data, characters other than those in the table, line
+   breaks, and other white space probably indicate a transmission error,
+   about which a warning message or even a message rejection might be
+   appropriate under some circumstances.
+
+   Because it is used only for padding at the end of the data, the
+   occurrence of any "=" characters may be taken as evidence that the
+   end of the data has been reached (without truncation in transit). No
+   such assurance is possible, however, when the number of octets
+   transmitted was a multiple of three and no "=" characters are
+   present.
+
+6.5. Examples of Radix-64
+
+       Input data:  0x14fb9c03d97e
+       Hex:     1   4    f   b    9   c     | 0   3    d   9    7   e
+       8-bit:   00010100 11111011 10011100  | 00000011 11011001
+       11111110
+       6-bit:   000101 001111 101110 011100 | 000000 111101 100111
+       111110
+       Decimal: 5      15     46     28       0      61     37     62
+       Output:  F      P      u      c        A      9      l      +
+
+       Input data:  0x14fb9c03d9
+       Hex:     1   4    f   b    9   c     | 0   3    d   9
+       8-bit:   00010100 11111011 10011100  | 00000011 11011001
+                                                       pad with 00
+       6-bit:   000101 001111 101110 011100 | 000000 111101 100100
+       Decimal: 5      15     46     28       0      61     36
+                                                          pad with =
+       Output:  F      P      u      c        A      9      k      =
+
+       Input data:  0x14fb9c03
+       Hex:     1   4    f   b    9   c     | 0   3
+       8-bit:   00010100 11111011 10011100  | 00000011
+                                              pad with 0000
+       6-bit:   000101 001111 101110 011100 | 000000 110000
+       Decimal: 5      15     46     28       0      48
+                                                   pad with =      =
+       Output:  F      P      u      c        A      w      =      =
+
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 46]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+6.6. Example of an ASCII Armored Message
+
+
+  -----BEGIN PGP MESSAGE-----
+  Version: OpenPrivacy 0.99
+
+  yDgBO22WxBHv7O8X7O/jygAEzol56iUKiXmV+XmpCtmpqQUKiQrFqclFqUDBovzS
+  vBSFjNSiVHsuAA==
+  =njUN
+  -----END PGP MESSAGE-----
+
+   Note that this example is indented by two spaces.
+
+7. Cleartext signature framework
+
+   It is desirable to sign a textual octet stream without ASCII armoring
+   the stream itself, so the signed text is still readable without
+   special software. In order to bind a signature to such a cleartext,
+   this framework is used.  (Note that RFC 2015 defines another way to
+   clear sign messages for environments that support MIME.)
+
+   The cleartext signed message consists of:
+
+     - The cleartext header '-----BEGIN PGP SIGNED MESSAGE-----' on a
+       single line,
+
+     - One or more "Hash" Armor Headers,
+
+     - Exactly one empty line not included into the message digest,
+
+     - The dash-escaped cleartext that is included into the message
+       digest,
+
+     - The ASCII armored signature(s) including the '-----BEGIN PGP
+       SIGNATURE-----' Armor Header and Armor Tail Lines.
+
+   If the "Hash" armor header is given, the specified message digest
+   algorithm is used for the signature. If there are no such headers,
+   MD5 is used, an implementation MAY omit them for V2.x compatibility.
+   If more than one message digest is used in the signature, the "Hash"
+   armor header contains a comma-delimited list of used message digests.
+
+   Current message digest names are described below with the algorithm
+   IDs.
+
+7.1. Dash-Escaped Text
+
+   The cleartext content of the message must also be dash-escaped.
+
+
+
+Callas, et. al.             Standards Track                    [Page 47]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   Dash escaped cleartext is the ordinary cleartext where every line
+   starting with a dash '-' (0x2D) is prefixed by the sequence dash '-'
+   (0x2D) and space ' ' (0x20). This prevents the parser from
+   recognizing armor headers of the cleartext itself. The message digest
+   is computed using the cleartext itself, not the dash escaped form.
+
+   As with binary signatures on text documents, a cleartext signature is
+   calculated on the text using canonical <CR><LF> line endings.  The
+   line ending (i.e. the <CR><LF>) before the '-----BEGIN PGP
+   SIGNATURE-----' line that terminates the signed text is not
+   considered part of the signed text.
+
+   Also, any trailing whitespace (spaces, and tabs, 0x09) at the end of
+   any line is ignored when the cleartext signature is calculated.
+
+8. Regular Expressions
+
+   A regular expression is zero or more branches, separated by '|'. It
+   matches anything that matches one of the branches.
+
+   A branch is zero or more pieces, concatenated. It matches a match for
+   the first, followed by a match for the second, etc.
+
+   A piece is an atom possibly followed by '*', '+', or '?'. An atom
+   followed by '*' matches a sequence of 0 or more matches of the atom.
+   An atom followed by '+' matches a sequence of 1 or more matches of
+   the atom. An atom followed by '?' matches a match of the atom, or the
+   null string.
+
+   An atom is a regular expression in parentheses (matching a match for
+   the regular expression), a range (see below), '.' (matching any
+   single character), '^' (matching the null string at the beginning of
+   the input string), '$' (matching the null string at the end of the
+   input string), a '\' followed by a single character (matching that
+   character), or a single character with no other significance
+   (matching that character).
+
+   A range is a sequence of characters enclosed in '[]'. It normally
+   matches any single character from the sequence. If the sequence
+   begins with '^', it matches any single character not from the rest of
+   the sequence. If two characters in the sequence are separated by '-',
+   this is shorthand for the full list of ASCII characters between them
+   (e.g. '[0-9]' matches any decimal digit). To include a literal ']' in
+   the sequence, make it the first character (following a possible '^').
+   To include a literal '-', make it the first or last character.
+
+
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 48]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+9. Constants
+
+   This section describes the constants used in OpenPGP.
+
+   Note that these tables are not exhaustive lists; an implementation
+   MAY implement an algorithm not on these lists.
+
+   See the section "Notes on Algorithms" below for more discussion of
+   the algorithms.
+
+9.1. Public Key Algorithms
+
+       ID           Algorithm
+       --           ---------
+       1          - RSA (Encrypt or Sign)
+       2          - RSA Encrypt-Only
+       3          - RSA Sign-Only
+       16         - Elgamal (Encrypt-Only), see [ELGAMAL]
+       17         - DSA (Digital Signature Standard)
+       18         - Reserved for Elliptic Curve
+       19         - Reserved for ECDSA
+       20         - Elgamal (Encrypt or Sign)
+
+
+
+
+
+       21         - Reserved for Diffie-Hellman (X9.42,
+                    as defined for IETF-S/MIME)
+       100 to 110 - Private/Experimental algorithm.
+
+   Implementations MUST implement DSA for signatures, and Elgamal for
+   encryption. Implementations SHOULD implement RSA keys.
+   Implementations MAY implement any other algorithm.
+
+9.2. Symmetric Key Algorithms
+
+       ID           Algorithm
+       --           ---------
+       0          - Plaintext or unencrypted data
+       1          - IDEA [IDEA]
+       2          - Triple-DES (DES-EDE, as per spec -
+                    168 bit key derived from 192)
+       3          - CAST5 (128 bit key, as per RFC 2144)
+       4          - Blowfish (128 bit key, 16 rounds) [BLOWFISH]
+       5          - SAFER-SK128 (13 rounds) [SAFER]
+       6          - Reserved for DES/SK
+       7          - Reserved for AES with 128-bit key
+
+
+
+Callas, et. al.             Standards Track                    [Page 49]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+       8          - Reserved for AES with 192-bit key
+       9          - Reserved for AES with 256-bit key
+       100 to 110 - Private/Experimental algorithm.
+
+   Implementations MUST implement Triple-DES. Implementations SHOULD
+   implement IDEA and CAST5.Implementations MAY implement any other
+   algorithm.
+
+9.3. Compression Algorithms
+
+       ID           Algorithm
+       --           ---------
+       0          - Uncompressed
+       1          - ZIP (RFC 1951)
+       2          - ZLIB (RFC 1950)
+       100 to 110 - Private/Experimental algorithm.
+
+   Implementations MUST implement uncompressed data. Implementations
+   SHOULD implement ZIP. Implementations MAY implement ZLIB.
+
+9.4. Hash Algorithms
+
+       ID           Algorithm                              Text Name
+       --           ---------                              ---- ----
+       1          - MD5                                    "MD5"
+       2          - SHA-1                                  "SHA1"
+       3          - RIPE-MD/160                            "RIPEMD160"
+       4          - Reserved for double-width SHA (experimental)
+       5          - MD2                                    "MD2"
+       6          - Reserved for TIGER/192                 "TIGER192"
+       7          - Reserved for HAVAL (5 pass, 160-bit)
+       "HAVAL-5-160"
+       100 to 110 - Private/Experimental algorithm.
+
+   Implementations MUST implement SHA-1. Implementations SHOULD
+   implement MD5.
+
+10. Packet Composition
+
+   OpenPGP packets are assembled into sequences in order to create
+   messages and to transfer keys.  Not all possible packet sequences are
+   meaningful and correct.  This describes the rules for how packets
+   should be placed into sequences.
+
+10.1. Transferable Public Keys
+
+   OpenPGP users may transfer public keys. The essential elements of a
+   transferable public key are:
+
+
+
+Callas, et. al.             Standards Track                    [Page 50]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+     - One Public Key packet
+
+     - Zero or more revocation signatures
+
+     - One or more User ID packets
+
+     - After each User ID packet, zero or more signature packets
+       (certifications)
+
+     - Zero or more Subkey packets
+
+     - After each Subkey packet, one signature packet, optionally a
+       revocation.
+
+   The Public Key packet occurs first.  Each of the following User ID
+   packets provides the identity of the owner of this public key.  If
+   there are multiple User ID packets, this corresponds to multiple
+   means of identifying the same unique individual user; for example, a
+   user may have more than one email address, and construct a User ID
+   for each one.
+
+   Immediately following each User ID packet, there are zero or more
+   signature packets. Each signature packet is calculated on the
+   immediately preceding User ID packet and the initial Public Key
+   packet. The signature serves to certify the corresponding public key
+   and user ID.  In effect, the signer is testifying to his or her
+   belief that this public key belongs to the user identified by this
+   user ID.
+
+   After the User ID packets there may be one or more Subkey packets.
+   In general, subkeys are provided in cases where the top-level public
+   key is a signature-only key.  However, any V4 key may have subkeys,
+   and the subkeys may be encryption-only keys, signature-only keys, or
+   general-purpose keys.
+
+   Each Subkey packet must be followed by one Signature packet, which
+   should be a subkey binding signature issued by the top level key.
+
+   Subkey and Key packets may each be followed by a revocation Signature
+   packet to indicate that the key is revoked.  Revocation signatures
+   are only accepted if they are issued by the key itself, or by a key
+   that is authorized to issue revocations via a revocation key
+   subpacket in a self-signature by the top level key.
+
+   Transferable public key packet sequences may be concatenated to allow
+   transferring multiple public keys in one operation.
+
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 51]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+10.2. OpenPGP Messages
+
+   An OpenPGP message is a packet or sequence of packets that
+   corresponds to the following grammatical rules (comma represents
+   sequential composition, and vertical bar separates alternatives):
+
+   OpenPGP Message :- Encrypted Message | Signed Message |
+                      Compressed Message | Literal Message.
+
+   Compressed Message :- Compressed Data Packet.
+
+   Literal Message :- Literal Data Packet.
+
+   ESK :- Public Key Encrypted Session Key Packet |
+          Symmetric-Key Encrypted Session Key Packet.
+
+   ESK Sequence :- ESK | ESK Sequence, ESK.
+
+   Encrypted Message :- Symmetrically Encrypted Data Packet |
+               ESK Sequence, Symmetrically Encrypted Data Packet.
+
+   One-Pass Signed Message :- One-Pass Signature Packet,
+               OpenPGP Message, Corresponding Signature Packet.
+
+   Signed Message :- Signature Packet, OpenPGP Message |
+               One-Pass Signed Message.
+
+   In addition, decrypting a Symmetrically Encrypted Data packet and
+
+   decompressing a Compressed Data packet must yield a valid OpenPGP
+   Message.
+
+10.3. Detached Signatures
+
+   Some OpenPGP applications use so-called "detached signatures." For
+   example, a program bundle may contain a file, and with it a second
+   file that is a detached signature of the first file. These detached
+   signatures are simply a signature packet stored separately from the
+   data that they are a signature of.
+
+11. Enhanced Key Formats
+
+11.1. Key Structures
+
+   The format of an OpenPGP V3 key is as follows.  Entries in square
+   brackets are optional and ellipses indicate repetition.
+
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 52]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+           RSA Public Key
+              [Revocation Self Signature]
+               User ID [Signature ...]
+              [User ID [Signature ...] ...]
+
+   Each signature certifies the RSA public key and the preceding user
+   ID. The RSA public key can have many user IDs and each user ID can
+   have many signatures.
+
+   The format of an OpenPGP V4 key that uses two public keys is similar
+   except that the other keys are added to the end as 'subkeys' of the
+   primary key.
+
+           Primary-Key
+              [Revocation Self Signature]
+              [Direct Key Self Signature...]
+               User ID [Signature ...]
+              [User ID [Signature ...] ...]
+              [[Subkey [Binding-Signature-Revocation]
+                      Primary-Key-Binding-Signature] ...]
+
+   A subkey always has a single signature after it that is issued using
+   the primary key to tie the two keys together.  This binding signature
+   may be in either V3 or V4 format, but V4 is preferred, of course.
+
+   In the above diagram, if the binding signature of a subkey has been
+   revoked, the revoked binding signature may be removed, leaving only
+   one signature.
+
+   In a key that has a main key and subkeys, the primary key MUST be a
+   key capable of signing. The subkeys may be keys of any other type.
+   There may be other constructions of V4 keys, too. For example, there
+   may be a single-key RSA key in V4 format, a DSA primary key with an
+   RSA encryption key, or RSA primary key with an Elgamal subkey, etc.
+
+   It is also possible to have a signature-only subkey. This permits a
+   primary key that collects certifications (key signatures) but is used
+   only used for certifying subkeys that are used for encryption and
+   signatures.
+
+11.2. Key IDs and Fingerprints
+
+   For a V3 key, the eight-octet key ID consists of the low 64 bits of
+   the public modulus of the RSA key.
+
+   The fingerprint of a V3 key is formed by hashing the body (but not
+   the two-octet length) of the MPIs that form the key material (public
+   modulus n, followed by exponent e) with MD5.
+
+
+
+Callas, et. al.             Standards Track                    [Page 53]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   A V4 fingerprint is the 160-bit SHA-1 hash of the one-octet Packet
+   Tag, followed by the two-octet packet length, followed by the entire
+   Public Key packet starting with the version field.  The key ID is the
+   low order 64 bits of the fingerprint.  Here are the fields of the
+   hash material, with the example of a DSA key:
+
+  a.1) 0x99 (1 octet)
+
+  a.2) high order length octet of (b)-(f) (1 octet)
+
+  a.3) low order length octet of (b)-(f) (1 octet)
+
+    b) version number = 4 (1 octet);
+
+    c) time stamp of key creation (4 octets);
+
+    d) algorithm (1 octet): 17 = DSA (example);
+
+    e) Algorithm specific fields.
+
+   Algorithm Specific Fields for DSA keys (example):
+
+  e.1) MPI of DSA prime p;
+
+  e.2) MPI of DSA group order q (q is a prime divisor of p-1);
+
+  e.3) MPI of DSA group generator g;
+
+  e.4) MPI of DSA public key value y (= g**x where x is secret).
+
+   Note that it is possible for there to be collisions of key IDs -- two
+   different keys with the same key ID. Note that there is a much
+   smaller, but still non-zero probability that two different keys have
+   the same fingerprint.
+
+   Also note that if V3 and V4 format keys share the same RSA key
+   material, they will have different key ids as well as different
+   fingerprints.
+
+12. Notes on Algorithms
+
+12.1. Symmetric Algorithm Preferences
+
+   The symmetric algorithm preference is an ordered list of algorithms
+   that the keyholder accepts. Since it is found on a self-signature, it
+   is possible that a keyholder may have different preferences. For
+   example, Alice may have TripleDES only specified for "alice@work.com"
+   but CAST5, Blowfish, and TripleDES specified for "alice@home.org".
+
+
+
+Callas, et. al.             Standards Track                    [Page 54]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   Note that it is also possible for preferences to be in a subkey's
+   binding signature.
+
+   Since TripleDES is the MUST-implement algorithm, if it is not
+   explicitly in the list, it is tacitly at the end. However, it is good
+   form to place it there explicitly. Note also that if an
+   implementation does not implement the preference, then it is
+   implicitly a TripleDES-only implementation.
+
+   An implementation MUST not use a symmetric algorithm that is not in
+   the recipient's preference list. When encrypting to more than one
+   recipient, the implementation finds a suitable algorithm by taking
+   the intersection of the preferences of the recipients. Note that the
+   MUST-implement algorithm, TripleDES, ensures that the intersection is
+   not null. The implementation may use any mechanism to pick an
+   algorithm in the intersection.
+
+   If an implementation can decrypt a message that a keyholder doesn't
+   have in their preferences, the implementation SHOULD decrypt the
+   message anyway, but MUST warn the keyholder than protocol has been
+   violated. (For example, suppose that Alice, above, has software that
+   implements all algorithms in this specification. Nonetheless, she
+   prefers subsets for work or home. If she is sent a message encrypted
+   with IDEA, which is not in her preferences, the software warns her
+   that someone sent her an IDEA-encrypted message, but it would ideally
+   decrypt it anyway.)
+
+   An implementation that is striving for backward compatibility MAY
+   consider a V3 key with a V3 self-signature to be an implicit
+   preference for IDEA, and no ability to do TripleDES. This is
+   technically non-compliant, but an implementation MAY violate the
+   above rule in this case only and use IDEA to encrypt the message,
+   provided that the message creator is warned. Ideally, though, the
+   implementation would follow the rule by actually generating two
+   messages, because it is possible that the OpenPGP user's
+   implementation does not have IDEA, and thus could not read the
+   message. Consequently, an implementation MAY, but SHOULD NOT use IDEA
+   in an algorithm conflict with a V3 key.
+
+12.2. Other Algorithm Preferences
+
+   Other algorithm preferences work similarly to the symmetric algorithm
+   preference, in that they specify which algorithms the keyholder
+   accepts. There are two interesting cases that other comments need to
+   be made about, though, the compression preferences and the hash
+   preferences.
+
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 55]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+12.2.1. Compression Preferences
+
+   Compression has been an integral part of PGP since its first days.
+   OpenPGP and all previous versions of PGP have offered compression.
+   And in this specification, the default is for messages to be
+   compressed, although an implementation is not required to do so.
+   Consequently, the compression preference gives a way for a keyholder
+   to request that messages not be compressed, presumably because they
+   are using a minimal implementation that does not include compression.
+   Additionally, this gives a keyholder a way to state that it can
+   support alternate algorithms.
+
+   Like the algorithm preferences, an implementation MUST NOT use an
+   algorithm that is not in the preference vector. If the preferences
+   are not present, then they are assumed to be [ZIP(1),
+   UNCOMPRESSED(0)].
+
+12.2.2. Hash Algorithm Preferences
+
+   Typically, the choice of a hash algorithm is something the signer
+   does, rather than the verifier, because a signer does not typically
+   know who is going to be verifying the signature. This preference,
+   though, allows a protocol based upon digital signatures ease in
+   negotiation.
+
+   Thus, if Alice is authenticating herself to Bob with a signature, it
+   makes sense for her to use a hash algorithm that Bob's software uses.
+   This preference allows Bob to state in his key which algorithms Alice
+   may use.
+
+12.3. Plaintext
+
+   Algorithm 0, "plaintext", may only be used to denote secret keys that
+   are stored in the clear. Implementations must not use plaintext in
+   Symmetrically Encrypted Data Packets; they must use Literal Data
+   Packets to encode unencrypted or literal data.
+
+12.4. RSA
+
+   There are algorithm types for RSA-signature-only, and RSA-encrypt-
+   only keys. These types are deprecated. The "key flags" subpacket in a
+   signature is a much better way to express the same idea, and
+   generalizes it to all algorithms. An implementation SHOULD NOT create
+   such a key, but MAY interpret it.
+
+   An implementation SHOULD NOT implement RSA keys of size less than 768
+   bits.
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 56]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   It is permissible for an implementation to support RSA merely for
+   backward compatibility; for example, such an implementation would
+   support V3 keys with IDEA symmetric cryptography. Note that this is
+   an exception to the other MUST-implement rules. An implementation
+   that supports RSA in V4 keys MUST implement the MUST-implement
+   features.
+
+12.5. Elgamal
+
+   If an Elgamal key is to be used for both signing and encryption,
+   extra care must be taken in creating the key.
+
+   An ElGamal key consists of a generator g, a prime modulus p, a secret
+   exponent x, and a public value y = g^x mod p.
+
+   The generator and prime must be chosen so that solving the discrete
+   log problem is intractable.  The group g should generate the
+   multiplicative group mod p-1 or a large subgroup of it, and the order
+   of g should have at least one large prime factor.  A good choice is
+   to use a "strong" Sophie-Germain prime in choosing p, so that both p
+   and (p-1)/2 are primes. In fact, this choice is so good that
+   implementors SHOULD do it, as it avoids a small subgroup attack.
+
+   In addition, a result of Bleichenbacher [BLEICHENBACHER] shows that
+   if the generator g has only small prime factors, and if g divides the
+   order of the group it generates, then signatures can be forged.  In
+   particular, choosing g=2 is a bad choice if the group order may be
+   even. On the other hand, a generator of 2 is a fine choice for an
+   encryption-only key, as this will make the encryption faster.
+
+   While verifying Elgamal signatures, note that it is important to test
+   that r and s are less than p.  If this test is not done then
+   signatures can be trivially forged by using large r values of
+   approximately twice the length of p.  This attack is also discussed
+   in the Bleichenbacher paper.
+
+   Details on safe use of Elgamal signatures may be found in [MENEZES],
+   which discusses all the weaknesses described above.
+
+   If an implementation allows Elgamal signatures, then it MUST use the
+   algorithm identifier 20 for an Elgamal public key that can sign.
+
+   An implementation SHOULD NOT implement Elgamal keys of size less than
+   768 bits. For long-term security, Elgamal keys should be 1024 bits or
+   longer.
+
+
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 57]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+12.6. DSA
+
+   An implementation SHOULD NOT implement DSA keys of size less than 768
+   bits. Note that present DSA is limited to a maximum of 1024 bit keys,
+   which are recommended for long-term use.
+
+12.7. Reserved Algorithm Numbers
+
+   A number of algorithm IDs have been reserved for algorithms that
+   would be useful to use in an OpenPGP implementation, yet there are
+   issues that prevent an implementor from actually implementing the
+   algorithm. These are marked in the Public Algorithms section as
+   "(reserved for)".
+
+   The reserved public key algorithms, Elliptic Curve (18), ECDSA (19),
+   and X9.42 (21) do not have the necessary parameters, parameter order,
+   or semantics defined.
+
+   The reserved symmetric key algorithm, DES/SK (6), does not have
+   semantics defined.
+
+   The reserved hash algorithms, TIGER192 (6), and HAVAL-5-160 (7), do
+   not have OIDs. The reserved algorithm number 4, reserved for a
+   double-width variant of SHA1, is not presently defined.
+
+   We have reserver three algorithm IDs for the US NIST's Advanced
+   Encryption Standard. This algorithm will work with (at least) 128,
+   192, and 256-bit keys. We expect that this algorithm will be selected
+   from the candidate algorithms in the year 2000.
+
+12.8. OpenPGP CFB mode
+
+   OpenPGP does symmetric encryption using a variant of Cipher Feedback
+   Mode (CFB mode). This section describes the procedure it uses in
+   detail. This mode is what is used for Symmetrically Encrypted Data
+   Packets; the mechanism used for encrypting secret key material is
+   similar, but described in those sections above.
+
+   OpenPGP CFB mode uses an initialization vector (IV) of all zeros, and
+   prefixes the plaintext with ten octets of random data, such that
+   octets 9 and 10 match octets 7 and 8.  It does a CFB "resync" after
+   encrypting those ten octets.
+
+   Note that for an algorithm that has a larger block size than 64 bits,
+   the equivalent function will be done with that entire block.  For
+   example, a 16-octet block algorithm would operate on 16 octets, and
+   then produce two octets of check, and then work on 16-octet blocks.
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 58]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   Step by step, here is the procedure:
+
+   1.  The feedback register (FR) is set to the IV, which is all zeros.
+
+   2.  FR is encrypted to produce FRE (FR Encrypted).  This is the
+       encryption of an all-zero value.
+
+   3.  FRE is xored with the first 8 octets of random data prefixed to
+       the plaintext to produce C1-C8, the first 8 octets of ciphertext.
+
+   4.  FR is loaded with C1-C8.
+
+   5.  FR is encrypted to produce FRE, the encryption of the first 8
+       octets of ciphertext.
+
+   6.  The left two octets of FRE get xored with the next two octets of
+       data that were prefixed to the plaintext.  This produces C9-C10,
+       the next two octets of ciphertext.
+
+   7.  (The resync step) FR is loaded with C3-C10.
+
+   8.  FR is encrypted to produce FRE.
+
+   9.  FRE is xored with the first 8 octets of the given plaintext, now
+       that we have finished encrypting the 10 octets of prefixed data.
+       This produces C11-C18, the next 8 octets of ciphertext.
+
+   10.  FR is loaded with C11-C18
+
+   11.  FR is encrypted to produce FRE.
+
+   12.  FRE is xored with the next 8 octets of plaintext, to produce the
+       next 8 octets of ciphertext.  These are loaded into FR and the
+       process is repeated until the plaintext is used up.
+
+13. Security Considerations
+
+   As with any technology involving cryptography, you should check the
+   current literature to determine if any algorithms used here have been
+   found to be vulnerable to attack.
+
+   This specification uses Public Key Cryptography technologies.
+   Possession of the private key portion of a public-private key pair is
+   assumed to be controlled by the proper party or parties.
+
+   Certain operations in this specification involve the use of random
+   numbers.  An appropriate entropy source should be used to generate
+   these numbers.  See RFC 1750.
+
+
+
+Callas, et. al.             Standards Track                    [Page 59]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   The MD5 hash algorithm has been found to have weaknesses (pseudo-
+   collisions in the compress function) that make some people deprecate
+   its use.  They consider the SHA-1 algorithm better.
+
+   Many security protocol designers think that it is a bad idea to use a
+   single key for both privacy (encryption) and integrity (signatures).
+   In fact, this was one of the motivating forces behind the V4 key
+   format with separate signature and encryption keys. If you as an
+   implementor promote dual-use keys, you should at least be aware of
+   this controversy.
+
+   The DSA algorithm will work with any 160-bit hash, but it is
+   sensitive to the quality of the hash algorithm, if the hash algorithm
+   is broken, it can leak the secret key. The Digital Signature Standard
+   (DSS) specifies that DSA be used with SHA-1.  RIPEMD-160 is
+   considered by many cryptographers to be as strong. An implementation
+   should take care which hash algorithms are used with DSA, as a weak
+   hash can not only allow a signature to be forged, but could leak the
+   secret key. These same considerations about the quality of the hash
+   algorithm apply to Elgamal signatures.
+
+   If you are building an authentication system, the recipient may
+   specify a preferred signing algorithm. However, the signer would be
+   foolish to use a weak algorithm simply because the recipient requests
+   it.
+
+   Some of the encryption algorithms mentioned in this document have
+   been analyzed less than others.  For example, although CAST5 is
+   presently considered strong, it has been analyzed less than Triple-
+   DES. Other algorithms may have other controversies surrounding them.
+
+   Some technologies mentioned here may be subject to government control
+   in some countries.
+
+14. Implementation Nits
+
+   This section is a collection of comments to help an implementer,
+   particularly with an eye to backward compatibility. Previous
+   implementations of PGP are not OpenPGP-compliant. Often the
+   differences are small, but small differences are frequently more
+   vexing than large differences. Thus, this list of potential problems
+   and gotchas for a developer who is trying to be backward-compatible.
+
+     * PGP 5.x does not accept V4 signatures for anything other than
+       key material.
+
+     * PGP 5.x does not recognize the "five-octet" lengths in new-format
+       headers or in signature subpacket lengths.
+
+
+
+Callas, et. al.             Standards Track                    [Page 60]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+     * PGP 5.0 rejects an encrypted session key if the keylength differs
+       from the S2K symmetric algorithm. This is a bug in its validation
+       function.
+
+     * PGP 5.0 does not handle multiple one-pass signature headers and
+       trailers. Signing one will compress the one-pass signed literal
+       and prefix a V3 signature instead of doing a nested one-pass
+       signature.
+
+     * When exporting a private key, PGP 2.x generates the header "BEGIN
+       PGP SECRET KEY BLOCK" instead of "BEGIN PGP PRIVATE KEY BLOCK".
+       All previous versions ignore the implied data type, and look
+       directly at the packet data type.
+
+     * In a clear-signed signature, PGP 5.0 will figure out the correct
+       hash algorithm if there is no "Hash:" header, but it will reject
+       a mismatch between the header and the actual algorithm used. The
+       "standard" (i.e. Zimmermann/Finney/et al.) version of PGP 2.x
+       rejects the "Hash:" header and assumes MD5. There are a number of
+       enhanced variants of PGP 2.6.x that have been modified for SHA-1
+       signatures.
+
+     * PGP 5.0 can read an RSA key in V4 format, but can only recognize
+       it with a V3 keyid, and can properly use only a V3 format RSA
+       key.
+
+     * Neither PGP 5.x nor PGP 6.0 recognize Elgamal Encrypt and Sign
+       keys. They only handle Elgamal Encrypt-only keys.
+
+     * There are many ways possible for two keys to have the same key
+       material, but different fingerprints (and thus key ids). Perhaps
+       the most interesting is an RSA key that has been "upgraded" to V4
+       format, but since a V4 fingerprint is constructed by hashing the
+       key creation time along with other things, two V4 keys created at
+       different times, yet with the same key material will have
+       different fingerprints.
+
+     * If an implementation is using zlib to interoperate with PGP 2.x,
+       then the "windowBits" parameter should be set to -13.
+
+
+
+
+
+
+
+
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 61]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+15. Authors and Working Group Chair
+
+   The working group can be contacted via the current chair:
+
+   John W. Noerenberg, II
+   Qualcomm, Inc
+   6455 Lusk Blvd
+   San Diego, CA 92131 USA
+
+   Phone: +1 619-658-3510
+   EMail: jwn2@qualcomm.com
+
+
+   The principal authors of this memo are:
+
+   Jon Callas
+   Network Associates, Inc.
+   3965 Freedom Circle
+   Santa Clara, CA 95054, USA
+
+   Phone: +1 408-346-5860
+   EMail: jon@pgp.com, jcallas@nai.com
+
+
+   Lutz Donnerhacke
+   IKS GmbH
+   Wildenbruchstr. 15
+   07745 Jena, Germany
+
+   Phone: +49-3641-675642
+   EMail: lutz@iks-jena.de
+
+
+   Hal Finney
+   Network Associates, Inc.
+   3965 Freedom Circle
+   Santa Clara, CA 95054, USA
+
+   EMail: hal@pgp.com
+
+
+   Rodney Thayer
+   EIS Corporation
+   Clearwater, FL 33767, USA
+
+   EMail: rodney@unitran.com
+
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 62]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   This memo also draws on much previous work from a number of other
+   authors who include: Derek Atkins, Charles Breed, Dave Del Torto,
+   Marc Dyksterhouse, Gail Haspert, Gene Hoffman, Paul Hoffman, Raph
+   Levien, Colin Plumb, Will Price, William Stallings, Mark Weaver, and
+   Philip R. Zimmermann.
+
+16. References
+
+   [BLEICHENBACHER] Bleichenbacher, Daniel, "Generating ElGamal
+                    signatures without knowing the secret key,"
+                    Eurocrypt 96.  Note that the version in the
+                    proceedings has an error.  A revised version is
+                    available at the time of writing from
+                    <ftp://ftp.inf.ethz.ch/pub/publications/papers/ti/isc
+                    /ElGamal.ps>
+
+   [BLOWFISH]       Schneier, B. "Description of a New Variable-Length
+                    Key, 64-Bit Block Cipher (Blowfish)" Fast Software
+                    Encryption, Cambridge Security Workshop Proceedings
+                    (December 1993), Springer-Verlag, 1994, pp191-204
+
+                    <http://www.counterpane.com/bfsverlag.html>
+
+   [DONNERHACKE]    Donnerhacke, L., et. al, "PGP263in - an improved
+                    international version of PGP", ftp://ftp.iks-
+                    jena.de/mitarb/lutz/crypt/software/pgp/
+
+   [ELGAMAL]        T. ElGamal, "A Public-Key Cryptosystem and a
+                    Signature Scheme Based on Discrete Logarithms," IEEE
+                    Transactions on Information Theory, v. IT-31, n. 4,
+                    1985, pp. 469-472.
+
+   [IDEA]           Lai, X, "On the design and security of block
+                    ciphers", ETH Series in Information Processing, J.L.
+                    Massey (editor), Vol. 1, Hartung-Gorre Verlag
+                    Knostanz, Technische Hochschule (Zurich), 1992
+
+   [ISO-10646]      ISO/IEC 10646-1:1993. International Standard --
+                    Information technology -- Universal Multiple-Octet
+                    Coded Character Set (UCS) -- Part 1: Architecture
+                    and Basic Multilingual Plane.  UTF-8 is described in
+                    Annex R, adopted but not yet published.  UTF-16 is
+                    described in Annex Q, adopted but not yet published.
+
+   [MENEZES]        Alfred Menezes, Paul van Oorschot, and Scott
+                    Vanstone, "Handbook of Applied Cryptography," CRC
+                    Press, 1996.
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 63]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+   [RFC822]         Crocker, D., "Standard for the format of ARPA
+                    Internet text messages", STD 11, RFC 822, August
+                    1982.
+
+   [RFC1423]        Balenson, D., "Privacy Enhancement for Internet
+                    Electronic Mail: Part III: Algorithms, Modes, and
+                    Identifiers", RFC 1423, October 1993.
+
+   [RFC1641]        Goldsmith, D. and M. Davis, "Using Unicode with
+                    MIME", RFC 1641, July 1994.
+
+   [RFC1750]        Eastlake, D., Crocker, S. and J. Schiller,
+                    "Randomness Recommendations for Security", RFC 1750,
+                    December 1994.
+
+   [RFC1951]        Deutsch, P., "DEFLATE Compressed Data Format
+                    Specification version 1.3.", RFC 1951, May 1996.
+
+   [RFC1983]        Malkin, G., "Internet Users' Glossary", FYI 18, RFC
+                    1983, August 1996.
+
+   [RFC1991]        Atkins, D., Stallings, W. and P. Zimmermann, "PGP
+                    Message Exchange Formats", RFC 1991, August 1996.
+
+   [RFC2015]        Elkins, M., "MIME Security with Pretty Good Privacy
+                    (PGP)", RFC 2015, October 1996.
+
+   [RFC2231]        Borenstein, N. and N. Freed, "Multipurpose Internet
+                    Mail Extensions (MIME) Part One: Format of Internet
+                    Message Bodies.", RFC 2231, November 1996.
+
+   [RFC2119]        Bradner, S., "Key words for use in RFCs to Indicate
+                    Requirement Level", BCP 14, RFC 2119, March 1997.
+
+   [RFC2144]        Adams, C., "The CAST-128 Encryption Algorithm", RFC
+                    2144, May 1997.
+
+   [RFC2279]        Yergeau., F., "UTF-8, a transformation format of
+                    Unicode and ISO 10646", RFC 2279, January 1998.
+
+   [RFC2313]        Kaliski, B., "PKCS #1: RSA Encryption Standard
+                    version 1.5", RFC 2313, March 1998.
+
+   [SAFER]          Massey, J.L. "SAFER K-64: One Year Later", B.
+                    Preneel, editor, Fast Software Encryption, Second
+                    International Workshop (LNCS 1008) pp212-241,
+                    Springer-Verlag 1995
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 64]
+
+RFC 2440                 OpenPGP Message Format            November 1998
+
+
+17.  Full Copyright Statement
+
+   Copyright (C) The Internet Society (1998).  All Rights Reserved.
+
+   This document and translations of it may be copied and furnished to
+   others, and derivative works that comment on or otherwise explain it
+   or assist in its implementation may be prepared, copied, published
+   and distributed, in whole or in part, without restriction of any
+   kind, provided that the above copyright notice and this paragraph are
+   included on all such copies and derivative works.  However, this
+   document itself may not be modified in any way, such as by removing
+   the copyright notice or references to the Internet Society or other
+   Internet organizations, except as needed for the purpose of
+   developing Internet standards in which case the procedures for
+   copyrights defined in the Internet Standards process must be
+   followed, or as required to translate it into languages other than
+   English.
+
+   The limited permissions granted above are perpetual and will not be
+   revoked by the Internet Society or its successors or assigns.
+
+   This document and the information contained herein is provided on an
+   "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
+   TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+   BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
+   HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
+   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Callas, et. al.             Standards Track                    [Page 65]
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2487.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2487.txt
new file mode 100644
index 000000000..fb1305f00
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2487.txt
@@ -0,0 +1,451 @@
+
+
+
+
+
+
+Network Working Group                                     P. Hoffman
+Request for Comments: 2487                  Internet Mail Consortium
+Category: Standards Track                               January 1999
+
+
+            SMTP Service Extension for Secure SMTP over TLS
+
+Status of this Memo
+
+   This document specifies an Internet standards track protocol for the
+   Internet community, and requests discussion and suggestions for
+   improvements.  Please refer to the current edition of the "Internet
+   Official Protocol Standards" (STD 1) for the standardization state
+   and status of this protocol.  Distribution of this memo is unlimited.
+
+Copyright Notice
+
+   Copyright (C) The Internet Society (1999).  All Rights Reserved.
+
+1. Abstract
+
+   This document describes an extension to the SMTP service that allows
+   an SMTP server and client to use transport-layer security to provide
+   private, authenticated communication over the Internet. This gives
+   SMTP agents the ability to protect some or all of their
+   communications from eavesdroppers and attackers.
+
+2. Introduction
+
+   SMTP [RFC-821] servers and clients normally communicate in the clear
+   over the Internet. In many cases, this communication goes through one
+   or more router that is not controlled or trusted by either entity.
+   Such an untrusted router might allow a third party to monitor or
+   alter the communications between the server and client.
+
+   Further, there is often a desire for two SMTP agents to be able to
+   authenticate each others' identities. For example, a secure SMTP
+   server might only allow communications from other SMTP agents it
+   knows, or it might act differently for messages received from an
+   agent it knows than from one it doesn't know.
+
+   TLS [TLS], more commonly known as SSL, is a popular mechanism for
+   enhancing TCP communications with privacy and authentication. TLS is
+   in wide use with the HTTP protocol, and is also being used for adding
+   security to many other common protocols that run over TCP.
+
+
+
+
+
+
+Hoffman                     Standards Track                     [Page 1]
+
+RFC 2487                 SMTP Service Extension             January 1999
+
+
+2.1 Terminology
+
+   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
+   "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
+   document are to be interpreted as described in [RFC-2119].
+
+3. STARTTLS Extension
+
+   The STARTTLS extension to SMTP is laid out as follows:
+
+   (1) the name of the SMTP service defined here is STARTTLS;
+
+   (2) the EHLO keyword value associated with the extension is STARTTLS;
+
+   (3) the STARTTLS keyword has no parameters;
+
+   (4) a new SMTP verb, "STARTTLS", is defined;
+
+   (5) no additional parameters are added to any SMTP command.
+
+4. The STARTTLS Keyword
+
+   The STARTTLS keyword is used to tell the SMTP client that the SMTP
+   server allows use of TLS. It takes no parameters.
+
+5. The STARTTLS Command
+
+   The format for the STARTTLS command is:
+
+   STARTTLS
+
+   with no parameters.
+
+   After the client gives the STARTTLS command, the server responds with
+   one of the following reply codes:
+
+   220 Ready to start TLS
+   501 Syntax error (no parameters allowed)
+   454 TLS not available due to temporary reason
+
+   A publicly-referenced SMTP server MUST NOT require use of the
+   STARTTLS extension in order to deliver mail locally. This rule
+   prevents the STARTTLS extension from damaging the interoperability of
+   the Internet's SMTP infrastructure. A publicly-referenced SMTP server
+   is an SMTP server which runs on port 25 of an Internet host listed in
+   the MX record (or A record if an MX record is not present) for the
+   domain name on the right hand side of an Internet mail address.
+
+
+
+
+Hoffman                     Standards Track                     [Page 2]
+
+RFC 2487                 SMTP Service Extension             January 1999
+
+
+   Any SMTP server may refuse to accept messages for relay based on
+   authentication supplied during the TLS negotiation. An SMTP server
+   that is not publicly referenced may refuse to accept any messages for
+   relay or local delivery based on authentication supplied during the
+   TLS negotiation.
+
+   A SMTP server that is not publicly referenced may choose to require
+   that the client perform a TLS negotiation before accepting any
+   commands. In this case, the server SHOULD return the reply code:
+
+   530 Must issue a STARTTLS command first
+
+   to every command other than NOOP, EHLO, STARTTLS, or QUIT. If the
+   client and server are using the ENHANCEDSTATUSCODES ESMTP extension
+   [RFC-2034], the status code to be returned SHOULD be 5.7.0.
+
+   After receiving a 220 response to a STARTTLS command, the client
+   SHOULD start the TLS negotiation before giving any other SMTP
+   commands.
+
+   If the SMTP client is using pipelining as defined in RFC 1854, the
+   STARTTLS command must be the last command in a group.
+
+5.1 Processing After the STARTTLS Command
+
+   After the TLS handshake has been completed, both parties MUST
+   immediately decide whether or not to continue based on the
+   authentication and privacy achieved. The SMTP client and server may
+   decide to move ahead even if the TLS negotiation ended with no
+   authentication and/or no privacy because most SMTP services are
+   performed with no authentication and no privacy, but some SMTP
+   clients or servers may want to continue only if a particular level of
+   authentication and/or privacy was achieved.
+
+   If the SMTP client decides that the level of authentication or
+   privacy is not high enough for it to continue, it SHOULD issue an
+   SMTP QUIT command immediately after the TLS negotiation is complete.
+   If the SMTP server decides that the level of authentication or
+   privacy is not high enough for it to continue, it SHOULD reply to
+   every SMTP command from the client (other than a QUIT command) with
+   the 554 reply code (with a possible text string such as "Command
+   refused due to lack of security").
+
+   The decision of whether or not to believe the authenticity of the
+   other party in a TLS negotiation is a local matter. However, some
+   general rules for the decisions are:
+
+
+
+
+
+Hoffman                     Standards Track                     [Page 3]
+
+RFC 2487                 SMTP Service Extension             January 1999
+
+
+    - A SMTP client would probably only want to authenticate an SMTP
+      server whose server certificate has a domain name that is the
+      domain name that the client thought it was connecting to.
+    - A publicly-referenced  SMTP server would probably want to accept
+      any certificate from an SMTP client, and would possibly want to
+      put distinguishing information about the certificate in the
+      Received header of messages that were relayed or submitted from
+      the client.
+
+5.2 Result of the STARTTLS Command
+
+   Upon completion of the TLS handshake, the SMTP protocol is reset to
+   the initial state (the state in SMTP after a server issues a 220
+   service ready greeting). The server MUST discard any knowledge
+   obtained from the client, such as the argument to the EHLO command,
+   which was not obtained from the TLS negotiation itself. The client
+   MUST discard any knowledge obtained from the server, such as the list
+   of SMTP service extensions, which was not obtained from the TLS
+   negotiation itself. The client SHOULD send an EHLO command as the
+   first command after a successful TLS negotiation.
+
+   The list of SMTP service extensions returned in response to an EHLO
+   command received after the TLS handshake MAY be different than the
+   list returned before the TLS handshake. For example, an SMTP server
+   might not want to advertise support for a particular SASL mechanism
+   [SASL] unless a client has sent an appropriate client certificate
+   during a TLS handshake.
+
+   Both the client and the server MUST know if there is a TLS session
+   active.  A client MUST NOT attempt to start a TLS session if a TLS
+   session is already active. A server MUST NOT return the TLS extension
+   in response to an EHLO command received after a TLS handshake has
+   completed.
+
+6. Usage Example
+
+   The following dialog illustrates how a client and server can start a
+   TLS session:
+
+   S: <waits for connection on TCP port 25>
+   C: <opens connection>
+   S: 220 mail.imc.org SMTP service ready
+   C: EHLO mail.ietf.org
+   S: 250-mail.imc.org offers a warm hug of welcome
+   S: 250 STARTTLS
+   C: STARTTLS
+   S: 220 Go ahead
+   C: <starts TLS negotiation>
+
+
+
+Hoffman                     Standards Track                     [Page 4]
+
+RFC 2487                 SMTP Service Extension             January 1999
+
+
+   C & S: <negotiate a TLS session>
+   C & S: <check result of negotiation>
+   C: <continues by sending an SMTP command>
+   . . .
+
+7. Security Considerations
+
+   It should be noted that SMTP is not an end-to-end mechanism. Thus, if
+   an SMTP client/server pair decide to add TLS privacy, they are not
+   securing the transport from the originating mail user agent to the
+   recipient.  Further, because delivery of a single piece of mail may
+   go between more than two SMTP servers, adding TLS privacy to one pair
+   of servers does not mean that the entire SMTP chain has been made
+   private. Further, just because an SMTP server can authenticate an
+   SMTP client, it does not mean that the mail from the SMTP client was
+   authenticated by the SMTP client when the client received it.
+
+   Both the STMP client and server must check the result of the TLS
+   negotiation to see whether acceptable authentication or privacy was
+   achieved. Ignoring this step completely invalidates using TLS for
+   security.  The decision about whether acceptable authentication or
+   privacy was achieved is made locally, is implementation-dependant,
+   and is beyond the scope of this document.
+
+   The SMTP client and server should note carefully the result of the
+   TLS negotiation. If the negotiation results in no privacy, or if it
+   results in privacy using algorithms or key lengths that are deemed
+   not strong enough, or if the authentication is not good enough for
+   either party, the client may choose to end the SMTP session with an
+   immediate QUIT command, or the server may choose to not accept any
+   more SMTP commands.
+
+   A server announcing in an EHLO response that it uses a particular TLS
+   protocol should not pose any security issues, since any use of TLS
+   will be at least as secure as no use of TLS.
+
+   A man-in-the-middle attack can be launched by deleting the "250
+   STARTTLS" response from the server. This would cause the client not
+   to try to start a TLS session. An SMTP client can protect against
+   this attack by recording the fact that a particular SMTP server
+   offers TLS during one session and generating an alarm if it does not
+   appear in the EHLO response for a later session. The lack of TLS
+   during a session SHOULD NOT result in the bouncing of email, although
+   it could result in delayed processing.
+
+
+
+
+
+
+
+Hoffman                     Standards Track                     [Page 5]
+
+RFC 2487                 SMTP Service Extension             January 1999
+
+
+   Before the TLS handshake has begun, any protocol interactions are
+   performed in the clear and may be modified by an active attacker. For
+   this reason, clients and servers MUST discard any knowledge obtained
+   prior to the start of the TLS handshake upon completion of the TLS
+   handshake.
+
+   The STARTTLS extension is not suitable for authenticating the author
+   of an email message unless every hop in the delivery chain, including
+   the submission to the first SMTP server, is authenticated. Another
+   proposal [SMTP-AUTH] can be used to authenticate delivery and MIME
+   security multiparts [MIME-SEC] can be used to authenticate the author
+   of an email message. In addition, the [SMTP-AUTH] proposal offers
+   simpler and more flexible options to authenticate an SMTP client and
+   the SASL EXTERNAL mechanism [SASL] MAY be used in conjunction with
+   the STARTTLS command to provide an authorization identity.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Hoffman                     Standards Track                     [Page 6]
+
+RFC 2487                 SMTP Service Extension             January 1999
+
+
+A. References
+
+   [RFC-821]   Postel, J., "Simple Mail Transfer Protocol", RFC 821,
+               August 1982.
+
+   [RFC-1869]  Klensin, J., Freed, N, Rose, M, Stefferud, E. and D.
+               Crocker, "SMTP Service Extensions", STD 10, RFC 1869,
+               November 1995.
+
+   [RFC-2034]  Freed, N., "SMTP Service Extension for Returning Enhanced
+               Error Codes", RFC 2034, October 1996.
+
+   [RFC-2119]  Bradner, S., "Key words for use in RFCs to Indicate
+               Requirement Levels", BCP 14, RFC 2119, March 1997.
+
+   [SASL]      Myers, J., "Simple Authentication and Security Layer
+               (SASL)", RFC 2222, October 1997.
+
+   [SMTP-AUTH] "SMTP Service Extension for Authentication", Work in
+               Progress.
+
+   [TLS]       Dierks, T. and C. Allen, "The TLS Protocol Version 1.0",
+               RFC 2246, January 1999.
+
+B. Author's Address
+
+   Paul Hoffman
+   Internet Mail Consortium
+   127 Segre Place
+   Santa Cruz, CA  95060
+
+   Phone: (831) 426-9827
+   EMail: phoffman@imc.org
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Hoffman                     Standards Track                     [Page 7]
+
+RFC 2487                 SMTP Service Extension             January 1999
+
+
+C.  Full Copyright Statement
+
+   Copyright (C) The Internet Society (1999).  All Rights Reserved.
+
+   This document and translations of it may be copied and furnished to
+   others, and derivative works that comment on or otherwise explain it
+   or assist in its implementation may be prepared, copied, published
+   and distributed, in whole or in part, without restriction of any
+   kind, provided that the above copyright notice and this paragraph are
+   included on all such copies and derivative works.  However, this
+   document itself may not be modified in any way, such as by removing
+   the copyright notice or references to the Internet Society or other
+   Internet organizations, except as needed for the purpose of
+   developing Internet standards in which case the procedures for
+   copyrights defined in the Internet Standards process must be
+   followed, or as required to translate it into languages other than
+   English.
+
+   The limited permissions granted above are perpetual and will not be
+   revoked by the Internet Society or its successors or assigns.
+
+   This document and the information contained herein is provided on an
+   "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
+   TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+   BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
+   HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
+   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Hoffman                     Standards Track                     [Page 8]
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2554.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2554.txt
new file mode 100644
index 000000000..2922deaee
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2554.txt
@@ -0,0 +1,619 @@
+
+
+
+
+
+
+Network Working Group                                           J. Myers
+Request for Comments: 2554                       Netscape Communications
+Category: Standards Track                                     March 1999
+
+
+                         SMTP Service Extension
+                           for Authentication
+
+Status of this Memo
+
+   This document specifies an Internet standards track protocol for the
+   Internet community, and requests discussion and suggestions for
+   improvements.  Please refer to the current edition of the "Internet
+   Official Protocol Standards" (STD 1) for the standardization state
+   and status of this protocol.  Distribution of this memo is unlimited.
+
+Copyright Notice
+
+   Copyright (C) The Internet Society (1999).  All Rights Reserved.
+
+
+1. Introduction
+
+   This document defines an SMTP service extension [ESMTP] whereby an
+   SMTP client may indicate an authentication mechanism to the server,
+   perform an authentication protocol exchange, and optionally negotiate
+   a security layer for subsequent protocol interactions.  This
+   extension is a profile of the Simple Authentication and Security
+   Layer [SASL].
+
+
+2. Conventions Used in this Document
+
+   In examples, "C:" and "S:" indicate lines sent by the client and
+   server respectively.
+
+   The key words "MUST", "MUST NOT", "SHOULD", "SHOULD NOT", and "MAY"
+   in this document are to be interpreted as defined in "Key words for
+   use in RFCs to Indicate Requirement Levels" [KEYWORDS].
+
+
+3. The Authentication service extension
+
+
+   (1) the name of the SMTP service extension is "Authentication"
+
+   (2) the EHLO keyword value associated with this extension is "AUTH"
+
+
+
+
+Myers                       Standards Track                     [Page 1]
+
+RFC 2554                  SMTP Authentication                 March 1999
+
+
+   (3) The AUTH EHLO keyword contains as a parameter a space separated
+       list of the names of supported SASL mechanisms.
+
+   (4) a new SMTP verb "AUTH" is defined
+
+   (5) an optional parameter using the keyword "AUTH" is added to the
+       MAIL FROM command, and extends the maximum line length of the
+       MAIL FROM command by 500 characters.
+
+   (6) this extension is appropriate for the submission protocol
+       [SUBMIT].
+
+
+4. The AUTH command
+
+   AUTH mechanism [initial-response]
+
+     Arguments:
+         a string identifying a SASL authentication mechanism.
+         an optional base64-encoded response
+
+     Restrictions:
+         After an AUTH command has successfully completed, no more AUTH
+         commands may be issued in the same session.  After a successful
+         AUTH command completes, a server MUST reject any further AUTH
+         commands with a 503 reply.
+
+         The AUTH command is not permitted during a mail transaction.
+
+     Discussion:
+         The AUTH command indicates an authentication mechanism to the
+         server.  If the server supports the requested authentication
+         mechanism, it performs an authentication protocol exchange to
+         authenticate and identify the user.  Optionally, it also
+         negotiates a security layer for subsequent protocol
+         interactions.  If the requested authentication mechanism is not
+         supported, the server rejects the AUTH command with a 504
+         reply.
+
+         The authentication protocol exchange consists of a series of
+         server challenges and client answers that are specific to the
+         authentication mechanism.  A server challenge, otherwise known
+         as a ready response, is a 334 reply with the text part
+         containing a BASE64 encoded string.  The client answer consists
+         of a line containing a BASE64 encoded string.  If the client
+         wishes to cancel an authentication exchange, it issues a line
+         with a single "*".  If the server receives such an answer, it
+         MUST reject the AUTH command by sending a 501 reply.
+
+
+
+Myers                       Standards Track                     [Page 2]
+
+RFC 2554                  SMTP Authentication                 March 1999
+
+
+         The optional initial-response argument to the AUTH command is
+         used to save a round trip when using authentication mechanisms
+         that are defined to send no data in the initial challenge.
+         When the initial-response argument is used with such a
+         mechanism, the initial empty challenge is not sent to the
+         client and the server uses the data in the initial-response
+         argument as if it were sent in response to the empty challenge.
+         Unlike a zero-length client answer to a 334 reply, a zero-
+         length initial response is sent as a single equals sign ("=").
+         If the client uses an initial-response argument to the AUTH
+         command with a mechanism that sends data in the initial
+         challenge, the server rejects the AUTH command with a 535
+         reply.
+
+         If the server cannot BASE64 decode the argument, it rejects the
+         AUTH command with a 501 reply.  If the server rejects the
+         authentication data, it SHOULD reject the AUTH command with a
+         535 reply unless a more specific error code, such as one listed
+         in section 6, is appropriate.  Should the client successfully
+         complete the authentication exchange, the SMTP server issues a
+         235 reply.
+
+         The service name specified by this protocol's profile of SASL
+         is "smtp".
+
+         If a security layer is negotiated through the SASL
+         authentication exchange, it takes effect immediately following
+         the CRLF that concludes the authentication exchange for the
+         client, and the CRLF of the success reply for the server.  Upon
+         a security layer's taking effect, the SMTP protocol is reset to
+         the initial state (the state in SMTP after a server issues a
+         220 service ready greeting).  The server MUST discard any
+         knowledge obtained from the client, such as the argument to the
+         EHLO command, which was not obtained from the SASL negotiation
+         itself.  The client MUST discard any knowledge obtained from
+         the server, such as the list of SMTP service extensions, which
+         was not obtained from the SASL negotiation itself (with the
+         exception that a client MAY compare the list of advertised SASL
+         mechanisms before and after authentication in order to detect
+         an active down-negotiation attack).  The client SHOULD send an
+         EHLO command as the first command after a successful SASL
+         negotiation which results in the enabling of a security layer.
+
+         The server is not required to support any particular
+         authentication mechanism, nor are authentication mechanisms
+         required to support any security layers.  If an AUTH command
+         fails, the client may try another authentication mechanism by
+         issuing another AUTH command.
+
+
+
+Myers                       Standards Track                     [Page 3]
+
+RFC 2554                  SMTP Authentication                 March 1999
+
+
+         If an AUTH command fails, the server MUST behave the same as if
+         the client had not issued the AUTH command.
+
+         The BASE64 string may in general be arbitrarily long.  Clients
+         and servers MUST be able to support challenges and responses
+         that are as long as are generated by the authentication
+         mechanisms they support, independent of any line length
+         limitations the client or server may have in other parts of its
+         protocol implementation.
+
+     Examples:
+         S: 220 smtp.example.com ESMTP server ready
+         C: EHLO jgm.example.com
+         S: 250-smtp.example.com
+         S: 250 AUTH CRAM-MD5 DIGEST-MD5
+         C: AUTH FOOBAR
+         S: 504 Unrecognized authentication type.
+         C: AUTH CRAM-MD5
+         S: 334
+         PENCeUxFREJoU0NnbmhNWitOMjNGNndAZWx3b29kLmlubm9zb2Z0LmNvbT4=
+         C: ZnJlZCA5ZTk1YWVlMDljNDBhZjJiODRhMGMyYjNiYmFlNzg2ZQ==
+         S: 235 Authentication successful.
+
+
+
+5. The AUTH parameter to the MAIL FROM command
+
+   AUTH=addr-spec
+
+   Arguments:
+       An addr-spec containing the identity which submitted the message
+       to the delivery system, or the two character sequence "<>"
+       indicating such an identity is unknown or insufficiently
+       authenticated.  To comply with the restrictions imposed on ESMTP
+       parameters, the addr-spec is encoded inside an xtext.  The syntax
+       of an xtext is described in section 5 of [ESMTP-DSN].
+
+   Discussion:
+       The optional AUTH parameter to the MAIL FROM command allows
+       cooperating agents in a trusted environment to communicate the
+       authentication of individual messages.
+
+       If the server trusts the authenticated identity of the client to
+       assert that the message was originally submitted by the supplied
+       addr-spec, then the server SHOULD supply the same addr-spec in an
+       AUTH parameter when relaying the message to any server which
+       supports the AUTH extension.
+
+
+
+
+Myers                       Standards Track                     [Page 4]
+
+RFC 2554                  SMTP Authentication                 March 1999
+
+
+       A MAIL FROM parameter of AUTH=<> indicates that the original
+       submitter of the message is not known.  The server MUST NOT treat
+       the message as having been originally submitted by the client.
+
+       If the AUTH parameter to the MAIL FROM is not supplied, the
+       client has authenticated, and the server believes the message is
+       an original submission by the client, the server MAY supply the
+       client's identity in the addr-spec in an AUTH parameter when
+       relaying the message to any server which supports the AUTH
+       extension.
+
+       If the server does not sufficiently trust the authenticated
+       identity of the client, or if the client is not authenticated,
+       then the server MUST behave as if the AUTH=<> parameter was
+       supplied.  The server MAY, however, write the value of the AUTH
+       parameter to a log file.
+
+       If an AUTH=<> parameter was supplied, either explicitly or due to
+       the requirement in the previous paragraph, then the server MUST
+       supply the AUTH=<> parameter when relaying the message to any
+       server which it has authenticated to using the AUTH extension.
+
+       A server MAY treat expansion of a mailing list as a new
+       submission, setting the AUTH parameter to the mailing list
+       address or mailing list administration address when relaying the
+       message to list subscribers.
+
+       It is conforming for an implementation to be hard-coded to treat
+       all clients as being insufficiently trusted.  In that case, the
+       implementation does nothing more than parse and discard
+       syntactically valid AUTH parameters to the MAIL FROM command and
+       supply AUTH=<> parameters to any servers to which it
+       authenticates using the AUTH extension.
+
+   Examples:
+       C: MAIL FROM:<e=mc2@example.com> AUTH=e+3Dmc2@example.com
+       S: 250 OK
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Myers                       Standards Track                     [Page 5]
+
+RFC 2554                  SMTP Authentication                 March 1999
+
+
+6. Error Codes
+
+   The following error codes may be used to indicate various conditions
+   as described.
+
+   432 A password transition is needed
+
+   This response to the AUTH command indicates that the user needs to
+   transition to the selected authentication mechanism.  This typically
+   done by authenticating once using the PLAIN authentication mechanism.
+
+   534 Authentication mechanism is too weak
+
+   This response to the AUTH command indicates that the selected
+   authentication mechanism is weaker than server policy permits for
+   that user.
+
+   538 Encryption required for requested authentication mechanism
+
+   This response to the AUTH command indicates that the selected
+   authentication mechanism may only be used when the underlying SMTP
+   connection is encrypted.
+
+   454 Temporary authentication failure
+
+   This response to the AUTH command indicates that the authentication
+   failed due to a temporary server failure.
+
+   530 Authentication required
+
+   This response may be returned by any command other than AUTH, EHLO,
+   HELO, NOOP, RSET, or QUIT.  It indicates that server policy requires
+   authentication in order to perform the requested action.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Myers                       Standards Track                     [Page 6]
+
+RFC 2554                  SMTP Authentication                 March 1999
+
+
+7. Formal Syntax
+
+   The following syntax specification uses the augmented Backus-Naur
+   Form (BNF) notation as specified in [ABNF].
+
+   Except as noted otherwise, all alphabetic characters are case-
+   insensitive.  The use of upper or lower case characters to define
+   token strings is for editorial clarity only.  Implementations MUST
+   accept these strings in a case-insensitive fashion.
+
+   UPALPHA         = %x41-5A            ;; Uppercase: A-Z
+
+   LOALPHA         = %x61-7A            ;; Lowercase: a-z
+
+   ALPHA           = UPALPHA / LOALPHA  ;; case insensitive
+
+   DIGIT           = %x30-39            ;; Digits 0-9
+
+   HEXDIGIT        = %x41-46 / DIGIT    ;; hexidecimal digit (uppercase)
+
+   hexchar         = "+" HEXDIGIT HEXDIGIT
+
+   xchar           = %x21-2A / %x2C-3C / %x3E-7E
+                     ;; US-ASCII except for "+", "=", SPACE and CTL
+
+   xtext           = *(xchar / hexchar)
+
+   AUTH_CHAR       = ALPHA / DIGIT / "-" / "_"
+
+   auth_type       = 1*20AUTH_CHAR
+
+   auth_command    = "AUTH" SPACE auth_type [SPACE (base64 / "=")]
+                     *(CRLF [base64]) CRLF
+
+   auth_param      = "AUTH=" xtext
+                       ;; The decoded form of the xtext MUST be either
+                       ;; an addr-spec or the two characters "<>"
+
+   base64          = base64_terminal /
+                     ( 1*(4base64_CHAR) [base64_terminal] )
+
+   base64_char     = UPALPHA / LOALPHA / DIGIT / "+" / "/"
+                     ;; Case-sensitive
+
+   base64_terminal = (2base64_char "==") / (3base64_char "=")
+
+   continue_req    = "334" SPACE [base64] CRLF
+
+
+
+
+Myers                       Standards Track                     [Page 7]
+
+RFC 2554                  SMTP Authentication                 March 1999
+
+
+   CR              = %x0C           ;; ASCII CR, carriage return
+
+   CRLF            = CR LF
+
+   CTL             = %x00-1F / %x7F ;; any ASCII control character and DEL
+
+   LF              = %x0A           ;; ASCII LF, line feed
+
+   SPACE           = %x20           ;; ASCII SP, space
+
+
+
+
+8. References
+
+   [ABNF]      Crocker, D. and P. Overell, "Augmented BNF for Syntax
+               Specifications: ABNF", RFC 2234, November 1997.
+
+   [CRAM-MD5]  Klensin, J., Catoe, R. and P. Krumviede, "IMAP/POP
+               AUTHorize Extension for Simple Challenge/Response", RFC
+               2195, September 1997.
+
+   [ESMTP]     Klensin, J., Freed, N., Rose, M., Stefferud, E. and D.
+               Crocker, "SMTP Service Extensions", RFC 1869, November
+               1995.
+
+   [ESMTP-DSN] Moore, K, "SMTP Service Extension for Delivery Status
+               Notifications", RFC 1891, January 1996.
+
+   [KEYWORDS]  Bradner, S., "Key words for use in RFCs to Indicate
+               Requirement Levels", BCP 14, RFC 2119, March 1997.
+
+   [SASL]      Myers, J., "Simple Authentication and Security Layer
+               (SASL)", RFC 2222, October 1997.
+
+   [SUBMIT]    Gellens, R. and J. Klensin, "Message Submission", RFC
+               2476, December 1998.
+
+   [RFC821]    Postel, J., "Simple Mail Transfer Protocol", STD 10, RFC
+               821, August 1982.
+
+   [RFC822]    Crocker, D., "Standard for the Format of ARPA Internet
+               Text Messages", STD 11, RFC 822, August 1982.
+
+
+
+
+
+
+
+
+Myers                       Standards Track                     [Page 8]
+
+RFC 2554                  SMTP Authentication                 March 1999
+
+
+9. Security Considerations
+
+   Security issues are discussed throughout this memo.
+
+   If a client uses this extension to get an encrypted tunnel through an
+   insecure network to a cooperating server, it needs to be configured
+   to never send mail to that server when the connection is not mutually
+   authenticated and encrypted.  Otherwise, an attacker could steal the
+   client's mail by hijacking the SMTP connection and either pretending
+   the server does not support the Authentication extension or causing
+   all AUTH commands to fail.
+
+   Before the SASL negotiation has begun, any protocol interactions are
+   performed in the clear and may be modified by an active attacker.
+   For this reason, clients and servers MUST discard any knowledge
+   obtained prior to the start of the SASL negotiation upon completion
+   of a SASL negotiation which results in a security layer.
+
+   This mechanism does not protect the TCP port, so an active attacker
+   may redirect a relay connection attempt to the submission port
+   [SUBMIT].  The AUTH=<> parameter prevents such an attack from causing
+   an relayed message without an envelope authentication to pick up the
+   authentication of the relay client.
+
+   A message submission client may require the user to authenticate
+   whenever a suitable SASL mechanism is advertised.  Therefore, it may
+   not be desirable for a submission server [SUBMIT] to advertise a SASL
+   mechanism when use of that mechanism grants the client no benefits
+   over anonymous submission.
+
+   This extension is not intended to replace or be used instead of end-
+   to-end message signature and encryption systems such as S/MIME or
+   PGP.  This extension addresses a different problem than end-to-end
+   systems; it has the following key differences:
+
+      (1) it is generally useful only within a trusted enclave
+
+      (2) it protects the entire envelope of a message, not just the
+          message's body.
+
+      (3) it authenticates the message submission, not authorship of the
+          message content
+
+      (4) it can give the sender some assurance the message was
+          delivered to the next hop in the case where the sender
+          mutually authenticates with the next hop and negotiates an
+          appropriate security layer.
+
+
+
+
+Myers                       Standards Track                     [Page 9]
+
+RFC 2554                  SMTP Authentication                 March 1999
+
+
+   Additional security considerations are mentioned in the SASL
+   specification [SASL].
+
+
+
+10. Author's Address
+
+   John Gardiner Myers
+   Netscape Communications
+   501 East Middlefield Road
+   Mail Stop MV-029
+   Mountain View, CA 94043
+
+   EMail: jgmyers@netscape.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Myers                       Standards Track                    [Page 10]
+
+RFC 2554                  SMTP Authentication                 March 1999
+
+
+11.  Full Copyright Statement
+
+   Copyright (C) The Internet Society (1999).  All Rights Reserved.
+
+   This document and translations of it may be copied and furnished to
+   others, and derivative works that comment on or otherwise explain it
+   or assist in its implementation may be prepared, copied, published
+   and distributed, in whole or in part, without restriction of any
+   kind, provided that the above copyright notice and this paragraph are
+   included on all such copies and derivative works.  However, this
+   document itself may not be modified in any way, such as by removing
+   the copyright notice or references to the Internet Society or other
+   Internet organizations, except as needed for the purpose of
+   developing Internet standards in which case the procedures for
+   copyrights defined in the Internet Standards process must be
+   followed, or as required to translate it into languages other than
+   English.
+
+   The limited permissions granted above are perpetual and will not be
+   revoked by the Internet Society or its successors or assigns.
+
+   This document and the information contained herein is provided on an
+   "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
+   TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+   BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
+   HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
+   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Myers                       Standards Track                    [Page 11]
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2821.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2821.txt
new file mode 100644
index 000000000..0eac91188
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2821.txt
@@ -0,0 +1,4427 @@
+
+
+
+
+
+
+Network Working Group                                 J. Klensin, Editor
+Request for Comments: 2821                             AT&T Laboratories
+Obsoletes: 821, 974, 1869                                     April 2001
+Updates: 1123
+Category: Standards Track
+
+
+                     Simple Mail Transfer Protocol
+
+Status of this Memo
+
+   This document specifies an Internet standards track protocol for the
+   Internet community, and requests discussion and suggestions for
+   improvements.  Please refer to the current edition of the "Internet
+   Official Protocol Standards" (STD 1) for the standardization state
+   and status of this protocol.  Distribution of this memo is unlimited.
+
+Copyright Notice
+
+   Copyright (C) The Internet Society (2001).  All Rights Reserved.
+
+Abstract
+
+   This document is a self-contained specification of the basic protocol
+   for the Internet electronic mail transport.  It consolidates, updates
+   and clarifies, but doesn't add new or change existing functionality
+   of the following:
+
+   -  the original SMTP (Simple Mail Transfer Protocol) specification of
+      RFC 821 [30],
+
+   -  domain name system requirements and implications for mail
+      transport from RFC 1035 [22] and RFC 974 [27],
+
+   -  the clarifications and applicability statements in RFC 1123 [2],
+      and
+
+   -  material drawn from the SMTP Extension mechanisms [19].
+
+   It obsoletes RFC 821, RFC 974, and updates RFC 1123 (replaces the
+   mail transport materials of RFC 1123).  However, RFC 821 specifies
+   some features that were not in significant use in the Internet by the
+   mid-1990s and (in appendices) some additional transport models.
+   Those sections are omitted here in the interest of clarity and
+   brevity; readers needing them should refer to RFC 821.
+
+
+
+
+
+
+Klensin                     Standards Track                     [Page 1]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   It also includes some additional material from RFC 1123 that required
+   amplification.  This material has been identified in multiple ways,
+   mostly by tracking flaming on various lists and newsgroups and
+   problems of unusual readings or interpretations that have appeared as
+   the SMTP extensions have been deployed.  Where this specification
+   moves beyond consolidation and actually differs from earlier
+   documents, it supersedes them technically as well as textually.
+
+   Although SMTP was designed as a mail transport and delivery protocol,
+   this specification also contains information that is important to its
+   use as a 'mail submission' protocol, as recommended for POP [3, 26]
+   and IMAP [6].  Additional submission issues are discussed in RFC 2476
+   [15].
+
+   Section 2.3 provides definitions of terms specific to this document.
+   Except when the historical terminology is necessary for clarity, this
+   document uses the current 'client' and 'server' terminology to
+   identify the sending and receiving SMTP processes, respectively.
+
+   A companion document [32] discusses message headers, message bodies
+   and formats and structures for them, and their relationship.
+
+Table of Contents
+
+   1. Introduction ..................................................  4
+   2. The SMTP Model ................................................  5
+   2.1 Basic Structure ..............................................  5
+   2.2 The Extension Model ..........................................  7
+   2.2.1 Background .................................................  7
+   2.2.2 Definition and Registration of Extensions ..................  8
+   2.3 Terminology ..................................................  9
+   2.3.1 Mail Objects ............................................... 10
+   2.3.2 Senders and Receivers ...................................... 10
+   2.3.3 Mail Agents and Message Stores ............................. 10
+   2.3.4 Host ....................................................... 11
+   2.3.5 Domain ..................................................... 11
+   2.3.6 Buffer and State Table ..................................... 11
+   2.3.7 Lines ...................................................... 12
+   2.3.8 Originator, Delivery, Relay, and Gateway Systems ........... 12
+   2.3.9 Message Content and Mail Data .............................. 13
+   2.3.10 Mailbox and Address ....................................... 13
+   2.3.11 Reply ..................................................... 13
+   2.4 General Syntax Principles and Transaction Model .............. 13
+   3. The SMTP Procedures: An Overview .............................. 15
+   3.1 Session Initiation ........................................... 15
+   3.2 Client Initiation ............................................ 16
+   3.3 Mail Transactions ............................................ 16
+   3.4 Forwarding for Address Correction or Updating ................ 19
+
+
+
+Klensin                     Standards Track                     [Page 2]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   3.5 Commands for Debugging Addresses ............................. 20
+   3.5.1 Overview ................................................... 20
+   3.5.2 VRFY Normal Response ....................................... 22
+   3.5.3 Meaning of VRFY or EXPN Success Response ................... 22
+   3.5.4 Semantics and Applications of EXPN ......................... 23
+   3.6 Domains ...................................................... 23
+   3.7 Relaying ..................................................... 24
+   3.8 Mail Gatewaying .............................................. 25
+   3.8.1 Header Fields in Gatewaying ................................ 26
+   3.8.2 Received Lines in Gatewaying ............................... 26
+   3.8.3 Addresses in Gatewaying .................................... 26
+   3.8.4 Other Header Fields in Gatewaying .......................... 27
+   3.8.5 Envelopes in Gatewaying .................................... 27
+   3.9 Terminating Sessions and Connections ......................... 27
+   3.10 Mailing Lists and Aliases ................................... 28
+   3.10.1 Alias ..................................................... 28
+   3.10.2 List ...................................................... 28
+   4. The SMTP Specifications ....................................... 29
+   4.1 SMTP Commands ................................................ 29
+   4.1.1 Command Semantics and Syntax ............................... 29
+   4.1.1.1  Extended HELLO (EHLO) or HELLO (HELO) ................... 29
+   4.1.1.2 MAIL (MAIL) .............................................. 31
+   4.1.1.3 RECIPIENT (RCPT) ......................................... 31
+   4.1.1.4 DATA (DATA) .............................................. 33
+   4.1.1.5 RESET (RSET) ............................................. 34
+   4.1.1.6 VERIFY (VRFY) ............................................ 35
+   4.1.1.7 EXPAND (EXPN) ............................................ 35
+   4.1.1.8 HELP (HELP) .............................................. 35
+   4.1.1.9 NOOP (NOOP) .............................................. 35
+   4.1.1.10 QUIT (QUIT) ............................................. 36
+   4.1.2 Command Argument Syntax .................................... 36
+   4.1.3 Address Literals ........................................... 38
+   4.1.4 Order of Commands .......................................... 39
+   4.1.5 Private-use Commands ....................................... 40
+   4.2  SMTP Replies ................................................ 40
+   4.2.1 Reply Code Severities and Theory ........................... 42
+   4.2.2 Reply Codes by Function Groups ............................. 44
+   4.2.3  Reply Codes in Numeric Order .............................. 45
+   4.2.4 Reply Code 502 ............................................. 46
+   4.2.5 Reply Codes After DATA and the Subsequent <CRLF>.<CRLF> .... 46
+   4.3 Sequencing of Commands and Replies ........................... 47
+   4.3.1 Sequencing Overview ........................................ 47
+   4.3.2 Command-Reply Sequences .................................... 48
+   4.4 Trace Information ............................................ 49
+   4.5 Additional Implementation Issues ............................. 53
+   4.5.1 Minimum Implementation ..................................... 53
+   4.5.2 Transparency ............................................... 53
+   4.5.3 Sizes and Timeouts ......................................... 54
+
+
+
+Klensin                     Standards Track                     [Page 3]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   4.5.3.1 Size limits and minimums ................................. 54
+   4.5.3.2 Timeouts ................................................. 56
+   4.5.4 Retry Strategies ........................................... 57
+   4.5.4.1 Sending Strategy ......................................... 58
+   4.5.4.2 Receiving Strategy ....................................... 59
+   4.5.5 Messages with a null reverse-path .......................... 59
+   5. Address Resolution and Mail Handling .......................... 60
+   6. Problem Detection and Handling ................................ 62
+   6.1 Reliable Delivery and Replies by Email ....................... 62
+   6.2 Loop Detection ............................................... 63
+   6.3 Compensating for Irregularities .............................. 63
+   7. Security Considerations ....................................... 64
+   7.1 Mail Security and Spoofing ................................... 64
+   7.2 "Blind" Copies ............................................... 65
+   7.3 VRFY, EXPN, and Security ..................................... 65
+   7.4 Information Disclosure in Announcements ...................... 66
+   7.5 Information Disclosure in Trace Fields ....................... 66
+   7.6 Information Disclosure in Message Forwarding ................. 67
+   7.7 Scope of Operation of SMTP Servers ........................... 67
+   8. IANA Considerations ........................................... 67
+   9. References .................................................... 68
+   10. Editor's Address ............................................. 70
+   11. Acknowledgments .............................................. 70
+   Appendices ....................................................... 71
+   A. TCP Transport Service ......................................... 71
+   B. Generating SMTP Commands from RFC 822 Headers ................. 71
+   C. Source Routes ................................................. 72
+   D. Scenarios ..................................................... 73
+   E. Other Gateway Issues .......................................... 76
+   F. Deprecated Features of RFC 821 ................................ 76
+   Full Copyright Statement ......................................... 79
+
+1. Introduction
+
+   The objective of the Simple Mail Transfer Protocol (SMTP) is to
+   transfer mail reliably and efficiently.
+
+   SMTP is independent of the particular transmission subsystem and
+   requires only a reliable ordered data stream channel.  While this
+   document specifically discusses transport over TCP, other transports
+   are possible.  Appendices to RFC 821 describe some of them.
+
+   An important feature of SMTP is its capability to transport mail
+   across networks, usually referred to as "SMTP mail relaying" (see
+   section 3.8).  A network consists of the mutually-TCP-accessible
+   hosts on the public Internet, the mutually-TCP-accessible hosts on a
+   firewall-isolated TCP/IP Intranet, or hosts in some other LAN or WAN
+   environment utilizing a non-TCP transport-level protocol.  Using
+
+
+
+Klensin                     Standards Track                     [Page 4]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   SMTP, a process can transfer mail to another process on the same
+   network or to some other network via a relay or gateway process
+   accessible to both networks.
+
+   In this way, a mail message may pass through a number of intermediate
+   relay or gateway hosts on its path from sender to ultimate recipient.
+   The Mail eXchanger mechanisms of the domain name system [22, 27] (and
+   section 5 of this document) are used to identify the appropriate
+   next-hop destination for a message being transported.
+
+2. The SMTP Model
+
+2.1 Basic Structure
+
+   The SMTP design can be pictured as:
+
+               +----------+                +----------+
+   +------+    |          |                |          |
+   | User |<-->|          |      SMTP      |          |
+   +------+    |  Client- |Commands/Replies| Server-  |
+   +------+    |   SMTP   |<-------------->|    SMTP  |    +------+
+   | File |<-->|          |    and Mail    |          |<-->| File |
+   |System|    |          |                |          |    |System|
+   +------+    +----------+                +----------+    +------+
+                SMTP client                SMTP server
+
+   When an SMTP client has a message to transmit, it establishes a two-
+   way transmission channel to an SMTP server.  The responsibility of an
+   SMTP client is to transfer mail messages to one or more SMTP servers,
+   or report its failure to do so.
+
+   The means by which a mail message is presented to an SMTP client, and
+   how that client determines the domain name(s) to which mail messages
+   are to be transferred is a local matter, and is not addressed by this
+   document.  In some cases, the domain name(s) transferred to, or
+   determined by, an SMTP client will identify the final destination(s)
+   of the mail message.  In other cases, common with SMTP clients
+   associated with implementations of the POP [3, 26] or IMAP [6]
+   protocols, or when the SMTP client is inside an isolated transport
+   service environment, the domain name determined will identify an
+   intermediate destination through which all mail messages are to be
+   relayed.  SMTP clients that transfer all traffic, regardless of the
+   target domain names associated with the individual messages, or that
+   do not maintain queues for retrying message transmissions that
+   initially cannot be completed, may otherwise conform to this
+   specification but are not considered fully-capable.  Fully-capable
+   SMTP implementations, including the relays used by these less capable
+
+
+
+
+Klensin                     Standards Track                     [Page 5]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   ones, and their destinations, are expected to support all of the
+   queuing, retrying, and alternate address functions discussed in this
+   specification.
+
+   The means by which an SMTP client, once it has determined a target
+   domain name, determines the identity of an SMTP server to which a
+   copy of a message is to be transferred, and then performs that
+   transfer, is covered by this document.  To effect a mail transfer to
+   an SMTP server, an SMTP client establishes a two-way transmission
+   channel to that SMTP server.  An SMTP client determines the address
+   of an appropriate host running an SMTP server by resolving a
+   destination domain name to either an intermediate Mail eXchanger host
+   or a final target host.
+
+   An SMTP server may be either the ultimate destination or an
+   intermediate "relay" (that is, it may assume the role of an SMTP
+   client after receiving the message) or "gateway" (that is, it may
+   transport the message further using some protocol other than SMTP).
+   SMTP commands are generated by the SMTP client and sent to the SMTP
+   server.  SMTP replies are sent from the SMTP server to the SMTP
+   client in response to the commands.
+
+   In other words, message transfer can occur in a single connection
+   between the original SMTP-sender and the final SMTP-recipient, or can
+   occur in a series of hops through intermediary systems.  In either
+   case, a formal handoff of responsibility for the message occurs: the
+   protocol requires that a server accept responsibility for either
+   delivering a message or properly reporting the failure to do so.
+
+   Once the transmission channel is established and initial handshaking
+   completed, the SMTP client normally initiates a mail transaction.
+   Such a transaction consists of a series of commands to specify the
+   originator and destination of the mail and transmission of the
+   message content (including any headers or other structure) itself.
+   When the same message is sent to multiple recipients, this protocol
+   encourages the transmission of only one copy of the data for all
+   recipients at the same destination (or intermediate relay) host.
+
+   The server responds to each command with a reply; replies may
+   indicate that the command was accepted, that additional commands are
+   expected, or that a temporary or permanent error condition exists.
+   Commands specifying the sender or recipients may include server-
+   permitted SMTP service extension requests as discussed in section
+   2.2.  The dialog is purposely lock-step, one-at-a-time, although this
+   can be modified by mutually-agreed extension requests such as command
+   pipelining [13].
+
+
+
+
+
+Klensin                     Standards Track                     [Page 6]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   Once a given mail message has been transmitted, the client may either
+   request that the connection be shut down or may initiate other mail
+   transactions.  In addition, an SMTP client may use a connection to an
+   SMTP server for ancillary services such as verification of email
+   addresses or retrieval of mailing list subscriber addresses.
+
+   As suggested above, this protocol provides mechanisms for the
+   transmission of mail.  This transmission normally occurs directly
+   from the sending user's host to the receiving user's host when the
+   two hosts are connected to the same transport service.  When they are
+   not connected to the same transport service, transmission occurs via
+   one or more relay SMTP servers.  An intermediate host that acts as
+   either an SMTP relay or as a gateway into some other transmission
+   environment is usually selected through the use of the domain name
+   service (DNS) Mail eXchanger mechanism.
+
+   Usually, intermediate hosts are determined via the DNS MX record, not
+   by explicit "source" routing (see section 5 and appendices C and
+   F.2).
+
+2.2 The Extension Model
+
+2.2.1 Background
+
+   In an effort that started in 1990, approximately a decade after RFC
+   821 was completed, the protocol was modified with a "service
+   extensions" model that permits the client and server to agree to
+   utilize shared functionality beyond the original SMTP requirements.
+   The SMTP extension mechanism defines a means whereby an extended SMTP
+   client and server may recognize each other, and the server can inform
+   the client as to the service extensions that it supports.
+
+   Contemporary SMTP implementations MUST support the basic extension
+   mechanisms.  For instance, servers MUST support the EHLO command even
+   if they do not implement any specific extensions and clients SHOULD
+   preferentially utilize EHLO rather than HELO.  (However, for
+   compatibility with older conforming implementations, SMTP clients and
+   servers MUST support the original HELO mechanisms as a fallback.)
+   Unless the different characteristics of HELO must be identified for
+   interoperability purposes, this document discusses only EHLO.
+
+   SMTP is widely deployed and high-quality implementations have proven
+   to be very robust.  However, the Internet community now considers
+   some services to be important that were not anticipated when the
+   protocol was first designed.  If support for those services is to be
+   added, it must be done in a way that permits older implementations to
+   continue working acceptably.  The extension framework consists of:
+
+
+
+
+Klensin                     Standards Track                     [Page 7]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   -  The SMTP command EHLO, superseding the earlier HELO,
+
+   -  a registry of SMTP service extensions,
+
+   -  additional parameters to the SMTP MAIL and RCPT commands, and
+
+   -  optional replacements for commands defined in this protocol, such
+      as for DATA in non-ASCII transmissions [33].
+
+   SMTP's strength comes primarily from its simplicity.  Experience with
+   many protocols has shown that protocols with few options tend towards
+   ubiquity, whereas protocols with many options tend towards obscurity.
+
+   Each and every extension, regardless of its benefits, must be
+   carefully scrutinized with respect to its implementation, deployment,
+   and interoperability costs.  In many cases, the cost of extending the
+   SMTP service will likely outweigh the benefit.
+
+2.2.2 Definition and Registration of Extensions
+
+   The IANA maintains a registry of SMTP service extensions.  A
+   corresponding EHLO keyword value is associated with each extension.
+   Each service extension registered with the IANA must be defined in a
+   formal standards-track or IESG-approved experimental protocol
+   document.  The definition must include:
+
+   -  the textual name of the SMTP service extension;
+
+   -  the EHLO keyword value associated with the extension;
+
+   -  the syntax and possible values of parameters associated with the
+      EHLO keyword value;
+
+   -  any additional SMTP verbs associated with the extension
+      (additional verbs will usually be, but are not required to be, the
+      same as the EHLO keyword value);
+
+   -  any new parameters the extension associates with the MAIL or RCPT
+      verbs;
+
+   -  a description of how support for the extension affects the
+      behavior of a server and client SMTP; and,
+
+   -  the increment by which the extension is increasing the maximum
+      length of the commands MAIL and/or RCPT, over that specified in
+      this standard.
+
+
+
+
+
+Klensin                     Standards Track                     [Page 8]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   In addition, any EHLO keyword value starting with an upper or lower
+   case "X" refers to a local SMTP service extension used exclusively
+   through bilateral agreement.  Keywords beginning with "X" MUST NOT be
+   used in a registered service extension.  Conversely, keyword values
+   presented in the EHLO response that do not begin with "X" MUST
+   correspond to a standard, standards-track, or IESG-approved
+   experimental SMTP service extension registered with IANA.  A
+   conforming server MUST NOT offer non-"X"-prefixed keyword values that
+   are not described in a registered extension.
+
+   Additional verbs and parameter names are bound by the same rules as
+   EHLO keywords; specifically, verbs beginning with "X" are local
+   extensions that may not be registered or standardized.  Conversely,
+   verbs not beginning with "X" must always be registered.
+
+2.3 Terminology
+
+   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
+   "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
+   document are to be interpreted as described below.
+
+   1. MUST   This word, or the terms "REQUIRED" or "SHALL", mean that
+      the definition is an absolute requirement of the specification.
+
+   2. MUST NOT   This phrase, or the phrase "SHALL NOT", mean that the
+      definition is an absolute prohibition of the specification.
+
+   3. SHOULD   This word, or the adjective "RECOMMENDED", mean that
+      there may exist valid reasons in particular circumstances to
+      ignore a particular item, but the full implications must be
+      understood and carefully weighed before choosing a different
+      course.
+
+   4. SHOULD NOT   This phrase, or the phrase "NOT RECOMMENDED" mean
+      that there may exist valid reasons in particular circumstances
+      when the particular behavior is acceptable or even useful, but the
+      full implications should be understood and the case carefully
+      weighed before implementing any behavior described with this
+      label.
+
+   5. MAY   This word, or the adjective "OPTIONAL", mean that an item is
+      truly optional.  One vendor may choose to include the item because
+      a particular marketplace requires it or because the vendor feels
+      that it enhances the product while another vendor may omit the
+      same item.  An implementation which does not include a particular
+      option MUST be prepared to interoperate with another
+      implementation which does include the option, though perhaps with
+      reduced functionality.  In the same vein an implementation which
+
+
+
+Klensin                     Standards Track                     [Page 9]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+      does include a particular option MUST be prepared to interoperate
+      with another implementation which does not include the option
+      (except, of course, for the feature the option provides.)
+
+2.3.1 Mail Objects
+
+   SMTP transports a mail object.  A mail object contains an envelope
+   and content.
+
+   The SMTP envelope is sent as a series of SMTP protocol units
+   (described in section 3).  It consists of an originator address (to
+   which error reports should be directed); one or more recipient
+   addresses; and optional protocol extension material.  Historically,
+   variations on the recipient address specification command (RCPT TO)
+   could be used to specify alternate delivery modes, such as immediate
+   display; those variations have now been deprecated (see appendix F,
+   section F.6).
+
+   The SMTP content is sent in the SMTP DATA protocol unit and has two
+   parts:  the headers and the body.  If the content conforms to other
+   contemporary standards, the headers form a collection of field/value
+   pairs structured as in the message format specification [32]; the
+   body, if structured, is defined according to MIME [12].  The content
+   is textual in nature, expressed using the US-ASCII repertoire [1].
+   Although SMTP extensions (such as "8BITMIME" [20]) may relax this
+   restriction for the content body, the content headers are always
+   encoded using the US-ASCII repertoire.  A MIME extension [23] defines
+   an algorithm for representing header values outside the US-ASCII
+   repertoire, while still encoding them using the US-ASCII repertoire.
+
+2.3.2 Senders and Receivers
+
+   In RFC 821, the two hosts participating in an SMTP transaction were
+   described as the "SMTP-sender" and "SMTP-receiver".  This document
+   has been changed to reflect current industry terminology and hence
+   refers to them as the "SMTP client" (or sometimes just "the client")
+   and "SMTP server" (or just "the server"), respectively.  Since a
+   given host may act both as server and client in a relay situation,
+   "receiver" and "sender" terminology is still used where needed for
+   clarity.
+
+2.3.3 Mail Agents and Message Stores
+
+   Additional mail system terminology became common after RFC 821 was
+   published and, where convenient, is used in this specification.  In
+   particular, SMTP servers and clients provide a mail transport service
+   and therefore act as "Mail Transfer Agents" (MTAs).  "Mail User
+   Agents" (MUAs or UAs) are normally thought of as the sources and
+
+
+
+Klensin                     Standards Track                    [Page 10]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   targets of mail.  At the source, an MUA might collect mail to be
+   transmitted from a user and hand it off to an MTA; the final
+   ("delivery") MTA would be thought of as handing the mail off to an
+   MUA (or at least transferring responsibility to it, e.g., by
+   depositing the message in a "message store").  However, while these
+   terms are used with at least the appearance of great precision in
+   other environments, the implied boundaries between MUAs and MTAs
+   often do not accurately match common, and conforming, practices with
+   Internet mail.  Hence, the reader should be cautious about inferring
+   the strong relationships and responsibilities that might be implied
+   if these terms were used elsewhere.
+
+2.3.4 Host
+
+   For the purposes of this specification, a host is a computer system
+   attached to the Internet (or, in some cases, to a private TCP/IP
+   network) and supporting the SMTP protocol.  Hosts are known by names
+   (see "domain"); identifying them by numerical address is discouraged.
+
+2.3.5 Domain
+
+   A domain (or domain name) consists of one or more dot-separated
+   components.  These components ("labels" in DNS terminology [22]) are
+   restricted for SMTP purposes to consist of a sequence of letters,
+   digits, and hyphens drawn from the ASCII character set [1].  Domain
+   names are used as names of hosts and of other entities in the domain
+   name hierarchy.  For example, a domain may refer to an alias (label
+   of a CNAME RR) or the label of Mail eXchanger records to be used to
+   deliver mail instead of representing a host name.  See [22] and
+   section 5 of this specification.
+
+   The domain name, as described in this document and in [22], is the
+   entire, fully-qualified name (often referred to as an "FQDN").  A
+   domain name that is not in FQDN form is no more than a local alias.
+   Local aliases MUST NOT appear in any SMTP transaction.
+
+2.3.6 Buffer and State Table
+
+   SMTP sessions are stateful, with both parties carefully maintaining a
+   common view of the current state.  In this document we model this
+   state by a virtual "buffer" and a "state table" on the server which
+   may be used by the client to, for example, "clear the buffer" or
+   "reset the state table," causing the information in the buffer to be
+   discarded and the state to be returned to some previous state.
+
+
+
+
+
+
+
+Klensin                     Standards Track                    [Page 11]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+2.3.7 Lines
+
+   SMTP commands and, unless altered by a service extension, message
+   data, are transmitted in "lines".  Lines consist of zero or more data
+   characters terminated by the sequence ASCII character "CR" (hex value
+   0D) followed immediately by ASCII character "LF" (hex value 0A).
+   This termination sequence is denoted as <CRLF> in this document.
+   Conforming implementations MUST NOT recognize or generate any other
+   character or character sequence as a line terminator.  Limits MAY be
+   imposed on line lengths by servers (see section 4.5.3).
+
+   In addition, the appearance of "bare" "CR" or "LF" characters in text
+   (i.e., either without the other) has a long history of causing
+   problems in mail implementations and applications that use the mail
+   system as a tool.  SMTP client implementations MUST NOT transmit
+   these characters except when they are intended as line terminators
+   and then MUST, as indicated above, transmit them only as a <CRLF>
+   sequence.
+
+2.3.8 Originator, Delivery, Relay, and Gateway Systems
+
+   This specification makes a distinction among four types of SMTP
+   systems, based on the role those systems play in transmitting
+   electronic mail.  An "originating" system (sometimes called an SMTP
+   originator) introduces mail into the Internet or, more generally,
+   into a transport service environment.  A "delivery" SMTP system is
+   one that receives mail from a transport service environment and
+   passes it to a mail user agent or deposits it in a message store
+   which a mail user agent is expected to subsequently access.  A
+   "relay" SMTP system (usually referred to just as a "relay") receives
+   mail from an SMTP client and transmits it, without modification to
+   the message data other than adding trace information, to another SMTP
+   server for further relaying or for delivery.
+
+   A "gateway" SMTP system (usually referred to just as a "gateway")
+   receives mail from a client system in one transport environment and
+   transmits it to a server system in another transport environment.
+   Differences in protocols or message semantics between the transport
+   environments on either side of a gateway may require that the gateway
+   system perform transformations to the message that are not permitted
+   to SMTP relay systems.  For the purposes of this specification,
+   firewalls that rewrite addresses should be considered as gateways,
+   even if SMTP is used on both sides of them (see [11]).
+
+
+
+
+
+
+
+
+Klensin                     Standards Track                    [Page 12]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+2.3.9 Message Content and Mail Data
+
+   The terms "message content" and "mail data" are used interchangeably
+   in this document to describe the material transmitted after the DATA
+   command is accepted and before the end of data indication is
+   transmitted.  Message content includes message headers and the
+   possibly-structured message body.  The MIME specification [12]
+   provides the standard mechanisms for structured message bodies.
+
+2.3.10 Mailbox and Address
+
+   As used in this specification, an "address" is a character string
+   that identifies a user to whom mail will be sent or a location into
+   which mail will be deposited.  The term "mailbox" refers to that
+   depository.  The two terms are typically used interchangeably unless
+   the distinction between the location in which mail is placed (the
+   mailbox) and a reference to it (the address) is important.  An
+   address normally consists of user and domain specifications.  The
+   standard mailbox naming convention is defined to be "local-
+   part@domain": contemporary usage permits a much broader set of
+   applications than simple "user names".  Consequently, and due to a
+   long history of problems when intermediate hosts have attempted to
+   optimize transport by modifying them, the local-part MUST be
+   interpreted and assigned semantics only by the host specified in the
+   domain part of the address.
+
+2.3.11 Reply
+
+   An SMTP reply is an acknowledgment (positive or negative) sent from
+   receiver to sender via the transmission channel in response to a
+   command.  The general form of a reply is a numeric completion code
+   (indicating failure or success) usually followed by a text string.
+   The codes are for use by programs and the text is usually intended
+   for human users.  Recent work [34] has specified further structuring
+   of the reply strings, including the use of supplemental and more
+   specific completion codes.
+
+2.4 General Syntax Principles and Transaction Model
+
+   SMTP commands and replies have a rigid syntax.  All commands begin
+   with a command verb.  All Replies begin with a three digit numeric
+   code.  In some commands and replies, arguments MUST follow the verb
+   or reply code.  Some commands do not accept arguments (after the
+   verb), and some reply codes are followed, sometimes optionally, by
+   free form text.  In both cases, where text appears, it is separated
+   from the verb or reply code by a space character.  Complete
+   definitions of commands and replies appear in section 4.
+
+
+
+
+Klensin                     Standards Track                    [Page 13]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   Verbs and argument values (e.g., "TO:" or "to:" in the RCPT command
+   and extension name keywords) are not case sensitive, with the sole
+   exception in this specification of a mailbox local-part (SMTP
+   Extensions may explicitly specify case-sensitive elements).  That is,
+   a command verb, an argument value other than a mailbox local-part,
+   and free form text MAY be encoded in upper case, lower case, or any
+   mixture of upper and lower case with no impact on its meaning.  This
+   is NOT true of a mailbox local-part.  The local-part of a mailbox
+   MUST BE treated as case sensitive.  Therefore, SMTP implementations
+   MUST take care to preserve the case of mailbox local-parts.  Mailbox
+   domains are not case sensitive.  In particular, for some hosts the
+   user "smith" is different from the user "Smith".  However, exploiting
+   the case sensitivity of mailbox local-parts impedes interoperability
+   and is discouraged.
+
+   A few SMTP servers, in violation of this specification (and RFC 821)
+   require that command verbs be encoded by clients in upper case.
+   Implementations MAY wish to employ this encoding to accommodate those
+   servers.
+
+   The argument field consists of a variable length character string
+   ending with the end of the line, i.e., with the character sequence
+   <CRLF>.  The receiver will take no action until this sequence is
+   received.
+
+   The syntax for each command is shown with the discussion of that
+   command.  Common elements and parameters are shown in section 4.1.2.
+
+   Commands and replies are composed of characters from the ASCII
+   character set [1].  When the transport service provides an 8-bit byte
+   (octet) transmission channel, each 7-bit character is transmitted
+   right justified in an octet with the high order bit cleared to zero.
+   More specifically, the unextended SMTP service provides seven bit
+   transport only.  An originating SMTP client which has not
+   successfully negotiated an appropriate extension with a particular
+   server MUST NOT transmit messages with information in the high-order
+   bit of octets.  If such messages are transmitted in violation of this
+   rule, receiving SMTP servers MAY clear the high-order bit or reject
+   the message as invalid.  In general, a relay SMTP SHOULD assume that
+   the message content it has received is valid and, assuming that the
+   envelope permits doing so, relay it without inspecting that content.
+   Of course, if the content is mislabeled and the data path cannot
+   accept the actual content, this may result in ultimate delivery of a
+   severely garbled message to the recipient.  Delivery SMTP systems MAY
+   reject ("bounce") such messages rather than deliver them.  No sending
+   SMTP system is permitted to send envelope commands in any character
+
+
+
+
+
+Klensin                     Standards Track                    [Page 14]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   set other than US-ASCII; receiving systems SHOULD reject such
+   commands, normally using "500 syntax error - invalid character"
+   replies.
+
+   Eight-bit message content transmission MAY be requested of the server
+   by a client using extended SMTP facilities, notably the "8BITMIME"
+   extension [20].  8BITMIME SHOULD be supported by SMTP servers.
+   However, it MUST not be construed as authorization to transmit
+   unrestricted eight bit material.  8BITMIME MUST NOT be requested by
+   senders for material with the high bit on that is not in MIME format
+   with an appropriate content-transfer encoding; servers MAY reject
+   such messages.
+
+   The metalinguistic notation used in this document corresponds to the
+   "Augmented BNF" used in other Internet mail system documents.  The
+   reader who is not familiar with that syntax should consult the ABNF
+   specification [8].  Metalanguage terms used in running text are
+   surrounded by pointed brackets (e.g., <CRLF>) for clarity.
+
+3. The SMTP Procedures: An Overview
+
+   This section contains descriptions of the procedures used in SMTP:
+   session initiation, the mail transaction, forwarding mail, verifying
+   mailbox names and expanding mailing lists, and the opening and
+   closing exchanges.  Comments on relaying, a note on mail domains, and
+   a discussion of changing roles are included at the end of this
+   section.  Several complete scenarios are presented in appendix D.
+
+3.1 Session Initiation
+
+   An SMTP session is initiated when a client opens a connection to a
+   server and the server responds with an opening message.
+
+   SMTP server implementations MAY include identification of their
+   software and version information in the connection greeting reply
+   after the 220 code, a practice that permits more efficient isolation
+   and repair of any problems.  Implementations MAY make provision for
+   SMTP servers to disable the software and version announcement where
+   it causes security concerns.  While some systems also identify their
+   contact point for mail problems, this is not a substitute for
+   maintaining the required "postmaster" address (see section 4.5.1).
+
+   The SMTP protocol allows a server to formally reject a transaction
+   while still allowing the initial connection as follows: a 554
+   response MAY be given in the initial connection opening message
+   instead of the 220.  A server taking this approach MUST still wait
+   for the client to send a QUIT (see section 4.1.1.10) before closing
+   the connection and SHOULD respond to any intervening commands with
+
+
+
+Klensin                     Standards Track                    [Page 15]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   "503 bad sequence of commands".  Since an attempt to make an SMTP
+   connection to such a system is probably in error, a server returning
+   a 554 response on connection opening SHOULD provide enough
+   information in the reply text to facilitate debugging of the sending
+   system.
+
+3.2 Client Initiation
+
+   Once the server has sent the welcoming message and the client has
+   received it, the client normally sends the EHLO command to the
+   server, indicating the client's identity.  In addition to opening the
+   session, use of EHLO indicates that the client is able to process
+   service extensions and requests that the server provide a list of the
+   extensions it supports.  Older SMTP systems which are unable to
+   support service extensions and contemporary clients which do not
+   require service extensions in the mail session being initiated, MAY
+   use HELO instead of EHLO.  Servers MUST NOT return the extended
+   EHLO-style response to a HELO command.  For a particular connection
+   attempt, if the server returns a "command not recognized" response to
+   EHLO, the client SHOULD be able to fall back and send HELO.
+
+   In the EHLO command the host sending the command identifies itself;
+   the command may be interpreted as saying "Hello, I am <domain>" (and,
+   in the case of EHLO, "and I support service extension requests").
+
+3.3 Mail Transactions
+
+   There are three steps to SMTP mail transactions.  The transaction
+   starts with a MAIL command which gives the sender identification.
+   (In general, the MAIL command may be sent only when no mail
+   transaction is in progress; see section 4.1.4.)  A series of one or
+   more RCPT commands follows giving the receiver information.  Then a
+   DATA command initiates transfer of the mail data and is terminated by
+   the "end of mail" data indicator, which also confirms the
+   transaction.
+
+   The first step in the procedure is the MAIL command.
+
+      MAIL FROM:<reverse-path> [SP <mail-parameters> ] <CRLF>
+
+   This command tells the SMTP-receiver that a new mail transaction is
+   starting and to reset all its state tables and buffers, including any
+   recipients or mail data.  The <reverse-path> portion of the first or
+   only argument contains the source mailbox (between "<" and ">"
+   brackets), which can be used to report errors (see section 4.2 for a
+   discussion of error reporting).  If accepted, the SMTP server returns
+   a 250 OK reply.  If the mailbox specification is not acceptable for
+   some reason, the server MUST return a reply indicating whether the
+
+
+
+Klensin                     Standards Track                    [Page 16]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   failure is permanent (i.e., will occur again if the client tries to
+   send the same address again) or temporary (i.e., the address might be
+   accepted if the client tries again later).  Despite the apparent
+   scope of this requirement, there are circumstances in which the
+   acceptability of the reverse-path may not be determined until one or
+   more forward-paths (in RCPT commands) can be examined.  In those
+   cases, the server MAY reasonably accept the reverse-path (with a 250
+   reply) and then report problems after the forward-paths are received
+   and examined.  Normally, failures produce 550 or 553 replies.
+
+   Historically, the <reverse-path> can contain more than just a
+   mailbox, however, contemporary systems SHOULD NOT use source routing
+   (see appendix C).
+
+   The optional <mail-parameters> are associated with negotiated SMTP
+   service extensions (see section 2.2).
+
+   The second step in the procedure is the RCPT command.
+
+      RCPT TO:<forward-path> [ SP <rcpt-parameters> ] <CRLF>
+
+   The first or only argument to this command includes a forward-path
+   (normally a mailbox and domain, always surrounded by "<" and ">"
+   brackets) identifying one recipient.  If accepted, the SMTP server
+   returns a 250 OK reply and stores the forward-path.  If the recipient
+   is known not to be a deliverable address, the SMTP server returns a
+   550 reply, typically with a string such as "no such user - " and the
+   mailbox name (other circumstances and reply codes are possible).
+   This step of the procedure can be repeated any number of times.
+
+   The <forward-path> can contain more than just a mailbox.
+   Historically, the <forward-path> can be a source routing list of
+   hosts and the destination mailbox, however, contemporary SMTP clients
+   SHOULD NOT utilize source routes (see appendix C).  Servers MUST be
+   prepared to encounter a list of source routes in the forward path,
+   but SHOULD ignore the routes or MAY decline to support the relaying
+   they imply.  Similarly, servers MAY decline to accept mail that is
+   destined for other hosts or systems.  These restrictions make a
+   server useless as a relay for clients that do not support full SMTP
+   functionality.  Consequently, restricted-capability clients MUST NOT
+   assume that any SMTP server on the Internet can be used as their mail
+   processing (relaying) site.  If a RCPT command appears without a
+   previous MAIL command, the server MUST return a 503 "Bad sequence of
+   commands" response.  The optional <rcpt-parameters> are associated
+   with negotiated SMTP service extensions (see section 2.2).
+
+   The third step in the procedure is the DATA command (or some
+   alternative specified in a service extension).
+
+
+
+Klensin                     Standards Track                    [Page 17]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+      DATA <CRLF>
+
+   If accepted, the SMTP server returns a 354 Intermediate reply and
+   considers all succeeding lines up to but not including the end of
+   mail data indicator to be the message text.  When the end of text is
+   successfully received and stored the SMTP-receiver sends a 250 OK
+   reply.
+
+   Since the mail data is sent on the transmission channel, the end of
+   mail data must be indicated so that the command and reply dialog can
+   be resumed.  SMTP indicates the end of the mail data by sending a
+   line containing only a "." (period or full stop).  A transparency
+   procedure is used to prevent this from interfering with the user's
+   text (see section 4.5.2).
+
+   The end of mail data indicator also confirms the mail transaction and
+   tells the SMTP server to now process the stored recipients and mail
+   data.  If accepted, the SMTP server returns a 250 OK reply.  The DATA
+   command can fail at only two points in the protocol exchange:
+
+   -  If there was no MAIL, or no RCPT, command, or all such commands
+      were rejected, the server MAY return a "command out of sequence"
+      (503) or "no valid recipients" (554) reply in response to the DATA
+      command.  If one of those replies (or any other 5yz reply) is
+      received, the client MUST NOT send the message data; more
+      generally, message data MUST NOT be sent unless a 354 reply is
+      received.
+
+   -  If the verb is initially accepted and the 354 reply issued, the
+      DATA command should fail only if the mail transaction was
+      incomplete (for example, no recipients), or if resources were
+      unavailable (including, of course, the server unexpectedly
+      becoming unavailable), or if the server determines that the
+      message should be rejected for policy or other reasons.
+
+   However, in practice, some servers do not perform recipient
+   verification until after the message text is received.  These servers
+   SHOULD treat a failure for one or more recipients as a "subsequent
+   failure" and return a mail message as discussed in section 6.  Using
+   a "550 mailbox not found" (or equivalent) reply code after the data
+   are accepted makes it difficult or impossible for the client to
+   determine which recipients failed.
+
+   When RFC 822 format [7, 32] is being used, the mail data include the
+   memo header items such as Date, Subject, To, Cc, From.  Server SMTP
+   systems SHOULD NOT reject messages based on perceived defects in the
+   RFC 822 or MIME [12] message header or message body.  In particular,
+
+
+
+
+Klensin                     Standards Track                    [Page 18]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   they MUST NOT reject messages in which the numbers of Resent-fields
+   do not match or Resent-to appears without Resent-from and/or Resent-
+   date.
+
+   Mail transaction commands MUST be used in the order discussed above.
+
+3.4 Forwarding for Address Correction or Updating
+
+   Forwarding support is most often required to consolidate and simplify
+   addresses within, or relative to, some enterprise and less frequently
+   to establish addresses to link a person's prior address with current
+   one.  Silent forwarding of messages (without server notification to
+   the sender), for security or non-disclosure purposes, is common in
+   the contemporary Internet.
+
+   In both the enterprise and the "new address" cases, information
+   hiding (and sometimes security) considerations argue against exposure
+   of the "final" address through the SMTP protocol as a side-effect of
+   the forwarding activity.  This may be especially important when the
+   final address may not even be reachable by the sender.  Consequently,
+   the "forwarding" mechanisms described in section 3.2 of RFC 821, and
+   especially the 251 (corrected destination) and 551 reply codes from
+   RCPT must be evaluated carefully by implementers and, when they are
+   available, by those configuring systems.
+
+   In particular:
+
+   *  Servers MAY forward messages when they are aware of an address
+      change.  When they do so, they MAY either provide address-updating
+      information with a 251 code, or may forward "silently" and return
+      a 250 code.  But, if a 251 code is used, they MUST NOT assume that
+      the client will actually update address information or even return
+      that information to the user.
+
+   Alternately,
+
+   *  Servers MAY reject or bounce messages when they are not
+      deliverable when addressed.  When they do so, they MAY either
+      provide address-updating information with a 551 code, or may
+      reject the message as undeliverable with a 550 code and no
+      address-specific information.  But, if a 551 code is used, they
+      MUST NOT assume that the client will actually update address
+      information or even return that information to the user.
+
+   SMTP server implementations that support the 251 and/or 551 reply
+   codes are strongly encouraged to provide configuration mechanisms so
+   that sites which conclude that they would undesirably disclose
+   information can disable or restrict their use.
+
+
+
+Klensin                     Standards Track                    [Page 19]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+3.5 Commands for Debugging Addresses
+
+3.5.1 Overview
+
+   SMTP provides commands to verify a user name or obtain the content of
+   a mailing list.  This is done with the VRFY and EXPN commands, which
+   have character string arguments.  Implementations SHOULD support VRFY
+   and EXPN (however, see section 3.5.2 and 7.3).
+
+   For the VRFY command, the string is a user name or a user name and
+   domain (see below).  If a normal (i.e., 250) response is returned,
+   the response MAY include the full name of the user and MUST include
+   the mailbox of the user.  It MUST be in either of the following
+   forms:
+
+      User Name <local-part@domain>
+      local-part@domain
+
+   When a name that is the argument to VRFY could identify more than one
+   mailbox, the server MAY either note the ambiguity or identify the
+   alternatives.  In other words, any of the following are legitimate
+   response to VRFY:
+
+      553 User ambiguous
+
+   or
+
+      553- Ambiguous;  Possibilities are
+      553-Joe Smith <jsmith@foo.com>
+      553-Harry Smith <hsmith@foo.com>
+      553 Melvin Smith <dweep@foo.com>
+
+   or
+
+      553-Ambiguous;  Possibilities
+      553- <jsmith@foo.com>
+      553- <hsmith@foo.com>
+      553 <dweep@foo.com>
+
+   Under normal circumstances, a client receiving a 553 reply would be
+   expected to expose the result to the user.  Use of exactly the forms
+   given, and the "user ambiguous" or "ambiguous" keywords, possibly
+   supplemented by extended reply codes such as those described in [34],
+   will facilitate automated translation into other languages as needed.
+   Of course, a client that was highly automated or that was operating
+   in another language than English, might choose to try to translate
+   the response, to return some other indication to the user than the
+
+
+
+
+Klensin                     Standards Track                    [Page 20]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   literal text of the reply, or to take some automated action such as
+   consulting a directory service for additional information before
+   reporting to the user.
+
+   For the EXPN command, the string identifies a mailing list, and the
+   successful (i.e., 250) multiline response MAY include the full name
+   of the users and MUST give the mailboxes on the mailing list.
+
+   In some hosts the distinction between a mailing list and an alias for
+   a single mailbox is a bit fuzzy, since a common data structure may
+   hold both types of entries, and it is possible to have mailing lists
+   containing only one mailbox.  If a request is made to apply VRFY to a
+   mailing list, a positive response MAY be given if a message so
+   addressed would be delivered to everyone on the list, otherwise an
+   error SHOULD be reported (e.g., "550 That is a mailing list, not a
+   user" or "252 Unable to verify members of mailing list").  If a
+   request is made to expand a user name, the server MAY return a
+   positive response consisting of a list containing one name, or an
+   error MAY be reported (e.g., "550 That is a user name, not a mailing
+   list").
+
+   In the case of a successful multiline reply (normal for EXPN) exactly
+   one mailbox is to be specified on each line of the reply.  The case
+   of an ambiguous request is discussed above.
+
+   "User name" is a fuzzy term and has been used deliberately.  An
+   implementation of the VRFY or EXPN commands MUST include at least
+   recognition of local mailboxes as "user names".  However, since
+   current Internet practice often results in a single host handling
+   mail for multiple domains, hosts, especially hosts that provide this
+   functionality, SHOULD accept the "local-part@domain" form as a "user
+   name"; hosts MAY also choose to recognize other strings as "user
+   names".
+
+   The case of expanding a mailbox list requires a multiline reply, such
+   as:
+
+      C: EXPN Example-People
+      S: 250-Jon Postel <Postel@isi.edu>
+      S: 250-Fred Fonebone <Fonebone@physics.foo-u.edu>
+      S: 250 Sam Q. Smith <SQSmith@specific.generic.com>
+
+   or
+
+      C: EXPN Executive-Washroom-List
+      S: 550 Access Denied to You.
+
+
+
+
+
+Klensin                     Standards Track                    [Page 21]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   The character string arguments of the VRFY and EXPN commands cannot
+   be further restricted due to the variety of implementations of the
+   user name and mailbox list concepts.  On some systems it may be
+   appropriate for the argument of the EXPN command to be a file name
+   for a file containing a mailing list, but again there are a variety
+   of file naming conventions in the Internet.  Similarly, historical
+   variations in what is returned by these commands are such that the
+   response SHOULD be interpreted very carefully, if at all, and SHOULD
+   generally only be used for diagnostic purposes.
+
+3.5.2 VRFY Normal Response
+
+   When normal (2yz or 551) responses are returned from a VRFY or EXPN
+   request, the reply normally includes the mailbox name, i.e.,
+   "<local-part@domain>", where "domain" is a fully qualified domain
+   name, MUST appear in the syntax.  In circumstances exceptional enough
+   to justify violating the intent of this specification, free-form text
+   MAY be returned.  In order to facilitate parsing by both computers
+   and people, addresses SHOULD appear in pointed brackets.  When
+   addresses, rather than free-form debugging information, are returned,
+   EXPN and VRFY MUST return only valid domain addresses that are usable
+   in SMTP RCPT commands.  Consequently, if an address implies delivery
+   to a program or other system, the mailbox name used to reach that
+   target MUST be given.  Paths (explicit source routes) MUST NOT be
+   returned by VRFY or EXPN.
+
+   Server implementations SHOULD support both VRFY and EXPN.  For
+   security reasons, implementations MAY provide local installations a
+   way to disable either or both of these commands through configuration
+   options or the equivalent.  When these commands are supported, they
+   are not required to work across relays when relaying is supported.
+   Since they were both optional in RFC 821, they MUST be listed as
+   service extensions in an EHLO response, if they are supported.
+
+3.5.3 Meaning of VRFY or EXPN Success Response
+
+   A server MUST NOT return a 250 code in response to a VRFY or EXPN
+   command unless it has actually verified the address.  In particular,
+   a server MUST NOT return 250 if all it has done is to verify that the
+   syntax given is valid.  In that case, 502 (Command not implemented)
+   or 500 (Syntax error, command unrecognized) SHOULD be returned.  As
+   stated elsewhere, implementation (in the sense of actually validating
+   addresses and returning information) of VRFY and EXPN are strongly
+   recommended.  Hence, implementations that return 500 or 502 for VRFY
+   are not in full compliance with this specification.
+
+
+
+
+
+
+Klensin                     Standards Track                    [Page 22]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   There may be circumstances where an address appears to be valid but
+   cannot reasonably be verified in real time, particularly when a
+   server is acting as a mail exchanger for another server or domain.
+   "Apparent validity" in this case would normally involve at least
+   syntax checking and might involve verification that any domains
+   specified were ones to which the host expected to be able to relay
+   mail.  In these situations, reply code 252 SHOULD be returned.  These
+   cases parallel the discussion of RCPT verification discussed in
+   section 2.1.  Similarly, the discussion in section 3.4 applies to the
+   use of reply codes 251 and 551 with VRFY (and EXPN) to indicate
+   addresses that are recognized but that would be forwarded or bounced
+   were mail received for them.  Implementations generally SHOULD be
+   more aggressive about address verification in the case of VRFY than
+   in the case of RCPT, even if it takes a little longer to do so.
+
+3.5.4 Semantics and Applications of EXPN
+
+   EXPN is often very useful in debugging and understanding problems
+   with mailing lists and multiple-target-address aliases.  Some systems
+   have attempted to use source expansion of mailing lists as a means of
+   eliminating duplicates.  The propagation of aliasing systems with
+   mail on the Internet, for hosts (typically with MX and CNAME DNS
+   records), for mailboxes (various types of local host aliases), and in
+   various proxying arrangements, has made it nearly impossible for
+   these strategies to work consistently, and mail systems SHOULD NOT
+   attempt them.
+
+3.6 Domains
+
+   Only resolvable, fully-qualified, domain names (FQDNs) are permitted
+   when domain names are used in SMTP.  In other words, names that can
+   be resolved to MX RRs or A RRs (as discussed in section 5) are
+   permitted, as are CNAME RRs whose targets can be resolved, in turn,
+   to MX or A RRs.  Local nicknames or unqualified names MUST NOT be
+   used.  There are two exceptions to the rule requiring FQDNs:
+
+   -  The domain name given in the EHLO command MUST BE either a primary
+      host name (a domain name that resolves to an A RR) or, if the host
+      has no name, an address literal as described in section 4.1.1.1.
+
+   -  The reserved mailbox name "postmaster" may be used in a RCPT
+      command without domain qualification (see section 4.1.1.3) and
+      MUST be accepted if so used.
+
+
+
+
+
+
+
+
+Klensin                     Standards Track                    [Page 23]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+3.7 Relaying
+
+   In general, the availability of Mail eXchanger records in the domain
+   name system [22, 27] makes the use of explicit source routes in the
+   Internet mail system unnecessary.  Many historical problems with
+   their interpretation have made their use undesirable.  SMTP clients
+   SHOULD NOT generate explicit source routes except under unusual
+   circumstances.  SMTP servers MAY decline to act as mail relays or to
+   accept addresses that specify source routes.  When route information
+   is encountered, SMTP servers are also permitted to ignore the route
+   information and simply send to the final destination specified as the
+   last element in the route and SHOULD do so.  There has been an
+   invalid practice of using names that do not appear in the DNS as
+   destination names, with the senders counting on the intermediate
+   hosts specified in source routing to resolve any problems.  If source
+   routes are stripped, this practice will cause failures.  This is one
+   of several reasons why SMTP clients MUST NOT generate invalid source
+   routes or depend on serial resolution of names.
+
+   When source routes are not used, the process described in RFC 821 for
+   constructing a reverse-path from the forward-path is not applicable
+   and the reverse-path at the time of delivery will simply be the
+   address that appeared in the MAIL command.
+
+   A relay SMTP server is usually the target of a DNS MX record that
+   designates it, rather than the final delivery system.  The relay
+   server may accept or reject the task of relaying the mail in the same
+   way it accepts or rejects mail for a local user.  If it accepts the
+   task, it then becomes an SMTP client, establishes a transmission
+   channel to the next SMTP server specified in the DNS (according to
+   the rules in section 5), and sends it the mail.  If it declines to
+   relay mail to a particular address for policy reasons, a 550 response
+   SHOULD be returned.
+
+   Many mail-sending clients exist, especially in conjunction with
+   facilities that receive mail via POP3 or IMAP, that have limited
+   capability to support some of the requirements of this specification,
+   such as the ability to queue messages for subsequent delivery
+   attempts.  For these clients, it is common practice to make private
+   arrangements to send all messages to a single server for processing
+   and subsequent distribution.  SMTP, as specified here, is not ideally
+   suited for this role, and work is underway on standardized mail
+   submission protocols that might eventually supercede the current
+   practices.  In any event, because these arrangements are private and
+   fall outside the scope of this specification, they are not described
+   here.
+
+
+
+
+
+Klensin                     Standards Track                    [Page 24]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   It is important to note that MX records can point to SMTP servers
+   which act as gateways into other environments, not just SMTP relays
+   and final delivery systems; see sections 3.8 and 5.
+
+   If an SMTP server has accepted the task of relaying the mail and
+   later finds that the destination is incorrect or that the mail cannot
+   be delivered for some other reason, then it MUST construct an
+   "undeliverable mail" notification message and send it to the
+   originator of the undeliverable mail (as indicated by the reverse-
+   path).  Formats specified for non-delivery reports by other standards
+   (see, for example, [24, 25]) SHOULD be used if possible.
+
+   This notification message must be from the SMTP server at the relay
+   host or the host that first determines that delivery cannot be
+   accomplished.  Of course, SMTP servers MUST NOT send notification
+   messages about problems transporting notification messages.  One way
+   to prevent loops in error reporting is to specify a null reverse-path
+   in the MAIL command of a notification message.  When such a message
+   is transmitted the reverse-path MUST be set to null (see section
+   4.5.5 for additional discussion).  A MAIL command with a null
+   reverse-path appears as follows:
+
+      MAIL FROM:<>
+
+   As discussed in section 2.4.1, a relay SMTP has no need to inspect or
+   act upon the headers or body of the message data and MUST NOT do so
+   except to add its own "Received:" header (section 4.4) and,
+   optionally, to attempt to detect looping in the mail system (see
+   section 6.2).
+
+3.8 Mail Gatewaying
+
+   While the relay function discussed above operates within the Internet
+   SMTP transport service environment, MX records or various forms of
+   explicit routing may require that an intermediate SMTP server perform
+   a translation function between one transport service and another.  As
+   discussed in section 2.3.8, when such a system is at the boundary
+   between two transport service environments, we refer to it as a
+   "gateway" or "gateway SMTP".
+
+   Gatewaying mail between different mail environments, such as
+   different mail formats and protocols, is complex and does not easily
+   yield to standardization.  However, some general requirements may be
+   given for a gateway between the Internet and another mail
+   environment.
+
+
+
+
+
+
+Klensin                     Standards Track                    [Page 25]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+3.8.1 Header Fields in Gatewaying
+
+   Header fields MAY be rewritten when necessary as messages are
+   gatewayed across mail environment boundaries.  This may involve
+   inspecting the message body or interpreting the local-part of the
+   destination address in spite of the prohibitions in section 2.4.1.
+
+   Other mail systems gatewayed to the Internet often use a subset of
+   RFC 822 headers or provide similar functionality with a different
+   syntax, but some of these mail systems do not have an equivalent to
+   the SMTP envelope.  Therefore, when a message leaves the Internet
+   environment, it may be necessary to fold the SMTP envelope
+   information into the message header.  A possible solution would be to
+   create new header fields to carry the envelope information (e.g.,
+   "X-SMTP-MAIL:"  and "X-SMTP-RCPT:"); however, this would require
+   changes in mail programs in foreign environments and might risk
+   disclosure of private information (see section 7.2).
+
+3.8.2 Received Lines in Gatewaying
+
+   When forwarding a message into or out of the Internet environment, a
+   gateway MUST prepend a Received: line, but it MUST NOT alter in any
+   way a Received: line that is already in the header.
+
+   "Received:" fields of messages originating from other environments
+   may not conform exactly to this specification.  However, the most
+   important use of Received: lines is for debugging mail faults, and
+   this debugging can be severely hampered by well-meaning gateways that
+   try to "fix" a Received: line.  As another consequence of trace
+   fields arising in non-SMTP environments, receiving systems MUST NOT
+   reject mail based on the format of a trace field and SHOULD be
+   extremely robust in the light of unexpected information or formats in
+   those fields.
+
+   The gateway SHOULD indicate the environment and protocol in the "via"
+   clauses of Received field(s) that it supplies.
+
+3.8.3 Addresses in Gatewaying
+
+   From the Internet side, the gateway SHOULD accept all valid address
+   formats in SMTP commands and in RFC 822 headers, and all valid RFC
+   822 messages.  Addresses and headers generated by gateways MUST
+   conform to applicable Internet standards (including this one and RFC
+   822).  Gateways are, of course, subject to the same rules for
+   handling source routes as those described for other SMTP systems in
+   section 3.3.
+
+
+
+
+
+Klensin                     Standards Track                    [Page 26]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+3.8.4 Other Header Fields in Gatewaying
+
+   The gateway MUST ensure that all header fields of a message that it
+   forwards into the Internet mail environment meet the requirements for
+   Internet mail.  In particular, all addresses in "From:", "To:",
+   "Cc:", etc., fields MUST be transformed (if necessary) to satisfy RFC
+   822 syntax, MUST reference only fully-qualified domain names, and
+   MUST be effective and useful for sending replies.  The translation
+   algorithm used to convert mail from the Internet protocols to another
+   environment's protocol SHOULD ensure that error messages from the
+   foreign mail environment are delivered to the return path from the
+   SMTP envelope, not to the sender listed in the "From:" field (or
+   other fields) of the RFC 822 message.
+
+3.8.5 Envelopes in Gatewaying
+
+   Similarly, when forwarding a message from another environment into
+   the Internet, the gateway SHOULD set the envelope return path in
+   accordance with an error message return address, if supplied by the
+   foreign environment.  If the foreign environment has no equivalent
+   concept, the gateway must select and use a best approximation, with
+   the message originator's address as the default of last resort.
+
+3.9 Terminating Sessions and Connections
+
+   An SMTP connection is terminated when the client sends a QUIT
+   command.  The server responds with a positive reply code, after which
+   it closes the connection.
+
+   An SMTP server MUST NOT intentionally close the connection except:
+
+   -  After receiving a QUIT command and responding with a 221 reply.
+
+   -  After detecting the need to shut down the SMTP service and
+      returning a 421 response code.  This response code can be issued
+      after the server receives any command or, if necessary,
+      asynchronously from command receipt (on the assumption that the
+      client will receive it after the next command is issued).
+
+   In particular, a server that closes connections in response to
+   commands that are not understood is in violation of this
+   specification.  Servers are expected to be tolerant of unknown
+   commands, issuing a 500 reply and awaiting further instructions from
+   the client.
+
+
+
+
+
+
+
+Klensin                     Standards Track                    [Page 27]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   An SMTP server which is forcibly shut down via external means SHOULD
+   attempt to send a line containing a 421 response code to the SMTP
+   client before exiting.  The SMTP client will normally read the 421
+   response code after sending its next command.
+
+   SMTP clients that experience a connection close, reset, or other
+   communications failure due to circumstances not under their control
+   (in violation of the intent of this specification but sometimes
+   unavoidable) SHOULD, to maintain the robustness of the mail system,
+   treat the mail transaction as if a 451 response had been received and
+   act accordingly.
+
+3.10 Mailing Lists and Aliases
+
+   An SMTP-capable host SHOULD support both the alias and the list
+   models of address expansion for multiple delivery.  When a message is
+   delivered or forwarded to each address of an expanded list form, the
+   return address in the envelope ("MAIL FROM:") MUST be changed to be
+   the address of a person or other entity who administers the list.
+   However, in this case, the message header [32] MUST be left
+   unchanged; in particular, the "From" field of the message header is
+   unaffected.
+
+   An important mail facility is a mechanism for multi-destination
+   delivery of a single message, by transforming (or "expanding" or
+   "exploding") a pseudo-mailbox address into a list of destination
+   mailbox addresses.  When a message is sent to such a pseudo-mailbox
+   (sometimes called an "exploder"), copies are forwarded or
+   redistributed to each mailbox in the expanded list.  Servers SHOULD
+   simply utilize the addresses on the list; application of heuristics
+   or other matching rules to eliminate some addresses, such as that of
+   the originator, is strongly discouraged.  We classify such a pseudo-
+   mailbox as an "alias" or a "list", depending upon the expansion
+   rules.
+
+3.10.1 Alias
+
+   To expand an alias, the recipient mailer simply replaces the pseudo-
+   mailbox address in the envelope with each of the expanded addresses
+   in turn; the rest of the envelope and the message body are left
+   unchanged.  The message is then delivered or forwarded to each
+   expanded address.
+
+3.10.2 List
+
+   A mailing list may be said to operate by "redistribution" rather than
+   by "forwarding".  To expand a list, the recipient mailer replaces the
+   pseudo-mailbox address in the envelope with all of the expanded
+
+
+
+Klensin                     Standards Track                    [Page 28]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   addresses.  The return address in the envelope is changed so that all
+   error messages generated by the final deliveries will be returned to
+   a list administrator, not to the message originator, who generally
+   has no control over the contents of the list and will typically find
+   error messages annoying.
+
+4. The SMTP Specifications
+
+4.1 SMTP Commands
+
+4.1.1 Command Semantics and Syntax
+
+   The SMTP commands define the mail transfer or the mail system
+   function requested by the user.  SMTP commands are character strings
+   terminated by <CRLF>.  The commands themselves are alphabetic
+   characters terminated by <SP> if parameters follow and <CRLF>
+   otherwise.  (In the interest of improved interoperability, SMTP
+   receivers are encouraged to tolerate trailing white space before the
+   terminating <CRLF>.)  The syntax of the local part of a mailbox must
+   conform to receiver site conventions and the syntax specified in
+   section 4.1.2.  The SMTP commands are discussed below.  The SMTP
+   replies are discussed in section 4.2.
+
+   A mail transaction involves several data objects which are
+   communicated as arguments to different commands.  The reverse-path is
+   the argument of the MAIL command, the forward-path is the argument of
+   the RCPT command, and the mail data is the argument of the DATA
+   command.  These arguments or data objects must be transmitted and
+   held pending the confirmation communicated by the end of mail data
+   indication which finalizes the transaction.  The model for this is
+   that distinct buffers are provided to hold the types of data objects,
+   that is, there is a reverse-path buffer, a forward-path buffer, and a
+   mail data buffer.  Specific commands cause information to be appended
+   to a specific buffer, or cause one or more buffers to be cleared.
+
+   Several commands (RSET, DATA, QUIT) are specified as not permitting
+   parameters.  In the absence of specific extensions offered by the
+   server and accepted by the client, clients MUST NOT send such
+   parameters and servers SHOULD reject commands containing them as
+   having invalid syntax.
+
+4.1.1.1  Extended HELLO (EHLO) or HELLO (HELO)
+
+   These commands are used to identify the SMTP client to the SMTP
+   server.  The argument field contains the fully-qualified domain name
+   of the SMTP client if one is available.  In situations in which the
+   SMTP client system does not have a meaningful domain name (e.g., when
+   its address is dynamically allocated and no reverse mapping record is
+
+
+
+Klensin                     Standards Track                    [Page 29]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   available), the client SHOULD send an address literal (see section
+   4.1.3), optionally followed by information that will help to identify
+   the client system.  y The SMTP server identifies itself to the SMTP
+   client in the connection greeting reply and in the response to this
+   command.
+
+   A client SMTP SHOULD start an SMTP session by issuing the EHLO
+   command.  If the SMTP server supports the SMTP service extensions it
+   will give a successful response, a failure response, or an error
+   response.  If the SMTP server, in violation of this specification,
+   does not support any SMTP service extensions it will generate an
+   error response.  Older client SMTP systems MAY, as discussed above,
+   use HELO (as specified in RFC 821) instead of EHLO, and servers MUST
+   support the HELO command and reply properly to it.  In any event, a
+   client MUST issue HELO or EHLO before starting a mail transaction.
+
+   These commands, and a "250 OK" reply to one of them, confirm that
+   both the SMTP client and the SMTP server are in the initial state,
+   that is, there is no transaction in progress and all state tables and
+   buffers are cleared.
+
+   Syntax:
+
+      ehlo            = "EHLO" SP Domain CRLF
+      helo            = "HELO" SP Domain CRLF
+
+   Normally, the response to EHLO will be a multiline reply.  Each line
+   of the response contains a keyword and, optionally, one or more
+   parameters.  Following the normal syntax for multiline replies, these
+   keyworks follow the code (250) and a hyphen for all but the last
+   line, and the code and a space for the last line.  The syntax for a
+   positive response, using the ABNF notation and terminal symbols of
+   [8], is:
+
+      ehlo-ok-rsp  =    ( "250"    domain [ SP ehlo-greet ] CRLF )
+                   / (    "250-"   domain [ SP ehlo-greet ] CRLF
+                       *( "250-"   ehlo-line                CRLF )
+                          "250"    SP ehlo-line             CRLF  )
+
+      ehlo-greet   = 1*(%d0-9 / %d11-12 / %d14-127)
+                   ; string of any characters other than CR or LF
+
+      ehlo-line    = ehlo-keyword *( SP ehlo-param )
+
+      ehlo-keyword = (ALPHA / DIGIT) *(ALPHA / DIGIT / "-")
+                   ; additional syntax of ehlo-params depends on
+                   ; ehlo-keyword
+
+
+
+
+Klensin                     Standards Track                    [Page 30]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+      ehlo-param   = 1*(%d33-127)
+                   ; any CHAR excluding <SP> and all
+                   ; control characters (US-ASCII 0-31 inclusive)
+
+   Although EHLO keywords may be specified in upper, lower, or mixed
+   case, they MUST always be recognized and processed in a case-
+   insensitive manner.  This is simply an extension of practices
+   specified in RFC 821 and section 2.4.1.
+
+4.1.1.2 MAIL (MAIL)
+
+   This command is used to initiate a mail transaction in which the mail
+   data is delivered to an SMTP server which may, in turn, deliver it to
+   one or more mailboxes or pass it on to another system (possibly using
+   SMTP).  The argument field contains a reverse-path and may contain
+   optional parameters.  In general, the MAIL command may be sent only
+   when no mail transaction is in progress, see section 4.1.4.
+
+   The reverse-path consists of the sender mailbox.  Historically, that
+   mailbox might optionally have been preceded by a list of hosts, but
+   that behavior is now deprecated (see appendix C).  In some types of
+   reporting messages for which a reply is likely to cause a mail loop
+   (for example, mail delivery and nondelivery notifications), the
+   reverse-path may be null (see section 3.7).
+
+   This command clears the reverse-path buffer, the forward-path buffer,
+   and the mail data buffer; and inserts the reverse-path information
+   from this command into the reverse-path buffer.
+
+   If service extensions were negotiated, the MAIL command may also
+   carry parameters associated with a particular service extension.
+
+   Syntax:
+
+      "MAIL FROM:" ("<>" / Reverse-Path)
+                       [SP Mail-parameters] CRLF
+
+4.1.1.3 RECIPIENT (RCPT)
+
+   This command is used to identify an individual recipient of the mail
+   data; multiple recipients are specified by multiple use of this
+   command.  The argument field contains a forward-path and may contain
+   optional parameters.
+
+   The forward-path normally consists of the required destination
+   mailbox.  Sending systems SHOULD not generate the optional list of
+   hosts known as a source route.  Receiving systems MUST recognize
+
+
+
+
+Klensin                     Standards Track                    [Page 31]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   source route syntax but SHOULD strip off the source route
+   specification and utilize the domain name associated with the mailbox
+   as if the source route had not been provided.
+
+   Similarly, relay hosts SHOULD strip or ignore source routes, and
+   names MUST NOT be copied into the reverse-path.  When mail reaches
+   its ultimate destination (the forward-path contains only a
+   destination mailbox), the SMTP server inserts it into the destination
+   mailbox in accordance with its host mail conventions.
+
+   For example, mail received at relay host xyz.com with envelope
+   commands
+
+      MAIL FROM:<userx@y.foo.org>
+      RCPT TO:<@hosta.int,@jkl.org:userc@d.bar.org>
+
+   will normally be sent directly on to host d.bar.org with envelope
+   commands
+
+      MAIL FROM:<userx@y.foo.org>
+      RCPT TO:<userc@d.bar.org>
+
+   As provided in appendix C, xyz.com MAY also choose to relay the
+   message to hosta.int, using the envelope commands
+
+      MAIL FROM:<userx@y.foo.org>
+      RCPT TO:<@hosta.int,@jkl.org:userc@d.bar.org>
+
+   or to jkl.org, using the envelope commands
+
+      MAIL FROM:<userx@y.foo.org>
+      RCPT TO:<@jkl.org:userc@d.bar.org>
+
+   Of course, since hosts are not required to relay mail at all, xyz.com
+   may also reject the message entirely when the RCPT command is
+   received, using a 550 code (since this is a "policy reason").
+
+   If service extensions were negotiated, the RCPT command may also
+   carry parameters associated with a particular service extension
+   offered by the server.  The client MUST NOT transmit parameters other
+   than those associated with a service extension offered by the server
+   in its EHLO response.
+
+Syntax:
+   "RCPT TO:" ("<Postmaster@" domain ">" / "<Postmaster>" / Forward-Path)
+                    [SP Rcpt-parameters] CRLF
+
+
+
+
+
+Klensin                     Standards Track                    [Page 32]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+4.1.1.4 DATA (DATA)
+
+   The receiver normally sends a 354 response to DATA, and then treats
+   the lines (strings ending in <CRLF> sequences, as described in
+   section 2.3.7) following the command as mail data from the sender.
+   This command causes the mail data to be appended to the mail data
+   buffer.  The mail data may contain any of the 128 ASCII character
+   codes, although experience has indicated that use of control
+   characters other than SP, HT, CR, and LF may cause problems and
+   SHOULD be avoided when possible.
+
+   The mail data is terminated by a line containing only a period, that
+   is, the character sequence "<CRLF>.<CRLF>" (see section 4.5.2).  This
+   is the end of mail data indication.  Note that the first <CRLF> of
+   this terminating sequence is also the <CRLF> that ends the final line
+   of the data (message text) or, if there was no data, ends the DATA
+   command itself.  An extra <CRLF> MUST NOT be added, as that would
+   cause an empty line to be added to the message.  The only exception
+   to this rule would arise if the message body were passed to the
+   originating SMTP-sender with a final "line" that did not end in
+   <CRLF>; in that case, the originating SMTP system MUST either reject
+   the message as invalid or add <CRLF> in order to have the receiving
+   SMTP server recognize the "end of data" condition.
+
+   The custom of accepting lines ending only in <LF>, as a concession to
+   non-conforming behavior on the part of some UNIX systems, has proven
+   to cause more interoperability problems than it solves, and SMTP
+   server systems MUST NOT do this, even in the name of improved
+   robustness.  In particular, the sequence "<LF>.<LF>" (bare line
+   feeds, without carriage returns) MUST NOT be treated as equivalent to
+   <CRLF>.<CRLF> as the end of mail data indication.
+
+   Receipt of the end of mail data indication requires the server to
+   process the stored mail transaction information.  This processing
+   consumes the information in the reverse-path buffer, the forward-path
+   buffer, and the mail data buffer, and on the completion of this
+   command these buffers are cleared.  If the processing is successful,
+   the receiver MUST send an OK reply.  If the processing fails the
+   receiver MUST send a failure reply.  The SMTP model does not allow
+   for partial failures at this point: either the message is accepted by
+   the server for delivery and a positive response is returned or it is
+   not accepted and a failure reply is returned.  In sending a positive
+   completion reply to the end of data indication, the receiver takes
+   full responsibility for the message (see section 6.1).  Errors that
+   are diagnosed subsequently MUST be reported in a mail message, as
+   discussed in section 4.4.
+
+
+
+
+
+Klensin                     Standards Track                    [Page 33]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   When the SMTP server accepts a message either for relaying or for
+   final delivery, it inserts a trace record (also referred to
+   interchangeably as a "time stamp line" or "Received" line) at the top
+   of the mail data.  This trace record indicates the identity of the
+   host that sent the message, the identity of the host that received
+   the message (and is inserting this time stamp), and the date and time
+   the message was received.  Relayed messages will have multiple time
+   stamp lines.  Details for formation of these lines, including their
+   syntax, is specified in section 4.4.
+
+   Additional discussion about the operation of the DATA command appears
+   in section 3.3.
+
+   Syntax:
+      "DATA" CRLF
+
+4.1.1.5 RESET (RSET)
+
+   This command specifies that the current mail transaction will be
+   aborted.  Any stored sender, recipients, and mail data MUST be
+   discarded, and all buffers and state tables cleared.  The receiver
+   MUST send a "250 OK" reply to a RSET command with no arguments.  A
+   reset command may be issued by the client at any time.  It is
+   effectively equivalent to a NOOP (i.e., if has no effect) if issued
+   immediately after EHLO, before EHLO is issued in the session, after
+   an end-of-data indicator has been sent and acknowledged, or
+   immediately before a QUIT.  An SMTP server MUST NOT close the
+   connection as the result of receiving a RSET; that action is reserved
+   for QUIT (see section 4.1.1.10).
+
+   Since EHLO implies some additional processing and response by the
+   server, RSET will normally be more efficient than reissuing that
+   command, even though the formal semantics are the same.
+
+   There are circumstances, contrary to the intent of this
+   specification, in which an SMTP server may receive an indication that
+   the underlying TCP connection has been closed or reset.  To preserve
+   the robustness of the mail system, SMTP servers SHOULD be prepared
+   for this condition and SHOULD treat it as if a QUIT had been received
+   before the connection disappeared.
+
+   Syntax:
+      "RSET" CRLF
+
+
+
+
+
+
+
+
+Klensin                     Standards Track                    [Page 34]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+4.1.1.6 VERIFY (VRFY)
+
+   This command asks the receiver to confirm that the argument
+   identifies a user or mailbox.  If it is a user name, information is
+   returned as specified in section 3.5.
+
+   This command has no effect on the reverse-path buffer, the forward-
+   path buffer, or the mail data buffer.
+
+   Syntax:
+      "VRFY" SP String CRLF
+
+4.1.1.7 EXPAND (EXPN)
+
+   This command asks the receiver to confirm that the argument
+   identifies a mailing list, and if so, to return the membership of
+   that list.  If the command is successful, a reply is returned
+   containing information as described in section 3.5.  This reply will
+   have multiple lines except in the trivial case of a one-member list.
+
+   This command has no effect on the reverse-path buffer, the forward-
+   path buffer, or the mail data buffer and may be issued at any time.
+
+   Syntax:
+      "EXPN" SP String CRLF
+
+4.1.1.8 HELP (HELP)
+
+   This command causes the server to send helpful information to the
+   client.  The command MAY take an argument (e.g., any command name)
+   and return more specific information as a response.
+
+   This command has no effect on the reverse-path buffer, the forward-
+   path buffer, or the mail data buffer and may be issued at any time.
+
+   SMTP servers SHOULD support HELP without arguments and MAY support it
+   with arguments.
+
+   Syntax:
+      "HELP" [ SP String ] CRLF
+
+4.1.1.9 NOOP (NOOP)
+
+   This command does not affect any parameters or previously entered
+   commands.  It specifies no action other than that the receiver send
+   an OK reply.
+
+
+
+
+
+Klensin                     Standards Track                    [Page 35]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   This command has no effect on the reverse-path buffer, the forward-
+   path buffer, or the mail data buffer and may be issued at any time.
+   If a parameter string is specified, servers SHOULD ignore it.
+
+   Syntax:
+      "NOOP" [ SP String ] CRLF
+
+4.1.1.10 QUIT (QUIT)
+
+   This command specifies that the receiver MUST send an OK reply, and
+   then close the transmission channel.
+
+   The receiver MUST NOT intentionally close the transmission channel
+   until it receives and replies to a QUIT command (even if there was an
+   error).  The sender MUST NOT intentionally close the transmission
+   channel until it sends a QUIT command and SHOULD wait until it
+   receives the reply (even if there was an error response to a previous
+   command).  If the connection is closed prematurely due to violations
+   of the above or system or network failure, the server MUST cancel any
+   pending transaction, but not undo any previously completed
+   transaction, and generally MUST act as if the command or transaction
+   in progress had received a temporary error (i.e., a 4yz response).
+
+   The QUIT command may be issued at any time.
+
+   Syntax:
+      "QUIT" CRLF
+
+4.1.2 Command Argument Syntax
+
+   The syntax of the argument fields of the above commands (using the
+   syntax specified in [8] where applicable) is given below.  Some of
+   the productions given below are used only in conjunction with source
+   routes as described in appendix C.  Terminals not defined in this
+   document, such as ALPHA, DIGIT, SP, CR, LF, CRLF, are as defined in
+   the "core" syntax [8 (section 6)] or in the message format syntax
+   [32].
+
+      Reverse-path = Path
+      Forward-path = Path
+      Path = "<" [ A-d-l ":" ] Mailbox ">"
+      A-d-l = At-domain *( "," A-d-l )
+            ; Note that this form, the so-called "source route",
+            ; MUST BE accepted, SHOULD NOT be generated, and SHOULD be
+            ; ignored.
+      At-domain = "@" domain
+      Mail-parameters = esmtp-param *(SP esmtp-param)
+      Rcpt-parameters = esmtp-param *(SP esmtp-param)
+
+
+
+Klensin                     Standards Track                    [Page 36]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+      esmtp-param     = esmtp-keyword ["=" esmtp-value]
+      esmtp-keyword   = (ALPHA / DIGIT) *(ALPHA / DIGIT / "-")
+      esmtp-value     = 1*(%d33-60 / %d62-127)
+            ; any CHAR excluding "=", SP, and control characters
+      Keyword  = Ldh-str
+      Argument = Atom
+      Domain = (sub-domain 1*("." sub-domain)) / address-literal
+      sub-domain = Let-dig [Ldh-str]
+
+      address-literal = "[" IPv4-address-literal /
+                            IPv6-address-literal /
+                            General-address-literal "]"
+            ; See section 4.1.3
+
+      Mailbox = Local-part "@" Domain
+
+      Local-part = Dot-string / Quoted-string
+            ; MAY be case-sensitive
+
+      Dot-string = Atom *("." Atom)
+
+      Atom = 1*atext
+
+      Quoted-string = DQUOTE *qcontent DQUOTE
+
+      String = Atom / Quoted-string
+
+   While the above definition for Local-part is relatively permissive,
+   for maximum interoperability, a host that expects to receive mail
+   SHOULD avoid defining mailboxes where the Local-part requires (or
+   uses) the Quoted-string form or where the Local-part is case-
+   sensitive.  For any purposes that require generating or comparing
+   Local-parts (e.g., to specific mailbox names), all quoted forms MUST
+   be treated as equivalent and the sending system SHOULD transmit the
+   form that uses the minimum quoting possible.
+
+   Systems MUST NOT define mailboxes in such a way as to require the use
+   in SMTP of non-ASCII characters (octets with the high order bit set
+   to one) or ASCII "control characters" (decimal value 0-31 and 127).
+   These characters MUST NOT be used in MAIL or RCPT commands or other
+   commands that require mailbox names.
+
+   Note that the backslash, "\", is a quote character, which is used to
+   indicate that the next character is to be used literally (instead of
+   its normal interpretation).  For example, "Joe\,Smith" indicates a
+   single nine character user field with the comma being the fourth
+   character of the field.
+
+
+
+
+Klensin                     Standards Track                    [Page 37]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   To promote interoperability and consistent with long-standing
+   guidance about conservative use of the DNS in naming and applications
+   (e.g., see section 2.3.1 of the base DNS document, RFC1035 [22]),
+   characters outside the set of alphas, digits, and hyphen MUST NOT
+   appear in domain name labels for SMTP clients or servers.  In
+   particular, the underscore character is not permitted.  SMTP servers
+   that receive a command in which invalid character codes have been
+   employed, and for which there are no other reasons for rejection,
+   MUST reject that command with a 501 response.
+
+4.1.3 Address Literals
+
+   Sometimes a host is not known to the domain name system and
+   communication (and, in particular, communication to report and repair
+   the error) is blocked.  To bypass this barrier a special literal form
+   of the address is allowed as an alternative to a domain name.  For
+   IPv4 addresses, this form uses four small decimal integers separated
+   by dots and enclosed by brackets such as [123.255.37.2], which
+   indicates an (IPv4) Internet Address in sequence-of-octets form.  For
+   IPv6 and other forms of addressing that might eventually be
+   standardized, the form consists of a standardized "tag" that
+   identifies the address syntax, a colon, and the address itself, in a
+   format specified as part of the IPv6 standards [17].
+
+   Specifically:
+
+      IPv4-address-literal = Snum 3("." Snum)
+      IPv6-address-literal = "IPv6:" IPv6-addr
+      General-address-literal = Standardized-tag ":" 1*dcontent
+      Standardized-tag = Ldh-str
+            ; MUST be specified in a standards-track RFC
+            ; and registered with IANA
+
+      Snum = 1*3DIGIT  ; representing a decimal integer
+            ; value in the range 0 through 255
+      Let-dig = ALPHA / DIGIT
+      Ldh-str = *( ALPHA / DIGIT / "-" ) Let-dig
+
+      IPv6-addr = IPv6-full / IPv6-comp / IPv6v4-full / IPv6v4-comp
+      IPv6-hex  = 1*4HEXDIG
+      IPv6-full = IPv6-hex 7(":" IPv6-hex)
+      IPv6-comp = [IPv6-hex *5(":" IPv6-hex)] "::" [IPv6-hex *5(":"
+                 IPv6-hex)]
+            ; The "::" represents at least 2 16-bit groups of zeros
+            ; No more than 6 groups in addition to the "::" may be
+            ; present
+      IPv6v4-full = IPv6-hex 5(":" IPv6-hex) ":" IPv4-address-literal
+      IPv6v4-comp = [IPv6-hex *3(":" IPv6-hex)] "::"
+
+
+
+Klensin                     Standards Track                    [Page 38]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+                   [IPv6-hex *3(":" IPv6-hex) ":"] IPv4-address-literal
+            ; The "::" represents at least 2 16-bit groups of zeros
+            ; No more than 4 groups in addition to the "::" and
+            ; IPv4-address-literal may be present
+
+4.1.4 Order of Commands
+
+   There are restrictions on the order in which these commands may be
+   used.
+
+   A session that will contain mail transactions MUST first be
+   initialized by the use of the EHLO command.  An SMTP server SHOULD
+   accept commands for non-mail transactions (e.g., VRFY or EXPN)
+   without this initialization.
+
+   An EHLO command MAY be issued by a client later in the session.  If
+   it is issued after the session begins, the SMTP server MUST clear all
+   buffers and reset the state exactly as if a RSET command had been
+   issued.  In other words, the sequence of RSET followed immediately by
+   EHLO is redundant, but not harmful other than in the performance cost
+   of executing unnecessary commands.
+
+   If the EHLO command is not acceptable to the SMTP server, 501, 500,
+   or 502 failure replies MUST be returned as appropriate.  The SMTP
+   server MUST stay in the same state after transmitting these replies
+   that it was in before the EHLO was received.
+
+   The SMTP client MUST, if possible, ensure that the domain parameter
+   to the EHLO command is a valid principal host name (not a CNAME or MX
+   name) for its host.  If this is not possible (e.g., when the client's
+   address is dynamically assigned and the client does not have an
+   obvious name), an address literal SHOULD be substituted for the
+   domain name and supplemental information provided that will assist in
+   identifying the client.
+
+   An SMTP server MAY verify that the domain name parameter in the EHLO
+   command actually corresponds to the IP address of the client.
+   However, the server MUST NOT refuse to accept a message for this
+   reason if the verification fails: the information about verification
+   failure is for logging and tracing only.
+
+   The NOOP, HELP, EXPN, VRFY, and RSET commands can be used at any time
+   during a session, or without previously initializing a session.  SMTP
+   servers SHOULD process these normally (that is, not return a 503
+   code) even if no EHLO command has yet been received; clients SHOULD
+   open a session with EHLO before sending these commands.
+
+
+
+
+
+Klensin                     Standards Track                    [Page 39]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   If these rules are followed, the example in RFC 821 that shows "550
+   access denied to you" in response to an EXPN command is incorrect
+   unless an EHLO command precedes the EXPN or the denial of access is
+   based on the client's IP address or other authentication or
+   authorization-determining mechanisms.
+
+   The MAIL command (or the obsolete SEND, SOML, or SAML commands)
+   begins a mail transaction.  Once started, a mail transaction consists
+   of a transaction beginning command, one or more RCPT commands, and a
+   DATA command, in that order.  A mail transaction may be aborted by
+   the RSET (or a new EHLO) command.  There may be zero or more
+   transactions in a session.  MAIL (or SEND, SOML, or SAML) MUST NOT be
+   sent if a mail transaction is already open, i.e., it should be sent
+   only if no mail transaction had been started in the session, or it
+   the previous one successfully concluded with a successful DATA
+   command, or if the previous one was aborted with a RSET.
+
+   If the transaction beginning command argument is not acceptable, a
+   501 failure reply MUST be returned and the SMTP server MUST stay in
+   the same state.  If the commands in a transaction are out of order to
+   the degree that they cannot be processed by the server, a 503 failure
+   reply MUST be returned and the SMTP server MUST stay in the same
+   state.
+
+   The last command in a session MUST be the QUIT command.  The QUIT
+   command cannot be used at any other time in a session, but SHOULD be
+   used by the client SMTP to request connection closure, even when no
+   session opening command was sent and accepted.
+
+4.1.5 Private-use Commands
+
+   As specified in section 2.2.2, commands starting in "X" may be used
+   by bilateral agreement between the client (sending) and server
+   (receiving) SMTP agents.  An SMTP server that does not recognize such
+   a command is expected to reply with "500 Command not recognized".  An
+   extended SMTP server MAY list the feature names associated with these
+   private commands in the response to the EHLO command.
+
+   Commands sent or accepted by SMTP systems that do not start with "X"
+   MUST conform to the requirements of section 2.2.2.
+
+4.2 SMTP Replies
+
+   Replies to SMTP commands serve to ensure the synchronization of
+   requests and actions in the process of mail transfer and to guarantee
+   that the SMTP client always knows the state of the SMTP server.
+   Every command MUST generate exactly one reply.
+
+
+
+
+Klensin                     Standards Track                    [Page 40]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   The details of the command-reply sequence are described in section
+   4.3.
+
+   An SMTP reply consists of a three digit number (transmitted as three
+   numeric characters) followed by some text unless specified otherwise
+   in this document.  The number is for use by automata to determine
+   what state to enter next; the text is for the human user.  The three
+   digits contain enough encoded information that the SMTP client need
+   not examine the text and may either discard it or pass it on to the
+   user, as appropriate.  Exceptions are as noted elsewhere in this
+   document.  In particular, the 220, 221, 251, 421, and 551 reply codes
+   are associated with message text that must be parsed and interpreted
+   by machines.  In the general case, the text may be receiver dependent
+   and context dependent, so there are likely to be varying texts for
+   each reply code.  A discussion of the theory of reply codes is given
+   in section 4.2.1.  Formally, a reply is defined to be the sequence: a
+   three-digit code, <SP>, one line of text, and <CRLF>, or a multiline
+   reply (as defined in section 4.2.1).  Since, in violation of this
+   specification, the text is sometimes not sent, clients which do not
+   receive it SHOULD be prepared to process the code alone (with or
+   without a trailing space character).  Only the EHLO, EXPN, and HELP
+   commands are expected to result in multiline replies in normal
+   circumstances, however, multiline replies are allowed for any
+   command.
+
+   In ABNF, server responses are:
+
+      Greeting = "220 " Domain [ SP text ] CRLF
+      Reply-line = Reply-code [ SP text ] CRLF
+
+   where "Greeting" appears only in the 220 response that announces that
+   the server is opening its part of the connection.
+
+   An SMTP server SHOULD send only the reply codes listed in this
+   document.  An SMTP server SHOULD use the text shown in the examples
+   whenever appropriate.
+
+   An SMTP client MUST determine its actions only by the reply code, not
+   by the text (except for the "change of address" 251 and 551 and, if
+   necessary, 220, 221, and 421 replies); in the general case, any text,
+   including no text at all (although senders SHOULD NOT send bare
+   codes), MUST be acceptable.  The space (blank) following the reply
+   code is considered part of the text.  Whenever possible, a receiver-
+   SMTP SHOULD test the first digit (severity indication) of the reply
+   code.
+
+
+
+
+
+
+Klensin                     Standards Track                    [Page 41]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   The list of codes that appears below MUST NOT be construed as
+   permanent.  While the addition of new codes should be a rare and
+   significant activity, with supplemental information in the textual
+   part of the response being preferred, new codes may be added as the
+   result of new Standards or Standards-track specifications.
+   Consequently, a sender-SMTP MUST be prepared to handle codes not
+   specified in this document and MUST do so by interpreting the first
+   digit only.
+
+4.2.1 Reply Code Severities and Theory
+
+   The three digits of the reply each have a special significance.  The
+   first digit denotes whether the response is good, bad or incomplete.
+   An unsophisticated SMTP client, or one that receives an unexpected
+   code, will be able to determine its next action (proceed as planned,
+   redo, retrench, etc.) by examining this first digit.  An SMTP client
+   that wants to know approximately what kind of error occurred (e.g.,
+   mail system error, command syntax error) may examine the second
+   digit.  The third digit and any supplemental information that may be
+   present is reserved for the finest gradation of information.
+
+   There are five values for the first digit of the reply code:
+
+   1yz   Positive Preliminary reply
+      The command has been accepted, but the requested action is being
+      held in abeyance, pending confirmation of the information in this
+      reply.  The SMTP client should send another command specifying
+      whether to continue or abort the action.  Note: unextended SMTP
+      does not have any commands that allow this type of reply, and so
+      does not have continue or abort commands.
+
+   2yz   Positive Completion reply
+      The requested action has been successfully completed.  A new
+      request may be initiated.
+
+   3yz   Positive Intermediate reply
+      The command has been accepted, but the requested action is being
+      held in abeyance, pending receipt of further information.  The
+      SMTP client should send another command specifying this
+      information.  This reply is used in command sequence groups (i.e.,
+      in DATA).
+
+   4yz   Transient Negative Completion reply
+      The command was not accepted, and the requested action did not
+      occur.  However, the error condition is temporary and the action
+      may be requested again.  The sender should return to the beginning
+      of the command sequence (if any).  It is difficult to assign a
+      meaning to "transient" when two different sites (receiver- and
+
+
+
+Klensin                     Standards Track                    [Page 42]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+      sender-SMTP agents) must agree on the interpretation.  Each reply
+      in this category might have a different time value, but the SMTP
+      client is encouraged to try again.  A rule of thumb to determine
+      whether a reply fits into the 4yz or the 5yz category (see below)
+      is that replies are 4yz if they can be successful if repeated
+      without any change in command form or in properties of the sender
+      or receiver (that is, the command is repeated identically and the
+      receiver does not put up a new implementation.)
+
+   5yz   Permanent Negative Completion reply
+      The command was not accepted and the requested action did not
+      occur.  The SMTP client is discouraged from repeating the exact
+      request (in the same sequence).  Even some "permanent" error
+      conditions can be corrected, so the human user may want to direct
+      the SMTP client to reinitiate the command sequence by direct
+      action at some point in the future (e.g., after the spelling has
+      been changed, or the user has altered the account status).
+
+   The second digit encodes responses in specific categories:
+
+   x0z   Syntax: These replies refer to syntax errors, syntactically
+      correct commands that do not fit any functional category, and
+      unimplemented or superfluous commands.
+
+   x1z   Information:  These are replies to requests for information,
+      such as status or help.
+
+   x2z   Connections: These are replies referring to the transmission
+      channel.
+
+   x3z   Unspecified.
+
+   x4z   Unspecified.
+
+   x5z   Mail system: These replies indicate the status of the receiver
+      mail system vis-a-vis the requested transfer or other mail system
+      action.
+
+   The third digit gives a finer gradation of meaning in each category
+   specified by the second digit.  The list of replies illustrates this.
+   Each reply text is recommended rather than mandatory, and may even
+   change according to the command with which it is associated.  On the
+   other hand, the reply codes must strictly follow the specifications
+   in this section.  Receiver implementations should not invent new
+   codes for slightly different situations from the ones described here,
+   but rather adapt codes already defined.
+
+
+
+
+
+Klensin                     Standards Track                    [Page 43]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   For example, a command such as NOOP, whose successful execution does
+   not offer the SMTP client any new information, will return a 250
+   reply.  The reply is 502 when the command requests an unimplemented
+   non-site-specific action.  A refinement of that is the 504 reply for
+   a command that is implemented, but that requests an unimplemented
+   parameter.
+
+   The reply text may be longer than a single line; in these cases the
+   complete text must be marked so the SMTP client knows when it can
+   stop reading the reply.  This requires a special format to indicate a
+   multiple line reply.
+
+   The format for multiline replies requires that every line, except the
+   last, begin with the reply code, followed immediately by a hyphen,
+   "-" (also known as minus), followed by text.  The last line will
+   begin with the reply code, followed immediately by <SP>, optionally
+   some text, and <CRLF>.  As noted above, servers SHOULD send the <SP>
+   if subsequent text is not sent, but clients MUST be prepared for it
+   to be omitted.
+
+   For example:
+
+      123-First line
+      123-Second line
+      123-234 text beginning with numbers
+      123 The last line
+
+   In many cases the SMTP client then simply needs to search for a line
+   beginning with the reply code followed by <SP> or <CRLF> and ignore
+   all preceding lines.  In a few cases, there is important data for the
+   client in the reply "text".  The client will be able to identify
+   these cases from the current context.
+
+4.2.2 Reply Codes by Function Groups
+
+      500 Syntax error, command unrecognized
+         (This may include errors such as command line too long)
+      501 Syntax error in parameters or arguments
+      502 Command not implemented  (see section 4.2.4)
+      503 Bad sequence of commands
+      504 Command parameter not implemented
+
+      211 System status, or system help reply
+      214 Help message
+         (Information on how to use the receiver or the meaning of a
+         particular non-standard command; this reply is useful only
+         to the human user)
+
+
+
+
+Klensin                     Standards Track                    [Page 44]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+      220 <domain> Service ready
+      221 <domain> Service closing transmission channel
+      421 <domain> Service not available, closing transmission channel
+         (This may be a reply to any command if the service knows it
+         must shut down)
+
+      250 Requested mail action okay, completed
+      251 User not local; will forward to <forward-path>
+         (See section 3.4)
+      252 Cannot VRFY user, but will accept message and attempt
+          delivery
+         (See section 3.5.3)
+      450 Requested mail action not taken: mailbox unavailable
+         (e.g., mailbox busy)
+      550 Requested action not taken: mailbox unavailable
+         (e.g., mailbox not found, no access, or command rejected
+         for policy reasons)
+      451 Requested action aborted: error in processing
+      551 User not local; please try <forward-path>
+         (See section 3.4)
+      452 Requested action not taken: insufficient system storage
+      552 Requested mail action aborted: exceeded storage allocation
+      553 Requested action not taken: mailbox name not allowed
+         (e.g., mailbox syntax incorrect)
+      354 Start mail input; end with <CRLF>.<CRLF>
+      554 Transaction failed (Or, in the case of a connection-opening
+          response, "No SMTP service here")
+
+4.2.3  Reply Codes in Numeric Order
+
+      211 System status, or system help reply
+      214 Help message
+         (Information on how to use the receiver or the meaning of a
+         particular non-standard command; this reply is useful only
+         to the human user)
+      220 <domain> Service ready
+      221 <domain> Service closing transmission channel
+      250 Requested mail action okay, completed
+      251 User not local; will forward to <forward-path>
+         (See section 3.4)
+      252 Cannot VRFY user, but will accept message and attempt
+         delivery
+         (See section 3.5.3)
+
+      354 Start mail input; end with <CRLF>.<CRLF>
+
+
+
+
+
+
+Klensin                     Standards Track                    [Page 45]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+      421 <domain> Service not available, closing transmission channel
+         (This may be a reply to any command if the service knows it
+         must shut down)
+      450 Requested mail action not taken: mailbox unavailable
+         (e.g., mailbox busy)
+      451 Requested action aborted: local error in processing
+      452 Requested action not taken: insufficient system storage
+      500 Syntax error, command unrecognized
+         (This may include errors such as command line too long)
+      501 Syntax error in parameters or arguments
+      502 Command not implemented (see section 4.2.4)
+      503 Bad sequence of commands
+      504 Command parameter not implemented
+      550 Requested action not taken: mailbox unavailable
+         (e.g., mailbox not found, no access, or command rejected
+         for policy reasons)
+      551 User not local; please try <forward-path>
+         (See section 3.4)
+      552 Requested mail action aborted: exceeded storage allocation
+      553 Requested action not taken: mailbox name not allowed
+         (e.g., mailbox syntax incorrect)
+      554 Transaction failed  (Or, in the case of a connection-opening
+          response, "No SMTP service here")
+
+4.2.4 Reply Code 502
+
+   Questions have been raised as to when reply code 502 (Command not
+   implemented) SHOULD be returned in preference to other codes.  502
+   SHOULD be used when the command is actually recognized by the SMTP
+   server, but not implemented.  If the command is not recognized, code
+   500 SHOULD be returned.  Extended SMTP systems MUST NOT list
+   capabilities in response to EHLO for which they will return 502 (or
+   500) replies.
+
+4.2.5 Reply Codes After DATA and the Subsequent <CRLF>.<CRLF>
+
+   When an SMTP server returns a positive completion status (2yz code)
+   after the DATA command is completed with <CRLF>.<CRLF>, it accepts
+   responsibility for:
+
+   -  delivering the message (if the recipient mailbox exists), or
+
+   -  if attempts to deliver the message fail due to transient
+      conditions, retrying delivery some reasonable number of times at
+      intervals as specified in section 4.5.4.
+
+
+
+
+
+
+Klensin                     Standards Track                    [Page 46]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   -  if attempts to deliver the message fail due to permanent
+      conditions, or if repeated attempts to deliver the message fail
+      due to transient conditions, returning appropriate notification to
+      the sender of the original message (using the address in the SMTP
+      MAIL command).
+
+   When an SMTP server returns a permanent error status (5yz) code after
+   the DATA command is completed with <CRLF>.<CRLF>, it MUST NOT make
+   any subsequent attempt to deliver that message.  The SMTP client
+   retains responsibility for delivery of that message and may either
+   return it to the user or requeue it for a subsequent attempt (see
+   section 4.5.4.1).
+
+   The user who originated the message SHOULD be able to interpret the
+   return of a transient failure status (by mail message or otherwise)
+   as a non-delivery indication, just as a permanent failure would be
+   interpreted.  I.e., if the client SMTP successfully handles these
+   conditions, the user will not receive such a reply.
+
+   When an SMTP server returns a permanent error status (5yz) code after
+   the DATA command is completely with <CRLF>.<CRLF>, it MUST NOT make
+   any subsequent attempt to deliver the message.  As with temporary
+   error status codes, the SMTP client retains responsibility for the
+   message, but SHOULD not again attempt delivery to the same server
+   without user review and intervention of the message.
+
+4.3 Sequencing of Commands and Replies
+
+4.3.1 Sequencing Overview
+
+   The communication between the sender and receiver is an alternating
+   dialogue, controlled by the sender.  As such, the sender issues a
+   command and the receiver responds with a reply.  Unless other
+   arrangements are negotiated through service extensions, the sender
+   MUST wait for this response before sending further commands.
+
+   One important reply is the connection greeting.  Normally, a receiver
+   will send a 220 "Service ready" reply when the connection is
+   completed.  The sender SHOULD wait for this greeting message before
+   sending any commands.
+
+   Note: all the greeting-type replies have the official name (the
+   fully-qualified primary domain name) of the server host as the first
+   word following the reply code.  Sometimes the host will have no
+   meaningful name.  See 4.1.3 for a discussion of alternatives in these
+   situations.
+
+
+
+
+
+Klensin                     Standards Track                    [Page 47]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   For example,
+
+      220 ISIF.USC.EDU Service ready
+   or
+      220 mail.foo.com SuperSMTP v 6.1.2 Service ready
+   or
+      220 [10.0.0.1] Clueless host service ready
+
+   The table below lists alternative success and failure replies for
+   each command.  These SHOULD be strictly adhered to: a receiver may
+   substitute text in the replies, but the meaning and action implied by
+   the code numbers and by the specific command reply sequence cannot be
+   altered.
+
+4.3.2 Command-Reply Sequences
+
+   Each command is listed with its usual possible replies.  The prefixes
+   used before the possible replies are "I" for intermediate, "S" for
+   success, and "E" for error.  Since some servers may generate other
+   replies under special circumstances, and to allow for future
+   extension, SMTP clients SHOULD, when possible, interpret only the
+   first digit of the reply and MUST be prepared to deal with
+   unrecognized reply codes by interpreting the first digit only.
+   Unless extended using the mechanisms described in section 2.2, SMTP
+   servers MUST NOT transmit reply codes to an SMTP client that are
+   other than three digits or that do not start in a digit between 2 and
+   5 inclusive.
+
+   These sequencing rules and, in principle, the codes themselves, can
+   be extended or modified by SMTP extensions offered by the server and
+   accepted (requested) by the client.
+
+   In addition to the codes listed below, any SMTP command can return
+   any of the following codes if the corresponding unusual circumstances
+   are encountered:
+
+   500  For the "command line too long" case or if the command name was
+      not recognized.  Note that producing a "command not recognized"
+      error in response to the required subset of these commands is a
+      violation of this specification.
+
+   501  Syntax error in command or arguments.  In order to provide for
+      future extensions, commands that are specified in this document as
+      not accepting arguments (DATA, RSET, QUIT) SHOULD return a 501
+      message if arguments are supplied in the absence of EHLO-
+      advertised extensions.
+
+   421  Service shutting down and closing transmission channel
+
+
+
+Klensin                     Standards Track                    [Page 48]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   Specific sequences are:
+
+   CONNECTION ESTABLISHMENT
+      S: 220
+      E: 554
+   EHLO or HELO
+      S: 250
+      E: 504, 550
+   MAIL
+      S: 250
+      E: 552, 451, 452, 550, 553, 503
+   RCPT
+      S: 250, 251 (but see section 3.4 for discussion of 251 and 551)
+      E: 550, 551, 552, 553, 450, 451, 452, 503, 550
+   DATA
+      I: 354 -> data -> S: 250
+                        E: 552, 554, 451, 452
+      E: 451, 554, 503
+   RSET
+      S: 250
+   VRFY
+      S: 250, 251, 252
+      E: 550, 551, 553, 502, 504
+   EXPN
+      S: 250, 252
+      E: 550, 500, 502, 504
+   HELP
+      S: 211, 214
+      E: 502, 504
+   NOOP
+      S: 250
+   QUIT
+      S: 221
+
+4.4 Trace Information
+
+   When an SMTP server receives a message for delivery or further
+   processing, it MUST insert trace ("time stamp" or "Received")
+   information at the beginning of the message content, as discussed in
+   section 4.1.1.4.
+
+   This line MUST be structured as follows:
+
+   -  The FROM field, which MUST be supplied in an SMTP environment,
+      SHOULD contain both (1) the name of the source host as presented
+      in the EHLO command and (2) an address literal containing the IP
+      address of the source, determined from the TCP connection.
+
+
+
+
+Klensin                     Standards Track                    [Page 49]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   -  The ID field MAY contain an "@" as suggested in RFC 822, but this
+      is not required.
+
+   -  The FOR field MAY contain a list of <path> entries when multiple
+      RCPT commands have been given.  This may raise some security
+      issues and is usually not desirable; see section 7.2.
+
+   An Internet mail program MUST NOT change a Received: line that was
+   previously added to the message header.  SMTP servers MUST prepend
+   Received lines to messages; they MUST NOT change the order of
+   existing lines or insert Received lines in any other location.
+
+   As the Internet grows, comparability of Received fields is important
+   for detecting problems, especially slow relays.  SMTP servers that
+   create Received fields SHOULD use explicit offsets in the dates
+   (e.g., -0800), rather than time zone names of any type.  Local time
+   (with an offset) is preferred to UT when feasible.  This formulation
+   allows slightly more information about local circumstances to be
+   specified.  If UT is needed, the receiver need merely do some simple
+   arithmetic to convert the values.  Use of UT loses information about
+   the time zone-location of the server.  If it is desired to supply a
+   time zone name, it SHOULD be included in a comment.
+
+   When the delivery SMTP server makes the "final delivery" of a
+   message, it inserts a return-path line at the beginning of the mail
+   data.  This use of return-path is required; mail systems MUST support
+   it.  The return-path line preserves the information in the <reverse-
+   path> from the MAIL command.  Here, final delivery means the message
+   has left the SMTP environment.  Normally, this would mean it had been
+   delivered to the destination user or an associated mail drop, but in
+   some cases it may be further processed and transmitted by another
+   mail system.
+
+   It is possible for the mailbox in the return path to be different
+   from the actual sender's mailbox, for example, if error responses are
+   to be delivered to a special error handling mailbox rather than to
+   the message sender.  When mailing lists are involved, this
+   arrangement is common and useful as a means of directing errors to
+   the list maintainer rather than the message originator.
+
+   The text above implies that the final mail data will begin with a
+   return path line, followed by one or more time stamp lines.  These
+   lines will be followed by the mail data headers and body [32].
+
+   It is sometimes difficult for an SMTP server to determine whether or
+   not it is making final delivery since forwarding or other operations
+   may occur after the message is accepted for delivery.  Consequently,
+
+
+
+
+Klensin                     Standards Track                    [Page 50]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   any further (forwarding, gateway, or relay) systems MAY remove the
+   return path and rebuild the MAIL command as needed to ensure that
+   exactly one such line appears in a delivered message.
+
+   A message-originating SMTP system SHOULD NOT send a message that
+   already contains a Return-path header.  SMTP servers performing a
+   relay function MUST NOT inspect the message data, and especially not
+   to the extent needed to determine if Return-path headers are present.
+   SMTP servers making final delivery MAY remove Return-path headers
+   before adding their own.
+
+   The primary purpose of the Return-path is to designate the address to
+   which messages indicating non-delivery or other mail system failures
+   are to be sent.  For this to be unambiguous, exactly one return path
+   SHOULD be present when the message is delivered.  Systems using RFC
+   822 syntax with non-SMTP transports SHOULD designate an unambiguous
+   address, associated with the transport envelope, to which error
+   reports (e.g., non-delivery messages) should be sent.
+
+   Historical note: Text in RFC 822 that appears to contradict the use
+   of the Return-path header (or the envelope reverse path address from
+   the MAIL command) as the destination for error messages is not
+   applicable on the Internet.  The reverse path address (as copied into
+   the Return-path) MUST be used as the target of any mail containing
+   delivery error messages.
+
+   In particular:
+
+   -  a gateway from SMTP->elsewhere SHOULD insert a return-path header,
+      unless it is known that the "elsewhere" transport also uses
+      Internet domain addresses and maintains the envelope sender
+      address separately.
+
+   -  a gateway from elsewhere->SMTP SHOULD delete any return-path
+      header present in the message, and either copy that information to
+      the SMTP envelope or combine it with information present in the
+      envelope of the other transport system to construct the reverse
+      path argument to the MAIL command in the SMTP envelope.
+
+   The server must give special treatment to cases in which the
+   processing following the end of mail data indication is only
+   partially successful.  This could happen if, after accepting several
+   recipients and the mail data, the SMTP server finds that the mail
+   data could be successfully delivered to some, but not all, of the
+   recipients.  In such cases, the response to the DATA command MUST be
+   an OK reply.  However, the SMTP server MUST compose and send an
+   "undeliverable mail" notification message to the originator of the
+   message.
+
+
+
+Klensin                     Standards Track                    [Page 51]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   A single notification listing all of the failed recipients or
+   separate notification messages MUST be sent for each failed
+   recipient.  For economy of processing by the sender, the former is
+   preferred when possible.  All undeliverable mail notification
+   messages are sent using the MAIL command (even if they result from
+   processing the obsolete SEND, SOML, or SAML commands) and use a null
+   return path as discussed in section 3.7.
+
+   The time stamp line and the return path line are formally defined as
+   follows:
+
+Return-path-line = "Return-Path:" FWS Reverse-path <CRLF>
+
+Time-stamp-line = "Received:" FWS Stamp <CRLF>
+
+Stamp = From-domain By-domain Opt-info ";"  FWS date-time
+
+      ; where "date-time" is as defined in [32]
+      ; but the "obs-" forms, especially two-digit
+      ; years, are prohibited in SMTP and MUST NOT be used.
+
+From-domain = "FROM" FWS Extended-Domain CFWS
+
+By-domain = "BY" FWS Extended-Domain CFWS
+
+Extended-Domain = Domain /
+           ( Domain FWS "(" TCP-info ")" ) /
+           ( Address-literal FWS "(" TCP-info ")" )
+
+TCP-info = Address-literal / ( Domain FWS Address-literal )
+      ; Information derived by server from TCP connection
+      ; not client EHLO.
+
+Opt-info = [Via] [With] [ID] [For]
+
+Via = "VIA" FWS Link CFWS
+
+With = "WITH" FWS Protocol CFWS
+
+ID = "ID" FWS String / msg-id CFWS
+
+For = "FOR" FWS 1*( Path / Mailbox ) CFWS
+
+Link = "TCP" / Addtl-Link
+Addtl-Link = Atom
+      ; Additional standard names for links are registered with the
+         ; Internet Assigned Numbers Authority (IANA).  "Via" is
+         ; primarily of value with non-Internet transports.  SMTP
+
+
+
+Klensin                     Standards Track                    [Page 52]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+         ; servers SHOULD NOT use unregistered names.
+Protocol = "ESMTP" / "SMTP" / Attdl-Protocol
+Attdl-Protocol = Atom
+      ; Additional standard names for protocols are registered with the
+         ; Internet Assigned Numbers Authority (IANA).  SMTP servers
+         ; SHOULD NOT use unregistered names.
+
+4.5 Additional Implementation Issues
+
+4.5.1 Minimum Implementation
+
+   In order to make SMTP workable, the following minimum implementation
+   is required for all receivers.  The following commands MUST be
+   supported to conform to this specification:
+
+      EHLO
+      HELO
+      MAIL
+      RCPT
+      DATA
+      RSET
+      NOOP
+      QUIT
+      VRFY
+
+   Any system that includes an SMTP server supporting mail relaying or
+   delivery MUST support the reserved mailbox "postmaster" as a case-
+   insensitive local name.  This postmaster address is not strictly
+   necessary if the server always returns 554 on connection opening (as
+   described in section 3.1).  The requirement to accept mail for
+   postmaster implies that RCPT commands which specify a mailbox for
+   postmaster at any of the domains for which the SMTP server provides
+   mail service, as well as the special case of "RCPT TO:<Postmaster>"
+   (with no domain specification), MUST be supported.
+
+   SMTP systems are expected to make every reasonable effort to accept
+   mail directed to Postmaster from any other system on the Internet.
+   In extreme cases --such as to contain a denial of service attack or
+   other breach of security-- an SMTP server may block mail directed to
+   Postmaster.  However, such arrangements SHOULD be narrowly tailored
+   so as to avoid blocking messages which are not part of such attacks.
+
+4.5.2 Transparency
+
+   Without some provision for data transparency, the character sequence
+   "<CRLF>.<CRLF>" ends the mail text and cannot be sent by the user.
+   In general, users are not aware of such "forbidden" sequences.  To
+
+
+
+
+Klensin                     Standards Track                    [Page 53]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   allow all user composed text to be transmitted transparently, the
+   following procedures are used:
+
+   -  Before sending a line of mail text, the SMTP client checks the
+      first character of the line.  If it is a period, one additional
+      period is inserted at the beginning of the line.
+
+   -  When a line of mail text is received by the SMTP server, it checks
+      the line.  If the line is composed of a single period, it is
+      treated as the end of mail indicator.  If the first character is a
+      period and there are other characters on the line, the first
+      character is deleted.
+
+   The mail data may contain any of the 128 ASCII characters.  All
+   characters are to be delivered to the recipient's mailbox, including
+   spaces, vertical and horizontal tabs, and other control characters.
+   If the transmission channel provides an 8-bit byte (octet) data
+   stream, the 7-bit ASCII codes are transmitted right justified in the
+   octets, with the high order bits cleared to zero.  See 3.7 for
+   special treatment of these conditions in SMTP systems serving a relay
+   function.
+
+   In some systems it may be necessary to transform the data as it is
+   received and stored.  This may be necessary for hosts that use a
+   different character set than ASCII as their local character set, that
+   store data in records rather than strings, or which use special
+   character sequences as delimiters inside mailboxes.  If such
+   transformations are necessary, they MUST be reversible, especially if
+   they are applied to mail being relayed.
+
+4.5.3 Sizes and Timeouts
+
+4.5.3.1 Size limits and minimums
+
+   There are several objects that have required minimum/maximum sizes.
+   Every implementation MUST be able to receive objects of at least
+   these sizes.  Objects larger than these sizes SHOULD be avoided when
+   possible.  However, some Internet mail constructs such as encoded
+   X.400 addresses [16] will often require larger objects: clients MAY
+   attempt to transmit these, but MUST be prepared for a server to
+   reject them if they cannot be handled by it.  To the maximum extent
+   possible, implementation techniques which impose no limits on the
+   length of these objects should be used.
+
+   local-part
+      The maximum total length of a user name or other local-part is 64
+      characters.
+
+
+
+
+Klensin                     Standards Track                    [Page 54]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   domain
+      The maximum total length of a domain name or number is 255
+      characters.
+
+   path
+      The maximum total length of a reverse-path or forward-path is 256
+      characters (including the punctuation and element separators).
+
+   command line
+      The maximum total length of a command line including the command
+      word and the <CRLF> is 512 characters.  SMTP extensions may be
+      used to increase this limit.
+
+   reply line
+      The maximum total length of a reply line including the reply code
+      and the <CRLF> is 512 characters.  More information may be
+      conveyed through multiple-line replies.
+
+   text line
+      The maximum total length of a text line including the <CRLF> is
+      1000 characters (not counting the leading dot duplicated for
+      transparency).  This number may be increased by the use of SMTP
+      Service Extensions.
+
+   message content
+      The maximum total length of a message content (including any
+      message headers as well as the message body) MUST BE at least 64K
+      octets.  Since the introduction of Internet standards for
+      multimedia mail [12], message lengths on the Internet have grown
+      dramatically, and message size restrictions should be avoided if
+      at all possible.  SMTP server systems that must impose
+      restrictions SHOULD implement the "SIZE" service extension [18],
+      and SMTP client systems that will send large messages SHOULD
+      utilize it when possible.
+
+   recipients buffer
+      The minimum total number of recipients that must be buffered is
+      100 recipients.  Rejection of messages (for excessive recipients)
+      with fewer than 100 RCPT commands is a violation of this
+      specification.  The general principle that relaying SMTP servers
+      MUST NOT, and delivery SMTP servers SHOULD NOT, perform validation
+      tests on message headers suggests that rejecting a message based
+      on the total number of recipients shown in header fields is to be
+      discouraged.  A server which imposes a limit on the number of
+      recipients MUST behave in an orderly fashion,  such as to reject
+      additional addresses over its limit rather than silently
+      discarding addresses previously accepted.  A client that needs to
+
+
+
+
+Klensin                     Standards Track                    [Page 55]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+      deliver a message containing over 100 RCPT commands SHOULD be
+      prepared to transmit in 100-recipient "chunks" if the server
+      declines to accept more than 100 recipients in a single message.
+
+   Errors due to exceeding these limits may be reported by using the
+   reply codes.  Some examples of reply codes are:
+
+      500 Line too long.
+   or
+      501 Path too long
+   or
+      452 Too many recipients  (see below)
+   or
+      552 Too much mail data.
+
+   RFC 821 [30] incorrectly listed the error where an SMTP server
+   exhausts its implementation limit on the number of RCPT commands
+   ("too many recipients") as having reply code 552.  The correct reply
+   code for this condition is 452.  Clients SHOULD treat a 552 code in
+   this case as a temporary, rather than permanent, failure so the logic
+   below works.
+
+   When a conforming SMTP server encounters this condition, it has at
+   least 100 successful RCPT commands in its recipients buffer.  If the
+   server is able to accept the message, then at least these 100
+   addresses will be removed from the SMTP client's queue.  When the
+   client attempts retransmission of those addresses which received 452
+   responses, at least 100 of these will be able to fit in the SMTP
+   server's recipients buffer.  Each retransmission attempt which is
+   able to deliver anything will be able to dispose of at least 100 of
+   these recipients.
+
+   If an SMTP server has an implementation limit on the number of RCPT
+   commands and this limit is exhausted, it MUST use a response code of
+   452 (but the client SHOULD also be prepared for a 552, as noted
+   above).  If the server has a configured site-policy limitation on the
+   number of RCPT commands, it MAY instead use a 5XX response code.
+   This would be most appropriate if the policy limitation was intended
+   to apply if the total recipient count for a particular message body
+   were enforced even if that message body was sent in multiple mail
+   transactions.
+
+4.5.3.2 Timeouts
+
+   An SMTP client MUST provide a timeout mechanism.  It MUST use per-
+   command timeouts rather than somehow trying to time the entire mail
+   transaction.  Timeouts SHOULD be easily reconfigurable, preferably
+   without recompiling the SMTP code.  To implement this, a timer is set
+
+
+
+Klensin                     Standards Track                    [Page 56]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   for each SMTP command and for each buffer of the data transfer.  The
+   latter means that the overall timeout is inherently proportional to
+   the size of the message.
+
+   Based on extensive experience with busy mail-relay hosts, the minimum
+   per-command timeout values SHOULD be as follows:
+
+   Initial 220 Message: 5 minutes
+      An SMTP client process needs to distinguish between a failed TCP
+      connection and a delay in receiving the initial 220 greeting
+      message.  Many SMTP servers accept a TCP connection but delay
+      delivery of the 220 message until their system load permits more
+      mail to be processed.
+
+   MAIL Command: 5 minutes
+
+   RCPT Command: 5 minutes
+      A longer timeout is required if processing of mailing lists and
+      aliases is not deferred until after the message was accepted.
+
+   DATA Initiation: 2 minutes
+      This is while awaiting the "354 Start Input" reply to a DATA
+      command.
+
+   Data Block: 3 minutes
+      This is while awaiting the completion of each TCP SEND call
+      transmitting a chunk of data.
+
+   DATA Termination: 10 minutes.
+      This is while awaiting the "250 OK" reply.  When the receiver gets
+      the final period terminating the message data, it typically
+      performs processing to deliver the message to a user mailbox.  A
+      spurious timeout at this point would be very wasteful and would
+      typically result in delivery of multiple copies of the message,
+      since it has been successfully sent and the server has accepted
+      responsibility for delivery.  See section 6.1 for additional
+      discussion.
+
+   An SMTP server SHOULD have a timeout of at least 5 minutes while it
+   is awaiting the next command from the sender.
+
+4.5.4 Retry Strategies
+
+   The common structure of a host SMTP implementation includes user
+   mailboxes, one or more areas for queuing messages in transit, and one
+   or more daemon processes for sending and receiving mail.  The exact
+   structure will vary depending on the needs of the users on the host
+
+
+
+
+Klensin                     Standards Track                    [Page 57]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   and the number and size of mailing lists supported by the host.  We
+   describe several optimizations that have proved helpful, particularly
+   for mailers supporting high traffic levels.
+
+   Any queuing strategy MUST include timeouts on all activities on a
+   per-command basis.  A queuing strategy MUST NOT send error messages
+   in response to error messages under any circumstances.
+
+4.5.4.1 Sending Strategy
+
+   The general model for an SMTP client is one or more processes that
+   periodically attempt to transmit outgoing mail.  In a typical system,
+   the program that composes a message has some method for requesting
+   immediate attention for a new piece of outgoing mail, while mail that
+   cannot be transmitted immediately MUST be queued and periodically
+   retried by the sender.  A mail queue entry will include not only the
+   message itself but also the envelope information.
+
+   The sender MUST delay retrying a particular destination after one
+   attempt has failed.  In general, the retry interval SHOULD be at
+   least 30 minutes; however, more sophisticated and variable strategies
+   will be beneficial when the SMTP client can determine the reason for
+   non-delivery.
+
+   Retries continue until the message is transmitted or the sender gives
+   up; the give-up time generally needs to be at least 4-5 days.  The
+   parameters to the retry algorithm MUST be configurable.
+
+   A client SHOULD keep a list of hosts it cannot reach and
+   corresponding connection timeouts, rather than just retrying queued
+   mail items.
+
+   Experience suggests that failures are typically transient (the target
+   system or its connection has crashed), favoring a policy of two
+   connection attempts in the first hour the message is in the queue,
+   and then backing off to one every two or three hours.
+
+   The SMTP client can shorten the queuing delay in cooperation with the
+   SMTP server.  For example, if mail is received from a particular
+   address, it is likely that mail queued for that host can now be sent.
+   Application of this principle may, in many cases, eliminate the
+   requirement for an explicit "send queues now" function such as ETRN
+   [9].
+
+   The strategy may be further modified as a result of multiple
+   addresses per host (see below) to optimize delivery time vs. resource
+   usage.
+
+
+
+
+Klensin                     Standards Track                    [Page 58]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   An SMTP client may have a large queue of messages for each
+   unavailable destination host.  If all of these messages were retried
+   in every retry cycle, there would be excessive Internet overhead and
+   the sending system would be blocked for a long period.  Note that an
+   SMTP client can generally determine that a delivery attempt has
+   failed only after a timeout of several minutes and even a one-minute
+   timeout per connection will result in a very large delay if retries
+   are repeated for dozens, or even hundreds, of queued messages to the
+   same host.
+
+   At the same time, SMTP clients SHOULD use great care in caching
+   negative responses from servers.  In an extreme case, if EHLO is
+   issued multiple times during the same SMTP connection, different
+   answers may be returned by the server.  More significantly, 5yz
+   responses to the MAIL command MUST NOT be cached.
+
+   When a mail message is to be delivered to multiple recipients, and
+   the SMTP server to which a copy of the message is to be sent is the
+   same for multiple recipients, then only one copy of the message
+   SHOULD be transmitted.  That is, the SMTP client SHOULD use the
+   command sequence:  MAIL, RCPT, RCPT,... RCPT, DATA instead of the
+   sequence: MAIL, RCPT, DATA, ..., MAIL, RCPT, DATA.  However, if there
+   are very many addresses, a limit on the number of RCPT commands per
+   MAIL command MAY be imposed.  Implementation of this efficiency
+   feature is strongly encouraged.
+
+   Similarly, to achieve timely delivery, the SMTP client MAY support
+   multiple concurrent outgoing mail transactions.  However, some limit
+   may be appropriate to protect the host from devoting all its
+   resources to mail.
+
+4.5.4.2 Receiving Strategy
+
+   The SMTP server SHOULD attempt to keep a pending listen on the SMTP
+   port at all times.  This requires the support of multiple incoming
+   TCP connections for SMTP.  Some limit MAY be imposed but servers that
+   cannot handle more than one SMTP transaction at a time are not in
+   conformance with the intent of this specification.
+
+   As discussed above, when the SMTP server receives mail from a
+   particular host address, it could activate its own SMTP queuing
+   mechanisms to retry any mail pending for that host address.
+
+4.5.5   Messages with a null reverse-path
+
+   There are several types of notification messages which are required
+   by existing and proposed standards to be sent with a null reverse
+   path, namely non-delivery notifications as discussed in section 3.7,
+
+
+
+Klensin                     Standards Track                    [Page 59]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   other kinds of Delivery Status Notifications (DSNs) [24], and also
+   Message Disposition Notifications (MDNs) [10].  All of these kinds of
+   messages are notifications about a previous message, and they are
+   sent to the reverse-path of the previous mail message.  (If the
+   delivery of such a notification message fails, that usually indicates
+   a problem with the mail system of the host to which the notification
+   message is addressed.  For this reason, at some hosts the MTA is set
+   up to forward such failed notification messages to someone who is
+   able to fix problems with the mail system, e.g., via the postmaster
+   alias.)
+
+   All other types of messages (i.e., any message which is not required
+   by a standards-track RFC to have a null reverse-path) SHOULD be sent
+   with with a valid, non-null reverse-path.
+
+   Implementors of automated email processors should be careful to make
+   sure that the various kinds of messages with null reverse-path are
+   handled correctly, in particular such systems SHOULD NOT reply to
+   messages with null reverse-path.
+
+5. Address Resolution and Mail Handling
+
+   Once an SMTP client lexically identifies a domain to which mail will
+   be delivered for processing (as described in sections 3.6 and 3.7), a
+   DNS lookup MUST be performed to resolve the domain name [22].  The
+   names are expected to be fully-qualified domain names (FQDNs):
+   mechanisms for inferring FQDNs from partial names or local aliases
+   are outside of this specification and, due to a history of problems,
+   are generally discouraged.  The lookup first attempts to locate an MX
+   record associated with the name.  If a CNAME record is found instead,
+   the resulting name is processed as if it were the initial name.  If
+   no MX records are found, but an A RR is found, the A RR is treated as
+   if it was associated with an implicit MX RR, with a preference of 0,
+   pointing to that host.  If one or more MX RRs are found for a given
+   name, SMTP systems MUST NOT utilize any A RRs associated with that
+   name unless they are located using the MX RRs; the "implicit MX" rule
+   above applies only if there are no MX records present.  If MX records
+   are present, but none of them are usable, this situation MUST be
+   reported as an error.
+
+   When the lookup succeeds, the mapping can result in a list of
+   alternative delivery addresses rather than a single address, because
+   of multiple MX records, multihoming, or both.  To provide reliable
+   mail transmission, the SMTP client MUST be able to try (and retry)
+   each of the relevant addresses in this list in order, until a
+   delivery attempt succeeds.  However, there MAY also be a configurable
+   limit on the number of alternate addresses that can be tried.  In any
+   case, the SMTP client SHOULD try at least two addresses.
+
+
+
+Klensin                     Standards Track                    [Page 60]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   Two types of information is used to rank the host addresses: multiple
+   MX records, and multihomed hosts.
+
+   Multiple MX records contain a preference indication that MUST be used
+   in sorting (see below).  Lower numbers are more preferred than higher
+   ones.  If there are multiple destinations with the same preference
+   and there is no clear reason to favor one (e.g., by recognition of an
+   easily-reached address), then the sender-SMTP MUST randomize them to
+   spread the load across multiple mail exchangers for a specific
+   organization.
+
+   The destination host (perhaps taken from the preferred MX record) may
+   be multihomed, in which case the domain name resolver will return a
+   list of alternative IP addresses.  It is the responsibility of the
+   domain name resolver interface to have ordered this list by
+   decreasing preference if necessary, and SMTP MUST try them in the
+   order presented.
+
+   Although the capability to try multiple alternative addresses is
+   required, specific installations may want to limit or disable the use
+   of alternative addresses.  The question of whether a sender should
+   attempt retries using the different addresses of a multihomed host
+   has been controversial.  The main argument for using the multiple
+   addresses is that it maximizes the probability of timely delivery,
+   and indeed sometimes the probability of any delivery; the counter-
+   argument is that it may result in unnecessary resource use.  Note
+   that resource use is also strongly determined by the sending strategy
+   discussed in section 4.5.4.1.
+
+   If an SMTP server receives a message with a destination for which it
+   is a designated Mail eXchanger, it MAY relay the message (potentially
+   after having rewritten the MAIL FROM and/or RCPT TO addresses), make
+   final delivery of the message, or hand it off using some mechanism
+   outside the SMTP-provided transport environment.  Of course, neither
+   of the latter require that the list of MX records be examined
+   further.
+
+   If it determines that it should relay the message without rewriting
+   the address, it MUST sort the MX records to determine candidates for
+   delivery.  The records are first ordered by preference, with the
+   lowest-numbered records being most preferred.  The relay host MUST
+   then inspect the list for any of the names or addresses by which it
+   might be known in mail transactions.  If a matching record is found,
+   all records at that preference level and higher-numbered ones MUST be
+   discarded from consideration.  If there are no records left at that
+   point, it is an error condition, and the message MUST be returned as
+   undeliverable.  If records do remain, they SHOULD be tried, best
+   preference first, as described above.
+
+
+
+Klensin                     Standards Track                    [Page 61]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+6. Problem Detection and Handling
+
+6.1 Reliable Delivery and Replies by Email
+
+   When the receiver-SMTP accepts a piece of mail (by sending a "250 OK"
+   message in response to DATA), it is accepting responsibility for
+   delivering or relaying the message.  It must take this responsibility
+   seriously.  It MUST NOT lose the message for frivolous reasons, such
+   as because the host later crashes or because of a predictable
+   resource shortage.
+
+   If there is a delivery failure after acceptance of a message, the
+   receiver-SMTP MUST formulate and mail a notification message.  This
+   notification MUST be sent using a null ("<>") reverse path in the
+   envelope.  The recipient of this notification MUST be the address
+   from the envelope return path (or the Return-Path: line).  However,
+   if this address is null ("<>"), the receiver-SMTP MUST NOT send a
+   notification.  Obviously, nothing in this section can or should
+   prohibit local decisions (i.e., as part of the same system
+   environment as the receiver-SMTP) to log or otherwise transmit
+   information about null address events locally if that is desired.  If
+   the address is an explicit source route, it MUST be stripped down to
+   its final hop.
+
+   For example, suppose that an error notification must be sent for a
+   message that arrived with:
+
+      MAIL FROM:<@a,@b:user@d>
+
+   The notification message MUST be sent using:
+
+      RCPT TO:<user@d>
+
+   Some delivery failures after the message is accepted by SMTP will be
+   unavoidable.  For example, it may be impossible for the receiving
+   SMTP server to validate all the delivery addresses in RCPT command(s)
+   due to a "soft" domain system error, because the target is a mailing
+   list (see earlier discussion of RCPT), or because the server is
+   acting as a relay and has no immediate access to the delivering
+   system.
+
+   To avoid receiving duplicate messages as the result of timeouts, a
+   receiver-SMTP MUST seek to minimize the time required to respond to
+   the final <CRLF>.<CRLF> end of data indicator.  See RFC 1047 [28] for
+   a discussion of this problem.
+
+
+
+
+
+
+Klensin                     Standards Track                    [Page 62]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+6.2 Loop Detection
+
+   Simple counting of the number of "Received:" headers in a message has
+   proven to be an effective, although rarely optimal, method of
+   detecting loops in mail systems.  SMTP servers using this technique
+   SHOULD use a large rejection threshold, normally at least 100
+   Received entries.  Whatever mechanisms are used, servers MUST contain
+   provisions for detecting and stopping trivial loops.
+
+6.3 Compensating for Irregularities
+
+   Unfortunately, variations, creative interpretations, and outright
+   violations of Internet mail protocols do occur; some would suggest
+   that they occur quite frequently.  The debate as to whether a well-
+   behaved SMTP receiver or relay should reject a malformed message,
+   attempt to pass it on unchanged, or attempt to repair it to increase
+   the odds of successful delivery (or subsequent reply) began almost
+   with the dawn of structured network mail and shows no signs of
+   abating.  Advocates of rejection claim that attempted repairs are
+   rarely completely adequate and that rejection of bad messages is the
+   only way to get the offending software repaired.  Advocates of
+   "repair" or "deliver no matter what" argue that users prefer that
+   mail go through it if at all possible and that there are significant
+   market pressures in that direction.  In practice, these market
+   pressures may be more important to particular vendors than strict
+   conformance to the standards, regardless of the preference of the
+   actual developers.
+
+   The problems associated with ill-formed messages were exacerbated by
+   the introduction of the split-UA mail reading protocols [3, 26, 5,
+   21].  These protocols have encouraged the use of SMTP as a posting
+   protocol, and SMTP servers as relay systems for these client hosts
+   (which are often only intermittently connected to the Internet).
+   Historically, many of those client machines lacked some of the
+   mechanisms and information assumed by SMTP (and indeed, by the mail
+   format protocol [7]).  Some could not keep adequate track of time;
+   others had no concept of time zones; still others could not identify
+   their own names or addresses; and, of course, none could satisfy the
+   assumptions that underlay RFC 822's conception of authenticated
+   addresses.
+
+   In response to these weak SMTP clients, many SMTP systems now
+   complete messages that are delivered to them in incomplete or
+   incorrect form.  This strategy is generally considered appropriate
+   when the server can identify or authenticate the client, and there
+   are prior agreements between them.  By contrast, there is at best
+   great concern about fixes applied by a relay or delivery SMTP server
+   that has little or no knowledge of the user or client machine.
+
+
+
+Klensin                     Standards Track                    [Page 63]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   The following changes to a message being processed MAY be applied
+   when necessary by an originating SMTP server, or one used as the
+   target of SMTP as an initial posting protocol:
+
+   -  Addition of a message-id field when none appears
+
+   -  Addition of a date, time or time zone when none appears
+
+   -  Correction of addresses to proper FQDN format
+
+   The less information the server has about the client, the less likely
+   these changes are to be correct and the more caution and conservatism
+   should be applied when considering whether or not to perform fixes
+   and how.  These changes MUST NOT be applied by an SMTP server that
+   provides an intermediate relay function.
+
+   In all cases, properly-operating clients supplying correct
+   information are preferred to corrections by the SMTP server.  In all
+   cases, documentation of actions performed by the servers (in trace
+   fields and/or header comments) is strongly encouraged.
+
+7. Security Considerations
+
+7.1 Mail Security and Spoofing
+
+   SMTP mail is inherently insecure in that it is feasible for even
+   fairly casual users to negotiate directly with receiving and relaying
+   SMTP servers and create messages that will trick a naive recipient
+   into believing that they came from somewhere else.  Constructing such
+   a message so that the "spoofed" behavior cannot be detected by an
+   expert is somewhat more difficult, but not sufficiently so as to be a
+   deterrent to someone who is determined and knowledgeable.
+   Consequently, as knowledge of Internet mail increases, so does the
+   knowledge that SMTP mail inherently cannot be authenticated, or
+   integrity checks provided, at the transport level.  Real mail
+   security lies only in end-to-end methods involving the message
+   bodies, such as those which use digital signatures (see [14] and,
+   e.g., PGP [4] or S/MIME [31]).
+
+   Various protocol extensions and configuration options that provide
+   authentication at the transport level (e.g., from an SMTP client to
+   an SMTP server) improve somewhat on the traditional situation
+   described above.  However, unless they are accompanied by careful
+   handoffs of responsibility in a carefully-designed trust environment,
+   they remain inherently weaker than end-to-end mechanisms which use
+   digitally signed messages rather than depending on the integrity of
+   the transport system.
+
+
+
+
+Klensin                     Standards Track                    [Page 64]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   Efforts to make it more difficult for users to set envelope return
+   path and header "From" fields to point to valid addresses other than
+   their own are largely misguided: they frustrate legitimate
+   applications in which mail is sent by one user on behalf of another
+   or in which error (or normal) replies should be directed to a special
+   address.  (Systems that provide convenient ways for users to alter
+   these fields on a per-message basis should attempt to establish a
+   primary and permanent mailbox address for the user so that Sender
+   fields within the message data can be generated sensibly.)
+
+   This specification does not further address the authentication issues
+   associated with SMTP other than to advocate that useful functionality
+   not be disabled in the hope of providing some small margin of
+   protection against an ignorant user who is trying to fake mail.
+
+7.2 "Blind" Copies
+
+   Addresses that do not appear in the message headers may appear in the
+   RCPT commands to an SMTP server for a number of reasons.  The two
+   most common involve the use of a mailing address as a "list exploder"
+   (a single address that resolves into multiple addresses) and the
+   appearance of "blind copies".  Especially when more than one RCPT
+   command is present, and in order to avoid defeating some of the
+   purpose of these mechanisms, SMTP clients and servers SHOULD NOT copy
+   the full set of RCPT command arguments into the headers, either as
+   part of trace headers or as informational or private-extension
+   headers.  Since this rule is often violated in practice, and cannot
+   be enforced, sending SMTP systems that are aware of "bcc" use MAY
+   find it helpful to send each blind copy as a separate message
+   transaction containing only a single RCPT command.
+
+   There is no inherent relationship between either "reverse" (from
+   MAIL, SAML, etc., commands) or "forward" (RCPT) addresses in the SMTP
+   transaction ("envelope") and the addresses in the headers.  Receiving
+   systems SHOULD NOT attempt to deduce such relationships and use them
+   to alter the headers of the message for delivery.  The popular
+   "Apparently-to" header is a violation of this principle as well as a
+   common source of unintended information disclosure and SHOULD NOT be
+   used.
+
+7.3 VRFY, EXPN, and Security
+
+   As discussed in section 3.5, individual sites may want to disable
+   either or both of VRFY or EXPN for security reasons.  As a corollary
+   to the above, implementations that permit this MUST NOT appear to
+   have verified addresses that are not, in fact, verified.  If a site
+
+
+
+
+
+Klensin                     Standards Track                    [Page 65]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   disables these commands for security reasons, the SMTP server MUST
+   return a 252 response, rather than a code that could be confused with
+   successful or unsuccessful verification.
+
+   Returning a 250 reply code with the address listed in the VRFY
+   command after having checked it only for syntax violates this rule.
+   Of course, an implementation that "supports" VRFY by always returning
+   550 whether or not the address is valid is equally not in
+   conformance.
+
+   Within the last few years, the contents of mailing lists have become
+   popular as an address information source for so-called "spammers."
+   The use of EXPN to "harvest" addresses has increased as list
+   administrators have installed protections against inappropriate uses
+   of the lists themselves.  Implementations SHOULD still provide
+   support for EXPN, but sites SHOULD carefully evaluate the tradeoffs.
+   As authentication mechanisms are introduced into SMTP, some sites may
+   choose to make EXPN available only to authenticated requestors.
+
+7.4 Information Disclosure in Announcements
+
+   There has been an ongoing debate about the tradeoffs between the
+   debugging advantages of announcing server type and version (and,
+   sometimes, even server domain name) in the greeting response or in
+   response to the HELP command and the disadvantages of exposing
+   information that might be useful in a potential hostile attack.  The
+   utility of the debugging information is beyond doubt.  Those who
+   argue for making it available point out that it is far better to
+   actually secure an SMTP server rather than hope that trying to
+   conceal known vulnerabilities by hiding the server's precise identity
+   will provide more protection.  Sites are encouraged to evaluate the
+   tradeoff with that issue in mind; implementations are strongly
+   encouraged to minimally provide for making type and version
+   information available in some way to other network hosts.
+
+7.5 Information Disclosure in Trace Fields
+
+   In some circumstances, such as when mail originates from within a LAN
+   whose hosts are not directly on the public Internet, trace
+   ("Received") fields produced in conformance with this specification
+   may disclose host names and similar information that would not
+   normally be available.  This ordinarily does not pose a problem, but
+   sites with special concerns about name disclosure should be aware of
+   it.  Also, the optional FOR clause should be supplied with caution or
+   not at all when multiple recipients are involved lest it
+   inadvertently disclose the identities of "blind copy" recipients to
+   others.
+
+
+
+
+Klensin                     Standards Track                    [Page 66]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+7.6 Information Disclosure in Message Forwarding
+
+   As discussed in section 3.4, use of the 251 or 551 reply codes to
+   identify the replacement address associated with a mailbox may
+   inadvertently disclose sensitive information.  Sites that are
+   concerned about those issues should ensure that they select and
+   configure servers appropriately.
+
+7.7 Scope of Operation of SMTP Servers
+
+   It is a well-established principle that an SMTP server may refuse to
+   accept mail for any operational or technical reason that makes sense
+   to the site providing the server.  However, cooperation among sites
+   and installations makes the Internet possible.  If sites take
+   excessive advantage of the right to reject traffic, the ubiquity of
+   email availability (one of the strengths of the Internet) will be
+   threatened; considerable care should be taken and balance maintained
+   if a site decides to be selective about the traffic it will accept
+   and process.
+
+   In recent years, use of the relay function through arbitrary sites
+   has been used as part of hostile efforts to hide the actual origins
+   of mail.  Some sites have decided to limit the use of the relay
+   function to known or identifiable sources, and implementations SHOULD
+   provide the capability to perform this type of filtering.  When mail
+   is rejected for these or other policy reasons, a 550 code SHOULD be
+   used in response to EHLO, MAIL, or RCPT as appropriate.
+
+8. IANA Considerations
+
+   IANA will maintain three registries in support of this specification.
+   The first consists of SMTP service extensions with the associated
+   keywords, and, as needed, parameters and verbs.  As specified in
+   section 2.2.2, no entry may be made in this registry that starts in
+   an "X".  Entries may be made only for service extensions (and
+   associated keywords, parameters, or verbs) that are defined in
+   standards-track or experimental RFCs specifically approved by the
+   IESG for this purpose.
+
+   The second registry consists of "tags" that identify forms of domain
+   literals other than those for IPv4 addresses (specified in RFC 821
+   and in this document) and IPv6 addresses (specified in this
+   document).  Additional literal types require standardization before
+   being used; none are anticipated at this time.
+
+   The third, established by RFC 821 and renewed by this specification,
+   is a registry of link and protocol identifiers to be used with the
+   "via" and "with" subclauses of the time stamp ("Received: header")
+
+
+
+Klensin                     Standards Track                    [Page 67]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   described in section 4.4.  Link and protocol identifiers in addition
+   to those specified in this document may be registered only by
+   standardization or by way of an RFC-documented, IESG-approved,
+   Experimental protocol extension.
+
+9. References
+
+   [1]  American National Standards Institute (formerly United States of
+        America Standards Institute), X3.4, 1968, "USA Code for
+        Information Interchange". ANSI X3.4-1968 has been replaced by
+        newer versions with slight modifications, but the 1968 version
+        remains definitive for the Internet.
+
+   [2]  Braden, R., "Requirements for Internet hosts - application and
+        support", STD 3, RFC 1123, October 1989.
+
+   [3]  Butler, M., Chase, D., Goldberger, J., Postel, J. and J.
+        Reynolds, "Post Office Protocol - version 2", RFC 937, February
+        1985.
+
+   [4]  Callas, J., Donnerhacke, L., Finney, H. and R. Thayer, "OpenPGP
+        Message Format", RFC 2440, November 1998.
+
+   [5]  Crispin, M., "Interactive Mail Access Protocol - Version 2", RFC
+        1176, August 1990.
+
+   [6]  Crispin, M., "Internet Message Access Protocol - Version 4", RFC
+        2060, December 1996.
+
+   [7]  Crocker, D., "Standard for the Format of ARPA Internet Text
+        Messages", RFC 822, August 1982.
+
+   [8]  Crocker, D. and P. Overell, Eds., "Augmented BNF for Syntax
+        Specifications: ABNF", RFC 2234, November 1997.
+
+   [9]  De Winter, J., "SMTP Service Extension for Remote Message Queue
+        Starting", RFC 1985, August 1996.
+
+   [10] Fajman, R., "An Extensible Message Format for Message
+        Disposition Notifications", RFC 2298, March 1998.
+
+   [11] Freed, N, "Behavior of and Requirements for Internet Firewalls",
+        RFC 2979, October 2000.
+
+   [12] Freed, N. and N. Borenstein, "Multipurpose Internet Mail
+        Extensions (MIME) Part One: Format of Internet Message Bodies",
+        RFC 2045, December 1996.
+
+
+
+
+Klensin                     Standards Track                    [Page 68]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   [13] Freed, N., "SMTP Service Extension for Command Pipelining", RFC
+        2920, September 2000.
+
+   [14] Galvin, J., Murphy, S., Crocker, S. and N. Freed, "Security
+        Multiparts for MIME: Multipart/Signed and Multipart/Encrypted",
+        RFC 1847, October 1995.
+
+   [15] Gellens, R. and J. Klensin, "Message Submission", RFC 2476,
+        December 1998.
+
+   [16] Kille, S., "Mapping between X.400 and RFC822/MIME", RFC 2156,
+        January 1998.
+
+   [17] Hinden, R and S. Deering, Eds. "IP Version 6 Addressing
+        Architecture", RFC 2373, July 1998.
+
+   [18] Klensin, J., Freed, N. and K. Moore, "SMTP Service Extension for
+        Message Size Declaration", STD 10, RFC 1870, November 1995.
+
+   [19] Klensin, J., Freed, N., Rose, M., Stefferud, E. and D. Crocker,
+        "SMTP Service Extensions", STD 10, RFC 1869, November 1995.
+
+   [20] Klensin, J., Freed, N., Rose, M., Stefferud, E. and D. Crocker,
+        "SMTP Service Extension for 8bit-MIMEtransport", RFC 1652, July
+        1994.
+
+   [21] Lambert, M., "PCMAIL: A distributed mail system for personal
+        computers", RFC 1056, July 1988.
+
+   [22] Mockapetris, P., "Domain names - implementation and
+        specification", STD 13, RFC 1035, November 1987.
+
+        Mockapetris, P., "Domain names - concepts and facilities", STD
+        13, RFC 1034, November 1987.
+
+   [23] Moore, K., "MIME (Multipurpose Internet Mail Extensions) Part
+        Three: Message Header Extensions for Non-ASCII Text", RFC 2047,
+        December 1996.
+
+   [24] Moore, K., "SMTP Service Extension for Delivery Status
+        Notifications", RFC 1891, January 1996.
+
+   [25] Moore, K., and G. Vaudreuil, "An Extensible Message Format for
+        Delivery Status Notifications", RFC 1894, January 1996.
+
+   [26] Myers, J. and M. Rose, "Post Office Protocol - Version 3", STD
+        53, RFC 1939, May 1996.
+
+
+
+
+Klensin                     Standards Track                    [Page 69]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   [27] Partridge, C., "Mail routing and the domain system", RFC 974,
+        January 1986.
+
+   [28] Partridge, C., "Duplicate messages and SMTP", RFC 1047, February
+        1988.
+
+   [29] Postel, J., ed., "Transmission Control Protocol - DARPA Internet
+        Program Protocol Specification", STD 7, RFC 793, September 1981.
+
+   [30] Postel, J., "Simple Mail Transfer Protocol", RFC 821, August
+        1982.
+
+   [31] Ramsdell, B., Ed., "S/MIME Version 3 Message Specification", RFC
+        2633, June 1999.
+
+   [32] Resnick, P., Ed., "Internet Message Format", RFC 2822, April
+        2001.
+
+   [33] Vaudreuil, G., "SMTP Service Extensions for Transmission of
+        Large and Binary MIME Messages", RFC 1830, August 1995.
+
+   [34] Vaudreuil, G., "Enhanced Mail System Status Codes", RFC 1893,
+        January 1996.
+
+10. Editor's Address
+
+   John C. Klensin
+   AT&T Laboratories
+   99 Bedford St
+   Boston, MA 02111 USA
+
+   Phone: 617-574-3076
+   EMail: klensin@research.att.com
+
+11. Acknowledgments
+
+   Many people worked long and hard on the many iterations of this
+   document.  There was wide-ranging debate in the IETF DRUMS Working
+   Group, both on its mailing list and in face to face discussions,
+   about many technical issues and the role of a revised standard for
+   Internet mail transport, and many contributors helped form the
+   wording in this specification.  The hundreds of participants in the
+   many discussions since RFC 821 was produced are too numerous to
+   mention, but they all helped this document become what it is.
+
+
+
+
+
+
+
+Klensin                     Standards Track                    [Page 70]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+APPENDICES
+
+A. TCP Transport Service
+
+   The TCP connection supports the transmission of 8-bit bytes.  The
+   SMTP data is 7-bit ASCII characters.  Each character is transmitted
+   as an 8-bit byte with the high-order bit cleared to zero.  Service
+   extensions may modify this rule to permit transmission of full 8-bit
+   data bytes as part of the message body, but not in SMTP commands or
+   responses.
+
+B. Generating SMTP Commands from RFC 822 Headers
+
+   Some systems use RFC 822 headers (only) in a mail submission
+   protocol, or otherwise generate SMTP commands from RFC 822 headers
+   when such a message is handed to an MTA from a UA.  While the MTA-UA
+   protocol is a private matter, not covered by any Internet Standard,
+   there are problems with this approach.  For example, there have been
+   repeated problems with proper handling of "bcc" copies and
+   redistribution lists when information that conceptually belongs to a
+   mail envelopes is not separated early in processing from header
+   information (and kept separate).
+
+   It is recommended that the UA provide its initial ("submission
+   client") MTA with an envelope separate from the message itself.
+   However, if the envelope is not supplied, SMTP commands SHOULD be
+   generated as follows:
+
+   1. Each recipient address from a TO, CC, or BCC header field SHOULD
+      be copied to a RCPT command (generating multiple message copies if
+      that is required for queuing or delivery).  This includes any
+      addresses listed in a RFC 822 "group".  Any BCC fields SHOULD then
+      be removed from the headers.  Once this process is completed, the
+      remaining headers SHOULD be checked to verify that at least one
+      To:, Cc:, or Bcc: header remains.  If none do, then a bcc: header
+      with no additional information SHOULD be inserted as specified in
+      [32].
+
+   2. The return address in the MAIL command SHOULD, if possible, be
+      derived from the system's identity for the submitting (local)
+      user, and the "From:" header field otherwise.  If there is a
+      system identity available, it SHOULD also be copied to the Sender
+      header field if it is different from the address in the From
+      header field.  (Any Sender field that was already there SHOULD be
+      removed.)  Systems may provide a way for submitters to override
+      the envelope return address, but may want to restrict its use to
+      privileged users.  This will not prevent mail forgery, but may
+      lessen its incidence; see section 7.1.
+
+
+
+Klensin                     Standards Track                    [Page 71]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   When an MTA is being used in this way, it bears responsibility for
+   ensuring that the message being transmitted is valid.  The mechanisms
+   for checking that validity, and for handling (or returning) messages
+   that are not valid at the time of arrival, are part of the MUA-MTA
+   interface and not covered by this specification.
+
+   A submission protocol based on Standard RFC 822 information alone
+   MUST NOT be used to gateway a message from a foreign (non-SMTP) mail
+   system into an SMTP environment.  Additional information to construct
+   an envelope must come from some source in the other environment,
+   whether supplemental headers or the foreign system's envelope.
+
+   Attempts to gateway messages using only their header "to" and "cc"
+   fields have repeatedly caused mail loops and other behavior adverse
+   to the proper functioning of the Internet mail environment.  These
+   problems have been especially common when the message originates from
+   an Internet mailing list and is distributed into the foreign
+   environment using envelope information.  When these messages are then
+   processed by a header-only remailer, loops back to the Internet
+   environment (and the mailing list) are almost inevitable.
+
+C. Source Routes
+
+   Historically, the <reverse-path> was a reverse source routing list of
+   hosts and a source mailbox.  The first host in the <reverse-path>
+   SHOULD be the host sending the MAIL command.  Similarly, the
+   <forward-path> may be a source routing lists of hosts and a
+   destination mailbox.  However, in general, the <forward-path> SHOULD
+   contain only a mailbox and domain name, relying on the domain name
+   system to supply routing information if required.  The use of source
+   routes is deprecated; while servers MUST be prepared to receive and
+   handle them as discussed in section 3.3 and F.2, clients SHOULD NOT
+   transmit them and this section was included only to provide context.
+
+   For relay purposes, the forward-path may be a source route of the
+   form "@ONE,@TWO:JOE@THREE", where ONE, TWO, and THREE MUST BE fully-
+   qualified domain names.  This form is used to emphasize the
+   distinction between an address and a route.  The mailbox is an
+   absolute address, and the route is information about how to get
+   there.  The two concepts should not be confused.
+
+   If source routes are used, RFC 821 and the text below should be
+   consulted for the mechanisms for constructing and updating the
+   forward- and reverse-paths.
+
+
+
+
+
+
+
+Klensin                     Standards Track                    [Page 72]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+   The SMTP server transforms the command arguments by moving its own
+   identifier (its domain name or that of any domain for which it is
+   acting as a mail exchanger), if it appears, from the forward-path to
+   the beginning of the reverse-path.
+
+   Notice that the forward-path and reverse-path appear in the SMTP
+   commands and replies, but not necessarily in the message.  That is,
+   there is no need for these paths and especially this syntax to appear
+   in the "To:" , "From:", "CC:", etc. fields of the message header.
+   Conversely, SMTP servers MUST NOT derive final message delivery
+   information from message header fields.
+
+   When the list of hosts is present, it is a "reverse" source route and
+   indicates that the mail was relayed through each host on the list
+   (the first host in the list was the most recent relay).  This list is
+   used as a source route to return non-delivery notices to the sender.
+   As each relay host adds itself to the beginning of the list, it MUST
+   use its name as known in the transport environment to which it is
+   relaying the mail rather than that of the transport environment from
+   which the mail came (if they are different).
+
+D. Scenarios
+
+   This section presents complete scenarios of several types of SMTP
+   sessions.  In the examples, "C:" indicates what is said by the SMTP
+   client, and "S:" indicates what is said by the SMTP server.
+
+D.1 A Typical SMTP Transaction Scenario
+
+   This SMTP example shows mail sent by Smith at host bar.com, to Jones,
+   Green, and Brown at host foo.com.  Here we assume that host bar.com
+   contacts host foo.com directly.  The mail is accepted for Jones and
+   Brown.  Green does not have a mailbox at host foo.com.
+
+      S: 220 foo.com Simple Mail Transfer Service Ready
+      C: EHLO bar.com
+      S: 250-foo.com greets bar.com
+      S: 250-8BITMIME
+      S: 250-SIZE
+      S: 250-DSN
+      S: 250 HELP
+      C: MAIL FROM:<Smith@bar.com>
+      S: 250 OK
+      C: RCPT TO:<Jones@foo.com>
+      S: 250 OK
+      C: RCPT TO:<Green@foo.com>
+      S: 550 No such user here
+      C: RCPT TO:<Brown@foo.com>
+
+
+
+Klensin                     Standards Track                    [Page 73]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+      S: 250 OK
+      C: DATA
+      S: 354 Start mail input; end with <CRLF>.<CRLF>
+      C: Blah blah blah...
+      C: ...etc. etc. etc.
+      C: .
+      S: 250 OK
+      C: QUIT
+      S: 221 foo.com Service closing transmission channel
+
+D.2 Aborted SMTP Transaction Scenario
+
+      S: 220 foo.com Simple Mail Transfer Service Ready
+      C: EHLO bar.com
+      S: 250-foo.com greets bar.com
+      S: 250-8BITMIME
+      S: 250-SIZE
+      S: 250-DSN
+      S: 250 HELP
+      C: MAIL FROM:<Smith@bar.com>
+      S: 250 OK
+      C: RCPT TO:<Jones@foo.com>
+      S: 250 OK
+      C: RCPT TO:<Green@foo.com>
+      S: 550 No such user here
+      C: RSET
+      S: 250 OK
+      C: QUIT
+      S: 221 foo.com Service closing transmission channel
+
+D.3 Relayed Mail Scenario
+
+   Step 1  --  Source Host to Relay Host
+
+      S: 220 foo.com Simple Mail Transfer Service Ready
+      C: EHLO bar.com
+      S: 250-foo.com greets bar.com
+      S: 250-8BITMIME
+      S: 250-SIZE
+      S: 250-DSN
+      S: 250 HELP
+      C: MAIL FROM:<JQP@bar.com>
+      S: 250 OK
+      C: RCPT TO:<@foo.com:Jones@XYZ.COM>
+      S: 250 OK
+      C: DATA
+      S: 354 Start mail input; end with <CRLF>.<CRLF>
+      C: Date: Thu, 21 May 1998 05:33:29 -0700
+
+
+
+Klensin                     Standards Track                    [Page 74]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+      C: From: John Q. Public <JQP@bar.com>
+      C: Subject:  The Next Meeting of the Board
+      C: To: Jones@xyz.com
+      C:
+      C: Bill:
+      C: The next meeting of the board of directors will be
+      C: on Tuesday.
+      C:                         John.
+      C: .
+      S: 250 OK
+      C: QUIT
+      S: 221 foo.com Service closing transmission channel
+
+   Step 2  --  Relay Host to Destination Host
+
+      S: 220 xyz.com Simple Mail Transfer Service Ready
+      C: EHLO foo.com
+      S: 250 xyz.com is on the air
+      C: MAIL FROM:<@foo.com:JQP@bar.com>
+      S: 250 OK
+      C: RCPT TO:<Jones@XYZ.COM>
+      S: 250 OK
+      C: DATA
+      S: 354 Start mail input; end with <CRLF>.<CRLF>
+      C: Received: from bar.com by foo.com ; Thu, 21 May 1998
+      C:     05:33:29 -0700
+      C: Date: Thu, 21 May 1998 05:33:22 -0700
+      C: From: John Q. Public <JQP@bar.com>
+      C: Subject:  The Next Meeting of the Board
+      C: To: Jones@xyz.com
+      C:
+      C: Bill:
+      C: The next meeting of the board of directors will be
+      C: on Tuesday.
+      C:                         John.
+      C: .
+      S: 250 OK
+      C: QUIT
+      S: 221 foo.com Service closing transmission channel
+
+D.4 Verifying and Sending Scenario
+
+      S: 220 foo.com Simple Mail Transfer Service Ready
+      C: EHLO bar.com
+      S: 250-foo.com greets bar.com
+      S: 250-8BITMIME
+      S: 250-SIZE
+      S: 250-DSN
+
+
+
+Klensin                     Standards Track                    [Page 75]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+      S: 250-VRFY
+      S: 250 HELP
+      C: VRFY Crispin
+      S: 250 Mark Crispin <Admin.MRC@foo.com>
+      C: SEND FROM:<EAK@bar.com>
+      S: 250 OK
+      C: RCPT TO:<Admin.MRC@foo.com>
+      S: 250 OK
+      C: DATA
+      S: 354 Start mail input; end with <CRLF>.<CRLF>
+      C: Blah blah blah...
+      C: ...etc. etc. etc.
+      C: .
+      S: 250 OK
+      C: QUIT
+      S: 221 foo.com Service closing transmission channel
+
+E. Other Gateway Issues
+
+   In general, gateways between the Internet and other mail systems
+   SHOULD attempt to preserve any layering semantics across the
+   boundaries between the two mail systems involved.  Gateway-
+   translation approaches that attempt to take shortcuts by mapping,
+   (such as envelope information from one system to the message headers
+   or body of another) have generally proven to be inadequate in
+   important ways.  Systems translating between environments that do not
+   support both envelopes and headers and Internet mail must be written
+   with the understanding that some information loss is almost
+   inevitable.
+
+F. Deprecated Features of RFC 821
+
+   A few features of RFC 821 have proven to be problematic and SHOULD
+   NOT be used in Internet mail.
+
+F.1 TURN
+
+   This command, described in RFC 821, raises important security issues
+   since, in the absence of strong authentication of the host requesting
+   that the client and server switch roles, it can easily be used to
+   divert mail from its correct destination.  Its use is deprecated;
+   SMTP systems SHOULD NOT use it unless the server can authenticate the
+   client.
+
+
+
+
+
+
+
+
+Klensin                     Standards Track                    [Page 76]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+F.2 Source Routing
+
+   RFC 821 utilized the concept of explicit source routing to get mail
+   from one host to another via a series of relays.  The requirement to
+   utilize source routes in regular mail traffic was eliminated by the
+   introduction of the domain name system "MX" record and the last
+   significant justification for them was eliminated by the
+   introduction, in RFC 1123, of a clear requirement that addresses
+   following an "@" must all be fully-qualified domain names.
+   Consequently, the only remaining justifications for the use of source
+   routes are support for very old SMTP clients or MUAs and in mail
+   system debugging.  They can, however, still be useful in the latter
+   circumstance and for routing mail around serious, but temporary,
+   problems such as problems with the relevant DNS records.
+
+   SMTP servers MUST continue to accept source route syntax as specified
+   in the main body of this document and in RFC 1123.  They MAY, if
+   necessary, ignore the routes and utilize only the target domain in
+   the address.  If they do utilize the source route, the message MUST
+   be sent to the first domain shown in the address.  In particular, a
+   server MUST NOT guess at shortcuts within the source route.
+
+   Clients SHOULD NOT utilize explicit source routing except under
+   unusual circumstances, such as debugging or potentially relaying
+   around firewall or mail system configuration errors.
+
+F.3 HELO
+
+   As discussed in sections 3.1 and 4.1.1, EHLO is strongly preferred to
+   HELO when the server will accept the former.  Servers must continue
+   to accept and process HELO in order to support older clients.
+
+F.4 #-literals
+
+   RFC 821 provided for specifying an Internet address as a decimal
+   integer host number prefixed by a pound sign, "#".  In practice, that
+   form has been obsolete since the introduction of TCP/IP.  It is
+   deprecated and MUST NOT be used.
+
+F.5 Dates and Years
+
+   When dates are inserted into messages by SMTP clients or servers
+   (e.g., in trace fields), four-digit years MUST BE used.  Two-digit
+   years are deprecated; three-digit years were never permitted in the
+   Internet mail system.
+
+
+
+
+
+
+Klensin                     Standards Track                    [Page 77]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+F.6 Sending versus Mailing
+
+   In addition to specifying a mechanism for delivering messages to
+   user's mailboxes, RFC 821 provided additional, optional, commands to
+   deliver messages directly to the user's terminal screen.  These
+   commands (SEND, SAML, SOML) were rarely implemented, and changes in
+   workstation technology and the introduction of other protocols may
+   have rendered them obsolete even where they are implemented.
+
+   Clients SHOULD NOT provide SEND, SAML, or SOML as services.  Servers
+   MAY implement them.  If they are implemented by servers, the
+   implementation model specified in RFC 821 MUST be used and the
+   command names MUST be published in the response to the EHLO command.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Klensin                     Standards Track                    [Page 78]
+
+RFC 2821             Simple Mail Transfer Protocol            April 2001
+
+
+Full Copyright Statement
+
+   Copyright (C) The Internet Society (2001).  All Rights Reserved.
+
+   This document and translations of it may be copied and furnished to
+   others, and derivative works that comment on or otherwise explain it
+   or assist in its implementation may be prepared, copied, published
+   and distributed, in whole or in part, without restriction of any
+   kind, provided that the above copyright notice and this paragraph are
+   included on all such copies and derivative works.  However, this
+   document itself may not be modified in any way, such as by removing
+   the copyright notice or references to the Internet Society or other
+   Internet organizations, except as needed for the purpose of
+   developing Internet standards in which case the procedures for
+   copyrights defined in the Internet Standards process must be
+   followed, or as required to translate it into languages other than
+   English.
+
+   The limited permissions granted above are perpetual and will not be
+   revoked by the Internet Society or its successors or assigns.
+
+   This document and the information contained herein is provided on an
+   "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
+   TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+   BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
+   HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
+   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+Acknowledgement
+
+   Funding for the RFC Editor function is currently provided by the
+   Internet Society.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Klensin                     Standards Track                    [Page 79]
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2822.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2822.txt
new file mode 100644
index 000000000..9f698f77d
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc2822.txt
@@ -0,0 +1,2859 @@
+
+
+
+
+
+
+Network Working Group                                 P. Resnick, Editor
+Request for Comments: 2822                         QUALCOMM Incorporated
+Obsoletes: 822                                                April 2001
+Category: Standards Track
+
+
+                        Internet Message Format
+
+Status of this Memo
+
+   This document specifies an Internet standards track protocol for the
+   Internet community, and requests discussion and suggestions for
+   improvements.  Please refer to the current edition of the "Internet
+   Official Protocol Standards" (STD 1) for the standardization state
+   and status of this protocol.  Distribution of this memo is unlimited.
+
+Copyright Notice
+
+   Copyright (C) The Internet Society (2001).  All Rights Reserved.
+
+Abstract
+
+   This standard specifies a syntax for text messages that are sent
+   between computer users, within the framework of "electronic mail"
+   messages.  This standard supersedes the one specified in Request For
+   Comments (RFC) 822, "Standard for the Format of ARPA Internet Text
+   Messages", updating it to reflect current practice and incorporating
+   incremental changes that were specified in other RFCs.
+
+Table of Contents
+
+   1. Introduction ............................................... 3
+   1.1. Scope .................................................... 3
+   1.2. Notational conventions ................................... 4
+   1.2.1. Requirements notation .................................. 4
+   1.2.2. Syntactic notation ..................................... 4
+   1.3. Structure of this document ............................... 4
+   2. Lexical Analysis of Messages ............................... 5
+   2.1. General Description ...................................... 5
+   2.1.1. Line Length Limits ..................................... 6
+   2.2. Header Fields ............................................ 7
+   2.2.1. Unstructured Header Field Bodies ....................... 7
+   2.2.2. Structured Header Field Bodies ......................... 7
+   2.2.3. Long Header Fields ..................................... 7
+   2.3. Body ..................................................... 8
+   3. Syntax ..................................................... 9
+   3.1. Introduction ............................................. 9
+   3.2. Lexical Tokens ........................................... 9
+
+
+
+Resnick                     Standards Track                     [Page 1]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+   3.2.1. Primitive Tokens ....................................... 9
+   3.2.2. Quoted characters ......................................10
+   3.2.3. Folding white space and comments .......................11
+   3.2.4. Atom ...................................................12
+   3.2.5. Quoted strings .........................................13
+   3.2.6. Miscellaneous tokens ...................................13
+   3.3. Date and Time Specification ..............................14
+   3.4. Address Specification ....................................15
+   3.4.1. Addr-spec specification ................................16
+   3.5 Overall message syntax ....................................17
+   3.6. Field definitions ........................................18
+   3.6.1. The origination date field .............................20
+   3.6.2. Originator fields ......................................21
+   3.6.3. Destination address fields .............................22
+   3.6.4. Identification fields ..................................23
+   3.6.5. Informational fields ...................................26
+   3.6.6. Resent fields ..........................................26
+   3.6.7. Trace fields ...........................................28
+   3.6.8. Optional fields ........................................29
+   4. Obsolete Syntax ............................................29
+   4.1. Miscellaneous obsolete tokens ............................30
+   4.2. Obsolete folding white space .............................31
+   4.3. Obsolete Date and Time ...................................31
+   4.4. Obsolete Addressing ......................................33
+   4.5. Obsolete header fields ...................................33
+   4.5.1. Obsolete origination date field ........................34
+   4.5.2. Obsolete originator fields .............................34
+   4.5.3. Obsolete destination address fields ....................34
+   4.5.4. Obsolete identification fields .........................35
+   4.5.5. Obsolete informational fields ..........................35
+   4.5.6. Obsolete resent fields .................................35
+   4.5.7. Obsolete trace fields ..................................36
+   4.5.8. Obsolete optional fields ...............................36
+   5. Security Considerations ....................................36
+   6. Bibliography ...............................................37
+   7. Editor's Address ...........................................38
+   8. Acknowledgements ...........................................39
+   Appendix A. Example messages ..................................41
+   A.1. Addressing examples ......................................41
+   A.1.1. A message from one person to another with simple
+          addressing .............................................41
+   A.1.2. Different types of mailboxes ...........................42
+   A.1.3. Group addresses ........................................43
+   A.2. Reply messages ...........................................43
+   A.3. Resent messages ..........................................44
+   A.4. Messages with trace fields ...............................46
+   A.5. White space, comments, and other oddities ................47
+   A.6. Obsoleted forms ..........................................47
+
+
+
+Resnick                     Standards Track                     [Page 2]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+   A.6.1. Obsolete addressing ....................................48
+   A.6.2. Obsolete dates .........................................48
+   A.6.3. Obsolete white space and comments ......................48
+   Appendix B. Differences from earlier standards ................49
+   Appendix C. Notices ...........................................50
+   Full Copyright Statement ......................................51
+
+1. Introduction
+
+1.1. Scope
+
+   This standard specifies a syntax for text messages that are sent
+   between computer users, within the framework of "electronic mail"
+   messages.  This standard supersedes the one specified in Request For
+   Comments (RFC) 822, "Standard for the Format of ARPA Internet Text
+   Messages" [RFC822], updating it to reflect current practice and
+   incorporating incremental changes that were specified in other RFCs
+   [STD3].
+
+   This standard specifies a syntax only for text messages.  In
+   particular, it makes no provision for the transmission of images,
+   audio, or other sorts of structured data in electronic mail messages.
+   There are several extensions published, such as the MIME document
+   series [RFC2045, RFC2046, RFC2049], which describe mechanisms for the
+   transmission of such data through electronic mail, either by
+   extending the syntax provided here or by structuring such messages to
+   conform to this syntax.  Those mechanisms are outside of the scope of
+   this standard.
+
+   In the context of electronic mail, messages are viewed as having an
+   envelope and contents.  The envelope contains whatever information is
+   needed to accomplish transmission and delivery.  (See [RFC2821] for a
+   discussion of the envelope.)  The contents comprise the object to be
+   delivered to the recipient.  This standard applies only to the format
+   and some of the semantics of message contents.  It contains no
+   specification of the information in the envelope.
+
+   However, some message systems may use information from the contents
+   to create the envelope.  It is intended that this standard facilitate
+   the acquisition of such information by programs.
+
+   This specification is intended as a definition of what message
+   content format is to be passed between systems.  Though some message
+   systems locally store messages in this format (which eliminates the
+   need for translation between formats) and others use formats that
+   differ from the one specified in this standard, local storage is
+   outside of the scope of this standard.
+
+
+
+
+Resnick                     Standards Track                     [Page 3]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+   Note: This standard is not intended to dictate the internal formats
+   used by sites, the specific message system features that they are
+   expected to support, or any of the characteristics of user interface
+   programs that create or read messages.  In addition, this standard
+   does not specify an encoding of the characters for either transport
+   or storage; that is, it does not specify the number of bits used or
+   how those bits are specifically transferred over the wire or stored
+   on disk.
+
+1.2. Notational conventions
+
+1.2.1. Requirements notation
+
+   This document occasionally uses terms that appear in capital letters.
+   When the terms "MUST", "SHOULD", "RECOMMENDED", "MUST NOT", "SHOULD
+   NOT", and "MAY" appear capitalized, they are being used to indicate
+   particular requirements of this specification.  A discussion of the
+   meanings of these terms appears in [RFC2119].
+
+1.2.2. Syntactic notation
+
+   This standard uses the Augmented Backus-Naur Form (ABNF) notation
+   specified in [RFC2234] for the formal definitions of the syntax of
+   messages.  Characters will be specified either by a decimal value
+   (e.g., the value %d65 for uppercase A and %d97 for lowercase A) or by
+   a case-insensitive literal value enclosed in quotation marks (e.g.,
+   "A" for either uppercase or lowercase A).  See [RFC2234] for the full
+   description of the notation.
+
+1.3. Structure of this document
+
+   This document is divided into several sections.
+
+   This section, section 1, is a short introduction to the document.
+
+   Section 2 lays out the general description of a message and its
+   constituent parts.  This is an overview to help the reader understand
+   some of the general principles used in the later portions of this
+   document.  Any examples in this section MUST NOT be taken as
+   specification of the formal syntax of any part of a message.
+
+   Section 3 specifies formal ABNF rules for the structure of each part
+   of a message (the syntax) and describes the relationship between
+   those parts and their meaning in the context of a message (the
+   semantics).  That is, it describes the actual rules for the structure
+   of each part of a message (the syntax) as well as a description of
+   the parts and instructions on how they ought to be interpreted (the
+   semantics).  This includes analysis of the syntax and semantics of
+
+
+
+Resnick                     Standards Track                     [Page 4]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+   subparts of messages that have specific structure.  The syntax
+   included in section 3 represents messages as they MUST be created.
+   There are also notes in section 3 to indicate if any of the options
+   specified in the syntax SHOULD be used over any of the others.
+
+   Both sections 2 and 3 describe messages that are legal to generate
+   for purposes of this standard.
+
+   Section 4 of this document specifies an "obsolete" syntax.  There are
+   references in section 3 to these obsolete syntactic elements.  The
+   rules of the obsolete syntax are elements that have appeared in
+   earlier revisions of this standard or have previously been widely
+   used in Internet messages.  As such, these elements MUST be
+   interpreted by parsers of messages in order to be conformant to this
+   standard.  However, since items in this syntax have been determined
+   to be non-interoperable or to cause significant problems for
+   recipients of messages, they MUST NOT be generated by creators of
+   conformant messages.
+
+   Section 5 details security considerations to take into account when
+   implementing this standard.
+
+   Section 6 is a bibliography of references in this document.
+
+   Section 7 contains the editor's address.
+
+   Section 8 contains acknowledgements.
+
+   Appendix A lists examples of different sorts of messages.  These
+   examples are not exhaustive of the types of messages that appear on
+   the Internet, but give a broad overview of certain syntactic forms.
+
+   Appendix B lists the differences between this standard and earlier
+   standards for Internet messages.
+
+   Appendix C has copyright and intellectual property notices.
+
+2. Lexical Analysis of Messages
+
+2.1. General Description
+
+   At the most basic level, a message is a series of characters.  A
+   message that is conformant with this standard is comprised of
+   characters with values in the range 1 through 127 and interpreted as
+   US-ASCII characters [ASCII].  For brevity, this document sometimes
+   refers to this range of characters as simply "US-ASCII characters".
+
+
+
+
+
+Resnick                     Standards Track                     [Page 5]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+   Note: This standard specifies that messages are made up of characters
+   in the US-ASCII range of 1 through 127.  There are other documents,
+   specifically the MIME document series [RFC2045, RFC2046, RFC2047,
+   RFC2048, RFC2049], that extend this standard to allow for values
+   outside of that range.  Discussion of those mechanisms is not within
+   the scope of this standard.
+
+   Messages are divided into lines of characters.  A line is a series of
+   characters that is delimited with the two characters carriage-return
+   and line-feed; that is, the carriage return (CR) character (ASCII
+   value 13) followed immediately by the line feed (LF) character (ASCII
+   value 10).  (The carriage-return/line-feed pair is usually written in
+   this document as "CRLF".)
+
+   A message consists of header fields (collectively called "the header
+   of the message") followed, optionally, by a body.  The header is a
+   sequence of lines of characters with special syntax as defined in
+   this standard. The body is simply a sequence of characters that
+   follows the header and is separated from the header by an empty line
+   (i.e., a line with nothing preceding the CRLF).
+
+2.1.1. Line Length Limits
+
+   There are two limits that this standard places on the number of
+   characters in a line. Each line of characters MUST be no more than
+   998 characters, and SHOULD be no more than 78 characters, excluding
+   the CRLF.
+
+   The 998 character limit is due to limitations in many implementations
+   which send, receive, or store Internet Message Format messages that
+   simply cannot handle more than 998 characters on a line. Receiving
+   implementations would do well to handle an arbitrarily large number
+   of characters in a line for robustness sake. However, there are so
+   many implementations which (in compliance with the transport
+   requirements of [RFC2821]) do not accept messages containing more
+   than 1000 character including the CR and LF per line, it is important
+   for implementations not to create such messages.
+
+   The more conservative 78 character recommendation is to accommodate
+   the many implementations of user interfaces that display these
+   messages which may truncate, or disastrously wrap, the display of
+   more than 78 characters per line, in spite of the fact that such
+   implementations are non-conformant to the intent of this
+   specification (and that of [RFC2821] if they actually cause
+   information to be lost). Again, even though this limitation is put on
+   messages, it is encumbant upon implementations which display messages
+
+
+
+
+
+Resnick                     Standards Track                     [Page 6]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+   to handle an arbitrarily large number of characters in a line
+   (certainly at least up to the 998 character limit) for the sake of
+   robustness.
+
+2.2. Header Fields
+
+   Header fields are lines composed of a field name, followed by a colon
+   (":"), followed by a field body, and terminated by CRLF.  A field
+   name MUST be composed of printable US-ASCII characters (i.e.,
+   characters that have values between 33 and 126, inclusive), except
+   colon.  A field body may be composed of any US-ASCII characters,
+   except for CR and LF.  However, a field body may contain CRLF when
+   used in header "folding" and  "unfolding" as described in section
+   2.2.3.  All field bodies MUST conform to the syntax described in
+   sections 3 and 4 of this standard.
+
+2.2.1. Unstructured Header Field Bodies
+
+   Some field bodies in this standard are defined simply as
+   "unstructured" (which is specified below as any US-ASCII characters,
+   except for CR and LF) with no further restrictions.  These are
+   referred to as unstructured field bodies.  Semantically, unstructured
+   field bodies are simply to be treated as a single line of characters
+   with no further processing (except for header "folding" and
+   "unfolding" as described in section 2.2.3).
+
+2.2.2. Structured Header Field Bodies
+
+   Some field bodies in this standard have specific syntactical
+   structure more restrictive than the unstructured field bodies
+   described above. These are referred to as "structured" field bodies.
+   Structured field bodies are sequences of specific lexical tokens as
+   described in sections 3 and 4 of this standard.  Many of these tokens
+   are allowed (according to their syntax) to be introduced or end with
+   comments (as described in section 3.2.3) as well as the space (SP,
+   ASCII value 32) and horizontal tab (HTAB, ASCII value 9) characters
+   (together known as the white space characters, WSP), and those WSP
+   characters are subject to header "folding" and "unfolding" as
+   described in section 2.2.3.  Semantic analysis of structured field
+   bodies is given along with their syntax.
+
+2.2.3. Long Header Fields
+
+   Each header field is logically a single line of characters comprising
+   the field name, the colon, and the field body.  For convenience
+   however, and to deal with the 998/78 character limitations per line,
+   the field body portion of a header field can be split into a multiple
+   line representation; this is called "folding".  The general rule is
+
+
+
+Resnick                     Standards Track                     [Page 7]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+   that wherever this standard allows for folding white space (not
+   simply WSP characters), a CRLF may be inserted before any WSP.  For
+   example, the header field:
+
+           Subject: This is a test
+
+   can be represented as:
+
+           Subject: This
+            is a test
+
+   Note: Though structured field bodies are defined in such a way that
+   folding can take place between many of the lexical tokens (and even
+   within some of the lexical tokens), folding SHOULD be limited to
+   placing the CRLF at higher-level syntactic breaks.  For instance, if
+   a field body is defined as comma-separated values, it is recommended
+   that folding occur after the comma separating the structured items in
+   preference to other places where the field could be folded, even if
+   it is allowed elsewhere.
+
+   The process of moving from this folded multiple-line representation
+   of a header field to its single line representation is called
+   "unfolding". Unfolding is accomplished by simply removing any CRLF
+   that is immediately followed by WSP.  Each header field should be
+   treated in its unfolded form for further syntactic and semantic
+   evaluation.
+
+2.3. Body
+
+   The body of a message is simply lines of US-ASCII characters.  The
+   only two limitations on the body are as follows:
+
+   - CR and LF MUST only occur together as CRLF; they MUST NOT appear
+     independently in the body.
+
+   - Lines of characters in the body MUST be limited to 998 characters,
+     and SHOULD be limited to 78 characters, excluding the CRLF.
+
+   Note: As was stated earlier, there are other standards documents,
+   specifically the MIME documents [RFC2045, RFC2046, RFC2048, RFC2049]
+   that extend this standard to allow for different sorts of message
+   bodies.  Again, these mechanisms are beyond the scope of this
+   document.
+
+
+
+
+
+
+
+
+Resnick                     Standards Track                     [Page 8]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+3. Syntax
+
+3.1. Introduction
+
+   The syntax as given in this section defines the legal syntax of
+   Internet messages.  Messages that are conformant to this standard
+   MUST conform to the syntax in this section.  If there are options in
+   this section where one option SHOULD be generated, that is indicated
+   either in the prose or in a comment next to the syntax.
+
+   For the defined expressions, a short description of the syntax and
+   use is given, followed by the syntax in ABNF, followed by a semantic
+   analysis.  Primitive tokens that are used but otherwise unspecified
+   come from [RFC2234].
+
+   In some of the definitions, there will be nonterminals whose names
+   start with "obs-".  These "obs-" elements refer to tokens defined in
+   the obsolete syntax in section 4.  In all cases, these productions
+   are to be ignored for the purposes of generating legal Internet
+   messages and MUST NOT be used as part of such a message.  However,
+   when interpreting messages, these tokens MUST be honored as part of
+   the legal syntax.  In this sense, section 3 defines a grammar for
+   generation of messages, with "obs-" elements that are to be ignored,
+   while section 4 adds grammar for interpretation of messages.
+
+3.2. Lexical Tokens
+
+   The following rules are used to define an underlying lexical
+   analyzer, which feeds tokens to the higher-level parsers.  This
+   section defines the tokens used in structured header field bodies.
+
+   Note: Readers of this standard need to pay special attention to how
+   these lexical tokens are used in both the lower-level and
+   higher-level syntax later in the document.  Particularly, the white
+   space tokens and the comment tokens defined in section 3.2.3 get used
+   in the lower-level tokens defined here, and those lower-level tokens
+   are in turn used as parts of the higher-level tokens defined later.
+   Therefore, the white space and comments may be allowed in the
+   higher-level tokens even though they may not explicitly appear in a
+   particular definition.
+
+3.2.1. Primitive Tokens
+
+   The following are primitive tokens referred to elsewhere in this
+   standard, but not otherwise defined in [RFC2234].  Some of them will
+   not appear anywhere else in the syntax, but they are convenient to
+   refer to in other parts of this document.
+
+
+
+
+Resnick                     Standards Track                     [Page 9]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+   Note: The "specials" below are just such an example.  Though the
+   specials token does not appear anywhere else in this standard, it is
+   useful for implementers who use tools that lexically analyze
+   messages.  Each of the characters in specials can be used to indicate
+   a tokenization point in lexical analysis.
+
+NO-WS-CTL       =       %d1-8 /         ; US-ASCII control characters
+                        %d11 /          ;  that do not include the
+                        %d12 /          ;  carriage return, line feed,
+                        %d14-31 /       ;  and white space characters
+                        %d127
+
+text            =       %d1-9 /         ; Characters excluding CR and LF
+                        %d11 /
+                        %d12 /
+                        %d14-127 /
+                        obs-text
+
+specials        =       "(" / ")" /     ; Special characters used in
+                        "<" / ">" /     ;  other parts of the syntax
+                        "[" / "]" /
+                        ":" / ";" /
+                        "@" / "\" /
+                        "," / "." /
+                        DQUOTE
+
+   No special semantics are attached to these tokens.  They are simply
+   single characters.
+
+3.2.2. Quoted characters
+
+   Some characters are reserved for special interpretation, such as
+   delimiting lexical tokens.  To permit use of these characters as
+   uninterpreted data, a quoting mechanism is provided.
+
+quoted-pair     =       ("\" text) / obs-qp
+
+   Where any quoted-pair appears, it is to be interpreted as the text
+   character alone.  That is to say, the "\" character that appears as
+   part of a quoted-pair is semantically "invisible".
+
+   Note: The "\" character may appear in a message where it is not part
+   of a quoted-pair.  A "\" character that does not appear in a
+   quoted-pair is not semantically invisible.  The only places in this
+   standard where quoted-pair currently appears are ccontent, qcontent,
+   dcontent, no-fold-quote, and no-fold-literal.
+
+
+
+
+
+Resnick                     Standards Track                    [Page 10]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+3.2.3. Folding white space and comments
+
+   White space characters, including white space used in folding
+   (described in section 2.2.3), may appear between many elements in
+   header field bodies.  Also, strings of characters that are treated as
+   comments may be included in structured field bodies as characters
+   enclosed in parentheses.  The following defines the folding white
+   space (FWS) and comment constructs.
+
+   Strings of characters enclosed in parentheses are considered comments
+   so long as they do not appear within a "quoted-string", as defined in
+   section 3.2.5.  Comments may nest.
+
+   There are several places in this standard where comments and FWS may
+   be freely inserted.  To accommodate that syntax, an additional token
+   for "CFWS" is defined for places where comments and/or FWS can occur.
+   However, where CFWS occurs in this standard, it MUST NOT be inserted
+   in such a way that any line of a folded header field is made up
+   entirely of WSP characters and nothing else.
+
+FWS             =       ([*WSP CRLF] 1*WSP) /   ; Folding white space
+                        obs-FWS
+
+ctext           =       NO-WS-CTL /     ; Non white space controls
+
+                        %d33-39 /       ; The rest of the US-ASCII
+                        %d42-91 /       ;  characters not including "(",
+                        %d93-126        ;  ")", or "\"
+
+ccontent        =       ctext / quoted-pair / comment
+
+comment         =       "(" *([FWS] ccontent) [FWS] ")"
+
+CFWS            =       *([FWS] comment) (([FWS] comment) / FWS)
+
+   Throughout this standard, where FWS (the folding white space token)
+   appears, it indicates a place where header folding, as discussed in
+   section 2.2.3, may take place.  Wherever header folding appears in a
+   message (that is, a header field body containing a CRLF followed by
+   any WSP), header unfolding (removal of the CRLF) is performed before
+   any further lexical analysis is performed on that header field
+   according to this standard.  That is to say, any CRLF that appears in
+   FWS is semantically "invisible."
+
+   A comment is normally used in a structured field body to provide some
+   human readable informational text.  Since a comment is allowed to
+   contain FWS, folding is permitted within the comment.  Also note that
+   since quoted-pair is allowed in a comment, the parentheses and
+
+
+
+Resnick                     Standards Track                    [Page 11]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+   backslash characters may appear in a comment so long as they appear
+   as a quoted-pair.  Semantically, the enclosing parentheses are not
+   part of the comment; the comment is what is contained between the two
+   parentheses.  As stated earlier, the "\" in any quoted-pair and the
+   CRLF in any FWS that appears within the comment are semantically
+   "invisible" and therefore not part of the comment either.
+
+   Runs of FWS, comment or CFWS that occur between lexical tokens in a
+   structured field header are semantically interpreted as a single
+   space character.
+
+3.2.4. Atom
+
+   Several productions in structured header field bodies are simply
+   strings of certain basic characters.  Such productions are called
+   atoms.
+
+   Some of the structured header field bodies also allow the period
+   character (".", ASCII value 46) within runs of atext.  An additional
+   "dot-atom" token is defined for those purposes.
+
+atext           =       ALPHA / DIGIT / ; Any character except controls,
+                        "!" / "#" /     ;  SP, and specials.
+                        "$" / "%" /     ;  Used for atoms
+                        "&" / "'" /
+                        "*" / "+" /
+                        "-" / "/" /
+                        "=" / "?" /
+                        "^" / "_" /
+                        "`" / "{" /
+                        "|" / "}" /
+                        "~"
+
+atom            =       [CFWS] 1*atext [CFWS]
+
+dot-atom        =       [CFWS] dot-atom-text [CFWS]
+
+dot-atom-text   =       1*atext *("." 1*atext)
+
+   Both atom and dot-atom are interpreted as a single unit, comprised of
+   the string of characters that make it up.  Semantically, the optional
+   comments and FWS surrounding the rest of the characters are not part
+   of the atom; the atom is only the run of atext characters in an atom,
+   or the atext and "." characters in a dot-atom.
+
+
+
+
+
+
+
+Resnick                     Standards Track                    [Page 12]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+3.2.5. Quoted strings
+
+   Strings of characters that include characters other than those
+   allowed in atoms may be represented in a quoted string format, where
+   the characters are surrounded by quote (DQUOTE, ASCII value 34)
+   characters.
+
+qtext           =       NO-WS-CTL /     ; Non white space controls
+
+                        %d33 /          ; The rest of the US-ASCII
+                        %d35-91 /       ;  characters not including "\"
+                        %d93-126        ;  or the quote character
+
+qcontent        =       qtext / quoted-pair
+
+quoted-string   =       [CFWS]
+                        DQUOTE *([FWS] qcontent) [FWS] DQUOTE
+                        [CFWS]
+
+   A quoted-string is treated as a unit.  That is, quoted-string is
+   identical to atom, semantically.  Since a quoted-string is allowed to
+   contain FWS, folding is permitted.  Also note that since quoted-pair
+   is allowed in a quoted-string, the quote and backslash characters may
+   appear in a quoted-string so long as they appear as a quoted-pair.
+
+   Semantically, neither the optional CFWS outside of the quote
+   characters nor the quote characters themselves are part of the
+   quoted-string; the quoted-string is what is contained between the two
+   quote characters.  As stated earlier, the "\" in any quoted-pair and
+   the CRLF in any FWS/CFWS that appears within the quoted-string are
+   semantically "invisible" and therefore not part of the quoted-string
+   either.
+
+3.2.6. Miscellaneous tokens
+
+   Three additional tokens are defined, word and phrase for combinations
+   of atoms and/or quoted-strings, and unstructured for use in
+   unstructured header fields and in some places within structured
+   header fields.
+
+word            =       atom / quoted-string
+
+phrase          =       1*word / obs-phrase
+
+
+
+
+
+
+
+
+Resnick                     Standards Track                    [Page 13]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+utext           =       NO-WS-CTL /     ; Non white space controls
+                        %d33-126 /      ; The rest of US-ASCII
+                        obs-utext
+
+unstructured    =       *([FWS] utext) [FWS]
+
+3.3. Date and Time Specification
+
+   Date and time occur in several header fields.  This section specifies
+   the syntax for a full date and time specification.  Though folding
+   white space is permitted throughout the date-time specification, it
+   is RECOMMENDED that a single space be used in each place that FWS
+   appears (whether it is required or optional); some older
+   implementations may not interpret other occurrences of folding white
+   space correctly.
+
+date-time       =       [ day-of-week "," ] date FWS time [CFWS]
+
+day-of-week     =       ([FWS] day-name) / obs-day-of-week
+
+day-name        =       "Mon" / "Tue" / "Wed" / "Thu" /
+                        "Fri" / "Sat" / "Sun"
+
+date            =       day month year
+
+year            =       4*DIGIT / obs-year
+
+month           =       (FWS month-name FWS) / obs-month
+
+month-name      =       "Jan" / "Feb" / "Mar" / "Apr" /
+                        "May" / "Jun" / "Jul" / "Aug" /
+                        "Sep" / "Oct" / "Nov" / "Dec"
+
+day             =       ([FWS] 1*2DIGIT) / obs-day
+
+time            =       time-of-day FWS zone
+
+time-of-day     =       hour ":" minute [ ":" second ]
+
+hour            =       2DIGIT / obs-hour
+
+minute          =       2DIGIT / obs-minute
+
+second          =       2DIGIT / obs-second
+
+zone            =       (( "+" / "-" ) 4DIGIT) / obs-zone
+
+
+
+
+
+Resnick                     Standards Track                    [Page 14]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+   The day is the numeric day of the month.  The year is any numeric
+   year 1900 or later.
+
+   The time-of-day specifies the number of hours, minutes, and
+   optionally seconds since midnight of the date indicated.
+
+   The date and time-of-day SHOULD express local time.
+
+   The zone specifies the offset from Coordinated Universal Time (UTC,
+   formerly referred to as "Greenwich Mean Time") that the date and
+   time-of-day represent.  The "+" or "-" indicates whether the
+   time-of-day is ahead of (i.e., east of) or behind (i.e., west of)
+   Universal Time.  The first two digits indicate the number of hours
+   difference from Universal Time, and the last two digits indicate the
+   number of minutes difference from Universal Time.  (Hence, +hhmm
+   means +(hh * 60 + mm) minutes, and -hhmm means -(hh * 60 + mm)
+   minutes).  The form "+0000" SHOULD be used to indicate a time zone at
+   Universal Time.  Though "-0000" also indicates Universal Time, it is
+   used to indicate that the time was generated on a system that may be
+   in a local time zone other than Universal Time and therefore
+   indicates that the date-time contains no information about the local
+   time zone.
+
+   A date-time specification MUST be semantically valid.  That is, the
+   day-of-the-week (if included) MUST be the day implied by the date,
+   the numeric day-of-month MUST be between 1 and the number of days
+   allowed for the specified month (in the specified year), the
+   time-of-day MUST be in the range 00:00:00 through 23:59:60 (the
+   number of seconds allowing for a leap second; see [STD12]), and the
+   zone MUST be within the range -9959 through +9959.
+
+3.4. Address Specification
+
+   Addresses occur in several message header fields to indicate senders
+   and recipients of messages.  An address may either be an individual
+   mailbox, or a group of mailboxes.
+
+address         =       mailbox / group
+
+mailbox         =       name-addr / addr-spec
+
+name-addr       =       [display-name] angle-addr
+
+angle-addr      =       [CFWS] "<" addr-spec ">" [CFWS] / obs-angle-addr
+
+group           =       display-name ":" [mailbox-list / CFWS] ";"
+                        [CFWS]
+
+
+
+
+Resnick                     Standards Track                    [Page 15]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+display-name    =       phrase
+
+mailbox-list    =       (mailbox *("," mailbox)) / obs-mbox-list
+
+address-list    =       (address *("," address)) / obs-addr-list
+
+   A mailbox receives mail.  It is a conceptual entity which does not
+   necessarily pertain to file storage.  For example, some sites may
+   choose to print mail on a printer and deliver the output to the
+   addressee's desk.  Normally, a mailbox is comprised of two parts: (1)
+   an optional display name that indicates the name of the recipient
+   (which could be a person or a system) that could be displayed to the
+   user of a mail application, and (2) an addr-spec address enclosed in
+   angle brackets ("<" and ">").  There is also an alternate simple form
+   of a mailbox where the addr-spec address appears alone, without the
+   recipient's name or the angle brackets.  The Internet addr-spec
+   address is described in section 3.4.1.
+
+   Note: Some legacy implementations used the simple form where the
+   addr-spec appears without the angle brackets, but included the name
+   of the recipient in parentheses as a comment following the addr-spec.
+   Since the meaning of the information in a comment is unspecified,
+   implementations SHOULD use the full name-addr form of the mailbox,
+   instead of the legacy form, to specify the display name associated
+   with a mailbox.  Also, because some legacy implementations interpret
+   the comment, comments generally SHOULD NOT be used in address fields
+   to avoid confusing such implementations.
+
+   When it is desirable to treat several mailboxes as a single unit
+   (i.e., in a distribution list), the group construct can be used.  The
+   group construct allows the sender to indicate a named group of
+   recipients. This is done by giving a display name for the group,
+   followed by a colon, followed by a comma separated list of any number
+   of mailboxes (including zero and one), and ending with a semicolon.
+   Because the list of mailboxes can be empty, using the group construct
+   is also a simple way to communicate to recipients that the message
+   was sent to one or more named sets of recipients, without actually
+   providing the individual mailbox address for each of those
+   recipients.
+
+3.4.1. Addr-spec specification
+
+   An addr-spec is a specific Internet identifier that contains a
+   locally interpreted string followed by the at-sign character ("@",
+   ASCII value 64) followed by an Internet domain.  The locally
+   interpreted string is either a quoted-string or a dot-atom.  If the
+   string can be represented as a dot-atom (that is, it contains no
+   characters other than atext characters or "." surrounded by atext
+
+
+
+Resnick                     Standards Track                    [Page 16]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+   characters), then the dot-atom form SHOULD be used and the
+   quoted-string form SHOULD NOT be used. Comments and folding white
+   space SHOULD NOT be used around the "@" in the addr-spec.
+
+addr-spec       =       local-part "@" domain
+
+local-part      =       dot-atom / quoted-string / obs-local-part
+
+domain          =       dot-atom / domain-literal / obs-domain
+
+domain-literal  =       [CFWS] "[" *([FWS] dcontent) [FWS] "]" [CFWS]
+
+dcontent        =       dtext / quoted-pair
+
+dtext           =       NO-WS-CTL /     ; Non white space controls
+
+                        %d33-90 /       ; The rest of the US-ASCII
+                        %d94-126        ;  characters not including "[",
+                                        ;  "]", or "\"
+
+   The domain portion identifies the point to which the mail is
+   delivered. In the dot-atom form, this is interpreted as an Internet
+   domain name (either a host name or a mail exchanger name) as
+   described in [STD3, STD13, STD14].  In the domain-literal form, the
+   domain is interpreted as the literal Internet address of the
+   particular host.  In both cases, how addressing is used and how
+   messages are transported to a particular host is covered in the mail
+   transport document [RFC2821].  These mechanisms are outside of the
+   scope of this document.
+
+   The local-part portion is a domain dependent string.  In addresses,
+   it is simply interpreted on the particular host as a name of a
+   particular mailbox.
+
+3.5 Overall message syntax
+
+   A message consists of header fields, optionally followed by a message
+   body.  Lines in a message MUST be a maximum of 998 characters
+   excluding the CRLF, but it is RECOMMENDED that lines be limited to 78
+   characters excluding the CRLF.  (See section 2.1.1 for explanation.)
+   In a message body, though all of the characters listed in the text
+   rule MAY be used, the use of US-ASCII control characters (values 1
+   through 8, 11, 12, and 14 through 31) is discouraged since their
+   interpretation by receivers for display is not guaranteed.
+
+
+
+
+
+
+
+Resnick                     Standards Track                    [Page 17]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+message         =       (fields / obs-fields)
+                        [CRLF body]
+
+body            =       *(*998text CRLF) *998text
+
+   The header fields carry most of the semantic information and are
+   defined in section 3.6.  The body is simply a series of lines of text
+   which are uninterpreted for the purposes of this standard.
+
+3.6. Field definitions
+
+   The header fields of a message are defined here.  All header fields
+   have the same general syntactic structure: A field name, followed by
+   a colon, followed by the field body.  The specific syntax for each
+   header field is defined in the subsequent sections.
+
+   Note: In the ABNF syntax for each field in subsequent sections, each
+   field name is followed by the required colon.  However, for brevity
+   sometimes the colon is not referred to in the textual description of
+   the syntax.  It is, nonetheless, required.
+
+   It is important to note that the header fields are not guaranteed to
+   be in a particular order.  They may appear in any order, and they
+   have been known to be reordered occasionally when transported over
+   the Internet.  However, for the purposes of this standard, header
+   fields SHOULD NOT be reordered when a message is transported or
+   transformed.  More importantly, the trace header fields and resent
+   header fields MUST NOT be reordered, and SHOULD be kept in blocks
+   prepended to the message.  See sections 3.6.6 and 3.6.7 for more
+   information.
+
+   The only required header fields are the origination date field and
+   the originator address field(s).  All other header fields are
+   syntactically optional.  More information is contained in the table
+   following this definition.
+
+fields          =       *(trace
+                          *(resent-date /
+                           resent-from /
+                           resent-sender /
+                           resent-to /
+                           resent-cc /
+                           resent-bcc /
+                           resent-msg-id))
+                        *(orig-date /
+                        from /
+                        sender /
+                        reply-to /
+
+
+
+Resnick                     Standards Track                    [Page 18]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+                        to /
+                        cc /
+                        bcc /
+                        message-id /
+                        in-reply-to /
+                        references /
+                        subject /
+                        comments /
+                        keywords /
+                        optional-field)
+
+   The following table indicates limits on the number of times each
+   field may occur in a message header as well as any special
+   limitations on the use of those fields.  An asterisk next to a value
+   in the minimum or maximum column indicates that a special restriction
+   appears in the Notes column.
+
+Field           Min number      Max number      Notes
+
+trace           0               unlimited       Block prepended - see
+                                                3.6.7
+
+resent-date     0*              unlimited*      One per block, required
+                                                if other resent fields
+                                                present - see 3.6.6
+
+resent-from     0               unlimited*      One per block - see
+                                                3.6.6
+
+resent-sender   0*              unlimited*      One per block, MUST
+                                                occur with multi-address
+                                                resent-from - see 3.6.6
+
+resent-to       0               unlimited*      One per block - see
+                                                3.6.6
+
+resent-cc       0               unlimited*      One per block - see
+                                                3.6.6
+
+resent-bcc      0               unlimited*      One per block - see
+                                                3.6.6
+
+resent-msg-id   0               unlimited*      One per block - see
+                                                3.6.6
+
+orig-date       1               1
+
+from            1               1               See sender and 3.6.2
+
+
+
+Resnick                     Standards Track                    [Page 19]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+sender          0*              1               MUST occur with multi-
+                                                address from - see 3.6.2
+
+reply-to        0               1
+
+to              0               1
+
+cc              0               1
+
+bcc             0               1
+
+message-id      0*              1               SHOULD be present - see
+                                                3.6.4
+
+in-reply-to     0*              1               SHOULD occur in some
+                                                replies - see 3.6.4
+
+references      0*              1               SHOULD occur in some
+                                                replies - see 3.6.4
+
+subject         0               1
+
+comments        0               unlimited
+
+keywords        0               unlimited
+
+optional-field  0               unlimited
+
+   The exact interpretation of each field is described in subsequent
+   sections.
+
+3.6.1. The origination date field
+
+   The origination date field consists of the field name "Date" followed
+   by a date-time specification.
+
+orig-date       =       "Date:" date-time CRLF
+
+   The origination date specifies the date and time at which the creator
+   of the message indicated that the message was complete and ready to
+   enter the mail delivery system.  For instance, this might be the time
+   that a user pushes the "send" or "submit" button in an application
+   program.  In any case, it is specifically not intended to convey the
+   time that the message is actually transported, but rather the time at
+   which the human or other creator of the message has put the message
+   into its final form, ready for transport.  (For example, a portable
+   computer user who is not connected to a network might queue a message
+
+
+
+
+Resnick                     Standards Track                    [Page 20]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+   for delivery.  The origination date is intended to contain the date
+   and time that the user queued the message, not the time when the user
+   connected to the network to send the message.)
+
+3.6.2. Originator fields
+
+   The originator fields of a message consist of the from field, the
+   sender field (when applicable), and optionally the reply-to field.
+   The from field consists of the field name "From" and a
+   comma-separated list of one or more mailbox specifications.  If the
+   from field contains more than one mailbox specification in the
+   mailbox-list, then the sender field, containing the field name
+   "Sender" and a single mailbox specification, MUST appear in the
+   message.  In either case, an optional reply-to field MAY also be
+   included, which contains the field name "Reply-To" and a
+   comma-separated list of one or more addresses.
+
+from            =       "From:" mailbox-list CRLF
+
+sender          =       "Sender:" mailbox CRLF
+
+reply-to        =       "Reply-To:" address-list CRLF
+
+   The originator fields indicate the mailbox(es) of the source of the
+   message.  The "From:" field specifies the author(s) of the message,
+   that is, the mailbox(es) of the person(s) or system(s) responsible
+   for the writing of the message.  The "Sender:" field specifies the
+   mailbox of the agent responsible for the actual transmission of the
+   message.  For example, if a secretary were to send a message for
+   another person, the mailbox of the secretary would appear in the
+   "Sender:" field and the mailbox of the actual author would appear in
+   the "From:" field.  If the originator of the message can be indicated
+   by a single mailbox and the author and transmitter are identical, the
+   "Sender:" field SHOULD NOT be used.  Otherwise, both fields SHOULD
+   appear.
+
+   The originator fields also provide the information required when
+   replying to a message.  When the "Reply-To:" field is present, it
+   indicates the mailbox(es) to which the author of the message suggests
+   that replies be sent.  In the absence of the "Reply-To:" field,
+   replies SHOULD by default be sent to the mailbox(es) specified in the
+   "From:" field unless otherwise specified by the person composing the
+   reply.
+
+   In all cases, the "From:" field SHOULD NOT contain any mailbox that
+   does not belong to the author(s) of the message.  See also section
+   3.6.3 for more information on forming the destination addresses for a
+   reply.
+
+
+
+Resnick                     Standards Track                    [Page 21]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+3.6.3. Destination address fields
+
+   The destination fields of a message consist of three possible fields,
+   each of the same form: The field name, which is either "To", "Cc", or
+   "Bcc", followed by a comma-separated list of one or more addresses
+   (either mailbox or group syntax).
+
+to              =       "To:" address-list CRLF
+
+cc              =       "Cc:" address-list CRLF
+
+bcc             =       "Bcc:" (address-list / [CFWS]) CRLF
+
+   The destination fields specify the recipients of the message.  Each
+   destination field may have one or more addresses, and each of the
+   addresses indicate the intended recipients of the message.  The only
+   difference between the three fields is how each is used.
+
+   The "To:" field contains the address(es) of the primary recipient(s)
+   of the message.
+
+   The "Cc:" field (where the "Cc" means "Carbon Copy" in the sense of
+   making a copy on a typewriter using carbon paper) contains the
+   addresses of others who are to receive the message, though the
+   content of the message may not be directed at them.
+
+   The "Bcc:" field (where the "Bcc" means "Blind Carbon Copy") contains
+   addresses of recipients of the message whose addresses are not to be
+   revealed to other recipients of the message.  There are three ways in
+   which the "Bcc:" field is used.  In the first case, when a message
+   containing a "Bcc:" field is prepared to be sent, the "Bcc:" line is
+   removed even though all of the recipients (including those specified
+   in the "Bcc:" field) are sent a copy of the message.  In the second
+   case, recipients specified in the "To:" and "Cc:" lines each are sent
+   a copy of the message with the "Bcc:" line removed as above, but the
+   recipients on the "Bcc:" line get a separate copy of the message
+   containing a "Bcc:" line.  (When there are multiple recipient
+   addresses in the "Bcc:" field, some implementations actually send a
+   separate copy of the message to each recipient with a "Bcc:"
+   containing only the address of that particular recipient.) Finally,
+   since a "Bcc:" field may contain no addresses, a "Bcc:" field can be
+   sent without any addresses indicating to the recipients that blind
+   copies were sent to someone.  Which method to use with "Bcc:" fields
+   is implementation dependent, but refer to the "Security
+   Considerations" section of this document for a discussion of each.
+
+
+
+
+
+
+Resnick                     Standards Track                    [Page 22]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+   When a message is a reply to another message, the mailboxes of the
+   authors of the original message (the mailboxes in the "From:" field)
+   or mailboxes specified in the "Reply-To:" field (if it exists) MAY
+   appear in the "To:" field of the reply since these would normally be
+   the primary recipients of the reply.  If a reply is sent to a message
+   that has destination fields, it is often desirable to send a copy of
+   the reply to all of the recipients of the message, in addition to the
+   author.  When such a reply is formed, addresses in the "To:" and
+   "Cc:" fields of the original message MAY appear in the "Cc:" field of
+   the reply, since these are normally secondary recipients of the
+   reply.  If a "Bcc:" field is present in the original message,
+   addresses in that field MAY appear in the "Bcc:" field of the reply,
+   but SHOULD NOT appear in the "To:" or "Cc:" fields.
+
+   Note: Some mail applications have automatic reply commands that
+   include the destination addresses of the original message in the
+   destination addresses of the reply.  How those reply commands behave
+   is implementation dependent and is beyond the scope of this document.
+   In particular, whether or not to include the original destination
+   addresses when the original message had a "Reply-To:" field is not
+   addressed here.
+
+3.6.4. Identification fields
+
+   Though optional, every message SHOULD have a "Message-ID:" field.
+   Furthermore, reply messages SHOULD have "In-Reply-To:" and
+   "References:" fields as appropriate, as described below.
+
+   The "Message-ID:" field contains a single unique message identifier.
+   The "References:" and "In-Reply-To:" field each contain one or more
+   unique message identifiers, optionally separated by CFWS.
+
+   The message identifier (msg-id) is similar in syntax to an angle-addr
+   construct without the internal CFWS.
+
+message-id      =       "Message-ID:" msg-id CRLF
+
+in-reply-to     =       "In-Reply-To:" 1*msg-id CRLF
+
+references      =       "References:" 1*msg-id CRLF
+
+msg-id          =       [CFWS] "<" id-left "@" id-right ">" [CFWS]
+
+id-left         =       dot-atom-text / no-fold-quote / obs-id-left
+
+id-right        =       dot-atom-text / no-fold-literal / obs-id-right
+
+no-fold-quote   =       DQUOTE *(qtext / quoted-pair) DQUOTE
+
+
+
+Resnick                     Standards Track                    [Page 23]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+no-fold-literal =       "[" *(dtext / quoted-pair) "]"
+
+   The "Message-ID:" field provides a unique message identifier that
+   refers to a particular version of a particular message.  The
+   uniqueness of the message identifier is guaranteed by the host that
+   generates it (see below).  This message identifier is intended to be
+   machine readable and not necessarily meaningful to humans.  A message
+   identifier pertains to exactly one instantiation of a particular
+   message; subsequent revisions to the message each receive new message
+   identifiers.
+
+   Note: There are many instances when messages are "changed", but those
+   changes do not constitute a new instantiation of that message, and
+   therefore the message would not get a new message identifier.  For
+   example, when messages are introduced into the transport system, they
+   are often prepended with additional header fields such as trace
+   fields (described in section 3.6.7) and resent fields (described in
+   section 3.6.6).  The addition of such header fields does not change
+   the identity of the message and therefore the original "Message-ID:"
+   field is retained.  In all cases, it is the meaning that the sender
+   of the message wishes to convey (i.e., whether this is the same
+   message or a different message) that determines whether or not the
+   "Message-ID:" field changes, not any particular syntactic difference
+   that appears (or does not appear) in the message.
+
+   The "In-Reply-To:" and "References:" fields are used when creating a
+   reply to a message.  They hold the message identifier of the original
+   message and the message identifiers of other messages (for example,
+   in the case of a reply to a message which was itself a reply).  The
+   "In-Reply-To:" field may be used to identify the message (or
+   messages) to which the new message is a reply, while the
+   "References:" field may be used to identify a "thread" of
+   conversation.
+
+   When creating a reply to a message, the "In-Reply-To:" and
+   "References:" fields of the resultant message are constructed as
+   follows:
+
+   The "In-Reply-To:" field will contain the contents of the "Message-
+   ID:" field of the message to which this one is a reply (the "parent
+   message").  If there is more than one parent message, then the "In-
+   Reply-To:" field will contain the contents of all of the parents'
+   "Message-ID:" fields.  If there is no "Message-ID:" field in any of
+   the parent messages, then the new message will have no "In-Reply-To:"
+   field.
+
+
+
+
+
+
+Resnick                     Standards Track                    [Page 24]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+   The "References:" field will contain the contents of the parent's
+   "References:" field (if any) followed by the contents of the parent's
+   "Message-ID:" field (if any).  If the parent message does not contain
+   a "References:" field but does have an "In-Reply-To:" field
+   containing a single message identifier, then the "References:" field
+   will contain the contents of the parent's "In-Reply-To:" field
+   followed by the contents of the parent's "Message-ID:" field (if
+   any).  If the parent has none of the "References:", "In-Reply-To:",
+   or "Message-ID:" fields, then the new message will have no
+   "References:" field.
+
+   Note: Some implementations parse the "References:" field to display
+   the "thread of the discussion".  These implementations assume that
+   each new message is a reply to a single parent and hence that they
+   can walk backwards through the "References:" field to find the parent
+   of each message listed there.  Therefore, trying to form a
+   "References:" field for a reply that has multiple parents is
+   discouraged and how to do so is not defined in this document.
+
+   The message identifier (msg-id) itself MUST be a globally unique
+   identifier for a message.  The generator of the message identifier
+   MUST guarantee that the msg-id is unique.  There are several
+   algorithms that can be used to accomplish this.  Since the msg-id has
+   a similar syntax to angle-addr (identical except that comments and
+   folding white space are not allowed), a good method is to put the
+   domain name (or a domain literal IP address) of the host on which the
+   message identifier was created on the right hand side of the "@", and
+   put a combination of the current absolute date and time along with
+   some other currently unique (perhaps sequential) identifier available
+   on the system (for example, a process id number) on the left hand
+   side.  Using a date on the left hand side and a domain name or domain
+   literal on the right hand side makes it possible to guarantee
+   uniqueness since no two hosts use the same domain name or IP address
+   at the same time.  Though other algorithms will work, it is
+   RECOMMENDED that the right hand side contain some domain identifier
+   (either of the host itself or otherwise) such that the generator of
+   the message identifier can guarantee the uniqueness of the left hand
+   side within the scope of that domain.
+
+   Semantically, the angle bracket characters are not part of the
+   msg-id; the msg-id is what is contained between the two angle bracket
+   characters.
+
+
+
+
+
+
+
+
+
+Resnick                     Standards Track                    [Page 25]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+3.6.5. Informational fields
+
+   The informational fields are all optional.  The "Keywords:" field
+   contains a comma-separated list of one or more words or
+   quoted-strings. The "Subject:" and "Comments:" fields are
+   unstructured fields as defined in section 2.2.1, and therefore may
+   contain text or folding white space.
+
+subject         =       "Subject:" unstructured CRLF
+
+comments        =       "Comments:" unstructured CRLF
+
+keywords        =       "Keywords:" phrase *("," phrase) CRLF
+
+   These three fields are intended to have only human-readable content
+   with information about the message.  The "Subject:" field is the most
+   common and contains a short string identifying the topic of the
+   message.  When used in a reply, the field body MAY start with the
+   string "Re: " (from the Latin "res", in the matter of) followed by
+   the contents of the "Subject:" field body of the original message.
+   If this is done, only one instance of the literal string "Re: " ought
+   to be used since use of other strings or more than one instance can
+   lead to undesirable consequences.  The "Comments:" field contains any
+   additional comments on the text of the body of the message.  The
+   "Keywords:" field contains a comma-separated list of important words
+   and phrases that might be useful for the recipient.
+
+3.6.6. Resent fields
+
+   Resent fields SHOULD be added to any message that is reintroduced by
+   a user into the transport system.  A separate set of resent fields
+   SHOULD be added each time this is done.  All of the resent fields
+   corresponding to a particular resending of the message SHOULD be
+   together.  Each new set of resent fields is prepended to the message;
+   that is, the most recent set of resent fields appear earlier in the
+   message.  No other fields in the message are changed when resent
+   fields are added.
+
+   Each of the resent fields corresponds to a particular field elsewhere
+   in the syntax.  For instance, the "Resent-Date:" field corresponds to
+   the "Date:" field and the "Resent-To:" field corresponds to the "To:"
+   field.  In each case, the syntax for the field body is identical to
+   the syntax given previously for the corresponding field.
+
+   When resent fields are used, the "Resent-From:" and "Resent-Date:"
+   fields MUST be sent.  The "Resent-Message-ID:" field SHOULD be sent.
+   "Resent-Sender:" SHOULD NOT be used if "Resent-Sender:" would be
+   identical to "Resent-From:".
+
+
+
+Resnick                     Standards Track                    [Page 26]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+resent-date     =       "Resent-Date:" date-time CRLF
+
+resent-from     =       "Resent-From:" mailbox-list CRLF
+
+resent-sender   =       "Resent-Sender:" mailbox CRLF
+
+resent-to       =       "Resent-To:" address-list CRLF
+
+resent-cc       =       "Resent-Cc:" address-list CRLF
+
+resent-bcc      =       "Resent-Bcc:" (address-list / [CFWS]) CRLF
+
+resent-msg-id   =       "Resent-Message-ID:" msg-id CRLF
+
+   Resent fields are used to identify a message as having been
+   reintroduced into the transport system by a user.  The purpose of
+   using resent fields is to have the message appear to the final
+   recipient as if it were sent directly by the original sender, with
+   all of the original fields remaining the same.  Each set of resent
+   fields correspond to a particular resending event.  That is, if a
+   message is resent multiple times, each set of resent fields gives
+   identifying information for each individual time.  Resent fields are
+   strictly informational.  They MUST NOT be used in the normal
+   processing of replies or other such automatic actions on messages.
+
+   Note: Reintroducing a message into the transport system and using
+   resent fields is a different operation from "forwarding".
+   "Forwarding" has two meanings: One sense of forwarding is that a mail
+   reading program can be told by a user to forward a copy of a message
+   to another person, making the forwarded message the body of the new
+   message.  A forwarded message in this sense does not appear to have
+   come from the original sender, but is an entirely new message from
+   the forwarder of the message.  On the other hand, forwarding is also
+   used to mean when a mail transport program gets a message and
+   forwards it on to a different destination for final delivery.  Resent
+   header fields are not intended for use with either type of
+   forwarding.
+
+   The resent originator fields indicate the mailbox of the person(s) or
+   system(s) that resent the message.  As with the regular originator
+   fields, there are two forms: a simple "Resent-From:" form which
+   contains the mailbox of the individual doing the resending, and the
+   more complex form, when one individual (identified in the
+   "Resent-Sender:" field) resends a message on behalf of one or more
+   others (identified in the "Resent-From:" field).
+
+   Note: When replying to a resent message, replies behave just as they
+   would with any other message, using the original "From:",
+
+
+
+Resnick                     Standards Track                    [Page 27]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+   "Reply-To:", "Message-ID:", and other fields.  The resent fields are
+   only informational and MUST NOT be used in the normal processing of
+   replies.
+
+   The "Resent-Date:" indicates the date and time at which the resent
+   message is dispatched by the resender of the message.  Like the
+   "Date:" field, it is not the date and time that the message was
+   actually transported.
+
+   The "Resent-To:", "Resent-Cc:", and "Resent-Bcc:" fields function
+   identically to the "To:", "Cc:", and "Bcc:" fields respectively,
+   except that they indicate the recipients of the resent message, not
+   the recipients of the original message.
+
+   The "Resent-Message-ID:" field provides a unique identifier for the
+   resent message.
+
+3.6.7. Trace fields
+
+   The trace fields are a group of header fields consisting of an
+   optional "Return-Path:" field, and one or more "Received:" fields.
+   The "Return-Path:" header field contains a pair of angle brackets
+   that enclose an optional addr-spec.  The "Received:" field contains a
+   (possibly empty) list of name/value pairs followed by a semicolon and
+   a date-time specification.  The first item of the name/value pair is
+   defined by item-name, and the second item is either an addr-spec, an
+   atom, a domain, or a msg-id.  Further restrictions may be applied to
+   the syntax of the trace fields by standards that provide for their
+   use, such as [RFC2821].
+
+trace           =       [return]
+                        1*received
+
+return          =       "Return-Path:" path CRLF
+
+path            =       ([CFWS] "<" ([CFWS] / addr-spec) ">" [CFWS]) /
+                        obs-path
+
+received        =       "Received:" name-val-list ";" date-time CRLF
+
+name-val-list   =       [CFWS] [name-val-pair *(CFWS name-val-pair)]
+
+name-val-pair   =       item-name CFWS item-value
+
+item-name       =       ALPHA *(["-"] (ALPHA / DIGIT))
+
+item-value      =       1*angle-addr / addr-spec /
+                         atom / domain / msg-id
+
+
+
+Resnick                     Standards Track                    [Page 28]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+   A full discussion of the Internet mail use of trace fields is
+   contained in [RFC2821].  For the purposes of this standard, the trace
+   fields are strictly informational, and any formal interpretation of
+   them is outside of the scope of this document.
+
+3.6.8. Optional fields
+
+   Fields may appear in messages that are otherwise unspecified in this
+   standard.  They MUST conform to the syntax of an optional-field.
+   This is a field name, made up of the printable US-ASCII characters
+   except SP and colon, followed by a colon, followed by any text which
+   conforms to unstructured.
+
+   The field names of any optional-field MUST NOT be identical to any
+   field name specified elsewhere in this standard.
+
+optional-field  =       field-name ":" unstructured CRLF
+
+field-name      =       1*ftext
+
+ftext           =       %d33-57 /               ; Any character except
+                        %d59-126                ;  controls, SP, and
+                                                ;  ":".
+
+   For the purposes of this standard, any optional field is
+   uninterpreted.
+
+4. Obsolete Syntax
+
+   Earlier versions of this standard allowed for different (usually more
+   liberal) syntax than is allowed in this version.  Also, there have
+   been syntactic elements used in messages on the Internet whose
+   interpretation have never been documented.  Though some of these
+   syntactic forms MUST NOT be generated according to the grammar in
+   section 3, they MUST be accepted and parsed by a conformant receiver.
+   This section documents many of these syntactic elements.  Taking the
+   grammar in section 3 and adding the definitions presented in this
+   section will result in the grammar to use for interpretation of
+   messages.
+
+   Note: This section identifies syntactic forms that any implementation
+   MUST reasonably interpret.  However, there are certainly Internet
+   messages which do not conform to even the additional syntax given in
+   this section.  The fact that a particular form does not appear in any
+   section of this document is not justification for computer programs
+   to crash or for malformed data to be irretrievably lost by any
+   implementation.  To repeat an example, though this document requires
+   lines in messages to be no longer than 998 characters, silently
+
+
+
+Resnick                     Standards Track                    [Page 29]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+   discarding the 999th and subsequent characters in a line without
+   warning would still be bad behavior for an implementation.  It is up
+   to the implementation to deal with messages robustly.
+
+   One important difference between the obsolete (interpreting) and the
+   current (generating) syntax is that in structured header field bodies
+   (i.e., between the colon and the CRLF of any structured header
+   field), white space characters, including folding white space, and
+   comments can be freely inserted between any syntactic tokens.  This
+   allows many complex forms that have proven difficult for some
+   implementations to parse.
+
+   Another key difference between the obsolete and the current syntax is
+   that the rule in section 3.2.3 regarding lines composed entirely of
+   white space in comments and folding white space does not apply.  See
+   the discussion of folding white space in section 4.2 below.
+
+   Finally, certain characters that were formerly allowed in messages
+   appear in this section.  The NUL character (ASCII value 0) was once
+   allowed, but is no longer for compatibility reasons.  CR and LF were
+   allowed to appear in messages other than as CRLF; this use is also
+   shown here.
+
+   Other differences in syntax and semantics are noted in the following
+   sections.
+
+4.1. Miscellaneous obsolete tokens
+
+   These syntactic elements are used elsewhere in the obsolete syntax or
+   in the main syntax.  The obs-char and obs-qp elements each add ASCII
+   value 0. Bare CR and bare LF are added to obs-text and obs-utext.
+   The period character is added to obs-phrase. The obs-phrase-list
+   provides for "empty" elements in a comma-separated list of phrases.
+
+   Note: The "period" (or "full stop") character (".") in obs-phrase is
+   not a form that was allowed in earlier versions of this or any other
+   standard.  Period (nor any other character from specials) was not
+   allowed in phrase because it introduced a parsing difficulty
+   distinguishing between phrases and portions of an addr-spec (see
+   section 4.4).  It appears here because the period character is
+   currently used in many messages in the display-name portion of
+   addresses, especially for initials in names, and therefore must be
+   interpreted properly.  In the future, period may appear in the
+   regular syntax of phrase.
+
+obs-qp          =       "\" (%d0-127)
+
+obs-text        =       *LF *CR *(obs-char *LF *CR)
+
+
+
+Resnick                     Standards Track                    [Page 30]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+obs-char        =       %d0-9 / %d11 /          ; %d0-127 except CR and
+                        %d12 / %d14-127         ;  LF
+
+obs-utext       =       obs-text
+
+obs-phrase      =       word *(word / "." / CFWS)
+
+obs-phrase-list =       phrase / 1*([phrase] [CFWS] "," [CFWS]) [phrase]
+
+   Bare CR and bare LF appear in messages with two different meanings.
+   In many cases, bare CR or bare LF are used improperly instead of CRLF
+   to indicate line separators.  In other cases, bare CR and bare LF are
+   used simply as ASCII control characters with their traditional ASCII
+   meanings.
+
+4.2. Obsolete folding white space
+
+   In the obsolete syntax, any amount of folding white space MAY be
+   inserted where the obs-FWS rule is allowed.  This creates the
+   possibility of having two consecutive "folds" in a line, and
+   therefore the possibility that a line which makes up a folded header
+   field could be composed entirely of white space.
+
+   obs-FWS         =       1*WSP *(CRLF 1*WSP)
+
+4.3. Obsolete Date and Time
+
+   The syntax for the obsolete date format allows a 2 digit year in the
+   date field and allows for a list of alphabetic time zone
+   specifications that were used in earlier versions of this standard.
+   It also permits comments and folding white space between many of the
+   tokens.
+
+obs-day-of-week =       [CFWS] day-name [CFWS]
+
+obs-year        =       [CFWS] 2*DIGIT [CFWS]
+
+obs-month       =       CFWS month-name CFWS
+
+obs-day         =       [CFWS] 1*2DIGIT [CFWS]
+
+obs-hour        =       [CFWS] 2DIGIT [CFWS]
+
+obs-minute      =       [CFWS] 2DIGIT [CFWS]
+
+obs-second      =       [CFWS] 2DIGIT [CFWS]
+
+obs-zone        =       "UT" / "GMT" /          ; Universal Time
+
+
+
+Resnick                     Standards Track                    [Page 31]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+                                                ; North American UT
+                                                ; offsets
+                        "EST" / "EDT" /         ; Eastern:  - 5/ - 4
+                        "CST" / "CDT" /         ; Central:  - 6/ - 5
+                        "MST" / "MDT" /         ; Mountain: - 7/ - 6
+                        "PST" / "PDT" /         ; Pacific:  - 8/ - 7
+
+                        %d65-73 /               ; Military zones - "A"
+                        %d75-90 /               ; through "I" and "K"
+                        %d97-105 /              ; through "Z", both
+                        %d107-122               ; upper and lower case
+
+   Where a two or three digit year occurs in a date, the year is to be
+   interpreted as follows: If a two digit year is encountered whose
+   value is between 00 and 49, the year is interpreted by adding 2000,
+   ending up with a value between 2000 and 2049.  If a two digit year is
+   encountered with a value between 50 and 99, or any three digit year
+   is encountered, the year is interpreted by adding 1900.
+
+   In the obsolete time zone, "UT" and "GMT" are indications of
+   "Universal Time" and "Greenwich Mean Time" respectively and are both
+   semantically identical to "+0000".
+
+   The remaining three character zones are the US time zones.  The first
+   letter, "E", "C", "M", or "P" stands for "Eastern", "Central",
+   "Mountain" and "Pacific".  The second letter is either "S" for
+   "Standard" time, or "D" for "Daylight" (or summer) time.  Their
+   interpretations are as follows:
+
+   EDT is semantically equivalent to -0400
+   EST is semantically equivalent to -0500
+   CDT is semantically equivalent to -0500
+   CST is semantically equivalent to -0600
+   MDT is semantically equivalent to -0600
+   MST is semantically equivalent to -0700
+   PDT is semantically equivalent to -0700
+   PST is semantically equivalent to -0800
+
+   The 1 character military time zones were defined in a non-standard
+   way in [RFC822] and are therefore unpredictable in their meaning.
+   The original definitions of the military zones "A" through "I" are
+   equivalent to "+0100" through "+0900" respectively; "K", "L", and "M"
+   are equivalent to  "+1000", "+1100", and "+1200" respectively; "N"
+   through "Y" are equivalent to "-0100" through "-1200" respectively;
+   and "Z" is equivalent to "+0000".  However, because of the error in
+   [RFC822], they SHOULD all be considered equivalent to "-0000" unless
+   there is out-of-band information confirming their meaning.
+
+
+
+
+Resnick                     Standards Track                    [Page 32]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+   Other multi-character (usually between 3 and 5) alphabetic time zones
+   have been used in Internet messages.  Any such time zone whose
+   meaning is not known SHOULD be considered equivalent to "-0000"
+   unless there is out-of-band information confirming their meaning.
+
+4.4. Obsolete Addressing
+
+   There are three primary differences in addressing.  First, mailbox
+   addresses were allowed to have a route portion before the addr-spec
+   when enclosed in "<" and ">".  The route is simply a comma-separated
+   list of domain names, each preceded by "@", and the list terminated
+   by a colon.  Second, CFWS were allowed between the period-separated
+   elements of local-part and domain (i.e., dot-atom was not used).  In
+   addition, local-part is allowed to contain quoted-string in addition
+   to just atom.  Finally, mailbox-list and address-list were allowed to
+   have "null" members.  That is, there could be two or more commas in
+   such a list with nothing in between them.
+
+obs-angle-addr  =       [CFWS] "<" [obs-route] addr-spec ">" [CFWS]
+
+obs-route       =       [CFWS] obs-domain-list ":" [CFWS]
+
+obs-domain-list =       "@" domain *(*(CFWS / "," ) [CFWS] "@" domain)
+
+obs-local-part  =       word *("." word)
+
+obs-domain      =       atom *("." atom)
+
+obs-mbox-list   =       1*([mailbox] [CFWS] "," [CFWS]) [mailbox]
+
+obs-addr-list   =       1*([address] [CFWS] "," [CFWS]) [address]
+
+   When interpreting addresses, the route portion SHOULD be ignored.
+
+4.5. Obsolete header fields
+
+   Syntactically, the primary difference in the obsolete field syntax is
+   that it allows multiple occurrences of any of the fields and they may
+   occur in any order.  Also, any amount of white space is allowed
+   before the ":" at the end of the field name.
+
+obs-fields      =       *(obs-return /
+                        obs-received /
+                        obs-orig-date /
+                        obs-from /
+                        obs-sender /
+                        obs-reply-to /
+                        obs-to /
+
+
+
+Resnick                     Standards Track                    [Page 33]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+                        obs-cc /
+                        obs-bcc /
+                        obs-message-id /
+                        obs-in-reply-to /
+                        obs-references /
+                        obs-subject /
+                        obs-comments /
+                        obs-keywords /
+                        obs-resent-date /
+                        obs-resent-from /
+                        obs-resent-send /
+                        obs-resent-rply /
+                        obs-resent-to /
+                        obs-resent-cc /
+                        obs-resent-bcc /
+                        obs-resent-mid /
+                        obs-optional)
+
+   Except for destination address fields (described in section 4.5.3),
+   the interpretation of multiple occurrences of fields is unspecified.
+   Also, the interpretation of trace fields and resent fields which do
+   not occur in blocks prepended to the message is unspecified as well.
+   Unless otherwise noted in the following sections, interpretation of
+   other fields is identical to the interpretation of their non-obsolete
+   counterparts in section 3.
+
+4.5.1. Obsolete origination date field
+
+obs-orig-date   =       "Date" *WSP ":" date-time CRLF
+
+4.5.2. Obsolete originator fields
+
+obs-from        =       "From" *WSP ":" mailbox-list CRLF
+
+obs-sender      =       "Sender" *WSP ":" mailbox CRLF
+
+obs-reply-to    =       "Reply-To" *WSP ":" mailbox-list CRLF
+
+4.5.3. Obsolete destination address fields
+
+obs-to          =       "To" *WSP ":" address-list CRLF
+
+obs-cc          =       "Cc" *WSP ":" address-list CRLF
+
+obs-bcc         =       "Bcc" *WSP ":" (address-list / [CFWS]) CRLF
+
+
+
+
+
+
+Resnick                     Standards Track                    [Page 34]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+   When multiple occurrences of destination address fields occur in a
+   message, they SHOULD be treated as if the address-list in the first
+   occurrence of the field is combined with the address lists of the
+   subsequent occurrences by adding a comma and concatenating.
+
+4.5.4. Obsolete identification fields
+
+   The obsolete "In-Reply-To:" and "References:" fields differ from the
+   current syntax in that they allow phrase (words or quoted strings) to
+   appear.  The obsolete forms of the left and right sides of msg-id
+   allow interspersed CFWS, making them syntactically identical to
+   local-part and domain respectively.
+
+obs-message-id  =       "Message-ID" *WSP ":" msg-id CRLF
+
+obs-in-reply-to =       "In-Reply-To" *WSP ":" *(phrase / msg-id) CRLF
+
+obs-references  =       "References" *WSP ":" *(phrase / msg-id) CRLF
+
+obs-id-left     =       local-part
+
+obs-id-right    =       domain
+
+   For purposes of interpretation, the phrases in the "In-Reply-To:" and
+   "References:" fields are ignored.
+
+   Semantically, none of the optional CFWS surrounding the local-part
+   and the domain are part of the obs-id-left and obs-id-right
+   respectively.
+
+4.5.5. Obsolete informational fields
+
+obs-subject     =       "Subject" *WSP ":" unstructured CRLF
+
+obs-comments    =       "Comments" *WSP ":" unstructured CRLF
+
+obs-keywords    =       "Keywords" *WSP ":" obs-phrase-list CRLF
+
+4.5.6. Obsolete resent fields
+
+   The obsolete syntax adds a "Resent-Reply-To:" field, which consists
+   of the field name, the optional comments and folding white space, the
+   colon, and a comma separated list of addresses.
+
+obs-resent-from =       "Resent-From" *WSP ":" mailbox-list CRLF
+
+obs-resent-send =       "Resent-Sender" *WSP ":" mailbox CRLF
+
+
+
+
+Resnick                     Standards Track                    [Page 35]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+obs-resent-date =       "Resent-Date" *WSP ":" date-time CRLF
+
+obs-resent-to   =       "Resent-To" *WSP ":" address-list CRLF
+
+obs-resent-cc   =       "Resent-Cc" *WSP ":" address-list CRLF
+
+obs-resent-bcc  =       "Resent-Bcc" *WSP ":"
+                         (address-list / [CFWS]) CRLF
+
+obs-resent-mid  =       "Resent-Message-ID" *WSP ":" msg-id CRLF
+
+obs-resent-rply =       "Resent-Reply-To" *WSP ":" address-list CRLF
+
+   As with other resent fields, the "Resent-Reply-To:" field is to be
+   treated as trace information only.
+
+4.5.7. Obsolete trace fields
+
+   The obs-return and obs-received are again given here as template
+   definitions, just as return and received are in section 3.  Their
+   full syntax is given in [RFC2821].
+
+obs-return      =       "Return-Path" *WSP ":" path CRLF
+
+obs-received    =       "Received" *WSP ":" name-val-list CRLF
+
+obs-path        =       obs-angle-addr
+
+4.5.8. Obsolete optional fields
+
+obs-optional    =       field-name *WSP ":" unstructured CRLF
+
+5. Security Considerations
+
+   Care needs to be taken when displaying messages on a terminal or
+   terminal emulator.  Powerful terminals may act on escape sequences
+   and other combinations of ASCII control characters with a variety of
+   consequences.  They can remap the keyboard or permit other
+   modifications to the terminal which could lead to denial of service
+   or even damaged data.  They can trigger (sometimes programmable)
+   answerback messages which can allow a message to cause commands to be
+   issued on the recipient's behalf.  They can also effect the operation
+   of terminal attached devices such as printers.  Message viewers may
+   wish to strip potentially dangerous terminal escape sequences from
+   the message prior to display.  However, other escape sequences appear
+   in messages for useful purposes (cf. [RFC2045, RFC2046, RFC2047,
+   RFC2048, RFC2049, ISO2022]) and therefore should not be stripped
+   indiscriminately.
+
+
+
+Resnick                     Standards Track                    [Page 36]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+   Transmission of non-text objects in messages raises additional
+   security issues.  These issues are discussed in [RFC2045, RFC2046,
+   RFC2047, RFC2048, RFC2049].
+
+   Many implementations use the "Bcc:" (blind carbon copy) field
+   described in section 3.6.3 to facilitate sending messages to
+   recipients without revealing the addresses of one or more of the
+   addressees to the other recipients.  Mishandling this use of "Bcc:"
+   has implications for confidential information that might be revealed,
+   which could eventually lead to security problems through knowledge of
+   even the existence of a particular mail address.  For example, if
+   using the first method described in section 3.6.3, where the "Bcc:"
+   line is removed from the message, blind recipients have no explicit
+   indication that they have been sent a blind copy, except insofar as
+   their address does not appear in the message header.  Because of
+   this, one of the blind addressees could potentially send a reply to
+   all of the shown recipients and accidentally reveal that the message
+   went to the blind recipient.  When the second method from section
+   3.6.3 is used, the blind recipient's address appears in the "Bcc:"
+   field of a separate copy of the message. If the "Bcc:" field sent
+   contains all of the blind addressees, all of the "Bcc:" recipients
+   will be seen by each "Bcc:" recipient.  Even if a separate message is
+   sent to each "Bcc:" recipient with only the individual's address,
+   implementations still need to be careful to process replies to the
+   message as per section 3.6.3 so as not to accidentally reveal the
+   blind recipient to other recipients.
+
+6. Bibliography
+
+   [ASCII]    American National Standards Institute (ANSI), Coded
+              Character Set - 7-Bit American National Standard Code for
+              Information Interchange, ANSI X3.4, 1986.
+
+   [ISO2022] International Organization for Standardization (ISO),
+              Information processing - ISO 7-bit and 8-bit coded
+              character sets - Code extension techniques, Third edition
+              - 1986-05-01, ISO 2022, 1986.
+
+   [RFC822]   Crocker, D., "Standard for the Format of ARPA Internet
+              Text Messages", RFC 822, August 1982.
+
+   [RFC2045]  Freed, N. and  N. Borenstein, "Multipurpose Internet Mail
+              Extensions (MIME) Part One: Format of Internet Message
+              Bodies", RFC 2045, November 1996.
+
+   [RFC2046]  Freed, N. and N. Borenstein, "Multipurpose Internet Mail
+              Extensions (MIME) Part Two: Media Types", RFC 2046,
+              November 1996.
+
+
+
+Resnick                     Standards Track                    [Page 37]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+   [RFC2047]  Moore, K., "Multipurpose Internet Mail Extensions (MIME)
+              Part Three: Message Header Extensions for Non-ASCII Text",
+              RFC 2047, November 1996.
+
+   [RFC2048]  Freed, N., Klensin, J. and J. Postel, "Multipurpose
+              Internet Mail Extensions (MIME) Part Four: Format of
+              Internet Message Bodies", RFC 2048, November 1996.
+
+   [RFC2049]  Freed, N. and N. Borenstein, "Multipurpose Internet Mail
+              Extensions (MIME) Part Five: Conformance Criteria and
+              Examples", RFC 2049, November 1996.
+
+   [RFC2119]  Bradner, S., "Key words for use in RFCs to Indicate
+              Requirement Levels", BCP 14, RFC 2119, March 1997.
+
+   [RFC2234]  Crocker, D., Editor, and P. Overell, "Augmented BNF for
+              Syntax Specifications: ABNF", RFC 2234, November 1997.
+
+   [RFC2821]  Klensin, J., Editor, "Simple Mail Transfer Protocol", RFC
+              2821, March 2001.
+
+   [STD3]     Braden, R., "Host Requirements", STD 3, RFC 1122 and RFC
+              1123, October 1989.
+
+   [STD12]    Mills, D., "Network Time Protocol", STD 12, RFC 1119,
+              September 1989.
+
+   [STD13]    Mockapetris, P., "Domain Name System", STD 13, RFC 1034
+              and RFC 1035,  November 1987.
+
+   [STD14]    Partridge, C., "Mail Routing and the Domain System", STD
+              14, RFC 974, January 1986.
+
+7. Editor's Address
+
+   Peter W. Resnick
+   QUALCOMM Incorporated
+   5775 Morehouse Drive
+   San Diego, CA 92121-1714
+   USA
+
+   Phone: +1 858 651 4478
+   Fax:   +1 858 651 1102
+   EMail: presnick@qualcomm.com
+
+
+
+
+
+
+
+Resnick                     Standards Track                    [Page 38]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+8. Acknowledgements
+
+   Many people contributed to this document.  They included folks who
+   participated in the Detailed Revision and Update of Messaging
+   Standards (DRUMS) Working Group of the Internet Engineering Task
+   Force (IETF), the chair of DRUMS, the Area Directors of the IETF, and
+   people who simply sent their comments in via e-mail.  The editor is
+   deeply indebted to them all and thanks them sincerely.  The below
+   list includes everyone who sent e-mail concerning this document.
+   Hopefully, everyone who contributed is named here:
+
+   Matti Aarnio              Barry Finkel           Larry Masinter
+   Tanaka Akira              Erik Forsberg          Denis McKeon
+   Russ Allbery              Chuck Foster           William P McQuillan
+   Eric Allman               Paul Fox               Alexey Melnikov
+   Harald Tveit Alvestrand   Klaus M. Frank         Perry E. Metzger
+   Ran Atkinson              Ned Freed              Steven Miller
+   Jos Backus                Jochen Friedrich       Keith Moore
+   Bruce Balden              Randall C. Gellens     John Gardiner Myers
+   Dave Barr                 Sukvinder Singh Gill   Chris Newman
+   Alan Barrett              Tim Goodwin            John W. Noerenberg
+   John Beck                 Philip Guenther        Eric Norman
+   J. Robert von Behren      Tony Hansen            Mike O'Dell
+   Jos den Bekker            John Hawkinson         Larry Osterman
+   D. J. Bernstein           Philip Hazel           Paul Overell
+   James Berriman            Kai Henningsen         Jacob Palme
+   Norbert Bollow            Robert Herriot         Michael A. Patton
+   Raj Bose                  Paul Hethmon           Uzi Paz
+   Antony Bowesman           Jim Hill               Michael A. Quinlan
+   Scott Bradner             Paul E. Hoffman        Eric S. Raymond
+   Randy Bush                Steve Hole             Sam Roberts
+   Tom Byrer                 Kari Hurtta            Hugh Sasse
+   Bruce Campbell            Marco S. Hyman         Bart Schaefer
+   Larry Campbell            Ofer Inbar             Tom Scola
+   W. J. Carpenter           Olle Jarnefors         Wolfgang Segmuller
+   Michael Chapman           Kevin Johnson          Nick Shelness
+   Richard Clayton           Sudish Joseph          John Stanley
+   Maurizio Codogno          Maynard Kang           Einar Stefferud
+   Jim Conklin               Prabhat Keni           Jeff Stephenson
+   R. Kelley Cook            John C. Klensin        Bernard Stern
+   Steve Coya                Graham Klyne           Peter Sylvester
+   Mark Crispin              Brad Knowles           Mark Symons
+   Dave Crocker              Shuhei Kobayashi       Eric Thomas
+   Matt Curtin               Peter Koch             Lee Thompson
+   Michael D'Errico          Dan Kohn               Karel De Vriendt
+   Cyrus Daboo               Christian Kuhtz        Matthew Wall
+   Jutta Degener             Anand Kumria           Rolf Weber
+   Mark Delany               Steen Larsen           Brent B. Welch
+
+
+
+Resnick                     Standards Track                    [Page 39]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+   Steve Dorner              Eliot Lear             Dan Wing
+   Harold A. Driscoll        Barry Leiba            Jack De Winter
+   Michael Elkins            Jay Levitt             Gregory J. Woodhouse
+   Robert Elz                Lars-Johan Liman       Greg A. Woods
+   Johnny Eriksson           Charles Lindsey        Kazu Yamamoto
+   Erik E. Fair              Pete Loshin            Alain Zahm
+   Roger Fajman              Simon Lyall            Jamie Zawinski
+   Patrik Faltstrom          Bill Manning           Timothy S. Zurcher
+   Claus Andre Farber        John Martin
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Resnick                     Standards Track                    [Page 40]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+Appendix A. Example messages
+
+   This section presents a selection of messages.  These are intended to
+   assist in the implementation of this standard, but should not be
+   taken as normative; that is to say, although the examples in this
+   section were carefully reviewed, if there happens to be a conflict
+   between these examples and the syntax described in sections 3 and 4
+   of this document, the syntax in those sections is to be taken as
+   correct.
+
+   Messages are delimited in this section between lines of "----".  The
+   "----" lines are not part of the message itself.
+
+A.1. Addressing examples
+
+   The following are examples of messages that might be sent between two
+   individuals.
+
+A.1.1. A message from one person to another with simple addressing
+
+   This could be called a canonical message.  It has a single author,
+   John Doe, a single recipient, Mary Smith, a subject, the date, a
+   message identifier, and a textual message in the body.
+
+----
+From: John Doe <jdoe@machine.example>
+To: Mary Smith <mary@example.net>
+Subject: Saying Hello
+Date: Fri, 21 Nov 1997 09:55:06 -0600
+Message-ID: <1234@local.machine.example>
+
+This is a message just to say hello.
+So, "Hello".
+----
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Resnick                     Standards Track                    [Page 41]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+   If John's secretary Michael actually sent the message, though John
+   was the author and replies to this message should go back to him, the
+   sender field would be used:
+
+----
+From: John Doe <jdoe@machine.example>
+Sender: Michael Jones <mjones@machine.example>
+To: Mary Smith <mary@example.net>
+Subject: Saying Hello
+Date: Fri, 21 Nov 1997 09:55:06 -0600
+Message-ID: <1234@local.machine.example>
+
+This is a message just to say hello.
+So, "Hello".
+----
+
+A.1.2. Different types of mailboxes
+
+   This message includes multiple addresses in the destination fields
+   and also uses several different forms of addresses.
+
+----
+From: "Joe Q. Public" <john.q.public@example.com>
+To: Mary Smith <mary@x.test>, jdoe@example.org, Who? <one@y.test>
+Cc: <boss@nil.test>, "Giant; \"Big\" Box" <sysservices@example.net>
+Date: Tue, 1 Jul 2003 10:52:37 +0200
+Message-ID: <5678.21-Nov-1997@example.com>
+
+Hi everyone.
+----
+
+   Note that the display names for Joe Q. Public and Giant; "Big" Box
+   needed to be enclosed in double-quotes because the former contains
+   the period and the latter contains both semicolon and double-quote
+   characters (the double-quote characters appearing as quoted-pair
+   construct).  Conversely, the display name for Who? could appear
+   without them because the question mark is legal in an atom.  Notice
+   also that jdoe@example.org and boss@nil.test have no display names
+   associated with them at all, and jdoe@example.org uses the simpler
+   address form without the angle brackets.
+
+
+
+
+
+
+
+
+
+
+
+Resnick                     Standards Track                    [Page 42]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+A.1.3. Group addresses
+
+----
+From: Pete <pete@silly.example>
+To: A Group:Chris Jones <c@a.test>,joe@where.test,John <jdoe@one.test>;
+Cc: Undisclosed recipients:;
+Date: Thu, 13 Feb 1969 23:32:54 -0330
+Message-ID: <testabcd.1234@silly.example>
+
+Testing.
+----
+
+   In this message, the "To:" field has a single group recipient named A
+   Group which contains 3 addresses, and a "Cc:" field with an empty
+   group recipient named Undisclosed recipients.
+
+A.2. Reply messages
+
+   The following is a series of three messages that make up a
+   conversation thread between John and Mary.  John firsts sends a
+   message to Mary, Mary then replies to John's message, and then John
+   replies to Mary's reply message.
+
+   Note especially the "Message-ID:", "References:", and "In-Reply-To:"
+   fields in each message.
+
+----
+From: John Doe <jdoe@machine.example>
+To: Mary Smith <mary@example.net>
+Subject: Saying Hello
+Date: Fri, 21 Nov 1997 09:55:06 -0600
+Message-ID: <1234@local.machine.example>
+
+This is a message just to say hello.
+So, "Hello".
+----
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Resnick                     Standards Track                    [Page 43]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+   When sending replies, the Subject field is often retained, though
+   prepended with "Re: " as described in section 3.6.5.
+
+----
+From: Mary Smith <mary@example.net>
+To: John Doe <jdoe@machine.example>
+Reply-To: "Mary Smith: Personal Account" <smith@home.example>
+Subject: Re: Saying Hello
+Date: Fri, 21 Nov 1997 10:01:10 -0600
+Message-ID: <3456@example.net>
+In-Reply-To: <1234@local.machine.example>
+References: <1234@local.machine.example>
+
+This is a reply to your hello.
+----
+
+   Note the "Reply-To:" field in the above message.  When John replies
+   to Mary's message above, the reply should go to the address in the
+   "Reply-To:" field instead of the address in the "From:" field.
+
+----
+To: "Mary Smith: Personal Account" <smith@home.example>
+From: John Doe <jdoe@machine.example>
+Subject: Re: Saying Hello
+Date: Fri, 21 Nov 1997 11:00:00 -0600
+Message-ID: <abcd.1234@local.machine.tld>
+In-Reply-To: <3456@example.net>
+References: <1234@local.machine.example> <3456@example.net>
+
+This is a reply to your reply.
+----
+
+A.3. Resent messages
+
+   Start with the message that has been used as an example several
+   times:
+
+----
+From: John Doe <jdoe@machine.example>
+To: Mary Smith <mary@example.net>
+Subject: Saying Hello
+Date: Fri, 21 Nov 1997 09:55:06 -0600
+Message-ID: <1234@local.machine.example>
+
+This is a message just to say hello.
+So, "Hello".
+----
+
+
+
+
+Resnick                     Standards Track                    [Page 44]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+   Say that Mary, upon receiving this message, wishes to send a copy of
+   the message to Jane such that (a) the message would appear to have
+   come straight from John; (b) if Jane replies to the message, the
+   reply should go back to John; and (c) all of the original
+   information, like the date the message was originally sent to Mary,
+   the message identifier, and the original addressee, is preserved.  In
+   this case, resent fields are prepended to the message:
+
+----
+Resent-From: Mary Smith <mary@example.net>
+Resent-To: Jane Brown <j-brown@other.example>
+Resent-Date: Mon, 24 Nov 1997 14:22:01 -0800
+Resent-Message-ID: <78910@example.net>
+From: John Doe <jdoe@machine.example>
+To: Mary Smith <mary@example.net>
+Subject: Saying Hello
+Date: Fri, 21 Nov 1997 09:55:06 -0600
+Message-ID: <1234@local.machine.example>
+
+This is a message just to say hello.
+So, "Hello".
+----
+
+   If Jane, in turn, wished to resend this message to another person,
+   she would prepend her own set of resent header fields to the above
+   and send that.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Resnick                     Standards Track                    [Page 45]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+A.4. Messages with trace fields
+
+   As messages are sent through the transport system as described in
+   [RFC2821], trace fields are prepended to the message.  The following
+   is an example of what those trace fields might look like.  Note that
+   there is some folding white space in the first one since these lines
+   can be long.
+
+----
+Received: from x.y.test
+   by example.net
+   via TCP
+   with ESMTP
+   id ABC12345
+   for <mary@example.net>;  21 Nov 1997 10:05:43 -0600
+Received: from machine.example by x.y.test; 21 Nov 1997 10:01:22 -0600
+From: John Doe <jdoe@machine.example>
+To: Mary Smith <mary@example.net>
+Subject: Saying Hello
+Date: Fri, 21 Nov 1997 09:55:06 -0600
+Message-ID: <1234@local.machine.example>
+
+This is a message just to say hello.
+So, "Hello".
+----
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Resnick                     Standards Track                    [Page 46]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+A.5. White space, comments, and other oddities
+
+   White space, including folding white space, and comments can be
+   inserted between many of the tokens of fields.  Taking the example
+   from A.1.3, white space and comments can be inserted into all of the
+   fields.
+
+----
+From: Pete(A wonderful \) chap) <pete(his account)@silly.test(his host)>
+To:A Group(Some people)
+     :Chris Jones <c@(Chris's host.)public.example>,
+         joe@example.org,
+  John <jdoe@one.test> (my dear friend); (the end of the group)
+Cc:(Empty list)(start)Undisclosed recipients  :(nobody(that I know))  ;
+Date: Thu,
+      13
+        Feb
+          1969
+      23:32
+               -0330 (Newfoundland Time)
+Message-ID:              <testabcd.1234@silly.test>
+
+Testing.
+----
+
+   The above example is aesthetically displeasing, but perfectly legal.
+   Note particularly (1) the comments in the "From:" field (including
+   one that has a ")" character appearing as part of a quoted-pair); (2)
+   the white space absent after the ":" in the "To:" field as well as
+   the comment and folding white space after the group name, the special
+   character (".") in the comment in Chris Jones's address, and the
+   folding white space before and after "joe@example.org,"; (3) the
+   multiple and nested comments in the "Cc:" field as well as the
+   comment immediately following the ":" after "Cc"; (4) the folding
+   white space (but no comments except at the end) and the missing
+   seconds in the time of the date field; and (5) the white space before
+   (but not within) the identifier in the "Message-ID:" field.
+
+A.6. Obsoleted forms
+
+   The following are examples of obsolete (that is, the "MUST NOT
+   generate") syntactic elements described in section 4 of this
+   document.
+
+
+
+
+
+
+
+
+Resnick                     Standards Track                    [Page 47]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+A.6.1. Obsolete addressing
+
+   Note in the below example the lack of quotes around Joe Q. Public,
+   the route that appears in the address for Mary Smith, the two commas
+   that appear in the "To:" field, and the spaces that appear around the
+   "." in the jdoe address.
+
+----
+From: Joe Q. Public <john.q.public@example.com>
+To: Mary Smith <@machine.tld:mary@example.net>, , jdoe@test   . example
+Date: Tue, 1 Jul 2003 10:52:37 +0200
+Message-ID: <5678.21-Nov-1997@example.com>
+
+Hi everyone.
+----
+
+A.6.2. Obsolete dates
+
+   The following message uses an obsolete date format, including a non-
+   numeric time zone and a two digit year.  Note that although the
+   day-of-week is missing, that is not specific to the obsolete syntax;
+   it is optional in the current syntax as well.
+
+----
+From: John Doe <jdoe@machine.example>
+To: Mary Smith <mary@example.net>
+Subject: Saying Hello
+Date: 21 Nov 97 09:55:06 GMT
+Message-ID: <1234@local.machine.example>
+
+This is a message just to say hello.
+So, "Hello".
+----
+
+A.6.3. Obsolete white space and comments
+
+   White space and comments can appear between many more elements than
+   in the current syntax.  Also, folding lines that are made up entirely
+   of white space are legal.
+
+
+
+
+
+
+
+
+
+
+
+
+Resnick                     Standards Track                    [Page 48]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+----
+From  : John Doe <jdoe@machine(comment).  example>
+To    : Mary Smith
+__
+          <mary@example.net>
+Subject     : Saying Hello
+Date  : Fri, 21 Nov 1997 09(comment):   55  :  06 -0600
+Message-ID  : <1234   @   local(blah)  .machine .example>
+
+This is a message just to say hello.
+So, "Hello".
+----
+
+   Note especially the second line of the "To:" field.  It starts with
+   two space characters.  (Note that "__" represent blank spaces.)
+   Therefore, it is considered part of the folding as described in
+   section 4.2.  Also, the comments and white space throughout
+   addresses, dates, and message identifiers are all part of the
+   obsolete syntax.
+
+Appendix B. Differences from earlier standards
+
+   This appendix contains a list of changes that have been made in the
+   Internet Message Format from earlier standards, specifically [RFC822]
+   and [STD3].  Items marked with an asterisk (*) below are items which
+   appear in section 4 of this document and therefore can no longer be
+   generated.
+
+   1. Period allowed in obsolete form of phrase.
+   2. ABNF moved out of document to [RFC2234].
+   3. Four or more digits allowed for year.
+   4. Header field ordering (and lack thereof) made explicit.
+   5. Encrypted header field removed.
+   6. Received syntax loosened to allow any token/value pair.
+   7. Specifically allow and give meaning to "-0000" time zone.
+   8. Folding white space is not allowed between every token.
+   9. Requirement for destinations removed.
+   10. Forwarding and resending redefined.
+   11. Extension header fields no longer specifically called out.
+   12. ASCII 0 (null) removed.*
+   13. Folding continuation lines cannot contain only white space.*
+   14. Free insertion of comments not allowed in date.*
+   15. Non-numeric time zones not allowed.*
+   16. Two digit years not allowed.*
+   17. Three digit years interpreted, but not allowed for generation.
+   18. Routes in addresses not allowed.*
+   19. CFWS within local-parts and domains not allowed.*
+   20. Empty members of address lists not allowed.*
+
+
+
+Resnick                     Standards Track                    [Page 49]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+   21. Folding white space between field name and colon not allowed.*
+   22. Comments between field name and colon not allowed.
+   23. Tightened syntax of in-reply-to and references.*
+   24. CFWS within msg-id not allowed.*
+   25. Tightened semantics of resent fields as informational only.
+   26. Resent-Reply-To not allowed.*
+   27. No multiple occurrences of fields (except resent and received).*
+   28. Free CR and LF not allowed.*
+   29. Routes in return path not allowed.*
+   30. Line length limits specified.
+   31. Bcc more clearly specified.
+
+Appendix C. Notices
+
+   Intellectual Property
+
+   The IETF takes no position regarding the validity or scope of any
+   intellectual property or other rights that might be claimed to
+   pertain to the implementation or use of the technology described in
+   this document or the extent to which any license under such rights
+   might or might not be available; neither does it represent that it
+   has made any effort to identify any such rights.  Information on the
+   IETF's procedures with respect to rights in standards-track and
+   standards-related documentation can be found in BCP-11.  Copies of
+   claims of rights made available for publication and any assurances of
+   licenses to be made available, or the result of an attempt made to
+   obtain a general license or permission for the use of such
+   proprietary rights by implementors or users of this specification can
+   be obtained from the IETF Secretariat.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Resnick                     Standards Track                    [Page 50]
+
+RFC 2822                Internet Message Format               April 2001
+
+
+Full Copyright Statement
+
+   Copyright (C) The Internet Society (2001).  All Rights Reserved.
+
+   This document and translations of it may be copied and furnished to
+   others, and derivative works that comment on or otherwise explain it
+   or assist in its implementation may be prepared, copied, published
+   and distributed, in whole or in part, without restriction of any
+   kind, provided that the above copyright notice and this paragraph are
+   included on all such copies and derivative works.  However, this
+   document itself may not be modified in any way, such as by removing
+   the copyright notice or references to the Internet Society or other
+   Internet organizations, except as needed for the purpose of
+   developing Internet standards in which case the procedures for
+   copyrights defined in the Internet Standards process must be
+   followed, or as required to translate it into languages other than
+   English.
+
+   The limited permissions granted above are perpetual and will not be
+   revoked by the Internet Society or its successors or assigns.
+
+   This document and the information contained herein is provided on an
+   "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
+   TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+   BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
+   HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
+   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+Acknowledgement
+
+   Funding for the RFC Editor function is currently provided by the
+   Internet Society.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Resnick                     Standards Track                    [Page 51]
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc3156.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc3156.txt
new file mode 100644
index 000000000..c8ca1d5f0
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc3156.txt
@@ -0,0 +1,842 @@
+
+
+
+
+
+Network Working Group                                          M. Elkins
+Request for Comments: 3156                      Network Associates, Inc.
+Updates: 2015                                               D. Del Torto
+Category: Standards Track                        CryptoRights Foundation
+                                                               R. Levien
+                                    University of California at Berkeley
+                                                             T. Roessler
+                                                             August 2001
+
+
+                       MIME Security with OpenPGP
+
+Status of this Memo
+
+   This document specifies an Internet standards track protocol for the
+   Internet community, and requests discussion and suggestions for
+   improvements.  Please refer to the current edition of the "Internet
+   Official Protocol Standards" (STD 1) for the standardization state
+   and status of this protocol.  Distribution of this memo is unlimited.
+
+Copyright Notice
+
+   Copyright (C) The Internet Society (2001).  All Rights Reserved.
+
+Abstract
+
+   This document describes how the OpenPGP Message Format can be used to
+   provide privacy and authentication using the Multipurpose Internet
+   Mail Extensions (MIME) security content types described in RFC 1847.
+
+1.  Introduction
+
+   Work on integrating PGP (Pretty Good Privacy) with MIME [3]
+   (including the since withdrawn "application/pgp" content type) prior
+   to RFC 2015 suffered from a number of problems, the most significant
+   of which is the inability to recover signed message bodies without
+   parsing data structures specific to PGP.  RFC 2015 makes use of the
+   elegant solution proposed in RFC 1847, which defines security
+   multipart formats for MIME.  The security multiparts clearly separate
+   the signed message body from the signature, and have a number of
+   other desirable properties.  This document revises RFC 2015 to adopt
+   the integration of PGP and MIME to the needs which emerged during the
+   work on the OpenPGP specification.
+
+   This document defines three content types for implementing security
+   and privacy with OpenPGP: "application/pgp-encrypted",
+   "application/pgp-signature" and "application/pgp-keys".
+
+
+
+
+Elkins, et al.              Standards Track                     [Page 1]
+
+RFC 3156               MIME Security with OpenPGP            August 2001
+
+
+   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
+   "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
+   document are to be interpreted as described in RFC 2119.
+
+2.  OpenPGP data formats
+
+   OpenPGP implementations can generate either ASCII armor (described in
+   [1]) or 8-bit binary output when encrypting data, generating a
+   digital signature, or extracting public key data.  The ASCII armor
+   output is the REQUIRED method for data transfer.  This allows those
+   users who do not have the means to interpret the formats described in
+   this document to be able to extract and use the OpenPGP information
+   in the message.
+
+   When the amount of data to be transmitted requires that it be sent in
+   many parts, the MIME message/partial mechanism SHOULD be used rather
+   than the multi-part ASCII armor OpenPGP format.
+
+3.  Content-Transfer-Encoding restrictions
+
+   Multipart/signed and multipart/encrypted are to be treated by agents
+   as opaque, meaning that the data is not to be altered in any way [2],
+   [7].  However, many existing mail gateways will detect if the next
+   hop does not support MIME or 8-bit data and perform conversion to
+   either Quoted-Printable or Base64.  This presents serious problems
+   for multipart/signed, in particular, where the signature is
+   invalidated when such an operation occurs.  For this reason all data
+   signed according to this protocol MUST be constrained to 7 bits (8-
+   bit data MUST be encoded using either Quoted-Printable or Base64).
+   Note that this also includes the case where a signed object is also
+   encrypted (see section 6).  This restriction will increase the
+   likelihood that the signature will be valid upon receipt.
+
+   Additionally, implementations MUST make sure that no trailing
+   whitespace is present after the MIME encoding has been applied.
+
+      Note: In most cases, trailing whitespace can either be removed, or
+      protected by applying an appropriate content-transfer-encoding.
+      However, special care must be taken when any header lines - either
+      in MIME entity headers, or in embedded RFC 822 headers - are
+      present which only consist of whitespace: Such lines must be
+      removed entirely, since replacing them by empty lines would turn
+      them into header delimiters, and change the semantics of the
+      message.  The restrictions on whitespace are necessary in order to
+      make the hash calculated invariant under the text and binary mode
+      signature mechanisms provided by OpenPGP [1].  Also, they help to
+      avoid compatibility problems with PGP implementations which
+      predate the OpenPGP specification.
+
+
+
+Elkins, et al.              Standards Track                     [Page 2]
+
+RFC 3156               MIME Security with OpenPGP            August 2001
+
+
+      Note: If any line begins with the string "From ", it is strongly
+      suggested that either the Quoted-Printable or Base64 MIME encoding
+      be applied.  If Quoted-Printable is used, at least one of the
+      characters in the string should be encoded using the hexadecimal
+      coding rule.  This is because many mail transfer and delivery
+      agents treat "From " (the word "from" followed immediately by a
+      space character) as the start of a new message and thus insert a
+      right angle-bracket (>) in front of any line beginning with
+      "From " to distinguish this case, invalidating the signature.
+
+   Data that is ONLY to be encrypted is allowed to contain 8-bit
+   characters and trailing whitespace and therefore need not undergo the
+   conversion to a 7bit format, and the stripping of whitespace.
+
+      Implementor's note: It cannot be stressed enough that applications
+      using this standard follow MIME's suggestion that you "be
+      conservative in what you generate, and liberal in what you
+      accept."  In this particular case it means it would be wise for an
+      implementation to accept messages with any content-transfer-
+      encoding, but restrict generation to the 7-bit format required by
+      this memo.  This will allow future compatibility in the event the
+      Internet SMTP framework becomes 8-bit friendly.
+
+4.  OpenPGP encrypted data
+
+   Before OpenPGP encryption, the data is written in MIME canonical
+   format (body and headers).
+
+   OpenPGP encrypted data is denoted by the "multipart/encrypted"
+   content type, described in [2], and MUST have a "protocol" parameter
+   value of "application/pgp-encrypted".  Note that the value of the
+   parameter MUST be enclosed in quotes.
+
+   The multipart/encrypted MIME body MUST consist of exactly two body
+   parts, the first with content type "application/pgp-encrypted".  This
+   body contains the control information.  A message complying with this
+   standard MUST contain a "Version: 1" field in this body.  Since the
+   OpenPGP packet format contains all other information necessary for
+   decrypting, no other information is required here.
+
+   The second MIME body part MUST contain the actual encrypted data.  It
+   MUST be labeled with a content type of "application/octet-stream".
+
+   Example message:
+
+      From: Michael Elkins <elkins@aero.org>
+      To: Michael Elkins <elkins@aero.org>
+      Mime-Version: 1.0
+
+
+
+Elkins, et al.              Standards Track                     [Page 3]
+
+RFC 3156               MIME Security with OpenPGP            August 2001
+
+
+      Content-Type: multipart/encrypted; boundary=foo;
+         protocol="application/pgp-encrypted"
+
+      --foo
+      Content-Type: application/pgp-encrypted
+
+      Version: 1
+
+      --foo
+      Content-Type: application/octet-stream
+
+      -----BEGIN PGP MESSAGE-----
+      Version: 2.6.2
+
+      hIwDY32hYGCE8MkBA/wOu7d45aUxF4Q0RKJprD3v5Z9K1YcRJ2fve87lMlDlx4Oj
+      eW4GDdBfLbJE7VUpp13N19GL8e/AqbyyjHH4aS0YoTk10QQ9nnRvjY8nZL3MPXSZ
+      g9VGQxFeGqzykzmykU6A26MSMexR4ApeeON6xzZWfo+0yOqAq6lb46wsvldZ96YA
+      AABH78hyX7YX4uT1tNCWEIIBoqqvCeIMpp7UQ2IzBrXg6GtukS8NxbukLeamqVW3
+      1yt21DYOjuLzcMNe/JNsD9vDVCvOOG3OCi8=
+      =zzaA
+      -----END PGP MESSAGE-----
+
+      --foo--
+
+5.  OpenPGP signed data
+
+   OpenPGP signed messages are denoted by the "multipart/signed" content
+   type, described in [2], with a "protocol" parameter which MUST have a
+   value of "application/pgp-signature" (MUST be quoted).
+
+   The "micalg" parameter for the "application/pgp-signature" protocol
+   MUST contain exactly one hash-symbol of the format "pgp-<hash-
+   identifier>", where <hash-identifier> identifies the Message
+   Integrity Check (MIC) algorithm used to generate the signature.
+   Hash-symbols are constructed from the text names registered in [1] or
+   according to the mechanism defined in that document by converting the
+   text name to lower case and prefixing it with the four characters
+   "pgp-".
+
+   Currently defined values are "pgp-md5", "pgp-sha1", "pgp-ripemd160",
+   "pgp-md2", "pgp-tiger192", and "pgp-haval-5-160".
+
+   The multipart/signed body MUST consist of exactly two parts.  The
+   first part contains the signed data in MIME canonical format,
+   including a set of appropriate content headers describing the data.
+
+   The second body MUST contain the OpenPGP digital signature.  It MUST
+   be labeled with a content type of "application/pgp-signature".
+
+
+
+Elkins, et al.              Standards Track                     [Page 4]
+
+RFC 3156               MIME Security with OpenPGP            August 2001
+
+
+      Note: Implementations can either generate "signatures of a
+      canonical text document" or "signatures of a binary document", as
+      defined in [1].  The restrictions on the signed material put forth
+      in section 3 and in this section will make sure that the various
+      MIC algorithm variants specified in [1] and [5] will all produce
+      the same result.
+
+   When the OpenPGP digital signature is generated:
+
+   (1)   The data to be signed MUST first be converted to its content-
+         type specific canonical form.  For text/plain, this means
+         conversion to an appropriate character set and conversion of
+         line endings to the canonical <CR><LF> sequence.
+
+   (2)   An appropriate Content-Transfer-Encoding is then applied; see
+         section 3.  In particular, line endings in the encoded data
+         MUST use the canonical <CR><LF> sequence where appropriate
+         (note that the canonical line ending may or may not be present
+         on the last line of encoded data and MUST NOT be included in
+         the signature if absent).
+
+   (3)   MIME content headers are then added to the body, each ending
+         with the canonical <CR><LF> sequence.
+
+   (4)   As described in section 3 of this document, any trailing
+         whitespace MUST then be removed from the signed material.
+
+   (5)   As described in [2], the digital signature MUST be calculated
+         over both the data to be signed and its set of content headers.
+
+   (6)   The signature MUST be generated detached from the signed data
+         so that the process does not alter the signed data in any way.
+
+      Note: The accepted OpenPGP convention is for signed data to end
+      with a <CR><LF> sequence.  Note that the <CR><LF> sequence
+      immediately preceding a MIME boundary delimiter line is considered
+      to be part of the delimiter in [3], 5.1.  Thus, it is not part of
+      the signed data preceding the delimiter line.  An implementation
+      which elects to adhere to the OpenPGP convention has to make sure
+      it inserts a <CR><LF> pair on the last line of the data to be
+      signed and transmitted (signed message and transmitted message
+      MUST be identical).
+
+   Example message:
+
+         From: Michael Elkins <elkins@aero.org>
+         To: Michael Elkins <elkins@aero.org>
+         Mime-Version: 1.0
+
+
+
+Elkins, et al.              Standards Track                     [Page 5]
+
+RFC 3156               MIME Security with OpenPGP            August 2001
+
+
+         Content-Type: multipart/signed; boundary=bar; micalg=pgp-md5;
+           protocol="application/pgp-signature"
+
+         --bar
+      & Content-Type: text/plain; charset=iso-8859-1
+      & Content-Transfer-Encoding: quoted-printable
+      &
+      & =A1Hola!
+      &
+      & Did you know that talking to yourself is a sign of senility?
+      &
+      & It's generally a good idea to encode lines that begin with
+      & From=20because some mail transport agents will insert a greater-
+      & than (>) sign, thus invalidating the signature.
+      &
+      & Also, in some cases it might be desirable to encode any   =20
+      & trailing whitespace that occurs on lines in order to ensure  =20
+      & that the message signature is not invalidated when passing =20
+      & a gateway that modifies such whitespace (like BITNET). =20
+      &
+      & me
+
+      --bar
+
+      Content-Type: application/pgp-signature
+
+      -----BEGIN PGP MESSAGE-----
+      Version: 2.6.2
+
+      iQCVAwUBMJrRF2N9oWBghPDJAQE9UQQAtl7LuRVndBjrk4EqYBIb3h5QXIX/LC//
+      jJV5bNvkZIGPIcEmI5iFd9boEgvpirHtIREEqLQRkYNoBActFBZmh9GC3C041WGq
+      uMbrbxc+nIs1TIKlA08rVi9ig/2Yh7LFrK5Ein57U/W72vgSxLhe/zhdfolT9Brn
+      HOxEa44b+EI=
+      =ndaj
+      -----END PGP MESSAGE-----
+
+      --bar--
+
+   The "&"s in the previous example indicate the portion of the data
+   over which the signature was calculated.
+
+   Upon receipt of a signed message, an application MUST:
+
+   (1)   Convert line endings to the canonical <CR><LF> sequence before
+         the signature can be verified.  This is necessary since the
+         local MTA may have converted to a local end of line convention.
+
+
+
+
+
+Elkins, et al.              Standards Track                     [Page 6]
+
+RFC 3156               MIME Security with OpenPGP            August 2001
+
+
+   (2)   Pass both the signed data and its associated content headers
+         along with the OpenPGP signature to the signature verification
+         service.
+
+6.  Encrypted and Signed Data
+
+   Sometimes it is desirable to both digitally sign and then encrypt a
+   message to be sent.  This protocol allows for two methods of
+   accomplishing this task.
+
+6.1.  RFC 1847 Encapsulation
+
+   In [2], it is stated that the data is first signed as a
+   multipart/signature body, and then encrypted to form the final
+   multipart/encrypted body.  This is most useful for standard MIME-
+   compliant message forwarding.
+
+   Example:
+
+         Content-Type: multipart/encrypted;
+            protocol="application/pgp-encrypted"; boundary=foo
+
+         --foo
+         Content-Type: application/pgp-encrypted
+
+         Version: 1
+
+         --foo
+         Content-Type: application/octet-stream
+
+         -----BEGIN PGP MESSAGE-----
+      & Content-Type: multipart/signed; micalg=pgp-md5
+      &     protocol="application/pgp-signature"; boundary=bar
+      &
+      & --bar
+      & Content-Type: text/plain; charset=us-ascii
+      &
+      & This message was first signed, and then encrypted.
+      &
+      & --bar
+      & Content-Type: application/pgp-signature
+      &
+      & -----BEGIN PGP MESSAGE-----
+      & Version: 2.6.2
+      &
+      & iQCVAwUBMJrRF2N9oWBghPDJAQE9UQQAtl7LuRVndBjrk4EqYBIb3h5QXIX/LC//
+      & jJV5bNvkZIGPIcEmI5iFd9boEgvpirHtIREEqLQRkYNoBActFBZmh9GC3C041WGq
+      & uMbrbxc+nIs1TIKlA08rVi9ig/2Yh7LFrK5Ein57U/W72vgSxLhe/zhdfolT9Brn
+
+
+
+Elkins, et al.              Standards Track                     [Page 7]
+
+RFC 3156               MIME Security with OpenPGP            August 2001
+
+
+      & HOxEa44b+EI=
+      & =ndaj
+      & -----END PGP MESSAGE-----
+      &
+      & --bar--
+        -----END PGP MESSAGE-----
+
+        --foo--
+
+   (The text preceded by '&' indicates that it is really encrypted, but
+   presented as text for clarity.)
+
+6.2.  Combined method
+
+   The OpenPGP packet format [1] describes a method for signing and
+   encrypting data in a single OpenPGP message.  This method is allowed
+   in order to reduce processing overhead and increase compatibility
+   with non-MIME implementations of OpenPGP.  The resulting data is
+   formatted as a "multipart/encrypted" object as described in Section
+   4.
+
+   Messages which are encrypted and signed in this combined fashion are
+   REQUIRED to follow the same canonicalization rules as
+   multipart/signed objects.
+
+   It is explicitly allowed for an agent to decrypt a combined message
+   and rewrite it as a multipart/signed object using the signature data
+   embedded in the encrypted version.
+
+7.  Distribution of OpenPGP public keys
+
+   Content-Type: application/pgp-keys
+   Required parameters: none
+   Optional parameters: none
+
+   A MIME body part of the content type "application/pgp-keys" contains
+   ASCII-armored transferable Public Key Packets as defined in [1],
+   section 10.1.
+
+8.  Security Considerations
+
+   Signatures of a canonical text document as defined in [1] ignore
+   trailing white space in signed material.  Implementations which
+   choose to use signatures of canonical text documents will not be able
+   to detect the addition of whitespace in transit.
+
+   See [3], [4] for more information on the security considerations
+   concerning the underlying protocols.
+
+
+
+Elkins, et al.              Standards Track                     [Page 8]
+
+RFC 3156               MIME Security with OpenPGP            August 2001
+
+
+9.  IANA Considerations
+
+   This document defines three media types: "application/pgp-encrypted",
+   "application/pgp-signature" and "application/pgp-keys".  The
+   following sections specify the IANA registrations for these types.
+
+9.1.  Registration of the application/pgp-encrypted media type
+
+   MIME media type name: application
+   MIME subtype name: pgp-encrypted
+   Required parameters: none
+   Optional parameters: none
+
+   Encoding considerations:
+
+      Currently this media type always consists of a single 7bit text
+      string.
+
+   Security considerations:
+
+      See Section 8 and RFC 2440 Section 13.
+
+   Interoperability considerations: none
+
+   Published specification:
+
+      This document.
+
+   Additional information:
+
+      Magic number(s): none
+      File extension(s): none
+      Macintosh File Type Code(s): none
+
+   Person & email address to contact for further information:
+
+      Michael Elkins
+      Email: me@cs.hmc.edu
+
+   Intended usage: common
+
+   Author/Change controller:
+
+      Michael Elkins
+      Email: me@cs.hmc.edu
+
+
+
+
+
+
+Elkins, et al.              Standards Track                     [Page 9]
+
+RFC 3156               MIME Security with OpenPGP            August 2001
+
+
+9.2.  Registration of the application/pgp-signature media type
+
+   MIME media type name: application
+   MIME subtype name: pgp-signature
+   Required parameters: none
+   Optional parameters: none
+
+   Encoding considerations:
+
+      The content of this media type always consists of 7bit text.
+
+   Security considerations:
+
+      See Section 8 and RFC 2440 Section 13.
+
+   Interoperability considerations: none
+
+   Published specification:
+
+      RFC 2440 and this document.
+
+   Additional information:
+
+      Magic number(s): none
+      File extension(s): asc, sig
+      Macintosh File Type Code(s): pgDS
+
+   Person & email address to contact for further information:
+
+      Michael Elkins
+      Email: me@cs.hmc.edu
+
+   Intended usage: common
+
+   Author/Change controller:
+
+      Michael Elkins
+      Email: me@cs.hmc.edu
+
+9.3.  Registration of the application/pgp-keys media type
+
+   MIME media type name: application
+   MIME subtype name: pgp-keys
+   Required parameters: none
+   Optional parameters: none
+
+
+
+
+
+
+Elkins, et al.              Standards Track                    [Page 10]
+
+RFC 3156               MIME Security with OpenPGP            August 2001
+
+
+   Encoding considerations:
+
+      The content of this media type always consists of 7bit text.
+
+   Security considerations:
+
+      See Section 8 and RFC 2440 Section 13.
+
+   Interoperability considerations: none
+
+   Published specification:
+
+      RFC 2440 and this document.
+
+   Additional information:
+
+      Magic number(s): none
+      File extension(s): asc
+      Macintosh File Type Code(s): none
+
+   Person & email address to contact for further information:
+
+      Michael Elkins
+      Email: me@cs.hmc.edu
+
+   Intended usage: common
+
+   Author/Change controller:
+
+      Michael Elkins
+      Email: me@cs.hmc.edu
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Elkins, et al.              Standards Track                    [Page 11]
+
+RFC 3156               MIME Security with OpenPGP            August 2001
+
+
+10.  Notes
+
+   "PGP" and "Pretty Good Privacy" are registered trademarks of Network
+   Associates, Inc.
+
+11.  Acknowledgements
+
+   This document relies on the work of the IETF's OpenPGP Working
+   Group's definitions of the OpenPGP Message Format.  The OpenPGP
+   message format is currently described in RFC 2440 [1].
+
+   Special thanks are due: to Philip Zimmermann for his original and
+   ongoing work on PGP; to Charles Breed, Jon Callas and Dave Del Torto
+   for originally proposing the formation of the OpenPGP Working Group;
+   and to Steve Schoenfeld for helpful feedback during the draft
+   process.  The authors would also like to thank the engineers at
+   Pretty Good Privacy, Inc (now Network Associates, Inc), including
+   Colin Plumb, Hal Finney, Jon Callas, Mark Elrod, Mark Weaver and
+   Lloyd Chambers, for their technical commentary.
+
+   Additional thanks are due to Jeff Schiller and Derek Atkins for their
+   continuing support of strong cryptography and PGP freeware at MIT; to
+   Rodney Thayer of Sable Technology; to John Noerenberg, Steve Dorner
+   and Laurence Lundblade of the Eudora team at QUALCOMM, Inc; to Bodo
+   Moeller for proposing the approach followed with respect to trailing
+   whitespace; to John Gilmore, Hugh Daniel and Fred Ringel (at
+   Rivertown) and Ian Bell (at Turnpike) for their timely critical
+   commentary; and to the international members of the IETF's OpenPGP
+   mailing list, including William Geiger, Lutz Donnerhacke and Kazu
+   Yamamoto.  The idea to use multipart/mixed with multipart/signed has
+   been attributed to James Galvin.  Finally, our gratitude is due to
+   the many members of the "Cypherpunks," "Coderpunks" and "pgp-users"
+   <http://cryptorights.org/pgp-users> mailing lists and the many users
+   of PGP worldwide for helping keep the path to privacy open.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Elkins, et al.              Standards Track                    [Page 12]
+
+RFC 3156               MIME Security with OpenPGP            August 2001
+
+
+12.  Addresses of the Authors and OpenPGP Working Group Chair
+
+   The OpenPGP working group can be contacted via the current chair:
+
+   John W. Noerenberg II
+   Qualcomm, Inc.
+   5775 Morehouse Dr.
+   San Diego, CA 92121 USA
+
+   Phone: +1 619 658 3510
+   EMail: jwn2@qualcomm.com
+
+   The principal authors of this document are:
+
+   Dave Del Torto
+   CryptoRights Foundation
+   80 Alviso Street, Mailstop: CRF
+   San Francisco, CA 94127 USA
+
+   Phone: +1.415.334.5533, vm: #2
+   EMail: ddt@cryptorights.org, ddt@openpgp.net
+
+
+   Michael Elkins
+   Network Associates, Inc.
+   3415 S. Sepulveda Blvd Suite 700
+   Los Angeles, CA 90034 USA
+
+   Phone: +1.310.737.1663
+   Fax:   +1.310.737.1755
+   Email: me@cs.hmc.edu, Michael_Elkins@NAI.com
+
+
+   Raph Levien
+   University of California at Berkeley
+   579 Soda Hall
+   Berkeley, CA 94720 USA
+
+   Phone: +1.510.642.6509
+   EMail: raph@acm.org
+
+
+   Thomas Roessler
+   Nordstrasse 99
+   D-53111 Bonn, Germany
+
+   Phone: +49-228-638007
+   EMail: roessler@does-not-exist.org
+
+
+
+Elkins, et al.              Standards Track                    [Page 13]
+
+RFC 3156               MIME Security with OpenPGP            August 2001
+
+
+References
+
+   [1]   Callas, J., Donnerhacke, L., Finney, H. and R. Thayer, "OpenPGP
+         Message Format", RFC 2440, November 1998.
+
+   [2]   Galvin, J., Murphy, G., Crocker, S. and N. Freed, "Security
+         Multiparts for MIME: Multipart/Signed and Multipart/Encrypted",
+         RFC 1847, October 1995.
+
+   [3]   Freed, N. and N. Borenstein, "Multipurpose Internet Mail
+         Extensions (MIME) Part Two: Media Types", RFC 2046, November
+         1996.
+
+   [4]   Galvin, J., Murphy, G., Crocker, S. and N. Freed, "MIME Object
+         Security Services", RFC 1848, October 1995.
+
+   [5]   Atkins, D., Stallings, W. and P. Zimmermann, "PGP Message
+         Exchange Formats", RFC 1991, August 1996.
+
+   [6]   Elkins, M., "MIME Security with Pretty Good Privacy (PGP)", RFC
+         2015, October 1996.
+
+   [7]   Freed, N., "Gateways and MIME Security Multiparts", RFC 2480,
+         January 1999.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Elkins, et al.              Standards Track                    [Page 14]
+
+RFC 3156               MIME Security with OpenPGP            August 2001
+
+
+Full Copyright Statement
+
+   Copyright (C) The Internet Society (2001).  All Rights Reserved.
+
+   This document and translations of it may be copied and furnished to
+   others, and derivative works that comment on or otherwise explain it
+   or assist in its implementation may be prepared, copied, published
+   and distributed, in whole or in part, without restriction of any
+   kind, provided that the above copyright notice and this paragraph are
+   included on all such copies and derivative works.  However, this
+   document itself may not be modified in any way, such as by removing
+   the copyright notice or references to the Internet Society or other
+   Internet organizations, except as needed for the purpose of
+   developing Internet standards in which case the procedures for
+   copyrights defined in the Internet Standards process must be
+   followed, or as required to translate it into languages other than
+   English.
+
+   The limited permissions granted above are perpetual and will not be
+   revoked by the Internet Society or its successors or assigns.
+
+   This document and the information contained herein is provided on an
+   "AS IS" basis and THE INTERNET SOCIETY AND THE INTERNET ENGINEERING
+   TASK FORCE DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING
+   BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION
+   HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF
+   MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+Acknowledgement
+
+   Funding for the RFC Editor function is currently provided by the
+   Internet Society.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Elkins, et al.              Standards Track                    [Page 15]
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc3676.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc3676.txt
new file mode 100644
index 000000000..bc08fba72
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc3676.txt
@@ -0,0 +1,1123 @@
+
+
+
+
+
+
+Network Working Group                                         R. Gellens
+Request for Comments: 3676                                      Qualcomm
+Obsoletes: 2646                                            February 2004
+Category: Standards Track
+
+
+               The Text/Plain Format and DelSp Parameters
+
+Status of this Memo
+
+   This document specifies an Internet standards track protocol for the
+   Internet community, and requests discussion and suggestions for
+   improvements.  Please refer to the current edition of the "Internet
+   Official Protocol Standards" (STD 1) for the standardization state
+   and status of this protocol.  Distribution of this memo is unlimited.
+
+Copyright Notice
+
+   Copyright (C) The Internet Society (2004).  All Rights Reserved.
+
+Abstract
+
+   This specification establishes two parameters (Format and DelSP) to
+   be used with the Text/Plain media type.  In the presence of these
+   parameters, trailing whitespace is used to indicate flowed lines and
+   a canonical quote indicator is used to indicate quoted lines.  This
+   results in an encoding which appears as normal Text/Plain in older
+   implementations, since it is in fact normal Text/Plain, yet provides
+   for superior wrapping/flowing, and quoting.
+
+   This document supersedes the one specified in RFC 2646, "The
+   Text/Plain Format Parameter", and adds the DelSp parameter to
+   accommodate languages/coded character sets in which ASCII spaces are
+   not used or appear rarely.
+
+Table of Contents
+
+   1.  Introduction. . . . . . . . . . . . . . . . . . . . . . . . .   2
+   2.  Conventions Used in this Document . . . . . . . . . . . . . .   2
+   3.  The Problem . . . . . . . . . . . . . . . . . . . . . . . . .   3
+       3.1.  Paragraph Text. . . . . . . . . . . . . . . . . . . . .   3
+       3.2.  Embarrassing Line Wrap  . . . . . . . . . . . . . . . .   3
+       3.3.  New Media Types . . . . . . . . . . . . . . . . . . . .   4
+   4.  The Format and DelSp Parameters . . . . . . . . . . . . . . .   5
+       4.1.  Interpreting Format=Flowed. . . . . . . . . . . . . . .   6
+       4.2.  Generating Format=Flowed  . . . . . . . . . . . . . . .   7
+       4.3.  Usenet Signature Convention . . . . . . . . . . . . . .   9
+       4.4.  Space-Stuffing  . . . . . . . . . . . . . . . . . . . .   9
+
+
+
+Gellens                     Standards Track                     [Page 1]
+
+RFC 3676         Text/Plain Format and DelSp Parameters    February 2004
+
+
+       4.5.  Quoting . . . . . . . . . . . . . . . . . . . . . . . .   9
+       4.6.  Digital Signatures and Encryption . . . . . . . . . . .  11
+       4.7.  Examples. . . . . . . . . . . . . . . . . . . . . . . .  12
+   5.  Interoperability. . . . . . . . . . . . . . . . . . . . . . .  12
+   6.  ABNF. . . . . . . . . . . . . . . . . . . . . . . . . . . . .  13
+   7.  Failure Modes . . . . . . . . . . . . . . . . . . . . . . . .  14
+       7.1.  Trailing White Space Corruption . . . . . . . . . . . .  14
+   8.  Security Considerations . . . . . . . . . . . . . . . . . . .  15
+   9.  IANA Considerations . . . . . . . . . . . . . . . . . . . . .  15
+   10. Internationalization Considerations . . . . . . . . . . . . .  15
+   11. Acknowledgments . . . . . . . . . . . . . . . . . . . . . . .  15
+   12. Normative References. . . . . . . . . . . . . . . . . . . . .  16
+   13. Informative References. . . . . . . . . . . . . . . . . . . .  16
+   Appendix A: Changes from RFC 2646 . . . . . . . . . . . . . . . .  18
+   Author's Address. . . . . . . . . . . . . . . . . . . . . . . . .  19
+   Full Copyright Statement. . . . . . . . . . . . . . . . . . . . .  20
+
+1.  Introduction
+
+   Interoperability problems have been observed with erroneous labelling
+   of paragraph text as Text/Plain, and with various forms of
+   "embarrassing line wrap".  (See Section 3.)
+
+   Attempts to deploy new media types, such as Text/Enriched [Rich] and
+   Text/HTML [HTML] have suffered from a lack of backwards compatibility
+   and an often hostile user reaction at the receiving end.
+
+   What is required is a format which is in all significant ways
+   Text/Plain, and therefore is quite suitable for display as
+   Text/Plain, and yet allows the sender to express to the receiver
+   which lines are quoted and which lines are considered a logical
+   paragraph, and thus eligible to be flowed (wrapped and joined) as
+   appropriate.
+
+2.  Conventions Used in this Document
+
+   The key words "REQUIRED", "MUST", "MUST NOT", "SHOULD", "SHOULD NOT",
+   and "MAY" in this document are to be interpreted as described in "Key
+   words for use in RFCs to Indicate Requirement Levels" [KEYWORDS].
+
+   The term "paragraph" is used here to mean a series of lines which are
+   logically to be treated as a unit for display purposes and eligible
+   to be flowed (wrapped and joined) as appropriate to fit in the
+   display window and when creating text for replies, forwarding, etc.
+
+
+
+
+
+
+
+Gellens                     Standards Track                     [Page 2]
+
+RFC 3676         Text/Plain Format and DelSp Parameters    February 2004
+
+
+3.  The Problem
+
+   The Text/Plain media type is the lowest common denominator of
+   Internet email, with lines of no more than 998 characters (by
+   convention usually no more than 78), and where the carriage-return
+   and line-feed (CRLF) sequence represents a line break (see [MIME-IMT]
+   and [MSG-FMT]).
+
+   Text/Plain is usually displayed as preformatted text, often in a
+   fixed font.  That is, the characters start at the left margin of the
+   display window, and advance to the right until a CRLF sequence is
+   seen, at which point a new line is started, again at the left margin.
+   When a line length exceeds the display window, some clients will wrap
+   the line, while others invoke a horizontal scroll bar.
+
+   Text which meets this description is defined by this memo as "fixed".
+
+   Some interoperability problems have been observed with this format:
+
+3.1.  Paragraph Text
+
+   Many modern programs use a proportional-spaced font, and use CRLF to
+   represent paragraph breaks.  Line breaks are "soft", occurring as
+   needed on display.  That is, characters are grouped into a paragraph
+   until a CRLF sequence is seen, at which point a new paragraph is
+   started.  Each paragraph is displayed, starting at the left margin
+   (or paragraph indent), and continuing to the right until a word is
+   encountered which does not fit in the remaining display width.  This
+   word is displayed at the left margin of the next line.  This
+   continues until the paragraph ends (a CRLF is seen).  Extra vertical
+   space is left between paragraphs.
+
+   Text which meets this description is defined by this memo as
+   "flowed".
+
+   Numerous software products erroneously label this format as
+   Text/Plain, resulting in much user discomfort.
+
+3.2.  Embarrassing Line Wrap
+
+   As Text/Plain messages are quoted in replies or forwarded messages,
+   each line gradually increases in length, eventually being arbitrarily
+   hard wrapped, resulting in "embarrassing line wrap".  This produces
+   text which is, at best, hard to read, and often confuses
+   attributions.
+
+
+
+
+
+
+Gellens                     Standards Track                     [Page 3]
+
+RFC 3676         Text/Plain Format and DelSp Parameters    February 2004
+
+
+   Example:
+
+      >>>>>>This is a comment from the first message to show a
+      >quoting example.
+      >>>>>This is a comment from the second message to show a
+      >quoting example.
+      >>>>This is a comment from the third message.
+      >>>This is a comment from the fourth message.
+
+   It can be confusing to assign attribution to lines 2 and 4 above.
+
+   In addition, as devices with display widths smaller than 79 or 80
+   characters become more popular, embarrassing line wrap has become
+   even more prevalent, even with unquoted text.
+
+   Example:
+
+      This is paragraph text that is
+      meant to be flowed across
+      several lines.
+      However, the sending mailer is
+      converting it to fixed text at
+      a width of 72
+      characters, which causes it to
+      look like this when shown on a
+      PDA with only
+      30 character lines.
+
+3.3.  New Media Types
+
+   Attempts to deploy new media types, such as Text/Enriched [Rich] and
+   Text/HTML [HTML] have suffered from a lack of backwards compatibility
+   and an often hostile user reaction at the receiving end.
+
+   In particular, Text/Enriched requires that open angle brackets ("<")
+   and hard line breaks be doubled, with resulting user unhappiness when
+   viewed as Text/Plain.  Text/HTML requires even more alteration of
+   text, with a corresponding increase in user complaints.
+
+   A proposal to define a new media type to explicitly represent the
+   paragraph form suffered from a lack of interoperability with
+   currently deployed software.  Some programs treat unknown subtypes of
+   TEXT as an attachment.
+
+
+
+
+
+
+
+
+Gellens                     Standards Track                     [Page 4]
+
+RFC 3676         Text/Plain Format and DelSp Parameters    February 2004
+
+
+   What is desired is a format which is in all significant ways
+   Text/Plain, and therefore is quite suitable for display as
+   Text/Plain, and yet allows the sender to express to the receiver
+   which lines can be considered a logical paragraph, and thus flowed
+   (wrapped and joined) as appropriate.
+
+4.  The Format and DelSp Parameters
+
+   This specification defines two MIME parameters for use with
+   Text/Plain:
+
+      Name:  Format
+      Value:  Fixed, Flowed
+
+      Name:  DelSp
+      Value:  Yes, No
+
+   (Neither the parameter names nor values are case sensitive.)
+
+   If Format is not specified, or if the value is not recognized, a
+   value of Fixed is assumed.  The semantics of the Fixed value are the
+   usual associated with Text/Plain [MIME-IMT].
+
+   A Format value of Flowed indicates that the definition of flowed text
+   (as specified in this memo) was used on generation, and MAY be used
+   on reception.
+
+   Note that because Format is a parameter of the Text/Plain content-
+   type, any content-transfer-encoding used is irrelevant to the
+   processing of flowed text.
+
+   If DelSp is not specified, or if its value is not recognized, a value
+   of No is assumed.  The use of DelSp without a Format value of Flowed
+   is undefined.  When creating messages, DelSp SHOULD NOT be specified
+   in Text content types other than Text/Plain with Format = Flowed.
+   When receiving messages, DelSp SHOULD be ignored if used in a Text
+   content type other than Text/Plain with Format = Flowed.
+
+   This section discusses flowed text; section 6 provides a formal
+   definition.
+
+   Section 5 discusses interoperability.
+
+   Note that this memo describes an on-the-wire format.  It does not
+   address formats for local file storage.
+
+
+
+
+
+
+Gellens                     Standards Track                     [Page 5]
+
+RFC 3676         Text/Plain Format and DelSp Parameters    February 2004
+
+
+4.1.  Interpreting Format=Flowed
+
+   If the first character of a line is a quote mark (">"), the line is
+   considered to be quoted (see Section 4.5).  Logically, all quote
+   marks are counted and deleted, resulting in a line with a non-zero
+   quote depth, and content.  (The agent is of course free to display
+   the content with quote marks or excerpt bars or anything else.)
+   Logically, this test for quoted lines is done before any other tests
+   (that is, before checking for space-stuffed and flowed).
+
+   If the first character of a line is a space, the line has been
+   space-stuffed (see Section 4.4).  Logically, this leading space is
+   deleted before examining the line further (that is, before checking
+   for flowed).
+
+   If the line ends in a space, the line is flowed.  Otherwise it is
+   fixed.  The exception to this rule is a signature separator line,
+   described in Section 4.3.  Such lines end in a space but are neither
+   flowed nor fixed.
+
+   If the line is flowed and DelSp is "yes", the trailing space
+   immediately prior to the line's CRLF is logically deleted.  If the
+   DelSp parameter is "no" (or not specified, or set to an unrecognized
+   value), the trailing space is not deleted.
+
+   Any remaining trailing spaces are part of the line's content, but the
+   CRLF of a soft line break is not.
+
+   A series of one or more flowed lines followed by one fixed line is
+   considered a paragraph, and MAY be flowed (wrapped and unwrapped) as
+   appropriate on display and in the construction of new messages (see
+   Section 4.5).
+
+   An interpreting agent SHOULD allow for three exceptions to the rule
+   that paragraphs end with a fixed line.  These exceptions are
+   improperly constructed messages: a flowed line SHOULD be considered
+   to end the paragraph if it is followed by a line of a different quote
+   depth (see 4.5) or by a signature separator (see 4.3); the end of the
+   body also ends the paragraph.
+
+   A line consisting of one or more spaces (after deleting a space
+   acting as stuffing) is considered a flowed line.
+
+   An empty line (just a CRLF) is a fixed line.
+
+   Note that, for Unicode text, [Annex-14] provides guidance for
+   choosing at which characters to wrap a line.
+
+
+
+
+Gellens                     Standards Track                     [Page 6]
+
+RFC 3676         Text/Plain Format and DelSp Parameters    February 2004
+
+
+4.2.  Generating Format=Flowed
+
+   When generating Format=Flowed text, lines SHOULD be 78 characters or
+   shorter, including any trailing white space and also including any
+   space added as part of stuffing (see Section 4.4).  As suggested
+   values, any paragraph longer than 78 characters in total length could
+   be wrapped using lines of 72 or fewer characters.  While the specific
+   line length used is a matter of aesthetics and preference, longer
+   lines are more likely to require rewrapping and to encounter
+   difficulties with older mailers.  (It has been suggested that 66
+   character lines are the most readable.)
+
+   The restriction to 78 or fewer characters between CRLFs on the wire
+   is to conform to [MSG-FMT].
+
+   (In addition to conformance to [MSG-FMT], there is a historical need
+   that all lines, even when displayed by a non-flowed-aware program,
+   will fit in a standard 79- or 80-column screen without having to be
+   wrapped.  The limit is 78, not 79 or 80, because while 79 or 80 fit
+   on a line, the last column is often reserved for a line-wrap
+   indicator.)
+
+   When creating flowed text, the generating agent wraps, that is,
+   inserts 'soft' line breaks as needed.  Soft line breaks are added at
+   natural wrapping points, such as between words.  A soft line break is
+   a SP CRLF sequence.
+
+   There are two techniques for inserting soft line breaks.  The older
+   technique, established by RFC 2646, creates a soft line break by
+   inserting a CRLF after the occurrence of a space.  With this
+   technique, soft line breaks are only possible where spaces already
+   occur.  When this technique is used, the DelSp parameter SHOULD be
+   used; if used it MUST be set to "no".
+
+   The newer technique, suitable for use even with languages/coded
+   character sets in which the ASCII space character is rare or not
+   used, creates a soft line break by inserting a SP CRLF sequence.
+   When this technique is used, the DelSp parameter MUST be used and
+   MUST be set to "yes".  Note that because of space-stuffing (see
+   Section 4.4), when this technique is used and a soft line break is
+   inserted at a point where a SP already exists (such as between
+   words), if the SP CRLF sequence is added immediately before the SP,
+   the pre-existing SP becomes leading and thus requires stuffing.  It
+   is RECOMMENDED that agents avoid this by inserting the SP CRLF
+   sequence following the existing SP.
+
+   Generating agents MAY use either method within each Text/Plain body
+   part.
+
+
+
+Gellens                     Standards Track                     [Page 7]
+
+RFC 3676         Text/Plain Format and DelSp Parameters    February 2004
+
+
+   Regardless of which technique is used, a generating agent SHOULD NOT
+   insert a space in an unnatural location, such as into a word (a
+   sequence of printable characters, not containing spaces, in a
+   language/coded character set in which spaces are common).  If faced
+   with such a word which exceeds 78 characters (but less than 998
+   characters, the [SMTP] limit on line length), the agent SHOULD send
+   the word as is and exceed the 78-character limit on line length.
+
+   A generating agent SHOULD:
+
+   o  Ensure all lines (fixed and flowed) are 78 characters or fewer in
+      length, counting any trailing space as well as a space added as
+      stuffing, but not counting the CRLF, unless a word by itself
+      exceeds 78 characters.
+
+   o  Trim spaces before user-inserted hard line breaks.
+
+   A generating agent MUST:
+
+   o  Space-stuff lines which start with a space, "From ", or ">".
+
+   In order to create messages which do not require space-stuffing, and
+   are thus more aesthetically pleasing when viewed as Format=Fixed, a
+   generating agent MAY avoid wrapping immediately before ">", "From ",
+   or space.
+
+   (See Sections 4.4 and 4.5 for more information on space-stuffing and
+   quoting, respectively.)
+
+   A Format=Flowed message consists of zero or more paragraphs, each
+   containing one or more flowed lines followed by one fixed line.  The
+   usual case is a series of flowed text lines with blank (empty) fixed
+   lines between them.
+
+   Any number of fixed lines can appear between paragraphs.
+
+   When placing soft line breaks in a paragraph, generating agents MUST
+   NOT place them in a way that causes any line of the paragraph to be a
+   signature separator line, because paragraphs cannot contain signature
+   separator lines (see Sections 4.3 and 6).
+
+   [Quoted-Printable] encoding SHOULD NOT be used with Format=Flowed
+   unless absolutely necessary (for example, non-US-ASCII (8-bit)
+   characters over a strictly 7-bit transport such as unextended
+   [SMTP]).  In particular, a message SHOULD NOT be encoded in Quoted-
+   Printable for the sole purpose of protecting the trailing space on
+   flowed lines unless the body part is cryptographically signed or
+   encrypted (see Section 4.6).
+
+
+
+Gellens                     Standards Track                     [Page 8]
+
+RFC 3676         Text/Plain Format and DelSp Parameters    February 2004
+
+
+   The intent of Format=Flowed is to allow user agents to generate
+   flowed text which is non-obnoxious when viewed as pure, raw
+   Text/Plain (without any decoding); use of Quoted-Printable hinders
+   this and may cause Format=Flowed to be rejected by end users.
+
+4.3.  Usenet Signature Convention
+
+   There is a long-standing convention in Usenet news which also
+   commonly appears in Internet mail of using "-- " as the separator
+   line between the body and the signature of a message.  When
+   generating a Format=Flowed message containing a Usenet-style
+   separator before the signature, the separator line is sent as-is.
+   This is a special case; an (optionally quoted or quoted and stuffed)
+   line consisting of DASH DASH SP is neither fixed nor flowed.
+
+   Generating agents MUST NOT end a paragraph with such a signature
+   line.
+
+   A receiving agent needs to test for a signature line both before the
+   test for a quoted line (see Section 4.5) and also after logically
+   counting and deleting quote marks and stuffing (see Section 4.4) from
+   a quoted line.
+
+4.4.  Space-Stuffing
+
+   In order to allow for unquoted lines which start with ">", and to
+   protect against systems which "From-munge" in-transit messages
+   (modifying any line which starts with "From " to ">From "),
+   Format=Flowed provides for space-stuffing.
+
+   Space-stuffing adds a single space to the start of any line which
+   needs protection when the message is generated.  On reception, if the
+   first character of a line is a space, it is logically deleted.  This
+   occurs after the test for a quoted line (which logically counts and
+   deletes any quote marks), and before the test for a flowed line.
+
+   On generation, any unquoted lines which start with ">", and any lines
+   which start with a space or "From " MUST be space-stuffed.  Other
+   lines MAY be space-stuffed as desired.
+
+   (Note that space-stuffing is conceptually similar to dot-stuffing as
+   specified in [SMTP].)
+
+4.5.  Quoting
+
+   In Format=Flowed, the canonical quote indicator (or quote mark) is
+   one or more close angle bracket (">") characters.  Lines which start
+   with the quote indicator are considered quoted.  The number of ">"
+
+
+
+Gellens                     Standards Track                     [Page 9]
+
+RFC 3676         Text/Plain Format and DelSp Parameters    February 2004
+
+
+   characters at the start of the line specifies the quote depth.
+   Flowed lines which are also quoted may require special handling on
+   display and when copied to new messages.
+
+   When creating quoted flowed lines, each such line starts with the
+   quote indicator.
+
+   Note that because of space-stuffing, the lines
+       >> Exit, Stage Left
+   and
+       >>Exit, Stage Left
+   are semantically identical; both have a quote-depth of two, and a
+   content of "Exit, Stage Left".
+
+   However, the line
+       > > Exit, Stage Left
+   is different.  It has a quote-depth of one, and a content of
+   "> Exit, Stage Left".
+
+   When generating quoted flowed lines, an agent needs to pay attention
+   to changes in quote depth.  All lines of a paragraph MUST be
+   unquoted, or else they MUST all be quoted and have the same quote
+   depth.  Therefore, whenever there is a change in quote depth, or a
+   change from quoted to unquoted, or change from unquoted to quoted,
+   the line immediately preceding the change MUST NOT be a flowed line.
+
+   If a receiving agent wishes to reformat flowed quoted lines (joining
+   and/or wrapping them) on display or when generating new messages, the
+   lines SHOULD be de-quoted, reformatted, and then re-quoted.  To de-
+   quote, the number of close angle brackets in the quote indicator at
+   the start of each line is counted.  To re-quote after reformatting, a
+   quote indicator containing the same number of close angle brackets
+   originally present are prefixed to each line.
+
+   On reception, if a change in quote depth occurs on a flowed line,
+   this is an improperly formatted message.  The receiver SHOULD handle
+   this error by using the 'quote-depth-wins' rule, which is to consider
+   the paragraph to end with the flowed line immediately preceding the
+   change in quote depth.
+
+   In other words, whenever two adjacent lines have different quote
+   depths, senders MUST ensure that the earlier line is not flowed (does
+   not end in a space), and receivers finding a flowed line there SHOULD
+   treat it as the last line of a paragraph.
+
+   For example, consider the following sequence of lines (using '*' to
+   indicate a soft line break, i.e., SP CRLF, and '#' to indicate a hard
+   line break, i.e., CRLF):
+
+
+
+Gellens                     Standards Track                    [Page 10]
+
+RFC 3676         Text/Plain Format and DelSp Parameters    February 2004
+
+
+      > Thou villainous ill-breeding spongy dizzy-eyed*
+      > reeky elf-skinned pigeon-egg!*     <--- problem ---<
+      >> Thou artless swag-bellied milk-livered*
+      >> dismal-dreaming idle-headed scut!#
+      >>> Thou errant folly-fallen spleeny reeling-ripe*
+      >>> unmuzzled ratsbane!#
+      >>>> Henceforth, the coding style is to be strictly*
+      >>>> enforced, including the use of only upper case.#
+      >>>>> I've noticed a lack of adherence to the coding*
+      >>>>> styles, of late.#
+      >>>>>> Any complaints?#
+
+   The second line ends in a soft line break, even though it is the last
+   line of the one-deep quote block.  The question then arises as to how
+   this line is to be interpreted, considering that the next line is the
+   first line of the two-deep quote block.
+
+   The example text above, when processed according to quote-depth wins,
+   results in the first two lines being considered as one quoted, flowed
+   section, with a quote depth of 1; the third and fourth lines become a
+   quoted, flowed section, with a quote depth of 2.
+
+   A generating agent MUST NOT create this situation; a receiving agent
+   SHOULD handle it by giving preference to the quote depth.
+
+4.6.  Digital Signatures and Encryption
+
+   If a message is digitally signed or encrypted it is important that
+   cryptographic processing use the same text for signature verification
+   and/or decryption as was used for signature generation and/or
+   encryption.  Since the use of format=flowed allows text to be altered
+   (by adding or removing line breaks and trailing spaces) between
+   composition and transmission, and between reception and display,
+   interoperability problems or security vulnerabilities may arise if
+   originator and recipient do not both use the on-the-wire format for
+   cryptographic processing.
+
+   The implications of the interaction between format=flowed and any
+   specific cryptographic process depend on the details of the
+   cryptographic processing and should be understood before using
+   format=flowed in conjunction with signed and/or encrypted messages.
+
+   Note that [OpenPGP] specifies (in Section 7.1) that "any trailing
+   whitespace (spaces, and tabs, 0x09) at the end of any line is ignored
+   when the cleartext signature is calculated."
+
+
+
+
+
+
+Gellens                     Standards Track                    [Page 11]
+
+RFC 3676         Text/Plain Format and DelSp Parameters    February 2004
+
+
+   Thus it would be possible to add, in transit, a format=flowed header
+   to a regular, format=fixed vanilla PGP (not [OpenPGP-MIME]) signed
+   message and add arbitrary trailing space characters without this
+   addition being detected.  This would change the rendering of the
+   article by a client which supported format=flowed.
+
+   Therefore, the use of [OpenPGP] with format=flowed messages is
+   strongly discouraged. [OpenPGP-MIME] is recommended instead.
+
+4.7.  Examples
+
+   The following example contains three paragraphs:
+
+      `Take some more tea,' the March Hare said to Alice, very
+      earnestly.
+
+      `I've had nothing yet,' Alice replied in an offended tone, `so I
+      can't take more.'
+
+      `You mean you can't take LESS,' said the Hatter: `it's very easy
+      to take MORE than nothing.'
+
+   This could be encoded as follows (using '*' to indicate a soft line
+   break, that is, SP CRLF sequence, and '#' to indicate a hard line
+   break, that is, CRLF):
+
+      `Take some more tea,' the March Hare said to Alice, very*
+      earnestly.#
+      #
+      `I've had nothing yet,' Alice replied in an offended tone, `so*
+      I can't take more.'#
+      #
+      `You mean you can't take LESS,' said the Hatter: `it's very*
+      easy to take MORE than nothing.'#
+
+   To show an example of quoting, here we have the same exchange,
+   presented as a series of direct quotes:
+
+      >>>Take some more tea.#
+      >>I've had nothing yet, so I can't take more.#
+      >You mean you can't take LESS, it's very easy to take*
+      >MORE than nothing.#
+
+5.  Interoperability
+
+   Because flowed lines are all-but-indistinguishable from fixed lines,
+   software which does not recognize Format=Flowed treats flowed lines
+   as normal Text/Plain (which is what they are).  Thus, Format=Flowed
+
+
+
+Gellens                     Standards Track                    [Page 12]
+
+RFC 3676         Text/Plain Format and DelSp Parameters    February 2004
+
+
+   interoperates with older clients, although flowed lines will have
+   trailing white space inserted.
+
+   If a space-stuffed message is received by an agent which handles
+   Format=Flowed, the space-stuffing is reversed and thus the message
+   appears unchanged.  An agent which is not aware of Format=Flowed will
+   of course not undo any space-stuffing; thus Format=Flowed messages
+   may appear with a leading space on some lines (those which start with
+   a space, ">" which is not a quote indicator, or "From ").  Since
+   lines which require space-stuffing rarely occur, and the aesthetic
+   consequences of unreversed space-stuffing are minimal, this is not
+   expected to be a significant problem.
+
+   If some lines begin with one or more spaces, the generating agent MAY
+   space-stuff all lines, to maintain the relative indentation of the
+   lines when viewed by clients which are not aware of Format=Flowed.
+
+   Messages generated with DelSp=yes and received by clients which are
+   aware of Format=Flowed but are not aware of the DelSp parameter will
+   have an extra space remaining after removal of soft line breaks.
+   Thus, when generating text in languages/coded character sets in which
+   spaces are common, the generating agent MAY always use the DelSp=no
+   method.
+
+   Hand-aligned text, such as ASCII tables or art, source code, etc.,
+   SHOULD be sent as fixed, not flowed lines.
+
+6.  ABNF
+
+   The constructs used in Text/Plain; Format=Flowed body parts are
+   described using Augmented Backus-Naur Form [ABNF], including the core
+   rules defined in Appendix A.
+
+   Note that the SP (space) and ">" characters are encoded according to
+   the charset parameter.
+
+flowed-body      = *( paragraph / fixed-line / sig-sep )
+paragraph        = 1*flowed-line fixed-line
+                   ; all lines in paragraph MUST be unquoted or
+                   ; have same quote depth
+flowed-line      = ( flowed-line-qt / flowed-line-unqt ) flow CRLF
+flowed-line-qt   = quote ( ( stuffing stuffed-flowed ) /
+                           unstuffed-flowed )
+flowed-line-unqt = ( stuffing stuffed-flowed ) / unstuffed-flowed
+stuffed-flowed   = *text-char
+unstuffed-flowed = non-sp-quote *text-char
+fixed-line       = fixed-line-qt / fixed-line-unqt
+fixed-line-qt    = quote ( ( stuffing stuffed-fixed ) /
+
+
+
+Gellens                     Standards Track                    [Page 13]
+
+RFC 3676         Text/Plain Format and DelSp Parameters    February 2004
+
+
+                           unstuffed-fixed ) CRLF
+fixed-line-unqt  = ( stuffed-fixed / unstuffed-fixed ) CRLF
+stuffed-fixed    = *text-char non-sp
+unstuffed-fixed  = non-sp-quote [ *text-char non-sp ]
+sig-sep          = [ quote [stuffing] ] "--" SP CRLF
+quote-mark       = ">"
+quote            = 1*quote-mark
+stuffing         = SP ; space-stuffed, added on generation if
+                      ; needed, deleted on reception
+flow             = SP ; space before CRLF indicates flowed line,
+                      ; if DelSp=yes, space was added on generation
+                      ; and is deleted on reception
+non-sp-quote     = < any character except NUL, CR, LF, SP, quote-mark >
+non-sp           = non-sp-quote / quote-mark
+text-char        = non-sp / SP
+
+   That is, a Format=Flowed message body consists of any number of
+   paragraphs and/or fixed lines and/or signature separator lines;
+   paragraphs need at least one flowed line and are terminated by a
+   fixed line; the fixed line terminating the paragraph is part of the
+   paragraph.  (There are some exceptions to this described in the
+   text.)
+
+   Without at least one flowed line, there is a series of fixed lines,
+   each independent.  There is no paragraph.
+
+   With at least one flowed line, there is a paragraph, and the received
+   lines can be reformed and flowed to fit the display window size.
+   This can only be done if the lines are part of a logical grouping,
+   the paragraph.
+
+   Note that the definitions of flowed-line and sig-sep are potentially
+   ambiguous: a signature separator line matches both, but is treated as
+   a signature separator line and not a flowed line.
+
+7.  Failure Modes
+
+7.1.  Trailing White Space Corruption
+
+   There are systems in existence which alter trailing whitespace on
+   messages which pass through them.  Such systems may strip, or in
+   rarer cases, add trailing whitespace, in violation of RFC 2821 [SMTP]
+   Section 4.5.2.
+
+   Stripping trailing whitespace has the effect of converting flowed
+   lines to fixed lines, which results in a message no worse than if
+   Format=Flowed had not been used.
+
+
+
+
+Gellens                     Standards Track                    [Page 14]
+
+RFC 3676         Text/Plain Format and DelSp Parameters    February 2004
+
+
+   Adding trailing whitespace to a Format=Flowed message may result in a
+   malformed display or reply.
+
+   Since most systems which add trailing white space do so to create a
+   line which fills an internal record format, the result is almost
+   always a line which contains an even number of characters (counting
+   the added trailing white space).
+
+   One possible avoidance, therefore, would be to define Format=Flowed
+   lines to use either one or two trailing space characters to indicate
+   a flowed line, such that the total line length is odd.  However,
+   considering the scarcity of such systems today, it is not worth the
+   added complexity.
+
+8.  Security Considerations
+
+   Any security considerations which apply to Text/Plain also apply to
+   Text/Plain with Format=Flowed.
+
+   Section 4.6 discusses the interaction between Format=Flowed and
+   digital signatures or encryption.
+
+9.  IANA Considerations
+
+   IANA has added a reference to this specification in the Text/Plain
+   Media Type registration.
+
+10.  Internationalization Considerations
+
+   The line wrap and quoting specifications of Format=Flowed may not be
+   suitable for certain charsets, such as for Arabic and Hebrew
+   characters that read from right to left.  Care needs to be taken in
+   applying format=flowed in these cases, as format=fixed combined with
+   [quoted-printable] encoding may be more suitable.
+
+   The DelSp parameter was added specifically to permit Format=Flowed to
+   be used with languages/coded character sets in which the ASCII space
+   character is rarely used, or not used at all.
+
+11.  Acknowledgments
+
+   The DelSp parameter was developed during a series of discussions
+   among a number of people, including Harald Alvestrand, Grant Baillie,
+   Ian Bell, Steve Dorner, Patrik Faltstrom, Eric Fischer, Ned Freed,
+   Alexey Melnikov, John Myers, and Pete Resnick.
+
+
+
+
+
+
+Gellens                     Standards Track                    [Page 15]
+
+RFC 3676         Text/Plain Format and DelSp Parameters    February 2004
+
+
+   Corrections and clarifications to RFC 2646 and early versions of this
+   document were pointed out by several people, including Adam Costello,
+   Jutta Degener, Tony Hansen, Simon Josefsson, Dan Kohn, Ragho
+   Mahalingam, Keith Moore, Greg Troxel, and Dan Wing.
+
+   I'm told that NeXT's mail application used a very similar mechanism
+   (without support for non-Western languages) in 1992.
+
+12.  Normative References
+
+   [ABNF]             Crocker, D., Ed. and P. Overell, "Augmented BNF
+                      for Syntax Specifications: ABNF", RFC 2234,
+                      November 1997.
+
+   [KEYWORDS]         Bradner, S., "Key words for use in RFCs to
+                      Indicate Requirement Levels", BCP 14, RFC 2119,
+                      March 1997.
+
+   [MIME-IMT]         Freed, N. and N. Borenstein, "Multipurpose
+                      Internet Mail Extensions (MIME) Part Two:  Media
+                      Types", RFC 2046, November 1996.
+
+   [Quoted-Printable] Freed, N. and N. Borenstein, "Multipurpose
+                      Internet Mail Extensions (MIME) Part One:  Format
+                      of Internet Message Bodies", RFC 2045, November
+                      1996.
+
+13.  Informative References
+
+   [Annex-14]         Unicode Standard Annex #14, "Line Breaking
+                      Properties"
+                      <URL:http://www.unicode.org/unicode/reports/tr14/>
+
+   [MSG-FMT]          Resnick, P., Ed., "Internet Message Format", RFC
+                      2822, April 2001.
+
+   [OpenPGP]          Callas, J., Donnerhacke, L., Finney, H. and R.
+                      Thayer, "OpenPGP Message Format", RFC 2440,
+                      November 1998.
+
+   [OpenPGP-MIME]     Elkins, M., "MIME Security with Pretty Good
+                      Privacy (PGP)", RFC 2015, October 1996.
+
+                      Elkins, M., Del Torto, D., Levien, R. and J.
+                      Roessler, "MIME Security with OpenPGP", RFC 3156,
+                      August 2001.
+
+
+
+
+
+Gellens                     Standards Track                    [Page 16]
+
+RFC 3676         Text/Plain Format and DelSp Parameters    February 2004
+
+
+   [Rich]             Resnick, P. and A. Walker, "The text/enriched MIME
+                      Content-type", RFC 1896, February 1996.
+
+   [SMTP]             Klensin, J., Ed., "Simple Mail Transfer Protocol",
+                      RFC 2821, April 2001.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Gellens                     Standards Track                    [Page 17]
+
+RFC 3676         Text/Plain Format and DelSp Parameters    February 2004
+
+
+Appendix A:  Changes from RFC 2646
+
+   Substantive:
+
+   o  Added DelSp parameter to handle languages and coded character sets
+      in which space is less common or not used.
+   o  Updated text on generating and interpreting to accommodate the
+      DelSp parameter.
+   o  Changed the limits of 79 or 80 to be 78 in conformance with RFC
+      2822.
+   o  Added text on generating to clarify that the 78-character limit
+      includes trailing white space and stuffing.
+   o  Changed sig-sep in ABNF to allow stuffing.
+   o  Changed fixed-line to allow empty lines in ABNF.
+   o  Added explanatory text following ABNF.
+   o  Moved text from Abstract to new Introduction; rewrote Abstract.
+   o  Moved interoperability text to new section, and updated.
+   o  Clarified Security Considerations.
+   o  Text on digital signatures now discusses that OpenPGP ignores
+      trailing white space.
+   o  Mention Unicode Annex 14.
+   o  Added mention of quoting to Abstract and Introduction.
+   o  Deleted line analysis table.
+   o  Added recommendations for OpenPGP and OpenPGP-MIME.
+   o  Rewrote ABNF rules to remove most ambiguity and note remaining
+      case.
+   o  Added note that c-t-e is irrelevant to flowed text processing.
+   o  Added text indicating that end of data terminates a paragraph.
+   o  Moved sig-sep out of fixed-line ABNF.
+   o  Changed some SHOULDs to MUSTs (space-stuffing, quoted paragraphs).
+   o  Added note to ABNF that space and ">" are encoded according to
+      charset.
+   o  Mentioned exceptions in section on interpreting.
+   o  Clarified and made consistent treatment of signature separator
+      lines.
+
+   Editorial:
+
+   o  Added mention of NeXT's mail application to Acknowledgments.
+   o  Updated Acknowledgments.
+   o  Updated [SMTP] reference to 2821.
+   o  Added Notices.
+   o  Split References into Normative and Informative.
+   o  Improved text wording in some areas.
+   o  Standardize on "quote depth", not "quoting depth".
+   o  Moved section on interpreting before section on generating.
+   o  Reworded non-normative "should"s.
+   o  Noted meaning of "paragraph".
+
+
+
+Gellens                     Standards Track                    [Page 18]
+
+RFC 3676         Text/Plain Format and DelSp Parameters    February 2004
+
+
+   The DelSp parameter was added specifically to permit Format=Flowed to
+   be used with languages/coded character sets in which the ASCII space
+   character is rarely used, or not used at all.  The DelSp mechanism
+   was selected despite having been initially rejected as too much of a
+   kludge, because among the many different techniques proposed, it
+   allows for maximum interoperability among clients which support
+   neither this specification nor RFC 2646, those which do support RFC
+   2646 but not this specification, and those that do support this
+   specification; this set is multiplied by those that handle
+   languages/coded character sets in which spaces are common, and in
+   which they are uncommon or not used.
+
+Author's Address
+
+   Randall Gellens
+   QUALCOMM Incorporated
+   5775 Morehouse Drive
+   San Diego, CA  92121
+   USA
+
+   Phone: +1 858 651 5115
+   EMail: randy@qualcomm.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Gellens                     Standards Track                    [Page 19]
+
+RFC 3676         Text/Plain Format and DelSp Parameters    February 2004
+
+
+Full Copyright Statement
+
+   Copyright (C) The Internet Society (2004).  This document is subject
+   to the rights, licenses and restrictions contained in BCP 78 and
+   except as set forth therein, the authors retain all their rights.
+
+   This document and the information contained herein are provided on an
+   "AS IS" basis and THE CONTRIBUTOR, THE ORGANIZATION HE/SHE
+   REPRESENTS OR IS SPONSORED BY (IF ANY), THE INTERNET SOCIETY AND THE
+   INTERNET ENGINEERING TASK FORCE DISCLAIM ALL WARRANTIES, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF
+   THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED
+   WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+Intellectual Property
+
+   The IETF takes no position regarding the validity or scope of any
+   Intellectual Property Rights or other rights that might be claimed
+   to pertain to the implementation or use of the technology
+   described in this document or the extent to which any license
+   under such rights might or might not be available; nor does it
+   represent that it has made any independent effort to identify any
+   such rights.  Information on the procedures with respect to
+   rights in RFC documents can be found in BCP 78 and BCP 79.
+
+   Copies of IPR disclosures made to the IETF Secretariat and any
+   assurances of licenses to be made available, or the result of an
+   attempt made to obtain a general license or permission for the use
+   of such proprietary rights by implementers or users of this
+   specification can be obtained from the IETF on-line IPR repository
+   at http://www.ietf.org/ipr.
+
+   The IETF invites any interested party to bring to its attention
+   any copyrights, patents or patent applications, or other
+   proprietary rights that may cover technology that may be required
+   to implement this standard.  Please address the information to the
+   IETF at ietf-ipr@ietf.org.
+
+Acknowledgement
+
+   Funding for the RFC Editor function is currently provided by the
+   Internet Society.
+
+
+
+
+
+
+
+
+
+Gellens                     Standards Track                    [Page 20]
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc4505.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc4505.txt
new file mode 100644
index 000000000..6b8a4a115
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc4505.txt
@@ -0,0 +1,507 @@
+
+
+
+
+
+
+Network Working Group                                   K. Zeilenga, Ed.
+Request for Comments: 4505                           OpenLDAP Foundation
+Obsoletes: 2245                                                June 2006
+Category: Standards Track
+
+
+  Anonymous Simple Authentication and Security Layer (SASL) Mechanism
+
+Status of This Memo
+
+   This document specifies an Internet standards track protocol for the
+   Internet community, and requests discussion and suggestions for
+   improvements.  Please refer to the current edition of the "Internet
+   Official Protocol Standards" (STD 1) for the standardization state
+   and status of this protocol.  Distribution of this memo is unlimited.
+
+Copyright Notice
+
+   Copyright (C) The Internet Society (2006).
+
+Abstract
+
+   On the Internet, it is common practice to permit anonymous access to
+   various services.  Traditionally, this has been done with a plain-
+   text password mechanism using "anonymous" as the user name and using
+   optional trace information, such as an email address, as the
+   password.  As plain-text login commands are not permitted in new IETF
+   protocols, a new way to provide anonymous login is needed within the
+   context of the Simple Authentication and Security Layer (SASL)
+   framework.
+
+1.  Introduction
+
+   This document defines an anonymous mechanism for the Simple
+   Authentication and Security Layer ([SASL]) framework.  The name
+   associated with this mechanism is "ANONYMOUS".
+
+   Unlike many other SASL mechanisms, whose purpose is to authenticate
+   and identify the user to a server, the purpose of this SASL mechanism
+   is to allow the user to gain access to services or resources without
+   requiring the user to establish or otherwise disclose their identity
+   to the server.  That is, this mechanism provides an anonymous login
+   method.
+
+   This mechanism does not provide a security layer.
+
+   This document replaces RFC 2245.  Changes since RFC 2245 are detailed
+   in Appendix A.
+
+
+
+Zeilenga                    Standards Track                     [Page 1]
+
+RFC 4505                Anonymous SASL Mechanism               June 2006
+
+
+2.  The Anonymous Mechanism
+
+   The mechanism consists of a single message from the client to the
+   server.  The client may include in this message trace information in
+   the form of a string of [UTF-8]-encoded [Unicode] characters prepared
+   in accordance with [StringPrep] and the "trace" stringprep profile
+   defined in Section 3 of this document.  The trace information, which
+   has no semantical value, should take one of two forms: an Internet
+   email address, or an opaque string that does not contain the '@'
+   (U+0040) character and that can be interpreted by the system
+   administrator of the client's domain.  For privacy reasons, an
+   Internet email address or other information identifying the user
+   should only be used with permission from the user.
+
+   A server that permits anonymous access will announce support for the
+   ANONYMOUS mechanism and allow anyone to log in using that mechanism,
+   usually with restricted access.
+
+   A formal grammar for the client message using Augmented BNF [ABNF] is
+   provided below as a tool for understanding this technical
+   specification.
+
+      message     = [ email / token ]
+                    ;; to be prepared in accordance with Section 3
+
+      UTF1        = %x00-3F / %x41-7F ;; less '@' (U+0040)
+      UTF2        = %xC2-DF UTF0
+      UTF3        = %xE0 %xA0-BF UTF0 / %xE1-EC 2(UTF0) /
+                    %xED %x80-9F UTF0 / %xEE-EF 2(UTF0)
+      UTF4        = %xF0 %x90-BF 2(UTF0) / %xF1-F3 3(UTF0) /
+                    %xF4 %x80-8F 2(UTF0)
+      UTF0        = %x80-BF
+
+      TCHAR       = UTF1 / UTF2 / UTF3 / UTF4
+                    ;; any UTF-8 encoded Unicode character
+                    ;; except '@' (U+0040)
+
+      email       = addr-spec
+                    ;; as defined in [IMAIL]
+
+      token       = 1*255TCHAR
+
+   Note to implementors:
+      The <token> production is restricted to 255 UTF-8-encoded Unicode
+      characters.  As the encoding of a characters uses a sequence of 1
+      to 4 octets, a token may be as long as 1020 octets.
+
+
+
+
+
+Zeilenga                    Standards Track                     [Page 2]
+
+RFC 4505                Anonymous SASL Mechanism               June 2006
+
+
+3.  The "trace" Profile of "Stringprep"
+
+   This section defines the "trace" profile of [StringPrep].  This
+   profile is designed for use with the SASL ANONYMOUS Mechanism.
+   Specifically, the client is to prepare the <message> production in
+   accordance with this profile.
+
+   The character repertoire of this profile is Unicode 3.2 [Unicode].
+
+   No mapping is required by this profile.
+
+   No Unicode normalization is required by this profile.
+
+   The list of unassigned code points for this profile is that provided
+   in Appendix A of [StringPrep].  Unassigned code points are not
+   prohibited.
+
+   Characters from the following tables of [StringPrep] are prohibited:
+
+      - C.2.1 (ASCII control characters)
+      - C.2.2 (Non-ASCII control characters)
+      - C.3 (Private use characters)
+      - C.4 (Non-character code points)
+      - C.5 (Surrogate codes)
+      - C.6 (Inappropriate for plain text)
+      - C.8 (Change display properties are deprecated)
+      - C.9 (Tagging characters)
+
+   No additional characters are prohibited.
+
+   This profile requires bidirectional character checking per Section 6
+   of [StringPrep].
+
+4.  Example
+
+   Here is a sample ANONYMOUS login between an IMAP client and server.
+   In this example, "C:" and "S:" indicate lines sent by the client and
+   server, respectively.  If such lines are wrapped without a new "C:"
+   or "S:" label, then the wrapping is for editorial clarity and is not
+   part of the command.
+
+   Note that this example uses the IMAP profile [IMAP4] of SASL.  The
+   base64 encoding of challenges and responses as well as the "+ "
+   preceding the responses are part of the IMAP4 profile, not part of
+   SASL itself.  Additionally, protocols with SASL profiles permitting
+   an initial client response will be able to avoid the extra round trip
+   below (the server response with an empty "+ ").
+
+
+
+
+Zeilenga                    Standards Track                     [Page 3]
+
+RFC 4505                Anonymous SASL Mechanism               June 2006
+
+
+   In this example, the trace information is "sirhc".
+
+      S: * OK IMAP4 server ready
+      C: A001 CAPABILITY
+      S: * CAPABILITY IMAP4 IMAP4rev1 AUTH=DIGEST-MD5 AUTH=ANONYMOUS
+      S: A001 OK done
+      C: A002 AUTHENTICATE ANONYMOUS
+      S: +
+      C: c2lyaGM=
+      S: A003 OK Welcome, trace information has been logged.
+
+5.  Security Considerations
+
+   The ANONYMOUS mechanism grants access to services and/or resources by
+   anyone.  For this reason, it should be disabled by default so that
+   the administrator can make an explicit decision to enable it.
+
+   If the anonymous user has any write privileges, a denial-of-service
+   attack is possible by filling up all available space.  This can be
+   prevented by disabling all write access by anonymous users.
+
+   If anonymous users have read and write access to the same area, the
+   server can be used as a communication mechanism to exchange
+   information anonymously.  Servers that accept anonymous submissions
+   should implement the common "drop box" model, which forbids anonymous
+   read access to the area where anonymous submissions are accepted.
+
+   If the anonymous user can run many expensive operations (e.g., an
+   IMAP SEARCH BODY command), this could enable a denial-of-service
+   attack.  Servers are encouraged to reduce the priority of anonymous
+   users or limit their resource usage.
+
+   While servers may impose a limit on the number of anonymous users,
+   note that such limits enable denial-of-service attacks and should be
+   used with caution.
+
+   The trace information is not authenticated, so it can be falsified.
+   This can be used as an attempt to get someone else in trouble for
+   access to questionable information.  Administrators investigating
+   abuse need to realize that this trace information may be falsified.
+
+   A client that uses the user's correct email address as trace
+   information without explicit permission may violate that user's
+   privacy.  Anyone who accesses an anonymous archive on a sensitive
+   subject (e.g., sexual abuse) likely has strong privacy needs.
+   Clients should not send the email address without the explicit
+   permission of the user and should offer the option of supplying no
+   trace information, thus only exposing the source IP address and time.
+
+
+
+Zeilenga                    Standards Track                     [Page 4]
+
+RFC 4505                Anonymous SASL Mechanism               June 2006
+
+
+   Anonymous proxy servers could enhance this privacy but would have to
+   consider the resulting potential denial-of-service attacks.
+
+   Anonymous connections are susceptible to man-in-the-middle attacks
+   that view or alter the data transferred.  Clients and servers are
+   encouraged to support external data security services.
+
+   Protocols that fail to require an explicit anonymous login are more
+   susceptible to break-ins given certain common implementation
+   techniques.  Specifically, Unix servers that offer user login may
+   initially start up as root and switch to the appropriate user id
+   after an explicit login command.  Normally, such servers refuse all
+   data access commands prior to explicit login and may enter a
+   restricted security environment (e.g., the Unix chroot(2) function)
+   for anonymous users.  If anonymous access is not explicitly
+   requested, the entire data access machinery is exposed to external
+   security attacks without the chance for explicit protective measures.
+   Protocols that offer restricted data access should not allow
+   anonymous data access without an explicit login step.
+
+   General [SASL] security considerations apply to this mechanism.
+
+   [StringPrep] security considerations and [Unicode] security
+   considerations discussed in [StringPrep] apply to this mechanism.
+   [UTF-8] security considerations also apply.
+
+6.  IANA Considerations
+
+   The SASL Mechanism registry [IANA-SASL] entry for the ANONYMOUS
+   mechanism has been updated by the IANA to reflect that this document
+   now provides its technical specification.
+
+      To: iana@iana.org
+      Subject: Updated Registration of SASL mechanism ANONYMOUS
+
+      SASL mechanism name: ANONYMOUS
+      Security considerations: See RFC 4505.
+      Published specification (optional, recommended): RFC 4505
+      Person & email address to contact for further information:
+           Kurt Zeilenga <Kurt@OpenLDAP.org>
+           Chris Newman <Chris.Newman@sun.com>
+      Intended usage: COMMON
+      Author/Change controller: IESG <iesg@ietf.org>
+      Note: Updates existing entry for ANONYMOUS
+
+
+
+
+
+
+
+Zeilenga                    Standards Track                     [Page 5]
+
+RFC 4505                Anonymous SASL Mechanism               June 2006
+
+
+   The [StringPrep] profile "trace", first defined in this RFC, has been
+   registered:
+
+      To: iana@iana.org
+      Subject: Initial Registration of Stringprep "trace" profile
+
+      Stringprep profile: trace
+      Published specification: RFC 4505
+      Person & email address to contact for further information:
+          Kurt Zeilenga <kurt@openldap.org>
+
+7.  Acknowledgement
+
+   This document is a revision of RFC 2245 by Chris Newman.  Portions of
+   the grammar defined in Section 1 were borrowed from RFC 3629 by
+   Francois Yergeau.
+
+   This document is a product of the IETF SASL WG.
+
+8.  Normative References
+
+   [ABNF]       Crocker, D. and P. Overell, "Augmented BNF for Syntax
+                Specifications: ABNF", RFC 4234, October 2005.
+
+   [IMAIL]      Resnick, P., "Internet Message Format", RFC 2822, April
+                2001.
+
+   [SASL]       Melnikov, A., Ed. and K. Zeilenga, Ed., "Simple
+                Authentication and Security Layer (SASL)", RFC 4422,
+                June 2006.
+
+   [StringPrep] Hoffman, P. and M. Blanchet, "Preparation of
+                Internationalized Strings ('stringprep')", RFC 3454,
+                December 2002.
+
+   [Unicode]    The Unicode Consortium, "The Unicode Standard, Version
+                3.2.0" is defined by "The Unicode Standard, Version 3.0"
+                (Reading, MA, Addison-Wesley, 2000. ISBN 0-201-61633-5),
+                as amended by the "Unicode Standard Annex #27: Unicode
+                3.1" (http://www.unicode.org/reports/tr27/) and by the
+                "Unicode Standard Annex #28: Unicode 3.2"
+                (http://www.unicode.org/reports/tr28/).
+
+   [UTF-8]      Yergeau, F., "UTF-8, a transformation format of ISO
+                10646", RFC 3629 (also STD 63), November 2003.
+
+
+
+
+
+
+Zeilenga                    Standards Track                     [Page 6]
+
+RFC 4505                Anonymous SASL Mechanism               June 2006
+
+
+9.  Informative References
+
+   [IMAP4]      Crispin, M., "INTERNET MESSAGE ACCESS PROTOCOL - VERSION
+                4rev1", RFC 3501, March 2003.
+
+   [IANA-SASL]  IANA, "SIMPLE AUTHENTICATION AND SECURITY LAYER (SASL)
+                MECHANISMS", <http://www.iana.org/assignments/sasl-
+                mechanisms>.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Zeilenga                    Standards Track                     [Page 7]
+
+RFC 4505                Anonymous SASL Mechanism               June 2006
+
+
+Appendix A.  Changes since RFC 2245
+
+   This appendix is non-normative.
+
+   RFC 2245 allows the client to include optional trace information in
+   the form of a human readable string.  RFC 2245 restricted this string
+   to US-ASCII.  As the Internet is international, this document uses a
+   string restricted to UTF-8 encoded Unicode characters.  A
+   "stringprep" profile is defined to precisely define which Unicode
+   characters are allowed in this string.  While the string remains
+   restricted to 255 characters, the encoded length of each character
+   may now range from 1 to 4 octets.
+
+   Additionally, a number of editorial changes were made.
+
+Editor's Address
+
+   Kurt D. Zeilenga
+   OpenLDAP Foundation
+
+   EMail: Kurt@OpenLDAP.org
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Zeilenga                    Standards Track                     [Page 8]
+
+RFC 4505                Anonymous SASL Mechanism               June 2006
+
+
+Full Copyright Statement
+
+   Copyright (C) The Internet Society (2006).
+
+   This document is subject to the rights, licenses and restrictions
+   contained in BCP 78, and except as set forth therein, the authors
+   retain all their rights.
+
+   This document and the information contained herein are provided on an
+   "AS IS" basis and THE CONTRIBUTOR, THE ORGANIZATION HE/SHE REPRESENTS
+   OR IS SPONSORED BY (IF ANY), THE INTERNET SOCIETY AND THE INTERNET
+   ENGINEERING TASK FORCE DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED,
+   INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE
+   INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED
+   WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+Intellectual Property
+
+   The IETF takes no position regarding the validity or scope of any
+   Intellectual Property Rights or other rights that might be claimed to
+   pertain to the implementation or use of the technology described in
+   this document or the extent to which any license under such rights
+   might or might not be available; nor does it represent that it has
+   made any independent effort to identify any such rights.  Information
+   on the procedures with respect to rights in RFC documents can be
+   found in BCP 78 and BCP 79.
+
+   Copies of IPR disclosures made to the IETF Secretariat and any
+   assurances of licenses to be made available, or the result of an
+   attempt made to obtain a general license or permission for the use of
+   such proprietary rights by implementers or users of this
+   specification can be obtained from the IETF on-line IPR repository at
+   http://www.ietf.org/ipr.
+
+   The IETF invites any interested party to bring to its attention any
+   copyrights, patents or patent applications, or other proprietary
+   rights that may cover technology that may be required to implement
+   this standard.  Please address the information to the IETF at
+   ietf-ipr@ietf.org.
+
+Acknowledgement
+
+   Funding for the RFC Editor function is provided by the IETF
+   Administrative Support Activity (IASA).
+
+
+
+
+
+
+
+Zeilenga                    Standards Track                     [Page 9]
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc4616.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc4616.txt
new file mode 100644
index 000000000..991189d54
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc4616.txt
@@ -0,0 +1,619 @@
+
+
+
+
+
+
+Network Working Group                                   K. Zeilenga, Ed.
+Request for Comments: 4616                           OpenLDAP Foundation
+Updates: 2595                                                August 2006
+Category: Standards Track
+
+
+  The PLAIN Simple Authentication and Security Layer (SASL) Mechanism
+
+Status of This Memo
+
+   This document specifies an Internet standards track protocol for the
+   Internet community, and requests discussion and suggestions for
+   improvements.  Please refer to the current edition of the "Internet
+   Official Protocol Standards" (STD 1) for the standardization state
+   and status of this protocol.  Distribution of this memo is unlimited.
+
+Copyright Notice
+
+   Copyright (C) The Internet Society (2006).
+
+Abstract
+
+   This document defines a simple clear-text user/password Simple
+   Authentication and Security Layer (SASL) mechanism called the PLAIN
+   mechanism.  The PLAIN mechanism is intended to be used, in
+   combination with data confidentiality services provided by a lower
+   layer, in protocols that lack a simple password authentication
+   command.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Zeilenga                    Standards Track                     [Page 1]
+
+RFC 4616                The PLAIN SASL Mechanism             August 2006
+
+
+1.  Introduction
+
+   Clear-text, multiple-use passwords are simple, interoperate with
+   almost all existing operating system authentication databases, and
+   are useful for a smooth transition to a more secure password-based
+   authentication mechanism.  The drawback is that they are unacceptable
+   for use over network connections where data confidentiality is not
+   ensured.
+
+   This document defines the PLAIN Simple Authentication and Security
+   Layer ([SASL]) mechanism for use in protocols with no clear-text
+   login command (e.g., [ACAP] or [SMTP-AUTH]).  This document updates
+   RFC 2595, replacing Section 6.  Changes since RFC 2595 are detailed
+   in Appendix A.
+
+   The name associated with this mechanism is "PLAIN".
+
+   The PLAIN SASL mechanism does not provide a security layer.
+
+   The PLAIN mechanism should not be used without adequate data security
+   protection as this mechanism affords no integrity or confidentiality
+   protections itself.  The mechanism is intended to be used with data
+   security protections provided by application-layer protocol,
+   generally through its use of Transport Layer Security ([TLS])
+   services.
+
+   By default, implementations SHOULD advertise and make use of the
+   PLAIN mechanism only when adequate data security services are in
+   place.  Specifications for IETF protocols that indicate that this
+   mechanism is an applicable authentication mechanism MUST mandate that
+   implementations support an strong data security service, such as TLS.
+
+   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
+   "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
+   document are to be interpreted as described in [Keywords].
+
+2.  PLAIN SASL Mechanism
+
+   The mechanism consists of a single message, a string of [UTF-8]
+   encoded [Unicode] characters, from the client to the server.  The
+   client presents the authorization identity (identity to act as),
+   followed by a NUL (U+0000) character, followed by the authentication
+   identity (identity whose password will be used), followed by a NUL
+   (U+0000) character, followed by the clear-text password.  As with
+   other SASL mechanisms, the client does not provide an authorization
+   identity when it wishes the server to derive an identity from the
+   credentials and use that as the authorization identity.
+
+
+
+
+Zeilenga                    Standards Track                     [Page 2]
+
+RFC 4616                The PLAIN SASL Mechanism             August 2006
+
+
+   The formal grammar for the client message using Augmented BNF [ABNF]
+   follows.
+
+   message   = [authzid] UTF8NUL authcid UTF8NUL passwd
+   authcid   = 1*SAFE ; MUST accept up to 255 octets
+   authzid   = 1*SAFE ; MUST accept up to 255 octets
+   passwd    = 1*SAFE ; MUST accept up to 255 octets
+   UTF8NUL   = %x00 ; UTF-8 encoded NUL character
+
+   SAFE      = UTF1 / UTF2 / UTF3 / UTF4
+               ;; any UTF-8 encoded Unicode character except NUL
+
+   UTF1      = %x01-7F ;; except NUL
+   UTF2      = %xC2-DF UTF0
+   UTF3      = %xE0 %xA0-BF UTF0 / %xE1-EC 2(UTF0) /
+               %xED %x80-9F UTF0 / %xEE-EF 2(UTF0)
+   UTF4      = %xF0 %x90-BF 2(UTF0) / %xF1-F3 3(UTF0) /
+               %xF4 %x80-8F 2(UTF0)
+   UTF0      = %x80-BF
+
+   The authorization identity (authzid), authentication identity
+   (authcid), password (passwd), and NUL character deliminators SHALL be
+   transferred as [UTF-8] encoded strings of [Unicode] characters.  As
+   the NUL (U+0000) character is used as a deliminator, the NUL (U+0000)
+   character MUST NOT appear in authzid, authcid, or passwd productions.
+
+   The form of the authzid production is specific to the application-
+   level protocol's SASL profile [SASL].  The authcid and passwd
+   productions are form-free.  Use of non-visible characters or
+   characters that a user may be unable to enter on some keyboards is
+   discouraged.
+
+   Servers MUST be capable of accepting authzid, authcid, and passwd
+   productions up to and including 255 octets.  It is noted that the
+   UTF-8 encoding of a Unicode character may be as long as 4 octets.
+
+   Upon receipt of the message, the server will verify the presented (in
+   the message) authentication identity (authcid) and password (passwd)
+   with the system authentication database, and it will verify that the
+   authentication credentials permit the client to act as the (presented
+   or derived) authorization identity (authzid).  If both steps succeed,
+   the user is authenticated.
+
+   The presented authentication identity and password strings, as well
+   as the database authentication identity and password strings, are to
+   be prepared before being used in the verification process.  The
+   [SASLPrep] profile of the [StringPrep] algorithm is the RECOMMENDED
+   preparation algorithm.  The SASLprep preparation algorithm is
+
+
+
+Zeilenga                    Standards Track                     [Page 3]
+
+RFC 4616                The PLAIN SASL Mechanism             August 2006
+
+
+   recommended to improve the likelihood that comparisons behave in an
+   expected manner.  The SASLprep preparation algorithm is not mandatory
+   so as to allow the server to employ other preparation algorithms
+   (including none) when appropriate.  For instance, use of a different
+   preparation algorithm may be necessary for the server to interoperate
+   with an external system.
+
+   When preparing the presented strings using [SASLPrep], the presented
+   strings are to be treated as "query" strings (Section 7 of
+   [StringPrep]) and hence unassigned code points are allowed to appear
+   in their prepared output.  When preparing the database strings using
+   [SASLPrep], the database strings are to be treated as "stored"
+   strings (Section 7 of [StringPrep]) and hence unassigned code points
+   are prohibited from appearing in their prepared output.
+
+   Regardless of the preparation algorithm used, if the output of a
+   non-invertible function (e.g., hash) of the expected string is
+   stored, the string MUST be prepared before input to that function.
+
+   Regardless of the preparation algorithm used, if preparation fails or
+   results in an empty string, verification SHALL fail.
+
+   When no authorization identity is provided, the server derives an
+   authorization identity from the prepared representation of the
+   provided authentication identity string.  This ensures that the
+   derivation of different representations of the authentication
+   identity produces the same authorization identity.
+
+   The server MAY use the credentials to initialize any new
+   authentication database, such as one suitable for [CRAM-MD5] or
+   [DIGEST-MD5].
+
+3.  Pseudo-Code
+
+   This section provides pseudo-code illustrating the verification
+   process (using hashed passwords and the SASLprep preparation
+   function) discussed above.  This section is not definitive.
+
+   boolean Verify(string authzid, string authcid, string passwd) {
+     string pAuthcid = SASLprep(authcid, true); # prepare authcid
+     string pPasswd = SASLprep(passwd, true);   # prepare passwd
+     if (pAuthcid == NULL || pPasswd == NULL) {
+       return false;     # preparation failed
+     }
+     if (pAuthcid == "" || pPasswd == "") {
+       return false;     # empty prepared string
+     }
+
+
+
+
+Zeilenga                    Standards Track                     [Page 4]
+
+RFC 4616                The PLAIN SASL Mechanism             August 2006
+
+
+     storedHash = FetchPasswordHash(pAuthcid);
+     if (storedHash == NULL || storedHash == "") {
+       return false;     # error or unknown authcid
+     }
+
+     if (!Compare(storedHash, Hash(pPasswd))) {
+       return false;     # incorrect password
+     }
+
+     if (authzid == NULL ) {
+       authzid = DeriveAuthzid(pAuthcid);
+       if (authzid == NULL || authzid == "") {
+           return false; # could not derive authzid
+       }
+     }
+
+     if (!Authorize(pAuthcid, authzid)) {
+       return false;     # not authorized
+     }
+
+     return true;
+   }
+
+   The second parameter of the SASLprep function, when true, indicates
+   that unassigned code points are allowed in the input.  When the
+   SASLprep function is called to prepare the password prior to
+   computing the stored hash, the second parameter would be false.
+
+   The second parameter provided to the Authorize function is not
+   prepared by this code.  The application-level SASL profile should be
+   consulted to determine what, if any, preparation is necessary.
+
+   Note that the DeriveAuthzid and Authorize functions (whether
+   implemented as one function or two, whether designed in a manner in
+   which these functions or whether the mechanism implementation can be
+   reused elsewhere) require knowledge and understanding of mechanism
+   and the application-level protocol specification and/or
+   implementation details to implement.
+
+   Note that the Authorize function outcome is clearly dependent on
+   details of the local authorization model and policy.  Both functions
+   may be dependent on other factors as well.
+
+
+
+
+
+
+
+
+
+Zeilenga                    Standards Track                     [Page 5]
+
+RFC 4616                The PLAIN SASL Mechanism             August 2006
+
+
+4.  Examples
+
+   This section provides examples of PLAIN authentication exchanges.
+   The examples are intended to help the readers understand the above
+   text.  The examples are not definitive.
+
+   "C:" and "S:" indicate lines sent by the client and server,
+   respectively.  "<NUL>" represents a single NUL (U+0000) character.
+   The Application Configuration Access Protocol ([ACAP]) is used in the
+   examples.
+
+   The first example shows how the PLAIN mechanism might be used for
+   user authentication.
+
+   S: * ACAP (SASL "CRAM-MD5") (STARTTLS)
+   C: a001 STARTTLS
+   S: a001 OK "Begin TLS negotiation now"
+   <TLS negotiation, further commands are under TLS layer>
+   S: * ACAP (SASL "CRAM-MD5" "PLAIN")
+   C: a002 AUTHENTICATE "PLAIN"
+   S: + ""
+   C: {21}
+   C: <NUL>tim<NUL>tanstaaftanstaaf
+   S: a002 OK "Authenticated"
+
+   The second example shows how the PLAIN mechanism might be used to
+   attempt to assume the identity of another user.  In this example, the
+   server rejects the request.  Also, this example makes use of the
+   protocol optional initial response capability to eliminate a round-
+   trip.
+
+   S: * ACAP (SASL "CRAM-MD5") (STARTTLS)
+   C: a001 STARTTLS
+   S: a001 OK "Begin TLS negotiation now"
+   <TLS negotiation, further commands are under TLS layer>
+   S: * ACAP (SASL "CRAM-MD5" "PLAIN")
+   C: a002 AUTHENTICATE "PLAIN" {20+}
+   C: Ursel<NUL>Kurt<NUL>xipj3plmq
+   S: a002 NO "Not authorized to requested authorization identity"
+
+5.  Security Considerations
+
+   As the PLAIN mechanism itself provided no integrity or
+   confidentiality protections, it should not be used without adequate
+   external data security protection, such as TLS services provided by
+   many application-layer protocols.  By default, implementations SHOULD
+   NOT advertise and SHOULD NOT make use of the PLAIN mechanism unless
+   adequate data security services are in place.
+
+
+
+Zeilenga                    Standards Track                     [Page 6]
+
+RFC 4616                The PLAIN SASL Mechanism             August 2006
+
+
+   When the PLAIN mechanism is used, the server gains the ability to
+   impersonate the user to all services with the same password
+   regardless of any encryption provided by TLS or other confidentiality
+   protection mechanisms.  Whereas many other authentication mechanisms
+   have similar weaknesses, stronger SASL mechanisms address this issue.
+   Clients are encouraged to have an operational mode where all
+   mechanisms that are likely to reveal the user's password to the
+   server are disabled.
+
+   General [SASL] security considerations apply to this mechanism.
+
+   Unicode, [UTF-8], and [StringPrep] security considerations also
+   apply.
+
+6.  IANA Considerations
+
+   The SASL Mechanism registry [IANA-SASL] entry for the PLAIN mechanism
+   has been updated by the IANA to reflect that this document now
+   provides its technical specification.
+
+   To: iana@iana.org
+   Subject: Updated Registration of SASL mechanism PLAIN
+
+   SASL mechanism name: PLAIN
+   Security considerations: See RFC 4616.
+   Published specification (optional, recommended): RFC 4616
+   Person & email address to contact for further information:
+        Kurt Zeilenga <kurt@openldap.org>
+        IETF SASL WG <ietf-sasl@imc.org>
+   Intended usage: COMMON
+   Author/Change controller: IESG <iesg@ietf.org>
+   Note: Updates existing entry for PLAIN
+
+7.  Acknowledgements
+
+   This document is a revision of RFC 2595 by Chris Newman.  Portions of
+   the grammar defined in Section 2 were borrowed from [UTF-8] by
+   Francois Yergeau.
+
+   This document is a product of the IETF Simple Authentication and
+   Security Layer (SASL) Working Group.
+
+
+
+
+
+
+
+
+
+
+Zeilenga                    Standards Track                     [Page 7]
+
+RFC 4616                The PLAIN SASL Mechanism             August 2006
+
+
+8.  Normative References
+
+   [ABNF]        Crocker, D., Ed. and P. Overell, "Augmented BNF for
+                 Syntax Specifications: ABNF", RFC 4234, October 2005.
+
+   [Keywords]    Bradner, S., "Key words for use in RFCs to Indicate
+                 Requirement Levels", BCP 14, RFC 2119, March 1997.
+
+   [SASL]        Melnikov, A., Ed., and K. Zeilenga, Ed., "Simple
+                 Authentication and Security Layer (SASL)", RFC 4422,
+                 June 2006.
+
+   [SASLPrep]    Zeilenga, K., "SASLprep: Stringprep Profile for User
+                 Names and Passwords", RFC 4013, February 2005.
+
+   [StringPrep]  Hoffman, P. and M. Blanchet, "Preparation of
+                 Internationalized Strings ("stringprep")", RFC 3454,
+                 December 2002.
+
+   [Unicode]     The Unicode Consortium, "The Unicode Standard, Version
+                 3.2.0" is defined by "The Unicode Standard, Version
+                 3.0" (Reading, MA, Addison-Wesley, 2000. ISBN 0-201-
+                 61633-5), as amended by the "Unicode Standard Annex
+                 #27: Unicode 3.1"
+                 (http://www.unicode.org/reports/tr27/) and by the
+                 "Unicode Standard Annex #28: Unicode 3.2"
+                 (http://www.unicode.org/reports/tr28/).
+
+   [UTF-8]       Yergeau, F., "UTF-8, a transformation format of ISO
+                 10646", STD 63, RFC 3629, November 2003.
+
+   [TLS]         Dierks, T. and E. Rescorla, "The Transport Layer
+                 Security (TLS) Protocol Version 1.1", RFC 4346, April
+                 2006.
+
+9.  Informative References
+
+   [ACAP]        Newman, C. and J. Myers, "ACAP -- Application
+                 Configuration Access Protocol", RFC 2244, November
+                 1997.
+
+   [CRAM-MD5]    Nerenberg, L., Ed., "The CRAM-MD5 SASL Mechanism", Work
+                 in Progress, June 2006.
+
+   [DIGEST-MD5]  Melnikov, A., Ed., "Using Digest Authentication as a
+                 SASL Mechanism", Work in Progress, June 2006.
+
+
+
+
+
+Zeilenga                    Standards Track                     [Page 8]
+
+RFC 4616                The PLAIN SASL Mechanism             August 2006
+
+
+   [IANA-SASL]   IANA, "SIMPLE AUTHENTICATION AND SECURITY LAYER (SASL)
+                 MECHANISMS",
+                 <http://www.iana.org/assignments/sasl-mechanisms>.
+
+   [SMTP-AUTH]   Myers, J., "SMTP Service Extension for Authentication",
+                 RFC 2554, March 1999.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Zeilenga                    Standards Track                     [Page 9]
+
+RFC 4616                The PLAIN SASL Mechanism             August 2006
+
+
+Appendix A.  Changes since RFC 2595
+
+   This appendix is non-normative.
+
+   This document replaces Section 6 of RFC 2595.
+
+   The specification details how the server is to compare client-
+   provided character strings with stored character strings.
+
+   The ABNF grammar was updated.  In particular, the grammar now allows
+   LINE FEED (U+000A) and CARRIAGE RETURN (U+000D) characters in the
+   authzid, authcid, passwd productions.  However, whether these control
+   characters may be used depends on the string preparation rules
+   applicable to the production.  For passwd and authcid productions,
+   control characters are prohibited.  For authzid, one must consult the
+   application-level SASL profile.  This change allows PLAIN to carry
+   all possible authorization identity strings allowed in SASL.
+
+   Pseudo-code was added.
+
+   The example section was expanded to illustrate more features of the
+   PLAIN mechanism.
+
+Editor's Address
+
+   Kurt D. Zeilenga
+   OpenLDAP Foundation
+
+   EMail: Kurt@OpenLDAP.org
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Zeilenga                    Standards Track                    [Page 10]
+
+RFC 4616                The PLAIN SASL Mechanism             August 2006
+
+
+Full Copyright Statement
+
+   Copyright (C) The Internet Society (2006).
+
+   This document is subject to the rights, licenses and restrictions
+   contained in BCP 78, and except as set forth therein, the authors
+   retain all their rights.
+
+   This document and the information contained herein are provided on an
+   "AS IS" basis and THE CONTRIBUTOR, THE ORGANIZATION HE/SHE REPRESENTS
+   OR IS SPONSORED BY (IF ANY), THE INTERNET SOCIETY AND THE INTERNET
+   ENGINEERING TASK FORCE DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED,
+   INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE
+   INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED
+   WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+Intellectual Property
+
+   The IETF takes no position regarding the validity or scope of any
+   Intellectual Property Rights or other rights that might be claimed to
+   pertain to the implementation or use of the technology described in
+   this document or the extent to which any license under such rights
+   might or might not be available; nor does it represent that it has
+   made any independent effort to identify any such rights.  Information
+   on the procedures with respect to rights in RFC documents can be
+   found in BCP 78 and BCP 79.
+
+   Copies of IPR disclosures made to the IETF Secretariat and any
+   assurances of licenses to be made available, or the result of an
+   attempt made to obtain a general license or permission for the use of
+   such proprietary rights by implementers or users of this
+   specification can be obtained from the IETF on-line IPR repository at
+   http://www.ietf.org/ipr.
+
+   The IETF invites any interested party to bring to its attention any
+   copyrights, patents or patent applications, or other proprietary
+   rights that may cover technology that may be required to implement
+   this standard.  Please address the information to the IETF at
+   ietf-ipr@ietf.org.
+
+Acknowledgement
+
+   Funding for the RFC Editor function is provided by the IETF
+   Administrative Support Activity (IASA).
+
+
+
+
+
+
+
+Zeilenga                    Standards Track                    [Page 11]
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc4870.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc4870.txt
new file mode 100644
index 000000000..55ba5e2e5
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc4870.txt
@@ -0,0 +1,2298 @@
+
+
+
+
+
+Network Working Group                                          M. Delany
+Request for Comments: 4870                                    Yahoo! Inc
+Obsoleted By: 4871                                              May 2007
+Category: Historic
+
+
+          Domain-Based Email Authentication Using Public Keys
+                   Advertised in the DNS (DomainKeys)
+
+Status of This Memo
+
+   This memo defines a Historic Document for the Internet community.  It
+   does not specify an Internet standard of any kind.  Distribution of
+   this memo is unlimited.
+
+Copyright Notice
+
+   Copyright (C) The IETF Trust (2007).
+
+Abstract
+
+   "DomainKeys" creates a domain-level authentication framework for
+   email by using public key technology and the DNS to prove the
+   provenance and contents of an email.
+
+   This document defines a framework for digitally signing email on a
+   per-domain basis.  The ultimate goal of this framework is to
+   unequivocally prove and protect identity while retaining the
+   semantics of Internet email as it is known today.
+
+   Proof and protection of email identity may assist in the global
+   control of "spam" and "phishing".
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Delany                          Historic                        [Page 1]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+Table of Contents
+
+   1. Introduction ....................................................3
+      1.1. Lack of Authentication Is Damaging Internet Email ..........3
+      1.2. Digitally Signing Email Creates Credible Domain
+           Authentication .............................................4
+      1.3. Public Keys in the DNS .....................................4
+      1.4. Initial Deployment Is Likely at the Border MTA .............5
+      1.5. Conveying Verification Results to MUAs .....................5
+      1.6. Technical Minutiae Are Not Completely Covered ..............5
+      1.7. Motivation .................................................6
+      1.8. Benefits of DomainKeys .....................................6
+      1.9. Definitions ................................................7
+      1.10. Requirements Notation .....................................8
+   2. DomainKeys Overview .............................................8
+   3. DomainKeys Detailed View ........................................8
+      3.1. Determining the Sending Address of an Email ................9
+      3.2. Retrieving the Public Key Given the Sending Domain ........10
+           3.2.1. Introducing "selectors" ............................10
+           3.2.2. Public Key Signing and Verification Algorithm ......11
+           3.2.3. Public key Representation in the DNS ...............13
+           3.2.4. Key Sizes ..........................................14
+      3.3. Storing the Signature in the Email Header .................15
+      3.4. Preparation of Email for Transit and Signing ..............17
+           3.4.1. Preparation for Transit ............................18
+           3.4.2. Canonicalization for Signing .......................18
+                  3.4.2.1. The "simple" Canonicalization Algorithm ...19
+                  3.4.2.2. The "nofws" Canonicalization Algorithm ....19
+      3.5. The Signing Process .......................................20
+           3.5.1. Identifying the Sending Domain .....................20
+           3.5.2. Determining Whether an Email Should Be Signed ......21
+           3.5.3. Selecting a Private Key and Corresponding
+                  Selector Information ...............................21
+           3.5.4. Calculating the Signature Value ....................21
+           3.5.5. Prepending the "DomainKey-Signature:" Header .......21
+      3.6. Policy Statement of Sending Domain ........................22
+      3.7. The Verification Process ..................................23
+           3.7.1. Presumption that Headers Are Not Reordered .........24
+           3.7.2. Verification Should Render a Binary Result .........24
+           3.7.3. Selecting the Most Appropriate
+                  "DomainKey-Signature:" Header ......................24
+           3.7.4. Retrieve the Public Key Based on the
+                  Signature Information ..............................26
+           3.7.5. Verify the Signature ...............................27
+           3.7.6. Retrieving Sending Domain Policy ...................27
+           3.7.7. Applying Local Policy ..............................27
+      3.8. Conveying Verification Results to MUAs ....................27
+
+
+
+
+Delany                          Historic                        [Page 2]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+   4. Example of Use .................................................29
+      4.1. The User Composes an Email ................................29
+      4.2. The Email Is Signed .......................................29
+      4.3. The Email Signature Is Verified ...........................30
+   5. Association with a Certificate Authority .......................31
+      5.1. The "DomainKey-X509:" Header ..............................31
+   6. Topics for Discussion ..........................................32
+      6.1. The Benefits of Selectors .................................32
+      6.2. Canonicalization of Email .................................33
+      6.3. Mailing Lists .............................................33
+      6.4. Roving Users ..............................................33
+   7. Security Considerations ........................................34
+      7.1. DNS .......................................................34
+           7.1.1. The DNS Is Not Currently Secure ....................34
+           7.1.2. DomainKeys Creates Additional DNS Load .............35
+      7.2. Key Management ............................................35
+      7.3. Implementation Risks ......................................35
+      7.4. Privacy Assumptions with Forwarding Addresses .............35
+      7.5. Cryptographic Processing Is Computationally Intensive .....36
+   8. The Trial ......................................................36
+      8.1. Goals .....................................................36
+      8.2. Results of Trial ..........................................37
+   9. Note to Implementors Regarding TXT Records .....................37
+   10. References ....................................................37
+      10.1. Normative References .....................................37
+      10.2. Informative References ...................................38
+      Appendix A - Syntax Rules for the Tag=Value Format .............39
+      Acknowledgments ................................................40
+
+1.  Introduction
+
+   This document proposes an authentication framework for email that
+   stores public keys in the DNS and digitally signs email on a domain
+   basis.  Separate documents discuss how this framework can be extended
+   to validate the delivery path of email as well as facilitate per-user
+   authentication.
+
+   The DomainKeys specification was a primary source from which the
+   DomainKeys Identified Mail [DKIM] specification has been derived.
+   The purpose in submitting this document is as an historical reference
+   for deployed implementations written prior to the DKIM specification.
+
+1.1.  Lack of Authentication Is Damaging Internet Email
+
+   Authentication of email is not currently widespread.  Not only is it
+   difficult to prove your own identity, it is impossible to prevent
+   others from abusing your identity.
+
+
+
+
+Delany                          Historic                        [Page 3]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+   While most email exchanges do not intrinsically need authentication
+   beyond context, it is the rampant abuse of identity by "spammers",
+   "phishers", and their criminal ilk that makes proof necessary.  In
+   other words, authentication is as much about protection as proof.
+
+   Importantly, the inability to authenticate email effectively
+   delegates much of the control of the disposition of inbound email to
+   the sender, since senders can trivially assume any email address.
+   Creating email authentication is the first step to returning
+   dispositional control of email to the recipient.
+
+   For the purposes of this document, authentication is seen from a user
+   perspective, and is intended to answer the question "who sent this
+   email?" where "who" is the email address the recipient sees and "this
+   email" is the content that the recipient sees.
+
+1.2.  Digitally Signing Email Creates Credible Domain Authentication
+
+   DomainKeys combines public key cryptography and the DNS to provide
+   credible domain-level authentication for email.
+
+   When an email claims to originate from a certain domain, DomainKeys
+   provides a mechanism by which the recipient system can credibly
+   determine that the email did in fact originate from a person or
+   system authorized to send email for that domain.
+
+   The authentication provided by DomainKeys works in a number of
+   scenarios in which other authentication systems fail or create
+   complex operational requirements.  These include the following:
+
+      o forwarded email
+
+      o distributed sending systems
+
+      o authorized third-party sending
+
+   This base definition of DomainKeys is intended to primarily enable
+   domain-level authenticity.  Whether a given message is really sent by
+   the purported user within the domain is outside the scope of the base
+   definition.  Having said that, this specification includes the
+   possibility that some domains may wish to delegate fine-grained
+   authentication to individual users.
+
+1.3.  Public Keys in the DNS
+
+   DomainKeys differs from traditional hierarchical public key systems
+   in that it leverages the DNS for public key management, placing
+   complete and direct control of key generation and management with the
+
+
+
+Delany                          Historic                        [Page 4]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+   owner of the domain.  That is, if you have control over the DNS for a
+   given domain, you have control over your DomainKeys for that domain.
+
+   The DNS is proposed as the initial mechanism for publishing public
+   keys.  DomainKeys is specifically designed to be extensible to other
+   key-fetching services as they become available.
+
+1.4.  Initial Deployment Is Likely at the Border MTA
+
+   For practical reasons, it is expected that initial implementations of
+   DomainKeys will be deployed on Mail Transfer Agents (MTAs) that
+   accept or relay email across administrative or organizational
+   boundaries.  There are numerous advantages to deployment at the
+   border MTA, including:
+
+      o  a reduction in the number of MTAs that have to be changed to
+         support an implementation of DomainKeys
+
+      o  a reduction in the number of MTAs involved in transmitting the
+         email between a signing system and a verifying system, thus
+         reducing the number of places that can make accidental changes
+         to the contents
+
+      o  removing the need to implement DomainKeys within an internal
+         email network.
+
+   However, there is no necessity to deploy DomainKeys at the border as
+   signing and verifying can effectively occur anywhere from the border
+   MTA right back to the Mail User Agent (MUA).  In particular, the best
+   place to sign an email for many domains is likely to be at the point
+   of SUBMISSION where the sender is often authenticated through SMTP
+   AUTH or other identifying mechanisms.
+
+1.5.  Conveying Verification Results to MUAs
+
+   It follows that testing the authenticity of an email results in some
+   action based on the results of the test.  Oftentimes, the action is
+   to notify the MUA in some way -- typically via a header line.
+
+   The "Domainkey-Status:" header is defined in this specification for
+   recording authentication results in the email.
+
+1.6.  Technical Minutiae Are Not Completely Covered
+
+   The intent of this specification is to communicate the fundamental
+   characteristics of DomainKeys for an implementor.  However, some
+   aspects are derived from the functionality of the openssl command
+   [OPENSSL] and, rather than duplicate that documentation, implementors
+
+
+
+Delany                          Historic                        [Page 5]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+   are expected to understand the mechanics of the openssl command,
+   sufficient to complete the implementation.
+
+1.7.  Motivation
+
+   The motivation for DomainKeys is to define a simple, cheap, and
+   "sufficiently effective" mechanism by which domain owners can control
+   who has authority to send email using their domain.  To this end, the
+   designers of DomainKeys set out to build a framework that:
+
+      o  is transparent and compatible with the existing email
+         infrastructure
+
+      o  requires no new infrastructure
+
+      o  can be implemented independently of clients in order to reduce
+         deployment time
+
+      o  does not require the use of a central certificate authority
+         that might impose fees for certificates or introduce delays to
+         deployment
+
+      o  can be deployed incrementally
+
+   While we believe that DomainKeys meets these criteria, it is by no
+   means a perfect solution.  The current Internet imposes considerable
+   compromises on any similar scheme, and readers should be careful not
+   to misinterpret the information provided in this document to imply
+   that DomainKeys makes stronger credibility statements than it is able
+   to do.
+
+1.8.  Benefits of DomainKeys
+
+   As the reader will discover, DomainKeys is solely an authentication
+   system.  It is not a magic bullet for spam, nor is it an
+   authorization system, a reputation system, a certification system, or
+   a trust system.
+
+   However, a strong authentication system such as DomainKeys creates an
+   unimpeachable framework within which comprehensive authorization
+   systems, reputations systems, and their ilk can be developed.
+
+
+
+
+
+
+
+
+
+
+Delany                          Historic                        [Page 6]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+1.9.  Definitions
+
+   With reference to the following sample email:
+
+   Line   Data
+   Number Bytes               Content
+   ----   --- --------------------------------------------
+     01    46 From: "Joe SixPack" <joe@football.example.com>
+     02    40 To: "Suzie Q" <suzie@shopping.example.net>
+     03    25 Subject: Is dinner ready?
+     04    43 Date: Fri, 11 Jul 2003 21:00:37 -0700 (PDT)
+     05    40 Comment: This comment has a continuation
+     06    51   because this line begins with folding white space
+     07    60 Message-ID: <20030712040037.46341@football.example.com>
+     08    00
+     09    03 Hi.
+     10    00
+     11    37 We lost the game. Are you hungry yet?
+     12    00
+     13    04 Joe.
+     14    00
+     15    00
+
+   Line 01 is the first line of the email and the first line of the
+         headers.
+
+   Lines 05 and 06 constitute the "Comment:" header.
+
+   Line 06 is a continuation header line.
+
+   Line 07 is the last line of the headers.
+
+   Line 08 is the empty line that separates the header from the body.
+
+   Line 09 is the first line of the body.
+
+   Lines 10, 12, 14, and 15 are empty lines.
+
+   Line 13 is the last non-empty line of the email.
+
+   Line 15 is the last line of the body and the last line of the email.
+
+   Lines 01 to 15 constitute the complete email.
+
+   Line 01 is earlier than line 02, and line 02 is later than line 01.
+
+
+
+
+
+
+Delany                          Historic                        [Page 7]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+1.10.  Requirements Notation
+
+   This document occasionally uses terms that appear in capital letters.
+   When the terms "MUST", "SHOULD", "RECOMMENDED", "MUST NOT", "SHOULD
+   NOT", and "MAY" appear capitalized, they are being used to indicate
+   particular requirements of this specification.  A discussion of the
+   meanings of these terms appears in [RFC2119].
+
+2.  DomainKeys Overview
+
+   Under DomainKeys, a domain owner generates one or more private/public
+   key pairs that will be used to sign messages originating from that
+   domain.  The domain owner places the public key in his domain
+   namespace (i.e., in a DNS record associated with that domain), and
+   makes the private key available to the outbound email system.  When
+   an email is submitted by an authorized user of that domain, the email
+   system uses the private key to digitally sign the email associated
+   with the sending domain.  The signature is added as a header to the
+   email, and the message is transferred to its recipients in the usual
+   way.
+
+   When a message is received with a DomainKey signature header, the
+   receiving system can verify the signature as follows:
+
+      1. Extract the signature and claimed sending domain from the
+         email.
+
+      2. Fetch the public key from the claimed sending domain namespace.
+
+      3. Use public key to determine whether the signature of the email
+         has been generated with the corresponding private key, and thus
+         whether the email was sent with the authority of the claimed
+         sending domain.
+
+   In the event that an email arrives without a signature or when the
+   signature verification fails, the receiving system retrieves the
+   policy of the claimed sending domain to ascertain the preferred
+   disposition of such email.
+
+   Armed with this information, the recipient system can apply local
+   policy based on the results of the signature test.
+
+3.  DomainKeys Detailed View
+
+   This section discusses the specifics of DomainKeys that are needed to
+   create interoperable implementations.  This section answers the
+   following questions:
+
+
+
+
+Delany                          Historic                        [Page 8]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+      Given an email, how is the sending domain determined?
+
+      How is the public key retrieved for a sending domain?
+
+      As email transits the email system, it can potentially go through
+      a number of changes.  Which parts of the email are included in the
+      signature and how are they protected from such transformations?
+
+      How is the signature represented in the email?
+
+      If a signature is not present, or a verification fails, how does
+      the recipient determine the policy intent of the sending domain?
+
+      Finally, on verifying the authenticity of an email, how is that
+      result conveyed to participating MUAs?
+
+   While there are many alternative design choices, most lead to
+   comparable functionality.  The overriding selection criteria used to
+   choose among the alternatives are as follows:
+
+      o  use deployed technology whenever possible
+
+      o  prefer ease of implementation
+
+      o  avoid trading risk for excessive flexibility or
+         interoperability
+
+      o  include basic flexibility
+
+   Adherence to these criteria implies that some existing email
+   implementations will require changes to participate in DomainKeys.
+   Ultimately, some hard choices need to be made regarding which
+   requirements are more important.
+
+3.1.  Determining the Sending Address of an Email
+
+   The goal of DomainKeys is to give the recipient confidence that the
+   email originated from the claimed sender.  As with much of Internet
+   email, agreement over what constitutes the "sender" is no easy
+   matter.  Forwarding systems and mailing lists add serious
+   complications to an overtly simple question.  From the point of view
+   of the recipient, the authenticity claim should be directed at the
+   domain most visible to the recipient.
+
+   In the first instance, the most visible address is clearly the RFC
+   2822 "From:" address [RFC2822].  Therefore, a conforming email MUST
+   contain a single "From:" header from which an email address with a
+   domain name can be extracted.
+
+
+
+Delany                          Historic                        [Page 9]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+   A conforming email MAY contain a single RFC 2822 "Sender:" header
+   from which an email address with a domain name can be extracted.
+
+   If the email has a valid "From:" and a valid "Sender:" header, then
+   the signer MUST use the sending address in the "Sender:" header.
+
+   If the email has a valid "From:" and no "Sender:" header, then the
+   signer MUST use the first sending address in the "From:" header.
+
+   In all other cases, a signer MUST NOT sign the email.  Implementors
+   should note that an email with a "Sender:" header and no "From:"
+   header MUST NOT be signed.
+
+   The domain name in the sending address constitutes the "sending
+   domain".
+
+3.2.  Retrieving the Public Key Given the Sending Domain
+
+   To avoid namespace conflicts, it is proposed that the DNS namespace
+   "_domainkey." be reserved within the sending domain for storing
+   public keys, e.g., if the sending domain is example.net, then the
+   public keys for that domain are stored in the _domainkey.example.net
+   namespace.
+
+3.2.1.  Introducing "selectors"
+
+   To support multiple concurrent public keys per sending domain, the
+   DNS namespace is further subdivided with "selectors".  Selectors are
+   arbitrary names below the "_domainkey." namespace.  A selector value
+   and length MUST be legal in the DNS namespace and in email headers
+   with the additional provision that they cannot contain a semicolon.
+
+   Examples of namespaces using selectors are as follows:
+
+      "coolumbeach._domainkey.example.net"
+      "sebastopol._domainkey.example.net"
+      "reykjavik._domainkey.example.net"
+      "default._domainkey.example.net"
+
+   and
+
+      "2005.pao._domainkey.example.net"
+      "2005.sql._domainkey.example.net"
+      "2005.rhv._domainkey.example.net"
+
+   Periods are allowed in selectors and are to be treated as component
+   separators.  In the case of DNS queries, that means the period
+   defines subdomain boundaries.
+
+
+
+Delany                          Historic                       [Page 10]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+   The number of public keys and corresponding selectors for each domain
+   is determined by the domain owner.  Many domain owners will be
+   satisfied with just one selector, whereas administratively
+   distributed organizations may choose to manage disparate selectors
+   and key pairs in different regions, or on different email servers.
+
+   Beyond administrative convenience, selectors make it possible to
+   seamlessly replace public keys on a routine basis.  If a domain
+   wishes to change from using a public key associated with selector
+   "2005" to a public key associated with selector "2006", it merely
+   makes sure that both public keys are advertised in the DNS
+   concurrently for the transition period during which email may be in
+   transit prior to verification.  At the start of the transition
+   period, the outbound email servers are configured to sign with the
+   "2006" private key.  At the end of the transition period, the "2005"
+   public key is removed from the DNS.
+
+   While some domains may wish to make selector values well known,
+   others will want to take care not to allocate selector names in a way
+   that allows harvesting of data by outside parties.  For example, if
+   per-user keys are issued, the domain owner will need to make the
+   decision as to whether to make this selector associated directly with
+   the user name or make it some unassociated random value, such as the
+   fingerprint of the public key.
+
+3.2.2.  Public Key Signing and Verification Algorithm
+
+   The default signature is an RSA signed SHA1 digest of the complete
+   email.
+
+   For ease of explanation, the openssl command is used throughout this
+   document to describe the mechanism by which keys and signatures are
+   managed.
+
+   One way to generate a 768-bit private key suitable for DomainKeys is
+   to use openssl like this:
+
+   $ openssl genrsa -out rsa.private 768
+
+
+
+
+
+
+
+
+
+
+
+
+
+Delany                          Historic                       [Page 11]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+   which results in the file rsa.private containing the key information
+   similar to this:
+
+   -----BEGIN RSA PRIVATE KEY-----
+   MIIByQIBAAJhAKJ2lzDLZ8XlVambQfMXn3LRGKOD5o6lMIgulclWjZwP56LRqdg5
+   ZX15bhc/GsvW8xW/R5Sh1NnkJNyL/cqY1a+GzzL47t7EXzVc+nRLWT1kwTvFNGIo
+   AUsFUq+J6+OprwIDAQABAmBOX0UaLdWWusYzNol++nNZ0RLAtr1/LKMX3tk1MkLH
+   +Ug13EzB2RZjjDOWlUOY98yxW9/hX05Uc9V5MPo+q2Lzg8wBtyRLqlORd7pfxYCn
+   Kapi2RPMcR1CxEJdXOkLCFECMQDTO0fzuShRvL8q0m5sitIHlLA/L+0+r9KaSRM/
+   3WQrmUpV+fAC3C31XGjhHv2EuAkCMQDE5U2nP2ZWVlSbxOKBqX724amoL7rrkUew
+   ti9TEjfaBndGKF2yYF7/+g53ZowRkfcCME/xOJr58VN17pejSl1T8Icj88wGNHCs
+   FDWGAH4EKNwDSMnfLMG4WMBqd9rzYpkvGQIwLhAHDq2CX4hq2tZAt1zT2yYH7tTb
+   weiHAQxeHe0RK+x/UuZ2pRhuoSv63mwbMLEZAjAP2vy6Yn+f9SKw2mKuj1zLjEhG
+   6ppw+nKD50ncnPoP322UMxVNG4Eah0GYJ4DLP0U=
+   -----END RSA PRIVATE KEY-----
+
+   Once a private key has been generated, the openssl command can be
+   used to sign an appropriately prepared email, like this:
+
+   $ openssl dgst -sign rsa.private -sha1 <input.file
+
+   which results in signature data similar to this when represented in
+   Base64 [BASE64] format:
+
+   aoiDeX42BB/gP4ScqTdIQJcpAObYr+54yvctqc4rSEFYby9+omKD3pJ/TVxATeTz
+   msybuW3WZiamb+mvn7f3rhmnozHJ0yORQbnn4qJQhPbbPbWEQKW09AMJbyz/0lsl
+
+   How this signature is added to the email is discussed later in this
+   document.
+
+   To extract the public key component from the private key, use openssl
+   like this:
+
+   $ openssl rsa -in rsa.private -out rsa.public -pubout -outform PEM
+
+   which results in the file rsa.public containing the key information
+   similar to this:
+
+   -----BEGIN PUBLIC KEY-----
+   MHwwDQYJKoZIhvcNAQEBBQADawAwaAJhAKJ2lzDLZ8XlVambQfMXn3LRGKOD5o6l
+   MIgulclWjZwP56LRqdg5ZX15bhc/GsvW8xW/R5Sh1NnkJNyL/cqY1a+GzzL47t7E
+   XzVc+nRLWT1kwTvFNGIoAUsFUq+J6+OprwIDAQAB
+   -----END PUBLIC KEY-----
+
+   This public key data is placed in the DNS.
+
+
+
+
+
+
+Delany                          Historic                       [Page 12]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+   With the signature, canonical email contents and public key, a
+   verifying system can test the validity of the signature.  The openssl
+   invocation to verify a signature looks like this:
+
+ $ openssl dgst -verify rsa.public -sha1 -signature sig.file <input.file
+
+3.2.3.  Public key Representation in the DNS
+
+   There is currently no standard method defined for storing public keys
+   in the DNS.  As an interim measure, the public key is stored as a TXT
+   record derived from a Privacy-Enhanced Mail (PEM) format [PEM], that
+   is, as a Base64 representation of a DER encoded key.  Here is an
+   example of a 768-bit RSA key in PEM form:
+
+   -----BEGIN PUBLIC KEY-----
+   MHwwDQYJKoZIhvcNAQEBBQADawAwaAJhAKJ2lzDLZ8XlVambQfMXn3LRGKOD5o6l
+   MIgulclWjZwP56LRqdg5ZX15bhc/GsvW8xW/R5Sh1NnkJNyL/cqY1a+GzzL47t7E
+   XzVc+nRLWT1kwTvFNGIoAUsFUq+J6+OprwIDAQAB
+   -----END PUBLIC KEY-----
+
+   To save scarce DNS packet space and aid extensibility, the PEM
+   wrapping MUST be removed and the remaining public key data along with
+   other attributes relevant to DomainKeys functionality are stored as
+   tag=value pairs separated by semicolons, for example, as in the
+   following:
+
+   brisbane._domainkey IN TXT "g=; k=rsa; p=MHww ... IDAQAB"
+
+   Verifiers MUST support key sizes of 512, 768, 1024, 1536 and 2048
+   bits.  Signers MUST support at least one of the verifier supported
+   key sizes.
+
+   The current valid tags are as follows:
+
+      g = granularity of the key.  If present with a non-zero length
+          value, this value MUST exactly match the local part of the
+          sending address.  This tag is optional.
+
+          The intent of this tag is to constrain which sending address
+          can legitimately use this selector.  An email with a sending
+          address that does not match the value of this tag constitutes
+          a failed verification.
+
+      k = key type (rsa is the default).  Signers and verifiers MUST
+          support the 'rsa' key type.  This tag is optional.
+
+
+
+
+
+
+Delany                          Historic                       [Page 13]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+      n = Notes that may be of interest to a human.  No interpretation
+          is made by any program.  This tag is optional.
+
+      p = public key data, encoded as a Base64 string.  An empty value
+          means that this public key has been revoked.  This tag MUST be
+          present.
+
+      t = a set of flags that define boolean attributes.  Valid
+          attributes are as follows:
+
+          y = testing mode.  This domain is testing DomainKeys and
+              unverified email MUST NOT be treated differently from
+              verified email.  Recipient systems MAY wish to track
+              testing mode results to assist the sender.
+
+          This tag is optional.
+
+   (Syntax rules for the tag=value format are discussed in Appendix A.)
+
+   Keeping the size of the TXT record to a minimum is important as some
+   implementations of content and caching DNS servers are reported to
+   have problems supporting large TXT records.  In the example above,
+   the encoding generates a 182-byte TXT record.  That this encoding is
+   less than 512 bytes is of particular significance as it fits within a
+   single UDP response packet.  With careful selection of query values,
+   a TXT record can accommodate a 2048 bit key.
+
+   For the same size restriction reason, the "n" tag SHOULD be used
+   sparingly.  The most likely use of this tag is to convey a reason why
+   a public key might have been revoked.  In this case, set the "n" tag
+   to the explanation and remove the public key value from the "p" tag.
+
+3.2.4.  Key Sizes
+
+   Selecting appropriate key sizes is a trade-off between cost,
+   performance, and risk.  This specification does not define either
+   minimum or maximum key sizes -- that decision is a matter for each
+   domain owner.
+
+   Factors that should influence this decision include the following:
+
+      o  the practical constraint that a 2048-bit key is the largest key
+         that fits within a 512-byte DNS UDP response packet
+
+      o  larger keys impose higher CPU costs to verify and sign email
+
+      o  keys can be replaced on a regular basis; thus, their lifetime
+         can be relatively short
+
+
+
+Delany                          Historic                       [Page 14]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+      o  the security goals of this specification are modest compared to
+         typical goals of public key systems
+
+   In general, it is expected that most domain owners will use keys that
+   are no larger than 1024 bits.
+
+3.3.  Storing the Signature in the Email Header
+
+   The signature of the email is stored in the "DomainKey-Signature:"
+   header.  This header contains all of the signature and key-fetching
+   data.
+
+   When generating the signed email, the "DomainKey-Signature:" header
+   MUST precede the original email headers presented to the signature
+   algorithm.
+
+   The "DomainKey-Signature:" header is not included in the signature
+   calculation.
+
+   For extensibility, the "DomainKey-Signature:" header contains
+   tag=value pairs separated by semicolons, for example, as in the
+   following:
+
+   DomainKey-Signature: a=rsa-sha1; s=brisbane; d=example.net;
+     q=dns; c=simple
+
+   The current valid tags are as follows:
+
+      a = The algorithm used to generate the signature.  The default is
+          "rsa-sha1", an RSA signed SHA1 digest.  Signers and verifiers
+          MUST support "rsa-sha1".
+
+      b = The signature data, encoded as a Base64 string.  This tag MUST
+          be present.
+
+          Whitespace is ignored in this value and MUST be removed when
+          reassembling the original signature.  This is another way of
+          saying that the signing process can safely insert folding
+          whitespace in this value to conform to line-length limits.
+
+      c = Canonicalization algorithm.  The method by which the headers
+          and content are prepared for presentation to the signing
+          algorithm.  This tag MUST be present.  Verifiers MUST support
+          "simple" and "nofws".  Signers MUST support at least one of
+          the verifier-supported algorithms.
+
+
+
+
+
+
+Delany                          Historic                       [Page 15]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+      d = The domain name of the signing domain.  This tag MUST be
+          present.  In conjunction with the selector tag, this domain
+          forms the basis of the public key query.  The value in this
+          tag MUST match the domain of the sending email address or MUST
+          be one of the parent domains of the sending email address.
+          Domain name comparison is case insensitive.
+
+             The matching process for this tag is called subdomain
+             matching, as the sending email address must be the domain
+             or subdomain of the value.
+
+      h = A colon-separated list of header field names that identify the
+          headers presented to the signing algorithm.  If present, the
+          value MUST contain the complete list of headers in the order
+          presented to the signing algorithm.
+
+          If present, this tag MUST include the header that was used to
+          identify the sending domain, i.e., the "From:" or "Sender:"
+          header; thus, this tag can never contain an empty value.
+
+          If this tag is not present, all headers subsequent to the
+          signature header are included in the order found in the email.
+
+          A verifier MUST support this tag.  A signer MAY support this
+          tag.  If a signer generates this tag, it MUST include all
+          email headers in the original email, as a verifier MAY remove
+          or render suspicious, lines that are not included in the
+          signature.
+
+          In the presence of duplicate headers, a signer may include
+          duplicate entries in the list of headers in this tag.  If a
+          header is included in this list, a verifier must include all
+          occurrences of that header, subsequent to the "DomainKey-
+          Signature:" header in the verification.
+
+          If a header identified in this list is not found after the
+          "DomainKey-Signature:" header in the verification process, a
+          verifier may "look" for a matching header prior to the
+          "DomainKey-Signature:" header; however, signers should not
+          rely on this as early experience suggests that most verifiers
+          do not try to "look" back before the "DomainKey-Signature:"
+          header.
+
+          Whitespace is ignored in this value and header comparisons are
+          case insensitive.
+
+
+
+
+
+
+Delany                          Historic                       [Page 16]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+      q = The query method used to retrieve the public key.  This tag
+          MUST be present.  Currently, the only valid value is "dns",
+          which defines the DNS lookup algorithm described in this
+          document.  Verifiers and signers MUST support "dns".
+
+      s = The selector used to form the query for the public key.  This
+          tag MUST be present.  In the DNS query type, this value is
+          prepended to the "_domainkey." namespace of the sending
+          domain.
+
+   (Syntax rules for the tag=value format are discussed in Appendix A.)
+
+   Here is an example of a signature header spread across multiple
+   continuation lines:
+
+      DomainKey-Signature: a=rsa-sha1; s=brisbane; d=example.net;
+       c=simple; q=dns;
+       b=dzdVyOfAKCdLXdJOc9G2q8LoXSlEniSbav+yuU4zGeeruD00lszZ
+         VoG4ZHRNiYzR;
+
+   Extreme care must be taken to ensure that any new tags added to this
+   header are defined and used solely for the purpose of fetching and
+   verifying the signature.  Any semantics beyond verification cannot be
+   trusted, as this header is not protected by the signature.
+
+   If additional semantics not pertaining directly to signature
+   verification are required, they must only be added as subsequent
+   headers protected by the signature.  Semantic additions might include
+   audit information describing the initial submission.
+
+3.4.  Preparation of Email for Transit and Signing
+
+   The fundamental purpose of a cryptographic signature is to ensure
+   that the signed content matches the contents presented for
+   verification.  However, unlike just about every other Internet
+   protocol, the email content is routinely modified as it enters and
+   transits the email system.
+
+   Fortunately most of the modifications typically made to email can be
+   predicted and consequently accounted for when signing and verifying.
+
+   To maximize the chance of a successful verification, submitted email
+   should be prepared for transport prior to signing, and the data
+   presented to the signing algorithm is canonicalized to exclude the
+   most common and minor changes made to email.
+
+
+
+
+
+
+Delany                          Historic                       [Page 17]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+3.4.1.  Preparation for Transit
+
+   The SMTP protocol defines a number of potential limitations to email
+   transport, particularly pertaining to line lengths and 8-bit content.
+
+   While the editor has observed that most modern SMTP implementations
+   accept 8-bit email and long lines, some implementations still do not.
+   Consequently, a DomainKeys implementation SHOULD prepare an email to
+   be suitable for the lowest common denominator of SMTP prior to
+   presenting the email for signing.
+
+3.4.2.  Canonicalization for Signing
+
+   DomainKeys is initially expected to be deployed at, or close to, the
+   email borders of an organization rather than in MUAs or SUBMISSION
+   servers.  In other words, the signing and verifying algorithms
+   normally apply after an email has been packaged, transmogrified, and
+   generally prepared for transmission across the Internet via SMTP and,
+   thus the likelihood of the email being subsequently modified is
+   reduced.
+
+   Nonetheless, empirical evidence suggests that some mail servers and
+   relay systems modify email in transit, potentially invalidating a
+   signature.
+
+   There are two competing perspectives on such modifications.  For most
+   senders, mild modification of email is immaterial to the
+   authentication status of the email.  For such senders, a
+   canonicalization algorithm that survives modest in-transit
+   modification is preferred.
+
+   For other senders however, any modification of the email - however
+   minor -- results in a desire for the authentication to fail.  In
+   other words, such senders do not want a modified email to be seen as
+   being authorized by them.  These senders prefer a canonicalization
+   algorithm that does not tolerate in-transit modification of the
+   signed email.
+
+   To satisfy both requirements, two canonicalization algorithms are
+   defined.  A "simple" algorithm that tolerates almost no modification
+   and a "nofws" algorithm that tolerates common modifications as
+   whitespace replacement and header line rewrapping.
+
+   A sender may choose either algorithm when signing an email.  A
+   verifier MUST be able to process email using either algorithm.
+
+   Either algorithm can be used in conjunction with the "h" tag in the
+   "DomainKey-Signature:" header.
+
+
+
+Delany                          Historic                       [Page 18]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+   Canonicalization simply prepares the email for the signing or
+   verification algorithm.  It does not change the transmitted data in
+   any way.
+
+3.4.2.1.  The "simple" Canonicalization Algorithm
+
+   o  Each line of the email is presented to the signing algorithm in
+      the order it occurs in the complete email, from the first line of
+      the headers to the last line of the body.
+
+   o  If the "h" tag is used, only those header lines (and their
+      continuation lines if any) added to the "h" tag list are included.
+
+   o  The "h" tag only constrains header lines.  It has no bearing on
+      body lines, which are always included.
+
+   o  Remove any local line terminator.
+
+   o  Append CRLF to the resulting line.
+
+   o  All trailing empty lines are ignored.  An empty line is a line of
+      zero length after removal of the local line terminator.
+
+      If the body consists entirely of empty lines, then the header/body
+      line is similarly ignored.
+
+3.4.2.2.  The "nofws" Canonicalization Algorithm
+
+   The "No Folding Whitespace" algorithm (nofws) is more complicated
+   than the "simple" algorithm for two reasons; folding whitespace is
+   removed from all lines and header continuation lines are unwrapped.
+
+      o  Each line of the email is presented to the signing algorithm in
+         the order it occurs in the complete email, from the first line
+         of the headers to the last line of the body.
+
+      o  Header continuation lines are unwrapped so that header lines
+         are processed as a single line.
+
+      o  If the "h" tag is used, only those header lines (and their
+         continuation lines if any) added to the "h" tag list are
+         included.
+
+      o  The "h" tag only constrains header lines.  It has no bearing on
+         body lines, which are always included.
+
+
+
+
+
+
+Delany                          Historic                       [Page 19]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+      o  For each line in the email, remove all folding whitespace
+         characters.  Folding whitespace is defined in RFC 2822 as being
+         the decimal ASCII values 9 (HTAB), 10 (NL), 13 (CR), and 32
+         (SP).
+
+      o  Append CRLF to the resulting line.
+
+      o  Trailing empty lines are ignored.  An empty line is a line of
+         zero length after removal of the local line terminator.  Note
+         that the test for an empty line occurs after removing all
+         folding whitespace characters.
+
+         If the body consists entirely of empty lines, then the
+         header/body line is similarly ignored.
+
+3.5.  The Signing Process
+
+   The previous sections defined the various components and mechanisms
+   needed to sign an email.  This section brings those together to
+   define the complete process of signing an email.
+
+   A signer MUST only sign email from submissions that are authorized to
+   use the sending address.
+
+   Once authorization of the submission has been determined, the signing
+   process consists of the following steps:
+
+      o  identifying the sending domain
+
+      o  determining if an email should be signed
+
+      o  selecting a private key and corresponding selector information
+
+      o  calculating the signature value
+
+      o  prepending the "DomainKey-Signature:" header
+
+   If an email cannot be signed for some reason, it is a local policy
+   decision as to what to do with that email.
+
+3.5.1.  Identifying the Sending Domain
+
+   The sending domain is determined by finding the email address in the
+   "Sender:" header, or, if the "Sender:" header is not present, the
+   first email address of the "From:" header is used to determine the
+   sending domain.
+
+
+
+
+
+Delany                          Historic                       [Page 20]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+   If the email has an invalid "From:" or an invalid "Sender:" header,
+   it MUST NOT be signed.
+
+   If the signer adds the "h" tag to the "DomainKey-Signature:" header,
+   that tag MUST include the header that was used to determine the
+   sending domain.
+
+3.5.2.  Determining Whether an Email Should Be Signed
+
+   A signer can obviously only sign email for domains for which it has a
+   private key and the necessary knowledge of the corresponding public
+   key and selector information, however there are a number of other
+   reasons why a signer may choose not to sign an email.
+
+   A signer MUST NOT sign an email if the email submission is not
+   authorized to use the sending domain.
+
+   A signer MUST NOT sign an email that already contains a "DomainKey-
+   Signature:" header unless a "Sender:" header has been added that was
+   not included in the original signature.  The most obvious case where
+   this occurs is with mailing lists.
+
+   A signer SHOULD NOT remove an existing "DomainKey-Signature:" header.
+
+3.5.3.  Selecting a Private Key and Corresponding Selector Information
+
+   This specification does not define the basis by which a signer should
+   choose which private key and selector information to use.  Currently,
+   all selectors are equal as far as this specification is concerned, so
+   the decision should largely be a matter of administrative
+   convenience.
+
+3.5.4.  Calculating the Signature Value
+
+   The signer MUST use one of the defined canonicalization algorithms to
+   present the email to the signing algorithm.  Canonicalization is only
+   used to prepare the email for signing.  It does not affect the
+   transmitted email in any way.
+
+   To avoid possible ambiguity, a signing server may choose to remove
+   any pre-existing "DomainKey-Status:" headers from the email prior to
+   preparation for signing and transmission.
+
+3.5.5.  Prepending the "DomainKey-Signature:" Header
+
+   The final step in the signing process is that the signer MUST prepend
+   the "DomainKey-Signature:" header prior to continuing with the
+   process of transmitting the email.
+
+
+
+Delany                          Historic                       [Page 21]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+3.6.  Policy Statement of Sending Domain
+
+   While the disposition of inbound email is ultimately a matter for the
+   receiving system, the introduction of authentication in email creates
+   a need for the sender domain to indicate their signing policy and
+   preferred disposition of unsigned email, in particular, whether a
+   domain is participating in DomainKeys, whether it is testing, and
+   whether it signs all outbound email.
+
+   The sending domain policy is very simple and is expressed in the
+   _domainkey TXT record in the DNS of the sending domain.  For example,
+   in the example.com domain, the record is called
+   _domainkey.example.com.
+
+   The contents of this TXT record are stored as tag=value pairs
+   separated by semicolons, for example, as in the following:
+
+   _domainkey   IN TXT "t=y; o=-; n=notes; r=emailAddress"
+
+   All tags are optional.  The current valid tags are as follows:
+
+      n = Notes that may be of interest to a human.  No interpretation
+          is made by any program.
+
+      o = Outbound Signing policy ("-" means that this domain signs all
+          email; "~" is the default and means that this domain may sign
+          some email with DomainKeys).
+
+      r = A reporting email address.  If present, this defines the email
+          address where invalid verification results are reported.  This
+          tag is primarily intended for early implementers -- the
+          content and frequency of the reports will be defined in a
+          separate document.
+
+      t = a set of flags that define boolean attributes.  Valid
+          attributes are as follows:
+
+          y = testing mode.  This domain is testing DomainKeys, and
+              unverified email MUST NOT be treated differently from
+              verified email.  Recipient systems MAY wish to track
+              testing mode results to assist the sender).
+
+          Note that testing mode cannot be turned off by this tag;
+          thus, policy cannot revert the testing mode setting of a
+          Selector.
+
+          This tag is optional.
+
+
+
+
+Delany                          Historic                       [Page 22]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+   (Syntax rules for the tag=value format are discussed in Appendix A.)
+
+   Recipient systems SHOULD only retrieve this policy TXT record to
+   determine policy when an email fails to verify or does not include a
+   signature.  Recipient systems SHOULD not retrieve this policy TXT
+   record for email that successfully verifies.  Note that "testing
+   mode" SHOULD also be in the Selector TXT record if the domain owner
+   is running a DomainKeys test.
+
+   If the policy TXT record does not exist, recipient systems MUST
+   assume the default values.
+
+   There is an important implication when a domain states that it signs
+   all email with the "o=-" setting, namely that the sending domain
+   prefers that the recipient system treat unsigned mail with a great
+   deal of suspicion.  Such suspicion could reasonably extend to
+   rejecting such email.  A verifying system MAY reject unverified email
+   if a domain policy indicates that it signs all email.
+
+   Of course, nothing compels a recipient MTA to abide by the policy of
+   the sender.  In fact, during the trial, a sending domain would want
+   to be very certain about setting this policy, as processing by
+   recipient MTAs may be unpredictable.  Nonetheless, a domain that
+   states that it signs all email MUST expect that unverified email may
+   be rejected by some receiving MTAs.
+
+3.7.  The Verification Process
+
+   There is no defined or recommended limit on the lifetime of a
+   selector and corresponding public key; however, it is recommended
+   that verification occur in a timely manner with the most timely place
+   being during acceptance or local delivery by the MTA.
+
+   Verifying a signature consists of the following three steps:
+
+      o  extract signature information from the headers
+
+      o  retrieve the public key based on the signature information
+
+      o  check that the signature verifies against the contents
+
+   In the event that any of these steps fails, the sending domain policy
+   is ascertained to assist in applying local policy.
+
+
+
+
+
+
+
+
+Delany                          Historic                       [Page 23]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+3.7.1.  Presumption that Headers Are Not Reordered
+
+   Indications from deployment of previous versions of this
+   specification suggest that the canonicalization algorithms in
+   conjunction with the "h" tag in the "DomainKey-Signature:" header
+   allows most email to cryptographically survive intact between signing
+   and verifying.
+
+   The one assumption that most of the early deployments make is that
+   the headers included in the signature are not reordered prior to
+   verification.
+
+   While nothing in this specification precludes a verifier from
+   "looking" for a header that may have been reordered, including being
+   moved to a position prior to the "DomainKey-Signature:" header, such
+   reordered email is unlikely to be successfully verified by most
+   implementations.
+
+   A second consequence of this assumption -- particularly in the
+   presence of multiple "DomainKey-Signature:" headers -- is that the
+   first "DomainKey-Signature:" header in the email was the last
+   signature added to the email and thus is the one to be verified.
+
+3.7.2.  Verification Should Render a Binary Result
+
+   While the symptoms of a failed verification are obvious -- the
+   signature doesn't verify -- establishing the exact cause can be more
+   difficult.  If a selector cannot be found, is that because the
+   selector has been removed, or was the value changed somehow in
+   transit? If the signature line is missing, is that because it was
+   never there, or was it removed by an overzealous filter?
+
+   For diagnostic purposes, the exact reason why the verification fails
+   SHOULD be recorded; however, in terms of presentation to the end
+   user, the result SHOULD be presented as a simple binary result:
+   either the email is verified or it is not.  If the email cannot be
+   verified, then it SHOULD be rendered the same as all unverified email
+   regardless of whether or not it looks like it was signed.
+
+3.7.3.  Selecting the Most Appropriate "DomainKey-Signature:" Header
+
+   In most cases, a signed email is expected to have just one signature
+   -- that is, one "DomainKey-Signature:" header.  However, it is
+   entirely possible that an email can contain multiple signatures.  In
+   such cases, a verifier MUST find the most appropriate signature to
+   use and SHOULD ignore all other signatures.
+
+
+
+
+
+Delany                          Historic                       [Page 24]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+   The process of finding the most appropriate signature consists of the
+   following "best match" rules.  The rules are to be evaluated in
+   order.
+
+      1. Selecting the sending domain
+
+         If the email contains a "Sender:" header, the sending domain is
+         extracted from the "Sender:" address.  If this extraction
+         fails, the email SHALL fail verification.
+
+         If no "Sender:" header is present, the sending domain is
+         extracted from the first address of the "From:" header.  If
+         this extraction fails, the email SHALL fail verification.
+
+      2. Domain matching
+
+         A signature can only match if the sending domain matches the
+         "d" tag domain -- according to the "d" tag subdomain matching
+         rules.
+
+      3. "h" tag matching
+
+         If the signature contains the "h" tag list of headers, that
+         list must include the header used to extract the sending domain
+         in rule 1, above.
+
+      4. Most secure signing algorithm
+
+         While it is not yet the case, in the event that additional
+         algorithms are added to this specification, a verifier MUST use
+         the signature that contains the most secure algorithm as
+         defined by the future specification.  For current
+         implementations, that means verifiers MUST ignore signatures
+         that are coded with an unrecognized signing algorithm.
+
+      5. Earlier signatures are preferred
+
+         If multiple signatures are equal as far as these rules apply,
+         the signature from the earlier header MUST be used in
+         preference to later signature headers.
+
+   Implementors MUST meticulously validate the format and values in the
+   "DomainKey-Signature:" header; any inconsistency or unexpected values
+   MUST result in ignoring that header.  Being "liberal in what you
+   accept" is definitely a bad strategy in this security context.
+
+
+
+
+
+
+Delany                          Historic                       [Page 25]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+   In all cases, if a verification fails, the "DomainKey-Status:" header
+   SHOULD be generated and include a message to help explain the reason
+   for failure.
+
+3.7.4.  Retrieve the Public Key Based on the Signature Information
+
+   The public key is needed to complete the verification process.  The
+   process of retrieving the public key depends on the query type as
+   defined by the "q" tag in the "DomainKey-Signature:" header line.
+   Obviously, a public key should only be retrieved if the process of
+   extracting the signature information is completely successful.
+
+   Currently, the only valid query type is "dns".  The public key
+   retrieval process for this type is as follows:
+
+      1. Using the selector name defined by the "s" tag, the
+         "_domainkey" namespace and the domain name defined by the "d"
+         tag, construct and issue the DNS TXT record query string.
+
+         For example, if s=brisbane and d=example.net, the query string
+         is "brisbane._domainkey.example.net".
+
+      2. If the query for the public key fails to respond, the verifier
+         SHOULD defer acceptance of this email (normally this will be
+         achieved with a 4XX SMTP response code).
+
+      3. If the query for the public key fails because the corresponding
+         data does not exist, the verifier MUST treat the email as
+         unverified.
+
+      4. If the result returned from the query does not adhere to the
+         format defined in this specification, the verifier MUST treat
+         the email as unverified.
+
+      5. If the public key data is not suitable for use with the
+         algorithm type defined by the "a" tag in the "DomainKey-
+         Signature:" header, the verifier MUST treat the email as
+         unverified.
+
+   Implementors MUST meticulously validate the format and values
+   returned by the public key query.  Any inconsistency or unexpected
+   values MUST result in an unverified email.  Being "liberal in what
+   you accept" is definitely a bad strategy in this security context.
+
+   Latency critical implementations may wish to initiate the public key
+   query in parallel with calculating the SHA-1 hash, as the public key
+   is not needed until the final RSA is calculated.
+
+
+
+
+Delany                          Historic                       [Page 26]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+3.7.5.  Verify the Signature
+
+   Armed with the signature information from the "DomainKey-Signature:"
+   header and the public key information returned by the query, the
+   signature of the email can now be verified.
+
+   The canonicalization algorithm defined by the "c" tag in the
+   "DomainKey-Signature:" header defines how the data is prepared for
+   the verification algorithm, and the "a" tag in the same header
+   defines which verification algorithm to use.
+
+3.7.6.  Retrieving Sending Domain Policy
+
+   In the event that an email fails to verify, the policy of the sending
+   domain MUST be consulted.  For now, that means consulting the
+   _domainkey TXT record in the DNS of the domain in the sending domain
+   as defined in Section 3.5.1.  For example, if example.net is the
+   sending domain the TXT query is:
+
+      _domainkey.example.net
+
+   A verifier SHOULD consider the sending domain policy statement and
+   act accordingly.  The range of possibilities is up to the receiver,
+   but it MAY include rejecting the email.
+
+3.7.7.  Applying Local Policy
+
+   After all verification processes are complete, the recipient system
+   has authentication information that can help it decide what to do
+   with the email.
+
+   It is beyond the scope of this specification to describe what actions
+   a recipient system should take, but an authenticated email presents
+   an opportunity to a receiving system that unauthenticated email
+   cannot.  Specifically, an authenticated email creates a predictable
+   identifier by which other decisions can reliably be managed, such as
+   trust and reputation.
+
+   Conversely, unauthenticated email lacks a reliable identifier that
+   can be used to assign trust and reputation.  It is not unreasonable
+   to treat unauthenticated email as lacking any trust and having no
+   positive reputation.
+
+3.8.  Conveying Verification Results to MUAs
+
+   Apart from the application of automated policy, the result of a
+   signature verification should be conveyed to the user reading the
+   email.
+
+
+
+Delany                          Historic                       [Page 27]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+   Most email clients can be configured to recognize specific headers
+   and apply simple rules, e.g., filing into a particular folder.  Since
+   DomainKey signatures are expected to be initially verified at the
+   border MTA, the results of the verification need to be conveyed to
+   the email client.  This is done with the "DomainKey-Status:" header
+   line prepended to the email.
+
+   The "DomainKey-Status:" header starts with a string that indicate the
+   result of the verification.  Valid values are as follows:
+
+   "good"         - the signature was verified at the time of testing
+   "bad"          - the signature failed the verification
+   "no key"       - the public key query failed as the key does not
+                    exist
+   "revoked"      - the public key query failed as the key has been
+                    revoked
+   "no signature" - this email has no "DomainKey-Signature:" header
+   "bad format"   - the signature or the public key contains unexpected
+                    data
+   "non-participant" - this sending domain has indicated that it does
+                       not participate in DomainKeys
+
+   Verifiers may append additional data that expands on the reason for
+   the particular status value.
+
+   A client SHOULD just look for "good" and assume that all other values
+   imply that the verification could not be performed for some reason.
+   Policy action as a consequence of this header is entirely a local
+   matter.
+
+   Here are some examples:
+
+      DomainKey-Status: good
+      DomainKey-Status: bad format
+
+   Although it is expected that MTAs will be DomainKey aware before
+   MUAs, it is nonetheless possible that a DomainKey-aware MUA can be
+   fooled by a spoofed "DomainKey-Status:" header that passes through a
+   non-DomainKey-aware MTA.
+
+   If this is perceived to be a serious problem, then it may make sense
+   to preclude the "good" value and only have values that effectively
+   demote the email as far as the UA is concerned.  That way successful
+   spoofing attempts can only serve to demote themselves.
+
+
+
+
+
+
+
+Delany                          Historic                       [Page 28]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+4.  Example of Use
+
+   This section shows the complete flow of an email from submission to
+   final delivery, demonstrating how the various components fit
+   together.
+
+4.1.  The User Composes an Email
+
+   From: "Joe SixPack" <joe@football.example.com>
+   To: "Suzie Q" <suzie@shopping.example.net>
+   Subject: Is dinner ready?
+   Date: Fri, 11 Jul 2003 21:00:37 -0700 (PDT)
+   Message-ID: <20030712040037.46341.5F8J@football.example.com>
+
+   Hi.
+
+   We lost the game. Are you hungry yet?
+
+   Joe.
+
+4.2.  The Email Is Signed
+
+   This email is signed by the football.example.com outbound email
+   server and now looks like this:
+
+   DomainKey-Signature: a=rsa-sha1; s=brisbane; d=football.example.com;
+     c=simple; q=dns;
+     b=dzdVyOfAKCdLXdJOc9G2q8LoXSlEniSbav+yuU4zGeeruD00lszZ
+       VoG4ZHRNiYzR;
+   Received: from dsl-10.2.3.4.football.example.com  [10.2.3.4]
+        by submitserver.football.example.com with SUBMISSION;
+        Fri, 11 Jul 2003 21:01:54 -0700 (PDT)
+   From: "Joe SixPack" <joe@football.example.com>
+   To: "Suzie Q" <suzie@shopping.example.net>
+   Subject: Is dinner ready?
+   Date: Fri, 11 Jul 2003 21:00:37 -0700 (PDT)
+   Message-ID: <20030712040037.46341.5F8J@football.example.com>
+
+   Hi.
+
+   We lost the game. Are you hungry yet?
+
+   Joe.
+
+   The signing email server requires access to the private key
+   associated with the "brisbane" selector to generate this signature.
+   Distribution and management of private keys are outside the scope of
+   this document.
+
+
+
+Delany                          Historic                       [Page 29]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+4.3.  The Email Signature Is Verified
+
+   The signature is normally verified by an inbound SMTP server or
+   possibly the final delivery agent.  However, intervening MTAs can
+   also perform this verification if they choose to do so.
+
+   The verification process uses the domain "football.example.com"
+   extracted from the "From:" header and the selector "brisbane" from
+   the "DomainKey-Signature:" header to form the DNS TXT query for:
+
+      brisbane._domainkey.football.example.com
+
+   Since there is no "h" tag in the "DomainKey-Signature:" header,
+   signature verification starts with the line following the
+   "DomainKey-Signature:" line.  The email is canonically prepared for
+   verifying with the "simple" method.
+
+   The result of the query and subsequent verification of the signature
+   is stored in the "DomainKey-Status:" header line.  After successful
+   verification, the email looks like this:
+
+   DomainKey-Status: good
+    from=joe@football.example.com; domainkeys=pass
+   Received: from mout23.brisbane.football.example.com (192.168.1.1)
+             by shopping.example.net with SMTP;
+             Fri, 11 Jul 2003 21:01:59 -0700 (PDT)
+   DomainKey-Signature: a=rsa-sha1; s=brisbane; d=football.example.com;
+    c=simple; q=dns;
+    b=dzdVyOfAKCdLXdJOc9G2q8LoXSlEniSbav+yuU4zGeeruD00lszZ
+      VoG4ZHRNiYzR;
+   Received: from dsl-10.2.3.4.network.example.com  [10.2.3.4]
+        by submitserver.example.com with SUBMISSION;
+        Fri, 11 Jul 2003 21:01:54 -0700 (PDT)
+   From: "Joe SixPack" <joe@football.example.com>
+   To: "Suzie Q" <suzie@shopping.example.net>
+   Subject: Is dinner ready?
+   Date: Fri, 11 Jul 2003 21:00:37 -0700 (PDT)
+   Message-ID: <20030712040037.46341.5F8J@football.example.com>
+
+   Hi.
+
+   We lost the game. Are you hungry yet?
+
+   Joe.
+
+
+
+
+
+
+
+Delany                          Historic                       [Page 30]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+5.  Association with a Certificate Authority
+
+   A fundamental aspect of DomainKeys is that public keys are generated
+   and advertised by each domain at no additional cost.  This
+   accessibility markedly differs from traditional Public Key
+   Infrastructures where there is typically a Certificate Authority (CA)
+   who validates an applicant and issues a signed certificate --
+   containing their public key -- often for a recurring fee.
+
+   While CAs do impose costs, they also have the potential to provide
+   additional value as part of their certification process.  Consider
+   financial institutions, public utilities, law enforcement agencies,
+   and the like.  In many cases, such entities justifiably need to
+   discriminate themselves above and beyond the authentication that
+   DomainKeys offers.
+
+   Creating a link between DomainKeys and CA-issued certificates has the
+   potential to access additional authentication mechanisms that are
+   more authoritative than domain-owner-issued authentication.  It is
+   well beyond the scope of this specification to describe such
+   authorities apart from defining how the linkage could be achieved
+   with the "DomainKey-X509:" header.
+
+5.1.  The "DomainKey-X509:" Header
+
+   The "DomainKey-X509:" header provides a link between the public key
+   used to sign the email and the certificate issued by a CA.
+
+   The exact content, syntax, and semantics of this header are yet to be
+   resolved.  One possibility is that this header contains an encoding
+   of the certificate issued by a CA.  Another possibility is that this
+   header contains a URL that points to a certificate issued by a CA.
+
+   In either case, this header can only be consulted if the signature
+   verifies and MUST be part of the content signed by the corresponding
+   "DomainKey-Signature:" header.  Furthermore, it is likely that MUAs
+   rather than MTAs will confirm that the link to the CA-issued
+   certificate is valid.  In part, this is because many MUAs already
+   have built-in capabilities as a consequence of Secure/Multipurpose
+   Internet Mail Extensions (S/MIME) [SMIME] and Secure Socket Layer
+   (SSL) [SSL] support.
+
+   The proof of linkage is made by testing that the public key in the
+   certificate matches the public key used to sign the email.
+
+
+
+
+
+
+
+Delany                          Historic                       [Page 31]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+   An example of an email containing the "DomainKey-X509:" header is:
+
+      DomainKey-Signature: a=rsa-sha1; s=statements;
+        d=largebank.example.com; c=simple; q=dns;
+        b=dzdVyOfAKCdLXdJOc9G2q8LoXSlEniSbav+yuU4zGeeruD00lszZ
+          VoG4ZHRNiYzR;
+      DomainKey-X509: https://ca.example.net/largebank.example.com
+      From: "Large Bank" <statements@largebank.example.com>
+      To: "Suzie Q" <suzie@shopping.example.net>
+      Subject: Statement for Account: 1234-5678
+      ...
+
+   The format of the retrieved value from the URL is not yet defined,
+   nor is the determination of valid CAs.
+
+   The whole matter of linkage to CA-issued certificates is one aspect
+   of DomainKeys that needs to be resolved with relevant CA's and
+   certificate-issuing entities.  The primary point is that a link is
+   possible to a higher authority.
+
+6.  Topics for Discussion
+
+6.1.  The Benefits of Selectors
+
+   Selectors are at the heart of the flexibility of DomainKeys.  A
+   domain administrator is free to use a single DomainKey for all
+   outbound mail.  Alternatively, the domain administrator may use many
+   DomainKeys differentiated by selector and assign each key to
+   different servers.
+
+   For example, a large outbound email farm might have a unique
+   DomainKey for each server, and thus their DNS will advertise
+   potentially hundreds of keys via their unique selectors.
+
+   Another example is a corporate email administrator who might generate
+   a separate DomainKey for each regional office email server.
+
+   In essence, selectors allow a domain owner to distribute authority to
+   send on behalf of that domain.  Combined with the ability to revoke
+   by removal or Time to Live (TTL) expiration, a domain owner has
+   coarse-grained control over the duration of the distributed
+   authority.
+
+   Selectors are particularly useful for domain owners who want to
+   contract a third-party mailing system to send a particular set of
+   mail.  The domain owner can generate a special key pair and selector
+   just for this mail-out.  The domain owner has to provide the private
+   key and selector to the third party for the life of the mail-out.
+
+
+
+Delany                          Historic                       [Page 32]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+   However, as soon as the mail-out is completely delivered, the domain
+   owner can revoke the public key by the simple expedient of removing
+   the entry from the DNS.
+
+6.2.  Canonicalization of Email
+
+   It is an unfortunate fact that some email software routinely (and
+   often unnecessarily) transforms email as it transits through the
+   network.  Such transformations conflict with the fundamental purpose
+   of cryptographic signatures - to detect modifications.
+
+   While two canonicalization algorithms are defined in this
+   specification, the primary goal of "nofws" is to provide a transition
+   path to "simple".  With a mixture of "simple" and "nofws" email, a
+   receiver can determine which systems are modifying email in ways that
+   cause the signature to fail and thus provide feedback to the
+   modifying system.
+
+6.3.  Mailing Lists
+
+   Integrating existing Mailing List Managers (MLMs) into the DomainKeys
+   authentication system is a complicated area, as the behavior of MLMs
+   is highly variable.  Essentially, there are two types of MLMs under
+   consideration: those that modify email to such an extent that
+   verification of the original content is not possible, and those that
+   make minimal or no modifications to an email.
+
+   MLMs that modify email in a way that causes verification to fail MUST
+   prepend a "Sender:" header and SHOULD prepend a "List-ID:"  header
+   prior to signing for distribution to list recipients.
+
+   A participating SUBMISSION server can deduce the need to re-sign such
+   an email by the presence of a "Sender:" or "List-ID:" header from an
+   authorized submission.
+
+   MLMs that do not modify email in a way that causes verification to
+   fail MAY perform the same actions as a modifying MLM.
+
+6.4.  Roving Users
+
+   One scenario that presents a particular problem with any form of
+   email authentication, including DomainKeys, is the roving user: a
+   user who is obliged to use a third-party SUBMISSION service when
+   unable to connect to the user's own SUBMISSION service.  The classic
+   example cited is a traveling salesperson being redirected to a hotel
+   email server to send email.
+
+
+
+
+
+Delany                          Historic                       [Page 33]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+   As far as DomainKeys is concerned, email of this nature clearly
+   originates from an email server that does not have authority to send
+   on behalf of the domain of the salesperson and is therefore
+   indistinguishable from a forgery.  While DomainKeys does not
+   prescribe any specific action for such email, it is likely that over
+   time, such email will be treated as second-class email.
+
+   The typical solution offered to roving users is to submit email via
+   an authorized server for their domain -- perhaps via a Virtual
+   Private Network (VPN) or a web interface or even SMTP AUTH back to a
+   SUBMISSION server.
+
+   While these are perfectly acceptable solutions for many, they are not
+   necessarily solutions that are available or possible for all such
+   users.
+
+   One possible way to address the needs of this contingent of
+   potentially disenfranchised users is for the domain to issue per-user
+   DomainKeys.  Per-user DomainKeys are identified by a non-empty "g"
+   tag value in the corresponding DNS record.
+
+7.  Security Considerations
+
+7.1.  DNS
+
+   DomainKeys is primarily a security mechanism.  Its core purpose is to
+   make claims about email authentication in a credible way.  However,
+   DomainKeys, like virtually all Internet applications, relies on the
+   DNS, which has well-known security flaws [RFC3833].
+
+7.1.1.  The DNS Is Not Currently Secure
+
+   While the DNS is currently insecure, it is expected that the security
+   problems should and will be solved by DNS Security (DNSSEC) [DNSSEC],
+   and all users of the DNS will reap the benefit of that work.
+
+   Secondly, the types of DNS attacks relevant to DomainKeys are very
+   costly and are far less rewarding than DNS attacks on other Internet
+   applications.
+
+   To systematically thwart the intent of DomainKeys, an attacker must
+   conduct a very costly and very extensive attack on many parts of the
+   DNS over an extended period.  No one knows for sure how attackers
+   will respond; however, the cost/benefit of conducting prolonged DNS
+   attacks of this nature is expected to be uneconomical.
+
+   Finally, DomainKeys is only intended as a "sufficient" method of
+   proving authenticity.  It is not intended to provide strong
+
+
+
+Delany                          Historic                       [Page 34]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+   cryptographic proof about authorship or contents.  Other technologies
+   such as GnuPG and S/MIME address those requirements.
+
+7.1.2.  DomainKeys Creates Additional DNS Load
+
+   A second security issue related to the DNS revolves around the
+   increased DNS traffic as a consequence of fetching selector-based
+   data, as well as fetching sending domain policy.  Widespread
+   deployment of DomainKeys will result in a significant increase in DNS
+   queries to the claimed sending domain.  In the case of forgeries on a
+   large scale, DNS servers could see a substantial increase in queries.
+
+7.2.  Key Management
+
+   All public key systems require management of key pairs.  Private keys
+   in particular need to be securely distributed to each signing mail
+   server and protected on those servers.  For those familiar with SSL,
+   the key management issues are similar to those of managing SSL
+   certificates.  Poor key management may result in unauthorized access
+   to private keys, which in essence gives unauthorized access to your
+   identity.
+
+7.3.  Implementation Risks
+
+   It is well recognized in cryptographic circles that many security
+   failures are caused by poor implementations rather than poor
+   algorithms.  For example, early SSL implementations were vulnerable
+   because the implementors used predictable "random numbers".
+
+   While some MTA software already supports various cryptographic
+   techniques, such as TLS, many do not.  This proposal introduces
+   cryptographic requirements into MTA software that implies a much
+   higher duty of care to manage the increased risk.
+
+   There are numerous articles, books, courses, and consultants that
+   help programming security applications.  Potential implementors are
+   strongly encouraged to avail themselves of all possible resources to
+   ensure secure implementations.
+
+7.4.  Privacy Assumptions with Forwarding Addresses
+
+   Some people believe that they can achieve anonymity by using an email
+   forwarding service.  While this has never been particularly true, as
+   bounces, over-quota messages, vacation messages, and web bugs all
+   conspire to expose IP addresses and domain names associated with the
+   delivery path, the DNS queries that are required to verify DomainKeys
+   signature can provide additional information to the sender.
+
+
+
+
+Delany                          Historic                       [Page 35]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+   In particular, as mail is forwarded through the mail network, the DNS
+   queries for the selector will typically identify the DNS cache used
+   by the forwarding and delivery MTAs.
+
+7.5.  Cryptographic Processing Is Computationally Intensive
+
+   Verifying a signature is computationally significant.  Early
+   indications are that a typical mail server can expect to increase CPU
+   demands by 8-15 percent.  While this increased demand is modest
+   compared to other common mail processing costs -- such as Bayesian
+   filtering -- any increase in resource requirements can make a
+   denial-of-service attack more effective against a mail system.
+
+   A constraining factor of such attacks is that the net computational
+   cost of verifying is bounded by the maximum key size allowed by this
+   specification and is essentially linear to the rate at which mail is
+   accepted by the verifying system.  Consequently, the additional
+   computational cost may augment a denial-of-service attack, but it
+   does not add a non-linear component to such attacks.
+
+8.  The Trial
+
+   The DomainKeys protocol was deployed as a trial to better understand
+   the implications of deploying wide-scale cryptographic email
+   authentication.
+
+   Open Source implementations were made available at various places,
+   particularly Source Forge [SOURCEFORGE], which includes links to
+   numerous implementations, both Open Source and commercial.
+
+8.1.  Goals
+
+   The primary goals of the trial were to:
+
+      o  understand the operational implications of running a DNS-based
+         public key system for email
+
+      o  measure the effectiveness of the canonicalization algorithms
+
+      o  experiment with possible per-user key deployment models
+
+      o  fully define the semantics of the "DomainKey-X509:" header
+
+
+
+
+
+
+
+
+
+Delany                          Historic                       [Page 36]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+8.2.  Results of Trial
+
+   The DomainKeys trial ran for approximately 2 years, in which time
+   numerous large ISPs and many thousands of smaller domains
+   participated in signing or verifying with DomainKeys.  The low order
+   numbers are that at least one billion DomainKey signed emails transit
+   the Internet each day between some 12,000 participating domains.
+
+   The operational and development experience of that trial was applied
+   to DKIM.
+
+9.  Note to Implementors Regarding TXT Records
+
+   The DNS is very flexible in that it is possible to have multiple TXT
+   records for a single name and for those TXT records to contain
+   multiple strings.
+
+   In all cases, implementors of DomainKeys should expect a single TXT
+   record for any particular name.  If multiple TXT records are
+   returned, the implementation is free to pick any single TXT record as
+   the authoritative data.  In other words, if a name server returns
+   different TXT records for the same name, it can expect unpredictable
+   results.
+
+   Within a single TXT record, implementors should concatenate multiple
+   strings in the order presented and ignore string boundaries.  Note
+   that a number of popular DNS command-line tools render multiple
+   strings as separately quoted strings, which can be misleading to a
+   novice implementor.
+
+10.  References
+
+10.1.  Normative References
+
+   [BASE64]      Josefsson, S., "The Base16, Base32, and Base64 Data
+                 Encodings", RFC 4648, October 2006.
+
+   [RFC2119]     Bradner, S., "Key words for use in RFCs to Indicate
+                 Requirement Levels", BCP 14, RFC 2119, March 1997.
+
+   [PEM]         Linn, J., "Privacy Enhancement for Internet Electronic
+                 Mail: Part I: Message Encryption and Authentication
+                 Procedures", RFC 1421 February, 1993.
+
+
+
+
+
+
+
+
+Delany                          Historic                       [Page 37]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+10.2.  Informative References
+
+   [DKIM]        Allman, E., Callas, J., Delany, M., Libbey, M., Fenton,
+                 J., and M. Thomas, "DomainKeys Identified Mail (DKIM)
+                 Signatures", RFC 4871, May 2007.
+
+   [DNSSEC]      http://www.ietf.org/html.charters/dnsext-charter.html
+
+   [OPENSSL]     http://www.openssl.org
+
+   [RFC2822]     Resnick, P., Editor, "Internet Message Format", RFC
+                               2822, April 2001.
+
+   [RFC3833]     Atkins, D. and R. Austein, "Threat Analysis of the
+                 Domain Name System (DNS)", RFC 3833, August 2004.
+
+   [SMIME]       Ramsdell, B., Ed., "Secure/Multipurpose Internet Mail
+                 Extensions (S/MIME) Version 3.1 Message Specification",
+                 RFC 3851, July 2004.
+
+   [SOURCEFORGE] http://domainkeys.sourceforge.net
+
+   [SSL]         http://wp.netscape.com/security/techbriefs/ssl.html
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Delany                          Historic                       [Page 38]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+Appendix A - Syntax Rules for the Tag=Value Format
+
+   A simple tag=value syntax is used to encode data in the response
+   values for DNS queries as well as headers embedded in emails.  This
+   section summarized the syntactic rules for this encoding:
+
+      o  A tag=value pair consists of three tokens, a "tag", the "="
+         character, and the "value"
+
+      o  A tag MUST be one character long and MUST be a lowercase
+         alphabetic character
+
+      o  Duplicate tags are not allowed
+
+      o  A value MUST only consist of characters that are valid in RFC
+         2822 headers and DNS TXT records and are within the ASCII range
+         of characters from SPACE (0x20) to TILDE (0x7E) inclusive.
+         Values MUST NOT contain a semicolon but they may contain "="
+         characters.
+
+      o  A tag=value pair MUST be terminated by a semicolon or the end
+         of the data
+
+      o  Values MUST be processed as case sensitive unless the specific
+         tag description of semantics imply case insensitivity.
+
+      o  Values MAY be zero bytes long
+
+      o  Whitespace MAY surround any of the tokens; however, whitespace
+         within a value MUST be retained unless explicitly excluded by
+         the specific tag description.  Currently, the only tags that
+         specifically ignore embedded whitespace are the "b" and "h"
+         tags in the "DomainKey-Signature:" header.
+
+      o  Tag=value pairs that represent the default value MAY be
+         included to aid legibility.
+
+      o  Unrecognized tags MUST be ignored
+
+
+
+
+
+
+
+
+
+
+
+
+
+Delany                          Historic                       [Page 39]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+Acknowledgments
+
+   The editor wishes to thank Russ Allbery, Eric Allman, Edwin Aoki,
+   Claus Asmann, Steve Atkins, Jon Callas, Dave Crocker, Michael Cudahy,
+   Jutta Degener, Timothy Der, Jim Fenton, Duncan Findlay, Phillip
+   Hallam-Baker, Murray S. Kucherawy, John Levine, Miles Libbey, David
+   Margrave, Justin Mason, David Mayne, Russell Nelson, Juan Altmayer
+   Pizzorno, Blake Ramsdell, Scott Renfro, the Spamhaus.org team, Malte
+   S. Stretz, Robert Sanders, Bradley Taylor, and Rand Wacker for their
+   valuable suggestions and constructive criticism.
+
+Author's Address
+
+   Mark Delany
+   Yahoo! Inc
+   701 First Avenue
+   Sunnyvale, CA 95087
+   USA
+
+   EMail: markd+domainkeys@yahoo-inc.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Delany                          Historic                       [Page 40]
+
+RFC 4870                       DomainKeys                       May 2007
+
+
+Full Copyright Statement
+
+   Copyright (C) The IETF Trust (2007).
+
+   This document is subject to the rights, licenses and restrictions
+   contained in BCP 78, and except as set forth therein, the authors
+   retain all their rights.
+
+   This document and the information contained herein are provided on an
+   "AS IS" basis and THE CONTRIBUTOR, THE ORGANIZATION HE/SHE REPRESENTS
+   OR IS SPONSORED BY (IF ANY), THE INTERNET SOCIETY, THE IETF TRUST AND
+   THE INTERNET ENGINEERING TASK FORCE DISCLAIM ALL WARRANTIES, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF
+   THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED
+   WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+Intellectual Property
+
+   The IETF takes no position regarding the validity or scope of any
+   Intellectual Property Rights or other rights that might be claimed to
+   pertain to the implementation or use of the technology described in
+   this document or the extent to which any license under such rights
+   might or might not be available; nor does it represent that it has
+   made any independent effort to identify any such rights.  Information
+   on the procedures with respect to rights in RFC documents can be
+   found in BCP 78 and BCP 79.
+
+   Copies of IPR disclosures made to the IETF Secretariat and any
+   assurances of licenses to be made available, or the result of an
+   attempt made to obtain a general license or permission for the use of
+   such proprietary rights by implementers or users of this
+   specification can be obtained from the IETF on-line IPR repository at
+   http://www.ietf.org/ipr.
+
+   The IETF invites any interested party to bring to its attention any
+   copyrights, patents or patent applications, or other proprietary
+   rights that may cover technology that may be required to implement
+   this standard.  Please address the information to the IETF at
+   ietf-ipr@ietf.org.
+
+Acknowledgement
+
+   Funding for the RFC Editor function is currently provided by the
+   Internet Society.
+
+
+
+
+
+
+
+Delany                          Historic                       [Page 41]
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc4871.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc4871.txt
new file mode 100644
index 000000000..80410e616
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc4871.txt
@@ -0,0 +1,3978 @@
+
+
+
+
+
+Network Working Group                                          E. Allman
+Request for Comments: 4871                                Sendmail, Inc.
+Obsoletes: 4870                                                J. Callas
+Category: Standards Track                                PGP Corporation
+                                                               M. Delany
+                                                               M. Libbey
+                                                              Yahoo! Inc
+                                                               J. Fenton
+                                                               M. Thomas
+                                                     Cisco Systems, Inc.
+                                                                May 2007
+
+
+              DomainKeys Identified Mail (DKIM) Signatures
+
+Status of This Memo
+
+   This document specifies an Internet standards track protocol for the
+   Internet community, and requests discussion and suggestions for
+   improvements.  Please refer to the current edition of the "Internet
+   Official Protocol Standards" (STD 1) for the standardization state
+   and status of this protocol.  Distribution of this memo is unlimited.
+
+Copyright Notice
+
+   Copyright (C) The IETF Trust (2007).
+
+Abstract
+
+   DomainKeys Identified Mail (DKIM) defines a domain-level
+   authentication framework for email using public-key cryptography and
+   key server technology to permit verification of the source and
+   contents of messages by either Mail Transfer Agents (MTAs) or Mail
+   User Agents (MUAs).  The ultimate goal of this framework is to permit
+   a signing domain to assert responsibility for a message, thus
+   protecting message signer identity and the integrity of the messages
+   they convey while retaining the functionality of Internet email as it
+   is known today.  Protection of email identity may assist in the
+   global control of "spam" and "phishing".
+
+
+
+
+
+
+
+
+
+
+
+
+Allman, et al.              Standards Track                     [Page 1]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+Table of Contents
+
+   1.  Introduction . . . . . . . . . . . . . . . . . . . . . . . . .  4
+     1.1.  Signing Identity . . . . . . . . . . . . . . . . . . . . .  5
+     1.2.  Scalability  . . . . . . . . . . . . . . . . . . . . . . .  5
+     1.3.  Simple Key Management  . . . . . . . . . . . . . . . . . .  5
+   2.  Terminology and Definitions  . . . . . . . . . . . . . . . . .  5
+     2.1.  Signers  . . . . . . . . . . . . . . . . . . . . . . . . .  6
+     2.2.  Verifiers  . . . . . . . . . . . . . . . . . . . . . . . .  6
+     2.3.  Whitespace . . . . . . . . . . . . . . . . . . . . . . . .  6
+     2.4.  Common ABNF Tokens . . . . . . . . . . . . . . . . . . . .  6
+     2.5.  Imported ABNF Tokens . . . . . . . . . . . . . . . . . . .  7
+     2.6.  DKIM-Quoted-Printable  . . . . . . . . . . . . . . . . . .  7
+   3.  Protocol Elements  . . . . . . . . . . . . . . . . . . . . . .  8
+     3.1.  Selectors  . . . . . . . . . . . . . . . . . . . . . . . .  8
+     3.2.  Tag=Value Lists  . . . . . . . . . . . . . . . . . . . . . 10
+     3.3.  Signing and Verification Algorithms  . . . . . . . . . . . 11
+     3.4.  Canonicalization . . . . . . . . . . . . . . . . . . . . . 13
+     3.5.  The DKIM-Signature Header Field  . . . . . . . . . . . . . 17
+     3.6.  Key Management and Representation  . . . . . . . . . . . . 25
+     3.7.  Computing the Message Hashes . . . . . . . . . . . . . . . 29
+     3.8.  Signing by Parent Domains  . . . . . . . . . . . . . . . . 31
+   4.  Semantics of Multiple Signatures . . . . . . . . . . . . . . . 32
+     4.1.  Example Scenarios  . . . . . . . . . . . . . . . . . . . . 32
+     4.2.  Interpretation . . . . . . . . . . . . . . . . . . . . . . 33
+   5.  Signer Actions . . . . . . . . . . . . . . . . . . . . . . . . 34
+     5.1.  Determine Whether the Email Should Be Signed and by
+           Whom . . . . . . . . . . . . . . . . . . . . . . . . . . . 34
+     5.2.  Select a Private Key and Corresponding Selector
+           Information  . . . . . . . . . . . . . . . . . . . . . . . 35
+     5.3.  Normalize the Message to Prevent Transport Conversions . . 35
+     5.4.  Determine the Header Fields to Sign  . . . . . . . . . . . 36
+     5.5.  Recommended Signature Content  . . . . . . . . . . . . . . 38
+     5.6.  Compute the Message Hash and Signature . . . . . . . . . . 39
+     5.7.  Insert the DKIM-Signature Header Field . . . . . . . . . . 40
+   6.  Verifier Actions . . . . . . . . . . . . . . . . . . . . . . . 40
+     6.1.  Extract Signatures from the Message  . . . . . . . . . . . 41
+     6.2.  Communicate Verification Results . . . . . . . . . . . . . 46
+     6.3.  Interpret Results/Apply Local Policy . . . . . . . . . . . 47
+   7.  IANA Considerations  . . . . . . . . . . . . . . . . . . . . . 48
+     7.1.  DKIM-Signature Tag Specifications  . . . . . . . . . . . . 48
+     7.2.  DKIM-Signature Query Method Registry . . . . . . . . . . . 49
+     7.3.  DKIM-Signature Canonicalization Registry . . . . . . . . . 49
+     7.4.  _domainkey DNS TXT Record Tag Specifications . . . . . . . 50
+     7.5.  DKIM Key Type Registry . . . . . . . . . . . . . . . . . . 50
+     7.6.  DKIM Hash Algorithms Registry  . . . . . . . . . . . . . . 51
+     7.7.  DKIM Service Types Registry  . . . . . . . . . . . . . . . 51
+     7.8.  DKIM Selector Flags Registry . . . . . . . . . . . . . . . 52
+
+
+
+Allman, et al.              Standards Track                     [Page 2]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+     7.9.  DKIM-Signature Header Field  . . . . . . . . . . . . . . . 52
+   8.  Security Considerations  . . . . . . . . . . . . . . . . . . . 52
+     8.1.  Misuse of Body Length Limits ("l=" Tag)  . . . . . . . . . 52
+     8.2.  Misappropriated Private Key  . . . . . . . . . . . . . . . 53
+     8.3.  Key Server Denial-of-Service Attacks . . . . . . . . . . . 54
+     8.4.  Attacks Against the DNS  . . . . . . . . . . . . . . . . . 54
+     8.5.  Replay Attacks . . . . . . . . . . . . . . . . . . . . . . 55
+     8.6.  Limits on Revoking Keys  . . . . . . . . . . . . . . . . . 55
+     8.7.  Intentionally Malformed Key Records  . . . . . . . . . . . 56
+     8.8.  Intentionally Malformed DKIM-Signature Header Fields . . . 56
+     8.9.  Information Leakage  . . . . . . . . . . . . . . . . . . . 56
+     8.10. Remote Timing Attacks  . . . . . . . . . . . . . . . . . . 56
+     8.11. Reordered Header Fields  . . . . . . . . . . . . . . . . . 56
+     8.12. RSA Attacks  . . . . . . . . . . . . . . . . . . . . . . . 56
+     8.13. Inappropriate Signing by Parent Domains  . . . . . . . . . 57
+   9.  References . . . . . . . . . . . . . . . . . . . . . . . . . . 57
+     9.1.  Normative References . . . . . . . . . . . . . . . . . . . 57
+     9.2.  Informative References . . . . . . . . . . . . . . . . . . 58
+   Appendix A.  Example of Use (INFORMATIVE)  . . . . . . . . . . . . 60
+     A.1.  The user composes an email . . . . . . . . . . . . . . . . 60
+     A.2.  The email is signed  . . . . . . . . . . . . . . . . . . . 61
+     A.3.  The email signature is verified  . . . . . . . . . . . . . 61
+   Appendix B.  Usage Examples (INFORMATIVE)  . . . . . . . . . . . . 62
+     B.1.  Alternate Submission Scenarios . . . . . . . . . . . . . . 63
+     B.2.  Alternate Delivery Scenarios . . . . . . . . . . . . . . . 65
+   Appendix C.  Creating a Public Key (INFORMATIVE) . . . . . . . . . 67
+   Appendix D.  MUA Considerations  . . . . . . . . . . . . . . . . . 68
+   Appendix E.  Acknowledgements  . . . . . . . . . . . . . . . . . . 69
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Allman, et al.              Standards Track                     [Page 3]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+1.  Introduction
+
+   DomainKeys Identified Mail (DKIM) defines a mechanism by which email
+   messages can be cryptographically signed, permitting a signing domain
+   to claim responsibility for the introduction of a message into the
+   mail stream.  Message recipients can verify the signature by querying
+   the signer's domain directly to retrieve the appropriate public key,
+   and thereby confirm that the message was attested to by a party in
+   possession of the private key for the signing domain.
+
+   The approach taken by DKIM differs from previous approaches to
+   message signing (e.g., Secure/Multipurpose Internet Mail Extensions
+   (S/MIME) [RFC1847], OpenPGP [RFC2440]) in that:
+
+   o  the message signature is written as a message header field so that
+      neither human recipients nor existing MUA (Mail User Agent)
+      software is confused by signature-related content appearing in the
+      message body;
+
+   o  there is no dependency on public and private key pairs being
+      issued by well-known, trusted certificate authorities;
+
+   o  there is no dependency on the deployment of any new Internet
+      protocols or services for public key distribution or revocation;
+
+   o  signature verification failure does not force rejection of the
+      message;
+
+   o  no attempt is made to include encryption as part of the mechanism;
+
+   o  message archiving is not a design goal.
+
+   DKIM:
+
+   o  is compatible with the existing email infrastructure and
+      transparent to the fullest extent possible;
+
+   o  requires minimal new infrastructure;
+
+   o  can be implemented independently of clients in order to reduce
+      deployment time;
+
+   o  can be deployed incrementally;
+
+   o  allows delegation of signing to third parties.
+
+
+
+
+
+
+Allman, et al.              Standards Track                     [Page 4]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+1.1.  Signing Identity
+
+   DKIM separates the question of the identity of the signer of the
+   message from the purported author of the message.  In particular, a
+   signature includes the identity of the signer.  Verifiers can use the
+   signing information to decide how they want to process the message.
+   The signing identity is included as part of the signature header
+   field.
+
+      INFORMATIVE RATIONALE: The signing identity specified by a DKIM
+      signature is not required to match an address in any particular
+      header field because of the broad methods of interpretation by
+      recipient mail systems, including MUAs.
+
+1.2.  Scalability
+
+   DKIM is designed to support the extreme scalability requirements that
+   characterize the email identification problem.  There are currently
+   over 70 million domains and a much larger number of individual
+   addresses.  DKIM seeks to preserve the positive aspects of the
+   current email infrastructure, such as the ability for anyone to
+   communicate with anyone else without introduction.
+
+1.3.  Simple Key Management
+
+   DKIM differs from traditional hierarchical public-key systems in that
+   no Certificate Authority infrastructure is required; the verifier
+   requests the public key from a repository in the domain of the
+   claimed signer directly rather than from a third party.
+
+   The DNS is proposed as the initial mechanism for the public keys.
+   Thus, DKIM currently depends on DNS administration and the security
+   of the DNS system.  DKIM is designed to be extensible to other key
+   fetching services as they become available.
+
+2.  Terminology and Definitions
+
+   This section defines terms used in the rest of the document.  Syntax
+   descriptions use the form described in Augmented BNF for Syntax
+   Specifications [RFC4234].
+
+   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
+   "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
+   document are to be interpreted as described in [RFC2119].
+
+
+
+
+
+
+
+Allman, et al.              Standards Track                     [Page 5]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+2.1.  Signers
+
+   Elements in the mail system that sign messages on behalf of a domain
+   are referred to as signers.  These may be MUAs (Mail User Agents),
+   MSAs (Mail Submission Agents), MTAs (Mail Transfer Agents), or other
+   agents such as mailing list exploders.  In general, any signer will
+   be involved in the injection of a message into the message system in
+   some way.  The key issue is that a message must be signed before it
+   leaves the administrative domain of the signer.
+
+2.2.  Verifiers
+
+   Elements in the mail system that verify signatures are referred to as
+   verifiers.  These may be MTAs, Mail Delivery Agents (MDAs), or MUAs.
+   In most cases it is expected that verifiers will be close to an end
+   user (reader) of the message or some consuming agent such as a
+   mailing list exploder.
+
+2.3.  Whitespace
+
+   There are three forms of whitespace:
+
+   o  WSP represents simple whitespace, i.e., a space or a tab character
+      (formal definition in [RFC4234]).
+
+   o  LWSP is linear whitespace, defined as WSP plus CRLF (formal
+      definition in [RFC4234]).
+
+   o  FWS is folding whitespace.  It allows multiple lines separated by
+      CRLF followed by at least one whitespace, to be joined.
+
+   The formal ABNF for these are (WSP and LWSP are given for information
+   only):
+
+       WSP =   SP / HTAB
+       LWSP =  *(WSP / CRLF WSP)
+       FWS =   [*WSP CRLF] 1*WSP
+
+   The definition of FWS is identical to that in [RFC2822] except for
+   the exclusion of obs-FWS.
+
+2.4.  Common ABNF Tokens
+
+   The following ABNF tokens are used elsewhere in this document:
+     hyphenated-word =  ALPHA [ *(ALPHA / DIGIT / "-") (ALPHA / DIGIT) ]
+     base64string =     1*(ALPHA / DIGIT / "+" / "/" / [FWS])
+                        [ "=" [FWS] [ "=" [FWS] ] ]
+
+
+
+
+Allman, et al.              Standards Track                     [Page 6]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+2.5.  Imported ABNF Tokens
+
+   The following tokens are imported from other RFCs as noted.  Those
+   RFCs should be considered definitive.
+
+   The following tokens are imported from [RFC2821]:
+
+   o  "Local-part" (implementation warning: this permits quoted strings)
+
+   o  "sub-domain"
+
+   The following tokens are imported from [RFC2822]:
+
+   o  "field-name" (name of a header field)
+
+   o  "dot-atom-text" (in the Local-part of an email address)
+
+   The following tokens are imported from [RFC2045]:
+
+   o  "qp-section" (a single line of quoted-printable-encoded text)
+
+   o  "hex-octet" (a quoted-printable encoded octet)
+
+      INFORMATIVE NOTE: Be aware that the ABNF in RFC 2045 does not obey
+      the rules of RFC 4234 and must be interpreted accordingly,
+      particularly as regards case folding.
+
+   Other tokens not defined herein are imported from [RFC4234].  These
+   are intuitive primitives such as SP, HTAB, WSP, ALPHA, DIGIT, CRLF,
+   etc.
+
+2.6.  DKIM-Quoted-Printable
+
+   The DKIM-Quoted-Printable encoding syntax resembles that described in
+   Quoted-Printable [RFC2045], Section 6.7: any character MAY be encoded
+   as an "=" followed by two hexadecimal digits from the alphabet
+   "0123456789ABCDEF" (no lowercase characters permitted) representing
+   the hexadecimal-encoded integer value of that character.  All control
+   characters (those with values < %x20), 8-bit characters (values >
+   %x7F), and the characters DEL (%x7F), SPACE (%x20), and semicolon
+   (";", %x3B) MUST be encoded.  Note that all whitespace, including
+   SPACE, CR, and LF characters, MUST be encoded.  After encoding, FWS
+   MAY be added at arbitrary locations in order to avoid excessively
+   long lines; such whitespace is NOT part of the value, and MUST be
+   removed before decoding.
+
+
+
+
+
+
+Allman, et al.              Standards Track                     [Page 7]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   ABNF:
+
+       dkim-quoted-printable =
+                          *(FWS / hex-octet / dkim-safe-char)
+                     ; hex-octet is from RFC 2045
+       dkim-safe-char =   %x21-3A / %x3C / %x3E-7E
+                     ; '!' - ':', '<', '>' - '~'
+                     ; Characters not listed as "mail-safe" in
+                     ; RFC 2049 are also not recommended.
+
+      INFORMATIVE NOTE: DKIM-Quoted-Printable differs from Quoted-
+      Printable as defined in RFC 2045 in several important ways:
+
+      1.  Whitespace in the input text, including CR and LF, must be
+          encoded.  RFC 2045 does not require such encoding, and does
+          not permit encoding of CR or LF characters that are part of a
+          CRLF line break.
+
+      2.  Whitespace in the encoded text is ignored.  This is to allow
+          tags encoded using DKIM-Quoted-Printable to be wrapped as
+          needed.  In particular, RFC 2045 requires that line breaks in
+          the input be represented as physical line breaks; that is not
+          the case here.
+
+      3.  The "soft line break" syntax ("=" as the last non-whitespace
+          character on the line) does not apply.
+
+      4.  DKIM-Quoted-Printable does not require that encoded lines be
+          no more than 76 characters long (although there may be other
+          requirements depending on the context in which the encoded
+          text is being used).
+
+3.  Protocol Elements
+
+   Protocol Elements are conceptual parts of the protocol that are not
+   specific to either signers or verifiers.  The protocol descriptions
+   for signers and verifiers are described in later sections (Signer
+   Actions (Section 5) and Verifier Actions (Section 6)).  NOTE: This
+   section must be read in the context of those sections.
+
+3.1.  Selectors
+
+   To support multiple concurrent public keys per signing domain, the
+   key namespace is subdivided using "selectors".  For example,
+   selectors might indicate the names of office locations (e.g.,
+   "sanfrancisco", "coolumbeach", and "reykjavik"), the signing date
+   (e.g., "january2005", "february2005", etc.), or even the individual
+   user.
+
+
+
+Allman, et al.              Standards Track                     [Page 8]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   Selectors are needed to support some important use cases.  For
+   example:
+
+   o  Domains that want to delegate signing capability for a specific
+      address for a given duration to a partner, such as an advertising
+      provider or other outsourced function.
+
+   o  Domains that want to allow frequent travelers to send messages
+      locally without the need to connect with a particular MSA.
+
+   o  "Affinity" domains (e.g., college alumni associations) that
+      provide forwarding of incoming mail, but that do not operate a
+      mail submission agent for outgoing mail.
+
+   Periods are allowed in selectors and are component separators.  When
+   keys are retrieved from the DNS, periods in selectors define DNS
+   label boundaries in a manner similar to the conventional use in
+   domain names.  Selector components might be used to combine dates
+   with locations, for example, "march2005.reykjavik".  In a DNS
+   implementation, this can be used to allow delegation of a portion of
+   the selector namespace.
+
+   ABNF:
+
+      selector =   sub-domain *( "." sub-domain )
+
+   The number of public keys and corresponding selectors for each domain
+   is determined by the domain owner.  Many domain owners will be
+   satisfied with just one selector, whereas administratively
+   distributed organizations may choose to manage disparate selectors
+   and key pairs in different regions or on different email servers.
+
+   Beyond administrative convenience, selectors make it possible to
+   seamlessly replace public keys on a routine basis.  If a domain
+   wishes to change from using a public key associated with selector
+   "january2005" to a public key associated with selector
+   "february2005", it merely makes sure that both public keys are
+   advertised in the public-key repository concurrently for the
+   transition period during which email may be in transit prior to
+   verification.  At the start of the transition period, the outbound
+   email servers are configured to sign with the "february2005" private
+   key.  At the end of the transition period, the "january2005" public
+   key is removed from the public-key repository.
+
+      INFORMATIVE NOTE: A key may also be revoked as described below.
+      The distinction between revoking and removing a key selector
+      record is subtle.  When phasing out keys as described above, a
+      signing domain would probably simply remove the key record after
+
+
+
+Allman, et al.              Standards Track                     [Page 9]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+      the transition period.  However, a signing domain could elect to
+      revoke the key (but maintain the key record) for a further period.
+      There is no defined semantic difference between a revoked key and
+      a removed key.
+
+   While some domains may wish to make selector values well known,
+   others will want to take care not to allocate selector names in a way
+   that allows harvesting of data by outside parties.  For example, if
+   per-user keys are issued, the domain owner will need to make the
+   decision as to whether to associate this selector directly with the
+   user name, or make it some unassociated random value, such as a
+   fingerprint of the public key.
+
+      INFORMATIVE OPERATIONS NOTE: Reusing a selector with a new key
+      (for example, changing the key associated with a user's name)
+      makes it impossible to tell the difference between a message that
+      didn't verify because the key is no longer valid versus a message
+      that is actually forged.  For this reason, signers are ill-advised
+      to reuse selectors for new keys.  A better strategy is to assign
+      new keys to new selectors.
+
+3.2.  Tag=Value Lists
+
+   DKIM uses a simple "tag=value" syntax in several contexts, including
+   in messages and domain signature records.
+
+   Values are a series of strings containing either plain text, "base64"
+   text (as defined in [RFC2045], Section 6.8), "qp-section" (ibid,
+   Section 6.7), or "dkim-quoted-printable" (as defined in Section 2.6).
+   The name of the tag will determine the encoding of each value.
+   Unencoded semicolon (";") characters MUST NOT occur in the tag value,
+   since that separates tag-specs.
+
+      INFORMATIVE IMPLEMENTATION NOTE: Although the "plain text" defined
+      below (as "tag-value") only includes 7-bit characters, an
+      implementation that wished to anticipate future standards would be
+      advised not to preclude the use of UTF8-encoded text in tag=value
+      lists.
+
+
+
+
+
+
+
+
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 10]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   Formally, the syntax rules are as follows:
+
+        tag-list  =  tag-spec 0*( ";" tag-spec ) [ ";" ]
+        tag-spec  =  [FWS] tag-name [FWS] "=" [FWS] tag-value [FWS]
+        tag-name  =  ALPHA 0*ALNUMPUNC
+        tag-value =  [ tval 0*( 1*(WSP / FWS) tval ) ]
+                          ; WSP and FWS prohibited at beginning and end
+        tval      =  1*VALCHAR
+        VALCHAR   =  %x21-3A / %x3C-7E
+                          ; EXCLAMATION to TILDE except SEMICOLON
+        ALNUMPUNC =  ALPHA / DIGIT / "_"
+
+   Note that WSP is allowed anywhere around tags.  In particular, any
+   WSP after the "=" and any WSP before the terminating ";" is not part
+   of the value; however, WSP inside the value is significant.
+
+   Tags MUST be interpreted in a case-sensitive manner.  Values MUST be
+   processed as case sensitive unless the specific tag description of
+   semantics specifies case insensitivity.
+
+   Tags with duplicate names MUST NOT occur within a single tag-list; if
+   a tag name does occur more than once, the entire tag-list is invalid.
+
+   Whitespace within a value MUST be retained unless explicitly excluded
+   by the specific tag description.
+
+   Tag=value pairs that represent the default value MAY be included to
+   aid legibility.
+
+   Unrecognized tags MUST be ignored.
+
+   Tags that have an empty value are not the same as omitted tags.  An
+   omitted tag is treated as having the default value; a tag with an
+   empty value explicitly designates the empty string as the value.  For
+   example, "g=" does not mean "g=*", even though "g=*" is the default
+   for that tag.
+
+3.3.  Signing and Verification Algorithms
+
+   DKIM supports multiple digital signature algorithms.  Two algorithms
+   are defined by this specification at this time: rsa-sha1 and rsa-
+   sha256.  The rsa-sha256 algorithm is the default if no algorithm is
+   specified.  Verifiers MUST implement both rsa-sha1 and rsa-sha256.
+   Signers MUST implement and SHOULD sign using rsa-sha256.
+
+
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 11]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+      INFORMATIVE NOTE: Although sha256 is strongly encouraged, some
+      senders of low-security messages (such as routine newsletters) may
+      prefer to use sha1 because of reduced CPU requirements to compute
+      a sha1 hash.  In general, sha256 should always be used whenever
+      possible.
+
+3.3.1.  The rsa-sha1 Signing Algorithm
+
+   The rsa-sha1 Signing Algorithm computes a message hash as described
+   in Section 3.7 below using SHA-1 [FIPS.180-2.2002] as the hash-alg.
+   That hash is then signed by the signer using the RSA algorithm
+   (defined in PKCS#1 version 1.5 [RFC3447]) as the crypt-alg and the
+   signer's private key.  The hash MUST NOT be truncated or converted
+   into any form other than the native binary form before being signed.
+   The signing algorithm SHOULD use a public exponent of 65537.
+
+3.3.2.  The rsa-sha256 Signing Algorithm
+
+   The rsa-sha256 Signing Algorithm computes a message hash as described
+   in Section 3.7 below using SHA-256 [FIPS.180-2.2002] as the hash-alg.
+   That hash is then signed by the signer using the RSA algorithm
+   (defined in PKCS#1 version 1.5 [RFC3447]) as the crypt-alg and the
+   signer's private key.  The hash MUST NOT be truncated or converted
+   into any form other than the native binary form before being signed.
+
+3.3.3.  Key Sizes
+
+   Selecting appropriate key sizes is a trade-off between cost,
+   performance, and risk.  Since short RSA keys more easily succumb to
+   off-line attacks, signers MUST use RSA keys of at least 1024 bits for
+   long-lived keys.  Verifiers MUST be able to validate signatures with
+   keys ranging from 512 bits to 2048 bits, and they MAY be able to
+   validate signatures with larger keys.  Verifier policies may use the
+   length of the signing key as one metric for determining whether a
+   signature is acceptable.
+
+   Factors that should influence the key size choice include the
+   following:
+
+   o  The practical constraint that large (e.g., 4096 bit) keys may not
+      fit within a 512-byte DNS UDP response packet
+
+   o  The security constraint that keys smaller than 1024 bits are
+      subject to off-line attacks
+
+   o  Larger keys impose higher CPU costs to verify and sign email
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 12]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   o  Keys can be replaced on a regular basis, thus their lifetime can
+      be relatively short
+
+   o  The security goals of this specification are modest compared to
+      typical goals of other systems that employ digital signatures
+
+   See [RFC3766] for further discussion on selecting key sizes.
+
+3.3.4.  Other Algorithms
+
+   Other algorithms MAY be defined in the future.  Verifiers MUST ignore
+   any signatures using algorithms that they do not implement.
+
+3.4.  Canonicalization
+
+   Empirical evidence demonstrates that some mail servers and relay
+   systems modify email in transit, potentially invalidating a
+   signature.  There are two competing perspectives on such
+   modifications.  For most signers, mild modification of email is
+   immaterial to the authentication status of the email.  For such
+   signers, a canonicalization algorithm that survives modest in-transit
+   modification is preferred.
+
+   Other signers demand that any modification of the email, however
+   minor, result in a signature verification failure.  These signers
+   prefer a canonicalization algorithm that does not tolerate in-transit
+   modification of the signed email.
+
+   Some signers may be willing to accept modifications to header fields
+   that are within the bounds of email standards such as [RFC2822], but
+   are unwilling to accept any modification to the body of messages.
+
+   To satisfy all requirements, two canonicalization algorithms are
+   defined for each of the header and the body: a "simple" algorithm
+   that tolerates almost no modification and a "relaxed" algorithm that
+   tolerates common modifications such as whitespace replacement and
+   header field line rewrapping.  A signer MAY specify either algorithm
+   for header or body when signing an email.  If no canonicalization
+   algorithm is specified by the signer, the "simple" algorithm defaults
+   for both header and body.  Verifiers MUST implement both
+   canonicalization algorithms.  Note that the header and body may use
+   different canonicalization algorithms.  Further canonicalization
+   algorithms MAY be defined in the future; verifiers MUST ignore any
+   signatures that use unrecognized canonicalization algorithms.
+
+   Canonicalization simply prepares the email for presentation to the
+   signing or verification algorithm.  It MUST NOT change the
+
+
+
+
+Allman, et al.              Standards Track                    [Page 13]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   transmitted data in any way.  Canonicalization of header fields and
+   body are described below.
+
+   NOTE: This section assumes that the message is already in "network
+   normal" format (text is ASCII encoded, lines are separated with CRLF
+   characters, etc.).  See also Section 5.3 for information about
+   normalizing the message.
+
+3.4.1.  The "simple" Header Canonicalization Algorithm
+
+   The "simple" header canonicalization algorithm does not change header
+   fields in any way.  Header fields MUST be presented to the signing or
+   verification algorithm exactly as they are in the message being
+   signed or verified.  In particular, header field names MUST NOT be
+   case folded and whitespace MUST NOT be changed.
+
+3.4.2.  The "relaxed" Header Canonicalization Algorithm
+
+   The "relaxed" header canonicalization algorithm MUST apply the
+   following steps in order:
+
+   o  Convert all header field names (not the header field values) to
+      lowercase.  For example, convert "SUBJect: AbC" to "subject: AbC".
+
+   o  Unfold all header field continuation lines as described in
+      [RFC2822]; in particular, lines with terminators embedded in
+      continued header field values (that is, CRLF sequences followed by
+      WSP) MUST be interpreted without the CRLF.  Implementations MUST
+      NOT remove the CRLF at the end of the header field value.
+
+   o  Convert all sequences of one or more WSP characters to a single SP
+      character.  WSP characters here include those before and after a
+      line folding boundary.
+
+   o  Delete all WSP characters at the end of each unfolded header field
+      value.
+
+   o  Delete any WSP characters remaining before and after the colon
+      separating the header field name from the header field value.  The
+      colon separator MUST be retained.
+
+3.4.3.  The "simple" Body Canonicalization Algorithm
+
+   The "simple" body canonicalization algorithm ignores all empty lines
+   at the end of the message body.  An empty line is a line of zero
+   length after removal of the line terminator.  If there is no body or
+   no trailing CRLF on the message body, a CRLF is added.  It makes no
+
+
+
+
+Allman, et al.              Standards Track                    [Page 14]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   other changes to the message body.  In more formal terms, the
+   "simple" body canonicalization algorithm converts "0*CRLF" at the end
+   of the body to a single "CRLF".
+
+   Note that a completely empty or missing body is canonicalized as a
+   single "CRLF"; that is, the canonicalized length will be 2 octets.
+
+3.4.4.  The "relaxed" Body Canonicalization Algorithm
+
+   The "relaxed" body canonicalization algorithm:
+
+   o  Ignores all whitespace at the end of lines.  Implementations MUST
+      NOT remove the CRLF at the end of the line.
+
+   o  Reduces all sequences of WSP within a line to a single SP
+      character.
+
+   o  Ignores all empty lines at the end of the message body.  "Empty
+      line" is defined in Section 3.4.3.
+
+      INFORMATIVE NOTE: It should be noted that the relaxed body
+      canonicalization algorithm may enable certain types of extremely
+      crude "ASCII Art" attacks where a message may be conveyed by
+      adjusting the spacing between words.  If this is a concern, the
+      "simple" body canonicalization algorithm should be used instead.
+
+3.4.5.  Body Length Limits
+
+   A body length count MAY be specified to limit the signature
+   calculation to an initial prefix of the body text, measured in
+   octets.  If the body length count is not specified, the entire
+   message body is signed.
+
+      INFORMATIVE RATIONALE: This capability is provided because it is
+      very common for mailing lists to add trailers to messages (e.g.,
+      instructions how to get off the list).  Until those messages are
+      also signed, the body length count is a useful tool for the
+      verifier since it may as a matter of policy accept messages having
+      valid signatures with extraneous data.
+
+      INFORMATIVE IMPLEMENTATION NOTE: Using body length limits enables
+      an attack in which an attacker modifies a message to include
+      content that solely benefits the attacker.  It is possible for the
+      appended content to completely replace the original content in the
+      end recipient's eyes and to defeat duplicate message detection
+      algorithms.  To avoid this attack, signers should be wary of using
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 15]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+      this tag, and verifiers might wish to ignore the tag or remove
+      text that appears after the specified content length, perhaps
+      based on other criteria.
+
+   The body length count allows the signer of a message to permit data
+   to be appended to the end of the body of a signed message.  The body
+   length count MUST be calculated following the canonicalization
+   algorithm; for example, any whitespace ignored by a canonicalization
+   algorithm is not included as part of the body length count.  Signers
+   of MIME messages that include a body length count SHOULD be sure that
+   the length extends to the closing MIME boundary string.
+
+      INFORMATIVE IMPLEMENTATION NOTE: A signer wishing to ensure that
+      the only acceptable modifications are to add to the MIME postlude
+      would use a body length count encompassing the entire final MIME
+      boundary string, including the final "--CRLF".  A signer wishing
+      to allow additional MIME parts but not modification of existing
+      parts would use a body length count extending through the final
+      MIME boundary string, omitting the final "--CRLF".  Note that this
+      only works for some MIME types, e.g., multipart/mixed but not
+      multipart/signed.
+
+   A body length count of zero means that the body is completely
+   unsigned.
+
+   Signers wishing to ensure that no modification of any sort can occur
+   should specify the "simple" canonicalization algorithm for both
+   header and body and omit the body length count.
+
+3.4.6.  Canonicalization Examples (INFORMATIVE)
+
+   In the following examples, actual whitespace is used only for
+   clarity.  The actual input and output text is designated using
+   bracketed descriptors: "<SP>" for a space character, "<HTAB>" for a
+   tab character, and "<CRLF>" for a carriage-return/line-feed sequence.
+   For example, "X <SP> Y" and "X<SP>Y" represent the same three
+   characters.
+
+   Example 1: A message reading:
+
+       A: <SP> X <CRLF>
+       B <SP> : <SP> Y <HTAB><CRLF>
+       <HTAB> Z <SP><SP><CRLF>
+       <CRLF>
+       <SP> C <SP><CRLF>
+       D <SP><HTAB><SP> E <CRLF>
+       <CRLF>
+       <CRLF>
+
+
+
+Allman, et al.              Standards Track                    [Page 16]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   when canonicalized using relaxed canonicalization for both header and
+   body results in a header reading:
+
+       a:X <CRLF>
+       b:Y <SP> Z <CRLF>
+
+   and a body reading:
+
+       <SP> C <CRLF>
+       D <SP> E <CRLF>
+
+   Example 2: The same message canonicalized using simple
+   canonicalization for both header and body results in a header
+   reading:
+
+       A: <SP> X <CRLF>
+       B <SP> : <SP> Y <HTAB><CRLF>
+       <HTAB> Z <SP><SP><CRLF>
+
+   and a body reading:
+
+       <SP> C <SP><CRLF>
+       D <SP><HTAB><SP> E <CRLF>
+
+   Example 3: When processed using relaxed header canonicalization and
+   simple body canonicalization, the canonicalized version has a header
+   of:
+
+       a:X <CRLF>
+       b:Y <SP> Z <CRLF>
+
+   and a body reading:
+
+       <SP> C <SP><CRLF>
+       D <SP><HTAB><SP> E <CRLF>
+
+3.5.  The DKIM-Signature Header Field
+
+   The signature of the email is stored in the DKIM-Signature header
+   field.  This header field contains all of the signature and key-
+   fetching data.  The DKIM-Signature value is a tag-list as described
+   in Section 3.2.
+
+   The DKIM-Signature header field SHOULD be treated as though it were a
+   trace header field as defined in Section 3.6 of [RFC2822], and hence
+   SHOULD NOT be reordered and SHOULD be prepended to the message.
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 17]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   The DKIM-Signature header field being created or verified is always
+   included in the signature calculation, after the rest of the header
+   fields being signed; however, when calculating or verifying the
+   signature, the value of the "b=" tag (signature value) of that DKIM-
+   Signature header field MUST be treated as though it were an empty
+   string.  Unknown tags in the DKIM-Signature header field MUST be
+   included in the signature calculation but MUST be otherwise ignored
+   by verifiers.  Other DKIM-Signature header fields that are included
+   in the signature should be treated as normal header fields; in
+   particular, the "b=" tag is not treated specially.
+
+   The encodings for each field type are listed below.  Tags described
+   as qp-section are encoded as described in Section 6.7 of MIME Part
+   One [RFC2045], with the additional conversion of semicolon characters
+   to "=3B"; intuitively, this is one line of quoted-printable encoded
+   text.  The dkim-quoted-printable syntax is defined in Section 2.6.
+
+   Tags on the DKIM-Signature header field along with their type and
+   requirement status are shown below.  Unrecognized tags MUST be
+   ignored.
+
+   v=  Version (MUST be included).  This tag defines the version of this
+       specification that applies to the signature record.  It MUST have
+       the value "1".  Note that verifiers must do a string comparison
+       on this value; for example, "1" is not the same as "1.0".
+
+   ABNF:
+
+       sig-v-tag   = %x76 [FWS] "=" [FWS] "1"
+
+           INFORMATIVE NOTE: DKIM-Signature version numbers are expected
+           to increase arithmetically as new versions of this
+           specification are released.
+
+   a=  The algorithm used to generate the signature (plain-text;
+       REQUIRED).  Verifiers MUST support "rsa-sha1" and "rsa-sha256";
+       signers SHOULD sign using "rsa-sha256".  See Section 3.3 for a
+       description of algorithms.
+
+   ABNF:
+
+       sig-a-tag       = %x61 [FWS] "=" [FWS] sig-a-tag-alg
+       sig-a-tag-alg   = sig-a-tag-k "-" sig-a-tag-h
+       sig-a-tag-k     = "rsa" / x-sig-a-tag-k
+       sig-a-tag-h     = "sha1" / "sha256" / x-sig-a-tag-h
+       x-sig-a-tag-k   = ALPHA *(ALPHA / DIGIT)   ; for later extension
+       x-sig-a-tag-h   = ALPHA *(ALPHA / DIGIT)   ; for later extension
+
+
+
+
+Allman, et al.              Standards Track                    [Page 18]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   b=  The signature data (base64; REQUIRED).  Whitespace is ignored in
+       this value and MUST be ignored when reassembling the original
+       signature.  In particular, the signing process can safely insert
+       FWS in this value in arbitrary places to conform to line-length
+       limits.  See Signer Actions (Section 5) for how the signature is
+       computed.
+
+   ABNF:
+
+       sig-b-tag       = %x62 [FWS] "=" [FWS] sig-b-tag-data
+       sig-b-tag-data  = base64string
+
+   bh= The hash of the canonicalized body part of the message as limited
+       by the "l=" tag (base64; REQUIRED).  Whitespace is ignored in
+       this value and MUST be ignored when reassembling the original
+       signature.  In particular, the signing process can safely insert
+       FWS in this value in arbitrary places to conform to line-length
+       limits.  See Section 3.7 for how the body hash is computed.
+
+   ABNF:
+
+       sig-bh-tag      = %x62 %x68 [FWS] "=" [FWS] sig-bh-tag-data
+       sig-bh-tag-data = base64string
+
+   c=  Message canonicalization (plain-text; OPTIONAL, default is
+       "simple/simple").  This tag informs the verifier of the type of
+       canonicalization used to prepare the message for signing.  It
+       consists of two names separated by a "slash" (%d47) character,
+       corresponding to the header and body canonicalization algorithms
+       respectively.  These algorithms are described in Section 3.4.  If
+       only one algorithm is named, that algorithm is used for the
+       header and "simple" is used for the body.  For example,
+       "c=relaxed" is treated the same as "c=relaxed/simple".
+
+   ABNF:
+
+       sig-c-tag       = %x63 [FWS] "=" [FWS] sig-c-tag-alg
+                     ["/" sig-c-tag-alg]
+       sig-c-tag-alg   = "simple" / "relaxed" / x-sig-c-tag-alg
+       x-sig-c-tag-alg = hyphenated-word    ; for later extension
+
+   d=  The domain of the signing entity (plain-text; REQUIRED).  This is
+       the domain that will be queried for the public key.  This domain
+       MUST be the same as or a parent domain of the "i=" tag (the
+       signing identity, as described below), or it MUST meet the
+       requirements for parent domain signing described in Section 3.8.
+       When presented with a signature that does not meet these
+       requirement, verifiers MUST consider the signature invalid.
+
+
+
+Allman, et al.              Standards Track                    [Page 19]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   Internationalized domain names MUST be encoded as described in
+       [RFC3490].
+
+   ABNF:
+
+       sig-d-tag       = %x64 [FWS] "=" [FWS] domain-name
+       domain-name     = sub-domain 1*("." sub-domain)
+                ; from RFC 2821 Domain, but excluding address-literal
+
+   h=  Signed header fields (plain-text, but see description; REQUIRED).
+       A colon-separated list of header field names that identify the
+       header fields presented to the signing algorithm.  The field MUST
+       contain the complete list of header fields in the order presented
+       to the signing algorithm.  The field MAY contain names of header
+       fields that do not exist when signed; nonexistent header fields
+       do not contribute to the signature computation (that is, they are
+       treated as the null input, including the header field name, the
+       separating colon, the header field value, and any CRLF
+       terminator).  The field MUST NOT include the DKIM-Signature
+       header field that is being created or verified, but may include
+       others.  Folding whitespace (FWS) MAY be included on either side
+       of the colon separator.  Header field names MUST be compared
+       against actual header field names in a case-insensitive manner.
+       This list MUST NOT be empty.  See Section 5.4 for a discussion of
+       choosing header fields to sign.
+
+   ABNF:
+
+       sig-h-tag       = %x68 [FWS] "=" [FWS] hdr-name
+                     0*( *FWS ":" *FWS hdr-name )
+       hdr-name        = field-name
+
+       INFORMATIVE EXPLANATION: By "signing" header fields that do not
+           actually exist, a signer can prevent insertion of those
+           header fields before verification.  However, since a signer
+           cannot possibly know what header fields might be created in
+           the future, and that some MUAs might present header fields
+           that are embedded inside a message (e.g., as a message/rfc822
+           content type), the security of this solution is not total.
+
+       INFORMATIVE EXPLANATION: The exclusion of the header field name
+           and colon as well as the header field value for non-existent
+           header fields prevents an attacker from inserting an actual
+           header field with a null value.
+
+
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 20]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   i=  Identity of the user or agent (e.g., a mailing list manager) on
+       behalf of which this message is signed (dkim-quoted-printable;
+       OPTIONAL, default is an empty Local-part followed by an "@"
+       followed by the domain from the "d=" tag).  The syntax is a
+       standard email address where the Local-part MAY be omitted.  The
+       domain part of the address MUST be the same as or a subdomain of
+       the value of the "d=" tag.
+
+   Internationalized domain names MUST be converted using the steps
+       listed in Section 4 of [RFC3490] using the "ToASCII" function.
+
+   ABNF:
+
+       sig-i-tag =   %x69 [FWS] "=" [FWS] [ Local-part ] "@" domain-name
+
+       INFORMATIVE NOTE: The Local-part of the "i=" tag is optional
+           because in some cases a signer may not be able to establish a
+           verified individual identity.  In such cases, the signer may
+           wish to assert that although it is willing to go as far as
+           signing for the domain, it is unable or unwilling to commit
+           to an individual user name within their domain.  It can do so
+           by including the domain part but not the Local-part of the
+           identity.
+
+       INFORMATIVE DISCUSSION: This document does not require the value
+           of the "i=" tag to match the identity in any message header
+           fields.  This is considered to be a verifier policy issue.
+           Constraints between the value of the "i=" tag and other
+           identities in other header fields seek to apply basic
+           authentication into the semantics of trust associated with a
+           role such as content author.  Trust is a broad and complex
+           topic and trust mechanisms are subject to highly creative
+           attacks.  The real-world efficacy of any but the most basic
+           bindings between the "i=" value and other identities is not
+           well established, nor is its vulnerability to subversion by
+           an attacker.  Hence reliance on the use of these options
+           should be strictly limited.  In particular, it is not at all
+           clear to what extent a typical end-user recipient can rely on
+           any assurances that might be made by successful use of the
+           "i=" options.
+
+   l=  Body length count (plain-text unsigned decimal integer; OPTIONAL,
+       default is entire body).  This tag informs the verifier of the
+       number of octets in the body of the email after canonicalization
+       included in the cryptographic hash, starting from 0 immediately
+       following the CRLF preceding the body.  This value MUST NOT be
+       larger than the actual number of octets in the canonicalized
+       message body.
+
+
+
+Allman, et al.              Standards Track                    [Page 21]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+       INFORMATIVE IMPLEMENTATION WARNING: Use of the "l=" tag might
+           allow display of fraudulent content without appropriate
+           warning to end users.  The "l=" tag is intended for
+           increasing signature robustness when sending to mailing lists
+           that both modify their content and do not sign their
+           messages.  However, using the "l=" tag enables attacks in
+           which an intermediary with malicious intent modifies a
+           message to include content that solely benefits the attacker.
+           It is possible for the appended content to completely replace
+           the original content in the end recipient's eyes and to
+           defeat duplicate message detection algorithms.  Examples are
+           described in Security Considerations (Section 8).  To avoid
+           this attack, signers should be extremely wary of using this
+           tag, and verifiers might wish to ignore the tag or remove
+           text that appears after the specified content length.
+
+       INFORMATIVE NOTE: The value of the "l=" tag is constrained to 76
+           decimal digits.  This constraint is not intended to predict
+           the size of future messages or to require implementations to
+           use an integer representation large enough to represent the
+           maximum possible value, but is intended to remind the
+           implementer to check the length of this and all other tags
+           during verification and to test for integer overflow when
+           decoding the value.  Implementers may need to limit the
+           actual value expressed to a value smaller than 10^76, e.g.,
+           to allow a message to fit within the available storage space.
+
+   ABNF:
+
+   sig-l-tag    = %x6c [FWS] "=" [FWS] 1*76DIGIT
+
+   q=  A colon-separated list of query methods used to retrieve the
+       public key (plain-text; OPTIONAL, default is "dns/txt").  Each
+       query method is of the form "type[/options]", where the syntax
+       and semantics of the options depend on the type and specified
+       options.  If there are multiple query mechanisms listed, the
+       choice of query mechanism MUST NOT change the interpretation of
+       the signature.  Implementations MUST use the recognized query
+       mechanisms in the order presented.
+
+   Currently, the only valid value is "dns/txt", which defines the DNS
+       TXT record lookup algorithm described elsewhere in this document.
+       The only option defined for the "dns" query type is "txt", which
+       MUST be included.  Verifiers and signers MUST support "dns/txt".
+
+
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 22]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   ABNF:
+
+       sig-q-tag        = %x71 [FWS] "=" [FWS] sig-q-tag-method
+                      *([FWS] ":" [FWS] sig-q-tag-method)
+       sig-q-tag-method = "dns/txt" / x-sig-q-tag-type
+                      ["/" x-sig-q-tag-args]
+       x-sig-q-tag-type = hyphenated-word  ; for future extension
+       x-sig-q-tag-args = qp-hdr-value
+
+   s=  The selector subdividing the namespace for the "d=" (domain) tag
+       (plain-text; REQUIRED).
+
+   ABNF:
+
+       sig-s-tag    = %x73 [FWS] "=" [FWS] selector
+
+   t=  Signature Timestamp (plain-text unsigned decimal integer;
+       RECOMMENDED, default is an unknown creation time).  The time that
+       this signature was created.  The format is the number of seconds
+       since 00:00:00 on January 1, 1970 in the UTC time zone.  The
+       value is expressed as an unsigned integer in decimal ASCII.  This
+       value is not constrained to fit into a 31- or 32-bit integer.
+       Implementations SHOULD be prepared to handle values up to at
+       least 10^12 (until approximately AD 200,000; this fits into 40
+       bits).  To avoid denial-of-service attacks, implementations MAY
+       consider any value longer than 12 digits to be infinite.  Leap
+       seconds are not counted.  Implementations MAY ignore signatures
+       that have a timestamp in the future.
+
+   ABNF:
+
+       sig-t-tag    = %x74 [FWS] "=" [FWS] 1*12DIGIT
+
+   x=  Signature Expiration (plain-text unsigned decimal integer;
+       RECOMMENDED, default is no expiration).  The format is the same
+       as in the "t=" tag, represented as an absolute date, not as a
+       time delta from the signing timestamp.  The value is expressed as
+       an unsigned integer in decimal ASCII, with the same constraints
+       on the value in the "t=" tag.  Signatures MAY be considered
+       invalid if the verification time at the verifier is past the
+       expiration date.  The verification time should be the time that
+       the message was first received at the administrative domain of
+       the verifier if that time is reliably available; otherwise the
+       current time should be used.  The value of the "x=" tag MUST be
+       greater than the value of the "t=" tag if both are present.
+
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 23]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+       INFORMATIVE NOTE: The "x=" tag is not intended as an anti-replay
+           defense.
+
+   ABNF:
+
+       sig-x-tag    = %x78 [FWS] "=" [FWS] 1*12DIGIT
+
+   z=  Copied header fields (dkim-quoted-printable, but see description;
+       OPTIONAL, default is null).  A vertical-bar-separated list of
+       selected header fields present when the message was signed,
+       including both the field name and value.  It is not required to
+       include all header fields present at the time of signing.  This
+       field need not contain the same header fields listed in the "h="
+       tag.  The header field text itself must encode the vertical bar
+       ("|", %x7C) character (i.e., vertical bars in the "z=" text are
+       metacharacters, and any actual vertical bar characters in a
+       copied header field must be encoded).  Note that all whitespace
+       must be encoded, including whitespace between the colon and the
+       header field value.  After encoding, FWS MAY be added at
+       arbitrary locations in order to avoid excessively long lines;
+       such whitespace is NOT part of the value of the header field, and
+       MUST be removed before decoding.
+
+   The header fields referenced by the "h=" tag refer to the fields in
+       the RFC 2822 header of the message, not to any copied fields in
+       the "z=" tag.  Copied header field values are for diagnostic use.
+
+   Header fields with characters requiring conversion (perhaps from
+       legacy MTAs that are not [RFC2822] compliant) SHOULD be converted
+       as described in MIME Part Three [RFC2047].
+
+   ABNF:
+       sig-z-tag      = %x7A [FWS] "=" [FWS] sig-z-tag-copy
+                    *( [FWS] "|" sig-z-tag-copy )
+   sig-z-tag-copy = hdr-name ":" qp-hdr-value
+   qp-hdr-value   = dkim-quoted-printable    ; with "|" encoded
+
+      INFORMATIVE EXAMPLE of a signature header field spread across
+      multiple continuation lines:
+
+
+
+
+
+
+
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 24]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   DKIM-Signature: a=rsa-sha256; d=example.net; s=brisbane;
+      c=simple; q=dns/txt; i=@eng.example.net;
+      t=1117574938; x=1118006938;
+      h=from:to:subject:date;
+      z=From:foo@eng.example.net|To:joe@example.com|
+        Subject:demo=20run|Date:July=205,=202005=203:44:08=20PM=20-0700;
+      bh=MTIzNDU2Nzg5MDEyMzQ1Njc4OTAxMjM0NTY3ODkwMTI=;
+      b=dzdVyOfAKCdLXdJOc9G2q8LoXSlEniSbav+yuU4zGeeruD00lszZ
+               VoG4ZHRNiYzR
+
+3.6.  Key Management and Representation
+
+   Signature applications require some level of assurance that the
+   verification public key is associated with the claimed signer.  Many
+   applications achieve this by using public key certificates issued by
+   a trusted third party.  However, DKIM can achieve a sufficient level
+   of security, with significantly enhanced scalability, by simply
+   having the verifier query the purported signer's DNS entry (or some
+   security-equivalent) in order to retrieve the public key.
+
+   DKIM keys can potentially be stored in multiple types of key servers
+   and in multiple formats.  The storage and format of keys are
+   irrelevant to the remainder of the DKIM algorithm.
+
+   Parameters to the key lookup algorithm are the type of the lookup
+   (the "q=" tag), the domain of the signer (the "d=" tag of the DKIM-
+   Signature header field), and the selector (the "s=" tag).
+
+       public_key = dkim_find_key(q_val, d_val, s_val)
+
+   This document defines a single binding, using DNS TXT records to
+   distribute the keys.  Other bindings may be defined in the future.
+
+3.6.1.  Textual Representation
+
+   It is expected that many key servers will choose to present the keys
+   in an otherwise unstructured text format (for example, an XML form
+   would not be considered to be unstructured text for this purpose).
+   The following definition MUST be used for any DKIM key represented in
+   an otherwise unstructured textual form.
+
+   The overall syntax is a tag-list as described in Section 3.2.  The
+   current valid tags are described below.  Other tags MAY be present
+   and MUST be ignored by any implementation that does not understand
+   them.
+
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 25]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   v=  Version of the DKIM key record (plain-text; RECOMMENDED, default
+       is "DKIM1").  If specified, this tag MUST be set to "DKIM1"
+       (without the quotes).  This tag MUST be the first tag in the
+       record.  Records beginning with a "v=" tag with any other value
+       MUST be discarded.  Note that verifiers must do a string
+       comparison on this value; for example, "DKIM1" is not the same as
+       "DKIM1.0".
+
+       ABNF:
+
+       key-v-tag    = %x76 [FWS] "=" [FWS] "DKIM1"
+
+   g=  Granularity of the key (plain-text; OPTIONAL, default is "*").
+       This value MUST match the Local-part of the "i=" tag of the DKIM-
+       Signature header field (or its default value of the empty string
+       if "i=" is not specified), with a single, optional "*" character
+       matching a sequence of zero or more arbitrary characters
+       ("wildcarding").  An email with a signing address that does not
+       match the value of this tag constitutes a failed verification.
+       The intent of this tag is to constrain which signing address can
+       legitimately use this selector, for example, when delegating a
+       key to a third party that should only be used for special
+       purposes.  Wildcarding allows matching for addresses such as
+       "user+*" or "*-offer".  An empty "g=" value never matches any
+       addresses.
+
+   ABNF:
+
+       key-g-tag       = %x67 [FWS] "=" [FWS] key-g-tag-lpart
+       key-g-tag-lpart = [dot-atom-text] ["*" [dot-atom-text] ]
+
+   h=  Acceptable hash algorithms (plain-text; OPTIONAL, defaults to
+       allowing all algorithms).  A colon-separated list of hash
+       algorithms that might be used.  Signers and Verifiers MUST
+       support the "sha256" hash algorithm.  Verifiers MUST also support
+       the "sha1" hash algorithm.
+
+       ABNF:
+
+       key-h-tag       = %x68 [FWS] "=" [FWS] key-h-tag-alg
+                     0*( [FWS] ":" [FWS] key-h-tag-alg )
+       key-h-tag-alg   = "sha1" / "sha256" / x-key-h-tag-alg
+       x-key-h-tag-alg = hyphenated-word   ; for future extension
+
+
+
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 26]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   k=  Key type (plain-text; OPTIONAL, default is "rsa").  Signers and
+       verifiers MUST support the "rsa" key type.  The "rsa" key type
+       indicates that an ASN.1 DER-encoded [ITU.X660.1997] RSAPublicKey
+       [RFC3447] (see Sections 3.1 and A.1.1) is being used in the "p="
+       tag.  (Note: the "p=" tag further encodes the value using the
+       base64 algorithm.)
+
+       ABNF:
+
+       key-k-tag        = %x76 [FWS] "=" [FWS] key-k-tag-type
+       key-k-tag-type   = "rsa" / x-key-k-tag-type
+       x-key-k-tag-type = hyphenated-word   ; for future extension
+
+   n=  Notes that might be of interest to a human (qp-section; OPTIONAL,
+       default is empty).  No interpretation is made by any program.
+       This tag should be used sparingly in any key server mechanism
+       that has space limitations (notably DNS).  This is intended for
+       use by administrators, not end users.
+
+   ABNF:
+
+       key-n-tag    = %x6e [FWS] "=" [FWS] qp-section
+
+   p=  Public-key data (base64; REQUIRED).  An empty value means that
+       this public key has been revoked.  The syntax and semantics of
+       this tag value before being encoded in base64 are defined by the
+       "k=" tag.
+
+           INFORMATIVE RATIONALE: If a private key has been compromised
+           or otherwise disabled (e.g., an outsourcing contract has been
+           terminated), a signer might want to explicitly state that it
+           knows about the selector, but all messages using that
+           selector should fail verification.  Verifiers should ignore
+           any DKIM-Signature header fields with a selector referencing
+           a revoked key.
+
+   ABNF:
+
+       key-p-tag    = %x70 [FWS] "=" [ [FWS] base64string ]
+
+       INFORMATIVE NOTE: A base64string is permitted to include white
+           space (FWS) at arbitrary places; however, any CRLFs must be
+           followed by at least one WSP character.  Implementors and
+           administrators are cautioned to ensure that selector TXT
+           records conform to this specification.
+
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 27]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   s=  Service Type (plain-text; OPTIONAL; default is "*").  A colon-
+       separated list of service types to which this record applies.
+       Verifiers for a given service type MUST ignore this record if the
+       appropriate type is not listed.  Currently defined service types
+       are as follows:
+
+       *   matches all service types
+
+       email   electronic mail (not necessarily limited to SMTP)
+
+       This tag is intended to constrain the use of keys for other
+       purposes, should use of DKIM be defined by other services in the
+       future.
+
+   ABNF:
+
+       key-s-tag        = %x73 [FWS] "=" [FWS] key-s-tag-type
+                       0*( [FWS] ":" [FWS] key-s-tag-type )
+       key-s-tag-type   = "email" / "*" / x-key-s-tag-type
+       x-key-s-tag-type = hyphenated-word   ; for future extension
+
+   t=  Flags, represented as a colon-separated list of names (plain-
+       text; OPTIONAL, default is no flags set).  The defined flags are
+       as follows:
+
+       y   This domain is testing DKIM.  Verifiers MUST NOT treat
+           messages from signers in testing mode differently from
+           unsigned email, even should the signature fail to verify.
+           Verifiers MAY wish to track testing mode results to assist
+           the signer.
+
+       s   Any DKIM-Signature header fields using the "i=" tag MUST have
+           the same domain value on the right-hand side of the "@" in
+           the "i=" tag and the value of the "d=" tag.  That is, the
+           "i=" domain MUST NOT be a subdomain of "d=".  Use of this
+           flag is RECOMMENDED unless subdomaining is required.
+
+   ABNF:
+
+       key-t-tag        = %x74 [FWS] "=" [FWS] key-t-tag-flag
+                      0*( [FWS] ":" [FWS] key-t-tag-flag )
+       key-t-tag-flag   = "y" / "s" / x-key-t-tag-flag
+       x-key-t-tag-flag = hyphenated-word   ; for future extension
+
+   Unrecognized flags MUST be ignored.
+
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 28]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+3.6.2.  DNS Binding
+
+   A binding using DNS TXT records as a key service is hereby defined.
+   All implementations MUST support this binding.
+
+3.6.2.1.  Namespace
+
+   All DKIM keys are stored in a subdomain named "_domainkey".  Given a
+   DKIM-Signature field with a "d=" tag of "example.com" and an "s=" tag
+   of "foo.bar", the DNS query will be for
+   "foo.bar._domainkey.example.com".
+
+      INFORMATIVE OPERATIONAL NOTE: Wildcard DNS records (e.g.,
+      *.bar._domainkey.example.com) do not make sense in this context
+      and should not be used.  Note also that wildcards within domains
+      (e.g., s._domainkey.*.example.com) are not supported by the DNS.
+
+3.6.2.2.  Resource Record Types for Key Storage
+
+   The DNS Resource Record type used is specified by an option to the
+   query-type ("q=") tag.  The only option defined in this base
+   specification is "txt", indicating the use of a TXT Resource Record
+   (RR).  A later extension of this standard may define another RR type.
+
+   Strings in a TXT RR MUST be concatenated together before use with no
+   intervening whitespace.  TXT RRs MUST be unique for a particular
+   selector name; that is, if there are multiple records in an RRset,
+   the results are undefined.
+
+   TXT RRs are encoded as described in Section 3.6.1.
+
+3.7.  Computing the Message Hashes
+
+   Both signing and verifying message signatures start with a step of
+   computing two cryptographic hashes over the message.  Signers will
+   choose the parameters of the signature as described in Signer Actions
+   (Section 5); verifiers will use the parameters specified in the DKIM-
+   Signature header field being verified.  In the following discussion,
+   the names of the tags in the DKIM-Signature header field that either
+   exists (when verifying) or will be created (when signing) are used.
+   Note that canonicalization (Section 3.4) is only used to prepare the
+   email for signing or verifying; it does not affect the transmitted
+   email in any way.
+
+   The signer/verifier MUST compute two hashes, one over the body of the
+   message and one over the selected header fields of the message.
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 29]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   Signers MUST compute them in the order shown.  Verifiers MAY compute
+   them in any order convenient to the verifier, provided that the
+   result is semantically identical to the semantics that would be the
+   case had they been computed in this order.
+
+   In hash step 1, the signer/verifier MUST hash the message body,
+   canonicalized using the body canonicalization algorithm specified in
+   the "c=" tag and then truncated to the length specified in the "l="
+   tag.  That hash value is then converted to base64 form and inserted
+   into (signers) or compared to (verifiers) the "bh=" tag of the DKIM-
+   Signature header field.
+
+   In hash step 2, the signer/verifier MUST pass the following to the
+   hash algorithm in the indicated order.
+
+   1.  The header fields specified by the "h=" tag, in the order
+       specified in that tag, and canonicalized using the header
+       canonicalization algorithm specified in the "c=" tag.  Each
+       header field MUST be terminated with a single CRLF.
+
+   2.  The DKIM-Signature header field that exists (verifying) or will
+       be inserted (signing) in the message, with the value of the "b="
+       tag deleted (i.e., treated as the empty string), canonicalized
+       using the header canonicalization algorithm specified in the "c="
+       tag, and without a trailing CRLF.
+
+   All tags and their values in the DKIM-Signature header field are
+   included in the cryptographic hash with the sole exception of the
+   value portion of the "b=" (signature) tag, which MUST be treated as
+   the null string.  All tags MUST be included even if they might not be
+   understood by the verifier.  The header field MUST be presented to
+   the hash algorithm after the body of the message rather than with the
+   rest of the header fields and MUST be canonicalized as specified in
+   the "c=" (canonicalization) tag.  The DKIM-Signature header field
+   MUST NOT be included in its own h= tag, although other DKIM-Signature
+   header fields MAY be signed (see Section 4).
+
+   When calculating the hash on messages that will be transmitted using
+   base64 or quoted-printable encoding, signers MUST compute the hash
+   after the encoding.  Likewise, the verifier MUST incorporate the
+   values into the hash before decoding the base64 or quoted-printable
+   text.  However, the hash MUST be computed before transport level
+   encodings such as SMTP "dot-stuffing" (the modification of lines
+   beginning with a "." to avoid confusion with the SMTP end-of-message
+   marker, as specified in [RFC2821]).
+
+   With the exception of the canonicalization procedure described in
+   Section 3.4, the DKIM signing process treats the body of messages as
+
+
+
+Allman, et al.              Standards Track                    [Page 30]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   simply a string of octets.  DKIM messages MAY be either in plain-text
+   or in MIME format; no special treatment is afforded to MIME content.
+   Message attachments in MIME format MUST be included in the content
+   that is signed.
+
+   More formally, the algorithm for the signature is as follows:
+       body-hash = hash-alg(canon_body)
+       header-hash = hash-alg(canon_header || DKIM-SIG)
+       signature = sig-alg(header-hash, key)
+
+   where "sig-alg" is the signature algorithm specified by the "a=" tag,
+   "hash-alg" is the hash algorithm specified by the "a=" tag,
+   "canon_header" and "canon_body" are the canonicalized message header
+   and body (respectively) as defined in Section 3.4 (excluding the
+   DKIM-Signature header field), and "DKIM-SIG" is the canonicalized
+   DKIM-Signature header field sans the signature value itself, but with
+   "body-hash" included as the "bh=" tag.
+
+      INFORMATIVE IMPLEMENTERS' NOTE: Many digital signature APIs
+      provide both hashing and application of the RSA private key using
+      a single "sign()" primitive.  When using such an API, the last two
+      steps in the algorithm would probably be combined into a single
+      call that would perform both the "hash-alg" and the "sig-alg".
+
+3.8.  Signing by Parent Domains
+
+   In some circumstances, it is desirable for a domain to apply a
+   signature on behalf of any of its subdomains without the need to
+   maintain separate selectors (key records) in each subdomain.  By
+   default, private keys corresponding to key records can be used to
+   sign messages for any subdomain of the domain in which they reside;
+   e.g., a key record for the domain example.com can be used to verify
+   messages where the signing identity ("i=" tag of the signature) is
+   sub.example.com, or even sub1.sub2.example.com.  In order to limit
+   the capability of such keys when this is not intended, the "s" flag
+   may be set in the "t=" tag of the key record to constrain the
+   validity of the record to exactly the domain of the signing identity.
+   If the referenced key record contains the "s" flag as part of the
+   "t=" tag, the domain of the signing identity ("i=" flag) MUST be the
+   same as that of the d= domain.  If this flag is absent, the domain of
+   the signing identity MUST be the same as, or a subdomain of, the d=
+   domain.  Key records that are not intended for use with subdomains
+   SHOULD specify the "s" flag in the "t=" tag.
+
+
+
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 31]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+4.  Semantics of Multiple Signatures
+
+4.1.  Example Scenarios
+
+   There are many reasons why a message might have multiple signatures.
+   For example, a given signer might sign multiple times, perhaps with
+   different hashing or signing algorithms during a transition phase.
+
+      INFORMATIVE EXAMPLE: Suppose SHA-256 is in the future found to be
+      insufficiently strong, and DKIM usage transitions to SHA-1024.  A
+      signer might immediately sign using the newer algorithm, but
+      continue to sign using the older algorithm for interoperability
+      with verifiers that had not yet upgraded.  The signer would do
+      this by adding two DKIM-Signature header fields, one using each
+      algorithm.  Older verifiers that did not recognize SHA-1024 as an
+      acceptable algorithm would skip that signature and use the older
+      algorithm; newer verifiers could use either signature at their
+      option, and all other things being equal might not even attempt to
+      verify the other signature.
+
+   Similarly, a signer might sign a message including all headers and no
+   "l=" tag (to satisfy strict verifiers) and a second time with a
+   limited set of headers and an "l=" tag (in anticipation of possible
+   message modifications in route to other verifiers).  Verifiers could
+   then choose which signature they preferred.
+
+      INFORMATIVE EXAMPLE: A verifier might receive a message with two
+      signatures, one covering more of the message than the other.  If
+      the signature covering more of the message verified, then the
+      verifier could make one set of policy decisions; if that signature
+      failed but the signature covering less of the message verified,
+      the verifier might make a different set of policy decisions.
+
+   Of course, a message might also have multiple signatures because it
+   passed through multiple signers.  A common case is expected to be
+   that of a signed message that passes through a mailing list that also
+   signs all messages.  Assuming both of those signatures verify, a
+   recipient might choose to accept the message if either of those
+   signatures were known to come from trusted sources.
+
+      INFORMATIVE EXAMPLE: Recipients might choose to whitelist mailing
+      lists to which they have subscribed and that have acceptable anti-
+      abuse policies so as to accept messages sent to that list even
+      from unknown authors.  They might also subscribe to less trusted
+      mailing lists (e.g., those without anti-abuse protection) and be
+      willing to accept all messages from specific authors, but insist
+      on doing additional abuse scanning for other messages.
+
+
+
+
+Allman, et al.              Standards Track                    [Page 32]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   Another related example of multiple signers might be forwarding
+   services, such as those commonly associated with academic alumni
+   sites.
+
+      INFORMATIVE EXAMPLE: A recipient might have an address at
+      members.example.org, a site that has anti-abuse protection that is
+      somewhat less effective than the recipient would prefer.  Such a
+      recipient might have specific authors whose messages would be
+      trusted absolutely, but messages from unknown authors that had
+      passed the forwarder's scrutiny would have only medium trust.
+
+4.2.  Interpretation
+
+   A signer that is adding a signature to a message merely creates a new
+   DKIM-Signature header, using the usual semantics of the h= option.  A
+   signer MAY sign previously existing DKIM-Signature header fields
+   using the method described in Section 5.4 to sign trace header
+   fields.
+
+      INFORMATIVE NOTE: Signers should be cognizant that signing DKIM-
+      Signature header fields may result in signature failures with
+      intermediaries that do not recognize that DKIM-Signature header
+      fields are trace header fields and unwittingly reorder them, thus
+      breaking such signatures.  For this reason, signing existing DKIM-
+      Signature header fields is unadvised, albeit legal.
+
+      INFORMATIVE NOTE: If a header field with multiple instances is
+      signed, those header fields are always signed from the bottom up.
+      Thus, it is not possible to sign only specific DKIM-Signature
+      header fields.  For example, if the message being signed already
+      contains three DKIM-Signature header fields A, B, and C, it is
+      possible to sign all of them, B and C only, or C only, but not A
+      only, B only, A and B only, or A and C only.
+
+   A signer MAY add more than one DKIM-Signature header field using
+   different parameters.  For example, during a transition period a
+   signer might want to produce signatures using two different hash
+   algorithms.
+
+   Signers SHOULD NOT remove any DKIM-Signature header fields from
+   messages they are signing, even if they know that the signatures
+   cannot be verified.
+
+   When evaluating a message with multiple signatures, a verifier SHOULD
+   evaluate signatures independently and on their own merits.  For
+   example, a verifier that by policy chooses not to accept signatures
+   with deprecated cryptographic algorithms would consider such
+   signatures invalid.  Verifiers MAY process signatures in any order of
+
+
+
+Allman, et al.              Standards Track                    [Page 33]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   their choice; for example, some verifiers might choose to process
+   signatures corresponding to the From field in the message header
+   before other signatures.  See Section 6.1 for more information about
+   signature choices.
+
+      INFORMATIVE IMPLEMENTATION NOTE: Verifier attempts to correlate
+      valid signatures with invalid signatures in an attempt to guess
+      why a signature failed are ill-advised.  In particular, there is
+      no general way that a verifier can determine that an invalid
+      signature was ever valid.
+
+   Verifiers SHOULD ignore failed signatures as though they were not
+   present in the message.  Verifiers SHOULD continue to check
+   signatures until a signature successfully verifies to the
+   satisfaction of the verifier.  To limit potential denial-of-service
+   attacks, verifiers MAY limit the total number of signatures they will
+   attempt to verify.
+
+5.  Signer Actions
+
+   The following steps are performed in order by signers.
+
+5.1.  Determine Whether the Email Should Be Signed and by Whom
+
+   A signer can obviously only sign email for domains for which it has a
+   private key and the necessary knowledge of the corresponding public
+   key and selector information.  However, there are a number of other
+   reasons beyond the lack of a private key why a signer could choose
+   not to sign an email.
+
+      INFORMATIVE NOTE: Signing modules may be incorporated into any
+      portion of the mail system as deemed appropriate, including an
+      MUA, a SUBMISSION server, or an MTA.  Wherever implemented,
+      signers should beware of signing (and thereby asserting
+      responsibility for) messages that may be problematic.  In
+      particular, within a trusted enclave the signing address might be
+      derived from the header according to local policy; SUBMISSION
+      servers might only sign messages from users that are properly
+      authenticated and authorized.
+
+      INFORMATIVE IMPLEMENTER ADVICE: SUBMISSION servers should not sign
+      Received header fields if the outgoing gateway MTA obfuscates
+      Received header fields, for example, to hide the details of
+      internal topology.
+
+   If an email cannot be signed for some reason, it is a local policy
+   decision as to what to do with that email.
+
+
+
+
+Allman, et al.              Standards Track                    [Page 34]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+5.2.  Select a Private Key and Corresponding Selector Information
+
+   This specification does not define the basis by which a signer should
+   choose which private key and selector information to use.  Currently,
+   all selectors are equal as far as this specification is concerned, so
+   the decision should largely be a matter of administrative
+   convenience.  Distribution and management of private keys is also
+   outside the scope of this document.
+
+      INFORMATIVE OPERATIONS ADVICE: A signer should not sign with a
+      private key when the selector containing the corresponding public
+      key is expected to be revoked or removed before the verifier has
+      an opportunity to validate the signature.  The signer should
+      anticipate that verifiers may choose to defer validation, perhaps
+      until the message is actually read by the final recipient.  In
+      particular, when rotating to a new key pair, signing should
+      immediately commence with the new private key and the old public
+      key should be retained for a reasonable validation interval before
+      being removed from the key server.
+
+5.3.  Normalize the Message to Prevent Transport Conversions
+
+   Some messages, particularly those using 8-bit characters, are subject
+   to modification during transit, notably conversion to 7-bit form.
+   Such conversions will break DKIM signatures.  In order to minimize
+   the chances of such breakage, signers SHOULD convert the message to a
+   suitable MIME content transfer encoding such as quoted-printable or
+   base64 as described in MIME Part One [RFC2045] before signing.  Such
+   conversion is outside the scope of DKIM; the actual message SHOULD be
+   converted to 7-bit MIME by an MUA or MSA prior to presentation to the
+   DKIM algorithm.
+
+   If the message is submitted to the signer with any local encoding
+   that will be modified before transmission, that modification to
+   canonical [RFC2822] form MUST be done before signing.  In particular,
+   bare CR or LF characters (used by some systems as a local line
+   separator convention) MUST be converted to the SMTP-standard CRLF
+   sequence before the message is signed.  Any conversion of this sort
+   SHOULD be applied to the message actually sent to the recipient(s),
+   not just to the version presented to the signing algorithm.
+
+   More generally, the signer MUST sign the message as it is expected to
+   be received by the verifier rather than in some local or internal
+   form.
+
+
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 35]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+5.4.  Determine the Header Fields to Sign
+
+   The From header field MUST be signed (that is, included in the "h="
+   tag of the resulting DKIM-Signature header field).  Signers SHOULD
+   NOT sign an existing header field likely to be legitimately modified
+   or removed in transit.  In particular, [RFC2821] explicitly permits
+   modification or removal of the Return-Path header field in transit.
+   Signers MAY include any other header fields present at the time of
+   signing at the discretion of the signer.
+
+      INFORMATIVE OPERATIONS NOTE: The choice of which header fields to
+      sign is non-obvious.  One strategy is to sign all existing, non-
+      repeatable header fields.  An alternative strategy is to sign only
+      header fields that are likely to be displayed to or otherwise be
+      likely to affect the processing of the message at the receiver.  A
+      third strategy is to sign only "well known" headers.  Note that
+      verifiers may treat unsigned header fields with extreme
+      skepticism, including refusing to display them to the end user or
+      even ignoring the signature if it does not cover certain header
+      fields.  For this reason, signing fields present in the message
+      such as Date, Subject, Reply-To, Sender, and all MIME header
+      fields are highly advised.
+
+   The DKIM-Signature header field is always implicitly signed and MUST
+   NOT be included in the "h=" tag except to indicate that other
+   preexisting signatures are also signed.
+
+   Signers MAY claim to have signed header fields that do not exist
+   (that is, signers MAY include the header field name in the "h=" tag
+   even if that header field does not exist in the message).  When
+   computing the signature, the non-existing header field MUST be
+   treated as the null string (including the header field name, header
+   field value, all punctuation, and the trailing CRLF).
+
+      INFORMATIVE RATIONALE: This allows signers to explicitly assert
+      the absence of a header field; if that header field is added later
+      the signature will fail.
+
+      INFORMATIVE NOTE: A header field name need only be listed once
+      more than the actual number of that header field in a message at
+      the time of signing in order to prevent any further additions.
+      For example, if there is a single Comments header field at the
+      time of signing, listing Comments twice in the "h=" tag is
+      sufficient to prevent any number of Comments header fields from
+      being appended; it is not necessary (but is legal) to list
+      Comments three or more times in the "h=" tag.
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 36]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   Signers choosing to sign an existing header field that occurs more
+   than once in the message (such as Received) MUST sign the physically
+   last instance of that header field in the header block.  Signers
+   wishing to sign multiple instances of such a header field MUST
+   include the header field name multiple times in the h= tag of the
+   DKIM-Signature header field, and MUST sign such header fields in
+   order from the bottom of the header field block to the top.  The
+   signer MAY include more instances of a header field name in h= than
+   there are actual corresponding header fields to indicate that
+   additional header fields of that name SHOULD NOT be added.
+
+      INFORMATIVE EXAMPLE:
+
+      If the signer wishes to sign two existing Received header fields,
+      and the existing header contains:
+
+       Received: <A>
+       Received: <B>
+       Received: <C>
+
+      then the resulting DKIM-Signature header field should read:
+
+       DKIM-Signature: ... h=Received : Received : ...
+
+      and Received header fields <C> and <B> will be signed in that
+      order.
+
+   Signers should be careful of signing header fields that might have
+   additional instances added later in the delivery process, since such
+   header fields might be inserted after the signed instance or
+   otherwise reordered.  Trace header fields (such as Received) and
+   Resent-* blocks are the only fields prohibited by [RFC2822] from
+   being reordered.  In particular, since DKIM-Signature header fields
+   may be reordered by some intermediate MTAs, signing existing DKIM-
+   Signature header fields is error-prone.
+
+      INFORMATIVE ADMONITION: Despite the fact that [RFC2822] permits
+      header fields to be reordered (with the exception of Received
+      header fields), reordering of signed header fields with multiple
+      instances by intermediate MTAs will cause DKIM signatures to be
+      broken; such anti-social behavior should be avoided.
+
+      INFORMATIVE IMPLEMENTER'S NOTE: Although not required by this
+      specification, all end-user visible header fields should be signed
+      to avoid possible "indirect spamming".  For example, if the
+      Subject header field is not signed, a spammer can resend a
+      previously signed mail, replacing the legitimate subject with a
+      one-line spam.
+
+
+
+Allman, et al.              Standards Track                    [Page 37]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+5.5.  Recommended Signature Content
+
+   In order to maximize compatibility with a variety of verifiers, it is
+   recommended that signers follow the practices outlined in this
+   section when signing a message.  However, these are generic
+   recommendations applying to the general case; specific senders may
+   wish to modify these guidelines as required by their unique
+   situations.  Verifiers MUST be capable of verifying signatures even
+   if one or more of the recommended header fields is not signed (with
+   the exception of From, which must always be signed) or if one or more
+   of the disrecommended header fields is signed.  Note that verifiers
+   do have the option of ignoring signatures that do not cover a
+   sufficient portion of the header or body, just as they may ignore
+   signatures from an identity they do not trust.
+
+   The following header fields SHOULD be included in the signature, if
+   they are present in the message being signed:
+
+   o  From (REQUIRED in all signatures)
+
+   o  Sender, Reply-To
+
+   o  Subject
+
+   o  Date, Message-ID
+
+   o  To, Cc
+
+   o  MIME-Version
+
+   o  Content-Type, Content-Transfer-Encoding, Content-ID, Content-
+      Description
+
+   o  Resent-Date, Resent-From, Resent-Sender, Resent-To, Resent-Cc,
+      Resent-Message-ID
+
+   o  In-Reply-To, References
+
+   o  List-Id, List-Help, List-Unsubscribe, List-Subscribe, List-Post,
+      List-Owner, List-Archive
+
+   The following header fields SHOULD NOT be included in the signature:
+
+   o  Return-Path
+
+   o  Received
+
+   o  Comments, Keywords
+
+
+
+Allman, et al.              Standards Track                    [Page 38]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   o  Bcc, Resent-Bcc
+
+   o  DKIM-Signature
+
+   Optional header fields (those not mentioned above) normally SHOULD
+   NOT be included in the signature, because of the potential for
+   additional header fields of the same name to be legitimately added or
+   reordered prior to verification.  There are likely to be legitimate
+   exceptions to this rule, because of the wide variety of application-
+   specific header fields that may be applied to a message, some of
+   which are unlikely to be duplicated, modified, or reordered.
+
+   Signers SHOULD choose canonicalization algorithms based on the types
+   of messages they process and their aversion to risk.  For example,
+   e-commerce sites sending primarily purchase receipts, which are not
+   expected to be processed by mailing lists or other software likely to
+   modify messages, will generally prefer "simple" canonicalization.
+   Sites sending primarily person-to-person email will likely prefer to
+   be more resilient to modification during transport by using "relaxed"
+   canonicalization.
+
+   Signers SHOULD NOT use "l=" unless they intend to accommodate
+   intermediate mail processors that append text to a message.  For
+   example, many mailing list processors append "unsubscribe"
+   information to message bodies.  If signers use "l=", they SHOULD
+   include the entire message body existing at the time of signing in
+   computing the count.  In particular, signers SHOULD NOT specify a
+   body length of 0 since this may be interpreted as a meaningless
+   signature by some verifiers.
+
+5.6.  Compute the Message Hash and Signature
+
+   The signer MUST compute the message hash as described in Section 3.7
+   and then sign it using the selected public-key algorithm.  This will
+   result in a DKIM-Signature header field that will include the body
+   hash and a signature of the header hash, where that header includes
+   the DKIM-Signature header field itself.
+
+   Entities such as mailing list managers that implement DKIM and that
+   modify the message or a header field (for example, inserting
+   unsubscribe information) before retransmitting the message SHOULD
+   check any existing signature on input and MUST make such
+   modifications before re-signing the message.
+
+   The signer MAY elect to limit the number of bytes of the body that
+   will be included in the hash and hence signed.  The length actually
+   hashed should be inserted in the "l=" tag of the DKIM-Signature
+   header field.
+
+
+
+Allman, et al.              Standards Track                    [Page 39]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+5.7.  Insert the DKIM-Signature Header Field
+
+   Finally, the signer MUST insert the DKIM-Signature header field
+   created in the previous step prior to transmitting the email.  The
+   DKIM-Signature header field MUST be the same as used to compute the
+   hash as described above, except that the value of the "b=" tag MUST
+   be the appropriately signed hash computed in the previous step,
+   signed using the algorithm specified in the "a=" tag of the DKIM-
+   Signature header field and using the private key corresponding to the
+   selector given in the "s=" tag of the DKIM-Signature header field, as
+   chosen above in Section 5.2
+
+   The DKIM-Signature header field MUST be inserted before any other
+   DKIM-Signature fields in the header block.
+
+      INFORMATIVE IMPLEMENTATION NOTE: The easiest way to achieve this
+      is to insert the DKIM-Signature header field at the beginning of
+      the header block.  In particular, it may be placed before any
+      existing Received header fields.  This is consistent with treating
+      DKIM-Signature as a trace header field.
+
+6.  Verifier Actions
+
+   Since a signer MAY remove or revoke a public key at any time, it is
+   recommended that verification occur in a timely manner.  In many
+   configurations, the most timely place is during acceptance by the
+   border MTA or shortly thereafter.  In particular, deferring
+   verification until the message is accessed by the end user is
+   discouraged.
+
+   A border or intermediate MTA MAY verify the message signature(s).  An
+   MTA who has performed verification MAY communicate the result of that
+   verification by adding a verification header field to incoming
+   messages.  This considerably simplifies things for the user, who can
+   now use an existing mail user agent.  Most MUAs have the ability to
+   filter messages based on message header fields or content; these
+   filters would be used to implement whatever policy the user wishes
+   with respect to unsigned mail.
+
+   A verifying MTA MAY implement a policy with respect to unverifiable
+   mail, regardless of whether or not it applies the verification header
+   field to signed messages.
+
+   Verifiers MUST produce a result that is semantically equivalent to
+   applying the following steps in the order listed.  In practice,
+   several of these steps can be performed in parallel in order to
+   improve performance.
+
+
+
+
+Allman, et al.              Standards Track                    [Page 40]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+6.1.  Extract Signatures from the Message
+
+   The order in which verifiers try DKIM-Signature header fields is not
+   defined; verifiers MAY try signatures in any order they like.  For
+   example, one implementation might try the signatures in textual
+   order, whereas another might try signatures by identities that match
+   the contents of the From header field before trying other signatures.
+   Verifiers MUST NOT attribute ultimate meaning to the order of
+   multiple DKIM-Signature header fields.  In particular, there is
+   reason to believe that some relays will reorder the header fields in
+   potentially arbitrary ways.
+
+      INFORMATIVE IMPLEMENTATION NOTE: Verifiers might use the order as
+      a clue to signing order in the absence of any other information.
+      However, other clues as to the semantics of multiple signatures
+      (such as correlating the signing host with Received header fields)
+      may also be considered.
+
+   A verifier SHOULD NOT treat a message that has one or more bad
+   signatures and no good signatures differently from a message with no
+   signature at all; such treatment is a matter of local policy and is
+   beyond the scope of this document.
+
+   When a signature successfully verifies, a verifier will either stop
+   processing or attempt to verify any other signatures, at the
+   discretion of the implementation.  A verifier MAY limit the number of
+   signatures it tries to avoid denial-of-service attacks.
+
+      INFORMATIVE NOTE: An attacker could send messages with large
+      numbers of faulty signatures, each of which would require a DNS
+      lookup and corresponding CPU time to verify the message.  This
+      could be an attack on the domain that receives the message, by
+      slowing down the verifier by requiring it to do a large number of
+      DNS lookups and/or signature verifications.  It could also be an
+      attack against the domains listed in the signatures, essentially
+      by enlisting innocent verifiers in launching an attack against the
+      DNS servers of the actual victim.
+
+   In the following description, text reading "return status
+   (explanation)" (where "status" is one of "PERMFAIL" or "TEMPFAIL")
+   means that the verifier MUST immediately cease processing that
+   signature.  The verifier SHOULD proceed to the next signature, if any
+   is present, and completely ignore the bad signature.  If the status
+   is "PERMFAIL", the signature failed and should not be reconsidered.
+   If the status is "TEMPFAIL", the signature could not be verified at
+   this time but may be tried again later.  A verifier MAY either defer
+   the message for later processing, perhaps by queueing it locally or
+   issuing a 451/4.7.5 SMTP reply, or try another signature; if no good
+
+
+
+Allman, et al.              Standards Track                    [Page 41]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   signature is found and any of the signatures resulted in a TEMPFAIL
+   status, the verifier MAY save the message for later processing.  The
+   "(explanation)" is not normative text; it is provided solely for
+   clarification.
+
+   Verifiers SHOULD ignore any DKIM-Signature header fields where the
+   signature does not validate.  Verifiers that are prepared to validate
+   multiple signature header fields SHOULD proceed to the next signature
+   header field, should it exist.  However, verifiers MAY make note of
+   the fact that an invalid signature was present for consideration at a
+   later step.
+
+      INFORMATIVE NOTE: The rationale of this requirement is to permit
+      messages that have invalid signatures but also a valid signature
+      to work.  For example, a mailing list exploder might opt to leave
+      the original submitter signature in place even though the exploder
+      knows that it is modifying the message in some way that will break
+      that signature, and the exploder inserts its own signature.  In
+      this case, the message should succeed even in the presence of the
+      known-broken signature.
+
+   For each signature to be validated, the following steps should be
+   performed in such a manner as to produce a result that is
+   semantically equivalent to performing them in the indicated order.
+
+6.1.1.  Validate the Signature Header Field
+
+   Implementers MUST meticulously validate the format and values in the
+   DKIM-Signature header field; any inconsistency or unexpected values
+   MUST cause the header field to be completely ignored and the verifier
+   to return PERMFAIL (signature syntax error).  Being "liberal in what
+   you accept" is definitely a bad strategy in this security context.
+   Note however that this does not include the existence of unknown tags
+   in a DKIM-Signature header field, which are explicitly permitted.
+
+   Verifiers MUST ignore DKIM-Signature header fields with a "v=" tag
+   that is inconsistent with this specification and return PERMFAIL
+   (incompatible version).
+
+      INFORMATIVE IMPLEMENTATION NOTE: An implementation may, of course,
+      choose to also verify signatures generated by older versions of
+      this specification.
+
+   If any tag listed as "required" in Section 3.5 is omitted from the
+   DKIM-Signature header field, the verifier MUST ignore the DKIM-
+   Signature header field and return PERMFAIL (signature missing
+   required tag).
+
+
+
+
+Allman, et al.              Standards Track                    [Page 42]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+      INFORMATIONAL NOTE: The tags listed as required in Section 3.5 are
+      "v=", "a=", "b=", "bh=", "d=", "h=", and "s=".  Should there be a
+      conflict between this note and Section 3.5, Section 3.5 is
+      normative.
+
+   If the DKIM-Signature header field does not contain the "i=" tag, the
+   verifier MUST behave as though the value of that tag were "@d", where
+   "d" is the value from the "d=" tag.
+
+   Verifiers MUST confirm that the domain specified in the "d=" tag is
+   the same as or a parent domain of the domain part of the "i=" tag.
+   If not, the DKIM-Signature header field MUST be ignored and the
+   verifier should return PERMFAIL (domain mismatch).
+
+   If the "h=" tag does not include the From header field, the verifier
+   MUST ignore the DKIM-Signature header field and return PERMFAIL (From
+   field not signed).
+
+   Verifiers MAY ignore the DKIM-Signature header field and return
+   PERMFAIL (signature expired) if it contains an "x=" tag and the
+   signature has expired.
+
+   Verifiers MAY ignore the DKIM-Signature header field if the domain
+   used by the signer in the "d=" tag is not associated with a valid
+   signing entity.  For example, signatures with "d=" values such as
+   "com" and "co.uk" may be ignored.  The list of unacceptable domains
+   SHOULD be configurable.
+
+   Verifiers MAY ignore the DKIM-Signature header field and return
+   PERMFAIL (unacceptable signature header) for any other reason, for
+   example, if the signature does not sign header fields that the
+   verifier views to be essential.  As a case in point, if MIME header
+   fields are not signed, certain attacks may be possible that the
+   verifier would prefer to avoid.
+
+6.1.2.  Get the Public Key
+
+   The public key for a signature is needed to complete the verification
+   process.  The process of retrieving the public key depends on the
+   query type as defined by the "q=" tag in the DKIM-Signature header
+   field.  Obviously, a public key need only be retrieved if the process
+   of extracting the signature information is completely successful.
+   Details of key management and representation are described in
+   Section 3.6.  The verifier MUST validate the key record and MUST
+   ignore any public key records that are malformed.
+
+   When validating a message, a verifier MUST perform the following
+   steps in a manner that is semantically the same as performing them in
+
+
+
+Allman, et al.              Standards Track                    [Page 43]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   the order indicated (in some cases, the implementation may
+   parallelize or reorder these steps, as long as the semantics remain
+   unchanged):
+
+   1.  Retrieve the public key as described in Section 3.6 using the
+       algorithm in the "q=" tag, the domain from the "d=" tag, and the
+       selector from the "s=" tag.
+
+   2.  If the query for the public key fails to respond, the verifier
+       MAY defer acceptance of this email and return TEMPFAIL (key
+       unavailable).  If verification is occurring during the incoming
+       SMTP session, this MAY be achieved with a 451/4.7.5 SMTP reply
+       code.  Alternatively, the verifier MAY store the message in the
+       local queue for later trial or ignore the signature.  Note that
+       storing a message in the local queue is subject to denial-of-
+       service attacks.
+
+   3.  If the query for the public key fails because the corresponding
+       key record does not exist, the verifier MUST immediately return
+       PERMFAIL (no key for signature).
+
+   4.  If the query for the public key returns multiple key records, the
+       verifier may choose one of the key records or may cycle through
+       the key records performing the remainder of these steps on each
+       record at the discretion of the implementer.  The order of the
+       key records is unspecified.  If the verifier chooses to cycle
+       through the key records, then the "return ..." wording in the
+       remainder of this section means "try the next key record, if any;
+       if none, return to try another signature in the usual way".
+
+   5.  If the result returned from the query does not adhere to the
+       format defined in this specification, the verifier MUST ignore
+       the key record and return PERMFAIL (key syntax error).  Verifiers
+       are urged to validate the syntax of key records carefully to
+       avoid attempted attacks.  In particular, the verifier MUST ignore
+       keys with a version code ("v=" tag) that they do not implement.
+
+   6.  If the "g=" tag in the public key does not match the Local-part
+       of the "i=" tag in the message signature header field, the
+       verifier MUST ignore the key record and return PERMFAIL
+       (inapplicable key).  If the Local-part of the "i=" tag on the
+       message signature is not present, the "g=" tag must be "*" (valid
+       for all addresses in the domain) or the entire g= tag must be
+       omitted (which defaults to "g=*"), otherwise the verifier MUST
+       ignore the key record and return PERMFAIL (inapplicable key).
+       Other than this test, verifiers SHOULD NOT treat a message signed
+       with a key record having a "g=" tag any differently than one
+       without; in particular, verifiers SHOULD NOT prefer messages that
+
+
+
+Allman, et al.              Standards Track                    [Page 44]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+       seem to have an individual signature by virtue of a "g=" tag
+       versus a domain signature.
+
+   7.  If the "h=" tag exists in the public key record and the hash
+       algorithm implied by the a= tag in the DKIM-Signature header
+       field is not included in the contents of the "h=" tag, the
+       verifier MUST ignore the key record and return PERMFAIL
+       (inappropriate hash algorithm).
+
+   8.  If the public key data (the "p=" tag) is empty, then this key has
+       been revoked and the verifier MUST treat this as a failed
+       signature check and return PERMFAIL (key revoked).  There is no
+       defined semantic difference between a key that has been revoked
+       and a key record that has been removed.
+
+   9.  If the public key data is not suitable for use with the algorithm
+       and key types defined by the "a=" and "k=" tags in the DKIM-
+       Signature header field, the verifier MUST immediately return
+       PERMFAIL (inappropriate key algorithm).
+
+6.1.3.  Compute the Verification
+
+   Given a signer and a public key, verifying a signature consists of
+   actions semantically equivalent to the following steps.
+
+   1.  Based on the algorithm defined in the "c=" tag, the body length
+       specified in the "l=" tag, and the header field names in the "h="
+       tag, prepare a canonicalized version of the message as is
+       described in Section 3.7 (note that this version does not
+       actually need to be instantiated).  When matching header field
+       names in the "h=" tag against the actual message header field,
+       comparisons MUST be case-insensitive.
+
+   2.  Based on the algorithm indicated in the "a=" tag, compute the
+       message hashes from the canonical copy as described in
+       Section 3.7.
+
+   3.  Verify that the hash of the canonicalized message body computed
+       in the previous step matches the hash value conveyed in the "bh="
+       tag.  If the hash does not match, the verifier SHOULD ignore the
+       signature and return PERMFAIL (body hash did not verify).
+
+   4.  Using the signature conveyed in the "b=" tag, verify the
+       signature against the header hash using the mechanism appropriate
+       for the public key algorithm described in the "a=" tag.  If the
+       signature does not validate, the verifier SHOULD ignore the
+       signature and return PERMFAIL (signature did not verify).
+
+
+
+
+Allman, et al.              Standards Track                    [Page 45]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   5.  Otherwise, the signature has correctly verified.
+
+      INFORMATIVE IMPLEMENTER'S NOTE: Implementations might wish to
+      initiate the public-key query in parallel with calculating the
+      hash as the public key is not needed until the final decryption is
+      calculated.  Implementations may also verify the signature on the
+      message header before validating that the message hash listed in
+      the "bh=" tag in the DKIM-Signature header field matches that of
+      the actual message body; however, if the body hash does not match,
+      the entire signature must be considered to have failed.
+
+   A body length specified in the "l=" tag of the signature limits the
+   number of bytes of the body passed to the verification algorithm.
+   All data beyond that limit is not validated by DKIM.  Hence,
+   verifiers might treat a message that contains bytes beyond the
+   indicated body length with suspicion, such as by truncating the
+   message at the indicated body length, declaring the signature invalid
+   (e.g., by returning PERMFAIL (unsigned content)), or conveying the
+   partial verification to the policy module.
+
+      INFORMATIVE IMPLEMENTATION NOTE: Verifiers that truncate the body
+      at the indicated body length might pass on a malformed MIME
+      message if the signer used the "N-4" trick (omitting the final
+      "--CRLF") described in the informative note in Section 3.4.5.
+      Such verifiers may wish to check for this case and include a
+      trailing "--CRLF" to avoid breaking the MIME structure.  A simple
+      way to achieve this might be to append "--CRLF" to any "multipart"
+      message with a body length; if the MIME structure is already
+      correctly formed, this will appear in the postlude and will not be
+      displayed to the end user.
+
+6.2.  Communicate Verification Results
+
+   Verifiers wishing to communicate the results of verification to other
+   parts of the mail system may do so in whatever manner they see fit.
+   For example, implementations might choose to add an email header
+   field to the message before passing it on.  Any such header field
+   SHOULD be inserted before any existing DKIM-Signature or preexisting
+   authentication status header fields in the header field block.
+
+      INFORMATIVE ADVICE to MUA filter writers: Patterns intended to
+      search for results header fields to visibly mark authenticated
+      mail for end users should verify that such header field was added
+      by the appropriate verifying domain and that the verified identity
+      matches the author identity that will be displayed by the MUA.  In
+      particular, MUA filters should not be influenced by bogus results
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 46]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+      header fields added by attackers.  To circumvent this attack,
+      verifiers may wish to delete existing results header fields after
+      verification and before adding a new header field.
+
+6.3.  Interpret Results/Apply Local Policy
+
+   It is beyond the scope of this specification to describe what actions
+   a verifier system should make, but an authenticated email presents an
+   opportunity to a receiving system that unauthenticated email cannot.
+   Specifically, an authenticated email creates a predictable identifier
+   by which other decisions can reliably be managed, such as trust and
+   reputation.  Conversely, unauthenticated email lacks a reliable
+   identifier that can be used to assign trust and reputation.  It is
+   reasonable to treat unauthenticated email as lacking any trust and
+   having no positive reputation.
+
+   In general, verifiers SHOULD NOT reject messages solely on the basis
+   of a lack of signature or an unverifiable signature; such rejection
+   would cause severe interoperability problems.  However, if the
+   verifier does opt to reject such messages (for example, when
+   communicating with a peer who, by prior agreement, agrees to only
+   send signed messages), and the verifier runs synchronously with the
+   SMTP session and a signature is missing or does not verify, the MTA
+   SHOULD use a 550/5.7.x reply code.
+
+   If it is not possible to fetch the public key, perhaps because the
+   key server is not available, a temporary failure message MAY be
+   generated using a 451/4.7.5 reply code, such as:
+
+      451 4.7.5 Unable to verify signature - key server unavailable
+
+   Temporary failures such as inability to access the key server or
+   other external service are the only conditions that SHOULD use a 4xx
+   SMTP reply code.  In particular, cryptographic signature verification
+   failures MUST NOT return 4xx SMTP replies.
+
+   Once the signature has been verified, that information MUST be
+   conveyed to higher-level systems (such as explicit allow/whitelists
+   and reputation systems) and/or to the end user.  If the message is
+   signed on behalf of any address other than that in the From: header
+   field, the mail system SHOULD take pains to ensure that the actual
+   signing identity is clear to the reader.
+
+   The verifier MAY treat unsigned header fields with extreme
+   skepticism, including marking them as untrusted or even deleting them
+   before display to the end user.
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 47]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   While the symptoms of a failed verification are obvious -- the
+   signature doesn't verify -- establishing the exact cause can be more
+   difficult.  If a selector cannot be found, is that because the
+   selector has been removed, or was the value changed somehow in
+   transit?  If the signature line is missing, is that because it was
+   never there, or was it removed by an overzealous filter?  For
+   diagnostic purposes, the exact reason why the verification fails
+   SHOULD be made available to the policy module and possibly recorded
+   in the system logs.  If the email cannot be verified, then it SHOULD
+   be rendered the same as all unverified email regardless of whether or
+   not it looks like it was signed.
+
+7.  IANA Considerations
+
+   DKIM introduces some new namespaces that have been registered with
+   IANA.  In all cases, new values are assigned only for values that
+   have been documented in a published RFC that has IETF Consensus
+   [RFC2434].
+
+7.1.  DKIM-Signature Tag Specifications
+
+   A DKIM-Signature provides for a list of tag specifications.  IANA has
+   established the DKIM-Signature Tag Specification Registry for tag
+   specifications that can be used in DKIM-Signature fields.
+
+               The initial entries in the registry comprise:
+
+                        +------+-----------------+
+                        | TYPE | REFERENCE       |
+                        +------+-----------------+
+                        | v    | (this document) |
+                        | a    | (this document) |
+                        | b    | (this document) |
+                        | bh   | (this document) |
+                        | c    | (this document) |
+                        | d    | (this document) |
+                        | h    | (this document) |
+                        | i    | (this document) |
+                        | l    | (this document) |
+                        | q    | (this document) |
+                        | s    | (this document) |
+                        | t    | (this document) |
+                        | x    | (this document) |
+                        | z    | (this document) |
+                        +------+-----------------+
+
+         DKIM-Signature Tag Specification Registry Initial Values
+
+
+
+
+Allman, et al.              Standards Track                    [Page 48]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+7.2.  DKIM-Signature Query Method Registry
+
+   The "q=" tag-spec (specified in Section 3.5) provides for a list of
+   query methods.
+
+   IANA has established the DKIM-Signature Query Method Registry for
+   mechanisms that can be used to retrieve the key that will permit
+   validation processing of a message signed using DKIM.
+
+               The initial entry in the registry comprises:
+
+                    +------+--------+-----------------+
+                    | TYPE | OPTION | REFERENCE       |
+                    +------+--------+-----------------+
+                    | dns  | txt    | (this document) |
+                    +------+--------+-----------------+
+
+            DKIM-Signature Query Method Registry Initial Values
+
+7.3.  DKIM-Signature Canonicalization Registry
+
+   The "c=" tag-spec (specified in Section 3.5) provides for a specifier
+   for canonicalization algorithms for the header and body of the
+   message.
+
+   IANA has established the DKIM-Signature Canonicalization Algorithm
+   Registry for algorithms for converting a message into a canonical
+   form before signing or verifying using DKIM.
+
+           The initial entries in the header registry comprise:
+
+                       +---------+-----------------+
+                       | TYPE    | REFERENCE       |
+                       +---------+-----------------+
+                       | simple  | (this document) |
+                       | relaxed | (this document) |
+                       +---------+-----------------+
+
+        DKIM-Signature Header Canonicalization Algorithm Registry
+                              Initial Values
+
+
+
+
+
+
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 49]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+            The initial entries in the body registry comprise:
+
+                       +---------+-----------------+
+                       | TYPE    | REFERENCE       |
+                       +---------+-----------------+
+                       | simple  | (this document) |
+                       | relaxed | (this document) |
+                       +---------+-----------------+
+
+         DKIM-Signature Body Canonicalization Algorithm Registry
+                              Initial Values
+
+7.4.  _domainkey DNS TXT Record Tag Specifications
+
+   A _domainkey DNS TXT record provides for a list of tag
+   specifications.  IANA has established the DKIM _domainkey DNS TXT Tag
+   Specification Registry for tag specifications that can be used in DNS
+   TXT Records.
+
+               The initial entries in the registry comprise:
+
+                        +------+-----------------+
+                        | TYPE | REFERENCE       |
+                        +------+-----------------+
+                        | v    | (this document) |
+                        | g    | (this document) |
+                        | h    | (this document) |
+                        | k    | (this document) |
+                        | n    | (this document) |
+                        | p    | (this document) |
+                        | s    | (this document) |
+                        | t    | (this document) |
+                        +------+-----------------+
+
+         DKIM _domainkey DNS TXT Record Tag Specification Registry
+                              Initial Values
+
+7.5.  DKIM Key Type Registry
+
+   The "k=" <key-k-tag> (specified in Section 3.6.1) and the "a=" <sig-
+   a-tag-k> (specified in Section 3.5) tags provide for a list of
+   mechanisms that can be used to decode a DKIM signature.
+
+   IANA has established the DKIM Key Type Registry for such mechanisms.
+
+
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 50]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+               The initial entry in the registry comprises:
+
+                           +------+-----------+
+                           | TYPE | REFERENCE |
+                           +------+-----------+
+                           | rsa  | [RFC3447] |
+                           +------+-----------+
+
+                       DKIM Key Type Initial Values
+
+7.6.  DKIM Hash Algorithms Registry
+
+   The "h=" <key-h-tag> (specified in Section 3.6.1) and the "a=" <sig-
+   a-tag-h> (specified in Section 3.5) tags provide for a list of
+   mechanisms that can be used to produce a digest of message data.
+
+   IANA has established the DKIM Hash Algorithms Registry for such
+   mechanisms.
+
+               The initial entries in the registry comprise:
+
+                      +--------+-------------------+
+                      | TYPE   | REFERENCE         |
+                      +--------+-------------------+
+                      | sha1   | [FIPS.180-2.2002] |
+                      | sha256 | [FIPS.180-2.2002] |
+                      +--------+-------------------+
+
+                    DKIM Hash Algorithms Initial Values
+
+7.7.  DKIM Service Types Registry
+
+   The "s=" <key-s-tag> tag (specified in Section 3.6.1) provides for a
+   list of service types to which this selector may apply.
+
+   IANA has established the DKIM Service Types Registry for service
+   types.
+
+               The initial entries in the registry comprise:
+
+                        +-------+-----------------+
+                        | TYPE  | REFERENCE       |
+                        +-------+-----------------+
+                        | email | (this document) |
+                        | *     | (this document) |
+                        +-------+-----------------+
+
+                DKIM Service Types Registry Initial Values
+
+
+
+Allman, et al.              Standards Track                    [Page 51]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+7.8.  DKIM Selector Flags Registry
+
+   The "t=" <key-t-tag> tag (specified in Section 3.6.1) provides for a
+   list of flags to modify interpretation of the selector.
+
+   IANA has established the DKIM Selector Flags Registry for additional
+   flags.
+
+               The initial entries in the registry comprise:
+
+                        +------+-----------------+
+                        | TYPE | REFERENCE       |
+                        +------+-----------------+
+                        | y    | (this document) |
+                        | s    | (this document) |
+                        +------+-----------------+
+
+                DKIM Selector Flags Registry Initial Values
+
+7.9.  DKIM-Signature Header Field
+
+   IANA has added DKIM-Signature to the "Permanent Message Header
+   Fields" registry (see [RFC3864]) for the "mail" protocol, using this
+   document as the reference.
+
+8.  Security Considerations
+
+   It has been observed that any mechanism that is introduced that
+   attempts to stem the flow of spam is subject to intensive attack.
+   DKIM needs to be carefully scrutinized to identify potential attack
+   vectors and the vulnerability to each.  See also [RFC4686].
+
+8.1.  Misuse of Body Length Limits ("l=" Tag)
+
+   Body length limits (in the form of the "l=" tag) are subject to
+   several potential attacks.
+
+8.1.1.  Addition of New MIME Parts to Multipart/*
+
+   If the body length limit does not cover a closing MIME multipart
+   section (including the trailing "--CRLF" portion), then it is
+   possible for an attacker to intercept a properly signed multipart
+   message and add a new body part.  Depending on the details of the
+   MIME type and the implementation of the verifying MTA and the
+   receiving MUA, this could allow an attacker to change the information
+   displayed to an end user from an apparently trusted source.
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 52]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   For example, if attackers can append information to a "text/html"
+   body part, they may be able to exploit a bug in some MUAs that
+   continue to read after a "</html>" marker, and thus display HTML text
+   on top of already displayed text.  If a message has a
+   "multipart/alternative" body part, they might be able to add a new
+   body part that is preferred by the displaying MUA.
+
+8.1.2.  Addition of new HTML content to existing content
+
+   Several receiving MUA implementations do not cease display after a
+   ""</html>"" tag.  In particular, this allows attacks involving
+   overlaying images on top of existing text.
+
+      INFORMATIVE EXAMPLE: Appending the following text to an existing,
+      properly closed message will in many MUAs result in inappropriate
+      data being rendered on top of existing, correct data:
+   <div style="position: relative; bottom: 350px; z-index: 2;">
+   <img src="http://www.ietf.org/images/ietflogo2e.gif"
+     width=578 height=370>
+   </div>
+
+8.2.  Misappropriated Private Key
+
+   If the private key for a user is resident on their computer and is
+   not protected by an appropriately secure mechanism, it is possible
+   for malware to send mail as that user and any other user sharing the
+   same private key.  The malware would not, however, be able to
+   generate signed spoofs of other signers' addresses, which would aid
+   in identification of the infected user and would limit the
+   possibilities for certain types of attacks involving socially
+   engineered messages.  This threat applies mainly to MUA-based
+   implementations; protection of private keys on servers can be easily
+   achieved through the use of specialized cryptographic hardware.
+
+   A larger problem occurs if malware on many users' computers obtains
+   the private keys for those users and transmits them via a covert
+   channel to a site where they can be shared.  The compromised users
+   would likely not know of the misappropriation until they receive
+   "bounce" messages from messages they are purported to have sent.
+   Many users might not understand the significance of these bounce
+   messages and would not take action.
+
+   One countermeasure is to use a user-entered passphrase to encrypt the
+   private key, although users tend to choose weak passphrases and often
+   reuse them for different purposes, possibly allowing an attack
+   against DKIM to be extended into other domains.  Nevertheless, the
+   decoded private key might be briefly available to compromise by
+   malware when it is entered, or might be discovered via keystroke
+
+
+
+Allman, et al.              Standards Track                    [Page 53]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   logging.  The added complexity of entering a passphrase each time one
+   sends a message would also tend to discourage the use of a secure
+   passphrase.
+
+   A somewhat more effective countermeasure is to send messages through
+   an outgoing MTA that can authenticate the submitter using existing
+   techniques (e.g., SMTP Authentication), possibly validate the message
+   itself (e.g., verify that the header is legitimate and that the
+   content passes a spam content check), and sign the message using a
+   key appropriate for the submitter address.  Such an MTA can also
+   apply controls on the volume of outgoing mail each user is permitted
+   to originate in order to further limit the ability of malware to
+   generate bulk email.
+
+8.3.  Key Server Denial-of-Service Attacks
+
+   Since the key servers are distributed (potentially separate for each
+   domain), the number of servers that would need to be attacked to
+   defeat this mechanism on an Internet-wide basis is very large.
+   Nevertheless, key servers for individual domains could be attacked,
+   impeding the verification of messages from that domain.  This is not
+   significantly different from the ability of an attacker to deny
+   service to the mail exchangers for a given domain, although it
+   affects outgoing, not incoming, mail.
+
+   A variation on this attack is that if a very large amount of mail
+   were to be sent using spoofed addresses from a given domain, the key
+   servers for that domain could be overwhelmed with requests.  However,
+   given the low overhead of verification compared with handling of the
+   email message itself, such an attack would be difficult to mount.
+
+8.4.  Attacks Against the DNS
+
+   Since the DNS is a required binding for key services, specific
+   attacks against the DNS must be considered.
+
+   While the DNS is currently insecure [RFC3833], these security
+   problems are the motivation behind DNS Security (DNSSEC) [RFC4033],
+   and all users of the DNS will reap the benefit of that work.
+
+   DKIM is only intended as a "sufficient" method of proving
+   authenticity.  It is not intended to provide strong cryptographic
+   proof about authorship or contents.  Other technologies such as
+   OpenPGP [RFC2440] and S/MIME [RFC3851] address those requirements.
+
+   A second security issue related to the DNS revolves around the
+   increased DNS traffic as a consequence of fetching selector-based
+   data as well as fetching signing domain policy.  Widespread
+
+
+
+Allman, et al.              Standards Track                    [Page 54]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   deployment of DKIM will result in a significant increase in DNS
+   queries to the claimed signing domain.  In the case of forgeries on a
+   large scale, DNS servers could see a substantial increase in queries.
+
+   A specific DNS security issue that should be considered by DKIM
+   verifiers is the name chaining attack described in Section 2.3 of the
+   DNS Threat Analysis [RFC3833].  A DKIM verifier, while verifying a
+   DKIM-Signature header field, could be prompted to retrieve a key
+   record of an attacker's choosing.  This threat can be minimized by
+   ensuring that name servers, including recursive name servers, used by
+   the verifier enforce strict checking of "glue" and other additional
+   information in DNS responses and are therefore not vulnerable to this
+   attack.
+
+8.5.  Replay Attacks
+
+   In this attack, a spammer sends a message to be spammed to an
+   accomplice, which results in the message being signed by the
+   originating MTA.  The accomplice resends the message, including the
+   original signature, to a large number of recipients, possibly by
+   sending the message to many compromised machines that act as MTAs.
+   The messages, not having been modified by the accomplice, have valid
+   signatures.
+
+   Partial solutions to this problem involve the use of reputation
+   services to convey the fact that the specific email address is being
+   used for spam and that messages from that signer are likely to be
+   spam.  This requires a real-time detection mechanism in order to
+   react quickly enough.  However, such measures might be prone to
+   abuse, if for example an attacker resent a large number of messages
+   received from a victim in order to make them appear to be a spammer.
+
+   Large verifiers might be able to detect unusually large volumes of
+   mails with the same signature in a short time period.  Smaller
+   verifiers can get substantially the same volume of information via
+   existing collaborative systems.
+
+8.6.  Limits on Revoking Keys
+
+   When a large domain detects undesirable behavior on the part of one
+   of its users, it might wish to revoke the key used to sign that
+   user's messages in order to disavow responsibility for messages that
+   have not yet been verified or that are the subject of a replay
+   attack.  However, the ability of the domain to do so can be limited
+   if the same key, for scalability reasons, is used to sign messages
+   for many other users.  Mechanisms for explicitly revoking keys on a
+   per-address basis have been proposed but require further study as to
+   their utility and the DNS load they represent.
+
+
+
+Allman, et al.              Standards Track                    [Page 55]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+8.7.  Intentionally Malformed Key Records
+
+   It is possible for an attacker to publish key records in DNS that are
+   intentionally malformed, with the intent of causing a denial-of-
+   service attack on a non-robust verifier implementation.  The attacker
+   could then cause a verifier to read the malformed key record by
+   sending a message to one of its users referencing the malformed
+   record in a (not necessarily valid) signature.  Verifiers MUST
+   thoroughly verify all key records retrieved from the DNS and be
+   robust against intentionally as well as unintentionally malformed key
+   records.
+
+8.8.  Intentionally Malformed DKIM-Signature Header Fields
+
+   Verifiers MUST be prepared to receive messages with malformed DKIM-
+   Signature header fields, and thoroughly verify the header field
+   before depending on any of its contents.
+
+8.9.  Information Leakage
+
+   An attacker could determine when a particular signature was verified
+   by using a per-message selector and then monitoring their DNS traffic
+   for the key lookup.  This would act as the equivalent of a "web bug"
+   for verification time rather than when the message was read.
+
+8.10.  Remote Timing Attacks
+
+   In some cases, it may be possible to extract private keys using a
+   remote timing attack [BONEH03].  Implementations should consider
+   obfuscating the timing to prevent such attacks.
+
+8.11.  Reordered Header Fields
+
+   Existing standards allow intermediate MTAs to reorder header fields.
+   If a signer signs two or more header fields of the same name, this
+   can cause spurious verification errors on otherwise legitimate
+   messages.  In particular, signers that sign any existing DKIM-
+   Signature fields run the risk of having messages incorrectly fail to
+   verify.
+
+8.12.  RSA Attacks
+
+   An attacker could create a large RSA signing key with a small
+   exponent, thus requiring that the verification key have a large
+   exponent.  This will force verifiers to use considerable computing
+   resources to verify the signature.  Verifiers might avoid this attack
+   by refusing to verify signatures that reference selectors with public
+   keys having unreasonable exponents.
+
+
+
+Allman, et al.              Standards Track                    [Page 56]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   In general, an attacker might try to overwhelm a verifier by flooding
+   it with messages requiring verification.  This is similar to other
+   MTA denial-of-service attacks and should be dealt with in a similar
+   fashion.
+
+8.13.  Inappropriate Signing by Parent Domains
+
+   The trust relationship described in Section 3.8 could conceivably be
+   used by a parent domain to sign messages with identities in a
+   subdomain not administratively related to the parent.  For example,
+   the ".com" registry could create messages with signatures using an
+   "i=" value in the example.com domain.  There is no general solution
+   to this problem, since the administrative cut could occur anywhere in
+   the domain name.  For example, in the domain "example.podunk.ca.us"
+   there are three administrative cuts (podunk.ca.us, ca.us, and us),
+   any of which could create messages with an identity in the full
+   domain.
+
+      INFORMATIVE NOTE: This is considered an acceptable risk for the
+      same reason that it is acceptable for domain delegation.  For
+      example, in the example above any of the domains could potentially
+      simply delegate "example.podunk.ca.us" to a server of their choice
+      and completely replace all DNS-served information.  Note that a
+      verifier MAY ignore signatures that come from an unlikely domain
+      such as ".com", as discussed in Section 6.1.1.
+
+9.  References
+
+9.1.  Normative References
+
+   [FIPS.180-2.2002]  U.S. Department of Commerce, "Secure Hash
+                      Standard", FIPS PUB 180-2, August 2002.
+
+   [ITU.X660.1997]    "Information Technology - ASN.1 encoding rules:
+                      Specification of Basic Encoding Rules (BER),
+                      Canonical Encoding Rules (CER) and Distinguished
+                      Encoding Rules (DER)", ITU-T Recommendation X.660,
+                      1997.
+
+   [RFC2045]          Freed, N. and N. Borenstein, "Multipurpose
+                      Internet Mail Extensions (MIME) Part One: Format
+                      of Internet Message Bodies", RFC 2045,
+                      November 1996.
+
+   [RFC2047]          Moore, K., "MIME (Multipurpose Internet Mail
+                      Extensions) Part Three: Message header field
+                      Extensions for Non-ASCII Text", RFC 2047,
+                      November 1996.
+
+
+
+Allman, et al.              Standards Track                    [Page 57]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   [RFC2119]          Bradner, S., "Key words for use in RFCs to
+                      Indicate Requirement Levels", BCP 14, RFC 2119,
+                      March 1997.
+
+   [RFC2821]          Klensin, J., "Simple Mail Transfer Protocol",
+                      RFC 2821, April 2001.
+
+   [RFC2822]          Resnick, P., "Internet Message Format", RFC 2822,
+                      April 2001.
+
+   [RFC3447]          Jonsson, J. and B. Kaliski, "Public-Key
+                      Cryptography Standards (PKCS) #1: RSA Cryptography
+                      Specifications Version 2.1", RFC 3447,
+                      February 2003.
+
+   [RFC3490]          Faltstrom, P., Hoffman, P., and A. Costello,
+                      "Internationalizing Domain Names in Applications
+                      (IDNA)", RFC 3490, March 2003.
+
+   [RFC4234]          Crocker, D., Ed. and P. Overell, "Augmented BNF
+                      for Syntax Specifications: ABNF", RFC 4234,
+                      October 2005.
+
+9.2.  Informative References
+
+   [BONEH03]          Proc. 12th USENIX Security Symposium, "Remote
+                      Timing Attacks are Practical", 2003.
+
+   [RFC1847]          Galvin, J., Murphy, S., Crocker, S., and N. Freed,
+                      "Security Multiparts for MIME: Multipart/Signed
+                      and Multipart/Encrypted", RFC 1847, October 1995.
+
+   [RFC2434]          Narten, T. and H. Alvestrand, "Guidelines for
+                      Writing an IANA Considerations Section in RFCs",
+                      BCP 26, RFC 2434, October 1998.
+
+   [RFC2440]          Callas, J., Donnerhacke, L., Finney, H., and R.
+                      Thayer, "OpenPGP Message Format", RFC 2440,
+                      November 1998.
+
+   [RFC3766]          Orman, H. and P. Hoffman, "Determining Strengths
+                      for Public Keys Used For Exchanging Symmetric
+                      Keys", RFC 3766, April 2004.
+
+   [RFC3833]          Atkins, D. and R. Austein, "Threat Analysis of the
+                      Domain Name System (DNS)", RFC 3833, August 2004.
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 58]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   [RFC3851]          Ramsdell, B., "S/MIME Version 3 Message
+                      Specification", RFC 3851, June 1999.
+
+   [RFC3864]          Klyne, G., Nottingham, M., and J. Mogul,
+                      "Registration Procedures for Message Header
+                      Fields", BCP 90, September 2004.
+
+   [RFC4033]          Arends, R., Austein, R., Larson, M., Massey, D.,
+                      and S. Rose, "DNS Security Introduction and
+                      Requirements", RFC 4033, March 2005.
+
+   [RFC4686]          Fenton, J., "Analysis of Threats Motivating
+                      DomainKeys Identified Mail (DKIM)", RFC 4686,
+                      September 2006.
+
+   [RFC4870]          Delany, M., "Domain-Based Email Authentication
+                      Using Public Keys Advertised in the DNS
+                      (DomainKeys)", RFC 4870, May 2007.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 59]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+Appendix A.  Example of Use (INFORMATIVE)
+
+   This section shows the complete flow of an email from submission to
+   final delivery, demonstrating how the various components fit
+   together.  The key used in this example is shown in Appendix C.
+
+A.1.  The User Composes an Email
+
+
+   From: Joe SixPack <joe@football.example.com>
+   To: Suzie Q <suzie@shopping.example.net>
+   Subject: Is dinner ready?
+   Date: Fri, 11 Jul 2003 21:00:37 -0700 (PDT)
+   Message-ID: <20030712040037.46341.5F8J@football.example.com>
+
+   Hi.
+
+   We lost the game. Are you hungry yet?
+
+   Joe.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 60]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+A.2.  The Email Is Signed
+
+   This email is signed by the example.com outbound email server and now
+   looks like this:
+
+   DKIM-Signature: v=1; a=rsa-sha256; s=brisbane; d=example.com;
+         c=simple/simple; q=dns/txt; i=joe@football.example.com;
+         h=Received : From : To : Subject : Date : Message-ID;
+         bh=2jUSOH9NhtVGCQWNr9BrIAPreKQjO6Sn7XIkfJVOzv8=;
+         b=AuUoFEfDxTDkHlLXSZEpZj79LICEps6eda7W3deTVFOk4yAUoqOB
+           4nujc7YopdG5dWLSdNg6xNAZpOPr+kHxt1IrE+NahM6L/LbvaHut
+           KVdkLLkpVaVVQPzeRDI009SO2Il5Lu7rDNH6mZckBdrIx0orEtZV
+           4bmp/YzhwvcubU4=;
+   Received: from client1.football.example.com  [192.0.2.1]
+         by submitserver.example.com with SUBMISSION;
+         Fri, 11 Jul 2003 21:01:54 -0700 (PDT)
+   From: Joe SixPack <joe@football.example.com>
+   To: Suzie Q <suzie@shopping.example.net>
+   Subject: Is dinner ready?
+   Date: Fri, 11 Jul 2003 21:00:37 -0700 (PDT)
+   Message-ID: <20030712040037.46341.5F8J@football.example.com>
+
+   Hi.
+
+   We lost the game. Are you hungry yet?
+
+   Joe.
+
+   The signing email server requires access to the private key
+   associated with the "brisbane" selector to generate this signature.
+
+A.3.  The Email Signature Is Verified
+
+   The signature is normally verified by an inbound SMTP server or
+   possibly the final delivery agent.  However, intervening MTAs can
+   also perform this verification if they choose to do so.  The
+   verification process uses the domain "example.com" extracted from the
+   "d=" tag and the selector "brisbane" from the "s=" tag in the DKIM-
+   Signature header field to form the DNS DKIM query for:
+
+   brisbane._domainkey.example.com
+
+   Signature verification starts with the physically last Received
+   header field, the From header field, and so forth, in the order
+   listed in the "h=" tag.  Verification follows with a single CRLF
+   followed by the body (starting with "Hi.").  The email is canonically
+   prepared for verifying with the "simple" method.  The result of the
+   query and subsequent verification of the signature is stored (in this
+
+
+
+Allman, et al.              Standards Track                    [Page 61]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   example) in the X-Authentication-Results header field line.  After
+   successful verification, the email looks like this:
+
+   X-Authentication-Results: shopping.example.net
+         header.from=joe@football.example.com; dkim=pass
+   Received: from mout23.football.example.com (192.168.1.1)
+         by shopping.example.net with SMTP;
+         Fri, 11 Jul 2003 21:01:59 -0700 (PDT)
+   DKIM-Signature: v=1; a=rsa-sha256; s=brisbane; d=example.com;
+         c=simple/simple; q=dns/txt; i=joe@football.example.com;
+         h=Received : From : To : Subject : Date : Message-ID;
+         bh=2jUSOH9NhtVGCQWNr9BrIAPreKQjO6Sn7XIkfJVOzv8=;
+         b=AuUoFEfDxTDkHlLXSZEpZj79LICEps6eda7W3deTVFOk4yAUoqOB
+           4nujc7YopdG5dWLSdNg6xNAZpOPr+kHxt1IrE+NahM6L/LbvaHut
+           KVdkLLkpVaVVQPzeRDI009SO2Il5Lu7rDNH6mZckBdrIx0orEtZV
+           4bmp/YzhwvcubU4=;
+   Received: from client1.football.example.com  [192.0.2.1]
+         by submitserver.example.com with SUBMISSION;
+         Fri, 11 Jul 2003 21:01:54 -0700 (PDT)
+   From: Joe SixPack <joe@football.example.com>
+   To: Suzie Q <suzie@shopping.example.net>
+   Subject: Is dinner ready?
+   Date: Fri, 11 Jul 2003 21:00:37 -0700 (PDT)
+   Message-ID: <20030712040037.46341.5F8J@football.example.com>
+
+   Hi.
+
+   We lost the game. Are you hungry yet?
+
+   Joe.
+
+Appendix B.  Usage Examples (INFORMATIVE)
+
+   DKIM signing and validating can be used in different ways, for
+   different operational scenarios.  This Appendix discusses some common
+   examples.
+
+      NOTE: Descriptions in this Appendix are for informational purposes
+      only.  They describe various ways that DKIM can be used, given
+      particular constraints and needs.  In no case are these examples
+      intended to be taken as providing explanation or guidance
+      concerning DKIM specification details, when creating an
+      implementation.
+
+
+
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 62]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+B.1.  Alternate Submission Scenarios
+
+   In the most simple scenario, a user's MUA, MSA, and Internet
+   (boundary) MTA are all within the same administrative environment,
+   using the same domain name.  Therefore, all of the components
+   involved in submission and initial transfer are related.  However, it
+   is common for two or more of the components to be under independent
+   administrative control.  This creates challenges for choosing and
+   administering the domain name to use for signing, and for its
+   relationship to common email identity header fields.
+
+B.1.1.  Delegated Business Functions
+
+   Some organizations assign specific business functions to discrete
+   groups, inside or outside the organization.  The goal, then, is to
+   authorize that group to sign some mail, but to constrain what
+   signatures they can generate.  DKIM selectors (the "s=" signature
+   tag) and granularity (the "g=" key tag) facilitate this kind of
+   restricted authorization.  Examples of these outsourced business
+   functions are legitimate email marketing providers and corporate
+   benefits providers.
+
+   Here, the delegated group needs to be able to send messages that are
+   signed, using the email domain of the client company.  At the same
+   time, the client often is reluctant to register a key for the
+   provider that grants the ability to send messages for arbitrary
+   addresses in the domain.
+
+   There are multiple ways to administer these usage scenarios.  In one
+   case, the client organization provides all of the public query
+   service (for example, DNS) administration, and in another it uses DNS
+   delegation to enable all ongoing administration of the DKIM key
+   record by the delegated group.
+
+   If the client organization retains responsibility for all of the DNS
+   administration, the outsourcing company can generate a key pair,
+   supplying the public key to the client company, which then registers
+   it in the query service, using a unique selector that authorizes a
+   specific From header field Local-part.  For example, a client with
+   the domain "example.com" could have the selector record specify
+   "g=winter-promotions" so that this signature is only valid for mail
+   with a From address of "winter-promotions@example.com".  This would
+   enable the provider to send messages using that specific address and
+   have them verify properly.  The client company retains control over
+   the email address because it retains the ability to revoke the key at
+   any time.
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 63]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   If the client wants the delegated group to do the DNS administration,
+   it can have the domain name that is specified with the selector point
+   to the provider's DNS server.  The provider then creates and
+   maintains all of the DKIM signature information for that selector.
+   Hence, the client cannot provide constraints on the Local-part of
+   addresses that get signed, but it can revoke the provider's signing
+   rights by removing the DNS delegation record.
+
+B.1.2.  PDAs and Similar Devices
+
+   PDAs demonstrate the need for using multiple keys per domain.
+   Suppose that John Doe wanted to be able to send messages using his
+   corporate email address, jdoe@example.com, and his email device did
+   not have the ability to make a Virtual Private Network (VPN)
+   connection to the corporate network, either because the device is
+   limited or because there are restrictions enforced by his Internet
+   access provider.  If the device was equipped with a private key
+   registered for jdoe@example.com by the administrator of the
+   example.com domain, and appropriate software to sign messages, John
+   could sign the message on the device itself before transmission
+   through the outgoing network of the access service provider.
+
+B.1.3.  Roaming Users
+
+   Roaming users often find themselves in circumstances where it is
+   convenient or necessary to use an SMTP server other than their home
+   server; examples are conferences and many hotels.  In such
+   circumstances, a signature that is added by the submission service
+   will use an identity that is different from the user's home system.
+
+   Ideally, roaming users would connect back to their home server using
+   either a VPN or a SUBMISSION server running with SMTP AUTHentication
+   on port 587.  If the signing can be performed on the roaming user's
+   laptop, then they can sign before submission, although the risk of
+   further modification is high.  If neither of these are possible,
+   these roaming users will not be able to send mail signed using their
+   own domain key.
+
+B.1.4.  Independent (Kiosk) Message Submission
+
+   Stand-alone services, such as walk-up kiosks and web-based
+   information services, have no enduring email service relationship
+   with the user, but users occasionally request that mail be sent on
+   their behalf.  For example, a website providing news often allows the
+   reader to forward a copy of the article to a friend.  This is
+   typically done using the reader's own email address, to indicate who
+   the author is.  This is sometimes referred to as the "Evite problem",
+
+
+
+
+Allman, et al.              Standards Track                    [Page 64]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   named after the website of the same name that allows a user to send
+   invitations to friends.
+
+   A common way this is handled is to continue to put the reader's email
+   address in the From header field of the message, but put an address
+   owned by the email posting site into the Sender header field.  The
+   posting site can then sign the message, using the domain that is in
+   the Sender field.  This provides useful information to the receiving
+   email site, which is able to correlate the signing domain with the
+   initial submission email role.
+
+   Receiving sites often wish to provide their end users with
+   information about mail that is mediated in this fashion.  Although
+   the real efficacy of different approaches is a subject for human
+   factors usability research, one technique that is used is for the
+   verifying system to rewrite the From header field, to indicate the
+   address that was verified.  For example: From: John Doe via
+   news@news-site.com <jdoe@example.com>.  (Note that such rewriting
+   will break a signature, unless it is done after the verification pass
+   is complete.)
+
+B.2.  Alternate Delivery Scenarios
+
+   Email is often received at a mailbox that has an address different
+   from the one used during initial submission.  In these cases, an
+   intermediary mechanism operates at the address originally used and it
+   then passes the message on to the final destination.  This mediation
+   process presents some challenges for DKIM signatures.
+
+B.2.1.  Affinity Addresses
+
+   "Affinity addresses" allow a user to have an email address that
+   remains stable, even as the user moves among different email
+   providers.  They are typically associated with college alumni
+   associations, professional organizations, and recreational
+   organizations with which they expect to have a long-term
+   relationship.  These domains usually provide forwarding of incoming
+   email, and they often have an associated Web application that
+   authenticates the user and allows the forwarding address to be
+   changed.  However, these services usually depend on users sending
+   outgoing messages through their own service providers' MTAs.  Hence,
+   mail that is signed with the domain of the affinity address is not
+   signed by an entity that is administered by the organization owning
+   that domain.
+
+   With DKIM, affinity domains could use the Web application to allow
+   users to register per-user keys to be used to sign messages on behalf
+   of their affinity address.  The user would take away the secret half
+
+
+
+Allman, et al.              Standards Track                    [Page 65]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   of the key pair for signing, and the affinity domain would publish
+   the public half in DNS for access by verifiers.
+
+   This is another application that takes advantage of user-level
+   keying, and domains used for affinity addresses would typically have
+   a very large number of user-level keys.  Alternatively, the affinity
+   domain could handle outgoing mail, operating a mail submission agent
+   that authenticates users before accepting and signing messages for
+   them.  This is of course dependent on the user's service provider not
+   blocking the relevant TCP ports used for mail submission.
+
+B.2.2.  Simple Address Aliasing (.forward)
+
+   In some cases, a recipient is allowed to configure an email address
+   to cause automatic redirection of email messages from the original
+   address to another, such as through the use of a Unix .forward file.
+   In this case, messages are typically redirected by the mail handling
+   service of the recipient's domain, without modification, except for
+   the addition of a Received header field to the message and a change
+   in the envelope recipient address.  In this case, the recipient at
+   the final address' mailbox is likely to be able to verify the
+   original signature since the signed content has not changed, and DKIM
+   is able to validate the message signature.
+
+B.2.3.  Mailing Lists and Re-Posters
+
+   There is a wide range of behaviors in services that take delivery of
+   a message and then resubmit it.  A primary example is with mailing
+   lists (collectively called "forwarders" below), ranging from those
+   that make no modification to the message itself, other than to add a
+   Received header field and change the envelope information, to those
+   that add header fields, change the Subject header field, add content
+   to the body (typically at the end), or reformat the body in some
+   manner.  The simple ones produce messages that are quite similar to
+   the automated alias services.  More elaborate systems essentially
+   create a new message.
+
+   A Forwarder that does not modify the body or signed header fields of
+   a message is likely to maintain the validity of the existing
+   signature.  It also could choose to add its own signature to the
+   message.
+
+   Forwarders which modify a message in a way that could make an
+   existing signature invalid are particularly good candidates for
+   adding their own signatures (e.g., mailing-list-name@example.net).
+   Since (re-)signing is taking responsibility for the content of the
+   message, these signing forwarders are likely to be selective, and
+   forward or re-sign a message only if it is received with a valid
+
+
+
+Allman, et al.              Standards Track                    [Page 66]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   signature or if they have some other basis for knowing that the
+   message is not spoofed.
+
+   A common practice among systems that are primarily redistributors of
+   mail is to add a Sender header field to the message, to identify the
+   address being used to sign the message.  This practice will remove
+   any preexisting Sender header field as required by [RFC2822].  The
+   forwarder applies a new DKIM-Signature header field with the
+   signature, public key, and related information of the forwarder.
+
+Appendix C.  Creating a Public Key (INFORMATIVE)
+
+   The default signature is an RSA signed SHA256 digest of the complete
+   email.  For ease of explanation, the openssl command is used to
+   describe the mechanism by which keys and signatures are managed.  One
+   way to generate a 1024-bit, unencrypted private key suitable for DKIM
+   is to use openssl like this:
+
+   $ openssl genrsa -out rsa.private 1024
+
+   For increased security, the "-passin" parameter can also be added to
+   encrypt the private key.  Use of this parameter will require entering
+   a password for several of the following steps.  Servers may prefer to
+   use hardware cryptographic support.
+
+   The "genrsa" step results in the file rsa.private containing the key
+   information similar to this:
+
+    -----BEGIN RSA PRIVATE KEY-----
+    MIICXwIBAAKBgQDwIRP/UC3SBsEmGqZ9ZJW3/DkMoGeLnQg1fWn7/zYtIxN2SnFC
+    jxOCKG9v3b4jYfcTNh5ijSsq631uBItLa7od+v/RtdC2UzJ1lWT947qR+Rcac2gb
+    to/NMqJ0fzfVjH4OuKhitdY9tf6mcwGjaNBcWToIMmPSPDdQPNUYckcQ2QIDAQAB
+    AoGBALmn+XwWk7akvkUlqb+dOxyLB9i5VBVfje89Teolwc9YJT36BGN/l4e0l6QX
+    /1//6DWUTB3KI6wFcm7TWJcxbS0tcKZX7FsJvUz1SbQnkS54DJck1EZO/BLa5ckJ
+    gAYIaqlA9C0ZwM6i58lLlPadX/rtHb7pWzeNcZHjKrjM461ZAkEA+itss2nRlmyO
+    n1/5yDyCluST4dQfO8kAB3toSEVc7DeFeDhnC1mZdjASZNvdHS4gbLIA1hUGEF9m
+    3hKsGUMMPwJBAPW5v/U+AWTADFCS22t72NUurgzeAbzb1HWMqO4y4+9Hpjk5wvL/
+    eVYizyuce3/fGke7aRYw/ADKygMJdW8H/OcCQQDz5OQb4j2QDpPZc0Nc4QlbvMsj
+    7p7otWRO5xRa6SzXqqV3+F0VpqvDmshEBkoCydaYwc2o6WQ5EBmExeV8124XAkEA
+    qZzGsIxVP+sEVRWZmW6KNFSdVUpk3qzK0Tz/WjQMe5z0UunY9Ax9/4PVhp/j61bf
+    eAYXunajbBSOLlx4D+TunwJBANkPI5S9iylsbLs6NkaMHV6k5ioHBBmgCak95JGX
+    GMot/L2x0IYyMLAz6oLWh2hm7zwtb0CgOrPo1ke44hFYnfc=
+    -----END RSA PRIVATE KEY-----
+
+   To extract the public-key component from the private key, use openssl
+   like this:
+
+   $ openssl rsa -in rsa.private -out rsa.public -pubout -outform PEM
+
+
+
+Allman, et al.              Standards Track                    [Page 67]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   This results in the file rsa.public containing the key information
+   similar to this:
+
+   -----BEGIN PUBLIC KEY-----
+   MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDwIRP/UC3SBsEmGqZ9ZJW3/DkM
+   oGeLnQg1fWn7/zYtIxN2SnFCjxOCKG9v3b4jYfcTNh5ijSsq631uBItLa7od+v/R
+   tdC2UzJ1lWT947qR+Rcac2gbto/NMqJ0fzfVjH4OuKhitdY9tf6mcwGjaNBcWToI
+   MmPSPDdQPNUYckcQ2QIDAQAB
+   -----END PUBLIC KEY-----
+
+   This public-key data (without the BEGIN and END tags) is placed in
+   the DNS:
+
+   brisbane IN  TXT  ("v=DKIM1; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQ"
+                      "KBgQDwIRP/UC3SBsEmGqZ9ZJW3/DkMoGeLnQg1fWn7/zYt"
+                      "IxN2SnFCjxOCKG9v3b4jYfcTNh5ijSsq631uBItLa7od+v"
+                      "/RtdC2UzJ1lWT947qR+Rcac2gbto/NMqJ0fzfVjH4OuKhi"
+                      "tdY9tf6mcwGjaNBcWToIMmPSPDdQPNUYckcQ2QIDAQAB")
+
+Appendix D.  MUA Considerations
+
+   When a DKIM signature is verified, the processing system sometimes
+   makes the result available to the recipient user's MUA.  How to
+   present this information to the user in a way that helps them is a
+   matter of continuing human factors usability research.  The tendency
+   is to have the MUA highlight the address associated with this signing
+   identity in some way, in an attempt to show the user the address from
+   which the mail was sent.  An MUA might do this with visual cues such
+   as graphics, or it might include the address in an alternate view, or
+   it might even rewrite the original From address using the verified
+   information.  Some MUAs might indicate which header fields were
+   protected by the validated DKIM signature.  This could be done with a
+   positive indication on the signed header fields, with a negative
+   indication on the unsigned header fields, by visually hiding the
+   unsigned header fields, or some combination of these.  If an MUA uses
+   visual indications for signed header fields, the MUA probably needs
+   to be careful not to display unsigned header fields in a way that
+   might be construed by the end user as having been signed.  If the
+   message has an l= tag whose value does not extend to the end of the
+   message, the MUA might also hide or mark the portion of the message
+   body that was not signed.
+
+   The aforementioned information is not intended to be exhaustive.  The
+   MUA may choose to highlight, accentuate, hide, or otherwise display
+   any other information that may, in the opinion of the MUA author, be
+   deemed important to the end user.
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 68]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+Appendix E.  Acknowledgements
+
+   The authors wish to thank Russ Allbery, Edwin Aoki, Claus Assmann,
+   Steve Atkins, Rob Austein, Fred Baker, Mark Baugher, Steve Bellovin,
+   Nathaniel Borenstein, Dave Crocker, Michael Cudahy, Dennis Dayman,
+   Jutta Degener, Frank Ellermann, Patrik Faeltstroem, Mark Fanto,
+   Stephen Farrell, Duncan Findlay, Elliot Gillum, Olafur
+   Gu[eth]mundsson, Phillip Hallam-Baker, Tony Hansen, Sam Hartman,
+   Arvel Hathcock, Amir Herzberg, Paul Hoffman, Russ Housley, Craig
+   Hughes, Cullen Jennings, Don Johnsen, Harry Katz, Murray S.
+   Kucherawy, Barry Leiba, John Levine, Charles Lindsey, Simon
+   Longsdale, David Margrave, Justin Mason, David Mayne, Thierry Moreau,
+   Steve Murphy, Russell Nelson, Dave Oran, Doug Otis, Shamim Pirzada,
+   Juan Altmayer Pizzorno, Sanjay Pol, Blake Ramsdell, Christian Renaud,
+   Scott Renfro, Neil Rerup, Eric Rescorla, Dave Rossetti, Hector
+   Santos, Jim Schaad, the Spamhaus.org team, Malte S. Stretz, Robert
+   Sanders, Rand Wacker, Sam Weiler, and Dan Wing for their valuable
+   suggestions and constructive criticism.
+
+   The DomainKeys specification was a primary source from which this
+   specification has been derived.  Further information about DomainKeys
+   is at [RFC4870].
+
+Authors' Addresses
+
+   Eric Allman
+   Sendmail, Inc.
+   6425 Christie Ave, Suite 400
+   Emeryville, CA  94608
+   USA
+
+   Phone: +1 510 594 5501
+   EMail: eric+dkim@sendmail.org
+   URI:
+
+
+   Jon Callas
+   PGP Corporation
+   3460 West Bayshore
+   Palo Alto, CA  94303
+   USA
+
+   Phone: +1 650 319 9016
+   EMail: jon@pgp.com
+
+
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 69]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+   Mark Delany
+   Yahoo! Inc
+   701 First Avenue
+   Sunnyvale, CA  95087
+   USA
+
+   Phone: +1 408 349 6831
+   EMail: markd+dkim@yahoo-inc.com
+   URI:
+
+
+   Miles Libbey
+   Yahoo! Inc
+   701 First Avenue
+   Sunnyvale, CA  95087
+   USA
+
+   EMail: mlibbeymail-mailsig@yahoo.com
+   URI:
+
+
+   Jim Fenton
+   Cisco Systems, Inc.
+   MS SJ-9/2
+   170 W. Tasman Drive
+   San Jose, CA  95134-1706
+   USA
+
+   Phone: +1 408 526 5914
+   EMail: fenton@cisco.com
+   URI:
+
+
+   Michael Thomas
+   Cisco Systems, Inc.
+   MS SJ-9/2
+   170 W. Tasman Drive
+   San Jose, CA  95134-1706
+
+   Phone: +1 408 525 5386
+   EMail: mat@cisco.com
+
+
+
+
+
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 70]
+
+RFC 4871                    DKIM Signatures                     May 2007
+
+
+Full Copyright Statement
+
+   Copyright (C) The IETF Trust (2007).
+
+   This document is subject to the rights, licenses and restrictions
+   contained in BCP 78, and except as set forth therein, the authors
+   retain all their rights.
+
+   This document and the information contained herein are provided on an
+   "AS IS" basis and THE CONTRIBUTOR, THE ORGANIZATION HE/SHE REPRESENTS
+   OR IS SPONSORED BY (IF ANY), THE INTERNET SOCIETY, THE IETF TRUST AND
+   THE INTERNET ENGINEERING TASK FORCE DISCLAIM ALL WARRANTIES, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF
+   THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED
+   WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+Intellectual Property
+
+   The IETF takes no position regarding the validity or scope of any
+   Intellectual Property Rights or other rights that might be claimed to
+   pertain to the implementation or use of the technology described in
+   this document or the extent to which any license under such rights
+   might or might not be available; nor does it represent that it has
+   made any independent effort to identify any such rights.  Information
+   on the procedures with respect to rights in RFC documents can be
+   found in BCP 78 and BCP 79.
+
+   Copies of IPR disclosures made to the IETF Secretariat and any
+   assurances of licenses to be made available, or the result of an
+   attempt made to obtain a general license or permission for the use of
+   such proprietary rights by implementers or users of this
+   specification can be obtained from the IETF on-line IPR repository at
+   http://www.ietf.org/ipr.
+
+   The IETF invites any interested party to bring to its attention any
+   copyrights, patents or patent applications, or other proprietary
+   rights that may cover technology that may be required to implement
+   this standard.  Please address the information to the IETF at
+   ietf-ipr@ietf.org.
+
+Acknowledgement
+
+   Funding for the RFC Editor function is currently provided by the
+   Internet Society.
+
+
+
+
+
+
+
+Allman, et al.              Standards Track                    [Page 71]
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc4880.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc4880.txt
new file mode 100644
index 000000000..0db94537c
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc4880.txt
@@ -0,0 +1,5042 @@
+
+
+
+
+
+Network Working Group                                          J. Callas
+Request for Comments: 4880                               PGP Corporation
+Obsoletes: 1991, 2440                                     L. Donnerhacke
+Category: Standards Track                                       IKS GmbH
+                                                               H. Finney
+                                                         PGP Corporation
+                                                                 D. Shaw
+                                                               R. Thayer
+                                                           November 2007
+
+
+                         OpenPGP Message Format
+
+Status of This Memo
+
+   This document specifies an Internet standards track protocol for the
+   Internet community, and requests discussion and suggestions for
+   improvements.  Please refer to the current edition of the "Internet
+   Official Protocol Standards" (STD 1) for the standardization state
+   and status of this protocol.  Distribution of this memo is unlimited.
+
+Abstract
+
+   This document is maintained in order to publish all necessary
+   information needed to develop interoperable applications based on the
+   OpenPGP format.  It is not a step-by-step cookbook for writing an
+   application.  It describes only the format and methods needed to
+   read, check, generate, and write conforming packets crossing any
+   network.  It does not deal with storage and implementation questions.
+   It does, however, discuss implementation issues necessary to avoid
+   security flaws.
+
+   OpenPGP software uses a combination of strong public-key and
+   symmetric cryptography to provide security services for electronic
+   communications and data storage.  These services include
+   confidentiality, key management, authentication, and digital
+   signatures.  This document specifies the message formats used in
+   OpenPGP.
+
+
+
+
+
+
+
+
+
+
+
+
+
+Callas, et al               Standards Track                     [Page 1]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+Table of Contents
+
+   1. Introduction ....................................................5
+      1.1. Terms ......................................................5
+   2. General functions ...............................................6
+      2.1. Confidentiality via Encryption .............................6
+      2.2. Authentication via Digital Signature .......................7
+      2.3. Compression ................................................7
+      2.4. Conversion to Radix-64 .....................................8
+      2.5. Signature-Only Applications ................................8
+   3. Data Element Formats ............................................8
+      3.1. Scalar Numbers .............................................8
+      3.2. Multiprecision Integers ....................................9
+      3.3. Key IDs ....................................................9
+      3.4. Text .......................................................9
+      3.5. Time Fields ...............................................10
+      3.6. Keyrings ..................................................10
+      3.7. String-to-Key (S2K) Specifiers ............................10
+           3.7.1. String-to-Key (S2K) Specifier Types ................10
+                  3.7.1.1. Simple S2K ................................10
+                  3.7.1.2. Salted S2K ................................11
+                  3.7.1.3. Iterated and Salted S2K ...................11
+           3.7.2. String-to-Key Usage ................................12
+                  3.7.2.1. Secret-Key Encryption .....................12
+                  3.7.2.2. Symmetric-Key Message Encryption ..........13
+   4. Packet Syntax ..................................................13
+      4.1. Overview ..................................................13
+      4.2. Packet Headers ............................................13
+           4.2.1. Old Format Packet Lengths ..........................14
+           4.2.2. New Format Packet Lengths ..........................15
+                  4.2.2.1. One-Octet Lengths .........................15
+                  4.2.2.2. Two-Octet Lengths .........................15
+                  4.2.2.3. Five-Octet Lengths ........................15
+                  4.2.2.4. Partial Body Lengths ......................16
+           4.2.3. Packet Length Examples .............................16
+      4.3. Packet Tags ...............................................17
+   5. Packet Types ...................................................17
+      5.1. Public-Key Encrypted Session Key Packets (Tag 1) ..........17
+      5.2. Signature Packet (Tag 2) ..................................19
+           5.2.1. Signature Types ....................................19
+           5.2.2. Version 3 Signature Packet Format ..................21
+           5.2.3. Version 4 Signature Packet Format ..................24
+                  5.2.3.1. Signature Subpacket Specification .........25
+                  5.2.3.2. Signature Subpacket Types .................27
+                  5.2.3.3. Notes on Self-Signatures ..................27
+                  5.2.3.4. Signature Creation Time ...................28
+                  5.2.3.5. Issuer ....................................28
+                  5.2.3.6. Key Expiration Time .......................28
+
+
+
+Callas, et al               Standards Track                     [Page 2]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+                  5.2.3.7. Preferred Symmetric Algorithms ............28
+                  5.2.3.8. Preferred Hash Algorithms .................29
+                  5.2.3.9. Preferred Compression Algorithms ..........29
+                  5.2.3.10. Signature Expiration Time ................29
+                  5.2.3.11. Exportable Certification .................29
+                  5.2.3.12. Revocable ................................30
+                  5.2.3.13. Trust Signature ..........................30
+                  5.2.3.14. Regular Expression .......................31
+                  5.2.3.15. Revocation Key ...........................31
+                  5.2.3.16. Notation Data ............................31
+                  5.2.3.17. Key Server Preferences ...................32
+                  5.2.3.18. Preferred Key Server .....................33
+                  5.2.3.19. Primary User ID ..........................33
+                  5.2.3.20. Policy URI ...............................33
+                  5.2.3.21. Key Flags ................................33
+                  5.2.3.22. Signer's User ID .........................34
+                  5.2.3.23. Reason for Revocation ....................35
+                  5.2.3.24. Features .................................36
+                  5.2.3.25. Signature Target .........................36
+                  5.2.3.26. Embedded Signature .......................37
+           5.2.4. Computing Signatures ...............................37
+                  5.2.4.1. Subpacket Hints ...........................38
+      5.3. Symmetric-Key Encrypted Session Key Packets (Tag 3) .......38
+      5.4. One-Pass Signature Packets (Tag 4) ........................39
+      5.5. Key Material Packet .......................................40
+           5.5.1. Key Packet Variants ................................40
+                  5.5.1.1. Public-Key Packet (Tag 6) .................40
+                  5.5.1.2. Public-Subkey Packet (Tag 14) .............40
+                  5.5.1.3. Secret-Key Packet (Tag 5) .................41
+                  5.5.1.4. Secret-Subkey Packet (Tag 7) ..............41
+           5.5.2. Public-Key Packet Formats ..........................41
+           5.5.3. Secret-Key Packet Formats ..........................43
+      5.6. Compressed Data Packet (Tag 8) ............................45
+      5.7. Symmetrically Encrypted Data Packet (Tag 9) ...............45
+      5.8. Marker Packet (Obsolete Literal Packet) (Tag 10) ..........46
+      5.9. Literal Data Packet (Tag 11) ..............................46
+      5.10. Trust Packet (Tag 12) ....................................47
+      5.11. User ID Packet (Tag 13) ..................................48
+      5.12. User Attribute Packet (Tag 17) ...........................48
+           5.12.1. The Image Attribute Subpacket .....................48
+      5.13. Sym. Encrypted Integrity Protected Data Packet (Tag 18) ..49
+      5.14. Modification Detection Code Packet (Tag 19) ..............52
+   6. Radix-64 Conversions ...........................................53
+      6.1. An Implementation of the CRC-24 in "C" ....................54
+      6.2. Forming ASCII Armor .......................................54
+      6.3. Encoding Binary in Radix-64 ...............................57
+      6.4. Decoding Radix-64 .........................................58
+      6.5. Examples of Radix-64 ......................................59
+
+
+
+Callas, et al               Standards Track                     [Page 3]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+      6.6. Example of an ASCII Armored Message .......................59
+   7. Cleartext Signature Framework ..................................59
+      7.1. Dash-Escaped Text .........................................60
+   8. Regular Expressions ............................................61
+   9. Constants ......................................................61
+      9.1. Public-Key Algorithms .....................................62
+      9.2. Symmetric-Key Algorithms ..................................62
+      9.3. Compression Algorithms ....................................63
+      9.4. Hash Algorithms ...........................................63
+   10. IANA Considerations ...........................................63
+      10.1. New String-to-Key Specifier Types ........................64
+      10.2. New Packets ..............................................64
+           10.2.1. User Attribute Types ..............................64
+                  10.2.1.1. Image Format Subpacket Types .............64
+           10.2.2. New Signature Subpackets ..........................64
+                  10.2.2.1. Signature Notation Data Subpackets .......65
+                  10.2.2.2. Key Server Preference Extensions .........65
+                  10.2.2.3. Key Flags Extensions .....................65
+                  10.2.2.4. Reason For Revocation Extensions .........65
+                  10.2.2.5. Implementation Features ..................66
+           10.2.3. New Packet Versions ...............................66
+      10.3. New Algorithms ...........................................66
+           10.3.1. Public-Key Algorithms .............................66
+           10.3.2. Symmetric-Key Algorithms ..........................67
+           10.3.3. Hash Algorithms ...................................67
+           10.3.4. Compression Algorithms ............................67
+   11. Packet Composition ............................................67
+      11.1. Transferable Public Keys .................................67
+      11.2. Transferable Secret Keys .................................69
+      11.3. OpenPGP Messages .........................................69
+      11.4. Detached Signatures ......................................70
+   12. Enhanced Key Formats ..........................................70
+      12.1. Key Structures ...........................................70
+      12.2. Key IDs and Fingerprints .................................71
+   13. Notes on Algorithms ...........................................72
+      13.1. PKCS#1 Encoding in OpenPGP ...............................72
+           13.1.1. EME-PKCS1-v1_5-ENCODE .............................73
+           13.1.2. EME-PKCS1-v1_5-DECODE .............................73
+           13.1.3. EMSA-PKCS1-v1_5 ...................................74
+      13.2. Symmetric Algorithm Preferences ..........................75
+      13.3. Other Algorithm Preferences ..............................76
+           13.3.1. Compression Preferences ...........................76
+           13.3.2. Hash Algorithm Preferences ........................76
+      13.4. Plaintext ................................................77
+      13.5. RSA ......................................................77
+      13.6. DSA ......................................................77
+      13.7. Elgamal ..................................................78
+      13.8. Reserved Algorithm Numbers ...............................78
+
+
+
+Callas, et al               Standards Track                     [Page 4]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+      13.9. OpenPGP CFB Mode .........................................78
+      13.10. Private or Experimental Parameters ......................79
+      13.11. Extension of the MDC System .............................80
+      13.12. Meta-Considerations for Expansion .......................80
+   14. Security Considerations .......................................81
+   15. Implementation Nits ...........................................84
+   16. References ....................................................86
+      16.1. Normative References .....................................86
+      16.2. Informative References ...................................88
+
+1.  Introduction
+
+   This document provides information on the message-exchange packet
+   formats used by OpenPGP to provide encryption, decryption, signing,
+   and key management functions.  It is a revision of RFC 2440, "OpenPGP
+   Message Format", which itself replaces RFC 1991, "PGP Message
+   Exchange Formats" [RFC1991] [RFC2440].
+
+1.1.  Terms
+
+     * OpenPGP - This is a term for security software that uses PGP 5.x
+       as a basis, formalized in RFC 2440 and this document.
+
+     * PGP - Pretty Good Privacy.  PGP is a family of software systems
+       developed by Philip R. Zimmermann from which OpenPGP is based.
+
+     * PGP 2.6.x - This version of PGP has many variants, hence the term
+       PGP 2.6.x.  It used only RSA, MD5, and IDEA for its cryptographic
+       transforms.  An informational RFC, RFC 1991, was written
+       describing this version of PGP.
+
+     * PGP 5.x - This version of PGP is formerly known as "PGP 3" in the
+       community and also in the predecessor of this document, RFC 1991.
+       It has new formats and corrects a number of problems in the PGP
+       2.6.x design.  It is referred to here as PGP 5.x because that
+       software was the first release of the "PGP 3" code base.
+
+     * GnuPG - GNU Privacy Guard, also called GPG.  GnuPG is an OpenPGP
+       implementation that avoids all encumbered algorithms.
+       Consequently, early versions of GnuPG did not include RSA public
+       keys.  GnuPG may or may not have (depending on version) support
+       for IDEA or other encumbered algorithms.
+
+   "PGP", "Pretty Good", and "Pretty Good Privacy" are trademarks of PGP
+   Corporation and are used with permission.  The term "OpenPGP" refers
+   to the protocol described in this and related documents.
+
+
+
+
+
+Callas, et al               Standards Track                     [Page 5]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
+   "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
+   document are to be interpreted as described in [RFC2119].
+
+   The key words "PRIVATE USE", "HIERARCHICAL ALLOCATION", "FIRST COME
+   FIRST SERVED", "EXPERT REVIEW", "SPECIFICATION REQUIRED", "IESG
+   APPROVAL", "IETF CONSENSUS", and "STANDARDS ACTION" that appear in
+   this document when used to describe namespace allocation are to be
+   interpreted as described in [RFC2434].
+
+2.  General functions
+
+   OpenPGP provides data integrity services for messages and data files
+   by using these core technologies:
+
+     - digital signatures
+
+     - encryption
+
+     - compression
+
+     - Radix-64 conversion
+
+   In addition, OpenPGP provides key management and certificate
+   services, but many of these are beyond the scope of this document.
+
+2.1.  Confidentiality via Encryption
+
+   OpenPGP combines symmetric-key encryption and public-key encryption
+   to provide confidentiality.  When made confidential, first the object
+   is encrypted using a symmetric encryption algorithm.  Each symmetric
+   key is used only once, for a single object.  A new "session key" is
+   generated as a random number for each object (sometimes referred to
+   as a session).  Since it is used only once, the session key is bound
+   to the message and transmitted with it.  To protect the key, it is
+   encrypted with the receiver's public key.  The sequence is as
+   follows:
+
+   1.  The sender creates a message.
+
+   2.  The sending OpenPGP generates a random number to be used as a
+       session key for this message only.
+
+   3.  The session key is encrypted using each recipient's public key.
+       These "encrypted session keys" start the message.
+
+
+
+
+
+
+Callas, et al               Standards Track                     [Page 6]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   4.  The sending OpenPGP encrypts the message using the session key,
+       which forms the remainder of the message.  Note that the message
+       is also usually compressed.
+
+   5.  The receiving OpenPGP decrypts the session key using the
+       recipient's private key.
+
+   6.  The receiving OpenPGP decrypts the message using the session key.
+       If the message was compressed, it will be decompressed.
+
+   With symmetric-key encryption, an object may be encrypted with a
+   symmetric key derived from a passphrase (or other shared secret), or
+   a two-stage mechanism similar to the public-key method described
+   above in which a session key is itself encrypted with a symmetric
+   algorithm keyed from a shared secret.
+
+   Both digital signature and confidentiality services may be applied to
+   the same message.  First, a signature is generated for the message
+   and attached to the message.  Then the message plus signature is
+   encrypted using a symmetric session key.  Finally, the session key is
+   encrypted using public-key encryption and prefixed to the encrypted
+   block.
+
+2.2.  Authentication via Digital Signature
+
+   The digital signature uses a hash code or message digest algorithm,
+   and a public-key signature algorithm.  The sequence is as follows:
+
+   1.  The sender creates a message.
+
+   2.  The sending software generates a hash code of the message.
+
+   3.  The sending software generates a signature from the hash code
+       using the sender's private key.
+
+   4.  The binary signature is attached to the message.
+
+   5.  The receiving software keeps a copy of the message signature.
+
+   6.  The receiving software generates a new hash code for the received
+       message and verifies it using the message's signature.  If the
+       verification is successful, the message is accepted as authentic.
+
+2.3.  Compression
+
+   OpenPGP implementations SHOULD compress the message after applying
+   the signature but before encryption.
+
+
+
+
+Callas, et al               Standards Track                     [Page 7]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   If an implementation does not implement compression, its authors
+   should be aware that most OpenPGP messages in the world are
+   compressed.  Thus, it may even be wise for a space-constrained
+   implementation to implement decompression, but not compression.
+
+   Furthermore, compression has the added side effect that some types of
+   attacks can be thwarted by the fact that slightly altered, compressed
+   data rarely uncompresses without severe errors.  This is hardly
+   rigorous, but it is operationally useful.  These attacks can be
+   rigorously prevented by implementing and using Modification Detection
+   Codes as described in sections following.
+
+2.4.  Conversion to Radix-64
+
+   OpenPGP's underlying native representation for encrypted messages,
+   signature certificates, and keys is a stream of arbitrary octets.
+   Some systems only permit the use of blocks consisting of seven-bit,
+   printable text.  For transporting OpenPGP's native raw binary octets
+   through channels that are not safe to raw binary data, a printable
+   encoding of these binary octets is needed.  OpenPGP provides the
+   service of converting the raw 8-bit binary octet stream to a stream
+   of printable ASCII characters, called Radix-64 encoding or ASCII
+   Armor.
+
+   Implementations SHOULD provide Radix-64 conversions.
+
+2.5.  Signature-Only Applications
+
+   OpenPGP is designed for applications that use both encryption and
+   signatures, but there are a number of problems that are solved by a
+   signature-only implementation.  Although this specification requires
+   both encryption and signatures, it is reasonable for there to be
+   subset implementations that are non-conformant only in that they omit
+   encryption.
+
+3.  Data Element Formats
+
+   This section describes the data elements used by OpenPGP.
+
+3.1.  Scalar Numbers
+
+   Scalar numbers are unsigned and are always stored in big-endian
+   format.  Using n[k] to refer to the kth octet being interpreted, the
+   value of a two-octet scalar is ((n[0] << 8) + n[1]).  The value of a
+   four-octet scalar is ((n[0] << 24) + (n[1] << 16) + (n[2] << 8) +
+   n[3]).
+
+
+
+
+
+Callas, et al               Standards Track                     [Page 8]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+3.2.  Multiprecision Integers
+
+   Multiprecision integers (also called MPIs) are unsigned integers used
+   to hold large integers such as the ones used in cryptographic
+   calculations.
+
+   An MPI consists of two pieces: a two-octet scalar that is the length
+   of the MPI in bits followed by a string of octets that contain the
+   actual integer.
+
+   These octets form a big-endian number; a big-endian number can be
+   made into an MPI by prefixing it with the appropriate length.
+
+   Examples:
+
+   (all numbers are in hexadecimal)
+
+   The string of octets [00 01 01] forms an MPI with the value 1.  The
+   string [00 09 01 FF] forms an MPI with the value of 511.
+
+   Additional rules:
+
+   The size of an MPI is ((MPI.length + 7) / 8) + 2 octets.
+
+   The length field of an MPI describes the length starting from its
+   most significant non-zero bit.  Thus, the MPI [00 02 01] is not
+   formed correctly.  It should be [00 01 01].
+
+   Unused bits of an MPI MUST be zero.
+
+   Also note that when an MPI is encrypted, the length refers to the
+   plaintext MPI.  It may be ill-formed in its ciphertext.
+
+3.3.  Key IDs
+
+   A Key ID is an eight-octet scalar that identifies a key.
+   Implementations SHOULD NOT assume that Key IDs are unique.  The
+   section "Enhanced Key Formats" below describes how Key IDs are
+   formed.
+
+3.4.  Text
+
+   Unless otherwise specified, the character set for text is the UTF-8
+   [RFC3629] encoding of Unicode [ISO10646].
+
+
+
+
+
+
+
+Callas, et al               Standards Track                     [Page 9]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+3.5.  Time Fields
+
+   A time field is an unsigned four-octet number containing the number
+   of seconds elapsed since midnight, 1 January 1970 UTC.
+
+3.6.  Keyrings
+
+   A keyring is a collection of one or more keys in a file or database.
+   Traditionally, a keyring is simply a sequential list of keys, but may
+   be any suitable database.  It is beyond the scope of this standard to
+   discuss the details of keyrings or other databases.
+
+3.7.  String-to-Key (S2K) Specifiers
+
+   String-to-key (S2K) specifiers are used to convert passphrase strings
+   into symmetric-key encryption/decryption keys.  They are used in two
+   places, currently: to encrypt the secret part of private keys in the
+   private keyring, and to convert passphrases to encryption keys for
+   symmetrically encrypted messages.
+
+3.7.1.  String-to-Key (S2K) Specifier Types
+
+   There are three types of S2K specifiers currently supported, and
+   some reserved values:
+
+       ID          S2K Type
+       --          --------
+       0           Simple S2K
+       1           Salted S2K
+       2           Reserved value
+       3           Iterated and Salted S2K
+       100 to 110  Private/Experimental S2K
+
+   These are described in Sections 3.7.1.1 - 3.7.1.3.
+
+3.7.1.1.  Simple S2K
+
+   This directly hashes the string to produce the key data.  See below
+   for how this hashing is done.
+
+       Octet 0:        0x00
+       Octet 1:        hash algorithm
+
+   Simple S2K hashes the passphrase to produce the session key.  The
+   manner in which this is done depends on the size of the session key
+   (which will depend on the cipher used) and the size of the hash
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 10]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   algorithm's output.  If the hash size is greater than the session key
+   size, the high-order (leftmost) octets of the hash are used as the
+   key.
+
+   If the hash size is less than the key size, multiple instances of the
+   hash context are created -- enough to produce the required key data.
+   These instances are preloaded with 0, 1, 2, ... octets of zeros (that
+   is to say, the first instance has no preloading, the second gets
+   preloaded with 1 octet of zero, the third is preloaded with two
+   octets of zeros, and so forth).
+
+   As the data is hashed, it is given independently to each hash
+   context.  Since the contexts have been initialized differently, they
+   will each produce different hash output.  Once the passphrase is
+   hashed, the output data from the multiple hashes is concatenated,
+   first hash leftmost, to produce the key data, with any excess octets
+   on the right discarded.
+
+3.7.1.2.  Salted S2K
+
+   This includes a "salt" value in the S2K specifier -- some arbitrary
+   data -- that gets hashed along with the passphrase string, to help
+   prevent dictionary attacks.
+
+       Octet 0:        0x01
+       Octet 1:        hash algorithm
+       Octets 2-9:     8-octet salt value
+
+   Salted S2K is exactly like Simple S2K, except that the input to the
+   hash function(s) consists of the 8 octets of salt from the S2K
+   specifier, followed by the passphrase.
+
+3.7.1.3.  Iterated and Salted S2K
+
+   This includes both a salt and an octet count.  The salt is combined
+   with the passphrase and the resulting value is hashed repeatedly.
+   This further increases the amount of work an attacker must do to try
+   dictionary attacks.
+
+       Octet  0:        0x03
+       Octet  1:        hash algorithm
+       Octets 2-9:      8-octet salt value
+       Octet  10:       count, a one-octet, coded value
+
+
+
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 11]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   The count is coded into a one-octet number using the following
+   formula:
+
+       #define EXPBIAS 6
+           count = ((Int32)16 + (c & 15)) << ((c >> 4) + EXPBIAS);
+
+   The above formula is in C, where "Int32" is a type for a 32-bit
+   integer, and the variable "c" is the coded count, Octet 10.
+
+   Iterated-Salted S2K hashes the passphrase and salt data multiple
+   times.  The total number of octets to be hashed is specified in the
+   encoded count in the S2K specifier.  Note that the resulting count
+   value is an octet count of how many octets will be hashed, not an
+   iteration count.
+
+   Initially, one or more hash contexts are set up as with the other S2K
+   algorithms, depending on how many octets of key data are needed.
+   Then the salt, followed by the passphrase data, is repeatedly hashed
+   until the number of octets specified by the octet count has been
+   hashed.  The one exception is that if the octet count is less than
+   the size of the salt plus passphrase, the full salt plus passphrase
+   will be hashed even though that is greater than the octet count.
+   After the hashing is done, the data is unloaded from the hash
+   context(s) as with the other S2K algorithms.
+
+3.7.2.  String-to-Key Usage
+
+   Implementations SHOULD use salted or iterated-and-salted S2K
+   specifiers, as simple S2K specifiers are more vulnerable to
+   dictionary attacks.
+
+3.7.2.1.  Secret-Key Encryption
+
+   An S2K specifier can be stored in the secret keyring to specify how
+   to convert the passphrase to a key that unlocks the secret data.
+   Older versions of PGP just stored a cipher algorithm octet preceding
+   the secret data or a zero to indicate that the secret data was
+   unencrypted.  The MD5 hash function was always used to convert the
+   passphrase to a key for the specified cipher algorithm.
+
+   For compatibility, when an S2K specifier is used, the special value
+   254 or 255 is stored in the position where the hash algorithm octet
+   would have been in the old data structure.  This is then followed
+   immediately by a one-octet algorithm identifier, and then by the S2K
+   specifier as encoded above.
+
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 12]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   Therefore, preceding the secret data there will be one of these
+   possibilities:
+
+       0:           secret data is unencrypted (no passphrase)
+       255 or 254:  followed by algorithm octet and S2K specifier
+       Cipher alg:  use Simple S2K algorithm using MD5 hash
+
+   This last possibility, the cipher algorithm number with an implicit
+   use of MD5 and IDEA, is provided for backward compatibility; it MAY
+   be understood, but SHOULD NOT be generated, and is deprecated.
+
+   These are followed by an Initial Vector of the same length as the
+   block size of the cipher for the decryption of the secret values, if
+   they are encrypted, and then the secret-key values themselves.
+
+3.7.2.2.  Symmetric-Key Message Encryption
+
+   OpenPGP can create a Symmetric-key Encrypted Session Key (ESK) packet
+   at the front of a message.  This is used to allow S2K specifiers to
+   be used for the passphrase conversion or to create messages with a
+   mix of symmetric-key ESKs and public-key ESKs.  This allows a message
+   to be decrypted either with a passphrase or a public-key pair.
+
+   PGP 2.X always used IDEA with Simple string-to-key conversion when
+   encrypting a message with a symmetric algorithm.  This is deprecated,
+   but MAY be used for backward-compatibility.
+
+4.  Packet Syntax
+
+   This section describes the packets used by OpenPGP.
+
+4.1.  Overview
+
+   An OpenPGP message is constructed from a number of records that are
+   traditionally called packets.  A packet is a chunk of data that has a
+   tag specifying its meaning.  An OpenPGP message, keyring,
+   certificate, and so forth consists of a number of packets.  Some of
+   those packets may contain other OpenPGP packets (for example, a
+   compressed data packet, when uncompressed, contains OpenPGP packets).
+
+   Each packet consists of a packet header, followed by the packet body.
+   The packet header is of variable length.
+
+4.2.  Packet Headers
+
+   The first octet of the packet header is called the "Packet Tag".  It
+   determines the format of the header and denotes the packet contents.
+   The remainder of the packet header is the length of the packet.
+
+
+
+Callas, et al               Standards Track                    [Page 13]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   Note that the most significant bit is the leftmost bit, called bit 7.
+   A mask for this bit is 0x80 in hexadecimal.
+
+              +---------------+
+         PTag |7 6 5 4 3 2 1 0|
+              +---------------+
+         Bit 7 -- Always one
+         Bit 6 -- New packet format if set
+
+   PGP 2.6.x only uses old format packets.  Thus, software that
+   interoperates with those versions of PGP must only use old format
+   packets.  If interoperability is not an issue, the new packet format
+   is RECOMMENDED.  Note that old format packets have four bits of
+   packet tags, and new format packets have six; some features cannot be
+   used and still be backward-compatible.
+
+   Also note that packets with a tag greater than or equal to 16 MUST
+   use new format packets.  The old format packets can only express tags
+   less than or equal to 15.
+
+   Old format packets contain:
+
+         Bits 5-2 -- packet tag
+         Bits 1-0 -- length-type
+
+   New format packets contain:
+
+         Bits 5-0 -- packet tag
+
+4.2.1.  Old Format Packet Lengths
+
+   The meaning of the length-type in old format packets is:
+
+   0 - The packet has a one-octet length.  The header is 2 octets long.
+
+   1 - The packet has a two-octet length.  The header is 3 octets long.
+
+   2 - The packet has a four-octet length.  The header is 5 octets long.
+
+   3 - The packet is of indeterminate length.  The header is 1 octet
+       long, and the implementation must determine how long the packet
+       is.  If the packet is in a file, this means that the packet
+       extends until the end of the file.  In general, an implementation
+       SHOULD NOT use indeterminate-length packets except where the end
+       of the data will be clear from the context, and even then it is
+       better to use a definite length, or a new format header.  The new
+       format headers described below have a mechanism for precisely
+       encoding data of indeterminate length.
+
+
+
+Callas, et al               Standards Track                    [Page 14]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+4.2.2.  New Format Packet Lengths
+
+   New format packets have four possible ways of encoding length:
+
+   1. A one-octet Body Length header encodes packet lengths of up to 191
+      octets.
+
+   2. A two-octet Body Length header encodes packet lengths of 192 to
+      8383 octets.
+
+   3. A five-octet Body Length header encodes packet lengths of up to
+      4,294,967,295 (0xFFFFFFFF) octets in length.  (This actually
+      encodes a four-octet scalar number.)
+
+   4. When the length of the packet body is not known in advance by the
+      issuer, Partial Body Length headers encode a packet of
+      indeterminate length, effectively making it a stream.
+
+4.2.2.1.  One-Octet Lengths
+
+   A one-octet Body Length header encodes a length of 0 to 191 octets.
+   This type of length header is recognized because the one octet value
+   is less than 192.  The body length is equal to:
+
+       bodyLen = 1st_octet;
+
+4.2.2.2.  Two-Octet Lengths
+
+   A two-octet Body Length header encodes a length of 192 to 8383
+   octets.  It is recognized because its first octet is in the range 192
+   to 223.  The body length is equal to:
+
+       bodyLen = ((1st_octet - 192) << 8) + (2nd_octet) + 192
+
+4.2.2.3.  Five-Octet Lengths
+
+   A five-octet Body Length header consists of a single octet holding
+   the value 255, followed by a four-octet scalar.  The body length is
+   equal to:
+
+       bodyLen = (2nd_octet << 24) | (3rd_octet << 16) |
+                 (4th_octet << 8)  | 5th_octet
+
+   This basic set of one, two, and five-octet lengths is also used
+   internally to some packets.
+
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 15]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+4.2.2.4.  Partial Body Lengths
+
+   A Partial Body Length header is one octet long and encodes the length
+   of only part of the data packet.  This length is a power of 2, from 1
+   to 1,073,741,824 (2 to the 30th power).  It is recognized by its one
+   octet value that is greater than or equal to 224, and less than 255.
+   The Partial Body Length is equal to:
+
+       partialBodyLen = 1 << (1st_octet & 0x1F);
+
+   Each Partial Body Length header is followed by a portion of the
+   packet body data.  The Partial Body Length header specifies this
+   portion's length.  Another length header (one octet, two-octet,
+   five-octet, or partial) follows that portion.  The last length header
+   in the packet MUST NOT be a Partial Body Length header.  Partial Body
+   Length headers may only be used for the non-final parts of the
+   packet.
+
+   Note also that the last Body Length header can be a zero-length
+   header.
+
+   An implementation MAY use Partial Body Lengths for data packets, be
+   they literal, compressed, or encrypted.  The first partial length
+   MUST be at least 512 octets long.  Partial Body Lengths MUST NOT be
+   used for any other packet types.
+
+4.2.3.  Packet Length Examples
+
+   These examples show ways that new format packets might encode the
+   packet lengths.
+
+   A packet with length 100 may have its length encoded in one octet:
+   0x64.  This is followed by 100 octets of data.
+
+   A packet with length 1723 may have its length encoded in two octets:
+   0xC5, 0xFB.  This header is followed by the 1723 octets of data.
+
+   A packet with length 100000 may have its length encoded in five
+   octets: 0xFF, 0x00, 0x01, 0x86, 0xA0.
+
+   It might also be encoded in the following octet stream: 0xEF, first
+   32768 octets of data; 0xE1, next two octets of data; 0xE0, next one
+   octet of data; 0xF0, next 65536 octets of data; 0xC5, 0xDD, last 1693
+   octets of data.  This is just one possible encoding, and many
+   variations are possible on the size of the Partial Body Length
+   headers, as long as a regular Body Length header encodes the last
+   portion of the data.
+
+
+
+
+Callas, et al               Standards Track                    [Page 16]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   Please note that in all of these explanations, the total length of
+   the packet is the length of the header(s) plus the length of the
+   body.
+
+4.3.  Packet Tags
+
+   The packet tag denotes what type of packet the body holds.  Note that
+   old format headers can only have tags less than 16, whereas new
+   format headers can have tags as great as 63.  The defined tags (in
+   decimal) are as follows:
+
+       0        -- Reserved - a packet tag MUST NOT have this value
+       1        -- Public-Key Encrypted Session Key Packet
+       2        -- Signature Packet
+       3        -- Symmetric-Key Encrypted Session Key Packet
+       4        -- One-Pass Signature Packet
+       5        -- Secret-Key Packet
+       6        -- Public-Key Packet
+       7        -- Secret-Subkey Packet
+       8        -- Compressed Data Packet
+       9        -- Symmetrically Encrypted Data Packet
+       10       -- Marker Packet
+       11       -- Literal Data Packet
+       12       -- Trust Packet
+       13       -- User ID Packet
+       14       -- Public-Subkey Packet
+       17       -- User Attribute Packet
+       18       -- Sym. Encrypted and Integrity Protected Data Packet
+       19       -- Modification Detection Code Packet
+       60 to 63 -- Private or Experimental Values
+
+5.  Packet Types
+
+5.1.  Public-Key Encrypted Session Key Packets (Tag 1)
+
+   A Public-Key Encrypted Session Key packet holds the session key used
+   to encrypt a message.  Zero or more Public-Key Encrypted Session Key
+   packets and/or Symmetric-Key Encrypted Session Key packets may
+   precede a Symmetrically Encrypted Data Packet, which holds an
+   encrypted message.  The message is encrypted with the session key,
+   and the session key is itself encrypted and stored in the Encrypted
+   Session Key packet(s).  The Symmetrically Encrypted Data Packet is
+   preceded by one Public-Key Encrypted Session Key packet for each
+   OpenPGP key to which the message is encrypted.  The recipient of the
+   message finds a session key that is encrypted to their public key,
+   decrypts the session key, and then uses the session key to decrypt
+   the message.
+
+
+
+
+Callas, et al               Standards Track                    [Page 17]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   The body of this packet consists of:
+
+     - A one-octet number giving the version number of the packet type.
+       The currently defined value for packet version is 3.
+
+     - An eight-octet number that gives the Key ID of the public key to
+       which the session key is encrypted.  If the session key is
+       encrypted to a subkey, then the Key ID of this subkey is used
+       here instead of the Key ID of the primary key.
+
+     - A one-octet number giving the public-key algorithm used.
+
+     - A string of octets that is the encrypted session key.  This
+       string takes up the remainder of the packet, and its contents are
+       dependent on the public-key algorithm used.
+
+   Algorithm Specific Fields for RSA encryption
+
+     - multiprecision integer (MPI) of RSA encrypted value m**e mod n.
+
+   Algorithm Specific Fields for Elgamal encryption:
+
+     - MPI of Elgamal (Diffie-Hellman) value g**k mod p.
+
+     - MPI of Elgamal (Diffie-Hellman) value m * y**k mod p.
+
+   The value "m" in the above formulas is derived from the session key
+   as follows.  First, the session key is prefixed with a one-octet
+   algorithm identifier that specifies the symmetric encryption
+   algorithm used to encrypt the following Symmetrically Encrypted Data
+   Packet.  Then a two-octet checksum is appended, which is equal to the
+   sum of the preceding session key octets, not including the algorithm
+   identifier, modulo 65536.  This value is then encoded as described in
+   PKCS#1 block encoding EME-PKCS1-v1_5 in Section 7.2.1 of [RFC3447] to
+   form the "m" value used in the formulas above.  See Section 13.1 of
+   this document for notes on OpenPGP's use of PKCS#1.
+
+   Note that when an implementation forms several PKESKs with one
+   session key, forming a message that can be decrypted by several keys,
+   the implementation MUST make a new PKCS#1 encoding for each key.
+
+   An implementation MAY accept or use a Key ID of zero as a "wild card"
+   or "speculative" Key ID.  In this case, the receiving implementation
+   would try all available private keys, checking for a valid decrypted
+   session key.  This format helps reduce traffic analysis of messages.
+
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 18]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+5.2.  Signature Packet (Tag 2)
+
+   A Signature packet describes a binding between some public key and
+   some data.  The most common signatures are a signature of a file or a
+   block of text, and a signature that is a certification of a User ID.
+
+   Two versions of Signature packets are defined.  Version 3 provides
+   basic signature information, while version 4 provides an expandable
+   format with subpackets that can specify more information about the
+   signature.  PGP 2.6.x only accepts version 3 signatures.
+
+   Implementations SHOULD accept V3 signatures.  Implementations SHOULD
+   generate V4 signatures.
+
+   Note that if an implementation is creating an encrypted and signed
+   message that is encrypted to a V3 key, it is reasonable to create a
+   V3 signature.
+
+5.2.1.  Signature Types
+
+   There are a number of possible meanings for a signature, which are
+   indicated in a signature type octet in any given signature.  Please
+   note that the vagueness of these meanings is not a flaw, but a
+   feature of the system.  Because OpenPGP places final authority for
+   validity upon the receiver of a signature, it may be that one
+   signer's casual act might be more rigorous than some other
+   authority's positive act.  See Section 5.2.4, "Computing Signatures",
+   for detailed information on how to compute and verify signatures of
+   each type.
+
+   These meanings are as follows:
+
+   0x00: Signature of a binary document.
+       This means the signer owns it, created it, or certifies that it
+       has not been modified.
+
+   0x01: Signature of a canonical text document.
+       This means the signer owns it, created it, or certifies that it
+       has not been modified.  The signature is calculated over the text
+       data with its line endings converted to <CR><LF>.
+
+   0x02: Standalone signature.
+       This signature is a signature of only its own subpacket contents.
+       It is calculated identically to a signature over a zero-length
+       binary document.  Note that it doesn't make sense to have a V3
+       standalone signature.
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 19]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   0x10: Generic certification of a User ID and Public-Key packet.
+       The issuer of this certification does not make any particular
+       assertion as to how well the certifier has checked that the owner
+       of the key is in fact the person described by the User ID.
+
+   0x11: Persona certification of a User ID and Public-Key packet.
+       The issuer of this certification has not done any verification of
+       the claim that the owner of this key is the User ID specified.
+
+   0x12: Casual certification of a User ID and Public-Key packet.
+       The issuer of this certification has done some casual
+       verification of the claim of identity.
+
+   0x13: Positive certification of a User ID and Public-Key packet.
+       The issuer of this certification has done substantial
+       verification of the claim of identity.
+
+       Most OpenPGP implementations make their "key signatures" as 0x10
+       certifications.  Some implementations can issue 0x11-0x13
+       certifications, but few differentiate between the types.
+
+   0x18: Subkey Binding Signature
+       This signature is a statement by the top-level signing key that
+       indicates that it owns the subkey.  This signature is calculated
+       directly on the primary key and subkey, and not on any User ID or
+       other packets.  A signature that binds a signing subkey MUST have
+       an Embedded Signature subpacket in this binding signature that
+       contains a 0x19 signature made by the signing subkey on the
+       primary key and subkey.
+
+   0x19: Primary Key Binding Signature
+       This signature is a statement by a signing subkey, indicating
+       that it is owned by the primary key and subkey.  This signature
+       is calculated the same way as a 0x18 signature: directly on the
+       primary key and subkey, and not on any User ID or other packets.
+
+   0x1F: Signature directly on a key
+       This signature is calculated directly on a key.  It binds the
+       information in the Signature subpackets to the key, and is
+       appropriate to be used for subpackets that provide information
+       about the key, such as the Revocation Key subpacket.  It is also
+       appropriate for statements that non-self certifiers want to make
+       about the key itself, rather than the binding between a key and a
+       name.
+
+
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 20]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   0x20: Key revocation signature
+       The signature is calculated directly on the key being revoked.  A
+       revoked key is not to be used.  Only revocation signatures by the
+       key being revoked, or by an authorized revocation key, should be
+       considered valid revocation signatures.
+
+   0x28: Subkey revocation signature
+       The signature is calculated directly on the subkey being revoked.
+       A revoked subkey is not to be used.  Only revocation signatures
+       by the top-level signature key that is bound to this subkey, or
+       by an authorized revocation key, should be considered valid
+       revocation signatures.
+
+   0x30: Certification revocation signature
+       This signature revokes an earlier User ID certification signature
+       (signature class 0x10 through 0x13) or direct-key signature
+       (0x1F).  It should be issued by the same key that issued the
+       revoked signature or an authorized revocation key.  The signature
+       is computed over the same data as the certificate that it
+       revokes, and should have a later creation date than that
+       certificate.
+
+   0x40: Timestamp signature.
+       This signature is only meaningful for the timestamp contained in
+       it.
+
+   0x50: Third-Party Confirmation signature.
+       This signature is a signature over some other OpenPGP Signature
+       packet(s).  It is analogous to a notary seal on the signed data.
+       A third-party signature SHOULD include Signature Target
+       subpacket(s) to give easy identification.  Note that we really do
+       mean SHOULD.  There are plausible uses for this (such as a blind
+       party that only sees the signature, not the key or source
+       document) that cannot include a target subpacket.
+
+5.2.2.  Version 3 Signature Packet Format
+
+   The body of a version 3 Signature Packet contains:
+
+     - One-octet version number (3).
+
+     - One-octet length of following hashed material.  MUST be 5.
+
+         - One-octet signature type.
+
+         - Four-octet creation time.
+
+     - Eight-octet Key ID of signer.
+
+
+
+Callas, et al               Standards Track                    [Page 21]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+     - One-octet public-key algorithm.
+
+     - One-octet hash algorithm.
+
+     - Two-octet field holding left 16 bits of signed hash value.
+
+     - One or more multiprecision integers comprising the signature.
+       This portion is algorithm specific, as described below.
+
+   The concatenation of the data to be signed, the signature type, and
+   creation time from the Signature packet (5 additional octets) is
+   hashed.  The resulting hash value is used in the signature algorithm.
+   The high 16 bits (first two octets) of the hash are included in the
+   Signature packet to provide a quick test to reject some invalid
+   signatures.
+
+   Algorithm-Specific Fields for RSA signatures:
+
+     - multiprecision integer (MPI) of RSA signature value m**d mod n.
+
+   Algorithm-Specific Fields for DSA signatures:
+
+     - MPI of DSA value r.
+
+     - MPI of DSA value s.
+
+   The signature calculation is based on a hash of the signed data, as
+   described above.  The details of the calculation are different for
+   DSA signatures than for RSA signatures.
+
+   With RSA signatures, the hash value is encoded using PKCS#1 encoding
+   type EMSA-PKCS1-v1_5 as described in Section 9.2 of RFC 3447.  This
+   requires inserting the hash value as an octet string into an ASN.1
+   structure.  The object identifier for the type of hash being used is
+   included in the structure.  The hexadecimal representations for the
+   currently defined hash algorithms are as follows:
+
+     - MD5:        0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x02, 0x05
+
+     - RIPEMD-160: 0x2B, 0x24, 0x03, 0x02, 0x01
+
+     - SHA-1:      0x2B, 0x0E, 0x03, 0x02, 0x1A
+
+     - SHA224:     0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x04
+
+     - SHA256:     0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01
+
+     - SHA384:     0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02
+
+
+
+Callas, et al               Standards Track                    [Page 22]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+     - SHA512:     0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03
+
+   The ASN.1 Object Identifiers (OIDs) are as follows:
+
+     - MD5:        1.2.840.113549.2.5
+
+     - RIPEMD-160: 1.3.36.3.2.1
+
+     - SHA-1:      1.3.14.3.2.26
+
+     - SHA224:     2.16.840.1.101.3.4.2.4
+
+     - SHA256:     2.16.840.1.101.3.4.2.1
+
+     - SHA384:     2.16.840.1.101.3.4.2.2
+
+     - SHA512:     2.16.840.1.101.3.4.2.3
+
+   The full hash prefixes for these are as follows:
+
+       MD5:        0x30, 0x20, 0x30, 0x0C, 0x06, 0x08, 0x2A, 0x86,
+                   0x48, 0x86, 0xF7, 0x0D, 0x02, 0x05, 0x05, 0x00,
+                   0x04, 0x10
+
+       RIPEMD-160: 0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2B, 0x24,
+                   0x03, 0x02, 0x01, 0x05, 0x00, 0x04, 0x14
+
+       SHA-1:      0x30, 0x21, 0x30, 0x09, 0x06, 0x05, 0x2b, 0x0E,
+                   0x03, 0x02, 0x1A, 0x05, 0x00, 0x04, 0x14
+
+       SHA224:     0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86,
+                   0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x04, 0x05,
+                   0x00, 0x04, 0x1C
+
+       SHA256:     0x30, 0x31, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86,
+                   0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x05,
+                   0x00, 0x04, 0x20
+
+       SHA384:     0x30, 0x41, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86,
+                   0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02, 0x05,
+                   0x00, 0x04, 0x30
+
+       SHA512:     0x30, 0x51, 0x30, 0x0d, 0x06, 0x09, 0x60, 0x86,
+                   0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03, 0x05,
+                   0x00, 0x04, 0x40
+
+   DSA signatures MUST use hashes that are equal in size to the number
+   of bits of q, the group generated by the DSA key's generator value.
+
+
+
+Callas, et al               Standards Track                    [Page 23]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   If the output size of the chosen hash is larger than the number of
+   bits of q, the hash result is truncated to fit by taking the number
+   of leftmost bits equal to the number of bits of q.  This (possibly
+   truncated) hash function result is treated as a number and used
+   directly in the DSA signature algorithm.
+
+5.2.3.  Version 4 Signature Packet Format
+
+   The body of a version 4 Signature packet contains:
+
+     - One-octet version number (4).
+
+     - One-octet signature type.
+
+     - One-octet public-key algorithm.
+
+     - One-octet hash algorithm.
+
+     - Two-octet scalar octet count for following hashed subpacket data.
+       Note that this is the length in octets of all of the hashed
+       subpackets; a pointer incremented by this number will skip over
+       the hashed subpackets.
+
+     - Hashed subpacket data set (zero or more subpackets).
+
+     - Two-octet scalar octet count for the following unhashed subpacket
+       data.  Note that this is the length in octets of all of the
+       unhashed subpackets; a pointer incremented by this number will
+       skip over the unhashed subpackets.
+
+     - Unhashed subpacket data set (zero or more subpackets).
+
+     - Two-octet field holding the left 16 bits of the signed hash
+       value.
+
+     - One or more multiprecision integers comprising the signature.
+       This portion is algorithm specific, as described above.
+
+   The concatenation of the data being signed and the signature data
+   from the version number through the hashed subpacket data (inclusive)
+   is hashed.  The resulting hash value is what is signed.  The left 16
+   bits of the hash are included in the Signature packet to provide a
+   quick test to reject some invalid signatures.
+
+   There are two fields consisting of Signature subpackets.  The first
+   field is hashed with the rest of the signature data, while the second
+   is unhashed.  The second set of subpackets is not cryptographically
+
+
+
+
+Callas, et al               Standards Track                    [Page 24]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   protected by the signature and should include only advisory
+   information.
+
+   The algorithms for converting the hash function result to a signature
+   are described in a section below.
+
+5.2.3.1.  Signature Subpacket Specification
+
+   A subpacket data set consists of zero or more Signature subpackets.
+   In Signature packets, the subpacket data set is preceded by a two-
+   octet scalar count of the length in octets of all the subpackets.  A
+   pointer incremented by this number will skip over the subpacket data
+   set.
+
+   Each subpacket consists of a subpacket header and a body.  The header
+   consists of:
+
+     - the subpacket length (1, 2, or 5 octets),
+
+     - the subpacket type (1 octet),
+
+   and is followed by the subpacket-specific data.
+
+   The length includes the type octet but not this length.  Its format
+   is similar to the "new" format packet header lengths, but cannot have
+   Partial Body Lengths.  That is:
+
+       if the 1st octet <  192, then
+           lengthOfLength = 1
+           subpacketLen = 1st_octet
+
+       if the 1st octet >= 192 and < 255, then
+           lengthOfLength = 2
+           subpacketLen = ((1st_octet - 192) << 8) + (2nd_octet) + 192
+
+       if the 1st octet = 255, then
+           lengthOfLength = 5
+           subpacket length = [four-octet scalar starting at 2nd_octet]
+
+   The value of the subpacket type octet may be:
+
+            0 = Reserved
+            1 = Reserved
+            2 = Signature Creation Time
+            3 = Signature Expiration Time
+            4 = Exportable Certification
+            5 = Trust Signature
+            6 = Regular Expression
+
+
+
+Callas, et al               Standards Track                    [Page 25]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+            7 = Revocable
+            8 = Reserved
+            9 = Key Expiration Time
+           10 = Placeholder for backward compatibility
+           11 = Preferred Symmetric Algorithms
+           12 = Revocation Key
+           13 = Reserved
+           14 = Reserved
+           15 = Reserved
+           16 = Issuer
+           17 = Reserved
+           18 = Reserved
+           19 = Reserved
+           20 = Notation Data
+           21 = Preferred Hash Algorithms
+           22 = Preferred Compression Algorithms
+           23 = Key Server Preferences
+           24 = Preferred Key Server
+           25 = Primary User ID
+           26 = Policy URI
+           27 = Key Flags
+           28 = Signer's User ID
+           29 = Reason for Revocation
+           30 = Features
+           31 = Signature Target
+           32 = Embedded Signature
+   100 To 110 = Private or experimental
+
+   An implementation SHOULD ignore any subpacket of a type that it does
+   not recognize.
+
+   Bit 7 of the subpacket type is the "critical" bit.  If set, it
+   denotes that the subpacket is one that is critical for the evaluator
+   of the signature to recognize.  If a subpacket is encountered that is
+   marked critical but is unknown to the evaluating software, the
+   evaluator SHOULD consider the signature to be in error.
+
+   An evaluator may "recognize" a subpacket, but not implement it.  The
+   purpose of the critical bit is to allow the signer to tell an
+   evaluator that it would prefer a new, unknown feature to generate an
+   error than be ignored.
+
+   Implementations SHOULD implement the three preferred algorithm
+   subpackets (11, 21, and 22), as well as the "Reason for Revocation"
+   subpacket.  Note, however, that if an implementation chooses not to
+   implement some of the preferences, it is required to behave in a
+   polite manner to respect the wishes of those users who do implement
+   these preferences.
+
+
+
+Callas, et al               Standards Track                    [Page 26]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+5.2.3.2.  Signature Subpacket Types
+
+   A number of subpackets are currently defined.  Some subpackets apply
+   to the signature itself and some are attributes of the key.
+   Subpackets that are found on a self-signature are placed on a
+   certification made by the key itself.  Note that a key may have more
+   than one User ID, and thus may have more than one self-signature, and
+   differing subpackets.
+
+   A subpacket may be found either in the hashed or unhashed subpacket
+   sections of a signature.  If a subpacket is not hashed, then the
+   information in it cannot be considered definitive because it is not
+   part of the signature proper.
+
+5.2.3.3.  Notes on Self-Signatures
+
+   A self-signature is a binding signature made by the key to which the
+   signature refers.  There are three types of self-signatures, the
+   certification signatures (types 0x10-0x13), the direct-key signature
+   (type 0x1F), and the subkey binding signature (type 0x18).  For
+   certification self-signatures, each User ID may have a self-
+   signature, and thus different subpackets in those self-signatures.
+   For subkey binding signatures, each subkey in fact has a self-
+   signature.  Subpackets that appear in a certification self-signature
+   apply to the user name, and subpackets that appear in the subkey
+   self-signature apply to the subkey.  Lastly, subpackets on the
+   direct-key signature apply to the entire key.
+
+   Implementing software should interpret a self-signature's preference
+   subpackets as narrowly as possible.  For example, suppose a key has
+   two user names, Alice and Bob.  Suppose that Alice prefers the
+   symmetric algorithm CAST5, and Bob prefers IDEA or TripleDES.  If the
+   software locates this key via Alice's name, then the preferred
+   algorithm is CAST5; if software locates the key via Bob's name, then
+   the preferred algorithm is IDEA.  If the key is located by Key ID,
+   the algorithm of the primary User ID of the key provides the
+   preferred symmetric algorithm.
+
+   Revoking a self-signature or allowing it to expire has a semantic
+   meaning that varies with the signature type.  Revoking the self-
+   signature on a User ID effectively retires that user name.  The
+   self-signature is a statement, "My name X is tied to my signing key
+   K" and is corroborated by other users' certifications.  If another
+   user revokes their certification, they are effectively saying that
+   they no longer believe that name and that key are tied together.
+   Similarly, if the users themselves revoke their self-signature, then
+   the users no longer go by that name, no longer have that email
+   address, etc.  Revoking a binding signature effectively retires that
+
+
+
+Callas, et al               Standards Track                    [Page 27]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   subkey.  Revoking a direct-key signature cancels that signature.
+   Please see the "Reason for Revocation" subpacket (Section 5.2.3.23)
+   for more relevant detail.
+
+   Since a self-signature contains important information about the key's
+   use, an implementation SHOULD allow the user to rewrite the self-
+   signature, and important information in it, such as preferences and
+   key expiration.
+
+   It is good practice to verify that a self-signature imported into an
+   implementation doesn't advertise features that the implementation
+   doesn't support, rewriting the signature as appropriate.
+
+   An implementation that encounters multiple self-signatures on the
+   same object may resolve the ambiguity in any way it sees fit, but it
+   is RECOMMENDED that priority be given to the most recent self-
+   signature.
+
+5.2.3.4.  Signature Creation Time
+
+   (4-octet time field)
+
+   The time the signature was made.
+
+   MUST be present in the hashed area.
+
+5.2.3.5.  Issuer
+
+   (8-octet Key ID)
+
+   The OpenPGP Key ID of the key issuing the signature.
+
+5.2.3.6.  Key Expiration Time
+
+   (4-octet time field)
+
+   The validity period of the key.  This is the number of seconds after
+   the key creation time that the key expires.  If this is not present
+   or has a value of zero, the key never expires.  This is found only on
+   a self-signature.
+
+5.2.3.7.  Preferred Symmetric Algorithms
+
+   (array of one-octet values)
+
+   Symmetric algorithm numbers that indicate which algorithms the key
+   holder prefers to use.  The subpacket body is an ordered list of
+   octets with the most preferred listed first.  It is assumed that only
+
+
+
+Callas, et al               Standards Track                    [Page 28]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   algorithms listed are supported by the recipient's software.
+   Algorithm numbers are in Section 9.  This is only found on a self-
+   signature.
+
+5.2.3.8.  Preferred Hash Algorithms
+
+   (array of one-octet values)
+
+   Message digest algorithm numbers that indicate which algorithms the
+   key holder prefers to receive.  Like the preferred symmetric
+   algorithms, the list is ordered.  Algorithm numbers are in Section 9.
+   This is only found on a self-signature.
+
+5.2.3.9.  Preferred Compression Algorithms
+
+   (array of one-octet values)
+
+   Compression algorithm numbers that indicate which algorithms the key
+   holder prefers to use.  Like the preferred symmetric algorithms, the
+   list is ordered.  Algorithm numbers are in Section 9.  If this
+   subpacket is not included, ZIP is preferred.  A zero denotes that
+   uncompressed data is preferred; the key holder's software might have
+   no compression software in that implementation.  This is only found
+   on a self-signature.
+
+5.2.3.10.  Signature Expiration Time
+
+   (4-octet time field)
+
+   The validity period of the signature.  This is the number of seconds
+   after the signature creation time that the signature expires.  If
+   this is not present or has a value of zero, it never expires.
+
+5.2.3.11.  Exportable Certification
+
+   (1 octet of exportability, 0 for not, 1 for exportable)
+
+   This subpacket denotes whether a certification signature is
+   "exportable", to be used by other users than the signature's issuer.
+   The packet body contains a Boolean flag indicating whether the
+   signature is exportable.  If this packet is not present, the
+   certification is exportable; it is equivalent to a flag containing a
+   1.
+
+   Non-exportable, or "local", certifications are signatures made by a
+   user to mark a key as valid within that user's implementation only.
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 29]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   Thus, when an implementation prepares a user's copy of a key for
+   transport to another user (this is the process of "exporting" the
+   key), any local certification signatures are deleted from the key.
+
+   The receiver of a transported key "imports" it, and likewise trims
+   any local certifications.  In normal operation, there won't be any,
+   assuming the import is performed on an exported key.  However, there
+   are instances where this can reasonably happen.  For example, if an
+   implementation allows keys to be imported from a key database in
+   addition to an exported key, then this situation can arise.
+
+   Some implementations do not represent the interest of a single user
+   (for example, a key server).  Such implementations always trim local
+   certifications from any key they handle.
+
+5.2.3.12.  Revocable
+
+   (1 octet of revocability, 0 for not, 1 for revocable)
+
+   Signature's revocability status.  The packet body contains a Boolean
+   flag indicating whether the signature is revocable.  Signatures that
+   are not revocable have any later revocation signatures ignored.  They
+   represent a commitment by the signer that he cannot revoke his
+   signature for the life of his key.  If this packet is not present,
+   the signature is revocable.
+
+5.2.3.13.  Trust Signature
+
+   (1 octet "level" (depth), 1 octet of trust amount)
+
+   Signer asserts that the key is not only valid but also trustworthy at
+   the specified level.  Level 0 has the same meaning as an ordinary
+   validity signature.  Level 1 means that the signed key is asserted to
+   be a valid trusted introducer, with the 2nd octet of the body
+   specifying the degree of trust.  Level 2 means that the signed key is
+   asserted to be trusted to issue level 1 trust signatures, i.e., that
+   it is a "meta introducer".  Generally, a level n trust signature
+   asserts that a key is trusted to issue level n-1 trust signatures.
+   The trust amount is in a range from 0-255, interpreted such that
+   values less than 120 indicate partial trust and values of 120 or
+   greater indicate complete trust.  Implementations SHOULD emit values
+   of 60 for partial trust and 120 for complete trust.
+
+
+
+
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 30]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+5.2.3.14.  Regular Expression
+
+   (null-terminated regular expression)
+
+   Used in conjunction with trust Signature packets (of level > 0) to
+   limit the scope of trust that is extended.  Only signatures by the
+   target key on User IDs that match the regular expression in the body
+   of this packet have trust extended by the trust Signature subpacket.
+   The regular expression uses the same syntax as the Henry Spencer's
+   "almost public domain" regular expression [REGEX] package.  A
+   description of the syntax is found in Section 8 below.
+
+5.2.3.15.  Revocation Key
+
+   (1 octet of class, 1 octet of public-key algorithm ID, 20 octets of
+   fingerprint)
+
+   Authorizes the specified key to issue revocation signatures for this
+   key.  Class octet must have bit 0x80 set.  If the bit 0x40 is set,
+   then this means that the revocation information is sensitive.  Other
+   bits are for future expansion to other kinds of authorizations.  This
+   is found on a self-signature.
+
+   If the "sensitive" flag is set, the keyholder feels this subpacket
+   contains private trust information that describes a real-world
+   sensitive relationship.  If this flag is set, implementations SHOULD
+   NOT export this signature to other users except in cases where the
+   data needs to be available: when the signature is being sent to the
+   designated revoker, or when it is accompanied by a revocation
+   signature from that revoker.  Note that it may be appropriate to
+   isolate this subpacket within a separate signature so that it is not
+   combined with other subpackets that need to be exported.
+
+5.2.3.16.  Notation Data
+
+       (4 octets of flags, 2 octets of name length (M),
+                           2 octets of value length (N),
+                           M octets of name data,
+                           N octets of value data)
+
+   This subpacket describes a "notation" on the signature that the
+   issuer wishes to make.  The notation has a name and a value, each of
+   which are strings of octets.  There may be more than one notation in
+   a signature.  Notations can be used for any extension the issuer of
+   the signature cares to make.  The "flags" field holds four octets of
+   flags.
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 31]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   All undefined flags MUST be zero.  Defined flags are as follows:
+
+       First octet: 0x80 = human-readable.  This note value is text.
+       Other octets: none.
+
+   Notation names are arbitrary strings encoded in UTF-8.  They reside
+   in two namespaces: The IETF namespace and the user namespace.
+
+   The IETF namespace is registered with IANA.  These names MUST NOT
+   contain the "@" character (0x40).  This is a tag for the user
+   namespace.
+
+   Names in the user namespace consist of a UTF-8 string tag followed by
+   "@" followed by a DNS domain name.  Note that the tag MUST NOT
+   contain an "@" character.  For example, the "sample" tag used by
+   Example Corporation could be "sample@example.com".
+
+   Names in a user space are owned and controlled by the owners of that
+   domain.  Obviously, it's bad form to create a new name in a DNS space
+   that you don't own.
+
+   Since the user namespace is in the form of an email address,
+   implementers MAY wish to arrange for that address to reach a person
+   who can be consulted about the use of the named tag.  Note that due
+   to UTF-8 encoding, not all valid user space name tags are valid email
+   addresses.
+
+   If there is a critical notation, the criticality applies to that
+   specific notation and not to notations in general.
+
+5.2.3.17.  Key Server Preferences
+
+   (N octets of flags)
+
+   This is a list of one-bit flags that indicate preferences that the
+   key holder has about how the key is handled on a key server.  All
+   undefined flags MUST be zero.
+
+   First octet: 0x80 = No-modify
+       the key holder requests that this key only be modified or updated
+       by the key holder or an administrator of the key server.
+
+   This is found only on a self-signature.
+
+
+
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 32]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+5.2.3.18.  Preferred Key Server
+
+   (String)
+
+   This is a URI of a key server that the key holder prefers be used for
+   updates.  Note that keys with multiple User IDs can have a preferred
+   key server for each User ID.  Note also that since this is a URI, the
+   key server can actually be a copy of the key retrieved by ftp, http,
+   finger, etc.
+
+5.2.3.19.  Primary User ID
+
+   (1 octet, Boolean)
+
+   This is a flag in a User ID's self-signature that states whether this
+   User ID is the main User ID for this key.  It is reasonable for an
+   implementation to resolve ambiguities in preferences, etc. by
+   referring to the primary User ID.  If this flag is absent, its value
+   is zero.  If more than one User ID in a key is marked as primary, the
+   implementation may resolve the ambiguity in any way it sees fit, but
+   it is RECOMMENDED that priority be given to the User ID with the most
+   recent self-signature.
+
+   When appearing on a self-signature on a User ID packet, this
+   subpacket applies only to User ID packets.  When appearing on a
+   self-signature on a User Attribute packet, this subpacket applies
+   only to User Attribute packets.  That is to say, there are two
+   different and independent "primaries" -- one for User IDs, and one
+   for User Attributes.
+
+5.2.3.20.  Policy URI
+
+   (String)
+
+   This subpacket contains a URI of a document that describes the policy
+   under which the signature was issued.
+
+5.2.3.21.  Key Flags
+
+   (N octets of flags)
+
+   This subpacket contains a list of binary flags that hold information
+   about a key.  It is a string of octets, and an implementation MUST
+   NOT assume a fixed size.  This is so it can grow over time.  If a
+   list is shorter than an implementation expects, the unstated flags
+   are considered to be zero.  The defined flags are as follows:
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 33]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+       First octet:
+
+       0x01 - This key may be used to certify other keys.
+
+       0x02 - This key may be used to sign data.
+
+       0x04 - This key may be used to encrypt communications.
+
+       0x08 - This key may be used to encrypt storage.
+
+       0x10 - The private component of this key may have been split
+              by a secret-sharing mechanism.
+
+       0x20 - This key may be used for authentication.
+
+       0x80 - The private component of this key may be in the
+              possession of more than one person.
+
+   Usage notes:
+
+   The flags in this packet may appear in self-signatures or in
+   certification signatures.  They mean different things depending on
+   who is making the statement -- for example, a certification signature
+   that has the "sign data" flag is stating that the certification is
+   for that use.  On the other hand, the "communications encryption"
+   flag in a self-signature is stating a preference that a given key be
+   used for communications.  Note however, that it is a thorny issue to
+   determine what is "communications" and what is "storage".  This
+   decision is left wholly up to the implementation; the authors of this
+   document do not claim any special wisdom on the issue and realize
+   that accepted opinion may change.
+
+   The "split key" (0x10) and "group key" (0x80) flags are placed on a
+   self-signature only; they are meaningless on a certification
+   signature.  They SHOULD be placed only on a direct-key signature
+   (type 0x1F) or a subkey signature (type 0x18), one that refers to the
+   key the flag applies to.
+
+5.2.3.22.  Signer's User ID
+
+   (String)
+
+   This subpacket allows a keyholder to state which User ID is
+   responsible for the signing.  Many keyholders use a single key for
+   different purposes, such as business communications as well as
+   personal communications.  This subpacket allows such a keyholder to
+   state which of their roles is making a signature.
+
+
+
+
+Callas, et al               Standards Track                    [Page 34]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   This subpacket is not appropriate to use to refer to a User Attribute
+   packet.
+
+5.2.3.23.  Reason for Revocation
+
+   (1 octet of revocation code, N octets of reason string)
+
+   This subpacket is used only in key revocation and certification
+   revocation signatures.  It describes the reason why the key or
+   certificate was revoked.
+
+   The first octet contains a machine-readable code that denotes the
+   reason for the revocation:
+
+        0  - No reason specified (key revocations or cert revocations)
+        1  - Key is superseded (key revocations)
+        2  - Key material has been compromised (key revocations)
+        3  - Key is retired and no longer used (key revocations)
+        32 - User ID information is no longer valid (cert revocations)
+   100-110 - Private Use
+
+   Following the revocation code is a string of octets that gives
+   information about the Reason for Revocation in human-readable form
+   (UTF-8).  The string may be null, that is, of zero length.  The
+   length of the subpacket is the length of the reason string plus one.
+   An implementation SHOULD implement this subpacket, include it in all
+   revocation signatures, and interpret revocations appropriately.
+   There are important semantic differences between the reasons, and
+   there are thus important reasons for revoking signatures.
+
+   If a key has been revoked because of a compromise, all signatures
+   created by that key are suspect.  However, if it was merely
+   superseded or retired, old signatures are still valid.  If the
+   revoked signature is the self-signature for certifying a User ID, a
+   revocation denotes that that user name is no longer in use.  Such a
+   revocation SHOULD include a 0x20 code.
+
+   Note that any signature may be revoked, including a certification on
+   some other person's key.  There are many good reasons for revoking a
+   certification signature, such as the case where the keyholder leaves
+   the employ of a business with an email address.  A revoked
+   certification is no longer a part of validity calculations.
+
+
+
+
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 35]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+5.2.3.24.  Features
+
+   (N octets of flags)
+
+   The Features subpacket denotes which advanced OpenPGP features a
+   user's implementation supports.  This is so that as features are
+   added to OpenPGP that cannot be backwards-compatible, a user can
+   state that they can use that feature.  The flags are single bits that
+   indicate that a given feature is supported.
+
+   This subpacket is similar to a preferences subpacket, and only
+   appears in a self-signature.
+
+   An implementation SHOULD NOT use a feature listed when sending to a
+   user who does not state that they can use it.
+
+   Defined features are as follows:
+
+       First octet:
+
+       0x01 - Modification Detection (packets 18 and 19)
+
+   If an implementation implements any of the defined features, it
+   SHOULD implement the Features subpacket, too.
+
+   An implementation may freely infer features from other suitable
+   implementation-dependent mechanisms.
+
+5.2.3.25.  Signature Target
+
+   (1 octet public-key algorithm, 1 octet hash algorithm, N octets hash)
+
+   This subpacket identifies a specific target signature to which a
+   signature refers.  For revocation signatures, this subpacket
+   provides explicit designation of which signature is being revoked.
+   For a third-party or timestamp signature, this designates what
+   signature is signed.  All arguments are an identifier of that target
+   signature.
+
+   The N octets of hash data MUST be the size of the hash of the
+   signature.  For example, a target signature with a SHA-1 hash MUST
+   have 20 octets of hash data.
+
+
+
+
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 36]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+5.2.3.26.  Embedded Signature
+
+   (1 signature packet body)
+
+   This subpacket contains a complete Signature packet body as
+   specified in Section 5.2 above.  It is useful when one signature
+   needs to refer to, or be incorporated in, another signature.
+
+5.2.4.  Computing Signatures
+
+   All signatures are formed by producing a hash over the signature
+   data, and then using the resulting hash in the signature algorithm.
+
+   For binary document signatures (type 0x00), the document data is
+   hashed directly.  For text document signatures (type 0x01), the
+   document is canonicalized by converting line endings to <CR><LF>,
+   and the resulting data is hashed.
+
+   When a signature is made over a key, the hash data starts with the
+   octet 0x99, followed by a two-octet length of the key, and then body
+   of the key packet.  (Note that this is an old-style packet header for
+   a key packet with two-octet length.)  A subkey binding signature
+   (type 0x18) or primary key binding signature (type 0x19) then hashes
+   the subkey using the same format as the main key (also using 0x99 as
+   the first octet).  Key revocation signatures (types 0x20 and 0x28)
+   hash only the key being revoked.
+
+   A certification signature (type 0x10 through 0x13) hashes the User
+   ID being bound to the key into the hash context after the above
+   data.  A V3 certification hashes the contents of the User ID or
+   attribute packet packet, without any header.  A V4 certification
+   hashes the constant 0xB4 for User ID certifications or the constant
+   0xD1 for User Attribute certifications, followed by a four-octet
+   number giving the length of the User ID or User Attribute data, and
+   then the User ID or User Attribute data.
+
+   When a signature is made over a Signature packet (type 0x50), the
+   hash data starts with the octet 0x88, followed by the four-octet
+   length of the signature, and then the body of the Signature packet.
+   (Note that this is an old-style packet header for a Signature packet
+   with the length-of-length set to zero.)  The unhashed subpacket data
+   of the Signature packet being hashed is not included in the hash, and
+   the unhashed subpacket data length value is set to zero.
+
+   Once the data body is hashed, then a trailer is hashed.  A V3
+   signature hashes five octets of the packet body, starting from the
+   signature type field.  This data is the signature type, followed by
+   the four-octet signature time.  A V4 signature hashes the packet body
+
+
+
+Callas, et al               Standards Track                    [Page 37]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   starting from its first field, the version number, through the end
+   of the hashed subpacket data.  Thus, the fields hashed are the
+   signature version, the signature type, the public-key algorithm, the
+   hash algorithm, the hashed subpacket length, and the hashed
+   subpacket body.
+
+   V4 signatures also hash in a final trailer of six octets: the
+   version of the Signature packet, i.e., 0x04; 0xFF; and a four-octet,
+   big-endian number that is the length of the hashed data from the
+   Signature packet (note that this number does not include these final
+   six octets).
+
+   After all this has been hashed in a single hash context, the
+   resulting hash field is used in the signature algorithm and placed
+   at the end of the Signature packet.
+
+5.2.4.1.  Subpacket Hints
+
+   It is certainly possible for a signature to contain conflicting
+   information in subpackets.  For example, a signature may contain
+   multiple copies of a preference or multiple expiration times.  In
+   most cases, an implementation SHOULD use the last subpacket in the
+   signature, but MAY use any conflict resolution scheme that makes
+   more sense.  Please note that we are intentionally leaving conflict
+   resolution to the implementer; most conflicts are simply syntax
+   errors, and the wishy-washy language here allows a receiver to be
+   generous in what they accept, while putting pressure on a creator to
+   be stingy in what they generate.
+
+   Some apparent conflicts may actually make sense -- for example,
+   suppose a keyholder has a V3 key and a V4 key that share the same
+   RSA key material.  Either of these keys can verify a signature
+   created by the other, and it may be reasonable for a signature to
+   contain an issuer subpacket for each key, as a way of explicitly
+   tying those keys to the signature.
+
+5.3.  Symmetric-Key Encrypted Session Key Packets (Tag 3)
+
+   The Symmetric-Key Encrypted Session Key packet holds the
+   symmetric-key encryption of a session key used to encrypt a message.
+   Zero or more Public-Key Encrypted Session Key packets and/or
+   Symmetric-Key Encrypted Session Key packets may precede a
+   Symmetrically Encrypted Data packet that holds an encrypted message.
+   The message is encrypted with a session key, and the session key is
+   itself encrypted and stored in the Encrypted Session Key packet or
+   the Symmetric-Key Encrypted Session Key packet.
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 38]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   If the Symmetrically Encrypted Data packet is preceded by one or
+   more Symmetric-Key Encrypted Session Key packets, each specifies a
+   passphrase that may be used to decrypt the message.  This allows a
+   message to be encrypted to a number of public keys, and also to one
+   or more passphrases.  This packet type is new and is not generated
+   by PGP 2.x or PGP 5.0.
+
+   The body of this packet consists of:
+
+     - A one-octet version number.  The only currently defined version
+       is 4.
+
+     - A one-octet number describing the symmetric algorithm used.
+
+     - A string-to-key (S2K) specifier, length as defined above.
+
+     - Optionally, the encrypted session key itself, which is decrypted
+       with the string-to-key object.
+
+   If the encrypted session key is not present (which can be detected
+   on the basis of packet length and S2K specifier size), then the S2K
+   algorithm applied to the passphrase produces the session key for
+   decrypting the file, using the symmetric cipher algorithm from the
+   Symmetric-Key Encrypted Session Key packet.
+
+   If the encrypted session key is present, the result of applying the
+   S2K algorithm to the passphrase is used to decrypt just that
+   encrypted session key field, using CFB mode with an IV of all zeros.
+   The decryption result consists of a one-octet algorithm identifier
+   that specifies the symmetric-key encryption algorithm used to
+   encrypt the following Symmetrically Encrypted Data packet, followed
+   by the session key octets themselves.
+
+   Note: because an all-zero IV is used for this decryption, the S2K
+   specifier MUST use a salt value, either a Salted S2K or an
+   Iterated-Salted S2K.  The salt value will ensure that the decryption
+   key is not repeated even if the passphrase is reused.
+
+5.4.  One-Pass Signature Packets (Tag 4)
+
+   The One-Pass Signature packet precedes the signed data and contains
+   enough information to allow the receiver to begin calculating any
+   hashes needed to verify the signature.  It allows the Signature
+   packet to be placed at the end of the message, so that the signer
+   can compute the entire signed message in one pass.
+
+   A One-Pass Signature does not interoperate with PGP 2.6.x or
+   earlier.
+
+
+
+Callas, et al               Standards Track                    [Page 39]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   The body of this packet consists of:
+
+     - A one-octet version number.  The current version is 3.
+
+     - A one-octet signature type.  Signature types are described in
+       Section 5.2.1.
+
+     - A one-octet number describing the hash algorithm used.
+
+     - A one-octet number describing the public-key algorithm used.
+
+     - An eight-octet number holding the Key ID of the signing key.
+
+     - A one-octet number holding a flag showing whether the signature
+       is nested.  A zero value indicates that the next packet is
+       another One-Pass Signature packet that describes another
+       signature to be applied to the same message data.
+
+   Note that if a message contains more than one one-pass signature,
+   then the Signature packets bracket the message; that is, the first
+   Signature packet after the message corresponds to the last one-pass
+   packet and the final Signature packet corresponds to the first
+   one-pass packet.
+
+5.5.  Key Material Packet
+
+   A key material packet contains all the information about a public or
+   private key.  There are four variants of this packet type, and two
+   major versions.  Consequently, this section is complex.
+
+5.5.1.  Key Packet Variants
+
+5.5.1.1.  Public-Key Packet (Tag 6)
+
+   A Public-Key packet starts a series of packets that forms an OpenPGP
+   key (sometimes called an OpenPGP certificate).
+
+5.5.1.2.  Public-Subkey Packet (Tag 14)
+
+   A Public-Subkey packet (tag 14) has exactly the same format as a
+   Public-Key packet, but denotes a subkey.  One or more subkeys may be
+   associated with a top-level key.  By convention, the top-level key
+   provides signature services, and the subkeys provide encryption
+   services.
+
+   Note: in PGP 2.6.x, tag 14 was intended to indicate a comment
+   packet.  This tag was selected for reuse because no previous version
+   of PGP ever emitted comment packets but they did properly ignore
+
+
+
+Callas, et al               Standards Track                    [Page 40]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   them.  Public-Subkey packets are ignored by PGP 2.6.x and do not
+   cause it to fail, providing a limited degree of backward
+   compatibility.
+
+5.5.1.3.  Secret-Key Packet (Tag 5)
+
+   A Secret-Key packet contains all the information that is found in a
+   Public-Key packet, including the public-key material, but also
+   includes the secret-key material after all the public-key fields.
+
+5.5.1.4.  Secret-Subkey Packet (Tag 7)
+
+   A Secret-Subkey packet (tag 7) is the subkey analog of the Secret
+   Key packet and has exactly the same format.
+
+5.5.2.  Public-Key Packet Formats
+
+   There are two versions of key-material packets.  Version 3 packets
+   were first generated by PGP 2.6.  Version 4 keys first appeared in
+   PGP 5.0 and are the preferred key version for OpenPGP.
+
+   OpenPGP implementations MUST create keys with version 4 format.  V3
+   keys are deprecated; an implementation MUST NOT generate a V3 key,
+   but MAY accept it.
+
+   A version 3 public key or public-subkey packet contains:
+
+     - A one-octet version number (3).
+
+     - A four-octet number denoting the time that the key was created.
+
+     - A two-octet number denoting the time in days that this key is
+       valid.  If this number is zero, then it does not expire.
+
+     - A one-octet number denoting the public-key algorithm of this key.
+
+     - A series of multiprecision integers comprising the key material:
+
+           - a multiprecision integer (MPI) of RSA public modulus n;
+
+           - an MPI of RSA public encryption exponent e.
+
+   V3 keys are deprecated.  They contain three weaknesses.  First, it is
+   relatively easy to construct a V3 key that has the same Key ID as any
+   other key because the Key ID is simply the low 64 bits of the public
+   modulus.  Secondly, because the fingerprint of a V3 key hashes the
+   key material, but not its length, there is an increased opportunity
+   for fingerprint collisions.  Third, there are weaknesses in the MD5
+
+
+
+Callas, et al               Standards Track                    [Page 41]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   hash algorithm that make developers prefer other algorithms.  See
+   below for a fuller discussion of Key IDs and fingerprints.
+
+   V2 keys are identical to the deprecated V3 keys except for the
+   version number.  An implementation MUST NOT generate them and MAY
+   accept or reject them as it sees fit.
+
+   The version 4 format is similar to the version 3 format except for
+   the absence of a validity period.  This has been moved to the
+   Signature packet.  In addition, fingerprints of version 4 keys are
+   calculated differently from version 3 keys, as described in the
+   section "Enhanced Key Formats".
+
+   A version 4 packet contains:
+
+     - A one-octet version number (4).
+
+     - A four-octet number denoting the time that the key was created.
+
+     - A one-octet number denoting the public-key algorithm of this key.
+
+     - A series of multiprecision integers comprising the key material.
+       This algorithm-specific portion is:
+
+       Algorithm-Specific Fields for RSA public keys:
+
+         - multiprecision integer (MPI) of RSA public modulus n;
+
+         - MPI of RSA public encryption exponent e.
+
+       Algorithm-Specific Fields for DSA public keys:
+
+         - MPI of DSA prime p;
+
+         - MPI of DSA group order q (q is a prime divisor of p-1);
+
+         - MPI of DSA group generator g;
+
+         - MPI of DSA public-key value y (= g**x mod p where x
+           is secret).
+
+       Algorithm-Specific Fields for Elgamal public keys:
+
+         - MPI of Elgamal prime p;
+
+         - MPI of Elgamal group generator g;
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 42]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+         - MPI of Elgamal public key value y (= g**x mod p where x
+           is secret).
+
+5.5.3.  Secret-Key Packet Formats
+
+   The Secret-Key and Secret-Subkey packets contain all the data of the
+   Public-Key and Public-Subkey packets, with additional algorithm-
+   specific secret-key data appended, usually in encrypted form.
+
+   The packet contains:
+
+     - A Public-Key or Public-Subkey packet, as described above.
+
+     - One octet indicating string-to-key usage conventions.  Zero
+       indicates that the secret-key data is not encrypted.  255 or 254
+       indicates that a string-to-key specifier is being given.  Any
+       other value is a symmetric-key encryption algorithm identifier.
+
+     - [Optional] If string-to-key usage octet was 255 or 254, a one-
+       octet symmetric encryption algorithm.
+
+     - [Optional] If string-to-key usage octet was 255 or 254, a
+       string-to-key specifier.  The length of the string-to-key
+       specifier is implied by its type, as described above.
+
+     - [Optional] If secret data is encrypted (string-to-key usage octet
+       not zero), an Initial Vector (IV) of the same length as the
+       cipher's block size.
+
+     - Plain or encrypted multiprecision integers comprising the secret
+       key data.  These algorithm-specific fields are as described
+       below.
+
+     - If the string-to-key usage octet is zero or 255, then a two-octet
+       checksum of the plaintext of the algorithm-specific portion (sum
+       of all octets, mod 65536).  If the string-to-key usage octet was
+       254, then a 20-octet SHA-1 hash of the plaintext of the
+       algorithm-specific portion.  This checksum or hash is encrypted
+       together with the algorithm-specific fields (if string-to-key
+       usage octet is not zero).  Note that for all other values, a
+       two-octet checksum is required.
+
+       Algorithm-Specific Fields for RSA secret keys:
+
+       - multiprecision integer (MPI) of RSA secret exponent d.
+
+       - MPI of RSA secret prime value p.
+
+
+
+
+Callas, et al               Standards Track                    [Page 43]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+       - MPI of RSA secret prime value q (p < q).
+
+       - MPI of u, the multiplicative inverse of p, mod q.
+
+       Algorithm-Specific Fields for DSA secret keys:
+
+       - MPI of DSA secret exponent x.
+
+       Algorithm-Specific Fields for Elgamal secret keys:
+
+       - MPI of Elgamal secret exponent x.
+
+   Secret MPI values can be encrypted using a passphrase.  If a string-
+   to-key specifier is given, that describes the algorithm for
+   converting the passphrase to a key, else a simple MD5 hash of the
+   passphrase is used.  Implementations MUST use a string-to-key
+   specifier; the simple hash is for backward compatibility and is
+   deprecated, though implementations MAY continue to use existing
+   private keys in the old format.  The cipher for encrypting the MPIs
+   is specified in the Secret-Key packet.
+
+   Encryption/decryption of the secret data is done in CFB mode using
+   the key created from the passphrase and the Initial Vector from the
+   packet.  A different mode is used with V3 keys (which are only RSA)
+   than with other key formats.  With V3 keys, the MPI bit count prefix
+   (i.e., the first two octets) is not encrypted.  Only the MPI non-
+   prefix data is encrypted.  Furthermore, the CFB state is
+   resynchronized at the beginning of each new MPI value, so that the
+   CFB block boundary is aligned with the start of the MPI data.
+
+   With V4 keys, a simpler method is used.  All secret MPI values are
+   encrypted in CFB mode, including the MPI bitcount prefix.
+
+   The two-octet checksum that follows the algorithm-specific portion is
+   the algebraic sum, mod 65536, of the plaintext of all the algorithm-
+   specific octets (including MPI prefix and data).  With V3 keys, the
+   checksum is stored in the clear.  With V4 keys, the checksum is
+   encrypted like the algorithm-specific data.  This value is used to
+   check that the passphrase was correct.  However, this checksum is
+   deprecated; an implementation SHOULD NOT use it, but should rather
+   use the SHA-1 hash denoted with a usage octet of 254.  The reason for
+   this is that there are some attacks that involve undetectably
+   modifying the secret key.
+
+
+
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 44]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+5.6.  Compressed Data Packet (Tag 8)
+
+   The Compressed Data packet contains compressed data.  Typically, this
+   packet is found as the contents of an encrypted packet, or following
+   a Signature or One-Pass Signature packet, and contains a literal data
+   packet.
+
+   The body of this packet consists of:
+
+     - One octet that gives the algorithm used to compress the packet.
+
+     - Compressed data, which makes up the remainder of the packet.
+
+   A Compressed Data Packet's body contains an block that compresses
+   some set of packets.  See section "Packet Composition" for details on
+   how messages are formed.
+
+   ZIP-compressed packets are compressed with raw RFC 1951 [RFC1951]
+   DEFLATE blocks.  Note that PGP V2.6 uses 13 bits of compression.  If
+   an implementation uses more bits of compression, PGP V2.6 cannot
+   decompress it.
+
+   ZLIB-compressed packets are compressed with RFC 1950 [RFC1950] ZLIB-
+   style blocks.
+
+   BZip2-compressed packets are compressed using the BZip2 [BZ2]
+   algorithm.
+
+5.7.  Symmetrically Encrypted Data Packet (Tag 9)
+
+   The Symmetrically Encrypted Data packet contains data encrypted with
+   a symmetric-key algorithm.  When it has been decrypted, it contains
+   other packets (usually a literal data packet or compressed data
+   packet, but in theory other Symmetrically Encrypted Data packets or
+   sequences of packets that form whole OpenPGP messages).
+
+   The body of this packet consists of:
+
+     - Encrypted data, the output of the selected symmetric-key cipher
+       operating in OpenPGP's variant of Cipher Feedback (CFB) mode.
+
+   The symmetric cipher used may be specified in a Public-Key or
+   Symmetric-Key Encrypted Session Key packet that precedes the
+   Symmetrically Encrypted Data packet.  In that case, the cipher
+   algorithm octet is prefixed to the session key before it is
+   encrypted.  If no packets of these types precede the encrypted data,
+   the IDEA algorithm is used with the session key calculated as the MD5
+   hash of the passphrase, though this use is deprecated.
+
+
+
+Callas, et al               Standards Track                    [Page 45]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   The data is encrypted in CFB mode, with a CFB shift size equal to the
+   cipher's block size.  The Initial Vector (IV) is specified as all
+   zeros.  Instead of using an IV, OpenPGP prefixes a string of length
+   equal to the block size of the cipher plus two to the data before it
+   is encrypted.  The first block-size octets (for example, 8 octets for
+   a 64-bit block length) are random, and the following two octets are
+   copies of the last two octets of the IV.  For example, in an 8-octet
+   block, octet 9 is a repeat of octet 7, and octet 10 is a repeat of
+   octet 8.  In a cipher of length 16, octet 17 is a repeat of octet 15
+   and octet 18 is a repeat of octet 16.  As a pedantic clarification,
+   in both these examples, we consider the first octet to be numbered 1.
+
+   After encrypting the first block-size-plus-two octets, the CFB state
+   is resynchronized.  The last block-size octets of ciphertext are
+   passed through the cipher and the block boundary is reset.
+
+   The repetition of 16 bits in the random data prefixed to the message
+   allows the receiver to immediately check whether the session key is
+   incorrect.  See the "Security Considerations" section for hints on
+   the proper use of this "quick check".
+
+5.8.  Marker Packet (Obsolete Literal Packet) (Tag 10)
+
+   An experimental version of PGP used this packet as the Literal
+   packet, but no released version of PGP generated Literal packets with
+   this tag.  With PGP 5.x, this packet has been reassigned and is
+   reserved for use as the Marker packet.
+
+   The body of this packet consists of:
+
+     - The three octets 0x50, 0x47, 0x50 (which spell "PGP" in UTF-8).
+
+   Such a packet MUST be ignored when received.  It may be placed at the
+   beginning of a message that uses features not available in PGP 2.6.x
+   in order to cause that version to report that newer software is
+   necessary to process the message.
+
+5.9.  Literal Data Packet (Tag 11)
+
+   A Literal Data packet contains the body of a message; data that is
+   not to be further interpreted.
+
+   The body of this packet consists of:
+
+     - A one-octet field that describes how the data is formatted.
+
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 46]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   If it is a 'b' (0x62), then the Literal packet contains binary data.
+   If it is a 't' (0x74), then it contains text data, and thus may need
+   line ends converted to local form, or other text-mode changes.  The
+   tag 'u' (0x75) means the same as 't', but also indicates that
+   implementation believes that the literal data contains UTF-8 text.
+
+   Early versions of PGP also defined a value of 'l' as a 'local' mode
+   for machine-local conversions.  RFC 1991 [RFC1991] incorrectly stated
+   this local mode flag as '1' (ASCII numeral one).  Both of these local
+   modes are deprecated.
+
+     - File name as a string (one-octet length, followed by a file
+       name).  This may be a zero-length string.  Commonly, if the
+       source of the encrypted data is a file, this will be the name of
+       the encrypted file.  An implementation MAY consider the file name
+       in the Literal packet to be a more authoritative name than the
+       actual file name.
+
+   If the special name "_CONSOLE" is used, the message is considered to
+   be "for your eyes only".  This advises that the message data is
+   unusually sensitive, and the receiving program should process it more
+   carefully, perhaps avoiding storing the received data to disk, for
+   example.
+
+     - A four-octet number that indicates a date associated with the
+       literal data.  Commonly, the date might be the modification date
+       of a file, or the time the packet was created, or a zero that
+       indicates no specific time.
+
+     - The remainder of the packet is literal data.
+
+       Text data is stored with <CR><LF> text endings (i.e., network-
+       normal line endings).  These should be converted to native line
+       endings by the receiving software.
+
+5.10.  Trust Packet (Tag 12)
+
+   The Trust packet is used only within keyrings and is not normally
+   exported.  Trust packets contain data that record the user's
+   specifications of which key holders are trustworthy introducers,
+   along with other information that implementing software uses for
+   trust information.  The format of Trust packets is defined by a given
+   implementation.
+
+   Trust packets SHOULD NOT be emitted to output streams that are
+   transferred to other users, and they SHOULD be ignored on any input
+   other than local keyring files.
+
+
+
+
+Callas, et al               Standards Track                    [Page 47]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+5.11.  User ID Packet (Tag 13)
+
+   A User ID packet consists of UTF-8 text that is intended to represent
+   the name and email address of the key holder.  By convention, it
+   includes an RFC 2822 [RFC2822] mail name-addr, but there are no
+   restrictions on its content.  The packet length in the header
+   specifies the length of the User ID.
+
+5.12.  User Attribute Packet (Tag 17)
+
+   The User Attribute packet is a variation of the User ID packet.  It
+   is capable of storing more types of data than the User ID packet,
+   which is limited to text.  Like the User ID packet, a User Attribute
+   packet may be certified by the key owner ("self-signed") or any other
+   key owner who cares to certify it.  Except as noted, a User Attribute
+   packet may be used anywhere that a User ID packet may be used.
+
+   While User Attribute packets are not a required part of the OpenPGP
+   standard, implementations SHOULD provide at least enough
+   compatibility to properly handle a certification signature on the
+   User Attribute packet.  A simple way to do this is by treating the
+   User Attribute packet as a User ID packet with opaque contents, but
+   an implementation may use any method desired.
+
+   The User Attribute packet is made up of one or more attribute
+   subpackets.  Each subpacket consists of a subpacket header and a
+   body.  The header consists of:
+
+     - the subpacket length (1, 2, or 5 octets)
+
+     - the subpacket type (1 octet)
+
+   and is followed by the subpacket specific data.
+
+   The only currently defined subpacket type is 1, signifying an image.
+   An implementation SHOULD ignore any subpacket of a type that it does
+   not recognize.  Subpacket types 100 through 110 are reserved for
+   private or experimental use.
+
+5.12.1.  The Image Attribute Subpacket
+
+   The Image Attribute subpacket is used to encode an image, presumably
+   (but not required to be) that of the key owner.
+
+   The Image Attribute subpacket begins with an image header.  The first
+   two octets of the image header contain the length of the image
+   header.  Note that unlike other multi-octet numerical values in this
+   document, due to a historical accident this value is encoded as a
+
+
+
+Callas, et al               Standards Track                    [Page 48]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   little-endian number.  The image header length is followed by a
+   single octet for the image header version.  The only currently
+   defined version of the image header is 1, which is a 16-octet image
+   header.  The first three octets of a version 1 image header are thus
+   0x10, 0x00, 0x01.
+
+   The fourth octet of a version 1 image header designates the encoding
+   format of the image.  The only currently defined encoding format is
+   the value 1 to indicate JPEG.  Image format types 100 through 110 are
+   reserved for private or experimental use.  The rest of the version 1
+   image header is made up of 12 reserved octets, all of which MUST be
+   set to 0.
+
+   The rest of the image subpacket contains the image itself.  As the
+   only currently defined image type is JPEG, the image is encoded in
+   the JPEG File Interchange Format (JFIF), a standard file format for
+   JPEG images [JFIF].
+
+   An implementation MAY try to determine the type of an image by
+   examination of the image data if it is unable to handle a particular
+   version of the image header or if a specified encoding format value
+   is not recognized.
+
+5.13.  Sym. Encrypted Integrity Protected Data Packet (Tag 18)
+
+   The Symmetrically Encrypted Integrity Protected Data packet is a
+   variant of the Symmetrically Encrypted Data packet.  It is a new
+   feature created for OpenPGP that addresses the problem of detecting a
+   modification to encrypted data.  It is used in combination with a
+   Modification Detection Code packet.
+
+   There is a corresponding feature in the features Signature subpacket
+   that denotes that an implementation can properly use this packet
+   type.  An implementation MUST support decrypting these packets and
+   SHOULD prefer generating them to the older Symmetrically Encrypted
+   Data packet when possible.  Since this data packet protects against
+   modification attacks, this standard encourages its proliferation.
+   While blanket adoption of this data packet would create
+   interoperability problems, rapid adoption is nevertheless important.
+   An implementation SHOULD specifically denote support for this packet,
+   but it MAY infer it from other mechanisms.
+
+   For example, an implementation might infer from the use of a cipher
+   such as Advanced Encryption Standard (AES) or Twofish that a user
+   supports this feature.  It might place in the unhashed portion of
+   another user's key signature a Features subpacket.  It might also
+   present a user with an opportunity to regenerate their own self-
+   signature with a Features subpacket.
+
+
+
+Callas, et al               Standards Track                    [Page 49]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   This packet contains data encrypted with a symmetric-key algorithm
+   and protected against modification by the SHA-1 hash algorithm.  When
+   it has been decrypted, it will typically contain other packets (often
+   a Literal Data packet or Compressed Data packet).  The last decrypted
+   packet in this packet's payload MUST be a Modification Detection Code
+   packet.
+
+   The body of this packet consists of:
+
+     - A one-octet version number.  The only currently defined value is
+       1.
+
+     - Encrypted data, the output of the selected symmetric-key cipher
+       operating in Cipher Feedback mode with shift amount equal to the
+       block size of the cipher (CFB-n where n is the block size).
+
+   The symmetric cipher used MUST be specified in a Public-Key or
+   Symmetric-Key Encrypted Session Key packet that precedes the
+   Symmetrically Encrypted Data packet.  In either case, the cipher
+   algorithm octet is prefixed to the session key before it is
+   encrypted.
+
+   The data is encrypted in CFB mode, with a CFB shift size equal to the
+   cipher's block size.  The Initial Vector (IV) is specified as all
+   zeros.  Instead of using an IV, OpenPGP prefixes an octet string to
+   the data before it is encrypted.  The length of the octet string
+   equals the block size of the cipher in octets, plus two.  The first
+   octets in the group, of length equal to the block size of the cipher,
+   are random; the last two octets are each copies of their 2nd
+   preceding octet.  For example, with a cipher whose block size is 128
+   bits or 16 octets, the prefix data will contain 16 random octets,
+   then two more octets, which are copies of the 15th and 16th octets,
+   respectively.  Unlike the Symmetrically Encrypted Data Packet, no
+   special CFB resynchronization is done after encrypting this prefix
+   data.  See "OpenPGP CFB Mode" below for more details.
+
+   The repetition of 16 bits in the random data prefixed to the message
+   allows the receiver to immediately check whether the session key is
+   incorrect.
+
+   The plaintext of the data to be encrypted is passed through the SHA-1
+   hash function, and the result of the hash is appended to the
+   plaintext in a Modification Detection Code packet.  The input to the
+   hash function includes the prefix data described above; it includes
+   all of the plaintext, and then also includes two octets of values
+   0xD3, 0x14.  These represent the encoding of a Modification Detection
+   Code packet tag and length field of 20 octets.
+
+
+
+
+Callas, et al               Standards Track                    [Page 50]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   The resulting hash value is stored in a Modification Detection Code
+   (MDC) packet, which MUST use the two octet encoding just given to
+   represent its tag and length field.  The body of the MDC packet is
+   the 20-octet output of the SHA-1 hash.
+
+   The Modification Detection Code packet is appended to the plaintext
+   and encrypted along with the plaintext using the same CFB context.
+
+   During decryption, the plaintext data should be hashed with SHA-1,
+   including the prefix data as well as the packet tag and length field
+   of the Modification Detection Code packet.  The body of the MDC
+   packet, upon decryption, is compared with the result of the SHA-1
+   hash.
+
+   Any failure of the MDC indicates that the message has been modified
+   and MUST be treated as a security problem.  Failures include a
+   difference in the hash values, but also the absence of an MDC packet,
+   or an MDC packet in any position other than the end of the plaintext.
+   Any failure SHOULD be reported to the user.
+
+   Note: future designs of new versions of this packet should consider
+   rollback attacks since it will be possible for an attacker to change
+   the version back to 1.
+
+      NON-NORMATIVE EXPLANATION
+
+      The MDC system, as packets 18 and 19 are called, were created to
+      provide an integrity mechanism that is less strong than a
+      signature, yet stronger than bare CFB encryption.
+
+      It is a limitation of CFB encryption that damage to the ciphertext
+      will corrupt the affected cipher blocks and the block following.
+      Additionally, if data is removed from the end of a CFB-encrypted
+      block, that removal is undetectable.  (Note also that CBC mode has
+      a similar limitation, but data removed from the front of the block
+      is undetectable.)
+
+      The obvious way to protect or authenticate an encrypted block is
+      to digitally sign it.  However, many people do not wish to
+      habitually sign data, for a large number of reasons beyond the
+      scope of this document.  Suffice it to say that many people
+      consider properties such as deniability to be as valuable as
+      integrity.
+
+      OpenPGP addresses this desire to have more security than raw
+      encryption and yet preserve deniability with the MDC system.  An
+      MDC is intentionally not a MAC.  Its name was not selected by
+      accident.  It is analogous to a checksum.
+
+
+
+Callas, et al               Standards Track                    [Page 51]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+      Despite the fact that it is a relatively modest system, it has
+      proved itself in the real world.  It is an effective defense to
+      several attacks that have surfaced since it has been created.  It
+      has met its modest goals admirably.
+
+      Consequently, because it is a modest security system, it has
+      modest requirements on the hash function(s) it employs.  It does
+      not rely on a hash function being collision-free, it relies on a
+      hash function being one-way.  If a forger, Frank, wishes to send
+      Alice a (digitally) unsigned message that says, "I've always
+      secretly loved you, signed Bob", it is far easier for him to
+      construct a new message than it is to modify anything intercepted
+      from Bob.  (Note also that if Bob wishes to communicate secretly
+      with Alice, but without authentication or identification and with
+      a threat model that includes forgers, he has a problem that
+      transcends mere cryptography.)
+
+      Note also that unlike nearly every other OpenPGP subsystem, there
+      are no parameters in the MDC system.  It hard-defines SHA-1 as its
+      hash function.  This is not an accident.  It is an intentional
+      choice to avoid downgrade and cross-grade attacks while making a
+      simple, fast system.  (A downgrade attack would be an attack that
+      replaced SHA-256 with SHA-1, for example.  A cross-grade attack
+      would replace SHA-1 with another 160-bit hash, such as RIPE-
+      MD/160, for example.)
+
+      However, given the present state of hash function cryptanalysis
+      and cryptography, it may be desirable to upgrade the MDC system to
+      a new hash function.  See Section 13.11 in the "IANA
+      Considerations" for guidance.
+
+5.14.  Modification Detection Code Packet (Tag 19)
+
+   The Modification Detection Code packet contains a SHA-1 hash of
+   plaintext data, which is used to detect message modification.  It is
+   only used with a Symmetrically Encrypted Integrity Protected Data
+   packet.  The Modification Detection Code packet MUST be the last
+   packet in the plaintext data that is encrypted in the Symmetrically
+   Encrypted Integrity Protected Data packet, and MUST appear in no
+   other place.
+
+   A Modification Detection Code packet MUST have a length of 20 octets.
+
+
+
+
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 52]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   The body of this packet consists of:
+
+     - A 20-octet SHA-1 hash of the preceding plaintext data of the
+       Symmetrically Encrypted Integrity Protected Data packet,
+       including prefix data, the tag octet, and length octet of the
+       Modification Detection Code packet.
+
+   Note that the Modification Detection Code packet MUST always use a
+   new format encoding of the packet tag, and a one-octet encoding of
+   the packet length.  The reason for this is that the hashing rules for
+   modification detection include a one-octet tag and one-octet length
+   in the data hash.  While this is a bit restrictive, it reduces
+   complexity.
+
+6.  Radix-64 Conversions
+
+   As stated in the introduction, OpenPGP's underlying native
+   representation for objects is a stream of arbitrary octets, and some
+   systems desire these objects to be immune to damage caused by
+   character set translation, data conversions, etc.
+
+   In principle, any printable encoding scheme that met the requirements
+   of the unsafe channel would suffice, since it would not change the
+   underlying binary bit streams of the native OpenPGP data structures.
+   The OpenPGP standard specifies one such printable encoding scheme to
+   ensure interoperability.
+
+   OpenPGP's Radix-64 encoding is composed of two parts: a base64
+   encoding of the binary data and a checksum.  The base64 encoding is
+   identical to the MIME base64 content-transfer-encoding [RFC2045].
+
+   The checksum is a 24-bit Cyclic Redundancy Check (CRC) converted to
+   four characters of radix-64 encoding by the same MIME base64
+   transformation, preceded by an equal sign (=).  The CRC is computed
+   by using the generator 0x864CFB and an initialization of 0xB704CE.
+   The accumulation is done on the data before it is converted to
+   radix-64, rather than on the converted data.  A sample implementation
+   of this algorithm is in the next section.
+
+   The checksum with its leading equal sign MAY appear on the first line
+   after the base64 encoded data.
+
+   Rationale for CRC-24: The size of 24 bits fits evenly into printable
+   base64.  The nonzero initialization can detect more errors than a
+   zero initialization.
+
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 53]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+6.1.  An Implementation of the CRC-24 in "C"
+
+      #define CRC24_INIT 0xB704CEL
+      #define CRC24_POLY 0x1864CFBL
+
+      typedef long crc24;
+      crc24 crc_octets(unsigned char *octets, size_t len)
+      {
+          crc24 crc = CRC24_INIT;
+          int i;
+          while (len--) {
+              crc ^= (*octets++) << 16;
+              for (i = 0; i < 8; i++) {
+                  crc <<= 1;
+                  if (crc & 0x1000000)
+                      crc ^= CRC24_POLY;
+              }
+          }
+          return crc & 0xFFFFFFL;
+      }
+
+6.2.  Forming ASCII Armor
+
+   When OpenPGP encodes data into ASCII Armor, it puts specific headers
+   around the Radix-64 encoded data, so OpenPGP can reconstruct the data
+   later.  An OpenPGP implementation MAY use ASCII armor to protect raw
+   binary data.  OpenPGP informs the user what kind of data is encoded
+   in the ASCII armor through the use of the headers.
+
+   Concatenating the following data creates ASCII Armor:
+
+     - An Armor Header Line, appropriate for the type of data
+
+     - Armor Headers
+
+     - A blank (zero-length, or containing only whitespace) line
+
+     - The ASCII-Armored data
+
+     - An Armor Checksum
+
+     - The Armor Tail, which depends on the Armor Header Line
+
+   An Armor Header Line consists of the appropriate header line text
+   surrounded by five (5) dashes ('-', 0x2D) on either side of the
+   header line text.  The header line text is chosen based upon the type
+   of data that is being encoded in Armor, and how it is being encoded.
+   Header line texts include the following strings:
+
+
+
+Callas, et al               Standards Track                    [Page 54]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   BEGIN PGP MESSAGE
+       Used for signed, encrypted, or compressed files.
+
+   BEGIN PGP PUBLIC KEY BLOCK
+       Used for armoring public keys.
+
+   BEGIN PGP PRIVATE KEY BLOCK
+       Used for armoring private keys.
+
+   BEGIN PGP MESSAGE, PART X/Y
+       Used for multi-part messages, where the armor is split amongst Y
+       parts, and this is the Xth part out of Y.
+
+   BEGIN PGP MESSAGE, PART X
+       Used for multi-part messages, where this is the Xth part of an
+       unspecified number of parts.  Requires the MESSAGE-ID Armor
+       Header to be used.
+
+   BEGIN PGP SIGNATURE
+       Used for detached signatures, OpenPGP/MIME signatures, and
+       cleartext signatures.  Note that PGP 2.x uses BEGIN PGP MESSAGE
+       for detached signatures.
+
+   Note that all these Armor Header Lines are to consist of a complete
+   line.  That is to say, there is always a line ending preceding the
+   starting five dashes, and following the ending five dashes.  The
+   header lines, therefore, MUST start at the beginning of a line, and
+   MUST NOT have text other than whitespace following them on the same
+   line.  These line endings are considered a part of the Armor Header
+   Line for the purposes of determining the content they delimit.  This
+   is particularly important when computing a cleartext signature (see
+   below).
+
+   The Armor Headers are pairs of strings that can give the user or the
+   receiving OpenPGP implementation some information about how to decode
+   or use the message.  The Armor Headers are a part of the armor, not a
+   part of the message, and hence are not protected by any signatures
+   applied to the message.
+
+   The format of an Armor Header is that of a key-value pair.  A colon
+   (':' 0x38) and a single space (0x20) separate the key and value.
+   OpenPGP should consider improperly formatted Armor Headers to be
+   corruption of the ASCII Armor.  Unknown keys should be reported to
+   the user, but OpenPGP should continue to process the message.
+
+   Note that some transport methods are sensitive to line length.  While
+   there is a limit of 76 characters for the Radix-64 data (Section
+   6.3), there is no limit to the length of Armor Headers.  Care should
+
+
+
+Callas, et al               Standards Track                    [Page 55]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   be taken that the Armor Headers are short enough to survive
+   transport.  One way to do this is to repeat an Armor Header key
+   multiple times with different values for each so that no one line is
+   overly long.
+
+   Currently defined Armor Header Keys are as follows:
+
+     - "Version", which states the OpenPGP implementation and version
+       used to encode the message.
+
+     - "Comment", a user-defined comment.  OpenPGP defines all text to
+       be in UTF-8.  A comment may be any UTF-8 string.  However, the
+       whole point of armoring is to provide seven-bit-clean data.
+       Consequently, if a comment has characters that are outside the
+       US-ASCII range of UTF, they may very well not survive transport.
+
+     - "MessageID", a 32-character string of printable characters.  The
+       string must be the same for all parts of a multi-part message
+       that uses the "PART X" Armor Header.  MessageID strings should be
+       unique enough that the recipient of the mail can associate all
+       the parts of a message with each other.  A good checksum or
+       cryptographic hash function is sufficient.
+
+       The MessageID SHOULD NOT appear unless it is in a multi-part
+       message.  If it appears at all, it MUST be computed from the
+       finished (encrypted, signed, etc.) message in a deterministic
+       fashion, rather than contain a purely random value.  This is to
+       allow the legitimate recipient to determine that the MessageID
+       cannot serve as a covert means of leaking cryptographic key
+       information.
+
+     - "Hash", a comma-separated list of hash algorithms used in this
+       message.  This is used only in cleartext signed messages.
+
+     - "Charset", a description of the character set that the plaintext
+       is in.  Please note that OpenPGP defines text to be in UTF-8.  An
+       implementation will get best results by translating into and out
+       of UTF-8.  However, there are many instances where this is easier
+       said than done.  Also, there are communities of users who have no
+       need for UTF-8 because they are all happy with a character set
+       like ISO Latin-5 or a Japanese character set.  In such instances,
+       an implementation MAY override the UTF-8 default by using this
+       header key.  An implementation MAY implement this key and any
+       translations it cares to; an implementation MAY ignore it and
+       assume all text is UTF-8.
+
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 56]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+       The Armor Tail Line is composed in the same manner as the Armor
+       Header Line, except the string "BEGIN" is replaced by the string
+       "END".
+
+6.3.  Encoding Binary in Radix-64
+
+   The encoding process represents 24-bit groups of input bits as output
+   strings of 4 encoded characters.  Proceeding from left to right, a
+   24-bit input group is formed by concatenating three 8-bit input
+   groups.  These 24 bits are then treated as four concatenated 6-bit
+   groups, each of which is translated into a single digit in the
+   Radix-64 alphabet.  When encoding a bit stream with the Radix-64
+   encoding, the bit stream must be presumed to be ordered with the most
+   significant bit first.  That is, the first bit in the stream will be
+   the high-order bit in the first 8-bit octet, and the eighth bit will
+   be the low-order bit in the first 8-bit octet, and so on.
+
+         +--first octet--+-second octet--+--third octet--+
+         |7 6 5 4 3 2 1 0|7 6 5 4 3 2 1 0|7 6 5 4 3 2 1 0|
+         +-----------+---+-------+-------+---+-----------+
+         |5 4 3 2 1 0|5 4 3 2 1 0|5 4 3 2 1 0|5 4 3 2 1 0|
+         +--1.index--+--2.index--+--3.index--+--4.index--+
+
+   Each 6-bit group is used as an index into an array of 64 printable
+   characters from the table below.  The character referenced by the
+   index is placed in the output string.
+
+     Value Encoding  Value Encoding  Value Encoding  Value Encoding
+         0 A            17 R            34 i            51 z
+         1 B            18 S            35 j            52 0
+         2 C            19 T            36 k            53 1
+         3 D            20 U            37 l            54 2
+         4 E            21 V            38 m            55 3
+         5 F            22 W            39 n            56 4
+         6 G            23 X            40 o            57 5
+         7 H            24 Y            41 p            58 6
+         8 I            25 Z            42 q            59 7
+         9 J            26 a            43 r            60 8
+        10 K            27 b            44 s            61 9
+        11 L            28 c            45 t            62 +
+        12 M            29 d            46 u            63 /
+        13 N            30 e            47 v
+        14 O            31 f            48 w         (pad) =
+        15 P            32 g            49 x
+        16 Q            33 h            50 y
+
+   The encoded output stream must be represented in lines of no more
+   than 76 characters each.
+
+
+
+Callas, et al               Standards Track                    [Page 57]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   Special processing is performed if fewer than 24 bits are available
+   at the end of the data being encoded.  There are three possibilities:
+
+   1. The last data group has 24 bits (3 octets).  No special processing
+      is needed.
+
+   2. The last data group has 16 bits (2 octets).  The first two 6-bit
+      groups are processed as above.  The third (incomplete) data group
+      has two zero-value bits added to it, and is processed as above.  A
+      pad character (=) is added to the output.
+
+   3. The last data group has 8 bits (1 octet).  The first 6-bit group
+      is processed as above.  The second (incomplete) data group has
+      four zero-value bits added to it, and is processed as above.  Two
+      pad characters (=) are added to the output.
+
+6.4.  Decoding Radix-64
+
+   In Radix-64 data, characters other than those in the table, line
+   breaks, and other white space probably indicate a transmission error,
+   about which a warning message or even a message rejection might be
+   appropriate under some circumstances.  Decoding software must ignore
+   all white space.
+
+   Because it is used only for padding at the end of the data, the
+   occurrence of any "=" characters may be taken as evidence that the
+   end of the data has been reached (without truncation in transit).  No
+   such assurance is possible, however, when the number of octets
+   transmitted was a multiple of three and no "=" characters are
+   present.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 58]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+6.5.  Examples of Radix-64
+
+   Input data:  0x14FB9C03D97E
+   Hex:     1   4    F   B    9   C     | 0   3    D   9    7   E
+   8-bit:   00010100 11111011 10011100  | 00000011 11011001 11111110
+   6-bit:   000101 001111 101110 011100 | 000000 111101 100111 111110
+   Decimal: 5      15     46     28       0      61     37     62
+   Output:  F      P      u      c        A      9      l      +
+   Input data:  0x14FB9C03D9
+   Hex:     1   4    F   B    9   C     | 0   3    D   9
+   8-bit:   00010100 11111011 10011100  | 00000011 11011001
+                                                   pad with 00
+   6-bit:   000101 001111 101110 011100 | 000000 111101 100100
+   Decimal: 5      15     46     28       0      61     36
+                                                      pad with =
+   Output:  F      P      u      c        A      9      k      =
+   Input data:  0x14FB9C03
+   Hex:     1   4    F   B    9   C     | 0   3
+   8-bit:   00010100 11111011 10011100  | 00000011
+                                          pad with 0000
+   6-bit:   000101 001111 101110 011100 | 000000 110000
+   Decimal: 5      15     46     28       0      48
+                                               pad with =      =
+   Output:  F      P      u      c        A      w      =      =
+
+6.6.  Example of an ASCII Armored Message
+
+   -----BEGIN PGP MESSAGE-----
+   Version: OpenPrivacy 0.99
+
+   yDgBO22WxBHv7O8X7O/jygAEzol56iUKiXmV+XmpCtmpqQUKiQrFqclFqUDBovzS
+   vBSFjNSiVHsuAA==
+   =njUN
+   -----END PGP MESSAGE-----
+
+   Note that this example has extra indenting; an actual armored message
+   would have no leading whitespace.
+
+7.  Cleartext Signature Framework
+
+   It is desirable to be able to sign a textual octet stream without
+   ASCII armoring the stream itself, so the signed text is still
+   readable without special software.  In order to bind a signature to
+   such a cleartext, this framework is used.  (Note that this framework
+   is not intended to be reversible.  RFC 3156 [RFC3156] defines another
+   way to sign cleartext messages for environments that support MIME.)
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 59]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   The cleartext signed message consists of:
+
+     - The cleartext header '-----BEGIN PGP SIGNED MESSAGE-----' on a
+       single line,
+
+     - One or more "Hash" Armor Headers,
+
+     - Exactly one empty line not included into the message digest,
+
+     - The dash-escaped cleartext that is included into the message
+       digest,
+
+     - The ASCII armored signature(s) including the '-----BEGIN PGP
+       SIGNATURE-----' Armor Header and Armor Tail Lines.
+
+   If the "Hash" Armor Header is given, the specified message digest
+   algorithm(s) are used for the signature.  If there are no such
+   headers, MD5 is used.  If MD5 is the only hash used, then an
+   implementation MAY omit this header for improved V2.x compatibility.
+   If more than one message digest is used in the signature, the "Hash"
+   armor header contains a comma-delimited list of used message digests.
+
+   Current message digest names are described below with the algorithm
+   IDs.
+
+   An implementation SHOULD add a line break after the cleartext, but
+   MAY omit it if the cleartext ends with a line break.  This is for
+   visual clarity.
+
+7.1.  Dash-Escaped Text
+
+   The cleartext content of the message must also be dash-escaped.
+
+   Dash-escaped cleartext is the ordinary cleartext where every line
+   starting with a dash '-' (0x2D) is prefixed by the sequence dash '-'
+   (0x2D) and space ' ' (0x20).  This prevents the parser from
+   recognizing armor headers of the cleartext itself.  An implementation
+   MAY dash-escape any line, SHOULD dash-escape lines commencing "From"
+   followed by a space, and MUST dash-escape any line commencing in a
+   dash.  The message digest is computed using the cleartext itself, not
+   the dash-escaped form.
+
+   As with binary signatures on text documents, a cleartext signature is
+   calculated on the text using canonical <CR><LF> line endings.  The
+   line ending (i.e., the <CR><LF>) before the '-----BEGIN PGP
+   SIGNATURE-----' line that terminates the signed text is not
+   considered part of the signed text.
+
+
+
+
+Callas, et al               Standards Track                    [Page 60]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   When reversing dash-escaping, an implementation MUST strip the string
+   "- " if it occurs at the beginning of a line, and SHOULD warn on "-"
+   and any character other than a space at the beginning of a line.
+
+   Also, any trailing whitespace -- spaces (0x20) and tabs (0x09) -- at
+   the end of any line is removed when the cleartext signature is
+   generated.
+
+8.  Regular Expressions
+
+   A regular expression is zero or more branches, separated by '|'.  It
+   matches anything that matches one of the branches.
+
+   A branch is zero or more pieces, concatenated.  It matches a match
+   for the first, followed by a match for the second, etc.
+
+   A piece is an atom possibly followed by '*', '+', or '?'.  An atom
+   followed by '*' matches a sequence of 0 or more matches of the atom.
+   An atom followed by '+' matches a sequence of 1 or more matches of
+   the atom.  An atom followed by '?' matches a match of the atom, or
+   the null string.
+
+   An atom is a regular expression in parentheses (matching a match for
+   the regular expression), a range (see below), '.' (matching any
+   single character), '^' (matching the null string at the beginning of
+   the input string), '$' (matching the null string at the end of the
+   input string), a '\' followed by a single character (matching that
+   character), or a single character with no other significance
+   (matching that character).
+
+   A range is a sequence of characters enclosed in '[]'.  It normally
+   matches any single character from the sequence.  If the sequence
+   begins with '^', it matches any single character not from the rest of
+   the sequence.  If two characters in the sequence are separated
+   by '-', this is shorthand for the full list of ASCII characters
+   between them (e.g., '[0-9]' matches any decimal digit).  To include a
+   literal ']' in the sequence, make it the first character (following a
+   possible '^').  To include a literal '-', make it the first or last
+   character.
+
+9.  Constants
+
+   This section describes the constants used in OpenPGP.
+
+   Note that these tables are not exhaustive lists; an implementation
+   MAY implement an algorithm not on these lists, so long as the
+   algorithm numbers are chosen from the private or experimental
+   algorithm range.
+
+
+
+Callas, et al               Standards Track                    [Page 61]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   See the section "Notes on Algorithms" below for more discussion of
+   the algorithms.
+
+9.1.  Public-Key Algorithms
+
+      ID           Algorithm
+      --           ---------
+      1          - RSA (Encrypt or Sign) [HAC]
+      2          - RSA Encrypt-Only [HAC]
+      3          - RSA Sign-Only [HAC]
+      16         - Elgamal (Encrypt-Only) [ELGAMAL] [HAC]
+      17         - DSA (Digital Signature Algorithm) [FIPS186] [HAC]
+      18         - Reserved for Elliptic Curve
+      19         - Reserved for ECDSA
+      20         - Reserved (formerly Elgamal Encrypt or Sign)
+      21         - Reserved for Diffie-Hellman (X9.42,
+                   as defined for IETF-S/MIME)
+      100 to 110 - Private/Experimental algorithm
+
+   Implementations MUST implement DSA for signatures, and Elgamal for
+   encryption.  Implementations SHOULD implement RSA keys (1).  RSA
+   Encrypt-Only (2) and RSA Sign-Only are deprecated and SHOULD NOT be
+   generated, but may be interpreted.  See Section 13.5.  See Section
+   13.8 for notes on Elliptic Curve (18), ECDSA (19), Elgamal Encrypt or
+   Sign (20), and X9.42 (21).  Implementations MAY implement any other
+   algorithm.
+
+9.2.  Symmetric-Key Algorithms
+
+       ID           Algorithm
+       --           ---------
+       0          - Plaintext or unencrypted data
+       1          - IDEA [IDEA]
+       2          - TripleDES (DES-EDE, [SCHNEIER] [HAC] -
+                    168 bit key derived from 192)
+       3          - CAST5 (128 bit key, as per [RFC2144])
+       4          - Blowfish (128 bit key, 16 rounds) [BLOWFISH]
+       5          - Reserved
+       6          - Reserved
+       7          - AES with 128-bit key [AES]
+       8          - AES with 192-bit key
+       9          - AES with 256-bit key
+       10         - Twofish with 256-bit key [TWOFISH]
+       100 to 110 - Private/Experimental algorithm
+
+   Implementations MUST implement TripleDES.  Implementations SHOULD
+   implement AES-128 and CAST5.  Implementations that interoperate with
+
+
+
+
+Callas, et al               Standards Track                    [Page 62]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   PGP 2.6 or earlier need to support IDEA, as that is the only
+   symmetric cipher those versions use.  Implementations MAY implement
+   any other algorithm.
+
+9.3.  Compression Algorithms
+
+       ID           Algorithm
+       --           ---------
+       0          - Uncompressed
+       1          - ZIP [RFC1951]
+       2          - ZLIB [RFC1950]
+       3          - BZip2 [BZ2]
+       100 to 110 - Private/Experimental algorithm
+
+   Implementations MUST implement uncompressed data.  Implementations
+   SHOULD implement ZIP.  Implementations MAY implement any other
+   algorithm.
+
+9.4.  Hash Algorithms
+
+      ID           Algorithm                             Text Name
+      --           ---------                             ---------
+      1          - MD5 [HAC]                             "MD5"
+      2          - SHA-1 [FIPS180]                       "SHA1"
+      3          - RIPE-MD/160 [HAC]                     "RIPEMD160"
+      4          - Reserved
+      5          - Reserved
+      6          - Reserved
+      7          - Reserved
+      8          - SHA256 [FIPS180]                      "SHA256"
+      9          - SHA384 [FIPS180]                      "SHA384"
+      10         - SHA512 [FIPS180]                      "SHA512"
+      11         - SHA224 [FIPS180]                      "SHA224"
+      100 to 110 - Private/Experimental algorithm
+
+   Implementations MUST implement SHA-1.  Implementations MAY implement
+   other algorithms.  MD5 is deprecated.
+
+10.  IANA Considerations
+
+   OpenPGP is highly parameterized, and consequently there are a number
+   of considerations for allocating parameters for extensions.  This
+   section describes how IANA should look at extensions to the protocol
+   as described in this document.
+
+
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 63]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+10.1.  New String-to-Key Specifier Types
+
+   OpenPGP S2K specifiers contain a mechanism for new algorithms to turn
+   a string into a key.  This specification creates a registry of S2K
+   specifier types.  The registry includes the S2K type, the name of the
+   S2K, and a reference to the defining specification.  The initial
+   values for this registry can be found in Section 3.7.1.  Adding a new
+   S2K specifier MUST be done through the IETF CONSENSUS method, as
+   described in [RFC2434].
+
+10.2.  New Packets
+
+   Major new features of OpenPGP are defined through new packet types.
+   This specification creates a registry of packet types.  The registry
+   includes the packet type, the name of the packet, and a reference to
+   the defining specification.  The initial values for this registry can
+   be found in Section 4.3.  Adding a new packet type MUST be done
+   through the IETF CONSENSUS method, as described in [RFC2434].
+
+10.2.1.  User Attribute Types
+
+   The User Attribute packet permits an extensible mechanism for other
+   types of certificate identification.  This specification creates a
+   registry of User Attribute types.  The registry includes the User
+   Attribute type, the name of the User Attribute, and a reference to
+   the defining specification.  The initial values for this registry can
+   be found in Section 5.12.  Adding a new User Attribute type MUST be
+   done through the IETF CONSENSUS method, as described in [RFC2434].
+
+10.2.1.1.  Image Format Subpacket Types
+
+   Within User Attribute packets, there is an extensible mechanism for
+   other types of image-based user attributes.  This specification
+   creates a registry of Image Attribute subpacket types.  The registry
+   includes the Image Attribute subpacket type, the name of the Image
+   Attribute subpacket, and a reference to the defining specification.
+   The initial values for this registry can be found in Section 5.12.1.
+   Adding a new Image Attribute subpacket type MUST be done through the
+   IETF CONSENSUS method, as described in [RFC2434].
+
+10.2.2.  New Signature Subpackets
+
+   OpenPGP signatures contain a mechanism for signed (or unsigned) data
+   to be added to them for a variety of purposes in the Signature
+   subpackets as discussed in Section 5.2.3.1.  This specification
+   creates a registry of Signature subpacket types.  The registry
+   includes the Signature subpacket type, the name of the subpacket, and
+   a reference to the defining specification.  The initial values for
+
+
+
+Callas, et al               Standards Track                    [Page 64]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   this registry can be found in Section 5.2.3.1.  Adding a new
+   Signature subpacket MUST be done through the IETF CONSENSUS method,
+   as described in [RFC2434].
+
+10.2.2.1.  Signature Notation Data Subpackets
+
+   OpenPGP signatures further contain a mechanism for extensions in
+   signatures.  These are the Notation Data subpackets, which contain a
+   key/value pair.  Notations contain a user space that is completely
+   unmanaged and an IETF space.
+
+   This specification creates a registry of Signature Notation Data
+   types.  The registry includes the Signature Notation Data type, the
+   name of the Signature Notation Data, its allowed values, and a
+   reference to the defining specification.  The initial values for this
+   registry can be found in Section 5.2.3.16.  Adding a new Signature
+   Notation Data subpacket MUST be done through the EXPERT REVIEW
+   method, as described in [RFC2434].
+
+10.2.2.2.  Key Server Preference Extensions
+
+   OpenPGP signatures contain a mechanism for preferences to be
+   specified about key servers.  This specification creates a registry
+   of key server preferences.  The registry includes the key server
+   preference, the name of the preference, and a reference to the
+   defining specification.  The initial values for this registry can be
+   found in Section 5.2.3.17.  Adding a new key server preference MUST
+   be done through the IETF CONSENSUS method, as described in [RFC2434].
+
+10.2.2.3.  Key Flags Extensions
+
+   OpenPGP signatures contain a mechanism for flags to be specified
+   about key usage.  This specification creates a registry of key usage
+   flags.  The registry includes the key flags value, the name of the
+   flag, and a reference to the defining specification.  The initial
+   values for this registry can be found in Section 5.2.3.21.  Adding a
+   new key usage flag MUST be done through the IETF CONSENSUS method, as
+   described in [RFC2434].
+
+10.2.2.4.  Reason for Revocation Extensions
+
+   OpenPGP signatures contain a mechanism for flags to be specified
+   about why a key was revoked.  This specification creates a registry
+   of "Reason for Revocation" flags.  The registry includes the "Reason
+   for Revocation" flags value, the name of the flag, and a reference to
+   the defining specification.  The initial values for this registry can
+   be found in Section 5.2.3.23.  Adding a new feature flag MUST be done
+   through the IETF CONSENSUS method, as described in [RFC2434].
+
+
+
+Callas, et al               Standards Track                    [Page 65]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+10.2.2.5.  Implementation Features
+
+   OpenPGP signatures contain a mechanism for flags to be specified
+   stating which optional features an implementation supports.  This
+   specification creates a registry of feature-implementation flags.
+   The registry includes the feature-implementation flags value, the
+   name of the flag, and a reference to the defining specification.  The
+   initial values for this registry can be found in Section 5.2.3.24.
+   Adding a new feature-implementation flag MUST be done through the
+   IETF CONSENSUS method, as described in [RFC2434].
+
+   Also see Section 13.12 for more information about when feature flags
+   are needed.
+
+10.2.3.  New Packet Versions
+
+   The core OpenPGP packets all have version numbers, and can be revised
+   by introducing a new version of an existing packet.  This
+   specification creates a registry of packet types.  The registry
+   includes the packet type, the number of the version, and a reference
+   to the defining specification.  The initial values for this registry
+   can be found in Section 5.  Adding a new packet version MUST be done
+   through the IETF CONSENSUS method, as described in [RFC2434].
+
+10.3.  New Algorithms
+
+   Section 9 lists the core algorithms that OpenPGP uses.  Adding in a
+   new algorithm is usually simple.  For example, adding in a new
+   symmetric cipher usually would not need anything more than allocating
+   a constant for that cipher.  If that cipher had other than a 64-bit
+   or 128-bit block size, there might need to be additional
+   documentation describing how OpenPGP-CFB mode would be adjusted.
+   Similarly, when DSA was expanded from a maximum of 1024-bit public
+   keys to 3072-bit public keys, the revision of FIPS 186 contained
+   enough information itself to allow implementation.  Changes to this
+   document were made mainly for emphasis.
+
+10.3.1.  Public-Key Algorithms
+
+   OpenPGP specifies a number of public-key algorithms.  This
+   specification creates a registry of public-key algorithm identifiers.
+   The registry includes the algorithm name, its key sizes and
+   parameters, and a reference to the defining specification.  The
+   initial values for this registry can be found in Section 9.  Adding a
+   new public-key algorithm MUST be done through the IETF CONSENSUS
+   method, as described in [RFC2434].
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 66]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+10.3.2.  Symmetric-Key Algorithms
+
+   OpenPGP specifies a number of symmetric-key algorithms.  This
+   specification creates a registry of symmetric-key algorithm
+   identifiers.  The registry includes the algorithm name, its key sizes
+   and block size, and a reference to the defining specification.  The
+   initial values for this registry can be found in Section 9.  Adding a
+   new symmetric-key algorithm MUST be done through the IETF CONSENSUS
+   method, as described in [RFC2434].
+
+10.3.3.  Hash Algorithms
+
+   OpenPGP specifies a number of hash algorithms.  This specification
+   creates a registry of hash algorithm identifiers.  The registry
+   includes the algorithm name, a text representation of that name, its
+   block size, an OID hash prefix, and a reference to the defining
+   specification.  The initial values for this registry can be found in
+   Section 9 for the algorithm identifiers and text names, and Section
+   5.2.2 for the OIDs and expanded signature prefixes.  Adding a new
+   hash algorithm MUST be done through the IETF CONSENSUS method, as
+   described in [RFC2434].
+
+10.3.4.  Compression Algorithms
+
+   OpenPGP specifies a number of compression algorithms.  This
+   specification creates a registry of compression algorithm
+   identifiers.  The registry includes the algorithm name and a
+   reference to the defining specification.  The initial values for this
+   registry can be found in Section 9.3.  Adding a new compression key
+   algorithm MUST be done through the IETF CONSENSUS method, as
+   described in [RFC2434].
+
+11.  Packet Composition
+
+   OpenPGP packets are assembled into sequences in order to create
+   messages and to transfer keys.  Not all possible packet sequences are
+   meaningful and correct.  This section describes the rules for how
+   packets should be placed into sequences.
+
+11.1.  Transferable Public Keys
+
+   OpenPGP users may transfer public keys.  The essential elements of a
+   transferable public key are as follows:
+
+     - One Public-Key packet
+
+     - Zero or more revocation signatures
+
+
+
+
+Callas, et al               Standards Track                    [Page 67]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+     - One or more User ID packets
+
+     - After each User ID packet, zero or more Signature packets
+       (certifications)
+
+     - Zero or more User Attribute packets
+
+     - After each User Attribute packet, zero or more Signature packets
+       (certifications)
+
+     - Zero or more Subkey packets
+
+     - After each Subkey packet, one Signature packet, plus optionally a
+       revocation
+
+   The Public-Key packet occurs first.  Each of the following User ID
+   packets provides the identity of the owner of this public key.  If
+   there are multiple User ID packets, this corresponds to multiple
+   means of identifying the same unique individual user; for example, a
+   user may have more than one email address, and construct a User ID
+   for each one.
+
+   Immediately following each User ID packet, there are zero or more
+   Signature packets.  Each Signature packet is calculated on the
+   immediately preceding User ID packet and the initial Public-Key
+   packet.  The signature serves to certify the corresponding public key
+   and User ID.  In effect, the signer is testifying to his or her
+   belief that this public key belongs to the user identified by this
+   User ID.
+
+   Within the same section as the User ID packets, there are zero or
+   more User Attribute packets.  Like the User ID packets, a User
+   Attribute packet is followed by zero or more Signature packets
+   calculated on the immediately preceding User Attribute packet and the
+   initial Public-Key packet.
+
+   User Attribute packets and User ID packets may be freely intermixed
+   in this section, so long as the signatures that follow them are
+   maintained on the proper User Attribute or User ID packet.
+
+   After the User ID packet or Attribute packet, there may be zero or
+   more Subkey packets.  In general, subkeys are provided in cases where
+   the top-level public key is a signature-only key.  However, any V4
+   key may have subkeys, and the subkeys may be encryption-only keys,
+   signature-only keys, or general-purpose keys.  V3 keys MUST NOT have
+   subkeys.
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 68]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   Each Subkey packet MUST be followed by one Signature packet, which
+   should be a subkey binding signature issued by the top-level key.
+   For subkeys that can issue signatures, the subkey binding signature
+   MUST contain an Embedded Signature subpacket with a primary key
+   binding signature (0x19) issued by the subkey on the top-level key.
+
+   Subkey and Key packets may each be followed by a revocation Signature
+   packet to indicate that the key is revoked.  Revocation signatures
+   are only accepted if they are issued by the key itself, or by a key
+   that is authorized to issue revocations via a Revocation Key
+   subpacket in a self-signature by the top-level key.
+
+   Transferable public-key packet sequences may be concatenated to allow
+   transferring multiple public keys in one operation.
+
+11.2.  Transferable Secret Keys
+
+   OpenPGP users may transfer secret keys.  The format of a transferable
+   secret key is the same as a transferable public key except that
+   secret-key and secret-subkey packets are used instead of the public
+   key and public-subkey packets.  Implementations SHOULD include self-
+   signatures on any user IDs and subkeys, as this allows for a complete
+   public key to be automatically extracted from the transferable secret
+   key.  Implementations MAY choose to omit the self-signatures,
+   especially if a transferable public key accompanies the transferable
+   secret key.
+
+11.3.  OpenPGP Messages
+
+   An OpenPGP message is a packet or sequence of packets that
+   corresponds to the following grammatical rules (comma represents
+   sequential composition, and vertical bar separates alternatives):
+
+   OpenPGP Message :- Encrypted Message | Signed Message |
+                      Compressed Message | Literal Message.
+
+   Compressed Message :- Compressed Data Packet.
+
+   Literal Message :- Literal Data Packet.
+
+   ESK :- Public-Key Encrypted Session Key Packet |
+          Symmetric-Key Encrypted Session Key Packet.
+
+   ESK Sequence :- ESK | ESK Sequence, ESK.
+
+   Encrypted Data :- Symmetrically Encrypted Data Packet |
+         Symmetrically Encrypted Integrity Protected Data Packet
+
+
+
+
+Callas, et al               Standards Track                    [Page 69]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   Encrypted Message :- Encrypted Data | ESK Sequence, Encrypted Data.
+
+   One-Pass Signed Message :- One-Pass Signature Packet,
+               OpenPGP Message, Corresponding Signature Packet.
+
+   Signed Message :- Signature Packet, OpenPGP Message |
+               One-Pass Signed Message.
+
+   In addition, decrypting a Symmetrically Encrypted Data packet or a
+   Symmetrically Encrypted Integrity Protected Data packet as well as
+   decompressing a Compressed Data packet must yield a valid OpenPGP
+   Message.
+
+11.4.  Detached Signatures
+
+   Some OpenPGP applications use so-called "detached signatures".  For
+   example, a program bundle may contain a file, and with it a second
+   file that is a detached signature of the first file.  These detached
+   signatures are simply a Signature packet stored separately from the
+   data for which they are a signature.
+
+12.  Enhanced Key Formats
+
+12.1.  Key Structures
+
+   The format of an OpenPGP V3 key is as follows.  Entries in square
+   brackets are optional and ellipses indicate repetition.
+
+           RSA Public Key
+              [Revocation Self Signature]
+               User ID [Signature ...]
+              [User ID [Signature ...] ...]
+
+   Each signature certifies the RSA public key and the preceding User
+   ID.  The RSA public key can have many User IDs and each User ID can
+   have many signatures.  V3 keys are deprecated.  Implementations MUST
+   NOT generate new V3 keys, but MAY continue to use existing ones.
+
+   The format of an OpenPGP V4 key that uses multiple public keys is
+   similar except that the other keys are added to the end as "subkeys"
+   of the primary key.
+
+
+
+
+
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 70]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+           Primary-Key
+              [Revocation Self Signature]
+              [Direct Key Signature...]
+               User ID [Signature ...]
+              [User ID [Signature ...] ...]
+              [User Attribute [Signature ...] ...]
+              [[Subkey [Binding-Signature-Revocation]
+                      Primary-Key-Binding-Signature] ...]
+
+   A subkey always has a single signature after it that is issued using
+   the primary key to tie the two keys together.  This binding signature
+   may be in either V3 or V4 format, but SHOULD be V4.  Subkeys that can
+   issue signatures MUST have a V4 binding signature due to the REQUIRED
+   embedded primary key binding signature.
+
+   In the above diagram, if the binding signature of a subkey has been
+   revoked, the revoked key may be removed, leaving only one key.
+
+   In a V4 key, the primary key MUST be a key capable of certification.
+   The subkeys may be keys of any other type.  There may be other
+   constructions of V4 keys, too.  For example, there may be a single-
+   key RSA key in V4 format, a DSA primary key with an RSA encryption
+   key, or RSA primary key with an Elgamal subkey, etc.
+
+   It is also possible to have a signature-only subkey.  This permits a
+   primary key that collects certifications (key signatures), but is
+   used only for certifying subkeys that are used for encryption and
+   signatures.
+
+12.2.  Key IDs and Fingerprints
+
+   For a V3 key, the eight-octet Key ID consists of the low 64 bits of
+   the public modulus of the RSA key.
+
+   The fingerprint of a V3 key is formed by hashing the body (but not
+   the two-octet length) of the MPIs that form the key material (public
+   modulus n, followed by exponent e) with MD5.  Note that both V3 keys
+   and MD5 are deprecated.
+
+   A V4 fingerprint is the 160-bit SHA-1 hash of the octet 0x99,
+   followed by the two-octet packet length, followed by the entire
+   Public-Key packet starting with the version field.  The Key ID is the
+   low-order 64 bits of the fingerprint.  Here are the fields of the
+   hash material, with the example of a DSA key:
+
+   a.1) 0x99 (1 octet)
+
+   a.2) high-order length octet of (b)-(e) (1 octet)
+
+
+
+Callas, et al               Standards Track                    [Page 71]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   a.3) low-order length octet of (b)-(e) (1 octet)
+
+     b) version number = 4 (1 octet);
+
+     c) timestamp of key creation (4 octets);
+
+     d) algorithm (1 octet): 17 = DSA (example);
+
+     e) Algorithm-specific fields.
+
+   Algorithm-Specific Fields for DSA keys (example):
+
+   e.1) MPI of DSA prime p;
+
+   e.2) MPI of DSA group order q (q is a prime divisor of p-1);
+
+   e.3) MPI of DSA group generator g;
+
+   e.4) MPI of DSA public-key value y (= g**x mod p where x is secret).
+
+   Note that it is possible for there to be collisions of Key IDs -- two
+   different keys with the same Key ID.  Note that there is a much
+   smaller, but still non-zero, probability that two different keys have
+   the same fingerprint.
+
+   Also note that if V3 and V4 format keys share the same RSA key
+   material, they will have different Key IDs as well as different
+   fingerprints.
+
+   Finally, the Key ID and fingerprint of a subkey are calculated in the
+   same way as for a primary key, including the 0x99 as the first octet
+   (even though this is not a valid packet ID for a public subkey).
+
+13.  Notes on Algorithms
+
+13.1.  PKCS#1 Encoding in OpenPGP
+
+   This standard makes use of the PKCS#1 functions EME-PKCS1-v1_5 and
+   EMSA-PKCS1-v1_5.  However, the calling conventions of these functions
+   has changed in the past.  To avoid potential confusion and
+   interoperability problems, we are including local copies in this
+   document, adapted from those in PKCS#1 v2.1 [RFC3447].  RFC 3447
+   should be treated as the ultimate authority on PKCS#1 for OpenPGP.
+   Nonetheless, we believe that there is value in having a self-
+   contained document that avoids problems in the future with needed
+   changes in the conventions.
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 72]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+13.1.1.  EME-PKCS1-v1_5-ENCODE
+
+   Input:
+
+   k  = the length in octets of the key modulus
+
+   M  = message to be encoded, an octet string of length mLen, where
+        mLen <= k - 11
+
+   Output:
+
+   EM = encoded message, an octet string of length k
+
+   Error:   "message too long"
+
+     1. Length checking: If mLen > k - 11, output "message too long" and
+        stop.
+
+     2. Generate an octet string PS of length k - mLen - 3 consisting of
+        pseudo-randomly generated nonzero octets.  The length of PS will
+        be at least eight octets.
+
+     3. Concatenate PS, the message M, and other padding to form an
+        encoded message EM of length k octets as
+
+        EM = 0x00 || 0x02 || PS || 0x00 || M.
+
+     4. Output EM.
+
+13.1.2.  EME-PKCS1-v1_5-DECODE
+
+   Input:
+
+   EM = encoded message, an octet string
+
+   Output:
+
+   M  = message, an octet string
+
+   Error:   "decryption error"
+
+   To decode an EME-PKCS1_v1_5 message, separate the encoded message EM
+   into an octet string PS consisting of nonzero octets and a message M
+   as follows
+
+     EM = 0x00 || 0x02 || PS || 0x00 || M.
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 73]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   If the first octet of EM does not have hexadecimal value 0x00, if the
+   second octet of EM does not have hexadecimal value 0x02, if there is
+   no octet with hexadecimal value 0x00 to separate PS from M, or if the
+   length of PS is less than 8 octets, output "decryption error" and
+   stop.  See also the security note in Section 14 regarding differences
+   in reporting between a decryption error and a padding error.
+
+13.1.3.  EMSA-PKCS1-v1_5
+
+   This encoding method is deterministic and only has an encoding
+   operation.
+
+   Option:
+
+   Hash - a hash function in which hLen denotes the length in octets of
+         the hash function output
+
+   Input:
+
+   M  = message to be encoded
+
+   mL = intended length in octets of the encoded message, at least tLen
+        + 11, where tLen is the octet length of the DER encoding T of a
+        certain value computed during the encoding operation
+
+   Output:
+
+   EM = encoded message, an octet string of length emLen
+
+   Errors: "message too long"; "intended encoded message length too
+   short"
+
+   Steps:
+
+     1. Apply the hash function to the message M to produce a hash value
+        H:
+
+        H = Hash(M).
+
+        If the hash function outputs "message too long," output "message
+        too long" and stop.
+
+     2. Using the list in Section 5.2.2, produce an ASN.1 DER value for
+        the hash function used.  Let T be the full hash prefix from
+        Section 5.2.2, and let tLen be the length in octets of T.
+
+     3. If emLen < tLen + 11, output "intended encoded message length
+        too short" and stop.
+
+
+
+Callas, et al               Standards Track                    [Page 74]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+     4. Generate an octet string PS consisting of emLen - tLen - 3
+        octets with hexadecimal value 0xFF.  The length of PS will be at
+        least 8 octets.
+
+     5. Concatenate PS, the hash prefix T, and other padding to form the
+        encoded message EM as
+
+        EM = 0x00 || 0x01 || PS || 0x00 || T.
+
+     6. Output EM.
+
+13.2.  Symmetric Algorithm Preferences
+
+   The symmetric algorithm preference is an ordered list of algorithms
+   that the keyholder accepts.  Since it is found on a self-signature,
+   it is possible that a keyholder may have multiple, different
+   preferences.  For example, Alice may have TripleDES only specified
+   for "alice@work.com" but CAST5, Blowfish, and TripleDES specified for
+   "alice@home.org".  Note that it is also possible for preferences to
+   be in a subkey's binding signature.
+
+   Since TripleDES is the MUST-implement algorithm, if it is not
+   explicitly in the list, it is tacitly at the end.  However, it is
+   good form to place it there explicitly.  Note also that if an
+   implementation does not implement the preference, then it is
+   implicitly a TripleDES-only implementation.
+
+   An implementation MUST NOT use a symmetric algorithm that is not in
+   the recipient's preference list.  When encrypting to more than one
+   recipient, the implementation finds a suitable algorithm by taking
+   the intersection of the preferences of the recipients.  Note that the
+   MUST-implement algorithm, TripleDES, ensures that the intersection is
+   not null.  The implementation may use any mechanism to pick an
+   algorithm in the intersection.
+
+   If an implementation can decrypt a message that a keyholder doesn't
+   have in their preferences, the implementation SHOULD decrypt the
+   message anyway, but MUST warn the keyholder that the protocol has
+   been violated.  For example, suppose that Alice, above, has software
+   that implements all algorithms in this specification.  Nonetheless,
+   she prefers subsets for work or home.  If she is sent a message
+   encrypted with IDEA, which is not in her preferences, the software
+   warns her that someone sent her an IDEA-encrypted message, but it
+   would ideally decrypt it anyway.
+
+
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 75]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+13.3.  Other Algorithm Preferences
+
+   Other algorithm preferences work similarly to the symmetric algorithm
+   preference, in that they specify which algorithms the keyholder
+   accepts.  There are two interesting cases that other comments need to
+   be made about, though, the compression preferences and the hash
+   preferences.
+
+13.3.1.  Compression Preferences
+
+   Compression has been an integral part of PGP since its first days.
+   OpenPGP and all previous versions of PGP have offered compression.
+   In this specification, the default is for messages to be compressed,
+   although an implementation is not required to do so.  Consequently,
+   the compression preference gives a way for a keyholder to request
+   that messages not be compressed, presumably because they are using a
+   minimal implementation that does not include compression.
+   Additionally, this gives a keyholder a way to state that it can
+   support alternate algorithms.
+
+   Like the algorithm preferences, an implementation MUST NOT use an
+   algorithm that is not in the preference vector.  If the preferences
+   are not present, then they are assumed to be [ZIP(1),
+   Uncompressed(0)].
+
+   Additionally, an implementation MUST implement this preference to the
+   degree of recognizing when to send an uncompressed message.  A robust
+   implementation would satisfy this requirement by looking at the
+   recipient's preference and acting accordingly.  A minimal
+   implementation can satisfy this requirement by never generating a
+   compressed message, since all implementations can handle messages
+   that have not been compressed.
+
+13.3.2.  Hash Algorithm Preferences
+
+   Typically, the choice of a hash algorithm is something the signer
+   does, rather than the verifier, because a signer rarely knows who is
+   going to be verifying the signature.  This preference, though, allows
+   a protocol based upon digital signatures ease in negotiation.
+
+   Thus, if Alice is authenticating herself to Bob with a signature, it
+   makes sense for her to use a hash algorithm that Bob's software uses.
+   This preference allows Bob to state in his key which algorithms Alice
+   may use.
+
+   Since SHA1 is the MUST-implement hash algorithm, if it is not
+   explicitly in the list, it is tacitly at the end.  However, it is
+   good form to place it there explicitly.
+
+
+
+Callas, et al               Standards Track                    [Page 76]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+13.4.  Plaintext
+
+   Algorithm 0, "plaintext", may only be used to denote secret keys that
+   are stored in the clear.  Implementations MUST NOT use plaintext in
+   Symmetrically Encrypted Data packets; they must use Literal Data
+   packets to encode unencrypted or literal data.
+
+13.5.  RSA
+
+   There are algorithm types for RSA Sign-Only, and RSA Encrypt-Only
+   keys.  These types are deprecated.  The "key flags" subpacket in a
+   signature is a much better way to express the same idea, and
+   generalizes it to all algorithms.  An implementation SHOULD NOT
+   create such a key, but MAY interpret it.
+
+   An implementation SHOULD NOT implement RSA keys of size less than
+   1024 bits.
+
+13.6.  DSA
+
+   An implementation SHOULD NOT implement DSA keys of size less than
+   1024 bits.  It MUST NOT implement a DSA key with a q size of less
+   than 160 bits.  DSA keys MUST also be a multiple of 64 bits, and the
+   q size MUST be a multiple of 8 bits.  The Digital Signature Standard
+   (DSS) [FIPS186] specifies that DSA be used in one of the following
+   ways:
+
+     * 1024-bit key, 160-bit q, SHA-1, SHA-224, SHA-256, SHA-384, or
+       SHA-512 hash
+
+     * 2048-bit key, 224-bit q, SHA-224, SHA-256, SHA-384, or SHA-512
+       hash
+
+     * 2048-bit key, 256-bit q, SHA-256, SHA-384, or SHA-512 hash
+
+     * 3072-bit key, 256-bit q, SHA-256, SHA-384, or SHA-512 hash
+
+   The above key and q size pairs were chosen to best balance the
+   strength of the key with the strength of the hash.  Implementations
+   SHOULD use one of the above key and q size pairs when generating DSA
+   keys.  If DSS compliance is desired, one of the specified SHA hashes
+   must be used as well.  [FIPS186] is the ultimate authority on DSS,
+   and should be consulted for all questions of DSS compliance.
+
+   Note that earlier versions of this standard only allowed a 160-bit q
+   with no truncation allowed, so earlier implementations may not be
+   able to handle signatures with a different q size or a truncated
+   hash.
+
+
+
+Callas, et al               Standards Track                    [Page 77]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+13.7.  Elgamal
+
+   An implementation SHOULD NOT implement Elgamal keys of size less than
+   1024 bits.
+
+13.8.  Reserved Algorithm Numbers
+
+   A number of algorithm IDs have been reserved for algorithms that
+   would be useful to use in an OpenPGP implementation, yet there are
+   issues that prevent an implementer from actually implementing the
+   algorithm.  These are marked in Section 9.1, "Public-Key Algorithms",
+   as "reserved for".
+
+   The reserved public-key algorithms, Elliptic Curve (18), ECDSA (19),
+   and X9.42 (21), do not have the necessary parameters, parameter
+   order, or semantics defined.
+
+   Previous versions of OpenPGP permitted Elgamal [ELGAMAL] signatures
+   with a public-key identifier of 20.  These are no longer permitted.
+   An implementation MUST NOT generate such keys.  An implementation
+   MUST NOT generate Elgamal signatures.  See [BLEICHENBACHER].
+
+13.9.  OpenPGP CFB Mode
+
+   OpenPGP does symmetric encryption using a variant of Cipher Feedback
+   mode (CFB mode).  This section describes the procedure it uses in
+   detail.  This mode is what is used for Symmetrically Encrypted Data
+   Packets; the mechanism used for encrypting secret-key material is
+   similar, and is described in the sections above.
+
+   In the description below, the value BS is the block size in octets of
+   the cipher.  Most ciphers have a block size of 8 octets.  The AES and
+   Twofish have a block size of 16 octets.  Also note that the
+   description below assumes that the IV and CFB arrays start with an
+   index of 1 (unlike the C language, which assumes arrays start with a
+   zero index).
+
+   OpenPGP CFB mode uses an initialization vector (IV) of all zeros, and
+   prefixes the plaintext with BS+2 octets of random data, such that
+   octets BS+1 and BS+2 match octets BS-1 and BS.  It does a CFB
+   resynchronization after encrypting those BS+2 octets.
+
+   Thus, for an algorithm that has a block size of 8 octets (64 bits),
+   the IV is 10 octets long and octets 7 and 8 of the IV are the same as
+   octets 9 and 10.  For an algorithm with a block size of 16 octets
+   (128 bits), the IV is 18 octets long, and octets 17 and 18 replicate
+   octets 15 and 16.  Those extra two octets are an easy check for a
+   correct key.
+
+
+
+Callas, et al               Standards Track                    [Page 78]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   Step by step, here is the procedure:
+
+   1.  The feedback register (FR) is set to the IV, which is all zeros.
+
+   2.  FR is encrypted to produce FRE (FR Encrypted).  This is the
+       encryption of an all-zero value.
+
+   3.  FRE is xored with the first BS octets of random data prefixed to
+       the plaintext to produce C[1] through C[BS], the first BS octets
+       of ciphertext.
+
+   4.  FR is loaded with C[1] through C[BS].
+
+   5.  FR is encrypted to produce FRE, the encryption of the first BS
+       octets of ciphertext.
+
+   6.  The left two octets of FRE get xored with the next two octets of
+       data that were prefixed to the plaintext.  This produces C[BS+1]
+       and C[BS+2], the next two octets of ciphertext.
+
+   7.  (The resynchronization step) FR is loaded with C[3] through
+       C[BS+2].
+
+   8.  FR is encrypted to produce FRE.
+
+   9.  FRE is xored with the first BS octets of the given plaintext, now
+       that we have finished encrypting the BS+2 octets of prefixed
+       data.  This produces C[BS+3] through C[BS+(BS+2)], the next BS
+       octets of ciphertext.
+
+   10. FR is loaded with C[BS+3] to C[BS + (BS+2)] (which is C11-C18 for
+       an 8-octet block).
+
+       11. FR is encrypted to produce FRE.
+
+       12. FRE is xored with the next BS octets of plaintext, to produce
+       the next BS octets of ciphertext.  These are loaded into FR, and
+       the process is repeated until the plaintext is used up.
+
+13.10.  Private or Experimental Parameters
+
+   S2K specifiers, Signature subpacket types, user attribute types,
+   image format types, and algorithms described in Section 9 all reserve
+   the range 100 to 110 for private and experimental use.  Packet types
+   reserve the range 60 to 63 for private and experimental use.  These
+   are intentionally managed with the PRIVATE USE method, as described
+   in [RFC2434].
+
+
+
+
+Callas, et al               Standards Track                    [Page 79]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   However, implementations need to be careful with these and promote
+   them to full IANA-managed parameters when they grow beyond the
+   original, limited system.
+
+13.11.  Extension of the MDC System
+
+   As described in the non-normative explanation in Section 5.13, the
+   MDC system is uniquely unparameterized in OpenPGP.  This was an
+   intentional decision to avoid cross-grade attacks.  If the MDC system
+   is extended to a stronger hash function, care must be taken to avoid
+   downgrade and cross-grade attacks.
+
+   One simple way to do this is to create new packets for a new MDC.
+   For example, instead of the MDC system using packets 18 and 19, a new
+   MDC could use 20 and 21.  This has obvious drawbacks (it uses two
+   packet numbers for each new hash function in a space that is limited
+   to a maximum of 60).
+
+   Another simple way to extend the MDC system is to create new versions
+   of packet 18, and reflect this in packet 19.  For example, suppose
+   that V2 of packet 18 implicitly used SHA-256.  This would require
+   packet 19 to have a length of 32 octets.  The change in the version
+   in packet 18 and the size of packet 19 prevent a downgrade attack.
+
+   There are two drawbacks to this latter approach.  The first is that
+   using the version number of a packet to carry algorithm information
+   is not tidy from a protocol-design standpoint.  It is possible that
+   there might be several versions of the MDC system in common use, but
+   this untidiness would reflect untidiness in cryptographic consensus
+   about hash function security.  The second is that different versions
+   of packet 19 would have to have unique sizes.  If there were two
+   versions each with 256-bit hashes, they could not both have 32-octet
+   packet 19s without admitting the chance of a cross-grade attack.
+
+   Yet another, complex approach to extend the MDC system would be a
+   hybrid of the two above -- create a new pair of MDC packets that are
+   fully parameterized, and yet protected from downgrade and cross-
+   grade.
+
+   Any change to the MDC system MUST be done through the IETF CONSENSUS
+   method, as described in [RFC2434].
+
+13.12.  Meta-Considerations for Expansion
+
+   If OpenPGP is extended in a way that is not backwards-compatible,
+   meaning that old implementations will not gracefully handle their
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 80]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   absence of a new feature, the extension proposal can be declared in
+   the key holder's self-signature as part of the Features signature
+   subpacket.
+
+   We cannot state definitively what extensions will not be upwards-
+   compatible, but typically new algorithms are upwards-compatible,
+   whereas new packets are not.
+
+   If an extension proposal does not update the Features system, it
+   SHOULD include an explanation of why this is unnecessary.  If the
+   proposal contains neither an extension to the Features system nor an
+   explanation of why such an extension is unnecessary, the proposal
+   SHOULD be rejected.
+
+14.  Security Considerations
+
+   * As with any technology involving cryptography, you should check the
+     current literature to determine if any algorithms used here have
+     been found to be vulnerable to attack.
+
+   * This specification uses Public-Key Cryptography technologies.  It
+     is assumed that the private key portion of a public-private key
+     pair is controlled and secured by the proper party or parties.
+
+   * Certain operations in this specification involve the use of random
+     numbers.  An appropriate entropy source should be used to generate
+     these numbers (see [RFC4086]).
+
+   * The MD5 hash algorithm has been found to have weaknesses, with
+     collisions found in a number of cases.  MD5 is deprecated for use
+     in OpenPGP.  Implementations MUST NOT generate new signatures using
+     MD5 as a hash function.  They MAY continue to consider old
+     signatures that used MD5 as valid.
+
+   * SHA-224 and SHA-384 require the same work as SHA-256 and SHA-512,
+     respectively.  In general, there are few reasons to use them
+     outside of DSS compatibility.  You need a situation where one needs
+     more security than smaller hashes, but does not want to have the
+     full 256-bit or 512-bit data length.
+
+   * Many security protocol designers think that it is a bad idea to use
+     a single key for both privacy (encryption) and integrity
+     (signatures).  In fact, this was one of the motivating forces
+     behind the V4 key format with separate signature and encryption
+     keys.  If you as an implementer promote dual-use keys, you should
+     at least be aware of this controversy.
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 81]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   * The DSA algorithm will work with any hash, but is sensitive to the
+     quality of the hash algorithm.  Verifiers should be aware that even
+     if the signer used a strong hash, an attacker could have modified
+     the signature to use a weak one.  Only signatures using acceptably
+     strong hash algorithms should be accepted as valid.
+
+   * As OpenPGP combines many different asymmetric, symmetric, and hash
+     algorithms, each with different measures of strength, care should
+     be taken that the weakest element of an OpenPGP message is still
+     sufficiently strong for the purpose at hand.  While consensus about
+     the strength of a given algorithm may evolve, NIST Special
+     Publication 800-57 [SP800-57] recommends the following list of
+     equivalent strengths:
+
+           Asymmetric  |  Hash  |  Symmetric
+            key size   |  size  |   key size
+           ------------+--------+-----------
+              1024        160         80
+              2048        224        112
+              3072        256        128
+              7680        384        192
+             15360        512        256
+
+   * There is a somewhat-related potential security problem in
+     signatures.  If an attacker can find a message that hashes to the
+     same hash with a different algorithm, a bogus signature structure
+     can be constructed that evaluates correctly.
+
+     For example, suppose Alice DSA signs message M using hash algorithm
+     H.  Suppose that Mallet finds a message M' that has the same hash
+     value as M with H'.  Mallet can then construct a signature block
+     that verifies as Alice's signature of M' with H'.  However, this
+     would also constitute a weakness in either H or H' or both.  Should
+     this ever occur, a revision will have to be made to this document
+     to revise the allowed hash algorithms.
+
+   * If you are building an authentication system, the recipient may
+     specify a preferred signing algorithm.  However, the signer would
+     be foolish to use a weak algorithm simply because the recipient
+     requests it.
+
+   * Some of the encryption algorithms mentioned in this document have
+     been analyzed less than others.  For example, although CAST5 is
+     presently considered strong, it has been analyzed less than
+     TripleDES.  Other algorithms may have other controversies
+     surrounding them.
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 82]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   * In late summer 2002, Jallad, Katz, and Schneier published an
+     interesting attack on the OpenPGP protocol and some of its
+     implementations [JKS02].  In this attack, the attacker modifies a
+     message and sends it to a user who then returns the erroneously
+     decrypted message to the attacker.  The attacker is thus using the
+     user as a random oracle, and can often decrypt the message.
+
+     Compressing data can ameliorate this attack.  The incorrectly
+     decrypted data nearly always decompresses in ways that defeat the
+     attack.  However, this is not a rigorous fix, and leaves open some
+     small vulnerabilities.  For example, if an implementation does not
+     compress a message before encryption (perhaps because it knows it
+     was already compressed), then that message is vulnerable.  Because
+     of this happenstance -- that modification attacks can be thwarted
+     by decompression errors -- an implementation SHOULD treat a
+     decompression error as a security problem, not merely a data
+     problem.
+
+     This attack can be defeated by the use of Modification Detection,
+     provided that the implementation does not let the user naively
+     return the data to the attacker.  An implementation MUST treat an
+     MDC failure as a security problem, not merely a data problem.
+
+     In either case, the implementation MAY allow the user access to the
+     erroneous data, but MUST warn the user as to potential security
+     problems should that data be returned to the sender.
+
+     While this attack is somewhat obscure, requiring a special set of
+     circumstances to create it, it is nonetheless quite serious as it
+     permits someone to trick a user to decrypt a message.
+     Consequently, it is important that:
+
+      1. Implementers treat MDC errors and decompression failures as
+         security problems.
+
+      2. Implementers implement Modification Detection with all due
+         speed and encourage its spread.
+
+      3. Users migrate to implementations that support Modification
+         Detection with all due speed.
+
+   * PKCS#1 has been found to be vulnerable to attacks in which a system
+     that reports errors in padding differently from errors in
+     decryption becomes a random oracle that can leak the private key in
+     mere millions of queries.  Implementations must be aware of this
+     attack and prevent it from happening.  The simplest solution is to
+     report a single error code for all variants of decryption errors so
+     as not to leak information to an attacker.
+
+
+
+Callas, et al               Standards Track                    [Page 83]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   * Some technologies mentioned here may be subject to government
+     control in some countries.
+
+   * In winter 2005, Serge Mister and Robert Zuccherato from Entrust
+     released a paper describing a way that the "quick check" in OpenPGP
+     CFB mode can be used with a random oracle to decrypt two octets of
+     every cipher block [MZ05].  They recommend as prevention not using
+     the quick check at all.
+
+     Many implementers have taken this advice to heart for any data that
+     is symmetrically encrypted and for which the session key is
+     public-key encrypted.  In this case, the quick check is not needed
+     as the public-key encryption of the session key should guarantee
+     that it is the right session key.  In other cases, the
+     implementation should use the quick check with care.
+
+     On the one hand, there is a danger to using it if there is a random
+     oracle that can leak information to an attacker.  In plainer
+     language, there is a danger to using the quick check if timing
+     information about the check can be exposed to an attacker,
+     particularly via an automated service that allows rapidly repeated
+     queries.
+
+     On the other hand, it is inconvenient to the user to be informed
+     that they typed in the wrong passphrase only after a petabyte of
+     data is decrypted.  There are many cases in cryptographic
+     engineering where the implementer must use care and wisdom, and
+     this is one.
+
+15.  Implementation Nits
+
+   This section is a collection of comments to help an implementer,
+   particularly with an eye to backward compatibility.  Previous
+   implementations of PGP are not OpenPGP compliant.  Often the
+   differences are small, but small differences are frequently more
+   vexing than large differences.  Thus, this is a non-comprehensive
+   list of potential problems and gotchas for a developer who is trying
+   to be backward-compatible.
+
+     * The IDEA algorithm is patented, and yet it is required for PGP
+       2.x interoperability.  It is also the de-facto preferred
+       algorithm for a V3 key with a V3 self-signature (or no self-
+       signature).
+
+     * When exporting a private key, PGP 2.x generates the header "BEGIN
+       PGP SECRET KEY BLOCK" instead of "BEGIN PGP PRIVATE KEY BLOCK".
+       All previous versions ignore the implied data type, and look
+       directly at the packet data type.
+
+
+
+Callas, et al               Standards Track                    [Page 84]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+     * PGP 2.0 through 2.5 generated V2 Public-Key packets.  These are
+       identical to the deprecated V3 keys except for the version
+       number.  An implementation MUST NOT generate them and may accept
+       or reject them as it sees fit.  Some older PGP versions generated
+       V2 PKESK packets (Tag 1) as well.  An implementation may accept
+       or reject V2 PKESK packets as it sees fit, and MUST NOT generate
+       them.
+
+     * PGP 2.6.x will not accept key-material packets with versions
+       greater than 3.
+
+     * There are many ways possible for two keys to have the same key
+       material, but different fingerprints (and thus Key IDs).  Perhaps
+       the most interesting is an RSA key that has been "upgraded" to V4
+       format, but since a V4 fingerprint is constructed by hashing the
+       key creation time along with other things, two V4 keys created at
+       different times, yet with the same key material will have
+       different fingerprints.
+
+     * If an implementation is using zlib to interoperate with PGP 2.x,
+       then the "windowBits" parameter should be set to -13.
+
+     * The 0x19 back signatures were not required for signing subkeys
+       until relatively recently.  Consequently, there may be keys in
+       the wild that do not have these back signatures.  Implementing
+       software may handle these keys as it sees fit.
+
+     * OpenPGP does not put limits on the size of public keys.  However,
+       larger keys are not necessarily better keys.  Larger keys take
+       more computation time to use, and this can quickly become
+       impractical.  Different OpenPGP implementations may also use
+       different upper bounds for public key sizes, and so care should
+       be taken when choosing sizes to maintain interoperability.  As of
+       2007 most implementations have an upper bound of 4096 bits.
+
+     * ASCII armor is an optional feature of OpenPGP.  The OpenPGP
+       working group strives for a minimal set of mandatory-to-implement
+       features, and since there could be useful implementations that
+       only use binary object formats, this is not a "MUST" feature for
+       an implementation.  For example, an implementation that is using
+       OpenPGP as a mechanism for file signatures may find ASCII armor
+       unnecessary. OpenPGP permits an implementation to declare what
+       features it does and does not support, but ASCII armor is not one
+       of these.  Since most implementations allow binary and armored
+       objects to be used indiscriminately, an implementation that does
+       not implement ASCII armor may find itself with compatibility
+       issues with general-purpose implementations.  Moreover,
+       implementations of OpenPGP-MIME [RFC3156] already have a
+
+
+
+Callas, et al               Standards Track                    [Page 85]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+       requirement for ASCII armor so those implementations will
+       necessarily have support.
+
+16.  References
+
+16.1.  Normative References
+
+   [AES]            NIST, FIPS PUB 197, "Advanced Encryption Standard
+                    (AES)," November 2001.
+                    http://csrc.nist.gov/publications/fips/fips197/fips-
+                    197.{ps,pdf}
+
+   [BLOWFISH]       Schneier, B. "Description of a New Variable-Length
+                    Key, 64-Bit Block Cipher (Blowfish)" Fast Software
+                    Encryption, Cambridge Security Workshop Proceedings
+                    (December 1993), Springer-Verlag, 1994, pp191-204
+                    <http://www.counterpane.com/bfsverlag.html>
+
+   [BZ2]            J. Seward, jseward@acm.org, "The Bzip2 and libbzip2
+                    home page" <http://www.bzip.org/>
+
+   [ELGAMAL]        T. Elgamal, "A Public-Key Cryptosystem and a
+                    Signature Scheme Based on Discrete Logarithms," IEEE
+                    Transactions on Information Theory, v. IT-31, n. 4,
+                    1985, pp. 469-472.
+
+   [FIPS180]        Secure Hash Signature Standard (SHS) (FIPS PUB 180-
+                    2).
+                    <http://csrc.nist.gov/publications/fips/fips180-
+                    2/fips180-2withchangenotice.pdf>
+
+   [FIPS186]        Digital Signature Standard (DSS) (FIPS PUB 186-2).
+                    <http://csrc.nist.gov/publications/fips/fips186-2/
+                     fips186-2-change1.pdf> FIPS 186-3 describes keys
+                    greater than 1024 bits.  The latest draft is at:
+                    <http://csrc.nist.gov/publications/drafts/
+                    fips_186-3/Draft-FIPS-186-3%20_March2006.pdf>
+
+   [HAC]            Alfred Menezes, Paul van Oorschot, and Scott
+                    Vanstone, "Handbook of Applied Cryptography," CRC
+                    Press, 1996.
+                    <http://www.cacr.math.uwaterloo.ca/hac/>
+
+   [IDEA]           Lai, X, "On the design and security of block
+                    ciphers", ETH Series in Information Processing, J.L.
+                    Massey (editor), Vol. 1, Hartung-Gorre Verlag
+                    Knostanz, Technische Hochschule (Zurich), 1992
+
+
+
+
+Callas, et al               Standards Track                    [Page 86]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   [ISO10646]       ISO/IEC 10646-1:1993. International Standard --
+                    Information technology -- Universal Multiple-Octet
+                    Coded Character Set (UCS) -- Part 1: Architecture
+                    and Basic Multilingual Plane.
+
+   [JFIF]           JPEG File Interchange Format (Version 1.02).  Eric
+                    Hamilton, C-Cube Microsystems, Milpitas, CA,
+                    September 1, 1992.
+
+   [RFC1950]        Deutsch, P. and J-L. Gailly, "ZLIB Compressed Data
+                    Format Specification version 3.3", RFC 1950, May
+                    1996.
+
+   [RFC1951]        Deutsch, P., "DEFLATE Compressed Data Format
+                    Specification version 1.3", RFC 1951, May 1996.
+
+   [RFC2045]        Freed, N. and N. Borenstein, "Multipurpose Internet
+                    Mail Extensions (MIME) Part One: Format of Internet
+                    Message Bodies", RFC 2045, November 1996
+
+   [RFC2119]        Bradner, S., "Key words for use in RFCs to Indicate
+                    Requirement Levels", BCP 14, RFC 2119, March 1997.
+
+   [RFC2144]        Adams, C., "The CAST-128 Encryption Algorithm", RFC
+                    2144, May 1997.
+
+   [RFC2434]        Narten, T. and H. Alvestrand, "Guidelines for
+                    Writing an IANA Considerations Section in RFCs", BCP
+                    26, RFC 2434, October 1998.
+
+   [RFC2822]        Resnick, P., "Internet Message Format", RFC 2822,
+                    April 2001.
+
+   [RFC3156]        Elkins, M., Del Torto, D., Levien, R., and T.
+                    Roessler, "MIME Security with OpenPGP", RFC 3156,
+                    August 2001.
+
+   [RFC3447]        Jonsson, J. and B. Kaliski, "Public-Key Cryptography
+                    Standards (PKCS) #1: RSA Cryptography Specifications
+                    Version 2.1", RFC 3447, February 2003.
+
+   [RFC3629]        Yergeau, F., "UTF-8, a transformation format of ISO
+                    10646", STD 63, RFC 3629, November 2003.
+
+   [RFC4086]        Eastlake, D., 3rd, Schiller, J., and S. Crocker,
+                    "Randomness Requirements for Security", BCP 106, RFC
+                    4086, June 2005.
+
+
+
+
+Callas, et al               Standards Track                    [Page 87]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   [SCHNEIER]      Schneier, B., "Applied Cryptography Second Edition:
+                    protocols, algorithms, and source code in C", 1996.
+
+   [TWOFISH]        B. Schneier, J. Kelsey, D. Whiting, D. Wagner, C.
+                    Hall, and N. Ferguson, "The Twofish Encryption
+                    Algorithm", John Wiley & Sons, 1999.
+
+16.2.  Informative References
+
+   [BLEICHENBACHER] Bleichenbacher, Daniel, "Generating Elgamal
+                    signatures without knowing the secret key,"
+                    Eurocrypt 96. Note that the version in the
+                    proceedings has an error. A revised version is
+                    available at the time of writing from
+                    <ftp://ftp.inf.ethz.ch/pub/publications/papers/ti
+                    /isc/ElGamal.ps>
+
+   [JKS02]          Kahil Jallad, Jonathan Katz, Bruce Schneier
+                    "Implementation of Chosen-Ciphertext Attacks against
+                    PGP and GnuPG" http://www.counterpane.com/pgp-
+                    attack.html
+
+   [MAURER]         Ueli Maurer, "Modelling a Public-Key
+                    Infrastructure", Proc. 1996 European Symposium on
+                    Research in Computer Security (ESORICS' 96), Lecture
+                    Notes in Computer Science, Springer-Verlag, vol.
+                    1146, pp. 325-350, Sep 1996.
+
+   [MZ05]           Serge Mister, Robert Zuccherato, "An Attack on CFB
+                    Mode Encryption As Used By OpenPGP," IACR ePrint
+                    Archive: Report 2005/033, 8 Feb 2005
+                    http://eprint.iacr.org/2005/033
+
+   [REGEX]          Jeffrey Friedl, "Mastering Regular Expressions,"
+                    O'Reilly, ISBN 0-596-00289-0.
+
+   [RFC1423]        Balenson, D., "Privacy Enhancement for Internet
+                    Electronic Mail: Part III: Algorithms, Modes, and
+                    Identifiers", RFC 1423, February 1993.
+
+   [RFC1991]        Atkins, D., Stallings, W., and P. Zimmermann, "PGP
+                    Message Exchange Formats", RFC 1991, August 1996.
+
+   [RFC2440]        Callas, J., Donnerhacke, L., Finney, H., and R.
+                    Thayer, "OpenPGP Message Format", RFC 2440, November
+                    1998.
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 88]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+   [SP800-57]       NIST Special Publication 800-57, Recommendation on
+                    Key Management
+                    <http://csrc.nist.gov/publications/nistpubs/ 800-
+                    57/SP800-57-Part1.pdf>
+                    <http://csrc.nist.gov/publications/nistpubs/ 800-
+                    57/SP800-57-Part2.pdf>
+
+Acknowledgements
+
+   This memo also draws on much previous work from a number of other
+   authors, including: Derek Atkins, Charles Breed, Dave Del Torto, Marc
+   Dyksterhouse, Gail Haspert, Gene Hoffman, Paul Hoffman, Ben Laurie,
+   Raph Levien, Colin Plumb, Will Price, David Shaw, William Stallings,
+   Mark Weaver, and Philip R. Zimmermann.
+
+Authors' Addresses
+
+   The working group can be contacted via the current chair:
+
+      Derek Atkins
+      IHTFP Consulting, Inc.
+      4 Farragut Ave
+      Somerville, MA  02144  USA
+
+      EMail: derek@ihtfp.com
+      Tel: +1 617 623 3745
+
+   The principal authors of this document are as follows:
+
+      Jon Callas
+      EMail: jon@callas.org
+
+      Lutz Donnerhacke
+      IKS GmbH
+      Wildenbruchstr. 15
+      07745 Jena, Germany
+      EMail: lutz@iks-jena.de
+
+      Hal Finney
+      EMail: hal@finney.org
+
+      David Shaw
+      EMail: dshaw@jabberwocky.com
+
+      Rodney Thayer
+      EMail: rodney@canola-jones.com
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 89]
+
+RFC 4880                 OpenPGP Message Format            November 2007
+
+
+Full Copyright Statement
+
+   Copyright (C) The IETF Trust (2007).
+
+   This document is subject to the rights, licenses and restrictions
+   contained in BCP 78, and except as set forth therein, the authors
+   retain all their rights.
+
+   This document and the information contained herein are provided on an
+   "AS IS" basis and THE CONTRIBUTOR, THE ORGANIZATION HE/SHE REPRESENTS
+   OR IS SPONSORED BY (IF ANY), THE INTERNET SOCIETY, THE IETF TRUST AND
+   THE INTERNET ENGINEERING TASK FORCE DISCLAIM ALL WARRANTIES, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF
+   THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED
+   WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+Intellectual Property
+
+   The IETF takes no position regarding the validity or scope of any
+   Intellectual Property Rights or other rights that might be claimed to
+   pertain to the implementation or use of the technology described in
+   this document or the extent to which any license under such rights
+   might or might not be available; nor does it represent that it has
+   made any independent effort to identify any such rights.  Information
+   on the procedures with respect to rights in RFC documents can be
+   found in BCP 78 and BCP 79.
+
+   Copies of IPR disclosures made to the IETF Secretariat and any
+   assurances of licenses to be made available, or the result of an
+   attempt made to obtain a general license or permission for the use of
+   such proprietary rights by implementers or users of this
+   specification can be obtained from the IETF on-line IPR repository at
+   http://www.ietf.org/ipr.
+
+   The IETF invites any interested party to bring to its attention any
+   copyrights, patents or patent applications, or other proprietary
+   rights that may cover technology that may be required to implement
+   this standard.  Please address the information to the IETF at
+   ietf-ipr@ietf.org.
+
+
+
+
+
+
+
+
+
+
+
+
+Callas, et al               Standards Track                    [Page 90]
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc4954.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc4954.txt
new file mode 100644
index 000000000..668d7383b
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc4954.txt
@@ -0,0 +1,1123 @@
+
+
+
+
+
+
+Network Working Group                                 R. Siemborski, Ed.
+Request for Comments: 4954                                  Google, Inc.
+Obsoletes: 2554                                         A. Melnikov, Ed.
+Updates: 3463                                              Isode Limited
+Category: Standards Track                                      July 2007
+
+
+               SMTP Service Extension for Authentication
+
+Status of This Memo
+
+   This document specifies an Internet standards track protocol for the
+   Internet community, and requests discussion and suggestions for
+   improvements.  Please refer to the current edition of the "Internet
+   Official Protocol Standards" (STD 1) for the standardization state
+   and status of this protocol.  Distribution of this memo is unlimited.
+
+Copyright Notice
+
+   Copyright (C) The IETF Trust (2007).
+
+Abstract
+
+   This document defines a Simple Mail Transport Protocol (SMTP)
+   extension whereby an SMTP client may indicate an authentication
+   mechanism to the server, perform an authentication protocol exchange,
+   and optionally negotiate a security layer for subsequent protocol
+   interactions during this session.  This extension includes a profile
+   of the Simple Authentication and Security Layer (SASL) for SMTP.
+
+   This document obsoletes RFC 2554.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Siemborski & Melnikov       Standards Track                     [Page 1]
+
+RFC 4954       SMTP Service Extension for Authentication       July 2007
+
+
+Table of Contents
+
+   1. Introduction ....................................................2
+   2. How to Read This Document .......................................2
+   3. The Authentication Service Extension ............................3
+   4. The AUTH Command ................................................3
+      4.1. Examples ...................................................7
+   5. The AUTH Parameter to the MAIL FROM command .....................9
+      5.1. Examples ..................................................10
+   6. Status Codes ...................................................11
+   7. Additional requirements on servers .............................12
+   8. Formal Syntax ..................................................13
+   9. Security Considerations ........................................14
+   10. IANA Considerations ...........................................15
+   11. Normative References ..........................................15
+   12. Informative References ........................................16
+   13. Acknowledgments ...............................................17
+   14. Additional Requirements When Using SASL PLAIN over TLS ........17
+   15. Changes since RFC 2554 ........................................18
+
+1.  Introduction
+
+   This document defines a Simple Mail Transport Protocol (SMTP)
+   extension whereby an SMTP client may indicate an authentication
+   mechanism to the server, perform an authentication protocol exchange,
+   optionally negotiate a security layer for subsequent protocol
+   interactions during this session and, during a mail transaction,
+   optionally specify a mailbox associated with the identity that
+   submitted the message to the mail delivery system.
+
+   This extension includes a profile of the Simple Authentication and
+   Security Layer (SASL) for SMTP.
+
+   When compared to RFC 2554, this document deprecates use of the 538
+   response code, adds a new Enhanced Status Code, adds a requirement to
+   support SASLprep profile for preparing authorization identities,
+   recommends use of RFC 3848 transmission types in the Received trace
+   header field, and clarifies interaction with SMTP PIPELINING
+   [PIPELINING] extension.
+
+2.  How to Read This Document
+
+   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
+   "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
+   document are to be interpreted as described in [KEYWORDS].
+
+   In examples, "C:" and "S:" indicate lines sent by the client and
+   server, respectively.
+
+
+
+Siemborski & Melnikov       Standards Track                     [Page 2]
+
+RFC 4954       SMTP Service Extension for Authentication       July 2007
+
+
+3.  The Authentication Service Extension
+
+   1.  The name of this [SMTP] service extension is "Authentication".
+
+   2.  The EHLO keyword value associated with this extension is "AUTH".
+
+   3.  The AUTH EHLO keyword contains as a parameter a space-separated
+       list of the names of available [SASL] mechanisms.  The list of
+       available mechanisms MAY change after a successful STARTTLS
+       command [SMTP-TLS].
+
+   4.  A new [SMTP] verb "AUTH" is defined.
+
+   5.  An optional parameter using the keyword "AUTH" is added to the
+       MAIL FROM command, and extends the maximum line length of the
+       MAIL FROM command by 500 characters.
+
+   6.  This extension is appropriate for the submission protocol
+       [SUBMIT].
+
+4.  The AUTH Command
+
+   AUTH mechanism [initial-response]
+
+      Arguments:
+          mechanism: A string identifying a [SASL] authentication
+          mechanism.
+
+          initial-response: An optional initial client response.  If
+          present, this response MUST be encoded as described in Section
+          4 of [BASE64] or contain a single character "=".
+
+      Restrictions:
+          After an AUTH command has been successfully completed, no more
+          AUTH commands may be issued in the same session.  After a
+          successful AUTH command completes, a server MUST reject any
+          further AUTH commands with a 503 reply.
+
+          The AUTH command is not permitted during a mail transaction.
+          An AUTH command issued during a mail transaction MUST be
+          rejected with a 503 reply.
+
+      Discussion:
+          The AUTH command initiates a [SASL] authentication exchange
+          between the client and the server.  The client identifies the
+          SASL mechanism to use with the first parameter of the AUTH
+          command.  If the server supports the requested authentication
+          mechanism, it performs the SASL exchange to authenticate the
+
+
+
+Siemborski & Melnikov       Standards Track                     [Page 3]
+
+RFC 4954       SMTP Service Extension for Authentication       July 2007
+
+
+          user.  Optionally, it also negotiates a security layer for
+          subsequent protocol interactions during this session.  If the
+          requested authentication mechanism is invalid (e.g., is not
+          supported or requires an encryption layer), the server rejects
+          the AUTH command with a 504 reply.  If the server supports the
+          [ESMTP-CODES] extension, it SHOULD return a 5.5.4 enhanced
+          response code.
+
+          The SASL authentication exchange consists of a series of
+          server challenges and client responses that are specific to
+          the chosen [SASL] mechanism.
+
+          A server challenge is sent as a 334 reply with the text part
+          containing the [BASE64] encoded string supplied by the SASL
+          mechanism.  This challenge MUST NOT contain any text other
+          than the BASE64 encoded challenge.
+
+          A client response consists of a line containing a [BASE64]
+          encoded string.  If the client wishes to cancel the
+          authentication exchange, it issues a line with a single "*".
+          If the server receives such a response, it MUST reject the
+          AUTH command by sending a 501 reply.
+
+          The optional initial response argument to the AUTH command is
+          used to save a round-trip when using authentication mechanisms
+          that support an initial client response.  If the initial
+          response argument is omitted and the chosen mechanism requires
+          an initial client response, the server MUST proceed as defined
+          in Section 5.1 of [SASL].  In SMTP, a server challenge that
+          contains no data is defined as a 334 reply with no text part.
+          Note that there is still a space following the reply code, so
+          the complete response line is "334 ".
+
+          Note that the AUTH command is still subject to the line length
+          limitations defined in [SMTP].  If use of the initial response
+          argument would cause the AUTH command to exceed this length,
+          the client MUST NOT use the initial response parameter (and
+          instead proceed as defined in Section 5.1 of [SASL]).
+
+          If the client is transmitting an initial response of zero
+          length, it MUST instead transmit the response as a single
+          equals sign ("=").  This indicates that the response is
+          present, but contains no data.
+
+          If the client uses an initial-response argument to the AUTH
+          command with a SASL mechanism in which the client does not
+          begin the authentication exchange, the server MUST reject the
+
+
+
+
+Siemborski & Melnikov       Standards Track                     [Page 4]
+
+RFC 4954       SMTP Service Extension for Authentication       July 2007
+
+
+          AUTH command with a 501 reply.  Servers using the enhanced
+          status codes extension [ESMTP-CODES] SHOULD return an enhanced
+          status code of 5.7.0 in this case.
+
+          If the server cannot [BASE64] decode any client response, it
+          MUST reject the AUTH command with a 501 reply (and an enhanced
+          status code of 5.5.2).  If the client cannot BASE64 decode any
+          of the server's challenges, it MUST cancel the authentication
+          using the "*" response.  In particular, servers and clients
+          MUST reject (and not ignore) any character not explicitly
+          allowed by the BASE64 alphabet, and MUST reject any sequence
+          of BASE64 characters that contains the pad character ('=')
+          anywhere other than the end of the string (e.g., "=AAA" and
+          "AAA=BBB" are not allowed).
+
+          Note that these [BASE64] strings can be much longer than
+          normal SMTP commands.  Clients and servers MUST be able to
+          handle the maximum encoded size of challenges and responses
+          generated by their supported authentication mechanisms.  This
+          requirement is independent of any line length limitations the
+          client or server may have in other parts of its protocol
+          implementation.  (At the time of writing of this document,
+          12288 octets is considered to be a sufficient line length
+          limit for handling of deployed authentication mechanisms.)
+          If, during an authentication exchange, the server receives a
+          line that is longer than the server's authentication buffer,
+          the server fails the AUTH command with the 500 reply.  Servers
+          using the enhanced status codes extension [ESMTP-CODES] SHOULD
+          return an enhanced status code of 5.5.6 in this case.
+
+          The authorization identity generated by this [SASL] exchange
+          is a "simple username" (in the sense defined in [SASLprep]),
+          and both client and server SHOULD (*) use the [SASLprep]
+          profile of the [StringPrep] algorithm to prepare these names
+          for transmission or comparison.  If preparation of the
+          authorization identity fails or results in an empty string
+          (unless it was transmitted as the empty string), the server
+          MUST fail the authentication.
+
+      (*) Note: Future revision of this specification may change this
+      requirement to MUST.  Currently, the SHOULD is used in order to
+      avoid breaking the majority of existing implementations.
+
+   If the server is unable to authenticate the client, it SHOULD reject
+   the AUTH command with a 535 reply unless a more specific error code
+   is appropriate.  Should the client successfully complete the
+   exchange, the SMTP server issues a 235 reply.  (Note that the SMTP
+   protocol doesn't support the SASL feature of returning additional
+
+
+
+Siemborski & Melnikov       Standards Track                     [Page 5]
+
+RFC 4954       SMTP Service Extension for Authentication       July 2007
+
+
+   data with a successful outcome.)  These status codes, along with
+   others defined by this extension, are discussed in Section 6 of this
+   document.
+
+   If a security layer is negotiated during the SASL exchange, it takes
+   effect for the client on the octet immediately following the CRLF
+   that concludes the last response generated by the client.  For the
+   server, it takes effect immediately following the CRLF of its success
+   reply.
+
+   When a security layer takes effect, the SMTP protocol is reset to the
+   initial state (the state in SMTP after a server issues a 220 service
+   ready greeting).  The server MUST discard any knowledge obtained from
+   the client, such as the EHLO argument, which was not obtained from
+   the SASL negotiation itself.  Likewise, the client MUST discard any
+   knowledge obtained from the server, such as the list of SMTP service
+   extensions, which was not obtained from the SASL negotiation itself.
+   (Note that a client MAY compare the advertised SASL mechanisms before
+   and after authentication in order to detect an active down-
+   negotiation attack).
+
+   The client SHOULD send an EHLO command as the first command after a
+   successful SASL negotiation that results in the enabling of a
+   security layer.
+
+   When an entity (whether it is the client or the server end) is
+   sending data, and both [TLS] and SASL security layers are in effect,
+   the TLS encoding MUST be applied after the SASL encoding, regardless
+   of the order in which the layers were negotiated.
+
+   The service name specified by this protocol's profile of SASL is
+   "smtp".  This service name is also to be used for the [SUBMIT]
+   protocol.
+
+   If an AUTH command fails, the client MAY proceed without
+   authentication.  Alternatively, the client MAY try another
+   authentication mechanism or present different credentials by issuing
+   another AUTH
+
+   Note: A server implementation MUST implement a configuration in which
+   it does NOT permit any plaintext password mechanisms, unless either
+   the STARTTLS [SMTP-TLS] command has been negotiated or some other
+   mechanism that protects the session from password snooping has been
+   provided.  Server sites SHOULD NOT use any configuration which
+   permits a plaintext password mechanism without such a protection
+   mechanism against password snooping.
+
+
+
+
+
+Siemborski & Melnikov       Standards Track                     [Page 6]
+
+RFC 4954       SMTP Service Extension for Authentication       July 2007
+
+
+   To ensure interoperability, client and server implementations of this
+   extension MUST implement the [PLAIN] SASL mechanism running over TLS
+   [TLS] [SMTP-TLS].  See also Section 15 for additional requirements on
+   implementations of [PLAIN] over [TLS].
+
+   Note that many existing client and server implementations implement
+   CRAM-MD5 [CRAM-MD5] SASL mechanism.  In order to ensure
+   interoperability with deployed software, new implementations MAY
+   implement it; however, implementations should be aware that this SASL
+   mechanism doesn't provide any server authentication.  Note that at
+   the time of writing of this document the SASL Working Group is
+   working on several replacement SASL mechanisms that provide server
+   authentication and other features.
+
+   When the AUTH command is used together with the [PIPELINING]
+   extension, it MUST be the last command in a pipelined group of
+   commands.  The only exception to this rule is when the AUTH command
+   contains an initial response for a SASL mechanism that allows the
+   client to send data first, the SASL mechanism is known to complete in
+   one round-trip, and a security layer is not negotiated by the client.
+   Two examples of such SASL mechanisms are PLAIN [PLAIN] and EXTERNAL
+   [SASL].
+
+4.1. Examples
+
+   Here is an example of a client attempting AUTH using the [PLAIN] SASL
+   mechanism under a TLS layer, and making use of the initial client
+   response:
+
+   S: 220-smtp.example.com ESMTP Server
+   C: EHLO client.example.com
+   S: 250-smtp.example.com Hello client.example.com
+   S: 250-AUTH GSSAPI DIGEST-MD5
+   S: 250-ENHANCEDSTATUSCODES
+   S: 250 STARTTLS
+   C: STARTTLS
+   S: 220 Ready to start TLS
+     ... TLS negotiation proceeds, further commands
+         protected by TLS layer ...
+   C: EHLO client.example.com
+   S: 250-smtp.example.com Hello client.example.com
+   S: 250 AUTH GSSAPI DIGEST-MD5 PLAIN
+   C: AUTH PLAIN dGVzdAB0ZXN0ADEyMzQ=
+   S: 235 2.7.0 Authentication successful
+
+   Here is another client that is attempting AUTH PLAIN under a TLS
+   layer, this time without the initial response.  Parts of the
+   negotiation before the TLS layer was established have been omitted:
+
+
+
+Siemborski & Melnikov       Standards Track                     [Page 7]
+
+RFC 4954       SMTP Service Extension for Authentication       July 2007
+
+
+     ... TLS negotiation proceeds, further commands
+         protected by TLS layer ...
+   C: EHLO client.example.com
+   S: 250-smtp.example.com Hello client.example.com
+   S: 250 AUTH GSSAPI DIGEST-MD5 PLAIN
+   C: AUTH PLAIN
+    (note: there is a single space following the 334
+     on the following line)
+   S: 334
+   C: dGVzdAB0ZXN0ADEyMzQ=
+   S: 235 2.7.0 Authentication successful
+
+   Here is an example using CRAM-MD5 [CRAM-MD5], a mechanism in which
+   the client does not begin the authentication exchange, and includes a
+   server challenge:
+
+   S: 220-smtp.example.com ESMTP Server
+   C: EHLO client.example.com
+   S: 250-smtp.example.com Hello client.example.com
+   S: 250-AUTH DIGEST-MD5 CRAM-MD5
+   S: 250-ENHANCEDSTATUSCODES
+   S: 250 STARTTLS
+   C: AUTH CRAM-MD5
+   S: 334 PDQxOTI5NDIzNDEuMTI4Mjg0NzJAc291cmNlZm91ci5hbmRyZXcuY211LmVk
+      dT4=
+   C: cmpzMyBlYzNhNTlmZWQzOTVhYmExZWM2MzY3YzRmNGI0MWFjMA==
+   S: 235 2.7.0 Authentication successful
+
+   Here is an example of a client attempting AUTH EXTERNAL under TLS,
+   using the derived authorization ID (and thus a zero-length initial
+   client response).
+
+   S: 220-smtp.example.com ESMTP Server
+   C: EHLO client.example.com
+   S: 250-smtp.example.com Hello client.example.com
+   S: 250-AUTH GSSAPI DIGEST-MD5
+   S: 250-ENHANCEDSTATUSCODES
+   S: 250 STARTTLS
+   C: STARTTLS
+   S: 220 Ready to start TLS
+     ... TLS negotiation proceeds, further commands
+         protected by TLS layer ...
+   C: EHLO client.example.com
+   S: 250-smtp.example.com Hello client.example.com
+   S: 250 AUTH EXTERNAL GSSAPI DIGEST-MD5 PLAIN
+   C: AUTH EXTERNAL =
+   S: 235 2.7.0 Authentication successful
+
+
+
+
+Siemborski & Melnikov       Standards Track                     [Page 8]
+
+RFC 4954       SMTP Service Extension for Authentication       July 2007
+
+
+5.  The AUTH Parameter to the MAIL FROM command
+
+   AUTH=mailbox
+
+   Arguments:
+        A <mailbox> (see Section 4.1.2 of [SMTP]) that is associated
+        with the identity that submitted the message to the delivery
+        system, or the two character sequence "<>" indicating such an
+        identity is unknown or insufficiently authenticated.  To comply
+        with restrictions imposed on ESMTP parameters, the <mailbox> is
+        encoded inside an xtext.  The syntax of an xtext is described in
+        Section 4 of [ESMTP-DSN].
+
+   Note:
+        For the purposes of this discussion, "authenticated identity"
+        refers to the identity (if any) derived from the authorization
+        identity of previous AUTH command, while the terms "authorized
+        identity" and "supplied <mailbox>" refer to the sender identity
+        that is being associated with a particular message.  Note that
+        one authenticated identity may be able to identify messages as
+        being sent by any number of authorized identities within a
+        single session.  For example, this may be the case when an SMTP
+        server (one authenticated identity) is processing its queue
+        (many messages with distinct authorized identities).
+
+   Discussion:
+        The optional AUTH parameter to the MAIL FROM command allows
+        cooperating agents in a trusted environment to communicate the
+        authorization identity associated with individual messages.
+
+        If the server trusts the authenticated identity of the client to
+        assert that the message was originally submitted by the supplied
+        <mailbox>, then the server SHOULD supply the same <mailbox> in
+        an AUTH parameter when relaying the message to any other server
+        which supports the AUTH extension.
+
+        For this reason, servers that advertise support for this
+        extension MUST support the AUTH parameter to the MAIL FROM
+        command even when the client has not authenticated itself to the
+        server.
+
+        A MAIL FROM parameter of AUTH=<> indicates that the original
+        submitter of the message is not known.  The server MUST NOT
+        treat the message as having been originally submitted by the
+        authenticated identity that resulted from the AUTH command.
+
+
+
+
+
+
+Siemborski & Melnikov       Standards Track                     [Page 9]
+
+RFC 4954       SMTP Service Extension for Authentication       July 2007
+
+
+        If the AUTH parameter to the MAIL FROM command is not supplied,
+        the client has authenticated, and the server believes the
+        message is an original submission, the server MAY generate a
+        <mailbox> from the user's authenticated identity for use in an
+        AUTH parameter when relaying the message to any server which
+        supports the AUTH extension.  The generated <mailbox> is
+        implementation specific, but it MUST conform to the syntax of
+        [SMTP].  If the implementation cannot generate a valid
+        <mailbox>, it MUST transmit AUTH=<> when relaying this message.
+
+        If the server does not sufficiently trust the authenticated
+        identity of the client, or if the client is not authenticated,
+        then the server MUST behave as if the AUTH=<> parameter was
+        supplied.  The server MAY, however, write the value of any
+        supplied AUTH parameter to a log file.
+
+        If an AUTH=<> parameter was supplied, either explicitly or due
+        to the requirement in the previous paragraph, then the server
+        MUST supply the AUTH=<> parameter when relaying the message to
+        any server which it has authenticated to using the AUTH
+        extension.
+
+        A server MAY treat expansion of a mailing list as a new
+        submission, setting the AUTH parameter to the mailing list
+        address or mailing list administration address when relaying the
+        message to list subscribers.
+
+        Note that an implementation which is hard-coded to treat all
+        clients as being insufficiently trusted is compliant with this
+        specification.  In that case, the implementation does nothing
+        more than parse and discard syntactically valid AUTH parameters
+        to the MAIL FROM command, and supply AUTH=<> parameters to any
+        servers that it authenticates to.
+
+5.1.  Examples
+
+   An example where the original identity of the sender is trusted and
+   known:
+
+   C: MAIL FROM:<e=mc2@example.com> AUTH=e+3Dmc2@example.com
+   S: 250 OK
+
+   One example where the identity of the sender is not trusted or is
+   otherwise being suppressed by the client:
+
+   C: MAIL FROM:<john+@example.org> AUTH=<>
+   S: 250 OK
+
+
+
+
+Siemborski & Melnikov       Standards Track                    [Page 10]
+
+RFC 4954       SMTP Service Extension for Authentication       July 2007
+
+
+6.  Status Codes
+
+   The following error codes may be used to indicate various success or
+   failure conditions.  Servers that return enhanced status codes
+   [ESMTP-CODES] SHOULD use the enhanced codes suggested here.
+
+   235 2.7.0  Authentication Succeeded
+
+   This response to the AUTH command indicates that the authentication
+   was successful.
+
+   432 4.7.12  A password transition is needed
+
+   This response to the AUTH command indicates that the user needs to
+   transition to the selected authentication mechanism.  This is
+   typically done by authenticating once using the [PLAIN]
+   authentication mechanism.  The selected mechanism SHOULD then work
+   for authentications in subsequent sessions.
+
+   454 4.7.0  Temporary authentication failure
+
+   This response to the AUTH command indicates that the authentication
+   failed due to a temporary server failure.  The client SHOULD NOT
+   prompt the user for another password in this case, and should instead
+   notify the user of server failure.
+
+   534 5.7.9  Authentication mechanism is too weak
+
+   This response to the AUTH command indicates that the selected
+   authentication mechanism is weaker than server policy permits for
+   that user.  The client SHOULD retry with a new authentication
+   mechanism.
+
+   535 5.7.8  Authentication credentials invalid
+
+   This response to the AUTH command indicates that the authentication
+   failed due to invalid or insufficient authentication credentials.  In
+   this case, the client SHOULD ask the user to supply new credentials
+   (such as by presenting a password dialog box).
+
+   500 5.5.6  Authentication Exchange line is too long
+
+   This response to the AUTH command indicates that the authentication
+   failed due to the client sending a [BASE64] response that is longer
+   than the maximum buffer size available for the currently selected
+   SASL mechanism.
+
+
+
+
+
+Siemborski & Melnikov       Standards Track                    [Page 11]
+
+RFC 4954       SMTP Service Extension for Authentication       July 2007
+
+
+   530 5.7.0  Authentication required
+
+   This response SHOULD be returned by any command other than AUTH,
+   EHLO, HELO, NOOP, RSET, or QUIT when server policy requires
+   authentication in order to perform the requested action and
+   authentication is not currently in force.
+
+   538 5.7.11  Encryption required for requested authentication
+               mechanism
+
+   This response to the AUTH command indicates that the selected
+   authentication mechanism may only be used when the underlying SMTP
+   connection is encrypted.  Note that this response code is documented
+   here for historical purposes only.  Modern implementations SHOULD NOT
+   advertise mechanisms that are not permitted due to lack of
+   encryption, unless an encryption layer of sufficient strength is
+   currently being employed.
+
+   This document adds several new enhanced status codes to the list
+   defined in [ENHANCED]:
+
+   The following 3 Enhanced Status Codes were defined above:
+
+       5.7.8 Authentication credentials invalid
+       5.7.9 Authentication mechanism is too weak
+       5.7.11 Encryption required for requested authentication mechanism
+
+   X.5.6     Authentication Exchange line is too long
+
+   This enhanced status code SHOULD be returned when the server fails
+   the AUTH command due to the client sending a [BASE64] response which
+   is longer than the maximum buffer size available for the currently
+   selected SASL mechanism.  This is useful for both permanent and
+   persistent transient errors.
+
+7.  Additional Requirements on Servers
+
+   As described in Section 4.4 of [SMTP], an SMTP server that receives a
+   message for delivery or further processing MUST insert the
+   "Received:" header field at the beginning of the message content.
+   This document places additional requirements on the content of a
+   generated "Received:" header field.  Upon successful authentication,
+   a server SHOULD use the "ESMTPA" or the "ESMTPSA" [SMTP-TT] (when
+   appropriate) keyword in the "with" clause of the Received header
+   field.
+
+
+
+
+
+
+Siemborski & Melnikov       Standards Track                    [Page 12]
+
+RFC 4954       SMTP Service Extension for Authentication       July 2007
+
+
+8.  Formal Syntax
+
+   The following syntax specification uses the Augmented Backus-Naur
+   Form notation as specified in [ABNF].  Non-terminals referenced but
+   not defined below are as defined by [ABNF] or [SASL].  The non-
+   terminal <mailbox> is defined in [SMTP].
+
+   Except as noted otherwise, all alphabetic characters are case-
+   insensitive.  The use of upper or lower case characters to define
+   token strings is for editorial clarity only.  Implementations MUST
+   accept these strings in a case-insensitive fashion.
+
+      hexchar         = "+" HEXDIG HEXDIG
+
+      xchar           = %x21-2A / %x2C-3C / %x3E-7E
+                        ;; US-ASCII except for "+", "=", SP, and CTL
+
+      xtext           = *(xchar / hexchar)
+                        ;; non-US-ASCII is only allowed as hexchar
+
+      auth-command    = "AUTH" SP sasl-mech [SP initial-response]
+                        *(CRLF [base64]) [CRLF cancel-response]
+                        CRLF
+                        ;; <sasl-mech> is defined in [SASL]
+
+      auth-param      = "AUTH=" xtext
+                        ;; Parameter to the MAIL FROM command.
+                        ;; This non-terminal complies with
+                        ;; syntax defined by esmtp-param [SMTP].
+                        ;;
+                        ;; The decoded form of the xtext MUST be
+                        ;; either a <mailbox> or the two
+                        ;; characters "<>"
+
+      base64          = base64-terminal /
+                        ( 1*(4base64-char) [base64-terminal] )
+
+      base64-char     = ALPHA / DIGIT / "+" / "/"
+                        ;; Case-sensitive
+
+      base64-terminal = (2base64-char "==") / (3base64-char "=")
+
+      continue-req    = "334" SP [base64] CRLF
+                        ;; Intermediate response to the AUTH
+                        ;; command.
+                        ;; This non-terminal complies with
+                        ;; syntax defined by Reply-line [SMTP].
+
+
+
+
+Siemborski & Melnikov       Standards Track                    [Page 13]
+
+RFC 4954       SMTP Service Extension for Authentication       July 2007
+
+
+      initial-response= base64 / "="
+
+      cancel-response = "*"
+
+9.  Security Considerations
+
+   Security issues are discussed throughout this memo.
+
+   If a client uses this extension to get an encrypted tunnel through an
+   insecure network to a cooperating server, it needs to be configured
+   to never send mail to that server when the connection is not mutually
+   authenticated and encrypted.  Otherwise, an attacker could steal the
+   client's mail by hijacking the [SMTP] connection and either
+   pretending the server does not support the Authentication extension
+   or causing all AUTH commands to fail.
+
+   Before the [SASL] negotiation has begun, any protocol interactions
+   are performed in the clear and may be modified by an active attacker.
+   For this reason, clients and servers MUST discard any knowledge
+   obtained prior to the start of the SASL negotiation upon the
+   establishment of a security layer.
+
+   This mechanism does not protect the TCP port, so an active attacker
+   may redirect a relay connection attempt (i.e., a connection between
+   two Mail Transfer Agents (MTAs)) to the submission port [SUBMIT].
+   The AUTH=<> parameter prevents such an attack from causing a relayed
+   message and, in the absence of other envelope authentication, from
+   picking up the authentication of the relay client.
+
+   A message submission client may require the user to authenticate
+   whenever a suitable [SASL] mechanism is advertised.  Therefore, it
+   may not be desirable for a submission server [SUBMIT] to advertise a
+   SASL mechanism when use of that mechanism grants the clients no
+   benefits over anonymous submission.
+
+   Servers MAY implement a policy whereby the connection is dropped
+   after a number of failed authentication attempts.  If they do so,
+   they SHOULD NOT drop the connection until at least 3 attempts to
+   authenticate have failed.
+
+   If an implementation supports SASL mechanisms that are vulnerable to
+   passive eavesdropping attacks (such as [PLAIN]), then the
+   implementation MUST support at least one configuration where these
+   SASL mechanisms are not advertised or used without the presence of an
+   external security layer such as [TLS].
+
+
+
+
+
+
+Siemborski & Melnikov       Standards Track                    [Page 14]
+
+RFC 4954       SMTP Service Extension for Authentication       July 2007
+
+
+   This extension is not intended to replace or be used instead of end-
+   to-end message signature and encryption systems such as [S/MIME] or
+   [PGP].  This extension addresses a different problem than end-to-end
+   systems; it has the following key differences:
+
+   1.  It is generally useful only within a trusted enclave.
+
+   2.  It protects the entire envelope of a message, not just the
+       message's body.
+
+   3.  It authenticates the message submission, not authorship of the
+       message content.
+
+   4.  When mutual authentication is used along with a security layer,
+       it can give the sender some assurance that the message was
+       successfully delivered to the next hop.
+
+   Additional security considerations are mentioned in the [SASL]
+   specification.  Additional security considerations specific to a
+   particular SASL mechanism are described in the relevant
+   specification.  Additional security considerations for [PLAIN] over
+   [TLS] are mentioned in Section 15 of this document.
+
+10.  IANA Considerations
+
+   IANA updated the entry for the "smtp" SASL protocol name to point at
+   this document.
+
+   IANA updated the registration of the Authentication SMTP service
+   extension as defined in Section 3 of this document.  This registry is
+   currently located at <http://www.iana.org/assignments/mail-
+   parameters>.
+
+11.  Normative References
+
+   [ABNF]        Crocker, D. and P. Overell, "Augmented BNF for Syntax
+                 Specifications: ABNF", RFC 4234, October 2005.
+
+   [BASE64]      Josefsson, S., "The Base16, Base32, and Base64 Data
+                 Encodings", RFC 4648, October 2006.
+
+   [ESMTP-CODES] Freed, N., "SMTP Service Extension for Returning
+                 Enhanced Error Codes", RFC 2034, October 1996.
+
+   [ENHANCED]    Vaudreuil, G., "Enhanced Mail System Status Codes", RFC
+                 3463, January 2003.
+
+
+
+
+
+Siemborski & Melnikov       Standards Track                    [Page 15]
+
+RFC 4954       SMTP Service Extension for Authentication       July 2007
+
+
+   [ESMTP-DSN]   Moore, K., "Simple Mail Transfer Protocol (SMTP)
+                 Service Extension Delivery Status Notifications
+                 (DSNs)", RFC 3461, January 2003.
+
+   [KEYWORDS]    Bradner, S., "Key words for use in RFCs to Indicate
+                 Requirement Levels", BCP 14, RFC 2119, March 1997.
+
+   [SASL]        Melnikov, A. and K. Zeilenga, "Simple Authentication
+                 and Security Layer (SASL)", RFC 4422, June 2006.
+
+   [SASLprep]    Zeilenga, K., "SASLprep: Stringprep Profile for User
+                 Names and Passwords", RFC 4013, February 2005.
+
+   [SMTP]        Klensin, J., "Simple Mail Transfer Protocol", RFC 2821,
+                 April 2001.
+
+   [SMTP-TLS]    Hoffman, P., "SMTP Service Extension for Secure SMTP
+                 over Transport Layer Security", RFC 3207, February
+                 2002.
+
+   [StringPrep]  Hoffman, P. and M. Blanchet, "Preparation of
+                 Internationalized Strings ("stringprep")", RFC 3454,
+                 December 2002.
+
+   [SUBMIT]      Gellens, R. and J. Klensin, "Message Submission for
+                 Mail", RFC 4409, April 2006.
+
+   [SMTP-TT]     Newman, C., "ESMTP and LMTP Transmission Types
+                 Registration", RFC 3848, July 2004.
+
+   [PLAIN]       Zeilenga, K., Ed., "The PLAIN Simple Authentication and
+                 Security Layer (SASL) Mechanism", RFC 4616, August
+                 2006.
+
+   [X509]        Housley, R., Polk, W., Ford, W., and D. Solo, "Internet
+                 X.509 Public Key Infrastructure Certificate and
+                 Certificate Revocation List (CRL) Profile", RFC 3280,
+                 April 2002.
+
+12.  Informative References
+
+   [PGP]         Elkins, M., "MIME Security with Pretty Good Privacy
+                 (PGP)", RFC 2015, October 1996.
+
+   [S/MIME]      Ramsdell, B., Ed., "Secure/Multipurpose Internet Mail
+                 Extensions (S/MIME) Version 3.1 Message Specification",
+                 RFC 3851, July 2004.
+
+
+
+
+Siemborski & Melnikov       Standards Track                    [Page 16]
+
+RFC 4954       SMTP Service Extension for Authentication       July 2007
+
+
+   [TLS]         Dierks, T. and E. Rescorla, "The Transport Layer
+                 Security (TLS) Protocol Version 1.1", RFC 4346, April
+                 2006.
+
+   [PIPELINING]  Freed, N., "SMTP Service Extension for Command
+                 Pipelining", STD 60, RFC 2920, September 2000.
+
+   [CRAM-MD5]    Klensin, J., Catoe, R., and P. Krumviede, "IMAP/POP
+                 AUTHorize Extension for Simple Challenge/Response", RFC
+                 2195, September 1997.
+
+13.  Acknowledgments
+
+   The editors would like to acknowledge the contributions of John Myers
+   and other contributors to RFC 2554, on which this document draws from
+   heavily.
+
+   The editors would also like to thank Ken Murchison, Mark Crispin,
+   Chris Newman, David Wilson, Dave Cridland, Frank Ellermann, Ned
+   Freed, John Klensin, Tony Finch, Abhijit Menon-Sen, Philip Guenther,
+   Sam Hartman, Russ Housley, Cullen Jennings, and Lisa Dusseault for
+   the time they devoted to reviewing of this document and/or for the
+   comments received.
+
+14.  Additional Requirements When Using SASL PLAIN over TLS
+
+   This section is normative for SMTP implementations that support SASL
+   [PLAIN] over [TLS].
+
+   If an SMTP client is willing to use SASL PLAIN over TLS to
+   authenticate to the SMTP server, the client verifies the server
+   certificate according to the rules of [X509].  If the server has not
+   provided any certificate, or if the certificate verification fails,
+   the client MUST NOT attempt to authenticate using the SASL PLAIN
+   mechanism.
+
+   After a successful [TLS] negotiation, the client MUST check its
+   understanding of the server hostname against the server's identity as
+   presented in the server Certificate message, in order to prevent
+   man-in-the-middle attacks.  If the match fails, the client MUST NOT
+   attempt to authenticate using the SASL PLAIN mechanism.  Matching is
+   performed according to the following rules:
+
+        The client MUST use the server hostname it used to open the
+        connection as the value to compare against the server name as
+        expressed in the server certificate.  The client MUST NOT use
+
+
+
+
+
+Siemborski & Melnikov       Standards Track                    [Page 17]
+
+RFC 4954       SMTP Service Extension for Authentication       July 2007
+
+
+        any form of the server hostname derived from an insecure remote
+        source (e.g., insecure DNS lookup).  CNAME canonicalization is
+        not done.
+
+        If a subjectAltName extension of type dNSName is present in the
+        certificate, it SHOULD be used as the source of the server's
+        identity.
+
+        Matching is case-insensitive.
+
+        A "*" wildcard character MAY be used as the leftmost name
+        component in the certificate.  For example, *.example.com would
+        match a.example.com, foo.example.com, etc., but would not match
+        example.com.
+
+        If the certificate contains multiple names (e.g., more than one
+        dNSName field), then a match with any one of the fields is
+        considered acceptable.
+
+15.  Changes since RFC 2554
+
+   1.  Clarified that servers MUST support the use of the AUTH=mailbox
+       parameter to MAIL FROM, even when the client is not
+       authenticated.
+
+   2.  Clarified the initial-client-send requirements, and give
+       additional examples.
+
+   3.  Updated references to newer versions of various specifications.
+
+   4.  Required SASL PLAIN (over TLS) as mandatory-to-implement.
+
+   5.  Clarified that the mechanism list can change.
+
+   6.  Deprecated the use of the 538 response code.
+
+   7.  Added the use of the SASLprep profile for preparing authorization
+       identities.
+
+   8.  Substantial cleanup of response codes and indicated suggested
+       enhanced response codes.  Also indicated what response codes
+       should result in a client prompting the user for new credentials.
+
+   9.  Updated ABNF section to use RFC 4234.
+
+   10. Clarified interaction with SMTP PIPELINING extension.
+
+   11. Added a reference to RFC 3848.
+
+
+
+Siemborski & Melnikov       Standards Track                    [Page 18]
+
+RFC 4954       SMTP Service Extension for Authentication       July 2007
+
+
+   12. Added a new Enhanced Status Code for "authentication line too
+       long" case.
+
+   13. Other general editorial clarifications.
+
+Editors' Addresses
+
+   Robert Siemborski
+   Google, Inc.
+   1600 Ampitheatre Parkway
+   Mountain View, CA 94043, USA
+
+   Phone: +1 650 623 6925
+   EMail: robsiemb@google.com
+
+
+   Alexey Melnikov
+   Isode Limited
+   5 Castle Business Village, 36 Station Road,
+   Hampton, Middlesex, TW12 2BX, UK
+
+   EMail: Alexey.Melnikov@isode.com
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Siemborski & Melnikov       Standards Track                    [Page 19]
+
+RFC 4954       SMTP Service Extension for Authentication       July 2007
+
+
+Full Copyright Statement
+
+   Copyright (C) The IETF Trust (2007).
+
+   This document is subject to the rights, licenses and restrictions
+   contained in BCP 78, and except as set forth therein, the authors
+   retain all their rights.
+
+   This document and the information contained herein are provided on an
+   "AS IS" basis and THE CONTRIBUTOR, THE ORGANIZATION HE/SHE REPRESENTS
+   OR IS SPONSORED BY (IF ANY), THE INTERNET SOCIETY, THE IETF TRUST AND
+   THE INTERNET ENGINEERING TASK FORCE DISCLAIM ALL WARRANTIES, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF
+   THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED
+   WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+Intellectual Property
+
+   The IETF takes no position regarding the validity or scope of any
+   Intellectual Property Rights or other rights that might be claimed to
+   pertain to the implementation or use of the technology described in
+   this document or the extent to which any license under such rights
+   might or might not be available; nor does it represent that it has
+   made any independent effort to identify any such rights.  Information
+   on the procedures with respect to rights in RFC documents can be
+   found in BCP 78 and BCP 79.
+
+   Copies of IPR disclosures made to the IETF Secretariat and any
+   assurances of licenses to be made available, or the result of an
+   attempt made to obtain a general license or permission for the use of
+   such proprietary rights by implementers or users of this
+   specification can be obtained from the IETF on-line IPR repository at
+   http://www.ietf.org/ipr.
+
+   The IETF invites any interested party to bring to its attention any
+   copyrights, patents or patent applications, or other proprietary
+   rights that may cover technology that may be required to implement
+   this standard.  Please address the information to the IETF at
+   ietf-ipr@ietf.org.
+
+Acknowledgement
+
+   Funding for the RFC Editor function is currently provided by the
+   Internet Society.
+
+
+
+
+
+
+
+Siemborski & Melnikov       Standards Track                    [Page 20]
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc5751.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc5751.txt
new file mode 100644
index 000000000..8d1dd2184
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/rfc5751.txt
@@ -0,0 +1,2523 @@
+
+
+
+
+
+
+Internet Engineering Task Force (IETF)                       B. Ramsdell
+Request for Comments: 5751                              Brute Squad Labs
+Obsoletes: 3851                                                S. Turner
+Category: Standards Track                                           IECA
+ISSN: 2070-1721                                             January 2010
+
+
+   Secure/Multipurpose Internet Mail Extensions (S/MIME) Version 3.2
+                         Message Specification
+
+Abstract
+
+   This document defines Secure/Multipurpose Internet Mail Extensions
+   (S/MIME) version 3.2.  S/MIME provides a consistent way to send and
+   receive secure MIME data.  Digital signatures provide authentication,
+   message integrity, and non-repudiation with proof of origin.
+   Encryption provides data confidentiality.  Compression can be used to
+   reduce data size.  This document obsoletes RFC 3851.
+
+Status of This Memo
+
+   This is an Internet Standards Track document.
+
+   This document is a product of the Internet Engineering Task Force
+   (IETF).  It represents the consensus of the IETF community.  It has
+   received public review and has been approved for publication by
+   the Internet Engineering Steering Group (IESG).  Further
+   information on Internet Standards is available in Section 2 of
+   RFC 5741.
+
+   Information about the current status of this document, any
+   errata, and how to provide feedback on it may be obtained at
+   http://www.rfc-editor.org/info/rfc5751.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Ramsdell & Turner            Standards Track                    [Page 1]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+Copyright Notice
+
+   Copyright (c) 2010 IETF Trust and the persons identified as the
+   document authors.  All rights reserved.
+
+   This document is subject to BCP 78 and the IETF Trust's Legal
+   Provisions Relating to IETF Documents
+   (http://trustee.ietf.org/license-info) in effect on the date of
+   publication of this document.  Please review these documents
+   carefully, as they describe your rights and restrictions with respect
+   to this document.  Code Components extracted from this document must
+   include Simplified BSD License text as described in Section 4.e of
+   the Trust Legal Provisions and are provided without warranty as
+   described in the Simplified BSD License.
+
+   This document may contain material from IETF Documents or IETF
+   Contributions published or made publicly available before November
+   10, 2008.  The person(s) controlling the copyright in some of this
+   material may not have granted the IETF Trust the right to allow
+   modifications of such material outside the IETF Standards Process.
+   Without obtaining an adequate license from the person(s) controlling
+   the copyright in such materials, this document may not be modified
+   outside the IETF Standards Process, and derivative works of it may
+   not be created outside the IETF Standards Process, except to format
+   it for publication as an RFC or to translate it into languages other
+   than English.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Ramsdell & Turner            Standards Track                    [Page 2]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+Table of Contents
+
+   1. Introduction ....................................................4
+      1.1. Specification Overview .....................................4
+      1.2. Definitions ................................................5
+      1.3. Conventions Used in This Document ..........................6
+      1.4. Compatibility with Prior Practice of S/MIME ................7
+      1.5. Changes from S/MIME v3 to S/MIME v3.1 ......................7
+      1.6. Changes since S/MIME v3.1 ..................................7
+   2. CMS Options .....................................................9
+      2.1. DigestAlgorithmIdentifier ..................................9
+      2.2. SignatureAlgorithmIdentifier ...............................9
+      2.3. KeyEncryptionAlgorithmIdentifier ..........................10
+      2.4. General Syntax ............................................11
+      2.5. Attributes and the SignerInfo Type ........................12
+      2.6. SignerIdentifier SignerInfo Type ..........................16
+      2.7. ContentEncryptionAlgorithmIdentifier ......................16
+   3. Creating S/MIME Messages .......................................18
+      3.1. Preparing the MIME Entity for Signing, Enveloping,
+           or Compressing ............................................19
+      3.2. The application/pkcs7-mime Media Type .....................23
+      3.3. Creating an Enveloped-Only Message ........................25
+      3.4. Creating a Signed-Only Message ............................26
+      3.5. Creating a Compressed-Only Message ........................30
+      3.6. Multiple Operations .......................................30
+      3.7. Creating a Certificate Management Message .................31
+      3.8. Registration Requests .....................................32
+      3.9. Identifying an S/MIME Message .............................32
+   4. Certificate Processing .........................................32
+      4.1. Key Pair Generation .......................................33
+      4.2. Signature Generation ......................................33
+      4.3. Signature Verification ....................................34
+      4.4. Encryption ................................................34
+      4.5. Decryption ................................................34
+   5. IANA Considerations ............................................34
+      5.1. Media Type for application/pkcs7-mime .....................34
+      5.2. Media Type for application/pkcs7-signature ................35
+   6. Security Considerations ........................................36
+   7. References .....................................................38
+      7.1. Reference Conventions .....................................38
+      7.2. Normative References ......................................39
+      7.3. Informative References ....................................41
+   Appendix A. ASN.1 Module ..........................................43
+   Appendix B. Moving S/MIME v2 Message Specification to Historic
+               Status ................................................45
+   Appendix C. Acknowledgments .......................................45
+
+
+
+
+
+Ramsdell & Turner            Standards Track                    [Page 3]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+1.  Introduction
+
+   S/MIME (Secure/Multipurpose Internet Mail Extensions) provides a
+   consistent way to send and receive secure MIME data.  Based on the
+   popular Internet MIME standard, S/MIME provides the following
+   cryptographic security services for electronic messaging
+   applications:  authentication, message integrity and non-repudiation
+   of origin (using digital signatures), and data confidentiality (using
+   encryption).  As a supplementary service, S/MIME provides for message
+   compression.
+
+   S/MIME can be used by traditional mail user agents (MUAs) to add
+   cryptographic security services to mail that is sent, and to
+   interpret cryptographic security services in mail that is received.
+   However, S/MIME is not restricted to mail; it can be used with any
+   transport mechanism that transports MIME data, such as HTTP or SIP.
+   As such, S/MIME takes advantage of the object-based features of MIME
+   and allows secure messages to be exchanged in mixed-transport
+   systems.
+
+   Further, S/MIME can be used in automated message transfer agents that
+   use cryptographic security services that do not require any human
+   intervention, such as the signing of software-generated documents and
+   the encryption of FAX messages sent over the Internet.
+
+1.1.  Specification Overview
+
+   This document describes a protocol for adding cryptographic signature
+   and encryption services to MIME data.  The MIME standard [MIME-SPEC]
+   provides a general structure for the content of Internet messages and
+   allows extensions for new content-type-based applications.
+
+   This specification defines how to create a MIME body part that has
+   been cryptographically enhanced according to the Cryptographic
+   Message Syntax (CMS) RFC 5652 [CMS], which is derived from PKCS #7
+   [PKCS-7].  This specification also defines the application/pkcs7-mime
+   media type that can be used to transport those body parts.
+
+   This document also discusses how to use the multipart/signed media
+   type defined in [MIME-SECURE] to transport S/MIME signed messages.
+   multipart/signed is used in conjunction with the application/pkcs7-
+   signature media type, which is used to transport a detached S/MIME
+   signature.
+
+
+
+
+
+
+
+
+Ramsdell & Turner            Standards Track                    [Page 4]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+   In order to create S/MIME messages, an S/MIME agent MUST follow the
+   specifications in this document, as well as the specifications listed
+   in the Cryptographic Message Syntax document [CMS], [CMSALG],
+   [RSAPSS], [RSAOAEP], and [CMS-SHA2].
+
+   Throughout this specification, there are requirements and
+   recommendations made for how receiving agents handle incoming
+   messages.  There are separate requirements and recommendations for
+   how sending agents create outgoing messages.  In general, the best
+   strategy is to "be liberal in what you receive and conservative in
+   what you send".  Most of the requirements are placed on the handling
+   of incoming messages, while the recommendations are mostly on the
+   creation of outgoing messages.
+
+   The separation for requirements on receiving agents and sending
+   agents also derives from the likelihood that there will be S/MIME
+   systems that involve software other than traditional Internet mail
+   clients.  S/MIME can be used with any system that transports MIME
+   data.  An automated process that sends an encrypted message might not
+   be able to receive an encrypted message at all, for example.  Thus,
+   the requirements and recommendations for the two types of agents are
+   listed separately when appropriate.
+
+1.2.  Definitions
+
+   For the purposes of this specification, the following definitions
+   apply.
+
+   ASN.1:             Abstract Syntax Notation One, as defined in ITU-T
+                      Recommendation X.680 [X.680].
+
+   BER:               Basic Encoding Rules for ASN.1, as defined in ITU-
+                      T Recommendation X.690 [X.690].
+
+   Certificate:       A type that binds an entity's name to a public key
+                      with a digital signature.
+
+   DER:               Distinguished Encoding Rules for ASN.1, as defined
+                      in ITU-T Recommendation X.690 [X.690].
+
+   7-bit data:        Text data with lines less than 998 characters
+                      long, where none of the characters have the 8th
+                      bit set, and there are no NULL characters.  <CR>
+                      and <LF> occur only as part of a <CR><LF> end-of-
+                      line delimiter.
+
+
+
+
+
+
+Ramsdell & Turner            Standards Track                    [Page 5]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+   8-bit data:        Text data with lines less than 998 characters, and
+                      where none of the characters are NULL characters.
+                      <CR> and <LF> occur only as part of a <CR><LF>
+                      end-of-line delimiter.
+
+   Binary data:       Arbitrary data.
+
+   Transfer encoding: A reversible transformation made on data so 8-bit
+                      or binary data can be sent via a channel that only
+                      transmits 7-bit data.
+
+   Receiving agent:   Software that interprets and processes S/MIME CMS
+                      objects, MIME body parts that contain CMS content
+                      types, or both.
+
+   Sending agent:     Software that creates S/MIME CMS content types,
+                      MIME body parts that contain CMS content types, or
+                      both.
+
+   S/MIME agent:      User software that is a receiving agent, a sending
+                      agent, or both.
+
+1.3.  Conventions Used in This Document
+
+   The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
+   "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
+   document are to be interpreted as described in [MUSTSHOULD].
+
+   We define some additional terms here:
+
+   SHOULD+   This term means the same as SHOULD.  However, the authors
+             expect that a requirement marked as SHOULD+ will be
+             promoted at some future time to be a MUST.
+
+   SHOULD-   This term means the same as SHOULD.  However, the authors
+             expect that a requirement marked as SHOULD- will be demoted
+             to a MAY in a future version of this document.
+
+   MUST-     This term means the same as MUST.  However, the authors
+             expect that this requirement will no longer be a MUST in a
+             future document.  Although its status will be determined at
+             a later time, it is reasonable to expect that if a future
+             revision of a document alters the status of a MUST-
+             requirement, it will remain at least a SHOULD or a SHOULD-.
+
+
+
+
+
+
+
+Ramsdell & Turner            Standards Track                    [Page 6]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+1.4.  Compatibility with Prior Practice of S/MIME
+
+   S/MIME version 3.2 agents ought to attempt to have the greatest
+   interoperability possible with agents for prior versions of S/MIME.
+   S/MIME version 2 is described in RFC 2311 through RFC 2315 inclusive
+   [SMIMEv2], S/MIME version 3 is described in RFC 2630 through RFC 2634
+   inclusive and RFC 5035 [SMIMEv3], and S/MIME version 3.1 is described
+   in RFC 3850, RFC 3851, RFC 3852, RFC 2634, and RFC 5035 [SMIMEv3.1].
+   RFC 2311 also has historical information about the development of
+   S/MIME.
+
+1.5.  Changes from S/MIME v3 to S/MIME v3.1
+
+   The RSA public key algorithm was changed to a MUST implement key
+   wrapping algorithm, and the Diffie-Hellman (DH) algorithm changed to
+   a SHOULD implement.
+
+   The AES symmetric encryption algorithm has been included as a SHOULD
+   implement.
+
+   The RSA public key algorithm was changed to a MUST implement
+   signature algorithm.
+
+   Ambiguous language about the use of "empty" SignedData messages to
+   transmit certificates was clarified to reflect that transmission of
+   Certificate Revocation Lists is also allowed.
+
+   The use of binary encoding for some MIME entities is now explicitly
+   discussed.
+
+   Header protection through the use of the message/rfc822 media type
+   has been added.
+
+   Use of the CompressedData CMS type is allowed, along with required
+   media type and file extension additions.
+
+1.6.  Changes since S/MIME v3.1
+
+   Editorial changes, e.g., replaced "MIME type" with "media type",
+   content-type with Content-Type.
+
+   Moved "Conventions Used in This Document" to Section 1.3.  Added
+   definitions for SHOULD+, SHOULD-, and MUST-.
+
+   Section 1.1 and Appendix A: Added references to RFCs for RSASSA-PSS,
+   RSAES-OAEP, and SHA2 CMS algorithms.  Added CMS Multiple Signers
+   Clarification to CMS reference.
+
+
+
+
+Ramsdell & Turner            Standards Track                    [Page 7]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+   Section 1.2: Updated references to ASN.1 to X.680 and BER and DER to
+   X.690.
+
+   Section 1.4: Added references to S/MIME MSG 3.1 RFCs.
+
+   Section 2.1 (digest algorithm): SHA-256 added as MUST, SHA-1 and MD5
+   made SHOULD-.
+
+   Section 2.2 (signature algorithms): RSA with SHA-256 added as MUST,
+   and DSA with SHA-256 added as SHOULD+, RSA with SHA-1, DSA with
+   SHA-1, and RSA with MD5 changed to SHOULD-, and RSASSA-PSS with
+   SHA-256 added as SHOULD+.  Also added note about what S/MIME v3.1
+   clients support.
+
+   Section 2.3 (key encryption): DH changed to SHOULD-, and RSAES-OAEP
+   added as SHOULD+.  Elaborated requirements for key wrap algorithm.
+
+   Section 2.5.1: Added requirement that receiving agents MUST support
+   both GeneralizedTime and UTCTime.
+
+   Section 2.5.2: Replaced reference "sha1WithRSAEncryption" with
+   "sha256WithRSAEncryption", "DES-3EDE-CBC" with "AES-128 CBC", and
+   deleted the RC5 example.
+
+   Section 2.5.2.1: Deleted entire section (discussed deprecated RC2).
+
+   Section 2.7, 2.7.1, Appendix A: references to RC2/40 removed.
+
+   Section 2.7 (content encryption): AES-128 CBC added as MUST, AES-192
+   and AES-256 CBC SHOULD+, tripleDES now SHOULD-.
+
+   Section 2.7.1: Updated pointers from 2.7.2.1 through 2.7.2.4 to
+   2.7.1.1 to 2.7.1.2.
+
+   Section 3.1.1: Removed text about MIME character sets.
+
+   Section 3.2.2 and 3.6: Replaced "encrypted" with "enveloped".  Update
+   OID example to use AES-128 CBC oid.
+
+   Section 3.4.3.2: Replace micalg parameter for SHA-1 with sha-1.
+
+   Section 4: Updated reference to CERT v3.2.
+
+   Section 4.1: Updated RSA and DSA key size discussion.  Moved last
+   four sentences to security considerations.  Updated reference to
+   randomness requirements for security.
+
+
+
+
+
+Ramsdell & Turner            Standards Track                    [Page 8]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+   Section 5: Added IANA registration templates to update media type
+   registry to point to this document as opposed to RFC 2311.
+
+   Section 6: Updated security considerations.
+
+   Section 7: Moved references from Appendix B to this section.  Updated
+   references.  Added informational references to SMIMEv2, SMIMEv3, and
+   SMIMEv3.1.
+
+   Appendix B: Added Appendix B to move S/MIME v2 to Historic status.
+
+2.  CMS Options
+
+   CMS allows for a wide variety of options in content, attributes, and
+   algorithm support.  This section puts forth a number of support
+   requirements and recommendations in order to achieve a base level of
+   interoperability among all S/MIME implementations.  [CMSALG] and
+   [CMS-SHA2] provides additional details regarding the use of the
+   cryptographic algorithms.  [ESS] provides additional details
+   regarding the use of additional attributes.
+
+2.1.  DigestAlgorithmIdentifier
+
+   Sending and receiving agents MUST support SHA-256 [CMS-SHA2] and
+   SHOULD- support SHA-1 [CMSALG].  Receiving agents SHOULD- support MD5
+   [CMSALG] for the purpose of providing backward compatibility with
+   MD5-digested S/MIME v2 SignedData objects.
+
+2.2.  SignatureAlgorithmIdentifier
+
+   Receiving agents:
+
+      - MUST support RSA with SHA-256.
+
+      - SHOULD+ support DSA with SHA-256.
+
+      - SHOULD+ support RSASSA-PSS with SHA-256.
+
+      - SHOULD- support RSA with SHA-1.
+
+      - SHOULD- support DSA with SHA-1.
+
+      - SHOULD- support RSA with MD5.
+
+
+
+
+
+
+
+
+Ramsdell & Turner            Standards Track                    [Page 9]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+   Sending agents:
+
+      - MUST support RSA with SHA-256.
+
+      - SHOULD+ support DSA with SHA-256.
+
+      - SHOULD+ support RSASSA-PSS with SHA-256.
+
+      - SHOULD- support RSA with SHA-1 or DSA with SHA-1.
+
+      - SHOULD- support RSA with MD5.
+
+   See Section 4.1 for information on key size and algorithm references.
+
+   Note that S/MIME v3.1 clients support verifying id-dsa-with-sha1 and
+   rsaEncryption and might not implement sha256withRSAEncryption.  Note
+   that S/MIME v3 clients might only implement signing or signature
+   verification using id-dsa-with-sha1, and might also use id-dsa as an
+   AlgorithmIdentifier in this field.  Receiving clients SHOULD
+   recognize id-dsa as equivalent to id-dsa-with-sha1, and sending
+   clients MUST use id-dsa-with-sha1 if using that algorithm.  Also note
+   that S/MIME v2 clients are only required to verify digital signatures
+   using the rsaEncryption algorithm with SHA-1 or MD5, and might not
+   implement id-dsa-with-sha1 or id-dsa at all.
+
+2.3.  KeyEncryptionAlgorithmIdentifier
+
+   Receiving and sending agents:
+
+      - MUST support RSA Encryption, as specified in [CMSALG].
+
+      - SHOULD+ support RSAES-OAEP, as specified in [RSAOAEP].
+
+      - SHOULD- support DH ephemeral-static mode, as specified in
+        [CMSALG] and [SP800-57].
+
+   When DH ephemeral-static is used, a key wrap algorithm is also
+   specified in the KeyEncryptionAlgorithmIdentifier [CMS].  The
+   underlying encryption functions for the key wrap and content
+   encryption algorithm ([CMSALG] and [CMSAES]) and the key sizes for
+   the two algorithms MUST be the same (e.g., AES-128 key wrap algorithm
+   with AES-128 content encryption algorithm).  As AES-128 CBC is the
+   mandatory-to-implement content encryption algorithm, the AES-128 key
+   wrap algorithm MUST also be supported when DH ephemeral-static is
+   used.
+
+
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 10]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+   Note that S/MIME v3.1 clients might only implement key encryption and
+   decryption using the rsaEncryption algorithm.  Note that S/MIME v3
+   clients might only implement key encryption and decryption using the
+   Diffie-Hellman algorithm.  Also note that S/MIME v2 clients are only
+   capable of decrypting content-encryption keys using the rsaEncryption
+   algorithm.
+
+2.4.  General Syntax
+
+   There are several CMS content types.  Of these, only the Data,
+   SignedData, EnvelopedData, and CompressedData content types are
+   currently used for S/MIME.
+
+2.4.1.  Data Content Type
+
+   Sending agents MUST use the id-data content type identifier to
+   identify the "inner" MIME message content.  For example, when
+   applying a digital signature to MIME data, the CMS SignedData
+   encapContentInfo eContentType MUST include the id-data object
+   identifier and the media type MUST be stored in the SignedData
+   encapContentInfo eContent OCTET STRING (unless the sending agent is
+   using multipart/signed, in which case the eContent is absent, per
+   Section 3.4.3 of this document).  As another example, when applying
+   encryption to MIME data, the CMS EnvelopedData encryptedContentInfo
+   contentType MUST include the id-data object identifier and the
+   encrypted MIME content MUST be stored in the EnvelopedData
+   encryptedContentInfo encryptedContent OCTET STRING.
+
+2.4.2.  SignedData Content Type
+
+   Sending agents MUST use the SignedData content type to apply a
+   digital signature to a message or, in a degenerate case where there
+   is no signature information, to convey certificates.  Applying a
+   signature to a message provides authentication, message integrity,
+   and non-repudiation of origin.
+
+2.4.3.  EnvelopedData Content Type
+
+   This content type is used to apply data confidentiality to a message.
+   A sender needs to have access to a public key for each intended
+   message recipient to use this service.
+
+2.4.4.  CompressedData Content Type
+
+   This content type is used to apply data compression to a message.
+   This content type does not provide authentication, message integrity,
+   non-repudiation, or data confidentiality, and is only used to reduce
+   the message's size.
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 11]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+   See Section 3.6 for further guidance on the use of this type in
+   conjunction with other CMS types.
+
+2.5.  Attributes and the SignerInfo Type
+
+   The SignerInfo type allows the inclusion of unsigned and signed
+   attributes along with a signature.
+
+   Receiving agents MUST be able to handle zero or one instance of each
+   of the signed attributes listed here.  Sending agents SHOULD generate
+   one instance of each of the following signed attributes in each
+   S/MIME message:
+
+      - Signing Time (section (Section 2.5.1 in this document)
+
+      - SMIME Capabilities (section (Section 2.5.2 in this document)
+
+      - Encryption Key Preference (section (Section 2.5.3 in this
+        document)
+
+      - Message Digest (section (Section 11.2 in [CMS])
+
+      - Content Type (section (Section 11.1 in [CMS])
+
+   Further, receiving agents SHOULD be able to handle zero or one
+   instance of the signingCertificate and signingCertificatev2 signed
+   attributes, as defined in Section 5 of RFC 2634 [ESS] and Section 3
+   of RFC 5035 [ESS].
+
+   Sending agents SHOULD generate one instance of the signingCertificate
+   or signingCertificatev2 signed attribute in each SignerInfo
+   structure.
+
+   Additional attributes and values for these attributes might be
+   defined in the future.  Receiving agents SHOULD handle attributes or
+   values that they do not recognize in a graceful manner.
+
+   Interactive sending agents that include signed attributes that are
+   not listed here SHOULD display those attributes to the user, so that
+   the user is aware of all of the data being signed.
+
+2.5.1.  Signing Time Attribute
+
+   The signing-time attribute is used to convey the time that a message
+   was signed.  The time of signing will most likely be created by a
+   message originator and therefore is only as trustworthy as the
+   originator.
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 12]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+   Sending agents MUST encode signing time through the year 2049 as
+   UTCTime; signing times in 2050 or later MUST be encoded as
+   GeneralizedTime.  When the UTCTime CHOICE is used, S/MIME agents MUST
+   interpret the year field (YY) as follows:
+
+      If YY is greater than or equal to 50, the year is interpreted as
+      19YY; if YY is less than 50, the year is interpreted as 20YY.
+
+   Receiving agents MUST be able to process signing-time attributes that
+   are encoded in either UTCTime or GeneralizedTime.
+
+2.5.2.  SMIME Capabilities Attribute
+
+   The SMIMECapabilities attribute includes signature algorithms (such
+   as "sha256WithRSAEncryption"), symmetric algorithms (such as "AES-128
+   CBC"), and key encipherment algorithms (such as "rsaEncryption").
+   There are also several identifiers that indicate support for other
+   optional features such as binary encoding and compression.  The
+   SMIMECapabilities were designed to be flexible and extensible so
+   that, in the future, a means of identifying other capabilities and
+   preferences such as certificates can be added in a way that will not
+   cause current clients to break.
+
+   If present, the SMIMECapabilities attribute MUST be a
+   SignedAttribute; it MUST NOT be an UnsignedAttribute.  CMS defines
+   SignedAttributes as a SET OF Attribute.  The SignedAttributes in a
+   signerInfo MUST NOT include multiple instances of the
+   SMIMECapabilities attribute.  CMS defines the ASN.1 syntax for
+   Attribute to include attrValues SET OF AttributeValue.  A
+   SMIMECapabilities attribute MUST only include a single instance of
+   AttributeValue.  There MUST NOT be zero or multiple instances of
+   AttributeValue present in the attrValues SET OF AttributeValue.
+
+   The semantics of the SMIMECapabilities attribute specify a partial
+   list as to what the client announcing the SMIMECapabilities can
+   support.  A client does not have to list every capability it
+   supports, and need not list all its capabilities so that the
+   capabilities list doesn't get too long.  In an SMIMECapabilities
+   attribute, the object identifiers (OIDs) are listed in order of their
+   preference, but SHOULD be separated logically along the lines of
+   their categories (signature algorithms, symmetric algorithms, key
+   encipherment algorithms, etc.).
+
+   The structure of the SMIMECapabilities attribute is to facilitate
+   simple table lookups and binary comparisons in order to determine
+   matches.  For instance, the DER-encoding for the SMIMECapability for
+   AES-128 CBC MUST be identically encoded regardless of the
+   implementation.  Because of the requirement for identical encoding,
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 13]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+   individuals documenting algorithms to be used in the
+   SMIMECapabilities attribute SHOULD explicitly document the correct
+   byte sequence for the common cases.
+
+   For any capability, the associated parameters for the OID MUST
+   specify all of the parameters necessary to differentiate between two
+   instances of the same algorithm.
+
+   The OIDs that correspond to algorithms SHOULD use the same OID as the
+   actual algorithm, except in the case where the algorithm usage is
+   ambiguous from the OID.  For instance, in an earlier specification,
+   rsaEncryption was ambiguous because it could refer to either a
+   signature algorithm or a key encipherment algorithm.  In the event
+   that an OID is ambiguous, it needs to be arbitrated by the maintainer
+   of the registered SMIMECapabilities list as to which type of
+   algorithm will use the OID, and a new OID MUST be allocated under the
+   smimeCapabilities OID to satisfy the other use of the OID.
+
+   The registered SMIMECapabilities list specifies the parameters for
+   OIDs that need them, most notably key lengths in the case of
+   variable-length symmetric ciphers.  In the event that there are no
+   differentiating parameters for a particular OID, the parameters MUST
+   be omitted, and MUST NOT be encoded as NULL.  Additional values for
+   the SMIMECapabilities attribute might be defined in the future.
+   Receiving agents MUST handle a SMIMECapabilities object that has
+   values that it does not recognize in a graceful manner.
+
+   Section 2.7.1 explains a strategy for caching capabilities.
+
+2.5.3.  Encryption Key Preference Attribute
+
+   The encryption key preference attribute allows the signer to
+   unambiguously describe which of the signer's certificates has the
+   signer's preferred encryption key.  This attribute is designed to
+   enhance behavior for interoperating with those clients that use
+   separate keys for encryption and signing.  This attribute is used to
+   convey to anyone viewing the attribute which of the listed
+   certificates is appropriate for encrypting a session key for future
+   encrypted messages.
+
+   If present, the SMIMEEncryptionKeyPreference attribute MUST be a
+   SignedAttribute; it MUST NOT be an UnsignedAttribute.  CMS defines
+   SignedAttributes as a SET OF Attribute.  The SignedAttributes in a
+   signerInfo MUST NOT include multiple instances of the
+   SMIMEEncryptionKeyPreference attribute.  CMS defines the ASN.1 syntax
+   for Attribute to include attrValues SET OF AttributeValue.  A
+   SMIMEEncryptionKeyPreference attribute MUST only include a single
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 14]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+   instance of AttributeValue.  There MUST NOT be zero or multiple
+   instances of AttributeValue present in the attrValues SET OF
+   AttributeValue.
+
+   The sending agent SHOULD include the referenced certificate in the
+   set of certificates included in the signed message if this attribute
+   is used.  The certificate MAY be omitted if it has been previously
+   made available to the receiving agent.  Sending agents SHOULD use
+   this attribute if the commonly used or preferred encryption
+   certificate is not the same as the certificate used to sign the
+   message.
+
+   Receiving agents SHOULD store the preference data if the signature on
+   the message is valid and the signing time is greater than the
+   currently stored value.  (As with the SMIMECapabilities, the clock
+   skew SHOULD be checked and the data not used if the skew is too
+   great.)  Receiving agents SHOULD respect the sender's encryption key
+   preference attribute if possible.  This, however, represents only a
+   preference and the receiving agent can use any certificate in
+   replying to the sender that is valid.
+
+   Section 2.7.1 explains a strategy for caching preference data.
+
+2.5.3.1.  Selection of Recipient Key Management Certificate
+
+   In order to determine the key management certificate to be used when
+   sending a future CMS EnvelopedData message for a particular
+   recipient, the following steps SHOULD be followed:
+
+   - If an SMIMEEncryptionKeyPreference attribute is found in a
+     SignedData object received from the desired recipient, this
+     identifies the X.509 certificate that SHOULD be used as the X.509
+     key management certificate for the recipient.
+
+   - If an SMIMEEncryptionKeyPreference attribute is not found in a
+     SignedData object received from the desired recipient, the set of
+     X.509 certificates SHOULD be searched for a X.509 certificate with
+     the same subject name as the signer of a X.509 certificate that can
+     be used for key management.
+
+   - Or use some other method of determining the user's key management
+     key.  If a X.509 key management certificate is not found, then
+     encryption cannot be done with the signer of the message.  If
+     multiple X.509 key management certificates are found, the S/MIME
+     agent can make an arbitrary choice between them.
+
+
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 15]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+2.6.  SignerIdentifier SignerInfo Type
+
+   S/MIME v3.2 implementations MUST support both issuerAndSerialNumber
+   and subjectKeyIdentifier.  Messages that use the subjectKeyIdentifier
+   choice cannot be read by S/MIME v2 clients.
+
+   It is important to understand that some certificates use a value for
+   subjectKeyIdentifier that is not suitable for uniquely identifying a
+   certificate.  Implementations MUST be prepared for multiple
+   certificates for potentially different entities to have the same
+   value for subjectKeyIdentifier, and MUST be prepared to try each
+   matching certificate during signature verification before indicating
+   an error condition.
+
+2.7.  ContentEncryptionAlgorithmIdentifier
+
+   Sending and receiving agents:
+
+      - MUST support encryption and decryption with AES-128 CBC
+        [CMSAES].
+
+      - SHOULD+ support encryption and decryption with AES-192 CBC and
+        AES-256 CBC [CMSAES].
+
+      - SHOULD- support encryption and decryption with DES EDE3 CBC,
+        hereinafter called "tripleDES" [CMSALG].
+
+2.7.1.  Deciding Which Encryption Method to Use
+
+   When a sending agent creates an encrypted message, it has to decide
+   which type of encryption to use.  The decision process involves using
+   information garnered from the capabilities lists included in messages
+   received from the recipient, as well as out-of-band information such
+   as private agreements, user preferences, legal restrictions, and so
+   on.
+
+   Section 2.5.2 defines a method by which a sending agent can
+   optionally announce, among other things, its decrypting capabilities
+   in its order of preference.  The following method for processing and
+   remembering the encryption capabilities attribute in incoming signed
+   messages SHOULD be used.
+
+      - If the receiving agent has not yet created a list of
+        capabilities for the sender's public key, then, after verifying
+        the signature on the incoming message and checking the
+        timestamp, the receiving agent SHOULD create a new list
+        containing at least the signing time and the symmetric
+        capabilities.
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 16]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+      - If such a list already exists, the receiving agent SHOULD verify
+        that the signing time in the incoming message is greater than
+        the signing time stored in the list and that the signature is
+        valid.  If so, the receiving agent SHOULD update both the
+        signing time and capabilities in the list.  Values of the
+        signing time that lie far in the future (that is, a greater
+        discrepancy than any reasonable clock skew), or a capabilities
+        list in messages whose signature could not be verified, MUST NOT
+        be accepted.
+
+   The list of capabilities SHOULD be stored for future use in creating
+   messages.
+
+   Before sending a message, the sending agent MUST decide whether it is
+   willing to use weak encryption for the particular data in the
+   message.  If the sending agent decides that weak encryption is
+   unacceptable for this data, then the sending agent MUST NOT use a
+   weak algorithm.  The decision to use or not use weak encryption
+   overrides any other decision in this section about which encryption
+   algorithm to use.
+
+   Sections 2.7.1.1 through 2.7.1.2 describe the decisions a sending
+   agent SHOULD use in deciding which type of encryption will be applied
+   to a message.  These rules are ordered, so the sending agent SHOULD
+   make its decision in the order given.
+
+2.7.1.1.  Rule 1: Known Capabilities
+
+   If the sending agent has received a set of capabilities from the
+   recipient for the message the agent is about to encrypt, then the
+   sending agent SHOULD use that information by selecting the first
+   capability in the list (that is, the capability most preferred by the
+   intended recipient) that the sending agent knows how to encrypt.  The
+   sending agent SHOULD use one of the capabilities in the list if the
+   agent reasonably expects the recipient to be able to decrypt the
+   message.
+
+2.7.1.2.  Rule 2: Unknown Capabilities, Unknown Version of S/MIME
+
+   If the following two conditions are met:
+
+      - the sending agent has no knowledge of the encryption
+        capabilities of the recipient, and
+
+      - the sending agent has no knowledge of the version of S/MIME of
+        the recipient,
+
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 17]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+   then the sending agent SHOULD use AES-128 because it is a stronger
+   algorithm and is required by S/MIME v3.2.  If the sending agent
+   chooses not to use AES-128 in this step, it SHOULD use tripleDES.
+
+2.7.2.  Choosing Weak Encryption
+
+   All algorithms that use 40-bit keys are considered by many to be weak
+   encryption.  A sending agent that is controlled by a human SHOULD
+   allow a human sender to determine the risks of sending data using a
+   weak encryption algorithm before sending the data, and possibly allow
+   the human to use a stronger encryption method such as tripleDES or
+   AES.
+
+2.7.3.  Multiple Recipients
+
+   If a sending agent is composing an encrypted message to a group of
+   recipients where the encryption capabilities of some of the
+   recipients do not overlap, the sending agent is forced to send more
+   than one message.  Please note that if the sending agent chooses to
+   send a message encrypted with a strong algorithm, and then send the
+   same message encrypted with a weak algorithm, someone watching the
+   communications channel could learn the contents of the strongly
+   encrypted message simply by decrypting the weakly encrypted message.
+
+3.  Creating S/MIME Messages
+
+   This section describes the S/MIME message formats and how they are
+   created.  S/MIME messages are a combination of MIME bodies and CMS
+   content types.  Several media types as well as several CMS content
+   types are used.  The data to be secured is always a canonical MIME
+   entity.  The MIME entity and other data, such as certificates and
+   algorithm identifiers, are given to CMS processing facilities that
+   produce a CMS object.  Finally, the CMS object is wrapped in MIME.
+   The Enhanced Security Services for S/MIME [ESS] document provides
+   descriptions of how nested, secured S/MIME messages are formatted.
+   ESS provides a description of how a triple-wrapped S/MIME message is
+   formatted using multipart/signed and application/pkcs7-mime for the
+   signatures.
+
+   S/MIME provides one format for enveloped-only data, several formats
+   for signed-only data, and several formats for signed and enveloped
+   data.  Several formats are required to accommodate several
+   environments, in particular for signed messages.  The criteria for
+   choosing among these formats are also described.
+
+   The reader of this section is expected to understand MIME as
+   described in [MIME-SPEC] and [MIME-SECURE].
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 18]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+3.1.  Preparing the MIME Entity for Signing, Enveloping, or Compressing
+
+   S/MIME is used to secure MIME entities.  A MIME entity can be a sub-
+   part, sub-parts of a message, or the whole message with all its sub-
+   parts.  A MIME entity that is the whole message includes only the
+   MIME message headers and MIME body, and does not include the RFC-822
+   header.  Note that S/MIME can also be used to secure MIME entities
+   used in applications other than Internet mail.  If protection of the
+   RFC-822 header is required, the use of the message/rfc822 media type
+   is explained later in this section.
+
+   The MIME entity that is secured and described in this section can be
+   thought of as the "inside" MIME entity.  That is, it is the
+   "innermost" object in what is possibly a larger MIME message.
+   Processing "outside" MIME entities into CMS content types is
+   described in Sections 3.2, 3.4, and elsewhere.
+
+   The procedure for preparing a MIME entity is given in [MIME-SPEC].
+   The same procedure is used here with some additional restrictions
+   when signing.  The description of the procedures from [MIME-SPEC] is
+   repeated here, but it is suggested that the reader refer to that
+   document for the exact procedure.  This section also describes
+   additional requirements.
+
+   A single procedure is used for creating MIME entities that are to
+   have any combination of signing, enveloping, and compressing applied.
+   Some additional steps are recommended to defend against known
+   corruptions that can occur during mail transport that are of
+   particular importance for clear-signing using the multipart/signed
+   format.  It is recommended that these additional steps be performed
+   on enveloped messages, or signed and enveloped messages, so that the
+   message can be forwarded to any environment without modification.
+
+   These steps are descriptive rather than prescriptive.  The
+   implementer is free to use any procedure as long as the result is the
+   same.
+
+   Step 1.  The MIME entity is prepared according to the local
+            conventions.
+
+   Step 2.  The leaf parts of the MIME entity are converted to canonical
+            form.
+
+   Step 3.  Appropriate transfer encoding is applied to the leaves of
+            the MIME entity.
+
+
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 19]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+   When an S/MIME message is received, the security services on the
+   message are processed, and the result is the MIME entity.  That MIME
+   entity is typically passed to a MIME-capable user agent where it is
+   further decoded and presented to the user or receiving application.
+
+   In order to protect outer, non-content-related message header fields
+   (for instance, the "Subject", "To", "From", and "Cc" fields), the
+   sending client MAY wrap a full MIME message in a message/rfc822
+   wrapper in order to apply S/MIME security services to these header
+   fields.  It is up to the receiving client to decide how to present
+   this "inner" header along with the unprotected "outer" header.
+
+   When an S/MIME message is received, if the top-level protected MIME
+   entity has a Content-Type of message/rfc822, it can be assumed that
+   the intent was to provide header protection.  This entity SHOULD be
+   presented as the top-level message, taking into account header
+   merging issues as previously discussed.
+
+3.1.1.  Canonicalization
+
+   Each MIME entity MUST be converted to a canonical form that is
+   uniquely and unambiguously representable in the environment where the
+   signature is created and the environment where the signature will be
+   verified.  MIME entities MUST be canonicalized for enveloping and
+   compressing as well as signing.
+
+   The exact details of canonicalization depend on the actual media type
+   and subtype of an entity, and are not described here.  Instead, the
+   standard for the particular media type SHOULD be consulted.  For
+   example, canonicalization of type text/plain is different from
+   canonicalization of audio/basic.  Other than text types, most types
+   have only one representation regardless of computing platform or
+   environment that can be considered their canonical representation.
+   In general, canonicalization will be performed by the non-security
+   part of the sending agent rather than the S/MIME implementation.
+
+   The most common and important canonicalization is for text, which is
+   often represented differently in different environments.  MIME
+   entities of major type "text" MUST have both their line endings and
+   character set canonicalized.  The line ending MUST be the pair of
+   characters <CR><LF>, and the charset SHOULD be a registered charset
+   [CHARSETS].  The details of the canonicalization are specified in
+   [MIME-SPEC].
+
+   Note that some charsets such as ISO-2022 have multiple
+   representations for the same characters.  When preparing such text
+   for signing, the canonical representation specified for the charset
+   MUST be used.
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 20]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+3.1.2.  Transfer Encoding
+
+   When generating any of the secured MIME entities below, except the
+   signing using the multipart/signed format, no transfer encoding is
+   required at all.  S/MIME implementations MUST be able to deal with
+   binary MIME objects.  If no Content-Transfer-Encoding header field is
+   present, the transfer encoding is presumed to be 7BIT.
+
+   S/MIME implementations SHOULD however use transfer encoding described
+   in Section 3.1.3 for all MIME entities they secure.  The reason for
+   securing only 7-bit MIME entities, even for enveloped data that are
+   not exposed to the transport, is that it allows the MIME entity to be
+   handled in any environment without changing it.  For example, a
+   trusted gateway might remove the envelope, but not the signature, of
+   a message, and then forward the signed message on to the end
+   recipient so that they can verify the signatures directly.  If the
+   transport internal to the site is not 8-bit clean, such as on a wide-
+   area network with a single mail gateway, verifying the signature will
+   not be possible unless the original MIME entity was only 7-bit data.
+
+   S/MIME implementations that "know" that all intended recipients are
+   capable of handling inner (all but the outermost) binary MIME objects
+   SHOULD use binary encoding as opposed to a 7-bit-safe transfer
+   encoding for the inner entities.  The use of a 7-bit-safe encoding
+   (such as base64) would unnecessarily expand the message size.
+   Implementations MAY "know" that recipient implementations are capable
+   of handling inner binary MIME entities either by interpreting the id-
+   cap-preferBinaryInside SMIMECapabilities attribute, by prior
+   agreement, or by other means.
+
+   If one or more intended recipients are unable to handle inner binary
+   MIME objects, or if this capability is unknown for any of the
+   intended recipients, S/MIME implementations SHOULD use transfer
+   encoding described in Section 3.1.3 for all MIME entities they
+   secure.
+
+3.1.3.  Transfer Encoding for Signing Using multipart/signed
+
+   If a multipart/signed entity is ever to be transmitted over the
+   standard Internet SMTP infrastructure or other transport that is
+   constrained to 7-bit text, it MUST have transfer encoding applied so
+   that it is represented as 7-bit text.  MIME entities that are 7-bit
+   data already need no transfer encoding.  Entities such as 8-bit text
+   and binary data can be encoded with quoted-printable or base-64
+   transfer encoding.
+
+
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 21]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+   The primary reason for the 7-bit requirement is that the Internet
+   mail transport infrastructure cannot guarantee transport of 8-bit or
+   binary data.  Even though many segments of the transport
+   infrastructure now handle 8-bit and even binary data, it is sometimes
+   not possible to know whether the transport path is 8-bit clean.  If a
+   mail message with 8-bit data were to encounter a message transfer
+   agent that cannot transmit 8-bit or binary data, the agent has three
+   options, none of which are acceptable for a clear-signed message:
+
+    - The agent could change the transfer encoding; this would
+      invalidate the signature.
+
+    - The agent could transmit the data anyway, which would most likely
+      result in the 8th bit being corrupted; this too would invalidate
+      the signature.
+
+    - The agent could return the message to the sender.
+
+   [MIME-SECURE] prohibits an agent from changing the transfer encoding
+   of the first part of a multipart/signed message.  If a compliant
+   agent that cannot transmit 8-bit or binary data encounters a
+   multipart/signed message with 8-bit or binary data in the first part,
+   it would have to return the message to the sender as undeliverable.
+
+3.1.4.  Sample Canonical MIME Entity
+
+   This example shows a multipart/mixed message with full transfer
+   encoding.  This message contains a text part and an attachment.  The
+   sample message text includes characters that are not US-ASCII and
+   thus need to be transfer encoded.  Though not shown here, the end of
+   each line is <CR><LF>.  The line ending of the MIME headers, the
+   text, and the transfer encoded parts, all MUST be <CR><LF>.
+
+   Note that this example is not of an S/MIME message.
+
+      Content-Type: multipart/mixed; boundary=bar
+
+      --bar
+      Content-Type: text/plain; charset=iso-8859-1
+      Content-Transfer-Encoding: quoted-printable
+
+      =A1Hola Michael!
+
+      How do you like the new S/MIME specification?
+
+      It's generally a good idea to encode lines that begin with
+      From=20because some mail transport agents will insert a greater-
+      than (>) sign, thus invalidating the signature.
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 22]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+      Also, in some cases it might be desirable to encode any =20
+      trailing whitespace that occurs on lines in order to ensure =20
+      that the message signature is not invalidated when passing =20
+      a gateway that modifies such whitespace (like BITNET). =20
+
+      --bar
+      Content-Type: image/jpeg
+      Content-Transfer-Encoding: base64
+
+      iQCVAwUBMJrRF2N9oWBghPDJAQE9UQQAtl7LuRVndBjrk4EqYBIb3h5QXIX/LC//
+      jJV5bNvkZIGPIcEmI5iFd9boEgvpirHtIREEqLQRkYNoBActFBZmh9GC3C041WGq
+      uMbrbxc+nIs1TIKlA08rVi9ig/2Yh7LFrK5Ein57U/W72vgSxLhe/zhdfolT9Brn
+      HOxEa44b+EI=
+
+      --bar--
+
+3.2.  The application/pkcs7-mime Media Type
+
+   The application/pkcs7-mime media type is used to carry CMS content
+   types including EnvelopedData, SignedData, and CompressedData.  The
+   details of constructing these entities are described in subsequent
+   sections.  This section describes the general characteristics of the
+   application/pkcs7-mime media type.
+
+   The carried CMS object always contains a MIME entity that is prepared
+   as described in Section 3.1 if the eContentType is id-data.  Other
+   contents MAY be carried when the eContentType contains different
+   values.  See [ESS] for an example of this with signed receipts.
+
+   Since CMS content types are binary data, in most cases base-64
+   transfer encoding is appropriate, in particular, when used with SMTP
+   transport.  The transfer encoding used depends on the transport
+   through which the object is to be sent, and is not a characteristic
+   of the media type.
+
+   Note that this discussion refers to the transfer encoding of the CMS
+   object or "outside" MIME entity.  It is completely distinct from, and
+   unrelated to, the transfer encoding of the MIME entity secured by the
+   CMS object, the "inside" object, which is described in Section 3.1.
+
+   Because there are several types of application/pkcs7-mime objects, a
+   sending agent SHOULD do as much as possible to help a receiving agent
+   know about the contents of the object without forcing the receiving
+   agent to decode the ASN.1 for the object.  The Content-Type header
+   field of all application/pkcs7-mime objects SHOULD include the
+   optional "smime-type" parameter, as described in the following
+   sections.
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 23]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+3.2.1.  The name and filename Parameters
+
+   For the application/pkcs7-mime, sending agents SHOULD emit the
+   optional "name" parameter to the Content-Type field for compatibility
+   with older systems.  Sending agents SHOULD also emit the optional
+   Content-Disposition field [CONTDISP] with the "filename" parameter.
+   If a sending agent emits the above parameters, the value of the
+   parameters SHOULD be a file name with the appropriate extension:
+
+   Media Type                                            File Extension
+     application/pkcs7-mime (SignedData, EnvelopedData)      .p7m
+     application/pkcs7-mime (degenerate SignedData           .p7c
+        certificate management message)
+     application/pkcs7-mime (CompressedData)                 .p7z
+     application/pkcs7-signature (SignedData)                .p7s
+
+   In addition, the file name SHOULD be limited to eight characters
+   followed by a three-letter extension.  The eight-character filename
+   base can be any distinct name; the use of the filename base "smime"
+   SHOULD be used to indicate that the MIME entity is associated with
+   S/MIME.
+
+   Including a file name serves two purposes.  It facilitates easier use
+   of S/MIME objects as files on disk.  It also can convey type
+   information across gateways.  When a MIME entity of type
+   application/pkcs7-mime (for example) arrives at a gateway that has no
+   special knowledge of S/MIME, it will default the entity's media type
+   to application/octet-stream and treat it as a generic attachment,
+   thus losing the type information.  However, the suggested filename
+   for an attachment is often carried across a gateway.  This often
+   allows the receiving systems to determine the appropriate application
+   to hand the attachment off to, in this case, a stand-alone S/MIME
+   processing application.  Note that this mechanism is provided as a
+   convenience for implementations in certain environments.  A proper
+   S/MIME implementation MUST use the media types and MUST NOT rely on
+   the file extensions.
+
+3.2.2.  The smime-type Parameter
+
+   The application/pkcs7-mime content type defines the optional "smime-
+   type" parameter.  The intent of this parameter is to convey details
+   about the security applied (signed or enveloped) along with
+   information about the contained content.  This specification defines
+   the following smime-types.
+
+
+
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 24]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+      Name                   CMS Type                Inner Content
+      enveloped-data         EnvelopedData           id-data
+      signed-data            SignedData              id-data
+      certs-only             SignedData              none
+      compressed-data        CompressedData          id-data
+
+   In order for consistency to be obtained with future specifications,
+   the following guidelines SHOULD be followed when assigning a new
+   smime-type parameter.
+
+      1. If both signing and encryption can be applied to the content,
+         then two values for smime-type SHOULD be assigned "signed-*"
+         and "enveloped-*".  If one operation can be assigned, then this
+         can be omitted.  Thus, since "certs-only" can only be signed,
+         "signed-" is omitted.
+
+      2. A common string for a content OID SHOULD be assigned.  We use
+         "data" for the id-data content OID when MIME is the inner
+         content.
+
+      3. If no common string is assigned, then the common string of
+         "OID.<oid>" is recommended (for example,
+         "OID.2.16.840.1.101.3.4.1.2" would be AES-128 CBC).
+
+   It is explicitly intended that this field be a suitable hint for mail
+   client applications to indicate whether a message is "signed" or
+   "enveloped" without having to tunnel into the CMS payload.
+
+3.3.  Creating an Enveloped-Only Message
+
+   This section describes the format for enveloping a MIME entity
+   without signing it.  It is important to note that sending enveloped
+   but not signed messages does not provide for data integrity.  It is
+   possible to replace ciphertext in such a way that the processed
+   message will still be valid, but the meaning can be altered.
+
+   Step 1.  The MIME entity to be enveloped is prepared according to
+            Section 3.1.
+
+   Step 2.  The MIME entity and other required data is processed into a
+            CMS object of type EnvelopedData.  In addition to encrypting
+            a copy of the content-encryption key for each recipient, a
+            copy of the content-encryption key SHOULD be encrypted for
+            the originator and included in the EnvelopedData (see [CMS],
+            Section 6).
+
+   Step 3.  The EnvelopedData object is wrapped in a CMS ContentInfo
+            object.
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 25]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+   Step 4.  The ContentInfo object is inserted into an
+            application/pkcs7-mime MIME entity.
+
+   The smime-type parameter for enveloped-only messages is "enveloped-
+   data".  The file extension for this type of message is ".p7m".
+
+   A sample message would be:
+
+      Content-Type: application/pkcs7-mime; smime-type=enveloped-data;
+           name=smime.p7m
+      Content-Transfer-Encoding: base64
+      Content-Disposition: attachment; filename=smime.p7m
+
+      rfvbnj756tbBghyHhHUujhJhjH77n8HHGT9HG4VQpfyF467GhIGfHfYT6
+      7n8HHGghyHhHUujhJh4VQpfyF467GhIGfHfYGTrfvbnjT6jH7756tbB9H
+      f8HHGTrfvhJhjH776tbB9HG4VQbnj7567GhIGfHfYT6ghyHhHUujpfyF4
+      0GhIGfHfQbnj756YT64V
+
+3.4.  Creating a Signed-Only Message
+
+   There are two formats for signed messages defined for S/MIME:
+
+      - application/pkcs7-mime with SignedData.
+
+      - multipart/signed.
+
+   In general, the multipart/signed form is preferred for sending, and
+   receiving agents MUST be able to handle both.
+
+3.4.1.  Choosing a Format for Signed-Only Messages
+
+   There are no hard-and-fast rules as to when a particular signed-only
+   format is chosen.  It depends on the capabilities of all the
+   receivers and the relative importance of receivers with S/MIME
+   facilities being able to verify the signature versus the importance
+   of receivers without S/MIME software being able to view the message.
+
+   Messages signed using the multipart/signed format can always be
+   viewed by the receiver whether or not they have S/MIME software.
+   They can also be viewed whether they are using a MIME-native user
+   agent or they have messages translated by a gateway.  In this
+   context, "be viewed" means the ability to process the message
+   essentially as if it were not a signed message, including any other
+   MIME structure the message might have.
+
+
+
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 26]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+   Messages signed using the SignedData format cannot be viewed by a
+   recipient unless they have S/MIME facilities.  However, the
+   SignedData format protects the message content from being changed by
+   benign intermediate agents.  Such agents might do line wrapping or
+   content-transfer encoding changes that would break the signature.
+
+3.4.2.  Signing Using application/pkcs7-mime with SignedData
+
+   This signing format uses the application/pkcs7-mime media type.  The
+   steps to create this format are:
+
+   Step 1.  The MIME entity is prepared according to Section 3.1.
+
+   Step 2.  The MIME entity and other required data are processed into a
+            CMS object of type SignedData.
+
+   Step 3.  The SignedData object is wrapped in a CMS ContentInfo
+            object.
+
+   Step 4.  The ContentInfo object is inserted into an
+            application/pkcs7-mime MIME entity.
+
+   The smime-type parameter for messages using application/pkcs7-mime
+   with SignedData is "signed-data".  The file extension for this type
+   of message is ".p7m".
+
+   A sample message would be:
+
+      Content-Type: application/pkcs7-mime; smime-type=signed-data;
+           name=smime.p7m
+      Content-Transfer-Encoding: base64
+      Content-Disposition: attachment; filename=smime.p7m
+
+      567GhIGfHfYT6ghyHhHUujpfyF4f8HHGTrfvhJhjH776tbB9HG4VQbnj7
+      77n8HHGT9HG4VQpfyF467GhIGfHfYT6rfvbnj756tbBghyHhHUujhJhjH
+      HUujhJh4VQpfyF467GhIGfHfYGTrfvbnjT6jH7756tbB9H7n8HHGghyHh
+      6YT64V0GhIGfHfQbnj75
+
+3.4.3.  Signing Using the multipart/signed Format
+
+   This format is a clear-signing format.  Recipients without any S/MIME
+   or CMS processing facilities are able to view the message.  It makes
+   use of the multipart/signed media type described in [MIME-SECURE].
+   The multipart/signed media type has two parts.  The first part
+   contains the MIME entity that is signed; the second part contains the
+   "detached signature" CMS SignedData object in which the
+   encapContentInfo eContent field is absent.
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 27]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+3.4.3.1.  The application/pkcs7-signature Media Type
+
+   This media type always contains a CMS ContentInfo containing a single
+   CMS object of type SignedData.  The SignedData encapContentInfo
+   eContent field MUST be absent.  The signerInfos field contains the
+   signatures for the MIME entity.
+
+   The file extension for signed-only messages using application/pkcs7-
+   signature is ".p7s".
+
+3.4.3.2.  Creating a multipart/signed Message
+
+   Step 1.  The MIME entity to be signed is prepared according to
+            Section 3.1, taking special care for clear-signing.
+
+   Step 2.  The MIME entity is presented to CMS processing in order to
+            obtain an object of type SignedData in which the
+            encapContentInfo eContent field is absent.
+
+   Step 3.  The MIME entity is inserted into the first part of a
+            multipart/signed message with no processing other than that
+            described in Section 3.1.
+
+   Step 4.  Transfer encoding is applied to the "detached signature" CMS
+            SignedData object, and it is inserted into a MIME entity of
+            type application/pkcs7-signature.
+
+   Step 5.  The MIME entity of the application/pkcs7-signature is
+            inserted into the second part of the multipart/signed
+            entity.
+
+   The multipart/signed Content-Type has two required parameters: the
+   protocol parameter and the micalg parameter.
+
+   The protocol parameter MUST be "application/pkcs7-signature".  Note
+   that quotation marks are required around the protocol parameter
+   because MIME requires that the "/" character in the parameter value
+   MUST be quoted.
+
+   The micalg parameter allows for one-pass processing when the
+   signature is being verified.  The value of the micalg parameter is
+   dependent on the message digest algorithm(s) used in the calculation
+   of the Message Integrity Check.  If multiple message digest
+   algorithms are used, they MUST be separated by commas per [MIME-
+   SECURE].  The values to be placed in the micalg parameter SHOULD be
+   from the following:
+
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 28]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+      Algorithm   Value Used
+
+      MD5         md5
+      SHA-1       sha-1
+      SHA-224     sha-224
+      SHA-256     sha-256
+      SHA-384     sha-384
+      SHA-512     sha-512
+      Any other   (defined separately in algorithm profile or "unknown"
+                   if not defined)
+
+   (Historical note: some early implementations of S/MIME emitted and
+   expected "rsa-md5", "rsa-sha1", and "sha1" for the micalg parameter.)
+   Receiving agents SHOULD be able to recover gracefully from a micalg
+   parameter value that they do not recognize.  Future names for this
+   parameter will be consistent with the IANA "Hash Function Textual
+   Names" registry.
+
+3.4.3.3.  Sample multipart/signed Message
+
+       Content-Type: multipart/signed;
+          protocol="application/pkcs7-signature";
+          micalg=sha1; boundary=boundary42
+
+       --boundary42
+       Content-Type: text/plain
+
+       This is a clear-signed message.
+
+       --boundary42
+       Content-Type: application/pkcs7-signature; name=smime.p7s
+       Content-Transfer-Encoding: base64
+       Content-Disposition: attachment; filename=smime.p7s
+
+       ghyHhHUujhJhjH77n8HHGTrfvbnj756tbB9HG4VQpfyF467GhIGfHfYT6
+       4VQpfyF467GhIGfHfYT6jH77n8HHGghyHhHUujhJh756tbB9HGTrfvbnj
+       n8HHGTrfvhJhjH776tbB9HG4VQbnj7567GhIGfHfYT6ghyHhHUujpfyF4
+       7GhIGfHfYT64VQbnj756
+
+      --boundary42--
+
+   The content that is digested (the first part of the multipart/signed)
+   consists of the bytes:
+
+   43 6f 6e 74 65 6e 74 2d 54 79 70 65 3a 20 74 65 78 74 2f 70 6c 61 69
+   6e 0d 0a 0d 0a 54 68 69 73 20 69 73 20 61 20 63 6c 65 61 72 2d 73 69
+   67 6e 65 64 20 6d 65 73 73 61 67 65 2e 0d 0a
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 29]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+3.5.  Creating a Compressed-Only Message
+
+   This section describes the format for compressing a MIME entity.
+   Please note that versions of S/MIME prior to version 3.1 did not
+   specify any use of CompressedData, and will not recognize it.  The
+   use of a capability to indicate the ability to receive CompressedData
+   is described in [CMSCOMPR] and is the preferred method for
+   compatibility.
+
+   Step 1.  The MIME entity to be compressed is prepared according to
+            Section 3.1.
+
+   Step 2.  The MIME entity and other required data are processed into a
+            CMS object of type CompressedData.
+
+   Step 3.  The CompressedData object is wrapped in a CMS ContentInfo
+            object.
+
+   Step 4.  The ContentInfo object is inserted into an
+            application/pkcs7-mime MIME entity.
+
+   The smime-type parameter for compressed-only messages is "compressed-
+   data".  The file extension for this type of message is ".p7z".
+
+   A sample message would be:
+
+   Content-Type: application/pkcs7-mime; smime-type=compressed-data;
+      name=smime.p7z
+   Content-Transfer-Encoding: base64
+   Content-Disposition: attachment; filename=smime.p7z
+
+   rfvbnj756tbBghyHhHUujhJhjH77n8HHGT9HG4VQpfyF467GhIGfHfYT6
+   7n8HHGghyHhHUujhJh4VQpfyF467GhIGfHfYGTrfvbnjT6jH7756tbB9H
+   f8HHGTrfvhJhjH776tbB9HG4VQbnj7567GhIGfHfYT6ghyHhHUujpfyF4
+   0GhIGfHfQbnj756YT64V
+
+3.6.  Multiple Operations
+
+   The signed-only, enveloped-only, and compressed-only MIME formats can
+   be nested.  This works because these formats are all MIME entities
+   that encapsulate other MIME entities.
+
+   An S/MIME implementation MUST be able to receive and process
+   arbitrarily nested S/MIME within reasonable resource limits of the
+   recipient computer.
+
+
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 30]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+   It is possible to apply any of the signing, encrypting, and
+   compressing operations in any order.  It is up to the implementer and
+   the user to choose.  When signing first, the signatories are then
+   securely obscured by the enveloping.  When enveloping first the
+   signatories are exposed, but it is possible to verify signatures
+   without removing the enveloping.  This can be useful in an
+   environment where automatic signature verification is desired, as no
+   private key material is required to verify a signature.
+
+   There are security ramifications to choosing whether to sign first or
+   encrypt first.  A recipient of a message that is encrypted and then
+   signed can validate that the encrypted block was unaltered, but
+   cannot determine any relationship between the signer and the
+   unencrypted contents of the message.  A recipient of a message that
+   is signed then encrypted can assume that the signed message itself
+   has not been altered, but that a careful attacker could have changed
+   the unauthenticated portions of the encrypted message.
+
+   When using compression, keep the following guidelines in mind:
+
+      - Compression of binary encoded encrypted data is discouraged,
+        since it will not yield significant compression.  Base64
+        encrypted data could very well benefit, however.
+
+      - If a lossy compression algorithm is used with signing, you will
+        need to compress first, then sign.
+
+3.7.  Creating a Certificate Management Message
+
+   The certificate management message or MIME entity is used to
+   transport certificates and/or Certificate Revocation Lists, such as
+   in response to a registration request.
+
+   Step 1.  The certificates and/or Certificate Revocation Lists are
+            made available to the CMS generating process that creates a
+            CMS object of type SignedData.  The SignedData
+            encapContentInfo eContent field MUST be absent and
+            signerInfos field MUST be empty.
+
+   Step 2.  The SignedData object is wrapped in a CMS ContentInfo
+            object.
+
+   Step 3.  The ContentInfo object is enclosed in an
+            application/pkcs7-mime MIME entity.
+
+   The smime-type parameter for a certificate management message is
+   "certs-only".  The file extension for this type of message is ".p7c".
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 31]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+3.8.  Registration Requests
+
+   A sending agent that signs messages MUST have a certificate for the
+   signature so that a receiving agent can verify the signature.  There
+   are many ways of getting certificates, such as through an exchange
+   with a certification authority, through a hardware token or diskette,
+   and so on.
+
+   S/MIME v2 [SMIMEv2] specified a method for "registering" public keys
+   with certificate authorities using an application/pkcs10 body part.
+   Since that time, the IETF PKIX Working Group has developed other
+   methods for requesting certificates.  However, S/MIME v3.2 does not
+   require a particular certificate request mechanism.
+
+3.9.  Identifying an S/MIME Message
+
+   Because S/MIME takes into account interoperation in non-MIME
+   environments, several different mechanisms are employed to carry the
+   type information, and it becomes a bit difficult to identify S/MIME
+   messages.  The following table lists criteria for determining whether
+   or not a message is an S/MIME message.  A message is considered an
+   S/MIME message if it matches any of the criteria listed below.
+
+   The file suffix in the table below comes from the "name" parameter in
+   the Content-Type header field, or the "filename" parameter on the
+   Content-Disposition header field.  These parameters that give the
+   file suffix are not listed below as part of the parameter section.
+
+   Media type:  application/pkcs7-mime
+   parameters:  any
+   file suffix: any
+
+   Media type:  multipart/signed
+   parameters:  protocol="application/pkcs7-signature"
+   file suffix: any
+
+   Media type:  application/octet-stream
+   parameters:  any
+   file suffix: p7m, p7s, p7c, p7z
+
+4.  Certificate Processing
+
+   A receiving agent MUST provide some certificate retrieval mechanism
+   in order to gain access to certificates for recipients of digital
+   envelopes.  This specification does not cover how S/MIME agents
+   handle certificates, only what they do after a certificate has been
+   validated or rejected.  S/MIME certificate issues are covered in
+   [CERT32].
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 32]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+   At a minimum, for initial S/MIME deployment, a user agent could
+   automatically generate a message to an intended recipient requesting
+   that recipient's certificate in a signed return message.  Receiving
+   and sending agents SHOULD also provide a mechanism to allow a user to
+   "store and protect" certificates for correspondents in such a way so
+   as to guarantee their later retrieval.
+
+4.1.  Key Pair Generation
+
+   All generated key pairs MUST be generated from a good source of non-
+   deterministic random input [RANDOM] and the private key MUST be
+   protected in a secure fashion.
+
+   An S/MIME user agent MUST NOT generate asymmetric keys less than 512
+   bits for use with the RSA or DSA signature algorithms.
+
+   For 512-bit RSA with SHA-1 see [CMSALG] and [FIPS186-2] without
+   Change Notice 1, for 512-bit RSA with SHA-256 see [CMS-SHA2] and
+   [FIPS186-2] without Change Notice 1, and for 1024-bit through
+   2048-bit RSA with SHA-256 see [CMS-SHA2] and [FIPS186-2] with Change
+   Notice 1.  The first reference provides the signature algorithm's
+   object identifier, and the second provides the signature algorithm's
+   definition.
+
+   For 512-bit DSA with SHA-1 see [CMSALG] and [FIPS186-2] without
+   Change Notice 1, for 512-bit DSA with SHA-256 see [CMS-SHA2] and
+   [FIPS186-2] without Change Notice 1, for 1024-bit DSA with SHA-1 see
+   [CMSALG] and [FIPS186-2] with Change Notice 1, for 1024-bit and above
+   DSA with SHA-256 see [CMS-SHA2] and [FIPS186-3].  The first reference
+   provides the signature algorithm's object identifier and the second
+   provides the signature algorithm's definition.
+
+   For RSASSA-PSS with SHA-256, see [RSAPSS].  For 1024-bit DH, see
+   [CMSALG].  For 1024-bit and larger DH, see [SP800-56A]; regardless,
+   use the KDF, which is from X9.42, specified in [CMSALG].  For RSAES-
+   OAEP, see [RSAOAEP].
+
+4.2.  Signature Generation
+
+   The following are the requirements for an S/MIME agent generated RSA,
+   RSASSA-PSS, and DSA signatures:
+
+           key size <= 1023 : SHOULD NOT (see Security Considerations)
+   1024 <= key size <= 2048 : SHOULD     (see Security Considerations)
+   2048 <  key size         : MAY        (see Security Considerations)
+
+
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 33]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+4.3.  Signature Verification
+
+   The following are the requirements for S/MIME receiving agents during
+   signature verification of RSA, RSASSA-PSS, and DSA signatures:
+
+           key size <= 1023 : MAY        (see Security Considerations)
+   1024 <= key size <= 2048 : MUST       (see Security Considerations)
+   2048 <  key size         : MAY        (see Security Considerations)
+
+4.4.  Encryption
+
+   The following are the requirements for an S/MIME agent when
+   establishing keys for content encryption using the RSA, RSA-OAEP, and
+   DH algorithms:
+
+           key size <= 1023 : SHOULD NOT (see Security Considerations)
+   1024 <= key size <= 2048 : SHOULD     (see Security Considerations)
+   2048 <  key size         : MAY        (see Security Considerations)
+
+4.5.  Decryption
+
+   The following are the requirements for an S/MIME agent when
+   establishing keys for content decryption using the RSA, RSAES-OAEP,
+   and DH algorithms:
+
+           key size <= 1023 : MAY        (see Security Considerations)
+   1024 <= key size <= 2048 : MUST       (see Security Considerations)
+   2048 <  key size         : MAY        (see Security Considerations)
+
+5.  IANA Considerations
+
+   The following information updates the media type registration for
+   application/pkcs7-mime and application/pkcs7-signature to refer to
+   this document as opposed to RFC 2311.
+
+   Note that other documents can define additional MIME media types for
+   S/MIME.
+
+5.1.  Media Type for application/pkcs7-mime
+
+   Type name: application
+
+   Subtype Name: pkcs7-mime
+
+   Required Parameters: NONE
+
+
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 34]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+   Optional Parameters: smime-type/signed-data
+                        smime-type/enveloped-data
+                        smime-type/compressed-data
+                        smime-type/certs-only
+                        name
+
+   Encoding Considerations: See Section 3 of this document
+
+   Security Considerations: See Section 6 of this document
+
+   Interoperability Considerations: See Sections 1-6 of this document
+
+   Published Specification: RFC 2311, RFC 2633, and this document
+
+   Applications that use this media type: Security applications
+
+   Additional information: NONE
+
+   Person & email to contact for further information:
+      S/MIME working group chairs smime-chairs@tools.ietf.org
+
+   Intended usage: COMMON
+
+   Restrictions on usage: NONE
+
+   Author: Sean Turner
+
+   Change Controller: S/MIME working group delegated from the IESG
+
+5.2.  Media Type for application/pkcs7-signature
+
+   Type name: application
+
+   Subtype Name: pkcs7-signature
+
+   Required Parameters: NONE
+
+   Optional Parameters: NONE
+
+   Encoding Considerations: See Section 3 of this document
+
+   Security Considerations: See Section 6 of this document
+
+   Interoperability Considerations: See Sections 1-6 of this document
+
+   Published Specification: RFC 2311, RFC 2633, and this document
+
+   Applications that use this media type: Security applications
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 35]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+   Additional information: NONE
+
+   Person & email to contact for further information:
+      S/MIME working group chairs smime-chairs@tools.ietf.org
+
+   Intended usage: COMMON
+
+   Restrictions on usage: NONE
+
+   Author: Sean Turner
+
+   Change Controller: S/MIME working group delegated from the IESG
+
+6.  Security Considerations
+
+   Cryptographic algorithms will be broken or weakened over time.
+   Implementers and users need to check that the cryptographic
+   algorithms listed in this document continue to provide the expected
+   level of security.  The IETF from time to time may issue documents
+   dealing with the current state of the art.  For example:
+
+      - The Million Message Attack described in RFC 3218 [MMA].
+
+      - The Diffie-Hellman "small-subgroup" attacks described in RFC
+        2785 [DHSUB].
+
+      - The attacks against hash algorithms described in RFC 4270 [HASH-
+        ATTACK].
+
+   This specification uses Public-Key Cryptography technologies.  It is
+   assumed that the private key is protected to ensure that it is not
+   accessed or altered by unauthorized parties.
+
+   It is impossible for most people or software to estimate the value of
+   a message's content.  Further, it is impossible for most people or
+   software to estimate the actual cost of recovering an encrypted
+   message content that is encrypted with a key of a particular size.
+   Further, it is quite difficult to determine the cost of a failed
+   decryption if a recipient cannot process a message's content.  Thus,
+   choosing between different key sizes (or choosing whether to just use
+   plaintext) is also impossible for most people or software.  However,
+   decisions based on these criteria are made all the time, and
+   therefore this specification gives a framework for using those
+   estimates in choosing algorithms.
+
+   The choice of 2048 bits as the RSA asymmetric key size in this
+   specification is based on the desire to provide at least 100 bits of
+   security.  The key sizes that must be supported to conform to this
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 36]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+   specification seem appropriate for the Internet based on [STRENGTH].
+   Of course, there are environments, such as financial and medical
+   systems, that may select different key sizes.  For this reason, an
+   implementation MAY support key sizes beyond those recommended in this
+   specification.
+
+   Receiving agents that validate signatures and sending agents that
+   encrypt messages need to be cautious of cryptographic processing
+   usage when validating signatures and encrypting messages using keys
+   larger than those mandated in this specification.  An attacker could
+   send certificates with keys that would result in excessive
+   cryptographic processing, for example, keys larger than those
+   mandated in this specification, which could swamp the processing
+   element.  Agents that use such keys without first validating the
+   certificate to a trust anchor are advised to have some sort of
+   cryptographic resource management system to prevent such attacks.
+
+   Using weak cryptography in S/MIME offers little actual security over
+   sending plaintext.  However, other features of S/MIME, such as the
+   specification of AES and the ability to announce stronger
+   cryptographic capabilities to parties with whom you communicate,
+   allow senders to create messages that use strong encryption.  Using
+   weak cryptography is never recommended unless the only alternative is
+   no cryptography.
+
+   RSA and DSA keys of less than 1024 bits are now considered by many
+   experts to be cryptographically insecure (due to advances in
+   computing power), and should no longer be used to protect messages.
+   Such keys were previously considered secure, so processing previously
+   received signed and encrypted mail will often result in the use of
+   weak keys.  Implementations that wish to support previous versions of
+   S/MIME or process old messages need to consider the security risks
+   that result from smaller key sizes (e.g., spoofed messages) versus
+   the costs of denial of service.  If an implementation supports
+   verification of digital signatures generated with RSA and DSA keys of
+   less than 1024 bits, it MUST warn the user.  Implementers should
+   consider providing different warnings for newly received messages and
+   previously stored messages.  Server implementations (e.g., secure
+   mail list servers) where user warnings are not appropriate SHOULD
+   reject messages with weak signatures.
+
+   Implementers SHOULD be aware that multiple active key pairs can be
+   associated with a single individual.  For example, one key pair can
+   be used to support confidentiality, while a different key pair can be
+   used for digital signatures.
+
+
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 37]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+   If a sending agent is sending the same message using different
+   strengths of cryptography, an attacker watching the communications
+   channel might be able to determine the contents of the strongly
+   encrypted message by decrypting the weakly encrypted version.  In
+   other words, a sender SHOULD NOT send a copy of a message using
+   weaker cryptography than they would use for the original of the
+   message.
+
+   Modification of the ciphertext can go undetected if authentication is
+   not also used, which is the case when sending EnvelopedData without
+   wrapping it in SignedData or enclosing SignedData within it.
+
+   If an implementation is concerned about compliance with National
+   Institute of Standards and Technology (NIST) key size
+   recommendations, then see [SP800-57].
+
+   If messaging environments make use of the fact that a message is
+   signed to change the behavior of message processing (examples would
+   be running rules or UI display hints), without first verifying that
+   the message is actually signed and knowing the state of the
+   signature, this can lead to incorrect handling of the message.
+   Visual indicators on messages may need to have the signature
+   validation code checked periodically if the indicator is supposed to
+   give information on the current status of a message.
+
+7.  References
+
+7.1.  Reference Conventions
+
+   [CMS] refers to [RFC5652].
+
+   [ESS] refers to [RFC2634] and [RFC5035].
+
+   [MIME] refers to [RFC2045], [RFC2046],  [RFC2047], [RFC2049],
+   [RFC4288], and [RFC4289].
+
+   [SMIMEv2] refers to [RFC2311], [RFC2312], [RFC2313], [RFC2314], and
+   [RFC2315].
+
+   [SMIMEv3] refers to [RFC2630], [RFC2631], [RFC2632], [RFC2633],
+   [RFC2634], and [RFC5035].
+
+   [SMIMv3.1] refers to [RFC2634], [RFC3850], [RFC3851], [RFC3852], and
+   [RFC5035].
+
+
+
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 38]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+7.2.  Normative References
+
+   [CERT32]      Ramsdell, B. and S. Turner, "Secure/Multipurpose
+                 Internet Mail Extensions (S/MIME) Version 3.2
+                 Certificate Handling", RFC 5750, January 2010.
+
+   [CHARSETS]    Character sets assigned by IANA.  See
+                 http://www.iana.org/assignments/character-sets.
+
+   [CMSAES]      Schaad, J., "Use of the Advanced Encryption Standard
+                 (AES) Encryption Algorithm in Cryptographic Message
+                 Syntax (CMS)", RFC 3565, July 2003.
+
+   [CMSALG]      Housley, R., "Cryptographic Message Syntax (CMS)
+                 Algorithms", RFC 3370, August 2002.
+
+   [CMSCOMPR]    Gutmann, P., "Compressed Data Content Type for
+                 Cryptographic Message Syntax (CMS)", RFC 3274, June
+                 2002.
+
+   [CMS-SHA2]    Turner, S., "Using SHA2 Algorithms with Cryptographic
+                 Message Syntax", RFC 5754, January 2010.
+
+   [CONTDISP]    Troost, R., Dorner, S., and K. Moore, Ed.,
+                 "Communicating Presentation Information in Internet
+                 Messages: The Content-Disposition Header Field", RFC
+                 2183, August 1997.
+
+   [FIPS186-2]   National Institute of Standards and Technology (NIST),
+                 "Digital Signature Standard (DSS)", FIPS Publication
+                 186-2, January 2000. [With Change Notice 1].
+
+   [FIPS186-3]   National Institute of Standards and Technology (NIST),
+                 FIPS Publication 186-3: Digital Signature Standard,
+                 June 2009.
+
+   [MIME-SECURE] Galvin, J., Murphy, S., Crocker, S., and N. Freed,
+                 "Security Multiparts for MIME: Multipart/Signed and
+                 Multipart/Encrypted", RFC 1847, October 1995.
+
+   [MUSTSHOULD]  Bradner, S., "Key words for use in RFCs to Indicate
+                 Requirement Levels", BCP 14, RFC 2119, March 1997.
+
+   [RANDOM]      Eastlake, D., 3rd, Schiller, J., and S. Crocker,
+                 "Randomness Requirements for Security", BCP 106, RFC
+                 4086, June 2005.
+
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 39]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+   [RFC2045]     Freed, N. and N. Borenstein, "Multipurpose Internet
+                 Mail Extensions (MIME) Part One: Format of Internet
+                 Message Bodies", RFC 2045, November 1996.
+
+   [RFC2046]     Freed, N. and N. Borenstein, "Multipurpose Internet
+                 Mail Extensions (MIME) Part Two: Media Types", RFC
+                 2046, November 1996.
+
+   [RFC2047]     Moore, K., "MIME (Multipurpose Internet Mail
+                 Extensions) Part Three: Message Header Extensions for
+                 Non-ASCII Text", RFC 2047, November 1996.
+
+   [RFC2049]     Freed, N. and N. Borenstein, "Multipurpose Internet
+                 Mail Extensions (MIME) Part Five: Conformance Criteria
+                 and Examples", RFC 2049, November 1996.
+
+   [RFC2634]     Hoffman, P. Ed., "Enhanced Security Services for
+                 S/MIME", RFC 2634, June 1999.
+
+   [RFC4288]     Freed, N. and J. Klensin, "Media Type Specifications
+                 and Registration Procedures", BCP 13, RFC 4288,
+                 December 2005.
+
+   [RFC4289]     Freed, N. and J. Klensin, "Multipurpose Internet Mail
+                 Extensions (MIME) Part Four: Registration Procedures",
+                 BCP 13, RFC 4289, December 2005.
+
+   [RFC5035]     Schaad, J., "Enhanced Security Services (ESS) Update:
+                 Adding CertID Algorithm Agility", RFC 5035, August
+                 2007.
+
+   [RFC5652]     Housley, R., "Cryptographic Message Syntax (CMS)", RFC
+                 5652, September 2009.
+
+   [RSAOAEP]     Housley, R. "Use of the RSAES-OAEP Key Transport
+                 Algorithm in the Cryptographic Message Syntax (CMS)",
+                 RFC 3560, July 2003.
+
+   [RSAPSS]      Schaad, J., "Use of the RSASSA-PSS Signature Algorithm
+                 in Cryptographic Message Syntax (CMS)", RFC 4056, June
+                 2005.
+
+   [SP800-56A]   National Institute of Standards and Technology (NIST),
+                 Special Publication 800-56A: Recommendation Pair-Wise
+                 Key Establishment Schemes Using Discrete Logarithm
+                 Cryptography (Revised), March 2007.
+
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 40]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+   [X.680]       ITU-T Recommendation X.680 (2002) | ISO/IEC
+                 8824-1:2002. Information Technology - Abstract Syntax
+                 Notation One (ASN.1):  Specification of basic notation.
+
+   [X.690]       ITU-T Recommendation X.690 (2002) | ISO/IEC
+                 8825-1:2002.  Information Technology - ASN.1 encoding
+                 rules: Specification of Basic Encoding Rules (BER),
+                 Canonical Encoding Rules (CER) and Distinguished
+                 Encoding Rules (DER).
+
+7.3.  Informative References
+
+   [DHSUB]       Zuccherato, R., "Methods for Avoiding the "Small-
+                 Subgroup" Attacks on the Diffie-Hellman Key Agreement
+                 Method for S/MIME", RFC 2785, March 2000.
+
+   [HASH-ATTACK] Hoffman, P. and B. Schneier, "Attacks on Cryptographic
+                 Hashes in Internet Protocols", RFC 4270, November 2005.
+
+   [MMA]         Rescorla, E., "Preventing the Million Message Attack on
+                 Cryptographic Message Syntax", RFC 3218, January 2002.
+
+   [PKCS-7]      Kaliski, B., "PKCS #7: Cryptographic Message Syntax
+                 Version 1.5", RFC 2315, March 1998.
+
+   [RFC2311]     Dusse, S., Hoffman, P., Ramsdell, B., Lundblade, L.,
+                 and L. Repka, "S/MIME Version 2 Message Specification",
+                 RFC 2311, March 1998.
+
+   [RFC2312]     Dusse, S., Hoffman, P., Ramsdell, B., and J.
+                 Weinstein, "S/MIME Version 2 Certificate Handling", RFC
+                 2312, March 1998.
+
+   [RFC2313]     Kaliski, B., "PKCS #1: RSA Encryption Version 1.5", RFC
+                 2313, March 1998.
+
+   [RFC2314]     Kaliski, B., "PKCS #10: Certification Request Syntax
+                 Version 1.5", RFC 2314, March 1998.
+
+   [RFC2315]     Kaliski, B., "PKCS #7: Certification Message Syntax
+                 Version 1.5", RFC 2315, March 1998.
+
+   [RFC2630]     Housley, R., "Cryptographic Message Syntax", RFC 2630,
+                 June 1999.
+
+   [RFC2631]     Rescorla, E., "Diffie-Hellman Key Agreement Method",
+                 RFC 2631, June 1999.
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 41]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+   [RFC2632]     Ramsdell, B., Ed., "S/MIME Version 3 Certificate
+                 Handling", RFC 2632, June 1999.
+
+   [RFC2633]     Ramsdell, B., Ed., "S/MIME Version 3 Message
+                 Specification", RFC 2633, June 1999.
+
+   [RFC3850]     Ramsdell, B., Ed., "Secure/Multipurpose Internet Mail
+                 Extensions (S/MIME) Version 3.1 Certificate Handling",
+                 RFC 3850, July 2004.
+
+   [RFC3851]     Ramsdell, B., Ed., "Secure/Multipurpose Internet Mail
+                 Extensions (S/MIME) Version 3.1 Message Specification",
+                 RFC 3851, July 2004.
+
+   [RFC3852]     Housley, R., "Cryptographic Message Syntax (CMS)", RFC
+                 3852, July 2004.
+
+   [SP800-57]    National Institute of Standards and Technology (NIST),
+                 Special Publication 800-57: Recommendation for Key
+                 Management, August 2005.
+
+   [STRENGTH]    Orman, H., and P. Hoffman, "Determining Strengths For
+                 Public Keys Used For Exchanging Symmetric Keys", BCP
+                 86, RFC 3766, April 2004.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 42]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+Appendix A.  ASN.1 Module
+
+   Note: The ASN.1 module contained herein is unchanged from RFC 3851
+   [SMIMEv3.1] with the exception of a change to the prefersBinaryInside
+   ASN.1 comment.  This module uses the 1988 version of ASN.1.
+
+   SecureMimeMessageV3dot1
+
+     { iso(1) member-body(2) us(840) rsadsi(113549)
+            pkcs(1) pkcs-9(9) smime(16) modules(0) msg-v3dot1(21) }
+
+   DEFINITIONS IMPLICIT TAGS ::=
+
+   BEGIN
+
+   IMPORTS
+
+   -- Cryptographic Message Syntax [CMS]
+      SubjectKeyIdentifier, IssuerAndSerialNumber,
+      RecipientKeyIdentifier
+          FROM  CryptographicMessageSyntax
+                { iso(1) member-body(2) us(840) rsadsi(113549)
+                  pkcs(1) pkcs-9(9) smime(16) modules(0) cms-2001(14) };
+
+   --  id-aa is the arc with all new authenticated and unauthenticated
+   --  attributes produced by the S/MIME Working Group
+
+   id-aa OBJECT IDENTIFIER ::= {iso(1) member-body(2) usa(840)
+           rsadsi(113549) pkcs(1) pkcs-9(9) smime(16) attributes(2)}
+
+   -- S/MIME Capabilities provides a method of broadcasting the
+   -- symmetric capabilities understood.  Algorithms SHOULD be ordered
+   -- by preference and grouped by type
+
+   smimeCapabilities OBJECT IDENTIFIER ::= {iso(1) member-body(2)
+           us(840) rsadsi(113549) pkcs(1) pkcs-9(9) 15}
+
+   SMIMECapability ::= SEQUENCE {
+      capabilityID OBJECT IDENTIFIER,
+      parameters ANY DEFINED BY capabilityID OPTIONAL }
+
+   SMIMECapabilities ::= SEQUENCE OF SMIMECapability
+
+   -- Encryption Key Preference provides a method of broadcasting the
+   -- preferred encryption certificate.
+
+   id-aa-encrypKeyPref OBJECT IDENTIFIER ::= {id-aa 11}
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 43]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+   SMIMEEncryptionKeyPreference ::= CHOICE {
+      issuerAndSerialNumber   [0] IssuerAndSerialNumber,
+      receipentKeyId          [1] RecipientKeyIdentifier,
+      subjectAltKeyIdentifier [2] SubjectKeyIdentifier
+   }
+
+   -- receipentKeyId is spelt incorrectly, but kept for historical
+   -- reasons.
+
+   id-smime OBJECT IDENTIFIER ::= { iso(1) member-body(2) us(840)
+           rsadsi(113549) pkcs(1) pkcs9(9) 16 }
+
+   id-cap  OBJECT IDENTIFIER ::= { id-smime 11 }
+
+   -- The preferBinaryInside OID indicates an ability to receive
+   -- messages with binary encoding inside the CMS wrapper.
+   -- The preferBinaryInside attribute's value field is ABSENT.
+
+   id-cap-preferBinaryInside  OBJECT IDENTIFIER ::= { id-cap 1 }
+
+   --  The following list OIDs to be used with S/MIME V3
+
+   -- Signature Algorithms Not Found in [CMSALG], [CMS-SHA2], [RSAPSS],
+   -- and [RSAOAEP]
+
+   --
+   -- md2WithRSAEncryption OBJECT IDENTIFIER ::=
+   --    {iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-1(1)
+   --     2}
+
+   --
+   -- Other Signed Attributes
+   --
+   -- signingTime OBJECT IDENTIFIER ::=
+   --    {iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1) pkcs-9(9)
+   --     5}
+   --    See [CMS] for a description of how to encode the attribute
+   --    value.
+
+   SMIMECapabilitiesParametersForRC2CBC ::= INTEGER
+   --        (RC2 Key Length (number of bits))
+
+   END
+
+
+
+
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 44]
+
+RFC 5751            S/MIME 3.2 Message Specification        January 2010
+
+
+Appendix B.  Moving S/MIME v2 Message Specification to Historic Status
+
+   The S/MIME v3 [SMIMEv3], v3.1 [SMIMEv3.1], and v3.2 (this document)
+   are backwards compatible with the S/MIME v2 Message Specification
+   [SMIMEv2], with the exception of the algorithms (dropped RC2/40
+   requirement and added DSA and RSASSA-PSS requirements).  Therefore,
+   it is recommended that RFC 2311 [SMIMEv2] be moved to Historic
+   status.
+
+Appendix C.  Acknowledgments
+
+   Many thanks go out to the other authors of the S/MIME version 2
+   Message Specification RFC: Steve Dusse, Paul Hoffman, Laurence
+   Lundblade, and Lisa Repka.  Without v2, there wouldn't be a v3, v3.1,
+   or v3.2.
+
+   A number of the members of the S/MIME Working Group have also worked
+   very hard and contributed to this document.  Any list of people is
+   doomed to omission, and for that I apologize.  In alphabetical order,
+   the following people stand out in my mind because they made direct
+   contributions to this document:
+
+   Tony Capel, Piers Chivers, Dave Crocker, Bill Flanigan, Peter
+   Gutmann, Alfred Hoenes, Paul Hoffman, Russ Housley, William Ottaway,
+   John Pawling, and Jim Schaad.
+
+Authors' Addresses
+
+   Blake Ramsdell
+   Brute Squad Labs, Inc.
+
+   EMail: blaker@gmail.com
+
+
+   Sean Turner
+   IECA, Inc.
+   3057 Nutley Street, Suite 106
+   Fairfax, VA 22031
+   USA
+
+   EMail: turners@ieca.com
+
+
+
+
+
+
+
+
+
+
+Ramsdell & Turner            Standards Track                   [Page 45]
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/whats_where.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/whats_where.txt
new file mode 100644
index 000000000..201a5f72f
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/rfc/whats_where.txt
@@ -0,0 +1,90 @@
+RFC 1854:
+---------
+PIPELINING extension
+
+RFC 2222:
+---------
+SASL
+
+RFC 4505:
+---------
+ANYNONYMOUS SASL
+
+RFC 4616:
+---------
+PLAIN SASL
+
+RFC 2487:
+---------
+STARTTLS extension
+
+RFC 2554 & 4954:
+----------------
+AUTH extension
+
+RFC 2821:
+---------
+SMTP protocol
+
+RFC 2822:
+---------
+General message structure (focusing on important headers)
+
+RFC 2045:
+---------
+Quoted Printable Encoding
+Base 64 Encoding
+Detailed message structure
+
+RFC 2046:
+---------
+Media types (for subparts)
+
+RFC 2047:
+---------
+Header Encoding
+
+RFC 2183:
+---------
+The Content-Disposition header
+
+RFC 2231:
+---------
+Encoded Text header/attribute extensions
+
+RFC 2234:
+---------
+ABNF definitions
+
+RFC 3676:
+---------
+Flowed formatting/delsp parameters
+
+RFC 2015:
+---------
+Original Mime Security with OpenPGP
+
+RFC 2440:
+---------
+Original OpenPGP message format
+
+RFC 3156:
+---------
+Current (30/01/2009) Mime Security with OpenPGP
+
+RFC 4880:
+---------
+Current (30/01/2009) OpenPGP Message format revision (fun, it's exactly original *2 --sorry)
+
+RFC 5751:
+--------
+Secure/Multipurpose Internet Mail Extensions (S/MIME) Version 3.2
+
+RFC 4870:
+---------
+DomainKeys (historic), but still used by a few people.
+
+RFX 4871:
+---------
+DKIM
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/notes/smtp.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/smtp.txt
new file mode 100644
index 000000000..3f8047a93
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/notes/smtp.txt
@@ -0,0 +1,48 @@
+General Notes
+--------------
+ * MX is NOT required, but an A record, or CNAME to a MX MUST be present at the least.
+ * EHLO should be tried, then fall back to HELO
+ * The 250 return code from RCPT TO is not actually clear-cut. A 251 may be
+   returned if the message was forwarded to another address.  This could be a
+   useful indicator to end-users that an address should be updated.
+ * RCPT TO can accpet just "postmaster" without a domain name
+ * Server MUST not close connection before:
+   - QUIT and returning 221 response
+   - Forced requirement, and only after returning a 421 response
+   - Clients expriencing a forced connection closure, without prior warning should
+     just treat it like a 451 closure regardless
+ * ALWAYS use blocking sockets for the initial connection (this should prevent
+   Exim4's whining about sync).
+
+Response codes
+--------------
+ * From RFC2821, 4.2.
+   - In particular, the 220, 221, 251, 421, and 551 reply codes
+     are associated with message text that must be parsed and interpreted
+     by machines.
+
+Error Codes
+------------
+ * Numeric 5yz = Error
+   - 550/RCPT TO = Relay denied
+   - 500 = Unknown command
+ * Numeric 2yz = Normal
+ * Numeric 4yz = Temporary failure??
+
+<?php
+
+class EsmtpTransport implements Transport, EsmtpCommandWriter {
+}
+
+interface EsmtpCommandWriter {
+  public function getBuffer();
+  public function executeCommand($command, $expectedCodes);
+}
+
+interface Extension {
+  public function getKeyword();
+  public function afterEhlo($commandWriter);
+  public function getRcptParams();
+  public function getMailParams();
+  public function atCommand($commandWriter, $command, $expectedResponse) throws CommandSentException;
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/phpunit.xml.dist b/lib/vendor/symfony/lib/vendor/swiftmailer/phpunit.xml.dist
new file mode 100644
index 000000000..0d3e698ed
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/phpunit.xml.dist
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false"
+         bootstrap="tests/bootstrap.php"
+>
+    <php>
+        <ini name="intl.default_locale" value="en"/>
+        <ini name="intl.error_level" value="0"/>
+        <ini name="memory_limit" value="-1"/>
+    </php>
+
+    <testsuites>
+        <testsuite name="SwiftMailer unit tests">
+            <directory>tests/unit</directory>
+        </testsuite>
+        <testsuite name="SwiftMailer acceptance tests">
+            <directory>tests/acceptance</directory>
+        </testsuite>
+        <testsuite name="SwiftMailer bug">
+            <directory>tests/bug</directory>
+        </testsuite>
+        <testsuite name="SwiftMailer smoke tests">
+            <directory>tests/smoke</directory>
+        </testsuite>
+    </testsuites>
+
+    <listeners>
+        <listener class="Mockery\Adapter\Phpunit\TestListener"/>
+    </listeners>
+</phpunit>
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/swift_init.php b/lib/vendor/symfony/lib/vendor/swiftmailer/swift_init.php
deleted file mode 100644
index fe624a9d2..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/swift_init.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/*
- * Dependency injection initialization for Swift Mailer.
- */
-
-//Load in dependency maps
-require_once dirname(__FILE__) . '/dependency_maps/cache_deps.php';
-require_once dirname(__FILE__) . '/dependency_maps/mime_deps.php';
-require_once dirname(__FILE__) . '/dependency_maps/transport_deps.php';
-
-//Load in global library preferences
-require_once dirname(__FILE__) . '/preferences.php';
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/swift_required.php b/lib/vendor/symfony/lib/vendor/swiftmailer/swift_required.php
deleted file mode 100644
index ad1a4ad5a..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/swift_required.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/*
- * Autoloader and dependency injection initialization for Swift Mailer.
- */
-
-//Load Swift utility class
-require_once dirname(__FILE__) . '/classes/Swift.php';
-
-//Start the autoloader
-Swift::registerAutoload();
-
-//Load the init script to set up dependency injection
-require_once dirname(__FILE__) . '/swift_init.php';
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/swift_required_pear.php b/lib/vendor/symfony/lib/vendor/swiftmailer/swift_required_pear.php
deleted file mode 100644
index 20a615974..000000000
--- a/lib/vendor/symfony/lib/vendor/swiftmailer/swift_required_pear.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/*
- * Autoloader and dependency injection initialization for Swift Mailer.
- */
-
-//Load Swift utility class
-require_once dirname(__FILE__) . '/Swift.php';
-
-//Start the autoloader
-Swift::registerAutoload();
-
-//Load the init script to set up dependency injection
-require_once dirname(__FILE__) . '/swift_init.php';
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/IdenticalBinaryConstraint.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/IdenticalBinaryConstraint.php
new file mode 100644
index 000000000..069d11ab7
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/IdenticalBinaryConstraint.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * A binary safe string comparison.
+ *
+ * @author Chris Corbyn
+ */
+class IdenticalBinaryConstraint extends \PHPUnit_Framework_Constraint
+{
+    protected $value;
+
+    public function __construct($value)
+    {
+        $this->value = $value;
+    }
+
+    /**
+     * Evaluates the constraint for parameter $other. Returns TRUE if the
+     * constraint is met, FALSE otherwise.
+     *
+     * @param mixed $other Value or object to evaluate.
+     *
+     * @return bool
+     */
+    public function matches($other)
+    {
+        $aHex = $this->asHexString($this->value);
+        $bHex = $this->asHexString($other);
+
+        return $aHex === $bHex;
+    }
+
+    /**
+     * Returns a string representation of the constraint.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'indentical binary';
+    }
+
+    /**
+     * Get the given string of bytes as a stirng of Hexadecimal sequences.
+     *
+     * @param string $binary
+     *
+     * @return string
+     */
+    private function asHexString($binary)
+    {
+        $hex = '';
+
+        $bytes = unpack('H*', $binary);
+
+        foreach ($bytes as &$byte) {
+            $byte = strtoupper($byte);
+        }
+
+        return implode('', $bytes);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/StreamCollector.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/StreamCollector.php
new file mode 100644
index 000000000..7f079d983
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/StreamCollector.php
@@ -0,0 +1,11 @@
+<?php
+
+class Swift_StreamCollector
+{
+    public $content = '';
+
+    public function __invoke($arg)
+    {
+        $this->content .= $arg;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/SwiftMailerSmokeTestCase.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/SwiftMailerSmokeTestCase.php
new file mode 100644
index 000000000..21d89e83b
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/SwiftMailerSmokeTestCase.php
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * Base test for smoke tests.
+ *
+ * @author Rouven Weßling
+ */
+class SwiftMailerSmokeTestCase extends SwiftMailerTestCase
+{
+    public function setUp()
+    {
+        if (!defined('SWIFT_SMOKE_TRANSPORT_TYPE')) {
+            $this->markTestSkipped(
+                'Smoke tests are skipped if tests/smoke.conf.php is not edited'
+             );
+        }
+    }
+
+    protected function _getMailer()
+    {
+        switch (SWIFT_SMOKE_TRANSPORT_TYPE) {
+            case 'smtp':
+                $transport = Swift_DependencyContainer::getInstance()->lookup('transport.smtp')
+                    ->setHost(SWIFT_SMOKE_SMTP_HOST)
+                    ->setPort(SWIFT_SMOKE_SMTP_PORT)
+                    ->setUsername(SWIFT_SMOKE_SMTP_USER)
+                    ->setPassword(SWIFT_SMOKE_SMTP_PASS)
+                    ->setEncryption(SWIFT_SMOKE_SMTP_ENCRYPTION)
+                    ;
+                break;
+            case 'sendmail':
+                $transport = Swift_DependencyContainer::getInstance()->lookup('transport.sendmail')
+                    ->setCommand(SWIFT_SMOKE_SENDMAIL_COMMAND)
+                    ;
+                break;
+            case 'mail':
+            case 'nativemail':
+                $transport = Swift_DependencyContainer::getInstance()->lookup('transport.mail');
+                break;
+            default:
+                throw new Exception('Undefined transport ['.SWIFT_SMOKE_TRANSPORT_TYPE.']');
+        }
+
+        return new Swift_Mailer($transport);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/SwiftMailerTestCase.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/SwiftMailerTestCase.php
new file mode 100644
index 000000000..f0e27361c
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/SwiftMailerTestCase.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * A base test case with some custom expectations.
+ *
+ * @author Rouven Weßling
+ */
+class SwiftMailerTestCase extends \PHPUnit_Framework_TestCase
+{
+    public static function regExp($pattern)
+    {
+        if (!is_string($pattern)) {
+            throw PHPUnit_Util_InvalidArgumentHelper::factory(1, 'string');
+        }
+
+        return new PHPUnit_Framework_Constraint_PCREMatch($pattern);
+    }
+
+    public function assertIdenticalBinary($expected, $actual, $message = '')
+    {
+        $constraint = new IdenticalBinaryConstraint($expected);
+        self::assertThat($actual, $constraint, $message);
+    }
+
+    protected function tearDown()
+    {
+        \Mockery::close();
+    }
+
+    protected function getMockery($class)
+    {
+        return \Mockery::mock($class);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/charsets/iso-2022-jp/one.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/charsets/iso-2022-jp/one.txt
new file mode 100644
index 000000000..c2923deb9
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/charsets/iso-2022-jp/one.txt
@@ -0,0 +1,11 @@
+ISO-2022-JPは、インターネット上(特に電子メール)などで使われる日本の文字用の文字符号化方式。ISO/IEC 2022のエスケープシーケンスを利用して文字集合を切り替える7ビットのコードであることを特徴とする (アナウンス機能のエスケープシーケンスは省略される)。俗に「JISコード」と呼ばれることもある。
+
+概要
+日本語表記への利用が想定されている文字コードであり、日本語の利用されるネットワークにおいて、日本の規格を応用したものである。また文字集合としては、日本語で用いられる漢字、ひらがな、カタカナはもちろん、ラテン文字、ギリシア文字、キリル文字なども含んでおり、学術や産業の分野での利用も考慮たものとなっている。規格名に、ISOの日本語の言語コードであるjaではなく、国・地域名コードのJPが示されているゆえんである。
+文字集合としてJIS X 0201のC0集合（制御文字）、JIS X 0201のラテン文字集合、ISO 646の国際基準版図形文字、JIS X 0208の1978年版（JIS C 6226-1978）と1983年および1990年版が利用できる。JIS X 0201の片仮名文字集合は利用できない。1986年以降、日本の電子メールで用いられてきたJUNETコードを、村井純・Mark Crispin・Erik van der Poelが1993年にRFC化したもの(RFC 1468)。後にJIS X 0208:1997の附属書2としてJISに規定された。MIMEにおける文字符号化方式の識別用の名前として IANA に登録されている。
+なお、符号化の仕様についてはISO/IEC 2022#ISO-2022-JPも参照。
+
+ISO-2022-JPと非標準的拡張使用
+「JISコード」（または「ISO-2022-JP」）というコード名の規定下では、その仕様通りの使用が求められる。しかし、Windows OS上では、実際にはCP932コード (MicrosoftによるShift JISを拡張した亜種。ISO-2022-JP規定外文字が追加されている。）による独自拡張（の文字）を断りなく使うアプリケーションが多い。この例としてInternet ExplorerやOutlook Expressがある。また、EmEditor、秀丸エディタやThunderbirdのようなMicrosoft社以外のWindowsアプリケーションでも同様の場合がある。この場合、ISO-2022-JPの範囲外の文字を使ってしまうと、異なる製品間では未定義不明文字として認識されるか、もしくは文字化けを起こす原因となる。そのため、Windows用の電子メールクライアントであっても独自拡張の文字を使用すると警告を出したり、あえて使えないように制限しているものも存在する。さらにはISO-2022-JPの範囲内であってもCP932は非標準文字（FULLWIDTH TILDE等）を持つので文字化けの原因になり得る。
+また、符号化方式名をISO-2022-JPとしているのに、文字集合としてはJIS X 0212 (いわゆる補助漢字) やJIS X 0201の片仮名文字集合 (いわゆる半角カナ) をも符号化している例があるが、ISO-2022-JPではこれらの文字を許容していない。これらの符号化は独自拡張の実装であり、中にはISO/IEC 2022の仕様に準拠すらしていないものもある[2]。従って受信側の電子メールクライアントがこれらの独自拡張に対応していない場合、その文字あるいはその文字を含む行、時にはテキスト全体が文字化けすることがある。
+
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/charsets/iso-8859-1/one.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/charsets/iso-8859-1/one.txt
new file mode 100644
index 000000000..3101178af
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/charsets/iso-8859-1/one.txt
@@ -0,0 +1,19 @@
+Op mat eraus hinnen beschte, rou zënne schaddreg ké. Ké sin Eisen Kaffi prächteg, den haut esou Fielse wa, Well zielen d'Welt am dir. Aus grousse rëschten d'Stroos do, as dat Kléder gewëss d'Kàchen. Schied gehéiert d'Vioule net hu, rou ke zënter Säiten d'Hierz. Ze eise Fletschen mat, gei as gréng d'Lëtzebuerger. Wäit räich no mat.
+
+Säiten d'Liewen aus en. Un gëtt bléit lossen wee, da wéi alle weisen Kolrettchen. Et deser d'Pan d'Kirmes vun, en wuel Benn rëschten méi. En get drem ménger beschte, da wär Stad welle. Nun Dach d'Pied do, mä gét ruffen gehéiert. Ze onser ugedon fir, d'Liewen Plett'len ech no, si Räis wielen bereet wat. Iwer spilt fir jo.
+
+An hin däischter Margréitchen, eng ke Frot brommt, vu den Räis néierens. Da hir Hunn Frot nozegon, rout Fläiß Himmel zum si, net gutt Kaffi Gesträich fu. Vill lait Gaart sou wa, Land Mamm Schuebersonndeg rei do. Gei geet Minutt en, gei d'Leit beschte Kolrettchen et, Mamm fergiess un hun.
+
+Et gutt Heck kommen oft, Lann rëscht rei um, Hunn rëscht schéinste ke der. En lait zielen schnéiwäiss hir, fu rou botze éiweg Minutt, rem fest gudden schaddreg en. Noper bereet Margréitchen mat op, dem denkt d'Leit d'Vioule no, oft ké Himmel Hämmel. En denkt blénken Fréijor net, Gart Schiet d'Natur no wou. No hin Ierd Frot d'Kirmes. Hire aremt un rou, ké den éiweg wielen Milliounen.
+
+Mir si Hunn Blénkeg. Ké get ston derfir d'Kàchen. Haut d'Pan fu ons, dé frou löschteg d'Meereische rei. Sou op wuel Léift. Stret schlon grousse gin hu. Mä denkt d'Leit hinnen net, ké gét haut fort rëscht.
+
+Koum d'Pan hannendrun ass ké, ké den brét Kaffi geplot. Schéi Hären d'Pied fu gét, do d'Mier néierens bei. Rëm päift Hämmel am, wee Engel beschéngt mä. Brommt klinzecht der ke, wa rout jeitzt dén. Get Zalot d'Vioule däischter da, jo fir Bänk päift duerch, bei d'Beem schéinen Plett'len jo. Den haut Faarwen ze, eng en Biereg Kirmesdag, um sin alles Faarwen d'Vioule.
+
+Eng Hunn Schied et, wat wa Frot fest gebotzt. Bei jo bleiwe ruffen Klarinett. Un Feld klinzecht gét, rifft Margréitchen rem ke. Mir dé Noper duurch gewëss, ston sech kille sin en. Gei Stret d'Wise um, Haus Gart wee as. Monn ménger an blo, wat da Gart gefällt Hämmelsbrot.
+
+Brommt geplot och ze, dat wa Räis Well Kaffi. Do get spilt prächteg, as wär kille bleiwe gewalteg. Onser frësch Margréitchen rem ke, blo en huet ugedon. Onser Hemecht wär de, hu eraus d'Sonn dat, eise deser hannendrun da och.
+
+As durch Himmel hun, no fest iw'rem schéinste mir, Hunn séngt Hierz ke zum. Séngt iw'rem d'Natur zum an. Ke wär gutt Grénge. Kënnt gudden prächteg mä rei. Dé dir Blénkeg Klarinett Kolrettchen, da fort muerges d'Kanner wou, main Feld ruffen vu wéi. Da gin esou Zalot gewalteg, gét vill Hemecht blénken dé.
+
+Haut gréng nun et, nei vu Bass gréng d'Gaassen. Fest d'Beem uechter si gin. Oft vu sinn wellen kréien. Et ass lait Zalot schéinen.
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/charsets/utf-8/one.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/charsets/utf-8/one.txt
new file mode 100644
index 000000000..26c94d5d2
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/charsets/utf-8/one.txt
@@ -0,0 +1,22 @@
+Код одно гринспана руководишь на. Его вы знания движение. Ты две начать
+одиночку, сказать основатель удовольствием но миф. Бы какие система тем.
+Полностью использует три мы, человек клоунов те нас, бы давать творческую
+эзотерическая шеф.
+
+Мог не помнить никакого сэкономленного, две либо какие пишите бы. Должен
+компанию кто те, этот заключалась проектировщик не ты. Глупые периоды ты
+для. Вам который хороший он. Те любых кремния концентрируются мог,
+собирать принадлежите без вы.
+
+Джоэла меньше хорошего вы миф, за тем году разработки. Даже управляющим
+руководители был не. Три коде выпускать заботиться ну. То его система
+удовольствием безостановочно, или ты главной процессорах. Мы без джоэл
+знания получат, статьи остальные мы ещё.
+
+Них русском касается поскольку по, образование должником
+систематизированный ну мои. Прийти кандидата университет но нас, для бы
+должны никакого, биг многие причин интервьюирования за.
+
+Тем до плиту почему. Вот учёт такие одного бы, об биг разным внешних
+промежуток. Вас до какому возможностей безответственный, были погодите бы
+его, по них глупые долгий количества.
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/charsets/utf-8/three.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/charsets/utf-8/three.txt
new file mode 100644
index 000000000..c81ccd598
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/charsets/utf-8/three.txt
@@ -0,0 +1,45 @@
+Αν ήδη διάβασε γλιτώσει μεταγλωτίσει, αυτήν θυμάμαι μου μα. Την κατάσταση χρησιμοποίησέ να! Τα διαφορά φαινόμενο διολισθήσεις πες, υψηλότερη προκαλείς περισσότερες όχι κι. Με ελέγχου γίνεται σας, μικρής δημιουργούν τη του. Τις τα γράψει εικόνες απαράδεκτη?
+
+Να ότι πρώτοι απαραίτητο. Άμεση πετάνε κακόκεφος τον ώς, να χώρου πιθανότητες του. Το μέχρι ορίστε λιγότερους σας. Πω ναί φυσικά εικόνες.
+
+Μου οι κώδικα αποκλειστικούς, λες το μάλλον συνεχώς. Νέου σημεία απίστευτα σας μα. Χρόνου μεταγλωτιστής σε νέα, τη τις πιάνει μπορούσες προγραμματιστές. Των κάνε βγαίνει εντυπωσιακό τα? Κρατάει τεσσαρών δυστυχώς της κι, ήδη υψηλότερη εξακολουθεί τα?
+
+Ώρα πετάνε μπορούσε λιγότερους αν, τα απαράδεκτη συγχωνευτεί ροή. Τη έγραψες συνηθίζουν σαν. Όλα με υλικό στήλες χειρότερα. Ανώδυνη δουλέψει επί ως, αν διαδίκτυο εσωτερικών παράγοντες από. Κεντρικό επιτυχία πες το.
+
+Πω ναι λέει τελειώσει, έξι ως έργων τελειώσει. Με αρχεία βουτήξουν ανταγωνιστής ώρα, πολύ γραφικά σελίδων τα στη. Όρο οέλεγχος δημιουργούν δε, ας θέλεις ελέγχου συντακτικό όρο! Της θυμάμαι επιδιόρθωση τα. Για μπορούσε περισσότερο αν, μέγιστη σημαίνει αποφάσισε τα του, άτομο αποτελέσει τι στα.
+
+Τι στην αφήσεις διοίκηση στη. Τα εσφαλμένη δημιουργια επιχείριση έξι! Βήμα μαγικά εκτελέσει ανά τη. Όλη αφήσεις συνεχώς εμπορικά αν, το λες κόλπα επιτυχία. Ότι οι ζώνη κειμένων. Όρο κι ρωτάει γραμμής πελάτες, τελειώσει διολισθήσεις καθυστερούσε αν εγώ? Τι πετούν διοίκηση προβλήματα ήδη.
+
+Τη γλιτώσει αποθηκευτικού μια. Πω έξι δημιουργια πιθανότητες, ως πέντε ελέγχους εκτελείται λες. Πως ερωτήσεις διοικητικό συγκεντρωμένοι οι, ας συνεχώς διοικητικό αποστηθίσει σαν. Δε πρώτες συνεχώς διολισθήσεις έχω, από τι κανένας βουτήξουν, γειτονιάς προσεκτικά ανταγωνιστής κι σαν.
+
+Δημιουργια συνηθίζουν κλπ τι? Όχι ποσοστό διακοπής κι. Κλπ φακέλους δεδομένη εξοργιστικά θα? Υποψήφιο καθορίζουν με όλη, στα πήρε προσοχή εταιρείες πω, ώς τον συνάδελφος διοικητικό δημιουργήσεις! Δούλευε επιτίθενται σας θα, με ένας παραγωγικής ένα, να ναι σημεία μέγιστη απαράδεκτη?
+
+Σας τεσσαρών συνεντεύξης τη, αρπάζεις σίγουρος μη για', επί τοπικές εντολές ακούσει θα? Ως δυστυχής μεταγλωτιστής όλη, να την είχαν σφάλμα απαραίτητο! Μην ώς άτομο διορθώσει χρησιμοποιούνταν. Δεν τα κόλπα πετάξαμε, μη που άγχος υόρκη άμεση, αφού δυστυχώς διακόψουμε όρο αν! Όλη μαγικά πετάνε επιδιορθώσεις δε, ροή φυσικά αποτελέσει πω.
+
+Άπειρα παραπάνω φαινόμενο πω ώρα, σαν πόρτες κρατήσουν συνηθίζουν ως. Κι ώρα τρέξει είχαμε εφαρμογή. Απλό σχεδιαστής μεταγλωτιστής ας επί, τις τα όταν έγραψες γραμμής? Όλα κάνεις συνάδελφος εργαζόμενοι θα, χαρτιού χαμηλός τα ροή. Ως ναι όροφο έρθει, μην πελάτες αποφάσισε μεταφραστής με, να βιαστικά εκδόσεις αναζήτησης λες. Των φταίει εκθέσεις προσπαθήσεις οι, σπίτι αποστηθίσει ας λες?
+
+Ώς που υπηρεσία απαραίτητο δημιουργείς. Μη άρα χαρά καθώς νύχτας, πω ματ μπουν είχαν. Άμεση δημιουργείς ώς ροή, γράψει γραμμής σίγουρος στα τι! Αν αφού πρώτοι εργαζόμενων ναί.
+
+Άμεση διορθώσεις με δύο? Έχουν παράδειγμα των θα, μου έρθει θυμάμαι περισσότερο το. Ότι θα αφού χρειάζονται περισσότερες. Σαν συνεχώς περίπου οι.
+
+Ώς πρώτης πετάξαμε λες, όρο κι πρώτες ζητήσεις δυστυχής. Ανά χρόνου διακοπή επιχειρηματίες ας, ώς μόλις άτομο χειρότερα όρο, κρατάει σχεδιαστής προσπαθήσεις νέο το. Πουλάς προσθέσει όλη πω, τύπου χαρακτηριστικό εγώ σε, πω πιο δούλευε αναζήτησης? Αναφορά δίνοντας σαν μη, μάθε δεδομένη εσωτερικών με ναι, αναφέρονται περιβάλλοντος ώρα αν. Και λέει απόλαυσε τα, που το όροφο προσπαθούν?
+
+Πάντα χρόνου χρήματα ναι το, σαν σωστά θυμάμαι σκεφτείς τα. Μα αποτελέσει ανεπιθύμητη την, πιο το τέτοιο ατόμου, τη των τρόπο εργαλείων επιδιόρθωσης. Περιβάλλον παραγωγικής σου κι, κλπ οι τύπου κακόκεφους αποστηθίσει, δε των πλέον τρόποι. Πιθανότητες χαρακτηριστικών σας κι, γραφικά δημιουργήσεις μια οι, πω πολλοί εξαρτάται προσεκτικά εδώ. Σταματάς παράγοντες για' ώς, στις ρωτάει το ναι! Καρέκλα ζητήσεις συνδυασμούς τη ήδη!
+
+Για μαγικά συνεχώς ακούσει το. Σταματάς προϊόντα βουτήξουν ώς ροή. Είχαν πρώτες οι ναι, μα λες αποστηθίσει ανακαλύπτεις. Όροφο άλγεβρα παραπάνω εδώ τη, πρόσληψη λαμβάνουν καταλάθος ήδη ας? Ως και εισαγωγή κρατήσουν, ένας κακόκεφους κι μας, όχι κώδικάς παίξουν πω. Πω νέα κρατάει εκφράσουν, τότε τελικών τη όχι, ας της τρέξει αλλάζοντας αποκλειστικούς.
+
+Ένας βιβλίο σε άρα, ναι ως γράψει ταξινομεί διορθώσεις! Εδώ να γεγονός συγγραφείς, ώς ήδη διακόψουμε επιχειρηματίες? Ότι πακέτων εσφαλμένη κι, θα όρο κόλπα παραγωγικής? Αν έχω κεντρικό υψηλότερη, κι δεν ίδιο πετάνε παρατηρούμενη! Που λοιπόν σημαντικό μα, προκαλείς χειροκροτήματα ως όλα, μα επί κόλπα άγχος γραμμές! Δε σου κάνεις βουτήξουν, μη έργων επενδυτής χρησιμοποίησέ στα, ως του πρώτες διάσημα σημαντικό.
+
+Βιβλίο τεράστιο προκύπτουν σαν το, σαν τρόπο επιδιόρθωση ας. Είχαν προσοχή προσπάθεια κι ματ, εδώ ως έτσι σελίδων συζήτηση. Και στην βγαίνει εσφαλμένη με, δυστυχής παράδειγμα δε μας, από σε υόρκη επιδιόρθωσης. Νέα πω νέου πιθανό, στήλες συγγραφείς μπαίνοντας μα για', το ρωτήσει κακόκεφους της? Μου σε αρέσει συγγραφής συγχωνευτεί, μη μου υόρκη ξέχασε διακοπής! Ώς επί αποφάσισε αποκλειστικούς χρησιμοποιώντας, χρήματα σελίδων ταξινομεί ναι με.
+
+Μη ανά γραμμή απόλαυσε, πω ναι μάτσο διασφαλίζεται. Τη έξι μόλις εργάστηκε δημιουργούν, έκδοση αναφορά δυσκολότερο οι νέο. Σας ως μπορούσε παράδειγμα, αν ότι δούλευε μπορούσε αποκλειστικούς, πιο λέει βουτήξουν διορθώσει ως. Έχω τελευταία κακόκεφους ας, όσο εργαζόμενων δημιουργήσεις τα.
+
+Του αν δουλέψει μπορούσε, πετούν χαμηλός εδώ ας? Κύκλο τύπους με που, δεν σε έχουν συνεχώς χειρότερα, τις τι απαράδεκτη συνηθίζουν? Θα μην τους αυτήν, τη ένα πήρε πακέτων, κι προκύπτουν περιβάλλον πως. Μα για δουλέψει απόλαυσε εφαμοργής, ώς εδώ σημαίνει μπορούσες, άμεση ακούσει προσοχή τη εδώ?
+
+Στα δώσε αθόρυβες λιγότερους οι, δε αναγκάζονται αποκλειστικούς όλα! Ας μπουν διοικητικό μια, πάντα ελέγχου διορθώσεις ώς τον. Ότι πήρε κανόνα μα. Που άτομα κάνεις δημιουργίες τα, οι μας αφού κόλπα προγραμματιστής, αφού ωραίο προκύπτουν στα ως. Θέμα χρησιμοποιήσει αν όλα, του τα άλγεβρα σελίδων. Τα ότι ανώδυνη δυστυχώς συνδυασμούς, μας οι πάντα γνωρίζουμε ανταγωνιστής, όχι τα δοκιμάσεις σχεδιαστής! Στην συνεντεύξης επιδιόρθωση πιο τα, μα από πουλάς περιβάλλον παραγωγικής.
+
+Έχουν μεταγλωτίσει σε σας, σε πάντα πρώτης μειώσει των, γράψει ρουτίνα δυσκολότερο ήδη μα? Ταξινομεί διορθώσεις να μας. Θα της προσπαθούν περιεχόμενα, δε έχω τοπικές στέλνοντάς. Ανά δε αλφα άμεση, κάποιο ρωτάει γνωρίζουμε πω στη, φράση μαγικά συνέχεια δε δύο! Αν είχαμε μειώσει ροή, μας μετράει καθυστερούσε επιδιορθώσεις μη. Χάος υόρκη κεντρικό έχω σε, ανά περίπου αναγκάζονται πω.
+
+Όσο επιστρέφουν χρονοδιαγράμματα μη. Πως ωραίο κακόκεφος διαχειριστής ως, τις να διακοπής αναζήτησης. Κάποιο ποσοστό ταξινομεί επί τη? Μάθε άμεση αλλάζοντας δύο με, μου νέου πάντα να.
+
+Πω του δυστυχώς πιθανότητες. Κι ρωτάει υψηλότερη δημιουργια ότι, πω εισαγωγή τελευταία απομόνωση ναι. Των ζητήσεις γνωρίζουμε ώς? Για' μη παραδοτέου αναφέρονται! Ύψος παραγωγικά ροή ως, φυσικά διάβασε εικόνες όσο σε? Δεν υόρκη διορθώσεις επεξεργασία θα, ως μέση σύστημα χρησιμοποιήσει τις.
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/charsets/utf-8/two.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/charsets/utf-8/two.txt
new file mode 100644
index 000000000..2443fc4d8
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/charsets/utf-8/two.txt
@@ -0,0 +1,3 @@
+रखति आवश्यकत प्रेरना मुख्यतह हिंदी किएलोग असक्षम कार्यलय करते विवरण किके मानसिक दिनांक पुर्व संसाध एवम् कुशलता अमितकुमार प्रोत्साहित जनित देखने उदेशीत विकसित बलवान ब्रौशर किएलोग विश्लेषण लोगो कैसे जागरुक प्रव्रुति प्रोत्साहित सदस्य आवश्यकत प्रसारन उपलब्धता अथवा हिंदी जनित दर्शाता यन्त्रालय बलवान अतित सहयोग शुरुआत सभीकुछ माहितीवानीज्य लिये खरिदे है।अभी एकत्रित सम्पर्क रिती मुश्किल प्राथमिक भेदनक्षमता विश्व उन्हे गटको द्वारा तकरीबन
+
+विश्व द्वारा व्याख्या सके। आजपर वातावरण व्याख्यान पहोच। हमारी कीसे प्राथमिक विचारशिलता पुर्व करती कम्प्युटर भेदनक्षमता लिये बलवान और्४५० यायेका वार्तालाप सुचना भारत शुरुआत लाभान्वित पढाए संस्था वर्णित मार्गदर्शन चुनने
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/dkim/dkim.test.priv b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/dkim/dkim.test.priv
new file mode 100644
index 000000000..3bd381a9c
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/dkim/dkim.test.priv
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDZeUdi1RKnm9cRYNn6E24xxrRTouh3Va8JOEHQ5SB018lvbjwH
+2lW5mZ/I0kh/dHsTN0zcN0VE62WIbnLreMk/af/4Pg1i93+c9TmfXmoropsmdLos
+w0tjq50jGbBqtHZNJYAokP/u3uUuRw8g0V/O4zlQ3GlO/PDH7xDQzekl9wIDAQAB
+AoGAaoCBXD5a72hbb/BNb7HaUlgscZUjYWW93bcGTGYZef8/b+m9Tl83gjhgzvlk
+db62k1eOtX3/11uskp78eqLhctv7yWc0mQQhgOogY2qCwHTCH8wja8kJkUAnKQhs
+P9sa5iJvgckiuX3SdxgTMwib9d1VyGq6YywiORiZF9rxyhECQQD/xhiZSi7y0ciB
+g4bassy0GVMS7EDRumMHc8wC23E1H2mj5yPE/QLqkW4ddmCv2BbJnYmyNvOaK9tk
+T2W+mn3/AkEA2aqDGja9CaTlY4BCXfiT166n+xVl5+d+1DENQ4FK9O2jpSi1265J
+tjEkXVxUOpV1ZEcUVOdK6RpvsKpc7vVICQJBALEFO5UsQJ4SD0GD9Ft8kCy9sj9Q
+f/Qnmc5YmIQJuKpZmVW07Y6yxcfu61U8zuIlHnBftiM/4Q18+RTN1s86QaUCQHoL
+9MTfCnH85q46/XuJZQRbp07O+bvlfqTl+CTwuyHImaiCwi2ydRxWQ6ihm4zZvuAC
+RvEwWz2HGDc73y4RlFkCQDDdnN9e46l1nMDLDI4cyyGBVg4Z2IZ3IAu5GaoUCGjM
+a8w6kxE8f1d8DD5vvqVbmfK89TA/DjT+7/arBNBCiCM=
+-----END RSA PRIVATE KEY-----
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/dkim/dkim.test.pub b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/dkim/dkim.test.pub
new file mode 100644
index 000000000..b503a9119
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/dkim/dkim.test.pub
@@ -0,0 +1,6 @@
+-----BEGIN PUBLIC KEY-----
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDZeUdi1RKnm9cRYNn6E24xxrRT
+ouh3Va8JOEHQ5SB018lvbjwH2lW5mZ/I0kh/dHsTN0zcN0VE62WIbnLreMk/af/4
+Pg1i93+c9TmfXmoropsmdLosw0tjq50jGbBqtHZNJYAokP/u3uUuRw8g0V/O4zlQ
+3GlO/PDH7xDQzekl9wIDAQAB
+-----END PUBLIC KEY-----
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/files/data.txt b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/files/data.txt
new file mode 100644
index 000000000..3f35021f1
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/files/data.txt
@@ -0,0 +1 @@
+<data>
\ No newline at end of file
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/files/swiftmailer.png b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/files/swiftmailer.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b95f619af1fcbed1fca382d22022bdf329849cf
GIT binary patch
literal 3194
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

literal 0
HcmV?d00001

diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/files/textfile.zip b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/files/textfile.zip
new file mode 100644
index 0000000000000000000000000000000000000000..5a580ecbf81ff98445bc5c6d0fce7a9a301f0e39
GIT binary patch
literal 202
zcmWIWW@h1HU}9ikII%0tqR&rhgC39#!aNM33?-=*C25&Csd^<9C7~gl49w;G_PK*_
zXax(ySH`c5AsLy)3P4nlSX82rpQezg5L}*_R-)jW2-H=iP-db~oSUDWs!)<zT%yMn
w;LXS+&Wy`CUZAB642(d$q!GkIwVV}Vd1wU#Lx49c8%O~o5V`~DTo8u=0JD!VkN^Mx

literal 0
HcmV?d00001

diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/CA.srl b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/CA.srl
new file mode 100644
index 000000000..dd9818abf
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/CA.srl
@@ -0,0 +1 @@
+D42DA34CF90FA0DE
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/ca.crt b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/ca.crt
new file mode 100644
index 000000000..695f81425
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/ca.crt
@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDazCCAlOgAwIBAgIJAKJCGQYLxWT1MA0GCSqGSIb3DQEBBQUAMEwxFzAVBgNV
+BAMMDlN3aWZ0bWFpbGVyIENBMRQwEgYDVQQKDAtTd2lmdG1haWxlcjEOMAwGA1UE
+BwwFUGFyaXMxCzAJBgNVBAYTAkZSMB4XDTEzMTEyNzA4MzkxMFoXDTE3MTEyNjA4
+MzkxMFowTDEXMBUGA1UEAwwOU3dpZnRtYWlsZXIgQ0ExFDASBgNVBAoMC1N3aWZ0
+bWFpbGVyMQ4wDAYDVQQHDAVQYXJpczELMAkGA1UEBhMCRlIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC7RLdHE3OWo9aZwv1xA/cYyPui/gegxpTqClRp
+gGcVQ+jxIfnJQDQndyoAvFDiqOiZ+gAjZGJeUHDp9C/2IZp05MLh+omt9N8pBykm
+3nj/3ZwPXOAO0uyDPAOHhISITAxEuZCqDnq7iYujywtwfQ7bpW1hCK9PfNZYMStM
+kw7LsGr5BqcKkPuOWTvxE3+NqK8HxydYolsoApEGhgonyImVh1Pg1Kjkt5ojvwAX
+zOdjfw5poY5NArwuLORUH+XocetRo8DC6S42HkU/MoqcYxa9EuRuwuQh7GtE6baR
+PgrDsEYaY4Asy43sK81V51F/8Q1bHZKN/goQdxQwzv+/nOLTAgMBAAGjUDBOMB0G
+A1UdDgQWBBRHgqkl543tKhsVAvcx1I0JFU7JuDAfBgNVHSMEGDAWgBRHgqkl543t
+KhsVAvcx1I0JFU7JuDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAz
+OJiEQcygKGkkXXDiXGBvP/cSznj3nG9FolON0yHUBgdvLfNnctRMStGzPke0siLt
+RJvjqiL0Uw+blmLJU8lgMyLJ9ctXkiLJ/WflabN7VzmwYRWe5HzafGQJAg5uFjae
+VtAAHQgvbmdXB6brWvcMQmB8di7wjVedeigZvkt1z2V0FtBy8ybJaT5H6bX9Bf5C
+dS9r4mLhk/0ThthpRhRxsmupSL6e49nJaIk9q0UTEQVnorJXPcs4SPTIY51bCp6u
+cOebhNgndSxCiy0zSD7vRjNiyB/YNGZ9Uv/3DNTLleMZ9kZgfoKVpwYKrRL0IFT/
+cfS2OV1wxRxq668qaOfK
+-----END CERTIFICATE-----
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/ca.key b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/ca.key
new file mode 100644
index 000000000..df6747082
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/ca.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEAu0S3RxNzlqPWmcL9cQP3GMj7ov4HoMaU6gpUaYBnFUPo8SH5
+yUA0J3cqALxQ4qjomfoAI2RiXlBw6fQv9iGadOTC4fqJrfTfKQcpJt54/92cD1zg
+DtLsgzwDh4SEiEwMRLmQqg56u4mLo8sLcH0O26VtYQivT3zWWDErTJMOy7Bq+Qan
+CpD7jlk78RN/jaivB8cnWKJbKAKRBoYKJ8iJlYdT4NSo5LeaI78AF8znY38OaaGO
+TQK8LizkVB/l6HHrUaPAwukuNh5FPzKKnGMWvRLkbsLkIexrROm2kT4Kw7BGGmOA
+LMuN7CvNVedRf/ENWx2Sjf4KEHcUMM7/v5zi0wIDAQABAoIBAGyaWkvu/O7Uz2TW
+z1JWgVuvWzfYaKYV5FCicvfITn/npVUKZikPge+NTR+mFqaMXHDHqoLb+axGrGUR
+hysPq9q0vEx/lo763tyVWYlAJh4E8Dd8njganK0zBbz23kGJEOheUYY95XGTQBda
+bqTq8c3x7zAB8GGBvXDh+wFqm38GLyMF6T+YEzWJZqXfg31f1ldRvf6+VFwlLfz6
+cvTR7oUpYIsUeGE47kBs13SN7Oju6a355o/7wy9tOCRiu+r/ikXFh8rFGLfeTiwv
+R1dhYjcEYGxZUD8u64U+Cj4qR1P0gHJL0kbh22VMMqgALOc8FpndkjNdg1Nun2X8
+BWpsPwECgYEA7C9PfTOIZfxGBlCl05rmWex++/h5E5PbH1Cw/NGjIH1HjmAkO3+5
+WyMXhySOJ8yWyCBQ/nxqc0w7+TO4C7wQcEdZdUak25KJ74v0sfmWWrVw6kcnLU6k
+oawW/L2F2w7ET3zDoxKh4fOF34pfHpSbZk7XJ68YOfHpYVnP4efkQVMCgYEAyvrM
+KA7xjnsKumWh206ag3QEI0M/9uPHWmrh2164p7w1MtawccZTxYYJ5o5SsjTwbxkf
+0cAamp4qLInmRUxU1gk76tPYC3Ndp6Yf1C+dt0q/vtzyJetCDrdz8HHT1SpKbW0l
+g6z1I5FMwa6oWvWsfS++W51vsxUheNsOJ4uxKIECgYBwM7GRiw+7U3N4wItm0Wmp
+Qp642Tu7vzwTzmOmV3klkB6UVrwfv/ewgiVFQGqAIcNn42JW44g2qfq70oQWnws4
+K80l15+t6Bm7QUPH4Qg6o4O26IKGFZxEadqpyudyP7um/2B5cfqRuvzYS4YQowyI
+N+AirB3YOUJjyyTk7yMSnQKBgGNLpSvDg6+ryWe96Bwcq8G6s3t8noHsk81LlAl4
+oOSNUYj5NX+zAbATDizXWuUKuMPgioxVaa5RyVfYbelgme/KvKD32Sxg12P4BIIM
+eR79VifMdjjOiZYhcHojdPlGovo89qkfpxwrLF1jT8CPhj4HaRvwPIBiyekRYC9A
+Sv4BAoGAXCIC1xxAJP15osUuQjcM8KdsL1qw+LiPB2+cJJ2VMAZGV7CR2K0aCsis
+OwRaYM0jZKUpxzp1uwtfrfqbhdYsv+jIBkfwoShYZuo6MhbUrj0sffkhJC3WrT2z
+xafCFLFv1idzGvvNxatlp1DNKrndG2NS3syVAox9MnL5OMsvGM8=
+-----END RSA PRIVATE KEY-----
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/create-cert.sh b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/create-cert.sh
new file mode 100644
index 000000000..0454f2056
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/create-cert.sh
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+openssl genrsa -out CA.key 2048
+openssl req -x509 -new -nodes -key CA.key -days 1460 -subj '/CN=Swiftmailer CA/O=Swiftmailer/L=Paris/C=FR' -out CA.crt
+openssl x509 -in CA.crt -clrtrust -out CA.crt
+
+openssl genrsa -out sign.key 2048
+openssl req -new -key sign.key -subj '/CN=Swiftmailer-User/O=Swiftmailer/L=Paris/C=FR' -out sign.csr
+openssl x509 -req -in sign.csr -CA CA.crt -CAkey CA.key -out sign.crt -days 1460 -addtrust emailProtection
+openssl x509 -in sign.crt -clrtrust -out sign.crt
+
+rm sign.csr
+
+openssl genrsa -out intermediate.key 2048
+openssl req -new -key intermediate.key -subj '/CN=Swiftmailer Intermediate/O=Swiftmailer/L=Paris/C=FR' -out intermediate.csr
+openssl x509 -req -in intermediate.csr -CA CA.crt -CAkey CA.key -set_serial 01 -out intermediate.crt -days 1460
+openssl x509 -in intermediate.crt -clrtrust -out intermediate.crt
+
+rm intermediate.csr
+
+openssl genrsa -out sign2.key 2048
+openssl req -new -key sign2.key -subj '/CN=Swiftmailer-User2/O=Swiftmailer/L=Paris/C=FR' -out sign2.csr
+openssl x509 -req -in sign2.csr -CA intermediate.crt -CAkey intermediate.key -set_serial 01 -out sign2.crt -days 1460 -addtrust emailProtection
+openssl x509 -in sign2.crt -clrtrust -out sign2.crt
+
+rm sign2.csr
+
+openssl genrsa -out encrypt.key 2048
+openssl req -new -key encrypt.key -subj '/CN=Swiftmailer-User/O=Swiftmailer/L=Paris/C=FR' -out encrypt.csr
+openssl x509 -req -in encrypt.csr -CA CA.crt -CAkey CA.key -CAcreateserial -out encrypt.crt -days 1460 -addtrust emailProtection
+openssl x509 -in encrypt.crt -clrtrust -out encrypt.crt
+
+rm encrypt.csr
+
+openssl genrsa -out encrypt2.key 2048
+openssl req -new -key encrypt2.key -subj '/CN=Swiftmailer-User2/O=Swiftmailer/L=Paris/C=FR' -out encrypt2.csr
+openssl x509 -req -in encrypt2.csr -CA CA.crt -CAkey CA.key -CAcreateserial -out encrypt2.crt -days 1460 -addtrust emailProtection
+openssl x509 -in encrypt2.crt -clrtrust -out encrypt2.crt
+
+rm encrypt2.csr
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/encrypt.crt b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/encrypt.crt
new file mode 100644
index 000000000..7435855c9
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/encrypt.crt
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDFjCCAf4CCQDULaNM+Q+g3TANBgkqhkiG9w0BAQUFADBMMRcwFQYDVQQDDA5T
+d2lmdG1haWxlciBDQTEUMBIGA1UECgwLU3dpZnRtYWlsZXIxDjAMBgNVBAcMBVBh
+cmlzMQswCQYDVQQGEwJGUjAeFw0xMzExMjcwODM5MTFaFw0xNzExMjYwODM5MTFa
+ME4xGTAXBgNVBAMMEFN3aWZ0bWFpbGVyLVVzZXIxFDASBgNVBAoMC1N3aWZ0bWFp
+bGVyMQ4wDAYDVQQHDAVQYXJpczELMAkGA1UEBhMCRlIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCcNO+fVZBT2znmVwXXZ08n3G5WA1kyvqh9z4RBBZOD
+V46Gc1X9MMXr9+wzZBFkAckKaa6KsTkeUr4pC8XUBpQnakxH/kW9CaDPdOE+7wNo
+FkPfc6pjWWgpAVxdkrtk7pb4/aGQ++HUkqVu0cMpIcj/7ht7H+3QLZHybn+oMr2+
+FDnn8vPmHxVioinSrxKTlUITuLWS9ZZUTrDa0dG8UAv55A/Tba4T4McCPDpJSA4m
+9jrW321NGQUntQoItOJxagaueSvh6PveGV826gTXoU5X+YJ3I2OZUEQ2l6yByAzf
+nT+QlxPj5ikotFwL72HsenYtetynOO/k43FblAF/V/l7AgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAJ048Sdb9Sw5OJM5L00OtGHgcT1B/phqdzSjkM/s64cg3Q20VN+F
+fZIIkOnxgyYWcpOWXcdNw2tm5OWhWPGsBcYgMac7uK/ukgoOJSjICg+TTS5kRo96
+iHtmImqkWc6WjNODh7uMnQ6DsZsscdl7Bkx5pKhgGnEdHr5GW8sztgXgyPQO5LUs
+YzCmR1RK1WoNMxwbPrGLgYdcpJw69ns5hJbZbMWwrdufiMjYWvTfBPABkk1JRCcY
+K6rRTAx4fApsw1kEIY8grGxyAzfRXLArpro7thJr0SIquZ8GpXkQT/mgRR8JD9Hp
+z9yhr98EnKzITE/yclGN4pUsuk9S3jiyzUU=
+-----END CERTIFICATE-----
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/encrypt.key b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/encrypt.key
new file mode 100644
index 000000000..aa620ca63
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/encrypt.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAnDTvn1WQU9s55lcF12dPJ9xuVgNZMr6ofc+EQQWTg1eOhnNV
+/TDF6/fsM2QRZAHJCmmuirE5HlK+KQvF1AaUJ2pMR/5FvQmgz3ThPu8DaBZD33Oq
+Y1loKQFcXZK7ZO6W+P2hkPvh1JKlbtHDKSHI/+4bex/t0C2R8m5/qDK9vhQ55/Lz
+5h8VYqIp0q8Sk5VCE7i1kvWWVE6w2tHRvFAL+eQP022uE+DHAjw6SUgOJvY61t9t
+TRkFJ7UKCLTicWoGrnkr4ej73hlfNuoE16FOV/mCdyNjmVBENpesgcgM350/kJcT
+4+YpKLRcC+9h7Hp2LXrcpzjv5ONxW5QBf1f5ewIDAQABAoIBADmuMm2botfUM+Ui
+bT3FIC2P8A5C3kUmsgEDB8sazAXL5w0uuanswKkJu2aepO1Q23PE4nbESlswIpf1
+iO9qHnsPfWt4MThEveTdO++JQrDEx/tTMq/M6/F4VysWa6wxjf4Taf2nhRSBsiTh
+wDcICri2q98jQyWELkhfFTR+yCHPsn6iNtzE2OpNv9ojKiSqck/sVjC39Z+uU/HD
+N4v0CPf9pDGkO+modaVGKf2TpvZT7Hpq/jsPzkk1h7BY7aWdZiIY4YkBkWYqZk8f
+0dsxKkOR2glfuEYNtcywG+4UGx3i1AY0mMu96hH5M1ACFmFrTCoodmWDnWy9wUpm
+leLmG8ECgYEAywWdryqcvLyhcmqHbnmUhCL9Vl4/5w5fr/5/FNvqArxSGwd2CxcN
+Jtkvu22cxWAUoe155eMc6GlPIdNRG8KdWg4sg0TN3Jb2jiHQ3QkHXUJlWU6onjP1
+g2n5h052JxVNGBEb7hr3U7ZMW6wnuYnGdYwCB9P3r5oGxxtfVRB8ygUCgYEAxPfy
+tAd3SNT8Sv/cciw76GYKbztUjJRXkLo6GOBGq/AQxP1NDWMuL2AES11YIahidMsF
+TMmM+zhkNHsd5P69p87FTMWx0cLoH0M9iQNK7Q6C1luTjLf5DTFuk+nHGErM4Drs
++6Ly1Z4KLXfXgBDD8Ce6U9+W3RrCc36poGZvjX8CgYEAna0P6WJr9r19mhIYevmc
+Gf/ex7xNXxMvx80dP8MIfPVrwyhJSpWtljVpt+SKtFRJ0fVRDfUUl4Bqf/fR74B3
+muCVO6ItTBxHAt5Ki9CeUpTlh7XqiWwLSvP8Y1TRuMr3ZDCtg4CYBAD6Ttxmwde6
+NcL2NMQwgsZaazrcEIHMmU0CgYEAl/Mn2tZ/oUIdt8YWzEVvmeNOXW0J1sGBo/bm
+ZtZt7qpuZWl7jb5bnNSXu4QxPxXljnAokIpUJmHke9AWydfze4c6EfXZLhcMd0Gq
+MQ7HOIWfTbqr4zzx9smRoq4Ql57s2nba521XpJAdDeKL7xH/9j7PsXCls8C3Dd5D
+AajEmgUCgYAGEdn6tYxIdX7jF39E3x7zHQf8jHIoQ7+cLTLtd944mSGgeqMfbiww
+CoUa+AAUqjdAD5ViAyJrA+gmDtWpkFnJZtToXYwfUF2o3zRo4k1DeBrVbFqwSQkE
+omrfiBGtviYIPdqQLE34LYpWEooNPraqO9qTyc+9w5038u2OFS+WmQ==
+-----END RSA PRIVATE KEY-----
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/encrypt2.crt b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/encrypt2.crt
new file mode 100644
index 000000000..69081656b
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/encrypt2.crt
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDFzCCAf8CCQDULaNM+Q+g3jANBgkqhkiG9w0BAQUFADBMMRcwFQYDVQQDDA5T
+d2lmdG1haWxlciBDQTEUMBIGA1UECgwLU3dpZnRtYWlsZXIxDjAMBgNVBAcMBVBh
+cmlzMQswCQYDVQQGEwJGUjAeFw0xMzExMjcwODM5MTJaFw0xNzExMjYwODM5MTJa
+ME8xGjAYBgNVBAMMEVN3aWZ0bWFpbGVyLVVzZXIyMRQwEgYDVQQKDAtTd2lmdG1h
+aWxlcjEOMAwGA1UEBwwFUGFyaXMxCzAJBgNVBAYTAkZSMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAw4AoYVYss2sa1BWJAJpK6gVemjXrp1mVXVpb1/z6
+SH15AGsp3kiNXsMpgvsdofbqC/5HXrw2G8gWqo+uh6GuK67+Tvp7tO2aD4+8CZzU
+K1cffj7Pbx95DUPwXckv79PT5ZcuyeFaVo92aug11+gS/P8n0WXSlzZxNuZ1f3G2
+r/IgwfNKZlarEf1Ih781L2SwmyveW/dtsV2pdrd4IZwsV5SOF2zBFIXSuhPN0c+m
+mtwSJe+Ow1udLX4KJkAX8sGVFJ5P5q4s2nS9vLkkj7X6YRQscbyJO9L7e1TksRqL
+DLxZwiko6gUhp4/bIs1wDj5tzkQBi4qXviRq3i7A9b2d0QIDAQABMA0GCSqGSIb3
+DQEBBQUAA4IBAQAj8iARhPB2DA3YfT5mJJrgU156Sm0Z3mekAECsr+VqFZtU/9Dz
+pPFYEf0hg61cjvwhLtOmaTB+50hu1KNNlu8QlxAfPJqNxtH85W0CYiZHJwW9eSTr
+z1swaHpRHLDUgo3oAXdh5syMbdl0MWos0Z14WP5yYu4IwJXs+j2JRW70BICyrNjm
+d+AjCzoYjKMdJkSj4uxQEOuW2/5veAoDyU+kHDdfT7SmbyoKu+Pw4Xg/XDuKoWYg
+w5/sRiw5vxsmOr9+anspDHdP9rUe1JEfwAJqZB3fwdqEyxu54Xw/GedG4wZBEJf0
+ZcS1eh31emcjYUHQa1IA93jcFSmXzJ+ftJrY
+-----END CERTIFICATE-----
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/encrypt2.key b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/encrypt2.key
new file mode 100644
index 000000000..e322a8f4c
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/encrypt2.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAw4AoYVYss2sa1BWJAJpK6gVemjXrp1mVXVpb1/z6SH15AGsp
+3kiNXsMpgvsdofbqC/5HXrw2G8gWqo+uh6GuK67+Tvp7tO2aD4+8CZzUK1cffj7P
+bx95DUPwXckv79PT5ZcuyeFaVo92aug11+gS/P8n0WXSlzZxNuZ1f3G2r/IgwfNK
+ZlarEf1Ih781L2SwmyveW/dtsV2pdrd4IZwsV5SOF2zBFIXSuhPN0c+mmtwSJe+O
+w1udLX4KJkAX8sGVFJ5P5q4s2nS9vLkkj7X6YRQscbyJO9L7e1TksRqLDLxZwiko
+6gUhp4/bIs1wDj5tzkQBi4qXviRq3i7A9b2d0QIDAQABAoIBAH8RvK1PmqxfkEeL
+W8oVf13OcafgJjRW6NuNkKa5mmAlldFs1gDRvXl7dm7ZE3CjkYqMEw2DXdP+4KSp
+0TH9J7zi+A6ThnaZ/QniTcEdu1YUQbcH0kIS/dZec0wyKUNDtrXC5zl2jQY4Jyrj
+laOpBzaEDfhvq0p3q2yYrIRSgACpSEVEsfPoHrxtlLhfMkVNe8P0nkQkzdwou5MQ
+MZKV4JUopLHLgPH6IXQCqA1wzlU32yZ86w88GFcBVLkwlLJCKbuAo7yxMCD+nzvA
+xm5NuF1kzpP0gk+kZRXF+rFEV4av/2kSS+n8IeUBQZrxovLBuQHVDvJXoqcEjmlh
+ZUltznUCgYEA4inwieePfb7kh7L/ma5OLLn+uCNwzVw9LayzXT1dyPravOnkHl6h
+MgaoTspqDyU8k8pStedRrr5dVYbseni/A4WSMGvi4innqSXBQGp64TyeJy/e+LrS
+ypSWQ6RSJkCxI5t8s4mOpR7FMcdE34I5qeA4G5RS1HIacn7Hxc7uXtcCgYEA3Uqn
+E7EDfNfYdZm6AikvE6x64oihWI0x47rlkLu6lf6ihiF1dbfaEN+IAaIxQ/unGYwU
+130F0TUwarXnVkeBIRlij4fXhExyd7USSQH1VpqmIqDwsS2ojrzQVMo5UcH+A22G
+bbHPtwJNmw8a7yzTPWo2/vnjgV2OaXEQ9vCVG5cCgYEAu1kEoihJDGBijSqxY4wp
+xBE7OSxamDNtlnV2i6l3FDMBmfaieqnnHDq5l7NDklJFUSQLyhXZ60hUprHDGV0G
+1pMCW8wzQSh3d/4HjSXnrsd5N3sHWMHiNeBKbbQkPP3f/2AhN9SebpgDwE2S9xe4
+TsmnkOkYiFYRJIFzWaAmhDcCgYEAwxRCgZt0xaPKULG6RpljxOYyVm24PsYKCwYB
+xjuYWw5k2/W3BJWVCXblAPuojpPUVTMmVGkErc9D5W6Ch471iOZF+t334cs6xci8
+W9v8GeKvPqu+Q5NKmrpctcKoESkA8qik7yLnSCAhpeYFCn/roKJ35QMJyktddhqU
+p/yilfUCgYBxZ6YmFjYH6l5SxQdcfa5JQ2To8lZCfRJwB65EyWj4pKH4TaWFS7vb
+50WOGTBwJgyhTKLCO3lOmXIUyIwC+OO9xzaeRCBjqEhpup/Ih3MsfMEd6BZRVK5E
+IxtmIWba5HQ52k8FKHeRrRB7PSVSADUN2pUFkLudH+j/01kSZyJoLA==
+-----END RSA PRIVATE KEY-----
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/intermediate.crt b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/intermediate.crt
new file mode 100644
index 000000000..012f734e3
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/intermediate.crt
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDFjCCAf4CAQEwDQYJKoZIhvcNAQEFBQAwTDEXMBUGA1UEAwwOU3dpZnRtYWls
+ZXIgQ0ExFDASBgNVBAoMC1N3aWZ0bWFpbGVyMQ4wDAYDVQQHDAVQYXJpczELMAkG
+A1UEBhMCRlIwHhcNMTQxMTIwMTMyNTQxWhcNMTgxMTE5MTMyNTQxWjBWMSEwHwYD
+VQQDDBhTd2lmdG1haWxlciBJbnRlcm1lZGlhdGUxFDASBgNVBAoMC1N3aWZ0bWFp
+bGVyMQ4wDAYDVQQHDAVQYXJpczELMAkGA1UEBhMCRlIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDSgEhftX6f1wV+uqWl4J+zwCn8fHaLZT6GZ0Gs9ThE
+4e+4mkLG1rvSEIJon8U0ic8Zph1UGa1Grveh5bgbldHlFxYSsCCyDGgixRvRWNhI
+KuO+SxaIZChqqKwVn3aNQ4BZOSo/MjJ/jQyr9BMgMmdxlHR3e1wkkeAkW//sOsfu
+xQGF1h9yeQvuu/GbG6K7vHSGOGd5O3G7bftfQ7l78TMqeJ7jV32AdJeuO5MD4dRn
+W4CQLTaeribLN0MKn35UdSiFoZxKHqqWcgtl5xcJWPOmq6CsAJ2Eo90kW/BHOrLv
+10h6Oan9R1PdXSvSCvVnXY3Kz30zofw305oA/KJk/hVzAgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBABijZ2NNd05Js5VFNr4uyaydam9Yqu/nnrxbPRbAXPlCduydu2Gd
+d1ekn3nblMJ87Bc7zVyHdAQD8/AfS1LOKuoWHpTzmlpIL+8T5sbCYG5J1jKdeLkh
+7L/UD5v1ACgA33oKtN8GzcrIq8Zp73r0n+c3hFCfDYRSZRCxGyIf3qgU2LBOD0A3
+wTff/N8E/p3WaJX9VnuQ7xyRMOubDuqJnlo5YsFv7wjyGOIAz9afZzcEbH6czt/t
+g0Xc/kGr/fkAjUu+z3ZfE4247Gut5m3hEVwWkpEEzQo4osX/BEX20Q2nPz9WBq4a
+pK3qNNGwAqS4gdE3ihOExMWxAKgr9d2CcU4=
+-----END CERTIFICATE-----
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/intermediate.key b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/intermediate.key
new file mode 100644
index 000000000..569eb0c50
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/intermediate.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEA0oBIX7V+n9cFfrqlpeCfs8Ap/Hx2i2U+hmdBrPU4ROHvuJpC
+xta70hCCaJ/FNInPGaYdVBmtRq73oeW4G5XR5RcWErAgsgxoIsUb0VjYSCrjvksW
+iGQoaqisFZ92jUOAWTkqPzIyf40Mq/QTIDJncZR0d3tcJJHgJFv/7DrH7sUBhdYf
+cnkL7rvxmxuiu7x0hjhneTtxu237X0O5e/EzKnie41d9gHSXrjuTA+HUZ1uAkC02
+nq4myzdDCp9+VHUohaGcSh6qlnILZecXCVjzpqugrACdhKPdJFvwRzqy79dIejmp
+/UdT3V0r0gr1Z12Nys99M6H8N9OaAPyiZP4VcwIDAQABAoIBAQDLJiKyu2XIvKsA
+8wCKZY262+mpUjTVso/1BhHL6Zy0XZgMgFORsgrxYB16+zZGzfiguD/1uhIP9Svn
+gtt7Q8udW/phbrkfG/okFDYUg7m3bCz+qVjFqGOZC8+Hzq2LB2oGsbSj6L3zexyP
+lq4elIZghvUfml4CrQW0EVWbld79/kF7XHABcIOk2+3f63XAQWkjdFNxj5+z6TR0
+52Rv7SmRioAsukW9wr77G3Luv/0cEzDFXgGW5s0wO+rJg28smlsIaj+Y0KsptTig
+reQvReAT/S5ZxEp4H6WtXQ1WmaliMB0Gcu4TKB0yE8DoTeCePuslo9DqGokXYT66
+oqtcVMqBAoGBAPoOL9byNNU/bBNDWSCiq8PqhSjl0M4vYBGqtgMXM4GFOJU+W2nX
+YRJbbxoSd/DKjnxEsR6V0vDTDHj4ZSkgmpEmVhEdAiwUwaZ0T8YUaCPhdiAENo5+
+zRBWVJcvAC2XKTK1hy5D7Z5vlC32HHygYqitU+JsK4ylvhrdeOcGx5cfAoGBANeB
+X0JbeuqBEwwEHZqYSpzmtB+IEiuYc9ARTttHEvIWgCThK4ldAzbXhDUIQy3Hm0sL
+PzDA33furNl2WwB+vmOuioYMNjArKrfg689Aim1byg4AHM5XVQcqoDSOABtI55iP
+E0hYDe/d4ema2gk1uR/mT4pnLnk2VzRKsHUbP9stAoGBAKjyIuJwPMADnMqbC0Hg
+hnrVHejW9TAJlDf7hgQqjdMppmQ3gF3PdjeH7VXJOp5GzOQrKRxIEABEJ74n3Xlf
+HO+K3kWrusb7syb6mNd0/DOZ5kyVbCL0iypJmdeXmuAyrFQlj9LzdD1Cl/RBv1d4
+qY/bo7xsZzQc24edMU2uJ/XzAoGBAMHChA95iK5HlwR6vtM8kfk4REMFaLDhxV8R
+8MCeyp33NQfzm91JT5aDd07nOt9yVGHInuwKveFrKuXq0C9FxZCCYfHcEOyGI0Zo
+aBxTfyKMIMMtvriXNM/Yt2oJMndVuUUlfsTQxtcfu/r5S4h0URopTOK3msVI4mcV
+sEnaUjORAoGAGDnslKYtROQMXTe4sh6CoJ32J8UZVV9M+8NLus9rO0v/eZ/pIFxo
+MXGrrrl51ScqahCQ+DXHzpLvInsdlAJvDP3ymhb7H2xGsyvb3x2YgsLmr1YVOnli
+ISbCssno3vZyFU1TDjeEIKqZHc92byHNMjMuhmlaA25g8kb0cCO76EA=
+-----END RSA PRIVATE KEY-----
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/sign.crt b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/sign.crt
new file mode 100644
index 000000000..15fd65d2e
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/sign.crt
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDFjCCAf4CCQDULaNM+Q+g3DANBgkqhkiG9w0BAQUFADBMMRcwFQYDVQQDDA5T
+d2lmdG1haWxlciBDQTEUMBIGA1UECgwLU3dpZnRtYWlsZXIxDjAMBgNVBAcMBVBh
+cmlzMQswCQYDVQQGEwJGUjAeFw0xMzExMjcwODM5MTBaFw0xNzExMjYwODM5MTBa
+ME4xGTAXBgNVBAMMEFN3aWZ0bWFpbGVyLVVzZXIxFDASBgNVBAoMC1N3aWZ0bWFp
+bGVyMQ4wDAYDVQQHDAVQYXJpczELMAkGA1UEBhMCRlIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCTe8ZouyjVGgqlljhaswYqLj7icMoHq+Qg13CE+zJg
+tl2/UzyPhAd3WWOIvlQ0lu+E/n0bXrS6+q28DrQ3UgJ9BskzzLz15qUO12b92AvG
+vLJ+9kKuiM5KXDljOAsXc7/A9UUGwEFA1D0mkeMmkHuiQavAMkzBLha22hGpg/hz
+VbE6W9MGna0szd8yh38IY1M5uR+OZ0dG3KbVZb7H3N0OLOP8j8n+4YtAGAW+Onz/
+2CGPfZ1kaDMvY/WTZwyGeA4FwCPy1D8tfeswqKnWDB9Sfl8hns5VxnoJ3dqKQHeX
+iC4OMfQ0U4CcuM5sVYJZRNNwP7/TeUh3HegnOnuZ1hy9AgMBAAEwDQYJKoZIhvcN
+AQEFBQADggEBAAEPjGt98GIK6ecAEat52aG+8UP7TuZaxoH3cbZdhFTafrP8187F
+Rk5G3LCPTeA/QIzbHppA4fPAiS07OVSwVCknpTJbtKKn0gmtTZxThacFHF2NlzTH
+XxM5bIbkK3jzIF+WattyTSj34UHHfaNAmvmS7Jyq6MhjSDbcQ+/dZ9eo2tF/AmrC
++MBhyH8aUYwKhTOQQh8yC11niziHhGO99FQ4tpuD9AKlun5snHq4uK9AOFe8VhoR
+q2CqX5g5v8OAtdlvzhp50IqD4BNOP+JrUxjGLHDG76BZZIK2Ai1eBz+GhRlIQru/
+8EhQzd94mdFEPblGbmuD2QXWLFFKLiYOwOc=
+-----END CERTIFICATE-----
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/sign.key b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/sign.key
new file mode 100644
index 000000000..b3d3c5350
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/sign.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAk3vGaLso1RoKpZY4WrMGKi4+4nDKB6vkINdwhPsyYLZdv1M8
+j4QHd1ljiL5UNJbvhP59G160uvqtvA60N1ICfQbJM8y89ealDtdm/dgLxryyfvZC
+rojOSlw5YzgLF3O/wPVFBsBBQNQ9JpHjJpB7okGrwDJMwS4WttoRqYP4c1WxOlvT
+Bp2tLM3fMod/CGNTObkfjmdHRtym1WW+x9zdDizj/I/J/uGLQBgFvjp8/9ghj32d
+ZGgzL2P1k2cMhngOBcAj8tQ/LX3rMKip1gwfUn5fIZ7OVcZ6Cd3aikB3l4guDjH0
+NFOAnLjObFWCWUTTcD+/03lIdx3oJzp7mdYcvQIDAQABAoIBAH2vrw/T6GFrlwU0
+twP8q1VJIghCDLpq77hZQafilzU6VTxWyDaaUu6QPDXt1b8Xnjnd02p+1FDAj0zD
+zyuR9VLtdIxzf9mj3KiAQ2IzOx3787YlUgCB0CQo4jM/MJyk5RahL1kogLOp7A8x
+pr5XxTUq+B6L/0Nmbq8XupOXRyWp53amZ5N8sgWDv4oKh9fqgAhxbSG6KUkTmhYs
+DLinWg86Q28pSn+eivf4dehR56YwtTBVguXW3WKO70+GW1RotSrS6e6SSxfKYksZ
+a7/J1hCmJkEE3+4C8BpcI0MelgaK66ocN0pOqDF9ByxphARqyD7tYCfoS2P8gi81
+XoiZJaECgYEAwqx4AnDX63AANsfKuKVsEQfMSAG47SnKOVwHB7prTAgchTRcDph1
+EVOPtJ+4ssanosXzLcN/dCRlvqLEqnKYAOizy3C56CyRguCpO1AGbRpJjRmHTRgA
+w8iArhM07HgJ3XLFn99V/0bsPCMxW8dje1ZMjKjoQtDrXRQMtWaVY+UCgYEAwfGi
+f0If6z7wJj9gQUkGimWDAg/bxDkvEeh3nSD/PQyNiW0XDclcb3roNPQsal2ZoMwt
+f1bwkclw7yUCIZBvXWEkZapjKCdseTp6nglScxr8GAzfN9p5KQl+OS3GzC6xZf6C
+BsZQ5ucsHTHsCAi3WbwGK829z9c7x0qRwgwu9/kCgYEAsqwEwYi8Q/RZ3e1lXC9H
+jiHwFi6ugc2XMyoJscghbnkLZB54V1UKLUraXFcz97FobnbsCJajxf8Z+uv9QMtI
+Q51QV2ow1q0BKHP2HuAF5eD4nK5Phix/lzHRGPO74UUTGNKcG22pylBXxaIvTSMl
+ZTABth/YfGqvepBKUbvDZRkCgYB5ykbUCW9H6D8glZ3ZgYU09ag+bD0CzTIs2cH7
+j1QZPz/GdBYNF00PyKv3TPpzVRH7cxyDIdJyioB7/M6Iy03T4wPbQBOCjLdGrZ2A
+jrQTCngSlkq6pVx+k7KLL57ua8gFF70JihIV3kfKkaX6KZcSJ8vsSAgRc8TbUo2T
+wNjh6QKBgDyxw4bG2ULs+LVaHcnp7nizLgRGXJsCkDICjla6y0eCgAnG8fSt8CcG
+s5DIfJeVs/NXe/NVNuVrfwsUx0gBOirtFwQStvi5wJnY/maGAyjmgafisNFgAroT
+aM5f+wyGPQeGCs7bj7JWY7Nx9lkyuUV7DdKBTZNMOe51K3+PTEL3
+-----END RSA PRIVATE KEY-----
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/sign2.crt b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/sign2.crt
new file mode 100644
index 000000000..44f4d9bcf
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/sign2.crt
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDGTCCAgECAQEwDQYJKoZIhvcNAQEFBQAwVjEhMB8GA1UEAwwYU3dpZnRtYWls
+ZXIgSW50ZXJtZWRpYXRlMRQwEgYDVQQKDAtTd2lmdG1haWxlcjEOMAwGA1UEBwwF
+UGFyaXMxCzAJBgNVBAYTAkZSMB4XDTE0MTEyMDEzMjYyNloXDTE4MTExOTEzMjYy
+NlowTzEaMBgGA1UEAwwRU3dpZnRtYWlsZXItVXNlcjIxFDASBgNVBAoMC1N3aWZ0
+bWFpbGVyMQ4wDAYDVQQHDAVQYXJpczELMAkGA1UEBhMCRlIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDbr1m4z/rzFS/DxUUQIhKNx19oAeGYLt3niaEP
+twfvBMNB80gMgM9d+XtqrPAMPeY/2C8t5NlChNPKMcR70JBKdmlSH4/aTjaIfWmD
+PoZJjvRRXINZgSHNKIt4ZGAN/EPFr19CBisV4iPxzu+lyIbbkaZJ/qtyatlP7m/q
+8TnykFRlyxNEveCakpcXeRd3YTFGKWoED+/URhVc0cCPZVjoeSTtPHAYBnC29lG5
+VFbq6NBQiyF4tpjOHRarq6G8PtQFH9CpAZg5bPk3bqka9C8mEr5jWfrM4EHtUkTl
+CwVLOQRBsz/nMBT27pXZh18GU0hc3geNDN4kqaeqgNBo0mblAgMBAAEwDQYJKoZI
+hvcNAQEFBQADggEBAAHDMuv6oxWPsTQWWGWWFIk7QZu3iogMqFuxhhQxg8BE37CT
+Vt1mBVEjYGMkWhMSwWBMWuP6yuOZecWtpp6eOie/UKGg1XoW7Y7zq2aQaP7YPug0
+8Lgq1jIo7iO2b6gZeMtLiTZrxyte0z1XzS3wy7ZC9mZjYd7QE7mZ+/rzQ0x5zjOp
+G8b3msS/yYYJCMN+HtHln++HOGmm6uhvbsHTfvvZvtl7F5vJ5WhGGlUfjhanSEtZ
+1RKx+cbgIv1eFOGO1OTuZfEuKdLb0T38d/rjLeI99nVVKEIGtLmX4dj327GHe/D3
+aPr2blF2gOvlzkfN9Vz6ZUE2s3rVBeCg2AVseYQ=
+-----END CERTIFICATE-----
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/sign2.key b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/sign2.key
new file mode 100644
index 000000000..ffb189b0f
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/_samples/smime/sign2.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA269ZuM/68xUvw8VFECISjcdfaAHhmC7d54mhD7cH7wTDQfNI
+DIDPXfl7aqzwDD3mP9gvLeTZQoTTyjHEe9CQSnZpUh+P2k42iH1pgz6GSY70UVyD
+WYEhzSiLeGRgDfxDxa9fQgYrFeIj8c7vpciG25GmSf6rcmrZT+5v6vE58pBUZcsT
+RL3gmpKXF3kXd2ExRilqBA/v1EYVXNHAj2VY6Hkk7TxwGAZwtvZRuVRW6ujQUIsh
+eLaYzh0Wq6uhvD7UBR/QqQGYOWz5N26pGvQvJhK+Y1n6zOBB7VJE5QsFSzkEQbM/
+5zAU9u6V2YdfBlNIXN4HjQzeJKmnqoDQaNJm5QIDAQABAoIBAAM2FvuqnqJ7Bs23
+zoCj3t2PsodUr7WHydqemmoeZNFLoocORVlZcK6Q/QrcKE4lgX4hbN8g30QnqOjl
+vVeJ/vH3tSZsK7AnQIjSPH6cpV3h5xRhY9IlHxdepltGLFlH/L2hCKVwbaTOP3RD
+cCFeQwpmoKWoQV1UzoRqmdw3Vn+DMaUULomLVR9aSW9PnKeFL+tPWShf7GmVISfM
+2H6xKw/qT0XAX59ZHA1laxSFVvbV5ZcKrBOFMV407Vzw2d3ojmfEzNsHjUVBXX8j
+B5nK1VeJiTVmcoVhnRX7tXESDaZy+Kv38pqOmc8Svn70lDJ35SM2EpWnX39w5LsQ
+29NsIUECgYEA/vNKiMfVmmZNQrpcuHQe5adlmz9+I4xJ4wbRzrS7czpbKF0/iaPf
+dKoVz67yYHOJCBHTVaXWkElQsq1mkyuFt/cc0ReJXO8709+t+6ULsE50cLQm/HN5
+npg3gw0Ls/9dy/cHM5SdVIHMBm9oQ65rXup/dqWC8Dz2cAAOQhIPwx0CgYEA3Jbk
+DPdUlrj4sXcE3V/CtmBuK9Xq1xolJt026fYCrle0YhdMKmchRBDCc6BzM+F/vDyC
+llPfQu8TDXK40Oan7GbxMdoLqKK9gSIq1dvfG1YMMz8OrBcX8xKe61KFRWd7QSBJ
+BcY575NzYHapOHVGnUJ68j8zCow0gfb7q6iK4GkCgYEAz2mUuKSCxYL21hORfUqT
+HFjMU7oa38axEa6pn9XvLjZKlRMPruWP1HTPG9ADRa6Yy+TcnrA1V9sdeM+TRKXC
+usCiRAU27lF+xccS30gNs1iQaGRX10gGqJzDhK1nWP+nClmlFTSRrn+OQan/FBjh
+Jy31lsveM54VC1cwQlY5Vo0CgYEArtjfnLNzFiE55xjq/znHUd4vlYlzItrzddHE
+lEBOsbiNH29ODRI/2P7b0uDsT8Q/BoqEC/ohLqHn3TIA8nzRv91880HdGecdBL17
+bJZiSv2yn/AshhWsAxzQYMDBKFk05lNb7jrIc3DR9DU6PqketsoaP+f+Yi7t89I8
+fD0VD3kCgYAaJCoQshng/ijiHF/RJXLrXXHJSUmaOfbweX/mzFup0YR1LxUjcv85
+cxvwc41Y2iI5MwUXyX97/GYKeoobzWZy3XflNWtg04rcInVaPsb/OOFDDqI+MkzT
+B4PcCurOmjzcxHMVE34CYvl3YVwWrPb5JO1rYG9T2gKUJnLU6qG4Bw==
+-----END RSA PRIVATE KEY-----
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance.conf.php.default b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance.conf.php.default
new file mode 100644
index 000000000..68902d84f
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance.conf.php.default
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ Swift Mailer V4 accpetance test configuration.
+
+ YOU ONLY NEED TO EDIT THIS FILE IF YOU WISH TO RUN THE ACCEPTANCE TESTS.
+
+ The acceptance tests are run by default when "All Tests" are run with the
+ testing suite, however, without configuration options here only the unit tests
+ will be run and the acceptance tests will be skipped.
+ 
+ You can fill out only the parts you know and leave the other bits.
+ */
+
+
+/*
+ Defines: The path to a writable directory (a temporary dir).
+ Recommended: /tmp
+ */
+define('SWIFT_TMP_DIR', '/tmp');
+
+/*
+ Defines: The name and port of a SMTP server you can connect to.
+ Recommended: smtp.gmail.com:25
+ */
+define('SWIFT_SMTP_HOST', 'localhost:4456');
+
+/*
+ Defines: An SMTP server and port which uses TLS encryption.
+ Recommended: smtp.gmail.com:465
+ */
+define('SWIFT_TLS_HOST', 'smtp.gmail.com:465');
+
+/*
+ Defines: An SMTP server and port which uses SSL encryption.
+ Recommended: smtp.gmail.com:465
+ */
+define('SWIFT_SSL_HOST', 'smtp.gmail.com:465');
+
+/*
+ Defines: The path to a sendmail binary (one which can run in -bs mode).
+ Recommended: /usr/sbin/sendmail
+ */
+define('SWIFT_SENDMAIL_PATH', '/usr/sbin/sendmail -bs');
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/AttachmentAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/AttachmentAcceptanceTest.php
new file mode 100644
index 000000000..5c0b8264e
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/AttachmentAcceptanceTest.php
@@ -0,0 +1,12 @@
+<?php
+
+require_once 'swift_required.php';
+require_once __DIR__.'/Mime/AttachmentAcceptanceTest.php';
+
+class Swift_AttachmentAcceptanceTest extends Swift_Mime_AttachmentAcceptanceTest
+{
+    protected function _createAttachment()
+    {
+        return Swift_Attachment::newInstance();
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/ByteStream/FileByteStreamAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/ByteStream/FileByteStreamAcceptanceTest.php
new file mode 100644
index 000000000..7fc7bc310
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/ByteStream/FileByteStreamAcceptanceTest.php
@@ -0,0 +1,174 @@
+<?php
+
+class Swift_ByteStream_FileByteStreamAcceptanceTest extends \PHPUnit_Framework_TestCase
+{
+    private $_tmpDir;
+    private $_testFile;
+
+    public function setUp()
+    {
+        if (!defined('SWIFT_TMP_DIR')) {
+            $this->markTestSkipped(
+                'Cannot run test without a writable directory to use ('.
+                'define SWIFT_TMP_DIR in tests/config.php if you wish to run this test)'
+             );
+        }
+
+        $this->_tmpDir = SWIFT_TMP_DIR;
+        $this->_testFile = $this->_tmpDir.'/swift-test-file'.__CLASS__;
+        file_put_contents($this->_testFile, 'abcdefghijklm');
+    }
+
+    public function tearDown()
+    {
+        unlink($this->_testFile);
+    }
+
+    public function testFileDataCanBeRead()
+    {
+        $file = $this->_createFileStream($this->_testFile);
+        $str = '';
+        while (false !== $bytes = $file->read(8192)) {
+            $str .= $bytes;
+        }
+        $this->assertEquals('abcdefghijklm', $str);
+    }
+
+    public function testFileDataCanBeReadSequentially()
+    {
+        $file = $this->_createFileStream($this->_testFile);
+        $this->assertEquals('abcde', $file->read(5));
+        $this->assertEquals('fghijklm', $file->read(8));
+        $this->assertFalse($file->read(1));
+    }
+
+    public function testFilenameIsReturned()
+    {
+        $file = $this->_createFileStream($this->_testFile);
+        $this->assertEquals($this->_testFile, $file->getPath());
+    }
+
+    public function testFileCanBeWrittenTo()
+    {
+        $file = $this->_createFileStream(
+            $this->_testFile, true
+            );
+        $file->write('foobar');
+        $this->assertEquals('foobar', $file->read(8192));
+    }
+
+    public function testReadingFromThenWritingToFile()
+    {
+        $file = $this->_createFileStream(
+            $this->_testFile, true
+            );
+        $file->write('foobar');
+        $this->assertEquals('foobar', $file->read(8192));
+        $file->write('zipbutton');
+        $this->assertEquals('zipbutton', $file->read(8192));
+    }
+
+    public function testWritingToFileWithCanonicalization()
+    {
+        $file = $this->_createFileStream(
+            $this->_testFile, true
+            );
+        $file->addFilter($this->_createFilter(array("\r\n", "\r"), "\n"), 'allToLF');
+        $file->write("foo\r\nbar\r");
+        $file->write("\nzip\r\ntest\r");
+        $file->flushBuffers();
+        $this->assertEquals("foo\nbar\nzip\ntest\n", file_get_contents($this->_testFile));
+    }
+
+    public function testBindingOtherStreamsMirrorsWriteOperations()
+    {
+        $file = $this->_createFileStream(
+            $this->_testFile, true
+            );
+        $is1 = $this->_createMockInputStream();
+        $is2 = $this->_createMockInputStream();
+
+        $is1->expects($this->at(0))
+            ->method('write')
+            ->with('x');
+        $is1->expects($this->at(1))
+            ->method('write')
+            ->with('y');
+        $is2->expects($this->at(0))
+            ->method('write')
+            ->with('x');
+        $is2->expects($this->at(1))
+            ->method('write')
+            ->with('y');
+
+        $file->bind($is1);
+        $file->bind($is2);
+
+        $file->write('x');
+        $file->write('y');
+    }
+
+    public function testBindingOtherStreamsMirrorsFlushOperations()
+    {
+        $file = $this->_createFileStream(
+            $this->_testFile, true
+            );
+        $is1 = $this->_createMockInputStream();
+        $is2 = $this->_createMockInputStream();
+
+        $is1->expects($this->once())
+            ->method('flushBuffers');
+        $is2->expects($this->once())
+            ->method('flushBuffers');
+
+        $file->bind($is1);
+        $file->bind($is2);
+
+        $file->flushBuffers();
+    }
+
+    public function testUnbindingStreamPreventsFurtherWrites()
+    {
+        $file = $this->_createFileStream(
+            $this->_testFile, true
+            );
+        $is1 = $this->_createMockInputStream();
+        $is2 = $this->_createMockInputStream();
+
+        $is1->expects($this->at(0))
+            ->method('write')
+            ->with('x');
+        $is1->expects($this->at(1))
+            ->method('write')
+            ->with('y');
+        $is2->expects($this->once())
+            ->method('write')
+            ->with('x');
+
+        $file->bind($is1);
+        $file->bind($is2);
+
+        $file->write('x');
+
+        $file->unbind($is2);
+
+        $file->write('y');
+    }
+
+    // -- Creation methods
+
+    private function _createFilter($search, $replace)
+    {
+        return new Swift_StreamFilters_StringReplacementFilter($search, $replace);
+    }
+
+    private function _createMockInputStream()
+    {
+        return $this->getMock('Swift_InputByteStream');
+    }
+
+    private function _createFileStream($file, $writable = false)
+    {
+        return new Swift_ByteStream_FileByteStream($file, $writable);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/CharacterReaderFactory/SimpleCharacterReaderFactoryAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/CharacterReaderFactory/SimpleCharacterReaderFactoryAcceptanceTest.php
new file mode 100644
index 000000000..8ce4a1828
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/CharacterReaderFactory/SimpleCharacterReaderFactoryAcceptanceTest.php
@@ -0,0 +1,179 @@
+<?php
+
+class Swift_CharacterReaderFactory_SimpleCharacterReaderFactoryAcceptanceTest extends \PHPUnit_Framework_TestCase
+{
+    private $_factory;
+    private $_prefix = 'Swift_CharacterReader_';
+
+    public function setUp()
+    {
+        $this->_factory = new Swift_CharacterReaderFactory_SimpleCharacterReaderFactory();
+    }
+
+    public function testCreatingUtf8Reader()
+    {
+        foreach (array('utf8', 'utf-8', 'UTF-8', 'UTF8') as $utf8) {
+            $reader = $this->_factory->getReaderFor($utf8);
+            $this->assertInstanceof($this->_prefix.'Utf8Reader', $reader);
+        }
+    }
+
+    public function testCreatingIso8859XReaders()
+    {
+        $charsets = array();
+        foreach (range(1, 16) as $number) {
+            foreach (array('iso', 'iec') as $body) {
+                $charsets[] = $body.'-8859-'.$number;
+                $charsets[] = $body.'8859-'.$number;
+                $charsets[] = strtoupper($body).'-8859-'.$number;
+                $charsets[] = strtoupper($body).'8859-'.$number;
+            }
+        }
+
+        foreach ($charsets as $charset) {
+            $reader = $this->_factory->getReaderFor($charset);
+            $this->assertInstanceof($this->_prefix.'GenericFixedWidthReader', $reader);
+            $this->assertEquals(1, $reader->getInitialByteSize());
+        }
+    }
+
+    public function testCreatingWindows125XReaders()
+    {
+        $charsets = array();
+        foreach (range(0, 8) as $number) {
+            $charsets[] = 'windows-125'.$number;
+            $charsets[] = 'windows125'.$number;
+            $charsets[] = 'WINDOWS-125'.$number;
+            $charsets[] = 'WINDOWS125'.$number;
+        }
+
+        foreach ($charsets as $charset) {
+            $reader = $this->_factory->getReaderFor($charset);
+            $this->assertInstanceof($this->_prefix.'GenericFixedWidthReader', $reader);
+            $this->assertEquals(1, $reader->getInitialByteSize());
+        }
+    }
+
+    public function testCreatingCodePageReaders()
+    {
+        $charsets = array();
+        foreach (range(0, 8) as $number) {
+            $charsets[] = 'cp-125'.$number;
+            $charsets[] = 'cp125'.$number;
+            $charsets[] = 'CP-125'.$number;
+            $charsets[] = 'CP125'.$number;
+        }
+
+        foreach (array(437, 737, 850, 855, 857, 858, 860,
+            861, 863, 865, 866, 869, ) as $number) {
+            $charsets[] = 'cp-'.$number;
+            $charsets[] = 'cp'.$number;
+            $charsets[] = 'CP-'.$number;
+            $charsets[] = 'CP'.$number;
+        }
+
+        foreach ($charsets as $charset) {
+            $reader = $this->_factory->getReaderFor($charset);
+            $this->assertInstanceof($this->_prefix.'GenericFixedWidthReader', $reader);
+            $this->assertEquals(1, $reader->getInitialByteSize());
+        }
+    }
+
+    public function testCreatingAnsiReader()
+    {
+        foreach (array('ansi', 'ANSI') as $ansi) {
+            $reader = $this->_factory->getReaderFor($ansi);
+            $this->assertInstanceof($this->_prefix.'GenericFixedWidthReader', $reader);
+            $this->assertEquals(1, $reader->getInitialByteSize());
+        }
+    }
+
+    public function testCreatingMacintoshReader()
+    {
+        foreach (array('macintosh', 'MACINTOSH') as $mac) {
+            $reader = $this->_factory->getReaderFor($mac);
+            $this->assertInstanceof($this->_prefix.'GenericFixedWidthReader', $reader);
+            $this->assertEquals(1, $reader->getInitialByteSize());
+        }
+    }
+
+    public function testCreatingKOIReaders()
+    {
+        $charsets = array();
+        foreach (array('7', '8-r', '8-u', '8u', '8r') as $end) {
+            $charsets[] = 'koi-'.$end;
+            $charsets[] = 'koi'.$end;
+            $charsets[] = 'KOI-'.$end;
+            $charsets[] = 'KOI'.$end;
+        }
+
+        foreach ($charsets as $charset) {
+            $reader = $this->_factory->getReaderFor($charset);
+            $this->assertInstanceof($this->_prefix.'GenericFixedWidthReader', $reader);
+            $this->assertEquals(1, $reader->getInitialByteSize());
+        }
+    }
+
+    public function testCreatingIsciiReaders()
+    {
+        foreach (array('iscii', 'ISCII', 'viscii', 'VISCII') as $charset) {
+            $reader = $this->_factory->getReaderFor($charset);
+            $this->assertInstanceof($this->_prefix.'GenericFixedWidthReader', $reader);
+            $this->assertEquals(1, $reader->getInitialByteSize());
+        }
+    }
+
+    public function testCreatingMIKReader()
+    {
+        foreach (array('mik', 'MIK') as $charset) {
+            $reader = $this->_factory->getReaderFor($charset);
+            $this->assertInstanceof($this->_prefix.'GenericFixedWidthReader', $reader);
+            $this->assertEquals(1, $reader->getInitialByteSize());
+        }
+    }
+
+    public function testCreatingCorkReader()
+    {
+        foreach (array('cork', 'CORK', 't1', 'T1') as $charset) {
+            $reader = $this->_factory->getReaderFor($charset);
+            $this->assertInstanceof($this->_prefix.'GenericFixedWidthReader', $reader);
+            $this->assertEquals(1, $reader->getInitialByteSize());
+        }
+    }
+
+    public function testCreatingUcs2Reader()
+    {
+        foreach (array('ucs-2', 'UCS-2', 'ucs2', 'UCS2') as $charset) {
+            $reader = $this->_factory->getReaderFor($charset);
+            $this->assertInstanceof($this->_prefix.'GenericFixedWidthReader', $reader);
+            $this->assertEquals(2, $reader->getInitialByteSize());
+        }
+    }
+
+    public function testCreatingUtf16Reader()
+    {
+        foreach (array('utf-16', 'UTF-16', 'utf16', 'UTF16') as $charset) {
+            $reader = $this->_factory->getReaderFor($charset);
+            $this->assertInstanceof($this->_prefix.'GenericFixedWidthReader', $reader);
+            $this->assertEquals(2, $reader->getInitialByteSize());
+        }
+    }
+
+    public function testCreatingUcs4Reader()
+    {
+        foreach (array('ucs-4', 'UCS-4', 'ucs4', 'UCS4') as $charset) {
+            $reader = $this->_factory->getReaderFor($charset);
+            $this->assertInstanceof($this->_prefix.'GenericFixedWidthReader', $reader);
+            $this->assertEquals(4, $reader->getInitialByteSize());
+        }
+    }
+
+    public function testCreatingUtf32Reader()
+    {
+        foreach (array('utf-32', 'UTF-32', 'utf32', 'UTF32') as $charset) {
+            $reader = $this->_factory->getReaderFor($charset);
+            $this->assertInstanceof($this->_prefix.'GenericFixedWidthReader', $reader);
+            $this->assertEquals(4, $reader->getInitialByteSize());
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/DependencyContainerAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/DependencyContainerAcceptanceTest.php
new file mode 100644
index 000000000..8caf6f54a
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/DependencyContainerAcceptanceTest.php
@@ -0,0 +1,20 @@
+<?php
+
+require_once 'swift_required.php';
+
+//This is more of a "cross your fingers and hope it works" test!
+
+class Swift_DependencyContainerAcceptanceTest extends \PHPUnit_Framework_TestCase
+{
+    public function testNoLookupsFail()
+    {
+        $di = Swift_DependencyContainer::getInstance();
+        foreach ($di->listItems() as $itemName) {
+            try {
+                $di->lookup($itemName);
+            } catch (Swift_DependencyException $e) {
+                $this->fail($e->getMessage());
+            }
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/EmbeddedFileAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/EmbeddedFileAcceptanceTest.php
new file mode 100644
index 000000000..fc5a8147d
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/EmbeddedFileAcceptanceTest.php
@@ -0,0 +1,12 @@
+<?php
+
+require_once 'swift_required.php';
+require_once __DIR__.'/Mime/EmbeddedFileAcceptanceTest.php';
+
+class Swift_EmbeddedFileAcceptanceTest extends Swift_Mime_EmbeddedFileAcceptanceTest
+{
+    protected function _createEmbeddedFile()
+    {
+        return Swift_EmbeddedFile::newInstance();
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Encoder/Base64EncoderAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Encoder/Base64EncoderAcceptanceTest.php
new file mode 100644
index 000000000..d8ba52648
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Encoder/Base64EncoderAcceptanceTest.php
@@ -0,0 +1,45 @@
+<?php
+
+class Swift_Encoder_Base64EncoderAcceptanceTest extends \PHPUnit_Framework_TestCase
+{
+    private $_samplesDir;
+    private $_encoder;
+
+    public function setUp()
+    {
+        $this->_samplesDir = realpath(__DIR__.'/../../../_samples/charsets');
+        $this->_encoder = new Swift_Encoder_Base64Encoder();
+    }
+
+    public function testEncodingAndDecodingSamples()
+    {
+        $sampleFp = opendir($this->_samplesDir);
+        while (false !== $encodingDir = readdir($sampleFp)) {
+            if (substr($encodingDir, 0, 1) == '.') {
+                continue;
+            }
+
+            $sampleDir = $this->_samplesDir.'/'.$encodingDir;
+
+            if (is_dir($sampleDir)) {
+                $fileFp = opendir($sampleDir);
+                while (false !== $sampleFile = readdir($fileFp)) {
+                    if (substr($sampleFile, 0, 1) == '.') {
+                        continue;
+                    }
+
+                    $text = file_get_contents($sampleDir.'/'.$sampleFile);
+                    $encodedText = $this->_encoder->encodeString($text);
+
+                    $this->assertEquals(
+                        base64_decode($encodedText), $text,
+                        '%s: Encoded string should decode back to original string for sample '.
+                        $sampleDir.'/'.$sampleFile
+                        );
+                }
+                closedir($fileFp);
+            }
+        }
+        closedir($sampleFp);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Encoder/QpEncoderAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Encoder/QpEncoderAcceptanceTest.php
new file mode 100644
index 000000000..1da3b837c
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Encoder/QpEncoderAcceptanceTest.php
@@ -0,0 +1,54 @@
+<?php
+
+class Swift_Encoder_QpEncoderAcceptanceTest extends \PHPUnit_Framework_TestCase
+{
+    private $_samplesDir;
+    private $_factory;
+
+    public function setUp()
+    {
+        $this->_samplesDir = realpath(__DIR__.'/../../../_samples/charsets');
+        $this->_factory = new Swift_CharacterReaderFactory_SimpleCharacterReaderFactory();
+    }
+
+    public function testEncodingAndDecodingSamples()
+    {
+        $sampleFp = opendir($this->_samplesDir);
+        while (false !== $encodingDir = readdir($sampleFp)) {
+            if (substr($encodingDir, 0, 1) == '.') {
+                continue;
+            }
+
+            $encoding = $encodingDir;
+            $charStream = new Swift_CharacterStream_ArrayCharacterStream(
+                $this->_factory, $encoding);
+            $encoder = new Swift_Encoder_QpEncoder($charStream);
+
+            $sampleDir = $this->_samplesDir.'/'.$encodingDir;
+
+            if (is_dir($sampleDir)) {
+                $fileFp = opendir($sampleDir);
+                while (false !== $sampleFile = readdir($fileFp)) {
+                    if (substr($sampleFile, 0, 1) == '.') {
+                        continue;
+                    }
+
+                    $text = file_get_contents($sampleDir.'/'.$sampleFile);
+                    $encodedText = $encoder->encodeString($text);
+
+                    foreach (explode("\r\n", $encodedText) as $line) {
+                        $this->assertLessThanOrEqual(76, strlen($line));
+                    }
+
+                    $this->assertEquals(
+                        quoted_printable_decode($encodedText), $text,
+                        '%s: Encoded string should decode back to original string for sample '.
+                        $sampleDir.'/'.$sampleFile
+                        );
+                }
+                closedir($fileFp);
+            }
+        }
+        closedir($sampleFp);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Encoder/Rfc2231EncoderAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Encoder/Rfc2231EncoderAcceptanceTest.php
new file mode 100644
index 000000000..043ddf8cd
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Encoder/Rfc2231EncoderAcceptanceTest.php
@@ -0,0 +1,50 @@
+<?php
+
+class Swift_Encoder_Rfc2231EncoderAcceptanceTest extends \PHPUnit_Framework_TestCase
+{
+    private $_samplesDir;
+    private $_factory;
+
+    public function setUp()
+    {
+        $this->_samplesDir = realpath(__DIR__.'/../../../_samples/charsets');
+        $this->_factory = new Swift_CharacterReaderFactory_SimpleCharacterReaderFactory();
+    }
+
+    public function testEncodingAndDecodingSamples()
+    {
+        $sampleFp = opendir($this->_samplesDir);
+        while (false !== $encodingDir = readdir($sampleFp)) {
+            if (substr($encodingDir, 0, 1) == '.') {
+                continue;
+            }
+
+            $encoding = $encodingDir;
+            $charStream = new Swift_CharacterStream_ArrayCharacterStream(
+                $this->_factory, $encoding);
+            $encoder = new Swift_Encoder_Rfc2231Encoder($charStream);
+
+            $sampleDir = $this->_samplesDir.'/'.$encodingDir;
+
+            if (is_dir($sampleDir)) {
+                $fileFp = opendir($sampleDir);
+                while (false !== $sampleFile = readdir($fileFp)) {
+                    if (substr($sampleFile, 0, 1) == '.') {
+                        continue;
+                    }
+
+                    $text = file_get_contents($sampleDir.'/'.$sampleFile);
+                    $encodedText = $encoder->encodeString($text);
+
+                    $this->assertEquals(
+                        urldecode(implode('', explode("\r\n", $encodedText))), $text,
+                        '%s: Encoded string should decode back to original string for sample '.
+                        $sampleDir.'/'.$sampleFile
+                        );
+                }
+                closedir($fileFp);
+            }
+        }
+        closedir($sampleFp);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/EncodingAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/EncodingAcceptanceTest.php
new file mode 100644
index 000000000..6a4d05d3c
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/EncodingAcceptanceTest.php
@@ -0,0 +1,30 @@
+<?php
+
+require_once 'swift_required.php';
+
+class Swift_EncodingAcceptanceTest extends \PHPUnit_Framework_TestCase
+{
+    public function testGet7BitEncodingReturns7BitEncoder()
+    {
+        $encoder = Swift_Encoding::get7BitEncoding();
+        $this->assertEquals('7bit', $encoder->getName());
+    }
+
+    public function testGet8BitEncodingReturns8BitEncoder()
+    {
+        $encoder = Swift_Encoding::get8BitEncoding();
+        $this->assertEquals('8bit', $encoder->getName());
+    }
+
+    public function testGetQpEncodingReturnsQpEncoder()
+    {
+        $encoder = Swift_Encoding::getQpEncoding();
+        $this->assertEquals('quoted-printable', $encoder->getName());
+    }
+
+    public function testGetBase64EncodingReturnsBase64Encoder()
+    {
+        $encoder = Swift_Encoding::getBase64Encoding();
+        $this->assertEquals('base64', $encoder->getName());
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/KeyCache/ArrayKeyCacheAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/KeyCache/ArrayKeyCacheAcceptanceTest.php
new file mode 100644
index 000000000..6b06e2ee6
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/KeyCache/ArrayKeyCacheAcceptanceTest.php
@@ -0,0 +1,173 @@
+<?php
+
+class Swift_KeyCache_ArrayKeyCacheAcceptanceTest extends \PHPUnit_Framework_TestCase
+{
+    private $_cache;
+    private $_key1 = 'key1';
+    private $_key2 = 'key2';
+
+    public function setUp()
+    {
+        $this->_cache = new Swift_KeyCache_ArrayKeyCache(
+            new Swift_KeyCache_SimpleKeyCacheInputStream()
+            );
+    }
+
+    public function testStringDataCanBeSetAndFetched()
+    {
+        $this->_cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+        $this->assertEquals('test', $this->_cache->getString($this->_key1, 'foo'));
+    }
+
+    public function testStringDataCanBeOverwritten()
+    {
+        $this->_cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+        $this->_cache->setString(
+            $this->_key1, 'foo', 'whatever', Swift_KeyCache::MODE_WRITE
+            );
+        $this->assertEquals('whatever', $this->_cache->getString($this->_key1, 'foo'));
+    }
+
+    public function testStringDataCanBeAppended()
+    {
+        $this->_cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+        $this->_cache->setString(
+            $this->_key1, 'foo', 'ing', Swift_KeyCache::MODE_APPEND
+            );
+        $this->assertEquals('testing', $this->_cache->getString($this->_key1, 'foo'));
+    }
+
+    public function testHasKeyReturnValue()
+    {
+        $this->assertFalse($this->_cache->hasKey($this->_key1, 'foo'));
+        $this->_cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+        $this->assertTrue($this->_cache->hasKey($this->_key1, 'foo'));
+    }
+
+    public function testNsKeyIsWellPartitioned()
+    {
+        $this->_cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+        $this->_cache->setString(
+            $this->_key2, 'foo', 'ing', Swift_KeyCache::MODE_WRITE
+            );
+        $this->assertEquals('test', $this->_cache->getString($this->_key1, 'foo'));
+        $this->assertEquals('ing', $this->_cache->getString($this->_key2, 'foo'));
+    }
+
+    public function testItemKeyIsWellPartitioned()
+    {
+        $this->_cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+        $this->_cache->setString(
+            $this->_key1, 'bar', 'ing', Swift_KeyCache::MODE_WRITE
+            );
+        $this->assertEquals('test', $this->_cache->getString($this->_key1, 'foo'));
+        $this->assertEquals('ing', $this->_cache->getString($this->_key1, 'bar'));
+    }
+
+    public function testByteStreamCanBeImported()
+    {
+        $os = new Swift_ByteStream_ArrayByteStream();
+        $os->write('abcdef');
+
+        $this->_cache->importFromByteStream(
+            $this->_key1, 'foo', $os, Swift_KeyCache::MODE_WRITE
+            );
+        $this->assertEquals('abcdef', $this->_cache->getString($this->_key1, 'foo'));
+    }
+
+    public function testByteStreamCanBeAppended()
+    {
+        $os1 = new Swift_ByteStream_ArrayByteStream();
+        $os1->write('abcdef');
+
+        $os2 = new Swift_ByteStream_ArrayByteStream();
+        $os2->write('xyzuvw');
+
+        $this->_cache->importFromByteStream(
+            $this->_key1, 'foo', $os1, Swift_KeyCache::MODE_APPEND
+            );
+        $this->_cache->importFromByteStream(
+            $this->_key1, 'foo', $os2, Swift_KeyCache::MODE_APPEND
+            );
+
+        $this->assertEquals('abcdefxyzuvw', $this->_cache->getString($this->_key1, 'foo'));
+    }
+
+    public function testByteStreamAndStringCanBeAppended()
+    {
+        $this->_cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_APPEND
+            );
+
+        $os = new Swift_ByteStream_ArrayByteStream();
+        $os->write('abcdef');
+
+        $this->_cache->importFromByteStream(
+            $this->_key1, 'foo', $os, Swift_KeyCache::MODE_APPEND
+            );
+        $this->assertEquals('testabcdef', $this->_cache->getString($this->_key1, 'foo'));
+    }
+
+    public function testDataCanBeExportedToByteStream()
+    {
+        $this->_cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+
+        $is = new Swift_ByteStream_ArrayByteStream();
+
+        $this->_cache->exportToByteStream($this->_key1, 'foo', $is);
+
+        $string = '';
+        while (false !== $bytes = $is->read(8192)) {
+            $string .= $bytes;
+        }
+
+        $this->assertEquals('test', $string);
+    }
+
+    public function testKeyCanBeCleared()
+    {
+        $this->_cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+        $this->assertTrue($this->_cache->hasKey($this->_key1, 'foo'));
+        $this->_cache->clearKey($this->_key1, 'foo');
+        $this->assertFalse($this->_cache->hasKey($this->_key1, 'foo'));
+    }
+
+    public function testNsKeyCanBeCleared()
+    {
+        $this->_cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+        $this->_cache->setString(
+            $this->_key1, 'bar', 'xyz', Swift_KeyCache::MODE_WRITE
+            );
+        $this->assertTrue($this->_cache->hasKey($this->_key1, 'foo'));
+        $this->assertTrue($this->_cache->hasKey($this->_key1, 'bar'));
+        $this->_cache->clearAll($this->_key1);
+        $this->assertFalse($this->_cache->hasKey($this->_key1, 'foo'));
+        $this->assertFalse($this->_cache->hasKey($this->_key1, 'bar'));
+    }
+
+    public function testKeyCacheInputStream()
+    {
+        $is = $this->_cache->getInputByteStream($this->_key1, 'foo');
+        $is->write('abc');
+        $is->write('xyz');
+        $this->assertEquals('abcxyz', $this->_cache->getString($this->_key1, 'foo'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/KeyCache/DiskKeyCacheAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/KeyCache/DiskKeyCacheAcceptanceTest.php
new file mode 100644
index 000000000..392edde8f
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/KeyCache/DiskKeyCacheAcceptanceTest.php
@@ -0,0 +1,183 @@
+<?php
+
+class Swift_KeyCache_DiskKeyCacheAcceptanceTest extends \PHPUnit_Framework_TestCase
+{
+    private $_cache;
+    private $_key1;
+    private $_key2;
+
+    public function setUp()
+    {
+        if (!defined('SWIFT_TMP_DIR')) {
+            $this->markTestSkipped(
+                'Cannot run test without a writable directory to use ('.
+                'define SWIFT_TMP_DIR in tests/config.php if you wish to run this test)'
+             );
+        }
+
+        $this->_key1 = uniqid(microtime(true), true);
+        $this->_key2 = uniqid(microtime(true), true);
+        $this->_cache = new Swift_KeyCache_DiskKeyCache(
+            new Swift_KeyCache_SimpleKeyCacheInputStream(),
+            SWIFT_TMP_DIR
+            );
+    }
+
+    public function testStringDataCanBeSetAndFetched()
+    {
+        $this->_cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+        $this->assertEquals('test', $this->_cache->getString($this->_key1, 'foo'));
+    }
+
+    public function testStringDataCanBeOverwritten()
+    {
+        $this->_cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+        $this->_cache->setString(
+            $this->_key1, 'foo', 'whatever', Swift_KeyCache::MODE_WRITE
+            );
+        $this->assertEquals('whatever', $this->_cache->getString($this->_key1, 'foo'));
+    }
+
+    public function testStringDataCanBeAppended()
+    {
+        $this->_cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+        $this->_cache->setString(
+            $this->_key1, 'foo', 'ing', Swift_KeyCache::MODE_APPEND
+            );
+        $this->assertEquals('testing', $this->_cache->getString($this->_key1, 'foo'));
+    }
+
+    public function testHasKeyReturnValue()
+    {
+        $this->assertFalse($this->_cache->hasKey($this->_key1, 'foo'));
+        $this->_cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+        $this->assertTrue($this->_cache->hasKey($this->_key1, 'foo'));
+    }
+
+    public function testNsKeyIsWellPartitioned()
+    {
+        $this->_cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+        $this->_cache->setString(
+            $this->_key2, 'foo', 'ing', Swift_KeyCache::MODE_WRITE
+            );
+        $this->assertEquals('test', $this->_cache->getString($this->_key1, 'foo'));
+        $this->assertEquals('ing', $this->_cache->getString($this->_key2, 'foo'));
+    }
+
+    public function testItemKeyIsWellPartitioned()
+    {
+        $this->_cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+        $this->_cache->setString(
+            $this->_key1, 'bar', 'ing', Swift_KeyCache::MODE_WRITE
+            );
+        $this->assertEquals('test', $this->_cache->getString($this->_key1, 'foo'));
+        $this->assertEquals('ing', $this->_cache->getString($this->_key1, 'bar'));
+    }
+
+    public function testByteStreamCanBeImported()
+    {
+        $os = new Swift_ByteStream_ArrayByteStream();
+        $os->write('abcdef');
+
+        $this->_cache->importFromByteStream(
+            $this->_key1, 'foo', $os, Swift_KeyCache::MODE_WRITE
+            );
+        $this->assertEquals('abcdef', $this->_cache->getString($this->_key1, 'foo'));
+    }
+
+    public function testByteStreamCanBeAppended()
+    {
+        $os1 = new Swift_ByteStream_ArrayByteStream();
+        $os1->write('abcdef');
+
+        $os2 = new Swift_ByteStream_ArrayByteStream();
+        $os2->write('xyzuvw');
+
+        $this->_cache->importFromByteStream(
+            $this->_key1, 'foo', $os1, Swift_KeyCache::MODE_APPEND
+            );
+        $this->_cache->importFromByteStream(
+            $this->_key1, 'foo', $os2, Swift_KeyCache::MODE_APPEND
+            );
+
+        $this->assertEquals('abcdefxyzuvw', $this->_cache->getString($this->_key1, 'foo'));
+    }
+
+    public function testByteStreamAndStringCanBeAppended()
+    {
+        $this->_cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_APPEND
+            );
+
+        $os = new Swift_ByteStream_ArrayByteStream();
+        $os->write('abcdef');
+
+        $this->_cache->importFromByteStream(
+            $this->_key1, 'foo', $os, Swift_KeyCache::MODE_APPEND
+            );
+        $this->assertEquals('testabcdef', $this->_cache->getString($this->_key1, 'foo'));
+    }
+
+    public function testDataCanBeExportedToByteStream()
+    {
+        $this->_cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+
+        $is = new Swift_ByteStream_ArrayByteStream();
+
+        $this->_cache->exportToByteStream($this->_key1, 'foo', $is);
+
+        $string = '';
+        while (false !== $bytes = $is->read(8192)) {
+            $string .= $bytes;
+        }
+
+        $this->assertEquals('test', $string);
+    }
+
+    public function testKeyCanBeCleared()
+    {
+        $this->_cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+        $this->assertTrue($this->_cache->hasKey($this->_key1, 'foo'));
+        $this->_cache->clearKey($this->_key1, 'foo');
+        $this->assertFalse($this->_cache->hasKey($this->_key1, 'foo'));
+    }
+
+    public function testNsKeyCanBeCleared()
+    {
+        $this->_cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+        $this->_cache->setString(
+            $this->_key1, 'bar', 'xyz', Swift_KeyCache::MODE_WRITE
+            );
+        $this->assertTrue($this->_cache->hasKey($this->_key1, 'foo'));
+        $this->assertTrue($this->_cache->hasKey($this->_key1, 'bar'));
+        $this->_cache->clearAll($this->_key1);
+        $this->assertFalse($this->_cache->hasKey($this->_key1, 'foo'));
+        $this->assertFalse($this->_cache->hasKey($this->_key1, 'bar'));
+    }
+
+    public function testKeyCacheInputStream()
+    {
+        $is = $this->_cache->getInputByteStream($this->_key1, 'foo');
+        $is->write('abc');
+        $is->write('xyz');
+        $this->assertEquals('abcxyz', $this->_cache->getString($this->_key1, 'foo'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/MessageAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/MessageAcceptanceTest.php
new file mode 100644
index 000000000..9372fbfdc
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/MessageAcceptanceTest.php
@@ -0,0 +1,57 @@
+<?php
+
+require_once 'swift_required.php';
+require_once __DIR__.'/Mime/SimpleMessageAcceptanceTest.php';
+
+class Swift_MessageAcceptanceTest extends Swift_Mime_SimpleMessageAcceptanceTest
+{
+    public function testAddPartWrapper()
+    {
+        $message = $this->_createMessage();
+        $message->setSubject('just a test subject');
+        $message->setFrom(array(
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+
+        $id = $message->getId();
+        $date = $message->getDate();
+        $boundary = $message->getBoundary();
+
+        $message->addPart('foo', 'text/plain', 'iso-8859-1');
+        $message->addPart('test <b>foo</b>', 'text/html', 'iso-8859-1');
+
+        $this->assertEquals(
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: Chris Corbyn <chris.corbyn@swiftmailer.org>'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: multipart/alternative;'."\r\n".
+            ' boundary="'.$boundary.'"'."\r\n".
+            "\r\n\r\n".
+            '--'.$boundary."\r\n".
+            'Content-Type: text/plain; charset=iso-8859-1'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n".
+            "\r\n".
+            'foo'.
+            "\r\n\r\n".
+            '--'.$boundary."\r\n".
+            'Content-Type: text/html; charset=iso-8859-1'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n".
+            "\r\n".
+            'test <b>foo</b>'.
+            "\r\n\r\n".
+            '--'.$boundary.'--'."\r\n",
+            $message->toString()
+            );
+    }
+
+    // -- Private helpers
+
+    protected function _createMessage()
+    {
+        Swift_DependencyContainer::getInstance()
+            ->register('properties.charset')->asValue(null);
+
+        return Swift_Message::newInstance();
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/AttachmentAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/AttachmentAcceptanceTest.php
new file mode 100644
index 000000000..e925367e9
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/AttachmentAcceptanceTest.php
@@ -0,0 +1,125 @@
+<?php
+
+class Swift_Mime_AttachmentAcceptanceTest extends \PHPUnit_Framework_TestCase
+{
+    private $_contentEncoder;
+    private $_cache;
+    private $_grammar;
+    private $_headers;
+
+    public function setUp()
+    {
+        $this->_cache = new Swift_KeyCache_ArrayKeyCache(
+            new Swift_KeyCache_SimpleKeyCacheInputStream()
+            );
+        $factory = new Swift_CharacterReaderFactory_SimpleCharacterReaderFactory();
+        $this->_contentEncoder = new Swift_Mime_ContentEncoder_Base64ContentEncoder();
+
+        $headerEncoder = new Swift_Mime_HeaderEncoder_QpHeaderEncoder(
+            new Swift_CharacterStream_ArrayCharacterStream($factory, 'utf-8')
+            );
+        $paramEncoder = new Swift_Encoder_Rfc2231Encoder(
+            new Swift_CharacterStream_ArrayCharacterStream($factory, 'utf-8')
+            );
+        $this->_grammar = new Swift_Mime_Grammar();
+        $this->_headers = new Swift_Mime_SimpleHeaderSet(
+            new Swift_Mime_SimpleHeaderFactory($headerEncoder, $paramEncoder, $this->_grammar)
+            );
+    }
+
+    public function testDispositionIsSetInHeader()
+    {
+        $attachment = $this->_createAttachment();
+        $attachment->setContentType('application/pdf');
+        $attachment->setDisposition('inline');
+        $this->assertEquals(
+            'Content-Type: application/pdf'."\r\n".
+            'Content-Transfer-Encoding: base64'."\r\n".
+            'Content-Disposition: inline'."\r\n",
+            $attachment->toString()
+            );
+    }
+
+    public function testDispositionIsAttachmentByDefault()
+    {
+        $attachment = $this->_createAttachment();
+        $attachment->setContentType('application/pdf');
+        $this->assertEquals(
+            'Content-Type: application/pdf'."\r\n".
+            'Content-Transfer-Encoding: base64'."\r\n".
+            'Content-Disposition: attachment'."\r\n",
+            $attachment->toString()
+            );
+    }
+
+    public function testFilenameIsSetInHeader()
+    {
+        $attachment = $this->_createAttachment();
+        $attachment->setContentType('application/pdf');
+        $attachment->setFilename('foo.pdf');
+        $this->assertEquals(
+            'Content-Type: application/pdf; name=foo.pdf'."\r\n".
+            'Content-Transfer-Encoding: base64'."\r\n".
+            'Content-Disposition: attachment; filename=foo.pdf'."\r\n",
+            $attachment->toString()
+            );
+    }
+
+    public function testSizeIsSetInHeader()
+    {
+        $attachment = $this->_createAttachment();
+        $attachment->setContentType('application/pdf');
+        $attachment->setSize(12340);
+        $this->assertEquals(
+            'Content-Type: application/pdf'."\r\n".
+            'Content-Transfer-Encoding: base64'."\r\n".
+            'Content-Disposition: attachment; size=12340'."\r\n",
+            $attachment->toString()
+            );
+    }
+
+    public function testMultipleParametersInHeader()
+    {
+        $attachment = $this->_createAttachment();
+        $attachment->setContentType('application/pdf');
+        $attachment->setFilename('foo.pdf');
+        $attachment->setSize(12340);
+        $this->assertEquals(
+            'Content-Type: application/pdf; name=foo.pdf'."\r\n".
+            'Content-Transfer-Encoding: base64'."\r\n".
+            'Content-Disposition: attachment; filename=foo.pdf; size=12340'."\r\n",
+            $attachment->toString()
+            );
+    }
+
+    public function testEndToEnd()
+    {
+        $attachment = $this->_createAttachment();
+        $attachment->setContentType('application/pdf');
+        $attachment->setFilename('foo.pdf');
+        $attachment->setSize(12340);
+        $attachment->setBody('abcd');
+        $this->assertEquals(
+            'Content-Type: application/pdf; name=foo.pdf'."\r\n".
+            'Content-Transfer-Encoding: base64'."\r\n".
+            'Content-Disposition: attachment; filename=foo.pdf; size=12340'."\r\n".
+            "\r\n".
+            base64_encode('abcd'),
+            $attachment->toString()
+            );
+    }
+
+    // -- Private helpers
+
+    protected function _createAttachment()
+    {
+        $entity = new Swift_Mime_Attachment(
+            $this->_headers,
+            $this->_contentEncoder,
+            $this->_cache,
+            $this->_grammar
+            );
+
+        return $entity;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/Base64ContentEncoderAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/Base64ContentEncoderAcceptanceTest.php
new file mode 100644
index 000000000..2a5c562b4
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/Base64ContentEncoderAcceptanceTest.php
@@ -0,0 +1,56 @@
+<?php
+
+class Swift_Mime_ContentEncoder_Base64ContentEncoderAcceptanceTest extends \PHPUnit_Framework_TestCase
+{
+    private $_samplesDir;
+    private $_encoder;
+
+    public function setUp()
+    {
+        $this->_samplesDir = realpath(__DIR__.'/../../../../_samples/charsets');
+        $this->_encoder = new Swift_Mime_ContentEncoder_Base64ContentEncoder();
+    }
+
+    public function testEncodingAndDecodingSamples()
+    {
+        $sampleFp = opendir($this->_samplesDir);
+        while (false !== $encodingDir = readdir($sampleFp)) {
+            if (substr($encodingDir, 0, 1) == '.') {
+                continue;
+            }
+
+            $sampleDir = $this->_samplesDir.'/'.$encodingDir;
+
+            if (is_dir($sampleDir)) {
+                $fileFp = opendir($sampleDir);
+                while (false !== $sampleFile = readdir($fileFp)) {
+                    if (substr($sampleFile, 0, 1) == '.') {
+                        continue;
+                    }
+
+                    $text = file_get_contents($sampleDir.'/'.$sampleFile);
+
+                    $os = new Swift_ByteStream_ArrayByteStream();
+                    $os->write($text);
+
+                    $is = new Swift_ByteStream_ArrayByteStream();
+
+                    $this->_encoder->encodeByteStream($os, $is);
+
+                    $encoded = '';
+                    while (false !== $bytes = $is->read(8192)) {
+                        $encoded .= $bytes;
+                    }
+
+                    $this->assertEquals(
+                        base64_decode($encoded), $text,
+                        '%s: Encoded string should decode back to original string for sample '.
+                        $sampleDir.'/'.$sampleFile
+                        );
+                }
+                closedir($fileFp);
+            }
+        }
+        closedir($sampleFp);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/NativeQpContentEncoderAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/NativeQpContentEncoderAcceptanceTest.php
new file mode 100644
index 000000000..ecd7fcd13
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/NativeQpContentEncoderAcceptanceTest.php
@@ -0,0 +1,88 @@
+<?php
+
+class Swift_Mime_ContentEncoder_NativeQpContentEncoderAcceptanceTest extends \PHPUnit_Framework_TestCase
+{
+    protected $_samplesDir;
+
+    /**
+     * @var Swift_Mime_ContentEncoder_NativeQpContentEncoder
+     */
+    protected $_encoder;
+
+    public function setUp()
+    {
+        $this->_samplesDir = realpath(__DIR__.'/../../../../_samples/charsets');
+        $this->_encoder = new Swift_Mime_ContentEncoder_NativeQpContentEncoder();
+    }
+
+    public function testEncodingAndDecodingSamples()
+    {
+        $sampleFp = opendir($this->_samplesDir);
+        while (false !== $encodingDir = readdir($sampleFp)) {
+            if (substr($encodingDir, 0, 1) == '.') {
+                continue;
+            }
+
+            $sampleDir = $this->_samplesDir.'/'.$encodingDir;
+
+            if (is_dir($sampleDir)) {
+                $fileFp = opendir($sampleDir);
+                while (false !== $sampleFile = readdir($fileFp)) {
+                    if (substr($sampleFile, 0, 1) == '.') {
+                        continue;
+                    }
+
+                    $text = file_get_contents($sampleDir.'/'.$sampleFile);
+
+                    $os = new Swift_ByteStream_ArrayByteStream();
+                    $os->write($text);
+
+                    $is = new Swift_ByteStream_ArrayByteStream();
+                    $this->_encoder->encodeByteStream($os, $is);
+
+                    $encoded = '';
+                    while (false !== $bytes = $is->read(8192)) {
+                        $encoded .= $bytes;
+                    }
+
+                    $this->assertEquals(
+                        quoted_printable_decode($encoded),
+                        // CR and LF are converted to CRLF
+                        preg_replace('~\r(?!\n)|(?<!\r)\n~', "\r\n", $text),
+                        '%s: Encoded string should decode back to original string for sample '.$sampleDir.'/'.$sampleFile
+                    );
+                }
+                closedir($fileFp);
+            }
+        }
+        closedir($sampleFp);
+    }
+
+    public function testEncodingAndDecodingSamplesFromDiConfiguredInstance()
+    {
+        $encoder = $this->_createEncoderFromContainer();
+        $this->assertSame('=C3=A4=C3=B6=C3=BC=C3=9F', $encoder->encodeString('äöüß'));
+    }
+
+    /**
+     * @expectedException RuntimeException
+     */
+    public function testCharsetChangeNotImplemented()
+    {
+        $this->_encoder->charsetChanged('utf-8');
+        $this->_encoder->charsetChanged('charset');
+        $this->_encoder->encodeString('foo');
+    }
+
+    public function testGetName()
+    {
+        $this->assertSame('quoted-printable', $this->_encoder->getName());
+    }
+
+    private function _createEncoderFromContainer()
+    {
+        return Swift_DependencyContainer::getInstance()
+            ->lookup('mime.nativeqpcontentencoder')
+            ;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/PlainContentEncoderAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/PlainContentEncoderAcceptanceTest.php
new file mode 100644
index 000000000..1541b7eac
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/PlainContentEncoderAcceptanceTest.php
@@ -0,0 +1,88 @@
+<?php
+
+class Swift_Mime_ContentEncoder_PlainContentEncoderAcceptanceTest extends \PHPUnit_Framework_TestCase
+{
+    private $_samplesDir;
+    private $_encoder;
+
+    public function setUp()
+    {
+        $this->_samplesDir = realpath(__DIR__.'/../../../../_samples/charsets');
+        $this->_encoder = new Swift_Mime_ContentEncoder_PlainContentEncoder('8bit');
+    }
+
+    public function testEncodingAndDecodingSamplesString()
+    {
+        $sampleFp = opendir($this->_samplesDir);
+        while (false !== $encodingDir = readdir($sampleFp)) {
+            if (substr($encodingDir, 0, 1) == '.') {
+                continue;
+            }
+
+            $sampleDir = $this->_samplesDir.'/'.$encodingDir;
+
+            if (is_dir($sampleDir)) {
+                $fileFp = opendir($sampleDir);
+                while (false !== $sampleFile = readdir($fileFp)) {
+                    if (substr($sampleFile, 0, 1) == '.') {
+                        continue;
+                    }
+
+                    $text = file_get_contents($sampleDir.'/'.$sampleFile);
+                    $encodedText = $this->_encoder->encodeString($text);
+
+                    $this->assertEquals(
+                        $encodedText, $text,
+                        '%s: Encoded string should be identical to original string for sample '.
+                        $sampleDir.'/'.$sampleFile
+                        );
+                }
+                closedir($fileFp);
+            }
+        }
+        closedir($sampleFp);
+    }
+
+    public function testEncodingAndDecodingSamplesByteStream()
+    {
+        $sampleFp = opendir($this->_samplesDir);
+        while (false !== $encodingDir = readdir($sampleFp)) {
+            if (substr($encodingDir, 0, 1) == '.') {
+                continue;
+            }
+
+            $sampleDir = $this->_samplesDir.'/'.$encodingDir;
+
+            if (is_dir($sampleDir)) {
+                $fileFp = opendir($sampleDir);
+                while (false !== $sampleFile = readdir($fileFp)) {
+                    if (substr($sampleFile, 0, 1) == '.') {
+                        continue;
+                    }
+
+                    $text = file_get_contents($sampleDir.'/'.$sampleFile);
+
+                    $os = new Swift_ByteStream_ArrayByteStream();
+                    $os->write($text);
+
+                    $is = new Swift_ByteStream_ArrayByteStream();
+
+                    $this->_encoder->encodeByteStream($os, $is);
+
+                    $encoded = '';
+                    while (false !== $bytes = $is->read(8192)) {
+                        $encoded .= $bytes;
+                    }
+
+                    $this->assertEquals(
+                        $encoded, $text,
+                        '%s: Encoded string should be identical to original string for sample '.
+                        $sampleDir.'/'.$sampleFile
+                        );
+                }
+                closedir($fileFp);
+            }
+        }
+        closedir($sampleFp);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/QpContentEncoderAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/QpContentEncoderAcceptanceTest.php
new file mode 100644
index 000000000..84f7e03bc
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/ContentEncoder/QpContentEncoderAcceptanceTest.php
@@ -0,0 +1,160 @@
+<?php
+
+class Swift_Mime_ContentEncoder_QpContentEncoderAcceptanceTest extends \PHPUnit_Framework_TestCase
+{
+    private $_samplesDir;
+    private $_factory;
+
+    public function setUp()
+    {
+        $this->_samplesDir = realpath(__DIR__.'/../../../../_samples/charsets');
+        $this->_factory = new Swift_CharacterReaderFactory_SimpleCharacterReaderFactory();
+    }
+
+    public function tearDown()
+    {
+        Swift_Preferences::getInstance()->setQPDotEscape(false);
+    }
+
+    public function testEncodingAndDecodingSamples()
+    {
+        $sampleFp = opendir($this->_samplesDir);
+        while (false !== $encodingDir = readdir($sampleFp)) {
+            if (substr($encodingDir, 0, 1) == '.') {
+                continue;
+            }
+
+            $encoding = $encodingDir;
+            $charStream = new Swift_CharacterStream_NgCharacterStream(
+                $this->_factory, $encoding);
+            $encoder = new Swift_Mime_ContentEncoder_QpContentEncoder($charStream);
+
+            $sampleDir = $this->_samplesDir.'/'.$encodingDir;
+
+            if (is_dir($sampleDir)) {
+                $fileFp = opendir($sampleDir);
+                while (false !== $sampleFile = readdir($fileFp)) {
+                    if (substr($sampleFile, 0, 1) == '.') {
+                        continue;
+                    }
+
+                    $text = file_get_contents($sampleDir.'/'.$sampleFile);
+
+                    $os = new Swift_ByteStream_ArrayByteStream();
+                    $os->write($text);
+
+                    $is = new Swift_ByteStream_ArrayByteStream();
+                    $encoder->encodeByteStream($os, $is);
+
+                    $encoded = '';
+                    while (false !== $bytes = $is->read(8192)) {
+                        $encoded .= $bytes;
+                    }
+
+                    $this->assertEquals(
+                        quoted_printable_decode($encoded), $text,
+                        '%s: Encoded string should decode back to original string for sample '.
+                        $sampleDir.'/'.$sampleFile
+                        );
+                }
+                closedir($fileFp);
+            }
+        }
+        closedir($sampleFp);
+    }
+
+    public function testEncodingAndDecodingSamplesFromDiConfiguredInstance()
+    {
+        $sampleFp = opendir($this->_samplesDir);
+        while (false !== $encodingDir = readdir($sampleFp)) {
+            if (substr($encodingDir, 0, 1) == '.') {
+                continue;
+            }
+
+            $encoding = $encodingDir;
+            $encoder = $this->_createEncoderFromContainer();
+
+            $sampleDir = $this->_samplesDir.'/'.$encodingDir;
+
+            if (is_dir($sampleDir)) {
+                $fileFp = opendir($sampleDir);
+                while (false !== $sampleFile = readdir($fileFp)) {
+                    if (substr($sampleFile, 0, 1) == '.') {
+                        continue;
+                    }
+
+                    $text = file_get_contents($sampleDir.'/'.$sampleFile);
+
+                    $os = new Swift_ByteStream_ArrayByteStream();
+                    $os->write($text);
+
+                    $is = new Swift_ByteStream_ArrayByteStream();
+                    $encoder->encodeByteStream($os, $is);
+
+                    $encoded = '';
+                    while (false !== $bytes = $is->read(8192)) {
+                        $encoded .= $bytes;
+                    }
+
+                    $this->assertEquals(
+                        str_replace("\r\n", "\n", quoted_printable_decode($encoded)), str_replace("\r\n", "\n", $text),
+                        '%s: Encoded string should decode back to original string for sample '.
+                        $sampleDir.'/'.$sampleFile
+                        );
+                }
+                closedir($fileFp);
+            }
+        }
+        closedir($sampleFp);
+    }
+
+    public function testEncodingLFTextWithDiConfiguredInstance()
+    {
+        $encoder = $this->_createEncoderFromContainer();
+        $this->assertEquals("a\r\nb\r\nc", $encoder->encodeString("a\nb\nc"));
+    }
+
+    public function testEncodingCRTextWithDiConfiguredInstance()
+    {
+        $encoder = $this->_createEncoderFromContainer();
+        $this->assertEquals("a\r\nb\r\nc", $encoder->encodeString("a\rb\rc"));
+    }
+
+    public function testEncodingLFCRTextWithDiConfiguredInstance()
+    {
+        $encoder = $this->_createEncoderFromContainer();
+        $this->assertEquals("a\r\n\r\nb\r\n\r\nc", $encoder->encodeString("a\n\rb\n\rc"));
+    }
+
+    public function testEncodingCRLFTextWithDiConfiguredInstance()
+    {
+        $encoder = $this->_createEncoderFromContainer();
+        $this->assertEquals("a\r\nb\r\nc", $encoder->encodeString("a\r\nb\r\nc"));
+    }
+
+    public function testEncodingDotStuffingWithDiConfiguredInstance()
+    {
+        // Enable DotEscaping
+        Swift_Preferences::getInstance()->setQPDotEscape(true);
+        $encoder = $this->_createEncoderFromContainer();
+        $this->assertEquals("a=2E\r\n=2E\r\n=2Eb\r\nc", $encoder->encodeString("a.\r\n.\r\n.b\r\nc"));
+        // Return to default
+        Swift_Preferences::getInstance()->setQPDotEscape(false);
+        $encoder = $this->_createEncoderFromContainer();
+        $this->assertEquals("a.\r\n.\r\n.b\r\nc", $encoder->encodeString("a.\r\n.\r\n.b\r\nc"));
+    }
+
+    public function testDotStuffingEncodingAndDecodingSamplesFromDiConfiguredInstance()
+    {
+        // Enable DotEscaping
+        Swift_Preferences::getInstance()->setQPDotEscape(true);
+        $this->testEncodingAndDecodingSamplesFromDiConfiguredInstance();
+    }
+
+    private function _createEncoderFromContainer()
+    {
+        return Swift_DependencyContainer::getInstance()
+            ->lookup('mime.qpcontentencoder')
+            ;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/EmbeddedFileAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/EmbeddedFileAcceptanceTest.php
new file mode 100644
index 000000000..8a04df6b0
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/EmbeddedFileAcceptanceTest.php
@@ -0,0 +1,138 @@
+<?php
+
+class Swift_Mime_EmbeddedFileAcceptanceTest extends \PHPUnit_Framework_TestCase
+{
+    private $_contentEncoder;
+    private $_cache;
+    private $_grammar;
+    private $_headers;
+
+    public function setUp()
+    {
+        $this->_cache = new Swift_KeyCache_ArrayKeyCache(
+            new Swift_KeyCache_SimpleKeyCacheInputStream()
+            );
+        $factory = new Swift_CharacterReaderFactory_SimpleCharacterReaderFactory();
+        $this->_contentEncoder = new Swift_Mime_ContentEncoder_Base64ContentEncoder();
+
+        $headerEncoder = new Swift_Mime_HeaderEncoder_QpHeaderEncoder(
+            new Swift_CharacterStream_ArrayCharacterStream($factory, 'utf-8')
+            );
+        $paramEncoder = new Swift_Encoder_Rfc2231Encoder(
+            new Swift_CharacterStream_ArrayCharacterStream($factory, 'utf-8')
+            );
+        $this->_grammar = new Swift_Mime_Grammar();
+        $this->_headers = new Swift_Mime_SimpleHeaderSet(
+            new Swift_Mime_SimpleHeaderFactory($headerEncoder, $paramEncoder, $this->_grammar)
+            );
+    }
+
+    public function testContentIdIsSetInHeader()
+    {
+        $file = $this->_createEmbeddedFile();
+        $file->setContentType('application/pdf');
+        $file->setId('foo@bar');
+        $this->assertEquals(
+            'Content-Type: application/pdf'."\r\n".
+            'Content-Transfer-Encoding: base64'."\r\n".
+            'Content-ID: <foo@bar>'."\r\n".
+            'Content-Disposition: inline'."\r\n",
+            $file->toString()
+            );
+    }
+
+    public function testDispositionIsSetInHeader()
+    {
+        $file = $this->_createEmbeddedFile();
+        $id = $file->getId();
+        $file->setContentType('application/pdf');
+        $file->setDisposition('attachment');
+        $this->assertEquals(
+            'Content-Type: application/pdf'."\r\n".
+            'Content-Transfer-Encoding: base64'."\r\n".
+            'Content-ID: <'.$id.'>'."\r\n".
+            'Content-Disposition: attachment'."\r\n",
+            $file->toString()
+            );
+    }
+
+    public function testFilenameIsSetInHeader()
+    {
+        $file = $this->_createEmbeddedFile();
+        $id = $file->getId();
+        $file->setContentType('application/pdf');
+        $file->setFilename('foo.pdf');
+        $this->assertEquals(
+            'Content-Type: application/pdf; name=foo.pdf'."\r\n".
+            'Content-Transfer-Encoding: base64'."\r\n".
+            'Content-ID: <'.$id.'>'."\r\n".
+            'Content-Disposition: inline; filename=foo.pdf'."\r\n",
+            $file->toString()
+            );
+    }
+
+    public function testSizeIsSetInHeader()
+    {
+        $file = $this->_createEmbeddedFile();
+        $id = $file->getId();
+        $file->setContentType('application/pdf');
+        $file->setSize(12340);
+        $this->assertEquals(
+            'Content-Type: application/pdf'."\r\n".
+            'Content-Transfer-Encoding: base64'."\r\n".
+            'Content-ID: <'.$id.'>'."\r\n".
+            'Content-Disposition: inline; size=12340'."\r\n",
+            $file->toString()
+            );
+    }
+
+    public function testMultipleParametersInHeader()
+    {
+        $file = $this->_createEmbeddedFile();
+        $id = $file->getId();
+        $file->setContentType('application/pdf');
+        $file->setFilename('foo.pdf');
+        $file->setSize(12340);
+
+        $this->assertEquals(
+            'Content-Type: application/pdf; name=foo.pdf'."\r\n".
+            'Content-Transfer-Encoding: base64'."\r\n".
+            'Content-ID: <'.$id.'>'."\r\n".
+            'Content-Disposition: inline; filename=foo.pdf; size=12340'."\r\n",
+            $file->toString()
+            );
+    }
+
+    public function testEndToEnd()
+    {
+        $file = $this->_createEmbeddedFile();
+        $id = $file->getId();
+        $file->setContentType('application/pdf');
+        $file->setFilename('foo.pdf');
+        $file->setSize(12340);
+        $file->setBody('abcd');
+        $this->assertEquals(
+            'Content-Type: application/pdf; name=foo.pdf'."\r\n".
+            'Content-Transfer-Encoding: base64'."\r\n".
+            'Content-ID: <'.$id.'>'."\r\n".
+            'Content-Disposition: inline; filename=foo.pdf; size=12340'."\r\n".
+            "\r\n".
+            base64_encode('abcd'),
+            $file->toString()
+            );
+    }
+
+    // -- Private helpers
+
+    protected function _createEmbeddedFile()
+    {
+        $entity = new Swift_Mime_EmbeddedFile(
+            $this->_headers,
+            $this->_contentEncoder,
+            $this->_cache,
+            $this->_grammar
+            );
+
+        return $entity;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/HeaderEncoder/Base64HeaderEncoderAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/HeaderEncoder/Base64HeaderEncoderAcceptanceTest.php
new file mode 100644
index 000000000..304867a48
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/HeaderEncoder/Base64HeaderEncoderAcceptanceTest.php
@@ -0,0 +1,32 @@
+<?php
+
+class Swift_Mime_HeaderEncoder_Base64HeaderEncoderAcceptanceTest extends \PHPUnit_Framework_TestCase
+{
+    private $_encoder;
+
+    public function setUp()
+    {
+        $this->_encoder = new Swift_Mime_HeaderEncoder_Base64HeaderEncoder();
+    }
+
+    public function testEncodingJIS()
+    {
+        if (function_exists('mb_convert_encoding')) {
+            // base64_encode and split cannot handle long JIS text to fold
+            $subject = '長い長い長い長い長い長い長い長い長い長い長い長い長い長い長い長い長い長い長い長い件名';
+
+            $encodedWrapperLength = strlen('=?iso-2022-jp?'.$this->_encoder->getName().'??=');
+
+            $old = mb_internal_encoding();
+            mb_internal_encoding('utf-8');
+            $newstring = mb_encode_mimeheader($subject, 'iso-2022-jp', 'B', "\r\n");
+            mb_internal_encoding($old);
+
+            $encoded = $this->_encoder->encodeString($subject, 0, 75 - $encodedWrapperLength, 'iso-2022-jp');
+            $this->assertEquals(
+                $encoded, $newstring,
+                'Encoded string should decode back to original string for sample '
+            );
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/MimePartAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/MimePartAcceptanceTest.php
new file mode 100644
index 000000000..8232fe63b
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/MimePartAcceptanceTest.php
@@ -0,0 +1,129 @@
+<?php
+
+class Swift_Mime_MimePartAcceptanceTest extends \PHPUnit_Framework_TestCase
+{
+    private $_contentEncoder;
+    private $_cache;
+    private $_grammar;
+    private $_headers;
+
+    public function setUp()
+    {
+        $this->_cache = new Swift_KeyCache_ArrayKeyCache(
+            new Swift_KeyCache_SimpleKeyCacheInputStream()
+            );
+        $factory = new Swift_CharacterReaderFactory_SimpleCharacterReaderFactory();
+        $this->_contentEncoder = new Swift_Mime_ContentEncoder_QpContentEncoder(
+            new Swift_CharacterStream_ArrayCharacterStream($factory, 'utf-8'),
+            new Swift_StreamFilters_ByteArrayReplacementFilter(
+                array(array(0x0D, 0x0A), array(0x0D), array(0x0A)),
+                array(array(0x0A), array(0x0A), array(0x0D, 0x0A))
+                )
+            );
+
+        $headerEncoder = new Swift_Mime_HeaderEncoder_QpHeaderEncoder(
+            new Swift_CharacterStream_ArrayCharacterStream($factory, 'utf-8')
+            );
+        $paramEncoder = new Swift_Encoder_Rfc2231Encoder(
+            new Swift_CharacterStream_ArrayCharacterStream($factory, 'utf-8')
+            );
+        $this->_grammar = new Swift_Mime_Grammar();
+        $this->_headers = new Swift_Mime_SimpleHeaderSet(
+            new Swift_Mime_SimpleHeaderFactory($headerEncoder, $paramEncoder, $this->_grammar)
+            );
+    }
+
+    public function testCharsetIsSetInHeader()
+    {
+        $part = $this->_createMimePart();
+        $part->setContentType('text/plain');
+        $part->setCharset('utf-8');
+        $part->setBody('foobar');
+        $this->assertEquals(
+            'Content-Type: text/plain; charset=utf-8'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n".
+            "\r\n".
+            'foobar',
+            $part->toString()
+            );
+    }
+
+    public function testFormatIsSetInHeaders()
+    {
+        $part = $this->_createMimePart();
+        $part->setContentType('text/plain');
+        $part->setFormat('flowed');
+        $part->setBody('> foobar');
+        $this->assertEquals(
+            'Content-Type: text/plain; format=flowed'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n".
+            "\r\n".
+            '> foobar',
+            $part->toString()
+            );
+    }
+
+    public function testDelSpIsSetInHeaders()
+    {
+        $part = $this->_createMimePart();
+        $part->setContentType('text/plain');
+        $part->setDelSp(true);
+        $part->setBody('foobar');
+        $this->assertEquals(
+            'Content-Type: text/plain; delsp=yes'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n".
+            "\r\n".
+            'foobar',
+            $part->toString()
+            );
+    }
+
+    public function testAll3ParamsInHeaders()
+    {
+        $part = $this->_createMimePart();
+        $part->setContentType('text/plain');
+        $part->setCharset('utf-8');
+        $part->setFormat('fixed');
+        $part->setDelSp(true);
+        $part->setBody('foobar');
+        $this->assertEquals(
+            'Content-Type: text/plain; charset=utf-8; format=fixed; delsp=yes'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n".
+            "\r\n".
+            'foobar',
+            $part->toString()
+            );
+    }
+
+    public function testBodyIsCanonicalized()
+    {
+        $part = $this->_createMimePart();
+        $part->setContentType('text/plain');
+        $part->setCharset('utf-8');
+        $part->setBody("foobar\r\rtest\ning\r");
+        $this->assertEquals(
+            'Content-Type: text/plain; charset=utf-8'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n".
+            "\r\n".
+            "foobar\r\n".
+            "\r\n".
+            "test\r\n".
+            "ing\r\n",
+            $part->toString()
+            );
+    }
+
+    // -- Private helpers
+
+    protected function _createMimePart()
+    {
+        $entity = new Swift_Mime_MimePart(
+            $this->_headers,
+            $this->_contentEncoder,
+            $this->_cache,
+            $this->_grammar
+            );
+
+        return $entity;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/SimpleMessageAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/SimpleMessageAcceptanceTest.php
new file mode 100644
index 000000000..cd6d910d6
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Mime/SimpleMessageAcceptanceTest.php
@@ -0,0 +1,1251 @@
+<?php
+
+class Swift_Mime_SimpleMessageAcceptanceTest extends \PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        Swift_Preferences::getInstance()->setCharset(null); //TODO: Test with the charset defined
+    }
+
+    public function testBasicHeaders()
+    {
+        /* -- RFC 2822, 3.6.
+     */
+
+        $message = $this->_createMessage();
+        $id = $message->getId();
+        $date = $message->getDate();
+        $this->assertEquals(
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'From: '."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/plain'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n",
+            $message->toString(),
+            '%s: Only required headers, and non-empty headers should be displayed'
+            );
+    }
+
+    public function testSubjectIsDisplayedIfSet()
+    {
+        $message = $this->_createMessage();
+        $message->setSubject('just a test subject');
+        $id = $message->getId();
+        $date = $message->getDate();
+        $this->assertEquals(
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: '."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/plain'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testDateCanBeSet()
+    {
+        $message = $this->_createMessage();
+        $message->setSubject('just a test subject');
+        $id = $message->getId();
+        $message->setDate(1234);
+        $this->assertEquals(
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', 1234)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: '."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/plain'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testMessageIdCanBeSet()
+    {
+        $message = $this->_createMessage();
+        $message->setSubject('just a test subject');
+        $message->setId('foo@bar');
+        $date = $message->getDate();
+        $this->assertEquals(
+            'Message-ID: <foo@bar>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: '."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/plain'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testContentTypeCanBeChanged()
+    {
+        $message = $this->_createMessage();
+        $message->setSubject('just a test subject');
+        $message->setContentType('text/html');
+        $id = $message->getId();
+        $date = $message->getDate();
+        $this->assertEquals(
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: '."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/html'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testCharsetCanBeSet()
+    {
+        $message = $this->_createMessage();
+        $message->setSubject('just a test subject');
+        $message->setContentType('text/html');
+        $message->setCharset('iso-8859-1');
+        $id = $message->getId();
+        $date = $message->getDate();
+        $this->assertEquals(
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: '."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/html; charset=iso-8859-1'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testFormatCanBeSet()
+    {
+        $message = $this->_createMessage();
+        $message->setSubject('just a test subject');
+        $message->setFormat('flowed');
+        $id = $message->getId();
+        $date = $message->getDate();
+        $this->assertEquals(
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: '."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/plain; format=flowed'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testEncoderCanBeSet()
+    {
+        $message = $this->_createMessage();
+        $message->setSubject('just a test subject');
+        $message->setContentType('text/html');
+        $message->setEncoder(
+            new Swift_Mime_ContentEncoder_PlainContentEncoder('7bit')
+            );
+        $id = $message->getId();
+        $date = $message->getDate();
+        $this->assertEquals(
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: '."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/html'."\r\n".
+            'Content-Transfer-Encoding: 7bit'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testFromAddressCanBeSet()
+    {
+        $message = $this->_createMessage();
+        $message->setSubject('just a test subject');
+        $message->setFrom('chris.corbyn@swiftmailer.org');
+        $id = $message->getId();
+        $date = $message->getDate();
+        $this->assertEquals(
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: chris.corbyn@swiftmailer.org'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/plain'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testFromAddressCanBeSetWithName()
+    {
+        $message = $this->_createMessage();
+        $message->setSubject('just a test subject');
+        $message->setFrom(array('chris.corbyn@swiftmailer.org' => 'Chris Corbyn'));
+        $id = $message->getId();
+        $date = $message->getDate();
+        $this->assertEquals(
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: Chris Corbyn <chris.corbyn@swiftmailer.org>'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/plain'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testMultipleFromAddressesCanBeSet()
+    {
+        $message = $this->_createMessage();
+        $message->setSubject('just a test subject');
+        $message->setFrom(array(
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn',
+            'mark@swiftmailer.org',
+            ));
+        $id = $message->getId();
+        $date = $message->getDate();
+        $this->assertEquals(
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: Chris Corbyn <chris.corbyn@swiftmailer.org>, mark@swiftmailer.org'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/plain'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testReturnPathAddressCanBeSet()
+    {
+        $message = $this->_createMessage();
+        $message->setReturnPath('chris@w3style.co.uk');
+        $message->setSubject('just a test subject');
+        $message->setFrom(array(
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+        $id = $message->getId();
+        $date = $message->getDate();
+        $this->assertEquals(
+            'Return-Path: <chris@w3style.co.uk>'."\r\n".
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: Chris Corbyn <chris.corbyn@swiftmailer.org>'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/plain'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testEmptyReturnPathHeaderCanBeUsed()
+    {
+        $message = $this->_createMessage();
+        $message->setReturnPath('');
+        $message->setSubject('just a test subject');
+        $message->setFrom(array(
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+        $id = $message->getId();
+        $date = $message->getDate();
+        $this->assertEquals(
+            'Return-Path: <>'."\r\n".
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: Chris Corbyn <chris.corbyn@swiftmailer.org>'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/plain'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testSenderCanBeSet()
+    {
+        $message = $this->_createMessage();
+        $message->setSubject('just a test subject');
+        $message->setSender('chris.corbyn@swiftmailer.org');
+        $id = $message->getId();
+        $date = $message->getDate();
+        $this->assertEquals(
+            'Sender: chris.corbyn@swiftmailer.org'."\r\n".
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: '."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/plain'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testSenderCanBeSetWithName()
+    {
+        $message = $this->_createMessage();
+        $message->setSubject('just a test subject');
+        $message->setSender(array('chris.corbyn@swiftmailer.org' => 'Chris'));
+        $id = $message->getId();
+        $date = $message->getDate();
+        $this->assertEquals(
+            'Sender: Chris <chris.corbyn@swiftmailer.org>'."\r\n".
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: '."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/plain'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testReplyToCanBeSet()
+    {
+        $message = $this->_createMessage();
+        $message->setSubject('just a test subject');
+        $message->setFrom(array('chris.corbyn@swiftmailer.org' => 'Chris'));
+        $message->setReplyTo(array('chris@w3style.co.uk' => 'Myself'));
+        $id = $message->getId();
+        $date = $message->getDate();
+        $this->assertEquals(
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: Chris <chris.corbyn@swiftmailer.org>'."\r\n".
+            'Reply-To: Myself <chris@w3style.co.uk>'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/plain'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testMultipleReplyAddressCanBeUsed()
+    {
+        $message = $this->_createMessage();
+        $message->setSubject('just a test subject');
+        $message->setFrom(array('chris.corbyn@swiftmailer.org' => 'Chris'));
+        $message->setReplyTo(array(
+            'chris@w3style.co.uk' => 'Myself',
+            'my.other@address.com' => 'Me',
+            ));
+        $id = $message->getId();
+        $date = $message->getDate();
+        $this->assertEquals(
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: Chris <chris.corbyn@swiftmailer.org>'."\r\n".
+            'Reply-To: Myself <chris@w3style.co.uk>, Me <my.other@address.com>'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/plain'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testToAddressCanBeSet()
+    {
+        $message = $this->_createMessage();
+        $message->setSubject('just a test subject');
+        $message->setFrom(array('chris.corbyn@swiftmailer.org' => 'Chris'));
+        $message->setReplyTo(array(
+            'chris@w3style.co.uk' => 'Myself',
+            'my.other@address.com' => 'Me',
+            ));
+        $message->setTo('mark@swiftmailer.org');
+        $id = $message->getId();
+        $date = $message->getDate();
+        $this->assertEquals(
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: Chris <chris.corbyn@swiftmailer.org>'."\r\n".
+            'Reply-To: Myself <chris@w3style.co.uk>, Me <my.other@address.com>'."\r\n".
+            'To: mark@swiftmailer.org'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/plain'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testMultipleToAddressesCanBeSet()
+    {
+        $message = $this->_createMessage();
+        $message->setSubject('just a test subject');
+        $message->setFrom(array('chris.corbyn@swiftmailer.org' => 'Chris'));
+        $message->setReplyTo(array(
+            'chris@w3style.co.uk' => 'Myself',
+            'my.other@address.com' => 'Me',
+            ));
+        $message->setTo(array(
+            'mark@swiftmailer.org', 'chris@swiftmailer.org' => 'Chris Corbyn',
+            ));
+        $id = $message->getId();
+        $date = $message->getDate();
+        $this->assertEquals(
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: Chris <chris.corbyn@swiftmailer.org>'."\r\n".
+            'Reply-To: Myself <chris@w3style.co.uk>, Me <my.other@address.com>'."\r\n".
+            'To: mark@swiftmailer.org, Chris Corbyn <chris@swiftmailer.org>'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/plain'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testCcAddressCanBeSet()
+    {
+        $message = $this->_createMessage();
+        $message->setSubject('just a test subject');
+        $message->setFrom(array('chris.corbyn@swiftmailer.org' => 'Chris'));
+        $message->setReplyTo(array(
+            'chris@w3style.co.uk' => 'Myself',
+            'my.other@address.com' => 'Me',
+            ));
+        $message->setTo(array(
+            'mark@swiftmailer.org', 'chris@swiftmailer.org' => 'Chris Corbyn',
+            ));
+        $message->setCc('john@some-site.com');
+        $id = $message->getId();
+        $date = $message->getDate();
+        $this->assertEquals(
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: Chris <chris.corbyn@swiftmailer.org>'."\r\n".
+            'Reply-To: Myself <chris@w3style.co.uk>, Me <my.other@address.com>'."\r\n".
+            'To: mark@swiftmailer.org, Chris Corbyn <chris@swiftmailer.org>'."\r\n".
+            'Cc: john@some-site.com'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/plain'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testMultipleCcAddressesCanBeSet()
+    {
+        $message = $this->_createMessage();
+        $message->setSubject('just a test subject');
+        $message->setFrom(array('chris.corbyn@swiftmailer.org' => 'Chris'));
+        $message->setReplyTo(array(
+            'chris@w3style.co.uk' => 'Myself',
+            'my.other@address.com' => 'Me',
+            ));
+        $message->setTo(array(
+            'mark@swiftmailer.org', 'chris@swiftmailer.org' => 'Chris Corbyn',
+            ));
+        $message->setCc(array(
+            'john@some-site.com' => 'John West',
+            'fred@another-site.co.uk' => 'Big Fred',
+            ));
+        $id = $message->getId();
+        $date = $message->getDate();
+        $this->assertEquals(
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: Chris <chris.corbyn@swiftmailer.org>'."\r\n".
+            'Reply-To: Myself <chris@w3style.co.uk>, Me <my.other@address.com>'."\r\n".
+            'To: mark@swiftmailer.org, Chris Corbyn <chris@swiftmailer.org>'."\r\n".
+            'Cc: John West <john@some-site.com>, Big Fred <fred@another-site.co.uk>'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/plain'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testBccAddressCanBeSet()
+    {
+        //Obviously Transports need to setBcc(array()) and send to each Bcc recipient
+        // separately in accordance with RFC 2822/2821
+        $message = $this->_createMessage();
+        $message->setSubject('just a test subject');
+        $message->setFrom(array('chris.corbyn@swiftmailer.org' => 'Chris'));
+        $message->setReplyTo(array(
+            'chris@w3style.co.uk' => 'Myself',
+            'my.other@address.com' => 'Me',
+            ));
+        $message->setTo(array(
+            'mark@swiftmailer.org', 'chris@swiftmailer.org' => 'Chris Corbyn',
+            ));
+        $message->setCc(array(
+            'john@some-site.com' => 'John West',
+            'fred@another-site.co.uk' => 'Big Fred',
+            ));
+        $message->setBcc('x@alphabet.tld');
+        $id = $message->getId();
+        $date = $message->getDate();
+        $this->assertEquals(
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: Chris <chris.corbyn@swiftmailer.org>'."\r\n".
+            'Reply-To: Myself <chris@w3style.co.uk>, Me <my.other@address.com>'."\r\n".
+            'To: mark@swiftmailer.org, Chris Corbyn <chris@swiftmailer.org>'."\r\n".
+            'Cc: John West <john@some-site.com>, Big Fred <fred@another-site.co.uk>'."\r\n".
+            'Bcc: x@alphabet.tld'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/plain'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testMultipleBccAddressesCanBeSet()
+    {
+        //Obviously Transports need to setBcc(array()) and send to each Bcc recipient
+        // separately in accordance with RFC 2822/2821
+        $message = $this->_createMessage();
+        $message->setSubject('just a test subject');
+        $message->setFrom(array('chris.corbyn@swiftmailer.org' => 'Chris'));
+        $message->setReplyTo(array(
+            'chris@w3style.co.uk' => 'Myself',
+            'my.other@address.com' => 'Me',
+            ));
+        $message->setTo(array(
+            'mark@swiftmailer.org', 'chris@swiftmailer.org' => 'Chris Corbyn',
+            ));
+        $message->setCc(array(
+            'john@some-site.com' => 'John West',
+            'fred@another-site.co.uk' => 'Big Fred',
+            ));
+        $message->setBcc(array('x@alphabet.tld', 'a@alphabet.tld' => 'A'));
+        $id = $message->getId();
+        $date = $message->getDate();
+        $this->assertEquals(
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: Chris <chris.corbyn@swiftmailer.org>'."\r\n".
+            'Reply-To: Myself <chris@w3style.co.uk>, Me <my.other@address.com>'."\r\n".
+            'To: mark@swiftmailer.org, Chris Corbyn <chris@swiftmailer.org>'."\r\n".
+            'Cc: John West <john@some-site.com>, Big Fred <fred@another-site.co.uk>'."\r\n".
+            'Bcc: x@alphabet.tld, A <a@alphabet.tld>'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/plain'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testStringBodyIsAppended()
+    {
+        $message = $this->_createMessage();
+        $message->setReturnPath('chris@w3style.co.uk');
+        $message->setSubject('just a test subject');
+        $message->setFrom(array(
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+        $message->setBody(
+            'just a test body'."\r\n".
+            'with a new line'
+            );
+        $id = $message->getId();
+        $date = $message->getDate();
+        $this->assertEquals(
+            'Return-Path: <chris@w3style.co.uk>'."\r\n".
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: Chris Corbyn <chris.corbyn@swiftmailer.org>'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/plain'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n".
+            "\r\n".
+            'just a test body'."\r\n".
+            'with a new line',
+            $message->toString()
+            );
+    }
+
+    public function testStringBodyIsEncoded()
+    {
+        $message = $this->_createMessage();
+        $message->setReturnPath('chris@w3style.co.uk');
+        $message->setSubject('just a test subject');
+        $message->setFrom(array(
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+        $message->setBody(
+            'Just s'.pack('C*', 0xC2, 0x01, 0x01).'me multi-'."\r\n".
+            'line message!'
+            );
+        $id = $message->getId();
+        $date = $message->getDate();
+        $this->assertEquals(
+            'Return-Path: <chris@w3style.co.uk>'."\r\n".
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: Chris Corbyn <chris.corbyn@swiftmailer.org>'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/plain'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n".
+            "\r\n".
+            'Just s=C2=01=01me multi-'."\r\n".
+            'line message!',
+            $message->toString()
+            );
+    }
+
+    public function testChildrenCanBeAttached()
+    {
+        $message = $this->_createMessage();
+        $message->setReturnPath('chris@w3style.co.uk');
+        $message->setSubject('just a test subject');
+        $message->setFrom(array(
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+
+        $id = $message->getId();
+        $date = $message->getDate();
+        $boundary = $message->getBoundary();
+
+        $part1 = $this->_createMimePart();
+        $part1->setContentType('text/plain');
+        $part1->setCharset('iso-8859-1');
+        $part1->setBody('foo');
+
+        $message->attach($part1);
+
+        $part2 = $this->_createMimePart();
+        $part2->setContentType('text/html');
+        $part2->setCharset('iso-8859-1');
+        $part2->setBody('test <b>foo</b>');
+
+        $message->attach($part2);
+
+        $this->assertEquals(
+            'Return-Path: <chris@w3style.co.uk>'."\r\n".
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: Chris Corbyn <chris.corbyn@swiftmailer.org>'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: multipart/alternative;'."\r\n".
+            ' boundary="'.$boundary.'"'."\r\n".
+            "\r\n\r\n".
+            '--'.$boundary."\r\n".
+            'Content-Type: text/plain; charset=iso-8859-1'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n".
+            "\r\n".
+            'foo'.
+            "\r\n\r\n".
+            '--'.$boundary."\r\n".
+            'Content-Type: text/html; charset=iso-8859-1'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n".
+            "\r\n".
+            'test <b>foo</b>'.
+            "\r\n\r\n".
+            '--'.$boundary.'--'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testAttachmentsBeingAttached()
+    {
+        $message = $this->_createMessage();
+        $message->setReturnPath('chris@w3style.co.uk');
+        $message->setSubject('just a test subject');
+        $message->setFrom(array(
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+
+        $id = $message->getId();
+        $date = preg_quote(date('r', $message->getDate()), '~');
+        $boundary = $message->getBoundary();
+
+        $part = $this->_createMimePart();
+        $part->setContentType('text/plain');
+        $part->setCharset('iso-8859-1');
+        $part->setBody('foo');
+
+        $message->attach($part);
+
+        $attachment = $this->_createAttachment();
+        $attachment->setContentType('application/pdf');
+        $attachment->setFilename('foo.pdf');
+        $attachment->setBody('<pdf data>');
+
+        $message->attach($attachment);
+
+        $this->assertRegExp(
+            '~^'.
+            'Return-Path: <chris@w3style.co.uk>'."\r\n".
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.$date."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: Chris Corbyn <chris.corbyn@swiftmailer.org>'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: multipart/mixed;'."\r\n".
+            ' boundary="'.$boundary.'"'."\r\n".
+            "\r\n\r\n".
+            '--'.$boundary."\r\n".
+            'Content-Type: multipart/alternative;'."\r\n".
+            ' boundary="(.*?)"'."\r\n".
+            "\r\n\r\n".
+            '--\\1'."\r\n".
+            'Content-Type: text/plain; charset=iso-8859-1'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n".
+            "\r\n".
+            'foo'.
+            "\r\n\r\n".
+            '--\\1--'."\r\n".
+            "\r\n\r\n".
+            '--'.$boundary."\r\n".
+            'Content-Type: application/pdf; name=foo.pdf'."\r\n".
+            'Content-Transfer-Encoding: base64'."\r\n".
+            'Content-Disposition: attachment; filename=foo.pdf'."\r\n".
+            "\r\n".
+            preg_quote(base64_encode('<pdf data>'), '~').
+            "\r\n\r\n".
+            '--'.$boundary.'--'."\r\n".
+            '$~D',
+            $message->toString()
+            );
+    }
+
+    public function testAttachmentsAndEmbeddedFilesBeingAttached()
+    {
+        $message = $this->_createMessage();
+        $message->setReturnPath('chris@w3style.co.uk');
+        $message->setSubject('just a test subject');
+        $message->setFrom(array(
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+
+        $id = $message->getId();
+        $date = preg_quote(date('r', $message->getDate()), '~');
+        $boundary = $message->getBoundary();
+
+        $part = $this->_createMimePart();
+        $part->setContentType('text/plain');
+        $part->setCharset('iso-8859-1');
+        $part->setBody('foo');
+
+        $message->attach($part);
+
+        $attachment = $this->_createAttachment();
+        $attachment->setContentType('application/pdf');
+        $attachment->setFilename('foo.pdf');
+        $attachment->setBody('<pdf data>');
+
+        $message->attach($attachment);
+
+        $file = $this->_createEmbeddedFile();
+        $file->setContentType('image/jpeg');
+        $file->setFilename('myimage.jpg');
+        $file->setBody('<image data>');
+
+        $message->attach($file);
+
+        $cid = $file->getId();
+
+        $this->assertRegExp(
+            '~^'.
+            'Return-Path: <chris@w3style.co.uk>'."\r\n".
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.$date."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: Chris Corbyn <chris.corbyn@swiftmailer.org>'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: multipart/mixed;'."\r\n".
+            ' boundary="'.$boundary.'"'."\r\n".
+            "\r\n\r\n".
+            '--'.$boundary."\r\n".
+            'Content-Type: multipart/alternative;'."\r\n".
+            ' boundary="(.*?)"'."\r\n".
+            "\r\n\r\n".
+            '--\\1'."\r\n".
+            'Content-Type: text/plain; charset=iso-8859-1'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n".
+            "\r\n".
+            'foo'.
+
+            "\r\n\r\n".
+            '--\\1'."\r\n".
+            'Content-Type: multipart/related;'."\r\n".
+            ' boundary="(.*?)"'."\r\n".
+            "\r\n\r\n".
+            '--\\2'."\r\n".
+            'Content-Type: image/jpeg; name=myimage.jpg'."\r\n".
+            'Content-Transfer-Encoding: base64'."\r\n".
+            'Content-ID: <'.$cid.'>'."\r\n".
+            'Content-Disposition: inline; filename=myimage.jpg'."\r\n".
+            "\r\n".
+            preg_quote(base64_encode('<image data>'), '~').
+            "\r\n\r\n".
+            '--\\2--'."\r\n".
+            "\r\n\r\n".
+            '--\\1--'."\r\n".
+            "\r\n\r\n".
+            '--'.$boundary."\r\n".
+            'Content-Type: application/pdf; name=foo.pdf'."\r\n".
+            'Content-Transfer-Encoding: base64'."\r\n".
+            'Content-Disposition: attachment; filename=foo.pdf'."\r\n".
+            "\r\n".
+            preg_quote(base64_encode('<pdf data>'), '~').
+            "\r\n\r\n".
+            '--'.$boundary.'--'."\r\n".
+            '$~D',
+            $message->toString()
+            );
+    }
+
+    public function testComplexEmbeddingOfContent()
+    {
+        $message = $this->_createMessage();
+        $message->setReturnPath('chris@w3style.co.uk');
+        $message->setSubject('just a test subject');
+        $message->setFrom(array(
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+
+        $id = $message->getId();
+        $date = preg_quote(date('r', $message->getDate()), '~');
+        $boundary = $message->getBoundary();
+
+        $attachment = $this->_createAttachment();
+        $attachment->setContentType('application/pdf');
+        $attachment->setFilename('foo.pdf');
+        $attachment->setBody('<pdf data>');
+
+        $message->attach($attachment);
+
+        $file = $this->_createEmbeddedFile();
+        $file->setContentType('image/jpeg');
+        $file->setFilename('myimage.jpg');
+        $file->setBody('<image data>');
+
+        $part = $this->_createMimePart();
+        $part->setContentType('text/html');
+        $part->setCharset('iso-8859-1');
+        $part->setBody('foo <img src="'.$message->embed($file).'" />');
+
+        $message->attach($part);
+
+        $cid = $file->getId();
+
+        $this->assertRegExp(
+            '~^'.
+            'Return-Path: <chris@w3style.co.uk>'."\r\n".
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.$date."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: Chris Corbyn <chris.corbyn@swiftmailer.org>'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: multipart/mixed;'."\r\n".
+            ' boundary="'.$boundary.'"'."\r\n".
+            "\r\n\r\n".
+            '--'.$boundary."\r\n".
+            'Content-Type: multipart/related;'."\r\n".
+            ' boundary="(.*?)"'."\r\n".
+            "\r\n\r\n".
+            '--\\1'."\r\n".
+            'Content-Type: text/html; charset=iso-8859-1'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n".
+            "\r\n".
+            'foo <img src=3D"cid:'.$cid.'" />'.//=3D is just = in QP
+            "\r\n\r\n".
+            '--\\1'."\r\n".
+            'Content-Type: image/jpeg; name=myimage.jpg'."\r\n".
+            'Content-Transfer-Encoding: base64'."\r\n".
+            'Content-ID: <'.$cid.'>'."\r\n".
+            'Content-Disposition: inline; filename=myimage.jpg'."\r\n".
+            "\r\n".
+            preg_quote(base64_encode('<image data>'), '~').
+            "\r\n\r\n".
+            '--\\1--'."\r\n".
+            "\r\n\r\n".
+            '--'.$boundary."\r\n".
+            'Content-Type: application/pdf; name=foo.pdf'."\r\n".
+            'Content-Transfer-Encoding: base64'."\r\n".
+            'Content-Disposition: attachment; filename=foo.pdf'."\r\n".
+            "\r\n".
+            preg_quote(base64_encode('<pdf data>'), '~').
+            "\r\n\r\n".
+            '--'.$boundary.'--'."\r\n".
+            '$~D',
+            $message->toString()
+            );
+    }
+
+    public function testAttachingAndDetachingContent()
+    {
+        $message = $this->_createMessage();
+        $message->setReturnPath('chris@w3style.co.uk');
+        $message->setSubject('just a test subject');
+        $message->setFrom(array(
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+
+        $id = $message->getId();
+        $date = preg_quote(date('r', $message->getDate()), '~');
+        $boundary = $message->getBoundary();
+
+        $part = $this->_createMimePart();
+        $part->setContentType('text/plain');
+        $part->setCharset('iso-8859-1');
+        $part->setBody('foo');
+
+        $message->attach($part);
+
+        $attachment = $this->_createAttachment();
+        $attachment->setContentType('application/pdf');
+        $attachment->setFilename('foo.pdf');
+        $attachment->setBody('<pdf data>');
+
+        $message->attach($attachment);
+
+        $file = $this->_createEmbeddedFile();
+        $file->setContentType('image/jpeg');
+        $file->setFilename('myimage.jpg');
+        $file->setBody('<image data>');
+
+        $message->attach($file);
+
+        $cid = $file->getId();
+
+        $message->detach($attachment);
+
+        $this->assertRegExp(
+            '~^'.
+            'Return-Path: <chris@w3style.co.uk>'."\r\n".
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.$date."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: Chris Corbyn <chris.corbyn@swiftmailer.org>'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: multipart/alternative;'."\r\n".
+            ' boundary="'.$boundary.'"'."\r\n".
+            "\r\n\r\n".
+            '--'.$boundary."\r\n".
+            'Content-Type: text/plain; charset=iso-8859-1'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n".
+            "\r\n".
+            'foo'.
+            "\r\n\r\n".
+            '--'.$boundary."\r\n".
+            'Content-Type: multipart/related;'."\r\n".
+            ' boundary="(.*?)"'."\r\n".
+            "\r\n\r\n".
+            '--\\1'."\r\n".
+            'Content-Type: image/jpeg; name=myimage.jpg'."\r\n".
+            'Content-Transfer-Encoding: base64'."\r\n".
+            'Content-ID: <'.$cid.'>'."\r\n".
+            'Content-Disposition: inline; filename=myimage.jpg'."\r\n".
+            "\r\n".
+            preg_quote(base64_encode('<image data>'), '~').
+            "\r\n\r\n".
+            '--\\1--'."\r\n".
+            "\r\n\r\n".
+            '--'.$boundary.'--'."\r\n".
+            '$~D',
+            $message->toString(),
+            '%s: Attachment should have been detached'
+            );
+    }
+
+    public function testBoundaryDoesNotAppearAfterAllPartsAreDetached()
+    {
+        $message = $this->_createMessage();
+        $message->setReturnPath('chris@w3style.co.uk');
+        $message->setSubject('just a test subject');
+        $message->setFrom(array(
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+
+        $id = $message->getId();
+        $date = $message->getDate();
+        $boundary = $message->getBoundary();
+
+        $part1 = $this->_createMimePart();
+        $part1->setContentType('text/plain');
+        $part1->setCharset('iso-8859-1');
+        $part1->setBody('foo');
+
+        $message->attach($part1);
+
+        $part2 = $this->_createMimePart();
+        $part2->setContentType('text/html');
+        $part2->setCharset('iso-8859-1');
+        $part2->setBody('test <b>foo</b>');
+
+        $message->attach($part2);
+
+        $message->detach($part1);
+        $message->detach($part2);
+
+        $this->assertEquals(
+            'Return-Path: <chris@w3style.co.uk>'."\r\n".
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: Chris Corbyn <chris.corbyn@swiftmailer.org>'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/plain'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n",
+            $message->toString(),
+            '%s: Message should be restored to orignal state after parts are detached'
+            );
+    }
+
+    public function testCharsetFormatOrDelSpAreNotShownWhenBoundaryIsSet()
+    {
+        $message = $this->_createMessage();
+        $message->setReturnPath('chris@w3style.co.uk');
+        $message->setSubject('just a test subject');
+        $message->setFrom(array(
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+        $message->setCharset('utf-8');
+        $message->setFormat('flowed');
+        $message->setDelSp(true);
+
+        $id = $message->getId();
+        $date = $message->getDate();
+        $boundary = $message->getBoundary();
+
+        $part1 = $this->_createMimePart();
+        $part1->setContentType('text/plain');
+        $part1->setCharset('iso-8859-1');
+        $part1->setBody('foo');
+
+        $message->attach($part1);
+
+        $part2 = $this->_createMimePart();
+        $part2->setContentType('text/html');
+        $part2->setCharset('iso-8859-1');
+        $part2->setBody('test <b>foo</b>');
+
+        $message->attach($part2);
+
+        $this->assertEquals(
+            'Return-Path: <chris@w3style.co.uk>'."\r\n".
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: Chris Corbyn <chris.corbyn@swiftmailer.org>'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: multipart/alternative;'."\r\n".
+            ' boundary="'.$boundary.'"'."\r\n".
+            "\r\n\r\n".
+            '--'.$boundary."\r\n".
+            'Content-Type: text/plain; charset=iso-8859-1'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n".
+            "\r\n".
+            'foo'.
+            "\r\n\r\n".
+            '--'.$boundary."\r\n".
+            'Content-Type: text/html; charset=iso-8859-1'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n".
+            "\r\n".
+            'test <b>foo</b>'.
+            "\r\n\r\n".
+            '--'.$boundary.'--'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testBodyCanBeSetWithAttachments()
+    {
+        $message = $this->_createMessage();
+        $message->setReturnPath('chris@w3style.co.uk');
+        $message->setSubject('just a test subject');
+        $message->setFrom(array(
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+        $message->setContentType('text/html');
+        $message->setCharset('iso-8859-1');
+        $message->setBody('foo');
+
+        $id = $message->getId();
+        $date = date('r', $message->getDate());
+        $boundary = $message->getBoundary();
+
+        $attachment = $this->_createAttachment();
+        $attachment->setContentType('application/pdf');
+        $attachment->setFilename('foo.pdf');
+        $attachment->setBody('<pdf data>');
+
+        $message->attach($attachment);
+
+        $this->assertEquals(
+            'Return-Path: <chris@w3style.co.uk>'."\r\n".
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.$date."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: Chris Corbyn <chris.corbyn@swiftmailer.org>'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: multipart/mixed;'."\r\n".
+            ' boundary="'.$boundary.'"'."\r\n".
+            "\r\n\r\n".
+            '--'.$boundary."\r\n".
+            'Content-Type: text/html; charset=iso-8859-1'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n".
+            "\r\n".
+            'foo'.
+            "\r\n\r\n".
+            '--'.$boundary."\r\n".
+            'Content-Type: application/pdf; name=foo.pdf'."\r\n".
+            'Content-Transfer-Encoding: base64'."\r\n".
+            'Content-Disposition: attachment; filename=foo.pdf'."\r\n".
+            "\r\n".
+            base64_encode('<pdf data>').
+            "\r\n\r\n".
+            '--'.$boundary.'--'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testHtmlPartAlwaysAppearsLast()
+    {
+        $message = $this->_createMessage();
+        $message->setReturnPath('chris@w3style.co.uk');
+        $message->setSubject('just a test subject');
+        $message->setFrom(array(
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+
+        $id = $message->getId();
+        $date = date('r', $message->getDate());
+        $boundary = $message->getBoundary();
+
+        $part1 = $this->_createMimePart();
+        $part1->setContentType('text/html');
+        $part1->setBody('foo');
+
+        $part2 = $this->_createMimePart();
+        $part2->setContentType('text/plain');
+        $part2->setBody('bar');
+
+        $message->attach($part1);
+        $message->attach($part2);
+
+        $this->assertEquals(
+            'Return-Path: <chris@w3style.co.uk>'."\r\n".
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.$date."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: Chris Corbyn <chris.corbyn@swiftmailer.org>'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: multipart/alternative;'."\r\n".
+            ' boundary="'.$boundary.'"'."\r\n".
+            "\r\n\r\n".
+            '--'.$boundary."\r\n".
+            'Content-Type: text/plain'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n".
+            "\r\n".
+            'bar'.
+            "\r\n\r\n".
+            '--'.$boundary."\r\n".
+            'Content-Type: text/html'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n".
+            "\r\n".
+            'foo'.
+            "\r\n\r\n".
+            '--'.$boundary.'--'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testBodyBecomesPartIfOtherPartsAttached()
+    {
+        $message = $this->_createMessage();
+        $message->setReturnPath('chris@w3style.co.uk');
+        $message->setSubject('just a test subject');
+        $message->setFrom(array(
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+        $message->setContentType('text/html');
+        $message->setBody('foo');
+
+        $id = $message->getId();
+        $date = date('r', $message->getDate());
+        $boundary = $message->getBoundary();
+
+        $part2 = $this->_createMimePart();
+        $part2->setContentType('text/plain');
+        $part2->setBody('bar');
+
+        $message->attach($part2);
+
+        $this->assertEquals(
+            'Return-Path: <chris@w3style.co.uk>'."\r\n".
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.$date."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: Chris Corbyn <chris.corbyn@swiftmailer.org>'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: multipart/alternative;'."\r\n".
+            ' boundary="'.$boundary.'"'."\r\n".
+            "\r\n\r\n".
+            '--'.$boundary."\r\n".
+            'Content-Type: text/plain'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n".
+            "\r\n".
+            'bar'.
+            "\r\n\r\n".
+            '--'.$boundary."\r\n".
+            'Content-Type: text/html'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n".
+            "\r\n".
+            'foo'.
+            "\r\n\r\n".
+            '--'.$boundary.'--'."\r\n",
+            $message->toString()
+            );
+    }
+
+    public function testBodyIsCanonicalized()
+    {
+        $message = $this->_createMessage();
+        $message->setReturnPath('chris@w3style.co.uk');
+        $message->setSubject('just a test subject');
+        $message->setFrom(array(
+            'chris.corbyn@swiftmailer.org' => 'Chris Corbyn', ));
+        $message->setBody(
+            'just a test body'."\n".
+            'with a new line'
+            );
+        $id = $message->getId();
+        $date = $message->getDate();
+        $this->assertEquals(
+            'Return-Path: <chris@w3style.co.uk>'."\r\n".
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.date('r', $date)."\r\n".
+            'Subject: just a test subject'."\r\n".
+            'From: Chris Corbyn <chris.corbyn@swiftmailer.org>'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: text/plain'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n".
+            "\r\n".
+            'just a test body'."\r\n".
+            'with a new line',
+            $message->toString()
+            );
+    }
+
+    // -- Private helpers
+
+    protected function _createMessage()
+    {
+        return new Swift_Message();
+    }
+
+    protected function _createMimePart()
+    {
+        return new Swift_MimePart();
+    }
+
+    protected function _createAttachment()
+    {
+        return new Swift_Attachment();
+    }
+
+    protected function _createEmbeddedFile()
+    {
+        return new Swift_EmbeddedFile();
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/MimePartAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/MimePartAcceptanceTest.php
new file mode 100644
index 000000000..f42405dfd
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/MimePartAcceptanceTest.php
@@ -0,0 +1,15 @@
+<?php
+
+require_once 'swift_required.php';
+require_once __DIR__.'/Mime/MimePartAcceptanceTest.php';
+
+class Swift_MimePartAcceptanceTest extends Swift_Mime_MimePartAcceptanceTest
+{
+    protected function _createMimePart()
+    {
+        Swift_DependencyContainer::getInstance()
+            ->register('properties.charset')->asValue(null);
+
+        return Swift_MimePart::newInstance();
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/AbstractStreamBufferAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/AbstractStreamBufferAcceptanceTest.php
new file mode 100644
index 000000000..465f2c189
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/AbstractStreamBufferAcceptanceTest.php
@@ -0,0 +1,134 @@
+<?php
+
+abstract class Swift_Transport_StreamBuffer_AbstractStreamBufferAcceptanceTest
+    extends \PHPUnit_Framework_TestCase
+{
+    protected $_buffer;
+
+    abstract protected function _initializeBuffer();
+
+    public function setUp()
+    {
+        if (true == getenv('TRAVIS')) {
+            $this->markTestSkipped(
+                'Will fail on travis-ci if not skipped due to travis blocking '.
+                'socket mailing tcp connections.'
+             );
+        }
+
+        $this->_buffer = new Swift_Transport_StreamBuffer(
+            $this->getMock('Swift_ReplacementFilterFactory')
+        );
+    }
+
+    public function testReadLine()
+    {
+        $this->_initializeBuffer();
+
+        $line = $this->_buffer->readLine(0);
+        $this->assertRegExp('/^[0-9]{3}.*?\r\n$/D', $line);
+        $seq = $this->_buffer->write("QUIT\r\n");
+        $this->assertTrue((bool) $seq);
+        $line = $this->_buffer->readLine($seq);
+        $this->assertRegExp('/^[0-9]{3}.*?\r\n$/D', $line);
+        $this->_buffer->terminate();
+    }
+
+    public function testWrite()
+    {
+        $this->_initializeBuffer();
+
+        $line = $this->_buffer->readLine(0);
+        $this->assertRegExp('/^[0-9]{3}.*?\r\n$/D', $line);
+
+        $seq = $this->_buffer->write("HELO foo\r\n");
+        $this->assertTrue((bool) $seq);
+        $line = $this->_buffer->readLine($seq);
+        $this->assertRegExp('/^[0-9]{3}.*?\r\n$/D', $line);
+
+        $seq = $this->_buffer->write("QUIT\r\n");
+        $this->assertTrue((bool) $seq);
+        $line = $this->_buffer->readLine($seq);
+        $this->assertRegExp('/^[0-9]{3}.*?\r\n$/D', $line);
+        $this->_buffer->terminate();
+    }
+
+    public function testBindingOtherStreamsMirrorsWriteOperations()
+    {
+        $this->_initializeBuffer();
+
+        $is1 = $this->_createMockInputStream();
+        $is2 = $this->_createMockInputStream();
+
+        $is1->expects($this->at(0))
+            ->method('write')
+            ->with('x');
+        $is1->expects($this->at(1))
+            ->method('write')
+            ->with('y');
+        $is2->expects($this->at(0))
+            ->method('write')
+            ->with('x');
+        $is2->expects($this->at(1))
+            ->method('write')
+            ->with('y');
+
+        $this->_buffer->bind($is1);
+        $this->_buffer->bind($is2);
+
+        $this->_buffer->write('x');
+        $this->_buffer->write('y');
+    }
+
+    public function testBindingOtherStreamsMirrorsFlushOperations()
+    {
+        $this->_initializeBuffer();
+
+        $is1 = $this->_createMockInputStream();
+        $is2 = $this->_createMockInputStream();
+
+        $is1->expects($this->once())
+            ->method('flushBuffers');
+        $is2->expects($this->once())
+            ->method('flushBuffers');
+
+        $this->_buffer->bind($is1);
+        $this->_buffer->bind($is2);
+
+        $this->_buffer->flushBuffers();
+    }
+
+    public function testUnbindingStreamPreventsFurtherWrites()
+    {
+        $this->_initializeBuffer();
+
+        $is1 = $this->_createMockInputStream();
+        $is2 = $this->_createMockInputStream();
+
+        $is1->expects($this->at(0))
+            ->method('write')
+            ->with('x');
+        $is1->expects($this->at(1))
+            ->method('write')
+            ->with('y');
+        $is2->expects($this->once())
+            ->method('write')
+            ->with('x');
+
+        $this->_buffer->bind($is1);
+        $this->_buffer->bind($is2);
+
+        $this->_buffer->write('x');
+
+        $this->_buffer->unbind($is2);
+
+        $this->_buffer->write('y');
+    }
+
+    // -- Creation Methods
+
+    private function _createMockInputStream()
+    {
+        return $this->getMock('Swift_InputByteStream');
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/BasicSocketAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/BasicSocketAcceptanceTest.php
new file mode 100644
index 000000000..b3e5cd8fc
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/BasicSocketAcceptanceTest.php
@@ -0,0 +1,34 @@
+<?php
+
+require_once __DIR__.'/AbstractStreamBufferAcceptanceTest.php';
+
+class Swift_Transport_StreamBuffer_BasicSocketAcceptanceTest
+    extends Swift_Transport_StreamBuffer_AbstractStreamBufferAcceptanceTest
+{
+    public function setUp()
+    {
+        if (!defined('SWIFT_SMTP_HOST')) {
+            $this->markTestSkipped(
+                'Cannot run test without an SMTP host to connect to (define '.
+                'SWIFT_SMTP_HOST in tests/acceptance.conf.php if you wish to run this test)'
+             );
+        }
+        parent::setUp();
+    }
+
+    protected function _initializeBuffer()
+    {
+        $parts = explode(':', SWIFT_SMTP_HOST);
+        $host = $parts[0];
+        $port = isset($parts[1]) ? $parts[1] : 25;
+
+        $this->_buffer->initialize(array(
+            'type' => Swift_Transport_IoBuffer::TYPE_SOCKET,
+            'host' => $host,
+            'port' => $port,
+            'protocol' => 'tcp',
+            'blocking' => 1,
+            'timeout' => 15,
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/ProcessAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/ProcessAcceptanceTest.php
new file mode 100644
index 000000000..b4e88a7ab
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/ProcessAcceptanceTest.php
@@ -0,0 +1,27 @@
+<?php
+
+require_once __DIR__.'/AbstractStreamBufferAcceptanceTest.php';
+
+class Swift_Transport_StreamBuffer_ProcessAcceptanceTest
+    extends Swift_Transport_StreamBuffer_AbstractStreamBufferAcceptanceTest
+{
+    public function setUp()
+    {
+        if (!defined('SWIFT_SENDMAIL_PATH')) {
+            $this->markTestSkipped(
+                'Cannot run test without a path to sendmail (define '.
+                'SWIFT_SENDMAIL_PATH in tests/acceptance.conf.php if you wish to run this test)'
+             );
+        }
+
+        parent::setUp();
+    }
+
+    protected function _initializeBuffer()
+    {
+        $this->_buffer->initialize(array(
+            'type' => Swift_Transport_IoBuffer::TYPE_PROCESS,
+            'command' => SWIFT_SENDMAIL_PATH.' -bs',
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SocketTimeoutTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SocketTimeoutTest.php
new file mode 100644
index 000000000..3ee7448de
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SocketTimeoutTest.php
@@ -0,0 +1,67 @@
+<?php
+
+class Swift_Transport_StreamBuffer_SocketTimeoutTest extends \PHPUnit_Framework_TestCase
+{
+    protected $_buffer;
+
+    protected $_randomHighPort;
+
+    protected $_server;
+
+    public function setUp()
+    {
+        if (!defined('SWIFT_SMTP_HOST')) {
+            $this->markTestSkipped(
+                'Cannot run test without an SMTP host to connect to (define '.
+                'SWIFT_SMTP_HOST in tests/acceptance.conf.php if you wish to run this test)'
+             );
+        }
+
+        $serverStarted = false;
+        for ($i = 0; $i < 5; ++$i) {
+            $this->_randomHighPort = rand(50000, 65000);
+            $this->_server = stream_socket_server('tcp://127.0.0.1:'.$this->_randomHighPort);
+            if ($this->_server) {
+                $serverStarted = true;
+            }
+        }
+
+        $this->_buffer = new Swift_Transport_StreamBuffer(
+            $this->getMock('Swift_ReplacementFilterFactory')
+        );
+    }
+
+    protected function _initializeBuffer()
+    {
+        $host = '127.0.0.1';
+        $port = $this->_randomHighPort;
+
+        $this->_buffer->initialize(array(
+            'type' => Swift_Transport_IoBuffer::TYPE_SOCKET,
+            'host' => $host,
+            'port' => $port,
+            'protocol' => 'tcp',
+            'blocking' => 1,
+            'timeout' => 1,
+        ));
+    }
+
+    public function testTimeoutException()
+    {
+        $this->_initializeBuffer();
+        $e = null;
+        try {
+            $line = $this->_buffer->readLine(0);
+        } catch (Exception $e) {
+        }
+        $this->assertInstanceof('Swift_IoException', $e, 'IO Exception Not Thrown On Connection Timeout');
+        $this->assertRegExp('/Connection to .* Timed Out/', $e->getMessage());
+    }
+
+    public function tearDown()
+    {
+        if ($this->_server) {
+            stream_socket_shutdown($this->_server, STREAM_SHUT_RDWR);
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SslSocketAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SslSocketAcceptanceTest.php
new file mode 100644
index 000000000..c257a6b56
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/SslSocketAcceptanceTest.php
@@ -0,0 +1,41 @@
+<?php
+
+require_once __DIR__.'/AbstractStreamBufferAcceptanceTest.php';
+
+class Swift_Transport_StreamBuffer_SslSocketAcceptanceTest
+    extends Swift_Transport_StreamBuffer_AbstractStreamBufferAcceptanceTest
+{
+    public function setUp()
+    {
+        $streams = stream_get_transports();
+        if (!in_array('ssl', $streams)) {
+            $this->markTestSkipped(
+                'SSL is not configured for your system.  It is not possible to run this test'
+             );
+        }
+        if (!defined('SWIFT_SSL_HOST')) {
+            $this->markTestSkipped(
+                'Cannot run test without an SSL enabled SMTP host to connect to (define '.
+                'SWIFT_SSL_HOST in tests/acceptance.conf.php if you wish to run this test)'
+             );
+        }
+
+        parent::setUp();
+    }
+
+    protected function _initializeBuffer()
+    {
+        $parts = explode(':', SWIFT_SSL_HOST);
+        $host = $parts[0];
+        $port = isset($parts[1]) ? $parts[1] : 25;
+
+        $this->_buffer->initialize(array(
+            'type' => Swift_Transport_IoBuffer::TYPE_SOCKET,
+            'host' => $host,
+            'port' => $port,
+            'protocol' => 'ssl',
+            'blocking' => 1,
+            'timeout' => 15,
+        ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/TlsSocketAcceptanceTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/TlsSocketAcceptanceTest.php
new file mode 100644
index 000000000..314fffe25
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/acceptance/Swift/Transport/StreamBuffer/TlsSocketAcceptanceTest.php
@@ -0,0 +1,40 @@
+<?php
+
+require_once __DIR__.'/AbstractStreamBufferAcceptanceTest.php';
+
+class Swift_Transport_StreamBuffer_TlsSocketAcceptanceTest
+    extends Swift_Transport_StreamBuffer_AbstractStreamBufferAcceptanceTest
+{
+    public function setUp()
+    {
+        $streams = stream_get_transports();
+        if (!in_array('tls', $streams)) {
+            $this->markTestSkipped(
+                'TLS is not configured for your system.  It is not possible to run this test'
+             );
+        }
+        if (!defined('SWIFT_TLS_HOST')) {
+            $this->markTestSkipped(
+                'Cannot run test without a TLS enabled SMTP host to connect to (define '.
+                'SWIFT_TLS_HOST in tests/acceptance.conf.php if you wish to run this test)'
+             );
+        }
+        parent::setUp();
+    }
+
+    protected function _initializeBuffer()
+    {
+        $parts = explode(':', SWIFT_TLS_HOST);
+        $host = $parts[0];
+        $port = isset($parts[1]) ? $parts[1] : 25;
+
+        $this->_buffer->initialize(array(
+            'type' => Swift_Transport_IoBuffer::TYPE_SOCKET,
+            'host' => $host,
+            'port' => $port,
+            'protocol' => 'tls',
+            'blocking' => 1,
+            'timeout' => 15,
+            ));
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bootstrap.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bootstrap.php
new file mode 100644
index 000000000..27091a28e
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bootstrap.php
@@ -0,0 +1,21 @@
+<?php
+
+require_once dirname(__DIR__).'/vendor/autoload.php';
+
+// Disable garbage collector to prevent segfaults
+gc_disable();
+
+set_include_path(get_include_path().PATH_SEPARATOR.dirname(__DIR__).'/lib');
+
+Mockery::getConfiguration()->allowMockingNonExistentMethods(true);
+
+if (is_file(__DIR__.'/acceptance.conf.php')) {
+    require_once __DIR__.'/acceptance.conf.php';
+}
+if (is_file(__DIR__.'/smoke.conf.php')) {
+    require_once __DIR__.'/smoke.conf.php';
+}
+require_once __DIR__.'/StreamCollector.php';
+require_once __DIR__.'/IdenticalBinaryConstraint.php';
+require_once __DIR__.'/SwiftMailerTestCase.php';
+require_once __DIR__.'/SwiftMailerSmokeTestCase.php';
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug111Test.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug111Test.php
new file mode 100644
index 000000000..ba29ba87a
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug111Test.php
@@ -0,0 +1,42 @@
+<?php
+
+class Swift_Bug111Test extends \PHPUnit_Framework_TestCase
+{
+    public function testUnstructuredHeaderSlashesShouldNotBeEscaped()
+    {
+        $complicated_header = array(
+            'to' => array(
+                'email1@example.com',
+                'email2@example.com',
+                'email3@example.com',
+                'email4@example.com',
+                'email5@example.com',
+            ),
+            'sub' => array(
+                '-name-' => array(
+                    'email1',
+                    '"email2"',
+                    'email3\\',
+                    'email4',
+                    'email5',
+                ),
+                '-url-' => array(
+                    'http://google.com',
+                    'http://yahoo.com',
+                    'http://hotmail.com',
+                    'http://aol.com',
+                    'http://facebook.com',
+                ),
+            ),
+        );
+        $json = json_encode($complicated_header);
+
+        $message = new Swift_Message();
+        $headers = $message->getHeaders();
+        $headers->addTextHeader('X-SMTPAPI', $json);
+        $header = $headers->get('X-SMTPAPI');
+
+        $this->assertEquals('Swift_Mime_Headers_UnstructuredHeader', get_class($header));
+        $this->assertEquals($json, $header->getFieldBody());
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug118Test.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug118Test.php
new file mode 100644
index 000000000..bd10c7163
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug118Test.php
@@ -0,0 +1,20 @@
+<?php
+
+class Swift_Bug118Test extends \PHPUnit_Framework_TestCase
+{
+    private $_message;
+
+    public function setUp()
+    {
+        $this->_message = new Swift_Message();
+    }
+
+    public function testCallingGenerateIdChangesTheMessageId()
+    {
+        $currentId = $this->_message->getId();
+        $this->_message->generateId();
+        $newId = $this->_message->getId();
+
+        $this->assertNotEquals($currentId, $newId);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug206Test.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug206Test.php
new file mode 100644
index 000000000..fdfa5302c
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug206Test.php
@@ -0,0 +1,38 @@
+<?php
+
+class Swift_Bug206Test extends \PHPUnit_Framework_TestCase
+{
+    private $_factory;
+
+    public function setUp()
+    {
+        $factory = new Swift_CharacterReaderFactory_SimpleCharacterReaderFactory();
+        $headerEncoder = new Swift_Mime_HeaderEncoder_QpHeaderEncoder(
+            new Swift_CharacterStream_ArrayCharacterStream($factory, 'utf-8')
+        );
+        $paramEncoder = new Swift_Encoder_Rfc2231Encoder(
+            new Swift_CharacterStream_ArrayCharacterStream($factory, 'utf-8')
+        );
+        $grammar = new Swift_Mime_Grammar();
+        $this->_factory = new Swift_Mime_SimpleHeaderFactory($headerEncoder, $paramEncoder, $grammar);
+    }
+
+    public function testMailboxHeaderEncoding()
+    {
+        $this->_testHeaderIsFullyEncoded('email@example.org', 'Family Name, Name', ' "Family Name, Name" <email@example.org>');
+        $this->_testHeaderIsFullyEncoded('email@example.org', 'Family Namé, Name', ' Family =?utf-8?Q?Nam=C3=A9=2C?= Name');
+        $this->_testHeaderIsFullyEncoded('email@example.org', 'Family Namé , Name', ' Family =?utf-8?Q?Nam=C3=A9_=2C?= Name');
+        $this->_testHeaderIsFullyEncoded('email@example.org', 'Family Namé ;Name', ' Family =?utf-8?Q?Nam=C3=A9_=3BName?= ');
+    }
+
+    private function _testHeaderIsFullyEncoded($email, $name, $expected)
+    {
+        $mailboxHeader = $this->_factory->createMailboxHeader('To', array(
+            $email => $name,
+        ));
+
+        $headerBody = substr($mailboxHeader->toString(), 3, strlen($expected));
+
+        $this->assertEquals($expected, $headerBody);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug274Test.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug274Test.php
new file mode 100644
index 000000000..f5f057aee
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug274Test.php
@@ -0,0 +1,21 @@
+<?php
+
+class Swift_Bug274Test extends \PHPUnit_Framework_TestCase
+{
+    public function testEmptyFileNameAsAttachment()
+    {
+        $message = new Swift_Message();
+        $this->setExpectedException('Swift_IoException', 'The path cannot be empty');
+        $message->attach(Swift_Attachment::fromPath(''));
+    }
+
+    public function testNonEmptyFileNameAsAttachment()
+    {
+        $message = new Swift_Message();
+        try {
+            $message->attach(Swift_Attachment::fromPath(__FILE__));
+        } catch (Exception $e) {
+            $this->fail('Path should not be empty');
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug34Test.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug34Test.php
new file mode 100644
index 000000000..9c76ceb3d
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug34Test.php
@@ -0,0 +1,75 @@
+<?php
+
+class Swift_Bug34Test extends \PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        Swift_Preferences::getInstance()->setCharset('utf-8');
+    }
+
+    public function testEmbeddedFilesWithMultipartDataCreateMultipartRelatedContentAsAnAlternative()
+    {
+        $message = Swift_Message::newInstance();
+        $message->setCharset('utf-8');
+        $message->setSubject('test subject');
+        $message->addPart('plain part', 'text/plain');
+
+        $image = Swift_Image::newInstance('<image data>', 'image.gif', 'image/gif');
+        $cid = $message->embed($image);
+
+        $message->setBody('<img src="'.$cid.'" />', 'text/html');
+
+        $message->setTo(array('user@domain.tld' => 'User'));
+
+        $message->setFrom(array('other@domain.tld' => 'Other'));
+        $message->setSender(array('other@domain.tld' => 'Other'));
+
+        $id = $message->getId();
+        $date = preg_quote(date('r', $message->getDate()), '~');
+        $boundary = $message->getBoundary();
+        $cidVal = $image->getId();
+
+        $this->assertRegExp(
+        '~^'.
+        'Sender: Other <other@domain.tld>'."\r\n".
+        'Message-ID: <'.$id.'>'."\r\n".
+        'Date: '.$date."\r\n".
+        'Subject: test subject'."\r\n".
+        'From: Other <other@domain.tld>'."\r\n".
+        'To: User <user@domain.tld>'."\r\n".
+        'MIME-Version: 1.0'."\r\n".
+        'Content-Type: multipart/alternative;'."\r\n".
+        ' boundary="'.$boundary.'"'."\r\n".
+        "\r\n\r\n".
+        '--'.$boundary."\r\n".
+        'Content-Type: text/plain; charset=utf-8'."\r\n".
+        'Content-Transfer-Encoding: quoted-printable'."\r\n".
+        "\r\n".
+        'plain part'.
+        "\r\n\r\n".
+        '--'.$boundary."\r\n".
+        'Content-Type: multipart/related;'."\r\n".
+        ' boundary="(.*?)"'."\r\n".
+        "\r\n\r\n".
+        '--\\1'."\r\n".
+        'Content-Type: text/html; charset=utf-8'."\r\n".
+        'Content-Transfer-Encoding: quoted-printable'."\r\n".
+        "\r\n".
+        '<img.*?/>'.
+        "\r\n\r\n".
+        '--\\1'."\r\n".
+        'Content-Type: image/gif; name=image.gif'."\r\n".
+        'Content-Transfer-Encoding: base64'."\r\n".
+        'Content-ID: <'.$cidVal.'>'."\r\n".
+        'Content-Disposition: inline; filename=image.gif'."\r\n".
+        "\r\n".
+        preg_quote(base64_encode('<image data>'), '~').
+        "\r\n\r\n".
+        '--\\1--'."\r\n".
+        "\r\n\r\n".
+        '--'.$boundary.'--'."\r\n".
+        '$~D',
+        $message->toString()
+        );
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug35Test.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug35Test.php
new file mode 100644
index 000000000..e07ee8f0b
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug35Test.php
@@ -0,0 +1,73 @@
+<?php
+
+class Swift_Bug35Test extends \PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        Swift_Preferences::getInstance()->setCharset('utf-8');
+    }
+
+    public function testHTMLPartAppearsLastEvenWhenAttachmentsAdded()
+    {
+        $message = Swift_Message::newInstance();
+        $message->setCharset('utf-8');
+        $message->setSubject('test subject');
+        $message->addPart('plain part', 'text/plain');
+
+        $attachment = Swift_Attachment::newInstance('<data>', 'image.gif', 'image/gif');
+        $message->attach($attachment);
+
+        $message->setBody('HTML part', 'text/html');
+
+        $message->setTo(array('user@domain.tld' => 'User'));
+
+        $message->setFrom(array('other@domain.tld' => 'Other'));
+        $message->setSender(array('other@domain.tld' => 'Other'));
+
+        $id = $message->getId();
+        $date = preg_quote(date('r', $message->getDate()), '~');
+        $boundary = $message->getBoundary();
+
+        $this->assertRegExp(
+        '~^'.
+        'Sender: Other <other@domain.tld>'."\r\n".
+        'Message-ID: <'.$id.'>'."\r\n".
+        'Date: '.$date."\r\n".
+        'Subject: test subject'."\r\n".
+        'From: Other <other@domain.tld>'."\r\n".
+        'To: User <user@domain.tld>'."\r\n".
+        'MIME-Version: 1.0'."\r\n".
+        'Content-Type: multipart/mixed;'."\r\n".
+        ' boundary="'.$boundary.'"'."\r\n".
+        "\r\n\r\n".
+        '--'.$boundary."\r\n".
+        'Content-Type: multipart/alternative;'."\r\n".
+        ' boundary="(.*?)"'."\r\n".
+        "\r\n\r\n".
+        '--\\1'."\r\n".
+        'Content-Type: text/plain; charset=utf-8'."\r\n".
+        'Content-Transfer-Encoding: quoted-printable'."\r\n".
+        "\r\n".
+        'plain part'.
+        "\r\n\r\n".
+        '--\\1'."\r\n".
+        'Content-Type: text/html; charset=utf-8'."\r\n".
+        'Content-Transfer-Encoding: quoted-printable'."\r\n".
+        "\r\n".
+        'HTML part'.
+        "\r\n\r\n".
+        '--\\1--'."\r\n".
+        "\r\n\r\n".
+        '--'.$boundary."\r\n".
+        'Content-Type: image/gif; name=image.gif'."\r\n".
+        'Content-Transfer-Encoding: base64'."\r\n".
+        'Content-Disposition: attachment; filename=image.gif'."\r\n".
+        "\r\n".
+        preg_quote(base64_encode('<data>'), '~').
+        "\r\n\r\n".
+        '--'.$boundary.'--'."\r\n".
+        '$~D',
+        $message->toString()
+        );
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug38Test.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug38Test.php
new file mode 100644
index 000000000..a8a9212cf
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug38Test.php
@@ -0,0 +1,194 @@
+<?php
+
+class Swift_Bug38Test extends \PHPUnit_Framework_TestCase
+{
+    private $_attFile;
+    private $_attFileName;
+    private $_attFileType;
+
+    public function setUp()
+    {
+        $this->_attFileName = 'data.txt';
+        $this->_attFileType = 'text/plain';
+        $this->_attFile = __DIR__.'/../../_samples/files/data.txt';
+        Swift_Preferences::getInstance()->setCharset('utf-8');
+    }
+
+    public function testWritingMessageToByteStreamProducesCorrectStructure()
+    {
+        $message = new Swift_Message();
+        $message->setSubject('test subject');
+        $message->setTo('user@domain.tld');
+        $message->setCc('other@domain.tld');
+        $message->setFrom('user@domain.tld');
+
+        $image = new Swift_Image('<data>', 'image.gif', 'image/gif');
+
+        $cid = $message->embed($image);
+        $message->setBody('HTML part', 'text/html');
+
+        $id = $message->getId();
+        $date = preg_quote(date('r', $message->getDate()), '~');
+        $boundary = $message->getBoundary();
+        $imgId = $image->getId();
+
+        $stream = new Swift_ByteStream_ArrayByteStream();
+
+        $message->toByteStream($stream);
+
+        $this->assertPatternInStream(
+            '~^'.
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.$date."\r\n".
+            'Subject: test subject'."\r\n".
+            'From: user@domain.tld'."\r\n".
+            'To: user@domain.tld'."\r\n".
+            'Cc: other@domain.tld'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: multipart/related;'."\r\n".
+            ' boundary="'.$boundary.'"'."\r\n".
+            "\r\n\r\n".
+            '--'.$boundary."\r\n".
+            'Content-Type: text/html; charset=utf-8'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n".
+            "\r\n".
+            'HTML part'.
+            "\r\n\r\n".
+            '--'.$boundary."\r\n".
+            'Content-Type: image/gif; name=image.gif'."\r\n".
+            'Content-Transfer-Encoding: base64'."\r\n".
+            'Content-ID: <'.preg_quote($imgId, '~').'>'."\r\n".
+            'Content-Disposition: inline; filename=image.gif'."\r\n".
+            "\r\n".
+            preg_quote(base64_encode('<data>'), '~').
+            "\r\n\r\n".
+            '--'.$boundary.'--'."\r\n".
+            '$~D',
+            $stream
+        );
+    }
+
+    public function testWritingMessageToByteStreamTwiceProducesCorrectStructure()
+    {
+        $message = new Swift_Message();
+        $message->setSubject('test subject');
+        $message->setTo('user@domain.tld');
+        $message->setCc('other@domain.tld');
+        $message->setFrom('user@domain.tld');
+
+        $image = new Swift_Image('<data>', 'image.gif', 'image/gif');
+
+        $cid = $message->embed($image);
+        $message->setBody('HTML part', 'text/html');
+
+        $id = $message->getId();
+        $date = preg_quote(date('r', $message->getDate()), '~');
+        $boundary = $message->getBoundary();
+        $imgId = $image->getId();
+
+        $pattern = '~^'.
+        'Message-ID: <'.$id.'>'."\r\n".
+        'Date: '.$date."\r\n".
+        'Subject: test subject'."\r\n".
+        'From: user@domain.tld'."\r\n".
+        'To: user@domain.tld'."\r\n".
+        'Cc: other@domain.tld'."\r\n".
+        'MIME-Version: 1.0'."\r\n".
+        'Content-Type: multipart/related;'."\r\n".
+        ' boundary="'.$boundary.'"'."\r\n".
+        "\r\n\r\n".
+        '--'.$boundary."\r\n".
+        'Content-Type: text/html; charset=utf-8'."\r\n".
+        'Content-Transfer-Encoding: quoted-printable'."\r\n".
+        "\r\n".
+        'HTML part'.
+        "\r\n\r\n".
+        '--'.$boundary."\r\n".
+        'Content-Type: image/gif; name=image.gif'."\r\n".
+        'Content-Transfer-Encoding: base64'."\r\n".
+        'Content-ID: <'.preg_quote($imgId, '~').'>'."\r\n".
+        'Content-Disposition: inline; filename=image.gif'."\r\n".
+        "\r\n".
+        preg_quote(base64_encode('<data>'), '~').
+        "\r\n\r\n".
+        '--'.$boundary.'--'."\r\n".
+        '$~D'
+        ;
+
+        $streamA = new Swift_ByteStream_ArrayByteStream();
+        $streamB = new Swift_ByteStream_ArrayByteStream();
+
+        $message->toByteStream($streamA);
+        $message->toByteStream($streamB);
+
+        $this->assertPatternInStream($pattern, $streamA);
+        $this->assertPatternInStream($pattern, $streamB);
+    }
+
+    public function testWritingMessageToByteStreamTwiceUsingAFileAttachment()
+    {
+        $message = new Swift_Message();
+        $message->setSubject('test subject');
+        $message->setTo('user@domain.tld');
+        $message->setCc('other@domain.tld');
+        $message->setFrom('user@domain.tld');
+
+        $attachment = Swift_Attachment::fromPath($this->_attFile);
+
+        $message->attach($attachment);
+
+        $message->setBody('HTML part', 'text/html');
+
+        $id = $message->getId();
+        $date = preg_quote(date('r', $message->getDate()), '~');
+        $boundary = $message->getBoundary();
+
+        $streamA = new Swift_ByteStream_ArrayByteStream();
+        $streamB = new Swift_ByteStream_ArrayByteStream();
+
+        $pattern = '~^'.
+            'Message-ID: <'.$id.'>'."\r\n".
+            'Date: '.$date."\r\n".
+            'Subject: test subject'."\r\n".
+            'From: user@domain.tld'."\r\n".
+            'To: user@domain.tld'."\r\n".
+            'Cc: other@domain.tld'."\r\n".
+            'MIME-Version: 1.0'."\r\n".
+            'Content-Type: multipart/mixed;'."\r\n".
+            ' boundary="'.$boundary.'"'."\r\n".
+            "\r\n\r\n".
+            '--'.$boundary."\r\n".
+            'Content-Type: text/html; charset=utf-8'."\r\n".
+            'Content-Transfer-Encoding: quoted-printable'."\r\n".
+            "\r\n".
+            'HTML part'.
+            "\r\n\r\n".
+            '--'.$boundary."\r\n".
+            'Content-Type: '.$this->_attFileType.'; name='.$this->_attFileName."\r\n".
+            'Content-Transfer-Encoding: base64'."\r\n".
+            'Content-Disposition: attachment; filename='.$this->_attFileName."\r\n".
+            "\r\n".
+            preg_quote(base64_encode(file_get_contents($this->_attFile)), '~').
+            "\r\n\r\n".
+            '--'.$boundary.'--'."\r\n".
+            '$~D'
+            ;
+
+        $message->toByteStream($streamA);
+        $message->toByteStream($streamB);
+
+        $this->assertPatternInStream($pattern, $streamA);
+        $this->assertPatternInStream($pattern, $streamB);
+    }
+
+    // -- Helpers
+
+    public function assertPatternInStream($pattern, $stream, $message = '%s')
+    {
+        $string = '';
+        while (false !== $bytes = $stream->read(8192)) {
+            $string .= $bytes;
+        }
+        $this->assertRegExp($pattern, $string, $message);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug518Test.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug518Test.php
new file mode 100644
index 000000000..b83984fec
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug518Test.php
@@ -0,0 +1,38 @@
+<?php
+
+use Mockery as m;
+
+class Swift_Bug518Test extends \PHPUnit_Framework_TestCase
+{
+    public function testIfEmailChangesAfterQueued()
+    {
+        $failedRecipients = 'value';
+        $message = new Swift_Message();
+        $message->setTo('foo@bar.com');
+
+        $that = $this;
+        $messageValidation = function ($m) use ($that) {
+            //the getTo should return the same value as we put in
+            $that->assertEquals('foo@bar.com', key($m->getTo()), 'The message has changed after it was put to the memory queue');
+
+            return true;
+        };
+
+        $transport = m::mock('Swift_Transport');
+        $transport->shouldReceive('isStarted')->andReturn(true);
+        $transport->shouldReceive('send')
+            ->with(m::on($messageValidation), $failedRecipients)
+            ->andReturn(1);
+
+        $memorySpool = new Swift_MemorySpool();
+        $memorySpool->queueMessage($message);
+
+        /*
+         * The message is queued in memory.
+         * Lets change the message
+         */
+        $message->setTo('other@value.com');
+
+        $memorySpool->flushQueue($transport, $failedRecipients);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug51Test.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug51Test.php
new file mode 100644
index 000000000..b9c33b09d
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug51Test.php
@@ -0,0 +1,121 @@
+<?php
+
+class Swift_Bug51Test extends \SwiftMailerTestCase
+{
+    private $_attachmentFile;
+    private $_outputFile;
+
+    public function setUp()
+    {
+        if (!defined('SWIFT_TMP_DIR') || !is_writable(SWIFT_TMP_DIR)) {
+            $this->markTestSkipped(
+                'Cannot run test without a writable directory to use ('.
+                'define SWIFT_TMP_DIR in tests/config.php if you wish to run this test)'
+             );
+        }
+
+        $this->_attachmentFile = SWIFT_TMP_DIR.'/attach.rand.bin';
+        file_put_contents($this->_attachmentFile, '');
+
+        $this->_outputFile = SWIFT_TMP_DIR.'/attach.out.bin';
+        file_put_contents($this->_outputFile, '');
+    }
+
+    public function tearDown()
+    {
+        unlink($this->_attachmentFile);
+        unlink($this->_outputFile);
+    }
+
+    public function testAttachmentsDoNotGetTruncatedUsingToByteStream()
+    {
+        //Run 100 times with 10KB attachments
+        for ($i = 0; $i < 10; ++$i) {
+            $message = $this->_createMessageWithRandomAttachment(
+                10000, $this->_attachmentFile
+            );
+
+            file_put_contents($this->_outputFile, '');
+            $message->toByteStream(
+                new Swift_ByteStream_FileByteStream($this->_outputFile, true)
+            );
+
+            $emailSource = file_get_contents($this->_outputFile);
+
+            $this->assertAttachmentFromSourceMatches(
+                file_get_contents($this->_attachmentFile),
+                $emailSource
+            );
+        }
+    }
+
+    public function testAttachmentsDoNotGetTruncatedUsingToString()
+    {
+        //Run 100 times with 10KB attachments
+        for ($i = 0; $i < 10; ++$i) {
+            $message = $this->_createMessageWithRandomAttachment(
+                10000, $this->_attachmentFile
+            );
+
+            $emailSource = $message->toString();
+
+            $this->assertAttachmentFromSourceMatches(
+                file_get_contents($this->_attachmentFile),
+                $emailSource
+            );
+        }
+    }
+
+    // -- Custom Assertions
+
+    public function assertAttachmentFromSourceMatches($attachmentData, $source)
+    {
+        $encHeader = 'Content-Transfer-Encoding: base64';
+        $base64declaration = strpos($source, $encHeader);
+
+        $attachmentDataStart = strpos($source, "\r\n\r\n", $base64declaration);
+        $attachmentDataEnd = strpos($source, "\r\n--", $attachmentDataStart);
+
+        if (false === $attachmentDataEnd) {
+            $attachmentBase64 = trim(substr($source, $attachmentDataStart));
+        } else {
+            $attachmentBase64 = trim(substr(
+                $source, $attachmentDataStart,
+                $attachmentDataEnd - $attachmentDataStart
+            ));
+        }
+
+        $this->assertIdenticalBinary($attachmentData, base64_decode($attachmentBase64));
+    }
+
+    // -- Creation Methods
+
+    private function _fillFileWithRandomBytes($byteCount, $file)
+    {
+        // I was going to use dd with if=/dev/random but this way seems more
+        // cross platform even if a hella expensive!!
+
+        file_put_contents($file, '');
+        $fp = fopen($file, 'wb');
+        for ($i = 0; $i < $byteCount; ++$i) {
+            $byteVal = rand(0, 255);
+            fwrite($fp, pack('i', $byteVal));
+        }
+        fclose($fp);
+    }
+
+    private function _createMessageWithRandomAttachment($size, $attachmentPath)
+    {
+        $this->_fillFileWithRandomBytes($size, $attachmentPath);
+
+        $message = Swift_Message::newInstance()
+            ->setSubject('test')
+            ->setBody('test')
+            ->setFrom('a@b.c')
+            ->setTo('d@e.f')
+            ->attach(Swift_Attachment::fromPath($attachmentPath))
+            ;
+
+        return $message;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug534Test.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug534Test.php
new file mode 100644
index 000000000..263cae51a
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug534Test.php
@@ -0,0 +1,38 @@
+<?php
+
+use Mockery as m;
+
+class Swift_Bug534Test extends \PHPUnit_Framework_TestCase
+{
+    public function testEmbeddedImagesAreEmbedded()
+    {
+        $message = Swift_Message::newInstance()
+            ->setFrom('from@example.com')
+            ->setTo('to@example.com')
+            ->setSubject('test')
+        ;
+        $cid = $message->embed(Swift_Image::fromPath(__DIR__.'/../../_samples/files/swiftmailer.png'));
+        $message->setBody('<img src="'.$cid.'" />', 'text/html');
+
+        $that = $this;
+        $messageValidation = function (Swift_Mime_Message $message) use ($that) {
+            preg_match('/cid:(.*)"/', $message->toString(), $matches);
+            $cid = $matches[1];
+            preg_match('/Content-ID: <(.*)>/', $message->toString(), $matches);
+            $contentId = $matches[1];
+            $that->assertEquals($cid, $contentId, 'cid in body and mime part Content-ID differ');
+
+            return true;
+        };
+
+        $failedRecipients = array();
+
+        $transport = m::mock('Swift_Transport');
+        $transport->shouldReceive('isStarted')->andReturn(true);
+        $transport->shouldReceive('send')->with(m::on($messageValidation), $failedRecipients)->andReturn(1);
+
+        $memorySpool = new Swift_MemorySpool();
+        $memorySpool->queueMessage($message);
+        $memorySpool->flushQueue($transport, $failedRecipients);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug650Test.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug650Test.php
new file mode 100644
index 000000000..3393fb800
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug650Test.php
@@ -0,0 +1,36 @@
+<?php
+
+class Swift_Bug650Test extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider encodingDataProvider
+     *
+     * @param string $name
+     * @param string $expectedEncodedName
+     */
+    public function testMailboxHeaderEncoding($name, $expectedEncodedName)
+    {
+        $factory = new Swift_CharacterReaderFactory_SimpleCharacterReaderFactory();
+        $charStream = new Swift_CharacterStream_NgCharacterStream($factory, 'utf-8');
+        $encoder = new Swift_Mime_HeaderEncoder_QpHeaderEncoder($charStream);
+        $header = new Swift_Mime_Headers_MailboxHeader('To', $encoder, new Swift_Mime_Grammar());
+        $header->setCharset('utf-8');
+
+        $header->setNameAddresses(array(
+            'test@example.com' => $name,
+        ));
+
+        $this->assertSame('To: '.$expectedEncodedName." <test@example.com>\r\n", $header->toString());
+    }
+
+    public function encodingDataProvider()
+    {
+        return array(
+            array('this is " a test ö', 'this is =?utf-8?Q?=22?= a test =?utf-8?Q?=C3=B6?='),
+            array(': this is a test ö', '=?utf-8?Q?=3A?= this is a test =?utf-8?Q?=C3=B6?='),
+            array('( test ö', '=?utf-8?Q?=28?= test =?utf-8?Q?=C3=B6?='),
+            array('[ test ö', '=?utf-8?Q?=5B?= test =?utf-8?Q?=C3=B6?='),
+            array('@ test ö)', '=?utf-8?Q?=40?= test =?utf-8?Q?=C3=B6=29?='),
+        );
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug71Test.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug71Test.php
new file mode 100644
index 000000000..4b8045370
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug71Test.php
@@ -0,0 +1,20 @@
+<?php
+
+class Swift_Bug71Test extends \PHPUnit_Framework_TestCase
+{
+    private $_message;
+
+    public function setUp()
+    {
+        $this->_message = new Swift_Message('test');
+    }
+
+    public function testCallingToStringAfterSettingNewBodyReflectsChanges()
+    {
+        $this->_message->setBody('BODY1');
+        $this->assertRegExp('/BODY1/', $this->_message->toString());
+
+        $this->_message->setBody('BODY2');
+        $this->assertRegExp('/BODY2/', $this->_message->toString());
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug76Test.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug76Test.php
new file mode 100644
index 000000000..c2b12cb4c
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/Bug76Test.php
@@ -0,0 +1,82 @@
+<?php
+
+class Swift_Bug76Test extends \PHPUnit_Framework_TestCase
+{
+    private $_inputFile;
+    private $_outputFile;
+    private $_encoder;
+
+    public function setUp()
+    {
+        if (!defined('SWIFT_TMP_DIR') || !is_writable(SWIFT_TMP_DIR)) {
+            $this->markTestSkipped(
+                'Cannot run test without a writable directory to use ('.
+                'define SWIFT_TMP_DIR in tests/config.php if you wish to run this test)'
+             );
+        }
+
+        $this->_inputFile = SWIFT_TMP_DIR.'/in.bin';
+        file_put_contents($this->_inputFile, '');
+
+        $this->_outputFile = SWIFT_TMP_DIR.'/out.bin';
+        file_put_contents($this->_outputFile, '');
+
+        $this->_encoder = $this->_createEncoder();
+    }
+
+    public function tearDown()
+    {
+        unlink($this->_inputFile);
+        unlink($this->_outputFile);
+    }
+
+    public function testBase64EncodedLineLengthNeverExceeds76CharactersEvenIfArgsDo()
+    {
+        $this->_fillFileWithRandomBytes(1000, $this->_inputFile);
+
+        $os = $this->_createStream($this->_inputFile);
+        $is = $this->_createStream($this->_outputFile);
+
+        $this->_encoder->encodeByteStream($os, $is, 0, 80); //Exceeds 76
+
+        $this->assertMaxLineLength(76, $this->_outputFile,
+            '%s: Line length should not exceed 76 characters'
+        );
+    }
+
+    // -- Custom Assertions
+
+    public function assertMaxLineLength($length, $filePath, $message = '%s')
+    {
+        $lines = file($filePath);
+        foreach ($lines as $line) {
+            $this->assertTrue((strlen(trim($line)) <= 76), $message);
+        }
+    }
+
+    // -- Creation Methods
+
+    private function _fillFileWithRandomBytes($byteCount, $file)
+    {
+        // I was going to use dd with if=/dev/random but this way seems more
+        // cross platform even if a hella expensive!!
+
+        file_put_contents($file, '');
+        $fp = fopen($file, 'wb');
+        for ($i = 0; $i < $byteCount; ++$i) {
+            $byteVal = rand(0, 255);
+            fwrite($fp, pack('i', $byteVal));
+        }
+        fclose($fp);
+    }
+
+    private function _createEncoder()
+    {
+        return new Swift_Mime_ContentEncoder_Base64ContentEncoder();
+    }
+
+    private function _createStream($file)
+    {
+        return new Swift_ByteStream_FileByteStream($file, true);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/BugFileByteStreamConsecutiveReadCallsTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/BugFileByteStreamConsecutiveReadCallsTest.php
new file mode 100644
index 000000000..07e71ac4b
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/bug/Swift/BugFileByteStreamConsecutiveReadCallsTest.php
@@ -0,0 +1,19 @@
+<?php
+
+
+class Swift_FileByteStreamConsecutiveReadCalls extends  \PHPUnit_Framework_TestCase
+{
+    /**
+     * @test
+     * @expectedException \Swift_IoException
+     */
+    public function shouldThrowExceptionOnConsecutiveRead()
+    {
+        $fbs = new \Swift_ByteStream_FileByteStream('does not exist');
+        try {
+            $fbs->read(100);
+        } catch (\Swift_IoException $exc) {
+            $fbs->read(100);
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/fixtures/MimeEntityFixture.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/fixtures/MimeEntityFixture.php
new file mode 100644
index 000000000..e2cf86a59
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/fixtures/MimeEntityFixture.php
@@ -0,0 +1,59 @@
+<?php
+
+class MimeEntityFixture implements Swift_Mime_MimeEntity
+{
+    private $level;
+    private $string;
+    private $contentType;
+
+    public function __construct($level = null, $string = '', $contentType = null)
+    {
+        $this->level = $level;
+        $this->string = $string;
+        $this->contentType = $contentType;
+    }
+
+    public function getNestingLevel()
+    {
+        return $this->level;
+    }
+
+    public function toString()
+    {
+        return $this->string;
+    }
+
+    public function getContentType()
+    {
+        return $this->contentType;
+    }
+
+    // These methods are here to account for the implemented interfaces
+    public function getId()
+    {
+    }
+    public function getHeaders()
+    {
+    }
+    public function getBody()
+    {
+    }
+    public function setBody($body, $contentType = null)
+    {
+    }
+    public function toByteStream(Swift_InputByteStream $is)
+    {
+    }
+    public function charsetChanged($charset)
+    {
+    }
+    public function encoderChanged(Swift_Mime_ContentEncoder $encoder)
+    {
+    }
+    public function getChildren()
+    {
+    }
+    public function setChildren(array $children)
+    {
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/smoke.conf.php.default b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/smoke.conf.php.default
new file mode 100644
index 000000000..0de2763fa
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/smoke.conf.php.default
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ Swift Mailer V4 smoke test configuration.
+
+ YOU ONLY NEED TO EDIT THIS FILE IF YOU WISH TO RUN THE SMOKE TESTS.
+
+ The smoke tests are run by default when "All Tests" are run with the
+ testing suite, however, without configuration options here only the unit tests
+ will be run and the smoke tests will be skipped.
+ */
+
+/*
+ Defines: The an address which Swift can send to (it will also send "from" this address).
+ Recommended: (your own email address?)
+ */
+define('SWIFT_SMOKE_EMAIL_ADDRESS', 'test@swiftmailer.org');
+
+/*
+ Defines: The specific transport you want to mail with.
+ Recommended: Any of 'smtp', 'sendmail' or 'mail'
+ */
+define('SWIFT_SMOKE_TRANSPORT_TYPE', 'smtp');
+
+// SMTP-specific settings
+
+/*
+ Defines: An SMTP server to connect to
+ Recommended: smtp.your-isp.com (varies wildly!)
+ */
+define('SWIFT_SMOKE_SMTP_HOST', 'localhost');
+
+/*
+ Defines: The SMTP port to connect to
+ Recommended: 25
+ */
+define('SWIFT_SMOKE_SMTP_PORT', '4456');
+
+/*
+ Defines: A username to authenticate with SMTP (if needed).
+ Recommended: (none)
+ */
+define('SWIFT_SMOKE_SMTP_USER', '');
+
+/*
+ Defines: A password to authenticate with SMTP (if needed).
+ Recommended: (none)
+ */
+define('SWIFT_SMOKE_SMTP_PASS', '');
+
+/*
+ Defines: The encryption needed on your SMTP server.
+ Recommended: (none), or 'tls' or 'ssl'
+ */
+define('SWIFT_SMOKE_SMTP_ENCRYPTION', '');
+
+// Sendmail specific settings
+
+/*
+ Defines: The command to use when sending via sendmail
+ Recommended: /usr/sbin/sendmail -bs (or "-oi -t")
+ */
+define('SWIFT_SMOKE_SENDMAIL_COMMAND', '/usr/sbin/sendmail -bs');
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/smoke/Swift/Smoke/AttachmentSmokeTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/smoke/Swift/Smoke/AttachmentSmokeTest.php
new file mode 100644
index 000000000..c3b61c399
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/smoke/Swift/Smoke/AttachmentSmokeTest.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * @group smoke
+ */
+class Swift_Smoke_AttachmentSmokeTest extends SwiftMailerSmokeTestCase
+{
+    private $_attFile;
+
+    public function setUp()
+    {
+        parent::setup(); // For skip
+        $this->_attFile = __DIR__.'/../../../_samples/files/textfile.zip';
+    }
+
+    public function testAttachmentSending()
+    {
+        $mailer = $this->_getMailer();
+        $message = Swift_Message::newInstance()
+            ->setSubject('[Swift Mailer] AttachmentSmokeTest')
+            ->setFrom(array(SWIFT_SMOKE_EMAIL_ADDRESS => 'Swift Mailer'))
+            ->setTo(SWIFT_SMOKE_EMAIL_ADDRESS)
+            ->setBody('This message should contain an attached ZIP file (named "textfile.zip").'.PHP_EOL.
+                'When unzipped, the archive should produce a text file which reads:'.PHP_EOL.
+                '"This is part of a Swift Mailer v4 smoke test."'
+                )
+            ->attach(Swift_Attachment::fromPath($this->_attFile))
+            ;
+        $this->assertEquals(1, $mailer->send($message),
+            '%s: The smoke test should send a single message'
+            );
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/smoke/Swift/Smoke/BasicSmokeTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/smoke/Swift/Smoke/BasicSmokeTest.php
new file mode 100644
index 000000000..c7501d46e
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/smoke/Swift/Smoke/BasicSmokeTest.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * @group smoke
+ */
+class Swift_Smoke_BasicSmokeTest extends SwiftMailerSmokeTestCase
+{
+    public function testBasicSending()
+    {
+        $mailer = $this->_getMailer();
+        $message = Swift_Message::newInstance()
+            ->setSubject('[Swift Mailer] BasicSmokeTest')
+            ->setFrom(array(SWIFT_SMOKE_EMAIL_ADDRESS => 'Swift Mailer'))
+            ->setTo(SWIFT_SMOKE_EMAIL_ADDRESS)
+            ->setBody('One, two, three, four, five...'.PHP_EOL.
+                'six, seven, eight...'
+                )
+            ;
+        $this->assertEquals(1, $mailer->send($message),
+            '%s: The smoke test should send a single message'
+            );
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/smoke/Swift/Smoke/HtmlWithAttachmentSmokeTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/smoke/Swift/Smoke/HtmlWithAttachmentSmokeTest.php
new file mode 100644
index 000000000..dca14341d
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/smoke/Swift/Smoke/HtmlWithAttachmentSmokeTest.php
@@ -0,0 +1,31 @@
+<?php
+
+/**
+ * @group smoke
+ */
+class Swift_Smoke_HtmlWithAttachmentSmokeTest extends SwiftMailerSmokeTestCase
+{
+    private $_attFile;
+
+    public function setUp()
+    {
+        $this->_attFile = __DIR__.'/../../../_samples/files/textfile.zip';
+    }
+
+    public function testAttachmentSending()
+    {
+        $mailer = $this->_getMailer();
+        $message = Swift_Message::newInstance('[Swift Mailer] HtmlWithAttachmentSmokeTest')
+            ->setFrom(array(SWIFT_SMOKE_EMAIL_ADDRESS => 'Swift Mailer'))
+            ->setTo(SWIFT_SMOKE_EMAIL_ADDRESS)
+            ->attach(Swift_Attachment::fromPath($this->_attFile))
+            ->setBody('<p>This HTML-formatted message should contain an attached ZIP file (named "textfile.zip").'.PHP_EOL.
+                'When unzipped, the archive should produce a text file which reads:</p>'.PHP_EOL.
+                '<p><q>This is part of a Swift Mailer v4 smoke test.</q></p>', 'text/html'
+            )
+            ;
+        $this->assertEquals(1, $mailer->send($message),
+            '%s: The smoke test should send a single message'
+            );
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/smoke/Swift/Smoke/InternationalSmokeTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/smoke/Swift/Smoke/InternationalSmokeTest.php
new file mode 100644
index 000000000..fafd72714
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/smoke/Swift/Smoke/InternationalSmokeTest.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * @group smoke
+ */
+class Swift_Smoke_InternationalSmokeTest extends SwiftMailerSmokeTestCase
+{
+    private $_attFile;
+
+    public function setUp()
+    {
+        parent::setup(); // For skip
+        $this->_attFile = __DIR__.'/../../../_samples/files/textfile.zip';
+    }
+
+    public function testAttachmentSending()
+    {
+        $mailer = $this->_getMailer();
+        $message = Swift_Message::newInstance()
+            ->setCharset('utf-8')
+            ->setSubject('[Swift Mailer] InternationalSmokeTest (διεθνής)')
+            ->setFrom(array(SWIFT_SMOKE_EMAIL_ADDRESS => 'Χριστοφορου (Swift Mailer)'))
+            ->setTo(SWIFT_SMOKE_EMAIL_ADDRESS)
+            ->setBody('This message should contain an attached ZIP file (named "κείμενο, εδάφιο, θέμα.zip").'.PHP_EOL.
+                'When unzipped, the archive should produce a text file which reads:'.PHP_EOL.
+                '"This is part of a Swift Mailer v4 smoke test."'.PHP_EOL.
+                PHP_EOL.
+                'Following is some arbitrary Greek text:'.PHP_EOL.
+                'Δεν βρέθηκαν λέξεις.'
+                )
+            ->attach(Swift_Attachment::fromPath($this->_attFile)
+                ->setContentType('application/zip')
+                ->setFilename('κείμενο, εδάφιο, θέμα.zip')
+                )
+            ;
+        $this->assertEquals(1, $mailer->send($message),
+            '%s: The smoke test should send a single message'
+            );
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/ByteStream/ArrayByteStreamTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/ByteStream/ArrayByteStreamTest.php
new file mode 100644
index 000000000..4f53bd8dc
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/ByteStream/ArrayByteStreamTest.php
@@ -0,0 +1,202 @@
+<?php
+
+class Swift_ByteStream_ArrayByteStreamTest extends \PHPUnit_Framework_TestCase
+{
+    public function testReadingSingleBytesFromBaseInput()
+    {
+        $input = array('a', 'b', 'c');
+        $bs = $this->_createArrayStream($input);
+        $output = array();
+        while (false !== $bytes = $bs->read(1)) {
+            $output[] = $bytes;
+        }
+        $this->assertEquals($input, $output,
+            '%s: Bytes read from stream should be the same as bytes in constructor'
+            );
+    }
+
+    public function testReadingMultipleBytesFromBaseInput()
+    {
+        $input = array('a', 'b', 'c', 'd');
+        $bs = $this->_createArrayStream($input);
+        $output = array();
+        while (false !== $bytes = $bs->read(2)) {
+            $output[] = $bytes;
+        }
+        $this->assertEquals(array('ab', 'cd'), $output,
+            '%s: Bytes read from stream should be in pairs'
+            );
+    }
+
+    public function testReadingOddOffsetOnLastByte()
+    {
+        $input = array('a', 'b', 'c', 'd', 'e');
+        $bs = $this->_createArrayStream($input);
+        $output = array();
+        while (false !== $bytes = $bs->read(2)) {
+            $output[] = $bytes;
+        }
+        $this->assertEquals(array('ab', 'cd', 'e'), $output,
+            '%s: Bytes read from stream should be in pairs except final read'
+            );
+    }
+
+    public function testSettingPointerPartway()
+    {
+        $input = array('a', 'b', 'c');
+        $bs = $this->_createArrayStream($input);
+        $bs->setReadPointer(1);
+        $this->assertEquals('b', $bs->read(1),
+            '%s: Byte should be second byte since pointer as at offset 1'
+            );
+    }
+
+    public function testResettingPointerAfterExhaustion()
+    {
+        $input = array('a', 'b', 'c');
+        $bs = $this->_createArrayStream($input); while (false !== $bs->read(1));
+
+        $bs->setReadPointer(0);
+        $this->assertEquals('a', $bs->read(1),
+            '%s: Byte should be first byte since pointer as at offset 0'
+            );
+    }
+
+    public function testPointerNeverSetsBelowZero()
+    {
+        $input = array('a', 'b', 'c');
+        $bs = $this->_createArrayStream($input);
+
+        $bs->setReadPointer(-1);
+        $this->assertEquals('a', $bs->read(1),
+            '%s: Byte should be first byte since pointer should be at offset 0'
+            );
+    }
+
+    public function testPointerNeverSetsAboveStackSize()
+    {
+        $input = array('a', 'b', 'c');
+        $bs = $this->_createArrayStream($input);
+
+        $bs->setReadPointer(3);
+        $this->assertSame(false, $bs->read(1),
+            '%s: Stream should be at end and thus return false'
+            );
+    }
+
+    public function testBytesCanBeWrittenToStream()
+    {
+        $input = array('a', 'b', 'c');
+        $bs = $this->_createArrayStream($input);
+
+        $bs->write('de');
+
+        $output = array();
+        while (false !== $bytes = $bs->read(1)) {
+            $output[] = $bytes;
+        }
+        $this->assertEquals(array('a', 'b', 'c', 'd', 'e'), $output,
+            '%s: Bytes read from stream should be from initial stack + written'
+            );
+    }
+
+    public function testContentsCanBeFlushed()
+    {
+        $input = array('a', 'b', 'c');
+        $bs = $this->_createArrayStream($input);
+
+        $bs->flushBuffers();
+
+        $this->assertSame(false, $bs->read(1),
+            '%s: Contents have been flushed so read() should return false'
+            );
+    }
+
+    public function testConstructorCanTakeStringArgument()
+    {
+        $bs = $this->_createArrayStream('abc');
+        $output = array();
+        while (false !== $bytes = $bs->read(1)) {
+            $output[] = $bytes;
+        }
+        $this->assertEquals(array('a', 'b', 'c'), $output,
+            '%s: Bytes read from stream should be the same as bytes in constructor'
+            );
+    }
+
+    public function testBindingOtherStreamsMirrorsWriteOperations()
+    {
+        $bs = $this->_createArrayStream('');
+        $is1 = $this->getMock('Swift_InputByteStream');
+        $is2 = $this->getMock('Swift_InputByteStream');
+
+        $is1->expects($this->at(0))
+            ->method('write')
+            ->with('x');
+        $is1->expects($this->at(1))
+            ->method('write')
+            ->with('y');
+        $is2->expects($this->at(0))
+            ->method('write')
+            ->with('x');
+        $is2->expects($this->at(1))
+            ->method('write')
+            ->with('y');
+
+        $bs->bind($is1);
+        $bs->bind($is2);
+
+        $bs->write('x');
+        $bs->write('y');
+    }
+
+    public function testBindingOtherStreamsMirrorsFlushOperations()
+    {
+        $bs = $this->_createArrayStream('');
+        $is1 = $this->getMock('Swift_InputByteStream');
+        $is2 = $this->getMock('Swift_InputByteStream');
+
+        $is1->expects($this->once())
+            ->method('flushBuffers');
+        $is2->expects($this->once())
+            ->method('flushBuffers');
+
+        $bs->bind($is1);
+        $bs->bind($is2);
+
+        $bs->flushBuffers();
+    }
+
+    public function testUnbindingStreamPreventsFurtherWrites()
+    {
+        $bs = $this->_createArrayStream('');
+        $is1 = $this->getMock('Swift_InputByteStream');
+        $is2 = $this->getMock('Swift_InputByteStream');
+
+        $is1->expects($this->at(0))
+            ->method('write')
+            ->with('x');
+        $is1->expects($this->at(1))
+            ->method('write')
+            ->with('y');
+        $is2->expects($this->once())
+            ->method('write')
+            ->with('x');
+
+        $bs->bind($is1);
+        $bs->bind($is2);
+
+        $bs->write('x');
+
+        $bs->unbind($is2);
+
+        $bs->write('y');
+    }
+
+    // -- Creation Methods
+
+    private function _createArrayStream($input)
+    {
+        return new Swift_ByteStream_ArrayByteStream($input);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/CharacterReader/GenericFixedWidthReaderTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/CharacterReader/GenericFixedWidthReaderTest.php
new file mode 100644
index 000000000..3f7a46cf5
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/CharacterReader/GenericFixedWidthReaderTest.php
@@ -0,0 +1,43 @@
+<?php
+
+class Swift_CharacterReader_GenericFixedWidthReaderTest extends \PHPUnit_Framework_TestCase
+{
+    public function testInitialByteSizeMatchesWidth()
+    {
+        $reader = new Swift_CharacterReader_GenericFixedWidthReader(1);
+        $this->assertSame(1, $reader->getInitialByteSize());
+
+        $reader = new Swift_CharacterReader_GenericFixedWidthReader(4);
+        $this->assertSame(4, $reader->getInitialByteSize());
+    }
+
+    public function testValidationValueIsBasedOnOctetCount()
+    {
+        $reader = new Swift_CharacterReader_GenericFixedWidthReader(4);
+
+        $this->assertSame(
+            1, $reader->validateByteSequence(array(0x01, 0x02, 0x03), 3)
+            ); //3 octets
+
+        $this->assertSame(
+            2, $reader->validateByteSequence(array(0x01, 0x0A), 2)
+            ); //2 octets
+
+        $this->assertSame(
+            3, $reader->validateByteSequence(array(0xFE), 1)
+            ); //1 octet
+
+        $this->assertSame(
+            0, $reader->validateByteSequence(array(0xFE, 0x03, 0x67, 0x9A), 4)
+            ); //All 4 octets
+    }
+
+    public function testValidationFailsIfTooManyOctets()
+    {
+        $reader = new Swift_CharacterReader_GenericFixedWidthReader(6);
+
+        $this->assertSame(-1, $reader->validateByteSequence(
+            array(0xFE, 0x03, 0x67, 0x9A, 0x10, 0x09, 0x85), 7
+            )); //7 octets
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/CharacterReader/UsAsciiReaderTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/CharacterReader/UsAsciiReaderTest.php
new file mode 100644
index 000000000..41f8f7035
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/CharacterReader/UsAsciiReaderTest.php
@@ -0,0 +1,52 @@
+<?php
+
+class Swift_CharacterReader_UsAsciiReaderTest extends \PHPUnit_Framework_TestCase
+{
+    /*
+
+    for ($c = '', $size = 1; false !== $bytes = $os->read($size); ) {
+        $c .= $bytes;
+        $size = $v->validateCharacter($c);
+        if (-1 == $size) {
+            throw new Exception( ... invalid char .. );
+        } elseif (0 == $size) {
+            return $c; //next character in $os
+        }
+    }
+
+    */
+
+    private $_reader;
+
+    public function setUp()
+    {
+        $this->_reader = new Swift_CharacterReader_UsAsciiReader();
+    }
+
+    public function testAllValidAsciiCharactersReturnZero()
+    {
+        for ($ordinal = 0x00; $ordinal <= 0x7F; ++$ordinal) {
+            $this->assertSame(
+                0, $this->_reader->validateByteSequence(array($ordinal), 1)
+                );
+        }
+    }
+
+    public function testMultipleBytesAreInvalid()
+    {
+        for ($ordinal = 0x00; $ordinal <= 0x7F; $ordinal += 2) {
+            $this->assertSame(
+                -1, $this->_reader->validateByteSequence(array($ordinal, $ordinal + 1), 2)
+                );
+        }
+    }
+
+    public function testBytesAboveAsciiRangeAreInvalid()
+    {
+        for ($ordinal = 0x80; $ordinal <= 0xFF; ++$ordinal) {
+            $this->assertSame(
+                -1, $this->_reader->validateByteSequence(array($ordinal), 1)
+                );
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/CharacterReader/Utf8ReaderTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/CharacterReader/Utf8ReaderTest.php
new file mode 100644
index 000000000..34e9c91de
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/CharacterReader/Utf8ReaderTest.php
@@ -0,0 +1,65 @@
+<?php
+
+class Swift_CharacterReader_Utf8ReaderTest extends \PHPUnit_Framework_TestCase
+{
+    private $_reader;
+
+    public function setUp()
+    {
+        $this->_reader = new Swift_CharacterReader_Utf8Reader();
+    }
+
+    public function testLeading7BitOctetCausesReturnZero()
+    {
+        for ($ordinal = 0x00; $ordinal <= 0x7F; ++$ordinal) {
+            $this->assertSame(
+                0, $this->_reader->validateByteSequence(array($ordinal), 1)
+                );
+        }
+    }
+
+    public function testLeadingByteOf2OctetCharCausesReturn1()
+    {
+        for ($octet = 0xC0; $octet <= 0xDF; ++$octet) {
+            $this->assertSame(
+                1, $this->_reader->validateByteSequence(array($octet), 1)
+                );
+        }
+    }
+
+    public function testLeadingByteOf3OctetCharCausesReturn2()
+    {
+        for ($octet = 0xE0; $octet <= 0xEF; ++$octet) {
+            $this->assertSame(
+                2, $this->_reader->validateByteSequence(array($octet), 1)
+                );
+        }
+    }
+
+    public function testLeadingByteOf4OctetCharCausesReturn3()
+    {
+        for ($octet = 0xF0; $octet <= 0xF7; ++$octet) {
+            $this->assertSame(
+                3, $this->_reader->validateByteSequence(array($octet), 1)
+                );
+        }
+    }
+
+    public function testLeadingByteOf5OctetCharCausesReturn4()
+    {
+        for ($octet = 0xF8; $octet <= 0xFB; ++$octet) {
+            $this->assertSame(
+                4, $this->_reader->validateByteSequence(array($octet), 1)
+                );
+        }
+    }
+
+    public function testLeadingByteOf6OctetCharCausesReturn5()
+    {
+        for ($octet = 0xFC; $octet <= 0xFD; ++$octet) {
+            $this->assertSame(
+                5, $this->_reader->validateByteSequence(array($octet), 1)
+                );
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/CharacterStream/ArrayCharacterStreamTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/CharacterStream/ArrayCharacterStreamTest.php
new file mode 100644
index 000000000..e22e496f9
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/CharacterStream/ArrayCharacterStreamTest.php
@@ -0,0 +1,360 @@
+<?php
+
+class Swift_CharacterStream_ArrayCharacterStreamTest extends \SwiftMailerTestCase
+{
+    public function testValidatorAlgorithmOnImportString()
+    {
+        $reader = $this->_getReader();
+        $factory = $this->_getFactory($reader);
+
+        $stream = new Swift_CharacterStream_ArrayCharacterStream($factory, 'utf-8');
+
+        $reader->shouldReceive('getInitialByteSize')
+               ->zeroOrMoreTimes()
+               ->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD1), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+
+        $stream->importString(pack('C*',
+            0xD0, 0x94,
+            0xD0, 0xB6,
+            0xD0, 0xBE,
+            0xD1, 0x8D,
+            0xD0, 0xBB,
+            0xD0, 0xB0
+            )
+        );
+    }
+
+    public function testCharactersWrittenUseValidator()
+    {
+        $reader = $this->_getReader();
+        $factory = $this->_getFactory($reader);
+
+        $stream = new Swift_CharacterStream_ArrayCharacterStream($factory, 'utf-8');
+
+        $reader->shouldReceive('getInitialByteSize')
+               ->zeroOrMoreTimes()
+               ->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD1), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD1), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD1), 1)->andReturn(1);
+
+        $stream->importString(pack('C*', 0xD0, 0x94, 0xD0, 0xB6, 0xD0, 0xBE));
+
+        $stream->write(pack('C*',
+            0xD0, 0xBB,
+            0xD1, 0x8E,
+            0xD0, 0xB1,
+            0xD1, 0x8B,
+            0xD1, 0x85
+            )
+        );
+    }
+
+    public function testReadCharactersAreInTact()
+    {
+        $reader = $this->_getReader();
+        $factory = $this->_getFactory($reader);
+
+        $stream = new Swift_CharacterStream_ArrayCharacterStream($factory, 'utf-8');
+
+        $reader->shouldReceive('getInitialByteSize')
+               ->zeroOrMoreTimes()
+               ->andReturn(1);
+        //String
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        //Stream
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD1), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD1), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD1), 1)->andReturn(1);
+
+        $stream->importString(pack('C*', 0xD0, 0x94, 0xD0, 0xB6, 0xD0, 0xBE));
+
+        $stream->write(pack('C*',
+            0xD0, 0xBB,
+            0xD1, 0x8E,
+            0xD0, 0xB1,
+            0xD1, 0x8B,
+            0xD1, 0x85
+            )
+        );
+
+        $this->assertIdenticalBinary(pack('C*', 0xD0, 0x94), $stream->read(1));
+        $this->assertIdenticalBinary(
+            pack('C*', 0xD0, 0xB6, 0xD0, 0xBE), $stream->read(2)
+            );
+        $this->assertIdenticalBinary(pack('C*', 0xD0, 0xBB), $stream->read(1));
+        $this->assertIdenticalBinary(
+            pack('C*', 0xD1, 0x8E, 0xD0, 0xB1, 0xD1, 0x8B), $stream->read(3)
+            );
+        $this->assertIdenticalBinary(pack('C*', 0xD1, 0x85), $stream->read(1));
+
+        $this->assertSame(false, $stream->read(1));
+    }
+
+    public function testCharactersCanBeReadAsByteArrays()
+    {
+        $reader = $this->_getReader();
+        $factory = $this->_getFactory($reader);
+
+        $stream = new Swift_CharacterStream_ArrayCharacterStream($factory, 'utf-8');
+
+        $reader->shouldReceive('getInitialByteSize')
+               ->zeroOrMoreTimes()
+               ->andReturn(1);
+        //String
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        //Stream
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD1), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD1), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD1), 1)->andReturn(1);
+
+        $stream->importString(pack('C*', 0xD0, 0x94, 0xD0, 0xB6, 0xD0, 0xBE));
+
+        $stream->write(pack('C*',
+            0xD0, 0xBB,
+            0xD1, 0x8E,
+            0xD0, 0xB1,
+            0xD1, 0x8B,
+            0xD1, 0x85
+            )
+        );
+
+        $this->assertEquals(array(0xD0, 0x94), $stream->readBytes(1));
+        $this->assertEquals(array(0xD0, 0xB6, 0xD0, 0xBE), $stream->readBytes(2));
+        $this->assertEquals(array(0xD0, 0xBB), $stream->readBytes(1));
+        $this->assertEquals(
+            array(0xD1, 0x8E, 0xD0, 0xB1, 0xD1, 0x8B), $stream->readBytes(3)
+            );
+        $this->assertEquals(array(0xD1, 0x85), $stream->readBytes(1));
+
+        $this->assertSame(false, $stream->readBytes(1));
+    }
+
+    public function testRequestingLargeCharCountPastEndOfStream()
+    {
+        $reader = $this->_getReader();
+        $factory = $this->_getFactory($reader);
+
+        $stream = new Swift_CharacterStream_ArrayCharacterStream($factory, 'utf-8');
+
+        $reader->shouldReceive('getInitialByteSize')
+               ->zeroOrMoreTimes()
+               ->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+
+        $stream->importString(pack('C*', 0xD0, 0x94, 0xD0, 0xB6, 0xD0, 0xBE));
+
+        $this->assertIdenticalBinary(pack('C*', 0xD0, 0x94, 0xD0, 0xB6, 0xD0, 0xBE),
+            $stream->read(100)
+            );
+
+        $this->assertSame(false, $stream->read(1));
+    }
+
+    public function testRequestingByteArrayCountPastEndOfStream()
+    {
+        $reader = $this->_getReader();
+        $factory = $this->_getFactory($reader);
+
+        $stream = new Swift_CharacterStream_ArrayCharacterStream($factory, 'utf-8');
+
+        $reader->shouldReceive('getInitialByteSize')
+               ->zeroOrMoreTimes()
+               ->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+
+        $stream->importString(pack('C*', 0xD0, 0x94, 0xD0, 0xB6, 0xD0, 0xBE));
+
+        $this->assertEquals(array(0xD0, 0x94, 0xD0, 0xB6, 0xD0, 0xBE),
+            $stream->readBytes(100)
+            );
+
+        $this->assertSame(false, $stream->readBytes(1));
+    }
+
+    public function testPointerOffsetCanBeSet()
+    {
+        $reader = $this->_getReader();
+        $factory = $this->_getFactory($reader);
+
+        $stream = new Swift_CharacterStream_ArrayCharacterStream($factory, 'utf-8');
+
+        $reader->shouldReceive('getInitialByteSize')
+               ->zeroOrMoreTimes()
+               ->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+
+        $stream->importString(pack('C*', 0xD0, 0x94, 0xD0, 0xB6, 0xD0, 0xBE));
+
+        $this->assertIdenticalBinary(pack('C*', 0xD0, 0x94), $stream->read(1));
+
+        $stream->setPointer(0);
+
+        $this->assertIdenticalBinary(pack('C*', 0xD0, 0x94), $stream->read(1));
+
+        $stream->setPointer(2);
+
+        $this->assertIdenticalBinary(pack('C*', 0xD0, 0xBE), $stream->read(1));
+    }
+
+    public function testContentsCanBeFlushed()
+    {
+        $reader = $this->_getReader();
+        $factory = $this->_getFactory($reader);
+
+        $stream = new Swift_CharacterStream_ArrayCharacterStream($factory, 'utf-8');
+
+        $reader->shouldReceive('getInitialByteSize')
+               ->zeroOrMoreTimes()
+               ->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+
+        $stream->importString(pack('C*', 0xD0, 0x94, 0xD0, 0xB6, 0xD0, 0xBE));
+
+        $stream->flushContents();
+
+        $this->assertSame(false, $stream->read(1));
+    }
+
+    public function testByteStreamCanBeImportingUsesValidator()
+    {
+        $reader = $this->_getReader();
+        $factory = $this->_getFactory($reader);
+        $os = $this->_getByteStream();
+
+        $stream = new Swift_CharacterStream_ArrayCharacterStream($factory, 'utf-8');
+
+        $os->shouldReceive('setReadPointer')
+           ->between(0, 1)
+           ->with(0);
+        $os->shouldReceive('read')->once()->andReturn(pack('C*', 0xD0));
+        $os->shouldReceive('read')->once()->andReturn(pack('C*', 0x94));
+        $os->shouldReceive('read')->once()->andReturn(pack('C*', 0xD0));
+        $os->shouldReceive('read')->once()->andReturn(pack('C*', 0xB6));
+        $os->shouldReceive('read')->once()->andReturn(pack('C*', 0xD0));
+        $os->shouldReceive('read')->once()->andReturn(pack('C*', 0xBE));
+        $os->shouldReceive('read')
+           ->zeroOrMoreTimes()
+           ->andReturn(false);
+
+        $reader->shouldReceive('getInitialByteSize')
+               ->zeroOrMoreTimes()
+               ->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+
+        $stream->importByteStream($os);
+    }
+
+    public function testImportingStreamProducesCorrectCharArray()
+    {
+        $reader = $this->_getReader();
+        $factory = $this->_getFactory($reader);
+        $os = $this->_getByteStream();
+
+        $stream = new Swift_CharacterStream_ArrayCharacterStream($factory, 'utf-8');
+
+        $os->shouldReceive('setReadPointer')
+           ->between(0, 1)
+           ->with(0);
+        $os->shouldReceive('read')->once()->andReturn(pack('C*', 0xD0));
+        $os->shouldReceive('read')->once()->andReturn(pack('C*', 0x94));
+        $os->shouldReceive('read')->once()->andReturn(pack('C*', 0xD0));
+        $os->shouldReceive('read')->once()->andReturn(pack('C*', 0xB6));
+        $os->shouldReceive('read')->once()->andReturn(pack('C*', 0xD0));
+        $os->shouldReceive('read')->once()->andReturn(pack('C*', 0xBE));
+        $os->shouldReceive('read')
+           ->zeroOrMoreTimes()
+           ->andReturn(false);
+
+        $reader->shouldReceive('getInitialByteSize')
+               ->zeroOrMoreTimes()
+               ->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0), 1)->andReturn(1);
+
+        $stream->importByteStream($os);
+
+        $this->assertIdenticalBinary(pack('C*', 0xD0, 0x94), $stream->read(1));
+        $this->assertIdenticalBinary(pack('C*', 0xD0, 0xB6), $stream->read(1));
+        $this->assertIdenticalBinary(pack('C*', 0xD0, 0xBE), $stream->read(1));
+
+        $this->assertSame(false, $stream->read(1));
+    }
+
+    public function testAlgorithmWithFixedWidthCharsets()
+    {
+        $reader = $this->_getReader();
+        $factory = $this->_getFactory($reader);
+
+        $reader->shouldReceive('getInitialByteSize')
+               ->zeroOrMoreTimes()
+               ->andReturn(2);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD1, 0x8D), 2);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0, 0xBB), 2);
+        $reader->shouldReceive('validateByteSequence')->once()->with(array(0xD0, 0xB0), 2);
+
+        $stream = new Swift_CharacterStream_ArrayCharacterStream(
+            $factory, 'utf-8'
+        );
+        $stream->importString(pack('C*', 0xD1, 0x8D, 0xD0, 0xBB, 0xD0, 0xB0));
+
+        $this->assertIdenticalBinary(pack('C*', 0xD1, 0x8D), $stream->read(1));
+        $this->assertIdenticalBinary(pack('C*', 0xD0, 0xBB), $stream->read(1));
+        $this->assertIdenticalBinary(pack('C*', 0xD0, 0xB0), $stream->read(1));
+
+        $this->assertSame(false, $stream->read(1));
+    }
+
+    // -- Creation methods
+
+    private function _getReader()
+    {
+        return $this->getMockery('Swift_CharacterReader');
+    }
+
+    private function _getFactory($reader)
+    {
+        $factory = $this->getMockery('Swift_CharacterReaderFactory');
+        $factory->shouldReceive('getReaderFor')
+                ->zeroOrMoreTimes()
+                ->with('utf-8')
+                ->andReturn($reader);
+
+        return $factory;
+    }
+
+    private function _getByteStream()
+    {
+        return $this->getMockery('Swift_OutputByteStream');
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/DependencyContainerTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/DependencyContainerTest.php
new file mode 100644
index 000000000..bc4a79bcb
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/DependencyContainerTest.php
@@ -0,0 +1,174 @@
+<?php
+
+class One
+{
+    public $arg1, $arg2;
+    public function __construct($arg1 = null, $arg2 = null)
+    {
+        $this->arg1 = $arg1;
+        $this->arg2 = $arg2;
+    }
+}
+
+class Swift_DependencyContainerTest extends \PHPUnit_Framework_TestCase
+{
+    private $_container;
+
+    public function setUp()
+    {
+        $this->_container = new Swift_DependencyContainer();
+    }
+
+    public function testRegisterAndLookupValue()
+    {
+        $this->_container->register('foo')->asValue('bar');
+        $this->assertEquals('bar', $this->_container->lookup('foo'));
+    }
+
+    public function testHasReturnsTrueForRegisteredValue()
+    {
+        $this->_container->register('foo')->asValue('bar');
+        $this->assertTrue($this->_container->has('foo'));
+    }
+
+    public function testHasReturnsFalseForUnregisteredValue()
+    {
+        $this->assertFalse($this->_container->has('foo'));
+    }
+
+    public function testRegisterAndLookupNewInstance()
+    {
+        $this->_container->register('one')->asNewInstanceOf('One');
+        $this->assertInstanceof('One', $this->_container->lookup('one'));
+    }
+
+    public function testHasReturnsTrueForRegisteredInstance()
+    {
+        $this->_container->register('one')->asNewInstanceOf('One');
+        $this->assertTrue($this->_container->has('one'));
+    }
+
+    public function testNewInstanceIsAlwaysNew()
+    {
+        $this->_container->register('one')->asNewInstanceOf('One');
+        $a = $this->_container->lookup('one');
+        $b = $this->_container->lookup('one');
+        $this->assertEquals($a, $b);
+    }
+
+    public function testRegisterAndLookupSharedInstance()
+    {
+        $this->_container->register('one')->asSharedInstanceOf('One');
+        $this->assertInstanceof('One', $this->_container->lookup('one'));
+    }
+
+    public function testHasReturnsTrueForSharedInstance()
+    {
+        $this->_container->register('one')->asSharedInstanceOf('One');
+        $this->assertTrue($this->_container->has('one'));
+    }
+
+    public function testMultipleSharedInstancesAreSameInstance()
+    {
+        $this->_container->register('one')->asSharedInstanceOf('One');
+        $a = $this->_container->lookup('one');
+        $b = $this->_container->lookup('one');
+        $this->assertEquals($a, $b);
+    }
+
+    public function testNewInstanceWithDependencies()
+    {
+        $this->_container->register('foo')->asValue('FOO');
+        $this->_container->register('one')->asNewInstanceOf('One')
+            ->withDependencies(array('foo'));
+        $obj = $this->_container->lookup('one');
+        $this->assertSame('FOO', $obj->arg1);
+    }
+
+    public function testNewInstanceWithMultipleDependencies()
+    {
+        $this->_container->register('foo')->asValue('FOO');
+        $this->_container->register('bar')->asValue(42);
+        $this->_container->register('one')->asNewInstanceOf('One')
+            ->withDependencies(array('foo', 'bar'));
+        $obj = $this->_container->lookup('one');
+        $this->assertSame('FOO', $obj->arg1);
+        $this->assertSame(42, $obj->arg2);
+    }
+
+    public function testNewInstanceWithInjectedObjects()
+    {
+        $this->_container->register('foo')->asValue('FOO');
+        $this->_container->register('one')->asNewInstanceOf('One');
+        $this->_container->register('two')->asNewInstanceOf('One')
+            ->withDependencies(array('one', 'foo'));
+        $obj = $this->_container->lookup('two');
+        $this->assertEquals($this->_container->lookup('one'), $obj->arg1);
+        $this->assertSame('FOO', $obj->arg2);
+    }
+
+    public function testNewInstanceWithAddConstructorValue()
+    {
+        $this->_container->register('one')->asNewInstanceOf('One')
+            ->addConstructorValue('x')
+            ->addConstructorValue(99);
+        $obj = $this->_container->lookup('one');
+        $this->assertSame('x', $obj->arg1);
+        $this->assertSame(99, $obj->arg2);
+    }
+
+    public function testNewInstanceWithAddConstructorLookup()
+    {
+        $this->_container->register('foo')->asValue('FOO');
+        $this->_container->register('bar')->asValue(42);
+        $this->_container->register('one')->asNewInstanceOf('One')
+            ->addConstructorLookup('foo')
+            ->addConstructorLookup('bar');
+
+        $obj = $this->_container->lookup('one');
+        $this->assertSame('FOO', $obj->arg1);
+        $this->assertSame(42, $obj->arg2);
+    }
+
+    public function testResolvedDependenciesCanBeLookedUp()
+    {
+        $this->_container->register('foo')->asValue('FOO');
+        $this->_container->register('one')->asNewInstanceOf('One');
+        $this->_container->register('two')->asNewInstanceOf('One')
+            ->withDependencies(array('one', 'foo'));
+        $deps = $this->_container->createDependenciesFor('two');
+        $this->assertEquals(
+            array($this->_container->lookup('one'), 'FOO'), $deps
+            );
+    }
+
+    public function testArrayOfDependenciesCanBeSpecified()
+    {
+        $this->_container->register('foo')->asValue('FOO');
+        $this->_container->register('one')->asNewInstanceOf('One');
+        $this->_container->register('two')->asNewInstanceOf('One')
+            ->withDependencies(array(array('one', 'foo'), 'foo'));
+
+        $obj = $this->_container->lookup('two');
+        $this->assertEquals(array($this->_container->lookup('one'), 'FOO'), $obj->arg1);
+        $this->assertSame('FOO', $obj->arg2);
+    }
+
+    public function testAliasCanBeSet()
+    {
+        $this->_container->register('foo')->asValue('FOO');
+        $this->_container->register('bar')->asAliasOf('foo');
+
+        $this->assertSame('FOO', $this->_container->lookup('bar'));
+    }
+
+    public function testAliasOfAliasCanBeSet()
+    {
+        $this->_container->register('foo')->asValue('FOO');
+        $this->_container->register('bar')->asAliasOf('foo');
+        $this->_container->register('zip')->asAliasOf('bar');
+        $this->_container->register('button')->asAliasOf('zip');
+
+        $this->assertSame('FOO', $this->_container->lookup('button'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Encoder/Base64EncoderTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Encoder/Base64EncoderTest.php
new file mode 100644
index 000000000..1e712fe52
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Encoder/Base64EncoderTest.php
@@ -0,0 +1,173 @@
+<?php
+
+class Swift_Encoder_Base64EncoderTest extends \PHPUnit_Framework_TestCase
+{
+    private $_encoder;
+
+    public function setUp()
+    {
+        $this->_encoder = new Swift_Encoder_Base64Encoder();
+    }
+
+    /*
+    There's really no point in testing the entire base64 encoding to the
+    level QP encoding has been tested.  base64_encode() has been in PHP for
+    years.
+    */
+
+    public function testInputOutputRatioIs3to4Bytes()
+    {
+        /*
+        RFC 2045, 6.8
+
+         The encoding process represents 24-bit groups of input bits as output
+         strings of 4 encoded characters.  Proceeding from left to right, a
+         24-bit input group is formed by concatenating 3 8bit input groups.
+         These 24 bits are then treated as 4 concatenated 6-bit groups, each
+         of which is translated into a single digit in the base64 alphabet.
+         */
+
+        $this->assertEquals(
+            'MTIz', $this->_encoder->encodeString('123'),
+            '%s: 3 bytes of input should yield 4 bytes of output'
+            );
+        $this->assertEquals(
+            'MTIzNDU2', $this->_encoder->encodeString('123456'),
+            '%s: 6 bytes in input should yield 8 bytes of output'
+            );
+        $this->assertEquals(
+            'MTIzNDU2Nzg5', $this->_encoder->encodeString('123456789'),
+            '%s: 9 bytes in input should yield 12 bytes of output'
+            );
+    }
+
+    public function testPadLength()
+    {
+        /*
+        RFC 2045, 6.8
+
+       Special processing is performed if fewer than 24 bits are available
+       at the end of the data being encoded.  A full encoding quantum is
+       always completed at the end of a body.  When fewer than 24 input bits
+       are available in an input group, zero bits are added (on the right)
+       to form an integral number of 6-bit groups.  Padding at the end of
+       the data is performed using the "=" character.  Since all base64
+       input is an integral number of octets, only the following cases can
+       arise: (1) the final quantum of encoding input is an integral
+       multiple of 24 bits; here, the final unit of encoded output will be
+       an integral multiple of 4 characters with no "=" padding, (2) the
+       final quantum of encoding input is exactly 8 bits; here, the final
+       unit of encoded output will be two characters followed by two "="
+       padding characters, or (3) the final quantum of encoding input is
+       exactly 16 bits; here, the final unit of encoded output will be three
+       characters followed by one "=" padding character.
+       */
+
+        for ($i = 0; $i < 30; ++$i) {
+            $input = pack('C', rand(0, 255));
+            $this->assertRegExp(
+                '~^[a-zA-Z0-9/\+]{2}==$~', $this->_encoder->encodeString($input),
+                '%s: A single byte should have 2 bytes of padding'
+                );
+        }
+
+        for ($i = 0; $i < 30; ++$i) {
+            $input = pack('C*', rand(0, 255), rand(0, 255));
+            $this->assertRegExp(
+                '~^[a-zA-Z0-9/\+]{3}=$~', $this->_encoder->encodeString($input),
+                '%s: Two bytes should have 1 byte of padding'
+                );
+        }
+
+        for ($i = 0; $i < 30; ++$i) {
+            $input = pack('C*', rand(0, 255), rand(0, 255), rand(0, 255));
+            $this->assertRegExp(
+                '~^[a-zA-Z0-9/\+]{4}$~', $this->_encoder->encodeString($input),
+                '%s: Three bytes should have no padding'
+                );
+        }
+    }
+
+    public function testMaximumLineLengthIs76Characters()
+    {
+        /*
+         The encoded output stream must be represented in lines of no more
+         than 76 characters each.  All line breaks or other characters not
+         found in Table 1 must be ignored by decoding software.
+         */
+
+        $input =
+        'abcdefghijklmnopqrstuvwxyz'.
+        'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.
+        '1234567890'.
+        'abcdefghijklmnopqrstuvwxyz'.
+        'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.
+        '1234567890'.
+        'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+
+        $output =
+        'YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQk'.//38
+        'NERUZHSElKS0xNTk9QUVJTVFVWV1hZWjEyMzQ1'."\r\n".//76 *
+        'Njc4OTBhYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3'.//38
+        'h5ekFCQ0RFRkdISUpLTE1OT1BRUlNUVVZXWFla'."\r\n".//76 *
+        'MTIzNDU2Nzg5MEFCQ0RFRkdISUpLTE1OT1BRUl'.//38
+        'NUVVZXWFla';                                       //48
+
+        $this->assertEquals(
+            $output, $this->_encoder->encodeString($input),
+            '%s: Lines should be no more than 76 characters'
+            );
+    }
+
+    public function testMaximumLineLengthCanBeSpecified()
+    {
+        $input =
+        'abcdefghijklmnopqrstuvwxyz'.
+        'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.
+        '1234567890'.
+        'abcdefghijklmnopqrstuvwxyz'.
+        'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.
+        '1234567890'.
+        'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+
+        $output =
+        'YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQk'.//38
+        'NERUZHSElKS0'."\r\n".//50 *
+        'xNTk9QUVJTVFVWV1hZWjEyMzQ1Njc4OTBhYmNk'.//38
+        'ZWZnaGlqa2xt'."\r\n".//50 *
+        'bm9wcXJzdHV2d3h5ekFCQ0RFRkdISUpLTE1OT1'.//38
+        'BRUlNUVVZXWF'."\r\n".//50 *
+        'laMTIzNDU2Nzg5MEFCQ0RFRkdISUpLTE1OT1BR'.//38
+        'UlNUVVZXWFla';                                     //50 *
+
+        $this->assertEquals(
+            $output, $this->_encoder->encodeString($input, 0, 50),
+            '%s: Lines should be no more than 100 characters'
+            );
+    }
+
+    public function testFirstLineLengthCanBeDifferent()
+    {
+        $input =
+        'abcdefghijklmnopqrstuvwxyz'.
+        'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.
+        '1234567890'.
+        'abcdefghijklmnopqrstuvwxyz'.
+        'ABCDEFGHIJKLMNOPQRSTUVWXYZ'.
+        '1234567890'.
+        'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+
+        $output =
+        'YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQk'.//38
+        'NERUZHSElKS0xNTk9QU'."\r\n".//57 *
+        'VJTVFVWV1hZWjEyMzQ1Njc4OTBhYmNkZWZnaGl'.//38
+        'qa2xtbm9wcXJzdHV2d3h5ekFCQ0RFRkdISUpLT'."\r\n".//76 *
+        'E1OT1BRUlNUVVZXWFlaMTIzNDU2Nzg5MEFCQ0R'.//38
+        'FRkdISUpLTE1OT1BRUlNUVVZXWFla';                    //67
+
+        $this->assertEquals(
+            $output, $this->_encoder->encodeString($input, 19),
+            '%s: First line offset is 19 so first line should be 57 chars long'
+            );
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Encoder/QpEncoderTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Encoder/QpEncoderTest.php
new file mode 100644
index 000000000..0bf4d1818
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Encoder/QpEncoderTest.php
@@ -0,0 +1,402 @@
+<?php
+
+class Swift_Encoder_QpEncoderTest extends \SwiftMailerTestCase
+{
+    /* -- RFC 2045, 6.7 --
+    (1)   (General 8bit representation) Any octet, except a CR or
+                    LF that is part of a CRLF line break of the canonical
+                    (standard) form of the data being encoded, may be
+                    represented by an "=" followed by a two digit
+                    hexadecimal representation of the octet's value.  The
+                    digits of the hexadecimal alphabet, for this purpose,
+                    are "0123456789ABCDEF".  Uppercase letters must be
+                    used; lowercase letters are not allowed.  Thus, for
+                    example, the decimal value 12 (US-ASCII form feed) can
+                    be represented by "=0C", and the decimal value 61 (US-
+                    ASCII EQUAL SIGN) can be represented by "=3D".  This
+                    rule must be followed except when the following rules
+                    allow an alternative encoding.
+                    */
+
+    public function testPermittedCharactersAreNotEncoded()
+    {
+        /* -- RFC 2045, 6.7 --
+        (2)   (Literal representation) Octets with decimal values of
+                    33 through 60 inclusive, and 62 through 126, inclusive,
+                    MAY be represented as the US-ASCII characters which
+                    correspond to those octets (EXCLAMATION POINT through
+                    LESS THAN, and GREATER THAN through TILDE,
+                    respectively).
+                    */
+
+        foreach (array_merge(range(33, 60), range(62, 126)) as $ordinal) {
+            $char = chr($ordinal);
+
+            $charStream = $this->_createCharStream();
+            $charStream->shouldReceive('flushContents')
+                       ->once();
+            $charStream->shouldReceive('importString')
+                       ->once()
+                       ->with($char);
+            $charStream->shouldReceive('readBytes')
+                       ->once()
+                       ->andReturn(array($ordinal));
+            $charStream->shouldReceive('readBytes')
+                       ->atLeast()->times(1)
+                       ->andReturn(false);
+
+            $encoder = new Swift_Encoder_QpEncoder($charStream);
+
+            $this->assertIdenticalBinary($char, $encoder->encodeString($char));
+        }
+    }
+
+    public function testWhiteSpaceAtLineEndingIsEncoded()
+    {
+        /* -- RFC 2045, 6.7 --
+        (3)   (White Space) Octets with values of 9 and 32 MAY be
+                    represented as US-ASCII TAB (HT) and SPACE characters,
+                    respectively, but MUST NOT be so represented at the end
+                    of an encoded line.  Any TAB (HT) or SPACE characters
+                    on an encoded line MUST thus be followed on that line
+                    by a printable character.  In particular, an "=" at the
+                    end of an encoded line, indicating a soft line break
+                    (see rule #5) may follow one or more TAB (HT) or SPACE
+                    characters.  It follows that an octet with decimal
+                    value 9 or 32 appearing at the end of an encoded line
+                    must be represented according to Rule #1.  This rule is
+                    necessary because some MTAs (Message Transport Agents,
+                    programs which transport messages from one user to
+                    another, or perform a portion of such transfers) are
+                    known to pad lines of text with SPACEs, and others are
+                    known to remove "white space" characters from the end
+                    of a line.  Therefore, when decoding a Quoted-Printable
+                    body, any trailing white space on a line must be
+                    deleted, as it will necessarily have been added by
+                    intermediate transport agents.
+                    */
+
+        $HT = chr(0x09); //9
+        $SPACE = chr(0x20); //32
+
+        //HT
+        $string = 'a'.$HT.$HT."\r\n".'b';
+
+        $charStream = $this->_createCharStream();
+        $charStream->shouldReceive('flushContents')
+                    ->once();
+        $charStream->shouldReceive('importString')
+                    ->once()
+                    ->with($string);
+
+        $charStream->shouldReceive('readBytes')->once()->andReturn(array(ord('a')));
+        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x09));
+        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x09));
+        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x0D));
+        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x0A));
+        $charStream->shouldReceive('readBytes')->once()->andReturn(array(ord('b')));
+        $charStream->shouldReceive('readBytes')->once()->andReturn(false);
+
+        $encoder = new Swift_Encoder_QpEncoder($charStream);
+        $this->assertEquals(
+            'a'.$HT.'=09'."\r\n".'b',
+            $encoder->encodeString($string)
+            );
+
+        //SPACE
+        $string = 'a'.$SPACE.$SPACE."\r\n".'b';
+
+        $charStream = $this->_createCharStream();
+        $charStream->shouldReceive('flushContents')
+                    ->once();
+        $charStream->shouldReceive('importString')
+                    ->once()
+                    ->with($string);
+
+        $charStream->shouldReceive('readBytes')->once()->andReturn(array(ord('a')));
+        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x20));
+        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x20));
+        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x0D));
+        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x0A));
+        $charStream->shouldReceive('readBytes')->once()->andReturn(array(ord('b')));
+        $charStream->shouldReceive('readBytes')->once()->andReturn(false);
+
+        $encoder = new Swift_Encoder_QpEncoder($charStream);
+        $this->assertEquals(
+            'a'.$SPACE.'=20'."\r\n".'b',
+            $encoder->encodeString($string)
+            );
+    }
+
+    public function testCRLFIsLeftAlone()
+    {
+        /*
+        (4)   (Line Breaks) A line break in a text body, represented
+                    as a CRLF sequence in the text canonical form, must be
+                    represented by a (RFC 822) line break, which is also a
+                    CRLF sequence, in the Quoted-Printable encoding.  Since
+                    the canonical representation of media types other than
+                    text do not generally include the representation of
+                    line breaks as CRLF sequences, no hard line breaks
+                    (i.e. line breaks that are intended to be meaningful
+                    and to be displayed to the user) can occur in the
+                    quoted-printable encoding of such types.  Sequences
+                    like "=0D", "=0A", "=0A=0D" and "=0D=0A" will routinely
+                    appear in non-text data represented in quoted-
+                    printable, of course.
+
+                    Note that many implementations may elect to encode the
+                    local representation of various content types directly
+                    rather than converting to canonical form first,
+                    encoding, and then converting back to local
+                    representation.  In particular, this may apply to plain
+                    text material on systems that use newline conventions
+                    other than a CRLF terminator sequence.  Such an
+                    implementation optimization is permissible, but only
+                    when the combined canonicalization-encoding step is
+                    equivalent to performing the three steps separately.
+                    */
+
+        $string = 'a'."\r\n".'b'."\r\n".'c'."\r\n";
+
+        $charStream = $this->_createCharStream();
+        $charStream->shouldReceive('flushContents')
+                    ->once();
+        $charStream->shouldReceive('importString')
+                    ->once()
+                    ->with($string);
+
+        $charStream->shouldReceive('readBytes')->once()->andReturn(array(ord('a')));
+        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x0D));
+        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x0A));
+        $charStream->shouldReceive('readBytes')->once()->andReturn(array(ord('b')));
+        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x0D));
+        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x0A));
+        $charStream->shouldReceive('readBytes')->once()->andReturn(array(ord('c')));
+        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x0D));
+        $charStream->shouldReceive('readBytes')->once()->andReturn(array(0x0A));
+        $charStream->shouldReceive('readBytes')->once()->andReturn(false);
+
+        $encoder = new Swift_Encoder_QpEncoder($charStream);
+        $this->assertEquals($string, $encoder->encodeString($string));
+    }
+
+    public function testLinesLongerThan76CharactersAreSoftBroken()
+    {
+        /*
+        (5)   (Soft Line Breaks) The Quoted-Printable encoding
+                    REQUIRES that encoded lines be no more than 76
+                    characters long.  If longer lines are to be encoded
+                    with the Quoted-Printable encoding, "soft" line breaks
+                    must be used.  An equal sign as the last character on a
+                    encoded line indicates such a non-significant ("soft")
+                    line break in the encoded text.
+                    */
+
+        $input = str_repeat('a', 140);
+
+        $charStream = $this->_createCharStream();
+        $charStream->shouldReceive('flushContents')
+                    ->once();
+        $charStream->shouldReceive('importString')
+                    ->once()
+                    ->with($input);
+
+        $output = '';
+        for ($i = 0; $i < 140; ++$i) {
+            $charStream->shouldReceive('readBytes')
+                       ->once()
+                       ->andReturn(array(ord('a')));
+
+            if (75 == $i) {
+                $output .= "=\r\n";
+            }
+            $output .= 'a';
+        }
+
+        $charStream->shouldReceive('readBytes')
+                    ->once()
+                    ->andReturn(false);
+
+        $encoder = new Swift_Encoder_QpEncoder($charStream);
+        $this->assertEquals($output, $encoder->encodeString($input));
+    }
+
+    public function testMaxLineLengthCanBeSpecified()
+    {
+        $input = str_repeat('a', 100);
+
+        $charStream = $this->_createCharStream();
+        $charStream->shouldReceive('flushContents')
+                    ->once();
+        $charStream->shouldReceive('importString')
+                    ->once()
+                    ->with($input);
+
+        $output = '';
+        for ($i = 0; $i < 100; ++$i) {
+            $charStream->shouldReceive('readBytes')
+                       ->once()
+                       ->andReturn(array(ord('a')));
+
+            if (53 == $i) {
+                $output .= "=\r\n";
+            }
+            $output .= 'a';
+        }
+        $charStream->shouldReceive('readBytes')
+                    ->once()
+                    ->andReturn(false);
+
+        $encoder = new Swift_Encoder_QpEncoder($charStream);
+        $this->assertEquals($output, $encoder->encodeString($input, 0, 54));
+    }
+
+    public function testBytesBelowPermittedRangeAreEncoded()
+    {
+        /*
+        According to Rule (1 & 2)
+        */
+
+        foreach (range(0, 32) as $ordinal) {
+            $char = chr($ordinal);
+
+            $charStream = $this->_createCharStream();
+            $charStream->shouldReceive('flushContents')
+                       ->once();
+            $charStream->shouldReceive('importString')
+                       ->once()
+                       ->with($char);
+            $charStream->shouldReceive('readBytes')
+                       ->once()
+                       ->andReturn(array($ordinal));
+            $charStream->shouldReceive('readBytes')
+                       ->atLeast()->times(1)
+                       ->andReturn(false);
+
+            $encoder = new Swift_Encoder_QpEncoder($charStream);
+
+            $this->assertEquals(
+                sprintf('=%02X', $ordinal), $encoder->encodeString($char)
+                );
+        }
+    }
+
+    public function testDecimalByte61IsEncoded()
+    {
+        /*
+        According to Rule (1 & 2)
+        */
+
+        $char = '=';
+
+        $charStream = $this->_createCharStream();
+        $charStream->shouldReceive('flushContents')
+                    ->once();
+        $charStream->shouldReceive('importString')
+                    ->once()
+                    ->with($char);
+        $charStream->shouldReceive('readBytes')
+                    ->once()
+                    ->andReturn(array(61));
+        $charStream->shouldReceive('readBytes')
+                    ->atLeast()->times(1)
+                    ->andReturn(false);
+
+        $encoder = new Swift_Encoder_QpEncoder($charStream);
+
+        $this->assertEquals('=3D', $encoder->encodeString('='));
+    }
+
+    public function testBytesAbovePermittedRangeAreEncoded()
+    {
+        /*
+        According to Rule (1 & 2)
+        */
+
+        foreach (range(127, 255) as $ordinal) {
+            $char = chr($ordinal);
+
+            $charStream = $this->_createCharStream();
+            $charStream->shouldReceive('flushContents')
+                       ->once();
+            $charStream->shouldReceive('importString')
+                       ->once()
+                       ->with($char);
+            $charStream->shouldReceive('readBytes')
+                       ->once()
+                       ->andReturn(array($ordinal));
+            $charStream->shouldReceive('readBytes')
+                       ->atLeast()->times(1)
+                       ->andReturn(false);
+
+            $encoder = new Swift_Encoder_QpEncoder($charStream);
+
+            $this->assertEquals(
+                sprintf('=%02X', $ordinal), $encoder->encodeString($char)
+                );
+        }
+    }
+
+    public function testFirstLineLengthCanBeDifferent()
+    {
+        $input = str_repeat('a', 140);
+
+        $charStream = $this->_createCharStream();
+        $charStream->shouldReceive('flushContents')
+                    ->once();
+        $charStream->shouldReceive('importString')
+                    ->once()
+                    ->with($input);
+
+        $output = '';
+        for ($i = 0; $i < 140; ++$i) {
+            $charStream->shouldReceive('readBytes')
+                       ->once()
+                       ->andReturn(array(ord('a')));
+
+            if (53 == $i || 53 + 75 == $i) {
+                $output .= "=\r\n";
+            }
+            $output .= 'a';
+        }
+
+        $charStream->shouldReceive('readBytes')
+                    ->once()
+                    ->andReturn(false);
+
+        $encoder = new Swift_Encoder_QpEncoder($charStream);
+        $this->assertEquals(
+            $output, $encoder->encodeString($input, 22),
+            '%s: First line should start at offset 22 so can only have max length 54'
+            );
+    }
+
+    public function testTextIsPreWrapped()
+    {
+        $encoder = $this->createEncoder();
+
+        $input = str_repeat('a', 70)."\r\n".
+                 str_repeat('a', 70)."\r\n".
+                 str_repeat('a', 70);
+
+        $this->assertEquals(
+            $input, $encoder->encodeString($input)
+            );
+    }
+
+    // -- Creation methods
+
+    private function _createCharStream()
+    {
+        return $this->getMockery('Swift_CharacterStream')->shouldIgnoreMissing();
+    }
+
+    private function createEncoder()
+    {
+        $factory = new Swift_CharacterReaderFactory_SimpleCharacterReaderFactory();
+        $charStream = new Swift_CharacterStream_NgCharacterStream($factory, 'utf-8');
+
+        return new Swift_Encoder_QpEncoder($charStream);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Encoder/Rfc2231EncoderTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Encoder/Rfc2231EncoderTest.php
new file mode 100644
index 000000000..28eae6f86
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Encoder/Rfc2231EncoderTest.php
@@ -0,0 +1,141 @@
+<?php
+
+class Swift_Encoder_Rfc2231EncoderTest extends \SwiftMailerTestCase
+{
+    private $_rfc2045Token = '/^[\x21\x23-\x27\x2A\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7E]+$/D';
+
+    /* --
+    This algorithm is described in RFC 2231, but is barely touched upon except
+    for mentioning bytes can be represented as their octet values (e.g. %20 for
+    the SPACE character).
+
+    The tests here focus on how to use that representation to always generate text
+    which matches RFC 2045's definition of "token".
+    */
+
+    public function testEncodingAsciiCharactersProducesValidToken()
+    {
+        $charStream = $this->getMockery('Swift_CharacterStream');
+
+        $string = '';
+        foreach (range(0x00, 0x7F) as $octet) {
+            $char = pack('C', $octet);
+            $string .= $char;
+            $charStream->shouldReceive('read')
+                       ->once()
+                       ->andReturn($char);
+        }
+
+        $charStream->shouldReceive('flushContents')
+                    ->once();
+        $charStream->shouldReceive('importString')
+                    ->once()
+                    ->with($string);
+        $charStream->shouldReceive('read')
+                    ->atLeast()->times(1)
+                    ->andReturn(false);
+
+        $encoder = new Swift_Encoder_Rfc2231Encoder($charStream);
+        $encoded = $encoder->encodeString($string);
+
+        foreach (explode("\r\n", $encoded) as $line) {
+            $this->assertRegExp($this->_rfc2045Token, $line,
+                '%s: Encoder should always return a valid RFC 2045 token.');
+        }
+    }
+
+    public function testEncodingNonAsciiCharactersProducesValidToken()
+    {
+        $charStream = $this->getMockery('Swift_CharacterStream');
+
+        $string = '';
+        foreach (range(0x80, 0xFF) as $octet) {
+            $char = pack('C', $octet);
+            $string .= $char;
+            $charStream->shouldReceive('read')
+                       ->once()
+                       ->andReturn($char);
+        }
+        $charStream->shouldReceive('flushContents')
+                    ->once();
+        $charStream->shouldReceive('importString')
+                    ->once()
+                    ->with($string);
+        $charStream->shouldReceive('read')
+                    ->atLeast()->times(1)
+                    ->andReturn(false);
+        $encoder = new Swift_Encoder_Rfc2231Encoder($charStream);
+
+        $encoded = $encoder->encodeString($string);
+
+        foreach (explode("\r\n", $encoded) as $line) {
+            $this->assertRegExp($this->_rfc2045Token, $line,
+                '%s: Encoder should always return a valid RFC 2045 token.');
+        }
+    }
+
+    public function testMaximumLineLengthCanBeSet()
+    {
+        $charStream = $this->getMockery('Swift_CharacterStream');
+
+        $string = '';
+        for ($x = 0; $x < 200; ++$x) {
+            $char = 'a';
+            $string .= $char;
+            $charStream->shouldReceive('read')
+                       ->once()
+                       ->andReturn($char);
+        }
+        $charStream->shouldReceive('flushContents')
+                    ->once();
+        $charStream->shouldReceive('importString')
+                    ->once()
+                    ->with($string);
+        $charStream->shouldReceive('read')
+                    ->atLeast()->times(1)
+                    ->andReturn(false);
+        $encoder = new Swift_Encoder_Rfc2231Encoder($charStream);
+
+        $encoded = $encoder->encodeString($string, 0, 75);
+
+        $this->assertEquals(
+            str_repeat('a', 75)."\r\n".
+            str_repeat('a', 75)."\r\n".
+            str_repeat('a', 50),
+            $encoded,
+            '%s: Lines should be wrapped at each 75 characters'
+            );
+    }
+
+    public function testFirstLineCanHaveShorterLength()
+    {
+        $charStream = $this->getMockery('Swift_CharacterStream');
+
+        $string = '';
+        for ($x = 0; $x < 200; ++$x) {
+            $char = 'a';
+            $string .= $char;
+            $charStream->shouldReceive('read')
+                       ->once()
+                       ->andReturn($char);
+        }
+        $charStream->shouldReceive('flushContents')
+                    ->once();
+        $charStream->shouldReceive('importString')
+                    ->once()
+                    ->with($string);
+        $charStream->shouldReceive('read')
+                    ->atLeast()->times(1)
+                    ->andReturn(false);
+        $encoder = new Swift_Encoder_Rfc2231Encoder($charStream);
+        $encoded = $encoder->encodeString($string, 25, 75);
+
+        $this->assertEquals(
+            str_repeat('a', 50)."\r\n".
+            str_repeat('a', 75)."\r\n".
+            str_repeat('a', 75),
+            $encoded,
+            '%s: First line should be 25 bytes shorter than the others.'
+            );
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/CommandEventTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/CommandEventTest.php
new file mode 100644
index 000000000..7e5980252
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/CommandEventTest.php
@@ -0,0 +1,36 @@
+<?php
+
+class Swift_Events_CommandEventTest extends \PHPUnit_Framework_TestCase
+{
+    public function testCommandCanBeFetchedByGetter()
+    {
+        $evt = $this->_createEvent($this->_createTransport(), "FOO\r\n");
+        $this->assertEquals("FOO\r\n", $evt->getCommand());
+    }
+
+    public function testSuccessCodesCanBeFetchedViaGetter()
+    {
+        $evt = $this->_createEvent($this->_createTransport(), "FOO\r\n", array(250));
+        $this->assertEquals(array(250), $evt->getSuccessCodes());
+    }
+
+    public function testSourceIsBuffer()
+    {
+        $transport = $this->_createTransport();
+        $evt = $this->_createEvent($transport, "FOO\r\n");
+        $ref = $evt->getSource();
+        $this->assertEquals($transport, $ref);
+    }
+
+    // -- Creation Methods
+
+    private function _createEvent(Swift_Transport $source, $command, $successCodes = array())
+    {
+        return new Swift_Events_CommandEvent($source, $command, $successCodes);
+    }
+
+    private function _createTransport()
+    {
+        return $this->getMock('Swift_Transport');
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/EventObjectTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/EventObjectTest.php
new file mode 100644
index 000000000..62a91be54
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/EventObjectTest.php
@@ -0,0 +1,34 @@
+<?php
+
+class Swift_Events_EventObjectTest extends \PHPUnit_Framework_TestCase
+{
+    public function testEventSourceCanBeReturnedViaGetter()
+    {
+        $source = new stdClass();
+        $evt = $this->_createEvent($source);
+        $ref = $evt->getSource();
+        $this->assertEquals($source, $ref);
+    }
+
+    public function testEventDoesNotHaveCancelledBubbleWhenNew()
+    {
+        $source = new stdClass();
+        $evt = $this->_createEvent($source);
+        $this->assertFalse($evt->bubbleCancelled());
+    }
+
+    public function testBubbleCanBeCancelledInEvent()
+    {
+        $source = new stdClass();
+        $evt = $this->_createEvent($source);
+        $evt->cancelBubble();
+        $this->assertTrue($evt->bubbleCancelled());
+    }
+
+    // -- Creation Methods
+
+    private function _createEvent($source)
+    {
+        return new Swift_Events_EventObject($source);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/ResponseEventTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/ResponseEventTest.php
new file mode 100644
index 000000000..e0f3e362d
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/ResponseEventTest.php
@@ -0,0 +1,40 @@
+<?php
+
+class Swift_Events_ResponseEventTest extends \PHPUnit_Framework_TestCase
+{
+    public function testResponseCanBeFetchViaGetter()
+    {
+        $evt = $this->_createEvent($this->_createTransport(), "250 Ok\r\n", true);
+        $this->assertEquals("250 Ok\r\n", $evt->getResponse(),
+            '%s: Response should be available via getResponse()'
+            );
+    }
+
+    public function testResultCanBeFetchedViaGetter()
+    {
+        $evt = $this->_createEvent($this->_createTransport(), "250 Ok\r\n", false);
+        $this->assertFalse($evt->isValid(),
+            '%s: Result should be checkable via isValid()'
+            );
+    }
+
+    public function testSourceIsBuffer()
+    {
+        $transport = $this->_createTransport();
+        $evt = $this->_createEvent($transport, "250 Ok\r\n", true);
+        $ref = $evt->getSource();
+        $this->assertEquals($transport, $ref);
+    }
+
+    // -- Creation Methods
+
+    private function _createEvent(Swift_Transport $source, $response, $result)
+    {
+        return new Swift_Events_ResponseEvent($source, $response, $result);
+    }
+
+    private function _createTransport()
+    {
+        return $this->getMock('Swift_Transport');
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/SendEventTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/SendEventTest.php
new file mode 100644
index 000000000..800387009
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/SendEventTest.php
@@ -0,0 +1,99 @@
+<?php
+
+class Swift_Events_SendEventTest extends \PHPUnit_Framework_TestCase
+{
+    public function testMessageCanBeFetchedViaGetter()
+    {
+        $message = $this->_createMessage();
+        $transport = $this->_createTransport();
+
+        $evt = $this->_createEvent($transport, $message);
+
+        $ref = $evt->getMessage();
+        $this->assertEquals($message, $ref,
+            '%s: Message should be returned from getMessage()'
+            );
+    }
+
+    public function testTransportCanBeFetchViaGetter()
+    {
+        $message = $this->_createMessage();
+        $transport = $this->_createTransport();
+
+        $evt = $this->_createEvent($transport, $message);
+
+        $ref = $evt->getTransport();
+        $this->assertEquals($transport, $ref,
+            '%s: Transport should be returned from getTransport()'
+            );
+    }
+
+    public function testTransportCanBeFetchViaGetSource()
+    {
+        $message = $this->_createMessage();
+        $transport = $this->_createTransport();
+
+        $evt = $this->_createEvent($transport, $message);
+
+        $ref = $evt->getSource();
+        $this->assertEquals($transport, $ref,
+            '%s: Transport should be returned from getSource()'
+            );
+    }
+
+    public function testResultCanBeSetAndGet()
+    {
+        $message = $this->_createMessage();
+        $transport = $this->_createTransport();
+
+        $evt = $this->_createEvent($transport, $message);
+
+        $evt->setResult(
+            Swift_Events_SendEvent::RESULT_SUCCESS | Swift_Events_SendEvent::RESULT_TENTATIVE
+            );
+
+        $this->assertTrue((bool) ($evt->getResult() & Swift_Events_SendEvent::RESULT_SUCCESS));
+        $this->assertTrue((bool) ($evt->getResult() & Swift_Events_SendEvent::RESULT_TENTATIVE));
+    }
+
+    public function testFailedRecipientsCanBeSetAndGet()
+    {
+        $message = $this->_createMessage();
+        $transport = $this->_createTransport();
+
+        $evt = $this->_createEvent($transport, $message);
+
+        $evt->setFailedRecipients(array('foo@bar', 'zip@button'));
+
+        $this->assertEquals(array('foo@bar', 'zip@button'), $evt->getFailedRecipients(),
+            '%s: FailedRecipients should be returned from getter'
+            );
+    }
+
+    public function testFailedRecipientsGetsPickedUpCorrectly()
+    {
+        $message = $this->_createMessage();
+        $transport = $this->_createTransport();
+
+        $evt = $this->_createEvent($transport, $message);
+        $this->assertEquals(array(), $evt->getFailedRecipients());
+    }
+
+    // -- Creation Methods
+
+    private function _createEvent(Swift_Transport $source,
+        Swift_Mime_Message $message)
+    {
+        return new Swift_Events_SendEvent($source, $message);
+    }
+
+    private function _createTransport()
+    {
+        return $this->getMock('Swift_Transport');
+    }
+
+    private function _createMessage()
+    {
+        return $this->getMock('Swift_Mime_Message');
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/SimpleEventDispatcherTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/SimpleEventDispatcherTest.php
new file mode 100644
index 000000000..910e0cf7c
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/SimpleEventDispatcherTest.php
@@ -0,0 +1,142 @@
+<?php
+
+class Swift_Events_SimpleEventDispatcherTest extends \PHPUnit_Framework_TestCase
+{
+    private $_dispatcher;
+
+    public function setUp()
+    {
+        $this->_dispatcher = new Swift_Events_SimpleEventDispatcher();
+    }
+
+    public function testSendEventCanBeCreated()
+    {
+        $transport = $this->getMock('Swift_Transport');
+        $message = $this->getMock('Swift_Mime_Message');
+        $evt = $this->_dispatcher->createSendEvent($transport, $message);
+        $this->assertInstanceof('Swift_Events_SendEvent', $evt);
+        $this->assertSame($message, $evt->getMessage());
+        $this->assertSame($transport, $evt->getTransport());
+    }
+
+    public function testCommandEventCanBeCreated()
+    {
+        $buf = $this->getMock('Swift_Transport');
+        $evt = $this->_dispatcher->createCommandEvent($buf, "FOO\r\n", array(250));
+        $this->assertInstanceof('Swift_Events_CommandEvent', $evt);
+        $this->assertSame($buf, $evt->getSource());
+        $this->assertEquals("FOO\r\n", $evt->getCommand());
+        $this->assertEquals(array(250), $evt->getSuccessCodes());
+    }
+
+    public function testResponseEventCanBeCreated()
+    {
+        $buf = $this->getMock('Swift_Transport');
+        $evt = $this->_dispatcher->createResponseEvent($buf, "250 Ok\r\n", true);
+        $this->assertInstanceof('Swift_Events_ResponseEvent', $evt);
+        $this->assertSame($buf, $evt->getSource());
+        $this->assertEquals("250 Ok\r\n", $evt->getResponse());
+        $this->assertTrue($evt->isValid());
+    }
+
+    public function testTransportChangeEventCanBeCreated()
+    {
+        $transport = $this->getMock('Swift_Transport');
+        $evt = $this->_dispatcher->createTransportChangeEvent($transport);
+        $this->assertInstanceof('Swift_Events_TransportChangeEvent', $evt);
+        $this->assertSame($transport, $evt->getSource());
+    }
+
+    public function testTransportExceptionEventCanBeCreated()
+    {
+        $transport = $this->getMock('Swift_Transport');
+        $ex = new Swift_TransportException('');
+        $evt = $this->_dispatcher->createTransportExceptionEvent($transport, $ex);
+        $this->assertInstanceof('Swift_Events_TransportExceptionEvent', $evt);
+        $this->assertSame($transport, $evt->getSource());
+        $this->assertSame($ex, $evt->getException());
+    }
+
+    public function testListenersAreNotifiedOfDispatchedEvent()
+    {
+        $transport = $this->getMock('Swift_Transport');
+
+        $evt = $this->_dispatcher->createTransportChangeEvent($transport);
+
+        $listenerA = $this->getMock('Swift_Events_TransportChangeListener');
+        $listenerB = $this->getMock('Swift_Events_TransportChangeListener');
+
+        $this->_dispatcher->bindEventListener($listenerA);
+        $this->_dispatcher->bindEventListener($listenerB);
+
+        $listenerA->expects($this->once())
+                  ->method('transportStarted')
+                  ->with($evt);
+        $listenerB->expects($this->once())
+                  ->method('transportStarted')
+                  ->with($evt);
+
+        $this->_dispatcher->dispatchEvent($evt, 'transportStarted');
+    }
+
+    public function testListenersAreOnlyCalledIfImplementingCorrectInterface()
+    {
+        $transport = $this->getMock('Swift_Transport');
+        $message = $this->getMock('Swift_Mime_Message');
+
+        $evt = $this->_dispatcher->createSendEvent($transport, $message);
+
+        $targetListener = $this->getMock('Swift_Events_SendListener');
+        $otherListener = $this->getMock('DummyListener');
+
+        $this->_dispatcher->bindEventListener($targetListener);
+        $this->_dispatcher->bindEventListener($otherListener);
+
+        $targetListener->expects($this->once())
+                       ->method('sendPerformed')
+                       ->with($evt);
+        $otherListener->expects($this->never())
+                    ->method('sendPerformed');
+
+        $this->_dispatcher->dispatchEvent($evt, 'sendPerformed');
+    }
+
+    public function testListenersCanCancelBubblingOfEvent()
+    {
+        $transport = $this->getMock('Swift_Transport');
+        $message = $this->getMock('Swift_Mime_Message');
+
+        $evt = $this->_dispatcher->createSendEvent($transport, $message);
+
+        $listenerA = $this->getMock('Swift_Events_SendListener');
+        $listenerB = $this->getMock('Swift_Events_SendListener');
+
+        $this->_dispatcher->bindEventListener($listenerA);
+        $this->_dispatcher->bindEventListener($listenerB);
+
+        $listenerA->expects($this->once())
+                  ->method('sendPerformed')
+                  ->with($evt)
+                  ->will($this->returnCallback(function ($object) {
+                      $object->cancelBubble(true);
+                  }));
+        $listenerB->expects($this->never())
+                  ->method('sendPerformed');
+
+        $this->_dispatcher->dispatchEvent($evt, 'sendPerformed');
+
+        $this->assertTrue($evt->bubbleCancelled());
+    }
+
+    private function _createDispatcher(array $map)
+    {
+        return new Swift_Events_SimpleEventDispatcher($map);
+    }
+}
+
+class DummyListener implements Swift_Events_EventListener
+{
+    public function sendPerformed(Swift_Events_SendEvent $evt)
+    {
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/TransportChangeEventTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/TransportChangeEventTest.php
new file mode 100644
index 000000000..40bec8345
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/TransportChangeEventTest.php
@@ -0,0 +1,32 @@
+<?php
+
+class Swift_Events_TransportChangeEventTest extends \PHPUnit_Framework_TestCase
+{
+    public function testGetTransportReturnsTransport()
+    {
+        $transport = $this->_createTransport();
+        $evt = $this->_createEvent($transport);
+        $ref = $evt->getTransport();
+        $this->assertEquals($transport, $ref);
+    }
+
+    public function testSourceIsTransport()
+    {
+        $transport = $this->_createTransport();
+        $evt = $this->_createEvent($transport);
+        $ref = $evt->getSource();
+        $this->assertEquals($transport, $ref);
+    }
+
+    // -- Creation Methods
+
+    private function _createEvent(Swift_Transport $source)
+    {
+        return new Swift_Events_TransportChangeEvent($source);
+    }
+
+    private function _createTransport()
+    {
+        return $this->getMock('Swift_Transport');
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/TransportExceptionEventTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/TransportExceptionEventTest.php
new file mode 100644
index 000000000..86c636b54
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Events/TransportExceptionEventTest.php
@@ -0,0 +1,43 @@
+<?php
+
+class Swift_Events_TransportExceptionEventTest extends \PHPUnit_Framework_TestCase
+{
+    public function testExceptionCanBeFetchViaGetter()
+    {
+        $ex = $this->_createException();
+        $transport = $this->_createTransport();
+        $evt = $this->_createEvent($transport, $ex);
+        $ref = $evt->getException();
+        $this->assertEquals($ex, $ref,
+            '%s: Exception should be available via getException()'
+            );
+    }
+
+    public function testSourceIsTransport()
+    {
+        $ex = $this->_createException();
+        $transport = $this->_createTransport();
+        $evt = $this->_createEvent($transport, $ex);
+        $ref = $evt->getSource();
+        $this->assertEquals($transport, $ref,
+            '%s: Transport should be available via getSource()'
+            );
+    }
+
+    // -- Creation Methods
+
+    private function _createEvent(Swift_Transport $transport, Swift_TransportException $ex)
+    {
+        return new Swift_Events_TransportExceptionEvent($transport, $ex);
+    }
+
+    private function _createTransport()
+    {
+        return $this->getMock('Swift_Transport');
+    }
+
+    private function _createException()
+    {
+        return new Swift_TransportException('');
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/KeyCache/ArrayKeyCacheTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/KeyCache/ArrayKeyCacheTest.php
new file mode 100644
index 000000000..36512cff4
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/KeyCache/ArrayKeyCacheTest.php
@@ -0,0 +1,242 @@
+<?php
+
+class Swift_KeyCache_ArrayKeyCacheTest extends \PHPUnit_Framework_TestCase
+{
+    private $_key1 = 'key1';
+    private $_key2 = 'key2';
+
+    public function testStringDataCanBeSetAndFetched()
+    {
+        $is = $this->_createKeyCacheInputStream();
+        $cache = $this->_createCache($is);
+        $cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+        $this->assertEquals('test', $cache->getString($this->_key1, 'foo'));
+    }
+
+    public function testStringDataCanBeOverwritten()
+    {
+        $is = $this->_createKeyCacheInputStream();
+        $cache = $this->_createCache($is);
+        $cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+        $cache->setString(
+            $this->_key1, 'foo', 'whatever', Swift_KeyCache::MODE_WRITE
+            );
+
+        $this->assertEquals('whatever', $cache->getString($this->_key1, 'foo'));
+    }
+
+    public function testStringDataCanBeAppended()
+    {
+        $is = $this->_createKeyCacheInputStream();
+        $cache = $this->_createCache($is);
+        $cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+        $cache->setString(
+            $this->_key1, 'foo', 'ing', Swift_KeyCache::MODE_APPEND
+            );
+
+        $this->assertEquals('testing', $cache->getString($this->_key1, 'foo'));
+    }
+
+    public function testHasKeyReturnValue()
+    {
+        $is = $this->_createKeyCacheInputStream();
+        $cache = $this->_createCache($is);
+        $cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+
+        $this->assertTrue($cache->hasKey($this->_key1, 'foo'));
+    }
+
+    public function testNsKeyIsWellPartitioned()
+    {
+        $is = $this->_createKeyCacheInputStream();
+        $cache = $this->_createCache($is);
+        $cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+        $cache->setString(
+            $this->_key2, 'foo', 'ing', Swift_KeyCache::MODE_WRITE
+            );
+
+        $this->assertEquals('test', $cache->getString($this->_key1, 'foo'));
+        $this->assertEquals('ing', $cache->getString($this->_key2, 'foo'));
+    }
+
+    public function testItemKeyIsWellPartitioned()
+    {
+        $is = $this->_createKeyCacheInputStream();
+        $cache = $this->_createCache($is);
+        $cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+        $cache->setString(
+            $this->_key1, 'bar', 'ing', Swift_KeyCache::MODE_WRITE
+            );
+
+        $this->assertEquals('test', $cache->getString($this->_key1, 'foo'));
+        $this->assertEquals('ing', $cache->getString($this->_key1, 'bar'));
+    }
+
+    public function testByteStreamCanBeImported()
+    {
+        $os = $this->_createOutputStream();
+        $os->expects($this->at(0))
+           ->method('read')
+           ->will($this->returnValue('abc'));
+        $os->expects($this->at(1))
+           ->method('read')
+           ->will($this->returnValue('def'));
+        $os->expects($this->at(2))
+           ->method('read')
+           ->will($this->returnValue(false));
+
+        $is = $this->_createKeyCacheInputStream();
+        $cache = $this->_createCache($is);
+        $cache->importFromByteStream(
+            $this->_key1, 'foo', $os, Swift_KeyCache::MODE_WRITE
+            );
+        $this->assertEquals('abcdef', $cache->getString($this->_key1, 'foo'));
+    }
+
+    public function testByteStreamCanBeAppended()
+    {
+        $os1 = $this->_createOutputStream();
+        $os1->expects($this->at(0))
+            ->method('read')
+            ->will($this->returnValue('abc'));
+        $os1->expects($this->at(1))
+            ->method('read')
+            ->will($this->returnValue('def'));
+        $os1->expects($this->at(2))
+            ->method('read')
+            ->will($this->returnValue(false));
+
+        $os2 = $this->_createOutputStream();
+        $os2->expects($this->at(0))
+            ->method('read')
+            ->will($this->returnValue('xyz'));
+        $os2->expects($this->at(1))
+            ->method('read')
+            ->will($this->returnValue('uvw'));
+        $os2->expects($this->at(2))
+            ->method('read')
+            ->will($this->returnValue(false));
+
+        $is = $this->_createKeyCacheInputStream(true);
+
+        $cache = $this->_createCache($is);
+
+        $cache->importFromByteStream(
+            $this->_key1, 'foo', $os1, Swift_KeyCache::MODE_APPEND
+            );
+        $cache->importFromByteStream(
+            $this->_key1, 'foo', $os2, Swift_KeyCache::MODE_APPEND
+            );
+
+        $this->assertEquals('abcdefxyzuvw', $cache->getString($this->_key1, 'foo'));
+    }
+
+    public function testByteStreamAndStringCanBeAppended()
+    {
+        $os = $this->_createOutputStream();
+        $os->expects($this->at(0))
+           ->method('read')
+           ->will($this->returnValue('abc'));
+        $os->expects($this->at(1))
+           ->method('read')
+           ->will($this->returnValue('def'));
+        $os->expects($this->at(2))
+           ->method('read')
+           ->will($this->returnValue(false));
+
+        $is = $this->_createKeyCacheInputStream(true);
+
+        $cache = $this->_createCache($is);
+
+        $cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_APPEND
+            );
+        $cache->importFromByteStream(
+            $this->_key1, 'foo', $os, Swift_KeyCache::MODE_APPEND
+            );
+        $this->assertEquals('testabcdef', $cache->getString($this->_key1, 'foo'));
+    }
+
+    public function testDataCanBeExportedToByteStream()
+    {
+        //See acceptance test for more detail
+        $is = $this->_createInputStream();
+        $is->expects($this->atLeastOnce())
+           ->method('write');
+
+        $kcis = $this->_createKeyCacheInputStream(true);
+
+        $cache = $this->_createCache($kcis);
+
+        $cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+
+        $cache->exportToByteStream($this->_key1, 'foo', $is);
+    }
+
+    public function testKeyCanBeCleared()
+    {
+        $is = $this->_createKeyCacheInputStream();
+        $cache = $this->_createCache($is);
+
+        $cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+        $this->assertTrue($cache->hasKey($this->_key1, 'foo'));
+        $cache->clearKey($this->_key1, 'foo');
+        $this->assertFalse($cache->hasKey($this->_key1, 'foo'));
+    }
+
+    public function testNsKeyCanBeCleared()
+    {
+        $is = $this->_createKeyCacheInputStream();
+        $cache = $this->_createCache($is);
+
+        $cache->setString(
+            $this->_key1, 'foo', 'test', Swift_KeyCache::MODE_WRITE
+            );
+        $cache->setString(
+            $this->_key1, 'bar', 'xyz', Swift_KeyCache::MODE_WRITE
+            );
+        $this->assertTrue($cache->hasKey($this->_key1, 'foo'));
+        $this->assertTrue($cache->hasKey($this->_key1, 'bar'));
+        $cache->clearAll($this->_key1);
+        $this->assertFalse($cache->hasKey($this->_key1, 'foo'));
+        $this->assertFalse($cache->hasKey($this->_key1, 'bar'));
+    }
+
+    // -- Creation methods
+
+    private function _createCache($is)
+    {
+        return new Swift_KeyCache_ArrayKeyCache($is);
+    }
+
+    private function _createKeyCacheInputStream()
+    {
+        return $this->getMock('Swift_KeyCache_KeyCacheInputStream');
+    }
+
+    private function _createOutputStream()
+    {
+        return $this->getMock('Swift_OutputByteStream');
+    }
+
+    private function _createInputStream()
+    {
+        return $this->getMock('Swift_InputByteStream');
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/KeyCache/SimpleKeyCacheInputStreamTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/KeyCache/SimpleKeyCacheInputStreamTest.php
new file mode 100644
index 000000000..691c1e790
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/KeyCache/SimpleKeyCacheInputStreamTest.php
@@ -0,0 +1,73 @@
+<?php
+
+class Swift_KeyCache_SimpleKeyCacheInputStreamTest extends \PHPUnit_Framework_TestCase
+{
+    private $_nsKey = 'ns1';
+
+    public function testStreamWritesToCacheInAppendMode()
+    {
+        $cache = $this->getMock('Swift_KeyCache');
+        $cache->expects($this->at(0))
+              ->method('setString')
+              ->with($this->_nsKey, 'foo', 'a', Swift_KeyCache::MODE_APPEND);
+        $cache->expects($this->at(1))
+              ->method('setString')
+              ->with($this->_nsKey, 'foo', 'b', Swift_KeyCache::MODE_APPEND);
+        $cache->expects($this->at(2))
+              ->method('setString')
+              ->with($this->_nsKey, 'foo', 'c', Swift_KeyCache::MODE_APPEND);
+
+        $stream = new Swift_KeyCache_SimpleKeyCacheInputStream();
+        $stream->setKeyCache($cache);
+        $stream->setNsKey($this->_nsKey);
+        $stream->setItemKey('foo');
+
+        $stream->write('a');
+        $stream->write('b');
+        $stream->write('c');
+    }
+
+    public function testFlushContentClearsKey()
+    {
+        $cache = $this->getMock('Swift_KeyCache');
+        $cache->expects($this->once())
+              ->method('clearKey')
+              ->with($this->_nsKey, 'foo');
+
+        $stream = new Swift_KeyCache_SimpleKeyCacheInputStream();
+        $stream->setKeyCache($cache);
+        $stream->setNsKey($this->_nsKey);
+        $stream->setItemKey('foo');
+
+        $stream->flushBuffers();
+    }
+
+    public function testClonedStreamStillReferencesSameCache()
+    {
+        $cache = $this->getMock('Swift_KeyCache');
+        $cache->expects($this->at(0))
+              ->method('setString')
+              ->with($this->_nsKey, 'foo', 'a', Swift_KeyCache::MODE_APPEND);
+        $cache->expects($this->at(1))
+              ->method('setString')
+              ->with($this->_nsKey, 'foo', 'b', Swift_KeyCache::MODE_APPEND);
+        $cache->expects($this->at(2))
+              ->method('setString')
+              ->with('test', 'bar', 'x', Swift_KeyCache::MODE_APPEND);
+
+        $stream = new Swift_KeyCache_SimpleKeyCacheInputStream();
+        $stream->setKeyCache($cache);
+        $stream->setNsKey($this->_nsKey);
+        $stream->setItemKey('foo');
+
+        $stream->write('a');
+        $stream->write('b');
+
+        $newStream = clone $stream;
+        $newStream->setKeyCache($cache);
+        $newStream->setNsKey('test');
+        $newStream->setItemKey('bar');
+
+        $newStream->write('x');
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mailer/ArrayRecipientIteratorTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mailer/ArrayRecipientIteratorTest.php
new file mode 100644
index 000000000..ff0bce4fa
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mailer/ArrayRecipientIteratorTest.php
@@ -0,0 +1,42 @@
+<?php
+
+class Swift_Mailer_ArrayRecipientIteratorTest extends \PHPUnit_Framework_TestCase
+{
+    public function testHasNextReturnsFalseForEmptyArray()
+    {
+        $it = new Swift_Mailer_ArrayRecipientIterator(array());
+        $this->assertFalse($it->hasNext());
+    }
+
+    public function testHasNextReturnsTrueIfItemsLeft()
+    {
+        $it = new Swift_Mailer_ArrayRecipientIterator(array('foo@bar' => 'Foo'));
+        $this->assertTrue($it->hasNext());
+    }
+
+    public function testReadingToEndOfListCausesHasNextToReturnFalse()
+    {
+        $it = new Swift_Mailer_ArrayRecipientIterator(array('foo@bar' => 'Foo'));
+        $this->assertTrue($it->hasNext());
+        $it->nextRecipient();
+        $this->assertFalse($it->hasNext());
+    }
+
+    public function testReturnedValueHasPreservedKeyValuePair()
+    {
+        $it = new Swift_Mailer_ArrayRecipientIterator(array('foo@bar' => 'Foo'));
+        $this->assertEquals(array('foo@bar' => 'Foo'), $it->nextRecipient());
+    }
+
+    public function testIteratorMovesNextAfterEachIteration()
+    {
+        $it = new Swift_Mailer_ArrayRecipientIterator(array(
+            'foo@bar' => 'Foo',
+            'zip@button' => 'Zip thing',
+            'test@test' => null,
+            ));
+        $this->assertEquals(array('foo@bar' => 'Foo'), $it->nextRecipient());
+        $this->assertEquals(array('zip@button' => 'Zip thing'), $it->nextRecipient());
+        $this->assertEquals(array('test@test' => null), $it->nextRecipient());
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/MailerTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/MailerTest.php
new file mode 100644
index 000000000..389264fb0
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/MailerTest.php
@@ -0,0 +1,147 @@
+<?php
+
+class Swift_MailerTest extends \SwiftMailerTestCase
+{
+    public function testTransportIsStartedWhenSending()
+    {
+        $transport = $this->_createTransport();
+        $message = $this->_createMessage();
+
+        $started = false;
+        $transport->shouldReceive('isStarted')
+                  ->zeroOrMoreTimes()
+                  ->andReturnUsing(function () use (&$started) {
+                      return $started;
+                  });
+        $transport->shouldReceive('start')
+                  ->once()
+                  ->andReturnUsing(function () use (&$started) {
+                      $started = true;
+
+                      return;
+                  });
+
+        $mailer = $this->_createMailer($transport);
+        $mailer->send($message);
+    }
+
+    public function testTransportIsOnlyStartedOnce()
+    {
+        $transport = $this->_createTransport();
+        $message = $this->_createMessage();
+
+        $started = false;
+        $transport->shouldReceive('isStarted')
+                  ->zeroOrMoreTimes()
+                  ->andReturnUsing(function () use (&$started) {
+                      return $started;
+                  });
+        $transport->shouldReceive('start')
+                  ->once()
+                  ->andReturnUsing(function () use (&$started) {
+                      $started = true;
+
+                      return;
+                  });
+
+        $mailer = $this->_createMailer($transport);
+        for ($i = 0; $i < 10; ++$i) {
+            $mailer->send($message);
+        }
+    }
+
+    public function testMessageIsPassedToTransport()
+    {
+        $transport = $this->_createTransport();
+        $message = $this->_createMessage();
+        $transport->shouldReceive('send')
+                  ->once()
+                  ->with($message, \Mockery::any());
+
+        $mailer = $this->_createMailer($transport);
+        $mailer->send($message);
+    }
+
+    public function testSendReturnsCountFromTransport()
+    {
+        $transport = $this->_createTransport();
+        $message = $this->_createMessage();
+        $transport->shouldReceive('send')
+                  ->once()
+                  ->with($message, \Mockery::any())
+                  ->andReturn(57);
+
+        $mailer = $this->_createMailer($transport);
+        $this->assertEquals(57, $mailer->send($message));
+    }
+
+    public function testFailedRecipientReferenceIsPassedToTransport()
+    {
+        $failures = array();
+
+        $transport = $this->_createTransport();
+        $message = $this->_createMessage();
+        $transport->shouldReceive('send')
+                  ->once()
+                  ->with($message, $failures)
+                  ->andReturn(57);
+
+        $mailer = $this->_createMailer($transport);
+        $mailer->send($message, $failures);
+    }
+
+    public function testSendRecordsRfcComplianceExceptionAsEntireSendFailure()
+    {
+        $failures = array();
+
+        $rfcException = new Swift_RfcComplianceException('test');
+        $transport = $this->_createTransport();
+        $message = $this->_createMessage();
+        $message->shouldReceive('getTo')
+                  ->once()
+                  ->andReturn(array('foo&invalid' => 'Foo', 'bar@valid.tld' => 'Bar'));
+        $transport->shouldReceive('send')
+                  ->once()
+                  ->with($message, $failures)
+                  ->andThrow($rfcException);
+
+        $mailer = $this->_createMailer($transport);
+        $this->assertEquals(0, $mailer->send($message, $failures), '%s: Should return 0');
+        $this->assertEquals(array('foo&invalid', 'bar@valid.tld'), $failures, '%s: Failures should contain all addresses since the entire message failed to compile');
+    }
+
+    public function testRegisterPluginDelegatesToTransport()
+    {
+        $plugin = $this->_createPlugin();
+        $transport = $this->_createTransport();
+        $mailer = $this->_createMailer($transport);
+
+        $transport->shouldReceive('registerPlugin')
+                  ->once()
+                  ->with($plugin);
+
+        $mailer->registerPlugin($plugin);
+    }
+
+    // -- Creation methods
+
+    private function _createPlugin()
+    {
+        return $this->getMockery('Swift_Events_EventListener')->shouldIgnoreMissing();
+    }
+
+    private function _createTransport()
+    {
+        return $this->getMockery('Swift_Transport')->shouldIgnoreMissing();
+    }
+
+    private function _createMessage()
+    {
+        return $this->getMockery('Swift_Mime_Message')->shouldIgnoreMissing();
+    }
+
+    private function _createMailer(Swift_Transport $transport)
+    {
+        return new Swift_Mailer($transport);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/MessageTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/MessageTest.php
new file mode 100644
index 000000000..c9e738336
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/MessageTest.php
@@ -0,0 +1,130 @@
+<?php
+
+class Swift_MessageTest extends \PHPUnit_Framework_TestCase
+{
+    public function testCloning()
+    {
+        $message1 = new Swift_Message('subj', 'body', 'ctype');
+        $message2 = new Swift_Message('subj', 'body', 'ctype');
+        $message1_clone = clone $message1;
+
+        $this->_recursiveObjectCloningCheck($message1, $message2, $message1_clone);
+    }
+
+    public function testCloningWithSigners()
+    {
+        $message1 = new Swift_Message('subj', 'body', 'ctype');
+        $signer = new Swift_Signers_DKIMSigner(dirname(dirname(__DIR__)).'/_samples/dkim/dkim.test.priv', 'test.example', 'example');
+        $message1->attachSigner($signer);
+        $message2 = new Swift_Message('subj', 'body', 'ctype');
+        $signer = new Swift_Signers_DKIMSigner(dirname(dirname(__DIR__)).'/_samples/dkim/dkim.test.priv', 'test.example', 'example');
+        $message2->attachSigner($signer);
+        $message1_clone = clone $message1;
+
+        $this->_recursiveObjectCloningCheck($message1, $message2, $message1_clone);
+    }
+
+    public function testBodySwap()
+    {
+        $message1 = new Swift_Message('Test');
+        $html = Swift_MimePart::newInstance('<html></html>', 'text/html');
+        $html->getHeaders()->addTextHeader('X-Test-Remove', 'Test-Value');
+        $html->getHeaders()->addTextHeader('X-Test-Alter', 'Test-Value');
+        $message1->attach($html);
+        $source = $message1->toString();
+        $message2 = clone $message1;
+        $message2->setSubject('Message2');
+        foreach ($message2->getChildren() as $child) {
+            $child->setBody('Test');
+            $child->getHeaders()->removeAll('X-Test-Remove');
+            $child->getHeaders()->get('X-Test-Alter')->setValue('Altered');
+        }
+        $final = $message1->toString();
+        if ($source != $final) {
+            $this->fail("Difference although object cloned \n [".$source."]\n[".$final."]\n");
+        }
+        $final = $message2->toString();
+        if ($final == $source) {
+            $this->fail('Two body matches although they should differ'."\n [".$source."]\n[".$final."]\n");
+        }
+        $id_1 = $message1->getId();
+        $id_2 = $message2->getId();
+        $this->assertEquals($id_1, $id_2, 'Message Ids differ');
+        $id_2 = $message2->generateId();
+        $this->assertNotEquals($id_1, $id_2, 'Message Ids are the same');
+    }
+
+    // -- Private helpers
+    protected function _recursiveObjectCloningCheck($obj1, $obj2, $obj1_clone)
+    {
+        $obj1_properties = (array) $obj1;
+        $obj2_properties = (array) $obj2;
+        $obj1_clone_properties = (array) $obj1_clone;
+
+        foreach ($obj1_properties as $property => $value) {
+            if (is_object($value)) {
+                $obj1_value = $obj1_properties[$property];
+                $obj2_value = $obj2_properties[$property];
+                $obj1_clone_value = $obj1_clone_properties[$property];
+
+                if ($obj1_value !== $obj2_value) {
+                    // two separetely instanciated objects property not referencing same object
+                    $this->assertFalse(
+                        // but object's clone does - not everything copied
+                        $obj1_value === $obj1_clone_value,
+                        "Property `$property` cloning error: source and cloned objects property is referencing same object"
+                    );
+                } else {
+                    // two separetely instanciated objects have same reference
+                    $this->assertFalse(
+                        // but object's clone doesn't - overdone making copies
+                        $obj1_value !== $obj1_clone_value,
+                        "Property `$property` not properly cloned: it should reference same object as cloning source (overdone copping)"
+                    );
+                }
+                // recurse
+                $this->_recursiveObjectCloningCheck($obj1_value, $obj2_value, $obj1_clone_value);
+            } elseif (is_array($value)) {
+                $obj1_value = $obj1_properties[$property];
+                $obj2_value = $obj2_properties[$property];
+                $obj1_clone_value = $obj1_clone_properties[$property];
+
+                return $this->_recursiveArrayCloningCheck($obj1_value, $obj2_value, $obj1_clone_value);
+            }
+        }
+    }
+
+    protected function _recursiveArrayCloningCheck($array1, $array2, $array1_clone)
+    {
+        foreach ($array1 as $key => $value) {
+            if (is_object($value)) {
+                $arr1_value = $array1[$key];
+                $arr2_value = $array2[$key];
+                $arr1_clone_value = $array1_clone[$key];
+                if ($arr1_value !== $arr2_value) {
+                    // two separetely instanciated objects property not referencing same object
+                    $this->assertFalse(
+                        // but object's clone does - not everything copied
+                        $arr1_value === $arr1_clone_value,
+                        "Key `$key` cloning error: source and cloned objects property is referencing same object"
+                    );
+                } else {
+                    // two separetely instanciated objects have same reference
+                    $this->assertFalse(
+                        // but object's clone doesn't - overdone making copies
+                        $arr1_value !== $arr1_clone_value,
+                        "Key `$key` not properly cloned: it should reference same object as cloning source (overdone copping)"
+                    );
+                }
+                // recurse
+                $this->_recursiveObjectCloningCheck($arr1_value, $arr2_value, $arr1_clone_value);
+            } elseif (is_array($value)) {
+                $arr1_value = $array1[$key];
+                $arr2_value = $array2[$key];
+                $arr1_clone_value = $array1_clone[$key];
+
+                return $this->_recursiveArrayCloningCheck($obj1_value, $obj2_value, $obj1_clone_value);
+            }
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/AbstractMimeEntityTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/AbstractMimeEntityTest.php
new file mode 100644
index 000000000..a1f884b66
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/AbstractMimeEntityTest.php
@@ -0,0 +1,1054 @@
+<?php
+
+require_once dirname(dirname(dirname(__DIR__))).'/fixtures/MimeEntityFixture.php';
+
+abstract class Swift_Mime_AbstractMimeEntityTest extends \SwiftMailerTestCase
+{
+    public function testGetHeadersReturnsHeaderSet()
+    {
+        $headers = $this->_createHeaderSet();
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $this->assertSame($headers, $entity->getHeaders());
+    }
+
+    public function testContentTypeIsReturnedFromHeader()
+    {
+        $ctype = $this->_createHeader('Content-Type', 'image/jpeg-test');
+        $headers = $this->_createHeaderSet(array('Content-Type' => $ctype));
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $this->assertEquals('image/jpeg-test', $entity->getContentType());
+    }
+
+    public function testContentTypeIsSetInHeader()
+    {
+        $ctype = $this->_createHeader('Content-Type', 'text/plain', array(), false);
+        $headers = $this->_createHeaderSet(array('Content-Type' => $ctype));
+
+        $ctype->shouldReceive('setFieldBodyModel')
+              ->once()
+              ->with('image/jpeg');
+        $ctype->shouldReceive('setFieldBodyModel')
+              ->zeroOrMoreTimes()
+              ->with(\Mockery::not('image/jpeg'));
+
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $entity->setContentType('image/jpeg');
+    }
+
+    public function testContentTypeHeaderIsAddedIfNoneSet()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addParameterizedHeader')
+                ->once()
+                ->with('Content-Type', 'image/jpeg');
+        $headers->shouldReceive('addParameterizedHeader')
+                ->zeroOrMoreTimes();
+
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $entity->setContentType('image/jpeg');
+    }
+
+    public function testContentTypeCanBeSetViaSetBody()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addParameterizedHeader')
+                ->once()
+                ->with('Content-Type', 'text/html');
+        $headers->shouldReceive('addParameterizedHeader')
+                ->zeroOrMoreTimes();
+
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $entity->setBody('<b>foo</b>', 'text/html');
+    }
+
+    public function testGetEncoderFromConstructor()
+    {
+        $encoder = $this->_createEncoder('base64');
+        $entity = $this->_createEntity($this->_createHeaderSet(), $encoder,
+            $this->_createCache()
+            );
+        $this->assertSame($encoder, $entity->getEncoder());
+    }
+
+    public function testSetAndGetEncoder()
+    {
+        $encoder = $this->_createEncoder('base64');
+        $headers = $this->_createHeaderSet();
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $entity->setEncoder($encoder);
+        $this->assertSame($encoder, $entity->getEncoder());
+    }
+
+    public function testSettingEncoderUpdatesTransferEncoding()
+    {
+        $encoder = $this->_createEncoder('base64');
+        $encoding = $this->_createHeader(
+            'Content-Transfer-Encoding', '8bit', array(), false
+            );
+        $headers = $this->_createHeaderSet(array(
+            'Content-Transfer-Encoding' => $encoding,
+            ));
+        $encoding->shouldReceive('setFieldBodyModel')
+                 ->once()
+                 ->with('base64');
+        $encoding->shouldReceive('setFieldBodyModel')
+                 ->zeroOrMoreTimes();
+
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $entity->setEncoder($encoder);
+    }
+
+    public function testSettingEncoderAddsEncodingHeaderIfNonePresent()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addTextHeader')
+                ->once()
+                ->with('Content-Transfer-Encoding', 'something');
+        $headers->shouldReceive('addTextHeader')
+                ->zeroOrMoreTimes();
+
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $entity->setEncoder($this->_createEncoder('something'));
+    }
+
+    public function testIdIsReturnedFromHeader()
+    {
+        /* -- RFC 2045, 7.
+        In constructing a high-level user agent, it may be desirable to allow
+        one body to make reference to another.  Accordingly, bodies may be
+        labelled using the "Content-ID" header field, which is syntactically
+        identical to the "Message-ID" header field
+        */
+
+        $cid = $this->_createHeader('Content-ID', 'zip@button');
+        $headers = $this->_createHeaderSet(array('Content-ID' => $cid));
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $this->assertEquals('zip@button', $entity->getId());
+    }
+
+    public function testIdIsSetInHeader()
+    {
+        $cid = $this->_createHeader('Content-ID', 'zip@button', array(), false);
+        $headers = $this->_createHeaderSet(array('Content-ID' => $cid));
+
+        $cid->shouldReceive('setFieldBodyModel')
+            ->once()
+            ->with('foo@bar');
+        $cid->shouldReceive('setFieldBodyModel')
+            ->zeroOrMoreTimes();
+
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $entity->setId('foo@bar');
+    }
+
+    public function testIdIsAutoGenerated()
+    {
+        $entity = $this->_createEntity($this->_createHeaderSet(),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $this->assertRegExp('/^.*?@.*?$/D', $entity->getId());
+    }
+
+    public function testGenerateIdCreatesNewId()
+    {
+        $headers = $this->_createHeaderSet();
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $id1 = $entity->generateId();
+        $id2 = $entity->generateId();
+        $this->assertNotEquals($id1, $id2);
+    }
+
+    public function testGenerateIdSetsNewId()
+    {
+        $headers = $this->_createHeaderSet();
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $id = $entity->generateId();
+        $this->assertEquals($id, $entity->getId());
+    }
+
+    public function testDescriptionIsReadFromHeader()
+    {
+        /* -- RFC 2045, 8.
+        The ability to associate some descriptive information with a given
+        body is often desirable.  For example, it may be useful to mark an
+        "image" body as "a picture of the Space Shuttle Endeavor."  Such text
+        may be placed in the Content-Description header field.  This header
+        field is always optional.
+        */
+
+        $desc = $this->_createHeader('Content-Description', 'something');
+        $headers = $this->_createHeaderSet(array('Content-Description' => $desc));
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $this->assertEquals('something', $entity->getDescription());
+    }
+
+    public function testDescriptionIsSetInHeader()
+    {
+        $desc = $this->_createHeader('Content-Description', '', array(), false);
+        $desc->shouldReceive('setFieldBodyModel')->once()->with('whatever');
+
+        $headers = $this->_createHeaderSet(array('Content-Description' => $desc));
+
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $entity->setDescription('whatever');
+    }
+
+    public function testDescriptionHeaderIsAddedIfNotPresent()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addTextHeader')
+                ->once()
+                ->with('Content-Description', 'whatever');
+        $headers->shouldReceive('addTextHeader')
+                ->zeroOrMoreTimes();
+
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $entity->setDescription('whatever');
+    }
+
+    public function testSetAndGetMaxLineLength()
+    {
+        $entity = $this->_createEntity($this->_createHeaderSet(),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $entity->setMaxLineLength(60);
+        $this->assertEquals(60, $entity->getMaxLineLength());
+    }
+
+    public function testEncoderIsUsedForStringGeneration()
+    {
+        $encoder = $this->_createEncoder('base64', false);
+        $encoder->expects($this->once())
+                ->method('encodeString')
+                ->with('blah');
+
+        $entity = $this->_createEntity($this->_createHeaderSet(),
+            $encoder, $this->_createCache()
+            );
+        $entity->setBody('blah');
+        $entity->toString();
+    }
+
+    public function testMaxLineLengthIsProvidedWhenEncoding()
+    {
+        $encoder = $this->_createEncoder('base64', false);
+        $encoder->expects($this->once())
+                ->method('encodeString')
+                ->with('blah', 0, 65);
+
+        $entity = $this->_createEntity($this->_createHeaderSet(),
+            $encoder, $this->_createCache()
+            );
+        $entity->setBody('blah');
+        $entity->setMaxLineLength(65);
+        $entity->toString();
+    }
+
+    public function testHeadersAppearInString()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('toString')
+                ->once()
+                ->andReturn(
+                    "Content-Type: text/plain; charset=utf-8\r\n".
+                    "X-MyHeader: foobar\r\n"
+                );
+
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $this->assertEquals(
+            "Content-Type: text/plain; charset=utf-8\r\n".
+            "X-MyHeader: foobar\r\n",
+            $entity->toString()
+            );
+    }
+
+    public function testSetAndGetBody()
+    {
+        $entity = $this->_createEntity($this->_createHeaderSet(),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $entity->setBody("blah\r\nblah!");
+        $this->assertEquals("blah\r\nblah!", $entity->getBody());
+    }
+
+    public function testBodyIsAppended()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('toString')
+                ->once()
+                ->andReturn("Content-Type: text/plain; charset=utf-8\r\n");
+
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $entity->setBody("blah\r\nblah!");
+        $this->assertEquals(
+            "Content-Type: text/plain; charset=utf-8\r\n".
+            "\r\n".
+            "blah\r\nblah!",
+            $entity->toString()
+            );
+    }
+
+    public function testGetBodyReturnsStringFromByteStream()
+    {
+        $os = $this->_createOutputStream('byte stream string');
+        $entity = $this->_createEntity($this->_createHeaderSet(),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $entity->setBody($os);
+        $this->assertEquals('byte stream string', $entity->getBody());
+    }
+
+    public function testByteStreamBodyIsAppended()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $os = $this->_createOutputStream('streamed');
+        $headers->shouldReceive('toString')
+                ->once()
+                ->andReturn("Content-Type: text/plain; charset=utf-8\r\n");
+
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $entity->setBody($os);
+        $this->assertEquals(
+            "Content-Type: text/plain; charset=utf-8\r\n".
+            "\r\n".
+            'streamed',
+            $entity->toString()
+            );
+    }
+
+    public function testBoundaryCanBeRetrieved()
+    {
+        /* -- RFC 2046, 5.1.1.
+     boundary := 0*69<bchars> bcharsnospace
+
+     bchars := bcharsnospace / " "
+
+     bcharsnospace := DIGIT / ALPHA / "'" / "(" / ")" /
+                                            "+" / "_" / "," / "-" / "." /
+                                            "/" / ":" / "=" / "?"
+        */
+
+        $entity = $this->_createEntity($this->_createHeaderSet(),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $this->assertRegExp(
+            '/^[a-zA-Z0-9\'\(\)\+_\-,\.\/:=\?\ ]{0,69}[a-zA-Z0-9\'\(\)\+_\-,\.\/:=\?]$/D',
+            $entity->getBoundary()
+            );
+    }
+
+    public function testBoundaryNeverChanges()
+    {
+        $entity = $this->_createEntity($this->_createHeaderSet(),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $firstBoundary = $entity->getBoundary();
+        for ($i = 0; $i < 10; ++$i) {
+            $this->assertEquals($firstBoundary, $entity->getBoundary());
+        }
+    }
+
+    public function testBoundaryCanBeSet()
+    {
+        $entity = $this->_createEntity($this->_createHeaderSet(),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $entity->setBoundary('foobar');
+        $this->assertEquals('foobar', $entity->getBoundary());
+    }
+
+    public function testAddingChildrenGeneratesBoundaryInHeaders()
+    {
+        $child = $this->_createChild();
+        $cType = $this->_createHeader('Content-Type', 'text/plain', array(), false);
+        $cType->shouldReceive('setParameter')
+              ->once()
+              ->with('boundary', \Mockery::any());
+        $cType->shouldReceive('setParameter')
+              ->zeroOrMoreTimes();
+
+        $entity = $this->_createEntity($this->_createHeaderSet(array(
+            'Content-Type' => $cType,
+            )),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $entity->setChildren(array($child));
+    }
+
+    public function testChildrenOfLevelAttachmentAndLessCauseMultipartMixed()
+    {
+        for ($level = Swift_Mime_MimeEntity::LEVEL_MIXED;
+            $level > Swift_Mime_MimeEntity::LEVEL_TOP; $level /= 2) {
+            $child = $this->_createChild($level);
+            $cType = $this->_createHeader(
+                'Content-Type', 'text/plain', array(), false
+                );
+            $cType->shouldReceive('setFieldBodyModel')
+                  ->once()
+                  ->with('multipart/mixed');
+            $cType->shouldReceive('setFieldBodyModel')
+                  ->zeroOrMoreTimes();
+
+            $entity = $this->_createEntity($this->_createHeaderSet(array(
+                'Content-Type' => $cType, )),
+                $this->_createEncoder(), $this->_createCache()
+                );
+            $entity->setChildren(array($child));
+        }
+    }
+
+    public function testChildrenOfLevelAlternativeAndLessCauseMultipartAlternative()
+    {
+        for ($level = Swift_Mime_MimeEntity::LEVEL_ALTERNATIVE;
+            $level > Swift_Mime_MimeEntity::LEVEL_MIXED; $level /= 2) {
+            $child = $this->_createChild($level);
+            $cType = $this->_createHeader(
+                'Content-Type', 'text/plain', array(), false
+                );
+            $cType->shouldReceive('setFieldBodyModel')
+                  ->once()
+                  ->with('multipart/alternative');
+            $cType->shouldReceive('setFieldBodyModel')
+                  ->zeroOrMoreTimes();
+
+            $entity = $this->_createEntity($this->_createHeaderSet(array(
+                'Content-Type' => $cType, )),
+                $this->_createEncoder(), $this->_createCache()
+                );
+            $entity->setChildren(array($child));
+        }
+    }
+
+    public function testChildrenOfLevelRelatedAndLessCauseMultipartRelated()
+    {
+        for ($level = Swift_Mime_MimeEntity::LEVEL_RELATED;
+            $level > Swift_Mime_MimeEntity::LEVEL_ALTERNATIVE; $level /= 2) {
+            $child = $this->_createChild($level);
+            $cType = $this->_createHeader(
+                'Content-Type', 'text/plain', array(), false
+                );
+            $cType->shouldReceive('setFieldBodyModel')
+                  ->once()
+                  ->with('multipart/related');
+            $cType->shouldReceive('setFieldBodyModel')
+                  ->zeroOrMoreTimes();
+
+            $entity = $this->_createEntity($this->_createHeaderSet(array(
+                'Content-Type' => $cType, )),
+                $this->_createEncoder(), $this->_createCache()
+                );
+            $entity->setChildren(array($child));
+        }
+    }
+
+    public function testHighestLevelChildDeterminesContentType()
+    {
+        $combinations = array(
+            array('levels' => array(Swift_Mime_MimeEntity::LEVEL_MIXED,
+                Swift_Mime_MimeEntity::LEVEL_ALTERNATIVE,
+                Swift_Mime_MimeEntity::LEVEL_RELATED,
+                ),
+                'type' => 'multipart/mixed',
+                ),
+            array('levels' => array(Swift_Mime_MimeEntity::LEVEL_MIXED,
+                Swift_Mime_MimeEntity::LEVEL_RELATED,
+                ),
+                'type' => 'multipart/mixed',
+                ),
+            array('levels' => array(Swift_Mime_MimeEntity::LEVEL_MIXED,
+                Swift_Mime_MimeEntity::LEVEL_ALTERNATIVE,
+                ),
+                'type' => 'multipart/mixed',
+                ),
+            array('levels' => array(Swift_Mime_MimeEntity::LEVEL_ALTERNATIVE,
+                Swift_Mime_MimeEntity::LEVEL_RELATED,
+                ),
+                'type' => 'multipart/alternative',
+                ),
+            );
+
+        foreach ($combinations as $combination) {
+            $children = array();
+            foreach ($combination['levels'] as $level) {
+                $children[] = $this->_createChild($level);
+            }
+
+            $cType = $this->_createHeader(
+                'Content-Type', 'text/plain', array(), false
+                );
+            $cType->shouldReceive('setFieldBodyModel')
+                  ->once()
+                  ->with($combination['type']);
+
+            $headerSet = $this->_createHeaderSet(array('Content-Type' => $cType));
+            $headerSet->shouldReceive('newInstance')
+                      ->zeroOrMoreTimes()
+                      ->andReturnUsing(function () use ($headerSet) {
+                          return $headerSet;
+                      });
+            $entity = $this->_createEntity($headerSet,
+                $this->_createEncoder(), $this->_createCache()
+                );
+            $entity->setChildren($children);
+        }
+    }
+
+    public function testChildrenAppearNestedInString()
+    {
+        /* -- RFC 2046, 5.1.1.
+     (excerpt too verbose to paste here)
+     */
+
+        $headers = $this->_createHeaderSet(array(), false);
+
+        $child1 = new MimeEntityFixture(Swift_Mime_MimeEntity::LEVEL_ALTERNATIVE,
+            "Content-Type: text/plain\r\n".
+            "\r\n".
+            'foobar', 'text/plain'
+            );
+
+        $child2 = new MimeEntityFixture(Swift_Mime_MimeEntity::LEVEL_ALTERNATIVE,
+            "Content-Type: text/html\r\n".
+            "\r\n".
+            '<b>foobar</b>', 'text/html'
+            );
+
+        $headers->shouldReceive('toString')
+              ->zeroOrMoreTimes()
+              ->andReturn("Content-Type: multipart/alternative; boundary=\"xxx\"\r\n");
+
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $entity->setBoundary('xxx');
+        $entity->setChildren(array($child1, $child2));
+
+        $this->assertEquals(
+            "Content-Type: multipart/alternative; boundary=\"xxx\"\r\n".
+            "\r\n".
+            "\r\n--xxx\r\n".
+            "Content-Type: text/plain\r\n".
+            "\r\n".
+            "foobar\r\n".
+            "\r\n--xxx\r\n".
+            "Content-Type: text/html\r\n".
+            "\r\n".
+            "<b>foobar</b>\r\n".
+            "\r\n--xxx--\r\n",
+            $entity->toString()
+            );
+    }
+
+    public function testMixingLevelsIsHierarchical()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $newHeaders = $this->_createHeaderSet(array(), false);
+
+        $part = $this->_createChild(Swift_Mime_MimeEntity::LEVEL_ALTERNATIVE,
+            "Content-Type: text/plain\r\n".
+            "\r\n".
+            'foobar'
+            );
+
+        $attachment = $this->_createChild(Swift_Mime_MimeEntity::LEVEL_MIXED,
+            "Content-Type: application/octet-stream\r\n".
+            "\r\n".
+            'data'
+            );
+
+        $headers->shouldReceive('toString')
+              ->zeroOrMoreTimes()
+              ->andReturn("Content-Type: multipart/mixed; boundary=\"xxx\"\r\n");
+        $headers->shouldReceive('newInstance')
+              ->zeroOrMoreTimes()
+              ->andReturn($newHeaders);
+        $newHeaders->shouldReceive('toString')
+              ->zeroOrMoreTimes()
+              ->andReturn("Content-Type: multipart/alternative; boundary=\"yyy\"\r\n");
+
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $entity->setBoundary('xxx');
+        $entity->setChildren(array($part, $attachment));
+
+        $this->assertRegExp(
+            '~^'.
+            "Content-Type: multipart/mixed; boundary=\"xxx\"\r\n".
+            "\r\n\r\n--xxx\r\n".
+            "Content-Type: multipart/alternative; boundary=\"yyy\"\r\n".
+            "\r\n\r\n--(.*?)\r\n".
+            "Content-Type: text/plain\r\n".
+            "\r\n".
+            'foobar'.
+            "\r\n\r\n--\\1--\r\n".
+            "\r\n\r\n--xxx\r\n".
+            "Content-Type: application/octet-stream\r\n".
+            "\r\n".
+            'data'.
+            "\r\n\r\n--xxx--\r\n".
+            '$~',
+            $entity->toString()
+            );
+    }
+
+    public function testSettingEncoderNotifiesChildren()
+    {
+        $child = $this->_createChild(0, '', false);
+        $encoder = $this->_createEncoder('base64');
+
+        $child->shouldReceive('encoderChanged')
+              ->once()
+              ->with($encoder);
+
+        $entity = $this->_createEntity($this->_createHeaderSet(),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $entity->setChildren(array($child));
+        $entity->setEncoder($encoder);
+    }
+
+    public function testReceiptOfEncoderChangeNotifiesChildren()
+    {
+        $child = $this->_createChild(0, '', false);
+        $encoder = $this->_createEncoder('base64');
+
+        $child->shouldReceive('encoderChanged')
+              ->once()
+              ->with($encoder);
+
+        $entity = $this->_createEntity($this->_createHeaderSet(),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $entity->setChildren(array($child));
+        $entity->encoderChanged($encoder);
+    }
+
+    public function testReceiptOfCharsetChangeNotifiesChildren()
+    {
+        $child = $this->_createChild(0, '', false);
+        $child->shouldReceive('charsetChanged')
+              ->once()
+              ->with('windows-874');
+
+        $entity = $this->_createEntity($this->_createHeaderSet(),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $entity->setChildren(array($child));
+        $entity->charsetChanged('windows-874');
+    }
+
+    public function testEntityIsWrittenToByteStream()
+    {
+        $entity = $this->_createEntity($this->_createHeaderSet(),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $is = $this->_createInputStream(false);
+        $is->expects($this->atLeastOnce())
+           ->method('write');
+
+        $entity->toByteStream($is);
+    }
+
+    public function testEntityHeadersAreComittedToByteStream()
+    {
+        $entity = $this->_createEntity($this->_createHeaderSet(),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $is = $this->_createInputStream(false);
+        $is->expects($this->atLeastOnce())
+           ->method('write');
+        $is->expects($this->atLeastOnce())
+           ->method('commit');
+
+        $entity->toByteStream($is);
+    }
+
+    public function testOrderingTextBeforeHtml()
+    {
+        $htmlChild = new MimeEntityFixture(Swift_Mime_MimeEntity::LEVEL_ALTERNATIVE,
+            "Content-Type: text/html\r\n".
+            "\r\n".
+            'HTML PART',
+            'text/html'
+            );
+        $textChild = new MimeEntityFixture(Swift_Mime_MimeEntity::LEVEL_ALTERNATIVE,
+            "Content-Type: text/plain\r\n".
+            "\r\n".
+            'TEXT PART',
+            'text/plain'
+            );
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('toString')
+                ->zeroOrMoreTimes()
+                ->andReturn("Content-Type: multipart/alternative; boundary=\"xxx\"\r\n");
+
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $entity->setBoundary('xxx');
+        $entity->setChildren(array($htmlChild, $textChild));
+
+        $this->assertEquals(
+            "Content-Type: multipart/alternative; boundary=\"xxx\"\r\n".
+            "\r\n\r\n--xxx\r\n".
+            "Content-Type: text/plain\r\n".
+            "\r\n".
+            'TEXT PART'.
+            "\r\n\r\n--xxx\r\n".
+            "Content-Type: text/html\r\n".
+            "\r\n".
+            'HTML PART'.
+            "\r\n\r\n--xxx--\r\n",
+            $entity->toString()
+            );
+    }
+
+    public function testUnsettingChildrenRestoresContentType()
+    {
+        $cType = $this->_createHeader('Content-Type', 'text/plain', array(), false);
+        $child = $this->_createChild(Swift_Mime_MimeEntity::LEVEL_ALTERNATIVE);
+
+        $cType->shouldReceive('setFieldBodyModel')
+              ->twice()
+              ->with('image/jpeg');
+        $cType->shouldReceive('setFieldBodyModel')
+              ->once()
+              ->with('multipart/alternative');
+        $cType->shouldReceive('setFieldBodyModel')
+              ->zeroOrMoreTimes()
+              ->with(\Mockery::not('multipart/alternative', 'image/jpeg'));
+
+        $entity = $this->_createEntity($this->_createHeaderSet(array(
+            'Content-Type' => $cType,
+            )),
+            $this->_createEncoder(), $this->_createCache()
+            );
+
+        $entity->setContentType('image/jpeg');
+        $entity->setChildren(array($child));
+        $entity->setChildren(array());
+    }
+
+    public function testBodyIsReadFromCacheWhenUsingToStringIfPresent()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('toString')
+                ->zeroOrMoreTimes()
+                ->andReturn("Content-Type: text/plain; charset=utf-8\r\n");
+
+        $cache = $this->_createCache(false);
+        $cache->shouldReceive('hasKey')
+              ->once()
+              ->with(\Mockery::any(), 'body')
+              ->andReturn(true);
+        $cache->shouldReceive('getString')
+              ->once()
+              ->with(\Mockery::any(), 'body')
+              ->andReturn("\r\ncache\r\ncache!");
+
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $cache
+            );
+
+        $entity->setBody("blah\r\nblah!");
+        $this->assertEquals(
+            "Content-Type: text/plain; charset=utf-8\r\n".
+            "\r\n".
+            "cache\r\ncache!",
+            $entity->toString()
+            );
+    }
+
+    public function testBodyIsAddedToCacheWhenUsingToString()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('toString')
+                ->zeroOrMoreTimes()
+                ->andReturn("Content-Type: text/plain; charset=utf-8\r\n");
+
+        $cache = $this->_createCache(false);
+        $cache->shouldReceive('hasKey')
+              ->once()
+              ->with(\Mockery::any(), 'body')
+              ->andReturn(false);
+        $cache->shouldReceive('setString')
+              ->once()
+              ->with(\Mockery::any(), 'body', "\r\nblah\r\nblah!", Swift_KeyCache::MODE_WRITE);
+
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $cache
+            );
+
+        $entity->setBody("blah\r\nblah!");
+        $entity->toString();
+    }
+
+    public function testBodyIsClearedFromCacheIfNewBodySet()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('toString')
+                ->zeroOrMoreTimes()
+                ->andReturn("Content-Type: text/plain; charset=utf-8\r\n");
+
+        $cache = $this->_createCache(false);
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $cache
+            );
+
+        $entity->setBody("blah\r\nblah!");
+        $entity->toString();
+
+        // We set the expectation at this point because we only care what happens when calling setBody()
+        $cache->shouldReceive('clearKey')
+              ->once()
+              ->with(\Mockery::any(), 'body');
+
+        $entity->setBody("new\r\nnew!");
+    }
+
+    public function testBodyIsNotClearedFromCacheIfSameBodySet()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('toString')
+                ->zeroOrMoreTimes()
+                ->andReturn("Content-Type: text/plain; charset=utf-8\r\n");
+
+        $cache = $this->_createCache(false);
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $cache
+            );
+
+        $entity->setBody("blah\r\nblah!");
+        $entity->toString();
+
+        // We set the expectation at this point because we only care what happens when calling setBody()
+        $cache->shouldReceive('clearKey')
+              ->never();
+
+        $entity->setBody("blah\r\nblah!");
+    }
+
+    public function testBodyIsClearedFromCacheIfNewEncoderSet()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('toString')
+                ->zeroOrMoreTimes()
+                ->andReturn("Content-Type: text/plain; charset=utf-8\r\n");
+
+        $cache = $this->_createCache(false);
+        $otherEncoder = $this->_createEncoder();
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $cache
+            );
+
+        $entity->setBody("blah\r\nblah!");
+        $entity->toString();
+
+        // We set the expectation at this point because we only care what happens when calling setEncoder()
+        $cache->shouldReceive('clearKey')
+              ->once()
+              ->with(\Mockery::any(), 'body');
+
+        $entity->setEncoder($otherEncoder);
+    }
+
+    public function testBodyIsReadFromCacheWhenUsingToByteStreamIfPresent()
+    {
+        $is = $this->_createInputStream();
+        $cache = $this->_createCache(false);
+        $cache->shouldReceive('hasKey')
+              ->once()
+              ->with(\Mockery::any(), 'body')
+              ->andReturn(true);
+        $cache->shouldReceive('exportToByteStream')
+              ->once()
+              ->with(\Mockery::any(), 'body', $is);
+
+        $entity = $this->_createEntity($this->_createHeaderSet(),
+            $this->_createEncoder(), $cache
+            );
+        $entity->setBody('foo');
+
+        $entity->toByteStream($is);
+    }
+
+    public function testBodyIsAddedToCacheWhenUsingToByteStream()
+    {
+        $is = $this->_createInputStream();
+        $cache = $this->_createCache(false);
+        $cache->shouldReceive('hasKey')
+              ->once()
+              ->with(\Mockery::any(), 'body')
+              ->andReturn(false);
+        $cache->shouldReceive('getInputByteStream')
+              ->once()
+              ->with(\Mockery::any(), 'body');
+
+        $entity = $this->_createEntity($this->_createHeaderSet(),
+            $this->_createEncoder(), $cache
+            );
+        $entity->setBody('foo');
+
+        $entity->toByteStream($is);
+    }
+
+    public function testFluidInterface()
+    {
+        $entity = $this->_createEntity($this->_createHeaderSet(),
+            $this->_createEncoder(), $this->_createCache()
+            );
+
+        $this->assertSame($entity,
+            $entity
+            ->setContentType('text/plain')
+            ->setEncoder($this->_createEncoder())
+            ->setId('foo@bar')
+            ->setDescription('my description')
+            ->setMaxLineLength(998)
+            ->setBody('xx')
+            ->setBoundary('xyz')
+            ->setChildren(array())
+            );
+    }
+
+    // -- Private helpers
+
+    abstract protected function _createEntity($headers, $encoder, $cache);
+
+    protected function _createChild($level = null, $string = '', $stub = true)
+    {
+        $child = $this->getMockery('Swift_Mime_MimeEntity')->shouldIgnoreMissing();
+        if (isset($level)) {
+            $child->shouldReceive('getNestingLevel')
+                  ->zeroOrMoreTimes()
+                  ->andReturn($level);
+        }
+        $child->shouldReceive('toString')
+              ->zeroOrMoreTimes()
+              ->andReturn($string);
+
+        return $child;
+    }
+
+    protected function _createEncoder($name = 'quoted-printable', $stub = true)
+    {
+        $encoder = $this->getMock('Swift_Mime_ContentEncoder');
+        $encoder->expects($this->any())
+                ->method('getName')
+                ->will($this->returnValue($name));
+        $encoder->expects($this->any())
+                ->method('encodeString')
+                ->will($this->returnCallback(function () {
+                    $args = func_get_args();
+
+                    return array_shift($args);
+                }));
+
+        return $encoder;
+    }
+
+    protected function _createCache($stub = true)
+    {
+        return $this->getMockery('Swift_KeyCache')->shouldIgnoreMissing();
+    }
+
+    protected function _createHeaderSet($headers = array(), $stub = true)
+    {
+        $set = $this->getMockery('Swift_Mime_HeaderSet')->shouldIgnoreMissing();
+        $set->shouldReceive('get')
+            ->zeroOrMoreTimes()
+            ->andReturnUsing(function ($key) use ($headers) {
+                return $headers[$key];
+            });
+        $set->shouldReceive('has')
+            ->zeroOrMoreTimes()
+            ->andReturnUsing(function ($key) use ($headers) {
+                return array_key_exists($key, $headers);
+            });
+
+        return $set;
+    }
+
+    protected function _createHeader($name, $model = null, $params = array(), $stub = true)
+    {
+        $header = $this->getMockery('Swift_Mime_ParameterizedHeader')->shouldIgnoreMissing();
+        $header->shouldReceive('getFieldName')
+               ->zeroOrMoreTimes()
+               ->andReturn($name);
+        $header->shouldReceive('getFieldBodyModel')
+               ->zeroOrMoreTimes()
+               ->andReturn($model);
+        $header->shouldReceive('getParameter')
+               ->zeroOrMoreTimes()
+               ->andReturnUsing(function ($key) use ($params) {
+                   return $params[$key];
+               });
+
+        return $header;
+    }
+
+    protected function _createOutputStream($data = null, $stub = true)
+    {
+        $os = $this->getMockery('Swift_OutputByteStream');
+        if (isset($data)) {
+            $os->shouldReceive('read')
+               ->zeroOrMoreTimes()
+               ->andReturnUsing(function () use ($data) {
+                   static $first = true;
+                   if (!$first) {
+                       return false;
+                   }
+
+                   $first = false;
+
+                   return $data;
+               });
+            $os->shouldReceive('setReadPointer')
+              ->zeroOrMoreTimes();
+        }
+
+        return $os;
+    }
+
+    protected function _createInputStream($stub = true)
+    {
+        return $this->getMock('Swift_InputByteStream');
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/AttachmentTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/AttachmentTest.php
new file mode 100644
index 000000000..bd2499c0c
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/AttachmentTest.php
@@ -0,0 +1,320 @@
+<?php
+
+class Swift_Mime_AttachmentTest extends Swift_Mime_AbstractMimeEntityTest
+{
+    public function testNestingLevelIsAttachment()
+    {
+        $attachment = $this->_createAttachment($this->_createHeaderSet(),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $this->assertEquals(
+            Swift_Mime_MimeEntity::LEVEL_MIXED, $attachment->getNestingLevel()
+            );
+    }
+
+    public function testDispositionIsReturnedFromHeader()
+    {
+        /* -- RFC 2183, 2.1, 2.2.
+     */
+
+        $disposition = $this->_createHeader('Content-Disposition', 'attachment');
+        $attachment = $this->_createAttachment($this->_createHeaderSet(array(
+            'Content-Disposition' => $disposition, )),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $this->assertEquals('attachment', $attachment->getDisposition());
+    }
+
+    public function testDispositionIsSetInHeader()
+    {
+        $disposition = $this->_createHeader('Content-Disposition', 'attachment',
+            array(), false
+            );
+        $disposition->shouldReceive('setFieldBodyModel')
+                    ->once()
+                    ->with('inline');
+        $disposition->shouldReceive('setFieldBodyModel')
+                    ->zeroOrMoreTimes();
+
+        $attachment = $this->_createAttachment($this->_createHeaderSet(array(
+            'Content-Disposition' => $disposition, )),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $attachment->setDisposition('inline');
+    }
+
+    public function testDispositionIsAddedIfNonePresent()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addParameterizedHeader')
+                ->once()
+                ->with('Content-Disposition', 'inline');
+        $headers->shouldReceive('addParameterizedHeader')
+                ->zeroOrMoreTimes();
+
+        $attachment = $this->_createAttachment($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $attachment->setDisposition('inline');
+    }
+
+    public function testDispositionIsAutoDefaultedToAttachment()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addParameterizedHeader')
+                ->once()
+                ->with('Content-Disposition', 'attachment');
+        $headers->shouldReceive('addParameterizedHeader')
+                ->zeroOrMoreTimes();
+
+        $attachment = $this->_createAttachment($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+    }
+
+    public function testDefaultContentTypeInitializedToOctetStream()
+    {
+        $cType = $this->_createHeader('Content-Type', '',
+            array(), false
+            );
+        $cType->shouldReceive('setFieldBodyModel')
+              ->once()
+              ->with('application/octet-stream');
+        $cType->shouldReceive('setFieldBodyModel')
+              ->zeroOrMoreTimes();
+
+        $attachment = $this->_createAttachment($this->_createHeaderSet(array(
+            'Content-Type' => $cType, )),
+            $this->_createEncoder(), $this->_createCache()
+            );
+    }
+
+    public function testFilenameIsReturnedFromHeader()
+    {
+        /* -- RFC 2183, 2.3.
+     */
+
+        $disposition = $this->_createHeader('Content-Disposition', 'attachment',
+            array('filename' => 'foo.txt')
+            );
+        $attachment = $this->_createAttachment($this->_createHeaderSet(array(
+            'Content-Disposition' => $disposition, )),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $this->assertEquals('foo.txt', $attachment->getFilename());
+    }
+
+    public function testFilenameIsSetInHeader()
+    {
+        $disposition = $this->_createHeader('Content-Disposition', 'attachment',
+            array('filename' => 'foo.txt'), false
+            );
+        $disposition->shouldReceive('setParameter')
+                    ->once()
+                    ->with('filename', 'bar.txt');
+        $disposition->shouldReceive('setParameter')
+                    ->zeroOrMoreTimes();
+
+        $attachment = $this->_createAttachment($this->_createHeaderSet(array(
+            'Content-Disposition' => $disposition, )),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $attachment->setFilename('bar.txt');
+    }
+
+    public function testSettingFilenameSetsNameInContentType()
+    {
+        /*
+     This is a legacy requirement which isn't covered by up-to-date RFCs.
+     */
+
+        $cType = $this->_createHeader('Content-Type', 'text/plain',
+            array(), false
+            );
+        $cType->shouldReceive('setParameter')
+              ->once()
+              ->with('name', 'bar.txt');
+        $cType->shouldReceive('setParameter')
+              ->zeroOrMoreTimes();
+
+        $attachment = $this->_createAttachment($this->_createHeaderSet(array(
+            'Content-Type' => $cType, )),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $attachment->setFilename('bar.txt');
+    }
+
+    public function testSizeIsReturnedFromHeader()
+    {
+        /* -- RFC 2183, 2.7.
+     */
+
+        $disposition = $this->_createHeader('Content-Disposition', 'attachment',
+            array('size' => 1234)
+            );
+        $attachment = $this->_createAttachment($this->_createHeaderSet(array(
+            'Content-Disposition' => $disposition, )),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $this->assertEquals(1234, $attachment->getSize());
+    }
+
+    public function testSizeIsSetInHeader()
+    {
+        $disposition = $this->_createHeader('Content-Disposition', 'attachment',
+            array(), false
+            );
+        $disposition->shouldReceive('setParameter')
+                    ->once()
+                    ->with('size', 12345);
+        $disposition->shouldReceive('setParameter')
+                    ->zeroOrMoreTimes();
+
+        $attachment = $this->_createAttachment($this->_createHeaderSet(array(
+            'Content-Disposition' => $disposition, )),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $attachment->setSize(12345);
+    }
+
+    public function testFilnameCanBeReadFromFileStream()
+    {
+        $file = $this->_createFileStream('/bar/file.ext', '');
+        $disposition = $this->_createHeader('Content-Disposition', 'attachment',
+            array('filename' => 'foo.txt'), false
+            );
+        $disposition->shouldReceive('setParameter')
+                    ->once()
+                    ->with('filename', 'file.ext');
+
+        $attachment = $this->_createAttachment($this->_createHeaderSet(array(
+            'Content-Disposition' => $disposition, )),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $attachment->setFile($file);
+    }
+
+    public function testContentTypeCanBeSetViaSetFile()
+    {
+        $file = $this->_createFileStream('/bar/file.ext', '');
+        $disposition = $this->_createHeader('Content-Disposition', 'attachment',
+            array('filename' => 'foo.txt'), false
+            );
+        $disposition->shouldReceive('setParameter')
+                    ->once()
+                    ->with('filename', 'file.ext');
+
+        $ctype = $this->_createHeader('Content-Type', 'text/plain', array(), false);
+        $ctype->shouldReceive('setFieldBodyModel')
+              ->once()
+              ->with('text/html');
+        $ctype->shouldReceive('setFieldBodyModel')
+              ->zeroOrMoreTimes();
+
+        $headers = $this->_createHeaderSet(array(
+            'Content-Disposition' => $disposition,
+            'Content-Type' => $ctype,
+            ));
+
+        $attachment = $this->_createAttachment($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $attachment->setFile($file, 'text/html');
+    }
+
+    public function XtestContentTypeCanBeLookedUpFromCommonListIfNotProvided()
+    {
+        $file = $this->_createFileStream('/bar/file.zip', '');
+        $disposition = $this->_createHeader('Content-Disposition', 'attachment',
+            array('filename' => 'foo.zip'), false
+            );
+        $disposition->shouldReceive('setParameter')
+                    ->once()
+                    ->with('filename', 'file.zip');
+
+        $ctype = $this->_createHeader('Content-Type', 'text/plain', array(), false);
+        $ctype->shouldReceive('setFieldBodyModel')
+              ->once()
+              ->with('application/zip');
+        $ctype->shouldReceive('setFieldBodyModel')
+              ->zeroOrMoreTimes();
+
+        $headers = $this->_createHeaderSet(array(
+            'Content-Disposition' => $disposition,
+            'Content-Type' => $ctype,
+            ));
+
+        $attachment = $this->_createAttachment($headers, $this->_createEncoder(),
+            $this->_createCache(), array('zip' => 'application/zip', 'txt' => 'text/plain')
+            );
+        $attachment->setFile($file);
+    }
+
+    public function testDataCanBeReadFromFile()
+    {
+        $file = $this->_createFileStream('/foo/file.ext', '<some data>');
+        $attachment = $this->_createAttachment($this->_createHeaderSet(),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $attachment->setFile($file);
+        $this->assertEquals('<some data>', $attachment->getBody());
+    }
+
+    public function testFluidInterface()
+    {
+        $attachment = $this->_createAttachment($this->_createHeaderSet(),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $this->assertSame($attachment,
+            $attachment
+            ->setContentType('application/pdf')
+            ->setEncoder($this->_createEncoder())
+            ->setId('foo@bar')
+            ->setDescription('my pdf')
+            ->setMaxLineLength(998)
+            ->setBody('xx')
+            ->setBoundary('xyz')
+            ->setChildren(array())
+            ->setDisposition('inline')
+            ->setFilename('afile.txt')
+            ->setSize(123)
+            ->setFile($this->_createFileStream('foo.txt', ''))
+            );
+    }
+
+    // -- Private helpers
+
+    protected function _createEntity($headers, $encoder, $cache)
+    {
+        return $this->_createAttachment($headers, $encoder, $cache);
+    }
+
+    protected function _createAttachment($headers, $encoder, $cache, $mimeTypes = array())
+    {
+        return new Swift_Mime_Attachment($headers, $encoder, $cache, new Swift_Mime_Grammar(), $mimeTypes);
+    }
+
+    protected function _createFileStream($path, $data, $stub = true)
+    {
+        $file = $this->getMockery('Swift_FileStream');
+        $file->shouldReceive('getPath')
+             ->zeroOrMoreTimes()
+             ->andReturn($path);
+        $file->shouldReceive('read')
+             ->zeroOrMoreTimes()
+             ->andReturnUsing(function () use ($data) {
+                 static $first = true;
+                 if (!$first) {
+                     return false;
+                 }
+
+                 $first = false;
+
+                 return $data;
+             });
+        $file->shouldReceive('setReadPointer')
+             ->zeroOrMoreTimes();
+
+        return $file;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/Base64ContentEncoderTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/Base64ContentEncoderTest.php
new file mode 100644
index 000000000..0442af33f
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/Base64ContentEncoderTest.php
@@ -0,0 +1,323 @@
+<?php
+
+class Swift_Mime_ContentEncoder_Base64ContentEncoderTest extends \SwiftMailerTestCase
+{
+    private $_encoder;
+
+    public function setUp()
+    {
+        $this->_encoder = new Swift_Mime_ContentEncoder_Base64ContentEncoder();
+    }
+
+    public function testNameIsBase64()
+    {
+        $this->assertEquals('base64', $this->_encoder->getName());
+    }
+
+    /*
+    There's really no point in testing the entire base64 encoding to the
+    level QP encoding has been tested.  base64_encode() has been in PHP for
+    years.
+    */
+
+    public function testInputOutputRatioIs3to4Bytes()
+    {
+        /*
+        RFC 2045, 6.8
+
+         The encoding process represents 24-bit groups of input bits as output
+         strings of 4 encoded characters.  Proceeding from left to right, a
+         24-bit input group is formed by concatenating 3 8bit input groups.
+         These 24 bits are then treated as 4 concatenated 6-bit groups, each
+         of which is translated into a single digit in the base64 alphabet.
+         */
+
+        $os = $this->_createOutputByteStream();
+        $is = $this->_createInputByteStream();
+        $collection = new Swift_StreamCollector();
+
+        $is->shouldReceive('write')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing($collection);
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('123');
+        $os->shouldReceive('read')
+           ->zeroOrMoreTimes()
+           ->andReturn(false);
+
+        $this->_encoder->encodeByteStream($os, $is);
+        $this->assertEquals('MTIz', $collection->content);
+    }
+
+    public function testPadLength()
+    {
+        /*
+        RFC 2045, 6.8
+
+       Special processing is performed if fewer than 24 bits are available
+       at the end of the data being encoded.  A full encoding quantum is
+       always completed at the end of a body.  When fewer than 24 input bits
+       are available in an input group, zero bits are added (on the right)
+       to form an integral number of 6-bit groups.  Padding at the end of
+       the data is performed using the "=" character.  Since all base64
+       input is an integral number of octets, only the following cases can
+       arise: (1) the final quantum of encoding input is an integral
+       multiple of 24 bits; here, the final unit of encoded output will be
+       an integral multiple of 4 characters with no "=" padding, (2) the
+       final quantum of encoding input is exactly 8 bits; here, the final
+       unit of encoded output will be two characters followed by two "="
+       padding characters, or (3) the final quantum of encoding input is
+       exactly 16 bits; here, the final unit of encoded output will be three
+       characters followed by one "=" padding character.
+       */
+
+        for ($i = 0; $i < 30; ++$i) {
+            $os = $this->_createOutputByteStream();
+            $is = $this->_createInputByteStream();
+            $collection = new Swift_StreamCollector();
+
+            $is->shouldReceive('write')
+               ->zeroOrMoreTimes()
+               ->andReturnUsing($collection);
+            $os->shouldReceive('read')
+               ->once()
+               ->andReturn(pack('C', rand(0, 255)));
+            $os->shouldReceive('read')
+               ->zeroOrMoreTimes()
+               ->andReturn(false);
+
+            $this->_encoder->encodeByteStream($os, $is);
+            $this->assertRegExp('~^[a-zA-Z0-9/\+]{2}==$~', $collection->content,
+                '%s: A single byte should have 2 bytes of padding'
+                );
+        }
+
+        for ($i = 0; $i < 30; ++$i) {
+            $os = $this->_createOutputByteStream();
+            $is = $this->_createInputByteStream();
+            $collection = new Swift_StreamCollector();
+
+            $is->shouldReceive('write')
+               ->zeroOrMoreTimes()
+               ->andReturnUsing($collection);
+            $os->shouldReceive('read')
+               ->once()
+               ->andReturn(pack('C*', rand(0, 255), rand(0, 255)));
+            $os->shouldReceive('read')
+               ->zeroOrMoreTimes()
+               ->andReturn(false);
+
+            $this->_encoder->encodeByteStream($os, $is);
+            $this->assertRegExp('~^[a-zA-Z0-9/\+]{3}=$~', $collection->content,
+                '%s: Two bytes should have 1 byte of padding'
+                );
+        }
+
+        for ($i = 0; $i < 30; ++$i) {
+            $os = $this->_createOutputByteStream();
+            $is = $this->_createInputByteStream();
+            $collection = new Swift_StreamCollector();
+
+            $is->shouldReceive('write')
+               ->zeroOrMoreTimes()
+               ->andReturnUsing($collection);
+            $os->shouldReceive('read')
+               ->once()
+               ->andReturn(pack('C*', rand(0, 255), rand(0, 255), rand(0, 255)));
+            $os->shouldReceive('read')
+               ->zeroOrMoreTimes()
+               ->andReturn(false);
+
+            $this->_encoder->encodeByteStream($os, $is);
+            $this->assertRegExp('~^[a-zA-Z0-9/\+]{4}$~', $collection->content,
+                '%s: Three bytes should have no padding'
+                );
+        }
+    }
+
+    public function testMaximumLineLengthIs76Characters()
+    {
+        /*
+         The encoded output stream must be represented in lines of no more
+         than 76 characters each.  All line breaks or other characters not
+         found in Table 1 must be ignored by decoding software.
+         */
+
+        $os = $this->_createOutputByteStream();
+        $is = $this->_createInputByteStream();
+        $collection = new Swift_StreamCollector();
+
+        $is->shouldReceive('write')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing($collection);
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('abcdefghijkl'); //12
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('mnopqrstuvwx'); //24
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('yzabc1234567'); //36
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('890ABCDEFGHI'); //48
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('JKLMNOPQRSTU'); //60
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('VWXYZ1234567'); //72
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('abcdefghijkl'); //84
+        $os->shouldReceive('read')
+           ->zeroOrMoreTimes()
+           ->andReturn(false);
+
+        $this->_encoder->encodeByteStream($os, $is);
+        $this->assertEquals(
+            "YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXphYmMxMjM0NTY3ODkwQUJDREVGR0hJSktMTU5PUFFS\r\n".
+            'U1RVVldYWVoxMjM0NTY3YWJjZGVmZ2hpamts',
+            $collection->content
+            );
+    }
+
+    public function testMaximumLineLengthCanBeDifferent()
+    {
+        $os = $this->_createOutputByteStream();
+        $is = $this->_createInputByteStream();
+        $collection = new Swift_StreamCollector();
+
+        $is->shouldReceive('write')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing($collection);
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('abcdefghijkl'); //12
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('mnopqrstuvwx'); //24
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('yzabc1234567'); //36
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('890ABCDEFGHI'); //48
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('JKLMNOPQRSTU'); //60
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('VWXYZ1234567'); //72
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('abcdefghijkl'); //84
+        $os->shouldReceive('read')
+           ->zeroOrMoreTimes()
+           ->andReturn(false);
+
+        $this->_encoder->encodeByteStream($os, $is, 0, 50);
+        $this->assertEquals(
+            "YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXphYmMxMjM0NTY3OD\r\n".
+            "kwQUJDREVGR0hJSktMTU5PUFFSU1RVVldYWVoxMjM0NTY3YWJj\r\n".
+            'ZGVmZ2hpamts',
+            $collection->content
+            );
+    }
+
+    public function testMaximumLineLengthIsNeverMoreThan76Chars()
+    {
+        $os = $this->_createOutputByteStream();
+        $is = $this->_createInputByteStream();
+        $collection = new Swift_StreamCollector();
+
+        $is->shouldReceive('write')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing($collection);
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('abcdefghijkl'); //12
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('mnopqrstuvwx'); //24
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('yzabc1234567'); //36
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('890ABCDEFGHI'); //48
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('JKLMNOPQRSTU'); //60
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('VWXYZ1234567'); //72
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('abcdefghijkl'); //84
+        $os->shouldReceive('read')
+           ->zeroOrMoreTimes()
+           ->andReturn(false);
+
+        $this->_encoder->encodeByteStream($os, $is, 0, 100);
+        $this->assertEquals(
+            "YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXphYmMxMjM0NTY3ODkwQUJDREVGR0hJSktMTU5PUFFS\r\n".
+            'U1RVVldYWVoxMjM0NTY3YWJjZGVmZ2hpamts',
+            $collection->content
+            );
+    }
+
+    public function testFirstLineLengthCanBeDifferent()
+    {
+        $os = $this->_createOutputByteStream();
+        $is = $this->_createInputByteStream();
+        $collection = new Swift_StreamCollector();
+
+        $is->shouldReceive('write')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing($collection);
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('abcdefghijkl'); //12
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('mnopqrstuvwx'); //24
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('yzabc1234567'); //36
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('890ABCDEFGHI'); //48
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('JKLMNOPQRSTU'); //60
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('VWXYZ1234567'); //72
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('abcdefghijkl'); //84
+        $os->shouldReceive('read')
+           ->zeroOrMoreTimes()
+           ->andReturn(false);
+
+        $this->_encoder->encodeByteStream($os, $is, 19);
+        $this->assertEquals(
+            "YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXphYmMxMjM0NTY3ODkwQUJDR\r\n".
+            'EVGR0hJSktMTU5PUFFSU1RVVldYWVoxMjM0NTY3YWJjZGVmZ2hpamts',
+            $collection->content
+            );
+    }
+
+    private function _createOutputByteStream($stub = false)
+    {
+        return $this->getMockery('Swift_OutputByteStream')->shouldIgnoreMissing();
+    }
+
+    private function _createInputByteStream($stub = false)
+    {
+        return $this->getMockery('Swift_InputByteStream')->shouldIgnoreMissing();
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/PlainContentEncoderTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/PlainContentEncoderTest.php
new file mode 100644
index 000000000..b523a64c6
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/PlainContentEncoderTest.php
@@ -0,0 +1,173 @@
+<?php
+
+class Swift_Mime_ContentEncoder_PlainContentEncoderTest extends \SwiftMailerTestCase
+{
+    public function testNameCanBeSpecifiedInConstructor()
+    {
+        $encoder = $this->_getEncoder('7bit');
+        $this->assertEquals('7bit', $encoder->getName());
+
+        $encoder = $this->_getEncoder('8bit');
+        $this->assertEquals('8bit', $encoder->getName());
+    }
+
+    public function testNoOctetsAreModifiedInString()
+    {
+        $encoder = $this->_getEncoder('7bit');
+        foreach (range(0x00, 0xFF) as $octet) {
+            $byte = pack('C', $octet);
+            $this->assertIdenticalBinary($byte, $encoder->encodeString($byte));
+        }
+    }
+
+    public function testNoOctetsAreModifiedInByteStream()
+    {
+        $encoder = $this->_getEncoder('7bit');
+        foreach (range(0x00, 0xFF) as $octet) {
+            $byte = pack('C', $octet);
+
+            $os = $this->_createOutputByteStream();
+            $is = $this->_createInputByteStream();
+            $collection = new Swift_StreamCollector();
+
+            $is->shouldReceive('write')
+               ->zeroOrMoreTimes()
+               ->andReturnUsing($collection);
+            $os->shouldReceive('read')
+               ->once()
+               ->andReturn($byte);
+            $os->shouldReceive('read')
+               ->zeroOrMoreTimes()
+               ->andReturn(false);
+
+            $encoder->encodeByteStream($os, $is);
+            $this->assertIdenticalBinary($byte, $collection->content);
+        }
+    }
+
+    public function testLineLengthCanBeSpecified()
+    {
+        $encoder = $this->_getEncoder('7bit');
+
+        $chars = array();
+        for ($i = 0; $i < 50; ++$i) {
+            $chars[] = 'a';
+        }
+        $input = implode(' ', $chars); //99 chars long
+
+        $this->assertEquals(
+            'a a a a a a a a a a a a a a a a a a a a a a a a a '."\r\n".//50 *
+            'a a a a a a a a a a a a a a a a a a a a a a a a a',            //99
+            $encoder->encodeString($input, 0, 50),
+            '%s: Lines should be wrapped at 50 chars'
+            );
+    }
+
+    public function testLineLengthCanBeSpecifiedInByteStream()
+    {
+        $encoder = $this->_getEncoder('7bit');
+
+        $os = $this->_createOutputByteStream();
+        $is = $this->_createInputByteStream();
+        $collection = new Swift_StreamCollector();
+
+        $is->shouldReceive('write')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing($collection);
+
+        for ($i = 0; $i < 50; ++$i) {
+            $os->shouldReceive('read')
+               ->once()
+               ->andReturn('a ');
+        }
+
+        $os->shouldReceive('read')
+           ->zeroOrMoreTimes()
+           ->andReturn(false);
+
+        $encoder->encodeByteStream($os, $is, 0, 50);
+        $this->assertEquals(
+            str_repeat('a ', 25)."\r\n".str_repeat('a ', 25),
+            $collection->content
+            );
+    }
+
+    public function testencodeStringGeneratesCorrectCrlf()
+    {
+        $encoder = $this->_getEncoder('7bit', true);
+        $this->assertEquals("a\r\nb", $encoder->encodeString("a\rb"),
+            '%s: Line endings should be standardized'
+            );
+        $this->assertEquals("a\r\nb", $encoder->encodeString("a\nb"),
+            '%s: Line endings should be standardized'
+            );
+        $this->assertEquals("a\r\n\r\nb", $encoder->encodeString("a\n\rb"),
+            '%s: Line endings should be standardized'
+            );
+        $this->assertEquals("a\r\n\r\nb", $encoder->encodeString("a\r\rb"),
+            '%s: Line endings should be standardized'
+            );
+        $this->assertEquals("a\r\n\r\nb", $encoder->encodeString("a\n\nb"),
+            '%s: Line endings should be standardized'
+            );
+    }
+
+    public function crlfProvider()
+    {
+        return array(
+            array("\r", "a\r\nb"),
+            array("\n", "a\r\nb"),
+            array("\n\r", "a\r\n\r\nb"),
+            array("\n\n", "a\r\n\r\nb"),
+            array("\r\r", "a\r\n\r\nb"),
+        );
+    }
+
+    /**
+     * @dataProvider crlfProvider
+     */
+    public function testCanonicEncodeByteStreamGeneratesCorrectCrlf($test, $expected)
+    {
+        $encoder = $this->_getEncoder('7bit', true);
+
+        $os = $this->_createOutputByteStream();
+        $is = $this->_createInputByteStream();
+        $collection = new Swift_StreamCollector();
+
+        $is->shouldReceive('write')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing($collection);
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('a');
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn($test);
+        $os->shouldReceive('read')
+           ->once()
+           ->andReturn('b');
+        $os->shouldReceive('read')
+           ->zeroOrMoreTimes()
+           ->andReturn(false);
+
+        $encoder->encodeByteStream($os, $is);
+        $this->assertEquals($expected, $collection->content);
+    }
+
+    // -- Private helpers
+
+    private function _getEncoder($name, $canonical = false)
+    {
+        return new Swift_Mime_ContentEncoder_PlainContentEncoder($name, $canonical);
+    }
+
+    private function _createOutputByteStream($stub = false)
+    {
+        return $this->getMockery('Swift_OutputByteStream')->shouldIgnoreMissing();
+    }
+
+    private function _createInputByteStream($stub = false)
+    {
+        return $this->getMockery('Swift_InputByteStream')->shouldIgnoreMissing();
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/QpContentEncoderTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/QpContentEncoderTest.php
new file mode 100644
index 000000000..819928910
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/ContentEncoder/QpContentEncoderTest.php
@@ -0,0 +1,518 @@
+<?php
+
+class Swift_Mime_ContentEncoder_QpContentEncoderTest extends \SwiftMailerTestCase
+{
+    public function testNameIsQuotedPrintable()
+    {
+        $encoder = new Swift_Mime_ContentEncoder_QpContentEncoder(
+            $this->_createCharacterStream(true)
+            );
+        $this->assertEquals('quoted-printable', $encoder->getName());
+    }
+
+    /* -- RFC 2045, 6.7 --
+    (1)   (General 8bit representation) Any octet, except a CR or
+                    LF that is part of a CRLF line break of the canonical
+                    (standard) form of the data being encoded, may be
+                    represented by an "=" followed by a two digit
+                    hexadecimal representation of the octet's value.  The
+                    digits of the hexadecimal alphabet, for this purpose,
+                    are "0123456789ABCDEF".  Uppercase letters must be
+                    used; lowercase letters are not allowed.  Thus, for
+                    example, the decimal value 12 (US-ASCII form feed) can
+                    be represented by "=0C", and the decimal value 61 (US-
+                    ASCII EQUAL SIGN) can be represented by "=3D".  This
+                    rule must be followed except when the following rules
+                    allow an alternative encoding.
+                    */
+
+    public function testPermittedCharactersAreNotEncoded()
+    {
+        /* -- RFC 2045, 6.7 --
+        (2)   (Literal representation) Octets with decimal values of
+                    33 through 60 inclusive, and 62 through 126, inclusive,
+                    MAY be represented as the US-ASCII characters which
+                    correspond to those octets (EXCLAMATION POINT through
+                    LESS THAN, and GREATER THAN through TILDE,
+                    respectively).
+                    */
+
+        foreach (array_merge(range(33, 60), range(62, 126)) as $ordinal) {
+            $char = chr($ordinal);
+
+            $os = $this->_createOutputByteStream(true);
+            $charStream = $this->_createCharacterStream();
+            $is = $this->_createInputByteStream();
+            $collection = new Swift_StreamCollector();
+
+            $is->shouldReceive('write')
+               ->zeroOrMoreTimes()
+               ->andReturnUsing($collection);
+            $charStream->shouldReceive('flushContents')
+                       ->once();
+            $charStream->shouldReceive('importByteStream')
+                       ->once()
+                       ->with($os);
+            $charStream->shouldReceive('readBytes')
+                       ->once()
+                       ->andReturn(array($ordinal));
+            $charStream->shouldReceive('readBytes')
+                       ->zeroOrMoreTimes()
+                       ->andReturn(false);
+
+            $encoder = new Swift_Mime_ContentEncoder_QpContentEncoder($charStream);
+            $encoder->encodeByteStream($os, $is);
+            $this->assertIdenticalBinary($char, $collection->content);
+        }
+    }
+
+    public function testLinearWhiteSpaceAtLineEndingIsEncoded()
+    {
+        /* -- RFC 2045, 6.7 --
+        (3)   (White Space) Octets with values of 9 and 32 MAY be
+                    represented as US-ASCII TAB (HT) and SPACE characters,
+                    respectively, but MUST NOT be so represented at the end
+                    of an encoded line.  Any TAB (HT) or SPACE characters
+                    on an encoded line MUST thus be followed on that line
+                    by a printable character.  In particular, an "=" at the
+                    end of an encoded line, indicating a soft line break
+                    (see rule #5) may follow one or more TAB (HT) or SPACE
+                    characters.  It follows that an octet with decimal
+                    value 9 or 32 appearing at the end of an encoded line
+                    must be represented according to Rule #1.  This rule is
+                    necessary because some MTAs (Message Transport Agents,
+                    programs which transport messages from one user to
+                    another, or perform a portion of such transfers) are
+                    known to pad lines of text with SPACEs, and others are
+                    known to remove "white space" characters from the end
+                    of a line.  Therefore, when decoding a Quoted-Printable
+                    body, any trailing white space on a line must be
+                    deleted, as it will necessarily have been added by
+                    intermediate transport agents.
+                    */
+
+        $HT = chr(0x09); //9
+        $SPACE = chr(0x20); //32
+
+        //HT
+        $os = $this->_createOutputByteStream(true);
+        $charStream = $this->_createCharacterStream();
+        $is = $this->_createInputByteStream();
+        $collection = new Swift_StreamCollector();
+
+        $is->shouldReceive('write')
+               ->zeroOrMoreTimes()
+               ->andReturnUsing($collection);
+        $charStream->shouldReceive('flushContents')
+                   ->once();
+        $charStream->shouldReceive('importByteStream')
+                   ->once()
+                   ->with($os);
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(ord('a')));
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(0x09));
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(0x09));
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(0x0D));
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(0x0A));
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(ord('b')));
+        $charStream->shouldReceive('readBytes')
+                   ->zeroOrMoreTimes()
+                   ->andReturn(false);
+
+        $encoder = new Swift_Mime_ContentEncoder_QpContentEncoder($charStream);
+        $encoder->encodeByteStream($os, $is);
+
+        $this->assertEquals("a\t=09\r\nb", $collection->content);
+
+        //SPACE
+        $os = $this->_createOutputByteStream(true);
+        $charStream = $this->_createCharacterStream();
+        $is = $this->_createInputByteStream();
+        $collection = new Swift_StreamCollector();
+
+        $is->shouldReceive('write')
+               ->zeroOrMoreTimes()
+               ->andReturnUsing($collection);
+        $charStream->shouldReceive('flushContents')
+                   ->once();
+        $charStream->shouldReceive('importByteStream')
+                   ->once()
+                   ->with($os);
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(ord('a')));
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(0x20));
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(0x20));
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(0x0D));
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(0x0A));
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(ord('b')));
+        $charStream->shouldReceive('readBytes')
+                   ->zeroOrMoreTimes()
+                   ->andReturn(false);
+
+        $encoder = new Swift_Mime_ContentEncoder_QpContentEncoder($charStream);
+        $encoder->encodeByteStream($os, $is);
+
+        $this->assertEquals("a =20\r\nb", $collection->content);
+    }
+
+    public function testCRLFIsLeftAlone()
+    {
+        /*
+        (4)   (Line Breaks) A line break in a text body, represented
+                    as a CRLF sequence in the text canonical form, must be
+                    represented by a (RFC 822) line break, which is also a
+                    CRLF sequence, in the Quoted-Printable encoding.  Since
+                    the canonical representation of media types other than
+                    text do not generally include the representation of
+                    line breaks as CRLF sequences, no hard line breaks
+                    (i.e. line breaks that are intended to be meaningful
+                    and to be displayed to the user) can occur in the
+                    quoted-printable encoding of such types.  Sequences
+                    like "=0D", "=0A", "=0A=0D" and "=0D=0A" will routinely
+                    appear in non-text data represented in quoted-
+                    printable, of course.
+
+                    Note that many implementations may elect to encode the
+                    local representation of various content types directly
+                    rather than converting to canonical form first,
+                    encoding, and then converting back to local
+                    representation.  In particular, this may apply to plain
+                    text material on systems that use newline conventions
+                    other than a CRLF terminator sequence.  Such an
+                    implementation optimization is permissible, but only
+                    when the combined canonicalization-encoding step is
+                    equivalent to performing the three steps separately.
+                    */
+
+        $os = $this->_createOutputByteStream(true);
+        $charStream = $this->_createCharacterStream();
+        $is = $this->_createInputByteStream();
+        $collection = new Swift_StreamCollector();
+
+        $is->shouldReceive('write')
+               ->zeroOrMoreTimes()
+               ->andReturnUsing($collection);
+        $charStream->shouldReceive('flushContents')
+                   ->once();
+        $charStream->shouldReceive('importByteStream')
+                   ->once()
+                   ->with($os);
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(ord('a')));
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(0x0D));
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(0x0A));
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(ord('b')));
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(0x0D));
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(0x0A));
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(ord('c')));
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(0x0D));
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(0x0A));
+        $charStream->shouldReceive('readBytes')
+                   ->zeroOrMoreTimes()
+                   ->andReturn(false);
+
+        $encoder = new Swift_Mime_ContentEncoder_QpContentEncoder($charStream);
+        $encoder->encodeByteStream($os, $is);
+        $this->assertEquals("a\r\nb\r\nc\r\n", $collection->content);
+    }
+
+    public function testLinesLongerThan76CharactersAreSoftBroken()
+    {
+        /*
+        (5)   (Soft Line Breaks) The Quoted-Printable encoding
+                    REQUIRES that encoded lines be no more than 76
+                    characters long.  If longer lines are to be encoded
+                    with the Quoted-Printable encoding, "soft" line breaks
+                    must be used.  An equal sign as the last character on a
+                    encoded line indicates such a non-significant ("soft")
+                    line break in the encoded text.
+                    */
+
+        $os = $this->_createOutputByteStream(true);
+        $charStream = $this->_createCharacterStream();
+        $is = $this->_createInputByteStream();
+        $collection = new Swift_StreamCollector();
+
+        $is->shouldReceive('write')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing($collection);
+        $charStream->shouldReceive('flushContents')
+                   ->once();
+        $charStream->shouldReceive('importByteStream')
+                   ->once()
+                   ->with($os);
+
+        for ($seq = 0; $seq <= 140; ++$seq) {
+            $charStream->shouldReceive('readBytes')
+                       ->once()
+                       ->andReturn(array(ord('a')));
+        }
+        $charStream->shouldReceive('readBytes')
+                   ->zeroOrMoreTimes()
+                   ->andReturn(false);
+
+        $encoder = new Swift_Mime_ContentEncoder_QpContentEncoder($charStream);
+        $encoder->encodeByteStream($os, $is);
+        $this->assertEquals(str_repeat('a', 75)."=\r\n".str_repeat('a', 66), $collection->content);
+    }
+
+    public function testMaxLineLengthCanBeSpecified()
+    {
+        $os = $this->_createOutputByteStream(true);
+        $charStream = $this->_createCharacterStream();
+        $is = $this->_createInputByteStream();
+        $collection = new Swift_StreamCollector();
+
+        $is->shouldReceive('write')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing($collection);
+        $charStream->shouldReceive('flushContents')
+                   ->once();
+        $charStream->shouldReceive('importByteStream')
+                   ->once()
+                   ->with($os);
+
+        for ($seq = 0; $seq <= 100; ++$seq) {
+            $charStream->shouldReceive('readBytes')
+                       ->once()
+                       ->andReturn(array(ord('a')));
+        }
+        $charStream->shouldReceive('readBytes')
+                   ->zeroOrMoreTimes()
+                   ->andReturn(false);
+
+        $encoder = new Swift_Mime_ContentEncoder_QpContentEncoder($charStream);
+        $encoder->encodeByteStream($os, $is, 0, 54);
+        $this->assertEquals(str_repeat('a', 53)."=\r\n".str_repeat('a', 48), $collection->content);
+    }
+
+    public function testBytesBelowPermittedRangeAreEncoded()
+    {
+        /*
+        According to Rule (1 & 2)
+        */
+
+        foreach (range(0, 32) as $ordinal) {
+            $char = chr($ordinal);
+
+            $os = $this->_createOutputByteStream(true);
+            $charStream = $this->_createCharacterStream();
+            $is = $this->_createInputByteStream();
+            $collection = new Swift_StreamCollector();
+
+            $is->shouldReceive('write')
+               ->zeroOrMoreTimes()
+               ->andReturnUsing($collection);
+            $charStream->shouldReceive('flushContents')
+                       ->once();
+            $charStream->shouldReceive('importByteStream')
+                       ->once()
+                       ->with($os);
+            $charStream->shouldReceive('readBytes')
+                       ->once()
+                       ->andReturn(array($ordinal));
+            $charStream->shouldReceive('readBytes')
+                       ->zeroOrMoreTimes()
+                       ->andReturn(false);
+
+            $encoder = new Swift_Mime_ContentEncoder_QpContentEncoder($charStream);
+            $encoder->encodeByteStream($os, $is);
+            $this->assertEquals(sprintf('=%02X', $ordinal), $collection->content);
+        }
+    }
+
+    public function testDecimalByte61IsEncoded()
+    {
+        /*
+        According to Rule (1 & 2)
+        */
+
+        $char = chr(61);
+
+        $os = $this->_createOutputByteStream(true);
+        $charStream = $this->_createCharacterStream();
+        $is = $this->_createInputByteStream();
+        $collection = new Swift_StreamCollector();
+
+        $is->shouldReceive('write')
+               ->zeroOrMoreTimes()
+               ->andReturnUsing($collection);
+        $charStream->shouldReceive('flushContents')
+                       ->once();
+        $charStream->shouldReceive('importByteStream')
+                       ->once()
+                       ->with($os);
+        $charStream->shouldReceive('readBytes')
+                       ->once()
+                       ->andReturn(array(61));
+        $charStream->shouldReceive('readBytes')
+                       ->zeroOrMoreTimes()
+                       ->andReturn(false);
+
+        $encoder = new Swift_Mime_ContentEncoder_QpContentEncoder($charStream);
+        $encoder->encodeByteStream($os, $is);
+        $this->assertEquals(sprintf('=%02X', 61), $collection->content);
+    }
+
+    public function testBytesAbovePermittedRangeAreEncoded()
+    {
+        /*
+        According to Rule (1 & 2)
+        */
+
+        foreach (range(127, 255) as $ordinal) {
+            $char = chr($ordinal);
+
+            $os = $this->_createOutputByteStream(true);
+            $charStream = $this->_createCharacterStream();
+            $is = $this->_createInputByteStream();
+            $collection = new Swift_StreamCollector();
+
+            $is->shouldReceive('write')
+               ->zeroOrMoreTimes()
+               ->andReturnUsing($collection);
+            $charStream->shouldReceive('flushContents')
+                       ->once();
+            $charStream->shouldReceive('importByteStream')
+                       ->once()
+                       ->with($os);
+            $charStream->shouldReceive('readBytes')
+                       ->once()
+                       ->andReturn(array($ordinal));
+            $charStream->shouldReceive('readBytes')
+                       ->zeroOrMoreTimes()
+                       ->andReturn(false);
+
+            $encoder = new Swift_Mime_ContentEncoder_QpContentEncoder($charStream);
+            $encoder->encodeByteStream($os, $is);
+            $this->assertEquals(sprintf('=%02X', $ordinal), $collection->content);
+        }
+    }
+
+    public function testFirstLineLengthCanBeDifferent()
+    {
+        $os = $this->_createOutputByteStream(true);
+        $charStream = $this->_createCharacterStream();
+        $is = $this->_createInputByteStream();
+        $collection = new Swift_StreamCollector();
+
+        $is->shouldReceive('write')
+               ->zeroOrMoreTimes()
+               ->andReturnUsing($collection);
+        $charStream->shouldReceive('flushContents')
+                    ->once();
+        $charStream->shouldReceive('importByteStream')
+                    ->once()
+                    ->with($os);
+
+        for ($seq = 0; $seq <= 140; ++$seq) {
+            $charStream->shouldReceive('readBytes')
+                       ->once()
+                       ->andReturn(array(ord('a')));
+        }
+        $charStream->shouldReceive('readBytes')
+                    ->zeroOrMoreTimes()
+                    ->andReturn(false);
+
+        $encoder = new Swift_Mime_ContentEncoder_QpContentEncoder($charStream);
+        $encoder->encodeByteStream($os, $is, 22);
+        $this->assertEquals(
+            str_repeat('a', 53)."=\r\n".str_repeat('a', 75)."=\r\n".str_repeat('a', 13),
+            $collection->content
+            );
+    }
+
+    public function testObserverInterfaceCanChangeCharset()
+    {
+        $stream = $this->_createCharacterStream();
+        $stream->shouldReceive('setCharacterSet')
+               ->once()
+               ->with('windows-1252');
+
+        $encoder = new Swift_Mime_ContentEncoder_QpContentEncoder($stream);
+        $encoder->charsetChanged('windows-1252');
+    }
+
+    public function testTextIsPreWrapped()
+    {
+        $encoder = $this->createEncoder();
+
+        $input = str_repeat('a', 70)."\r\n".
+                 str_repeat('a', 70)."\r\n".
+                 str_repeat('a', 70);
+
+        $os = new Swift_ByteStream_ArrayByteStream();
+        $is = new Swift_ByteStream_ArrayByteStream();
+        $is->write($input);
+
+        $encoder->encodeByteStream($is, $os);
+
+        $this->assertEquals(
+            $input, $os->read(PHP_INT_MAX)
+            );
+    }
+
+    // -- Creation Methods
+
+    private function _createCharacterStream($stub = false)
+    {
+        return $this->getMockery('Swift_CharacterStream')->shouldIgnoreMissing();
+    }
+
+    private function createEncoder()
+    {
+        $factory = new Swift_CharacterReaderFactory_SimpleCharacterReaderFactory();
+        $charStream = new Swift_CharacterStream_NgCharacterStream($factory, 'utf-8');
+
+        return new Swift_Mime_ContentEncoder_QpContentEncoder($charStream);
+    }
+
+    private function _createOutputByteStream($stub = false)
+    {
+        return $this->getMockery('Swift_OutputByteStream')->shouldIgnoreMissing();
+    }
+
+    private function _createInputByteStream($stub = false)
+    {
+        return $this->getMockery('Swift_InputByteStream')->shouldIgnoreMissing();
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/EmbeddedFileTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/EmbeddedFileTest.php
new file mode 100644
index 000000000..f4c3ac898
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/EmbeddedFileTest.php
@@ -0,0 +1,57 @@
+<?php
+
+class Swift_Mime_EmbeddedFileTest extends Swift_Mime_AttachmentTest
+{
+    public function testNestingLevelIsAttachment()
+    {
+        //Overridden
+    }
+
+    public function testNestingLevelIsEmbedded()
+    {
+        $file = $this->_createEmbeddedFile($this->_createHeaderSet(),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $this->assertEquals(
+            Swift_Mime_MimeEntity::LEVEL_RELATED, $file->getNestingLevel()
+            );
+    }
+
+    public function testIdIsAutoGenerated()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addIdHeader')
+                ->once()
+                ->with('Content-ID', '/^.*?@.*?$/D');
+
+        $file = $this->_createEmbeddedFile($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+    }
+
+    public function testDefaultDispositionIsInline()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addParameterizedHeader')
+                ->once()
+                ->with('Content-Disposition', 'inline');
+        $headers->shouldReceive('addParameterizedHeader')
+                ->zeroOrMoreTimes();
+
+        $file = $this->_createEmbeddedFile($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+    }
+
+    // -- Private helpers
+
+    protected function _createAttachment($headers, $encoder, $cache, $mimeTypes = array())
+    {
+        return $this->_createEmbeddedFile($headers, $encoder, $cache, $mimeTypes);
+    }
+
+    private function _createEmbeddedFile($headers, $encoder, $cache)
+    {
+        return new Swift_Mime_EmbeddedFile($headers, $encoder, $cache, new Swift_Mime_Grammar());
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/HeaderEncoder/Base64HeaderEncoderTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/HeaderEncoder/Base64HeaderEncoderTest.php
new file mode 100644
index 000000000..35801556e
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/HeaderEncoder/Base64HeaderEncoderTest.php
@@ -0,0 +1,13 @@
+<?php
+
+class Swift_Mime_HeaderEncoder_Base64HeaderEncoderTest extends \PHPUnit_Framework_TestCase
+{
+    //Most tests are already covered in Base64EncoderTest since this subclass only
+    // adds a getName() method
+
+    public function testNameIsB()
+    {
+        $encoder = new Swift_Mime_HeaderEncoder_Base64HeaderEncoder();
+        $this->assertEquals('B', $encoder->getName());
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/HeaderEncoder/QpHeaderEncoderTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/HeaderEncoder/QpHeaderEncoderTest.php
new file mode 100644
index 000000000..54a792a67
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/HeaderEncoder/QpHeaderEncoderTest.php
@@ -0,0 +1,223 @@
+<?php
+
+class Swift_Mime_HeaderEncoder_QpHeaderEncoderTest extends \SwiftMailerTestCase
+{
+    //Most tests are already covered in QpEncoderTest since this subclass only
+    // adds a getName() method
+
+    public function testNameIsQ()
+    {
+        $encoder = $this->_createEncoder(
+            $this->_createCharacterStream(true)
+            );
+        $this->assertEquals('Q', $encoder->getName());
+    }
+
+    public function testSpaceAndTabNeverAppear()
+    {
+        /* -- RFC 2047, 4.
+     Only a subset of the printable ASCII characters may be used in
+     'encoded-text'.  Space and tab characters are not allowed, so that
+     the beginning and end of an 'encoded-word' are obvious.
+     */
+
+        $charStream = $this->_createCharacterStream();
+        $charStream->shouldReceive('readBytes')
+                   ->atLeast()->times(6)
+                   ->andReturn(array(ord('a')), array(0x20), array(0x09), array(0x20), array(ord('b')), false);
+
+        $encoder = $this->_createEncoder($charStream);
+        $this->assertNotRegExp('~[ \t]~', $encoder->encodeString("a \t b"),
+            '%s: encoded-words in headers cannot contain LWSP as per RFC 2047.'
+            );
+    }
+
+    public function testSpaceIsRepresentedByUnderscore()
+    {
+        /* -- RFC 2047, 4.2.
+        (2) The 8-bit hexadecimal value 20 (e.g., ISO-8859-1 SPACE) may be
+       represented as "_" (underscore, ASCII 95.).  (This character may
+       not pass through some internetwork mail gateways, but its use
+       will greatly enhance readability of "Q" encoded data with mail
+       readers that do not support this encoding.)  Note that the "_"
+       always represents hexadecimal 20, even if the SPACE character
+       occupies a different code position in the character set in use.
+       */
+        $charStream = $this->_createCharacterStream();
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(ord('a')));
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(0x20));
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(ord('b')));
+        $charStream->shouldReceive('readBytes')
+                   ->zeroOrMoreTimes()
+                   ->andReturn(false);
+
+        $encoder = $this->_createEncoder($charStream);
+        $this->assertEquals('a_b', $encoder->encodeString('a b'),
+            '%s: Spaces can be represented by more readable underscores as per RFC 2047.'
+            );
+    }
+
+    public function testEqualsAndQuestionAndUnderscoreAreEncoded()
+    {
+        /* -- RFC 2047, 4.2.
+        (3) 8-bit values which correspond to printable ASCII characters other
+       than "=", "?", and "_" (underscore), MAY be represented as those
+       characters.  (But see section 5 for restrictions.)  In
+       particular, SPACE and TAB MUST NOT be represented as themselves
+       within encoded words.
+       */
+        $charStream = $this->_createCharacterStream();
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(ord('=')));
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(ord('?')));
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(ord('_')));
+        $charStream->shouldReceive('readBytes')
+                   ->zeroOrMoreTimes()
+                   ->andReturn(false);
+
+        $encoder = $this->_createEncoder($charStream);
+        $this->assertEquals('=3D=3F=5F', $encoder->encodeString('=?_'),
+            '%s: Chars =, ? and _ (underscore) may not appear as per RFC 2047.'
+            );
+    }
+
+    public function testParensAndQuotesAreEncoded()
+    {
+        /* -- RFC 2047, 5 (2).
+     A "Q"-encoded 'encoded-word' which appears in a 'comment' MUST NOT
+     contain the characters "(", ")" or "
+     */
+
+        $charStream = $this->_createCharacterStream();
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(ord('(')));
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(ord('"')));
+        $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array(ord(')')));
+        $charStream->shouldReceive('readBytes')
+                   ->zeroOrMoreTimes()
+                   ->andReturn(false);
+
+        $encoder = $this->_createEncoder($charStream);
+        $this->assertEquals('=28=22=29', $encoder->encodeString('(")'),
+            '%s: Chars (, " (DQUOTE) and ) may not appear as per RFC 2047.'
+            );
+    }
+
+    public function testOnlyCharactersAllowedInPhrasesAreUsed()
+    {
+        /* -- RFC 2047, 5.
+        (3) As a replacement for a 'word' entity within a 'phrase', for example,
+        one that precedes an address in a From, To, or Cc header.  The ABNF
+        definition for 'phrase' from RFC 822 thus becomes:
+
+        phrase = 1*( encoded-word / word )
+
+        In this case the set of characters that may be used in a "Q"-encoded
+        'encoded-word' is restricted to: <upper and lower case ASCII
+        letters, decimal digits, "!", "*", "+", "-", "/", "=", and "_"
+        (underscore, ASCII 95.)>.  An 'encoded-word' that appears within a
+        'phrase' MUST be separated from any adjacent 'word', 'text' or
+        'special' by 'linear-white-space'.
+        */
+
+        $allowedBytes = array_merge(
+            range(ord('a'), ord('z')), range(ord('A'), ord('Z')),
+            range(ord('0'), ord('9')),
+            array(ord('!'), ord('*'), ord('+'), ord('-'), ord('/'))
+            );
+
+        foreach (range(0x00, 0xFF) as $byte) {
+            $char = pack('C', $byte);
+
+            $charStream = $this->_createCharacterStream();
+            $charStream->shouldReceive('readBytes')
+                   ->once()
+                   ->andReturn(array($byte));
+            $charStream->shouldReceive('readBytes')
+                   ->zeroOrMoreTimes()
+                   ->andReturn(false);
+
+            $encoder = $this->_createEncoder($charStream);
+            $encodedChar = $encoder->encodeString($char);
+
+            if (in_array($byte, $allowedBytes)) {
+                $this->assertEquals($char, $encodedChar,
+                    '%s: Character '.$char.' should not be encoded.'
+                    );
+            } elseif (0x20 == $byte) {
+                //Special case
+                $this->assertEquals('_', $encodedChar,
+                    '%s: Space character should be replaced.'
+                    );
+            } else {
+                $this->assertEquals(sprintf('=%02X', $byte), $encodedChar,
+                    '%s: Byte '.$byte.' should be encoded.'
+                    );
+            }
+        }
+    }
+
+    public function testEqualsNeverAppearsAtEndOfLine()
+    {
+        /* -- RFC 2047, 5 (3).
+        The 'encoded-text' in an 'encoded-word' must be self-contained;
+        'encoded-text' MUST NOT be continued from one 'encoded-word' to
+        another.  This implies that the 'encoded-text' portion of a "B"
+        'encoded-word' will be a multiple of 4 characters long; for a "Q"
+        'encoded-word', any "=" character that appears in the 'encoded-text'
+        portion will be followed by two hexadecimal characters.
+        */
+
+        $input = str_repeat('a', 140);
+
+        $charStream = $this->_createCharacterStream();
+
+        $output = '';
+        $seq = 0;
+        for (; $seq < 140; ++$seq) {
+            $charStream->shouldReceive('readBytes')
+                       ->once()
+                       ->andReturn(array(ord('a')));
+
+            if (75 == $seq) {
+                $output .= "\r\n"; // =\r\n
+            }
+            $output .= 'a';
+        }
+
+        $charStream->shouldReceive('readBytes')
+                   ->zeroOrMoreTimes()
+                   ->andReturn(false);
+
+        $encoder = $this->_createEncoder($charStream);
+        $this->assertEquals($output, $encoder->encodeString($input));
+    }
+
+    // -- Creation Methods
+
+    private function _createEncoder($charStream)
+    {
+        return new Swift_Mime_HeaderEncoder_QpHeaderEncoder($charStream);
+    }
+
+    private function _createCharacterStream($stub = false)
+    {
+        return $this->getMockery('Swift_CharacterStream')->shouldIgnoreMissing();
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/Headers/DateHeaderTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/Headers/DateHeaderTest.php
new file mode 100644
index 000000000..1822ea688
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/Headers/DateHeaderTest.php
@@ -0,0 +1,69 @@
+<?php
+
+class Swift_Mime_Headers_DateHeaderTest extends \PHPUnit_Framework_TestCase
+{
+    /* --
+    The following tests refer to RFC 2822, section 3.6.1 and 3.3.
+    */
+
+    public function testTypeIsDateHeader()
+    {
+        $header = $this->_getHeader('Date');
+        $this->assertEquals(Swift_Mime_Header::TYPE_DATE, $header->getFieldType());
+    }
+
+    public function testGetTimestamp()
+    {
+        $timestamp = time();
+        $header = $this->_getHeader('Date');
+        $header->setTimestamp($timestamp);
+        $this->assertSame($timestamp, $header->getTimestamp());
+    }
+
+    public function testTimestampCanBeSetBySetter()
+    {
+        $timestamp = time();
+        $header = $this->_getHeader('Date');
+        $header->setTimestamp($timestamp);
+        $this->assertSame($timestamp, $header->getTimestamp());
+    }
+
+    public function testIntegerTimestampIsConvertedToRfc2822Date()
+    {
+        $timestamp = time();
+        $header = $this->_getHeader('Date');
+        $header->setTimestamp($timestamp);
+        $this->assertEquals(date('r', $timestamp), $header->getFieldBody());
+    }
+
+    public function testSetBodyModel()
+    {
+        $timestamp = time();
+        $header = $this->_getHeader('Date');
+        $header->setFieldBodyModel($timestamp);
+        $this->assertEquals(date('r', $timestamp), $header->getFieldBody());
+    }
+
+    public function testGetBodyModel()
+    {
+        $timestamp = time();
+        $header = $this->_getHeader('Date');
+        $header->setTimestamp($timestamp);
+        $this->assertEquals($timestamp, $header->getFieldBodyModel());
+    }
+
+    public function testToString()
+    {
+        $timestamp = time();
+        $header = $this->_getHeader('Date');
+        $header->setTimestamp($timestamp);
+        $this->assertEquals('Date: '.date('r', $timestamp)."\r\n",
+            $header->toString()
+            );
+    }
+
+    private function _getHeader($name)
+    {
+        return new Swift_Mime_Headers_DateHeader($name, new Swift_Mime_Grammar());
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/Headers/IdentificationHeaderTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/Headers/IdentificationHeaderTest.php
new file mode 100644
index 000000000..93b3f6092
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/Headers/IdentificationHeaderTest.php
@@ -0,0 +1,189 @@
+<?php
+
+class Swift_Mime_Headers_IdentificationHeaderTest extends \PHPUnit_Framework_TestCase
+{
+    public function testTypeIsIdHeader()
+    {
+        $header = $this->_getHeader('Message-ID');
+        $this->assertEquals(Swift_Mime_Header::TYPE_ID, $header->getFieldType());
+    }
+
+    public function testValueMatchesMsgIdSpec()
+    {
+        /* -- RFC 2822, 3.6.4.
+     message-id      =       "Message-ID:" msg-id CRLF
+
+     in-reply-to     =       "In-Reply-To:" 1*msg-id CRLF
+
+     references      =       "References:" 1*msg-id CRLF
+
+     msg-id          =       [CFWS] "<" id-left "@" id-right ">" [CFWS]
+
+     id-left         =       dot-atom-text / no-fold-quote / obs-id-left
+
+     id-right        =       dot-atom-text / no-fold-literal / obs-id-right
+
+     no-fold-quote   =       DQUOTE *(qtext / quoted-pair) DQUOTE
+
+     no-fold-literal =       "[" *(dtext / quoted-pair) "]"
+     */
+
+        $header = $this->_getHeader('Message-ID');
+        $header->setId('id-left@id-right');
+        $this->assertEquals('<id-left@id-right>', $header->getFieldBody());
+    }
+
+    public function testIdCanBeRetrievedVerbatim()
+    {
+        $header = $this->_getHeader('Message-ID');
+        $header->setId('id-left@id-right');
+        $this->assertEquals('id-left@id-right', $header->getId());
+    }
+
+    public function testMultipleIdsCanBeSet()
+    {
+        $header = $this->_getHeader('References');
+        $header->setIds(array('a@b', 'x@y'));
+        $this->assertEquals(array('a@b', 'x@y'), $header->getIds());
+    }
+
+    public function testSettingMultipleIdsProducesAListValue()
+    {
+        /* -- RFC 2822, 3.6.4.
+     The "References:" and "In-Reply-To:" field each contain one or more
+     unique message identifiers, optionally separated by CFWS.
+
+     .. SNIP ..
+
+     in-reply-to     =       "In-Reply-To:" 1*msg-id CRLF
+
+     references      =       "References:" 1*msg-id CRLF
+     */
+
+        $header = $this->_getHeader('References');
+        $header->setIds(array('a@b', 'x@y'));
+        $this->assertEquals('<a@b> <x@y>', $header->getFieldBody());
+    }
+
+    public function testIdLeftCanBeQuoted()
+    {
+        /* -- RFC 2822, 3.6.4.
+     id-left         =       dot-atom-text / no-fold-quote / obs-id-left
+     */
+
+        $header = $this->_getHeader('References');
+        $header->setId('"ab"@c');
+        $this->assertEquals('"ab"@c', $header->getId());
+        $this->assertEquals('<"ab"@c>', $header->getFieldBody());
+    }
+
+    public function testIdLeftCanContainAnglesAsQuotedPairs()
+    {
+        /* -- RFC 2822, 3.6.4.
+     no-fold-quote   =       DQUOTE *(qtext / quoted-pair) DQUOTE
+     */
+
+        $header = $this->_getHeader('References');
+        $header->setId('"a\\<\\>b"@c');
+        $this->assertEquals('"a\\<\\>b"@c', $header->getId());
+        $this->assertEquals('<"a\\<\\>b"@c>', $header->getFieldBody());
+    }
+
+    public function testIdLeftCanBeDotAtom()
+    {
+        $header = $this->_getHeader('References');
+        $header->setId('a.b+&%$.c@d');
+        $this->assertEquals('a.b+&%$.c@d', $header->getId());
+        $this->assertEquals('<a.b+&%$.c@d>', $header->getFieldBody());
+    }
+
+    public function testInvalidIdLeftThrowsException()
+    {
+        try {
+            $header = $this->_getHeader('References');
+            $header->setId('a b c@d');
+            $this->fail(
+                'Exception should be thrown since "a b c" is not valid id-left.'
+                );
+        } catch (Exception $e) {
+        }
+    }
+
+    public function testIdRightCanBeDotAtom()
+    {
+        /* -- RFC 2822, 3.6.4.
+     id-right        =       dot-atom-text / no-fold-literal / obs-id-right
+     */
+
+        $header = $this->_getHeader('References');
+        $header->setId('a@b.c+&%$.d');
+        $this->assertEquals('a@b.c+&%$.d', $header->getId());
+        $this->assertEquals('<a@b.c+&%$.d>', $header->getFieldBody());
+    }
+
+    public function testIdRightCanBeLiteral()
+    {
+        /* -- RFC 2822, 3.6.4.
+     no-fold-literal =       "[" *(dtext / quoted-pair) "]"
+     */
+
+        $header = $this->_getHeader('References');
+        $header->setId('a@[1.2.3.4]');
+        $this->assertEquals('a@[1.2.3.4]', $header->getId());
+        $this->assertEquals('<a@[1.2.3.4]>', $header->getFieldBody());
+    }
+
+    public function testInvalidIdRightThrowsException()
+    {
+        try {
+            $header = $this->_getHeader('References');
+            $header->setId('a@b c d');
+            $this->fail(
+                'Exception should be thrown since "b c d" is not valid id-right.'
+                );
+        } catch (Exception $e) {
+        }
+    }
+
+    public function testMissingAtSignThrowsException()
+    {
+        /* -- RFC 2822, 3.6.4.
+     msg-id          =       [CFWS] "<" id-left "@" id-right ">" [CFWS]
+     */
+
+        try {
+            $header = $this->_getHeader('References');
+            $header->setId('abc');
+            $this->fail(
+                'Exception should be thrown since "abc" is does not contain @.'
+                );
+        } catch (Exception $e) {
+        }
+    }
+
+    public function testSetBodyModel()
+    {
+        $header = $this->_getHeader('Message-ID');
+        $header->setFieldBodyModel('a@b');
+        $this->assertEquals(array('a@b'), $header->getIds());
+    }
+
+    public function testGetBodyModel()
+    {
+        $header = $this->_getHeader('Message-ID');
+        $header->setId('a@b');
+        $this->assertEquals(array('a@b'), $header->getFieldBodyModel());
+    }
+
+    public function testStringValue()
+    {
+        $header = $this->_getHeader('References');
+        $header->setIds(array('a@b', 'x@y'));
+        $this->assertEquals('References: <a@b> <x@y>'."\r\n", $header->toString());
+    }
+
+    private function _getHeader($name)
+    {
+        return new Swift_Mime_Headers_IdentificationHeader($name, new Swift_Mime_Grammar());
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/Headers/MailboxHeaderTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/Headers/MailboxHeaderTest.php
new file mode 100644
index 000000000..0713ff4e7
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/Headers/MailboxHeaderTest.php
@@ -0,0 +1,327 @@
+<?php
+
+class Swift_Mime_Headers_MailboxHeaderTest extends \SwiftMailerTestCase
+{
+    /* -- RFC 2822, 3.6.2 for all tests.
+     */
+
+    private $_charset = 'utf-8';
+
+    public function testTypeIsMailboxHeader()
+    {
+        $header = $this->_getHeader('To', $this->_getEncoder('Q', true));
+        $this->assertEquals(Swift_Mime_Header::TYPE_MAILBOX, $header->getFieldType());
+    }
+
+    public function testMailboxIsSetForAddress()
+    {
+        $header = $this->_getHeader('From', $this->_getEncoder('Q', true));
+        $header->setAddresses('chris@swiftmailer.org');
+        $this->assertEquals(array('chris@swiftmailer.org'),
+            $header->getNameAddressStrings()
+            );
+    }
+
+    public function testMailboxIsRenderedForNameAddress()
+    {
+        $header = $this->_getHeader('From', $this->_getEncoder('Q', true));
+        $header->setNameAddresses(array('chris@swiftmailer.org' => 'Chris Corbyn'));
+        $this->assertEquals(
+            array('Chris Corbyn <chris@swiftmailer.org>'), $header->getNameAddressStrings()
+            );
+    }
+
+    public function testAddressCanBeReturnedForAddress()
+    {
+        $header = $this->_getHeader('From', $this->_getEncoder('Q', true));
+        $header->setAddresses('chris@swiftmailer.org');
+        $this->assertEquals(array('chris@swiftmailer.org'), $header->getAddresses());
+    }
+
+    public function testAddressCanBeReturnedForNameAddress()
+    {
+        $header = $this->_getHeader('From', $this->_getEncoder('Q', true));
+        $header->setNameAddresses(array('chris@swiftmailer.org' => 'Chris Corbyn'));
+        $this->assertEquals(array('chris@swiftmailer.org'), $header->getAddresses());
+    }
+
+    public function testQuotesInNameAreQuoted()
+    {
+        $header = $this->_getHeader('From', $this->_getEncoder('Q', true));
+        $header->setNameAddresses(array(
+            'chris@swiftmailer.org' => 'Chris Corbyn, "DHE"',
+            ));
+        $this->assertEquals(
+            array('"Chris Corbyn, \"DHE\"" <chris@swiftmailer.org>'),
+            $header->getNameAddressStrings()
+            );
+    }
+
+    public function testEscapeCharsInNameAreQuoted()
+    {
+        $header = $this->_getHeader('From', $this->_getEncoder('Q', true));
+        $header->setNameAddresses(array(
+            'chris@swiftmailer.org' => 'Chris Corbyn, \\escaped\\',
+            ));
+        $this->assertEquals(
+            array('"Chris Corbyn, \\\\escaped\\\\" <chris@swiftmailer.org>'),
+            $header->getNameAddressStrings()
+            );
+    }
+
+    public function testGetMailboxesReturnsNameValuePairs()
+    {
+        $header = $this->_getHeader('From', $this->_getEncoder('Q', true));
+        $header->setNameAddresses(array(
+            'chris@swiftmailer.org' => 'Chris Corbyn, DHE',
+            ));
+        $this->assertEquals(
+            array('chris@swiftmailer.org' => 'Chris Corbyn, DHE'), $header->getNameAddresses()
+            );
+    }
+
+    public function testMultipleAddressesCanBeSetAndFetched()
+    {
+        $header = $this->_getHeader('From', $this->_getEncoder('Q', true));
+        $header->setAddresses(array(
+            'chris@swiftmailer.org', 'mark@swiftmailer.org',
+            ));
+        $this->assertEquals(
+            array('chris@swiftmailer.org', 'mark@swiftmailer.org'),
+            $header->getAddresses()
+            );
+    }
+
+    public function testMultipleAddressesAsMailboxes()
+    {
+        $header = $this->_getHeader('From', $this->_getEncoder('Q', true));
+        $header->setAddresses(array(
+            'chris@swiftmailer.org', 'mark@swiftmailer.org',
+            ));
+        $this->assertEquals(
+            array('chris@swiftmailer.org' => null, 'mark@swiftmailer.org' => null),
+            $header->getNameAddresses()
+            );
+    }
+
+    public function testMultipleAddressesAsMailboxStrings()
+    {
+        $header = $this->_getHeader('From', $this->_getEncoder('Q', true));
+        $header->setAddresses(array(
+            'chris@swiftmailer.org', 'mark@swiftmailer.org',
+            ));
+        $this->assertEquals(
+            array('chris@swiftmailer.org', 'mark@swiftmailer.org'),
+            $header->getNameAddressStrings()
+            );
+    }
+
+    public function testMultipleNamedMailboxesReturnsMultipleAddresses()
+    {
+        $header = $this->_getHeader('From', $this->_getEncoder('Q', true));
+        $header->setNameAddresses(array(
+            'chris@swiftmailer.org' => 'Chris Corbyn',
+            'mark@swiftmailer.org' => 'Mark Corbyn',
+            ));
+        $this->assertEquals(
+            array('chris@swiftmailer.org', 'mark@swiftmailer.org'),
+            $header->getAddresses()
+            );
+    }
+
+    public function testMultipleNamedMailboxesReturnsMultipleMailboxes()
+    {
+        $header = $this->_getHeader('From', $this->_getEncoder('Q', true));
+        $header->setNameAddresses(array(
+            'chris@swiftmailer.org' => 'Chris Corbyn',
+            'mark@swiftmailer.org' => 'Mark Corbyn',
+            ));
+        $this->assertEquals(array(
+                'chris@swiftmailer.org' => 'Chris Corbyn',
+                'mark@swiftmailer.org' => 'Mark Corbyn',
+                ),
+            $header->getNameAddresses()
+            );
+    }
+
+    public function testMultipleMailboxesProducesMultipleMailboxStrings()
+    {
+        $header = $this->_getHeader('From', $this->_getEncoder('Q', true));
+        $header->setNameAddresses(array(
+            'chris@swiftmailer.org' => 'Chris Corbyn',
+            'mark@swiftmailer.org' => 'Mark Corbyn',
+            ));
+        $this->assertEquals(array(
+                'Chris Corbyn <chris@swiftmailer.org>',
+                'Mark Corbyn <mark@swiftmailer.org>',
+                ),
+            $header->getNameAddressStrings()
+            );
+    }
+
+    public function testSetAddressesOverwritesAnyMailboxes()
+    {
+        $header = $this->_getHeader('From', $this->_getEncoder('Q', true));
+        $header->setNameAddresses(array(
+            'chris@swiftmailer.org' => 'Chris Corbyn',
+            'mark@swiftmailer.org' => 'Mark Corbyn',
+            ));
+        $this->assertEquals(
+            array('chris@swiftmailer.org' => 'Chris Corbyn',
+            'mark@swiftmailer.org' => 'Mark Corbyn', ),
+            $header->getNameAddresses()
+            );
+        $this->assertEquals(
+            array('chris@swiftmailer.org', 'mark@swiftmailer.org'),
+            $header->getAddresses()
+            );
+
+        $header->setAddresses(array('chris@swiftmailer.org', 'mark@swiftmailer.org'));
+
+        $this->assertEquals(
+            array('chris@swiftmailer.org' => null, 'mark@swiftmailer.org' => null),
+            $header->getNameAddresses()
+            );
+        $this->assertEquals(
+            array('chris@swiftmailer.org', 'mark@swiftmailer.org'),
+            $header->getAddresses()
+            );
+    }
+
+    public function testNameIsEncodedIfNonAscii()
+    {
+        $name = 'C'.pack('C', 0x8F).'rbyn';
+
+        $encoder = $this->_getEncoder('Q');
+        $encoder->shouldReceive('encodeString')
+                ->once()
+                ->with($name, \Mockery::any(), \Mockery::any(), \Mockery::any())
+                ->andReturn('C=8Frbyn');
+
+        $header = $this->_getHeader('From', $encoder);
+        $header->setNameAddresses(array('chris@swiftmailer.org' => 'Chris '.$name));
+
+        $addresses = $header->getNameAddressStrings();
+        $this->assertEquals(
+            'Chris =?'.$this->_charset.'?Q?C=8Frbyn?= <chris@swiftmailer.org>',
+            array_shift($addresses)
+            );
+    }
+
+    public function testEncodingLineLengthCalculations()
+    {
+        /* -- RFC 2047, 2.
+        An 'encoded-word' may not be more than 75 characters long, including
+        'charset', 'encoding', 'encoded-text', and delimiters.
+        */
+
+        $name = 'C'.pack('C', 0x8F).'rbyn';
+
+        $encoder = $this->_getEncoder('Q');
+        $encoder->shouldReceive('encodeString')
+                ->once()
+                ->with($name, \Mockery::any(), \Mockery::any(), \Mockery::any())
+                ->andReturn('C=8Frbyn');
+
+        $header = $this->_getHeader('From', $encoder);
+        $header->setNameAddresses(array('chris@swiftmailer.org' => 'Chris '.$name));
+
+        $header->getNameAddressStrings();
+    }
+
+    public function testGetValueReturnsMailboxStringValue()
+    {
+        $header = $this->_getHeader('From', $this->_getEncoder('Q', true));
+        $header->setNameAddresses(array(
+            'chris@swiftmailer.org' => 'Chris Corbyn',
+            ));
+        $this->assertEquals(
+            'Chris Corbyn <chris@swiftmailer.org>', $header->getFieldBody()
+            );
+    }
+
+    public function testGetValueReturnsMailboxStringValueForMultipleMailboxes()
+    {
+        $header = $this->_getHeader('From', $this->_getEncoder('Q', true));
+        $header->setNameAddresses(array(
+            'chris@swiftmailer.org' => 'Chris Corbyn',
+            'mark@swiftmailer.org' => 'Mark Corbyn',
+            ));
+        $this->assertEquals(
+            'Chris Corbyn <chris@swiftmailer.org>, Mark Corbyn <mark@swiftmailer.org>',
+            $header->getFieldBody()
+            );
+    }
+
+    public function testRemoveAddressesWithSingleValue()
+    {
+        $header = $this->_getHeader('From', $this->_getEncoder('Q', true));
+        $header->setNameAddresses(array(
+            'chris@swiftmailer.org' => 'Chris Corbyn',
+            'mark@swiftmailer.org' => 'Mark Corbyn',
+            ));
+        $header->removeAddresses('chris@swiftmailer.org');
+        $this->assertEquals(array('mark@swiftmailer.org'),
+            $header->getAddresses()
+            );
+    }
+
+    public function testRemoveAddressesWithList()
+    {
+        $header = $this->_getHeader('From', $this->_getEncoder('Q', true));
+        $header->setNameAddresses(array(
+            'chris@swiftmailer.org' => 'Chris Corbyn',
+            'mark@swiftmailer.org' => 'Mark Corbyn',
+            ));
+        $header->removeAddresses(
+            array('chris@swiftmailer.org', 'mark@swiftmailer.org')
+            );
+        $this->assertEquals(array(), $header->getAddresses());
+    }
+
+    public function testSetBodyModel()
+    {
+        $header = $this->_getHeader('From', $this->_getEncoder('Q', true));
+        $header->setFieldBodyModel('chris@swiftmailer.org');
+        $this->assertEquals(array('chris@swiftmailer.org' => null), $header->getNameAddresses());
+    }
+
+    public function testGetBodyModel()
+    {
+        $header = $this->_getHeader('From', $this->_getEncoder('Q', true));
+        $header->setAddresses(array('chris@swiftmailer.org'));
+        $this->assertEquals(array('chris@swiftmailer.org' => null), $header->getFieldBodyModel());
+    }
+
+    public function testToString()
+    {
+        $header = $this->_getHeader('From', $this->_getEncoder('Q', true));
+        $header->setNameAddresses(array(
+            'chris@swiftmailer.org' => 'Chris Corbyn',
+            'mark@swiftmailer.org' => 'Mark Corbyn',
+            ));
+        $this->assertEquals(
+            'From: Chris Corbyn <chris@swiftmailer.org>, '.
+            'Mark Corbyn <mark@swiftmailer.org>'."\r\n",
+            $header->toString()
+            );
+    }
+
+    private function _getHeader($name, $encoder)
+    {
+        $header = new Swift_Mime_Headers_MailboxHeader($name, $encoder, new Swift_Mime_Grammar());
+        $header->setCharset($this->_charset);
+
+        return $header;
+    }
+
+    private function _getEncoder($type, $stub = false)
+    {
+        $encoder = $this->getMockery('Swift_Mime_HeaderEncoder')->shouldIgnoreMissing();
+        $encoder->shouldReceive('getName')
+                ->zeroOrMoreTimes()
+                ->andReturn($type);
+
+        return $encoder;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/Headers/ParameterizedHeaderTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/Headers/ParameterizedHeaderTest.php
new file mode 100644
index 000000000..0f3fe1454
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/Headers/ParameterizedHeaderTest.php
@@ -0,0 +1,400 @@
+<?php
+
+class Swift_Mime_Headers_ParameterizedHeaderTest extends \SwiftMailerTestCase
+{
+    private $_charset = 'utf-8';
+    private $_lang = 'en-us';
+
+    public function testTypeIsParameterizedHeader()
+    {
+        $header = $this->_getHeader('Content-Type',
+            $this->_getHeaderEncoder('Q', true), $this->_getParameterEncoder(true)
+            );
+        $this->assertEquals(Swift_Mime_Header::TYPE_PARAMETERIZED, $header->getFieldType());
+    }
+
+    public function testValueIsReturnedVerbatim()
+    {
+        $header = $this->_getHeader('Content-Type',
+            $this->_getHeaderEncoder('Q', true), $this->_getParameterEncoder(true)
+            );
+        $header->setValue('text/plain');
+        $this->assertEquals('text/plain', $header->getValue());
+    }
+
+    public function testParametersAreAppended()
+    {
+        /* -- RFC 2045, 5.1
+        parameter := attribute "=" value
+
+     attribute := token
+                                    ; Matching of attributes
+                                    ; is ALWAYS case-insensitive.
+
+     value := token / quoted-string
+
+     token := 1*<any (US-ASCII) CHAR except SPACE, CTLs,
+                 or tspecials>
+
+     tspecials :=  "(" / ")" / "<" / ">" / "@" /
+                   "," / ";" / ":" / "\" / <">
+                   "/" / "[" / "]" / "?" / "="
+                   ; Must be in quoted-string,
+                   ; to use within parameter values
+        */
+
+        $header = $this->_getHeader('Content-Type',
+            $this->_getHeaderEncoder('Q', true), $this->_getParameterEncoder(true)
+            );
+        $header->setValue('text/plain');
+        $header->setParameters(array('charset' => 'utf-8'));
+        $this->assertEquals('text/plain; charset=utf-8', $header->getFieldBody());
+    }
+
+    public function testSpaceInParamResultsInQuotedString()
+    {
+        $header = $this->_getHeader('Content-Disposition',
+            $this->_getHeaderEncoder('Q', true), $this->_getParameterEncoder(true)
+            );
+        $header->setValue('attachment');
+        $header->setParameters(array('filename' => 'my file.txt'));
+        $this->assertEquals('attachment; filename="my file.txt"',
+            $header->getFieldBody()
+            );
+    }
+
+    public function testLongParamsAreBrokenIntoMultipleAttributeStrings()
+    {
+        /* -- RFC 2231, 3.
+        The asterisk character ("*") followed
+        by a decimal count is employed to indicate that multiple parameters
+        are being used to encapsulate a single parameter value.  The count
+        starts at 0 and increments by 1 for each subsequent section of the
+        parameter value.  Decimal values are used and neither leading zeroes
+        nor gaps in the sequence are allowed.
+
+        The original parameter value is recovered by concatenating the
+        various sections of the parameter, in order.  For example, the
+        content-type field
+
+                Content-Type: message/external-body; access-type=URL;
+         URL*0="ftp://";
+         URL*1="cs.utk.edu/pub/moore/bulk-mailer/bulk-mailer.tar"
+
+        is semantically identical to
+
+                Content-Type: message/external-body; access-type=URL;
+                    URL="ftp://cs.utk.edu/pub/moore/bulk-mailer/bulk-mailer.tar"
+
+        Note that quotes around parameter values are part of the value
+        syntax; they are NOT part of the value itself.  Furthermore, it is
+        explicitly permitted to have a mixture of quoted and unquoted
+        continuation fields.
+        */
+
+        $value = str_repeat('a', 180);
+
+        $encoder = $this->_getParameterEncoder();
+        $encoder->shouldReceive('encodeString')
+                ->once()
+                ->with($value, \Mockery::any(), 63, \Mockery::any())
+                ->andReturn(str_repeat('a', 63)."\r\n".
+                    str_repeat('a', 63)."\r\n".str_repeat('a', 54));
+
+        $header = $this->_getHeader('Content-Disposition',
+            $this->_getHeaderEncoder('Q', true), $encoder
+            );
+        $header->setValue('attachment');
+        $header->setParameters(array('filename' => $value));
+        $header->setMaxLineLength(78);
+        $this->assertEquals(
+            'attachment; '.
+            'filename*0*=utf-8\'\''.str_repeat('a', 63).";\r\n ".
+            'filename*1*='.str_repeat('a', 63).";\r\n ".
+            'filename*2*='.str_repeat('a', 54),
+            $header->getFieldBody()
+            );
+    }
+
+    public function testEncodedParamDataIncludesCharsetAndLanguage()
+    {
+        /* -- RFC 2231, 4.
+        Asterisks ("*") are reused to provide the indicator that language and
+        character set information is present and encoding is being used. A
+        single quote ("'") is used to delimit the character set and language
+        information at the beginning of the parameter value. Percent signs
+        ("%") are used as the encoding flag, which agrees with RFC 2047.
+
+        Specifically, an asterisk at the end of a parameter name acts as an
+        indicator that character set and language information may appear at
+        the beginning of the parameter value. A single quote is used to
+        separate the character set, language, and actual value information in
+        the parameter value string, and an percent sign is used to flag
+        octets encoded in hexadecimal.  For example:
+
+                Content-Type: application/x-stuff;
+         title*=us-ascii'en-us'This%20is%20%2A%2A%2Afun%2A%2A%2A
+
+        Note that it is perfectly permissible to leave either the character
+        set or language field blank.  Note also that the single quote
+        delimiters MUST be present even when one of the field values is
+        omitted.
+        */
+
+        $value = str_repeat('a', 20).pack('C', 0x8F).str_repeat('a', 10);
+
+        $encoder = $this->_getParameterEncoder();
+        $encoder->shouldReceive('encodeString')
+                ->once()
+                ->with($value, 12, 62, \Mockery::any())
+                ->andReturn(str_repeat('a', 20).'%8F'.str_repeat('a', 10));
+
+        $header = $this->_getHeader('Content-Disposition',
+            $this->_getHeaderEncoder('Q', true), $encoder
+            );
+        $header->setValue('attachment');
+        $header->setParameters(array('filename' => $value));
+        $header->setMaxLineLength(78);
+        $header->setLanguage($this->_lang);
+        $this->assertEquals(
+            'attachment; filename*='.$this->_charset."'".$this->_lang."'".
+            str_repeat('a', 20).'%8F'.str_repeat('a', 10),
+            $header->getFieldBody()
+            );
+    }
+
+    public function testMultipleEncodedParamLinesAreFormattedCorrectly()
+    {
+        /* -- RFC 2231, 4.1.
+        Character set and language information may be combined with the
+        parameter continuation mechanism. For example:
+
+        Content-Type: application/x-stuff
+     title*0*=us-ascii'en'This%20is%20even%20more%20
+     title*1*=%2A%2A%2Afun%2A%2A%2A%20
+     title*2="isn't it!"
+
+        Note that:
+
+     (1)   Language and character set information only appear at
+           the beginning of a given parameter value.
+
+     (2)   Continuations do not provide a facility for using more
+           than one character set or language in the same
+           parameter value.
+
+     (3)   A value presented using multiple continuations may
+           contain a mixture of encoded and unencoded segments.
+
+     (4)   The first segment of a continuation MUST be encoded if
+           language and character set information are given.
+
+     (5)   If the first segment of a continued parameter value is
+           encoded the language and character set field delimiters
+           MUST be present even when the fields are left blank.
+        */
+
+        $value = str_repeat('a', 20).pack('C', 0x8F).str_repeat('a', 60);
+
+        $encoder = $this->_getParameterEncoder();
+        $encoder->shouldReceive('encodeString')
+                ->once()
+                ->with($value, 12, 62, \Mockery::any())
+                ->andReturn(str_repeat('a', 20).'%8F'.str_repeat('a', 28)."\r\n".
+                    str_repeat('a', 32));
+
+        $header = $this->_getHeader('Content-Disposition',
+            $this->_getHeaderEncoder('Q', true), $encoder
+            );
+        $header->setValue('attachment');
+        $header->setParameters(array('filename' => $value));
+        $header->setMaxLineLength(78);
+        $header->setLanguage($this->_lang);
+        $this->assertEquals(
+            'attachment; filename*0*='.$this->_charset."'".$this->_lang."'".
+            str_repeat('a', 20).'%8F'.str_repeat('a', 28).";\r\n ".
+            'filename*1*='.str_repeat('a', 32),
+            $header->getFieldBody()
+            );
+    }
+
+    public function testToString()
+    {
+        $header = $this->_getHeader('Content-Type',
+            $this->_getHeaderEncoder('Q', true), $this->_getParameterEncoder(true)
+            );
+        $header->setValue('text/html');
+        $header->setParameters(array('charset' => 'utf-8'));
+        $this->assertEquals('Content-Type: text/html; charset=utf-8'."\r\n",
+            $header->toString()
+            );
+    }
+
+    public function testValueCanBeEncodedIfNonAscii()
+    {
+        $value = 'fo'.pack('C', 0x8F).'bar';
+
+        $encoder = $this->_getHeaderEncoder('Q');
+        $encoder->shouldReceive('encodeString')
+                ->once()
+                ->with($value, \Mockery::any(), \Mockery::any(), \Mockery::any())
+                ->andReturn('fo=8Fbar');
+
+        $header = $this->_getHeader('X-Foo', $encoder, $this->_getParameterEncoder(true));
+        $header->setValue($value);
+        $header->setParameters(array('lookslike' => 'foobar'));
+        $this->assertEquals('X-Foo: =?utf-8?Q?fo=8Fbar?=; lookslike=foobar'."\r\n",
+            $header->toString()
+            );
+    }
+
+    public function testValueAndParamCanBeEncodedIfNonAscii()
+    {
+        $value = 'fo'.pack('C', 0x8F).'bar';
+
+        $encoder = $this->_getHeaderEncoder('Q');
+        $encoder->shouldReceive('encodeString')
+                ->once()
+                ->with($value, \Mockery::any(), \Mockery::any(), \Mockery::any())
+                ->andReturn('fo=8Fbar');
+
+        $paramEncoder = $this->_getParameterEncoder();
+        $paramEncoder->shouldReceive('encodeString')
+                     ->once()
+                     ->with($value, \Mockery::any(), \Mockery::any(), \Mockery::any())
+                     ->andReturn('fo%8Fbar');
+
+        $header = $this->_getHeader('X-Foo', $encoder, $paramEncoder);
+        $header->setValue($value);
+        $header->setParameters(array('says' => $value));
+        $this->assertEquals("X-Foo: =?utf-8?Q?fo=8Fbar?=; says*=utf-8''fo%8Fbar\r\n",
+            $header->toString()
+            );
+    }
+
+    public function testParamsAreEncodedWithEncodedWordsIfNoParamEncoderSet()
+    {
+        $value = 'fo'.pack('C', 0x8F).'bar';
+
+        $encoder = $this->_getHeaderEncoder('Q');
+        $encoder->shouldReceive('encodeString')
+                ->once()
+                ->with($value, \Mockery::any(), \Mockery::any(), \Mockery::any())
+                ->andReturn('fo=8Fbar');
+
+        $header = $this->_getHeader('X-Foo', $encoder, null);
+        $header->setValue('bar');
+        $header->setParameters(array('says' => $value));
+        $this->assertEquals("X-Foo: bar; says=\"=?utf-8?Q?fo=8Fbar?=\"\r\n",
+            $header->toString()
+            );
+    }
+
+    public function testLanguageInformationAppearsInEncodedWords()
+    {
+        /* -- RFC 2231, 5.
+        5.  Language specification in Encoded Words
+
+        RFC 2047 provides support for non-US-ASCII character sets in RFC 822
+        message header comments, phrases, and any unstructured text field.
+        This is done by defining an encoded word construct which can appear
+        in any of these places.  Given that these are fields intended for
+        display, it is sometimes necessary to associate language information
+        with encoded words as well as just the character set.  This
+        specification extends the definition of an encoded word to allow the
+        inclusion of such information.  This is simply done by suffixing the
+        character set specification with an asterisk followed by the language
+        tag.  For example:
+
+                    From: =?US-ASCII*EN?Q?Keith_Moore?= <moore@cs.utk.edu>
+        */
+
+        $value = 'fo'.pack('C', 0x8F).'bar';
+
+        $encoder = $this->_getHeaderEncoder('Q');
+        $encoder->shouldReceive('encodeString')
+                ->once()
+                ->with($value, \Mockery::any(), \Mockery::any(), \Mockery::any())
+                ->andReturn('fo=8Fbar');
+
+        $paramEncoder = $this->_getParameterEncoder();
+        $paramEncoder->shouldReceive('encodeString')
+                     ->once()
+                     ->with($value, \Mockery::any(), \Mockery::any(), \Mockery::any())
+                     ->andReturn('fo%8Fbar');
+
+        $header = $this->_getHeader('X-Foo', $encoder, $paramEncoder);
+        $header->setLanguage('en');
+        $header->setValue($value);
+        $header->setParameters(array('says' => $value));
+        $this->assertEquals("X-Foo: =?utf-8*en?Q?fo=8Fbar?=; says*=utf-8'en'fo%8Fbar\r\n",
+            $header->toString()
+            );
+    }
+
+    public function testSetBodyModel()
+    {
+        $header = $this->_getHeader('Content-Type',
+            $this->_getHeaderEncoder('Q', true), $this->_getParameterEncoder(true)
+            );
+        $header->setFieldBodyModel('text/html');
+        $this->assertEquals('text/html', $header->getValue());
+    }
+
+    public function testGetBodyModel()
+    {
+        $header = $this->_getHeader('Content-Type',
+            $this->_getHeaderEncoder('Q', true), $this->_getParameterEncoder(true)
+            );
+        $header->setValue('text/plain');
+        $this->assertEquals('text/plain', $header->getFieldBodyModel());
+    }
+
+    public function testSetParameter()
+    {
+        $header = $this->_getHeader('Content-Type',
+            $this->_getHeaderEncoder('Q', true), $this->_getParameterEncoder(true)
+            );
+        $header->setParameters(array('charset' => 'utf-8', 'delsp' => 'yes'));
+        $header->setParameter('delsp', 'no');
+        $this->assertEquals(array('charset' => 'utf-8', 'delsp' => 'no'),
+            $header->getParameters()
+            );
+    }
+
+    public function testGetParameter()
+    {
+        $header = $this->_getHeader('Content-Type',
+            $this->_getHeaderEncoder('Q', true), $this->_getParameterEncoder(true)
+            );
+        $header->setParameters(array('charset' => 'utf-8', 'delsp' => 'yes'));
+        $this->assertEquals('utf-8', $header->getParameter('charset'));
+    }
+
+    // -- Private helper
+
+    private function _getHeader($name, $encoder, $paramEncoder)
+    {
+        $header = new Swift_Mime_Headers_ParameterizedHeader($name, $encoder,
+            $paramEncoder, new Swift_Mime_Grammar()
+            );
+        $header->setCharset($this->_charset);
+
+        return $header;
+    }
+
+    private function _getHeaderEncoder($type, $stub = false)
+    {
+        $encoder = $this->getMockery('Swift_Mime_HeaderEncoder')->shouldIgnoreMissing();
+        $encoder->shouldReceive('getName')
+                ->zeroOrMoreTimes()
+                ->andReturn($type);
+
+        return $encoder;
+    }
+
+    private function _getParameterEncoder($stub = false)
+    {
+        return $this->getMockery('Swift_Encoder')->shouldIgnoreMissing();
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/Headers/PathHeaderTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/Headers/PathHeaderTest.php
new file mode 100644
index 000000000..a9f35e9de
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/Headers/PathHeaderTest.php
@@ -0,0 +1,77 @@
+<?php
+
+class Swift_Mime_Headers_PathHeaderTest extends \PHPUnit_Framework_TestCase
+{
+    public function testTypeIsPathHeader()
+    {
+        $header = $this->_getHeader('Return-Path');
+        $this->assertEquals(Swift_Mime_Header::TYPE_PATH, $header->getFieldType());
+    }
+
+    public function testSingleAddressCanBeSetAndFetched()
+    {
+        $header = $this->_getHeader('Return-Path');
+        $header->setAddress('chris@swiftmailer.org');
+        $this->assertEquals('chris@swiftmailer.org', $header->getAddress());
+    }
+
+    public function testAddressMustComplyWithRfc2822()
+    {
+        try {
+            $header = $this->_getHeader('Return-Path');
+            $header->setAddress('chr is@swiftmailer.org');
+            $this->fail('Addresses not valid according to RFC 2822 addr-spec grammar must be rejected.');
+        } catch (Exception $e) {
+        }
+    }
+
+    public function testValueIsAngleAddrWithValidAddress()
+    {
+        /* -- RFC 2822, 3.6.7.
+
+            return          =       "Return-Path:" path CRLF
+
+            path            =       ([CFWS] "<" ([CFWS] / addr-spec) ">" [CFWS]) /
+                                                            obs-path
+     */
+
+        $header = $this->_getHeader('Return-Path');
+        $header->setAddress('chris@swiftmailer.org');
+        $this->assertEquals('<chris@swiftmailer.org>', $header->getFieldBody());
+    }
+
+    public function testValueIsEmptyAngleBracketsIfEmptyAddressSet()
+    {
+        $header = $this->_getHeader('Return-Path');
+        $header->setAddress('');
+        $this->assertEquals('<>', $header->getFieldBody());
+    }
+
+    public function testSetBodyModel()
+    {
+        $header = $this->_getHeader('Return-Path');
+        $header->setFieldBodyModel('foo@bar.tld');
+        $this->assertEquals('foo@bar.tld', $header->getAddress());
+    }
+
+    public function testGetBodyModel()
+    {
+        $header = $this->_getHeader('Return-Path');
+        $header->setAddress('foo@bar.tld');
+        $this->assertEquals('foo@bar.tld', $header->getFieldBodyModel());
+    }
+
+    public function testToString()
+    {
+        $header = $this->_getHeader('Return-Path');
+        $header->setAddress('chris@swiftmailer.org');
+        $this->assertEquals('Return-Path: <chris@swiftmailer.org>'."\r\n",
+            $header->toString()
+            );
+    }
+
+    private function _getHeader($name)
+    {
+        return new Swift_Mime_Headers_PathHeader($name, new Swift_Mime_Grammar());
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/Headers/UnstructuredHeaderTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/Headers/UnstructuredHeaderTest.php
new file mode 100644
index 000000000..2e1dc8cab
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/Headers/UnstructuredHeaderTest.php
@@ -0,0 +1,355 @@
+<?php
+
+class Swift_Mime_Headers_UnstructuredHeaderTest extends \SwiftMailerTestCase
+{
+    private $_charset = 'utf-8';
+
+    public function testTypeIsTextHeader()
+    {
+        $header = $this->_getHeader('Subject', $this->_getEncoder('Q', true));
+        $this->assertEquals(Swift_Mime_Header::TYPE_TEXT, $header->getFieldType());
+    }
+
+    public function testGetNameReturnsNameVerbatim()
+    {
+        $header = $this->_getHeader('Subject', $this->_getEncoder('Q', true));
+        $this->assertEquals('Subject', $header->getFieldName());
+    }
+
+    public function testGetValueReturnsValueVerbatim()
+    {
+        $header = $this->_getHeader('Subject', $this->_getEncoder('Q', true));
+        $header->setValue('Test');
+        $this->assertEquals('Test', $header->getValue());
+    }
+
+    public function testBasicStructureIsKeyValuePair()
+    {
+        /* -- RFC 2822, 2.2
+        Header fields are lines composed of a field name, followed by a colon
+        (":"), followed by a field body, and terminated by CRLF.
+        */
+        $header = $this->_getHeader('Subject', $this->_getEncoder('Q', true));
+        $header->setValue('Test');
+        $this->assertEquals('Subject: Test'."\r\n", $header->toString());
+    }
+
+    public function testLongHeadersAreFoldedAtWordBoundary()
+    {
+        /* -- RFC 2822, 2.2.3
+        Each header field is logically a single line of characters comprising
+        the field name, the colon, and the field body.  For convenience
+        however, and to deal with the 998/78 character limitations per line,
+        the field body portion of a header field can be split into a multiple
+        line representation; this is called "folding".  The general rule is
+        that wherever this standard allows for folding white space (not
+        simply WSP characters), a CRLF may be inserted before any WSP.
+        */
+
+        $value = 'The quick brown fox jumped over the fence, he was a very very '.
+            'scary brown fox with a bushy tail';
+        $header = $this->_getHeader('X-Custom-Header',
+            $this->_getEncoder('Q', true)
+            );
+        $header->setValue($value);
+        $header->setMaxLineLength(78); //A safe [RFC 2822, 2.2.3] default
+        /*
+        X-Custom-Header: The quick brown fox jumped over the fence, he was a very very
+     scary brown fox with a bushy tail
+        */
+        $this->assertEquals(
+            'X-Custom-Header: The quick brown fox jumped over the fence, he was a'.
+            ' very very'."\r\n".//Folding
+            ' scary brown fox with a bushy tail'."\r\n",
+            $header->toString(), '%s: The header should have been folded at 78th char'
+            );
+    }
+
+    public function testPrintableAsciiOnlyAppearsInHeaders()
+    {
+        /* -- RFC 2822, 2.2.
+        A field name MUST be composed of printable US-ASCII characters (i.e.,
+        characters that have values between 33 and 126, inclusive), except
+        colon.  A field body may be composed of any US-ASCII characters,
+        except for CR and LF.
+        */
+
+        $nonAsciiChar = pack('C', 0x8F);
+        $header = $this->_getHeader('X-Test', $this->_getEncoder('Q', true));
+        $header->setValue($nonAsciiChar);
+        $this->assertRegExp(
+            '~^[^:\x00-\x20\x80-\xFF]+: [^\x80-\xFF\r\n]+\r\n$~s',
+            $header->toString()
+            );
+    }
+
+    public function testEncodedWordsFollowGeneralStructure()
+    {
+        /* -- RFC 2047, 1.
+        Generally, an "encoded-word" is a sequence of printable ASCII
+        characters that begins with "=?", ends with "?=", and has two "?"s in
+        between.
+        */
+
+        $nonAsciiChar = pack('C', 0x8F);
+        $header = $this->_getHeader('X-Test', $this->_getEncoder('Q', true));
+        $header->setValue($nonAsciiChar);
+        $this->assertRegExp(
+            '~^X-Test: \=?.*?\?.*?\?.*?\?=\r\n$~s',
+            $header->toString()
+            );
+    }
+
+    public function testEncodedWordIncludesCharsetAndEncodingMethodAndText()
+    {
+        /* -- RFC 2047, 2.
+        An 'encoded-word' is defined by the following ABNF grammar.  The
+        notation of RFC 822 is used, with the exception that white space
+        characters MUST NOT appear between components of an 'encoded-word'.
+
+        encoded-word = "=?" charset "?" encoding "?" encoded-text "?="
+        */
+
+        $nonAsciiChar = pack('C', 0x8F);
+
+        $encoder = $this->_getEncoder('Q');
+        $encoder->shouldReceive('encodeString')
+                ->once()
+                ->with($nonAsciiChar, \Mockery::any(), \Mockery::any(), \Mockery::any())
+                ->andReturn('=8F');
+
+        $header = $this->_getHeader('X-Test', $encoder);
+        $header->setValue($nonAsciiChar);
+        $this->assertEquals(
+            'X-Test: =?'.$this->_charset.'?Q?=8F?='."\r\n",
+            $header->toString()
+            );
+    }
+
+    public function testEncodedWordsAreUsedToEncodedNonPrintableAscii()
+    {
+        //SPACE and TAB permitted
+        $nonPrintableBytes = array_merge(
+            range(0x00, 0x08), range(0x10, 0x19), array(0x7F)
+            );
+
+        foreach ($nonPrintableBytes as $byte) {
+            $char = pack('C', $byte);
+            $encodedChar = sprintf('=%02X', $byte);
+
+            $encoder = $this->_getEncoder('Q');
+            $encoder->shouldReceive('encodeString')
+                ->once()
+                ->with($char, \Mockery::any(), \Mockery::any(), \Mockery::any())
+                ->andReturn($encodedChar);
+
+            $header = $this->_getHeader('X-A', $encoder);
+            $header->setValue($char);
+
+            $this->assertEquals(
+                'X-A: =?'.$this->_charset.'?Q?'.$encodedChar.'?='."\r\n",
+                $header->toString(), '%s: Non-printable ascii should be encoded'
+                );
+        }
+    }
+
+    public function testEncodedWordsAreUsedToEncode8BitOctets()
+    {
+        $_8BitBytes = range(0x80, 0xFF);
+
+        foreach ($_8BitBytes as $byte) {
+            $char = pack('C', $byte);
+            $encodedChar = sprintf('=%02X', $byte);
+
+            $encoder = $this->_getEncoder('Q');
+            $encoder->shouldReceive('encodeString')
+                ->once()
+                ->with($char, \Mockery::any(), \Mockery::any(), \Mockery::any())
+                ->andReturn($encodedChar);
+
+            $header = $this->_getHeader('X-A', $encoder);
+            $header->setValue($char);
+
+            $this->assertEquals(
+                'X-A: =?'.$this->_charset.'?Q?'.$encodedChar.'?='."\r\n",
+                $header->toString(), '%s: 8-bit octets should be encoded'
+                );
+        }
+    }
+
+    public function testEncodedWordsAreNoMoreThan75CharsPerLine()
+    {
+        /* -- RFC 2047, 2.
+        An 'encoded-word' may not be more than 75 characters long, including
+        'charset', 'encoding', 'encoded-text', and delimiters.
+
+        ... SNIP ...
+
+        While there is no limit to the length of a multiple-line header
+        field, each line of a header field that contains one or more
+        'encoded-word's is limited to 76 characters.
+        */
+
+        $nonAsciiChar = pack('C', 0x8F);
+
+        $encoder = $this->_getEncoder('Q');
+        $encoder->shouldReceive('encodeString')
+                ->once()
+                ->with($nonAsciiChar, \Mockery::any(), \Mockery::any(), \Mockery::any())
+                ->andReturn('=8F');
+        //Note that multi-line headers begin with LWSP which makes 75 + 1 = 76
+        //Note also that =?utf-8?q??= is 12 chars which makes 75 - 12 = 63
+
+        //* X-Test: is 8 chars
+        $header = $this->_getHeader('X-Test', $encoder);
+        $header->setValue($nonAsciiChar);
+
+        $this->assertEquals(
+            'X-Test: =?'.$this->_charset.'?Q?=8F?='."\r\n",
+            $header->toString()
+            );
+    }
+
+    public function testFWSPIsUsedWhenEncoderReturnsMultipleLines()
+    {
+        /* --RFC 2047, 2.
+        If it is desirable to encode more text than will fit in an 'encoded-word' of
+        75 characters, multiple 'encoded-word's (separated by CRLF SPACE) may
+        be used.
+        */
+
+        //Note the Mock does NOT return 8F encoded, the 8F merely triggers
+        // encoding for the sake of testing
+        $nonAsciiChar = pack('C', 0x8F);
+
+        $encoder = $this->_getEncoder('Q');
+        $encoder->shouldReceive('encodeString')
+                ->once()
+                ->with($nonAsciiChar, 8, 63, \Mockery::any())
+                ->andReturn('line_one_here'."\r\n".'line_two_here');
+
+        //Note that multi-line headers begin with LWSP which makes 75 + 1 = 76
+        //Note also that =?utf-8?q??= is 12 chars which makes 75 - 12 = 63
+
+        //* X-Test: is 8 chars
+        $header = $this->_getHeader('X-Test', $encoder);
+        $header->setValue($nonAsciiChar);
+
+        $this->assertEquals(
+            'X-Test: =?'.$this->_charset.'?Q?line_one_here?='."\r\n".
+            ' =?'.$this->_charset.'?Q?line_two_here?='."\r\n",
+            $header->toString()
+            );
+    }
+
+    public function testAdjacentWordsAreEncodedTogether()
+    {
+        /* -- RFC 2047, 5 (1)
+     Ordinary ASCII text and 'encoded-word's may appear together in the
+     same header field.  However, an 'encoded-word' that appears in a
+     header field defined as '*text' MUST be separated from any adjacent
+     'encoded-word' or 'text' by 'linear-white-space'.
+
+     -- RFC 2047, 2.
+     IMPORTANT: 'encoded-word's are designed to be recognized as 'atom's
+     by an RFC 822 parser.  As a consequence, unencoded white space
+     characters (such as SPACE and HTAB) are FORBIDDEN within an
+     'encoded-word'.
+     */
+
+        //It would be valid to encode all words needed, however it's probably
+        // easiest to encode the longest amount required at a time
+
+        $word = 'w'.pack('C', 0x8F).'rd';
+        $text = 'start '.$word.' '.$word.' then end '.$word;
+        // 'start', ' word word', ' and end', ' word'
+
+        $encoder = $this->_getEncoder('Q');
+        $encoder->shouldReceive('encodeString')
+                ->once()
+                ->with($word.' '.$word, \Mockery::any(), \Mockery::any(), \Mockery::any())
+                ->andReturn('w=8Frd_w=8Frd');
+        $encoder->shouldReceive('encodeString')
+                ->once()
+                ->with($word, \Mockery::any(), \Mockery::any(), \Mockery::any())
+                ->andReturn('w=8Frd');
+
+        $header = $this->_getHeader('X-Test', $encoder);
+        $header->setValue($text);
+
+        $headerString = $header->toString();
+
+        $this->assertEquals('X-Test: start =?'.$this->_charset.'?Q?'.
+            'w=8Frd_w=8Frd?= then end =?'.$this->_charset.'?Q?'.
+            'w=8Frd?='."\r\n", $headerString,
+            '%s: Adjacent encoded words should appear grouped with WSP encoded'
+            );
+    }
+
+    public function testLanguageInformationAppearsInEncodedWords()
+    {
+        /* -- RFC 2231, 5.
+        5.  Language specification in Encoded Words
+
+        RFC 2047 provides support for non-US-ASCII character sets in RFC 822
+        message header comments, phrases, and any unstructured text field.
+        This is done by defining an encoded word construct which can appear
+        in any of these places.  Given that these are fields intended for
+        display, it is sometimes necessary to associate language information
+        with encoded words as well as just the character set.  This
+        specification extends the definition of an encoded word to allow the
+        inclusion of such information.  This is simply done by suffixing the
+        character set specification with an asterisk followed by the language
+        tag.  For example:
+
+                    From: =?US-ASCII*EN?Q?Keith_Moore?= <moore@cs.utk.edu>
+        */
+
+        $value = 'fo'.pack('C', 0x8F).'bar';
+
+        $encoder = $this->_getEncoder('Q');
+        $encoder->shouldReceive('encodeString')
+                ->once()
+                ->with($value, \Mockery::any(), \Mockery::any(), \Mockery::any())
+                ->andReturn('fo=8Fbar');
+
+        $header = $this->_getHeader('Subject', $encoder);
+        $header->setLanguage('en');
+        $header->setValue($value);
+        $this->assertEquals("Subject: =?utf-8*en?Q?fo=8Fbar?=\r\n",
+            $header->toString()
+            );
+    }
+
+    public function testSetBodyModel()
+    {
+        $header = $this->_getHeader('Subject', $this->_getEncoder('Q', true));
+        $header->setFieldBodyModel('test');
+        $this->assertEquals('test', $header->getValue());
+    }
+
+    public function testGetBodyModel()
+    {
+        $header = $this->_getHeader('Subject', $this->_getEncoder('Q', true));
+        $header->setValue('test');
+        $this->assertEquals('test', $header->getFieldBodyModel());
+    }
+
+    private function _getHeader($name, $encoder)
+    {
+        $header = new Swift_Mime_Headers_UnstructuredHeader($name, $encoder, new Swift_Mime_Grammar());
+        $header->setCharset($this->_charset);
+
+        return $header;
+    }
+
+    private function _getEncoder($type, $stub = false)
+    {
+        $encoder = $this->getMockery('Swift_Mime_HeaderEncoder')->shouldIgnoreMissing();
+        $encoder->shouldReceive('getName')
+                ->zeroOrMoreTimes()
+                ->andReturn($type);
+
+        return $encoder;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/MimePartTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/MimePartTest.php
new file mode 100644
index 000000000..af69088a1
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/MimePartTest.php
@@ -0,0 +1,233 @@
+<?php
+
+class Swift_Mime_MimePartTest extends Swift_Mime_AbstractMimeEntityTest
+{
+    public function testNestingLevelIsSubpart()
+    {
+        $part = $this->_createMimePart($this->_createHeaderSet(),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $this->assertEquals(
+            Swift_Mime_MimeEntity::LEVEL_ALTERNATIVE, $part->getNestingLevel()
+            );
+    }
+
+    public function testCharsetIsReturnedFromHeader()
+    {
+        /* -- RFC 2046, 4.1.2.
+        A critical parameter that may be specified in the Content-Type field
+        for "text/plain" data is the character set.  This is specified with a
+        "charset" parameter, as in:
+
+     Content-type: text/plain; charset=iso-8859-1
+
+        Unlike some other parameter values, the values of the charset
+        parameter are NOT case sensitive.  The default character set, which
+        must be assumed in the absence of a charset parameter, is US-ASCII.
+        */
+
+        $cType = $this->_createHeader('Content-Type', 'text/plain',
+            array('charset' => 'iso-8859-1')
+            );
+        $part = $this->_createMimePart($this->_createHeaderSet(array(
+            'Content-Type' => $cType, )),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $this->assertEquals('iso-8859-1', $part->getCharset());
+    }
+
+    public function testCharsetIsSetInHeader()
+    {
+        $cType = $this->_createHeader('Content-Type', 'text/plain',
+            array('charset' => 'iso-8859-1'), false
+            );
+        $cType->shouldReceive('setParameter')->once()->with('charset', 'utf-8');
+
+        $part = $this->_createMimePart($this->_createHeaderSet(array(
+            'Content-Type' => $cType, )),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $part->setCharset('utf-8');
+    }
+
+    public function testCharsetIsSetInHeaderIfPassedToSetBody()
+    {
+        $cType = $this->_createHeader('Content-Type', 'text/plain',
+            array('charset' => 'iso-8859-1'), false
+            );
+        $cType->shouldReceive('setParameter')->once()->with('charset', 'utf-8');
+
+        $part = $this->_createMimePart($this->_createHeaderSet(array(
+            'Content-Type' => $cType, )),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $part->setBody('', 'text/plian', 'utf-8');
+    }
+
+    public function testSettingCharsetNotifiesEncoder()
+    {
+        $encoder = $this->_createEncoder('quoted-printable', false);
+        $encoder->expects($this->once())
+                ->method('charsetChanged')
+                ->with('utf-8');
+
+        $part = $this->_createMimePart($this->_createHeaderSet(),
+            $encoder, $this->_createCache()
+            );
+        $part->setCharset('utf-8');
+    }
+
+    public function testSettingCharsetNotifiesHeaders()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('charsetChanged')
+                ->zeroOrMoreTimes()
+                ->with('utf-8');
+
+        $part = $this->_createMimePart($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $part->setCharset('utf-8');
+    }
+
+    public function testSettingCharsetNotifiesChildren()
+    {
+        $child = $this->_createChild(0, '', false);
+        $child->shouldReceive('charsetChanged')
+              ->once()
+              ->with('windows-874');
+
+        $part = $this->_createMimePart($this->_createHeaderSet(),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $part->setChildren(array($child));
+        $part->setCharset('windows-874');
+    }
+
+    public function testCharsetChangeUpdatesCharset()
+    {
+        $cType = $this->_createHeader('Content-Type', 'text/plain',
+            array('charset' => 'iso-8859-1'), false
+            );
+        $cType->shouldReceive('setParameter')->once()->with('charset', 'utf-8');
+
+        $part = $this->_createMimePart($this->_createHeaderSet(array(
+            'Content-Type' => $cType, )),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $part->charsetChanged('utf-8');
+    }
+
+    public function testSettingCharsetClearsCache()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('toString')
+                ->zeroOrMoreTimes()
+                ->andReturn("Content-Type: text/plain; charset=utf-8\r\n");
+
+        $cache = $this->_createCache(false);
+
+        $entity = $this->_createEntity($headers, $this->_createEncoder(),
+            $cache
+            );
+
+        $entity->setBody("blah\r\nblah!");
+        $entity->toString();
+
+        // Initialize the expectation here because we only care about what happens in setCharset()
+        $cache->shouldReceive('clearKey')
+                ->once()
+                ->with(\Mockery::any(), 'body');
+
+        $entity->setCharset('iso-2022');
+    }
+
+    public function testFormatIsReturnedFromHeader()
+    {
+        /* -- RFC 3676.
+     */
+
+        $cType = $this->_createHeader('Content-Type', 'text/plain',
+            array('format' => 'flowed')
+            );
+        $part = $this->_createMimePart($this->_createHeaderSet(array(
+            'Content-Type' => $cType, )),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $this->assertEquals('flowed', $part->getFormat());
+    }
+
+    public function testFormatIsSetInHeader()
+    {
+        $cType = $this->_createHeader('Content-Type', 'text/plain', array(), false);
+        $cType->shouldReceive('setParameter')->once()->with('format', 'fixed');
+
+        $part = $this->_createMimePart($this->_createHeaderSet(array(
+            'Content-Type' => $cType, )),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $part->setFormat('fixed');
+    }
+
+    public function testDelSpIsReturnedFromHeader()
+    {
+        /* -- RFC 3676.
+     */
+
+        $cType = $this->_createHeader('Content-Type', 'text/plain',
+            array('delsp' => 'no')
+            );
+        $part = $this->_createMimePart($this->_createHeaderSet(array(
+            'Content-Type' => $cType, )),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $this->assertSame(false, $part->getDelSp());
+    }
+
+    public function testDelSpIsSetInHeader()
+    {
+        $cType = $this->_createHeader('Content-Type', 'text/plain', array(), false);
+        $cType->shouldReceive('setParameter')->once()->with('delsp', 'yes');
+
+        $part = $this->_createMimePart($this->_createHeaderSet(array(
+            'Content-Type' => $cType, )),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $part->setDelSp(true);
+    }
+
+    public function testFluidInterface()
+    {
+        $part = $this->_createMimePart($this->_createHeaderSet(),
+            $this->_createEncoder(), $this->_createCache()
+            );
+
+        $this->assertSame($part,
+            $part
+            ->setContentType('text/plain')
+            ->setEncoder($this->_createEncoder())
+            ->setId('foo@bar')
+            ->setDescription('my description')
+            ->setMaxLineLength(998)
+            ->setBody('xx')
+            ->setBoundary('xyz')
+            ->setChildren(array())
+            ->setCharset('utf-8')
+            ->setFormat('flowed')
+            ->setDelSp(true)
+            );
+    }
+
+    // -- Private helpers
+
+    //abstract
+    protected function _createEntity($headers, $encoder, $cache)
+    {
+        return $this->_createMimePart($headers, $encoder, $cache);
+    }
+
+    protected function _createMimePart($headers, $encoder, $cache)
+    {
+        return new Swift_Mime_MimePart($headers, $encoder, $cache, new Swift_Mime_Grammar());
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderFactoryTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderFactoryTest.php
new file mode 100644
index 000000000..0d5573f89
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderFactoryTest.php
@@ -0,0 +1,168 @@
+<?php
+
+class Swift_Mime_SimpleHeaderFactoryTest extends \PHPUnit_Framework_TestCase
+{
+    private $_factory;
+
+    public function setUp()
+    {
+        $this->_factory = $this->_createFactory();
+    }
+
+    public function testMailboxHeaderIsCorrectType()
+    {
+        $header = $this->_factory->createMailboxHeader('X-Foo');
+        $this->assertInstanceof('Swift_Mime_Headers_MailboxHeader', $header);
+    }
+
+    public function testMailboxHeaderHasCorrectName()
+    {
+        $header = $this->_factory->createMailboxHeader('X-Foo');
+        $this->assertEquals('X-Foo', $header->getFieldName());
+    }
+
+    public function testMailboxHeaderHasCorrectModel()
+    {
+        $header = $this->_factory->createMailboxHeader('X-Foo',
+            array('foo@bar' => 'FooBar')
+            );
+        $this->assertEquals(array('foo@bar' => 'FooBar'), $header->getFieldBodyModel());
+    }
+
+    public function testDateHeaderHasCorrectType()
+    {
+        $header = $this->_factory->createDateHeader('X-Date');
+        $this->assertInstanceof('Swift_Mime_Headers_DateHeader', $header);
+    }
+
+    public function testDateHeaderHasCorrectName()
+    {
+        $header = $this->_factory->createDateHeader('X-Date');
+        $this->assertEquals('X-Date', $header->getFieldName());
+    }
+
+    public function testDateHeaderHasCorrectModel()
+    {
+        $header = $this->_factory->createDateHeader('X-Date', 123);
+        $this->assertEquals(123, $header->getFieldBodyModel());
+    }
+
+    public function testTextHeaderHasCorrectType()
+    {
+        $header = $this->_factory->createTextHeader('X-Foo');
+        $this->assertInstanceof('Swift_Mime_Headers_UnstructuredHeader', $header);
+    }
+
+    public function testTextHeaderHasCorrectName()
+    {
+        $header = $this->_factory->createTextHeader('X-Foo');
+        $this->assertEquals('X-Foo', $header->getFieldName());
+    }
+
+    public function testTextHeaderHasCorrectModel()
+    {
+        $header = $this->_factory->createTextHeader('X-Foo', 'bar');
+        $this->assertEquals('bar', $header->getFieldBodyModel());
+    }
+
+    public function testParameterizedHeaderHasCorrectType()
+    {
+        $header = $this->_factory->createParameterizedHeader('X-Foo');
+        $this->assertInstanceof('Swift_Mime_Headers_ParameterizedHeader', $header);
+    }
+
+    public function testParameterizedHeaderHasCorrectName()
+    {
+        $header = $this->_factory->createParameterizedHeader('X-Foo');
+        $this->assertEquals('X-Foo', $header->getFieldName());
+    }
+
+    public function testParameterizedHeaderHasCorrectModel()
+    {
+        $header = $this->_factory->createParameterizedHeader('X-Foo', 'bar');
+        $this->assertEquals('bar', $header->getFieldBodyModel());
+    }
+
+    public function testParameterizedHeaderHasCorrectParams()
+    {
+        $header = $this->_factory->createParameterizedHeader('X-Foo', 'bar',
+            array('zip' => 'button')
+            );
+        $this->assertEquals(array('zip' => 'button'), $header->getParameters());
+    }
+
+    public function testIdHeaderHasCorrectType()
+    {
+        $header = $this->_factory->createIdHeader('X-ID');
+        $this->assertInstanceof('Swift_Mime_Headers_IdentificationHeader', $header);
+    }
+
+    public function testIdHeaderHasCorrectName()
+    {
+        $header = $this->_factory->createIdHeader('X-ID');
+        $this->assertEquals('X-ID', $header->getFieldName());
+    }
+
+    public function testIdHeaderHasCorrectModel()
+    {
+        $header = $this->_factory->createIdHeader('X-ID', 'xyz@abc');
+        $this->assertEquals(array('xyz@abc'), $header->getFieldBodyModel());
+    }
+
+    public function testPathHeaderHasCorrectType()
+    {
+        $header = $this->_factory->createPathHeader('X-Path');
+        $this->assertInstanceof('Swift_Mime_Headers_PathHeader', $header);
+    }
+
+    public function testPathHeaderHasCorrectName()
+    {
+        $header = $this->_factory->createPathHeader('X-Path');
+        $this->assertEquals('X-Path', $header->getFieldName());
+    }
+
+    public function testPathHeaderHasCorrectModel()
+    {
+        $header = $this->_factory->createPathHeader('X-Path', 'foo@bar');
+        $this->assertEquals('foo@bar', $header->getFieldBodyModel());
+    }
+
+    public function testCharsetChangeNotificationNotifiesEncoders()
+    {
+        $encoder = $this->_createHeaderEncoder();
+        $encoder->expects($this->once())
+                ->method('charsetChanged')
+                ->with('utf-8');
+        $paramEncoder = $this->_createParamEncoder();
+        $paramEncoder->expects($this->once())
+                     ->method('charsetChanged')
+                     ->with('utf-8');
+
+        $factory = $this->_createFactory($encoder, $paramEncoder);
+
+        $factory->charsetChanged('utf-8');
+    }
+
+    // -- Creation methods
+
+    private function _createFactory($encoder = null, $paramEncoder = null)
+    {
+        return new Swift_Mime_SimpleHeaderFactory(
+            $encoder
+                ? $encoder : $this->_createHeaderEncoder(),
+            $paramEncoder
+                ? $paramEncoder : $this->_createParamEncoder(),
+            new Swift_Mime_Grammar()
+            );
+    }
+
+    private function _createHeaderEncoder()
+    {
+        return $this->getMock('Swift_Mime_HeaderEncoder');
+    }
+
+    private function _createParamEncoder()
+    {
+        return $this->getMock('Swift_Encoder');
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderSetTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderSetTest.php
new file mode 100644
index 000000000..94ee5c69b
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/SimpleHeaderSetTest.php
@@ -0,0 +1,739 @@
+<?php
+
+class Swift_Mime_SimpleHeaderSetTest extends \PHPUnit_Framework_TestCase
+{
+    public function testAddMailboxHeaderDelegatesToFactory()
+    {
+        $factory = $this->_createFactory();
+        $factory->expects($this->once())
+                ->method('createMailboxHeader')
+                ->with('From', array('person@domain' => 'Person'))
+                ->will($this->returnValue($this->_createHeader('From')));
+
+        $set = $this->_createSet($factory);
+        $set->addMailboxHeader('From', array('person@domain' => 'Person'));
+    }
+
+    public function testAddDateHeaderDelegatesToFactory()
+    {
+        $factory = $this->_createFactory();
+        $factory->expects($this->once())
+                ->method('createDateHeader')
+                ->with('Date', 1234)
+                ->will($this->returnValue($this->_createHeader('Date')));
+
+        $set = $this->_createSet($factory);
+        $set->addDateHeader('Date', 1234);
+    }
+
+    public function testAddTextHeaderDelegatesToFactory()
+    {
+        $factory = $this->_createFactory();
+        $factory->expects($this->once())
+                ->method('createTextHeader')
+                ->with('Subject', 'some text')
+                ->will($this->returnValue($this->_createHeader('Subject')));
+
+        $set = $this->_createSet($factory);
+        $set->addTextHeader('Subject', 'some text');
+    }
+
+    public function testAddParameterizedHeaderDelegatesToFactory()
+    {
+        $factory = $this->_createFactory();
+        $factory->expects($this->once())
+                ->method('createParameterizedHeader')
+                ->with('Content-Type', 'text/plain', array('charset' => 'utf-8'))
+                ->will($this->returnValue($this->_createHeader('Content-Type')));
+
+        $set = $this->_createSet($factory);
+        $set->addParameterizedHeader('Content-Type', 'text/plain',
+            array('charset' => 'utf-8')
+            );
+    }
+
+    public function testAddIdHeaderDelegatesToFactory()
+    {
+        $factory = $this->_createFactory();
+        $factory->expects($this->once())
+                ->method('createIdHeader')
+                ->with('Message-ID', 'some@id')
+                ->will($this->returnValue($this->_createHeader('Message-ID')));
+
+        $set = $this->_createSet($factory);
+        $set->addIdHeader('Message-ID', 'some@id');
+    }
+
+    public function testAddPathHeaderDelegatesToFactory()
+    {
+        $factory = $this->_createFactory();
+        $factory->expects($this->once())
+                ->method('createPathHeader')
+                ->with('Return-Path', 'some@path')
+                ->will($this->returnValue($this->_createHeader('Return-Path')));
+
+        $set = $this->_createSet($factory);
+        $set->addPathHeader('Return-Path', 'some@path');
+    }
+
+    public function testHasReturnsFalseWhenNoHeaders()
+    {
+        $set = $this->_createSet($this->_createFactory());
+        $this->assertFalse($set->has('Some-Header'));
+    }
+
+    public function testAddedMailboxHeaderIsSeenByHas()
+    {
+        $factory = $this->_createFactory();
+        $factory->expects($this->once())
+                ->method('createMailboxHeader')
+                ->with('From', array('person@domain' => 'Person'))
+                ->will($this->returnValue($this->_createHeader('From')));
+
+        $set = $this->_createSet($factory);
+        $set->addMailboxHeader('From', array('person@domain' => 'Person'));
+        $this->assertTrue($set->has('From'));
+    }
+
+    public function testAddedDateHeaderIsSeenByHas()
+    {
+        $factory = $this->_createFactory();
+        $factory->expects($this->once())
+                ->method('createDateHeader')
+                ->with('Date', 1234)
+                ->will($this->returnValue($this->_createHeader('Date')));
+
+        $set = $this->_createSet($factory);
+        $set->addDateHeader('Date', 1234);
+        $this->assertTrue($set->has('Date'));
+    }
+
+    public function testAddedTextHeaderIsSeenByHas()
+    {
+        $factory = $this->_createFactory();
+        $factory->expects($this->once())
+                ->method('createTextHeader')
+                ->with('Subject', 'some text')
+                ->will($this->returnValue($this->_createHeader('Subject')));
+
+        $set = $this->_createSet($factory);
+        $set->addTextHeader('Subject', 'some text');
+        $this->assertTrue($set->has('Subject'));
+    }
+
+    public function testAddedParameterizedHeaderIsSeenByHas()
+    {
+        $factory = $this->_createFactory();
+        $factory->expects($this->once())
+                ->method('createParameterizedHeader')
+                ->with('Content-Type', 'text/plain', array('charset' => 'utf-8'))
+                ->will($this->returnValue($this->_createHeader('Content-Type')));
+
+        $set = $this->_createSet($factory);
+        $set->addParameterizedHeader('Content-Type', 'text/plain',
+            array('charset' => 'utf-8')
+            );
+        $this->assertTrue($set->has('Content-Type'));
+    }
+
+    public function testAddedIdHeaderIsSeenByHas()
+    {
+        $factory = $this->_createFactory();
+        $factory->expects($this->once())
+                ->method('createIdHeader')
+                ->with('Message-ID', 'some@id')
+                ->will($this->returnValue($this->_createHeader('Message-ID')));
+
+        $set = $this->_createSet($factory);
+        $set->addIdHeader('Message-ID', 'some@id');
+        $this->assertTrue($set->has('Message-ID'));
+    }
+
+    public function testAddedPathHeaderIsSeenByHas()
+    {
+        $factory = $this->_createFactory();
+        $factory->expects($this->once())
+                ->method('createPathHeader')
+                ->with('Return-Path', 'some@path')
+                ->will($this->returnValue($this->_createHeader('Return-Path')));
+
+        $set = $this->_createSet($factory);
+        $set->addPathHeader('Return-Path', 'some@path');
+        $this->assertTrue($set->has('Return-Path'));
+    }
+
+    public function testNewlySetHeaderIsSeenByHas()
+    {
+        $factory = $this->_createFactory();
+        $header = $this->_createHeader('X-Foo', 'bar');
+        $set = $this->_createSet($factory);
+        $set->set($header);
+        $this->assertTrue($set->has('X-Foo'));
+    }
+
+    public function testHasCanAcceptOffset()
+    {
+        $factory = $this->_createFactory();
+        $factory->expects($this->once())
+                ->method('createIdHeader')
+                ->with('Message-ID', 'some@id')
+                ->will($this->returnValue($this->_createHeader('Message-ID')));
+
+        $set = $this->_createSet($factory);
+        $set->addIdHeader('Message-ID', 'some@id');
+        $this->assertTrue($set->has('Message-ID', 0));
+    }
+
+    public function testHasWithIllegalOffsetReturnsFalse()
+    {
+        $factory = $this->_createFactory();
+        $factory->expects($this->once())
+                ->method('createIdHeader')
+                ->with('Message-ID', 'some@id')
+                ->will($this->returnValue($this->_createHeader('Message-ID')));
+
+        $set = $this->_createSet($factory);
+        $set->addIdHeader('Message-ID', 'some@id');
+        $this->assertFalse($set->has('Message-ID', 1));
+    }
+
+    public function testHasCanDistinguishMultipleHeaders()
+    {
+        $factory = $this->_createFactory();
+        $factory->expects($this->at(0))
+                ->method('createIdHeader')
+                ->with('Message-ID', 'some@id')
+                ->will($this->returnValue($this->_createHeader('Message-ID')));
+        $factory->expects($this->at(1))
+                ->method('createIdHeader')
+                ->with('Message-ID', 'other@id')
+                ->will($this->returnValue($this->_createHeader('Message-ID')));
+
+        $set = $this->_createSet($factory);
+        $set->addIdHeader('Message-ID', 'some@id');
+        $set->addIdHeader('Message-ID', 'other@id');
+        $this->assertTrue($set->has('Message-ID', 1));
+    }
+
+    public function testGetWithUnspecifiedOffset()
+    {
+        $header = $this->_createHeader('Message-ID');
+        $factory = $this->_createFactory();
+        $factory->expects($this->once())
+                ->method('createIdHeader')
+                ->with('Message-ID', 'some@id')
+                ->will($this->returnValue($header));
+
+        $set = $this->_createSet($factory);
+        $set->addIdHeader('Message-ID', 'some@id');
+        $this->assertSame($header, $set->get('Message-ID'));
+    }
+
+    public function testGetWithSpeiciedOffset()
+    {
+        $header0 = $this->_createHeader('Message-ID');
+        $header1 = $this->_createHeader('Message-ID');
+        $header2 = $this->_createHeader('Message-ID');
+        $factory = $this->_createFactory();
+        $factory->expects($this->at(0))
+                ->method('createIdHeader')
+                ->with('Message-ID', 'some@id')
+                ->will($this->returnValue($header0));
+        $factory->expects($this->at(1))
+                ->method('createIdHeader')
+                ->with('Message-ID', 'other@id')
+                ->will($this->returnValue($header1));
+        $factory->expects($this->at(2))
+                ->method('createIdHeader')
+                ->with('Message-ID', 'more@id')
+                ->will($this->returnValue($header2));
+
+        $set = $this->_createSet($factory);
+        $set->addIdHeader('Message-ID', 'some@id');
+        $set->addIdHeader('Message-ID', 'other@id');
+        $set->addIdHeader('Message-ID', 'more@id');
+        $this->assertSame($header1, $set->get('Message-ID', 1));
+    }
+
+    public function testGetReturnsNullIfHeaderNotSet()
+    {
+        $set = $this->_createSet($this->_createFactory());
+        $this->assertNull($set->get('Message-ID', 99));
+    }
+
+    public function testGetAllReturnsAllHeadersMatchingName()
+    {
+        $header0 = $this->_createHeader('Message-ID');
+        $header1 = $this->_createHeader('Message-ID');
+        $header2 = $this->_createHeader('Message-ID');
+        $factory = $this->_createFactory();
+        $factory->expects($this->at(0))
+                ->method('createIdHeader')
+                ->with('Message-ID', 'some@id')
+                ->will($this->returnValue($header0));
+        $factory->expects($this->at(1))
+                ->method('createIdHeader')
+                ->with('Message-ID', 'other@id')
+                ->will($this->returnValue($header1));
+        $factory->expects($this->at(2))
+                ->method('createIdHeader')
+                ->with('Message-ID', 'more@id')
+                ->will($this->returnValue($header2));
+
+        $set = $this->_createSet($factory);
+        $set->addIdHeader('Message-ID', 'some@id');
+        $set->addIdHeader('Message-ID', 'other@id');
+        $set->addIdHeader('Message-ID', 'more@id');
+
+        $this->assertEquals(array($header0, $header1, $header2),
+            $set->getAll('Message-ID')
+            );
+    }
+
+    public function testGetAllReturnsAllHeadersIfNoArguments()
+    {
+        $header0 = $this->_createHeader('Message-ID');
+        $header1 = $this->_createHeader('Subject');
+        $header2 = $this->_createHeader('To');
+        $factory = $this->_createFactory();
+        $factory->expects($this->at(0))
+                ->method('createIdHeader')
+                ->with('Message-ID', 'some@id')
+                ->will($this->returnValue($header0));
+        $factory->expects($this->at(1))
+                ->method('createIdHeader')
+                ->with('Subject', 'thing')
+                ->will($this->returnValue($header1));
+        $factory->expects($this->at(2))
+                ->method('createIdHeader')
+                ->with('To', 'person@example.org')
+                ->will($this->returnValue($header2));
+
+        $set = $this->_createSet($factory);
+        $set->addIdHeader('Message-ID', 'some@id');
+        $set->addIdHeader('Subject', 'thing');
+        $set->addIdHeader('To', 'person@example.org');
+
+        $this->assertEquals(array($header0, $header1, $header2),
+            $set->getAll()
+            );
+    }
+
+    public function testGetAllReturnsEmptyArrayIfNoneSet()
+    {
+        $set = $this->_createSet($this->_createFactory());
+        $this->assertEquals(array(), $set->getAll('Received'));
+    }
+
+    public function testRemoveWithUnspecifiedOffset()
+    {
+        $header = $this->_createHeader('Message-ID');
+        $factory = $this->_createFactory();
+        $factory->expects($this->at(0))
+                ->method('createIdHeader')
+                ->with('Message-ID', 'some@id')
+                ->will($this->returnValue($header));
+
+        $set = $this->_createSet($factory);
+        $set->addIdHeader('Message-ID', 'some@id');
+        $set->remove('Message-ID');
+        $this->assertFalse($set->has('Message-ID'));
+    }
+
+    public function testRemoveWithSpecifiedIndexRemovesHeader()
+    {
+        $header0 = $this->_createHeader('Message-ID');
+        $header1 = $this->_createHeader('Message-ID');
+        $factory = $this->_createFactory();
+        $factory->expects($this->at(0))
+                ->method('createIdHeader')
+                ->with('Message-ID', 'some@id')
+                ->will($this->returnValue($header0));
+        $factory->expects($this->at(1))
+                ->method('createIdHeader')
+                ->with('Message-ID', 'other@id')
+                ->will($this->returnValue($header1));
+
+        $set = $this->_createSet($factory);
+        $set->addIdHeader('Message-ID', 'some@id');
+        $set->addIdHeader('Message-ID', 'other@id');
+        $set->remove('Message-ID', 0);
+        $this->assertFalse($set->has('Message-ID', 0));
+        $this->assertTrue($set->has('Message-ID', 1));
+        $this->assertTrue($set->has('Message-ID'));
+        $set->remove('Message-ID', 1);
+        $this->assertFalse($set->has('Message-ID', 1));
+        $this->assertFalse($set->has('Message-ID'));
+    }
+
+    public function testRemoveWithSpecifiedIndexLeavesOtherHeaders()
+    {
+        $header0 = $this->_createHeader('Message-ID');
+        $header1 = $this->_createHeader('Message-ID');
+        $factory = $this->_createFactory();
+        $factory->expects($this->at(0))
+                ->method('createIdHeader')
+                ->with('Message-ID', 'some@id')
+                ->will($this->returnValue($header0));
+        $factory->expects($this->at(1))
+                ->method('createIdHeader')
+                ->with('Message-ID', 'other@id')
+                ->will($this->returnValue($header1));
+
+        $set = $this->_createSet($factory);
+        $set->addIdHeader('Message-ID', 'some@id');
+        $set->addIdHeader('Message-ID', 'other@id');
+        $set->remove('Message-ID', 1);
+        $this->assertTrue($set->has('Message-ID', 0));
+    }
+
+    public function testRemoveWithInvalidOffsetDoesNothing()
+    {
+        $header = $this->_createHeader('Message-ID');
+        $factory = $this->_createFactory();
+        $factory->expects($this->at(0))
+                ->method('createIdHeader')
+                ->with('Message-ID', 'some@id')
+                ->will($this->returnValue($header));
+
+        $set = $this->_createSet($factory);
+        $set->addIdHeader('Message-ID', 'some@id');
+        $set->remove('Message-ID', 50);
+        $this->assertTrue($set->has('Message-ID'));
+    }
+
+    public function testRemoveAllRemovesAllHeadersWithName()
+    {
+        $header0 = $this->_createHeader('Message-ID');
+        $header1 = $this->_createHeader('Message-ID');
+        $factory = $this->_createFactory();
+        $factory->expects($this->at(0))
+                ->method('createIdHeader')
+                ->with('Message-ID', 'some@id')
+                ->will($this->returnValue($header0));
+        $factory->expects($this->at(1))
+                ->method('createIdHeader')
+                ->with('Message-ID', 'other@id')
+                ->will($this->returnValue($header1));
+
+        $set = $this->_createSet($factory);
+        $set->addIdHeader('Message-ID', 'some@id');
+        $set->addIdHeader('Message-ID', 'other@id');
+        $set->removeAll('Message-ID');
+        $this->assertFalse($set->has('Message-ID', 0));
+        $this->assertFalse($set->has('Message-ID', 1));
+    }
+
+    public function testHasIsNotCaseSensitive()
+    {
+        $header = $this->_createHeader('Message-ID');
+        $factory = $this->_createFactory();
+        $factory->expects($this->at(0))
+                ->method('createIdHeader')
+                ->with('Message-ID', 'some@id')
+                ->will($this->returnValue($header));
+
+        $set = $this->_createSet($factory);
+        $set->addIdHeader('Message-ID', 'some@id');
+        $this->assertTrue($set->has('message-id'));
+    }
+
+    public function testGetIsNotCaseSensitive()
+    {
+        $header = $this->_createHeader('Message-ID');
+        $factory = $this->_createFactory();
+        $factory->expects($this->at(0))
+                ->method('createIdHeader')
+                ->with('Message-ID', 'some@id')
+                ->will($this->returnValue($header));
+
+        $set = $this->_createSet($factory);
+        $set->addIdHeader('Message-ID', 'some@id');
+        $this->assertSame($header, $set->get('message-id'));
+    }
+
+    public function testGetAllIsNotCaseSensitive()
+    {
+        $header = $this->_createHeader('Message-ID');
+        $factory = $this->_createFactory();
+        $factory->expects($this->at(0))
+                ->method('createIdHeader')
+                ->with('Message-ID', 'some@id')
+                ->will($this->returnValue($header));
+
+        $set = $this->_createSet($factory);
+        $set->addIdHeader('Message-ID', 'some@id');
+        $this->assertEquals(array($header), $set->getAll('message-id'));
+    }
+
+    public function testRemoveIsNotCaseSensitive()
+    {
+        $header = $this->_createHeader('Message-ID');
+        $factory = $this->_createFactory();
+        $factory->expects($this->at(0))
+                ->method('createIdHeader')
+                ->with('Message-ID', 'some@id')
+                ->will($this->returnValue($header));
+
+        $set = $this->_createSet($factory);
+        $set->addIdHeader('Message-ID', 'some@id');
+        $set->remove('message-id');
+        $this->assertFalse($set->has('Message-ID'));
+    }
+
+    public function testRemoveAllIsNotCaseSensitive()
+    {
+        $header = $this->_createHeader('Message-ID');
+        $factory = $this->_createFactory();
+        $factory->expects($this->at(0))
+                ->method('createIdHeader')
+                ->with('Message-ID', 'some@id')
+                ->will($this->returnValue($header));
+
+        $set = $this->_createSet($factory);
+        $set->addIdHeader('Message-ID', 'some@id');
+        $set->removeAll('message-id');
+        $this->assertFalse($set->has('Message-ID'));
+    }
+
+    public function testNewInstance()
+    {
+        $set = $this->_createSet($this->_createFactory());
+        $instance = $set->newInstance();
+        $this->assertInstanceof('Swift_Mime_HeaderSet', $instance);
+    }
+
+    public function testToStringJoinsHeadersTogether()
+    {
+        $factory = $this->_createFactory();
+        $factory->expects($this->at(0))
+                ->method('createTextHeader')
+                ->with('Foo', 'bar')
+                ->will($this->returnValue($this->_createHeader('Foo', 'bar')));
+        $factory->expects($this->at(1))
+                ->method('createTextHeader')
+                ->with('Zip', 'buttons')
+                ->will($this->returnValue($this->_createHeader('Zip', 'buttons')));
+
+        $set = $this->_createSet($factory);
+        $set->addTextHeader('Foo', 'bar');
+        $set->addTextHeader('Zip', 'buttons');
+        $this->assertEquals(
+            "Foo: bar\r\n".
+            "Zip: buttons\r\n",
+            $set->toString()
+            );
+    }
+
+    public function testHeadersWithoutBodiesAreNotDisplayed()
+    {
+        $factory = $this->_createFactory();
+        $factory->expects($this->at(0))
+                ->method('createTextHeader')
+                ->with('Foo', 'bar')
+                ->will($this->returnValue($this->_createHeader('Foo', 'bar')));
+        $factory->expects($this->at(1))
+                ->method('createTextHeader')
+                ->with('Zip', '')
+                ->will($this->returnValue($this->_createHeader('Zip', '')));
+
+        $set = $this->_createSet($factory);
+        $set->addTextHeader('Foo', 'bar');
+        $set->addTextHeader('Zip', '');
+        $this->assertEquals(
+            "Foo: bar\r\n",
+            $set->toString()
+            );
+    }
+
+    public function testHeadersWithoutBodiesCanBeForcedToDisplay()
+    {
+        $factory = $this->_createFactory();
+        $factory->expects($this->at(0))
+                ->method('createTextHeader')
+                ->with('Foo', '')
+                ->will($this->returnValue($this->_createHeader('Foo', '')));
+        $factory->expects($this->at(1))
+                ->method('createTextHeader')
+                ->with('Zip', '')
+                ->will($this->returnValue($this->_createHeader('Zip', '')));
+
+        $set = $this->_createSet($factory);
+        $set->addTextHeader('Foo', '');
+        $set->addTextHeader('Zip', '');
+        $set->setAlwaysDisplayed(array('Foo', 'Zip'));
+        $this->assertEquals(
+            "Foo: \r\n".
+            "Zip: \r\n",
+            $set->toString()
+            );
+    }
+
+    public function testHeaderSequencesCanBeSpecified()
+    {
+        $factory = $this->_createFactory();
+        $factory->expects($this->at(0))
+                ->method('createTextHeader')
+                ->with('Third', 'three')
+                ->will($this->returnValue($this->_createHeader('Third', 'three')));
+        $factory->expects($this->at(1))
+                ->method('createTextHeader')
+                ->with('First', 'one')
+                ->will($this->returnValue($this->_createHeader('First', 'one')));
+        $factory->expects($this->at(2))
+                ->method('createTextHeader')
+                ->with('Second', 'two')
+                ->will($this->returnValue($this->_createHeader('Second', 'two')));
+
+        $set = $this->_createSet($factory);
+        $set->addTextHeader('Third', 'three');
+        $set->addTextHeader('First', 'one');
+        $set->addTextHeader('Second', 'two');
+
+        $set->defineOrdering(array('First', 'Second', 'Third'));
+
+        $this->assertEquals(
+            "First: one\r\n".
+            "Second: two\r\n".
+            "Third: three\r\n",
+            $set->toString()
+            );
+    }
+
+    public function testUnsortedHeadersAppearAtEnd()
+    {
+        $factory = $this->_createFactory();
+        $factory->expects($this->at(0))
+                ->method('createTextHeader')
+                ->with('Fourth', 'four')
+                ->will($this->returnValue($this->_createHeader('Fourth', 'four')));
+        $factory->expects($this->at(1))
+                ->method('createTextHeader')
+                ->with('Fifth', 'five')
+                ->will($this->returnValue($this->_createHeader('Fifth', 'five')));
+        $factory->expects($this->at(2))
+                ->method('createTextHeader')
+                ->with('Third', 'three')
+                ->will($this->returnValue($this->_createHeader('Third', 'three')));
+        $factory->expects($this->at(3))
+                ->method('createTextHeader')
+                ->with('First', 'one')
+                ->will($this->returnValue($this->_createHeader('First', 'one')));
+        $factory->expects($this->at(4))
+                ->method('createTextHeader')
+                ->with('Second', 'two')
+                ->will($this->returnValue($this->_createHeader('Second', 'two')));
+
+        $set = $this->_createSet($factory);
+        $set->addTextHeader('Fourth', 'four');
+        $set->addTextHeader('Fifth', 'five');
+        $set->addTextHeader('Third', 'three');
+        $set->addTextHeader('First', 'one');
+        $set->addTextHeader('Second', 'two');
+
+        $set->defineOrdering(array('First', 'Second', 'Third'));
+
+        $this->assertEquals(
+            "First: one\r\n".
+            "Second: two\r\n".
+            "Third: three\r\n".
+            "Fourth: four\r\n".
+            "Fifth: five\r\n",
+            $set->toString()
+            );
+    }
+
+    public function testSettingCharsetNotifiesAlreadyExistingHeaders()
+    {
+        $subject = $this->_createHeader('Subject', 'some text');
+        $xHeader = $this->_createHeader('X-Header', 'some text');
+        $factory = $this->_createFactory();
+        $factory->expects($this->at(0))
+                ->method('createTextHeader')
+                ->with('Subject', 'some text')
+                ->will($this->returnValue($subject));
+        $factory->expects($this->at(1))
+                ->method('createTextHeader')
+                ->with('X-Header', 'some text')
+                ->will($this->returnValue($xHeader));
+        $subject->expects($this->once())
+                ->method('setCharset')
+                ->with('utf-8');
+        $xHeader->expects($this->once())
+                ->method('setCharset')
+                ->with('utf-8');
+
+        $set = $this->_createSet($factory);
+        $set->addTextHeader('Subject', 'some text');
+        $set->addTextHeader('X-Header', 'some text');
+
+        $set->setCharset('utf-8');
+    }
+
+    public function testCharsetChangeNotifiesAlreadyExistingHeaders()
+    {
+        $subject = $this->_createHeader('Subject', 'some text');
+        $xHeader = $this->_createHeader('X-Header', 'some text');
+        $factory = $this->_createFactory();
+        $factory->expects($this->at(0))
+                ->method('createTextHeader')
+                ->with('Subject', 'some text')
+                ->will($this->returnValue($subject));
+        $factory->expects($this->at(1))
+                ->method('createTextHeader')
+                ->with('X-Header', 'some text')
+                ->will($this->returnValue($xHeader));
+        $subject->expects($this->once())
+                ->method('setCharset')
+                ->with('utf-8');
+        $xHeader->expects($this->once())
+                ->method('setCharset')
+                ->with('utf-8');
+
+        $set = $this->_createSet($factory);
+        $set->addTextHeader('Subject', 'some text');
+        $set->addTextHeader('X-Header', 'some text');
+
+        $set->charsetChanged('utf-8');
+    }
+
+    public function testCharsetChangeNotifiesFactory()
+    {
+        $factory = $this->_createFactory();
+        $factory->expects($this->once())
+                ->method('charsetChanged')
+                ->with('utf-8');
+
+        $set = $this->_createSet($factory);
+
+        $set->setCharset('utf-8');
+    }
+
+    // -- Creation methods
+
+    private function _createSet($factory)
+    {
+        return new Swift_Mime_SimpleHeaderSet($factory);
+    }
+
+    private function _createFactory()
+    {
+        return $this->getMock('Swift_Mime_HeaderFactory');
+    }
+
+    private function _createHeader($name, $body = '')
+    {
+        $header = $this->getMock('Swift_Mime_Header');
+        $header->expects($this->any())
+               ->method('getFieldName')
+               ->will($this->returnValue($name));
+        $header->expects($this->any())
+               ->method('toString')
+               ->will($this->returnValue(sprintf("%s: %s\r\n", $name, $body)));
+        $header->expects($this->any())
+               ->method('getFieldBody')
+               ->will($this->returnValue($body));
+
+        return $header;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/SimpleMessageTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/SimpleMessageTest.php
new file mode 100644
index 000000000..a2cbbcab2
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/SimpleMessageTest.php
@@ -0,0 +1,829 @@
+<?php
+
+class Swift_Mime_SimpleMessageTest extends Swift_Mime_MimePartTest
+{
+    public function testNestingLevelIsSubpart()
+    {
+        //Overridden
+    }
+
+    public function testNestingLevelIsTop()
+    {
+        $message = $this->_createMessage($this->_createHeaderSet(),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $this->assertEquals(
+            Swift_Mime_MimeEntity::LEVEL_TOP, $message->getNestingLevel()
+            );
+    }
+
+    public function testDateIsReturnedFromHeader()
+    {
+        $date = $this->_createHeader('Date', 123);
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('Date' => $date)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $this->assertEquals(123, $message->getDate());
+    }
+
+    public function testDateIsSetInHeader()
+    {
+        $date = $this->_createHeader('Date', 123, array(), false);
+        $date->shouldReceive('setFieldBodyModel')
+             ->once()
+             ->with(1234);
+        $date->shouldReceive('setFieldBodyModel')
+             ->zeroOrMoreTimes();
+
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('Date' => $date)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $message->setDate(1234);
+    }
+
+    public function testDateHeaderIsCreatedIfNonePresent()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addDateHeader')
+                ->once()
+                ->with('Date', 1234);
+        $headers->shouldReceive('addDateHeader')
+                ->zeroOrMoreTimes();
+
+        $message = $this->_createMessage($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $message->setDate(1234);
+    }
+
+    public function testDateHeaderIsAddedDuringConstruction()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addDateHeader')
+                ->once()
+                ->with('Date', '/^[0-9]+$/D');
+
+        $message = $this->_createMessage($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+    }
+
+    public function testIdIsReturnedFromHeader()
+    {
+        /* -- RFC 2045, 7.
+        In constructing a high-level user agent, it may be desirable to allow
+        one body to make reference to another.  Accordingly, bodies may be
+        labelled using the "Content-ID" header field, which is syntactically
+        identical to the "Message-ID" header field
+        */
+
+        $messageId = $this->_createHeader('Message-ID', 'a@b');
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('Message-ID' => $messageId)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $this->assertEquals('a@b', $message->getId());
+    }
+
+    public function testIdIsSetInHeader()
+    {
+        $messageId = $this->_createHeader('Message-ID', 'a@b', array(), false);
+        $messageId->shouldReceive('setFieldBodyModel')
+                  ->once()
+                  ->with('x@y');
+        $messageId->shouldReceive('setFieldBodyModel')
+                  ->zeroOrMoreTimes();
+
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('Message-ID' => $messageId)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $message->setId('x@y');
+    }
+
+    public function testIdIsAutoGenerated()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addIdHeader')
+                ->once()
+                ->with('Message-ID', '/^.*?@.*?$/D');
+
+        $message = $this->_createMessage($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+    }
+
+    public function testSubjectIsReturnedFromHeader()
+    {
+        /* -- RFC 2822, 3.6.5.
+     */
+
+        $subject = $this->_createHeader('Subject', 'example subject');
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('Subject' => $subject)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $this->assertEquals('example subject', $message->getSubject());
+    }
+
+    public function testSubjectIsSetInHeader()
+    {
+        $subject = $this->_createHeader('Subject', '', array(), false);
+        $subject->shouldReceive('setFieldBodyModel')
+                ->once()
+                ->with('foo');
+
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('Subject' => $subject)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $message->setSubject('foo');
+    }
+
+    public function testSubjectHeaderIsCreatedIfNotPresent()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addTextHeader')
+                ->once()
+                ->with('Subject', 'example subject');
+        $headers->shouldReceive('addTextHeader')
+                ->zeroOrMoreTimes();
+
+        $message = $this->_createMessage($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $message->setSubject('example subject');
+    }
+
+    public function testReturnPathIsReturnedFromHeader()
+    {
+        /* -- RFC 2822, 3.6.7.
+     */
+
+        $path = $this->_createHeader('Return-Path', 'bounces@domain');
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('Return-Path' => $path)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $this->assertEquals('bounces@domain', $message->getReturnPath());
+    }
+
+    public function testReturnPathIsSetInHeader()
+    {
+        $path = $this->_createHeader('Return-Path', '', array(), false);
+        $path->shouldReceive('setFieldBodyModel')
+             ->once()
+             ->with('bounces@domain');
+
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('Return-Path' => $path)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $message->setReturnPath('bounces@domain');
+    }
+
+    public function testReturnPathHeaderIsAddedIfNoneSet()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addPathHeader')
+                ->once()
+                ->with('Return-Path', 'bounces@domain');
+
+        $message = $this->_createMessage($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $message->setReturnPath('bounces@domain');
+    }
+
+    public function testSenderIsReturnedFromHeader()
+    {
+        /* -- RFC 2822, 3.6.2.
+     */
+
+        $sender = $this->_createHeader('Sender', array('sender@domain' => 'Name'));
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('Sender' => $sender)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $this->assertEquals(array('sender@domain' => 'Name'), $message->getSender());
+    }
+
+    public function testSenderIsSetInHeader()
+    {
+        $sender = $this->_createHeader('Sender', array('sender@domain' => 'Name'),
+            array(), false
+            );
+        $sender->shouldReceive('setFieldBodyModel')
+               ->once()
+               ->with(array('other@domain' => 'Other'));
+
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('Sender' => $sender)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $message->setSender(array('other@domain' => 'Other'));
+    }
+
+    public function testSenderHeaderIsAddedIfNoneSet()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addMailboxHeader')
+                ->once()
+                ->with('Sender', (array) 'sender@domain');
+        $headers->shouldReceive('addMailboxHeader')
+                ->zeroOrMoreTimes();
+
+        $message = $this->_createMessage($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $message->setSender('sender@domain');
+    }
+
+    public function testNameCanBeUsedInSenderHeader()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addMailboxHeader')
+                ->once()
+                ->with('Sender', array('sender@domain' => 'Name'));
+        $headers->shouldReceive('addMailboxHeader')
+                ->zeroOrMoreTimes();
+
+        $message = $this->_createMessage($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $message->setSender('sender@domain', 'Name');
+    }
+
+    public function testFromIsReturnedFromHeader()
+    {
+        /* -- RFC 2822, 3.6.2.
+     */
+
+        $from = $this->_createHeader('From', array('from@domain' => 'Name'));
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('From' => $from)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $this->assertEquals(array('from@domain' => 'Name'), $message->getFrom());
+    }
+
+    public function testFromIsSetInHeader()
+    {
+        $from = $this->_createHeader('From', array('from@domain' => 'Name'),
+            array(), false
+            );
+        $from->shouldReceive('setFieldBodyModel')
+             ->once()
+             ->with(array('other@domain' => 'Other'));
+
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('From' => $from)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $message->setFrom(array('other@domain' => 'Other'));
+    }
+
+    public function testFromIsAddedToHeadersDuringAddFrom()
+    {
+        $from = $this->_createHeader('From', array('from@domain' => 'Name'),
+            array(), false
+            );
+        $from->shouldReceive('setFieldBodyModel')
+             ->once()
+             ->with(array('from@domain' => 'Name', 'other@domain' => 'Other'));
+
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('From' => $from)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $message->addFrom('other@domain', 'Other');
+    }
+
+    public function testFromHeaderIsAddedIfNoneSet()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addMailboxHeader')
+                ->once()
+                ->with('From', (array) 'from@domain');
+        $headers->shouldReceive('addMailboxHeader')
+                ->zeroOrMoreTimes();
+
+        $message = $this->_createMessage($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $message->setFrom('from@domain');
+    }
+
+    public function testPersonalNameCanBeUsedInFromAddress()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addMailboxHeader')
+                ->once()
+                ->with('From', array('from@domain' => 'Name'));
+        $headers->shouldReceive('addMailboxHeader')
+                ->zeroOrMoreTimes();
+
+        $message = $this->_createMessage($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $message->setFrom('from@domain', 'Name');
+    }
+
+    public function testReplyToIsReturnedFromHeader()
+    {
+        /* -- RFC 2822, 3.6.2.
+     */
+
+        $reply = $this->_createHeader('Reply-To', array('reply@domain' => 'Name'));
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('Reply-To' => $reply)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $this->assertEquals(array('reply@domain' => 'Name'), $message->getReplyTo());
+    }
+
+    public function testReplyToIsSetInHeader()
+    {
+        $reply = $this->_createHeader('Reply-To', array('reply@domain' => 'Name'),
+            array(), false
+            );
+        $reply->shouldReceive('setFieldBodyModel')
+              ->once()
+              ->with(array('other@domain' => 'Other'));
+
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('Reply-To' => $reply)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $message->setReplyTo(array('other@domain' => 'Other'));
+    }
+
+    public function testReplyToIsAddedToHeadersDuringAddReplyTo()
+    {
+        $replyTo = $this->_createHeader('Reply-To', array('from@domain' => 'Name'),
+            array(), false
+            );
+        $replyTo->shouldReceive('setFieldBodyModel')
+                ->once()
+                ->with(array('from@domain' => 'Name', 'other@domain' => 'Other'));
+
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('Reply-To' => $replyTo)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $message->addReplyTo('other@domain', 'Other');
+    }
+
+    public function testReplyToHeaderIsAddedIfNoneSet()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addMailboxHeader')
+                ->once()
+                ->with('Reply-To', (array) 'reply@domain');
+        $headers->shouldReceive('addMailboxHeader')
+                ->zeroOrMoreTimes();
+
+        $message = $this->_createMessage($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $message->setReplyTo('reply@domain');
+    }
+
+    public function testNameCanBeUsedInReplyTo()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addMailboxHeader')
+                ->once()
+                ->with('Reply-To', array('reply@domain' => 'Name'));
+        $headers->shouldReceive('addMailboxHeader')
+                ->zeroOrMoreTimes();
+
+        $message = $this->_createMessage($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $message->setReplyTo('reply@domain', 'Name');
+    }
+
+    public function testToIsReturnedFromHeader()
+    {
+        /* -- RFC 2822, 3.6.3.
+     */
+
+        $to = $this->_createHeader('To', array('to@domain' => 'Name'));
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('To' => $to)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $this->assertEquals(array('to@domain' => 'Name'), $message->getTo());
+    }
+
+    public function testToIsSetInHeader()
+    {
+        $to = $this->_createHeader('To', array('to@domain' => 'Name'),
+            array(), false
+            );
+        $to->shouldReceive('setFieldBodyModel')
+           ->once()
+           ->with(array('other@domain' => 'Other'));
+
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('To' => $to)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $message->setTo(array('other@domain' => 'Other'));
+    }
+
+    public function testToIsAddedToHeadersDuringAddTo()
+    {
+        $to = $this->_createHeader('To', array('from@domain' => 'Name'),
+            array(), false
+            );
+        $to->shouldReceive('setFieldBodyModel')
+           ->once()
+           ->with(array('from@domain' => 'Name', 'other@domain' => 'Other'));
+
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('To' => $to)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $message->addTo('other@domain', 'Other');
+    }
+
+    public function testToHeaderIsAddedIfNoneSet()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addMailboxHeader')
+                ->once()
+                ->with('To', (array) 'to@domain');
+        $headers->shouldReceive('addMailboxHeader')
+                ->zeroOrMoreTimes();
+
+        $message = $this->_createMessage($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $message->setTo('to@domain');
+    }
+
+    public function testNameCanBeUsedInToHeader()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addMailboxHeader')
+                ->once()
+                ->with('To', array('to@domain' => 'Name'));
+        $headers->shouldReceive('addMailboxHeader')
+                ->zeroOrMoreTimes();
+
+        $message = $this->_createMessage($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $message->setTo('to@domain', 'Name');
+    }
+
+    public function testCcIsReturnedFromHeader()
+    {
+        /* -- RFC 2822, 3.6.3.
+     */
+
+        $cc = $this->_createHeader('Cc', array('cc@domain' => 'Name'));
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('Cc' => $cc)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $this->assertEquals(array('cc@domain' => 'Name'), $message->getCc());
+    }
+
+    public function testCcIsSetInHeader()
+    {
+        $cc = $this->_createHeader('Cc', array('cc@domain' => 'Name'),
+            array(), false
+            );
+        $cc->shouldReceive('setFieldBodyModel')
+           ->once()
+           ->with(array('other@domain' => 'Other'));
+
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('Cc' => $cc)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $message->setCc(array('other@domain' => 'Other'));
+    }
+
+    public function testCcIsAddedToHeadersDuringAddCc()
+    {
+        $cc = $this->_createHeader('Cc', array('from@domain' => 'Name'),
+            array(), false
+            );
+        $cc->shouldReceive('setFieldBodyModel')
+           ->once()
+           ->with(array('from@domain' => 'Name', 'other@domain' => 'Other'));
+
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('Cc' => $cc)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $message->addCc('other@domain', 'Other');
+    }
+
+    public function testCcHeaderIsAddedIfNoneSet()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addMailboxHeader')
+                ->once()
+                ->with('Cc', (array) 'cc@domain');
+        $headers->shouldReceive('addMailboxHeader')
+                ->zeroOrMoreTimes();
+
+        $message = $this->_createMessage($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $message->setCc('cc@domain');
+    }
+
+    public function testNameCanBeUsedInCcHeader()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addMailboxHeader')
+                ->once()
+                ->with('Cc', array('cc@domain' => 'Name'));
+        $headers->shouldReceive('addMailboxHeader')
+                ->zeroOrMoreTimes();
+
+        $message = $this->_createMessage($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $message->setCc('cc@domain', 'Name');
+    }
+
+    public function testBccIsReturnedFromHeader()
+    {
+        /* -- RFC 2822, 3.6.3.
+     */
+
+        $bcc = $this->_createHeader('Bcc', array('bcc@domain' => 'Name'));
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('Bcc' => $bcc)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $this->assertEquals(array('bcc@domain' => 'Name'), $message->getBcc());
+    }
+
+    public function testBccIsSetInHeader()
+    {
+        $bcc = $this->_createHeader('Bcc', array('bcc@domain' => 'Name'),
+            array(), false
+            );
+        $bcc->shouldReceive('setFieldBodyModel')
+            ->once()
+            ->with(array('other@domain' => 'Other'));
+
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('Bcc' => $bcc)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $message->setBcc(array('other@domain' => 'Other'));
+    }
+
+    public function testBccIsAddedToHeadersDuringAddBcc()
+    {
+        $bcc = $this->_createHeader('Bcc', array('from@domain' => 'Name'),
+            array(), false
+            );
+        $bcc->shouldReceive('setFieldBodyModel')
+            ->once()
+            ->with(array('from@domain' => 'Name', 'other@domain' => 'Other'));
+
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('Bcc' => $bcc)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $message->addBcc('other@domain', 'Other');
+    }
+
+    public function testBccHeaderIsAddedIfNoneSet()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addMailboxHeader')
+                ->once()
+                ->with('Bcc', (array) 'bcc@domain');
+        $headers->shouldReceive('addMailboxHeader')
+                ->zeroOrMoreTimes();
+
+        $message = $this->_createMessage($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $message->setBcc('bcc@domain');
+    }
+
+    public function testNameCanBeUsedInBcc()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addMailboxHeader')
+                ->once()
+                ->with('Bcc', array('bcc@domain' => 'Name'));
+        $headers->shouldReceive('addMailboxHeader')
+                ->zeroOrMoreTimes();
+
+        $message = $this->_createMessage($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $message->setBcc('bcc@domain', 'Name');
+    }
+
+    public function testPriorityIsReadFromHeader()
+    {
+        $prio = $this->_createHeader('X-Priority', '2 (High)');
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('X-Priority' => $prio)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $this->assertEquals(2, $message->getPriority());
+    }
+
+    public function testPriorityIsSetInHeader()
+    {
+        $prio = $this->_createHeader('X-Priority', '2 (High)', array(), false);
+        $prio->shouldReceive('setFieldBodyModel')
+             ->once()
+             ->with('5 (Lowest)');
+
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('X-Priority' => $prio)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $message->setPriority(5);
+    }
+
+    public function testPriorityHeaderIsAddedIfNoneSet()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addTextHeader')
+                ->once()
+                ->with('X-Priority', '4 (Low)');
+        $headers->shouldReceive('addTextHeader')
+                ->zeroOrMoreTimes();
+
+        $message = $this->_createMessage($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $message->setPriority(4);
+    }
+
+    public function testReadReceiptAddressReadFromHeader()
+    {
+        $rcpt = $this->_createHeader('Disposition-Notification-To',
+            array('chris@swiftmailer.org' => 'Chris')
+            );
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('Disposition-Notification-To' => $rcpt)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $this->assertEquals(array('chris@swiftmailer.org' => 'Chris'),
+            $message->getReadReceiptTo()
+            );
+    }
+
+    public function testReadReceiptIsSetInHeader()
+    {
+        $rcpt = $this->_createHeader('Disposition-Notification-To', array(), array(), false);
+        $rcpt->shouldReceive('setFieldBodyModel')
+             ->once()
+             ->with('mark@swiftmailer.org');
+
+        $message = $this->_createMessage(
+            $this->_createHeaderSet(array('Disposition-Notification-To' => $rcpt)),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $message->setReadReceiptTo('mark@swiftmailer.org');
+    }
+
+    public function testReadReceiptHeaderIsAddedIfNoneSet()
+    {
+        $headers = $this->_createHeaderSet(array(), false);
+        $headers->shouldReceive('addMailboxHeader')
+                ->once()
+                ->with('Disposition-Notification-To', 'mark@swiftmailer.org');
+        $headers->shouldReceive('addMailboxHeader')
+                ->zeroOrMoreTimes();
+
+        $message = $this->_createMessage($headers, $this->_createEncoder(),
+            $this->_createCache()
+            );
+        $message->setReadReceiptTo('mark@swiftmailer.org');
+    }
+
+    public function testChildrenCanBeAttached()
+    {
+        $child1 = $this->_createChild();
+        $child2 = $this->_createChild();
+
+        $message = $this->_createMessage($this->_createHeaderSet(),
+            $this->_createEncoder(), $this->_createCache()
+            );
+
+        $message->attach($child1);
+        $message->attach($child2);
+
+        $this->assertEquals(array($child1, $child2), $message->getChildren());
+    }
+
+    public function testChildrenCanBeDetached()
+    {
+        $child1 = $this->_createChild();
+        $child2 = $this->_createChild();
+
+        $message = $this->_createMessage($this->_createHeaderSet(),
+            $this->_createEncoder(), $this->_createCache()
+            );
+
+        $message->attach($child1);
+        $message->attach($child2);
+
+        $message->detach($child1);
+
+        $this->assertEquals(array($child2), $message->getChildren());
+    }
+
+    public function testEmbedAttachesChild()
+    {
+        $child = $this->_createChild();
+
+        $message = $this->_createMessage($this->_createHeaderSet(),
+            $this->_createEncoder(), $this->_createCache()
+            );
+
+        $message->embed($child);
+
+        $this->assertEquals(array($child), $message->getChildren());
+    }
+
+    public function testEmbedReturnsValidCid()
+    {
+        $child = $this->_createChild(Swift_Mime_MimeEntity::LEVEL_RELATED, '',
+            false
+            );
+        $child->shouldReceive('getId')
+              ->zeroOrMoreTimes()
+              ->andReturn('foo@bar');
+
+        $message = $this->_createMessage($this->_createHeaderSet(),
+            $this->_createEncoder(), $this->_createCache()
+            );
+
+        $this->assertEquals('cid:foo@bar', $message->embed($child));
+    }
+
+    public function testFluidInterface()
+    {
+        $child = $this->_createChild();
+        $message = $this->_createMessage($this->_createHeaderSet(),
+            $this->_createEncoder(), $this->_createCache()
+            );
+        $this->assertSame($message,
+            $message
+            ->setContentType('text/plain')
+            ->setEncoder($this->_createEncoder())
+            ->setId('foo@bar')
+            ->setDescription('my description')
+            ->setMaxLineLength(998)
+            ->setBody('xx')
+            ->setBoundary('xyz')
+            ->setChildren(array())
+            ->setCharset('iso-8859-1')
+            ->setFormat('flowed')
+            ->setDelSp(false)
+            ->setSubject('subj')
+            ->setDate(123)
+            ->setReturnPath('foo@bar')
+            ->setSender('foo@bar')
+            ->setFrom(array('x@y' => 'XY'))
+            ->setReplyTo(array('ab@cd' => 'ABCD'))
+            ->setTo(array('chris@site.tld', 'mark@site.tld'))
+            ->setCc('john@somewhere.tld')
+            ->setBcc(array('one@site', 'two@site' => 'Two'))
+            ->setPriority(4)
+            ->setReadReceiptTo('a@b')
+            ->attach($child)
+            ->detach($child)
+            );
+    }
+
+    // -- Private helpers
+
+    //abstract
+    protected function _createEntity($headers, $encoder, $cache)
+    {
+        return $this->_createMessage($headers, $encoder, $cache);
+    }
+
+    protected function _createMimePart($headers, $encoder, $cache)
+    {
+        return $this->_createMessage($headers, $encoder, $cache);
+    }
+
+    private function _createMessage($headers, $encoder, $cache)
+    {
+        return new Swift_Mime_SimpleMessage($headers, $encoder, $cache, new Swift_Mime_Grammar());
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/SimpleMimeEntityTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/SimpleMimeEntityTest.php
new file mode 100644
index 000000000..b54d7f874
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Mime/SimpleMimeEntityTest.php
@@ -0,0 +1,11 @@
+<?php
+
+class Swift_Mime_SimpleMimeEntityTest extends Swift_Mime_AbstractMimeEntityTest
+{
+    // -- Private helpers
+
+    protected function _createEntity($headerFactory, $encoder, $cache)
+    {
+        return new Swift_Mime_SimpleMimeEntity($headerFactory, $encoder, $cache, new Swift_Mime_Grammar());
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/AntiFloodPluginTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/AntiFloodPluginTest.php
new file mode 100644
index 000000000..91d475948
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/AntiFloodPluginTest.php
@@ -0,0 +1,95 @@
+<?php
+
+class Swift_Plugins_AntiFloodPluginTest extends \PHPUnit_Framework_TestCase
+{
+    public function testThresholdCanBeSetAndFetched()
+    {
+        $plugin = new Swift_Plugins_AntiFloodPlugin(10);
+        $this->assertEquals(10, $plugin->getThreshold());
+        $plugin->setThreshold(100);
+        $this->assertEquals(100, $plugin->getThreshold());
+    }
+
+    public function testSleepTimeCanBeSetAndFetched()
+    {
+        $plugin = new Swift_Plugins_AntiFloodPlugin(10, 5);
+        $this->assertEquals(5, $plugin->getSleepTime());
+        $plugin->setSleepTime(1);
+        $this->assertEquals(1, $plugin->getSleepTime());
+    }
+
+    public function testPluginStopsConnectionAfterThreshold()
+    {
+        $transport = $this->_createTransport();
+        $transport->expects($this->once())
+                  ->method('start');
+        $transport->expects($this->once())
+                  ->method('stop');
+
+        $evt = $this->_createSendEvent($transport);
+
+        $plugin = new Swift_Plugins_AntiFloodPlugin(10);
+        for ($i = 0; $i < 12; ++$i) {
+            $plugin->sendPerformed($evt);
+        }
+    }
+
+    public function testPluginCanStopAndStartMultipleTimes()
+    {
+        $transport = $this->_createTransport();
+        $transport->expects($this->exactly(5))
+                  ->method('start');
+        $transport->expects($this->exactly(5))
+                  ->method('stop');
+
+        $evt = $this->_createSendEvent($transport);
+
+        $plugin = new Swift_Plugins_AntiFloodPlugin(2);
+        for ($i = 0; $i < 11; ++$i) {
+            $plugin->sendPerformed($evt);
+        }
+    }
+
+    public function testPluginCanSleepDuringRestart()
+    {
+        $sleeper = $this->getMock('Swift_Plugins_Sleeper');
+        $sleeper->expects($this->once())
+                ->method('sleep')
+                ->with(10);
+
+        $transport = $this->_createTransport();
+        $transport->expects($this->once())
+                  ->method('start');
+        $transport->expects($this->once())
+                  ->method('stop');
+
+        $evt = $this->_createSendEvent($transport);
+
+        $plugin = new Swift_Plugins_AntiFloodPlugin(99, 10, $sleeper);
+        for ($i = 0; $i < 101; ++$i) {
+            $plugin->sendPerformed($evt);
+        }
+    }
+
+    // -- Creation Methods
+
+    private function _createTransport()
+    {
+        return $this->getMock('Swift_Transport');
+    }
+
+    private function _createSendEvent($transport)
+    {
+        $evt = $this->getMockBuilder('Swift_Events_SendEvent')
+                    ->disableOriginalConstructor()
+                    ->getMock();
+        $evt->expects($this->any())
+            ->method('getSource')
+            ->will($this->returnValue($transport));
+        $evt->expects($this->any())
+            ->method('getTransport')
+            ->will($this->returnValue($transport));
+
+        return $evt;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/BandwidthMonitorPluginTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/BandwidthMonitorPluginTest.php
new file mode 100644
index 000000000..49024cff7
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/BandwidthMonitorPluginTest.php
@@ -0,0 +1,130 @@
+<?php
+
+class Swift_Plugins_BandwidthMonitorPluginTest extends \PHPUnit_Framework_TestCase
+{
+    private $_monitor;
+
+    private $_bytes = 0;
+
+    public function setUp()
+    {
+        $this->_monitor = new Swift_Plugins_BandwidthMonitorPlugin();
+    }
+
+    public function testBytesOutIncreasesWhenCommandsSent()
+    {
+        $evt = $this->_createCommandEvent("RCPT TO:<foo@bar.com>\r\n");
+
+        $this->assertEquals(0, $this->_monitor->getBytesOut());
+        $this->_monitor->commandSent($evt);
+        $this->assertEquals(23, $this->_monitor->getBytesOut());
+        $this->_monitor->commandSent($evt);
+        $this->assertEquals(46, $this->_monitor->getBytesOut());
+    }
+
+    public function testBytesInIncreasesWhenResponsesReceived()
+    {
+        $evt = $this->_createResponseEvent("250 Ok\r\n");
+
+        $this->assertEquals(0, $this->_monitor->getBytesIn());
+        $this->_monitor->responseReceived($evt);
+        $this->assertEquals(8, $this->_monitor->getBytesIn());
+        $this->_monitor->responseReceived($evt);
+        $this->assertEquals(16, $this->_monitor->getBytesIn());
+    }
+
+    public function testCountersCanBeReset()
+    {
+        $evt = $this->_createResponseEvent("250 Ok\r\n");
+
+        $this->assertEquals(0, $this->_monitor->getBytesIn());
+        $this->_monitor->responseReceived($evt);
+        $this->assertEquals(8, $this->_monitor->getBytesIn());
+        $this->_monitor->responseReceived($evt);
+        $this->assertEquals(16, $this->_monitor->getBytesIn());
+
+        $evt = $this->_createCommandEvent("RCPT TO:<foo@bar.com>\r\n");
+
+        $this->assertEquals(0, $this->_monitor->getBytesOut());
+        $this->_monitor->commandSent($evt);
+        $this->assertEquals(23, $this->_monitor->getBytesOut());
+        $this->_monitor->commandSent($evt);
+        $this->assertEquals(46, $this->_monitor->getBytesOut());
+
+        $this->_monitor->reset();
+
+        $this->assertEquals(0, $this->_monitor->getBytesOut());
+        $this->assertEquals(0, $this->_monitor->getBytesIn());
+    }
+
+    public function testBytesOutIncreasesAccordingToMessageLength()
+    {
+        $message = $this->_createMessageWithByteCount(6);
+        $evt = $this->_createSendEvent($message);
+
+        $this->assertEquals(0, $this->_monitor->getBytesOut());
+        $this->_monitor->sendPerformed($evt);
+        $this->assertEquals(6, $this->_monitor->getBytesOut());
+        $this->_monitor->sendPerformed($evt);
+        $this->assertEquals(12, $this->_monitor->getBytesOut());
+    }
+
+    // -- Creation Methods
+
+    private function _createSendEvent($message)
+    {
+        $evt = $this->getMockBuilder('Swift_Events_SendEvent')
+                    ->disableOriginalConstructor()
+                    ->getMock();
+        $evt->expects($this->any())
+            ->method('getMessage')
+            ->will($this->returnValue($message));
+
+        return $evt;
+    }
+
+    private function _createCommandEvent($command)
+    {
+        $evt = $this->getMockBuilder('Swift_Events_CommandEvent')
+                    ->disableOriginalConstructor()
+                    ->getMock();
+        $evt->expects($this->any())
+            ->method('getCommand')
+            ->will($this->returnValue($command));
+
+        return $evt;
+    }
+
+    private function _createResponseEvent($response)
+    {
+        $evt = $this->getMockBuilder('Swift_Events_ResponseEvent')
+                    ->disableOriginalConstructor()
+                    ->getMock();
+        $evt->expects($this->any())
+            ->method('getResponse')
+            ->will($this->returnValue($response));
+
+        return $evt;
+    }
+
+    private function _createMessageWithByteCount($bytes)
+    {
+        $this->_bytes = $bytes;
+        $msg = $this->getMock('Swift_Mime_Message');
+        $msg->expects($this->any())
+            ->method('toByteStream')
+            ->will($this->returnCallback(array($this, '_write')));
+      /*  $this->_checking(Expectations::create()
+            -> ignoring($msg)->toByteStream(any()) -> calls(array($this, '_write'))
+        ); */
+
+        return $msg;
+    }
+
+    public function _write($is)
+    {
+        for ($i = 0; $i < $this->_bytes; ++$i) {
+            $is->write('x');
+        }
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/DecoratorPluginTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/DecoratorPluginTest.php
new file mode 100644
index 000000000..7f4cdef15
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/DecoratorPluginTest.php
@@ -0,0 +1,269 @@
+<?php
+
+class Swift_Plugins_DecoratorPluginTest extends \SwiftMailerTestCase
+{
+    public function testMessageBodyReceivesReplacements()
+    {
+        $message = $this->_createMessage(
+            $this->_createHeaders(),
+            array('zip@button.tld' => 'Zipathon'),
+            array('chris.corbyn@swiftmailer.org' => 'Chris'),
+            'Subject',
+            'Hello {name}, you are customer #{id}'
+            );
+        $message->shouldReceive('setBody')
+                ->once()
+                ->with('Hello Zip, you are customer #456');
+        $message->shouldReceive('setBody')
+                ->zeroOrMoreTimes();
+
+        $plugin = $this->_createPlugin(
+            array('zip@button.tld' => array('{name}' => 'Zip', '{id}' => '456'))
+            );
+
+        $evt = $this->_createSendEvent($message);
+
+        $plugin->beforeSendPerformed($evt);
+        $plugin->sendPerformed($evt);
+    }
+
+    public function testReplacementsCanBeAppliedToSameMessageMultipleTimes()
+    {
+        $message = $this->_createMessage(
+            $this->_createHeaders(),
+            array('zip@button.tld' => 'Zipathon', 'foo@bar.tld' => 'Foo'),
+            array('chris.corbyn@swiftmailer.org' => 'Chris'),
+            'Subject',
+            'Hello {name}, you are customer #{id}'
+            );
+        $message->shouldReceive('setBody')
+                ->once()
+                ->with('Hello Zip, you are customer #456');
+        $message->shouldReceive('setBody')
+                ->once()
+                ->with('Hello {name}, you are customer #{id}');
+        $message->shouldReceive('setBody')
+                ->once()
+                ->with('Hello Foo, you are customer #123');
+        $message->shouldReceive('setBody')
+                ->zeroOrMoreTimes();
+
+        $plugin = $this->_createPlugin(
+            array(
+                'foo@bar.tld' => array('{name}' => 'Foo', '{id}' => '123'),
+                'zip@button.tld' => array('{name}' => 'Zip', '{id}' => '456'),
+                )
+            );
+
+        $evt = $this->_createSendEvent($message);
+
+        $plugin->beforeSendPerformed($evt);
+        $plugin->sendPerformed($evt);
+        $plugin->beforeSendPerformed($evt);
+        $plugin->sendPerformed($evt);
+    }
+
+    public function testReplacementsCanBeMadeInHeaders()
+    {
+        $headers = $this->_createHeaders(array(
+            $returnPathHeader = $this->_createHeader('Return-Path', 'foo-{id}@swiftmailer.org'),
+            $toHeader = $this->_createHeader('Subject', 'A message for {name}!'),
+        ));
+
+        $message = $this->_createMessage(
+            $headers,
+            array('zip@button.tld' => 'Zipathon'),
+            array('chris.corbyn@swiftmailer.org' => 'Chris'),
+            'A message for {name}!',
+            'Hello {name}, you are customer #{id}'
+            );
+
+        $message->shouldReceive('setBody')
+                ->once()
+                ->with('Hello Zip, you are customer #456');
+        $toHeader->shouldReceive('setFieldBodyModel')
+                 ->once()
+                 ->with('A message for Zip!');
+        $returnPathHeader->shouldReceive('setFieldBodyModel')
+                         ->once()
+                         ->with('foo-456@swiftmailer.org');
+        $message->shouldReceive('setBody')
+                ->zeroOrMoreTimes();
+        $toHeader->shouldReceive('setFieldBodyModel')
+                 ->zeroOrMoreTimes();
+        $returnPathHeader->shouldReceive('setFieldBodyModel')
+                         ->zeroOrMoreTimes();
+
+        $plugin = $this->_createPlugin(
+            array('zip@button.tld' => array('{name}' => 'Zip', '{id}' => '456'))
+            );
+        $evt = $this->_createSendEvent($message);
+
+        $plugin->beforeSendPerformed($evt);
+        $plugin->sendPerformed($evt);
+    }
+
+    public function testReplacementsAreMadeOnSubparts()
+    {
+        $part1 = $this->_createPart('text/plain', 'Your name is {name}?', '1@x');
+        $part2 = $this->_createPart('text/html', 'Your <em>name</em> is {name}?', '2@x');
+        $message = $this->_createMessage(
+            $this->_createHeaders(),
+            array('zip@button.tld' => 'Zipathon'),
+            array('chris.corbyn@swiftmailer.org' => 'Chris'),
+            'A message for {name}!',
+            'Subject'
+            );
+        $message->shouldReceive('getChildren')
+                ->zeroOrMoreTimes()
+                ->andReturn(array($part1, $part2));
+        $part1->shouldReceive('setBody')
+              ->once()
+              ->with('Your name is Zip?');
+        $part2->shouldReceive('setBody')
+              ->once()
+              ->with('Your <em>name</em> is Zip?');
+        $part1->shouldReceive('setBody')
+              ->zeroOrMoreTimes();
+        $part2->shouldReceive('setBody')
+              ->zeroOrMoreTimes();
+
+        $plugin = $this->_createPlugin(
+            array('zip@button.tld' => array('{name}' => 'Zip', '{id}' => '456'))
+            );
+
+        $evt = $this->_createSendEvent($message);
+
+        $plugin->beforeSendPerformed($evt);
+        $plugin->sendPerformed($evt);
+    }
+
+    public function testReplacementsCanBeTakenFromCustomReplacementsObject()
+    {
+        $message = $this->_createMessage(
+            $this->_createHeaders(),
+            array('foo@bar' => 'Foobar', 'zip@zap' => 'Zip zap'),
+            array('chris.corbyn@swiftmailer.org' => 'Chris'),
+            'Subject',
+            'Something {a}'
+            );
+
+        $replacements = $this->_createReplacements();
+
+        $message->shouldReceive('setBody')
+                ->once()
+                ->with('Something b');
+        $message->shouldReceive('setBody')
+                ->once()
+                ->with('Something c');
+        $message->shouldReceive('setBody')
+                ->zeroOrMoreTimes();
+        $replacements->shouldReceive('getReplacementsFor')
+                     ->once()
+                     ->with('foo@bar')
+                     ->andReturn(array('{a}' => 'b'));
+        $replacements->shouldReceive('getReplacementsFor')
+                     ->once()
+                     ->with('zip@zap')
+                     ->andReturn(array('{a}' => 'c'));
+
+        $plugin = $this->_createPlugin($replacements);
+
+        $evt = $this->_createSendEvent($message);
+
+        $plugin->beforeSendPerformed($evt);
+        $plugin->sendPerformed($evt);
+        $plugin->beforeSendPerformed($evt);
+        $plugin->sendPerformed($evt);
+    }
+
+    // -- Creation methods
+
+    private function _createMessage($headers, $to = array(), $from = null, $subject = null,
+        $body = null)
+    {
+        $message = $this->getMockery('Swift_Mime_Message')->shouldIgnoreMissing();
+        foreach ($to as $addr => $name) {
+            $message->shouldReceive('getTo')
+                    ->once()
+                    ->andReturn(array($addr => $name));
+        }
+        $message->shouldReceive('getHeaders')
+                ->zeroOrMoreTimes()
+                ->andReturn($headers);
+        $message->shouldReceive('getFrom')
+                ->zeroOrMoreTimes()
+                ->andReturn($from);
+        $message->shouldReceive('getSubject')
+                ->zeroOrMoreTimes()
+                ->andReturn($subject);
+        $message->shouldReceive('getBody')
+                ->zeroOrMoreTimes()
+                ->andReturn($body);
+
+        return $message;
+    }
+
+    private function _createPlugin($replacements)
+    {
+        return new Swift_Plugins_DecoratorPlugin($replacements);
+    }
+
+    private function _createReplacements()
+    {
+        return $this->getMockery('Swift_Plugins_Decorator_Replacements')->shouldIgnoreMissing();
+    }
+
+    private function _createSendEvent(Swift_Mime_Message $message)
+    {
+        $evt = $this->getMockery('Swift_Events_SendEvent')->shouldIgnoreMissing();
+        $evt->shouldReceive('getMessage')
+            ->zeroOrMoreTimes()
+            ->andReturn($message);
+
+        return $evt;
+    }
+
+    private function _createPart($type, $body, $id)
+    {
+        $part = $this->getMockery('Swift_Mime_MimeEntity')->shouldIgnoreMissing();
+        $part->shouldReceive('getContentType')
+             ->zeroOrMoreTimes()
+             ->andReturn($type);
+        $part->shouldReceive('getBody')
+             ->zeroOrMoreTimes()
+             ->andReturn($body);
+        $part->shouldReceive('getId')
+             ->zeroOrMoreTimes()
+             ->andReturn($id);
+
+        return $part;
+    }
+
+    private function _createHeaders($headers = array())
+    {
+        $set = $this->getMockery('Swift_Mime_HeaderSet')->shouldIgnoreMissing();
+        $set->shouldReceive('getAll')
+            ->zeroOrMoreTimes()
+            ->andReturn($headers);
+
+        foreach ($headers as $header) {
+            $set->set($header);
+        }
+
+        return $set;
+    }
+
+    private function _createHeader($name, $body = '')
+    {
+        $header = $this->getMockery('Swift_Mime_Header')->shouldIgnoreMissing();
+        $header->shouldReceive('getFieldName')
+               ->zeroOrMoreTimes()
+               ->andReturn($name);
+        $header->shouldReceive('getFieldBodyModel')
+               ->zeroOrMoreTimes()
+               ->andReturn($body);
+
+        return $header;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/LoggerPluginTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/LoggerPluginTest.php
new file mode 100644
index 000000000..bd1fd97af
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/LoggerPluginTest.php
@@ -0,0 +1,190 @@
+<?php
+
+class Swift_Plugins_LoggerPluginTest extends \SwiftMailerTestCase
+{
+    public function testLoggerDelegatesAddingEntries()
+    {
+        $logger = $this->_createLogger();
+        $logger->expects($this->once())
+               ->method('add')
+               ->with('foo');
+
+        $plugin = $this->_createPlugin($logger);
+        $plugin->add('foo');
+    }
+
+    public function testLoggerDelegatesDumpingEntries()
+    {
+        $logger = $this->_createLogger();
+        $logger->expects($this->once())
+               ->method('dump')
+               ->will($this->returnValue('foobar'));
+
+        $plugin = $this->_createPlugin($logger);
+        $this->assertEquals('foobar', $plugin->dump());
+    }
+
+    public function testLoggerDelegatesClearingEntries()
+    {
+        $logger = $this->_createLogger();
+        $logger->expects($this->once())
+               ->method('clear');
+
+        $plugin = $this->_createPlugin($logger);
+        $plugin->clear();
+    }
+
+    public function testCommandIsSentToLogger()
+    {
+        $evt = $this->_createCommandEvent("foo\r\n");
+        $logger = $this->_createLogger();
+        $logger->expects($this->once())
+               ->method('add')
+               ->with($this->regExp('~foo\r\n~'));
+
+        $plugin = $this->_createPlugin($logger);
+        $plugin->commandSent($evt);
+    }
+
+    public function testResponseIsSentToLogger()
+    {
+        $evt = $this->_createResponseEvent("354 Go ahead\r\n");
+        $logger = $this->_createLogger();
+        $logger->expects($this->once())
+               ->method('add')
+               ->with($this->regExp('~354 Go ahead\r\n~'));
+
+        $plugin = $this->_createPlugin($logger);
+        $plugin->responseReceived($evt);
+    }
+
+    public function testTransportBeforeStartChangeIsSentToLogger()
+    {
+        $evt = $this->_createTransportChangeEvent();
+        $logger = $this->_createLogger();
+        $logger->expects($this->once())
+               ->method('add')
+               ->with($this->anything());
+
+        $plugin = $this->_createPlugin($logger);
+        $plugin->beforeTransportStarted($evt);
+    }
+
+    public function testTransportStartChangeIsSentToLogger()
+    {
+        $evt = $this->_createTransportChangeEvent();
+        $logger = $this->_createLogger();
+        $logger->expects($this->once())
+               ->method('add')
+               ->with($this->anything());
+
+        $plugin = $this->_createPlugin($logger);
+        $plugin->transportStarted($evt);
+    }
+
+    public function testTransportStopChangeIsSentToLogger()
+    {
+        $evt = $this->_createTransportChangeEvent();
+        $logger = $this->_createLogger();
+        $logger->expects($this->once())
+               ->method('add')
+               ->with($this->anything());
+
+        $plugin = $this->_createPlugin($logger);
+        $plugin->transportStopped($evt);
+    }
+
+    public function testTransportBeforeStopChangeIsSentToLogger()
+    {
+        $evt = $this->_createTransportChangeEvent();
+        $logger = $this->_createLogger();
+        $logger->expects($this->once())
+               ->method('add')
+               ->with($this->anything());
+
+        $plugin = $this->_createPlugin($logger);
+        $plugin->beforeTransportStopped($evt);
+    }
+
+    public function testExceptionsArePassedToDelegateAndLeftToBubbleUp()
+    {
+        $transport = $this->_createTransport();
+        $evt = $this->_createTransportExceptionEvent();
+        $logger = $this->_createLogger();
+        $logger->expects($this->once())
+               ->method('add')
+               ->with($this->anything());
+
+        $plugin = $this->_createPlugin($logger);
+        try {
+            $plugin->exceptionThrown($evt);
+            $this->fail('Exception should bubble up.');
+        } catch (Swift_TransportException $ex) {
+        }
+    }
+
+    // -- Creation Methods
+
+    private function _createLogger()
+    {
+        return $this->getMock('Swift_Plugins_Logger');
+    }
+
+    private function _createPlugin($logger)
+    {
+        return new Swift_Plugins_LoggerPlugin($logger);
+    }
+
+    private function _createCommandEvent($command)
+    {
+        $evt = $this->getMockBuilder('Swift_Events_CommandEvent')
+                    ->disableOriginalConstructor()
+                    ->getMock();
+        $evt->expects($this->any())
+            ->method('getCommand')
+            ->will($this->returnValue($command));
+
+        return $evt;
+    }
+
+    private function _createResponseEvent($response)
+    {
+        $evt = $this->getMockBuilder('Swift_Events_ResponseEvent')
+                    ->disableOriginalConstructor()
+                    ->getMock();
+        $evt->expects($this->any())
+            ->method('getResponse')
+            ->will($this->returnValue($response));
+
+        return $evt;
+    }
+
+    private function _createTransport()
+    {
+        return $this->getMock('Swift_Transport');
+    }
+
+    private function _createTransportChangeEvent()
+    {
+        $evt = $this->getMockBuilder('Swift_Events_TransportChangeEvent')
+                    ->disableOriginalConstructor()
+                    ->getMock();
+        $evt->expects($this->any())
+            ->method('getSource')
+            ->will($this->returnValue($this->_createTransport()));
+
+        return $evt;
+    }
+
+    public function _createTransportExceptionEvent()
+    {
+        $evt = $this->getMockBuilder('Swift_Events_TransportExceptionEvent')
+                    ->disableOriginalConstructor()
+                    ->getMock();
+        $evt->expects($this->any())
+            ->method('getException')
+            ->will($this->returnValue(new Swift_TransportException('')));
+
+        return $evt;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/Loggers/ArrayLoggerTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/Loggers/ArrayLoggerTest.php
new file mode 100644
index 000000000..880bb32c9
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/Loggers/ArrayLoggerTest.php
@@ -0,0 +1,65 @@
+<?php
+
+class Swift_Plugins_Loggers_ArrayLoggerTest extends \PHPUnit_Framework_TestCase
+{
+    public function testAddingSingleEntryDumpsSingleLine()
+    {
+        $logger = new Swift_Plugins_Loggers_ArrayLogger();
+        $logger->add(">> Foo\r\n");
+        $this->assertEquals(">> Foo\r\n", $logger->dump());
+    }
+
+    public function testAddingMultipleEntriesDumpsMultipleLines()
+    {
+        $logger = new Swift_Plugins_Loggers_ArrayLogger();
+        $logger->add(">> FOO\r\n");
+        $logger->add("<< 502 That makes no sense\r\n");
+        $logger->add(">> RSET\r\n");
+        $logger->add("<< 250 OK\r\n");
+
+        $this->assertEquals(
+            ">> FOO\r\n".PHP_EOL.
+            "<< 502 That makes no sense\r\n".PHP_EOL.
+            ">> RSET\r\n".PHP_EOL.
+            "<< 250 OK\r\n",
+            $logger->dump()
+            );
+    }
+
+    public function testLogCanBeCleared()
+    {
+        $logger = new Swift_Plugins_Loggers_ArrayLogger();
+        $logger->add(">> FOO\r\n");
+        $logger->add("<< 502 That makes no sense\r\n");
+        $logger->add(">> RSET\r\n");
+        $logger->add("<< 250 OK\r\n");
+
+        $this->assertEquals(
+            ">> FOO\r\n".PHP_EOL.
+            "<< 502 That makes no sense\r\n".PHP_EOL.
+            ">> RSET\r\n".PHP_EOL.
+            "<< 250 OK\r\n",
+            $logger->dump()
+            );
+
+        $logger->clear();
+
+        $this->assertEquals('', $logger->dump());
+    }
+
+    public function testLengthCanBeTruncated()
+    {
+        $logger = new Swift_Plugins_Loggers_ArrayLogger(2);
+        $logger->add(">> FOO\r\n");
+        $logger->add("<< 502 That makes no sense\r\n");
+        $logger->add(">> RSET\r\n");
+        $logger->add("<< 250 OK\r\n");
+
+        $this->assertEquals(
+            ">> RSET\r\n".PHP_EOL.
+            "<< 250 OK\r\n",
+            $logger->dump(),
+            '%s: Log should be truncated to last 2 entries'
+            );
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/Loggers/EchoLoggerTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/Loggers/EchoLoggerTest.php
new file mode 100644
index 000000000..6134fe64e
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/Loggers/EchoLoggerTest.php
@@ -0,0 +1,24 @@
+<?php
+
+class Swift_Plugins_Loggers_EchoLoggerTest extends \PHPUnit_Framework_TestCase
+{
+    public function testAddingEntryDumpsSingleLineWithoutHtml()
+    {
+        $logger = new Swift_Plugins_Loggers_EchoLogger(false);
+        ob_start();
+        $logger->add('>> Foo');
+        $data = ob_get_clean();
+
+        $this->assertEquals('>> Foo'.PHP_EOL, $data);
+    }
+
+    public function testAddingEntryDumpsEscapedLineWithHtml()
+    {
+        $logger = new Swift_Plugins_Loggers_EchoLogger(true);
+        ob_start();
+        $logger->add('>> Foo');
+        $data = ob_get_clean();
+
+        $this->assertEquals('&gt;&gt; Foo<br />'.PHP_EOL, $data);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/PopBeforeSmtpPluginTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/PopBeforeSmtpPluginTest.php
new file mode 100644
index 000000000..1227c24c5
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/PopBeforeSmtpPluginTest.php
@@ -0,0 +1,103 @@
+<?php
+
+class Swift_Plugins_PopBeforeSmtpPluginTest extends \PHPUnit_Framework_TestCase
+{
+    public function testPluginConnectsToPop3HostBeforeTransportStarts()
+    {
+        $connection = $this->_createConnection();
+        $connection->expects($this->once())
+                   ->method('connect');
+
+        $plugin = $this->_createPlugin('pop.host.tld', 110);
+        $plugin->setConnection($connection);
+
+        $transport = $this->_createTransport();
+        $evt = $this->_createTransportChangeEvent($transport);
+
+        $plugin->beforeTransportStarted($evt);
+    }
+
+    public function testPluginDisconnectsFromPop3HostBeforeTransportStarts()
+    {
+        $connection = $this->_createConnection();
+        $connection->expects($this->once())
+                   ->method('disconnect');
+
+        $plugin = $this->_createPlugin('pop.host.tld', 110);
+        $plugin->setConnection($connection);
+
+        $transport = $this->_createTransport();
+        $evt = $this->_createTransportChangeEvent($transport);
+
+        $plugin->beforeTransportStarted($evt);
+    }
+
+    public function testPluginDoesNotConnectToSmtpIfBoundToDifferentTransport()
+    {
+        $connection = $this->_createConnection();
+        $connection->expects($this->never())
+                   ->method('disconnect');
+        $connection->expects($this->never())
+                   ->method('connect');
+
+        $smtp = $this->_createTransport();
+
+        $plugin = $this->_createPlugin('pop.host.tld', 110);
+        $plugin->setConnection($connection);
+        $plugin->bindSmtp($smtp);
+
+        $transport = $this->_createTransport();
+        $evt = $this->_createTransportChangeEvent($transport);
+
+        $plugin->beforeTransportStarted($evt);
+    }
+
+    public function testPluginCanBindToSpecificTransport()
+    {
+        $connection = $this->_createConnection();
+        $connection->expects($this->once())
+                   ->method('connect');
+
+        $smtp = $this->_createTransport();
+
+        $plugin = $this->_createPlugin('pop.host.tld', 110);
+        $plugin->setConnection($connection);
+        $plugin->bindSmtp($smtp);
+
+        $evt = $this->_createTransportChangeEvent($smtp);
+
+        $plugin->beforeTransportStarted($evt);
+    }
+
+    // -- Creation Methods
+
+    private function _createTransport()
+    {
+        return $this->getMock('Swift_Transport');
+    }
+
+    private function _createTransportChangeEvent($transport)
+    {
+        $evt = $this->getMockBuilder('Swift_Events_TransportChangeEvent')
+                    ->disableOriginalConstructor()
+                    ->getMock();
+        $evt->expects($this->any())
+            ->method('getSource')
+            ->will($this->returnValue($transport));
+        $evt->expects($this->any())
+            ->method('getTransport')
+            ->will($this->returnValue($transport));
+
+        return $evt;
+    }
+
+    public function _createConnection()
+    {
+        return $this->getMock('Swift_Plugins_Pop_Pop3Connection');
+    }
+
+    public function _createPlugin($host, $port, $crypto = null)
+    {
+        return new Swift_Plugins_PopBeforeSmtpPlugin($host, $port, $crypto);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/RedirectingPluginTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/RedirectingPluginTest.php
new file mode 100644
index 000000000..4cc7e89f1
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/RedirectingPluginTest.php
@@ -0,0 +1,185 @@
+<?php
+
+class Swift_Plugins_RedirectingPluginTest extends \PHPUnit_Framework_TestCase
+{
+    public function testRecipientCanBeSetAndFetched()
+    {
+        $plugin = new Swift_Plugins_RedirectingPlugin('fabien@example.com');
+        $this->assertEquals('fabien@example.com', $plugin->getRecipient());
+        $plugin->setRecipient('chris@example.com');
+        $this->assertEquals('chris@example.com', $plugin->getRecipient());
+    }
+
+    public function testPluginChangesRecipients()
+    {
+        $message = Swift_Message::newInstance()
+            ->setSubject('...')
+            ->setFrom(array('john@example.com' => 'John Doe'))
+            ->setTo($to = array(
+                'fabien-to@example.com' => 'Fabien (To)',
+                'chris-to@example.com' => 'Chris (To)',
+            ))
+            ->setCc($cc = array(
+                'fabien-cc@example.com' => 'Fabien (Cc)',
+                'chris-cc@example.com' => 'Chris (Cc)',
+            ))
+            ->setBcc($bcc = array(
+                'fabien-bcc@example.com' => 'Fabien (Bcc)',
+                'chris-bcc@example.com' => 'Chris (Bcc)',
+            ))
+            ->setBody('...')
+        ;
+
+        $plugin = new Swift_Plugins_RedirectingPlugin('god@example.com');
+
+        $evt = $this->_createSendEvent($message);
+
+        $plugin->beforeSendPerformed($evt);
+
+        $this->assertEquals($message->getTo(), array('god@example.com' => ''));
+        $this->assertEquals($message->getCc(), array());
+        $this->assertEquals($message->getBcc(), array());
+
+        $plugin->sendPerformed($evt);
+
+        $this->assertEquals($message->getTo(), $to);
+        $this->assertEquals($message->getCc(), $cc);
+        $this->assertEquals($message->getBcc(), $bcc);
+    }
+
+    public function testPluginRespectsUnsetToList()
+    {
+        $message = Swift_Message::newInstance()
+            ->setSubject('...')
+            ->setFrom(array('john@example.com' => 'John Doe'))
+            ->setCc($cc = array(
+                'fabien-cc@example.com' => 'Fabien (Cc)',
+                'chris-cc@example.com' => 'Chris (Cc)',
+            ))
+            ->setBcc($bcc = array(
+                'fabien-bcc@example.com' => 'Fabien (Bcc)',
+                'chris-bcc@example.com' => 'Chris (Bcc)',
+            ))
+            ->setBody('...')
+        ;
+
+        $plugin = new Swift_Plugins_RedirectingPlugin('god@example.com');
+
+        $evt = $this->_createSendEvent($message);
+
+        $plugin->beforeSendPerformed($evt);
+
+        $this->assertEquals($message->getTo(), array('god@example.com' => ''));
+        $this->assertEquals($message->getCc(), array());
+        $this->assertEquals($message->getBcc(), array());
+
+        $plugin->sendPerformed($evt);
+
+        $this->assertEquals($message->getTo(), array());
+        $this->assertEquals($message->getCc(), $cc);
+        $this->assertEquals($message->getBcc(), $bcc);
+    }
+
+    public function testPluginRespectsAWhitelistOfPatterns()
+    {
+        $message = Swift_Message::newInstance()
+            ->setSubject('...')
+            ->setFrom(array('john@example.com' => 'John Doe'))
+            ->setTo($to = array(
+                'fabien-to@example.com' => 'Fabien (To)',
+                'chris-to@example.com' => 'Chris (To)',
+                'lars-to@internal.com' => 'Lars (To)',
+            ))
+            ->setCc($cc = array(
+                'fabien-cc@example.com' => 'Fabien (Cc)',
+                'chris-cc@example.com' => 'Chris (Cc)',
+                'lars-cc@internal.org' => 'Lars (Cc)',
+            ))
+            ->setBcc($bcc = array(
+                'fabien-bcc@example.com' => 'Fabien (Bcc)',
+                'chris-bcc@example.com' => 'Chris (Bcc)',
+                'john-bcc@example.org' => 'John (Bcc)',
+            ))
+            ->setBody('...')
+        ;
+
+        $recipient = 'god@example.com';
+        $patterns = array('/^.*@internal.[a-z]+$/', '/^john-.*$/');
+
+        $plugin = new Swift_Plugins_RedirectingPlugin($recipient, $patterns);
+
+        $this->assertEquals($recipient, $plugin->getRecipient());
+        $this->assertEquals($plugin->getWhitelist(), $patterns);
+
+        $evt = $this->_createSendEvent($message);
+
+        $plugin->beforeSendPerformed($evt);
+
+        $this->assertEquals($message->getTo(), array('lars-to@internal.com' => 'Lars (To)', 'god@example.com' => null));
+        $this->assertEquals($message->getCc(), array('lars-cc@internal.org' => 'Lars (Cc)'));
+        $this->assertEquals($message->getBcc(), array('john-bcc@example.org' => 'John (Bcc)'));
+
+        $plugin->sendPerformed($evt);
+
+        $this->assertEquals($message->getTo(), $to);
+        $this->assertEquals($message->getCc(), $cc);
+        $this->assertEquals($message->getBcc(), $bcc);
+    }
+
+    public function testArrayOfRecipientsCanBeExplicitlyDefined()
+    {
+        $message = Swift_Message::newInstance()
+            ->setSubject('...')
+            ->setFrom(array('john@example.com' => 'John Doe'))
+            ->setTo(array(
+            'fabien@example.com' => 'Fabien',
+            'chris@example.com' => 'Chris (To)',
+            'lars-to@internal.com' => 'Lars (To)',
+        ))
+            ->setCc(array(
+            'fabien@example.com' => 'Fabien',
+            'chris-cc@example.com' => 'Chris (Cc)',
+            'lars-cc@internal.org' => 'Lars (Cc)',
+        ))
+            ->setBcc(array(
+            'fabien@example.com' => 'Fabien',
+            'chris-bcc@example.com' => 'Chris (Bcc)',
+            'john-bcc@example.org' => 'John (Bcc)',
+        ))
+            ->setBody('...')
+        ;
+
+        $recipients = array('god@example.com', 'fabien@example.com');
+        $patterns = array('/^.*@internal.[a-z]+$/');
+
+        $plugin = new Swift_Plugins_RedirectingPlugin($recipients, $patterns);
+
+        $evt = $this->_createSendEvent($message);
+
+        $plugin->beforeSendPerformed($evt);
+
+        $this->assertEquals(
+            $message->getTo(),
+            array('fabien@example.com' => 'Fabien', 'lars-to@internal.com' => 'Lars (To)', 'god@example.com' => null)
+        );
+        $this->assertEquals(
+            $message->getCc(),
+            array('fabien@example.com' => 'Fabien', 'lars-cc@internal.org' => 'Lars (Cc)')
+        );
+        $this->assertEquals($message->getBcc(), array('fabien@example.com' => 'Fabien'));
+    }
+
+    // -- Creation Methods
+
+    private function _createSendEvent(Swift_Mime_Message $message)
+    {
+        $evt = $this->getMockBuilder('Swift_Events_SendEvent')
+                    ->disableOriginalConstructor()
+                    ->getMock();
+        $evt->expects($this->any())
+            ->method('getMessage')
+            ->will($this->returnValue($message));
+
+        return $evt;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/ReporterPluginTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/ReporterPluginTest.php
new file mode 100644
index 000000000..810188300
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/ReporterPluginTest.php
@@ -0,0 +1,88 @@
+<?php
+
+class Swift_Plugins_ReporterPluginTest extends \SwiftMailerTestCase
+{
+    public function testReportingPasses()
+    {
+        $message = $this->_createMessage();
+        $evt = $this->_createSendEvent();
+        $reporter = $this->_createReporter();
+
+        $message->shouldReceive('getTo')->zeroOrMoreTimes()->andReturn(array('foo@bar.tld' => 'Foo'));
+        $evt->shouldReceive('getMessage')->zeroOrMoreTimes()->andReturn($message);
+        $evt->shouldReceive('getFailedRecipients')->zeroOrMoreTimes()->andReturn(array());
+        $reporter->shouldReceive('notify')->once()->with($message, 'foo@bar.tld', Swift_Plugins_Reporter::RESULT_PASS);
+
+        $plugin = new Swift_Plugins_ReporterPlugin($reporter);
+        $plugin->sendPerformed($evt);
+    }
+
+    public function testReportingFailedTo()
+    {
+        $message = $this->_createMessage();
+        $evt = $this->_createSendEvent();
+        $reporter = $this->_createReporter();
+
+        $message->shouldReceive('getTo')->zeroOrMoreTimes()->andReturn(array('foo@bar.tld' => 'Foo', 'zip@button' => 'Zip'));
+        $evt->shouldReceive('getMessage')->zeroOrMoreTimes()->andReturn($message);
+        $evt->shouldReceive('getFailedRecipients')->zeroOrMoreTimes()->andReturn(array('zip@button'));
+        $reporter->shouldReceive('notify')->once()->with($message, 'foo@bar.tld', Swift_Plugins_Reporter::RESULT_PASS);
+        $reporter->shouldReceive('notify')->once()->with($message, 'zip@button', Swift_Plugins_Reporter::RESULT_FAIL);
+
+        $plugin = new Swift_Plugins_ReporterPlugin($reporter);
+        $plugin->sendPerformed($evt);
+    }
+
+    public function testReportingFailedCc()
+    {
+        $message = $this->_createMessage();
+        $evt = $this->_createSendEvent();
+        $reporter = $this->_createReporter();
+
+        $message->shouldReceive('getTo')->zeroOrMoreTimes()->andReturn(array('foo@bar.tld' => 'Foo'));
+        $message->shouldReceive('getCc')->zeroOrMoreTimes()->andReturn(array('zip@button' => 'Zip', 'test@test.com' => 'Test'));
+        $evt->shouldReceive('getMessage')->zeroOrMoreTimes()->andReturn($message);
+        $evt->shouldReceive('getFailedRecipients')->zeroOrMoreTimes()->andReturn(array('zip@button'));
+        $reporter->shouldReceive('notify')->once()->with($message, 'foo@bar.tld', Swift_Plugins_Reporter::RESULT_PASS);
+        $reporter->shouldReceive('notify')->once()->with($message, 'zip@button', Swift_Plugins_Reporter::RESULT_FAIL);
+        $reporter->shouldReceive('notify')->once()->with($message, 'test@test.com', Swift_Plugins_Reporter::RESULT_PASS);
+
+        $plugin = new Swift_Plugins_ReporterPlugin($reporter);
+        $plugin->sendPerformed($evt);
+    }
+
+    public function testReportingFailedBcc()
+    {
+        $message = $this->_createMessage();
+        $evt = $this->_createSendEvent();
+        $reporter = $this->_createReporter();
+
+        $message->shouldReceive('getTo')->zeroOrMoreTimes()->andReturn(array('foo@bar.tld' => 'Foo'));
+        $message->shouldReceive('getBcc')->zeroOrMoreTimes()->andReturn(array('zip@button' => 'Zip', 'test@test.com' => 'Test'));
+        $evt->shouldReceive('getMessage')->zeroOrMoreTimes()->andReturn($message);
+        $evt->shouldReceive('getFailedRecipients')->zeroOrMoreTimes()->andReturn(array('zip@button'));
+        $reporter->shouldReceive('notify')->once()->with($message, 'foo@bar.tld', Swift_Plugins_Reporter::RESULT_PASS);
+        $reporter->shouldReceive('notify')->once()->with($message, 'zip@button', Swift_Plugins_Reporter::RESULT_FAIL);
+        $reporter->shouldReceive('notify')->once()->with($message, 'test@test.com', Swift_Plugins_Reporter::RESULT_PASS);
+
+        $plugin = new Swift_Plugins_ReporterPlugin($reporter);
+        $plugin->sendPerformed($evt);
+    }
+
+    // -- Creation Methods
+
+    private function _createMessage()
+    {
+        return $this->getMockery('Swift_Mime_Message')->shouldIgnoreMissing();
+    }
+
+    private function _createSendEvent()
+    {
+        return $this->getMockery('Swift_Events_SendEvent')->shouldIgnoreMissing();
+    }
+
+    private function _createReporter()
+    {
+        return $this->getMockery('Swift_Plugins_Reporter')->shouldIgnoreMissing();
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/Reporters/HitReporterTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/Reporters/HitReporterTest.php
new file mode 100644
index 000000000..4d31c3c6a
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/Reporters/HitReporterTest.php
@@ -0,0 +1,64 @@
+<?php
+
+class Swift_Plugins_Reporters_HitReporterTest extends \PHPUnit_Framework_TestCase
+{
+    private $_hitReporter;
+    private $_message;
+
+    public function setUp()
+    {
+        $this->_hitReporter = new Swift_Plugins_Reporters_HitReporter();
+        $this->_message = $this->getMock('Swift_Mime_Message');
+    }
+
+    public function testReportingFail()
+    {
+        $this->_hitReporter->notify($this->_message, 'foo@bar.tld',
+            Swift_Plugins_Reporter::RESULT_FAIL
+            );
+        $this->assertEquals(array('foo@bar.tld'),
+            $this->_hitReporter->getFailedRecipients()
+            );
+    }
+
+    public function testMultipleReports()
+    {
+        $this->_hitReporter->notify($this->_message, 'foo@bar.tld',
+            Swift_Plugins_Reporter::RESULT_FAIL
+            );
+        $this->_hitReporter->notify($this->_message, 'zip@button',
+            Swift_Plugins_Reporter::RESULT_FAIL
+            );
+        $this->assertEquals(array('foo@bar.tld', 'zip@button'),
+            $this->_hitReporter->getFailedRecipients()
+            );
+    }
+
+    public function testReportingPassIsIgnored()
+    {
+        $this->_hitReporter->notify($this->_message, 'foo@bar.tld',
+            Swift_Plugins_Reporter::RESULT_FAIL
+            );
+        $this->_hitReporter->notify($this->_message, 'zip@button',
+            Swift_Plugins_Reporter::RESULT_PASS
+            );
+        $this->assertEquals(array('foo@bar.tld'),
+            $this->_hitReporter->getFailedRecipients()
+            );
+    }
+
+    public function testBufferCanBeCleared()
+    {
+        $this->_hitReporter->notify($this->_message, 'foo@bar.tld',
+            Swift_Plugins_Reporter::RESULT_FAIL
+            );
+        $this->_hitReporter->notify($this->_message, 'zip@button',
+            Swift_Plugins_Reporter::RESULT_FAIL
+            );
+        $this->assertEquals(array('foo@bar.tld', 'zip@button'),
+            $this->_hitReporter->getFailedRecipients()
+            );
+        $this->_hitReporter->clear();
+        $this->assertEquals(array(), $this->_hitReporter->getFailedRecipients());
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/Reporters/HtmlReporterTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/Reporters/HtmlReporterTest.php
new file mode 100644
index 000000000..3e78fca5b
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/Reporters/HtmlReporterTest.php
@@ -0,0 +1,54 @@
+<?php
+
+class Swift_Plugins_Reporters_HtmlReporterTest extends \PHPUnit_Framework_TestCase
+{
+    private $_html;
+    private $_message;
+
+    public function setUp()
+    {
+        $this->_html = new Swift_Plugins_Reporters_HtmlReporter();
+        $this->_message = $this->getMock('Swift_Mime_Message');
+    }
+
+    public function testReportingPass()
+    {
+        ob_start();
+        $this->_html->notify($this->_message, 'foo@bar.tld',
+            Swift_Plugins_Reporter::RESULT_PASS
+            );
+        $html = ob_get_clean();
+
+        $this->assertRegExp('~ok|pass~i', $html, '%s: Reporter should indicate pass');
+        $this->assertRegExp('~foo@bar\.tld~', $html, '%s: Reporter should show address');
+    }
+
+    public function testReportingFail()
+    {
+        ob_start();
+        $this->_html->notify($this->_message, 'zip@button',
+            Swift_Plugins_Reporter::RESULT_FAIL
+            );
+        $html = ob_get_clean();
+
+        $this->assertRegExp('~fail~i', $html, '%s: Reporter should indicate fail');
+        $this->assertRegExp('~zip@button~', $html, '%s: Reporter should show address');
+    }
+
+    public function testMultipleReports()
+    {
+        ob_start();
+        $this->_html->notify($this->_message, 'foo@bar.tld',
+            Swift_Plugins_Reporter::RESULT_PASS
+            );
+        $this->_html->notify($this->_message, 'zip@button',
+            Swift_Plugins_Reporter::RESULT_FAIL
+            );
+        $html = ob_get_clean();
+
+        $this->assertRegExp('~ok|pass~i', $html, '%s: Reporter should indicate pass');
+        $this->assertRegExp('~foo@bar\.tld~', $html, '%s: Reporter should show address');
+        $this->assertRegExp('~fail~i', $html, '%s: Reporter should indicate fail');
+        $this->assertRegExp('~zip@button~', $html, '%s: Reporter should show address');
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/ThrottlerPluginTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/ThrottlerPluginTest.php
new file mode 100644
index 000000000..a50f14f9f
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Plugins/ThrottlerPluginTest.php
@@ -0,0 +1,104 @@
+<?php
+
+class Swift_Plugins_ThrottlerPluginTest extends \SwiftMailerTestCase
+{
+    public function testBytesPerMinuteThrottling()
+    {
+        $sleeper = $this->_createSleeper();
+        $timer = $this->_createTimer();
+
+        //10MB/min
+        $plugin = new Swift_Plugins_ThrottlerPlugin(
+            10000000, Swift_Plugins_ThrottlerPlugin::BYTES_PER_MINUTE,
+            $sleeper, $timer
+            );
+
+        $timer->shouldReceive('getTimestamp')->once()->andReturn(0);
+        $timer->shouldReceive('getTimestamp')->once()->andReturn(1); //expected 0.6
+        $timer->shouldReceive('getTimestamp')->once()->andReturn(1); //expected 1.2 (sleep 1)
+        $timer->shouldReceive('getTimestamp')->once()->andReturn(2); //expected 1.8
+        $timer->shouldReceive('getTimestamp')->once()->andReturn(2); //expected 2.4 (sleep 1)
+        $sleeper->shouldReceive('sleep')->twice()->with(1);
+
+        //10,000,000 bytes per minute
+        //100,000 bytes per email
+
+        // .: (10,000,000/100,000)/60 emails per second = 1.667 emais/sec
+
+        $message = $this->_createMessageWithByteCount(100000); //100KB
+
+        $evt = $this->_createSendEvent($message);
+
+        for ($i = 0; $i < 5; ++$i) {
+            $plugin->beforeSendPerformed($evt);
+            $plugin->sendPerformed($evt);
+        }
+    }
+
+    public function testMessagesPerMinuteThrottling()
+    {
+        $sleeper = $this->_createSleeper();
+        $timer = $this->_createTimer();
+
+        //60/min
+        $plugin = new Swift_Plugins_ThrottlerPlugin(
+            60, Swift_Plugins_ThrottlerPlugin::MESSAGES_PER_MINUTE,
+            $sleeper, $timer
+            );
+
+        $timer->shouldReceive('getTimestamp')->once()->andReturn(0);
+        $timer->shouldReceive('getTimestamp')->once()->andReturn(0); //expected 1 (sleep 1)
+        $timer->shouldReceive('getTimestamp')->once()->andReturn(2); //expected 2
+        $timer->shouldReceive('getTimestamp')->once()->andReturn(2); //expected 3 (sleep 1)
+        $timer->shouldReceive('getTimestamp')->once()->andReturn(4); //expected 4
+        $sleeper->shouldReceive('sleep')->twice()->with(1);
+
+        //60 messages per minute
+        //1 message per second
+
+        $message = $this->_createMessageWithByteCount(10);
+
+        $evt = $this->_createSendEvent($message);
+
+        for ($i = 0; $i < 5; ++$i) {
+            $plugin->beforeSendPerformed($evt);
+            $plugin->sendPerformed($evt);
+        }
+    }
+
+    // -- Creation Methods
+
+    private function _createSleeper()
+    {
+        return $this->getMockery('Swift_Plugins_Sleeper');
+    }
+
+    private function _createTimer()
+    {
+        return $this->getMockery('Swift_Plugins_Timer');
+    }
+
+    private function _createMessageWithByteCount($bytes)
+    {
+        $msg = $this->getMockery('Swift_Mime_Message');
+        $msg->shouldReceive('toByteStream')
+            ->zeroOrMoreTimes()
+            ->andReturnUsing(function ($is) use ($bytes) {
+                for ($i = 0; $i < $bytes; ++$i) {
+                    $is->write('x');
+                }
+            });
+
+        return $msg;
+    }
+
+    private function _createSendEvent($message)
+    {
+        $evt = $this->getMockery('Swift_Events_SendEvent');
+        $evt->shouldReceive('getMessage')
+            ->zeroOrMoreTimes()
+            ->andReturn($message);
+
+        return $evt;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Signers/DKIMSignerTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Signers/DKIMSignerTest.php
new file mode 100644
index 000000000..13c1b4c1e
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Signers/DKIMSignerTest.php
@@ -0,0 +1,227 @@
+<?php
+
+class Swift_Signers_DKIMSignerTest extends \SwiftMailerTestCase
+{
+    public function setUp()
+    {
+        if (version_compare(phpversion(), '5.4', '<') && !defined('OPENSSL_ALGO_SHA256')) {
+            $this->markTestSkipped(
+                'skipping because of https://bugs.php.net/bug.php?id=61421'
+             );
+        }
+    }
+
+    public function testBasicSigningHeaderManipulation()
+    {
+        $headers = $this->_createHeaders();
+        $messageContent = 'Hello World';
+        $signer = new Swift_Signers_DKIMSigner(file_get_contents(dirname(dirname(dirname(__DIR__))).'/_samples/dkim/dkim.test.priv'), 'dummy.nxdomain.be', 'dummySelector');
+        /* @var $signer Swift_Signers_HeaderSigner */
+        $altered = $signer->getAlteredHeaders();
+        $signer->reset();
+        // Headers
+        $signer->setHeaders($headers);
+        // Body
+        $signer->startBody();
+        $signer->write($messageContent);
+        $signer->endBody();
+        // Signing
+        $signer->addSignature($headers);
+    }
+
+    // Default Signing
+    public function testSigningDefaults()
+    {
+        $headerSet = $this->_createHeaderSet();
+        $messageContent = 'Hello World';
+        $signer = new Swift_Signers_DKIMSigner(file_get_contents(dirname(dirname(dirname(__DIR__))).'/_samples/dkim/dkim.test.priv'), 'dummy.nxdomain.be', 'dummySelector');
+        $signer->setSignatureTimestamp('1299879181');
+        $altered = $signer->getAlteredHeaders();
+        $this->assertEquals(array('DKIM-Signature'), $altered);
+        $signer->reset();
+        $signer->setHeaders($headerSet);
+        $this->assertFalse($headerSet->has('DKIM-Signature'));
+        $signer->startBody();
+        $signer->write($messageContent);
+        $signer->endBody();
+        $signer->addSignature($headerSet);
+        $this->assertTrue($headerSet->has('DKIM-Signature'));
+        $dkim = $headerSet->getAll('DKIM-Signature');
+        $sig = reset($dkim);
+        $this->assertEquals($sig->getValue(), 'v=1; a=rsa-sha1; bh=wlbYcY9O9OPInGJ4D0E/rGsvMLE=; d=dummy.nxdomain.be; h=; i=@dummy.nxdomain.be; s=dummySelector; t=1299879181; b=RMSNelzM2O5MAAnMjT3G3/VF36S3DGJXoPCXR001F1WDReu0prGphWjuzK/m6V1pwqQL8cCNg Hi74mTx2bvyAvmkjvQtJf1VMUOCc9WHGcm1Yec66I3ZWoNMGSWZ1EKAm2CtTzyG0IFw4ml9DI wSkyAFxlgicckDD6FibhqwX4w=');
+    }
+
+    // SHA256 Signing
+    public function testSigning256()
+    {
+        $headerSet = $this->_createHeaderSet();
+        $messageContent = 'Hello World';
+        $signer = new Swift_Signers_DKIMSigner(file_get_contents(dirname(dirname(dirname(__DIR__))).'/_samples/dkim/dkim.test.priv'), 'dummy.nxdomain.be', 'dummySelector');
+        $signer->setHashAlgorithm('rsa-sha256');
+        $signer->setSignatureTimestamp('1299879181');
+        $altered = $signer->getAlteredHeaders();
+        $this->assertEquals(array('DKIM-Signature'), $altered);
+        $signer->reset();
+        $signer->setHeaders($headerSet);
+        $this->assertFalse($headerSet->has('DKIM-Signature'));
+        $signer->startBody();
+        $signer->write($messageContent);
+        $signer->endBody();
+        $signer->addSignature($headerSet);
+        $this->assertTrue($headerSet->has('DKIM-Signature'));
+        $dkim = $headerSet->getAll('DKIM-Signature');
+        $sig = reset($dkim);
+        $this->assertEquals($sig->getValue(), 'v=1; a=rsa-sha256; bh=f+W+hu8dIhf2VAni89o8lF6WKTXi7nViA4RrMdpD5/U=; d=dummy.nxdomain.be; h=; i=@dummy.nxdomain.be; s=dummySelector; t=1299879181; b=jqPmieHzF5vR9F4mXCAkowuphpO4iJ8IAVuioh1BFZ3VITXZj5jlOFxULJMBiiApm2keJirnh u4mzogj444QkpT3lJg8/TBGAYQPdcvkG3KC0jdyN6QpSgpITBJG2BwWa+keXsv2bkQgLRAzNx qRhP45vpHCKun0Tg9LrwW/KCg=');
+    }
+
+    // Relaxed/Relaxed Hash Signing
+    public function testSigningRelaxedRelaxed256()
+    {
+        $headerSet = $this->_createHeaderSet();
+        $messageContent = 'Hello World';
+        $signer = new Swift_Signers_DKIMSigner(file_get_contents(dirname(dirname(dirname(__DIR__))).'/_samples/dkim/dkim.test.priv'), 'dummy.nxdomain.be', 'dummySelector');
+        $signer->setHashAlgorithm('rsa-sha256');
+        $signer->setSignatureTimestamp('1299879181');
+        $signer->setBodyCanon('relaxed');
+        $signer->setHeaderCanon('relaxed');
+        $altered = $signer->getAlteredHeaders();
+        $this->assertEquals(array('DKIM-Signature'), $altered);
+        $signer->reset();
+        $signer->setHeaders($headerSet);
+        $this->assertFalse($headerSet->has('DKIM-Signature'));
+        $signer->startBody();
+        $signer->write($messageContent);
+        $signer->endBody();
+        $signer->addSignature($headerSet);
+        $this->assertTrue($headerSet->has('DKIM-Signature'));
+        $dkim = $headerSet->getAll('DKIM-Signature');
+        $sig = reset($dkim);
+        $this->assertEquals($sig->getValue(), 'v=1; a=rsa-sha256; bh=f+W+hu8dIhf2VAni89o8lF6WKTXi7nViA4RrMdpD5/U=; d=dummy.nxdomain.be; h=; i=@dummy.nxdomain.be; s=dummySelector; c=relaxed/relaxed; t=1299879181; b=gzOI+PX6HpZKQFzwwmxzcVJsyirdLXOS+4pgfCpVHQIdqYusKLrhlLeFBTNoz75HrhNvGH6T0 Rt3w5aTqkrWfUuAEYt0Ns14GowLM7JojaFN+pZ4eYnRB3CBBgW6fee4NEMD5WPca3uS09tr1E 10RYh9ILlRtl+84sovhx5id3Y=');
+    }
+
+    // Relaxed/Simple Hash Signing
+    public function testSigningRelaxedSimple256()
+    {
+        $headerSet = $this->_createHeaderSet();
+        $messageContent = 'Hello World';
+        $signer = new Swift_Signers_DKIMSigner(file_get_contents(dirname(dirname(dirname(__DIR__))).'/_samples/dkim/dkim.test.priv'), 'dummy.nxdomain.be', 'dummySelector');
+        $signer->setHashAlgorithm('rsa-sha256');
+        $signer->setSignatureTimestamp('1299879181');
+        $signer->setHeaderCanon('relaxed');
+        $altered = $signer->getAlteredHeaders();
+        $this->assertEquals(array('DKIM-Signature'), $altered);
+        $signer->reset();
+        $signer->setHeaders($headerSet);
+        $this->assertFalse($headerSet->has('DKIM-Signature'));
+        $signer->startBody();
+        $signer->write($messageContent);
+        $signer->endBody();
+        $signer->addSignature($headerSet);
+        $this->assertTrue($headerSet->has('DKIM-Signature'));
+        $dkim = $headerSet->getAll('DKIM-Signature');
+        $sig = reset($dkim);
+        $this->assertEquals($sig->getValue(), 'v=1; a=rsa-sha256; bh=f+W+hu8dIhf2VAni89o8lF6WKTXi7nViA4RrMdpD5/U=; d=dummy.nxdomain.be; h=; i=@dummy.nxdomain.be; s=dummySelector; c=relaxed; t=1299879181; b=dLPJNec5v81oelyzGOY0qPqTlGnQeNfUNBOrV/JKbStr3NqWGI9jH4JAe2YvO2V32lfPNoby1 4MMzZ6EPkaZkZDDSPa+53YbCPQAlqiD9QZZIUe2UNM33HN8yAMgiWEF5aP7MbQnxeVZMfVLEl 9S8qOImu+K5JZqhQQTL0dgLwA=');
+    }
+
+    // Simple/Relaxed Hash Signing
+    public function testSigningSimpleRelaxed256()
+    {
+        $headerSet = $this->_createHeaderSet();
+        $messageContent = 'Hello World';
+        $signer = new Swift_Signers_DKIMSigner(file_get_contents(dirname(dirname(dirname(__DIR__))).'/_samples/dkim/dkim.test.priv'), 'dummy.nxdomain.be', 'dummySelector');
+        $signer->setHashAlgorithm('rsa-sha256');
+        $signer->setSignatureTimestamp('1299879181');
+        $signer->setBodyCanon('relaxed');
+        $altered = $signer->getAlteredHeaders();
+        $this->assertEquals(array('DKIM-Signature'), $altered);
+        $signer->reset();
+        $signer->setHeaders($headerSet);
+        $this->assertFalse($headerSet->has('DKIM-Signature'));
+        $signer->startBody();
+        $signer->write($messageContent);
+        $signer->endBody();
+        $signer->addSignature($headerSet);
+        $this->assertTrue($headerSet->has('DKIM-Signature'));
+        $dkim = $headerSet->getAll('DKIM-Signature');
+        $sig = reset($dkim);
+        $this->assertEquals($sig->getValue(), 'v=1; a=rsa-sha256; bh=f+W+hu8dIhf2VAni89o8lF6WKTXi7nViA4RrMdpD5/U=; d=dummy.nxdomain.be; h=; i=@dummy.nxdomain.be; s=dummySelector; c=simple/relaxed; t=1299879181; b=M5eomH/zamyzix9kOes+6YLzQZxuJdBP4x3nP9zF2N26eMLG2/cBKbnNyqiOTDhJdYfWPbLIa 1CWnjST0j5p4CpeOkGYuiE+M4TWEZwhRmRWootlPO3Ii6XpbBJKFk1o9zviS7OmXblUUE4aqb yRSIMDhtLdCK5GlaCneFLN7RQ=');
+    }
+
+    // -- Creation Methods
+    private function _createHeaderSet()
+    {
+        $cache = new Swift_KeyCache_ArrayKeyCache(new Swift_KeyCache_SimpleKeyCacheInputStream());
+        $factory = new Swift_CharacterReaderFactory_SimpleCharacterReaderFactory();
+        $contentEncoder = new Swift_Mime_ContentEncoder_Base64ContentEncoder();
+
+        $headerEncoder = new Swift_Mime_HeaderEncoder_QpHeaderEncoder(new Swift_CharacterStream_ArrayCharacterStream($factory, 'utf-8'));
+        $paramEncoder = new Swift_Encoder_Rfc2231Encoder(new Swift_CharacterStream_ArrayCharacterStream($factory, 'utf-8'));
+        $grammar = new Swift_Mime_Grammar();
+        $headers = new Swift_Mime_SimpleHeaderSet(new Swift_Mime_SimpleHeaderFactory($headerEncoder, $paramEncoder, $grammar));
+
+        return $headers;
+    }
+
+    /**
+     * @return Swift_Mime_Headers
+     */
+    private function _createHeaders()
+    {
+        $x = 0;
+        $cache = new Swift_KeyCache_ArrayKeyCache(new Swift_KeyCache_SimpleKeyCacheInputStream());
+        $factory = new Swift_CharacterReaderFactory_SimpleCharacterReaderFactory();
+        $contentEncoder = new Swift_Mime_ContentEncoder_Base64ContentEncoder();
+
+        $headerEncoder = new Swift_Mime_HeaderEncoder_QpHeaderEncoder(new Swift_CharacterStream_ArrayCharacterStream($factory, 'utf-8'));
+        $paramEncoder = new Swift_Encoder_Rfc2231Encoder(new Swift_CharacterStream_ArrayCharacterStream($factory, 'utf-8'));
+        $grammar = new Swift_Mime_Grammar();
+        $headerFactory = new Swift_Mime_SimpleHeaderFactory($headerEncoder, $paramEncoder, $grammar);
+        $headers = $this->getMockery('Swift_Mime_HeaderSet');
+
+        $headers->shouldReceive('listAll')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('From', 'To', 'Date', 'Subject'));
+        $headers->shouldReceive('has')
+                ->zeroOrMoreTimes()
+                ->with('From')
+                ->andReturn(true);
+        $headers->shouldReceive('getAll')
+                ->zeroOrMoreTimes()
+                ->with('From')
+                ->andReturn(array($headerFactory->createMailboxHeader('From', 'test@test.test')));
+        $headers->shouldReceive('has')
+                ->zeroOrMoreTimes()
+                ->with('To')
+                ->andReturn(true);
+        $headers->shouldReceive('getAll')
+                ->zeroOrMoreTimes()
+                ->with('To')
+                ->andReturn(array($headerFactory->createMailboxHeader('To', 'test@test.test')));
+        $headers->shouldReceive('has')
+                ->zeroOrMoreTimes()
+                ->with('Date')
+                ->andReturn(true);
+        $headers->shouldReceive('getAll')
+                ->zeroOrMoreTimes()
+                ->with('Date')
+                ->andReturn(array($headerFactory->createTextHeader('Date', 'Fri, 11 Mar 2011 20:56:12 +0000 (GMT)')));
+        $headers->shouldReceive('has')
+                ->zeroOrMoreTimes()
+                ->with('Subject')
+                ->andReturn(true);
+        $headers->shouldReceive('getAll')
+                ->zeroOrMoreTimes()
+                ->with('Subject')
+                ->andReturn(array($headerFactory->createTextHeader('Subject', 'Foo Bar Text Message')));
+        $headers->shouldReceive('addTextHeader')
+                ->zeroOrMoreTimes()
+                ->with('DKIM-Signature', \Mockery::any())
+                ->andReturn(true);
+        $headers->shouldReceive('getAll')
+                ->zeroOrMoreTimes()
+                ->with('DKIM-Signature')
+                ->andReturn(array($headerFactory->createTextHeader('DKIM-Signature', 'Foo Bar Text Message')));
+
+        return $headers;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Signers/OpenDKIMSignerTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Signers/OpenDKIMSignerTest.php
new file mode 100644
index 000000000..00e48c139
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Signers/OpenDKIMSignerTest.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * @todo
+ */
+class Swift_Signers_OpenDKIMSignerTest extends \SwiftMailerTestCase
+{
+    public function setUp()
+    {
+        if (!extension_loaded('opendkim')) {
+            $this->markTestSkipped(
+                'Need OpenDKIM extension run these tests.'
+             );
+        }
+    }
+
+    public function testBasicSigningHeaderManipulation()
+    {
+    }
+
+    // Default Signing
+    public function testSigningDefaults()
+    {
+    }
+
+    // SHA256 Signing
+    public function testSigning256()
+    {
+    }
+
+    // Relaxed/Relaxed Hash Signing
+    public function testSigningRelaxedRelaxed256()
+    {
+    }
+
+    // Relaxed/Simple Hash Signing
+    public function testSigningRelaxedSimple256()
+    {
+    }
+
+    // Simple/Relaxed Hash Signing
+    public function testSigningSimpleRelaxed256()
+    {
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Signers/SMimeSignerTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Signers/SMimeSignerTest.php
new file mode 100644
index 000000000..df745ef2d
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Signers/SMimeSignerTest.php
@@ -0,0 +1,554 @@
+<?php
+
+class Swift_Signers_SMimeSignerTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Swift_StreamFilters_StringReplacementFilterFactory
+     */
+    protected $replacementFactory;
+
+    protected $samplesDir;
+
+    public function setUp()
+    {
+        $this->replacementFactory = Swift_DependencyContainer::getInstance()
+            ->lookup('transport.replacementfactory');
+
+        $this->samplesDir = str_replace('\\', '/', realpath(__DIR__.'/../../../_samples/')).'/';
+    }
+
+    public function testUnSingedMessage()
+    {
+        $message = Swift_SignedMessage::newInstance('Wonderful Subject')
+          ->setFrom(array('john@doe.com' => 'John Doe'))
+          ->setTo(array('receiver@domain.org', 'other@domain.org' => 'A name'))
+          ->setBody('Here is the message itself');
+
+        $this->assertEquals('Here is the message itself', $message->getBody());
+    }
+
+    public function testSingedMessage()
+    {
+        $message = Swift_SignedMessage::newInstance('Wonderful Subject')
+          ->setFrom(array('john@doe.com' => 'John Doe'))
+          ->setTo(array('receiver@domain.org', 'other@domain.org' => 'A name'))
+          ->setBody('Here is the message itself');
+
+        $signer = new Swift_Signers_SMimeSigner();
+        $signer->setSignCertificate($this->samplesDir.'smime/sign.crt', $this->samplesDir.'smime/sign.key');
+        $message->attachSigner($signer);
+
+        $messageStream = $this->newFilteredStream();
+        $message->toByteStream($messageStream);
+        $messageStream->commit();
+
+        $entityString = $messageStream->getContent();
+        $headers = self::getHeadersOfMessage($entityString);
+
+        if (!($boundary = $this->getBoundary($headers['content-type']))) {
+            return false;
+        }
+
+        $expectedBody = <<<OEL
+This is an S/MIME signed message
+
+--$boundary
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: quoted-printable
+
+Here is the message itself
+--$boundary
+Content-Type: application/(x\-)?pkcs7-signature; name="smime\.p7s"
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename="smime\.p7s"
+
+(?:^[a-zA-Z0-9\/\\r\\n+]*={0,2})
+
+--$boundary--
+OEL;
+        $this->assertValidVerify($expectedBody, $messageStream);
+        unset($messageStream);
+    }
+
+    public function testSingedMessageExtraCerts()
+    {
+        $message = Swift_SignedMessage::newInstance('Wonderful Subject')
+          ->setFrom(array('john@doe.com' => 'John Doe'))
+          ->setTo(array('receiver@domain.org', 'other@domain.org' => 'A name'))
+          ->setBody('Here is the message itself');
+
+        $signer = new Swift_Signers_SMimeSigner();
+        $signer->setSignCertificate($this->samplesDir.'smime/sign2.crt', $this->samplesDir.'smime/sign2.key', PKCS7_DETACHED, $this->samplesDir.'smime/intermediate.crt');
+        $message->attachSigner($signer);
+
+        $messageStream = $this->newFilteredStream();
+        $message->toByteStream($messageStream);
+        $messageStream->commit();
+
+        $entityString = $messageStream->getContent();
+        $headers = self::getHeadersOfMessage($entityString);
+
+        if (!($boundary = $this->getBoundary($headers['content-type']))) {
+            return false;
+        }
+
+        $expectedBody = <<<OEL
+This is an S/MIME signed message
+
+--$boundary
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: quoted-printable
+
+Here is the message itself
+--$boundary
+Content-Type: application/(x\-)?pkcs7-signature; name="smime\.p7s"
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename="smime\.p7s"
+
+(?:^[a-zA-Z0-9\/\\r\\n+]*={0,2})
+
+--$boundary--
+OEL;
+        $this->assertValidVerify($expectedBody, $messageStream);
+        unset($messageStream);
+    }
+
+    public function testSingedMessageBinary()
+    {
+        $message = Swift_SignedMessage::newInstance('Wonderful Subject')
+          ->setFrom(array('john@doe.com' => 'John Doe'))
+          ->setTo(array('receiver@domain.org', 'other@domain.org' => 'A name'))
+          ->setBody('Here is the message itself');
+
+        $signer = new Swift_Signers_SMimeSigner();
+        $signer->setSignCertificate($this->samplesDir.'smime/sign.crt', $this->samplesDir.'smime/sign.key', PKCS7_BINARY);
+        $message->attachSigner($signer);
+
+        $messageStream = $this->newFilteredStream();
+        $message->toByteStream($messageStream);
+        $messageStream->commit();
+
+        $entityString = $messageStream->getContent();
+        $headers = self::getHeadersOfMessage($entityString);
+
+        if (!preg_match('#^application/(x\-)?pkcs7-mime; smime-type=signed\-data;#', $headers['content-type'])) {
+            $this->fail('Content-type does not match.');
+
+            return false;
+        }
+
+        $this->assertEquals($headers['content-transfer-encoding'], 'base64');
+        $this->assertEquals($headers['content-disposition'], 'attachment; filename="smime.p7m"');
+
+        $expectedBody = '(?:^[a-zA-Z0-9\/\\r\\n+]*={0,2})';
+
+        $messageStreamClean = $this->newFilteredStream();
+
+        $this->assertValidVerify($expectedBody, $messageStream);
+        unset($messageStreamClean, $messageStream);
+    }
+
+    public function testSingedMessageWithAttachments()
+    {
+        $message = Swift_SignedMessage::newInstance('Wonderful Subject')
+          ->setFrom(array('john@doe.com' => 'John Doe'))
+          ->setTo(array('receiver@domain.org', 'other@domain.org' => 'A name'))
+          ->setBody('Here is the message itself');
+
+        $message->attach(Swift_Attachment::fromPath($this->samplesDir.'/files/textfile.zip'));
+
+        $signer = new Swift_Signers_SMimeSigner();
+        $signer->setSignCertificate($this->samplesDir.'smime/sign.crt', $this->samplesDir.'smime/sign.key');
+        $message->attachSigner($signer);
+
+        $messageStream = $this->newFilteredStream();
+        $message->toByteStream($messageStream);
+        $messageStream->commit();
+
+        $entityString = $messageStream->getContent();
+        $headers = self::getHeadersOfMessage($entityString);
+
+        if (!($boundary = $this->getBoundary($headers['content-type']))) {
+            return false;
+        }
+
+        $expectedBody = <<<OEL
+This is an S/MIME signed message
+
+--$boundary
+Content-Type: multipart/mixed;
+ boundary="([a-z0-9\\'\\(\\)\\+_\\-,\\.\\/:=\\?\\ ]{0,69}[a-z0-9\\'\\(\\)\\+_\\-,\\.\\/:=\\?])"
+
+
+--\\1
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: quoted-printable
+
+Here is the message itself
+
+--\\1
+Content-Type: application/zip; name=textfile\\.zip
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename=textfile\\.zip
+
+UEsDBAoAAgAAAMi6VjiOTiKwLgAAAC4AAAAMABUAdGV4dGZpbGUudHh0VVQJAAN3vr5Hd76\\+R1V4
+BAD1AfUBVGhpcyBpcyBwYXJ0IG9mIGEgU3dpZnQgTWFpbGVyIHY0IHNtb2tlIHRlc3QuClBLAQIX
+AwoAAgAAAMi6VjiOTiKwLgAAAC4AAAAMAA0AAAAAAAEAAACkgQAAAAB0ZXh0ZmlsZS50eHRVVAUA
+A3e\\+vkdVeAAAUEsFBgAAAAABAAEARwAAAG0AAAAAAA==
+
+--\\1--
+
+--$boundary
+Content-Type: application/(x\-)?pkcs7-signature; name="smime\\.p7s"
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename="smime\\.p7s"
+
+(?:^[a-zA-Z0-9\/\\r\\n+]*={0,2})
+
+--$boundary--
+OEL;
+
+        $this->assertValidVerify($expectedBody, $messageStream);
+        unset($messageStream);
+    }
+
+    public function testEncryptedMessage()
+    {
+        $message = Swift_SignedMessage::newInstance('Wonderful Subject')
+          ->setFrom(array('john@doe.com' => 'John Doe'))
+          ->setTo(array('receiver@domain.org', 'other@domain.org' => 'A name'))
+          ->setBody('Here is the message itself');
+
+        $originalMessage = $this->cleanMessage($message->toString());
+
+        $signer = new Swift_Signers_SMimeSigner();
+        $signer->setEncryptCertificate($this->samplesDir.'smime/encrypt.crt');
+        $message->attachSigner($signer);
+
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $message->toByteStream($messageStream);
+        $messageStream->commit();
+
+        $entityString = $messageStream->getContent();
+        $headers = self::getHeadersOfMessage($entityString);
+
+        if (!preg_match('#^application/(x\-)?pkcs7-mime; smime-type=enveloped\-data;#', $headers['content-type'])) {
+            $this->fail('Content-type does not match.');
+
+            return false;
+        }
+
+        $expectedBody = '(?:^[a-zA-Z0-9\/\\r\\n+]*={0,2})';
+
+        $decryptedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
+
+        if (!openssl_pkcs7_decrypt($messageStream->getPath(), $decryptedMessageStream->getPath(), 'file://'.$this->samplesDir.'smime/encrypt.crt', array('file://'.$this->samplesDir.'smime/encrypt.key', 'swift'))) {
+            $this->fail(sprintf('Decrypt of the message failed. Internal error "%s".', openssl_error_string()));
+        }
+
+        $this->assertEquals($originalMessage, $decryptedMessageStream->getContent());
+        unset($decryptedMessageStream, $messageStream);
+    }
+
+    public function testEncryptedMessageWithMultipleCerts()
+    {
+        $message = Swift_SignedMessage::newInstance('Wonderful Subject')
+          ->setFrom(array('john@doe.com' => 'John Doe'))
+          ->setTo(array('receiver@domain.org', 'other@domain.org' => 'A name'))
+          ->setBody('Here is the message itself');
+
+        $originalMessage = $this->cleanMessage($message->toString());
+
+        $signer = new Swift_Signers_SMimeSigner();
+        $signer->setEncryptCertificate(array($this->samplesDir.'smime/encrypt.crt', $this->samplesDir.'smime/encrypt2.crt'));
+        $message->attachSigner($signer);
+
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $message->toByteStream($messageStream);
+        $messageStream->commit();
+
+        $entityString = $messageStream->getContent();
+        $headers = self::getHeadersOfMessage($entityString);
+
+        if (!preg_match('#^application/(x\-)?pkcs7-mime; smime-type=enveloped\-data;#', $headers['content-type'])) {
+            $this->fail('Content-type does not match.');
+
+            return false;
+        }
+
+        $expectedBody = '(?:^[a-zA-Z0-9\/\\r\\n+]*={0,2})';
+
+        $decryptedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
+
+        if (!openssl_pkcs7_decrypt($messageStream->getPath(), $decryptedMessageStream->getPath(), 'file://'.$this->samplesDir.'smime/encrypt.crt', array('file://'.$this->samplesDir.'smime/encrypt.key', 'swift'))) {
+            $this->fail(sprintf('Decrypt of the message failed. Internal error "%s".', openssl_error_string()));
+        }
+
+        $this->assertEquals($originalMessage, $decryptedMessageStream->getContent());
+        unset($decryptedMessageStream);
+
+        $decryptedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
+
+        if (!openssl_pkcs7_decrypt($messageStream->getPath(), $decryptedMessageStream->getPath(), 'file://'.$this->samplesDir.'smime/encrypt2.crt', array('file://'.$this->samplesDir.'smime/encrypt2.key', 'swift'))) {
+            $this->fail(sprintf('Decrypt of the message failed. Internal error "%s".', openssl_error_string()));
+        }
+
+        $this->assertEquals($originalMessage, $decryptedMessageStream->getContent());
+        unset($decryptedMessageStream, $messageStream);
+    }
+
+    public function testSignThenEncryptedMessage()
+    {
+        $message = Swift_SignedMessage::newInstance('Wonderful Subject')
+          ->setFrom(array('john@doe.com' => 'John Doe'))
+          ->setTo(array('receiver@domain.org', 'other@domain.org' => 'A name'))
+          ->setBody('Here is the message itself');
+
+        $signer = new Swift_Signers_SMimeSigner();
+        $signer->setSignCertificate($this->samplesDir.'smime/sign.crt', $this->samplesDir.'smime/sign.key');
+        $signer->setEncryptCertificate($this->samplesDir.'smime/encrypt.crt');
+        $message->attachSigner($signer);
+
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $message->toByteStream($messageStream);
+        $messageStream->commit();
+
+        $entityString = $messageStream->getContent();
+        $headers = self::getHeadersOfMessage($entityString);
+
+        if (!preg_match('#^application/(x\-)?pkcs7-mime; smime-type=enveloped\-data;#', $headers['content-type'])) {
+            $this->fail('Content-type does not match.');
+
+            return false;
+        }
+
+        $expectedBody = '(?:^[a-zA-Z0-9\/\\r\\n+]*={0,2})';
+
+        $decryptedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
+
+        if (!openssl_pkcs7_decrypt($messageStream->getPath(), $decryptedMessageStream->getPath(), 'file://'.$this->samplesDir.'smime/encrypt.crt', array('file://'.$this->samplesDir.'smime/encrypt.key', 'swift'))) {
+            $this->fail(sprintf('Decrypt of the message failed. Internal error "%s".', openssl_error_string()));
+        }
+
+        $entityString = $decryptedMessageStream->getContent();
+        $headers = self::getHeadersOfMessage($entityString);
+
+        if (!($boundary = $this->getBoundary($headers['content-type']))) {
+            return false;
+        }
+
+        $expectedBody = <<<OEL
+This is an S/MIME signed message
+
+--$boundary
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: quoted-printable
+
+Here is the message itself
+--$boundary
+Content-Type: application/(x\-)?pkcs7-signature; name="smime\.p7s"
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename="smime\.p7s"
+
+(?:^[a-zA-Z0-9\/\\r\\n+]*={0,2})
+
+--$boundary--
+OEL;
+
+        if (!$this->assertValidVerify($expectedBody, $decryptedMessageStream)) {
+            return false;
+        }
+
+        unset($decryptedMessageStream, $messageStream);
+    }
+
+    public function testEncryptThenSignMessage()
+    {
+        $message = Swift_SignedMessage::newInstance('Wonderful Subject')
+          ->setFrom(array('john@doe.com' => 'John Doe'))
+          ->setTo(array('receiver@domain.org', 'other@domain.org' => 'A name'))
+          ->setBody('Here is the message itself');
+
+        $originalMessage = $this->cleanMessage($message->toString());
+
+        $signer = Swift_Signers_SMimeSigner::newInstance();
+        $signer->setSignCertificate($this->samplesDir.'smime/sign.crt', $this->samplesDir.'smime/sign.key');
+        $signer->setEncryptCertificate($this->samplesDir.'smime/encrypt.crt');
+        $signer->setSignThenEncrypt(false);
+        $message->attachSigner($signer);
+
+        $messageStream = $this->newFilteredStream();
+        $message->toByteStream($messageStream);
+        $messageStream->commit();
+
+        $entityString = $messageStream->getContent();
+        $headers = self::getHeadersOfMessage($entityString);
+
+        if (!($boundary = $this->getBoundary($headers['content-type']))) {
+            return false;
+        }
+
+        $expectedBody = <<<OEL
+This is an S/MIME signed message
+
+--$boundary
+(?P<encrypted_message>MIME-Version: 1\.0
+Content-Disposition: attachment; filename="smime\.p7m"
+Content-Type: application/(x\-)?pkcs7-mime; smime-type=enveloped-data; name="smime\.p7m"
+Content-Transfer-Encoding: base64
+
+(?:^[a-zA-Z0-9\/\\r\\n+]*={0,2})
+
+
+)--$boundary
+Content-Type: application/(x\-)?pkcs7-signature; name="smime\.p7s"
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename="smime\.p7s"
+
+(?:^[a-zA-Z0-9\/\\r\\n+]*={0,2})
+
+--$boundary--
+OEL;
+
+        if (!$this->assertValidVerify($expectedBody, $messageStream)) {
+            return false;
+        }
+
+        $expectedBody = str_replace("\n", "\r\n", $expectedBody);
+        if (!preg_match('%'.$expectedBody.'*%m', $entityString, $entities)) {
+            $this->fail('Failed regex match.');
+
+            return false;
+        }
+
+        $messageStreamClean = new Swift_ByteStream_TemporaryFileByteStream();
+        $messageStreamClean->write($entities['encrypted_message']);
+
+        $decryptedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
+
+        if (!openssl_pkcs7_decrypt($messageStreamClean->getPath(), $decryptedMessageStream->getPath(), 'file://'.$this->samplesDir.'smime/encrypt.crt', array('file://'.$this->samplesDir.'smime/encrypt.key', 'swift'))) {
+            $this->fail(sprintf('Decrypt of the message failed. Internal error "%s".', openssl_error_string()));
+        }
+
+        $this->assertEquals($originalMessage, $decryptedMessageStream->getContent());
+        unset($messageStreamClean, $messageStream, $decryptedMessageStream);
+    }
+
+    protected function assertValidVerify($expected, Swift_ByteStream_TemporaryFileByteStream $messageStream)
+    {
+        $actual = $messageStream->getContent();
+
+        // File is UNIX encoded so convert them to correct line ending
+        $expected = str_replace("\n", "\r\n", $expected);
+
+        $actual = trim(self::getBodyOfMessage($actual));
+        if (!$this->assertRegExp('%^'.$expected.'$\s*%m', $actual)) {
+            return false;
+        }
+
+        $opensslOutput = new Swift_ByteStream_TemporaryFileByteStream();
+        $verify = openssl_pkcs7_verify($messageStream->getPath(), null, $opensslOutput->getPath(), array($this->samplesDir.'smime/ca.crt'));
+
+        if (false === $verify) {
+            $this->fail('Verification of the message failed.');
+
+            return false;
+        } elseif (-1 === $verify) {
+            $this->fail(sprintf('Verification of the message failed. Internal error "%s".', openssl_error_string()));
+
+            return false;
+        }
+
+        return true;
+    }
+
+    protected function getBoundary($contentType)
+    {
+        if (!preg_match('/boundary=("[^"]+"|(?:[^\s]+|$))/is', $contentType, $contentTypeData)) {
+            $this->fail('Failed to find Boundary parameter');
+
+            return false;
+        }
+
+        return trim($contentTypeData[1], '"');
+    }
+
+    protected function newFilteredStream()
+    {
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $messageStream->addFilter($this->replacementFactory->createFilter("\r\n", "\n"), 'CRLF to LF');
+        $messageStream->addFilter($this->replacementFactory->createFilter("\n", "\r\n"), 'LF to CRLF');
+
+        return $messageStream;
+    }
+
+    protected static function getBodyOfMessage($message)
+    {
+        return substr($message, strpos($message, "\r\n\r\n"));
+    }
+
+    /**
+     * Strips of the sender headers and Mime-Version.
+     *
+     * @param Swift_ByteStream_TemporaryFileByteStream $messageStream
+     * @param Swift_ByteStream_TemporaryFileByteStream $inputStream
+     */
+    protected function cleanMessage($content)
+    {
+        $newContent = '';
+
+        $headers = self::getHeadersOfMessage($content);
+        foreach ($headers as $headerName => $value) {
+            if (!in_array($headerName, array('content-type', 'content-transfer-encoding', 'content-disposition'))) {
+                continue;
+            }
+
+            $headerName = explode('-', $headerName);
+            $headerName = array_map('ucfirst', $headerName);
+            $headerName = implode('-', $headerName);
+
+            if (strlen($value) > 62) {
+                $value = wordwrap($value, 62, "\n ");
+            }
+
+            $newContent .= "$headerName: $value\r\n";
+        }
+
+        return $newContent."\r\n".ltrim(self::getBodyOfMessage($content));
+    }
+
+    /**
+     * Returns the headers of the message.
+     *
+     * Header-names are lowercase.
+     *
+     * @param string $message
+     *
+     * @return array
+     */
+    protected static function getHeadersOfMessage($message)
+    {
+        $headersPosEnd = strpos($message, "\r\n\r\n");
+        $headerData = substr($message, 0, $headersPosEnd);
+        $headerLines = explode("\r\n", $headerData);
+
+        if (empty($headerLines)) {
+            return array();
+        }
+
+        $headers = array();
+
+        foreach ($headerLines as $headerLine) {
+            if (ctype_space($headerLines[0]) || false === strpos($headerLine, ':')) {
+                $headers[$currentHeaderName] .= ' '.trim($headerLine);
+                continue;
+            }
+
+            $header = explode(':', $headerLine, 2);
+            $currentHeaderName = strtolower($header[0]);
+            $headers[$currentHeaderName] = trim($header[1]);
+        }
+
+        return $headers;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/StreamFilters/ByteArrayReplacementFilterTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/StreamFilters/ByteArrayReplacementFilterTest.php
new file mode 100644
index 000000000..e4d4f48d8
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/StreamFilters/ByteArrayReplacementFilterTest.php
@@ -0,0 +1,131 @@
+<?php
+
+class Swift_StreamFilters_ByteArrayReplacementFilterTest extends \PHPUnit_Framework_TestCase
+{
+    public function testBasicReplacementsAreMade()
+    {
+        $filter = $this->_createFilter(array(0x61, 0x62), array(0x63, 0x64));
+        $this->assertEquals(
+            array(0x59, 0x60, 0x63, 0x64, 0x65),
+            $filter->filter(array(0x59, 0x60, 0x61, 0x62, 0x65))
+            );
+    }
+
+    public function testShouldBufferReturnsTrueIfPartialMatchAtEndOfBuffer()
+    {
+        $filter = $this->_createFilter(array(0x61, 0x62), array(0x63, 0x64));
+        $this->assertTrue($filter->shouldBuffer(array(0x59, 0x60, 0x61)),
+            '%s: Filter should buffer since 0x61 0x62 is the needle and the ending '.
+            '0x61 could be from 0x61 0x62'
+            );
+    }
+
+    public function testFilterCanMakeMultipleReplacements()
+    {
+        $filter = $this->_createFilter(array(array(0x61), array(0x62)), array(0x63));
+        $this->assertEquals(
+            array(0x60, 0x63, 0x60, 0x63, 0x60),
+            $filter->filter(array(0x60, 0x61, 0x60, 0x62, 0x60))
+            );
+    }
+
+    public function testMultipleReplacementsCanBeDifferent()
+    {
+        $filter = $this->_createFilter(array(array(0x61), array(0x62)), array(array(0x63), array(0x64)));
+        $this->assertEquals(
+            array(0x60, 0x63, 0x60, 0x64, 0x60),
+            $filter->filter(array(0x60, 0x61, 0x60, 0x62, 0x60))
+            );
+    }
+
+    public function testShouldBufferReturnsFalseIfPartialMatchNotAtEndOfString()
+    {
+        $filter = $this->_createFilter(array(0x0D, 0x0A), array(0x0A));
+        $this->assertFalse($filter->shouldBuffer(array(0x61, 0x62, 0x0D, 0x0A, 0x63)),
+            '%s: Filter should not buffer since x0Dx0A is the needle and is not at EOF'
+            );
+    }
+
+    public function testShouldBufferReturnsTrueIfAnyOfMultipleMatchesAtEndOfString()
+    {
+        $filter = $this->_createFilter(array(array(0x61, 0x62), array(0x63)), array(0x64));
+        $this->assertTrue($filter->shouldBuffer(array(0x59, 0x60, 0x61)),
+            '%s: Filter should buffer since 0x61 0x62 is a needle and the ending '.
+            '0x61 could be from 0x61 0x62'
+            );
+    }
+
+    public function testConvertingAllLineEndingsToCRLFWhenInputIsLF()
+    {
+        $filter = $this->_createFilter(
+            array(array(0x0D, 0x0A), array(0x0D), array(0x0A)),
+            array(array(0x0A), array(0x0A), array(0x0D, 0x0A))
+            );
+
+        $this->assertEquals(
+            array(0x60, 0x0D, 0x0A, 0x61, 0x0D, 0x0A, 0x62, 0x0D, 0x0A, 0x63),
+            $filter->filter(array(0x60, 0x0A, 0x61, 0x0A, 0x62, 0x0A, 0x63))
+            );
+    }
+
+    public function testConvertingAllLineEndingsToCRLFWhenInputIsCR()
+    {
+        $filter = $this->_createFilter(
+            array(array(0x0D, 0x0A), array(0x0D), array(0x0A)),
+            array(array(0x0A), array(0x0A), array(0x0D, 0x0A))
+            );
+
+        $this->assertEquals(
+            array(0x60, 0x0D, 0x0A, 0x61, 0x0D, 0x0A, 0x62, 0x0D, 0x0A, 0x63),
+            $filter->filter(array(0x60, 0x0D, 0x61, 0x0D, 0x62, 0x0D, 0x63))
+            );
+    }
+
+    public function testConvertingAllLineEndingsToCRLFWhenInputIsCRLF()
+    {
+        $filter = $this->_createFilter(
+            array(array(0x0D, 0x0A), array(0x0D), array(0x0A)),
+            array(array(0x0A), array(0x0A), array(0x0D, 0x0A))
+            );
+
+        $this->assertEquals(
+            array(0x60, 0x0D, 0x0A, 0x61, 0x0D, 0x0A, 0x62, 0x0D, 0x0A, 0x63),
+            $filter->filter(array(0x60, 0x0D, 0x0A, 0x61, 0x0D, 0x0A, 0x62, 0x0D, 0x0A, 0x63))
+            );
+    }
+
+    public function testConvertingAllLineEndingsToCRLFWhenInputIsLFCR()
+    {
+        $filter = $this->_createFilter(
+            array(array(0x0D, 0x0A), array(0x0D), array(0x0A)),
+            array(array(0x0A), array(0x0A), array(0x0D, 0x0A))
+            );
+
+        $this->assertEquals(
+            array(0x60, 0x0D, 0x0A, 0x0D, 0x0A, 0x61, 0x0D, 0x0A, 0x0D, 0x0A, 0x62, 0x0D, 0x0A, 0x0D, 0x0A, 0x63),
+            $filter->filter(array(0x60, 0x0A, 0x0D, 0x61, 0x0A, 0x0D, 0x62, 0x0A, 0x0D, 0x63))
+            );
+    }
+
+    public function testConvertingAllLineEndingsToCRLFWhenInputContainsLFLF()
+    {
+        //Lighthouse Bug #23
+
+        $filter = $this->_createFilter(
+            array(array(0x0D, 0x0A), array(0x0D), array(0x0A)),
+            array(array(0x0A), array(0x0A), array(0x0D, 0x0A))
+            );
+
+        $this->assertEquals(
+            array(0x60, 0x0D, 0x0A, 0x0D, 0x0A, 0x61, 0x0D, 0x0A, 0x0D, 0x0A, 0x62, 0x0D, 0x0A, 0x0D, 0x0A, 0x63),
+            $filter->filter(array(0x60, 0x0A, 0x0A, 0x61, 0x0A, 0x0A, 0x62, 0x0A, 0x0A, 0x63))
+            );
+    }
+
+    // -- Creation methods
+
+    private function _createFilter($search, $replace)
+    {
+        return new Swift_StreamFilters_ByteArrayReplacementFilter($search, $replace);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/StreamFilters/StringReplacementFilterFactoryTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/StreamFilters/StringReplacementFilterFactoryTest.php
new file mode 100644
index 000000000..bd44f5c74
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/StreamFilters/StringReplacementFilterFactoryTest.php
@@ -0,0 +1,38 @@
+<?php
+
+class Swift_StreamFilters_StringReplacementFilterFactoryTest extends \PHPUnit_Framework_TestCase
+{
+    public function testInstancesOfStringReplacementFilterAreCreated()
+    {
+        $factory = $this->_createFactory();
+        $this->assertInstanceof(
+            'Swift_StreamFilters_StringReplacementFilter',
+            $factory->createFilter('a', 'b')
+        );
+    }
+
+    public function testSameInstancesAreCached()
+    {
+        $factory = $this->_createFactory();
+        $filter1 = $factory->createFilter('a', 'b');
+        $filter2 = $factory->createFilter('a', 'b');
+        $this->assertSame($filter1, $filter2, '%s: Instances should be cached');
+    }
+
+    public function testDifferingInstancesAreNotCached()
+    {
+        $factory = $this->_createFactory();
+        $filter1 = $factory->createFilter('a', 'b');
+        $filter2 = $factory->createFilter('a', 'c');
+        $this->assertNotEquals($filter1, $filter2,
+            '%s: Differing instances should not be cached'
+            );
+    }
+
+    // -- Creation methods
+
+    private function _createFactory()
+    {
+        return new Swift_StreamFilters_StringReplacementFilterFactory();
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/StreamFilters/StringReplacementFilterTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/StreamFilters/StringReplacementFilterTest.php
new file mode 100644
index 000000000..7a98a2f27
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/StreamFilters/StringReplacementFilterTest.php
@@ -0,0 +1,55 @@
+<?php
+
+class Swift_StreamFilters_StringReplacementFilterTest extends \PHPUnit_Framework_TestCase
+{
+    public function testBasicReplacementsAreMade()
+    {
+        $filter = $this->_createFilter('foo', 'bar');
+        $this->assertEquals('XbarYbarZ', $filter->filter('XfooYfooZ'));
+    }
+
+    public function testShouldBufferReturnsTrueIfPartialMatchAtEndOfBuffer()
+    {
+        $filter = $this->_createFilter('foo', 'bar');
+        $this->assertTrue($filter->shouldBuffer('XfooYf'),
+            '%s: Filter should buffer since "foo" is the needle and the ending '.
+            '"f" could be from "foo"'
+            );
+    }
+
+    public function testFilterCanMakeMultipleReplacements()
+    {
+        $filter = $this->_createFilter(array('a', 'b'), 'foo');
+        $this->assertEquals('XfooYfooZ', $filter->filter('XaYbZ'));
+    }
+
+    public function testMultipleReplacementsCanBeDifferent()
+    {
+        $filter = $this->_createFilter(array('a', 'b'), array('foo', 'zip'));
+        $this->assertEquals('XfooYzipZ', $filter->filter('XaYbZ'));
+    }
+
+    public function testShouldBufferReturnsFalseIfPartialMatchNotAtEndOfString()
+    {
+        $filter = $this->_createFilter("\r\n", "\n");
+        $this->assertFalse($filter->shouldBuffer("foo\r\nbar"),
+            '%s: Filter should not buffer since x0Dx0A is the needle and is not at EOF'
+            );
+    }
+
+    public function testShouldBufferReturnsTrueIfAnyOfMultipleMatchesAtEndOfString()
+    {
+        $filter = $this->_createFilter(array('foo', 'zip'), 'bar');
+        $this->assertTrue($filter->shouldBuffer('XfooYzi'),
+            '%s: Filter should buffer since "zip" is a needle and the ending '.
+            '"zi" could be from "zip"'
+            );
+    }
+
+    // -- Creation methods
+
+    private function _createFilter($search, $replace)
+    {
+        return new Swift_StreamFilters_StringReplacementFilter($search, $replace);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpEventSupportTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpEventSupportTest.php
new file mode 100644
index 000000000..121aaba09
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpEventSupportTest.php
@@ -0,0 +1,560 @@
+<?php
+
+require_once __DIR__.'/AbstractSmtpTest.php';
+
+abstract class Swift_Transport_AbstractSmtpEventSupportTest extends Swift_Transport_AbstractSmtpTest
+{
+    public function testRegisterPluginLoadsPluginInEventDispatcher()
+    {
+        $buf = $this->_getBuffer();
+        $dispatcher = $this->_createEventDispatcher(false);
+        $listener = $this->getMockery('Swift_Events_EventListener');
+        $smtp = $this->_getTransport($buf, $dispatcher);
+        $dispatcher->shouldReceive('bindEventListener')
+                   ->once()
+                   ->with($listener);
+
+        $smtp->registerPlugin($listener);
+    }
+
+    public function testSendingDispatchesBeforeSendEvent()
+    {
+        $buf = $this->_getBuffer();
+        $dispatcher = $this->_createEventDispatcher(false);
+        $message = $this->_createMessage();
+        $smtp = $this->_getTransport($buf, $dispatcher);
+        $evt = $this->getMockery('Swift_Events_SendEvent')->shouldIgnoreMissing();
+
+        $message->shouldReceive('getFrom')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('chris@swiftmailer.org' => null));
+        $message->shouldReceive('getTo')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('mark@swiftmailer.org' => 'Mark'));
+        $dispatcher->shouldReceive('createSendEvent')
+                   ->once()
+                   ->andReturn($evt);
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->once()
+                   ->with($evt, 'beforeSendPerformed');
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->zeroOrMoreTimes();
+        $evt->shouldReceive('bubbleCancelled')
+            ->zeroOrMoreTimes()
+            ->andReturn(false);
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+        $this->assertEquals(1, $smtp->send($message));
+    }
+
+    public function testSendingDispatchesSendEvent()
+    {
+        $buf = $this->_getBuffer();
+        $dispatcher = $this->_createEventDispatcher(false);
+        $message = $this->_createMessage();
+        $smtp = $this->_getTransport($buf, $dispatcher);
+        $evt = $this->getMockery('Swift_Events_SendEvent')->shouldIgnoreMissing();
+
+        $message->shouldReceive('getFrom')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('chris@swiftmailer.org' => null));
+        $message->shouldReceive('getTo')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('mark@swiftmailer.org' => 'Mark'));
+        $dispatcher->shouldReceive('createSendEvent')
+                   ->once()
+                   ->andReturn($evt);
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->once()
+                   ->with($evt, 'sendPerformed');
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->zeroOrMoreTimes();
+        $evt->shouldReceive('bubbleCancelled')
+            ->zeroOrMoreTimes()
+            ->andReturn(false);
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+        $this->assertEquals(1, $smtp->send($message));
+    }
+
+    public function testSendEventCapturesFailures()
+    {
+        $buf = $this->_getBuffer();
+        $dispatcher = $this->_createEventDispatcher(false);
+        $evt = $this->getMockery('Swift_Events_SendEvent')->shouldIgnoreMissing();
+        $smtp = $this->_getTransport($buf, $dispatcher);
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getFrom')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('chris@swiftmailer.org' => null));
+        $message->shouldReceive('getTo')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('mark@swiftmailer.org' => 'Mark'));
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("MAIL FROM:<chris@swiftmailer.org>\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn("250 OK\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("RCPT TO:<mark@swiftmailer.org>\r\n")
+            ->andReturn(2);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(2)
+            ->andReturn("500 Not now\r\n");
+        $dispatcher->shouldReceive('createSendEvent')
+                   ->zeroOrMoreTimes()
+                   ->with($smtp, \Mockery::any())
+                   ->andReturn($evt);
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->once()
+                   ->with($evt, 'sendPerformed');
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->zeroOrMoreTimes();
+        $evt->shouldReceive('bubbleCancelled')
+            ->zeroOrMoreTimes()
+            ->andReturn(false);
+        $evt->shouldReceive('setFailedRecipients')
+            ->once()
+            ->with(array('mark@swiftmailer.org'));
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+        $this->assertEquals(0, $smtp->send($message));
+    }
+
+    public function testSendEventHasResultFailedIfAllFailures()
+    {
+        $buf = $this->_getBuffer();
+        $dispatcher = $this->_createEventDispatcher(false);
+        $evt = $this->getMockery('Swift_Events_SendEvent')->shouldIgnoreMissing();
+        $smtp = $this->_getTransport($buf, $dispatcher);
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getFrom')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('chris@swiftmailer.org' => null));
+        $message->shouldReceive('getTo')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('mark@swiftmailer.org' => 'Mark'));
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("MAIL FROM:<chris@swiftmailer.org>\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn("250 OK\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("RCPT TO:<mark@swiftmailer.org>\r\n")
+            ->andReturn(2);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(2)
+            ->andReturn("500 Not now\r\n");
+        $dispatcher->shouldReceive('createSendEvent')
+                   ->zeroOrMoreTimes()
+                   ->with($smtp, \Mockery::any())
+                   ->andReturn($evt);
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->once()
+                   ->with($evt, 'sendPerformed');
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->zeroOrMoreTimes();
+        $evt->shouldReceive('bubbleCancelled')
+            ->zeroOrMoreTimes()
+            ->andReturn(false);
+        $evt->shouldReceive('setResult')
+            ->once()
+            ->with(Swift_Events_SendEvent::RESULT_FAILED);
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+        $this->assertEquals(0, $smtp->send($message));
+    }
+
+    public function testSendEventHasResultTentativeIfSomeFailures()
+    {
+        $buf = $this->_getBuffer();
+        $dispatcher = $this->_createEventDispatcher(false);
+        $evt = $this->getMockery('Swift_Events_SendEvent')->shouldIgnoreMissing();
+        $smtp = $this->_getTransport($buf, $dispatcher);
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getFrom')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('chris@swiftmailer.org' => null));
+        $message->shouldReceive('getTo')
+                ->zeroOrMoreTimes()
+                ->andReturn(array(
+                    'mark@swiftmailer.org' => 'Mark',
+                    'chris@site.tld' => 'Chris',
+                ));
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("MAIL FROM:<chris@swiftmailer.org>\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn("250 OK\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("RCPT TO:<mark@swiftmailer.org>\r\n")
+            ->andReturn(2);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(2)
+            ->andReturn("500 Not now\r\n");
+        $dispatcher->shouldReceive('createSendEvent')
+                   ->zeroOrMoreTimes()
+                   ->with($smtp, \Mockery::any())
+                   ->andReturn($evt);
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->once()
+                   ->with($evt, 'sendPerformed');
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->zeroOrMoreTimes();
+        $evt->shouldReceive('bubbleCancelled')
+            ->zeroOrMoreTimes()
+            ->andReturn(false);
+        $evt->shouldReceive('setResult')
+            ->once()
+            ->with(Swift_Events_SendEvent::RESULT_TENTATIVE);
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+        $this->assertEquals(1, $smtp->send($message));
+    }
+
+    public function testSendEventHasResultSuccessIfNoFailures()
+    {
+        $buf = $this->_getBuffer();
+        $dispatcher = $this->_createEventDispatcher(false);
+        $evt = $this->getMockery('Swift_Events_SendEvent')->shouldIgnoreMissing();
+        $smtp = $this->_getTransport($buf, $dispatcher);
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getFrom')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('chris@swiftmailer.org' => null));
+        $message->shouldReceive('getTo')
+                ->zeroOrMoreTimes()
+                ->andReturn(array(
+                    'mark@swiftmailer.org' => 'Mark',
+                    'chris@site.tld' => 'Chris',
+                ));
+        $dispatcher->shouldReceive('createSendEvent')
+                   ->zeroOrMoreTimes()
+                   ->with($smtp, \Mockery::any())
+                   ->andReturn($evt);
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->once()
+                   ->with($evt, 'sendPerformed');
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->zeroOrMoreTimes();
+        $evt->shouldReceive('bubbleCancelled')
+            ->zeroOrMoreTimes()
+            ->andReturn(false);
+        $evt->shouldReceive('setResult')
+            ->once()
+            ->with(Swift_Events_SendEvent::RESULT_SUCCESS);
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+        $this->assertEquals(2, $smtp->send($message));
+    }
+
+    public function testCancellingEventBubbleBeforeSendStopsEvent()
+    {
+        $buf = $this->_getBuffer();
+        $dispatcher = $this->_createEventDispatcher(false);
+        $evt = $this->getMockery('Swift_Events_SendEvent')->shouldIgnoreMissing();
+        $smtp = $this->_getTransport($buf, $dispatcher);
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getFrom')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('chris@swiftmailer.org' => null));
+        $message->shouldReceive('getTo')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('mark@swiftmailer.org' => 'Mark'));
+        $dispatcher->shouldReceive('createSendEvent')
+                   ->zeroOrMoreTimes()
+                   ->with($smtp, \Mockery::any())
+                   ->andReturn($evt);
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->once()
+                   ->with($evt, 'beforeSendPerformed');
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->zeroOrMoreTimes();
+        $evt->shouldReceive('bubbleCancelled')
+            ->atLeast()->once()
+            ->andReturn(true);
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+        $this->assertEquals(0, $smtp->send($message));
+    }
+
+    public function testStartingTransportDispatchesTransportChangeEvent()
+    {
+        $buf = $this->_getBuffer();
+        $dispatcher = $this->_createEventDispatcher(false);
+        $evt = $this->getMockery('Swift_Events_TransportChangeEvent');
+        $smtp = $this->_getTransport($buf, $dispatcher);
+
+        $dispatcher->shouldReceive('createTransportChangeEvent')
+                   ->atLeast()->once()
+                   ->with($smtp)
+                   ->andReturn($evt);
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->once()
+                   ->with($evt, 'transportStarted');
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->zeroOrMoreTimes();
+        $evt->shouldReceive('bubbleCancelled')
+            ->atLeast()->once()
+            ->andReturn(false);
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+    }
+
+    public function testStartingTransportDispatchesBeforeTransportChangeEvent()
+    {
+        $buf = $this->_getBuffer();
+        $dispatcher = $this->_createEventDispatcher(false);
+        $evt = $this->getMockery('Swift_Events_TransportChangeEvent');
+        $smtp = $this->_getTransport($buf, $dispatcher);
+
+        $dispatcher->shouldReceive('createTransportChangeEvent')
+                   ->atLeast()->once()
+                   ->with($smtp)
+                   ->andReturn($evt);
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->once()
+                   ->with($evt, 'beforeTransportStarted');
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->zeroOrMoreTimes();
+        $evt->shouldReceive('bubbleCancelled')
+            ->atLeast()->once()
+            ->andReturn(false);
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+    }
+
+    public function testCancellingBubbleBeforeTransportStartStopsEvent()
+    {
+        $buf = $this->_getBuffer();
+        $dispatcher = $this->_createEventDispatcher(false);
+        $evt = $this->getMockery('Swift_Events_TransportChangeEvent');
+        $smtp = $this->_getTransport($buf, $dispatcher);
+
+        $dispatcher->shouldReceive('createTransportChangeEvent')
+                   ->atLeast()->once()
+                   ->with($smtp)
+                   ->andReturn($evt);
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->once()
+                   ->with($evt, 'beforeTransportStarted');
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->zeroOrMoreTimes();
+        $evt->shouldReceive('bubbleCancelled')
+            ->atLeast()->once()
+            ->andReturn(true);
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+
+        $this->assertFalse($smtp->isStarted(),
+            '%s: Transport should not be started since event bubble was cancelled'
+        );
+    }
+
+    public function testStoppingTransportDispatchesTransportChangeEvent()
+    {
+        $buf = $this->_getBuffer();
+        $dispatcher = $this->_createEventDispatcher(false);
+        $evt = $this->getMockery('Swift_Events_TransportChangeEvent')->shouldIgnoreMissing();
+        $smtp = $this->_getTransport($buf, $dispatcher);
+
+        $dispatcher->shouldReceive('createTransportChangeEvent')
+                   ->atLeast()->once()
+                   ->with($smtp)
+                   ->andReturn($evt);
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->once()
+                   ->with($evt, 'transportStopped');
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->zeroOrMoreTimes();
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+        $smtp->stop();
+    }
+
+    public function testStoppingTransportDispatchesBeforeTransportChangeEvent()
+    {
+        $buf = $this->_getBuffer();
+        $dispatcher = $this->_createEventDispatcher(false);
+        $evt = $this->getMockery('Swift_Events_TransportChangeEvent')->shouldIgnoreMissing();
+        $smtp = $this->_getTransport($buf, $dispatcher);
+
+        $dispatcher->shouldReceive('createTransportChangeEvent')
+                   ->atLeast()->once()
+                   ->with($smtp)
+                   ->andReturn($evt);
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->once()
+                   ->with($evt, 'beforeTransportStopped');
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->zeroOrMoreTimes();
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+        $smtp->stop();
+    }
+
+    public function testCancellingBubbleBeforeTransportStoppedStopsEvent()
+    {
+        $buf = $this->_getBuffer();
+        $dispatcher = $this->_createEventDispatcher(false);
+        $evt = $this->getMockery('Swift_Events_TransportChangeEvent');
+        $smtp = $this->_getTransport($buf, $dispatcher);
+
+        $hasRun = false;
+        $dispatcher->shouldReceive('createTransportChangeEvent')
+                   ->atLeast()->once()
+                   ->with($smtp)
+                   ->andReturn($evt);
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->once()
+                   ->with($evt, 'beforeTransportStopped')
+                   ->andReturnUsing(function () use (&$hasRun) {
+                       $hasRun = true;
+                   });
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->zeroOrMoreTimes();
+        $evt->shouldReceive('bubbleCancelled')
+            ->zeroOrMoreTimes()
+            ->andReturnUsing(function () use (&$hasRun) {
+                return $hasRun;
+            });
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+        $smtp->stop();
+
+        $this->assertTrue($smtp->isStarted(),
+            '%s: Transport should not be stopped since event bubble was cancelled'
+        );
+    }
+
+    public function testResponseEventsAreGenerated()
+    {
+        $buf = $this->_getBuffer();
+        $dispatcher = $this->_createEventDispatcher(false);
+        $evt = $this->getMockery('Swift_Events_ResponseEvent');
+        $smtp = $this->_getTransport($buf, $dispatcher);
+
+        $dispatcher->shouldReceive('createResponseEvent')
+                   ->atLeast()->once()
+                   ->with($smtp, \Mockery::any(), \Mockery::any())
+                   ->andReturn($evt);
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->atLeast()->once()
+                   ->with($evt, 'responseReceived');
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+    }
+
+    public function testCommandEventsAreGenerated()
+    {
+        $buf = $this->_getBuffer();
+        $dispatcher = $this->_createEventDispatcher(false);
+        $evt = $this->getMockery('Swift_Events_CommandEvent');
+        $smtp = $this->_getTransport($buf, $dispatcher);
+
+        $dispatcher->shouldReceive('createCommandEvent')
+                   ->once()
+                   ->with($smtp, \Mockery::any(), \Mockery::any())
+                   ->andReturn($evt);
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->once()
+                   ->with($evt, 'commandSent');
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+    }
+
+    public function testExceptionsCauseExceptionEvents()
+    {
+        $buf = $this->_getBuffer();
+        $dispatcher = $this->_createEventDispatcher(false);
+        $evt = $this->getMockery('Swift_Events_TransportExceptionEvent');
+        $smtp = $this->_getTransport($buf, $dispatcher);
+
+        $buf->shouldReceive('readLine')
+            ->atLeast()->once()
+            ->andReturn("503 I'm sleepy, go away!\r\n");
+        $dispatcher->shouldReceive('createTransportExceptionEvent')
+                   ->zeroOrMoreTimes()
+                   ->with($smtp, \Mockery::any())
+                   ->andReturn($evt);
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->once()
+                   ->with($evt, 'exceptionThrown');
+        $evt->shouldReceive('bubbleCancelled')
+            ->atLeast()->once()
+            ->andReturn(false);
+
+        try {
+            $smtp->start();
+            $this->fail('TransportException should be thrown on invalid response');
+        } catch (Swift_TransportException $e) {
+        }
+    }
+
+    public function testExceptionBubblesCanBeCancelled()
+    {
+        $buf = $this->_getBuffer();
+        $dispatcher = $this->_createEventDispatcher(false);
+        $evt = $this->getMockery('Swift_Events_TransportExceptionEvent');
+        $smtp = $this->_getTransport($buf, $dispatcher);
+
+        $buf->shouldReceive('readLine')
+            ->atLeast()->once()
+            ->andReturn("503 I'm sleepy, go away!\r\n");
+        $dispatcher->shouldReceive('createTransportExceptionEvent')
+                   ->twice()
+                   ->with($smtp, \Mockery::any())
+                   ->andReturn($evt);
+        $dispatcher->shouldReceive('dispatchEvent')
+                   ->twice()
+                   ->with($evt, 'exceptionThrown');
+        $evt->shouldReceive('bubbleCancelled')
+            ->atLeast()->once()
+            ->andReturn(true);
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+    }
+
+    // -- Creation Methods
+
+    protected function _createEventDispatcher($stub = true)
+    {
+        return $this->getMockery('Swift_Events_EventDispatcher')->shouldIgnoreMissing();
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpTest.php
new file mode 100644
index 000000000..f49b489ed
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/AbstractSmtpTest.php
@@ -0,0 +1,1249 @@
+<?php
+
+abstract class Swift_Transport_AbstractSmtpTest extends \SwiftMailerTestCase
+{
+    /** Abstract test method */
+    abstract protected function _getTransport($buf);
+
+    public function testStartAccepts220ServiceGreeting()
+    {
+        /* -- RFC 2821, 4.2.
+
+     Greeting = "220 " Domain [ SP text ] CRLF
+
+     -- RFC 2822, 4.3.2.
+
+     CONNECTION ESTABLISHMENT
+         S: 220
+         E: 554
+        */
+
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $buf->shouldReceive('initialize')
+            ->once();
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(0)
+            ->andReturn("220 some.server.tld bleh\r\n");
+
+        $this->_finishBuffer($buf);
+        try {
+            $this->assertFalse($smtp->isStarted(), '%s: SMTP should begin non-started');
+            $smtp->start();
+            $this->assertTrue($smtp->isStarted(), '%s: start() should have started connection');
+        } catch (Exception $e) {
+            $this->fail('220 is a valid SMTP greeting and should be accepted');
+        }
+    }
+
+    public function testBadGreetingCausesException()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $buf->shouldReceive('initialize')
+            ->once();
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(0)
+            ->andReturn("554 I'm busy\r\n");
+        $this->_finishBuffer($buf);
+        try {
+            $this->assertFalse($smtp->isStarted(), '%s: SMTP should begin non-started');
+            $smtp->start();
+            $this->fail('554 greeting indicates an error and should cause an exception');
+        } catch (Exception $e) {
+            $this->assertFalse($smtp->isStarted(), '%s: start() should have failed');
+        }
+    }
+
+    public function testStartSendsHeloToInitiate()
+    {
+        /* -- RFC 2821, 3.2.
+
+            3.2 Client Initiation
+
+         Once the server has sent the welcoming message and the client has
+         received it, the client normally sends the EHLO command to the
+         server, indicating the client's identity.  In addition to opening the
+         session, use of EHLO indicates that the client is able to process
+         service extensions and requests that the server provide a list of the
+         extensions it supports.  Older SMTP systems which are unable to
+         support service extensions and contemporary clients which do not
+         require service extensions in the mail session being initiated, MAY
+         use HELO instead of EHLO.  Servers MUST NOT return the extended
+         EHLO-style response to a HELO command.  For a particular connection
+         attempt, if the server returns a "command not recognized" response to
+         EHLO, the client SHOULD be able to fall back and send HELO.
+
+         In the EHLO command the host sending the command identifies itself;
+         the command may be interpreted as saying "Hello, I am <domain>" (and,
+         in the case of EHLO, "and I support service extension requests").
+
+       -- RFC 2281, 4.1.1.1.
+
+       ehlo            = "EHLO" SP Domain CRLF
+       helo            = "HELO" SP Domain CRLF
+
+       -- RFC 2821, 4.3.2.
+
+       EHLO or HELO
+           S: 250
+           E: 504, 550
+
+     */
+
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+
+        $buf->shouldReceive('initialize')
+            ->once();
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(0)
+            ->andReturn("220 some.server.tld bleh\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with('~^HELO .*?\r\n$~D')
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('250 ServerName'."\r\n");
+
+        $this->_finishBuffer($buf);
+        try {
+            $smtp->start();
+        } catch (Exception $e) {
+            $this->fail('Starting SMTP should send HELO and accept 250 response');
+        }
+    }
+
+    public function testInvalidHeloResponseCausesException()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+
+        $buf->shouldReceive('initialize')
+            ->once();
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(0)
+            ->andReturn("220 some.server.tld bleh\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with('~^HELO .*?\r\n$~D')
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('504 WTF'."\r\n");
+
+        $this->_finishBuffer($buf);
+        try {
+            $this->assertFalse($smtp->isStarted(), '%s: SMTP should begin non-started');
+            $smtp->start();
+            $this->fail('Non 250 HELO response should raise Exception');
+        } catch (Exception $e) {
+            $this->assertFalse($smtp->isStarted(), '%s: SMTP start() should have failed');
+        }
+    }
+
+    public function testDomainNameIsPlacedInHelo()
+    {
+        /* -- RFC 2821, 4.1.4.
+
+       The SMTP client MUST, if possible, ensure that the domain parameter
+       to the EHLO command is a valid principal host name (not a CNAME or MX
+       name) for its host.  If this is not possible (e.g., when the client's
+       address is dynamically assigned and the client does not have an
+       obvious name), an address literal SHOULD be substituted for the
+       domain name and supplemental information provided that will assist in
+       identifying the client.
+        */
+
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+
+        $buf->shouldReceive('initialize')
+            ->once();
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(0)
+            ->andReturn("220 some.server.tld bleh\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("HELO mydomain.com\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('250 ServerName'."\r\n");
+
+        $this->_finishBuffer($buf);
+        $smtp->setLocalDomain('mydomain.com');
+        $smtp->start();
+    }
+
+    public function testSuccessfulMailCommand()
+    {
+        /* -- RFC 2821, 3.3.
+
+        There are three steps to SMTP mail transactions.  The transaction
+        starts with a MAIL command which gives the sender identification.
+
+        .....
+
+        The first step in the procedure is the MAIL command.
+
+            MAIL FROM:<reverse-path> [SP <mail-parameters> ] <CRLF>
+
+        -- RFC 2821, 4.1.1.2.
+
+        Syntax:
+
+            "MAIL FROM:" ("<>" / Reverse-Path)
+                       [SP Mail-parameters] CRLF
+        -- RFC 2821, 4.1.2.
+
+        Reverse-path = Path
+            Forward-path = Path
+            Path = "<" [ A-d-l ":" ] Mailbox ">"
+            A-d-l = At-domain *( "," A-d-l )
+                        ; Note that this form, the so-called "source route",
+                        ; MUST BE accepted, SHOULD NOT be generated, and SHOULD be
+                        ; ignored.
+            At-domain = "@" domain
+
+        -- RFC 2821, 4.3.2.
+
+        MAIL
+            S: 250
+            E: 552, 451, 452, 550, 553, 503
+        */
+
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $message = $this->_createMessage();
+        $message->shouldReceive('getFrom')
+                ->once()
+                ->andReturn(array('me@domain.com' => 'Me'));
+        $message->shouldReceive('getTo')
+                ->once()
+                ->andReturn(array('foo@bar' => null));
+        $buf->shouldReceive('initialize')
+            ->once();
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("MAIL FROM:<me@domain.com>\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn("250 OK\r\n");
+
+        $this->_finishBuffer($buf);
+        try {
+            $smtp->start();
+            $smtp->send($message);
+        } catch (Exception $e) {
+            $this->fail('MAIL FROM should accept a 250 response');
+        }
+    }
+
+    public function testInvalidResponseCodeFromMailCausesException()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getFrom')
+                ->once()
+                ->andReturn(array('me@domain.com' => 'Me'));
+        $message->shouldReceive('getTo')
+                ->once()
+                ->andReturn(array('foo@bar' => null));
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("MAIL FROM:<me@domain.com>\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('553 Bad'."\r\n");
+
+        $this->_finishBuffer($buf);
+        try {
+            $smtp->start();
+            $smtp->send($message);
+            $this->fail('MAIL FROM should accept a 250 response');
+        } catch (Exception $e) {
+        }
+    }
+
+    public function testSenderIsPreferredOverFrom()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getFrom')
+                ->once()
+                ->andReturn(array('me@domain.com' => 'Me'));
+        $message->shouldReceive('getSender')
+                ->once()
+                ->andReturn(array('another@domain.com' => 'Someone'));
+        $message->shouldReceive('getTo')
+                ->once()
+                ->andReturn(array('foo@bar' => null));
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("MAIL FROM:<another@domain.com>\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('250 OK'."\r\n");
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+        $smtp->send($message);
+    }
+
+    public function testReturnPathIsPreferredOverSender()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getFrom')
+                ->once()
+                ->andReturn(array('me@domain.com' => 'Me'));
+        $message->shouldReceive('getSender')
+                ->once()
+                ->andReturn(array('another@domain.com' => 'Someone'));
+        $message->shouldReceive('getReturnPath')
+                ->once()
+                ->andReturn('more@domain.com');
+        $message->shouldReceive('getTo')
+                ->once()
+                ->andReturn(array('foo@bar' => null));
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("MAIL FROM:<more@domain.com>\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('250 OK'."\r\n");
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+        $smtp->send($message);
+    }
+
+    public function testSuccessfulRcptCommandWith250Response()
+    {
+        /* -- RFC 2821, 3.3.
+
+     The second step in the procedure is the RCPT command.
+
+            RCPT TO:<forward-path> [ SP <rcpt-parameters> ] <CRLF>
+
+     The first or only argument to this command includes a forward-path
+     (normally a mailbox and domain, always surrounded by "<" and ">"
+     brackets) identifying one recipient.  If accepted, the SMTP server
+     returns a 250 OK reply and stores the forward-path.  If the recipient
+     is known not to be a deliverable address, the SMTP server returns a
+     550 reply, typically with a string such as "no such user - " and the
+     mailbox name (other circumstances and reply codes are possible).
+     This step of the procedure can be repeated any number of times.
+
+        -- RFC 2821, 4.1.1.3.
+
+        This command is used to identify an individual recipient of the mail
+        data; multiple recipients are specified by multiple use of this
+        command.  The argument field contains a forward-path and may contain
+        optional parameters.
+
+        The forward-path normally consists of the required destination
+        mailbox.  Sending systems SHOULD not generate the optional list of
+        hosts known as a source route.
+
+        .......
+
+        "RCPT TO:" ("<Postmaster@" domain ">" / "<Postmaster>" / Forward-Path)
+                                        [SP Rcpt-parameters] CRLF
+
+        -- RFC 2821, 4.2.2.
+
+            250 Requested mail action okay, completed
+            251 User not local; will forward to <forward-path>
+         (See section 3.4)
+            252 Cannot VRFY user, but will accept message and attempt
+                    delivery
+
+        -- RFC 2821, 4.3.2.
+
+        RCPT
+            S: 250, 251 (but see section 3.4 for discussion of 251 and 551)
+            E: 550, 551, 552, 553, 450, 451, 452, 503, 550
+        */
+
+        //We'll treat 252 as accepted since it isn't really a failure
+
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getFrom')
+                ->once()
+                ->andReturn(array('me@domain.com' => 'Me'));
+        $message->shouldReceive('getTo')
+                ->once()
+                ->andReturn(array('foo@bar' => null));
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("MAIL FROM:<me@domain.com>\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('250 OK'."\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("RCPT TO:<foo@bar>\r\n")
+            ->andReturn(2);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(2)
+            ->andReturn('250 OK'."\r\n");
+
+        $this->_finishBuffer($buf);
+        try {
+            $smtp->start();
+            $smtp->send($message);
+        } catch (Exception $e) {
+            $this->fail('RCPT TO should accept a 250 response');
+        }
+    }
+
+    public function testMailFromCommandIsOnlySentOncePerMessage()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getFrom')
+                ->once()
+                ->andReturn(array('me@domain.com' => 'Me'));
+        $message->shouldReceive('getTo')
+                ->once()
+                ->andReturn(array('foo@bar' => null));
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("MAIL FROM:<me@domain.com>\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('250 OK'."\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("RCPT TO:<foo@bar>\r\n")
+            ->andReturn(2);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(2)
+            ->andReturn('250 OK'."\r\n");
+        $buf->shouldReceive('write')
+            ->never()
+            ->with("MAIL FROM:<me@domain.com>\r\n");
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+        $smtp->send($message);
+    }
+
+    public function testMultipleRecipientsSendsMultipleRcpt()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getFrom')
+                ->once()
+                ->andReturn(array('me@domain.com' => 'Me'));
+        $message->shouldReceive('getTo')
+                ->once()
+                ->andReturn(array(
+                    'foo@bar' => null,
+                    'zip@button' => 'Zip Button',
+                    'test@domain' => 'Test user',
+                ));
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("RCPT TO:<foo@bar>\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('250 OK'."\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("RCPT TO:<zip@button>\r\n")
+            ->andReturn(2);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(2)
+            ->andReturn('250 OK'."\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("RCPT TO:<test@domain>\r\n")
+            ->andReturn(3);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(3)
+            ->andReturn('250 OK'."\r\n");
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+        $smtp->send($message);
+    }
+
+    public function testCcRecipientsSendsMultipleRcpt()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getFrom')
+                ->once()
+                ->andReturn(array('me@domain.com' => 'Me'));
+        $message->shouldReceive('getTo')
+                ->once()
+                ->andReturn(array('foo@bar' => null));
+        $message->shouldReceive('getCc')
+                ->once()
+                ->andReturn(array(
+                    'zip@button' => 'Zip Button',
+                    'test@domain' => 'Test user',
+                ));
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("RCPT TO:<foo@bar>\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('250 OK'."\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("RCPT TO:<zip@button>\r\n")
+            ->andReturn(2);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(2)
+            ->andReturn('250 OK'."\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("RCPT TO:<test@domain>\r\n")
+            ->andReturn(3);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(3)
+            ->andReturn('250 OK'."\r\n");
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+        $smtp->send($message);
+    }
+
+    public function testSendReturnsNumberOfSuccessfulRecipients()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getFrom')
+                ->once()
+                ->andReturn(array('me@domain.com' => 'Me'));
+        $message->shouldReceive('getTo')
+                ->once()
+                ->andReturn(array('foo@bar' => null));
+        $message->shouldReceive('getCc')
+                ->once()
+                ->andReturn(array(
+                    'zip@button' => 'Zip Button',
+                    'test@domain' => 'Test user',
+                ));
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("RCPT TO:<foo@bar>\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('250 OK'."\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("RCPT TO:<zip@button>\r\n")
+            ->andReturn(2);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(2)
+            ->andReturn('501 Nobody here'."\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("RCPT TO:<test@domain>\r\n")
+            ->andReturn(3);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(3)
+            ->andReturn('250 OK'."\r\n");
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+        $this->assertEquals(2, $smtp->send($message),
+            '%s: 1 of 3 recipients failed so 2 should be returned'
+            );
+    }
+
+    public function testRsetIsSentIfNoSuccessfulRecipients()
+    {
+        /* --RFC 2821, 4.1.1.5.
+
+        This command specifies that the current mail transaction will be
+        aborted.  Any stored sender, recipients, and mail data MUST be
+        discarded, and all buffers and state tables cleared.  The receiver
+        MUST send a "250 OK" reply to a RSET command with no arguments.  A
+        reset command may be issued by the client at any time.
+
+        -- RFC 2821, 4.3.2.
+
+        RSET
+            S: 250
+        */
+
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getFrom')
+                ->once()
+                ->andReturn(array('me@domain.com' => 'Me'));
+        $message->shouldReceive('getTo')
+                ->once()
+                ->andReturn(array('foo@bar' => null));
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("RCPT TO:<foo@bar>\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('503 Bad'."\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("RSET\r\n")
+            ->andReturn(2);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(2)
+            ->andReturn('250 OK'."\r\n");
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+        $this->assertEquals(0, $smtp->send($message),
+            '%s: 1 of 1 recipients failed so 0 should be returned'
+            );
+    }
+
+    public function testSuccessfulDataCommand()
+    {
+        /* -- RFC 2821, 3.3.
+
+        The third step in the procedure is the DATA command (or some
+        alternative specified in a service extension).
+
+                    DATA <CRLF>
+
+        If accepted, the SMTP server returns a 354 Intermediate reply and
+        considers all succeeding lines up to but not including the end of
+        mail data indicator to be the message text.
+
+        -- RFC 2821, 4.1.1.4.
+
+        The receiver normally sends a 354 response to DATA, and then treats
+        the lines (strings ending in <CRLF> sequences, as described in
+        section 2.3.7) following the command as mail data from the sender.
+        This command causes the mail data to be appended to the mail data
+        buffer.  The mail data may contain any of the 128 ASCII character
+        codes, although experience has indicated that use of control
+        characters other than SP, HT, CR, and LF may cause problems and
+        SHOULD be avoided when possible.
+
+        -- RFC 2821, 4.3.2.
+
+        DATA
+            I: 354 -> data -> S: 250
+                                                E: 552, 554, 451, 452
+            E: 451, 554, 503
+        */
+
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getFrom')
+                ->once()
+                ->andReturn(array('me@domain.com' => 'Me'));
+        $message->shouldReceive('getTo')
+                ->once()
+                ->andReturn(array('foo@bar' => null));
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("DATA\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('354 Go ahead'."\r\n");
+
+        $this->_finishBuffer($buf);
+        try {
+            $smtp->start();
+            $smtp->send($message);
+        } catch (Exception $e) {
+            $this->fail('354 is the expected response to DATA');
+        }
+    }
+
+    public function testBadDataResponseCausesException()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getFrom')
+                ->once()
+                ->andReturn(array('me@domain.com' => 'Me'));
+        $message->shouldReceive('getTo')
+                ->once()
+                ->andReturn(array('foo@bar' => null));
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("DATA\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('451 Bad'."\r\n");
+
+        $this->_finishBuffer($buf);
+        try {
+            $smtp->start();
+            $smtp->send($message);
+            $this->fail('354 is the expected response to DATA (not observed)');
+        } catch (Exception $e) {
+        }
+    }
+
+    public function testMessageIsStreamedToBufferForData()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getFrom')
+                ->once()
+                ->andReturn(array('me@domain.com' => 'Me'));
+        $message->shouldReceive('getTo')
+                ->once()
+                ->andReturn(array('foo@bar' => null));
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("DATA\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('354 OK'."\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("\r\n.\r\n")
+            ->andReturn(2);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(2)
+            ->andReturn('250 OK'."\r\n");
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+        $smtp->send($message);
+    }
+
+    public function testBadResponseAfterDataTransmissionCausesException()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getFrom')
+                ->once()
+                ->andReturn(array('me@domain.com' => 'Me'));
+        $message->shouldReceive('getTo')
+                ->once()
+                ->andReturn(array('foo@bar' => null));
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("DATA\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('354 OK'."\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("\r\n.\r\n")
+            ->andReturn(2);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(2)
+            ->andReturn('554 Error'."\r\n");
+
+        $this->_finishBuffer($buf);
+        try {
+            $smtp->start();
+            $smtp->send($message);
+            $this->fail('250 is the expected response after a DATA transmission (not observed)');
+        } catch (Exception $e) {
+        }
+    }
+
+    public function testBccRecipientsAreRemovedFromHeaders()
+    {
+        /* -- RFC 2821, 7.2.
+
+     Addresses that do not appear in the message headers may appear in the
+     RCPT commands to an SMTP server for a number of reasons.  The two
+     most common involve the use of a mailing address as a "list exploder"
+     (a single address that resolves into multiple addresses) and the
+     appearance of "blind copies".  Especially when more than one RCPT
+     command is present, and in order to avoid defeating some of the
+     purpose of these mechanisms, SMTP clients and servers SHOULD NOT copy
+     the full set of RCPT command arguments into the headers, either as
+     part of trace headers or as informational or private-extension
+     headers.  Since this rule is often violated in practice, and cannot
+     be enforced, sending SMTP systems that are aware of "bcc" use MAY
+     find it helpful to send each blind copy as a separate message
+     transaction containing only a single RCPT command.
+     */
+
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $message = $this->_createMessage();
+        $message->shouldReceive('getFrom')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('me@domain.com' => 'Me'));
+        $message->shouldReceive('getTo')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('foo@bar' => null));
+        $message->shouldReceive('getBcc')
+                ->zeroOrMoreTimes()
+                ->andReturn(array(
+                    'zip@button' => 'Zip Button',
+                    'test@domain' => 'Test user',
+                ));
+        $message->shouldReceive('setBcc')
+                ->once()
+                ->with(array());
+        $message->shouldReceive('setBcc')
+                ->zeroOrMoreTimes();
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+        $smtp->send($message);
+    }
+
+    public function testEachBccRecipientIsSentASeparateMessage()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getFrom')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('me@domain.com' => 'Me'));
+        $message->shouldReceive('getTo')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('foo@bar' => null));
+        $message->shouldReceive('getBcc')
+                ->zeroOrMoreTimes()
+                ->andReturn(array(
+                    'zip@button' => 'Zip Button',
+                    'test@domain' => 'Test user',
+                ));
+        $message->shouldReceive('setBcc')
+                ->atLeast()->once()
+                ->with(array());
+        $message->shouldReceive('setBcc')
+                ->once()
+                ->with(array('zip@button' => 'Zip Button'));
+        $message->shouldReceive('setBcc')
+                ->once()
+                ->with(array('test@domain' => 'Test user'));
+        $message->shouldReceive('setBcc')
+                ->atLeast()->once()
+                ->with(array(
+                    'zip@button' => 'Zip Button',
+                    'test@domain' => 'Test user',
+                ));
+
+        $buf->shouldReceive('write')->once()->with("MAIL FROM:<me@domain.com>\r\n")->andReturn(1);
+        $buf->shouldReceive('readLine')->once()->with(1)->andReturn("250 OK\r\n");
+        $buf->shouldReceive('write')->once()->with("RCPT TO:<foo@bar>\r\n")->andReturn(2);
+        $buf->shouldReceive('readLine')->once()->with(2)->andReturn("250 OK\r\n");
+        $buf->shouldReceive('write')->once()->with("DATA\r\n")->andReturn(3);
+        $buf->shouldReceive('readLine')->once()->with(3)->andReturn("354 OK\r\n");
+        $buf->shouldReceive('write')->once()->with("\r\n.\r\n")->andReturn(4);
+        $buf->shouldReceive('readLine')->once()->with(4)->andReturn("250 OK\r\n");
+
+        $buf->shouldReceive('write')->once()->with("MAIL FROM:<me@domain.com>\r\n")->andReturn(5);
+        $buf->shouldReceive('readLine')->once()->with(5)->andReturn("250 OK\r\n");
+        $buf->shouldReceive('write')->once()->with("RCPT TO:<zip@button>\r\n")->andReturn(6);
+        $buf->shouldReceive('readLine')->once()->with(6)->andReturn("250 OK\r\n");
+        $buf->shouldReceive('write')->once()->with("DATA\r\n")->andReturn(7);
+        $buf->shouldReceive('readLine')->once()->with(7)->andReturn("354 OK\r\n");
+        $buf->shouldReceive('write')->once()->with("\r\n.\r\n")->andReturn(8);
+        $buf->shouldReceive('readLine')->once()->with(8)->andReturn("250 OK\r\n");
+
+        $buf->shouldReceive('write')->once()->with("MAIL FROM:<me@domain.com>\r\n")->andReturn(9);
+        $buf->shouldReceive('readLine')->once()->with(9)->andReturn("250 OK\r\n");
+        $buf->shouldReceive('write')->once()->with("RCPT TO:<test@domain>\r\n")->andReturn(10);
+        $buf->shouldReceive('readLine')->once()->with(10)->andReturn("250 OK\r\n");
+        $buf->shouldReceive('write')->once()->with("DATA\r\n")->andReturn(11);
+        $buf->shouldReceive('readLine')->once()->with(11)->andReturn("354 OK\r\n");
+        $buf->shouldReceive('write')->once()->with("\r\n.\r\n")->andReturn(12);
+        $buf->shouldReceive('readLine')->once()->with(12)->andReturn("250 OK\r\n");
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+        $this->assertEquals(3, $smtp->send($message));
+    }
+
+    public function testMessageStateIsRestoredOnFailure()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getFrom')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('me@domain.com' => 'Me'));
+        $message->shouldReceive('getTo')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('foo@bar' => null));
+        $message->shouldReceive('getBcc')
+                ->zeroOrMoreTimes()
+                ->andReturn(array(
+                    'zip@button' => 'Zip Button',
+                    'test@domain' => 'Test user',
+                ));
+        $message->shouldReceive('setBcc')
+                ->once()
+                ->with(array());
+        $message->shouldReceive('setBcc')
+                ->once()
+                ->with(array(
+                    'zip@button' => 'Zip Button',
+                    'test@domain' => 'Test user',
+                ));
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("MAIL FROM:<me@domain.com>\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn("250 OK\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("RCPT TO:<foo@bar>\r\n")
+            ->andReturn(2);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(2)
+            ->andReturn("250 OK\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("DATA\r\n")
+            ->andReturn(3);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(3)
+            ->andReturn("451 No\r\n");
+
+        $this->_finishBuffer($buf);
+
+        $smtp->start();
+        try {
+            $smtp->send($message);
+            $this->fail('A bad response was given so exception is expected');
+        } catch (Exception $e) {
+        }
+    }
+
+    public function testStopSendsQuitCommand()
+    {
+        /* -- RFC 2821, 4.1.1.10.
+
+        This command specifies that the receiver MUST send an OK reply, and
+        then close the transmission channel.
+
+        The receiver MUST NOT intentionally close the transmission channel
+        until it receives and replies to a QUIT command (even if there was an
+        error).  The sender MUST NOT intentionally close the transmission
+        channel until it sends a QUIT command and SHOULD wait until it
+        receives the reply (even if there was an error response to a previous
+        command).  If the connection is closed prematurely due to violations
+        of the above or system or network failure, the server MUST cancel any
+        pending transaction, but not undo any previously completed
+        transaction, and generally MUST act as if the command or transaction
+        in progress had received a temporary error (i.e., a 4yz response).
+
+        The QUIT command may be issued at any time.
+
+        Syntax:
+            "QUIT" CRLF
+        */
+
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $message = $this->_createMessage();
+        $buf->shouldReceive('initialize')
+            ->once();
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("QUIT\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn("221 Bye\r\n");
+        $buf->shouldReceive('terminate')
+            ->once();
+
+        $this->_finishBuffer($buf);
+
+        $this->assertFalse($smtp->isStarted());
+        $smtp->start();
+        $this->assertTrue($smtp->isStarted());
+        $smtp->stop();
+        $this->assertFalse($smtp->isStarted());
+    }
+
+    public function testBufferCanBeFetched()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $ref = $smtp->getBuffer();
+        $this->assertEquals($buf, $ref);
+    }
+
+    public function testBufferCanBeWrittenToUsingExecuteCommand()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $message = $this->_createMessage();
+        $buf->shouldReceive('write')
+            ->zeroOrMoreTimes()
+            ->with("FOO\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->zeroOrMoreTimes()
+            ->with(1)
+            ->andReturn("250 OK\r\n");
+
+        $res = $smtp->executeCommand("FOO\r\n");
+        $this->assertEquals("250 OK\r\n", $res);
+    }
+
+    public function testResponseCodesAreValidated()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $message = $this->_createMessage();
+        $buf->shouldReceive('write')
+            ->zeroOrMoreTimes()
+            ->with("FOO\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->zeroOrMoreTimes()
+            ->with(1)
+            ->andReturn("551 Not ok\r\n");
+
+        try {
+            $smtp->executeCommand("FOO\r\n", array(250, 251));
+            $this->fail('A 250 or 251 response was needed but 551 was returned.');
+        } catch (Exception $e) {
+        }
+    }
+
+    public function testFailedRecipientsCanBeCollectedByReference()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getFrom')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('me@domain.com' => 'Me'));
+        $message->shouldReceive('getTo')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('foo@bar' => null));
+        $message->shouldReceive('getBcc')
+                ->zeroOrMoreTimes()
+                ->andReturn(array(
+                    'zip@button' => 'Zip Button',
+                    'test@domain' => 'Test user',
+                ));
+        $message->shouldReceive('setBcc')
+                ->atLeast()->once()
+                ->with(array());
+        $message->shouldReceive('setBcc')
+                ->once()
+                ->with(array('zip@button' => 'Zip Button'));
+        $message->shouldReceive('setBcc')
+                ->once()
+                ->with(array('test@domain' => 'Test user'));
+        $message->shouldReceive('setBcc')
+                ->atLeast()->once()
+                ->with(array(
+                    'zip@button' => 'Zip Button',
+                    'test@domain' => 'Test user',
+                ));
+
+        $buf->shouldReceive('write')->once()->with("MAIL FROM:<me@domain.com>\r\n")->andReturn(1);
+        $buf->shouldReceive('readLine')->once()->with(1)->andReturn("250 OK\r\n");
+        $buf->shouldReceive('write')->once()->with("RCPT TO:<foo@bar>\r\n")->andReturn(2);
+        $buf->shouldReceive('readLine')->once()->with(2)->andReturn("250 OK\r\n");
+        $buf->shouldReceive('write')->once()->with("DATA\r\n")->andReturn(3);
+        $buf->shouldReceive('readLine')->once()->with(3)->andReturn("354 OK\r\n");
+        $buf->shouldReceive('write')->once()->with("\r\n.\r\n")->andReturn(4);
+        $buf->shouldReceive('readLine')->once()->with(4)->andReturn("250 OK\r\n");
+
+        $buf->shouldReceive('write')->once()->with("MAIL FROM:<me@domain.com>\r\n")->andReturn(5);
+        $buf->shouldReceive('readLine')->once()->with(5)->andReturn("250 OK\r\n");
+        $buf->shouldReceive('write')->once()->with("RCPT TO:<zip@button>\r\n")->andReturn(6);
+        $buf->shouldReceive('readLine')->once()->with(6)->andReturn("500 Bad\r\n");
+        $buf->shouldReceive('write')->once()->with("RSET\r\n")->andReturn(7);
+        $buf->shouldReceive('readLine')->once()->with(7)->andReturn("250 OK\r\n");
+
+        $buf->shouldReceive('write')->once()->with("MAIL FROM:<me@domain.com>\r\n")->andReturn(9);
+        $buf->shouldReceive('readLine')->once()->with(9)->andReturn("250 OK\r\n");
+        $buf->shouldReceive('write')->once()->with("RCPT TO:<test@domain>\r\n")->andReturn(10);
+        $buf->shouldReceive('readLine')->once()->with(10)->andReturn("500 Bad\r\n");
+        $buf->shouldReceive('write')->once()->with("RSET\r\n")->andReturn(11);
+        $buf->shouldReceive('readLine')->once()->with(11)->andReturn("250 OK\r\n");
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+        $this->assertEquals(1, $smtp->send($message, $failures));
+        $this->assertEquals(array('zip@button', 'test@domain'), $failures,
+            '%s: Failures should be caught in an array'
+            );
+    }
+
+    public function testSendingRegeneratesMessageId()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $message = $this->_createMessage();
+        $message->shouldReceive('getFrom')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('me@domain.com' => 'Me'));
+        $message->shouldReceive('getTo')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('foo@bar' => null));
+        $message->shouldReceive('generateId')
+                ->once();
+
+        $this->_finishBuffer($buf);
+        $smtp->start();
+        $smtp->send($message);
+    }
+
+    protected function _getBuffer()
+    {
+        return $this->getMockery('Swift_Transport_IoBuffer')->shouldIgnoreMissing();
+    }
+
+    protected function _createMessage()
+    {
+        return $this->getMockery('Swift_Mime_Message')->shouldIgnoreMissing();
+    }
+
+    protected function _finishBuffer($buf)
+    {
+        $buf->shouldReceive('readLine')
+            ->zeroOrMoreTimes()
+            ->with(0)
+            ->andReturn('220 server.com foo'."\r\n");
+        $buf->shouldReceive('write')
+            ->zeroOrMoreTimes()
+            ->with('~^(EH|HE)LO .*?\r\n$~D')
+            ->andReturn($x = uniqid());
+        $buf->shouldReceive('readLine')
+            ->zeroOrMoreTimes()
+            ->with($x)
+            ->andReturn('250 ServerName'."\r\n");
+        $buf->shouldReceive('write')
+            ->zeroOrMoreTimes()
+            ->with('~^MAIL FROM:<.*?>\r\n$~D')
+            ->andReturn($x = uniqid());
+        $buf->shouldReceive('readLine')
+            ->zeroOrMoreTimes()
+            ->with($x)
+            ->andReturn("250 OK\r\n");
+        $buf->shouldReceive('write')
+            ->zeroOrMoreTimes()
+            ->with('~^RCPT TO:<.*?>\r\n$~D')
+            ->andReturn($x = uniqid());
+        $buf->shouldReceive('readLine')
+            ->zeroOrMoreTimes()
+            ->with($x)
+            ->andReturn("250 OK\r\n");
+        $buf->shouldReceive('write')
+            ->zeroOrMoreTimes()
+            ->with("DATA\r\n")
+            ->andReturn($x = uniqid());
+        $buf->shouldReceive('readLine')
+            ->zeroOrMoreTimes()
+            ->with($x)
+            ->andReturn("354 OK\r\n");
+        $buf->shouldReceive('write')
+            ->zeroOrMoreTimes()
+            ->with("\r\n.\r\n")
+            ->andReturn($x = uniqid());
+        $buf->shouldReceive('readLine')
+            ->zeroOrMoreTimes()
+            ->with($x)
+            ->andReturn("250 OK\r\n");
+        $buf->shouldReceive('write')
+            ->zeroOrMoreTimes()
+            ->with("RSET\r\n")
+            ->andReturn($x = uniqid());
+        $buf->shouldReceive('readLine')
+            ->zeroOrMoreTimes()
+            ->with($x)
+            ->andReturn("250 OK\r\n");
+
+        $buf->shouldReceive('write')
+            ->zeroOrMoreTimes()
+            ->andReturn(false);
+        $buf->shouldReceive('readLine')
+            ->zeroOrMoreTimes()
+            ->andReturn(false);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/CramMd5AuthenticatorTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/CramMd5AuthenticatorTest.php
new file mode 100644
index 000000000..f64b0716a
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/CramMd5AuthenticatorTest.php
@@ -0,0 +1,66 @@
+<?php
+
+class Swift_Transport_Esmtp_Auth_CramMd5AuthenticatorTest extends \SwiftMailerTestCase
+{
+    private $_agent;
+
+    public function setUp()
+    {
+        $this->_agent = $this->getMockery('Swift_Transport_SmtpAgent')->shouldIgnoreMissing();
+    }
+
+    public function testKeywordIsCramMd5()
+    {
+        /* -- RFC 2195, 2.
+        The authentication type associated with CRAM is "CRAM-MD5".
+        */
+
+        $cram = $this->_getAuthenticator();
+        $this->assertEquals('CRAM-MD5', $cram->getAuthKeyword());
+    }
+
+    public function testSuccessfulAuthentication()
+    {
+        $cram = $this->_getAuthenticator();
+
+        $this->_agent->shouldReceive('executeCommand')
+             ->once()
+             ->with("AUTH CRAM-MD5\r\n", array(334))
+             ->andReturn('334 '.base64_encode('<foo@bar>')."\r\n");
+        $this->_agent->shouldReceive('executeCommand')
+             ->once()
+             ->with(\Mockery::any(), array(235));
+
+        $this->assertTrue($cram->authenticate($this->_agent, 'jack', 'pass'),
+            '%s: The buffer accepted all commands authentication should succeed'
+            );
+    }
+
+    public function testAuthenticationFailureSendRsetAndReturnFalse()
+    {
+        $cram = $this->_getAuthenticator();
+
+        $this->_agent->shouldReceive('executeCommand')
+             ->once()
+             ->with("AUTH CRAM-MD5\r\n", array(334))
+             ->andReturn('334 '.base64_encode('<foo@bar>')."\r\n");
+        $this->_agent->shouldReceive('executeCommand')
+             ->once()
+             ->with(\Mockery::any(), array(235))
+             ->andThrow(new Swift_TransportException(''));
+        $this->_agent->shouldReceive('executeCommand')
+             ->once()
+             ->with("RSET\r\n", array(250));
+
+        $this->assertFalse($cram->authenticate($this->_agent, 'jack', 'pass'),
+            '%s: Authentication fails, so RSET should be sent'
+            );
+    }
+
+    // -- Private helpers
+
+    private function _getAuthenticator()
+    {
+        return new Swift_Transport_Esmtp_Auth_CramMd5Authenticator();
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/LoginAuthenticatorTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/LoginAuthenticatorTest.php
new file mode 100644
index 000000000..fc6e80695
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/LoginAuthenticatorTest.php
@@ -0,0 +1,66 @@
+<?php
+
+class Swift_Transport_Esmtp_Auth_LoginAuthenticatorTest extends \SwiftMailerTestCase
+{
+    private $_agent;
+
+    public function setUp()
+    {
+        $this->_agent = $this->getMockery('Swift_Transport_SmtpAgent')->shouldIgnoreMissing();
+    }
+
+    public function testKeywordIsLogin()
+    {
+        $login = $this->_getAuthenticator();
+        $this->assertEquals('LOGIN', $login->getAuthKeyword());
+    }
+
+    public function testSuccessfulAuthentication()
+    {
+        $login = $this->_getAuthenticator();
+
+        $this->_agent->shouldReceive('executeCommand')
+             ->once()
+             ->with("AUTH LOGIN\r\n", array(334));
+        $this->_agent->shouldReceive('executeCommand')
+             ->once()
+             ->with(base64_encode('jack')."\r\n", array(334));
+        $this->_agent->shouldReceive('executeCommand')
+             ->once()
+             ->with(base64_encode('pass')."\r\n", array(235));
+
+        $this->assertTrue($login->authenticate($this->_agent, 'jack', 'pass'),
+            '%s: The buffer accepted all commands authentication should succeed'
+            );
+    }
+
+    public function testAuthenticationFailureSendRsetAndReturnFalse()
+    {
+        $login = $this->_getAuthenticator();
+
+        $this->_agent->shouldReceive('executeCommand')
+             ->once()
+             ->with("AUTH LOGIN\r\n", array(334));
+        $this->_agent->shouldReceive('executeCommand')
+             ->once()
+             ->with(base64_encode('jack')."\r\n", array(334));
+        $this->_agent->shouldReceive('executeCommand')
+             ->once()
+             ->with(base64_encode('pass')."\r\n", array(235))
+             ->andThrow(new Swift_TransportException(''));
+        $this->_agent->shouldReceive('executeCommand')
+             ->once()
+             ->with("RSET\r\n", array(250));
+
+        $this->assertFalse($login->authenticate($this->_agent, 'jack', 'pass'),
+            '%s: Authentication fails, so RSET should be sent'
+            );
+    }
+
+    // -- Private helpers
+
+    private function _getAuthenticator()
+    {
+        return new Swift_Transport_Esmtp_Auth_LoginAuthenticator();
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/NTLMAuthenticatorTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/NTLMAuthenticatorTest.php
new file mode 100644
index 000000000..09ace8343
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/NTLMAuthenticatorTest.php
@@ -0,0 +1,235 @@
+<?php
+
+class Swift_Transport_Esmtp_Auth_NTLMAuthenticatorTest extends \SwiftMailerTestCase
+{
+    private $_message1 = '4e544c4d535350000100000007020000';
+    private $_message2 = '4e544c4d53535000020000000c000c003000000035828980514246973ea892c10000000000000000460046003c00000054004500530054004e00540002000c0054004500530054004e00540001000c004d0045004d0042004500520003001e006d0065006d006200650072002e0074006500730074002e0063006f006d0000000000';
+    private $_message3 = '4e544c4d5353500003000000180018006000000076007600780000000c000c0040000000080008004c0000000c000c0054000000000000009a0000000102000054004500530054004e00540074006500730074004d0045004d00420045005200bf2e015119f6bdb3f6fdb768aa12d478f5ce3d2401c8f6e9caa4da8f25d5e840974ed8976d3ada46010100000000000030fa7e3c677bc301f5ce3d2401c8f6e90000000002000c0054004500530054004e00540001000c004d0045004d0042004500520003001e006d0065006d006200650072002e0074006500730074002e0063006f006d000000000000000000';
+
+    public function setUp()
+    {
+        if (!function_exists('openssl_encrypt') || !function_exists('openssl_random_pseudo_bytes') || !function_exists('bcmul') || !function_exists('iconv')) {
+            $this->markTestSkipped(
+                'One of the required functions is not available.'
+             );
+        }
+    }
+
+    public function testKeywordIsNtlm()
+    {
+        $login = $this->_getAuthenticator();
+        $this->assertEquals('NTLM', $login->getAuthKeyword());
+    }
+
+    public function testMessage1Generator()
+    {
+        $login = $this->_getAuthenticator();
+        $message1 = $this->_invokePrivateMethod('createMessage1', $login);
+
+        $this->assertEquals($this->_message1, bin2hex($message1),
+            '%s: We send the smallest ntlm message which should never fail.'
+        );
+    }
+
+    public function testLMv1Generator()
+    {
+        $password = 'test1234';
+        $challenge = 'b019d38bad875c9d';
+        $lmv1 = '1879f60127f8a877022132ec221bcbf3ca016a9f76095606';
+
+        $login = $this->_getAuthenticator();
+        $lmv1Result = $this->_invokePrivateMethod('createLMPassword', $login, array($password, $this->hex2bin($challenge)));
+
+        $this->assertEquals($lmv1, bin2hex($lmv1Result),
+            '%s: The keys should be the same cause we use the same values to generate them.'
+        );
+    }
+
+    public function testLMv2Generator()
+    {
+        $username = 'user';
+        $password = 'SecREt01';
+        $domain = 'DOMAIN';
+        $challenge = '0123456789abcdef';
+        $lmv2 = 'd6e6152ea25d03b7c6ba6629c2d6aaf0ffffff0011223344';
+
+        $login = $this->_getAuthenticator();
+        $lmv2Result = $this->_invokePrivateMethod('createLMv2Password', $login, array($password, $username, $domain, $this->hex2bin($challenge), $this->hex2bin('ffffff0011223344')));
+
+        $this->assertEquals($lmv2, bin2hex($lmv2Result),
+            '%s: The keys should be the same cause we use the same values to generate them.'
+        );
+    }
+
+    public function testMessage3v1Generator()
+    {
+        $username = 'test';
+        $domain = 'TESTNT';
+        $workstation = 'MEMBER';
+        $lmResponse = '1879f60127f8a877022132ec221bcbf3ca016a9f76095606';
+        $ntlmResponse = 'e6285df3287c5d194f84df1a94817c7282d09754b6f9e02a';
+        $message3T = '4e544c4d5353500003000000180018006000000018001800780000000c000c0040000000080008004c0000000c000c0054000000000000009a0000000102000054004500530054004e00540074006500730074004d0045004d004200450052001879f60127f8a877022132ec221bcbf3ca016a9f76095606e6285df3287c5d194f84df1a94817c7282d09754b6f9e02a';
+
+        $login = $this->_getAuthenticator();
+        $message3 = $this->_invokePrivateMethod('createMessage3', $login, array($domain, $username, $workstation, $this->hex2bin($lmResponse), $this->hex2bin($ntlmResponse)));
+
+        $this->assertEquals($message3T, bin2hex($message3),
+            '%s: We send the same information as the example is created with so this should be the same'
+        );
+    }
+
+    public function testMessage3v2Generator()
+    {
+        $username = 'test';
+        $domain = 'TESTNT';
+        $workstation = 'MEMBER';
+        $lmResponse = 'bf2e015119f6bdb3f6fdb768aa12d478f5ce3d2401c8f6e9';
+        $ntlmResponse = 'caa4da8f25d5e840974ed8976d3ada46010100000000000030fa7e3c677bc301f5ce3d2401c8f6e90000000002000c0054004500530054004e00540001000c004d0045004d0042004500520003001e006d0065006d006200650072002e0074006500730074002e0063006f006d000000000000000000';
+
+        $login = $this->_getAuthenticator();
+        $message3 = $this->_invokePrivateMethod('createMessage3', $login, array($domain, $username, $workstation, $this->hex2bin($lmResponse), $this->hex2bin($ntlmResponse)));
+
+        $this->assertEquals($this->_message3, bin2hex($message3),
+            '%s: We send the same information as the example is created with so this should be the same'
+        );
+    }
+
+    public function testGetDomainAndUsername()
+    {
+        $username = "DOMAIN\user";
+
+        $login = $this->_getAuthenticator();
+        list($domain, $user) = $this->_invokePrivateMethod('getDomainAndUsername', $login, array($username));
+
+        $this->assertEquals('DOMAIN', $domain,
+            '%s: the fetched domain did not match'
+        );
+        $this->assertEquals('user', $user,
+            '%s: the fetched user did not match'
+        );
+    }
+
+    public function testGetDomainAndUsernameWithExtension()
+    {
+        $username = "domain.com\user";
+
+        $login = $this->_getAuthenticator();
+        list($domain, $user) = $this->_invokePrivateMethod('getDomainAndUsername', $login, array($username));
+
+        $this->assertEquals('domain.com', $domain,
+            '%s: the fetched domain did not match'
+        );
+        $this->assertEquals('user', $user,
+            '%s: the fetched user did not match'
+        );
+    }
+
+    public function testGetDomainAndUsernameWithAtSymbol()
+    {
+        $username = 'user@DOMAIN';
+
+        $login = $this->_getAuthenticator();
+        list($domain, $user) = $this->_invokePrivateMethod('getDomainAndUsername', $login, array($username));
+
+        $this->assertEquals('DOMAIN', $domain,
+            '%s: the fetched domain did not match'
+        );
+        $this->assertEquals('user', $user,
+            '%s: the fetched user did not match'
+        );
+    }
+
+    public function testGetDomainAndUsernameWithAtSymbolAndExtension()
+    {
+        $username = 'user@domain.com';
+
+        $login = $this->_getAuthenticator();
+        list($domain, $user) = $this->_invokePrivateMethod('getDomainAndUsername', $login, array($username));
+
+        $this->assertEquals('domain.com', $domain,
+            '%s: the fetched domain did not match'
+        );
+        $this->assertEquals('user', $user,
+            '%s: the fetched user did not match'
+        );
+    }
+
+    public function testSuccessfulAuthentication()
+    {
+        $domain = 'TESTNT';
+        $username = 'test';
+        $secret = 'test1234';
+
+        $ntlm = $this->_getAuthenticator();
+        $agent = $this->_getAgent();
+        $agent->shouldReceive('executeCommand')
+              ->once()
+              ->with('AUTH NTLM '.base64_encode(
+                        $this->_invokePrivateMethod('createMessage1', $ntlm)
+                    )."\r\n", array(334))
+              ->andReturn('334 '.base64_encode($this->hex2bin('4e544c4d53535000020000000c000c003000000035828980514246973ea892c10000000000000000460046003c00000054004500530054004e00540002000c0054004500530054004e00540001000c004d0045004d0042004500520003001e006d0065006d006200650072002e0074006500730074002e0063006f006d0000000000')));
+        $agent->shouldReceive('executeCommand')
+              ->once()
+              ->with(base64_encode(
+                        $this->_invokePrivateMethod('createMessage3', $ntlm, array($domain, $username, $this->hex2bin('4d0045004d00420045005200'), $this->hex2bin('bf2e015119f6bdb3f6fdb768aa12d478f5ce3d2401c8f6e9'), $this->hex2bin('caa4da8f25d5e840974ed8976d3ada46010100000000000030fa7e3c677bc301f5ce3d2401c8f6e90000000002000c0054004500530054004e00540001000c004d0045004d0042004500520003001e006d0065006d006200650072002e0074006500730074002e0063006f006d000000000000000000'))
+                    ))."\r\n", array(235));
+
+        $this->assertTrue($ntlm->authenticate($agent, $username.'@'.$domain, $secret, $this->hex2bin('30fa7e3c677bc301'), $this->hex2bin('f5ce3d2401c8f6e9')),
+            '%s: The buffer accepted all commands authentication should succeed'
+        );
+    }
+
+    public function testAuthenticationFailureSendRsetAndReturnFalse()
+    {
+        $domain = 'TESTNT';
+        $username = 'test';
+        $secret = 'test1234';
+
+        $ntlm = $this->_getAuthenticator();
+        $agent = $this->_getAgent();
+        $agent->shouldReceive('executeCommand')
+              ->once()
+              ->with('AUTH NTLM '.base64_encode(
+                        $this->_invokePrivateMethod('createMessage1', $ntlm)
+                    )."\r\n", array(334))
+              ->andThrow(new Swift_TransportException(''));
+        $agent->shouldReceive('executeCommand')
+              ->once()
+              ->with("RSET\r\n", array(250));
+
+        $this->assertFalse($ntlm->authenticate($agent, $username.'@'.$domain, $secret, $this->hex2bin('30fa7e3c677bc301'), $this->hex2bin('f5ce3d2401c8f6e9')),
+            '%s: Authentication fails, so RSET should be sent'
+        );
+    }
+
+    // -- Private helpers
+    private function _getAuthenticator()
+    {
+        return new Swift_Transport_Esmtp_Auth_NTLMAuthenticator();
+    }
+
+    private function _getAgent()
+    {
+        return $this->getMockery('Swift_Transport_SmtpAgent')->shouldIgnoreMissing();
+    }
+
+    private function _invokePrivateMethod($method, $instance, array $args = array())
+    {
+        $methodC = new ReflectionMethod($instance, trim($method));
+        $methodC->setAccessible(true);
+
+        return $methodC->invokeArgs($instance, $args);
+    }
+
+    /**
+     * Hex2bin replacement for < PHP 5.4.
+     *
+     * @param string $hex
+     *
+     * @return string Binary
+     */
+    protected function hex2bin($hex)
+    {
+        return function_exists('hex2bin') ? hex2bin($hex) : pack('H*', $hex);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/PlainAuthenticatorTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/PlainAuthenticatorTest.php
new file mode 100644
index 000000000..4fe9db80e
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/Esmtp/Auth/PlainAuthenticatorTest.php
@@ -0,0 +1,69 @@
+<?php
+
+class Swift_Transport_Esmtp_Auth_PlainAuthenticatorTest extends \SwiftMailerTestCase
+{
+    private $_agent;
+
+    public function setUp()
+    {
+        $this->_agent = $this->getMockery('Swift_Transport_SmtpAgent')->shouldIgnoreMissing();
+    }
+
+    public function testKeywordIsPlain()
+    {
+        /* -- RFC 4616, 1.
+        The name associated with this mechanism is "PLAIN".
+        */
+
+        $login = $this->_getAuthenticator();
+        $this->assertEquals('PLAIN', $login->getAuthKeyword());
+    }
+
+    public function testSuccessfulAuthentication()
+    {
+        /* -- RFC 4616, 2.
+        The client presents the authorization identity (identity to act as),
+        followed by a NUL (U+0000) character, followed by the authentication
+        identity (identity whose password will be used), followed by a NUL
+        (U+0000) character, followed by the clear-text password.
+        */
+
+        $plain = $this->_getAuthenticator();
+
+        $this->_agent->shouldReceive('executeCommand')
+             ->once()
+             ->with('AUTH PLAIN '.base64_encode(
+                        'jack'.chr(0).'jack'.chr(0).'pass'
+                    )."\r\n", array(235));
+
+        $this->assertTrue($plain->authenticate($this->_agent, 'jack', 'pass'),
+            '%s: The buffer accepted all commands authentication should succeed'
+            );
+    }
+
+    public function testAuthenticationFailureSendRsetAndReturnFalse()
+    {
+        $plain = $this->_getAuthenticator();
+
+        $this->_agent->shouldReceive('executeCommand')
+             ->once()
+             ->with('AUTH PLAIN '.base64_encode(
+                        'jack'.chr(0).'jack'.chr(0).'pass'
+                    )."\r\n", array(235))
+             ->andThrow(new Swift_TransportException(''));
+        $this->_agent->shouldReceive('executeCommand')
+             ->once()
+             ->with("RSET\r\n", array(250));
+
+        $this->assertFalse($plain->authenticate($this->_agent, 'jack', 'pass'),
+            '%s: Authentication fails, so RSET should be sent'
+            );
+    }
+
+    // -- Private helpers
+
+    private function _getAuthenticator()
+    {
+        return new Swift_Transport_Esmtp_Auth_PlainAuthenticator();
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/Esmtp/AuthHandlerTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/Esmtp/AuthHandlerTest.php
new file mode 100644
index 000000000..64327d478
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/Esmtp/AuthHandlerTest.php
@@ -0,0 +1,167 @@
+<?php
+
+class Swift_Transport_Esmtp_AuthHandlerTest extends \SwiftMailerTestCase
+{
+    private $_agent;
+
+    public function setUp()
+    {
+        $this->_agent = $this->getMockery('Swift_Transport_SmtpAgent')->shouldIgnoreMissing();
+    }
+
+    public function testKeywordIsAuth()
+    {
+        $auth = $this->_createHandler(array());
+        $this->assertEquals('AUTH', $auth->getHandledKeyword());
+    }
+
+    public function testUsernameCanBeSetAndFetched()
+    {
+        $auth = $this->_createHandler(array());
+        $auth->setUsername('jack');
+        $this->assertEquals('jack', $auth->getUsername());
+    }
+
+    public function testPasswordCanBeSetAndFetched()
+    {
+        $auth = $this->_createHandler(array());
+        $auth->setPassword('pass');
+        $this->assertEquals('pass', $auth->getPassword());
+    }
+
+    public function testAuthModeCanBeSetAndFetched()
+    {
+        $auth = $this->_createHandler(array());
+        $auth->setAuthMode('PLAIN');
+        $this->assertEquals('PLAIN', $auth->getAuthMode());
+    }
+
+    public function testMixinMethods()
+    {
+        $auth = $this->_createHandler(array());
+        $mixins = $auth->exposeMixinMethods();
+        $this->assertTrue(in_array('getUsername', $mixins),
+            '%s: getUsername() should be accessible via mixin'
+            );
+        $this->assertTrue(in_array('setUsername', $mixins),
+            '%s: setUsername() should be accessible via mixin'
+            );
+        $this->assertTrue(in_array('getPassword', $mixins),
+            '%s: getPassword() should be accessible via mixin'
+            );
+        $this->assertTrue(in_array('setPassword', $mixins),
+            '%s: setPassword() should be accessible via mixin'
+            );
+        $this->assertTrue(in_array('setAuthMode', $mixins),
+            '%s: setAuthMode() should be accessible via mixin'
+            );
+        $this->assertTrue(in_array('getAuthMode', $mixins),
+            '%s: getAuthMode() should be accessible via mixin'
+            );
+    }
+
+    public function testAuthenticatorsAreCalledAccordingToParamsAfterEhlo()
+    {
+        $a1 = $this->_createMockAuthenticator('PLAIN');
+        $a2 = $this->_createMockAuthenticator('LOGIN');
+
+        $a1->shouldReceive('authenticate')
+           ->never()
+           ->with($this->_agent, 'jack', 'pass');
+        $a2->shouldReceive('authenticate')
+           ->once()
+           ->with($this->_agent, 'jack', 'pass')
+           ->andReturn(true);
+
+        $auth = $this->_createHandler(array($a1, $a2));
+        $auth->setUsername('jack');
+        $auth->setPassword('pass');
+
+        $auth->setKeywordParams(array('CRAM-MD5', 'LOGIN'));
+        $auth->afterEhlo($this->_agent);
+    }
+
+    public function testAuthenticatorsAreNotUsedIfNoUsernameSet()
+    {
+        $a1 = $this->_createMockAuthenticator('PLAIN');
+        $a2 = $this->_createMockAuthenticator('LOGIN');
+
+        $a1->shouldReceive('authenticate')
+           ->never()
+           ->with($this->_agent, 'jack', 'pass');
+        $a2->shouldReceive('authenticate')
+           ->never()
+           ->with($this->_agent, 'jack', 'pass')
+           ->andReturn(true);
+
+        $auth = $this->_createHandler(array($a1, $a2));
+
+        $auth->setKeywordParams(array('CRAM-MD5', 'LOGIN'));
+        $auth->afterEhlo($this->_agent);
+    }
+
+    public function testSeveralAuthenticatorsAreTriedIfNeeded()
+    {
+        $a1 = $this->_createMockAuthenticator('PLAIN');
+        $a2 = $this->_createMockAuthenticator('LOGIN');
+
+        $a1->shouldReceive('authenticate')
+           ->once()
+           ->with($this->_agent, 'jack', 'pass')
+           ->andReturn(false);
+        $a2->shouldReceive('authenticate')
+           ->once()
+           ->with($this->_agent, 'jack', 'pass')
+           ->andReturn(true);
+
+        $auth = $this->_createHandler(array($a1, $a2));
+        $auth->setUsername('jack');
+        $auth->setPassword('pass');
+
+        $auth->setKeywordParams(array('PLAIN', 'LOGIN'));
+        $auth->afterEhlo($this->_agent);
+    }
+
+    public function testFirstAuthenticatorToPassBreaksChain()
+    {
+        $a1 = $this->_createMockAuthenticator('PLAIN');
+        $a2 = $this->_createMockAuthenticator('LOGIN');
+        $a3 = $this->_createMockAuthenticator('CRAM-MD5');
+
+        $a1->shouldReceive('authenticate')
+           ->once()
+           ->with($this->_agent, 'jack', 'pass')
+           ->andReturn(false);
+        $a2->shouldReceive('authenticate')
+           ->once()
+           ->with($this->_agent, 'jack', 'pass')
+           ->andReturn(true);
+        $a3->shouldReceive('authenticate')
+           ->never()
+           ->with($this->_agent, 'jack', 'pass');
+
+        $auth = $this->_createHandler(array($a1, $a2));
+        $auth->setUsername('jack');
+        $auth->setPassword('pass');
+
+        $auth->setKeywordParams(array('PLAIN', 'LOGIN', 'CRAM-MD5'));
+        $auth->afterEhlo($this->_agent);
+    }
+
+    // -- Private helpers
+
+    private function _createHandler($authenticators)
+    {
+        return new Swift_Transport_Esmtp_AuthHandler($authenticators);
+    }
+
+    private function _createMockAuthenticator($type)
+    {
+        $authenticator = $this->getMockery('Swift_Transport_Esmtp_Authenticator')->shouldIgnoreMissing();
+        $authenticator->shouldReceive('getAuthKeyword')
+                      ->zeroOrMoreTimes()
+                      ->andReturn($type);
+
+        return $authenticator;
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/EsmtpTransport/ExtensionSupportTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/EsmtpTransport/ExtensionSupportTest.php
new file mode 100644
index 000000000..8d6321f30
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/EsmtpTransport/ExtensionSupportTest.php
@@ -0,0 +1,528 @@
+<?php
+
+require_once dirname(__DIR__).'/EsmtpTransportTest.php';
+
+interface Swift_Transport_EsmtpHandlerMixin extends Swift_Transport_EsmtpHandler
+{
+    public function setUsername($user);
+    public function setPassword($pass);
+}
+
+class Swift_Transport_EsmtpTransport_ExtensionSupportTest extends Swift_Transport_EsmtpTransportTest
+{
+    public function testExtensionHandlersAreSortedAsNeeded()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $ext1 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
+        $ext2 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
+
+        $ext1->shouldReceive('getHandledKeyword')
+             ->zeroOrMoreTimes()
+             ->andReturn('AUTH');
+        $ext1->shouldReceive('getPriorityOver')
+             ->zeroOrMoreTimes()
+             ->with('STARTTLS')
+             ->andReturn(1);
+        $ext2->shouldReceive('getHandledKeyword')
+             ->zeroOrMoreTimes()
+             ->andReturn('STARTTLS');
+        $ext2->shouldReceive('getPriorityOver')
+             ->zeroOrMoreTimes()
+             ->with('AUTH')
+             ->andReturn(-1);
+        $this->_finishBuffer($buf);
+
+        $smtp->setExtensionHandlers(array($ext1, $ext2));
+        $this->assertEquals(array($ext2, $ext1), $smtp->getExtensionHandlers());
+    }
+
+    public function testHandlersAreNotifiedOfParams()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $ext1 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
+        $ext2 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
+
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(0)
+            ->andReturn("220 server.com foo\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with('~^EHLO .*?\r\n$~D')
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn("250-ServerName.tld\r\n");
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn("250-AUTH PLAIN LOGIN\r\n");
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn("250 SIZE=123456\r\n");
+
+        $ext1->shouldReceive('getHandledKeyword')
+             ->zeroOrMoreTimes()
+             ->andReturn('AUTH');
+        $ext1->shouldReceive('setKeywordParams')
+             ->once()
+             ->with(array('PLAIN', 'LOGIN'));
+        $ext2->shouldReceive('getHandledKeyword')
+             ->zeroOrMoreTimes()
+             ->andReturn('SIZE');
+        $ext2->shouldReceive('setKeywordParams')
+             ->zeroOrMoreTimes()
+             ->with(array('123456'));
+        $this->_finishBuffer($buf);
+
+        $smtp->setExtensionHandlers(array($ext1, $ext2));
+        $smtp->start();
+    }
+
+    public function testSupportedExtensionHandlersAreRunAfterEhlo()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $ext1 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
+        $ext2 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
+        $ext3 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
+
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(0)
+            ->andReturn("220 server.com foo\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with('~^EHLO .*?\r\n$~D')
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn("250-ServerName.tld\r\n");
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn("250-AUTH PLAIN LOGIN\r\n");
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn("250 SIZE=123456\r\n");
+
+        $ext1->shouldReceive('getHandledKeyword')
+             ->zeroOrMoreTimes()
+             ->andReturn('AUTH');
+        $ext1->shouldReceive('afterEhlo')
+             ->once()
+             ->with($smtp);
+        $ext2->shouldReceive('getHandledKeyword')
+             ->zeroOrMoreTimes()
+             ->andReturn('SIZE');
+        $ext2->shouldReceive('afterEhlo')
+             ->zeroOrMoreTimes()
+             ->with($smtp);
+        $ext3->shouldReceive('getHandledKeyword')
+             ->zeroOrMoreTimes()
+             ->andReturn('STARTTLS');
+        $ext3->shouldReceive('afterEhlo')
+             ->never()
+             ->with($smtp);
+        $this->_finishBuffer($buf);
+
+        $smtp->setExtensionHandlers(array($ext1, $ext2, $ext3));
+        $smtp->start();
+    }
+
+    public function testExtensionsCanModifyMailFromParams()
+    {
+        $buf = $this->_getBuffer();
+        $dispatcher = $this->_createEventDispatcher();
+        $smtp = new Swift_Transport_EsmtpTransport($buf, array(), $dispatcher);
+        $ext1 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
+        $ext2 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
+        $ext3 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getFrom')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('me@domain' => 'Me'));
+        $message->shouldReceive('getTo')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('foo@bar' => null));
+
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(0)
+            ->andReturn("220 server.com foo\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with('~^EHLO .*?\r\n$~D')
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn("250-ServerName.tld\r\n");
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn("250-AUTH PLAIN LOGIN\r\n");
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn("250 SIZE=123456\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("MAIL FROM:<me@domain> FOO ZIP\r\n")
+            ->andReturn(2);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(2)
+            ->andReturn("250 OK\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("RCPT TO:<foo@bar>\r\n")
+            ->andReturn(3);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(3)
+            ->andReturn("250 OK\r\n");
+        $this->_finishBuffer($buf);
+
+        $ext1->shouldReceive('getHandledKeyword')
+             ->zeroOrMoreTimes()
+             ->andReturn('AUTH');
+        $ext1->shouldReceive('getMailParams')
+             ->once()
+             ->andReturn('FOO');
+        $ext1->shouldReceive('getPriorityOver')
+             ->zeroOrMoreTimes()
+             ->with('AUTH')
+             ->andReturn(-1);
+        $ext2->shouldReceive('getHandledKeyword')
+             ->zeroOrMoreTimes()
+             ->andReturn('SIZE');
+        $ext2->shouldReceive('getMailParams')
+             ->once()
+             ->andReturn('ZIP');
+        $ext2->shouldReceive('getPriorityOver')
+             ->zeroOrMoreTimes()
+             ->with('AUTH')
+             ->andReturn(1);
+        $ext3->shouldReceive('getHandledKeyword')
+             ->zeroOrMoreTimes()
+             ->andReturn('STARTTLS');
+        $ext3->shouldReceive('getMailParams')
+             ->never();
+
+        $smtp->setExtensionHandlers(array($ext1, $ext2, $ext3));
+        $smtp->start();
+        $smtp->send($message);
+    }
+
+    public function testExtensionsCanModifyRcptParams()
+    {
+        $buf = $this->_getBuffer();
+        $dispatcher = $this->_createEventDispatcher();
+        $smtp = new Swift_Transport_EsmtpTransport($buf, array(), $dispatcher);
+        $ext1 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
+        $ext2 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
+        $ext3 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getFrom')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('me@domain' => 'Me'));
+        $message->shouldReceive('getTo')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('foo@bar' => null));
+
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(0)
+            ->andReturn("220 server.com foo\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with('~^EHLO .+?\r\n$~D')
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn("250-ServerName.tld\r\n");
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn("250-AUTH PLAIN LOGIN\r\n");
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn("250 SIZE=123456\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("MAIL FROM:<me@domain>\r\n")
+            ->andReturn(2);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(2)
+            ->andReturn("250 OK\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("RCPT TO:<foo@bar> FOO ZIP\r\n")
+            ->andReturn(3);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(3)
+            ->andReturn("250 OK\r\n");
+        $this->_finishBuffer($buf);
+
+        $ext1->shouldReceive('getHandledKeyword')
+             ->zeroOrMoreTimes()
+             ->andReturn('AUTH');
+        $ext1->shouldReceive('getRcptParams')
+             ->once()
+             ->andReturn('FOO');
+        $ext1->shouldReceive('getPriorityOver')
+             ->zeroOrMoreTimes()
+             ->with('AUTH')
+             ->andReturn(-1);
+        $ext2->shouldReceive('getHandledKeyword')
+             ->zeroOrMoreTimes()
+             ->andReturn('SIZE');
+        $ext2->shouldReceive('getRcptParams')
+             ->once()
+             ->andReturn('ZIP');
+        $ext2->shouldReceive('getPriorityOver')
+             ->zeroOrMoreTimes()
+             ->with('AUTH')
+             ->andReturn(1);
+        $ext3->shouldReceive('getHandledKeyword')
+             ->zeroOrMoreTimes()
+             ->andReturn('STARTTLS');
+        $ext3->shouldReceive('getRcptParams')
+             ->never();
+
+        $smtp->setExtensionHandlers(array($ext1, $ext2, $ext3));
+        $smtp->start();
+        $smtp->send($message);
+    }
+
+    public function testExtensionsAreNotifiedOnCommand()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $ext1 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
+        $ext2 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
+        $ext3 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
+
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(0)
+            ->andReturn("220 server.com foo\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with('~^EHLO .+?\r\n$~D')
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn("250-ServerName.tld\r\n");
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn("250-AUTH PLAIN LOGIN\r\n");
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn("250 SIZE=123456\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("FOO\r\n")
+            ->andReturn(2);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(2)
+            ->andReturn("250 Cool\r\n");
+        $this->_finishBuffer($buf);
+
+        $ext1->shouldReceive('getHandledKeyword')
+             ->zeroOrMoreTimes()
+             ->andReturn('AUTH');
+        $ext1->shouldReceive('onCommand')
+             ->once()
+             ->with($smtp, "FOO\r\n", array(250, 251), \Mockery::any(), \Mockery::any());
+        $ext2->shouldReceive('getHandledKeyword')
+             ->zeroOrMoreTimes()
+             ->andReturn('SIZE');
+        $ext2->shouldReceive('onCommand')
+             ->once()
+             ->with($smtp, "FOO\r\n", array(250, 251), \Mockery::any(), \Mockery::any());
+        $ext3->shouldReceive('getHandledKeyword')
+             ->zeroOrMoreTimes()
+             ->andReturn('STARTTLS');
+        $ext3->shouldReceive('onCommand')
+             ->never()
+             ->with(\Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any());
+
+        $smtp->setExtensionHandlers(array($ext1, $ext2, $ext3));
+        $smtp->start();
+        $smtp->executeCommand("FOO\r\n", array(250, 251));
+    }
+
+    public function testChainOfCommandAlgorithmWhenNotifyingExtensions()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $ext1 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
+        $ext2 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
+        $ext3 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
+
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(0)
+            ->andReturn("220 server.com foo\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with('~^EHLO .+?\r\n$~D')
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn("250-ServerName.tld\r\n");
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn("250-AUTH PLAIN LOGIN\r\n");
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn("250 SIZE=123456\r\n");
+        $buf->shouldReceive('write')
+            ->never()
+            ->with("FOO\r\n");
+        $this->_finishBuffer($buf);
+
+        $ext1->shouldReceive('getHandledKeyword')
+             ->zeroOrMoreTimes()
+             ->andReturn('AUTH');
+        $ext1->shouldReceive('onCommand')
+             ->once()
+             ->with($smtp, "FOO\r\n", array(250, 251), \Mockery::any(), \Mockery::any())
+             ->andReturnUsing(function ($a, $b, $c, $d, &$e) {
+                 $e = true;
+
+                 return '250 ok';
+             });
+        $ext2->shouldReceive('getHandledKeyword')
+             ->zeroOrMoreTimes()
+             ->andReturn('SIZE');
+        $ext2->shouldReceive('onCommand')
+             ->never()
+             ->with(\Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any());
+
+        $ext3->shouldReceive('getHandledKeyword')
+             ->zeroOrMoreTimes()
+             ->andReturn('STARTTLS');
+        $ext3->shouldReceive('onCommand')
+             ->never()
+             ->with(\Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any());
+
+        $smtp->setExtensionHandlers(array($ext1, $ext2, $ext3));
+        $smtp->start();
+        $smtp->executeCommand("FOO\r\n", array(250, 251));
+    }
+
+    public function testExtensionsCanExposeMixinMethods()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $ext1 = $this->getMockery('Swift_Transport_EsmtpHandlerMixin')->shouldIgnoreMissing();
+        $ext2 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
+
+        $ext1->shouldReceive('getHandledKeyword')
+             ->zeroOrMoreTimes()
+             ->andReturn('AUTH');
+        $ext1->shouldReceive('exposeMixinMethods')
+             ->zeroOrMoreTimes()
+             ->andReturn(array('setUsername', 'setPassword'));
+        $ext1->shouldReceive('setUsername')
+             ->once()
+             ->with('mick');
+        $ext1->shouldReceive('setPassword')
+             ->once()
+             ->with('pass');
+        $ext2->shouldReceive('getHandledKeyword')
+             ->zeroOrMoreTimes()
+             ->andReturn('STARTTLS');
+        $this->_finishBuffer($buf);
+
+        $smtp->setExtensionHandlers(array($ext1, $ext2));
+        $smtp->setUsername('mick');
+        $smtp->setPassword('pass');
+    }
+
+    public function testMixinMethodsBeginningWithSetAndNullReturnAreFluid()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $ext1 = $this->getMockery('Swift_Transport_EsmtpHandlerMixin')->shouldIgnoreMissing();
+        $ext2 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
+
+        $ext1->shouldReceive('getHandledKeyword')
+             ->zeroOrMoreTimes()
+             ->andReturn('AUTH');
+        $ext1->shouldReceive('exposeMixinMethods')
+             ->zeroOrMoreTimes()
+             ->andReturn(array('setUsername', 'setPassword'));
+        $ext1->shouldReceive('setUsername')
+             ->once()
+             ->with('mick')
+             ->andReturn(null);
+        $ext1->shouldReceive('setPassword')
+             ->once()
+             ->with('pass')
+             ->andReturn(null);
+        $ext2->shouldReceive('getHandledKeyword')
+             ->zeroOrMoreTimes()
+             ->andReturn('STARTTLS');
+        $this->_finishBuffer($buf);
+
+        $smtp->setExtensionHandlers(array($ext1, $ext2));
+        $ret = $smtp->setUsername('mick');
+        $this->assertEquals($smtp, $ret);
+        $ret = $smtp->setPassword('pass');
+        $this->assertEquals($smtp, $ret);
+    }
+
+    public function testMixinSetterWhichReturnValuesAreNotFluid()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $ext1 = $this->getMockery('Swift_Transport_EsmtpHandlerMixin')->shouldIgnoreMissing();
+        $ext2 = $this->getMockery('Swift_Transport_EsmtpHandler')->shouldIgnoreMissing();
+
+        $ext1->shouldReceive('getHandledKeyword')
+             ->zeroOrMoreTimes()
+             ->andReturn('AUTH');
+        $ext1->shouldReceive('exposeMixinMethods')
+             ->zeroOrMoreTimes()
+             ->andReturn(array('setUsername', 'setPassword'));
+        $ext1->shouldReceive('setUsername')
+             ->once()
+             ->with('mick')
+             ->andReturn('x');
+        $ext1->shouldReceive('setPassword')
+             ->once()
+             ->with('pass')
+             ->andReturn('x');
+        $ext2->shouldReceive('getHandledKeyword')
+             ->zeroOrMoreTimes()
+             ->andReturn('STARTTLS');
+        $this->_finishBuffer($buf);
+
+        $smtp->setExtensionHandlers(array($ext1, $ext2));
+        $this->assertEquals('x', $smtp->setUsername('mick'));
+        $this->assertEquals('x', $smtp->setPassword('pass'));
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/EsmtpTransportTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/EsmtpTransportTest.php
new file mode 100644
index 000000000..95a9ce2fe
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/EsmtpTransportTest.php
@@ -0,0 +1,298 @@
+<?php
+
+class Swift_Transport_EsmtpTransportTest
+    extends Swift_Transport_AbstractSmtpEventSupportTest
+{
+    protected function _getTransport($buf, $dispatcher = null)
+    {
+        if (!$dispatcher) {
+            $dispatcher = $this->_createEventDispatcher();
+        }
+
+        return new Swift_Transport_EsmtpTransport($buf, array(), $dispatcher);
+    }
+
+    public function testHostCanBeSetAndFetched()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $smtp->setHost('foo');
+        $this->assertEquals('foo', $smtp->getHost(), '%s: Host should be returned');
+    }
+
+    public function testPortCanBeSetAndFetched()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $smtp->setPort(25);
+        $this->assertEquals(25, $smtp->getPort(), '%s: Port should be returned');
+    }
+
+    public function testTimeoutCanBeSetAndFetched()
+    {
+        $buf = $this->_getBuffer();
+        $buf->shouldReceive('setParam')
+            ->once()
+            ->with('timeout', 10);
+
+        $smtp = $this->_getTransport($buf);
+        $smtp->setTimeout(10);
+        $this->assertEquals(10, $smtp->getTimeout(), '%s: Timeout should be returned');
+    }
+
+    public function testEncryptionCanBeSetAndFetched()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $smtp->setEncryption('tls');
+        $this->assertEquals('tls', $smtp->getEncryption(), '%s: Crypto should be returned');
+    }
+
+    public function testStartSendsHeloToInitiate()
+    {
+        //Overridden for EHLO instead
+    }
+
+    public function testStartSendsEhloToInitiate()
+    {
+        /* -- RFC 2821, 3.2.
+
+            3.2 Client Initiation
+
+         Once the server has sent the welcoming message and the client has
+         received it, the client normally sends the EHLO command to the
+         server, indicating the client's identity.  In addition to opening the
+         session, use of EHLO indicates that the client is able to process
+         service extensions and requests that the server provide a list of the
+         extensions it supports.  Older SMTP systems which are unable to
+         support service extensions and contemporary clients which do not
+         require service extensions in the mail session being initiated, MAY
+         use HELO instead of EHLO.  Servers MUST NOT return the extended
+         EHLO-style response to a HELO command.  For a particular connection
+         attempt, if the server returns a "command not recognized" response to
+         EHLO, the client SHOULD be able to fall back and send HELO.
+
+         In the EHLO command the host sending the command identifies itself;
+         the command may be interpreted as saying "Hello, I am <domain>" (and,
+         in the case of EHLO, "and I support service extension requests").
+
+       -- RFC 2281, 4.1.1.1.
+
+       ehlo            = "EHLO" SP Domain CRLF
+       helo            = "HELO" SP Domain CRLF
+
+       -- RFC 2821, 4.3.2.
+
+       EHLO or HELO
+           S: 250
+           E: 504, 550
+
+     */
+
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+
+        $buf->shouldReceive('initialize')
+            ->once();
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(0)
+            ->andReturn("220 some.server.tld bleh\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with('~^EHLO .+?\r\n$~D')
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('250 ServerName'."\r\n");
+
+        $this->_finishBuffer($buf);
+        try {
+            $smtp->start();
+        } catch (Exception $e) {
+            $this->fail('Starting Esmtp should send EHLO and accept 250 response');
+        }
+    }
+
+    public function testHeloIsUsedAsFallback()
+    {
+        /* -- RFC 2821, 4.1.4.
+
+       If the EHLO command is not acceptable to the SMTP server, 501, 500,
+       or 502 failure replies MUST be returned as appropriate.  The SMTP
+       server MUST stay in the same state after transmitting these replies
+       that it was in before the EHLO was received.
+        */
+
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+
+        $buf->shouldReceive('initialize')
+            ->once();
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(0)
+            ->andReturn("220 some.server.tld bleh\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with('~^EHLO .+?\r\n$~D')
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('501 WTF'."\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with('~^HELO .+?\r\n$~D')
+            ->andReturn(2);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(2)
+            ->andReturn('250 HELO'."\r\n");
+
+        $this->_finishBuffer($buf);
+        try {
+            $smtp->start();
+        } catch (Exception $e) {
+            $this->fail(
+                'Starting Esmtp should fallback to HELO if needed and accept 250 response'
+                );
+        }
+    }
+
+    public function testInvalidHeloResponseCausesException()
+    {
+        //Overridden to first try EHLO
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+
+        $buf->shouldReceive('initialize')
+            ->once();
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(0)
+            ->andReturn("220 some.server.tld bleh\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with('~^EHLO .+?\r\n$~D')
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('501 WTF'."\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with('~^HELO .+?\r\n$~D')
+            ->andReturn(2);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(2)
+            ->andReturn('504 WTF'."\r\n");
+        $this->_finishBuffer($buf);
+
+        try {
+            $this->assertFalse($smtp->isStarted(), '%s: SMTP should begin non-started');
+            $smtp->start();
+            $this->fail('Non 250 HELO response should raise Exception');
+        } catch (Exception $e) {
+            $this->assertFalse($smtp->isStarted(), '%s: SMTP start() should have failed');
+        }
+    }
+
+    public function testDomainNameIsPlacedInEhlo()
+    {
+        /* -- RFC 2821, 4.1.4.
+
+       The SMTP client MUST, if possible, ensure that the domain parameter
+       to the EHLO command is a valid principal host name (not a CNAME or MX
+       name) for its host.  If this is not possible (e.g., when the client's
+       address is dynamically assigned and the client does not have an
+       obvious name), an address literal SHOULD be substituted for the
+       domain name and supplemental information provided that will assist in
+       identifying the client.
+        */
+
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $buf->shouldReceive('initialize')
+            ->once();
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(0)
+            ->andReturn("220 some.server.tld bleh\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("EHLO mydomain.com\r\n")
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('250 ServerName'."\r\n");
+
+        $this->_finishBuffer($buf);
+        $smtp->setLocalDomain('mydomain.com');
+        $smtp->start();
+    }
+
+    public function testDomainNameIsPlacedInHelo()
+    {
+        //Overridden to include ESMTP
+        /* -- RFC 2821, 4.1.4.
+
+       The SMTP client MUST, if possible, ensure that the domain parameter
+       to the EHLO command is a valid principal host name (not a CNAME or MX
+       name) for its host.  If this is not possible (e.g., when the client's
+       address is dynamically assigned and the client does not have an
+       obvious name), an address literal SHOULD be substituted for the
+       domain name and supplemental information provided that will assist in
+       identifying the client.
+        */
+
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $buf->shouldReceive('initialize')
+            ->once();
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(0)
+            ->andReturn("220 some.server.tld bleh\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with('~^EHLO .+?\r\n$~D')
+            ->andReturn(1);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(1)
+            ->andReturn('501 WTF'."\r\n");
+        $buf->shouldReceive('write')
+            ->once()
+            ->with("HELO mydomain.com\r\n")
+            ->andReturn(2);
+        $buf->shouldReceive('readLine')
+            ->once()
+            ->with(2)
+            ->andReturn('250 ServerName'."\r\n");
+
+        $this->_finishBuffer($buf);
+        $smtp->setLocalDomain('mydomain.com');
+        $smtp->start();
+    }
+
+    public function testFluidInterface()
+    {
+        $buf = $this->_getBuffer();
+        $smtp = $this->_getTransport($buf);
+        $buf->shouldReceive('setParam')
+            ->once()
+            ->with('timeout', 30);
+
+        $ref = $smtp
+            ->setHost('foo')
+            ->setPort(25)
+            ->setEncryption('tls')
+            ->setTimeout(30)
+            ;
+        $this->assertEquals($ref, $smtp);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/FailoverTransportTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/FailoverTransportTest.php
new file mode 100644
index 000000000..8d80f3593
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/FailoverTransportTest.php
@@ -0,0 +1,520 @@
+<?php
+
+class Swift_Transport_FailoverTransportTest extends \SwiftMailerTestCase
+{
+    public function testFirstTransportIsUsed()
+    {
+        $message1 = $this->getMockery('Swift_Mime_Message');
+        $message2 = $this->getMockery('Swift_Mime_Message');
+        $t1 = $this->getMockery('Swift_Transport');
+        $t2 = $this->getMockery('Swift_Transport');
+        $connectionState = false;
+
+        $t1->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState) {
+               return $connectionState;
+           });
+        $t1->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState) {
+               if (!$connectionState) {
+                   $connectionState = true;
+               }
+           });
+        $t1->shouldReceive('send')
+           ->twice()
+           ->with(\Mockery::anyOf($message1, $message2), \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState) {
+               if ($connectionState) {
+                   return 1;
+               }
+           });
+        $t2->shouldReceive('start')->never();
+        $t2->shouldReceive('send')->never();
+
+        $transport = $this->_getTransport(array($t1, $t2));
+        $transport->start();
+        $this->assertEquals(1, $transport->send($message1));
+        $this->assertEquals(1, $transport->send($message2));
+    }
+
+    public function testMessageCanBeTriedOnNextTransportIfExceptionThrown()
+    {
+        $e = new Swift_TransportException('b0rken');
+
+        $message = $this->getMockery('Swift_Mime_Message');
+        $t1 = $this->getMockery('Swift_Transport');
+        $t2 = $this->getMockery('Swift_Transport');
+        $connectionState1 = false;
+        $connectionState2 = false;
+
+        $t1->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               return $connectionState1;
+           });
+        $t1->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               if (!$connectionState1) {
+                   $connectionState1 = true;
+               }
+           });
+        $t1->shouldReceive('send')
+           ->once()
+           ->with($message, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState1, $e) {
+               if ($connectionState1) {
+                   throw $e;
+               }
+           });
+
+        $t2->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               return $connectionState2;
+           });
+        $t2->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               if (!$connectionState2) {
+                   $connectionState2 = true;
+               }
+           });
+        $t2->shouldReceive('send')
+           ->once()
+           ->with($message, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState2, $e) {
+               if ($connectionState2) {
+                   return 1;
+               }
+           });
+
+        $transport = $this->_getTransport(array($t1, $t2));
+        $transport->start();
+        $this->assertEquals(1, $transport->send($message));
+    }
+
+    public function testZeroIsReturnedIfTransportReturnsZero()
+    {
+        $message = $this->getMockery('Swift_Mime_Message')->shouldIgnoreMissing();
+        $t1 = $this->getMockery('Swift_Transport')->shouldIgnoreMissing();
+
+        $connectionState = false;
+        $t1->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState) {
+               return $connectionState;
+           });
+        $t1->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState) {
+               if (!$connectionState) {
+                   $connectionState = true;
+               }
+           });
+        $testCase = $this;
+        $t1->shouldReceive('send')
+           ->once()
+           ->with($message, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState, $testCase) {
+               if (!$connectionState) {
+                   $testCase->fail();
+               }
+
+               return 0;
+           });
+
+        $transport = $this->_getTransport(array($t1));
+        $transport->start();
+        $this->assertEquals(0, $transport->send($message));
+    }
+
+    public function testTransportsWhichThrowExceptionsAreNotRetried()
+    {
+        $e = new Swift_TransportException('maur b0rken');
+
+        $message1 = $this->getMockery('Swift_Mime_Message');
+        $message2 = $this->getMockery('Swift_Mime_Message');
+        $message3 = $this->getMockery('Swift_Mime_Message');
+        $message4 = $this->getMockery('Swift_Mime_Message');
+        $t1 = $this->getMockery('Swift_Transport');
+        $t2 = $this->getMockery('Swift_Transport');
+        $connectionState1 = false;
+        $connectionState2 = false;
+
+        $t1->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               return $connectionState1;
+           });
+        $t1->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               if (!$connectionState1) {
+                   $connectionState1 = true;
+               }
+           });
+        $t1->shouldReceive('send')
+           ->once()
+           ->with($message1, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState1, $e) {
+               if ($connectionState1) {
+                   throw $e;
+               }
+           });
+        $t1->shouldReceive('send')
+           ->never()
+           ->with($message2, \Mockery::any());
+        $t1->shouldReceive('send')
+           ->never()
+           ->with($message3, \Mockery::any());
+        $t1->shouldReceive('send')
+           ->never()
+           ->with($message4, \Mockery::any());
+
+        $t2->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               return $connectionState2;
+           });
+        $t2->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               if (!$connectionState2) {
+                   $connectionState2 = true;
+               }
+           });
+        $t2->shouldReceive('send')
+           ->times(4)
+           ->with(\Mockery::anyOf($message1, $message2, $message3, $message4), \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState2, $e) {
+               if ($connectionState2) {
+                   return 1;
+               }
+           });
+
+        $transport = $this->_getTransport(array($t1, $t2));
+        $transport->start();
+        $this->assertEquals(1, $transport->send($message1));
+        $this->assertEquals(1, $transport->send($message2));
+        $this->assertEquals(1, $transport->send($message3));
+        $this->assertEquals(1, $transport->send($message4));
+    }
+
+    public function testExceptionIsThrownIfAllTransportsDie()
+    {
+        $e = new Swift_TransportException('b0rken');
+
+        $message = $this->getMockery('Swift_Mime_Message');
+        $t1 = $this->getMockery('Swift_Transport');
+        $t2 = $this->getMockery('Swift_Transport');
+        $connectionState1 = false;
+        $connectionState2 = false;
+
+        $t1->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               return $connectionState1;
+           });
+        $t1->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               if (!$connectionState1) {
+                   $connectionState1 = true;
+               }
+           });
+        $t1->shouldReceive('send')
+           ->once()
+           ->with($message, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState1, $e) {
+               if ($connectionState1) {
+                   throw $e;
+               }
+           });
+
+        $t2->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               return $connectionState2;
+           });
+        $t2->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               if (!$connectionState2) {
+                   $connectionState2 = true;
+               }
+           });
+        $t2->shouldReceive('send')
+           ->once()
+           ->with($message, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState2, $e) {
+               if ($connectionState2) {
+                   throw $e;
+               }
+           });
+
+        $transport = $this->_getTransport(array($t1, $t2));
+        $transport->start();
+        try {
+            $transport->send($message);
+            $this->fail('All transports failed so Exception should be thrown');
+        } catch (Exception $e) {
+        }
+    }
+
+    public function testStoppingTransportStopsAllDelegates()
+    {
+        $t1 = $this->getMockery('Swift_Transport');
+        $t2 = $this->getMockery('Swift_Transport');
+
+        $connectionState1 = true;
+        $connectionState2 = true;
+
+        $t1->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               return $connectionState1;
+           });
+        $t1->shouldReceive('stop')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               if ($connectionState1) {
+                   $connectionState1 = false;
+               }
+           });
+
+        $t2->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               return $connectionState2;
+           });
+        $t2->shouldReceive('stop')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               if ($connectionState2) {
+                   $connectionState2 = false;
+               }
+           });
+
+        $transport = $this->_getTransport(array($t1, $t2));
+        $transport->start();
+        $transport->stop();
+    }
+
+    public function testTransportShowsAsNotStartedIfAllDelegatesDead()
+    {
+        $e = new Swift_TransportException('b0rken');
+
+        $message = $this->getMockery('Swift_Mime_Message');
+        $t1 = $this->getMockery('Swift_Transport');
+        $t2 = $this->getMockery('Swift_Transport');
+
+        $connectionState1 = false;
+        $connectionState2 = false;
+
+        $t1->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               return $connectionState1;
+           });
+        $t1->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               if (!$connectionState1) {
+                   $connectionState1 = true;
+               }
+           });
+        $t1->shouldReceive('send')
+           ->once()
+           ->with($message, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState1, $e) {
+               if ($connectionState1) {
+                   $connectionState1 = false;
+                   throw $e;
+               }
+           });
+
+        $t2->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               return $connectionState2;
+           });
+        $t2->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               if (!$connectionState2) {
+                   $connectionState2 = true;
+               }
+           });
+        $t2->shouldReceive('send')
+           ->once()
+           ->with($message, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState2, $e) {
+               if ($connectionState2) {
+                   $connectionState2 = false;
+                   throw $e;
+               }
+           });
+
+        $transport = $this->_getTransport(array($t1, $t2));
+        $transport->start();
+        $this->assertTrue($transport->isStarted());
+        try {
+            $transport->send($message);
+            $this->fail('All transports failed so Exception should be thrown');
+        } catch (Exception $e) {
+            $this->assertFalse($transport->isStarted());
+        }
+    }
+
+    public function testRestartingTransportRestartsDeadDelegates()
+    {
+        $e = new Swift_TransportException('b0rken');
+
+        $message1 = $this->getMockery('Swift_Mime_Message');
+        $message2 = $this->getMockery('Swift_Mime_Message');
+        $t1 = $this->getMockery('Swift_Transport');
+        $t2 = $this->getMockery('Swift_Transport');
+
+        $connectionState1 = false;
+        $connectionState2 = false;
+
+        $t1->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               return $connectionState1;
+           });
+        $t1->shouldReceive('start')
+           ->twice()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               if (!$connectionState1) {
+                   $connectionState1 = true;
+               }
+           });
+        $t1->shouldReceive('send')
+           ->once()
+           ->with($message1, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState1, $e) {
+               if ($connectionState1) {
+                   $connectionState1 = false;
+                   throw $e;
+               }
+           });
+        $t1->shouldReceive('send')
+           ->once()
+           ->with($message2, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState1) {
+               if ($connectionState1) {
+                   return 10;
+               }
+           });
+
+        $t2->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               return $connectionState2;
+           });
+        $t2->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               if (!$connectionState2) {
+                   $connectionState2 = true;
+               }
+           });
+        $t2->shouldReceive('send')
+           ->once()
+           ->with($message1, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState2, $e) {
+               if ($connectionState2) {
+                   $connectionState2 = false;
+                   throw $e;
+               }
+           });
+        $t2->shouldReceive('send')
+           ->never()
+           ->with($message2, \Mockery::any());
+
+        $transport = $this->_getTransport(array($t1, $t2));
+        $transport->start();
+        $this->assertTrue($transport->isStarted());
+        try {
+            $transport->send($message1);
+            $this->fail('All transports failed so Exception should be thrown');
+        } catch (Exception $e) {
+            $this->assertFalse($transport->isStarted());
+        }
+        //Restart and re-try
+        $transport->start();
+        $this->assertTrue($transport->isStarted());
+        $this->assertEquals(10, $transport->send($message2));
+    }
+
+    public function testFailureReferenceIsPassedToDelegates()
+    {
+        $failures = array();
+
+        $message = $this->getMockery('Swift_Mime_Message');
+        $t1 = $this->getMockery('Swift_Transport');
+
+        $connectionState = false;
+
+        $t1->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use ($connectionState) {
+               return $connectionState;
+           });
+        $t1->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use ($connectionState) {
+               if (!$connectionState) {
+                   $connectionState = true;
+               }
+           });
+        $t1->shouldReceive('send')
+           ->once()
+           ->with($message, $failures)
+           ->andReturnUsing(function () use ($connectionState) {
+               if ($connectionState) {
+                   return 1;
+               }
+           });
+
+        $transport = $this->_getTransport(array($t1));
+        $transport->start();
+        $transport->send($message, $failures);
+    }
+
+    public function testRegisterPluginDelegatesToLoadedTransports()
+    {
+        $plugin = $this->_createPlugin();
+
+        $t1 = $this->getMockery('Swift_Transport');
+        $t2 = $this->getMockery('Swift_Transport');
+        $t1->shouldReceive('registerPlugin')
+           ->once()
+           ->with($plugin);
+        $t2->shouldReceive('registerPlugin')
+           ->once()
+           ->with($plugin);
+
+        $transport = $this->_getTransport(array($t1, $t2));
+        $transport->registerPlugin($plugin);
+    }
+
+    // -- Private helpers
+
+    private function _getTransport(array $transports)
+    {
+        $transport = new Swift_Transport_FailoverTransport();
+        $transport->setTransports($transports);
+
+        return $transport;
+    }
+
+    private function _createPlugin()
+    {
+        return $this->getMockery('Swift_Events_EventListener');
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/LoadBalancedTransportTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/LoadBalancedTransportTest.php
new file mode 100644
index 000000000..273f13563
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/LoadBalancedTransportTest.php
@@ -0,0 +1,751 @@
+<?php
+
+class Swift_Transport_LoadBalancedTransportTest extends \SwiftMailerTestCase
+{
+    public function testEachTransportIsUsedInTurn()
+    {
+        $message1 = $this->getMockery('Swift_Mime_Message');
+        $message2 = $this->getMockery('Swift_Mime_Message');
+        $t1 = $this->getMockery('Swift_Transport');
+        $t2 = $this->getMockery('Swift_Transport');
+        $connectionState1 = false;
+        $connectionState2 = false;
+
+        $testCase = $this;
+        $t1->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               return $connectionState1;
+           });
+        $t1->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               if (!$connectionState1) {
+                   $connectionState1 = true;
+               }
+           });
+        $t1->shouldReceive('send')
+           ->once()
+           ->with($message1, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState1, $testCase) {
+               if ($connectionState1) {
+                   return 1;
+               }
+               $testCase->fail();
+           });
+        $t1->shouldReceive('send')
+           ->never()
+           ->with($message2, \Mockery::any());
+
+        $t2->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               return $connectionState2;
+           });
+        $t2->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               if (!$connectionState2) {
+                   $connectionState2 = true;
+               }
+           });
+        $t2->shouldReceive('send')
+           ->once()
+           ->with($message2, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState2, $testCase) {
+               if ($connectionState2) {
+                   return 1;
+               }
+               $testCase->fail();
+           });
+        $t2->shouldReceive('send')
+           ->never()
+           ->with($message1, \Mockery::any());
+
+        $transport = $this->_getTransport(array($t1, $t2));
+        $transport->start();
+        $this->assertEquals(1, $transport->send($message1));
+        $this->assertEquals(1, $transport->send($message2));
+    }
+
+    public function testTransportsAreReusedInRotatingFashion()
+    {
+        $message1 = $this->getMockery('Swift_Mime_Message');
+        $message2 = $this->getMockery('Swift_Mime_Message');
+        $message3 = $this->getMockery('Swift_Mime_Message');
+        $message4 = $this->getMockery('Swift_Mime_Message');
+        $t1 = $this->getMockery('Swift_Transport');
+        $t2 = $this->getMockery('Swift_Transport');
+        $connectionState1 = false;
+        $connectionState2 = false;
+
+        $testCase = $this;
+        $t1->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               return $connectionState1;
+           });
+        $t1->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               if (!$connectionState1) {
+                   $connectionState1 = true;
+               }
+           });
+        $t1->shouldReceive('send')
+           ->once()
+           ->with($message1, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState1, $testCase) {
+               if ($connectionState1) {
+                   return 1;
+               }
+               $testCase->fail();
+           });
+        $t1->shouldReceive('send')
+           ->never()
+           ->with($message2, \Mockery::any());
+        $t1->shouldReceive('send')
+           ->once()
+           ->with($message3, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState1, $testCase) {
+               if ($connectionState1) {
+                   return 1;
+               }
+               $testCase->fail();
+           });
+        $t1->shouldReceive('send')
+           ->never()
+           ->with($message4, \Mockery::any());
+
+        $t2->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               return $connectionState2;
+           });
+        $t2->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               if (!$connectionState2) {
+                   $connectionState2 = true;
+               }
+           });
+        $t2->shouldReceive('send')
+           ->once()
+           ->with($message2, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState2, $testCase) {
+               if ($connectionState2) {
+                   return 1;
+               }
+               $testCase->fail();
+           });
+        $t2->shouldReceive('send')
+           ->never()
+           ->with($message1, \Mockery::any());
+        $t2->shouldReceive('send')
+           ->once()
+           ->with($message4, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState2, $testCase) {
+               if ($connectionState2) {
+                   return 1;
+               }
+               $testCase->fail();
+           });
+        $t2->shouldReceive('send')
+           ->never()
+           ->with($message3, \Mockery::any());
+
+        $transport = $this->_getTransport(array($t1, $t2));
+        $transport->start();
+
+        $this->assertEquals(1, $transport->send($message1));
+        $this->assertEquals(1, $transport->send($message2));
+        $this->assertEquals(1, $transport->send($message3));
+        $this->assertEquals(1, $transport->send($message4));
+    }
+
+    public function testMessageCanBeTriedOnNextTransportIfExceptionThrown()
+    {
+        $e = new Swift_TransportException('b0rken');
+
+        $message = $this->getMockery('Swift_Mime_Message');
+        $t1 = $this->getMockery('Swift_Transport');
+        $t2 = $this->getMockery('Swift_Transport');
+        $connectionState1 = false;
+        $connectionState2 = false;
+
+        $testCase = $this;
+        $t1->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               return $connectionState1;
+           });
+        $t1->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               if (!$connectionState1) {
+                   $connectionState1 = true;
+               }
+           });
+        $t1->shouldReceive('send')
+           ->once()
+           ->with($message, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState1, $e, $testCase) {
+               if ($connectionState1) {
+                   throw $e;
+               }
+               $testCase->fail();
+           });
+
+        $t2->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               return $connectionState2;
+           });
+        $t2->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               if (!$connectionState2) {
+                   $connectionState2 = true;
+               }
+           });
+        $t2->shouldReceive('send')
+           ->once()
+           ->with($message, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState2, $testCase) {
+               if ($connectionState2) {
+                   return 1;
+               }
+               $testCase->fail();
+           });
+
+        $transport = $this->_getTransport(array($t1, $t2));
+        $transport->start();
+        $this->assertEquals(1, $transport->send($message));
+    }
+
+    public function testMessageIsTriedOnNextTransportIfZeroReturned()
+    {
+        $message = $this->getMockery('Swift_Mime_Message');
+        $t1 = $this->getMockery('Swift_Transport');
+        $t2 = $this->getMockery('Swift_Transport');
+        $connectionState1 = false;
+        $connectionState2 = false;
+
+        $t1->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               return $connectionState1;
+           });
+        $t1->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               if (!$connectionState1) {
+                   $connectionState1 = true;
+               }
+           });
+        $t1->shouldReceive('send')
+           ->once()
+           ->with($message, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState1) {
+               if ($connectionState1) {
+                   return 0;
+               }
+
+               return 1;
+           });
+
+        $t2->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               return $connectionState2;
+           });
+        $t2->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               if (!$connectionState2) {
+                   $connectionState2 = true;
+               }
+           });
+        $t2->shouldReceive('send')
+           ->once()
+           ->with($message, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState2) {
+               if ($connectionState2) {
+                   return 1;
+               }
+
+               return 0;
+           });
+
+        $transport = $this->_getTransport(array($t1, $t2));
+        $transport->start();
+        $this->assertEquals(1, $transport->send($message));
+    }
+
+    public function testZeroIsReturnedIfAllTransportsReturnZero()
+    {
+        $message = $this->getMockery('Swift_Mime_Message');
+        $t1 = $this->getMockery('Swift_Transport');
+        $t2 = $this->getMockery('Swift_Transport');
+        $connectionState1 = false;
+        $connectionState2 = false;
+
+        $t1->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               return $connectionState1;
+           });
+        $t1->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               if (!$connectionState1) {
+                   $connectionState1 = true;
+               }
+           });
+        $t1->shouldReceive('send')
+           ->once()
+           ->with($message, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState1) {
+               if ($connectionState1) {
+                   return 0;
+               }
+
+               return 1;
+           });
+
+        $t2->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               return $connectionState2;
+           });
+        $t2->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               if (!$connectionState2) {
+                   $connectionState2 = true;
+               }
+           });
+        $t2->shouldReceive('send')
+           ->once()
+           ->with($message, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState2) {
+               if ($connectionState2) {
+                   return 0;
+               }
+
+               return 1;
+           });
+
+        $transport = $this->_getTransport(array($t1, $t2));
+        $transport->start();
+        $this->assertEquals(0, $transport->send($message));
+    }
+
+    public function testTransportsWhichThrowExceptionsAreNotRetried()
+    {
+        $e = new Swift_TransportException('maur b0rken');
+
+        $message1 = $this->getMockery('Swift_Mime_Message');
+        $message2 = $this->getMockery('Swift_Mime_Message');
+        $message3 = $this->getMockery('Swift_Mime_Message');
+        $message4 = $this->getMockery('Swift_Mime_Message');
+        $t1 = $this->getMockery('Swift_Transport');
+        $t2 = $this->getMockery('Swift_Transport');
+        $connectionState1 = false;
+        $connectionState2 = false;
+
+        $testCase = $this;
+        $t1->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               return $connectionState1;
+           });
+        $t1->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               if (!$connectionState1) {
+                   $connectionState1 = true;
+               }
+           });
+        $t1->shouldReceive('send')
+           ->once()
+           ->with($message1, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState1, $e, $testCase) {
+               if ($connectionState1) {
+                   throw $e;
+               }
+               $testCase->fail();
+           });
+        $t1->shouldReceive('send')
+           ->never()
+           ->with($message2, \Mockery::any());
+        $t1->shouldReceive('send')
+           ->never()
+           ->with($message3, \Mockery::any());
+        $t1->shouldReceive('send')
+           ->never()
+           ->with($message4, \Mockery::any());
+
+        $t2->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               return $connectionState2;
+           });
+        $t2->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               if (!$connectionState2) {
+                   $connectionState2 = true;
+               }
+           });
+        $t2->shouldReceive('send')
+           ->times(4)
+           ->with(\Mockery::anyOf($message1, $message3, $message3, $message4), \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState2, $testCase) {
+               if ($connectionState2) {
+                   return 1;
+               }
+               $testCase->fail();
+           });
+
+        $transport = $this->_getTransport(array($t1, $t2));
+        $transport->start();
+        $this->assertEquals(1, $transport->send($message1));
+        $this->assertEquals(1, $transport->send($message2));
+        $this->assertEquals(1, $transport->send($message3));
+        $this->assertEquals(1, $transport->send($message4));
+    }
+
+    public function testExceptionIsThrownIfAllTransportsDie()
+    {
+        $e = new Swift_TransportException('b0rken');
+
+        $message = $this->getMockery('Swift_Mime_Message');
+        $t1 = $this->getMockery('Swift_Transport');
+        $t2 = $this->getMockery('Swift_Transport');
+        $connectionState1 = false;
+        $connectionState2 = false;
+
+        $t1->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               return $connectionState1;
+           });
+        $t1->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               if (!$connectionState1) {
+                   $connectionState1 = true;
+               }
+           });
+        $t1->shouldReceive('send')
+           ->once()
+           ->with($message, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState1, $e) {
+               if ($connectionState1) {
+                   throw $e;
+               }
+           });
+
+        $t2->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               return $connectionState2;
+           });
+        $t2->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               if (!$connectionState2) {
+                   $connectionState2 = true;
+               }
+           });
+        $t2->shouldReceive('send')
+           ->once()
+           ->with($message, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState2, $e) {
+               if ($connectionState2) {
+                   throw $e;
+               }
+           });
+
+        $transport = $this->_getTransport(array($t1, $t2));
+        $transport->start();
+        try {
+            $transport->send($message);
+            $this->fail('All transports failed so Exception should be thrown');
+        } catch (Exception $e) {
+        }
+    }
+
+    public function testStoppingTransportStopsAllDelegates()
+    {
+        $t1 = $this->getMockery('Swift_Transport');
+        $t2 = $this->getMockery('Swift_Transport');
+        $connectionState1 = true;
+        $connectionState2 = true;
+
+        $t1->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               return $connectionState1;
+           });
+        $t1->shouldReceive('stop')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               if ($connectionState1) {
+                   $connectionState1 = false;
+               }
+           });
+
+        $t2->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               return $connectionState2;
+           });
+        $t2->shouldReceive('stop')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               if ($connectionState2) {
+                   $connectionState2 = false;
+               }
+           });
+
+        $transport = $this->_getTransport(array($t1, $t2));
+        $transport->start();
+        $transport->stop();
+    }
+
+    public function testTransportShowsAsNotStartedIfAllDelegatesDead()
+    {
+        $e = new Swift_TransportException('b0rken');
+
+        $message = $this->getMockery('Swift_Mime_Message');
+        $t1 = $this->getMockery('Swift_Transport');
+        $t2 = $this->getMockery('Swift_Transport');
+        $connectionState1 = false;
+        $connectionState2 = false;
+
+        $t1->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               return $connectionState1;
+           });
+        $t1->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               if (!$connectionState1) {
+                   $connectionState1 = true;
+               }
+           });
+        $t1->shouldReceive('send')
+           ->once()
+           ->with($message, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState1, $e) {
+               if ($connectionState1) {
+                   throw $e;
+               }
+           });
+
+        $t2->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               return $connectionState2;
+           });
+        $t2->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               if (!$connectionState2) {
+                   $connectionState2 = true;
+               }
+           });
+        $t2->shouldReceive('send')
+           ->once()
+           ->with($message, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState2, $e) {
+               if ($connectionState2) {
+                   throw $e;
+               }
+           });
+
+        $transport = $this->_getTransport(array($t1, $t2));
+        $transport->start();
+        $this->assertTrue($transport->isStarted());
+        try {
+            $transport->send($message);
+            $this->fail('All transports failed so Exception should be thrown');
+        } catch (Exception $e) {
+            $this->assertFalse($transport->isStarted());
+        }
+    }
+
+    public function testRestartingTransportRestartsDeadDelegates()
+    {
+        $e = new Swift_TransportException('b0rken');
+
+        $message1 = $this->getMockery('Swift_Mime_Message');
+        $message2 = $this->getMockery('Swift_Mime_Message');
+        $t1 = $this->getMockery('Swift_Transport');
+        $t2 = $this->getMockery('Swift_Transport');
+        $connectionState1 = false;
+        $connectionState2 = false;
+
+        $t1->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               return $connectionState1;
+           });
+        $t1->shouldReceive('start')
+           ->twice()
+           ->andReturnUsing(function () use (&$connectionState1) {
+               if (!$connectionState1) {
+                   $connectionState1 = true;
+               }
+           });
+        $t1->shouldReceive('send')
+           ->once()
+           ->with($message1, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState1, $e) {
+               if ($connectionState1) {
+                   $connectionState1 = false;
+                   throw $e;
+               }
+           });
+        $t1->shouldReceive('send')
+           ->once()
+           ->with($message2, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState1, $e) {
+               if ($connectionState1) {
+                   return 10;
+               }
+           });
+
+        $t2->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               return $connectionState2;
+           });
+        $t2->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState2) {
+               if (!$connectionState2) {
+                   $connectionState2 = true;
+               }
+           });
+        $t2->shouldReceive('send')
+           ->once()
+           ->with($message1, \Mockery::any())
+           ->andReturnUsing(function () use (&$connectionState2, $e) {
+               if ($connectionState2) {
+                   throw $e;
+               }
+           });
+        $t2->shouldReceive('send')
+           ->never()
+           ->with($message2, \Mockery::any());
+
+        $transport = $this->_getTransport(array($t1, $t2));
+        $transport->start();
+        $this->assertTrue($transport->isStarted());
+        try {
+            $transport->send($message1);
+            $this->fail('All transports failed so Exception should be thrown');
+        } catch (Exception $e) {
+            $this->assertFalse($transport->isStarted());
+        }
+        //Restart and re-try
+        $transport->start();
+        $this->assertTrue($transport->isStarted());
+        $this->assertEquals(10, $transport->send($message2));
+    }
+
+    public function testFailureReferenceIsPassedToDelegates()
+    {
+        $failures = array();
+        $testCase = $this;
+
+        $message = $this->getMockery('Swift_Mime_Message');
+        $t1 = $this->getMockery('Swift_Transport');
+        $connectionState = false;
+
+        $t1->shouldReceive('isStarted')
+           ->zeroOrMoreTimes()
+           ->andReturnUsing(function () use (&$connectionState) {
+               return $connectionState;
+           });
+        $t1->shouldReceive('start')
+           ->once()
+           ->andReturnUsing(function () use (&$connectionState) {
+               if (!$connectionState) {
+                   $connectionState = true;
+               }
+           });
+        $t1->shouldReceive('send')
+           ->once()
+           ->with($message, \Mockery::on(function (&$var) use (&$failures, $testCase) {
+                return $testCase->varsAreReferences($var, $failures);
+           }))
+           ->andReturnUsing(function () use (&$connectionState) {
+               if ($connectionState) {
+                   return 1;
+               }
+           });
+
+        $transport = $this->_getTransport(array($t1));
+        $transport->start();
+        $transport->send($message, $failures);
+    }
+
+    public function testRegisterPluginDelegatesToLoadedTransports()
+    {
+        $plugin = $this->_createPlugin();
+
+        $t1 = $this->getMockery('Swift_Transport');
+        $t2 = $this->getMockery('Swift_Transport');
+
+        $t1->shouldReceive('registerPlugin')
+           ->once()
+           ->with($plugin);
+        $t2->shouldReceive('registerPlugin')
+           ->once()
+           ->with($plugin);
+
+        $transport = $this->_getTransport(array($t1, $t2));
+        $transport->registerPlugin($plugin);
+    }
+
+    /**
+     * Adapted from Yay_Matchers_ReferenceMatcher.
+     */
+    public function varsAreReferences(&$ref1, &$ref2)
+    {
+        if (is_object($ref2)) {
+            return ($ref1 === $ref2);
+        }
+        if ($ref1 !== $ref2) {
+            return false;
+        }
+
+        $copy = $ref2;
+        $randomString = uniqid('yay');
+        $ref2 = $randomString;
+        $isRef = ($ref1 === $ref2);
+        $ref2 = $copy;
+
+        return $isRef;
+    }
+
+    // -- Private helpers
+
+    private function _getTransport(array $transports)
+    {
+        $transport = new Swift_Transport_LoadBalancedTransport();
+        $transport->setTransports($transports);
+
+        return $transport;
+    }
+
+    private function _createPlugin()
+    {
+        return $this->getMockery('Swift_Events_EventListener');
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/MailTransportTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/MailTransportTest.php
new file mode 100644
index 000000000..4faa6de21
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/MailTransportTest.php
@@ -0,0 +1,505 @@
+<?php
+
+class Swift_Transport_MailTransportTest extends \SwiftMailerTestCase
+{
+    public function testTransportInvokesMailOncePerMessage()
+    {
+        $invoker = $this->_createInvoker();
+        $dispatcher = $this->_createEventDispatcher();
+        $transport = $this->_createTransport($invoker, $dispatcher);
+
+        $headers = $this->_createHeaders();
+        $message = $this->_createMessageWithRecipient($headers);
+
+        $invoker->shouldReceive('mail')
+                ->once();
+
+        $transport->send($message);
+    }
+
+    public function testTransportUsesToFieldBodyInSending()
+    {
+        $invoker = $this->_createInvoker();
+        $dispatcher = $this->_createEventDispatcher();
+        $transport = $this->_createTransport($invoker, $dispatcher);
+
+        $to = $this->_createHeader();
+        $headers = $this->_createHeaders(array(
+            'To' => $to,
+        ));
+        $message = $this->_createMessageWithRecipient($headers);
+
+        $to->shouldReceive('getFieldBody')
+           ->zeroOrMoreTimes()
+           ->andReturn('Foo <foo@bar>');
+        $invoker->shouldReceive('mail')
+                ->once()
+                ->with('Foo <foo@bar>', \Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any());
+
+        $transport->send($message);
+    }
+
+    public function testTransportUsesSubjectFieldBodyInSending()
+    {
+        $invoker = $this->_createInvoker();
+        $dispatcher = $this->_createEventDispatcher();
+        $transport = $this->_createTransport($invoker, $dispatcher);
+
+        $subj = $this->_createHeader();
+        $headers = $this->_createHeaders(array(
+            'Subject' => $subj,
+        ));
+        $message = $this->_createMessageWithRecipient($headers);
+
+        $subj->shouldReceive('getFieldBody')
+             ->zeroOrMoreTimes()
+             ->andReturn('Thing');
+        $invoker->shouldReceive('mail')
+                ->once()
+                ->with(\Mockery::any(), 'Thing', \Mockery::any(), \Mockery::any(), \Mockery::any());
+
+        $transport->send($message);
+    }
+
+    public function testTransportUsesBodyOfMessage()
+    {
+        $invoker = $this->_createInvoker();
+        $dispatcher = $this->_createEventDispatcher();
+        $transport = $this->_createTransport($invoker, $dispatcher);
+
+        $headers = $this->_createHeaders();
+        $message = $this->_createMessageWithRecipient($headers);
+
+        $message->shouldReceive('toString')
+             ->zeroOrMoreTimes()
+             ->andReturn(
+                "To: Foo <foo@bar>\r\n".
+                "\r\n".
+                'This body'
+             );
+        $invoker->shouldReceive('mail')
+                ->once()
+                ->with(\Mockery::any(), \Mockery::any(), 'This body', \Mockery::any(), \Mockery::any());
+
+        $transport->send($message);
+    }
+
+    public function testTransportSettingUsingReturnPathForExtraParams()
+    {
+        $invoker = $this->_createInvoker();
+        $dispatcher = $this->_createEventDispatcher();
+        $transport = $this->_createTransport($invoker, $dispatcher);
+
+        $headers = $this->_createHeaders();
+        $message = $this->_createMessageWithRecipient($headers);
+
+        $message->shouldReceive('getReturnPath')
+             ->zeroOrMoreTimes()
+             ->andReturn(
+                'foo@bar'
+             );
+        $invoker->shouldReceive('mail')
+                ->once()
+                ->with(\Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any(), '-f\'foo@bar\'');
+
+        $transport->send($message);
+    }
+
+    public function testTransportSettingEmptyExtraParams()
+    {
+        $invoker = $this->_createInvoker();
+        $dispatcher = $this->_createEventDispatcher();
+        $transport = $this->_createTransport($invoker, $dispatcher);
+
+        $headers = $this->_createHeaders();
+        $message = $this->_createMessageWithRecipient($headers);
+
+        $message->shouldReceive('getReturnPath')
+            ->zeroOrMoreTimes()
+            ->andReturn(null);
+        $message->shouldReceive('getSender')
+            ->zeroOrMoreTimes()
+            ->andReturn(null);
+        $message->shouldReceive('getFrom')
+            ->zeroOrMoreTimes()
+            ->andReturn(null);
+        $invoker->shouldReceive('mail')
+            ->once()
+            ->with(\Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any(), null);
+
+        $transport->send($message);
+    }
+
+    public function testTransportSettingSettingExtraParamsWithF()
+    {
+        $invoker = $this->_createInvoker();
+        $dispatcher = $this->_createEventDispatcher();
+        $transport = $this->_createTransport($invoker, $dispatcher);
+        $transport->setExtraParams('-x\'foo\' -f%s');
+
+        $headers = $this->_createHeaders();
+        $message = $this->_createMessageWithRecipient($headers);
+
+        $message->shouldReceive('getReturnPath')
+            ->zeroOrMoreTimes()
+            ->andReturn(
+                    'foo@bar'
+                );
+        $message->shouldReceive('getSender')
+            ->zeroOrMoreTimes()
+            ->andReturn(null);
+        $message->shouldReceive('getFrom')
+            ->zeroOrMoreTimes()
+            ->andReturn(null);
+        $invoker->shouldReceive('mail')
+            ->once()
+            ->with(\Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any(), '-x\'foo\' -f\'foo@bar\'');
+
+        $transport->send($message);
+    }
+
+    public function testTransportSettingSettingExtraParamsWithoutF()
+    {
+        $invoker = $this->_createInvoker();
+        $dispatcher = $this->_createEventDispatcher();
+        $transport = $this->_createTransport($invoker, $dispatcher);
+        $transport->setExtraParams('-x\'foo\'');
+
+        $headers = $this->_createHeaders();
+        $message = $this->_createMessageWithRecipient($headers);
+
+        $message->shouldReceive('getReturnPath')
+            ->zeroOrMoreTimes()
+            ->andReturn(
+                'foo@bar'
+            );
+        $message->shouldReceive('getSender')
+            ->zeroOrMoreTimes()
+            ->andReturn(null);
+        $message->shouldReceive('getFrom')
+            ->zeroOrMoreTimes()
+            ->andReturn(null);
+        $invoker->shouldReceive('mail')
+            ->once()
+            ->with(\Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any(), '-x\'foo\'');
+
+        $transport->send($message);
+    }
+
+    public function testTransportUsesHeadersFromMessage()
+    {
+        $invoker = $this->_createInvoker();
+        $dispatcher = $this->_createEventDispatcher();
+        $transport = $this->_createTransport($invoker, $dispatcher);
+
+        $headers = $this->_createHeaders();
+        $message = $this->_createMessageWithRecipient($headers);
+
+        $message->shouldReceive('toString')
+            ->zeroOrMoreTimes()
+            ->andReturn(
+                "Subject: Stuff\r\n".
+                "\r\n".
+                'This body'
+            );
+        $invoker->shouldReceive('mail')
+            ->once()
+            ->with(\Mockery::any(), \Mockery::any(), \Mockery::any(), 'Subject: Stuff'.PHP_EOL, \Mockery::any());
+
+        $transport->send($message);
+    }
+
+    public function testTransportReturnsCountOfAllRecipientsIfInvokerReturnsTrue()
+    {
+        $invoker = $this->_createInvoker();
+        $dispatcher = $this->_createEventDispatcher();
+        $transport = $this->_createTransport($invoker, $dispatcher);
+
+        $headers = $this->_createHeaders();
+        $message = $this->_createMessage($headers);
+
+        $message->shouldReceive('getTo')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('foo@bar' => null, 'zip@button' => null));
+        $message->shouldReceive('getCc')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('test@test' => null));
+        $invoker->shouldReceive('mail')
+                ->once()
+                ->with(\Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any())
+                ->andReturn(true);
+
+        $this->assertEquals(3, $transport->send($message));
+    }
+
+    public function testTransportReturnsZeroIfInvokerReturnsFalse()
+    {
+        $invoker = $this->_createInvoker();
+        $dispatcher = $this->_createEventDispatcher();
+        $transport = $this->_createTransport($invoker, $dispatcher);
+
+        $headers = $this->_createHeaders();
+        $message = $this->_createMessage($headers);
+
+        $message->shouldReceive('getTo')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('foo@bar' => null, 'zip@button' => null));
+        $message->shouldReceive('getCc')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('test@test' => null));
+        $invoker->shouldReceive('mail')
+                ->once()
+                ->with(\Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any())
+                ->andReturn(false);
+
+        $this->assertEquals(0, $transport->send($message));
+    }
+
+    public function testToHeaderIsRemovedFromHeaderSetDuringSending()
+    {
+        $invoker = $this->_createInvoker();
+        $dispatcher = $this->_createEventDispatcher();
+        $transport = $this->_createTransport($invoker, $dispatcher);
+
+        $to = $this->_createHeader();
+        $headers = $this->_createHeaders(array(
+            'To' => $to,
+        ));
+        $message = $this->_createMessageWithRecipient($headers);
+
+        $headers->shouldReceive('remove')
+                ->once()
+                ->with('To');
+        $headers->shouldReceive('remove')
+                ->zeroOrMoreTimes();
+        $invoker->shouldReceive('mail')
+                ->once()
+                ->with(\Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any());
+
+        $transport->send($message);
+    }
+
+    public function testSubjectHeaderIsRemovedFromHeaderSetDuringSending()
+    {
+        $invoker = $this->_createInvoker();
+        $dispatcher = $this->_createEventDispatcher();
+        $transport = $this->_createTransport($invoker, $dispatcher);
+
+        $subject = $this->_createHeader();
+        $headers = $this->_createHeaders(array(
+            'Subject' => $subject,
+        ));
+        $message = $this->_createMessageWithRecipient($headers);
+
+        $headers->shouldReceive('remove')
+                ->once()
+                ->with('Subject');
+        $headers->shouldReceive('remove')
+                ->zeroOrMoreTimes();
+        $invoker->shouldReceive('mail')
+                ->once()
+                ->with(\Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any());
+
+        $transport->send($message);
+    }
+
+    public function testToHeaderIsPutBackAfterSending()
+    {
+        $invoker = $this->_createInvoker();
+        $dispatcher = $this->_createEventDispatcher();
+        $transport = $this->_createTransport($invoker, $dispatcher);
+
+        $to = $this->_createHeader();
+        $headers = $this->_createHeaders(array(
+            'To' => $to,
+        ));
+        $message = $this->_createMessageWithRecipient($headers);
+
+        $headers->shouldReceive('set')
+                ->once()
+                ->with($to);
+        $headers->shouldReceive('set')
+                ->zeroOrMoreTimes();
+        $invoker->shouldReceive('mail')
+                ->once()
+                ->with(\Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any());
+
+        $transport->send($message);
+    }
+
+    public function testSubjectHeaderIsPutBackAfterSending()
+    {
+        $invoker = $this->_createInvoker();
+        $dispatcher = $this->_createEventDispatcher();
+        $transport = $this->_createTransport($invoker, $dispatcher);
+
+        $subject = $this->_createHeader();
+        $headers = $this->_createHeaders(array(
+            'Subject' => $subject,
+        ));
+        $message = $this->_createMessageWithRecipient($headers);
+
+        $headers->shouldReceive('set')
+                ->once()
+                ->with($subject);
+        $headers->shouldReceive('set')
+                ->zeroOrMoreTimes();
+        $invoker->shouldReceive('mail')
+                ->once()
+                ->with(\Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any(), \Mockery::any());
+
+        $transport->send($message);
+    }
+
+    public function testMessageHeadersOnlyHavePHPEolsDuringSending()
+    {
+        $invoker = $this->_createInvoker();
+        $dispatcher = $this->_createEventDispatcher();
+        $transport = $this->_createTransport($invoker, $dispatcher);
+
+        $subject = $this->_createHeader();
+        $subject->shouldReceive('getFieldBody')->andReturn("Foo\r\nBar");
+
+        $headers = $this->_createHeaders(array(
+            'Subject' => $subject,
+        ));
+        $message = $this->_createMessageWithRecipient($headers);
+        $message->shouldReceive('toString')
+            ->zeroOrMoreTimes()
+            ->andReturn(
+                "From: Foo\r\n<foo@bar>\r\n".
+                "\r\n".
+                "This\r\n".
+                'body'
+            );
+
+        if ("\r\n" != PHP_EOL) {
+            $expectedHeaders = "From: Foo\n<foo@bar>\n";
+            $expectedSubject = "Foo\nBar";
+            $expectedBody = "This\nbody";
+        } else {
+            $expectedHeaders = "From: Foo\r\n<foo@bar>\r\n";
+            $expectedSubject = "Foo\r\nBar";
+            $expectedBody = "This\r\nbody";
+        }
+
+        $invoker->shouldReceive('mail')
+            ->once()
+            ->with(\Mockery::any(), $expectedSubject, $expectedBody, $expectedHeaders, \Mockery::any());
+
+        $transport->send($message);
+    }
+
+    /**
+     * @expectedException Swift_TransportException
+     * @expectedExceptionMessage Cannot send message without a recipient
+     */
+    public function testExceptionWhenNoRecipients()
+    {
+        $invoker = $this->_createInvoker();
+        $invoker->shouldReceive('mail');
+        $dispatcher = $this->_createEventDispatcher();
+        $transport = $this->_createTransport($invoker, $dispatcher);
+
+        $headers = $this->_createHeaders();
+        $message = $this->_createMessage($headers);
+
+        $transport->send($message);
+    }
+
+    public function noExceptionWhenRecipientsExistProvider()
+    {
+        return array(
+            array('To'),
+            array('Cc'),
+            array('Bcc'),
+        );
+    }
+
+    /**
+     * @dataProvider noExceptionWhenRecipientsExistProvider
+     *
+     * @param string $header
+     */
+    public function testNoExceptionWhenRecipientsExist($header)
+    {
+        $invoker = $this->_createInvoker();
+        $invoker->shouldReceive('mail');
+        $dispatcher = $this->_createEventDispatcher();
+        $transport = $this->_createTransport($invoker, $dispatcher);
+
+        $headers = $this->_createHeaders();
+        $message = $this->_createMessage($headers);
+        $message->shouldReceive(sprintf('get%s', $header))->andReturn(array('foo@bar' => 'Foo'));
+
+        $transport->send($message);
+    }
+
+    // -- Creation Methods
+
+    private function _createTransport($invoker, $dispatcher)
+    {
+        return new Swift_Transport_MailTransport($invoker, $dispatcher);
+    }
+
+    private function _createEventDispatcher()
+    {
+        return $this->getMockery('Swift_Events_EventDispatcher')->shouldIgnoreMissing();
+    }
+
+    private function _createInvoker()
+    {
+        return $this->getMockery('Swift_Transport_MailInvoker');
+    }
+
+    private function _createMessage($headers)
+    {
+        $message = $this->getMockery('Swift_Mime_Message')->shouldIgnoreMissing();
+        $message->shouldReceive('getHeaders')
+                ->zeroOrMoreTimes()
+                ->andReturn($headers);
+
+        return $message;
+    }
+
+    private function _createMessageWithRecipient($headers, $recipient = array('foo@bar' => 'Foo'))
+    {
+        $message = $this->_createMessage($headers);
+        $message->shouldReceive('getTo')->andReturn($recipient);
+
+        return $message;
+    }
+
+    private function _createHeaders($headers = array())
+    {
+        $set = $this->getMockery('Swift_Mime_HeaderSet')->shouldIgnoreMissing();
+
+        if (count($headers) > 0) {
+            foreach ($headers as $name => $header) {
+                $set->shouldReceive('get')
+                    ->zeroOrMoreTimes()
+                    ->with($name)
+                    ->andReturn($header);
+                $set->shouldReceive('has')
+                    ->zeroOrMoreTimes()
+                    ->with($name)
+                    ->andReturn(true);
+            }
+        }
+
+        $header = $this->_createHeader();
+        $set->shouldReceive('get')
+            ->zeroOrMoreTimes()
+            ->andReturn($header);
+        $set->shouldReceive('has')
+            ->zeroOrMoreTimes()
+            ->andReturn(true);
+
+        return $set;
+    }
+
+    private function _createHeader()
+    {
+        return $this->getMockery('Swift_Mime_Header')->shouldIgnoreMissing();
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/SendmailTransportTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/SendmailTransportTest.php
new file mode 100644
index 000000000..c704c3c35
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/SendmailTransportTest.php
@@ -0,0 +1,152 @@
+<?php
+
+class Swift_Transport_SendmailTransportTest
+    extends Swift_Transport_AbstractSmtpEventSupportTest
+{
+    protected function _getTransport($buf, $dispatcher = null, $command = '/usr/sbin/sendmail -bs')
+    {
+        if (!$dispatcher) {
+            $dispatcher = $this->_createEventDispatcher();
+        }
+        $transport = new Swift_Transport_SendmailTransport($buf, $dispatcher);
+        $transport->setCommand($command);
+
+        return $transport;
+    }
+
+    protected function _getSendmail($buf, $dispatcher = null)
+    {
+        if (!$dispatcher) {
+            $dispatcher = $this->_createEventDispatcher();
+        }
+        $sendmail = new Swift_Transport_SendmailTransport($buf, $dispatcher);
+
+        return $sendmail;
+    }
+
+    public function testCommandCanBeSetAndFetched()
+    {
+        $buf = $this->_getBuffer();
+        $sendmail = $this->_getSendmail($buf);
+
+        $sendmail->setCommand('/usr/sbin/sendmail -bs');
+        $this->assertEquals('/usr/sbin/sendmail -bs', $sendmail->getCommand());
+        $sendmail->setCommand('/usr/sbin/sendmail -oi -t');
+        $this->assertEquals('/usr/sbin/sendmail -oi -t', $sendmail->getCommand());
+    }
+
+    public function testSendingMessageIn_t_ModeUsesSimplePipe()
+    {
+        $buf = $this->_getBuffer();
+        $sendmail = $this->_getSendmail($buf);
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getTo')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('foo@bar' => 'Foobar', 'zip@button' => 'Zippy'));
+        $message->shouldReceive('toByteStream')
+                ->once()
+                ->with($buf);
+        $buf->shouldReceive('initialize')
+            ->once();
+        $buf->shouldReceive('terminate')
+            ->once();
+        $buf->shouldReceive('setWriteTranslations')
+            ->once()
+            ->with(array("\r\n" => "\n", "\n." => "\n.."));
+        $buf->shouldReceive('setWriteTranslations')
+            ->once()
+            ->with(array());
+
+        $sendmail->setCommand('/usr/sbin/sendmail -t');
+        $this->assertEquals(2, $sendmail->send($message));
+    }
+
+    public function testSendingIn_t_ModeWith_i_FlagDoesntEscapeDot()
+    {
+        $buf = $this->_getBuffer();
+        $sendmail = $this->_getSendmail($buf);
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getTo')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('foo@bar' => 'Foobar', 'zip@button' => 'Zippy'));
+        $message->shouldReceive('toByteStream')
+                ->once()
+                ->with($buf);
+        $buf->shouldReceive('initialize')
+            ->once();
+        $buf->shouldReceive('terminate')
+            ->once();
+        $buf->shouldReceive('setWriteTranslations')
+            ->once()
+            ->with(array("\r\n" => "\n"));
+        $buf->shouldReceive('setWriteTranslations')
+            ->once()
+            ->with(array());
+
+        $sendmail->setCommand('/usr/sbin/sendmail -i -t');
+        $this->assertEquals(2, $sendmail->send($message));
+    }
+
+    public function testSendingInTModeWith_oi_FlagDoesntEscapeDot()
+    {
+        $buf = $this->_getBuffer();
+        $sendmail = $this->_getSendmail($buf);
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getTo')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('foo@bar' => 'Foobar', 'zip@button' => 'Zippy'));
+        $message->shouldReceive('toByteStream')
+                ->once()
+                ->with($buf);
+        $buf->shouldReceive('initialize')
+            ->once();
+        $buf->shouldReceive('terminate')
+            ->once();
+        $buf->shouldReceive('setWriteTranslations')
+            ->once()
+            ->with(array("\r\n" => "\n"));
+        $buf->shouldReceive('setWriteTranslations')
+            ->once()
+            ->with(array());
+
+        $sendmail->setCommand('/usr/sbin/sendmail -oi -t');
+        $this->assertEquals(2, $sendmail->send($message));
+    }
+
+    public function testSendingMessageRegeneratesId()
+    {
+        $buf = $this->_getBuffer();
+        $sendmail = $this->_getSendmail($buf);
+        $message = $this->_createMessage();
+
+        $message->shouldReceive('getTo')
+                ->zeroOrMoreTimes()
+                ->andReturn(array('foo@bar' => 'Foobar', 'zip@button' => 'Zippy'));
+        $message->shouldReceive('generateId');
+        $buf->shouldReceive('initialize')
+            ->once();
+        $buf->shouldReceive('terminate')
+            ->once();
+        $buf->shouldReceive('setWriteTranslations')
+            ->once()
+            ->with(array("\r\n" => "\n", "\n." => "\n.."));
+        $buf->shouldReceive('setWriteTranslations')
+            ->once()
+            ->with(array());
+
+        $sendmail->setCommand('/usr/sbin/sendmail -t');
+        $this->assertEquals(2, $sendmail->send($message));
+    }
+
+    public function testFluidInterface()
+    {
+        $buf = $this->_getBuffer();
+        $sendmail = $this->_getTransport($buf);
+
+        $ref = $sendmail->setCommand('/foo');
+        $this->assertEquals($ref, $sendmail);
+    }
+}
diff --git a/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/StreamBufferTest.php b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/StreamBufferTest.php
new file mode 100644
index 000000000..3ec74b3e7
--- /dev/null
+++ b/lib/vendor/symfony/lib/vendor/swiftmailer/tests/unit/Swift/Transport/StreamBufferTest.php
@@ -0,0 +1,45 @@
+<?php
+
+class Swift_Transport_StreamBufferTest extends \PHPUnit_Framework_TestCase
+{
+    public function testSettingWriteTranslationsCreatesFilters()
+    {
+        $factory = $this->_createFactory();
+        $factory->expects($this->once())
+                ->method('createFilter')
+                ->with('a', 'b')
+                ->will($this->returnCallback(array($this, '_createFilter')));
+
+        $buffer = $this->_createBuffer($factory);
+        $buffer->setWriteTranslations(array('a' => 'b'));
+    }
+
+    public function testOverridingTranslationsOnlyAddsNeededFilters()
+    {
+        $factory = $this->_createFactory();
+        $factory->expects($this->exactly(2))
+                ->method('createFilter')
+                ->will($this->returnCallback(array($this, '_createFilter')));
+
+        $buffer = $this->_createBuffer($factory);
+        $buffer->setWriteTranslations(array('a' => 'b'));
+        $buffer->setWriteTranslations(array('x' => 'y', 'a' => 'b'));
+    }
+
+    // -- Creation methods
+
+    private function _createBuffer($replacementFactory)
+    {
+        return new Swift_Transport_StreamBuffer($replacementFactory);
+    }
+
+    private function _createFactory()
+    {
+        return $this->getMock('Swift_ReplacementFilterFactory');
+    }
+
+    public function _createFilter()
+    {
+        return $this->getMock('Swift_StreamFilter');
+    }
+}
diff --git a/lib/vendor/symfony/lib/view/sfPHPView.class.php b/lib/vendor/symfony/lib/view/sfPHPView.class.php
index fcdf5cd22..f6feca06c 100644
--- a/lib/vendor/symfony/lib/view/sfPHPView.class.php
+++ b/lib/vendor/symfony/lib/view/sfPHPView.class.php
@@ -16,7 +16,7 @@
  * @subpackage view
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfPHPView.class.php 28713 2010-03-23 15:08:22Z fabien $
+ * @version    SVN: $Id$
  */
 class sfPHPView extends sfView
 {
diff --git a/lib/vendor/symfony/lib/view/sfPartialView.class.php b/lib/vendor/symfony/lib/view/sfPartialView.class.php
index 93b97fa00..d8a122eff 100644
--- a/lib/vendor/symfony/lib/view/sfPartialView.class.php
+++ b/lib/vendor/symfony/lib/view/sfPartialView.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage view
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPartialView.class.php 31928 2011-01-29 16:02:51Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfPartialView extends sfPHPView
 {
diff --git a/lib/vendor/symfony/lib/view/sfView.class.php b/lib/vendor/symfony/lib/view/sfView.class.php
index 7b8eff255..87107d59c 100644
--- a/lib/vendor/symfony/lib/view/sfView.class.php
+++ b/lib/vendor/symfony/lib/view/sfView.class.php
@@ -18,7 +18,7 @@
  * @subpackage view
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
  * @author     Sean Kerr <sean@code-box.org>
- * @version    SVN: $Id: sfView.class.php 28713 2010-03-23 15:08:22Z fabien $
+ * @version    SVN: $Id$
  */
 abstract class sfView
 {
diff --git a/lib/vendor/symfony/lib/view/sfViewCacheManager.class.php b/lib/vendor/symfony/lib/view/sfViewCacheManager.class.php
index f43ee63ed..834d46697 100644
--- a/lib/vendor/symfony/lib/view/sfViewCacheManager.class.php
+++ b/lib/vendor/symfony/lib/view/sfViewCacheManager.class.php
@@ -18,7 +18,7 @@
  * @package    symfony
  * @subpackage view
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfViewCacheManager.class.php 32699 2011-07-01 06:58:02Z fabien $
+ * @version    SVN: $Id$
  */
 class sfViewCacheManager
 {
@@ -307,7 +307,7 @@ public function addCache($moduleName, $actionName, $options = array())
     {
       foreach ($options['vary'] as $key => $name)
       {
-        $options['vary'][$key] = strtr(strtolower($name), '_', '-');
+        $options['vary'][$key] = str_replace('_', '-', strtolower($name));
       }
     }
 
diff --git a/lib/vendor/symfony/lib/view/sfViewParameterHolder.class.php b/lib/vendor/symfony/lib/view/sfViewParameterHolder.class.php
index 31096e1a4..5172c8aac 100644
--- a/lib/vendor/symfony/lib/view/sfViewParameterHolder.class.php
+++ b/lib/vendor/symfony/lib/view/sfViewParameterHolder.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage view
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfViewParameterHolder.class.php 21884 2009-09-11 07:38:24Z fabien $
+ * @version    SVN: $Id$
  */
 class sfViewParameterHolder extends sfParameterHolder
 {
diff --git a/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nChoiceCountry.class.php b/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nChoiceCountry.class.php
index aa621849f..1735530fc 100644
--- a/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nChoiceCountry.class.php
+++ b/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nChoiceCountry.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormI18nChoiceCountry.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormI18nChoiceCountry extends sfWidgetFormChoice
 {
diff --git a/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nChoiceCurrency.class.php b/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nChoiceCurrency.class.php
index 576c3c452..0887acc79 100644
--- a/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nChoiceCurrency.class.php
+++ b/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nChoiceCurrency.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormI18nChoiceCurrency.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormI18nChoiceCurrency extends sfWidgetFormChoice
 {
diff --git a/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nChoiceLanguage.class.php b/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nChoiceLanguage.class.php
index 6d66c8ea1..905309717 100644
--- a/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nChoiceLanguage.class.php
+++ b/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nChoiceLanguage.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormI18nChoiceLanguage.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormI18nChoiceLanguage extends sfWidgetFormChoice
 {
diff --git a/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nChoiceTimezone.class.php b/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nChoiceTimezone.class.php
index e9bbb8946..d28dbbb21 100644
--- a/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nChoiceTimezone.class.php
+++ b/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nChoiceTimezone.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormI18nChoiceTimezone.class.php 23810 2009-11-12 11:07:44Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormI18nChoiceTimezone extends sfWidgetFormChoice
 {
diff --git a/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nDate.class.php b/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nDate.class.php
index b0cd8e13f..3c74c71b7 100644
--- a/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nDate.class.php
+++ b/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nDate.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormI18nDate.class.php 9046 2008-05-19 08:13:51Z FabianLange $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormI18nDate extends sfWidgetFormDate
 {
diff --git a/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nDateTime.class.php b/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nDateTime.class.php
index 8cd654405..3dac59e6e 100644
--- a/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nDateTime.class.php
+++ b/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nDateTime.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormI18nDateTime.class.php 15086 2009-01-30 00:23:45Z FabianLange $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormI18nDateTime extends sfWidgetFormDateTime
 {
diff --git a/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nTime.class.php b/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nTime.class.php
index 3471f24cb..32bb53307 100644
--- a/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nTime.class.php
+++ b/lib/vendor/symfony/lib/widget/i18n/sfWidgetFormI18nTime.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormI18nTime.class.php 9046 2008-05-19 08:13:51Z FabianLange $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormI18nTime extends sfWidgetFormTime
 {
diff --git a/lib/vendor/symfony/lib/widget/sfWidget.class.php b/lib/vendor/symfony/lib/widget/sfWidget.class.php
index 87f8abaf9..80a4c4b63 100644
--- a/lib/vendor/symfony/lib/widget/sfWidget.class.php
+++ b/lib/vendor/symfony/lib/widget/sfWidget.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidget.class.php 22933 2009-10-11 22:42:56Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 abstract class sfWidget
 {
@@ -157,12 +157,13 @@ public function setOption($name, $value)
    * Gets an option value.
    *
    * @param  string $name The option name
+   * @param  string $default A default value if option does not exists
    *
    * @return mixed  The option value
    */
-  public function getOption($name)
+  public function getOption($name, $default = null)
   {
-    return isset($this->options[$name]) ? $this->options[$name] : null;
+    return isset($this->options[$name]) ? $this->options[$name] : $default;
   }
 
   /**
@@ -385,8 +386,12 @@ static public function fixDoubleEscape($escaped)
   public function attributesToHtml($attributes)
   {
     $attributes = array_merge($this->attributes, $attributes);
+    foreach ($attributes as $key => &$value)
+    {
+      $value = $this->attributesToHtmlCallback($key, $value);
+    }
 
-    return implode('', array_map(array($this, 'attributesToHtmlCallback'), array_keys($attributes), array_values($attributes)));
+    return implode('', $attributes);
   }
 
   /**
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetForm.class.php b/lib/vendor/symfony/lib/widget/sfWidgetForm.class.php
index be2ce90c6..558ae285b 100644
--- a/lib/vendor/symfony/lib/widget/sfWidgetForm.class.php
+++ b/lib/vendor/symfony/lib/widget/sfWidgetForm.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetForm.class.php 24137 2009-11-18 13:12:40Z fabien $
+ * @version    SVN: $Id$
  */
 abstract class sfWidgetForm extends sfWidget
 {
@@ -242,9 +242,9 @@ public function generateId($name, $value = null)
     }
 
     // check to see if we have an array variable for a field name
-    if (strstr($name, '['))
+    if (false !== strpos($name, '['))
     {
-      $name = str_replace(array('[]', '][', '[', ']'), array((null !== $value ? '_'.$value : ''), '_', '_', ''), $name);
+      $name = str_replace(array('[]', '][', '[', ']'), array((null !== $value && !is_array($value) ? '_'.$value : ''), '_', '_', ''), $name);
     }
 
     if (false !== strpos($this->getOption('id_format'), '%s'))
@@ -330,7 +330,7 @@ protected function translate($text, array $parameters = array())
    * @param  array $parameters  The values to replace the placeholders
    *
    * @return array              The translated texts
-   * 
+   *
    * @see sfWidgetFormSchemaFormatter::translate()
    */
   protected function translateAll(array $texts, array $parameters = array())
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormChoice.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormChoice.class.php
index 7cd8d742e..71cceec08 100644
--- a/lib/vendor/symfony/lib/widget/sfWidgetFormChoice.class.php
+++ b/lib/vendor/symfony/lib/widget/sfWidgetFormChoice.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormChoice.class.php 32835 2011-07-27 07:07:00Z fabien $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormChoice extends sfWidgetFormChoiceBase
 {
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormDate.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormDate.class.php
index c0447dbc9..96eba1a5d 100644
--- a/lib/vendor/symfony/lib/widget/sfWidgetFormDate.class.php
+++ b/lib/vendor/symfony/lib/widget/sfWidgetFormDate.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormDate.class.php 30762 2010-08-25 12:33:33Z fabien $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormDate extends sfWidgetForm
 {
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormDateRange.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormDateRange.class.php
index 6b25f2e93..a33314c84 100644
--- a/lib/vendor/symfony/lib/widget/sfWidgetFormDateRange.class.php
+++ b/lib/vendor/symfony/lib/widget/sfWidgetFormDateRange.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormDateRange.class.php 30762 2010-08-25 12:33:33Z fabien $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormDateRange extends sfWidgetForm
 {
@@ -55,11 +55,12 @@ protected function configure($options = array(), $attributes = array())
    */
   public function render($name, $value = null, $attributes = array(), $errors = array())
   {
-    $values = array_merge(array('from' => '', 'to' => '', 'is_empty' => ''), is_array($value) ? $value : array());
+    $value = array_merge(array('from' => '', 'to' => ''), is_array($value) ? $value : array());
+    $attributes = array_merge(array('from' => array(), 'to' => array()), is_array($attributes) ? $attributes : array());
 
     return strtr($this->translate($this->getOption('template')), array(
-      '%from_date%'      => $this->getOption('from_date')->render($name.'[from]', $value['from']),
-      '%to_date%'        => $this->getOption('to_date')->render($name.'[to]', $value['to']),
+      '%from_date%'      => $this->getOption('from_date')->render($name.'[from]', $value['from'], $attributes['from'], $errors),
+      '%to_date%'        => $this->getOption('to_date')->render($name.'[to]', $value['to'], $attributes['to'], $errors),
     ));
   }
 
@@ -70,7 +71,7 @@ public function render($name, $value = null, $attributes = array(), $errors = ar
    */
   public function getStylesheets()
   {
-    return array_unique(array_merge($this->getOption('from_date')->getStylesheets(), $this->getOption('to_date')->getStylesheets()));
+    return array_merge($this->getOption('from_date')->getStylesheets(), $this->getOption('to_date')->getStylesheets());
   }
 
   /**
@@ -80,6 +81,6 @@ public function getStylesheets()
    */
   public function getJavaScripts()
   {
-    return array_unique(array_merge($this->getOption('from_date')->getJavaScripts(), $this->getOption('to_date')->getJavaScripts()));
+    return array_merge($this->getOption('from_date')->getJavaScripts(), $this->getOption('to_date')->getJavaScripts());
   }
 }
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormDateTime.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormDateTime.class.php
index 5e7f29c94..5415fa9a4 100644
--- a/lib/vendor/symfony/lib/widget/sfWidgetFormDateTime.class.php
+++ b/lib/vendor/symfony/lib/widget/sfWidgetFormDateTime.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormDateTime.class.php 30762 2010-08-25 12:33:33Z fabien $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormDateTime extends sfWidgetForm
 {
@@ -58,7 +58,7 @@ protected function configure($options = array(), $attributes = array())
    *
    * @see sfWidgetForm
    */
-  function render($name, $value = null, $attributes = array(), $errors = array())
+  public function render($name, $value = null, $attributes = array(), $errors = array())
   {
     $date = $this->getDateWidget($attributes)->render($name, $value);
 
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormFilterDate.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormFilterDate.class.php
index a56c88315..4f7369af8 100644
--- a/lib/vendor/symfony/lib/widget/sfWidgetFormFilterDate.class.php
+++ b/lib/vendor/symfony/lib/widget/sfWidgetFormFilterDate.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormFilterDate.class.php 30762 2010-08-25 12:33:33Z fabien $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormFilterDate extends sfWidgetFormDateRange
 {
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormFilterInput.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormFilterInput.class.php
index 632dea1b9..9b46e7921 100644
--- a/lib/vendor/symfony/lib/widget/sfWidgetFormFilterInput.class.php
+++ b/lib/vendor/symfony/lib/widget/sfWidgetFormFilterInput.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormFilterInput.class.php 30762 2010-08-25 12:33:33Z fabien $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormFilterInput extends sfWidgetForm
 {
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormInput.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormInput.class.php
index a45a4af3d..adab49faa 100644
--- a/lib/vendor/symfony/lib/widget/sfWidgetFormInput.class.php
+++ b/lib/vendor/symfony/lib/widget/sfWidgetFormInput.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormInput.class.php 30762 2010-08-25 12:33:33Z fabien $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormInput extends sfWidgetForm
 {
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormInputCheckbox.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormInputCheckbox.class.php
index c5447a2f9..9fd08b57c 100644
--- a/lib/vendor/symfony/lib/widget/sfWidgetFormInputCheckbox.class.php
+++ b/lib/vendor/symfony/lib/widget/sfWidgetFormInputCheckbox.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormInputCheckbox.class.php 30762 2010-08-25 12:33:33Z fabien $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormInputCheckbox extends sfWidgetFormInput
 {
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormInputFile.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormInputFile.class.php
index cfacca0bd..26444e2a1 100644
--- a/lib/vendor/symfony/lib/widget/sfWidgetFormInputFile.class.php
+++ b/lib/vendor/symfony/lib/widget/sfWidgetFormInputFile.class.php
@@ -3,7 +3,7 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormInputFile.class.php 30762 2010-08-25 12:33:33Z fabien $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormInputFile extends sfWidgetFormInput
 {
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormInputFileEditable.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormInputFileEditable.class.php
index 515c25218..0bf04f0c9 100644
--- a/lib/vendor/symfony/lib/widget/sfWidgetFormInputFileEditable.class.php
+++ b/lib/vendor/symfony/lib/widget/sfWidgetFormInputFileEditable.class.php
@@ -15,7 +15,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormInputFileEditable.class.php 30762 2010-08-25 12:33:33Z fabien $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormInputFileEditable extends sfWidgetFormInputFile
 {
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormInputFileMulti.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormInputFileMulti.class.php
new file mode 100644
index 000000000..d6fddf76a
--- /dev/null
+++ b/lib/vendor/symfony/lib/widget/sfWidgetFormInputFileMulti.class.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * sfWidgetFormInputFileMulti represents an upload HTML input tag with multiple option.
+ *
+ * @package    symfony
+ * @subpackage widget
+ * @author     Vincent Chabot <vchabot@groupe-exp.com>
+ * @version    SVN: $Id$
+ */
+class sfWidgetFormInputFileMulti extends sfWidgetFormInputFile
+{
+  /**
+   * Configures the current widget.
+   *
+   * @param array $options     An array of options
+   * @param array $attributes  An array of default HTML attributes
+   *
+   * @see sfWidgetFormInput
+   */
+  protected function configure($options = array(), $attributes = array())
+  {
+    parent::configure($options, $attributes);
+
+    $this->addOption('multiple', true);
+  }
+
+  /**
+   * Renders the widget.
+   *
+   * @param  string $name        The element name
+   * @param  string $value       The value displayed in this widget
+   * @param  array  $attributes  An array of HTML attributes to be merged with the default HTML attributes
+   * @param  array  $errors      An array of errors for the field
+   *
+   * @return string An HTML tag string
+   *
+   * @see sfWidgetForm
+   */
+  public function render($name, $value = null, $attributes = array(), $errors = array())
+  {
+    if ($this->getOption('multiple'))
+    {
+      $name .= '[]';
+      $attributes['multiple'] = $this->getOption('multiple');
+    }
+
+    return parent::render($name, $value, $attributes, $errors);
+  }
+}
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormInputHidden.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormInputHidden.class.php
index 5038a582e..f1b434294 100644
--- a/lib/vendor/symfony/lib/widget/sfWidgetFormInputHidden.class.php
+++ b/lib/vendor/symfony/lib/widget/sfWidgetFormInputHidden.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormInputHidden.class.php 30762 2010-08-25 12:33:33Z fabien $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormInputHidden extends sfWidgetFormInput
 {
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormInputPassword.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormInputPassword.class.php
index a6e6cb5f0..6998850e0 100644
--- a/lib/vendor/symfony/lib/widget/sfWidgetFormInputPassword.class.php
+++ b/lib/vendor/symfony/lib/widget/sfWidgetFormInputPassword.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormInputPassword.class.php 30762 2010-08-25 12:33:33Z fabien $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormInputPassword extends sfWidgetFormInput
 {
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormInputRead.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormInputRead.class.php
new file mode 100644
index 000000000..8d64272e9
--- /dev/null
+++ b/lib/vendor/symfony/lib/widget/sfWidgetFormInputRead.class.php
@@ -0,0 +1,71 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * sfWidgetFormInputRead represents an HTML text hidden input tag with readonly text input tag containing text to read.
+ *
+ * @package    symfony
+ * @subpackage widget
+ * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
+ * @version    SVN: $Id$
+ */
+class sfWidgetFormInputRead extends sfWidgetFormInput
+{
+  /**
+   * Configures the current widget.
+   *
+   * @param array $options     An array of options
+   * @param array $attributes  An array of default HTML attributes
+   *
+   * @see sfWidgetForm
+   */
+  protected function configure($options = array(), $attributes = array())
+  {
+    parent::configure($options, $attributes);
+
+    $this->addOption('text');
+    $this->setOption('type', 'hidden');
+  }
+
+  /**
+   * Render the current widget
+   *
+   * @param  string $name        The element name
+   * @param  string $value       The this widget is checked if value is not null
+   * @param  array  $attributes  An array of HTML attributes to be merged with the default HTML attributes
+   * @param  array  $errors      An array of errors for the field
+   *
+   * @return string An HTML tag string
+   *
+   * @see sfWidgetForm
+   */
+  public function render($name, $value = null, $attributes = array(), $errors = array())
+  {
+    $attributes = array_merge($this->attributes, $attributes);
+    $this->attributes = array();
+
+    $tag = parent::render($name, $value, array(), $errors);
+
+    $style = 'border: 0;';
+    if (isset($attributes['style']))
+    {
+      $style .= ' '.$attributes['style'];
+      unset($attributes['style']);
+    }
+
+    return $tag.$this->renderTag('input', array_merge(array(
+        'type'      => 'text',
+        'value'     => $this->getOption('text', $value),
+        'readonly'  => 'readonly',
+        'style'     => $style,
+      ), $attributes));
+  }
+}
+
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormInputText.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormInputText.class.php
index dac3ffea7..19dd68e84 100644
--- a/lib/vendor/symfony/lib/widget/sfWidgetFormInputText.class.php
+++ b/lib/vendor/symfony/lib/widget/sfWidgetFormInputText.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormInputText.class.php 30762 2010-08-25 12:33:33Z fabien $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormInputText extends sfWidgetFormInput
 {
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormSchema.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormSchema.class.php
index 94f5d482f..c660b4855 100644
--- a/lib/vendor/symfony/lib/widget/sfWidgetFormSchema.class.php
+++ b/lib/vendor/symfony/lib/widget/sfWidgetFormSchema.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormSchema.class.php 26870 2010-01-19 10:34:52Z fabien $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormSchema extends sfWidgetForm implements ArrayAccess
 {
@@ -500,9 +500,11 @@ public function renderField($name, $value = null, $attributes = array(), $errors
       throw new InvalidArgumentException(sprintf('The field named "%s" does not exist.', $name));
     }
 
-    if ($widget instanceof sfWidgetFormSchema && $errors && !$errors instanceof sfValidatorErrorSchema)
+    if ($errors && $widget instanceof sfWidgetFormSchema && !$errors instanceof sfValidatorErrorSchema)
     {
-      $errors = new sfValidatorErrorSchema($errors->getValidator(), array($errors));
+      $schema = new sfValidatorErrorSchema($errors->getValidator());
+      $schema->addError($errors);
+      $errors = $schema;
     }
 
     // we clone the widget because we want to change the id format temporarily
@@ -533,7 +535,7 @@ public function render($name, $values = array(), $attributes = array(), $errors
 
     if (!is_array($values) && !$values instanceof ArrayAccess)
     {
-      throw new InvalidArgumentException('You must pass an array of values to render a widget schema');
+      throw new InvalidArgumentException('You must pass an array of values or an instanceof ArrayAccess to render a widget schema');
     }
 
     $formFormat = $this->getFormFormatter();
@@ -559,7 +561,7 @@ public function render($name, $values = array(), $attributes = array(), $errors
         $field = $this->renderField($name, $value, $widgetAttributes, $error);
 
         // don't add a label tag and errors if we embed a form schema
-        $label = $widget instanceof sfWidgetFormSchema ? $this->getFormFormatter()->generateLabelName($name) : $this->getFormFormatter()->generateLabel($name);
+        $label = $widget instanceof sfWidgetFormSchema ? $formFormat->generateLabelName($name) : $formFormat->generateLabel($name);
         $error = $widget instanceof sfWidgetFormSchema ? array() : $error;
 
         $rows[] = $formFormat->formatRow($label, $field, $error, $this->getHelp($name));
@@ -580,7 +582,7 @@ public function render($name, $values = array(), $attributes = array(), $errors
       $rows[0] = implode("\n", $hiddenRows);
     }
 
-    return $this->getFormFormatter()->formatErrorRow($this->getGlobalErrors($errors)).implode('', $rows);
+    return $formFormat->formatErrorRow($this->getGlobalErrors($errors)).implode('', $rows);
   }
 
   /**
@@ -820,7 +822,7 @@ public function moveField($field, $action, $pivot = null)
         array_unshift($this->positions, $field);
         break;
       case sfWidgetFormSchema::LAST:
-        array_push($this->positions, $field);
+        $this->positions []= $field;
         break;
       case sfWidgetFormSchema::BEFORE:
         if (null === $pivot)
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormSchemaDecorator.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormSchemaDecorator.class.php
index aedc28d89..96cd45586 100644
--- a/lib/vendor/symfony/lib/widget/sfWidgetFormSchemaDecorator.class.php
+++ b/lib/vendor/symfony/lib/widget/sfWidgetFormSchemaDecorator.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormSchemaDecorator.class.php 30762 2010-08-25 12:33:33Z fabien $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormSchemaDecorator extends sfWidgetFormSchema
 {
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormSchemaForEach.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormSchemaForEach.class.php
deleted file mode 100644
index 75858a7ff..000000000
--- a/lib/vendor/symfony/lib/widget/sfWidgetFormSchemaForEach.class.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * sfWidgetFormSchemaForEach duplicates a given widget multiple times in a widget schema.
- *
- * @package    symfony
- * @subpackage widget
- * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormSchemaForEach.class.php 9046 2008-05-19 08:13:51Z FabianLange $
- */
-class sfWidgetFormSchemaForEach extends sfWidgetFormSchema
-{
-  /**
-   * Constructor.
-   *
-   * @param sfWidgetFormSchema $widget      An sfWidgetFormSchema instance
-   * @param integer            $count       The number of times to duplicate the widget
-   * @param array              $options     An array of options
-   * @param array              $attributes  An array of default HTML attributes
-   * @param array              $labels      An array of HTML labels
-   *
-   * @see sfWidgetFormSchema
-   */
-  public function __construct(sfWidgetFormSchema $widget, $count, $options = array(), $attributes = array(), $labels = array())
-  {
-    parent::__construct(array_fill(0, $count, $widget), $options, $attributes, $labels);
-  }
-}
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormSchemaFormatter.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormSchemaFormatter.class.php
index 172965b3a..6a332080e 100644
--- a/lib/vendor/symfony/lib/widget/sfWidgetFormSchemaFormatter.class.php
+++ b/lib/vendor/symfony/lib/widget/sfWidgetFormSchemaFormatter.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormSchemaFormatter.class.php 21908 2009-09-11 12:06:21Z fabien $
+ * @version    SVN: $Id$
  */
 abstract class sfWidgetFormSchemaFormatter
 {
@@ -245,7 +245,7 @@ protected function unnestErrors($errors, $prefix = '')
           $err = $this->translate($error);
         }
 
-        if (!is_integer($name))
+        if (!is_int($name))
         {
           $newErrors[] = strtr($this->getNamedErrorRowFormatInARow(), array('%error%' => $err, '%name%' => ($prefix ? $prefix.' > ' : '').$name));
         }
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormSchemaFormatterList.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormSchemaFormatterList.class.php
index e4c229f40..069c9e58c 100644
--- a/lib/vendor/symfony/lib/widget/sfWidgetFormSchemaFormatterList.class.php
+++ b/lib/vendor/symfony/lib/widget/sfWidgetFormSchemaFormatterList.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormSchemaFormatterList.class.php 5995 2007-11-13 15:50:03Z fabien $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormSchemaFormatterList extends sfWidgetFormSchemaFormatter
 {
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormSchemaFormatterTable.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormSchemaFormatterTable.class.php
index ba7ab35c7..67dc04769 100644
--- a/lib/vendor/symfony/lib/widget/sfWidgetFormSchemaFormatterTable.class.php
+++ b/lib/vendor/symfony/lib/widget/sfWidgetFormSchemaFormatterTable.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormSchemaFormatterTable.class.php 5995 2007-11-13 15:50:03Z fabien $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormSchemaFormatterTable extends sfWidgetFormSchemaFormatter
 {
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormSelect.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormSelect.class.php
index 72155de80..34f4438b8 100644
--- a/lib/vendor/symfony/lib/widget/sfWidgetFormSelect.class.php
+++ b/lib/vendor/symfony/lib/widget/sfWidgetFormSelect.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormSelect.class.php 30762 2010-08-25 12:33:33Z fabien $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormSelect extends sfWidgetFormChoiceBase
 {
@@ -85,8 +85,11 @@ protected function getOptionsForSelect($value, $choices)
       $value = array($value);
     }
 
-    $value = array_map('strval', array_values($value));
-    $value_set = array_flip($value);
+    $value_set = array();
+    foreach ($value as $v)
+    {
+      $value_set[(string) $v] = true;
+    }
 
     $options = array();
     foreach ($choices as $key => $option)
@@ -98,7 +101,7 @@ protected function getOptionsForSelect($value, $choices)
       else
       {
         $attributes = array('value' => self::escapeOnce($key));
-        if (isset($value_set[strval($key)]))
+        if (isset($value_set[(string) $key]))
         {
           $attributes['selected'] = 'selected';
         }
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormSelectCheckbox.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormSelectCheckbox.class.php
index 98b22096b..336058335 100644
--- a/lib/vendor/symfony/lib/widget/sfWidgetFormSelectCheckbox.class.php
+++ b/lib/vendor/symfony/lib/widget/sfWidgetFormSelectCheckbox.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormSelectCheckbox.class.php 30762 2010-08-25 12:33:33Z fabien $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormSelectCheckbox extends sfWidgetFormChoiceBase
 {
@@ -102,7 +102,7 @@ protected function formatChoices($name, $value, $choices, $attributes)
         'id'    => $id = $this->generateId($name, self::escapeOnce($key)),
       );
 
-      if ((is_array($value) && in_array(strval($key), $value)) || strval($key) == strval($value))
+      if ((is_array($value) && in_array((string) $key, $value)) || (is_string($value) && (string) $key == (string) $value))
       {
         $baseAttributes['checked'] = 'checked';
       }
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormSelectMany.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormSelectMany.class.php
index 87885dfbf..9a3413797 100644
--- a/lib/vendor/symfony/lib/widget/sfWidgetFormSelectMany.class.php
+++ b/lib/vendor/symfony/lib/widget/sfWidgetFormSelectMany.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormSelectMany.class.php 30762 2010-08-25 12:33:33Z fabien $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormSelectMany extends sfWidgetFormSelect
 {
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormSelectRadio.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormSelectRadio.class.php
index 12468f8cb..aae552db3 100644
--- a/lib/vendor/symfony/lib/widget/sfWidgetFormSelectRadio.class.php
+++ b/lib/vendor/symfony/lib/widget/sfWidgetFormSelectRadio.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormSelectRadio.class.php 30762 2010-08-25 12:33:33Z fabien $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormSelectRadio extends sfWidgetFormChoiceBase
 {
@@ -97,7 +97,7 @@ protected function formatChoices($name, $value, $choices, $attributes)
         'id'    => $id = $this->generateId($name, self::escapeOnce($key)),
       );
 
-      if (strval($key) == strval($value === false ? 0 : $value))
+      if ((string) $key == (string) ($value === false ? 0 : $value))
       {
         $baseAttributes['checked'] = 'checked';
       }
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormTextarea.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormTextarea.class.php
index 6f0d3cd9e..89c150a3a 100644
--- a/lib/vendor/symfony/lib/widget/sfWidgetFormTextarea.class.php
+++ b/lib/vendor/symfony/lib/widget/sfWidgetFormTextarea.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormTextarea.class.php 30762 2010-08-25 12:33:33Z fabien $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormTextarea extends sfWidgetForm
 {
diff --git a/lib/vendor/symfony/lib/widget/sfWidgetFormTime.class.php b/lib/vendor/symfony/lib/widget/sfWidgetFormTime.class.php
index 38fbd0b59..d68f375df 100644
--- a/lib/vendor/symfony/lib/widget/sfWidgetFormTime.class.php
+++ b/lib/vendor/symfony/lib/widget/sfWidgetFormTime.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage widget
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfWidgetFormTime.class.php 30762 2010-08-25 12:33:33Z fabien $
+ * @version    SVN: $Id$
  */
 class sfWidgetFormTime extends sfWidgetForm
 {
diff --git a/lib/vendor/symfony/lib/yaml/sfYaml.php b/lib/vendor/symfony/lib/yaml/sfYaml.class.php
similarity index 69%
rename from lib/vendor/symfony/lib/yaml/sfYaml.php
rename to lib/vendor/symfony/lib/yaml/sfYaml.class.php
index 1d89ccc97..80085856c 100644
--- a/lib/vendor/symfony/lib/yaml/sfYaml.php
+++ b/lib/vendor/symfony/lib/yaml/sfYaml.class.php
@@ -2,7 +2,7 @@
 
 /*
  * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -64,7 +64,7 @@ static public function getSpecVersion()
    *
    * @throws InvalidArgumentException If the YAML is not valid
    */
-  public static function load($input)
+  public static function load($input, $encoding = 'UTF-8')
   {
     $file = '';
 
@@ -87,7 +87,13 @@ public static function load($input)
       return $input;
     }
 
-    require_once dirname(__FILE__).'/sfYamlParser.php';
+    $mbConvertEncoding = false;
+    $encoding = strtoupper($encoding);
+    if ('UTF-8' != $encoding && function_exists('mb_convert_encoding'))
+    {
+      $input = mb_convert_encoding($input, 'UTF-8', $encoding);
+      $mbConvertEncoding = true;
+    }
 
     $yaml = new sfYamlParser();
 
@@ -100,6 +106,11 @@ public static function load($input)
       throw new InvalidArgumentException(sprintf('Unable to parse %s: %s', $file ? sprintf('file "%s"', $file) : 'string', $e->getMessage()));
     }
 
+    if ($ret && $mbConvertEncoding)
+    {
+      $ret = self::arrayConvertEncoding($ret, $encoding);
+    }
+
     return $ret;
   }
 
@@ -116,20 +127,41 @@ public static function load($input)
    */
   public static function dump($array, $inline = 2)
   {
-    require_once dirname(__FILE__).'/sfYamlDumper.php';
-
     $yaml = new sfYamlDumper();
 
     return $yaml->dump($array, $inline);
   }
-}
 
-/**
- * Wraps echo to automatically provide a newline.
- *
- * @param string $string The string to echo with new line
- */
-function echoln($string)
-{
-  echo $string."\n";
+  /**
+   * Converts all kayes and values from UTF-8 to given encoding
+   *
+   * @param  array  $result   Original result
+   * @param  string $encoding The expected encoding
+   * @return array
+   */
+  protected static function arrayConvertEncoding(array $result, $encoding)
+  {
+    $convertedResult = array();
+    foreach ($result as $key => $value)
+    {
+      if (is_string($key))
+      {
+        $key = mb_convert_encoding($key, $encoding, 'UTF-8');
+      }
+      if (is_array($value))
+      {
+        $convertedResult[$key] = self::arrayConvertEncoding($value, $encoding);
+      }
+      else if (is_string($value))
+      {
+        $convertedResult[$key] = mb_convert_encoding($value, $encoding, 'UTF-8');
+      }
+      else
+      {
+        $convertedResult[$key] = $value;
+      }
+    }
+
+    return $convertedResult;
+  }
 }
diff --git a/lib/vendor/symfony/lib/yaml/sfYamlDumper.php b/lib/vendor/symfony/lib/yaml/sfYamlDumper.class.php
similarity index 96%
rename from lib/vendor/symfony/lib/yaml/sfYamlDumper.php
rename to lib/vendor/symfony/lib/yaml/sfYamlDumper.class.php
index 0ada2b37d..130f2366d 100644
--- a/lib/vendor/symfony/lib/yaml/sfYamlDumper.php
+++ b/lib/vendor/symfony/lib/yaml/sfYamlDumper.class.php
@@ -8,8 +8,6 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfYamlInline.php');
-
 /**
  * sfYamlDumper dumps PHP variables to YAML strings.
  *
diff --git a/lib/vendor/symfony/lib/yaml/sfYamlInline.php b/lib/vendor/symfony/lib/yaml/sfYamlInline.class.php
similarity index 92%
rename from lib/vendor/symfony/lib/yaml/sfYamlInline.php
rename to lib/vendor/symfony/lib/yaml/sfYamlInline.class.php
index a88cbb3d9..ad9342099 100644
--- a/lib/vendor/symfony/lib/yaml/sfYamlInline.php
+++ b/lib/vendor/symfony/lib/yaml/sfYamlInline.class.php
@@ -8,8 +8,6 @@
  * file that was distributed with this source code.
  */
 
-require_once dirname(__FILE__).'/sfYaml.php';
-
 /**
  * sfYamlInline implements a YAML parser/dumper for the YAML inline syntax.
  *
@@ -33,7 +31,7 @@ static public function load($value)
   {
     $value = trim($value);
 
-    if (0 == strlen($value))
+    if ('' === $value)
     {
       return '';
     }
@@ -87,7 +85,8 @@ static public function dump($value)
     switch (true)
     {
       case is_resource($value):
-        throw new InvalidArgumentException('Unable to dump PHP resources in a YAML file.');
+        return stream_get_contents($value);
+        // throw new InvalidArgumentException('Unable to dump PHP resources in a YAML file.');
       case is_object($value):
         return '!!php/object:'.serialize($value);
       case is_array($value):
@@ -101,7 +100,7 @@ static public function dump($value)
       case ctype_digit($value):
         return is_string($value) ? "'$value'" : (int) $value;
       case is_numeric($value):
-        return is_infinite($value) ? str_ireplace('INF', '.Inf', strval($value)) : (is_string($value) ? "'$value'" : $value);
+        return is_infinite($value) ? str_ireplace('INF', '.Inf', (string) $value) : (is_string($value) ? "'$value'" : $value);
       case false !== strpos($value, "\n") || false !== strpos($value, "\r"):
         return sprintf('"%s"', str_replace(array('"', "\n", "\r"), array('\\"', '\n', '\r'), $value));
       case preg_match('/[ \s \' " \: \{ \} \[ \] , & \* \# \?] | \A[ - ? | < > = ! % @ ` ]/x', $value):
@@ -135,7 +134,7 @@ static protected function dumpArray($value)
     if (
       (1 == count($keys) && '0' == $keys[0])
       ||
-      (count($keys) > 1 && array_reduce($keys, create_function('$v,$w', 'return (integer) $v + $w;'), 0) == count($keys) * (count($keys) - 1) / 2))
+      (count($keys) > 1 && array_sum(array_map('intval', $keys)) == count($keys) * (count($keys) - 1) / 2))
     {
       $output = array();
       foreach ($value as $val)
@@ -249,7 +248,7 @@ static protected function parseSequence($sequence, &$i = 0)
   {
     $output = array();
     $len = strlen($sequence);
-    $i += 1;
+    ++$i;
 
     // [foo, bar, ...]
     while ($i < $len)
@@ -309,7 +308,7 @@ static protected function parseMapping($mapping, &$i = 0)
   {
     $output = array();
     $len = strlen($mapping);
-    $i += 1;
+    ++$i;
 
     // {foo: bar, bar:foo, ...}
     while ($i < $len)
@@ -395,26 +394,32 @@ static protected function evaluateScalar($scalar)
       case 0 === strpos($scalar, '!str'):
         return (string) substr($scalar, 5);
       case 0 === strpos($scalar, '! '):
-        return intval(self::parseScalar(substr($scalar, 2)));
+        return (int) self::parseScalar(substr($scalar, 2));
       case 0 === strpos($scalar, '!!php/object:'):
         return unserialize(substr($scalar, 13));
       case ctype_digit($scalar):
         $raw = $scalar;
-        $cast = intval($scalar);
+        $cast = (int) $scalar;
         return '0' == $scalar[0] ? octdec($scalar) : (((string) $raw == (string) $cast) ? $cast : $raw);
       case in_array(strtolower($scalar), $trueValues):
         return true;
       case in_array(strtolower($scalar), $falseValues):
         return false;
+      case 0 === strpos($scalar, '0x'):
+        return hexdec($scalar);
       case is_numeric($scalar):
-        return '0x' == $scalar[0].$scalar[1] ? hexdec($scalar) : floatval($scalar);
+        return floatval($scalar);
       case 0 == strcasecmp($scalar, '.inf'):
       case 0 == strcasecmp($scalar, '.NaN'):
         return -log(0);
       case 0 == strcasecmp($scalar, '-.inf'):
         return log(0);
-      case preg_match('/^(-|\+)?[0-9,]+(\.[0-9]+)?$/', $scalar):
-        return floatval(str_replace(',', '', $scalar));
+      case preg_match('/^(-|\+)?[0-9,]+(\.\d+)?$/', $scalar):
+        $replaced = str_replace(',', '', $scalar);
+        $replaced = str_replace('+', '', $replaced);
+        $floatval = floatval($replaced);
+        $intval = intval($replaced);
+        return $floatval == $intval ? $intval : $floatval;
       case preg_match(self::getTimestampRegex(), $scalar):
         return strtotime($scalar);
       default:
diff --git a/lib/vendor/symfony/lib/yaml/sfYamlParser.php b/lib/vendor/symfony/lib/yaml/sfYamlParser.class.php
similarity index 90%
rename from lib/vendor/symfony/lib/yaml/sfYamlParser.php
rename to lib/vendor/symfony/lib/yaml/sfYamlParser.class.php
index 03bd0b8ae..69b9f2651 100644
--- a/lib/vendor/symfony/lib/yaml/sfYamlParser.php
+++ b/lib/vendor/symfony/lib/yaml/sfYamlParser.class.php
@@ -8,8 +8,6 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/sfYamlInline.php');
-
 if (!defined('PREG_BAD_UTF8_OFFSET_ERROR'))
 {
   define('PREG_BAD_UTF8_OFFSET_ERROR', 5);
@@ -57,6 +55,11 @@ public function parse($value)
     $this->currentLine = '';
     $this->lines = explode("\n", $this->cleanup($value));
 
+    if (function_exists('mb_detect_encoding') && false === mb_detect_encoding($value, 'UTF-8', true))
+    {
+      throw new InvalidArgumentException('The YAML value does not appear to be valid UTF-8.');
+    }
+
     if (function_exists('mb_internal_encoding') && ((int) ini_get('mbstring.func_overload')) & 2)
     {
       $mbEncoding = mb_internal_encoding();
@@ -78,7 +81,7 @@ public function parse($value)
       }
 
       $isRef = $isInPlace = $isProcessed = false;
-      if (preg_match('#^\-(\s+(?P<value>.+?))?\s*$#u', $this->currentLine, $values))
+      if (preg_match('#^\-((?P<leadspaces>\s+)(?P<value>.+?))?\s*$#u', $this->currentLine, $values))
       {
         if (isset($values['value']) && preg_match('#^&(?P<ref>[^ ]+) *(?P<value>.*)#u', $values['value'], $matches))
         {
@@ -96,9 +99,22 @@ public function parse($value)
         }
         else
         {
-          if (preg_match('/^([^ ]+)\: +({.*?)$/u', $values['value'], $matches))
+          if (isset($values['leadspaces'])
+            && ' ' == $values['leadspaces']
+            && preg_match('#^(?P<key>'.sfYamlInline::REGEX_QUOTED_STRING.'|[^ \'"\{].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $values['value'], $matches))
           {
-            $data[] = array($matches[1] => sfYamlInline::load($matches[2]));
+            // this is a compact notation element, add to next block and parse
+            $c = $this->getRealCurrentLineNb();
+            $parser = new sfYamlParser($c);
+            $parser->refs =& $this->refs;
+
+            $block = $values['value'];
+            if (!$this->isNextLineIndented())
+            {
+              $block .= "\n".$this->getNextEmbedBlock($this->getCurrentLineIndentation() + 2);
+            }
+
+            $data[] = $parser->parse($block);
           }
           else
           {
@@ -106,7 +122,7 @@ public function parse($value)
           }
         }
       }
-      else if (preg_match('#^(?P<key>'.sfYamlInline::REGEX_QUOTED_STRING.'|[^ \{\[].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $this->currentLine, $values))
+      else if (preg_match('#^(?P<key>'.sfYamlInline::REGEX_QUOTED_STRING.'|[^ \'"].*?) *\:(\s+(?P<value>.+?))?\s*$#u', $this->currentLine, $values))
       {
         $key = sfYamlInline::parseScalar($values['key']);
 
@@ -289,17 +305,26 @@ protected function getCurrentLineIndentation()
   /**
    * Returns the next embed block of YAML.
    *
+   * @param integer $indentation The indent level at which the block is to be read, or null for default
+   *
    * @return string A YAML string
    */
-  protected function getNextEmbedBlock()
+  protected function getNextEmbedBlock($indentation = null)
   {
     $this->moveToNextLine();
 
-    $newIndent = $this->getCurrentLineIndentation();
+    if (null === $indentation)
+    {
+      $newIndent = $this->getCurrentLineIndentation();
 
-    if (!$this->isCurrentLineEmpty() && 0 == $newIndent)
+      if (!$this->isCurrentLineEmpty() && 0 == $newIndent)
+      {
+        throw new InvalidArgumentException(sprintf('Indentation problem at line %d (%s)', $this->getRealCurrentLineNb() + 1, $this->currentLine));
+      }
+    }
+    else
     {
-      throw new InvalidArgumentException(sprintf('Indentation problem at line %d (%s)', $this->getRealCurrentLineNb() + 1, $this->currentLine));
+      $newIndent = $indentation;
     }
 
     $data = array(substr($this->currentLine, $newIndent));
@@ -396,7 +421,7 @@ protected function parseValue($value)
     {
       $modifiers = isset($matches['modifiers']) ? $matches['modifiers'] : '';
 
-      return $this->parseFoldedScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), intval(abs($modifiers)));
+      return $this->parseFoldedScalar($matches['separator'], preg_replace('#\d+#', '', $modifiers), (int) abs($modifiers));
     }
     else
     {
diff --git a/lib/vendor/symfony/package.xml.tmpl b/lib/vendor/symfony/package.xml.tmpl
index 5cf94f3dc..5c1144fc1 100644
--- a/lib/vendor/symfony/package.xml.tmpl
+++ b/lib/vendor/symfony/package.xml.tmpl
@@ -40,10 +40,10 @@
 
    <file role="script" baseinstalldir="/" name="data/bin/symfony.bat" />
 
-   <file role="doc" baseinstalldir="symfony" name="CHANGELOG" />
-   <file role="doc" baseinstalldir="symfony" name="COPYRIGHT" />
-   <file role="doc" baseinstalldir="symfony" name="LICENSE" />
-   <file role="doc" baseinstalldir="symfony" name="README" />
+   <file role="doc" baseinstalldir="symfony" name="CHANGELOG.md" />
+   <file role="doc" baseinstalldir="symfony" name="COPYRIGHT.md" />
+   <file role="doc" baseinstalldir="symfony" name="LICENSE.md" />
+   <file role="doc" baseinstalldir="symfony" name="README.md" />
    <file role="doc" baseinstalldir="symfony" name="licenses/LICENSE.ICU" />
    <file role="doc" baseinstalldir="symfony" name="licenses/LICENSE.lime" />
    <file role="doc" baseinstalldir="symfony" name="licenses/LICENSE.prado" />
diff --git a/lib/vendor/symfony/test/bin/coverage.php b/lib/vendor/symfony/test/bin/coverage.php
index 75a23398a..e4f7cc40b 100644
--- a/lib/vendor/symfony/test/bin/coverage.php
+++ b/lib/vendor/symfony/test/bin/coverage.php
@@ -3,33 +3,43 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../lib/vendor/lime/lime.php');
-require_once(dirname(__FILE__).'/../../lib/util/sfFinder.class.php');
+$name = '*';
+$verbose = false;
+
+if (isset($argv[1]))
+{
+  $name = $argv[1];
+  $verbose = true;
+}
+
+require_once(__DIR__.'/../../lib/vendor/lime/lime.php');
+require_once(__DIR__.'/../../lib/util/sfFinder.class.php');
 
 $h = new lime_harness();
-$h->base_dir = realpath(dirname(__FILE__).'/..');
+$h->base_dir = realpath(__DIR__.'/..');
 
 // unit tests
-$h->register_glob($h->base_dir.'/unit/*/*Test.php');
-$h->register_glob($h->base_dir.'/unit/*/*/*Test.php');
-$h->register_glob($h->base_dir.'/../lib/plugins/*/unit/*Test.php');
-$h->register_glob($h->base_dir.'/../lib/plugins/*/unit/*/*Test.php');
+$h->register_glob(sprintf('%s/unit/*/%sTest.php', $h->base_dir, $name));
+$h->register_glob(sprintf('%s/unit/*/*/%sTest.php', $h->base_dir, $name));
+$h->register_glob(sprintf('%s/../lib/plugins/*/unit/%sTest.php', $h->base_dir, $name));
+$h->register_glob(sprintf('%s/../lib/plugins/*/unit/*/%sTest.php', $h->base_dir, $name));
 
 // functional tests
-$h->register_glob($h->base_dir.'/functional/*Test.php');
-$h->register_glob($h->base_dir.'/functional/*/*Test.php');
-$h->register_glob($h->base_dir.'/../lib/plugins/*/functional/*Test.php');
+$h->register_glob(sprintf('%s/functional/%sTest.php', $h->base_dir, $name));
+$h->register_glob(sprintf('%s/functional/*/%sTest.php', $h->base_dir, $name));
+$h->register_glob(sprintf('%s/../lib/plugins/*/functional/%sTest.php', $h->base_dir, $name));
 
 $c = new lime_coverage($h);
 $c->extension = '.class.php';
-$c->verbose = false;
-$c->base_dir = realpath(dirname(__FILE__).'/../../lib');
+$c->verbose = $verbose;
+$c->base_dir = realpath(__DIR__.'/../../lib');
+
+$finder = sfFinder::type('file')->name($name.'.class.php')->prune('vendor')->prune('test')->prune('data');
 
-$finder = sfFinder::type('file')->name('*.php')->prune('vendor')->prune('test')->prune('data');
 $c->register($finder->in($c->base_dir));
 $c->run();
diff --git a/lib/vendor/symfony/test/bin/loc.php b/lib/vendor/symfony/test/bin/loc.php
old mode 100644
new mode 100755
index 9b6965b61..a5462174f
--- a/lib/vendor/symfony/test/bin/loc.php
+++ b/lib/vendor/symfony/test/bin/loc.php
@@ -1,6 +1,6 @@
 <?php
 
-$root_dir = realpath(dirname(__FILE__).'/../..');
+$root_dir = realpath(__DIR__.'/../..');
 require_once($root_dir.'/lib/vendor/lime/lime.php');
 require_once($root_dir.'/lib/util/sfFinder.class.php');
 
@@ -26,8 +26,6 @@
 // symfony tests LOC
 $total_tests_loc = 0;
 $files = sfFinder::type('file')->name('*Test.php')->in(array(
-  $root_dir.'/lib/plugins/sfPropelPlugin/test/unit',
-  $root_dir.'/lib/plugins/sfPropelPlugin/test/functional',
   $root_dir.'/lib/plugins/sfDoctrinePlugin/test/unit',
   $root_dir.'/lib/plugins/sfDoctrinePlugin/test/functional',
   $root_dir.'/test/unit',
diff --git a/lib/vendor/symfony/test/bootstrap/functional.php b/lib/vendor/symfony/test/bootstrap/functional.php
index bcb9ac6bb..875adbeb8 100644
--- a/lib/vendor/symfony/test/bootstrap/functional.php
+++ b/lib/vendor/symfony/test/bootstrap/functional.php
@@ -16,7 +16,7 @@
 
 if (!isset($root_dir))
 {
-  $root_dir = realpath(dirname(__FILE__).sprintf('/../%s/fixtures', isset($type) ? $type : 'functional'));
+  $root_dir = realpath(__DIR__.sprintf('/../%s/fixtures', isset($type) ? $type : 'functional'));
 }
 
 require_once $root_dir.'/config/ProjectConfiguration.class.php';
diff --git a/lib/vendor/symfony/test/bootstrap/task.php b/lib/vendor/symfony/test/bootstrap/task.php
index 5cedc61bb..a2cd12931 100644
--- a/lib/vendor/symfony/test/bootstrap/task.php
+++ b/lib/vendor/symfony/test/bootstrap/task.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/unit.php');
+require_once(__DIR__.'/unit.php');
 
 require_once(sfConfig::get('sf_symfony_lib_dir').'/command/sfCommandApplication.class.php');
 require_once(sfConfig::get('sf_symfony_lib_dir').'/command/sfSymfonyCommandApplication.class.php');
diff --git a/lib/vendor/symfony/test/bootstrap/unit.php b/lib/vendor/symfony/test/bootstrap/unit.php
index 85de7d23b..b46c8f5e4 100644
--- a/lib/vendor/symfony/test/bootstrap/unit.php
+++ b/lib/vendor/symfony/test/bootstrap/unit.php
@@ -14,15 +14,15 @@
 ini_set('arg_separator.output', '&amp;');
 ini_set('allow_url_fopen', 'on');
 
-$_test_dir = realpath(dirname(__FILE__).'/..');
+$_test_dir = realpath(__DIR__.'/..');
 require_once($_test_dir.'/../lib/vendor/lime/lime.php');
 require_once($_test_dir.'/../lib/config/sfConfig.class.php');
 sfConfig::set('sf_symfony_lib_dir', realpath($_test_dir.'/../lib'));
 
-require_once(dirname(__FILE__).'/../../lib/autoload/sfCoreAutoload.class.php');
+require_once(__DIR__.'/../../lib/autoload/sfCoreAutoload.class.php');
 sfCoreAutoload::register();
 
-require_once(dirname(__FILE__).'/../../lib/util/sfToolkit.class.php');
+require_once(__DIR__.'/../../lib/util/sfToolkit.class.php');
 sfConfig::set('sf_test_cache_dir', sys_get_temp_dir().'/sf_test_project');
 
 // remove all test cache
@@ -65,4 +65,4 @@ function sf_unit_test_shutdown()
 function fix_linebreaks($content)
 {
   return str_replace(array("\r\n", "\n", "\r"), "\n", $content);
-}
\ No newline at end of file
+}
diff --git a/lib/vendor/symfony/test/functional/authTest.php b/lib/vendor/symfony/test/functional/authTest.php
index 759d8a499..022208060 100644
--- a/lib/vendor/symfony/test/functional/authTest.php
+++ b/lib/vendor/symfony/test/functional/authTest.php
@@ -9,7 +9,7 @@
  */
 
 $app = 'frontend';
-if (!include(dirname(__FILE__).'/../bootstrap/functional.php'))
+if (!include(__DIR__.'/../bootstrap/functional.php'))
 {
   return;
 }
diff --git a/lib/vendor/symfony/test/functional/autoloadTest.php b/lib/vendor/symfony/test/functional/autoloadTest.php
old mode 100644
new mode 100755
index f63bfe6d5..0888a30b0
--- a/lib/vendor/symfony/test/functional/autoloadTest.php
+++ b/lib/vendor/symfony/test/functional/autoloadTest.php
@@ -3,13 +3,13 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 $app = 'frontend';
-if (!include(dirname(__FILE__).'/../bootstrap/functional.php'))
+if (!include(__DIR__.'/../bootstrap/functional.php'))
 {
   return;
 }
@@ -30,9 +30,6 @@
 
 $t = $b->test();
 
-$autoload = sfAutoload::getInstance();
-$t->ok(@file_get_contents($autoload->getClassPath('sfpropel'), FILE_USE_INCLUDE_PATH), '"sfAutoload" is case insensitive');
-
 $t->ok(class_exists('BaseExtendMe'), 'plugin lib directory added to autoload');
 $r = new ReflectionClass('ExtendMe');
 $t->like(str_replace(DIRECTORY_SEPARATOR, '/', $r->getFilename()), '~fixtures/lib/ExtendMe~', 'plugin class can be replaced by project');
diff --git a/lib/vendor/symfony/test/functional/cacheTest.php b/lib/vendor/symfony/test/functional/cacheTest.php
index da87d8cb3..83ca3b91b 100644
--- a/lib/vendor/symfony/test/functional/cacheTest.php
+++ b/lib/vendor/symfony/test/functional/cacheTest.php
@@ -9,7 +9,7 @@
  */
 
 $app = 'cache';
-if (!include(dirname(__FILE__).'/../bootstrap/functional.php'))
+if (!include(__DIR__.'/../bootstrap/functional.php'))
 {
   return;
 }
@@ -322,7 +322,7 @@ public function launch()
 $b = new myTestBrowser();
 
 // non HTML cache
-$image = file_get_contents(dirname(__FILE__).'/fixtures/apps/cache/modules/cache/data/ok48.png');
+$image = file_get_contents(__DIR__.'/fixtures/apps/cache/modules/cache/data/ok48.png');
 sfConfig::set('sf_web_debug', true);
 $b->
   get('/cache/imageWithLayoutCacheWithLayout')->
diff --git a/lib/vendor/symfony/test/functional/escapingTest.php b/lib/vendor/symfony/test/functional/escapingTest.php
index 3e47fce0d..4803f137c 100644
--- a/lib/vendor/symfony/test/functional/escapingTest.php
+++ b/lib/vendor/symfony/test/functional/escapingTest.php
@@ -9,7 +9,7 @@
  */
 
 $app = 'frontend';
-if (!include(dirname(__FILE__).'/../bootstrap/functional.php'))
+if (!include(__DIR__.'/../bootstrap/functional.php'))
 {
   return;
 }
diff --git a/lib/vendor/symfony/test/functional/filterTest.php b/lib/vendor/symfony/test/functional/filterTest.php
index c1d0724d4..b34f9372a 100644
--- a/lib/vendor/symfony/test/functional/filterTest.php
+++ b/lib/vendor/symfony/test/functional/filterTest.php
@@ -9,7 +9,7 @@
  */
 
 $app = 'frontend';
-if (!include(dirname(__FILE__).'/../bootstrap/functional.php'))
+if (!include(__DIR__.'/../bootstrap/functional.php'))
 {
   return;
 }
diff --git a/lib/vendor/symfony/test/functional/fixtures/apps/cache/modules/cache/actions/actions.class.php b/lib/vendor/symfony/test/functional/fixtures/apps/cache/modules/cache/actions/actions.class.php
index fabf9552b..0aa42dbe7 100644
--- a/lib/vendor/symfony/test/functional/fixtures/apps/cache/modules/cache/actions/actions.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/apps/cache/modules/cache/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    project
  * @subpackage cache
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 31928 2011-01-29 16:02:51Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class cacheActions extends sfActions
 {
@@ -92,7 +92,7 @@ public function executeImageNoLayoutCacheNoLayout()
   protected function prepareImage()
   {
     $this->getResponse()->setContentType('image/png');
-    $this->image = file_get_contents(dirname(__FILE__).'/../data/ok48.png');
+    $this->image = file_get_contents(__DIR__.'/../data/ok48.png');
     $this->setTemplate('image');
   }
 
diff --git a/lib/vendor/symfony/test/functional/fixtures/apps/cache/modules/cache/actions/components.class.php b/lib/vendor/symfony/test/functional/fixtures/apps/cache/modules/cache/actions/components.class.php
index 915065e4d..c552dad45 100644
--- a/lib/vendor/symfony/test/functional/fixtures/apps/cache/modules/cache/actions/components.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/apps/cache/modules/cache/actions/components.class.php
@@ -6,7 +6,7 @@
  * @package    project
  * @subpackage cache
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: components.class.php 2319 2006-10-05 09:03:13Z fabien $
+ * @version    SVN: $Id$
  */
 class cacheComponents extends sfComponents
 {
diff --git a/lib/vendor/symfony/test/functional/fixtures/apps/cache/modules/nocache/actions/actions.class.php b/lib/vendor/symfony/test/functional/fixtures/apps/cache/modules/nocache/actions/actions.class.php
index 438c2cdc7..4ef42234f 100644
--- a/lib/vendor/symfony/test/functional/fixtures/apps/cache/modules/nocache/actions/actions.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/apps/cache/modules/nocache/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    project
  * @subpackage nocache
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 2288 2006-10-02 15:22:13Z fabien $
+ * @version    SVN: $Id$
  */
 class nocacheActions extends sfActions
 {
diff --git a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/config/services.yml b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/config/services.yml
new file mode 100644
index 000000000..abf6f0e92
--- /dev/null
+++ b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/config/services.yml
@@ -0,0 +1,12 @@
+all:
+  parameters:
+    my_app_param: foo
+
+  services:
+    my_app_service:
+      class: sfOutputEscaperSafe
+      arguments: [%my_project_param%]
+
+test:
+  parameters:
+    my_app_test_param: foo
diff --git a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/config/view.yml b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/config/view.yml
index 64f550313..d690255fe 100644
--- a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/config/view.yml
+++ b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/config/view.yml
@@ -14,6 +14,9 @@ default:
     -
       ie6:
         condition: lte IE 6
+    -
+      multiple_media:
+        media: 'print,handheld'
 
   javascripts:    [ ]
 
diff --git a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/lib/myAutoload.class.php b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/lib/myAutoload.class.php
index f95b71a4d..e26c9944d 100644
--- a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/lib/myAutoload.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/lib/myAutoload.class.php
@@ -6,7 +6,7 @@ static public function autoload($class)
   {
     if ('myAutoloadedClass' == $class)
     {
-      require_once(dirname(__FILE__).'/myAutoloadedClass.class.php');
+      require_once(__DIR__.'/myAutoloadedClass.class.php');
 
       return true;
     }
diff --git a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/assetInclusion/actions/actions.class.php b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/assetInclusion/actions/actions.class.php
index b53b29a90..698c51d9d 100644
--- a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/assetInclusion/actions/actions.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/assetInclusion/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    project
  * @subpackage assetInclusion
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 2288 2006-10-02 15:22:13Z fabien $
+ * @version    SVN: $Id$
  */
 class assetInclusionActions extends sfActions
 {
diff --git a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/auth/actions/actions.class.php b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/auth/actions/actions.class.php
index b7a560d84..3843adedf 100644
--- a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/auth/actions/actions.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/auth/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    project
  * @subpackage view
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 3237 2007-01-12 08:34:46Z fabien $
+ * @version    SVN: $Id$
  */
 class authActions extends sfActions
 {
diff --git a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/autoload/actions/actions.class.php b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/autoload/actions/actions.class.php
index 2845b3733..b65e901ab 100644
--- a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/autoload/actions/actions.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/autoload/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    project
  * @subpackage autoload
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 2802 2006-11-24 11:10:03Z fabien $
+ * @version    SVN: $Id$
  */
 class autoloadActions extends sfActions
 {
diff --git a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/browser/actions/actions.class.php b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/browser/actions/actions.class.php
index 48ae02d0f..1ca9763a3 100644
--- a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/browser/actions/actions.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/browser/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    project
  * @subpackage browser
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 24992 2009-12-06 20:48:52Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class browserActions extends sfActions
 {
diff --git a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/configFiltersSimpleFilter/actions/actions.class.php b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/configFiltersSimpleFilter/actions/actions.class.php
index 02b0de238..005d74837 100644
--- a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/configFiltersSimpleFilter/actions/actions.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/configFiltersSimpleFilter/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    project
  * @subpackage configFiltersSimpleFilter
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 2288 2006-10-02 15:22:13Z fabien $
+ * @version    SVN: $Id$
  */
 class configFiltersSimpleFilterActions extends sfActions
 {
diff --git a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/configModuleDisabled/actions/actions.class.php b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/configModuleDisabled/actions/actions.class.php
index d59c2213c..020894314 100644
--- a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/configModuleDisabled/actions/actions.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/configModuleDisabled/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    project
  * @subpackage configModuleDisabled
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 2288 2006-10-02 15:22:13Z fabien $
+ * @version    SVN: $Id$
  */
 class configModuleDisabledActions extends sfActions
 {
diff --git a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/configSecurityIsSecure/actions/actions.class.php b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/configSecurityIsSecure/actions/actions.class.php
index e43e27b60..48d14ef9c 100644
--- a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/configSecurityIsSecure/actions/actions.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/configSecurityIsSecure/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    project
  * @subpackage configSecurityIsSecure
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 2288 2006-10-02 15:22:13Z fabien $
+ * @version    SVN: $Id$
  */
 class configSecurityIsSecureActions extends sfActions
 {
diff --git a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/configSecurityIsSecureAction/actions/actions.class.php b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/configSecurityIsSecureAction/actions/actions.class.php
index ade6f0563..9e0489bc6 100644
--- a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/configSecurityIsSecureAction/actions/actions.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/configSecurityIsSecureAction/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    project
  * @subpackage configSecurityIsSecure
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 3625 2007-03-17 11:04:36Z fabien $
+ * @version    SVN: $Id$
  */
 class configSecurityIsSecureActionActions extends sfActions
 {
diff --git a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/configSettingsMaxForwards/actions/actions.class.php b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/configSettingsMaxForwards/actions/actions.class.php
index d7fd96985..a4b50e581 100644
--- a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/configSettingsMaxForwards/actions/actions.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/configSettingsMaxForwards/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    project
  * @subpackage configSettingsMaxForwards
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 2288 2006-10-02 15:22:13Z fabien $
+ * @version    SVN: $Id$
  */
 class configSettingsMaxForwardsActions extends sfActions
 {
diff --git a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/configViewHasLayout/actions/actions.class.php b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/configViewHasLayout/actions/actions.class.php
index 9ee855f0c..343eb97cf 100644
--- a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/configViewHasLayout/actions/actions.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/configViewHasLayout/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    project
  * @subpackage configViewHasLayout
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 2288 2006-10-02 15:22:13Z fabien $
+ * @version    SVN: $Id$
  */
 class configViewHasLayoutActions extends sfActions
 {
diff --git a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/cookie/actions/actions.class.php b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/cookie/actions/actions.class.php
index 8bb49ac2c..9de75fa9e 100644
--- a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/cookie/actions/actions.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/cookie/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    project
  * @subpackage cookie
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 10831 2008-08-13 07:26:25Z fabien $
+ * @version    SVN: $Id$
  */
 class cookieActions extends sfActions
 {
diff --git a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/escaping/actions/actions.class.php b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/escaping/actions/actions.class.php
index 0a16565ec..f491689f2 100644
--- a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/escaping/actions/actions.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/escaping/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    project
  * @subpackage escaping
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 27755 2010-02-08 20:51:02Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class escapingActions extends sfActions
 {
diff --git a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/exception/actions/actions.class.php b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/exception/actions/actions.class.php
index 0573c589c..8d8048922 100644
--- a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/exception/actions/actions.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/exception/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    project
  * @subpackage exception
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 2980 2006-12-08 20:02:11Z fabien $
+ * @version    SVN: $Id$
  */
 class exceptionActions extends sfActions
 {
diff --git a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/filter/actions/actions.class.php b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/filter/actions/actions.class.php
index ab69c5791..21b1b8275 100644
--- a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/filter/actions/actions.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/filter/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    project
  * @subpackage filter
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 2569 2006-10-30 16:36:31Z fabien $
+ * @version    SVN: $Id$
  */
 class filterActions extends sfActions
 {
diff --git a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/format/actions/actions.class.php b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/format/actions/actions.class.php
index 4c7d4bb72..86a61e43e 100644
--- a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/format/actions/actions.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/format/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    project
  * @subpackage format
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 11805 2008-09-26 18:08:49Z fabien $
+ * @version    SVN: $Id$
  */
 class formatActions extends sfActions
 {
diff --git a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/notfound/actions/actions.class.php b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/notfound/actions/actions.class.php
index c429def6e..d39ee1022 100644
--- a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/notfound/actions/actions.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/notfound/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    project
  * @subpackage notfound
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 4560 2007-07-08 15:36:39Z fabien $
+ * @version    SVN: $Id$
  */
 class notfoundActions extends sfActions
 {
diff --git a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/presentation/actions/actions.class.php b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/presentation/actions/actions.class.php
index 440981174..f84af61ae 100644
--- a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/presentation/actions/actions.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/presentation/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    project
  * @subpackage view
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 4937 2007-08-30 08:40:10Z fabien $
+ * @version    SVN: $Id$
  */
 class presentationActions extends sfActions
 {
diff --git a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/renderText/actions/actions.class.php b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/renderText/actions/actions.class.php
index 814315fc4..46a693a77 100644
--- a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/renderText/actions/actions.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/renderText/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    project
  * @subpackage renderText
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 2895 2006-12-04 12:40:19Z fabien $
+ * @version    SVN: $Id$
  */
 class renderTextActions extends sfActions
 {
diff --git a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/view/actions/actions.class.php b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/view/actions/actions.class.php
index 545817e86..c8d16b7e2 100644
--- a/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/view/actions/actions.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/apps/frontend/modules/view/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    project
  * @subpackage view
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 8497 2008-04-17 06:06:14Z fabien $
+ * @version    SVN: $Id$
  */
 class viewActions extends sfActions
 {
diff --git a/lib/vendor/symfony/test/functional/fixtures/apps/i18n/modules/i18n/actions/actions.class.php b/lib/vendor/symfony/test/functional/fixtures/apps/i18n/modules/i18n/actions/actions.class.php
index 940943dce..5c34b094f 100644
--- a/lib/vendor/symfony/test/functional/fixtures/apps/i18n/modules/i18n/actions/actions.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/apps/i18n/modules/i18n/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    project
  * @subpackage i18n
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 8645 2008-04-27 15:37:17Z fabien $
+ * @version    SVN: $Id$
  */
 class i18nActions extends sfActions
 {
diff --git a/lib/vendor/symfony/test/functional/fixtures/config/ProjectConfiguration.class.php b/lib/vendor/symfony/test/functional/fixtures/config/ProjectConfiguration.class.php
index b61849e52..e9ef1b327 100644
--- a/lib/vendor/symfony/test/functional/fixtures/config/ProjectConfiguration.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/config/ProjectConfiguration.class.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once dirname(__FILE__).'/../../../../lib/autoload/sfCoreAutoload.class.php';
+require_once __DIR__.'/../../../../lib/autoload/sfCoreAutoload.class.php';
 sfCoreAutoload::register();
 
 class ProjectConfiguration extends sfProjectConfiguration
diff --git a/lib/vendor/symfony/test/functional/fixtures/config/databases.yml b/lib/vendor/symfony/test/functional/fixtures/config/databases.yml
index fad67ec81..f2f2f82d6 100644
--- a/lib/vendor/symfony/test/functional/fixtures/config/databases.yml
+++ b/lib/vendor/symfony/test/functional/fixtures/config/databases.yml
@@ -1,6 +1 @@
 #all:
-#  propel:
-#    class:          sfPropelDatabase
-#    param:
-#      phptype:      sqlite
-#      database:     %SF_DATA_DIR%/database.sqlite
diff --git a/lib/vendor/symfony/test/functional/fixtures/config/propel.ini b/lib/vendor/symfony/test/functional/fixtures/config/propel.ini
deleted file mode 100644
index fa07a2080..000000000
--- a/lib/vendor/symfony/test/functional/fixtures/config/propel.ini
+++ /dev/null
@@ -1,48 +0,0 @@
-propel.targetPackage       = lib.model
-propel.project             = project
-propel.database            = sqlite
-propel.database.createUrl  = sqlite://./../../../../data/database.sqlite
-propel.database.url        = sqlite://./../../../../data/database.sqlite
-
-propel.addGenericAccessors = true
-propel.addGenericMutators  = true
-propel.addTimeStamp        = false
-
-propel.schema.validate     = false
-
-; directories
-propel.home                    = .
-propel.output.dir              = /Users/fabien/work/symfony/svn/tests/functionnal/fixtures/project
-propel.schema.dir              = ${propel.output.dir}/config
-propel.conf.dir                = ${propel.output.dir}/config
-propel.phpconf.dir             = ${propel.output.dir}/config
-propel.sql.dir                 = ${propel.output.dir}/data/sql
-propel.runtime.conf.file       = runtime-conf.xml
-propel.php.dir                 = ${propel.output.dir}
-propel.default.schema.basename = schema
-propel.datadump.mapper.from    = *schema.xml
-propel.datadump.mapper.to      = *data.xml
-
-; builder settings
-propel.builder.peer.class              = plugins.sfPropelPlugin.lib.builder.SfPeerBuilder
-propel.builder.object.class            = plugins.sfPropelPlugin.lib.builder.SfObjectBuilder
-
-propel.builder.objectstub.class        = plugins.sfPropelPlugin.lib.builder.SfExtensionObjectBuilder
-propel.builder.peerstub.class          = plugins.sfPropelPlugin.lib.builder.SfExtensionPeerBuilder
-propel.builder.objectmultiextend.class = plugins.sfPropelPlugin.lib.builder.SfMultiExtendObjectBuilder
-propel.builder.mapbuilder.class        = plugins.sfPropelPlugin.lib.builder.SfMapBuilderBuilder
-propel.builder.interface.class         = propel.engine.builder.om.php5.PHP5InterfaceBuilder
-propel.builder.node.class              = propel.engine.builder.om.php5.PHP5NodeBuilder
-propel.builder.nodepeer.class          = propel.engine.builder.om.php5.PHP5NodePeerBuilder
-propel.builder.nodestub.class          = propel.engine.builder.om.php5.PHP5ExtensionNodeBuilder
-propel.builder.nodepeerstub.class      = propel.engine.builder.om.php5.PHP5ExtensionNodePeerBuilder
-
-propel.builder.addIncludes = false
-propel.builder.addComments = false
-propel.packageObjectModel = true
-
-propel.defaultTimeStampFormat = Y-m-d H:i:s
-propel.defaultTimeFormat = H:i:s
-propel.defaultDateFormat = Y-m-d
-propel.builder.nestedset.class         = plugins.sfPropelPlugin.lib.builder.SfNestedSetBuilder
-propel.builder.nestedsetpeer.class     = plugins.sfPropelPlugin.lib.builder.SfNestedSetPeerBuilder
\ No newline at end of file
diff --git a/lib/vendor/symfony/test/functional/fixtures/config/services.yml b/lib/vendor/symfony/test/functional/fixtures/config/services.yml
new file mode 100644
index 000000000..7fec391b9
--- /dev/null
+++ b/lib/vendor/symfony/test/functional/fixtures/config/services.yml
@@ -0,0 +1,9 @@
+all:
+  parameters:
+    my_project_param: foo
+    other_param: quz
+
+  services:
+    my_project_service:
+      class: sfOutputEscaperSafe
+      arguments: [%my_project_param%, %sf_cache_dir%]
diff --git a/lib/vendor/symfony/test/functional/fixtures/lib/form/BaseForm.class.php b/lib/vendor/symfony/test/functional/fixtures/lib/form/BaseForm.class.php
index 9aa6b04f0..395d5a061 100644
--- a/lib/vendor/symfony/test/functional/fixtures/lib/form/BaseForm.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/lib/form/BaseForm.class.php
@@ -6,7 +6,7 @@
  * @package    ##PROJECT_NAME##
  * @subpackage form
  * @author     Your name here
- * @version    SVN: $Id: BaseForm.class.php 18331 2009-05-16 11:13:47Z Kris.Wallsmith $
+ * @version    SVN: $Id$
  */
 class BaseForm extends sfFormSymfony
 {
diff --git a/lib/vendor/symfony/test/functional/fixtures/plugins/sfAutoloadPlugin/config/autoload.yml b/lib/vendor/symfony/test/functional/fixtures/plugins/sfAutoloadPlugin/config/autoload.yml
index 0877d9f45..ca8a83b3f 100644
--- a/lib/vendor/symfony/test/functional/fixtures/plugins/sfAutoloadPlugin/config/autoload.yml
+++ b/lib/vendor/symfony/test/functional/fixtures/plugins/sfAutoloadPlugin/config/autoload.yml
@@ -1,11 +1,11 @@
 autoload:
   sfAutoloadPlugin_lib:
     name:       sfAutoloadPlugin lib
-    path:       <?php echo dirname(__FILE__)."/../lib\n" ?>
+    path:       <?php echo __DIR__."/../lib\n" ?>
     exclude:    [vendor]
     recursive:  true
 
   not_in_lib_class:
     name:       NotInLib class
     files:
-      NotInLib: <?php echo dirname(__FILE__)."/NotInLib.class.php\n" ?>
+      NotInLib: <?php echo __DIR__."/NotInLib.class.php\n" ?>
diff --git a/lib/vendor/symfony/test/functional/fixtures/plugins/sfConfigPlugin/config/services.yml b/lib/vendor/symfony/test/functional/fixtures/plugins/sfConfigPlugin/config/services.yml
new file mode 100644
index 000000000..9442c1f3d
--- /dev/null
+++ b/lib/vendor/symfony/test/functional/fixtures/plugins/sfConfigPlugin/config/services.yml
@@ -0,0 +1,9 @@
+all:
+  parameters:
+    my_plugin_param: foo
+    other_param: bar
+
+  services:
+    my_plugin_service:
+      class: sfOutputEscaperSafe
+      arguments: [%my_plugin_param%]
diff --git a/lib/vendor/symfony/test/functional/fixtures/plugins/sfI18NPlugin/modules/sfI18NPlugin/actions/actions.class.php b/lib/vendor/symfony/test/functional/fixtures/plugins/sfI18NPlugin/modules/sfI18NPlugin/actions/actions.class.php
index 13121cc7d..03c16d8fb 100644
--- a/lib/vendor/symfony/test/functional/fixtures/plugins/sfI18NPlugin/modules/sfI18NPlugin/actions/actions.class.php
+++ b/lib/vendor/symfony/test/functional/fixtures/plugins/sfI18NPlugin/modules/sfI18NPlugin/actions/actions.class.php
@@ -6,7 +6,7 @@
  * @package    project
  * @subpackage i18n
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: actions.class.php 4350 2007-06-25 07:37:00Z fabien $
+ * @version    SVN: $Id$
  */
 class sfI18NPluginActions extends sfActions
 {
diff --git a/lib/vendor/symfony/test/functional/fixtures/symfony b/lib/vendor/symfony/test/functional/fixtures/symfony
index 3ea1419a8..720a9e1ad 100755
--- a/lib/vendor/symfony/test/functional/fixtures/symfony
+++ b/lib/vendor/symfony/test/functional/fixtures/symfony
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-chdir(dirname(__FILE__));
-require_once(dirname(__FILE__).'/config/ProjectConfiguration.class.php');
+chdir(__DIR__);
+require_once(__DIR__.'/config/ProjectConfiguration.class.php');
 $configuration = new ProjectConfiguration();
 include($configuration->getSymfonyLibDir().'/command/cli.php');
diff --git a/lib/vendor/symfony/test/functional/formatTest.php b/lib/vendor/symfony/test/functional/formatTest.php
index 1cfcdc5ba..b401171d6 100644
--- a/lib/vendor/symfony/test/functional/formatTest.php
+++ b/lib/vendor/symfony/test/functional/formatTest.php
@@ -9,7 +9,7 @@
  */
 
 $app = 'frontend';
-if (!include(dirname(__FILE__).'/../bootstrap/functional.php'))
+if (!include(__DIR__.'/../bootstrap/functional.php'))
 {
   return;
 }
diff --git a/lib/vendor/symfony/test/functional/genericTest.php b/lib/vendor/symfony/test/functional/genericTest.php
index 43ef9945b..3e6544f89 100644
--- a/lib/vendor/symfony/test/functional/genericTest.php
+++ b/lib/vendor/symfony/test/functional/genericTest.php
@@ -3,13 +3,13 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 $app = 'frontend';
-if (!include(dirname(__FILE__).'/../bootstrap/functional.php'))
+if (!include(__DIR__.'/../bootstrap/functional.php'))
 {
   return;
 }
@@ -23,6 +23,7 @@
     checkElement('body', '/congratulations/i')->
     checkElement('link[href="/sf/sf_default/css/screen.css"]')->
     checkElement('link[href="/css/main.css"]')->
+    checkElement('link[href="/css/multiple_media.css"][media="print,handheld"]')->
     matches('#'.preg_quote('<!--[if lte IE 6]><link rel="stylesheet" type="text/css" media="screen" href="/css/ie6.css" /><![endif]-->').'#')->
   end()
 ;
diff --git a/lib/vendor/symfony/test/functional/httpcacheTest.php b/lib/vendor/symfony/test/functional/httpcacheTest.php
index d21731d10..c38cb9bfa 100644
--- a/lib/vendor/symfony/test/functional/httpcacheTest.php
+++ b/lib/vendor/symfony/test/functional/httpcacheTest.php
@@ -9,7 +9,7 @@
  */
 
 $app = 'cache';
-if (!include(dirname(__FILE__).'/../bootstrap/functional.php'))
+if (!include(__DIR__.'/../bootstrap/functional.php'))
 {
   return;
 }
diff --git a/lib/vendor/symfony/test/functional/i18nFormTest.php b/lib/vendor/symfony/test/functional/i18nFormTest.php
index 13c5a15c4..645e91508 100644
--- a/lib/vendor/symfony/test/functional/i18nFormTest.php
+++ b/lib/vendor/symfony/test/functional/i18nFormTest.php
@@ -9,7 +9,7 @@
  */
 
 $app = 'i18n';
-if (!include(dirname(__FILE__).'/../bootstrap/functional.php'))
+if (!include(__DIR__.'/../bootstrap/functional.php'))
 {
   return;
 }
diff --git a/lib/vendor/symfony/test/functional/i18nTest.php b/lib/vendor/symfony/test/functional/i18nTest.php
index fc8ac9e68..6cf49b819 100644
--- a/lib/vendor/symfony/test/functional/i18nTest.php
+++ b/lib/vendor/symfony/test/functional/i18nTest.php
@@ -9,7 +9,7 @@
  */
 
 $app = 'i18n';
-if (!include(dirname(__FILE__).'/../bootstrap/functional.php'))
+if (!include(__DIR__.'/../bootstrap/functional.php'))
 {
   return;
 }
diff --git a/lib/vendor/symfony/test/functional/prodTest.php b/lib/vendor/symfony/test/functional/prodTest.php
index 799c8b828..127e88a74 100644
--- a/lib/vendor/symfony/test/functional/prodTest.php
+++ b/lib/vendor/symfony/test/functional/prodTest.php
@@ -10,7 +10,7 @@
 
 $app = 'frontend';
 $debug = false;
-if (!include(dirname(__FILE__).'/../bootstrap/functional.php'))
+if (!include(__DIR__.'/../bootstrap/functional.php'))
 {
   return;
 }
diff --git a/lib/vendor/symfony/test/functional/sfTestBrowserTest.php b/lib/vendor/symfony/test/functional/sfTestBrowserTest.php
index 67a5cce20..f93f5727a 100644
--- a/lib/vendor/symfony/test/functional/sfTestBrowserTest.php
+++ b/lib/vendor/symfony/test/functional/sfTestBrowserTest.php
@@ -9,7 +9,7 @@
  */
 
 $app = 'frontend';
-if (!include(dirname(__FILE__).'/../bootstrap/functional.php'))
+if (!include(__DIR__.'/../bootstrap/functional.php'))
 {
   return;
 }
diff --git a/lib/vendor/symfony/test/other/fixtures/propel/Category.php b/lib/vendor/symfony/test/other/fixtures/propel/Category.php
deleted file mode 100644
index 298ad84a0..000000000
--- a/lib/vendor/symfony/test/other/fixtures/propel/Category.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-class Category extends BaseCategory
-{
-  public function __toString()
-  {
-    return $this->name;
-  }
-}
\ No newline at end of file
diff --git a/lib/vendor/symfony/test/other/fixtures/propel/databases.yml b/lib/vendor/symfony/test/other/fixtures/propel/databases.yml
deleted file mode 100644
index 15deab784..000000000
--- a/lib/vendor/symfony/test/other/fixtures/propel/databases.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-all:
-  propel:
-    class:      sfPropelDatabase
-    param:
-      dsn:      sqlite:%SF_DATA_DIR%/database.sqlite
diff --git a/lib/vendor/symfony/test/other/fixtures/propel/propel.ini b/lib/vendor/symfony/test/other/fixtures/propel/propel.ini
deleted file mode 100644
index 947e6e08c..000000000
--- a/lib/vendor/symfony/test/other/fixtures/propel/propel.ini
+++ /dev/null
@@ -1,40 +0,0 @@
-propel.targetPackage       = lib.model
-propel.project             = project
-propel.database            = sqlite
-propel.database.createUrl  = sqlite:%SF_DATA_DIR%/database.sqlite
-propel.database.url        = sqlite:%SF_DATA_DIR%/database.sqlite
-
-propel.addGenericAccessors = true
-propel.addGenericMutators  = true
-propel.addTimeStamp        = false
-
-propel.schema.validate     = false
-
-; directories
-propel.home                    = .
-propel.output.dir              = %SF_ROOT_DIR%
-propel.schema.dir              = ${propel.output.dir}/config
-propel.conf.dir                = ${propel.output.dir}/config
-propel.phpconf.dir             = ${propel.output.dir}/config
-propel.sql.dir                 = ${propel.output.dir}/data/sql
-propel.runtime.conf.file       = runtime-conf.xml
-propel.php.dir                 = ${propel.output.dir}
-propel.default.schema.basename = schema
-propel.datadump.mapper.from    = *schema.xml
-propel.datadump.mapper.to      = *data.xml
-
-; builder settings
-propel.behavior.default                        = symfony,symfony_i18n
-propel.behavior.symfony.class                  = plugins.sfPropelPlugin.lib.behavior.SfPropelBehaviorSymfony
-propel.behavior.symfony_i18n.class             = plugins.sfPropelPlugin.lib.behavior.SfPropelBehaviorI18n
-propel.behavior.symfony_i18n_translation.class = plugins.sfPropelPlugin.lib.behavior.SfPropelBehaviorI18nTranslation
-propel.behavior.symfony_behaviors.class        = plugins.sfPropelPlugin.lib.behavior.SfPropelBehaviorSymfonyBehaviors
-propel.behavior.symfony_timestampable.class    = plugins.sfPropelPlugin.lib.behavior.SfPropelBehaviorTimestampable
-
-propel.builder.addIncludes = true
-propel.builder.addComments = true
-propel.packageObjectModel = true
-
-propel.defaultTimeStampFormat = Y-m-d H:i:s
-propel.defaultTimeFormat = H:i:s
-propel.defaultDateFormat = Y-m-d
diff --git a/lib/vendor/symfony/test/other/fixtures/propel/schema.yml b/lib/vendor/symfony/test/other/fixtures/propel/schema.yml
deleted file mode 100644
index 11d3212fd..000000000
--- a/lib/vendor/symfony/test/other/fixtures/propel/schema.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-propel:
-  article:
-    id:
-    title: varchar(255)
-    body:  longvarchar
-    category_id:
-    created_at:
-
-  category:
-    id:
-    name: varchar(255)
diff --git a/lib/vendor/symfony/test/other/fixtures/task/aTask.class.php b/lib/vendor/symfony/test/other/fixtures/task/aTask.class.php
deleted file mode 100644
index c7a3ffb3e..000000000
--- a/lib/vendor/symfony/test/other/fixtures/task/aTask.class.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-class aTask extends sfPropelBaseTask 
-{
-  public function configure()
-  {
-    $this->namespace = 'a';
-    $this->name = 'run';
-  }
-  public function execute($arguments = array(), $options = array())
-  {
-  }
-}
\ No newline at end of file
diff --git a/lib/vendor/symfony/test/other/fixtures/task/zTask.class.php b/lib/vendor/symfony/test/other/fixtures/task/zTask.class.php
deleted file mode 100644
index 9b01309ec..000000000
--- a/lib/vendor/symfony/test/other/fixtures/task/zTask.class.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-class zTask extends sfPropelBaseTask 
-{
-  public function configure()
-  {
-    $this->namespace = 'z';
-    $this->name = 'run';
-  }
-  public function execute($arguments = array(), $options = array())
-  {
-  }
-}
\ No newline at end of file
diff --git a/lib/vendor/symfony/test/other/fixtures/test/unit/testTest.php b/lib/vendor/symfony/test/other/fixtures/test/unit/testTest.php
index e93bae0a7..c1c6a48e1 100644
--- a/lib/vendor/symfony/test/other/fixtures/test/unit/testTest.php
+++ b/lib/vendor/symfony/test/other/fixtures/test/unit/testTest.php
@@ -1,6 +1,6 @@
 <?php
 
-include(dirname(__FILE__).'/../bootstrap/unit.php');
+include(__DIR__.'/../bootstrap/unit.php');
 
 $t = new lime_test(1);
 
diff --git a/lib/vendor/symfony/test/other/tasksTest.php b/lib/vendor/symfony/test/other/tasksTest.php
index 2209bd7bc..945b4fa18 100644
--- a/lib/vendor/symfony/test/other/tasksTest.php
+++ b/lib/vendor/symfony/test/other/tasksTest.php
@@ -1,6 +1,6 @@
 <?php
 
-$_test_dir = realpath(dirname(__FILE__).'/..');
+$_test_dir = realpath(__DIR__.'/..');
 require_once($_test_dir.'/../lib/vendor/lime/lime.php');
 require_once($_test_dir.'/../lib/util/sfToolkit.class.php');
 
@@ -42,14 +42,14 @@ public function shutdown()
 
   protected function clearTmpDir()
   {
-    require_once(dirname(__FILE__).'/../../lib/util/sfToolkit.class.php');
+    require_once(__DIR__.'/../../lib/util/sfToolkit.class.php');
     sfToolkit::clearDirectory($this->tmp_dir);
   }
 
   public function execute_command($cmd, $awaited_return=0)
   {
     chdir($this->tmp_dir);
-    $symfony = file_exists('symfony') ? 'symfony' : dirname(__FILE__).'/../../data/bin/symfony';
+    $symfony = file_exists('symfony') ? 'symfony' : __DIR__.'/../../data/bin/symfony';
 
     ob_start();
     passthru(sprintf('%s "%s" %s 2>&1', $this->php_cli, $symfony, $cmd), $return);
@@ -61,11 +61,11 @@ public function execute_command($cmd, $awaited_return=0)
 
   public function get_fixture_content($file)
   {
-    return str_replace("\r\n", "\n", file_get_contents(dirname(__FILE__).'/fixtures/'.$file));
+    return str_replace("\r\n", "\n", file_get_contents(__DIR__.'/fixtures/'.$file));
   }
 }
 
-$plan = 39;
+$plan = 18;
 $t = new lime_test($plan);
 
 if (!extension_loaded('SQLite') && !extension_loaded('pdo_SQLite'))
@@ -79,7 +79,7 @@ public function get_fixture_content($file)
 $c->initialize($t);
 
 // generate:*
-$content = $c->execute_command('generate:project myproject --orm=Propel');
+$content = $c->execute_command('generate:project myproject --orm=Doctrine');
 $t->ok(file_exists($c->tmp_dir.DS.'symfony'), '"generate:project" installs the symfony CLI in root project directory');
 
 $content = $c->execute_command('generate:app frontend');
@@ -97,74 +97,36 @@ public function get_fixture_content($file)
 $content = $c->execute_command('generate:module frontend foo');
 $t->ok(is_dir($c->tmp_dir.DS.'apps'.DS.'frontend'.DS.'modules'.DS.'foo'), '"generate:module" creates a "foo" directory under "modules" directory');
 
-copy(dirname(__FILE__).'/fixtures/propel/schema.yml', $c->tmp_dir.DS.'config'.DS.'schema.yml');
-copy(dirname(__FILE__).'/fixtures/propel/databases.yml', $c->tmp_dir.DS.'config'.DS.'databases.yml');
-copy(dirname(__FILE__).'/fixtures/propel/propel.ini', $c->tmp_dir.DS.'config'.DS.'propel.ini');
-copy(dirname(__FILE__).'/fixtures/factories.yml', $c->tmp_dir.DS.'apps'.DS.'frontend'.DS.'config'.DS.'factories.yml');
-
-// update propel configuration paths
-file_put_contents($c->tmp_dir.DS.'config'.DS.'propel.ini', str_replace('%SF_ROOT_DIR%', $c->tmp_dir, str_replace('%SF_DATA_DIR%', $c->tmp_dir.'/data', file_get_contents($c->tmp_dir.DS.'config'.DS.'propel.ini'))));
-
-// propel:*
-$content = $c->execute_command('propel:build-sql');
-$t->ok(file_exists($c->tmp_dir.DS.'data'.DS.'sql'.DS.'lib.model.schema.sql'), '"propel:build-sql" creates a "schema.sql" file under "data/sql" directory');
-
-$content = $c->execute_command('propel:build-model');
-$t->ok(file_exists($c->tmp_dir.DS.'lib'.DS.'model'.DS.'Article.php'), '"propel:build-model" creates model classes under "lib/model" directory');
-
-copy(dirname(__FILE__).'/fixtures/propel/Category.php', $c->tmp_dir.DS.'lib'.DS.'model'.DS.'Category.php');
-
-$content = $c->execute_command('propel:build-form');
-$t->ok(file_exists($c->tmp_dir.DS.'lib'.DS.'form'.DS.DS.'BaseFormPropel.class.php'), '"propel:build-form" creates form classes under "lib/form" directory');
-
-$c->execute_command('propel:insert-sql --no-confirmation');
-$t->ok(file_exists($c->tmp_dir.DS.'data'.DS.'database.sqlite'), '"propel:insert-sql" creates tables in the database');
-
-$c->execute_command('propel:build-all --no-confirmation');
-
-$content = $c->execute_command('propel:generate-module --generate-in-cache frontend articleInitCrud Article');
-$t->ok(file_exists($c->tmp_dir.DS.'apps'.DS.'frontend'.DS.'modules'.DS.'articleInitCrud'.DS.'config'.DS.'generator.yml'), '"propel:generate-module" initializes a CRUD module');
-
-$content = $c->execute_command('propel:generate-admin frontend Article --module=articleInitAdmin');
-$t->ok(file_exists($c->tmp_dir.DS.'apps'.DS.'frontend'.DS.'modules'.DS.'articleInitAdmin'.DS.'config'.DS.'generator.yml'), '"propel:generate-admin" initializes an admin generator module');
+copy(__DIR__.'/fixtures/factories.yml', $c->tmp_dir.DS.'apps'.DS.'frontend'.DS.'config'.DS.'factories.yml');
 
 // test:*
-$content = $c->execute_command('test:functional frontend articleInitCrudActions');
-$t->is($content, $c->get_fixture_content('test/functional/result.txt'), '"test:functional" can launch a particular functional test');
-
-$content = $c->execute_command('test:functional frontend', 1);
-$t->is($content, $c->get_fixture_content('test/functional/result-harness.txt'), '"test:functional" can launch all functional tests');
-
-copy(dirname(__FILE__).'/fixtures/test/unit/testTest.php', $c->tmp_dir.DS.'test'.DS.'unit'.DS.'testTest.php');
+copy(__DIR__.'/fixtures/test/unit/testTest.php', $c->tmp_dir.DS.'test'.DS.'unit'.DS.'testTest.php');
 
 $content = $c->execute_command('test:unit test');
 $t->is($content, $c->get_fixture_content('/test/unit/result.txt'), '"test:unit" can launch a particular unit test');
 
 $content = $c->execute_command('test:unit');
-$t->is($content, $c->get_fixture_content('test/unit/result-harness.txt'), '"test:unit" can launch all unit tests');
 
-$content = $c->execute_command('test:all', 1);
-$t->is($content, $c->get_fixture_content('test/result-harness.txt'), '"test:all" launches all unit and functional tests');
+// this test is failing on 7.1 because tempnam() raise a notice because it uses sys_get_temp_dir()
+// so strict comparison doesn't work because the result contains the notice
+// $t->like($content, $c->get_fixture_content('test/unit/result-harness.txt'), '"test:unit" can launch all unit tests');
+$t->ok(false !== stripos($content, $c->get_fixture_content('test/unit/result-harness.txt')), '"test:unit" can launch all unit tests');
 
 $content = $c->execute_command('cache:clear');
 
 // Test task autoloading
 mkdir($c->tmp_dir.DS.'lib'.DS.'task');
-copy(dirname(__FILE__).'/fixtures/task/aTask.class.php', $c->tmp_dir.DS.'lib'.DS.'task'.DS.'aTask.class.php');
-copy(dirname(__FILE__).'/fixtures/task/zTask.class.php', $c->tmp_dir.DS.'lib'.DS.'task'.DS.'zTask.class.php');
 mkdir($pluginDir = $c->tmp_dir.DS.'plugins'.DS.'myFooPlugin'.DS.'lib'.DS.'task', 0777, true);
-copy(dirname(__FILE__).'/fixtures/task/myPluginTask.class.php', $pluginDir.DS.'myPluginTask.class.php');
+copy(__DIR__.'/fixtures/task/myPluginTask.class.php', $pluginDir.DS.'myPluginTask.class.php');
 file_put_contents(
-  $projectConfigurationFile = $c->tmp_dir.DS.'config'.DS.'ProjectConfiguration.class.php', 
+  $projectConfigurationFile = $c->tmp_dir.DS.'config'.DS.'ProjectConfiguration.class.php',
   str_replace(
-    '$this->enablePlugins(\'sfPropelPlugin\')', 
-    '$this->enablePlugins(array(\'myFooPlugin\', \'sfPropelPlugin\'))', 
+    '$this->enablePlugins(\'sfDoctrinePlugin\')',
+    '$this->enablePlugins(array(\'sfDoctrinePlugin\', \'myFooPlugin\'))',
     file_get_contents($projectConfigurationFile)
   )
 );
 
-$c->execute_command('a:run');
-$c->execute_command('z:run');
 $c->execute_command('p:run');
 
 $c->shutdown();
diff --git a/lib/vendor/symfony/test/unit/action/sfComponentTest.php b/lib/vendor/symfony/test/unit/action/sfComponentTest.php
index 96340d8f5..edbf9b0d7 100644
--- a/lib/vendor/symfony/test/unit/action/sfComponentTest.php
+++ b/lib/vendor/symfony/test/unit/action/sfComponentTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 require_once($_test_dir.'/unit/sfContextMock.class.php');
 require_once($_test_dir.'/unit/sfNoRouting.class.php');
 
diff --git a/lib/vendor/symfony/test/unit/addon/sfPagerTest.php b/lib/vendor/symfony/test/unit/addon/sfPagerTest.php
index c1a8cfa3f..b588238fc 100644
--- a/lib/vendor/symfony/test/unit/addon/sfPagerTest.php
+++ b/lib/vendor/symfony/test/unit/addon/sfPagerTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(2);
 class myPager extends sfPager
@@ -40,4 +40,4 @@ function getResults()
 {
   $countRuns++;
 }
-$t->is($countRuns, $pager->count(), '->rewind will allow reiterating');
\ No newline at end of file
+$t->is($countRuns, $pager->count(), '->rewind will allow reiterating');
diff --git a/lib/vendor/symfony/test/unit/autoload/sfCoreAutoloadTest.php b/lib/vendor/symfony/test/unit/autoload/sfCoreAutoloadTest.php
index 3bba79609..299b7f099 100644
--- a/lib/vendor/symfony/test/unit/autoload/sfCoreAutoloadTest.php
+++ b/lib/vendor/symfony/test/unit/autoload/sfCoreAutoloadTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once dirname(__FILE__).'/../../bootstrap/unit.php';
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(1);
 
diff --git a/lib/vendor/symfony/test/unit/autoload/sfSimpleAutoloadTest.php b/lib/vendor/symfony/test/unit/autoload/sfSimpleAutoloadTest.php
index 3560b2996..0ce066686 100644
--- a/lib/vendor/symfony/test/unit/autoload/sfSimpleAutoloadTest.php
+++ b/lib/vendor/symfony/test/unit/autoload/sfSimpleAutoloadTest.php
@@ -8,12 +8,12 @@
  * file that was distributed with this source code.
  */
 
-require_once dirname(__FILE__).'/../../bootstrap/unit.php';
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(1);
 
 $autoload = sfSimpleAutoload::getInstance();
-$autoload->addFile(dirname(__FILE__).'/../sfEventDispatcherTest.class.php');
+$autoload->addFile(__DIR__.'/../sfEventDispatcherTest.class.php');
 $autoload->register();
 
 $t->is(class_exists('myeventdispatchertest'), true, '"sfSimpleAutoload" is case insensitive');
diff --git a/lib/vendor/symfony/test/unit/cache/sfAPCCacheTest.php b/lib/vendor/symfony/test/unit/cache/sfAPCCacheTest.php
index d9c7e9a4c..343a68fac 100644
--- a/lib/vendor/symfony/test/unit/cache/sfAPCCacheTest.php
+++ b/lib/vendor/symfony/test/unit/cache/sfAPCCacheTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $plan = 64;
 $t = new lime_test($plan);
@@ -29,7 +29,7 @@
   return;
 }
 
-require_once(dirname(__FILE__).'/sfCacheDriverTests.class.php');
+require_once(__DIR__.'/sfCacheDriverTests.class.php');
 
 // setup
 sfConfig::set('sf_logging_enabled', false);
diff --git a/lib/vendor/symfony/test/unit/cache/sfCacheTest.php b/lib/vendor/symfony/test/unit/cache/sfCacheTest.php
index 27bd88898..8be6dd5e1 100644
--- a/lib/vendor/symfony/test/unit/cache/sfCacheTest.php
+++ b/lib/vendor/symfony/test/unit/cache/sfCacheTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 class myCache extends sfCache
 {
diff --git a/lib/vendor/symfony/test/unit/cache/sfEAcceleratorCacheTest.php b/lib/vendor/symfony/test/unit/cache/sfEAcceleratorCacheTest.php
index 87a8afd91..7b4f57de5 100644
--- a/lib/vendor/symfony/test/unit/cache/sfEAcceleratorCacheTest.php
+++ b/lib/vendor/symfony/test/unit/cache/sfEAcceleratorCacheTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $plan = 64;
 $t = new lime_test($plan);
@@ -23,7 +23,7 @@
   return;
 }
 
-require_once(dirname(__FILE__).'/sfCacheDriverTests.class.php');
+require_once(__DIR__.'/sfCacheDriverTests.class.php');
 
 // setup
 sfConfig::set('sf_logging_enabled', false);
diff --git a/lib/vendor/symfony/test/unit/cache/sfFileCacheTest.php b/lib/vendor/symfony/test/unit/cache/sfFileCacheTest.php
index 799e1ae9e..20b5166d1 100644
--- a/lib/vendor/symfony/test/unit/cache/sfFileCacheTest.php
+++ b/lib/vendor/symfony/test/unit/cache/sfFileCacheTest.php
@@ -8,8 +8,8 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-require_once(dirname(__FILE__).'/sfCacheDriverTests.class.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once(__DIR__.'/sfCacheDriverTests.class.php');
 
 $t = new lime_test(65);
 
diff --git a/lib/vendor/symfony/test/unit/cache/sfFunctionCacheTest.php b/lib/vendor/symfony/test/unit/cache/sfFunctionCacheTest.php
index 5010f5770..1434bc317 100644
--- a/lib/vendor/symfony/test/unit/cache/sfFunctionCacheTest.php
+++ b/lib/vendor/symfony/test/unit/cache/sfFunctionCacheTest.php
@@ -8,8 +8,8 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-require_once(dirname(__FILE__).'/sfCacheDriverTests.class.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once(__DIR__.'/sfCacheDriverTests.class.php');
 
 $t = new lime_test(15);
 
diff --git a/lib/vendor/symfony/test/unit/cache/sfMemcacheCacheTest.php b/lib/vendor/symfony/test/unit/cache/sfMemcacheCacheTest.php
index 7ac170740..7de822f0d 100644
--- a/lib/vendor/symfony/test/unit/cache/sfMemcacheCacheTest.php
+++ b/lib/vendor/symfony/test/unit/cache/sfMemcacheCacheTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $plan = 73;
 $t = new lime_test($plan);
@@ -19,7 +19,7 @@
   return;
 }
 
-require_once(dirname(__FILE__).'/sfCacheDriverTests.class.php');
+require_once(__DIR__.'/sfCacheDriverTests.class.php');
 
 // setup
 sfConfig::set('sf_logging_enabled', false);
@@ -66,4 +66,4 @@
 $t->is(count($cacheInfo),1,'Cache info contains 1 element');
 $t->ok(!in_array($prefix.'test_1',$cacheInfo),'Cache info no longer contains the key that matches the pattern (first key)');
 $t->ok(!in_array($prefix.'test_2',$cacheInfo),'Cache info no longer contains the key that matches the pattern (second key)');
-$t->ok(in_array($prefix.'test3',$cacheInfo),'Cache info still contains the key that did not match the pattern (third key)');
\ No newline at end of file
+$t->ok(in_array($prefix.'test3',$cacheInfo),'Cache info still contains the key that did not match the pattern (third key)');
diff --git a/lib/vendor/symfony/test/unit/cache/sfNoCacheTest.php b/lib/vendor/symfony/test/unit/cache/sfNoCacheTest.php
index 5d9b9abab..144a638a8 100644
--- a/lib/vendor/symfony/test/unit/cache/sfNoCacheTest.php
+++ b/lib/vendor/symfony/test/unit/cache/sfNoCacheTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(8);
 
diff --git a/lib/vendor/symfony/test/unit/cache/sfSQLiteCacheTest.php b/lib/vendor/symfony/test/unit/cache/sfSQLiteCacheTest.php
index 4780ea9bd..e0d82302d 100644
--- a/lib/vendor/symfony/test/unit/cache/sfSQLiteCacheTest.php
+++ b/lib/vendor/symfony/test/unit/cache/sfSQLiteCacheTest.php
@@ -8,8 +8,8 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-require_once(dirname(__FILE__).'/sfCacheDriverTests.class.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once(__DIR__.'/sfCacheDriverTests.class.php');
 
 $plan = 129;
 $t = new lime_test($plan);
diff --git a/lib/vendor/symfony/test/unit/cache/sfXCacheCacheTest.php b/lib/vendor/symfony/test/unit/cache/sfXCacheCacheTest.php
index 30a0842fa..fbe5cd94c 100644
--- a/lib/vendor/symfony/test/unit/cache/sfXCacheCacheTest.php
+++ b/lib/vendor/symfony/test/unit/cache/sfXCacheCacheTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $plan = 64;
 $t = new lime_test($plan);
@@ -23,7 +23,7 @@
   return;
 }
 
-require_once(dirname(__FILE__).'/sfCacheDriverTests.class.php');
+require_once(__DIR__.'/sfCacheDriverTests.class.php');
 
 // setup
 sfConfig::set('sf_logging_enabled', false);
diff --git a/lib/vendor/symfony/test/unit/command/sfCommandArgumentSetTest.php b/lib/vendor/symfony/test/unit/command/sfCommandArgumentSetTest.php
index 68faad963..fc36b2f88 100644
--- a/lib/vendor/symfony/test/unit/command/sfCommandArgumentSetTest.php
+++ b/lib/vendor/symfony/test/unit/command/sfCommandArgumentSetTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(21);
 
diff --git a/lib/vendor/symfony/test/unit/command/sfCommandArgumentTest.php b/lib/vendor/symfony/test/unit/command/sfCommandArgumentTest.php
index ebd7d4fc7..892f4b776 100644
--- a/lib/vendor/symfony/test/unit/command/sfCommandArgumentTest.php
+++ b/lib/vendor/symfony/test/unit/command/sfCommandArgumentTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(16);
 
@@ -63,7 +63,7 @@
 $t->diag('->setDefault()');
 $argument = new sfCommandArgument('foo', sfCommandArgument::OPTIONAL, '', 'default');
 $argument->setDefault(null);
-$t->ok(is_null($argument->getDefault()), '->setDefault() can reset the default value by passing null');
+$t->ok(null === $argument->getDefault(), '->setDefault() can reset the default value by passing null');
 $argument->setDefault('another');
 $t->is($argument->getDefault(), 'another', '->setDefault() changes the default value');
 
diff --git a/lib/vendor/symfony/test/unit/command/sfCommandManagerTest.php b/lib/vendor/symfony/test/unit/command/sfCommandManagerTest.php
index a4fd42681..67d1676c3 100644
--- a/lib/vendor/symfony/test/unit/command/sfCommandManagerTest.php
+++ b/lib/vendor/symfony/test/unit/command/sfCommandManagerTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(41);
 
diff --git a/lib/vendor/symfony/test/unit/command/sfCommandOptionSetTest.php b/lib/vendor/symfony/test/unit/command/sfCommandOptionSetTest.php
index f7de2b2fa..5e26d5e37 100644
--- a/lib/vendor/symfony/test/unit/command/sfCommandOptionSetTest.php
+++ b/lib/vendor/symfony/test/unit/command/sfCommandOptionSetTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(20);
 
diff --git a/lib/vendor/symfony/test/unit/command/sfCommandOptionTest.php b/lib/vendor/symfony/test/unit/command/sfCommandOptionTest.php
index d1fa9edf7..c9cb32d9e 100644
--- a/lib/vendor/symfony/test/unit/command/sfCommandOptionTest.php
+++ b/lib/vendor/symfony/test/unit/command/sfCommandOptionTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(34);
 
@@ -84,7 +84,7 @@
 $t->is($option->getDefault(), 'default', '->getDefault() returns the default value');
 
 $option = new sfCommandOption('foo', null, sfCommandOption::PARAMETER_REQUIRED);
-$t->ok(is_null($option->getDefault()), '->getDefault() returns null if no default value is configured');
+$t->ok(null === $option->getDefault(), '->getDefault() returns null if no default value is configured');
 
 $option = new sfCommandOption('foo', null, sfCommandOption::IS_ARRAY);
 $t->is($option->getDefault(), array(), '->getDefault() returns an empty array if option is an array');
@@ -96,7 +96,7 @@
 $t->diag('->setDefault()');
 $option = new sfCommandOption('foo', null, sfCommandOption::PARAMETER_REQUIRED, '', 'default');
 $option->setDefault(null);
-$t->ok(is_null($option->getDefault()), '->setDefault() can reset the default value by passing null');
+$t->ok(null === $option->getDefault(), '->setDefault() can reset the default value by passing null');
 $option->setDefault('another');
 $t->is($option->getDefault(), 'another', '->setDefault() changes the default value');
 
diff --git a/lib/vendor/symfony/test/unit/config/fixtures/sfCompileConfigHandler/simple.yml b/lib/vendor/symfony/test/unit/config/fixtures/sfCompileConfigHandler/simple.yml
new file mode 100644
index 000000000..a1091849d
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/config/fixtures/sfCompileConfigHandler/simple.yml
@@ -0,0 +1 @@
+- %SF_SYMFONY_LIB_DIR%/util/sfInflector.class.php
diff --git a/lib/vendor/symfony/test/unit/config/fixtures/sfGeneratorConfigHandler/root_edit_section.yml b/lib/vendor/symfony/test/unit/config/fixtures/sfGeneratorConfigHandler/root_edit_section.yml
index 710f8dc26..c247ce649 100644
--- a/lib/vendor/symfony/test/unit/config/fixtures/sfGeneratorConfigHandler/root_edit_section.yml
+++ b/lib/vendor/symfony/test/unit/config/fixtures/sfGeneratorConfigHandler/root_edit_section.yml
@@ -1,7 +1,7 @@
 generator:
-  class:              sfPropelAdminGenerator
+  class: sfAdminGenerator
   param:
-    model_class:      Article
-    theme:            default
+    model_class: Article
+    theme: default
   edit:
-    title: test
+    title: test
\ No newline at end of file
diff --git a/lib/vendor/symfony/test/unit/config/fixtures/sfGeneratorConfigHandler/root_fields_section.yml b/lib/vendor/symfony/test/unit/config/fixtures/sfGeneratorConfigHandler/root_fields_section.yml
index a5b5df304..4337bbaef 100644
--- a/lib/vendor/symfony/test/unit/config/fixtures/sfGeneratorConfigHandler/root_fields_section.yml
+++ b/lib/vendor/symfony/test/unit/config/fixtures/sfGeneratorConfigHandler/root_fields_section.yml
@@ -1,7 +1,7 @@
 generator:
-  class:              sfPropelAdminGenerator
+  class: sfAdminGenerator
   param:
-    model_class:      Article
-    theme:            default
+    model_class: Article
+    theme: default
   fields:
-    name: -
+    name:
\ No newline at end of file
diff --git a/lib/vendor/symfony/test/unit/config/fixtures/sfGeneratorConfigHandler/root_list_section.yml b/lib/vendor/symfony/test/unit/config/fixtures/sfGeneratorConfigHandler/root_list_section.yml
index eaa7140af..c23812ccf 100644
--- a/lib/vendor/symfony/test/unit/config/fixtures/sfGeneratorConfigHandler/root_list_section.yml
+++ b/lib/vendor/symfony/test/unit/config/fixtures/sfGeneratorConfigHandler/root_list_section.yml
@@ -1,7 +1,7 @@
 generator:
-  class:              sfPropelAdminGenerator
+  class: sfAdminGenerator
   param:
-    model_class:      Article
-    theme:            default
+    model_class: Article
+    theme: default
   list:
-    title: test
+    title: test
\ No newline at end of file
diff --git a/lib/vendor/symfony/test/unit/config/sfCompileConfigHandlerTest.php b/lib/vendor/symfony/test/unit/config/sfCompileConfigHandlerTest.php
new file mode 100644
index 000000000..9c67bf939
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/config/sfCompileConfigHandlerTest.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once(__DIR__.'/../../bootstrap/unit.php');
+
+$t = new lime_test(2);
+
+$handler = new sfCompileConfigHandler();
+$handler->initialize();
+
+$dir = __DIR__.DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'sfCompileConfigHandler'.DIRECTORY_SEPARATOR;
+
+$t->diag('execute');
+
+sfConfig::set('sf_debug', true);
+$data = $handler->execute(array($dir.'simple.yml'));
+$t->ok(false !== strpos($data, "class sfInflector\n{\n  /**"), '->execute() return complete classe codes');
+
+sfConfig::set('sf_debug', false);
+$data = $handler->execute(array($dir.'simple.yml'));
+$t->ok(false !== strpos($data, "class sfInflector\n{\n  public"), '->execute() return minified classe codes');
diff --git a/lib/vendor/symfony/test/unit/config/sfConfigHandlerTest.php b/lib/vendor/symfony/test/unit/config/sfConfigHandlerTest.php
index 38ef7822e..c90d804cd 100644
--- a/lib/vendor/symfony/test/unit/config/sfConfigHandlerTest.php
+++ b/lib/vendor/symfony/test/unit/config/sfConfigHandlerTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(8);
 
diff --git a/lib/vendor/symfony/test/unit/config/sfConfigTest.php b/lib/vendor/symfony/test/unit/config/sfConfigTest.php
index 3cabc5018..ebcc6d332 100644
--- a/lib/vendor/symfony/test/unit/config/sfConfigTest.php
+++ b/lib/vendor/symfony/test/unit/config/sfConfigTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(9);
 
diff --git a/lib/vendor/symfony/test/unit/config/sfDefineEnvironmentConfigHandlerTest.php b/lib/vendor/symfony/test/unit/config/sfDefineEnvironmentConfigHandlerTest.php
index f99790041..8436bfbea 100644
--- a/lib/vendor/symfony/test/unit/config/sfDefineEnvironmentConfigHandlerTest.php
+++ b/lib/vendor/symfony/test/unit/config/sfDefineEnvironmentConfigHandlerTest.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
-sfConfig::set('sf_symfony_lib_dir', realpath(dirname(__FILE__).'/../../../lib'));
+sfConfig::set('sf_symfony_lib_dir', realpath(__DIR__.'/../../../lib'));
 
 $t = new lime_test(1);
 
@@ -18,7 +18,7 @@
 $handler = new sfDefineEnvironmentConfigHandler();
 $handler->initialize(array('prefix' => 'sf_'));
 
-$dir = dirname(__FILE__).DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'sfDefineEnvironmentConfigHandler'.DIRECTORY_SEPARATOR;
+$dir = __DIR__.DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'sfDefineEnvironmentConfigHandler'.DIRECTORY_SEPARATOR;
 
 $files = array(
   $dir.'prefix_default.yml',
diff --git a/lib/vendor/symfony/test/unit/config/sfFilterConfigHandlerTest.php b/lib/vendor/symfony/test/unit/config/sfFilterConfigHandlerTest.php
index 537f1fd43..00e69d5a4 100644
--- a/lib/vendor/symfony/test/unit/config/sfFilterConfigHandlerTest.php
+++ b/lib/vendor/symfony/test/unit/config/sfFilterConfigHandlerTest.php
@@ -8,14 +8,14 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(8);
 
 $handler = new sfFilterConfigHandler();
 $handler->initialize();
 
-$dir = dirname(__FILE__).DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'sfFilterConfigHandler'.DIRECTORY_SEPARATOR;
+$dir = __DIR__.DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'sfFilterConfigHandler'.DIRECTORY_SEPARATOR;
 
 // parse errors
 $t->diag('parse errors');
diff --git a/lib/vendor/symfony/test/unit/config/sfGeneratorConfigHandlerTest.php b/lib/vendor/symfony/test/unit/config/sfGeneratorConfigHandlerTest.php
index eead09fe3..feaa01bbe 100644
--- a/lib/vendor/symfony/test/unit/config/sfGeneratorConfigHandlerTest.php
+++ b/lib/vendor/symfony/test/unit/config/sfGeneratorConfigHandlerTest.php
@@ -8,16 +8,16 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
-sfConfig::set('sf_symfony_lib_dir', realpath(dirname(__FILE__).'/../../../lib'));
+sfConfig::set('sf_symfony_lib_dir', realpath(__DIR__.'/../../../lib'));
 
 $t = new lime_test(5);
 
 $handler = new sfGeneratorConfigHandler();
 $handler->initialize();
 
-$dir = dirname(__FILE__).DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'sfGeneratorConfigHandler'.DIRECTORY_SEPARATOR;
+$dir = __DIR__.DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'sfGeneratorConfigHandler'.DIRECTORY_SEPARATOR;
 
 $t->diag('parse errors');
 $files = array(
diff --git a/lib/vendor/symfony/test/unit/config/sfPluginConfigurationTest.php b/lib/vendor/symfony/test/unit/config/sfPluginConfigurationTest.php
index 4d07f7b1b..2f592d9ea 100644
--- a/lib/vendor/symfony/test/unit/config/sfPluginConfigurationTest.php
+++ b/lib/vendor/symfony/test/unit/config/sfPluginConfigurationTest.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-require_once dirname(__FILE__).'/../../bootstrap/unit.php';
+require_once __DIR__.'/../../bootstrap/unit.php';
 
-$rootDir = realpath(dirname(__FILE__).'/../../functional/fixtures');
+$rootDir = realpath(__DIR__.'/../../functional/fixtures');
 $pluginRoot = realpath($rootDir.'/plugins/sfAutoloadPlugin');
 
 require_once $pluginRoot.'/config/sfAutoloadPluginConfiguration.class.php';
diff --git a/lib/vendor/symfony/test/unit/config/sfProjectConfigurationTest.php b/lib/vendor/symfony/test/unit/config/sfProjectConfigurationTest.php
index e4f6d19bb..b28259b47 100644
--- a/lib/vendor/symfony/test/unit/config/sfProjectConfigurationTest.php
+++ b/lib/vendor/symfony/test/unit/config/sfProjectConfigurationTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(6);
 
@@ -21,7 +21,7 @@ public function setup()
   }
 }
 
-$configuration = new ProjectConfiguration(dirname(__FILE__).'/../../functional/fixtures');
+$configuration = new ProjectConfiguration(__DIR__.'/../../functional/fixtures');
 
 // ->setPlugins() ->disablePlugins() ->enablePlugins() ->enableAllPluginsExcept()
 $t->diag('->setPlugins() ->disablePlugins() ->enablePlugins() ->enableAllPluginsExcept()');
@@ -47,7 +47,7 @@ public function setup()
   }
 }
 
-$configuration = new ProjectConfiguration2(dirname(__FILE__).'/../../functional/fixtures');
+$configuration = new ProjectConfiguration2(__DIR__.'/../../functional/fixtures');
 $t->is_deeply($configuration->getPlugins(), array('sfAutoloadPlugin', 'sfConfigPlugin'), '->enablePlugins() can enable plugins passed as arguments instead of array');
 
 // ->__construct()
@@ -63,7 +63,7 @@ public function setup()
 
 try
 {
-  $configuration = new ProjectConfiguration3(dirname(__FILE__).'/../../functional/fixtures');
+  $configuration = new ProjectConfiguration3(__DIR__.'/../../functional/fixtures');
   $t->fail('->__construct() throws an exception if a non-existant plugin is enabled');
 }
 catch (Exception $e)
diff --git a/lib/vendor/symfony/test/unit/config/sfSimpleYamlConfigHandlerTest.php b/lib/vendor/symfony/test/unit/config/sfSimpleYamlConfigHandlerTest.php
index 00227529b..267902fed 100644
--- a/lib/vendor/symfony/test/unit/config/sfSimpleYamlConfigHandlerTest.php
+++ b/lib/vendor/symfony/test/unit/config/sfSimpleYamlConfigHandlerTest.php
@@ -8,14 +8,14 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(2);
 
 $config = new sfSimpleYamlConfigHandler();
 $config->initialize();
 
-$dir = dirname(__FILE__).DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'sfSimpleYamlConfigHandler'.DIRECTORY_SEPARATOR;
+$dir = __DIR__.DIRECTORY_SEPARATOR.'fixtures'.DIRECTORY_SEPARATOR.'sfSimpleYamlConfigHandler'.DIRECTORY_SEPARATOR;
 
 $array = get_retval($config, array($dir.'config.yml'));
 $t->is($array['article']['title'], 'foo', '->execute() returns configuration file as an array');
diff --git a/lib/vendor/symfony/test/unit/config/sfViewConfigHandlerTest.php b/lib/vendor/symfony/test/unit/config/sfViewConfigHandlerTest.php
index 2506327d9..d62743a96 100644
--- a/lib/vendor/symfony/test/unit/config/sfViewConfigHandlerTest.php
+++ b/lib/vendor/symfony/test/unit/config/sfViewConfigHandlerTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(22);
 
diff --git a/lib/vendor/symfony/test/unit/config/sfYamlConfigHandlerTest.php b/lib/vendor/symfony/test/unit/config/sfYamlConfigHandlerTest.php
index 892872a0f..4a8aed384 100644
--- a/lib/vendor/symfony/test/unit/config/sfYamlConfigHandlerTest.php
+++ b/lib/vendor/symfony/test/unit/config/sfYamlConfigHandlerTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(7);
 
diff --git a/lib/vendor/symfony/test/unit/controller/sfControllerTest.php b/lib/vendor/symfony/test/unit/controller/sfControllerTest.php
index 9a0d9a3d3..fcbb62877 100644
--- a/lib/vendor/symfony/test/unit/controller/sfControllerTest.php
+++ b/lib/vendor/symfony/test/unit/controller/sfControllerTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 require_once($_test_dir.'/unit/sfContextMock.class.php');
 
 $t = new lime_test(2);
diff --git a/lib/vendor/symfony/test/unit/controller/sfWebControllerTest.php b/lib/vendor/symfony/test/unit/controller/sfWebControllerTest.php
index 27f36bc0e..a433e5b17 100644
--- a/lib/vendor/symfony/test/unit/controller/sfWebControllerTest.php
+++ b/lib/vendor/symfony/test/unit/controller/sfWebControllerTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 require_once($_test_dir.'/unit/sfContextMock.class.php');
 require_once($_test_dir.'/unit/sfNoRouting.class.php');
 
diff --git a/lib/vendor/symfony/test/unit/database/sfDatabaseTest.php b/lib/vendor/symfony/test/unit/database/sfDatabaseTest.php
index 17c4b3642..ef13767f8 100644
--- a/lib/vendor/symfony/test/unit/database/sfDatabaseTest.php
+++ b/lib/vendor/symfony/test/unit/database/sfDatabaseTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 require_once($_test_dir.'/unit/sfContextMock.class.php');
 
 $t = new lime_test(10);
diff --git a/lib/vendor/symfony/test/unit/debug/sfDebugTest.php b/lib/vendor/symfony/test/unit/debug/sfDebugTest.php
index 70bca7bca..d1a76fe32 100644
--- a/lib/vendor/symfony/test/unit/debug/sfDebugTest.php
+++ b/lib/vendor/symfony/test/unit/debug/sfDebugTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(1);
 
@@ -16,4 +16,4 @@
 $t->diag('::removeObjects()');
 $objectArray = array('foo', 42, new sfDebug(), array('bar', 23, new lime_test(null)));
 $cleanedArray = array('foo', 42, 'sfDebug Object()', array('bar', 23, 'lime_test Object()'));
-$t->is_deeply(sfDebug::removeObjects($objectArray), $cleanedArray, '::removeObjects() converts objects to String representations using the class name');
\ No newline at end of file
+$t->is_deeply(sfDebug::removeObjects($objectArray), $cleanedArray, '::removeObjects() converts objects to String representations using the class name');
diff --git a/lib/vendor/symfony/test/unit/debug/sfTimerTest.php b/lib/vendor/symfony/test/unit/debug/sfTimerTest.php
index 59058fea6..92540224a 100644
--- a/lib/vendor/symfony/test/unit/debug/sfTimerTest.php
+++ b/lib/vendor/symfony/test/unit/debug/sfTimerTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(6);
 
@@ -28,4 +28,4 @@
 $t->is(count($timers), 2, '::getTimers() returns an array with the timers created by the timer manager');
 $t->is($timers['timerA'], $timerA, '::getTimers() returns an array with keys being the timer name');
 sfTimerManager::clearTimers();
-$t->is(count(sfTimerManager::getTimers()), 0, '::clearTimers() empties the list of the timer instances');
\ No newline at end of file
+$t->is(count(sfTimerManager::getTimers()), 0, '::clearTimers() empties the list of the timer instances');
diff --git a/lib/vendor/symfony/test/unit/debug/sfWebDebugTest.php b/lib/vendor/symfony/test/unit/debug/sfWebDebugTest.php
index ac6c16dba..85df62484 100644
--- a/lib/vendor/symfony/test/unit/debug/sfWebDebugTest.php
+++ b/lib/vendor/symfony/test/unit/debug/sfWebDebugTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once dirname(__FILE__).'/../../bootstrap/unit.php';
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(10);
 
diff --git a/lib/vendor/symfony/test/unit/escaper/sfOutputEscaperArrayDecoratorTest.php b/lib/vendor/symfony/test/unit/escaper/sfOutputEscaperArrayDecoratorTest.php
index bed42dbe5..63b12489f 100644
--- a/lib/vendor/symfony/test/unit/escaper/sfOutputEscaperArrayDecoratorTest.php
+++ b/lib/vendor/symfony/test/unit/escaper/sfOutputEscaperArrayDecoratorTest.php
@@ -8,15 +8,15 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../../lib/vendor/lime/lime.php');
-require_once(dirname(__FILE__).'/../../../lib/escaper/sfOutputEscaper.class.php');
-require_once(dirname(__FILE__).'/../../../lib/escaper/sfOutputEscaperGetterDecorator.class.php');
-require_once(dirname(__FILE__).'/../../../lib/escaper/sfOutputEscaperArrayDecorator.class.php');
-require_once(dirname(__FILE__).'/../../../lib/escaper/sfOutputEscaperObjectDecorator.class.php');
-require_once(dirname(__FILE__).'/../../../lib/escaper/sfOutputEscaperIteratorDecorator.class.php');
+require_once(__DIR__.'/../../../lib/vendor/lime/lime.php');
+require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaper.class.php');
+require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperGetterDecorator.class.php');
+require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperArrayDecorator.class.php');
+require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperObjectDecorator.class.php');
+require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperIteratorDecorator.class.php');
 
-require_once(dirname(__FILE__).'/../../../lib/helper/EscapingHelper.php');
-require_once(dirname(__FILE__).'/../../../lib/config/sfConfig.class.php');
+require_once(__DIR__.'/../../../lib/helper/EscapingHelper.php');
+require_once(__DIR__.'/../../../lib/config/sfConfig.class.php');
 
 class sfException extends Exception
 {
diff --git a/lib/vendor/symfony/test/unit/escaper/sfOutputEscaperObjectDecoratorTest.php b/lib/vendor/symfony/test/unit/escaper/sfOutputEscaperObjectDecoratorTest.php
index c87650520..967bde98a 100644
--- a/lib/vendor/symfony/test/unit/escaper/sfOutputEscaperObjectDecoratorTest.php
+++ b/lib/vendor/symfony/test/unit/escaper/sfOutputEscaperObjectDecoratorTest.php
@@ -8,15 +8,15 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../../lib/vendor/lime/lime.php');
-require_once(dirname(__FILE__).'/../../../lib/escaper/sfOutputEscaper.class.php');
-require_once(dirname(__FILE__).'/../../../lib/escaper/sfOutputEscaperGetterDecorator.class.php');
-require_once(dirname(__FILE__).'/../../../lib/escaper/sfOutputEscaperArrayDecorator.class.php');
-require_once(dirname(__FILE__).'/../../../lib/escaper/sfOutputEscaperObjectDecorator.class.php');
-require_once(dirname(__FILE__).'/../../../lib/escaper/sfOutputEscaperIteratorDecorator.class.php');
-
-require_once(dirname(__FILE__).'/../../../lib/helper/EscapingHelper.php');
-require_once(dirname(__FILE__).'/../../../lib/config/sfConfig.class.php');
+require_once(__DIR__.'/../../../lib/vendor/lime/lime.php');
+require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaper.class.php');
+require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperGetterDecorator.class.php');
+require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperArrayDecorator.class.php');
+require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperObjectDecorator.class.php');
+require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperIteratorDecorator.class.php');
+
+require_once(__DIR__.'/../../../lib/helper/EscapingHelper.php');
+require_once(__DIR__.'/../../../lib/config/sfConfig.class.php');
 
 class sfException extends Exception
 {
diff --git a/lib/vendor/symfony/test/unit/escaper/sfOutputEscaperSafeTest.php b/lib/vendor/symfony/test/unit/escaper/sfOutputEscaperSafeTest.php
index 13b4e861a..b25079b6e 100644
--- a/lib/vendor/symfony/test/unit/escaper/sfOutputEscaperSafeTest.php
+++ b/lib/vendor/symfony/test/unit/escaper/sfOutputEscaperSafeTest.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../../lib/vendor/lime/lime.php');
-require_once(dirname(__FILE__).'/../../../lib/helper/EscapingHelper.php');
-require_once(dirname(__FILE__).'/../../../lib/escaper/sfOutputEscaperSafe.class.php');
+require_once(__DIR__.'/../../../lib/vendor/lime/lime.php');
+require_once(__DIR__.'/../../../lib/helper/EscapingHelper.php');
+require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperSafe.class.php');
 
 $t = new lime_test(13);
 
diff --git a/lib/vendor/symfony/test/unit/escaper/sfOutputEscaperTest.php b/lib/vendor/symfony/test/unit/escaper/sfOutputEscaperTest.php
index 1f05f334f..9d96acd0f 100644
--- a/lib/vendor/symfony/test/unit/escaper/sfOutputEscaperTest.php
+++ b/lib/vendor/symfony/test/unit/escaper/sfOutputEscaperTest.php
@@ -8,16 +8,16 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../../lib/vendor/lime/lime.php');
-require_once(dirname(__FILE__).'/../../../lib/escaper/sfOutputEscaper.class.php');
-require_once(dirname(__FILE__).'/../../../lib/escaper/sfOutputEscaperGetterDecorator.class.php');
-require_once(dirname(__FILE__).'/../../../lib/escaper/sfOutputEscaperArrayDecorator.class.php');
-require_once(dirname(__FILE__).'/../../../lib/escaper/sfOutputEscaperObjectDecorator.class.php');
-require_once(dirname(__FILE__).'/../../../lib/escaper/sfOutputEscaperIteratorDecorator.class.php');
-require_once(dirname(__FILE__).'/../../../lib/escaper/sfOutputEscaperSafe.class.php');
-
-require_once(dirname(__FILE__).'/../../../lib/helper/EscapingHelper.php');
-require_once(dirname(__FILE__).'/../../../lib/config/sfConfig.class.php');
+require_once(__DIR__.'/../../../lib/vendor/lime/lime.php');
+require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaper.class.php');
+require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperGetterDecorator.class.php');
+require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperArrayDecorator.class.php');
+require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperObjectDecorator.class.php');
+require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperIteratorDecorator.class.php');
+require_once(__DIR__.'/../../../lib/escaper/sfOutputEscaperSafe.class.php');
+
+require_once(__DIR__.'/../../../lib/helper/EscapingHelper.php');
+require_once(__DIR__.'/../../../lib/config/sfConfig.class.php');
 
 sfConfig::set('sf_charset', 'UTF-8');
 
diff --git a/lib/vendor/symfony/test/unit/event/sfEventDispatcherTest.php b/lib/vendor/symfony/test/unit/event/sfEventDispatcherTest.php
new file mode 100644
index 000000000..dcfe99717
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/event/sfEventDispatcherTest.php
@@ -0,0 +1,131 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once(__DIR__.'/../../bootstrap/unit.php');
+
+$t = new lime_test(19);
+
+$dispatcher = new sfEventDispatcher();
+
+// ->connect() ->disconnect()
+$t->diag('->connect() ->disconnect()');
+$dispatcher->connect('bar', 'listenToBar');
+$t->is($dispatcher->getListeners('bar'), array('listenToBar'), '->connect() connects a listener to an event name');
+$dispatcher->connect('bar', 'listenToBarBar');
+$t->is($dispatcher->getListeners('bar'), array('listenToBar', 'listenToBarBar'), '->connect() can connect several listeners for the same event name');
+
+$dispatcher->connect('barbar', 'listenToBarBar');
+$dispatcher->disconnect('bar', 'listenToBarBar');
+$t->is($dispatcher->getListeners('bar'), array('listenToBar'), '->disconnect() disconnects a listener for an event name');
+$t->is($dispatcher->getListeners('barbar'), array('listenToBarBar'), '->disconnect() disconnects a listener for an event name');
+
+$t->ok($dispatcher->disconnect('foobar', 'listen') === false, '->disconnect() returns false if the listener does not exist');
+
+// ->getListeners() ->hasListeners()
+$t->diag('->getListeners() ->hasListeners()');
+$t->is($dispatcher->hasListeners('foo'), false, '->hasListeners() returns false if the event has no listener');
+$dispatcher->connect('foo', 'listenToFoo');
+$t->is($dispatcher->hasListeners('foo'), true, '->hasListeners() returns true if the event has some listeners');
+$dispatcher->disconnect('foo', 'listenToFoo');
+$t->is($dispatcher->hasListeners('foo'), false, '->hasListeners() returns false if the event has no listener');
+
+$t->is($dispatcher->getListeners('bar'), array('listenToBar'), '->getListeners() returns an array of listeners connected to the given event name');
+$t->is($dispatcher->getListeners('foobar'), array(), '->getListeners() returns an empty array if no listener are connected to the given event name');
+
+$listener = new Listener();
+
+// ->notify()
+$t->diag('->notify()');
+$listener->reset();
+$dispatcher = new sfEventDispatcher();
+$dispatcher->connect('foo', array($listener, 'listenToFoo'));
+$dispatcher->connect('foo', array($listener, 'listenToFooBis'));
+$e = $dispatcher->notify($event = new sfEvent(new stdClass(), 'foo'));
+$t->is($listener->getValue(), 'listenToFoolistenToFooBis', '->notify() notifies all registered listeners in order');
+$t->is($e, $event, '->notify() returns the event object');
+
+$listener->reset();
+$dispatcher = new sfEventDispatcher();
+$dispatcher->connect('foo', array($listener, 'listenToFooBis'));
+$dispatcher->connect('foo', array($listener, 'listenToFoo'));
+$dispatcher->notify(new sfEvent(new stdClass(), 'foo'));
+$t->is($listener->getValue(), 'listenToFooBislistenToFoo', '->notify() notifies all registered listeners in order');
+
+// ->notifyUntil()
+$t->diag('->notifyUntil()');
+$listener->reset();
+$dispatcher = new sfEventDispatcher();
+$dispatcher->connect('foo', array($listener, 'listenToFoo'));
+$dispatcher->connect('foo', array($listener, 'listenToFooBis'));
+$e = $dispatcher->notifyUntil($event = new sfEvent(new stdClass(), 'foo'));
+$t->is($listener->getValue(), 'listenToFoolistenToFooBis', '->notifyUntil() notifies all registered listeners in order and stops if it returns true');
+$t->is($e, $event, '->notifyUntil() returns the event object');
+
+$listener->reset();
+$dispatcher = new sfEventDispatcher();
+$dispatcher->connect('foo', array($listener, 'listenToFooBis'));
+$dispatcher->connect('foo', array($listener, 'listenToFoo'));
+$e = $dispatcher->notifyUntil($event = new sfEvent(new stdClass(), 'foo'));
+$t->is($listener->getValue(), 'listenToFooBis', '->notifyUntil() notifies all registered listeners in order and stops if it returns true');
+
+// ->filter()
+$t->diag('->filter()');
+$listener->reset();
+$dispatcher = new sfEventDispatcher();
+$dispatcher->connect('foo', array($listener, 'filterFoo'));
+$dispatcher->connect('foo', array($listener, 'filterFooBis'));
+$e = $dispatcher->filter($event = new sfEvent(new stdClass(), 'foo'), 'foo');
+$t->is($e->getReturnValue(), '-*foo*-', '->filter() filters a value');
+$t->is($e, $event, '->filter() returns the event object');
+
+$listener->reset();
+$dispatcher = new sfEventDispatcher();
+$dispatcher->connect('foo', array($listener, 'filterFooBis'));
+$dispatcher->connect('foo', array($listener, 'filterFoo'));
+$e = $dispatcher->filter($event = new sfEvent(new stdClass(), 'foo'), 'foo');
+$t->is($e->getReturnValue(), '*-foo-*', '->filter() filters a value');
+
+class Listener
+{
+  protected
+    $value = '';
+
+  function filterFoo(sfEvent $event, $foo)
+  {
+    return "*$foo*";
+  }
+
+  function filterFooBis(sfEvent $event, $foo)
+  {
+    return "-$foo-";
+  }
+
+  function listenToFoo(sfEvent $event)
+  {
+    $this->value .= 'listenToFoo';
+  }
+
+  function listenToFooBis(sfEvent $event)
+  {
+    $this->value .= 'listenToFooBis';
+
+    return true;
+  }
+
+  function getValue()
+  {
+    return $this->value;
+  }
+
+  function reset()
+  {
+    $this->value = '';
+  }
+}
diff --git a/lib/vendor/symfony/test/unit/event/sfEventTest.php b/lib/vendor/symfony/test/unit/event/sfEventTest.php
new file mode 100644
index 000000000..48b6ea9c1
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/event/sfEventTest.php
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once(__DIR__.'/../../bootstrap/unit.php');
+
+$t = new lime_test(11);
+
+$subject = new stdClass();
+$parameters = array('foo' => 'bar');
+$event = new sfEvent($subject, 'name', $parameters);
+
+// ->getSubject()
+$t->diag('->getSubject()');
+$t->is($event->getSubject(), $subject, '->getSubject() returns the event subject');
+
+// ->getName()
+$t->diag('->getName()');
+$t->is($event->getName(), 'name', '->getName() returns the event name');
+
+// ->getParameters()
+$t->diag('->getParameters()');
+$t->is($event->getParameters(), $parameters, '->getParameters() returns the event parameters');
+
+// ->getReturnValue() ->setReturnValue()
+$t->diag('->getReturnValue() ->setReturnValue()');
+$event->setReturnValue('foo');
+$t->is($event->getReturnValue(), 'foo', '->getReturnValue() returns the return value of the event');
+
+// ->setProcessed() ->isProcessed()
+$t->diag('->setProcessed() ->isProcessed()');
+$event->setProcessed(true);
+$t->is($event->isProcessed(), true, '->isProcessed() returns true if the event has been processed');
+$event->setProcessed(false);
+$t->is($event->isProcessed(), false, '->setProcessed() changes the processed status');
+
+// ArrayAccess interface
+$t->diag('ArrayAccess interface');
+$t->is($event['foo'], 'bar', 'sfEvent implements the ArrayAccess interface');
+$event['foo'] = 'foo';
+$t->is($event['foo'], 'foo', 'sfEvent implements the ArrayAccess interface');
+
+try
+{
+  $event['foobar'];
+  $t->fail('::offsetGet() throws an InvalidArgumentException exception when the parameter does not exist');
+}
+catch (InvalidArgumentException $e)
+{
+  $t->pass('::offsetGet() throws an InvalidArgumentException exception when the parameter does not exist');
+}
+
+$t->ok(isset($event['foo']), 'sfEvent implements the ArrayAccess interface');
+unset($event['foo']);
+$t->ok(!isset($event['foo']), 'sfEvent implements the ArrayAccess interface');
diff --git a/lib/vendor/symfony/test/unit/exception/sfExceptionsTest.php b/lib/vendor/symfony/test/unit/exception/sfExceptionsTest.php
index 1ed8e6e75..af8a35e98 100644
--- a/lib/vendor/symfony/test/unit/exception/sfExceptionsTest.php
+++ b/lib/vendor/symfony/test/unit/exception/sfExceptionsTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(24);
 
diff --git a/lib/vendor/symfony/test/unit/filter/sfFilterTest.php b/lib/vendor/symfony/test/unit/filter/sfFilterTest.php
index f924eca14..50d5bd120 100644
--- a/lib/vendor/symfony/test/unit/filter/sfFilterTest.php
+++ b/lib/vendor/symfony/test/unit/filter/sfFilterTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 require_once($_test_dir.'/unit/sfContextMock.class.php');
 
 $t = new lime_test(17);
diff --git a/lib/vendor/symfony/test/unit/form/addon/sfFormSymfonyTest.php b/lib/vendor/symfony/test/unit/form/addon/sfFormSymfonyTest.php
index b722e822f..0c2f90efd 100644
--- a/lib/vendor/symfony/test/unit/form/addon/sfFormSymfonyTest.php
+++ b/lib/vendor/symfony/test/unit/form/addon/sfFormSymfonyTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../../bootstrap/unit.php');
+require_once(__DIR__.'/../../../bootstrap/unit.php');
 
 $t = new lime_test(8);
 
diff --git a/lib/vendor/symfony/test/unit/form/sfFormFieldSchemaTest.php b/lib/vendor/symfony/test/unit/form/sfFormFieldSchemaTest.php
index af4ef2131..13f1f89be 100644
--- a/lib/vendor/symfony/test/unit/form/sfFormFieldSchemaTest.php
+++ b/lib/vendor/symfony/test/unit/form/sfFormFieldSchemaTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(11);
 
diff --git a/lib/vendor/symfony/test/unit/form/sfFormFieldTest.php b/lib/vendor/symfony/test/unit/form/sfFormFieldTest.php
index e52dddde1..1c8687dc8 100644
--- a/lib/vendor/symfony/test/unit/form/sfFormFieldTest.php
+++ b/lib/vendor/symfony/test/unit/form/sfFormFieldTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(31);
 
diff --git a/lib/vendor/symfony/test/unit/form/sfFormTest.php b/lib/vendor/symfony/test/unit/form/sfFormTest.php
index 5f72954c5..ecaf8aa48 100644
--- a/lib/vendor/symfony/test/unit/form/sfFormTest.php
+++ b/lib/vendor/symfony/test/unit/form/sfFormTest.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
-$t = new lime_test(165);
+$t = new lime_test(157);
 
 class FormTest extends sfForm
 {
@@ -619,34 +619,51 @@ public function configure()
 $author = new FormTest(array('first_name' => 'Fabien'));
 $author->setWidgetSchema($author_widget_schema = new sfWidgetFormSchema(array('first_name' => new sfWidgetFormInputText())));
 $author->setValidatorSchema($author_validator_schema = new sfValidatorSchema(array('first_name' => new sfValidatorString(array('min_length' => 2)))));
+$author->addCSRFProtection(null);
+
 
 $company = new FormTest();
 $company->setWidgetSchema($company_widget_schema = new sfWidgetFormSchema(array('name' => new sfWidgetFormInputText())));
 $company->setValidatorSchema($company_validator_schema = new sfValidatorSchema(array('name' => new sfValidatorString(array('min_length' => 2)))));
+$company->addCSRFProtection(null);
 
 $article = new FormTest();
 $article->setWidgetSchema($article_widget_schema = new sfWidgetFormSchema(array('title' => new sfWidgetFormInputText())));
 $article->setValidatorSchema($article_validator_schema = new sfValidatorSchema(array('title' => new sfValidatorString(array('min_length' => 2)))));
+$article->addCSRFProtection(null);
 
 $author->embedForm('company', $company);
 $article->embedForm('author', $author);
 $v = $article->getValidatorSchema();
 $w = $article->getWidgetSchema();
 $d = $article->getDefaults();
+$f = $article->getEmbeddedForms();
 
 $w->setNameFormat('article[%s]');
 
-$t->ok($v['author']['first_name'] == $author_validator_schema['first_name'], '->embedForm() embeds the validator schema');
+$t->ok($v['author'] instanceof sfValidatorPass, '->embedForm() set validator pass');
 // ignore parents in comparison
 $w['author']['first_name']->setParent(null); $author_widget_schema['first_name']->setParent(null);
 $t->ok($w['author']['first_name'] == $author_widget_schema['first_name'], '->embedForm() embeds the widget schema');
 $t->is($d['author']['first_name'], 'Fabien', '->embedForm() merges default values from the embedded form');
-$t->is($v['author'][sfForm::getCSRFFieldName()], null, '->embedForm() removes the CSRF token for the embedded form');
 $t->is($w['author'][sfForm::getCSRFFieldName()], null, '->embedForm() removes the CSRF token for the embedded form');
+$t->ok(!isset($f['author'][sfForm::getCSRFFieldName()]), '->embedForm() removes the CSRF token for the embedded form');
 
 $t->is($w['author']->generateName('first_name'), 'article[author][first_name]', '->embedForm() changes the name format to reflect the embedding');
 $t->is($w['author']['company']->generateName('name'), 'article[author][company][name]', '->embedForm() changes the name format to reflect the embedding');
 
+// tests for ticket #56
+$t->ok($author->getValidator('company') == $company_validator_schema, '->getValidator() gets a validator schema for an embedded form');
+try
+{
+  $author->setValidator('company', new sfValidatorPass());
+  $t->fail('"sfForm" Trying to set a validator for an embedded form field throws a LogicException');
+}
+catch (LogicException $e)
+{
+  $t->pass('"sfForm" Trying to set a validator for an embedded form field throws a LogicException');
+}
+
 // tests for ticket #4754
 $f1 = new TestForm1();
 $f2 = new TestForm2();
@@ -654,33 +671,15 @@ public function configure()
 $t->is($f1['f2']['c']->render(), '<textarea rows="4" cols="30" name="f2[c]" id="f2_c"></textarea>', '->embedForm() generates a correct id in embedded form fields');
 $t->is($f1['f2']['c']->renderLabel(), '<label for="f2_c">2_c</label>', '->embedForm() generates a correct label id correctly in embedded form fields');
 
-// ->embedFormForEach()
-$t->diag('->embedFormForEach()');
-$article->embedFormForEach('authors', $author, 2, null, null, array('id_format' => '%s_id'), array('class' => 'embedded'));
-$v = $article->getValidatorSchema();
-$w = $article->getWidgetSchema();
-$d = $article->getDefaults();
-$w->setNameFormat('article[%s]');
-
-for ($i = 0; $i < 2; $i++)
-{
-  $t->ok($v['authors'][$i]['first_name'] == $author_validator_schema['first_name'], '->embedFormForEach() embeds the validator schema');
-  // ignore the parents in comparison
-  $w['authors'][$i]['first_name']->setParent(null); $author_widget_schema['first_name']->setParent(null);
-  $t->ok($w['authors'][$i]['first_name'] == $author_widget_schema['first_name'], '->embedFormForEach() embeds the widget schema');
-  $t->is($d['authors'][$i]['first_name'], 'Fabien', '->embedFormForEach() merges default values from the embedded forms');
-  $t->is($v['authors'][$i][sfForm::getCSRFFieldName()], null, '->embedFormForEach() removes the CSRF token for the embedded forms');
-  $t->is($w['authors'][$i][sfForm::getCSRFFieldName()], null, '->embedFormForEach() removes the CSRF token for the embedded forms');
-}
-
-$t->is($w['authors'][0]->generateName('first_name'), 'article[authors][0][first_name]', '->embedFormForEach() changes the name format to reflect the embedding');
-
 // bind too many values for embedded forms
 $t->diag('bind too many values for embedded forms');
 $list = new FormTest();
 $list->setWidgets(array('title' => new sfWidgetFormInputText()));
 $list->setValidators(array('title' => new sfValidatorString()));
-$list->embedFormForEach('items', clone $list, 2);
+$containerForm = new sfForm();
+$containerForm->embedForm('0', clone $list);
+$containerForm->embedForm('1', clone $list);
+$list->embedForm('items', $containerForm);
 $list->bind(array(
   'title' => 'list title',
   'items' => array(
@@ -980,6 +979,33 @@ public function getStylesheets()
 $f->bind(array('5' => 'bound'));
 $t->is_deeply($f->getFormFieldSchema()->getValue(), array('5' => 'bound'), '->getFormFieldSchema() includes bound numeric fields');
 
+// ->getErrors()
+$t->diag('->getErrors()');
+
+$f1 = new TestForm1();
+$f21 = new TestForm1();
+$f2 = new TestForm2();
+$f2->embedForm('F21', $f21);
+$f1->embedForm('F2', $f2);
+$f1->bind(array());
+$expected = array (
+  '1_a' => 'Required.',
+  '1_b' => 'Required.',
+  '1_c' => 'Required.',
+  'F2' =>
+  array (
+    '2_d' => 'Required.',
+    'F21' =>
+    array (
+      '1_a' => 'Required.',
+      '1_b' => 'Required.',
+      '1_c' => 'Required.',
+    ),
+  ),
+);
+
+$t->is($f1->getErrors(), $expected, '->getErrors() return array of errors');
+
 // bind with a simulated file upload in the POST array
 $f = new FormTest();
 try
diff --git a/lib/vendor/symfony/test/unit/generator/sfGeneratorTest.php b/lib/vendor/symfony/test/unit/generator/sfGeneratorTest.php
index b5f4d4dbf..94f0fcbb4 100644
--- a/lib/vendor/symfony/test/unit/generator/sfGeneratorTest.php
+++ b/lib/vendor/symfony/test/unit/generator/sfGeneratorTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(0);
 
diff --git a/lib/vendor/symfony/test/unit/generator/sfModelGeneratorConfigurationFieldTest.php b/lib/vendor/symfony/test/unit/generator/sfModelGeneratorConfigurationFieldTest.php
index 3a4c578ed..3b986e461 100644
--- a/lib/vendor/symfony/test/unit/generator/sfModelGeneratorConfigurationFieldTest.php
+++ b/lib/vendor/symfony/test/unit/generator/sfModelGeneratorConfigurationFieldTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once dirname(__FILE__).'/../../bootstrap/unit.php';
+require_once __DIR__.'/../../bootstrap/unit.php';
 
 $t = new lime_test(12);
 
diff --git a/lib/vendor/symfony/test/unit/helper/AssetHelperTest.php b/lib/vendor/symfony/test/unit/helper/AssetHelperTest.php
index 0a2bbb4e1..91b09a8e3 100644
--- a/lib/vendor/symfony/test/unit/helper/AssetHelperTest.php
+++ b/lib/vendor/symfony/test/unit/helper/AssetHelperTest.php
@@ -8,12 +8,12 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 require_once($_test_dir.'/unit/sfContextMock.class.php');
 
-require_once(dirname(__FILE__).'/../../../lib/helper/TagHelper.php');
-require_once(dirname(__FILE__).'/../../../lib/helper/UrlHelper.php');
-require_once(dirname(__FILE__).'/../../../lib/helper/AssetHelper.php');
+require_once(__DIR__.'/../../../lib/helper/TagHelper.php');
+require_once(__DIR__.'/../../../lib/helper/UrlHelper.php');
+require_once(__DIR__.'/../../../lib/helper/AssetHelper.php');
 
 $t = new lime_test(68);
 
diff --git a/lib/vendor/symfony/test/unit/helper/DateHelperTest.php b/lib/vendor/symfony/test/unit/helper/DateHelperTest.php
index 760c543f6..03303b924 100644
--- a/lib/vendor/symfony/test/unit/helper/DateHelperTest.php
+++ b/lib/vendor/symfony/test/unit/helper/DateHelperTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 require_once($_test_dir.'/unit/sfContextMock.class.php');
 
 $t = new lime_test(592);
@@ -27,9 +27,9 @@ public function getCulture()
 
 $context = sfContext::getInstance(array('user' => 'sfUser'));
 
-require_once(dirname(__FILE__).'/../../../lib/helper/UrlHelper.php');
-require_once(dirname(__FILE__).'/../../../lib/helper/TagHelper.php');
-require_once(dirname(__FILE__).'/../../../lib/helper/DateHelper.php');
+require_once(__DIR__.'/../../../lib/helper/UrlHelper.php');
+require_once(__DIR__.'/../../../lib/helper/TagHelper.php');
+require_once(__DIR__.'/../../../lib/helper/DateHelper.php');
 
 // get a fixed timestamp to test with
 $now = time();
diff --git a/lib/vendor/symfony/test/unit/helper/EscapingHelperTest.php b/lib/vendor/symfony/test/unit/helper/EscapingHelperTest.php
index 364bfe9bc..b03948af6 100644
--- a/lib/vendor/symfony/test/unit/helper/EscapingHelperTest.php
+++ b/lib/vendor/symfony/test/unit/helper/EscapingHelperTest.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
-require_once(dirname(__FILE__).'/../../../lib/helper/EscapingHelper.php');
+require_once(__DIR__.'/../../../lib/helper/EscapingHelper.php');
 
 $t = new lime_test(11);
 
@@ -41,4 +41,4 @@
 world')
 EOF;
 $t->is(esc_js_no_entities(fix_linebreaks($output)), 'alert(\\\'hello\\nworld\\\')', 'esc_js_no_entities() handles linebreaks correctly');
-$t->is(esc_js_no_entities("alert('hello\nworld')"), 'alert(\\\'hello\\nworld\\\')', 'esc_js_no_entities() handles linebreaks correctly');
\ No newline at end of file
+$t->is(esc_js_no_entities("alert('hello\nworld')"), 'alert(\\\'hello\\nworld\\\')', 'esc_js_no_entities() handles linebreaks correctly');
diff --git a/lib/vendor/symfony/test/unit/helper/JavascriptBaseHelperTest.php b/lib/vendor/symfony/test/unit/helper/JavascriptBaseHelperTest.php
index 2ecac9521..a15a5848a 100644
--- a/lib/vendor/symfony/test/unit/helper/JavascriptBaseHelperTest.php
+++ b/lib/vendor/symfony/test/unit/helper/JavascriptBaseHelperTest.php
@@ -3,14 +3,14 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-require_once(dirname(__FILE__).'/../../../lib/helper/TagHelper.php');
-require_once(dirname(__FILE__).'/../../../lib/helper/JavascriptBaseHelper.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../../lib/helper/TagHelper.php');
+require_once(__DIR__.'/../../../lib/helper/JavascriptBaseHelper.php');
 
 $t = new lime_test(9, new lime_output_color());
 
@@ -41,4 +41,4 @@
 $t->diag('link_to_function()');
 $t->is(link_to_function('foo', 'alert(\'bar\')'), '<a href="#" onclick="alert(\'bar\'); return false;">foo</a>', 'link_to_function generates a link with onClick handler for function');
 //#4152
-$t->is(link_to_function('foo', 'alert(\'bar\')', array('confirm' => 'sure?')), '<a href="#" onclick="if(window.confirm(\'sure?\')){ alert(\'bar\');}; return false;">foo</a>', 'link_to_function works fine with confirm dialog');
\ No newline at end of file
+$t->is(link_to_function('foo', 'alert(\'bar\')', array('confirm' => 'sure?')), '<a href="#" onclick="if(window.confirm(\'sure?\')){ alert(\'bar\');}; return false;">foo</a>', 'link_to_function works fine with confirm dialog');
diff --git a/lib/vendor/symfony/test/unit/helper/NumberHelperTest.php b/lib/vendor/symfony/test/unit/helper/NumberHelperTest.php
index 963f1dc1b..6976f4ec0 100644
--- a/lib/vendor/symfony/test/unit/helper/NumberHelperTest.php
+++ b/lib/vendor/symfony/test/unit/helper/NumberHelperTest.php
@@ -8,8 +8,8 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-require_once(dirname(__FILE__).'/../../../lib/helper/NumberHelper.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../../lib/helper/NumberHelper.php');
 
 $t = new lime_test(12);
 
diff --git a/lib/vendor/symfony/test/unit/helper/PartialHelperTest.php b/lib/vendor/symfony/test/unit/helper/PartialHelperTest.php
index 4407997b8..507aa34b5 100644
--- a/lib/vendor/symfony/test/unit/helper/PartialHelperTest.php
+++ b/lib/vendor/symfony/test/unit/helper/PartialHelperTest.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 require_once($_test_dir.'/unit/sfContextMock.class.php');
-require_once(dirname(__FILE__).'/../../../lib/helper/PartialHelper.php');
+require_once(__DIR__.'/../../../lib/helper/PartialHelper.php');
 
 // Fixme: make this test more beautiful and extend it
 
@@ -61,4 +61,4 @@ public function setPartialVars(array $partialVars)
 
 ob_start();
 include_slot('doo', 'zoo');
-$t->is(ob_get_clean(), 'zoo', 'include_slot() prints out the default content specified for an unexisting slot');
\ No newline at end of file
+$t->is(ob_get_clean(), 'zoo', 'include_slot() prints out the default content specified for an unexisting slot');
diff --git a/lib/vendor/symfony/test/unit/helper/TagHelperTest.php b/lib/vendor/symfony/test/unit/helper/TagHelperTest.php
index 1353e3942..d8930979c 100644
--- a/lib/vendor/symfony/test/unit/helper/TagHelperTest.php
+++ b/lib/vendor/symfony/test/unit/helper/TagHelperTest.php
@@ -8,14 +8,14 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 require_once($_test_dir.'/unit/sfContextMock.class.php');
 
 $t = new lime_test(21);
 
 $context = sfContext::getInstance();
 
-require_once(dirname(__FILE__).'/../../../lib/helper/TagHelper.php');
+require_once(__DIR__.'/../../../lib/helper/TagHelper.php');
 
 // tag()
 $t->diag('tag()');
diff --git a/lib/vendor/symfony/test/unit/helper/TextHelperTest.php b/lib/vendor/symfony/test/unit/helper/TextHelperTest.php
index eca779d09..9d111eb84 100644
--- a/lib/vendor/symfony/test/unit/helper/TextHelperTest.php
+++ b/lib/vendor/symfony/test/unit/helper/TextHelperTest.php
@@ -8,48 +8,63 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../../test/bootstrap/unit.php');
+require_once(__DIR__.'/../../../test/bootstrap/unit.php');
 
-require_once(dirname(__FILE__).'/../../../lib/helper/TagHelper.php');
-require_once(dirname(__FILE__).'/../../../lib/helper/TextHelper.php');
+require_once(__DIR__.'/../../../lib/helper/TagHelper.php');
+require_once(__DIR__.'/../../../lib/helper/TextHelper.php');
 
-$t = new lime_test(54);
+$t = new lime_test(60);
 
 // truncate_text()
 $t->diag('truncate_text()');
-$t->is(truncate_text(''), '', 'text_truncate() does nothing on an empty string');
+$t->is(truncate_text(''), '', 'truncate_text() does nothing on an empty string');
 
-$t->is(truncate_text('Test'), 'Test', 'text_truncate() truncates to 30 characters by default');
+$t->is(truncate_text('Test'), 'Test', 'truncate_text() truncates to 30 characters by default');
 
 $text = str_repeat('A', 35);
 $truncated = str_repeat('A', 27).'...';
-$t->is(truncate_text($text), $truncated, 'text_truncate() adds ... to truncated text');
+$t->is(truncate_text($text), $truncated, 'truncate_text() adds ... to truncated text');
 
 $text = str_repeat('A', 35);
 $truncated = str_repeat('A', 22).'...';
-$t->is(truncate_text($text, 25), $truncated, 'text_truncate() takes the max length as its second argument');
+$t->is(truncate_text($text, 25), $truncated, 'truncate_text() takes the max length as its second argument');
 
 $text = str_repeat('A', 35);
 $truncated = str_repeat('A', 21).'BBBB';
-$t->is(truncate_text($text, 25, 'BBBB'), $truncated, 'text_truncate() takes the ... text as its third argument');
+$t->is(truncate_text($text, 25, 'BBBB'), $truncated, 'truncate_text() takes the ... text as its third argument');
 
 $text = str_repeat('A', 10).str_repeat(' ', 10).str_repeat('A', 10);
 $truncated_true = str_repeat('A', 10).'...';
 $truncated_false = str_repeat('A', 10).str_repeat(' ', 2).'...';
-$t->is(truncate_text($text, 15, '...', false), $truncated_false, 'text_truncate() accepts a truncate lastspace boolean as its fourth argument');
-$t->is(truncate_text($text, 15, '...', true), $truncated_true, 'text_truncate() accepts a truncate lastspace boolean as its fourth argument');
+$t->is(truncate_text($text, 15, '...', false), $truncated_false, 'truncate_text() accepts a truncate lastspace boolean as its fourth argument');
+$t->is(truncate_text($text, 15, '...', true), $truncated_true, 'truncate_text() accepts a truncate lastspace boolean as its fourth argument');
 
-if(extension_loaded('mbstring'))
+if (extension_loaded('mbstring'))
 {
   $oldEncoding = mb_internal_encoding();
-  $t->is(truncate_text('のビヘイビアにパラメーターを渡すことで特定のモデルでのフォーム生成を無効にできます', 11), 'のビヘイビアにパ...', 'text_truncate() handles unicode characters using mbstring if available');
-  $t->is(mb_internal_encoding(), $oldEncoding, 'text_truncate() sets back the internal encoding in case it changes it');
+  $t->is(truncate_text('のビヘイビアにパラメーターを渡すことで特定のモデルでのフォーム生成を無効にできます', 11), 'のビヘイビアにパ...', 'truncate_text() handles unicode characters using mbstring if available');
+  $t->is(mb_internal_encoding(), $oldEncoding, 'truncate_text() sets back the internal encoding in case it changes it');
 }
 else
 {
   $t->skip('mbstring extension is not enabled', 2);
 }
 
+$text = 'Web applications spend a large share of their code transforming arrays of data. PHP is a wonderful language for that, because it offers a lot of array manipulation functions. But web developers are actually required to translate business logic into a program - not to mess up with arrays. In fact, web developers should spend the least possible amount of tim';
+$result = 'Web applications spend a large share of their code transforming arrays of data. PHP is a wonderful language for that, because it offers a lot of array manipulation functions. But web developers are actually required to translate business logic into a program - not to mess up with arrays. [...]';
+
+$t->is(truncate_text($text, 200, '[...]', false, '/[.]\s+?/', 0), $result, 'truncate_text() truncate text after the first found pattern after 200 characters');
+
+$result = 'Web applications spend a large share of their code transforming arrays of data. [...]';
+$t->is(truncate_text($text, 200, '[...]', false, '/[.]\s+?/'), $result, 'truncate_text() truncate text after the last found pattern before 200 characters');
+
+$text = 'Web applications spend a large share of their code transforming arrays of data. PHP is a wonderful language for that.';
+$t->is(truncate_text($text, 200, '[...]', false, '/[.]\s+?/'), $text, 'truncate_text() does nothing for a text that not exceed 200 characters');
+
+$text = 'Web applications spend a large share of their code transforming arrays of data PHP is a wonderful language for that, because it offers a lot of array manipulation functions But web developers are actually required to translate business logic into a program - not to mess up with arrays In fact, web developers should spend the least possible amount of tim';
+$result = 'Web applications spend a large share of their code transforming arrays of data PHP is a wonderful language for that, because it offers a lot of array manipulation functions But web developers are[...]';
+$t->is(truncate_text($text, 200, '[...]', false, '/[.]\s+?/', 0), $result, 'truncate_text() whitout truncate_pattern on text, truncate it just after 200 characters');
+
 // highlight_text()
 $t->diag('highlight_text()');
 $t->is(highlight_text("This is a beautiful morning", "beautiful"),
@@ -134,4 +149,5 @@
 $t->is(auto_link_text('<p>http://www.google.com/?q=symfony+link</p>', 'all', array(), true, 32, '***'), '<p><a href="http://www.google.com/?q=symfony+link">http://www.google.com/?q=symfony***</a></p>', 'auto_link_text() takes truncation parameters');
 $t->is(auto_link_text('<p>http://twitter.com/#!/fabpot</p>'),'<p><a href="http://twitter.com/#!/fabpot">http://twitter.com/#!/fabpot</a></p>',"auto_link_text() converts URLs with complex fragments to links");
 $t->is(auto_link_text('<p>http://twitter.com/#!/fabpot is Fabien Potencier on Twitter</p>'),'<p><a href="http://twitter.com/#!/fabpot">http://twitter.com/#!/fabpot</a> is Fabien Potencier on Twitter</p>',"auto_link_text() converts URLs with complex fragments and trailing text to links");
-
+$t->is(auto_link_text('hello '.$email_result, 'email_addresses'), 'hello '.$email_result, "auto_link_text() does not double-link emails");
+$t->is(auto_link_text('<p>Link '.$link_result.'</p>'), '<p>Link '.$link_result.'</p>', "auto_link_text() does not double-link emails");
diff --git a/lib/vendor/symfony/test/unit/helper/UrlHelperTest.php b/lib/vendor/symfony/test/unit/helper/UrlHelperTest.php
index 52d9c256f..e97862d99 100644
--- a/lib/vendor/symfony/test/unit/helper/UrlHelperTest.php
+++ b/lib/vendor/symfony/test/unit/helper/UrlHelperTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 require_once($_test_dir.'/unit/sfContextMock.class.php');
 
 class myController
@@ -52,9 +52,9 @@ public function getCSRFToken($secret = null)
 
 $context = sfContext::getInstance(array('controller' => 'myController', 'request' => 'myRequest'));
 
-require_once(dirname(__FILE__).'/../../../lib/helper/AssetHelper.php');
-require_once(dirname(__FILE__).'/../../../lib/helper/UrlHelper.php');
-require_once(dirname(__FILE__).'/../../../lib/helper/TagHelper.php');
+require_once(__DIR__.'/../../../lib/helper/AssetHelper.php');
+require_once(__DIR__.'/../../../lib/helper/UrlHelper.php');
+require_once(__DIR__.'/../../../lib/helper/TagHelper.php');
 
 // url_for()
 $t->diag('url_for()');
diff --git a/lib/vendor/symfony/test/unit/i18n/dataTest.php b/lib/vendor/symfony/test/unit/i18n/dataTest.php
index 2a666c177..b731ab72a 100644
--- a/lib/vendor/symfony/test/unit/i18n/dataTest.php
+++ b/lib/vendor/symfony/test/unit/i18n/dataTest.php
@@ -8,12 +8,12 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(92);
 
 $t->diag('i18n data');
-$en = unserialize(file_get_contents(dirname(__FILE__).'/../../../lib/i18n/data/en.dat'));
+$en = unserialize(file_get_contents(__DIR__.'/../../../lib/i18n/data/en.dat'));
 
 // check main keys
 foreach (array('Countries', 'Currencies', 'Languages', 'LocaleScript', 'NumberPatterns', 'Scripts', 'Types', 'Variants', 'Version', 'calendar', 'zoneStrings') as $entry)
diff --git a/lib/vendor/symfony/test/unit/i18n/extract/sfI18nExtractTest.php b/lib/vendor/symfony/test/unit/i18n/extract/sfI18nExtractTest.php
index 7c84f1853..334692ca9 100644
--- a/lib/vendor/symfony/test/unit/i18n/extract/sfI18nExtractTest.php
+++ b/lib/vendor/symfony/test/unit/i18n/extract/sfI18nExtractTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../../bootstrap/unit.php');
+require_once(__DIR__.'/../../../bootstrap/unit.php');
 
 $t = new lime_test(3);
 
@@ -20,7 +20,7 @@ class TestConfiguration extends sfApplicationConfiguration
 {
   public function getI18NGlobalDirs()
   {
-    return array(dirname(__FILE__).'/../fixtures');
+    return array(__DIR__.'/../fixtures');
   }
 }
 
diff --git a/lib/vendor/symfony/test/unit/i18n/extract/sfI18nPhpExtractorTest.php b/lib/vendor/symfony/test/unit/i18n/extract/sfI18nPhpExtractorTest.php
index a73dd7056..04f194cb0 100644
--- a/lib/vendor/symfony/test/unit/i18n/extract/sfI18nPhpExtractorTest.php
+++ b/lib/vendor/symfony/test/unit/i18n/extract/sfI18nPhpExtractorTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../../bootstrap/unit.php');
+require_once(__DIR__.'/../../../bootstrap/unit.php');
 
 $t = new lime_test(7);
 
diff --git a/lib/vendor/symfony/test/unit/i18n/extract/sfI18nYamlGeneratorExtractorTest.php b/lib/vendor/symfony/test/unit/i18n/extract/sfI18nYamlGeneratorExtractorTest.php
index 4dc060beb..d612b8395 100644
--- a/lib/vendor/symfony/test/unit/i18n/extract/sfI18nYamlGeneratorExtractorTest.php
+++ b/lib/vendor/symfony/test/unit/i18n/extract/sfI18nYamlGeneratorExtractorTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../../bootstrap/unit.php');
+require_once(__DIR__.'/../../../bootstrap/unit.php');
 
 $t = new lime_test(3);
 
diff --git a/lib/vendor/symfony/test/unit/i18n/extract/sfI18nYamlValidateExtractorTest.php b/lib/vendor/symfony/test/unit/i18n/extract/sfI18nYamlValidateExtractorTest.php
index 37eee57eb..22d57b85d 100644
--- a/lib/vendor/symfony/test/unit/i18n/extract/sfI18nYamlValidateExtractorTest.php
+++ b/lib/vendor/symfony/test/unit/i18n/extract/sfI18nYamlValidateExtractorTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../../bootstrap/unit.php');
+require_once(__DIR__.'/../../../bootstrap/unit.php');
 
 $t = new lime_test(2);
 
diff --git a/lib/vendor/symfony/test/unit/i18n/sfChoiceFormatTest.php b/lib/vendor/symfony/test/unit/i18n/sfChoiceFormatTest.php
index b182ada9b..e8a46b95a 100644
--- a/lib/vendor/symfony/test/unit/i18n/sfChoiceFormatTest.php
+++ b/lib/vendor/symfony/test/unit/i18n/sfChoiceFormatTest.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
-$t = new lime_test(89);
+$t = new lime_test(90);
 
 $n = new sfChoiceFormat();
 
@@ -97,6 +97,9 @@
 $t->is($n->format($strings[4][0], 1), $strings[4][1][1][1], '->format() returns the string that match the number');
 $t->is($n->format($strings[4][0], 12), $strings[4][1][1][2], '->format() returns the string that match the number');
 
+// test strings with some set notation
+$t->is($n->format("[0]Some text|[1,Inf] Some text (10)", 12), 'Some text (10)', '->format() does not take into account ranges that are not prefixed with |');
+
 // test set notation
 // tests adapted from Prado unit test suite
 $t->diag('set notation');
diff --git a/lib/vendor/symfony/test/unit/i18n/sfCultureInfoTest.php b/lib/vendor/symfony/test/unit/i18n/sfCultureInfoTest.php
index b0d1fe102..f45c2df41 100644
--- a/lib/vendor/symfony/test/unit/i18n/sfCultureInfoTest.php
+++ b/lib/vendor/symfony/test/unit/i18n/sfCultureInfoTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(67);
 
diff --git a/lib/vendor/symfony/test/unit/i18n/sfI18NTest.php b/lib/vendor/symfony/test/unit/i18n/sfI18NTest.php
index c3dce065e..4117ee033 100644
--- a/lib/vendor/symfony/test/unit/i18n/sfI18NTest.php
+++ b/lib/vendor/symfony/test/unit/i18n/sfI18NTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(34);
 
@@ -20,7 +20,7 @@ class TestConfiguration extends sfApplicationConfiguration
 {
   public function getI18NGlobalDirs()
   {
-    return array(dirname(__FILE__).'/fixtures');
+    return array(__DIR__.'/fixtures');
   }
 }
 
@@ -35,7 +35,7 @@ public function getI18NGlobalDirs()
 $t->is($i18n->getCulture(), 'fr', '->initialize() connects to the user.change_culture event');
 
 // passing a "culture" option to initialize() should set PHP locale
-if (class_exists('Locale') && ($en = Locale::lookup(array('en-US'), 'en-US', true)) && ($fr = Locale::lookup(array('fr-FR'), 'fr-FR', true)))
+if (version_compare(PHP_VERSION, '5.3', '<') && class_exists('Locale') && ($en = Locale::lookup(array('en-US'), 'en-US', true)) && ($fr = Locale::lookup(array('fr-FR'), 'fr-FR', true)))
 {
   $i18n = new sfI18N($configuration, $cache, array('culture' => $fr));
   $frLocale = localeconv();
@@ -45,7 +45,7 @@ public function getI18NGlobalDirs()
 }
 else
 {
-  $t->skip('Locale class or English and French locales are not installed');
+  $t->skip('PHP version > 5.2 or Locale class or English and French locales are not installed');
 }
 
 // ->getCulture() ->setCulture()
diff --git a/lib/vendor/symfony/test/unit/i18n/sfMessageSourceTest.php b/lib/vendor/symfony/test/unit/i18n/sfMessageSourceTest.php
index 077675e39..f259ec408 100644
--- a/lib/vendor/symfony/test/unit/i18n/sfMessageSourceTest.php
+++ b/lib/vendor/symfony/test/unit/i18n/sfMessageSourceTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(3);
 
diff --git a/lib/vendor/symfony/test/unit/i18n/sfMessageSource_AggregateTest.php b/lib/vendor/symfony/test/unit/i18n/sfMessageSource_AggregateTest.php
index 45ca4d6ef..e853137b3 100644
--- a/lib/vendor/symfony/test/unit/i18n/sfMessageSource_AggregateTest.php
+++ b/lib/vendor/symfony/test/unit/i18n/sfMessageSource_AggregateTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(9);
 
@@ -22,8 +22,8 @@
 mkdir($temp2);
 
 // copy fixtures to tmp directory
-copy(dirname(__FILE__).'/fixtures/messages.fr.xml', $temp1.'/messages.fr.xml');
-copy(dirname(__FILE__).'/fixtures/messages_bis.fr.xml', $temp2.'/messages.fr.xml');
+copy(__DIR__.'/fixtures/messages.fr.xml', $temp1.'/messages.fr.xml');
+copy(__DIR__.'/fixtures/messages_bis.fr.xml', $temp2.'/messages.fr.xml');
 
 $source = get_source($temp1, $temp2);
 $source->setCulture('fr_FR');
diff --git a/lib/vendor/symfony/test/unit/i18n/sfMessageSource_FileTest.php b/lib/vendor/symfony/test/unit/i18n/sfMessageSource_FileTest.php
index 8de1b6319..5bd44855b 100644
--- a/lib/vendor/symfony/test/unit/i18n/sfMessageSource_FileTest.php
+++ b/lib/vendor/symfony/test/unit/i18n/sfMessageSource_FileTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(7);
 
@@ -26,7 +26,7 @@ public function getCatalogueByDir($catalogue)
   }
 }
 
-$source = sfMessageSource::factory('Simple', dirname(__FILE__).'/fixtures');
+$source = sfMessageSource::factory('Simple', __DIR__.'/fixtures');
 $source->setCulture('fr_FR');
 
 // ->getCatalogueByDir()
@@ -39,7 +39,7 @@ public function getCatalogueByDir($catalogue)
 
 // ->getSource()
 $t->diag('->getSource()');
-$t->is($source->getSource('fr_FR/messages.xml'), dirname(__FILE__).'/fixtures/fr_FR/messages.xml', '->getSource() returns the full path name to a specific variant');
+$t->is($source->getSource('fr_FR/messages.xml'), __DIR__.'/fixtures/fr_FR/messages.xml', '->getSource() returns the full path name to a specific variant');
 
 // ->isValidSource()
 $t->diag('->isValidSource()');
diff --git a/lib/vendor/symfony/test/unit/i18n/sfMessageSource_SQLiteTest.php b/lib/vendor/symfony/test/unit/i18n/sfMessageSource_SQLiteTest.php
index 906b1026e..6e71be1fa 100644
--- a/lib/vendor/symfony/test/unit/i18n/sfMessageSource_SQLiteTest.php
+++ b/lib/vendor/symfony/test/unit/i18n/sfMessageSource_SQLiteTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $plan = 10;
 $t = new lime_test($plan);
@@ -20,7 +20,7 @@
 }
 
 // setup
-$temp = dirname(__FILE__).'/'.rand(11111, 99999);
+$temp = __DIR__.'/'.rand(11111, 99999);
 sf_test_shutdown();
 
 register_shutdown_function('sf_test_shutdown');
@@ -84,16 +84,37 @@ function sf_test_shutdown()
 
 function init_fixtures($temp)
 {
-  $db = sqlite_open($temp);
+  $queries = array(
+    'CREATE TABLE catalogue (cat_id INTEGER PRIMARY KEY, name VARCHAR NOT NULL, source_lang VARCHAR, target_lang VARCHAR, date_created INT, date_modified INT, author VARCHAR);',
+    'CREATE TABLE trans_unit (msg_id INTEGER PRIMARY KEY, cat_id INTEGER NOT NULL DEFAULT \'1\', id VARCHAR, source TEXT, target TEXT, comments TEXT, date_added INT, date_modified INT, author VARCHAR, translated INT(1) NOT NULL DEFAULT \'0\');',
+    "INSERT INTO catalogue (cat_id, name) VALUES (1, 'messages.fr_FR')",
+    "INSERT INTO catalogue (cat_id, name) VALUES (2, 'messages.it')",
+    "INSERT INTO trans_unit (msg_id, cat_id, id, source, target, translated) VALUES (1, 1, 1, 'an english sentence', 'une phrase en français', 1)",
+    "INSERT INTO trans_unit (msg_id, cat_id, id, source, target, translated) VALUES (2, 1, 2, 'another english sentence', 'une autre phrase en français', 1)",
+  );
+
+  if (version_compare(PHP_VERSION, '5.3', '>'))
+  {
+    $db = new SQLite3($temp);
+
+    foreach ($queries as $query)
+    {
+      $db->exec($query);
+    }
+
+    $db->close();
+  }
+  else
+  {
+    $db = sqlite_open($temp);
 
-  sqlite_query('CREATE TABLE catalogue (cat_id INTEGER PRIMARY KEY, name VARCHAR NOT NULL, source_lang VARCHAR, target_lang VARCHAR, date_created INT, date_modified INT, author VARCHAR);', $db);
-  sqlite_query('CREATE TABLE trans_unit (msg_id INTEGER PRIMARY KEY, cat_id INTEGER NOT NULL DEFAULT \'1\', id VARCHAR, source TEXT, target TEXT, comments TEXT, date_added INT, date_modified INT, author VARCHAR, translated INT(1) NOT NULL DEFAULT \'0\');', $db);
-  sqlite_query("INSERT INTO catalogue (cat_id, name) VALUES (1, 'messages.fr_FR')", $db);
-  sqlite_query("INSERT INTO catalogue (cat_id, name) VALUES (2, 'messages.it')", $db);
-  sqlite_query("INSERT INTO trans_unit (msg_id, cat_id, id, source, target, translated) VALUES (1, 1, 1, 'an english sentence', 'une phrase en français', 1)", $db);
-  sqlite_query("INSERT INTO trans_unit (msg_id, cat_id, id, source, target, translated) VALUES (2, 1, 2, 'another english sentence', 'une autre phrase en français', 1)", $db);
+    foreach ($queries as $query)
+    {
+      sqlite_query($query, $db);
+    }
 
-  sqlite_close($db);
+    sqlite_close($db);
+  }
 
   return sfMessageSource::factory('SQLite', 'sqlite://localhost/'.$temp);
 }
diff --git a/lib/vendor/symfony/test/unit/i18n/sfMessageSource_XLIFFTest.php b/lib/vendor/symfony/test/unit/i18n/sfMessageSource_XLIFFTest.php
index 6b5a8e384..8c4abe6f1 100644
--- a/lib/vendor/symfony/test/unit/i18n/sfMessageSource_XLIFFTest.php
+++ b/lib/vendor/symfony/test/unit/i18n/sfMessageSource_XLIFFTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(11);
 
@@ -18,7 +18,7 @@
 mkdir($temp);
 
 // copy fixtures to tmp directory
-copy(dirname(__FILE__).'/fixtures/messages.fr.xml', $temp.'/messages.fr.xml');
+copy(__DIR__.'/fixtures/messages.fr.xml', $temp.'/messages.fr.xml');
 
 $source = sfMessageSource::factory('XLIFF', $temp);
 $source->setCulture('fr_FR');
diff --git a/lib/vendor/symfony/test/unit/i18n/sfNumberFormatInfoTest.php b/lib/vendor/symfony/test/unit/i18n/sfNumberFormatInfoTest.php
index 1abc80edb..641fde3fa 100644
--- a/lib/vendor/symfony/test/unit/i18n/sfNumberFormatInfoTest.php
+++ b/lib/vendor/symfony/test/unit/i18n/sfNumberFormatInfoTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(75);
 
diff --git a/lib/vendor/symfony/test/unit/log/sfAggregateLoggerTest.php b/lib/vendor/symfony/test/unit/log/sfAggregateLoggerTest.php
index 3b4910ad6..550249d76 100644
--- a/lib/vendor/symfony/test/unit/log/sfAggregateLoggerTest.php
+++ b/lib/vendor/symfony/test/unit/log/sfAggregateLoggerTest.php
@@ -8,13 +8,13 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(6);
 
 $dispatcher = new sfEventDispatcher();
 
-require_once(dirname(__FILE__).'/../../../lib/util/sfToolkit.class.php');
+require_once(__DIR__.'/../../../lib/util/sfToolkit.class.php');
 $file = sys_get_temp_dir().DIRECTORY_SEPARATOR.'sf_log_file.txt';
 if (file_exists($file))
 {
diff --git a/lib/vendor/symfony/test/unit/log/sfConsoleLoggerTest.php b/lib/vendor/symfony/test/unit/log/sfConsoleLoggerTest.php
index 03e276f3c..e694aa01c 100644
--- a/lib/vendor/symfony/test/unit/log/sfConsoleLoggerTest.php
+++ b/lib/vendor/symfony/test/unit/log/sfConsoleLoggerTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(1);
 
diff --git a/lib/vendor/symfony/test/unit/log/sfFileLoggerTest.php b/lib/vendor/symfony/test/unit/log/sfFileLoggerTest.php
index 57ccfd8ce..81fa52a58 100644
--- a/lib/vendor/symfony/test/unit/log/sfFileLoggerTest.php
+++ b/lib/vendor/symfony/test/unit/log/sfFileLoggerTest.php
@@ -8,11 +8,11 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(7);
 
-require_once(dirname(__FILE__).'/../../../lib/util/sfToolkit.class.php');
+require_once(__DIR__.'/../../../lib/util/sfToolkit.class.php');
 $file = sys_get_temp_dir().DIRECTORY_SEPARATOR.'sf_log_file.txt';
 if (file_exists($file))
 {
diff --git a/lib/vendor/symfony/test/unit/log/sfLoggerTest.php b/lib/vendor/symfony/test/unit/log/sfLoggerTest.php
index 606731665..23d21ef21 100644
--- a/lib/vendor/symfony/test/unit/log/sfLoggerTest.php
+++ b/lib/vendor/symfony/test/unit/log/sfLoggerTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(136);
 
diff --git a/lib/vendor/symfony/test/unit/log/sfLoggerWrapperTest.php b/lib/vendor/symfony/test/unit/log/sfLoggerWrapperTest.php
index 061678b49..f3def97ce 100644
--- a/lib/vendor/symfony/test/unit/log/sfLoggerWrapperTest.php
+++ b/lib/vendor/symfony/test/unit/log/sfLoggerWrapperTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(2);
 
diff --git a/lib/vendor/symfony/test/unit/log/sfStreamLoggerTest.php b/lib/vendor/symfony/test/unit/log/sfStreamLoggerTest.php
index b0c541de8..ce8dadd15 100644
--- a/lib/vendor/symfony/test/unit/log/sfStreamLoggerTest.php
+++ b/lib/vendor/symfony/test/unit/log/sfStreamLoggerTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(1);
 
diff --git a/lib/vendor/symfony/test/unit/log/sfVarLoggerTest.php b/lib/vendor/symfony/test/unit/log/sfVarLoggerTest.php
index 7083ac5a1..946e7b7f5 100644
--- a/lib/vendor/symfony/test/unit/log/sfVarLoggerTest.php
+++ b/lib/vendor/symfony/test/unit/log/sfVarLoggerTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(9);
 
diff --git a/lib/vendor/symfony/test/unit/log/sfWebDebugLoggerTest.php b/lib/vendor/symfony/test/unit/log/sfWebDebugLoggerTest.php
index fed9b405c..2c7bd5928 100644
--- a/lib/vendor/symfony/test/unit/log/sfWebDebugLoggerTest.php
+++ b/lib/vendor/symfony/test/unit/log/sfWebDebugLoggerTest.php
@@ -8,8 +8,8 @@
  * file that was distributed with this source code.
  */
 
-require_once dirname(__FILE__).'/../../bootstrap/unit.php';
-require_once dirname(__FILE__).'/../sfContextMock.class.php';
+require_once __DIR__.'/../../bootstrap/unit.php';
+require_once __DIR__.'/../sfContextMock.class.php';
 
 $t = new lime_test(1);
 
diff --git a/lib/vendor/symfony/test/unit/mailer/sfMailerTest.php b/lib/vendor/symfony/test/unit/mailer/sfMailerTest.php
old mode 100644
new mode 100755
index da056bc1e..ab1972706
--- a/lib/vendor/symfony/test/unit/mailer/sfMailerTest.php
+++ b/lib/vendor/symfony/test/unit/mailer/sfMailerTest.php
@@ -7,13 +7,11 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-require_once dirname(__FILE__) . '/../../bootstrap/unit.php';
-require_once sfConfig::get('sf_symfony_lib_dir').'/vendor/swiftmailer/classes/Swift.php';
-Swift::registerAutoload();
-sfMailer::initialize();
-require_once dirname(__FILE__).'/fixtures/TestMailerTransport.class.php';
-require_once dirname(__FILE__).'/fixtures/TestSpool.class.php';
-require_once dirname(__FILE__).'/fixtures/TestMailMessage.class.php';
+require_once __DIR__ . '/../../bootstrap/unit.php';
+require_once sfConfig::get('sf_symfony_lib_dir').'/vendor/swiftmailer/lib/swift_required.php';
+require_once __DIR__.'/fixtures/TestMailerTransport.class.php';
+require_once __DIR__.'/fixtures/TestSpool.class.php';
+require_once __DIR__.'/fixtures/TestMailMessage.class.php';
 
 $t = new lime_test(34);
 
diff --git a/lib/vendor/symfony/test/unit/plugin/sfPearDownloaderTest.class.php b/lib/vendor/symfony/test/unit/plugin/sfPearDownloaderTest.class.php
index 24880f917..3f8e8c286 100644
--- a/lib/vendor/symfony/test/unit/plugin/sfPearDownloaderTest.class.php
+++ b/lib/vendor/symfony/test/unit/plugin/sfPearDownloaderTest.class.php
@@ -16,7 +16,7 @@
  * @package    symfony
  * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPearDownloaderTest.class.php 5250 2007-09-24 08:11:50Z fabien $
+ * @version    SVN: $Id$
  */
 class sfPearDownloaderTest extends sfPearDownloader
 {
diff --git a/lib/vendor/symfony/test/unit/plugin/sfPearEnvironmentTest.php b/lib/vendor/symfony/test/unit/plugin/sfPearEnvironmentTest.php
index e35b359d6..4f54c8996 100644
--- a/lib/vendor/symfony/test/unit/plugin/sfPearEnvironmentTest.php
+++ b/lib/vendor/symfony/test/unit/plugin/sfPearEnvironmentTest.php
@@ -10,7 +10,7 @@
 
 error_reporting(error_reporting() & ~E_STRICT);
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(3);
 
@@ -21,9 +21,9 @@
   return;
 }
 
-require_once dirname(__FILE__).'/sfPearDownloaderTest.class.php';
-require_once dirname(__FILE__).'/sfPearRestTest.class.php';
-require_once dirname(__FILE__).'/sfPluginTestHelper.class.php';
+require_once __DIR__.'/sfPearDownloaderTest.class.php';
+require_once __DIR__.'/sfPearRestTest.class.php';
+require_once __DIR__.'/sfPluginTestHelper.class.php';
 
 // setup
 $temp = tempnam('/tmp/sf_plugin_test', 'tmp');
diff --git a/lib/vendor/symfony/test/unit/plugin/sfPearRestPluginTest.php b/lib/vendor/symfony/test/unit/plugin/sfPearRestPluginTest.php
index 98fd4fff6..b511055d9 100644
--- a/lib/vendor/symfony/test/unit/plugin/sfPearRestPluginTest.php
+++ b/lib/vendor/symfony/test/unit/plugin/sfPearRestPluginTest.php
@@ -10,7 +10,7 @@
 
 error_reporting(error_reporting() & ~E_STRICT);
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(5);
 
@@ -21,9 +21,9 @@
   return;
 }
 
-require_once dirname(__FILE__).'/sfPearDownloaderTest.class.php';
-require_once dirname(__FILE__).'/sfPearRestTest.class.php';
-require_once dirname(__FILE__).'/sfPluginTestHelper.class.php';
+require_once __DIR__.'/sfPearDownloaderTest.class.php';
+require_once __DIR__.'/sfPearRestTest.class.php';
+require_once __DIR__.'/sfPluginTestHelper.class.php';
 
 // setup
 $temp = tempnam('/tmp/sf_plugin_test', 'tmp');
diff --git a/lib/vendor/symfony/test/unit/plugin/sfPearRestTest.class.php b/lib/vendor/symfony/test/unit/plugin/sfPearRestTest.class.php
index 82d7c8b22..251f913fc 100644
--- a/lib/vendor/symfony/test/unit/plugin/sfPearRestTest.class.php
+++ b/lib/vendor/symfony/test/unit/plugin/sfPearRestTest.class.php
@@ -14,7 +14,7 @@
  * @package    symfony
  * @subpackage plugin
  * @author     Fabien Potencier <fabien.potencier@symfony-project.com>
- * @version    SVN: $Id: sfPearRestTest.class.php 5250 2007-09-24 08:11:50Z fabien $
+ * @version    SVN: $Id$
  */
 class sfPearRestTest extends sfPearRest
 {
diff --git a/lib/vendor/symfony/test/unit/plugin/sfPluginManagerTest.php b/lib/vendor/symfony/test/unit/plugin/sfPluginManagerTest.php
index 510bd47b5..76cd7e394 100644
--- a/lib/vendor/symfony/test/unit/plugin/sfPluginManagerTest.php
+++ b/lib/vendor/symfony/test/unit/plugin/sfPluginManagerTest.php
@@ -10,7 +10,7 @@
 
 error_reporting(error_reporting() & ~E_STRICT);
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(40);
 
@@ -21,9 +21,9 @@
   return;
 }
 
-require_once dirname(__FILE__).'/sfPearDownloaderTest.class.php';
-require_once dirname(__FILE__).'/sfPearRestTest.class.php';
-require_once dirname(__FILE__).'/sfPluginTestHelper.class.php';
+require_once __DIR__.'/sfPearDownloaderTest.class.php';
+require_once __DIR__.'/sfPearRestTest.class.php';
+require_once __DIR__.'/sfPluginTestHelper.class.php';
 
 // setup
 $temp = tempnam('/tmp/sf_plugin_test', 'tmp');
@@ -170,7 +170,7 @@ protected function isPluginCompatibleWithDependency($dependency)
 $t->ok($pluginManager->uninstallPlugin('sfTestPlugin'), '->uninstallPlugin() returns true if the plugin is properly uninstalled');
 $t->ok(!is_file($temp.'/plugins/sfTestPlugin/VERSION'), '->uninstallPlugin() uninstalls a plugin');
 
-$pluginManager->installPlugin(dirname(__FILE__).'/fixtures/http/pear.example.com/get/sfTestPlugin/sfTestPlugin-1.1.4.tgz');
+$pluginManager->installPlugin(__DIR__.'/fixtures/http/pear.example.com/get/sfTestPlugin/sfTestPlugin-1.1.4.tgz');
 $t->is(file_get_contents($temp.'/plugins/sfTestPlugin/VERSION'), '1.1.4', '->installPlugin() can install a local PEAR package');
 
 $t->ok($pluginManager->uninstallPlugin('sfTestPlugin'), '->uninstallPlugin() returns true if the plugin is properly uninstalled');
diff --git a/lib/vendor/symfony/test/unit/plugin/sfPluginTestHelper.class.php b/lib/vendor/symfony/test/unit/plugin/sfPluginTestHelper.class.php
index bcc8508de..102fc09be 100644
--- a/lib/vendor/symfony/test/unit/plugin/sfPluginTestHelper.class.php
+++ b/lib/vendor/symfony/test/unit/plugin/sfPluginTestHelper.class.php
@@ -16,12 +16,12 @@ static public function convertUrlToFixture($url)
       mkdir(dirname($dest), 0777, true);
     }
 
-    if (!file_exists(dirname(__FILE__).'/fixtures/'.$dir.'/'.$file))
+    if (!file_exists(__DIR__.'/fixtures/'.$dir.'/'.$file))
     {
       throw new sfException(sprintf('Unable to find fixture for %s (%s)', $url, $file));
     }
 
-    copy(dirname(__FILE__).'/fixtures/'.$dir.'/'.$file, $dest);
+    copy(__DIR__.'/fixtures/'.$dir.'/'.$file, $dest);
 
     return $dest;
   }
diff --git a/lib/vendor/symfony/test/unit/request/sfRequestTest.php b/lib/vendor/symfony/test/unit/request/sfRequestTest.php
old mode 100644
new mode 100755
index 980f62d2c..f91fd1941
--- a/lib/vendor/symfony/test/unit/request/sfRequestTest.php
+++ b/lib/vendor/symfony/test/unit/request/sfRequestTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 class myRequest extends sfRequest
 {
@@ -22,7 +22,7 @@ class fakeRequest
 {
 }
 
-$t = new lime_test(36);
+$t = new lime_test(41);
 
 $dispatcher = new sfEventDispatcher();
 
@@ -71,6 +71,19 @@ class fakeRequest
 unset($request['foo2']);
 $t->is(isset($request['foo2']), false, '->offsetUnset() unsets parameter by name');
 
+// ->getOption()
+$t->diag('->getOption()');
+$request = new myRequest($dispatcher, array(), array(), array('val_1' => 'value', 'val_2' => false));
+$t->is($request->getOption('val_1'), 'value', '->getOption() returns the option value if exists');
+$t->is($request->getOption('val_2'), false, '->getOption() returns the option value if exists');
+$t->is($request->getOption('none'), null, '->getOption() returns the option value if not exists');
+
+// ->getOption()
+$t->diag('->__clone()');
+$request = new myRequest($dispatcher);
+$requestClone = clone $request;
+$t->ok($request->getParameterHolder() !== $requestClone->getParameterHolder(), '->__clone() clone parameterHolder');
+$t->ok($request->getAttributeHolder() !== $requestClone->getAttributeHolder(), '->__clone() clone attributeHolder');
 
 $request = new myRequest($dispatcher);
 
diff --git a/lib/vendor/symfony/test/unit/request/sfWebRequestTest.php b/lib/vendor/symfony/test/unit/request/sfWebRequestTest.php
index 6e3b4306e..5af4a4e23 100644
--- a/lib/vendor/symfony/test/unit/request/sfWebRequestTest.php
+++ b/lib/vendor/symfony/test/unit/request/sfWebRequestTest.php
@@ -3,14 +3,14 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
-$t = new lime_test(72);
+$t = new lime_test(109);
 
 class myRequest extends sfWebRequest
 {
@@ -22,6 +22,12 @@ class myRequest extends sfWebRequest
 
   public function initialize(sfEventDispatcher $dispatcher, $parameters = array(), $attributes = array(), $options = array())
   {
+    if (isset($options['content_custom_only_for_test']))
+    {
+      $this->content = $options['content_custom_only_for_test'];
+      unset($options['content_custom_only_for_test']);
+    }
+
     parent::initialize($dispatcher, $parameters, $attributes, $options);
 
     if (null === self::$initialPathArrayKeys)
@@ -62,9 +68,17 @@ public function resetPathInfoArray()
 $_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en-us,en;q=0.5,fr;q=0.3';
 $t->is($request->getLanguages(), array('en_US', 'en', 'fr'), '->getLanguages() returns an array with all accepted languages');
 
+$request->languages = null;
+$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'i-cherokee';
+$t->is($request->getLanguages(), array('cherokee'), '->getLanguages() returns an array with all accepted languages');
+
+
 // ->getPreferredCulture()
 $t->diag('->getPreferredCulture()');
 
+$request->languages = array('fr');
+$t->is($request->getPreferredCulture(), 'fr', '->getPreferredCulture() returns the first given languages if no parameter given');
+
 $request->languages = null;
 $_SERVER['HTTP_ACCEPT_LANGUAGE'] = '';
 $t->is($request->getPreferredCulture(array('fr', 'en')), 'fr', '->getPreferredCulture() returns the first given culture if the client do not send an ACCEPT_LANGUAGE header');
@@ -82,6 +96,9 @@ public function resetPathInfoArray()
 
 $t->is($request->getCharsets(), array(), '->getCharsets() returns an empty array if the client do not send an ACCEPT_CHARSET header');
 
+$request->charsets = array('ISO-8859-1');
+$t->is($request->getCharsets(), array('ISO-8859-1'), '->getCharsets() returns an empty array if charsets are already defined');
+
 $request->charsets = null;
 $_SERVER['HTTP_ACCEPT_CHARSET'] = '';
 $t->is($request->getCharsets(), array(), '->getCharsets() returns an empty array if the client send an empty ACCEPT_CHARSET header');
@@ -95,28 +112,32 @@ public function resetPathInfoArray()
 
 $t->is($request->getAcceptableContentTypes(), array(), '->getAcceptableContentTypes() returns an empty array if the client do not send an ACCEPT header');
 
+$request->acceptableContentTypes = array('text/xml');
+$t->is($request->getAcceptableContentTypes(), array('text/xml'), '->getAcceptableContentTypes() returns an empty array if acceptableContentTypes are already set');
+
 $request->acceptableContentTypes = null;
 $_SERVER['HTTP_ACCEPT'] = '';
 $t->is($request->getAcceptableContentTypes(), array(), '->getAcceptableContentTypes() returns an empty array if the client send an empty ACCEPT header');
 
 $request->acceptableContentTypes = null;
 $_SERVER['HTTP_ACCEPT'] = 'text/xml,application/xhtml+xml,application/xml,text/html;q=0.9,text/plain;q=0.8,*/*;q=0.5';
-$t->is($request->getAcceptableContentTypes(), array('text/xml', 'application/xml', 'application/xhtml+xml', 'text/html', 'text/plain', '*/*'), '->getAcceptableContentTypes() returns an array with all accepted content types');
+$t->is($request->getAcceptableContentTypes(), array('text/xml', 'application/xhtml+xml', 'application/xml', 'text/html', 'text/plain', '*/*'), '->getAcceptableContentTypes() returns an array with all accepted content types');
 
 // ->splitHttpAcceptHeader()
 $t->diag('->splitHttpAcceptHeader()');
 
 $t->is($request->splitHttpAcceptHeader(''), array(), '->splitHttpAcceptHeader() returns an empty array if the header is empty');
-$t->is($request->splitHttpAcceptHeader('a,b,c'), array('c', 'b', 'a'), '->splitHttpAcceptHeader() returns an array of values');
+$t->is($request->splitHttpAcceptHeader('a,b,c'), array('a', 'b', 'c'), '->splitHttpAcceptHeader() returns an array of values');
 $t->is($request->splitHttpAcceptHeader('a,b;q=0.7,c;q=0.3'), array('a', 'b', 'c'), '->splitHttpAcceptHeader() strips the q value');
 $t->is($request->splitHttpAcceptHeader('a;q=0.1,b,c;q=0.3'), array('b', 'c', 'a'), '->splitHttpAcceptHeader() sorts values by the q value');
+$t->is($request->splitHttpAcceptHeader('a;q=0.3,b,c;q=0.3'), array('b', 'a', 'c'), '->splitHttpAcceptHeader() sorts values by the q value including equal values');
 $t->is($request->splitHttpAcceptHeader('a; q=0.1, b, c; q=0.3'), array('b', 'c', 'a'), '->splitHttpAcceptHeader() trims whitespaces');
 $t->is($request->splitHttpAcceptHeader('a; q=0, b'), array('b'), '->splitHttpAcceptHeader() removes values when q = 0 (as per the RFC)');
 
 // ->getRequestFormat() ->setRequestFormat()
 $t->diag('->getRequestFormat() ->setRequestFormat()');
 
-$t->ok(is_null($request->getRequestFormat()), '->getRequestFormat() returns null if the format is not defined in the request');
+$t->ok(null === $request->getRequestFormat(), '->getRequestFormat() returns null if the format is not defined in the request');
 $request->setParameter('sf_format', 'js');
 $t->is($request->getRequestFormat(), 'js', '->getRequestFormat() returns the request format');
 
@@ -126,6 +147,9 @@ public function resetPathInfoArray()
 // ->getFormat() ->setFormat()
 $t->diag('->getFormat() ->setFormat()');
 
+$customRequest = new myRequest($dispatcher, array(), array(), array('formats' => array('custom' => 'application/custom')));
+$t->is($customRequest->getFormat('application/custom'), 'custom', '->getFormat() returns the format for the given mime type if when is set as initialisation option');
+
 $request->setFormat('js', 'application/x-javascript');
 $t->is($request->getFormat('application/x-javascript'), 'js', '->getFormat() returns the format for the given mime type');
 $request->setFormat('js', array('application/x-javascript', 'text/js'));
@@ -163,6 +187,18 @@ public function resetPathInfoArray()
 $t->is($request->isSecure(), true, '->isSecure() checks the "HTTP_X_FORWARDED_PROTO" environment variable');
 $request->resetPathInfoArray();
 
+$request->setOption('trust_proxy', false);
+
+$_SERVER['HTTP_SSL_HTTPS'] = '1';
+$t->is($request->isSecure(), false, '->isSecure() not checks the "HTTP_SSL_HTTPS" environment variable when "trust_proxy" option is set to false');
+$request->resetPathInfoArray();
+
+$_SERVER['HTTP_X_FORWARDED_PROTO'] = '1';
+$t->is($request->isSecure(), false, '->isSecure() not checks the "HTTP_X_FORWARDED_PROTO" environment variable when "trust_proxy" option is set to false');
+$request->resetPathInfoArray();
+
+$request->setOption('trust_proxy', true);
+
 // ->getUriPrefix()
 $t->diag('->getUriPrefix()');
 
@@ -237,9 +273,86 @@ public function resetPathInfoArray()
 $_SERVER['HTTP_X_FORWARDED_FOR'] = '10.0.0.1, 10.0.0.2';
 $t->is_deeply($request->getForwardedFor(), array('10.0.0.1', '10.0.0.2'), '->getForwardedFor() returns the value from HTTP_X_FORWARDED_FOR');
 
+// ->getClientIp()
+$t->diag('->getClientIp()');
+
+$_SERVER['HTTP_CLIENT_IP'] = '127.1.1.1';
+$t->is($request->getClientIp(), '127.1.1.1', '->getClientIp() returns the value from HTTP_CLIENT_IP if it exists');
+unset($_SERVER['HTTP_CLIENT_IP']);
+
+$_SERVER['HTTP_X_FORWARDED_FOR'] = '10.0.0.1, 10.0.0.2';
+$t->is($request->getClientIp(), '10.0.0.1', '->getClientIp() returns the first HTTP_X_FORWARDED_FOR if it exists');
+unset($_SERVER['HTTP_X_FORWARDED_FOR']);
+
+$_SERVER['HTTP_CLIENT_IP'] = '127.1.1.1';
+$t->is($request->getClientIp(false), '127.0.0.1', '->getClientIp() returns the remote address even if HTTP_CLIENT_IP exists when "proxy" argument is set to false');
+unset($_SERVER['HTTP_CLIENT_IP']);
+
+$_SERVER['HTTP_X_FORWARDED_FOR'] = '10.0.0.1, 10.0.0.2';
+$t->is($request->getClientIp(false), '127.0.0.1', '->getClientIp() returns the remote address even if HTTP_X_FORWARDED_FOR exists when "proxy" argument is set to false');
+unset($_SERVER['HTTP_X_FORWARDED_FOR']);
+
+$t->is($request->getClientIp(false), '127.0.0.1', '->getClientIp() returns remote address by default');
+
+$request->setOption('trust_proxy', false);
+$_SERVER['HTTP_X_FORWARDED_FOR'] = '10.0.0.1, 10.0.0.2';
+$t->is($request->getClientIp(), '127.0.0.1', '->getClientIp() returns the remote address even if HTTP_X_FORWARDED_FOR exists when "trust_proxy" is set ot false');
+$request->setOption('trust_proxy', true);
+unset($_SERVER['HTTP_X_FORWARDED_FOR']);
+
+// ->getGetParameters() ->getGetParameter()
+$t->diag('->getGetParameters() ->getGetParameter()');
+
+$_GET['get_param'] = 'value';
+$request = new myRequest($dispatcher);
+$t->is($request->getGetParameters(), array('get_param' => 'value'), '->getGetParameters() returns GET parameters');
+$t->is($request->getGetParameter('get_param'), 'value', '->getGetParameter() returns GET parameter by name');
+unset($_GET['get_param']);
+
+// ->getPostParameters() ->getPostParameter()
+$t->diag('->getPostParameters() ->getPostParameter()');
+
+$_POST['post_param'] = 'value';
+$request = new myRequest($dispatcher);
+$t->is($request->getPostParameters(), array('post_param' => 'value'), '->getPostParameters() returns POST parameters');
+$t->is($request->getPostParameter('post_param'), 'value', '->getPostParameter() returns POST parameter by name');
+unset($_POST['post_param']);
+
 // ->getMethod()
 $t->diag('->getMethod()');
 
+$_SERVER['REQUEST_METHOD'] = 'none';
+$request = new myRequest($dispatcher);
+$t->is($request->getMethod(), 'GET', '->getMethod() returns GET by default');
+
+$_SERVER['REQUEST_METHOD'] = 'GET';
+$request = new myRequest($dispatcher);
+$t->is($request->getMethod(), 'GET', '->getMethod() returns GET if the method is GET');
+
+$_SERVER['REQUEST_METHOD'] = 'PUT';
+$request = new myRequest($dispatcher);
+$t->is($request->getMethod(), 'PUT', '->getMethod() returns PUT if the method is PUT');
+
+$_SERVER['REQUEST_METHOD'] = 'PUT';
+$_SERVER['CONTENT_TYPE'] = 'application/x-www-form-urlencoded';
+$request = new myRequest($dispatcher, array(), array(), array('content_custom_only_for_test' => 'first=value'));
+$t->is($request->getPostParameter('first'), 'value', '->getMethod() set POST parameters from parsed content if content type is "application/x-www-form-urlencoded" and the method is PUT');
+unset($_POST['first'], $_SERVER['CONTENT_TYPE']);
+
+$_SERVER['REQUEST_METHOD'] = 'DELETE';
+$request = new myRequest($dispatcher);
+$t->is($request->getMethod(), 'DELETE', '->getMethod() returns DELETE if the method is DELETE');
+
+$_SERVER['REQUEST_METHOD'] = 'DELETE';
+$_SERVER['CONTENT_TYPE'] = 'application/x-www-form-urlencoded';
+$request = new myRequest($dispatcher, array(), array(), array('content_custom_only_for_test' => 'first=value'));
+$t->is($request->getPostParameter('first'), 'value', '->getMethod() set POST parameters from parsed content if content type is "application/x-www-form-urlencoded" and the method is DELETE');
+unset($_POST['first'], $_SERVER['CONTENT_TYPE']);
+
+$_SERVER['REQUEST_METHOD'] = 'HEAD';
+$request = new myRequest($dispatcher);
+$t->is($request->getMethod(), 'HEAD', '->getMethod() returns DELETE if the method is HEAD');
+
 $_SERVER['REQUEST_METHOD'] = 'POST';
 $_POST['sf_method'] = 'PUT';
 $request = new myRequest($dispatcher);
@@ -255,6 +368,36 @@ public function resetPathInfoArray()
 $request = new myRequest($dispatcher);
 $t->is($request->getMethod(), 'POST', '->getMethod() returns the "sf_method" parameter value if it exists and if the method is POST');
 
+$_SERVER['REQUEST_METHOD'] = 'POST';
+$_GET['sf_method'] = 'PUT';
+$request = new myRequest($dispatcher);
+$t->is($request->getMethod(), 'PUT', '->getMethod() returns the "sf_method" parameter value if it exists and if the method is POST');
+
+$_SERVER['REQUEST_METHOD'] = 'POST';
+unset($_GET['sf_method']);
+$request = new myRequest($dispatcher);
+$t->is($request->getMethod(), 'POST', '->getMethod() returns the "sf_method" parameter value if it exists and if the method is POST');
+
+// ->isMethod()
+$t->diag('->isMethod()');
+
+$_SERVER['REQUEST_METHOD'] = 'POST';
+$request = new myRequest($dispatcher);
+$t->ok($request->isMethod('POST'), '->isMethod() returns true if the method is POST');
+
+// ->isXmlHttpRequest()
+$t->diag('->isXmlHttpRequest()');
+
+$_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest';
+$t->ok($request->isXmlHttpRequest(), '->isXmlHttpRequest() returns true if the method has HTTP_X_REQUESTED_WITH to XMLHttpRequest');
+
+// ->getCookie()
+$t->diag('->getCookie()');
+
+$_COOKIE['test'] = 'value';
+$request = new myRequest($dispatcher);
+$t->is($request->getCookie('test'), 'value', '->getCookie() returns value of cookie');
+
 // ->getScriptName()
 $t->diag('->getScriptName()');
 
@@ -305,8 +448,14 @@ public function resetPathInfoArray()
 $request = new myRequest($dispatcher);
 $t->is($request->getPathInfo(), '/', '->getPathInfo() returns the url path value if it not exists use default /');
 
+// -setRelativeUrlRoot() ->getRelativeUrlRoot()
+$t->diag('-setRelativeUrlRoot() ->getRelativeUrlRoot()');
+$t->is($request->getRelativeUrlRoot(), '', '->getRelativeUrlRoot() return computed relative url root');
+$request->setRelativeUrlRoot('toto');
+$t->is($request->getRelativeUrlRoot(), 'toto', '->getRelativeUrlRoot() return previously set relative url root');
+
 // ->addRequestParameters() ->getRequestParameters() ->fixParameters()
-$t->diag('getPathInfo');
+$t->diag('->addRequestParameters() ->getRequestParameters() ->fixParameters()');
 
 $request = new myRequest($dispatcher);
 $t->is($request->getRequestParameters(), array(), '->getRequestParameters() returns the request parameters default array');
@@ -321,6 +470,10 @@ public function resetPathInfoArray()
 $t->is($request->getRequestParameters(), array('test' => 'test', 'test2' => 'test2', '_sf_ignore_cache' => 1), '->getRequestParameters() returns the request parameters check fixParameters call for special _sf_ params');
 $t->is($request->getAttribute('sf_ignore_cache'), 1, '->getAttribute() check special param is set as attribute');
 
+// ->getUrlParameter
+$t->diag('->getUrlParameter()');
+$t->is($request->getUrlParameter('test'), 'test', '->getUrlParameter() returns URL parameter by name');
+
 // ->checkCSRFProtection()
 $t->diag('->checkCSRFProtection()');
 
@@ -368,6 +521,13 @@ public function getCSRFToken($secret = null)
 $t->is($request->getContentType(), 'text/html', '->getContentType() strips the charset information by default');
 $t->is($request->getContentType(false), 'text/html; charset=UTF-8', '->getContentType() does not strip the charset information by defaultif you pass false as the first argument');
 
+// ->getReferer()
+$t->diag('->getReferer()');
+
+$request = new myRequest($dispatcher);
+$_SERVER['HTTP_REFERER'] = 'http://domain';
+$t->is($request->getReferer(), 'http://domain', '->getContentType() returns the content type');
+
 // ->getHost()
 $t->diag('->getHost()');
 
@@ -375,3 +535,47 @@ public function getCSRFToken($secret = null)
 $_SERVER['HTTP_X_FORWARDED_HOST'] = 'example1.com, example2.com, example3.com';
 $t->is($request->getHost(), 'example3.com', '->getHost() returns the last forwarded host');
 unset($_SERVER['HTTP_X_FORWARDED_HOST']);
+
+$_SERVER['HTTP_HOST'] = 'symfony-project.org';
+$t->is($request->getHost(), 'symfony-project.org', '->getHost() returns the host');
+
+$request->setOption('trust_proxy', false);
+$_SERVER['HTTP_X_FORWARDED_HOST'] = 'example1.com, example2.com, example3.com';
+$t->is($request->getHost(), 'symfony-project.org', '->getHost() returns the host even if forwarded host is define when "trust_proxy" option is set to false');
+unset($_SERVER['HTTP_X_FORWARDED_HOST']);
+
+// ->getFiles()
+$t->diag('->getFiles()');
+
+$_FILES = array(
+  'article' => array(
+    'name' => array(
+      'media' => '1.png',
+    ),
+    'type' => array(
+      'media' => 'image/png',
+    ),
+    'tmp_name' => array(
+      'media' => '/private/var/tmp/phpnTrAJG',
+    ),
+    'error' => array(
+      'media' => 0,
+    ),
+    'size' => array(
+      'media' => 899,
+    ),
+  ),
+);
+$taintedFiles = array(
+  'article' => array(
+    'media' => array (
+      'error'    => 0,
+      'name'     => '1.png',
+      'type'     => 'image/png',
+      'tmp_name' => '/private/var/tmp/phpnTrAJG',
+      'size'     => 899,
+    ),
+  ),
+);
+$t->is_deeply($request->getFiles(), $taintedFiles, '->getFiles() return clean array extracted from $_FILES');
+
diff --git a/lib/vendor/symfony/test/unit/response/sfResponseTest.php b/lib/vendor/symfony/test/unit/response/sfResponseTest.php
index 61a9c6cd5..31aad5842 100644
--- a/lib/vendor/symfony/test/unit/response/sfResponseTest.php
+++ b/lib/vendor/symfony/test/unit/response/sfResponseTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 class myResponse extends sfResponse
 {
diff --git a/lib/vendor/symfony/test/unit/response/sfWebResponseTest.php b/lib/vendor/symfony/test/unit/response/sfWebResponseTest.php
index f3a581fe5..0697da8d8 100644
--- a/lib/vendor/symfony/test/unit/response/sfWebResponseTest.php
+++ b/lib/vendor/symfony/test/unit/response/sfWebResponseTest.php
@@ -3,14 +3,14 @@
 /*
  * This file is part of the symfony package.
  * (c) 2004-2006 Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
-$t = new lime_test(83);
+$t = new lime_test(89);
 
 class myWebResponse extends sfWebResponse
 {
@@ -134,13 +134,21 @@ public function normalizeHeaderName($name)
 $response->setContentType('text/html');
 $t->is(count($response->getHttpHeader('content-type')), 1, '->setContentType() overrides previous content type if replace is true');
 
-// ->getTitle() ->setTitle()
-$t->diag('->getTitle() ->setTitle()');
+// ->getTitle() ->setTitle() ->prependTitle
+$t->diag('->getTitle() ->setTitle() ->prependTitle()');
 $t->is($response->getTitle(), '', '->getTitle() returns an empty string by default');
 $response->setTitle('my title');
 $t->is($response->getTitle(), 'my title', '->setTitle() sets the title');
 $response->setTitle('fööbäär');
 $t->is($response->getTitle(), 'fööbäär', '->setTitle() will leave encoding intact');
+$response->setTitle(null);
+$t->is($response->getTitle(), '', '->setTitle() to null remove existing title');
+$response->prependTitle('my title');
+$t->is($response->getTitle(), 'my title', '->prependTitle() set title if no title has been set');
+$response->prependTitle('my subtitle');
+$t->is($response->getTitle(), 'my subtitle - my title', '->prependTitle() prepend title');
+$response->prependTitle('other title', ' | ');
+$t->is($response->getTitle(), 'other title | my subtitle - my title', '->prependTitle() prepend title with custom separator');
 
 // ->addHttpMeta()
 $t->diag('->addHttpMeta()');
@@ -224,12 +232,17 @@ public function normalizeHeaderName($name)
 $t->is($response->getStylesheets('first'), array('first' => array()), '->getStylesheets() takes a position as its first argument');
 $t->is($response->getStylesheets('last'), array('last' => array()), '->getStylesheets() takes a position as its first argument');
 
+// ->removeStylesheet()
 $t->diag('->removeStylesheet()');
 $response->removeStylesheet('foo');
-$t->is(array_keys($response->getStylesheets()), array('first', 'test', 'bar', 'last'), '->getStylesheets() removes a stylesheet from the response');
-
+$t->is(array_keys($response->getStylesheets()), array('first', 'test', 'bar', 'last'), '->removeStylesheet() removes a stylesheet from the response');
 $response->removeStylesheet('first');
-$t->is(array_keys($response->getStylesheets()), array('test', 'bar', 'last'), '->getStylesheets() removes a stylesheet from the response');
+$t->is(array_keys($response->getStylesheets()), array('test', 'bar', 'last'), '->removeStylesheet() removes a stylesheet from the response');
+
+// ->clearStylesheets()
+$t->diag('->clearStylesheets()');
+$response->clearStylesheets();
+$t->is($response->getStylesheets(), array(), '->clearStylesheets() removes all stylesheets from the response');
 
 // ->addJavascript()
 $t->diag('->addJavascript()');
@@ -260,13 +273,18 @@ public function normalizeHeaderName($name)
 $t->is($response->getJavascripts('first'), array('first_js' => array()), '->getJavascripts() takes a position as its first argument');
 $t->is($response->getJavascripts('last'), array('last_js' => array()), '->getJavascripts() takes a position as its first argument');
 
+// ->removeJavascript()
 $t->diag('->removeJavascript()');
 $response->removeJavascript('test');
 $t->is(array_keys($response->getJavascripts()), array('first_js', 'foo', 'last_js'), '->removeJavascripts() removes a javascript file');
-
 $response->removeJavascript('first_js');
 $t->is(array_keys($response->getJavascripts()), array('foo', 'last_js'), '->removeJavascripts() removes a javascript file');
 
+// ->clearJavascripts()
+$t->diag('->clearJavascripts()');
+$response->clearJavascripts();
+$t->is($response->clearJavascripts(), array(), '->clearJavascripts() removes all javascripts from the response');
+
 // ->setCookie() ->getCookies()
 $t->diag('->setCookie() ->getCookies()');
 $response->setCookie('foo', 'bar');
diff --git a/lib/vendor/symfony/test/unit/routing/fixtures/config_routing.yml.php b/lib/vendor/symfony/test/unit/routing/fixtures/config_routing.yml.php
new file mode 100644
index 000000000..2dc4a8a32
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/routing/fixtures/config_routing.yml.php
@@ -0,0 +1,3 @@
+<?php
+// auto-generated by sfRoutingConfigHandler
+$this->routes['test1'] = 'C:7:"sfRoute":1143:{a:11:{i:0;a:2:{i:0;a:4:{i:0;s:9:"separator";i:1;s:0:"";i:2;s:1:"/";i:3;N;}i:1;a:3:{i:0;s:9:"separator";i:1;s:1:"/";i:2;s:1:"/";}}i:1;a:9:{s:18:"load_configuration";b:1;s:6:"suffix";s:0:"";s:14:"default_module";s:7:"default";s:14:"default_action";s:5:"index";s:5:"debug";s:0:"";s:7:"logging";s:0:"";s:21:"generate_shortest_url";b:1;s:32:"extra_parameters_as_query_string";b:1;s:27:"lookup_cache_dedicated_keys";b:1;}i:2;a:16:{s:6:"suffix";s:0:"";s:17:"variable_prefixes";a:1:{i:0;s:1:":";}s:18:"segment_separators";a:2:{i:0;s:1:"/";i:1;s:1:".";}s:14:"variable_regex";s:8:"[\\w\\d_]+";s:10:"text_regex";s:3:".+?";s:21:"generate_shortest_url";b:1;s:32:"extra_parameters_as_query_string";b:1;s:18:"load_configuration";b:1;s:14:"default_module";s:7:"default";s:14:"default_action";s:5:"index";s:5:"debug";s:0:"";s:7:"logging";s:0:"";s:27:"lookup_cache_dedicated_keys";b:1;s:21:"variable_prefix_regex";s:6:"(?:\\:)";s:24:"segment_separators_regex";s:8:"(?:/|\\.)";s:22:"variable_content_regex";s:7:"[^/\\.]+";}i:3;s:1:"/";i:4;s:0:"";i:5;s:6:"#^/$#x";i:6;a:0:{}i:7;a:2:{s:6:"module";s:7:"default";s:6:"action";s:5:"index";}i:8;a:0:{}i:9;s:1:"/";i:10;b:0;}}';
diff --git a/lib/vendor/symfony/test/unit/routing/sfObjectRouteCollectionTest.php b/lib/vendor/symfony/test/unit/routing/sfObjectRouteCollectionTest.php
index d7c9418af..6d949f242 100644
--- a/lib/vendor/symfony/test/unit/routing/sfObjectRouteCollectionTest.php
+++ b/lib/vendor/symfony/test/unit/routing/sfObjectRouteCollectionTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(25);
 
diff --git a/lib/vendor/symfony/test/unit/routing/sfObjectRouteTest.php b/lib/vendor/symfony/test/unit/routing/sfObjectRouteTest.php
index e9dbcaa8e..441d753f0 100644
--- a/lib/vendor/symfony/test/unit/routing/sfObjectRouteTest.php
+++ b/lib/vendor/symfony/test/unit/routing/sfObjectRouteTest.php
@@ -3,12 +3,12 @@
 /*
  * This file is part of the symfony package.
  * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- * 
+ *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(1);
 
@@ -20,7 +20,7 @@ public function getid()
   }
 }
 
-// simulate Propel/Doctrine route
+// simulate Doctrine route
 class ObjectRoute extends sfObjectRoute
 {
   protected function doConvertObjectToArray($object)
diff --git a/lib/vendor/symfony/test/unit/routing/sfPatternRoutingTest.php b/lib/vendor/symfony/test/unit/routing/sfPatternRoutingTest.php
index 9a68f7584..20398fbe6 100644
--- a/lib/vendor/symfony/test/unit/routing/sfPatternRoutingTest.php
+++ b/lib/vendor/symfony/test/unit/routing/sfPatternRoutingTest.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
-$t = new lime_test(145);
+$t = new lime_test(149);
 
 class sfPatternRoutingTest extends sfPatternRouting
 {
@@ -38,6 +38,11 @@ public function isRouteLoaded($name)
   {
     return isset($this->routes[$name]) && is_object($this->routes[$name]);
   }
+
+  protected function getConfigFileName()
+  {
+    return __DIR__.'/fixtures/config_routing.yml.php';
+  }
 }
 
 class sfAlwaysAbsoluteRoute extends sfRoute
@@ -627,3 +632,15 @@ function configureRouting($event)
 $t->is($r->generate('', array('module' => 'posts', 'action' => 'index')), '/posts.html', '->generate() creates URL when using suffix and generate_shortest_url');
 $t->is($r->generate('', array('module' => 'posts', 'action' => 'index', 'page' => '1')), '/posts.html', '->generate() creates URL when using suffix and generate_shortest_url');
 $t->is($r->generate('', array('module' => 'posts', 'action' => 'index', 'page' => '2')), '/posts/2.html', '->generate() creates URL when using suffix and generate_shortest_url');
+
+
+$t->diag('load_configuration with serialized routes');
+
+// see fixtures/config_routing.yml.php
+$r = new sfPatternRoutingTest(new sfEventDispatcher(), new sfNoCache(), array('load_configuration' => true));
+$t->ok($r->hasRouteName('test1'), '->loadConfiguration() Config file is loaded');
+$routes = $r->getRoutes();
+$t->ok(is_string($routes['test1']), '->loadConfiguration() Route objects are not serialized in cache');
+$route = $r->getRoute('test1');
+$t->ok(is_object($route), '->loadConfiguration() Route objects are unserialized on demand');
+$t->is_deeply($r->parse('/'), array('module' => 'default', 'action' => 'index'), '->parse() Default parameters are applied to serialized routes');
diff --git a/lib/vendor/symfony/test/unit/routing/sfRequestRouteTest.php b/lib/vendor/symfony/test/unit/routing/sfRequestRouteTest.php
index 765b04df5..811fcfb51 100644
--- a/lib/vendor/symfony/test/unit/routing/sfRequestRouteTest.php
+++ b/lib/vendor/symfony/test/unit/routing/sfRequestRouteTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(8);
 
diff --git a/lib/vendor/symfony/test/unit/routing/sfRouteTest.php b/lib/vendor/symfony/test/unit/routing/sfRouteTest.php
index 3ad99537f..ff50cee0b 100644
--- a/lib/vendor/symfony/test/unit/routing/sfRouteTest.php
+++ b/lib/vendor/symfony/test/unit/routing/sfRouteTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(65);
 
@@ -270,4 +270,4 @@ public function isCompiled()
 $options = $route->getOptions();
 $t->is($options['options'], 'bar', '->getOptions() compiles the route and returns the compiled options');
 $t->is(count($options) > 1, true, '->getOptions() compiles the route and returns many compiled options');
-$t->is($route->isCompiled(), true, '->getOptions() compiles the route and returns compiled options');
\ No newline at end of file
+$t->is($route->isCompiled(), true, '->getOptions() compiles the route and returns compiled options');
diff --git a/lib/vendor/symfony/test/unit/service/fixtures/containers/container10.php b/lib/vendor/symfony/test/unit/service/fixtures/containers/container10.php
new file mode 100644
index 000000000..99b200a34
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/fixtures/containers/container10.php
@@ -0,0 +1,11 @@
+<?php
+
+require_once __DIR__.'/../includes/classes.php';
+
+$container = new sfServiceContainerBuilder();
+$container->
+  register('foo', 'FooClass')->
+  addArgument(new sfServiceReference('bar'))
+;
+
+return $container;
diff --git a/lib/vendor/symfony/test/unit/service/fixtures/containers/container8.php b/lib/vendor/symfony/test/unit/service/fixtures/containers/container8.php
new file mode 100644
index 000000000..19dc7819d
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/fixtures/containers/container8.php
@@ -0,0 +1,10 @@
+<?php
+
+$container = new sfServiceContainerBuilder();
+$container->setParameters(array(
+  'FOO'    => 'bar',
+  'bar'    => 'foo is %foo bar',
+  'values' => array(true, false, null, 0, 1000.3, 'true', 'false', 'null'),
+));
+
+return $container;
diff --git a/lib/vendor/symfony/test/unit/service/fixtures/containers/container9.php b/lib/vendor/symfony/test/unit/service/fixtures/containers/container9.php
new file mode 100644
index 000000000..c787ffa87
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/fixtures/containers/container9.php
@@ -0,0 +1,35 @@
+<?php
+
+require_once __DIR__.'/../includes/classes.php';
+
+$container = new sfServiceContainerBuilder();
+$container->
+  register('foo', 'FooClass')->
+  setConstructor('getInstance')->
+  setArguments(array('foo', new sfServiceReference('foo.baz'), array('%foo%' => 'foo is %foo%'), true, new sfServiceReference('service_container')))->
+  setFile(realpath(__DIR__.'/../includes/foo.php'))->
+  setShared(false)->
+  addMethodCall('setBar', array('bar'))->
+  addMethodCall('initialize')->
+  setConfigurator('sc_configure')
+;
+$container->
+  register('bar', 'FooClass')->
+  setArguments(array('foo', new sfServiceReference('foo.baz'), new sfServiceParameter('foo_bar')))->
+  setShared(true)->
+  setConfigurator(array(new sfServiceReference('foo.baz'), 'configure'))
+;
+$container->
+  register('foo.baz', '%baz_class%')->
+  setConstructor('getInstance')->
+  setConfigurator(array('%baz_class%', 'configureStatic1'))
+;
+$container->register('foo_bar', 'FooClass');
+$container->setParameters(array(
+  'baz_class' => 'BazClass',
+  'foo' => 'bar',
+  'foo_bar' => new sfServiceReference('foo_bar'),
+));
+$container->setAlias('alias_for_foo', 'foo');
+
+return $container;
diff --git a/lib/vendor/symfony/test/unit/service/fixtures/graphviz/services1.dot b/lib/vendor/symfony/test/unit/service/fixtures/graphviz/services1.dot
new file mode 100644
index 000000000..bcc9196e9
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/fixtures/graphviz/services1.dot
@@ -0,0 +1,7 @@
+digraph sc {
+  ratio="compress"
+  node [fontsize="11" fontname="Arial" shape="record"];
+  edge [fontsize="9" fontname="Arial" color="grey" arrowhead="open" arrowsize="0.5"];
+
+  node_service_container [label="service_container\nsfServiceContainerBuilder\n", shape=record, fillcolor="#9999ff", style="filled"];
+}
diff --git a/lib/vendor/symfony/test/unit/service/fixtures/graphviz/services10-1.dot b/lib/vendor/symfony/test/unit/service/fixtures/graphviz/services10-1.dot
new file mode 100644
index 000000000..980b51070
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/fixtures/graphviz/services10-1.dot
@@ -0,0 +1,10 @@
+digraph sc {
+  ratio="normal"
+  node [fontsize="13" fontname="Verdana" shape="square"];
+  edge [fontsize="12" fontname="Verdana" color="white" arrowhead="closed" arrowsize="1"];
+
+  node_foo [label="foo\nFooClass\n", shape=square, fillcolor="grey", style="filled"];
+  node_service_container [label="service_container\nsfServiceContainerBuilder\n", shape=square, fillcolor="green", style="empty"];
+  node_bar [label="bar\n\n", shape=square, fillcolor="red", style="empty"];
+  node_foo -> node_bar [label="" style="filled"];
+}
diff --git a/lib/vendor/symfony/test/unit/service/fixtures/graphviz/services10.dot b/lib/vendor/symfony/test/unit/service/fixtures/graphviz/services10.dot
new file mode 100644
index 000000000..9d7f3291c
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/fixtures/graphviz/services10.dot
@@ -0,0 +1,10 @@
+digraph sc {
+  ratio="compress"
+  node [fontsize="11" fontname="Arial" shape="record"];
+  edge [fontsize="9" fontname="Arial" color="grey" arrowhead="open" arrowsize="0.5"];
+
+  node_foo [label="foo\nFooClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_service_container [label="service_container\nsfServiceContainerBuilder\n", shape=record, fillcolor="#9999ff", style="filled"];
+  node_bar [label="bar\n\n", shape=record, fillcolor="#ff9999", style="filled"];
+  node_foo -> node_bar [label="" style="filled"];
+}
diff --git a/lib/vendor/symfony/test/unit/service/fixtures/graphviz/services9.dot b/lib/vendor/symfony/test/unit/service/fixtures/graphviz/services9.dot
new file mode 100644
index 000000000..724aabaf9
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/fixtures/graphviz/services9.dot
@@ -0,0 +1,15 @@
+digraph sc {
+  ratio="compress"
+  node [fontsize="11" fontname="Arial" shape="record"];
+  edge [fontsize="9" fontname="Arial" color="grey" arrowhead="open" arrowsize="0.5"];
+
+  node_foo [label="foo (alias_for_foo)\nFooClass\n", shape=record, fillcolor="#eeeeee", style="dotted"];
+  node_bar [label="bar\nFooClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_foo_baz [label="foo.baz\nBazClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_foo_bar [label="foo_bar\nFooClass\n", shape=record, fillcolor="#eeeeee", style="filled"];
+  node_service_container [label="service_container\nsfServiceContainerBuilder\n", shape=record, fillcolor="#9999ff", style="filled"];
+  node_foo -> node_foo_baz [label="" style="filled"];
+  node_foo -> node_service_container [label="" style="filled"];
+  node_bar -> node_foo_baz [label="" style="filled"];
+  node_bar -> node_foo_bar [label="" style="filled"];
+}
diff --git a/lib/vendor/symfony/test/unit/service/fixtures/includes/classes.php b/lib/vendor/symfony/test/unit/service/fixtures/includes/classes.php
new file mode 100644
index 000000000..764e259f6
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/fixtures/includes/classes.php
@@ -0,0 +1,32 @@
+<?php
+
+function sc_configure($instance)
+{
+  $instance->configure();
+}
+
+class BarClass
+{
+}
+
+class BazClass
+{
+  public function configure($instance)
+  {
+    $instance->configure();
+  }
+
+  static public function getInstance()
+  {
+    return new self();
+  }
+
+  static public function configureStatic($instance)
+  {
+    $instance->configure();
+  }
+
+  static public function configureStatic1()
+  {
+  }
+}
diff --git a/lib/vendor/symfony/test/unit/service/fixtures/includes/foo.php b/lib/vendor/symfony/test/unit/service/fixtures/includes/foo.php
new file mode 100644
index 000000000..841815155
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/fixtures/includes/foo.php
@@ -0,0 +1,34 @@
+<?php
+
+class FooClass
+{
+  public $bar = null, $initialized = false, $configured = false, $called = false, $arguments = array();
+
+  public function __construct($arguments = array())
+  {
+    $this->arguments = $arguments;
+  }
+
+  static public function getInstance($arguments = array())
+  {
+    $obj = new self($arguments);
+    $obj->called = true;
+
+    return $obj;
+  }
+
+  public function initialize()
+  {
+    $this->initialized = true;
+  }
+
+  public function configure()
+  {
+    $this->configured = true;
+  }
+
+  public function setBar($value = null)
+  {
+    $this->bar = $value;
+  }
+}
diff --git a/lib/vendor/symfony/test/unit/service/fixtures/php/services1-1.php b/lib/vendor/symfony/test/unit/service/fixtures/php/services1-1.php
new file mode 100644
index 000000000..1f5bd3428
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/fixtures/php/services1-1.php
@@ -0,0 +1,4 @@
+class Container extends AbstractContainer
+{
+  protected $shared = array();
+}
diff --git a/lib/vendor/symfony/test/unit/service/fixtures/php/services1.php b/lib/vendor/symfony/test/unit/service/fixtures/php/services1.php
new file mode 100644
index 000000000..22ed3b5bc
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/fixtures/php/services1.php
@@ -0,0 +1,4 @@
+class ProjectServiceContainer extends sfServiceContainer
+{
+  protected $shared = array();
+}
diff --git a/lib/vendor/symfony/test/unit/service/fixtures/php/services8.php b/lib/vendor/symfony/test/unit/service/fixtures/php/services8.php
new file mode 100644
index 000000000..60530ea82
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/fixtures/php/services8.php
@@ -0,0 +1,27 @@
+class ProjectServiceContainer extends sfServiceContainer
+{
+  protected $shared = array();
+
+  public function __construct()
+  {
+    parent::__construct($this->getDefaultParameters());
+  }
+
+  protected function getDefaultParameters()
+  {
+    return array(
+      'foo' => 'bar',
+      'bar' => 'foo is %foo bar',
+      'values' => array(
+        0 => true,
+        1 => false,
+        2 => NULL,
+        3 => 0,
+        4 => 1000.3,
+        5 => 'true',
+        6 => 'false',
+        7 => 'null',
+      ),
+    );
+  }
+}
diff --git a/lib/vendor/symfony/test/unit/service/fixtures/php/services9.php b/lib/vendor/symfony/test/unit/service/fixtures/php/services9.php
new file mode 100644
index 000000000..6fe62cc66
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/fixtures/php/services9.php
@@ -0,0 +1,64 @@
+class ProjectServiceContainer extends sfServiceContainer
+{
+  protected $shared = array();
+
+  public function __construct()
+  {
+    parent::__construct($this->getDefaultParameters());
+  }
+
+  protected function getFooService()
+  {
+    require_once '%path%/foo.php';
+
+    $instance = call_user_func(array('FooClass', 'getInstance'), 'foo', $this->getService('foo.baz'), array($this->getParameter('foo') => 'foo is '.$this->getParameter('foo')), true, $this);
+    $instance->setBar('bar');
+    $instance->initialize();
+    sc_configure($instance);
+
+    return $instance;
+  }
+
+  protected function getBarService()
+  {
+    if (isset($this->shared['bar'])) return $this->shared['bar'];
+
+    $instance = new FooClass('foo', $this->getService('foo.baz'), $this->getParameter('foo_bar'));
+    $this->getService('foo.baz')->configure($instance);
+
+    return $this->shared['bar'] = $instance;
+  }
+
+  protected function getFoo_BazService()
+  {
+    if (isset($this->shared['foo.baz'])) return $this->shared['foo.baz'];
+
+    $instance = call_user_func(array($this->getParameter('baz_class'), 'getInstance'));
+    call_user_func(array($this->getParameter('baz_class'), 'configureStatic1'), $instance);
+
+    return $this->shared['foo.baz'] = $instance;
+  }
+
+  protected function getFooBarService()
+  {
+    if (isset($this->shared['foo_bar'])) return $this->shared['foo_bar'];
+
+    $instance = new FooClass();
+
+    return $this->shared['foo_bar'] = $instance;
+  }
+
+  protected function getAliasForFooService()
+  {
+    return $this->getService('foo');
+  }
+
+  protected function getDefaultParameters()
+  {
+    return array(
+      'baz_class' => 'BazClass',
+      'foo' => 'bar',
+      'foo_bar' => new sfServiceReference('foo_bar'),
+    );
+  }
+}
diff --git a/lib/vendor/symfony/test/unit/service/fixtures/yaml/nonvalid1.yml b/lib/vendor/symfony/test/unit/service/fixtures/yaml/nonvalid1.yml
new file mode 100644
index 000000000..4eddb872b
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/fixtures/yaml/nonvalid1.yml
@@ -0,0 +1,2 @@
+foo:
+  bar
diff --git a/lib/vendor/symfony/test/unit/service/fixtures/yaml/nonvalid2.yml b/lib/vendor/symfony/test/unit/service/fixtures/yaml/nonvalid2.yml
new file mode 100644
index 000000000..02e4a84d6
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/fixtures/yaml/nonvalid2.yml
@@ -0,0 +1 @@
+false
\ No newline at end of file
diff --git a/lib/vendor/symfony/test/unit/service/fixtures/yaml/services1.yml b/lib/vendor/symfony/test/unit/service/fixtures/yaml/services1.yml
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/fixtures/yaml/services1.yml
@@ -0,0 +1 @@
+
diff --git a/lib/vendor/symfony/test/unit/service/fixtures/yaml/services2.yml b/lib/vendor/symfony/test/unit/service/fixtures/yaml/services2.yml
new file mode 100644
index 000000000..93d1cf518
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/fixtures/yaml/services2.yml
@@ -0,0 +1,9 @@
+parameters:
+  FOO: bar
+  values:
+    - true
+    - false
+    - 0
+    - 1000.3
+  bar: foo
+  foo_bar: "@foo_bar"
diff --git a/lib/vendor/symfony/test/unit/service/fixtures/yaml/services3.yml b/lib/vendor/symfony/test/unit/service/fixtures/yaml/services3.yml
new file mode 100644
index 000000000..3745347b4
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/fixtures/yaml/services3.yml
@@ -0,0 +1,20 @@
+services:
+  foo: { class: FooClass }
+  baz: { class: BazClass }
+  shared: { class: FooClass, shared: true }
+  non_shared: { class: FooClass, shared: false }
+  constructor: { class: FooClass, constructor: getInstance }
+  file: { class: FooClass, file: %path%/foo.php }
+  arguments: { class: FooClass, arguments: [foo, "@foo", [true, false]] }
+  configurator1: { class: FooClass, configurator: sc_configure }
+  configurator2: { class: FooClass, configurator: [@baz, configure] }
+  configurator3: { class: FooClass, configurator: [BazClass, configureStatic] }
+  method_call1:
+    class: FooClass
+    calls:
+      - [ setBar, [] ]
+  method_call2:
+    class: FooClass
+    calls:
+      - [ setBar, [ foo, @foo, [true, false] ] ]
+  alias_for_foo: @foo
diff --git a/lib/vendor/symfony/test/unit/service/sfServiceContainerBuilderTest.php b/lib/vendor/symfony/test/unit/service/sfServiceContainerBuilderTest.php
new file mode 100644
index 000000000..85db8a138
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/sfServiceContainerBuilderTest.php
@@ -0,0 +1,233 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once(__DIR__.'/../../bootstrap/unit.php');
+
+$t = new lime_test(48);
+
+// ->setServiceDefinitions() ->addServiceDefinitions() ->getServiceDefinitions() ->setServiceDefinition() ->getServiceDefinition() ->hasServiceDefinition()
+$t->diag('->setServiceDefinitions() ->addServiceDefinitions() ->getServiceDefinitions() ->setServiceDefinition() ->getServiceDefinition() ->hasServiceDefinition()');
+$builder = new sfServiceContainerBuilder();
+$definitions = array(
+  'foo' => new sfServiceDefinition('FooClass'),
+  'bar' => new sfServiceDefinition('BarClass'),
+);
+$builder->setServiceDefinitions($definitions);
+$t->is($builder->getServiceDefinitions(), $definitions, '->setServiceDefinitions() sets the service definitions');
+$t->ok($builder->hasServiceDefinition('foo'), '->hasServiceDefinition() returns true if a service definition exists');
+$t->ok(!$builder->hasServiceDefinition('foobar'), '->hasServiceDefinition() returns false if a service definition does not exist');
+
+$builder->setServiceDefinition('foobar', $foo = new sfServiceDefinition('FooBarClass'));
+$t->is($builder->getServiceDefinition('foobar'), $foo, '->getServiceDefinition() returns a service definition if defined');
+$t->ok($builder->setServiceDefinition('foobar', $foo = new sfServiceDefinition('FooBarClass')) === $foo, '->setServiceDefinition() implements a fuild interface by returning the service reference');
+
+$builder->addServiceDefinitions($defs = array('foobar' => new sfServiceDefinition('FooBarClass')));
+$t->is($builder->getServiceDefinitions(), array_merge($definitions, $defs), '->addServiceDefinitions() adds the service definitions');
+
+try
+{
+  $builder->getServiceDefinition('baz');
+  $t->fail('->getServiceDefinition() throws an InvalidArgumentException if the service definition does not exist');
+}
+catch (InvalidArgumentException $e)
+{
+  $t->pass('->getServiceDefinition() throws an InvalidArgumentException if the service definition does not exist');
+}
+
+// ->register()
+$t->diag('->register()');
+$builder = new sfServiceContainerBuilder();
+$builder->register('foo', 'FooClass');
+$t->ok($builder->hasServiceDefinition('foo'), '->register() registers a new service definition');
+$t->ok($builder->getServiceDefinition('foo') instanceof sfServiceDefinition, '->register() returns the newly created sfServiceDefinition instance');
+
+// ->setAlias()
+$t->diag('->setAlias()');
+$builder = new sfServiceContainerBuilder();
+$builder->register('foo', 'stdClass');
+$builder->setAlias('bar', 'foo');
+$t->ok($builder->hasService('bar'), '->setAlias() defines a new service');
+$t->ok($builder->getService('bar') === $builder->getService('foo'), '->setAlias() creates a service that is an alias to another one');
+
+// ->getAliases()
+$t->diag('->getAliases()');
+$builder = new sfServiceContainerBuilder();
+$builder->setAlias('bar', 'foo');
+$builder->setAlias('foobar', 'foo');
+$t->is($builder->getAliases(), array('bar' => 'foo', 'foobar' => 'foo'), '->getAliases() returns all service aliases');
+$builder->register('bar', 'stdClass');
+$t->is($builder->getAliases(), array('foobar' => 'foo'), '->getAliases() does not return aliased services that have been overridden');
+$builder->setService('foobar', 'stdClass');
+$t->is($builder->getAliases(), array(), '->getAliases() does not return aliased services that have been overridden');
+
+// ->hasService()
+$t->diag('->hasService()');
+$builder = new sfServiceContainerBuilder();
+$t->ok(!$builder->hasService('foo'), '->hasService() returns false if the service does not exist');
+$builder->register('foo', 'FooClass');
+$t->ok($builder->hasService('foo'), '->hasService() returns true if a service definition exists');
+$builder->setAlias('foobar', 'foo');
+$t->ok($builder->hasService('foo'), '->hasService() returns true if a service definition exists');
+$builder->setService('bar', new stdClass());
+$t->ok($builder->hasService('bar'), '->hasService() returns true if a service exists');
+$builder->setAlias('foobar2', 'foo');
+$t->ok($builder->hasService('foobar2'), '->hasService() returns true if a service exists');
+
+// ->getService()
+$t->diag('->getService()');
+$builder = new sfServiceContainerBuilder();
+try
+{
+  $builder->getService('foo');
+  $t->fail('->getService() throws an InvalidArgumentException if the service does not exist');
+}
+catch (InvalidArgumentException $e)
+{
+  $t->pass('->getService() throws an InvalidArgumentException if the service does not exist');
+}
+$builder->register('foo', 'stdClass');
+$t->ok(is_object($builder->getService('foo')), '->getService() returns the service definition associated with the id');
+$builder->setService('bar', $bar = new stdClass());
+$t->is($builder->getService('bar'), $bar, '->getService() returns the service associated with the id');
+$builder->register('bar', 'stdClass');
+$t->is($builder->getService('bar'), $bar, '->getService() returns the service associated with the id even if a definition has been defined');
+
+$builder->register('baz', 'stdClass')->setArguments(array(new sfServiceReference('baz')));
+try
+{
+  @$builder->getService('baz');
+  $t->fail('->getService() throws a LogicException if the service has a circular reference to itself');
+}
+catch (LogicException $e)
+{
+  $t->pass('->getService() throws a LogicException if the service has a circular reference to itself');
+}
+
+$builder->register('foobar', 'stdClass')->setShared(true);
+$t->ok($builder->getService('bar') === $builder->getService('bar'), '->getService() always returns the same instance if the service is shared');
+
+// ->getServiceIds()
+$t->diag('->getServiceIds()');
+$builder = new sfServiceContainerBuilder();
+$builder->register('foo', 'stdClass');
+$builder->bar = $bar = new stdClass();
+$builder->register('bar', 'stdClass');
+$t->is($builder->getServiceIds(), array('foo', 'bar', 'service_container'), '->getServiceIds() returns all defined service ids');
+
+// ->createService() # file
+$t->diag('->createService() # file');
+$builder = new sfServiceContainerBuilder();
+$builder->register('foo1', 'FooClass')->setFile(__DIR__.'/fixtures/includes/foo.php');
+$t->ok($builder->getService('foo1'), '->createService() requires the file defined by the service definition');
+$builder->register('foo2', 'FooClass')->setFile(__DIR__.'/fixtures/includes/%file%.php');
+$builder->setParameter('file', 'foo');
+$t->ok($builder->getService('foo2'), '->createService() replaces parameters in the file provided by the service definition');
+
+// ->createService() # class
+$t->diag('->createService() # class');
+$builder = new sfServiceContainerBuilder();
+$builder->register('foo1', '%class%');
+$builder->setParameter('class', 'stdClass');
+$t->ok($builder->getService('foo1') instanceof stdClass, '->createService() replaces parameters in the class provided by the service definition');
+
+// ->createService() # arguments
+$t->diag('->createService() # arguments');
+$builder = new sfServiceContainerBuilder();
+$builder->register('bar', 'stdClass');
+$builder->register('foo1', 'FooClass')->addArgument(array('foo' => '%value%', '%value%' => 'foo', new sfServiceReference('bar')));
+$builder->setParameter('value', 'bar');
+$t->is($builder->getService('foo1')->arguments, array('foo' => 'bar', 'bar' => 'foo', $builder->getService('bar')), '->createService() replaces parameters and service references in the arguments provided by the service definition');
+
+// ->createService() # constructor
+$t->diag('->createService() # constructor');
+$builder = new sfServiceContainerBuilder();
+$builder->register('bar', 'stdClass');
+$builder->register('foo1', 'FooClass')->setConstructor('getInstance')->addArgument(array('foo' => '%value%', '%value%' => 'foo', new sfServiceReference('bar')));
+$builder->setParameter('value', 'bar');
+$t->ok($builder->getService('foo1')->called, '->createService() calls the constructor to create the service instance');
+$t->is($builder->getService('foo1')->arguments, array('foo' => 'bar', 'bar' => 'foo', $builder->getService('bar')), '->createService() passes the arguments to the constructor');
+
+// ->createService() # method calls
+$t->diag('->createService() # method calls');
+$builder = new sfServiceContainerBuilder();
+$builder->register('bar', 'stdClass');
+$builder->register('foo1', 'FooClass')->addMethodCall('setBar', array(array('%value%', new sfServiceReference('bar'))));
+$builder->setParameter('value', 'bar');
+$t->is($builder->getService('foo1')->bar, array('bar', $builder->getService('bar')), '->createService() replaces the values in the method calls arguments');
+
+// ->createService() # configurator
+require_once __DIR__.'/fixtures/includes/classes.php';
+$t->diag('->createService() # configurator');
+$builder = new sfServiceContainerBuilder();
+$builder->register('foo1', 'FooClass')->setConfigurator('sc_configure');
+$t->ok($builder->getService('foo1')->configured, '->createService() calls the configurator');
+
+$builder->register('foo2', 'FooClass')->setConfigurator(array('%class%', 'configureStatic'));
+$builder->setParameter('class', 'BazClass');
+$t->ok($builder->getService('foo2')->configured, '->createService() calls the configurator');
+
+$builder->register('baz', 'BazClass');
+$builder->register('foo3', 'FooClass')->setConfigurator(array(new sfServiceReference('baz'), 'configure'));
+$t->ok($builder->getService('foo3')->configured, '->createService() calls the configurator');
+
+$builder->register('foo4', 'FooClass')->setConfigurator('foo');
+try
+{
+  $builder->getService('foo4');
+  $t->fail('->createService() throws an InvalidArgumentException if the configure callable is not a valid callable');
+}
+catch (InvalidArgumentException $e)
+{
+  $t->pass('->createService() throws an InvalidArgumentException if the configure callable is not a valid callable');
+}
+
+// ->resolveValue()
+$t->diag('->resolveValue()');
+$builder = new sfServiceContainerBuilder();
+$t->is($builder->resolveValue('foo'), 'foo', '->resolveValue() returns its argument unmodified if no placeholders are found');
+$builder->setParameter('foo', 'bar');
+$t->is($builder->resolveValue('I\'m a %foo%'), 'I\'m a bar', '->resolveValue() replaces placeholders by their values');
+$builder->setParameter('foo', true);
+$t->ok($builder->resolveValue('%foo%') === true, '->resolveValue() replaces arguments that are just a placeholder by their value without casting them to strings');
+
+$builder->setParameter('foo', 'bar');
+$t->is($builder->resolveValue(array('%foo%' => '%foo%')), array('bar' => 'bar'), '->resolveValue() replaces placeholders in keys and values of arrays');
+
+$t->is($builder->resolveValue(array('%foo%' => array('%foo%' => array('%foo%' => '%foo%')))), array('bar' => array('bar' => array('bar' => 'bar'))), '->resolveValue() replaces placeholders in nested arrays');
+
+$t->is($builder->resolveValue('I\'m a %%foo%%'), 'I\'m a %foo%', '->resolveValue() supports % escaping by doubling it');
+$t->is($builder->resolveValue('I\'m a %foo% %%foo %foo%'), 'I\'m a bar %foo bar', '->resolveValue() supports % escaping by doubling it');
+
+try
+{
+  $builder->resolveValue('%foobar%');
+  $t->fail('->resolveValue() throws a InvalidArgumentException if a placeholder references a non-existant parameter');
+}
+catch (InvalidArgumentException $e)
+{
+  $t->pass('->resolveValue() throws a InvalidArgumentException if a placeholder references a non-existant parameter');
+}
+
+try
+{
+  $builder->resolveValue('foo %foobar% bar');
+  $t->fail('->resolveValue() throws a InvalidArgumentException if a placeholder references a non-existant parameter');
+}
+catch (InvalidArgumentException $e)
+{
+  $t->pass('->resolveValue() throws a InvalidArgumentException if a placeholder references a non-existant parameter');
+}
+
+// ->resolveServices()
+$t->diag('->resolveServices()');
+$builder = new sfServiceContainerBuilder();
+$builder->register('foo', 'FooClass');
+$t->is($builder->resolveServices(new sfServiceReference('foo')), $builder->getService('foo'), '->resolveServices() resolves service references to service instances');
+$t->is($builder->resolveServices(array('foo' => array('foo', new sfServiceReference('foo')))), array('foo' => array('foo', $builder->getService('foo'))), '->resolveServices() resolves service references to service instances in nested arrays');
diff --git a/lib/vendor/symfony/test/unit/service/sfServiceContainerDumperGraphvizTest.php b/lib/vendor/symfony/test/unit/service/sfServiceContainerDumperGraphvizTest.php
new file mode 100644
index 000000000..69d3b10d0
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/sfServiceContainerDumperGraphvizTest.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once(__DIR__.'/../../bootstrap/unit.php');
+
+$t = new lime_test(4);
+
+$dir = __DIR__.'/fixtures/graphviz';
+
+
+// ->dump()
+$t->diag('->dump()');
+$dumper = new sfServiceContainerDumperGraphviz($container = new sfServiceContainerBuilder());
+
+$t->is($dumper->dump(), file_get_contents($dir.'/services1.dot'), '->dump() dumps an empty container as an empty dot file');
+
+$container = new sfServiceContainerBuilder();
+$dumper = new sfServiceContainerDumperGraphviz($container);
+
+$container = include __DIR__.'/fixtures/containers/container9.php';
+$dumper = new sfServiceContainerDumperGraphviz($container);
+$t->is($dumper->dump(), str_replace('%path%', __DIR__, file_get_contents($dir.'/services9.dot')), '->dump() dumps services');
+
+$container = include __DIR__.'/fixtures/containers/container10.php';
+$dumper = new sfServiceContainerDumperGraphviz($container);
+$t->is($dumper->dump(), str_replace('%path%', __DIR__, file_get_contents($dir.'/services10.dot')), '->dump() dumps services');
+
+$container = include __DIR__.'/fixtures/containers/container10.php';
+$dumper = new sfServiceContainerDumperGraphviz($container);
+$t->is($dumper->dump(array(
+  'graph' => array('ratio' => 'normal'),
+  'node'  => array('fontsize' => 13, 'fontname' => 'Verdana', 'shape' => 'square'),
+  'edge'  => array('fontsize' => 12, 'fontname' => 'Verdana', 'color' => 'white', 'arrowhead' => 'closed', 'arrowsize' => 1),
+  'node.instance' => array('fillcolor' => 'green', 'style' => 'empty'),
+  'node.definition' => array('fillcolor' => 'grey'),
+  'node.missing' => array('fillcolor' => 'red', 'style' => 'empty'),
+)), str_replace('%path%', __DIR__, file_get_contents($dir.'/services10-1.dot')), '->dump() dumps services');
diff --git a/lib/vendor/symfony/test/unit/service/sfServiceContainerDumperPhpTest.php b/lib/vendor/symfony/test/unit/service/sfServiceContainerDumperPhpTest.php
new file mode 100644
index 000000000..e9abc0b10
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/sfServiceContainerDumperPhpTest.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once(__DIR__.'/../../bootstrap/unit.php');
+
+$t = new lime_test(5);
+
+$dir = __DIR__.'/fixtures/php';
+
+
+// ->dump()
+$t->diag('->dump()');
+$dumper = new sfServiceContainerDumperPhp($container = new sfServiceContainerBuilder());
+
+$t->is($dumper->dump(), file_get_contents($dir.'/services1.php'), '->dump() dumps an empty container as an empty PHP class');
+$t->is($dumper->dump(array('class' => 'Container', 'base_class' => 'AbstractContainer')), file_get_contents($dir.'/services1-1.php'), '->dump() takes a class and a base_class options');
+
+$container = new sfServiceContainerBuilder();
+$dumper = new sfServiceContainerDumperPhp($container);
+
+// ->addParameters()
+$t->diag('->addParameters()');
+$container = include __DIR__.'/fixtures/containers/container8.php';
+$dumper = new sfServiceContainerDumperPhp($container);
+$t->is($dumper->dump(), file_get_contents($dir.'/services8.php'), '->dump() dumps parameters');
+
+// ->addService()
+$t->diag('->addService()');
+$container = include __DIR__.'/fixtures/containers/container9.php';
+$dumper = new sfServiceContainerDumperPhp($container);
+$t->is($dumper->dump(), str_replace('%path%', __DIR__.'/fixtures/includes', file_get_contents($dir.'/services9.php')), '->dump() dumps services');
+
+$dumper = new sfServiceContainerDumperPhp($container = new sfServiceContainerBuilder());
+$container->register('foo', 'FooClass')->addArgument(new stdClass());
+try
+{
+  $dumper->dump();
+  $t->fail('->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
+}
+catch (RuntimeException $e)
+{
+  $t->pass('->dump() throws a RuntimeException if the container to be dumped has reference to objects or resources');
+}
diff --git a/lib/vendor/symfony/test/unit/service/sfServiceContainerDumperTest.php b/lib/vendor/symfony/test/unit/service/sfServiceContainerDumperTest.php
new file mode 100644
index 000000000..8e4f44f74
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/sfServiceContainerDumperTest.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once(__DIR__.'/../../bootstrap/unit.php');
+
+$t = new lime_test(1);
+
+class ProjectDumper extends sfServiceContainerDumper
+{
+}
+
+$builder = new sfServiceContainerBuilder();
+$dumper = new ProjectDumper($builder);
+try
+{
+  $dumper->dump();
+  $t->fail('->dump() returns a LogicException if the dump() method has not been overriden by a children class');
+}
+catch (LogicException $e)
+{
+  $t->pass('->dump() returns a LogicException if the dump() method has not been overriden by a children class');
+}
diff --git a/lib/vendor/symfony/test/unit/service/sfServiceContainerLoaderArrayTest.php b/lib/vendor/symfony/test/unit/service/sfServiceContainerLoaderArrayTest.php
new file mode 100644
index 000000000..5000013e2
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/sfServiceContainerLoaderArrayTest.php
@@ -0,0 +1,75 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once(__DIR__.'/../../bootstrap/unit.php');
+
+$t = new lime_test(20);
+
+class ProjectLoader extends sfServiceContainerLoaderArray
+{
+  public function validate($content)
+  {
+    return parent::validate($content);
+  }
+}
+
+$loader = new ProjectLoader(null);
+
+// ->validate()
+try
+{
+  $loader->validate(sfYaml::load(__DIR__.'/fixtures/yaml/nonvalid1.yml'));
+  $t->fail('->validate() throws an InvalidArgumentException if the loaded definition is not an array');
+}
+catch (InvalidArgumentException $e)
+{
+  $t->pass('->validate() throws an InvalidArgumentException if the loaded definition is not an array');
+}
+
+try
+{
+  $loader->validate(sfYaml::load(__DIR__.'/fixtures/yaml/nonvalid2.yml'));
+  $t->fail('->validate() throws an InvalidArgumentException if the loaded definition is not a valid array');
+}
+catch (InvalidArgumentException $e)
+{
+  $t->pass('->validate() throws an InvalidArgumentException if the loaded definition is not a valid array');
+}
+
+// ->load() # parameters
+$t->diag('->load() # parameters');
+
+list($services, $parameters) = $loader->doLoad(array());
+$t->is($parameters, array(), '->load() return emty parameters array for an empty array definition');
+
+list($services, $parameters) = $loader->doLoad(sfYaml::load(__DIR__.'/fixtures/yaml/services2.yml'));
+$t->is($parameters, array('foo' => 'bar', 'values' => array(true, false, 0, 1000.3), 'bar' => 'foo', 'foo_bar' => new sfServiceReference('foo_bar')), '->load() converts array keys to lowercase');
+
+// ->load() # services
+list($services, $parameters) = $loader->doLoad(sfYaml::load(__DIR__.'/fixtures/yaml/services2.yml'));
+$t->is($services, array(), '->load() return emty services array for an empty array definition');
+
+$t->diag('->load() # services');
+list($services, $parameters) = $loader->doLoad(sfYaml::load(__DIR__.'/fixtures/yaml/services3.yml'));
+$t->ok(isset($services['foo']), '->load() parses service elements');
+$t->is(get_class($services['foo']), 'sfServiceDefinition', '->load() converts service element to sfServiceDefinition instances');
+$t->is($services['foo']->getClass(), 'FooClass', '->load() parses the class attribute');
+$t->ok($services['shared']->isShared(), '->load() parses the shared attribute');
+$t->ok(!$services['non_shared']->isShared(), '->load() parses the shared attribute');
+$t->is($services['constructor']->getConstructor(), 'getInstance', '->load() parses the constructor attribute');
+$t->is($services['file']->getFile(), '%path%/foo.php', '->load() parses the file tag');
+$t->is($services['arguments']->getArguments(), array('foo', new sfServiceReference('foo'), array(true, false)), '->load() parses the argument tags');
+$t->is($services['configurator1']->getConfigurator(), 'sc_configure', '->load() parses the configurator tag');
+$t->is($services['configurator2']->getConfigurator(), array(new sfServiceReference('baz'), 'configure'), '->load() parses the configurator tag');
+$t->is($services['configurator3']->getConfigurator(), array('BazClass', 'configureStatic'), '->load() parses the configurator tag');
+$t->is($services['method_call1']->getMethodCalls(), array(array('setBar', array())), '->load() parses the method_call tag');
+$t->is($services['method_call2']->getMethodCalls(), array(array('setBar', array('foo', new sfServiceReference('foo'), array(true, false)))), '->load() parses the method_call tag');
+$t->ok(isset($services['alias_for_foo']), '->load() parses aliases');
+$t->is($services['alias_for_foo'], 'foo', '->load() parses aliases');
diff --git a/lib/vendor/symfony/test/unit/service/sfServiceContainerLoaderTest.php b/lib/vendor/symfony/test/unit/service/sfServiceContainerLoaderTest.php
new file mode 100644
index 000000000..7dc33dc11
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/sfServiceContainerLoaderTest.php
@@ -0,0 +1,79 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once(__DIR__.'/../../bootstrap/unit.php');
+
+$t = new lime_test(11);
+
+class ProjectLoader extends sfServiceContainerLoader
+{
+  public $container;
+
+  public function doLoad($resource)
+  {
+    return $resource;
+  }
+}
+
+// __construct()
+$t->diag('__construct()');
+$loader = new ProjectLoader($container = new sfServiceContainerBuilder());
+$t->is($loader->container, $container, '__construct() takes a container builder instance as its first argument');
+
+// ->setServiceContainer()
+$t->diag('->setServiceContainer()');
+$loader = new ProjectLoader();
+$loader->setServiceContainer($container = new sfServiceContainerBuilder());
+$t->is($loader->container, $container, '->setServiceContainer() sets the container builder attached to this loader');
+
+// ->load()
+$t->diag('->load()');
+$loader = new ProjectLoader();
+try
+{
+  $loader->load('foo');
+  $t->fail('->load() throws a LogicException if no container is attached to the loader');
+}
+catch (LogicException $e)
+{
+  $t->pass('->load() throws a LogicException if no container is attached to the loader');
+}
+
+$loader->setServiceContainer($container = new sfServiceContainerBuilder(array('bar' => 'foo')));
+$loader->load(array(array(), array('foo' => 'bar')));
+$t->is($container->getParameters(), array('bar' => 'foo', 'foo' => 'bar'), '->load() merges current parameters with the loaded ones');
+
+$loader->setServiceContainer($container = new sfServiceContainerBuilder(array('bar' => 'foo', 'foo' => 'baz')));
+$loader->load(array(array(), array('foo' => 'bar')));
+$t->is($container->getParameters(), array('bar' => 'foo', 'foo' => 'baz'), '->load() does not change the already defined parameters');
+
+$loader->setServiceContainer($container = new sfServiceContainerBuilder(array('bar' => 'foo')));
+$loader->load(array(array(), array('foo' => '%bar%')));
+$t->is($container->getParameters(), array('bar' => 'foo', 'foo' => 'foo'), '->load() evaluates the values of the parameters towards already defined ones');
+
+$loader->setServiceContainer($container = new sfServiceContainerBuilder(array('bar' => 'foo')));
+$loader->load(array(array(), array('foo' => '%bar%', 'baz' => '%foo%')));
+$t->is($container->getParameters(), array('bar' => 'foo', 'foo' => 'foo', 'baz' => 'foo'), '->load() evaluates the values of the parameters towards already defined ones');
+
+$loader->setServiceContainer($container = new sfServiceContainerBuilder());
+$container->register('foo', 'FooClass');
+$container->register('bar', 'BarClass');
+$loader->load(array(array('baz' => new sfServiceDefinition('BazClass'), 'alias_for_foo' => 'foo'), array()));
+$t->is(array_keys($container->getServiceDefinitions()), array('foo', 'bar', 'baz'), '->load() merges definitions already defined ones');
+$t->is($container->getAliases(), array('alias_for_foo' => 'foo'), '->load() registers defined aliases');
+
+$loader->setServiceContainer($container = new sfServiceContainerBuilder());
+$container->register('foo', 'FooClass');
+$loader->load(array(array('foo' => new sfServiceDefinition('BazClass')), array()));
+$t->is($container->getServiceDefinition('foo')->getClass(), 'BazClass', '->load() overrides already defined services');
+
+$loader->setServiceContainer($container = new sfServiceContainerBuilder());
+$loader->load(array(array(), array('foo' => 'bar')), array(array(), array('bar' => 'foo')));
+$t->is($container->getParameters(), array('foo' => 'bar', 'bar' => 'foo'), '->load() accepts several resources as argument');
diff --git a/lib/vendor/symfony/test/unit/service/sfServiceContainerTest.php b/lib/vendor/symfony/test/unit/service/sfServiceContainerTest.php
new file mode 100644
index 000000000..ae35adb3f
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/sfServiceContainerTest.php
@@ -0,0 +1,142 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once(__DIR__.'/../../bootstrap/unit.php');
+
+$t = new lime_test(27);
+
+// __construct()
+$t->diag('__construct()');
+$sc = new sfServiceContainer();
+$t->is(spl_object_hash($sc->getService('service_container')), spl_object_hash($sc), '__construct() automatically registers itself as a service');
+
+$sc = new sfServiceContainer(array('foo' => 'bar'));
+$t->is($sc->getParameters(), array('foo' => 'bar'), '__construct() takes an array of parameters as its first argument');
+
+// ->setParameters() ->getParameters()
+$t->diag('->setParameters() ->getParameters()');
+
+$sc = new sfServiceContainer();
+$t->is($sc->getParameters(), array(), '->getParameters() returns an empty array if no parameter has been defined');
+
+$sc->setParameters(array('foo' => 'bar'));
+$t->is($sc->getParameters(), array('foo' => 'bar'), '->setParameters() sets the parameters');
+
+$sc->setParameters(array('bar' => 'foo'));
+$t->is($sc->getParameters(), array('bar' => 'foo'), '->setParameters() overrides the previous defined parameters');
+
+$sc->setParameters(array('Bar' => 'foo'));
+$t->is($sc->getParameters(), array('bar' => 'foo'), '->setParameters() converts the key to lowercase');
+
+// ->setParameter() ->getParameter()
+$t->diag('->setParameter() ->getParameter() ');
+
+$sc = new sfServiceContainer(array('foo' => 'bar'));
+$sc->setParameter('bar', 'foo');
+$t->is($sc->getParameter('bar'), 'foo', '->setParameter() sets the value of a new parameter');
+$t->is($sc->getParameter('bar'), 'foo', '->getParameter() gets the value of a parameter');
+
+$sc->setParameter('foo', 'baz');
+$t->is($sc->getParameter('foo'), 'baz', '->setParameter() overrides previously set parameter');
+
+$sc->setParameter('Foo', 'baz1');
+$t->is($sc->getParameter('foo'), 'baz1', '->setParameter() converts the key to lowercase');
+$t->is($sc->getParameter('FOO'), 'baz1', '->getParameter() converts the key to lowercase');
+
+try
+{
+  $sc->getParameter('baba');
+  $t->fail('->getParameter() thrown an InvalidArgumentException if the key does not exist');
+}
+catch (InvalidArgumentException $e)
+{
+  $t->pass('->getParameter() thrown an InvalidArgumentException if the key does not exist');
+}
+
+// ->hasParameter()
+$t->diag('->hasParameter()');
+$sc = new sfServiceContainer(array('foo' => 'bar'));
+$t->ok($sc->hasParameter('foo'), '->hasParameter() returns true if a parameter is defined');
+$t->ok($sc->hasParameter('Foo'), '->hasParameter() converts the key to lowercase');
+$t->ok(!$sc->hasParameter('bar'), '->hasParameter() returns false if a parameter is not defined');
+
+// ->addParameters()
+$t->diag('->addParameters()');
+$sc = new sfServiceContainer(array('foo' => 'bar'));
+$sc->addParameters(array('bar' => 'foo'));
+$t->is($sc->getParameters(), array('foo' => 'bar', 'bar' => 'foo'), '->addParameters() adds parameters to the existing ones');
+$sc->addParameters(array('Bar' => 'fooz'));
+$t->is($sc->getParameters(), array('foo' => 'bar', 'bar' => 'fooz'), '->addParameters() converts keys to lowercase');
+
+// ->setService() ->hasService() ->getService()
+$t->diag('->setService() ->hasService() ->getService()');
+$sc = new sfServiceContainer();
+$sc->setService('foo', $obj = new stdClass());
+$t->is(spl_object_hash($sc->getService('foo')), spl_object_hash($obj), '->setService() registers a service under a key name');
+
+$sc->foo1 = $obj1 = new stdClass();
+$t->ok($sc->hasService('foo'), '->hasService() returns true if the service is defined');
+$t->ok(!$sc->hasService('bar'), '->hasService() returns false if the service is not defined');
+
+// ->getServiceIds()
+$t->diag('->getServiceIds()');
+$sc = new sfServiceContainer();
+$sc->setService('foo', $obj = new stdClass());
+$sc->setService('bar', $obj = new stdClass());
+$t->is($sc->getServiceIds(), array('service_container', 'foo', 'bar'), '->getServiceIds() returns all defined service ids');
+
+class ProjectServiceContainer extends sfServiceContainer
+{
+  public $__bar, $__foo_bar, $__foo_baz;
+
+  public function __construct()
+  {
+    parent::__construct();
+
+    $this->__bar = new stdClass();
+    $this->__foo_bar = new stdClass();
+    $this->__foo_baz = new stdClass();
+  }
+
+  protected function getBarService()
+  {
+    return $this->__bar;
+  }
+
+  protected function getFooBarService()
+  {
+    return $this->__foo_bar;
+  }
+
+  protected function getFoo_BazService()
+  {
+    return $this->__foo_baz;
+  }
+}
+
+$sc = new ProjectServiceContainer();
+$t->is(spl_object_hash($sc->getService('bar')), spl_object_hash($sc->__bar), '->getService() looks for a getXXXService() method');
+$t->ok($sc->hasService('bar'), '->hasService() returns true if the service has been defined as a getXXXService() method');
+
+$sc->setService('bar', $bar = new stdClass());
+$t->is(spl_object_hash($sc->getService('bar')), spl_object_hash($bar), '->getService() prefers to return a service defined with setService() than one defined with a getXXXService() method');
+
+try
+{
+  $sc->getService('baba');
+  $t->fail('->getService() thrown an InvalidArgumentException if the service does not exist');
+}
+catch (InvalidArgumentException $e)
+{
+  $t->pass('->getService() thrown an InvalidArgumentException if the service does not exist');
+}
+
+$t->is(spl_object_hash($sc->getService('foo_bar')), spl_object_hash($sc->__foo_bar), '->getService() camelizes the service id when looking for a method');
+$t->is(spl_object_hash($sc->getService('foo.baz')), spl_object_hash($sc->__foo_baz), '->getService() camelizes the service id when looking for a method');
diff --git a/lib/vendor/symfony/test/unit/service/sfServiceDefinitionTest.php b/lib/vendor/symfony/test/unit/service/sfServiceDefinitionTest.php
new file mode 100644
index 000000000..5a9c98b05
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/sfServiceDefinitionTest.php
@@ -0,0 +1,69 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once(__DIR__.'/../../bootstrap/unit.php');
+
+$t = new lime_test(21);
+
+// __construct()
+$t->diag('__construct()');
+
+$def = new sfServiceDefinition('stdClass');
+$t->is($def->getClass(), 'stdClass', '__construct() takes the class name as its first argument');
+
+$def = new sfServiceDefinition('stdClass', array('foo'));
+$t->is($def->getArguments(), array('foo'), '__construct() takes an optional array of arguments as its second argument');
+
+// ->setConstructor() ->getConstructor()
+$t->diag('->setConstructor() ->getConstructor()');
+$def = new sfServiceDefinition('stdClass');
+$t->is(spl_object_hash($def->setConstructor('foo')), spl_object_hash($def), '->setConstructor() implements a fluent interface');
+$t->is($def->getConstructor(), 'foo', '->getConstructor() returns the constructor name');
+
+// ->setClass() ->getClass()
+$t->diag('->setClass() ->getClass()');
+$def = new sfServiceDefinition('stdClass');
+$t->is(spl_object_hash($def->setClass('foo')), spl_object_hash($def), '->setClass() implements a fluent interface');
+$t->is($def->getClass(), 'foo', '->getClass() returns the class name');
+
+// ->setArguments() ->getArguments() ->addArgument()
+$t->diag('->setArguments() ->getArguments() ->addArgument()');
+$def = new sfServiceDefinition('stdClass');
+$t->is(spl_object_hash($def->setArguments(array('foo'))), spl_object_hash($def), '->setArguments() implements a fluent interface');
+$t->is($def->getArguments(), array('foo'), '->getArguments() returns the arguments');
+$t->is(spl_object_hash($def->addArgument('bar')), spl_object_hash($def), '->addArgument() implements a fluent interface');
+$t->is($def->getArguments(), array('foo', 'bar'), '->addArgument() adds an argument');
+
+// ->setMethodCalls() ->getMethodCalls() ->addMethodCall()
+$t->diag('->setMethodCalls() ->getMethodCalls() ->addMethodCall()');
+$def = new sfServiceDefinition('stdClass');
+$t->is(spl_object_hash($def->setMethodCalls(array(array('foo', array('foo'))))), spl_object_hash($def), '->setMethodCalls() implements a fluent interface');
+$t->is($def->getMethodCalls(), array(array('foo', array('foo'))), '->getMethodCalls() returns the methods to call');
+$t->is(spl_object_hash($def->addMethodCall('bar', array('bar'))), spl_object_hash($def), '->addMethodCall() implements a fluent interface');
+$t->is($def->getMethodCalls(), array(array('foo', array('foo')), array('bar', array('bar'))), '->addMethodCall() adds a method to call');
+
+// ->setFile() ->getFile()
+$t->diag('->setFile() ->getFile()');
+$def = new sfServiceDefinition('stdClass');
+$t->is(spl_object_hash($def->setFile('foo')), spl_object_hash($def), '->setFile() implements a fluent interface');
+$t->is($def->getFile(), 'foo', '->getFile() returns the file to include');
+
+// ->setShared() ->isShared()
+$t->diag('->setShared() ->isShared()');
+$def = new sfServiceDefinition('stdClass');
+$t->is($def->isShared(), true, '->isShared() returns true by default');
+$t->is(spl_object_hash($def->setShared(false)), spl_object_hash($def), '->setShared() implements a fluent interface');
+$t->is($def->isShared(), false, '->isShared() returns false if the instance must not be shared');
+
+// ->setConfigurator() ->getConfigurator()
+$t->diag('->setConfigurator() ->getConfigurator()');
+$def = new sfServiceDefinition('stdClass');
+$t->is(spl_object_hash($def->setConfigurator('foo')), spl_object_hash($def), '->setConfigurator() implements a fluent interface');
+$t->is($def->getConfigurator(), 'foo', '->getConfigurator() returns the configurator');
diff --git a/lib/vendor/symfony/test/unit/service/sfServiceParameterTest.php b/lib/vendor/symfony/test/unit/service/sfServiceParameterTest.php
new file mode 100644
index 000000000..1cd18333d
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/sfServiceParameterTest.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once(__DIR__.'/../../bootstrap/unit.php');
+
+$t = new lime_test(1);
+
+// __construct() ->__toString()
+$t->diag('__construct() ->__toString()');
+
+$ref = new sfServiceParameter('foo');
+$t->is((string) $ref, 'foo', '__construct() sets the id of the parameter, which is used for the __toString() method');
diff --git a/lib/vendor/symfony/test/unit/service/sfServiceReferenceTest.php b/lib/vendor/symfony/test/unit/service/sfServiceReferenceTest.php
new file mode 100644
index 000000000..19f11a36a
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/service/sfServiceReferenceTest.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once(__DIR__.'/../../bootstrap/unit.php');
+
+$t = new lime_test(1);
+
+// __construct() ->__toString()
+$t->diag('__construct() ->__toString()');
+
+$ref = new sfServiceReference('foo');
+$t->is((string) $ref, 'foo', '__construct() sets the id of the reference, which is used for the __toString() method');
diff --git a/lib/vendor/symfony/test/unit/sfNoRouting.class.php b/lib/vendor/symfony/test/unit/sfNoRouting.class.php
index 625adb5e9..2899cccb0 100644
--- a/lib/vendor/symfony/test/unit/sfNoRouting.class.php
+++ b/lib/vendor/symfony/test/unit/sfNoRouting.class.php
@@ -70,6 +70,14 @@ public function getRoutes()
     return array();
   }
 
+  /**
+   * @see sfRouting
+   */
+  public function getRoute($name)
+  {
+    return null;
+  }
+
   /**
    * @see sfRouting
    */
diff --git a/lib/vendor/symfony/test/unit/storage/sfCacheSessionStorageTest.php b/lib/vendor/symfony/test/unit/storage/sfCacheSessionStorageTest.php
index dc0806d87..6e1c64064 100644
--- a/lib/vendor/symfony/test/unit/storage/sfCacheSessionStorageTest.php
+++ b/lib/vendor/symfony/test/unit/storage/sfCacheSessionStorageTest.php
@@ -10,9 +10,9 @@
 
 $app = 'frontend';
 
-require_once(dirname(__FILE__).'/../../bootstrap/functional.php');
+require_once(__DIR__.'/../../bootstrap/functional.php');
 
-$_test_dir = realpath(dirname(__FILE__).'/../../');
+$_test_dir = realpath(__DIR__.'/../../');
 require_once($_test_dir.'/../lib/vendor/lime/lime.php');
 
 sfConfig::set('sf_symfony_lib_dir', realpath($_test_dir.'/../lib'));
diff --git a/lib/vendor/symfony/test/unit/storage/sfMySQLStorageTest.php b/lib/vendor/symfony/test/unit/storage/sfMySQLStorageTest.php
index 4cbab2f43..8cbb0d683 100644
--- a/lib/vendor/symfony/test/unit/storage/sfMySQLStorageTest.php
+++ b/lib/vendor/symfony/test/unit/storage/sfMySQLStorageTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 ob_start();
 $plan = 16;
diff --git a/lib/vendor/symfony/test/unit/storage/sfMySQLiStorageTest.php b/lib/vendor/symfony/test/unit/storage/sfMySQLiStorageTest.php
index a54635343..ebf0ccba6 100644
--- a/lib/vendor/symfony/test/unit/storage/sfMySQLiStorageTest.php
+++ b/lib/vendor/symfony/test/unit/storage/sfMySQLiStorageTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 ob_start();
 $plan = 12;
diff --git a/lib/vendor/symfony/test/unit/storage/sfNoStorageTest.php b/lib/vendor/symfony/test/unit/storage/sfNoStorageTest.php
index c1f867b45..0fcd82f57 100644
--- a/lib/vendor/symfony/test/unit/storage/sfNoStorageTest.php
+++ b/lib/vendor/symfony/test/unit/storage/sfNoStorageTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(1);
 
diff --git a/lib/vendor/symfony/test/unit/storage/sfPDOSessionStorageTest.php b/lib/vendor/symfony/test/unit/storage/sfPDOSessionStorageTest.php
index bb438f842..4e055d4df 100644
--- a/lib/vendor/symfony/test/unit/storage/sfPDOSessionStorageTest.php
+++ b/lib/vendor/symfony/test/unit/storage/sfPDOSessionStorageTest.php
@@ -8,10 +8,10 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 ob_start();
-$plan = 15;
+$plan = 14;
 $t = new lime_test($plan);
 
 if (!extension_loaded('SQLite') && !extension_loaded('pdo_SQLite'))
@@ -45,7 +45,6 @@
 $result = $connection->query(sprintf('SELECT sess_id, sess_data FROM session WHERE sess_id = "%s"', $session_id));
 $data = $result->fetchAll();
 $t->is(count($data), 1, 'regenerate() has kept destroyed old session');
-$t->is($data[0]['sess_data'], $oldSessionData, 'regenerate() has kept destroyed old session data');
 
 // checking if the new session record has been created
 $result = $connection->query(sprintf('SELECT sess_id, sess_data FROM session WHERE sess_id = "%s"', session_id()));
diff --git a/lib/vendor/symfony/test/unit/storage/sfSessionStorageTest.php b/lib/vendor/symfony/test/unit/storage/sfSessionStorageTest.php
index 1b9f7f6da..ddc1f4a6b 100644
--- a/lib/vendor/symfony/test/unit/storage/sfSessionStorageTest.php
+++ b/lib/vendor/symfony/test/unit/storage/sfSessionStorageTest.php
@@ -10,11 +10,11 @@
 
 $app = 'frontend';
 
-require_once(dirname(__FILE__).'/../../bootstrap/functional.php');
+require_once(__DIR__.'/../../bootstrap/functional.php');
 
 ob_start();
 
-$_test_dir = realpath(dirname(__FILE__).'/../../');
+$_test_dir = realpath(__DIR__.'/../../');
 require_once($_test_dir.'/../lib/vendor/lime/lime.php');
 
 sfConfig::set('sf_symfony_lib_dir', realpath($_test_dir.'/../lib'));
diff --git a/lib/vendor/symfony/test/unit/storage/sfStorageTest.php b/lib/vendor/symfony/test/unit/storage/sfStorageTest.php
index 194c062af..ab8a1dd63 100644
--- a/lib/vendor/symfony/test/unit/storage/sfStorageTest.php
+++ b/lib/vendor/symfony/test/unit/storage/sfStorageTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(0);
 
diff --git a/lib/vendor/symfony/test/unit/task/cache/sfCacheClearTaskTest.php b/lib/vendor/symfony/test/unit/task/cache/sfCacheClearTaskTest.php
index f42a22aea..6f4a7c370 100644
--- a/lib/vendor/symfony/test/unit/task/cache/sfCacheClearTaskTest.php
+++ b/lib/vendor/symfony/test/unit/task/cache/sfCacheClearTaskTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../../bootstrap/task.php');
+require_once(__DIR__.'/../../../bootstrap/task.php');
 
 $t = new lime_test(2);
 
diff --git a/lib/vendor/symfony/test/unit/task/sfBaseTaskTest.php b/lib/vendor/symfony/test/unit/task/sfBaseTaskTest.php
index e2b0030c5..7a070e3fc 100644
--- a/lib/vendor/symfony/test/unit/task/sfBaseTaskTest.php
+++ b/lib/vendor/symfony/test/unit/task/sfBaseTaskTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-include dirname(__FILE__).'/../../bootstrap/unit.php';
+include __DIR__.'/../../bootstrap/unit.php';
 require_once sfConfig::get('sf_symfony_lib_dir').'/vendor/lime/lime.php';
 
 class TestTask extends sfBaseTask
@@ -28,7 +28,7 @@ public function initializeAutoload(sfProjectConfiguration $configuration, $reloa
   }
 }
 
-$rootDir = dirname(__FILE__).'/../../functional/fixtures';
+$rootDir = __DIR__.'/../../functional/fixtures';
 sfToolkit::clearDirectory($rootDir.'/cache');
 
 $dispatcher = new sfEventDispatcher();
@@ -36,7 +36,7 @@ public function initializeAutoload(sfProjectConfiguration $configuration, $reloa
 $configuration = new ProjectConfiguration($rootDir, $dispatcher);
 $autoload = sfSimpleAutoload::getInstance();
 
-$t = new lime_test(7);
+$t = new lime_test(16);
 $task = new TestTask($dispatcher, new sfFormatter());
 
 // ->initializeAutoload()
@@ -70,6 +70,21 @@ protected function execute($arguments = array(), $options = array())
       throw new Exception('This task requires an application configuration be loaded.');
     }
   }
+
+  public function getServiceContainer()
+  {
+    return parent::getServiceContainer();
+  }
+
+  public function getRouting()
+  {
+    return parent::getRouting();
+  }
+
+  public function getMailer()
+  {
+    return parent::getMailer();
+  }
 }
 
 chdir($rootDir);
@@ -98,3 +113,27 @@ protected function execute($arguments = array(), $options = array())
   $t->diag($e->getMessage());
   $t->fail('->run() creates an application configuration if only a project configuration is set');
 }
+
+// ->getServiceContainer()
+$t->diag('->getServiceContainer()');
+$serviceContainer = $task->getServiceContainer();
+
+$t->ok($serviceContainer instanceof sfServiceContainer, '->getServiceContainer() returns an sfServiceContainer');
+$t->is($serviceContainer, $task->getServiceContainer(), '->getServiceContainer() returns always the same instance');
+$t->ok($serviceContainer->hasService('my_project_service'), '->getServiceContainer() is correctly configured');
+
+// ->getRouting()
+$t->diag('->getRouting()');
+$routing = $task->getRouting();
+
+$t->ok($routing instanceof sfRouting, '->getRouting() returns an sfPatternRouting');
+$t->is($routing, $task->getRouting(), '->getRouting() returns always the same instance');
+$t->ok($routing->hasRouteName('homepage'), '->getRouting() is correctly configured');
+
+// ->getMailer()
+$t->diag('->getMailer()');
+$mailer = $task->getMailer();
+
+$t->ok($mailer instanceof sfMailer, '->getMailer() returns an sfMailer');
+$t->is($mailer, $task->getMailer(), '->getMailer() returns always the same instance');
+$t->is($mailer->getDeliveryStrategy(), sfMailer::REALTIME, '->getMailer() is correctly configured');
diff --git a/lib/vendor/symfony/test/unit/task/sfFilesystemTest.php b/lib/vendor/symfony/test/unit/task/sfFilesystemTest.php
index 0f678dde9..538d21580 100644
--- a/lib/vendor/symfony/test/unit/task/sfFilesystemTest.php
+++ b/lib/vendor/symfony/test/unit/task/sfFilesystemTest.php
@@ -7,7 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 //lazy constant, cause it is so often used in this test
 define("DS", DIRECTORY_SEPARATOR);
diff --git a/lib/vendor/symfony/test/unit/task/sfTaskTest.php b/lib/vendor/symfony/test/unit/task/sfTaskTest.php
index 32edcead3..29cd0a9ba 100644
--- a/lib/vendor/symfony/test/unit/task/sfTaskTest.php
+++ b/lib/vendor/symfony/test/unit/task/sfTaskTest.php
@@ -7,9 +7,9 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-require_once dirname(__FILE__).'/../../bootstrap/unit.php';
+require_once __DIR__.'/../../bootstrap/unit.php';
 
-$t = new lime_test(15);
+$t = new lime_test(16);
 
 abstract class BaseTestTask extends sfTask
 {
@@ -114,3 +114,19 @@ protected function configure()
 
 $task->run(array(), array('array' => 'one'));
 $t->is_deeply($task->lastOptions, array('none' => false, 'required' => null, 'optional' => null, 'array' => array('one')), '->run() accepts an associative array of options with a scalar array option value');
+
+// ->getDetailedDescription()
+$t->diag('->getDetailedDescription()');
+
+class DetailedDescriptionTestTask extends BaseTestTask
+{
+  protected function configure()
+  {
+    $this->detailedDescription = <<<EOF
+The [detailedDescription|INFO] formats special string like [...|COMMENT] or [--xml|COMMENT]
+EOF;
+  }
+}
+
+$task = new DetailedDescriptionTestTask();
+$t->is($task->getDetailedDescription(), "The detailedDescription formats special string like ... or --xml", "->getDetailedDescription() formats special string");
diff --git a/lib/vendor/symfony/test/unit/test/sfTestFunctionalTest.php b/lib/vendor/symfony/test/unit/test/sfTestFunctionalTest.php
index d46466de4..667f28d06 100644
--- a/lib/vendor/symfony/test/unit/test/sfTestFunctionalTest.php
+++ b/lib/vendor/symfony/test/unit/test/sfTestFunctionalTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(2);
 
diff --git a/lib/vendor/symfony/test/unit/user/sfBasicSecurityUserTest.php b/lib/vendor/symfony/test/unit/user/sfBasicSecurityUserTest.php
index 08a819655..5535076a6 100644
--- a/lib/vendor/symfony/test/unit/user/sfBasicSecurityUserTest.php
+++ b/lib/vendor/symfony/test/unit/user/sfBasicSecurityUserTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(47);
 
diff --git a/lib/vendor/symfony/test/unit/user/sfUserTest.php b/lib/vendor/symfony/test/unit/user/sfUserTest.php
index 2ef8b0f53..23cea5bd9 100644
--- a/lib/vendor/symfony/test/unit/user/sfUserTest.php
+++ b/lib/vendor/symfony/test/unit/user/sfUserTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(32);
 
diff --git a/lib/vendor/symfony/test/unit/util/sfBrowserTest.php b/lib/vendor/symfony/test/unit/util/sfBrowserTest.php
old mode 100644
new mode 100755
index d4f457c76..a4a2c6ade
--- a/lib/vendor/symfony/test/unit/util/sfBrowserTest.php
+++ b/lib/vendor/symfony/test/unit/util/sfBrowserTest.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
-$t = new lime_test(73);
+$t = new lime_test(76);
 
 // ->click()
 $t->diag('->click()');
@@ -127,12 +127,22 @@ public function getDefaultServerArray($name)
       </span></div>
     </form>
 
+    <form action="/myform7" method="post">
+      <input type="text" name="text_default_value" value="default" />
+      <input type="submit" value="submit7" />
+    </form>
+
     <a href="/myotherlink">test link</a>
     <a href="/submitlink">submit</a>
     <a href="/submitimagelink"><img src="myimage.gif" alt="submit" /></a>
 
     <input type="submit" id="orphaned-input-submit" />
 
+    <ul class="css-selector-test">
+      <li>my first <a href="myfirstlink">paragraph</a></li>
+      <li>my second <a href="mysecondlink">paragraph</a></li>
+    </ul>
+
   </body>
 </html>
 EOF;
@@ -311,6 +321,9 @@ public function getDefaultServerArray($name)
   $t->pass('->deselect() cannot deselect radiobuttons');
 }
 
+list($method, $uri, $parameters) = $b->click('li:contains("first") a');
+$t->is($uri, 'myfirstlink', 'click accept css selectors without "[" or "]"');
+
 // ->call()
 $t->diag('->call()');
 $b->call('https://app-test/index.phpmain/index');
@@ -345,3 +358,9 @@ public function getDefaultServerArray($name)
 list($method, $uri, $parameters) = $b->click('submit6');
 $t->is($parameters['bar'], 'bar', '->click() overrides input elements defined several times');
 $t->is($parameters['foo']['bar'], 'bar', '->click() overrides input elements defined several times');
+
+// bug #106
+$t->diag('bug #106');
+list($method, $uri, $parameters) = $b->click('submit7');
+$t->is(isset($parameters['']), false, 'submit without name is not submitted');
+$t->is($parameters['text_default_value'], 'default', 'input field with name is still submitted');
\ No newline at end of file
diff --git a/lib/vendor/symfony/test/unit/util/sfCallableTest.php b/lib/vendor/symfony/test/unit/util/sfCallableTest.php
index 11bbe71d4..450fee011 100644
--- a/lib/vendor/symfony/test/unit/util/sfCallableTest.php
+++ b/lib/vendor/symfony/test/unit/util/sfCallableTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(5);
 
diff --git a/lib/vendor/symfony/test/unit/util/sfClassManipulatorTest.php b/lib/vendor/symfony/test/unit/util/sfClassManipulatorTest.php
index 0d5e27251..b3c25af8b 100644
--- a/lib/vendor/symfony/test/unit/util/sfClassManipulatorTest.php
+++ b/lib/vendor/symfony/test/unit/util/sfClassManipulatorTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(18);
 
diff --git a/lib/vendor/symfony/test/unit/util/sfContextTest.php b/lib/vendor/symfony/test/unit/util/sfContextTest.php
index 688226f2e..3737a0bee 100644
--- a/lib/vendor/symfony/test/unit/util/sfContextTest.php
+++ b/lib/vendor/symfony/test/unit/util/sfContextTest.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
-$t = new lime_test(17);
+$t = new lime_test(29);
 
 class myContext extends sfContext
 {
@@ -33,9 +33,10 @@ class frontendConfiguration extends sfApplicationConfiguration
 */
 
 // use functional project configruration
-require_once realpath(dirname(__FILE__).'/../../functional/fixtures/config/ProjectConfiguration.class.php');
+require_once realpath(__DIR__.'/../../functional/fixtures/config/ProjectConfiguration.class.php');
 
 $frontend_context = sfContext::createInstance(ProjectConfiguration::getApplicationConfiguration('frontend', 'test', true));
+$frontend_context_prod = sfContext::createInstance(ProjectConfiguration::getApplicationConfiguration('frontend', 'prod', false));
 $i18n_context = sfContext::createInstance(ProjectConfiguration::getApplicationConfiguration('i18n', 'test', true));
 $cache_context = sfContext::createInstance(ProjectConfiguration::getApplicationConfiguration('cache', 'test', true));
 
@@ -100,3 +101,21 @@ class frontendConfiguration extends sfApplicationConfiguration
 {
   $t->pass('->__call() throws an sfException if factory / method does not exist');
 }
+
+$t->diag('->getServiceContainer() test');
+$sc = $frontend_context->getServiceContainer();
+$t->ok(file_exists(sfConfig::get('sf_cache_dir').'/frontend/test/config/config_services.yml.php'), '->getServiceContainer() creates a cache file in /cache/frontend/test/config');
+$t->ok(class_exists('frontend_testServiceContainer'), '->getServiceContainer() creates and loads the frontend_testServiceContainer class');
+$t->ok($sc instanceof frontend_testServiceContainer, '->getServiceContainer() returns an instance of frontend_testServiceContainer');
+$t->ok($sc->hasService('my_app_service'), '->getServiceContainer() contains app/config/service.yml services');
+$t->ok($sc->hasService('my_project_service'), '->getServiceContainer() contains /config/service.yml services');
+$t->ok($sc->hasService('my_plugin_service'), '->getServiceContainer() contains plugin/config/service.yml services');
+$t->ok($sc->getParameter('sf_root_dir'), '->getServiceContainer() sfConfig parameters are accessibles');
+$t->ok($sc->hasParameter('my_app_test_param'), '->getServiceContainer() contains env specifiv parameters');
+
+$t->diag('->getServiceContainer() prod');
+$sc = $frontend_context_prod->getServiceContainer();
+$t->ok(file_exists(sfConfig::get('sf_cache_dir').'/frontend/prod/config/config_services.yml.php'), '->getServiceContainer() creates a cache file in /cache/frontend/prod/config');
+$t->ok(class_exists('frontend_prodServiceContainer'), '->getServiceContainer() creates and loads the frontend_prodServiceContainer class');
+$t->ok($sc instanceof frontend_prodServiceContainer, '->getServiceContainer() returns an instance of frontend_prodServiceContainer');
+$t->ok(false === $sc->hasParameter('my_app_test_param'), '->getServiceContainer() does not contain other env specifiv parameters');
diff --git a/lib/vendor/symfony/test/unit/util/sfDomCssSelectorTest.php b/lib/vendor/symfony/test/unit/util/sfDomCssSelectorTest.php
index 83e77fce2..c742c7f38 100644
--- a/lib/vendor/symfony/test/unit/util/sfDomCssSelectorTest.php
+++ b/lib/vendor/symfony/test/unit/util/sfDomCssSelectorTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(72);
 
diff --git a/lib/vendor/symfony/test/unit/util/sfFinderTest.php b/lib/vendor/symfony/test/unit/util/sfFinderTest.php
index 8659210fd..22e247ed7 100644
--- a/lib/vendor/symfony/test/unit/util/sfFinderTest.php
+++ b/lib/vendor/symfony/test/unit/util/sfFinderTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 class my_lime_test extends lime_test
 {
@@ -24,7 +24,7 @@ public function arrays_are_equal($a, $b, $message)
 
 require_once($_test_dir.'/../lib/util/sfFinder.class.php');
 
-$fixtureDir = dirname(__FILE__).'/fixtures/finder';
+$fixtureDir = __DIR__.'/fixtures/finder';
 $phpFiles = array(
   'dir1/dir2/file21.php',
   'dir1/file12.php',
diff --git a/lib/vendor/symfony/test/unit/util/sfInflectorTest.php b/lib/vendor/symfony/test/unit/util/sfInflectorTest.php
index b0faa6425..fb6e01baa 100644
--- a/lib/vendor/symfony/test/unit/util/sfInflectorTest.php
+++ b/lib/vendor/symfony/test/unit/util/sfInflectorTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 require_once($_test_dir.'/../lib/util/sfToolkit.class.php');
 require_once($_test_dir.'/../lib/util/sfInflector.class.php');
 
diff --git a/lib/vendor/symfony/test/unit/util/sfNamespacedParameterHolderTest.php b/lib/vendor/symfony/test/unit/util/sfNamespacedParameterHolderTest.php
index 23c2b4bda..6df398bd2 100644
--- a/lib/vendor/symfony/test/unit/util/sfNamespacedParameterHolderTest.php
+++ b/lib/vendor/symfony/test/unit/util/sfNamespacedParameterHolderTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(50);
 
diff --git a/lib/vendor/symfony/test/unit/util/sfParameterHolderTest.php b/lib/vendor/symfony/test/unit/util/sfParameterHolderTest.php
index 2b7aa71e0..1165cea3a 100644
--- a/lib/vendor/symfony/test/unit/util/sfParameterHolderTest.php
+++ b/lib/vendor/symfony/test/unit/util/sfParameterHolderTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(24);
 
diff --git a/lib/vendor/symfony/test/unit/util/sfToolkitTest.php b/lib/vendor/symfony/test/unit/util/sfToolkitTest.php
index 3fdb86d4e..e62d30a2c 100644
--- a/lib/vendor/symfony/test/unit/util/sfToolkitTest.php
+++ b/lib/vendor/symfony/test/unit/util/sfToolkitTest.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
-$t = new lime_test(93);
+$t = new lime_test(95);
 
 // ::stringToArray()
 $t->diag('::stringToArray()');
@@ -26,6 +26,8 @@
   'foo1="l\'autre" foo=bar' => array('foo1' => 'l\'autre', 'foo' => 'bar'),
   'foo1="l"autre" foo=bar' => array('foo1' => 'l"autre', 'foo' => 'bar'),
   'foo_1=bar_1' => array('foo_1' => 'bar_1'),
+  'data-foo=bar' => array('data-foo' => 'bar'),
+  'data-foo-bar=baz' => array('data-foo-bar' => 'baz'),
 );
 
 foreach ($tests as $string => $attributes)
@@ -223,27 +225,27 @@
 // ::addIncludePath()
 $t->diag('::addIncludePath()');
 $path = get_include_path();
-$t->is(sfToolkit::addIncludePath(dirname(__FILE__)), $path, '::addIncludePath() returns the previous include_path');
-$t->is(get_include_path(), dirname(__FILE__).PATH_SEPARATOR.$path, '::addIncludePath() adds a path to the front of include_path');
+$t->is(sfToolkit::addIncludePath(__DIR__), $path, '::addIncludePath() returns the previous include_path');
+$t->is(get_include_path(), __DIR__.PATH_SEPARATOR.$path, '::addIncludePath() adds a path to the front of include_path');
 
-sfToolkit::addIncludePath(dirname(__FILE__), 'back');
-$t->is(get_include_path(), $path.PATH_SEPARATOR.dirname(__FILE__), '::addIncludePath() moves a path to the end of include_path');
+sfToolkit::addIncludePath(__DIR__, 'back');
+$t->is(get_include_path(), $path.PATH_SEPARATOR.__DIR__, '::addIncludePath() moves a path to the end of include_path');
 
 sfToolkit::addIncludePath(array(
-  dirname(__FILE__),
-  dirname(__FILE__).'/..',
+  __DIR__,
+  __DIR__.'/..',
 ));
-$t->is(get_include_path(), dirname(__FILE__).PATH_SEPARATOR.dirname(__FILE__).'/..'.PATH_SEPARATOR.$path, '::addIncludePath() adds multiple paths the the front of include_path');
+$t->is(get_include_path(), __DIR__.PATH_SEPARATOR.__DIR__.'/..'.PATH_SEPARATOR.$path, '::addIncludePath() adds multiple paths the the front of include_path');
 
 sfToolkit::addIncludePath(array(
-  dirname(__FILE__),
-  dirname(__FILE__).'/..',
+  __DIR__,
+  __DIR__.'/..',
 ), 'back');
-$t->is(get_include_path(), $path.PATH_SEPARATOR.dirname(__FILE__).PATH_SEPARATOR.dirname(__FILE__).'/..', '::addIncludePath() adds multiple paths the the back of include_path');
+$t->is(get_include_path(), $path.PATH_SEPARATOR.__DIR__.PATH_SEPARATOR.__DIR__.'/..', '::addIncludePath() adds multiple paths the the back of include_path');
 
 try
 {
-  sfToolkit::addIncludePath(dirname(__FILE__), 'foobar');
+  sfToolkit::addIncludePath(__DIR__, 'foobar');
   $t->fail('::addIncludePath() throws an exception if position is not valid');
 }
 catch (Exception $e)
diff --git a/lib/vendor/symfony/test/unit/validator/i18n/sfValidatorI18nChoiceCountryTest.php b/lib/vendor/symfony/test/unit/validator/i18n/sfValidatorI18nChoiceCountryTest.php
index 658e9ad4a..8bcd2a3cd 100644
--- a/lib/vendor/symfony/test/unit/validator/i18n/sfValidatorI18nChoiceCountryTest.php
+++ b/lib/vendor/symfony/test/unit/validator/i18n/sfValidatorI18nChoiceCountryTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../../bootstrap/unit.php');
+require_once(__DIR__.'/../../../bootstrap/unit.php');
 
 $t = new lime_test(3);
 
diff --git a/lib/vendor/symfony/test/unit/validator/i18n/sfValidatorI18nChoiceLanguageTest.php b/lib/vendor/symfony/test/unit/validator/i18n/sfValidatorI18nChoiceLanguageTest.php
index 792ca9a83..33081578b 100644
--- a/lib/vendor/symfony/test/unit/validator/i18n/sfValidatorI18nChoiceLanguageTest.php
+++ b/lib/vendor/symfony/test/unit/validator/i18n/sfValidatorI18nChoiceLanguageTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../../bootstrap/unit.php');
+require_once(__DIR__.'/../../../bootstrap/unit.php');
 
 $t = new lime_test(3);
 
diff --git a/lib/vendor/symfony/test/unit/validator/i18n/sfValidatorI18nChoiceTimezoneTest.php b/lib/vendor/symfony/test/unit/validator/i18n/sfValidatorI18nChoiceTimezoneTest.php
index 244405bc6..8e4e954c3 100644
--- a/lib/vendor/symfony/test/unit/validator/i18n/sfValidatorI18nChoiceTimezoneTest.php
+++ b/lib/vendor/symfony/test/unit/validator/i18n/sfValidatorI18nChoiceTimezoneTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../../bootstrap/unit.php');
+require_once(__DIR__.'/../../../bootstrap/unit.php');
 
 $t = new lime_test(1);
 
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorAndTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorAndTest.php
index c06259797..cc373b737 100644
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorAndTest.php
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorAndTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(25);
 
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorBaseTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorBaseTest.php
index 628823081..d71c3fdbf 100644
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorBaseTest.php
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorBaseTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(47);
 
@@ -110,7 +110,7 @@ protected function doClean($value)
   $t->pass('->clean() throws a sfValidatorError exception if the data does not validate');
   $t->is($e->getCode(), 'required', '->clean() throws a sfValidatorError');
 }
-$t->is($v->clean('  foo  '), '  foo  ', '->clean() does not trim whitespaces by default');
+$t->is($v->clean('  foo  '), 'foo', '->clean() trim whitespaces by default');
 
 // ->isEmpty()
 $t->diag('->isEmpty()');
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorBooleanTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorBooleanTest.php
index aee0eae90..944455bf9 100644
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorBooleanTest.php
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorBooleanTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(17);
 
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorCSRFTokenTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorCSRFTokenTest.php
index 885cb66ac..23daba8ba 100644
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorCSRFTokenTest.php
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorCSRFTokenTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(5);
 
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorCallbackTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorCallbackTest.php
index 130d84395..a0b0597d2 100644
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorCallbackTest.php
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorCallbackTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(7);
 
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorChoiceTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorChoiceTest.php
index 857c80f09..bb5241852 100644
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorChoiceTest.php
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorChoiceTest.php
@@ -8,15 +8,23 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
-$t = new lime_test(13);
+$t = new lime_test(14);
 
 function choice_callable()
 {
   return array(1, 2, 3);
 }
 
+class ValidatorChoiceTestIsEmpty extends sfValidatorChoice
+{
+  public function run($value)
+  {
+    return $this->isEmpty($value);
+  }
+}
+
 // __construct()
 $t->diag('__construct()');
 try
@@ -29,6 +37,12 @@ function choice_callable()
   $t->pass('__construct() throws an RuntimeException if you don\'t pass an expected option');
 }
 
+$v = new ValidatorChoiceTestIsEmpty(array('choices' => array('foo', 'bar')));
+
+// ->isEmpty()
+$t->diag('->isEmpty()');
+$t->is($v->run(array('', '')), true, '->isEmpty() return true if array has only empty value(s)');
+
 $v = new sfValidatorChoice(array('choices' => array('foo', 'bar')));
 
 // ->clean()
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorDateRangeTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorDateRangeTest.php
index 717bb7bc1..4db90baa2 100644
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorDateRangeTest.php
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorDateRangeTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(7);
 
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorDateTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorDateTest.php
index 3f2239025..e695bb792 100644
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorDateTest.php
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorDateTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(52);
 
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorDateTimeTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorDateTimeTest.php
index 471cc1edc..77a29df53 100644
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorDateTimeTest.php
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorDateTimeTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(4);
 
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorDecoratorTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorDecoratorTest.php
index 1fdc3510f..b42669f0f 100644
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorDecoratorTest.php
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorDecoratorTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(20);
 
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorEmailTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorEmailTest.php
index 11058149b..dbfe50e9c 100644
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorEmailTest.php
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorEmailTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(11);
 
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorEqualTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorEqualTest.php
new file mode 100644
index 000000000..9dbe1cc82
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorEqualTest.php
@@ -0,0 +1,83 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once(__DIR__.'/../../bootstrap/unit.php');
+
+$t = new lime_test(9);
+
+// __construct()
+$t->diag('__construct()');
+try
+{
+  new sfValidatorEqual();
+  $t->fail('->__construct() throws an "RuntimeException" if you don\'t pass a "value" option');
+}
+catch (RuntimeException $e)
+{
+  $t->pass('->__construct() throws an "RuntimeException" if you don\'t pass a "value" option');
+}
+
+$v = new sfValidatorEqual(array('value' => 'foo'));
+
+// ->clean()
+$t->diag('->clean()');
+$t->is($v->clean('foo'), 'foo', '->clean() returns the value unmodified');
+
+$v->setOption('value', '0');
+$t->ok($v->clean(0) === 0, '->clean() returns the value unmodified');
+
+try
+{
+  $v->clean('bar');
+  $t->fail('->clean() fails values are not equal');
+  $t->skip('', 1);
+}
+catch (sfValidatorError $e)
+{
+  $t->pass('->clean() fails values are not equal');
+  $t->is($e->getCode(), 'not_equal', '->clean() throws a sfValidatorError');
+}
+
+$v->setMessage('not_equal', 'Not equal');
+try
+{
+  $v->clean('bar');
+  $t->fail('"not_equal" error message customization');
+}
+catch (sfValidatorError $e)
+{
+  $t->is($e->getMessage(), 'Not equal', '"not_equal" error message customization');
+}
+
+$v->setOption('strict', true);
+$v->setOption('value', '0');
+
+try
+{
+  $v->clean(0);
+  $t->fail('"strict" option set the operator for comparaison');
+  $t->skip('', 1);
+}
+catch (sfValidatorError $e)
+{
+  $t->pass('"strict" option set the operator for comparaison');
+  $t->is($e->getCode(), 'not_strictly_equal', '->clean() throws a sfValidatorError');
+}
+
+$v->setMessage('not_strictly_equal', 'Not strictly equal');
+try
+{
+  $v->clean(0);
+  $t->fail('"not_strictly_equal" error message customization');
+}
+catch (sfValidatorError $e)
+{
+  $t->is($e->getMessage(), 'Not strictly equal', '"not_strictly_equal" error message customization');
+}
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorErrorSchemaTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorErrorSchemaTest.php
index d2bc24cbd..e7768a9a6 100644
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorErrorSchemaTest.php
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorErrorSchemaTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(33);
 
@@ -24,7 +24,7 @@
 $t->diag('__construct()');
 $t->is($e->getValidator(), $v1, '__construct() takes a sfValidator as its first argument');
 $e = new sfValidatorErrorSchema($v1, array('e1' => $e1, 'e2' => $e2));
-$t->is($e->getErrors(), array('e1' => $e1, 'e2' => $e2), '__construct() can take an array of sfValidatorError as its second argument');
+$t->is($e->getErrors(), array('e1' => $e1, 'e2' => $e2), '__construct() can take an array of sfValidatorError as its second argument (depreciated)');
 
 // ->addError() ->getErrors()
 $t->diag('->addError() ->getErrors()');
@@ -35,19 +35,56 @@
 $t->is($e->getErrors(), array($e1, 'e2' => $e2, '2' => $e1), '->addError() adds an error to the error schema');
 
 $t->diag('embedded errors');
-$es1 = new sfValidatorErrorSchema($v1, array($e1, 'e1' => $e1, 'e2' => $e2));
-$es = new sfValidatorErrorSchema($v1, array($e1, 'e1' => $e1, 'e2' => $es1));
+$es1 = new sfValidatorErrorSchema(new sfValidatorString());
+$es1->addError($e1);
+$es1->addError($e1, 'e1');
+$es1->addError($e2, 'e2');
+
+$es = new sfValidatorErrorSchema(new sfValidatorString());
+$es->addError($e1);
+$es->addError($e1, 'e1');
+$es->addError($es1, 'e2');
 $es->addError($e2, 'e1');
 $t->is($es->getCode(), 'max_length e1 [max_length min_length] e2 [max_length e1 [max_length] e2 [min_length]]', '->addError() adds an error to the error schema');
+
 $es->addError($e2);
 $t->is($es->getCode(), 'max_length min_length e1 [max_length min_length] e2 [max_length e1 [max_length] e2 [min_length]]', '->addError() adds an error to the error schema');
-$es->addError($es1, 'e3');
+
+$es2 = new sfValidatorErrorSchema(new sfValidatorString());
+$es2->addError($e1);
+$es2->addError($e1, 'e1');
+$es2->addError($e2, 'e2');
+
+$es->addError($es2, 'e3');
 $t->is($es->getCode(), 'max_length min_length e1 [max_length min_length] e2 [max_length e1 [max_length] e2 [min_length]] e3 [max_length e1 [max_length] e2 [min_length]]', '->addError() adds an error to the error schema');
-$es->addError($es1);
+
+$es3 = new sfValidatorErrorSchema(new sfValidatorString());
+$es3->addError($e1);
+$es3->addError($e1, 'e1');
+$es3->addError($e2, 'e2');
+
+$es->addError($es3);
 $t->is($es->getCode(), 'max_length min_length max_length e1 [max_length min_length max_length] e2 [max_length min_length e1 [max_length] e2 [min_length]] e3 [max_length e1 [max_length] e2 [min_length]]', '->addError() adds an error to the error schema');
 
-$es = new sfValidatorErrorSchema($v1, array($e1, 'e1' => $e1, 'e2' => $es1));
-$es2 = new sfValidatorErrorSchema($v1, array($e1, 'e1' => $e1, 'e2' => $es1));
+
+$es1 = new sfValidatorErrorSchema($v1);
+$es1->addError($e1);
+$es1->addError($e1, 'e1');
+$es1->addError($e2, 'e2');
+$es = new sfValidatorErrorSchema($v1);
+$es->addError($e1);
+$es->addError($e1, 'e1');
+$es->addError($es1, 'e2');
+
+$es1 = new sfValidatorErrorSchema($v1);
+$es1->addError($e1);
+$es1->addError($e1, 'e1');
+$es1->addError($e2, 'e2');
+$es2 = new sfValidatorErrorSchema($v1);
+$es2->addError($e1);
+$es2->addError($e1, 'e1');
+$es2->addError($es1, 'e2');
+
 $es->addError($es2, 'e2');
 $t->is($es->getCode(), 'max_length e1 [max_length] e2 [max_length max_length e1 [max_length max_length] e2 [min_length max_length e1 [max_length] e2 [min_length]]]', '->addError() adds an error to the error schema');
 
@@ -55,11 +92,12 @@
 $t->diag('->addErrors()');
 $es1 = new sfValidatorErrorSchema($v1);
 $es1->addError($e1);
+$es1->addError($e1, 0);
 $es1->addError($e2, '1');
 $es = new sfValidatorErrorSchema($v1);
 $es->addErrors($es1);
 $t->is($es->getGlobalErrors(), array($e1), '->addErrors() adds an array of errors to the current error');
-$t->is($es->getNamedErrors(), array('1' => $e2), '->addErrors() merges a sfValidatorErrorSchema to the current error');
+$t->is($es->getNamedErrors(), array(0 => $e1, '1' => $e2), '->addErrors() merges a sfValidatorErrorSchema to the current error');
 
 // ->getGlobalErrors()
 $t->diag('->getGlobalErrors()');
@@ -96,37 +134,43 @@
 
 // implements Countable
 $t->diag('implements Countable');
-$e = new sfValidatorErrorSchema($v1, array('e1' => $e1, 'e2' => $e2));
+$e = new sfValidatorErrorSchema($v1);
+$e->addError($e1, 'e1');
+$e->addError($e2, 'e2');
 $t->is(count($e), 2, '"sfValidatorError" implements Countable');
 
 // implements Iterator
 $t->diag('implements Iterator');
-$e = new sfValidatorErrorSchema($v1, array('e1' => $e1, $e2));
+$e = new sfValidatorErrorSchema($v1);
+$e->addError($e1, 'e1');
+$e->addError($e2);
 $e->addError($e2, '2');
 $errors = array();
 foreach ($e as $name => $error)
 {
   $errors[$name] = $error;
 }
-$t->is($errors, array('e1' => $e1, 0 => $e2, '2' => $e2), 'sfValidatorErrorSchema implements the Iterator interface');
+$t->is($errors, array('e1' => $e1, 0 => $e2, '2' => $e2), '"sfValidatorErrorSchema" implements the Iterator interface');
 
 // implements ArrayAccess
 $t->diag('implements ArrayAccess');
-$e = new sfValidatorErrorSchema($v1, array('e1' => $e1, $e2));
+$e = new sfValidatorErrorSchema($v1);
+$e->addError($e1, 'e1');
+$e->addError($e2);
 $e->addError($e2, '2');
-$t->is($e['e1'], $e1, 'sfValidatorErrorSchema implements the ArrayAccess interface');
-$t->is($e[0], $e2, 'sfValidatorErrorSchema implements the ArrayAccess interface');
-$t->is($e['2'], $e2, 'sfValidatorErrorSchema implements the ArrayAccess interface');
-$t->is(isset($e['e1']), true, 'sfValidatorErrorSchema implements the ArrayAccess interface');
-$t->is(isset($e['e2']), false, 'sfValidatorErrorSchema implements the ArrayAccess interface');
+$t->is($e['e1'], $e1, '"sfValidatorErrorSchema" implements the ArrayAccess interface');
+$t->is($e[0], $e2, '"sfValidatorErrorSchema" implements the ArrayAccess interface');
+$t->is($e['2'], $e2, '"sfValidatorErrorSchema" implements the ArrayAccess interface');
+$t->is(isset($e['e1']), true, '"sfValidatorErrorSchema" implements the ArrayAccess interface');
+$t->is(isset($e['e2']), false, '"sfValidatorErrorSchema" implements the ArrayAccess interface');
 try
 {
   $e['e1'] = $e2;
-  $t->fail('sfValidatorErrorSchema implements the ArrayAccess interface');
+  $t->fail('"sfValidatorErrorSchema" implements the ArrayAccess interface');
 }
 catch (LogicException $e)
 {
-  $t->pass('sfValidatorErrorSchema implements the ArrayAccess interface');
+  $t->pass('"sfValidatorErrorSchema" implements the ArrayAccess interface');
 }
 
 // implements Serializable
@@ -155,18 +199,18 @@ function will_crash($a)
 try
 {
   $serialized = will_crash($a);
-  $t->pass('sfValidatorErrorSchema implements Serializable');
+  $t->pass('"sfValidatorErrorSchema" implements Serializable');
 }
 catch (Exception $e)
 {
-  $t->fail('sfValidatorErrorSchema implements Serializable');
+  $t->fail('"sfValidatorErrorSchema" implements Serializable');
 }
 
 $e = new sfValidatorErrorSchema($v1);
 $e1 = unserialize($serialized);
-$t->is($e1->getMessage(), $e->getMessage(), 'sfValidatorErrorSchema implements Serializable');
-$t->is($e1->getCode(), $e->getCode(), 'sfValidatorErrorSchema implements Serializable');
-$t->is(get_class($e1->getValidator()), get_class($e->getValidator()), 'sfValidatorErrorSchema implements Serializable');
-$t->is($e1->getArguments(), $e->getArguments(), 'sfValidatorErrorSchema implements Serializable');
-$t->is($e1->getNamedErrors(), $e->getNamedErrors(), 'sfValidatorErrorSchema implements Serializable');
-$t->is($e1->getGlobalErrors(), $e->getGlobalErrors(), 'sfValidatorErrorSchema implements Serializable');
+$t->is($e1->getMessage(), $e->getMessage(), '"sfValidatorErrorSchema" implements Serializable');
+$t->is($e1->getCode(), $e->getCode(), '"sfValidatorErrorSchema" implements Serializable');
+$t->is(get_class($e1->getValidator()), get_class($e->getValidator()), '"sfValidatorErrorSchema" implements Serializable');
+$t->is($e1->getArguments(), $e->getArguments(), '"sfValidatorErrorSchema" implements Serializable');
+$t->is($e1->getNamedErrors(), $e->getNamedErrors(), '"sfValidatorErrorSchema" implements Serializable');
+$t->is($e1->getGlobalErrors(), $e->getGlobalErrors(), '"sfValidatorErrorSchema" implements Serializable');
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorErrorTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorErrorTest.php
index 35f8e3b9d..41b03f4c3 100644
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorErrorTest.php
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorErrorTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(14);
 
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorFileMultiTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorFileMultiTest.php
new file mode 100644
index 000000000..59b54727e
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorFileMultiTest.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once(__DIR__.'/../../bootstrap/unit.php');
+
+$t = new lime_test(9);
+
+$tmpDir = sys_get_temp_dir();
+$content = 'This is an ASCII file.';
+$content2 = 'This is an ASCII file. And another one.';
+file_put_contents($tmpDir.'/test.txt', $content);
+file_put_contents($tmpDir.'/test2.txt', $content2);
+
+// ->clean()
+$t->diag('->clean()');
+$v = new sfValidatorFileMulti();
+
+$f = $v->clean(array(
+  array('tmp_name' => $tmpDir.'/test.txt'),
+  array('tmp_name' => $tmpDir.'/test2.txt'),
+));
+
+$t->ok(is_array($f), '->clean() returns an array of sfValidatedFile instances');
+
+$t->ok($f[0] instanceof sfValidatedFile, '->clean() returns an array of sfValidatedFile');
+$t->is($f[0]->getOriginalName(), '', '->clean() returns an array of sfValidatedFile with an empty original name if the name is not passed in the initial value');
+$t->is($f[0]->getSize(), strlen($content), '->clean() returns an array of sfValidatedFile with a computed file size if the size is not passed in the initial value');
+$t->is($f[0]->getType(), 'text/plain', '->clean() returns an array of sfValidatedFile with a guessed content type');
+
+$t->ok($f[1] instanceof sfValidatedFile, '->clean() returns an array of sfValidatedFile');
+$t->is($f[1]->getOriginalName(), '', '->clean() returns an array of sfValidatedFile with an empty original name if the name is not passed in the initial value');
+$t->is($f[1]->getSize(), strlen($content2), '->clean() returns an array of sfValidatedFile with a computed file size if the size is not passed in the initial value');
+$t->is($f[1]->getType(), 'text/plain', '->clean() returns an array of sfValidatedFile with a guessed content type');
+
+unlink($tmpDir.'/test.txt');
+unlink($tmpDir.'/test2.txt');
+sfToolkit::clearDirectory($tmpDir.'/foo');
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorFileTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorFileTest.php
old mode 100644
new mode 100755
index bd3274a55..407f0e316
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorFileTest.php
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorFileTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(69);
 
@@ -75,7 +75,7 @@ public function getMimeTypesFromCategory($category)
 else
 {
   $v = new testValidatorFile();
-  $t->is($v->guessFromFileinfo($tmpDir.'/test.txt'), (version_compare(PHP_VERSION, '5.3', '<')) ? 'text/plain' : 'text/plain; charset=us-ascii', '->guessFromFileinfo() guesses the type of a given file');
+  $t->is($v->guessFromFileinfo($tmpDir.'/test.txt'), 'text/plain', '->guessFromFileinfo() guesses the type of a given file');
   $t->is($v->guessFromFileinfo($tmpDir.'/foo.txt'), null, '->guessFromFileinfo() returns null if the file type is not guessable');
 }
 
@@ -88,7 +88,15 @@ public function getMimeTypesFromCategory($category)
 else
 {
   $v = new testValidatorFile();
-  $t->is($v->guessFromMimeContentType($tmpDir.'/test.txt'), (version_compare(PHP_VERSION, '5.3', '<')) ? 'text/plain' : 'text/plain; charset=us-ascii', '->guessFromMimeContentType() guesses the type of a given file');
+  $mimeType = $v->guessFromMimeContentType($tmpDir.'/test.txt');
+  if ((version_compare(PHP_VERSION, '5.3', '<')) && false === $mimeType)
+  {
+    $t->skip('mime_content_type has some issue with php 5.2', 1);
+  }
+  else
+  {
+    $t->is($mimeType, 'text/plain', '->guessFromMimeContentType() guesses the type of a given file');
+  }
   $t->is($v->guessFromMimeContentType($tmpDir.'/foo.txt'), null, '->guessFromMimeContentType() returns null if the file type is not guessable');
 }
 
@@ -102,7 +110,7 @@ public function getMimeTypesFromCategory($category)
 // ->getMimeType()
 $t->diag('->getMimeType()');
 $v = new testValidatorFile();
-$t->is($v->getMimeType($tmpDir.'/test.txt', 'image/png'), (version_compare(PHP_VERSION, '5.3', '<')) ? 'text/plain' : 'text/plain; charset=us-ascii', '->getMimeType() guesses the type of a given file');
+$t->is($v->getMimeType($tmpDir.'/test.txt', 'image/png'), 'text/plain', '->getMimeType() guesses the type of a given file');
 $t->is($v->getMimeType($tmpDir.'/foo.txt', 'text/plain'), 'text/plain', '->getMimeType() returns the default type if the file type is not guessable');
 
 $v->setOption('mime_type_guessers', array_merge(array(array($v, 'guessFromNothing')), $v->getOption('mime_type_guessers')));
@@ -126,7 +134,7 @@ public function getMimeTypesFromCategory($category)
 $t->ok($f instanceof sfValidatedFile, '->clean() returns a sfValidatedFile instance');
 $t->is($f->getOriginalName(), '', '->clean() returns a sfValidatedFile with an empty original name if the name is not passed in the initial value');
 $t->is($f->getSize(), strlen($content), '->clean() returns a sfValidatedFile with a computed file size if the size is not passed in the initial value');
-$t->is($f->getType(), (version_compare(PHP_VERSION, '5.3', '<')) ? 'text/plain' : 'text/plain; charset=us-ascii', '->clean() returns a sfValidatedFile with a guessed content type');
+$t->is($f->getType(), 'text/plain', '->clean() returns a sfValidatedFile with a guessed content type');
 
 class myValidatedFile extends sfValidatedFile
 {
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorFromDescriptionTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorFromDescriptionTest.php
index 6f431779d..099b06895 100644
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorFromDescriptionTest.php
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorFromDescriptionTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(98);
 
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorIntegerTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorIntegerTest.php
index f7010ca1d..fcde4a357 100644
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorIntegerTest.php
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorIntegerTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(15);
 
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorIpTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorIpTest.php
new file mode 100644
index 000000000..e6094b455
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorIpTest.php
@@ -0,0 +1,276 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once(__DIR__.'/../../bootstrap/unit.php');
+
+$validV4Ips = array(
+  '0.0.0.0',
+  '10.0.0.0',
+  '123.45.67.178',
+  '172.16.0.0',
+  '192.168.1.0',
+  '224.0.0.1',
+  '255.255.255.255',
+  '127.0.0.0',
+);
+
+$invalidV4Ips = array(
+  '0',
+  '0.0',
+  '0.0.0',
+  '256.0.0.0',
+  '0.256.0.0',
+  '0.0.256.0',
+  '0.0.0.256',
+  '-1.0.0.0',
+  'foobar',
+);
+
+$invalidPrivateV4Ips = array(
+  '10.0.0.0',
+  '172.16.0.0',
+  '192.168.1.0'
+);
+
+$invalidReservedV4Ips = array(
+  '0.0.0.0',
+  '240.0.0.1',
+  '255.255.255.255'
+);
+
+$validV6Ips = array(
+  '2001:0db8:85a3:0000:0000:8a2e:0370:7334',
+  '2001:0DB8:85A3:0000:0000:8A2E:0370:7334',
+  '2001:0Db8:85a3:0000:0000:8A2e:0370:7334',
+  'fdfe:dcba:9876:ffff:fdc6:c46b:bb8f:7d4c',
+  'fdc6:c46b:bb8f:7d4c:fdc6:c46b:bb8f:7d4c',
+  'fdc6:c46b:bb8f:7d4c:0000:8a2e:0370:7334',
+  'fe80:0000:0000:0000:0202:b3ff:fe1e:8329',
+  'fe80:0:0:0:202:b3ff:fe1e:8329',
+  'fe80::202:b3ff:fe1e:8329',
+  '0:0:0:0:0:0:0:0',
+  '::',
+  '0::',
+  '::0',
+  '0::0',
+  // IPv4 mapped to IPv6
+  '2001:0db8:85a3:0000:0000:8a2e:0.0.0.0',
+  '::0.0.0.0',
+  '::255.255.255.255',
+  '::123.45.67.178',
+);
+
+$invalidV6Ips = array(
+  'z001:0db8:85a3:0000:0000:8a2e:0370:7334',
+  'fe80',
+  'fe80:8329',
+  'fe80:::202:b3ff:fe1e:8329',
+  'fe80::202:b3ff::fe1e:8329',
+  // IPv4 mapped to IPv6
+  '2001:0db8:85a3:0000:0000:8a2e:0370:0.0.0.0',
+  '::0.0',
+  '::0.0.0',
+  '::256.0.0.0',
+  '::0.256.0.0',
+  '::0.0.256.0',
+  '::0.0.0.256',
+);
+
+$invalidPrivateV6Ips = array(
+  'fdfe:dcba:9876:ffff:fdc6:c46b:bb8f:7d4c',
+  'fdc6:c46b:bb8f:7d4c:fdc6:c46b:bb8f:7d4c',
+  'fdc6:c46b:bb8f:7d4c:0000:8a2e:0370:7334'
+);
+
+$t = new lime_test(180, new lime_output_color());
+
+
+$t->diag('testing against empty IP');
+
+$v = new sfValidatorIp(array('required' => false));
+
+foreach (array(null, '') as $ip)
+{
+  try
+  {
+    $v->clean($ip);
+    $t->pass("Empty IP is considered as valid");
+  }
+  catch (sfValidatorError $e)
+  {
+    $t->fail("Empty IP is considered as valid");
+  }
+}
+
+$t->diag('testing against valid IP all');
+foreach (array_merge($validV4Ips, $validV6Ips) as $ip)
+{
+  try
+  {
+    $v->clean($ip);
+    $t->pass(sprintf("%s is considered as valid ip", $ip));
+  }
+  catch (sfValidatorError $e)
+  {
+    $t->fail(sprintf("%s is considered as valid ip", $ip));
+  }
+}
+
+foreach (array(sfValidatorIp::IP_V4 => $validV4Ips, sfValidatorIp::IP_V6 => $validV6Ips) as $version => $ips)
+{
+  $t->diag('testing against valid IP V'.$version);
+  $v->setOption('version', $version);
+  foreach ($ips as $ip)
+  {
+    try
+    {
+      $v->clean($ip);
+      $t->pass(sprintf("%s is considered as valid ip", $ip));
+    }
+    catch (sfValidatorError $e)
+    {
+      $t->fail(sprintf("%s is considered as valid ip", $ip));
+    }
+  }
+}
+
+$t->diag('testing against invalid IP all');
+foreach (array_merge($invalidV4Ips, $invalidV6Ips) as $ip)
+{
+  try
+  {
+    $v->clean($ip);
+    $t->fail(sprintf("%s is not considered as valid ip", $ip));
+  }
+  catch (sfValidatorError $e)
+  {
+    $t->pass(sprintf("%s is not considered as valid ip", $ip));
+  }
+}
+
+foreach (array(sfValidatorIp::IP_V4 => $invalidV4Ips, sfValidatorIp::IP_V6 => $invalidV6Ips) as $version => $ips)
+{
+  $t->diag('testing against invalid IP V'.$version);
+  $v->setOption('version', $version);
+  foreach ($ips as $ip)
+  {
+    try
+    {
+      $v->clean($ip);
+      $t->fail(sprintf("%s is not considered as valid ip", $ip));
+    }
+    catch (sfValidatorError $e)
+    {
+      $t->pass(sprintf("%s is not considered as valid ip", $ip));
+    }
+  }
+}
+
+foreach (array(sfValidatorIp::IP_V4_NO_PRIV => $invalidPrivateV4Ips, sfValidatorIp::IP_V6_NO_PRIV => $invalidPrivateV6Ips) as $version => $ips)
+{
+  $t->diag('testing against invalid IP V'.$version);
+  $v->setOption('version', $version);
+  foreach ($ips as $ip)
+  {
+    try
+    {
+      $v->clean($ip);
+      $t->fail(sprintf("%s is not considered as valid ip", $ip));
+    }
+    catch (sfValidatorError $e)
+    {
+      $t->pass(sprintf("%s is not considered as valid ip", $ip));
+    }
+  }
+}
+
+foreach (array(sfValidatorIp::IP_V4_NO_RES => $invalidReservedV4Ips, sfValidatorIp::IP_V6_NO_RES => $invalidV6Ips) as $version => $ips)
+{
+  $t->diag('testing against invalid IP V'.$version);
+  $v->setOption('version', $version);
+  foreach ($ips as $ip)
+  {
+    try
+    {
+      $v->clean($ip);
+      $t->fail(sprintf("%s is not considered as valid ip", $ip));
+    }
+    catch (sfValidatorError $e)
+    {
+      $t->pass(sprintf("%s is not considered as valid ip", $ip));
+    }
+  }
+}
+
+foreach (array(sfValidatorIp::IP_V4_ONLY_PUBLIC => array_merge($invalidReservedV4Ips, $invalidPrivateV4Ips), sfValidatorIp::IP_V6_ONLY_PUBLIC => array_merge($invalidPrivateV6Ips,$invalidV6Ips)) as $version => $ips)
+{
+  $t->diag('testing against invalid IP V'.$version);
+  $v->setOption('version', $version);
+  foreach ($ips as $ip)
+  {
+    try
+    {
+      $v->clean($ip);
+      $t->fail(sprintf("%s is not considered as valid ip", $ip));
+    }
+    catch (sfValidatorError $e)
+    {
+      $t->pass(sprintf("%s is not considered as valid ip", $ip));
+    }
+  }
+}
+
+$t->diag('testing against invalid private IP all');
+
+$v->setOption('version', sfValidatorIp::IP_ALL_NO_PRIV);
+foreach (array_merge($invalidPrivateV4Ips, $invalidPrivateV6Ips) as $ip)
+{
+  try
+  {
+    $v->clean($ip);
+    $t->fail(sprintf("%s is not considered as valid ip", $ip));
+  }
+  catch (sfValidatorError $e)
+  {
+    $t->pass(sprintf("%s is not considered as valid ip", $ip));
+  }
+}
+
+$t->diag('testing against invalid reserved IP all');
+
+$v->setOption('version', sfValidatorIp::IP_ALL_NO_RES);
+foreach (array_merge($invalidReservedV4Ips, $invalidV6Ips) as $ip)
+{
+  try
+  {
+    $v->clean($ip);
+    $t->fail(sprintf("%s is not considered as valid ip", $ip));
+  }
+  catch (sfValidatorError $e)
+  {
+    $t->pass(sprintf("%s is not considered as valid ip", $ip));
+  }
+}
+
+$t->diag('testing against invalid public IP all');
+
+$v->setOption('version', sfValidatorIp::IP_ALL_ONLY_PUBLIC);
+foreach (array_merge($invalidReservedV4Ips, $invalidV6Ips, $invalidPrivateV4Ips, $invalidPrivateV6Ips) as $ip)
+{
+  try
+  {
+    $v->clean($ip);
+    $t->fail(sprintf("%s is not considered as valid ip", $ip));
+  }
+  catch (sfValidatorError $e)
+  {
+    $t->pass(sprintf("%s is not considered as valid ip", $ip));
+  }
+}
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorNumberTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorNumberTest.php
index 4cd9d567d..1882106ec 100644
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorNumberTest.php
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorNumberTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(13);
 
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorOrTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorOrTest.php
index 2fcac2d24..ac4d04bc9 100644
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorOrTest.php
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorOrTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(18);
 
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorPassTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorPassTest.php
index 667a60749..aa58574f3 100644
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorPassTest.php
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorPassTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(2);
 
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorRegexTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorRegexTest.php
index a351333c6..2b5df4bbe 100644
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorRegexTest.php
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorRegexTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 function generate_regex()
 {
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorSchemaCompareTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorSchemaCompareTest.php
index 2f4c996de..c8b79d280 100644
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorSchemaCompareTest.php
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorSchemaCompareTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(114);
 
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorSchemaFilterTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorSchemaFilterTest.php
index ef18f0155..26a72b902 100644
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorSchemaFilterTest.php
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorSchemaFilterTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(6);
 
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorSchemaForEachTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorSchemaForEachTest.php
deleted file mode 100644
index 9aa481e32..000000000
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorSchemaForEachTest.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-$t = new lime_test(5);
-
-$v1 = new sfValidatorString(array('min_length' => 3));
-
-// __construct()
-$t->diag('__construct()');
-$v = new sfValidatorSchemaForEach($v1, 3);
-$t->is($v->getFields(), array($v1, $v1, $v1), '->__construct() takes a sfValidator object as its first argument');
-
-$v = new sfValidatorSchemaForEach($v1, 6);
-$t->is($v->getFields(), array($v1, $v1, $v1, $v1, $v1, $v1), '->__construct() takes a number of times to duplicate the validator');
-
-// ->clean()
-$t->diag('->clean()');
-try
-{
-  $v->clean(array('f', 'a', 'b', 'i', 'e', 'n'));
-  $t->fail('->clean() throws an sfValidatorError');
-  $t->skip('', 2);
-}
-catch (sfValidatorError $e)
-{
-  $t->pass('->clean() throws an sfValidatorError');
-  $t->is(count($e->getGlobalErrors()), 0, '->clean() does not throw global errors');
-  $t->is(count($e->getNamedErrors()), 6, '->clean() throws named errors');
-}
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorSchemaTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorSchemaTest.php
index 07d64dccf..83708a608 100644
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorSchemaTest.php
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorSchemaTest.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
-$t = new lime_test(84);
+$t = new lime_test(94);
 
 class PreValidator extends sfValidatorBase
 {
@@ -20,6 +20,8 @@ protected function doClean($values)
     {
       throw new sfValidatorError($this, 's1_or_s2', array('value' => $values));
     }
+
+    return array_map('strtoupper', $values);
   }
 }
 
@@ -46,6 +48,14 @@ protected function doClean($values)
   }
 }
 
+class BytesValidatorSchema extends sfValidatorSchema
+{
+  public function getBytes($value)
+  {
+    return parent::getBytes($value);
+  }
+}
+
 $v1 = new sfValidatorString(array('max_length' => 3));
 $v2 = new sfValidatorString(array('min_length' => 3));
 
@@ -174,6 +184,9 @@ protected function doClean($values)
   $t->is($e[0]->getCode(), 's1_or_s2', '->clean() throws an exception with all error messages');
 }
 
+$s = $v->clean(array('s1' => 'foo'));
+$t->is('FOO', $s['s1'], '->clean() takes values returned by pre-validator');
+
 // ->getPostValidator() ->setPostValidator()
 $t->diag('->getPostValidator() ->setPostValidator()');
 $v1 = new sfValidatorString(array('max_length' => 3, 'required' => false));
@@ -396,3 +409,15 @@ protected function doClean($values)
 $t->ok($v1->getPreValidator() == $v->getPreValidator(), '__clone() clones the pre validator');
 $t->ok($v1->getPostValidator() !== $v->getPostValidator(), '__clone() clones the post validator');
 $t->ok($v1->getPostValidator() == $v->getPostValidator(), '__clone() clones the post validator');
+
+$t->diag('convert post_max_size to bytes');
+$v = new BytesValidatorSchema();
+$t->is($v->getBytes(null), 0, 'empty string considered as 0 bytes');
+$t->is($v->getBytes(''), 0, 'empty string considered as 0 bytes');
+$t->is($v->getBytes('0'), 0, 'simple bytes');
+$t->is($v->getBytes('1'), 1, 'simple bytes');
+$t->is($v->getBytes('1B'), 1, 'simple bytes');
+$t->is($v->getBytes('1K'), 1024, 'kilobytes');
+$t->is($v->getBytes('1M'), 1024 * 1024, 'megabytes short syntax');
+$t->is($v->getBytes('0.5M'), 1024 * 1024 / 2, 'fractional megabytes');
+$t->is($v->getBytes('1G'), 1024 * 1024 * 1024, 'gigabytes');
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorStringTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorStringTest.php
index fc40eb4b1..072ee267f 100644
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorStringTest.php
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorStringTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(12);
 
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorTimeTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorTimeTest.php
index 7a952a1a4..751687f59 100644
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorTimeTest.php
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorTimeTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(27);
 
diff --git a/lib/vendor/symfony/test/unit/validator/sfValidatorUrlTest.php b/lib/vendor/symfony/test/unit/validator/sfValidatorUrlTest.php
index bffe4e034..9d1a083b6 100644
--- a/lib/vendor/symfony/test/unit/validator/sfValidatorUrlTest.php
+++ b/lib/vendor/symfony/test/unit/validator/sfValidatorUrlTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(15);
 
diff --git a/lib/vendor/symfony/test/unit/view/sfViewCacheManagerTest.php b/lib/vendor/symfony/test/unit/view/sfViewCacheManagerTest.php
index d1accaec4..4d115cc55 100644
--- a/lib/vendor/symfony/test/unit/view/sfViewCacheManagerTest.php
+++ b/lib/vendor/symfony/test/unit/view/sfViewCacheManagerTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 require_once($_test_dir.'/unit/sfContextMock.class.php');
 
 $t = new lime_test(41);
diff --git a/lib/vendor/symfony/test/unit/view/sfViewParameterHolderTest.php b/lib/vendor/symfony/test/unit/view/sfViewParameterHolderTest.php
index c451bc4f3..f6ffbf749 100644
--- a/lib/vendor/symfony/test/unit/view/sfViewParameterHolderTest.php
+++ b/lib/vendor/symfony/test/unit/view/sfViewParameterHolderTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 require_once($_test_dir.'/unit/sfContextMock.class.php');
 
 $t = new lime_test(21);
diff --git a/lib/vendor/symfony/test/unit/view/sfViewTest.php b/lib/vendor/symfony/test/unit/view/sfViewTest.php
index 07ef7a2e9..450aede22 100644
--- a/lib/vendor/symfony/test/unit/view/sfViewTest.php
+++ b/lib/vendor/symfony/test/unit/view/sfViewTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 require_once($_test_dir.'/unit/sfContextMock.class.php');
 
 $t = new lime_test(19);
diff --git a/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nChoiceCountryTest.php b/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nChoiceCountryTest.php
index 7a4460871..b0187961d 100644
--- a/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nChoiceCountryTest.php
+++ b/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nChoiceCountryTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../../bootstrap/unit.php');
+require_once(__DIR__.'/../../../bootstrap/unit.php');
 
 $t = new lime_test(8);
 
@@ -41,7 +41,7 @@
 // Test for ICU Upgrade and Ticket #7988
 // should be 0. Tests will break after ICU Update, which is fine. change count to 0
 $t->is(count($css->matchAll('#country option[value="ZZ"]')), 1, '->render() does not contain dummy data');
-$t->is(count($css->matchAll('#country option[value="419"]')), 1, '->render() does not contain region data');
+$t->is(count($css->matchAll('#country option[value="419"]')), 0, '->render() does not contain region data');
 
 // add_empty
 $t->diag('add_empty');
diff --git a/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nChoiceCurrencyTest.php b/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nChoiceCurrencyTest.php
index 903266f9d..367dc3b8b 100644
--- a/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nChoiceCurrencyTest.php
+++ b/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nChoiceCurrencyTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../../bootstrap/unit.php');
+require_once(__DIR__.'/../../../bootstrap/unit.php');
 
 $t = new lime_test(7);
 
diff --git a/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nChoiceLanguageTest.php b/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nChoiceLanguageTest.php
index 0148ad263..c954d7c4b 100644
--- a/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nChoiceLanguageTest.php
+++ b/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nChoiceLanguageTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../../bootstrap/unit.php');
+require_once(__DIR__.'/../../../bootstrap/unit.php');
 
 $t = new lime_test(6);
 
diff --git a/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nChoiceTimezoneTest.php b/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nChoiceTimezoneTest.php
index 09fee3eee..99d4903ef 100644
--- a/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nChoiceTimezoneTest.php
+++ b/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nChoiceTimezoneTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../../bootstrap/unit.php');
+require_once(__DIR__.'/../../../bootstrap/unit.php');
 
 $t = new lime_test(4);
 
diff --git a/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nDateTest.php b/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nDateTest.php
index 99c5079a4..5efb3dc50 100644
--- a/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nDateTest.php
+++ b/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nDateTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../../bootstrap/unit.php');
+require_once(__DIR__.'/../../../bootstrap/unit.php');
 
 $t = new lime_test(7);
 
diff --git a/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nDateTimeTest.php b/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nDateTimeTest.php
index 0d3473706..a12d4901b 100644
--- a/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nDateTimeTest.php
+++ b/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nDateTimeTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../../bootstrap/unit.php');
+require_once(__DIR__.'/../../../bootstrap/unit.php');
 
 $t = new lime_test(1);
 
diff --git a/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nTimeTest.php b/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nTimeTest.php
index ed6f8e66f..75f37bf73 100644
--- a/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nTimeTest.php
+++ b/lib/vendor/symfony/test/unit/widget/i18n/sfWidgetFormI18nTimeTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../../bootstrap/unit.php');
+require_once(__DIR__.'/../../../bootstrap/unit.php');
 
 $t = new lime_test(4);
 
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormChoiceTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormChoiceTest.php
index 12c5f29d8..eb3c90a54 100644
--- a/lib/vendor/symfony/test/unit/widget/sfWidgetFormChoiceTest.php
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetFormChoiceTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 class FormFormatterStub extends sfWidgetFormSchemaFormatter
 {
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormDateRangeTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormDateRangeTest.php
index adcc6d86b..a0278a817 100644
--- a/lib/vendor/symfony/test/unit/widget/sfWidgetFormDateRangeTest.php
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetFormDateRangeTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 class FormFormatterMock extends sfWidgetFormSchemaFormatter
 {
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormDateTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormDateTest.php
index 06d06f072..cca41669a 100644
--- a/lib/vendor/symfony/test/unit/widget/sfWidgetFormDateTest.php
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetFormDateTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $year = date('Y');
 
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormDateTimeTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormDateTimeTest.php
index 8cbb455b0..582ec0625 100644
--- a/lib/vendor/symfony/test/unit/widget/sfWidgetFormDateTimeTest.php
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetFormDateTimeTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $year = date('Y');
 
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormFilterDateTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormFilterDateTest.php
index ff1750f3c..62a1a2f7b 100644
--- a/lib/vendor/symfony/test/unit/widget/sfWidgetFormFilterDateTest.php
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetFormFilterDateTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 class FormFormatterStub extends sfWidgetFormSchemaFormatter
 {
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormFilterInputTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormFilterInputTest.php
index 2842a6bbd..94a3cbab0 100644
--- a/lib/vendor/symfony/test/unit/widget/sfWidgetFormFilterInputTest.php
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetFormFilterInputTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 class FormFormatterStub extends sfWidgetFormSchemaFormatter
 {
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputCheckboxTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputCheckboxTest.php
index ea6dfff51..3d6f4af8f 100644
--- a/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputCheckboxTest.php
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputCheckboxTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(7);
 
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputFileEditableTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputFileEditableTest.php
index b8ec612fb..0d2ea3646 100644
--- a/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputFileEditableTest.php
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputFileEditableTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 class FormFormatterStub extends sfWidgetFormSchemaFormatter
 {
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputFileMultiTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputFileMultiTest.php
new file mode 100644
index 000000000..cc83e6571
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputFileMultiTest.php
@@ -0,0 +1,13 @@
+<?php
+
+require_once(__DIR__.'/../../bootstrap/unit.php');
+
+$t = new lime_test(1);
+
+$w = new sfWidgetFormInputFileMulti();
+
+// ->render()
+$t->diag('->render() multiple file upload');
+$t->is($w->render('foo'), '<input type="file" name="foo[]" multiple="1" id="foo" />', '->render() renders the widget as HTML');
+
+
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputFileTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputFileTest.php
index b154709b8..60d994132 100644
--- a/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputFileTest.php
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputFileTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(1);
 
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputHiddenTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputHiddenTest.php
index adb512ac2..7bb3cfbcd 100644
--- a/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputHiddenTest.php
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputHiddenTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(2);
 
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputPasswordTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputPasswordTest.php
index eecb4fdb0..12755af4b 100644
--- a/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputPasswordTest.php
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputPasswordTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(3);
 
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputReadTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputReadTest.php
new file mode 100644
index 000000000..7a662e1a0
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputReadTest.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once(__DIR__.'/../../bootstrap/unit.php');
+
+$t = new lime_test(6);
+
+$w = new sfWidgetFormInputRead();
+
+// ->render()
+$t->diag('->render()');
+$t->is($w->render('foo'), '<input type="hidden" name="foo" id="foo" /><input type="text" readonly="readonly" style="border: 0;" />', '->render() renders the widget as HTML');
+$t->is($w->render('foo', 'bar'), '<input type="hidden" name="foo" value="bar" id="foo" /><input type="text" value="bar" readonly="readonly" style="border: 0;" />', '->render() can take a value for the input');
+$t->is($w->render('foo', '', array('class' => 'foobar', 'style' => 'width: 500px;')), '<input type="hidden" name="foo" value="" id="foo" /><input type="text" value="" readonly="readonly" style="border: 0; width: 500px;" class="foobar" />', '->render() can take HTML attributes as its third argument');
+
+$w = new sfWidgetFormInputRead(array('text' => 'Read text'));
+$t->is($w->render('foo', 'bar'), '<input type="hidden" name="foo" value="bar" id="foo" /><input type="text" value="Read text" readonly="readonly" style="border: 0;" />', '->render() can take a value for the input and another value for read input');
+
+$w = new sfWidgetFormInputRead(array(), array('class' => 'foobar', 'style' => 'width: 500px;'));
+$t->is($w->render('foo'), '<input type="hidden" name="foo" id="foo" /><input type="text" readonly="readonly" style="border: 0; width: 500px;" class="foobar" />', '__construct() can take default HTML attributes');
+$t->is($w->render('foo', null, array('class' => 'barfoo')), '<input type="hidden" name="foo" id="foo" /><input type="text" readonly="readonly" style="border: 0;" class="barfoo" />', '->render() can override default attributes');
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputTextTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputTextTest.php
index c8ef775ec..c3412a9c8 100644
--- a/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputTextTest.php
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetFormInputTextTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(5);
 
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormSchemaDecoratorTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormSchemaDecoratorTest.php
index 897f1b83b..1efd9914e 100644
--- a/lib/vendor/symfony/test/unit/widget/sfWidgetFormSchemaDecoratorTest.php
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetFormSchemaDecoratorTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(16);
 
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormSchemaForEachTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormSchemaForEachTest.php
deleted file mode 100644
index 3e26fd7e5..000000000
--- a/lib/vendor/symfony/test/unit/widget/sfWidgetFormSchemaForEachTest.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
-
-$t = new lime_test(4);
-
-$w1 = new sfWidgetFormInputText();
-$w = new sfWidgetFormSchema(array('w1' => $w1));
-
-// __construct()
-$t->diag('__construct()');
-$wf = new sfWidgetFormSchemaForEach($w, 2);
-// avoid recursive loop in comparison
-$wf[0]['w1']->setParent(null); $wf[1]['w1']->setParent(null);
-$t->ok($wf[0]['w1'] !== $w1, '__construct() takes a sfWidgetFormSchema as its first argument');
-$t->ok($wf[0]['w1'] == $w1, '__construct() takes a sfWidgetFormSchema as its first argument');
-$t->ok($wf[1]['w1'] !== $w1, '__construct() takes a sfWidgetFormSchema as its first argument');
-$t->ok($wf[1]['w1'] == $w1, '__construct() takes a sfWidgetFormSchema as its first argument');
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormSchemaFormatterListTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormSchemaFormatterListTest.php
index 96035a662..7196afeaa 100644
--- a/lib/vendor/symfony/test/unit/widget/sfWidgetFormSchemaFormatterListTest.php
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetFormSchemaFormatterListTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(2);
 
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormSchemaFormatterTableTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormSchemaFormatterTableTest.php
index 16d2ec17d..4e165d73e 100644
--- a/lib/vendor/symfony/test/unit/widget/sfWidgetFormSchemaFormatterTableTest.php
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetFormSchemaFormatterTableTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(2);
 
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormSchemaFormatterTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormSchemaFormatterTest.php
index 7b8b60cc6..173722d73 100644
--- a/lib/vendor/symfony/test/unit/widget/sfWidgetFormSchemaFormatterTest.php
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetFormSchemaFormatterTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(28);
 
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormSchemaTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormSchemaTest.php
index e65241478..cb1bc19f9 100644
--- a/lib/vendor/symfony/test/unit/widget/sfWidgetFormSchemaTest.php
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetFormSchemaTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(95);
 
@@ -46,44 +46,44 @@
 $w['w1'] = $w1;
 $w['w2'] = $w2;
 $w1->setParent($w); $w2->setParent($w);
-$t->ok($w->getFields() == array('w1' => $w1, 'w2' => $w2), 'sfWidgetFormSchema implements the ArrayAccess interface for the fields');
+$t->ok($w->getFields() == array('w1' => $w1, 'w2' => $w2), '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
 $t->is($w1->getParent(), $w, 'The widget schema is associated with the fields');
 $t->is($w2->getParent(), $w, 'The widget schema is associated with the fields');
 
 try
 {
   $w['w1'] = 'string';
-  $t->fail('sfWidgetFormSchema implements the ArrayAccess interface for the fields');
+  $t->fail('"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
 }
 catch (LogicException $e)
 {
-  $t->pass('sfWidgetFormSchema implements the ArrayAccess interface for the fields');
+  $t->pass('"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
 }
 
 $w = new sfWidgetFormSchema(array('w1' => $w1));
-$t->is(isset($w['w1']), true, 'sfWidgetFormSchema implements the ArrayAccess interface for the fields');
-$t->is(isset($w['w2']), false, 'sfWidgetFormSchema implements the ArrayAccess interface for the fields');
+$t->is(isset($w['w1']), true, '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
+$t->is(isset($w['w2']), false, '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
 
 $w = new sfWidgetFormSchema(array('w1' => $w1));
 $w1->setParent($w); $w2->setParent($w);
-$t->ok($w['w1'] == $w1, 'sfWidgetFormSchema implements the ArrayAccess interface for the fields');
-$t->is($w['w2'], null, 'sfWidgetFormSchema implements the ArrayAccess interface for the fields');
+$t->ok($w['w1'] == $w1, '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
+$t->is($w['w2'], null, '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
 
 $w = new sfWidgetFormSchema(array('w1' => $w1, 'w2' => $w2));
 unset($w['w1']);
-$t->is($w['w1'], null, 'sfWidgetFormSchema implements the ArrayAccess interface for the fields');
-$t->is($w->getPositions(), array('w2'), 'sfWidgetFormSchema implements the ArrayAccess interface for the fields');
+$t->is($w['w1'], null, '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
+$t->is($w->getPositions(), array('w2'), '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
 
 // unset with numeric keys
 $w = new sfWidgetFormSchema(array('0' => $w1, 'w2' => $w2));
 unset($w['w2']);
-$t->is($w['w2'], null, 'sfWidgetFormSchema implements the ArrayAccess interface for the fields');
-$t->is($w->getPositions(), array('0'), 'sfWidgetFormSchema implements the ArrayAccess interface for the fields');
+$t->is($w['w2'], null, '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
+$t->is($w->getPositions(), array('0'), '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
 
 $w = new sfWidgetFormSchema(array('w1' => $w1, '0' => $w2));
 unset($w[0]);
-$t->is($w[0], null, 'sfWidgetFormSchema implements the ArrayAccess interface for the fields');
-$t->is($w->getPositions(), array('w1'), 'sfWidgetFormSchema implements the ArrayAccess interface for the fields');
+$t->is($w[0], null, '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
+$t->is($w->getPositions(), array('w1'), '"sfWidgetFormSchema" implements the ArrayAccess interface for the fields');
 
 
 // ->addFormFormatter() ->setFormFormatterName() ->getFormFormatterName() ->getFormFormatter() ->getFormFormatters()
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormSelectCheckboxTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormSelectCheckboxTest.php
index 5480cd0e0..122932427 100644
--- a/lib/vendor/symfony/test/unit/widget/sfWidgetFormSelectCheckboxTest.php
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetFormSelectCheckboxTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 class FormFormatterStub extends sfWidgetFormSchemaFormatter
 {
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormSelectManyTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormSelectManyTest.php
index 6be1e9744..066936830 100644
--- a/lib/vendor/symfony/test/unit/widget/sfWidgetFormSelectManyTest.php
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetFormSelectManyTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(1);
 
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormSelectRadioTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormSelectRadioTest.php
index 23243b49d..6b744f1af 100644
--- a/lib/vendor/symfony/test/unit/widget/sfWidgetFormSelectRadioTest.php
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetFormSelectRadioTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 class FormFormatterStub extends sfWidgetFormSchemaFormatter
 {
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormSelectTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormSelectTest.php
index 96ff68914..85d7bde7b 100644
--- a/lib/vendor/symfony/test/unit/widget/sfWidgetFormSelectTest.php
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetFormSelectTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 class FormFormatterStub extends sfWidgetFormSchemaFormatter
 {
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormTest.php
index 68998a88e..cfff314e3 100644
--- a/lib/vendor/symfony/test/unit/widget/sfWidgetFormTest.php
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetFormTest.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
-$t = new lime_test(34);
+$t = new lime_test(35);
 
 class MyWidgetForm extends sfWidgetForm
 {
@@ -106,12 +106,13 @@ public function generateId($name, $value = null)
 $t->is($w->generateId('foo[]'), 'id_for_foo_works', '->generateId() removes the [] from the name');
 $t->is($w->generateId('foo[bar][]'), 'id_for_foo_bar_works', '->generateId() replaces [] with _');
 $t->is($w->generateId('foo[bar][]', 'test'), 'id_for_foo_bar_test_works', '->generateId() takes the value into account if provided');
-$t->is($w->generateId('_foo[bar][]', 'test'), 'id_for__foo_bar_test_works', '->generateId() leaves valid ids'); 
+$t->is($w->generateId('_foo[bar][]', 'test'), 'id_for__foo_bar_test_works', '->generateId() leaves valid ids');
 
 $w->setIdFormat('id');
 $t->is($w->generateId('foo[bar][]', 'test'), 'foo_bar_test', '->generateId() returns the name if the id format does not contain %s');
+$t->is($w->generateId('foo[bar][]', array('test1', 'test2')), 'foo_bar', '->generateId() ignore the value if not a string');
 
 $w->setIdFormat('%s');
-$t->is($w->generateId('_foo[bar][]', 'test'), 'foo_bar_test', '->generateId() removes invalid characters'); 
-$t->is($w->generateId('_foo@bar'), 'foo_bar', '->generateId() removes invalid characters'); 
-$t->is($w->generateId('_____foo@bar'), 'foo_bar', '->generateId() removes invalid characters'); 
+$t->is($w->generateId('_foo[bar][]', 'test'), 'foo_bar_test', '->generateId() removes invalid characters');
+$t->is($w->generateId('_foo@bar'), 'foo_bar', '->generateId() removes invalid characters');
+$t->is($w->generateId('_____foo@bar'), 'foo_bar', '->generateId() removes invalid characters');
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormTextareaTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormTextareaTest.php
index 4bda4e145..c69ab0949 100644
--- a/lib/vendor/symfony/test/unit/widget/sfWidgetFormTextareaTest.php
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetFormTextareaTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(4);
 
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetFormTimeTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetFormTimeTest.php
index 2a3460703..928a4572b 100644
--- a/lib/vendor/symfony/test/unit/widget/sfWidgetFormTimeTest.php
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetFormTimeTest.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
 $t = new lime_test(43);
 
diff --git a/lib/vendor/symfony/test/unit/widget/sfWidgetTest.php b/lib/vendor/symfony/test/unit/widget/sfWidgetTest.php
index 6c210a972..09b8d3f1b 100644
--- a/lib/vendor/symfony/test/unit/widget/sfWidgetTest.php
+++ b/lib/vendor/symfony/test/unit/widget/sfWidgetTest.php
@@ -8,9 +8,9 @@
  * file that was distributed with this source code.
  */
 
-require_once(dirname(__FILE__).'/../../bootstrap/unit.php');
+require_once(__DIR__.'/../../bootstrap/unit.php');
 
-$t = new lime_test(32);
+$t = new lime_test(33);
 
 class MyWidget extends sfWidget
 {
@@ -73,6 +73,7 @@ protected function configure($options = array(), $attributes = array())
 $w->setOption('foo', 'bar');
 $t->is($w->getOption('foo'), 'bar', '->setOption() sets an option value');
 $t->is($w->getOption('nonexistant'), null, '->getOption() returns null if the option does not exist');
+$t->is($w->getOption('nonexistant', 'default value'), 'default value', '->getOption() returns default value if the option does not exist');
 $t->is($w->hasOption('foo'), true, '->hasOption() returns true if the option exist');
 $t->is($w->hasOption('nonexistant'), false, '->hasOption() returns false if the option does not exist');
 try
diff --git a/lib/vendor/symfony/test/unit/yaml/fixtures/YtsAnchorAlias.yml b/lib/vendor/symfony/test/unit/yaml/fixtures/YtsAnchorAlias.yml
new file mode 100644
index 000000000..5f9c94275
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/yaml/fixtures/YtsAnchorAlias.yml
@@ -0,0 +1,31 @@
+--- %YAML:1.0
+test: Simple Alias Example
+brief: >
+    If you need to refer to the same item of data twice,
+    you can give that item an alias.  The alias is a plain
+    string, starting with an ampersand.  The item may then
+    be referred to by the alias throughout your document
+    by using an asterisk before the name of the alias.
+    This is called an anchor.
+yaml: |
+    - &showell Steve
+    - Clark
+    - Brian
+    - Oren
+    - *showell
+php: |
+    array('Steve', 'Clark', 'Brian', 'Oren', 'Steve')
+
+---
+test: Alias of a Mapping
+brief: >
+    An alias can be used on any item of data, including
+    sequences, mappings, and other complex data types.
+yaml: |
+    - &hello
+        Meat: pork
+        Starch: potato
+    - banana
+    - *hello
+php: |
+    array(array('Meat'=>'pork', 'Starch'=>'potato'), 'banana', array('Meat'=>'pork', 'Starch'=>'potato'))
diff --git a/lib/vendor/symfony/test/unit/yaml/fixtures/YtsBasicTests.yml b/lib/vendor/symfony/test/unit/yaml/fixtures/YtsBasicTests.yml
new file mode 100644
index 000000000..eafee681d
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/yaml/fixtures/YtsBasicTests.yml
@@ -0,0 +1,178 @@
+--- %YAML:1.0
+test: Simple Sequence 
+brief: | 
+    You can specify a list in YAML by placing each 
+    member of the list on a new line with an opening 
+    dash. These lists are called sequences. 
+yaml: | 
+    - apple 
+    - banana 
+    - carrot 
+php: |
+    array('apple', 'banana', 'carrot')
+--- 
+test: Nested Sequences 
+brief: | 
+    You can include a sequence within another 
+    sequence by giving the sequence an empty 
+    dash, followed by an indented list. 
+yaml: | 
+    - 
+     - foo 
+     - bar 
+     - baz 
+php: | 
+    array(array('foo', 'bar', 'baz'))
+--- 
+test: Mixed Sequences 
+brief: | 
+    Sequences can contain any YAML data, 
+    including strings and other sequences. 
+yaml: | 
+    - apple 
+    - 
+     - foo 
+     - bar 
+     - x123 
+    - banana 
+    - carrot 
+php: | 
+    array('apple', array('foo', 'bar', 'x123'), 'banana', 'carrot')
+--- 
+test: Deeply Nested Sequences 
+brief: | 
+    Sequences can be nested even deeper, with each 
+    level of indentation representing a level of 
+    depth. 
+yaml: | 
+    - 
+     - 
+      - uno 
+      - dos 
+php: | 
+    array(array(array('uno', 'dos')))
+--- 
+test: Simple Mapping 
+brief: | 
+    You can add a keyed list (also known as a dictionary or 
+    hash) to your document by placing each member of the 
+    list on a new line, with a colon seperating the key 
+    from its value.  In YAML, this type of list is called 
+    a mapping. 
+yaml: | 
+    foo: whatever 
+    bar: stuff 
+php: | 
+    array('foo' => 'whatever', 'bar' => 'stuff')
+--- 
+test: Sequence in a Mapping 
+brief: | 
+    A value in a mapping can be a sequence. 
+yaml: | 
+    foo: whatever 
+    bar: 
+     - uno 
+     - dos 
+php: | 
+    array('foo' => 'whatever', 'bar' => array('uno', 'dos'))
+--- 
+test: Nested Mappings 
+brief: | 
+    A value in a mapping can be another mapping. 
+yaml: | 
+    foo: whatever 
+    bar: 
+     fruit: apple 
+     name: steve 
+     sport: baseball 
+php: | 
+    array(
+      'foo' => 'whatever',  
+      'bar' => array(
+         'fruit' => 'apple',  
+         'name' => 'steve', 
+         'sport' => 'baseball' 
+       ) 
+    ) 
+--- 
+test: Mixed Mapping 
+brief: | 
+    A mapping can contain any assortment 
+    of mappings and sequences as values. 
+yaml: | 
+    foo: whatever 
+    bar: 
+     - 
+       fruit: apple 
+       name: steve 
+       sport: baseball 
+     - more 
+     - 
+       python: rocks 
+       perl: papers 
+       ruby: scissorses 
+php: | 
+    array(
+      'foo' => 'whatever',  
+      'bar' => array( 
+        array( 
+            'fruit' => 'apple',  
+            'name' => 'steve', 
+            'sport' => 'baseball' 
+        ), 
+        'more', 
+        array( 
+            'python' => 'rocks', 
+            'perl' => 'papers', 
+            'ruby' => 'scissorses' 
+        ) 
+      ) 
+    ) 
+--- 
+test: Mapping-in-Sequence Shortcut 
+todo: true
+brief: | 
+     If you are adding a mapping to a sequence, you 
+     can place the mapping on the same line as the 
+     dash as a shortcut. 
+yaml: | 
+     - work on YAML.py: 
+        - work on Store 
+php: | 
+    array(array('work on YAML.py' => array('work on Store')))
+---
+test: Sequence-in-Mapping Shortcut
+todo: true
+brief: |
+     The dash in a sequence counts as indentation, so
+     you can add a sequence inside of a mapping without
+     needing spaces as indentation.
+yaml: |
+     allow:
+     - 'localhost'
+     - '%.sourceforge.net'
+     - '%.freepan.org'
+php: |
+     array('allow' => array('localhost', '%.sourceforge.net', '%.freepan.org'))
+---
+todo: true
+test: Merge key
+brief: |
+     A merge key ('<<') can be used in a mapping to insert other mappings.  If
+     the value associated with the merge key is a mapping, each of its key/value
+     pairs is inserted into the current mapping.
+yaml: |
+     mapping:
+       name: Joe
+       job: Accountant
+       <<:
+         age: 38
+php: |
+     array(
+       'mapping' =>
+       array(
+         'name' => 'Joe',
+         'job' => 'Accountant',
+         'age' => 38
+       )
+     )
diff --git a/lib/vendor/symfony/test/unit/yaml/fixtures/YtsBlockMapping.yml b/lib/vendor/symfony/test/unit/yaml/fixtures/YtsBlockMapping.yml
new file mode 100644
index 000000000..3a2d410c9
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/yaml/fixtures/YtsBlockMapping.yml
@@ -0,0 +1,52 @@
+--- 
+test: One Element Mapping 
+brief: | 
+    A mapping with one key/value pair 
+yaml: | 
+    foo: bar 
+php: | 
+    array('foo' => 'bar')
+--- 
+test: Multi Element Mapping 
+brief: | 
+    More than one key/value pair 
+yaml: | 
+    red: baron 
+    white: walls 
+    blue: berries 
+php: | 
+    array(
+     'red' => 'baron', 
+     'white' => 'walls', 
+     'blue' => 'berries', 
+    )
+--- 
+test: Values aligned 
+brief: | 
+    Often times human editors of documents will align the values even 
+    though YAML emitters generally don't. 
+yaml: | 
+    red:   baron 
+    white: walls 
+    blue:  berries 
+php: | 
+    array(
+     'red' => 'baron', 
+     'white' => 'walls', 
+     'blue' => 'berries', 
+    )
+--- 
+test: Colons aligned 
+brief: | 
+    Spaces can come before the ': ' key/value separator. 
+yaml: | 
+    red   : baron 
+    white : walls 
+    blue  : berries 
+php: | 
+    array(
+     'red' => 'baron', 
+     'white' => 'walls', 
+     'blue' => 'berries', 
+    )
+    
\ No newline at end of file
diff --git a/lib/vendor/symfony/test/unit/yaml/fixtures/YtsDocumentSeparator.yml b/lib/vendor/symfony/test/unit/yaml/fixtures/YtsDocumentSeparator.yml
new file mode 100644
index 000000000..d0e3877f9
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/yaml/fixtures/YtsDocumentSeparator.yml
@@ -0,0 +1,85 @@
+--- %YAML:1.0 
+test: Trailing Document Separator 
+todo: true
+brief: > 
+    You can separate YAML documents 
+    with a string of three dashes. 
+yaml: |
+    - foo: 1
+      bar: 2
+    ---
+    more: stuff
+python: |
+    [
+        [ { 'foo': 1, 'bar': 2 } ],
+        { 'more': 'stuff' }
+    ]
+ruby: |
+    [ { 'foo' => 1, 'bar' => 2 } ]
+
+--- 
+test: Leading Document Separator 
+todo: true
+brief: >
+    You can explicity give an opening 
+    document separator to your YAML stream. 
+yaml: |
+    ---
+    - foo: 1
+      bar: 2
+    ---
+    more: stuff
+python: |
+    [ 
+        [ {'foo': 1, 'bar': 2}], 
+        {'more': 'stuff'} 
+    ]
+ruby: |
+    [ { 'foo' => 1, 'bar' => 2 } ] 
+
+--- 
+test: YAML Header 
+todo: true
+brief: > 
+    The opening separator can contain directives 
+    to the YAML parser, such as the version 
+    number. 
+yaml: | 
+    --- %YAML:1.0 
+    foo: 1 
+    bar: 2 
+php: | 
+    array('foo' => 1, 'bar' => 2)
+documents: 1 
+ 
+--- 
+test: Red Herring Document Separator 
+brief: > 
+    Separators included in blocks or strings 
+    are treated as blocks or strings, as the 
+    document separator should have no indentation 
+    preceding it. 
+yaml: | 
+    foo: |
+        ---
+php: | 
+    array('foo' => "---\n")
+ 
+--- 
+test: Multiple Document Separators in Block 
+brief: > 
+    This technique allows you to embed other YAML 
+    documents within literal blocks. 
+yaml: | 
+    foo: | 
+        ---
+        foo: bar
+        ---
+        yo: baz
+    bar: | 
+        fooness
+php: | 
+    array( 
+       'foo' => "---\nfoo: bar\n---\nyo: baz\n", 
+       'bar' => "fooness\n" 
+    )
diff --git a/lib/vendor/symfony/test/unit/yaml/fixtures/YtsErrorTests.yml b/lib/vendor/symfony/test/unit/yaml/fixtures/YtsErrorTests.yml
new file mode 100644
index 000000000..c0d6d6d3b
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/yaml/fixtures/YtsErrorTests.yml
@@ -0,0 +1,26 @@
+--- 
+test: Missing value for hash item 
+todo: true
+brief: | 
+    Third item in this hash doesn't have a value 
+yaml: | 
+    okay: value 
+    also okay: ~ 
+    causes error because no value specified 
+    last key: value okay here too 
+python-error: causes error because no value specified 
+ 
+--- 
+test: Not indenting enough 
+brief: | 
+    There was a bug in PyYaml where it was off by one 
+    in the indentation check.  It was allowing the YAML  
+    below. 
+# This is actually valid YAML now. Someone should tell showell. 
+yaml: | 
+    foo: 
+    firstline: 1 
+    secondline: 2 
+php: |
+  array('foo' => null, 'firstline' => 1, 'secondline' => 2)
+
diff --git a/lib/vendor/symfony/test/unit/yaml/fixtures/YtsFlowCollections.yml b/lib/vendor/symfony/test/unit/yaml/fixtures/YtsFlowCollections.yml
new file mode 100644
index 000000000..56bf6b87f
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/yaml/fixtures/YtsFlowCollections.yml
@@ -0,0 +1,60 @@
+--- 
+test: Simple Inline Array 
+brief: > 
+    Sequences can be contained on a 
+    single line, using the inline syntax. 
+    Separate each entry with commas and 
+    enclose in square brackets. 
+yaml: | 
+    seq: [ a, b, c ] 
+php: | 
+    array('seq' => array('a', 'b', 'c'))
+--- 
+test: Simple Inline Hash 
+brief: > 
+    Mapping can also be contained on 
+    a single line, using the inline 
+    syntax.  Each key-value pair is 
+    separated by a colon, with a comma 
+    between each entry in the mapping. 
+    Enclose with curly braces. 
+yaml: | 
+    hash: { name: Steve, foo: bar } 
+php: | 
+    array('hash' => array('name' => 'Steve', 'foo' => 'bar'))
+--- 
+test: Multi-line Inline Collections 
+todo: true
+brief: > 
+    Both inline sequences and inline mappings 
+    can span multiple lines, provided that you 
+    indent the additional lines. 
+yaml: | 
+    languages: [ Ruby, 
+                 Perl, 
+                 Python ] 
+    websites: { YAML: yaml.org, 
+                Ruby: ruby-lang.org, 
+                Python: python.org, 
+                Perl: use.perl.org } 
+php: | 
+    array(
+      'languages' => array('Ruby', 'Perl', 'Python'), 
+      'websites' => array(
+        'YAML' => 'yaml.org', 
+        'Ruby' => 'ruby-lang.org', 
+        'Python' => 'python.org', 
+        'Perl' => 'use.perl.org'  
+      )
+    )
+--- 
+test: Commas in Values (not in the spec!)
+todo: true
+brief: > 
+    List items in collections are delimited by commas, but  
+    there must be a space after each comma.  This allows you 
+    to add numbers without quoting. 
+yaml: | 
+    attendances: [ 45,123, 70,000, 17,222 ] 
+php: | 
+    array('attendances' => array(45123, 70000, 17222))
diff --git a/lib/vendor/symfony/test/unit/yaml/fixtures/YtsFoldedScalars.yml b/lib/vendor/symfony/test/unit/yaml/fixtures/YtsFoldedScalars.yml
new file mode 100644
index 000000000..d1432f63b
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/yaml/fixtures/YtsFoldedScalars.yml
@@ -0,0 +1,176 @@
+--- %YAML:1.0 
+test: Single ending newline 
+brief: > 
+    A pipe character, followed by an indented
+    block of text is treated as a literal
+    block, in which newlines are preserved
+    throughout the block, including the final
+    newline.
+yaml: | 
+    ---
+    this: |
+        Foo
+        Bar
+php: | 
+    array('this' => "Foo\nBar\n")
+--- 
+test: The '+' indicator 
+brief: > 
+    The '+' indicator says to keep newlines at the end of text 
+    blocks. 
+yaml: |
+    normal: |
+      extra new lines not kept
+
+    preserving: |+
+      extra new lines are kept
+
+
+    dummy: value
+php: | 
+    array( 
+        'normal' => "extra new lines not kept\n", 
+        'preserving' => "extra new lines are kept\n\n\n", 
+        'dummy' => 'value' 
+    ) 
+--- 
+test: Three trailing newlines in literals 
+brief: > 
+    To give you more control over how space 
+    is preserved in text blocks, YAML has 
+    the keep '+' and chomp '-' indicators. 
+    The keep indicator will preserve all 
+    ending newlines, while the chomp indicator 
+    will strip all ending newlines. 
+yaml: |
+    clipped: |
+        This has one newline.
+
+
+
+    same as "clipped" above: "This has one newline.\n"
+
+    stripped: |-
+        This has no newline.
+
+
+
+    same as "stripped" above: "This has no newline."
+
+    kept: |+
+        This has four newlines.
+
+
+
+    same as "kept" above: "This has four newlines.\n\n\n\n"
+php: |
+    array(  
+      'clipped' => "This has one newline.\n", 
+      'same as "clipped" above' => "This has one newline.\n", 
+      'stripped' => 'This has no newline.', 
+      'same as "stripped" above' => 'This has no newline.', 
+      'kept' => "This has four newlines.\n\n\n\n", 
+      'same as "kept" above' => "This has four newlines.\n\n\n\n" 
+    )
+--- 
+test: Extra trailing newlines with spaces
+todo: true
+brief: >
+    Normally, only a single newline is kept 
+    from the end of a literal block, unless the 
+    keep '+' character is used in combination 
+    with the pipe.  The following example 
+    will preserve all ending whitespace 
+    since the last line of both literal blocks 
+    contains spaces which extend past the indentation 
+    level. 
+yaml: |
+    ---
+    this: |
+        Foo
+
+          
+    kept: |+
+        Foo
+
+          
+php: | 
+    array('this' => "Foo\n\n  \n",  
+      'kept' => "Foo\n\n  \n" )
+ 
+--- 
+test: Folded Block in a Sequence 
+brief: > 
+    A greater-then character, followed by an indented 
+    block of text is treated as a folded block, in 
+    which lines of text separated by a single newline 
+    are concatenated as a single line. 
+yaml: | 
+    ---
+    - apple
+    - banana
+    - >
+        can't you see
+        the beauty of yaml?
+        hmm
+    - dog
+php: | 
+    array( 
+        'apple',  
+        'banana',  
+        "can't you see the beauty of yaml? hmm\n", 
+        'dog' 
+    )
+--- 
+test: Folded Block as a Mapping Value 
+brief: > 
+    Both literal and folded blocks can be 
+    used in collections, as values in a  
+    sequence or a mapping. 
+yaml: |
+    ---
+    quote: >
+        Mark McGwire's
+        year was crippled
+        by a knee injury.
+    source: espn
+php: |
+    array( 
+        'quote' => "Mark McGwire's year was crippled by a knee injury.\n", 
+        'source' => 'espn' 
+    ) 
+--- 
+test: Three trailing newlines in folded blocks 
+brief: > 
+    The keep and chomp indicators can also 
+    be applied to folded blocks. 
+yaml: | 
+    clipped: >
+        This has one newline.
+
+
+
+    same as "clipped" above: "This has one newline.\n" 
+ 
+    stripped: >-
+        This has no newline.
+
+
+
+    same as "stripped" above: "This has no newline."
+
+    kept: >+
+        This has four newlines.
+
+
+
+    same as "kept" above: "This has four newlines.\n\n\n\n"
+php: |
+    array(  
+      'clipped' => "This has one newline.\n", 
+      'same as "clipped" above' => "This has one newline.\n", 
+      'stripped' => 'This has no newline.', 
+      'same as "stripped" above' => 'This has no newline.', 
+      'kept' => "This has four newlines.\n\n\n\n", 
+      'same as "kept" above' => "This has four newlines.\n\n\n\n" 
+    )
diff --git a/lib/vendor/symfony/test/unit/yaml/fixtures/YtsNullsAndEmpties.yml b/lib/vendor/symfony/test/unit/yaml/fixtures/YtsNullsAndEmpties.yml
new file mode 100644
index 000000000..4e0c8dbf1
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/yaml/fixtures/YtsNullsAndEmpties.yml
@@ -0,0 +1,45 @@
+--- %YAML:1.0 
+test: Empty Sequence 
+brief: > 
+    You can represent the empty sequence 
+    with an empty inline sequence. 
+yaml: | 
+    empty: [] 
+php: | 
+    array('empty' => array())
+--- 
+test: Empty Mapping 
+brief: > 
+    You can represent the empty mapping 
+    with an empty inline mapping. 
+yaml: | 
+    empty: {} 
+php: | 
+    array('empty' => array())
+--- 
+test: Empty Sequence as Entire Document 
+yaml: | 
+    [] 
+php: | 
+    array()
+--- 
+test: Empty Mapping as Entire Document 
+yaml: | 
+    {} 
+php: | 
+    array() 
+---  
+test: Null as Document 
+yaml: | 
+    ~ 
+php: | 
+    null
+--- 
+test: Empty String 
+brief: > 
+    You can represent an empty string 
+    with a pair of quotes. 
+yaml: | 
+    '' 
+php: | 
+    '' 
diff --git a/lib/vendor/symfony/test/unit/yaml/fixtures/YtsSpecificationExamples.yml b/lib/vendor/symfony/test/unit/yaml/fixtures/YtsSpecificationExamples.yml
new file mode 100644
index 000000000..c975fe589
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/yaml/fixtures/YtsSpecificationExamples.yml
@@ -0,0 +1,1681 @@
+--- %YAML:1.0 
+test: Sequence of scalars 
+spec: 2.1
+yaml: | 
+  - Mark McGwire 
+  - Sammy Sosa 
+  - Ken Griffey 
+php: | 
+  array('Mark McGwire', 'Sammy Sosa', 'Ken Griffey')
+--- 
+test: Mapping of scalars to scalars 
+spec: 2.2
+yaml: | 
+  hr:  65 
+  avg: 0.278 
+  rbi: 147 
+php: | 
+  array('hr' => 65, 'avg' => 0.278, 'rbi' => 147)
+--- 
+test: Mapping of scalars to sequences 
+spec: 2.3
+yaml: | 
+    american: 
+       - Boston Red Sox 
+       - Detroit Tigers 
+       - New York Yankees 
+    national: 
+       - New York Mets 
+       - Chicago Cubs 
+       - Atlanta Braves 
+php: | 
+    array('american' =>  
+        array( 'Boston Red Sox', 'Detroit Tigers',  
+          'New York Yankees' ), 
+      'national' => 
+        array( 'New York Mets', 'Chicago Cubs',  
+          'Atlanta Braves' )
+    ) 
+--- 
+test: Sequence of mappings 
+spec: 2.4
+yaml: | 
+    -  
+      name: Mark McGwire 
+      hr:   65 
+      avg:  0.278 
+    -  
+      name: Sammy Sosa 
+      hr:   63 
+      avg:  0.288 
+php: | 
+    array( 
+      array('name' => 'Mark McGwire', 'hr' => 65, 'avg' => 0.278), 
+      array('name' => 'Sammy Sosa', 'hr' => 63, 'avg' => 0.288) 
+    )
+--- 
+test: Legacy A5 
+todo: true
+spec: legacy_A5 
+yaml: | 
+    ? 
+        - New York Yankees 
+        - Atlanta Braves 
+    : 
+      - 2001-07-02 
+      - 2001-08-12 
+      - 2001-08-14 
+    ? 
+        - Detroit Tigers 
+        - Chicago Cubs 
+    : 
+      - 2001-07-23 
+perl-busted: > 
+    YAML.pm will be able to emulate this behavior soon. In this regard 
+    it may be somewhat more correct than Python's native behaviour which 
+    can only use tuples as mapping keys. PyYAML will also need to figure 
+    out some clever way to roundtrip structured keys.
+python: | 
+    [ 
+    { 
+        ('New York Yankees', 'Atlanta Braves'): 
+            [yaml.timestamp('2001-07-02'),  
+             yaml.timestamp('2001-08-12'), 
+             yaml.timestamp('2001-08-14')], 
+        ('Detroit Tigers', 'Chicago Cubs'): 
+        [yaml.timestamp('2001-07-23')] 
+    } 
+    ] 
+ruby: | 
+    { 
+      [ 'New York Yankees', 'Atlanta Braves' ] => 
+        [ Date.new( 2001, 7, 2 ), Date.new( 2001, 8, 12 ), Date.new( 2001, 8, 14 ) ], 
+      [ 'Detroit Tigers', 'Chicago Cubs' ] => 
+        [ Date.new( 2001, 7, 23 ) ] 
+    } 
+syck: |
+  struct test_node seq1[] = {
+      { T_STR, 0, "New York Yankees" },
+      { T_STR, 0, "Atlanta Braves" },
+      end_node
+  };
+  struct test_node seq2[] = {
+      { T_STR, 0, "2001-07-02" },
+      { T_STR, 0, "2001-08-12" },
+      { T_STR, 0, "2001-08-14" },
+      end_node
+  };
+  struct test_node seq3[] = {
+      { T_STR, 0, "Detroit Tigers" },
+      { T_STR, 0, "Chicago Cubs" },
+      end_node
+  };
+  struct test_node seq4[] = {
+      { T_STR, 0, "2001-07-23" },
+      end_node
+  };
+  struct test_node map[] = {
+      { T_SEQ, 0, 0, seq1 },
+      { T_SEQ, 0, 0, seq2 },
+      { T_SEQ, 0, 0, seq3 },
+      { T_SEQ, 0, 0, seq4 },
+      end_node
+  };
+  struct test_node stream[] = {
+      { T_MAP, 0, 0, map },
+      end_node
+  };
+ 
+--- 
+test: Sequence of sequences 
+spec: 2.5
+yaml: | 
+  - [ name         , hr , avg   ] 
+  - [ Mark McGwire , 65 , 0.278 ] 
+  - [ Sammy Sosa   , 63 , 0.288 ] 
+php: | 
+  array( 
+    array( 'name', 'hr', 'avg' ), 
+    array( 'Mark McGwire', 65, 0.278 ), 
+    array( 'Sammy Sosa', 63, 0.288 ) 
+  )
+--- 
+test: Mapping of mappings 
+todo: true
+spec: 2.6
+yaml: | 
+  Mark McGwire: {hr: 65, avg: 0.278}
+  Sammy Sosa: {
+      hr: 63,
+      avg: 0.288
+    }
+ruby: | 
+  array(  
+    'Mark McGwire' => 
+      array( 'hr' => 65, 'avg' => 0.278 ), 
+    'Sammy Sosa' => 
+      array( 'hr' => 63, 'avg' => 0.288 ) 
+  )
+--- 
+test: Two documents in a stream each with a leading comment
+todo: true
+spec: 2.7 
+yaml: | 
+  # Ranking of 1998 home runs
+  ---
+  - Mark McGwire
+  - Sammy Sosa
+  - Ken Griffey
+  
+  # Team ranking
+  ---
+  - Chicago Cubs
+  - St Louis Cardinals
+ruby: | 
+  y = YAML::Stream.new 
+  y.add( [ 'Mark McGwire', 'Sammy Sosa', 'Ken Griffey' ] ) 
+  y.add( [ 'Chicago Cubs', 'St Louis Cardinals' ] ) 
+documents: 2 
+ 
+--- 
+test: Play by play feed from a game
+todo: true
+spec: 2.8
+yaml: | 
+  ---
+  time: 20:03:20
+  player: Sammy Sosa
+  action: strike (miss)
+  ...
+  ---
+  time: 20:03:47
+  player: Sammy Sosa
+  action: grand slam
+  ...
+perl: | 
+  [ 'Mark McGwire', 'Sammy Sosa', 'Ken Griffey' ] 
+documents: 2 
+ 
+--- 
+test: Single document with two comments 
+spec: 2.9
+yaml: | 
+  hr: # 1998 hr ranking 
+    - Mark McGwire 
+    - Sammy Sosa 
+  rbi: 
+    # 1998 rbi ranking 
+    - Sammy Sosa 
+    - Ken Griffey 
+php: | 
+  array(  
+    'hr' => array( 'Mark McGwire', 'Sammy Sosa' ), 
+    'rbi' => array( 'Sammy Sosa', 'Ken Griffey' )  
+  )
+--- 
+test: Node for Sammy Sosa appears twice in this document 
+spec: 2.10 
+yaml: | 
+   ---
+   hr: 
+      - Mark McGwire 
+      # Following node labeled SS 
+      - &SS Sammy Sosa 
+   rbi: 
+      - *SS # Subsequent occurance 
+      - Ken Griffey 
+php: | 
+   array(
+      'hr' =>
+         array('Mark McGwire', 'Sammy Sosa'),
+      'rbi' =>
+         array('Sammy Sosa', 'Ken Griffey')
+   )
+--- 
+test: Mapping between sequences 
+todo: true
+spec: 2.11
+yaml: | 
+   ? # PLAY SCHEDULE 
+     - Detroit Tigers 
+     - Chicago Cubs 
+   :   
+     - 2001-07-23 
+   
+   ? [ New York Yankees, 
+       Atlanta Braves ] 
+   : [ 2001-07-02, 2001-08-12,  
+       2001-08-14 ] 
+ruby: | 
+   {  
+      [ 'Detroit Tigers', 'Chicago Cubs' ] => [ Date.new( 2001, 7, 23 ) ], 
+      [ 'New York Yankees', 'Atlanta Braves' ] => [ Date.new( 2001, 7, 2 ), Date.new( 2001, 8, 12 ), Date.new( 2001, 8, 14 ) ] 
+   } 
+syck: |
+  struct test_node seq1[] = {
+      { T_STR, 0, "New York Yankees" },
+      { T_STR, 0, "Atlanta Braves" },
+      end_node
+  };
+  struct test_node seq2[] = {
+      { T_STR, 0, "2001-07-02" },
+      { T_STR, 0, "2001-08-12" },
+      { T_STR, 0, "2001-08-14" },
+      end_node
+  };
+  struct test_node seq3[] = {
+      { T_STR, 0, "Detroit Tigers" },
+      { T_STR, 0, "Chicago Cubs" },
+      end_node
+  };
+  struct test_node seq4[] = {
+      { T_STR, 0, "2001-07-23" },
+      end_node
+  };
+  struct test_node map[] = {
+      { T_SEQ, 0, 0, seq3 },
+      { T_SEQ, 0, 0, seq4 },
+      { T_SEQ, 0, 0, seq1 },
+      { T_SEQ, 0, 0, seq2 },
+      end_node
+  };
+  struct test_node stream[] = {
+      { T_MAP, 0, 0, map },
+      end_node
+  };
+ 
+--- 
+test: Sequence key shortcut 
+todo: true
+spec: 2.12
+yaml: | 
+  ---
+  # products purchased
+  - item    : Super Hoop
+    quantity: 1
+  - item    : Basketball
+    quantity: 4
+  - item    : Big Shoes
+    quantity: 1
+perl: | 
+  [  
+     { item => 'Super Hoop', quantity => 1 }, 
+     { item => 'Basketball', quantity => 4 }, 
+     { item => 'Big Shoes',  quantity => 1 }  
+  ]  
+   
+ruby: | 
+  [  
+     { 'item' => 'Super Hoop', 'quantity' => 1 }, 
+     { 'item' => 'Basketball', 'quantity' => 4 }, 
+     { 'item' => 'Big Shoes', 'quantity' => 1 }  
+  ]  
+python: | 
+  [ 
+       { 'item': 'Super Hoop', 'quantity': 1 }, 
+       { 'item': 'Basketball', 'quantity': 4 }, 
+       { 'item': 'Big Shoes',  'quantity': 1 }  
+  ] 
+syck: |
+  struct test_node map1[] = {
+      { T_STR, 0, "item" },
+          { T_STR, 0, "Super Hoop" },
+      { T_STR, 0, "quantity" },
+          { T_STR, 0, "1" },
+      end_node
+  };
+  struct test_node map2[] = {
+      { T_STR, 0, "item" },
+          { T_STR, 0, "Basketball" },
+      { T_STR, 0, "quantity" },
+          { T_STR, 0, "4" },
+      end_node
+  };
+  struct test_node map3[] = {
+      { T_STR, 0, "item" },
+          { T_STR, 0, "Big Shoes" },
+      { T_STR, 0, "quantity" },
+          { T_STR, 0, "1" },
+      end_node
+  };
+  struct test_node seq[] = {
+      { T_MAP, 0, 0, map1 },
+      { T_MAP, 0, 0, map2 },
+      { T_MAP, 0, 0, map3 },
+      end_node
+  };
+  struct test_node stream[] = {
+      { T_SEQ, 0, 0, seq },
+      end_node
+  };
+  
+ 
+--- 
+test: Literal perserves newlines 
+todo: true
+spec: 2.13
+yaml: | 
+  # ASCII Art
+  --- | 
+    \//||\/||
+    // ||  ||_
+perl: | 
+  "\\//||\\/||\n// ||  ||_\n" 
+ruby: | 
+  "\\//||\\/||\n// ||  ||_\n" 
+python: | 
+    [ 
+        flushLeft( 
+        """ 
+        \//||\/||
+        // ||  ||_
+        """ 
+        ) 
+    ] 
+syck: |
+  struct test_node stream[] = {
+      { T_STR, 0, "\\//||\\/||\n// ||  ||_\n" },
+      end_node
+  };
+ 
+--- 
+test: Folded treats newlines as a space 
+todo: true
+spec: 2.14
+yaml: | 
+  ---
+    Mark McGwire's
+    year was crippled
+    by a knee injury.
+perl: | 
+  "Mark McGwire's year was crippled by a knee injury." 
+ruby: | 
+  "Mark McGwire's year was crippled by a knee injury."
+python: | 
+    [ "Mark McGwire's year was crippled by a knee injury." ] 
+syck: |
+  struct test_node stream[] = {
+      { T_STR, 0, "Mark McGwire's year was crippled by a knee injury." },
+      end_node
+  };
+ 
+--- 
+test: Newlines preserved for indented and blank lines 
+todo: true
+spec: 2.15
+yaml: | 
+  --- > 
+   Sammy Sosa completed another
+   fine season with great stats.
+   
+     63 Home Runs
+     0.288 Batting Average
+   
+   What a year!
+perl: |  
+  "Sammy Sosa completed another fine season with great stats.\n\n  63 Home Runs\n  0.288 Batting Average\n\nWhat a year!\n" 
+ruby: |  
+  "Sammy Sosa completed another fine season with great stats.\n\n  63 Home Runs\n  0.288 Batting Average\n\nWhat a year!\n" 
+python: | 
+    [ 
+        flushLeft( 
+        """ 
+        Sammy Sosa completed another fine season with great stats. 
+ 
+          63 Home Runs 
+          0.288 Batting Average 
+ 
+        What a year! 
+        """ 
+        ) 
+    ] 
+syck: |
+  struct test_node stream[] = {
+      { T_STR, 0, "Sammy Sosa completed another fine season with great stats.\n\n  63 Home Runs\n  0.288 Batting Average\n\nWhat a year!\n" },
+      end_node
+  };
+ 
+ 
+--- 
+test: Indentation determines scope 
+spec: 2.16
+yaml: | 
+  name: Mark McGwire 
+  accomplishment: > 
+     Mark set a major league
+     home run record in 1998.
+  stats: | 
+     65 Home Runs
+     0.278 Batting Average
+php: | 
+  array(  
+    'name'           => 'Mark McGwire',  
+    'accomplishment' => "Mark set a major league home run record in 1998.\n", 
+    'stats'          => "65 Home Runs\n0.278 Batting Average\n" 
+  ) 
+--- 
+test: Quoted scalars 
+todo: true
+spec: 2.17
+yaml: | 
+  unicode: "Sosa did fine.\u263A" 
+  control: "\b1998\t1999\t2000\n" 
+  hexesc:  "\x0D\x0A is \r\n" 
+
+  single: '"Howdy!" he cried.' 
+  quoted: ' # not a ''comment''.' 
+  tie-fighter: '|\-*-/|' 
+ruby: | 
+  { 
+    "tie-fighter" => "|\\-*-/|", 
+    "control"=>"\0101998\t1999\t2000\n", 
+    "unicode"=>"Sosa did fine." + ["263A".hex ].pack('U*'), 
+    "quoted"=>" # not a 'comment'.", 
+    "single"=>"\"Howdy!\" he cried.", 
+    "hexesc"=>"\r\n is \r\n" 
+  } 
+--- 
+test: Multiline flow scalars 
+todo: true
+spec: 2.18 
+yaml: |
+  plain:
+    This unquoted scalar
+    spans many lines.
+  
+  quoted: "So does this
+    quoted scalar.\n"
+ruby: | 
+  {  
+    'plain' => 'This unquoted scalar spans many lines.', 
+    'quoted' => "So does this quoted scalar.\n" 
+  } 
+--- 
+test: Integers 
+spec: 2.19
+yaml: | 
+  canonical: 12345 
+  decimal: +12,345 
+  octal: 014 
+  hexadecimal: 0xC 
+php: | 
+  array(  
+    'canonical' => 12345,  
+    'decimal' => 12345,  
+    'octal' => 014,  
+    'hexadecimal' => 0xC
+  )
+--- 
+# FIX: spec shows parens around -inf and NaN
+test: Floating point 
+spec: 2.20
+yaml: | 
+  canonical: 1.23015e+3 
+  exponential: 12.3015e+02 
+  fixed: 1,230.15 
+  negative infinity: -.inf
+  not a number: .NaN 
+php: | 
+  array( 
+    'canonical' => 1230.15,  
+    'exponential' => 1230.15,  
+    'fixed' => 1230.15, 
+    'negative infinity' => log(0), 
+    'not a number' => -log(0), 
+  )
+--- 
+test: Miscellaneous 
+spec: 2.21
+yaml: | 
+  null: ~ 
+  true: y
+  false: n 
+  string: '12345' 
+php: |  
+  array(  
+    '' => null,  
+    1 => true,  
+    0 => false,  
+    'string' => '12345'  
+  ) 
+---
+test: Timestamps
+todo: true
+spec: 2.22
+yaml: |
+  canonical: 2001-12-15T02:59:43.1Z
+  iso8601:  2001-12-14t21:59:43.10-05:00
+  spaced:  2001-12-14 21:59:43.10 -05:00
+  date:   2002-12-14 # Time is noon UTC
+php: |
+  array(
+    'canonical' => YAML::mktime( 2001, 12, 15, 2, 59, 43, 0.10 ),
+    'iso8601' => YAML::mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ),
+    'spaced' => YAML::mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ),
+    'date' => Date.new( 2002, 12, 14 )
+  )
+---
+test: legacy Timestamps test
+todo: true
+spec: legacy D4
+yaml: |
+    canonical: 2001-12-15T02:59:43.00Z
+    iso8601:  2001-02-28t21:59:43.00-05:00
+    spaced:  2001-12-14 21:59:43.00 -05:00
+    date:   2002-12-14
+php: |
+   array(
+     'canonical' => Time::utc( 2001, 12, 15, 2, 59, 43, 0 ),
+     'iso8601' => YAML::mktime( 2001, 2, 28, 21, 59, 43, 0, "-05:00" ),
+     'spaced' => YAML::mktime( 2001, 12, 14, 21, 59, 43, 0, "-05:00" ),
+     'date' => Date.new( 2002, 12, 14 )
+   )
+---
+test: Various explicit families
+todo: true
+spec: 2.23
+yaml: |
+  not-date: !str 2002-04-28
+  picture: !binary |
+   R0lGODlhDAAMAIQAAP//9/X
+   17unp5WZmZgAAAOfn515eXv
+   Pz7Y6OjuDg4J+fn5OTk6enp
+   56enmleECcgggoBADs=
+
+  application specific tag: !!something |
+   The semantics of the tag
+   above may be different for
+   different documents.
+
+ruby-setup: |
+  YAML.add_private_type( "something" ) do |type, val|
+    "SOMETHING: #{val}"
+  end
+ruby: |
+  {
+    'not-date' => '2002-04-28',
+    'picture' => "GIF89a\f\000\f\000\204\000\000\377\377\367\365\365\356\351\351\345fff\000\000\000\347\347\347^^^\363\363\355\216\216\216\340\340\340\237\237\237\223\223\223\247\247\247\236\236\236i^\020' \202\n\001\000;",
+    'application specific tag' => "SOMETHING: The semantics of the tag\nabove may be different for\ndifferent documents.\n"
+  }
+---
+test: Application specific family
+todo: true
+spec: 2.24
+yaml: |
+  # Establish a tag prefix
+  --- !clarkevans.com,2002/graph/^shape
+    # Use the prefix: shorthand for
+    # !clarkevans.com,2002/graph/circle
+  - !^circle
+    center: &ORIGIN {x: 73, 'y': 129}
+    radius: 7
+  - !^line # !clarkevans.com,2002/graph/line
+    start: *ORIGIN
+    finish: { x: 89, 'y': 102 }
+  - !^label
+    start: *ORIGIN
+    color: 0xFFEEBB
+    value: Pretty vector drawing.
+ruby-setup: |
+  YAML.add_domain_type( "clarkevans.com,2002", 'graph/shape' ) { |type, val|
+    if Array === val
+      val << "Shape Container"
+      val
+    else
+      raise YAML::Error, "Invalid graph of class #{ val.class }: " + val.inspect
+    end
+  }
+  one_shape_proc = Proc.new { |type, val|
+    scheme, domain, type = type.split( /:/, 3 )
+    if val.is_a? ::Hash
+      val['TYPE'] = "Shape: #{type}"
+      val
+    else
+      raise YAML::Error, "Invalid graph of class #{ val.class }: " + val.inspect
+    end
+  }
+  YAML.add_domain_type( "clarkevans.com,2002", 'graph/circle', &one_shape_proc )
+  YAML.add_domain_type( "clarkevans.com,2002", 'graph/line', &one_shape_proc )
+  YAML.add_domain_type( "clarkevans.com,2002", 'graph/label', &one_shape_proc )
+ruby: |
+  [
+    {
+      "radius" => 7,
+      "center"=>
+      {
+        "x" => 73,
+        "y" => 129
+      },
+      "TYPE" => "Shape: graph/circle"
+    }, {
+      "finish" =>
+      {
+        "x" => 89,
+        "y" => 102
+      },
+      "TYPE" => "Shape: graph/line",
+      "start" =>
+      {
+        "x" => 73,
+        "y" => 129
+      }
+    }, {
+      "TYPE" => "Shape: graph/label",
+      "value" => "Pretty vector drawing.",
+      "start" =>
+      {
+        "x" => 73,
+        "y" => 129
+      },
+      "color" => 16772795
+    },
+    "Shape Container"
+  ]
+# ---
+# test: Unordered set
+# spec: 2.25
+# yaml: |
+#   # sets are represented as a
+#   # mapping where each key is
+#   # associated with the empty string
+#   --- !set
+#   ? Mark McGwire
+#   ? Sammy Sosa
+#   ? Ken Griff
+---
+test: Ordered mappings
+todo: true
+spec: 2.26
+yaml: |
+  # ordered maps are represented as
+  # a sequence of mappings, with
+  # each mapping having one key
+  --- !omap
+  - Mark McGwire: 65
+  - Sammy Sosa: 63
+  - Ken Griffy: 58
+ruby: |
+  YAML::Omap[
+    'Mark McGwire', 65,
+    'Sammy Sosa', 63,
+    'Ken Griffy', 58
+  ]
+---
+test: Invoice
+dump_skip: true
+spec: 2.27
+yaml: |
+  --- !clarkevans.com,2002/^invoice
+  invoice: 34843
+  date   : 2001-01-23
+  bill-to: &id001
+      given  : Chris
+      family : Dumars
+      address:
+          lines: |
+              458 Walkman Dr.
+              Suite #292
+          city    : Royal Oak
+          state   : MI
+          postal  : 48046
+  ship-to: *id001
+  product:
+      - 
+        sku         : BL394D
+        quantity    : 4
+        description : Basketball
+        price       : 450.00
+      - 
+        sku         : BL4438H
+        quantity    : 1
+        description : Super Hoop
+        price       : 2392.00
+  tax  : 251.42
+  total: 4443.52
+  comments: >
+    Late afternoon is best.
+    Backup contact is Nancy
+    Billsmer @ 338-4338.
+php: |
+  array(
+     'invoice' => 34843, 'date' => mktime(0, 0, 0, 1, 23, 2001),
+     'bill-to' => 
+      array( 'given' => 'Chris', 'family' => 'Dumars', 'address' => array( 'lines' => "458 Walkman Dr.\nSuite #292\n", 'city' => 'Royal Oak', 'state' => 'MI', 'postal' => 48046 ) )
+     , 'ship-to' => 
+      array( 'given' => 'Chris', 'family' => 'Dumars', 'address' => array( 'lines' => "458 Walkman Dr.\nSuite #292\n", 'city' => 'Royal Oak', 'state' => 'MI', 'postal' => 48046 ) )
+     , 'product' =>
+       array(
+        array( 'sku' => 'BL394D', 'quantity' => 4, 'description' => 'Basketball', 'price' => 450.00 ),
+        array( 'sku' => 'BL4438H', 'quantity' => 1, 'description' => 'Super Hoop', 'price' => 2392.00 )
+      ),
+     'tax' => 251.42, 'total' => 4443.52,
+     'comments' => "Late afternoon is best. Backup contact is Nancy Billsmer @ 338-4338.\n"
+  )
+---
+test: Log file
+todo: true
+spec: 2.28
+yaml: |
+  ---
+  Time: 2001-11-23 15:01:42 -05:00
+  User: ed
+  Warning: >
+    This is an error message
+    for the log file
+  ---
+  Time: 2001-11-23 15:02:31 -05:00
+  User: ed
+  Warning: >
+    A slightly different error
+    message.
+  ---
+  Date: 2001-11-23 15:03:17 -05:00
+  User: ed
+  Fatal: >
+    Unknown variable "bar"
+  Stack:
+    - file: TopClass.py
+      line: 23
+      code: |
+        x = MoreObject("345\n")
+    - file: MoreClass.py
+      line: 58
+      code: |-
+        foo = bar
+ruby: |
+  y = YAML::Stream.new
+  y.add( { 'Time' => YAML::mktime( 2001, 11, 23, 15, 01, 42, 00, "-05:00" ), 
+           'User' => 'ed', 'Warning' => "This is an error message for the log file\n" } ) 
+  y.add( { 'Time' => YAML::mktime( 2001, 11, 23, 15, 02, 31, 00, "-05:00" ), 
+           'User' => 'ed', 'Warning' => "A slightly different error message.\n" } ) 
+  y.add( { 'Date' => YAML::mktime( 2001, 11, 23, 15, 03, 17, 00, "-05:00" ), 
+           'User' => 'ed', 'Fatal' => "Unknown variable \"bar\"\n", 
+           'Stack' => [ 
+           { 'file' => 'TopClass.py', 'line' => 23, 'code' => "x = MoreObject(\"345\\n\")\n" }, 
+           { 'file' => 'MoreClass.py', 'line' => 58, 'code' => "foo = bar" } ] } ) 
+documents: 3 
+ 
+--- 
+test: Throwaway comments 
+yaml: | 
+   ### These are four throwaway comment  ### 
+   
+   ### lines (the second line is empty). ### 
+   this: |   # Comments may trail lines.
+      contains three lines of text.
+      The third one starts with a
+      # character. This isn't a comment.
+   
+   # These are three throwaway comment
+   # lines (the first line is empty).
+php: | 
+   array( 
+     'this' => "contains three lines of text.\nThe third one starts with a\n# character. This isn't a comment.\n" 
+   )
+--- 
+test: Document with a single value 
+todo: true
+yaml: | 
+   --- > 
+   This YAML stream contains a single text value.
+   The next stream is a log file - a sequence of
+   log entries. Adding an entry to the log is a
+   simple matter of appending it at the end.
+ruby: | 
+   "This YAML stream contains a single text value. The next stream is a log file - a sequence of log entries. Adding an entry to the log is a simple matter of appending it at the end.\n" 
+--- 
+test: Document stream 
+todo: true
+yaml: | 
+   --- 
+   at: 2001-08-12 09:25:00.00 Z 
+   type: GET 
+   HTTP: '1.0' 
+   url: '/index.html' 
+   --- 
+   at: 2001-08-12 09:25:10.00 Z 
+   type: GET 
+   HTTP: '1.0' 
+   url: '/toc.html' 
+ruby: | 
+   y = YAML::Stream.new 
+   y.add( { 
+      'at' => Time::utc( 2001, 8, 12, 9, 25, 00 ), 
+      'type' => 'GET', 
+      'HTTP' => '1.0', 
+      'url' => '/index.html' 
+   } ) 
+   y.add( { 
+      'at' => Time::utc( 2001, 8, 12, 9, 25, 10 ), 
+      'type' => 'GET', 
+      'HTTP' => '1.0', 
+      'url' => '/toc.html' 
+   } ) 
+documents: 2 
+ 
+--- 
+test: Top level mapping 
+yaml: | 
+   # This stream is an example of a top-level mapping. 
+   invoice : 34843 
+   date    : 2001-01-23 
+   total   : 4443.52 
+php: | 
+   array( 
+      'invoice' => 34843,
+      'date' => mktime(0, 0, 0, 1, 23, 2001), 
+      'total' => 4443.52 
+   )
+--- 
+test: Single-line documents 
+todo: true
+yaml: | 
+  # The following is a sequence of three documents. 
+  # The first contains an empty mapping, the second 
+  # an empty sequence, and the last an empty string. 
+  --- {} 
+  --- [ ] 
+  --- '' 
+ruby: | 
+  y = YAML::Stream.new 
+  y.add( {} ) 
+  y.add( [] ) 
+  y.add( '' ) 
+documents: 3 
+ 
+--- 
+test: Document with pause 
+todo: true
+yaml: | 
+  # A communication channel based on a YAML stream. 
+  --- 
+  sent at: 2002-06-06 11:46:25.10 Z 
+  payload: Whatever 
+  # Receiver can process this as soon as the following is sent: 
+  ... 
+  # Even if the next message is sent long after: 
+  --- 
+  sent at: 2002-06-06 12:05:53.47 Z 
+  payload: Whatever 
+  ... 
+ruby: | 
+  y = YAML::Stream.new 
+  y.add( 
+    { 'sent at' => YAML::mktime( 2002, 6, 6, 11, 46, 25, 0.10 ), 
+      'payload' => 'Whatever' } 
+  ) 
+  y.add(  
+    { "payload" => "Whatever", "sent at" => YAML::mktime( 2002, 6, 6, 12, 5, 53, 0.47 ) } 
+  ) 
+documents: 2 
+ 
+--- 
+test: Explicit typing 
+yaml: | 
+   integer: 12 
+   also int: ! "12" 
+   string: !str 12 
+php: | 
+   array( 'integer' => 12, 'also int' => 12, 'string' => '12' )
+--- 
+test: Private types 
+todo: true
+yaml: | 
+  # Both examples below make use of the 'x-private:ball' 
+  # type family URI, but with different semantics. 
+  --- 
+  pool: !!ball 
+    number: 8 
+    color: black 
+  --- 
+  bearing: !!ball 
+    material: steel 
+ruby: | 
+  y = YAML::Stream.new 
+  y.add( { 'pool' => 
+    YAML::PrivateType.new( 'ball', 
+      { 'number' => 8, 'color' => 'black' } ) } 
+  ) 
+  y.add( { 'bearing' =>  
+    YAML::PrivateType.new( 'ball', 
+      { 'material' => 'steel' } ) } 
+  ) 
+documents: 2 
+ 
+--- 
+test: Type family under yaml.org 
+yaml: | 
+  # The URI is 'tag:yaml.org,2002:str' 
+  - !str a Unicode string 
+php: | 
+  array( 'a Unicode string' )
+--- 
+test: Type family under perl.yaml.org 
+todo: true
+yaml: | 
+  # The URI is 'tag:perl.yaml.org,2002:Text::Tabs' 
+  - !perl/Text::Tabs {} 
+ruby: | 
+  [ YAML::DomainType.new( 'perl.yaml.org,2002', 'Text::Tabs', {} ) ]
+--- 
+test: Type family under clarkevans.com 
+todo: true
+yaml: | 
+  # The URI is 'tag:clarkevans.com,2003-02:timesheet' 
+  - !clarkevans.com,2003-02/timesheet {}
+ruby: | 
+  [ YAML::DomainType.new( 'clarkevans.com,2003-02', 'timesheet', {} ) ]
+--- 
+test: URI Escaping 
+todo: true
+yaml: | 
+  same: 
+    - !domain.tld,2002/type\x30 value
+    - !domain.tld,2002/type0 value
+  different: # As far as the YAML parser is concerned 
+    - !domain.tld,2002/type%30 value
+    - !domain.tld,2002/type0 value
+ruby-setup: | 
+  YAML.add_domain_type( "domain.tld,2002", "type0" ) { |type, val| 
+    "ONE: #{val}" 
+  } 
+  YAML.add_domain_type( "domain.tld,2002", "type%30" ) { |type, val| 
+    "TWO: #{val}" 
+  } 
+ruby: | 
+  { 'same' => [ 'ONE: value', 'ONE: value' ], 'different' => [ 'TWO: value', 'ONE: value' ] } 
+--- 
+test: URI Prefixing 
+todo: true
+yaml: | 
+  # 'tag:domain.tld,2002:invoice' is some type family. 
+  invoice: !domain.tld,2002/^invoice 
+    # 'seq' is shorthand for 'tag:yaml.org,2002:seq'. 
+    # This does not effect '^customer' below 
+    # because it is does not specify a prefix. 
+    customers: !seq 
+      # '^customer' is shorthand for the full 
+      # notation 'tag:domain.tld,2002:customer'. 
+      - !^customer 
+        given : Chris 
+        family : Dumars 
+ruby-setup: | 
+  YAML.add_domain_type( "domain.tld,2002", /(invoice|customer)/ ) { |type, val| 
+    if val.is_a? ::Hash 
+      scheme, domain, type = type.split( /:/, 3 )
+      val['type'] = "domain #{type}" 
+      val 
+    else 
+      raise YAML::Error, "Not a Hash in domain.tld/invoice: " + val.inspect 
+    end 
+  } 
+ruby: | 
+  { "invoice"=> { "customers"=> [ { "given"=>"Chris", "type"=>"domain customer", "family"=>"Dumars" } ], "type"=>"domain invoice" } } 
+ 
+--- 
+test: Overriding anchors 
+yaml: | 
+  anchor : &A001 This scalar has an anchor. 
+  override : &A001 >
+   The alias node below is a
+   repeated use of this value.
+  alias : *A001
+php: | 
+  array( 'anchor' => 'This scalar has an anchor.',
+    'override' => "The alias node below is a repeated use of this value.\n",
+    'alias' => "The alias node below is a repeated use of this value.\n" )
+--- 
+test: Flow and block formatting 
+todo: true
+yaml: | 
+  empty: [] 
+  flow: [ one, two, three # May span lines, 
+           , four,           # indentation is 
+             five ]          # mostly ignored. 
+  block: 
+   - First item in top sequence 
+   - 
+    - Subordinate sequence entry 
+   - > 
+     A folded sequence entry
+   - Sixth item in top sequence 
+ruby: | 
+  { 'empty' => [], 'flow' => [ 'one', 'two', 'three', 'four', 'five' ], 
+    'block' => [ 'First item in top sequence', [ 'Subordinate sequence entry' ], 
+    "A folded sequence entry\n", 'Sixth item in top sequence' ] } 
+--- 
+test: Complete mapping test 
+todo: true
+yaml: |
+ empty: {} 
+ flow: { one: 1, two: 2 }
+ spanning: { one: 1,
+    two: 2 }
+ block:
+  first : First entry
+  second:
+   key: Subordinate mapping
+  third:
+   - Subordinate sequence
+   - { }
+   - Previous mapping is empty.
+   - A key: value pair in a sequence.
+     A second: key:value pair.
+   - The previous entry is equal to the following one.
+   -
+     A key: value pair in a sequence.
+     A second: key:value pair.
+  !float 12 : This key is a float.
+  ? >
+   ?
+  : This key had to be protected.
+  "\a" : This key had to be escaped.
+  ? >
+   This is a
+   multi-line
+   folded key
+  : Whose value is
+    also multi-line.
+  ? this also works as a key
+  : with a value at the next line.
+  ?
+   - This key
+   - is a sequence
+  :
+   - With a sequence value.
+  ?
+   This: key
+   is a: mapping
+  :
+   with a: mapping value.
+ruby: |
+  { 'empty' => {}, 'flow' => { 'one' => 1, 'two' => 2 }, 
+    'spanning' => { 'one' => 1, 'two' => 2 }, 
+    'block' => { 'first' => 'First entry', 'second' => 
+    { 'key' => 'Subordinate mapping' }, 'third' => 
+      [ 'Subordinate sequence', {}, 'Previous mapping is empty.', 
+        { 'A key' => 'value pair in a sequence.', 'A second' => 'key:value pair.' }, 
+        'The previous entry is equal to the following one.', 
+        { 'A key' => 'value pair in a sequence.', 'A second' => 'key:value pair.' } ], 
+    12.0 => 'This key is a float.', "?\n" => 'This key had to be protected.', 
+    "\a" => 'This key had to be escaped.', 
+    "This is a multi-line folded key\n" => "Whose value is also multi-line.", 
+    'this also works as a key' => 'with a value at the next line.', 
+    [ 'This key', 'is a sequence' ] => [ 'With a sequence value.' ] } } 
+  # Couldn't recreate map exactly, so we'll do a detailed check to be sure it's entact 
+  obj_y['block'].keys.each { |k| 
+    if Hash === k
+      v = obj_y['block'][k] 
+      if k['This'] == 'key' and k['is a'] == 'mapping' and v['with a'] == 'mapping value.' 
+         obj_r['block'][k] = v 
+      end 
+    end 
+  } 
+--- 
+test: Literal explicit indentation
+yaml: |
+   # Explicit indentation must 
+   # be given in all the three 
+   # following cases. 
+   leading spaces: |2
+         This value starts with four spaces.
+   
+   leading line break: |2
+   
+     This value starts with a line break.
+   
+   leading comment indicator: |2
+     # first line starts with a
+     # character.
+   
+   # Explicit indentation may
+   # also be given when it is
+   # not required.
+   redundant: |2
+     This value is indented 2 spaces.
+php: |
+   array( 
+      'leading spaces' => "    This value starts with four spaces.\n", 
+      'leading line break' => "\nThis value starts with a line break.\n", 
+      'leading comment indicator' => "# first line starts with a\n# character.\n", 
+      'redundant' => "This value is indented 2 spaces.\n" 
+   )
+---
+test: Chomping and keep modifiers
+yaml: |
+    clipped: |
+        This has one newline.
+    
+    same as "clipped" above: "This has one newline.\n"
+    
+    stripped: |-
+        This has no newline.
+    
+    same as "stripped" above: "This has no newline."
+    
+    kept: |+
+        This has two newlines.
+    
+    same as "kept" above: "This has two newlines.\n\n"
+php: | 
+    array(  
+      'clipped' => "This has one newline.\n", 
+      'same as "clipped" above' => "This has one newline.\n", 
+      'stripped' => 'This has no newline.', 
+      'same as "stripped" above' => 'This has no newline.', 
+      'kept' => "This has two newlines.\n\n", 
+      'same as "kept" above' => "This has two newlines.\n\n" 
+    )
+--- 
+test: Literal combinations 
+todo: true
+yaml: | 
+   empty: |
+   
+   literal: |
+    The \ ' " characters may be
+    freely used. Leading white
+       space is significant.
+   
+    Line breaks are significant.
+    Thus this value contains one
+    empty line and ends with a
+    single line break, but does
+    not start with one.
+   
+   is equal to: "The \\ ' \" characters may \
+    be\nfreely used. Leading white\n   space \
+    is significant.\n\nLine breaks are \
+    significant.\nThus this value contains \
+    one\nempty line and ends with a\nsingle \
+    line break, but does\nnot start with one.\n"
+   
+   # Comments may follow a block 
+   # scalar value. They must be 
+   # less indented. 
+   
+   # Modifiers may be combined in any order.
+   indented and chomped: |2-
+       This has no newline.
+   
+   also written as: |-2
+       This has no newline.
+   
+   both are equal to: "  This has no newline."
+php: | 
+   array( 
+     'empty' => '', 
+     'literal' => "The \\ ' \" characters may be\nfreely used. Leading white\n   space " + 
+       "is significant.\n\nLine breaks are significant.\nThus this value contains one\n" + 
+       "empty line and ends with a\nsingle line break, but does\nnot start with one.\n", 
+     'is equal to' => "The \\ ' \" characters may be\nfreely used. Leading white\n   space " + 
+       "is significant.\n\nLine breaks are significant.\nThus this value contains one\n" + 
+       "empty line and ends with a\nsingle line break, but does\nnot start with one.\n", 
+     'indented and chomped' => '  This has no newline.', 
+     'also written as' => '  This has no newline.', 
+     'both are equal to' => '  This has no newline.' 
+   )
+--- 
+test: Folded combinations 
+todo: true
+yaml: | 
+   empty: > 
+   
+   one paragraph: > 
+    Line feeds are converted
+    to spaces, so this value
+    contains no line breaks
+    except for the final one.
+   
+   multiple paragraphs: >2 
+   
+     An empty line, either
+     at the start or in
+     the value:
+   
+     Is interpreted as a
+     line break. Thus this
+     value contains three
+     line breaks.
+   
+   indented text: > 
+       This is a folded
+       paragraph followed
+       by a list:
+        * first entry
+        * second entry
+       Followed by another
+       folded paragraph,
+       another list:
+   
+        * first entry
+   
+        * second entry
+   
+       And a final folded
+       paragraph.
+   
+   above is equal to: | 
+       This is a folded paragraph followed by a list:
+        * first entry
+        * second entry
+       Followed by another folded paragraph, another list:
+   
+        * first entry
+ 
+        * second entry
+   
+       And a final folded paragraph.
+   
+   # Explicit comments may follow 
+   # but must be less indented. 
+php: | 
+   array( 
+     'empty' => '', 
+     'one paragraph' => 'Line feeds are converted to spaces, so this value'.
+       " contains no line breaks except for the final one.\n", 
+     'multiple paragraphs' => "\nAn empty line, either at the start or in the value:\n".
+       "Is interpreted as a line break. Thus this value contains three line breaks.\n", 
+     'indented text' => "This is a folded paragraph followed by a list:\n".
+       " * first entry\n * second entry\nFollowed by another folded paragraph, ".
+       "another list:\n\n * first entry\n\n * second entry\n\nAnd a final folded paragraph.\n", 
+     'above is equal to' => "This is a folded paragraph followed by a list:\n".
+       " * first entry\n * second entry\nFollowed by another folded paragraph, ".
+       "another list:\n\n * first entry\n\n * second entry\n\nAnd a final folded paragraph.\n" 
+   )
+--- 
+test: Single quotes 
+todo: true
+yaml: | 
+   empty: ''
+   second: '! : \ etc. can be used freely.'
+   third: 'a single quote '' must be escaped.'
+   span: 'this contains
+         six spaces
+    
+         and one
+         line break'
+   is same as: "this contains six spaces\nand one line break" 
+php: | 
+   array( 
+     'empty' => '', 
+     'second' => '! : \\ etc. can be used freely.', 
+     'third' => "a single quote ' must be escaped.", 
+     'span' => "this contains six spaces\nand one line break", 
+     'is same as' => "this contains six spaces\nand one line break" 
+   )
+--- 
+test: Double quotes
+todo: true
+yaml: |
+   empty: ""
+   second: "! : etc. can be used freely."
+   third: "a \" or a \\ must be escaped."
+   fourth: "this value ends with an LF.\n"
+   span: "this contains
+     four  \
+         spaces" 
+   is equal to: "this contains four  spaces"
+php: | 
+   array( 
+     'empty' => '', 
+     'second' => '! : etc. can be used freely.', 
+     'third' => 'a " or a \\ must be escaped.', 
+     'fourth' => "this value ends with an LF.\n", 
+     'span' => "this contains four  spaces", 
+     'is equal to' => "this contains four  spaces" 
+   )
+--- 
+test: Unquoted strings 
+todo: true
+yaml: | 
+   first: There is no unquoted empty string.
+ 
+   second: 12          ## This is an integer. 
+
+   third: !str 12      ## This is a string. 
+
+   span: this contains
+         six spaces
+   
+         and one
+         line break
+
+   indicators: this has no comments.
+               #:foo and bar# are
+               both text.
+
+   flow: [ can span
+              lines, # comment
+              like
+              this ]
+
+   note: { one-line keys: but multi-line values } 
+
+php: | 
+   array( 
+     'first' => 'There is no unquoted empty string.', 
+     'second' => 12, 
+     'third' => '12', 
+     'span' => "this contains six spaces\nand one line break", 
+     'indicators' => "this has no comments. #:foo and bar# are both text.", 
+     'flow' => [ 'can span lines', 'like this' ], 
+     'note' => { 'one-line keys' => 'but multi-line values' } 
+   )
+--- 
+test: Spanning sequences 
+todo: true
+yaml: | 
+   # The following are equal seqs 
+   # with different identities. 
+   flow: [ one, two ] 
+   spanning: [ one, 
+        two ] 
+   block: 
+     - one 
+     - two 
+php: | 
+   array( 
+     'flow' => [ 'one', 'two' ], 
+     'spanning' => [ 'one', 'two' ], 
+     'block' => [ 'one', 'two' ] 
+   )
+--- 
+test: Flow mappings 
+yaml: | 
+   # The following are equal maps 
+   # with different identities. 
+   flow: { one: 1, two: 2 } 
+   block: 
+       one: 1 
+       two: 2 
+php: | 
+   array( 
+     'flow' => array( 'one' => 1, 'two' => 2 ), 
+     'block' => array( 'one' => 1, 'two' => 2 )
+   )
+---
+test: Representations of 12
+todo: true
+yaml: |
+   - 12 # An integer 
+   # The following scalars 
+   # are loaded to the 
+   # string value '1' '2'. 
+   - !str 12
+   - '12'
+   - "12"
+   - "\
+     1\
+     2\
+     "
+   # Strings containing paths and regexps can be unquoted:
+   - /foo/bar
+   - d:/foo/bar
+   - foo/bar
+   - /a.*b/
+php: |
+   array( 12, '12', '12', '12', '12', '/foo/bar', 'd:/foo/bar', 'foo/bar', '/a.*b/' )
+---
+test: "Null"
+todo: true
+yaml: |
+   canonical: ~
+
+   english: null
+
+   # This sequence has five 
+   # entries, two with values. 
+   sparse:
+     - ~
+     - 2nd entry
+     - Null
+     - 4th entry
+     -
+
+   four: This mapping has five keys,
+         only two with values.
+
+php: |
+   array (
+     'canonical' => null, 
+     'english' => null, 
+     'sparse' => array( null, '2nd entry', null, '4th entry', null ]), 
+     'four' => 'This mapping has five keys, only two with values.'
+   ) 
+---
+test: Omap
+todo: true
+yaml: |
+   # Explicitly typed dictionary.
+   Bestiary: !omap
+     - aardvark: African pig-like ant eater. Ugly.
+     - anteater: South-American ant eater. Two species.
+     - anaconda: South-American constrictor snake. Scary.
+     # Etc.
+ruby: |
+   {
+     'Bestiary' => YAML::Omap[
+       'aardvark', 'African pig-like ant eater. Ugly.',
+       'anteater', 'South-American ant eater. Two species.',
+       'anaconda', 'South-American constrictor snake. Scary.'
+     ]
+   }
+
+---
+test: Pairs
+todo: true
+yaml: |
+  # Explicitly typed pairs.
+  tasks: !pairs
+    - meeting: with team.
+    - meeting: with boss.
+    - break: lunch.
+    - meeting: with client.
+ruby: |
+  {
+    'tasks' => YAML::Pairs[
+      'meeting', 'with team.',
+      'meeting', 'with boss.',
+      'break', 'lunch.',
+      'meeting', 'with client.'
+    ]
+  }
+
+---
+test: Set
+todo: true
+yaml: |
+  # Explicitly typed set.
+  baseball players: !set
+    Mark McGwire:
+    Sammy Sosa:
+    Ken Griffey:
+ruby: |
+  {
+    'baseball players' => YAML::Set[
+      'Mark McGwire', nil,
+      'Sammy Sosa', nil,
+      'Ken Griffey', nil
+    ]
+  }
+
+---
+test: Boolean
+yaml: |
+   false: used as key
+   logical:  true 
+   answer: no 
+php: | 
+   array( 
+     false => 'used as key', 
+     'logical' => true, 
+     'answer' => false 
+   )
+--- 
+test: Integer 
+yaml: | 
+   canonical: 12345 
+   decimal: +12,345 
+   octal: 014 
+   hexadecimal: 0xC 
+php: | 
+   array( 
+     'canonical' => 12345, 
+     'decimal' => 12345, 
+     'octal' => 12, 
+     'hexadecimal' => 12  
+   )
+--- 
+test: Float 
+yaml: | 
+   canonical: 1.23015e+3 
+   exponential: 12.3015e+02 
+   fixed: 1,230.15 
+   negative infinity: -.inf
+   not a number: .NaN 
+php: | 
+  array(  
+    'canonical' => 1230.15,  
+    'exponential' => 1230.15,  
+    'fixed' => 1230.15, 
+    'negative infinity' => log(0), 
+    'not a number' => -log(0) 
+  )
+--- 
+test: Timestamp 
+todo: true
+yaml: | 
+   canonical:       2001-12-15T02:59:43.1Z 
+   valid iso8601:   2001-12-14t21:59:43.10-05:00 
+   space separated: 2001-12-14 21:59:43.10 -05:00 
+   date (noon UTC): 2002-12-14 
+ruby: | 
+   array( 
+     'canonical' => YAML::mktime( 2001, 12, 15, 2, 59, 43, 0.10 ), 
+     'valid iso8601' => YAML::mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ), 
+     'space separated' => YAML::mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ), 
+     'date (noon UTC)' => Date.new( 2002, 12, 14 ) 
+   )
+--- 
+test: Binary 
+todo: true
+yaml: | 
+   canonical: !binary "\
+    R0lGODlhDAAMAIQAAP//9/X17unp5WZmZgAAAOfn515eXvPz7Y6OjuDg4J+fn5\
+    OTk6enp56enmlpaWNjY6Ojo4SEhP/++f/++f/++f/++f/++f/++f/++f/++f/+\
+    +f/++f/++f/++f/++f/++SH+Dk1hZGUgd2l0aCBHSU1QACwAAAAADAAMAAAFLC\
+    AgjoEwnuNAFOhpEMTRiggcz4BNJHrv/zCFcLiwMWYNG84BwwEeECcgggoBADs="
+   base64: !binary |
+    R0lGODlhDAAMAIQAAP//9/X17unp5WZmZgAAAOfn515eXvPz7Y6OjuDg4J+fn5
+    OTk6enp56enmlpaWNjY6Ojo4SEhP/++f/++f/++f/++f/++f/++f/++f/++f/+
+    +f/++f/++f/++f/++f/++SH+Dk1hZGUgd2l0aCBHSU1QACwAAAAADAAMAAAFLC
+    AgjoEwnuNAFOhpEMTRiggcz4BNJHrv/zCFcLiwMWYNG84BwwEeECcgggoBADs=
+   description: >
+    The binary value above is a tiny arrow
+    encoded as a gif image.
+ruby-setup: | 
+   arrow_gif = "GIF89a\f\000\f\000\204\000\000\377\377\367\365\365\356\351\351\345fff\000\000\000\347\347\347^^^\363\363\355\216\216\216\340\340\340\237\237\237\223\223\223\247\247\247\236\236\236iiiccc\243\243\243\204\204\204\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371!\376\016Made with GIMP\000,\000\000\000\000\f\000\f\000\000\005,  \216\2010\236\343@\024\350i\020\304\321\212\010\034\317\200M$z\357\3770\205p\270\2601f\r\e\316\001\303\001\036\020' \202\n\001\000;" 
+ruby: | 
+   { 
+     'canonical' => arrow_gif, 
+     'base64' => arrow_gif, 
+     'description' => "The binary value above is a tiny arrow encoded as a gif image.\n" 
+   } 
+ 
+---
+test: Merge key
+todo: true
+yaml: |
+  ---
+  - &CENTER { x: 1, y: 2 }
+  - &LEFT { x: 0, y: 2 }
+  - &BIG { r: 10 } 
+  - &SMALL { r: 1 }
+
+  # All the following maps are equal:
+
+  - # Explicit keys
+    x: 1
+    y: 2 
+    r: 10
+    label: center/big
+
+  - # Merge one map
+    << : *CENTER
+    r: 10
+    label: center/big
+
+  - # Merge multiple maps
+    << : [ *CENTER, *BIG ]
+    label: center/big
+
+  - # Override
+    << : [ *BIG, *LEFT, *SMALL ]
+    x: 1
+    label: center/big
+
+ruby-setup: |
+  center = { 'x' => 1, 'y' => 2 }
+  left = { 'x' => 0, 'y' => 2 }
+  big = { 'r' => 10 } 
+  small = { 'r' => 1 }
+  node1 = { 'x' => 1, 'y' => 2, 'r' => 10, 'label' => 'center/big' }
+  node2 = center.dup
+  node2.update( { 'r' => 10, 'label' => 'center/big' } )
+  node3 = big.dup
+  node3.update( center )
+  node3.update( { 'label' => 'center/big' } )
+  node4 = small.dup
+  node4.update( left )
+  node4.update( big )
+  node4.update( { 'x' => 1, 'label' => 'center/big' } )
+
+ruby: |
+  [
+    center, left, big, small, node1, node2, node3, node4
+  ]
+
+--- 
+test: Default key 
+todo: true
+yaml: | 
+   ---     # Old schema 
+   link with:  
+     - library1.dll 
+     - library2.dll 
+   ---     # New schema 
+   link with: 
+     - = : library1.dll 
+       version: 1.2 
+     - = : library2.dll 
+       version: 2.3 
+ruby: | 
+   y = YAML::Stream.new 
+   y.add( { 'link with' => [ 'library1.dll', 'library2.dll' ] } ) 
+   obj_h = Hash[ 'version' => 1.2 ] 
+   obj_h.default = 'library1.dll' 
+   obj_h2 = Hash[ 'version' => 2.3 ] 
+   obj_h2.default = 'library2.dll' 
+   y.add( { 'link with' => [ obj_h, obj_h2 ] } ) 
+documents: 2 
+ 
+--- 
+test: Special keys 
+todo: true
+yaml: | 
+   "!": These three keys 
+   "&": had to be quoted 
+   "=": and are normal strings. 
+   # NOTE: the following node should NOT be serialized this way. 
+   encoded node : 
+    !special '!' : '!type' 
+    !special|canonical '&' : 12 
+    = : value 
+   # The proper way to serialize the above node is as follows: 
+   node : !!type &12 value 
+ruby: |
+   { '!' => 'These three keys', '&' => 'had to be quoted',
+     '=' => 'and are normal strings.',
+     'encoded node' => YAML::PrivateType.new( 'type', 'value' ),
+     'node' => YAML::PrivateType.new( 'type', 'value' ) }
diff --git a/lib/vendor/symfony/test/unit/yaml/fixtures/YtsTypeTransfers.yml b/lib/vendor/symfony/test/unit/yaml/fixtures/YtsTypeTransfers.yml
new file mode 100644
index 000000000..398fa0eb8
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/yaml/fixtures/YtsTypeTransfers.yml
@@ -0,0 +1,244 @@
+--- %YAML:1.0 
+test: Strings 
+brief: > 
+    Any group of characters beginning with an 
+    alphabetic or numeric character is a string, 
+    unless it belongs to one of the groups below 
+    (such as an Integer or Time).   
+yaml: | 
+    String
+php: | 
+    'String' 
+--- 
+test: String characters 
+brief: > 
+    A string can contain any alphabetic or 
+    numeric character, along with many 
+    punctuation characters, including the 
+    period, dash, space, quotes, exclamation, and 
+    question mark. 
+yaml: | 
+    - What's Yaml? 
+    - It's for writing data structures in plain text. 
+    - And? 
+    - And what? That's not good enough for you? 
+    - No, I mean, "And what about Yaml?" 
+    - Oh, oh yeah. Uh.. Yaml for Ruby. 
+php: | 
+    array(
+      "What's Yaml?", 
+      "It's for writing data structures in plain text.", 
+      "And?", 
+      "And what? That's not good enough for you?", 
+      "No, I mean, \"And what about Yaml?\"", 
+      "Oh, oh yeah. Uh.. Yaml for Ruby." 
+    )
+--- 
+test: Indicators in Strings 
+brief: > 
+    Be careful using indicators in strings.  In particular, 
+    the comma, colon, and pound sign must be used carefully. 
+yaml: | 
+    the colon followed by space is an indicator: but is a string:right here 
+    same for the pound sign: here we have it#in a string 
+    the comma can, honestly, be used in most cases: [ but not in, inline collections ] 
+php: | 
+    array(
+      'the colon followed by space is an indicator' => 'but is a string:right here', 
+      'same for the pound sign' => 'here we have it#in a string', 
+      'the comma can, honestly, be used in most cases' => array('but not in', 'inline collections')
+    )
+--- 
+test: Forcing Strings 
+brief: > 
+    Any YAML type can be forced into a string using the 
+    explicit !str method. 
+yaml: | 
+    date string: !str 2001-08-01 
+    number string: !str 192 
+php: | 
+    array(
+      'date string' => '2001-08-01', 
+      'number string' => '192' 
+    )
+--- 
+test: Single-quoted Strings 
+brief: > 
+    You can also enclose your strings within single quotes, 
+    which allows use of slashes, colons, and other indicators 
+    freely.  Inside single quotes, you can represent a single 
+    quote in your string by using two single quotes next to 
+    each other. 
+yaml: | 
+    all my favorite symbols: '#:!/%.)' 
+    a few i hate: '&(*' 
+    why do i hate them?: 'it''s very hard to explain' 
+    entities: '&pound; me'
+php: | 
+    array(
+      'all my favorite symbols' => '#:!/%.)', 
+      'a few i hate' => '&(*', 
+      'why do i hate them?' => 'it\'s very hard to explain', 
+      'entities' => '&pound; me'
+    )
+--- 
+test: Double-quoted Strings 
+brief: > 
+    Enclosing strings in double quotes allows you 
+    to use escapings to represent ASCII and 
+    Unicode characters. 
+yaml: | 
+    i know where i want my line breaks: "one here\nand another here\n" 
+php: | 
+    array(
+      'i know where i want my line breaks' => "one here\nand another here\n" 
+    )
+--- 
+test: Multi-line Quoted Strings 
+todo: true
+brief: > 
+    Both single- and double-quoted strings may be
+    carried on to new lines in your YAML document.
+    They must be indented a step and indentation
+    is interpreted as a single space.
+yaml: | 
+    i want a long string: "so i'm going to
+      let it go on and on to other lines
+      until i end it with a quote."
+php: | 
+    array('i want a long string' => "so i'm going to ".
+         "let it go on and on to other lines ".
+         "until i end it with a quote."
+    )
+ 
+---
+test: Plain scalars
+todo: true
+brief: >
+    Unquoted strings may also span multiple lines, if they
+    are free of YAML space indicators and indented.
+yaml: |
+    - My little toe is broken in two places;
+    - I'm crazy to have skied this way;
+    - I'm not the craziest he's seen, since there was always the German guy
+      who skied for 3 hours on a broken shin bone (just below the kneecap);
+    - Nevertheless, second place is respectable, and he doesn't
+      recommend going for the record;
+    - He's going to put my foot in plaster for a month;
+    - This would impair my skiing ability somewhat for the
+      duration, as can be imagined.
+php: |
+    array(
+      "My little toe is broken in two places;", 
+      "I'm crazy to have skied this way;", 
+      "I'm not the craziest he's seen, since there was always ".
+         "the German guy who skied for 3 hours on a broken shin ".
+         "bone (just below the kneecap);", 
+      "Nevertheless, second place is respectable, and he doesn't ".
+         "recommend going for the record;", 
+      "He's going to put my foot in plaster for a month;", 
+      "This would impair my skiing ability somewhat for the duration, ".
+         "as can be imagined."
+    )
+--- 
+test: 'Null' 
+brief: > 
+    You can use the tilde '~' character for a null value. 
+yaml: | 
+    name: Mr. Show 
+    hosted by: Bob and David 
+    date of next season: ~ 
+php: | 
+    array( 
+      'name' => 'Mr. Show', 
+      'hosted by' => 'Bob and David', 
+      'date of next season' => null 
+    )
+--- 
+test: Boolean 
+brief: > 
+    You can use 'true' and 'false' for boolean values. 
+yaml: | 
+    Is Gus a Liar?: true
+    Do I rely on Gus for Sustenance?: false
+php: | 
+    array( 
+      'Is Gus a Liar?' => true, 
+      'Do I rely on Gus for Sustenance?' => false 
+    )
+--- 
+test: Integers 
+dump_skip: true
+brief: > 
+    An integer is a series of numbers, optionally 
+    starting with a positive or negative sign.  Integers 
+    may also contain commas for readability. 
+yaml: | 
+    zero: 0 
+    simple: 12 
+    one-thousand: 1,000 
+    negative one-thousand: -1,000 
+php: | 
+    array(
+      'zero' => 0, 
+      'simple' => 12, 
+      'one-thousand' => 1000, 
+      'negative one-thousand' => -1000 
+    )
+--- 
+test: Integers as Map Keys 
+brief: > 
+    An integer can be used a dictionary key. 
+yaml: | 
+    1: one 
+    2: two 
+    3: three 
+php: | 
+    array(
+        1 => 'one', 
+        2 => 'two', 
+        3 => 'three' 
+    )
+--- 
+test: Floats 
+dump_skip: true
+brief: > 
+     Floats are represented by numbers with decimals, 
+     allowing for scientific notation, as well as 
+     positive and negative infinity and "not a number." 
+yaml: | 
+     a simple float: 2.00 
+     larger float: 1,000.09 
+     scientific notation: 1.00009e+3 
+php: | 
+     array(
+       'a simple float' => 2.0, 
+       'larger float' => 1000.09, 
+       'scientific notation' => 1000.09 
+     )
+---
+test: Time 
+todo: true
+brief: > 
+    You can represent timestamps by using 
+    ISO8601 format, or a variation which 
+    allows spaces between the date, time and 
+    time zone. 
+yaml: | 
+    iso8601: 2001-12-14t21:59:43.10-05:00 
+    space seperated: 2001-12-14 21:59:43.10 -05:00 
+php: | 
+    array(
+      'iso8601' => mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ), 
+      'space seperated' => mktime( 2001, 12, 14, 21, 59, 43, 0.10, "-05:00" ) 
+    )
+--- 
+test: Date 
+todo: true
+brief: > 
+    A date can be represented by its year, 
+    month and day in ISO8601 order. 
+yaml: |
+    1976-07-31
+php: | 
+    date( 1976, 7, 31 ) 
diff --git a/lib/vendor/symfony/test/unit/yaml/fixtures/index.yml b/lib/vendor/symfony/test/unit/yaml/fixtures/index.yml
new file mode 100644
index 000000000..e9735d6f4
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/yaml/fixtures/index.yml
@@ -0,0 +1,15 @@
+- sfComments
+- sfTests
+- sfObjects
+- sfMergeKey
+- sfQuotes
+- YtsAnchorAlias
+- YtsBasicTests
+- YtsBlockMapping
+- YtsDocumentSeparator
+- YtsErrorTests
+- YtsFlowCollections
+- YtsFoldedScalars
+- YtsNullsAndEmpties
+- YtsSpecificationExamples
+- YtsTypeTransfers
diff --git a/lib/vendor/symfony/test/unit/yaml/fixtures/sfComments.yml b/lib/vendor/symfony/test/unit/yaml/fixtures/sfComments.yml
new file mode 100644
index 000000000..c02940a58
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/yaml/fixtures/sfComments.yml
@@ -0,0 +1,51 @@
+--- %YAML:1.0 
+test: Comments at the end of a line
+brief: > 
+    Comments at the end of a line
+yaml: | 
+    ex1: "foo # bar"
+    ex2: "foo # bar" # comment
+    ex3: 'foo # bar' # comment
+    ex4: foo # comment
+php: | 
+    array('ex1' => 'foo # bar', 'ex2' => 'foo # bar', 'ex3' => 'foo # bar', 'ex4' => 'foo')
+---
+test: Comments in the middle
+brief: >
+  Comments in the middle
+yaml: |
+    foo:
+    # some comment
+    # some comment
+      bar: foo
+    # some comment
+    # some comment
+php: |
+    array('foo' => array('bar' => 'foo'))
+---
+test: Comments on a hash line
+brief: >
+  Comments on a hash line
+yaml: |
+    foo:   # a comment
+      foo: bar # a comment
+php: |
+    array('foo' => array('foo' => 'bar'))
+--- 
+test: 'Value starting with a #' 
+brief: > 
+  'Value starting with a #' 
+yaml: | 
+    foo:   '#bar' 
+php: | 
+    array('foo' => '#bar')
+---
+test: Document starting with a comment and a separator
+brief: >
+  Commenting before document start is allowed
+yaml: |
+    # document comment
+    ---
+    foo: bar # a comment
+php: |
+    array('foo' => 'bar')
diff --git a/lib/vendor/symfony/test/unit/yaml/fixtures/sfMergeKey.yml b/lib/vendor/symfony/test/unit/yaml/fixtures/sfMergeKey.yml
new file mode 100644
index 000000000..3eec4f877
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/yaml/fixtures/sfMergeKey.yml
@@ -0,0 +1,27 @@
+--- %YAML:1.0
+test: Simple In Place Substitution
+brief: >
+    If you want to reuse an entire alias, only overwriting what is different
+    you can use a << in place substitution. This is not part of the official
+    YAML spec, but a widely implemented extension. See the following URL for
+    details: http://yaml.org/type/merge.html
+yaml: |
+    foo: &foo
+        a: Steve
+        b: Clark
+        c: Brian
+    bar: &bar
+        <<: *foo
+        x: Oren
+    foo2: &foo2
+        a: Ballmer
+    ding: &dong [ fi, fei, fo, fam]
+    check:
+        <<:
+            - *foo
+            - *dong
+        isit: tested
+    head:
+        <<: [ *foo , *dong , *foo2 ]
+php: |
+    array('foo' => array('a' => 'Steve', 'b' => 'Clark', 'c' => 'Brian'), 'bar' => array('a' => 'Steve', 'b' => 'Clark', 'c' => 'Brian', 'x' => 'Oren'), 'foo2' => array('a' => 'Ballmer'), 'ding' => array('fi', 'fei', 'fo', 'fam'), 'check' => array('a' => 'Steve', 'b' => 'Clark', 'c' => 'Brian', 'fi', 'fei', 'fo', 'fam', 'isit' => 'tested'), 'head' => array('a' => 'Ballmer', 'b' => 'Clark', 'c' => 'Brian', 'fi', 'fei', 'fo', 'fam'))
diff --git a/lib/vendor/symfony/test/unit/yaml/fixtures/sfObjects.yml b/lib/vendor/symfony/test/unit/yaml/fixtures/sfObjects.yml
new file mode 100644
index 000000000..454ceae69
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/yaml/fixtures/sfObjects.yml
@@ -0,0 +1,11 @@
+--- %YAML:1.0 
+test: Objects
+brief: > 
+    Comments at the end of a line
+yaml: | 
+    ex1: "foo # bar"
+    ex2: "foo # bar" # comment
+    ex3: 'foo # bar' # comment
+    ex4: foo # comment
+php: | 
+    array('ex1' => 'foo # bar', 'ex2' => 'foo # bar', 'ex3' => 'foo # bar', 'ex4' => 'foo')
diff --git a/lib/vendor/symfony/test/unit/yaml/fixtures/sfQuotes.yml b/lib/vendor/symfony/test/unit/yaml/fixtures/sfQuotes.yml
new file mode 100644
index 000000000..741f1befe
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/yaml/fixtures/sfQuotes.yml
@@ -0,0 +1,33 @@
+--- %YAML:1.0
+test: Some characters at the beginning of a string must be escaped
+brief: >
+    Some characters at the beginning of a string must be escaped
+yaml: |
+    foo: | bar
+php: |
+    array('foo' => '| bar')
+---
+test: A key can be a quoted string
+brief: >
+  A key can be a quoted string
+yaml: |
+    "foo1": bar
+    'foo2': bar
+    "foo \" bar": bar
+    'foo '' bar': bar
+    'foo3: ': bar
+    "foo4: ": bar
+    foo5: { "foo \" bar: ": bar, 'foo '' bar: ': bar }
+php: |
+    array(
+      'foo1' => 'bar',
+      'foo2' => 'bar',
+      'foo " bar' => 'bar',
+      'foo \' bar' => 'bar',
+      'foo3: ' => 'bar',
+      'foo4: ' => 'bar',
+      'foo5' => array(
+        'foo " bar: ' => 'bar',
+        'foo \' bar: ' => 'bar',
+      ),
+    )
diff --git a/lib/vendor/symfony/test/unit/yaml/fixtures/sfTests.yml b/lib/vendor/symfony/test/unit/yaml/fixtures/sfTests.yml
new file mode 100644
index 000000000..dd62bacfa
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/yaml/fixtures/sfTests.yml
@@ -0,0 +1,153 @@
+--- %YAML:1.0
+test: Multiple quoted string on one line
+brief: >
+    Multiple quoted string on one line
+yaml: |
+    stripped_title: { name: "foo bar", help: "bar foo" }
+php: |
+    array('stripped_title' => array('name' => 'foo bar', 'help' => 'bar foo'))
+---
+test: Empty sequence
+yaml: |
+    foo: [ ]
+php: |
+    array('foo' => array())
+---
+test: Inline string parsing
+brief: >
+    Inline string parsing
+yaml: |
+    test: ['complex: string', 'another [string]']
+php: |
+    array('test' => array('complex: string', 'another [string]'))
+---
+test: Boolean
+brief: >
+    Boolean
+yaml: |
+    - false
+    - -
+    - off
+    - no
+    - true
+    - +
+    - on
+    - yes
+    - null
+    - ~
+    - 'false'
+    - '-'
+    - 'off'
+    - 'no'
+    - 'true'
+    - '+'
+    - 'on'
+    - 'yes'
+    - 'null'
+    - '~'
+php: |
+    array(
+      false,
+      false,
+      false,
+      false,
+      true,
+      true,
+      true,
+      true,
+      null,
+      null,
+      'false',
+      '-',
+      'off',
+      'no',
+      'true',
+      '+',
+      'on',
+      'yes',
+      'null',
+      '~',
+    )
+# ---
+# test: Empty lines in folded blocks
+# brief: >
+#   Empty lines in folded blocks
+# yaml: |
+#   foo:
+#     bar: |
+#       foo
+
+
+
+#       bar
+# php: |
+#   array('foo' => array('bar' => "foo\n\n\n  \nbar\n"))
+---
+test: IP addresses
+brief: >
+  IP addresses
+yaml: |
+  foo: 10.0.0.2
+php: |
+  array('foo' => '10.0.0.2')
+---
+test: A sequence with an embedded mapping
+brief: >
+  A sequence with an embedded mapping
+yaml: |
+  - foo
+  - bar: { bar: foo }
+php: |
+  array('foo', array('bar' => array('bar' => 'foo')))
+---
+test: A sequence with an unordered array
+brief: >
+  A sequence with an unordered array
+yaml: |
+  1: foo
+  0: bar
+php: |
+  array(1 => 'foo', 0 => 'bar')
+---
+test: Octal
+brief: as in spec example 2.19, octal value is converted
+yaml: |
+  foo: 0123
+php: |
+  array('foo' => 83)
+---
+test: Octal strings
+brief: Octal notation in a string must remain a string
+yaml: |
+  foo: "0123"
+php: |
+  array('foo' => '0123')
+---
+test: Octal strings
+brief: Octal notation in a string must remain a string
+yaml: |
+  foo: '0123'
+php: |
+  array('foo' => '0123')
+---
+test: Octal strings
+brief: Octal notation in a string must remain a string
+yaml: |
+  foo: |
+    0123
+php: |
+  array('foo' => "0123\n")
+#---
+# test: Document as a simple hash
+# brief: Document as a simple hash
+# yaml: |
+#   { foo: bar }
+# php: |
+#   array('foo' => 'bar')
+---
+test: Document as a simple array
+brief: Document as a simple array
+yaml: |
+  [ foo, bar ]
+php: |
+  array('foo', 'bar')
diff --git a/lib/vendor/symfony/test/unit/yaml/sfYamlDumperTest.php b/lib/vendor/symfony/test/unit/yaml/sfYamlDumperTest.php
new file mode 100644
index 000000000..05124c97a
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/yaml/sfYamlDumperTest.php
@@ -0,0 +1,149 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once(__DIR__.'/../../bootstrap/unit.php');
+
+sfYaml::setSpecVersion('1.1');
+
+$t = new lime_test(149);
+
+$parser = new sfYamlParser();
+$dumper = new sfYamlDumper();
+
+$path = __DIR__.'/fixtures';
+$files = $parser->parse(file_get_contents($path.'/index.yml'));
+foreach ($files as $file)
+{
+  $t->diag($file);
+
+  $yamls = file_get_contents($path.'/'.$file.'.yml');
+
+  // split YAMLs documents
+  foreach (preg_split('/^---( %YAML\:1\.0)?/m', $yamls) as $yaml)
+  {
+    if (!$yaml)
+    {
+      continue;
+    }
+
+    $test = $parser->parse($yaml);
+    if (isset($test['dump_skip']) && $test['dump_skip'])
+    {
+      continue;
+    }
+    else if (isset($test['todo']) && $test['todo'])
+    {
+      $t->todo($test['test']);
+    }
+    else
+    {
+      $expected = eval('return '.trim($test['php']).';');
+
+      $t->is_deeply($parser->parse($dumper->dump($expected, 10)), $expected, $test['test']);
+    }
+  }
+}
+
+// inline level
+$array = array(
+  '' => 'bar',
+  'foo' => '#bar',
+  'foo\'bar' => array(),
+  'bar' => array(1, 'foo'),
+  'foobar' => array(
+    'foo' => 'bar',
+    'bar' => array(1, 'foo'),
+    'foobar' => array(
+      'foo' => 'bar',
+      'bar' => array(1, 'foo'),
+    ),
+  ),
+);
+
+$expected = <<<EOF
+{ '': bar, foo: '#bar', 'foo''bar': {  }, bar: [1, foo], foobar: { foo: bar, bar: [1, foo], foobar: { foo: bar, bar: [1, foo] } } }
+EOF;
+$t->is($dumper->dump($array, -10), $expected, '->dump() takes an inline level argument');
+$t->is($dumper->dump($array, 0), $expected, '->dump() takes an inline level argument');
+
+$expected = <<<EOF
+'': bar
+foo: '#bar'
+'foo''bar': {  }
+bar: [1, foo]
+foobar: { foo: bar, bar: [1, foo], foobar: { foo: bar, bar: [1, foo] } }
+
+EOF;
+$t->is($dumper->dump($array, 1), $expected, '->dump() takes an inline level argument');
+
+$expected = <<<EOF
+'': bar
+foo: '#bar'
+'foo''bar': {  }
+bar:
+  - 1
+  - foo
+foobar:
+  foo: bar
+  bar: [1, foo]
+  foobar: { foo: bar, bar: [1, foo] }
+
+EOF;
+$t->is($dumper->dump($array, 2), $expected, '->dump() takes an inline level argument');
+
+$expected = <<<EOF
+'': bar
+foo: '#bar'
+'foo''bar': {  }
+bar:
+  - 1
+  - foo
+foobar:
+  foo: bar
+  bar:
+    - 1
+    - foo
+  foobar:
+    foo: bar
+    bar: [1, foo]
+
+EOF;
+$t->is($dumper->dump($array, 3), $expected, '->dump() takes an inline level argument');
+
+$expected = <<<EOF
+'': bar
+foo: '#bar'
+'foo''bar': {  }
+bar:
+  - 1
+  - foo
+foobar:
+  foo: bar
+  bar:
+    - 1
+    - foo
+  foobar:
+    foo: bar
+    bar:
+      - 1
+      - foo
+
+EOF;
+$t->is($dumper->dump($array, 4), $expected, '->dump() takes an inline level argument');
+$t->is($dumper->dump($array, 10), $expected, '->dump() takes an inline level argument');
+
+// objects
+$t->diag('Objects support');
+class A
+{
+  public $a = 'foo';
+}
+$a = array('foo' => new A(), 'bar' => 1);
+$t->is($dumper->dump($a), '{ foo: !!php/object:O:1:"A":1:{s:1:"a";s:3:"foo";}, bar: 1 }', '->dump() is able to dump objects');
diff --git a/lib/vendor/symfony/test/unit/yaml/sfYamlInlineTest.php b/lib/vendor/symfony/test/unit/yaml/sfYamlInlineTest.php
new file mode 100644
index 000000000..b87ad2f6b
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/yaml/sfYamlInlineTest.php
@@ -0,0 +1,145 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once(__DIR__.'/../../bootstrap/unit.php');
+
+sfYaml::setSpecVersion('1.1');
+
+$t = new lime_test(124);
+
+// ::load()
+$t->diag('::load()');
+
+$testsForLoad = array(
+  '' => '',
+  'null' => null,
+  'false' => false,
+  'true' => true,
+  '12' => 12,
+  '"quoted string"' => 'quoted string',
+  "'quoted string'" => 'quoted string',
+  '12.30e+02' => 12.30e+02,
+  '0x4D2' => 0x4D2,
+  '02333' => 02333,
+  '.Inf' => -log(0),
+  '-.Inf' => log(0),
+  '123456789123456789000' => '123456789123456789000',
+  '"foo\r\nbar"' => "foo\r\nbar",
+  "'foo#bar'" => 'foo#bar',
+  "'foo # bar'" => 'foo # bar',
+  "'#cfcfcf'" => '#cfcfcf',
+
+  '2007-10-30' => mktime(0, 0, 0, 10, 30, 2007),
+  '2007-10-30T02:59:43Z' => gmmktime(2, 59, 43, 10, 30, 2007),
+  '2007-10-30 02:59:43 Z' => gmmktime(2, 59, 43, 10, 30, 2007),
+
+  '"a \\"string\\" with \'quoted strings inside\'"' => 'a "string" with \'quoted strings inside\'',
+  "'a \"string\" with ''quoted strings inside'''" => 'a "string" with \'quoted strings inside\'',
+
+  // sequences
+  // urls are no key value mapping. see #3609. Valid yaml "key: value" mappings require a space after the colon
+  '[foo, http://urls.are/no/mappings, false, null, 12]' => array('foo', 'http://urls.are/no/mappings', false, null, 12),
+  '[  foo  ,   bar , false  ,  null     ,  12  ]' => array('foo', 'bar', false, null, 12),
+  '[\'foo,bar\', \'foo bar\']' => array('foo,bar', 'foo bar'),
+
+  // mappings
+  '{foo:bar,bar:foo,false:false,null:null,integer:12}' => array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12),
+  '{ foo  : bar, bar : foo,  false  :   false,  null  :   null,  integer :  12  }' => array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12),
+  '{foo: \'bar\', bar: \'foo: bar\'}' => array('foo' => 'bar', 'bar' => 'foo: bar'),
+  '{\'foo\': \'bar\', "bar": \'foo: bar\'}' => array('foo' => 'bar', 'bar' => 'foo: bar'),
+  '{\'foo\'\'\': \'bar\', "bar\"": \'foo: bar\'}' => array('foo\'' => 'bar', "bar\"" => 'foo: bar'),
+  '{\'foo: \': \'bar\', "bar: ": \'foo: bar\'}' => array('foo: ' => 'bar', "bar: " => 'foo: bar'),
+
+  // nested sequences and mappings
+  '[foo, [bar, foo]]' => array('foo', array('bar', 'foo')),
+  '[foo, {bar: foo}]' => array('foo', array('bar' => 'foo')),
+  '{ foo: {bar: foo} }' => array('foo' => array('bar' => 'foo')),
+  '{ foo: [bar, foo] }' => array('foo' => array('bar', 'foo')),
+
+  '[  foo, [  bar, foo  ]  ]' => array('foo', array('bar', 'foo')),
+
+  '[{ foo: {bar: foo} }]' => array(array('foo' => array('bar' => 'foo'))),
+
+  '[foo, [bar, [foo, [bar, foo]], foo]]' => array('foo', array('bar', array('foo', array('bar', 'foo')), 'foo')),
+
+  '[foo, {bar: foo, foo: [foo, {bar: foo}]}, [foo, {bar: foo}]]' => array('foo', array('bar' => 'foo', 'foo' => array('foo', array('bar' => 'foo'))), array('foo', array('bar' => 'foo'))),
+
+  '[foo, bar: { foo: bar }]' => array('foo', '1' => array('bar' => array('foo' => 'bar'))),
+);
+
+foreach ($testsForLoad as $yaml => $value)
+{
+  $t->is_deeply(sfYamlInline::load($yaml), $value, sprintf('::load() converts an inline YAML to a PHP structure (%s)', $yaml));
+}
+
+$testsForDump = array(
+  'null' => null,
+  'false' => false,
+  'true' => true,
+  '12' => 12,
+  "'quoted string'" => 'quoted string',
+  '12.30e+02' => 12.30e+02,
+  '1234' => 0x4D2,
+  '1243' => 02333,
+  '.Inf' => -log(0),
+  '-.Inf' => log(0),
+  '"foo\r\nbar"' => "foo\r\nbar",
+  "'foo#bar'" => 'foo#bar',
+  "'foo # bar'" => 'foo # bar',
+  "'#cfcfcf'" => '#cfcfcf',
+
+  "'a \"string\" with ''quoted strings inside'''" => 'a "string" with \'quoted strings inside\'',
+
+  // sequences
+  '[foo, bar, false, null, 12]' => array('foo', 'bar', false, null, 12),
+  '[\'foo,bar\', \'foo bar\']' => array('foo,bar', 'foo bar'),
+
+  // mappings
+  '{ foo: bar, bar: foo, \'false\': false, \'null\': null, integer: 12 }' => array('foo' => 'bar', 'bar' => 'foo', 'false' => false, 'null' => null, 'integer' => 12),
+  '{ foo: bar, bar: \'foo: bar\' }' => array('foo' => 'bar', 'bar' => 'foo: bar'),
+
+  // nested sequences and mappings
+  '[foo, [bar, foo]]' => array('foo', array('bar', 'foo')),
+
+  '[foo, [bar, [foo, [bar, foo]], foo]]' => array('foo', array('bar', array('foo', array('bar', 'foo')), 'foo')),
+
+  '{ foo: { bar: foo } }' => array('foo' => array('bar' => 'foo')),
+
+  '[foo, { bar: foo }]' => array('foo', array('bar' => 'foo')),
+
+  '[foo, { bar: foo, foo: [foo, { bar: foo }] }, [foo, { bar: foo }]]' => array('foo', array('bar' => 'foo', 'foo' => array('foo', array('bar' => 'foo'))), array('foo', array('bar' => 'foo'))),
+);
+
+// ::dump()
+$t->diag('::dump()');
+foreach ($testsForDump as $yaml => $value)
+{
+  $t->is(sfYamlInline::dump($value), $yaml, sprintf('::dump() converts a PHP structure to an inline YAML (%s)', $yaml));
+}
+
+foreach ($testsForLoad as $yaml => $value)
+{
+  if ($value == 1230)
+  {
+    continue;
+  }
+
+  $t->is_deeply(sfYamlInline::load(sfYamlInline::dump($value)), $value, 'check consistency');
+}
+
+foreach ($testsForDump as $yaml => $value)
+{
+  if ($value == 1230)
+  {
+    continue;
+  }
+
+  $t->is_deeply(sfYamlInline::load(sfYamlInline::dump($value)), $value, 'check consistency');
+}
diff --git a/lib/vendor/symfony/test/unit/yaml/sfYamlParserTest.php b/lib/vendor/symfony/test/unit/yaml/sfYamlParserTest.php
new file mode 100644
index 000000000..7e17b2a3e
--- /dev/null
+++ b/lib/vendor/symfony/test/unit/yaml/sfYamlParserTest.php
@@ -0,0 +1,89 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) Fabien Potencier <fabien.potencier@symfony-project.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+require_once(__DIR__.'/../../bootstrap/unit.php');
+
+sfYaml::setSpecVersion('1.1');
+
+$t = new lime_test(150);
+
+$parser = new sfYamlParser();
+
+$path = __DIR__.'/fixtures';
+$files = $parser->parse(file_get_contents($path.'/index.yml'));
+foreach ($files as $file)
+{
+  $t->diag($file);
+
+  $yamls = file_get_contents($path.'/'.$file.'.yml');
+
+  // split YAMLs documents
+  foreach (preg_split('/^---( %YAML\:1\.0)?/m', $yamls) as $yaml)
+  {
+    if (!$yaml)
+    {
+      continue;
+    }
+
+    $test = $parser->parse($yaml);
+    if (isset($test['todo']) && $test['todo'])
+    {
+      $t->todo($test['test']);
+    }
+    else
+    {
+      $expected = var_export(eval('return '.trim($test['php']).';'), true);
+
+      $t->is(var_export($parser->parse($test['yaml']), true), $expected, $test['test']);
+    }
+  }
+}
+
+// test tabs in YAML
+$yamls = array(
+  "foo:\n	bar",
+  "foo:\n 	bar",
+  "foo:\n	 bar",
+  "foo:\n 	 bar",
+);
+
+foreach ($yamls as $yaml)
+{
+  try
+  {
+    $content = $parser->parse($yaml);
+    $t->fail('YAML files must not contain tabs');
+  }
+  catch (InvalidArgumentException $e)
+  {
+    $t->pass('YAML files must not contain tabs');
+  }
+}
+
+$yaml = <<<EOF
+--- %YAML:1.0
+foo
+...
+EOF;
+
+$t->is('foo', $parser->parse($yaml));
+
+// objects
+$t->diag('Objects support');
+class A
+{
+  public $a = 'foo';
+}
+$a = array('foo' => new A(), 'bar' => 1);
+$t->is($parser->parse(<<<EOF
+foo: !!php/object:O:1:"A":1:{s:1:"a";s:3:"foo";}
+bar: 1
+EOF
+), $a, '->parse() is able to dump objects');

From 10a4ec37437ae4d2c85d1752f4e2beab9d5fa534 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Fri, 24 Mar 2017 17:11:09 +0900
Subject: [PATCH 586/630] apply patch to symfony for #1565 (refs #4178)

---
 data/patches/t1565.patch                        | 17 +++++++----------
 .../symfony/lib/request/sfWebRequest.class.php  |  5 +++--
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/data/patches/t1565.patch b/data/patches/t1565.patch
index 6eb50284e..219422c19 100644
--- a/data/patches/t1565.patch
+++ b/data/patches/t1565.patch
@@ -1,18 +1,16 @@
 diff --git a/lib/vendor/symfony/lib/request/sfWebRequest.class.php b/lib/vendor/symfony/lib/request/sfWebRequest.class.php
-index c2205f6..0c817fd 100644
+index 7839899..f6c5d55 100644
 --- a/lib/vendor/symfony/lib/request/sfWebRequest.class.php
 +++ b/lib/vendor/symfony/lib/request/sfWebRequest.class.php
-@@ -239,8 +239,8 @@ class sfWebRequest extends sfRequest
-   public function getPathInfo()
-   {
+@@ -271,6 +271,7 @@ class sfWebRequest extends sfRequest
      $pathInfo = '';
--
+ 
      $pathArray = $this->getPathInfoArray();
 +    $isIis = (isset($pathArray['SERVER_SOFTWARE']) && false !== stripos($pathArray['SERVER_SOFTWARE'], 'iis'));
-
+ 
      // simulate PATH_INFO if needed
-     $sf_path_info_key = $this->options['path_info_key'];
-@@ -261,14 +261,14 @@ class sfWebRequest extends sfRequest
+     $sf_path_info_key = $this->getOption('path_info_key');
+@@ -291,14 +292,14 @@ class sfWebRequest extends sfRequest
      else
      {
        $pathInfo = $pathArray[$sf_path_info_key];
@@ -22,11 +20,10 @@ index c2205f6..0c817fd 100644
          $pathInfo = preg_replace('/^'.str_replace('/', '\\/', $relativeUrlRoot).'\//', '', $pathInfo);
        }
      }
-
+ 
      // for IIS
 -    if (isset($_SERVER['SERVER_SOFTWARE']) && false !== stripos($_SERVER['SERVER_SOFTWARE'], 'iis') && $pos = stripos($pathInfo, '.php'))
 +    if ($isIis && $pos = stripos($pathInfo, '.php'))
      {
        $pathInfo = substr($pathInfo, $pos + 4);
      }
-
diff --git a/lib/vendor/symfony/lib/request/sfWebRequest.class.php b/lib/vendor/symfony/lib/request/sfWebRequest.class.php
index 7839899ff..f6c5d553b 100644
--- a/lib/vendor/symfony/lib/request/sfWebRequest.class.php
+++ b/lib/vendor/symfony/lib/request/sfWebRequest.class.php
@@ -271,6 +271,7 @@ public function getPathInfo()
     $pathInfo = '';
 
     $pathArray = $this->getPathInfoArray();
+    $isIis = (isset($pathArray['SERVER_SOFTWARE']) && false !== stripos($pathArray['SERVER_SOFTWARE'], 'iis'));
 
     // simulate PATH_INFO if needed
     $sf_path_info_key = $this->getOption('path_info_key');
@@ -291,14 +292,14 @@ public function getPathInfo()
     else
     {
       $pathInfo = $pathArray[$sf_path_info_key];
-      if ($relativeUrlRoot = $this->getRelativeUrlRoot())
+      if ($isIis && $relativeUrlRoot = $this->getRelativeUrlRoot())
       {
         $pathInfo = preg_replace('/^'.str_replace('/', '\\/', $relativeUrlRoot).'\//', '', $pathInfo);
       }
     }
 
     // for IIS
-    if (isset($_SERVER['SERVER_SOFTWARE']) && false !== stripos($_SERVER['SERVER_SOFTWARE'], 'iis') && $pos = stripos($pathInfo, '.php'))
+    if ($isIis && $pos = stripos($pathInfo, '.php'))
     {
       $pathInfo = substr($pathInfo, $pos + 4);
     }

From 3dfdc5f1a2c9b2e8c6093ff8aebf2c8c3c63cda1 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Fri, 24 Mar 2017 17:13:31 +0900
Subject: [PATCH 587/630] apply patch to symfony for #2408 (refs #4178)

---
 data/patches/t2408.patch                        | 9 ++++-----
 lib/vendor/symfony/lib/helper/PartialHelper.php | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/data/patches/t2408.patch b/data/patches/t2408.patch
index bf9f74cb0..5a5796e42 100644
--- a/data/patches/t2408.patch
+++ b/data/patches/t2408.patch
@@ -1,14 +1,13 @@
 diff --git a/lib/vendor/symfony/lib/helper/PartialHelper.php b/lib/vendor/symfony/lib/helper/PartialHelper.php
-index e5aac3d..9bfb4e1 100644
+index e20d0b9..ec1a846 100644
 --- a/lib/vendor/symfony/lib/helper/PartialHelper.php
 +++ b/lib/vendor/symfony/lib/helper/PartialHelper.php
-@@ -213,7 +213,7 @@ function get_partial($templateName, $vars = array())
-
+@@ -215,7 +215,7 @@ function get_partial($templateName, $vars = array())
+ 
    $class = sfConfig::get('mod_'.strtolower($moduleName).'_partial_view_class', 'sf').'PartialView';
    $view = new $class($context, $moduleName, $actionName, '');
 -  $view->setPartialVars(true === sfConfig::get('sf_escaping_strategy') ? sfOutputEscaper::unescape($vars) : $vars);
 +  $view->setPartialVars($vars);
-
+ 
    return $view->render();
  }
-
diff --git a/lib/vendor/symfony/lib/helper/PartialHelper.php b/lib/vendor/symfony/lib/helper/PartialHelper.php
index e20d0b9c2..ec1a84666 100644
--- a/lib/vendor/symfony/lib/helper/PartialHelper.php
+++ b/lib/vendor/symfony/lib/helper/PartialHelper.php
@@ -215,7 +215,7 @@ function get_partial($templateName, $vars = array())
 
   $class = sfConfig::get('mod_'.strtolower($moduleName).'_partial_view_class', 'sf').'PartialView';
   $view = new $class($context, $moduleName, $actionName, '');
-  $view->setPartialVars(true === sfConfig::get('sf_escaping_strategy') ? sfOutputEscaper::unescape($vars) : $vars);
+  $view->setPartialVars($vars);
 
   return $view->render();
 }

From e8951a80e6e82500c7c74182cdbdf51d01e1ac60 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Fri, 24 Mar 2017 17:16:04 +0900
Subject: [PATCH 588/630] apply patch to symfony for #3956 (refs #4178)

---
 data/patches/t3956.patch                                    | 6 +++---
 .../symfony/lib/config/sfFactoryConfigHandler.class.php     | 2 +-
 lib/vendor/symfony/lib/response/sfWebResponse.class.php     | 4 +---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/data/patches/t3956.patch b/data/patches/t3956.patch
index 1a1432081..c1674d267 100644
--- a/data/patches/t3956.patch
+++ b/data/patches/t3956.patch
@@ -1,5 +1,5 @@
 diff --git a/lib/vendor/symfony/lib/config/sfFactoryConfigHandler.class.php b/lib/vendor/symfony/lib/config/sfFactoryConfigHandler.class.php
-index 35e54459..b1615adf 100644
+index 0c1f2a8..c70e2c1 100644
 --- a/lib/vendor/symfony/lib/config/sfFactoryConfigHandler.class.php
 +++ b/lib/vendor/symfony/lib/config/sfFactoryConfigHandler.class.php
 @@ -95,7 +95,7 @@ class sfFactoryConfigHandler extends sfYamlConfigHandler
@@ -12,10 +12,10 @@ index 35e54459..b1615adf 100644
            $instances[] = sprintf("  if (\$this->factories['request'] instanceof sfWebRequest \n      && \$this->factories['response'] instanceof sfWebResponse \n      && 'HEAD' == \$this->factories['request']->getMethod())\n  {  \n    \$this->factories['response']->setHeaderOnly(true);\n  }\n");
            break;
 diff --git a/lib/vendor/symfony/lib/response/sfWebResponse.class.php b/lib/vendor/symfony/lib/response/sfWebResponse.class.php
-index 3aa15ea2..627b7223 100644
+index dcac761..9947b93 100644
 --- a/lib/vendor/symfony/lib/response/sfWebResponse.class.php
 +++ b/lib/vendor/symfony/lib/response/sfWebResponse.class.php
-@@ -796,9 +796,7 @@ class sfWebResponse extends sfResponse
+@@ -850,9 +850,7 @@ class sfWebResponse extends sfResponse
      $this->javascripts = $response->getJavascripts(self::RAW);
      $this->slots       = $response->getSlots();
  
diff --git a/lib/vendor/symfony/lib/config/sfFactoryConfigHandler.class.php b/lib/vendor/symfony/lib/config/sfFactoryConfigHandler.class.php
index 0c1f2a851..c70e2c137 100644
--- a/lib/vendor/symfony/lib/config/sfFactoryConfigHandler.class.php
+++ b/lib/vendor/symfony/lib/config/sfFactoryConfigHandler.class.php
@@ -95,7 +95,7 @@ public function execute($configFiles)
           break;
 
         case 'response':
-          $instances[] = sprintf("  \$class = sfConfig::get('sf_factory_response', '%s');\n  \$this->factories['response'] = new \$class(\$this->dispatcher, sfConfig::get('sf_factory_response_parameters', array_merge(array('http_protocol' => isset(\$_SERVER['SERVER_PROTOCOL']) ? \$_SERVER['SERVER_PROTOCOL'] : null), %s)));", $class, var_export($parameters, true));
+          $instances[] = sprintf("  \$class = sfConfig::get('sf_factory_response', '%s');\n  \$this->factories['response'] = new \$class(\$this->dispatcher, sfConfig::get('sf_factory_response_parameters', array_merge(array('http_protocol' => 'HTTP/1.1'), %s)));", $class, var_export($parameters, true));
           // TODO: this is a bit ugly, as it only works for sfWebRequest & sfWebResponse combination. see #3397
           $instances[] = sprintf("  if (\$this->factories['request'] instanceof sfWebRequest \n      && \$this->factories['response'] instanceof sfWebResponse \n      && 'HEAD' == \$this->factories['request']->getMethod())\n  {  \n    \$this->factories['response']->setHeaderOnly(true);\n  }\n");
           break;
diff --git a/lib/vendor/symfony/lib/response/sfWebResponse.class.php b/lib/vendor/symfony/lib/response/sfWebResponse.class.php
index dcac761d6..9947b9375 100644
--- a/lib/vendor/symfony/lib/response/sfWebResponse.class.php
+++ b/lib/vendor/symfony/lib/response/sfWebResponse.class.php
@@ -850,9 +850,7 @@ public function copyProperties(sfWebResponse $response)
     $this->javascripts = $response->getJavascripts(self::RAW);
     $this->slots       = $response->getSlots();
 
-    // HTTP protocol must be from the current request
-    // this fix is not nice but that's the only way to fix it and keep BC (see #9254)
-    $this->options['http_protocol'] = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0';
+    $this->options['http_protocol'] = 'HTTP/1.1';
   }
 
   /**

From f8d49a3ca878b057d88e04715119fac8bb1a05de Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Tue, 28 Mar 2017 13:34:30 +0900
Subject: [PATCH 589/630] update library dependency for NOTICE (refs #4178)

---
 NOTICE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NOTICE b/NOTICE
index ca1d27b0e..2ab97733e 100644
--- a/NOTICE
+++ b/NOTICE
@@ -31,7 +31,7 @@ This product needs the third-party softwares listed blow to run.
   - PHP: Hypertext Preprocessor (5.2.4 +)
 
 This product includes dependent libraries listed blow:
-  - symfony 1.4.1
+  - LExpress/symfony1 1.5.9 (fork of symfony 1.4)
   - Zend Framework 1.10.8 (partly)
     - Zend_Acl
     - Zend_Exception

From 83167a3d08678a755432097448c26f2a29f049aa Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Tue, 28 Mar 2017 15:22:05 +0900
Subject: [PATCH 590/630] use doctrine.configure event instead of
 ProjectConfiguration::configureDoctrine() (refs #4178)

---
 lib/config/opProjectConfiguration.class.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/config/opProjectConfiguration.class.php b/lib/config/opProjectConfiguration.class.php
index c591c0712..8e2e51ceb 100644
--- a/lib/config/opProjectConfiguration.class.php
+++ b/lib/config/opProjectConfiguration.class.php
@@ -48,6 +48,7 @@ public function setup()
     ));
 
     $this->dispatcher->connect('command.pre_command', array(__CLASS__, 'listenToPreCommandEvent'));
+    $this->dispatcher->connect('doctrine.configure', array($this, 'configureDoctrineEvent'));
     $this->dispatcher->connect('doctrine.filter_cli_config', array(__CLASS__, 'filterDoctrineCliConfig'));
 
     $this->setupProjectOpenPNE();
@@ -105,8 +106,10 @@ public function setIncludePath()
     ));
   }
 
-  public function configureDoctrine($manager)
+  public function configureDoctrineEvent(sfEvent $event)
   {
+    $manager = $event->getSubject();
+
     spl_autoload_register(array('Doctrine', 'extensionsAutoload'));
     Doctrine::setExtensionsPath(sfConfig::get('sf_lib_dir').'/vendor/doctrine_extensions');
     $manager->registerExtension('ExtraFunctions');

From 2ce146366b857841b9131029c34f78c1de501867 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Tue, 28 Mar 2017 15:23:55 +0900
Subject: [PATCH 591/630] define alias to Doctrine_Core class for backward
 compatibility (refs #4178)

---
 lib/config/opProjectConfiguration.class.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/config/opProjectConfiguration.class.php b/lib/config/opProjectConfiguration.class.php
index 8e2e51ceb..0495e4cf4 100644
--- a/lib/config/opProjectConfiguration.class.php
+++ b/lib/config/opProjectConfiguration.class.php
@@ -110,6 +110,12 @@ public function configureDoctrineEvent(sfEvent $event)
   {
     $manager = $event->getSubject();
 
+    // for BC
+    if (!class_exists('Doctrine'))
+    {
+      class_alias('Doctrine_Core', 'Doctrine');
+    }
+
     spl_autoload_register(array('Doctrine', 'extensionsAutoload'));
     Doctrine::setExtensionsPath(sfConfig::get('sf_lib_dir').'/vendor/doctrine_extensions');
     $manager->registerExtension('ExtraFunctions');

From cbfb258b96d3fad96f11288663dd754163464476 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Tue, 28 Mar 2017 15:36:36 +0900
Subject: [PATCH 592/630] use doctrine.filter_model_builder_options event
 instead of doctrine_model_builder_options config (refs #4178)

---
 lib/config/opProjectConfiguration.class.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/config/opProjectConfiguration.class.php b/lib/config/opProjectConfiguration.class.php
index 0495e4cf4..1eb7b0596 100644
--- a/lib/config/opProjectConfiguration.class.php
+++ b/lib/config/opProjectConfiguration.class.php
@@ -43,12 +43,9 @@ public function setup()
 
     $this->setOpenPNEConfiguration();
 
-    sfConfig::set('doctrine_model_builder_options', array(
-      'baseClassName' => 'opDoctrineRecord',
-    ));
-
     $this->dispatcher->connect('command.pre_command', array(__CLASS__, 'listenToPreCommandEvent'));
     $this->dispatcher->connect('doctrine.configure', array($this, 'configureDoctrineEvent'));
+    $this->dispatcher->connect('doctrine.filter_model_builder_options', array($this, 'filterDoctrineModelBuilderOptions'));
     $this->dispatcher->connect('doctrine.filter_cli_config', array(__CLASS__, 'filterDoctrineCliConfig'));
 
     $this->setupProjectOpenPNE();
@@ -146,6 +143,13 @@ class_alias('Doctrine_Core', 'Doctrine');
     $this->setupProjectOpenPNEDoctrine($manager);
   }
 
+  public function filterDoctrineModelBuilderOptions(sfEvent $event, array $options)
+  {
+    return array_merge($options, array(
+      'baseClassName' => 'opDoctrineRecord',
+    ));
+  }
+
   protected function setOpenPNEConfiguration()
   {
     $opConfigCachePath = sfConfig::get('sf_cache_dir').DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'OpenPNE.yml.php';

From 8e76bdea864759db06fbc074eae1e46a91dcc491 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Wed, 29 Mar 2017 14:09:15 +0900
Subject: [PATCH 593/630] update Image_Transform 0.9.5 (refs #4176)

---
 lib/vendor/PEAR/Image/Transform.php           | 15 ++++++---
 .../Image/Transform/Driver/Cairowrapper.php   | 25 ++++++---------
 lib/vendor/PEAR/Image/Transform/Driver/GD.php | 31 ++++++++++++++++---
 .../PEAR/Image/Transform/Driver/GD1.php       |  2 +-
 lib/vendor/PEAR/Image/Transform/Driver/IM.php |  2 +-
 .../PEAR/Image/Transform/Driver/Imagick2.php  |  2 +-
 .../PEAR/Image/Transform/Driver/Imagick3.php  |  2 +-
 .../PEAR/Image/Transform/Driver/Imlib.php     |  2 +-
 .../PEAR/Image/Transform/Driver/NetPBM.php    |  2 +-
 9 files changed, 53 insertions(+), 30 deletions(-)

diff --git a/lib/vendor/PEAR/Image/Transform.php b/lib/vendor/PEAR/Image/Transform.php
index bb2efc920..caa941207 100644
--- a/lib/vendor/PEAR/Image/Transform.php
+++ b/lib/vendor/PEAR/Image/Transform.php
@@ -22,7 +22,7 @@
  * @author    Philippe Jausions <Philippe.Jausions@11abacus.com>
  * @copyright 2002-2007 The PHP Group
  * @license   http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version   CVS: $Id: Transform.php 287350 2009-08-16 03:26:32Z clockwerx $
+ * @version   CVS: $Id: Transform.php 322659 2012-01-24 11:56:22Z clockwerx $
  * @link      http://pear.php.net/package/Image_Transform
  */
 
@@ -202,10 +202,14 @@ function &factory($driver = '')
     {
         if ($driver == '') {
             $extensions = array(
-                'imagick' => 'Imagick2',
+                'imagick' => 'Imagick3',
                 'gd'      => 'GD',
                 'imlib'   => 'Imlib'
             );
+            if (version_compare(PHP_VERSION, '5.0.0', '<')) {
+                //Imagick2 driver for php < 5
+                $extensions['imagick'] = 'Imagick2';
+            }
 
             foreach ($extensions as $ext => $ext_driver) {
                 if (PEAR::loadExtension($ext)) {
@@ -226,7 +230,10 @@ function &factory($driver = '')
                     $driver = 'GD';
                     break;
                 case 'imagick':
-                    $driver = 'Imagick2';
+                    $driver = 'Imagick3';
+                    if (version_compare(PHP_VERSION, '5.0.0', '<')) {
+                        $driver = 'Imagick2';
+                    }
                     break;
                 case 'imlib':
                     $driver = 'Imlib';
@@ -252,7 +259,7 @@ function &factory($driver = '')
                 );
             }
         }
-        $obj =& new $classname();
+        $obj = new $classname();
 
         // Check startup error
         if ($error =& $obj->isError()) {
diff --git a/lib/vendor/PEAR/Image/Transform/Driver/Cairowrapper.php b/lib/vendor/PEAR/Image/Transform/Driver/Cairowrapper.php
index e4d31ba50..179cd2efa 100644
--- a/lib/vendor/PEAR/Image/Transform/Driver/Cairowrapper.php
+++ b/lib/vendor/PEAR/Image/Transform/Driver/Cairowrapper.php
@@ -6,19 +6,13 @@
  *
  * PHP versions 4 and 5
  *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
  * @category   Image
  * @package    Image_Transform
- * @subpackage Image_Transform_Driver_GD
+ * @subpackage Image_Transform_Driver_Cairowrapper
  * @author     Christian Weiske <cweiske@php.net>
  * @copyright  2008 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Cairowrapper.php 287351 2009-08-16 03:28:48Z clockwerx $
+ * @license    http://www.gnu.org/copyleft/lesser.html LGPL
+ * @version    CVS: $Id: Cairowrapper.php 288112 2009-09-06 21:02:37Z cweiske $
  * @link       http://pear.php.net/package/Image_Transform
  */
 require_once 'Image/Transform.php';
@@ -27,12 +21,14 @@
  * Cairo implementation for Image_Transform package using pecl's cairo_wrapper
  * extension.
  *
+ * Supports png files only.
+ *
  * @category   Image
  * @package    Image_Transform
  * @subpackage Image_Transform_Driver_Cairowrapper
  * @author     Christian Weiske <cweiske@php.net>
  * @copyright  2008 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @license    http://www.gnu.org/copyleft/lesser.html LGPL
  * @version    Release: @package_version@
  * @link       http://pear.php.net/package/Image_Transform
  */
@@ -42,7 +38,8 @@ class Image_Transform_Driver_Cairowrapper extends Image_Transform
 
     /**
      * Supported image types
-     * @var array
+     *
+     * @var    array
      * @access protected
      */
     var $_supported_image_types = array(
@@ -60,16 +57,14 @@ function Image_Transform_Driver_Cairowrapper()
 
 
     /**
-     * Check settings
-     *
-     * @since PHP 5
+     * Create object and check if cairo_wrapper is loaded
      */
     function __construct()
     {
         if (!PEAR::loadExtension('cairo_wrapper')) {
             $this->isError(
                 PEAR::raiseError(
-                    "cairo_wrapper extension is not available.",
+                    'cairo_wrapper extension is not available.',
                     IMAGE_TRANSFORM_ERROR_UNSUPPORTED
                 )
             );
diff --git a/lib/vendor/PEAR/Image/Transform/Driver/GD.php b/lib/vendor/PEAR/Image/Transform/Driver/GD.php
index 3003daca7..a72f5686b 100644
--- a/lib/vendor/PEAR/Image/Transform/Driver/GD.php
+++ b/lib/vendor/PEAR/Image/Transform/Driver/GD.php
@@ -21,7 +21,7 @@
  * @author     Philippe Jausions <Philippe.Jausions@11abacus.com>
  * @copyright  2002-2005 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: GD.php 287351 2009-08-16 03:28:48Z clockwerx $
+ * @version    CVS: $Id: GD.php 322661 2012-01-24 12:02:59Z clockwerx $
  * @link       http://pear.php.net/package/Image_Transform
  */
 
@@ -106,7 +106,7 @@ function __construct()
                 || function_exists('imagegif')) {
                 $this->_supported_image_types['gif'] = 'rw';
             } elseif (function_exists('imagecreatefromgif')) {
-                $this->_supported_image_types['gif'] = 'r';
+                $this->_supported_image_types['gif'] = 'rw';
             }
             if ($types & IMG_JPG) {
                 $this->_supported_image_types['jpeg'] = 'rw';
@@ -576,8 +576,12 @@ function _createImage($width = -1, $height = -1, $trueColor = null)
         if ($createtruecolor
             && function_exists('ImageCreateTrueColor')) {
             $new_img = @ImageCreateTrueColor($width, $height);
-            imagealphablending($new_img, false);
-            imagesavealpha($new_img, true);
+            //GIF Transparent Patch
+            if ($this->type!='gif') {
+                imagealphablending($new_img, false);
+                imagesavealpha($new_img, true);
+            }
+            //End GIF Transparent Patch
         }
         if (!$new_img) {
             $new_img = ImageCreate($width, $height);
@@ -588,6 +592,23 @@ function _createImage($width = -1, $height = -1, $trueColor = null)
                 imagefill($new_img, 0, 0, $color);
             }
         }
+        
+        //GIF Transparent Patch
+        if ($this->type=='gif') {
+            $transparencyIndex = imagecolortransparent($this->imageHandle);
+            $transparencyColor = array('red' => 255, 'green' => 255, 'blue' => 255);
+            
+            if ($transparencyIndex >= 0) {
+                $transparencyColor = imagecolorsforindex($this->imageHandle, $transparencyIndex);   
+            }
+           
+            $transparencyIndex = imagecolorallocate($new_img, $transparencyColor['red'], $transparencyColor['green'], $transparencyColor['blue']);
+            imagefill($new_img, 0, 0, $transparencyIndex);
+            imagecolortransparent($new_img, $transparencyIndex);
+        }
+        //End GIF Transparent Patch
+        
+        
         return $new_img;
     }
-}
+}
\ No newline at end of file
diff --git a/lib/vendor/PEAR/Image/Transform/Driver/GD1.php b/lib/vendor/PEAR/Image/Transform/Driver/GD1.php
index b5e64453a..30a710ac5 100644
--- a/lib/vendor/PEAR/Image/Transform/Driver/GD1.php
+++ b/lib/vendor/PEAR/Image/Transform/Driver/GD1.php
@@ -24,7 +24,7 @@
  * @package
  * @author NAWAL ASWAN
  * @copyright Copyright (c) 2003
- * @version $Id: GD1.php 287351 2009-08-16 03:28:48Z clockwerx $
+ * @version $Id: GD1.php 234123 2007-04-19 16:36:09Z dufuz $
  * @access public
  **/
 Class Image_Transform_Driver_GD1 extends Image_Transform_Driver_GD
diff --git a/lib/vendor/PEAR/Image/Transform/Driver/IM.php b/lib/vendor/PEAR/Image/Transform/Driver/IM.php
index 3797e9e71..451d8288e 100644
--- a/lib/vendor/PEAR/Image/Transform/Driver/IM.php
+++ b/lib/vendor/PEAR/Image/Transform/Driver/IM.php
@@ -19,7 +19,7 @@
  * @author     Philippe Jausions <Philippe.Jausions@11abacus.com>
  * @copyright  2002-2005 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: IM.php 287351 2009-08-16 03:28:48Z clockwerx $
+ * @version    CVS: $Id: IM.php 266859 2008-09-30 22:28:47Z dufuz $
  * @link       http://pear.php.net/package/Image_Transform
  */
 
diff --git a/lib/vendor/PEAR/Image/Transform/Driver/Imagick2.php b/lib/vendor/PEAR/Image/Transform/Driver/Imagick2.php
index ea4b54980..6d6334296 100644
--- a/lib/vendor/PEAR/Image/Transform/Driver/Imagick2.php
+++ b/lib/vendor/PEAR/Image/Transform/Driver/Imagick2.php
@@ -21,7 +21,7 @@
  * @author     Philippe Jausions <Philippe.Jausions@11abacus.com>
  * @copyright  2002-2005 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Imagick2.php 287351 2009-08-16 03:28:48Z clockwerx $
+ * @version    CVS: $Id: Imagick2.php 266907 2008-10-01 21:10:50Z dufuz $
  * @link       http://pear.php.net/package/Image_Transform
  */
 
diff --git a/lib/vendor/PEAR/Image/Transform/Driver/Imagick3.php b/lib/vendor/PEAR/Image/Transform/Driver/Imagick3.php
index 8c19d6994..eb842a231 100644
--- a/lib/vendor/PEAR/Image/Transform/Driver/Imagick3.php
+++ b/lib/vendor/PEAR/Image/Transform/Driver/Imagick3.php
@@ -19,7 +19,7 @@
  * @author     Philippe Jausions <Philippe.Jausions@11abacus.com>
  * @copyright  2007 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Imagick3.php 287351 2009-08-16 03:28:48Z clockwerx $
+ * @version    CVS: $Id: Imagick3.php 266908 2008-10-01 21:11:07Z dufuz $
  * @link       http://pear.php.net/package/Image_Transform
  */
 
diff --git a/lib/vendor/PEAR/Image/Transform/Driver/Imlib.php b/lib/vendor/PEAR/Image/Transform/Driver/Imlib.php
index 856227fd6..15ac0e22a 100644
--- a/lib/vendor/PEAR/Image/Transform/Driver/Imlib.php
+++ b/lib/vendor/PEAR/Image/Transform/Driver/Imlib.php
@@ -14,7 +14,7 @@
 // +----------------------------------------------------------------------+
 // | Authors: Jason Rust <jrust@rustyparts.com>                           |
 // +----------------------------------------------------------------------+
-// $Id: Imlib.php 287351 2009-08-16 03:28:48Z clockwerx $
+// $Id: Imlib.php 258825 2008-04-30 23:00:13Z cweiske $
 // {{{ requires
 
 require_once 'Image/Transform.php';
diff --git a/lib/vendor/PEAR/Image/Transform/Driver/NetPBM.php b/lib/vendor/PEAR/Image/Transform/Driver/NetPBM.php
index 3c6e23606..a62742ffd 100644
--- a/lib/vendor/PEAR/Image/Transform/Driver/NetPBM.php
+++ b/lib/vendor/PEAR/Image/Transform/Driver/NetPBM.php
@@ -19,7 +19,7 @@
  * @author     Philippe Jausions <Philippe.Jausions@11abacus.com>
  * @copyright  2002-2005 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: NetPBM.php 287351 2009-08-16 03:28:48Z clockwerx $
+ * @version    CVS: $Id: NetPBM.php 236527 2007-05-28 16:36:09Z dufuz $
  * @link       http://pear.php.net/package/Image_Transform
  */
 

From 3d1d664ceb022df87c2fa677f14c47dc21883e10 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Wed, 29 Mar 2017 14:14:29 +0900
Subject: [PATCH 594/630] update Calendar 0.5.5 (refs #4176)

---
 lib/vendor/PEAR/Calendar/Calendar.php         |  4 +--
 lib/vendor/PEAR/Calendar/Day.php              |  6 ++--
 lib/vendor/PEAR/Calendar/Decorator.php        |  6 ++--
 .../PEAR/Calendar/Decorator/Textual.php       |  2 +-
 lib/vendor/PEAR/Calendar/Decorator/Uri.php    |  6 ++--
 .../PEAR/Calendar/Decorator/Weekday.php       |  4 +--
 .../PEAR/Calendar/Decorator/Wrapper.php       |  6 ++--
 lib/vendor/PEAR/Calendar/Engine/Interface.php |  2 +-
 lib/vendor/PEAR/Calendar/Engine/PearDate.php  |  2 +-
 lib/vendor/PEAR/Calendar/Engine/UnixTS.php    |  2 +-
 lib/vendor/PEAR/Calendar/Factory.php          |  2 +-
 lib/vendor/PEAR/Calendar/Hour.php             |  6 ++--
 lib/vendor/PEAR/Calendar/Minute.php           |  6 ++--
 lib/vendor/PEAR/Calendar/Month.php            |  6 ++--
 lib/vendor/PEAR/Calendar/Month/Weekdays.php   |  8 ++---
 lib/vendor/PEAR/Calendar/Month/Weeks.php      |  8 ++---
 lib/vendor/PEAR/Calendar/Second.php           |  4 +--
 lib/vendor/PEAR/Calendar/Table/Helper.php     |  2 +-
 lib/vendor/PEAR/Calendar/Util/Textual.php     |  4 +--
 lib/vendor/PEAR/Calendar/Util/Uri.php         |  4 +--
 lib/vendor/PEAR/Calendar/Validator.php        |  2 +-
 lib/vendor/PEAR/Calendar/Week.php             | 35 ++++++++++---------
 lib/vendor/PEAR/Calendar/Year.php             |  4 +--
 23 files changed, 67 insertions(+), 64 deletions(-)

diff --git a/lib/vendor/PEAR/Calendar/Calendar.php b/lib/vendor/PEAR/Calendar/Calendar.php
index 2c8f7082e..dc30d9cd4 100644
--- a/lib/vendor/PEAR/Calendar/Calendar.php
+++ b/lib/vendor/PEAR/Calendar/Calendar.php
@@ -33,7 +33,7 @@
  * @author    Lorenzo Alberton <l.alberton@quipo.it>
  * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Calendar.php,v 1.9 2008/11/15 21:21:42 quipo Exp $
+ * @version   CVS: $Id: Calendar.php 300729 2010-06-24 12:05:53Z quipo $
  * @link      http://pear.php.net/package/Calendar
  */
 
@@ -457,7 +457,7 @@ function & getValidator()
     {
         if (!isset($this->validator)) {
             include_once CALENDAR_ROOT.'Validator.php';
-            $this->validator = & new Calendar_Validator($this);
+            $this->validator = new Calendar_Validator($this);
         }
         return $this->validator;
     }
diff --git a/lib/vendor/PEAR/Calendar/Day.php b/lib/vendor/PEAR/Calendar/Day.php
index e265f9daa..4b76c7440 100644
--- a/lib/vendor/PEAR/Calendar/Day.php
+++ b/lib/vendor/PEAR/Calendar/Day.php
@@ -32,7 +32,7 @@
  * @author    Harry Fuecks <hfuecks@phppatterns.com>
  * @copyright 2003-2007 Harry Fuecks
  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Day.php,v 1.5 2007/11/16 20:03:12 quipo Exp $
+ * @version   CVS: $Id: Day.php 300729 2010-06-24 12:05:53Z quipo $
  * @link      http://pear.php.net/package/Calendar
  */
 
@@ -53,7 +53,7 @@
  * Represents a Day and builds Hours.
  * <code>
  * require_once 'Calendar/Day.php';
- * $Day = & new Calendar_Day(2003, 10, 21); // Oct 21st 2003
+ * $Day = new Calendar_Day(2003, 10, 21); // Oct 21st 2003
  * while ($Hour = & $Day->fetch()) {
  *    echo $Hour->thisHour().'<br />';
  * }
@@ -102,7 +102,7 @@ class Calendar_Day extends Calendar
      */
     function Calendar_Day($y, $m, $d)
     {
-        Calendar::Calendar($y, $m, $d);
+        parent::Calendar($y, $m, $d);
     }
 
     /**
diff --git a/lib/vendor/PEAR/Calendar/Decorator.php b/lib/vendor/PEAR/Calendar/Decorator.php
index 621ca57af..c01ffd753 100644
--- a/lib/vendor/PEAR/Calendar/Decorator.php
+++ b/lib/vendor/PEAR/Calendar/Decorator.php
@@ -32,7 +32,7 @@
  * @author    Harry Fuecks <hfuecks@phppatterns.com>
  * @copyright 2003-2007 Harry Fuecks
  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Decorator.php,v 1.9 2007/11/18 21:46:42 quipo Exp $
+ * @version   CVS: $Id: Decorator.php 300729 2010-06-24 12:05:53Z quipo $
  * @link      http://pear.php.net/package/Calendar
  */
 
@@ -49,8 +49,8 @@
 .*         return date('D', $day);
  *     }
  * }
- * $Day = & new Calendar_Day(2003, 10, 25);
- * $DayDecorator = & new DayDecorator($Day);
+ * $Day = new Calendar_Day(2003, 10, 25);
+ * $DayDecorator = new DayDecorator($Day);
  * echo $DayDecorator->thisDay(); // Outputs "Sat"
  * </code>
  *
diff --git a/lib/vendor/PEAR/Calendar/Decorator/Textual.php b/lib/vendor/PEAR/Calendar/Decorator/Textual.php
index 9737b3699..0cb1b933a 100644
--- a/lib/vendor/PEAR/Calendar/Decorator/Textual.php
+++ b/lib/vendor/PEAR/Calendar/Decorator/Textual.php
@@ -33,7 +33,7 @@
  * @author    Lorenzo Alberton <l.alberton@quipo.it>
  * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Textual.php,v 1.8 2007/11/24 11:04:24 quipo Exp $
+ * @version   CVS: $Id: Textual.php 246907 2007-11-24 11:04:24Z quipo $
  * @link      http://pear.php.net/package/Calendar
  */
 
diff --git a/lib/vendor/PEAR/Calendar/Decorator/Uri.php b/lib/vendor/PEAR/Calendar/Decorator/Uri.php
index e612c12ff..e94ce4d53 100644
--- a/lib/vendor/PEAR/Calendar/Decorator/Uri.php
+++ b/lib/vendor/PEAR/Calendar/Decorator/Uri.php
@@ -33,7 +33,7 @@
  * @author    Lorenzo Alberton <l.alberton@quipo.it>
  * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Uri.php,v 1.8 2007/11/18 21:46:43 quipo Exp $
+ * @version   CVS: $Id: Uri.php 300729 2010-06-24 12:05:53Z quipo $
  * @link      http://pear.php.net/package/Calendar
  */
 
@@ -61,7 +61,7 @@
  * have a specific need to use a decorator
  * <code>
  * $Day = new Calendar_Day(2003, 10, 23);
- * $Uri = & new Calendar_Decorator_Uri($Day);
+ * $Uri = new Calendar_Decorator_Uri($Day);
  * $Uri->setFragments('year', 'month', 'day');
  * echo $Uri->getPrev(); // Displays year=2003&month=10&day=22
  * </code>
@@ -112,7 +112,7 @@ function Calendar_Decorator_Uri(&$Calendar)
      */
     function setFragments($y, $m = null, $d = null, $h = null, $i = null, $s = null)
     {
-        $this->Uri = & new Calendar_Util_Uri($y, $m, $d, $h, $i, $s);
+        $this->Uri = new Calendar_Util_Uri($y, $m, $d, $h, $i, $s);
     }
 
     /**
diff --git a/lib/vendor/PEAR/Calendar/Decorator/Weekday.php b/lib/vendor/PEAR/Calendar/Decorator/Weekday.php
index eb0b49225..91d6f09bc 100644
--- a/lib/vendor/PEAR/Calendar/Decorator/Weekday.php
+++ b/lib/vendor/PEAR/Calendar/Decorator/Weekday.php
@@ -33,7 +33,7 @@
  * @author    Lorenzo Alberton <l.alberton@quipo.it>
  * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Weekday.php,v 1.8 2007/11/24 11:04:24 quipo Exp $
+ * @version   CVS: $Id: Weekday.php 300729 2010-06-24 12:05:53Z quipo $
  * @link      http://pear.php.net/package/Calendar
  */
 
@@ -58,7 +58,7 @@
  * Decorator for fetching the day of the week
  * <code>
  * $Day = new Calendar_Day(2003, 10, 23);
- * $Weekday = & new Calendar_Decorator_Weekday($Day);
+ * $Weekday = new Calendar_Decorator_Weekday($Day);
  * $Weekday->setFirstDay(0); // Set first day of week to Sunday (default Mon)
  * echo $Weekday->thisWeekDay(); // Displays 5 - fifth day of week relative to Sun
  * </code>
diff --git a/lib/vendor/PEAR/Calendar/Decorator/Wrapper.php b/lib/vendor/PEAR/Calendar/Decorator/Wrapper.php
index c813732a3..e8a522948 100644
--- a/lib/vendor/PEAR/Calendar/Decorator/Wrapper.php
+++ b/lib/vendor/PEAR/Calendar/Decorator/Wrapper.php
@@ -33,7 +33,7 @@
  * @author    Lorenzo Alberton <l.alberton@quipo.it>
  * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Wrapper.php,v 1.5 2007/10/31 18:27:03 quipo Exp $
+ * @version   CVS: $Id: Wrapper.php 300729 2010-06-24 12:05:53Z quipo $
  * @link      http://pear.php.net/package/Calendar
  */
 
@@ -88,7 +88,7 @@ function & fetch($decorator)
     {
         $Calendar = parent::fetch();
         if ($Calendar) {
-            $ret =& new $decorator($Calendar);
+            $ret = new $decorator($Calendar);
         } else {
             $ret = false;
         }
@@ -107,7 +107,7 @@ function fetchAll($decorator)
     {
         $children = parent::fetchAll();
         foreach ($children as $key => $Calendar) {
-            $children[$key] = & new $decorator($Calendar);
+            $children[$key] = new $decorator($Calendar);
         }
         return $children;
     }
diff --git a/lib/vendor/PEAR/Calendar/Engine/Interface.php b/lib/vendor/PEAR/Calendar/Engine/Interface.php
index b8c83a837..71f7573f1 100644
--- a/lib/vendor/PEAR/Calendar/Engine/Interface.php
+++ b/lib/vendor/PEAR/Calendar/Engine/Interface.php
@@ -33,7 +33,7 @@
  * @author    Lorenzo Alberton <l.alberton@quipo.it>
  * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Interface.php,v 1.10 2008/11/15 21:21:42 quipo Exp $
+ * @version   CVS: $Id: Interface.php 269074 2008-11-15 21:21:42Z quipo $
  * @link      http://pear.php.net/package/Calendar
  */
 
diff --git a/lib/vendor/PEAR/Calendar/Engine/PearDate.php b/lib/vendor/PEAR/Calendar/Engine/PearDate.php
index 4cd3fe507..a887e6443 100644
--- a/lib/vendor/PEAR/Calendar/Engine/PearDate.php
+++ b/lib/vendor/PEAR/Calendar/Engine/PearDate.php
@@ -32,7 +32,7 @@
  * @author    Lorenzo Alberton <l.alberton@quipo.it>
  * @copyright 2003-2007 Lorenzo Alberton
  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: PearDate.php,v 1.14 2008/11/15 21:41:38 quipo Exp $
+ * @version   CVS: $Id: PearDate.php 269076 2008-11-15 21:41:38Z quipo $
  * @link      http://pear.php.net/package/Calendar
  */
 
diff --git a/lib/vendor/PEAR/Calendar/Engine/UnixTS.php b/lib/vendor/PEAR/Calendar/Engine/UnixTS.php
index 0972e28ee..3dc500485 100644
--- a/lib/vendor/PEAR/Calendar/Engine/UnixTS.php
+++ b/lib/vendor/PEAR/Calendar/Engine/UnixTS.php
@@ -32,7 +32,7 @@
  * @author    Harry Fuecks <hfuecks@phppatterns.com>
  * @copyright 2003-2007 Harry Fuecks
  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: UnixTS.php,v 1.14 2008/11/15 21:21:42 quipo Exp $
+ * @version   CVS: $Id: UnixTS.php 269074 2008-11-15 21:21:42Z quipo $
  * @link      http://pear.php.net/package/Calendar
  */
 
diff --git a/lib/vendor/PEAR/Calendar/Factory.php b/lib/vendor/PEAR/Calendar/Factory.php
index bc38a76fe..980cf37fe 100644
--- a/lib/vendor/PEAR/Calendar/Factory.php
+++ b/lib/vendor/PEAR/Calendar/Factory.php
@@ -33,7 +33,7 @@
  * @author    Lorenzo Alberton <l.alberton@quipo.it>
  * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Factory.php,v 1.8 2007/11/18 21:46:42 quipo Exp $
+ * @version   CVS: $Id: Factory.php 246404 2007-11-18 21:46:43Z quipo $
  * @link      http://pear.php.net/package/Calendar
  */
 
diff --git a/lib/vendor/PEAR/Calendar/Hour.php b/lib/vendor/PEAR/Calendar/Hour.php
index f82ad74ba..a6378256f 100644
--- a/lib/vendor/PEAR/Calendar/Hour.php
+++ b/lib/vendor/PEAR/Calendar/Hour.php
@@ -32,7 +32,7 @@
  * @author    Harry Fuecks <hfuecks@phppatterns.com>
  * @copyright 2003-2007 Harry Fuecks
  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Hour.php,v 1.6 2007/11/24 11:04:24 quipo Exp $
+ * @version   CVS: $Id: Hour.php 300729 2010-06-24 12:05:53Z quipo $
  * @link      http://pear.php.net/package/Calendar
  */
 
@@ -53,7 +53,7 @@
  * Represents an Hour and builds Minutes
  * <code>
  * require_once 'Calendar'.DIRECTORY_SEPARATOR.'Hour.php';
- * $Hour = & new Calendar_Hour(2003, 10, 21, 15); // Oct 21st 2003, 3pm
+ * $Hour = new Calendar_Hour(2003, 10, 21, 15); // Oct 21st 2003, 3pm
  * $Hour->build(); // Build Calendar_Minute objects
  * while ($Minute = & $Hour->fetch()) {
  *     echo $Minute->thisMinute().'<br />';
@@ -82,7 +82,7 @@ class Calendar_Hour extends Calendar
      */
     function Calendar_Hour($y, $m, $d, $h)
     {
-        Calendar::Calendar($y, $m, $d, $h);
+        parent::Calendar($y, $m, $d, $h);
     }
 
     /**
diff --git a/lib/vendor/PEAR/Calendar/Minute.php b/lib/vendor/PEAR/Calendar/Minute.php
index 25403c00c..bd3edd74c 100644
--- a/lib/vendor/PEAR/Calendar/Minute.php
+++ b/lib/vendor/PEAR/Calendar/Minute.php
@@ -32,7 +32,7 @@
  * @author    Harry Fuecks <hfuecks@phppatterns.com>
  * @copyright 2003-2007 Harry Fuecks
  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Minute.php,v 1.5 2007/11/16 20:03:12 quipo Exp $
+ * @version   CVS: $Id: Minute.php 300729 2010-06-24 12:05:53Z quipo $
  * @link      http://pear.php.net/package/Calendar
  */
 
@@ -53,7 +53,7 @@
  * Represents a Minute and builds Seconds
  * <code>
  * require_once 'Calendar'.DIRECTORY_SEPARATOR.'Minute.php';
- * $Minute = & new Calendar_Minute(2003, 10, 21, 15, 31); // Oct 21st 2003, 3:31pm
+ * $Minute = new Calendar_Minute(2003, 10, 21, 15, 31); // Oct 21st 2003, 3:31pm
  * $Minute->build(); // Build Calendar_Second objects
  * while ($Second = & $Minute->fetch()) {
  *     echo $Second->thisSecond().'<br />';
@@ -83,7 +83,7 @@ class Calendar_Minute extends Calendar
      */
     function Calendar_Minute($y, $m, $d, $h, $i)
     {
-        Calendar::Calendar($y, $m, $d, $h, $i);
+        parent::Calendar($y, $m, $d, $h, $i);
     }
 
     /**
diff --git a/lib/vendor/PEAR/Calendar/Month.php b/lib/vendor/PEAR/Calendar/Month.php
index 1c8f1aeba..873f2d93a 100644
--- a/lib/vendor/PEAR/Calendar/Month.php
+++ b/lib/vendor/PEAR/Calendar/Month.php
@@ -32,7 +32,7 @@
  * @author    Harry Fuecks <hfuecks@phppatterns.com>
  * @copyright 2003-2007 Harry Fuecks
  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Month.php,v 1.7 2007/11/16 20:03:12 quipo Exp $
+ * @version   CVS: $Id: Month.php 300729 2010-06-24 12:05:53Z quipo $
  * @link      http://pear.php.net/package/Calendar
  */
 
@@ -53,7 +53,7 @@
  * Represents a Month and builds Days
  * <code>
  * require_once 'Calendar/Month.php';
- * $Month = & new Calendar_Month(2003, 10); // Oct 2003
+ * $Month = new Calendar_Month(2003, 10); // Oct 2003
  * $Month->build(); // Build Calendar_Day objects
  * while ($Day = & $Month->fetch()) {
  *     echo $Day->thisDay().'<br />';
@@ -81,7 +81,7 @@ class Calendar_Month extends Calendar
      */
     function Calendar_Month($y, $m, $firstDay=null)
     {
-        Calendar::Calendar($y, $m);
+        parent::Calendar($y, $m);
         $this->firstDay = $this->defineFirstDayOfWeek($firstDay);
     }
 
diff --git a/lib/vendor/PEAR/Calendar/Month/Weekdays.php b/lib/vendor/PEAR/Calendar/Month/Weekdays.php
index 2f40ce92e..f6fb46126 100644
--- a/lib/vendor/PEAR/Calendar/Month/Weekdays.php
+++ b/lib/vendor/PEAR/Calendar/Month/Weekdays.php
@@ -32,7 +32,7 @@
  * @author    Harry Fuecks <hfuecks@phppatterns.com>
  * @copyright 2003-2007 Harry Fuecks
  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Weekdays.php,v 1.8 2007/11/16 20:04:45 quipo Exp $
+ * @version   CVS: $Id: Weekdays.php 300729 2010-06-24 12:05:53Z quipo $
  * @link      http://pear.php.net/package/Calendar
  */
 
@@ -58,7 +58,7 @@
  * Represents a Month and builds Days in tabular form<br>
  * <code>
  * require_once 'Calendar/Month/Weekdays.php';
- * $Month = & new Calendar_Month_Weekdays(2003, 10); // Oct 2003
+ * $Month = new Calendar_Month_Weekdays(2003, 10); // Oct 2003
  * $Month->build(); // Build Calendar_Day objects
  * while ($Day = & $Month->fetch()) {
  *     if ($Day->isFirst()) {
@@ -110,7 +110,7 @@ class Calendar_Month_Weekdays extends Calendar_Month
      */
     function Calendar_Month_Weekdays($y, $m, $firstDay=null)
     {
-        Calendar_Month::Calendar_Month($y, $m, $firstDay);
+        parent::Calendar_Month($y, $m, $firstDay);
     }
 
     /**
@@ -129,7 +129,7 @@ function Calendar_Month_Weekdays($y, $m, $firstDay=null)
     function build($sDates = array())
     {
         include_once CALENDAR_ROOT.'Table/Helper.php';
-        $this->tableHelper = & new Calendar_Table_Helper($this, $this->firstDay);
+        $this->tableHelper = new Calendar_Table_Helper($this, $this->firstDay);
         Calendar_Month::build($sDates);
         $this->buildEmptyDaysBefore();
         $this->shiftDays();
diff --git a/lib/vendor/PEAR/Calendar/Month/Weeks.php b/lib/vendor/PEAR/Calendar/Month/Weeks.php
index 746d3a763..20f278640 100644
--- a/lib/vendor/PEAR/Calendar/Month/Weeks.php
+++ b/lib/vendor/PEAR/Calendar/Month/Weeks.php
@@ -33,7 +33,7 @@
  * @author    Lorenzo Alberton <l.alberton@quipo.it>
  * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Weeks.php,v 1.7 2007/11/16 20:04:45 quipo Exp $
+ * @version   CVS: $Id: Weeks.php 300729 2010-06-24 12:05:53Z quipo $
  * @link      http://pear.php.net/package/Calendar
  */
 
@@ -59,7 +59,7 @@
  * Represents a Month and builds Weeks
  * <code>
  * require_once 'Calendar'.DIRECTORY_SEPARATOR.'Month'.DIRECTORY_SEPARATOR.'Weeks.php';
- * $Month = & new Calendar_Month_Weeks(2003, 10); // Oct 2003
+ * $Month = new Calendar_Month_Weeks(2003, 10); // Oct 2003
  * $Month->build(); // Build Calendar_Day objects
  * while ($Week = & $Month->fetch()) {
  *     echo $Week->thisWeek().'<br />';
@@ -102,7 +102,7 @@ class Calendar_Month_Weeks extends Calendar_Month
      */
     function Calendar_Month_Weeks($y, $m, $firstDay=null)
     {
-        Calendar_Month::Calendar_Month($y, $m, $firstDay);
+        parent::Calendar_Month($y, $m, $firstDay);
     }
 
     /**
@@ -117,7 +117,7 @@ function Calendar_Month_Weeks($y, $m, $firstDay=null)
     function build($sDates = array())
     {
         include_once CALENDAR_ROOT.'Table/Helper.php';
-        $this->tableHelper = & new Calendar_Table_Helper($this, $this->firstDay);
+        $this->tableHelper = new Calendar_Table_Helper($this, $this->firstDay);
         include_once CALENDAR_ROOT.'Week.php';
         $numWeeks = $this->tableHelper->getNumWeeks();
         for ($i=1, $d=1; $i<=$numWeeks; $i++,
diff --git a/lib/vendor/PEAR/Calendar/Second.php b/lib/vendor/PEAR/Calendar/Second.php
index 2c4c493c2..b154396a4 100644
--- a/lib/vendor/PEAR/Calendar/Second.php
+++ b/lib/vendor/PEAR/Calendar/Second.php
@@ -32,7 +32,7 @@
  * @author    Harry Fuecks <hfuecks@phppatterns.com>
  * @copyright 2003-2007 Harry Fuecks
  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Second.php,v 1.4 2007/10/31 18:26:41 quipo Exp $
+ * @version   CVS: $Id: Second.php 300728 2010-06-24 11:43:56Z quipo $
  * @link      http://pear.php.net/package/Calendar
  */
 
@@ -76,7 +76,7 @@ class Calendar_Second extends Calendar
      */
     function Calendar_Second($y, $m, $d, $h, $i, $s)
     {
-        Calendar::Calendar($y, $m, $d, $h, $i, $s);
+        parent::Calendar($y, $m, $d, $h, $i, $s);
     }
 
     /**
diff --git a/lib/vendor/PEAR/Calendar/Table/Helper.php b/lib/vendor/PEAR/Calendar/Table/Helper.php
index 4720b18a2..ac1986fe9 100644
--- a/lib/vendor/PEAR/Calendar/Table/Helper.php
+++ b/lib/vendor/PEAR/Calendar/Table/Helper.php
@@ -32,7 +32,7 @@
  * @author    Harry Fuecks <hfuecks@phppatterns.com>
  * @copyright 2003-2007 Harry Fuecks
  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Helper.php,v 1.9 2007/11/16 20:05:05 quipo Exp $
+ * @version   CVS: $Id: Helper.php 246317 2007-11-16 20:05:32Z quipo $
  * @link      http://pear.php.net/package/Calendar
  */
 
diff --git a/lib/vendor/PEAR/Calendar/Util/Textual.php b/lib/vendor/PEAR/Calendar/Util/Textual.php
index 012e57bcb..4db00543f 100644
--- a/lib/vendor/PEAR/Calendar/Util/Textual.php
+++ b/lib/vendor/PEAR/Calendar/Util/Textual.php
@@ -33,13 +33,13 @@
  * @author    Lorenzo Alberton <l.alberton@quipo.it>
  * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Textual.php,v 1.8 2007/11/28 19:42:01 quipo Exp $
+ * @version   CVS: $Id: Textual.php 247250 2007-11-28 19:42:01Z quipo $
  * @link      http://pear.php.net/package/Calendar
  */
 
 /**
  * @package Calendar
- * @version $Id: Textual.php,v 1.8 2007/11/28 19:42:01 quipo Exp $
+ * @version $Id: Textual.php 247250 2007-11-28 19:42:01Z quipo $
  */
 
 /**
diff --git a/lib/vendor/PEAR/Calendar/Util/Uri.php b/lib/vendor/PEAR/Calendar/Util/Uri.php
index 9d63b9a59..c455acc01 100644
--- a/lib/vendor/PEAR/Calendar/Util/Uri.php
+++ b/lib/vendor/PEAR/Calendar/Util/Uri.php
@@ -33,7 +33,7 @@
  * @author    Lorenzo Alberton <l.alberton@quipo.it>
  * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Uri.php,v 1.7 2007/11/18 22:22:42 quipo Exp $
+ * @version   CVS: $Id: Uri.php 300729 2010-06-24 12:05:53Z quipo $
  * @link      http://pear.php.net/package/Calendar
  */
 
@@ -41,7 +41,7 @@
  * Utility to help building HTML links for navigating the calendar<br />
  * <code>
  * $Day = new Calendar_Day(2003, 10, 23);
- * $Uri = & new Calendar_Util_Uri('year', 'month', 'day');
+ * $Uri = new Calendar_Util_Uri('year', 'month', 'day');
  * echo $Uri->prev($Day,'month'); // Displays year=2003&amp;month=10
  * echo $Uri->prev($Day,'day'); // Displays year=2003&amp;month=10&amp;day=22
  * $Uri->seperator = '/';
diff --git a/lib/vendor/PEAR/Calendar/Validator.php b/lib/vendor/PEAR/Calendar/Validator.php
index d9296d993..64b4ef481 100644
--- a/lib/vendor/PEAR/Calendar/Validator.php
+++ b/lib/vendor/PEAR/Calendar/Validator.php
@@ -32,7 +32,7 @@
  * @author    Harry Fuecks <hfuecks@phppatterns.com>
  * @copyright 2003-2007 Harry Fuecks
  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Validator.php,v 1.6 2007/11/28 19:42:33 quipo Exp $
+ * @version   CVS: $Id: Validator.php 247251 2007-11-28 19:42:33Z quipo $
  * @link      http://pear.php.net/package/Calendar
  */
 
diff --git a/lib/vendor/PEAR/Calendar/Week.php b/lib/vendor/PEAR/Calendar/Week.php
index ba336c94d..43c62dd37 100644
--- a/lib/vendor/PEAR/Calendar/Week.php
+++ b/lib/vendor/PEAR/Calendar/Week.php
@@ -33,7 +33,7 @@
  * @author    Lorenzo Alberton <l.alberton@quipo.it>
  * @copyright 2003-2007 Harry Fuecks, Lorenzo Alberton
  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Week.php,v 1.14 2007/11/18 21:46:42 quipo Exp $
+ * @version   CVS: $Id: Week.php 300729 2010-06-24 12:05:53Z quipo $
  * @link      http://pear.php.net/package/Calendar
  */
 
@@ -54,7 +54,7 @@
  * Represents a Week and builds Days in tabular format<br>
  * <code>
  * require_once 'Calendar/Week.php';
- * $Week = & new Calendar_Week(2003, 10, 1); Oct 2003, 1st tabular week
+ * $Week = new Calendar_Week(2003, 10, 1); Oct 2003, 1st tabular week
  * echo '<tr>';
  * while ($Day = & $Week->fetch()) {
  *     if ($Day->isEmpty()) {
@@ -138,9 +138,9 @@ class Calendar_Week extends Calendar
     function Calendar_Week($y, $m, $d, $firstDay = null)
     {
         include_once CALENDAR_ROOT.'Table/Helper.php';
-        Calendar::Calendar($y, $m, $d);
+        parent::Calendar($y, $m, $d);
         $this->firstDay    = $this->defineFirstDayOfWeek($firstDay);
-        $this->tableHelper = & new Calendar_Table_Helper($this, $this->firstDay);
+        $this->tableHelper = new Calendar_Table_Helper($this, $this->firstDay);
         $this->thisWeek    = $this->tableHelper->getWeekStart($y, $m, $d, $this->firstDay);
         $this->prevWeek    = $this->tableHelper->getWeekStart(
             $y, 
@@ -313,21 +313,24 @@ function setSelection($sDates)
      */
     function thisYear($format = 'int')
     {
-        $tmp_cal = new Calendar();
-        $tmp_cal->setTimestamp($this->thisWeek);
-        $first_dow = $tmp_cal->thisDay('array');
-        $days_in_week = $tmp_cal->cE->getDaysInWeek($tmp_cal->year, $tmp_cal->month, $tmp_cal->day);
-        $tmp_cal->day += $days_in_week;
-        $last_dow  = $tmp_cal->thisDay('array');
+        if (null !== $this->thisWeek) {
+            $tmp_cal = new Calendar();
+            $tmp_cal->setTimestamp($this->thisWeek);
+            $first_dow = $tmp_cal->thisDay('array');
+            $days_in_week = $tmp_cal->cE->getDaysInWeek($tmp_cal->year, $tmp_cal->month, $tmp_cal->day);
+            $tmp_cal->day += $days_in_week;
+            $last_dow  = $tmp_cal->thisDay('array');
 
-        if ($first_dow['year'] == $last_dow['year']) {
-            return $first_dow['year'];
-        }
+            if ($first_dow['year'] == $last_dow['year']) {
+                return $first_dow['year'];
+            }
 
-        if ($last_dow['day'] > floor($days_in_week / 2)) {
-            return $last_dow['year'];
+            if ($last_dow['day'] > floor($days_in_week / 2)) {
+                return $last_dow['year'];
+            }
+            return $first_dow['year'];
         }
-        return $first_dow['year'];
+        return parent::thisYear();
     }
 
     /**
diff --git a/lib/vendor/PEAR/Calendar/Year.php b/lib/vendor/PEAR/Calendar/Year.php
index 3d0a32010..681a35f09 100644
--- a/lib/vendor/PEAR/Calendar/Year.php
+++ b/lib/vendor/PEAR/Calendar/Year.php
@@ -32,7 +32,7 @@
  * @author    Harry Fuecks <hfuecks@phppatterns.com>
  * @copyright 2003-2007 Harry Fuecks
  * @license   http://www.debian.org/misc/bsd.license  BSD License (3 Clause)
- * @version   CVS: $Id: Year.php,v 1.9 2007/11/18 21:46:42 quipo Exp $
+ * @version   CVS: $Id: Year.php 300728 2010-06-24 11:43:56Z quipo $
  * @link      http://pear.php.net/package/Calendar
  */
 
@@ -79,7 +79,7 @@ class Calendar_Year extends Calendar
      */
     function Calendar_Year($y)
     {
-        Calendar::Calendar($y);
+        parent::Calendar($y);
     }
 
     /**

From 75e65ae81ca573eeb100c11279fa4e6a91176086 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Wed, 29 Mar 2017 16:28:19 +0900
Subject: [PATCH 595/630] drop OpenPNE_Amazon class and its dependencies (refs
 #4176)

---
 lib/vendor/PEAR/Amazon/Amazon.php             |   49 -
 lib/vendor/PEAR/Amazon/HTTP/Request.php       | 1484 -----------------
 lib/vendor/PEAR/Amazon/Net/Socket.php         |  576 -------
 lib/vendor/PEAR/Amazon/Net/URL.php            |  485 ------
 .../PEAR/Amazon/Services/AmazonECS4.php       | 1211 --------------
 lib/vendor/PEAR/Amazon/XML/Parser.php         |  690 --------
 lib/vendor/PEAR/Amazon/XML/Unserializer.php   |  856 ----------
 7 files changed, 5351 deletions(-)
 delete mode 100644 lib/vendor/PEAR/Amazon/Amazon.php
 delete mode 100644 lib/vendor/PEAR/Amazon/HTTP/Request.php
 delete mode 100644 lib/vendor/PEAR/Amazon/Net/Socket.php
 delete mode 100644 lib/vendor/PEAR/Amazon/Net/URL.php
 delete mode 100644 lib/vendor/PEAR/Amazon/Services/AmazonECS4.php
 delete mode 100644 lib/vendor/PEAR/Amazon/XML/Parser.php
 delete mode 100644 lib/vendor/PEAR/Amazon/XML/Unserializer.php

diff --git a/lib/vendor/PEAR/Amazon/Amazon.php b/lib/vendor/PEAR/Amazon/Amazon.php
deleted file mode 100644
index bd3139fc1..000000000
--- a/lib/vendor/PEAR/Amazon/Amazon.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * @copyright 2005-2008 OpenPNE Project
- * @license   http://www.php.net/license/3_01.txt PHP License 3.01
- */
-
-require_once 'Services/AmazonECS4.php';
-
-/**
- * OpenPNEでAmazonECSを利用するためのクラス
- *
- * @package OpenPNE
- * @author Kousuke Ebihara <ebihara@tejimaya.com>
- */
-class OpenPNE_Amazon extends Services_AmazonECS4
-{
-    /**
-     * Category(AmazonECS3)とSearchIndexの変換テーブル
-     *
-     * @var array
-     */
-    var $_categoryToSearchIndex = array(
-        'books-jp' => 'Books',
-        'books-us' => 'ForeignBooks',
-        'music-jp' => 'Music',
-        'classical-jp' => 'Classical',
-        'dvd-jp' => 'DVD',
-        'videogames-jp' => 'VideoGames',
-        'software-jp' => 'Software',
-        'electronics-jp' => 'Electronics',
-        'kitchen-jp' => 'Kitchen',
-        'toys-jp' => 'Toys',
-        'sporting-goods-jp' => 'SportingGoods',
-        'hpc-jp' => 'HealthPersonalCare',
-    );
-
-    function ItemSearch($search_index, $options = array())
-    {
-        // SearchIndex ではなく Category が渡された
-        if (array_key_exists($search_index, $this->_categoryToSearchIndex)) {
-            $search_index = $this->_categoryToSearchIndex[$search_index];
-        }
-
-        $result =  parent::ItemSearch($search_index, $options);
-        return $result;
-    }
-}
-
-?>
diff --git a/lib/vendor/PEAR/Amazon/HTTP/Request.php b/lib/vendor/PEAR/Amazon/HTTP/Request.php
deleted file mode 100644
index 10fa312b0..000000000
--- a/lib/vendor/PEAR/Amazon/HTTP/Request.php
+++ /dev/null
@@ -1,1484 +0,0 @@
-<?php
-/**
- * Class for performing HTTP requests
- *
- * PHP versions 4 and 5
- * 
- * LICENSE:
- *
- * Copyright (c) 2002-2007, Richard Heyes
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * o Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * o Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * o The names of the authors may not be used to endorse or promote
- *   products derived from this software without specific prior written
- *   permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category    HTTP
- * @package     HTTP_Request
- * @author      Richard Heyes <richard@phpguru.org>
- * @author      Alexey Borzov <avb@php.net>
- * @copyright   2002-2007 Richard Heyes
- * @license     http://opensource.org/licenses/bsd-license.php New BSD License
- * @version     CVS: $Id: Request.php,v 1.58 2007/10/26 13:45:56 avb Exp $
- * @link        http://pear.php.net/package/HTTP_Request/ 
- */
-
-/**
- * PEAR and PEAR_Error classes (for error handling)
- */
-require_once 'PEAR.php';
-/**
- * Socket class
- */
-require_once 'Net/Socket.php';
-/**
- * URL handling class
- */ 
-require_once 'Net/URL.php';
-
-/**#@+
- * Constants for HTTP request methods
- */ 
-define('HTTP_REQUEST_METHOD_GET',     'GET',     true);
-define('HTTP_REQUEST_METHOD_HEAD',    'HEAD',    true);
-define('HTTP_REQUEST_METHOD_POST',    'POST',    true);
-define('HTTP_REQUEST_METHOD_PUT',     'PUT',     true);
-define('HTTP_REQUEST_METHOD_DELETE',  'DELETE',  true);
-define('HTTP_REQUEST_METHOD_OPTIONS', 'OPTIONS', true);
-define('HTTP_REQUEST_METHOD_TRACE',   'TRACE',   true);
-/**#@-*/
-
-/**#@+
- * Constants for HTTP request error codes
- */ 
-define('HTTP_REQUEST_ERROR_FILE',             1);
-define('HTTP_REQUEST_ERROR_URL',              2);
-define('HTTP_REQUEST_ERROR_PROXY',            4);
-define('HTTP_REQUEST_ERROR_REDIRECTS',        8);
-define('HTTP_REQUEST_ERROR_RESPONSE',        16);  
-define('HTTP_REQUEST_ERROR_GZIP_METHOD',     32);
-define('HTTP_REQUEST_ERROR_GZIP_READ',       64);
-define('HTTP_REQUEST_ERROR_GZIP_DATA',      128);
-define('HTTP_REQUEST_ERROR_GZIP_CRC',       256);
-/**#@-*/
-
-/**#@+
- * Constants for HTTP protocol versions
- */
-define('HTTP_REQUEST_HTTP_VER_1_0', '1.0', true);
-define('HTTP_REQUEST_HTTP_VER_1_1', '1.1', true);
-/**#@-*/
-
-if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {
-   /**
-    * Whether string functions are overloaded by their mbstring equivalents 
-    */
-    define('HTTP_REQUEST_MBSTRING', true);
-} else {
-   /**
-    * @ignore
-    */
-    define('HTTP_REQUEST_MBSTRING', false);
-}
-
-/**
- * Class for performing HTTP requests
- *
- * Simple example (fetches yahoo.com and displays it):
- * <code>
- * $a = &new HTTP_Request('http://www.yahoo.com/');
- * $a->sendRequest();
- * echo $a->getResponseBody();
- * </code>
- *
- * @category    HTTP
- * @package     HTTP_Request
- * @author      Richard Heyes <richard@phpguru.org>
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 1.4.2
- */
-class HTTP_Request
-{
-   /**#@+
-    * @access private
-    */
-    /**
-    * Instance of Net_URL
-    * @var Net_URL
-    */
-    var $_url;
-
-    /**
-    * Type of request
-    * @var string
-    */
-    var $_method;
-
-    /**
-    * HTTP Version
-    * @var string
-    */
-    var $_http;
-
-    /**
-    * Request headers
-    * @var array
-    */
-    var $_requestHeaders;
-
-    /**
-    * Basic Auth Username
-    * @var string
-    */
-    var $_user;
-    
-    /**
-    * Basic Auth Password
-    * @var string
-    */
-    var $_pass;
-
-    /**
-    * Socket object
-    * @var Net_Socket
-    */
-    var $_sock;
-    
-    /**
-    * Proxy server
-    * @var string
-    */
-    var $_proxy_host;
-    
-    /**
-    * Proxy port
-    * @var integer
-    */
-    var $_proxy_port;
-    
-    /**
-    * Proxy username
-    * @var string
-    */
-    var $_proxy_user;
-    
-    /**
-    * Proxy password
-    * @var string
-    */
-    var $_proxy_pass;
-
-    /**
-    * Post data
-    * @var array
-    */
-    var $_postData;
-
-   /**
-    * Request body  
-    * @var string
-    */
-    var $_body;
-
-   /**
-    * A list of methods that MUST NOT have a request body, per RFC 2616
-    * @var array
-    */
-    var $_bodyDisallowed = array('TRACE');
-
-   /**
-    * Files to post 
-    * @var array
-    */
-    var $_postFiles = array();
-
-    /**
-    * Connection timeout.
-    * @var float
-    */
-    var $_timeout;
-    
-    /**
-    * HTTP_Response object
-    * @var HTTP_Response
-    */
-    var $_response;
-    
-    /**
-    * Whether to allow redirects
-    * @var boolean
-    */
-    var $_allowRedirects;
-    
-    /**
-    * Maximum redirects allowed
-    * @var integer
-    */
-    var $_maxRedirects;
-    
-    /**
-    * Current number of redirects
-    * @var integer
-    */
-    var $_redirects;
-
-   /**
-    * Whether to append brackets [] to array variables
-    * @var bool
-    */
-    var $_useBrackets = true;
-
-   /**
-    * Attached listeners
-    * @var array
-    */
-    var $_listeners = array();
-
-   /**
-    * Whether to save response body in response object property  
-    * @var bool
-    */
-    var $_saveBody = true;
-
-   /**
-    * Timeout for reading from socket (array(seconds, microseconds))
-    * @var array
-    */
-    var $_readTimeout = null;
-
-   /**
-    * Options to pass to Net_Socket::connect. See stream_context_create
-    * @var array
-    */
-    var $_socketOptions = null;
-   /**#@-*/
-
-    /**
-    * Constructor
-    *
-    * Sets up the object
-    * @param    string  The url to fetch/access
-    * @param    array   Associative array of parameters which can have the following keys:
-    * <ul>
-    *   <li>method         - Method to use, GET, POST etc (string)</li>
-    *   <li>http           - HTTP Version to use, 1.0 or 1.1 (string)</li>
-    *   <li>user           - Basic Auth username (string)</li>
-    *   <li>pass           - Basic Auth password (string)</li>
-    *   <li>proxy_host     - Proxy server host (string)</li>
-    *   <li>proxy_port     - Proxy server port (integer)</li>
-    *   <li>proxy_user     - Proxy auth username (string)</li>
-    *   <li>proxy_pass     - Proxy auth password (string)</li>
-    *   <li>timeout        - Connection timeout in seconds (float)</li>
-    *   <li>allowRedirects - Whether to follow redirects or not (bool)</li>
-    *   <li>maxRedirects   - Max number of redirects to follow (integer)</li>
-    *   <li>useBrackets    - Whether to append [] to array variable names (bool)</li>
-    *   <li>saveBody       - Whether to save response body in response object property (bool)</li>
-    *   <li>readTimeout    - Timeout for reading / writing data over the socket (array (seconds, microseconds))</li>
-    *   <li>socketOptions  - Options to pass to Net_Socket object (array)</li>
-    * </ul>
-    * @access public
-    */
-    function HTTP_Request($url = '', $params = array())
-    {
-        $this->_method         =  HTTP_REQUEST_METHOD_GET;
-        $this->_http           =  HTTP_REQUEST_HTTP_VER_1_1;
-        $this->_requestHeaders = array();
-        $this->_postData       = array();
-        $this->_body           = null;
-
-        $this->_user = null;
-        $this->_pass = null;
-
-        $this->_proxy_host = null;
-        $this->_proxy_port = null;
-        $this->_proxy_user = null;
-        $this->_proxy_pass = null;
-
-        $this->_allowRedirects = false;
-        $this->_maxRedirects   = 3;
-        $this->_redirects      = 0;
-
-        $this->_timeout  = null;
-        $this->_response = null;
-
-        foreach ($params as $key => $value) {
-            $this->{'_' . $key} = $value;
-        }
-
-        if (!empty($url)) {
-            $this->setURL($url);
-        }
-
-        // Default useragent
-        $this->addHeader('User-Agent', 'PEAR HTTP_Request class ( http://pear.php.net/ )');
-
-        // We don't do keep-alives by default
-        $this->addHeader('Connection', 'close');
-
-        // Basic authentication
-        if (!empty($this->_user)) {
-            $this->addHeader('Authorization', 'Basic ' . base64_encode($this->_user . ':' . $this->_pass));
-        }
-
-        // Proxy authentication (see bug #5913)
-        if (!empty($this->_proxy_user)) {
-            $this->addHeader('Proxy-Authorization', 'Basic ' . base64_encode($this->_proxy_user . ':' . $this->_proxy_pass));
-        }
-
-        // Use gzip encoding if possible
-        if (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http && extension_loaded('zlib')) {
-            $this->addHeader('Accept-Encoding', 'gzip');
-        }
-    }
-    
-    /**
-    * Generates a Host header for HTTP/1.1 requests
-    *
-    * @access private
-    * @return string
-    */
-    function _generateHostHeader()
-    {
-        if ($this->_url->port != 80 AND strcasecmp($this->_url->protocol, 'http') == 0) {
-            $host = $this->_url->host . ':' . $this->_url->port;
-
-        } elseif ($this->_url->port != 443 AND strcasecmp($this->_url->protocol, 'https') == 0) {
-            $host = $this->_url->host . ':' . $this->_url->port;
-
-        } elseif ($this->_url->port == 443 AND strcasecmp($this->_url->protocol, 'https') == 0 AND strpos($this->_url->url, ':443') !== false) {
-            $host = $this->_url->host . ':' . $this->_url->port;
-        
-        } else {
-            $host = $this->_url->host;
-        }
-
-        return $host;
-    }
-    
-    /**
-    * Resets the object to its initial state (DEPRECATED).
-    * Takes the same parameters as the constructor.
-    *
-    * @param  string $url    The url to be requested
-    * @param  array  $params Associative array of parameters
-    *                        (see constructor for details)
-    * @access public
-    * @deprecated deprecated since 1.2, call the constructor if this is necessary
-    */
-    function reset($url, $params = array())
-    {
-        $this->HTTP_Request($url, $params);
-    }
-
-    /**
-    * Sets the URL to be requested
-    *
-    * @param  string The url to be requested
-    * @access public
-    */
-    function setURL($url)
-    {
-        $this->_url = &new Net_URL($url, $this->_useBrackets);
-
-        if (!empty($this->_url->user) || !empty($this->_url->pass)) {
-            $this->setBasicAuth($this->_url->user, $this->_url->pass);
-        }
-
-        if (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http) {
-            $this->addHeader('Host', $this->_generateHostHeader());
-        }
-
-        // set '/' instead of empty path rather than check later (see bug #8662)
-        if (empty($this->_url->path)) {
-            $this->_url->path = '/';
-        } 
-    }
-    
-   /**
-    * Returns the current request URL  
-    *
-    * @return   string  Current request URL
-    * @access   public
-    */
-    function getUrl()
-    {
-        return empty($this->_url)? '': $this->_url->getUrl();
-    }
-
-    /**
-    * Sets a proxy to be used
-    *
-    * @param string     Proxy host
-    * @param int        Proxy port
-    * @param string     Proxy username
-    * @param string     Proxy password
-    * @access public
-    */
-    function setProxy($host, $port = 8080, $user = null, $pass = null)
-    {
-        $this->_proxy_host = $host;
-        $this->_proxy_port = $port;
-        $this->_proxy_user = $user;
-        $this->_proxy_pass = $pass;
-
-        if (!empty($user)) {
-            $this->addHeader('Proxy-Authorization', 'Basic ' . base64_encode($user . ':' . $pass));
-        }
-    }
-
-    /**
-    * Sets basic authentication parameters
-    *
-    * @param string     Username
-    * @param string     Password
-    */
-    function setBasicAuth($user, $pass)
-    {
-        $this->_user = $user;
-        $this->_pass = $pass;
-
-        $this->addHeader('Authorization', 'Basic ' . base64_encode($user . ':' . $pass));
-    }
-
-    /**
-    * Sets the method to be used, GET, POST etc.
-    *
-    * @param string     Method to use. Use the defined constants for this
-    * @access public
-    */
-    function setMethod($method)
-    {
-        $this->_method = $method;
-    }
-
-    /**
-    * Sets the HTTP version to use, 1.0 or 1.1
-    *
-    * @param string     Version to use. Use the defined constants for this
-    * @access public
-    */
-    function setHttpVer($http)
-    {
-        $this->_http = $http;
-    }
-
-    /**
-    * Adds a request header
-    *
-    * @param string     Header name
-    * @param string     Header value
-    * @access public
-    */
-    function addHeader($name, $value)
-    {
-        $this->_requestHeaders[strtolower($name)] = $value;
-    }
-
-    /**
-    * Removes a request header
-    *
-    * @param string     Header name to remove
-    * @access public
-    */
-    function removeHeader($name)
-    {
-        if (isset($this->_requestHeaders[strtolower($name)])) {
-            unset($this->_requestHeaders[strtolower($name)]);
-        }
-    }
-
-    /**
-    * Adds a querystring parameter
-    *
-    * @param string     Querystring parameter name
-    * @param string     Querystring parameter value
-    * @param bool       Whether the value is already urlencoded or not, default = not
-    * @access public
-    */
-    function addQueryString($name, $value, $preencoded = false)
-    {
-        $this->_url->addQueryString($name, $value, $preencoded);
-    }    
-    
-    /**
-    * Sets the querystring to literally what you supply
-    *
-    * @param string     The querystring data. Should be of the format foo=bar&x=y etc
-    * @param bool       Whether data is already urlencoded or not, default = already encoded
-    * @access public
-    */
-    function addRawQueryString($querystring, $preencoded = true)
-    {
-        $this->_url->addRawQueryString($querystring, $preencoded);
-    }
-
-    /**
-    * Adds postdata items
-    *
-    * @param string     Post data name
-    * @param string     Post data value
-    * @param bool       Whether data is already urlencoded or not, default = not
-    * @access public
-    */
-    function addPostData($name, $value, $preencoded = false)
-    {
-        if ($preencoded) {
-            $this->_postData[$name] = $value;
-        } else {
-            $this->_postData[$name] = $this->_arrayMapRecursive('urlencode', $value);
-        }
-    }
-
-   /**
-    * Recursively applies the callback function to the value
-    * 
-    * @param    mixed   Callback function
-    * @param    mixed   Value to process
-    * @access   private
-    * @return   mixed   Processed value
-    */
-    function _arrayMapRecursive($callback, $value)
-    {
-        if (!is_array($value)) {
-            return call_user_func($callback, $value);
-        } else {
-            $map = array();
-            foreach ($value as $k => $v) {
-                $map[$k] = $this->_arrayMapRecursive($callback, $v);
-            }
-            return $map;
-        }
-    }
-
-   /**
-    * Adds a file to upload
-    * 
-    * This also changes content-type to 'multipart/form-data' for proper upload
-    * 
-    * @access public
-    * @param  string    name of file-upload field
-    * @param  mixed     file name(s)
-    * @param  mixed     content-type(s) of file(s) being uploaded
-    * @return bool      true on success
-    * @throws PEAR_Error
-    */
-    function addFile($inputName, $fileName, $contentType = 'application/octet-stream')
-    {
-        if (!is_array($fileName) && !is_readable($fileName)) {
-            return PEAR::raiseError("File '{$fileName}' is not readable", HTTP_REQUEST_ERROR_FILE);
-        } elseif (is_array($fileName)) {
-            foreach ($fileName as $name) {
-                if (!is_readable($name)) {
-                    return PEAR::raiseError("File '{$name}' is not readable", HTTP_REQUEST_ERROR_FILE);
-                }
-            }
-        }
-        $this->addHeader('Content-Type', 'multipart/form-data');
-        $this->_postFiles[$inputName] = array(
-            'name' => $fileName,
-            'type' => $contentType
-        );
-        return true;
-    }
-
-    /**
-    * Adds raw postdata (DEPRECATED)
-    *
-    * @param string     The data
-    * @param bool       Whether data is preencoded or not, default = already encoded
-    * @access public
-    * @deprecated       deprecated since 1.3.0, method setBody() should be used instead
-    */
-    function addRawPostData($postdata, $preencoded = true)
-    {
-        $this->_body = $preencoded ? $postdata : urlencode($postdata);
-    }
-
-   /**
-    * Sets the request body (for POST, PUT and similar requests)
-    *
-    * @param    string  Request body
-    * @access   public
-    */
-    function setBody($body)
-    {
-        $this->_body = $body;
-    }
-
-    /**
-    * Clears any postdata that has been added (DEPRECATED). 
-    * 
-    * Useful for multiple request scenarios.
-    *
-    * @access public
-    * @deprecated deprecated since 1.2
-    */
-    function clearPostData()
-    {
-        $this->_postData = null;
-    }
-
-    /**
-    * Appends a cookie to "Cookie:" header
-    * 
-    * @param string $name cookie name
-    * @param string $value cookie value
-    * @access public
-    */
-    function addCookie($name, $value)
-    {
-        $cookies = isset($this->_requestHeaders['cookie']) ? $this->_requestHeaders['cookie']. '; ' : '';
-        $this->addHeader('Cookie', $cookies . $name . '=' . $value);
-    }
-    
-    /**
-    * Clears any cookies that have been added (DEPRECATED). 
-    * 
-    * Useful for multiple request scenarios
-    *
-    * @access public
-    * @deprecated deprecated since 1.2
-    */
-    function clearCookies()
-    {
-        $this->removeHeader('Cookie');
-    }
-
-    /**
-    * Sends the request
-    *
-    * @access public
-    * @param  bool   Whether to store response body in Response object property,
-    *                set this to false if downloading a LARGE file and using a Listener
-    * @return mixed  PEAR error on error, true otherwise
-    */
-    function sendRequest($saveBody = true)
-    {
-        if (!is_a($this->_url, 'Net_URL')) {
-            return PEAR::raiseError('No URL given', HTTP_REQUEST_ERROR_URL);
-        }
-
-        $host = isset($this->_proxy_host) ? $this->_proxy_host : $this->_url->host;
-        $port = isset($this->_proxy_port) ? $this->_proxy_port : $this->_url->port;
-
-        // 4.3.0 supports SSL connections using OpenSSL. The function test determines
-        // we running on at least 4.3.0
-        if (strcasecmp($this->_url->protocol, 'https') == 0 AND function_exists('file_get_contents') AND extension_loaded('openssl')) {
-            if (isset($this->_proxy_host)) {
-                return PEAR::raiseError('HTTPS proxies are not supported', HTTP_REQUEST_ERROR_PROXY);
-            }
-            $host = 'ssl://' . $host;
-        }
-
-        // magic quotes may fuck up file uploads and chunked response processing
-        $magicQuotes = ini_get('magic_quotes_runtime');
-        ini_set('magic_quotes_runtime', false);
-
-        // RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive 
-        // connection token to a proxy server...
-        if (isset($this->_proxy_host) && !empty($this->_requestHeaders['connection']) &&
-            'Keep-Alive' == $this->_requestHeaders['connection'])
-        {
-            $this->removeHeader('connection');
-        }
-
-        $keepAlive = (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http && empty($this->_requestHeaders['connection'])) ||
-                     (!empty($this->_requestHeaders['connection']) && 'Keep-Alive' == $this->_requestHeaders['connection']);
-        $sockets   = &PEAR::getStaticProperty('HTTP_Request', 'sockets');
-        $sockKey   = $host . ':' . $port;
-        unset($this->_sock);
-
-        // There is a connected socket in the "static" property?
-        if ($keepAlive && !empty($sockets[$sockKey]) &&
-            !empty($sockets[$sockKey]->fp)) 
-        {
-            $this->_sock =& $sockets[$sockKey];
-            $err = null;
-        } else {
-            $this->_notify('connect');
-            $this->_sock =& new Net_Socket();
-            $err = $this->_sock->connect($host, $port, null, $this->_timeout, $this->_socketOptions);
-        }
-        PEAR::isError($err) or $err = $this->_sock->write($this->_buildRequest());
-
-        if (!PEAR::isError($err)) {
-            if (!empty($this->_readTimeout)) {
-                $this->_sock->setTimeout($this->_readTimeout[0], $this->_readTimeout[1]);
-            }
-
-            $this->_notify('sentRequest');
-
-            // Read the response
-            $this->_response = &new HTTP_Response($this->_sock, $this->_listeners);
-            $err = $this->_response->process(
-                $this->_saveBody && $saveBody,
-                HTTP_REQUEST_METHOD_HEAD != $this->_method
-            );
-
-            if ($keepAlive) {
-                $keepAlive = (isset($this->_response->_headers['content-length'])
-                              || (isset($this->_response->_headers['transfer-encoding'])
-                                  && strtolower($this->_response->_headers['transfer-encoding']) == 'chunked'));
-                if ($keepAlive) {
-                    if (isset($this->_response->_headers['connection'])) {
-                        $keepAlive = strtolower($this->_response->_headers['connection']) == 'keep-alive';
-                    } else {
-                        $keepAlive = 'HTTP/'.HTTP_REQUEST_HTTP_VER_1_1 == $this->_response->_protocol;
-                    }
-                }
-            }
-        }
-
-        ini_set('magic_quotes_runtime', $magicQuotes);
-
-        if (PEAR::isError($err)) {
-            return $err;
-        }
-
-        if (!$keepAlive) {
-            $this->disconnect();
-        // Store the connected socket in "static" property
-        } elseif (empty($sockets[$sockKey]) || empty($sockets[$sockKey]->fp)) {
-            $sockets[$sockKey] =& $this->_sock;
-        }
-
-        // Check for redirection
-        if (    $this->_allowRedirects
-            AND $this->_redirects <= $this->_maxRedirects
-            AND $this->getResponseCode() > 300
-            AND $this->getResponseCode() < 399
-            AND !empty($this->_response->_headers['location'])) {
-
-            
-            $redirect = $this->_response->_headers['location'];
-
-            // Absolute URL
-            if (preg_match('/^https?:\/\//i', $redirect)) {
-                $this->_url = &new Net_URL($redirect);
-                $this->addHeader('Host', $this->_generateHostHeader());
-            // Absolute path
-            } elseif ($redirect{0} == '/') {
-                $this->_url->path = $redirect;
-            
-            // Relative path
-            } elseif (substr($redirect, 0, 3) == '../' OR substr($redirect, 0, 2) == './') {
-                if (substr($this->_url->path, -1) == '/') {
-                    $redirect = $this->_url->path . $redirect;
-                } else {
-                    $redirect = dirname($this->_url->path) . '/' . $redirect;
-                }
-                $redirect = Net_URL::resolvePath($redirect);
-                $this->_url->path = $redirect;
-                
-            // Filename, no path
-            } else {
-                if (substr($this->_url->path, -1) == '/') {
-                    $redirect = $this->_url->path . $redirect;
-                } else {
-                    $redirect = dirname($this->_url->path) . '/' . $redirect;
-                }
-                $this->_url->path = $redirect;
-            }
-
-            $this->_redirects++;
-            return $this->sendRequest($saveBody);
-
-        // Too many redirects
-        } elseif ($this->_allowRedirects AND $this->_redirects > $this->_maxRedirects) {
-            return PEAR::raiseError('Too many redirects', HTTP_REQUEST_ERROR_REDIRECTS);
-        }
-
-        return true;
-    }
-
-    /**
-     * Disconnect the socket, if connected. Only useful if using Keep-Alive.
-     *
-     * @access public
-     */
-    function disconnect()
-    {
-        if (!empty($this->_sock) && !empty($this->_sock->fp)) {
-            $this->_notify('disconnect');
-            $this->_sock->disconnect();
-        }
-    }
-
-    /**
-    * Returns the response code
-    *
-    * @access public
-    * @return mixed     Response code, false if not set
-    */
-    function getResponseCode()
-    {
-        return isset($this->_response->_code) ? $this->_response->_code : false;
-    }
-
-    /**
-    * Returns either the named header or all if no name given
-    *
-    * @access public
-    * @param string     The header name to return, do not set to get all headers
-    * @return mixed     either the value of $headername (false if header is not present)
-    *                   or an array of all headers
-    */
-    function getResponseHeader($headername = null)
-    {
-        if (!isset($headername)) {
-            return isset($this->_response->_headers)? $this->_response->_headers: array();
-        } else {
-            $headername = strtolower($headername);
-            return isset($this->_response->_headers[$headername]) ? $this->_response->_headers[$headername] : false;
-        }
-    }
-
-    /**
-    * Returns the body of the response
-    *
-    * @access public
-    * @return mixed     response body, false if not set
-    */
-    function getResponseBody()
-    {
-        return isset($this->_response->_body) ? $this->_response->_body : false;
-    }
-
-    /**
-    * Returns cookies set in response
-    * 
-    * @access public
-    * @return mixed     array of response cookies, false if none are present
-    */
-    function getResponseCookies()
-    {
-        return isset($this->_response->_cookies) ? $this->_response->_cookies : false;
-    }
-
-    /**
-    * Builds the request string
-    *
-    * @access private
-    * @return string The request string
-    */
-    function _buildRequest()
-    {
-        $separator = ini_get('arg_separator.output');
-        ini_set('arg_separator.output', '&');
-        $querystring = ($querystring = $this->_url->getQueryString()) ? '?' . $querystring : '';
-        ini_set('arg_separator.output', $separator);
-
-        $host = isset($this->_proxy_host) ? $this->_url->protocol . '://' . $this->_url->host : '';
-        $port = (isset($this->_proxy_host) AND $this->_url->port != 80) ? ':' . $this->_url->port : '';
-        $path = $this->_url->path . $querystring;
-        $url  = $host . $port . $path;
-
-        if (!strlen($url)) {
-            $url = '/';
-        }
-
-        $request = $this->_method . ' ' . $url . ' HTTP/' . $this->_http . "\r\n";
-
-        if (in_array($this->_method, $this->_bodyDisallowed) ||
-            (0 == strlen($this->_body) && (HTTP_REQUEST_METHOD_POST != $this->_method ||
-             (empty($this->_postData) && empty($this->_postFiles)))))
-        {
-            $this->removeHeader('Content-Type');
-        } else {
-            if (empty($this->_requestHeaders['content-type'])) {
-                // Add default content-type
-                $this->addHeader('Content-Type', 'application/x-www-form-urlencoded');
-            } elseif ('multipart/form-data' == $this->_requestHeaders['content-type']) {
-                $boundary = 'HTTP_Request_' . md5(uniqid('request') . microtime());
-                $this->addHeader('Content-Type', 'multipart/form-data; boundary=' . $boundary);
-            }
-        }
-
-        // Request Headers
-        if (!empty($this->_requestHeaders)) {
-            foreach ($this->_requestHeaders as $name => $value) {
-                $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
-                $request      .= $canonicalName . ': ' . $value . "\r\n";
-            }
-        }
-
-        // No post data or wrong method, so simply add a final CRLF
-        if (in_array($this->_method, $this->_bodyDisallowed) || 
-            (HTTP_REQUEST_METHOD_POST != $this->_method && 0 == strlen($this->_body))) {
-
-            $request .= "\r\n";
-
-        // Post data if it's an array
-        } elseif (HTTP_REQUEST_METHOD_POST == $this->_method && 
-                  (!empty($this->_postData) || !empty($this->_postFiles))) {
-
-            // "normal" POST request
-            if (!isset($boundary)) {
-                $postdata = implode('&', array_map(
-                    create_function('$a', 'return $a[0] . \'=\' . $a[1];'), 
-                    $this->_flattenArray('', $this->_postData)
-                ));
-
-            // multipart request, probably with file uploads
-            } else {
-                $postdata = '';
-                if (!empty($this->_postData)) {
-                    $flatData = $this->_flattenArray('', $this->_postData);
-                    foreach ($flatData as $item) {
-                        $postdata .= '--' . $boundary . "\r\n";
-                        $postdata .= 'Content-Disposition: form-data; name="' . $item[0] . '"';
-                        $postdata .= "\r\n\r\n" . urldecode($item[1]) . "\r\n";
-                    }
-                }
-                foreach ($this->_postFiles as $name => $value) {
-                    if (is_array($value['name'])) {
-                        $varname       = $name . ($this->_useBrackets? '[]': '');
-                    } else {
-                        $varname       = $name;
-                        $value['name'] = array($value['name']);
-                    }
-                    foreach ($value['name'] as $key => $filename) {
-                        $fp   = fopen($filename, 'r');
-                        $data = fread($fp, filesize($filename));
-                        fclose($fp);
-                        $basename = basename($filename);
-                        $type     = is_array($value['type'])? @$value['type'][$key]: $value['type'];
-
-                        $postdata .= '--' . $boundary . "\r\n";
-                        $postdata .= 'Content-Disposition: form-data; name="' . $varname . '"; filename="' . $basename . '"';
-                        $postdata .= "\r\nContent-Type: " . $type;
-                        $postdata .= "\r\n\r\n" . $data . "\r\n";
-                    }
-                }
-                $postdata .= '--' . $boundary . "--\r\n";
-            }
-            $request .= 'Content-Length: ' .
-                        (HTTP_REQUEST_MBSTRING? mb_strlen($postdata, 'iso-8859-1'): strlen($postdata)) .
-                        "\r\n\r\n";
-            $request .= $postdata;
-
-        // Explicitly set request body
-        } elseif (0 < strlen($this->_body)) {
-
-            $request .= 'Content-Length: ' .
-                        (HTTP_REQUEST_MBSTRING? mb_strlen($this->_body, 'iso-8859-1'): strlen($this->_body)) .
-                        "\r\n\r\n";
-            $request .= $this->_body;
-
-        // Terminate headers with CRLF on POST request with no body, too
-        } else {
-
-            $request .= "\r\n";
-        }
-        
-        return $request;
-    }
-
-   /**
-    * Helper function to change the (probably multidimensional) associative array
-    * into the simple one.
-    *
-    * @param    string  name for item
-    * @param    mixed   item's values
-    * @return   array   array with the following items: array('item name', 'item value');
-    * @access   private
-    */
-    function _flattenArray($name, $values)
-    {
-        if (!is_array($values)) {
-            return array(array($name, $values));
-        } else {
-            $ret = array();
-            foreach ($values as $k => $v) {
-                if (empty($name)) {
-                    $newName = $k;
-                } elseif ($this->_useBrackets) {
-                    $newName = $name . '[' . $k . ']';
-                } else {
-                    $newName = $name;
-                }
-                $ret = array_merge($ret, $this->_flattenArray($newName, $v));
-            }
-            return $ret;
-        }
-    }
-
-
-   /**
-    * Adds a Listener to the list of listeners that are notified of
-    * the object's events
-    * 
-    * Events sent by HTTP_Request object
-    * - 'connect': on connection to server
-    * - 'sentRequest': after the request was sent
-    * - 'disconnect': on disconnection from server
-    *
-    * Events sent by HTTP_Response object
-    * - 'gotHeaders': after receiving response headers (headers are passed in $data)
-    * - 'tick': on receiving a part of response body (the part is passed in $data)
-    * - 'gzTick': on receiving a gzip-encoded part of response body (ditto)
-    * - 'gotBody': after receiving the response body (passes the decoded body in $data if it was gzipped)
-    *
-    * @param    HTTP_Request_Listener   listener to attach
-    * @return   boolean                 whether the listener was successfully attached
-    * @access   public
-    */
-    function attach(&$listener)
-    {
-        if (!is_a($listener, 'HTTP_Request_Listener')) {
-            return false;
-        }
-        $this->_listeners[$listener->getId()] =& $listener;
-        return true;
-    }
-
-
-   /**
-    * Removes a Listener from the list of listeners 
-    * 
-    * @param    HTTP_Request_Listener   listener to detach
-    * @return   boolean                 whether the listener was successfully detached
-    * @access   public
-    */
-    function detach(&$listener)
-    {
-        if (!is_a($listener, 'HTTP_Request_Listener') || 
-            !isset($this->_listeners[$listener->getId()])) {
-            return false;
-        }
-        unset($this->_listeners[$listener->getId()]);
-        return true;
-    }
-
-
-   /**
-    * Notifies all registered listeners of an event.
-    * 
-    * @param    string  Event name
-    * @param    mixed   Additional data
-    * @access   private
-    * @see      HTTP_Request::attach()
-    */
-    function _notify($event, $data = null)
-    {
-        foreach (array_keys($this->_listeners) as $id) {
-            $this->_listeners[$id]->update($this, $event, $data);
-        }
-    }
-}
-
-
-/**
- * Response class to complement the Request class
- *
- * @category    HTTP
- * @package     HTTP_Request
- * @author      Richard Heyes <richard@phpguru.org>
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 1.4.2
- */
-class HTTP_Response
-{
-    /**
-    * Socket object
-    * @var Net_Socket
-    */
-    var $_sock;
-
-    /**
-    * Protocol
-    * @var string
-    */
-    var $_protocol;
-    
-    /**
-    * Return code
-    * @var string
-    */
-    var $_code;
-    
-    /**
-    * Response headers
-    * @var array
-    */
-    var $_headers;
-
-    /**
-    * Cookies set in response  
-    * @var array
-    */
-    var $_cookies;
-
-    /**
-    * Response body
-    * @var string
-    */
-    var $_body = '';
-
-   /**
-    * Used by _readChunked(): remaining length of the current chunk
-    * @var string
-    */
-    var $_chunkLength = 0;
-
-   /**
-    * Attached listeners
-    * @var array
-    */
-    var $_listeners = array();
-
-   /**
-    * Bytes left to read from message-body
-    * @var null|int
-    */
-    var $_toRead;
-
-    /**
-    * Constructor
-    *
-    * @param  Net_Socket    socket to read the response from
-    * @param  array         listeners attached to request
-    */
-    function HTTP_Response(&$sock, &$listeners)
-    {
-        $this->_sock      =& $sock;
-        $this->_listeners =& $listeners;
-    }
-
-
-   /**
-    * Processes a HTTP response
-    * 
-    * This extracts response code, headers, cookies and decodes body if it 
-    * was encoded in some way
-    *
-    * @access public
-    * @param  bool      Whether to store response body in object property, set
-    *                   this to false if downloading a LARGE file and using a Listener.
-    *                   This is assumed to be true if body is gzip-encoded.
-    * @param  bool      Whether the response can actually have a message-body.
-    *                   Will be set to false for HEAD requests.
-    * @throws PEAR_Error
-    * @return mixed     true on success, PEAR_Error in case of malformed response
-    */
-    function process($saveBody = true, $canHaveBody = true)
-    {
-        do {
-            $line = $this->_sock->readLine();
-            if (sscanf($line, 'HTTP/%s %s', $http_version, $returncode) != 2) {
-                return PEAR::raiseError('Malformed response', HTTP_REQUEST_ERROR_RESPONSE);
-            } else {
-                $this->_protocol = 'HTTP/' . $http_version;
-                $this->_code     = intval($returncode);
-            }
-            while ('' !== ($header = $this->_sock->readLine())) {
-                $this->_processHeader($header);
-            }
-        } while (100 == $this->_code);
-
-        $this->_notify('gotHeaders', $this->_headers);
-
-        // RFC 2616, section 4.4:
-        // 1. Any response message which "MUST NOT" include a message-body ... 
-        // is always terminated by the first empty line after the header fields 
-        // 3. ... If a message is received with both a
-        // Transfer-Encoding header field and a Content-Length header field,
-        // the latter MUST be ignored.
-        $canHaveBody = $canHaveBody && $this->_code >= 200 && 
-                       $this->_code != 204 && $this->_code != 304;
-
-        // If response body is present, read it and decode
-        $chunked = isset($this->_headers['transfer-encoding']) && ('chunked' == $this->_headers['transfer-encoding']);
-        $gzipped = isset($this->_headers['content-encoding']) && ('gzip' == $this->_headers['content-encoding']);
-        $hasBody = false;
-        if ($canHaveBody && ($chunked || !isset($this->_headers['content-length']) || 
-                0 != $this->_headers['content-length']))
-        {
-            if ($chunked || !isset($this->_headers['content-length'])) {
-                $this->_toRead = null;
-            } else {
-                $this->_toRead = $this->_headers['content-length'];
-            }
-            while (!$this->_sock->eof() && (is_null($this->_toRead) || 0 < $this->_toRead)) {
-                if ($chunked) {
-                    $data = $this->_readChunked();
-                } elseif (is_null($this->_toRead)) {
-                    $data = $this->_sock->read(4096);
-                } else {
-                    $data = $this->_sock->read(min(4096, $this->_toRead));
-                    $this->_toRead -= HTTP_REQUEST_MBSTRING? mb_strlen($data, 'iso-8859-1'): strlen($data);
-                }
-                if ('' == $data) {
-                    break;
-                } else {
-                    $hasBody = true;
-                    if ($saveBody || $gzipped) {
-                        $this->_body .= $data;
-                    }
-                    $this->_notify($gzipped? 'gzTick': 'tick', $data);
-                }
-            }
-        }
-
-        if ($hasBody) {
-            // Uncompress the body if needed
-            if ($gzipped) {
-                $body = $this->_decodeGzip($this->_body);
-                if (PEAR::isError($body)) {
-                    return $body;
-                }
-                $this->_body = $body;
-                $this->_notify('gotBody', $this->_body);
-            } else {
-                $this->_notify('gotBody');
-            }
-        }
-        return true;
-    }
-
-
-   /**
-    * Processes the response header
-    *
-    * @access private
-    * @param  string    HTTP header
-    */
-    function _processHeader($header)
-    {
-        if (false === strpos($header, ':')) {
-            return;
-        }
-        list($headername, $headervalue) = explode(':', $header, 2);
-        $headername  = strtolower($headername);
-        $headervalue = ltrim($headervalue);
-        
-        if ('set-cookie' != $headername) {
-            if (isset($this->_headers[$headername])) {
-                $this->_headers[$headername] .= ',' . $headervalue;
-            } else {
-                $this->_headers[$headername]  = $headervalue;
-            }
-        } else {
-            $this->_parseCookie($headervalue);
-        }
-    }
-
-
-   /**
-    * Parse a Set-Cookie header to fill $_cookies array
-    *
-    * @access private
-    * @param  string    value of Set-Cookie header
-    */
-    function _parseCookie($headervalue)
-    {
-        $cookie = array(
-            'expires' => null,
-            'domain'  => null,
-            'path'    => null,
-            'secure'  => false
-        );
-
-        // Only a name=value pair
-        if (!strpos($headervalue, ';')) {
-            $pos = strpos($headervalue, '=');
-            $cookie['name']  = trim(substr($headervalue, 0, $pos));
-            $cookie['value'] = trim(substr($headervalue, $pos + 1));
-
-        // Some optional parameters are supplied
-        } else {
-            $elements = explode(';', $headervalue);
-            $pos = strpos($elements[0], '=');
-            $cookie['name']  = trim(substr($elements[0], 0, $pos));
-            $cookie['value'] = trim(substr($elements[0], $pos + 1));
-
-            for ($i = 1; $i < count($elements); $i++) {
-                if (false === strpos($elements[$i], '=')) {
-                    $elName  = trim($elements[$i]);
-                    $elValue = null;
-                } else {
-                    list ($elName, $elValue) = array_map('trim', explode('=', $elements[$i]));
-                }
-                $elName = strtolower($elName);
-                if ('secure' == $elName) {
-                    $cookie['secure'] = true;
-                } elseif ('expires' == $elName) {
-                    $cookie['expires'] = str_replace('"', '', $elValue);
-                } elseif ('path' == $elName || 'domain' == $elName) {
-                    $cookie[$elName] = urldecode($elValue);
-                } else {
-                    $cookie[$elName] = $elValue;
-                }
-            }
-        }
-        $this->_cookies[] = $cookie;
-    }
-
-
-   /**
-    * Read a part of response body encoded with chunked Transfer-Encoding
-    * 
-    * @access private
-    * @return string
-    */
-    function _readChunked()
-    {
-        // at start of the next chunk?
-        if (0 == $this->_chunkLength) {
-            $line = $this->_sock->readLine();
-            if (preg_match('/^([0-9a-f]+)/i', $line, $matches)) {
-                $this->_chunkLength = hexdec($matches[1]); 
-                // Chunk with zero length indicates the end
-                if (0 == $this->_chunkLength) {
-                    $this->_sock->readLine(); // make this an eof()
-                    return '';
-                }
-            } else {
-                return '';
-            }
-        }
-        $data = $this->_sock->read($this->_chunkLength);
-        $this->_chunkLength -= HTTP_REQUEST_MBSTRING? mb_strlen($data, 'iso-8859-1'): strlen($data);
-        if (0 == $this->_chunkLength) {
-            $this->_sock->readLine(); // Trailing CRLF
-        }
-        return $data;
-    }
-
-
-   /**
-    * Notifies all registered listeners of an event.
-    * 
-    * @param    string  Event name
-    * @param    mixed   Additional data
-    * @access   private
-    * @see HTTP_Request::_notify()
-    */
-    function _notify($event, $data = null)
-    {
-        foreach (array_keys($this->_listeners) as $id) {
-            $this->_listeners[$id]->update($this, $event, $data);
-        }
-    }
-
-
-   /**
-    * Decodes the message-body encoded by gzip
-    *
-    * The real decoding work is done by gzinflate() built-in function, this
-    * method only parses the header and checks data for compliance with
-    * RFC 1952  
-    *
-    * @access   private
-    * @param    string  gzip-encoded data
-    * @return   string  decoded data
-    */
-    function _decodeGzip($data)
-    {
-        if (HTTP_REQUEST_MBSTRING) {
-            $oldEncoding = mb_internal_encoding();
-            mb_internal_encoding('iso-8859-1');
-        }
-        $length = strlen($data);
-        // If it doesn't look like gzip-encoded data, don't bother
-        if (18 > $length || strcmp(substr($data, 0, 2), "\x1f\x8b")) {
-            return $data;
-        }
-        $method = ord(substr($data, 2, 1));
-        if (8 != $method) {
-            return PEAR::raiseError('_decodeGzip(): unknown compression method', HTTP_REQUEST_ERROR_GZIP_METHOD);
-        }
-        $flags = ord(substr($data, 3, 1));
-        if ($flags & 224) {
-            return PEAR::raiseError('_decodeGzip(): reserved bits are set', HTTP_REQUEST_ERROR_GZIP_DATA);
-        }
-
-        // header is 10 bytes minimum. may be longer, though.
-        $headerLength = 10;
-        // extra fields, need to skip 'em
-        if ($flags & 4) {
-            if ($length - $headerLength - 2 < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short', HTTP_REQUEST_ERROR_GZIP_DATA);
-            }
-            $extraLength = unpack('v', substr($data, 10, 2));
-            if ($length - $headerLength - 2 - $extraLength[1] < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short', HTTP_REQUEST_ERROR_GZIP_DATA);
-            }
-            $headerLength += $extraLength[1] + 2;
-        }
-        // file name, need to skip that
-        if ($flags & 8) {
-            if ($length - $headerLength - 1 < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short', HTTP_REQUEST_ERROR_GZIP_DATA);
-            }
-            $filenameLength = strpos(substr($data, $headerLength), chr(0));
-            if (false === $filenameLength || $length - $headerLength - $filenameLength - 1 < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short', HTTP_REQUEST_ERROR_GZIP_DATA);
-            }
-            $headerLength += $filenameLength + 1;
-        }
-        // comment, need to skip that also
-        if ($flags & 16) {
-            if ($length - $headerLength - 1 < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short', HTTP_REQUEST_ERROR_GZIP_DATA);
-            }
-            $commentLength = strpos(substr($data, $headerLength), chr(0));
-            if (false === $commentLength || $length - $headerLength - $commentLength - 1 < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short', HTTP_REQUEST_ERROR_GZIP_DATA);
-            }
-            $headerLength += $commentLength + 1;
-        }
-        // have a CRC for header. let's check
-        if ($flags & 1) {
-            if ($length - $headerLength - 2 < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short', HTTP_REQUEST_ERROR_GZIP_DATA);
-            }
-            $crcReal   = 0xffff & crc32(substr($data, 0, $headerLength));
-            $crcStored = unpack('v', substr($data, $headerLength, 2));
-            if ($crcReal != $crcStored[1]) {
-                return PEAR::raiseError('_decodeGzip(): header CRC check failed', HTTP_REQUEST_ERROR_GZIP_CRC);
-            }
-            $headerLength += 2;
-        }
-        // unpacked data CRC and size at the end of encoded data
-        $tmp = unpack('V2', substr($data, -8));
-        $dataCrc  = $tmp[1];
-        $dataSize = $tmp[2];
-
-        // finally, call the gzinflate() function
-        $unpacked = @gzinflate(substr($data, $headerLength, -8), $dataSize);
-        if (false === $unpacked) {
-            return PEAR::raiseError('_decodeGzip(): gzinflate() call failed', HTTP_REQUEST_ERROR_GZIP_READ);
-        } elseif ($dataSize != strlen($unpacked)) {
-            return PEAR::raiseError('_decodeGzip(): data size check failed', HTTP_REQUEST_ERROR_GZIP_READ);
-        } elseif ((0xffffffff & $dataCrc) != (0xffffffff & crc32($unpacked))) {
-            return PEAR::raiseError('_decodeGzip(): data CRC check failed', HTTP_REQUEST_ERROR_GZIP_CRC);
-        }
-        if (HTTP_REQUEST_MBSTRING) {
-            mb_internal_encoding($oldEncoding);
-        }
-        return $unpacked;
-    }
-} // End class HTTP_Response
-?>
diff --git a/lib/vendor/PEAR/Amazon/Net/Socket.php b/lib/vendor/PEAR/Amazon/Net/Socket.php
deleted file mode 100644
index d7a049566..000000000
--- a/lib/vendor/PEAR/Amazon/Net/Socket.php
+++ /dev/null
@@ -1,576 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Stig Bakken <ssb@php.net>                                   |
-// |          Chuck Hagenbuch <chuck@horde.org>                           |
-// +----------------------------------------------------------------------+
-//
-// $Id: Socket.php,v 1.31 2007/05/04 04:30:29 chagenbu Exp $
-
-require_once 'PEAR.php';
-
-define('NET_SOCKET_READ',  1);
-define('NET_SOCKET_WRITE', 2);
-define('NET_SOCKET_ERROR', 4);
-
-/**
- * Generalized Socket class.
- *
- * @version 1.1
- * @author Stig Bakken <ssb@php.net>
- * @author Chuck Hagenbuch <chuck@horde.org>
- */
-class Net_Socket extends PEAR {
-
-    /**
-     * Socket file pointer.
-     * @var resource $fp
-     */
-    var $fp = null;
-
-    /**
-     * Whether the socket is blocking. Defaults to true.
-     * @var boolean $blocking
-     */
-    var $blocking = true;
-
-    /**
-     * Whether the socket is persistent. Defaults to false.
-     * @var boolean $persistent
-     */
-    var $persistent = false;
-
-    /**
-     * The IP address to connect to.
-     * @var string $addr
-     */
-    var $addr = '';
-
-    /**
-     * The port number to connect to.
-     * @var integer $port
-     */
-    var $port = 0;
-
-    /**
-     * Number of seconds to wait on socket connections before assuming
-     * there's no more data. Defaults to no timeout.
-     * @var integer $timeout
-     */
-    var $timeout = false;
-
-    /**
-     * Number of bytes to read at a time in readLine() and
-     * readAll(). Defaults to 2048.
-     * @var integer $lineLength
-     */
-    var $lineLength = 2048;
-
-    /**
-     * Connect to the specified port. If called when the socket is
-     * already connected, it disconnects and connects again.
-     *
-     * @param string  $addr        IP address or host name.
-     * @param integer $port        TCP port number.
-     * @param boolean $persistent  (optional) Whether the connection is
-     *                             persistent (kept open between requests
-     *                             by the web server).
-     * @param integer $timeout     (optional) How long to wait for data.
-     * @param array   $options     See options for stream_context_create.
-     *
-     * @access public
-     *
-     * @return boolean | PEAR_Error  True on success or a PEAR_Error on failure.
-     */
-    function connect($addr, $port = 0, $persistent = null, $timeout = null, $options = null)
-    {
-        if (is_resource($this->fp)) {
-            @fclose($this->fp);
-            $this->fp = null;
-        }
-
-        if (!$addr) {
-            return $this->raiseError('$addr cannot be empty');
-        } elseif (strspn($addr, '.0123456789') == strlen($addr) ||
-                  strstr($addr, '/') !== false) {
-            $this->addr = $addr;
-        } else {
-            $this->addr = @gethostbyname($addr);
-        }
-
-        $this->port = $port % 65536;
-
-        if ($persistent !== null) {
-            $this->persistent = $persistent;
-        }
-
-        if ($timeout !== null) {
-            $this->timeout = $timeout;
-        }
-
-        $openfunc = $this->persistent ? 'pfsockopen' : 'fsockopen';
-        $errno = 0;
-        $errstr = '';
-        if ($options && function_exists('stream_context_create')) {
-            if ($this->timeout) {
-                $timeout = $this->timeout;
-            } else {
-                $timeout = 0;
-            }
-            $context = stream_context_create($options);
-            $fp = @$openfunc($this->addr, $this->port, $errno, $errstr, $timeout, $context);
-        } else {
-            if ($this->timeout) {
-                $fp = @$openfunc($this->addr, $this->port, $errno, $errstr, $this->timeout);
-            } else {
-                $fp = @$openfunc($this->addr, $this->port, $errno, $errstr);
-            }
-        }
-
-        if (!$fp) {
-            return $this->raiseError($errstr, $errno);
-        }
-
-        $this->fp = $fp;
-
-        return $this->setBlocking($this->blocking);
-    }
-
-    /**
-     * Disconnects from the peer, closes the socket.
-     *
-     * @access public
-     * @return mixed true on success or an error object otherwise
-     */
-    function disconnect()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        @fclose($this->fp);
-        $this->fp = null;
-        return true;
-    }
-
-    /**
-     * Find out if the socket is in blocking mode.
-     *
-     * @access public
-     * @return boolean  The current blocking mode.
-     */
-    function isBlocking()
-    {
-        return $this->blocking;
-    }
-
-    /**
-     * Sets whether the socket connection should be blocking or
-     * not. A read call to a non-blocking socket will return immediately
-     * if there is no data available, whereas it will block until there
-     * is data for blocking sockets.
-     *
-     * @param boolean $mode  True for blocking sockets, false for nonblocking.
-     * @access public
-     * @return mixed true on success or an error object otherwise
-     */
-    function setBlocking($mode)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $this->blocking = $mode;
-        socket_set_blocking($this->fp, $this->blocking);
-        return true;
-    }
-
-    /**
-     * Sets the timeout value on socket descriptor,
-     * expressed in the sum of seconds and microseconds
-     *
-     * @param integer $seconds  Seconds.
-     * @param integer $microseconds  Microseconds.
-     * @access public
-     * @return mixed true on success or an error object otherwise
-     */
-    function setTimeout($seconds, $microseconds)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return socket_set_timeout($this->fp, $seconds, $microseconds);
-    }
-
-    /**
-     * Sets the file buffering size on the stream.
-     * See php's stream_set_write_buffer for more information.
-     *
-     * @param integer $size     Write buffer size.
-     * @access public
-     * @return mixed on success or an PEAR_Error object otherwise
-     */
-    function setWriteBuffer($size)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $returned = stream_set_write_buffer($this->fp, $code);
-        if ($returned == 0) {
-            return true;
-        }
-        return $this->raiseError('Cannot set write buffer.');
-    }
-
-    /**
-     * Returns information about an existing socket resource.
-     * Currently returns four entries in the result array:
-     *
-     * <p>
-     * timed_out (bool) - The socket timed out waiting for data<br>
-     * blocked (bool) - The socket was blocked<br>
-     * eof (bool) - Indicates EOF event<br>
-     * unread_bytes (int) - Number of bytes left in the socket buffer<br>
-     * </p>
-     *
-     * @access public
-     * @return mixed Array containing information about existing socket resource or an error object otherwise
-     */
-    function getStatus()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return socket_get_status($this->fp);
-    }
-
-    /**
-     * Get a specified line of data
-     *
-     * @access public
-     * @return $size bytes of data from the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    function gets($size)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return @fgets($this->fp, $size);
-    }
-
-    /**
-     * Read a specified amount of data. This is guaranteed to return,
-     * and has the added benefit of getting everything in one fread()
-     * chunk; if you know the size of the data you're getting
-     * beforehand, this is definitely the way to go.
-     *
-     * @param integer $size  The number of bytes to read from the socket.
-     * @access public
-     * @return $size bytes of data from the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    function read($size)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return @fread($this->fp, $size);
-    }
-
-    /**
-     * Write a specified amount of data.
-     *
-     * @param string  $data       Data to write.
-     * @param integer $blocksize  Amount of data to write at once.
-     *                            NULL means all at once.
-     *
-     * @access public
-     * @return mixed true on success or an error object otherwise
-     */
-    function write($data, $blocksize = null)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        if (is_null($blocksize) && !OS_WINDOWS) {
-            return fwrite($this->fp, $data);
-        } else {
-            if (is_null($blocksize)) {
-                $blocksize = 1024;
-            }
-
-            $pos = 0;
-            $size = strlen($data);
-            while ($pos < $size) {
-                $written = @fwrite($this->fp, substr($data, $pos, $blocksize));
-                if ($written === false) {
-                    return false;
-                }
-                $pos += $written;
-            }
-
-            return $pos;
-        }
-    }
-
-    /**
-     * Write a line of data to the socket, followed by a trailing "\r\n".
-     *
-     * @access public
-     * @return mixed fputs result, or an error
-     */
-    function writeLine($data)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return fwrite($this->fp, $data . "\r\n");
-    }
-
-    /**
-     * Tests for end-of-file on a socket descriptor.
-     *
-     * Also returns true if the socket is disconnected.
-     *
-     * @access public
-     * @return bool
-     */
-    function eof()
-    {
-        return (!is_resource($this->fp) || feof($this->fp));
-    }
-
-    /**
-     * Reads a byte of data
-     *
-     * @access public
-     * @return 1 byte of data from the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    function readByte()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return ord(@fread($this->fp, 1));
-    }
-
-    /**
-     * Reads a word of data
-     *
-     * @access public
-     * @return 1 word of data from the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    function readWord()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $buf = @fread($this->fp, 2);
-        return (ord($buf[0]) + (ord($buf[1]) << 8));
-    }
-
-    /**
-     * Reads an int of data
-     *
-     * @access public
-     * @return integer  1 int of data from the socket, or a PEAR_Error if
-     *                  not connected.
-     */
-    function readInt()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $buf = @fread($this->fp, 4);
-        return (ord($buf[0]) + (ord($buf[1]) << 8) +
-                (ord($buf[2]) << 16) + (ord($buf[3]) << 24));
-    }
-
-    /**
-     * Reads a zero-terminated string of data
-     *
-     * @access public
-     * @return string, or a PEAR_Error if
-     *         not connected.
-     */
-    function readString()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $string = '';
-        while (($char = @fread($this->fp, 1)) != "\x00")  {
-            $string .= $char;
-        }
-        return $string;
-    }
-
-    /**
-     * Reads an IP Address and returns it in a dot formated string
-     *
-     * @access public
-     * @return Dot formated string, or a PEAR_Error if
-     *         not connected.
-     */
-    function readIPAddress()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $buf = @fread($this->fp, 4);
-        return sprintf("%s.%s.%s.%s", ord($buf[0]), ord($buf[1]),
-                       ord($buf[2]), ord($buf[3]));
-    }
-
-    /**
-     * Read until either the end of the socket or a newline, whichever
-     * comes first. Strips the trailing newline from the returned data.
-     *
-     * @access public
-     * @return All available data up to a newline, without that
-     *         newline, or until the end of the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    function readLine()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $line = '';
-        $timeout = time() + $this->timeout;
-        while (!feof($this->fp) && (!$this->timeout || time() < $timeout)) {
-            $line .= @fgets($this->fp, $this->lineLength);
-            if (substr($line, -1) == "\n") {
-                return rtrim($line, "\r\n");
-            }
-        }
-        return $line;
-    }
-
-    /**
-     * Read until the socket closes, or until there is no more data in
-     * the inner PHP buffer. If the inner buffer is empty, in blocking
-     * mode we wait for at least 1 byte of data. Therefore, in
-     * blocking mode, if there is no data at all to be read, this
-     * function will never exit (unless the socket is closed on the
-     * remote end).
-     *
-     * @access public
-     *
-     * @return string  All data until the socket closes, or a PEAR_Error if
-     *                 not connected.
-     */
-    function readAll()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $data = '';
-        while (!feof($this->fp)) {
-            $data .= @fread($this->fp, $this->lineLength);
-        }
-        return $data;
-    }
-
-    /**
-     * Runs the equivalent of the select() system call on the socket
-     * with a timeout specified by tv_sec and tv_usec.
-     *
-     * @param integer $state    Which of read/write/error to check for.
-     * @param integer $tv_sec   Number of seconds for timeout.
-     * @param integer $tv_usec  Number of microseconds for timeout.
-     *
-     * @access public
-     * @return False if select fails, integer describing which of read/write/error
-     *         are ready, or PEAR_Error if not connected.
-     */
-    function select($state, $tv_sec, $tv_usec = 0)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $read = null;
-        $write = null;
-        $except = null;
-        if ($state & NET_SOCKET_READ) {
-            $read[] = $this->fp;
-        }
-        if ($state & NET_SOCKET_WRITE) {
-            $write[] = $this->fp;
-        }
-        if ($state & NET_SOCKET_ERROR) {
-            $except[] = $this->fp;
-        }
-        if (false === ($sr = stream_select($read, $write, $except, $tv_sec, $tv_usec))) {
-            return false;
-        }
-
-        $result = 0;
-        if (count($read)) {
-            $result |= NET_SOCKET_READ;
-        }
-        if (count($write)) {
-            $result |= NET_SOCKET_WRITE;
-        }
-        if (count($except)) {
-            $result |= NET_SOCKET_ERROR;
-        }
-        return $result;
-    }
-
-    /**
-     * Turns encryption on/off on a connected socket.
-     *
-     * @param bool    $enabled  Set this parameter to true to enable encryption
-     *                          and false to disable encryption.
-     * @param integer $type     Type of encryption. See
-     *                          http://se.php.net/manual/en/function.stream-socket-enable-crypto.php for values.
-     *
-     * @access public
-     * @return false on error, true on success and 0 if there isn't enough data and the
-     *         user should try again (non-blocking sockets only). A PEAR_Error object
-     *         is returned if the socket is not connected
-     */
-    function enableCrypto($enabled, $type)
-    {
-        if (version_compare(phpversion(), "5.1.0", ">=")) {
-            if (!is_resource($this->fp)) {
-                return $this->raiseError('not connected');
-            }
-            return @stream_socket_enable_crypto($this->fp, $enabled, $type);
-        } else {
-            return $this->raiseError('Net_Socket::enableCrypto() requires php version >= 5.1.0');
-        }
-    }
-
-}
diff --git a/lib/vendor/PEAR/Amazon/Net/URL.php b/lib/vendor/PEAR/Amazon/Net/URL.php
deleted file mode 100644
index 3dcfef60d..000000000
--- a/lib/vendor/PEAR/Amazon/Net/URL.php
+++ /dev/null
@@ -1,485 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | Copyright (c) 2002-2004, Richard Heyes                                |
-// | All rights reserved.                                                  |
-// |                                                                       |
-// | Redistribution and use in source and binary forms, with or without    |
-// | modification, are permitted provided that the following conditions    |
-// | are met:                                                              |
-// |                                                                       |
-// | o Redistributions of source code must retain the above copyright      |
-// |   notice, this list of conditions and the following disclaimer.       |
-// | o Redistributions in binary form must reproduce the above copyright   |
-// |   notice, this list of conditions and the following disclaimer in the |
-// |   documentation and/or other materials provided with the distribution.|
-// | o The names of the authors may not be used to endorse or promote      |
-// |   products derived from this software without specific prior written  |
-// |   permission.                                                         |
-// |                                                                       |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
-// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  |
-// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
-// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      |
-// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
-// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
-// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   |
-// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
-// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  |
-// |                                                                       |
-// +-----------------------------------------------------------------------+
-// | Author: Richard Heyes <richard at php net>                            |
-// +-----------------------------------------------------------------------+
-//
-// $Id: URL.php,v 1.49 2007/06/28 14:43:07 davidc Exp $
-//
-// Net_URL Class
-
-
-class Net_URL
-{
-    var $options = array('encode_query_keys' => false);
-    /**
-    * Full url
-    * @var string
-    */
-    var $url;
-
-    /**
-    * Protocol
-    * @var string
-    */
-    var $protocol;
-
-    /**
-    * Username
-    * @var string
-    */
-    var $username;
-
-    /**
-    * Password
-    * @var string
-    */
-    var $password;
-
-    /**
-    * Host
-    * @var string
-    */
-    var $host;
-
-    /**
-    * Port
-    * @var integer
-    */
-    var $port;
-
-    /**
-    * Path
-    * @var string
-    */
-    var $path;
-
-    /**
-    * Query string
-    * @var array
-    */
-    var $querystring;
-
-    /**
-    * Anchor
-    * @var string
-    */
-    var $anchor;
-
-    /**
-    * Whether to use []
-    * @var bool
-    */
-    var $useBrackets;
-
-    /**
-    * PHP4 Constructor
-    *
-    * @see __construct()
-    */
-    function Net_URL($url = null, $useBrackets = true)
-    {
-        $this->__construct($url, $useBrackets);
-    }
-
-    /**
-    * PHP5 Constructor
-    *
-    * Parses the given url and stores the various parts
-    * Defaults are used in certain cases
-    *
-    * @param string $url         Optional URL
-    * @param bool   $useBrackets Whether to use square brackets when
-    *                            multiple querystrings with the same name
-    *                            exist
-    */
-    function __construct($url = null, $useBrackets = true)
-    {
-        $this->url = $url;
-        $this->useBrackets = $useBrackets;
-
-        $this->initialize();
-    }
-
-    function initialize()
-    {
-        $HTTP_SERVER_VARS  = !empty($_SERVER) ? $_SERVER : $GLOBALS['HTTP_SERVER_VARS'];
-
-        $this->user        = '';
-        $this->pass        = '';
-        $this->host        = '';
-        $this->port        = 80;
-        $this->path        = '';
-        $this->querystring = array();
-        $this->anchor      = '';
-
-        // Only use defaults if not an absolute URL given
-        if (!preg_match('/^[a-z0-9]+:\/\//i', $this->url)) {
-            $this->protocol = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on' ? 'https' : 'http');
-
-            /**
-            * Figure out host/port
-            */
-            if (!empty($HTTP_SERVER_VARS['HTTP_HOST']) && 
-                preg_match('/^(.*)(:([0-9]+))?$/U', $HTTP_SERVER_VARS['HTTP_HOST'], $matches)) 
-            {
-                $host = $matches[1];
-                if (!empty($matches[3])) {
-                    $port = $matches[3];
-                } else {
-                    $port = $this->getStandardPort($this->protocol);
-                }
-            }
-
-            $this->user        = '';
-            $this->pass        = '';
-            $this->host        = !empty($host) ? $host : (isset($HTTP_SERVER_VARS['SERVER_NAME']) ? $HTTP_SERVER_VARS['SERVER_NAME'] : 'localhost');
-            $this->port        = !empty($port) ? $port : (isset($HTTP_SERVER_VARS['SERVER_PORT']) ? $HTTP_SERVER_VARS['SERVER_PORT'] : $this->getStandardPort($this->protocol));
-            $this->path        = !empty($HTTP_SERVER_VARS['PHP_SELF']) ? $HTTP_SERVER_VARS['PHP_SELF'] : '/';
-            $this->querystring = isset($HTTP_SERVER_VARS['QUERY_STRING']) ? $this->_parseRawQuerystring($HTTP_SERVER_VARS['QUERY_STRING']) : null;
-            $this->anchor      = '';
-        }
-
-        // Parse the url and store the various parts
-        if (!empty($this->url)) {
-            $urlinfo = parse_url($this->url);
-
-            // Default querystring
-            $this->querystring = array();
-
-            foreach ($urlinfo as $key => $value) {
-                switch ($key) {
-                    case 'scheme':
-                        $this->protocol = $value;
-                        $this->port     = $this->getStandardPort($value);
-                        break;
-
-                    case 'user':
-                    case 'pass':
-                    case 'host':
-                    case 'port':
-                        $this->$key = $value;
-                        break;
-
-                    case 'path':
-                        if ($value{0} == '/') {
-                            $this->path = $value;
-                        } else {
-                            $path = dirname($this->path) == DIRECTORY_SEPARATOR ? '' : dirname($this->path);
-                            $this->path = sprintf('%s/%s', $path, $value);
-                        }
-                        break;
-
-                    case 'query':
-                        $this->querystring = $this->_parseRawQueryString($value);
-                        break;
-
-                    case 'fragment':
-                        $this->anchor = $value;
-                        break;
-                }
-            }
-        }
-    }
-    /**
-    * Returns full url
-    *
-    * @return string Full url
-    * @access public
-    */
-    function getURL()
-    {
-        $querystring = $this->getQueryString();
-
-        $this->url = $this->protocol . '://'
-                   . $this->user . (!empty($this->pass) ? ':' : '')
-                   . $this->pass . (!empty($this->user) ? '@' : '')
-                   . $this->host . ($this->port == $this->getStandardPort($this->protocol) ? '' : ':' . $this->port)
-                   . $this->path
-                   . (!empty($querystring) ? '?' . $querystring : '')
-                   . (!empty($this->anchor) ? '#' . $this->anchor : '');
-
-        return $this->url;
-    }
-
-    /**
-    * Adds or updates a querystring item (URL parameter).
-    * Automatically encodes parameters with rawurlencode() if $preencoded
-    *  is false.
-    * You can pass an array to $value, it gets mapped via [] in the URL if
-    * $this->useBrackets is activated.
-    *
-    * @param  string $name       Name of item
-    * @param  string $value      Value of item
-    * @param  bool   $preencoded Whether value is urlencoded or not, default = not
-    * @access public
-    */
-    function addQueryString($name, $value, $preencoded = false)
-    {
-        if ($this->getOption('encode_query_keys')) {
-            $name = rawurlencode($name);
-        }
-
-        if ($preencoded) {
-            $this->querystring[$name] = $value;
-        } else {
-            $this->querystring[$name] = is_array($value) ? array_map('rawurlencode', $value): rawurlencode($value);
-        }
-    }
-
-    /**
-    * Removes a querystring item
-    *
-    * @param  string $name Name of item
-    * @access public
-    */
-    function removeQueryString($name)
-    {
-        if ($this->getOption('encode_query_keys')) {
-            $name = rawurlencode($name);
-        }
-
-        if (isset($this->querystring[$name])) {
-            unset($this->querystring[$name]);
-        }
-    }
-
-    /**
-    * Sets the querystring to literally what you supply
-    *
-    * @param  string $querystring The querystring data. Should be of the format foo=bar&x=y etc
-    * @access public
-    */
-    function addRawQueryString($querystring)
-    {
-        $this->querystring = $this->_parseRawQueryString($querystring);
-    }
-
-    /**
-    * Returns flat querystring
-    *
-    * @return string Querystring
-    * @access public
-    */
-    function getQueryString()
-    {
-        if (!empty($this->querystring)) {
-            foreach ($this->querystring as $name => $value) {
-                // Encode var name
-                $name = rawurlencode($name);
-
-                if (is_array($value)) {
-                    foreach ($value as $k => $v) {
-                        $querystring[] = $this->useBrackets ? sprintf('%s[%s]=%s', $name, $k, $v) : ($name . '=' . $v);
-                    }
-                } elseif (!is_null($value)) {
-                    $querystring[] = $name . '=' . $value;
-                } else {
-                    $querystring[] = $name;
-                }
-            }
-            $querystring = implode(ini_get('arg_separator.output'), $querystring);
-        } else {
-            $querystring = '';
-        }
-
-        return $querystring;
-    }
-
-    /**
-    * Parses raw querystring and returns an array of it
-    *
-    * @param  string  $querystring The querystring to parse
-    * @return array                An array of the querystring data
-    * @access private
-    */
-    function _parseRawQuerystring($querystring)
-    {
-        $parts  = preg_split('/[' . preg_quote(ini_get('arg_separator.input'), '/') . ']/', $querystring, -1, PREG_SPLIT_NO_EMPTY);
-        $return = array();
-
-        foreach ($parts as $part) {
-            if (strpos($part, '=') !== false) {
-                $value = substr($part, strpos($part, '=') + 1);
-                $key   = substr($part, 0, strpos($part, '='));
-            } else {
-                $value = null;
-                $key   = $part;
-            }
-
-            if (!$this->getOption('encode_query_keys')) {
-                $key = rawurldecode($key);
-            }
-
-            if (preg_match('#^(.*)\[([0-9a-z_-]*)\]#i', $key, $matches)) {
-                $key = $matches[1];
-                $idx = $matches[2];
-
-                // Ensure is an array
-                if (empty($return[$key]) || !is_array($return[$key])) {
-                    $return[$key] = array();
-                }
-
-                // Add data
-                if ($idx === '') {
-                    $return[$key][] = $value;
-                } else {
-                    $return[$key][$idx] = $value;
-                }
-            } elseif (!$this->useBrackets AND !empty($return[$key])) {
-                $return[$key]   = (array)$return[$key];
-                $return[$key][] = $value;
-            } else {
-                $return[$key] = $value;
-            }
-        }
-
-        return $return;
-    }
-
-    /**
-    * Resolves //, ../ and ./ from a path and returns
-    * the result. Eg:
-    *
-    * /foo/bar/../boo.php    => /foo/boo.php
-    * /foo/bar/../../boo.php => /boo.php
-    * /foo/bar/.././/boo.php => /foo/boo.php
-    *
-    * This method can also be called statically.
-    *
-    * @param  string $path URL path to resolve
-    * @return string      The result
-    */
-    function resolvePath($path)
-    {
-        $path = explode('/', str_replace('//', '/', $path));
-
-        for ($i=0; $i<count($path); $i++) {
-            if ($path[$i] == '.') {
-                unset($path[$i]);
-                $path = array_values($path);
-                $i--;
-
-            } elseif ($path[$i] == '..' AND ($i > 1 OR ($i == 1 AND $path[0] != '') ) ) {
-                unset($path[$i]);
-                unset($path[$i-1]);
-                $path = array_values($path);
-                $i -= 2;
-
-            } elseif ($path[$i] == '..' AND $i == 1 AND $path[0] == '') {
-                unset($path[$i]);
-                $path = array_values($path);
-                $i--;
-
-            } else {
-                continue;
-            }
-        }
-
-        return implode('/', $path);
-    }
-
-    /**
-    * Returns the standard port number for a protocol
-    *
-    * @param  string  $scheme The protocol to lookup
-    * @return integer         Port number or NULL if no scheme matches
-    *
-    * @author Philippe Jausions <Philippe.Jausions@11abacus.com>
-    */
-    function getStandardPort($scheme)
-    {
-        switch (strtolower($scheme)) {
-            case 'http':    return 80;
-            case 'https':   return 443;
-            case 'ftp':     return 21;
-            case 'imap':    return 143;
-            case 'imaps':   return 993;
-            case 'pop3':    return 110;
-            case 'pop3s':   return 995;
-            default:        return null;
-       }
-    }
-
-    /**
-    * Forces the URL to a particular protocol
-    *
-    * @param string  $protocol Protocol to force the URL to
-    * @param integer $port     Optional port (standard port is used by default)
-    */
-    function setProtocol($protocol, $port = null)
-    {
-        $this->protocol = $protocol;
-        $this->port     = is_null($port) ? $this->getStandardPort($protocol) : $port;
-    }
-
-    /**
-     * Set an option
-     *
-     * This function set an option
-     * to be used thorough the script.
-     *
-     * @access public
-     * @param  string $optionName  The optionname to set
-     * @param  string $value       The value of this option.
-     */
-    function setOption($optionName, $value)
-    {
-        if (!array_key_exists($optionName, $this->options)) {
-            return false;
-        }
-
-        $this->options[$optionName] = $value;
-        $this->initialize();
-    }
-
-    /**
-     * Get an option
-     *
-     * This function gets an option
-     * from the $this->options array
-     * and return it's value.
-     *
-     * @access public
-     * @param  string $opionName  The name of the option to retrieve
-     * @see    $this->options
-     */
-    function getOption($optionName)
-    {
-        if (!isset($this->options[$optionName])) {
-            return false;
-        }
-
-        return $this->options[$optionName];
-    }
-
-}
-?>
diff --git a/lib/vendor/PEAR/Amazon/Services/AmazonECS4.php b/lib/vendor/PEAR/Amazon/Services/AmazonECS4.php
deleted file mode 100644
index c5ba0d106..000000000
--- a/lib/vendor/PEAR/Amazon/Services/AmazonECS4.php
+++ /dev/null
@@ -1,1211 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-/**
-* Implementation of a developers backend for accessing Amazon's retail and
-* assosciate services.
-*
-* PHP versions 4 and 5
-*
-* LICENSE: Copyright 2004 John Downey. All rights reserved.
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions are met:
-*
-* o Redistributions of source code must retain the above copyright notice, this
-*   list of conditions and the following disclaimer.
-* o Redistributions in binary form must reproduce the above copyright notice,
-*   this list of conditions and the following disclaimer in the documentation
-*   and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE FREEBSD PROJECT "AS IS" AND ANY EXPRESS OR
-* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-* EVENT SHALL THE FREEBSD PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
-* OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*
-* The views and conclusions contained in the software and documentation are
-* those of the authors and should not be interpreted as representing official
-* policies, either expressed or implied, of The PEAR Group.
-*
-* @category  Web Services
-* @package   Services_Amazon
-* @author    John Downey <jdowney@gmail.com>
-* @author    Tatsuya Tsuruoka <ttsuruoka@p4life.jp>
-* @copyright 2004 John Downey
-* @license   http://www.freebsd.org/copyright/freebsd-license.html 2 Clause BSD License
-* @version   CVS: $Id: AmazonECS4.php,v 1.4 2006/08/04 10:31:00 ttsuruoka Exp $
-* @link      http://pear.php.net/package/Services_Amazon/
-* @filesource
-*/
-
-/**
-* Uses PEAR class for error management
-*/
-require_once 'PEAR.php';
-
-/**
-* Uses HTTP_Request class to send and receive data from Amazon web servers
-*/
-require_once 'HTTP/Request.php';
-
-/**
-* Uses XML_Unserializer class to parse data received from Amazon
-*/
-require_once 'XML/Unserializer.php';
-
-/**
-* A default base URL that is specific to the locale
-*
-* - Amazon.com (US)
-*   http://webservices.amazon.com/onca/xml?Service=AWSECommerceService
-* - Amazon.co.uk (UK)
-*   http://webservices.amazon.co.uk/onca/xml?Service=AWSECommerceService
-* - Amazon.de (DE)
-*   http://webservices.amazon.de/onca/xml?Service=AWSECommerceService
-* - Amazon.co.jp (JP)
-*   http://webservices.amazon.co.jp/onca/xml?Service=AWSECommerceService
-* - Amazon.fr (FR)
-*   http://webservices.amazon.fr/onca/xml?Service=AWSECommerceService
-* - Amazon.ca (CA)
-*   http://webservices.amazon.ca/onca/xml?Service=AWSECommerceService
-*/
-if (!defined('SERVICES_AMAZON_BASEURL')) {
-    define('SERVICES_AMAZON_BASEURL', 'http://webservices.amazon.com/onca/xml?Service=AWSECommerceService');
-}
-/**
-* A service version
-*
-* Use this to retrieve a particular version of the Amazon ECS.
-*/
-if (!defined('SERVICES_AMAZON_ECSVERSION')) {
-    define('SERVICES_AMAZON_ECSVERSION', '2005-10-05');
-}
-
-/**
-* Class for accessing and retrieving information from Amazon's Web Services
-*
-* @package Services_Amazon
-* @author  John Downey <jdowney@gmail.com>
-* @author  Tatsuya Tsuruoka <ttsuruoka@p4life.jp>
-* @access  public
-* @version Release: 0.7.1
-* @uses    PEAR
-* @uses    HTTP_Request
-* @uses    XML_Unserializer
-*/
-class Services_AmazonECS4
-{
-    /**
-    * An Amazon AccessKey/Subscription ID used when quering Amazon servers
-    *
-    * @access private
-    * @var    string
-    */
-    var $_keyid = null;
-
-    /**
-    * An Amazon Associate ID used in the URL's so a commision may be payed
-    *
-    * @access private
-    * @var    string
-    */
-    var $_associd = null;
-
-    /**
-    * A base URL used to build the query for the Amazon servers
-    *
-    * @access private
-    * @var    string
-    */
-    var $_baseurl = SERVICES_AMAZON_BASEURL;
-
-    /**
-    * A service version
-    *
-    * @access private
-    * @var    string
-    */
-    var $_version = SERVICES_AMAZON_ECSVERSION;
-
-    /**
-    * The time that the Amazon took to process the request
-    * 
-    * @access private
-    * @var    string
-    */
-    var $_processing_time = null;
-
-    /**
-    * The last URL accessed to the Amazon (for debugging)
-    *
-    * @access private
-    * @var    string
-    */
-    var $_lasturl = null;
-
-    /**
-    * The raw result returned from the request
-    *
-    * @access private
-    * @var    string
-    */
-    var $_raw_result = null;
-
-    /**
-    * The cache object
-    *
-    * @access private
-    * @var    object
-    */
-    var $_cache = null;
-
-    /**
-    * The cache expire time
-    *
-    * Defaults to one hour.
-    *
-    * @access private
-    * @var    integer
-    */
-    var $_cache_expire = 3600;
-
-    /**
-    * Proxy server
-    *
-    * @access private
-    * @var    string
-    */
-    var $_proxy_host = null;
-
-    /**
-    * Proxy port
-    *
-    * @access private
-    * @var    integer
-    */
-    var $_proxy_port = null;
-
-    /**
-    * Proxy username
-    *
-    * @access private
-    * @var    string
-    */
-    var $_proxy_user = null;
-
-    /**
-    * Proxy password
-    *
-    * @access private
-    * @var    string
-    */
-    var $_proxy_pass = null;
-
-    /**
-    * Errors
-    *
-    * @access private
-    * @var    array
-    */
-    var $_errors = array();
-
-    /**
-    * Constructor
-    *
-    * @access public
-    * @param  string $keyid An Amazon Access Key ID used when quering Amazon servers
-    * @param  string $associd An Amazon Associate ID used in the URL's so a commision may be payed
-    * @see    setAccessKeyID
-    * @see    setAssociateID
-    * @see    setBaseUrl
-    * @see    setVersion
-    */
-    function Services_AmazonECS4($keyid, $associd = null)
-    {
-        $this->_keyid = $keyid;
-        $this->_associd = $associd;
-    }
-
-    /**
-    * Retrieves the current version of this classes API
-    *
-    * @access public
-    * @static
-    * @return string The API version
-    */
-    function getApiVersion()
-    {
-        return '0.7.1';
-    }
-
-    /**
-    * Sets an Access Key ID
-    *
-    * @access public
-    * @param  string $subid An Access Key ID
-    * @return void
-    */
-    function setAccessKeyID($keyid)
-    {
-        $this->_keyid = $keyid;
-    }
-
-    /**
-    * Sets a Subscription ID (for backward compatibility)
-    *
-    * @access public
-    * @param  string $subid A Subscription ID
-    * @return void
-    */
-    function setSubscriptionID($subid)
-    {
-        $this->_keyid = $subid;
-    }
-
-    /**
-    * Sets an Associate ID
-    *
-    * @access public
-    * @param  string $associd An Associate ID
-    * @return void
-    */
-    function setAssociateID($associd)
-    {
-        $this->_associd = $associd;
-    }
-
-    /**
-    * Sets the base URL
-    *
-    * @access public
-    * @param  string $url The base url
-    * @return void
-    */
-    function setBaseUrl($url)
-    {
-        $this->_baseurl = $url;
-    }
-
-    /**
-    * Sets the locale passed when making a query to Amazon
-    *
-    * Currently US, UK, DE, JP, FR, and CA are supported
-    *
-    * @access public
-    * @param  string $locale The new locale to use
-    * @return mixed A PEAR_Error on error, a true on success
-    */
-    function setLocale($locale)
-    {
-        $urls = array(
-            'US' => 'http://webservices.amazon.com/onca/xml?Service=AWSECommerceService',
-            'UK' => 'http://webservices.amazon.co.uk/onca/xml?Service=AWSECommerceService',
-            'DE' => 'http://webservices.amazon.de/onca/xml?Service=AWSECommerceService',
-            'JP' => 'http://webservices.amazon.co.jp/onca/xml?Service=AWSECommerceService',
-            'FR' => 'http://webservices.amazon.fr/onca/xml?Service=AWSECommerceService',
-            'CA' => 'http://webservices.amazon.ca/onca/xml?Service=AWSECommerceService',
-        );
-        $locale = strtoupper($locale);
-        if (empty($urls[$locale])) {
-            return PEAR::raiseError('Invalid locale');
-        }
-        $this->setBaseUrl($urls[$locale]);
-        return true;
-    }
-
-    /**
-    * Sets a version
-    *
-    * @access public
-    * @param  string $version A service version
-    * @return void
-    */
-    function setVersion($version)
-    {
-        $this->_version = $version;
-    }
-
-    /**
-    * Enables caching the data
-    *
-    * Requires Cache to be installed.
-    * Example:
-    * <code>
-    * <?php
-    * $amazon = new Services_AmazonECS4('[your Access Key ID here]');
-    * $amazon->setCache('file', array('cache_dir' => 'cache/'));
-    * $amazon->setCacheExpire(86400); // 86400 seconds = 24 hours
-    * $result = $amazon->BrowseNodeLookup('283155');
-    * ?>
-    * </code>
-    *
-    * @access public
-    * @param  string $container Name of container class
-    * @param  array $container_options Array with container class options
-    * @return mixed A PEAR_Error on error, a true on success
-    * @see    setCacheExpire()
-    */
-    function setCache($container = 'file', $container_options = array())
-    {
-        if(!class_exists('Cache')){
-            @include_once 'Cache.php';
-        }
-        
-        @$cache = new Cache($container, $container_options);
-        
-        if (is_object($cache)) {
-            $this->_cache = $cache;
-        } else {
-            $this->_cache = null;
-            return PEAR::raiseError('Cache init failed');
-        }
-
-        return true;
-    }
-    
-    /**
-    * Sets cache expire time
-    * 
-    * Amazon dictates that any prices that are displayed that may be over an
-    * hour old should be accompanied by some sort of timestamp. You can get
-    * around that by expiring any queries that use the time in an hour (3600
-    * seconds).
-    *
-    * @access public
-    * @param  integer $secs Expire time in seconds
-    * @return void
-    * @see    setCache()
-    */
-    function setCacheExpire($secs)
-    {
-        $this->_cache_expire = $secs;
-    }
-
-    /**
-    * Sets a proxy
-    *
-    * @access public
-    * @param string $host Proxy host
-    * @param int $port Proxy port
-    * @param string $user Proxy username
-    * @param string $pass Proxy password
-    */
-    function setProxy($host, $port = 8080, $user = null, $pass = null)
-    {
-        $this->_proxy_host = $host;
-        $this->_proxy_port = $port;
-        $this->_proxy_user = $user;
-        $this->_proxy_pass = $pass;
-    }
-
-    /**
-    * Retrieves all error codes and messages
-    *
-    * <code>
-    * if (PEAR::isError($result)) {
-    *     foreach ($amazon->getErrors() as $error) {
-    *         echo $error['Code'];
-    *         echo $error['Message'];
-    *     }
-    * }
-    * </code>
-    *
-    * @access public
-    * @return array All errors
-    */
-    function getErrors()
-    {
-        return $this->_errors;
-    }
-    
-    /**
-    * Retrieves the error code and message
-    *
-    * <code>
-    * if (PEAR::isError($result)) {
-    *     $error = $amazon->getError();
-    *     echo $error['Code'];
-    *     echo $error['Message'];
-    * }
-    * </code>
-    *
-    * @access public
-    * @return array All errors
-    */
-    function getError()
-    {
-        return current($this->_errors);
-    }
-
-    /**
-    * Retrieves the processing time
-    *
-    * @access public
-    * @return string Processing time
-    */
-    function getProcessingTime()
-    {
-        return $this->_processing_time;
-    }
-
-    /**
-    * Retrieves the last URL accessed to the Amazon (for debugging)
-    *
-    * @access public
-    * @return string The Last URL
-    */
-    function getLastUrl()
-    {
-        return $this->_lasturl;
-    }
-
-    /**
-     * Retrieves the raw result
-     *
-     * @access public
-     * @return string The raw result
-     */
-    function getRawResult()
-    {
-        return $this->_raw_result;
-    }
-
-    /**
-    * Retrieves information about a browse node
-    *
-    * Example:
-    * <code>
-    * <?php
-    * $amazon = new Services_AmazonECS4('[your Access Key ID here]');
-    * $result = $amazon->BrowseNodeLookup('283155'); // 283155='Books'
-    * ?>
-    * </code>
-    *
-    * @access public
-    * @param  string $browsenode_id The browse node ID
-    * @param  array $options The optional parameters
-    * @return array The array of information returned by the query
-    */
-    function BrowseNodeLookup($browsenode_id, $options = array())
-    {
-        $params = $options;
-        $params['Operation'] = 'BrowseNodeLookup';
-        $params['BrowseNodeId'] = $browsenode_id;
-        return $this->_sendRequest($params);
-    }
-
-    /**
-    * Adds items to an existing remote shopping cart
-    *
-    * Example:
-    * <code>
-    * <?php
-    * $amazon = new Services_AmazonECS4('[your Access Key ID here]');
-    * $item = array('ASIN' => 'aaaaaaaaaa', 'Quantity' => 1);
-    * // $item = array(array('ASIN' => 'aaaaaaaaaa', 'Quantity' => 1),
-    * //               array('OfferListingId' => 'bbbbbbbbbb', 'Quantity' => 10),
-    * //               array('ASIN' => 'cccccccccc', 'Quantity' => 20));
-    * $result = $amazon->CartAdd('[Cart ID]', '[HMAC]', $item);
-    * ?>
-    * </code>
-    *
-    * @access public
-    * @param  string $cart_id A unique identifier for a cart
-    * @param  string $hmac A unique security token
-    * @param  array $item Products and the quantities
-    * @param  array $options The optional parameters
-    * @return array The array of information returned by the query
-    * @see    CartClear(), CartCreate(), CartModify()
-    */
-    function CartAdd($cart_id, $hmac, $item, $options = array())
-    {
-        $params = $options;
-        $params['Operation'] = 'CartAdd';
-        $params['CartId'] = $cart_id;
-        $params['HMAC'] = $hmac;
-        $params += $this->_assembleItemParameter($item);
-        return $this->_sendRequest($params);
-    }
-
-    /**
-    * Removes all the contents of a remote shopping cart
-    *
-    * @access public
-    * @param  string $cart_id A unique identifier for a cart
-    * @param  string $hmac A unique security token
-    * @param  array $options The optional parameters
-    * @return array The array of information returned by the query
-    * @see    CartAdd(), CartCreate(), CartGet(), CartModify()
-    */
-    function CartClear($cart_id, $hmac, $options = array())
-    {
-        $params = $options;
-        $params['Operation'] = 'CartClear';
-        $params['CartId'] = $cart_id;
-        $params['HMAC'] = $hmac;
-        return $this->_sendRequest($params);
-    }
-
-    /**
-    * Creates a new remote shopping cart
-    *
-    * Example:
-    * <code>
-    * <?php
-    * $amazon = new Services_AmazonECS4('[your Access Key ID here]');
-    * $item = array('ASIN' => 'aaaaaaaaaa', 'Quantity' => 1);
-    * // $item = array(array('ASIN' => 'aaaaaaaaaa', 'Quantity' => 1),
-    * //               array('ASIN' => 'cccccccccc', 'Quantity' => 20));
-    * $result = $amazon->CartCreate($item);
-    * ?>
-    * </code>
-    *
-    * @access public
-    * @param  array $item Products and the quantities
-    * @param  array $options The optional parameters
-    * @return array The array of information returned by the query
-    * @see    CartAdd(), CartClear(), CartGet(), CartModify()
-    */
-    function CartCreate($item, $options = array())
-    {
-        $params = $options;
-        $params['Operation'] = 'CartCreate';
-        $params += $this->_assembleItemParameter($item);
-        return $this->_sendRequest($params);
-    }
-
-    /**
-    * Retrieves the contents of a remote shopping cart
-    *
-    * @access public
-    * @param  string $cart_id A unique identifier for a cart
-    * @param  string $hmac A unique security token
-    * @param  array $options The optional parameters
-    * @return array The array of information returned by the query
-    * @see    CartAdd(), CartClear(), CartCreate(), CartModify()
-    */
-    function CartGet($cart_id, $hmac, $options = array())
-    {
-        $params = $options;
-        $params['Operation'] = 'CartGet';
-        $params['CartId'] = $cart_id;
-        $params['HMAC'] = $hmac;
-        return $this->_sendRequest($params);
-    }
-
-    /**
-    * Modifies the quantity of items in a cart and changes cart items to saved items
-    *
-    * Example:
-    * <code>
-    * <?php
-    * $amazon = new Services_AmazonECS4('[your Access Key ID here]');
-    * $item = array('CartItemId' => 'aaaaaaaaaa', 'Quantity' => 1);
-    * // $item = array('CartItemId' => 'aaaaaaaaaa', 'Action' => 'SaveForLater');
-    * // $item = array(array('CartItemId' => 'aaaaaaaaaa', 'Quantity' => 1),
-    * //               array('CartItemId' => 'cccccccccc', 'Quantity' => 20));
-    * $result = $amazon->CartModify('[Cart ID]', '[HMAC]', $item);
-    * ?>
-    * </code>
-    *
-    * @access public
-    * @param  string $cart_id A unique identifier for a cart
-    * @param  string $hmac A unique security token
-    * @param  array $item The CartItemId and the quantities or the Action
-    * @param  array $options The optional parameters
-    * @return array The array of information returned by the query
-    * @see    CartAdd(), CartClear(), CartCreate(), CartGet()
-    */
-    function CartModify($cart_id, $hmac, $item, $options = array())
-    {
-        $params = $options;
-        $params['Operation'] = 'CartModify';
-        $params['CartId'] = $cart_id;
-        $params['HMAC'] = $hmac;
-        $params += $this->_assembleItemParameter($item);
-        return $this->_sendRequest($params);
-    }
-
-    /**
-    * Retrieves publicly available content written by specific Amazon customers
-    *
-    * @access public
-    * @param  string $customer_id A customer ID
-    * @param  array $options The optional parameters
-    * @return array The array of information returned by the query
-    * @see    CustomerContentSearch()
-    */
-    function CustomerContentLookup($customer_id, $options = array())
-    {
-        $params = $options;
-        $params['Operation'] = 'CustomerContentLookup';
-        $params['CustomerId'] = $customer_id;
-        return $this->_sendRequest($params);
-    }
-
-    /**
-    * Searches for Amazon customers by name or email address
-    *
-    * @access public
-    * @param  array $customer A customer's name or its email
-    * @param  array $options The optional parameters
-    * @return array The array of information returned by the query
-    * @see    CustomerContentLookup()
-    */
-    function CustomerContentSearch($customer = null, $options = array())
-    {
-        $params = $options;
-        $params['Operation'] = 'CustomerContentSearch';
-        $params += $customer;
-        return $this->_sendRequest($params);
-    }
-
-    /**
-    * Retrieves information about operations and response groups
-    *
-    * Example:
-    * <code>
-    * <?php
-    * $amazon = new Services_AmazonECS4('[your Access Key ID here]');
-    * $result = $amazon->Help('Operation', 'ItemLookup');
-    * ?>
-    * </code>
-    *
-    * @access public
-    * @param  string $help_type The type of information
-    * @param  string $about The name of an operation or a response group
-    * @param  array $options The optional parameters
-    * @return array The array of information returned by the query
-    */
-    function Help($help_type, $about, $options = array())
-    {
-        $params = $options;
-        $params['Operation'] = 'Help';
-        $params['HelpType'] = $help_type;
-        $params['About'] = $about;
-        return $this->_sendRequest($params);
-    }
-        
-    /**
-    * Retrieves information for products
-    *
-    * Example:
-    * <code>
-    * <?php
-    * $amazon = new Services_AmazonECS4('[your Access Key ID here]');
-    * $options = array();
-    * $options['ResponseGroup'] = 'Large';
-    * $result = $amazon->ItemLookup('[ASIN(s)]', $options);
-    * ?>
-    * </code>
-    *
-    * @access public
-    * @param  string $item_id Product IDs
-    * @param  array $options The optional parameters
-    * @return array The array of information returned by the query
-    * @see    ItemSearch()
-    */
-    function ItemLookup($item_id, $options = array())
-    {
-        $params = $options;
-        $params['Operation'] = 'ItemLookup';
-        if (is_array($item_id)) {
-            $item_id = implode(',', $item_id);
-        }
-        $params['ItemId'] = $item_id;
-        return $this->_sendRequest($params);
-    }
-
-    /**
-    * Searches for products
-    *
-    * Example:
-    * <code>
-    * <?php
-    * $amazon = new Services_AmazonECS4('[your Access Key ID here]');
-    * $options = array();
-    * $options['Keywords'] = 'sushi';
-    * $options['Sort'] = 'salesrank';
-    * $options['ResponseGroup'] = 'ItemIds,ItemAttributes,Images';
-    * $result = $amazon->ItemSearch('Books', $options);
-    * ?>
-    * </code>
-    *
-    * @access public
-    * @param  string $search_index A search index
-    * @param  array $options The optional parameters
-    * @return array The array of information returned by the query
-    * @see    ItemLookup()
-    */
-    function ItemSearch($search_index, $options = array())
-    {
-        $params = $options;
-        $params['Operation'] = 'ItemSearch';
-        $params['SearchIndex'] = $search_index;
-        return $this->_sendRequest($params);
-    }
-
-    /**
-    * Retrieves products in a specific list
-    *
-    * @access public
-    * @param  string $list_type The type of list
-    * @param  string $list_id A list ID
-    * @param  array $options The optional parameters
-    * @return array The array of information returned by the query
-    * @see    ListSearch()
-    */
-    function ListLookup($list_type, $list_id, $options = array())
-    {
-        $params = $options;
-        $params['Operation'] = 'ListLookup';
-        $params['ListType'] = $list_type;
-        $params['ListId'] = $list_id;
-        return $this->_sendRequest($params);
-    }
-
-    /**
-    * Searches for a wish list, baby registry, or wedding registry
-    *
-    * Example:
-    * <code>
-    * <?php
-    * $amazon = new Services_AmazonECS4('[your Access Key ID here]');
-    * $keywords = array('Name' => 'hoge');
-    * $result = $amazon->ListSearch('WishList', $keywords);
-    * ?>
-    * </code>
-    *
-    * @access public
-    * @param  string $list_type The type of list
-    * @param  array $keywords Parameters to search for
-    * @param  array $options The optional parameters
-    * @return array The array of information returned by the query
-    * @see    ListLookup()
-    */
-    function ListSearch($list_type, $keywords, $options = array())
-    {
-        $params = $options;
-        $params['Operation'] = 'ListSearch';
-        $params['ListType'] = $list_type;
-        $params += $keywords;
-        return $this->_sendRequest($params);
-    }
-
-    /**
-    * Retrieves information about Amazon zShops and Marketplace products
-    *
-    * @access public
-    * @param  string $id_type The type of ID
-    * @param  string $id The exchange ID or the listing ID
-    * @param  array $options The optional parameters
-    * @return array The array of information returned by the query
-    * @see    SellerListingSearch()
-    */
-    function SellerListingLookup($id_type, $id, $options = array())
-    {
-        $params = $options;
-        $params['Operation'] = 'SellerListingLookup';
-        $params['IdType'] = $id_type;
-        $params['Id'] = $id;
-        return $this->_sendRequest($params);
-    }
-
-    /**
-    * Searches for Amazon zShops and Marketplace products
-    *
-    * Example:
-    * <code>
-    * <?php
-    * $amazon = new Services_AmazonECS4('[your Access Key ID here]');
-    * $keywords = array('Keywords' => 'pizza');
-    * $result = $amazon->SellerListingSearch('zShops', $keywords);
-    * ?>
-    * </code>
-    *
-    * @access public
-    * @param  string $search_index The type of seller listings
-    * @param  array $options The optional parameters
-    * @return array The array of information returned by the query
-    * @see    SellerListingLookup()
-    */
-    function SellerListingSearch($search_index, $options = array())
-    {
-        $params = $options;
-        $params['Operation'] = 'SellerListingSearch';
-        $params['SearchIndex'] = $search_index;
-        return $this->_sendRequest($params);
-    }
-
-    /**
-    * Retrieves information about specific sellers
-    *
-    * @access public
-    * @param  string $seller_id IDs for Amazon sellers
-    * @param  array $options The optional parameters
-    * @return array The array of information returned by the query
-    */
-    function SellerLookup($seller_id, $options = array())
-    {
-        $params = $options;
-        $params['Operation'] = 'SellerLookup';
-        $params['SellerId'] = $seller_id;
-        return $this->_sendRequest($params);
-    }
-
-    /**
-    * Retrieves products that are similar to Amazon products
-    *
-    * @access public
-    * @param  string $item_id Product IDs
-    * @param  array $options The optional parameters
-    * @return array The array of information returned by the query
-    */
-    function SimilarityLookup($item_id, $options = array())
-    {
-        $params = $options;
-        $params['Operation'] = 'SimilarityLookup';
-        if (is_array($item_id)) {
-            $item_id = implode(',', $item_id);
-        }
-        $params['ItemId'] = $item_id;
-        return $this->_sendRequest($params);
-    }
-
-    /**
-    * Retrieves information about the status of financial transactions
-    *
-    * @access public
-    * @param  string $transaction_id Transaction IDs
-    * @param  array $options The optional parameters
-    * @return array The array of information returned by the query
-    */
-    function TransactionLookup($transaction_id, $options = array())
-    {
-        $params = $options;
-        $params['Operation'] = 'SimilarityLookup';
-        $params['TransactionId'] = $transaction_id;
-        return $this->_sendRequest($params);
-    }
-
-    /**
-    * Combines requests for the same operation into a single request
-    *
-    * Example:
-    * <code>
-    * <?php
-    * $amazon = new Services_AmazonECS4('[your Access Key ID here]');
-    * $shared = array('SearchIndex' => 'Books',
-    *                 'Keywords' => 'php');
-    * $params1 = array('ItemPage' => '1');
-    * $params2 = array('ItemPage' => '2');
-    * $result = $amazon->doBatch('ItemSearch', $shared, $params1, $params2);
-    * ?>
-    * </code>
-    *
-    * @access public
-    * @param  string $operation The operation
-    * @param  array $shared Shared parameters
-    * @param  array $params1 The parameters specific to the first request
-    * @param  array $params2 The parameters specific to the second request
-    * @return array The array of information returned by the query
-    */
-    function doBatch($operation, $shared, $params1 = array(), $params2 = array())
-    {
-        $params = array();
-        $params['Operation'] = $operation;
-        foreach ($shared as $k => $v) {
-            $params[$operation . '.Shared.' . $k] = $v;
-        }
-        foreach ($params1 as $k => $v) {
-            $params[$operation . '.1.' . $k] = $v;
-        }
-        foreach ($params2 as $k => $v) {
-            $params[$operation . '.2.' . $k] = $v;
-        }
-        return $this->_sendRequest($params);
-    }
-
-    /**
-    * Combines the different operations into a single request
-    *
-    * Example:
-    * <code>
-    * <?php
-    * $amazon = new Services_AmazonECS4('[your Access Key ID here]');
-    * $params1 = array('SearchIndex' => 'Books',
-    *                  'Title' => 'sushi');
-    * $params2 = array('Keywords' => 'tempura');
-    * $result = $amazon->doMultiOperation('ItemSearch', $params1,
-    *                                     'SellerListingSearch', $params2);
-    * ?>
-    * </code>
-    *
-    * @access public
-    * @param  string $operation1 The first operation
-    * @param  array $params1 The parameters specific to the first request
-    * @param  string $operation2 The second operation
-    * @param  array $params2 The parameters specific to the second request
-    * @return array The array of information returned by the query
-    */
-    function doMultiOperation($operation1, $params1, $operation2, $params2)
-    {
-        $params = array();
-        $params['Operation'] = $operation1 . ',' . $operation2;
-        foreach ($params1 as $k => $v) {
-            $params[$operation1 . '.1.' . $k] = $v;
-        }
-        foreach ($params2 as $k => $v) {
-            $params[$operation2 . '.1.' . $k] = $v;
-        }
-        return $this->_sendRequest($params);
-    }
-
-    /**
-    * Assembles the Item parameters
-    *
-    * @access private
-    * @param  array $items The items
-    * @return array The item parameters
-    */
-    function _assembleItemParameter($items)
-    {
-        $params = array();
-        if (!is_array(current($items))) {
-            $items = array(0 => $items);
-        }
-        $i = 1;
-        foreach ($items as $item) {
-            foreach ($item as $k => $v) {
-                $params['Item.' . $i . '.' . $k] = $v;
-            }
-            $i++;
-        }
-        return $params;
-    }
-
-    /**
-    * Ignores the caching of specific operations
-    *
-    * @access private
-    * @param  string $operation The operation
-    * @return bool Returns true if the operation isn't cached, false otherwise
-    */
-    function _ignoreCache($operation)
-    {
-        $ignore = array('CartAdd', 'CartClear', 'CartGet', 'CartModify', 'TransactionLookup');
-        if (!strchr($operation, ',')) {
-            return in_array($operation, $ignore);
-        }
-        $operations = explode(',', $operation);
-        foreach ($operations as $v) {
-            if (in_array($v, $ignore)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-    * Generates ID used as cache identifier
-    *
-    * @access private
-    * @param  array $params
-    * @return string Cache ID
-    */
-    function _generateCacheId($params)
-    {
-        unset($params['AWSAccessKeyId']);
-        unset($params['AssociateTag']);
-        $str = '';
-        foreach ($params as $k => $v) {
-            $str .= $k . $v;
-        }
-        return md5($str);
-    }
-
-    /**
-    * Builds a URL
-    *
-    * @access private
-    * @param array $params
-    * @return string URL
-    */
-    function _buildUrl($params)
-    {
-        $params['AWSAccessKeyId'] = $this->_keyid;
-        $params['AssociateTag'] = $this->_associd;
-        $params['Version'] = $this->_version;
-        $url = $this->_baseurl;
-        foreach ($params as $k => $v) {
-            $url .= '&' . $k . '=' . urlencode($v);
-        }
-        return $url;
-    }
-
-    /**
-    * Sends a request
-    *
-    * @access private
-    * @param string $url
-    * @return string The response
-    */
-    function _sendHttpRequest($url)
-    {
-        $http = &new HTTP_Request($url);
-        $http->setHttpVer('1.0');
-        $http->addHeader('User-Agent', 'Services_AmazonECS4/' . $this->getApiVersion());
-        if ($this->_proxy_host) {
-            $http->setProxy($this->_proxy_host, $this->_proxy_port, $this->_proxy_user, $this->_proxy_pass);
-        }
-
-        $result = $http->sendRequest();
-        if (PEAR::isError($result)) {
-            return PEAR::raiseError('HTTP_Request::sendRequest failed: ' . $result->message);
-        }
-
-        if ($http->getResponseCode() != 200){
-            return PEAR::raiseError('Amazon returned invalid HTTP response code ' . $http->getResponseCode());
-        }
-        return $http->getResponseBody();
-    }
-
-    /**
-    * Parses raw XML result
-    *
-    * @access private
-    * @param string $raw_result
-    * @return string The contents
-    */
-    function _parseRawResult($raw_result)
-    {
-        $xml = &new XML_Unserializer();
-        $xml->setOption(XML_UNSERIALIZER_OPTION_ATTRIBUTES_PARSE, true);
-        $xml->setOption(XML_UNSERIALIZER_OPTION_FORCE_ENUM,
-                        array('Item', 'Review', 'EditorialReview',
-                              'Parameter', 'Author', 'Creator', 'ResponseGroup', 'Error'));
-        $xml->unserialize($raw_result, false);
-        $data = $xml->getUnserializedData();
-        if (PEAR::isError($data)) {
-            return $data;
-        }
-
-        if (isset($data['Error'])) {
-            $this->_errors = $data['Error'];
-            return PEAR::raiseError(implode(':', $this->getError()));
-        }
-
-        if (isset($data['OperationRequest']['RequestProcessingTime'])) {
-            $this->_processing_time = $data['OperationRequest']['RequestProcessingTime'];
-        }
-
-        if (isset($data['OperationRequest']['Errors'])) {
-            $this->_errors = $data['OperationRequest']['Errors']['Error'];
-            return PEAR::raiseError(implode(':', $this->getError()));
-        }
-
-        // Get values of the second level content elements
-        unset($data['xmlns']);
-        unset($data['OperationRequest']);
-        $contents = array();
-        $keys = array_keys($data);
-        foreach ($keys as $v) {
-            if (strstr($v, 'Response')) {
-                $data[$v] = current($data[$v]);
-                $contents[$v] = $data[$v];
-            } else {
-                $contents = $data[$v];
-            }
-            $result = $this->_checkContentError($data[$v]);
-            if (PEAR::isError($result)) {
-                return $result;
-            }
-        }
-        return $contents;
-    }
-
-    /**
-    * Checks error codes at the content elements
-    *
-    * @access private
-    * @param  array $content Values of the content elements
-    * @return array mixed A PEAR_Error on error, a true on success
-    * @see    _parseRawResult
-    */
-    function _checkContentError($content)
-    {
-        if (isset($content['Request']['Errors'])) {
-            $this->_errors = $content['Request']['Errors']['Error'];
-            return PEAR::raiseError(implode(':', $this->getError()));
-        } else if (isset($content[0])) {
-            $errors = array();
-            foreach ($content as $v) {
-                if (isset($v['Request']['Errors']['Error'])) {
-                    $errors = array_merge($errors, $v['Request']['Errors']['Error']);
-                }
-            }
-            if (!empty($errors)) {
-                $this->_errors = $errors;
-                return PEAR::raiseError(implode(':', $this->getError()));
-            }
-        }
-        return true;
-    }
-
-    /**
-    * Sends the request to Amazon
-    *
-    * @access private
-    * @param  array $params The array of request parameters
-    * @return array The array of information returned by the query
-    */
-    function _sendRequest($params)
-    {
-        $this->_errors = array();
-
-        if (is_null($this->_keyid)) {
-            return PEAR::raiseError('Access Key ID have not been set');
-        }
-
-        $url = $this->_buildUrl($params);
-        $this->_lasturl = $url;
-        if (PEAR::isError($url)) {
-            return $url;
-        }
-
-        // Return cached data if available
-        $cache_id = false;
-        if (isset($this->_cache) && !$this->_ignoreCache($params['Operation'])) {
-            $cache_id = $this->_generateCacheId($params);
-            $cache = $this->_cache->get($cache_id);
-            if (!is_null($cache)) {
-                $this->_processing_time = 0;
-                return $cache;
-            }
-        }
-
-        $result = $this->_sendHttpRequest($url);
-        $this->_raw_result = $result;
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-
-        $contents = $this->_parseRawResult($result);
-        if (PEAR::isError($contents)) {
-            return $contents;
-        }
-
-        if ($cache_id) {
-            $this->_cache->save($cache_id, $contents, $this->_cache_expire);
-        }
-
-        return $contents;
-    }
-
-}
-?>
diff --git a/lib/vendor/PEAR/Amazon/XML/Parser.php b/lib/vendor/PEAR/Amazon/XML/Parser.php
deleted file mode 100644
index ac4038fcd..000000000
--- a/lib/vendor/PEAR/Amazon/XML/Parser.php
+++ /dev/null
@@ -1,690 +0,0 @@
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2004 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 3.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/3_0.txt.                                  |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Stig Bakken <ssb@fast.no>                                    |
-// |         Tomas V.V.Cox <cox@idecnet.com>                              |
-// |         Stephan Schmidt <schst@php-tools.net>                        |
-// +----------------------------------------------------------------------+
-//
-// $Id: Parser.php,v 1.28 2006/12/01 16:23:22 schst Exp $
-
-/**
- * XML Parser class.
- *
- * This is an XML parser based on PHP's "xml" extension,
- * based on the bundled expat library.
- *
- * @category XML
- * @package XML_Parser
- * @author  Stig Bakken <ssb@fast.no>
- * @author  Tomas V.V.Cox <cox@idecnet.com>
- * @author  Stephan Schmidt <schst@php-tools.net>
- */
-
-/**
- * uses PEAR's error handling
- */
-require_once 'PEAR.php';
-
-/**
- * resource could not be created
- */
-define('XML_PARSER_ERROR_NO_RESOURCE', 200);
-
-/**
- * unsupported mode
- */
-define('XML_PARSER_ERROR_UNSUPPORTED_MODE', 201);
-
-/**
- * invalid encoding was given
- */
-define('XML_PARSER_ERROR_INVALID_ENCODING', 202);
-
-/**
- * specified file could not be read
- */
-define('XML_PARSER_ERROR_FILE_NOT_READABLE', 203);
-
-/**
- * invalid input
- */
-define('XML_PARSER_ERROR_INVALID_INPUT', 204);
-
-/**
- * remote file cannot be retrieved in safe mode
- */
-define('XML_PARSER_ERROR_REMOTE', 205);
-
-/**
- * XML Parser class.
- *
- * This is an XML parser based on PHP's "xml" extension,
- * based on the bundled expat library.
- *
- * Notes:
- * - It requires PHP 4.0.4pl1 or greater
- * - From revision 1.17, the function names used by the 'func' mode
- *   are in the format "xmltag_$elem", for example: use "xmltag_name"
- *   to handle the <name></name> tags of your xml file.
- *
- * @category XML
- * @package XML_Parser
- * @author  Stig Bakken <ssb@fast.no>
- * @author  Tomas V.V.Cox <cox@idecnet.com>
- * @author  Stephan Schmidt <schst@php-tools.net>
- * @todo    create XML_Parser_Namespace to parse documents with namespaces
- * @todo    create XML_Parser_Pull
- * @todo    Tests that need to be made:
- *          - mixing character encodings
- *          - a test using all expat handlers
- *          - options (folding, output charset)
- *          - different parsing modes
- */
-class XML_Parser extends PEAR
-{
-    // {{{ properties
-
-   /**
-     * XML parser handle
-     *
-     * @var  resource
-     * @see  xml_parser_create()
-     */
-    var $parser;
-
-    /**
-     * File handle if parsing from a file
-     *
-     * @var  resource
-     */
-    var $fp;
-
-    /**
-     * Whether to do case folding
-     *
-     * If set to true, all tag and attribute names will
-     * be converted to UPPER CASE.
-     *
-     * @var  boolean
-     */
-    var $folding = true;
-
-    /**
-     * Mode of operation, one of "event" or "func"
-     *
-     * @var  string
-     */
-    var $mode;
-
-    /**
-     * Mapping from expat handler function to class method.
-     *
-     * @var  array
-     */
-    var $handler = array(
-        'character_data_handler'            => 'cdataHandler',
-        'default_handler'                   => 'defaultHandler',
-        'processing_instruction_handler'    => 'piHandler',
-        'unparsed_entity_decl_handler'      => 'unparsedHandler',
-        'notation_decl_handler'             => 'notationHandler',
-        'external_entity_ref_handler'       => 'entityrefHandler'
-    );
-
-    /**
-     * source encoding
-     *
-     * @var string
-     */
-    var $srcenc;
-
-    /**
-     * target encoding
-     *
-     * @var string
-     */
-    var $tgtenc;
-
-    /**
-     * handler object
-     *
-     * @var object
-     */
-    var $_handlerObj;
-
-    /**
-     * valid encodings
-     *
-     * @var array
-     */
-    var $_validEncodings = array('ISO-8859-1', 'UTF-8', 'US-ASCII');
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * Creates an XML parser.
-     *
-     * This is needed for PHP4 compatibility, it will
-     * call the constructor, when a new instance is created.
-     *
-     * @param string $srcenc source charset encoding, use NULL (default) to use
-     *                       whatever the document specifies
-     * @param string $mode   how this parser object should work, "event" for
-     *                       startelement/endelement-type events, "func"
-     *                       to have it call functions named after elements
-     * @param string $tgenc  a valid target encoding
-     */
-    function XML_Parser($srcenc = null, $mode = 'event', $tgtenc = null)
-    {
-        XML_Parser::__construct($srcenc, $mode, $tgtenc);
-    }
-    // }}}
-
-    /**
-     * PHP5 constructor
-     *
-     * @param string $srcenc source charset encoding, use NULL (default) to use
-     *                       whatever the document specifies
-     * @param string $mode   how this parser object should work, "event" for
-     *                       startelement/endelement-type events, "func"
-     *                       to have it call functions named after elements
-     * @param string $tgenc  a valid target encoding
-     */
-    function __construct($srcenc = null, $mode = 'event', $tgtenc = null)
-    {
-        $this->PEAR('XML_Parser_Error');
-
-        $this->mode   = $mode;
-        $this->srcenc = $srcenc;
-        $this->tgtenc = $tgtenc;
-    }
-    // }}}
-
-    /**
-     * Sets the mode of the parser.
-     *
-     * Possible modes are:
-     * - func
-     * - event
-     *
-     * You can set the mode using the second parameter
-     * in the constructor.
-     *
-     * This method is only needed, when switching to a new
-     * mode at a later point.
-     *
-     * @access  public
-     * @param   string          mode, either 'func' or 'event'
-     * @return  boolean|object  true on success, PEAR_Error otherwise
-     */
-    function setMode($mode)
-    {
-        if ($mode != 'func' && $mode != 'event') {
-            $this->raiseError('Unsupported mode given', XML_PARSER_ERROR_UNSUPPORTED_MODE);
-        }
-
-        $this->mode = $mode;
-        return true;
-    }
-
-    /**
-     * Sets the object, that will handle the XML events
-     *
-     * This allows you to create a handler object independent of the
-     * parser object that you are using and easily switch the underlying
-     * parser.
-     *
-     * If no object will be set, XML_Parser assumes that you
-     * extend this class and handle the events in $this.
-     *
-     * @access  public
-     * @param   object      object to handle the events
-     * @return  boolean     will always return true
-     * @since   v1.2.0beta3
-     */
-    function setHandlerObj(&$obj)
-    {
-        $this->_handlerObj = &$obj;
-        return true;
-    }
-
-    /**
-     * Init the element handlers
-     *
-     * @access  private
-     */
-    function _initHandlers()
-    {
-        if (!is_resource($this->parser)) {
-            return false;
-        }
-
-        if (!is_object($this->_handlerObj)) {
-            $this->_handlerObj = &$this;
-        }
-        switch ($this->mode) {
-
-            case 'func':
-                xml_set_object($this->parser, $this->_handlerObj);
-                xml_set_element_handler($this->parser, array(&$this, 'funcStartHandler'), array(&$this, 'funcEndHandler'));
-                break;
-
-            case 'event':
-                xml_set_object($this->parser, $this->_handlerObj);
-                xml_set_element_handler($this->parser, 'startHandler', 'endHandler');
-                break;
-            default:
-                return $this->raiseError('Unsupported mode given', XML_PARSER_ERROR_UNSUPPORTED_MODE);
-                break;
-        }
-
-
-        /**
-         * set additional handlers for character data, entities, etc.
-         */
-        foreach ($this->handler as $xml_func => $method) {
-            if (method_exists($this->_handlerObj, $method)) {
-                $xml_func = 'xml_set_' . $xml_func;
-                $xml_func($this->parser, $method);
-            }
-		}
-    }
-
-    // {{{ _create()
-
-    /**
-     * create the XML parser resource
-     *
-     * Has been moved from the constructor to avoid
-     * problems with object references.
-     *
-     * Furthermore it allows us returning an error
-     * if something fails.
-     *
-     * @access   private
-     * @return   boolean|object     true on success, PEAR_Error otherwise
-     *
-     * @see xml_parser_create
-     */
-    function _create()
-    {
-        if ($this->srcenc === null) {
-            $xp = @xml_parser_create();
-        } else {
-            $xp = @xml_parser_create($this->srcenc);
-        }
-        if (is_resource($xp)) {
-            if ($this->tgtenc !== null) {
-                if (!@xml_parser_set_option($xp, XML_OPTION_TARGET_ENCODING,
-                                            $this->tgtenc)) {
-                    return $this->raiseError('invalid target encoding', XML_PARSER_ERROR_INVALID_ENCODING);
-                }
-            }
-            $this->parser = $xp;
-            $result = $this->_initHandlers($this->mode);
-            if ($this->isError($result)) {
-                return $result;
-            }
-            xml_parser_set_option($xp, XML_OPTION_CASE_FOLDING, $this->folding);
-            return true;
-        }
-        if (!in_array(strtoupper($this->srcenc), $this->_validEncodings)) {
-            return $this->raiseError('invalid source encoding', XML_PARSER_ERROR_INVALID_ENCODING);
-        }
-        return $this->raiseError('Unable to create XML parser resource.', XML_PARSER_ERROR_NO_RESOURCE);
-    }
-
-    // }}}
-    // {{{ reset()
-
-    /**
-     * Reset the parser.
-     *
-     * This allows you to use one parser instance
-     * to parse multiple XML documents.
-     *
-     * @access   public
-     * @return   boolean|object     true on success, PEAR_Error otherwise
-     */
-    function reset()
-    {
-        $result = $this->_create();
-        if ($this->isError( $result )) {
-            return $result;
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ setInputFile()
-
-    /**
-     * Sets the input xml file to be parsed
-     *
-     * @param    string      Filename (full path)
-     * @return   resource    fopen handle of the given file
-     * @throws   XML_Parser_Error
-     * @see      setInput(), setInputString(), parse()
-     * @access   public
-     */
-    function setInputFile($file)
-    {
-        /**
-         * check, if file is a remote file
-         */
-        if (eregi('^(http|ftp)://', substr($file, 0, 10))) {
-            if (!ini_get('allow_url_fopen')) {
-            	return $this->raiseError('Remote files cannot be parsed, as safe mode is enabled.', XML_PARSER_ERROR_REMOTE);
-            }
-        }
-
-        $fp = @fopen($file, 'rb');
-        if (is_resource($fp)) {
-            $this->fp = $fp;
-            return $fp;
-        }
-        return $this->raiseError('File could not be opened.', XML_PARSER_ERROR_FILE_NOT_READABLE);
-    }
-
-    // }}}
-    // {{{ setInputString()
-
-    /**
-     * XML_Parser::setInputString()
-     *
-     * Sets the xml input from a string
-     *
-     * @param string $data a string containing the XML document
-     * @return null
-     **/
-    function setInputString($data)
-    {
-        $this->fp = $data;
-        return null;
-    }
-
-    // }}}
-    // {{{ setInput()
-
-    /**
-     * Sets the file handle to use with parse().
-     *
-     * You should use setInputFile() or setInputString() if you
-     * pass a string
-     *
-     * @param    mixed  $fp  Can be either a resource returned from fopen(),
-     *                       a URL, a local filename or a string.
-     * @access   public
-     * @see      parse()
-     * @uses     setInputString(), setInputFile()
-     */
-    function setInput($fp)
-    {
-        if (is_resource($fp)) {
-            $this->fp = $fp;
-            return true;
-        }
-        // see if it's an absolute URL (has a scheme at the beginning)
-        elseif (eregi('^[a-z]+://', substr($fp, 0, 10))) {
-            return $this->setInputFile($fp);
-        }
-        // see if it's a local file
-        elseif (file_exists($fp)) {
-            return $this->setInputFile($fp);
-        }
-        // it must be a string
-        else {
-            $this->fp = $fp;
-            return true;
-        }
-
-        return $this->raiseError('Illegal input format', XML_PARSER_ERROR_INVALID_INPUT);
-    }
-
-    // }}}
-    // {{{ parse()
-
-    /**
-     * Central parsing function.
-     *
-     * @return   true|object PEAR error     returns true on success, or a PEAR_Error otherwise
-     * @access   public
-     */
-    function parse()
-    {
-        /**
-         * reset the parser
-         */
-        $result = $this->reset();
-        if ($this->isError($result)) {
-            return $result;
-        }
-        // if $this->fp was fopened previously
-        if (is_resource($this->fp)) {
-
-            while ($data = fread($this->fp, 4096)) {
-                if (!$this->_parseString($data, feof($this->fp))) {
-                    $error = &$this->raiseError();
-                    $this->free();
-                    return $error;
-                }
-            }
-        // otherwise, $this->fp must be a string
-        } else {
-            if (!$this->_parseString($this->fp, true)) {
-                $error = &$this->raiseError();
-                $this->free();
-                return $error;
-            }
-        }
-        $this->free();
-
-        return true;
-    }
-
-    /**
-     * XML_Parser::_parseString()
-     *
-     * @param string $data
-     * @param boolean $eof
-     * @return bool
-     * @access private
-     * @see parseString()
-     **/
-    function _parseString($data, $eof = false)
-    {
-        return xml_parse($this->parser, $data, $eof);
-    }
-
-    // }}}
-    // {{{ parseString()
-
-    /**
-     * XML_Parser::parseString()
-     *
-     * Parses a string.
-     *
-     * @param    string  $data XML data
-     * @param    boolean $eof  If set and TRUE, data is the last piece of data sent in this parser
-     * @throws   XML_Parser_Error
-     * @return   Pear Error|true   true on success or a PEAR Error
-     * @see      _parseString()
-     */
-    function parseString($data, $eof = false)
-    {
-        if (!isset($this->parser) || !is_resource($this->parser)) {
-            $this->reset();
-        }
-
-        if (!$this->_parseString($data, $eof)) {
-           $error = &$this->raiseError();
-           $this->free();
-           return $error;
-        }
-
-        if ($eof === true) {
-            $this->free();
-        }
-        return true;
-    }
-
-    /**
-     * XML_Parser::free()
-     *
-     * Free the internal resources associated with the parser
-     *
-     * @return null
-     **/
-    function free()
-    {
-        if (isset($this->parser) && is_resource($this->parser)) {
-            xml_parser_free($this->parser);
-            unset( $this->parser );
-        }
-        if (isset($this->fp) && is_resource($this->fp)) {
-            fclose($this->fp);
-        }
-        unset($this->fp);
-        return null;
-    }
-
-    /**
-     * XML_Parser::raiseError()
-     *
-     * Throws a XML_Parser_Error
-     *
-     * @param string  $msg   the error message
-     * @param integer $ecode the error message code
-     * @return XML_Parser_Error
-     **/
-    function raiseError($msg = null, $ecode = 0)
-    {
-        $msg = !is_null($msg) ? $msg : $this->parser;
-        $err = &new XML_Parser_Error($msg, $ecode);
-        return parent::raiseError($err);
-    }
-
-    // }}}
-    // {{{ funcStartHandler()
-
-    function funcStartHandler($xp, $elem, $attribs)
-    {
-        $func = 'xmltag_' . $elem;
-        $func = str_replace(array('.', '-', ':'), '_', $func);
-        if (method_exists($this->_handlerObj, $func)) {
-            call_user_func(array(&$this->_handlerObj, $func), $xp, $elem, $attribs);
-        } elseif (method_exists($this->_handlerObj, 'xmltag')) {
-            call_user_func(array(&$this->_handlerObj, 'xmltag'), $xp, $elem, $attribs);
-        }
-    }
-
-    // }}}
-    // {{{ funcEndHandler()
-
-    function funcEndHandler($xp, $elem)
-    {
-        $func = 'xmltag_' . $elem . '_';
-        $func = str_replace(array('.', '-', ':'), '_', $func);
-        if (method_exists($this->_handlerObj, $func)) {
-            call_user_func(array(&$this->_handlerObj, $func), $xp, $elem);
-        } elseif (method_exists($this->_handlerObj, 'xmltag_')) {
-            call_user_func(array(&$this->_handlerObj, 'xmltag_'), $xp, $elem);
-        }
-    }
-
-    // }}}
-    // {{{ startHandler()
-
-    /**
-     *
-     * @abstract
-     */
-    function startHandler($xp, $elem, &$attribs)
-    {
-        return NULL;
-    }
-
-    // }}}
-    // {{{ endHandler()
-
-    /**
-     *
-     * @abstract
-     */
-    function endHandler($xp, $elem)
-    {
-        return NULL;
-    }
-
-
-    // }}}me
-}
-
-/**
- * error class, replaces PEAR_Error
- *
- * An instance of this class will be returned
- * if an error occurs inside XML_Parser.
- *
- * There are three advantages over using the standard PEAR_Error:
- * - All messages will be prefixed
- * - check for XML_Parser error, using is_a( $error, 'XML_Parser_Error' )
- * - messages can be generated from the xml_parser resource
- *
- * @package XML_Parser
- * @access  public
- * @see     PEAR_Error
- */
-class XML_Parser_Error extends PEAR_Error
-{
-    // {{{ properties
-
-   /**
-    * prefix for all messages
-    *
-    * @var      string
-    */
-    var $error_message_prefix = 'XML_Parser: ';
-
-    // }}}
-    // {{{ constructor()
-   /**
-    * construct a new error instance
-    *
-    * You may either pass a message or an xml_parser resource as first
-    * parameter. If a resource has been passed, the last error that
-    * happened will be retrieved and returned.
-    *
-    * @access   public
-    * @param    string|resource     message or parser resource
-    * @param    integer             error code
-    * @param    integer             error handling
-    * @param    integer             error level
-    */
-    function XML_Parser_Error($msgorparser = 'unknown error', $code = 0, $mode = PEAR_ERROR_RETURN, $level = E_USER_NOTICE)
-    {
-        if (is_resource($msgorparser)) {
-            $code = xml_get_error_code($msgorparser);
-            $msgorparser = sprintf('%s at XML input line %d:%d',
-                                   xml_error_string($code),
-                                   xml_get_current_line_number($msgorparser),
-                                   xml_get_current_column_number($msgorparser));
-        }
-        $this->PEAR_Error($msgorparser, $code, $mode, $level);
-    }
-    // }}}
-}
-?>
\ No newline at end of file
diff --git a/lib/vendor/PEAR/Amazon/XML/Unserializer.php b/lib/vendor/PEAR/Amazon/XML/Unserializer.php
deleted file mode 100644
index 15ab49258..000000000
--- a/lib/vendor/PEAR/Amazon/XML/Unserializer.php
+++ /dev/null
@@ -1,856 +0,0 @@
-<?PHP
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * XML_Unserializer
- *
- * Parses any XML document into PHP data structures.
- *
- * PHP versions 4 and 5
- *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
- * @category   XML
- * @package    XML_Serializer
- * @author     Stephan Schmidt <schst@php.net>
- * @copyright  1997-2005 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Unserializer.php,v 1.39 2005/09/28 11:19:56 schst Exp $
- * @link       http://pear.php.net/package/XML_Serializer
- * @see        XML_Unserializer
- */
-
-/**
- * uses PEAR error managemt
- */
-require_once 'PEAR.php';
-
-/**
- * uses XML_Parser to unserialize document
- */
-require_once 'XML/Parser.php';
-
-/**
- * option: Convert nested tags to array or object
- *
- * Possible values:
- * - array
- * - object
- * - associative array to define this option per tag name
- */
-define('XML_UNSERIALIZER_OPTION_COMPLEXTYPE', 'complexType');
-
-/**
- * option: Name of the attribute that stores the original key
- *
- * Possible values:
- * - any string
- */
-define('XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY', 'keyAttribute');
-
-/**
- * option: Name of the attribute that stores the type
- *
- * Possible values:
- * - any string
- */
-define('XML_UNSERIALIZER_OPTION_ATTRIBUTE_TYPE', 'typeAttribute');
-
-/**
- * option: Name of the attribute that stores the class name
- *
- * Possible values:
- * - any string
- */
-define('XML_UNSERIALIZER_OPTION_ATTRIBUTE_CLASS', 'classAttribute');
-
-/**
- * option: Whether to use the tag name as a class name
- *
- * Possible values:
- * - true or false
- */
-define('XML_UNSERIALIZER_OPTION_TAG_AS_CLASSNAME', 'tagAsClass');
-
-/**
- * option: Name of the default class
- *
- * Possible values:
- * - any string
- */
-define('XML_UNSERIALIZER_OPTION_DEFAULT_CLASS', 'defaultClass');
-
-/**
- * option: Whether to parse attributes
- *
- * Possible values:
- * - true or false
- */
-define('XML_UNSERIALIZER_OPTION_ATTRIBUTES_PARSE', 'parseAttributes');
-
-/**
- * option: Key of the array to store attributes (if any)
- *
- * Possible values:
- * - any string
- * - false (disabled)
- */
-define('XML_UNSERIALIZER_OPTION_ATTRIBUTES_ARRAYKEY', 'attributesArray');
-
-/**
- * option: string to prepend attribute name (if any)
- *
- * Possible values:
- * - any string
- * - false (disabled)
- */
-define('XML_UNSERIALIZER_OPTION_ATTRIBUTES_PREPEND', 'prependAttributes');
-
-/**
- * option: key to store the content, if XML_UNSERIALIZER_OPTION_ATTRIBUTES_PARSE is used
- *
- * Possible values:
- * - any string
- */
-define('XML_UNSERIALIZER_OPTION_CONTENT_KEY', 'contentName');
-
-/**
- * option: map tag names
- *
- * Possible values:
- * - associative array
- */
-define('XML_UNSERIALIZER_OPTION_TAG_MAP', 'tagMap');
-
-/**
- * option: list of tags that will always be enumerated
- *
- * Possible values:
- * - indexed array
- */
-define('XML_UNSERIALIZER_OPTION_FORCE_ENUM', 'forceEnum');
-
-/**
- * option: Encoding of the XML document
- *
- * Possible values:
- * - UTF-8
- * - ISO-8859-1
- */
-define('XML_UNSERIALIZER_OPTION_ENCODING_SOURCE', 'encoding');
-
-/**
- * option: Desired target encoding of the data
- *
- * Possible values:
- * - UTF-8
- * - ISO-8859-1
- */
-define('XML_UNSERIALIZER_OPTION_ENCODING_TARGET', 'targetEncoding');
-
-/**
- * option: Callback that will be applied to textual data
- *
- * Possible values:
- * - any valid PHP callback
- */
-define('XML_UNSERIALIZER_OPTION_DECODE_FUNC', 'decodeFunction');
-
-/**
- * option: whether to return the result of the unserialization from unserialize()
- *
- * Possible values:
- * - true
- * - false (default)
- */
-define('XML_UNSERIALIZER_OPTION_RETURN_RESULT', 'returnResult');
-
-/**
- * option: set the whitespace behaviour
- *
- * Possible values:
- * - XML_UNSERIALIZER_WHITESPACE_KEEP
- * - XML_UNSERIALIZER_WHITESPACE_TRIM
- * - XML_UNSERIALIZER_WHITESPACE_NORMALIZE
- */
-define('XML_UNSERIALIZER_OPTION_WHITESPACE', 'whitespace');
-
-/**
- * Keep all whitespace
- */
-define('XML_UNSERIALIZER_WHITESPACE_KEEP', 'keep');
-
-/**
- * remove whitespace from start and end of the data
- */
-define('XML_UNSERIALIZER_WHITESPACE_TRIM', 'trim');
-
-/**
- * normalize whitespace
- */
-define('XML_UNSERIALIZER_WHITESPACE_NORMALIZE', 'normalize');
-
-/**
- * option: whether to ovverride all options that have been set before
- *
- * Possible values:
- * - true
- * - false (default)
- */
-define('XML_UNSERIALIZER_OPTION_OVERRIDE_OPTIONS', 'overrideOptions');
-
-/**
- * option: list of tags, that will not be used as keys
- */
-define('XML_UNSERIALIZER_OPTION_IGNORE_KEYS', 'ignoreKeys');
-
-/**
- * option: whether to use type guessing for scalar values
- */
-define('XML_UNSERIALIZER_OPTION_GUESS_TYPES', 'guessTypes');
-
-/**
- * error code for no serialization done
- */
-define('XML_UNSERIALIZER_ERROR_NO_UNSERIALIZATION', 151);
-
-/**
- * XML_Unserializer
- *
- * class to unserialize XML documents that have been created with
- * XML_Serializer. To unserialize an XML document you have to add
- * type hints to the XML_Serializer options.
- *
- * If no type hints are available, XML_Unserializer will guess how
- * the tags should be treated, that means complex structures will be
- * arrays and tags with only CData in them will be strings.
- *
- * <code>
- * require_once 'XML/Unserializer.php';
- *
- * //  be careful to always use the ampersand in front of the new operator
- * $unserializer = &new XML_Unserializer();
- *
- * $unserializer->unserialize($xml);
- *
- * $data = $unserializer->getUnserializedData();
- * <code>
- *
- *
- * @category   XML
- * @package    XML_Serializer
- * @author     Stephan Schmidt <schst@php.net>
- * @copyright  1997-2005 The PHP Group
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    Release: 0.18.0
- * @link       http://pear.php.net/package/XML_Serializer
- * @see        XML_Serializer
- */
-class XML_Unserializer extends PEAR
-{
-   /**
-    * list of all available options
-    *
-    * @access private
-    * @var    array
-    */
-    var $_knownOptions = array(
-                                XML_UNSERIALIZER_OPTION_COMPLEXTYPE,
-                                XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY,
-                                XML_UNSERIALIZER_OPTION_ATTRIBUTE_TYPE,
-                                XML_UNSERIALIZER_OPTION_ATTRIBUTE_CLASS,
-                                XML_UNSERIALIZER_OPTION_TAG_AS_CLASSNAME,
-                                XML_UNSERIALIZER_OPTION_DEFAULT_CLASS,
-                                XML_UNSERIALIZER_OPTION_ATTRIBUTES_PARSE,
-                                XML_UNSERIALIZER_OPTION_ATTRIBUTES_ARRAYKEY,
-                                XML_UNSERIALIZER_OPTION_ATTRIBUTES_PREPEND,
-                                XML_UNSERIALIZER_OPTION_CONTENT_KEY,
-                                XML_UNSERIALIZER_OPTION_TAG_MAP,
-                                XML_UNSERIALIZER_OPTION_FORCE_ENUM,
-                                XML_UNSERIALIZER_OPTION_ENCODING_SOURCE,
-                                XML_UNSERIALIZER_OPTION_ENCODING_TARGET,
-                                XML_UNSERIALIZER_OPTION_DECODE_FUNC,
-                                XML_UNSERIALIZER_OPTION_RETURN_RESULT,
-                                XML_UNSERIALIZER_OPTION_WHITESPACE,
-                                XML_UNSERIALIZER_OPTION_IGNORE_KEYS,
-                                XML_UNSERIALIZER_OPTION_GUESS_TYPES
-                              );
-   /**
-    * default options for the serialization
-    *
-    * @access private
-    * @var    array
-    */
-    var $_defaultOptions = array(
-                         XML_UNSERIALIZER_OPTION_COMPLEXTYPE         => 'array',                // complex types will be converted to arrays, if no type hint is given
-                         XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY       => '_originalKey',         // get array key/property name from this attribute
-                         XML_UNSERIALIZER_OPTION_ATTRIBUTE_TYPE      => '_type',                // get type from this attribute
-                         XML_UNSERIALIZER_OPTION_ATTRIBUTE_CLASS     => '_class',               // get class from this attribute (if not given, use tag name)
-                         XML_UNSERIALIZER_OPTION_TAG_AS_CLASSNAME    => true,                   // use the tagname as the classname
-                         XML_UNSERIALIZER_OPTION_DEFAULT_CLASS       => 'stdClass',             // name of the class that is used to create objects
-                         XML_UNSERIALIZER_OPTION_ATTRIBUTES_PARSE    => false,                  // parse the attributes of the tag into an array
-                         XML_UNSERIALIZER_OPTION_ATTRIBUTES_ARRAYKEY => false,                  // parse them into sperate array (specify name of array here)
-                         XML_UNSERIALIZER_OPTION_ATTRIBUTES_PREPEND  => '',                     // prepend attribute names with this string
-                         XML_UNSERIALIZER_OPTION_CONTENT_KEY         => '_content',             // put cdata found in a tag that has been converted to a complex type in this key
-                         XML_UNSERIALIZER_OPTION_TAG_MAP             => array(),                // use this to map tagnames
-                         XML_UNSERIALIZER_OPTION_FORCE_ENUM          => array(),                // these tags will always be an indexed array
-                         XML_UNSERIALIZER_OPTION_ENCODING_SOURCE     => null,                   // specify the encoding character of the document to parse
-                         XML_UNSERIALIZER_OPTION_ENCODING_TARGET     => null,                   // specify the target encoding
-                         XML_UNSERIALIZER_OPTION_DECODE_FUNC         => null,                   // function used to decode data
-                         XML_UNSERIALIZER_OPTION_RETURN_RESULT       => false,                  // unserialize() returns the result of the unserialization instead of true
-                         XML_UNSERIALIZER_OPTION_WHITESPACE          => XML_UNSERIALIZER_WHITESPACE_TRIM, // remove whitespace around data
-                         XML_UNSERIALIZER_OPTION_IGNORE_KEYS         => array(),                // List of tags that will automatically be added to the parent, instead of adding a new key
-                         XML_UNSERIALIZER_OPTION_GUESS_TYPES         => false                   // Whether to use type guessing
-                        );
-
-   /**
-    * current options for the serialization
-    *
-    * @access public
-    * @var    array
-    */
-    var $options = array();
-
-   /**
-    * unserialized data
-    *
-    * @access private
-    * @var    string
-    */
-    var $_unserializedData = null;
-
-   /**
-    * name of the root tag
-    *
-    * @access private
-    * @var    string
-    */
-    var $_root = null;
-
-   /**
-    * stack for all data that is found
-    *
-    * @access private
-    * @var    array
-    */
-    var $_dataStack  =   array();
-
-   /**
-    * stack for all values that are generated
-    *
-    * @access private
-    * @var    array
-    */
-    var $_valStack  =   array();
-
-   /**
-    * current tag depth
-    *
-    * @access private
-    * @var    int
-    */
-    var $_depth = 0;
-
-   /**
-    * XML_Parser instance
-    *
-    * @access   private
-    * @var      object XML_Parser
-    */
-    var $_parser = null;
-    
-   /**
-    * constructor
-    *
-    * @access   public
-    * @param    mixed   $options    array containing options for the unserialization
-    */
-    function XML_Unserializer($options = null)
-    {
-        if (is_array($options)) {
-            $this->options = array_merge($this->_defaultOptions, $options);
-        } else {
-            $this->options = $this->_defaultOptions;
-        }
-    }
-
-   /**
-    * return API version
-    *
-    * @access   public
-    * @static
-    * @return   string  $version API version
-    */
-    function apiVersion()
-    {
-        return '0.18.0';
-    }
-
-   /**
-    * reset all options to default options
-    *
-    * @access   public
-    * @see      setOption(), XML_Unserializer(), setOptions()
-    */
-    function resetOptions()
-    {
-        $this->options = $this->_defaultOptions;
-    }
-
-   /**
-    * set an option
-    *
-    * You can use this method if you do not want to set all options in the constructor
-    *
-    * @access   public
-    * @see      resetOption(), XML_Unserializer(), setOptions()
-    */
-    function setOption($name, $value)
-    {
-        $this->options[$name] = $value;
-    }
-
-   /**
-    * sets several options at once
-    *
-    * You can use this method if you do not want to set all options in the constructor
-    *
-    * @access   public
-    * @see      resetOption(), XML_Unserializer(), setOption()
-    */
-    function setOptions($options)
-    {
-        $this->options = array_merge($this->options, $options);
-    }
-
-   /**
-    * unserialize data
-    *
-    * @access   public
-    * @param    mixed    $data     data to unserialize (string, filename or resource)
-    * @param    boolean  $isFile   data should be treated as a file
-    * @param    array    $options  options that will override the global options for this call
-    * @return   boolean  $success
-    */
-    function unserialize($data, $isFile = false, $options = null)
-    {
-        $this->_unserializedData = null;
-        $this->_root = null;
-
-        // if options have been specified, use them instead
-        // of the previously defined ones
-        if (is_array($options)) {
-            $optionsBak = $this->options;
-            if (isset($options[XML_UNSERIALIZER_OPTION_OVERRIDE_OPTIONS]) && $options[XML_UNSERIALIZER_OPTION_OVERRIDE_OPTIONS] == true) {
-                $this->options = array_merge($this->_defaultOptions, $options);
-            } else {
-                $this->options = array_merge($this->options, $options);
-            }
-        } else {
-            $optionsBak = null;
-        }
-
-        $this->_valStack = array();
-        $this->_dataStack = array();
-        $this->_depth = 0;
-
-        $this->_createParser();
-        
-        if (is_string($data)) {
-            if ($isFile) {
-                $result = $this->_parser->setInputFile($data);
-                if (PEAR::isError($result)) {
-                    return $result;
-                }
-                $result = $this->_parser->parse();
-            } else {
-                $result = $this->_parser->parseString($data,true);
-            }
-        } else {
-           $this->_parser->setInput($data);
-           $result = $this->_parser->parse();
-        }
-
-        if ($this->options[XML_UNSERIALIZER_OPTION_RETURN_RESULT] === true) {
-        	$return = $this->_unserializedData;
-        } else {
-            $return = true;
-        }
-
-        if ($optionsBak !== null) {
-            $this->options = $optionsBak;
-        }
-
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-
-        return $return;
-    }
-
-   /**
-    * get the result of the serialization
-    *
-    * @access public
-    * @return string  $serializedData
-    */
-    function getUnserializedData()
-    {
-        if ($this->_root === null) {
-            return $this->raiseError('No unserialized data available. Use XML_Unserializer::unserialize() first.', XML_UNSERIALIZER_ERROR_NO_UNSERIALIZATION);
-        }
-        return $this->_unserializedData;
-    }
-
-   /**
-    * get the name of the root tag
-    *
-    * @access public
-    * @return string  $rootName
-    */
-    function getRootName()
-    {
-        if ($this->_root === null) {
-            return $this->raiseError('No unserialized data available. Use XML_Unserializer::unserialize() first.', XML_UNSERIALIZER_ERROR_NO_UNSERIALIZATION);
-        }
-        return $this->_root;
-    }
-
-   /**
-    * Start element handler for XML parser
-    *
-    * @access private
-    * @param  object $parser  XML parser object
-    * @param  string $element XML element
-    * @param  array  $attribs attributes of XML tag
-    * @return void
-    */
-    function startHandler($parser, $element, $attribs)
-    {
-        if (isset($attribs[$this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_TYPE]])) {
-            $type = $attribs[$this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_TYPE]];
-            $guessType = false;
-        } else {
-            $type = 'string';
-            if ($this->options[XML_UNSERIALIZER_OPTION_GUESS_TYPES] === true) {
-                $guessType = true;
-            } else {
-                $guessType = false;
-            }
-        }
-
-        if ($this->options[XML_UNSERIALIZER_OPTION_DECODE_FUNC] !== null) {
-            $attribs = array_map($this->options[XML_UNSERIALIZER_OPTION_DECODE_FUNC], $attribs);
-        }
-        
-        $this->_depth++;
-        $this->_dataStack[$this->_depth] = null;
-
-        if (is_array($this->options[XML_UNSERIALIZER_OPTION_TAG_MAP]) && isset($this->options[XML_UNSERIALIZER_OPTION_TAG_MAP][$element])) {
-            $element = $this->options[XML_UNSERIALIZER_OPTION_TAG_MAP][$element];
-        }
-
-        $val = array(
-                     'name'         => $element,
-                     'value'        => null,
-                     'type'         => $type,
-                     'guessType'    => $guessType,
-                     'childrenKeys' => array(),
-                     'aggregKeys'   => array()
-                    );
-
-        if ($this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTES_PARSE] == true && (count($attribs) > 0)) {
-            $val['children'] = array();
-            $val['type']  = $this->_getComplexType($element);
-            $val['class'] = $element;
-
-            if ($this->options[XML_UNSERIALIZER_OPTION_GUESS_TYPES] === true) {
-            	$attribs = $this->_guessAndSetTypes($attribs);
-            }            
-            if ($this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTES_ARRAYKEY] != false) {
-                $val['children'][$this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTES_ARRAYKEY]] = $attribs;
-            } else {
-                foreach ($attribs as $attrib => $value) {
-                    $val['children'][$this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTES_PREPEND].$attrib] = $value;
-                }
-            }
-        }
-
-        $keyAttr = false;
-        
-        if (is_string($this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY])) {
-            $keyAttr = $this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY];
-        } elseif (is_array($this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY])) {
-            if (isset($this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY][$element])) {
-                $keyAttr = $this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY][$element];
-            } elseif (isset($this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY]['#default'])) {
-                $keyAttr = $this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY]['#default'];
-            } elseif (isset($this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY]['__default'])) {
-                // keep this for BC
-                $keyAttr = $this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_KEY]['__default'];
-            }
-        }
-        
-        if ($keyAttr !== false && isset($attribs[$keyAttr])) {
-            $val['name'] = $attribs[$keyAttr];
-        }
-
-        if (isset($attribs[$this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_CLASS]])) {
-            $val['class'] = $attribs[$this->options[XML_UNSERIALIZER_OPTION_ATTRIBUTE_CLASS]];
-        }
-
-        array_push($this->_valStack, $val);
-    }
-
-   /**
-    * Try to guess the type of several values and
-    * set them accordingly
-    *
-    * @access   private
-    * @param    array      array, containing the values
-    * @return   array      array, containing the values with their correct types 
-    */
-    function _guessAndSetTypes($array)
-    {
-        foreach ($array as $key => $value) {
-        	$array[$key] = $this->_guessAndSetType($value);
-        }
-        return $array;
-    }
-    
-   /**
-    * Try to guess the type of a value and
-    * set it accordingly
-    *
-    * @access   private
-    * @param    string      character data
-    * @return   mixed       value with the best matching type
-    */
-    function _guessAndSetType($value)
-    {
-        if ($value === 'true') {
-            return true;
-        }
-        if ($value === 'false') {
-            return false;
-        }
-        if ($value === 'NULL') {
-            return null;
-        }
-        if (preg_match('/^[-+]?[0-9]{1,}$/', $value)) {
-        	return intval($value);
-        }
-        if (preg_match('/^[-+]?[0-9]{1,}\.[0-9]{1,}$/', $value)) {
-        	return doubleval($value);
-        }
-        return (string)$value;
-    }
-    
-   /**
-    * End element handler for XML parser
-    *
-    * @access private
-    * @param  object XML parser object
-    * @param  string
-    * @return void
-    */
-    function endHandler($parser, $element)
-    {
-        $value = array_pop($this->_valStack);
-        switch ($this->options[XML_UNSERIALIZER_OPTION_WHITESPACE]) {
-            case XML_UNSERIALIZER_WHITESPACE_KEEP:
-                $data = $this->_dataStack[$this->_depth];
-                break;
-            case XML_UNSERIALIZER_WHITESPACE_NORMALIZE:
-                $data = trim(preg_replace('/\s\s+/m', ' ', $this->_dataStack[$this->_depth]));
-                break;
-            case XML_UNSERIALIZER_WHITESPACE_TRIM:
-            default:
-                $data  = trim($this->_dataStack[$this->_depth]);
-                break;
-        }
-
-        // adjust type of the value
-        switch(strtolower($value['type'])) {
-
-            // unserialize an object
-            case 'object':
-                if (isset($value['class'])) {
-                    $classname  = $value['class'];
-                } else {
-                    $classname = '';
-                }
-                // instantiate the class
-                if ($this->options[XML_UNSERIALIZER_OPTION_TAG_AS_CLASSNAME] === true && class_exists($classname)) {
-                    $value['value'] = &new $classname;
-                } else {
-                    $value['value'] = &new $this->options[XML_UNSERIALIZER_OPTION_DEFAULT_CLASS];
-                }
-                if (trim($data) !== '') {
-                    if ($value['guessType'] === true) {
-                    	$data = $this->_guessAndSetType($data);
-                    }
-                    $value['children'][$this->options[XML_UNSERIALIZER_OPTION_CONTENT_KEY]] = $data;
-                }
-
-                // set properties
-                foreach ($value['children'] as $prop => $propVal) {
-                    // check whether there is a special method to set this property
-                    $setMethod = 'set'.$prop;
-                    if (method_exists($value['value'], $setMethod)) {
-                        call_user_func(array(&$value['value'], $setMethod), $propVal);
-                    } else {
-                        $value['value']->$prop = $propVal;
-                    }
-                }
-                //  check for magic function
-                if (method_exists($value['value'], '__wakeup')) {
-                    $value['value']->__wakeup();
-                }
-                break;
-
-            // unserialize an array
-            case 'array':
-                if (trim($data) !== '') {
-                    if ($value['guessType'] === true) {
-                    	$data = $this->_guessAndSetType($data);
-                    }
-                    $value['children'][$this->options[XML_UNSERIALIZER_OPTION_CONTENT_KEY]] = $data;
-                }
-                if (isset($value['children'])) {
-                    $value['value'] = $value['children'];
-                } else {
-                    $value['value'] = array();
-                }
-                break;
-
-            // unserialize a null value
-            case 'null':
-                $data = null;
-                break;
-
-            // unserialize a resource => this is not possible :-(
-            case 'resource':
-                $value['value'] = $data;
-                break;
-
-            // unserialize any scalar value
-            default:
-                if ($value['guessType'] === true) {
-                    $data = $this->_guessAndSetType($data);
-                } else {
-                    settype($data, $value['type']);
-                }
-            
-                $value['value'] = $data;
-                break;
-        }
-        $parent = array_pop($this->_valStack);
-        if ($parent === null) {
-            $this->_unserializedData = &$value['value'];
-            $this->_root = &$value['name'];
-            return true;
-        } else {
-            // parent has to be an array
-            if (!isset($parent['children']) || !is_array($parent['children'])) {
-                $parent['children'] = array();
-                if (!in_array($parent['type'], array('array', 'object'))) {
-                    $parent['type'] = $this->_getComplexType($parent['name']);
-                    if ($parent['type'] == 'object') {
-                        $parent['class'] = $parent['name'];
-                    }
-                }
-            }
-
-            if (in_array($element, $this->options[XML_UNSERIALIZER_OPTION_IGNORE_KEYS])) {
-                $ignoreKey = true;
-            } else {
-            	$ignoreKey = false;
-            }
-            
-            if (!empty($value['name']) && $ignoreKey === false) {
-                // there already has been a tag with this name
-                if (in_array($value['name'], $parent['childrenKeys']) || in_array($value['name'], $this->options[XML_UNSERIALIZER_OPTION_FORCE_ENUM])) {
-                    // no aggregate has been created for this tag
-                    if (!in_array($value['name'], $parent['aggregKeys'])) {
-                        if (isset($parent['children'][$value['name']])) {
-                            $parent['children'][$value['name']] = array($parent['children'][$value['name']]);
-                        } else {
-                            $parent['children'][$value['name']] = array();
-                        }
-                        array_push($parent['aggregKeys'], $value['name']);
-                    }
-                    array_push($parent['children'][$value['name']], $value['value']);
-                } else {
-                    $parent['children'][$value['name']] = &$value['value'];
-                    array_push($parent['childrenKeys'], $value['name']);
-                }
-            } else {
-                array_push($parent['children'], $value['value']);
-            }
-            array_push($this->_valStack, $parent);
-        }
-
-        $this->_depth--;
-    }
-
-   /**
-    * Handler for character data
-    *
-    * @access private
-    * @param  object XML parser object
-    * @param  string CDATA
-    * @return void
-    */
-    function cdataHandler($parser, $cdata)
-    {
-        if ($this->options[XML_UNSERIALIZER_OPTION_DECODE_FUNC] !== null) {
-            $cdata = call_user_func($this->options[XML_UNSERIALIZER_OPTION_DECODE_FUNC], $cdata);
-        }
-        $this->_dataStack[$this->_depth] .= $cdata;
-    }
-
-   /**
-    * get the complex type, that should be used for a specified tag
-    *
-    * @access   private
-    * @param    string      name of the tag
-    * @return   string      complex type ('array' or 'object')
-    */
-    function _getComplexType($tagname)
-    {
-        if (is_string($this->options[XML_UNSERIALIZER_OPTION_COMPLEXTYPE])) {
-        	return $this->options[XML_UNSERIALIZER_OPTION_COMPLEXTYPE];
-        }
-        if (isset($this->options[XML_UNSERIALIZER_OPTION_COMPLEXTYPE][$tagname])) {
-        	return $this->options[XML_UNSERIALIZER_OPTION_COMPLEXTYPE][$tagname];
-        }
-        if (isset($this->options[XML_UNSERIALIZER_OPTION_COMPLEXTYPE]['#default'])) {
-        	return $this->options[XML_UNSERIALIZER_OPTION_COMPLEXTYPE]['#default'];
-        }
-        return 'array';
-    }
-    
-   /**
-    * create the XML_Parser instance
-    *
-    * @access    private
-    * @return    boolean
-    */
-    function _createParser()
-    {
-        if (is_object($this->_parser)) {
-            $this->_parser->free();
-            unset($this->_parser);
-        }
-        $this->_parser = &new XML_Parser($this->options[XML_UNSERIALIZER_OPTION_ENCODING_SOURCE], 'event', $this->options[XML_UNSERIALIZER_OPTION_ENCODING_TARGET]);
-        $this->_parser->folding = false;
-        $this->_parser->setHandlerObj($this);
-        return true;
-    }
-}
-?>
\ No newline at end of file

From 3e3b4233ab32142766b432579fec38ffa171e144 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Tue, 28 Mar 2017 13:44:32 +0900
Subject: [PATCH 596/630] update library dependencies for NOTICE (refs #4176)

---
 NOTICE | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/NOTICE b/NOTICE
index ca1d27b0e..531231bf7 100644
--- a/NOTICE
+++ b/NOTICE
@@ -24,8 +24,14 @@ This product includes also softwares developed by :
     - MIT License
   - Kousuke Ebihara (http://co3k.org/)
     - Apache License 2.0
+  - Stig Bakken, Gregory Beaver, Helgi Þormar Þorbjörnsson, Tomas V.V.Cox, Martin Jansen
+    - BSD 2-clause License (PEAR)
+  - Greg Beaver
+    - BSD 2-clause License (PEAR_PackageFileManager2)
   - Vincent Oostindie, Alan Knowles, Peter Bowyer, Philippe Jausions
-    - PHP License 3.0 (PEAR::Image_Transform)
+    - PHP License 3.0 (Image_Transform)
+  - Harry Fuecks, Lorenzo Alberton
+    - BSD 3-clause License (Calendar)
 
 This product needs the third-party softwares listed blow to run.
   - PHP: Hypertext Preprocessor (5.2.4 +)
@@ -49,4 +55,7 @@ This product includes dependent libraries listed blow:
   - PHP OAuth library
   - sfFormExtraPlugin 1.0.12
   - sfImageHandlerPlugin 1.0.0
-  - PEAR::Image_Transform 0.9.3
+  - PEAR 1.10.3
+  - PEAR_PackageFileManager2 1.0.4
+  - Image_Transform 0.9.5
+  - Calendar 0.5.5

From 98c126607342bea8e5c8543a7adce5acf9cfbd5c Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Wed, 29 Mar 2017 17:16:46 +0900
Subject: [PATCH 597/630] update SimplePie 1.4.3 (refs #4179)

---
 lib/vendor/simplepie/SimplePie.php            |  3297 +++++
 lib/vendor/simplepie/SimplePie/Author.php     |   156 +
 lib/vendor/simplepie/SimplePie/Cache.php      |   134 +
 lib/vendor/simplepie/SimplePie/Cache/Base.php |   113 +
 lib/vendor/simplepie/SimplePie/Cache/DB.php   |   136 +
 lib/vendor/simplepie/SimplePie/Cache/File.php |   164 +
 .../simplepie/SimplePie/Cache/Memcache.php    |   180 +
 .../simplepie/SimplePie/Cache/Memcached.php   |   166 +
 .../simplepie/SimplePie/Cache/MySQL.php       |   454 +
 .../simplepie/SimplePie/Cache/Redis.php       |   166 +
 lib/vendor/simplepie/SimplePie/Caption.php    |   209 +
 lib/vendor/simplepie/SimplePie/Category.php   |   156 +
 .../SimplePie/Content/Type/Sniffer.php        |   331 +
 lib/vendor/simplepie/SimplePie/Copyright.php  |   129 +
 lib/vendor/simplepie/SimplePie/Core.php       |    56 +
 lib/vendor/simplepie/SimplePie/Credit.php     |   155 +
 .../SimplePie/Decode/HTML/Entities.php        |   615 +
 lib/vendor/simplepie/SimplePie/Enclosure.php  |  1379 ++
 lib/vendor/simplepie/SimplePie/Exception.php  |    51 +
 lib/vendor/simplepie/SimplePie/File.php       |   306 +
 .../simplepie/SimplePie/HTTP/Parser.php       |   499 +
 lib/vendor/simplepie/SimplePie/IRI.php        |  1257 ++
 lib/vendor/simplepie/SimplePie/Item.php       |  2989 +++++
 lib/vendor/simplepie/SimplePie/Locator.php    |   429 +
 lib/vendor/simplepie/SimplePie/Misc.php       |  2279 ++++
 lib/vendor/simplepie/SimplePie/Net/IPv6.php   |   275 +
 lib/vendor/simplepie/SimplePie/Parse/Date.php |   983 ++
 lib/vendor/simplepie/SimplePie/Parser.php     |   656 +
 lib/vendor/simplepie/SimplePie/Rating.php     |   128 +
 lib/vendor/simplepie/SimplePie/Registry.php   |   224 +
 .../simplepie/SimplePie/Restriction.php       |   154 +
 lib/vendor/simplepie/SimplePie/Sanitize.php   |   591 +
 lib/vendor/simplepie/SimplePie/Source.php     |   610 +
 .../SimplePie/XML/Declaration/Parser.php      |   361 +
 lib/vendor/simplepie/SimplePie/gzdecode.php   |   370 +
 lib/vendor/simplepie/simplepie.inc            | 10889 ----------------
 36 files changed, 20158 insertions(+), 10889 deletions(-)
 create mode 100755 lib/vendor/simplepie/SimplePie.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Author.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Cache.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Cache/Base.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Cache/DB.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Cache/File.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Cache/Memcache.php
 create mode 100755 lib/vendor/simplepie/SimplePie/Cache/Memcached.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Cache/MySQL.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Cache/Redis.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Caption.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Category.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Content/Type/Sniffer.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Copyright.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Core.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Credit.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Decode/HTML/Entities.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Enclosure.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Exception.php
 create mode 100644 lib/vendor/simplepie/SimplePie/File.php
 create mode 100644 lib/vendor/simplepie/SimplePie/HTTP/Parser.php
 create mode 100644 lib/vendor/simplepie/SimplePie/IRI.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Item.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Locator.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Misc.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Net/IPv6.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Parse/Date.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Parser.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Rating.php
 create mode 100755 lib/vendor/simplepie/SimplePie/Registry.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Restriction.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Sanitize.php
 create mode 100644 lib/vendor/simplepie/SimplePie/Source.php
 create mode 100644 lib/vendor/simplepie/SimplePie/XML/Declaration/Parser.php
 create mode 100644 lib/vendor/simplepie/SimplePie/gzdecode.php
 delete mode 100644 lib/vendor/simplepie/simplepie.inc

diff --git a/lib/vendor/simplepie/SimplePie.php b/lib/vendor/simplepie/SimplePie.php
new file mode 100755
index 000000000..63ab10b5f
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie.php
@@ -0,0 +1,3297 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version 1.4.3
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * SimplePie Name
+ */
+define('SIMPLEPIE_NAME', 'SimplePie');
+
+/**
+ * SimplePie Version
+ */
+define('SIMPLEPIE_VERSION', '1.4.3');
+
+/**
+ * SimplePie Build
+ * @todo Hardcode for release (there's no need to have to call SimplePie_Misc::get_build() only every load of simplepie.inc)
+ */
+define('SIMPLEPIE_BUILD', gmdate('YmdHis', SimplePie_Misc::get_build()));
+
+/**
+ * SimplePie Website URL
+ */
+define('SIMPLEPIE_URL', 'http://simplepie.org');
+
+/**
+ * SimplePie Useragent
+ * @see SimplePie::set_useragent()
+ */
+define('SIMPLEPIE_USERAGENT', SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION . ' (Feed Parser; ' . SIMPLEPIE_URL . '; Allow like Gecko) Build/' . SIMPLEPIE_BUILD);
+
+/**
+ * SimplePie Linkback
+ */
+define('SIMPLEPIE_LINKBACK', '<a href="' . SIMPLEPIE_URL . '" title="' . SIMPLEPIE_NAME . ' ' . SIMPLEPIE_VERSION . '">' . SIMPLEPIE_NAME . '</a>');
+
+/**
+ * No Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ */
+define('SIMPLEPIE_LOCATOR_NONE', 0);
+
+/**
+ * Feed Link Element Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ */
+define('SIMPLEPIE_LOCATOR_AUTODISCOVERY', 1);
+
+/**
+ * Local Feed Extension Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ */
+define('SIMPLEPIE_LOCATOR_LOCAL_EXTENSION', 2);
+
+/**
+ * Local Feed Body Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ */
+define('SIMPLEPIE_LOCATOR_LOCAL_BODY', 4);
+
+/**
+ * Remote Feed Extension Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ */
+define('SIMPLEPIE_LOCATOR_REMOTE_EXTENSION', 8);
+
+/**
+ * Remote Feed Body Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ */
+define('SIMPLEPIE_LOCATOR_REMOTE_BODY', 16);
+
+/**
+ * All Feed Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ */
+define('SIMPLEPIE_LOCATOR_ALL', 31);
+
+/**
+ * No known feed type
+ */
+define('SIMPLEPIE_TYPE_NONE', 0);
+
+/**
+ * RSS 0.90
+ */
+define('SIMPLEPIE_TYPE_RSS_090', 1);
+
+/**
+ * RSS 0.91 (Netscape)
+ */
+define('SIMPLEPIE_TYPE_RSS_091_NETSCAPE', 2);
+
+/**
+ * RSS 0.91 (Userland)
+ */
+define('SIMPLEPIE_TYPE_RSS_091_USERLAND', 4);
+
+/**
+ * RSS 0.91 (both Netscape and Userland)
+ */
+define('SIMPLEPIE_TYPE_RSS_091', 6);
+
+/**
+ * RSS 0.92
+ */
+define('SIMPLEPIE_TYPE_RSS_092', 8);
+
+/**
+ * RSS 0.93
+ */
+define('SIMPLEPIE_TYPE_RSS_093', 16);
+
+/**
+ * RSS 0.94
+ */
+define('SIMPLEPIE_TYPE_RSS_094', 32);
+
+/**
+ * RSS 1.0
+ */
+define('SIMPLEPIE_TYPE_RSS_10', 64);
+
+/**
+ * RSS 2.0
+ */
+define('SIMPLEPIE_TYPE_RSS_20', 128);
+
+/**
+ * RDF-based RSS
+ */
+define('SIMPLEPIE_TYPE_RSS_RDF', 65);
+
+/**
+ * Non-RDF-based RSS (truly intended as syndication format)
+ */
+define('SIMPLEPIE_TYPE_RSS_SYNDICATION', 190);
+
+/**
+ * All RSS
+ */
+define('SIMPLEPIE_TYPE_RSS_ALL', 255);
+
+/**
+ * Atom 0.3
+ */
+define('SIMPLEPIE_TYPE_ATOM_03', 256);
+
+/**
+ * Atom 1.0
+ */
+define('SIMPLEPIE_TYPE_ATOM_10', 512);
+
+/**
+ * All Atom
+ */
+define('SIMPLEPIE_TYPE_ATOM_ALL', 768);
+
+/**
+ * All feed types
+ */
+define('SIMPLEPIE_TYPE_ALL', 1023);
+
+/**
+ * No construct
+ */
+define('SIMPLEPIE_CONSTRUCT_NONE', 0);
+
+/**
+ * Text construct
+ */
+define('SIMPLEPIE_CONSTRUCT_TEXT', 1);
+
+/**
+ * HTML construct
+ */
+define('SIMPLEPIE_CONSTRUCT_HTML', 2);
+
+/**
+ * XHTML construct
+ */
+define('SIMPLEPIE_CONSTRUCT_XHTML', 4);
+
+/**
+ * base64-encoded construct
+ */
+define('SIMPLEPIE_CONSTRUCT_BASE64', 8);
+
+/**
+ * IRI construct
+ */
+define('SIMPLEPIE_CONSTRUCT_IRI', 16);
+
+/**
+ * A construct that might be HTML
+ */
+define('SIMPLEPIE_CONSTRUCT_MAYBE_HTML', 32);
+
+/**
+ * All constructs
+ */
+define('SIMPLEPIE_CONSTRUCT_ALL', 63);
+
+/**
+ * Don't change case
+ */
+define('SIMPLEPIE_SAME_CASE', 1);
+
+/**
+ * Change to lowercase
+ */
+define('SIMPLEPIE_LOWERCASE', 2);
+
+/**
+ * Change to uppercase
+ */
+define('SIMPLEPIE_UPPERCASE', 4);
+
+/**
+ * PCRE for HTML attributes
+ */
+define('SIMPLEPIE_PCRE_HTML_ATTRIBUTE', '((?:[\x09\x0A\x0B\x0C\x0D\x20]+[^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3D\x3E]*(?:[\x09\x0A\x0B\x0C\x0D\x20]*=[\x09\x0A\x0B\x0C\x0D\x20]*(?:"(?:[^"]*)"|\'(?:[^\']*)\'|(?:[^\x09\x0A\x0B\x0C\x0D\x20\x22\x27\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x3E]*)?))?)*)[\x09\x0A\x0B\x0C\x0D\x20]*');
+
+/**
+ * PCRE for XML attributes
+ */
+define('SIMPLEPIE_PCRE_XML_ATTRIBUTE', '((?:\s+(?:(?:[^\s:]+:)?[^\s:]+)\s*=\s*(?:"(?:[^"]*)"|\'(?:[^\']*)\'))*)\s*');
+
+/**
+ * XML Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_XML', 'http://www.w3.org/XML/1998/namespace');
+
+/**
+ * Atom 1.0 Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_ATOM_10', 'http://www.w3.org/2005/Atom');
+
+/**
+ * Atom 0.3 Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_ATOM_03', 'http://purl.org/atom/ns#');
+
+/**
+ * RDF Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_RDF', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#');
+
+/**
+ * RSS 0.90 Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_RSS_090', 'http://my.netscape.com/rdf/simple/0.9/');
+
+/**
+ * RSS 1.0 Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_RSS_10', 'http://purl.org/rss/1.0/');
+
+/**
+ * RSS 1.0 Content Module Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_RSS_10_MODULES_CONTENT', 'http://purl.org/rss/1.0/modules/content/');
+
+/**
+ * RSS 2.0 Namespace
+ * (Stupid, I know, but I'm certain it will confuse people less with support.)
+ */
+define('SIMPLEPIE_NAMESPACE_RSS_20', '');
+
+/**
+ * DC 1.0 Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_DC_10', 'http://purl.org/dc/elements/1.0/');
+
+/**
+ * DC 1.1 Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_DC_11', 'http://purl.org/dc/elements/1.1/');
+
+/**
+ * W3C Basic Geo (WGS84 lat/long) Vocabulary Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO', 'http://www.w3.org/2003/01/geo/wgs84_pos#');
+
+/**
+ * GeoRSS Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_GEORSS', 'http://www.georss.org/georss');
+
+/**
+ * Media RSS Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_MEDIARSS', 'http://search.yahoo.com/mrss/');
+
+/**
+ * Wrong Media RSS Namespace. Caused by a long-standing typo in the spec.
+ */
+define('SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG', 'http://search.yahoo.com/mrss');
+
+/**
+ * Wrong Media RSS Namespace #2. New namespace introduced in Media RSS 1.5.
+ */
+define('SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG2', 'http://video.search.yahoo.com/mrss');
+
+/**
+ * Wrong Media RSS Namespace #3. A possible typo of the Media RSS 1.5 namespace.
+ */
+define('SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG3', 'http://video.search.yahoo.com/mrss/');
+
+/**
+ * Wrong Media RSS Namespace #4. New spec location after the RSS Advisory Board takes it over, but not a valid namespace.
+ */
+define('SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG4', 'http://www.rssboard.org/media-rss');
+
+/**
+ * Wrong Media RSS Namespace #5. A possible typo of the RSS Advisory Board URL.
+ */
+define('SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG5', 'http://www.rssboard.org/media-rss/');
+
+/**
+ * iTunes RSS Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_ITUNES', 'http://www.itunes.com/dtds/podcast-1.0.dtd');
+
+/**
+ * XHTML Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_XHTML', 'http://www.w3.org/1999/xhtml');
+
+/**
+ * IANA Link Relations Registry
+ */
+define('SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY', 'http://www.iana.org/assignments/relation/');
+
+/**
+ * No file source
+ */
+define('SIMPLEPIE_FILE_SOURCE_NONE', 0);
+
+/**
+ * Remote file source
+ */
+define('SIMPLEPIE_FILE_SOURCE_REMOTE', 1);
+
+/**
+ * Local file source
+ */
+define('SIMPLEPIE_FILE_SOURCE_LOCAL', 2);
+
+/**
+ * fsockopen() file source
+ */
+define('SIMPLEPIE_FILE_SOURCE_FSOCKOPEN', 4);
+
+/**
+ * cURL file source
+ */
+define('SIMPLEPIE_FILE_SOURCE_CURL', 8);
+
+/**
+ * file_get_contents() file source
+ */
+define('SIMPLEPIE_FILE_SOURCE_FILE_GET_CONTENTS', 16);
+
+
+
+/**
+ * SimplePie
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie
+{
+	/**
+	 * @var array Raw data
+	 * @access private
+	 */
+	public $data = array();
+
+	/**
+	 * @var mixed Error string
+	 * @access private
+	 */
+	public $error;
+
+	/**
+	 * @var object Instance of SimplePie_Sanitize (or other class)
+	 * @see SimplePie::set_sanitize_class()
+	 * @access private
+	 */
+	public $sanitize;
+
+	/**
+	 * @var string SimplePie Useragent
+	 * @see SimplePie::set_useragent()
+	 * @access private
+	 */
+	public $useragent = SIMPLEPIE_USERAGENT;
+
+	/**
+	 * @var string Feed URL
+	 * @see SimplePie::set_feed_url()
+	 * @access private
+	 */
+	public $feed_url;
+
+	/**
+	 * @var string Original feed URL, or new feed URL iff HTTP 301 Moved Permanently
+	 * @see SimplePie::subscribe_url()
+	 * @access private
+	 */
+	public $permanent_url = null;
+
+	/**
+	 * @var object Instance of SimplePie_File to use as a feed
+	 * @see SimplePie::set_file()
+	 * @access private
+	 */
+	public $file;
+
+	/**
+	 * @var string Raw feed data
+	 * @see SimplePie::set_raw_data()
+	 * @access private
+	 */
+	public $raw_data;
+
+	/**
+	 * @var int Timeout for fetching remote files
+	 * @see SimplePie::set_timeout()
+	 * @access private
+	 */
+	public $timeout = 10;
+
+	/**
+	 * @var array Custom curl options
+	 * @see SimplePie::set_curl_options()
+	 * @access private
+	 */
+	public $curl_options = array();
+
+	/**
+	 * @var bool Forces fsockopen() to be used for remote files instead
+	 * of cURL, even if a new enough version is installed
+	 * @see SimplePie::force_fsockopen()
+	 * @access private
+	 */
+	public $force_fsockopen = false;
+
+	/**
+	 * @var bool Force the given data/URL to be treated as a feed no matter what
+	 * it appears like
+	 * @see SimplePie::force_feed()
+	 * @access private
+	 */
+	public $force_feed = false;
+
+	/**
+	 * @var bool Enable/Disable Caching
+	 * @see SimplePie::enable_cache()
+	 * @access private
+	 */
+	public $cache = true;
+
+	/**
+	 * @var bool Force SimplePie to fallback to expired cache, if enabled,
+	 * when feed is unavailable.
+	 * @see SimplePie::force_cache_fallback()
+	 * @access private
+	 */
+	public $force_cache_fallback = false;
+
+	/**
+	 * @var int Cache duration (in seconds)
+	 * @see SimplePie::set_cache_duration()
+	 * @access private
+	 */
+	public $cache_duration = 3600;
+
+	/**
+	 * @var int Auto-discovery cache duration (in seconds)
+	 * @see SimplePie::set_autodiscovery_cache_duration()
+	 * @access private
+	 */
+	public $autodiscovery_cache_duration = 604800; // 7 Days.
+
+	/**
+	 * @var string Cache location (relative to executing script)
+	 * @see SimplePie::set_cache_location()
+	 * @access private
+	 */
+	public $cache_location = './cache';
+
+	/**
+	 * @var string Function that creates the cache filename
+	 * @see SimplePie::set_cache_name_function()
+	 * @access private
+	 */
+	public $cache_name_function = 'md5';
+
+	/**
+	 * @var bool Reorder feed by date descending
+	 * @see SimplePie::enable_order_by_date()
+	 * @access private
+	 */
+	public $order_by_date = true;
+
+	/**
+	 * @var mixed Force input encoding to be set to the follow value
+	 * (false, or anything type-cast to false, disables this feature)
+	 * @see SimplePie::set_input_encoding()
+	 * @access private
+	 */
+	public $input_encoding = false;
+
+	/**
+	 * @var int Feed Autodiscovery Level
+	 * @see SimplePie::set_autodiscovery_level()
+	 * @access private
+	 */
+	public $autodiscovery = SIMPLEPIE_LOCATOR_ALL;
+
+	/**
+	 * Class registry object
+	 *
+	 * @var SimplePie_Registry
+	 */
+	public $registry;
+
+	/**
+	 * @var int Maximum number of feeds to check with autodiscovery
+	 * @see SimplePie::set_max_checked_feeds()
+	 * @access private
+	 */
+	public $max_checked_feeds = 10;
+
+	/**
+	 * @var array All the feeds found during the autodiscovery process
+	 * @see SimplePie::get_all_discovered_feeds()
+	 * @access private
+	 */
+	public $all_discovered_feeds = array();
+
+	/**
+	 * @var string Web-accessible path to the handler_image.php file.
+	 * @see SimplePie::set_image_handler()
+	 * @access private
+	 */
+	public $image_handler = '';
+
+	/**
+	 * @var array Stores the URLs when multiple feeds are being initialized.
+	 * @see SimplePie::set_feed_url()
+	 * @access private
+	 */
+	public $multifeed_url = array();
+
+	/**
+	 * @var array Stores SimplePie objects when multiple feeds initialized.
+	 * @access private
+	 */
+	public $multifeed_objects = array();
+
+	/**
+	 * @var array Stores the get_object_vars() array for use with multifeeds.
+	 * @see SimplePie::set_feed_url()
+	 * @access private
+	 */
+	public $config_settings = null;
+
+	/**
+	 * @var integer Stores the number of items to return per-feed with multifeeds.
+	 * @see SimplePie::set_item_limit()
+	 * @access private
+	 */
+	public $item_limit = 0;
+
+	/**
+	 * @var bool Stores if last-modified and/or etag headers were sent with the
+	 * request when checking a feed.
+	 */
+	public $check_modified = false;
+
+	/**
+	 * @var array Stores the default attributes to be stripped by strip_attributes().
+	 * @see SimplePie::strip_attributes()
+	 * @access private
+	 */
+	public $strip_attributes = array('bgsound', 'class', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc');
+
+	/**
+	 * @var array Stores the default attributes to add to different tags by add_attributes().
+	 * @see SimplePie::add_attributes()
+	 * @access private
+	 */
+	public $add_attributes = array('audio' => array('preload' => 'none'), 'iframe' => array('sandbox' => 'allow-scripts allow-same-origin'), 'video' => array('preload' => 'none'));
+
+	/**
+	 * @var array Stores the default tags to be stripped by strip_htmltags().
+	 * @see SimplePie::strip_htmltags()
+	 * @access private
+	 */
+	public $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style');
+
+	/**
+	 * The SimplePie class contains feed level data and options
+	 *
+	 * To use SimplePie, create the SimplePie object with no parameters. You can
+	 * then set configuration options using the provided methods. After setting
+	 * them, you must initialise the feed using $feed->init(). At that point the
+	 * object's methods and properties will be available to you.
+	 *
+	 * Previously, it was possible to pass in the feed URL along with cache
+	 * options directly into the constructor. This has been removed as of 1.3 as
+	 * it caused a lot of confusion.
+	 *
+	 * @since 1.0 Preview Release
+	 */
+	public function __construct()
+	{
+		if (version_compare(PHP_VERSION, '5.3', '<'))
+		{
+			trigger_error('Please upgrade to PHP 5.3 or newer.');
+			die();
+		}
+
+		// Other objects, instances created here so we can set options on them
+		$this->sanitize = new SimplePie_Sanitize();
+		$this->registry = new SimplePie_Registry();
+
+		if (func_num_args() > 0)
+		{
+			$level = defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_WARNING;
+			trigger_error('Passing parameters to the constructor is no longer supported. Please use set_feed_url(), set_cache_location(), and set_cache_duration() directly.', $level);
+
+			$args = func_get_args();
+			switch (count($args)) {
+				case 3:
+					$this->set_cache_duration($args[2]);
+				case 2:
+					$this->set_cache_location($args[1]);
+				case 1:
+					$this->set_feed_url($args[0]);
+					$this->init();
+			}
+		}
+	}
+
+	/**
+	 * Used for converting object to a string
+	 */
+	public function __toString()
+	{
+		return md5(serialize($this->data));
+	}
+
+	/**
+	 * Remove items that link back to this before destroying this object
+	 */
+	public function __destruct()
+	{
+		if ((version_compare(PHP_VERSION, '5.3', '<') || !gc_enabled()) && !ini_get('zend.ze1_compatibility_mode'))
+		{
+			if (!empty($this->data['items']))
+			{
+				foreach ($this->data['items'] as $item)
+				{
+					$item->__destruct();
+				}
+				unset($item, $this->data['items']);
+			}
+			if (!empty($this->data['ordered_items']))
+			{
+				foreach ($this->data['ordered_items'] as $item)
+				{
+					$item->__destruct();
+				}
+				unset($item, $this->data['ordered_items']);
+			}
+		}
+	}
+
+	/**
+	 * Force the given data/URL to be treated as a feed
+	 *
+	 * This tells SimplePie to ignore the content-type provided by the server.
+	 * Be careful when using this option, as it will also disable autodiscovery.
+	 *
+	 * @since 1.1
+	 * @param bool $enable Force the given data/URL to be treated as a feed
+	 */
+	public function force_feed($enable = false)
+	{
+		$this->force_feed = (bool) $enable;
+	}
+
+	/**
+	 * Set the URL of the feed you want to parse
+	 *
+	 * This allows you to enter the URL of the feed you want to parse, or the
+	 * website you want to try to use auto-discovery on. This takes priority
+	 * over any set raw data.
+	 *
+	 * You can set multiple feeds to mash together by passing an array instead
+	 * of a string for the $url. Remember that with each additional feed comes
+	 * additional processing and resources.
+	 *
+	 * @since 1.0 Preview Release
+	 * @see set_raw_data()
+	 * @param string|array $url This is the URL (or array of URLs) that you want to parse.
+	 */
+	public function set_feed_url($url)
+	{
+		$this->multifeed_url = array();
+		if (is_array($url))
+		{
+			foreach ($url as $value)
+			{
+				$this->multifeed_url[] = $this->registry->call('Misc', 'fix_protocol', array($value, 1));
+			}
+		}
+		else
+		{
+			$this->feed_url = $this->registry->call('Misc', 'fix_protocol', array($url, 1));
+			$this->permanent_url = $this->feed_url;
+		}
+	}
+
+	/**
+	 * Set an instance of {@see SimplePie_File} to use as a feed
+	 *
+	 * @param SimplePie_File &$file
+	 * @return bool True on success, false on failure
+	 */
+	public function set_file(&$file)
+	{
+		if ($file instanceof SimplePie_File)
+		{
+			$this->feed_url = $file->url;
+			$this->permanent_url = $this->feed_url;
+			$this->file =& $file;
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Set the raw XML data to parse
+	 *
+	 * Allows you to use a string of RSS/Atom data instead of a remote feed.
+	 *
+	 * If you have a feed available as a string in PHP, you can tell SimplePie
+	 * to parse that data string instead of a remote feed. Any set feed URL
+	 * takes precedence.
+	 *
+	 * @since 1.0 Beta 3
+	 * @param string $data RSS or Atom data as a string.
+	 * @see set_feed_url()
+	 */
+	public function set_raw_data($data)
+	{
+		$this->raw_data = $data;
+	}
+
+	/**
+	 * Set the the default timeout for fetching remote feeds
+	 *
+	 * This allows you to change the maximum time the feed's server to respond
+	 * and send the feed back.
+	 *
+	 * @since 1.0 Beta 3
+	 * @param int $timeout The maximum number of seconds to spend waiting to retrieve a feed.
+	 */
+	public function set_timeout($timeout = 10)
+	{
+		$this->timeout = (int) $timeout;
+	}
+
+	/**
+	 * Set custom curl options
+	 *
+	 * This allows you to change default curl options
+	 *
+	 * @since 1.0 Beta 3
+	 * @param array $curl_options Curl options to add to default settings
+	 */
+	public function set_curl_options(array $curl_options = array())
+	{
+		$this->curl_options = $curl_options;
+	}
+
+	/**
+	 * Force SimplePie to use fsockopen() instead of cURL
+	 *
+	 * @since 1.0 Beta 3
+	 * @param bool $enable Force fsockopen() to be used
+	 */
+	public function force_fsockopen($enable = false)
+	{
+		$this->force_fsockopen = (bool) $enable;
+	}
+
+	/**
+	 * Enable/disable caching in SimplePie.
+	 *
+	 * This option allows you to disable caching all-together in SimplePie.
+	 * However, disabling the cache can lead to longer load times.
+	 *
+	 * @since 1.0 Preview Release
+	 * @param bool $enable Enable caching
+	 */
+	public function enable_cache($enable = true)
+	{
+		$this->cache = (bool) $enable;
+	}
+
+	/**
+	 * SimplePie to continue to fall back to expired cache, if enabled, when
+	 * feed is unavailable.
+	 *
+	 * This tells SimplePie to ignore any file errors and fall back to cache
+	 * instead. This only works if caching is enabled and cached content
+	 * still exists.
+
+	 * @param bool $enable Force use of cache on fail.
+	 */
+	public function force_cache_fallback($enable = false)
+	{
+		$this->force_cache_fallback= (bool) $enable;
+	}
+
+	/**
+	 * Set the length of time (in seconds) that the contents of a feed will be
+	 * cached
+	 *
+	 * @param int $seconds The feed content cache duration
+	 */
+	public function set_cache_duration($seconds = 3600)
+	{
+		$this->cache_duration = (int) $seconds;
+	}
+
+	/**
+	 * Set the length of time (in seconds) that the autodiscovered feed URL will
+	 * be cached
+	 *
+	 * @param int $seconds The autodiscovered feed URL cache duration.
+	 */
+	public function set_autodiscovery_cache_duration($seconds = 604800)
+	{
+		$this->autodiscovery_cache_duration = (int) $seconds;
+	}
+
+	/**
+	 * Set the file system location where the cached files should be stored
+	 *
+	 * @param string $location The file system location.
+	 */
+	public function set_cache_location($location = './cache')
+	{
+		$this->cache_location = (string) $location;
+	}
+
+	/**
+	 * Set whether feed items should be sorted into reverse chronological order
+	 *
+	 * @param bool $enable Sort as reverse chronological order.
+	 */
+	public function enable_order_by_date($enable = true)
+	{
+		$this->order_by_date = (bool) $enable;
+	}
+
+	/**
+	 * Set the character encoding used to parse the feed
+	 *
+	 * This overrides the encoding reported by the feed, however it will fall
+	 * back to the normal encoding detection if the override fails
+	 *
+	 * @param string $encoding Character encoding
+	 */
+	public function set_input_encoding($encoding = false)
+	{
+		if ($encoding)
+		{
+			$this->input_encoding = (string) $encoding;
+		}
+		else
+		{
+			$this->input_encoding = false;
+		}
+	}
+
+	/**
+	 * Set how much feed autodiscovery to do
+	 *
+	 * @see SIMPLEPIE_LOCATOR_NONE
+	 * @see SIMPLEPIE_LOCATOR_AUTODISCOVERY
+	 * @see SIMPLEPIE_LOCATOR_LOCAL_EXTENSION
+	 * @see SIMPLEPIE_LOCATOR_LOCAL_BODY
+	 * @see SIMPLEPIE_LOCATOR_REMOTE_EXTENSION
+	 * @see SIMPLEPIE_LOCATOR_REMOTE_BODY
+	 * @see SIMPLEPIE_LOCATOR_ALL
+	 * @param int $level Feed Autodiscovery Level (level can be a combination of the above constants, see bitwise OR operator)
+	 */
+	public function set_autodiscovery_level($level = SIMPLEPIE_LOCATOR_ALL)
+	{
+		$this->autodiscovery = (int) $level;
+	}
+
+	/**
+	 * Get the class registry
+	 *
+	 * Use this to override SimplePie's default classes
+	 * @see SimplePie_Registry
+	 * @return SimplePie_Registry
+	 */
+	public function &get_registry()
+	{
+		return $this->registry;
+	}
+
+	/**#@+
+	 * Useful when you are overloading or extending SimplePie's default classes.
+	 *
+	 * @deprecated Use {@see get_registry()} instead
+	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
+	 * @param string $class Name of custom class
+	 * @return boolean True on success, false otherwise
+	 */
+	/**
+	 * Set which class SimplePie uses for caching
+	 */
+	public function set_cache_class($class = 'SimplePie_Cache')
+	{
+		return $this->registry->register('Cache', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for auto-discovery
+	 */
+	public function set_locator_class($class = 'SimplePie_Locator')
+	{
+		return $this->registry->register('Locator', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for XML parsing
+	 */
+	public function set_parser_class($class = 'SimplePie_Parser')
+	{
+		return $this->registry->register('Parser', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for remote file fetching
+	 */
+	public function set_file_class($class = 'SimplePie_File')
+	{
+		return $this->registry->register('File', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for data sanitization
+	 */
+	public function set_sanitize_class($class = 'SimplePie_Sanitize')
+	{
+		return $this->registry->register('Sanitize', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for handling feed items
+	 */
+	public function set_item_class($class = 'SimplePie_Item')
+	{
+		return $this->registry->register('Item', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for handling author data
+	 */
+	public function set_author_class($class = 'SimplePie_Author')
+	{
+		return $this->registry->register('Author', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for handling category data
+	 */
+	public function set_category_class($class = 'SimplePie_Category')
+	{
+		return $this->registry->register('Category', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for feed enclosures
+	 */
+	public function set_enclosure_class($class = 'SimplePie_Enclosure')
+	{
+		return $this->registry->register('Enclosure', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for `<media:text>` captions
+	 */
+	public function set_caption_class($class = 'SimplePie_Caption')
+	{
+		return $this->registry->register('Caption', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for `<media:copyright>`
+	 */
+	public function set_copyright_class($class = 'SimplePie_Copyright')
+	{
+		return $this->registry->register('Copyright', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for `<media:credit>`
+	 */
+	public function set_credit_class($class = 'SimplePie_Credit')
+	{
+		return $this->registry->register('Credit', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for `<media:rating>`
+	 */
+	public function set_rating_class($class = 'SimplePie_Rating')
+	{
+		return $this->registry->register('Rating', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for `<media:restriction>`
+	 */
+	public function set_restriction_class($class = 'SimplePie_Restriction')
+	{
+		return $this->registry->register('Restriction', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses for content-type sniffing
+	 */
+	public function set_content_type_sniffer_class($class = 'SimplePie_Content_Type_Sniffer')
+	{
+		return $this->registry->register('Content_Type_Sniffer', $class, true);
+	}
+
+	/**
+	 * Set which class SimplePie uses item sources
+	 */
+	public function set_source_class($class = 'SimplePie_Source')
+	{
+		return $this->registry->register('Source', $class, true);
+	}
+	/**#@-*/
+
+	/**
+	 * Set the user agent string
+	 *
+	 * @param string $ua New user agent string.
+	 */
+	public function set_useragent($ua = SIMPLEPIE_USERAGENT)
+	{
+		$this->useragent = (string) $ua;
+	}
+
+	/**
+	 * Set callback function to create cache filename with
+	 *
+	 * @param mixed $function Callback function
+	 */
+	public function set_cache_name_function($function = 'md5')
+	{
+		if (is_callable($function))
+		{
+			$this->cache_name_function = $function;
+		}
+	}
+
+	/**
+	 * Set options to make SP as fast as possible
+	 *
+	 * Forgoes a substantial amount of data sanitization in favor of speed. This
+	 * turns SimplePie into a dumb parser of feeds.
+	 *
+	 * @param bool $set Whether to set them or not
+	 */
+	public function set_stupidly_fast($set = false)
+	{
+		if ($set)
+		{
+			$this->enable_order_by_date(false);
+			$this->remove_div(false);
+			$this->strip_comments(false);
+			$this->strip_htmltags(false);
+			$this->strip_attributes(false);
+			$this->add_attributes(false);
+			$this->set_image_handler(false);
+		}
+	}
+
+	/**
+	 * Set maximum number of feeds to check with autodiscovery
+	 *
+	 * @param int $max Maximum number of feeds to check
+	 */
+	public function set_max_checked_feeds($max = 10)
+	{
+		$this->max_checked_feeds = (int) $max;
+	}
+
+	public function remove_div($enable = true)
+	{
+		$this->sanitize->remove_div($enable);
+	}
+
+	public function strip_htmltags($tags = '', $encode = null)
+	{
+		if ($tags === '')
+		{
+			$tags = $this->strip_htmltags;
+		}
+		$this->sanitize->strip_htmltags($tags);
+		if ($encode !== null)
+		{
+			$this->sanitize->encode_instead_of_strip($tags);
+		}
+	}
+
+	public function encode_instead_of_strip($enable = true)
+	{
+		$this->sanitize->encode_instead_of_strip($enable);
+	}
+
+	public function strip_attributes($attribs = '')
+	{
+		if ($attribs === '')
+		{
+			$attribs = $this->strip_attributes;
+		}
+		$this->sanitize->strip_attributes($attribs);
+	}
+
+	public function add_attributes($attribs = '')
+	{
+		if ($attribs === '')
+		{
+			$attribs = $this->add_attributes;
+		}
+		$this->sanitize->add_attributes($attribs);
+	}
+
+	/**
+	 * Set the output encoding
+	 *
+	 * Allows you to override SimplePie's output to match that of your webpage.
+	 * This is useful for times when your webpages are not being served as
+	 * UTF-8. This setting will be obeyed by {@see handle_content_type()}, and
+	 * is similar to {@see set_input_encoding()}.
+	 *
+	 * It should be noted, however, that not all character encodings can support
+	 * all characters. If your page is being served as ISO-8859-1 and you try
+	 * to display a Japanese feed, you'll likely see garbled characters.
+	 * Because of this, it is highly recommended to ensure that your webpages
+	 * are served as UTF-8.
+	 *
+	 * The number of supported character encodings depends on whether your web
+	 * host supports {@link http://php.net/mbstring mbstring},
+	 * {@link http://php.net/iconv iconv}, or both. See
+	 * {@link http://simplepie.org/wiki/faq/Supported_Character_Encodings} for
+	 * more information.
+	 *
+	 * @param string $encoding
+	 */
+	public function set_output_encoding($encoding = 'UTF-8')
+	{
+		$this->sanitize->set_output_encoding($encoding);
+	}
+
+	public function strip_comments($strip = false)
+	{
+		$this->sanitize->strip_comments($strip);
+	}
+
+	/**
+	 * Set element/attribute key/value pairs of HTML attributes
+	 * containing URLs that need to be resolved relative to the feed
+	 *
+	 * Defaults to |a|@href, |area|@href, |blockquote|@cite, |del|@cite,
+	 * |form|@action, |img|@longdesc, |img|@src, |input|@src, |ins|@cite,
+	 * |q|@cite
+	 *
+	 * @since 1.0
+	 * @param array|null $element_attribute Element/attribute key/value pairs, null for default
+	 */
+	public function set_url_replacements($element_attribute = null)
+	{
+		$this->sanitize->set_url_replacements($element_attribute);
+	}
+
+	/**
+	 * Set the handler to enable the display of cached images.
+	 *
+	 * @param str $page Web-accessible path to the handler_image.php file.
+	 * @param str $qs The query string that the value should be passed to.
+	 */
+	public function set_image_handler($page = false, $qs = 'i')
+	{
+		if ($page !== false)
+		{
+			$this->sanitize->set_image_handler($page . '?' . $qs . '=');
+		}
+		else
+		{
+			$this->image_handler = '';
+		}
+	}
+
+	/**
+	 * Set the limit for items returned per-feed with multifeeds
+	 *
+	 * @param integer $limit The maximum number of items to return.
+	 */
+	public function set_item_limit($limit = 0)
+	{
+		$this->item_limit = (int) $limit;
+	}
+
+	/**
+	 * Enable throwing exceptions
+	 *
+	 * @param boolean $enable Should we throw exceptions, or use the old-style error property?
+	 */
+	public function enable_exceptions($enable = true)
+	{
+		$this->enable_exceptions = $enable;
+	}
+
+	/**
+	 * Initialize the feed object
+	 *
+	 * This is what makes everything happen. Period. This is where all of the
+	 * configuration options get processed, feeds are fetched, cached, and
+	 * parsed, and all of that other good stuff.
+	 *
+	 * @return boolean True if successful, false otherwise
+	 */
+	public function init()
+	{
+		// Check absolute bare minimum requirements.
+		if (!extension_loaded('xml') || !extension_loaded('pcre'))
+		{
+			$this->error = 'XML or PCRE extensions not loaded!';
+			return false;
+		}
+		// Then check the xml extension is sane (i.e., libxml 2.7.x issue on PHP < 5.2.9 and libxml 2.7.0 to 2.7.2 on any version) if we don't have xmlreader.
+		elseif (!extension_loaded('xmlreader'))
+		{
+			static $xml_is_sane = null;
+			if ($xml_is_sane === null)
+			{
+				$parser_check = xml_parser_create();
+				xml_parse_into_struct($parser_check, '<foo>&amp;</foo>', $values);
+				xml_parser_free($parser_check);
+				$xml_is_sane = isset($values[0]['value']);
+			}
+			if (!$xml_is_sane)
+			{
+				return false;
+			}
+		}
+
+		if (method_exists($this->sanitize, 'set_registry'))
+		{
+			$this->sanitize->set_registry($this->registry);
+		}
+
+		// Pass whatever was set with config options over to the sanitizer.
+		// Pass the classes in for legacy support; new classes should use the registry instead
+		$this->sanitize->pass_cache_data($this->cache, $this->cache_location, $this->cache_name_function, $this->registry->get_class('Cache'));
+		$this->sanitize->pass_file_data($this->registry->get_class('File'), $this->timeout, $this->useragent, $this->force_fsockopen, $this->curl_options);
+
+		if (!empty($this->multifeed_url))
+		{
+			$i = 0;
+			$success = 0;
+			$this->multifeed_objects = array();
+			$this->error = array();
+			foreach ($this->multifeed_url as $url)
+			{
+				$this->multifeed_objects[$i] = clone $this;
+				$this->multifeed_objects[$i]->set_feed_url($url);
+				$single_success = $this->multifeed_objects[$i]->init();
+				$success |= $single_success;
+				if (!$single_success)
+				{
+					$this->error[$i] = $this->multifeed_objects[$i]->error();
+				}
+				$i++;
+			}
+			return (bool) $success;
+		}
+		elseif ($this->feed_url === null && $this->raw_data === null)
+		{
+			return false;
+		}
+
+		$this->error = null;
+		$this->data = array();
+		$this->check_modified = false;
+		$this->multifeed_objects = array();
+		$cache = false;
+
+		if ($this->feed_url !== null)
+		{
+			$parsed_feed_url = $this->registry->call('Misc', 'parse_url', array($this->feed_url));
+
+			// Decide whether to enable caching
+			if ($this->cache && $parsed_feed_url['scheme'] !== '')
+			{
+				$cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, call_user_func($this->cache_name_function, $this->feed_url), 'spc'));
+			}
+
+			// Fetch the data via SimplePie_File into $this->raw_data
+			if (($fetched = $this->fetch_data($cache)) === true)
+			{
+				return true;
+			}
+			elseif ($fetched === false) {
+				return false;
+			}
+
+			list($headers, $sniffed) = $fetched;
+		}
+		
+		// Empty response check
+		if(empty($this->raw_data)){
+			$this->error = "A feed could not be found at `$this->feed_url`. Empty body.";
+			$this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
+			return false;
+		}
+
+		// Set up array of possible encodings
+		$encodings = array();
+
+		// First check to see if input has been overridden.
+		if ($this->input_encoding !== false)
+		{
+			$encodings[] = strtoupper($this->input_encoding);
+		}
+
+		$application_types = array('application/xml', 'application/xml-dtd', 'application/xml-external-parsed-entity');
+		$text_types = array('text/xml', 'text/xml-external-parsed-entity');
+
+		// RFC 3023 (only applies to sniffed content)
+		if (isset($sniffed))
+		{
+			if (in_array($sniffed, $application_types) || substr($sniffed, 0, 12) === 'application/' && substr($sniffed, -4) === '+xml')
+			{
+				if (isset($headers['content-type']) && preg_match('/;\x20?charset=([^;]*)/i', $headers['content-type'], $charset))
+				{
+					$encodings[] = strtoupper($charset[1]);
+				}
+				$encodings = array_merge($encodings, $this->registry->call('Misc', 'xml_encoding', array($this->raw_data, &$this->registry)));
+				$encodings[] = 'UTF-8';
+			}
+			elseif (in_array($sniffed, $text_types) || substr($sniffed, 0, 5) === 'text/' && substr($sniffed, -4) === '+xml')
+			{
+				if (isset($headers['content-type']) && preg_match('/;\x20?charset=([^;]*)/i', $headers['content-type'], $charset))
+				{
+					$encodings[] = strtoupper($charset[1]);
+				}
+				$encodings[] = 'US-ASCII';
+			}
+			// Text MIME-type default
+			elseif (substr($sniffed, 0, 5) === 'text/')
+			{
+				$encodings[] = 'UTF-8';
+			}
+		}
+
+		// Fallback to XML 1.0 Appendix F.1/UTF-8/ISO-8859-1
+		$encodings = array_merge($encodings, $this->registry->call('Misc', 'xml_encoding', array($this->raw_data, &$this->registry)));
+		$encodings[] = 'UTF-8';
+		$encodings[] = 'ISO-8859-1';
+
+		// There's no point in trying an encoding twice
+		$encodings = array_unique($encodings);
+
+		// Loop through each possible encoding, till we return something, or run out of possibilities
+		foreach ($encodings as $encoding)
+		{
+			// Change the encoding to UTF-8 (as we always use UTF-8 internally)
+			if ($utf8_data = $this->registry->call('Misc', 'change_encoding', array($this->raw_data, $encoding, 'UTF-8')))
+			{
+				// Create new parser
+				$parser = $this->registry->create('Parser');
+
+				// If it's parsed fine
+				if ($parser->parse($utf8_data, 'UTF-8', $this->permanent_url))
+				{
+					$this->data = $parser->get_data();
+					if (!($this->get_type() & ~SIMPLEPIE_TYPE_NONE))
+					{
+						$this->error = "A feed could not be found at `$this->feed_url`. This does not appear to be a valid RSS or Atom feed.";
+						$this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
+						return false;
+					}
+
+					if (isset($headers))
+					{
+						$this->data['headers'] = $headers;
+					}
+					$this->data['build'] = SIMPLEPIE_BUILD;
+
+					// Cache the file if caching is enabled
+					if ($cache && !$cache->save($this))
+					{
+						trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
+					}
+					return true;
+				}
+			}
+		}
+
+		if (isset($parser))
+		{
+			// We have an error, just set SimplePie_Misc::error to it and quit
+			$this->error = $this->feed_url;
+			$this->error .= sprintf(' is invalid XML, likely due to invalid characters. XML error: %s at line %d, column %d', $parser->get_error_string(), $parser->get_current_line(), $parser->get_current_column());
+		}
+		else
+		{
+			$this->error = 'The data could not be converted to UTF-8.';
+			if (!extension_loaded('mbstring') && !extension_loaded('iconv') && !class_exists('\UConverter')) {
+				$this->error .= ' You MUST have either the iconv, mbstring or intl (PHP 5.5+) extension installed and enabled.';
+			} else {
+				$missingExtensions = array();
+				if (!extension_loaded('iconv')) {
+					$missingExtensions[] = 'iconv';
+				}
+				if (!extension_loaded('mbstring')) {
+					$missingExtensions[] = 'mbstring';
+				}
+				if (!class_exists('\UConverter')) {
+					$missingExtensions[] = 'intl (PHP 5.5+)';
+				}
+				$this->error .= ' Try installing/enabling the ' . implode(' or ', $missingExtensions) . ' extension.';
+			}
+		}
+
+		$this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
+
+		return false;
+	}
+
+	/**
+	 * Fetch the data via SimplePie_File
+	 *
+	 * If the data is already cached, attempt to fetch it from there instead
+	 * @param SimplePie_Cache|false $cache Cache handler, or false to not load from the cache
+	 * @return array|true Returns true if the data was loaded from the cache, or an array of HTTP headers and sniffed type
+	 */
+	protected function fetch_data(&$cache)
+	{
+		// If it's enabled, use the cache
+		if ($cache)
+		{
+			// Load the Cache
+			$this->data = $cache->load();
+			if (!empty($this->data))
+			{
+				// If the cache is for an outdated build of SimplePie
+				if (!isset($this->data['build']) || $this->data['build'] !== SIMPLEPIE_BUILD)
+				{
+					$cache->unlink();
+					$this->data = array();
+				}
+				// If we've hit a collision just rerun it with caching disabled
+				elseif (isset($this->data['url']) && $this->data['url'] !== $this->feed_url)
+				{
+					$cache = false;
+					$this->data = array();
+				}
+				// If we've got a non feed_url stored (if the page isn't actually a feed, or is a redirect) use that URL.
+				elseif (isset($this->data['feed_url']))
+				{
+					// If the autodiscovery cache is still valid use it.
+					if ($cache->mtime() + $this->autodiscovery_cache_duration > time())
+					{
+						// Do not need to do feed autodiscovery yet.
+						if ($this->data['feed_url'] !== $this->data['url'])
+						{
+							$this->set_feed_url($this->data['feed_url']);
+							return $this->init();
+						}
+
+						$cache->unlink();
+						$this->data = array();
+					}
+				}
+				// Check if the cache has been updated
+				elseif ($cache->mtime() + $this->cache_duration < time())
+				{
+					// Want to know if we tried to send last-modified and/or etag headers
+					// when requesting this file. (Note that it's up to the file to
+					// support this, but we don't always send the headers either.)
+					$this->check_modified = true;
+					if (isset($this->data['headers']['last-modified']) || isset($this->data['headers']['etag']))
+					{
+						$headers = array(
+							'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
+						);
+						if (isset($this->data['headers']['last-modified']))
+						{
+							$headers['if-modified-since'] = $this->data['headers']['last-modified'];
+						}
+						if (isset($this->data['headers']['etag']))
+						{
+							$headers['if-none-match'] = $this->data['headers']['etag'];
+						}
+
+						$file = $this->registry->create('File', array($this->feed_url, $this->timeout/10, 5, $headers, $this->useragent, $this->force_fsockopen, $this->curl_options));
+
+						if ($file->success)
+						{
+							if ($file->status_code === 304)
+							{
+								// Set raw_data to false here too, to signify that the cache
+								// is still valid.
+								$this->raw_data = false;
+								$cache->touch();
+								return true;
+							}
+						}
+						else
+						{
+							$this->check_modified = false;
+							if($this->force_cache_fallback)
+							{
+								$cache->touch();
+								return true;
+							}
+
+							unset($file);
+						}
+					}
+				}
+				// If the cache is still valid, just return true
+				else
+				{
+					$this->raw_data = false;
+					return true;
+				}
+			}
+			// If the cache is empty, delete it
+			else
+			{
+				$cache->unlink();
+				$this->data = array();
+			}
+		}
+		// If we don't already have the file (it'll only exist if we've opened it to check if the cache has been modified), open it.
+		if (!isset($file))
+		{
+			if ($this->file instanceof SimplePie_File && $this->file->url === $this->feed_url)
+			{
+				$file =& $this->file;
+			}
+			else
+			{
+				$headers = array(
+					'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
+				);
+				$file = $this->registry->create('File', array($this->feed_url, $this->timeout, 5, $headers, $this->useragent, $this->force_fsockopen, $this->curl_options));
+			}
+		}
+		// If the file connection has an error, set SimplePie::error to that and quit
+		if (!$file->success && !($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)))
+		{
+			$this->error = $file->error;
+			return !empty($this->data);
+		}
+
+		if (!$this->force_feed)
+		{
+			// Check if the supplied URL is a feed, if it isn't, look for it.
+			$locate = $this->registry->create('Locator', array(&$file, $this->timeout, $this->useragent, $this->max_checked_feeds));
+
+			if (!$locate->is_feed($file))
+			{
+				$copyStatusCode = $file->status_code;
+				$copyContentType = $file->headers['content-type'];
+				try
+				{
+					$microformats = false;
+					if (function_exists('Mf2\parse')) {
+						// Check for both h-feed and h-entry, as both a feed with no entries
+						// and a list of entries without an h-feed wrapper are both valid.
+						$position = 0;
+						while ($position = strpos($file->body, 'h-feed', $position))
+						{
+							$start = $position < 200 ? 0 : $position - 200;
+							$check = substr($file->body, $start, 400);
+							if ($microformats = preg_match('/class="[^"]*h-feed/', $check))
+							{
+								break;
+							}
+							$position += 7;
+						}
+						$position = 0;
+						while ($position = strpos($file->body, 'h-entry', $position))
+						{
+							$start = $position < 200 ? 0 : $position - 200;
+							$check = substr($file->body, $start, 400);
+							if ($microformats = preg_match('/class="[^"]*h-entry/', $check))
+							{
+								break;
+							}
+							$position += 7;
+						}
+					}
+					// Now also do feed discovery, but if an h-entry was found don't
+					// overwrite the current value of file.
+					$discovered = $locate->find($this->autodiscovery,
+					                            $this->all_discovered_feeds);
+					if ($microformats)
+					{
+						if ($hub = $locate->get_rel_link('hub'))
+						{
+							$self = $locate->get_rel_link('self');
+							$this->store_links($file, $hub, $self);
+						}
+						// Push the current file onto all_discovered feeds so the user can
+						// be shown this as one of the options.
+						if (isset($this->all_discovered_feeds)) {
+							$this->all_discovered_feeds[] = $file;
+						}
+					}
+					else
+					{
+						if ($discovered)
+						{
+							$file = $discovered;
+						}
+						else
+						{
+							// We need to unset this so that if SimplePie::set_file() has
+							// been called that object is untouched
+							unset($file);
+							$this->error = "A feed could not be found at `$this->feed_url`; the status code is `$copyStatusCode` and content-type is `$copyContentType`";
+							$this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__));
+							return false;
+						}
+					}
+				}
+				catch (SimplePie_Exception $e)
+				{
+					// We need to unset this so that if SimplePie::set_file() has been called that object is untouched
+					unset($file);
+					// This is usually because DOMDocument doesn't exist
+					$this->error = $e->getMessage();
+					$this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, $e->getFile(), $e->getLine()));
+					return false;
+				}
+				if ($cache)
+				{
+					$this->data = array('url' => $this->feed_url, 'feed_url' => $file->url, 'build' => SIMPLEPIE_BUILD);
+					if (!$cache->save($this))
+					{
+						trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
+					}
+					$cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, call_user_func($this->cache_name_function, $file->url), 'spc'));
+				}
+				$this->feed_url = $file->url;
+			}
+			$locate = null;
+		}
+
+		$this->raw_data = $file->body;
+		$this->permanent_url = $file->permanent_url;
+		$headers = $file->headers;
+		$sniffer = $this->registry->create('Content_Type_Sniffer', array(&$file));
+		$sniffed = $sniffer->get_type();
+
+		return array($headers, $sniffed);
+	}
+
+	/**
+	 * Get the error message for the occured error
+	 *
+	 * @return string|array Error message, or array of messages for multifeeds
+	 */
+	public function error()
+	{
+		return $this->error;
+	}
+
+	/**
+	 * Get the raw XML
+	 *
+	 * This is the same as the old `$feed->enable_xml_dump(true)`, but returns
+	 * the data instead of printing it.
+	 *
+	 * @return string|boolean Raw XML data, false if the cache is used
+	 */
+	public function get_raw_data()
+	{
+		return $this->raw_data;
+	}
+
+	/**
+	 * Get the character encoding used for output
+	 *
+	 * @since Preview Release
+	 * @return string
+	 */
+	public function get_encoding()
+	{
+		return $this->sanitize->output_encoding;
+	}
+
+	/**
+	 * Send the content-type header with correct encoding
+	 *
+	 * This method ensures that the SimplePie-enabled page is being served with
+	 * the correct {@link http://www.iana.org/assignments/media-types/ mime-type}
+	 * and character encoding HTTP headers (character encoding determined by the
+	 * {@see set_output_encoding} config option).
+	 *
+	 * This won't work properly if any content or whitespace has already been
+	 * sent to the browser, because it relies on PHP's
+	 * {@link http://php.net/header header()} function, and these are the
+	 * circumstances under which the function works.
+	 *
+	 * Because it's setting these settings for the entire page (as is the nature
+	 * of HTTP headers), this should only be used once per page (again, at the
+	 * top).
+	 *
+	 * @param string $mime MIME type to serve the page as
+	 */
+	public function handle_content_type($mime = 'text/html')
+	{
+		if (!headers_sent())
+		{
+			$header = "Content-type: $mime;";
+			if ($this->get_encoding())
+			{
+				$header .= ' charset=' . $this->get_encoding();
+			}
+			else
+			{
+				$header .= ' charset=UTF-8';
+			}
+			header($header);
+		}
+	}
+
+	/**
+	 * Get the type of the feed
+	 *
+	 * This returns a SIMPLEPIE_TYPE_* constant, which can be tested against
+	 * using {@link http://php.net/language.operators.bitwise bitwise operators}
+	 *
+	 * @since 0.8 (usage changed to using constants in 1.0)
+	 * @see SIMPLEPIE_TYPE_NONE Unknown.
+	 * @see SIMPLEPIE_TYPE_RSS_090 RSS 0.90.
+	 * @see SIMPLEPIE_TYPE_RSS_091_NETSCAPE RSS 0.91 (Netscape).
+	 * @see SIMPLEPIE_TYPE_RSS_091_USERLAND RSS 0.91 (Userland).
+	 * @see SIMPLEPIE_TYPE_RSS_091 RSS 0.91.
+	 * @see SIMPLEPIE_TYPE_RSS_092 RSS 0.92.
+	 * @see SIMPLEPIE_TYPE_RSS_093 RSS 0.93.
+	 * @see SIMPLEPIE_TYPE_RSS_094 RSS 0.94.
+	 * @see SIMPLEPIE_TYPE_RSS_10 RSS 1.0.
+	 * @see SIMPLEPIE_TYPE_RSS_20 RSS 2.0.x.
+	 * @see SIMPLEPIE_TYPE_RSS_RDF RDF-based RSS.
+	 * @see SIMPLEPIE_TYPE_RSS_SYNDICATION Non-RDF-based RSS (truly intended as syndication format).
+	 * @see SIMPLEPIE_TYPE_RSS_ALL Any version of RSS.
+	 * @see SIMPLEPIE_TYPE_ATOM_03 Atom 0.3.
+	 * @see SIMPLEPIE_TYPE_ATOM_10 Atom 1.0.
+	 * @see SIMPLEPIE_TYPE_ATOM_ALL Any version of Atom.
+	 * @see SIMPLEPIE_TYPE_ALL Any known/supported feed type.
+	 * @return int SIMPLEPIE_TYPE_* constant
+	 */
+	public function get_type()
+	{
+		if (!isset($this->data['type']))
+		{
+			$this->data['type'] = SIMPLEPIE_TYPE_ALL;
+			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed']))
+			{
+				$this->data['type'] &= SIMPLEPIE_TYPE_ATOM_10;
+			}
+			elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed']))
+			{
+				$this->data['type'] &= SIMPLEPIE_TYPE_ATOM_03;
+			}
+			elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF']))
+			{
+				if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['channel'])
+				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['image'])
+				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['item'])
+				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['textinput']))
+				{
+					$this->data['type'] &= SIMPLEPIE_TYPE_RSS_10;
+				}
+				if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_090]['channel'])
+				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_090]['image'])
+				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_090]['item'])
+				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_090]['textinput']))
+				{
+					$this->data['type'] &= SIMPLEPIE_TYPE_RSS_090;
+				}
+			}
+			elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss']))
+			{
+				$this->data['type'] &= SIMPLEPIE_TYPE_RSS_ALL;
+				if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['attribs']['']['version']))
+				{
+					switch (trim($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['attribs']['']['version']))
+					{
+						case '0.91':
+							$this->data['type'] &= SIMPLEPIE_TYPE_RSS_091;
+							if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['skiphours']['hour'][0]['data']))
+							{
+								switch (trim($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['skiphours']['hour'][0]['data']))
+								{
+									case '0':
+										$this->data['type'] &= SIMPLEPIE_TYPE_RSS_091_NETSCAPE;
+										break;
+
+									case '24':
+										$this->data['type'] &= SIMPLEPIE_TYPE_RSS_091_USERLAND;
+										break;
+								}
+							}
+							break;
+
+						case '0.92':
+							$this->data['type'] &= SIMPLEPIE_TYPE_RSS_092;
+							break;
+
+						case '0.93':
+							$this->data['type'] &= SIMPLEPIE_TYPE_RSS_093;
+							break;
+
+						case '0.94':
+							$this->data['type'] &= SIMPLEPIE_TYPE_RSS_094;
+							break;
+
+						case '2.0':
+							$this->data['type'] &= SIMPLEPIE_TYPE_RSS_20;
+							break;
+					}
+				}
+			}
+			else
+			{
+				$this->data['type'] = SIMPLEPIE_TYPE_NONE;
+			}
+		}
+		return $this->data['type'];
+	}
+
+	/**
+	 * Get the URL for the feed
+	 * 
+	 * When the 'permanent' mode is enabled, returns the original feed URL,
+	 * except in the case of an `HTTP 301 Moved Permanently` status response,
+	 * in which case the location of the first redirection is returned.
+	 *
+	 * When the 'permanent' mode is disabled (default),
+	 * may or may not be different from the URL passed to {@see set_feed_url()},
+	 * depending on whether auto-discovery was used.
+	 *
+	 * @since Preview Release (previously called `get_feed_url()` since SimplePie 0.8.)
+	 * @todo Support <itunes:new-feed-url>
+	 * @todo Also, |atom:link|@rel=self
+	 * @param bool $permanent Permanent mode to return only the original URL or the first redirection
+	 * iff it is a 301 redirection
+	 * @return string|null
+	 */
+	public function subscribe_url($permanent = false)
+	{
+		if ($permanent)
+		{
+			if ($this->permanent_url !== null)
+			{
+				// sanitize encodes ampersands which are required when used in a url.
+				return str_replace('&amp;', '&',
+				                   $this->sanitize($this->permanent_url,
+				                                   SIMPLEPIE_CONSTRUCT_IRI));
+			}
+		}
+		else
+		{
+			if ($this->feed_url !== null)
+			{
+				return str_replace('&amp;', '&',
+				                   $this->sanitize($this->feed_url,
+				                                   SIMPLEPIE_CONSTRUCT_IRI));
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Get data for an feed-level element
+	 *
+	 * This method allows you to get access to ANY element/attribute that is a
+	 * sub-element of the opening feed tag.
+	 *
+	 * The return value is an indexed array of elements matching the given
+	 * namespace and tag name. Each element has `attribs`, `data` and `child`
+	 * subkeys. For `attribs` and `child`, these contain namespace subkeys.
+	 * `attribs` then has one level of associative name => value data (where
+	 * `value` is a string) after the namespace. `child` has tag-indexed keys
+	 * after the namespace, each member of which is an indexed array matching
+	 * this same format.
+	 *
+	 * For example:
+	 * <pre>
+	 * // This is probably a bad example because we already support
+	 * // <media:content> natively, but it shows you how to parse through
+	 * // the nodes.
+	 * $group = $item->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'group');
+	 * $content = $group[0]['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'];
+	 * $file = $content[0]['attribs']['']['url'];
+	 * echo $file;
+	 * </pre>
+	 *
+	 * @since 1.0
+	 * @see http://simplepie.org/wiki/faq/supported_xml_namespaces
+	 * @param string $namespace The URL of the XML namespace of the elements you're trying to access
+	 * @param string $tag Tag name
+	 * @return array
+	 */
+	public function get_feed_tags($namespace, $tag)
+	{
+		$type = $this->get_type();
+		if ($type & SIMPLEPIE_TYPE_ATOM_10)
+		{
+			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['child'][$namespace][$tag]))
+			{
+				return $this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['child'][$namespace][$tag];
+			}
+		}
+		if ($type & SIMPLEPIE_TYPE_ATOM_03)
+		{
+			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['child'][$namespace][$tag]))
+			{
+				return $this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['child'][$namespace][$tag];
+			}
+		}
+		if ($type & SIMPLEPIE_TYPE_RSS_RDF)
+		{
+			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][$namespace][$tag]))
+			{
+				return $this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][$namespace][$tag];
+			}
+		}
+		if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
+		{
+			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][$namespace][$tag]))
+			{
+				return $this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][$namespace][$tag];
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Get data for an channel-level element
+	 *
+	 * This method allows you to get access to ANY element/attribute in the
+	 * channel/header section of the feed.
+	 *
+	 * See {@see SimplePie::get_feed_tags()} for a description of the return value
+	 *
+	 * @since 1.0
+	 * @see http://simplepie.org/wiki/faq/supported_xml_namespaces
+	 * @param string $namespace The URL of the XML namespace of the elements you're trying to access
+	 * @param string $tag Tag name
+	 * @return array
+	 */
+	public function get_channel_tags($namespace, $tag)
+	{
+		$type = $this->get_type();
+		if ($type & SIMPLEPIE_TYPE_ATOM_ALL)
+		{
+			if ($return = $this->get_feed_tags($namespace, $tag))
+			{
+				return $return;
+			}
+		}
+		if ($type & SIMPLEPIE_TYPE_RSS_10)
+		{
+			if ($channel = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'channel'))
+			{
+				if (isset($channel[0]['child'][$namespace][$tag]))
+				{
+					return $channel[0]['child'][$namespace][$tag];
+				}
+			}
+		}
+		if ($type & SIMPLEPIE_TYPE_RSS_090)
+		{
+			if ($channel = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'channel'))
+			{
+				if (isset($channel[0]['child'][$namespace][$tag]))
+				{
+					return $channel[0]['child'][$namespace][$tag];
+				}
+			}
+		}
+		if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
+		{
+			if ($channel = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'channel'))
+			{
+				if (isset($channel[0]['child'][$namespace][$tag]))
+				{
+					return $channel[0]['child'][$namespace][$tag];
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Get data for an channel-level element
+	 *
+	 * This method allows you to get access to ANY element/attribute in the
+	 * image/logo section of the feed.
+	 *
+	 * See {@see SimplePie::get_feed_tags()} for a description of the return value
+	 *
+	 * @since 1.0
+	 * @see http://simplepie.org/wiki/faq/supported_xml_namespaces
+	 * @param string $namespace The URL of the XML namespace of the elements you're trying to access
+	 * @param string $tag Tag name
+	 * @return array
+	 */
+	public function get_image_tags($namespace, $tag)
+	{
+		$type = $this->get_type();
+		if ($type & SIMPLEPIE_TYPE_RSS_10)
+		{
+			if ($image = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'image'))
+			{
+				if (isset($image[0]['child'][$namespace][$tag]))
+				{
+					return $image[0]['child'][$namespace][$tag];
+				}
+			}
+		}
+		if ($type & SIMPLEPIE_TYPE_RSS_090)
+		{
+			if ($image = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'image'))
+			{
+				if (isset($image[0]['child'][$namespace][$tag]))
+				{
+					return $image[0]['child'][$namespace][$tag];
+				}
+			}
+		}
+		if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
+		{
+			if ($image = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'image'))
+			{
+				if (isset($image[0]['child'][$namespace][$tag]))
+				{
+					return $image[0]['child'][$namespace][$tag];
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Get the base URL value from the feed
+	 *
+	 * Uses `<xml:base>` if available, otherwise uses the first link in the
+	 * feed, or failing that, the URL of the feed itself.
+	 *
+	 * @see get_link
+	 * @see subscribe_url
+	 *
+	 * @param array $element
+	 * @return string
+	 */
+	public function get_base($element = array())
+	{
+		if (!($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION) && !empty($element['xml_base_explicit']) && isset($element['xml_base']))
+		{
+			return $element['xml_base'];
+		}
+		elseif ($this->get_link() !== null)
+		{
+			return $this->get_link();
+		}
+		else
+		{
+			return $this->subscribe_url();
+		}
+	}
+
+	/**
+	 * Sanitize feed data
+	 *
+	 * @access private
+	 * @see SimplePie_Sanitize::sanitize()
+	 * @param string $data Data to sanitize
+	 * @param int $type One of the SIMPLEPIE_CONSTRUCT_* constants
+	 * @param string $base Base URL to resolve URLs against
+	 * @return string Sanitized data
+	 */
+	public function sanitize($data, $type, $base = '')
+	{
+		try
+		{
+			return $this->sanitize->sanitize($data, $type, $base);
+		}
+		catch (SimplePie_Exception $e)
+		{
+			if (!$this->enable_exceptions)
+			{
+				$this->error = $e->getMessage();
+				$this->registry->call('Misc', 'error', array($this->error, E_USER_WARNING, $e->getFile(), $e->getLine()));
+				return '';
+			}
+
+			throw $e;
+		}
+	}
+
+	/**
+	 * Get the title of the feed
+	 *
+	 * Uses `<atom:title>`, `<title>` or `<dc:title>`
+	 *
+	 * @since 1.0 (previously called `get_feed_title` since 0.8)
+	 * @return string|null
+	 */
+	public function get_title()
+	{
+		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get a category for the feed
+	 *
+	 * @since Unknown
+	 * @param int $key The category that you want to return. Remember that arrays begin with 0, not 1
+	 * @return SimplePie_Category|null
+	 */
+	public function get_category($key = 0)
+	{
+		$categories = $this->get_categories();
+		if (isset($categories[$key]))
+		{
+			return $categories[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all categories for the feed
+	 *
+	 * Uses `<atom:category>`, `<category>` or `<dc:subject>`
+	 *
+	 * @since Unknown
+	 * @return array|null List of {@see SimplePie_Category} objects
+	 */
+	public function get_categories()
+	{
+		$categories = array();
+
+		foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'category') as $category)
+		{
+			$term = null;
+			$scheme = null;
+			$label = null;
+			if (isset($category['attribs']['']['term']))
+			{
+				$term = $this->sanitize($category['attribs']['']['term'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($category['attribs']['']['scheme']))
+			{
+				$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($category['attribs']['']['label']))
+			{
+				$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			$categories[] = $this->registry->create('Category', array($term, $scheme, $label));
+		}
+		foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'category') as $category)
+		{
+			// This is really the label, but keep this as the term also for BC.
+			// Label will also work on retrieving because that falls back to term.
+			$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			if (isset($category['attribs']['']['domain']))
+			{
+				$scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			else
+			{
+				$scheme = null;
+			}
+			$categories[] = $this->registry->create('Category', array($term, $scheme, null));
+		}
+		foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category)
+		{
+			$categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
+		}
+		foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'subject') as $category)
+		{
+			$categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
+		}
+
+		if (!empty($categories))
+		{
+			return array_unique($categories);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get an author for the feed
+	 *
+	 * @since 1.1
+	 * @param int $key The author that you want to return. Remember that arrays begin with 0, not 1
+	 * @return SimplePie_Author|null
+	 */
+	public function get_author($key = 0)
+	{
+		$authors = $this->get_authors();
+		if (isset($authors[$key]))
+		{
+			return $authors[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all authors for the feed
+	 *
+	 * Uses `<atom:author>`, `<author>`, `<dc:creator>` or `<itunes:author>`
+	 *
+	 * @since 1.1
+	 * @return array|null List of {@see SimplePie_Author} objects
+	 */
+	public function get_authors()
+	{
+		$authors = array();
+		foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'author') as $author)
+		{
+			$name = null;
+			$uri = null;
+			$email = null;
+			if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']))
+			{
+				$name = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']))
+			{
+				$uri = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]));
+			}
+			if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data']))
+			{
+				$email = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if ($name !== null || $email !== null || $uri !== null)
+			{
+				$authors[] = $this->registry->create('Author', array($name, $uri, $email));
+			}
+		}
+		if ($author = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'author'))
+		{
+			$name = null;
+			$url = null;
+			$email = null;
+			if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data']))
+			{
+				$name = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data']))
+			{
+				$url = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]));
+			}
+			if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data']))
+			{
+				$email = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if ($name !== null || $email !== null || $url !== null)
+			{
+				$authors[] = $this->registry->create('Author', array($name, $url, $email));
+			}
+		}
+		foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'creator') as $author)
+		{
+			$authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
+		}
+		foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'creator') as $author)
+		{
+			$authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
+		}
+		foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'author') as $author)
+		{
+			$authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
+		}
+
+		if (!empty($authors))
+		{
+			return array_unique($authors);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get a contributor for the feed
+	 *
+	 * @since 1.1
+	 * @param int $key The contrbutor that you want to return. Remember that arrays begin with 0, not 1
+	 * @return SimplePie_Author|null
+	 */
+	public function get_contributor($key = 0)
+	{
+		$contributors = $this->get_contributors();
+		if (isset($contributors[$key]))
+		{
+			return $contributors[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all contributors for the feed
+	 *
+	 * Uses `<atom:contributor>`
+	 *
+	 * @since 1.1
+	 * @return array|null List of {@see SimplePie_Author} objects
+	 */
+	public function get_contributors()
+	{
+		$contributors = array();
+		foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'contributor') as $contributor)
+		{
+			$name = null;
+			$uri = null;
+			$email = null;
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']))
+			{
+				$name = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']))
+			{
+				$uri = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]));
+			}
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data']))
+			{
+				$email = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if ($name !== null || $email !== null || $uri !== null)
+			{
+				$contributors[] = $this->registry->create('Author', array($name, $uri, $email));
+			}
+		}
+		foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'contributor') as $contributor)
+		{
+			$name = null;
+			$url = null;
+			$email = null;
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data']))
+			{
+				$name = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data']))
+			{
+				$url = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]));
+			}
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data']))
+			{
+				$email = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if ($name !== null || $email !== null || $url !== null)
+			{
+				$contributors[] = $this->registry->create('Author', array($name, $url, $email));
+			}
+		}
+
+		if (!empty($contributors))
+		{
+			return array_unique($contributors);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get a single link for the feed
+	 *
+	 * @since 1.0 (previously called `get_feed_link` since Preview Release, `get_feed_permalink()` since 0.8)
+	 * @param int $key The link that you want to return. Remember that arrays begin with 0, not 1
+	 * @param string $rel The relationship of the link to return
+	 * @return string|null Link URL
+	 */
+	public function get_link($key = 0, $rel = 'alternate')
+	{
+		$links = $this->get_links($rel);
+		if (isset($links[$key]))
+		{
+			return $links[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the permalink for the item
+	 *
+	 * Returns the first link available with a relationship of "alternate".
+	 * Identical to {@see get_link()} with key 0
+	 *
+	 * @see get_link
+	 * @since 1.0 (previously called `get_feed_link` since Preview Release, `get_feed_permalink()` since 0.8)
+	 * @internal Added for parity between the parent-level and the item/entry-level.
+	 * @return string|null Link URL
+	 */
+	public function get_permalink()
+	{
+		return $this->get_link(0);
+	}
+
+	/**
+	 * Get all links for the feed
+	 *
+	 * Uses `<atom:link>` or `<link>`
+	 *
+	 * @since Beta 2
+	 * @param string $rel The relationship of links to return
+	 * @return array|null Links found for the feed (strings)
+	 */
+	public function get_links($rel = 'alternate')
+	{
+		if (!isset($this->data['links']))
+		{
+			$this->data['links'] = array();
+			if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link'))
+			{
+				foreach ($links as $link)
+				{
+					if (isset($link['attribs']['']['href']))
+					{
+						$link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
+						$this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
+					}
+				}
+			}
+			if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'link'))
+			{
+				foreach ($links as $link)
+				{
+					if (isset($link['attribs']['']['href']))
+					{
+						$link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
+						$this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
+
+					}
+				}
+			}
+			if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link'))
+			{
+				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+			}
+			if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
+			{
+				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+			}
+			if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
+			{
+				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+			}
+
+			$keys = array_keys($this->data['links']);
+			foreach ($keys as $key)
+			{
+				if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key)))
+				{
+					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
+					{
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
+						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
+					}
+					else
+					{
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
+					}
+				}
+				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
+				{
+					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
+				}
+				$this->data['links'][$key] = array_unique($this->data['links'][$key]);
+			}
+		}
+
+		if (isset($this->data['links'][$rel]))
+		{
+			return $this->data['links'][$rel];
+		}
+		else if (isset($this->data['headers']['link']) &&
+		         preg_match('/<([^>]+)>; rel='.preg_quote($rel).'/',
+		                    $this->data['headers']['link'], $match))
+		{
+			return array($match[1]);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_all_discovered_feeds()
+	{
+		return $this->all_discovered_feeds;
+	}
+
+	/**
+	 * Get the content for the item
+	 *
+	 * Uses `<atom:subtitle>`, `<atom:tagline>`, `<description>`,
+	 * `<dc:description>`, `<itunes:summary>` or `<itunes:subtitle>`
+	 *
+	 * @since 1.0 (previously called `get_feed_description()` since 0.8)
+	 * @return string|null
+	 */
+	public function get_description()
+	{
+		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'subtitle'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the copyright info for the feed
+	 *
+	 * Uses `<atom:rights>`, `<atom:copyright>` or `<dc:rights>`
+	 *
+	 * @since 1.0 (previously called `get_feed_copyright()` since 0.8)
+	 * @return string|null
+	 */
+	public function get_copyright()
+	{
+		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'rights'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the language for the feed
+	 *
+	 * Uses `<language>`, `<dc:language>`, or @xml_lang
+	 *
+	 * @since 1.0 (previously called `get_feed_language()` since 0.8)
+	 * @return string|null
+	 */
+	public function get_language()
+	{
+		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'language'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang']))
+		{
+			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang']))
+		{
+			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang']))
+		{
+			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif (isset($this->data['headers']['content-language']))
+		{
+			return $this->sanitize($this->data['headers']['content-language'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the latitude coordinates for the item
+	 *
+	 * Compatible with the W3C WGS84 Basic Geo and GeoRSS specifications
+	 *
+	 * Uses `<geo:lat>` or `<georss:point>`
+	 *
+	 * @since 1.0
+	 * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
+	 * @link http://www.georss.org/ GeoRSS
+	 * @return string|null
+	 */
+	public function get_latitude()
+	{
+
+		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
+		{
+			return (float) $return[0]['data'];
+		}
+		elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		{
+			return (float) $match[1];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the longitude coordinates for the feed
+	 *
+	 * Compatible with the W3C WGS84 Basic Geo and GeoRSS specifications
+	 *
+	 * Uses `<geo:long>`, `<geo:lon>` or `<georss:point>`
+	 *
+	 * @since 1.0
+	 * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
+	 * @link http://www.georss.org/ GeoRSS
+	 * @return string|null
+	 */
+	public function get_longitude()
+	{
+		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
+		{
+			return (float) $return[0]['data'];
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
+		{
+			return (float) $return[0]['data'];
+		}
+		elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		{
+			return (float) $match[2];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the feed logo's title
+	 *
+	 * RSS 0.9.0, 1.0 and 2.0 feeds are allowed to have a "feed logo" title.
+	 *
+	 * Uses `<image><title>` or `<image><dc:title>`
+	 *
+	 * @return string|null
+	 */
+	public function get_image_title()
+	{
+		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the feed logo's URL
+	 *
+	 * RSS 0.9.0, 2.0, Atom 1.0, and feeds with iTunes RSS tags are allowed to
+	 * have a "feed logo" URL. This points directly to the image itself.
+	 *
+	 * Uses `<itunes:image>`, `<atom:logo>`, `<atom:icon>`,
+	 * `<image><title>` or `<image><dc:title>`
+	 *
+	 * @return string|null
+	 */
+	public function get_image_url()
+	{
+		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'image'))
+		{
+			return $this->sanitize($return[0]['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI);
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'url'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'url'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+
+	/**
+	 * Get the feed logo's link
+	 *
+	 * RSS 0.9.0, 1.0 and 2.0 feeds are allowed to have a "feed logo" link. This
+	 * points to a human-readable page that the image should link to.
+	 *
+	 * Uses `<itunes:image>`, `<atom:logo>`, `<atom:icon>`,
+	 * `<image><title>` or `<image><dc:title>`
+	 *
+	 * @return string|null
+	 */
+	public function get_image_link()
+	{
+		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the feed logo's link
+	 *
+	 * RSS 2.0 feeds are allowed to have a "feed logo" width.
+	 *
+	 * Uses `<image><width>` or defaults to 88.0 if no width is specified and
+	 * the feed is an RSS 2.0 feed.
+	 *
+	 * @return int|float|null
+	 */
+	public function get_image_width()
+	{
+		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'width'))
+		{
+			return round($return[0]['data']);
+		}
+		elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
+		{
+			return 88.0;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the feed logo's height
+	 *
+	 * RSS 2.0 feeds are allowed to have a "feed logo" height.
+	 *
+	 * Uses `<image><height>` or defaults to 31.0 if no height is specified and
+	 * the feed is an RSS 2.0 feed.
+	 *
+	 * @return int|float|null
+	 */
+	public function get_image_height()
+	{
+		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'height'))
+		{
+			return round($return[0]['data']);
+		}
+		elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url'))
+		{
+			return 31.0;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the number of items in the feed
+	 *
+	 * This is well-suited for {@link http://php.net/for for()} loops with
+	 * {@see get_item()}
+	 *
+	 * @param int $max Maximum value to return. 0 for no limit
+	 * @return int Number of items in the feed
+	 */
+	public function get_item_quantity($max = 0)
+	{
+		$max = (int) $max;
+		$qty = count($this->get_items());
+		if ($max === 0)
+		{
+			return $qty;
+		}
+		else
+		{
+			return ($qty > $max) ? $max : $qty;
+		}
+	}
+
+	/**
+	 * Get a single item from the feed
+	 *
+	 * This is better suited for {@link http://php.net/for for()} loops, whereas
+	 * {@see get_items()} is better suited for
+	 * {@link http://php.net/foreach foreach()} loops.
+	 *
+	 * @see get_item_quantity()
+	 * @since Beta 2
+	 * @param int $key The item that you want to return. Remember that arrays begin with 0, not 1
+	 * @return SimplePie_Item|null
+	 */
+	public function get_item($key = 0)
+	{
+		$items = $this->get_items();
+		if (isset($items[$key]))
+		{
+			return $items[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all items from the feed
+	 *
+	 * This is better suited for {@link http://php.net/for for()} loops, whereas
+	 * {@see get_items()} is better suited for
+	 * {@link http://php.net/foreach foreach()} loops.
+	 *
+	 * @see get_item_quantity
+	 * @since Beta 2
+	 * @param int $start Index to start at
+	 * @param int $end Number of items to return. 0 for all items after `$start`
+	 * @return SimplePie_Item[]|null List of {@see SimplePie_Item} objects
+	 */
+	public function get_items($start = 0, $end = 0)
+	{
+		if (!isset($this->data['items']))
+		{
+			if (!empty($this->multifeed_objects))
+			{
+				$this->data['items'] = SimplePie::merge_items($this->multifeed_objects, $start, $end, $this->item_limit);
+				if (empty($this->data['items']))
+				{
+					return array();
+				}
+				return $this->data['items'];
+			}
+			$this->data['items'] = array();
+			if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'entry'))
+			{
+				$keys = array_keys($items);
+				foreach ($keys as $key)
+				{
+					$this->data['items'][] = $this->registry->create('Item', array($this, $items[$key]));
+				}
+			}
+			if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'entry'))
+			{
+				$keys = array_keys($items);
+				foreach ($keys as $key)
+				{
+					$this->data['items'][] = $this->registry->create('Item', array($this, $items[$key]));
+				}
+			}
+			if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'item'))
+			{
+				$keys = array_keys($items);
+				foreach ($keys as $key)
+				{
+					$this->data['items'][] = $this->registry->create('Item', array($this, $items[$key]));
+				}
+			}
+			if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'item'))
+			{
+				$keys = array_keys($items);
+				foreach ($keys as $key)
+				{
+					$this->data['items'][] = $this->registry->create('Item', array($this, $items[$key]));
+				}
+			}
+			if ($items = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'item'))
+			{
+				$keys = array_keys($items);
+				foreach ($keys as $key)
+				{
+					$this->data['items'][] = $this->registry->create('Item', array($this, $items[$key]));
+				}
+			}
+		}
+
+		if (empty($this->data['items']))
+		{
+			return array();
+		}
+
+		if ($this->order_by_date)
+		{
+			if (!isset($this->data['ordered_items']))
+			{
+				$this->data['ordered_items'] = $this->data['items'];
+				usort($this->data['ordered_items'], array(get_class($this), 'sort_items'));
+		 	}
+			$items = $this->data['ordered_items'];
+		}
+		else
+		{
+			$items = $this->data['items'];
+		}
+		// Slice the data as desired
+		if ($end === 0)
+		{
+			return array_slice($items, $start);
+		}
+		else
+		{
+			return array_slice($items, $start, $end);
+		}
+	}
+
+	/**
+	 * Set the favicon handler
+	 *
+	 * @deprecated Use your own favicon handling instead
+	 */
+	public function set_favicon_handler($page = false, $qs = 'i')
+	{
+		$level = defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_WARNING;
+		trigger_error('Favicon handling has been removed, please use your own handling', $level);
+		return false;
+	}
+
+	/**
+	 * Get the favicon for the current feed
+	 *
+	 * @deprecated Use your own favicon handling instead
+	 */
+	public function get_favicon()
+	{
+		$level = defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_WARNING;
+		trigger_error('Favicon handling has been removed, please use your own handling', $level);
+
+		if (($url = $this->get_link()) !== null)
+		{
+			return 'http://g.etfv.co/' . urlencode($url);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Magic method handler
+	 *
+	 * @param string $method Method name
+	 * @param array $args Arguments to the method
+	 * @return mixed
+	 */
+	public function __call($method, $args)
+	{
+		if (strpos($method, 'subscribe_') === 0)
+		{
+			$level = defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_WARNING;
+			trigger_error('subscribe_*() has been deprecated, implement the callback yourself', $level);
+			return '';
+		}
+		if ($method === 'enable_xml_dump')
+		{
+			$level = defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_WARNING;
+			trigger_error('enable_xml_dump() has been deprecated, use get_raw_data() instead', $level);
+			return false;
+		}
+
+		$class = get_class($this);
+		$trace = debug_backtrace();
+		$file = $trace[0]['file'];
+		$line = $trace[0]['line'];
+		trigger_error("Call to undefined method $class::$method() in $file on line $line", E_USER_ERROR);
+	}
+
+	/**
+	 * Sorting callback for items
+	 *
+	 * @access private
+	 * @param SimplePie $a
+	 * @param SimplePie $b
+	 * @return boolean
+	 */
+	public static function sort_items($a, $b)
+	{
+		$a_date = $a->get_date('U');
+		$b_date = $b->get_date('U');
+		if ($a_date && $b_date) {
+			return $a_date > $b_date ? -1 : 1;
+		}
+		// Sort items without dates to the top.
+		if ($a_date) {
+			return 1;
+		}
+		if ($b_date) {
+			return -1;
+		}
+		return 0;
+	}
+
+	/**
+	 * Merge items from several feeds into one
+	 *
+	 * If you're merging multiple feeds together, they need to all have dates
+	 * for the items or else SimplePie will refuse to sort them.
+	 *
+	 * @link http://simplepie.org/wiki/tutorial/sort_multiple_feeds_by_time_and_date#if_feeds_require_separate_per-feed_settings
+	 * @param array $urls List of SimplePie feed objects to merge
+	 * @param int $start Starting item
+	 * @param int $end Number of items to return
+	 * @param int $limit Maximum number of items per feed
+	 * @return array
+	 */
+	public static function merge_items($urls, $start = 0, $end = 0, $limit = 0)
+	{
+		if (is_array($urls) && sizeof($urls) > 0)
+		{
+			$items = array();
+			foreach ($urls as $arg)
+			{
+				if ($arg instanceof SimplePie)
+				{
+					$items = array_merge($items, $arg->get_items(0, $limit));
+				}
+				else
+				{
+					trigger_error('Arguments must be SimplePie objects', E_USER_WARNING);
+				}
+			}
+
+			usort($items, array(get_class($urls[0]), 'sort_items'));
+
+			if ($end === 0)
+			{
+				return array_slice($items, $start);
+			}
+			else
+			{
+				return array_slice($items, $start, $end);
+			}
+		}
+		else
+		{
+			trigger_error('Cannot merge zero SimplePie objects', E_USER_WARNING);
+			return array();
+		}
+	}
+
+	/**
+	 * Store PubSubHubbub links as headers
+	 *
+	 * There is no way to find PuSH links in the body of a microformats feed,
+	 * so they are added to the headers when found, to be used later by get_links.
+	 * @param SimplePie_File $file
+	 * @param string $hub
+	 * @param string $self
+	 */
+	private function store_links(&$file, $hub, $self) {
+		if (isset($file->headers['link']['hub']) ||
+			  (isset($file->headers['link']) &&
+			   preg_match('/rel=hub/', $file->headers['link'])))
+		{
+			return;
+		}
+
+		if ($hub)
+		{
+			if (isset($file->headers['link']))
+			{
+				if ($file->headers['link'] !== '')
+				{
+					$file->headers['link'] = ', ';
+				}
+			}
+			else
+			{
+				$file->headers['link'] = '';
+			}
+			$file->headers['link'] .= '<'.$hub.'>; rel=hub';
+			if ($self)
+			{
+				$file->headers['link'] .= ', <'.$self.'>; rel=self';
+			}
+		}
+	}
+}
diff --git a/lib/vendor/simplepie/SimplePie/Author.php b/lib/vendor/simplepie/SimplePie/Author.php
new file mode 100644
index 000000000..e6768ff29
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Author.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Manages all author-related data
+ *
+ * Used by {@see SimplePie_Item::get_author()} and {@see SimplePie::get_authors()}
+ *
+ * This class can be overloaded with {@see SimplePie::set_author_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie_Author
+{
+	/**
+	 * Author's name
+	 *
+	 * @var string
+	 * @see get_name()
+	 */
+	var $name;
+
+	/**
+	 * Author's link
+	 *
+	 * @var string
+	 * @see get_link()
+	 */
+	var $link;
+
+	/**
+	 * Author's email address
+	 *
+	 * @var string
+	 * @see get_email()
+	 */
+	var $email;
+
+	/**
+	 * Constructor, used to input the data
+	 *
+	 * @param string $name
+	 * @param string $link
+	 * @param string $email
+	 */
+	public function __construct($name = null, $link = null, $email = null)
+	{
+		$this->name = $name;
+		$this->link = $link;
+		$this->email = $email;
+	}
+
+	/**
+	 * String-ified version
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		// There is no $this->data here
+		return md5(serialize($this));
+	}
+
+	/**
+	 * Author's name
+	 *
+	 * @return string|null
+	 */
+	public function get_name()
+	{
+		if ($this->name !== null)
+		{
+			return $this->name;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Author's link
+	 *
+	 * @return string|null
+	 */
+	public function get_link()
+	{
+		if ($this->link !== null)
+		{
+			return $this->link;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Author's email address
+	 *
+	 * @return string|null
+	 */
+	public function get_email()
+	{
+		if ($this->email !== null)
+		{
+			return $this->email;
+		}
+		else
+		{
+			return null;
+		}
+	}
+}
+
diff --git a/lib/vendor/simplepie/SimplePie/Cache.php b/lib/vendor/simplepie/SimplePie/Cache.php
new file mode 100644
index 000000000..d98cc6511
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Cache.php
@@ -0,0 +1,134 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Used to create cache objects
+ *
+ * This class can be overloaded with {@see SimplePie::set_cache_class()},
+ * although the preferred way is to create your own handler
+ * via {@see register()}
+ *
+ * @package SimplePie
+ * @subpackage Caching
+ */
+class SimplePie_Cache
+{
+	/**
+	 * Cache handler classes
+	 *
+	 * These receive 3 parameters to their constructor, as documented in
+	 * {@see register()}
+	 * @var array
+	 */
+	protected static $handlers = array(
+		'mysql'     => 'SimplePie_Cache_MySQL',
+		'memcache'  => 'SimplePie_Cache_Memcache',
+		'memcached' => 'SimplePie_Cache_Memcached',
+		'redis'     => 'SimplePie_Cache_Redis'
+	);
+
+	/**
+	 * Don't call the constructor. Please.
+	 */
+	private function __construct() { }
+
+	/**
+	 * Create a new SimplePie_Cache object
+	 *
+	 * @param string $location URL location (scheme is used to determine handler)
+	 * @param string $filename Unique identifier for cache object
+	 * @param string $extension 'spi' or 'spc'
+	 * @return SimplePie_Cache_Base Type of object depends on scheme of `$location`
+	 */
+	public static function get_handler($location, $filename, $extension)
+	{
+		$type = explode(':', $location, 2);
+		$type = $type[0];
+		if (!empty(self::$handlers[$type]))
+		{
+			$class = self::$handlers[$type];
+			return new $class($location, $filename, $extension);
+		}
+
+		return new SimplePie_Cache_File($location, $filename, $extension);
+	}
+
+	/**
+	 * Create a new SimplePie_Cache object
+	 *
+	 * @deprecated Use {@see get_handler} instead
+	 */
+	public function create($location, $filename, $extension)
+	{
+		trigger_error('Cache::create() has been replaced with Cache::get_handler(). Switch to the registry system to use this.', E_USER_DEPRECATED);
+		return self::get_handler($location, $filename, $extension);
+	}
+
+	/**
+	 * Register a handler
+	 *
+	 * @param string $type DSN type to register for
+	 * @param string $class Name of handler class. Must implement SimplePie_Cache_Base
+	 */
+	public static function register($type, $class)
+	{
+		self::$handlers[$type] = $class;
+	}
+
+	/**
+	 * Parse a URL into an array
+	 *
+	 * @param string $url
+	 * @return array
+	 */
+	public static function parse_URL($url)
+	{
+		$params = parse_url($url);
+		$params['extras'] = array();
+		if (isset($params['query']))
+		{
+			parse_str($params['query'], $params['extras']);
+		}
+		return $params;
+	}
+}
diff --git a/lib/vendor/simplepie/SimplePie/Cache/Base.php b/lib/vendor/simplepie/SimplePie/Cache/Base.php
new file mode 100644
index 000000000..333fb05cf
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Cache/Base.php
@@ -0,0 +1,113 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Base for cache objects
+ *
+ * Classes to be used with {@see SimplePie_Cache::register()} are expected
+ * to implement this interface.
+ *
+ * @package SimplePie
+ * @subpackage Caching
+ */
+interface SimplePie_Cache_Base
+{
+	/**
+	 * Feed cache type
+	 *
+	 * @var string
+	 */
+	const TYPE_FEED = 'spc';
+
+	/**
+	 * Image cache type
+	 *
+	 * @var string
+	 */
+	const TYPE_IMAGE = 'spi';
+
+	/**
+	 * Create a new cache object
+	 *
+	 * @param string $location Location string (from SimplePie::$cache_location)
+	 * @param string $name Unique ID for the cache
+	 * @param string $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
+	 */
+	public function __construct($location, $name, $type);
+
+	/**
+	 * Save data to the cache
+	 *
+	 * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property
+	 * @return bool Successfulness
+	 */
+	public function save($data);
+
+	/**
+	 * Retrieve the data saved to the cache
+	 *
+	 * @return array Data for SimplePie::$data
+	 */
+	public function load();
+
+	/**
+	 * Retrieve the last modified time for the cache
+	 *
+	 * @return int Timestamp
+	 */
+	public function mtime();
+
+	/**
+	 * Set the last modified time to the current time
+	 *
+	 * @return bool Success status
+	 */
+	public function touch();
+
+	/**
+	 * Remove the cache
+	 *
+	 * @return bool Success status
+	 */
+	public function unlink();
+}
diff --git a/lib/vendor/simplepie/SimplePie/Cache/DB.php b/lib/vendor/simplepie/SimplePie/Cache/DB.php
new file mode 100644
index 000000000..7e8f77532
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Cache/DB.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Base class for database-based caches
+ *
+ * @package SimplePie
+ * @subpackage Caching
+ */
+abstract class SimplePie_Cache_DB implements SimplePie_Cache_Base
+{
+	/**
+	 * Helper for database conversion
+	 *
+	 * Converts a given {@see SimplePie} object into data to be stored
+	 *
+	 * @param SimplePie $data
+	 * @return array First item is the serialized data for storage, second item is the unique ID for this item
+	 */
+	protected static function prepare_simplepie_object_for_cache($data)
+	{
+		$items = $data->get_items();
+		$items_by_id = array();
+
+		if (!empty($items))
+		{
+			foreach ($items as $item)
+			{
+				$items_by_id[$item->get_id()] = $item;
+			}
+
+			if (count($items_by_id) !== count($items))
+			{
+				$items_by_id = array();
+				foreach ($items as $item)
+				{
+					$items_by_id[$item->get_id(true)] = $item;
+				}
+			}
+
+			if (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]))
+			{
+				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
+			}
+			elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
+			{
+				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
+			}
+			elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
+			{
+				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
+			}
+			elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0]))
+			{
+				$channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0];
+			}
+			else
+			{
+				$channel = null;
+			}
+
+			if ($channel !== null)
+			{
+				if (isset($channel['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['entry']))
+				{
+					unset($channel['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['entry']);
+				}
+				if (isset($channel['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['entry']))
+				{
+					unset($channel['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['entry']);
+				}
+				if (isset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_10]['item']))
+				{
+					unset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_10]['item']);
+				}
+				if (isset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_090]['item']))
+				{
+					unset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_090]['item']);
+				}
+				if (isset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_20]['item']))
+				{
+					unset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_20]['item']);
+				}
+			}
+			if (isset($data->data['items']))
+			{
+				unset($data->data['items']);
+			}
+			if (isset($data->data['ordered_items']))
+			{
+				unset($data->data['ordered_items']);
+			}
+		}
+		return array(serialize($data->data), $items_by_id);
+	}
+}
diff --git a/lib/vendor/simplepie/SimplePie/Cache/File.php b/lib/vendor/simplepie/SimplePie/Cache/File.php
new file mode 100644
index 000000000..6ba6c5f6e
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Cache/File.php
@@ -0,0 +1,164 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Caches data to the filesystem
+ *
+ * @package SimplePie
+ * @subpackage Caching
+ */
+class SimplePie_Cache_File implements SimplePie_Cache_Base
+{
+	/**
+	 * Location string
+	 *
+	 * @see SimplePie::$cache_location
+	 * @var string
+	 */
+	protected $location;
+
+	/**
+	 * Filename
+	 *
+	 * @var string
+	 */
+	protected $filename;
+
+	/**
+	 * File extension
+	 *
+	 * @var string
+	 */
+	protected $extension;
+
+	/**
+	 * File path
+	 *
+	 * @var string
+	 */
+	protected $name;
+
+	/**
+	 * Create a new cache object
+	 *
+	 * @param string $location Location string (from SimplePie::$cache_location)
+	 * @param string $name Unique ID for the cache
+	 * @param string $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
+	 */
+	public function __construct($location, $name, $type)
+	{
+		$this->location = $location;
+		$this->filename = $name;
+		$this->extension = $type;
+		$this->name = "$this->location/$this->filename.$this->extension";
+	}
+
+	/**
+	 * Save data to the cache
+	 *
+	 * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property
+	 * @return bool Successfulness
+	 */
+	public function save($data)
+	{
+		if (file_exists($this->name) && is_writeable($this->name) || file_exists($this->location) && is_writeable($this->location))
+		{
+			if ($data instanceof SimplePie)
+			{
+				$data = $data->data;
+			}
+
+			$data = serialize($data);
+			return (bool) file_put_contents($this->name, $data);
+		}
+		return false;
+	}
+
+	/**
+	 * Retrieve the data saved to the cache
+	 *
+	 * @return array Data for SimplePie::$data
+	 */
+	public function load()
+	{
+		if (file_exists($this->name) && is_readable($this->name))
+		{
+			return unserialize(file_get_contents($this->name));
+		}
+		return false;
+	}
+
+	/**
+	 * Retrieve the last modified time for the cache
+	 *
+	 * @return int Timestamp
+	 */
+	public function mtime()
+	{
+		return @filemtime($this->name);
+	}
+
+	/**
+	 * Set the last modified time to the current time
+	 *
+	 * @return bool Success status
+	 */
+	public function touch()
+	{
+		return @touch($this->name);
+	}
+
+	/**
+	 * Remove the cache
+	 *
+	 * @return bool Success status
+	 */
+	public function unlink()
+	{
+		if (file_exists($this->name))
+		{
+			return unlink($this->name);
+		}
+		return false;
+	}
+}
diff --git a/lib/vendor/simplepie/SimplePie/Cache/Memcache.php b/lib/vendor/simplepie/SimplePie/Cache/Memcache.php
new file mode 100644
index 000000000..5190eef93
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Cache/Memcache.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Caches data to memcache
+ *
+ * Registered for URLs with the "memcache" protocol
+ *
+ * For example, `memcache://localhost:11211/?timeout=3600&prefix=sp_` will
+ * connect to memcache on `localhost` on port 11211. All tables will be
+ * prefixed with `sp_` and data will expire after 3600 seconds
+ *
+ * @package SimplePie
+ * @subpackage Caching
+ * @uses Memcache
+ */
+class SimplePie_Cache_Memcache implements SimplePie_Cache_Base
+{
+	/**
+	 * Memcache instance
+	 *
+	 * @var Memcache
+	 */
+	protected $cache;
+
+	/**
+	 * Options
+	 *
+	 * @var array
+	 */
+	protected $options;
+
+	/**
+	 * Cache name
+	 *
+	 * @var string
+	 */
+	protected $name;
+
+	/**
+	 * Create a new cache object
+	 *
+	 * @param string $location Location string (from SimplePie::$cache_location)
+	 * @param string $name Unique ID for the cache
+	 * @param string $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
+	 */
+	public function __construct($location, $name, $type)
+	{
+		$this->options = array(
+			'host' => '127.0.0.1',
+			'port' => 11211,
+			'extras' => array(
+				'timeout' => 3600, // one hour
+				'prefix' => 'simplepie_',
+			),
+		);
+		$this->options = SimplePie_Misc::array_merge_recursive($this->options, SimplePie_Cache::parse_URL($location));
+
+		$this->name = $this->options['extras']['prefix'] . md5("$name:$type");
+
+		$this->cache = new Memcache();
+		$this->cache->addServer($this->options['host'], (int) $this->options['port']);
+	}
+
+	/**
+	 * Save data to the cache
+	 *
+	 * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property
+	 * @return bool Successfulness
+	 */
+	public function save($data)
+	{
+		if ($data instanceof SimplePie)
+		{
+			$data = $data->data;
+		}
+		return $this->cache->set($this->name, serialize($data), MEMCACHE_COMPRESSED, (int) $this->options['extras']['timeout']);
+	}
+
+	/**
+	 * Retrieve the data saved to the cache
+	 *
+	 * @return array Data for SimplePie::$data
+	 */
+	public function load()
+	{
+		$data = $this->cache->get($this->name);
+
+		if ($data !== false)
+		{
+			return unserialize($data);
+		}
+		return false;
+	}
+
+	/**
+	 * Retrieve the last modified time for the cache
+	 *
+	 * @return int Timestamp
+	 */
+	public function mtime()
+	{
+		$data = $this->cache->get($this->name);
+
+		if ($data !== false)
+		{
+			// essentially ignore the mtime because Memcache expires on its own
+			return time();
+		}
+
+		return false;
+	}
+
+	/**
+	 * Set the last modified time to the current time
+	 *
+	 * @return bool Success status
+	 */
+	public function touch()
+	{
+		$data = $this->cache->get($this->name);
+
+		if ($data !== false)
+		{
+			return $this->cache->set($this->name, $data, MEMCACHE_COMPRESSED, (int) $this->options['extras']['timeout']);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Remove the cache
+	 *
+	 * @return bool Success status
+	 */
+	public function unlink()
+	{
+		return $this->cache->delete($this->name, 0);
+	}
+}
diff --git a/lib/vendor/simplepie/SimplePie/Cache/Memcached.php b/lib/vendor/simplepie/SimplePie/Cache/Memcached.php
new file mode 100755
index 000000000..1f73b3890
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Cache/Memcached.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Caches data to memcached
+ *
+ * Registered for URLs with the "memcached" protocol
+ *
+ * For example, `memcached://localhost:11211/?timeout=3600&prefix=sp_` will
+ * connect to memcached on `localhost` on port 11211. All tables will be
+ * prefixed with `sp_` and data will expire after 3600 seconds
+ *
+ * @package    SimplePie
+ * @subpackage Caching
+ * @author     Paul L. McNeely
+ * @uses       Memcached
+ */
+class SimplePie_Cache_Memcached implements SimplePie_Cache_Base
+{
+    /**
+     * Memcached instance
+     * @var Memcached
+     */
+    protected $cache;
+
+    /**
+     * Options
+     * @var array
+     */
+    protected $options;
+
+    /**
+     * Cache name
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * Create a new cache object
+     * @param string $location Location string (from SimplePie::$cache_location)
+     * @param string $name     Unique ID for the cache
+     * @param string $type     Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
+     */
+    public function __construct($location, $name, $type) {
+        $this->options = array(
+            'host'   => '127.0.0.1',
+            'port'   => 11211,
+            'extras' => array(
+                'timeout' => 3600, // one hour
+                'prefix'  => 'simplepie_',
+            ),
+        );
+        $this->options = SimplePie_Misc::array_merge_recursive($this->options, SimplePie_Cache::parse_URL($location));
+
+        $this->name = $this->options['extras']['prefix'] . md5("$name:$type");
+
+        $this->cache = new Memcached();
+        $this->cache->addServer($this->options['host'], (int)$this->options['port']);
+    }
+
+    /**
+     * Save data to the cache
+     * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property
+     * @return bool Successfulness
+     */
+    public function save($data) {
+        if ($data instanceof SimplePie) {
+            $data = $data->data;
+        }
+
+        return $this->setData(serialize($data));
+    }
+
+    /**
+     * Retrieve the data saved to the cache
+     * @return array Data for SimplePie::$data
+     */
+    public function load() {
+        $data = $this->cache->get($this->name);
+
+        if ($data !== false) {
+            return unserialize($data);
+        }
+        return false;
+    }
+
+    /**
+     * Retrieve the last modified time for the cache
+     * @return int Timestamp
+     */
+    public function mtime() {
+        $data = $this->cache->get($this->name . '_mtime');
+        return (int) $data;
+    }
+
+    /**
+     * Set the last modified time to the current time
+     * @return bool Success status
+     */
+    public function touch() {
+        $data = $this->cache->get($this->name);
+        return $this->setData($data);
+    }
+
+    /**
+     * Remove the cache
+     * @return bool Success status
+     */
+    public function unlink() {
+        return $this->cache->delete($this->name, 0);
+    }
+
+    /**
+     * Set the last modified time and data to Memcached
+     * @return bool Success status
+     */
+    private function setData($data) {
+
+        if ($data !== false) {
+            $this->cache->set($this->name . '_mtime', time(), (int)$this->options['extras']['timeout']);
+            return $this->cache->set($this->name, $data, (int)$this->options['extras']['timeout']);
+        }
+
+        return false;
+    }
+}
diff --git a/lib/vendor/simplepie/SimplePie/Cache/MySQL.php b/lib/vendor/simplepie/SimplePie/Cache/MySQL.php
new file mode 100644
index 000000000..8686b6c67
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Cache/MySQL.php
@@ -0,0 +1,454 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Caches data to a MySQL database
+ *
+ * Registered for URLs with the "mysql" protocol
+ *
+ * For example, `mysql://root:password@localhost:3306/mydb?prefix=sp_` will
+ * connect to the `mydb` database on `localhost` on port 3306, with the user
+ * `root` and the password `password`. All tables will be prefixed with `sp_`
+ *
+ * @package SimplePie
+ * @subpackage Caching
+ */
+class SimplePie_Cache_MySQL extends SimplePie_Cache_DB
+{
+	/**
+	 * PDO instance
+	 *
+	 * @var PDO
+	 */
+	protected $mysql;
+
+	/**
+	 * Options
+	 *
+	 * @var array
+	 */
+	protected $options;
+
+	/**
+	 * Cache ID
+	 *
+	 * @var string
+	 */
+	protected $id;
+
+	/**
+	 * Create a new cache object
+	 *
+	 * @param string $location Location string (from SimplePie::$cache_location)
+	 * @param string $name Unique ID for the cache
+	 * @param string $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
+	 */
+	public function __construct($location, $name, $type)
+	{
+		$this->options = array(
+			'user' => null,
+			'pass' => null,
+			'host' => '127.0.0.1',
+			'port' => '3306',
+			'path' => '',
+			'extras' => array(
+				'prefix' => '',
+				'cache_purge_time' => 2592000
+			),
+		);
+		
+		$this->options = SimplePie_Misc::array_merge_recursive($this->options, SimplePie_Cache::parse_URL($location));
+
+		// Path is prefixed with a "/"
+		$this->options['dbname'] = substr($this->options['path'], 1);
+
+		try
+		{
+			$this->mysql = new PDO("mysql:dbname={$this->options['dbname']};host={$this->options['host']};port={$this->options['port']}", $this->options['user'], $this->options['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8'));
+		}
+		catch (PDOException $e)
+		{
+			$this->mysql = null;
+			return;
+		}
+
+		$this->id = $name . $type;
+
+		if (!$query = $this->mysql->query('SHOW TABLES'))
+		{
+			$this->mysql = null;
+			return;
+		}
+
+		$db = array();
+		while ($row = $query->fetchColumn())
+		{
+			$db[] = $row;
+		}
+
+		if (!in_array($this->options['extras']['prefix'] . 'cache_data', $db))
+		{
+			$query = $this->mysql->exec('CREATE TABLE `' . $this->options['extras']['prefix'] . 'cache_data` (`id` TEXT CHARACTER SET utf8 NOT NULL, `items` SMALLINT NOT NULL DEFAULT 0, `data` BLOB NOT NULL, `mtime` INT UNSIGNED NOT NULL, UNIQUE (`id`(125)))');
+			if ($query === false)
+			{
+				trigger_error("Can't create " . $this->options['extras']['prefix'] . "cache_data table, check permissions", E_USER_WARNING);
+				$this->mysql = null;
+				return;
+			}
+		}
+
+		if (!in_array($this->options['extras']['prefix'] . 'items', $db))
+		{
+			$query = $this->mysql->exec('CREATE TABLE `' . $this->options['extras']['prefix'] . 'items` (`feed_id` TEXT CHARACTER SET utf8 NOT NULL, `id` TEXT CHARACTER SET utf8 NOT NULL, `data` MEDIUMBLOB NOT NULL, `posted` INT UNSIGNED NOT NULL, INDEX `feed_id` (`feed_id`(125)))');
+			if ($query === false)
+			{
+				trigger_error("Can't create " . $this->options['extras']['prefix'] . "items table, check permissions", E_USER_WARNING);
+				$this->mysql = null;
+				return;
+			}
+		}
+	}
+
+	/**
+	 * Save data to the cache
+	 *
+	 * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property
+	 * @return bool Successfulness
+	 */
+	public function save($data)
+	{
+		if ($this->mysql === null)
+		{
+			return false;
+		}
+
+		$query = $this->mysql->prepare('DELETE i, cd FROM `' . $this->options['extras']['prefix'] . 'cache_data` cd, ' .
+			'`' . $this->options['extras']['prefix'] . 'items` i ' .
+			'WHERE cd.id = i.feed_id ' .
+			'AND cd.mtime < (unix_timestamp() - :purge_time)');
+		$query->bindValue(':purge_time', $this->options['extras']['cache_purge_time']);
+
+		if (!$query->execute())
+		{
+			return false;
+		}
+
+		if ($data instanceof SimplePie)
+		{
+			$data = clone $data;
+
+			$prepared = self::prepare_simplepie_object_for_cache($data);
+
+			$query = $this->mysql->prepare('SELECT COUNT(*) FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed');
+			$query->bindValue(':feed', $this->id);
+			if ($query->execute())
+			{
+				if ($query->fetchColumn() > 0)
+				{
+					$items = count($prepared[1]);
+					if ($items)
+					{
+						$sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = :items, `data` = :data, `mtime` = :time WHERE `id` = :feed';
+						$query = $this->mysql->prepare($sql);
+						$query->bindValue(':items', $items);
+					}
+					else
+					{
+						$sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `data` = :data, `mtime` = :time WHERE `id` = :feed';
+						$query = $this->mysql->prepare($sql);
+					}
+
+					$query->bindValue(':data', $prepared[0]);
+					$query->bindValue(':time', time());
+					$query->bindValue(':feed', $this->id);
+					if (!$query->execute())
+					{
+						return false;
+					}
+				}
+				else
+				{
+					$query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:feed, :count, :data, :time)');
+					$query->bindValue(':feed', $this->id);
+					$query->bindValue(':count', count($prepared[1]));
+					$query->bindValue(':data', $prepared[0]);
+					$query->bindValue(':time', time());
+					if (!$query->execute())
+					{
+						return false;
+					}
+				}
+
+				$ids = array_keys($prepared[1]);
+				if (!empty($ids))
+				{
+					foreach ($ids as $id)
+					{
+						$database_ids[] = $this->mysql->quote($id);
+					}
+
+					$query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `id` = ' . implode(' OR `id` = ', $database_ids) . ' AND `feed_id` = :feed');
+					$query->bindValue(':feed', $this->id);
+
+					if ($query->execute())
+					{
+						$existing_ids = array();
+						while ($row = $query->fetchColumn())
+						{
+							$existing_ids[] = $row;
+						}
+
+						$new_ids = array_diff($ids, $existing_ids);
+
+						foreach ($new_ids as $new_id)
+						{
+							if (!($date = $prepared[1][$new_id]->get_date('U')))
+							{
+								$date = time();
+							}
+
+							$query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'items` (`feed_id`, `id`, `data`, `posted`) VALUES(:feed, :id, :data, :date)');
+							$query->bindValue(':feed', $this->id);
+							$query->bindValue(':id', $new_id);
+							$query->bindValue(':data', serialize($prepared[1][$new_id]->data));
+							$query->bindValue(':date', $date);
+							if (!$query->execute())
+							{
+								return false;
+							}
+						}
+						return true;
+					}
+				}
+				else
+				{
+					return true;
+				}
+			}
+		}
+		else
+		{
+			$query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed');
+			$query->bindValue(':feed', $this->id);
+			if ($query->execute())
+			{
+				if ($query->rowCount() > 0)
+				{
+					$query = $this->mysql->prepare('UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = 0, `data` = :data, `mtime` = :time WHERE `id` = :feed');
+					$query->bindValue(':data', serialize($data));
+					$query->bindValue(':time', time());
+					$query->bindValue(':feed', $this->id);
+					if ($this->execute())
+					{
+						return true;
+					}
+				}
+				else
+				{
+					$query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:id, 0, :data, :time)');
+					$query->bindValue(':id', $this->id);
+					$query->bindValue(':data', serialize($data));
+					$query->bindValue(':time', time());
+					if ($query->execute())
+					{
+						return true;
+					}
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Retrieve the data saved to the cache
+	 *
+	 * @return array Data for SimplePie::$data
+	 */
+	public function load()
+	{
+		if ($this->mysql === null)
+		{
+			return false;
+		}
+
+		$query = $this->mysql->prepare('SELECT `items`, `data` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
+		$query->bindValue(':id', $this->id);
+		if ($query->execute() && ($row = $query->fetch()))
+		{
+			$data = unserialize($row[1]);
+
+			if (isset($this->options['items'][0]))
+			{
+				$items = (int) $this->options['items'][0];
+			}
+			else
+			{
+				$items = (int) $row[0];
+			}
+
+			if ($items !== 0)
+			{
+				if (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]))
+				{
+					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0];
+				}
+				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]))
+				{
+					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0];
+				}
+				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]))
+				{
+					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0];
+				}
+				elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]))
+				{
+					$feed =& $data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0];
+				}
+				else
+				{
+					$feed = null;
+				}
+
+				if ($feed !== null)
+				{
+					$sql = 'SELECT `data` FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `feed_id` = :feed ORDER BY `posted` DESC';
+					if ($items > 0)
+					{
+						$sql .= ' LIMIT ' . $items;
+					}
+
+					$query = $this->mysql->prepare($sql);
+					$query->bindValue(':feed', $this->id);
+					if ($query->execute())
+					{
+						while ($row = $query->fetchColumn())
+						{
+							$feed['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['entry'][] = unserialize($row);
+						}
+					}
+					else
+					{
+						return false;
+					}
+				}
+			}
+			return $data;
+		}
+		return false;
+	}
+
+	/**
+	 * Retrieve the last modified time for the cache
+	 *
+	 * @return int Timestamp
+	 */
+	public function mtime()
+	{
+		if ($this->mysql === null)
+		{
+			return false;
+		}
+
+		$query = $this->mysql->prepare('SELECT `mtime` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
+		$query->bindValue(':id', $this->id);
+		if ($query->execute() && ($time = $query->fetchColumn()))
+		{
+			return $time;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Set the last modified time to the current time
+	 *
+	 * @return bool Success status
+	 */
+	public function touch()
+	{
+		if ($this->mysql === null)
+		{
+			return false;
+		}
+
+		$query = $this->mysql->prepare('UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `mtime` = :time WHERE `id` = :id');
+		$query->bindValue(':time', time());
+		$query->bindValue(':id', $this->id);
+		if ($query->execute() && $query->rowCount() > 0)
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Remove the cache
+	 *
+	 * @return bool Success status
+	 */
+	public function unlink()
+	{
+		if ($this->mysql === null)
+		{
+			return false;
+		}
+
+		$query = $this->mysql->prepare('DELETE FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id');
+		$query->bindValue(':id', $this->id);
+		$query2 = $this->mysql->prepare('DELETE FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `feed_id` = :id');
+		$query2->bindValue(':id', $this->id);
+		if ($query->execute() && $query2->execute())
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
diff --git a/lib/vendor/simplepie/SimplePie/Cache/Redis.php b/lib/vendor/simplepie/SimplePie/Cache/Redis.php
new file mode 100644
index 000000000..04d72c79a
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Cache/Redis.php
@@ -0,0 +1,166 @@
+<?php
+
+/**
+ * SimplePie Redis Cache Extension
+ *
+ * @package SimplePie
+ * @author Jan Kozak <galvani78@gmail.com>
+ * @link http://galvani.cz/
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ * @version 0.2.9
+ */
+
+
+/**
+ * Caches data to redis
+ *
+ * Registered for URLs with the "redis" protocol
+ *
+ * For example, `redis://localhost:6379/?timeout=3600&prefix=sp_&dbIndex=0` will
+ * connect to redis on `localhost` on port 6379. All tables will be
+ * prefixed with `simple_primary-` and data will expire after 3600 seconds
+ *
+ * @package SimplePie
+ * @subpackage Caching
+ * @uses Redis
+ */
+class SimplePie_Cache_Redis implements SimplePie_Cache_Base {
+    /**
+     * Redis instance
+     *
+     * @var \Redis
+     */
+    protected $cache;
+
+    /**
+     * Options
+     *
+     * @var array
+     */
+    protected $options;
+
+    /**
+     * Cache name
+     *
+     * @var string
+     */
+    protected $name;
+
+    /**
+     * Cache Data
+     *
+     * @var type
+     */
+    protected $data;
+
+    /**
+     * Create a new cache object
+     *
+     * @param string $location Location string (from SimplePie::$cache_location)
+     * @param string $name Unique ID for the cache
+     * @param string $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data
+     */
+    public function __construct($location, $name, $options = null) {
+        //$this->cache = \flow\simple\cache\Redis::getRedisClientInstance();
+        $parsed = SimplePie_Cache::parse_URL($location);
+        $redis = new Redis();
+        $redis->connect($parsed['host'], $parsed['port']);
+        $this->cache = $redis;
+
+        if (!is_null($options) && is_array($options)) {
+            $this->options = $options;
+        } else {
+            $this->options = array (
+                'prefix' => 'rss:simple_primary:',
+                'expire' => 0,
+            );
+        }
+
+        $this->name = $this->options['prefix'] . $name;
+    }
+
+    /**
+     * @param \Redis $cache
+     */
+    public function setRedisClient(\Redis $cache) {
+        $this->cache = $cache;
+    }
+
+    /**
+     * Save data to the cache
+     *
+     * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property
+     * @return bool Successfulness
+     */
+    public function save($data) {
+        if ($data instanceof SimplePie) {
+            $data = $data->data;
+        }
+        $response = $this->cache->set($this->name, serialize($data));
+        if ($this->options['expire']) {
+            $this->cache->expire($this->name, $this->options['expire']);
+        }
+
+        return $response;
+    }
+
+    /**
+     * Retrieve the data saved to the cache
+     *
+     * @return array Data for SimplePie::$data
+     */
+    public function load() {
+        $data = $this->cache->get($this->name);
+
+        if ($data !== false) {
+            return unserialize($data);
+        }
+        return false;
+    }
+
+    /**
+     * Retrieve the last modified time for the cache
+     *
+     * @return int Timestamp
+     */
+    public function mtime() {
+
+        $data = $this->cache->get($this->name);
+
+        if ($data !== false) {
+            return time();
+        }
+
+        return false;
+    }
+
+    /**
+     * Set the last modified time to the current time
+     *
+     * @return bool Success status
+     */
+    public function touch() {
+
+        $data = $this->cache->get($this->name);
+
+        if ($data !== false) {
+            $return = $this->cache->set($this->name, $data);
+            if ($this->options['expire']) {
+                return $this->cache->expire($this->name, $this->ttl);
+            }
+            return $return;
+        }
+
+        return false;
+    }
+
+    /**
+     * Remove the cache
+     *
+     * @return bool Success status
+     */
+    public function unlink() {
+        return $this->cache->set($this->name, null);
+    }
+
+}
diff --git a/lib/vendor/simplepie/SimplePie/Caption.php b/lib/vendor/simplepie/SimplePie/Caption.php
new file mode 100644
index 000000000..abf07de1b
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Caption.php
@@ -0,0 +1,209 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+
+/**
+ * Handles `<media:text>` captions as defined in Media RSS.
+ *
+ * Used by {@see SimplePie_Enclosure::get_caption()} and {@see SimplePie_Enclosure::get_captions()}
+ *
+ * This class can be overloaded with {@see SimplePie::set_caption_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie_Caption
+{
+	/**
+	 * Content type
+	 *
+	 * @var string
+	 * @see get_type()
+	 */
+	var $type;
+
+	/**
+	 * Language
+	 *
+	 * @var string
+	 * @see get_language()
+	 */
+	var $lang;
+
+	/**
+	 * Start time
+	 *
+	 * @var string
+	 * @see get_starttime()
+	 */
+	var $startTime;
+
+	/**
+	 * End time
+	 *
+	 * @var string
+	 * @see get_endtime()
+	 */
+	var $endTime;
+
+	/**
+	 * Caption text
+	 *
+	 * @var string
+	 * @see get_text()
+	 */
+	var $text;
+
+	/**
+	 * Constructor, used to input the data
+	 *
+	 * For documentation on all the parameters, see the corresponding
+	 * properties and their accessors
+	 */
+	public function __construct($type = null, $lang = null, $startTime = null, $endTime = null, $text = null)
+	{
+		$this->type = $type;
+		$this->lang = $lang;
+		$this->startTime = $startTime;
+		$this->endTime = $endTime;
+		$this->text = $text;
+	}
+
+	/**
+	 * String-ified version
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		// There is no $this->data here
+		return md5(serialize($this));
+	}
+
+	/**
+	 * Get the end time
+	 *
+	 * @return string|null Time in the format 'hh:mm:ss.SSS'
+	 */
+	public function get_endtime()
+	{
+		if ($this->endTime !== null)
+		{
+			return $this->endTime;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the language
+	 *
+	 * @link http://tools.ietf.org/html/rfc3066
+	 * @return string|null Language code as per RFC 3066
+	 */
+	public function get_language()
+	{
+		if ($this->lang !== null)
+		{
+			return $this->lang;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the start time
+	 *
+	 * @return string|null Time in the format 'hh:mm:ss.SSS'
+	 */
+	public function get_starttime()
+	{
+		if ($this->startTime !== null)
+		{
+			return $this->startTime;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the text of the caption
+	 *
+	 * @return string|null
+	 */
+	public function get_text()
+	{
+		if ($this->text !== null)
+		{
+			return $this->text;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the content type (not MIME type)
+	 *
+	 * @return string|null Either 'text' or 'html'
+	 */
+	public function get_type()
+	{
+		if ($this->type !== null)
+		{
+			return $this->type;
+		}
+		else
+		{
+			return null;
+		}
+	}
+}
+
diff --git a/lib/vendor/simplepie/SimplePie/Category.php b/lib/vendor/simplepie/SimplePie/Category.php
new file mode 100644
index 000000000..92d511e1a
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Category.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Manages all category-related data
+ *
+ * Used by {@see SimplePie_Item::get_category()} and {@see SimplePie_Item::get_categories()}
+ *
+ * This class can be overloaded with {@see SimplePie::set_category_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie_Category
+{
+	/**
+	 * Category identifier
+	 *
+	 * @var string
+	 * @see get_term
+	 */
+	var $term;
+
+	/**
+	 * Categorization scheme identifier
+	 *
+	 * @var string
+	 * @see get_scheme()
+	 */
+	var $scheme;
+
+	/**
+	 * Human readable label
+	 *
+	 * @var string
+	 * @see get_label()
+	 */
+	var $label;
+
+	/**
+	 * Constructor, used to input the data
+	 *
+	 * @param string $term
+	 * @param string $scheme
+	 * @param string $label
+	 */
+	public function __construct($term = null, $scheme = null, $label = null)
+	{
+		$this->term = $term;
+		$this->scheme = $scheme;
+		$this->label = $label;
+	}
+
+	/**
+	 * String-ified version
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		// There is no $this->data here
+		return md5(serialize($this));
+	}
+
+	/**
+	 * Get the category identifier
+	 *
+	 * @return string|null
+	 */
+	public function get_term()
+	{
+		if ($this->term !== null)
+		{
+			return $this->term;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the categorization scheme identifier
+	 *
+	 * @return string|null
+	 */
+	public function get_scheme()
+	{
+		if ($this->scheme !== null)
+		{
+			return $this->scheme;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the human readable label
+	 *
+	 * @return string|null
+	 */
+	public function get_label()
+	{
+		if ($this->label !== null)
+		{
+			return $this->label;
+		}
+		else
+		{
+			return $this->get_term();
+		}
+	}
+}
+
diff --git a/lib/vendor/simplepie/SimplePie/Content/Type/Sniffer.php b/lib/vendor/simplepie/SimplePie/Content/Type/Sniffer.php
new file mode 100644
index 000000000..ff35de614
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Content/Type/Sniffer.php
@@ -0,0 +1,331 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+
+/**
+ * Content-type sniffing
+ *
+ * Based on the rules in http://tools.ietf.org/html/draft-abarth-mime-sniff-06
+ *
+ * This is used since we can't always trust Content-Type headers, and is based
+ * upon the HTML5 parsing rules.
+ *
+ *
+ * This class can be overloaded with {@see SimplePie::set_content_type_sniffer_class()}
+ *
+ * @package SimplePie
+ * @subpackage HTTP
+ */
+class SimplePie_Content_Type_Sniffer
+{
+	/**
+	 * File object
+	 *
+	 * @var SimplePie_File
+	 */
+	var $file;
+
+	/**
+	 * Create an instance of the class with the input file
+	 *
+	 * @param SimplePie_Content_Type_Sniffer $file Input file
+	 */
+	public function __construct($file)
+	{
+		$this->file = $file;
+	}
+
+	/**
+	 * Get the Content-Type of the specified file
+	 *
+	 * @return string Actual Content-Type
+	 */
+	public function get_type()
+	{
+		if (isset($this->file->headers['content-type']))
+		{
+			if (!isset($this->file->headers['content-encoding'])
+				&& ($this->file->headers['content-type'] === 'text/plain'
+					|| $this->file->headers['content-type'] === 'text/plain; charset=ISO-8859-1'
+					|| $this->file->headers['content-type'] === 'text/plain; charset=iso-8859-1'
+					|| $this->file->headers['content-type'] === 'text/plain; charset=UTF-8'))
+			{
+				return $this->text_or_binary();
+			}
+
+			if (($pos = strpos($this->file->headers['content-type'], ';')) !== false)
+			{
+				$official = substr($this->file->headers['content-type'], 0, $pos);
+			}
+			else
+			{
+				$official = $this->file->headers['content-type'];
+			}
+			$official = trim(strtolower($official));
+
+			if ($official === 'unknown/unknown'
+				|| $official === 'application/unknown')
+			{
+				return $this->unknown();
+			}
+			elseif (substr($official, -4) === '+xml'
+				|| $official === 'text/xml'
+				|| $official === 'application/xml')
+			{
+				return $official;
+			}
+			elseif (substr($official, 0, 6) === 'image/')
+			{
+				if ($return = $this->image())
+				{
+					return $return;
+				}
+				else
+				{
+					return $official;
+				}
+			}
+			elseif ($official === 'text/html')
+			{
+				return $this->feed_or_html();
+			}
+			else
+			{
+				return $official;
+			}
+		}
+		else
+		{
+			return $this->unknown();
+		}
+	}
+
+	/**
+	 * Sniff text or binary
+	 *
+	 * @return string Actual Content-Type
+	 */
+	public function text_or_binary()
+	{
+		if (substr($this->file->body, 0, 2) === "\xFE\xFF"
+			|| substr($this->file->body, 0, 2) === "\xFF\xFE"
+			|| substr($this->file->body, 0, 4) === "\x00\x00\xFE\xFF"
+			|| substr($this->file->body, 0, 3) === "\xEF\xBB\xBF")
+		{
+			return 'text/plain';
+		}
+		elseif (preg_match('/[\x00-\x08\x0E-\x1A\x1C-\x1F]/', $this->file->body))
+		{
+			return 'application/octect-stream';
+		}
+		else
+		{
+			return 'text/plain';
+		}
+	}
+
+	/**
+	 * Sniff unknown
+	 *
+	 * @return string Actual Content-Type
+	 */
+	public function unknown()
+	{
+		$ws = strspn($this->file->body, "\x09\x0A\x0B\x0C\x0D\x20");
+		if (strtolower(substr($this->file->body, $ws, 14)) === '<!doctype html'
+			|| strtolower(substr($this->file->body, $ws, 5)) === '<html'
+			|| strtolower(substr($this->file->body, $ws, 7)) === '<script')
+		{
+			return 'text/html';
+		}
+		elseif (substr($this->file->body, 0, 5) === '%PDF-')
+		{
+			return 'application/pdf';
+		}
+		elseif (substr($this->file->body, 0, 11) === '%!PS-Adobe-')
+		{
+			return 'application/postscript';
+		}
+		elseif (substr($this->file->body, 0, 6) === 'GIF87a'
+			|| substr($this->file->body, 0, 6) === 'GIF89a')
+		{
+			return 'image/gif';
+		}
+		elseif (substr($this->file->body, 0, 8) === "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A")
+		{
+			return 'image/png';
+		}
+		elseif (substr($this->file->body, 0, 3) === "\xFF\xD8\xFF")
+		{
+			return 'image/jpeg';
+		}
+		elseif (substr($this->file->body, 0, 2) === "\x42\x4D")
+		{
+			return 'image/bmp';
+		}
+		elseif (substr($this->file->body, 0, 4) === "\x00\x00\x01\x00")
+		{
+			return 'image/vnd.microsoft.icon';
+		}
+		else
+		{
+			return $this->text_or_binary();
+		}
+	}
+
+	/**
+	 * Sniff images
+	 *
+	 * @return string Actual Content-Type
+	 */
+	public function image()
+	{
+		if (substr($this->file->body, 0, 6) === 'GIF87a'
+			|| substr($this->file->body, 0, 6) === 'GIF89a')
+		{
+			return 'image/gif';
+		}
+		elseif (substr($this->file->body, 0, 8) === "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A")
+		{
+			return 'image/png';
+		}
+		elseif (substr($this->file->body, 0, 3) === "\xFF\xD8\xFF")
+		{
+			return 'image/jpeg';
+		}
+		elseif (substr($this->file->body, 0, 2) === "\x42\x4D")
+		{
+			return 'image/bmp';
+		}
+		elseif (substr($this->file->body, 0, 4) === "\x00\x00\x01\x00")
+		{
+			return 'image/vnd.microsoft.icon';
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Sniff HTML
+	 *
+	 * @return string Actual Content-Type
+	 */
+	public function feed_or_html()
+	{
+		$len = strlen($this->file->body);
+		$pos = strspn($this->file->body, "\x09\x0A\x0D\x20\xEF\xBB\xBF");
+
+		while ($pos < $len)
+		{
+			switch ($this->file->body[$pos])
+			{
+				case "\x09":
+				case "\x0A":
+				case "\x0D":
+				case "\x20":
+					$pos += strspn($this->file->body, "\x09\x0A\x0D\x20", $pos);
+					continue 2;
+
+				case '<':
+					$pos++;
+					break;
+
+				default:
+					return 'text/html';
+			}
+
+			if (substr($this->file->body, $pos, 3) === '!--')
+			{
+				$pos += 3;
+				if ($pos < $len && ($pos = strpos($this->file->body, '-->', $pos)) !== false)
+				{
+					$pos += 3;
+				}
+				else
+				{
+					return 'text/html';
+				}
+			}
+			elseif (substr($this->file->body, $pos, 1) === '!')
+			{
+				if ($pos < $len && ($pos = strpos($this->file->body, '>', $pos)) !== false)
+				{
+					$pos++;
+				}
+				else
+				{
+					return 'text/html';
+				}
+			}
+			elseif (substr($this->file->body, $pos, 1) === '?')
+			{
+				if ($pos < $len && ($pos = strpos($this->file->body, '?>', $pos)) !== false)
+				{
+					$pos += 2;
+				}
+				else
+				{
+					return 'text/html';
+				}
+			}
+			elseif (substr($this->file->body, $pos, 3) === 'rss'
+				|| substr($this->file->body, $pos, 7) === 'rdf:RDF')
+			{
+				return 'application/rss+xml';
+			}
+			elseif (substr($this->file->body, $pos, 4) === 'feed')
+			{
+				return 'application/atom+xml';
+			}
+			else
+			{
+				return 'text/html';
+			}
+		}
+
+		return 'text/html';
+	}
+}
+
diff --git a/lib/vendor/simplepie/SimplePie/Copyright.php b/lib/vendor/simplepie/SimplePie/Copyright.php
new file mode 100644
index 000000000..3f3d07d3b
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Copyright.php
@@ -0,0 +1,129 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Manages `<media:copyright>` copyright tags as defined in Media RSS
+ *
+ * Used by {@see SimplePie_Enclosure::get_copyright()}
+ *
+ * This class can be overloaded with {@see SimplePie::set_copyright_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie_Copyright
+{
+	/**
+	 * Copyright URL
+	 *
+	 * @var string
+	 * @see get_url()
+	 */
+	var $url;
+
+	/**
+	 * Attribution
+	 *
+	 * @var string
+	 * @see get_attribution()
+	 */
+	var $label;
+
+	/**
+	 * Constructor, used to input the data
+	 *
+	 * For documentation on all the parameters, see the corresponding
+	 * properties and their accessors
+	 */
+	public function __construct($url = null, $label = null)
+	{
+		$this->url = $url;
+		$this->label = $label;
+	}
+
+	/**
+	 * String-ified version
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		// There is no $this->data here
+		return md5(serialize($this));
+	}
+
+	/**
+	 * Get the copyright URL
+	 *
+	 * @return string|null URL to copyright information
+	 */
+	public function get_url()
+	{
+		if ($this->url !== null)
+		{
+			return $this->url;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the attribution text
+	 *
+	 * @return string|null
+	 */
+	public function get_attribution()
+	{
+		if ($this->label !== null)
+		{
+			return $this->label;
+		}
+		else
+		{
+			return null;
+		}
+	}
+}
+
diff --git a/lib/vendor/simplepie/SimplePie/Core.php b/lib/vendor/simplepie/SimplePie/Core.php
new file mode 100644
index 000000000..c856ba361
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Core.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * SimplePie class.
+ *
+ * Class for backward compatibility.
+ *
+ * @deprecated Use {@see SimplePie} directly
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie_Core extends SimplePie
+{
+
+}
\ No newline at end of file
diff --git a/lib/vendor/simplepie/SimplePie/Credit.php b/lib/vendor/simplepie/SimplePie/Credit.php
new file mode 100644
index 000000000..9bad9ef34
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Credit.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Handles `<media:credit>` as defined in Media RSS
+ *
+ * Used by {@see SimplePie_Enclosure::get_credit()} and {@see SimplePie_Enclosure::get_credits()}
+ *
+ * This class can be overloaded with {@see SimplePie::set_credit_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie_Credit
+{
+	/**
+	 * Credited role
+	 *
+	 * @var string
+	 * @see get_role()
+	 */
+	var $role;
+
+	/**
+	 * Organizational scheme
+	 *
+	 * @var string
+	 * @see get_scheme()
+	 */
+	var $scheme;
+
+	/**
+	 * Credited name
+	 *
+	 * @var string
+	 * @see get_name()
+	 */
+	var $name;
+
+	/**
+	 * Constructor, used to input the data
+	 *
+	 * For documentation on all the parameters, see the corresponding
+	 * properties and their accessors
+	 */
+	public function __construct($role = null, $scheme = null, $name = null)
+	{
+		$this->role = $role;
+		$this->scheme = $scheme;
+		$this->name = $name;
+	}
+
+	/**
+	 * String-ified version
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		// There is no $this->data here
+		return md5(serialize($this));
+	}
+
+	/**
+	 * Get the role of the person receiving credit
+	 *
+	 * @return string|null
+	 */
+	public function get_role()
+	{
+		if ($this->role !== null)
+		{
+			return $this->role;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the organizational scheme
+	 *
+	 * @return string|null
+	 */
+	public function get_scheme()
+	{
+		if ($this->scheme !== null)
+		{
+			return $this->scheme;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the credited person/entity's name
+	 *
+	 * @return string|null
+	 */
+	public function get_name()
+	{
+		if ($this->name !== null)
+		{
+			return $this->name;
+		}
+		else
+		{
+			return null;
+		}
+	}
+}
+
diff --git a/lib/vendor/simplepie/SimplePie/Decode/HTML/Entities.php b/lib/vendor/simplepie/SimplePie/Decode/HTML/Entities.php
new file mode 100644
index 000000000..de3f2cb53
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Decode/HTML/Entities.php
@@ -0,0 +1,615 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+
+/**
+ * Decode HTML Entities
+ *
+ * This implements HTML5 as of revision 967 (2007-06-28)
+ *
+ * @deprecated Use DOMDocument instead!
+ * @package SimplePie
+ */
+class SimplePie_Decode_HTML_Entities
+{
+	/**
+	 * Data to be parsed
+	 *
+	 * @access private
+	 * @var string
+	 */
+	var $data = '';
+
+	/**
+	 * Currently consumed bytes
+	 *
+	 * @access private
+	 * @var string
+	 */
+	var $consumed = '';
+
+	/**
+	 * Position of the current byte being parsed
+	 *
+	 * @access private
+	 * @var int
+	 */
+	var $position = 0;
+
+	/**
+	 * Create an instance of the class with the input data
+	 *
+	 * @access public
+	 * @param string $data Input data
+	 */
+	public function __construct($data)
+	{
+		$this->data = $data;
+	}
+
+	/**
+	 * Parse the input data
+	 *
+	 * @access public
+	 * @return string Output data
+	 */
+	public function parse()
+	{
+		while (($this->position = strpos($this->data, '&', $this->position)) !== false)
+		{
+			$this->consume();
+			$this->entity();
+			$this->consumed = '';
+		}
+		return $this->data;
+	}
+
+	/**
+	 * Consume the next byte
+	 *
+	 * @access private
+	 * @return mixed The next byte, or false, if there is no more data
+	 */
+	public function consume()
+	{
+		if (isset($this->data[$this->position]))
+		{
+			$this->consumed .= $this->data[$this->position];
+			return $this->data[$this->position++];
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Consume a range of characters
+	 *
+	 * @access private
+	 * @param string $chars Characters to consume
+	 * @return mixed A series of characters that match the range, or false
+	 */
+	public function consume_range($chars)
+	{
+		if ($len = strspn($this->data, $chars, $this->position))
+		{
+			$data = substr($this->data, $this->position, $len);
+			$this->consumed .= $data;
+			$this->position += $len;
+			return $data;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Unconsume one byte
+	 *
+	 * @access private
+	 */
+	public function unconsume()
+	{
+		$this->consumed = substr($this->consumed, 0, -1);
+		$this->position--;
+	}
+
+	/**
+	 * Decode an entity
+	 *
+	 * @access private
+	 */
+	public function entity()
+	{
+		switch ($this->consume())
+		{
+			case "\x09":
+			case "\x0A":
+			case "\x0B":
+			case "\x0C":
+			case "\x20":
+			case "\x3C":
+			case "\x26":
+			case false:
+				break;
+
+			case "\x23":
+				switch ($this->consume())
+				{
+					case "\x78":
+					case "\x58":
+						$range = '0123456789ABCDEFabcdef';
+						$hex = true;
+						break;
+
+					default:
+						$range = '0123456789';
+						$hex = false;
+						$this->unconsume();
+						break;
+				}
+
+				if ($codepoint = $this->consume_range($range))
+				{
+					static $windows_1252_specials = array(0x0D => "\x0A", 0x80 => "\xE2\x82\xAC", 0x81 => "\xEF\xBF\xBD", 0x82 => "\xE2\x80\x9A", 0x83 => "\xC6\x92", 0x84 => "\xE2\x80\x9E", 0x85 => "\xE2\x80\xA6", 0x86 => "\xE2\x80\xA0", 0x87 => "\xE2\x80\xA1", 0x88 => "\xCB\x86", 0x89 => "\xE2\x80\xB0", 0x8A => "\xC5\xA0", 0x8B => "\xE2\x80\xB9", 0x8C => "\xC5\x92", 0x8D => "\xEF\xBF\xBD", 0x8E => "\xC5\xBD", 0x8F => "\xEF\xBF\xBD", 0x90 => "\xEF\xBF\xBD", 0x91 => "\xE2\x80\x98", 0x92 => "\xE2\x80\x99", 0x93 => "\xE2\x80\x9C", 0x94 => "\xE2\x80\x9D", 0x95 => "\xE2\x80\xA2", 0x96 => "\xE2\x80\x93", 0x97 => "\xE2\x80\x94", 0x98 => "\xCB\x9C", 0x99 => "\xE2\x84\xA2", 0x9A => "\xC5\xA1", 0x9B => "\xE2\x80\xBA", 0x9C => "\xC5\x93", 0x9D => "\xEF\xBF\xBD", 0x9E => "\xC5\xBE", 0x9F => "\xC5\xB8");
+
+					if ($hex)
+					{
+						$codepoint = hexdec($codepoint);
+					}
+					else
+					{
+						$codepoint = intval($codepoint);
+					}
+
+					if (isset($windows_1252_specials[$codepoint]))
+					{
+						$replacement = $windows_1252_specials[$codepoint];
+					}
+					else
+					{
+						$replacement = SimplePie_Misc::codepoint_to_utf8($codepoint);
+					}
+
+					if (!in_array($this->consume(), array(';', false), true))
+					{
+						$this->unconsume();
+					}
+
+					$consumed_length = strlen($this->consumed);
+					$this->data = substr_replace($this->data, $replacement, $this->position - $consumed_length, $consumed_length);
+					$this->position += strlen($replacement) - $consumed_length;
+				}
+				break;
+
+			default:
+				static $entities = array(
+					'Aacute' => "\xC3\x81",
+					'aacute' => "\xC3\xA1",
+					'Aacute;' => "\xC3\x81",
+					'aacute;' => "\xC3\xA1",
+					'Acirc' => "\xC3\x82",
+					'acirc' => "\xC3\xA2",
+					'Acirc;' => "\xC3\x82",
+					'acirc;' => "\xC3\xA2",
+					'acute' => "\xC2\xB4",
+					'acute;' => "\xC2\xB4",
+					'AElig' => "\xC3\x86",
+					'aelig' => "\xC3\xA6",
+					'AElig;' => "\xC3\x86",
+					'aelig;' => "\xC3\xA6",
+					'Agrave' => "\xC3\x80",
+					'agrave' => "\xC3\xA0",
+					'Agrave;' => "\xC3\x80",
+					'agrave;' => "\xC3\xA0",
+					'alefsym;' => "\xE2\x84\xB5",
+					'Alpha;' => "\xCE\x91",
+					'alpha;' => "\xCE\xB1",
+					'AMP' => "\x26",
+					'amp' => "\x26",
+					'AMP;' => "\x26",
+					'amp;' => "\x26",
+					'and;' => "\xE2\x88\xA7",
+					'ang;' => "\xE2\x88\xA0",
+					'apos;' => "\x27",
+					'Aring' => "\xC3\x85",
+					'aring' => "\xC3\xA5",
+					'Aring;' => "\xC3\x85",
+					'aring;' => "\xC3\xA5",
+					'asymp;' => "\xE2\x89\x88",
+					'Atilde' => "\xC3\x83",
+					'atilde' => "\xC3\xA3",
+					'Atilde;' => "\xC3\x83",
+					'atilde;' => "\xC3\xA3",
+					'Auml' => "\xC3\x84",
+					'auml' => "\xC3\xA4",
+					'Auml;' => "\xC3\x84",
+					'auml;' => "\xC3\xA4",
+					'bdquo;' => "\xE2\x80\x9E",
+					'Beta;' => "\xCE\x92",
+					'beta;' => "\xCE\xB2",
+					'brvbar' => "\xC2\xA6",
+					'brvbar;' => "\xC2\xA6",
+					'bull;' => "\xE2\x80\xA2",
+					'cap;' => "\xE2\x88\xA9",
+					'Ccedil' => "\xC3\x87",
+					'ccedil' => "\xC3\xA7",
+					'Ccedil;' => "\xC3\x87",
+					'ccedil;' => "\xC3\xA7",
+					'cedil' => "\xC2\xB8",
+					'cedil;' => "\xC2\xB8",
+					'cent' => "\xC2\xA2",
+					'cent;' => "\xC2\xA2",
+					'Chi;' => "\xCE\xA7",
+					'chi;' => "\xCF\x87",
+					'circ;' => "\xCB\x86",
+					'clubs;' => "\xE2\x99\xA3",
+					'cong;' => "\xE2\x89\x85",
+					'COPY' => "\xC2\xA9",
+					'copy' => "\xC2\xA9",
+					'COPY;' => "\xC2\xA9",
+					'copy;' => "\xC2\xA9",
+					'crarr;' => "\xE2\x86\xB5",
+					'cup;' => "\xE2\x88\xAA",
+					'curren' => "\xC2\xA4",
+					'curren;' => "\xC2\xA4",
+					'Dagger;' => "\xE2\x80\xA1",
+					'dagger;' => "\xE2\x80\xA0",
+					'dArr;' => "\xE2\x87\x93",
+					'darr;' => "\xE2\x86\x93",
+					'deg' => "\xC2\xB0",
+					'deg;' => "\xC2\xB0",
+					'Delta;' => "\xCE\x94",
+					'delta;' => "\xCE\xB4",
+					'diams;' => "\xE2\x99\xA6",
+					'divide' => "\xC3\xB7",
+					'divide;' => "\xC3\xB7",
+					'Eacute' => "\xC3\x89",
+					'eacute' => "\xC3\xA9",
+					'Eacute;' => "\xC3\x89",
+					'eacute;' => "\xC3\xA9",
+					'Ecirc' => "\xC3\x8A",
+					'ecirc' => "\xC3\xAA",
+					'Ecirc;' => "\xC3\x8A",
+					'ecirc;' => "\xC3\xAA",
+					'Egrave' => "\xC3\x88",
+					'egrave' => "\xC3\xA8",
+					'Egrave;' => "\xC3\x88",
+					'egrave;' => "\xC3\xA8",
+					'empty;' => "\xE2\x88\x85",
+					'emsp;' => "\xE2\x80\x83",
+					'ensp;' => "\xE2\x80\x82",
+					'Epsilon;' => "\xCE\x95",
+					'epsilon;' => "\xCE\xB5",
+					'equiv;' => "\xE2\x89\xA1",
+					'Eta;' => "\xCE\x97",
+					'eta;' => "\xCE\xB7",
+					'ETH' => "\xC3\x90",
+					'eth' => "\xC3\xB0",
+					'ETH;' => "\xC3\x90",
+					'eth;' => "\xC3\xB0",
+					'Euml' => "\xC3\x8B",
+					'euml' => "\xC3\xAB",
+					'Euml;' => "\xC3\x8B",
+					'euml;' => "\xC3\xAB",
+					'euro;' => "\xE2\x82\xAC",
+					'exist;' => "\xE2\x88\x83",
+					'fnof;' => "\xC6\x92",
+					'forall;' => "\xE2\x88\x80",
+					'frac12' => "\xC2\xBD",
+					'frac12;' => "\xC2\xBD",
+					'frac14' => "\xC2\xBC",
+					'frac14;' => "\xC2\xBC",
+					'frac34' => "\xC2\xBE",
+					'frac34;' => "\xC2\xBE",
+					'frasl;' => "\xE2\x81\x84",
+					'Gamma;' => "\xCE\x93",
+					'gamma;' => "\xCE\xB3",
+					'ge;' => "\xE2\x89\xA5",
+					'GT' => "\x3E",
+					'gt' => "\x3E",
+					'GT;' => "\x3E",
+					'gt;' => "\x3E",
+					'hArr;' => "\xE2\x87\x94",
+					'harr;' => "\xE2\x86\x94",
+					'hearts;' => "\xE2\x99\xA5",
+					'hellip;' => "\xE2\x80\xA6",
+					'Iacute' => "\xC3\x8D",
+					'iacute' => "\xC3\xAD",
+					'Iacute;' => "\xC3\x8D",
+					'iacute;' => "\xC3\xAD",
+					'Icirc' => "\xC3\x8E",
+					'icirc' => "\xC3\xAE",
+					'Icirc;' => "\xC3\x8E",
+					'icirc;' => "\xC3\xAE",
+					'iexcl' => "\xC2\xA1",
+					'iexcl;' => "\xC2\xA1",
+					'Igrave' => "\xC3\x8C",
+					'igrave' => "\xC3\xAC",
+					'Igrave;' => "\xC3\x8C",
+					'igrave;' => "\xC3\xAC",
+					'image;' => "\xE2\x84\x91",
+					'infin;' => "\xE2\x88\x9E",
+					'int;' => "\xE2\x88\xAB",
+					'Iota;' => "\xCE\x99",
+					'iota;' => "\xCE\xB9",
+					'iquest' => "\xC2\xBF",
+					'iquest;' => "\xC2\xBF",
+					'isin;' => "\xE2\x88\x88",
+					'Iuml' => "\xC3\x8F",
+					'iuml' => "\xC3\xAF",
+					'Iuml;' => "\xC3\x8F",
+					'iuml;' => "\xC3\xAF",
+					'Kappa;' => "\xCE\x9A",
+					'kappa;' => "\xCE\xBA",
+					'Lambda;' => "\xCE\x9B",
+					'lambda;' => "\xCE\xBB",
+					'lang;' => "\xE3\x80\x88",
+					'laquo' => "\xC2\xAB",
+					'laquo;' => "\xC2\xAB",
+					'lArr;' => "\xE2\x87\x90",
+					'larr;' => "\xE2\x86\x90",
+					'lceil;' => "\xE2\x8C\x88",
+					'ldquo;' => "\xE2\x80\x9C",
+					'le;' => "\xE2\x89\xA4",
+					'lfloor;' => "\xE2\x8C\x8A",
+					'lowast;' => "\xE2\x88\x97",
+					'loz;' => "\xE2\x97\x8A",
+					'lrm;' => "\xE2\x80\x8E",
+					'lsaquo;' => "\xE2\x80\xB9",
+					'lsquo;' => "\xE2\x80\x98",
+					'LT' => "\x3C",
+					'lt' => "\x3C",
+					'LT;' => "\x3C",
+					'lt;' => "\x3C",
+					'macr' => "\xC2\xAF",
+					'macr;' => "\xC2\xAF",
+					'mdash;' => "\xE2\x80\x94",
+					'micro' => "\xC2\xB5",
+					'micro;' => "\xC2\xB5",
+					'middot' => "\xC2\xB7",
+					'middot;' => "\xC2\xB7",
+					'minus;' => "\xE2\x88\x92",
+					'Mu;' => "\xCE\x9C",
+					'mu;' => "\xCE\xBC",
+					'nabla;' => "\xE2\x88\x87",
+					'nbsp' => "\xC2\xA0",
+					'nbsp;' => "\xC2\xA0",
+					'ndash;' => "\xE2\x80\x93",
+					'ne;' => "\xE2\x89\xA0",
+					'ni;' => "\xE2\x88\x8B",
+					'not' => "\xC2\xAC",
+					'not;' => "\xC2\xAC",
+					'notin;' => "\xE2\x88\x89",
+					'nsub;' => "\xE2\x8A\x84",
+					'Ntilde' => "\xC3\x91",
+					'ntilde' => "\xC3\xB1",
+					'Ntilde;' => "\xC3\x91",
+					'ntilde;' => "\xC3\xB1",
+					'Nu;' => "\xCE\x9D",
+					'nu;' => "\xCE\xBD",
+					'Oacute' => "\xC3\x93",
+					'oacute' => "\xC3\xB3",
+					'Oacute;' => "\xC3\x93",
+					'oacute;' => "\xC3\xB3",
+					'Ocirc' => "\xC3\x94",
+					'ocirc' => "\xC3\xB4",
+					'Ocirc;' => "\xC3\x94",
+					'ocirc;' => "\xC3\xB4",
+					'OElig;' => "\xC5\x92",
+					'oelig;' => "\xC5\x93",
+					'Ograve' => "\xC3\x92",
+					'ograve' => "\xC3\xB2",
+					'Ograve;' => "\xC3\x92",
+					'ograve;' => "\xC3\xB2",
+					'oline;' => "\xE2\x80\xBE",
+					'Omega;' => "\xCE\xA9",
+					'omega;' => "\xCF\x89",
+					'Omicron;' => "\xCE\x9F",
+					'omicron;' => "\xCE\xBF",
+					'oplus;' => "\xE2\x8A\x95",
+					'or;' => "\xE2\x88\xA8",
+					'ordf' => "\xC2\xAA",
+					'ordf;' => "\xC2\xAA",
+					'ordm' => "\xC2\xBA",
+					'ordm;' => "\xC2\xBA",
+					'Oslash' => "\xC3\x98",
+					'oslash' => "\xC3\xB8",
+					'Oslash;' => "\xC3\x98",
+					'oslash;' => "\xC3\xB8",
+					'Otilde' => "\xC3\x95",
+					'otilde' => "\xC3\xB5",
+					'Otilde;' => "\xC3\x95",
+					'otilde;' => "\xC3\xB5",
+					'otimes;' => "\xE2\x8A\x97",
+					'Ouml' => "\xC3\x96",
+					'ouml' => "\xC3\xB6",
+					'Ouml;' => "\xC3\x96",
+					'ouml;' => "\xC3\xB6",
+					'para' => "\xC2\xB6",
+					'para;' => "\xC2\xB6",
+					'part;' => "\xE2\x88\x82",
+					'permil;' => "\xE2\x80\xB0",
+					'perp;' => "\xE2\x8A\xA5",
+					'Phi;' => "\xCE\xA6",
+					'phi;' => "\xCF\x86",
+					'Pi;' => "\xCE\xA0",
+					'pi;' => "\xCF\x80",
+					'piv;' => "\xCF\x96",
+					'plusmn' => "\xC2\xB1",
+					'plusmn;' => "\xC2\xB1",
+					'pound' => "\xC2\xA3",
+					'pound;' => "\xC2\xA3",
+					'Prime;' => "\xE2\x80\xB3",
+					'prime;' => "\xE2\x80\xB2",
+					'prod;' => "\xE2\x88\x8F",
+					'prop;' => "\xE2\x88\x9D",
+					'Psi;' => "\xCE\xA8",
+					'psi;' => "\xCF\x88",
+					'QUOT' => "\x22",
+					'quot' => "\x22",
+					'QUOT;' => "\x22",
+					'quot;' => "\x22",
+					'radic;' => "\xE2\x88\x9A",
+					'rang;' => "\xE3\x80\x89",
+					'raquo' => "\xC2\xBB",
+					'raquo;' => "\xC2\xBB",
+					'rArr;' => "\xE2\x87\x92",
+					'rarr;' => "\xE2\x86\x92",
+					'rceil;' => "\xE2\x8C\x89",
+					'rdquo;' => "\xE2\x80\x9D",
+					'real;' => "\xE2\x84\x9C",
+					'REG' => "\xC2\xAE",
+					'reg' => "\xC2\xAE",
+					'REG;' => "\xC2\xAE",
+					'reg;' => "\xC2\xAE",
+					'rfloor;' => "\xE2\x8C\x8B",
+					'Rho;' => "\xCE\xA1",
+					'rho;' => "\xCF\x81",
+					'rlm;' => "\xE2\x80\x8F",
+					'rsaquo;' => "\xE2\x80\xBA",
+					'rsquo;' => "\xE2\x80\x99",
+					'sbquo;' => "\xE2\x80\x9A",
+					'Scaron;' => "\xC5\xA0",
+					'scaron;' => "\xC5\xA1",
+					'sdot;' => "\xE2\x8B\x85",
+					'sect' => "\xC2\xA7",
+					'sect;' => "\xC2\xA7",
+					'shy' => "\xC2\xAD",
+					'shy;' => "\xC2\xAD",
+					'Sigma;' => "\xCE\xA3",
+					'sigma;' => "\xCF\x83",
+					'sigmaf;' => "\xCF\x82",
+					'sim;' => "\xE2\x88\xBC",
+					'spades;' => "\xE2\x99\xA0",
+					'sub;' => "\xE2\x8A\x82",
+					'sube;' => "\xE2\x8A\x86",
+					'sum;' => "\xE2\x88\x91",
+					'sup;' => "\xE2\x8A\x83",
+					'sup1' => "\xC2\xB9",
+					'sup1;' => "\xC2\xB9",
+					'sup2' => "\xC2\xB2",
+					'sup2;' => "\xC2\xB2",
+					'sup3' => "\xC2\xB3",
+					'sup3;' => "\xC2\xB3",
+					'supe;' => "\xE2\x8A\x87",
+					'szlig' => "\xC3\x9F",
+					'szlig;' => "\xC3\x9F",
+					'Tau;' => "\xCE\xA4",
+					'tau;' => "\xCF\x84",
+					'there4;' => "\xE2\x88\xB4",
+					'Theta;' => "\xCE\x98",
+					'theta;' => "\xCE\xB8",
+					'thetasym;' => "\xCF\x91",
+					'thinsp;' => "\xE2\x80\x89",
+					'THORN' => "\xC3\x9E",
+					'thorn' => "\xC3\xBE",
+					'THORN;' => "\xC3\x9E",
+					'thorn;' => "\xC3\xBE",
+					'tilde;' => "\xCB\x9C",
+					'times' => "\xC3\x97",
+					'times;' => "\xC3\x97",
+					'TRADE;' => "\xE2\x84\xA2",
+					'trade;' => "\xE2\x84\xA2",
+					'Uacute' => "\xC3\x9A",
+					'uacute' => "\xC3\xBA",
+					'Uacute;' => "\xC3\x9A",
+					'uacute;' => "\xC3\xBA",
+					'uArr;' => "\xE2\x87\x91",
+					'uarr;' => "\xE2\x86\x91",
+					'Ucirc' => "\xC3\x9B",
+					'ucirc' => "\xC3\xBB",
+					'Ucirc;' => "\xC3\x9B",
+					'ucirc;' => "\xC3\xBB",
+					'Ugrave' => "\xC3\x99",
+					'ugrave' => "\xC3\xB9",
+					'Ugrave;' => "\xC3\x99",
+					'ugrave;' => "\xC3\xB9",
+					'uml' => "\xC2\xA8",
+					'uml;' => "\xC2\xA8",
+					'upsih;' => "\xCF\x92",
+					'Upsilon;' => "\xCE\xA5",
+					'upsilon;' => "\xCF\x85",
+					'Uuml' => "\xC3\x9C",
+					'uuml' => "\xC3\xBC",
+					'Uuml;' => "\xC3\x9C",
+					'uuml;' => "\xC3\xBC",
+					'weierp;' => "\xE2\x84\x98",
+					'Xi;' => "\xCE\x9E",
+					'xi;' => "\xCE\xBE",
+					'Yacute' => "\xC3\x9D",
+					'yacute' => "\xC3\xBD",
+					'Yacute;' => "\xC3\x9D",
+					'yacute;' => "\xC3\xBD",
+					'yen' => "\xC2\xA5",
+					'yen;' => "\xC2\xA5",
+					'yuml' => "\xC3\xBF",
+					'Yuml;' => "\xC5\xB8",
+					'yuml;' => "\xC3\xBF",
+					'Zeta;' => "\xCE\x96",
+					'zeta;' => "\xCE\xB6",
+					'zwj;' => "\xE2\x80\x8D",
+					'zwnj;' => "\xE2\x80\x8C"
+				);
+
+				for ($i = 0, $match = null; $i < 9 && $this->consume() !== false; $i++)
+				{
+					$consumed = substr($this->consumed, 1);
+					if (isset($entities[$consumed]))
+					{
+						$match = $consumed;
+					}
+				}
+
+				if ($match !== null)
+				{
+ 					$this->data = substr_replace($this->data, $entities[$match], $this->position - strlen($consumed) - 1, strlen($match) + 1);
+					$this->position += strlen($entities[$match]) - strlen($consumed) - 1;
+				}
+				break;
+		}
+	}
+}
+
diff --git a/lib/vendor/simplepie/SimplePie/Enclosure.php b/lib/vendor/simplepie/SimplePie/Enclosure.php
new file mode 100644
index 000000000..15060e193
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Enclosure.php
@@ -0,0 +1,1379 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Handles everything related to enclosures (including Media RSS and iTunes RSS)
+ *
+ * Used by {@see SimplePie_Item::get_enclosure()} and {@see SimplePie_Item::get_enclosures()}
+ *
+ * This class can be overloaded with {@see SimplePie::set_enclosure_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie_Enclosure
+{
+	/**
+	 * @var string
+	 * @see get_bitrate()
+	 */
+	var $bitrate;
+
+	/**
+	 * @var array
+	 * @see get_captions()
+	 */
+	var $captions;
+
+	/**
+	 * @var array
+	 * @see get_categories()
+	 */
+	var $categories;
+
+	/**
+	 * @var int
+	 * @see get_channels()
+	 */
+	var $channels;
+
+	/**
+	 * @var SimplePie_Copyright
+	 * @see get_copyright()
+	 */
+	var $copyright;
+
+	/**
+	 * @var array
+	 * @see get_credits()
+	 */
+	var $credits;
+
+	/**
+	 * @var string
+	 * @see get_description()
+	 */
+	var $description;
+
+	/**
+	 * @var int
+	 * @see get_duration()
+	 */
+	var $duration;
+
+	/**
+	 * @var string
+	 * @see get_expression()
+	 */
+	var $expression;
+
+	/**
+	 * @var string
+	 * @see get_framerate()
+	 */
+	var $framerate;
+
+	/**
+	 * @var string
+	 * @see get_handler()
+	 */
+	var $handler;
+
+	/**
+	 * @var array
+	 * @see get_hashes()
+	 */
+	var $hashes;
+
+	/**
+	 * @var string
+	 * @see get_height()
+	 */
+	var $height;
+
+	/**
+	 * @deprecated
+	 * @var null
+	 */
+	var $javascript;
+
+	/**
+	 * @var array
+	 * @see get_keywords()
+	 */
+	var $keywords;
+
+	/**
+	 * @var string
+	 * @see get_language()
+	 */
+	var $lang;
+
+	/**
+	 * @var string
+	 * @see get_length()
+	 */
+	var $length;
+
+	/**
+	 * @var string
+	 * @see get_link()
+	 */
+	var $link;
+
+	/**
+	 * @var string
+	 * @see get_medium()
+	 */
+	var $medium;
+
+	/**
+	 * @var string
+	 * @see get_player()
+	 */
+	var $player;
+
+	/**
+	 * @var array
+	 * @see get_ratings()
+	 */
+	var $ratings;
+
+	/**
+	 * @var array
+	 * @see get_restrictions()
+	 */
+	var $restrictions;
+
+	/**
+	 * @var string
+	 * @see get_sampling_rate()
+	 */
+	var $samplingrate;
+
+	/**
+	 * @var array
+	 * @see get_thumbnails()
+	 */
+	var $thumbnails;
+
+	/**
+	 * @var string
+	 * @see get_title()
+	 */
+	var $title;
+
+	/**
+	 * @var string
+	 * @see get_type()
+	 */
+	var $type;
+
+	/**
+	 * @var string
+	 * @see get_width()
+	 */
+	var $width;
+
+	/**
+	 * Constructor, used to input the data
+	 *
+	 * For documentation on all the parameters, see the corresponding
+	 * properties and their accessors
+	 *
+	 * @uses idna_convert If available, this will convert an IDN
+	 */
+	public function __construct($link = null, $type = null, $length = null, $javascript = null, $bitrate = null, $captions = null, $categories = null, $channels = null, $copyright = null, $credits = null, $description = null, $duration = null, $expression = null, $framerate = null, $hashes = null, $height = null, $keywords = null, $lang = null, $medium = null, $player = null, $ratings = null, $restrictions = null, $samplingrate = null, $thumbnails = null, $title = null, $width = null)
+	{
+		$this->bitrate = $bitrate;
+		$this->captions = $captions;
+		$this->categories = $categories;
+		$this->channels = $channels;
+		$this->copyright = $copyright;
+		$this->credits = $credits;
+		$this->description = $description;
+		$this->duration = $duration;
+		$this->expression = $expression;
+		$this->framerate = $framerate;
+		$this->hashes = $hashes;
+		$this->height = $height;
+		$this->keywords = $keywords;
+		$this->lang = $lang;
+		$this->length = $length;
+		$this->link = $link;
+		$this->medium = $medium;
+		$this->player = $player;
+		$this->ratings = $ratings;
+		$this->restrictions = $restrictions;
+		$this->samplingrate = $samplingrate;
+		$this->thumbnails = $thumbnails;
+		$this->title = $title;
+		$this->type = $type;
+		$this->width = $width;
+
+		if (class_exists('idna_convert'))
+		{
+			$idn = new idna_convert();
+			$parsed = SimplePie_Misc::parse_url($link);
+			$this->link = SimplePie_Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], $parsed['fragment']);
+		}
+		$this->handler = $this->get_handler(); // Needs to load last
+	}
+
+	/**
+	 * String-ified version
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		// There is no $this->data here
+		return md5(serialize($this));
+	}
+
+	/**
+	 * Get the bitrate
+	 *
+	 * @return string|null
+	 */
+	public function get_bitrate()
+	{
+		if ($this->bitrate !== null)
+		{
+			return $this->bitrate;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get a single caption
+	 *
+	 * @param int $key
+	 * @return SimplePie_Caption|null
+	 */
+	public function get_caption($key = 0)
+	{
+		$captions = $this->get_captions();
+		if (isset($captions[$key]))
+		{
+			return $captions[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all captions
+	 *
+	 * @return array|null Array of {@see SimplePie_Caption} objects
+	 */
+	public function get_captions()
+	{
+		if ($this->captions !== null)
+		{
+			return $this->captions;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get a single category
+	 *
+	 * @param int $key
+	 * @return SimplePie_Category|null
+	 */
+	public function get_category($key = 0)
+	{
+		$categories = $this->get_categories();
+		if (isset($categories[$key]))
+		{
+			return $categories[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all categories
+	 *
+	 * @return array|null Array of {@see SimplePie_Category} objects
+	 */
+	public function get_categories()
+	{
+		if ($this->categories !== null)
+		{
+			return $this->categories;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the number of audio channels
+	 *
+	 * @return int|null
+	 */
+	public function get_channels()
+	{
+		if ($this->channels !== null)
+		{
+			return $this->channels;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the copyright information
+	 *
+	 * @return SimplePie_Copyright|null
+	 */
+	public function get_copyright()
+	{
+		if ($this->copyright !== null)
+		{
+			return $this->copyright;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get a single credit
+	 *
+	 * @param int $key
+	 * @return SimplePie_Credit|null
+	 */
+	public function get_credit($key = 0)
+	{
+		$credits = $this->get_credits();
+		if (isset($credits[$key]))
+		{
+			return $credits[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all credits
+	 *
+	 * @return array|null Array of {@see SimplePie_Credit} objects
+	 */
+	public function get_credits()
+	{
+		if ($this->credits !== null)
+		{
+			return $this->credits;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the description of the enclosure
+	 *
+	 * @return string|null
+	 */
+	public function get_description()
+	{
+		if ($this->description !== null)
+		{
+			return $this->description;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the duration of the enclosure
+	 *
+	 * @param bool $convert Convert seconds into hh:mm:ss
+	 * @return string|int|null 'hh:mm:ss' string if `$convert` was specified, otherwise integer (or null if none found)
+	 */
+	public function get_duration($convert = false)
+	{
+		if ($this->duration !== null)
+		{
+			if ($convert)
+			{
+				$time = SimplePie_Misc::time_hms($this->duration);
+				return $time;
+			}
+			else
+			{
+				return $this->duration;
+			}
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the expression
+	 *
+	 * @return string Probably one of 'sample', 'full', 'nonstop', 'clip'. Defaults to 'full'
+	 */
+	public function get_expression()
+	{
+		if ($this->expression !== null)
+		{
+			return $this->expression;
+		}
+		else
+		{
+			return 'full';
+		}
+	}
+
+	/**
+	 * Get the file extension
+	 *
+	 * @return string|null
+	 */
+	public function get_extension()
+	{
+		if ($this->link !== null)
+		{
+			$url = SimplePie_Misc::parse_url($this->link);
+			if ($url['path'] !== '')
+			{
+				return pathinfo($url['path'], PATHINFO_EXTENSION);
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Get the framerate (in frames-per-second)
+	 *
+	 * @return string|null
+	 */
+	public function get_framerate()
+	{
+		if ($this->framerate !== null)
+		{
+			return $this->framerate;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the preferred handler
+	 *
+	 * @return string|null One of 'flash', 'fmedia', 'quicktime', 'wmedia', 'mp3'
+	 */
+	public function get_handler()
+	{
+		return $this->get_real_type(true);
+	}
+
+	/**
+	 * Get a single hash
+	 *
+	 * @link http://www.rssboard.org/media-rss#media-hash
+	 * @param int $key
+	 * @return string|null Hash as per `media:hash`, prefixed with "$algo:"
+	 */
+	public function get_hash($key = 0)
+	{
+		$hashes = $this->get_hashes();
+		if (isset($hashes[$key]))
+		{
+			return $hashes[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all credits
+	 *
+	 * @return array|null Array of strings, see {@see get_hash()}
+	 */
+	public function get_hashes()
+	{
+		if ($this->hashes !== null)
+		{
+			return $this->hashes;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the height
+	 *
+	 * @return string|null
+	 */
+	public function get_height()
+	{
+		if ($this->height !== null)
+		{
+			return $this->height;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the language
+	 *
+	 * @link http://tools.ietf.org/html/rfc3066
+	 * @return string|null Language code as per RFC 3066
+	 */
+	public function get_language()
+	{
+		if ($this->lang !== null)
+		{
+			return $this->lang;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get a single keyword
+	 *
+	 * @param int $key
+	 * @return string|null
+	 */
+	public function get_keyword($key = 0)
+	{
+		$keywords = $this->get_keywords();
+		if (isset($keywords[$key]))
+		{
+			return $keywords[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all keywords
+	 *
+	 * @return array|null Array of strings
+	 */
+	public function get_keywords()
+	{
+		if ($this->keywords !== null)
+		{
+			return $this->keywords;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get length
+	 *
+	 * @return float Length in bytes
+	 */
+	public function get_length()
+	{
+		if ($this->length !== null)
+		{
+			return $this->length;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the URL
+	 *
+	 * @return string|null
+	 */
+	public function get_link()
+	{
+		if ($this->link !== null)
+		{
+			return urldecode($this->link);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the medium
+	 *
+	 * @link http://www.rssboard.org/media-rss#media-content
+	 * @return string|null Should be one of 'image', 'audio', 'video', 'document', 'executable'
+	 */
+	public function get_medium()
+	{
+		if ($this->medium !== null)
+		{
+			return $this->medium;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the player URL
+	 *
+	 * Typically the same as {@see get_permalink()}
+	 * @return string|null Player URL
+	 */
+	public function get_player()
+	{
+		if ($this->player !== null)
+		{
+			return $this->player;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get a single rating
+	 *
+	 * @param int $key
+	 * @return SimplePie_Rating|null
+	 */
+	public function get_rating($key = 0)
+	{
+		$ratings = $this->get_ratings();
+		if (isset($ratings[$key]))
+		{
+			return $ratings[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all ratings
+	 *
+	 * @return array|null Array of {@see SimplePie_Rating} objects
+	 */
+	public function get_ratings()
+	{
+		if ($this->ratings !== null)
+		{
+			return $this->ratings;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get a single restriction
+	 *
+	 * @param int $key
+	 * @return SimplePie_Restriction|null
+	 */
+	public function get_restriction($key = 0)
+	{
+		$restrictions = $this->get_restrictions();
+		if (isset($restrictions[$key]))
+		{
+			return $restrictions[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all restrictions
+	 *
+	 * @return array|null Array of {@see SimplePie_Restriction} objects
+	 */
+	public function get_restrictions()
+	{
+		if ($this->restrictions !== null)
+		{
+			return $this->restrictions;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the sampling rate (in kHz)
+	 *
+	 * @return string|null
+	 */
+	public function get_sampling_rate()
+	{
+		if ($this->samplingrate !== null)
+		{
+			return $this->samplingrate;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the file size (in MiB)
+	 *
+	 * @return float|null File size in mebibytes (1048 bytes)
+	 */
+	public function get_size()
+	{
+		$length = $this->get_length();
+		if ($length !== null)
+		{
+			return round($length/1048576, 2);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get a single thumbnail
+	 *
+	 * @param int $key
+	 * @return string|null Thumbnail URL
+	 */
+	public function get_thumbnail($key = 0)
+	{
+		$thumbnails = $this->get_thumbnails();
+		if (isset($thumbnails[$key]))
+		{
+			return $thumbnails[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all thumbnails
+	 *
+	 * @return array|null Array of thumbnail URLs
+	 */
+	public function get_thumbnails()
+	{
+		if ($this->thumbnails !== null)
+		{
+			return $this->thumbnails;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the title
+	 *
+	 * @return string|null
+	 */
+	public function get_title()
+	{
+		if ($this->title !== null)
+		{
+			return $this->title;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get mimetype of the enclosure
+	 *
+	 * @see get_real_type()
+	 * @return string|null MIME type
+	 */
+	public function get_type()
+	{
+		if ($this->type !== null)
+		{
+			return $this->type;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the width
+	 *
+	 * @return string|null
+	 */
+	public function get_width()
+	{
+		if ($this->width !== null)
+		{
+			return $this->width;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Embed the enclosure using `<embed>`
+	 *
+	 * @deprecated Use the second parameter to {@see embed} instead
+	 *
+	 * @param array|string $options See first paramter to {@see embed}
+	 * @return string HTML string to output
+	 */
+	public function native_embed($options='')
+	{
+		return $this->embed($options, true);
+	}
+
+	/**
+	 * Embed the enclosure using Javascript
+	 *
+	 * `$options` is an array or comma-separated key:value string, with the
+	 * following properties:
+	 *
+	 * - `alt` (string): Alternate content for when an end-user does not have
+	 *    the appropriate handler installed or when a file type is
+	 *    unsupported. Can be any text or HTML. Defaults to blank.
+	 * - `altclass` (string): If a file type is unsupported, the end-user will
+	 *    see the alt text (above) linked directly to the content. That link
+	 *    will have this value as its class name. Defaults to blank.
+	 * - `audio` (string): This is an image that should be used as a
+	 *    placeholder for audio files before they're loaded (QuickTime-only).
+	 *    Can be any relative or absolute URL. Defaults to blank.
+	 * - `bgcolor` (string): The background color for the media, if not
+	 *    already transparent. Defaults to `#ffffff`.
+	 * - `height` (integer): The height of the embedded media. Accepts any
+	 *    numeric pixel value (such as `360`) or `auto`. Defaults to `auto`,
+	 *    and it is recommended that you use this default.
+	 * - `loop` (boolean): Do you want the media to loop when it's done?
+	 *    Defaults to `false`.
+	 * - `mediaplayer` (string): The location of the included
+	 *    `mediaplayer.swf` file. This allows for the playback of Flash Video
+	 *    (`.flv`) files, and is the default handler for non-Odeo MP3's.
+	 *    Defaults to blank.
+	 * - `video` (string): This is an image that should be used as a
+	 *    placeholder for video files before they're loaded (QuickTime-only).
+	 *    Can be any relative or absolute URL. Defaults to blank.
+	 * - `width` (integer): The width of the embedded media. Accepts any
+	 *    numeric pixel value (such as `480`) or `auto`. Defaults to `auto`,
+	 *    and it is recommended that you use this default.
+	 * - `widescreen` (boolean): Is the enclosure widescreen or standard?
+	 *    This applies only to video enclosures, and will automatically resize
+	 *    the content appropriately.  Defaults to `false`, implying 4:3 mode.
+	 *
+	 * Note: Non-widescreen (4:3) mode with `width` and `height` set to `auto`
+	 * will default to 480x360 video resolution.  Widescreen (16:9) mode with
+	 * `width` and `height` set to `auto` will default to 480x270 video resolution.
+	 *
+	 * @todo If the dimensions for media:content are defined, use them when width/height are set to 'auto'.
+	 * @param array|string $options Comma-separated key:value list, or array
+	 * @param bool $native Use `<embed>`
+	 * @return string HTML string to output
+	 */
+	public function embed($options = '', $native = false)
+	{
+		// Set up defaults
+		$audio = '';
+		$video = '';
+		$alt = '';
+		$altclass = '';
+		$loop = 'false';
+		$width = 'auto';
+		$height = 'auto';
+		$bgcolor = '#ffffff';
+		$mediaplayer = '';
+		$widescreen = false;
+		$handler = $this->get_handler();
+		$type = $this->get_real_type();
+
+		// Process options and reassign values as necessary
+		if (is_array($options))
+		{
+			extract($options);
+		}
+		else
+		{
+			$options = explode(',', $options);
+			foreach($options as $option)
+			{
+				$opt = explode(':', $option, 2);
+				if (isset($opt[0], $opt[1]))
+				{
+					$opt[0] = trim($opt[0]);
+					$opt[1] = trim($opt[1]);
+					switch ($opt[0])
+					{
+						case 'audio':
+							$audio = $opt[1];
+							break;
+
+						case 'video':
+							$video = $opt[1];
+							break;
+
+						case 'alt':
+							$alt = $opt[1];
+							break;
+
+						case 'altclass':
+							$altclass = $opt[1];
+							break;
+
+						case 'loop':
+							$loop = $opt[1];
+							break;
+
+						case 'width':
+							$width = $opt[1];
+							break;
+
+						case 'height':
+							$height = $opt[1];
+							break;
+
+						case 'bgcolor':
+							$bgcolor = $opt[1];
+							break;
+
+						case 'mediaplayer':
+							$mediaplayer = $opt[1];
+							break;
+
+						case 'widescreen':
+							$widescreen = $opt[1];
+							break;
+					}
+				}
+			}
+		}
+
+		$mime = explode('/', $type, 2);
+		$mime = $mime[0];
+
+		// Process values for 'auto'
+		if ($width === 'auto')
+		{
+			if ($mime === 'video')
+			{
+				if ($height === 'auto')
+				{
+					$width = 480;
+				}
+				elseif ($widescreen)
+				{
+					$width = round((intval($height)/9)*16);
+				}
+				else
+				{
+					$width = round((intval($height)/3)*4);
+				}
+			}
+			else
+			{
+				$width = '100%';
+			}
+		}
+
+		if ($height === 'auto')
+		{
+			if ($mime === 'audio')
+			{
+				$height = 0;
+			}
+			elseif ($mime === 'video')
+			{
+				if ($width === 'auto')
+				{
+					if ($widescreen)
+					{
+						$height = 270;
+					}
+					else
+					{
+						$height = 360;
+					}
+				}
+				elseif ($widescreen)
+				{
+					$height = round((intval($width)/16)*9);
+				}
+				else
+				{
+					$height = round((intval($width)/4)*3);
+				}
+			}
+			else
+			{
+				$height = 376;
+			}
+		}
+		elseif ($mime === 'audio')
+		{
+			$height = 0;
+		}
+
+		// Set proper placeholder value
+		if ($mime === 'audio')
+		{
+			$placeholder = $audio;
+		}
+		elseif ($mime === 'video')
+		{
+			$placeholder = $video;
+		}
+
+		$embed = '';
+
+		// Flash
+		if ($handler === 'flash')
+		{
+			if ($native)
+			{
+				$embed .= "<embed src=\"" . $this->get_link() . "\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"$type\" quality=\"high\" width=\"$width\" height=\"$height\" bgcolor=\"$bgcolor\" loop=\"$loop\"></embed>";
+			}
+			else
+			{
+				$embed .= "<script type='text/javascript'>embed_flash('$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$loop', '$type');</script>";
+			}
+		}
+
+		// Flash Media Player file types.
+		// Preferred handler for MP3 file types.
+		elseif ($handler === 'fmedia' || ($handler === 'mp3' && $mediaplayer !== ''))
+		{
+			$height += 20;
+			if ($native)
+			{
+				$embed .= "<embed src=\"$mediaplayer\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"application/x-shockwave-flash\" quality=\"high\" width=\"$width\" height=\"$height\" wmode=\"transparent\" flashvars=\"file=" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "&autostart=false&repeat=$loop&showdigits=true&showfsbutton=false\"></embed>";
+			}
+			else
+			{
+				$embed .= "<script type='text/javascript'>embed_flv('$width', '$height', '" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "', '$placeholder', '$loop', '$mediaplayer');</script>";
+			}
+		}
+
+		// QuickTime 7 file types.  Need to test with QuickTime 6.
+		// Only handle MP3's if the Flash Media Player is not present.
+		elseif ($handler === 'quicktime' || ($handler === 'mp3' && $mediaplayer === ''))
+		{
+			$height += 16;
+			if ($native)
+			{
+				if ($placeholder !== '')
+				{
+					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" href=\"" . $this->get_link() . "\" src=\"$placeholder\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"false\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
+				}
+				else
+				{
+					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" src=\"" . $this->get_link() . "\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"true\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
+				}
+			}
+			else
+			{
+				$embed .= "<script type='text/javascript'>embed_quicktime('$type', '$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$placeholder', '$loop');</script>";
+			}
+		}
+
+		// Windows Media
+		elseif ($handler === 'wmedia')
+		{
+			$height += 45;
+			if ($native)
+			{
+				$embed .= "<embed type=\"application/x-mplayer2\" src=\"" . $this->get_link() . "\" autosize=\"1\" width=\"$width\" height=\"$height\" showcontrols=\"1\" showstatusbar=\"0\" showdisplay=\"0\" autostart=\"0\"></embed>";
+			}
+			else
+			{
+				$embed .= "<script type='text/javascript'>embed_wmedia('$width', '$height', '" . $this->get_link() . "');</script>";
+			}
+		}
+
+		// Everything else
+		else $embed .= '<a href="' . $this->get_link() . '" class="' . $altclass . '">' . $alt . '</a>';
+
+		return $embed;
+	}
+
+	/**
+	 * Get the real media type
+	 *
+	 * Often, feeds lie to us, necessitating a bit of deeper inspection. This
+	 * converts types to their canonical representations based on the file
+	 * extension
+	 *
+	 * @see get_type()
+	 * @param bool $find_handler Internal use only, use {@see get_handler()} instead
+	 * @return string MIME type
+	 */
+	public function get_real_type($find_handler = false)
+	{
+		// Mime-types by handler.
+		$types_flash = array('application/x-shockwave-flash', 'application/futuresplash'); // Flash
+		$types_fmedia = array('video/flv', 'video/x-flv','flv-application/octet-stream'); // Flash Media Player
+		$types_quicktime = array('audio/3gpp', 'audio/3gpp2', 'audio/aac', 'audio/x-aac', 'audio/aiff', 'audio/x-aiff', 'audio/mid', 'audio/midi', 'audio/x-midi', 'audio/mp4', 'audio/m4a', 'audio/x-m4a', 'audio/wav', 'audio/x-wav', 'video/3gpp', 'video/3gpp2', 'video/m4v', 'video/x-m4v', 'video/mp4', 'video/mpeg', 'video/x-mpeg', 'video/quicktime', 'video/sd-video'); // QuickTime
+		$types_wmedia = array('application/asx', 'application/x-mplayer2', 'audio/x-ms-wma', 'audio/x-ms-wax', 'video/x-ms-asf-plugin', 'video/x-ms-asf', 'video/x-ms-wm', 'video/x-ms-wmv', 'video/x-ms-wvx'); // Windows Media
+		$types_mp3 = array('audio/mp3', 'audio/x-mp3', 'audio/mpeg', 'audio/x-mpeg'); // MP3
+
+		if ($this->get_type() !== null)
+		{
+			$type = strtolower($this->type);
+		}
+		else
+		{
+			$type = null;
+		}
+
+		// If we encounter an unsupported mime-type, check the file extension and guess intelligently.
+		if (!in_array($type, array_merge($types_flash, $types_fmedia, $types_quicktime, $types_wmedia, $types_mp3)))
+		{
+			switch (strtolower($this->get_extension()))
+			{
+				// Audio mime-types
+				case 'aac':
+				case 'adts':
+					$type = 'audio/acc';
+					break;
+
+				case 'aif':
+				case 'aifc':
+				case 'aiff':
+				case 'cdda':
+					$type = 'audio/aiff';
+					break;
+
+				case 'bwf':
+					$type = 'audio/wav';
+					break;
+
+				case 'kar':
+				case 'mid':
+				case 'midi':
+				case 'smf':
+					$type = 'audio/midi';
+					break;
+
+				case 'm4a':
+					$type = 'audio/x-m4a';
+					break;
+
+				case 'mp3':
+				case 'swa':
+					$type = 'audio/mp3';
+					break;
+
+				case 'wav':
+					$type = 'audio/wav';
+					break;
+
+				case 'wax':
+					$type = 'audio/x-ms-wax';
+					break;
+
+				case 'wma':
+					$type = 'audio/x-ms-wma';
+					break;
+
+				// Video mime-types
+				case '3gp':
+				case '3gpp':
+					$type = 'video/3gpp';
+					break;
+
+				case '3g2':
+				case '3gp2':
+					$type = 'video/3gpp2';
+					break;
+
+				case 'asf':
+					$type = 'video/x-ms-asf';
+					break;
+
+				case 'flv':
+					$type = 'video/x-flv';
+					break;
+
+				case 'm1a':
+				case 'm1s':
+				case 'm1v':
+				case 'm15':
+				case 'm75':
+				case 'mp2':
+				case 'mpa':
+				case 'mpeg':
+				case 'mpg':
+				case 'mpm':
+				case 'mpv':
+					$type = 'video/mpeg';
+					break;
+
+				case 'm4v':
+					$type = 'video/x-m4v';
+					break;
+
+				case 'mov':
+				case 'qt':
+					$type = 'video/quicktime';
+					break;
+
+				case 'mp4':
+				case 'mpg4':
+					$type = 'video/mp4';
+					break;
+
+				case 'sdv':
+					$type = 'video/sd-video';
+					break;
+
+				case 'wm':
+					$type = 'video/x-ms-wm';
+					break;
+
+				case 'wmv':
+					$type = 'video/x-ms-wmv';
+					break;
+
+				case 'wvx':
+					$type = 'video/x-ms-wvx';
+					break;
+
+				// Flash mime-types
+				case 'spl':
+					$type = 'application/futuresplash';
+					break;
+
+				case 'swf':
+					$type = 'application/x-shockwave-flash';
+					break;
+			}
+		}
+
+		if ($find_handler)
+		{
+			if (in_array($type, $types_flash))
+			{
+				return 'flash';
+			}
+			elseif (in_array($type, $types_fmedia))
+			{
+				return 'fmedia';
+			}
+			elseif (in_array($type, $types_quicktime))
+			{
+				return 'quicktime';
+			}
+			elseif (in_array($type, $types_wmedia))
+			{
+				return 'wmedia';
+			}
+			elseif (in_array($type, $types_mp3))
+			{
+				return 'mp3';
+			}
+			else
+			{
+				return null;
+			}
+		}
+		else
+		{
+			return $type;
+		}
+	}
+}
+
diff --git a/lib/vendor/simplepie/SimplePie/Exception.php b/lib/vendor/simplepie/SimplePie/Exception.php
new file mode 100644
index 000000000..53c015e77
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Exception.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * General SimplePie exception class
+ *
+ * @package SimplePie
+ */
+class SimplePie_Exception extends Exception
+{
+}
\ No newline at end of file
diff --git a/lib/vendor/simplepie/SimplePie/File.php b/lib/vendor/simplepie/SimplePie/File.php
new file mode 100644
index 000000000..e670e05a0
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/File.php
@@ -0,0 +1,306 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Used for fetching remote files and reading local files
+ *
+ * Supports HTTP 1.0 via cURL or fsockopen, with spotty HTTP 1.1 support
+ *
+ * This class can be overloaded with {@see SimplePie::set_file_class()}
+ *
+ * @package SimplePie
+ * @subpackage HTTP
+ * @todo Move to properly supporting RFC2616 (HTTP/1.1)
+ */
+class SimplePie_File
+{
+	var $url;
+	var $useragent;
+	var $success = true;
+	var $headers = array();
+	var $body;
+	var $status_code;
+	var $redirects = 0;
+	var $error;
+	var $method = SIMPLEPIE_FILE_SOURCE_NONE;
+	var $permanent_url;
+
+	public function __construct($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false, $curl_options = array())
+	{
+		if (class_exists('idna_convert'))
+		{
+			$idn = new idna_convert();
+			$parsed = SimplePie_Misc::parse_url($url);
+			$url = SimplePie_Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], $parsed['fragment']);
+		}
+		$this->url = $url;
+		$this->permanent_url = $url;
+		$this->useragent = $useragent;
+		if (preg_match('/^http(s)?:\/\//i', $url))
+		{
+			if ($useragent === null)
+			{
+				$useragent = ini_get('user_agent');
+				$this->useragent = $useragent;
+			}
+			if (!is_array($headers))
+			{
+				$headers = array();
+			}
+			if (!$force_fsockopen && function_exists('curl_exec'))
+			{
+				$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_CURL;
+				$fp = curl_init();
+				$headers2 = array();
+				foreach ($headers as $key => $value)
+				{
+					$headers2[] = "$key: $value";
+				}
+				if (version_compare(SimplePie_Misc::get_curl_version(), '7.10.5', '>='))
+				{
+					curl_setopt($fp, CURLOPT_ENCODING, '');
+				}
+				curl_setopt($fp, CURLOPT_URL, $url);
+				curl_setopt($fp, CURLOPT_HEADER, 1);
+				curl_setopt($fp, CURLOPT_RETURNTRANSFER, 1);
+				curl_setopt($fp, CURLOPT_FAILONERROR, 1);
+				curl_setopt($fp, CURLOPT_TIMEOUT, $timeout);
+				curl_setopt($fp, CURLOPT_CONNECTTIMEOUT, $timeout);
+				curl_setopt($fp, CURLOPT_REFERER, $url);
+				curl_setopt($fp, CURLOPT_USERAGENT, $useragent);
+				curl_setopt($fp, CURLOPT_HTTPHEADER, $headers2);
+				if (!ini_get('open_basedir') && !ini_get('safe_mode') && version_compare(SimplePie_Misc::get_curl_version(), '7.15.2', '>='))
+				{
+					curl_setopt($fp, CURLOPT_FOLLOWLOCATION, 1);
+					curl_setopt($fp, CURLOPT_MAXREDIRS, $redirects);
+				}
+				foreach ($curl_options as $curl_param => $curl_value) {
+					curl_setopt($fp, $curl_param, $curl_value);
+				}
+
+				$this->headers = curl_exec($fp);
+				if (curl_errno($fp) === 23 || curl_errno($fp) === 61)
+				{
+					curl_setopt($fp, CURLOPT_ENCODING, 'none');
+					$this->headers = curl_exec($fp);
+				}
+				if (curl_errno($fp))
+				{
+					$this->error = 'cURL error ' . curl_errno($fp) . ': ' . curl_error($fp);
+					$this->success = false;
+				}
+				else
+				{
+					// Use the updated url provided by curl_getinfo after any redirects.
+					if ($info = curl_getinfo($fp)) {
+						$this->url = $info['url'];
+					}
+					curl_close($fp);
+					$this->headers = explode("\r\n\r\n", $this->headers, $info['redirect_count'] + 1);
+					$this->headers = array_pop($this->headers);
+					$parser = new SimplePie_HTTP_Parser($this->headers);
+					if ($parser->parse())
+					{
+						$this->headers = $parser->headers;
+						$this->body = trim($parser->body);
+						$this->status_code = $parser->status_code;
+						if ((in_array($this->status_code, array(300, 301, 302, 303, 307)) || $this->status_code > 307 && $this->status_code < 400) && isset($this->headers['location']) && $this->redirects < $redirects)
+						{
+							$this->redirects++;
+							$location = SimplePie_Misc::absolutize_url($this->headers['location'], $url);
+							$previousStatusCode = $this->status_code;
+							$this->__construct($location, $timeout, $redirects, $headers, $useragent, $force_fsockopen);
+							$this->permanent_url = ($previousStatusCode == 301) ? $location : $url;
+							return;
+						}
+					}
+				}
+			}
+			else
+			{
+				$this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_FSOCKOPEN;
+				$url_parts = parse_url($url);
+				$socket_host = $url_parts['host'];
+				if (isset($url_parts['scheme']) && strtolower($url_parts['scheme']) === 'https')
+				{
+					$socket_host = "ssl://$url_parts[host]";
+					$url_parts['port'] = 443;
+				}
+				if (!isset($url_parts['port']))
+				{
+					$url_parts['port'] = 80;
+				}
+				$fp = @fsockopen($socket_host, $url_parts['port'], $errno, $errstr, $timeout);
+				if (!$fp)
+				{
+					$this->error = 'fsockopen error: ' . $errstr;
+					$this->success = false;
+				}
+				else
+				{
+					stream_set_timeout($fp, $timeout);
+					if (isset($url_parts['path']))
+					{
+						if (isset($url_parts['query']))
+						{
+							$get = "$url_parts[path]?$url_parts[query]";
+						}
+						else
+						{
+							$get = $url_parts['path'];
+						}
+					}
+					else
+					{
+						$get = '/';
+					}
+					$out = "GET $get HTTP/1.1\r\n";
+					$out .= "Host: $url_parts[host]\r\n";
+					$out .= "User-Agent: $useragent\r\n";
+					if (extension_loaded('zlib'))
+					{
+						$out .= "Accept-Encoding: x-gzip,gzip,deflate\r\n";
+					}
+
+					if (isset($url_parts['user']) && isset($url_parts['pass']))
+					{
+						$out .= "Authorization: Basic " . base64_encode("$url_parts[user]:$url_parts[pass]") . "\r\n";
+					}
+					foreach ($headers as $key => $value)
+					{
+						$out .= "$key: $value\r\n";
+					}
+					$out .= "Connection: Close\r\n\r\n";
+					fwrite($fp, $out);
+
+					$info = stream_get_meta_data($fp);
+
+					$this->headers = '';
+					while (!$info['eof'] && !$info['timed_out'])
+					{
+						$this->headers .= fread($fp, 1160);
+						$info = stream_get_meta_data($fp);
+					}
+					if (!$info['timed_out'])
+					{
+						$parser = new SimplePie_HTTP_Parser($this->headers);
+						if ($parser->parse())
+						{
+							$this->headers = $parser->headers;
+							$this->body = $parser->body;
+							$this->status_code = $parser->status_code;
+							if ((in_array($this->status_code, array(300, 301, 302, 303, 307)) || $this->status_code > 307 && $this->status_code < 400) && isset($this->headers['location']) && $this->redirects < $redirects)
+							{
+								$this->redirects++;
+								$location = SimplePie_Misc::absolutize_url($this->headers['location'], $url);
+								$previousStatusCode = $this->status_code;
+								$this->__construct($location, $timeout, $redirects, $headers, $useragent, $force_fsockopen);
+								$this->permanent_url = ($previousStatusCode == 301) ? $location : $url;
+								return;
+							}
+							if (isset($this->headers['content-encoding']))
+							{
+								// Hey, we act dumb elsewhere, so let's do that here too
+								switch (strtolower(trim($this->headers['content-encoding'], "\x09\x0A\x0D\x20")))
+								{
+									case 'gzip':
+									case 'x-gzip':
+										$decoder = new SimplePie_gzdecode($this->body);
+										if (!$decoder->parse())
+										{
+											$this->error = 'Unable to decode HTTP "gzip" stream';
+											$this->success = false;
+										}
+										else
+										{
+											$this->body = trim($decoder->data);
+										}
+										break;
+
+									case 'deflate':
+										if (($decompressed = gzinflate($this->body)) !== false)
+										{
+											$this->body = $decompressed;
+										}
+										else if (($decompressed = gzuncompress($this->body)) !== false)
+										{
+											$this->body = $decompressed;
+										}
+										else if (function_exists('gzdecode') && ($decompressed = gzdecode($this->body)) !== false)
+										{
+											$this->body = $decompressed;
+										}
+										else
+										{
+											$this->error = 'Unable to decode HTTP "deflate" stream';
+											$this->success = false;
+										}
+										break;
+
+									default:
+										$this->error = 'Unknown content coding';
+										$this->success = false;
+								}
+							}
+						}
+					}
+					else
+					{
+						$this->error = 'fsocket timed out';
+						$this->success = false;
+					}
+					fclose($fp);
+				}
+			}
+		}
+		else
+		{
+			$this->method = SIMPLEPIE_FILE_SOURCE_LOCAL | SIMPLEPIE_FILE_SOURCE_FILE_GET_CONTENTS;
+			if (empty($url) || !($this->body = trim(file_get_contents($url))))
+			{
+				$this->error = 'file_get_contents could not read the file';
+				$this->success = false;
+			}
+		}
+	}
+}
diff --git a/lib/vendor/simplepie/SimplePie/HTTP/Parser.php b/lib/vendor/simplepie/SimplePie/HTTP/Parser.php
new file mode 100644
index 000000000..63ae1e03d
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/HTTP/Parser.php
@@ -0,0 +1,499 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+
+/**
+ * HTTP Response Parser
+ *
+ * @package SimplePie
+ * @subpackage HTTP
+ */
+class SimplePie_HTTP_Parser
+{
+	/**
+	 * HTTP Version
+	 *
+	 * @var float
+	 */
+	public $http_version = 0.0;
+
+	/**
+	 * Status code
+	 *
+	 * @var int
+	 */
+	public $status_code = 0;
+
+	/**
+	 * Reason phrase
+	 *
+	 * @var string
+	 */
+	public $reason = '';
+
+	/**
+	 * Key/value pairs of the headers
+	 *
+	 * @var array
+	 */
+	public $headers = array();
+
+	/**
+	 * Body of the response
+	 *
+	 * @var string
+	 */
+	public $body = '';
+
+	/**
+	 * Current state of the state machine
+	 *
+	 * @var string
+	 */
+	protected $state = 'http_version';
+
+	/**
+	 * Input data
+	 *
+	 * @var string
+	 */
+	protected $data = '';
+
+	/**
+	 * Input data length (to avoid calling strlen() everytime this is needed)
+	 *
+	 * @var int
+	 */
+	protected $data_length = 0;
+
+	/**
+	 * Current position of the pointer
+	 *
+	 * @var int
+	 */
+	protected $position = 0;
+
+	/**
+	 * Name of the hedaer currently being parsed
+	 *
+	 * @var string
+	 */
+	protected $name = '';
+
+	/**
+	 * Value of the hedaer currently being parsed
+	 *
+	 * @var string
+	 */
+	protected $value = '';
+
+	/**
+	 * Create an instance of the class with the input data
+	 *
+	 * @param string $data Input data
+	 */
+	public function __construct($data)
+	{
+		$this->data = $data;
+		$this->data_length = strlen($this->data);
+	}
+
+	/**
+	 * Parse the input data
+	 *
+	 * @return bool true on success, false on failure
+	 */
+	public function parse()
+	{
+		while ($this->state && $this->state !== 'emit' && $this->has_data())
+		{
+			$state = $this->state;
+			$this->$state();
+		}
+		$this->data = '';
+		if ($this->state === 'emit' || $this->state === 'body')
+		{
+			return true;
+		}
+		else
+		{
+			$this->http_version = '';
+			$this->status_code = '';
+			$this->reason = '';
+			$this->headers = array();
+			$this->body = '';
+			return false;
+		}
+	}
+
+	/**
+	 * Check whether there is data beyond the pointer
+	 *
+	 * @return bool true if there is further data, false if not
+	 */
+	protected function has_data()
+	{
+		return (bool) ($this->position < $this->data_length);
+	}
+
+	/**
+	 * See if the next character is LWS
+	 *
+	 * @return bool true if the next character is LWS, false if not
+	 */
+	protected function is_linear_whitespace()
+	{
+		return (bool) ($this->data[$this->position] === "\x09"
+			|| $this->data[$this->position] === "\x20"
+			|| ($this->data[$this->position] === "\x0A"
+				&& isset($this->data[$this->position + 1])
+				&& ($this->data[$this->position + 1] === "\x09" || $this->data[$this->position + 1] === "\x20")));
+	}
+
+	/**
+	 * Parse the HTTP version
+	 */
+	protected function http_version()
+	{
+		if (strpos($this->data, "\x0A") !== false && strtoupper(substr($this->data, 0, 5)) === 'HTTP/')
+		{
+			$len = strspn($this->data, '0123456789.', 5);
+			$this->http_version = substr($this->data, 5, $len);
+			$this->position += 5 + $len;
+			if (substr_count($this->http_version, '.') <= 1)
+			{
+				$this->http_version = (float) $this->http_version;
+				$this->position += strspn($this->data, "\x09\x20", $this->position);
+				$this->state = 'status';
+			}
+			else
+			{
+				$this->state = false;
+			}
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+
+	/**
+	 * Parse the status code
+	 */
+	protected function status()
+	{
+		if ($len = strspn($this->data, '0123456789', $this->position))
+		{
+			$this->status_code = (int) substr($this->data, $this->position, $len);
+			$this->position += $len;
+			$this->state = 'reason';
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+
+	/**
+	 * Parse the reason phrase
+	 */
+	protected function reason()
+	{
+		$len = strcspn($this->data, "\x0A", $this->position);
+		$this->reason = trim(substr($this->data, $this->position, $len), "\x09\x0D\x20");
+		$this->position += $len + 1;
+		$this->state = 'new_line';
+	}
+
+	/**
+	 * Deal with a new line, shifting data around as needed
+	 */
+	protected function new_line()
+	{
+		$this->value = trim($this->value, "\x0D\x20");
+		if ($this->name !== '' && $this->value !== '')
+		{
+			$this->name = strtolower($this->name);
+			// We should only use the last Content-Type header. c.f. issue #1
+			if (isset($this->headers[$this->name]) && $this->name !== 'content-type')
+			{
+				$this->headers[$this->name] .= ', ' . $this->value;
+			}
+			else
+			{
+				$this->headers[$this->name] = $this->value;
+			}
+		}
+		$this->name = '';
+		$this->value = '';
+		if (substr($this->data[$this->position], 0, 2) === "\x0D\x0A")
+		{
+			$this->position += 2;
+			$this->state = 'body';
+		}
+		elseif ($this->data[$this->position] === "\x0A")
+		{
+			$this->position++;
+			$this->state = 'body';
+		}
+		else
+		{
+			$this->state = 'name';
+		}
+	}
+
+	/**
+	 * Parse a header name
+	 */
+	protected function name()
+	{
+		$len = strcspn($this->data, "\x0A:", $this->position);
+		if (isset($this->data[$this->position + $len]))
+		{
+			if ($this->data[$this->position + $len] === "\x0A")
+			{
+				$this->position += $len;
+				$this->state = 'new_line';
+			}
+			else
+			{
+				$this->name = substr($this->data, $this->position, $len);
+				$this->position += $len + 1;
+				$this->state = 'value';
+			}
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+
+	/**
+	 * Parse LWS, replacing consecutive LWS characters with a single space
+	 */
+	protected function linear_whitespace()
+	{
+		do
+		{
+			if (substr($this->data, $this->position, 2) === "\x0D\x0A")
+			{
+				$this->position += 2;
+			}
+			elseif ($this->data[$this->position] === "\x0A")
+			{
+				$this->position++;
+			}
+			$this->position += strspn($this->data, "\x09\x20", $this->position);
+		} while ($this->has_data() && $this->is_linear_whitespace());
+		$this->value .= "\x20";
+	}
+
+	/**
+	 * See what state to move to while within non-quoted header values
+	 */
+	protected function value()
+	{
+		if ($this->is_linear_whitespace())
+		{
+			$this->linear_whitespace();
+		}
+		else
+		{
+			switch ($this->data[$this->position])
+			{
+				case '"':
+					// Workaround for ETags: we have to include the quotes as
+					// part of the tag.
+					if (strtolower($this->name) === 'etag')
+					{
+						$this->value .= '"';
+						$this->position++;
+						$this->state = 'value_char';
+						break;
+					}
+					$this->position++;
+					$this->state = 'quote';
+					break;
+
+				case "\x0A":
+					$this->position++;
+					$this->state = 'new_line';
+					break;
+
+				default:
+					$this->state = 'value_char';
+					break;
+			}
+		}
+	}
+
+	/**
+	 * Parse a header value while outside quotes
+	 */
+	protected function value_char()
+	{
+		$len = strcspn($this->data, "\x09\x20\x0A\"", $this->position);
+		$this->value .= substr($this->data, $this->position, $len);
+		$this->position += $len;
+		$this->state = 'value';
+	}
+
+	/**
+	 * See what state to move to while within quoted header values
+	 */
+	protected function quote()
+	{
+		if ($this->is_linear_whitespace())
+		{
+			$this->linear_whitespace();
+		}
+		else
+		{
+			switch ($this->data[$this->position])
+			{
+				case '"':
+					$this->position++;
+					$this->state = 'value';
+					break;
+
+				case "\x0A":
+					$this->position++;
+					$this->state = 'new_line';
+					break;
+
+				case '\\':
+					$this->position++;
+					$this->state = 'quote_escaped';
+					break;
+
+				default:
+					$this->state = 'quote_char';
+					break;
+			}
+		}
+	}
+
+	/**
+	 * Parse a header value while within quotes
+	 */
+	protected function quote_char()
+	{
+		$len = strcspn($this->data, "\x09\x20\x0A\"\\", $this->position);
+		$this->value .= substr($this->data, $this->position, $len);
+		$this->position += $len;
+		$this->state = 'value';
+	}
+
+	/**
+	 * Parse an escaped character within quotes
+	 */
+	protected function quote_escaped()
+	{
+		$this->value .= $this->data[$this->position];
+		$this->position++;
+		$this->state = 'quote';
+	}
+
+	/**
+	 * Parse the body
+	 */
+	protected function body()
+	{
+		$this->body = substr($this->data, $this->position);
+		if (!empty($this->headers['transfer-encoding']))
+		{
+			unset($this->headers['transfer-encoding']);
+			$this->state = 'chunked';
+		}
+		else
+		{
+			$this->state = 'emit';
+		}
+	}
+
+	/**
+	 * Parsed a "Transfer-Encoding: chunked" body
+	 */
+	protected function chunked()
+	{
+		if (!preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', trim($this->body)))
+		{
+			$this->state = 'emit';
+			return;
+		}
+
+		$decoded = '';
+		$encoded = $this->body;
+
+		while (true)
+		{
+			$is_chunked = (bool) preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', $encoded, $matches );
+			if (!$is_chunked)
+			{
+				// Looks like it's not chunked after all
+				$this->state = 'emit';
+				return;
+			}
+
+			$length = hexdec(trim($matches[1]));
+			if ($length === 0)
+			{
+				// Ignore trailer headers
+				$this->state = 'emit';
+				$this->body = $decoded;
+				return;
+			}
+
+			$chunk_length = strlen($matches[0]);
+			$decoded .= $part = substr($encoded, $chunk_length, $length);
+			$encoded = substr($encoded, $chunk_length + $length + 2);
+
+			if (trim($encoded) === '0' || empty($encoded))
+			{
+				$this->state = 'emit';
+				$this->body = $decoded;
+				return;
+			}
+		}
+	}
+}
diff --git a/lib/vendor/simplepie/SimplePie/IRI.php b/lib/vendor/simplepie/SimplePie/IRI.php
new file mode 100644
index 000000000..2b3fbaf07
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/IRI.php
@@ -0,0 +1,1257 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * IRI parser/serialiser/normaliser
+ *
+ * @package SimplePie
+ * @subpackage HTTP
+ * @author Geoffrey Sneddon
+ * @author Steve Minutillo
+ * @author Ryan McCue
+ * @copyright 2007-2012 Geoffrey Sneddon, Steve Minutillo, Ryan McCue
+ * @license http://www.opensource.org/licenses/bsd-license.php
+ */
+class SimplePie_IRI
+{
+	/**
+	 * Scheme
+	 *
+	 * @var string
+	 */
+	protected $scheme = null;
+
+	/**
+	 * User Information
+	 *
+	 * @var string
+	 */
+	protected $iuserinfo = null;
+
+	/**
+	 * ihost
+	 *
+	 * @var string
+	 */
+	protected $ihost = null;
+
+	/**
+	 * Port
+	 *
+	 * @var string
+	 */
+	protected $port = null;
+
+	/**
+	 * ipath
+	 *
+	 * @var string
+	 */
+	protected $ipath = '';
+
+	/**
+	 * iquery
+	 *
+	 * @var string
+	 */
+	protected $iquery = null;
+
+	/**
+	 * ifragment
+	 *
+	 * @var string
+	 */
+	protected $ifragment = null;
+
+	/**
+	 * Normalization database
+	 *
+	 * Each key is the scheme, each value is an array with each key as the IRI
+	 * part and value as the default value for that part.
+	 */
+	protected $normalization = array(
+		'acap' => array(
+			'port' => 674
+		),
+		'dict' => array(
+			'port' => 2628
+		),
+		'file' => array(
+			'ihost' => 'localhost'
+		),
+		'http' => array(
+			'port' => 80,
+			'ipath' => '/'
+		),
+		'https' => array(
+			'port' => 443,
+			'ipath' => '/'
+		),
+	);
+
+	/**
+	 * Return the entire IRI when you try and read the object as a string
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->get_iri();
+	}
+
+	/**
+	 * Overload __set() to provide access via properties
+	 *
+	 * @param string $name Property name
+	 * @param mixed $value Property value
+	 */
+	public function __set($name, $value)
+	{
+		if (method_exists($this, 'set_' . $name))
+		{
+			call_user_func(array($this, 'set_' . $name), $value);
+		}
+		elseif (
+			   $name === 'iauthority'
+			|| $name === 'iuserinfo'
+			|| $name === 'ihost'
+			|| $name === 'ipath'
+			|| $name === 'iquery'
+			|| $name === 'ifragment'
+		)
+		{
+			call_user_func(array($this, 'set_' . substr($name, 1)), $value);
+		}
+	}
+
+	/**
+	 * Overload __get() to provide access via properties
+	 *
+	 * @param string $name Property name
+	 * @return mixed
+	 */
+	public function __get($name)
+	{
+		// isset() returns false for null, we don't want to do that
+		// Also why we use array_key_exists below instead of isset()
+		$props = get_object_vars($this);
+
+		if (
+			$name === 'iri' ||
+			$name === 'uri' ||
+			$name === 'iauthority' ||
+			$name === 'authority'
+		)
+		{
+			$return = $this->{"get_$name"}();
+		}
+		elseif (array_key_exists($name, $props))
+		{
+			$return = $this->$name;
+		}
+		// host -> ihost
+		elseif (($prop = 'i' . $name) && array_key_exists($prop, $props))
+		{
+			$name = $prop;
+			$return = $this->$prop;
+		}
+		// ischeme -> scheme
+		elseif (($prop = substr($name, 1)) && array_key_exists($prop, $props))
+		{
+			$name = $prop;
+			$return = $this->$prop;
+		}
+		else
+		{
+			trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
+			$return = null;
+		}
+
+		if ($return === null && isset($this->normalization[$this->scheme][$name]))
+		{
+			return $this->normalization[$this->scheme][$name];
+		}
+		else
+		{
+			return $return;
+		}
+	}
+
+	/**
+	 * Overload __isset() to provide access via properties
+	 *
+	 * @param string $name Property name
+	 * @return bool
+	 */
+	public function __isset($name)
+	{
+		if (method_exists($this, 'get_' . $name) || isset($this->$name))
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Overload __unset() to provide access via properties
+	 *
+	 * @param string $name Property name
+	 */
+	public function __unset($name)
+	{
+		if (method_exists($this, 'set_' . $name))
+		{
+			call_user_func(array($this, 'set_' . $name), '');
+		}
+	}
+
+	/**
+	 * Create a new IRI object, from a specified string
+	 *
+	 * @param string $iri
+	 */
+	public function __construct($iri = null)
+	{
+		$this->set_iri($iri);
+	}
+
+	/**
+	 * Clean up
+	 */
+	public function __destruct() {
+	    $this->set_iri(null, true);
+	    $this->set_path(null, true);
+	    $this->set_authority(null, true);
+	}
+
+	/**
+	 * Create a new IRI object by resolving a relative IRI
+	 *
+	 * Returns false if $base is not absolute, otherwise an IRI.
+	 *
+	 * @param IRI|string $base (Absolute) Base IRI
+	 * @param IRI|string $relative Relative IRI
+	 * @return IRI|false
+	 */
+	public static function absolutize($base, $relative)
+	{
+		if (!($relative instanceof SimplePie_IRI))
+		{
+			$relative = new SimplePie_IRI($relative);
+		}
+		if (!$relative->is_valid())
+		{
+			return false;
+		}
+		elseif ($relative->scheme !== null)
+		{
+			return clone $relative;
+		}
+		else
+		{
+			if (!($base instanceof SimplePie_IRI))
+			{
+				$base = new SimplePie_IRI($base);
+			}
+			if ($base->scheme !== null && $base->is_valid())
+			{
+				if ($relative->get_iri() !== '')
+				{
+					if ($relative->iuserinfo !== null || $relative->ihost !== null || $relative->port !== null)
+					{
+						$target = clone $relative;
+						$target->scheme = $base->scheme;
+					}
+					else
+					{
+						$target = new SimplePie_IRI;
+						$target->scheme = $base->scheme;
+						$target->iuserinfo = $base->iuserinfo;
+						$target->ihost = $base->ihost;
+						$target->port = $base->port;
+						if ($relative->ipath !== '')
+						{
+							if ($relative->ipath[0] === '/')
+							{
+								$target->ipath = $relative->ipath;
+							}
+							elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '')
+							{
+								$target->ipath = '/' . $relative->ipath;
+							}
+							elseif (($last_segment = strrpos($base->ipath, '/')) !== false)
+							{
+								$target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath;
+							}
+							else
+							{
+								$target->ipath = $relative->ipath;
+							}
+							$target->ipath = $target->remove_dot_segments($target->ipath);
+							$target->iquery = $relative->iquery;
+						}
+						else
+						{
+							$target->ipath = $base->ipath;
+							if ($relative->iquery !== null)
+							{
+								$target->iquery = $relative->iquery;
+							}
+							elseif ($base->iquery !== null)
+							{
+								$target->iquery = $base->iquery;
+							}
+						}
+						$target->ifragment = $relative->ifragment;
+					}
+				}
+				else
+				{
+					$target = clone $base;
+					$target->ifragment = null;
+				}
+				$target->scheme_normalization();
+				return $target;
+			}
+			else
+			{
+				return false;
+			}
+		}
+	}
+
+	/**
+	 * Parse an IRI into scheme/authority/path/query/fragment segments
+	 *
+	 * @param string $iri
+	 * @return array
+	 */
+	protected function parse_iri($iri)
+	{
+		$iri = trim($iri, "\x20\x09\x0A\x0C\x0D");
+		if (preg_match('/^((?P<scheme>[^:\/?#]+):)?(\/\/(?P<authority>[^\/?#]*))?(?P<path>[^?#]*)(\?(?P<query>[^#]*))?(#(?P<fragment>.*))?$/', $iri, $match))
+		{
+			if ($match[1] === '')
+			{
+				$match['scheme'] = null;
+			}
+			if (!isset($match[3]) || $match[3] === '')
+			{
+				$match['authority'] = null;
+			}
+			if (!isset($match[5]))
+			{
+				$match['path'] = '';
+			}
+			if (!isset($match[6]) || $match[6] === '')
+			{
+				$match['query'] = null;
+			}
+			if (!isset($match[8]) || $match[8] === '')
+			{
+				$match['fragment'] = null;
+			}
+			return $match;
+		}
+		else
+		{
+			// This can occur when a paragraph is accidentally parsed as a URI
+			return false;
+		}
+	}
+
+	/**
+	 * Remove dot segments from a path
+	 *
+	 * @param string $input
+	 * @return string
+	 */
+	protected function remove_dot_segments($input)
+	{
+		$output = '';
+		while (strpos($input, './') !== false || strpos($input, '/.') !== false || $input === '.' || $input === '..')
+		{
+			// A: If the input buffer begins with a prefix of "../" or "./", then remove that prefix from the input buffer; otherwise,
+			if (strpos($input, '../') === 0)
+			{
+				$input = substr($input, 3);
+			}
+			elseif (strpos($input, './') === 0)
+			{
+				$input = substr($input, 2);
+			}
+			// B: if the input buffer begins with a prefix of "/./" or "/.", where "." is a complete path segment, then replace that prefix with "/" in the input buffer; otherwise,
+			elseif (strpos($input, '/./') === 0)
+			{
+				$input = substr($input, 2);
+			}
+			elseif ($input === '/.')
+			{
+				$input = '/';
+			}
+			// C: if the input buffer begins with a prefix of "/../" or "/..", where ".." is a complete path segment, then replace that prefix with "/" in the input buffer and remove the last segment and its preceding "/" (if any) from the output buffer; otherwise,
+			elseif (strpos($input, '/../') === 0)
+			{
+				$input = substr($input, 3);
+				$output = substr_replace($output, '', strrpos($output, '/'));
+			}
+			elseif ($input === '/..')
+			{
+				$input = '/';
+				$output = substr_replace($output, '', strrpos($output, '/'));
+			}
+			// D: if the input buffer consists only of "." or "..", then remove that from the input buffer; otherwise,
+			elseif ($input === '.' || $input === '..')
+			{
+				$input = '';
+			}
+			// E: move the first path segment in the input buffer to the end of the output buffer, including the initial "/" character (if any) and any subsequent characters up to, but not including, the next "/" character or the end of the input buffer
+			elseif (($pos = strpos($input, '/', 1)) !== false)
+			{
+				$output .= substr($input, 0, $pos);
+				$input = substr_replace($input, '', 0, $pos);
+			}
+			else
+			{
+				$output .= $input;
+				$input = '';
+			}
+		}
+		return $output . $input;
+	}
+
+	/**
+	 * Replace invalid character with percent encoding
+	 *
+	 * @param string $string Input string
+	 * @param string $extra_chars Valid characters not in iunreserved or
+	 *                            iprivate (this is ASCII-only)
+	 * @param bool $iprivate Allow iprivate
+	 * @return string
+	 */
+	protected function replace_invalid_with_pct_encoding($string, $extra_chars, $iprivate = false)
+	{
+		// Normalize as many pct-encoded sections as possible
+		$string = preg_replace_callback('/(?:%[A-Fa-f0-9]{2})+/', array($this, 'remove_iunreserved_percent_encoded'), $string);
+
+		// Replace invalid percent characters
+		$string = preg_replace('/%(?![A-Fa-f0-9]{2})/', '%25', $string);
+
+		// Add unreserved and % to $extra_chars (the latter is safe because all
+		// pct-encoded sections are now valid).
+		$extra_chars .= 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~%';
+
+		// Now replace any bytes that aren't allowed with their pct-encoded versions
+		$position = 0;
+		$strlen = strlen($string);
+		while (($position += strspn($string, $extra_chars, $position)) < $strlen)
+		{
+			$value = ord($string[$position]);
+
+			// Start position
+			$start = $position;
+
+			// By default we are valid
+			$valid = true;
+
+			// No one byte sequences are valid due to the while.
+			// Two byte sequence:
+			if (($value & 0xE0) === 0xC0)
+			{
+				$character = ($value & 0x1F) << 6;
+				$length = 2;
+				$remaining = 1;
+			}
+			// Three byte sequence:
+			elseif (($value & 0xF0) === 0xE0)
+			{
+				$character = ($value & 0x0F) << 12;
+				$length = 3;
+				$remaining = 2;
+			}
+			// Four byte sequence:
+			elseif (($value & 0xF8) === 0xF0)
+			{
+				$character = ($value & 0x07) << 18;
+				$length = 4;
+				$remaining = 3;
+			}
+			// Invalid byte:
+			else
+			{
+				$valid = false;
+				$length = 1;
+				$remaining = 0;
+			}
+
+			if ($remaining)
+			{
+				if ($position + $length <= $strlen)
+				{
+					for ($position++; $remaining; $position++)
+					{
+						$value = ord($string[$position]);
+
+						// Check that the byte is valid, then add it to the character:
+						if (($value & 0xC0) === 0x80)
+						{
+							$character |= ($value & 0x3F) << (--$remaining * 6);
+						}
+						// If it is invalid, count the sequence as invalid and reprocess the current byte:
+						else
+						{
+							$valid = false;
+							$position--;
+							break;
+						}
+					}
+				}
+				else
+				{
+					$position = $strlen - 1;
+					$valid = false;
+				}
+			}
+
+			// Percent encode anything invalid or not in ucschar
+			if (
+				// Invalid sequences
+				!$valid
+				// Non-shortest form sequences are invalid
+				|| $length > 1 && $character <= 0x7F
+				|| $length > 2 && $character <= 0x7FF
+				|| $length > 3 && $character <= 0xFFFF
+				// Outside of range of ucschar codepoints
+				// Noncharacters
+				|| ($character & 0xFFFE) === 0xFFFE
+				|| $character >= 0xFDD0 && $character <= 0xFDEF
+				|| (
+					// Everything else not in ucschar
+					   $character > 0xD7FF && $character < 0xF900
+					|| $character < 0xA0
+					|| $character > 0xEFFFD
+				)
+				&& (
+					// Everything not in iprivate, if it applies
+					   !$iprivate
+					|| $character < 0xE000
+					|| $character > 0x10FFFD
+				)
+			)
+			{
+				// If we were a character, pretend we weren't, but rather an error.
+				if ($valid)
+					$position--;
+
+				for ($j = $start; $j <= $position; $j++)
+				{
+					$string = substr_replace($string, sprintf('%%%02X', ord($string[$j])), $j, 1);
+					$j += 2;
+					$position += 2;
+					$strlen += 2;
+				}
+			}
+		}
+
+		return $string;
+	}
+
+	/**
+	 * Callback function for preg_replace_callback.
+	 *
+	 * Removes sequences of percent encoded bytes that represent UTF-8
+	 * encoded characters in iunreserved
+	 *
+	 * @param array $match PCRE match
+	 * @return string Replacement
+	 */
+	protected function remove_iunreserved_percent_encoded($match)
+	{
+		// As we just have valid percent encoded sequences we can just explode
+		// and ignore the first member of the returned array (an empty string).
+		$bytes = explode('%', $match[0]);
+
+		// Initialize the new string (this is what will be returned) and that
+		// there are no bytes remaining in the current sequence (unsurprising
+		// at the first byte!).
+		$string = '';
+		$remaining = 0;
+
+		// Loop over each and every byte, and set $value to its value
+		for ($i = 1, $len = count($bytes); $i < $len; $i++)
+		{
+			$value = hexdec($bytes[$i]);
+
+			// If we're the first byte of sequence:
+			if (!$remaining)
+			{
+				// Start position
+				$start = $i;
+
+				// By default we are valid
+				$valid = true;
+
+				// One byte sequence:
+				if ($value <= 0x7F)
+				{
+					$character = $value;
+					$length = 1;
+				}
+				// Two byte sequence:
+				elseif (($value & 0xE0) === 0xC0)
+				{
+					$character = ($value & 0x1F) << 6;
+					$length = 2;
+					$remaining = 1;
+				}
+				// Three byte sequence:
+				elseif (($value & 0xF0) === 0xE0)
+				{
+					$character = ($value & 0x0F) << 12;
+					$length = 3;
+					$remaining = 2;
+				}
+				// Four byte sequence:
+				elseif (($value & 0xF8) === 0xF0)
+				{
+					$character = ($value & 0x07) << 18;
+					$length = 4;
+					$remaining = 3;
+				}
+				// Invalid byte:
+				else
+				{
+					$valid = false;
+					$remaining = 0;
+				}
+			}
+			// Continuation byte:
+			else
+			{
+				// Check that the byte is valid, then add it to the character:
+				if (($value & 0xC0) === 0x80)
+				{
+					$remaining--;
+					$character |= ($value & 0x3F) << ($remaining * 6);
+				}
+				// If it is invalid, count the sequence as invalid and reprocess the current byte as the start of a sequence:
+				else
+				{
+					$valid = false;
+					$remaining = 0;
+					$i--;
+				}
+			}
+
+			// If we've reached the end of the current byte sequence, append it to Unicode::$data
+			if (!$remaining)
+			{
+				// Percent encode anything invalid or not in iunreserved
+				if (
+					// Invalid sequences
+					!$valid
+					// Non-shortest form sequences are invalid
+					|| $length > 1 && $character <= 0x7F
+					|| $length > 2 && $character <= 0x7FF
+					|| $length > 3 && $character <= 0xFFFF
+					// Outside of range of iunreserved codepoints
+					|| $character < 0x2D
+					|| $character > 0xEFFFD
+					// Noncharacters
+					|| ($character & 0xFFFE) === 0xFFFE
+					|| $character >= 0xFDD0 && $character <= 0xFDEF
+					// Everything else not in iunreserved (this is all BMP)
+					|| $character === 0x2F
+					|| $character > 0x39 && $character < 0x41
+					|| $character > 0x5A && $character < 0x61
+					|| $character > 0x7A && $character < 0x7E
+					|| $character > 0x7E && $character < 0xA0
+					|| $character > 0xD7FF && $character < 0xF900
+				)
+				{
+					for ($j = $start; $j <= $i; $j++)
+					{
+						$string .= '%' . strtoupper($bytes[$j]);
+					}
+				}
+				else
+				{
+					for ($j = $start; $j <= $i; $j++)
+					{
+						$string .= chr(hexdec($bytes[$j]));
+					}
+				}
+			}
+		}
+
+		// If we have any bytes left over they are invalid (i.e., we are
+		// mid-way through a multi-byte sequence)
+		if ($remaining)
+		{
+			for ($j = $start; $j < $len; $j++)
+			{
+				$string .= '%' . strtoupper($bytes[$j]);
+			}
+		}
+
+		return $string;
+	}
+
+	protected function scheme_normalization()
+	{
+		if (isset($this->normalization[$this->scheme]['iuserinfo']) && $this->iuserinfo === $this->normalization[$this->scheme]['iuserinfo'])
+		{
+			$this->iuserinfo = null;
+		}
+		if (isset($this->normalization[$this->scheme]['ihost']) && $this->ihost === $this->normalization[$this->scheme]['ihost'])
+		{
+			$this->ihost = null;
+		}
+		if (isset($this->normalization[$this->scheme]['port']) && $this->port === $this->normalization[$this->scheme]['port'])
+		{
+			$this->port = null;
+		}
+		if (isset($this->normalization[$this->scheme]['ipath']) && $this->ipath === $this->normalization[$this->scheme]['ipath'])
+		{
+			$this->ipath = '';
+		}
+		if (isset($this->normalization[$this->scheme]['iquery']) && $this->iquery === $this->normalization[$this->scheme]['iquery'])
+		{
+			$this->iquery = null;
+		}
+		if (isset($this->normalization[$this->scheme]['ifragment']) && $this->ifragment === $this->normalization[$this->scheme]['ifragment'])
+		{
+			$this->ifragment = null;
+		}
+	}
+
+	/**
+	 * Check if the object represents a valid IRI. This needs to be done on each
+	 * call as some things change depending on another part of the IRI.
+	 *
+	 * @return bool
+	 */
+	public function is_valid()
+	{
+		if ($this->ipath === '') return true;
+
+		$isauthority = $this->iuserinfo !== null || $this->ihost !== null ||
+			$this->port !== null;
+		if ($isauthority && $this->ipath[0] === '/') return true;
+
+		if (!$isauthority && (substr($this->ipath, 0, 2) === '//')) return false;
+
+		// Relative urls cannot have a colon in the first path segment (and the
+		// slashes themselves are not included so skip the first character).
+		if (!$this->scheme && !$isauthority &&
+		    strpos($this->ipath, ':') !== false &&
+		    strpos($this->ipath, '/', 1) !== false &&
+		    strpos($this->ipath, ':') < strpos($this->ipath, '/', 1)) return false;
+
+		return true;
+	}
+
+	/**
+	 * Set the entire IRI. Returns true on success, false on failure (if there
+	 * are any invalid characters).
+	 *
+	 * @param string $iri
+	 * @return bool
+	 */
+	public function set_iri($iri, $clear_cache = false)
+	{
+		static $cache;
+		if ($clear_cache) 
+		{
+			$cache = null;
+			return;
+		}
+		if (!$cache)
+		{
+			$cache = array();
+		}
+
+		if ($iri === null)
+		{
+			return true;
+		}
+		elseif (isset($cache[$iri]))
+		{
+			list($this->scheme,
+				 $this->iuserinfo,
+				 $this->ihost,
+				 $this->port,
+				 $this->ipath,
+				 $this->iquery,
+				 $this->ifragment,
+				 $return) = $cache[$iri];
+			return $return;
+		}
+		else
+		{
+			$parsed = $this->parse_iri((string) $iri);
+			if (!$parsed)
+			{
+				return false;
+			}
+
+			$return = $this->set_scheme($parsed['scheme'])
+				&& $this->set_authority($parsed['authority'])
+				&& $this->set_path($parsed['path'])
+				&& $this->set_query($parsed['query'])
+				&& $this->set_fragment($parsed['fragment']);
+
+			$cache[$iri] = array($this->scheme,
+								 $this->iuserinfo,
+								 $this->ihost,
+								 $this->port,
+								 $this->ipath,
+								 $this->iquery,
+								 $this->ifragment,
+								 $return);
+			return $return;
+		}
+	}
+
+	/**
+	 * Set the scheme. Returns true on success, false on failure (if there are
+	 * any invalid characters).
+	 *
+	 * @param string $scheme
+	 * @return bool
+	 */
+	public function set_scheme($scheme)
+	{
+		if ($scheme === null)
+		{
+			$this->scheme = null;
+		}
+		elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme))
+		{
+			$this->scheme = null;
+			return false;
+		}
+		else
+		{
+			$this->scheme = strtolower($scheme);
+		}
+		return true;
+	}
+
+	/**
+	 * Set the authority. Returns true on success, false on failure (if there are
+	 * any invalid characters).
+	 *
+	 * @param string $authority
+	 * @return bool
+	 */
+	public function set_authority($authority, $clear_cache = false)
+	{
+		static $cache;
+		if ($clear_cache)
+		{
+			$cache = null;
+			return;
+		}
+		if (!$cache)
+			$cache = array();
+
+		if ($authority === null)
+		{
+			$this->iuserinfo = null;
+			$this->ihost = null;
+			$this->port = null;
+			return true;
+		}
+		elseif (isset($cache[$authority]))
+		{
+			list($this->iuserinfo,
+				 $this->ihost,
+				 $this->port,
+				 $return) = $cache[$authority];
+
+			return $return;
+		}
+		else
+		{
+			$remaining = $authority;
+			if (($iuserinfo_end = strrpos($remaining, '@')) !== false)
+			{
+				$iuserinfo = substr($remaining, 0, $iuserinfo_end);
+				$remaining = substr($remaining, $iuserinfo_end + 1);
+			}
+			else
+			{
+				$iuserinfo = null;
+			}
+			if (($port_start = strpos($remaining, ':', strpos($remaining, ']'))) !== false)
+			{
+				if (($port = substr($remaining, $port_start + 1)) === false)
+				{
+					$port = null;
+				}
+				$remaining = substr($remaining, 0, $port_start);
+			}
+			else
+			{
+				$port = null;
+			}
+
+			$return = $this->set_userinfo($iuserinfo) &&
+					  $this->set_host($remaining) &&
+					  $this->set_port($port);
+
+			$cache[$authority] = array($this->iuserinfo,
+									   $this->ihost,
+									   $this->port,
+									   $return);
+
+			return $return;
+		}
+	}
+
+	/**
+	 * Set the iuserinfo.
+	 *
+	 * @param string $iuserinfo
+	 * @return bool
+	 */
+	public function set_userinfo($iuserinfo)
+	{
+		if ($iuserinfo === null)
+		{
+			$this->iuserinfo = null;
+		}
+		else
+		{
+			$this->iuserinfo = $this->replace_invalid_with_pct_encoding($iuserinfo, '!$&\'()*+,;=:');
+			$this->scheme_normalization();
+		}
+
+		return true;
+	}
+
+	/**
+	 * Set the ihost. Returns true on success, false on failure (if there are
+	 * any invalid characters).
+	 *
+	 * @param string $ihost
+	 * @return bool
+	 */
+	public function set_host($ihost)
+	{
+		if ($ihost === null)
+		{
+			$this->ihost = null;
+			return true;
+		}
+		elseif (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']')
+		{
+			if (SimplePie_Net_IPv6::check_ipv6(substr($ihost, 1, -1)))
+			{
+				$this->ihost = '[' . SimplePie_Net_IPv6::compress(substr($ihost, 1, -1)) . ']';
+			}
+			else
+			{
+				$this->ihost = null;
+				return false;
+			}
+		}
+		else
+		{
+			$ihost = $this->replace_invalid_with_pct_encoding($ihost, '!$&\'()*+,;=');
+
+			// Lowercase, but ignore pct-encoded sections (as they should
+			// remain uppercase). This must be done after the previous step
+			// as that can add unescaped characters.
+			$position = 0;
+			$strlen = strlen($ihost);
+			while (($position += strcspn($ihost, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ%', $position)) < $strlen)
+			{
+				if ($ihost[$position] === '%')
+				{
+					$position += 3;
+				}
+				else
+				{
+					$ihost[$position] = strtolower($ihost[$position]);
+					$position++;
+				}
+			}
+
+			$this->ihost = $ihost;
+		}
+
+		$this->scheme_normalization();
+
+		return true;
+	}
+
+	/**
+	 * Set the port. Returns true on success, false on failure (if there are
+	 * any invalid characters).
+	 *
+	 * @param string $port
+	 * @return bool
+	 */
+	public function set_port($port)
+	{
+		if ($port === null)
+		{
+			$this->port = null;
+			return true;
+		}
+		elseif (strspn($port, '0123456789') === strlen($port))
+		{
+			$this->port = (int) $port;
+			$this->scheme_normalization();
+			return true;
+		}
+		else
+		{
+			$this->port = null;
+			return false;
+		}
+	}
+
+	/**
+	 * Set the ipath.
+	 *
+	 * @param string $ipath
+	 * @return bool
+	 */
+	public function set_path($ipath, $clear_cache = false)
+	{
+		static $cache;
+		if ($clear_cache) 
+		{
+			$cache = null;
+			return;
+		}
+		if (!$cache)
+		{
+			$cache = array();
+		}
+
+		$ipath = (string) $ipath;
+
+		if (isset($cache[$ipath]))
+		{
+			$this->ipath = $cache[$ipath][(int) ($this->scheme !== null)];
+		}
+		else
+		{
+			$valid = $this->replace_invalid_with_pct_encoding($ipath, '!$&\'()*+,;=@:/');
+			$removed = $this->remove_dot_segments($valid);
+
+			$cache[$ipath] = array($valid, $removed);
+			$this->ipath =  ($this->scheme !== null) ? $removed : $valid;
+		}
+
+		$this->scheme_normalization();
+		return true;
+	}
+
+	/**
+	 * Set the iquery.
+	 *
+	 * @param string $iquery
+	 * @return bool
+	 */
+	public function set_query($iquery)
+	{
+		if ($iquery === null)
+		{
+			$this->iquery = null;
+		}
+		else
+		{
+			$this->iquery = $this->replace_invalid_with_pct_encoding($iquery, '!$&\'()*+,;=:@/?', true);
+			$this->scheme_normalization();
+		}
+		return true;
+	}
+
+	/**
+	 * Set the ifragment.
+	 *
+	 * @param string $ifragment
+	 * @return bool
+	 */
+	public function set_fragment($ifragment)
+	{
+		if ($ifragment === null)
+		{
+			$this->ifragment = null;
+		}
+		else
+		{
+			$this->ifragment = $this->replace_invalid_with_pct_encoding($ifragment, '!$&\'()*+,;=:@/?');
+			$this->scheme_normalization();
+		}
+		return true;
+	}
+
+	/**
+	 * Convert an IRI to a URI (or parts thereof)
+	 *
+	 * @return string
+	 */
+	public function to_uri($string)
+	{
+		static $non_ascii;
+		if (!$non_ascii)
+		{
+			$non_ascii = implode('', range("\x80", "\xFF"));
+		}
+
+		$position = 0;
+		$strlen = strlen($string);
+		while (($position += strcspn($string, $non_ascii, $position)) < $strlen)
+		{
+			$string = substr_replace($string, sprintf('%%%02X', ord($string[$position])), $position, 1);
+			$position += 3;
+			$strlen += 2;
+		}
+
+		return $string;
+	}
+
+	/**
+	 * Get the complete IRI
+	 *
+	 * @return string
+	 */
+	public function get_iri()
+	{
+		if (!$this->is_valid())
+		{
+			return false;
+		}
+
+		$iri = '';
+		if ($this->scheme !== null)
+		{
+			$iri .= $this->scheme . ':';
+		}
+		if (($iauthority = $this->get_iauthority()) !== null)
+		{
+			$iri .= '//' . $iauthority;
+		}
+		if ($this->ipath !== '')
+		{
+			$iri .= $this->ipath;
+		}
+		elseif (!empty($this->normalization[$this->scheme]['ipath']) && $iauthority !== null && $iauthority !== '')
+		{
+			$iri .= $this->normalization[$this->scheme]['ipath'];
+		}
+		if ($this->iquery !== null)
+		{
+			$iri .= '?' . $this->iquery;
+		}
+		if ($this->ifragment !== null)
+		{
+			$iri .= '#' . $this->ifragment;
+		}
+
+		return $iri;
+	}
+
+	/**
+	 * Get the complete URI
+	 *
+	 * @return string
+	 */
+	public function get_uri()
+	{
+		return $this->to_uri($this->get_iri());
+	}
+
+	/**
+	 * Get the complete iauthority
+	 *
+	 * @return string
+	 */
+	protected function get_iauthority()
+	{
+		if ($this->iuserinfo !== null || $this->ihost !== null || $this->port !== null)
+		{
+			$iauthority = '';
+			if ($this->iuserinfo !== null)
+			{
+				$iauthority .= $this->iuserinfo . '@';
+			}
+			if ($this->ihost !== null)
+			{
+				$iauthority .= $this->ihost;
+			}
+			if ($this->port !== null)
+			{
+				$iauthority .= ':' . $this->port;
+			}
+			return $iauthority;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the complete authority
+	 *
+	 * @return string
+	 */
+	protected function get_authority()
+	{
+		$iauthority = $this->get_iauthority();
+		if (is_string($iauthority))
+			return $this->to_uri($iauthority);
+		else
+			return $iauthority;
+	}
+}
diff --git a/lib/vendor/simplepie/SimplePie/Item.php b/lib/vendor/simplepie/SimplePie/Item.php
new file mode 100644
index 000000000..3979b8f1b
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Item.php
@@ -0,0 +1,2989 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+
+/**
+ * Manages all item-related data
+ *
+ * Used by {@see SimplePie::get_item()} and {@see SimplePie::get_items()}
+ *
+ * This class can be overloaded with {@see SimplePie::set_item_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie_Item
+{
+	/**
+	 * Parent feed
+	 *
+	 * @access private
+	 * @var SimplePie
+	 */
+	var $feed;
+
+	/**
+	 * Raw data
+	 *
+	 * @access private
+	 * @var array
+	 */
+	var $data = array();
+
+	/**
+	 * Registry object
+	 *
+	 * @see set_registry
+	 * @var SimplePie_Registry
+	 */
+	protected $registry;
+
+	/**
+	 * Create a new item object
+	 *
+	 * This is usually used by {@see SimplePie::get_items} and
+	 * {@see SimplePie::get_item}. Avoid creating this manually.
+	 *
+	 * @param SimplePie $feed Parent feed
+	 * @param array $data Raw data
+	 */
+	public function __construct($feed, $data)
+	{
+		$this->feed = $feed;
+		$this->data = $data;
+	}
+
+	/**
+	 * Set the registry handler
+	 *
+	 * This is usually used by {@see SimplePie_Registry::create}
+	 *
+	 * @since 1.3
+	 * @param SimplePie_Registry $registry
+	 */
+	public function set_registry(SimplePie_Registry $registry)
+	{
+		$this->registry = $registry;
+	}
+
+	/**
+	 * Get a string representation of the item
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return md5(serialize($this->data));
+	}
+
+	/**
+	 * Remove items that link back to this before destroying this object
+	 */
+	public function __destruct()
+	{
+		if ((version_compare(PHP_VERSION, '5.3', '<') || !gc_enabled()) && !ini_get('zend.ze1_compatibility_mode'))
+		{
+			unset($this->feed);
+		}
+	}
+
+	/**
+	 * Get data for an item-level element
+	 *
+	 * This method allows you to get access to ANY element/attribute that is a
+	 * sub-element of the item/entry tag.
+	 *
+	 * See {@see SimplePie::get_feed_tags()} for a description of the return value
+	 *
+	 * @since 1.0
+	 * @see http://simplepie.org/wiki/faq/supported_xml_namespaces
+	 * @param string $namespace The URL of the XML namespace of the elements you're trying to access
+	 * @param string $tag Tag name
+	 * @return array
+	 */
+	public function get_item_tags($namespace, $tag)
+	{
+		if (isset($this->data['child'][$namespace][$tag]))
+		{
+			return $this->data['child'][$namespace][$tag];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the base URL value from the parent feed
+	 *
+	 * Uses `<xml:base>`
+	 *
+	 * @param array $element
+	 * @return string
+	 */
+	public function get_base($element = array())
+	{
+		return $this->feed->get_base($element);
+	}
+
+	/**
+	 * Sanitize feed data
+	 *
+	 * @access private
+	 * @see SimplePie::sanitize()
+	 * @param string $data Data to sanitize
+	 * @param int $type One of the SIMPLEPIE_CONSTRUCT_* constants
+	 * @param string $base Base URL to resolve URLs against
+	 * @return string Sanitized data
+	 */
+	public function sanitize($data, $type, $base = '')
+	{
+		return $this->feed->sanitize($data, $type, $base);
+	}
+
+	/**
+	 * Get the parent feed
+	 *
+	 * Note: this may not work as you think for multifeeds!
+	 *
+	 * @link http://simplepie.org/faq/typical_multifeed_gotchas#missing_data_from_feed
+	 * @since 1.0
+	 * @return SimplePie
+	 */
+	public function get_feed()
+	{
+		return $this->feed;
+	}
+
+	/**
+	 * Get the unique identifier for the item
+	 *
+	 * This is usually used when writing code to check for new items in a feed.
+	 *
+	 * Uses `<atom:id>`, `<guid>`, `<dc:identifier>` or the `about` attribute
+	 * for RDF. If none of these are supplied (or `$hash` is true), creates an
+	 * MD5 hash based on the permalink, title and content.
+	 *
+	 * @since Beta 2
+	 * @param boolean $hash Should we force using a hash instead of the supplied ID?
+	 * @return string
+	 */
+	public function get_id($hash = false, $fn = '')
+	{
+		if (!$hash)
+		{
+			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'id'))
+			{
+				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'id'))
+			{
+				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'guid'))
+			{
+				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'identifier'))
+			{
+				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'identifier'))
+			{
+				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			elseif (isset($this->data['attribs'][SIMPLEPIE_NAMESPACE_RDF]['about']))
+			{
+				return $this->sanitize($this->data['attribs'][SIMPLEPIE_NAMESPACE_RDF]['about'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+		}
+		if ($fn === '' || !is_callable($fn)) $fn = 'md5';
+		return call_user_func($fn,
+		       $this->get_permalink().$this->get_title().$this->get_content());
+	}
+
+	/**
+	 * Get the title of the item
+	 *
+	 * Uses `<atom:title>`, `<title>` or `<dc:title>`
+	 *
+	 * @since Beta 2 (previously called `get_item_title` since 0.8)
+	 * @return string|null
+	 */
+	public function get_title()
+	{
+		if (!isset($this->data['title']))
+		{
+			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
+			{
+				$this->data['title'] = $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
+			{
+				$this->data['title'] = $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
+			{
+				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+			{
+				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
+			{
+				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+			{
+				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+			{
+				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			else
+			{
+				$this->data['title'] = null;
+			}
+		}
+		return $this->data['title'];
+	}
+
+	/**
+	 * Get the content for the item
+	 *
+	 * Prefers summaries over full content , but will return full content if a
+	 * summary does not exist.
+	 *
+	 * To prefer full content instead, use {@see get_content}
+	 *
+	 * Uses `<atom:summary>`, `<description>`, `<dc:description>` or
+	 * `<itunes:subtitle>`
+	 *
+	 * @since 0.8
+	 * @param boolean $description_only Should we avoid falling back to the content?
+	 * @return string|null
+	 */
+	public function get_description($description_only = false)
+	{
+		if (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'summary')) &&
+		    ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0]))))
+		{
+			return $return;
+		}
+		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'summary')) &&
+		        ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0]))))
+		{
+			return $return;
+		}
+		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description')) &&
+		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($tags[0]))))
+		{
+			return $return;
+		}
+		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description')) &&
+		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($tags[0]))))
+		{
+			return $return;
+		}
+		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description')) &&
+		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)))
+		{
+			return $return;
+		}
+		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description')) &&
+		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)))
+		{
+			return $return;
+		}
+		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary')) &&
+		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($tags[0]))))
+		{
+			return $return;
+		}
+		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle')) &&
+		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)))
+		{
+			return $return;
+		}
+		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description')) &&
+		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML)))
+		{
+			return $return;
+		}
+
+		elseif (!$description_only)
+		{
+			return $this->get_content(true);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the content for the item
+	 *
+	 * Prefers full content over summaries, but will return a summary if full
+	 * content does not exist.
+	 *
+	 * To prefer summaries instead, use {@see get_description}
+	 *
+	 * Uses `<atom:content>` or `<content:encoded>` (RSS 1.0 Content Module)
+	 *
+	 * @since 1.0
+	 * @param boolean $content_only Should we avoid falling back to the description?
+	 * @return string|null
+	 */
+	public function get_content($content_only = false)
+	{
+		if (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'content')) &&
+		    ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_10_content_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0]))))
+		{
+			return $return;
+		}
+		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'content')) &&
+		        ($return = $this->sanitize($tags[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($tags[0]['attribs'])), $this->get_base($tags[0]))))
+		{
+			return $return;
+		}
+		elseif (($tags = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10_MODULES_CONTENT, 'encoded')) &&
+		        ($return = $this->sanitize($tags[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($tags[0]))))
+		{
+			return $return;
+		}
+		elseif (!$content_only)
+		{
+			return $this->get_description(true);
+		}
+		else
+		{
+			return null;
+		}
+	}
+	
+	/**
+	 * Get the media:thumbnail of the item
+	 *
+	 * Uses `<media:thumbnail>`
+	 *
+	 * 
+	 * @return array|null
+	 */
+	public function get_thumbnail()
+	{
+		if (!isset($this->data['thumbnail']))
+		{
+			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail'))
+			{
+				$this->data['thumbnail'] = $return[0]['attribs'][''];
+			}
+			else
+			{
+				$this->data['thumbnail'] = null;
+			}
+		}
+		return $this->data['thumbnail'];
+	}	
+
+	/**
+	 * Get a category for the item
+	 *
+	 * @since Beta 3 (previously called `get_categories()` since Beta 2)
+	 * @param int $key The category that you want to return.  Remember that arrays begin with 0, not 1
+	 * @return SimplePie_Category|null
+	 */
+	public function get_category($key = 0)
+	{
+		$categories = $this->get_categories();
+		if (isset($categories[$key]))
+		{
+			return $categories[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all categories for the item
+	 *
+	 * Uses `<atom:category>`, `<category>` or `<dc:subject>`
+	 *
+	 * @since Beta 3
+	 * @return SimplePie_Category[]|null List of {@see SimplePie_Category} objects
+	 */
+	public function get_categories()
+	{
+		$categories = array();
+
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'category') as $category)
+		{
+			$term = null;
+			$scheme = null;
+			$label = null;
+			if (isset($category['attribs']['']['term']))
+			{
+				$term = $this->sanitize($category['attribs']['']['term'], SIMPLEPIE_CONSTRUCT_HTML);
+			}
+			if (isset($category['attribs']['']['scheme']))
+			{
+				$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_HTML);
+			}
+			if (isset($category['attribs']['']['label']))
+			{
+				$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_HTML);
+			}
+			$categories[] = $this->registry->create('Category', array($term, $scheme, $label));
+		}
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'category') as $category)
+		{
+			// This is really the label, but keep this as the term also for BC.
+			// Label will also work on retrieving because that falls back to term.
+			$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_HTML);
+			if (isset($category['attribs']['']['domain']))
+			{
+				$scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_HTML);
+			}
+			else
+			{
+				$scheme = null;
+			}
+			$categories[] = $this->registry->create('Category', array($term, $scheme, null));
+		}
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category)
+		{
+			$categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_HTML), null, null));
+		}
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'subject') as $category)
+		{
+			$categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_HTML), null, null));
+		}
+
+		if (!empty($categories))
+		{
+			return array_unique($categories);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get an author for the item
+	 *
+	 * @since Beta 2
+	 * @param int $key The author that you want to return.  Remember that arrays begin with 0, not 1
+	 * @return SimplePie_Author|null
+	 */
+	public function get_author($key = 0)
+	{
+		$authors = $this->get_authors();
+		if (isset($authors[$key]))
+		{
+			return $authors[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get a contributor for the item
+	 *
+	 * @since 1.1
+	 * @param int $key The contrbutor that you want to return.  Remember that arrays begin with 0, not 1
+	 * @return SimplePie_Author|null
+	 */
+	public function get_contributor($key = 0)
+	{
+		$contributors = $this->get_contributors();
+		if (isset($contributors[$key]))
+		{
+			return $contributors[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all contributors for the item
+	 *
+	 * Uses `<atom:contributor>`
+	 *
+	 * @since 1.1
+	 * @return array|null List of {@see SimplePie_Author} objects
+	 */
+	public function get_contributors()
+	{
+		$contributors = array();
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'contributor') as $contributor)
+		{
+			$name = null;
+			$uri = null;
+			$email = null;
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']))
+			{
+				$name = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']))
+			{
+				$uri = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]));
+			}
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data']))
+			{
+				$email = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if ($name !== null || $email !== null || $uri !== null)
+			{
+				$contributors[] = $this->registry->create('Author', array($name, $uri, $email));
+			}
+		}
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'contributor') as $contributor)
+		{
+			$name = null;
+			$url = null;
+			$email = null;
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data']))
+			{
+				$name = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data']))
+			{
+				$url = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]));
+			}
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data']))
+			{
+				$email = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if ($name !== null || $email !== null || $url !== null)
+			{
+				$contributors[] = $this->registry->create('Author', array($name, $url, $email));
+			}
+		}
+
+		if (!empty($contributors))
+		{
+			return array_unique($contributors);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all authors for the item
+	 *
+	 * Uses `<atom:author>`, `<author>`, `<dc:creator>` or `<itunes:author>`
+	 *
+	 * @since Beta 2
+	 * @return array|null List of {@see SimplePie_Author} objects
+	 */
+	public function get_authors()
+	{
+		$authors = array();
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'author') as $author)
+		{
+			$name = null;
+			$uri = null;
+			$email = null;
+			if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']))
+			{
+				$name = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_HTML);
+			}
+			if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']))
+			{
+				$uri = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]));
+			}
+			if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data']))
+			{
+				$email = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_HTML);
+			}
+			if ($name !== null || $email !== null || $uri !== null)
+			{
+				$authors[] = $this->registry->create('Author', array($name, $uri, $email));
+			}
+		}
+		if ($author = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'author'))
+		{
+			$name = null;
+			$url = null;
+			$email = null;
+			if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data']))
+			{
+				$name = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_HTML);
+			}
+			if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data']))
+			{
+				$url = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]));
+			}
+			if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data']))
+			{
+				$email = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_HTML);
+			}
+			if ($name !== null || $email !== null || $url !== null)
+			{
+				$authors[] = $this->registry->create('Author', array($name, $url, $email));
+			}
+		}
+		if ($author = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'author'))
+		{
+			$authors[] = $this->registry->create('Author', array(null, null, $this->sanitize($author[0]['data'], SIMPLEPIE_CONSTRUCT_HTML)));
+		}
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'creator') as $author)
+		{
+			$authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_HTML), null, null));
+		}
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'creator') as $author)
+		{
+			$authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_HTML), null, null));
+		}
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'author') as $author)
+		{
+			$authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_HTML), null, null));
+		}
+
+		if (!empty($authors))
+		{
+			return array_unique($authors);
+		}
+		elseif (($source = $this->get_source()) && ($authors = $source->get_authors()))
+		{
+			return $authors;
+		}
+		elseif ($authors = $this->feed->get_authors())
+		{
+			return $authors;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the copyright info for the item
+	 *
+	 * Uses `<atom:rights>` or `<dc:rights>`
+	 *
+	 * @since 1.1
+	 * @return string
+	 */
+	public function get_copyright()
+	{
+		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'rights'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the posting date/time for the item
+	 *
+	 * Uses `<atom:published>`, `<atom:updated>`, `<atom:issued>`,
+	 * `<atom:modified>`, `<pubDate>` or `<dc:date>`
+	 *
+	 * Note: obeys PHP's timezone setting. To get a UTC date/time, use
+	 * {@see get_gmdate}
+	 *
+	 * @since Beta 2 (previously called `get_item_date` since 0.8)
+	 *
+	 * @param string $date_format Supports any PHP date format from {@see http://php.net/date} (empty for the raw data)
+	 * @return int|string|null
+	 */
+	public function get_date($date_format = 'j F Y, g:i a')
+	{
+		if (!isset($this->data['date']))
+		{
+			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'published'))
+			{
+				$this->data['date']['raw'] = $return[0]['data'];
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'pubDate'))
+			{
+				$this->data['date']['raw'] = $return[0]['data'];
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'date'))
+			{
+				$this->data['date']['raw'] = $return[0]['data'];
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'date'))
+			{
+				$this->data['date']['raw'] = $return[0]['data'];
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'updated'))
+			{
+				$this->data['date']['raw'] = $return[0]['data'];
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'issued'))
+			{
+				$this->data['date']['raw'] = $return[0]['data'];
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'created'))
+			{
+				$this->data['date']['raw'] = $return[0]['data'];
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'modified'))
+			{
+				$this->data['date']['raw'] = $return[0]['data'];
+			}
+
+			if (!empty($this->data['date']['raw']))
+			{
+				$parser = $this->registry->call('Parse_Date', 'get');
+				$this->data['date']['parsed'] = $parser->parse($this->data['date']['raw']);
+			}
+			else
+			{
+				$this->data['date'] = null;
+			}
+		}
+		if ($this->data['date'])
+		{
+			$date_format = (string) $date_format;
+			switch ($date_format)
+			{
+				case '':
+					return $this->sanitize($this->data['date']['raw'], SIMPLEPIE_CONSTRUCT_TEXT);
+
+				case 'U':
+					return $this->data['date']['parsed'];
+
+				default:
+					return date($date_format, $this->data['date']['parsed']);
+			}
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the update date/time for the item
+	 *
+	 * Uses `<atom:updated>`
+	 *
+	 * Note: obeys PHP's timezone setting. To get a UTC date/time, use
+	 * {@see get_gmdate}
+	 *
+	 * @param string $date_format Supports any PHP date format from {@see http://php.net/date} (empty for the raw data)
+	 * @return int|string|null
+	 */
+	public function get_updated_date($date_format = 'j F Y, g:i a')
+	{
+		if (!isset($this->data['updated']))
+		{
+			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'updated'))
+			{
+				$this->data['updated']['raw'] = $return[0]['data'];
+			}
+
+			if (!empty($this->data['updated']['raw']))
+			{
+				$parser = $this->registry->call('Parse_Date', 'get');
+				$this->data['updated']['parsed'] = $parser->parse($this->data['updated']['raw']);
+			}
+			else
+			{
+				$this->data['updated'] = null;
+			}
+		}
+		if ($this->data['updated'])
+		{
+			$date_format = (string) $date_format;
+			switch ($date_format)
+			{
+				case '':
+					return $this->sanitize($this->data['updated']['raw'], SIMPLEPIE_CONSTRUCT_TEXT);
+
+				case 'U':
+					return $this->data['updated']['parsed'];
+
+				default:
+					return date($date_format, $this->data['updated']['parsed']);
+			}
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the localized posting date/time for the item
+	 *
+	 * Returns the date formatted in the localized language. To display in
+	 * languages other than the server's default, you need to change the locale
+	 * with {@link http://php.net/setlocale setlocale()}. The available
+	 * localizations depend on which ones are installed on your web server.
+	 *
+	 * @since 1.0
+	 *
+	 * @param string $date_format Supports any PHP date format from {@see http://php.net/strftime} (empty for the raw data)
+	 * @return int|string|null
+	 */
+	public function get_local_date($date_format = '%c')
+	{
+		if (!$date_format)
+		{
+			return $this->sanitize($this->get_date(''), SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif (($date = $this->get_date('U')) !== null && $date !== false)
+		{
+			return strftime($date_format, $date);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the posting date/time for the item (UTC time)
+	 *
+	 * @see get_date
+	 * @param string $date_format Supports any PHP date format from {@see http://php.net/date}
+	 * @return int|string|null
+	 */
+	public function get_gmdate($date_format = 'j F Y, g:i a')
+	{
+		$date = $this->get_date('U');
+		if ($date === null)
+		{
+			return null;
+		}
+
+		return gmdate($date_format, $date);
+	}
+
+	/**
+	 * Get the update date/time for the item (UTC time)
+	 *
+	 * @see get_updated_date
+	 * @param string $date_format Supports any PHP date format from {@see http://php.net/date}
+	 * @return int|string|null
+	 */
+	public function get_updated_gmdate($date_format = 'j F Y, g:i a')
+	{
+		$date = $this->get_updated_date('U');
+		if ($date === null)
+		{
+			return null;
+		}
+
+		return gmdate($date_format, $date);
+	}
+
+	/**
+	 * Get the permalink for the item
+	 *
+	 * Returns the first link available with a relationship of "alternate".
+	 * Identical to {@see get_link()} with key 0
+	 *
+	 * @see get_link
+	 * @since 0.8
+	 * @return string|null Permalink URL
+	 */
+	public function get_permalink()
+	{
+		$link = $this->get_link();
+		$enclosure = $this->get_enclosure(0);
+		if ($link !== null)
+		{
+			return $link;
+		}
+		elseif ($enclosure !== null)
+		{
+			return $enclosure->get_link();
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get a single link for the item
+	 *
+	 * @since Beta 3
+	 * @param int $key The link that you want to return.  Remember that arrays begin with 0, not 1
+	 * @param string $rel The relationship of the link to return
+	 * @return string|null Link URL
+	 */
+	public function get_link($key = 0, $rel = 'alternate')
+	{
+		$links = $this->get_links($rel);
+		if ($links[$key] !== null)
+		{
+			return $links[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all links for the item
+	 *
+	 * Uses `<atom:link>`, `<link>` or `<guid>`
+	 *
+	 * @since Beta 2
+	 * @param string $rel The relationship of links to return
+	 * @return array|null Links found for the item (strings)
+	 */
+	public function get_links($rel = 'alternate')
+	{
+		if (!isset($this->data['links']))
+		{
+			$this->data['links'] = array();
+			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link') as $link)
+			{
+				if (isset($link['attribs']['']['href']))
+				{
+					$link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
+					$this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
+
+				}
+			}
+			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'link') as $link)
+			{
+				if (isset($link['attribs']['']['href']))
+				{
+					$link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
+					$this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
+				}
+			}
+			if ($links = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link'))
+			{
+				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+			}
+			if ($links = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
+			{
+				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+			}
+			if ($links = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
+			{
+				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+			}
+			if ($links = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'guid'))
+			{
+				if (!isset($links[0]['attribs']['']['isPermaLink']) || strtolower(trim($links[0]['attribs']['']['isPermaLink'])) === 'true')
+				{
+					$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+				}
+			}
+
+			$keys = array_keys($this->data['links']);
+			foreach ($keys as $key)
+			{
+				if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key)))
+				{
+					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
+					{
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
+						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
+					}
+					else
+					{
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
+					}
+				}
+				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
+				{
+					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
+				}
+				$this->data['links'][$key] = array_unique($this->data['links'][$key]);
+			}
+		}
+		if (isset($this->data['links'][$rel]))
+		{
+			return $this->data['links'][$rel];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get an enclosure from the item
+	 *
+	 * Supports the <enclosure> RSS tag, as well as Media RSS and iTunes RSS.
+	 *
+	 * @since Beta 2
+	 * @todo Add ability to prefer one type of content over another (in a media group).
+	 * @param int $key The enclosure that you want to return.  Remember that arrays begin with 0, not 1
+	 * @return SimplePie_Enclosure|null
+	 */
+	public function get_enclosure($key = 0, $prefer = null)
+	{
+		$enclosures = $this->get_enclosures();
+		if (isset($enclosures[$key]))
+		{
+			return $enclosures[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get all available enclosures (podcasts, etc.)
+	 *
+	 * Supports the <enclosure> RSS tag, as well as Media RSS and iTunes RSS.
+	 *
+	 * At this point, we're pretty much assuming that all enclosures for an item
+	 * are the same content.  Anything else is too complicated to
+	 * properly support.
+	 *
+	 * @since Beta 2
+	 * @todo Add support for end-user defined sorting of enclosures by type/handler (so we can prefer the faster-loading FLV over MP4).
+	 * @todo If an element exists at a level, but its value is empty, we should fall back to the value from the parent (if it exists).
+	 * @return SimplePie_Enclosure[]|null List of SimplePie_Enclosure items
+	 */
+	public function get_enclosures()
+	{
+		if (!isset($this->data['enclosures']))
+		{
+			$this->data['enclosures'] = array();
+
+			// Elements
+			$captions_parent = null;
+			$categories_parent = null;
+			$copyrights_parent = null;
+			$credits_parent = null;
+			$description_parent = null;
+			$duration_parent = null;
+			$hashes_parent = null;
+			$keywords_parent = null;
+			$player_parent = null;
+			$ratings_parent = null;
+			$restrictions_parent = null;
+			$thumbnails_parent = null;
+			$title_parent = null;
+
+			// Let's do the channel and item-level ones first, and just re-use them if we need to.
+			$parent = $this->get_feed();
+
+			// CAPTIONS
+			if ($captions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'text'))
+			{
+				foreach ($captions as $caption)
+				{
+					$caption_type = null;
+					$caption_lang = null;
+					$caption_startTime = null;
+					$caption_endTime = null;
+					$caption_text = null;
+					if (isset($caption['attribs']['']['type']))
+					{
+						$caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($caption['attribs']['']['lang']))
+					{
+						$caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($caption['attribs']['']['start']))
+					{
+						$caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($caption['attribs']['']['end']))
+					{
+						$caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($caption['data']))
+					{
+						$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$captions_parent[] = $this->registry->create('Caption', array($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text));
+				}
+			}
+			elseif ($captions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'text'))
+			{
+				foreach ($captions as $caption)
+				{
+					$caption_type = null;
+					$caption_lang = null;
+					$caption_startTime = null;
+					$caption_endTime = null;
+					$caption_text = null;
+					if (isset($caption['attribs']['']['type']))
+					{
+						$caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($caption['attribs']['']['lang']))
+					{
+						$caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($caption['attribs']['']['start']))
+					{
+						$caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($caption['attribs']['']['end']))
+					{
+						$caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($caption['data']))
+					{
+						$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$captions_parent[] = $this->registry->create('Caption', array($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text));
+				}
+			}
+			if (is_array($captions_parent))
+			{
+				$captions_parent = array_values(array_unique($captions_parent));
+			}
+
+			// CATEGORIES
+			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'category') as $category)
+			{
+				$term = null;
+				$scheme = null;
+				$label = null;
+				if (isset($category['data']))
+				{
+					$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				if (isset($category['attribs']['']['scheme']))
+				{
+					$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				else
+				{
+					$scheme = 'http://search.yahoo.com/mrss/category_schema';
+				}
+				if (isset($category['attribs']['']['label']))
+				{
+					$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				$categories_parent[] = $this->registry->create('Category', array($term, $scheme, $label));
+			}
+			foreach ((array) $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'category') as $category)
+			{
+				$term = null;
+				$scheme = null;
+				$label = null;
+				if (isset($category['data']))
+				{
+					$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				if (isset($category['attribs']['']['scheme']))
+				{
+					$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				else
+				{
+					$scheme = 'http://search.yahoo.com/mrss/category_schema';
+				}
+				if (isset($category['attribs']['']['label']))
+				{
+					$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				$categories_parent[] = $this->registry->create('Category', array($term, $scheme, $label));
+			}
+			foreach ((array) $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'category') as $category)
+			{
+				$term = null;
+				$scheme = 'http://www.itunes.com/dtds/podcast-1.0.dtd';
+				$label = null;
+				if (isset($category['attribs']['']['text']))
+				{
+					$label = $this->sanitize($category['attribs']['']['text'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				$categories_parent[] = $this->registry->create('Category', array($term, $scheme, $label));
+
+				if (isset($category['child'][SIMPLEPIE_NAMESPACE_ITUNES]['category']))
+				{
+					foreach ((array) $category['child'][SIMPLEPIE_NAMESPACE_ITUNES]['category'] as $subcategory)
+					{
+						if (isset($subcategory['attribs']['']['text']))
+						{
+							$label = $this->sanitize($subcategory['attribs']['']['text'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						$categories_parent[] = $this->registry->create('Category', array($term, $scheme, $label));
+					}
+				}
+			}
+			if (is_array($categories_parent))
+			{
+				$categories_parent = array_values(array_unique($categories_parent));
+			}
+
+			// COPYRIGHT
+			if ($copyright = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'copyright'))
+			{
+				$copyright_url = null;
+				$copyright_label = null;
+				if (isset($copyright[0]['attribs']['']['url']))
+				{
+					$copyright_url = $this->sanitize($copyright[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				if (isset($copyright[0]['data']))
+				{
+					$copyright_label = $this->sanitize($copyright[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				$copyrights_parent = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
+			}
+			elseif ($copyright = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'copyright'))
+			{
+				$copyright_url = null;
+				$copyright_label = null;
+				if (isset($copyright[0]['attribs']['']['url']))
+				{
+					$copyright_url = $this->sanitize($copyright[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				if (isset($copyright[0]['data']))
+				{
+					$copyright_label = $this->sanitize($copyright[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				$copyrights_parent = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
+			}
+
+			// CREDITS
+			if ($credits = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'credit'))
+			{
+				foreach ($credits as $credit)
+				{
+					$credit_role = null;
+					$credit_scheme = null;
+					$credit_name = null;
+					if (isset($credit['attribs']['']['role']))
+					{
+						$credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($credit['attribs']['']['scheme']))
+					{
+						$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					else
+					{
+						$credit_scheme = 'urn:ebu';
+					}
+					if (isset($credit['data']))
+					{
+						$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$credits_parent[] = $this->registry->create('Credit', array($credit_role, $credit_scheme, $credit_name));
+				}
+			}
+			elseif ($credits = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'credit'))
+			{
+				foreach ($credits as $credit)
+				{
+					$credit_role = null;
+					$credit_scheme = null;
+					$credit_name = null;
+					if (isset($credit['attribs']['']['role']))
+					{
+						$credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($credit['attribs']['']['scheme']))
+					{
+						$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					else
+					{
+						$credit_scheme = 'urn:ebu';
+					}
+					if (isset($credit['data']))
+					{
+						$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$credits_parent[] = $this->registry->create('Credit', array($credit_role, $credit_scheme, $credit_name));
+				}
+			}
+			if (is_array($credits_parent))
+			{
+				$credits_parent = array_values(array_unique($credits_parent));
+			}
+
+			// DESCRIPTION
+			if ($description_parent = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'description'))
+			{
+				if (isset($description_parent[0]['data']))
+				{
+					$description_parent = $this->sanitize($description_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+			}
+			elseif ($description_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'description'))
+			{
+				if (isset($description_parent[0]['data']))
+				{
+					$description_parent = $this->sanitize($description_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+			}
+
+			// DURATION
+			if ($duration_parent = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'duration'))
+			{
+				$seconds = null;
+				$minutes = null;
+				$hours = null;
+				if (isset($duration_parent[0]['data']))
+				{
+					$temp = explode(':', $this->sanitize($duration_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+					if (sizeof($temp) > 0)
+					{
+						$seconds = (int) array_pop($temp);
+					}
+					if (sizeof($temp) > 0)
+					{
+						$minutes = (int) array_pop($temp);
+						$seconds += $minutes * 60;
+					}
+					if (sizeof($temp) > 0)
+					{
+						$hours = (int) array_pop($temp);
+						$seconds += $hours * 3600;
+					}
+					unset($temp);
+					$duration_parent = $seconds;
+				}
+			}
+
+			// HASHES
+			if ($hashes_iterator = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'hash'))
+			{
+				foreach ($hashes_iterator as $hash)
+				{
+					$value = null;
+					$algo = null;
+					if (isset($hash['data']))
+					{
+						$value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($hash['attribs']['']['algo']))
+					{
+						$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					else
+					{
+						$algo = 'md5';
+					}
+					$hashes_parent[] = $algo.':'.$value;
+				}
+			}
+			elseif ($hashes_iterator = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'hash'))
+			{
+				foreach ($hashes_iterator as $hash)
+				{
+					$value = null;
+					$algo = null;
+					if (isset($hash['data']))
+					{
+						$value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($hash['attribs']['']['algo']))
+					{
+						$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					else
+					{
+						$algo = 'md5';
+					}
+					$hashes_parent[] = $algo.':'.$value;
+				}
+			}
+			if (is_array($hashes_parent))
+			{
+				$hashes_parent = array_values(array_unique($hashes_parent));
+			}
+
+			// KEYWORDS
+			if ($keywords = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'keywords'))
+			{
+				if (isset($keywords[0]['data']))
+				{
+					$temp = explode(',', $this->sanitize($keywords[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+					foreach ($temp as $word)
+					{
+						$keywords_parent[] = trim($word);
+					}
+				}
+				unset($temp);
+			}
+			elseif ($keywords = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
+			{
+				if (isset($keywords[0]['data']))
+				{
+					$temp = explode(',', $this->sanitize($keywords[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+					foreach ($temp as $word)
+					{
+						$keywords_parent[] = trim($word);
+					}
+				}
+				unset($temp);
+			}
+			elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'keywords'))
+			{
+				if (isset($keywords[0]['data']))
+				{
+					$temp = explode(',', $this->sanitize($keywords[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+					foreach ($temp as $word)
+					{
+						$keywords_parent[] = trim($word);
+					}
+				}
+				unset($temp);
+			}
+			elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
+			{
+				if (isset($keywords[0]['data']))
+				{
+					$temp = explode(',', $this->sanitize($keywords[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+					foreach ($temp as $word)
+					{
+						$keywords_parent[] = trim($word);
+					}
+				}
+				unset($temp);
+			}
+			if (is_array($keywords_parent))
+			{
+				$keywords_parent = array_values(array_unique($keywords_parent));
+			}
+
+			// PLAYER
+			if ($player_parent = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'player'))
+			{
+				if (isset($player_parent[0]['attribs']['']['url']))
+				{
+					$player_parent = $this->sanitize($player_parent[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+				}
+			}
+			elseif ($player_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'player'))
+			{
+				if (isset($player_parent[0]['attribs']['']['url']))
+				{
+					$player_parent = $this->sanitize($player_parent[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+				}
+			}
+
+			// RATINGS
+			if ($ratings = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'rating'))
+			{
+				foreach ($ratings as $rating)
+				{
+					$rating_scheme = null;
+					$rating_value = null;
+					if (isset($rating['attribs']['']['scheme']))
+					{
+						$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					else
+					{
+						$rating_scheme = 'urn:simple';
+					}
+					if (isset($rating['data']))
+					{
+						$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
+				}
+			}
+			elseif ($ratings = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
+			{
+				foreach ($ratings as $rating)
+				{
+					$rating_scheme = 'urn:itunes';
+					$rating_value = null;
+					if (isset($rating['data']))
+					{
+						$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
+				}
+			}
+			elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'rating'))
+			{
+				foreach ($ratings as $rating)
+				{
+					$rating_scheme = null;
+					$rating_value = null;
+					if (isset($rating['attribs']['']['scheme']))
+					{
+						$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					else
+					{
+						$rating_scheme = 'urn:simple';
+					}
+					if (isset($rating['data']))
+					{
+						$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
+				}
+			}
+			elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
+			{
+				foreach ($ratings as $rating)
+				{
+					$rating_scheme = 'urn:itunes';
+					$rating_value = null;
+					if (isset($rating['data']))
+					{
+						$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
+				}
+			}
+			if (is_array($ratings_parent))
+			{
+				$ratings_parent = array_values(array_unique($ratings_parent));
+			}
+
+			// RESTRICTIONS
+			if ($restrictions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'restriction'))
+			{
+				foreach ($restrictions as $restriction)
+				{
+					$restriction_relationship = null;
+					$restriction_type = null;
+					$restriction_value = null;
+					if (isset($restriction['attribs']['']['relationship']))
+					{
+						$restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($restriction['attribs']['']['type']))
+					{
+						$restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($restriction['data']))
+					{
+						$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
+				}
+			}
+			elseif ($restrictions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
+			{
+				foreach ($restrictions as $restriction)
+				{
+					$restriction_relationship = 'allow';
+					$restriction_type = null;
+					$restriction_value = 'itunes';
+					if (isset($restriction['data']) && strtolower($restriction['data']) === 'yes')
+					{
+						$restriction_relationship = 'deny';
+					}
+					$restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
+				}
+			}
+			elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'restriction'))
+			{
+				foreach ($restrictions as $restriction)
+				{
+					$restriction_relationship = null;
+					$restriction_type = null;
+					$restriction_value = null;
+					if (isset($restriction['attribs']['']['relationship']))
+					{
+						$restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($restriction['attribs']['']['type']))
+					{
+						$restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($restriction['data']))
+					{
+						$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
+				}
+			}
+			elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
+			{
+				foreach ($restrictions as $restriction)
+				{
+					$restriction_relationship = 'allow';
+					$restriction_type = null;
+					$restriction_value = 'itunes';
+					if (isset($restriction['data']) && strtolower($restriction['data']) === 'yes')
+					{
+						$restriction_relationship = 'deny';
+					}
+					$restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
+				}
+			}
+			if (is_array($restrictions_parent))
+			{
+				$restrictions_parent = array_values(array_unique($restrictions_parent));
+			}
+			else
+			{
+				$restrictions_parent = array(new SimplePie_Restriction('allow', null, 'default'));
+			}
+
+			// THUMBNAILS
+			if ($thumbnails = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail'))
+			{
+				foreach ($thumbnails as $thumbnail)
+				{
+					if (isset($thumbnail['attribs']['']['url']))
+					{
+						$thumbnails_parent[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+					}
+				}
+			}
+			elseif ($thumbnails = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail'))
+			{
+				foreach ($thumbnails as $thumbnail)
+				{
+					if (isset($thumbnail['attribs']['']['url']))
+					{
+						$thumbnails_parent[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+					}
+				}
+			}
+
+			// TITLES
+			if ($title_parent = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'title'))
+			{
+				if (isset($title_parent[0]['data']))
+				{
+					$title_parent = $this->sanitize($title_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+			}
+			elseif ($title_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'title'))
+			{
+				if (isset($title_parent[0]['data']))
+				{
+					$title_parent = $this->sanitize($title_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+			}
+
+			// Clear the memory
+			unset($parent);
+
+			// Attributes
+			$bitrate = null;
+			$channels = null;
+			$duration = null;
+			$expression = null;
+			$framerate = null;
+			$height = null;
+			$javascript = null;
+			$lang = null;
+			$length = null;
+			$medium = null;
+			$samplingrate = null;
+			$type = null;
+			$url = null;
+			$width = null;
+
+			// Elements
+			$captions = null;
+			$categories = null;
+			$copyrights = null;
+			$credits = null;
+			$description = null;
+			$hashes = null;
+			$keywords = null;
+			$player = null;
+			$ratings = null;
+			$restrictions = null;
+			$thumbnails = null;
+			$title = null;
+
+			// If we have media:group tags, loop through them.
+			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'group') as $group)
+			{
+				if(isset($group['child']) && isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content']))
+				{
+					// If we have media:content tags, loop through them.
+					foreach ((array) $group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'] as $content)
+					{
+						if (isset($content['attribs']['']['url']))
+						{
+							// Attributes
+							$bitrate = null;
+							$channels = null;
+							$duration = null;
+							$expression = null;
+							$framerate = null;
+							$height = null;
+							$javascript = null;
+							$lang = null;
+							$length = null;
+							$medium = null;
+							$samplingrate = null;
+							$type = null;
+							$url = null;
+							$width = null;
+
+							// Elements
+							$captions = null;
+							$categories = null;
+							$copyrights = null;
+							$credits = null;
+							$description = null;
+							$hashes = null;
+							$keywords = null;
+							$player = null;
+							$ratings = null;
+							$restrictions = null;
+							$thumbnails = null;
+							$title = null;
+
+							// Start checking the attributes of media:content
+							if (isset($content['attribs']['']['bitrate']))
+							{
+								$bitrate = $this->sanitize($content['attribs']['']['bitrate'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							if (isset($content['attribs']['']['channels']))
+							{
+								$channels = $this->sanitize($content['attribs']['']['channels'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							if (isset($content['attribs']['']['duration']))
+							{
+								$duration = $this->sanitize($content['attribs']['']['duration'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							else
+							{
+								$duration = $duration_parent;
+							}
+							if (isset($content['attribs']['']['expression']))
+							{
+								$expression = $this->sanitize($content['attribs']['']['expression'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							if (isset($content['attribs']['']['framerate']))
+							{
+								$framerate = $this->sanitize($content['attribs']['']['framerate'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							if (isset($content['attribs']['']['height']))
+							{
+								$height = $this->sanitize($content['attribs']['']['height'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							if (isset($content['attribs']['']['lang']))
+							{
+								$lang = $this->sanitize($content['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							if (isset($content['attribs']['']['fileSize']))
+							{
+								$length = ceil($content['attribs']['']['fileSize']);
+							}
+							if (isset($content['attribs']['']['medium']))
+							{
+								$medium = $this->sanitize($content['attribs']['']['medium'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							if (isset($content['attribs']['']['samplingrate']))
+							{
+								$samplingrate = $this->sanitize($content['attribs']['']['samplingrate'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							if (isset($content['attribs']['']['type']))
+							{
+								$type = $this->sanitize($content['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							if (isset($content['attribs']['']['width']))
+							{
+								$width = $this->sanitize($content['attribs']['']['width'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							$url = $this->sanitize($content['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+
+							// Checking the other optional media: elements. Priority: media:content, media:group, item, channel
+
+							// CAPTIONS
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text']))
+							{
+								foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text'] as $caption)
+								{
+									$caption_type = null;
+									$caption_lang = null;
+									$caption_startTime = null;
+									$caption_endTime = null;
+									$caption_text = null;
+									if (isset($caption['attribs']['']['type']))
+									{
+										$caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($caption['attribs']['']['lang']))
+									{
+										$caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($caption['attribs']['']['start']))
+									{
+										$caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($caption['attribs']['']['end']))
+									{
+										$caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($caption['data']))
+									{
+										$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									$captions[] = $this->registry->create('Caption', array($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text));
+								}
+								if (is_array($captions))
+								{
+									$captions = array_values(array_unique($captions));
+								}
+							}
+							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text']))
+							{
+								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text'] as $caption)
+								{
+									$caption_type = null;
+									$caption_lang = null;
+									$caption_startTime = null;
+									$caption_endTime = null;
+									$caption_text = null;
+									if (isset($caption['attribs']['']['type']))
+									{
+										$caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($caption['attribs']['']['lang']))
+									{
+										$caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($caption['attribs']['']['start']))
+									{
+										$caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($caption['attribs']['']['end']))
+									{
+										$caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($caption['data']))
+									{
+										$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									$captions[] = $this->registry->create('Caption', array($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text));
+								}
+								if (is_array($captions))
+								{
+									$captions = array_values(array_unique($captions));
+								}
+							}
+							else
+							{
+								$captions = $captions_parent;
+							}
+
+							// CATEGORIES
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category']))
+							{
+								foreach ((array) $content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category'] as $category)
+								{
+									$term = null;
+									$scheme = null;
+									$label = null;
+									if (isset($category['data']))
+									{
+										$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($category['attribs']['']['scheme']))
+									{
+										$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									else
+									{
+										$scheme = 'http://search.yahoo.com/mrss/category_schema';
+									}
+									if (isset($category['attribs']['']['label']))
+									{
+										$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									$categories[] = $this->registry->create('Category', array($term, $scheme, $label));
+								}
+							}
+							if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category']))
+							{
+								foreach ((array) $group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category'] as $category)
+								{
+									$term = null;
+									$scheme = null;
+									$label = null;
+									if (isset($category['data']))
+									{
+										$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($category['attribs']['']['scheme']))
+									{
+										$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									else
+									{
+										$scheme = 'http://search.yahoo.com/mrss/category_schema';
+									}
+									if (isset($category['attribs']['']['label']))
+									{
+										$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									$categories[] = $this->registry->create('Category', array($term, $scheme, $label));
+								}
+							}
+							if (is_array($categories) && is_array($categories_parent))
+							{
+								$categories = array_values(array_unique(array_merge($categories, $categories_parent)));
+							}
+							elseif (is_array($categories))
+							{
+								$categories = array_values(array_unique($categories));
+							}
+							elseif (is_array($categories_parent))
+							{
+								$categories = array_values(array_unique($categories_parent));
+							}
+
+							// COPYRIGHTS
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
+							{
+								$copyright_url = null;
+								$copyright_label = null;
+								if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url']))
+								{
+									$copyright_url = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data']))
+								{
+									$copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
+							}
+							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
+							{
+								$copyright_url = null;
+								$copyright_label = null;
+								if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url']))
+								{
+									$copyright_url = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data']))
+								{
+									$copyright_label = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
+							}
+							else
+							{
+								$copyrights = $copyrights_parent;
+							}
+
+							// CREDITS
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit']))
+							{
+								foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit'] as $credit)
+								{
+									$credit_role = null;
+									$credit_scheme = null;
+									$credit_name = null;
+									if (isset($credit['attribs']['']['role']))
+									{
+										$credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($credit['attribs']['']['scheme']))
+									{
+										$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									else
+									{
+										$credit_scheme = 'urn:ebu';
+									}
+									if (isset($credit['data']))
+									{
+										$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									$credits[] = $this->registry->create('Credit', array($credit_role, $credit_scheme, $credit_name));
+								}
+								if (is_array($credits))
+								{
+									$credits = array_values(array_unique($credits));
+								}
+							}
+							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit']))
+							{
+								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit'] as $credit)
+								{
+									$credit_role = null;
+									$credit_scheme = null;
+									$credit_name = null;
+									if (isset($credit['attribs']['']['role']))
+									{
+										$credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($credit['attribs']['']['scheme']))
+									{
+										$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									else
+									{
+										$credit_scheme = 'urn:ebu';
+									}
+									if (isset($credit['data']))
+									{
+										$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									$credits[] = $this->registry->create('Credit', array($credit_role, $credit_scheme, $credit_name));
+								}
+								if (is_array($credits))
+								{
+									$credits = array_values(array_unique($credits));
+								}
+							}
+							else
+							{
+								$credits = $credits_parent;
+							}
+
+							// DESCRIPTION
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
+							{
+								$description = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
+							{
+								$description = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							else
+							{
+								$description = $description_parent;
+							}
+
+							// HASHES
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash']))
+							{
+								foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash'] as $hash)
+								{
+									$value = null;
+									$algo = null;
+									if (isset($hash['data']))
+									{
+										$value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($hash['attribs']['']['algo']))
+									{
+										$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									else
+									{
+										$algo = 'md5';
+									}
+									$hashes[] = $algo.':'.$value;
+								}
+								if (is_array($hashes))
+								{
+									$hashes = array_values(array_unique($hashes));
+								}
+							}
+							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash']))
+							{
+								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash'] as $hash)
+								{
+									$value = null;
+									$algo = null;
+									if (isset($hash['data']))
+									{
+										$value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($hash['attribs']['']['algo']))
+									{
+										$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									else
+									{
+										$algo = 'md5';
+									}
+									$hashes[] = $algo.':'.$value;
+								}
+								if (is_array($hashes))
+								{
+									$hashes = array_values(array_unique($hashes));
+								}
+							}
+							else
+							{
+								$hashes = $hashes_parent;
+							}
+
+							// KEYWORDS
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords']))
+							{
+								if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data']))
+								{
+									$temp = explode(',', $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+									foreach ($temp as $word)
+									{
+										$keywords[] = trim($word);
+									}
+									unset($temp);
+								}
+								if (is_array($keywords))
+								{
+									$keywords = array_values(array_unique($keywords));
+								}
+							}
+							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords']))
+							{
+								if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data']))
+								{
+									$temp = explode(',', $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+									foreach ($temp as $word)
+									{
+										$keywords[] = trim($word);
+									}
+									unset($temp);
+								}
+								if (is_array($keywords))
+								{
+									$keywords = array_values(array_unique($keywords));
+								}
+							}
+							else
+							{
+								$keywords = $keywords_parent;
+							}
+
+							// PLAYER
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
+							{
+								$player = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+							}
+							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
+							{
+								$player = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+							}
+							else
+							{
+								$player = $player_parent;
+							}
+
+							// RATINGS
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating']))
+							{
+								foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating'] as $rating)
+								{
+									$rating_scheme = null;
+									$rating_value = null;
+									if (isset($rating['attribs']['']['scheme']))
+									{
+										$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									else
+									{
+										$rating_scheme = 'urn:simple';
+									}
+									if (isset($rating['data']))
+									{
+										$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									$ratings[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
+								}
+								if (is_array($ratings))
+								{
+									$ratings = array_values(array_unique($ratings));
+								}
+							}
+							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating']))
+							{
+								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating'] as $rating)
+								{
+									$rating_scheme = null;
+									$rating_value = null;
+									if (isset($rating['attribs']['']['scheme']))
+									{
+										$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									else
+									{
+										$rating_scheme = 'urn:simple';
+									}
+									if (isset($rating['data']))
+									{
+										$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									$ratings[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
+								}
+								if (is_array($ratings))
+								{
+									$ratings = array_values(array_unique($ratings));
+								}
+							}
+							else
+							{
+								$ratings = $ratings_parent;
+							}
+
+							// RESTRICTIONS
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction']))
+							{
+								foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction'] as $restriction)
+								{
+									$restriction_relationship = null;
+									$restriction_type = null;
+									$restriction_value = null;
+									if (isset($restriction['attribs']['']['relationship']))
+									{
+										$restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($restriction['attribs']['']['type']))
+									{
+										$restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($restriction['data']))
+									{
+										$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									$restrictions[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
+								}
+								if (is_array($restrictions))
+								{
+									$restrictions = array_values(array_unique($restrictions));
+								}
+							}
+							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction']))
+							{
+								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction'] as $restriction)
+								{
+									$restriction_relationship = null;
+									$restriction_type = null;
+									$restriction_value = null;
+									if (isset($restriction['attribs']['']['relationship']))
+									{
+										$restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($restriction['attribs']['']['type']))
+									{
+										$restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									if (isset($restriction['data']))
+									{
+										$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+									}
+									$restrictions[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
+								}
+								if (is_array($restrictions))
+								{
+									$restrictions = array_values(array_unique($restrictions));
+								}
+							}
+							else
+							{
+								$restrictions = $restrictions_parent;
+							}
+
+							// THUMBNAILS
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail']))
+							{
+								foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail)
+								{
+									$thumbnails[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+								}
+								if (is_array($thumbnails))
+								{
+									$thumbnails = array_values(array_unique($thumbnails));
+								}
+							}
+							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail']))
+							{
+								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail)
+								{
+									$thumbnails[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+								}
+								if (is_array($thumbnails))
+								{
+									$thumbnails = array_values(array_unique($thumbnails));
+								}
+							}
+							else
+							{
+								$thumbnails = $thumbnails_parent;
+							}
+
+							// TITLES
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
+							{
+								$title = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
+							{
+								$title = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							else
+							{
+								$title = $title_parent;
+							}
+
+							$this->data['enclosures'][] = $this->registry->create('Enclosure', array($url, $type, $length, null, $bitrate, $captions, $categories, $channels, $copyrights, $credits, $description, $duration, $expression, $framerate, $hashes, $height, $keywords, $lang, $medium, $player, $ratings, $restrictions, $samplingrate, $thumbnails, $title, $width));
+						}
+					}
+				}
+			}
+
+			// If we have standalone media:content tags, loop through them.
+			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content']))
+			{
+				foreach ((array) $this->data['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'] as $content)
+				{
+					if (isset($content['attribs']['']['url']) || isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
+					{
+						// Attributes
+						$bitrate = null;
+						$channels = null;
+						$duration = null;
+						$expression = null;
+						$framerate = null;
+						$height = null;
+						$javascript = null;
+						$lang = null;
+						$length = null;
+						$medium = null;
+						$samplingrate = null;
+						$type = null;
+						$url = null;
+						$width = null;
+
+						// Elements
+						$captions = null;
+						$categories = null;
+						$copyrights = null;
+						$credits = null;
+						$description = null;
+						$hashes = null;
+						$keywords = null;
+						$player = null;
+						$ratings = null;
+						$restrictions = null;
+						$thumbnails = null;
+						$title = null;
+
+						// Start checking the attributes of media:content
+						if (isset($content['attribs']['']['bitrate']))
+						{
+							$bitrate = $this->sanitize($content['attribs']['']['bitrate'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['channels']))
+						{
+							$channels = $this->sanitize($content['attribs']['']['channels'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['duration']))
+						{
+							$duration = $this->sanitize($content['attribs']['']['duration'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						else
+						{
+							$duration = $duration_parent;
+						}
+						if (isset($content['attribs']['']['expression']))
+						{
+							$expression = $this->sanitize($content['attribs']['']['expression'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['framerate']))
+						{
+							$framerate = $this->sanitize($content['attribs']['']['framerate'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['height']))
+						{
+							$height = $this->sanitize($content['attribs']['']['height'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['lang']))
+						{
+							$lang = $this->sanitize($content['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['fileSize']))
+						{
+							$length = ceil($content['attribs']['']['fileSize']);
+						}
+						if (isset($content['attribs']['']['medium']))
+						{
+							$medium = $this->sanitize($content['attribs']['']['medium'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['samplingrate']))
+						{
+							$samplingrate = $this->sanitize($content['attribs']['']['samplingrate'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['type']))
+						{
+							$type = $this->sanitize($content['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['width']))
+						{
+							$width = $this->sanitize($content['attribs']['']['width'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['url']))
+						{
+							$url = $this->sanitize($content['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+						}
+						// Checking the other optional media: elements. Priority: media:content, media:group, item, channel
+
+						// CAPTIONS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text']))
+						{
+							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text'] as $caption)
+							{
+								$caption_type = null;
+								$caption_lang = null;
+								$caption_startTime = null;
+								$caption_endTime = null;
+								$caption_text = null;
+								if (isset($caption['attribs']['']['type']))
+								{
+									$caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($caption['attribs']['']['lang']))
+								{
+									$caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($caption['attribs']['']['start']))
+								{
+									$caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($caption['attribs']['']['end']))
+								{
+									$caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($caption['data']))
+								{
+									$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$captions[] = $this->registry->create('Caption', array($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text));
+							}
+							if (is_array($captions))
+							{
+								$captions = array_values(array_unique($captions));
+							}
+						}
+						else
+						{
+							$captions = $captions_parent;
+						}
+
+						// CATEGORIES
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category']))
+						{
+							foreach ((array) $content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category'] as $category)
+							{
+								$term = null;
+								$scheme = null;
+								$label = null;
+								if (isset($category['data']))
+								{
+									$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($category['attribs']['']['scheme']))
+								{
+									$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								else
+								{
+									$scheme = 'http://search.yahoo.com/mrss/category_schema';
+								}
+								if (isset($category['attribs']['']['label']))
+								{
+									$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$categories[] = $this->registry->create('Category', array($term, $scheme, $label));
+							}
+						}
+						if (is_array($categories) && is_array($categories_parent))
+						{
+							$categories = array_values(array_unique(array_merge($categories, $categories_parent)));
+						}
+						elseif (is_array($categories))
+						{
+							$categories = array_values(array_unique($categories));
+						}
+						elseif (is_array($categories_parent))
+						{
+							$categories = array_values(array_unique($categories_parent));
+						}
+						else
+						{
+							$categories = null;
+						}
+
+						// COPYRIGHTS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
+						{
+							$copyright_url = null;
+							$copyright_label = null;
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url']))
+							{
+								$copyright_url = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data']))
+							{
+								$copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							$copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
+						}
+						else
+						{
+							$copyrights = $copyrights_parent;
+						}
+
+						// CREDITS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit']))
+						{
+							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit'] as $credit)
+							{
+								$credit_role = null;
+								$credit_scheme = null;
+								$credit_name = null;
+								if (isset($credit['attribs']['']['role']))
+								{
+									$credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($credit['attribs']['']['scheme']))
+								{
+									$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								else
+								{
+									$credit_scheme = 'urn:ebu';
+								}
+								if (isset($credit['data']))
+								{
+									$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$credits[] = $this->registry->create('Credit', array($credit_role, $credit_scheme, $credit_name));
+							}
+							if (is_array($credits))
+							{
+								$credits = array_values(array_unique($credits));
+							}
+						}
+						else
+						{
+							$credits = $credits_parent;
+						}
+
+						// DESCRIPTION
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
+						{
+							$description = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						else
+						{
+							$description = $description_parent;
+						}
+
+						// HASHES
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash']))
+						{
+							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash'] as $hash)
+							{
+								$value = null;
+								$algo = null;
+								if (isset($hash['data']))
+								{
+									$value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($hash['attribs']['']['algo']))
+								{
+									$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								else
+								{
+									$algo = 'md5';
+								}
+								$hashes[] = $algo.':'.$value;
+							}
+							if (is_array($hashes))
+							{
+								$hashes = array_values(array_unique($hashes));
+							}
+						}
+						else
+						{
+							$hashes = $hashes_parent;
+						}
+
+						// KEYWORDS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords']))
+						{
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data']))
+							{
+								$temp = explode(',', $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+								foreach ($temp as $word)
+								{
+									$keywords[] = trim($word);
+								}
+								unset($temp);
+							}
+							if (is_array($keywords))
+							{
+								$keywords = array_values(array_unique($keywords));
+							}
+						}
+						else
+						{
+							$keywords = $keywords_parent;
+						}
+
+						// PLAYER
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
+						{
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'])) {
+								$player = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+							}
+						}
+						else
+						{
+							$player = $player_parent;
+						}
+
+						// RATINGS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating']))
+						{
+							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating'] as $rating)
+							{
+								$rating_scheme = null;
+								$rating_value = null;
+								if (isset($rating['attribs']['']['scheme']))
+								{
+									$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								else
+								{
+									$rating_scheme = 'urn:simple';
+								}
+								if (isset($rating['data']))
+								{
+									$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$ratings[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
+							}
+							if (is_array($ratings))
+							{
+								$ratings = array_values(array_unique($ratings));
+							}
+						}
+						else
+						{
+							$ratings = $ratings_parent;
+						}
+
+						// RESTRICTIONS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction']))
+						{
+							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction'] as $restriction)
+							{
+								$restriction_relationship = null;
+								$restriction_type = null;
+								$restriction_value = null;
+								if (isset($restriction['attribs']['']['relationship']))
+								{
+									$restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($restriction['attribs']['']['type']))
+								{
+									$restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($restriction['data']))
+								{
+									$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$restrictions[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
+							}
+							if (is_array($restrictions))
+							{
+								$restrictions = array_values(array_unique($restrictions));
+							}
+						}
+						else
+						{
+							$restrictions = $restrictions_parent;
+						}
+
+						// THUMBNAILS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail']))
+						{
+							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail)
+							{
+								if (isset($thumbnail['attribs']['']['url'])) {
+									$thumbnails[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+								}
+							}
+							if (is_array($thumbnails))
+							{
+								$thumbnails = array_values(array_unique($thumbnails));
+							}
+						}
+						else
+						{
+							$thumbnails = $thumbnails_parent;
+						}
+
+						// TITLES
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
+						{
+							$title = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						else
+						{
+							$title = $title_parent;
+						}
+
+						$this->data['enclosures'][] = $this->registry->create('Enclosure', array($url, $type, $length, null, $bitrate, $captions, $categories, $channels, $copyrights, $credits, $description, $duration, $expression, $framerate, $hashes, $height, $keywords, $lang, $medium, $player, $ratings, $restrictions, $samplingrate, $thumbnails, $title, $width));
+					}
+				}
+			}
+
+			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link') as $link)
+			{
+				if (isset($link['attribs']['']['href']) && !empty($link['attribs']['']['rel']) && $link['attribs']['']['rel'] === 'enclosure')
+				{
+					// Attributes
+					$bitrate = null;
+					$channels = null;
+					$duration = null;
+					$expression = null;
+					$framerate = null;
+					$height = null;
+					$javascript = null;
+					$lang = null;
+					$length = null;
+					$medium = null;
+					$samplingrate = null;
+					$type = null;
+					$url = null;
+					$width = null;
+
+					$url = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
+					if (isset($link['attribs']['']['type']))
+					{
+						$type = $this->sanitize($link['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($link['attribs']['']['length']))
+					{
+						$length = ceil($link['attribs']['']['length']);
+					}
+
+					// Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
+					$this->data['enclosures'][] = $this->registry->create('Enclosure', array($url, $type, $length, null, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width));
+				}
+			}
+
+			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'link') as $link)
+			{
+				if (isset($link['attribs']['']['href']) && !empty($link['attribs']['']['rel']) && $link['attribs']['']['rel'] === 'enclosure')
+				{
+					// Attributes
+					$bitrate = null;
+					$channels = null;
+					$duration = null;
+					$expression = null;
+					$framerate = null;
+					$height = null;
+					$javascript = null;
+					$lang = null;
+					$length = null;
+					$medium = null;
+					$samplingrate = null;
+					$type = null;
+					$url = null;
+					$width = null;
+
+					$url = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
+					if (isset($link['attribs']['']['type']))
+					{
+						$type = $this->sanitize($link['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($link['attribs']['']['length']))
+					{
+						$length = ceil($link['attribs']['']['length']);
+					}
+
+					// Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
+					$this->data['enclosures'][] = $this->registry->create('Enclosure', array($url, $type, $length, null, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width));
+				}
+			}
+
+			if ($enclosure = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'enclosure'))
+			{
+				if (isset($enclosure[0]['attribs']['']['url']))
+				{
+					// Attributes
+					$bitrate = null;
+					$channels = null;
+					$duration = null;
+					$expression = null;
+					$framerate = null;
+					$height = null;
+					$javascript = null;
+					$lang = null;
+					$length = null;
+					$medium = null;
+					$samplingrate = null;
+					$type = null;
+					$url = null;
+					$width = null;
+
+					$url = $this->sanitize($enclosure[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($enclosure[0]));
+					if (isset($enclosure[0]['attribs']['']['type']))
+					{
+						$type = $this->sanitize($enclosure[0]['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($enclosure[0]['attribs']['']['length']))
+					{
+						$length = ceil($enclosure[0]['attribs']['']['length']);
+					}
+
+					// Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
+					$this->data['enclosures'][] = $this->registry->create('Enclosure', array($url, $type, $length, null, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width));
+				}
+			}
+
+			if (sizeof($this->data['enclosures']) === 0 && ($url || $type || $length || $bitrate || $captions_parent || $categories_parent || $channels || $copyrights_parent || $credits_parent || $description_parent || $duration_parent || $expression || $framerate || $hashes_parent || $height || $keywords_parent || $lang || $medium || $player_parent || $ratings_parent || $restrictions_parent || $samplingrate || $thumbnails_parent || $title_parent || $width))
+			{
+				// Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
+				$this->data['enclosures'][] = $this->registry->create('Enclosure', array($url, $type, $length, null, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width));
+			}
+
+			$this->data['enclosures'] = array_values(array_unique($this->data['enclosures']));
+		}
+		if (!empty($this->data['enclosures']))
+		{
+			return $this->data['enclosures'];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the latitude coordinates for the item
+	 *
+	 * Compatible with the W3C WGS84 Basic Geo and GeoRSS specifications
+	 *
+	 * Uses `<geo:lat>` or `<georss:point>`
+	 *
+	 * @since 1.0
+	 * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
+	 * @link http://www.georss.org/ GeoRSS
+	 * @return string|null
+	 */
+	public function get_latitude()
+	{
+		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
+		{
+			return (float) $return[0]['data'];
+		}
+		elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		{
+			return (float) $match[1];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the longitude coordinates for the item
+	 *
+	 * Compatible with the W3C WGS84 Basic Geo and GeoRSS specifications
+	 *
+	 * Uses `<geo:long>`, `<geo:lon>` or `<georss:point>`
+	 *
+	 * @since 1.0
+	 * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
+	 * @link http://www.georss.org/ GeoRSS
+	 * @return string|null
+	 */
+	public function get_longitude()
+	{
+		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
+		{
+			return (float) $return[0]['data'];
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
+		{
+			return (float) $return[0]['data'];
+		}
+		elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		{
+			return (float) $match[2];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the `<atom:source>` for the item
+	 *
+	 * @since 1.1
+	 * @return SimplePie_Source|null
+	 */
+	public function get_source()
+	{
+		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'source'))
+		{
+			return $this->registry->create('Source', array($this, $return[0]));
+		}
+		else
+		{
+			return null;
+		}
+	}
+}
+
diff --git a/lib/vendor/simplepie/SimplePie/Locator.php b/lib/vendor/simplepie/SimplePie/Locator.php
new file mode 100644
index 000000000..bc314c2cd
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Locator.php
@@ -0,0 +1,429 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Used for feed auto-discovery
+ *
+ *
+ * This class can be overloaded with {@see SimplePie::set_locator_class()}
+ *
+ * @package SimplePie
+ */
+class SimplePie_Locator
+{
+	var $useragent;
+	var $timeout;
+	var $file;
+	var $local = array();
+	var $elsewhere = array();
+	var $cached_entities = array();
+	var $http_base;
+	var $base;
+	var $base_location = 0;
+	var $checked_feeds = 0;
+	var $max_checked_feeds = 10;
+	protected $registry;
+
+	public function __construct(SimplePie_File $file, $timeout = 10, $useragent = null, $max_checked_feeds = 10)
+	{
+		$this->file = $file;
+		$this->useragent = $useragent;
+		$this->timeout = $timeout;
+		$this->max_checked_feeds = $max_checked_feeds;
+
+		if (class_exists('DOMDocument'))
+		{
+			$this->dom = new DOMDocument();
+
+			set_error_handler(array('SimplePie_Misc', 'silence_errors'));
+			$this->dom->loadHTML($this->file->body);
+			restore_error_handler();
+		}
+		else
+		{
+			$this->dom = null;
+		}
+	}
+
+	public function set_registry(SimplePie_Registry $registry)
+	{
+		$this->registry = $registry;
+	}
+
+	public function find($type = SIMPLEPIE_LOCATOR_ALL, &$working)
+	{
+		if ($this->is_feed($this->file))
+		{
+			return $this->file;
+		}
+
+		if ($this->file->method & SIMPLEPIE_FILE_SOURCE_REMOTE)
+		{
+			$sniffer = $this->registry->create('Content_Type_Sniffer', array($this->file));
+			if ($sniffer->get_type() !== 'text/html')
+			{
+				return null;
+			}
+		}
+
+		if ($type & ~SIMPLEPIE_LOCATOR_NONE)
+		{
+			$this->get_base();
+		}
+
+		if ($type & SIMPLEPIE_LOCATOR_AUTODISCOVERY && $working = $this->autodiscovery())
+		{
+			return $working[0];
+		}
+
+		if ($type & (SIMPLEPIE_LOCATOR_LOCAL_EXTENSION | SIMPLEPIE_LOCATOR_LOCAL_BODY | SIMPLEPIE_LOCATOR_REMOTE_EXTENSION | SIMPLEPIE_LOCATOR_REMOTE_BODY) && $this->get_links())
+		{
+			if ($type & SIMPLEPIE_LOCATOR_LOCAL_EXTENSION && $working = $this->extension($this->local))
+			{
+				return $working[0];
+			}
+
+			if ($type & SIMPLEPIE_LOCATOR_LOCAL_BODY && $working = $this->body($this->local))
+			{
+				return $working[0];
+			}
+
+			if ($type & SIMPLEPIE_LOCATOR_REMOTE_EXTENSION && $working = $this->extension($this->elsewhere))
+			{
+				return $working[0];
+			}
+
+			if ($type & SIMPLEPIE_LOCATOR_REMOTE_BODY && $working = $this->body($this->elsewhere))
+			{
+				return $working[0];
+			}
+		}
+		return null;
+	}
+
+	public function is_feed($file, $check_html = false)
+	{
+		if ($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE)
+		{
+			$sniffer = $this->registry->create('Content_Type_Sniffer', array($file));
+			$sniffed = $sniffer->get_type();
+			$mime_types = array('application/rss+xml', 'application/rdf+xml',
+			                    'text/rdf', 'application/atom+xml', 'text/xml',
+			                    'application/xml', 'application/x-rss+xml');
+			if ($check_html)
+			{
+				$mime_types[] = 'text/html';
+			}
+			if (in_array($sniffed, $mime_types))
+			{
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}
+		elseif ($file->method & SIMPLEPIE_FILE_SOURCE_LOCAL)
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	public function get_base()
+	{
+		if ($this->dom === null)
+		{
+			throw new SimplePie_Exception('DOMDocument not found, unable to use locator');
+		}
+		$this->http_base = $this->file->url;
+		$this->base = $this->http_base;
+		$elements = $this->dom->getElementsByTagName('base');
+		foreach ($elements as $element)
+		{
+			if ($element->hasAttribute('href'))
+			{
+				$base = $this->registry->call('Misc', 'absolutize_url', array(trim($element->getAttribute('href')), $this->http_base));
+				if ($base === false)
+				{
+					continue;
+				}
+				$this->base = $base;
+				$this->base_location = method_exists($element, 'getLineNo') ? $element->getLineNo() : 0;
+				break;
+			}
+		}
+	}
+
+	public function autodiscovery()
+	{
+		$done = array();
+		$feeds = array();
+		$feeds = array_merge($feeds, $this->search_elements_by_tag('link', $done, $feeds));
+		$feeds = array_merge($feeds, $this->search_elements_by_tag('a', $done, $feeds));
+		$feeds = array_merge($feeds, $this->search_elements_by_tag('area', $done, $feeds));
+
+		if (!empty($feeds))
+		{
+			return array_values($feeds);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	protected function search_elements_by_tag($name, &$done, $feeds)
+	{
+		if ($this->dom === null)
+		{
+			throw new SimplePie_Exception('DOMDocument not found, unable to use locator');
+		}
+
+		$links = $this->dom->getElementsByTagName($name);
+		foreach ($links as $link)
+		{
+			if ($this->checked_feeds === $this->max_checked_feeds)
+			{
+				break;
+			}
+			if ($link->hasAttribute('href') && $link->hasAttribute('rel'))
+			{
+				$rel = array_unique($this->registry->call('Misc', 'space_separated_tokens', array(strtolower($link->getAttribute('rel')))));
+				$line = method_exists($link, 'getLineNo') ? $link->getLineNo() : 1;
+
+				if ($this->base_location < $line)
+				{
+					$href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->base));
+				}
+				else
+				{
+					$href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->http_base));
+				}
+				if ($href === false)
+				{
+					continue;
+				}
+
+				if (!in_array($href, $done) && in_array('feed', $rel) || (in_array('alternate', $rel) && !in_array('stylesheet', $rel) && $link->hasAttribute('type') && in_array(strtolower($this->registry->call('Misc', 'parse_mime', array($link->getAttribute('type')))), array('text/html', 'application/rss+xml', 'application/atom+xml'))) && !isset($feeds[$href]))
+				{
+					$this->checked_feeds++;
+					$headers = array(
+						'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
+					);
+					$feed = $this->registry->create('File', array($href, $this->timeout, 5, $headers, $this->useragent));
+					if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed, true))
+					{
+						$feeds[$href] = $feed;
+					}
+				}
+				$done[] = $href;
+			}
+		}
+
+		return $feeds;
+	}
+
+	public function get_links()
+	{
+		if ($this->dom === null)
+		{
+			throw new SimplePie_Exception('DOMDocument not found, unable to use locator');
+		}
+
+		$links = $this->dom->getElementsByTagName('a');
+		foreach ($links as $link)
+		{
+			if ($link->hasAttribute('href'))
+			{
+				$href = trim($link->getAttribute('href'));
+				$parsed = $this->registry->call('Misc', 'parse_url', array($href));
+				if ($parsed['scheme'] === '' || preg_match('/^(https?|feed)?$/i', $parsed['scheme']))
+				{
+					if (method_exists($link, 'getLineNo') && $this->base_location < $link->getLineNo())
+					{
+						$href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->base));
+					}
+					else
+					{
+						$href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->http_base));
+					}
+					if ($href === false)
+					{
+						continue;
+					}
+
+					$current = $this->registry->call('Misc', 'parse_url', array($this->file->url));
+
+					if ($parsed['authority'] === '' || $parsed['authority'] === $current['authority'])
+					{
+						$this->local[] = $href;
+					}
+					else
+					{
+						$this->elsewhere[] = $href;
+					}
+				}
+			}
+		}
+		$this->local = array_unique($this->local);
+		$this->elsewhere = array_unique($this->elsewhere);
+		if (!empty($this->local) || !empty($this->elsewhere))
+		{
+			return true;
+		}
+		return null;
+	}
+
+	public function get_rel_link($rel)
+	{
+		if ($this->dom === null)
+		{
+			throw new SimplePie_Exception('DOMDocument not found, unable to use '.
+			                              'locator');
+		}
+		if (!class_exists('DOMXpath'))
+		{
+			throw new SimplePie_Exception('DOMXpath not found, unable to use '.
+			                              'get_rel_link');
+		}
+
+		$xpath = new DOMXpath($this->dom);
+		$query = '//a[@rel and @href] | //link[@rel and @href]';
+		foreach ($xpath->query($query) as $link)
+		{
+			$href = trim($link->getAttribute('href'));
+			$parsed = $this->registry->call('Misc', 'parse_url', array($href));
+			if ($parsed['scheme'] === '' ||
+			    preg_match('/^https?$/i', $parsed['scheme']))
+			{
+				if (method_exists($link, 'getLineNo') &&
+				    $this->base_location < $link->getLineNo())
+				{
+					$href =
+						$this->registry->call('Misc', 'absolutize_url',
+						                      array(trim($link->getAttribute('href')),
+						                            $this->base));
+				}
+				else
+				{
+					$href =
+						$this->registry->call('Misc', 'absolutize_url',
+						                      array(trim($link->getAttribute('href')),
+						                            $this->http_base));
+				}
+				if ($href === false)
+				{
+					return null;
+				}
+				$rel_values = explode(' ', strtolower($link->getAttribute('rel')));
+				if (in_array($rel, $rel_values))
+				{
+					return $href;
+				}
+			}
+		}
+		return null;
+	}
+
+	public function extension(&$array)
+	{
+		foreach ($array as $key => $value)
+		{
+			if ($this->checked_feeds === $this->max_checked_feeds)
+			{
+				break;
+			}
+			if (in_array(strtolower(strrchr($value, '.')), array('.rss', '.rdf', '.atom', '.xml')))
+			{
+				$this->checked_feeds++;
+
+				$headers = array(
+					'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
+				);
+				$feed = $this->registry->create('File', array($value, $this->timeout, 5, $headers, $this->useragent));
+				if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed))
+				{
+					return array($feed);
+				}
+				else
+				{
+					unset($array[$key]);
+				}
+			}
+		}
+		return null;
+	}
+
+	public function body(&$array)
+	{
+		foreach ($array as $key => $value)
+		{
+			if ($this->checked_feeds === $this->max_checked_feeds)
+			{
+				break;
+			}
+			if (preg_match('/(rss|rdf|atom|xml)/i', $value))
+			{
+				$this->checked_feeds++;
+				$headers = array(
+					'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1',
+				);
+				$feed = $this->registry->create('File', array($value, $this->timeout, 5, null, $this->useragent));
+				if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed))
+				{
+					return array($feed);
+				}
+				else
+				{
+					unset($array[$key]);
+				}
+			}
+		}
+		return null;
+	}
+}
+
diff --git a/lib/vendor/simplepie/SimplePie/Misc.php b/lib/vendor/simplepie/SimplePie/Misc.php
new file mode 100644
index 000000000..2e3107eb4
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Misc.php
@@ -0,0 +1,2279 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Miscellanous utilities
+ *
+ * @package SimplePie
+ */
+class SimplePie_Misc
+{
+	public static function time_hms($seconds)
+	{
+		$time = '';
+
+		$hours = floor($seconds / 3600);
+		$remainder = $seconds % 3600;
+		if ($hours > 0)
+		{
+			$time .= $hours.':';
+		}
+
+		$minutes = floor($remainder / 60);
+		$seconds = $remainder % 60;
+		if ($minutes < 10 && $hours > 0)
+		{
+			$minutes = '0' . $minutes;
+		}
+		if ($seconds < 10)
+		{
+			$seconds = '0' . $seconds;
+		}
+
+		$time .= $minutes.':';
+		$time .= $seconds;
+
+		return $time;
+	}
+
+	public static function absolutize_url($relative, $base)
+	{
+		$iri = SimplePie_IRI::absolutize(new SimplePie_IRI($base), $relative);
+		if ($iri === false)
+		{
+			return false;
+		}
+		return $iri->get_uri();
+	}
+
+	/**
+	 * Get a HTML/XML element from a HTML string
+	 *
+	 * @deprecated Use DOMDocument instead (parsing HTML with regex is bad!)
+	 * @param string $realname Element name (including namespace prefix if applicable)
+	 * @param string $string HTML document
+	 * @return array
+	 */
+	public static function get_element($realname, $string)
+	{
+		$return = array();
+		$name = preg_quote($realname, '/');
+		if (preg_match_all("/<($name)" . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . "(>(.*)<\/$name>|(\/)?>)/siU", $string, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE))
+		{
+			for ($i = 0, $total_matches = count($matches); $i < $total_matches; $i++)
+			{
+				$return[$i]['tag'] = $realname;
+				$return[$i]['full'] = $matches[$i][0][0];
+				$return[$i]['offset'] = $matches[$i][0][1];
+				if (strlen($matches[$i][3][0]) <= 2)
+				{
+					$return[$i]['self_closing'] = true;
+				}
+				else
+				{
+					$return[$i]['self_closing'] = false;
+					$return[$i]['content'] = $matches[$i][4][0];
+				}
+				$return[$i]['attribs'] = array();
+				if (isset($matches[$i][2][0]) && preg_match_all('/[\x09\x0A\x0B\x0C\x0D\x20]+([^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3D\x3E]*)(?:[\x09\x0A\x0B\x0C\x0D\x20]*=[\x09\x0A\x0B\x0C\x0D\x20]*(?:"([^"]*)"|\'([^\']*)\'|([^\x09\x0A\x0B\x0C\x0D\x20\x22\x27\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x3E]*)?))?/', ' ' . $matches[$i][2][0] . ' ', $attribs, PREG_SET_ORDER))
+				{
+					for ($j = 0, $total_attribs = count($attribs); $j < $total_attribs; $j++)
+					{
+						if (count($attribs[$j]) === 2)
+						{
+							$attribs[$j][2] = $attribs[$j][1];
+						}
+						$return[$i]['attribs'][strtolower($attribs[$j][1])]['data'] = SimplePie_Misc::entities_decode(end($attribs[$j]));
+					}
+				}
+			}
+		}
+		return $return;
+	}
+
+	public static function element_implode($element)
+	{
+		$full = "<$element[tag]";
+		foreach ($element['attribs'] as $key => $value)
+		{
+			$key = strtolower($key);
+			$full .= " $key=\"" . htmlspecialchars($value['data'], ENT_COMPAT, 'UTF-8') . '"';
+		}
+		if ($element['self_closing'])
+		{
+			$full .= ' />';
+		}
+		else
+		{
+			$full .= ">$element[content]</$element[tag]>";
+		}
+		return $full;
+	}
+
+	public static function error($message, $level, $file, $line)
+	{
+		if ((ini_get('error_reporting') & $level) > 0)
+		{
+			switch ($level)
+			{
+				case E_USER_ERROR:
+					$note = 'PHP Error';
+					break;
+				case E_USER_WARNING:
+					$note = 'PHP Warning';
+					break;
+				case E_USER_NOTICE:
+					$note = 'PHP Notice';
+					break;
+				default:
+					$note = 'Unknown Error';
+					break;
+			}
+
+			$log_error = true;
+			if (!function_exists('error_log'))
+			{
+				$log_error = false;
+			}
+
+			$log_file = @ini_get('error_log');
+			if (!empty($log_file) && ('syslog' !== $log_file) && !@is_writable($log_file))
+			{
+				$log_error = false;
+			}
+
+			if ($log_error)
+			{
+				@error_log("$note: $message in $file on line $line", 0);
+			}
+		}
+
+		return $message;
+	}
+
+	public static function fix_protocol($url, $http = 1)
+	{
+		$url = SimplePie_Misc::normalize_url($url);
+		$parsed = SimplePie_Misc::parse_url($url);
+		if ($parsed['scheme'] !== '' && $parsed['scheme'] !== 'http' && $parsed['scheme'] !== 'https')
+		{
+			return SimplePie_Misc::fix_protocol(SimplePie_Misc::compress_parse_url('http', $parsed['authority'], $parsed['path'], $parsed['query'], $parsed['fragment']), $http);
+		}
+
+		if ($parsed['scheme'] === '' && $parsed['authority'] === '' && !file_exists($url))
+		{
+			return SimplePie_Misc::fix_protocol(SimplePie_Misc::compress_parse_url('http', $parsed['path'], '', $parsed['query'], $parsed['fragment']), $http);
+		}
+
+		if ($http === 2 && $parsed['scheme'] !== '')
+		{
+			return "feed:$url";
+		}
+		elseif ($http === 3 && strtolower($parsed['scheme']) === 'http')
+		{
+			return substr_replace($url, 'podcast', 0, 4);
+		}
+		elseif ($http === 4 && strtolower($parsed['scheme']) === 'http')
+		{
+			return substr_replace($url, 'itpc', 0, 4);
+		}
+		else
+		{
+			return $url;
+		}
+	}
+
+	public static function array_merge_recursive($array1, $array2)
+	{
+		foreach ($array2 as $key => $value)
+		{
+			if (is_array($value))
+			{
+				$array1[$key] = SimplePie_Misc::array_merge_recursive($array1[$key], $value);
+			}
+			else
+			{
+				$array1[$key] = $value;
+			}            
+		}
+		
+		return $array1;
+	}
+
+	public static function parse_url($url)
+	{
+		$iri = new SimplePie_IRI($url);
+		return array(
+			'scheme' => (string) $iri->scheme,
+			'authority' => (string) $iri->authority,
+			'path' => (string) $iri->path,
+			'query' => (string) $iri->query,
+			'fragment' => (string) $iri->fragment
+		);
+	}
+
+	public static function compress_parse_url($scheme = '', $authority = '', $path = '', $query = '', $fragment = '')
+	{
+		$iri = new SimplePie_IRI('');
+		$iri->scheme = $scheme;
+		$iri->authority = $authority;
+		$iri->path = $path;
+		$iri->query = $query;
+		$iri->fragment = $fragment;
+		return $iri->get_uri();
+	}
+
+	public static function normalize_url($url)
+	{
+		$iri = new SimplePie_IRI($url);
+		return $iri->get_uri();
+	}
+
+	public static function percent_encoding_normalization($match)
+	{
+		$integer = hexdec($match[1]);
+		if ($integer >= 0x41 && $integer <= 0x5A || $integer >= 0x61 && $integer <= 0x7A || $integer >= 0x30 && $integer <= 0x39 || $integer === 0x2D || $integer === 0x2E || $integer === 0x5F || $integer === 0x7E)
+		{
+			return chr($integer);
+		}
+		else
+		{
+			return strtoupper($match[0]);
+		}
+	}
+
+	/**
+	 * Converts a Windows-1252 encoded string to a UTF-8 encoded string
+	 *
+	 * @static
+	 * @param string $string Windows-1252 encoded string
+	 * @return string UTF-8 encoded string
+	 */
+	public static function windows_1252_to_utf8($string)
+	{
+		static $convert_table = array("\x80" => "\xE2\x82\xAC", "\x81" => "\xEF\xBF\xBD", "\x82" => "\xE2\x80\x9A", "\x83" => "\xC6\x92", "\x84" => "\xE2\x80\x9E", "\x85" => "\xE2\x80\xA6", "\x86" => "\xE2\x80\xA0", "\x87" => "\xE2\x80\xA1", "\x88" => "\xCB\x86", "\x89" => "\xE2\x80\xB0", "\x8A" => "\xC5\xA0", "\x8B" => "\xE2\x80\xB9", "\x8C" => "\xC5\x92", "\x8D" => "\xEF\xBF\xBD", "\x8E" => "\xC5\xBD", "\x8F" => "\xEF\xBF\xBD", "\x90" => "\xEF\xBF\xBD", "\x91" => "\xE2\x80\x98", "\x92" => "\xE2\x80\x99", "\x93" => "\xE2\x80\x9C", "\x94" => "\xE2\x80\x9D", "\x95" => "\xE2\x80\xA2", "\x96" => "\xE2\x80\x93", "\x97" => "\xE2\x80\x94", "\x98" => "\xCB\x9C", "\x99" => "\xE2\x84\xA2", "\x9A" => "\xC5\xA1", "\x9B" => "\xE2\x80\xBA", "\x9C" => "\xC5\x93", "\x9D" => "\xEF\xBF\xBD", "\x9E" => "\xC5\xBE", "\x9F" => "\xC5\xB8", "\xA0" => "\xC2\xA0", "\xA1" => "\xC2\xA1", "\xA2" => "\xC2\xA2", "\xA3" => "\xC2\xA3", "\xA4" => "\xC2\xA4", "\xA5" => "\xC2\xA5", "\xA6" => "\xC2\xA6", "\xA7" => "\xC2\xA7", "\xA8" => "\xC2\xA8", "\xA9" => "\xC2\xA9", "\xAA" => "\xC2\xAA", "\xAB" => "\xC2\xAB", "\xAC" => "\xC2\xAC", "\xAD" => "\xC2\xAD", "\xAE" => "\xC2\xAE", "\xAF" => "\xC2\xAF", "\xB0" => "\xC2\xB0", "\xB1" => "\xC2\xB1", "\xB2" => "\xC2\xB2", "\xB3" => "\xC2\xB3", "\xB4" => "\xC2\xB4", "\xB5" => "\xC2\xB5", "\xB6" => "\xC2\xB6", "\xB7" => "\xC2\xB7", "\xB8" => "\xC2\xB8", "\xB9" => "\xC2\xB9", "\xBA" => "\xC2\xBA", "\xBB" => "\xC2\xBB", "\xBC" => "\xC2\xBC", "\xBD" => "\xC2\xBD", "\xBE" => "\xC2\xBE", "\xBF" => "\xC2\xBF", "\xC0" => "\xC3\x80", "\xC1" => "\xC3\x81", "\xC2" => "\xC3\x82", "\xC3" => "\xC3\x83", "\xC4" => "\xC3\x84", "\xC5" => "\xC3\x85", "\xC6" => "\xC3\x86", "\xC7" => "\xC3\x87", "\xC8" => "\xC3\x88", "\xC9" => "\xC3\x89", "\xCA" => "\xC3\x8A", "\xCB" => "\xC3\x8B", "\xCC" => "\xC3\x8C", "\xCD" => "\xC3\x8D", "\xCE" => "\xC3\x8E", "\xCF" => "\xC3\x8F", "\xD0" => "\xC3\x90", "\xD1" => "\xC3\x91", "\xD2" => "\xC3\x92", "\xD3" => "\xC3\x93", "\xD4" => "\xC3\x94", "\xD5" => "\xC3\x95", "\xD6" => "\xC3\x96", "\xD7" => "\xC3\x97", "\xD8" => "\xC3\x98", "\xD9" => "\xC3\x99", "\xDA" => "\xC3\x9A", "\xDB" => "\xC3\x9B", "\xDC" => "\xC3\x9C", "\xDD" => "\xC3\x9D", "\xDE" => "\xC3\x9E", "\xDF" => "\xC3\x9F", "\xE0" => "\xC3\xA0", "\xE1" => "\xC3\xA1", "\xE2" => "\xC3\xA2", "\xE3" => "\xC3\xA3", "\xE4" => "\xC3\xA4", "\xE5" => "\xC3\xA5", "\xE6" => "\xC3\xA6", "\xE7" => "\xC3\xA7", "\xE8" => "\xC3\xA8", "\xE9" => "\xC3\xA9", "\xEA" => "\xC3\xAA", "\xEB" => "\xC3\xAB", "\xEC" => "\xC3\xAC", "\xED" => "\xC3\xAD", "\xEE" => "\xC3\xAE", "\xEF" => "\xC3\xAF", "\xF0" => "\xC3\xB0", "\xF1" => "\xC3\xB1", "\xF2" => "\xC3\xB2", "\xF3" => "\xC3\xB3", "\xF4" => "\xC3\xB4", "\xF5" => "\xC3\xB5", "\xF6" => "\xC3\xB6", "\xF7" => "\xC3\xB7", "\xF8" => "\xC3\xB8", "\xF9" => "\xC3\xB9", "\xFA" => "\xC3\xBA", "\xFB" => "\xC3\xBB", "\xFC" => "\xC3\xBC", "\xFD" => "\xC3\xBD", "\xFE" => "\xC3\xBE", "\xFF" => "\xC3\xBF");
+
+		return strtr($string, $convert_table);
+	}
+
+	/**
+	 * Change a string from one encoding to another
+	 *
+	 * @param string $data Raw data in $input encoding
+	 * @param string $input Encoding of $data
+	 * @param string $output Encoding you want
+	 * @return string|boolean False if we can't convert it
+	 */
+	public static function change_encoding($data, $input, $output)
+	{
+		$input = SimplePie_Misc::encoding($input);
+		$output = SimplePie_Misc::encoding($output);
+
+		// We fail to fail on non US-ASCII bytes
+		if ($input === 'US-ASCII')
+		{
+			static $non_ascii_octects = '';
+			if (!$non_ascii_octects)
+			{
+				for ($i = 0x80; $i <= 0xFF; $i++)
+				{
+					$non_ascii_octects .= chr($i);
+				}
+			}
+			$data = substr($data, 0, strcspn($data, $non_ascii_octects));
+		}
+
+		// This is first, as behaviour of this is completely predictable
+		if ($input === 'windows-1252' && $output === 'UTF-8')
+		{
+			return SimplePie_Misc::windows_1252_to_utf8($data);
+		}
+		// This is second, as behaviour of this varies only with PHP version (the middle part of this expression checks the encoding is supported).
+		elseif (function_exists('mb_convert_encoding') && ($return = SimplePie_Misc::change_encoding_mbstring($data, $input, $output)))
+		{
+			return $return;
+ 		}
+		// This is third, as behaviour of this varies with OS userland and PHP version
+		elseif (function_exists('iconv') && ($return = SimplePie_Misc::change_encoding_iconv($data, $input, $output)))
+		{
+			return $return;
+		}
+		// This is last, as behaviour of this varies with OS userland and PHP version
+		elseif (class_exists('\UConverter') && ($return = SimplePie_Misc::change_encoding_uconverter($data, $input, $output)))
+		{
+			return $return;
+		}
+		// If we can't do anything, just fail
+		else
+		{
+			return false;
+		}
+	}
+
+	protected static function change_encoding_mbstring($data, $input, $output)
+	{
+		if ($input === 'windows-949')
+		{
+			$input = 'EUC-KR';
+		}
+		if ($output === 'windows-949')
+		{
+			$output = 'EUC-KR';
+		}
+		if ($input === 'Windows-31J')
+		{
+			$input = 'SJIS';
+		}
+		if ($output === 'Windows-31J')
+		{
+			$output = 'SJIS';
+		}
+
+		// Check that the encoding is supported
+		if (@mb_convert_encoding("\x80", 'UTF-16BE', $input) === "\x00\x80")
+		{
+			return false;
+		}
+		if (!in_array($input, mb_list_encodings()))
+		{
+			return false;
+		}
+
+		// Let's do some conversion
+		if ($return = @mb_convert_encoding($data, $output, $input))
+		{
+			return $return;
+		}
+
+		return false;
+	}
+
+	protected static function change_encoding_iconv($data, $input, $output)
+	{
+		return @iconv($input, $output, $data);
+	}
+
+	/**
+	 * @param string $data
+	 * @param string $input
+	 * @param string $output
+	 * @return string|false
+	 */
+	protected static function change_encoding_uconverter($data, $input, $output)
+	{
+		return @\UConverter::transcode($data, $output, $input);
+	}
+
+	/**
+	 * Normalize an encoding name
+	 *
+	 * This is automatically generated by create.php
+	 *
+	 * To generate it, run `php create.php` on the command line, and copy the
+	 * output to replace this function.
+	 *
+	 * @param string $charset Character set to standardise
+	 * @return string Standardised name
+	 */
+	public static function encoding($charset)
+	{
+		// Normalization from UTS #22
+		switch (strtolower(preg_replace('/(?:[^a-zA-Z0-9]+|([^0-9])0+)/', '\1', $charset)))
+		{
+			case 'adobestandardencoding':
+			case 'csadobestandardencoding':
+				return 'Adobe-Standard-Encoding';
+
+			case 'adobesymbolencoding':
+			case 'cshppsmath':
+				return 'Adobe-Symbol-Encoding';
+
+			case 'ami1251':
+			case 'amiga1251':
+				return 'Amiga-1251';
+
+			case 'ansix31101983':
+			case 'csat5001983':
+			case 'csiso99naplps':
+			case 'isoir99':
+			case 'naplps':
+				return 'ANSI_X3.110-1983';
+
+			case 'arabic7':
+			case 'asmo449':
+			case 'csiso89asmo449':
+			case 'iso9036':
+			case 'isoir89':
+				return 'ASMO_449';
+
+			case 'big5':
+			case 'csbig5':
+				return 'Big5';
+
+			case 'big5hkscs':
+				return 'Big5-HKSCS';
+
+			case 'bocu1':
+			case 'csbocu1':
+				return 'BOCU-1';
+
+			case 'brf':
+			case 'csbrf':
+				return 'BRF';
+
+			case 'bs4730':
+			case 'csiso4unitedkingdom':
+			case 'gb':
+			case 'iso646gb':
+			case 'isoir4':
+			case 'uk':
+				return 'BS_4730';
+
+			case 'bsviewdata':
+			case 'csiso47bsviewdata':
+			case 'isoir47':
+				return 'BS_viewdata';
+
+			case 'cesu8':
+			case 'cscesu8':
+				return 'CESU-8';
+
+			case 'ca':
+			case 'csa71':
+			case 'csaz243419851':
+			case 'csiso121canadian1':
+			case 'iso646ca':
+			case 'isoir121':
+				return 'CSA_Z243.4-1985-1';
+
+			case 'csa72':
+			case 'csaz243419852':
+			case 'csiso122canadian2':
+			case 'iso646ca2':
+			case 'isoir122':
+				return 'CSA_Z243.4-1985-2';
+
+			case 'csaz24341985gr':
+			case 'csiso123csaz24341985gr':
+			case 'isoir123':
+				return 'CSA_Z243.4-1985-gr';
+
+			case 'csiso139csn369103':
+			case 'csn369103':
+			case 'isoir139':
+				return 'CSN_369103';
+
+			case 'csdecmcs':
+			case 'dec':
+			case 'decmcs':
+				return 'DEC-MCS';
+
+			case 'csiso21german':
+			case 'de':
+			case 'din66003':
+			case 'iso646de':
+			case 'isoir21':
+				return 'DIN_66003';
+
+			case 'csdkus':
+			case 'dkus':
+				return 'dk-us';
+
+			case 'csiso646danish':
+			case 'dk':
+			case 'ds2089':
+			case 'iso646dk':
+				return 'DS_2089';
+
+			case 'csibmebcdicatde':
+			case 'ebcdicatde':
+				return 'EBCDIC-AT-DE';
+
+			case 'csebcdicatdea':
+			case 'ebcdicatdea':
+				return 'EBCDIC-AT-DE-A';
+
+			case 'csebcdiccafr':
+			case 'ebcdiccafr':
+				return 'EBCDIC-CA-FR';
+
+			case 'csebcdicdkno':
+			case 'ebcdicdkno':
+				return 'EBCDIC-DK-NO';
+
+			case 'csebcdicdknoa':
+			case 'ebcdicdknoa':
+				return 'EBCDIC-DK-NO-A';
+
+			case 'csebcdices':
+			case 'ebcdices':
+				return 'EBCDIC-ES';
+
+			case 'csebcdicesa':
+			case 'ebcdicesa':
+				return 'EBCDIC-ES-A';
+
+			case 'csebcdicess':
+			case 'ebcdicess':
+				return 'EBCDIC-ES-S';
+
+			case 'csebcdicfise':
+			case 'ebcdicfise':
+				return 'EBCDIC-FI-SE';
+
+			case 'csebcdicfisea':
+			case 'ebcdicfisea':
+				return 'EBCDIC-FI-SE-A';
+
+			case 'csebcdicfr':
+			case 'ebcdicfr':
+				return 'EBCDIC-FR';
+
+			case 'csebcdicit':
+			case 'ebcdicit':
+				return 'EBCDIC-IT';
+
+			case 'csebcdicpt':
+			case 'ebcdicpt':
+				return 'EBCDIC-PT';
+
+			case 'csebcdicuk':
+			case 'ebcdicuk':
+				return 'EBCDIC-UK';
+
+			case 'csebcdicus':
+			case 'ebcdicus':
+				return 'EBCDIC-US';
+
+			case 'csiso111ecmacyrillic':
+			case 'ecmacyrillic':
+			case 'isoir111':
+			case 'koi8e':
+				return 'ECMA-cyrillic';
+
+			case 'csiso17spanish':
+			case 'es':
+			case 'iso646es':
+			case 'isoir17':
+				return 'ES';
+
+			case 'csiso85spanish2':
+			case 'es2':
+			case 'iso646es2':
+			case 'isoir85':
+				return 'ES2';
+
+			case 'cseucpkdfmtjapanese':
+			case 'eucjp':
+			case 'extendedunixcodepackedformatforjapanese':
+				return 'EUC-JP';
+
+			case 'cseucfixwidjapanese':
+			case 'extendedunixcodefixedwidthforjapanese':
+				return 'Extended_UNIX_Code_Fixed_Width_for_Japanese';
+
+			case 'gb18030':
+				return 'GB18030';
+
+			case 'chinese':
+			case 'cp936':
+			case 'csgb2312':
+			case 'csiso58gb231280':
+			case 'gb2312':
+			case 'gb231280':
+			case 'gbk':
+			case 'isoir58':
+			case 'ms936':
+			case 'windows936':
+				return 'GBK';
+
+			case 'cn':
+			case 'csiso57gb1988':
+			case 'gb198880':
+			case 'iso646cn':
+			case 'isoir57':
+				return 'GB_1988-80';
+
+			case 'csiso153gost1976874':
+			case 'gost1976874':
+			case 'isoir153':
+			case 'stsev35888':
+				return 'GOST_19768-74';
+
+			case 'csiso150':
+			case 'csiso150greekccitt':
+			case 'greekccitt':
+			case 'isoir150':
+				return 'greek-ccitt';
+
+			case 'csiso88greek7':
+			case 'greek7':
+			case 'isoir88':
+				return 'greek7';
+
+			case 'csiso18greek7old':
+			case 'greek7old':
+			case 'isoir18':
+				return 'greek7-old';
+
+			case 'cshpdesktop':
+			case 'hpdesktop':
+				return 'HP-DeskTop';
+
+			case 'cshplegal':
+			case 'hplegal':
+				return 'HP-Legal';
+
+			case 'cshpmath8':
+			case 'hpmath8':
+				return 'HP-Math8';
+
+			case 'cshppifont':
+			case 'hppifont':
+				return 'HP-Pi-font';
+
+			case 'cshproman8':
+			case 'hproman8':
+			case 'r8':
+			case 'roman8':
+				return 'hp-roman8';
+
+			case 'hzgb2312':
+				return 'HZ-GB-2312';
+
+			case 'csibmsymbols':
+			case 'ibmsymbols':
+				return 'IBM-Symbols';
+
+			case 'csibmthai':
+			case 'ibmthai':
+				return 'IBM-Thai';
+
+			case 'cp37':
+			case 'csibm37':
+			case 'ebcdiccpca':
+			case 'ebcdiccpnl':
+			case 'ebcdiccpus':
+			case 'ebcdiccpwt':
+			case 'ibm37':
+				return 'IBM037';
+
+			case 'cp38':
+			case 'csibm38':
+			case 'ebcdicint':
+			case 'ibm38':
+				return 'IBM038';
+
+			case 'cp273':
+			case 'csibm273':
+			case 'ibm273':
+				return 'IBM273';
+
+			case 'cp274':
+			case 'csibm274':
+			case 'ebcdicbe':
+			case 'ibm274':
+				return 'IBM274';
+
+			case 'cp275':
+			case 'csibm275':
+			case 'ebcdicbr':
+			case 'ibm275':
+				return 'IBM275';
+
+			case 'csibm277':
+			case 'ebcdiccpdk':
+			case 'ebcdiccpno':
+			case 'ibm277':
+				return 'IBM277';
+
+			case 'cp278':
+			case 'csibm278':
+			case 'ebcdiccpfi':
+			case 'ebcdiccpse':
+			case 'ibm278':
+				return 'IBM278';
+
+			case 'cp280':
+			case 'csibm280':
+			case 'ebcdiccpit':
+			case 'ibm280':
+				return 'IBM280';
+
+			case 'cp281':
+			case 'csibm281':
+			case 'ebcdicjpe':
+			case 'ibm281':
+				return 'IBM281';
+
+			case 'cp284':
+			case 'csibm284':
+			case 'ebcdiccpes':
+			case 'ibm284':
+				return 'IBM284';
+
+			case 'cp285':
+			case 'csibm285':
+			case 'ebcdiccpgb':
+			case 'ibm285':
+				return 'IBM285';
+
+			case 'cp290':
+			case 'csibm290':
+			case 'ebcdicjpkana':
+			case 'ibm290':
+				return 'IBM290';
+
+			case 'cp297':
+			case 'csibm297':
+			case 'ebcdiccpfr':
+			case 'ibm297':
+				return 'IBM297';
+
+			case 'cp420':
+			case 'csibm420':
+			case 'ebcdiccpar1':
+			case 'ibm420':
+				return 'IBM420';
+
+			case 'cp423':
+			case 'csibm423':
+			case 'ebcdiccpgr':
+			case 'ibm423':
+				return 'IBM423';
+
+			case 'cp424':
+			case 'csibm424':
+			case 'ebcdiccphe':
+			case 'ibm424':
+				return 'IBM424';
+
+			case '437':
+			case 'cp437':
+			case 'cspc8codepage437':
+			case 'ibm437':
+				return 'IBM437';
+
+			case 'cp500':
+			case 'csibm500':
+			case 'ebcdiccpbe':
+			case 'ebcdiccpch':
+			case 'ibm500':
+				return 'IBM500';
+
+			case 'cp775':
+			case 'cspc775baltic':
+			case 'ibm775':
+				return 'IBM775';
+
+			case '850':
+			case 'cp850':
+			case 'cspc850multilingual':
+			case 'ibm850':
+				return 'IBM850';
+
+			case '851':
+			case 'cp851':
+			case 'csibm851':
+			case 'ibm851':
+				return 'IBM851';
+
+			case '852':
+			case 'cp852':
+			case 'cspcp852':
+			case 'ibm852':
+				return 'IBM852';
+
+			case '855':
+			case 'cp855':
+			case 'csibm855':
+			case 'ibm855':
+				return 'IBM855';
+
+			case '857':
+			case 'cp857':
+			case 'csibm857':
+			case 'ibm857':
+				return 'IBM857';
+
+			case 'ccsid858':
+			case 'cp858':
+			case 'ibm858':
+			case 'pcmultilingual850euro':
+				return 'IBM00858';
+
+			case '860':
+			case 'cp860':
+			case 'csibm860':
+			case 'ibm860':
+				return 'IBM860';
+
+			case '861':
+			case 'cp861':
+			case 'cpis':
+			case 'csibm861':
+			case 'ibm861':
+				return 'IBM861';
+
+			case '862':
+			case 'cp862':
+			case 'cspc862latinhebrew':
+			case 'ibm862':
+				return 'IBM862';
+
+			case '863':
+			case 'cp863':
+			case 'csibm863':
+			case 'ibm863':
+				return 'IBM863';
+
+			case 'cp864':
+			case 'csibm864':
+			case 'ibm864':
+				return 'IBM864';
+
+			case '865':
+			case 'cp865':
+			case 'csibm865':
+			case 'ibm865':
+				return 'IBM865';
+
+			case '866':
+			case 'cp866':
+			case 'csibm866':
+			case 'ibm866':
+				return 'IBM866';
+
+			case 'cp868':
+			case 'cpar':
+			case 'csibm868':
+			case 'ibm868':
+				return 'IBM868';
+
+			case '869':
+			case 'cp869':
+			case 'cpgr':
+			case 'csibm869':
+			case 'ibm869':
+				return 'IBM869';
+
+			case 'cp870':
+			case 'csibm870':
+			case 'ebcdiccproece':
+			case 'ebcdiccpyu':
+			case 'ibm870':
+				return 'IBM870';
+
+			case 'cp871':
+			case 'csibm871':
+			case 'ebcdiccpis':
+			case 'ibm871':
+				return 'IBM871';
+
+			case 'cp880':
+			case 'csibm880':
+			case 'ebcdiccyrillic':
+			case 'ibm880':
+				return 'IBM880';
+
+			case 'cp891':
+			case 'csibm891':
+			case 'ibm891':
+				return 'IBM891';
+
+			case 'cp903':
+			case 'csibm903':
+			case 'ibm903':
+				return 'IBM903';
+
+			case '904':
+			case 'cp904':
+			case 'csibbm904':
+			case 'ibm904':
+				return 'IBM904';
+
+			case 'cp905':
+			case 'csibm905':
+			case 'ebcdiccptr':
+			case 'ibm905':
+				return 'IBM905';
+
+			case 'cp918':
+			case 'csibm918':
+			case 'ebcdiccpar2':
+			case 'ibm918':
+				return 'IBM918';
+
+			case 'ccsid924':
+			case 'cp924':
+			case 'ebcdiclatin9euro':
+			case 'ibm924':
+				return 'IBM00924';
+
+			case 'cp1026':
+			case 'csibm1026':
+			case 'ibm1026':
+				return 'IBM1026';
+
+			case 'ibm1047':
+				return 'IBM1047';
+
+			case 'ccsid1140':
+			case 'cp1140':
+			case 'ebcdicus37euro':
+			case 'ibm1140':
+				return 'IBM01140';
+
+			case 'ccsid1141':
+			case 'cp1141':
+			case 'ebcdicde273euro':
+			case 'ibm1141':
+				return 'IBM01141';
+
+			case 'ccsid1142':
+			case 'cp1142':
+			case 'ebcdicdk277euro':
+			case 'ebcdicno277euro':
+			case 'ibm1142':
+				return 'IBM01142';
+
+			case 'ccsid1143':
+			case 'cp1143':
+			case 'ebcdicfi278euro':
+			case 'ebcdicse278euro':
+			case 'ibm1143':
+				return 'IBM01143';
+
+			case 'ccsid1144':
+			case 'cp1144':
+			case 'ebcdicit280euro':
+			case 'ibm1144':
+				return 'IBM01144';
+
+			case 'ccsid1145':
+			case 'cp1145':
+			case 'ebcdices284euro':
+			case 'ibm1145':
+				return 'IBM01145';
+
+			case 'ccsid1146':
+			case 'cp1146':
+			case 'ebcdicgb285euro':
+			case 'ibm1146':
+				return 'IBM01146';
+
+			case 'ccsid1147':
+			case 'cp1147':
+			case 'ebcdicfr297euro':
+			case 'ibm1147':
+				return 'IBM01147';
+
+			case 'ccsid1148':
+			case 'cp1148':
+			case 'ebcdicinternational500euro':
+			case 'ibm1148':
+				return 'IBM01148';
+
+			case 'ccsid1149':
+			case 'cp1149':
+			case 'ebcdicis871euro':
+			case 'ibm1149':
+				return 'IBM01149';
+
+			case 'csiso143iecp271':
+			case 'iecp271':
+			case 'isoir143':
+				return 'IEC_P27-1';
+
+			case 'csiso49inis':
+			case 'inis':
+			case 'isoir49':
+				return 'INIS';
+
+			case 'csiso50inis8':
+			case 'inis8':
+			case 'isoir50':
+				return 'INIS-8';
+
+			case 'csiso51iniscyrillic':
+			case 'iniscyrillic':
+			case 'isoir51':
+				return 'INIS-cyrillic';
+
+			case 'csinvariant':
+			case 'invariant':
+				return 'INVARIANT';
+
+			case 'iso2022cn':
+				return 'ISO-2022-CN';
+
+			case 'iso2022cnext':
+				return 'ISO-2022-CN-EXT';
+
+			case 'csiso2022jp':
+			case 'iso2022jp':
+				return 'ISO-2022-JP';
+
+			case 'csiso2022jp2':
+			case 'iso2022jp2':
+				return 'ISO-2022-JP-2';
+
+			case 'csiso2022kr':
+			case 'iso2022kr':
+				return 'ISO-2022-KR';
+
+			case 'cswindows30latin1':
+			case 'iso88591windows30latin1':
+				return 'ISO-8859-1-Windows-3.0-Latin-1';
+
+			case 'cswindows31latin1':
+			case 'iso88591windows31latin1':
+				return 'ISO-8859-1-Windows-3.1-Latin-1';
+
+			case 'csisolatin2':
+			case 'iso88592':
+			case 'iso885921987':
+			case 'isoir101':
+			case 'l2':
+			case 'latin2':
+				return 'ISO-8859-2';
+
+			case 'cswindows31latin2':
+			case 'iso88592windowslatin2':
+				return 'ISO-8859-2-Windows-Latin-2';
+
+			case 'csisolatin3':
+			case 'iso88593':
+			case 'iso885931988':
+			case 'isoir109':
+			case 'l3':
+			case 'latin3':
+				return 'ISO-8859-3';
+
+			case 'csisolatin4':
+			case 'iso88594':
+			case 'iso885941988':
+			case 'isoir110':
+			case 'l4':
+			case 'latin4':
+				return 'ISO-8859-4';
+
+			case 'csisolatincyrillic':
+			case 'cyrillic':
+			case 'iso88595':
+			case 'iso885951988':
+			case 'isoir144':
+				return 'ISO-8859-5';
+
+			case 'arabic':
+			case 'asmo708':
+			case 'csisolatinarabic':
+			case 'ecma114':
+			case 'iso88596':
+			case 'iso885961987':
+			case 'isoir127':
+				return 'ISO-8859-6';
+
+			case 'csiso88596e':
+			case 'iso88596e':
+				return 'ISO-8859-6-E';
+
+			case 'csiso88596i':
+			case 'iso88596i':
+				return 'ISO-8859-6-I';
+
+			case 'csisolatingreek':
+			case 'ecma118':
+			case 'elot928':
+			case 'greek':
+			case 'greek8':
+			case 'iso88597':
+			case 'iso885971987':
+			case 'isoir126':
+				return 'ISO-8859-7';
+
+			case 'csisolatinhebrew':
+			case 'hebrew':
+			case 'iso88598':
+			case 'iso885981988':
+			case 'isoir138':
+				return 'ISO-8859-8';
+
+			case 'csiso88598e':
+			case 'iso88598e':
+				return 'ISO-8859-8-E';
+
+			case 'csiso88598i':
+			case 'iso88598i':
+				return 'ISO-8859-8-I';
+
+			case 'cswindows31latin5':
+			case 'iso88599windowslatin5':
+				return 'ISO-8859-9-Windows-Latin-5';
+
+			case 'csisolatin6':
+			case 'iso885910':
+			case 'iso8859101992':
+			case 'isoir157':
+			case 'l6':
+			case 'latin6':
+				return 'ISO-8859-10';
+
+			case 'iso885913':
+				return 'ISO-8859-13';
+
+			case 'iso885914':
+			case 'iso8859141998':
+			case 'isoceltic':
+			case 'isoir199':
+			case 'l8':
+			case 'latin8':
+				return 'ISO-8859-14';
+
+			case 'iso885915':
+			case 'latin9':
+				return 'ISO-8859-15';
+
+			case 'iso885916':
+			case 'iso8859162001':
+			case 'isoir226':
+			case 'l10':
+			case 'latin10':
+				return 'ISO-8859-16';
+
+			case 'iso10646j1':
+				return 'ISO-10646-J-1';
+
+			case 'csunicode':
+			case 'iso10646ucs2':
+				return 'ISO-10646-UCS-2';
+
+			case 'csucs4':
+			case 'iso10646ucs4':
+				return 'ISO-10646-UCS-4';
+
+			case 'csunicodeascii':
+			case 'iso10646ucsbasic':
+				return 'ISO-10646-UCS-Basic';
+
+			case 'csunicodelatin1':
+			case 'iso10646':
+			case 'iso10646unicodelatin1':
+				return 'ISO-10646-Unicode-Latin1';
+
+			case 'csiso10646utf1':
+			case 'iso10646utf1':
+				return 'ISO-10646-UTF-1';
+
+			case 'csiso115481':
+			case 'iso115481':
+			case 'isotr115481':
+				return 'ISO-11548-1';
+
+			case 'csiso90':
+			case 'isoir90':
+				return 'iso-ir-90';
+
+			case 'csunicodeibm1261':
+			case 'isounicodeibm1261':
+				return 'ISO-Unicode-IBM-1261';
+
+			case 'csunicodeibm1264':
+			case 'isounicodeibm1264':
+				return 'ISO-Unicode-IBM-1264';
+
+			case 'csunicodeibm1265':
+			case 'isounicodeibm1265':
+				return 'ISO-Unicode-IBM-1265';
+
+			case 'csunicodeibm1268':
+			case 'isounicodeibm1268':
+				return 'ISO-Unicode-IBM-1268';
+
+			case 'csunicodeibm1276':
+			case 'isounicodeibm1276':
+				return 'ISO-Unicode-IBM-1276';
+
+			case 'csiso646basic1983':
+			case 'iso646basic1983':
+			case 'ref':
+				return 'ISO_646.basic:1983';
+
+			case 'csiso2intlrefversion':
+			case 'irv':
+			case 'iso646irv1983':
+			case 'isoir2':
+				return 'ISO_646.irv:1983';
+
+			case 'csiso2033':
+			case 'e13b':
+			case 'iso20331983':
+			case 'isoir98':
+				return 'ISO_2033-1983';
+
+			case 'csiso5427cyrillic':
+			case 'iso5427':
+			case 'isoir37':
+				return 'ISO_5427';
+
+			case 'iso5427cyrillic1981':
+			case 'iso54271981':
+			case 'isoir54':
+				return 'ISO_5427:1981';
+
+			case 'csiso5428greek':
+			case 'iso54281980':
+			case 'isoir55':
+				return 'ISO_5428:1980';
+
+			case 'csiso6937add':
+			case 'iso6937225':
+			case 'isoir152':
+				return 'ISO_6937-2-25';
+
+			case 'csisotextcomm':
+			case 'iso69372add':
+			case 'isoir142':
+				return 'ISO_6937-2-add';
+
+			case 'csiso8859supp':
+			case 'iso8859supp':
+			case 'isoir154':
+			case 'latin125':
+				return 'ISO_8859-supp';
+
+			case 'csiso10367box':
+			case 'iso10367box':
+			case 'isoir155':
+				return 'ISO_10367-box';
+
+			case 'csiso15italian':
+			case 'iso646it':
+			case 'isoir15':
+			case 'it':
+				return 'IT';
+
+			case 'csiso13jisc6220jp':
+			case 'isoir13':
+			case 'jisc62201969':
+			case 'jisc62201969jp':
+			case 'katakana':
+			case 'x2017':
+				return 'JIS_C6220-1969-jp';
+
+			case 'csiso14jisc6220ro':
+			case 'iso646jp':
+			case 'isoir14':
+			case 'jisc62201969ro':
+			case 'jp':
+				return 'JIS_C6220-1969-ro';
+
+			case 'csiso42jisc62261978':
+			case 'isoir42':
+			case 'jisc62261978':
+				return 'JIS_C6226-1978';
+
+			case 'csiso87jisx208':
+			case 'isoir87':
+			case 'jisc62261983':
+			case 'jisx2081983':
+			case 'x208':
+				return 'JIS_C6226-1983';
+
+			case 'csiso91jisc62291984a':
+			case 'isoir91':
+			case 'jisc62291984a':
+			case 'jpocra':
+				return 'JIS_C6229-1984-a';
+
+			case 'csiso92jisc62991984b':
+			case 'iso646jpocrb':
+			case 'isoir92':
+			case 'jisc62291984b':
+			case 'jpocrb':
+				return 'JIS_C6229-1984-b';
+
+			case 'csiso93jis62291984badd':
+			case 'isoir93':
+			case 'jisc62291984badd':
+			case 'jpocrbadd':
+				return 'JIS_C6229-1984-b-add';
+
+			case 'csiso94jis62291984hand':
+			case 'isoir94':
+			case 'jisc62291984hand':
+			case 'jpocrhand':
+				return 'JIS_C6229-1984-hand';
+
+			case 'csiso95jis62291984handadd':
+			case 'isoir95':
+			case 'jisc62291984handadd':
+			case 'jpocrhandadd':
+				return 'JIS_C6229-1984-hand-add';
+
+			case 'csiso96jisc62291984kana':
+			case 'isoir96':
+			case 'jisc62291984kana':
+				return 'JIS_C6229-1984-kana';
+
+			case 'csjisencoding':
+			case 'jisencoding':
+				return 'JIS_Encoding';
+
+			case 'cshalfwidthkatakana':
+			case 'jisx201':
+			case 'x201':
+				return 'JIS_X0201';
+
+			case 'csiso159jisx2121990':
+			case 'isoir159':
+			case 'jisx2121990':
+			case 'x212':
+				return 'JIS_X0212-1990';
+
+			case 'csiso141jusib1002':
+			case 'iso646yu':
+			case 'isoir141':
+			case 'js':
+			case 'jusib1002':
+			case 'yu':
+				return 'JUS_I.B1.002';
+
+			case 'csiso147macedonian':
+			case 'isoir147':
+			case 'jusib1003mac':
+			case 'macedonian':
+				return 'JUS_I.B1.003-mac';
+
+			case 'csiso146serbian':
+			case 'isoir146':
+			case 'jusib1003serb':
+			case 'serbian':
+				return 'JUS_I.B1.003-serb';
+
+			case 'koi7switched':
+				return 'KOI7-switched';
+
+			case 'cskoi8r':
+			case 'koi8r':
+				return 'KOI8-R';
+
+			case 'koi8u':
+				return 'KOI8-U';
+
+			case 'csksc5636':
+			case 'iso646kr':
+			case 'ksc5636':
+				return 'KSC5636';
+
+			case 'cskz1048':
+			case 'kz1048':
+			case 'rk1048':
+			case 'strk10482002':
+				return 'KZ-1048';
+
+			case 'csiso19latingreek':
+			case 'isoir19':
+			case 'latingreek':
+				return 'latin-greek';
+
+			case 'csiso27latingreek1':
+			case 'isoir27':
+			case 'latingreek1':
+				return 'Latin-greek-1';
+
+			case 'csiso158lap':
+			case 'isoir158':
+			case 'lap':
+			case 'latinlap':
+				return 'latin-lap';
+
+			case 'csmacintosh':
+			case 'mac':
+			case 'macintosh':
+				return 'macintosh';
+
+			case 'csmicrosoftpublishing':
+			case 'microsoftpublishing':
+				return 'Microsoft-Publishing';
+
+			case 'csmnem':
+			case 'mnem':
+				return 'MNEM';
+
+			case 'csmnemonic':
+			case 'mnemonic':
+				return 'MNEMONIC';
+
+			case 'csiso86hungarian':
+			case 'hu':
+			case 'iso646hu':
+			case 'isoir86':
+			case 'msz77953':
+				return 'MSZ_7795.3';
+
+			case 'csnatsdano':
+			case 'isoir91':
+			case 'natsdano':
+				return 'NATS-DANO';
+
+			case 'csnatsdanoadd':
+			case 'isoir92':
+			case 'natsdanoadd':
+				return 'NATS-DANO-ADD';
+
+			case 'csnatssefi':
+			case 'isoir81':
+			case 'natssefi':
+				return 'NATS-SEFI';
+
+			case 'csnatssefiadd':
+			case 'isoir82':
+			case 'natssefiadd':
+				return 'NATS-SEFI-ADD';
+
+			case 'csiso151cuba':
+			case 'cuba':
+			case 'iso646cu':
+			case 'isoir151':
+			case 'ncnc1081':
+				return 'NC_NC00-10:81';
+
+			case 'csiso69french':
+			case 'fr':
+			case 'iso646fr':
+			case 'isoir69':
+			case 'nfz62010':
+				return 'NF_Z_62-010';
+
+			case 'csiso25french':
+			case 'iso646fr1':
+			case 'isoir25':
+			case 'nfz620101973':
+				return 'NF_Z_62-010_(1973)';
+
+			case 'csiso60danishnorwegian':
+			case 'csiso60norwegian1':
+			case 'iso646no':
+			case 'isoir60':
+			case 'no':
+			case 'ns45511':
+				return 'NS_4551-1';
+
+			case 'csiso61norwegian2':
+			case 'iso646no2':
+			case 'isoir61':
+			case 'no2':
+			case 'ns45512':
+				return 'NS_4551-2';
+
+			case 'osdebcdicdf3irv':
+				return 'OSD_EBCDIC_DF03_IRV';
+
+			case 'osdebcdicdf41':
+				return 'OSD_EBCDIC_DF04_1';
+
+			case 'osdebcdicdf415':
+				return 'OSD_EBCDIC_DF04_15';
+
+			case 'cspc8danishnorwegian':
+			case 'pc8danishnorwegian':
+				return 'PC8-Danish-Norwegian';
+
+			case 'cspc8turkish':
+			case 'pc8turkish':
+				return 'PC8-Turkish';
+
+			case 'csiso16portuguese':
+			case 'iso646pt':
+			case 'isoir16':
+			case 'pt':
+				return 'PT';
+
+			case 'csiso84portuguese2':
+			case 'iso646pt2':
+			case 'isoir84':
+			case 'pt2':
+				return 'PT2';
+
+			case 'cp154':
+			case 'csptcp154':
+			case 'cyrillicasian':
+			case 'pt154':
+			case 'ptcp154':
+				return 'PTCP154';
+
+			case 'scsu':
+				return 'SCSU';
+
+			case 'csiso10swedish':
+			case 'fi':
+			case 'iso646fi':
+			case 'iso646se':
+			case 'isoir10':
+			case 'se':
+			case 'sen850200b':
+				return 'SEN_850200_B';
+
+			case 'csiso11swedishfornames':
+			case 'iso646se2':
+			case 'isoir11':
+			case 'se2':
+			case 'sen850200c':
+				return 'SEN_850200_C';
+
+			case 'csiso102t617bit':
+			case 'isoir102':
+			case 't617bit':
+				return 'T.61-7bit';
+
+			case 'csiso103t618bit':
+			case 'isoir103':
+			case 't61':
+			case 't618bit':
+				return 'T.61-8bit';
+
+			case 'csiso128t101g2':
+			case 'isoir128':
+			case 't101g2':
+				return 'T.101-G2';
+
+			case 'cstscii':
+			case 'tscii':
+				return 'TSCII';
+
+			case 'csunicode11':
+			case 'unicode11':
+				return 'UNICODE-1-1';
+
+			case 'csunicode11utf7':
+			case 'unicode11utf7':
+				return 'UNICODE-1-1-UTF-7';
+
+			case 'csunknown8bit':
+			case 'unknown8bit':
+				return 'UNKNOWN-8BIT';
+
+			case 'ansix341968':
+			case 'ansix341986':
+			case 'ascii':
+			case 'cp367':
+			case 'csascii':
+			case 'ibm367':
+			case 'iso646irv1991':
+			case 'iso646us':
+			case 'isoir6':
+			case 'us':
+			case 'usascii':
+				return 'US-ASCII';
+
+			case 'csusdk':
+			case 'usdk':
+				return 'us-dk';
+
+			case 'utf7':
+				return 'UTF-7';
+
+			case 'utf8':
+				return 'UTF-8';
+
+			case 'utf16':
+				return 'UTF-16';
+
+			case 'utf16be':
+				return 'UTF-16BE';
+
+			case 'utf16le':
+				return 'UTF-16LE';
+
+			case 'utf32':
+				return 'UTF-32';
+
+			case 'utf32be':
+				return 'UTF-32BE';
+
+			case 'utf32le':
+				return 'UTF-32LE';
+
+			case 'csventurainternational':
+			case 'venturainternational':
+				return 'Ventura-International';
+
+			case 'csventuramath':
+			case 'venturamath':
+				return 'Ventura-Math';
+
+			case 'csventuraus':
+			case 'venturaus':
+				return 'Ventura-US';
+
+			case 'csiso70videotexsupp1':
+			case 'isoir70':
+			case 'videotexsuppl':
+				return 'videotex-suppl';
+
+			case 'csviqr':
+			case 'viqr':
+				return 'VIQR';
+
+			case 'csviscii':
+			case 'viscii':
+				return 'VISCII';
+
+			case 'csshiftjis':
+			case 'cswindows31j':
+			case 'mskanji':
+			case 'shiftjis':
+			case 'windows31j':
+				return 'Windows-31J';
+
+			case 'iso885911':
+			case 'tis620':
+				return 'windows-874';
+
+			case 'cseuckr':
+			case 'csksc56011987':
+			case 'euckr':
+			case 'isoir149':
+			case 'korean':
+			case 'ksc5601':
+			case 'ksc56011987':
+			case 'ksc56011989':
+			case 'windows949':
+				return 'windows-949';
+
+			case 'windows1250':
+				return 'windows-1250';
+
+			case 'windows1251':
+				return 'windows-1251';
+
+			case 'cp819':
+			case 'csisolatin1':
+			case 'ibm819':
+			case 'iso88591':
+			case 'iso885911987':
+			case 'isoir100':
+			case 'l1':
+			case 'latin1':
+			case 'windows1252':
+				return 'windows-1252';
+
+			case 'windows1253':
+				return 'windows-1253';
+
+			case 'csisolatin5':
+			case 'iso88599':
+			case 'iso885991989':
+			case 'isoir148':
+			case 'l5':
+			case 'latin5':
+			case 'windows1254':
+				return 'windows-1254';
+
+			case 'windows1255':
+				return 'windows-1255';
+
+			case 'windows1256':
+				return 'windows-1256';
+
+			case 'windows1257':
+				return 'windows-1257';
+
+			case 'windows1258':
+				return 'windows-1258';
+
+			default:
+				return $charset;
+		}
+	}
+
+	public static function get_curl_version()
+	{
+		if (is_array($curl = curl_version()))
+		{
+			$curl = $curl['version'];
+		}
+		elseif (substr($curl, 0, 5) === 'curl/')
+		{
+			$curl = substr($curl, 5, strcspn($curl, "\x09\x0A\x0B\x0C\x0D", 5));
+		}
+		elseif (substr($curl, 0, 8) === 'libcurl/')
+		{
+			$curl = substr($curl, 8, strcspn($curl, "\x09\x0A\x0B\x0C\x0D", 8));
+		}
+		else
+		{
+			$curl = 0;
+		}
+		return $curl;
+	}
+
+	/**
+	 * Strip HTML comments
+	 *
+	 * @param string $data Data to strip comments from
+	 * @return string Comment stripped string
+	 */
+	public static function strip_comments($data)
+	{
+		$output = '';
+		while (($start = strpos($data, '<!--')) !== false)
+		{
+			$output .= substr($data, 0, $start);
+			if (($end = strpos($data, '-->', $start)) !== false)
+			{
+				$data = substr_replace($data, '', 0, $end + 3);
+			}
+			else
+			{
+				$data = '';
+			}
+		}
+		return $output . $data;
+	}
+
+	public static function parse_date($dt)
+	{
+		$parser = SimplePie_Parse_Date::get();
+		return $parser->parse($dt);
+	}
+
+	/**
+	 * Decode HTML entities
+	 *
+	 * @deprecated Use DOMDocument instead
+	 * @param string $data Input data
+	 * @return string Output data
+	 */
+	public static function entities_decode($data)
+	{
+		$decoder = new SimplePie_Decode_HTML_Entities($data);
+		return $decoder->parse();
+	}
+
+	/**
+	 * Remove RFC822 comments
+	 *
+	 * @param string $data Data to strip comments from
+	 * @return string Comment stripped string
+	 */
+	public static function uncomment_rfc822($string)
+	{
+		$string = (string) $string;
+		$position = 0;
+		$length = strlen($string);
+		$depth = 0;
+
+		$output = '';
+
+		while ($position < $length && ($pos = strpos($string, '(', $position)) !== false)
+		{
+			$output .= substr($string, $position, $pos - $position);
+			$position = $pos + 1;
+			if ($string[$pos - 1] !== '\\')
+			{
+				$depth++;
+				while ($depth && $position < $length)
+				{
+					$position += strcspn($string, '()', $position);
+					if ($string[$position - 1] === '\\')
+					{
+						$position++;
+						continue;
+					}
+					elseif (isset($string[$position]))
+					{
+						switch ($string[$position])
+						{
+							case '(':
+								$depth++;
+								break;
+
+							case ')':
+								$depth--;
+								break;
+						}
+						$position++;
+					}
+					else
+					{
+						break;
+					}
+				}
+			}
+			else
+			{
+				$output .= '(';
+			}
+		}
+		$output .= substr($string, $position);
+
+		return $output;
+	}
+
+	public static function parse_mime($mime)
+	{
+		if (($pos = strpos($mime, ';')) === false)
+		{
+			return trim($mime);
+		}
+		else
+		{
+			return trim(substr($mime, 0, $pos));
+		}
+	}
+
+	public static function atom_03_construct_type($attribs)
+	{
+		if (isset($attribs['']['mode']) && strtolower(trim($attribs['']['mode']) === 'base64'))
+		{
+			$mode = SIMPLEPIE_CONSTRUCT_BASE64;
+		}
+		else
+		{
+			$mode = SIMPLEPIE_CONSTRUCT_NONE;
+		}
+		if (isset($attribs['']['type']))
+		{
+			switch (strtolower(trim($attribs['']['type'])))
+			{
+				case 'text':
+				case 'text/plain':
+					return SIMPLEPIE_CONSTRUCT_TEXT | $mode;
+
+				case 'html':
+				case 'text/html':
+					return SIMPLEPIE_CONSTRUCT_HTML | $mode;
+
+				case 'xhtml':
+				case 'application/xhtml+xml':
+					return SIMPLEPIE_CONSTRUCT_XHTML | $mode;
+
+				default:
+					return SIMPLEPIE_CONSTRUCT_NONE | $mode;
+			}
+		}
+		else
+		{
+			return SIMPLEPIE_CONSTRUCT_TEXT | $mode;
+		}
+	}
+
+	public static function atom_10_construct_type($attribs)
+	{
+		if (isset($attribs['']['type']))
+		{
+			switch (strtolower(trim($attribs['']['type'])))
+			{
+				case 'text':
+					return SIMPLEPIE_CONSTRUCT_TEXT;
+
+				case 'html':
+					return SIMPLEPIE_CONSTRUCT_HTML;
+
+				case 'xhtml':
+					return SIMPLEPIE_CONSTRUCT_XHTML;
+
+				default:
+					return SIMPLEPIE_CONSTRUCT_NONE;
+			}
+		}
+		return SIMPLEPIE_CONSTRUCT_TEXT;
+	}
+
+	public static function atom_10_content_construct_type($attribs)
+	{
+		if (isset($attribs['']['type']))
+		{
+			$type = strtolower(trim($attribs['']['type']));
+			switch ($type)
+			{
+				case 'text':
+					return SIMPLEPIE_CONSTRUCT_TEXT;
+
+				case 'html':
+					return SIMPLEPIE_CONSTRUCT_HTML;
+
+				case 'xhtml':
+					return SIMPLEPIE_CONSTRUCT_XHTML;
+			}
+			if (in_array(substr($type, -4), array('+xml', '/xml')) || substr($type, 0, 5) === 'text/')
+			{
+				return SIMPLEPIE_CONSTRUCT_NONE;
+			}
+			else
+			{
+				return SIMPLEPIE_CONSTRUCT_BASE64;
+			}
+		}
+		else
+		{
+			return SIMPLEPIE_CONSTRUCT_TEXT;
+		}
+	}
+
+	public static function is_isegment_nz_nc($string)
+	{
+		return (bool) preg_match('/^([A-Za-z0-9\-._~\x{A0}-\x{D7FF}\x{F900}-\x{FDCF}\x{FDF0}-\x{FFEF}\x{10000}-\x{1FFFD}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}\x{40000}-\x{4FFFD}\x{50000}-\x{5FFFD}\x{60000}-\x{6FFFD}\x{70000}-\x{7FFFD}\x{80000}-\x{8FFFD}\x{90000}-\x{9FFFD}\x{A0000}-\x{AFFFD}\x{B0000}-\x{BFFFD}\x{C0000}-\x{CFFFD}\x{D0000}-\x{DFFFD}\x{E1000}-\x{EFFFD}!$&\'()*+,;=@]|(%[0-9ABCDEF]{2}))+$/u', $string);
+	}
+
+	public static function space_separated_tokens($string)
+	{
+		$space_characters = "\x20\x09\x0A\x0B\x0C\x0D";
+		$string_length = strlen($string);
+
+		$position = strspn($string, $space_characters);
+		$tokens = array();
+
+		while ($position < $string_length)
+		{
+			$len = strcspn($string, $space_characters, $position);
+			$tokens[] = substr($string, $position, $len);
+			$position += $len;
+			$position += strspn($string, $space_characters, $position);
+		}
+
+		return $tokens;
+	}
+
+	/**
+	 * Converts a unicode codepoint to a UTF-8 character
+	 *
+	 * @static
+	 * @param int $codepoint Unicode codepoint
+	 * @return string UTF-8 character
+	 */
+	public static function codepoint_to_utf8($codepoint)
+	{
+		$codepoint = (int) $codepoint;
+		if ($codepoint < 0)
+		{
+			return false;
+		}
+		else if ($codepoint <= 0x7f)
+		{
+			return chr($codepoint);
+		}
+		else if ($codepoint <= 0x7ff)
+		{
+			return chr(0xc0 | ($codepoint >> 6)) . chr(0x80 | ($codepoint & 0x3f));
+		}
+		else if ($codepoint <= 0xffff)
+		{
+			return chr(0xe0 | ($codepoint >> 12)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
+		}
+		else if ($codepoint <= 0x10ffff)
+		{
+			return chr(0xf0 | ($codepoint >> 18)) . chr(0x80 | (($codepoint >> 12) & 0x3f)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
+		}
+		else
+		{
+			// U+FFFD REPLACEMENT CHARACTER
+			return "\xEF\xBF\xBD";
+		}
+	}
+
+	/**
+	 * Similar to parse_str()
+	 *
+	 * Returns an associative array of name/value pairs, where the value is an
+	 * array of values that have used the same name
+	 *
+	 * @static
+	 * @param string $str The input string.
+	 * @return array
+	 */
+	public static function parse_str($str)
+	{
+		$return = array();
+		$str = explode('&', $str);
+
+		foreach ($str as $section)
+		{
+			if (strpos($section, '=') !== false)
+			{
+				list($name, $value) = explode('=', $section, 2);
+				$return[urldecode($name)][] = urldecode($value);
+			}
+			else
+			{
+				$return[urldecode($section)][] = null;
+			}
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Detect XML encoding, as per XML 1.0 Appendix F.1
+	 *
+	 * @todo Add support for EBCDIC
+	 * @param string $data XML data
+	 * @param SimplePie_Registry $registry Class registry
+	 * @return array Possible encodings
+	 */
+	public static function xml_encoding($data, $registry)
+	{
+		// UTF-32 Big Endian BOM
+		if (substr($data, 0, 4) === "\x00\x00\xFE\xFF")
+		{
+			$encoding[] = 'UTF-32BE';
+		}
+		// UTF-32 Little Endian BOM
+		elseif (substr($data, 0, 4) === "\xFF\xFE\x00\x00")
+		{
+			$encoding[] = 'UTF-32LE';
+		}
+		// UTF-16 Big Endian BOM
+		elseif (substr($data, 0, 2) === "\xFE\xFF")
+		{
+			$encoding[] = 'UTF-16BE';
+		}
+		// UTF-16 Little Endian BOM
+		elseif (substr($data, 0, 2) === "\xFF\xFE")
+		{
+			$encoding[] = 'UTF-16LE';
+		}
+		// UTF-8 BOM
+		elseif (substr($data, 0, 3) === "\xEF\xBB\xBF")
+		{
+			$encoding[] = 'UTF-8';
+		}
+		// UTF-32 Big Endian Without BOM
+		elseif (substr($data, 0, 20) === "\x00\x00\x00\x3C\x00\x00\x00\x3F\x00\x00\x00\x78\x00\x00\x00\x6D\x00\x00\x00\x6C")
+		{
+			if ($pos = strpos($data, "\x00\x00\x00\x3F\x00\x00\x00\x3E"))
+			{
+				$parser = $registry->create('XML_Declaration_Parser', array(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32BE', 'UTF-8')));
+				if ($parser->parse())
+				{
+					$encoding[] = $parser->encoding;
+				}
+			}
+			$encoding[] = 'UTF-32BE';
+		}
+		// UTF-32 Little Endian Without BOM
+		elseif (substr($data, 0, 20) === "\x3C\x00\x00\x00\x3F\x00\x00\x00\x78\x00\x00\x00\x6D\x00\x00\x00\x6C\x00\x00\x00")
+		{
+			if ($pos = strpos($data, "\x3F\x00\x00\x00\x3E\x00\x00\x00"))
+			{
+				$parser = $registry->create('XML_Declaration_Parser', array(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32LE', 'UTF-8')));
+				if ($parser->parse())
+				{
+					$encoding[] = $parser->encoding;
+				}
+			}
+			$encoding[] = 'UTF-32LE';
+		}
+		// UTF-16 Big Endian Without BOM
+		elseif (substr($data, 0, 10) === "\x00\x3C\x00\x3F\x00\x78\x00\x6D\x00\x6C")
+		{
+			if ($pos = strpos($data, "\x00\x3F\x00\x3E"))
+			{
+				$parser = $registry->create('XML_Declaration_Parser', array(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16BE', 'UTF-8')));
+				if ($parser->parse())
+				{
+					$encoding[] = $parser->encoding;
+				}
+			}
+			$encoding[] = 'UTF-16BE';
+		}
+		// UTF-16 Little Endian Without BOM
+		elseif (substr($data, 0, 10) === "\x3C\x00\x3F\x00\x78\x00\x6D\x00\x6C\x00")
+		{
+			if ($pos = strpos($data, "\x3F\x00\x3E\x00"))
+			{
+				$parser = $registry->create('XML_Declaration_Parser', array(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16LE', 'UTF-8')));
+				if ($parser->parse())
+				{
+					$encoding[] = $parser->encoding;
+				}
+			}
+			$encoding[] = 'UTF-16LE';
+		}
+		// US-ASCII (or superset)
+		elseif (substr($data, 0, 5) === "\x3C\x3F\x78\x6D\x6C")
+		{
+			if ($pos = strpos($data, "\x3F\x3E"))
+			{
+				$parser = $registry->create('XML_Declaration_Parser', array(substr($data, 5, $pos - 5)));
+				if ($parser->parse())
+				{
+					$encoding[] = $parser->encoding;
+				}
+			}
+			$encoding[] = 'UTF-8';
+		}
+		// Fallback to UTF-8
+		else
+		{
+			$encoding[] = 'UTF-8';
+		}
+		return $encoding;
+	}
+
+	public static function output_javascript()
+	{
+		if (function_exists('ob_gzhandler'))
+		{
+			ob_start('ob_gzhandler');
+		}
+		header('Content-type: text/javascript; charset: UTF-8');
+		header('Cache-Control: must-revalidate');
+		header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 604800) . ' GMT'); // 7 days
+		?>
+function embed_quicktime(type, bgcolor, width, height, link, placeholder, loop) {
+	if (placeholder != '') {
+		document.writeln('<embed type="'+type+'" style="cursor:hand; cursor:pointer;" href="'+link+'" src="'+placeholder+'" width="'+width+'" height="'+height+'" autoplay="false" target="myself" controller="false" loop="'+loop+'" scale="aspect" bgcolor="'+bgcolor+'" pluginspage="http://www.apple.com/quicktime/download/"></embed>');
+	}
+	else {
+		document.writeln('<embed type="'+type+'" style="cursor:hand; cursor:pointer;" src="'+link+'" width="'+width+'" height="'+height+'" autoplay="false" target="myself" controller="true" loop="'+loop+'" scale="aspect" bgcolor="'+bgcolor+'" pluginspage="http://www.apple.com/quicktime/download/"></embed>');
+	}
+}
+
+function embed_flash(bgcolor, width, height, link, loop, type) {
+	document.writeln('<embed src="'+link+'" pluginspage="http://www.macromedia.com/go/getflashplayer" type="'+type+'" quality="high" width="'+width+'" height="'+height+'" bgcolor="'+bgcolor+'" loop="'+loop+'"></embed>');
+}
+
+function embed_flv(width, height, link, placeholder, loop, player) {
+	document.writeln('<embed src="'+player+'" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash" quality="high" width="'+width+'" height="'+height+'" wmode="transparent" flashvars="file='+link+'&autostart=false&repeat='+loop+'&showdigits=true&showfsbutton=false"></embed>');
+}
+
+function embed_wmedia(width, height, link) {
+	document.writeln('<embed type="application/x-mplayer2" src="'+link+'" autosize="1" width="'+width+'" height="'+height+'" showcontrols="1" showstatusbar="0" showdisplay="0" autostart="0"></embed>');
+}
+		<?php
+	}
+
+	/**
+	 * Get the SimplePie build timestamp
+	 *
+	 * Uses the git index if it exists, otherwise uses the modification time
+	 * of the newest file.
+	 */
+	public static function get_build()
+	{
+		$root = dirname(dirname(__FILE__));
+		if (file_exists($root . '/.git/index'))
+		{
+			return filemtime($root . '/.git/index');
+		}
+		elseif (file_exists($root . '/SimplePie'))
+		{
+			$time = 0;
+			foreach (glob($root . '/SimplePie/*.php') as $file)
+			{
+				if (($mtime = filemtime($file)) > $time)
+				{
+					$time = $mtime;
+				}
+			}
+			return $time;
+		}
+		elseif (file_exists(dirname(__FILE__) . '/Core.php'))
+		{
+			return filemtime(dirname(__FILE__) . '/Core.php');
+		}
+		else
+		{
+			return filemtime(__FILE__);
+		}
+	}
+
+	/**
+	 * Format debugging information
+	 */
+	public static function debug(&$sp)
+	{
+		$info = 'SimplePie ' . SIMPLEPIE_VERSION . ' Build ' . SIMPLEPIE_BUILD . "\n";
+		$info .= 'PHP ' . PHP_VERSION . "\n";
+		if ($sp->error() !== null)
+		{
+			$info .= 'Error occurred: ' . $sp->error() . "\n";
+		}
+		else
+		{
+			$info .= "No error found.\n";
+		}
+		$info .= "Extensions:\n";
+		$extensions = array('pcre', 'curl', 'zlib', 'mbstring', 'iconv', 'xmlreader', 'xml');
+		foreach ($extensions as $ext)
+		{
+			if (extension_loaded($ext))
+			{
+				$info .= "    $ext loaded\n";
+				switch ($ext)
+				{
+					case 'pcre':
+						$info .= '      Version ' . PCRE_VERSION . "\n";
+						break;
+					case 'curl':
+						$version = curl_version();
+						$info .= '      Version ' . $version['version'] . "\n";
+						break;
+					case 'mbstring':
+						$info .= '      Overloading: ' . mb_get_info('func_overload') . "\n";
+						break;
+					case 'iconv':
+						$info .= '      Version ' . ICONV_VERSION . "\n";
+						break;
+					case 'xml':
+						$info .= '      Version ' . LIBXML_DOTTED_VERSION . "\n";
+						break;
+				}
+			}
+			else
+			{
+				$info .= "    $ext not loaded\n";
+			}
+		}
+		return $info;
+	}
+
+	public static function silence_errors($num, $str)
+	{
+		// No-op
+	}
+}
+
diff --git a/lib/vendor/simplepie/SimplePie/Net/IPv6.php b/lib/vendor/simplepie/SimplePie/Net/IPv6.php
new file mode 100644
index 000000000..47658aff2
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Net/IPv6.php
@@ -0,0 +1,275 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+
+/**
+ * Class to validate and to work with IPv6 addresses.
+ *
+ * @package SimplePie
+ * @subpackage HTTP
+ * @copyright 2003-2005 The PHP Group
+ * @license http://www.opensource.org/licenses/bsd-license.php
+ * @link http://pear.php.net/package/Net_IPv6
+ * @author Alexander Merz <alexander.merz@web.de>
+ * @author elfrink at introweb dot nl
+ * @author Josh Peck <jmp at joshpeck dot org>
+ * @author Geoffrey Sneddon <geoffers@gmail.com>
+ */
+class SimplePie_Net_IPv6
+{
+	/**
+	 * Uncompresses an IPv6 address
+	 *
+	 * RFC 4291 allows you to compress concecutive zero pieces in an address to
+	 * '::'. This method expects a valid IPv6 address and expands the '::' to
+	 * the required number of zero pieces.
+	 *
+	 * Example:  FF01::101   ->  FF01:0:0:0:0:0:0:101
+	 *           ::1         ->  0:0:0:0:0:0:0:1
+	 *
+	 * @author Alexander Merz <alexander.merz@web.de>
+	 * @author elfrink at introweb dot nl
+	 * @author Josh Peck <jmp at joshpeck dot org>
+	 * @copyright 2003-2005 The PHP Group
+	 * @license http://www.opensource.org/licenses/bsd-license.php
+	 * @param string $ip An IPv6 address
+	 * @return string The uncompressed IPv6 address
+	 */
+	public static function uncompress($ip)
+	{
+		$c1 = -1;
+		$c2 = -1;
+		if (substr_count($ip, '::') === 1)
+		{
+			list($ip1, $ip2) = explode('::', $ip);
+			if ($ip1 === '')
+			{
+				$c1 = -1;
+			}
+			else
+			{
+				$c1 = substr_count($ip1, ':');
+			}
+			if ($ip2 === '')
+			{
+				$c2 = -1;
+			}
+			else
+			{
+				$c2 = substr_count($ip2, ':');
+			}
+			if (strpos($ip2, '.') !== false)
+			{
+				$c2++;
+			}
+			// ::
+			if ($c1 === -1 && $c2 === -1)
+			{
+				$ip = '0:0:0:0:0:0:0:0';
+			}
+			// ::xxx
+			else if ($c1 === -1)
+			{
+				$fill = str_repeat('0:', 7 - $c2);
+				$ip = str_replace('::', $fill, $ip);
+			}
+			// xxx::
+			else if ($c2 === -1)
+			{
+				$fill = str_repeat(':0', 7 - $c1);
+				$ip = str_replace('::', $fill, $ip);
+			}
+			// xxx::xxx
+			else
+			{
+				$fill = ':' . str_repeat('0:', 6 - $c2 - $c1);
+				$ip = str_replace('::', $fill, $ip);
+			}
+		}
+		return $ip;
+	}
+
+	/**
+	 * Compresses an IPv6 address
+	 *
+	 * RFC 4291 allows you to compress concecutive zero pieces in an address to
+	 * '::'. This method expects a valid IPv6 address and compresses consecutive
+	 * zero pieces to '::'.
+	 *
+	 * Example:  FF01:0:0:0:0:0:0:101   ->  FF01::101
+	 *           0:0:0:0:0:0:0:1        ->  ::1
+	 *
+	 * @see uncompress()
+	 * @param string $ip An IPv6 address
+	 * @return string The compressed IPv6 address
+	 */
+	public static function compress($ip)
+	{
+		// Prepare the IP to be compressed
+		$ip = self::uncompress($ip);
+		$ip_parts = self::split_v6_v4($ip);
+
+		// Replace all leading zeros
+		$ip_parts[0] = preg_replace('/(^|:)0+([0-9])/', '\1\2', $ip_parts[0]);
+
+		// Find bunches of zeros
+		if (preg_match_all('/(?:^|:)(?:0(?::|$))+/', $ip_parts[0], $matches, PREG_OFFSET_CAPTURE))
+		{
+			$max = 0;
+			$pos = null;
+			foreach ($matches[0] as $match)
+			{
+				if (strlen($match[0]) > $max)
+				{
+					$max = strlen($match[0]);
+					$pos = $match[1];
+				}
+			}
+
+			$ip_parts[0] = substr_replace($ip_parts[0], '::', $pos, $max);
+		}
+
+		if ($ip_parts[1] !== '')
+		{
+			return implode(':', $ip_parts);
+		}
+		else
+		{
+			return $ip_parts[0];
+		}
+	}
+
+	/**
+	 * Splits an IPv6 address into the IPv6 and IPv4 representation parts
+	 *
+	 * RFC 4291 allows you to represent the last two parts of an IPv6 address
+	 * using the standard IPv4 representation
+	 *
+	 * Example:  0:0:0:0:0:0:13.1.68.3
+	 *           0:0:0:0:0:FFFF:129.144.52.38
+	 *
+	 * @param string $ip An IPv6 address
+	 * @return array [0] contains the IPv6 represented part, and [1] the IPv4 represented part
+	 */
+	private static function split_v6_v4($ip)
+	{
+		if (strpos($ip, '.') !== false)
+		{
+			$pos = strrpos($ip, ':');
+			$ipv6_part = substr($ip, 0, $pos);
+			$ipv4_part = substr($ip, $pos + 1);
+			return array($ipv6_part, $ipv4_part);
+		}
+		else
+		{
+			return array($ip, '');
+		}
+	}
+
+	/**
+	 * Checks an IPv6 address
+	 *
+	 * Checks if the given IP is a valid IPv6 address
+	 *
+	 * @param string $ip An IPv6 address
+	 * @return bool true if $ip is a valid IPv6 address
+	 */
+	public static function check_ipv6($ip)
+	{
+		$ip = self::uncompress($ip);
+		list($ipv6, $ipv4) = self::split_v6_v4($ip);
+		$ipv6 = explode(':', $ipv6);
+		$ipv4 = explode('.', $ipv4);
+		if (count($ipv6) === 8 && count($ipv4) === 1 || count($ipv6) === 6 && count($ipv4) === 4)
+		{
+			foreach ($ipv6 as $ipv6_part)
+			{
+				// The section can't be empty
+				if ($ipv6_part === '')
+					return false;
+
+				// Nor can it be over four characters
+				if (strlen($ipv6_part) > 4)
+					return false;
+
+				// Remove leading zeros (this is safe because of the above)
+				$ipv6_part = ltrim($ipv6_part, '0');
+				if ($ipv6_part === '')
+					$ipv6_part = '0';
+
+				// Check the value is valid
+				$value = hexdec($ipv6_part);
+				if (dechex($value) !== strtolower($ipv6_part) || $value < 0 || $value > 0xFFFF)
+					return false;
+			}
+			if (count($ipv4) === 4)
+			{
+				foreach ($ipv4 as $ipv4_part)
+				{
+					$value = (int) $ipv4_part;
+					if ((string) $value !== $ipv4_part || $value < 0 || $value > 0xFF)
+						return false;
+				}
+			}
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Checks if the given IP is a valid IPv6 address
+	 *
+	 * @codeCoverageIgnore
+	 * @deprecated Use {@see SimplePie_Net_IPv6::check_ipv6()} instead
+	 * @see check_ipv6
+	 * @param string $ip An IPv6 address
+	 * @return bool true if $ip is a valid IPv6 address
+	 */
+	public static function checkIPv6($ip)
+	{
+		return self::check_ipv6($ip);
+	}
+}
diff --git a/lib/vendor/simplepie/SimplePie/Parse/Date.php b/lib/vendor/simplepie/SimplePie/Parse/Date.php
new file mode 100644
index 000000000..1f2156655
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Parse/Date.php
@@ -0,0 +1,983 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+
+/**
+ * Date Parser
+ *
+ * @package SimplePie
+ * @subpackage Parsing
+ */
+class SimplePie_Parse_Date
+{
+	/**
+	 * Input data
+	 *
+	 * @access protected
+	 * @var string
+	 */
+	var $date;
+
+	/**
+	 * List of days, calendar day name => ordinal day number in the week
+	 *
+	 * @access protected
+	 * @var array
+	 */
+	var $day = array(
+		// English
+		'mon' => 1,
+		'monday' => 1,
+		'tue' => 2,
+		'tuesday' => 2,
+		'wed' => 3,
+		'wednesday' => 3,
+		'thu' => 4,
+		'thursday' => 4,
+		'fri' => 5,
+		'friday' => 5,
+		'sat' => 6,
+		'saturday' => 6,
+		'sun' => 7,
+		'sunday' => 7,
+		// Dutch
+		'maandag' => 1,
+		'dinsdag' => 2,
+		'woensdag' => 3,
+		'donderdag' => 4,
+		'vrijdag' => 5,
+		'zaterdag' => 6,
+		'zondag' => 7,
+		// French
+		'lundi' => 1,
+		'mardi' => 2,
+		'mercredi' => 3,
+		'jeudi' => 4,
+		'vendredi' => 5,
+		'samedi' => 6,
+		'dimanche' => 7,
+		// German
+		'montag' => 1,
+		'dienstag' => 2,
+		'mittwoch' => 3,
+		'donnerstag' => 4,
+		'freitag' => 5,
+		'samstag' => 6,
+		'sonnabend' => 6,
+		'sonntag' => 7,
+		// Italian
+		'lunedì' => 1,
+		'martedì' => 2,
+		'mercoledì' => 3,
+		'giovedì' => 4,
+		'venerdì' => 5,
+		'sabato' => 6,
+		'domenica' => 7,
+		// Spanish
+		'lunes' => 1,
+		'martes' => 2,
+		'miércoles' => 3,
+		'jueves' => 4,
+		'viernes' => 5,
+		'sábado' => 6,
+		'domingo' => 7,
+		// Finnish
+		'maanantai' => 1,
+		'tiistai' => 2,
+		'keskiviikko' => 3,
+		'torstai' => 4,
+		'perjantai' => 5,
+		'lauantai' => 6,
+		'sunnuntai' => 7,
+		// Hungarian
+		'hétfő' => 1,
+		'kedd' => 2,
+		'szerda' => 3,
+		'csütörtok' => 4,
+		'péntek' => 5,
+		'szombat' => 6,
+		'vasárnap' => 7,
+		// Greek
+		'Δευ' => 1,
+		'Τρι' => 2,
+		'Τετ' => 3,
+		'Πεμ' => 4,
+		'Παρ' => 5,
+		'Σαβ' => 6,
+		'Κυρ' => 7,
+	);
+
+	/**
+	 * List of months, calendar month name => calendar month number
+	 *
+	 * @access protected
+	 * @var array
+	 */
+	var $month = array(
+		// English
+		'jan' => 1,
+		'january' => 1,
+		'feb' => 2,
+		'february' => 2,
+		'mar' => 3,
+		'march' => 3,
+		'apr' => 4,
+		'april' => 4,
+		'may' => 5,
+		// No long form of May
+		'jun' => 6,
+		'june' => 6,
+		'jul' => 7,
+		'july' => 7,
+		'aug' => 8,
+		'august' => 8,
+		'sep' => 9,
+		'september' => 9,
+		'oct' => 10,
+		'october' => 10,
+		'nov' => 11,
+		'november' => 11,
+		'dec' => 12,
+		'december' => 12,
+		// Dutch
+		'januari' => 1,
+		'februari' => 2,
+		'maart' => 3,
+		'april' => 4,
+		'mei' => 5,
+		'juni' => 6,
+		'juli' => 7,
+		'augustus' => 8,
+		'september' => 9,
+		'oktober' => 10,
+		'november' => 11,
+		'december' => 12,
+		// French
+		'janvier' => 1,
+		'février' => 2,
+		'mars' => 3,
+		'avril' => 4,
+		'mai' => 5,
+		'juin' => 6,
+		'juillet' => 7,
+		'août' => 8,
+		'septembre' => 9,
+		'octobre' => 10,
+		'novembre' => 11,
+		'décembre' => 12,
+		// German
+		'januar' => 1,
+		'februar' => 2,
+		'märz' => 3,
+		'april' => 4,
+		'mai' => 5,
+		'juni' => 6,
+		'juli' => 7,
+		'august' => 8,
+		'september' => 9,
+		'oktober' => 10,
+		'november' => 11,
+		'dezember' => 12,
+		// Italian
+		'gennaio' => 1,
+		'febbraio' => 2,
+		'marzo' => 3,
+		'aprile' => 4,
+		'maggio' => 5,
+		'giugno' => 6,
+		'luglio' => 7,
+		'agosto' => 8,
+		'settembre' => 9,
+		'ottobre' => 10,
+		'novembre' => 11,
+		'dicembre' => 12,
+		// Spanish
+		'enero' => 1,
+		'febrero' => 2,
+		'marzo' => 3,
+		'abril' => 4,
+		'mayo' => 5,
+		'junio' => 6,
+		'julio' => 7,
+		'agosto' => 8,
+		'septiembre' => 9,
+		'setiembre' => 9,
+		'octubre' => 10,
+		'noviembre' => 11,
+		'diciembre' => 12,
+		// Finnish
+		'tammikuu' => 1,
+		'helmikuu' => 2,
+		'maaliskuu' => 3,
+		'huhtikuu' => 4,
+		'toukokuu' => 5,
+		'kesäkuu' => 6,
+		'heinäkuu' => 7,
+		'elokuu' => 8,
+		'suuskuu' => 9,
+		'lokakuu' => 10,
+		'marras' => 11,
+		'joulukuu' => 12,
+		// Hungarian
+		'január' => 1,
+		'február' => 2,
+		'március' => 3,
+		'április' => 4,
+		'május' => 5,
+		'június' => 6,
+		'július' => 7,
+		'augusztus' => 8,
+		'szeptember' => 9,
+		'október' => 10,
+		'november' => 11,
+		'december' => 12,
+		// Greek
+		'Ιαν' => 1,
+		'Φεβ' => 2,
+		'Μάώ' => 3,
+		'Μαώ' => 3,
+		'Απρ' => 4,
+		'Μάι' => 5,
+		'Μαϊ' => 5,
+		'Μαι' => 5,
+		'Ιούν' => 6,
+		'Ιον' => 6,
+		'Ιούλ' => 7,
+		'Ιολ' => 7,
+		'Αύγ' => 8,
+		'Αυγ' => 8,
+		'Σεπ' => 9,
+		'Οκτ' => 10,
+		'Νοέ' => 11,
+		'Δεκ' => 12,
+	);
+
+	/**
+	 * List of timezones, abbreviation => offset from UTC
+	 *
+	 * @access protected
+	 * @var array
+	 */
+	var $timezone = array(
+		'ACDT' => 37800,
+		'ACIT' => 28800,
+		'ACST' => 34200,
+		'ACT' => -18000,
+		'ACWDT' => 35100,
+		'ACWST' => 31500,
+		'AEDT' => 39600,
+		'AEST' => 36000,
+		'AFT' => 16200,
+		'AKDT' => -28800,
+		'AKST' => -32400,
+		'AMDT' => 18000,
+		'AMT' => -14400,
+		'ANAST' => 46800,
+		'ANAT' => 43200,
+		'ART' => -10800,
+		'AZOST' => -3600,
+		'AZST' => 18000,
+		'AZT' => 14400,
+		'BIOT' => 21600,
+		'BIT' => -43200,
+		'BOT' => -14400,
+		'BRST' => -7200,
+		'BRT' => -10800,
+		'BST' => 3600,
+		'BTT' => 21600,
+		'CAST' => 18000,
+		'CAT' => 7200,
+		'CCT' => 23400,
+		'CDT' => -18000,
+		'CEDT' => 7200,
+		'CEST' => 7200,
+		'CET' => 3600,
+		'CGST' => -7200,
+		'CGT' => -10800,
+		'CHADT' => 49500,
+		'CHAST' => 45900,
+		'CIST' => -28800,
+		'CKT' => -36000,
+		'CLDT' => -10800,
+		'CLST' => -14400,
+		'COT' => -18000,
+		'CST' => -21600,
+		'CVT' => -3600,
+		'CXT' => 25200,
+		'DAVT' => 25200,
+		'DTAT' => 36000,
+		'EADT' => -18000,
+		'EAST' => -21600,
+		'EAT' => 10800,
+		'ECT' => -18000,
+		'EDT' => -14400,
+		'EEST' => 10800,
+		'EET' => 7200,
+		'EGT' => -3600,
+		'EKST' => 21600,
+		'EST' => -18000,
+		'FJT' => 43200,
+		'FKDT' => -10800,
+		'FKST' => -14400,
+		'FNT' => -7200,
+		'GALT' => -21600,
+		'GEDT' => 14400,
+		'GEST' => 10800,
+		'GFT' => -10800,
+		'GILT' => 43200,
+		'GIT' => -32400,
+		'GST' => 14400,
+		'GST' => -7200,
+		'GYT' => -14400,
+		'HAA' => -10800,
+		'HAC' => -18000,
+		'HADT' => -32400,
+		'HAE' => -14400,
+		'HAP' => -25200,
+		'HAR' => -21600,
+		'HAST' => -36000,
+		'HAT' => -9000,
+		'HAY' => -28800,
+		'HKST' => 28800,
+		'HMT' => 18000,
+		'HNA' => -14400,
+		'HNC' => -21600,
+		'HNE' => -18000,
+		'HNP' => -28800,
+		'HNR' => -25200,
+		'HNT' => -12600,
+		'HNY' => -32400,
+		'IRDT' => 16200,
+		'IRKST' => 32400,
+		'IRKT' => 28800,
+		'IRST' => 12600,
+		'JFDT' => -10800,
+		'JFST' => -14400,
+		'JST' => 32400,
+		'KGST' => 21600,
+		'KGT' => 18000,
+		'KOST' => 39600,
+		'KOVST' => 28800,
+		'KOVT' => 25200,
+		'KRAST' => 28800,
+		'KRAT' => 25200,
+		'KST' => 32400,
+		'LHDT' => 39600,
+		'LHST' => 37800,
+		'LINT' => 50400,
+		'LKT' => 21600,
+		'MAGST' => 43200,
+		'MAGT' => 39600,
+		'MAWT' => 21600,
+		'MDT' => -21600,
+		'MESZ' => 7200,
+		'MEZ' => 3600,
+		'MHT' => 43200,
+		'MIT' => -34200,
+		'MNST' => 32400,
+		'MSDT' => 14400,
+		'MSST' => 10800,
+		'MST' => -25200,
+		'MUT' => 14400,
+		'MVT' => 18000,
+		'MYT' => 28800,
+		'NCT' => 39600,
+		'NDT' => -9000,
+		'NFT' => 41400,
+		'NMIT' => 36000,
+		'NOVST' => 25200,
+		'NOVT' => 21600,
+		'NPT' => 20700,
+		'NRT' => 43200,
+		'NST' => -12600,
+		'NUT' => -39600,
+		'NZDT' => 46800,
+		'NZST' => 43200,
+		'OMSST' => 25200,
+		'OMST' => 21600,
+		'PDT' => -25200,
+		'PET' => -18000,
+		'PETST' => 46800,
+		'PETT' => 43200,
+		'PGT' => 36000,
+		'PHOT' => 46800,
+		'PHT' => 28800,
+		'PKT' => 18000,
+		'PMDT' => -7200,
+		'PMST' => -10800,
+		'PONT' => 39600,
+		'PST' => -28800,
+		'PWT' => 32400,
+		'PYST' => -10800,
+		'PYT' => -14400,
+		'RET' => 14400,
+		'ROTT' => -10800,
+		'SAMST' => 18000,
+		'SAMT' => 14400,
+		'SAST' => 7200,
+		'SBT' => 39600,
+		'SCDT' => 46800,
+		'SCST' => 43200,
+		'SCT' => 14400,
+		'SEST' => 3600,
+		'SGT' => 28800,
+		'SIT' => 28800,
+		'SRT' => -10800,
+		'SST' => -39600,
+		'SYST' => 10800,
+		'SYT' => 7200,
+		'TFT' => 18000,
+		'THAT' => -36000,
+		'TJT' => 18000,
+		'TKT' => -36000,
+		'TMT' => 18000,
+		'TOT' => 46800,
+		'TPT' => 32400,
+		'TRUT' => 36000,
+		'TVT' => 43200,
+		'TWT' => 28800,
+		'UYST' => -7200,
+		'UYT' => -10800,
+		'UZT' => 18000,
+		'VET' => -14400,
+		'VLAST' => 39600,
+		'VLAT' => 36000,
+		'VOST' => 21600,
+		'VUT' => 39600,
+		'WAST' => 7200,
+		'WAT' => 3600,
+		'WDT' => 32400,
+		'WEST' => 3600,
+		'WFT' => 43200,
+		'WIB' => 25200,
+		'WIT' => 32400,
+		'WITA' => 28800,
+		'WKST' => 18000,
+		'WST' => 28800,
+		'YAKST' => 36000,
+		'YAKT' => 32400,
+		'YAPT' => 36000,
+		'YEKST' => 21600,
+		'YEKT' => 18000,
+	);
+
+	/**
+	 * Cached PCRE for SimplePie_Parse_Date::$day
+	 *
+	 * @access protected
+	 * @var string
+	 */
+	var $day_pcre;
+
+	/**
+	 * Cached PCRE for SimplePie_Parse_Date::$month
+	 *
+	 * @access protected
+	 * @var string
+	 */
+	var $month_pcre;
+
+	/**
+	 * Array of user-added callback methods
+	 *
+	 * @access private
+	 * @var array
+	 */
+	var $built_in = array();
+
+	/**
+	 * Array of user-added callback methods
+	 *
+	 * @access private
+	 * @var array
+	 */
+	var $user = array();
+
+	/**
+	 * Create new SimplePie_Parse_Date object, and set self::day_pcre,
+	 * self::month_pcre, and self::built_in
+	 *
+	 * @access private
+	 */
+	public function __construct()
+	{
+		$this->day_pcre = '(' . implode(array_keys($this->day), '|') . ')';
+		$this->month_pcre = '(' . implode(array_keys($this->month), '|') . ')';
+
+		static $cache;
+		if (!isset($cache[get_class($this)]))
+		{
+			$all_methods = get_class_methods($this);
+
+			foreach ($all_methods as $method)
+			{
+				if (strtolower(substr($method, 0, 5)) === 'date_')
+				{
+					$cache[get_class($this)][] = $method;
+				}
+			}
+		}
+
+		foreach ($cache[get_class($this)] as $method)
+		{
+			$this->built_in[] = $method;
+		}
+	}
+
+	/**
+	 * Get the object
+	 *
+	 * @access public
+	 */
+	public static function get()
+	{
+		static $object;
+		if (!$object)
+		{
+			$object = new SimplePie_Parse_Date;
+		}
+		return $object;
+	}
+
+	/**
+	 * Parse a date
+	 *
+	 * @final
+	 * @access public
+	 * @param string $date Date to parse
+	 * @return int Timestamp corresponding to date string, or false on failure
+	 */
+	public function parse($date)
+	{
+		foreach ($this->user as $method)
+		{
+			if (($returned = call_user_func($method, $date)) !== false)
+			{
+				return $returned;
+			}
+		}
+
+		foreach ($this->built_in as $method)
+		{
+			if (($returned = call_user_func(array($this, $method), $date)) !== false)
+			{
+				return $returned;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Add a callback method to parse a date
+	 *
+	 * @final
+	 * @access public
+	 * @param callback $callback
+	 */
+	public function add_callback($callback)
+	{
+		if (is_callable($callback))
+		{
+			$this->user[] = $callback;
+		}
+		else
+		{
+			trigger_error('User-supplied function must be a valid callback', E_USER_WARNING);
+		}
+	}
+
+	/**
+	 * Parse a superset of W3C-DTF (allows hyphens and colons to be omitted, as
+	 * well as allowing any of upper or lower case "T", horizontal tabs, or
+	 * spaces to be used as the time separator (including more than one))
+	 *
+	 * @access protected
+	 * @return int Timestamp
+	 */
+	public function date_w3cdtf($date)
+	{
+		static $pcre;
+		if (!$pcre)
+		{
+			$year = '([0-9]{4})';
+			$month = $day = $hour = $minute = $second = '([0-9]{2})';
+			$decimal = '([0-9]*)';
+			$zone = '(?:(Z)|([+\-])([0-9]{1,2}):?([0-9]{1,2}))';
+			$pcre = '/^' . $year . '(?:-?' . $month . '(?:-?' . $day . '(?:[Tt\x09\x20]+' . $hour . '(?::?' . $minute . '(?::?' . $second . '(?:.' . $decimal . ')?)?)?' . $zone . ')?)?)?$/';
+		}
+		if (preg_match($pcre, $date, $match))
+		{
+			/*
+			Capturing subpatterns:
+			1: Year
+			2: Month
+			3: Day
+			4: Hour
+			5: Minute
+			6: Second
+			7: Decimal fraction of a second
+			8: Zulu
+			9: Timezone ±
+			10: Timezone hours
+			11: Timezone minutes
+			*/
+
+			// Fill in empty matches
+			for ($i = count($match); $i <= 3; $i++)
+			{
+				$match[$i] = '1';
+			}
+
+			for ($i = count($match); $i <= 7; $i++)
+			{
+				$match[$i] = '0';
+			}
+
+			// Numeric timezone
+			if (isset($match[9]) && $match[9] !== '')
+			{
+				$timezone = $match[10] * 3600;
+				$timezone += $match[11] * 60;
+				if ($match[9] === '-')
+				{
+					$timezone = 0 - $timezone;
+				}
+			}
+			else
+			{
+				$timezone = 0;
+			}
+
+			// Convert the number of seconds to an integer, taking decimals into account
+			$second = round((int)$match[6] + (int)$match[7] / pow(10, strlen($match[7])));
+
+			return gmmktime($match[4], $match[5], $second, $match[2], $match[3], $match[1]) - $timezone;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Remove RFC822 comments
+	 *
+	 * @access protected
+	 * @param string $data Data to strip comments from
+	 * @return string Comment stripped string
+	 */
+	public function remove_rfc2822_comments($string)
+	{
+		$string = (string) $string;
+		$position = 0;
+		$length = strlen($string);
+		$depth = 0;
+
+		$output = '';
+
+		while ($position < $length && ($pos = strpos($string, '(', $position)) !== false)
+		{
+			$output .= substr($string, $position, $pos - $position);
+			$position = $pos + 1;
+			if ($pos === 0 || $string[$pos - 1] !== '\\')
+			{
+				$depth++;
+				while ($depth && $position < $length)
+				{
+					$position += strcspn($string, '()', $position);
+					if ($string[$position - 1] === '\\')
+					{
+						$position++;
+						continue;
+					}
+					elseif (isset($string[$position]))
+					{
+						switch ($string[$position])
+						{
+							case '(':
+								$depth++;
+								break;
+
+							case ')':
+								$depth--;
+								break;
+						}
+						$position++;
+					}
+					else
+					{
+						break;
+					}
+				}
+			}
+			else
+			{
+				$output .= '(';
+			}
+		}
+		$output .= substr($string, $position);
+
+		return $output;
+	}
+
+	/**
+	 * Parse RFC2822's date format
+	 *
+	 * @access protected
+	 * @return int Timestamp
+	 */
+	public function date_rfc2822($date)
+	{
+		static $pcre;
+		if (!$pcre)
+		{
+			$wsp = '[\x09\x20]';
+			$fws = '(?:' . $wsp . '+|' . $wsp . '*(?:\x0D\x0A' . $wsp . '+)+)';
+			$optional_fws = $fws . '?';
+			$day_name = $this->day_pcre;
+			$month = $this->month_pcre;
+			$day = '([0-9]{1,2})';
+			$hour = $minute = $second = '([0-9]{2})';
+			$year = '([0-9]{2,4})';
+			$num_zone = '([+\-])([0-9]{2})([0-9]{2})';
+			$character_zone = '([A-Z]{1,5})';
+			$zone = '(?:' . $num_zone . '|' . $character_zone . ')';
+			$pcre = '/(?:' . $optional_fws . $day_name . $optional_fws . ',)?' . $optional_fws . $day . $fws . $month . $fws . $year . $fws . $hour . $optional_fws . ':' . $optional_fws . $minute . '(?:' . $optional_fws . ':' . $optional_fws . $second . ')?' . $fws . $zone . '/i';
+		}
+		if (preg_match($pcre, $this->remove_rfc2822_comments($date), $match))
+		{
+			/*
+			Capturing subpatterns:
+			1: Day name
+			2: Day
+			3: Month
+			4: Year
+			5: Hour
+			6: Minute
+			7: Second
+			8: Timezone ±
+			9: Timezone hours
+			10: Timezone minutes
+			11: Alphabetic timezone
+			*/
+
+			// Find the month number
+			$month = $this->month[strtolower($match[3])];
+
+			// Numeric timezone
+			if ($match[8] !== '')
+			{
+				$timezone = $match[9] * 3600;
+				$timezone += $match[10] * 60;
+				if ($match[8] === '-')
+				{
+					$timezone = 0 - $timezone;
+				}
+			}
+			// Character timezone
+			elseif (isset($this->timezone[strtoupper($match[11])]))
+			{
+				$timezone = $this->timezone[strtoupper($match[11])];
+			}
+			// Assume everything else to be -0000
+			else
+			{
+				$timezone = 0;
+			}
+
+			// Deal with 2/3 digit years
+			if ($match[4] < 50)
+			{
+				$match[4] += 2000;
+			}
+			elseif ($match[4] < 1000)
+			{
+				$match[4] += 1900;
+			}
+
+			// Second is optional, if it is empty set it to zero
+			if ($match[7] !== '')
+			{
+				$second = $match[7];
+			}
+			else
+			{
+				$second = 0;
+			}
+
+			return gmmktime($match[5], $match[6], $second, $month, $match[2], $match[4]) - $timezone;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Parse RFC850's date format
+	 *
+	 * @access protected
+	 * @return int Timestamp
+	 */
+	public function date_rfc850($date)
+	{
+		static $pcre;
+		if (!$pcre)
+		{
+			$space = '[\x09\x20]+';
+			$day_name = $this->day_pcre;
+			$month = $this->month_pcre;
+			$day = '([0-9]{1,2})';
+			$year = $hour = $minute = $second = '([0-9]{2})';
+			$zone = '([A-Z]{1,5})';
+			$pcre = '/^' . $day_name . ',' . $space . $day . '-' . $month . '-' . $year . $space . $hour . ':' . $minute . ':' . $second . $space . $zone . '$/i';
+		}
+		if (preg_match($pcre, $date, $match))
+		{
+			/*
+			Capturing subpatterns:
+			1: Day name
+			2: Day
+			3: Month
+			4: Year
+			5: Hour
+			6: Minute
+			7: Second
+			8: Timezone
+			*/
+
+			// Month
+			$month = $this->month[strtolower($match[3])];
+
+			// Character timezone
+			if (isset($this->timezone[strtoupper($match[8])]))
+			{
+				$timezone = $this->timezone[strtoupper($match[8])];
+			}
+			// Assume everything else to be -0000
+			else
+			{
+				$timezone = 0;
+			}
+
+			// Deal with 2 digit year
+			if ($match[4] < 50)
+			{
+				$match[4] += 2000;
+			}
+			else
+			{
+				$match[4] += 1900;
+			}
+
+			return gmmktime($match[5], $match[6], $match[7], $month, $match[2], $match[4]) - $timezone;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Parse C99's asctime()'s date format
+	 *
+	 * @access protected
+	 * @return int Timestamp
+	 */
+	public function date_asctime($date)
+	{
+		static $pcre;
+		if (!$pcre)
+		{
+			$space = '[\x09\x20]+';
+			$wday_name = $this->day_pcre;
+			$mon_name = $this->month_pcre;
+			$day = '([0-9]{1,2})';
+			$hour = $sec = $min = '([0-9]{2})';
+			$year = '([0-9]{4})';
+			$terminator = '\x0A?\x00?';
+			$pcre = '/^' . $wday_name . $space . $mon_name . $space . $day . $space . $hour . ':' . $min . ':' . $sec . $space . $year . $terminator . '$/i';
+		}
+		if (preg_match($pcre, $date, $match))
+		{
+			/*
+			Capturing subpatterns:
+			1: Day name
+			2: Month
+			3: Day
+			4: Hour
+			5: Minute
+			6: Second
+			7: Year
+			*/
+
+			$month = $this->month[strtolower($match[2])];
+			return gmmktime($match[4], $match[5], $match[6], $month, $match[3], $match[7]);
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Parse dates using strtotime()
+	 *
+	 * @access protected
+	 * @return int Timestamp
+	 */
+	public function date_strtotime($date)
+	{
+		$strtotime = strtotime($date);
+		if ($strtotime === -1 || $strtotime === false)
+		{
+			return false;
+		}
+		else
+		{
+			return $strtotime;
+		}
+	}
+}
+
diff --git a/lib/vendor/simplepie/SimplePie/Parser.php b/lib/vendor/simplepie/SimplePie/Parser.php
new file mode 100644
index 000000000..17139abe9
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Parser.php
@@ -0,0 +1,656 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Parses XML into something sane
+ *
+ *
+ * This class can be overloaded with {@see SimplePie::set_parser_class()}
+ *
+ * @package SimplePie
+ * @subpackage Parsing
+ */
+class SimplePie_Parser
+{
+	var $error_code;
+	var $error_string;
+	var $current_line;
+	var $current_column;
+	var $current_byte;
+	var $separator = ' ';
+	var $namespace = array('');
+	var $element = array('');
+	var $xml_base = array('');
+	var $xml_base_explicit = array(false);
+	var $xml_lang = array('');
+	var $data = array();
+	var $datas = array(array());
+	var $current_xhtml_construct = -1;
+	var $encoding;
+	protected $registry;
+
+	public function set_registry(SimplePie_Registry $registry)
+	{
+		$this->registry = $registry;
+	}
+
+	public function parse(&$data, $encoding, $url = '')
+	{
+		if (function_exists('Mf2\parse')) {
+			// Check for both h-feed and h-entry, as both a feed with no entries
+			// and a list of entries without an h-feed wrapper are both valid.
+			$position = 0;
+			while ($position = strpos($data, 'h-feed', $position)) {
+				$start = $position < 200 ? 0 : $position - 200;
+				$check = substr($data, $start, 400);
+				if (preg_match('/class="[^"]*h-feed/', $check)) {
+					return $this->parse_microformats($data, $url);
+				}
+				$position += 7;
+			}
+			$position = 0;
+			while ($position = strpos($data, 'h-entry', $position)) {
+				$start = $position < 200 ? 0 : $position - 200;
+				$check = substr($data, $start, 400);
+				if (preg_match('/class="[^"]*h-entry/', $check)) {
+					return $this->parse_microformats($data, $url);
+				}
+				$position += 7;
+			}
+		}
+
+		// Use UTF-8 if we get passed US-ASCII, as every US-ASCII character is a UTF-8 character
+		if (strtoupper($encoding) === 'US-ASCII')
+		{
+			$this->encoding = 'UTF-8';
+		}
+		else
+		{
+			$this->encoding = $encoding;
+		}
+
+		// Strip BOM:
+		// UTF-32 Big Endian BOM
+		if (substr($data, 0, 4) === "\x00\x00\xFE\xFF")
+		{
+			$data = substr($data, 4);
+		}
+		// UTF-32 Little Endian BOM
+		elseif (substr($data, 0, 4) === "\xFF\xFE\x00\x00")
+		{
+			$data = substr($data, 4);
+		}
+		// UTF-16 Big Endian BOM
+		elseif (substr($data, 0, 2) === "\xFE\xFF")
+		{
+			$data = substr($data, 2);
+		}
+		// UTF-16 Little Endian BOM
+		elseif (substr($data, 0, 2) === "\xFF\xFE")
+		{
+			$data = substr($data, 2);
+		}
+		// UTF-8 BOM
+		elseif (substr($data, 0, 3) === "\xEF\xBB\xBF")
+		{
+			$data = substr($data, 3);
+		}
+
+		if (substr($data, 0, 5) === '<?xml' && strspn(substr($data, 5, 1), "\x09\x0A\x0D\x20") && ($pos = strpos($data, '?>')) !== false)
+		{
+			$declaration = $this->registry->create('XML_Declaration_Parser', array(substr($data, 5, $pos - 5)));
+			if ($declaration->parse())
+			{
+				$data = substr($data, $pos + 2);
+				$data = '<?xml version="' . $declaration->version . '" encoding="' . $encoding . '" standalone="' . (($declaration->standalone) ? 'yes' : 'no') . '"?>' ."\n". $this->declare_html_entities() . $data;
+			}
+			else
+			{
+				$this->error_string = 'SimplePie bug! Please report this!';
+				return false;
+			}
+		}
+
+		$return = true;
+
+		static $xml_is_sane = null;
+		if ($xml_is_sane === null)
+		{
+			$parser_check = xml_parser_create();
+			xml_parse_into_struct($parser_check, '<foo>&amp;</foo>', $values);
+			xml_parser_free($parser_check);
+			$xml_is_sane = isset($values[0]['value']);
+		}
+
+		// Create the parser
+		if ($xml_is_sane)
+		{
+			$xml = xml_parser_create_ns($this->encoding, $this->separator);
+			xml_parser_set_option($xml, XML_OPTION_SKIP_WHITE, 1);
+			xml_parser_set_option($xml, XML_OPTION_CASE_FOLDING, 0);
+			xml_set_object($xml, $this);
+			xml_set_character_data_handler($xml, 'cdata');
+			xml_set_element_handler($xml, 'tag_open', 'tag_close');
+
+			// Parse!
+			if (!xml_parse($xml, $data, true))
+			{
+				$this->error_code = xml_get_error_code($xml);
+				$this->error_string = xml_error_string($this->error_code);
+				$return = false;
+			}
+			$this->current_line = xml_get_current_line_number($xml);
+			$this->current_column = xml_get_current_column_number($xml);
+			$this->current_byte = xml_get_current_byte_index($xml);
+			xml_parser_free($xml);
+			return $return;
+		}
+		else
+		{
+			libxml_clear_errors();
+			$xml = new XMLReader();
+			$xml->xml($data);
+			while (@$xml->read())
+			{
+				switch ($xml->nodeType)
+				{
+
+					case constant('XMLReader::END_ELEMENT'):
+						if ($xml->namespaceURI !== '')
+						{
+							$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
+						}
+						else
+						{
+							$tagName = $xml->localName;
+						}
+						$this->tag_close(null, $tagName);
+						break;
+					case constant('XMLReader::ELEMENT'):
+						$empty = $xml->isEmptyElement;
+						if ($xml->namespaceURI !== '')
+						{
+							$tagName = $xml->namespaceURI . $this->separator . $xml->localName;
+						}
+						else
+						{
+							$tagName = $xml->localName;
+						}
+						$attributes = array();
+						while ($xml->moveToNextAttribute())
+						{
+							if ($xml->namespaceURI !== '')
+							{
+								$attrName = $xml->namespaceURI . $this->separator . $xml->localName;
+							}
+							else
+							{
+								$attrName = $xml->localName;
+							}
+							$attributes[$attrName] = $xml->value;
+						}
+						$this->tag_open(null, $tagName, $attributes);
+						if ($empty)
+						{
+							$this->tag_close(null, $tagName);
+						}
+						break;
+					case constant('XMLReader::TEXT'):
+
+					case constant('XMLReader::CDATA'):
+						$this->cdata(null, $xml->value);
+						break;
+				}
+			}
+			if ($error = libxml_get_last_error())
+			{
+				$this->error_code = $error->code;
+				$this->error_string = $error->message;
+				$this->current_line = $error->line;
+				$this->current_column = $error->column;
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+	}
+
+	public function get_error_code()
+	{
+		return $this->error_code;
+	}
+
+	public function get_error_string()
+	{
+		return $this->error_string;
+	}
+
+	public function get_current_line()
+	{
+		return $this->current_line;
+	}
+
+	public function get_current_column()
+	{
+		return $this->current_column;
+	}
+
+	public function get_current_byte()
+	{
+		return $this->current_byte;
+	}
+
+	public function get_data()
+	{
+		return $this->data;
+	}
+
+	public function tag_open($parser, $tag, $attributes)
+	{
+		list($this->namespace[], $this->element[]) = $this->split_ns($tag);
+
+		$attribs = array();
+		foreach ($attributes as $name => $value)
+		{
+			list($attrib_namespace, $attribute) = $this->split_ns($name);
+			$attribs[$attrib_namespace][$attribute] = $value;
+		}
+
+		if (isset($attribs[SIMPLEPIE_NAMESPACE_XML]['base']))
+		{
+			$base = $this->registry->call('Misc', 'absolutize_url', array($attribs[SIMPLEPIE_NAMESPACE_XML]['base'], end($this->xml_base)));
+			if ($base !== false)
+			{
+				$this->xml_base[] = $base;
+				$this->xml_base_explicit[] = true;
+			}
+		}
+		else
+		{
+			$this->xml_base[] = end($this->xml_base);
+			$this->xml_base_explicit[] = end($this->xml_base_explicit);
+		}
+
+		if (isset($attribs[SIMPLEPIE_NAMESPACE_XML]['lang']))
+		{
+			$this->xml_lang[] = $attribs[SIMPLEPIE_NAMESPACE_XML]['lang'];
+		}
+		else
+		{
+			$this->xml_lang[] = end($this->xml_lang);
+		}
+
+		if ($this->current_xhtml_construct >= 0)
+		{
+			$this->current_xhtml_construct++;
+			if (end($this->namespace) === SIMPLEPIE_NAMESPACE_XHTML)
+			{
+				$this->data['data'] .= '<' . end($this->element);
+				if (isset($attribs['']))
+				{
+					foreach ($attribs[''] as $name => $value)
+					{
+						$this->data['data'] .= ' ' . $name . '="' . htmlspecialchars($value, ENT_COMPAT, $this->encoding) . '"';
+					}
+				}
+				$this->data['data'] .= '>';
+			}
+		}
+		else
+		{
+			$this->datas[] =& $this->data;
+			$this->data =& $this->data['child'][end($this->namespace)][end($this->element)][];
+			$this->data = array('data' => '', 'attribs' => $attribs, 'xml_base' => end($this->xml_base), 'xml_base_explicit' => end($this->xml_base_explicit), 'xml_lang' => end($this->xml_lang));
+			if ((end($this->namespace) === SIMPLEPIE_NAMESPACE_ATOM_03 && in_array(end($this->element), array('title', 'tagline', 'copyright', 'info', 'summary', 'content')) && isset($attribs['']['mode']) && $attribs['']['mode'] === 'xml')
+			|| (end($this->namespace) === SIMPLEPIE_NAMESPACE_ATOM_10 && in_array(end($this->element), array('rights', 'subtitle', 'summary', 'info', 'title', 'content')) && isset($attribs['']['type']) && $attribs['']['type'] === 'xhtml')
+			|| (end($this->namespace) === SIMPLEPIE_NAMESPACE_RSS_20 && in_array(end($this->element), array('title')))
+			|| (end($this->namespace) === SIMPLEPIE_NAMESPACE_RSS_090 && in_array(end($this->element), array('title')))
+			|| (end($this->namespace) === SIMPLEPIE_NAMESPACE_RSS_10 && in_array(end($this->element), array('title'))))
+			{
+				$this->current_xhtml_construct = 0;
+			}
+		}
+	}
+
+	public function cdata($parser, $cdata)
+	{
+		if ($this->current_xhtml_construct >= 0)
+		{
+			$this->data['data'] .= htmlspecialchars($cdata, ENT_QUOTES, $this->encoding);
+		}
+		else
+		{
+			$this->data['data'] .= $cdata;
+		}
+	}
+
+	public function tag_close($parser, $tag)
+	{
+		if ($this->current_xhtml_construct >= 0)
+		{
+			$this->current_xhtml_construct--;
+			if (end($this->namespace) === SIMPLEPIE_NAMESPACE_XHTML && !in_array(end($this->element), array('area', 'base', 'basefont', 'br', 'col', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param')))
+			{
+				$this->data['data'] .= '</' . end($this->element) . '>';
+			}
+		}
+		if ($this->current_xhtml_construct === -1)
+		{
+			$this->data =& $this->datas[count($this->datas) - 1];
+			array_pop($this->datas);
+		}
+
+		array_pop($this->element);
+		array_pop($this->namespace);
+		array_pop($this->xml_base);
+		array_pop($this->xml_base_explicit);
+		array_pop($this->xml_lang);
+	}
+
+	public function split_ns($string)
+	{
+		static $cache = array();
+		if (!isset($cache[$string]))
+		{
+			if ($pos = strpos($string, $this->separator))
+			{
+				static $separator_length;
+				if (!$separator_length)
+				{
+					$separator_length = strlen($this->separator);
+				}
+				$namespace = substr($string, 0, $pos);
+				$local_name = substr($string, $pos + $separator_length);
+				if (strtolower($namespace) === SIMPLEPIE_NAMESPACE_ITUNES)
+				{
+					$namespace = SIMPLEPIE_NAMESPACE_ITUNES;
+				}
+
+				// Normalize the Media RSS namespaces
+				if ($namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG ||
+					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG2 ||
+					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG3 ||
+					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG4 ||
+					$namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG5 )
+				{
+					$namespace = SIMPLEPIE_NAMESPACE_MEDIARSS;
+				}
+				$cache[$string] = array($namespace, $local_name);
+			}
+			else
+			{
+				$cache[$string] = array('', $string);
+			}
+		}
+		return $cache[$string];
+	}
+
+	private function parse_hcard($data, $category = false) {
+		$name = '';
+		$link = '';
+		// Check if h-card is set and pass that information on in the link.
+		if (isset($data['type']) && in_array('h-card', $data['type'])) {
+			if (isset($data['properties']['name'][0])) {
+				$name = $data['properties']['name'][0];
+			}
+			if (isset($data['properties']['url'][0])) {
+				$link = $data['properties']['url'][0];
+				if ($name === '') {
+					$name = $link;
+				}
+				else {
+					// can't have commas in categories.
+					$name = str_replace(',', '', $name);
+				}
+				$person_tag = $category ? '<span class="person-tag"></span>' : '';
+				return '<a class="h-card" href="'.$link.'">'.$person_tag.$name.'</a>';
+			}
+		}
+		return isset($data['value']) ? $data['value'] : '';
+	}
+
+	private function parse_microformats(&$data, $url) {
+		$feed_title = '';
+		$feed_author = NULL;
+		$author_cache = array();
+		$items = array();
+		$entries = array();
+		$mf = Mf2\parse($data, $url);
+		// First look for an h-feed.
+		$h_feed = array();
+		foreach ($mf['items'] as $mf_item) {
+			if (in_array('h-feed', $mf_item['type'])) {
+				$h_feed = $mf_item;
+				break;
+			}
+			// Also look for an h-feed in the children of each top level item.
+			if (!isset($mf_item['children'][0]['type'])) continue;
+			if (in_array('h-feed', $mf_item['children'][0]['type'])) {
+				$h_feed = $mf_item['children'][0];
+				// In this case the parent of the h-feed may be an h-card, so use it as
+				// the feed_author.
+				if (in_array('h-card', $mf_item['type'])) $feed_author = $mf_item;
+				break;
+			}
+		}
+		if (isset($h_feed['children'])) {
+			$entries = $h_feed['children'];
+			// Also set the feed title and store author from the h-feed if available.
+			if (isset($mf['items'][0]['properties']['name'][0])) {
+				$feed_title = $mf['items'][0]['properties']['name'][0];
+			}
+			if (isset($mf['items'][0]['properties']['author'][0])) {
+				$feed_author = $mf['items'][0]['properties']['author'][0];
+			}
+		}
+		else {
+			$entries = $mf['items'];
+		}
+		for ($i = 0; $i < count($entries); $i++) {
+			$entry = $entries[$i];
+			if (in_array('h-entry', $entry['type'])) {
+				$item = array();
+				$title = '';
+				$description = '';
+				if (isset($entry['properties']['url'][0])) {
+					$link = $entry['properties']['url'][0];
+					if (isset($link['value'])) $link = $link['value'];
+					$item['link'] = array(array('data' => $link));
+				}
+				if (isset($entry['properties']['uid'][0])) {
+					$guid = $entry['properties']['uid'][0];
+					if (isset($guid['value'])) $guid = $guid['value'];
+					$item['guid'] = array(array('data' => $guid));
+				}
+				if (isset($entry['properties']['name'][0])) {
+					$title = $entry['properties']['name'][0];
+					if (isset($title['value'])) $title = $title['value'];
+					$item['title'] = array(array('data' => $title));
+				}
+				if (isset($entry['properties']['author'][0]) || isset($feed_author)) {
+					// author is a special case, it can be plain text or an h-card array.
+					// If it's plain text it can also be a url that should be followed to
+					// get the actual h-card.
+					$author = isset($entry['properties']['author'][0]) ?
+						$entry['properties']['author'][0] : $feed_author;
+					if (!is_string($author)) {
+						$author = $this->parse_hcard($author);
+					}
+					else if (strpos($author, 'http') === 0) {
+						if (isset($author_cache[$author])) {
+							$author = $author_cache[$author];
+						}
+						else {
+							$mf = Mf2\fetch($author);
+							foreach ($mf['items'] as $hcard) {
+								// Only interested in an h-card by itself in this case.
+								if (!in_array('h-card', $hcard['type'])) {
+									continue;
+								}
+								// It must have a url property matching what we fetched.
+								if (!isset($hcard['properties']['url']) ||
+										!(in_array($author, $hcard['properties']['url']))) {
+									continue;
+								}
+								// Save parse_hcard the trouble of finding the correct url.
+								$hcard['properties']['url'][0] = $author;
+								// Cache this h-card for the next h-entry to check.
+								$author_cache[$author] = $this->parse_hcard($hcard);
+								$author = $author_cache[$author];
+								break;
+							}
+						}
+					}
+					$item['author'] = array(array('data' => $author));
+				}
+				if (isset($entry['properties']['photo'][0])) {
+					// If a photo is also in content, don't need to add it again here.
+					$content = '';
+					if (isset($entry['properties']['content'][0]['html'])) {
+						$content = $entry['properties']['content'][0]['html'];
+					}
+					$photo_list = array();
+					for ($j = 0; $j < count($entry['properties']['photo']); $j++) {
+						$photo = $entry['properties']['photo'][$j];
+						if (strpos($content, $photo) === false) {
+							$photo_list[] = $photo;
+						}
+					}
+					// When there's more than one photo show the first and use a lightbox.
+					$count = count($photo_list);
+					if ($count > 1) {
+						$description = '<p>';
+						for ($j = 0; $j < $count; $j++) {
+							$hidden = $j === 0 ? '' : 'class="hidden" ';
+							$description .= '<a href="'.$photo_list[$j].'" '.$hidden.
+								'data-lightbox="image-set-'.$i.'">'.
+								'<img src="'.$photo_list[$j].'"></a>';
+						}
+						$description .= '<br><b>'.$count.' photos</b></p>';
+					}
+					else if ($count == 1) {
+						$description = '<p><img src="'.$photo_list[0].'"></p>';
+					}
+				}
+				if (isset($entry['properties']['content'][0]['html'])) {
+					// e-content['value'] is the same as p-name when they are on the same
+					// element. Use this to replace title with a strip_tags version so
+					// that alt text from images is not included in the title.
+					if ($entry['properties']['content'][0]['value'] === $title) {
+						$title = strip_tags($entry['properties']['content'][0]['html']);
+						$item['title'] = array(array('data' => $title));
+					}
+					$description .= $entry['properties']['content'][0]['html'];
+					if (isset($entry['properties']['in-reply-to'][0]['value'])) {
+						$in_reply_to = $entry['properties']['in-reply-to'][0]['value'];
+						$description .= '<p><span class="in-reply-to"></span> '.
+							'<a href="'.$in_reply_to.'">'.$in_reply_to.'</a><p>';
+					}
+					$item['description'] = array(array('data' => $description));
+				}
+				if (isset($entry['properties']['category'])) {
+					$category_csv = '';
+					// Categories can also contain h-cards.
+					foreach ($entry['properties']['category'] as $category) {
+						if ($category_csv !== '') $category_csv .= ', ';
+						if (is_string($category)) {
+							// Can't have commas in categories.
+							$category_csv .= str_replace(',', '', $category);
+						}
+						else {
+							$category_csv .= $this->parse_hcard($category, true);
+						}
+					}
+					$item['category'] = array(array('data' => $category_csv));
+				}
+				if (isset($entry['properties']['published'][0])) {
+					$timestamp = strtotime($entry['properties']['published'][0]);
+					$pub_date = date('F j Y g:ia', $timestamp).' GMT';
+					$item['pubDate'] = array(array('data' => $pub_date));
+				}
+				// The title and description are set to the empty string to represent
+				// a deleted item (which also makes it an invalid rss item).
+				if (isset($entry['properties']['deleted'][0])) {
+					$item['title'] = array(array('data' => ''));
+					$item['description'] = array(array('data' => ''));
+				}
+				$items[] = array('child' => array('' => $item));
+			}
+		}
+		// Mimic RSS data format when storing microformats.
+		$link = array(array('data' => $url));
+		$image = '';
+		if (!is_string($feed_author) &&
+				isset($feed_author['properties']['photo'][0])) {
+			$image = array(array('child' => array('' => array('url' =>
+				array(array('data' => $feed_author['properties']['photo'][0]))))));
+		}
+		// Use the a name given for the h-feed, or get the title from the html.
+		if ($feed_title !== '') {
+			$feed_title = array(array('data' => htmlspecialchars($feed_title)));
+		}
+		else if ($position = strpos($data, '<title>')) {
+			$start = $position < 200 ? 0 : $position - 200;
+			$check = substr($data, $start, 400);
+			$matches = array();
+			if (preg_match('/<title>(.+)<\/title>/', $check, $matches)) {
+				$feed_title = array(array('data' => htmlspecialchars($matches[1])));
+			}
+		}
+		$channel = array('channel' => array(array('child' => array('' =>
+			array('link' => $link, 'image' => $image, 'title' => $feed_title,
+			      'item' => $items)))));
+		$rss = array(array('attribs' => array('' => array('version' => '2.0')),
+		                   'child' => array('' => $channel)));
+		$this->data = array('child' => array('' => array('rss' => $rss)));
+		return true;
+	}
+
+	private function declare_html_entities() {
+		// This is required because the RSS specification says that entity-encoded
+		// html is allowed, but the xml specification says they must be declared.
+		return '<!DOCTYPE html [ <!ENTITY nbsp "&#x00A0;"> <!ENTITY iexcl "&#x00A1;"> <!ENTITY cent "&#x00A2;"> <!ENTITY pound "&#x00A3;"> <!ENTITY curren "&#x00A4;"> <!ENTITY yen "&#x00A5;"> <!ENTITY brvbar "&#x00A6;"> <!ENTITY sect "&#x00A7;"> <!ENTITY uml "&#x00A8;"> <!ENTITY copy "&#x00A9;"> <!ENTITY ordf "&#x00AA;"> <!ENTITY laquo "&#x00AB;"> <!ENTITY not "&#x00AC;"> <!ENTITY shy "&#x00AD;"> <!ENTITY reg "&#x00AE;"> <!ENTITY macr "&#x00AF;"> <!ENTITY deg "&#x00B0;"> <!ENTITY plusmn "&#x00B1;"> <!ENTITY sup2 "&#x00B2;"> <!ENTITY sup3 "&#x00B3;"> <!ENTITY acute "&#x00B4;"> <!ENTITY micro "&#x00B5;"> <!ENTITY para "&#x00B6;"> <!ENTITY middot "&#x00B7;"> <!ENTITY cedil "&#x00B8;"> <!ENTITY sup1 "&#x00B9;"> <!ENTITY ordm "&#x00BA;"> <!ENTITY raquo "&#x00BB;"> <!ENTITY frac14 "&#x00BC;"> <!ENTITY frac12 "&#x00BD;"> <!ENTITY frac34 "&#x00BE;"> <!ENTITY iquest "&#x00BF;"> <!ENTITY Agrave "&#x00C0;"> <!ENTITY Aacute "&#x00C1;"> <!ENTITY Acirc "&#x00C2;"> <!ENTITY Atilde "&#x00C3;"> <!ENTITY Auml "&#x00C4;"> <!ENTITY Aring "&#x00C5;"> <!ENTITY AElig "&#x00C6;"> <!ENTITY Ccedil "&#x00C7;"> <!ENTITY Egrave "&#x00C8;"> <!ENTITY Eacute "&#x00C9;"> <!ENTITY Ecirc "&#x00CA;"> <!ENTITY Euml "&#x00CB;"> <!ENTITY Igrave "&#x00CC;"> <!ENTITY Iacute "&#x00CD;"> <!ENTITY Icirc "&#x00CE;"> <!ENTITY Iuml "&#x00CF;"> <!ENTITY ETH "&#x00D0;"> <!ENTITY Ntilde "&#x00D1;"> <!ENTITY Ograve "&#x00D2;"> <!ENTITY Oacute "&#x00D3;"> <!ENTITY Ocirc "&#x00D4;"> <!ENTITY Otilde "&#x00D5;"> <!ENTITY Ouml "&#x00D6;"> <!ENTITY times "&#x00D7;"> <!ENTITY Oslash "&#x00D8;"> <!ENTITY Ugrave "&#x00D9;"> <!ENTITY Uacute "&#x00DA;"> <!ENTITY Ucirc "&#x00DB;"> <!ENTITY Uuml "&#x00DC;"> <!ENTITY Yacute "&#x00DD;"> <!ENTITY THORN "&#x00DE;"> <!ENTITY szlig "&#x00DF;"> <!ENTITY agrave "&#x00E0;"> <!ENTITY aacute "&#x00E1;"> <!ENTITY acirc "&#x00E2;"> <!ENTITY atilde "&#x00E3;"> <!ENTITY auml "&#x00E4;"> <!ENTITY aring "&#x00E5;"> <!ENTITY aelig "&#x00E6;"> <!ENTITY ccedil "&#x00E7;"> <!ENTITY egrave "&#x00E8;"> <!ENTITY eacute "&#x00E9;"> <!ENTITY ecirc "&#x00EA;"> <!ENTITY euml "&#x00EB;"> <!ENTITY igrave "&#x00EC;"> <!ENTITY iacute "&#x00ED;"> <!ENTITY icirc "&#x00EE;"> <!ENTITY iuml "&#x00EF;"> <!ENTITY eth "&#x00F0;"> <!ENTITY ntilde "&#x00F1;"> <!ENTITY ograve "&#x00F2;"> <!ENTITY oacute "&#x00F3;"> <!ENTITY ocirc "&#x00F4;"> <!ENTITY otilde "&#x00F5;"> <!ENTITY ouml "&#x00F6;"> <!ENTITY divide "&#x00F7;"> <!ENTITY oslash "&#x00F8;"> <!ENTITY ugrave "&#x00F9;"> <!ENTITY uacute "&#x00FA;"> <!ENTITY ucirc "&#x00FB;"> <!ENTITY uuml "&#x00FC;"> <!ENTITY yacute "&#x00FD;"> <!ENTITY thorn "&#x00FE;"> <!ENTITY yuml "&#x00FF;"> <!ENTITY OElig "&#x0152;"> <!ENTITY oelig "&#x0153;"> <!ENTITY Scaron "&#x0160;"> <!ENTITY scaron "&#x0161;"> <!ENTITY Yuml "&#x0178;"> <!ENTITY fnof "&#x0192;"> <!ENTITY circ "&#x02C6;"> <!ENTITY tilde "&#x02DC;"> <!ENTITY Alpha "&#x0391;"> <!ENTITY Beta "&#x0392;"> <!ENTITY Gamma "&#x0393;"> <!ENTITY Epsilon "&#x0395;"> <!ENTITY Zeta "&#x0396;"> <!ENTITY Eta "&#x0397;"> <!ENTITY Theta "&#x0398;"> <!ENTITY Iota "&#x0399;"> <!ENTITY Kappa "&#x039A;"> <!ENTITY Lambda "&#x039B;"> <!ENTITY Mu "&#x039C;"> <!ENTITY Nu "&#x039D;"> <!ENTITY Xi "&#x039E;"> <!ENTITY Omicron "&#x039F;"> <!ENTITY Pi "&#x03A0;"> <!ENTITY Rho "&#x03A1;"> <!ENTITY Sigma "&#x03A3;"> <!ENTITY Tau "&#x03A4;"> <!ENTITY Upsilon "&#x03A5;"> <!ENTITY Phi "&#x03A6;"> <!ENTITY Chi "&#x03A7;"> <!ENTITY Psi "&#x03A8;"> <!ENTITY Omega "&#x03A9;"> <!ENTITY alpha "&#x03B1;"> <!ENTITY beta "&#x03B2;"> <!ENTITY gamma "&#x03B3;"> <!ENTITY delta "&#x03B4;"> <!ENTITY epsilon "&#x03B5;"> <!ENTITY zeta "&#x03B6;"> <!ENTITY eta "&#x03B7;"> <!ENTITY theta "&#x03B8;"> <!ENTITY iota "&#x03B9;"> <!ENTITY kappa "&#x03BA;"> <!ENTITY lambda "&#x03BB;"> <!ENTITY mu "&#x03BC;"> <!ENTITY nu "&#x03BD;"> <!ENTITY xi "&#x03BE;"> <!ENTITY omicron "&#x03BF;"> <!ENTITY pi "&#x03C0;"> <!ENTITY rho "&#x03C1;"> <!ENTITY sigmaf "&#x03C2;"> <!ENTITY sigma "&#x03C3;"> <!ENTITY tau "&#x03C4;"> <!ENTITY upsilon "&#x03C5;"> <!ENTITY phi "&#x03C6;"> <!ENTITY chi "&#x03C7;"> <!ENTITY psi "&#x03C8;"> <!ENTITY omega "&#x03C9;"> <!ENTITY thetasym "&#x03D1;"> <!ENTITY upsih "&#x03D2;"> <!ENTITY piv "&#x03D6;"> <!ENTITY ensp "&#x2002;"> <!ENTITY emsp "&#x2003;"> <!ENTITY thinsp "&#x2009;"> <!ENTITY zwnj "&#x200C;"> <!ENTITY zwj "&#x200D;"> <!ENTITY lrm "&#x200E;"> <!ENTITY rlm "&#x200F;"> <!ENTITY ndash "&#x2013;"> <!ENTITY mdash "&#x2014;"> <!ENTITY lsquo "&#x2018;"> <!ENTITY rsquo "&#x2019;"> <!ENTITY sbquo "&#x201A;"> <!ENTITY ldquo "&#x201C;"> <!ENTITY rdquo "&#x201D;"> <!ENTITY bdquo "&#x201E;"> <!ENTITY dagger "&#x2020;"> <!ENTITY Dagger "&#x2021;"> <!ENTITY bull "&#x2022;"> <!ENTITY hellip "&#x2026;"> <!ENTITY permil "&#x2030;"> <!ENTITY prime "&#x2032;"> <!ENTITY Prime "&#x2033;"> <!ENTITY lsaquo "&#x2039;"> <!ENTITY rsaquo "&#x203A;"> <!ENTITY oline "&#x203E;"> <!ENTITY frasl "&#x2044;"> <!ENTITY euro "&#x20AC;"> <!ENTITY image "&#x2111;"> <!ENTITY weierp "&#x2118;"> <!ENTITY real "&#x211C;"> <!ENTITY trade "&#x2122;"> <!ENTITY alefsym "&#x2135;"> <!ENTITY larr "&#x2190;"> <!ENTITY uarr "&#x2191;"> <!ENTITY rarr "&#x2192;"> <!ENTITY darr "&#x2193;"> <!ENTITY harr "&#x2194;"> <!ENTITY crarr "&#x21B5;"> <!ENTITY lArr "&#x21D0;"> <!ENTITY uArr "&#x21D1;"> <!ENTITY rArr "&#x21D2;"> <!ENTITY dArr "&#x21D3;"> <!ENTITY hArr "&#x21D4;"> <!ENTITY forall "&#x2200;"> <!ENTITY part "&#x2202;"> <!ENTITY exist "&#x2203;"> <!ENTITY empty "&#x2205;"> <!ENTITY nabla "&#x2207;"> <!ENTITY isin "&#x2208;"> <!ENTITY notin "&#x2209;"> <!ENTITY ni "&#x220B;"> <!ENTITY prod "&#x220F;"> <!ENTITY sum "&#x2211;"> <!ENTITY minus "&#x2212;"> <!ENTITY lowast "&#x2217;"> <!ENTITY radic "&#x221A;"> <!ENTITY prop "&#x221D;"> <!ENTITY infin "&#x221E;"> <!ENTITY ang "&#x2220;"> <!ENTITY and "&#x2227;"> <!ENTITY or "&#x2228;"> <!ENTITY cap "&#x2229;"> <!ENTITY cup "&#x222A;"> <!ENTITY int "&#x222B;"> <!ENTITY there4 "&#x2234;"> <!ENTITY sim "&#x223C;"> <!ENTITY cong "&#x2245;"> <!ENTITY asymp "&#x2248;"> <!ENTITY ne "&#x2260;"> <!ENTITY equiv "&#x2261;"> <!ENTITY le "&#x2264;"> <!ENTITY ge "&#x2265;"> <!ENTITY sub "&#x2282;"> <!ENTITY sup "&#x2283;"> <!ENTITY nsub "&#x2284;"> <!ENTITY sube "&#x2286;"> <!ENTITY supe "&#x2287;"> <!ENTITY oplus "&#x2295;"> <!ENTITY otimes "&#x2297;"> <!ENTITY perp "&#x22A5;"> <!ENTITY sdot "&#x22C5;"> <!ENTITY lceil "&#x2308;"> <!ENTITY rceil "&#x2309;"> <!ENTITY lfloor "&#x230A;"> <!ENTITY rfloor "&#x230B;"> <!ENTITY lang "&#x2329;"> <!ENTITY rang "&#x232A;"> <!ENTITY loz "&#x25CA;"> <!ENTITY spades "&#x2660;"> <!ENTITY clubs "&#x2663;"> <!ENTITY hearts "&#x2665;"> <!ENTITY diams "&#x2666;"> ]>';
+	}
+}
\ No newline at end of file
diff --git a/lib/vendor/simplepie/SimplePie/Rating.php b/lib/vendor/simplepie/SimplePie/Rating.php
new file mode 100644
index 000000000..eaf57080c
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Rating.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Handles `<media:rating>` or `<itunes:explicit>` tags as defined in Media RSS and iTunes RSS respectively
+ *
+ * Used by {@see SimplePie_Enclosure::get_rating()} and {@see SimplePie_Enclosure::get_ratings()}
+ *
+ * This class can be overloaded with {@see SimplePie::set_rating_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie_Rating
+{
+	/**
+	 * Rating scheme
+	 *
+	 * @var string
+	 * @see get_scheme()
+	 */
+	var $scheme;
+
+	/**
+	 * Rating value
+	 *
+	 * @var string
+	 * @see get_value()
+	 */
+	var $value;
+
+	/**
+	 * Constructor, used to input the data
+	 *
+	 * For documentation on all the parameters, see the corresponding
+	 * properties and their accessors
+	 */
+	public function __construct($scheme = null, $value = null)
+	{
+		$this->scheme = $scheme;
+		$this->value = $value;
+	}
+
+	/**
+	 * String-ified version
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		// There is no $this->data here
+		return md5(serialize($this));
+	}
+
+	/**
+	 * Get the organizational scheme for the rating
+	 *
+	 * @return string|null
+	 */
+	public function get_scheme()
+	{
+		if ($this->scheme !== null)
+		{
+			return $this->scheme;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the value of the rating
+	 *
+	 * @return string|null
+	 */
+	public function get_value()
+	{
+		if ($this->value !== null)
+		{
+			return $this->value;
+		}
+		else
+		{
+			return null;
+		}
+	}
+}
diff --git a/lib/vendor/simplepie/SimplePie/Registry.php b/lib/vendor/simplepie/SimplePie/Registry.php
new file mode 100755
index 000000000..e0909bb74
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Registry.php
@@ -0,0 +1,224 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Handles creating objects and calling methods
+ *
+ * Access this via {@see SimplePie::get_registry()}
+ *
+ * @package SimplePie
+ */
+class SimplePie_Registry
+{
+	/**
+	 * Default class mapping
+	 *
+	 * Overriding classes *must* subclass these.
+	 *
+	 * @var array
+	 */
+	protected $default = array(
+		'Cache' => 'SimplePie_Cache',
+		'Locator' => 'SimplePie_Locator',
+		'Parser' => 'SimplePie_Parser',
+		'File' => 'SimplePie_File',
+		'Sanitize' => 'SimplePie_Sanitize',
+		'Item' => 'SimplePie_Item',
+		'Author' => 'SimplePie_Author',
+		'Category' => 'SimplePie_Category',
+		'Enclosure' => 'SimplePie_Enclosure',
+		'Caption' => 'SimplePie_Caption',
+		'Copyright' => 'SimplePie_Copyright',
+		'Credit' => 'SimplePie_Credit',
+		'Rating' => 'SimplePie_Rating',
+		'Restriction' => 'SimplePie_Restriction',
+		'Content_Type_Sniffer' => 'SimplePie_Content_Type_Sniffer',
+		'Source' => 'SimplePie_Source',
+		'Misc' => 'SimplePie_Misc',
+		'XML_Declaration_Parser' => 'SimplePie_XML_Declaration_Parser',
+		'Parse_Date' => 'SimplePie_Parse_Date',
+	);
+
+	/**
+	 * Class mapping
+	 *
+	 * @see register()
+	 * @var array
+	 */
+	protected $classes = array();
+
+	/**
+	 * Legacy classes
+	 *
+	 * @see register()
+	 * @var array
+	 */
+	protected $legacy = array();
+
+	/**
+	 * Constructor
+	 *
+	 * No-op
+	 */
+	public function __construct() { }
+
+	/**
+	 * Register a class
+	 *
+	 * @param string $type See {@see $default} for names
+	 * @param string $class Class name, must subclass the corresponding default
+	 * @param bool $legacy Whether to enable legacy support for this class
+	 * @return bool Successfulness
+	 */
+	public function register($type, $class, $legacy = false)
+	{
+		if (!@is_subclass_of($class, $this->default[$type]))
+		{
+			return false;
+		}
+
+		$this->classes[$type] = $class;
+
+		if ($legacy)
+		{
+			$this->legacy[] = $class;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get the class registered for a type
+	 *
+	 * Where possible, use {@see create()} or {@see call()} instead
+	 *
+	 * @param string $type
+	 * @return string|null
+	 */
+	public function get_class($type)
+	{
+		if (!empty($this->classes[$type]))
+		{
+			return $this->classes[$type];
+		}
+		if (!empty($this->default[$type]))
+		{
+			return $this->default[$type];
+		}
+
+		return null;
+	}
+
+	/**
+	 * Create a new instance of a given type
+	 *
+	 * @param string $type
+	 * @param array $parameters Parameters to pass to the constructor
+	 * @return object Instance of class
+	 */
+	public function &create($type, $parameters = array())
+	{
+		$class = $this->get_class($type);
+
+		if (in_array($class, $this->legacy))
+		{
+			switch ($type)
+			{
+				case 'locator':
+					// Legacy: file, timeout, useragent, file_class, max_checked_feeds, content_type_sniffer_class
+					// Specified: file, timeout, useragent, max_checked_feeds
+					$replacement = array($this->get_class('file'), $parameters[3], $this->get_class('content_type_sniffer'));
+					array_splice($parameters, 3, 1, $replacement);
+					break;
+			}
+		}
+
+		if (!method_exists($class, '__construct'))
+		{
+			$instance = new $class;
+		}
+		else
+		{
+			$reflector = new ReflectionClass($class);
+			$instance = $reflector->newInstanceArgs($parameters);
+		}
+
+		if (method_exists($instance, 'set_registry'))
+		{
+			$instance->set_registry($this);
+		}
+		return $instance;
+	}
+
+	/**
+	 * Call a static method for a type
+	 *
+	 * @param string $type
+	 * @param string $method
+	 * @param array $parameters
+	 * @return mixed
+	 */
+	public function &call($type, $method, $parameters = array())
+	{
+		$class = $this->get_class($type);
+
+		if (in_array($class, $this->legacy))
+		{
+			switch ($type)
+			{
+				case 'Cache':
+					// For backwards compatibility with old non-static
+					// Cache::create() methods
+					if ($method === 'get_handler')
+					{
+						$result = @call_user_func_array(array($class, 'create'), $parameters);
+						return $result;
+					}
+					break;
+			}
+		}
+
+		$result = call_user_func_array(array($class, $method), $parameters);
+		return $result;
+	}
+}
diff --git a/lib/vendor/simplepie/SimplePie/Restriction.php b/lib/vendor/simplepie/SimplePie/Restriction.php
new file mode 100644
index 000000000..001a5cd28
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Restriction.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Handles `<media:restriction>` as defined in Media RSS
+ *
+ * Used by {@see SimplePie_Enclosure::get_restriction()} and {@see SimplePie_Enclosure::get_restrictions()}
+ *
+ * This class can be overloaded with {@see SimplePie::set_restriction_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie_Restriction
+{
+	/**
+	 * Relationship ('allow'/'deny')
+	 *
+	 * @var string
+	 * @see get_relationship()
+	 */
+	var $relationship;
+
+	/**
+	 * Type of restriction
+	 *
+	 * @var string
+	 * @see get_type()
+	 */
+	var $type;
+
+	/**
+	 * Restricted values
+	 *
+	 * @var string
+	 * @see get_value()
+	 */
+	var $value;
+
+	/**
+	 * Constructor, used to input the data
+	 *
+	 * For documentation on all the parameters, see the corresponding
+	 * properties and their accessors
+	 */
+	public function __construct($relationship = null, $type = null, $value = null)
+	{
+		$this->relationship = $relationship;
+		$this->type = $type;
+		$this->value = $value;
+	}
+
+	/**
+	 * String-ified version
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		// There is no $this->data here
+		return md5(serialize($this));
+	}
+
+	/**
+	 * Get the relationship
+	 *
+	 * @return string|null Either 'allow' or 'deny'
+	 */
+	public function get_relationship()
+	{
+		if ($this->relationship !== null)
+		{
+			return $this->relationship;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the type
+	 *
+	 * @return string|null
+	 */
+	public function get_type()
+	{
+		if ($this->type !== null)
+		{
+			return $this->type;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Get the list of restricted things
+	 *
+	 * @return string|null
+	 */
+	public function get_value()
+	{
+		if ($this->value !== null)
+		{
+			return $this->value;
+		}
+		else
+		{
+			return null;
+		}
+	}
+}
diff --git a/lib/vendor/simplepie/SimplePie/Sanitize.php b/lib/vendor/simplepie/SimplePie/Sanitize.php
new file mode 100644
index 000000000..5a11721df
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Sanitize.php
@@ -0,0 +1,591 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Used for data cleanup and post-processing
+ *
+ *
+ * This class can be overloaded with {@see SimplePie::set_sanitize_class()}
+ *
+ * @package SimplePie
+ * @todo Move to using an actual HTML parser (this will allow tags to be properly stripped, and to switch between HTML and XHTML), this will also make it easier to shorten a string while preserving HTML tags
+ */
+class SimplePie_Sanitize
+{
+	// Private vars
+	var $base;
+
+	// Options
+	var $remove_div = true;
+	var $image_handler = '';
+	var $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style');
+	var $encode_instead_of_strip = false;
+	var $strip_attributes = array('bgsound', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc');
+	var $add_attributes = array('audio' => array('preload' => 'none'), 'iframe' => array('sandbox' => 'allow-scripts allow-same-origin'), 'video' => array('preload' => 'none'));
+	var $strip_comments = false;
+	var $output_encoding = 'UTF-8';
+	var $enable_cache = true;
+	var $cache_location = './cache';
+	var $cache_name_function = 'md5';
+	var $timeout = 10;
+	var $useragent = '';
+	var $force_fsockopen = false;
+	var $replace_url_attributes = null;
+
+	public function __construct()
+	{
+		// Set defaults
+		$this->set_url_replacements(null);
+	}
+
+	public function remove_div($enable = true)
+	{
+		$this->remove_div = (bool) $enable;
+	}
+
+	public function set_image_handler($page = false)
+	{
+		if ($page)
+		{
+			$this->image_handler = (string) $page;
+		}
+		else
+		{
+			$this->image_handler = false;
+		}
+	}
+
+	public function set_registry(SimplePie_Registry $registry)
+	{
+		$this->registry = $registry;
+	}
+
+	public function pass_cache_data($enable_cache = true, $cache_location = './cache', $cache_name_function = 'md5', $cache_class = 'SimplePie_Cache')
+	{
+		if (isset($enable_cache))
+		{
+			$this->enable_cache = (bool) $enable_cache;
+		}
+
+		if ($cache_location)
+		{
+			$this->cache_location = (string) $cache_location;
+		}
+
+		if ($cache_name_function)
+		{
+			$this->cache_name_function = (string) $cache_name_function;
+		}
+	}
+
+	public function pass_file_data($file_class = 'SimplePie_File', $timeout = 10, $useragent = '', $force_fsockopen = false)
+	{
+		if ($timeout)
+		{
+			$this->timeout = (string) $timeout;
+		}
+
+		if ($useragent)
+		{
+			$this->useragent = (string) $useragent;
+		}
+
+		if ($force_fsockopen)
+		{
+			$this->force_fsockopen = (string) $force_fsockopen;
+		}
+	}
+
+	public function strip_htmltags($tags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style'))
+	{
+		if ($tags)
+		{
+			if (is_array($tags))
+			{
+				$this->strip_htmltags = $tags;
+			}
+			else
+			{
+				$this->strip_htmltags = explode(',', $tags);
+			}
+		}
+		else
+		{
+			$this->strip_htmltags = false;
+		}
+	}
+
+	public function encode_instead_of_strip($encode = false)
+	{
+		$this->encode_instead_of_strip = (bool) $encode;
+	}
+
+	public function strip_attributes($attribs = array('bgsound', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc'))
+	{
+		if ($attribs)
+		{
+			if (is_array($attribs))
+			{
+				$this->strip_attributes = $attribs;
+			}
+			else
+			{
+				$this->strip_attributes = explode(',', $attribs);
+			}
+		}
+		else
+		{
+			$this->strip_attributes = false;
+		}
+	}
+
+	public function add_attributes($attribs = array('audio' => array('preload' => 'none'), 'iframe' => array('sandbox' => 'allow-scripts allow-same-origin'), 'video' => array('preload' => 'none')))
+	{
+		if ($attribs)
+		{
+			if (is_array($attribs))
+			{
+				$this->add_attributes = $attribs;
+			}
+			else
+			{
+				$this->add_attributes = explode(',', $attribs);
+			}
+		}
+		else
+		{
+			$this->add_attributes = false;
+		}
+	}
+
+	public function strip_comments($strip = false)
+	{
+		$this->strip_comments = (bool) $strip;
+	}
+
+	public function set_output_encoding($encoding = 'UTF-8')
+	{
+		$this->output_encoding = (string) $encoding;
+	}
+
+	/**
+	 * Set element/attribute key/value pairs of HTML attributes
+	 * containing URLs that need to be resolved relative to the feed
+	 *
+	 * Defaults to |a|@href, |area|@href, |blockquote|@cite, |del|@cite,
+	 * |form|@action, |img|@longdesc, |img|@src, |input|@src, |ins|@cite,
+	 * |q|@cite
+	 *
+	 * @since 1.0
+	 * @param array|null $element_attribute Element/attribute key/value pairs, null for default
+	 */
+	public function set_url_replacements($element_attribute = null)
+	{
+		if ($element_attribute === null)
+		{
+			$element_attribute = array(
+				'a' => 'href',
+				'area' => 'href',
+				'blockquote' => 'cite',
+				'del' => 'cite',
+				'form' => 'action',
+				'img' => array(
+					'longdesc',
+					'src'
+				),
+				'input' => 'src',
+				'ins' => 'cite',
+				'q' => 'cite'
+			);
+		}
+		$this->replace_url_attributes = (array) $element_attribute;
+	}
+
+	public function sanitize($data, $type, $base = '')
+	{
+		$data = trim($data);
+		if ($data !== '' || $type & SIMPLEPIE_CONSTRUCT_IRI)
+		{
+			if ($type & SIMPLEPIE_CONSTRUCT_MAYBE_HTML)
+			{
+				if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data))
+				{
+					$type |= SIMPLEPIE_CONSTRUCT_HTML;
+				}
+				else
+				{
+					$type |= SIMPLEPIE_CONSTRUCT_TEXT;
+				}
+			}
+
+			if ($type & SIMPLEPIE_CONSTRUCT_BASE64)
+			{
+				$data = base64_decode($data);
+			}
+
+			if ($type & (SIMPLEPIE_CONSTRUCT_HTML | SIMPLEPIE_CONSTRUCT_XHTML))
+			{
+
+				if (!class_exists('DOMDocument'))
+				{
+					throw new SimplePie_Exception('DOMDocument not found, unable to use sanitizer');
+				}
+				$document = new DOMDocument();
+				$document->encoding = 'UTF-8';
+
+				$data = $this->preprocess($data, $type);
+
+				set_error_handler(array('SimplePie_Misc', 'silence_errors'));
+				$document->loadHTML($data);
+				restore_error_handler();
+
+				$xpath = new DOMXPath($document);
+
+				// Strip comments
+				if ($this->strip_comments)
+				{
+					$comments = $xpath->query('//comment()');
+
+					foreach ($comments as $comment)
+					{
+						$comment->parentNode->removeChild($comment);
+					}
+				}
+
+				// Strip out HTML tags and attributes that might cause various security problems.
+				// Based on recommendations by Mark Pilgrim at:
+				// http://diveintomark.org/archives/2003/06/12/how_to_consume_rss_safely
+				if ($this->strip_htmltags)
+				{
+					foreach ($this->strip_htmltags as $tag)
+					{
+						$this->strip_tag($tag, $document, $xpath, $type);
+					}
+				}
+
+				if ($this->strip_attributes)
+				{
+					foreach ($this->strip_attributes as $attrib)
+					{
+						$this->strip_attr($attrib, $xpath);
+					}
+				}
+
+				if ($this->add_attributes)
+				{
+					foreach ($this->add_attributes as $tag => $valuePairs)
+					{
+						$this->add_attr($tag, $valuePairs, $document);
+					}
+				}
+
+				// Replace relative URLs
+				$this->base = $base;
+				foreach ($this->replace_url_attributes as $element => $attributes)
+				{
+					$this->replace_urls($document, $element, $attributes);
+				}
+
+				// If image handling (caching, etc.) is enabled, cache and rewrite all the image tags.
+				if (isset($this->image_handler) && ((string) $this->image_handler) !== '' && $this->enable_cache)
+				{
+					$images = $document->getElementsByTagName('img');
+					foreach ($images as $img)
+					{
+						if ($img->hasAttribute('src'))
+						{
+							$image_url = call_user_func($this->cache_name_function, $img->getAttribute('src'));
+							$cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, $image_url, 'spi'));
+
+							if ($cache->load())
+							{
+								$img->setAttribute('src', $this->image_handler . $image_url);
+							}
+							else
+							{
+								$file = $this->registry->create('File', array($img->getAttribute('src'), $this->timeout, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen));
+								$headers = $file->headers;
+
+								if ($file->success && ($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300)))
+								{
+									if ($cache->save(array('headers' => $file->headers, 'body' => $file->body)))
+									{
+										$img->setAttribute('src', $this->image_handler . $image_url);
+									}
+									else
+									{
+										trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING);
+									}
+								}
+							}
+						}
+					}
+				}
+
+				// Get content node
+				$div = $document->getElementsByTagName('body')->item(0)->firstChild;
+				// Finally, convert to a HTML string
+				if (version_compare(PHP_VERSION, '5.3.6', '>='))
+				{
+					$data = trim($document->saveHTML($div));
+				}
+				else
+				{
+					$data = trim($document->saveXML($div));
+				}
+
+				if ($this->remove_div)
+				{
+					$data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '', $data);
+					$data = preg_replace('/<\/div>$/', '', $data);
+				}
+				else
+				{
+					$data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '<div>', $data);
+				}
+			}
+
+			if ($type & SIMPLEPIE_CONSTRUCT_IRI)
+			{
+				$absolute = $this->registry->call('Misc', 'absolutize_url', array($data, $base));
+				if ($absolute !== false)
+				{
+					$data = $absolute;
+				}
+			}
+
+			if ($type & (SIMPLEPIE_CONSTRUCT_TEXT | SIMPLEPIE_CONSTRUCT_IRI))
+			{
+				$data = htmlspecialchars($data, ENT_COMPAT, 'UTF-8');
+			}
+
+			if ($this->output_encoding !== 'UTF-8')
+			{
+				$data = $this->registry->call('Misc', 'change_encoding', array($data, 'UTF-8', $this->output_encoding));
+			}
+		}
+		return $data;
+	}
+
+	protected function preprocess($html, $type)
+	{
+		$ret = '';
+		$html = preg_replace('%</?(?:html|body)[^>]*?'.'>%is', '', $html);
+		if ($type & ~SIMPLEPIE_CONSTRUCT_XHTML)
+		{
+			// Atom XHTML constructs are wrapped with a div by default
+			// Note: No protection if $html contains a stray </div>!
+			$html = '<div>' . $html . '</div>';
+			$ret .= '<!DOCTYPE html>';
+			$content_type = 'text/html';
+		}
+		else
+		{
+			$ret .= '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
+			$content_type = 'application/xhtml+xml';
+		}
+
+		$ret .= '<html><head>';
+		$ret .= '<meta http-equiv="Content-Type" content="' . $content_type . '; charset=utf-8" />';
+		$ret .= '</head><body>' . $html . '</body></html>';
+		return $ret;
+	}
+
+	public function replace_urls($document, $tag, $attributes)
+	{
+		if (!is_array($attributes))
+		{
+			$attributes = array($attributes);
+		}
+
+		if (!is_array($this->strip_htmltags) || !in_array($tag, $this->strip_htmltags))
+		{
+			$elements = $document->getElementsByTagName($tag);
+			foreach ($elements as $element)
+			{
+				foreach ($attributes as $attribute)
+				{
+					if ($element->hasAttribute($attribute))
+					{
+						$value = $this->registry->call('Misc', 'absolutize_url', array($element->getAttribute($attribute), $this->base));
+						if ($value !== false)
+						{
+							$element->setAttribute($attribute, $value);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	public function do_strip_htmltags($match)
+	{
+		if ($this->encode_instead_of_strip)
+		{
+			if (isset($match[4]) && !in_array(strtolower($match[1]), array('script', 'style')))
+			{
+				$match[1] = htmlspecialchars($match[1], ENT_COMPAT, 'UTF-8');
+				$match[2] = htmlspecialchars($match[2], ENT_COMPAT, 'UTF-8');
+				return "&lt;$match[1]$match[2]&gt;$match[3]&lt;/$match[1]&gt;";
+			}
+			else
+			{
+				return htmlspecialchars($match[0], ENT_COMPAT, 'UTF-8');
+			}
+		}
+		elseif (isset($match[4]) && !in_array(strtolower($match[1]), array('script', 'style')))
+		{
+			return $match[4];
+		}
+		else
+		{
+			return '';
+		}
+	}
+
+	protected function strip_tag($tag, $document, $xpath, $type)
+	{
+		$elements = $xpath->query('body//' . $tag);
+		if ($this->encode_instead_of_strip)
+		{
+			foreach ($elements as $element)
+			{
+				$fragment = $document->createDocumentFragment();
+
+				// For elements which aren't script or style, include the tag itself
+				if (!in_array($tag, array('script', 'style')))
+				{
+					$text = '<' . $tag;
+					if ($element->hasAttributes())
+					{
+						$attrs = array();
+						foreach ($element->attributes as $name => $attr)
+						{
+							$value = $attr->value;
+
+							// In XHTML, empty values should never exist, so we repeat the value
+							if (empty($value) && ($type & SIMPLEPIE_CONSTRUCT_XHTML))
+							{
+								$value = $name;
+							}
+							// For HTML, empty is fine
+							elseif (empty($value) && ($type & SIMPLEPIE_CONSTRUCT_HTML))
+							{
+								$attrs[] = $name;
+								continue;
+							}
+
+							// Standard attribute text
+							$attrs[] = $name . '="' . $attr->value . '"';
+						}
+						$text .= ' ' . implode(' ', $attrs);
+					}
+					$text .= '>';
+					$fragment->appendChild(new DOMText($text));
+				}
+
+				$number = $element->childNodes->length;
+				for ($i = $number; $i > 0; $i--)
+				{
+					$child = $element->childNodes->item(0);
+					$fragment->appendChild($child);
+				}
+
+				if (!in_array($tag, array('script', 'style')))
+				{
+					$fragment->appendChild(new DOMText('</' . $tag . '>'));
+				}
+
+				$element->parentNode->replaceChild($fragment, $element);
+			}
+
+			return;
+		}
+		elseif (in_array($tag, array('script', 'style')))
+		{
+			foreach ($elements as $element)
+			{
+				$element->parentNode->removeChild($element);
+			}
+
+			return;
+		}
+		else
+		{
+			foreach ($elements as $element)
+			{
+				$fragment = $document->createDocumentFragment();
+				$number = $element->childNodes->length;
+				for ($i = $number; $i > 0; $i--)
+				{
+					$child = $element->childNodes->item(0);
+					$fragment->appendChild($child);
+				}
+
+				$element->parentNode->replaceChild($fragment, $element);
+			}
+		}
+	}
+
+	protected function strip_attr($attrib, $xpath)
+	{
+		$elements = $xpath->query('//*[@' . $attrib . ']');
+
+		foreach ($elements as $element)
+		{
+			$element->removeAttribute($attrib);
+		}
+	}
+
+	protected function add_attr($tag, $valuePairs, $document)
+	{
+		$elements = $document->getElementsByTagName($tag);
+		foreach ($elements as $element)
+		{
+			foreach ($valuePairs as $attrib => $value)
+			{
+				$element->setAttribute($attrib, $value);
+			}
+		}
+	}
+}
diff --git a/lib/vendor/simplepie/SimplePie/Source.php b/lib/vendor/simplepie/SimplePie/Source.php
new file mode 100644
index 000000000..1a66a392d
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/Source.php
@@ -0,0 +1,610 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+/**
+ * Handles `<atom:source>`
+ *
+ * Used by {@see SimplePie_Item::get_source()}
+ *
+ * This class can be overloaded with {@see SimplePie::set_source_class()}
+ *
+ * @package SimplePie
+ * @subpackage API
+ */
+class SimplePie_Source
+{
+	var $item;
+	var $data = array();
+	protected $registry;
+
+	public function __construct($item, $data)
+	{
+		$this->item = $item;
+		$this->data = $data;
+	}
+
+	public function set_registry(SimplePie_Registry $registry)
+	{
+		$this->registry = $registry;
+	}
+
+	public function __toString()
+	{
+		return md5(serialize($this->data));
+	}
+
+	public function get_source_tags($namespace, $tag)
+	{
+		if (isset($this->data['child'][$namespace][$tag]))
+		{
+			return $this->data['child'][$namespace][$tag];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_base($element = array())
+	{
+		return $this->item->get_base($element);
+	}
+
+	public function sanitize($data, $type, $base = '')
+	{
+		return $this->item->sanitize($data, $type, $base);
+	}
+
+	public function get_item()
+	{
+		return $this->item;
+	}
+
+	public function get_title()
+	{
+		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_category($key = 0)
+	{
+		$categories = $this->get_categories();
+		if (isset($categories[$key]))
+		{
+			return $categories[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_categories()
+	{
+		$categories = array();
+
+		foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'category') as $category)
+		{
+			$term = null;
+			$scheme = null;
+			$label = null;
+			if (isset($category['attribs']['']['term']))
+			{
+				$term = $this->sanitize($category['attribs']['']['term'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($category['attribs']['']['scheme']))
+			{
+				$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($category['attribs']['']['label']))
+			{
+				$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			$categories[] = $this->registry->create('Category', array($term, $scheme, $label));
+		}
+		foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'category') as $category)
+		{
+			// This is really the label, but keep this as the term also for BC.
+			// Label will also work on retrieving because that falls back to term.
+			$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			if (isset($category['attribs']['']['domain']))
+			{
+				$scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			else
+			{
+				$scheme = null;
+			}
+			$categories[] = $this->registry->create('Category', array($term, $scheme, null));
+		}
+		foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category)
+		{
+			$categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
+		}
+		foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'subject') as $category)
+		{
+			$categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
+		}
+
+		if (!empty($categories))
+		{
+			return array_unique($categories);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_author($key = 0)
+	{
+		$authors = $this->get_authors();
+		if (isset($authors[$key]))
+		{
+			return $authors[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_authors()
+	{
+		$authors = array();
+		foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'author') as $author)
+		{
+			$name = null;
+			$uri = null;
+			$email = null;
+			if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']))
+			{
+				$name = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']))
+			{
+				$uri = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]));
+			}
+			if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data']))
+			{
+				$email = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if ($name !== null || $email !== null || $uri !== null)
+			{
+				$authors[] = $this->registry->create('Author', array($name, $uri, $email));
+			}
+		}
+		if ($author = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'author'))
+		{
+			$name = null;
+			$url = null;
+			$email = null;
+			if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data']))
+			{
+				$name = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data']))
+			{
+				$url = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]));
+			}
+			if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data']))
+			{
+				$email = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if ($name !== null || $email !== null || $url !== null)
+			{
+				$authors[] = $this->registry->create('Author', array($name, $url, $email));
+			}
+		}
+		foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'creator') as $author)
+		{
+			$authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
+		}
+		foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'creator') as $author)
+		{
+			$authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
+		}
+		foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'author') as $author)
+		{
+			$authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
+		}
+
+		if (!empty($authors))
+		{
+			return array_unique($authors);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_contributor($key = 0)
+	{
+		$contributors = $this->get_contributors();
+		if (isset($contributors[$key]))
+		{
+			return $contributors[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_contributors()
+	{
+		$contributors = array();
+		foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'contributor') as $contributor)
+		{
+			$name = null;
+			$uri = null;
+			$email = null;
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']))
+			{
+				$name = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']))
+			{
+				$uri = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]));
+			}
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data']))
+			{
+				$email = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if ($name !== null || $email !== null || $uri !== null)
+			{
+				$contributors[] = $this->registry->create('Author', array($name, $uri, $email));
+			}
+		}
+		foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'contributor') as $contributor)
+		{
+			$name = null;
+			$url = null;
+			$email = null;
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data']))
+			{
+				$name = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data']))
+			{
+				$url = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]));
+			}
+			if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data']))
+			{
+				$email = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if ($name !== null || $email !== null || $url !== null)
+			{
+				$contributors[] = $this->registry->create('Author', array($name, $url, $email));
+			}
+		}
+
+		if (!empty($contributors))
+		{
+			return array_unique($contributors);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_link($key = 0, $rel = 'alternate')
+	{
+		$links = $this->get_links($rel);
+		if (isset($links[$key]))
+		{
+			return $links[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Added for parity between the parent-level and the item/entry-level.
+	 */
+	public function get_permalink()
+	{
+		return $this->get_link(0);
+	}
+
+	public function get_links($rel = 'alternate')
+	{
+		if (!isset($this->data['links']))
+		{
+			$this->data['links'] = array();
+			if ($links = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link'))
+			{
+				foreach ($links as $link)
+				{
+					if (isset($link['attribs']['']['href']))
+					{
+						$link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
+						$this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
+					}
+				}
+			}
+			if ($links = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'link'))
+			{
+				foreach ($links as $link)
+				{
+					if (isset($link['attribs']['']['href']))
+					{
+						$link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
+						$this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
+
+					}
+				}
+			}
+			if ($links = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link'))
+			{
+				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+			}
+			if ($links = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
+			{
+				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+			}
+			if ($links = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link'))
+			{
+				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+			}
+
+			$keys = array_keys($this->data['links']);
+			foreach ($keys as $key)
+			{
+				if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key)))
+				{
+					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
+					{
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
+						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
+					}
+					else
+					{
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
+					}
+				}
+				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
+				{
+					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
+				}
+				$this->data['links'][$key] = array_unique($this->data['links'][$key]);
+			}
+		}
+
+		if (isset($this->data['links'][$rel]))
+		{
+			return $this->data['links'][$rel];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_description()
+	{
+		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'subtitle'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_copyright()
+	{
+		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'rights'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright'))
+		{
+			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_language()
+	{
+		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'language'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif (isset($this->data['xml_lang']))
+		{
+			return $this->sanitize($this->data['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_latitude()
+	{
+		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
+		{
+			return (float) $return[0]['data'];
+		}
+		elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		{
+			return (float) $match[1];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_longitude()
+	{
+		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
+		{
+			return (float) $return[0]['data'];
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
+		{
+			return (float) $return[0]['data'];
+		}
+		elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		{
+			return (float) $match[2];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	public function get_image_url()
+	{
+		if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'image'))
+		{
+			return $this->sanitize($return[0]['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI);
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		else
+		{
+			return null;
+		}
+	}
+}
+
diff --git a/lib/vendor/simplepie/SimplePie/XML/Declaration/Parser.php b/lib/vendor/simplepie/SimplePie/XML/Declaration/Parser.php
new file mode 100644
index 000000000..99e751672
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/XML/Declaration/Parser.php
@@ -0,0 +1,361 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+
+/**
+ * Parses the XML Declaration
+ *
+ * @package SimplePie
+ * @subpackage Parsing
+ */
+class SimplePie_XML_Declaration_Parser
+{
+	/**
+	 * XML Version
+	 *
+	 * @access public
+	 * @var string
+	 */
+	var $version = '1.0';
+
+	/**
+	 * Encoding
+	 *
+	 * @access public
+	 * @var string
+	 */
+	var $encoding = 'UTF-8';
+
+	/**
+	 * Standalone
+	 *
+	 * @access public
+	 * @var bool
+	 */
+	var $standalone = false;
+
+	/**
+	 * Current state of the state machine
+	 *
+	 * @access private
+	 * @var string
+	 */
+	var $state = 'before_version_name';
+
+	/**
+	 * Input data
+	 *
+	 * @access private
+	 * @var string
+	 */
+	var $data = '';
+
+	/**
+	 * Input data length (to avoid calling strlen() everytime this is needed)
+	 *
+	 * @access private
+	 * @var int
+	 */
+	var $data_length = 0;
+
+	/**
+	 * Current position of the pointer
+	 *
+	 * @var int
+	 * @access private
+	 */
+	var $position = 0;
+
+	/**
+	 * Create an instance of the class with the input data
+	 *
+	 * @access public
+	 * @param string $data Input data
+	 */
+	public function __construct($data)
+	{
+		$this->data = $data;
+		$this->data_length = strlen($this->data);
+	}
+
+	/**
+	 * Parse the input data
+	 *
+	 * @access public
+	 * @return bool true on success, false on failure
+	 */
+	public function parse()
+	{
+		while ($this->state && $this->state !== 'emit' && $this->has_data())
+		{
+			$state = $this->state;
+			$this->$state();
+		}
+		$this->data = '';
+		if ($this->state === 'emit')
+		{
+			return true;
+		}
+		else
+		{
+			$this->version = '';
+			$this->encoding = '';
+			$this->standalone = '';
+			return false;
+		}
+	}
+
+	/**
+	 * Check whether there is data beyond the pointer
+	 *
+	 * @access private
+	 * @return bool true if there is further data, false if not
+	 */
+	public function has_data()
+	{
+		return (bool) ($this->position < $this->data_length);
+	}
+
+	/**
+	 * Advance past any whitespace
+	 *
+	 * @return int Number of whitespace characters passed
+	 */
+	public function skip_whitespace()
+	{
+		$whitespace = strspn($this->data, "\x09\x0A\x0D\x20", $this->position);
+		$this->position += $whitespace;
+		return $whitespace;
+	}
+
+	/**
+	 * Read value
+	 */
+	public function get_value()
+	{
+		$quote = substr($this->data, $this->position, 1);
+		if ($quote === '"' || $quote === "'")
+		{
+			$this->position++;
+			$len = strcspn($this->data, $quote, $this->position);
+			if ($this->has_data())
+			{
+				$value = substr($this->data, $this->position, $len);
+				$this->position += $len + 1;
+				return $value;
+			}
+		}
+		return false;
+	}
+
+	public function before_version_name()
+	{
+		if ($this->skip_whitespace())
+		{
+			$this->state = 'version_name';
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+
+	public function version_name()
+	{
+		if (substr($this->data, $this->position, 7) === 'version')
+		{
+			$this->position += 7;
+			$this->skip_whitespace();
+			$this->state = 'version_equals';
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+
+	public function version_equals()
+	{
+		if (substr($this->data, $this->position, 1) === '=')
+		{
+			$this->position++;
+			$this->skip_whitespace();
+			$this->state = 'version_value';
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+
+	public function version_value()
+	{
+		if ($this->version = $this->get_value())
+		{
+			$this->skip_whitespace();
+			if ($this->has_data())
+			{
+				$this->state = 'encoding_name';
+			}
+			else
+			{
+				$this->state = 'emit';
+			}
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+
+	public function encoding_name()
+	{
+		if (substr($this->data, $this->position, 8) === 'encoding')
+		{
+			$this->position += 8;
+			$this->skip_whitespace();
+			$this->state = 'encoding_equals';
+		}
+		else
+		{
+			$this->state = 'standalone_name';
+		}
+	}
+
+	public function encoding_equals()
+	{
+		if (substr($this->data, $this->position, 1) === '=')
+		{
+			$this->position++;
+			$this->skip_whitespace();
+			$this->state = 'encoding_value';
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+
+	public function encoding_value()
+	{
+		if ($this->encoding = $this->get_value())
+		{
+			$this->skip_whitespace();
+			if ($this->has_data())
+			{
+				$this->state = 'standalone_name';
+			}
+			else
+			{
+				$this->state = 'emit';
+			}
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+
+	public function standalone_name()
+	{
+		if (substr($this->data, $this->position, 10) === 'standalone')
+		{
+			$this->position += 10;
+			$this->skip_whitespace();
+			$this->state = 'standalone_equals';
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+
+	public function standalone_equals()
+	{
+		if (substr($this->data, $this->position, 1) === '=')
+		{
+			$this->position++;
+			$this->skip_whitespace();
+			$this->state = 'standalone_value';
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+
+	public function standalone_value()
+	{
+		if ($standalone = $this->get_value())
+		{
+			switch ($standalone)
+			{
+				case 'yes':
+					$this->standalone = true;
+					break;
+
+				case 'no':
+					$this->standalone = false;
+					break;
+
+				default:
+					$this->state = false;
+					return;
+			}
+
+			$this->skip_whitespace();
+			if ($this->has_data())
+			{
+				$this->state = false;
+			}
+			else
+			{
+				$this->state = 'emit';
+			}
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+}
diff --git a/lib/vendor/simplepie/SimplePie/gzdecode.php b/lib/vendor/simplepie/SimplePie/gzdecode.php
new file mode 100644
index 000000000..0e8bc8fc6
--- /dev/null
+++ b/lib/vendor/simplepie/SimplePie/gzdecode.php
@@ -0,0 +1,370 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2016, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @copyright 2004-2016 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @author Ryan McCue
+ * @link http://simplepie.org/ SimplePie
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ */
+
+
+/**
+ * Decode 'gzip' encoded HTTP data
+ *
+ * @package SimplePie
+ * @subpackage HTTP
+ * @link http://www.gzip.org/format.txt
+ */
+class SimplePie_gzdecode
+{
+	/**
+	 * Compressed data
+	 *
+	 * @access private
+	 * @var string
+	 * @see gzdecode::$data
+	 */
+	var $compressed_data;
+
+	/**
+	 * Size of compressed data
+	 *
+	 * @access private
+	 * @var int
+	 */
+	var $compressed_size;
+
+	/**
+	 * Minimum size of a valid gzip string
+	 *
+	 * @access private
+	 * @var int
+	 */
+	var $min_compressed_size = 18;
+
+	/**
+	 * Current position of pointer
+	 *
+	 * @access private
+	 * @var int
+	 */
+	var $position = 0;
+
+	/**
+	 * Flags (FLG)
+	 *
+	 * @access private
+	 * @var int
+	 */
+	var $flags;
+
+	/**
+	 * Uncompressed data
+	 *
+	 * @access public
+	 * @see gzdecode::$compressed_data
+	 * @var string
+	 */
+	var $data;
+
+	/**
+	 * Modified time
+	 *
+	 * @access public
+	 * @var int
+	 */
+	var $MTIME;
+
+	/**
+	 * Extra Flags
+	 *
+	 * @access public
+	 * @var int
+	 */
+	var $XFL;
+
+	/**
+	 * Operating System
+	 *
+	 * @access public
+	 * @var int
+	 */
+	var $OS;
+
+	/**
+	 * Subfield ID 1
+	 *
+	 * @access public
+	 * @see gzdecode::$extra_field
+	 * @see gzdecode::$SI2
+	 * @var string
+	 */
+	var $SI1;
+
+	/**
+	 * Subfield ID 2
+	 *
+	 * @access public
+	 * @see gzdecode::$extra_field
+	 * @see gzdecode::$SI1
+	 * @var string
+	 */
+	var $SI2;
+
+	/**
+	 * Extra field content
+	 *
+	 * @access public
+	 * @see gzdecode::$SI1
+	 * @see gzdecode::$SI2
+	 * @var string
+	 */
+	var $extra_field;
+
+	/**
+	 * Original filename
+	 *
+	 * @access public
+	 * @var string
+	 */
+	var $filename;
+
+	/**
+	 * Human readable comment
+	 *
+	 * @access public
+	 * @var string
+	 */
+	var $comment;
+
+	/**
+	 * Don't allow anything to be set
+	 *
+	 * @param string $name
+	 * @param mixed $value
+	 */
+	public function __set($name, $value)
+	{
+		trigger_error("Cannot write property $name", E_USER_ERROR);
+	}
+
+	/**
+	 * Set the compressed string and related properties
+	 *
+	 * @param string $data
+	 */
+	public function __construct($data)
+	{
+		$this->compressed_data = $data;
+		$this->compressed_size = strlen($data);
+	}
+
+	/**
+	 * Decode the GZIP stream
+	 *
+	 * @return bool Successfulness
+	 */
+	public function parse()
+	{
+		if ($this->compressed_size >= $this->min_compressed_size)
+		{
+			// Check ID1, ID2, and CM
+			if (substr($this->compressed_data, 0, 3) !== "\x1F\x8B\x08")
+			{
+				return false;
+			}
+
+			// Get the FLG (FLaGs)
+			$this->flags = ord($this->compressed_data[3]);
+
+			// FLG bits above (1 << 4) are reserved
+			if ($this->flags > 0x1F)
+			{
+				return false;
+			}
+
+			// Advance the pointer after the above
+			$this->position += 4;
+
+			// MTIME
+			$mtime = substr($this->compressed_data, $this->position, 4);
+			// Reverse the string if we're on a big-endian arch because l is the only signed long and is machine endianness
+			if (current(unpack('S', "\x00\x01")) === 1)
+			{
+				$mtime = strrev($mtime);
+			}
+			$this->MTIME = current(unpack('l', $mtime));
+			$this->position += 4;
+
+			// Get the XFL (eXtra FLags)
+			$this->XFL = ord($this->compressed_data[$this->position++]);
+
+			// Get the OS (Operating System)
+			$this->OS = ord($this->compressed_data[$this->position++]);
+
+			// Parse the FEXTRA
+			if ($this->flags & 4)
+			{
+				// Read subfield IDs
+				$this->SI1 = $this->compressed_data[$this->position++];
+				$this->SI2 = $this->compressed_data[$this->position++];
+
+				// SI2 set to zero is reserved for future use
+				if ($this->SI2 === "\x00")
+				{
+					return false;
+				}
+
+				// Get the length of the extra field
+				$len = current(unpack('v', substr($this->compressed_data, $this->position, 2)));
+				$this->position += 2;
+
+				// Check the length of the string is still valid
+				$this->min_compressed_size += $len + 4;
+				if ($this->compressed_size >= $this->min_compressed_size)
+				{
+					// Set the extra field to the given data
+					$this->extra_field = substr($this->compressed_data, $this->position, $len);
+					$this->position += $len;
+				}
+				else
+				{
+					return false;
+				}
+			}
+
+			// Parse the FNAME
+			if ($this->flags & 8)
+			{
+				// Get the length of the filename
+				$len = strcspn($this->compressed_data, "\x00", $this->position);
+
+				// Check the length of the string is still valid
+				$this->min_compressed_size += $len + 1;
+				if ($this->compressed_size >= $this->min_compressed_size)
+				{
+					// Set the original filename to the given string
+					$this->filename = substr($this->compressed_data, $this->position, $len);
+					$this->position += $len + 1;
+				}
+				else
+				{
+					return false;
+				}
+			}
+
+			// Parse the FCOMMENT
+			if ($this->flags & 16)
+			{
+				// Get the length of the comment
+				$len = strcspn($this->compressed_data, "\x00", $this->position);
+
+				// Check the length of the string is still valid
+				$this->min_compressed_size += $len + 1;
+				if ($this->compressed_size >= $this->min_compressed_size)
+				{
+					// Set the original comment to the given string
+					$this->comment = substr($this->compressed_data, $this->position, $len);
+					$this->position += $len + 1;
+				}
+				else
+				{
+					return false;
+				}
+			}
+
+			// Parse the FHCRC
+			if ($this->flags & 2)
+			{
+				// Check the length of the string is still valid
+				$this->min_compressed_size += $len + 2;
+				if ($this->compressed_size >= $this->min_compressed_size)
+				{
+					// Read the CRC
+					$crc = current(unpack('v', substr($this->compressed_data, $this->position, 2)));
+
+					// Check the CRC matches
+					if ((crc32(substr($this->compressed_data, 0, $this->position)) & 0xFFFF) === $crc)
+					{
+						$this->position += 2;
+					}
+					else
+					{
+						return false;
+					}
+				}
+				else
+				{
+					return false;
+				}
+			}
+
+			// Decompress the actual data
+			if (($this->data = gzinflate(substr($this->compressed_data, $this->position, -8))) === false)
+			{
+				return false;
+			}
+			else
+			{
+				$this->position = $this->compressed_size - 8;
+			}
+
+			// Check CRC of data
+			$crc = current(unpack('V', substr($this->compressed_data, $this->position, 4)));
+			$this->position += 4;
+			/*if (extension_loaded('hash') && sprintf('%u', current(unpack('V', hash('crc32b', $this->data)))) !== sprintf('%u', $crc))
+			{
+				return false;
+			}*/
+
+			// Check ISIZE of data
+			$isize = current(unpack('V', substr($this->compressed_data, $this->position, 4)));
+			$this->position += 4;
+			if (sprintf('%u', strlen($this->data) & 0xFFFFFFFF) !== sprintf('%u', $isize))
+			{
+				return false;
+			}
+
+			// Wow, against all odds, we've actually got a valid gzip string
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+}
diff --git a/lib/vendor/simplepie/simplepie.inc b/lib/vendor/simplepie/simplepie.inc
deleted file mode 100644
index 27c2d182d..000000000
--- a/lib/vendor/simplepie/simplepie.inc
+++ /dev/null
@@ -1,10889 +0,0 @@
-<?php
-/**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2007, Ryan Parman and Geoffrey Sneddon
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- * 	* Redistributions of source code must retain the above copyright notice, this list of
- * 	  conditions and the following disclaimer.
- *
- * 	* Redistributions in binary form must reproduce the above copyright notice, this list
- * 	  of conditions and the following disclaimer in the documentation and/or other materials
- * 	  provided with the distribution.
- *
- * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
- * 	  to endorse or promote products derived from this software without specific prior
- * 	  written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @version "Razzleberry"
- * @copyright 2004-2007 Ryan Parman, Geoffrey Sneddon
- * @author Ryan Parman
- * @author Geoffrey Sneddon
- * @link http://simplepie.org/ SimplePie
- * @link http://simplepie.org/support/ Please submit all bug reports and feature requests to the SimplePie forums
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- * @todo phpDoc comments
- */
-
-/**
- * SimplePie Name
- */
-define('SIMPLEPIE_NAME', 'SimplePie');
-
-/**
- * SimplePie Version
- */
-define('SIMPLEPIE_VERSION', '1.0.1');
-
-/**
- * SimplePie Build
- * @todo Hardcode for release (there's no need to have to call SimplePie_Misc::parse_date() only every load of simplepie.inc)
- */
-define('SIMPLEPIE_BUILD', 20070719221955);
-
-/**
- * SimplePie Website URL
- */
-define('SIMPLEPIE_URL', 'http://simplepie.org/');
-
-/**
- * SimplePie Useragent
- * @see SimplePie::set_useragent()
- */
-define('SIMPLEPIE_USERAGENT', SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION . ' (Feed Parser; ' . SIMPLEPIE_URL . '; Allow like Gecko) Build/' . SIMPLEPIE_BUILD);
-
-/**
- * SimplePie Linkback
- */
-define('SIMPLEPIE_LINKBACK', '<a href="' . SIMPLEPIE_URL . '" title="' . SIMPLEPIE_NAME . ' ' . SIMPLEPIE_VERSION . '">' . SIMPLEPIE_NAME . '</a>');
-
-/**
- * No Autodiscovery
- * @see SimplePie::set_autodiscovery_level()
- */
-define('SIMPLEPIE_LOCATOR_NONE', 0);
-
-/**
- * Feed Link Element Autodiscovery
- * @see SimplePie::set_autodiscovery_level()
- */
-define('SIMPLEPIE_LOCATOR_AUTODISCOVERY', 1);
-
-/**
- * Local Feed Extension Autodiscovery
- * @see SimplePie::set_autodiscovery_level()
- */
-define('SIMPLEPIE_LOCATOR_LOCAL_EXTENSION', 2);
-
-/**
- * Local Feed Body Autodiscovery
- * @see SimplePie::set_autodiscovery_level()
- */
-define('SIMPLEPIE_LOCATOR_LOCAL_BODY', 4);
-
-/**
- * Remote Feed Extension Autodiscovery
- * @see SimplePie::set_autodiscovery_level()
- */
-define('SIMPLEPIE_LOCATOR_REMOTE_EXTENSION', 8);
-
-/**
- * Remote Feed Body Autodiscovery
- * @see SimplePie::set_autodiscovery_level()
- */
-define('SIMPLEPIE_LOCATOR_REMOTE_BODY', 16);
-
-/**
- * All Feed Autodiscovery
- * @see SimplePie::set_autodiscovery_level()
- */
-define('SIMPLEPIE_LOCATOR_ALL', 31);
-
-/**
- * No known feed type
- */
-define('SIMPLEPIE_TYPE_NONE', 0);
-
-/**
- * RSS 0.90
- */
-define('SIMPLEPIE_TYPE_RSS_090', 1);
-
-/**
- * RSS 0.91 (Netscape)
- */
-define('SIMPLEPIE_TYPE_RSS_091_NETSCAPE', 2);
-
-/**
- * RSS 0.91 (Userland)
- */
-define('SIMPLEPIE_TYPE_RSS_091_USERLAND', 4);
-
-/**
- * RSS 0.91 (both Netscape and Userland)
- */
-define('SIMPLEPIE_TYPE_RSS_091', 6);
-
-/**
- * RSS 0.92
- */
-define('SIMPLEPIE_TYPE_RSS_092', 8);
-
-/**
- * RSS 0.93
- */
-define('SIMPLEPIE_TYPE_RSS_093', 16);
-
-/**
- * RSS 0.94
- */
-define('SIMPLEPIE_TYPE_RSS_094', 32);
-
-/**
- * RSS 1.0
- */
-define('SIMPLEPIE_TYPE_RSS_10', 64);
-
-/**
- * RSS 2.0
- */
-define('SIMPLEPIE_TYPE_RSS_20', 128);
-
-/**
- * RDF-based RSS
- */
-define('SIMPLEPIE_TYPE_RSS_RDF', 65);
-
-/**
- * Non-RDF-based RSS (truly intended as syndication format)
- */
-define('SIMPLEPIE_TYPE_RSS_SYNDICATION', 190);
-
-/**
- * All RSS
- */
-define('SIMPLEPIE_TYPE_RSS_ALL', 255);
-
-/**
- * Atom 0.3
- */
-define('SIMPLEPIE_TYPE_ATOM_03', 256);
-
-/**
- * Atom 1.0
- */
-define('SIMPLEPIE_TYPE_ATOM_10', 512);
-
-/**
- * All Atom
- */
-define('SIMPLEPIE_TYPE_ATOM_ALL', 768);
-
-/**
- * All feed types
- */
-define('SIMPLEPIE_TYPE_ALL', 1023);
-
-/**
- * No construct
- */
-define('SIMPLEPIE_CONSTRUCT_NONE', 0);
-
-/**
- * Text construct
- */
-define('SIMPLEPIE_CONSTRUCT_TEXT', 1);
-
-/**
- * HTML construct
- */
-define('SIMPLEPIE_CONSTRUCT_HTML', 2);
-
-/**
- * XHTML construct
- */
-define('SIMPLEPIE_CONSTRUCT_XHTML', 4);
-
-/**
- * base64-encoded construct
- */
-define('SIMPLEPIE_CONSTRUCT_BASE64', 8);
-
-/**
- * IRI construct
- */
-define('SIMPLEPIE_CONSTRUCT_IRI', 16);
-
-/**
- * A construct that might be HTML
- */
-define('SIMPLEPIE_CONSTRUCT_MAYBE_HTML', 32);
-
-/**
- * All constructs
- */
-define('SIMPLEPIE_CONSTRUCT_ALL', 63);
-
-/**
- * PCRE for HTML attributes
- */
-define('SIMPLEPIE_PCRE_HTML_ATTRIBUTE', '((?:\s+(?:(?:[^\s:]+:)?[^\s:]+)(?:\s*=\s*(?:"(?:[^"]*)"|\'(?:[^\']*)\'|(?:[a-z0-9\-._:]*)))?)*)\s*');
-
-/**
- * PCRE for XML attributes
- */
-define('SIMPLEPIE_PCRE_XML_ATTRIBUTE', '((?:\s+(?:(?:[^\s:]+:)?[^\s:]+)\s*=\s*(?:"(?:[^"]*)"|\'(?:[^\']*)\'))*)\s*');
-
-/**
- * XML Namespace
- */
-define('SIMPLEPIE_NAMESPACE_XML', 'http://www.w3.org/XML/1998/namespace');
-
-/**
- * Atom 1.0 Namespace
- */
-define('SIMPLEPIE_NAMESPACE_ATOM_10', 'http://www.w3.org/2005/Atom');
-
-/**
- * Atom 0.3 Namespace
- */
-define('SIMPLEPIE_NAMESPACE_ATOM_03', 'http://purl.org/atom/ns#');
-
-/**
- * RDF Namespace
- */
-define('SIMPLEPIE_NAMESPACE_RDF', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#');
-
-/**
- * RSS 0.90 Namespace
- */
-define('SIMPLEPIE_NAMESPACE_RSS_090', 'http://my.netscape.com/rdf/simple/0.9/');
-
-/**
- * RSS 1.0 Namespace
- */
-define('SIMPLEPIE_NAMESPACE_RSS_10', 'http://purl.org/rss/1.0/');
-
-/**
- * RSS 1.0 Content Module Namespace
- */
-define('SIMPLEPIE_NAMESPACE_RSS_10_MODULES_CONTENT', 'http://purl.org/rss/1.0/modules/content/');
-
-/**
- * DC 1.0 Namespace
- */
-define('SIMPLEPIE_NAMESPACE_DC_10', 'http://purl.org/dc/elements/1.0/');
-
-/**
- * DC 1.1 Namespace
- */
-define('SIMPLEPIE_NAMESPACE_DC_11', 'http://purl.org/dc/elements/1.1/');
-
-/**
- * W3C Basic Geo (WGS84 lat/long) Vocabulary Namespace
- */
-define('SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO', 'http://www.w3.org/2003/01/geo/wgs84_pos#');
-
-/**
- * GeoRSS Namespace
- */
-define('SIMPLEPIE_NAMESPACE_GEORSS', 'http://www.georss.org/georss');
-
-/**
- * Media RSS Namespace
- */
-define('SIMPLEPIE_NAMESPACE_MEDIARSS', 'http://search.yahoo.com/mrss/');
-
-/**
- * iTunes RSS Namespace
- */
-define('SIMPLEPIE_NAMESPACE_ITUNES', 'http://www.itunes.com/dtds/podcast-1.0.dtd');
-
-/**
- * XHTML Namespace
- */
-define('SIMPLEPIE_NAMESPACE_XHTML', 'http://www.w3.org/1999/xhtml');
-
-/**
- * IANA Link Relations Registry
- */
-define('SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY', 'http://www.iana.org/assignments/relation/');
-
-/**
- * Whether we're running on PHP5
- */
-define('SIMPLEPIE_PHP5', version_compare(PHP_VERSION, '5.0.0', '>='));
-
-/**
- * SimplePie
- *
- * @package SimplePie
- * @version "Razzleberry"
- * @copyright 2004-2007 Ryan Parman, Geoffrey Sneddon
- * @author Ryan Parman
- * @author Geoffrey Sneddon
- * @todo Option for type of fetching (cache, not modified header, fetch, etc.)
- */
-class SimplePie
-{
-	/**
-	 * @var array Raw data
-	 * @access private
-	 */
-	var $data = array();
-
-	/**
-	 * @var mixed Error string
-	 * @access private
-	 */
-	var $error;
-
-	/**
-	 * @var object Instance of SimplePie_Sanitize (or other class)
-	 * @see SimplePie::set_sanitize_class()
-	 * @access private
-	 */
-	var $sanitize;
-
-	/**
-	 * @var string SimplePie Useragent
-	 * @see SimplePie::set_useragent()
-	 * @access private
-	 */
-	var $useragent = SIMPLEPIE_USERAGENT;
-
-	/**
-	 * @var string Feed URL
-	 * @see SimplePie::set_feed_url()
-	 * @access private
-	 */
-	var $feed_url;
-
-	/**
-	 * @var object Instance of SimplePie_File to use as a feed
-	 * @see SimplePie::set_file()
-	 * @access private
-	 */
-	var $file;
-
-	/**
-	 * @var string Raw feed data
-	 * @see SimplePie::set_raw_data()
-	 * @access private
-	 */
-	var $raw_data;
-
-	/**
-	 * @var int Timeout for fetching remote files
-	 * @see SimplePie::set_timeout()
-	 * @access private
-	 */
-	var $timeout = 10;
-
-	/**
-	 * @var bool Forces fsockopen() to be used for remote files instead
-	 * of cURL, even if a new enough version is installed
-	 * @see SimplePie::force_fsockopen()
-	 * @access private
-	 */
-	var $force_fsockopen = false;
-
-	/**
-	 * @var bool Enable/Disable XML dump
-	 * @see SimplePie::enable_xml_dump()
-	 * @access private
-	 */
-	var $xml_dump = false;
-
-	/**
-	 * @var bool Enable/Disable Caching
-	 * @see SimplePie::enable_cache()
-	 * @access private
-	 */
-	var $cache = true;
-
-	/**
-	 * @var int Cache duration (in seconds)
-	 * @see SimplePie::set_cache_duration()
-	 * @access private
-	 */
-	var $cache_duration = 3600;
-
-	/**
-	 * @var int Auto-discovery cache duration (in seconds)
-	 * @see SimplePie::set_autodiscovery_cache_duration()
-	 * @access private
-	 */
-	var $autodiscovery_cache_duration = 604800; // 7 Days.
-
-	/**
-	 * @var string Cache location (relative to executing script)
-	 * @see SimplePie::set_cache_location()
-	 * @access private
-	 */
-	var $cache_location = './cache';
-
-	/**
-	 * @var string Function that creates the cache filename
-	 * @see SimplePie::set_cache_name_function()
-	 * @access private
-	 */
-	var $cache_name_function = 'md5';
-
-	/**
-	 * @var bool Reorder feed by date descending
-	 * @see SimplePie::enable_order_by_date()
-	 * @access private
-	 */
-	var $order_by_date = true;
-
-	/**
-	 * @var mixed Force input encoding to be set to the follow value
-	 * (false, or anything type-cast to false, disables this feature)
-	 * @see SimplePie::set_input_encoding()
-	 * @access private
-	 */
-	var $input_encoding = false;
-
-	/**
-	 * @var int Feed Autodiscovery Level
-	 * @see SimplePie::set_autodiscovery_level()
-	 * @access private
-	 */
-	var $autodiscovery = SIMPLEPIE_LOCATOR_ALL;
-
-	/**
-	 * @var string Class used for caching feeds
-	 * @see SimplePie::set_cache_class()
-	 * @access private
-	 */
-	var $cache_class = 'SimplePie_Cache';
-
-	/**
-	 * @var string Class used for locating feeds
-	 * @see SimplePie::set_locator_class()
-	 * @access private
-	 */
-	var $locator_class = 'SimplePie_Locator';
-
-	/**
-	 * @var string Class used for parsing feeds
-	 * @see SimplePie::set_parser_class()
-	 * @access private
-	 */
-	var $parser_class = 'SimplePie_Parser';
-
-	/**
-	 * @var string Class used for fetching feeds
-	 * @see SimplePie::set_file_class()
-	 * @access private
-	 */
-	var $file_class = 'SimplePie_File';
-
-	/**
-	 * @var string Class used for items
-	 * @see SimplePie::set_item_class()
-	 * @access private
-	 */
-	var $item_class = 'SimplePie_Item';
-
-	/**
-	 * @var string Class used for authors
-	 * @see SimplePie::set_author_class()
-	 * @access private
-	 */
-	var $author_class = 'SimplePie_Author';
-
-	/**
-	 * @var string Class used for categories
-	 * @see SimplePie::set_category_class()
-	 * @access private
-	 */
-	var $category_class = 'SimplePie_Category';
-
-	/**
-	 * @var string Class used for enclosures
-	 * @see SimplePie::set_enclosures_class()
-	 * @access private
-	 */
-	var $enclosure_class = 'SimplePie_Enclosure';
-
-	/**
-	 * @var string Class used for Media RSS <media:text> captions
-	 * @see SimplePie::set_caption_class()
-	 * @access private
-	 */
-	var $caption_class = 'SimplePie_Caption';
-
-	/**
-	 * @var string Class used for Media RSS <media:copyright>
-	 * @see SimplePie::set_copyright_class()
-	 * @access private
-	 */
-	var $copyright_class = 'SimplePie_Copyright';
-
-	/**
-	 * @var string Class used for Media RSS <media:credit>
-	 * @see SimplePie::set_credit_class()
-	 * @access private
-	 */
-	var $credit_class = 'SimplePie_Credit';
-
-	/**
-	 * @var string Class used for Media RSS <media:rating>
-	 * @see SimplePie::set_rating_class()
-	 * @access private
-	 */
-	var $rating_class = 'SimplePie_Rating';
-
-	/**
-	 * @var string Class used for Media RSS <media:restriction>
-	 * @see SimplePie::set_restriction_class()
-	 * @access private
-	 */
-	var $restriction_class = 'SimplePie_Restriction';
-
-	/**
-	 * @var mixed Set javascript query string parameter (false, or
-	 * anything type-cast to false, disables this feature)
-	 * @see SimplePie::set_javascript()
-	 * @access private
-	 */
-	var $javascript = 'js';
-
-	/**
-	 * @var int Maximum number of feeds to check with autodiscovery
-	 * @see SimplePie::set_max_checked_feeds()
-	 * @access private
-	 */
-	var $max_checked_feeds = 10;
-
-	/**
-	 * @var string Web-accessible path to the handler_favicon.php file.
-	 * @see SimplePie::set_favicon_handler()
-	 * @access private
-	 */
-	var $favicon_handler = '';
-
-	/**
-	 * @var string Web-accessible path to the handler_image.php file.
-	 * @see SimplePie::set_image_handler()
-	 * @access private
-	 */
-	var $image_handler = '';
-
-	/**
-	 * @var array Stores the URLs when multiple feeds are being initialized.
-	 * @see SimplePie::set_feed_url()
-	 * @access private
-	 */
-	var $multifeed_url = array();
-
-	/**
-	 * @var array Stores SimplePie objects when multiple feeds initialized.
-	 * @access private
-	 */
-	var $multifeed_objects = array();
-
-	/**
-	 * @var array Stores the get_object_vars() array for use with multifeeds.
-	 * @see SimplePie::set_feed_url()
-	 * @access private
-	 */
-	var $config_settings = null;
-
-	/**
-	 * @var array Stores the default attributes to be stripped by strip_attributes().
-	 * @see SimplePie::strip_attributes()
-	 * @access private
-	 */
-	var $strip_attributes = array('bgsound', 'class', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc');
-
-	/**
-	 * @var array Stores the default tags to be stripped by strip_htmltags().
-	 * @see SimplePie::strip_htmltags()
-	 * @access private
-	 */
-	var $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style');
-
-	/**
-	 * @var string proxy used to fetch feeds
-	 * @see SimplePie::set_proxy()
-	 * @access private
-	 */
-	var $proxy = "";
-
-	/**
-	 * The SimplePie class contains feed level data and options
-	 *
-	 * There are two ways that you can create a new SimplePie object. The first
-	 * is by passing a feed URL as a parameter to the SimplePie constructor
-	 * (as well as optionally setting the cache location and cache expiry). This
-	 * will initialise the whole feed with all of the default settings, and you
-	 * can begin accessing methods and properties immediately.
-	 *
-	 * The second way is to create the SimplePie object with no parameters
-	 * at all. This will enable you to set configuration options. After setting
-	 * them, you must initialise the feed using $feed->init(). At that point the
-	 * object's methods and properties will be available to you. This format is
-	 * what is used throughout this documentation.
-	 *
-	 * @access public
-	 * @since 1.0 Preview Release
-	 * @param string $feed_url This is the URL you want to parse.
-	 * @param string $cache_location This is where you want the cache to be stored.
-	 * @param int $cache_duration This is the number of seconds that you want to store the cache file for.
-	 * @param string $proxy This is the proxy "host:port" used to fetch feeds
-	 */
-	function SimplePie($feed_url = null, $cache_location = null, $cache_duration = null, $proxy = null)
-	{
-		// Other objects, instances created here so we can set options on them
-		$this->sanitize =& new SimplePie_Sanitize;
-
-		// Set options if they're passed to the constructor
-		if ($cache_location !== null)
-		{
-			$this->set_cache_location($cache_location);
-		}
-
-		if ($cache_duration !== null)
-		{
-			$this->set_cache_duration($cache_duration);
-		}
-
-		if ($proxy !== null)
-		{
-			$this->set_proxy($proxy);
-		}
-
-		// Only init the script if we're passed a feed URL
-		if ($feed_url !== null)
-		{
-			$this->set_feed_url($feed_url);
-			$this->init();
-		}
-	}
-
-	/**
-	 * Used for converting object to a string
-	 */
-	function __toString()
-	{
-		return md5(serialize($this->data));
-	}
-
-	/**
-	 * This is the URL of the feed you want to parse.
-	 *
-	 * This allows you to enter the URL of the feed you want to parse, or the
-	 * website you want to try to use auto-discovery on. This takes priority
-	 * over any set raw data.
-	 *
-	 * You can set multiple feeds to mash together by passing an array instead
-	 * of a string for the $url. Remember that with each additional feed comes
-	 * additional processing and resources.
-	 *
-	 * @access public
-	 * @since 1.0 Preview Release
-	 * @param mixed $url This is the URL (or array of URLs) that you want to parse.
-	 * @see SimplePie::set_raw_data()
-	 */
-	function set_feed_url($url)
-	{
-		if (is_array($url))
-		{
-			$this->multifeed_url = array();
-			foreach ($url as $value)
-			{
-				$this->multifeed_url[] = SimplePie_Misc::fix_protocol($value, 1);
-			}
-		}
-		else
-		{
-			$this->feed_url = SimplePie_Misc::fix_protocol($url, 1);
-		}
-	}
-
-	/**
-	 * This is the proxy used to fetch feeds
-	 *
-	 * @access public
-	 * @param string $proxy This is the URL of the proxy "host:port"
-	 */
-	function set_proxy($proxy)
-	{
-		$this->proxy = $proxy;
-		$this->sanitize->proxy = $proxy;
-	}
-
-	/**
-	 * Provides an instance of SimplePie_File to use as a feed
-	 *
-	 * @access public
-	 * @param object &$file Instance of SimplePie_File (or subclass)
-	 * @return bool True on success, false on failure
-	 */
-	function set_file(&$file)
-	{
-		if (SimplePie_Misc::is_a($file, 'SimplePie_File'))
-		{
-			$this->feed_url = $file->url;
-			$this->file =& $file;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Allows you to use a string of RSS/Atom data instead of a remote feed.
-	 *
-	 * If you have a feed available as a string in PHP, you can tell SimplePie
-	 * to parse that data string instead of a remote feed. Any set feed URL
-	 * takes precedence.
-	 *
-	 * @access public
-	 * @since 1.0 Beta 3
-	 * @param string $data RSS or Atom data as a string.
-	 * @see SimplePie::set_feed_url()
-	 */
-	function set_raw_data($data)
-	{
-		$this->raw_data = trim($data);
-	}
-
-	/**
-	 * Allows you to override the default timeout for fetching remote feeds.
-	 *
-	 * This allows you to change the maximum time the feed's server to respond
-	 * and send the feed back.
-	 *
-	 * @access public
-	 * @since 1.0 Beta 3
-	 * @param int $timeout The maximum number of seconds to spend waiting to retrieve a feed.
-	 */
-	function set_timeout($timeout = 10)
-	{
-		$this->timeout = (int) $timeout;
-	}
-
-	/**
-	 * Forces SimplePie to use fsockopen() instead of the preferred cURL
-	 * functions.
-	 *
-	 * @access public
-	 * @since 1.0 Beta 3
-	 * @param bool $enable Force fsockopen() to be used
-	 */
-	function force_fsockopen($enable = false)
-	{
-		$this->force_fsockopen = (bool) $enable;
-	}
-
-	/**
-	 * Outputs the raw XML content of the feed, after it has gone through
-	 * SimplePie's filters.
-	 *
-	 * Used only for debugging, this function will output the XML content as
-	 * text/xml. When SimplePie reads in a feed, it does a bit of cleaning up
-	 * before trying to parse it. Many parts of the feed are re-written in
-	 * memory, and in the end, you have a parsable feed. XML dump shows you the
-	 * actual XML that SimplePie tries to parse, which may or may not be very
-	 * different from the original feed.
-	 *
-	 * @access public
-	 * @since 1.0 Preview Release
-	 * @param bool $enable Enable XML dump
-	 */
-	function enable_xml_dump($enable = false)
-	{
-		$this->xml_dump = (bool) $enable;
-	}
-
-	/**
-	 * Enables/disables caching in SimplePie.
-	 *
-	 * This option allows you to disable caching all-together in SimplePie.
-	 * However, disabling the cache can lead to longer load times.
-	 *
-	 * @access public
-	 * @since 1.0 Preview Release
-	 * @param bool $enable Enable caching
-	 */
-	function enable_cache($enable = true)
-	{
-		$this->cache = (bool) $enable;
-	}
-
-	/**
-	 * Set the length of time (in seconds) that the contents of a feed
-	 * will be cached.
-	 *
-	 * @access public
-	 * @param int $seconds The feed content cache duration.
-	 */
-	function set_cache_duration($seconds = 3600)
-	{
-		$this->cache_duration = (int) $seconds;
-	}
-
-	/**
-	 * Set the length of time (in seconds) that the autodiscovered feed
-	 * URL will be cached.
-	 *
-	 * @access public
-	 * @param int $seconds The autodiscovered feed URL cache duration.
-	 */
-	function set_autodiscovery_cache_duration($seconds = 604800)
-	{
-		$this->autodiscovery_cache_duration = (int) $seconds;
-	}
-
-	/**
-	 * Set the file system location where the cached files should be stored.
-	 *
-	 * @access public
-	 * @param string $location The file system location.
-	 */
-	function set_cache_location($location = './cache')
-	{
-		$this->cache_location = (string) $location;
-	}
-
-	/**
-	 * Determines whether feed items should be sorted into reverse chronological order.
-	 *
-	 * @access public
-	 * @param bool $enable Sort as reverse chronological order.
-	 */
-	function enable_order_by_date($enable = true)
-	{
-		$this->order_by_date = (bool) $enable;
-	}
-
-	/**
-	 * Allows you to override the character encoding reported by the feed.
-	 *
-	 * @access public
-	 * @param string $encoding Character encoding.
-	 */
-	function set_input_encoding($encoding = false)
-	{
-		if ($encoding)
-		{
-			$this->input_encoding = (string) $encoding;
-		}
-		else
-		{
-			$this->input_encoding = false;
-		}
-	}
-
-	/**
-	 * Set how much feed autodiscovery to do
-	 *
-	 * @access public
-	 * @see SIMPLEPIE_LOCATOR_NONE
-	 * @see SIMPLEPIE_LOCATOR_AUTODISCOVERY
-	 * @see SIMPLEPIE_LOCATOR_LOCAL_EXTENSION
-	 * @see SIMPLEPIE_LOCATOR_LOCAL_BODY
-	 * @see SIMPLEPIE_LOCATOR_REMOTE_EXTENSION
-	 * @see SIMPLEPIE_LOCATOR_REMOTE_BODY
-	 * @see SIMPLEPIE_LOCATOR_ALL
-	 * @param int $level Feed Autodiscovery Level (level can be a
-	 * combination of the above constants, see bitwise OR operator)
-	 */
-	function set_autodiscovery_level($level = SIMPLEPIE_LOCATOR_ALL)
-	{
-		$this->autodiscovery = (int) $level;
-	}
-
-	/**
-	 * Allows you to change which class SimplePie uses for caching.
-	 * Useful when you are overloading or extending SimplePie's default classes.
-	 *
-	 * @access public
-	 * @param string $class Name of custom class.
-	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
-	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
-	 */
-	function set_cache_class($class = 'SimplePie_Cache')
-	{
-		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Cache'))
-		{
-			$this->cache_class = $class;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Allows you to change which class SimplePie uses for auto-discovery.
-	 * Useful when you are overloading or extending SimplePie's default classes.
-	 *
-	 * @access public
-	 * @param string $class Name of custom class.
-	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
-	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
-	 */
-	function set_locator_class($class = 'SimplePie_Locator')
-	{
-		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Locator'))
-		{
-			$this->locator_class = $class;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Allows you to change which class SimplePie uses for XML parsing.
-	 * Useful when you are overloading or extending SimplePie's default classes.
-	 *
-	 * @access public
-	 * @param string $class Name of custom class.
-	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
-	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
-	 */
-	function set_parser_class($class = 'SimplePie_Parser')
-	{
-		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Parser'))
-		{
-			$this->parser_class = $class;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Allows you to change which class SimplePie uses for remote file fetching.
-	 * Useful when you are overloading or extending SimplePie's default classes.
-	 *
-	 * @access public
-	 * @param string $class Name of custom class.
-	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
-	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
-	 */
-	function set_file_class($class = 'SimplePie_File')
-	{
-		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_File'))
-		{
-			$this->file_class = $class;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Allows you to change which class SimplePie uses for data sanitization.
-	 * Useful when you are overloading or extending SimplePie's default classes.
-	 *
-	 * @access public
-	 * @param string $class Name of custom class.
-	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
-	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
-	 */
-	function set_sanitize_class($class = 'SimplePie_Sanitize')
-	{
-		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Sanitize'))
-		{
-			$this->sanitize =& new $class;
-			$this->sanitize->proxy = $this->proxy;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Allows you to change which class SimplePie uses for handling feed items.
-	 * Useful when you are overloading or extending SimplePie's default classes.
-	 *
-	 * @access public
-	 * @param string $class Name of custom class.
-	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
-	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
-	 */
-	function set_item_class($class = 'SimplePie_Item')
-	{
-		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Item'))
-		{
-			$this->item_class = $class;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Allows you to change which class SimplePie uses for handling author data.
-	 * Useful when you are overloading or extending SimplePie's default classes.
-	 *
-	 * @access public
-	 * @param string $class Name of custom class.
-	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
-	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
-	 */
-	function set_author_class($class = 'SimplePie_Author')
-	{
-		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Author'))
-		{
-			$this->author_class = $class;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Allows you to change which class SimplePie uses for handling category data.
-	 * Useful when you are overloading or extending SimplePie's default classes.
-	 *
-	 * @access public
-	 * @param string $class Name of custom class.
-	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
-	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
-	 */
-	function set_category_class($class = 'SimplePie_Category')
-	{
-		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Category'))
-		{
-			$this->category_class = $class;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Allows you to change which class SimplePie uses for feed enclosures.
-	 * Useful when you are overloading or extending SimplePie's default classes.
-	 *
-	 * @access public
-	 * @param string $class Name of custom class.
-	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
-	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
-	 */
-	function set_enclosure_class($class = 'SimplePie_Enclosure')
-	{
-		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Enclosure'))
-		{
-			$this->enclosure_class = $class;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Allows you to change which class SimplePie uses for <media:text> captions
-	 * Useful when you are overloading or extending SimplePie's default classes.
-	 *
-	 * @access public
-	 * @param string $class Name of custom class.
-	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
-	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
-	 */
-	function set_caption_class($class = 'SimplePie_Caption')
-	{
-		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Caption'))
-		{
-			$this->caption_class = $class;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Allows you to change which class SimplePie uses for <media:copyright>
-	 * Useful when you are overloading or extending SimplePie's default classes.
-	 *
-	 * @access public
-	 * @param string $class Name of custom class.
-	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
-	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
-	 */
-	function set_copyright_class($class = 'SimplePie_Copyright')
-	{
-		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Copyright'))
-		{
-			$this->copyright_class = $class;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Allows you to change which class SimplePie uses for <media:credit>
-	 * Useful when you are overloading or extending SimplePie's default classes.
-	 *
-	 * @access public
-	 * @param string $class Name of custom class.
-	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
-	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
-	 */
-	function set_credit_class($class = 'SimplePie_Credit')
-	{
-		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Credit'))
-		{
-			$this->credit_class = $class;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Allows you to change which class SimplePie uses for <media:rating>
-	 * Useful when you are overloading or extending SimplePie's default classes.
-	 *
-	 * @access public
-	 * @param string $class Name of custom class.
-	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
-	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
-	 */
-	function set_rating_class($class = 'SimplePie_Rating')
-	{
-		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Rating'))
-		{
-			$this->rating_class = $class;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Allows you to change which class SimplePie uses for <media:restriction>
-	 * Useful when you are overloading or extending SimplePie's default classes.
-	 *
-	 * @access public
-	 * @param string $class Name of custom class.
-	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
-	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
-	 */
-	function set_restriction_class($class = 'SimplePie_Restriction')
-	{
-		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Restriction'))
-		{
-			$this->restriction_class = $class;
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Allows you to override the default user agent string.
-	 *
-	 * @access public
-	 * @param string $ua New user agent string.
-	 */
-	function set_useragent($ua = SIMPLEPIE_USERAGENT)
-	{
-		$this->useragent = (string) $ua;
-	}
-
-	/**
-	 * Set callback function to create cache filename with
-	 *
-	 * @access public
-	 * @param mixed $function Callback function
-	 */
-	function set_cache_name_function($function = 'md5')
-	{
-		if (is_callable($function))
-		{
-			$this->cache_name_function = $function;
-		}
-	}
-
-	/**
-	 * Set javascript query string parameter
-	 *
-	 * @access public
-	 * @param mixed $get Javascript query string parameter
-	 */
-	function set_javascript($get = 'js')
-	{
-		if ($get)
-		{
-			$this->javascript = (string) $get;
-		}
-		else
-		{
-			$this->javascript = false;
-		}
-	}
-
-	/**
-	 * Set options to make SP as fast as possible.  Forgoes a
-	 * substantial amount of data sanitization in favor of speed.
-	 *
-	 * @access public
-	 * @param bool $set Whether to set them or not
-	 */
-	function set_stupidly_fast($set = false)
-	{
-		if ($set)
-		{
-			$this->enable_order_by_date(false);
-			$this->remove_div(false);
-			$this->strip_comments(false);
-			$this->strip_htmltags(false);
-			$this->strip_attributes(false);
-			$this->set_image_handler(false);
-		}
-	}
-
-	/**
-	 * Set maximum number of feeds to check with autodiscovery
-	 *
-	 * @access public
-	 * @param int $max Maximum number of feeds to check
-	 */
-	function set_max_checked_feeds($max = 10)
-	{
-		$this->max_checked_feeds = (int) $max;
-	}
-
-	function remove_div($enable = true)
-	{
-		$this->sanitize->remove_div($enable);
-	}
-
-	function strip_htmltags($tags = '', $encode = null)
-	{
-		if ($tags === '')
-		{
-			$tags = $this->strip_htmltags;
-		}
-		$this->sanitize->strip_htmltags($tags);
-		if ($encode !== null)
-		{
-			$this->sanitize->encode_instead_of_strip($tags);
-		}
-	}
-
-	function encode_instead_of_strip($enable = true)
-	{
-		$this->sanitize->encode_instead_of_strip($enable);
-	}
-
-	function strip_attributes($attribs = '')
-	{
-		if ($attribs === '')
-		{
-			$attribs = $this->strip_attributes;
-		}
-		$this->sanitize->strip_attributes($attribs);
-	}
-
-	function set_output_encoding($encoding = 'UTF-8')
-	{
-		$this->sanitize->set_output_encoding($encoding);
-	}
-
-	function strip_comments($strip = false)
-	{
-		$this->sanitize->strip_comments($strip);
-	}
-
-	/**
-	 * Set element/attribute key/value pairs of HTML attributes
-	 * containing URLs that need to be resolved relative to the feed
-	 *
-	 * @access public
-	 * @since 1.0
-	 * @param array $element_attribute Element/attribute key/value pairs
-	 */
-	function set_url_replacements($element_attribute = array('a' => 'href', 'area' => 'href', 'blockquote' => 'cite', 'del' => 'cite', 'form' => 'action', 'img' => array('longdesc', 'src'), 'input' => 'src', 'ins' => 'cite', 'q' => 'cite'))
-	{
-		$this->sanitize->set_url_replacements($element_attribute);
-	}
-
-	/**
-	 * Set the handler to enable the display of cached favicons.
-	 *
-	 * @access public
-	 * @param str $page Web-accessible path to the handler_favicon.php file.
-	 * @param str $qs The query string that the value should be passed to.
-	 */
-	function set_favicon_handler($page = false, $qs = 'i')
-	{
-		if ($page != false)
-		{
-			$this->favicon_handler = $page . '?' . $qs . '=';
-		}
-		else
-		{
-			$this->favicon_handler = '';
-		}
-	}
-
-	/**
-	 * Set the handler to enable the display of cached images.
-	 *
-	 * @access public
-	 * @param str $page Web-accessible path to the handler_image.php file.
-	 * @param str $qs The query string that the value should be passed to.
-	 */
-	function set_image_handler($page = false, $qs = 'i')
-	{
-		if ($page != false)
-		{
-			$this->sanitize->set_image_handler($page . '?' . $qs . '=');
-		}
-		else
-		{
-			$this->image_handler = '';
-		}
-	}
-
-	function init()
-	{
-		if ((function_exists('version_compare') && version_compare(PHP_VERSION, '4.1.0', '<')) || !extension_loaded('xml') || !extension_loaded('pcre'))
-		{
-			return false;
-		}
-		if (isset($_GET[$this->javascript]))
-		{
-			if (function_exists('ob_gzhandler'))
-			{
-				ob_start('ob_gzhandler');
-			}
-			header('Content-type: text/javascript; charset: UTF-8');
-			header('Cache-Control: must-revalidate');
-			header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 604800) . ' GMT'); // 7 days
-			?>
-function embed_odeo(link) {
-	document.writeln('<embed src="http://odeo.com/flash/audio_player_fullsize.swf" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash" quality="high" width="440" height="80" wmode="transparent" allowScriptAccess="any" flashvars="valid_sample_rate=true&external_url='+link+'"></embed>');
-}
-
-function embed_quicktime(type, bgcolor, width, height, link, placeholder, loop) {
-	if (placeholder != '') {
-		document.writeln('<embed type="'+type+'" style="cursor:hand; cursor:pointer;" href="'+link+'" src="'+placeholder+'" width="'+width+'" height="'+height+'" autoplay="false" target="myself" controller="false" loop="'+loop+'" scale="aspect" bgcolor="'+bgcolor+'" pluginspage="http://www.apple.com/quicktime/download/"></embed>');
-	}
-	else {
-		document.writeln('<embed type="'+type+'" style="cursor:hand; cursor:pointer;" src="'+link+'" width="'+width+'" height="'+height+'" autoplay="false" target="myself" controller="true" loop="'+loop+'" scale="aspect" bgcolor="'+bgcolor+'" pluginspage="http://www.apple.com/quicktime/download/"></embed>');
-	}
-}
-
-function embed_flash(bgcolor, width, height, link, loop, type) {
-	document.writeln('<embed src="'+link+'" pluginspage="http://www.macromedia.com/go/getflashplayer" type="'+type+'" quality="high" width="'+width+'" height="'+height+'" bgcolor="'+bgcolor+'" loop="'+loop+'"></embed>');
-}
-
-function embed_flv(width, height, link, placeholder, loop, player) {
-	document.writeln('<embed src="'+player+'" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash" quality="high" width="'+width+'" height="'+height+'" wmode="transparent" flashvars="file='+link+'&autostart=false&repeat='+loop+'&showdigits=true&showfsbutton=false"></embed>');
-}
-
-function embed_wmedia(width, height, link) {
-	document.writeln('<embed type="application/x-mplayer2" src="'+link+'" autosize="1" width="'+width+'" height="'+height+'" showcontrols="1" showstatusbar="0" showdisplay="0" autostart="0"></embed>');
-}
-			<?php
-			exit;
-		}
-
-		// Pass whatever was set with config options over to the sanitizer.
-		$this->sanitize->pass_cache_data($this->cache, $this->cache_location, $this->cache_name_function, $this->cache_class);
-		$this->sanitize->pass_file_data($this->file_class, $this->timeout, $this->useragent, $this->force_fsockopen);
-
-		if ($this->feed_url !== null || $this->raw_data !== null)
-		{
-			$this->data = array();
-			$this->multifeed_objects = array();
-			$cache = false;
-
-			if ($this->feed_url !== null)
-			{
-				$parsed_feed_url = SimplePie_Misc::parse_url($this->feed_url);
-				// Decide whether to enable caching
-				if ($this->cache && $parsed_feed_url['scheme'] !== '')
-				{
-					$cache =& new $this->cache_class($this->cache_location, call_user_func($this->cache_name_function, $this->feed_url), 'spc');
-				}
-				// If it's enabled and we don't want an XML dump, use the cache
-				if ($cache && !$this->xml_dump)
-				{
-					// Load the Cache
-					$this->data = $cache->load();
-					if (!empty($this->data))
-					{
-						// If the cache is for an outdated build of SimplePie
-						if (!isset($this->data['build']) || $this->data['build'] != SIMPLEPIE_BUILD)
-						{
-							$cache->unlink();
-							$this->data = array();
-						}
-						// If we've hit a collision just rerun it with caching disabled
-						elseif (isset($this->data['url']) && $this->data['url'] != $this->feed_url)
-						{
-							$cache = false;
-							$this->data = array();
-						}
-						// If we've got a non feed_url stored (if the page isn't actually a feed, or is a redirect) use that URL.
-						elseif (isset($this->data['feed_url']))
-						{
-							// If the autodiscovery cache is still valid use it.
-							if ($cache->mtime() + $this->autodiscovery_cache_duration > time())
-							{
-								// Do not need to do feed autodiscovery yet.
-								if ($this->data['feed_url'] == $this->data['url'])
-								{
-									$cache->unlink();
-									$this->data = array();
-								}
-								else
-								{
-									$this->set_feed_url($this->data['feed_url']);
-									return $this->init();
-								}
-							}
-						}
-						// Check if the cache has been updated
-						elseif ($cache->mtime() + $this->cache_duration < time())
-						{
-							// If we have last-modified and/or etag set
-							if (isset($this->data['headers']['last-modified']) || isset($this->data['headers']['etag']))
-							{
-								$headers = array();
-								if (isset($this->data['headers']['last-modified']))
-								{
-									$headers['if-modified-since'] = $this->data['headers']['last-modified'];
-								}
-								if (isset($this->data['headers']['etag']))
-								{
-									$headers['if-none-match'] = $this->data['headers']['etag'];
-								}
-								$file =& new $this->file_class($this->feed_url, $this->timeout/10, 5, $headers, $this->useragent, $this->force_fsockopen, $this->proxy);
-								if ($file->success)
-								{
-									if ($file->status_code == 304)
-									{
-										$cache->touch();
-										return true;
-									}
-									else
-									{
-										$headers = $file->headers;
-									}
-								}
-								else
-								{
-									unset($file);
-								}
-							}
-						}
-						// If the cache is still valid, just return true
-						else
-						{
-							return true;
-						}
-					}
-					// If the cache is empty, delete it
-					else
-					{
-						$cache->unlink();
-						$this->data = array();
-					}
-				}
-				// If we don't already have the file (it'll only exist if we've opened it to check if the cache has been modified), open it.
-				if (!isset($file))
-				{
-					if (SimplePie_Misc::is_a($this->file, 'SimplePie_File') && $this->file->url == $this->feed_url)
-					{
-						$file =& $this->file;
-					}
-					else
-					{
-						$file =& new $this->file_class($this->feed_url, $this->timeout, 5, null, $this->useragent, $this->force_fsockopen, $this->proxy);
-					}
-				}
-				// If the file connection has an error, set SimplePie::error to that and quit
-				if (!$file->success)
-				{
-					$this->error = $file->error;
-					if (!empty($this->data))
-					{
-						return true;
-					}
-					else
-					{
-						return false;
-					}
-				}
-
-				// Check if the supplied URL is a feed, if it isn't, look for it.
-				$locate =& new $this->locator_class($file, $this->timeout, $this->useragent, $this->file_class, $this->max_checked_feeds);
-				if (!$locate->is_feed($file))
-				{
-					// We need to unset this so that if SimplePie::set_file() has been called that object is untouched
-					unset($file);
-					if ($file = $locate->find($this->autodiscovery))
-					{
-						if ($cache)
-						{
-							if (!$cache->save(array('url' => $this->feed_url, 'feed_url' => $file->url, 'build' => SIMPLEPIE_BUILD)))
-							{
-								trigger_error("$cache->name is not writeable", E_USER_WARNING);
-							}
-							$cache =& new $this->cache_class($this->cache_location, call_user_func($this->cache_name_function, $file->url), 'spc');
-						}
-						$this->feed_url = $file->url;
-					}
-					else
-					{
-						$this->error = "A feed could not be found at $this->feed_url";
-						SimplePie_Misc::error($this->error, E_USER_NOTICE, __FILE__, __LINE__);
-						return false;
-					}
-				}
-				$locate = null;
-
-				$headers = $file->headers;
-				$data = trim($file->body);
-				unset($file);
-			}
-			else
-			{
-				$data = $this->raw_data;
-			}
-
-			// First check to see if input has been overridden.
-			if ($this->input_encoding !== false)
-			{
-				$encoding = $this->input_encoding;
-			}
-			// Second try HTTP headers
-			elseif (isset($headers['content-type']) && preg_match('/;[\x09\x20]*charset=([^;]*)/i', $headers['content-type'], $charset))
-			{
-				$encoding = $charset[1];
-			}
-			// Then prolog, if at the very start of the document
-			elseif (preg_match("/^<\?xml[\x20\x9\xD\xA]+version([\x20\x9\xD\xA]+)?=([\x20\x9\xD\xA]+)?(\"1.0\"|'1.0'|\"1.1\"|'1.1')[\x20\x9\xD\xA]+encoding([\x20\x9\xD\xA]+)?=([\x20\x9\xD\xA]+)?(\"[A-Za-z][A-Za-z0-9._\-]*\"|'[A-Za-z][A-Za-z0-9._\-]*')([\x20\x9\xD\xA]+standalone([\x20\x9\xD\xA]+)?=([\x20\x9\xD\xA]+)?(\"(yes|no)\"|'(yes|no)'))?([\x20\x9\xD\xA]+)?\?>/", $data, $prolog))
-			{
-				$encoding = substr($prolog[6], 1, -1);
-			}
-			// UTF-32 Big Endian BOM
-			elseif (strpos($data, "\x0\x0\xFE\xFF") === 0)
-			{
-				$encoding = 'UTF-32be';
-			}
-			// UTF-32 Little Endian BOM
-			elseif (strpos($data, "\xFF\xFE\x0\x0") === 0)
-			{
-				$encoding = 'UTF-32';
-			}
-			// UTF-16 Big Endian BOM
-			elseif (strpos($data, "\xFE\xFF") === 0)
-			{
-				$encoding = 'UTF-16be';
-			}
-			// UTF-16 Little Endian BOM
-			elseif (strpos($data, "\xFF\xFE") === 0)
-			{
-				$encoding = 'UTF-16le';
-			}
-			// UTF-8 BOM
-			elseif (strpos($data, "\xEF\xBB\xBF") === 0)
-			{
-				$encoding = 'UTF-8';
-			}
-			// Fallback to the default (US-ASCII for text/xml, ISO-8859-1 for text/* MIME types, UTF-8 otherwise)
-			elseif (isset($headers['content-type']) && strtolower(SimplePie_Misc::parse_mime($headers['content-type'])) == 'text/xml')
-			{
-				$encoding = 'US-ASCII';
-			}
-			elseif (isset($headers['content-type']) && SimplePie_Misc::stripos(SimplePie_Misc::parse_mime($headers['content-type']), 'text/') === 0)
-			{
-				$encoding = 'ISO-8859-1';
-			}
-			else
-			{
-				$encoding = 'UTF-8';
-			}
-
-			// Change the encoding to UTF-8 (as we always use UTF-8 internally)
-			if ($encoding != 'UTF-8')
-			{
-				$data = SimplePie_Misc::change_encoding($data, $encoding, 'UTF-8');
-			}
-
-			// Strip illegal characters
-			$data = SimplePie_Misc::utf8_bad_replace($data);
-
-			$parser =& new $this->parser_class();
-			$parser->pre_process($data, 'UTF-8');
-			// If we want the XML, just output that and quit
-			if ($this->xml_dump)
-			{
-				header('Content-type: text/xml; charset=UTF-8');
-				echo $data;
-				exit;
-			}
-			// If it's parsed fine
-			elseif ($parser->parse($data))
-			{
-				unset($data);
-				$this->data = $parser->get_data();
-				if (isset($this->data['child']))
-				{
-					if (isset($headers))
-					{
-						$this->data['headers'] = $headers;
-					}
-					$this->data['build'] = SIMPLEPIE_BUILD;
-
-					// Cache the file if caching is enabled
-					if ($cache && !$cache->save($this->data))
-					{
-						trigger_error("$cache->name is not writeable", E_USER_WARNING);
-					}
-					return true;
-				}
-				else
-				{
-					$this->error = "A feed could not be found at $this->feed_url";
-					SimplePie_Misc::error($this->error, E_USER_NOTICE, __FILE__, __LINE__);
-					return false;
-				}
-			}
-			// If we have an error, just set SimplePie::error to it and quit
-			else
-			{
-				$this->error = sprintf('XML error: %s at line %d, column %d', $parser->get_error_string(), $parser->get_current_line(), $parser->get_current_column());
-				SimplePie_Misc::error($this->error, E_USER_NOTICE, __FILE__, __LINE__);
-				return false;
-			}
-		}
-		elseif (!empty($this->multifeed_url))
-		{
-			$i = 0;
-			$success = 0;
-			$this->multifeed_objects = array();
-			foreach ($this->multifeed_url as $url)
-			{
-				if (SIMPLEPIE_PHP5)
-				{
-					// This keyword needs to defy coding standards for PHP4 compatibility
-					$this->multifeed_objects[$i] = clone($this);
-				}
-				else
-				{
-					$this->multifeed_objects[$i] = $this;
-				}
-				$this->multifeed_objects[$i]->set_feed_url($url);
-				$success |= $this->multifeed_objects[$i]->init();
-				$i++;
-			}
-			return (bool) $success;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	/**
-	 * Return the error message for the occured error
-	 *
-	 * @access public
-	 * @return string Error message
-	 */
-	function error()
-	{
-		return $this->error;
-	}
-
-	function get_encoding()
-	{
-		return $this->sanitize->output_encoding;
-	}
-
-	function handle_content_type($mime = 'text/html')
-	{
-		if (!headers_sent())
-		{
-			$header = "Content-type: $mime;";
-			if ($this->get_encoding())
-			{
-				$header .= ' charset=' . $this->get_encoding();
-			}
-			else
-			{
-				$header .= ' charset=UTF-8';
-			}
-			header($header);
-		}
-	}
-
-	function get_type()
-	{
-		if (!isset($this->data['type']))
-		{
-			$this->data['type'] = SIMPLEPIE_TYPE_ALL;
-			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed']))
-			{
-				$this->data['type'] &= SIMPLEPIE_TYPE_ATOM_10;
-			}
-			elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed']))
-			{
-				$this->data['type'] &= SIMPLEPIE_TYPE_ATOM_03;
-			}
-			elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF']))
-			{
-				if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['channel'])
-				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['image'])
-				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['item'])
-				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['textinput']))
-				{
-					$this->data['type'] &= SIMPLEPIE_TYPE_RSS_10;
-				}
-				if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_090]['channel'])
-				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_090]['image'])
-				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_090]['item'])
-				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_090]['textinput']))
-				{
-					$this->data['type'] &= SIMPLEPIE_TYPE_RSS_090;
-				}
-			}
-			elseif (isset($this->data['child']['']['rss']))
-			{
-				$this->data['type'] &= SIMPLEPIE_TYPE_RSS_ALL;
-				if (isset($this->data['child']['']['rss'][0]['attribs']['']['version']))
-				{
-					switch (trim($this->data['child']['']['rss'][0]['attribs']['']['version']))
-					{
-						case '0.91':
-							$this->data['type'] &= SIMPLEPIE_TYPE_RSS_091;
-							if (isset($this->data['child']['']['rss'][0]['child']['']['skiphours']['hour'][0]['data']))
-							{
-								switch (trim($this->data['child']['']['rss'][0]['child']['']['skiphours']['hour'][0]['data']))
-								{
-									case '0':
-										$this->data['type'] &= SIMPLEPIE_TYPE_RSS_091_NETSCAPE;
-										break;
-
-									case '24':
-										$this->data['type'] &= SIMPLEPIE_TYPE_RSS_091_USERLAND;
-										break;
-								}
-							}
-							break;
-
-						case '0.92':
-							$this->data['type'] &= SIMPLEPIE_TYPE_RSS_092;
-							break;
-
-						case '0.93':
-							$this->data['type'] &= SIMPLEPIE_TYPE_RSS_093;
-							break;
-
-						case '0.94':
-							$this->data['type'] &= SIMPLEPIE_TYPE_RSS_094;
-							break;
-
-						case '2.0':
-							$this->data['type'] &= SIMPLEPIE_TYPE_RSS_20;
-							break;
-					}
-				}
-			}
-			else
-			{
-				$this->data['type'] = SIMPLEPIE_TYPE_NONE;
-			}
-		}
-		return $this->data['type'];
-	}
-
-	/**
-	 * Returns the URL for the favicon of the feed's website.
-	 *
-	 * @access public
-	 * @since 1.0
-	 */
-	function get_favicon()
-	{
-		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif (($url = $this->get_link()) !== null && preg_match('/^http(s)?:\/\//i', $url))
-		{
-			$favicon = SimplePie_Misc::absolutize_url('/favicon.ico', $url);
-
-			if ($this->cache && $this->favicon_handler)
-			{
-				$cache =& new $this->cache_class($this->cache_location, call_user_func($this->cache_name_function, $favicon), 'spi');
-
-				if ($cache->load())
-				{
-					return $this->sanitize($this->favicon_handler . rawurlencode($favicon), SIMPLEPIE_CONSTRUCT_IRI);
-				}
-				else
-				{
-					$file =& new $this->file_class($favicon, $this->timeout / 10, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen, $this->proxy);
-
-					if ($file->success && ($file->status_code == 200 || ($file->status_code > 206 && $file->status_code < 300)) && strlen($file->body) > 0)
-					{
-						if ($cache->save(array('headers' => $file->headers, 'body' => $file->body)))
-						{
-							return $this->sanitize($this->favicon_handler . rawurlencode($favicon), SIMPLEPIE_CONSTRUCT_IRI);
-						}
-						else
-						{
-							trigger_error("$cache->name is not writeable", E_USER_WARNING);
-							return $this->sanitize($favicon, SIMPLEPIE_CONSTRUCT_IRI);
-						}
-					}
-				}
-			}
-			else
-			{
-				return $this->sanitize($favicon, SIMPLEPIE_CONSTRUCT_IRI);
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * @todo If we have a perm redirect we should return the new URL
-	 * @todo When we make the above change, let's support <itunes:new-feed-url> as well
-	 * @todo Also, |atom:link|@rel=self
-	 */
-	function subscribe_url()
-	{
-		if ($this->feed_url !== null)
-		{
-			return $this->sanitize($this->feed_url, SIMPLEPIE_CONSTRUCT_IRI);
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function subscribe_feed()
-	{
-		if ($this->feed_url !== null)
-		{
-			return $this->sanitize(SimplePie_Misc::fix_protocol($this->feed_url, 2), SIMPLEPIE_CONSTRUCT_IRI);
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function subscribe_outlook()
-	{
-		if ($this->feed_url !== null)
-		{
-			return 'outlook' . $this->sanitize(SimplePie_Misc::fix_protocol($this->feed_url, 2), SIMPLEPIE_CONSTRUCT_IRI);
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function subscribe_podcast()
-	{
-		if ($this->feed_url !== null)
-		{
-			return $this->sanitize(SimplePie_Misc::fix_protocol($this->feed_url, 3), SIMPLEPIE_CONSTRUCT_IRI);
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function subscribe_itunes()
-	{
-		if ($this->feed_url !== null)
-		{
-			return $this->sanitize(SimplePie_Misc::fix_protocol($this->feed_url, 4), SIMPLEPIE_CONSTRUCT_IRI);
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	/**
-	 * Creates the subscribe_* methods' return data
-	 *
-	 * @access private
-	 * @param string $feed_url String to prefix to the feed URL
-	 * @param string $site_url String to prefix to the site URL (and
-	 * suffix to the feed URL)
-	 * @return mixed URL if feed exists, false otherwise
-	 */
-	function subscribe_service($feed_url, $site_url = null)
-	{
-		if ($this->subscribe_url())
-		{
-			$return = $this->sanitize($feed_url, SIMPLEPIE_CONSTRUCT_IRI) . rawurlencode($this->subscribe_url());
-			if ($site_url !== null && $this->get_link() !== null)
-			{
-				$return .= $this->sanitize($site_url, SIMPLEPIE_CONSTRUCT_IRI) . rawurlencode($this->get_link());
-			}
-			return $return;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function subscribe_aol()
-	{
-		return $this->subscribe_service('http://feeds.my.aol.com/add.jsp?url=');
-	}
-
-	function subscribe_bloglines()
-	{
-		return urldecode($this->subscribe_service('http://www.bloglines.com/sub/'));
-	}
-
-	function subscribe_eskobo()
-	{
-		return $this->subscribe_service('http://www.eskobo.com/?AddToMyPage=');
-	}
-
-	function subscribe_feedfeeds()
-	{
-		return $this->subscribe_service('http://www.feedfeeds.com/add?feed=');
-	}
-
-	function subscribe_feedster()
-	{
-		return $this->subscribe_service('http://www.feedster.com/myfeedster.php?action=addrss&confirm=no&rssurl=');
-	}
-
-	function subscribe_google()
-	{
-		return $this->subscribe_service('http://fusion.google.com/add?feedurl=');
-	}
-
-	function subscribe_gritwire()
-	{
-		return $this->subscribe_service('http://my.gritwire.com/feeds/addExternalFeed.aspx?FeedUrl=');
-	}
-
-	function subscribe_msn()
-	{
-		return $this->subscribe_service('http://my.msn.com/addtomymsn.armx?id=rss&ut=', '&ru=');
-	}
-
-	function subscribe_netvibes()
-	{
-		return $this->subscribe_service('http://www.netvibes.com/subscribe.php?url=');
-	}
-
-	function subscribe_newsburst()
-	{
-		return $this->subscribe_service('http://www.newsburst.com/Source/?add=');
-	}
-
-	function subscribe_newsgator()
-	{
-		return $this->subscribe_service('http://www.newsgator.com/ngs/subscriber/subext.aspx?url=');
-	}
-
-	function subscribe_odeo()
-	{
-		return $this->subscribe_service('http://www.odeo.com/listen/subscribe?feed=');
-	}
-
-	function subscribe_podnova()
-	{
-		return $this->subscribe_service('http://www.podnova.com/index_your_podcasts.srf?action=add&url=');
-	}
-
-	function subscribe_rojo()
-	{
-		return $this->subscribe_service('http://www.rojo.com/add-subscription?resource=');
-	}
-
-	function subscribe_yahoo()
-	{
-		return $this->subscribe_service('http://add.my.yahoo.com/rss?url=');
-	}
-
-	function get_feed_tags($namespace, $tag)
-	{
-		$type = $this->get_type();
-		if ($type & SIMPLEPIE_TYPE_ATOM_10)
-		{
-			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['child'][$namespace][$tag]))
-			{
-				return $this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['child'][$namespace][$tag];
-			}
-		}
-		if ($type & SIMPLEPIE_TYPE_ATOM_03)
-		{
-			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['child'][$namespace][$tag]))
-			{
-				return $this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['child'][$namespace][$tag];
-			}
-		}
-		if ($type & SIMPLEPIE_TYPE_RSS_RDF)
-		{
-			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][$namespace][$tag]))
-			{
-				return $this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][$namespace][$tag];
-			}
-		}
-		if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
-		{
-			if (isset($this->data['child']['']['rss'][0]['child'][$namespace][$tag]))
-			{
-				return $this->data['child']['']['rss'][0]['child'][$namespace][$tag];
-			}
-		}
-		return null;
-	}
-
-	function get_channel_tags($namespace, $tag)
-	{
-		$type = $this->get_type();
-		if ($type & SIMPLEPIE_TYPE_ATOM_ALL)
-		{
-			if ($return = $this->get_feed_tags($namespace, $tag))
-			{
-				return $return;
-			}
-		}
-		if ($type & SIMPLEPIE_TYPE_RSS_10)
-		{
-			if ($channel = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'channel'))
-			{
-				if (isset($channel[0]['child'][$namespace][$tag]))
-				{
-					return $channel[0]['child'][$namespace][$tag];
-				}
-			}
-		}
-		if ($type & SIMPLEPIE_TYPE_RSS_090)
-		{
-			if ($channel = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'channel'))
-			{
-				if (isset($channel[0]['child'][$namespace][$tag]))
-				{
-					return $channel[0]['child'][$namespace][$tag];
-				}
-			}
-		}
-		if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
-		{
-			if ($channel = $this->get_feed_tags('', 'channel'))
-			{
-				if (isset($channel[0]['child'][$namespace][$tag]))
-				{
-					return $channel[0]['child'][$namespace][$tag];
-				}
-			}
-		}
-		return null;
-	}
-
-	function get_image_tags($namespace, $tag)
-	{
-		$type = $this->get_type();
-		if ($type & SIMPLEPIE_TYPE_RSS_10)
-		{
-			if ($image = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'image'))
-			{
-				if (isset($image[0]['child'][$namespace][$tag]))
-				{
-					return $image[0]['child'][$namespace][$tag];
-				}
-			}
-		}
-		if ($type & SIMPLEPIE_TYPE_RSS_090)
-		{
-			if ($image = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'image'))
-			{
-				if (isset($image[0]['child'][$namespace][$tag]))
-				{
-					return $image[0]['child'][$namespace][$tag];
-				}
-			}
-		}
-		if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
-		{
-			if ($image = $this->get_channel_tags('', 'image'))
-			{
-				if (isset($image[0]['child'][$namespace][$tag]))
-				{
-					return $image[0]['child'][$namespace][$tag];
-				}
-			}
-		}
-		return null;
-	}
-
-	function get_base($element = array())
-	{
-		if (!($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION) && !empty($element['xml_base_explicit']) && isset($element['xml_base']))
-		{
-			return $element['xml_base'];
-		}
-		elseif ($this->get_link() !== null)
-		{
-			return $this->get_link();
-		}
-		elseif (isset($this->data['headers']['content-location']))
-		{
-			return SimplePie_Misc::absolutize_url($this->data['headers']['content-location'], $this->subscribe_url());
-		}
-		else
-		{
-			return $this->subscribe_url();
-		}
-	}
-
-	function sanitize($data, $type, $base = '')
-	{
-		return $this->sanitize->sanitize($data, $type, $base);
-	}
-
-	function get_title()
-	{
-		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
-		{
-			return $this->sanitize($return[0]['data'], SimplePie_Misc::atom_10_construct_type($return[0]['attribs']), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
-		{
-			return $this->sanitize($return[0]['data'], SimplePie_Misc::atom_03_construct_type($return[0]['attribs']), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags('', 'title'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_link($key = 0, $rel = 'alternate')
-	{
-		$links = $this->get_links($rel);
-		if (isset($links[$key]))
-		{
-			return $links[$key];
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	/**
-	 * Added for parity between the parent-level and the item/entry-level.
-	 */
-	function get_permalink()
-	{
-		return $this->get_link(0);
-	}
-
-	function get_links($rel = 'alternate')
-	{
-		if (!isset($this->data['links']))
-		{
-			$this->data['links'] = array();
-			if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link'))
-			{
-				foreach ($links as $link)
-				{
-					if (isset($link['attribs']['']['href']))
-					{
-						$link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
-						$this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
-					}
-				}
-			}
-			if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'link'))
-			{
-				foreach ($links as $link)
-				{
-					if (isset($link['attribs']['']['href']))
-					{
-						$link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
-						$this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
-
-					}
-				}
-			}
-			if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link'))
-			{
-				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
-			}
-			if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
-			{
-				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
-			}
-			if ($links = $this->get_channel_tags('', 'link'))
-			{
-				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
-			}
-
-			$keys = array_keys($this->data['links']);
-			foreach ($keys as $key)
-			{
-				if (SimplePie_Misc::is_isegment_nz_nc($key))
-				{
-					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
-					{
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
-						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
-					}
-					else
-					{
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
-					}
-				}
-				elseif (substr($key, 0, 41) == SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
-				{
-					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
-				}
-				$this->data['links'][$key] = array_unique($this->data['links'][$key]);
-			}
-		}
-
-		if (isset($this->data['links'][$rel]))
-		{
-			return $this->data['links'][$rel];
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_description()
-	{
-		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'subtitle'))
-		{
-			return $this->sanitize($return[0]['data'], SimplePie_Misc::atom_10_construct_type($return[0]['attribs']), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
-		{
-			return $this->sanitize($return[0]['data'], SimplePie_Misc::atom_03_construct_type($return[0]['attribs']), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags('', 'description'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_copyright()
-	{
-		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'rights'))
-		{
-			return $this->sanitize($return[0]['data'], SimplePie_Misc::atom_10_construct_type($return[0]['attribs']), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags('', 'copyright'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_language()
-	{
-		if ($return = $this->get_channel_tags('', 'language'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang']))
-		{
-			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang']))
-		{
-			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang']))
-		{
-			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (isset($this->data['headers']['content-language']))
-		{
-			return $this->sanitize($this->data['headers']['content-language'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_latitude()
-	{
-		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
-		{
-			return (float) $return[0]['data'];
-		}
-		elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', $return[0]['data'], $match))
-		{
-			return (float) $match[1];
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_longitude()
-	{
-		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
-		{
-			return (float) $return[0]['data'];
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
-		{
-			return (float) $return[0]['data'];
-		}
-		elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', $return[0]['data'], $match))
-		{
-			return (float) $match[2];
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_image_title()
-	{
-		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_image_tags('', 'title'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_image_url()
-	{
-		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'image'))
-		{
-			return $this->sanitize($return[0]['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI);
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'url'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'url'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_image_tags('', 'url'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_image_link()
-	{
-		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_image_tags('', 'link'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_image_width()
-	{
-		if ($return = $this->get_image_tags('', 'width'))
-		{
-			return round($return[0]['data']);
-		}
-		elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags('', 'url'))
-		{
-			return 88.0;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_image_height()
-	{
-		if ($return = $this->get_image_tags('', 'height'))
-		{
-			return round($return[0]['data']);
-		}
-		elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags('', 'url'))
-		{
-			return 31.0;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_item_quantity($max = 0)
-	{
-		$qty = count($this->get_items());
-		if ($max == 0)
-		{
-			return $qty;
-		}
-		else
-		{
-			return ($qty > $max) ? $max : $qty;
-		}
-	}
-
-	function get_item($key = 0)
-	{
-		$items = $this->get_items();
-		if (isset($items[$key]))
-		{
-			return $items[$key];
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_items($start = 0, $end = 0)
-	{
-		if (!empty($this->multifeed_objects))
-		{
-			return SimplePie::merge_items($this->multifeed_objects, $start, $end);
-		}
-		elseif (!isset($this->data['items']))
-		{
-			if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'entry'))
-			{
-				$keys = array_keys($items);
-				foreach ($keys as $key)
-				{
-					$this->data['items'][] =& new $this->item_class($this, $items[$key]);
-				}
-			}
-			if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'entry'))
-			{
-				$keys = array_keys($items);
-				foreach ($keys as $key)
-				{
-					$this->data['items'][] =& new $this->item_class($this, $items[$key]);
-				}
-			}
-			if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'item'))
-			{
-				$keys = array_keys($items);
-				foreach ($keys as $key)
-				{
-					$this->data['items'][] =& new $this->item_class($this, $items[$key]);
-				}
-			}
-			if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'item'))
-			{
-				$keys = array_keys($items);
-				foreach ($keys as $key)
-				{
-					$this->data['items'][] =& new $this->item_class($this, $items[$key]);
-				}
-			}
-			if ($items = $this->get_channel_tags('', 'item'))
-			{
-				$keys = array_keys($items);
-				foreach ($keys as $key)
-				{
-					$this->data['items'][] =& new $this->item_class($this, $items[$key]);
-				}
-			}
-		}
-
-		if (!empty($this->data['items']))
-		{
-			// If we want to order it by date, check if all items have a date, and then sort it
-			if ($this->order_by_date)
-			{
-				if (!isset($this->data['ordered_items']))
-				{
-					$do_sort = true;
-					foreach ($this->data['items'] as $item)
-					{
-						if (!$item->get_date('U'))
-						{
-							$do_sort = false;
-							break;
-						}
-					}
-					$item = null;
-					$this->data['ordered_items'] = $this->data['items'];
-					if ($do_sort)
-					{
-						usort($this->data['ordered_items'], array(&$this, 'sort_items'));
-					}
-				}
-				$items = $this->data['ordered_items'];
-			}
-			else
-			{
-				$items = $this->data['items'];
-			}
-
-			// Slice the data as desired
-			if ($end == 0)
-			{
-				return array_slice($items, $start);
-			}
-			else
-			{
-				return array_slice($items, $start, $end);
-			}
-		}
-		else
-		{
-			return array();
-		}
-	}
-
-	function sort_items($a, $b)
-	{
-		return $a->get_date('U') <= $b->get_date('U');
-	}
-
-	function merge_items($urls, $start = 0, $end = 0)
-	{
-		if (is_array($urls) && sizeof($urls) > 0)
-		{
-			$items = array();
-			foreach ($urls as $arg)
-			{
-				if (SimplePie_Misc::is_a($arg, 'SimplePie'))
-				{
-					$items = array_merge($items, $arg->get_items());
-				}
-				else
-				{
-					trigger_error('Arguments must be SimplePie objects', E_USER_WARNING);
-				}
-			}
-
-			$do_sort = true;
-			foreach ($items as $item)
-			{
-				if (!$item->get_date('U'))
-				{
-					$do_sort = false;
-					break;
-				}
-			}
-			$item = null;
-			if ($do_sort)
-			{
-				usort($items, array('SimplePie', 'sort_items'));
-			}
-
-			if ($end == 0)
-			{
-				return array_slice($items, $start);
-			}
-			else
-			{
-				return array_slice($items, $start, $end);
-			}
-		}
-		else
-		{
-			trigger_error('Cannot merge zero SimplePie objects', E_USER_WARNING);
-			return array();
-		}
-	}
-}
-
-class SimplePie_Item
-{
-	var $feed;
-	var $data = array();
-
-	function SimplePie_Item($feed, $data)
-	{
-		$this->feed = $feed;
-		$this->data = $data;
-	}
-
-	function __toString()
-	{
-		return md5(serialize($this->data));
-	}
-
-	function get_item_tags($namespace, $tag)
-	{
-		if (isset($this->data['child'][$namespace][$tag]))
-		{
-			return $this->data['child'][$namespace][$tag];
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_base($element = array())
-	{
-		return $this->feed->get_base($element);
-	}
-
-	function sanitize($data, $type, $base = '')
-	{
-		return $this->feed->sanitize($data, $type, $base);
-	}
-
-	function get_feed()
-	{
-		return $this->feed;
-	}
-
-	function get_id($hash = false)
-	{
-		if ($hash)
-		{
-			return $this->__toString();
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'id'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'id'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_item_tags('', 'guid'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'identifier'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'identifier'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (($return = $this->get_permalink()) !== null)
-		{
-			return $return;
-		}
-		elseif (($return = $this->get_title()) !== null)
-		{
-			return $return;
-		}
-		else
-		{
-			return $this->__toString();
-		}
-	}
-
-	function get_title()
-	{
-		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
-		{
-			return $this->sanitize($return[0]['data'], SimplePie_Misc::atom_10_construct_type($return[0]['attribs']), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
-		{
-			return $this->sanitize($return[0]['data'], SimplePie_Misc::atom_03_construct_type($return[0]['attribs']), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_item_tags('', 'title'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_description($description_only = false)
-	{
-		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'summary'))
-		{
-			return $this->sanitize($return[0]['data'], SimplePie_Misc::atom_10_construct_type($return[0]['attribs']), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'summary'))
-		{
-			return $this->sanitize($return[0]['data'], SimplePie_Misc::atom_03_construct_type($return[0]['attribs']), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_item_tags('', 'description'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (!$description_only)
-		{
-			return $this->get_content(true);
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_content($content_only = false)
-	{
-		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'content'))
-		{
-			return $this->sanitize($return[0]['data'], SimplePie_Misc::atom_10_content_construct_type($return[0]['attribs']), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'content'))
-		{
-			return $this->sanitize($return[0]['data'], SimplePie_Misc::atom_03_construct_type($return[0]['attribs']), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10_MODULES_CONTENT, 'encoded'))
-		{
-			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-		}
-		elseif (!$content_only)
-		{
-			return $this->get_description(true);
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_category($key = 0)
-	{
-		$categories = $this->get_categories();
-		if (isset($categories[$key]))
-		{
-			return $categories[$key];
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_categories()
-	{
-		$categories = array();
-
-		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'category') as $category)
-		{
-			$term = null;
-			$scheme = null;
-			$label = null;
-			if (isset($category['attribs']['']['term']))
-			{
-				$term = $this->sanitize($category['attribs']['']['term'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			if (isset($category['attribs']['']['scheme']))
-			{
-				$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			if (isset($category['attribs']['']['label']))
-			{
-				$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			$categories[] =& new $this->feed->category_class($term, $scheme, $label);
-		}
-		foreach ((array) $this->get_item_tags('', 'category') as $category)
-		{
-			$categories[] =& new $this->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
-		}
-		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category)
-		{
-			$categories[] =& new $this->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
-		}
-		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'subject') as $category)
-		{
-			$categories[] =& new $this->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
-		}
-
-		if (!empty($categories))
-		{
-			return SimplePie_Misc::array_unique($categories);
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_author($key = 0)
-	{
-		$authors = $this->get_authors();
-		if (isset($authors[$key]))
-		{
-			return $authors[$key];
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	/**
-	 * @todo Atom inheritance (item author, source author, feed author)
-	 */
-	function get_authors()
-	{
-		$authors = array();
-		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'author') as $author)
-		{
-			$name = null;
-			$uri = null;
-			$email = null;
-			if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']))
-			{
-				$name = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']))
-			{
-				$uri = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]));
-			}
-			if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data']))
-			{
-				$email = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			if ($name !== null || $email !== null || $uri !== null)
-			{
-				$authors[] =& new $this->feed->author_class($name, $uri, $email);
-			}
-		}
-		if ($author = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'author'))
-		{
-			$name = null;
-			$url = null;
-			$email = null;
-			if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data']))
-			{
-				$name = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data']))
-			{
-				$uri = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]));
-			}
-			if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data']))
-			{
-				$email = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			if ($name !== null || $email !== null || $uri !== null)
-			{
-				$authors[] =& new $this->feed->author_class($name, $url, $email);
-			}
-		}
-		if ($author = $this->get_item_tags('', 'author'))
-		{
-			$authors[] =& new $this->feed->author_class(null, null, $this->sanitize($author[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
-		}
-		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'creator') as $author)
-		{
-			$authors[] =& new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
-		}
-		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'creator') as $author)
-		{
-			$authors[] =& new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
-		}
-		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'author') as $author)
-		{
-			$authors[] =& new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
-		}
-
-		if (!empty($authors))
-		{
-			return SimplePie_Misc::array_unique($authors);
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_date($date_format = 'j F Y, g:i a')
-	{
-		if (!isset($this->data['date']))
-		{
-			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'published'))
-			{
-				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'updated'))
-			{
-				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'issued'))
-			{
-				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'created'))
-			{
-				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'modified'))
-			{
-				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags('', 'pubDate'))
-			{
-				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'date'))
-			{
-				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'date'))
-			{
-				$this->data['date']['raw'] = $return[0]['data'];
-			}
-
-			if (!empty($this->data['date']['raw']))
-			{
-				$this->data['date']['parsed'] = SimplePie_Misc::parse_date($this->data['date']['raw']);
-			}
-			else
-			{
-				$this->data['date'] = null;
-			}
-		}
-		if ($this->data['date'])
-		{
-			$date_format = (string) $date_format;
-			switch ($date_format)
-			{
-				case '':
-					return $this->sanitize($this->data['date']['raw'], SIMPLEPIE_CONSTRUCT_TEXT);
-
-				case 'U':
-					return $this->data['date']['parsed'];
-
-				default:
-					return date($date_format, $this->data['date']['parsed']);
-			}
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_local_date($date_format = '%c')
-	{
-		if (!$date_format)
-		{
-			return $this->sanitize($this->get_date(''), SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (($date = $this->get_date('U')) !== null)
-		{
-			return strftime($date_format, $date);
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_permalink()
-	{
-		$link = $this->get_link();
-		$enclosure = $this->get_enclosure(0);
-		if ($link !== null)
-		{
-			return $link;
-		}
-		elseif ($enclosure !== null)
-		{
-			return $enclosure->get_link();
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_link($key = 0, $rel = 'alternate')
-	{
-		$links = $this->get_links($rel);
-		if ($links[$key] !== null)
-		{
-			return $links[$key];
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_links($rel = 'alternate')
-	{
-		if (!isset($this->data['links']))
-		{
-			$this->data['links'] = array();
-			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link') as $link)
-			{
-				if (isset($link['attribs']['']['href']))
-				{
-					$link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
-					$this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
-
-				}
-			}
-			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'link') as $link)
-			{
-				if (isset($link['attribs']['']['href']))
-				{
-					$link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
-					$this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
-				}
-			}
-			if ($links = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link'))
-			{
-				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
-			}
-			if ($links = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
-			{
-				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
-			}
-			if ($links = $this->get_item_tags('', 'link'))
-			{
-				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
-			}
-			if ($links = $this->get_item_tags('', 'guid'))
-			{
-				if (!isset($links[0]['attribs']['']['isPermaLink']) || strtolower(trim($links[0]['attribs']['']['isPermaLink'])) == 'true')
-				{
-					$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
-				}
-			}
-
-			$keys = array_keys($this->data['links']);
-			foreach ($keys as $key)
-			{
-				if (SimplePie_Misc::is_isegment_nz_nc($key))
-				{
-					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
-					{
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
-						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
-					}
-					else
-					{
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
-					}
-				}
-				elseif (substr($key, 0, 41) == SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
-				{
-					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
-				}
-				$this->data['links'][$key] = array_unique($this->data['links'][$key]);
-			}
-		}
-		if (isset($this->data['links'][$rel]))
-		{
-			return $this->data['links'][$rel];
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	/**
-	 * @todo Add ability to prefer one type of content over another (in a media group).
-	 */
-	function get_enclosure($key = 0, $prefer = null)
-	{
-		$enclosures = $this->get_enclosures();
-		if (isset($enclosures[$key]))
-		{
-			return $enclosures[$key];
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	/**
-	 * Grabs all available enclosures (podcasts, etc.)
-	 *
-	 * Supports the <enclosure> RSS tag, as well as Media RSS and iTunes RSS.
-	 *
-	 * At this point, we're pretty much assuming that all enclosures for an item are the same content.  Anything else is too complicated to properly support.
-	 *
-	 * @todo Add support for end-user defined sorting of enclosures by type/handler (so we can prefer the faster-loading FLV over MP4).
-	 * @todo Add support for itunes: tags.  These should be relatively simple compared to media:.
-	 * @todo If an element exists at a level, but it's value is empty, we should fall back to the value from the parent (if it exists).
-	 */
-	function get_enclosures()
-	{
-		if (!isset($this->data['enclosures']))
-		{
-			$this->data['enclosures'] = array();
-
-			// Elements
-			$captions_parent = null;
-			$categories_parent = null;
-			$copyrights_parent = null;
-			$credits_parent = null;
-			$description_parent = null;
-			$duration_parent = null;
-			$hashes_parent = null;
-			$keywords_parent = null;
-			$player_parent = null;
-			$ratings_parent = null;
-			$restrictions_parent = null;
-			$thumbnails_parent = null;
-			$title_parent = null;
-
-			// Let's do the channel and item-level ones first, and just re-use them if we need to.
-			$parent = $this->get_feed();
-
-			// CAPTIONS
-			if ($captions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'text'))
-			{
-				foreach ($captions as $caption)
-				{
-					$caption_type = null;
-					$caption_lang = null;
-					$caption_startTime = null;
-					$caption_endTime = null;
-					$caption_text = null;
-					if (isset($caption['attribs']['']['type']))
-					{
-						$caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					if (isset($caption['attribs']['']['lang']))
-					{
-						$caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					if (isset($caption['attribs']['']['start']))
-					{
-						$caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					if (isset($caption['attribs']['']['end']))
-					{
-						$caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					if (isset($caption['data']))
-					{
-						$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					$captions_parent[] =& new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
-				}
-			}
-			elseif ($captions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'text'))
-			{
-				foreach ($captions as $caption)
-				{
-					$caption_type = null;
-					$caption_lang = null;
-					$caption_startTime = null;
-					$caption_endTime = null;
-					$caption_text = null;
-					if (isset($caption['attribs']['']['type']))
-					{
-						$caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					if (isset($caption['attribs']['']['lang']))
-					{
-						$caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					if (isset($caption['attribs']['']['start']))
-					{
-						$caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					if (isset($caption['attribs']['']['end']))
-					{
-						$caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					if (isset($caption['data']))
-					{
-						$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					$captions_parent[] =& new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
-				}
-			}
-			if (is_array($captions_parent))
-			{
-				$captions_parent = array_values(SimplePie_Misc::array_unique($captions_parent));
-			}
-
-			// CATEGORIES
-			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'category') as $category)
-			{
-				$term = null;
-				$scheme = null;
-				$label = null;
-				if (isset($category['data']))
-				{
-					$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-				}
-				if (isset($category['attribs']['']['scheme']))
-				{
-					$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-				}
-				else
-				{
-					$scheme = 'http://search.yahoo.com/mrss/category_schema';
-				}
-				if (isset($category['attribs']['']['label']))
-				{
-					$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
-				}
-				$categories_parent[] =& new $this->feed->category_class($term, $scheme, $label);
-			}
-			foreach ((array) $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'category') as $category)
-			{
-				$term = null;
-				$scheme = null;
-				$label = null;
-				if (isset($category['data']))
-				{
-					$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-				}
-				if (isset($category['attribs']['']['scheme']))
-				{
-					$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-				}
-				else
-				{
-					$scheme = 'http://search.yahoo.com/mrss/category_schema';
-				}
-				if (isset($category['attribs']['']['label']))
-				{
-					$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
-				}
-				$categories_parent[] =& new $this->feed->category_class($term, $scheme, $label);
-			}
-			foreach ((array) $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'category') as $category)
-			{
-				$term = null;
-				$scheme = 'http://www.itunes.com/dtds/podcast-1.0.dtd';
-				$label = null;
-				if (isset($category['attribs']['']['text']))
-				{
-					$label = $this->sanitize($category['attribs']['']['text'], SIMPLEPIE_CONSTRUCT_TEXT);
-				}
-				$categories_parent[] =& new $this->feed->category_class($term, $scheme, $label);
-
-				if (isset($category['child'][SIMPLEPIE_NAMESPACE_ITUNES]['category']))
-				{
-					foreach ((array) $category['child'][SIMPLEPIE_NAMESPACE_ITUNES]['category'] as $subcategory)
-					{
-						if (isset($subcategory['attribs']['']['text']))
-						{
-							$label = $this->sanitize($subcategory['attribs']['']['text'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						$categories_parent[] =& new $this->feed->category_class($term, $scheme, $label);
-					}
-				}
-			}
-			if (is_array($categories_parent))
-			{
-				$categories_parent = array_values(SimplePie_Misc::array_unique($categories_parent));
-			}
-
-			// COPYRIGHT
-			if ($copyright = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'copyright'))
-			{
-				$copyright_url = null;
-				$copyright_label = null;
-				if (isset($copyright[0]['attribs']['']['url']))
-				{
-					$copyright_url = $this->sanitize($copyright[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT);
-				}
-				if (isset($copyright[0]['data']))
-				{
-					$copyright_label = $this->sanitize($copyright[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-				}
-				$copyrights_parent =& new $this->feed->copyright_class($copyright_url, $copyright_label);
-			}
-			elseif ($copyright = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'copyright'))
-			{
-				$copyright_url = null;
-				$copyright_label = null;
-				if (isset($copyright[0]['attribs']['']['url']))
-				{
-					$copyright_url = $this->sanitize($copyright[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT);
-				}
-				if (isset($copyright[0]['data']))
-				{
-					$copyright_label = $this->sanitize($copyright[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-				}
-				$copyrights_parent =& new $this->feed->copyright_class($copyright_url, $copyright_label);
-			}
-
-			// CREDITS
-			if ($credits = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'credit'))
-			{
-				foreach ($credits as $credit)
-				{
-					$credit_role = null;
-					$credit_scheme = null;
-					$credit_name = null;
-					if (isset($credit['attribs']['']['role']))
-					{
-						$credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					if (isset($credit['attribs']['']['scheme']))
-					{
-						$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
-					{
-						$credit_scheme = 'urn:ebu';
-					}
-					if (isset($credit['data']))
-					{
-						$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					$credits_parent[] =& new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
-				}
-			}
-			elseif ($credits = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'credit'))
-			{
-				foreach ($credits as $credit)
-				{
-					$credit_role = null;
-					$credit_scheme = null;
-					$credit_name = null;
-					if (isset($credit['attribs']['']['role']))
-					{
-						$credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					if (isset($credit['attribs']['']['scheme']))
-					{
-						$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
-					{
-						$credit_scheme = 'urn:ebu';
-					}
-					if (isset($credit['data']))
-					{
-						$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					$credits_parent[] =& new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
-				}
-			}
-			if (is_array($credits_parent))
-			{
-				$credits_parent = array_values(SimplePie_Misc::array_unique($credits_parent));
-			}
-
-			// DESCRIPTION
-			if ($description_parent = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'description'))
-			{
-				if (isset($description_parent[0]['data']))
-				{
-					$description_parent = $this->sanitize($description_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-				}
-			}
-			elseif ($description_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'description'))
-			{
-				if (isset($description_parent[0]['data']))
-				{
-					$description_parent = $this->sanitize($description_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-				}
-			}
-
-			// DURATION
-			if ($duration_parent = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'duration'))
-			{
-				$seconds = null;
-				$minutes = null;
-				$hours = null;
-				if (isset($duration_parent[0]['data']))
-				{
-					$temp = explode(':', $this->sanitize($duration_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
-					if (sizeof($temp) > 0)
-					{
-						(int) $seconds = array_pop($temp);
-					}
-					if (sizeof($temp) > 0)
-					{
-						(int) $minutes = array_pop($temp);
-						$seconds += $minutes * 60;
-					}
-					if (sizeof($temp) > 0)
-					{
-						(int) $hours = array_pop($temp);
-						$seconds += $hours * 3600;
-					}
-					unset($temp);
-					$duration_parent = $seconds;
-				}
-			}
-
-			// HASHES
-			if ($hashes_iterator = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'hash'))
-			{
-				foreach ($hashes_iterator as $hash)
-				{
-					$value = null;
-					$algo = null;
-					if (isset($hash['data']))
-					{
-						$value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					if (isset($hash['attribs']['']['algo']))
-					{
-						$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
-					{
-						$algo = 'md5';
-					}
-					$hashes_parent[] = $algo.':'.$value;
-				}
-			}
-			elseif ($hashes_iterator = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'hash'))
-			{
-				foreach ($hashes_iterator as $hash)
-				{
-					$value = null;
-					$algo = null;
-					if (isset($hash['data']))
-					{
-						$value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					if (isset($hash['attribs']['']['algo']))
-					{
-						$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
-					{
-						$algo = 'md5';
-					}
-					$hashes_parent[] = $algo.':'.$value;
-				}
-			}
-			if (is_array($hashes_parent))
-			{
-				$hashes_parent = array_values(SimplePie_Misc::array_unique($hashes_parent));
-			}
-
-			// KEYWORDS
-			if ($keywords = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'keywords'))
-			{
-				if (isset($keywords[0]['data']))
-				{
-					$temp = explode(',', $this->sanitize($keywords[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
-					foreach ($temp as $word)
-					{
-						$keywords_parent[] = trim($word);
-					}
-				}
-				unset($temp);
-			}
-			elseif ($keywords = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
-			{
-				if (isset($keywords[0]['data']))
-				{
-					$temp = explode(',', $this->sanitize($keywords[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
-					foreach ($temp as $word)
-					{
-						$keywords_parent[] = trim($word);
-					}
-				}
-				unset($temp);
-			}
-			elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'keywords'))
-			{
-				if (isset($keywords[0]['data']))
-				{
-					$temp = explode(',', $this->sanitize($keywords[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
-					foreach ($temp as $word)
-					{
-						$keywords_parent[] = trim($word);
-					}
-				}
-				unset($temp);
-			}
-			elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
-			{
-				if (isset($keywords[0]['data']))
-				{
-					$temp = explode(',', $this->sanitize($keywords[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
-					foreach ($temp as $word)
-					{
-						$keywords_parent[] = trim($word);
-					}
-				}
-				unset($temp);
-			}
-			if (is_array($keywords_parent))
-			{
-				$keywords_parent = array_values(SimplePie_Misc::array_unique($keywords_parent));
-			}
-
-			// PLAYER
-			if ($player_parent = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'player'))
-			{
-				if (isset($player_parent[0]['attribs']['']['url']))
-				{
-					$player_parent = $this->sanitize($player_parent[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-				}
-			}
-			elseif ($player_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'player'))
-			{
-				if (isset($player_parent[0]['attribs']['']['url']))
-				{
-					$player_parent = $this->sanitize($player_parent[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-				}
-			}
-
-			// RATINGS
-			if ($ratings = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'rating'))
-			{
-				foreach ($ratings as $rating)
-				{
-					$rating_scheme = null;
-					$rating_value = null;
-					if (isset($rating['attribs']['']['scheme']))
-					{
-						$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
-					{
-						$rating_scheme = 'urn:simple';
-					}
-					if (isset($rating['data']))
-					{
-						$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					$ratings_parent[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
-				}
-			}
-			elseif ($ratings = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
-			{
-				foreach ($ratings as $rating)
-				{
-					$rating_scheme = 'urn:itunes';
-					$rating_value = null;
-					if (isset($rating['data']))
-					{
-						$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					$ratings_parent[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
-				}
-			}
-			elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'rating'))
-			{
-				foreach ($ratings as $rating)
-				{
-					$rating_scheme = null;
-					$rating_value = null;
-					if (isset($rating['attribs']['']['scheme']))
-					{
-						$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
-					{
-						$rating_scheme = 'urn:simple';
-					}
-					if (isset($rating['data']))
-					{
-						$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					$ratings_parent[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
-				}
-			}
-			elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
-			{
-				foreach ($ratings as $rating)
-				{
-					$rating_scheme = 'urn:itunes';
-					$rating_value = null;
-					if (isset($rating['data']))
-					{
-						$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					$ratings_parent[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
-				}
-			}
-			if (is_array($ratings_parent))
-			{
-				$ratings_parent = array_values(SimplePie_Misc::array_unique($ratings_parent));
-			}
-
-			// RESTRICTIONS
-			if ($restrictions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'restriction'))
-			{
-				foreach ($restrictions as $restriction)
-				{
-					$restriction_relationship = null;
-					$restriction_type = null;
-					$restriction_value = null;
-					if (isset($restriction['attribs']['']['relationship']))
-					{
-						$restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					if (isset($restriction['attribs']['']['type']))
-					{
-						$restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					if (isset($restriction['data']))
-					{
-						$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					$restrictions_parent[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
-				}
-			}
-			elseif ($restrictions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
-			{
-				foreach ($restrictions as $restriction)
-				{
-					$restriction_relationship = 'allow';
-					$restriction_type = null;
-					$restriction_value = 'itunes';
-					if (isset($restriction['data']) && strtolower($restriction['data']) == 'yes')
-					{
-						$restriction_relationship = 'deny';
-					}
-					$restrictions_parent[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
-				}
-			}
-			elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'restriction'))
-			{
-				foreach ($restrictions as $restriction)
-				{
-					$restriction_relationship = null;
-					$restriction_type = null;
-					$restriction_value = null;
-					if (isset($restriction['attribs']['']['relationship']))
-					{
-						$restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					if (isset($restriction['attribs']['']['type']))
-					{
-						$restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					if (isset($restriction['data']))
-					{
-						$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					$restrictions_parent[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
-				}
-			}
-			elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
-			{
-				foreach ($restrictions as $restriction)
-				{
-					$restriction_relationship = 'allow';
-					$restriction_type = null;
-					$restriction_value = 'itunes';
-					if (isset($restriction['data']) && strtolower($restriction['data']) == 'yes')
-					{
-						$restriction_relationship = 'deny';
-					}
-					$restrictions_parent[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
-				}
-			}
-			if (is_array($restrictions_parent))
-			{
-				$restrictions_parent = array_values(SimplePie_Misc::array_unique($restrictions_parent));
-			}
-
-			// THUMBNAILS
-			if ($thumbnails = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail'))
-			{
-				foreach ($thumbnails as $thumbnail)
-				{
-					if (isset($thumbnail['attribs']['']['url']))
-					{
-						$thumbnails_parent[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-					}
-				}
-			}
-			elseif ($thumbnails = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail'))
-			{
-				foreach ($thumbnails as $thumbnail)
-				{
-					if (isset($thumbnail['attribs']['']['url']))
-					{
-						$thumbnails_parent[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-					}
-				}
-			}
-
-			// TITLES
-			if ($title_parent = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'title'))
-			{
-				if (isset($title_parent[0]['data']))
-				{
-					$title_parent = $this->sanitize($title_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-				}
-			}
-			elseif ($title_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'title'))
-			{
-				if (isset($title_parent[0]['data']))
-				{
-					$title_parent = $this->sanitize($title_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-				}
-			}
-
-			// Clear the memory
-			unset($parent);
-
-			// If we have media:group tags, loop through them.
-			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'group') as $group)
-			{
-				// If we have media:content tags, loop through them.
-				foreach ((array) $group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'] as $content)
-				{
-					if (isset($content['attribs']['']['url']))
-					{
-						// Attributes
-						$bitrate = null;
-						$channels = null;
-						$duration = null;
-						$expression = null;
-						$framerate = null;
-						$height = null;
-						$javascript = null;
-						$lang = null;
-						$length = null;
-						$medium = null;
-						$samplingrate = null;
-						$type = null;
-						$url = null;
-						$width = null;
-
-						// Elements
-						$captions = null;
-						$categories = null;
-						$copyrights = null;
-						$credits = null;
-						$description = null;
-						$hashes = null;
-						$keywords = null;
-						$player = null;
-						$ratings = null;
-						$restrictions = null;
-						$thumbnails = null;
-						$title = null;
-
-						// Start checking the attributes of media:content
-						if (isset($content['attribs']['']['bitrate']))
-						{
-							$bitrate = $this->sanitize($content['attribs']['']['bitrate'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						if (isset($content['attribs']['']['channels']))
-						{
-							$channels = $this->sanitize($content['attribs']['']['channels'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						if (isset($content['attribs']['']['duration']))
-						{
-							$duration = $this->sanitize($content['attribs']['']['duration'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						else
-						{
-							$duration = $duration_parent;
-						}
-						if (isset($content['attribs']['']['expression']))
-						{
-							$expression = $this->sanitize($content['attribs']['']['expression'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						if (isset($content['attribs']['']['framerate']))
-						{
-							$framerate = $this->sanitize($content['attribs']['']['framerate'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						if (isset($content['attribs']['']['height']))
-						{
-							$height = $this->sanitize($content['attribs']['']['height'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						if (isset($content['attribs']['']['lang']))
-						{
-							$lang = $this->sanitize($content['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						if (isset($content['attribs']['']['fileSize']))
-						{
-							$length = ceil($content['attribs']['']['fileSize']);
-						}
-						if (isset($content['attribs']['']['medium']))
-						{
-							$medium = $this->sanitize($content['attribs']['']['medium'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						if (isset($content['attribs']['']['samplingrate']))
-						{
-							$samplingrate = $this->sanitize($content['attribs']['']['samplingrate'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						if (isset($content['attribs']['']['type']))
-						{
-							$type = $this->sanitize($content['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						if (isset($content['attribs']['']['width']))
-						{
-							$width = $this->sanitize($content['attribs']['']['width'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						$url = $this->sanitize($content['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-
-						// Checking the other optional media: elements. Priority: media:content, media:group, item, channel
-
-						// CAPTIONS
-						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text']))
-						{
-							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text'] as $caption)
-							{
-								$caption_type = null;
-								$caption_lang = null;
-								$caption_startTime = null;
-								$caption_endTime = null;
-								$caption_text = null;
-								if (isset($caption['attribs']['']['type']))
-								{
-									$caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($caption['attribs']['']['lang']))
-								{
-									$caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($caption['attribs']['']['start']))
-								{
-									$caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($caption['attribs']['']['end']))
-								{
-									$caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($caption['data']))
-								{
-									$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								$captions[] =& new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
-							}
-							if (is_array($captions))
-							{
-								$captions = array_values(SimplePie_Misc::array_unique($captions));
-							}
-						}
-						elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text']))
-						{
-							foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text'] as $caption)
-							{
-								$caption_type = null;
-								$caption_lang = null;
-								$caption_startTime = null;
-								$caption_endTime = null;
-								$caption_text = null;
-								if (isset($caption['attribs']['']['type']))
-								{
-									$caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($caption['attribs']['']['lang']))
-								{
-									$caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($caption['attribs']['']['start']))
-								{
-									$caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($caption['attribs']['']['end']))
-								{
-									$caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($caption['data']))
-								{
-									$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								$captions[] =& new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
-							}
-							if (is_array($captions))
-							{
-								$captions = array_values(SimplePie_Misc::array_unique($captions));
-							}
-						}
-						else
-						{
-							$captions = $captions_parent;
-						}
-
-						// CATEGORIES
-						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category']))
-						{
-							foreach ((array) $content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category'] as $category)
-							{
-								$term = null;
-								$scheme = null;
-								$label = null;
-								if (isset($category['data']))
-								{
-									$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($category['attribs']['']['scheme']))
-								{
-									$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
-								{
-									$scheme = 'http://search.yahoo.com/mrss/category_schema';
-								}
-								if (isset($category['attribs']['']['label']))
-								{
-									$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								$categories[] =& new $this->feed->category_class($term, $scheme, $label);
-							}
-						}
-						if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category']))
-						{
-							foreach ((array) $group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category'] as $category)
-							{
-								$term = null;
-								$scheme = null;
-								$label = null;
-								if (isset($category['data']))
-								{
-									$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($category['attribs']['']['scheme']))
-								{
-									$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
-								{
-									$scheme = 'http://search.yahoo.com/mrss/category_schema';
-								}
-								if (isset($category['attribs']['']['label']))
-								{
-									$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								$categories[] =& new $this->feed->category_class($term, $scheme, $label);
-							}
-						}
-						if (is_array($categories) && is_array($categories_parent))
-						{
-							$categories = array_values(SimplePie_Misc::array_unique(array_merge($categories, $categories_parent)));
-						}
-						elseif (is_array($categories))
-						{
-							$categories = array_values(SimplePie_Misc::array_unique($categories));
-						}
-						elseif (is_array($categories_parent))
-						{
-							$categories = array_values(SimplePie_Misc::array_unique($categories_parent));
-						}
-
-						// COPYRIGHTS
-						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
-						{
-							$copyright_url = null;
-							$copyright_label = null;
-							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url']))
-							{
-								$copyright_url = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT);
-							}
-							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data']))
-							{
-								$copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-							}
-							$copyrights =& new $this->feed->copyright_class($copyright_url, $copyright_label);
-						}
-						elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
-						{
-							$copyright_url = null;
-							$copyright_label = null;
-							if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url']))
-							{
-								$copyright_url = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT);
-							}
-							if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data']))
-							{
-								$copyright_label = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-							}
-							$copyrights =& new $this->feed->copyright_class($copyright_url, $copyright_label);
-						}
-						else
-						{
-							$copyrights = $copyrights_parent;
-						}
-
-						// CREDITS
-						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit']))
-						{
-							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit'] as $credit)
-							{
-								$credit_role = null;
-								$credit_scheme = null;
-								$credit_name = null;
-								if (isset($credit['attribs']['']['role']))
-								{
-									$credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($credit['attribs']['']['scheme']))
-								{
-									$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
-								{
-									$credit_scheme = 'urn:ebu';
-								}
-								if (isset($credit['data']))
-								{
-									$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								$credits[] =& new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
-							}
-							if (is_array($credits))
-							{
-								$credits = array_values(SimplePie_Misc::array_unique($credits));
-							}
-						}
-						elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit']))
-						{
-							foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit'] as $credit)
-							{
-								$credit_role = null;
-								$credit_scheme = null;
-								$credit_name = null;
-								if (isset($credit['attribs']['']['role']))
-								{
-									$credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($credit['attribs']['']['scheme']))
-								{
-									$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
-								{
-									$credit_scheme = 'urn:ebu';
-								}
-								if (isset($credit['data']))
-								{
-									$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								$credits[] =& new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
-							}
-							if (is_array($credits))
-							{
-								$credits = array_values(SimplePie_Misc::array_unique($credits));
-							}
-						}
-						else
-						{
-							$credits = $credits_parent;
-						}
-
-						// DESCRIPTION
-						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
-						{
-							$description = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
-						{
-							$description = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						else
-						{
-							$description = $description_parent;
-						}
-
-						// HASHES
-						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash']))
-						{
-							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash'] as $hash)
-							{
-								$value = null;
-								$algo = null;
-								if (isset($hash['data']))
-								{
-									$value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($hash['attribs']['']['algo']))
-								{
-									$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
-								{
-									$algo = 'md5';
-								}
-								$hashes[] = $algo.':'.$value;
-							}
-							if (is_array($hashes))
-							{
-								$hashes = array_values(SimplePie_Misc::array_unique($hashes));
-							}
-						}
-						elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash']))
-						{
-							foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash'] as $hash)
-							{
-								$value = null;
-								$algo = null;
-								if (isset($hash['data']))
-								{
-									$value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($hash['attribs']['']['algo']))
-								{
-									$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
-								{
-									$algo = 'md5';
-								}
-								$hashes[] = $algo.':'.$value;
-							}
-							if (is_array($hashes))
-							{
-								$hashes = array_values(SimplePie_Misc::array_unique($hashes));
-							}
-						}
-						else
-						{
-							$hashes = $hashes_parent;
-						}
-
-						// KEYWORDS
-						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords']))
-						{
-							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data']))
-							{
-								$temp = explode(',', $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
-								foreach ($temp as $word)
-								{
-									$keywords[] = trim($word);
-								}
-								unset($temp);
-							}
-							if (is_array($keywords))
-							{
-								$keywords = array_values(SimplePie_Misc::array_unique($keywords));
-							}
-						}
-						elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords']))
-						{
-							if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data']))
-							{
-								$temp = explode(',', $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
-								foreach ($temp as $word)
-								{
-									$keywords[] = trim($word);
-								}
-								unset($temp);
-							}
-							if (is_array($keywords))
-							{
-								$keywords = array_values(SimplePie_Misc::array_unique($keywords));
-							}
-						}
-						else
-						{
-							$keywords = $keywords_parent;
-						}
-
-						// PLAYER
-						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
-						{
-							$player = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-						}
-						elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
-						{
-							$player = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-						}
-						else
-						{
-							$player = $player_parent;
-						}
-
-						// RATINGS
-						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating']))
-						{
-							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating'] as $rating)
-							{
-								$rating_scheme = null;
-								$rating_value = null;
-								if (isset($rating['attribs']['']['scheme']))
-								{
-									$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
-								{
-									$rating_scheme = 'urn:simple';
-								}
-								if (isset($rating['data']))
-								{
-									$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								$ratings[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
-							}
-							if (is_array($ratings))
-							{
-								$ratings = array_values(SimplePie_Misc::array_unique($ratings));
-							}
-						}
-						elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating']))
-						{
-							foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating'] as $rating)
-							{
-								$rating_scheme = null;
-								$rating_value = null;
-								if (isset($rating['attribs']['']['scheme']))
-								{
-									$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
-								{
-									$rating_scheme = 'urn:simple';
-								}
-								if (isset($rating['data']))
-								{
-									$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								$ratings[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
-							}
-							if (is_array($ratings))
-							{
-								$ratings = array_values(SimplePie_Misc::array_unique($ratings));
-							}
-						}
-						else
-						{
-							$ratings = $ratings_parent;
-						}
-
-						// RESTRICTIONS
-						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction']))
-						{
-							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction'] as $restriction)
-							{
-								$restriction_relationship = null;
-								$restriction_type = null;
-								$restriction_value = null;
-								if (isset($restriction['attribs']['']['relationship']))
-								{
-									$restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($restriction['attribs']['']['type']))
-								{
-									$restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($restriction['data']))
-								{
-									$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								$restrictions[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
-							}
-							if (is_array($restrictions))
-							{
-								$restrictions = array_values(SimplePie_Misc::array_unique($restrictions));
-							}
-						}
-						elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction']))
-						{
-							foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction'] as $restriction)
-							{
-								$restriction_relationship = null;
-								$restriction_type = null;
-								$restriction_value = null;
-								if (isset($restriction['attribs']['']['relationship']))
-								{
-									$restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($restriction['attribs']['']['type']))
-								{
-									$restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($restriction['data']))
-								{
-									$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								$restrictions[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
-							}
-							if (is_array($restrictions))
-							{
-								$restrictions = array_values(SimplePie_Misc::array_unique($restrictions));
-							}
-						}
-						else
-						{
-							$restrictions = $restrictions_parent;
-						}
-
-						// THUMBNAILS
-						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail']))
-						{
-							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail)
-							{
-								$thumbnails[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-							}
-							if (is_array($thumbnails))
-							{
-								$thumbnails = array_values(SimplePie_Misc::array_unique($thumbnails));
-							}
-						}
-						elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail']))
-						{
-							foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail)
-							{
-								$thumbnails[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-							}
-							if (is_array($thumbnails))
-							{
-								$thumbnails = array_values(SimplePie_Misc::array_unique($thumbnails));
-							}
-						}
-						else
-						{
-							$thumbnails = $thumbnails_parent;
-						}
-
-						// TITLES
-						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
-						{
-							$title = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
-						{
-							$title = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						else
-						{
-							$title = $title_parent;
-						}
-
-						$this->data['enclosures'][] =& new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions, $categories, $channels, $copyrights, $credits, $description, $duration, $expression, $framerate, $hashes, $height, $keywords, $lang, $medium, $player, $ratings, $restrictions, $samplingrate, $thumbnails, $title, $width);
-					}
-				}
-			}
-
-			// If we have standalone media:content tags, loop through them.
-			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content']))
-			{
-				foreach ((array) $this->data['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'] as $content)
-				{
-					if (isset($content['attribs']['']['url']))
-					{
-						// Attributes
-						$bitrate = null;
-						$channels = null;
-						$duration = null;
-						$expression = null;
-						$framerate = null;
-						$height = null;
-						$javascript = null;
-						$lang = null;
-						$length = null;
-						$medium = null;
-						$samplingrate = null;
-						$type = null;
-						$url = null;
-						$width = null;
-
-						// Elements
-						$captions = null;
-						$categories = null;
-						$copyrights = null;
-						$credits = null;
-						$description = null;
-						$hashes = null;
-						$keywords = null;
-						$player = null;
-						$ratings = null;
-						$restrictions = null;
-						$thumbnails = null;
-						$title = null;
-
-						// Start checking the attributes of media:content
-						if (isset($content['attribs']['']['bitrate']))
-						{
-							$bitrate = $this->sanitize($content['attribs']['']['bitrate'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						if (isset($content['attribs']['']['channels']))
-						{
-							$channels = $this->sanitize($content['attribs']['']['channels'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						if (isset($content['attribs']['']['duration']))
-						{
-							$duration = $this->sanitize($content['attribs']['']['duration'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						else
-						{
-							$duration = $duration_parent;
-						}
-						if (isset($content['attribs']['']['expression']))
-						{
-							$expression = $this->sanitize($content['attribs']['']['expression'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						if (isset($content['attribs']['']['framerate']))
-						{
-							$framerate = $this->sanitize($content['attribs']['']['framerate'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						if (isset($content['attribs']['']['height']))
-						{
-							$height = $this->sanitize($content['attribs']['']['height'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						if (isset($content['attribs']['']['lang']))
-						{
-							$lang = $this->sanitize($content['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						if (isset($content['attribs']['']['fileSize']))
-						{
-							$length = ceil($content['attribs']['']['fileSize']);
-						}
-						if (isset($content['attribs']['']['medium']))
-						{
-							$medium = $this->sanitize($content['attribs']['']['medium'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						if (isset($content['attribs']['']['samplingrate']))
-						{
-							$samplingrate = $this->sanitize($content['attribs']['']['samplingrate'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						if (isset($content['attribs']['']['type']))
-						{
-							$type = $this->sanitize($content['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						if (isset($content['attribs']['']['width']))
-						{
-							$width = $this->sanitize($content['attribs']['']['width'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						$url = $this->sanitize($content['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-
-						// Checking the other optional media: elements. Priority: media:content, media:group, item, channel
-
-						// CAPTIONS
-						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text']))
-						{
-							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text'] as $caption)
-							{
-								$caption_type = null;
-								$caption_lang = null;
-								$caption_startTime = null;
-								$caption_endTime = null;
-								$caption_text = null;
-								if (isset($caption['attribs']['']['type']))
-								{
-									$caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($caption['attribs']['']['lang']))
-								{
-									$caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($caption['attribs']['']['start']))
-								{
-									$caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($caption['attribs']['']['end']))
-								{
-									$caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($caption['data']))
-								{
-									$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								$captions[] =& new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
-							}
-							if (is_array($captions))
-							{
-								$captions = array_values(SimplePie_Misc::array_unique($captions));
-							}
-						}
-						else
-						{
-							$captions = $captions_parent;
-						}
-
-						// CATEGORIES
-						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category']))
-						{
-							foreach ((array) $content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category'] as $category)
-							{
-								$term = null;
-								$scheme = null;
-								$label = null;
-								if (isset($category['data']))
-								{
-									$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($category['attribs']['']['scheme']))
-								{
-									$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
-								{
-									$scheme = 'http://search.yahoo.com/mrss/category_schema';
-								}
-								if (isset($category['attribs']['']['label']))
-								{
-									$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								$categories[] =& new $this->feed->category_class($term, $scheme, $label);
-							}
-						}
-						if (is_array($categories) && is_array($categories_parent))
-						{
-							$categories = array_values(SimplePie_Misc::array_unique(array_merge($categories, $categories_parent)));
-						}
-						elseif (is_array($categories))
-						{
-							$categories = array_values(SimplePie_Misc::array_unique($categories));
-						}
-						elseif (is_array($categories_parent))
-						{
-							$categories = array_values(SimplePie_Misc::array_unique($categories_parent));
-						}
-						else
-						{
-							$categories = null;
-						}
-
-						// COPYRIGHTS
-						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
-						{
-							$copyright_url = null;
-							$copyright_label = null;
-							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url']))
-							{
-								$copyright_url = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT);
-							}
-							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data']))
-							{
-								$copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-							}
-							$copyrights =& new $this->feed->copyright_class($copyright_url, $copyright_label);
-						}
-						else
-						{
-							$copyrights = $copyrights_parent;
-						}
-
-						// CREDITS
-						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit']))
-						{
-							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit'] as $credit)
-							{
-								$credit_role = null;
-								$credit_scheme = null;
-								$credit_name = null;
-								if (isset($credit['attribs']['']['role']))
-								{
-									$credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($credit['attribs']['']['scheme']))
-								{
-									$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
-								{
-									$credit_scheme = 'urn:ebu';
-								}
-								if (isset($credit['data']))
-								{
-									$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								$credits[] =& new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
-							}
-							if (is_array($credits))
-							{
-								$credits = array_values(SimplePie_Misc::array_unique($credits));
-							}
-						}
-						else
-						{
-							$credits = $credits_parent;
-						}
-
-						// DESCRIPTION
-						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
-						{
-							$description = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						else
-						{
-							$description = $description_parent;
-						}
-
-						// HASHES
-						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash']))
-						{
-							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash'] as $hash)
-							{
-								$value = null;
-								$algo = null;
-								if (isset($hash['data']))
-								{
-									$value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($hash['attribs']['']['algo']))
-								{
-									$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
-								{
-									$algo = 'md5';
-								}
-								$hashes[] = $algo.':'.$value;
-							}
-							if (is_array($hashes))
-							{
-								$hashes = array_values(SimplePie_Misc::array_unique($hashes));
-							}
-						}
-						else
-						{
-							$hashes = $hashes_parent;
-						}
-
-						// KEYWORDS
-						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords']))
-						{
-							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data']))
-							{
-								$temp = explode(',', $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
-								foreach ($temp as $word)
-								{
-									$keywords[] = trim($word);
-								}
-								unset($temp);
-							}
-							if (is_array($keywords))
-							{
-								$keywords = array_values(SimplePie_Misc::array_unique($keywords));
-							}
-						}
-						else
-						{
-							$keywords = $keywords_parent;
-						}
-
-						// PLAYER
-						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
-						{
-							$player = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-						}
-						else
-						{
-							$player = $player_parent;
-						}
-
-						// RATINGS
-						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating']))
-						{
-							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating'] as $rating)
-							{
-								$rating_scheme = null;
-								$rating_value = null;
-								if (isset($rating['attribs']['']['scheme']))
-								{
-									$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
-								{
-									$rating_scheme = 'urn:simple';
-								}
-								if (isset($rating['data']))
-								{
-									$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								$ratings[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
-							}
-							if (is_array($ratings))
-							{
-								$ratings = array_values(SimplePie_Misc::array_unique($ratings));
-							}
-						}
-						else
-						{
-							$ratings = $ratings_parent;
-						}
-
-						// RESTRICTIONS
-						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction']))
-						{
-							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction'] as $restriction)
-							{
-								$restriction_relationship = null;
-								$restriction_type = null;
-								$restriction_value = null;
-								if (isset($restriction['attribs']['']['relationship']))
-								{
-									$restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($restriction['attribs']['']['type']))
-								{
-									$restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								if (isset($restriction['data']))
-								{
-									$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								$restrictions[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
-							}
-							if (is_array($restrictions))
-							{
-								$restrictions = array_values(SimplePie_Misc::array_unique($restrictions));
-							}
-						}
-						else
-						{
-							$restrictions = $restrictions_parent;
-						}
-
-						// THUMBNAILS
-						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail']))
-						{
-							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail)
-							{
-								$thumbnails[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-							}
-							if (is_array($thumbnails))
-							{
-								$thumbnails = array_values(SimplePie_Misc::array_unique($thumbnails));
-							}
-						}
-						else
-						{
-							$thumbnails = $thumbnails_parent;
-						}
-
-						// TITLES
-						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
-						{
-							$title = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						else
-						{
-							$title = $title_parent;
-						}
-
-						$this->data['enclosures'][] =& new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions, $categories, $channels, $copyrights, $credits, $description, $duration, $expression, $framerate, $hashes, $height, $keywords, $lang, $medium, $player, $ratings, $restrictions, $samplingrate, $thumbnails, $title, $width);
-					}
-				}
-			}
-
-			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link') as $link)
-			{
-				if (isset($link['attribs']['']['href']) && !empty($link['attribs']['']['rel']) && $link['attribs']['']['rel'] == 'enclosure')
-				{
-					// Attributes
-					$bitrate = null;
-					$channels = null;
-					$duration = null;
-					$expression = null;
-					$framerate = null;
-					$height = null;
-					$javascript = null;
-					$lang = null;
-					$length = null;
-					$medium = null;
-					$samplingrate = null;
-					$type = null;
-					$url = null;
-					$width = null;
-
-					$url = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
-					if (isset($link['attribs']['']['type']))
-					{
-						$type = $this->sanitize($link['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					if (isset($link['attribs']['']['length']))
-					{
-						$length = ceil($link['attribs']['']['length']);
-					}
-
-					// Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
-					$this->data['enclosures'][] =& new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width);
-				}
-			}
-
-			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'link') as $link)
-			{
-				if (isset($link['attribs']['']['href']) && !empty($link['attribs']['']['rel']) && $link['attribs']['']['rel'] == 'enclosure')
-				{
-					// Attributes
-					$bitrate = null;
-					$channels = null;
-					$duration = null;
-					$expression = null;
-					$framerate = null;
-					$height = null;
-					$javascript = null;
-					$lang = null;
-					$length = null;
-					$medium = null;
-					$samplingrate = null;
-					$type = null;
-					$url = null;
-					$width = null;
-
-					$url = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
-					if (isset($link['attribs']['']['type']))
-					{
-						$type = $this->sanitize($link['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					if (isset($link['attribs']['']['length']))
-					{
-						$length = ceil($link['attribs']['']['length']);
-					}
-
-					// Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
-					$this->data['enclosures'][] =& new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width);
-				}
-			}
-
-			if ($enclosure = $this->get_item_tags('', 'enclosure'))
-			{
-				if (isset($enclosure[0]['attribs']['']['url']))
-				{
-					// Attributes
-					$bitrate = null;
-					$channels = null;
-					$duration = null;
-					$expression = null;
-					$framerate = null;
-					$height = null;
-					$javascript = null;
-					$lang = null;
-					$length = null;
-					$medium = null;
-					$samplingrate = null;
-					$type = null;
-					$url = null;
-					$width = null;
-
-					$url = $this->sanitize($enclosure[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($enclosure[0]));
-					if (isset($enclosure[0]['attribs']['']['type']))
-					{
-						$type = $this->sanitize($enclosure[0]['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					if (isset($enclosure[0]['attribs']['']['length']))
-					{
-						$length = ceil($enclosure[0]['attribs']['']['length']);
-					}
-
-					// Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
-					$this->data['enclosures'][] =& new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width);
-				}
-			}
-			$this->data['enclosures'] = array_values(SimplePie_Misc::array_unique($this->data['enclosures']));
-		}
-		if (!empty($this->data['enclosures']))
-		{
-			return $this->data['enclosures'];
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_latitude()
-	{
-		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
-		{
-			return (float) $return[0]['data'];
-		}
-		elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', $return[0]['data'], $match))
-		{
-			return (float) $match[1];
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_longitude()
-	{
-		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
-		{
-			return (float) $return[0]['data'];
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
-		{
-			return (float) $return[0]['data'];
-		}
-		elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', $return[0]['data'], $match))
-		{
-			return (float) $match[2];
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	/**
-	 * Creates the add_to_* methods' return data
-	 *
-	 * @access private
-	 * @param string $item_url String to prefix to the item permalink
-	 * @param string $title_url String to prefix to the item title
-	 * (and suffix to the item permalink)
-	 * @return mixed URL if feed exists, false otherwise
-	 */
-	function add_to_service($item_url, $title_url = null)
-	{
-		if ($this->get_permalink() !== null)
-		{
-			$return = $this->sanitize($item_url, SIMPLEPIE_CONSTRUCT_IRI) . rawurlencode($this->get_permalink());
-			if ($title_url !== null && $this->get_title() !== null)
-			{
-				$return .= $this->sanitize($title_url, SIMPLEPIE_CONSTRUCT_IRI) . rawurlencode($this->get_title());
-			}
-			return $return;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function add_to_blinklist()
-	{
-		return $this->add_to_service('http://www.blinklist.com/index.php?Action=Blink/addblink.php&Description=&Url=', '&Title=');
-	}
-
-	function add_to_blogmarks()
-	{
-		return $this->add_to_service('http://blogmarks.net/my/new.php?mini=1&simple=1&url=', '&title=');
-	}
-
-	function add_to_delicious()
-	{
-		return $this->add_to_service('http://del.icio.us/post/?v=3&url=', '&title=');
-	}
-
-	function add_to_digg()
-	{
-		return $this->add_to_service('http://digg.com/submit?phase=2&URL=');
-	}
-
-	function add_to_furl()
-	{
-		return $this->add_to_service('http://www.furl.net/storeIt.jsp?u=', '&t=');
-	}
-
-	function add_to_magnolia()
-	{
-		return $this->add_to_service('http://ma.gnolia.com/bookmarklet/add?url=', '&title=');
-	}
-
-	function add_to_myweb20()
-	{
-		return $this->add_to_service('http://myweb2.search.yahoo.com/myresults/bookmarklet?u=', '&t=');
-	}
-
-	function add_to_newsvine()
-	{
-		return $this->add_to_service('http://www.newsvine.com/_wine/save?u=', '&h=');
-	}
-
-	function add_to_reddit()
-	{
-		return $this->add_to_service('http://reddit.com/submit?url=', '&title=');
-	}
-
-	function add_to_segnalo()
-	{
-		return $this->add_to_service('http://segnalo.com/post.html.php?url=', '&title=');
-	}
-
-	function add_to_simpy()
-	{
-		return $this->add_to_service('http://www.simpy.com/simpy/LinkAdd.do?href=', '&title=');
-	}
-
-	function add_to_spurl()
-	{
-		return $this->add_to_service('http://www.spurl.net/spurl.php?v=3&url=', '&title=');
-	}
-
-	function add_to_wists()
-	{
-		return $this->add_to_service('http://wists.com/r.php?c=&r=', '&title=');
-	}
-
-	function search_technorati()
-	{
-		return $this->add_to_service('http://www.technorati.com/search/');
-	}
-}
-
-class SimplePie_Author
-{
-	var $name;
-	var $link;
-	var $email;
-
-	// Constructor, used to input the data
-	function SimplePie_Author($name = null, $link = null, $email = null)
-	{
-		$this->name = $name;
-		$this->link = $link;
-		$this->email = $email;
-	}
-
-	function __toString()
-	{
-		// There is no $this->data here
-		return md5(serialize($this));
-	}
-
-	function get_name()
-	{
-		if ($this->name !== null)
-		{
-			return $this->name;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_link()
-	{
-		if ($this->link !== null)
-		{
-			return $this->link;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_email()
-	{
-		if ($this->email !== null)
-		{
-			return $this->email;
-		}
-		else
-		{
-			return null;
-		}
-	}
-}
-
-class SimplePie_Category
-{
-	var $term;
-	var $scheme;
-	var $label;
-
-	// Constructor, used to input the data
-	function SimplePie_Category($term = null, $scheme = null, $label = null)
-	{
-		$this->term = $term;
-		$this->scheme = $scheme;
-		$this->label = $label;
-	}
-
-	function __toString()
-	{
-		// There is no $this->data here
-		return md5(serialize($this));
-	}
-
-	function get_term()
-	{
-		if ($this->term !== null)
-		{
-			return $this->term;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_scheme()
-	{
-		if ($this->scheme !== null)
-		{
-			return $this->scheme;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_label()
-	{
-		if ($this->label !== null)
-		{
-			return $this->label;
-		}
-		else
-		{
-			return $this->get_term();
-		}
-	}
-}
-
-class SimplePie_Enclosure
-{
-	var $bitrate;
-	var $captions;
-	var $categories;
-	var $channels;
-	var $copyright;
-	var $credits;
-	var $description;
-	var $duration;
-	var $expression;
-	var $framerate;
-	var $handler;
-	var $hashes;
-	var $height;
-	var $javascript;
-	var $keywords;
-	var $lang;
-	var $length;
-	var $link;
-	var $medium;
-	var $player;
-	var $ratings;
-	var $restrictions;
-	var $samplingrate;
-	var $thumbnails;
-	var $title;
-	var $type;
-	var $width;
-
-	// Constructor, used to input the data
-	function SimplePie_Enclosure($link = null, $type = null, $length = null, $javascript = null, $bitrate = null, $captions = null, $categories = null, $channels = null, $copyright = null, $credits = null, $description = null, $duration = null, $expression = null, $framerate = null, $hashes = null, $height = null, $keywords = null, $lang = null, $medium = null, $player = null, $ratings = null, $restrictions = null, $samplingrate = null, $thumbnails = null, $title = null, $width = null)
-	{
-		$this->bitrate = $bitrate;
-		$this->captions = $captions;
-		$this->categories = $categories;
-		$this->channels = $channels;
-		$this->copyright = $copyright;
-		$this->credits = $credits;
-		$this->description = $description;
-		$this->duration = $duration;
-		$this->expression = $expression;
-		$this->framerate = $framerate;
-		$this->hashes = $hashes;
-		$this->height = $height;
-		$this->javascript = $javascript;
-		$this->keywords = $keywords;
-		$this->lang = $lang;
-		$this->length = $length;
-		$this->link = $link;
-		$this->medium = $medium;
-		$this->player = $player;
-		$this->ratings = $ratings;
-		$this->restrictions = $restrictions;
-		$this->samplingrate = $samplingrate;
-		$this->thumbnails = $thumbnails;
-		$this->title = $title;
-		$this->type = $type;
-		$this->width = $width;
-		if (class_exists('idna_convert'))
-		{
-			$idn =& new idna_convert;
-			$parsed = SimplePie_Misc::parse_url($link);
-			$this->link = SimplePie_Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], $parsed['fragment']);
-		}
-		$this->handler = $this->get_handler(); // Needs to load last
-	}
-
-	function __toString()
-	{
-		// There is no $this->data here
-		return md5(serialize($this));
-	}
-
-	function get_bitrate()
-	{
-		if ($this->bitrate !== null)
-		{
-			return $this->bitrate;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_caption($key = 0)
-	{
-		$captions = $this->get_captions();
-		if (isset($captions[$key]))
-		{
-			return $captions[$key];
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_captions()
-	{
-		if ($this->captions !== null)
-		{
-			return $this->captions;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_category($key = 0)
-	{
-		$categories = $this->get_categories();
-		if (isset($categories[$key]))
-		{
-			return $categories[$key];
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_categories()
-	{
-		if ($this->categories !== null)
-		{
-			return $this->categories;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_channels()
-	{
-		if ($this->channels !== null)
-		{
-			return $this->channels;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_copyright()
-	{
-		if ($this->copyright !== null)
-		{
-			return $this->copyright;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_credit($key = 0)
-	{
-		$credits = $this->get_credits();
-		if (isset($credits[$key]))
-		{
-			return $credits[$key];
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_credits()
-	{
-		if ($this->credits !== null)
-		{
-			return $this->credits;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_description()
-	{
-		if ($this->description !== null)
-		{
-			return $this->description;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_duration($convert = false)
-	{
-		if ($this->duration !== null)
-		{
-			if ($convert)
-			{
-				$time = SimplePie_Misc::time_hms($this->duration);
-				return $time;
-			}
-			else
-			{
-				return $this->duration;
-			}
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_expression()
-	{
-		if ($this->expression !== null)
-		{
-			return $this->expression;
-		}
-		else
-		{
-			return 'full';
-		}
-	}
-
-	function get_extension()
-	{
-		if ($this->link !== null)
-		{
-			$url = SimplePie_Misc::parse_url($this->link);
-			if ($url['path'] !== '')
-			{
-				return pathinfo($url['path'], PATHINFO_EXTENSION);
-			}
-		}
-		return null;
-	}
-
-	function get_framerate()
-	{
-		if ($this->framerate !== null)
-		{
-			return $this->framerate;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_handler()
-	{
-		return $this->get_real_type(true);
-	}
-
-	function get_hash($key = 0)
-	{
-		$hashes = $this->get_hashes();
-		if (isset($hashes[$key]))
-		{
-			return $hashes[$key];
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_hashes()
-	{
-		if ($this->hashes !== null)
-		{
-			return $this->hashes;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_height()
-	{
-		if ($this->height !== null)
-		{
-			return $this->height;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_language()
-	{
-		if ($this->lang !== null)
-		{
-			return $this->lang;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_keyword($key = 0)
-	{
-		$keywords = $this->get_keywords();
-		if (isset($keywords[$key]))
-		{
-			return $keywords[$key];
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_keywords()
-	{
-		if ($this->keywords !== null)
-		{
-			return $this->keywords;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_length()
-	{
-		if ($this->length !== null)
-		{
-			return $this->length;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_link()
-	{
-		if ($this->link !== null)
-		{
-			return urldecode($this->link);
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_medium()
-	{
-		if ($this->medium !== null)
-		{
-			return $this->medium;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_player()
-	{
-		if ($this->player !== null)
-		{
-			return $this->player;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_rating($key = 0)
-	{
-		$ratings = $this->get_ratings();
-		if (isset($ratings[$key]))
-		{
-			return $ratings[$key];
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_ratings()
-	{
-		if ($this->ratings !== null)
-		{
-			return $this->ratings;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_restriction($key = 0)
-	{
-		$restrictions = $this->get_restrictions();
-		if (isset($restrictions[$key]))
-		{
-			return $restrictions[$key];
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_restrictions()
-	{
-		if ($this->restrictions !== null)
-		{
-			return $this->restrictions;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_sampling_rate()
-	{
-		if ($this->samplingrate !== null)
-		{
-			return $this->samplingrate;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_size()
-	{
-		$length = $this->get_length();
-		if ($length !== null)
-		{
-			return round($length/1048576, 2);
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_thumbnail($key = 0)
-	{
-		$thumbnails = $this->get_thumbnails();
-		if (isset($thumbnails[$key]))
-		{
-			return $thumbnails[$key];
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_thumbnails()
-	{
-		if ($this->thumbnails !== null)
-		{
-			return $this->thumbnails;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_title()
-	{
-		if ($this->title !== null)
-		{
-			return $this->title;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_type()
-	{
-		if ($this->type !== null)
-		{
-			return $this->type;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_width()
-	{
-		if ($this->width !== null)
-		{
-			return $this->width;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function native_embed($options='')
-	{
-		return $this->embed($options, true);
-	}
-
-	/**
-	 * @todo If the dimensions for media:content are defined, use them when width/height are set to 'auto'.
-	 */
-	function embed($options = '', $native = false)
-	{
-		// Set up defaults
-		$audio = '';
-		$video = '';
-		$alt = '';
-		$altclass = '';
-		$loop = 'false';
-		$width = 'auto';
-		$height = 'auto';
-		$bgcolor = '#ffffff';
-		$mediaplayer = '';
-		$widescreen = false;
-		$handler = $this->get_handler();
-		$type = $this->get_real_type();
-
-		// Process options and reassign values as necessary
-		if (is_array($options))
-		{
-			extract($options);
-		}
-		else
-		{
-			$options = explode(',', $options);
-			foreach($options as $option)
-			{
-				$opt = explode(':', $option, 2);
-				if (isset($opt[0], $opt[1]))
-				{
-					$opt[0] = trim($opt[0]);
-					$opt[1] = trim($opt[1]);
-					switch ($opt[0])
-					{
-						case 'audio':
-							$audio = $opt[1];
-							break;
-
-						case 'video':
-							$video = $opt[1];
-							break;
-
-						case 'alt':
-							$alt = $opt[1];
-							break;
-
-						case 'altclass':
-							$altclass = $opt[1];
-							break;
-
-						case 'loop':
-							$loop = $opt[1];
-							break;
-
-						case 'width':
-							$width = $opt[1];
-							break;
-
-						case 'height':
-							$height = $opt[1];
-							break;
-
-						case 'bgcolor':
-							$bgcolor = $opt[1];
-							break;
-
-						case 'mediaplayer':
-							$mediaplayer = $opt[1];
-							break;
-
-						case 'widescreen':
-							$widescreen = $opt[1];
-							break;
-					}
-				}
-			}
-		}
-
-		$mime = explode('/', $type, 2);
-		$mime = $mime[0];
-
-		// Process values for 'auto'
-		if ($width == 'auto')
-		{
-			if ($mime == 'video')
-			{
-				if ($height == 'auto')
-				{
-					$width = 480;
-				}
-				elseif ($widescreen)
-				{
-					$width = round((intval($height)/9)*16);
-				}
-				else
-				{
-					$width = round((intval($height)/3)*4);
-				}
-			}
-			else
-			{
-				$width = '100%';
-			}
-		}
-
-		if ($height == 'auto')
-		{
-			if ($mime == 'audio')
-			{
-				$height = 0;
-			}
-			elseif ($mime == 'video')
-			{
-				if ($width == 'auto')
-				{
-					if ($widescreen)
-					{
-						$height = 270;
-					}
-					else
-					{
-						$height = 360;
-					}
-				}
-				elseif ($widescreen)
-				{
-					$height = round((intval($width)/16)*9);
-				}
-				else
-				{
-					$height = round((intval($width)/4)*3);
-				}
-			}
-			else
-			{
-				$height = 376;
-			}
-		}
-		elseif ($mime == 'audio')
-		{
-			$height = 0;
-		}
-
-		// Set proper placeholder value
-		if ($mime == 'audio')
-		{
-			$placeholder = $audio;
-		}
-		elseif ($mime == 'video')
-		{
-			$placeholder = $video;
-		}
-
-		$embed = '';
-
-		// Make sure the JS library is included
-		if (!$native)
-		{
-			static $javascript_outputted = null;
-			if (!$javascript_outputted && $this->javascript)
-			{
-				$embed .= '<script type="text/javascript" src="?' . htmlspecialchars($this->javascript) . '"></script>';
-				$javascript_outputted = true;
-			}
-		}
-
-		// Odeo Feed MP3's
-		if ($handler == 'odeo')
-		{
-			if ($native)
-			{
-				$embed .= '<embed src="http://odeo.com/flash/audio_player_fullsize.swf" pluginspage="http://adobe.com/go/getflashplayer" type="application/x-shockwave-flash" quality="high" width="440" height="80" wmode="transparent" allowScriptAccess="any" flashvars="valid_sample_rate=true&external_url=' . $this->get_link() . '"></embed>';
-			}
-			else
-			{
-				$embed .= '<script type="text/javascript">embed_odeo("' . $this->get_link() . '");</script>';
-			}
-		}
-
-		// Flash
-		elseif ($handler == 'flash')
-		{
-			if ($native)
-			{
-				$embed .= "<embed src=\"" . $this->get_link() . "\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"$type\" quality=\"high\" width=\"$width\" height=\"$height\" bgcolor=\"$bgcolor\" loop=\"$loop\"></embed>";
-			}
-			else
-			{
-				$embed .= "<script type='text/javascript'>embed_flash('$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$loop', '$type');</script>";
-			}
-		}
-
-		// Flash Media Player file types.
-		// Preferred handler for MP3 file types.
-		elseif ($handler == 'fmedia' || ($handler == 'mp3' && $mediaplayer != ''))
-		{
-			$height += 20;
-			if ($native)
-			{
-				$embed .= "<embed src=\"$mediaplayer\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"application/x-shockwave-flash\" quality=\"high\" width=\"$width\" height=\"$height\" wmode=\"transparent\" flashvars=\"file=" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "&autostart=false&repeat=$loop&showdigits=true&showfsbutton=false\"></embed>";
-			}
-			else
-			{
-				$embed .= "<script type='text/javascript'>embed_flv('$width', '$height', '" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "', '$placeholder', '$loop', '$mediaplayer');</script>";
-			}
-		}
-
-		// QuickTime 7 file types.  Need to test with QuickTime 6.
-		// Only handle MP3's if the Flash Media Player is not present.
-		elseif ($handler == 'quicktime' || ($handler == 'mp3' && $mediaplayer == ''))
-		{
-			$height += 16;
-			if ($native)
-			{
-				if ($placeholder != ""){
-					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" href=\"" . $this->get_link() . "\" src=\"$placeholder\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"false\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
-				}
-				else {
-					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" src=\"" . $this->get_link() . "\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"true\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
-				}
-			}
-			else
-			{
-				$embed .= "<script type='text/javascript'>embed_quicktime('$type', '$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$placeholder', '$loop');</script>";
-			}
-		}
-
-		// Windows Media
-		elseif ($handler == 'wmedia')
-		{
-			$height += 45;
-			if ($native)
-			{
-				$embed .= "<embed type=\"application/x-mplayer2\" src=\"" . $this->get_link() . "\" autosize=\"1\" width=\"$width\" height=\"$height\" showcontrols=\"1\" showstatusbar=\"0\" showdisplay=\"0\" autostart=\"0\"></embed>";
-			}
-			else
-			{
-				$embed .= "<script type='text/javascript'>embed_wmedia('$width', '$height', '" . $this->get_link() . "');</script>";
-			}
-		}
-
-		// Everything else
-		else $embed .= '<a href="' . $this->get_link() . '" class="' . $altclass . '">' . $alt . '</a>';
-
-		return $embed;
-	}
-
-	function get_real_type($find_handler = false)
-	{
-		// If it's Odeo, let's get it out of the way.
-		if (substr(strtolower($this->get_link()), 0, 15) == 'http://odeo.com')
-		{
-			return 'odeo';
-		}
-
-		// Mime-types by handler.
-		$types_flash = array('application/x-shockwave-flash', 'application/futuresplash'); // Flash
-		$types_fmedia = array('video/flv', 'video/x-flv'); // Flash Media Player
-		$types_quicktime = array('audio/3gpp', 'audio/3gpp2', 'audio/aac', 'audio/x-aac', 'audio/aiff', 'audio/x-aiff', 'audio/mid', 'audio/midi', 'audio/x-midi', 'audio/mp4', 'audio/m4a', 'audio/x-m4a', 'audio/wav', 'audio/x-wav', 'video/3gpp', 'video/3gpp2', 'video/m4v', 'video/x-m4v', 'video/mp4', 'video/mpeg', 'video/x-mpeg', 'video/quicktime', 'video/sd-video'); // QuickTime
-		$types_wmedia = array('application/asx', 'application/x-mplayer2', 'audio/x-ms-wma', 'audio/x-ms-wax', 'video/x-ms-asf-plugin', 'video/x-ms-asf', 'video/x-ms-wm', 'video/x-ms-wmv', 'video/x-ms-wvx'); // Windows Media
-		$types_mp3 = array('audio/mp3', 'audio/x-mp3', 'audio/mpeg', 'audio/x-mpeg'); // MP3
-
-		if ($this->get_type() !== null)
-		{
-			$type = strtolower($this->type);
-		}
-		else
-		{
-			$type = null;
-		}
-
-		// If we encounter an unsupported mime-type, check the file extension and guess intelligently.
-		if (!in_array($type, array_merge($types_flash, $types_fmedia, $types_quicktime, $types_wmedia, $types_mp3)))
-		{
-			switch (strtolower($this->get_extension()))
-			{
-				// Audio mime-types
-				case 'aac':
-				case 'adts':
-					$type = 'audio/acc';
-					break;
-
-				case 'aif':
-				case 'aifc':
-				case 'aiff':
-				case 'cdda':
-					$type = 'audio/aiff';
-					break;
-
-				case 'bwf':
-					$type = 'audio/wav';
-					break;
-
-				case 'kar':
-				case 'mid':
-				case 'midi':
-				case 'smf':
-					$type = 'audio/midi';
-					break;
-
-				case 'm4a':
-					$type = 'audio/x-m4a';
-					break;
-
-				case 'mp3':
-				case 'swa':
-					$type = 'audio/mp3';
-					break;
-
-				case 'wav':
-					$type = 'audio/wav';
-					break;
-
-				case 'wax':
-					$type = 'audio/x-ms-wax';
-					break;
-
-				case 'wma':
-					$type = 'audio/x-ms-wma';
-					break;
-
-				// Video mime-types
-				case '3gp':
-				case '3gpp':
-					$type = 'video/3gpp';
-					break;
-
-				case '3g2':
-				case '3gp2':
-					$type = 'video/3gpp2';
-					break;
-
-				case 'asf':
-					$type = 'video/x-ms-asf';
-					break;
-
-				case 'flv':
-					$type = 'video/x-flv';
-					break;
-
-				case 'm1a':
-				case 'm1s':
-				case 'm1v':
-				case 'm15':
-				case 'm75':
-				case 'mp2':
-				case 'mpa':
-				case 'mpeg':
-				case 'mpg':
-				case 'mpm':
-				case 'mpv':
-					$type = 'video/mpeg';
-					break;
-
-				case 'm4v':
-					$type = 'video/x-m4v';
-					break;
-
-				case 'mov':
-				case 'qt':
-					$type = 'video/quicktime';
-					break;
-
-				case 'mp4':
-				case 'mpg4':
-					$type = 'video/mp4';
-					break;
-
-				case 'sdv':
-					$type = 'video/sd-video';
-					break;
-
-				case 'wm':
-					$type = 'video/x-ms-wm';
-					break;
-
-				case 'wmv':
-					$type = 'video/x-ms-wmv';
-					break;
-
-				case 'wvx':
-					$type = 'video/x-ms-wvx';
-					break;
-
-				// Flash mime-types
-				case 'spl':
-					$type = 'application/futuresplash';
-					break;
-
-				case 'swf':
-					$type = 'application/x-shockwave-flash';
-					break;
-			}
-		}
-
-		if ($find_handler)
-		{
-			if (in_array($type, $types_flash))
-			{
-				return 'flash';
-			}
-			elseif (in_array($type, $types_fmedia))
-			{
-				return 'fmedia';
-			}
-			elseif (in_array($type, $types_quicktime))
-			{
-				return 'quicktime';
-			}
-			elseif (in_array($type, $types_wmedia))
-			{
-				return 'wmedia';
-			}
-			elseif (in_array($type, $types_mp3))
-			{
-				return 'mp3';
-			}
-			else
-			{
-				return null;
-			}
-		}
-		else
-		{
-			return $type;
-		}
-	}
-}
-
-class SimplePie_Caption
-{
-	var $type;
-	var $lang;
-	var $startTime;
-	var $endTime;
-	var $text;
-
-	// Constructor, used to input the data
-	function SimplePie_Caption($type = null, $lang = null, $startTime = null, $endTime = null, $text = null)
-	{
-		$this->type = $type;
-		$this->lang = $lang;
-		$this->startTime = $startTime;
-		$this->endTime = $endTime;
-		$this->text = $text;
-	}
-
-	function __toString()
-	{
-		// There is no $this->data here
-		return md5(serialize($this));
-	}
-
-	function get_endtime()
-	{
-		if ($this->endTime !== null)
-		{
-			return $this->endTime;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_language()
-	{
-		if ($this->language !== null)
-		{
-			return $this->language;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_starttime()
-	{
-		if ($this->startTime !== null)
-		{
-			return $this->startTime;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_text()
-	{
-		if ($this->text !== null)
-		{
-			return $this->text;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_type()
-	{
-		if ($this->type !== null)
-		{
-			return $this->type;
-		}
-		else
-		{
-			return null;
-		}
-	}
-}
-
-class SimplePie_Credit
-{
-	var $role;
-	var $scheme;
-	var $name;
-
-	// Constructor, used to input the data
-	function SimplePie_Credit($role = null, $scheme = null, $name = null)
-	{
-		$this->role = $role;
-		$this->scheme = $scheme;
-		$this->name = $name;
-	}
-
-	function __toString()
-	{
-		// There is no $this->data here
-		return md5(serialize($this));
-	}
-
-	function get_role()
-	{
-		if ($this->role !== null)
-		{
-			return $this->role;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_scheme()
-	{
-		if ($this->scheme !== null)
-		{
-			return $this->scheme;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_name()
-	{
-		if ($this->name !== null)
-		{
-			return $this->name;
-		}
-		else
-		{
-			return null;
-		}
-	}
-}
-
-class SimplePie_Copyright
-{
-	var $url;
-	var $label;
-
-	// Constructor, used to input the data
-	function SimplePie_Copyright($url = null, $label = null)
-	{
-		$this->url = $url;
-		$this->label = $label;
-	}
-
-	function __toString()
-	{
-		// There is no $this->data here
-		return md5(serialize($this));
-	}
-
-	function get_url()
-	{
-		if ($this->url !== null)
-		{
-			return $this->url;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_attribution()
-	{
-		if ($this->label !== null)
-		{
-			return $this->label;
-		}
-		else
-		{
-			return null;
-		}
-	}
-}
-
-class SimplePie_Rating
-{
-	var $scheme;
-	var $value;
-
-	// Constructor, used to input the data
-	function SimplePie_Rating($scheme = null, $value = null)
-	{
-		$this->scheme = $scheme;
-		$this->value = $value;
-	}
-
-	function __toString()
-	{
-		// There is no $this->data here
-		return md5(serialize($this));
-	}
-
-	function get_scheme()
-	{
-		if ($this->scheme !== null)
-		{
-			return $this->scheme;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_value()
-	{
-		if ($this->value !== null)
-		{
-			return $this->value;
-		}
-		else
-		{
-			return null;
-		}
-	}
-}
-
-class SimplePie_Restriction
-{
-	var $relationship;
-	var $type;
-	var $value;
-
-	// Constructor, used to input the data
-	function SimplePie_Restriction($relationship = null, $type = null, $value = null)
-	{
-		$this->relationship = $relationship;
-		$this->type = $type;
-		$this->value = $value;
-	}
-
-	function __toString()
-	{
-		// There is no $this->data here
-		return md5(serialize($this));
-	}
-
-	function get_relationship()
-	{
-		if ($this->relationship !== null)
-		{
-			return $this->relationship;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_type()
-	{
-		if ($this->type !== null)
-		{
-			return $this->type;
-		}
-		else
-		{
-			return null;
-		}
-	}
-
-	function get_value()
-	{
-		if ($this->value !== null)
-		{
-			return $this->value;
-		}
-		else
-		{
-			return null;
-		}
-	}
-}
-
-/**
- * @todo Move to properly supporting RFC2616 (HTTP/1.1)
- */
-class SimplePie_File
-{
-	var $url;
-	var $useragent;
-	var $success = true;
-	var $headers = array();
-	var $body;
-	var $status_code;
-	var $redirects = 0;
-	var $error;
-	var $method;
-
-	function SimplePie_File($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false, $proxy = "")
-	{
-		if (class_exists('idna_convert'))
-		{
-			$idn =& new idna_convert;
-			$parsed = SimplePie_Misc::parse_url($url);
-			$url = SimplePie_Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], $parsed['fragment']);
-		}
-		$this->url = $url;
-		$this->useragent = $useragent;
-		if (preg_match('/^http(s)?:\/\//i', $url))
-		{
-			if ($useragent === null)
-			{
-				$useragent = ini_get('user_agent');
-				$this->useragent = $useragent;
-			}
-			if (!is_array($headers))
-			{
-				$headers = array();
-			}
-			if (!$force_fsockopen && extension_loaded('curl'))
-			{
-				$this->method = 'curl';
-				$fp = curl_init();
-				$headers2 = array();
-				foreach ($headers as $key => $value)
-				{
-					$headers2[] = "$key: $value";
-				}
-				if (version_compare(SimplePie_Misc::get_curl_version(), '7.10.5', '>='))
-				{
-					curl_setopt($fp, CURLOPT_ENCODING, '');
-				}
-				curl_setopt($fp, CURLOPT_URL, $url);
-				curl_setopt($fp, CURLOPT_HEADER, 1);
-				curl_setopt($fp, CURLOPT_RETURNTRANSFER, 1);
-				curl_setopt($fp, CURLOPT_TIMEOUT, $timeout);
-				curl_setopt($fp, CURLOPT_CONNECTTIMEOUT, $timeout);
-				curl_setopt($fp, CURLOPT_REFERER, $url);
-				curl_setopt($fp, CURLOPT_USERAGENT, $useragent);
-				curl_setopt($fp, CURLOPT_HTTPHEADER, $headers2);
-				if (!ini_get('open_basedir') && !ini_get('safe_mode') && version_compare(SimplePie_Misc::get_curl_version(), '7.15.2', '>='))
-				{
-					curl_setopt($fp, CURLOPT_FOLLOWLOCATION, 1);
-					curl_setopt($fp, CURLOPT_MAXREDIRS, $redirects);
-				}
-				if ($proxy)
-				{
-					curl_setopt($fp, CURLOPT_PROXY, $proxy);
-				}
-
-				$this->headers = curl_exec($fp);
-				if (curl_errno($fp) == 23 || curl_errno($fp) == 61)
-				{
-					curl_setopt($fp, CURLOPT_ENCODING, 'none');
-					$this->headers = curl_exec($fp);
-				}
-				if (curl_errno($fp))
-				{
-					$this->error = 'cURL error ' . curl_errno($fp) . ': ' . curl_error($fp);
-					$this->success = false;
-				}
-				else
-				{
-					$info = curl_getinfo($fp);
-					curl_close($fp);
-					$this->headers = explode("\r\n\r\n", $this->headers, $info['redirect_count'] + 1);
-					$this->headers = array_pop($this->headers);
-					$parser =& new SimplePie_HTTP_Parser($this->headers);
-					if ($parser->parse())
-					{
-						$this->headers = $parser->headers;
-						$this->body = $parser->body;
-						$this->status_code = $parser->status_code;
-						if (($this->status_code == 300 || $this->status_code == 301 || $this->status_code == 302 || $this->status_code == 303 || $this->status_code == 307 || $this->status_code > 307 && $this->status_code < 400) && isset($this->headers['location']) && $this->redirects < $redirects)
-						{
-							$this->redirects++;
-							if (isset($this->headers['content-location']))
-							{
-								$location = SimplePie_Misc::absolutize_url($this->headers['location'], SimplePie_Misc::absolutize_url($this->headers['content-location'], $url));
-							}
-							else
-							{
-								$location = SimplePie_Misc::absolutize_url($this->headers['location'], $url);
-							}
-							return $this->SimplePie_File($location, $timeout, $redirects, $headers, $useragent, $force_fsockopen);
-						}
-					}
-				}
-			}
-			else
-			{
-				$this->method = 'fsockopen';
-				$url_parts = parse_url($url);
-				if (isset($url_parts['scheme']) && strtolower($url_parts['scheme']) == 'https')
-				{
-					$url_parts['host'] = "ssl://$url_parts[host]";
-					$url_parts['port'] = 443;
-				}
-				if (!isset($url_parts['port']))
-				{
-					$url_parts['port'] = 80;
-				}
-				if ($proxy) {
-					$proxy_parts = explode(':', $proxy);
-					if (!isset($proxy_parts[1])) {
-					    $proxy_parts[1] = 80;
-					}
-					$host = $proxy_parts[0];
-					$port = $proxy_parts[1];
-				} else {
-					$host = $url_parts['host'];
-					$port = $url_parts['port'];
-				}
-				$fp = fsockopen($host, $port, $errno, $errstr, $timeout);
-				if (!$fp)
-				{
-					$this->error = 'fsockopen error: ' . $errstr;
-					$this->success = false;
-				}
-				else
-				{
-					if (function_exists('stream_set_timeout'))
-					{
-						stream_set_timeout($fp, $timeout);
-					}
-					else
-					{
-						socket_set_timeout($fp, $timeout);
-					}
-					if ($proxy) {
-						$get = $url;
-					} else {
-						if (isset($url_parts['path']))
-						{
-							if (isset($url_parts['query']))
-							{
-								$get = "$url_parts[path]?$url_parts[query]";
-							}
-							else
-							{
-								$get = $url_parts['path'];
-							}
-						}
-						else
-						{
-						    $get = '/';
-						}
-					}
-					$out = "GET $get HTTP/1.0\r\n";
-					$out .= "Host: $url_parts[host]\r\n";
-					$out .= "User-Agent: $useragent\r\n";
-					if (function_exists('gzinflate'))
-					{
-						$out .= "Accept-Encoding: gzip,deflate\r\n";
-					}
-
-					if (isset($url_parts['user']) && isset($url_parts['pass']))
-					{
-						$out .= "Authorization: Basic " . base64_encode("$url_parts[user]:$url_parts[pass]") . "\r\n";
-					}
-					foreach ($headers as $key => $value)
-					{
-						$out .= "$key: $value\r\n";
-					}
-					$out .= "Connection: Close\r\n\r\n";
-					fwrite($fp, $out);
-
-					if (function_exists('stream_get_meta_data'))
-					{
-						$info = stream_get_meta_data($fp);
-					}
-					else
-					{
-						$info = socket_get_status($fp);
-					}
-
-					$this->headers = '';
-					while (!$info['eof'] && !$info['timed_out'])
-					{
-						$this->headers .= fread($fp, 1160);
-						if (function_exists('stream_get_meta_data'))
-						{
-							$info = stream_get_meta_data($fp);
-						}
-						else
-						{
-							$info = socket_get_status($fp);
-						}
-					}
-					if (!$info['timed_out'])
-					{
-						$parser =& new SimplePie_HTTP_Parser($this->headers);
-						if ($parser->parse())
-						{
-							$this->headers = $parser->headers;
-							$this->body = $parser->body;
-							$this->status_code = $parser->status_code;
-							if (($this->status_code == 300 || $this->status_code == 301 || $this->status_code == 302 || $this->status_code == 303 || $this->status_code == 307 || $this->status_code > 307 && $this->status_code < 400) && isset($this->headers['location']) && $this->redirects < $redirects)
-							{
-								$this->redirects++;
-								if (isset($this->headers['content-location']))
-								{
-									$location = SimplePie_Misc::absolutize_url($this->headers['location'], SimplePie_Misc::absolutize_url($this->headers['content-location'], $url));
-								}
-								else
-								{
-									$location = SimplePie_Misc::absolutize_url($this->headers['location'], $url);
-								}
-								return $this->SimplePie_File($location, $timeout, $redirects, $headers, $useragent, $force_fsockopen);
-							}
-							if (isset($this->headers['content-encoding']) && ($this->headers['content-encoding'] == 'gzip' || $this->headers['content-encoding'] == 'deflate'))
-							{
-								if (substr($this->body, 0, 8) == "\x1f\x8b\x08\x00\x00\x00\x00\x00")
-								{
-									$this->body = substr($this->body, 10);
-								}
-								$this->body = gzinflate($this->body);
-							}
-						}
-					}
-					else
-					{
-						$this->error = 'fsocket timed out';
-						$this->success = false;
-					}
-					fclose($fp);
-				}
-			}
-		}
-		elseif (function_exists('file_get_contents'))
-		{
-			$this->method = 'file_get_contents';
-			if (!$this->body = file_get_contents($url))
-			{
-				$this->error = 'file_get_contents could not read the file';
-				$this->success = false;
-			}
-		}
-		else
-		{
-			$this->method = 'fopen';
-			if (($fp = fopen($url, 'rb')) === false)
-			{
-				$this->error = 'failed to open stream: No such file or directory';
-				$this->success = false;
-			}
-			else
-			{
-				$this->body = '';
-				while (!feof($fp))
-				{
-					$this->body .= fread($fp, 8192);
-				}
-				fclose($fp);
-			}
-		}
-	}
-}
-
-/**
- * HTTP Response Parser
- *
- * @package SimplePie
- * @todo Support HTTP Requests
- */
-class SimplePie_HTTP_Parser
-{
-	/**
-	 * HTTP Version
-	 *
-	 * @access public
-	 * @var string
-	 */
-	var $http_version = '';
-
-	/**
-	 * Status code
-	 *
-	 * @access public
-	 * @var string
-	 */
-	var $status_code = '';
-
-	/**
-	 * Reason phrase
-	 *
-	 * @access public
-	 * @var string
-	 */
-	var $reason = '';
-
-	/**
-	 * Key/value pairs of the headers
-	 *
-	 * @access public
-	 * @var array
-	 */
-	var $headers = array();
-
-	/**
-	 * Body of the response
-	 *
-	 * @access public
-	 * @var string
-	 */
-	var $body = '';
-
-	/**
-	 * Current state of the state machine
-	 *
-	 * @access private
-	 * @var string
-	 */
-	var $state = 'start';
-
-	/**
-	 * Input data
-	 *
-	 * @access private
-	 * @var string
-	 */
-	var $data = '';
-
-	/**
-	 * Input data length (to avoid calling strlen() everytime this is needed)
-	 *
-	 * @access private
-	 * @var int
-	 */
-	var $data_length = 0;
-
-	/**
-	 * Current position of the pointer
-	 *
-	 * @access private
-	 * @var int
-	 */
-	var $position = 0;
-
-	/**
-	 * Name of the hedaer currently being parsed
-	 *
-	 * @access private
-	 * @var string
-	 */
-	var $name = '';
-
-	/**
-	 * Value of the hedaer currently being parsed
-	 *
-	 * @access private
-	 * @var string
-	 */
-	var $value = '';
-
-	/**
-	 * Create an instance of the class with the input data
-	 *
-	 * @access public
-	 * @param string $data Input data
-	 */
-	function SimplePie_HTTP_Parser($data)
-	{
-		$this->data = $data;
-		$this->data_length = strlen($this->data);
-	}
-
-	/**
-	 * Parse the input data
-	 *
-	 * @access public
-	 * @return bool true on success, false on failure
-	 */
-	function parse()
-	{
-		while ($this->state && $this->state != 'emit' && $this->has_data())
-		{
-			$state = $this->state;
-			$this->$state();
-		}
-		$this->data = '';
-		if ($this->state == 'emit')
-		{
-			return true;
-		}
-		else
-		{
-			$this->http_version = '';
-			$this->status_code = '';
-			$this->headers = array();
-			$this->body = '';
-			return false;
-		}
-	}
-
-	/**
-	 * Check whether there is data beyond the pointer
-	 *
-	 * @access private
-	 * @return bool true if there is further data, false if not
-	 */
-	function has_data()
-	{
-		return (bool) ($this->position < $this->data_length);
-	}
-
-	/**
-	 * See if the next character is LWS
-	 *
-	 * @access private
-	 * @return bool true if the next character is LWS, false if not
-	 */
-	function is_linear_whitespace()
-	{
-		return (bool) (strspn($this->data, "\x09\x20", $this->position, 1)
-			|| (substr($this->data, $this->position, 2) == "\r\n" && strspn($this->data, "\x09\x20", $this->position + 2, 1))
-			|| (strspn($this->data, "\r\n", $this->position, 1) && strspn($this->data, "\x09\x20", $this->position + 1, 1)));
-	}
-
-	/**
-	 * The starting state of the state machine, see if the data is a response or request
-	 *
-	 * @access private
-	 */
-	function start()
-	{
-		$this->state = 'http_version_response';
-	}
-
-	/**
-	 * Parse an HTTP-version string
-	 *
-	 * @access private
-	 */
-	function http_version()
-	{
-		if (preg_match('/^HTTP\/([0-9]+\.[0-9]+)/i', substr($this->data, $this->position, strcspn($this->data, "\r\n", $this->position)), $match))
-		{
-			$this->position += strlen($match[0]);
-			$this->http_version = $match[1];
-			return true;
-		}
-		else
-		{
-			return false;
-		}
-	}
-
-	/**
-	 * Parse LWS, replacing consecutive characters with a single space
-	 *
-	 * @access private
-	 */
-	function linear_whitespace()
-	{
-		do
-		{
-			if (substr($this->data, $this->position, 2) == "\r\n")
-			{
-				$this->position += 2;
-			}
-			elseif (strspn($this->data, "\r\n", $this->position, 1))
-			{
-				$this->position++;
-			}
-			$this->position += strspn($this->data, "\x09\x20", $this->position);
-		} while ($this->is_linear_whitespace());
-		$this->value .= "\x20";
-	}
-
-	/**
-	 * Parse an HTTP-version string within a response
-	 *
-	 * @access private
-	 */
-	function http_version_response()
-	{
-		if ($this->http_version() && $this->data[$this->position] == "\x20")
-		{
-			$this->state = 'status_code';
-			$this->position++;
-		}
-		else
-		{
-			$this->state = false;
-		}
-	}
-
-	/**
-	 * Parse a status code
-	 *
-	 * @access private
-	 */
-	function status_code()
-	{
-		if (strspn($this->data, '1234567890', $this->position, 3) == 3)
-		{
-			$this->status_code = substr($this->data, $this->position, 3);
-			$this->state = 'reason_phrase';
-			$this->position += 3;
-		}
-		else
-		{
-			$this->state = false;
-		}
-	}
-
-	/**
-	 * Skip over the reason phrase (it has no normative value, and you can send absolutely anything here)
-	 *
-	 * @access private
-	 */
-	function reason_phrase()
-	{
-		$len = strcspn($this->data, "\r\n", $this->position);
-		$this->reason = substr($this->data, $this->position, $len);
-		$this->position += $len;
-		if ($this->has_data())
-		{
-			if (substr($this->data, $this->position, 2) == "\r\n")
-			{
-				$this->position += 2;
-			}
-			elseif (strspn($this->data, "\r\n", $this->position, 1))
-			{
-				$this->position++;
-			}
-			$this->state = 'name';
-		}
-	}
-
-	/**
-	 * Parse a header name
-	 *
-	 * @access private
-	 */
-	function name()
-	{
-		$len = strcspn($this->data, ':', $this->position);
-		$this->name = substr($this->data, $this->position, $len);
-		$this->position += $len;
-
-		if ($this->has_data() && $this->data[$this->position] == ':')
-		{
-			$this->state = 'value_next';
-			$this->position++;
-		}
-		else
-		{
-			$this->state = false;
-		}
-	}
-
-	/**
-	 * See what state to move the state machine to while within non-quoted header values
-	 *
-	 * @access private
-	 */
-	function value_next()
-	{
-		if ($this->is_linear_whitespace())
-		{
-			$this->state = 'value_linear_whitespace';
-		}
-		elseif ($this->data[$this->position] == '"')
-		{
-			$this->state = 'value_quote_next';
-			$this->position++;
-		}
-		elseif (substr($this->data, $this->position, 2) == "\r\n")
-		{
-			$this->state = 'end_crlf';
-			$this->position += 2;
-		}
-		elseif (strspn($this->data, "\r\n", $this->position, 1))
-		{
-			$this->state = 'end_crlf';
-			$this->position++;
-		}
-		else
-		{
-			$this->state = 'value_no_quote';
-		}
-	}
-
-	/**
-	 * Parse a header value while outside quotes
-	 *
-	 * @access private
-	 */
-	function value_no_quote()
-	{
-		$len = strcspn($this->data, "\x09\x20\r\n\"", $this->position);
-		$this->value .= substr($this->data, $this->position, $len);
-		$this->state = 'value_next';
-		$this->position += $len;
-	}
-
-	/**
-	 * Parse LWS outside quotes
-	 *
-	 * @access private
-	 */
-	function value_linear_whitespace()
-	{
-		$this->linear_whitespace();
-		$this->state = 'value_next';
-	}
-
-	/**
-	 * See what state to move the state machine to while within quoted header values
-	 *
-	 * @access private
-	 */
-	function value_quote_next()
-	{
-		if ($this->is_linear_whitespace())
-		{
-			$this->state = 'value_linear_whitespace_quote';
-		}
-		else
-		{
-			switch ($this->data[$this->position])
-			{
-				case '"':
-					$this->state = 'value_next';
-					$this->position++;
-					break;
-
-				case '\\':
-					$this->state = 'value_quote_char';
-					$this->position++;
-					break;
-
-				default:
-					$this->state = 'value_quote';
-					break;
-			}
-		}
-	}
-
-	/**
-	 * Parse a header value while within quotes
-	 *
-	 * @access private
-	 */
-	function value_quote()
-	{
-		$len = strcspn($this->data, "\x09\x20\r\n\"\\", $this->position);
-		$this->value .= substr($this->data, $this->position, $len);
-		$this->position += $len;
-		$this->state = 'value_quote_next';
-	}
-
-	/**
-	 * Parse an escaped character within quotes
-	 *
-	 * @access private
-	 */
-	function value_quote_char()
-	{
-		$this->value .= $this->data[$this->position];
-		$this->state = 'value_quote_next';
-		$this->position++;
-	}
-
-	/**
-	 * Parse LWS within quotes
-	 *
-	 * @access private
-	 */
-	function value_linear_whitespace_quote()
-	{
-		$this->linear_whitespace();
-		$this->state = 'value_quote_next';
-	}
-
-	/**
-	 * Parse a CRLF, and see whether we have a further header, or whether we are followed by the body
-	 *
-	 * @access private
-	 */
-	function end_crlf()
-	{
-		$this->name = strtolower($this->name);
-		$this->value = trim($this->value, "\x20");
-		if (isset($this->headers[$this->name]))
-		{
-			$this->headers[$this->name] .= ', ' . $this->value;
-		}
-		else
-		{
-			$this->headers[$this->name] = $this->value;
-		}
-
-		if (substr($this->data, $this->position, 2) == "\r\n")
-		{
-			$this->body = substr($this->data, $this->position + 2);
-			$this->state = 'emit';
-		}
-		elseif (strspn($this->data, "\r\n", $this->position, 1))
-		{
-			$this->body = substr($this->data, $this->position + 1);
-			$this->state = 'emit';
-		}
-		else
-		{
-			$this->name = '';
-			$this->value = '';
-			$this->state = 'name';
-		}
-	}
-}
-
-class SimplePie_Cache
-{
-	var $location;
-	var $filename;
-	var $extension;
-	var $name;
-
-	function SimplePie_Cache($location, $filename, $extension)
-	{
-		$this->location = $location;
-		$this->filename = rawurlencode($filename);
-		$this->extension = rawurlencode($extension);
-		$this->name = "$location/$this->filename.$this->extension";
-	}
-
-	function save($data)
-	{
-		if (file_exists($this->name) && is_writeable($this->name) || file_exists($this->location) && is_writeable($this->location))
-		{
-			if (function_exists('file_put_contents'))
-			{
-				return (bool) file_put_contents($this->name, serialize($data));
-			}
-			else
-			{
-				$fp = fopen($this->name, 'wb');
-				if ($fp)
-				{
-					fwrite($fp, serialize($data));
-					fclose($fp);
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	function load()
-	{
-		if (file_exists($this->name) && is_readable($this->name))
-		{
-			if (function_exists('file_get_contents'))
-			{
-				return unserialize(file_get_contents($this->name));
-			}
-			elseif (($fp = fopen($this->name, 'rb')) !== false)
-			{
-				$data = '';
-				while (!feof($fp))
-				{
-					$data .= fread($fp, 8192);
-				}
-				fclose($fp);
-				return unserialize($data);
-			}
-		}
-		return false;
-	}
-
-	function mtime()
-	{
-		if (file_exists($this->name))
-		{
-			return filemtime($this->name);
-		}
-		return false;
-	}
-
-	function touch()
-	{
-		if (file_exists($this->name))
-		{
-			return touch($this->name);
-		}
-		return false;
-	}
-
-	function unlink()
-	{
-		if (file_exists($this->name))
-		{
-			return unlink($this->name);
-		}
-		return false;
-	}
-}
-
-class SimplePie_Misc
-{
-	function time_hms($seconds)
-	{
-		$time = '';
-
-		$hours = floor($seconds / 3600);
-		$remainder = $seconds % 3600;
-		if ($hours > 0)
-		{
-			$time .= $hours.':';
-		}
-
-		$minutes = floor($remainder / 60);
-		$seconds = $remainder % 60;
-		if ($minutes < 10 && $hours > 0)
-		{
-			$minutes = '0' . $minutes;
-		}
-		if ($seconds < 10)
-		{
-			$seconds = '0' . $seconds;
-		}
-
-		$time .= $minutes.':';
-		$time .= $seconds;
-
-		return $time;
-	}
-
-	function absolutize_url($relative, $base)
-	{
-		if ($relative !== '')
-		{
-			$relative = SimplePie_Misc::parse_url($relative);
-			if ($relative['scheme'] !== '')
-			{
-				$target = $relative;
-			}
-			elseif ($base !== '')
-			{
-				$base = SimplePie_Misc::parse_url($base);
-				$target = SimplePie_Misc::parse_url('');
-				if ($relative['authority'] !== '')
-				{
-					$target = $relative;
-					$target['scheme'] = $base['scheme'];
-				}
-				else
-				{
-					$target['scheme'] = $base['scheme'];
-					$target['authority'] = $base['authority'];
-					if ($relative['path'] !== '')
-					{
-						if (strpos($relative['path'], '/') === 0)
-						{
-							$target['path'] = $relative['path'];
-						}
-						elseif (($target['path'] = dirname("$base[path].")) == '/')
-						{
-							$target['path'] .= $relative['path'];
-						}
-						else
-						{
-							$target['path'] .= '/' . $relative['path'];
-						}
-						if ($relative['query'] !== '')
-						{
-							$target['query'] = $relative['query'];
-						}
-					}
-					else
-					{
-						if ($base['path'] !== '')
-						{
-							$target['path'] = $base['path'];
-						}
-						else
-						{
-							$target['path'] = '/';
-						}
-						if ($relative['query'] !== '')
-						{
-							$target['query'] = $relative['query'];
-						}
-						elseif ($base['query'] !== '')
-						{
-							$target['query'] = $base['query'];
-						}
-					}
-				}
-				if ($relative['fragment'] !== '')
-				{
-					$target['fragment'] = $relative['fragment'];
-				}
-			}
-			else
-			{
-				// No base URL, just return the relative URL
-				$target = $relative;
-			}
-			$return = SimplePie_Misc::compress_parse_url($target['scheme'], $target['authority'], $target['path'], $target['query'], $target['fragment']);
-		}
-		else
-		{
-			$return = $base;
-		}
-		$return = SimplePie_Misc::normalize_url($return);
-		return $return;
-	}
-
-	function remove_dot_segments($input)
-	{
-		$output = '';
-		while (strpos($input, './') !== false || strpos($input, '/.') !== false || $input == '.' || $input == '..')
-		{
-			// A: If the input buffer begins with a prefix of "../" or "./", then remove that prefix from the input buffer; otherwise,
-			if (strpos($input, '../') === 0)
-			{
-				$input = substr($input, 3);
-			}
-			elseif (strpos($input, './') === 0)
-			{
-				$input = substr($input, 2);
-			}
-			// B: if the input buffer begins with a prefix of "/./" or "/.", where "." is a complete path segment, then replace that prefix with "/" in the input buffer; otherwise,
-			elseif (strpos($input, '/./') === 0)
-			{
-				$input = substr_replace($input, '/', 0, 3);
-			}
-			elseif ($input == '/.')
-			{
-				$input = '/';
-			}
-			// C: if the input buffer begins with a prefix of "/../" or "/..", where ".." is a complete path segment, then replace that prefix with "/" in the input buffer and remove the last segment and its preceding "/" (if any) from the output buffer; otherwise,
-			elseif (strpos($input, '/../') === 0)
-			{
-				$input = substr_replace($input, '/', 0, 4);
-				$output = substr_replace($output, '', strrpos($output, '/'));
-			}
-			elseif ($input == '/..')
-			{
-				$input = '/';
-				$output = substr_replace($output, '', strrpos($output, '/'));
-			}
-			// D: if the input buffer consists only of "." or "..", then remove that from the input buffer; otherwise,
-			elseif ($input == '.' || $input == '..')
-			{
-				$input = '';
-			}
-			// E: move the first path segment in the input buffer to the end of the output buffer, including the initial "/" character (if any) and any subsequent characters up to, but not including, the next "/" character or the end of the input buffer
-			elseif (($pos = strpos($input, '/', 1)) !== false)
-			{
-				$output .= substr($input, 0, $pos);
-				$input = substr_replace($input, '', 0, $pos);
-			}
-			else
-			{
-				$output .= $input;
-				$input = '';
-			}
-		}
-		return $output . $input;
-	}
-
-	function get_element($realname, $string)
-	{
-		$return = array();
-		$name = preg_quote($realname, '/');
-		if (preg_match_all("/<($name)" . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . "(>(.*)<\/$name>|(\/)?>)/siU", $string, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE))
-		{
-			for ($i = 0, $total_matches = count($matches); $i < $total_matches; $i++)
-			{
-				$return[$i]['tag'] = $realname;
-				$return[$i]['full'] = $matches[$i][0][0];
-				$return[$i]['offset'] = $matches[$i][0][1];
-				if (strlen($matches[$i][3][0]) <= 2)
-				{
-					$return[$i]['self_closing'] = true;
-				}
-				else
-				{
-					$return[$i]['self_closing'] = false;
-					$return[$i]['content'] = $matches[$i][4][0];
-				}
-				$return[$i]['attribs'] = array();
-				if (isset($matches[$i][2][0]) && preg_match_all('/((?:[^\s:]+:)?[^\s:]+)(?:\s*=\s*(?:"([^"]*)"|\'([^\']*)\'|([a-z0-9\-._:]*)))?\s/U', ' ' . $matches[$i][2][0] . ' ', $attribs, PREG_SET_ORDER))
-				{
-					for ($j = 0, $total_attribs = count($attribs); $j < $total_attribs; $j++)
-					{
-						if (count($attribs[$j]) == 2)
-						{
-							$attribs[$j][2] = $attribs[$j][1];
-						}
-						$return[$i]['attribs'][strtolower($attribs[$j][1])]['data'] = SimplePie_Misc::entities_decode(end($attribs[$j]), 'UTF-8');
-					}
-				}
-			}
-		}
-		return $return;
-	}
-
-	function element_implode($element)
-	{
-		$full = "<$element[tag]";
-		foreach ($element['attribs'] as $key => $value)
-		{
-			$key = strtolower($key);
-			$full .= " $key=\"" . htmlspecialchars($value['data']) . '"';
-		}
-		if ($element['self_closing'])
-		{
-			$full .= ' />';
-		}
-		else
-		{
-			$full .= ">$element[content]</$element[tag]>";
-		}
-		return $full;
-	}
-
-	function error($message, $level, $file, $line)
-	{
-		switch ($level)
-		{
-			case E_USER_ERROR:
-				$note = 'PHP Error';
-				break;
-			case E_USER_WARNING:
-				$note = 'PHP Warning';
-				break;
-			case E_USER_NOTICE:
-				$note = 'PHP Notice';
-				break;
-			default:
-				$note = 'Unknown Error';
-				break;
-		}
-		error_log("$note: $message in $file on line $line", 0);
-		return $message;
-	}
-
-	/**
-	 * If a file has been cached, retrieve and display it.
-	 *
-	 * This is most useful for caching images (get_favicon(), etc.),
-	 * however it works for all cached files.  This WILL NOT display ANY
-	 * file/image/page/whatever, but rather only display what has already
-	 * been cached by SimplePie.
-	 *
-	 * @access public
-	 * @see SimplePie::get_favicon()
-	 * @param str $identifier_url URL that is used to identify the content.
-	 * This may or may not be the actual URL of the live content.
-	 * @param str $cache_location Location of SimplePie's cache.  Defaults
-	 * to './cache'.
-	 * @param str $cache_extension The file extension that the file was
-	 * cached with.  Defaults to 'spc'.
-	 * @param str $cache_class Name of the cache-handling class being used
-	 * in SimplePie.  Defaults to 'SimplePie_Cache', and should be left
-	 * as-is unless you've overloaded the class.
-	 * @param str $cache_name_function Function that converts the filename
-	 * for saving.  Defaults to 'md5'.
-	 */
-	function display_cached_file($identifier_url, $cache_location = './cache', $cache_extension = 'spc', $cache_class = 'SimplePie_Cache', $cache_name_function = 'md5')
-	{
-		$cache =& new $cache_class($cache_location, call_user_func($cache_name_function, $identifier_url), $cache_extension);
-
-		if ($file = $cache->load())
-		{
-			header('Content-type:' . $file['headers']['content-type']);
-			header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 604800) . ' GMT'); // 7 days
-			echo $file['body'];
-			exit;
-		}
-
-		die('Cached file for ' . $identifier_url . ' cannot be found.');
-	}
-
-	function fix_protocol($url, $http = 1)
-	{
-		$url = SimplePie_Misc::normalize_url($url);
-		$parsed = SimplePie_Misc::parse_url($url);
-		if ($parsed['scheme'] !== '' && $parsed['scheme'] != 'http' && $parsed['scheme'] != 'https')
-		{
-			return SimplePie_Misc::fix_protocol(SimplePie_Misc::compress_parse_url('http', $parsed['authority'], $parsed['path'], $parsed['query'], $parsed['fragment']), $http);
-		}
-		
-		if ($parsed['scheme'] === '' && $parsed['authority'] === '' && !file_exists($url))
-		{
-			return SimplePie_Misc::fix_protocol(SimplePie_Misc::compress_parse_url('http', $parsed['path'], '', $parsed['query'], $parsed['fragment']), $http);
-		}
-
-		if ($http == 2 && $parsed['scheme'] !== '')
-		{
-			return "feed:$url";
-		}
-		elseif ($http == 3 && strtolower($parsed['scheme']) == 'http')
-		{
-			return substr_replace($url, 'podcast', 0, 4);
-		}
-		elseif ($http == 4 && strtolower($parsed['scheme']) == 'http')
-		{
-			return substr_replace($url, 'itpc', 0, 4);
-		}
-		else
-		{
-			return $url;
-		}
-	}
-
-	function parse_url($url)
-	{
-		static $cache = array();
-		if (isset($cache[$url]))
-		{
-			return $cache[$url];
-		}
-		elseif (preg_match('/^(([^:\/?#]+):)?(\/\/([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?$/', $url, $match))
-		{
-			for ($i = count($match); $i <= 9; $i++)
-			{
-				$match[$i] = '';
-			}
-			return $cache[$url] = array('scheme' => $match[2], 'authority' => $match[4], 'path' => $match[5], 'query' => $match[7], 'fragment' => $match[9]);
-		}
-		else
-		{
-			return $cache[$url] = array('scheme' => '', 'authority' => '', 'path' => '', 'query' => '', 'fragment' => '');
-		}
-	}
-
-	function compress_parse_url($scheme = '', $authority = '', $path = '', $query = '', $fragment = '')
-	{
-		$return = '';
-		if ($scheme !== '')
-		{
-			$return .= "$scheme:";
-		}
-		if ($authority !== '')
-		{
-			$return .= "//$authority";
-		}
-		if ($path !== '')
-		{
-			$return .= $path;
-		}
-		if ($query !== '')
-		{
-			$return .= "?$query";
-		}
-		if ($fragment !== '')
-		{
-			$return .= "#$fragment";
-		}
-		return $return;
-	}
-
-	function normalize_url($url)
-	{
-		$url = preg_replace_callback('/%([0-9A-Fa-f]{2})/', array('SimplePie_Misc', 'percent_encoding_normalization'), $url);
-		$url = SimplePie_Misc::parse_url($url);
-		$url['scheme'] = strtolower($url['scheme']);
-		if ($url['authority'] !== '')
-		{
-			$url['authority'] = strtolower($url['authority']);
-			$url['path'] = SimplePie_Misc::remove_dot_segments($url['path']);
-		}
-		return SimplePie_Misc::compress_parse_url($url['scheme'], $url['authority'], $url['path'], $url['query'], $url['fragment']);
-	}
-
-	function percent_encoding_normalization($match)
-	{
-		$integer = hexdec($match[1]);
-		if ($integer >= 0x41 && $integer <= 0x5A || $integer >= 0x61 && $integer <= 0x7A || $integer >= 0x30 && $integer <= 0x39 || $integer == 0x2D || $integer == 0x2E || $integer == 0x5F || $integer == 0x7E)
-		{
-			return chr($integer);
-		}
-		else
-		{
-			return strtoupper($match[0]);
-		}
-	}
-
-	/**
-	 * Remove bad UTF-8 bytes
-	 *
-	 * PCRE Pattern to locate bad bytes in a UTF-8 string comes from W3C
-	 * FAQ: Multilingual Forms (modified to include full ASCII range)
-	 *
-	 * @author Geoffrey Sneddon
-	 * @see http://www.w3.org/International/questions/qa-forms-utf-8
-	 * @param string $str String to remove bad UTF-8 bytes from
-	 * @return string UTF-8 string
-	 */
-	function utf8_bad_replace($str)
-	{
-		if (function_exists('iconv'))
-		{
-			return iconv('UTF-8', 'UTF-8//IGNORE', $str);
-		}
-		elseif (function_exists('mb_convert_encoding'))
-		{
-			return mb_convert_encoding($str, 'UTF-8', 'UTF-8');
-		}
-		elseif (preg_match_all('/([\x00-\x7F]|[\xC2-\xDF][\x80-\xBF]|\xE0[\xA0-\xBF][\x80-\xBF]|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}|\xED[\x80-\x9F][\x80-\xBF]|\xF0[\x90-\xBF][\x80-\xBF]{2}|[\xF1-\xF3][\x80-\xBF]{3}|\xF4[\x80-\x8F][\x80-\xBF]{2})/', $str, $matches))
-		{
-			return implode("\xEF\xBF\xBD", $matches[0]);
-		}
-		elseif ($str !== '')
-		{
-			return "\xEF\xBF\xBD";
-		}
-		else
-		{
-			return '';
-		}
-	}
-
-	function change_encoding($data, $input, $output)
-	{
-		$input = SimplePie_Misc::encoding($input);
-		$output = SimplePie_Misc::encoding($output);
-
-		if (function_exists('iconv') && ($return = @iconv($input, "$output//IGNORE", $data)))
-		{
-			return $return;
-		}
-		elseif (function_exists('iconv') && ($return = @iconv($input, $output, $data)))
-		{
-			return $return;
-		}
-		elseif (function_exists('mb_convert_encoding') && ($return = @mb_convert_encoding($data, $output, $input)))
-		{
-			return $return;
-		}
-		elseif ($input == 'ISO-8859-1' && $output == 'UTF-8')
-		{
-			return utf8_encode($data);
-		}
-		elseif ($input == 'UTF-8' && $output == 'ISO-8859-1')
-		{
-			return utf8_decode($data);
-		}
-		return $data;
-	}
-
-	function encoding($encoding)
-	{
-		// Character sets are case-insensitive (though we'll return them in the form given in their registration)
-		switch (strtoupper($encoding))
-		{
-			case 'ANSI_X3.4-1968':
-			case 'ISO-IR-6':
-			case 'ANSI_X3.4-1986':
-			case 'ISO_646.IRV:1991':
-			case 'ASCII':
-			case 'ISO646-US':
-			case 'US-ASCII':
-			case 'US':
-			case 'IBM367':
-			case 'CP367':
-			case 'CSASCII':
-				return 'US-ASCII';
-
-			case 'ISO_8859-1:1987':
-			case 'ISO-IR-100':
-			case 'ISO_8859-1':
-			case 'ISO-8859-1':
-			case 'LATIN1':
-			case 'L1':
-			case 'IBM819':
-			case 'CP819':
-			case 'CSISOLATIN1':
-				return 'ISO-8859-1';
-
-			case 'ISO_8859-2:1987':
-			case 'ISO-IR-101':
-			case 'ISO_8859-2':
-			case 'ISO-8859-2':
-			case 'LATIN2':
-			case 'L2':
-			case 'CSISOLATIN2':
-				return 'ISO-8859-2';
-
-			case 'ISO_8859-3:1988':
-			case 'ISO-IR-109':
-			case 'ISO_8859-3':
-			case 'ISO-8859-3':
-			case 'LATIN3':
-			case 'L3':
-			case 'CSISOLATIN3':
-				return 'ISO-8859-3';
-
-			case 'ISO_8859-4:1988':
-			case 'ISO-IR-110':
-			case 'ISO_8859-4':
-			case 'ISO-8859-4':
-			case 'LATIN4':
-			case 'L4':
-			case 'CSISOLATIN4':
-				return 'ISO-8859-4';
-
-			case 'ISO_8859-5:1988':
-			case 'ISO-IR-144':
-			case 'ISO_8859-5':
-			case 'ISO-8859-5':
-			case 'CYRILLIC':
-			case 'CSISOLATINCYRILLIC':
-				return 'ISO-8859-5';
-
-			case 'ISO_8859-6:1987':
-			case 'ISO-IR-127':
-			case 'ISO_8859-6':
-			case 'ISO-8859-6':
-			case 'ECMA-114':
-			case 'ASMO-708':
-			case 'ARABIC':
-			case 'CSISOLATINARABIC':
-				return 'ISO-8859-6';
-
-			case 'ISO_8859-7:1987':
-			case 'ISO-IR-126':
-			case 'ISO_8859-7':
-			case 'ISO-8859-7':
-			case 'ELOT_928':
-			case 'ECMA-118':
-			case 'GREEK':
-			case 'GREEK8':
-			case 'CSISOLATINGREEK':
-				return 'ISO-8859-7';
-
-			case 'ISO_8859-8:1988':
-			case 'ISO-IR-138':
-			case 'ISO_8859-8':
-			case 'ISO-8859-8':
-			case 'HEBREW':
-			case 'CSISOLATINHEBREW':
-				return 'ISO-8859-8';
-
-			case 'ISO_8859-9:1989':
-			case 'ISO-IR-148':
-			case 'ISO_8859-9':
-			case 'ISO-8859-9':
-			case 'LATIN5':
-			case 'L5':
-			case 'CSISOLATIN5':
-				return 'ISO-8859-9';
-
-			case 'ISO-8859-10':
-			case 'ISO-IR-157':
-			case 'L6':
-			case 'ISO_8859-10:1992':
-			case 'CSISOLATIN6':
-			case 'LATIN6':
-				return 'ISO-8859-10';
-
-			case 'ISO_6937-2-ADD':
-			case 'ISO-IR-142':
-			case 'CSISOTEXTCOMM':
-				return 'ISO_6937-2-add';
-
-			case 'JIS_X0201':
-			case 'X0201':
-			case 'CSHALFWIDTHKATAKANA':
-				return 'JIS_X0201';
-
-			case 'JIS_ENCODING':
-			case 'CSJISENCODING':
-				return 'JIS_Encoding';
-
-			case 'SHIFT_JIS':
-			case 'MS_KANJI':
-			case 'CSSHIFTJIS':
-				return 'Shift_JIS';
-
-			case 'EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE':
-			case 'CSEUCPKDFMTJAPANESE':
-			case 'EUC-JP':
-				return 'EUC-JP';
-
-			case 'EXTENDED_UNIX_CODE_FIXED_WIDTH_FOR_JAPANESE':
-			case 'CSEUCFIXWIDJAPANESE':
-				return 'Extended_UNIX_Code_Fixed_Width_for_Japanese';
-
-			case 'BS_4730':
-			case 'ISO-IR-4':
-			case 'ISO646-GB':
-			case 'GB':
-			case 'UK':
-			case 'CSISO4UNITEDKINGDOM':
-				return 'BS_4730';
-
-			case 'SEN_850200_C':
-			case 'ISO-IR-11':
-			case 'ISO646-SE2':
-			case 'SE2':
-			case 'CSISO11SWEDISHFORNAMES':
-				return 'SEN_850200_C';
-
-			case 'IT':
-			case 'ISO-IR-15':
-			case 'ISO646-IT':
-			case 'CSISO15ITALIAN':
-				return 'IT';
-
-			case 'ES':
-			case 'ISO-IR-17':
-			case 'ISO646-ES':
-			case 'CSISO17SPANISH':
-				return 'ES';
-
-			case 'DIN_66003':
-			case 'ISO-IR-21':
-			case 'DE':
-			case 'ISO646-DE':
-			case 'CSISO21GERMAN':
-				return 'DIN_66003';
-
-			case 'NS_4551-1':
-			case 'ISO-IR-60':
-			case 'ISO646-NO':
-			case 'NO':
-			case 'CSISO60DANISHNORWEGIAN':
-			case 'CSISO60NORWEGIAN1':
-				return 'NS_4551-1';
-
-			case 'NF_Z_62-010':
-			case 'ISO-IR-69':
-			case 'ISO646-FR':
-			case 'FR':
-			case 'CSISO69FRENCH':
-				return 'NF_Z_62-010';
-
-			case 'ISO-10646-UTF-1':
-			case 'CSISO10646UTF1':
-				return 'ISO-10646-UTF-1';
-
-			case 'ISO_646.BASIC:1983':
-			case 'REF':
-			case 'CSISO646BASIC1983':
-				return 'ISO_646.basic:1983';
-
-			case 'INVARIANT':
-			case 'CSINVARIANT':
-				return 'INVARIANT';
-
-			case 'ISO_646.IRV:1983':
-			case 'ISO-IR-2':
-			case 'IRV':
-			case 'CSISO2INTLREFVERSION':
-				return 'ISO_646.irv:1983';
-
-			case 'NATS-SEFI':
-			case 'ISO-IR-8-1':
-			case 'CSNATSSEFI':
-				return 'NATS-SEFI';
-
-			case 'NATS-SEFI-ADD':
-			case 'ISO-IR-8-2':
-			case 'CSNATSSEFIADD':
-				return 'NATS-SEFI-ADD';
-
-			case 'NATS-DANO':
-			case 'ISO-IR-9-1':
-			case 'CSNATSDANO':
-				return 'NATS-DANO';
-
-			case 'NATS-DANO-ADD':
-			case 'ISO-IR-9-2':
-			case 'CSNATSDANOADD':
-				return 'NATS-DANO-ADD';
-
-			case 'SEN_850200_B':
-			case 'ISO-IR-10':
-			case 'FI':
-			case 'ISO646-FI':
-			case 'ISO646-SE':
-			case 'SE':
-			case 'CSISO10SWEDISH':
-				return 'SEN_850200_B';
-
-			case 'KS_C_5601-1987':
-			case 'ISO-IR-149':
-			case 'KS_C_5601-1989':
-			case 'KSC_5601':
-			case 'KOREAN':
-			case 'CSKSC56011987':
-				return 'KS_C_5601-1987';
-
-			case 'ISO-2022-KR':
-			case 'CSISO2022KR':
-				return 'ISO-2022-KR';
-
-			case 'EUC-KR':
-			case 'CSEUCKR':
-				return 'EUC-KR';
-
-			case 'ISO-2022-JP':
-			case 'CSISO2022JP':
-				return 'ISO-2022-JP';
-
-			case 'ISO-2022-JP-2':
-			case 'CSISO2022JP2':
-				return 'ISO-2022-JP-2';
-
-			case 'JIS_C6220-1969-JP':
-			case 'JIS_C6220-1969':
-			case 'ISO-IR-13':
-			case 'KATAKANA':
-			case 'X0201-7':
-			case 'CSISO13JISC6220JP':
-				return 'JIS_C6220-1969-jp';
-
-			case 'JIS_C6220-1969-RO':
-			case 'ISO-IR-14':
-			case 'JP':
-			case 'ISO646-JP':
-			case 'CSISO14JISC6220RO':
-				return 'JIS_C6220-1969-ro';
-
-			case 'PT':
-			case 'ISO-IR-16':
-			case 'ISO646-PT':
-			case 'CSISO16PORTUGUESE':
-				return 'PT';
-
-			case 'GREEK7-OLD':
-			case 'ISO-IR-18':
-			case 'CSISO18GREEK7OLD':
-				return 'greek7-old';
-
-			case 'LATIN-GREEK':
-			case 'ISO-IR-19':
-			case 'CSISO19LATINGREEK':
-				return 'latin-greek';
-
-			case 'NF_Z_62-010_(1973)':
-			case 'ISO-IR-25':
-			case 'ISO646-FR1':
-			case 'CSISO25FRENCH':
-				return 'NF_Z_62-010_(1973)';
-
-			case 'LATIN-GREEK-1':
-			case 'ISO-IR-27':
-			case 'CSISO27LATINGREEK1':
-				return 'Latin-greek-1';
-
-			case 'ISO_5427':
-			case 'ISO-IR-37':
-			case 'CSISO5427CYRILLIC':
-				return 'ISO_5427';
-
-			case 'JIS_C6226-1978':
-			case 'ISO-IR-42':
-			case 'CSISO42JISC62261978':
-				return 'JIS_C6226-1978';
-
-			case 'BS_VIEWDATA':
-			case 'ISO-IR-47':
-			case 'CSISO47BSVIEWDATA':
-				return 'BS_viewdata';
-
-			case 'INIS':
-			case 'ISO-IR-49':
-			case 'CSISO49INIS':
-				return 'INIS';
-
-			case 'INIS-8':
-			case 'ISO-IR-50':
-			case 'CSISO50INIS8':
-				return 'INIS-8';
-
-			case 'INIS-CYRILLIC':
-			case 'ISO-IR-51':
-			case 'CSISO51INISCYRILLIC':
-				return 'INIS-cyrillic';
-
-			case 'ISO_5427:1981':
-			case 'ISO-IR-54':
-			case 'ISO5427CYRILLIC1981':
-				return 'ISO_5427:1981';
-
-			case 'ISO_5428:1980':
-			case 'ISO-IR-55':
-			case 'CSISO5428GREEK':
-				return 'ISO_5428:1980';
-
-			case 'GB_1988-80':
-			case 'ISO-IR-57':
-			case 'CN':
-			case 'ISO646-CN':
-			case 'CSISO57GB1988':
-				return 'GB_1988-80';
-
-			case 'GB_2312-80':
-			case 'ISO-IR-58':
-			case 'CHINESE':
-			case 'CSISO58GB231280':
-				return 'GB_2312-80';
-
-			case 'NS_4551-2':
-			case 'ISO646-NO2':
-			case 'ISO-IR-61':
-			case 'NO2':
-			case 'CSISO61NORWEGIAN2':
-				return 'NS_4551-2';
-
-			case 'VIDEOTEX-SUPPL':
-			case 'ISO-IR-70':
-			case 'CSISO70VIDEOTEXSUPP1':
-				return 'videotex-suppl';
-
-			case 'PT2':
-			case 'ISO-IR-84':
-			case 'ISO646-PT2':
-			case 'CSISO84PORTUGUESE2':
-				return 'PT2';
-
-			case 'ES2':
-			case 'ISO-IR-85':
-			case 'ISO646-ES2':
-			case 'CSISO85SPANISH2':
-				return 'ES2';
-
-			case 'MSZ_7795.3':
-			case 'ISO-IR-86':
-			case 'ISO646-HU':
-			case 'HU':
-			case 'CSISO86HUNGARIAN':
-				return 'MSZ_7795.3';
-
-			case 'JIS_C6226-1983':
-			case 'ISO-IR-87':
-			case 'X0208':
-			case 'JIS_X0208-1983':
-			case 'CSISO87JISX0208':
-				return 'JIS_C6226-1983';
-
-			case 'GREEK7':
-			case 'ISO-IR-88':
-			case 'CSISO88GREEK7':
-				return 'greek7';
-
-			case 'ASMO_449':
-			case 'ISO_9036':
-			case 'ARABIC7':
-			case 'ISO-IR-89':
-			case 'CSISO89ASMO449':
-				return 'ASMO_449';
-
-			case 'ISO-IR-90':
-			case 'CSISO90':
-				return 'iso-ir-90';
-
-			case 'JIS_C6229-1984-A':
-			case 'ISO-IR-91':
-			case 'JP-OCR-A':
-			case 'CSISO91JISC62291984A':
-				return 'JIS_C6229-1984-a';
-
-			case 'JIS_C6229-1984-B':
-			case 'ISO-IR-92':
-			case 'ISO646-JP-OCR-B':
-			case 'JP-OCR-B':
-			case 'CSISO92JISC62991984B':
-				return 'JIS_C6229-1984-b';
-
-			case 'JIS_C6229-1984-B-ADD':
-			case 'ISO-IR-93':
-			case 'JP-OCR-B-ADD':
-			case 'CSISO93JIS62291984BADD':
-				return 'JIS_C6229-1984-b-add';
-
-			case 'JIS_C6229-1984-HAND':
-			case 'ISO-IR-94':
-			case 'JP-OCR-HAND':
-			case 'CSISO94JIS62291984HAND':
-				return 'JIS_C6229-1984-hand';
-
-			case 'JIS_C6229-1984-HAND-ADD':
-			case 'ISO-IR-95':
-			case 'JP-OCR-HAND-ADD':
-			case 'CSISO95JIS62291984HANDADD':
-				return 'JIS_C6229-1984-hand-add';
-
-			case 'JIS_C6229-1984-KANA':
-			case 'ISO-IR-96':
-			case 'CSISO96JISC62291984KANA':
-				return 'JIS_C6229-1984-kana';
-
-			case 'ISO_2033-1983':
-			case 'ISO-IR-98':
-			case 'E13B':
-			case 'CSISO2033':
-				return 'ISO_2033-1983';
-
-			case 'ANSI_X3.110-1983':
-			case 'ISO-IR-99':
-			case 'CSA_T500-1983':
-			case 'NAPLPS':
-			case 'CSISO99NAPLPS':
-				return 'ANSI_X3.110-1983';
-
-			case 'T.61-7BIT':
-			case 'ISO-IR-102':
-			case 'CSISO102T617BIT':
-				return 'T.61-7bit';
-
-			case 'T.61-8BIT':
-			case 'T.61':
-			case 'ISO-IR-103':
-			case 'CSISO103T618BIT':
-				return 'T.61-8bit';
-
-			case 'ECMA-CYRILLIC':
-			case 'ISO-IR-111':
-			case 'KOI8-E':
-			case 'CSISO111ECMACYRILLIC':
-				return 'ECMA-cyrillic';
-
-			case 'CSA_Z243.4-1985-1':
-			case 'ISO-IR-121':
-			case 'ISO646-CA':
-			case 'CSA7-1':
-			case 'CA':
-			case 'CSISO121CANADIAN1':
-				return 'CSA_Z243.4-1985-1';
-
-			case 'CSA_Z243.4-1985-2':
-			case 'ISO-IR-122':
-			case 'ISO646-CA2':
-			case 'CSA7-2':
-			case 'CSISO122CANADIAN2':
-				return 'CSA_Z243.4-1985-2';
-
-			case 'CSA_Z243.4-1985-GR':
-			case 'ISO-IR-123':
-			case 'CSISO123CSAZ24341985GR':
-				return 'CSA_Z243.4-1985-gr';
-
-			case 'ISO_8859-6-E':
-			case 'CSISO88596E':
-			case 'ISO-8859-6-E':
-				return 'ISO-8859-6-E';
-
-			case 'ISO_8859-6-I':
-			case 'CSISO88596I':
-			case 'ISO-8859-6-I':
-				return 'ISO-8859-6-I';
-
-			case 'T.101-G2':
-			case 'ISO-IR-128':
-			case 'CSISO128T101G2':
-				return 'T.101-G2';
-
-			case 'ISO_8859-8-E':
-			case 'CSISO88598E':
-			case 'ISO-8859-8-E':
-				return 'ISO-8859-8-E';
-
-			case 'ISO_8859-8-I':
-			case 'CSISO88598I':
-			case 'ISO-8859-8-I':
-				return 'ISO-8859-8-I';
-
-			case 'CSN_369103':
-			case 'ISO-IR-139':
-			case 'CSISO139CSN369103':
-				return 'CSN_369103';
-
-			case 'JUS_I.B1.002':
-			case 'ISO-IR-141':
-			case 'ISO646-YU':
-			case 'JS':
-			case 'YU':
-			case 'CSISO141JUSIB1002':
-				return 'JUS_I.B1.002';
-
-			case 'IEC_P27-1':
-			case 'ISO-IR-143':
-			case 'CSISO143IECP271':
-				return 'IEC_P27-1';
-
-			case 'JUS_I.B1.003-SERB':
-			case 'ISO-IR-146':
-			case 'SERBIAN':
-			case 'CSISO146SERBIAN':
-				return 'JUS_I.B1.003-serb';
-
-			case 'JUS_I.B1.003-MAC':
-			case 'MACEDONIAN':
-			case 'ISO-IR-147':
-			case 'CSISO147MACEDONIAN':
-				return 'JUS_I.B1.003-mac';
-
-			case 'GREEK-CCITT':
-			case 'ISO-IR-150':
-			case 'CSISO150':
-			case 'CSISO150GREEKCCITT':
-				return 'greek-ccitt';
-
-			case 'NC_NC00-10:81':
-			case 'CUBA':
-			case 'ISO-IR-151':
-			case 'ISO646-CU':
-			case 'CSISO151CUBA':
-				return 'NC_NC00-10:81';
-
-			case 'ISO_6937-2-25':
-			case 'ISO-IR-152':
-			case 'CSISO6937ADD':
-				return 'ISO_6937-2-25';
-
-			case 'GOST_19768-74':
-			case 'ST_SEV_358-88':
-			case 'ISO-IR-153':
-			case 'CSISO153GOST1976874':
-				return 'GOST_19768-74';
-
-			case 'ISO_8859-SUPP':
-			case 'ISO-IR-154':
-			case 'LATIN1-2-5':
-			case 'CSISO8859SUPP':
-				return 'ISO_8859-supp';
-
-			case 'ISO_10367-BOX':
-			case 'ISO-IR-155':
-			case 'CSISO10367BOX':
-				return 'ISO_10367-box';
-
-			case 'LATIN-LAP':
-			case 'LAP':
-			case 'ISO-IR-158':
-			case 'CSISO158LAP':
-				return 'latin-lap';
-
-			case 'JIS_X0212-1990':
-			case 'X0212':
-			case 'ISO-IR-159':
-			case 'CSISO159JISX02121990':
-				return 'JIS_X0212-1990';
-
-			case 'DS_2089':
-			case 'DS2089':
-			case 'ISO646-DK':
-			case 'DK':
-			case 'CSISO646DANISH':
-				return 'DS_2089';
-
-			case 'US-DK':
-			case 'CSUSDK':
-				return 'us-dk';
-
-			case 'DK-US':
-			case 'CSDKUS':
-				return 'dk-us';
-
-			case 'KSC5636':
-			case 'ISO646-KR':
-			case 'CSKSC5636':
-				return 'KSC5636';
-
-			case 'UNICODE-1-1-UTF-7':
-			case 'CSUNICODE11UTF7':
-				return 'UNICODE-1-1-UTF-7';
-
-			case 'ISO-2022-CN':
-				return 'ISO-2022-CN';
-
-			case 'ISO-2022-CN-EXT':
-				return 'ISO-2022-CN-EXT';
-
-			case 'UTF-8':
-				return 'UTF-8';
-
-			case 'ISO-8859-13':
-				return 'ISO-8859-13';
-
-			case 'ISO-8859-14':
-			case 'ISO-IR-199':
-			case 'ISO_8859-14:1998':
-			case 'ISO_8859-14':
-			case 'LATIN8':
-			case 'ISO-CELTIC':
-			case 'L8':
-				return 'ISO-8859-14';
-
-			case 'ISO-8859-15':
-			case 'ISO_8859-15':
-			case 'LATIN-9':
-				return 'ISO-8859-15';
-
-			case 'ISO-8859-16':
-			case 'ISO-IR-226':
-			case 'ISO_8859-16:2001':
-			case 'ISO_8859-16':
-			case 'LATIN10':
-			case 'L10':
-				return 'ISO-8859-16';
-
-			case 'GBK':
-			case 'CP936':
-			case 'MS936':
-			case 'WINDOWS-936':
-				return 'GBK';
-
-			case 'GB18030':
-				return 'GB18030';
-
-			case 'OSD_EBCDIC_DF04_15':
-				return 'OSD_EBCDIC_DF04_15';
-
-			case 'OSD_EBCDIC_DF03_IRV':
-				return 'OSD_EBCDIC_DF03_IRV';
-
-			case 'OSD_EBCDIC_DF04_1':
-				return 'OSD_EBCDIC_DF04_1';
-
-			case 'ISO-11548-1':
-			case 'ISO_11548-1':
-			case 'ISO_TR_11548-1':
-			case 'CSISO115481':
-				return 'ISO-11548-1';
-
-			case 'KZ-1048':
-			case 'STRK1048-2002':
-			case 'RK1048':
-			case 'CSKZ1048':
-				return 'KZ-1048';
-
-			case 'ISO-10646-UCS-2':
-			case 'CSUNICODE':
-				return 'ISO-10646-UCS-2';
-
-			case 'ISO-10646-UCS-4':
-			case 'CSUCS4':
-				return 'ISO-10646-UCS-4';
-
-			case 'ISO-10646-UCS-BASIC':
-			case 'CSUNICODEASCII':
-				return 'ISO-10646-UCS-Basic';
-
-			case 'ISO-10646-UNICODE-LATIN1':
-			case 'CSUNICODELATIN1':
-			case 'ISO-10646':
-				return 'ISO-10646-Unicode-Latin1';
-
-			case 'ISO-10646-J-1':
-				return 'ISO-10646-J-1';
-
-			case 'ISO-UNICODE-IBM-1261':
-			case 'CSUNICODEIBM1261':
-				return 'ISO-Unicode-IBM-1261';
-
-			case 'ISO-UNICODE-IBM-1268':
-			case 'CSUNICODEIBM1268':
-				return 'ISO-Unicode-IBM-1268';
-
-			case 'ISO-UNICODE-IBM-1276':
-			case 'CSUNICODEIBM1276':
-				return 'ISO-Unicode-IBM-1276';
-
-			case 'ISO-UNICODE-IBM-1264':
-			case 'CSUNICODEIBM1264':
-				return 'ISO-Unicode-IBM-1264';
-
-			case 'ISO-UNICODE-IBM-1265':
-			case 'CSUNICODEIBM1265':
-				return 'ISO-Unicode-IBM-1265';
-
-			case 'UNICODE-1-1':
-			case 'CSUNICODE11':
-				return 'UNICODE-1-1';
-
-			case 'SCSU':
-				return 'SCSU';
-
-			case 'UTF-7':
-				return 'UTF-7';
-
-			case 'UTF-16BE':
-				return 'UTF-16BE';
-
-			case 'UTF-16LE':
-				return 'UTF-16LE';
-
-			case 'UTF-16':
-				return 'UTF-16';
-
-			case 'CESU-8':
-			case 'CSCESU-8':
-				return 'CESU-8';
-
-			case 'UTF-32':
-				return 'UTF-32';
-
-			case 'UTF-32BE':
-				return 'UTF-32BE';
-
-			case 'UTF-32LE':
-				return 'UTF-32LE';
-
-			case 'BOCU-1':
-			case 'CSBOCU-1':
-				return 'BOCU-1';
-
-			case 'ISO-8859-1-WINDOWS-3.0-LATIN-1':
-			case 'CSWINDOWS30LATIN1':
-				return 'ISO-8859-1-Windows-3.0-Latin-1';
-
-			case 'ISO-8859-1-WINDOWS-3.1-LATIN-1':
-			case 'CSWINDOWS31LATIN1':
-				return 'ISO-8859-1-Windows-3.1-Latin-1';
-
-			case 'ISO-8859-2-WINDOWS-LATIN-2':
-			case 'CSWINDOWS31LATIN2':
-				return 'ISO-8859-2-Windows-Latin-2';
-
-			case 'ISO-8859-9-WINDOWS-LATIN-5':
-			case 'CSWINDOWS31LATIN5':
-				return 'ISO-8859-9-Windows-Latin-5';
-
-			case 'HP-ROMAN8':
-			case 'ROMAN8':
-			case 'R8':
-			case 'CSHPROMAN8':
-				return 'hp-roman8';
-
-			case 'ADOBE-STANDARD-ENCODING':
-			case 'CSADOBESTANDARDENCODING':
-				return 'Adobe-Standard-Encoding';
-
-			case 'VENTURA-US':
-			case 'CSVENTURAUS':
-				return 'Ventura-US';
-
-			case 'VENTURA-INTERNATIONAL':
-			case 'CSVENTURAINTERNATIONAL':
-				return 'Ventura-International';
-
-			case 'DEC-MCS':
-			case 'DEC':
-			case 'CSDECMCS':
-				return 'DEC-MCS';
-
-			case 'IBM850':
-			case 'CP850':
-			case '850':
-			case 'CSPC850MULTILINGUAL':
-				return 'IBM850';
-
-			case 'PC8-DANISH-NORWEGIAN':
-			case 'CSPC8DANISHNORWEGIAN':
-				return 'PC8-Danish-Norwegian';
-
-			case 'IBM862':
-			case 'CP862':
-			case '862':
-			case 'CSPC862LATINHEBREW':
-				return 'IBM862';
-
-			case 'PC8-TURKISH':
-			case 'CSPC8TURKISH':
-				return 'PC8-Turkish';
-
-			case 'IBM-SYMBOLS':
-			case 'CSIBMSYMBOLS':
-				return 'IBM-Symbols';
-
-			case 'IBM-THAI':
-			case 'CSIBMTHAI':
-				return 'IBM-Thai';
-
-			case 'HP-LEGAL':
-			case 'CSHPLEGAL':
-				return 'HP-Legal';
-
-			case 'HP-PI-FONT':
-			case 'CSHPPIFONT':
-				return 'HP-Pi-font';
-
-			case 'HP-MATH8':
-			case 'CSHPMATH8':
-				return 'HP-Math8';
-
-			case 'ADOBE-SYMBOL-ENCODING':
-			case 'CSHPPSMATH':
-				return 'Adobe-Symbol-Encoding';
-
-			case 'HP-DESKTOP':
-			case 'CSHPDESKTOP':
-				return 'HP-DeskTop';
-
-			case 'VENTURA-MATH':
-			case 'CSVENTURAMATH':
-				return 'Ventura-Math';
-
-			case 'MICROSOFT-PUBLISHING':
-			case 'CSMICROSOFTPUBLISHING':
-				return 'Microsoft-Publishing';
-
-			case 'WINDOWS-31J':
-			case 'CSWINDOWS31J':
-				return 'Windows-31J';
-
-			case 'GB2312':
-			case 'CSGB2312':
-				return 'GB2312';
-
-			case 'BIG5':
-			case 'CSBIG5':
-				return 'Big5';
-
-			case 'MACINTOSH':
-			case 'MAC':
-			case 'CSMACINTOSH':
-				return 'macintosh';
-
-			case 'IBM037':
-			case 'CP037':
-			case 'EBCDIC-CP-US':
-			case 'EBCDIC-CP-CA':
-			case 'EBCDIC-CP-WT':
-			case 'EBCDIC-CP-NL':
-			case 'CSIBM037':
-				return 'IBM037';
-
-			case 'IBM038':
-			case 'EBCDIC-INT':
-			case 'CP038':
-			case 'CSIBM038':
-				return 'IBM038';
-
-			case 'IBM273':
-			case 'CP273':
-			case 'CSIBM273':
-				return 'IBM273';
-
-			case 'IBM274':
-			case 'EBCDIC-BE':
-			case 'CP274':
-			case 'CSIBM274':
-				return 'IBM274';
-
-			case 'IBM275':
-			case 'EBCDIC-BR':
-			case 'CP275':
-			case 'CSIBM275':
-				return 'IBM275';
-
-			case 'IBM277':
-			case 'EBCDIC-CP-DK':
-			case 'EBCDIC-CP-NO':
-			case 'CSIBM277':
-				return 'IBM277';
-
-			case 'IBM278':
-			case 'CP278':
-			case 'EBCDIC-CP-FI':
-			case 'EBCDIC-CP-SE':
-			case 'CSIBM278':
-				return 'IBM278';
-
-			case 'IBM280':
-			case 'CP280':
-			case 'EBCDIC-CP-IT':
-			case 'CSIBM280':
-				return 'IBM280';
-
-			case 'IBM281':
-			case 'EBCDIC-JP-E':
-			case 'CP281':
-			case 'CSIBM281':
-				return 'IBM281';
-
-			case 'IBM284':
-			case 'CP284':
-			case 'EBCDIC-CP-ES':
-			case 'CSIBM284':
-				return 'IBM284';
-
-			case 'IBM285':
-			case 'CP285':
-			case 'EBCDIC-CP-GB':
-			case 'CSIBM285':
-				return 'IBM285';
-
-			case 'IBM290':
-			case 'CP290':
-			case 'EBCDIC-JP-KANA':
-			case 'CSIBM290':
-				return 'IBM290';
-
-			case 'IBM297':
-			case 'CP297':
-			case 'EBCDIC-CP-FR':
-			case 'CSIBM297':
-				return 'IBM297';
-
-			case 'IBM420':
-			case 'CP420':
-			case 'EBCDIC-CP-AR1':
-			case 'CSIBM420':
-				return 'IBM420';
-
-			case 'IBM423':
-			case 'CP423':
-			case 'EBCDIC-CP-GR':
-			case 'CSIBM423':
-				return 'IBM423';
-
-			case 'IBM424':
-			case 'CP424':
-			case 'EBCDIC-CP-HE':
-			case 'CSIBM424':
-				return 'IBM424';
-
-			case 'IBM437':
-			case 'CP437':
-			case '437':
-			case 'CSPC8CODEPAGE437':
-				return 'IBM437';
-
-			case 'IBM500':
-			case 'CP500':
-			case 'EBCDIC-CP-BE':
-			case 'EBCDIC-CP-CH':
-			case 'CSIBM500':
-				return 'IBM500';
-
-			case 'IBM851':
-			case 'CP851':
-			case '851':
-			case 'CSIBM851':
-				return 'IBM851';
-
-			case 'IBM852':
-			case 'CP852':
-			case '852':
-			case 'CSPCP852':
-				return 'IBM852';
-
-			case 'IBM855':
-			case 'CP855':
-			case '855':
-			case 'CSIBM855':
-				return 'IBM855';
-
-			case 'IBM857':
-			case 'CP857':
-			case '857':
-			case 'CSIBM857':
-				return 'IBM857';
-
-			case 'IBM860':
-			case 'CP860':
-			case '860':
-			case 'CSIBM860':
-				return 'IBM860';
-
-			case 'IBM861':
-			case 'CP861':
-			case '861':
-			case 'CP-IS':
-			case 'CSIBM861':
-				return 'IBM861';
-
-			case 'IBM863':
-			case 'CP863':
-			case '863':
-			case 'CSIBM863':
-				return 'IBM863';
-
-			case 'IBM864':
-			case 'CP864':
-			case 'CSIBM864':
-				return 'IBM864';
-
-			case 'IBM865':
-			case 'CP865':
-			case '865':
-			case 'CSIBM865':
-				return 'IBM865';
-
-			case 'IBM868':
-			case 'CP868':
-			case 'CP-AR':
-			case 'CSIBM868':
-				return 'IBM868';
-
-			case 'IBM869':
-			case 'CP869':
-			case '869':
-			case 'CP-GR':
-			case 'CSIBM869':
-				return 'IBM869';
-
-			case 'IBM870':
-			case 'CP870':
-			case 'EBCDIC-CP-ROECE':
-			case 'EBCDIC-CP-YU':
-			case 'CSIBM870':
-				return 'IBM870';
-
-			case 'IBM871':
-			case 'CP871':
-			case 'EBCDIC-CP-IS':
-			case 'CSIBM871':
-				return 'IBM871';
-
-			case 'IBM880':
-			case 'CP880':
-			case 'EBCDIC-CYRILLIC':
-			case 'CSIBM880':
-				return 'IBM880';
-
-			case 'IBM891':
-			case 'CP891':
-			case 'CSIBM891':
-				return 'IBM891';
-
-			case 'IBM903':
-			case 'CP903':
-			case 'CSIBM903':
-				return 'IBM903';
-
-			case 'IBM904':
-			case 'CP904':
-			case '904':
-			case 'CSIBBM904':
-				return 'IBM904';
-
-			case 'IBM905':
-			case 'CP905':
-			case 'EBCDIC-CP-TR':
-			case 'CSIBM905':
-				return 'IBM905';
-
-			case 'IBM918':
-			case 'CP918':
-			case 'EBCDIC-CP-AR2':
-			case 'CSIBM918':
-				return 'IBM918';
-
-			case 'IBM1026':
-			case 'CP1026':
-			case 'CSIBM1026':
-				return 'IBM1026';
-
-			case 'EBCDIC-AT-DE':
-			case 'CSIBMEBCDICATDE':
-				return 'EBCDIC-AT-DE';
-
-			case 'EBCDIC-AT-DE-A':
-			case 'CSEBCDICATDEA':
-				return 'EBCDIC-AT-DE-A';
-
-			case 'EBCDIC-CA-FR':
-			case 'CSEBCDICCAFR':
-				return 'EBCDIC-CA-FR';
-
-			case 'EBCDIC-DK-NO':
-			case 'CSEBCDICDKNO':
-				return 'EBCDIC-DK-NO';
-
-			case 'EBCDIC-DK-NO-A':
-			case 'CSEBCDICDKNOA':
-				return 'EBCDIC-DK-NO-A';
-
-			case 'EBCDIC-FI-SE':
-			case 'CSEBCDICFISE':
-				return 'EBCDIC-FI-SE';
-
-			case 'EBCDIC-FI-SE-A':
-			case 'CSEBCDICFISEA':
-				return 'EBCDIC-FI-SE-A';
-
-			case 'EBCDIC-FR':
-			case 'CSEBCDICFR':
-				return 'EBCDIC-FR';
-
-			case 'EBCDIC-IT':
-			case 'CSEBCDICIT':
-				return 'EBCDIC-IT';
-
-			case 'EBCDIC-PT':
-			case 'CSEBCDICPT':
-				return 'EBCDIC-PT';
-
-			case 'EBCDIC-ES':
-			case 'CSEBCDICES':
-				return 'EBCDIC-ES';
-
-			case 'EBCDIC-ES-A':
-			case 'CSEBCDICESA':
-				return 'EBCDIC-ES-A';
-
-			case 'EBCDIC-ES-S':
-			case 'CSEBCDICESS':
-				return 'EBCDIC-ES-S';
-
-			case 'EBCDIC-UK':
-			case 'CSEBCDICUK':
-				return 'EBCDIC-UK';
-
-			case 'EBCDIC-US':
-			case 'CSEBCDICUS':
-				return 'EBCDIC-US';
-
-			case 'UNKNOWN-8BIT':
-			case 'CSUNKNOWN8BIT':
-				return 'UNKNOWN-8BIT';
-
-			case 'MNEMONIC':
-			case 'CSMNEMONIC':
-				return 'MNEMONIC';
-
-			case 'MNEM':
-			case 'CSMNEM':
-				return 'MNEM';
-
-			case 'VISCII':
-			case 'CSVISCII':
-				return 'VISCII';
-
-			case 'VIQR':
-			case 'CSVIQR':
-				return 'VIQR';
-
-			case 'KOI8-R':
-			case 'CSKOI8R':
-				return 'KOI8-R';
-
-			case 'HZ-GB-2312':
-				return 'HZ-GB-2312';
-
-			case 'IBM866':
-			case 'CP866':
-			case '866':
-			case 'CSIBM866':
-				return 'IBM866';
-
-			case 'IBM775':
-			case 'CP775':
-			case 'CSPC775BALTIC':
-				return 'IBM775';
-
-			case 'KOI8-U':
-				return 'KOI8-U';
-
-			case 'IBM00858':
-			case 'CCSID00858':
-			case 'CP00858':
-			case 'PC-MULTILINGUAL-850+EURO':
-				return 'IBM00858';
-
-			case 'IBM00924':
-			case 'CCSID00924':
-			case 'CP00924':
-			case 'EBCDIC-LATIN9--EURO':
-				return 'IBM00924';
-
-			case 'IBM01140':
-			case 'CCSID01140':
-			case 'CP01140':
-			case 'EBCDIC-US-37+EURO':
-				return 'IBM01140';
-
-			case 'IBM01141':
-			case 'CCSID01141':
-			case 'CP01141':
-			case 'EBCDIC-DE-273+EURO':
-				return 'IBM01141';
-
-			case 'IBM01142':
-			case 'CCSID01142':
-			case 'CP01142':
-			case 'EBCDIC-DK-277+EURO':
-			case 'EBCDIC-NO-277+EURO':
-				return 'IBM01142';
-
-			case 'IBM01143':
-			case 'CCSID01143':
-			case 'CP01143':
-			case 'EBCDIC-FI-278+EURO':
-			case 'EBCDIC-SE-278+EURO':
-				return 'IBM01143';
-
-			case 'IBM01144':
-			case 'CCSID01144':
-			case 'CP01144':
-			case 'EBCDIC-IT-280+EURO':
-				return 'IBM01144';
-
-			case 'IBM01145':
-			case 'CCSID01145':
-			case 'CP01145':
-			case 'EBCDIC-ES-284+EURO':
-				return 'IBM01145';
-
-			case 'IBM01146':
-			case 'CCSID01146':
-			case 'CP01146':
-			case 'EBCDIC-GB-285+EURO':
-				return 'IBM01146';
-
-			case 'IBM01147':
-			case 'CCSID01147':
-			case 'CP01147':
-			case 'EBCDIC-FR-297+EURO':
-				return 'IBM01147';
-
-			case 'IBM01148':
-			case 'CCSID01148':
-			case 'CP01148':
-			case 'EBCDIC-INTERNATIONAL-500+EURO':
-				return 'IBM01148';
-
-			case 'IBM01149':
-			case 'CCSID01149':
-			case 'CP01149':
-			case 'EBCDIC-IS-871+EURO':
-				return 'IBM01149';
-
-			case 'BIG5-HKSCS':
-				return 'Big5-HKSCS';
-
-			case 'IBM1047':
-			case 'IBM-1047':
-				return 'IBM1047';
-
-			case 'PTCP154':
-			case 'CSPTCP154':
-			case 'PT154':
-			case 'CP154':
-			case 'CYRILLIC-ASIAN':
-				return 'PTCP154';
-
-			case 'AMIGA-1251':
-			case 'AMI1251':
-			case 'AMIGA1251':
-			case 'AMI-1251':
-				return 'Amiga-1251';
-
-			case 'KOI7-SWITCHED':
-				return 'KOI7-switched';
-
-			case 'BRF':
-			case 'CSBRF':
-				return 'BRF';
-
-			case 'TSCII':
-			case 'CSTSCII':
-				return 'TSCII';
-
-			case 'WINDOWS-1250':
-				return 'windows-1250';
-
-			case 'WINDOWS-1251':
-				return 'windows-1251';
-
-			case 'WINDOWS-1252':
-				return 'windows-1252';
-
-			case 'WINDOWS-1253':
-				return 'windows-1253';
-
-			case 'WINDOWS-1254':
-				return 'windows-1254';
-
-			case 'WINDOWS-1255':
-				return 'windows-1255';
-
-			case 'WINDOWS-1256':
-				return 'windows-1256';
-
-			case 'WINDOWS-1257':
-				return 'windows-1257';
-
-			case 'WINDOWS-1258':
-				return 'windows-1258';
-
-			default:
-				return (string) $encoding;
-		}
-	}
-
-	function get_curl_version()
-	{
-		if (is_array($curl = curl_version()))
-		{
-			$curl = $curl['version'];
-		}
-		elseif (substr($curl, 0, 5) == 'curl/')
-		{
-			$curl = substr($curl, 5, strcspn($curl, "\x09\x0A\x0B\x0C\x0D", 5));
-		}
-		elseif (substr($curl, 0, 8) == 'libcurl/')
-		{
-			$curl = substr($curl, 8, strcspn($curl, "\x09\x0A\x0B\x0C\x0D", 8));
-		}
-		else
-		{
-			$curl = 0;
-		}
-		return $curl;
-	}
-
-	function is_subclass_of($class1, $class2)
-	{
-		if (func_num_args() != 2)
-		{
-			trigger_error('Wrong parameter count for SimplePie_Misc::is_subclass_of()', E_USER_WARNING);
-		}
-		elseif (version_compare(PHP_VERSION, '5.0.3', '>=') || is_object($class1))
-		{
-			return is_subclass_of($class1, $class2);
-		}
-		elseif (is_string($class1) && is_string($class2))
-		{
-			if (class_exists($class1))
-			{
-				if (class_exists($class2))
-				{
-					$class2 = strtolower($class2);
-					while ($class1 = strtolower(get_parent_class($class1)))
-					{
-						if ($class1 == $class2)
-						{
-							return true;
-						}
-					}
-				}
-			}
-			else
-			{
-				trigger_error('Unknown class passed as parameter', E_USER_WARNNG);
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Strip HTML comments
-	 *
-	 * @access public
-	 * @param string $data Data to strip comments from
-	 * @return string Comment stripped string
-	 */
-	function strip_comments($data)
-	{
-		$output = '';
-		while (($start = strpos($data, '<!--')) !== false)
-		{
-			$output .= substr($data, 0, $start);
-			if (($end = strpos($data, '-->', $start)) !== false)
-			{
-				$data = substr_replace($data, '', 0, $end + 3);
-			}
-			else
-			{
-				$data = '';
-			}
-		}
-		return $output . $data;
-	}
-
-	function parse_date($dt, $rfc822_tz = true)
-	{
-		static $cache = array();
-		if (!isset($cache[$dt][$rfc822_tz]))
-		{
-			$dt = SimplePie_Misc::uncomment_rfc822($dt);
-			/*
-			Capturing subpatterns:
-			1: RFC 822 date
-			2: RFC 822 day
-			3: RFC 822 month
-			4: RFC 822 year
-			5: ISO 8601 date
-			6: ISO 8601 century
-			7: ISO 8601 year
-			8: ISO 8601 month
-			9: ISO 8601 day
-			10: ISO 8601 ordinal day
-			11: ISO 8601 month
-			12: ISO 8601 day
-			13: ISO 8601 week
-			14: ISO 8601 day of week
-			15: Time
-			16: Hour
-			17: Hour Decimal
-			18: Minute
-			19: Minute Decimal
-			20: Second
-			21: Second Decimal
-			22: Timezone
-			23: Diff ±
-			24: Hour
-			25: Hour Decimal
-			26: Minute
-			27: Minute Decimal
-			28: Alphabetic Timezone
-			*/
-			if (preg_match('/^(?:(?:(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)[,\s]+)?(([0-9]{1,2})\s*(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s*([0-9]{4}|[0-9]{2}))|(([0-9]{2})(?:([0-9]{2})(?:(?:-|\s)*(?:([0-9]{2})([0-9]{2})|([0-9]{3})|([0-9]{2})(?:(?:-|\s)*([0-9]{2}))?|W([0-9]{2})(?:(?:-|\s)*([0-9]))?))?)?))((?:T|\s)+([0-9]{2})(?:(?:,|\.)([0-9]*)|(?:\:|\s)*([0-9]{2})(?:(?:,|\.)([0-9]*)|(?:\:|\s)*([0-9]{2})(?:(?:,|\.)([0-9]*))?)?)?(?:\s)*((?:(\+|-)([0-9]{2})(?:(?:,|\.)([0-9]*)|(?:\:|\s)*(?:([0-9]{2})(?:(?:,|\.)([0-9]*))?))?)|(UTC|GMT|EST|CST|MST|PST|EDT|CDT|MDT|PDT|UT|[A-IK-Z]))?)?$/i', $dt, $match))
-			{
-				// Fill all matches
-				for ($i = count($match); $i <= 28; $i++)
-				{
-					$match[$i] = '';
-				}
-				
-				// Set blank vars
-				$year = 1970;
-				$month = 1;
-				$day = 1;
-				$hour = 0;
-				$minute = 0;
-				$second = 0;
-				$timezone = false;
-
-				// RFC 822
-				if ($match[1] !== '')
-				{
-					if (strlen($match[4]) == 2)
-					{
-						$year = ($match[4] < 70) ? "20$match[4]" : "19$match[4]";
-					}
-					else
-					{
-						$year = $match[4];
-					}
-					switch (strtolower($match[3]))
-					{
-						case 'jan':
-							$month = 1;
-							break;
-
-						case 'feb':
-							$month = 2;
-							break;
-
-						case 'mar':
-							$month = 3;
-							break;
-
-						case 'apr':
-							$month = 4;
-							break;
-
-						case 'may':
-							$month = 5;
-							break;
-
-						case 'jun':
-							$month = 6;
-							break;
-
-						case 'jul':
-							$month = 7;
-							break;
-
-						case 'aug':
-							$month = 8;
-							break;
-
-						case 'sep':
-							$month = 9;
-							break;
-
-						case 'oct':
-							$month = 10;
-							break;
-
-						case 'nov':
-							$month = 11;
-							break;
-
-						case 'dec':
-							$month = 12;
-							break;
-					}
-					$day = $match[2];
-				}
-				// ISO 8601
-				else
-				{
-					// Year
-					if ($match[7] !== '')
-					{
-						$year = "$match[6]$match[7]";
-
-						// Two Digit Month/Day
-						if ($match[11] !== '')
-						{
-							$month = $match[11];
-							if ($match[12] !== '')
-							{
-								$day = $match[12];
-							}
-						}
-
-						// Four Digit Month/Day
-						elseif ($match[8] !== '')
-						{
-							$month = $match[8];
-							$day = $match[9];
-						}
-
-						// Ordinal Day
-						elseif ($match[10] !== '')
-						{
-							$day = $match[10];
-						}
-
-						// Week Date
-						elseif ($match[13] !== '')
-						{
-							// Week Day
-							if ($match[14] !== '')
-							{
-								$day = $match[14];
-							}
-
-							$first_day_of_year = date('w', mktime(0, 0, 0, 1, 1, $year));
-							if ($first_day_of_year == 0)
-							{
-								$first_day_of_year = 7;
-							}
-
-							$day = 7 * ($match[13] - 1) + $day - ($first_day_of_year - 1);
-						}
-					}
-					else
-					{
-						$year = "$match[6]00";
-					}
-				}
-				// Time
-				if ($match[15] !== '')
-				{
-					$time = 0;
-					$time += ($match[16] + ('.' . $match[17])) * 3600;
-					$time += ($match[18] + ('.' . $match[19])) * 60;
-					$time += $match[20] + ('.' . $match[21]);
-					$hour = floor($time / 3600);
-					$time -= $hour * 3600;
-					$minute = floor($time / 60);
-					$time -= $minute * 60;
-					$second = round($time);
-
-					// Timezone
-					if ($match[22] !== '')
-					{
-						// Alphabetic Timezone
-						if ($match[28] !== '')
-						{
-							// Military
-							if (strlen($match[28]) == 1)
-							{
-								if ($match[28] == 'Z' || $match[28] == 'z' || !$rfc822_tz)
-								{
-									$timezone = 0;
-								}
-								else
-								{
-									$timezone = ord(strtoupper($match[28]));
-
-									if ($timezone > 74)
-									{
-										$timezone--;
-									}
-
-									if ($timezone <= 76)
-									{
-										$timezone = -($timezone - 64);
-									}
-									else
-									{
-										$timezone -= 76;
-									}
-
-									$timezone *= 3600;
-								}
-							}
-							// Code
-							else
-							{
-								switch (strtoupper($match[28]))
-								{
-									case 'UT':
-									case 'UTC':
-									case 'GMT':
-										$timezone = 0;
-										break;
-
-									case 'EST':
-										$timezone = -18000;
-										break;
-
-									case 'CST':
-										$timezone = -21600;
-										break;
-
-									case 'MST':
-										$timezone = -25200;
-										break;
-
-									case 'PST':
-										$timezone = -28800;
-										break;
-
-									case 'EDT':
-										$timezone = -14400;
-										break;
-
-									case 'CDT':
-										$timezone = -18000;
-										break;
-
-									case 'MDT':
-										$timezone = -21600;
-										break;
-
-									case 'PDT':
-										$timezone = -25200;
-										break;
-								}
-							}
-						}
-						// Timezone difference from UTC
-						else
-						{
-							$timezone = 0;
-							$timezone += ($match[24] + ('.' . $match[25])) * 3600;
-							$timezone += ($match[26] + ('.' . $match[27])) * 60;
-							$timezone = (int) round($timezone);
-
-							if ($match[23] == '-')
-							{
-								$timezone = -$timezone;
-							}
-						}
-					}
-				}
-				if ($timezone === false)
-				{
-					$cache[$dt][$rfc822_tz] = mktime($hour, $minute, $second, $month, $day, $year);
-				}
-				else
-				{
-					$cache[$dt][$rfc822_tz] = gmmktime($hour, $minute, $second, $month, $day, $year) - $timezone;
-				}
-			}
-			elseif (($time = strtotime($dt)) > 0)
-			{
-				$cache[$dt][$rfc822_tz] = $time;
-			}
-			else
-			{
-				$cache[$dt][$rfc822_tz] = false;
-			}
-		}
-		return $cache[$dt][$rfc822_tz];
-	}
-
-	/**
-	 * Decode HTML entities
-	 *
-	 * @static
-	 * @access public
-	 * @param string $data Input data
-	 * @return string Output data
-	 */
-	function entities_decode($data)
-	{
-		$decoder = new SimplePie_Decode_HTML_Entities($data);
-		return $decoder->parse();
-	}
-
-	/**
-	 * Remove RFC822 comments
-	 *
-	 * @author Tomas V.V.Cox <cox@idecnet.com>
-	 * @author Pierre-Alain Joye <pajoye@php.net>
-	 * @author Amir Mohammad Saied <amir@php.net>
-	 * @copyright 1997-2006 Pierre-Alain Joye,Tomas V.V.Cox,Amir Mohammad Saied
-	 * @license http://www.opensource.org/licenses/bsd-license.php New BSD License
-	 * @version CVS: $Id: Validate.php,v 1.104 2006/11/17 16:32:06 amir Exp $
-	 * @link http://pear.php.net/package/Validate
-	 * @access public
-	 * @param string $data Data to strip comments from
-	 * @return string Comment stripped string
-	 */
-	function uncomment_rfc822($data)
-	{
-		if ((version_compare(PHP_VERSION, '4.4.6', '>=') && version_compare(PHP_VERSION, '5', '<')) || version_compare(PHP_VERSION, '5.2.2', '>='))
-		{
-			return $data;
-		}
-		else
-		{
-			return preg_replace('/((?:(?:\\\\"|[^("])*(?:"(?:[^"\\\\\r]|\\\\.)*"\s*)?)*)((?<!\\\\)\((?:(?2)|.)*?(?<!\\\\)\))/', '$1', $data);
-		}
-	}
-
-	function parse_mime($mime)
-	{
-		if (($pos = strpos($mime, ';')) === false)
-		{
-			return trim($mime);
-		}
-		else
-		{
-			return trim(substr($mime, 0, $pos));
-		}
-	}
-
-	function htmlspecialchars_decode($string, $quote_style)
-	{
-		if (function_exists('htmlspecialchars_decode'))
-		{
-			return htmlspecialchars_decode($string, $quote_style);
-		}
-		else
-		{
-			return strtr($string, array_flip(get_html_translation_table(HTML_SPECIALCHARS, $quote_style)));
-		}
-	}
-
-	function atom_03_construct_type($attribs)
-	{
-		if (isset($attribs['']['mode']) && strtolower(trim($attribs['']['mode']) == 'base64'))
-		{
-			$mode = SIMPLEPIE_CONSTRUCT_BASE64;
-		}
-		else
-		{
-			$mode = SIMPLEPIE_CONSTRUCT_NONE;
-		}
-		if (isset($attribs['']['type']))
-		{
-			switch (strtolower(trim($attribs['']['type'])))
-			{
-				case 'text':
-				case 'text/plain':
-					return SIMPLEPIE_CONSTRUCT_TEXT | $mode;
-
-				case 'html':
-				case 'text/html':
-					return SIMPLEPIE_CONSTRUCT_HTML | $mode;
-
-				case 'xhtml':
-				case 'application/xhtml+xml':
-					return SIMPLEPIE_CONSTRUCT_XHTML | $mode;
-
-				default:
-					return SIMPLEPIE_CONSTRUCT_NONE | $mode;
-			}
-		}
-		else
-		{
-			return SIMPLEPIE_CONSTRUCT_TEXT | $mode;
-		}
-	}
-
-	function atom_10_construct_type($attribs)
-	{
-		if (isset($attribs['']['type']))
-		{
-			switch (strtolower(trim($attribs['']['type'])))
-			{
-				case 'text':
-					return SIMPLEPIE_CONSTRUCT_TEXT;
-
-				case 'html':
-					return SIMPLEPIE_CONSTRUCT_HTML;
-
-				case 'xhtml':
-					return SIMPLEPIE_CONSTRUCT_XHTML;
-
-				default:
-					return SIMPLEPIE_CONSTRUCT_NONE;
-			}
-		}
-		return SIMPLEPIE_CONSTRUCT_TEXT;
-	}
-
-	function atom_10_content_construct_type($attribs)
-	{
-		if (isset($attribs['']['type']))
-		{
-			$type = strtolower(trim($attribs['']['type']));
-			switch ($type)
-			{
-				case 'text':
-					return SIMPLEPIE_CONSTRUCT_TEXT;
-
-				case 'html':
-					return SIMPLEPIE_CONSTRUCT_HTML;
-
-				case 'xhtml':
-					return SIMPLEPIE_CONSTRUCT_XHTML;
-			}
-			if (in_array(substr($type, -4), array('+xml', '/xml')) || substr($type, 0, 5) == 'text/')
-			{
-				return SIMPLEPIE_CONSTRUCT_NONE;
-			}
-			else
-			{
-				return SIMPLEPIE_CONSTRUCT_BASE64;
-			}
-		}
-		else
-		{
-			return SIMPLEPIE_CONSTRUCT_TEXT;
-		}
-	}
-
-	function is_isegment_nz_nc($string)
-	{
-		return (bool) preg_match('/^([A-Za-z0-9\-._~\x{A0}-\x{D7FF}\x{F900}-\x{FDCF}\x{FDF0}-\x{FFEF}\x{10000}-\x{1FFFD}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}\x{40000}-\x{4FFFD}\x{50000}-\x{5FFFD}\x{60000}-\x{6FFFD}\x{70000}-\x{7FFFD}\x{80000}-\x{8FFFD}\x{90000}-\x{9FFFD}\x{A0000}-\x{AFFFD}\x{B0000}-\x{BFFFD}\x{C0000}-\x{CFFFD}\x{D0000}-\x{DFFFD}\x{E1000}-\x{EFFFD}!$&\'()*+,;=@]|(%[0-9ABCDEF]{2}))+$/u', $string);
-	}
-
-	function space_seperated_tokens($string)
-	{
-		$space_characters = "\x20\x09\x0A\x0B\x0C\x0D";
-		$string_length = strlen($string);
-
-		$position = strspn($string, $space_characters);
-		$tokens = array();
-
-		while ($position < $string_length)
-		{
-			$len = strcspn($string, $space_characters, $position);
-			$tokens[] = substr($string, $position, $len);
-			$position += $len;
-			$position += strspn($string, $space_characters, $position);
-		}
-
-		return $tokens;
-	}
-
-	function array_unique($array)
-	{
-		if (version_compare(PHP_VERSION, '5.2', '>='))
-		{
-			return array_unique($array);
-		}
-		else
-		{
-			$array = (array) $array;
-			$new_array = array();
-			$new_array_strings = array();
-			foreach ($array as $key => $value)
-			{
-				if (is_object($value))
-				{
-					if (method_exists($value, '__toString'))
-					{
-						$cmp = $value->__toString();
-					}
-					else
-					{
-						trigger_error('Object of class ' . get_class($value) . ' could not be converted to string', E_USER_ERROR);
-					}
-				}
-				elseif (is_array($value))
-				{
-					$cmp = (string) reset($value);
-				}
-				else
-				{
-					$cmp = (string) $value;
-				}
-				if (!in_array($cmp, $new_array_strings))
-				{
-					$new_array[$key] = $value;
-					$new_array_strings[] = $cmp;
-				}
-			}
-			return $new_array;
-		}
-	}
-
-	/**
-	 * Converts a unicode codepoint to a UTF-8 character
-	 *
-	 * @static
-	 * @access public
-	 * @param int $codepoint Unicode codepoint
-	 * @return string UTF-8 character
-	 */
-	function codepoint_to_utf8($codepoint)
-	{
-		static $cache = array();
-		$codepoint = (int) $codepoint;
-		if (isset($cache[$codepoint]))
-		{
-			return $cache[$codepoint];
-		}
-		elseif ($codepoint < 0)
-		{
-			return $cache[$codepoint] = false;
-		}
-		else if ($codepoint <= 0x7f)
-		{
-			return $cache[$codepoint] = chr($codepoint);
-		}
-		else if ($codepoint <= 0x7ff)
-		{
-			return $cache[$codepoint] = chr(0xc0 | ($codepoint >> 6)) . chr(0x80 | ($codepoint & 0x3f));
-		}
-		else if ($codepoint <= 0xffff)
-		{
-			return $cache[$codepoint] = chr(0xe0 | ($codepoint >> 12)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
-		}
-		else if ($codepoint <= 0x10ffff)
-		{
-			return $cache[$codepoint] = chr(0xf0 | ($codepoint >> 18)) . chr(0x80 | (($codepoint >> 12) & 0x3f)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
-		}
-		else
-		{
-			// U+FFFD REPLACEMENT CHARACTER
-			return $cache[$codepoint] = "\xEF\xBF\xBD";
-		}
-	}
-
-	/**
-	 * Re-implementation of PHP 4.2.0's is_a()
-	 *
-	 * @static
-	 * @access public
-	 * @param object $object The tested object
-	 * @param string $class_name The class name
-	 * @return bool Returns true if the object is of this class or has this class as one of its parents, false otherwise
-	 */
-	 function is_a($object, $class_name)
-	 {
-	 	if (function_exists('is_a'))
-	 	{
-	 		return is_a($object, $class_name);
-	 	}
-	 	elseif (!is_object($object))
-	 	{
-	 		return false;
-	 	}
-	 	elseif (get_class($object) == strtolower($class_name))
-	 	{
-	 		return true;
-	 	}
-	 	else
-	 	{
-	 		return is_subclass_of($object, $class_name);
-	 	}
-	 }
-
-	/**
-	 * Re-implementation of PHP 5's stripos()
-	 *
-	 * Returns the numeric position of the first occurrence of needle in the
-	 * haystack string.
-	 *
-	 * @static
-	 * @access string
-	 * @param object $haystack
-	 * @param string $needle Note that the needle may be a string of one or more
-	 *     characters. If needle is not a string, it is converted to an integer
-	 *     and applied as the ordinal value of a character.
-	 * @param int $offset The optional offset parameter allows you to specify which
-	 *     character in haystack to start searching. The position returned is still
-	 *     relative to the beginning of haystack.
-	 * @return bool If needle is not found, stripos() will return boolean false.
-	 */
-	 function stripos($haystack, $needle, $offset = 0)
-	 {
-	 	if (function_exists('stripos'))
-	 	{
-	 		return stripos($haystack, $needle, $offset);
-	 	}
-	 	else
-	 	{
-	 		if (is_string($needle))
-	 		{
-	 			$needle = strtolower($needle);
-	 		}
-	 		elseif (is_int($needle) || is_bool($needle) || is_double($needle))
-	 		{
-	 			$needle = strtolower(chr($needle));
-	 		}
-	 		else
-	 		{
-	 			trigger_error('needle is not a string or an integer', E_USER_WARNING);
-	 			return false;
-	 		}
-	 
-	 		return strpos(strtolower($haystack), $needle, $offset);
-	 	}
-	 }
-}
-
-/**
- * Decode HTML Entities
- *
- * This implements HTML5 as of revision 967 (2007-06-28)
- *
- * @package SimplePie
- */
-class SimplePie_Decode_HTML_Entities
-{
-	/**
-	 * Data to be parsed
-	 *
-	 * @access private
-	 * @var string
-	 */
-	var $data = '';
-
-	/**
-	 * Currently consumed bytes
-	 *
-	 * @access private
-	 * @var string
-	 */
-	var $consumed = '';
-
-	/**
-	 * Position of the current byte being parsed
-	 *
-	 * @access private
-	 * @var int
-	 */
-	var $position = 0;
-
-	/**
-	 * Create an instance of the class with the input data
-	 *
-	 * @access public
-	 * @param string $data Input data
-	 */
-	function SimplePie_Decode_HTML_Entities($data)
-	{
-		$this->data = $data;
-	}
-
-	/**
-	 * Parse the input data
-	 *
-	 * @access public
-	 * @return string Output data
-	 */
-	function parse()
-	{
-		while (($this->position = strpos($this->data, '&', $this->position)) !== false)
-		{
-			$this->consume();
-			$this->entity();
-			$this->consumed = '';
-		}
-		return $this->data;
-	}
-
-	/**
-	 * Consume the next byte
-	 *
-	 * @access private
-	 * @return mixed The next byte, or false, if there is no more data
-	 */
-	function consume()
-	{
-		if (isset($this->data[$this->position]))
-		{
-			$this->consumed .= $this->data[$this->position];
-			return $this->data[$this->position++];
-		}
-		else
-		{
-			$this->consumed = false;
-			return false;
-		}
-	}
-
-	/**
-	 * Consume a range of characters
-	 *
-	 * @access private
-	 * @param string $chars Characters to consume
-	 * @return mixed A series of characters that match the range, or false
-	 */
-	function consume_range($chars)
-	{
-		if ($len = strspn($this->data, $chars, $this->position))
-		{
-			$data = substr($this->data, $this->position, $len);
-			$this->consumed .= $data;
-			$this->position += $len;
-			return $data;
-		}
-		else
-		{
-			$this->consumed = false;
-			return false;
-		}
-	}
-
-	/**
-	 * Unconsume one byte
-	 *
-	 * @access private
-	 */
-	function unconsume()
-	{
-		$this->consumed = substr($this->consumed, 0, -1);
-		$this->position--;
-	}
-
-	/**
-	 * Decode an entity
-	 *
-	 * @access private
-	 */
-	function entity()
-	{
-		switch ($this->consume())
-		{
-			case "\x09":
-			case "\x0A":
-			case "\x0B":
-			case "\x0B":
-			case "\x0C":
-			case "\x20":
-			case "\x3C":
-			case "\x26":
-			case false:
-				break;
-
-			case "\x23":
-				switch ($this->consume())
-				{
-					case "\x78":
-					case "\x58":
-						$range = '0123456789ABCDEFabcdef';
-						$hex = true;
-						break;
-
-					default:
-						$range = '0123456789';
-						$hex = false;
-						$this->unconsume();
-						break;
-				}
-
-				if ($codepoint = $this->consume_range($range))
-				{
-					static $windows_1252_specials = array(0x0D => "\x0A", 0x80 => "\xE2\x82\xAC", 0x81 => "\xEF\xBF\xBD", 0x82 => "\xE2\x80\x9A", 0x83 => "\xC6\x92", 0x84 => "\xE2\x80\x9E", 0x85 => "\xE2\x80\xA6", 0x86 => "\xE2\x80\xA0", 0x87 => "\xE2\x80\xA1", 0x88 => "\xCB\x86", 0x89 => "\xE2\x80\xB0", 0x8A => "\xC5\xA0", 0x8B => "\xE2\x80\xB9", 0x8C => "\xC5\x92", 0x8D => "\xEF\xBF\xBD", 0x8E => "\xC5\xBD", 0x8F => "\xEF\xBF\xBD", 0x90 => "\xEF\xBF\xBD", 0x91 => "\xE2\x80\x98", 0x92 => "\xE2\x80\x99", 0x93 => "\xE2\x80\x9C", 0x94 => "\xE2\x80\x9D", 0x95 => "\xE2\x80\xA2", 0x96 => "\xE2\x80\x93", 0x97 => "\xE2\x80\x94", 0x98 => "\xCB\x9C", 0x99 => "\xE2\x84\xA2", 0x9A => "\xC5\xA1", 0x9B => "\xE2\x80\xBA", 0x9C => "\xC5\x93", 0x9D => "\xEF\xBF\xBD", 0x9E => "\xC5\xBE", 0x9F => "\xC5\xB8");
-
-					if ($hex)
-					{
-						$codepoint = hexdec($codepoint);
-					}
-					else
-					{
-						$codepoint = intval($codepoint);
-					}
-
-					if (isset($windows_1252_specials[$codepoint]))
-					{
-						$replacement = $windows_1252_specials[$codepoint];
-					}
-					else
-					{
-						$replacement = SimplePie_Misc::codepoint_to_utf8($codepoint);
-					}
-
-					if ($this->consume() != ';')
-					{
-						$this->unconsume();
-					}
-
-					$consumed_length = strlen($this->consumed);
-					$this->data = substr_replace($this->data, $replacement, $this->position - $consumed_length, $consumed_length);
-					$this->position += strlen($replacement) - $consumed_length;
-				}
-				break;
-
-			default:
-				static $entities = array('Aacute' => "\xC3\x81", 'aacute' => "\xC3\xA1", 'Aacute;' => "\xC3\x81", 'aacute;' => "\xC3\xA1", 'Acirc' => "\xC3\x82", 'acirc' => "\xC3\xA2", 'Acirc;' => "\xC3\x82", 'acirc;' => "\xC3\xA2", 'acute' => "\xC2\xB4", 'acute;' => "\xC2\xB4", 'AElig' => "\xC3\x86", 'aelig' => "\xC3\xA6", 'AElig;' => "\xC3\x86", 'aelig;' => "\xC3\xA6", 'Agrave' => "\xC3\x80", 'agrave' => "\xC3\xA0", 'Agrave;' => "\xC3\x80", 'agrave;' => "\xC3\xA0", 'alefsym;' => "\xE2\x84\xB5", 'Alpha;' => "\xCE\x91", 'alpha;' => "\xCE\xB1", 'AMP' => "\x26", 'amp' => "\x26", 'AMP;' => "\x26", 'amp;' => "\x26", 'and;' => "\xE2\x88\xA7", 'ang;' => "\xE2\x88\xA0", 'apos;' => "\x27", 'Aring' => "\xC3\x85", 'aring' => "\xC3\xA5", 'Aring;' => "\xC3\x85", 'aring;' => "\xC3\xA5", 'asymp;' => "\xE2\x89\x88", 'Atilde' => "\xC3\x83", 'atilde' => "\xC3\xA3", 'Atilde;' => "\xC3\x83", 'atilde;' => "\xC3\xA3", 'Auml' => "\xC3\x84", 'auml' => "\xC3\xA4", 'Auml;' => "\xC3\x84", 'auml;' => "\xC3\xA4", 'bdquo;' => "\xE2\x80\x9E", 'Beta;' => "\xCE\x92", 'beta;' => "\xCE\xB2", 'brvbar' => "\xC2\xA6", 'brvbar;' => "\xC2\xA6", 'bull;' => "\xE2\x80\xA2", 'cap;' => "\xE2\x88\xA9", 'Ccedil' => "\xC3\x87", 'ccedil' => "\xC3\xA7", 'Ccedil;' => "\xC3\x87", 'ccedil;' => "\xC3\xA7", 'cedil' => "\xC2\xB8", 'cedil;' => "\xC2\xB8", 'cent' => "\xC2\xA2", 'cent;' => "\xC2\xA2", 'Chi;' => "\xCE\xA7", 'chi;' => "\xCF\x87", 'circ;' => "\xCB\x86", 'clubs;' => "\xE2\x99\xA3", 'cong;' => "\xE2\x89\x85", 'COPY' => "\xC2\xA9", 'copy' => "\xC2\xA9", 'COPY;' => "\xC2\xA9", 'copy;' => "\xC2\xA9", 'crarr;' => "\xE2\x86\xB5", 'cup;' => "\xE2\x88\xAA", 'curren' => "\xC2\xA4", 'curren;' => "\xC2\xA4", 'Dagger;' => "\xE2\x80\xA1", 'dagger;' => "\xE2\x80\xA0", 'dArr;' => "\xE2\x87\x93", 'darr;' => "\xE2\x86\x93", 'deg' => "\xC2\xB0", 'deg;' => "\xC2\xB0", 'Delta;' => "\xCE\x94", 'delta;' => "\xCE\xB4", 'diams;' => "\xE2\x99\xA6", 'divide' => "\xC3\xB7", 'divide;' => "\xC3\xB7", 'Eacute' => "\xC3\x89", 'eacute' => "\xC3\xA9", 'Eacute;' => "\xC3\x89", 'eacute;' => "\xC3\xA9", 'Ecirc' => "\xC3\x8A", 'ecirc' => "\xC3\xAA", 'Ecirc;' => "\xC3\x8A", 'ecirc;' => "\xC3\xAA", 'Egrave' => "\xC3\x88", 'egrave' => "\xC3\xA8", 'Egrave;' => "\xC3\x88", 'egrave;' => "\xC3\xA8", 'empty;' => "\xE2\x88\x85", 'emsp;' => "\xE2\x80\x83", 'ensp;' => "\xE2\x80\x82", 'Epsilon;' => "\xCE\x95", 'epsilon;' => "\xCE\xB5", 'equiv;' => "\xE2\x89\xA1", 'Eta;' => "\xCE\x97", 'eta;' => "\xCE\xB7", 'ETH' => "\xC3\x90", 'eth' => "\xC3\xB0", 'ETH;' => "\xC3\x90", 'eth;' => "\xC3\xB0", 'Euml' => "\xC3\x8B", 'euml' => "\xC3\xAB", 'Euml;' => "\xC3\x8B", 'euml;' => "\xC3\xAB", 'euro;' => "\xE2\x82\xAC", 'exist;' => "\xE2\x88\x83", 'fnof;' => "\xC6\x92", 'forall;' => "\xE2\x88\x80", 'frac12' => "\xC2\xBD", 'frac12;' => "\xC2\xBD", 'frac14' => "\xC2\xBC", 'frac14;' => "\xC2\xBC", 'frac34' => "\xC2\xBE", 'frac34;' => "\xC2\xBE", 'frasl;' => "\xE2\x81\x84", 'Gamma;' => "\xCE\x93", 'gamma;' => "\xCE\xB3", 'ge;' => "\xE2\x89\xA5", 'GT' => "\x3E", 'gt' => "\x3E", 'GT;' => "\x3E", 'gt;' => "\x3E", 'hArr;' => "\xE2\x87\x94", 'harr;' => "\xE2\x86\x94", 'hearts;' => "\xE2\x99\xA5", 'hellip;' => "\xE2\x80\xA6", 'Iacute' => "\xC3\x8D", 'iacute' => "\xC3\xAD", 'Iacute;' => "\xC3\x8D", 'iacute;' => "\xC3\xAD", 'Icirc' => "\xC3\x8E", 'icirc' => "\xC3\xAE", 'Icirc;' => "\xC3\x8E", 'icirc;' => "\xC3\xAE", 'iexcl' => "\xC2\xA1", 'iexcl;' => "\xC2\xA1", 'Igrave' => "\xC3\x8C", 'igrave' => "\xC3\xAC", 'Igrave;' => "\xC3\x8C", 'igrave;' => "\xC3\xAC", 'image;' => "\xE2\x84\x91", 'infin;' => "\xE2\x88\x9E", 'int;' => "\xE2\x88\xAB", 'Iota;' => "\xCE\x99", 'iota;' => "\xCE\xB9", 'iquest' => "\xC2\xBF", 'iquest;' => "\xC2\xBF", 'isin;' => "\xE2\x88\x88", 'Iuml' => "\xC3\x8F", 'iuml' => "\xC3\xAF", 'Iuml;' => "\xC3\x8F", 'iuml;' => "\xC3\xAF", 'Kappa;' => "\xCE\x9A", 'kappa;' => "\xCE\xBA", 'Lambda;' => "\xCE\x9B", 'lambda;' => "\xCE\xBB", 'lang;' => "\xE3\x80\x88", 'laquo' => "\xC2\xAB", 'laquo;' => "\xC2\xAB", 'lArr;' => "\xE2\x87\x90", 'larr;' => "\xE2\x86\x90", 'lceil;' => "\xE2\x8C\x88", 'ldquo;' => "\xE2\x80\x9C", 'le;' => "\xE2\x89\xA4", 'lfloor;' => "\xE2\x8C\x8A", 'lowast;' => "\xE2\x88\x97", 'loz;' => "\xE2\x97\x8A", 'lrm;' => "\xE2\x80\x8E", 'lsaquo;' => "\xE2\x80\xB9", 'lsquo;' => "\xE2\x80\x98", 'LT' => "\x3C", 'lt' => "\x3C", 'LT;' => "\x3C", 'lt;' => "\x3C", 'macr' => "\xC2\xAF", 'macr;' => "\xC2\xAF", 'mdash;' => "\xE2\x80\x94", 'micro' => "\xC2\xB5", 'micro;' => "\xC2\xB5", 'middot' => "\xC2\xB7", 'middot;' => "\xC2\xB7", 'minus;' => "\xE2\x88\x92", 'Mu;' => "\xCE\x9C", 'mu;' => "\xCE\xBC", 'nabla;' => "\xE2\x88\x87", 'nbsp' => "\xC2\xA0", 'nbsp;' => "\xC2\xA0", 'ndash;' => "\xE2\x80\x93", 'ne;' => "\xE2\x89\xA0", 'ni;' => "\xE2\x88\x8B", 'not' => "\xC2\xAC", 'not;' => "\xC2\xAC", 'notin;' => "\xE2\x88\x89", 'nsub;' => "\xE2\x8A\x84", 'Ntilde' => "\xC3\x91", 'ntilde' => "\xC3\xB1", 'Ntilde;' => "\xC3\x91", 'ntilde;' => "\xC3\xB1", 'Nu;' => "\xCE\x9D", 'nu;' => "\xCE\xBD", 'Oacute' => "\xC3\x93", 'oacute' => "\xC3\xB3", 'Oacute;' => "\xC3\x93", 'oacute;' => "\xC3\xB3", 'Ocirc' => "\xC3\x94", 'ocirc' => "\xC3\xB4", 'Ocirc;' => "\xC3\x94", 'ocirc;' => "\xC3\xB4", 'OElig;' => "\xC5\x92", 'oelig;' => "\xC5\x93", 'Ograve' => "\xC3\x92", 'ograve' => "\xC3\xB2", 'Ograve;' => "\xC3\x92", 'ograve;' => "\xC3\xB2", 'oline;' => "\xE2\x80\xBE", 'Omega;' => "\xCE\xA9", 'omega;' => "\xCF\x89", 'Omicron;' => "\xCE\x9F", 'omicron;' => "\xCE\xBF", 'oplus;' => "\xE2\x8A\x95", 'or;' => "\xE2\x88\xA8", 'ordf' => "\xC2\xAA", 'ordf;' => "\xC2\xAA", 'ordm' => "\xC2\xBA", 'ordm;' => "\xC2\xBA", 'Oslash' => "\xC3\x98", 'oslash' => "\xC3\xB8", 'Oslash;' => "\xC3\x98", 'oslash;' => "\xC3\xB8", 'Otilde' => "\xC3\x95", 'otilde' => "\xC3\xB5", 'Otilde;' => "\xC3\x95", 'otilde;' => "\xC3\xB5", 'otimes;' => "\xE2\x8A\x97", 'Ouml' => "\xC3\x96", 'ouml' => "\xC3\xB6", 'Ouml;' => "\xC3\x96", 'ouml;' => "\xC3\xB6", 'para' => "\xC2\xB6", 'para;' => "\xC2\xB6", 'part;' => "\xE2\x88\x82", 'permil;' => "\xE2\x80\xB0", 'perp;' => "\xE2\x8A\xA5", 'Phi;' => "\xCE\xA6", 'phi;' => "\xCF\x86", 'Pi;' => "\xCE\xA0", 'pi;' => "\xCF\x80", 'piv;' => "\xCF\x96", 'plusmn' => "\xC2\xB1", 'plusmn;' => "\xC2\xB1", 'pound' => "\xC2\xA3", 'pound;' => "\xC2\xA3", 'Prime;' => "\xE2\x80\xB3", 'prime;' => "\xE2\x80\xB2", 'prod;' => "\xE2\x88\x8F", 'prop;' => "\xE2\x88\x9D", 'Psi;' => "\xCE\xA8", 'psi;' => "\xCF\x88", 'QUOT' => "\x22", 'quot' => "\x22", 'QUOT;' => "\x22", 'quot;' => "\x22", 'radic;' => "\xE2\x88\x9A", 'rang;' => "\xE3\x80\x89", 'raquo' => "\xC2\xBB", 'raquo;' => "\xC2\xBB", 'rArr;' => "\xE2\x87\x92", 'rarr;' => "\xE2\x86\x92", 'rceil;' => "\xE2\x8C\x89", 'rdquo;' => "\xE2\x80\x9D", 'real;' => "\xE2\x84\x9C", 'REG' => "\xC2\xAE", 'reg' => "\xC2\xAE", 'REG;' => "\xC2\xAE", 'reg;' => "\xC2\xAE", 'rfloor;' => "\xE2\x8C\x8B", 'Rho;' => "\xCE\xA1", 'rho;' => "\xCF\x81", 'rlm;' => "\xE2\x80\x8F", 'rsaquo;' => "\xE2\x80\xBA", 'rsquo;' => "\xE2\x80\x99", 'sbquo;' => "\xE2\x80\x9A", 'Scaron;' => "\xC5\xA0", 'scaron;' => "\xC5\xA1", 'sdot;' => "\xE2\x8B\x85", 'sect' => "\xC2\xA7", 'sect;' => "\xC2\xA7", 'shy' => "\xC2\xAD", 'shy;' => "\xC2\xAD", 'Sigma;' => "\xCE\xA3", 'sigma;' => "\xCF\x83", 'sigmaf;' => "\xCF\x82", 'sim;' => "\xE2\x88\xBC", 'spades;' => "\xE2\x99\xA0", 'sub;' => "\xE2\x8A\x82", 'sube;' => "\xE2\x8A\x86", 'sum;' => "\xE2\x88\x91", 'sup;' => "\xE2\x8A\x83", 'sup1' => "\xC2\xB9", 'sup1;' => "\xC2\xB9", 'sup2' => "\xC2\xB2", 'sup2;' => "\xC2\xB2", 'sup3' => "\xC2\xB3", 'sup3;' => "\xC2\xB3", 'supe;' => "\xE2\x8A\x87", 'szlig' => "\xC3\x9F", 'szlig;' => "\xC3\x9F", 'Tau;' => "\xCE\xA4", 'tau;' => "\xCF\x84", 'there4;' => "\xE2\x88\xB4", 'Theta;' => "\xCE\x98", 'theta;' => "\xCE\xB8", 'thetasym;' => "\xCF\x91", 'thinsp;' => "\xE2\x80\x89", 'THORN' => "\xC3\x9E", 'thorn' => "\xC3\xBE", 'THORN;' => "\xC3\x9E", 'thorn;' => "\xC3\xBE", 'tilde;' => "\xCB\x9C", 'times' => "\xC3\x97", 'times;' => "\xC3\x97", 'TRADE;' => "\xE2\x84\xA2", 'trade;' => "\xE2\x84\xA2", 'Uacute' => "\xC3\x9A", 'uacute' => "\xC3\xBA", 'Uacute;' => "\xC3\x9A", 'uacute;' => "\xC3\xBA", 'uArr;' => "\xE2\x87\x91", 'uarr;' => "\xE2\x86\x91", 'Ucirc' => "\xC3\x9B", 'ucirc' => "\xC3\xBB", 'Ucirc;' => "\xC3\x9B", 'ucirc;' => "\xC3\xBB", 'Ugrave' => "\xC3\x99", 'ugrave' => "\xC3\xB9", 'Ugrave;' => "\xC3\x99", 'ugrave;' => "\xC3\xB9", 'uml' => "\xC2\xA8", 'uml;' => "\xC2\xA8", 'upsih;' => "\xCF\x92", 'Upsilon;' => "\xCE\xA5", 'upsilon;' => "\xCF\x85", 'Uuml' => "\xC3\x9C", 'uuml' => "\xC3\xBC", 'Uuml;' => "\xC3\x9C", 'uuml;' => "\xC3\xBC", 'weierp;' => "\xE2\x84\x98", 'Xi;' => "\xCE\x9E", 'xi;' => "\xCE\xBE", 'Yacute' => "\xC3\x9D", 'yacute' => "\xC3\xBD", 'Yacute;' => "\xC3\x9D", 'yacute;' => "\xC3\xBD", 'yen' => "\xC2\xA5", 'yen;' => "\xC2\xA5", 'yuml' => "\xC3\xBF", 'Yuml;' => "\xC5\xB8", 'yuml;' => "\xC3\xBF", 'Zeta;' => "\xCE\x96", 'zeta;' => "\xCE\xB6", 'zwj;' => "\xE2\x80\x8D", 'zwnj;' => "\xE2\x80\x8C");
-
-				for ($i = 0, $match = null; $i < 9 && $this->consume(); $i++)
-				{
-					$consumed = substr($this->consumed, 1);
-					if (isset($entities[$consumed]))
-					{
-						$match = $consumed;
-					}
-				}
-
-				if ($match !== null)
-				{
- 					$this->data = substr_replace($this->data, $entities[$match], $this->position - strlen($consumed) - 1, strlen($match) + 1);
-					$this->position += strlen($entities[$match]) - strlen($consumed) - 1;
-				}
-				break;
-		}
-	}
-}
-
-class SimplePie_Locator
-{
-	var $useragent;
-	var $timeout;
-	var $file;
-	var $local = array();
-	var $elsewhere = array();
-	var $file_class = 'SimplePie_File';
-	var $cached_entities = array();
-	var $http_base;
-	var $base;
-	var $base_location = 0;
-	var $checked_feeds = 0;
-	var $max_checked_feeds = 10;
-	var $proxy;
-
-	function SimplePie_Locator(&$file, $timeout = 10, $useragent = null, $file_class = 'SimplePie_File', $max_checked_feeds = 10, $proxy = "")
-	{
-		$this->file =& $file;
-		$this->file_class = $file_class;
-		$this->useragent = $useragent;
-		$this->timeout = $timeout;
-		$this->max_checked_feeds = $max_checked_feeds;
-		$this->proxy = $proxy;
-	}
-
-	function find($type = SIMPLEPIE_LOCATOR_ALL)
-	{
-		if ($this->is_feed($this->file))
-		{
-			return $this->file;
-		}
-
-		if ($type & ~SIMPLEPIE_LOCATOR_NONE)
-		{
-			$this->get_base();
-		}
-
-		if ($type & SIMPLEPIE_LOCATOR_AUTODISCOVERY && $working = $this->autodiscovery())
-		{
-			return $working;
-		}
-
-		if ($type & (SIMPLEPIE_LOCATOR_LOCAL_EXTENSION | SIMPLEPIE_LOCATOR_LOCAL_BODY | SIMPLEPIE_LOCATOR_REMOTE_EXTENSION | SIMPLEPIE_LOCATOR_REMOTE_BODY) && $this->get_links())
-		{
-			if ($type & SIMPLEPIE_LOCATOR_LOCAL_EXTENSION && $working = $this->extension($this->local))
-			{
-				return $working;
-			}
-
-			if ($type & SIMPLEPIE_LOCATOR_LOCAL_BODY && $working = $this->body($this->local))
-			{
-				return $working;
-			}
-
-			if ($type & SIMPLEPIE_LOCATOR_REMOTE_EXTENSION && $working = $this->extension($this->elsewhere))
-			{
-				return $working;
-			}
-
-			if ($type & SIMPLEPIE_LOCATOR_REMOTE_BODY && $working = $this->body($this->elsewhere))
-			{
-				return $working;
-			}
-		}
-		return null;
-	}
-
-	function is_feed(&$file)
-	{
-		$body = SimplePie_Misc::strip_comments($file->body);
-		if (preg_match('/<([^\s:]+:)?(rss|RDF|feed)' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/i', $body))
-		{
-			return true;
-		}
-		return false;
-	}
-
-	function get_base()
-	{
-		if (isset($this->file->headers['content-location']))
-		{
-			$this->http_base = SimplePie_Misc::absolutize_url(trim($this->file->headers['content-location']), $this->file->url);
-		}
-		else
-		{
-			$this->http_base = $this->file->url;
-		}
-		$this->base = $this->http_base;
-		$elements = SimplePie_Misc::get_element('base', $this->file->body);
-		foreach ($elements as $element)
-		{
-			if ($element['attribs']['href']['data'] !== '')
-			{
-				$this->base = SimplePie_Misc::absolutize_url(trim($element['attribs']['href']['data']), $this->http_base);
-				$this->base_location = $element['offset'];
-				break;
-			}
-		}
-	}
-
-	function autodiscovery()
-	{
-		$links = array_merge(SimplePie_Misc::get_element('link', $this->file->body), SimplePie_Misc::get_element('a', $this->file->body), SimplePie_Misc::get_element('area', $this->file->body));
-		$done = array();
-		foreach ($links as $link)
-		{
-			if ($this->checked_feeds == $this->max_checked_feeds)
-			{
-				break;
-			}
-			if (isset($link['attribs']['href']['data']) && isset($link['attribs']['rel']['data']))
-			{
-				$rel = array_unique(SimplePie_Misc::space_seperated_tokens(strtolower($link['attribs']['rel']['data'])));
-
-				if ($this->base_location < $link['offset'])
-				{
-					$href = SimplePie_Misc::absolutize_url(trim($link['attribs']['href']['data']), $this->base);
-				}
-				else
-				{
-					$href = SimplePie_Misc::absolutize_url(trim($link['attribs']['href']['data']), $this->http_base);
-				}
-
-				if (!in_array($href, $done) && in_array('feed', $rel) || (in_array('alternate', $rel) && !empty($link['attribs']['type']['data']) && in_array(strtolower(SimplePie_Misc::parse_mime($link['attribs']['type']['data'])), array('application/rss+xml', 'application/atom+xml'))))
-				{
-					$this->checked_feeds++;
-					$feed =& new $this->file_class($href, $this->timeout, 5, null, $this->useragent, false, $this->proxy);
-					if ($this->is_feed($feed))
-					{
-						return $feed;
-					}
-				}
-				$done[] = $href;
-			}
-		}
-		return null;
-	}
-
-	function get_links()
-	{
-		$links = SimplePie_Misc::get_element('a', $this->file->body);
-		foreach ($links as $link)
-		{
-			if (isset($link['attribs']['href']['data']))
-			{
-				$href = trim($link['attribs']['href']['data']);
-				$parsed = SimplePie_Misc::parse_url($href);
-				if ($parsed['scheme'] === '' || preg_match('/^(http(s)|feed)?$/i', $parsed['scheme']))
-				{
-					if ($this->base_location < $link['offset'])
-					{
-						$href = SimplePie_Misc::absolutize_url(trim($link['attribs']['href']['data']), $this->base);
-					}
-					else
-					{
-						$href = SimplePie_Misc::absolutize_url(trim($link['attribs']['href']['data']), $this->http_base);
-					}
-
-					$current = SimplePie_Misc::parse_url($this->file->url);
-
-					if ($parsed['authority'] === '' || $parsed['authority'] == $current['authority'])
-					{
-						$this->local[] = $href;
-					}
-					else
-					{
-						$this->elsewhere[] = $href;
-					}
-				}
-			}
-		}
-		$this->local = array_unique($this->local);
-		$this->elsewhere = array_unique($this->elsewhere);
-		if (!empty($this->local) || !empty($this->elsewhere))
-		{
-			return true;
-		}
-		return null;
-	}
-
-	function extension(&$array)
-	{
-		foreach ($array as $key => $value)
-		{
-			if ($this->checked_feeds == $this->max_checked_feeds)
-			{
-				break;
-			}
-			if (in_array(strtolower(strrchr($value, '.')), array('.rss', '.rdf', '.atom', '.xml')))
-			{
-				$this->checked_feeds++;
-				$feed =& new $this->file_class($value, $this->timeout, 5, null, $this->useragent, false, $this->proxy);
-				if ($this->is_feed($feed))
-				{
-					return $feed;
-				}
-				else
-				{
-					unset($array[$key]);
-				}
-			}
-		}
-		return null;
-	}
-
-	function body(&$array)
-	{
-		foreach ($array as $key => $value)
-		{
-			if ($this->checked_feeds == $this->max_checked_feeds)
-			{
-				break;
-			}
-			if (preg_match('/(rss|rdf|atom|xml)/i', $value))
-			{
-				$this->checked_feeds++;
-				$feed =& new $this->file_class($value, $this->timeout, 5, null, $this->useragent, false, $this->proxy);
-				if ($this->is_feed($feed))
-				{
-					return $feed;
-				}
-				else
-				{
-					unset($array[$key]);
-				}
-			}
-		}
-		return null;
-	}
-}
-
-class SimplePie_Parser
-{
-	var $xml;
-	var $error_code;
-	var $error_string;
-	var $current_line;
-	var $current_column;
-	var $current_byte;
-	var $separator = ' ';
-	var $feed = false;
-	var $namespace = array('');
-	var $element = array('');
-	var $xml_base = array('');
-	var $xml_base_explicit = array(false);
-	var $xml_lang = array('');
-	var $data = array();
-	var $datas = array(array());
-	var $current_xhtml_construct = -1;
-	var $encoding;
-
-	function pre_process(&$data, $encoding)
-	{
-		// Use UTF-8 if we get passed US-ASCII, as every US-ASCII character is a UTF-8 character
-		if (strtoupper($encoding) == 'US-ASCII')
-		{
-			$this->encoding = 'UTF-8';
-		}
-		else
-		{
-			$this->encoding = $encoding;
-		}
-
-		// Strip BOM:
-		// UTF-32 Big Endian BOM
-		if (strpos($data, "\x0\x0\xFE\xFF") === 0)
-		{
-			$data = substr($data, 4);
-		}
-		// UTF-32 Little Endian BOM
-		elseif (strpos($data, "\xFF\xFE\x0\x0") === 0)
-		{
-			$data = substr($data, 4);
-		}
-		// UTF-16 Big Endian BOM
-		elseif (strpos($data, "\xFE\xFF") === 0)
-		{
-			$data = substr($data, 2);
-		}
-		// UTF-16 Little Endian BOM
-		elseif (strpos($data, "\xFF\xFE") === 0)
-		{
-			$data = substr($data, 2);
-		}
-		// UTF-8 BOM
-		elseif (strpos($data, "\xEF\xBB\xBF") === 0)
-		{
-			$data = substr($data, 3);
-		}
-
-		// Make sure the XML prolog is sane and has the correct encoding
-		$data = preg_replace("/^<\?xml[\x20\x9\xD\xA]+version([\x20\x9\xD\xA]+)?=([\x20\x9\xD\xA]+)?(\"1.0\"|'1.0'|\"1.1\"|'1.1')([\x20\x9\xD\xA]+encoding([\x20\x9\xD\xA]+)?=([\x20\x9\xD\xA]+)?(\"[A-Za-z][A-Za-z0-9._\-]*\"|'[A-Za-z][A-Za-z0-9._\-]*'))?([\x20\x9\xD\xA]+standalone([\x20\x9\xD\xA]+)?=([\x20\x9\xD\xA]+)?(\"(yes|no)\"|'(yes|no)'))?([\x20\x9\xD\xA]+)?\?>/", '', $data);
-		$data = "<?xml version='1.0' encoding='$encoding'?>\n" . $data;
-	}
-
-	function parse(&$data)
-	{
-		$return = true;
-
-		// Create the parser
-		$this->xml = xml_parser_create_ns($this->encoding, $this->separator);
-		xml_parser_set_option($this->xml, XML_OPTION_SKIP_WHITE, 1);
-		xml_parser_set_option($this->xml, XML_OPTION_CASE_FOLDING, 0);
-		xml_set_object($this->xml, $this);
-		xml_set_character_data_handler($this->xml, 'cdata');
-		xml_set_element_handler($this->xml, 'tag_open', 'tag_close');
-
-		// Parse!
-		if (!xml_parse($this->xml, $data, true))
-		{
-			$this->data = null;
-			$this->error_code = xml_get_error_code($this->xml);
-			$this->error_string = xml_error_string($this->error_code);
-			$return = false;
-		}
-		$this->current_line = xml_get_current_line_number($this->xml);
-		$this->current_column = xml_get_current_column_number($this->xml);
-		$this->current_byte = xml_get_current_byte_index($this->xml);
-		xml_parser_free($this->xml);
-		return $return;
-	}
-
-	function get_error_code()
-	{
-		return $this->error_code;
-	}
-
-	function get_error_string()
-	{
-		return $this->error_string;
-	}
-
-	function get_current_line()
-	{
-		return $this->current_line;
-	}
-
-	function get_current_column()
-	{
-		return $this->current_column;
-	}
-
-	function get_current_byte()
-	{
-		return $this->current_byte;
-	}
-
-	function get_data()
-	{
-		return $this->data;
-	}
-
-	function tag_open($parser, $tag, $attributes)
-	{
-		if ($this->feed === 0)
-		{
-			return;
-		}
-		elseif ($this->feed == false)
-		{
-			if (in_array($tag, array(
-				SIMPLEPIE_NAMESPACE_ATOM_10 . $this->separator . 'feed',
-				SIMPLEPIE_NAMESPACE_ATOM_03 . $this->separator . 'feed',
-				'rss',
-				SIMPLEPIE_NAMESPACE_RDF . $this->separator . 'RDF'
-			)))
-			{
-					$this->feed = 1;
-			}
-		}
-		else
-		{
-			$this->feed++;
-		}
-
-		list($this->namespace[], $this->element[]) = $this->split_ns($tag);
-
-		$attribs = array();
-		foreach ($attributes as $name => $value)
-		{
-			list($attrib_namespace, $attribute) = $this->split_ns($name);
-			$attribs[$attrib_namespace][$attribute] = $value;
-		}
-
-		if (isset($attribs[SIMPLEPIE_NAMESPACE_XML]['base']))
-		{
-			$this->xml_base[] = SimplePie_Misc::absolutize_url($attribs[SIMPLEPIE_NAMESPACE_XML]['base'], end($this->xml_base));
-			$this->xml_base_explicit[] = true;
-		}
-		else
-		{
-			$this->xml_base[] = end($this->xml_base);
-			$this->xml_base_explicit[] = end($this->xml_base_explicit);
-		}
-
-		if (isset($attribs[SIMPLEPIE_NAMESPACE_XML]['lang']))
-		{
-			$this->xml_lang[] = $attribs[SIMPLEPIE_NAMESPACE_XML]['lang'];
-		}
-		else
-		{
-			$this->xml_lang[] = end($this->xml_lang);
-		}
-
-		if ($this->current_xhtml_construct >= 0)
-		{
-			$this->current_xhtml_construct++;
-			if (end($this->namespace) == SIMPLEPIE_NAMESPACE_XHTML)
-			{
-				$this->data['data'] .= '<' . end($this->element);
-				if (isset($attribs['']))
-				{
-					foreach ($attribs[''] as $name => $value)
-					{
-						$this->data['data'] .= ' ' . $name . '="' . htmlspecialchars($value, ENT_COMPAT, $this->encoding) . '"';
-					}
-				}
-				$this->data['data'] .= '>';
-			}
-		}
-		else
-		{
-			$this->datas[] =& $this->data;
-			$this->data =& $this->data['child'][end($this->namespace)][end($this->element)][];
-			$this->data = array('data' => '', 'attribs' => $attribs, 'xml_base' => end($this->xml_base), 'xml_base_explicit' => end($this->xml_base_explicit), 'xml_lang' => end($this->xml_lang));
-			if ((end($this->namespace) == SIMPLEPIE_NAMESPACE_ATOM_03 && in_array(end($this->element), array('title', 'tagline', 'copyright', 'info', 'summary', 'content')) && isset($attribs['']['mode']) && $attribs['']['mode'] == 'xml')
-			|| (end($this->namespace) == SIMPLEPIE_NAMESPACE_ATOM_10 && in_array(end($this->element), array('rights', 'subtitle', 'summary', 'info', 'title', 'content')) && isset($attribs['']['type']) && $attribs['']['type'] == 'xhtml'))
-			{
-				$this->current_xhtml_construct = 0;
-			}
-		}
-	}
-
-	function cdata($parser, $cdata)
-	{
-		if ($this->current_xhtml_construct >= 0)
-		{
-			$this->data['data'] .= htmlspecialchars($cdata, ENT_QUOTES, $this->encoding);
-		}
-		elseif ($this->feed > 1)
-		{
-			$this->data['data'] .= $cdata;
-		}
-	}
-
-	function tag_close($parser, $tag)
-	{
-		if (!$this->feed)
-		{
-			return;
-		}
-
-		if ($this->current_xhtml_construct >= 0)
-		{
-			$this->current_xhtml_construct--;
-			if (end($this->namespace) == SIMPLEPIE_NAMESPACE_XHTML && !in_array(end($this->element), array('area', 'base', 'basefont', 'br', 'col', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param')))
-			{
-				$this->data['data'] .= '</' . end($this->element) . '>';
-			}
-		}
-		if ($this->current_xhtml_construct == -1)
-		{
-			$this->data =& $this->datas[$this->feed];
-			array_pop($this->datas);
-		}
-
-		array_pop($this->element);
-		array_pop($this->namespace);
-		array_pop($this->xml_base);
-		array_pop($this->xml_base_explicit);
-		array_pop($this->xml_lang);
-		$this->feed--;
-	}
-
-	function split_ns($string)
-	{
-		static $cache = array();
-		if (!isset($cache[$string]))
-		{
-			if ($pos = strpos($string, $this->separator))
-			{
-				static $separator_length;
-				if (!$separator_length)
-				{
-					$separator_length = strlen($this->separator);
-				}
-				$cache[$string] = array(substr($string, 0, $pos), substr($string, $pos + $separator_length));
-			}
-			else
-			{
-				$cache[$string] = array('', $string);
-			}
-		}
-		return $cache[$string];
-	}
-}
-
-/**
- * @todo Move to using an actual HTML parser (this will allow tags to be properly stripped, and to switch between HTML and XHTML), this will also make it easier to shortern a string while preserving HTML tags
- */
-class SimplePie_Sanitize
-{
-	// Private vars
-	var $base;
-
-	// Options
-	var $remove_div = true;
-	var $image_handler = '';
-	var $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style');
-	var $encode_instead_of_strip = false;
-	var $strip_attributes = array('bgsound', 'class', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc');
-	var $strip_comments = false;
-	var $output_encoding = 'UTF-8';
-	var $enable_cache = true;
-	var $cache_location = './cache';
-	var $cache_name_function = 'md5';
-	var $cache_class = 'SimplePie_Cache';
-	var $file_class = 'SimplePie_File';
-	var $timeout = 10;
-	var $useragent = '';
-	var $force_fsockopen = false;
-	var $proxy = "";
-
-	var $replace_url_attributes = array(
-		'a' => 'href',
-		'area' => 'href',
-		'blockquote' => 'cite',
-		'del' => 'cite',
-		'form' => 'action',
-		'img' => array('longdesc', 'src'),
-		'input' => 'src',
-		'ins' => 'cite',
-		'q' => 'cite'
-	);
-
-	function remove_div($enable = true)
-	{
-		$this->remove_div = (bool) $enable;
-	}
-
-	function set_image_handler($page = false)
-	{
-		if ($page)
-		{
-			$this->image_handler = (string) $page;
-		}
-		else
-		{
-			$this->image_handler = false;
-		}
-	}
-
-	function pass_cache_data($enable_cache = true, $cache_location = './cache', $cache_name_function = 'md5', $cache_class = 'SimplePie_Cache')
-	{
-		if (isset($enable_cache))
-		{
-			$this->enable_cache = (bool) $enable_cache;
-		}
-
-		if ($cache_location)
-		{
-			$this->cache_location = (string) $cache_location;
-		}
-
-		if ($cache_name_function)
-		{
-			$this->cache_name_function = (string) $cache_name_function;
-		}
-
-		if ($cache_class)
-		{
-			$this->cache_class = (string) $cache_class;
-		}
-	}
-
-	function pass_file_data($file_class = 'SimplePie_File', $timeout = 10, $useragent = '', $force_fsockopen = false)
-	{
-		if ($file_class)
-		{
-			$this->file_class = (string) $file_class;
-		}
-
-		if ($timeout)
-		{
-			$this->timeout = (string) $timeout;
-		}
-
-		if ($useragent)
-		{
-			$this->useragent = (string) $useragent;
-		}
-
-		if ($force_fsockopen)
-		{
-			$this->force_fsockopen = (string) $force_fsockopen;
-		}
-	}
-
-	function strip_htmltags($tags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style'))
-	{
-		if ($tags)
-		{
-			if (is_array($tags))
-			{
-				$this->strip_htmltags = $tags;
-			}
-			else
-			{
-				$this->strip_htmltags = explode(',', $tags);
-			}
-		}
-		else
-		{
-			$this->strip_htmltags = false;
-		}
-	}
-
-	function encode_instead_of_strip($encode = false)
-	{
-		$this->encode_instead_of_strip = (bool) $encode;
-	}
-
-	function strip_attributes($attribs = array('bgsound', 'class', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc'))
-	{
-		if ($attribs)
-		{
-			if (is_array($attribs))
-			{
-				$this->strip_attributes = $attribs;
-			}
-			else
-			{
-				$this->strip_attributes = explode(',', $attribs);
-			}
-		}
-		else
-		{
-			$this->strip_attributes = false;
-		}
-	}
-
-	function strip_comments($strip = false)
-	{
-		$this->strip_comments = (bool) $strip;
-	}
-
-	function set_output_encoding($encoding = 'UTF-8')
-	{
-		$this->output_encoding = (string) $encoding;
-	}
-
-	/**
-	 * Set element/attribute key/value pairs of HTML attributes
-	 * containing URLs that need to be resolved relative to the feed
-	 *
-	 * @access public
-	 * @since 1.0
-	 * @param array $element_attribute Element/attribute key/value pairs
-	 */
-	function set_url_replacements($element_attribute = array('a' => 'href', 'area' => 'href', 'blockquote' => 'cite', 'del' => 'cite', 'form' => 'action', 'img' => array('longdesc', 'src'), 'input' => 'src', 'ins' => 'cite', 'q' => 'cite'))
-	{
-		$this->replace_url_attributes = (array) $element_attribute;
-	}
-
-	function sanitize($data, $type, $base = '')
-	{
-		$data = trim($data);
-		if ($data !== '' || $type & SIMPLEPIE_CONSTRUCT_IRI)
-		{
-			if ($type & SIMPLEPIE_CONSTRUCT_MAYBE_HTML)
-			{
-				if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/(\w+)' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data))
-				{
-					$type |= SIMPLEPIE_CONSTRUCT_HTML;
-				}
-				else
-				{
-					$type |= SIMPLEPIE_CONSTRUCT_TEXT;
-				}
-			}
-
-			if ($type & SIMPLEPIE_CONSTRUCT_BASE64)
-			{
-				$data = base64_decode($data);
-			}
-
-			if ($type & SIMPLEPIE_CONSTRUCT_XHTML)
-			{
-				if ($this->remove_div)
-				{
-					$data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '', $data);
-					$data = preg_replace('/<\/div>$/', '', $data);
-				}
-				else
-				{
-					$data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '<div>', $data);
-				}
-			}
-
-			if ($type & (SIMPLEPIE_CONSTRUCT_HTML | SIMPLEPIE_CONSTRUCT_XHTML))
-			{
-				// Strip comments
-				if ($this->strip_comments)
-				{
-					$data = SimplePie_Misc::strip_comments($data);
-				}
-
-				// Strip out HTML tags and attributes that might cause various security problems.
-				// Based on recommendations by Mark Pilgrim at:
-				// http://diveintomark.org/archives/2003/06/12/how_to_consume_rss_safely
-				if ($this->strip_htmltags)
-				{
-					foreach ($this->strip_htmltags as $tag)
-					{
-						$pcre = "/<($tag)" . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . "(>(.*)<\/$tag" . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>|(\/)?>)/siU';
-						while (preg_match($pcre, $data))
-						{
-							$data = preg_replace_callback($pcre, array(&$this, 'do_strip_htmltags'), $data);
-						}
-					}
-				}
-
-				if ($this->strip_attributes)
-				{
-					foreach ($this->strip_attributes as $attrib)
-					{
-						$data = preg_replace('/ '. trim($attrib) .'=("|&quot;)(\w|\s|=|-|:|;|\/|\.|\?|&|,|#|!|\(|\)|\'|&apos;|<|>|\+|{|})*("|&quot;)/i', '', $data);
-						$data = preg_replace('/ '. trim($attrib) .'=(\'|&apos;)(\w|\s|=|-|:|;|\/|\.|\?|&|,|#|!|\(|\)|"|&quot;|<|>|\+|{|})*(\'|&apos;)/i', '', $data);
-						$data = preg_replace('/ '. trim($attrib) .'=(\w|\s|=|-|:|;|\/|\.|\?|&|,|#|!|\(|\)|\+|{|})*/i', '', $data);
-					}
-				}
-
-				// Replace relative URLs
-				$this->base = $base;
-				foreach ($this->replace_url_attributes as $element => $attributes)
-				{
-					$data = $this->replace_urls($data, $element, $attributes);
-				}
-
-				// If image handling (caching, etc.) is enabled, cache and rewrite all the image tags.
-				if (isset($this->image_handler) && ((string) $this->image_handler) !== '' && $this->enable_cache)
-				{
-					$images = SimplePie_Misc::get_element('img', $data);
-					foreach ($images as $img)
-					{
-						if (isset($img['attribs']['src']['data']))
-						{
-							$image_url = $img['attribs']['src']['data'];
-							$cache =& new $this->cache_class($this->cache_location, call_user_func($this->cache_name_function, $image_url), 'spi');
-
-							if ($cache->load())
-							{
-								$img['attribs']['src']['data'] = $this->image_handler . rawurlencode($img['attribs']['src']['data']);
-								$data = str_replace($img['full'], SimplePie_Misc::element_implode($img), $data);
-							}
-							else
-							{
-								$file =& new $this->file_class($image_url, $this->timeout, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen, $this->proxy);
-								$headers = $file->headers;
-
-								if ($file->success && ($file->status_code == 200 || ($file->status_code > 206 && $file->status_code < 300)))
-								{
-									if (!$cache->save(array('headers' => $file->headers, 'body' => $file->body)))
-									{
-										trigger_error("$cache->name is not writeable", E_USER_WARNING);
-									}
-									$img['attribs']['src']['data'] = $this->image_handler . rawurlencode($img['attribs']['src']['data']);
-									$data = str_replace($img['full'], SimplePie_Misc::element_implode($img), $data);
-								}
-							}
-						}
-					}
-				}
-
-				// Having (possibly) taken stuff out, there may now be whitespace at the beginning/end of the data
-				$data = trim($data);
-			}
-
-			if ($type & SIMPLEPIE_CONSTRUCT_IRI)
-			{
-				$data = SimplePie_Misc::absolutize_url($data, $base);
-			}
-
-			if ($type & (SIMPLEPIE_CONSTRUCT_TEXT | SIMPLEPIE_CONSTRUCT_IRI))
-			{
-				$data = htmlspecialchars($data, ENT_COMPAT, 'UTF-8');
-			}
-
-			if ($this->output_encoding != 'UTF-8')
-			{
-				$data = SimplePie_Misc::change_encoding($data, 'UTF-8', $this->output_encoding);
-			}
-		}
-		return $data;
-	}
-
-	function replace_urls($data, $tag, $attributes)
-	{
-		if (!is_array($this->strip_htmltags) || !in_array($tag, $this->strip_htmltags))
-		{
-			$elements = SimplePie_Misc::get_element($tag, $data);
-			foreach ($elements as $element)
-			{
-				if (is_array($attributes))
-				{
-					foreach ($attributes as $attribute)
-					{
-						if (isset($element['attribs'][$attribute]['data']))
-						{
-							$element['attribs'][$attribute]['data'] = SimplePie_Misc::absolutize_url($element['attribs'][$attribute]['data'], $this->base);
-							$data = str_replace($element['full'], SimplePie_Misc::element_implode($element), $data);
-						}
-					}
-				}
-				elseif (isset($element['attribs'][$attributes]['data']))
-				{
-					$element['attribs'][$attributes]['data'] = SimplePie_Misc::absolutize_url($element['attribs'][$attributes]['data'], $this->base);
-					$data = str_replace($element['full'], SimplePie_Misc::element_implode($element), $data);
-				}
-			}
-		}
-		return $data;
-	}
-
-	function do_strip_htmltags($match)
-	{
-		if ($this->encode_instead_of_strip)
-		{
-			if (isset($match[4]) && !in_array(strtolower($match[1]), array('script', 'style')))
-			{
-				$match[1] = htmlspecialchars($match[1], ENT_COMPAT, 'UTF-8');
-				$match[2] = htmlspecialchars($match[2], ENT_COMPAT, 'UTF-8');
-				return "&lt;$match[1]$match[2]&gt;$match[3]&lt;/$match[1]&gt;";
-			}
-			else
-			{
-				return htmlspecialchars($match[0], ENT_COMPAT, 'UTF-8');
-			}
-		}
-		elseif (isset($match[4]) && !in_array(strtolower($match[1]), array('script', 'style')))
-		{
-			return $match[4];
-		}
-		else
-		{
-			return '';
-		}
-	}
-}
-
-?>
\ No newline at end of file

From 64036204244ee58cb823f29b6991d9ffde4e8919 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Wed, 29 Mar 2017 19:53:40 +0900
Subject: [PATCH 598/630] use sfAutoload to autoloading SimplePie classes (refs
 #4179)

---
 lib/config/opProjectConfiguration.class.php | 1 -
 lib/util/opRssFetcher.class.php             | 2 --
 2 files changed, 3 deletions(-)

diff --git a/lib/config/opProjectConfiguration.class.php b/lib/config/opProjectConfiguration.class.php
index c591c0712..f708d06dc 100644
--- a/lib/config/opProjectConfiguration.class.php
+++ b/lib/config/opProjectConfiguration.class.php
@@ -101,7 +101,6 @@ public function setIncludePath()
     sfToolkit::addIncludePath(array(
       dirname(__FILE__).'/../vendor/PEAR/',
       dirname(__FILE__).'/../vendor/OAuth/',
-      dirname(__FILE__).'/../vendor/simplepie/',
     ));
   }
 
diff --git a/lib/util/opRssFetcher.class.php b/lib/util/opRssFetcher.class.php
index e61db49a3..9b165fa94 100644
--- a/lib/util/opRssFetcher.class.php
+++ b/lib/util/opRssFetcher.class.php
@@ -5,8 +5,6 @@
  * @license   http://www.php.net/license/3_01.txt PHP License 3.01
  */
 
-require_once 'simplepie.inc';
-
 /**
  * This class is for fetching RSS / Atom feed
  *

From c2263a5f20127ff76cb9b0a2364fd832545fd91c Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Wed, 29 Mar 2017 19:55:23 +0900
Subject: [PATCH 599/630] update opRssFetcher for latest SimplePie (refs #4179)

The unit tests for opRssFetcher::autoDiscover() has been dropped because
SimplePie_Locator::find() is no longer discovering feeds when specifying local files.
---
 lib/util/opRssFetcher.class.php     |  7 +++++--
 test/unit/util/opRssFetcherTest.php | 32 +++++++++++++----------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/lib/util/opRssFetcher.class.php b/lib/util/opRssFetcher.class.php
index 9b165fa94..3779c305d 100644
--- a/lib/util/opRssFetcher.class.php
+++ b/lib/util/opRssFetcher.class.php
@@ -71,6 +71,8 @@ public function fetch($rssUrl, $isGetFeedTitle = false)
       return false;
     }
 
+    $feed->enable_order_by_date(false);
+
     if (!($items = $feed->get_items()))
     {
       return false;
@@ -173,8 +175,9 @@ static public function autoDiscovery($url)
     }
     $file = @new SimplePie_File($url, 10, 5, null, null, false, $proxy);
     $locator = new SimplePie_Locator($file, 10, null, 'SimplePie_File', 10, $proxy);
-    $feedUrl = $locator->find();
-    if (SimplePie_Misc::is_a($feedUrl, 'SimplePie_File'))
+    $locator->set_registry(new SimplePie_Registry());
+    $feedUrl = $locator->find(SIMPLEPIE_LOCATOR_ALL, $all);
+    if ($feedUrl instanceof SimplePie_File)
     {
       $result = $feedUrl->url;
     }
diff --git a/test/unit/util/opRssFetcherTest.php b/test/unit/util/opRssFetcherTest.php
index 632046df8..e2b08cfdc 100644
--- a/test/unit/util/opRssFetcherTest.php
+++ b/test/unit/util/opRssFetcherTest.php
@@ -11,9 +11,10 @@ class opRssFetcherMock extends opRssFetcher
   public function createSimplePieObject($fileName)
   {
     $filePath = self::calcFixtureFilePath($fileName);
+    $file = new SimplePie_File($filePath);
 
     $feed = new SimplePie();
-    $feed->set_file(new SimplePie_File($filePath));
+    $feed->set_file($file);
     $feed->set_cache_location(sfConfig::get('sf_cache_dir'));
     if (!(@$feed->init()))
     {
@@ -63,18 +64,19 @@ static public function calcFixtureFilePath($path)
 $t->is($result[0]['body'], 'OpenPNE 開発チームの海老原です。
 				本日 2009/11/30（月）、 開発版 OpenPNE 3.2RC1 をリリースしました。
 				今後の OpenPNE3 のリリーススケジュール にて発表 [...]', '->fetch() returns RSS entries that contains valid body');
-$t->is($result[4]['body'], '<p>開発チームの海老原です。</p>
+$t->is($result[4]['body'], '
+<p>開発チームの海老原です。</p>
 				<p>11/23 に <a href="http://www.openpne.jp/archives/3931/">opAlbumPlugin のアップデート</a>が、 11/24 に <a href="http://www.openpne.jp/archives/3938/">opDiaryPlugin のアップデート</a>がありました。</p>
 				<p>どちらも重要なバグフィックスがおこなわれたリリースのため、 OpenPNE 3.1.5 にバンドルされているプラグインも、新しく更新されたバージョンに変更しました。</p>
-				<p>以下のコマンドを実行することで、更新された opAlbumPlugin と opDiaryPlugin が利用できます。<br />
-				<code>./symfony openpne:migrate</code></p>', '->fetch() returns RSS entries that contains valid content');
+				<p>以下のコマンドを実行することで、更新された opAlbumPlugin と opDiaryPlugin が利用できます。<br><code>./symfony openpne:migrate</code></p>
+', '->fetch() returns RSS entries that contains valid content');
 $t->is($result[5]['body'], '', '->fetch() returns RSS entries that contains empty body');
 $t->is($result[0]['link'], 'http://www.openpne.jp/archives/3988/', '->fetch() returns RSS entries that contains valid link');
 $t->is($result[2]['link'], '', '->fetch() returns RSS entries that contains empty link');
 $t->is($result[0]['date'], '2009-11-30 01:16:36', '->fetch() returns RSS entries that contains valid date');
 $t->is($result[6]['date'], '', '->fetch() returns RSS entries that contains empty date');
-$t->isa_ok($result[0]['enclosure'], 'SimplePie_Enclosure', '->fetch() returns RSS entries that contains valid enclosure');
-$t->is($result[7]['enclosure'], '', '->fetch() returns RSS entries that contains empty enclosure');
+$t->is($result[0]['enclosure']->get_type(), 'image/png', '->fetch() returns RSS entries that contains valid enclosure');
+$t->is($result[7]['enclosure']->get_type(), null, '->fetch() returns RSS entries that contains empty enclosure');
 
 $result = $mock->fetch('www.openpne.jp.feed.atom');
 $t->is(count($result), 10, '->fetch() for www.openpne.jp is returns array that contains recently 10 Atom entries');
@@ -83,19 +85,20 @@ static public function calcFixtureFilePath($path)
 $t->is($result[0]['body'], 'OpenPNE 開発チームの海老原です。
 				本日 2009/11/30（月）、 開発版 OpenPNE 3.2RC1 をリリースしました。
 				今後の OpenPNE3 のリリーススケジュール にて発表 [...]', '->fetch() returns Atom entries that contains valid body');
-$t->is($result[4]['body'], '<p>開発チームの海老原です。</p>
+$t->is($result[4]['body'], '
+<p>開発チームの海老原です。</p>
 				<p>11/23 に <a href="http://www.openpne.jp/archives/3931/">opAlbumPlugin のアップデート</a>が、 11/24 に <a href="http://www.openpne.jp/archives/3938/">opDiaryPlugin のアップデート</a>がありました。</p>
 				<p>どちらも重要なバグフィックスがおこなわれたリリースのため、 OpenPNE 3.1.5 にバンドルされているプラグインも、新しく更新されたバージョンに変更しました。</p>
-				<p>以下のコマンドを実行することで、更新された opAlbumPlugin と opDiaryPlugin が利用できます。<br />
-				<code>./symfony openpne:migrate</code></p>', '->fetch() returns Atom entries that contains valid content');
+				<p>以下のコマンドを実行することで、更新された opAlbumPlugin と opDiaryPlugin が利用できます。<br><code>./symfony openpne:migrate</code></p>
+', '->fetch() returns Atom entries that contains valid content');
 $t->is($result[5]['body'], '', '->fetch() returns Atom entries that contains empty body');
 $t->is($result[0]['link'], 'http://www.openpne.jp/archives/3988/', '->fetch() returns Atom entries that contains valid link');
 $t->is($result[2]['link'], '', '->fetch() returns Atom entries that contains empty link');
 $t->is($result[0]['date'], '2009-11-30 01:16:36', '->fetch() returns Atom entries that contains valid date');
 $t->is($result[6]['date'], '2009-11-23 19:57:27', '->fetch() returns Atom entries that contains updated date');
 $t->is($result[8]['date'], '', '->fetch() returns Atom entries that contains empty date');
-$t->isa_ok($result[0]['enclosure'], 'SimplePie_Enclosure', '->fetch() returns Atom entries that contains valid enclosure');
-$t->is($result[7]['enclosure'], '', '->fetch() returns Atom entries that contains empty enclosure');
+$t->is($result[0]['enclosure']->get_type(), 'image/png', '->fetch() returns Atom entries that contains valid enclosure');
+$t->is($result[7]['enclosure']->get_type(), null, '->fetch() returns Atom entries that contains empty enclosure');
 $result = $mock->fetch('www.openpne.jp.feed.rss', true);
 $t->is($result[0], 'OpenPNE', '->fetch() returns also RSS feed title if the second parameter is true');
 $result = $mock->fetch('www.openpne.jp.feed.atom', true);
@@ -103,10 +106,3 @@ static public function calcFixtureFilePath($path)
 $t->is($instance->fetch('http://example.com/undefined.rss'), false, '->fetch() returns false if the specified uri is 404');
 $t->is($mock->fetch('www.openpne.jp.feed.empty.rss'), false, '->fetch() returns false if the specified feed does not have any entries');
 $t->is($mock->fetch('www.openpne.jp.feed.empty.rss', true), false, '->fetch() returns false if the specified feed does not have any entries even if the second parameter is specified');
-
-$t->diag('::autoDiscovery');
-$url = opRssFetcher::autoDiscovery(opRssFetcherMock::calcFixtureFilePath('www.openpne.jp.html'));
-$t->is($url, 'http://www.openpne.jp/feed/', '::autoDiscovery() returns a valid feed url');
-$url = opRssFetcher::autoDiscovery(opRssFetcherMock::calcFixtureFilePath('www.co3k.org.html'));
-$t->is($url, '', '::autoDiscovery() returns an empty string if the specified uri does not have related feeds');
-

From d45bf2b98fcde1197b670a4546c2988bf843d386 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Wed, 29 Mar 2017 20:09:33 +0900
Subject: [PATCH 600/630] update library dependency for NOTICE (refs #4179)

---
 NOTICE | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/NOTICE b/NOTICE
index ca1d27b0e..b99f41c82 100644
--- a/NOTICE
+++ b/NOTICE
@@ -20,6 +20,8 @@ This product includes also softwares developed by :
     - Apache License 2.0
   - Andy Smith (http://term.ie/)
     - MIT License
+  - Ryan Parman, Geoffrey Sneddon
+    - BSD 3-clause License (SimplePie)
   - Fabien Potencier (http://fabien.potencier.org/)
     - MIT License
   - Kousuke Ebihara (http://co3k.org/)
@@ -47,6 +49,7 @@ This product includes dependent libraries listed blow:
     - Zend_Version
   - Auth OpenID 2.1.2
   - PHP OAuth library
+  - SimplePie 1.4.3
   - sfFormExtraPlugin 1.0.12
   - sfImageHandlerPlugin 1.0.0
   - PEAR::Image_Transform 0.9.3

From cef2e30a3587cabbf684cbb73505e7d9995ac086 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Fri, 31 Mar 2017 15:03:56 +0900
Subject: [PATCH 601/630] drop opJsonApiActions::renderJSON() method replaced
 by sfAction::renderJson() (refs #4178)

---
 lib/action/opJsonApiActions.class.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/lib/action/opJsonApiActions.class.php b/lib/action/opJsonApiActions.class.php
index 5e38cf2fb..c02c8bde4 100644
--- a/lib/action/opJsonApiActions.class.php
+++ b/lib/action/opJsonApiActions.class.php
@@ -39,13 +39,6 @@ public function execute($request)
     return parent::execute($request);
   }
 
-  public function renderJSON(array $data)
-  {
-    $json = json_encode($data, $this->doEscape);
-
-    return $this->renderText($json);
-  }
-
   public function forward400($message = null)
   {
     $exception = new opErrorHttpException($message);

From 444735fcd992105148f126b8a5981cc0065f18d2 Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Tue, 28 Feb 2017 17:31:33 +0900
Subject: [PATCH 602/630] =?UTF-8?q?(fixed=20#4143)=20messages.ja.xml=20?=
 =?UTF-8?q?=E3=81=8B=E3=82=89=E5=85=AC=E9=96=8B=E7=AF=84=E5=9B=B2=E5=90=91?=
 =?UTF-8?q?=E3=81=91=E3=81=AE=E7=BF=BB=E8=A8=B3=E3=82=92=E5=89=8A=E9=99=A4?=
 =?UTF-8?q?=E3=81=97=20%my=5Ffriend%=20=E3=81=AE=E7=BF=BB=E8=A8=B3?=
 =?UTF-8?q?=E3=81=AF=20%my=5Ffriend%=20=E3=81=A8=E3=81=97=E3=80=81publicFl?=
 =?UTF-8?q?ags.ja.xml=20=E3=82=92=E8=BF=BD=E5=8A=A0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/mobile_frontend/i18n/messages.ja.xml     | 18 +--------------
 apps/mobile_frontend/i18n/publicFlags.ja.xml  | 23 +++++++++++++++++++
 .../member/templates/profileSuccess.php       |  8 +++++--
 apps/pc_frontend/i18n/messages.ja.xml         | 18 +--------------
 apps/pc_frontend/i18n/publicFlags.ja.xml      | 23 +++++++++++++++++++
 .../member/templates/_profileListBox.php      | 18 +++++++++------
 .../doctrine/ActivityDataTable.class.php      |  4 +++-
 lib/model/doctrine/ProfileTable.class.php     | 15 ++++++++++--
 8 files changed, 81 insertions(+), 46 deletions(-)
 create mode 100644 apps/mobile_frontend/i18n/publicFlags.ja.xml
 create mode 100644 apps/pc_frontend/i18n/publicFlags.ja.xml

diff --git a/apps/mobile_frontend/i18n/messages.ja.xml b/apps/mobile_frontend/i18n/messages.ja.xml
index 94b39c785..855de27e5 100644
--- a/apps/mobile_frontend/i18n/messages.ja.xml
+++ b/apps/mobile_frontend/i18n/messages.ja.xml
@@ -106,25 +106,9 @@
         <source>Public Flag for Profile Page</source>
         <target>ﾌﾟﾛﾌｨｰﾙﾍﾟｰｼﾞの公開範囲</target>
       </trans-unit>
-      <trans-unit id="">
-        <source>All Users on the Web</source>
-        <target>Web全体に公開</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>All Members</source>
-        <target>全員に公開</target>
-      </trans-unit>
       <trans-unit id="">
         <source>%my_friend%</source>
-        <target>%my_friend%まで公開</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Only Open to %my_friend%</source>
-        <target>%my_friend%まで公開</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Private</source>
-        <target>公開しない</target>
+        <target>%my_friend%</target>
       </trans-unit>
       <trans-unit id="">
         <source>Register mobile</source>
diff --git a/apps/mobile_frontend/i18n/publicFlags.ja.xml b/apps/mobile_frontend/i18n/publicFlags.ja.xml
new file mode 100644
index 000000000..0fc2f7aa9
--- /dev/null
+++ b/apps/mobile_frontend/i18n/publicFlags.ja.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" ?>
+<xliff version="1.0">
+  <file orginal="global" source-language="en" datatype="plaintext">
+    <body>
+      <trans-unit id="1">
+        <source>All Users on the Web</source>
+        <target>Web全体に公開</target>
+      </trans-unit>
+      <trans-unit id="2">
+        <source>All Members</source>
+        <target>全員に公開</target>
+      </trans-unit>
+      <trans-unit id="3">
+        <source>%my_friend%</source>
+        <target>%my_friend%まで公開</target>
+      </trans-unit>
+      <trans-unit id="4">
+        <source>Private</source>
+        <target>公開しない</target>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/apps/mobile_frontend/modules/member/templates/profileSuccess.php b/apps/mobile_frontend/modules/member/templates/profileSuccess.php
index 74b90f97e..3d44346e9 100644
--- a/apps/mobile_frontend/modules/member/templates/profileSuccess.php
+++ b/apps/mobile_frontend/modules/member/templates/profileSuccess.php
@@ -84,13 +84,17 @@
 
   if ($member->getId() == $sf_user->getMemberId())
   {
+    $i18n = sfContext::getInstance()->getI18N();
+    $termMyFriend = Doctrine::getTable('SnsTerm')->get('my_friend');
+    $terms = array('%my_friend%' => $termMyFriend->pluralize()->titleize());
+
     if ($profile->getPublicFlag() == ProfileTable::PUBLIC_FLAG_FRIEND)
     {
-      $value .= '<font color="'.$op_color["core_color_22"].'">('.__('Only Open to %my_friend%').')</font><br>';
+      $value .= '<font color="'.$op_color["core_color_22"].'">('.__('%my_friend%', $terms, 'publicFlags').')</font><br>';
     }
     elseif ($profile->getPublicFlag() == ProfileTable::PUBLIC_FLAG_WEB && $profile->Profile->is_public_web)
     {
-      $value .= '<font color="'.$op_color["core_color_22"].'">('.__('All Users on the Web').')</font><br>';
+      $value .= '<font color="'.$op_color["core_color_22"].'">('.__('All Users on the Web', $terms, 'publicFlags').')</font><br>';
     }
   }
 
diff --git a/apps/pc_frontend/i18n/messages.ja.xml b/apps/pc_frontend/i18n/messages.ja.xml
index 008de66ae..24b752598 100644
--- a/apps/pc_frontend/i18n/messages.ja.xml
+++ b/apps/pc_frontend/i18n/messages.ja.xml
@@ -278,25 +278,9 @@
         <source>Public Flag for Profile Page</source>
         <target>プロフィールページの公開範囲</target>
       </trans-unit>
-      <trans-unit id="">
-        <source>All Users on the Web</source>
-        <target>Web全体に公開</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>All Members</source>
-        <target>全員に公開</target>
-      </trans-unit>
       <trans-unit id="">
         <source>%my_friend%</source>
-        <target>%my_friend%まで公開</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Only Open to %my_friend%</source>
-        <target>%my_friend%まで公開</target>
-      </trans-unit>
-      <trans-unit id="">
-        <source>Private</source>
-        <target>公開しない</target>
+        <target>%my_friend%</target>
       </trans-unit>
       <trans-unit id="">
         <source>Invite a friend to %1%</source>
diff --git a/apps/pc_frontend/i18n/publicFlags.ja.xml b/apps/pc_frontend/i18n/publicFlags.ja.xml
new file mode 100644
index 000000000..0fc2f7aa9
--- /dev/null
+++ b/apps/pc_frontend/i18n/publicFlags.ja.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" ?>
+<xliff version="1.0">
+  <file orginal="global" source-language="en" datatype="plaintext">
+    <body>
+      <trans-unit id="1">
+        <source>All Users on the Web</source>
+        <target>Web全体に公開</target>
+      </trans-unit>
+      <trans-unit id="2">
+        <source>All Members</source>
+        <target>全員に公開</target>
+      </trans-unit>
+      <trans-unit id="3">
+        <source>%my_friend%</source>
+        <target>%my_friend%まで公開</target>
+      </trans-unit>
+      <trans-unit id="4">
+        <source>Private</source>
+        <target>公開しない</target>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/apps/pc_frontend/modules/member/templates/_profileListBox.php b/apps/pc_frontend/modules/member/templates/_profileListBox.php
index bea0e8f5f..e7b498e92 100644
--- a/apps/pc_frontend/modules/member/templates/_profileListBox.php
+++ b/apps/pc_frontend/modules/member/templates/_profileListBox.php
@@ -11,9 +11,11 @@
   $ageValue = __('%1% years old', array('%1%' => $member->getAge()));
   if ($member->getConfig('age_public_flag') == ProfileTable::PUBLIC_FLAG_FRIEND)
   {
-    $ageValue .= ' ('.__('Only Open to %my_friend%', array(
-      '%my_friend%' => $op_term['my_friend']->titleize()->pluralize(),
-    )).')';
+    $i18n = sfContext::getInstance()->getI18N();
+    $termMyFriend = Doctrine::getTable('SnsTerm')->get('my_friend');
+    $terms = array('%my_friend%' => $termMyFriend->pluralize()->titleize());
+
+    $ageValue .= ' ('.__('%my_friend%', $terms, 'publicFlags').')';
   }
 
   $list[__('Age')] = $ageValue;
@@ -55,15 +57,17 @@
 
   if ($member->getId() == $sf_user->getMemberId())
   {
+    $i18n = sfContext::getInstance()->getI18N();
+    $termMyFriend = Doctrine::getTable('SnsTerm')->get('my_friend');
+    $terms = array('%my_friend%' => $termMyFriend->pluralize()->titleize());
+
     if ($profile->getPublicFlag() == ProfileTable::PUBLIC_FLAG_FRIEND)
     {
-      $profileValue .= ' ('.__('Only Open to %my_friend%', array(
-        '%my_friend%' => $op_term['my_friend']->titleize()->pluralize(),
-      )).')';
+      $profileValue .= ' ('.__('%my_friend%', $terms, 'publicFlags').')';
     }
     elseif ($profile->getPublicFlag() == ProfileTable::PUBLIC_FLAG_WEB && $profile->Profile->is_public_web)
     {
-      $profileValue .= ' ('.__('All Users on the Web').')';
+      $profileValue .= ' ('.__('All Users on the Web', $terms, 'publicFlags').')';
     }
   }
   $list[$caption] = $profileValue;
diff --git a/lib/model/doctrine/ActivityDataTable.class.php b/lib/model/doctrine/ActivityDataTable.class.php
index 81c0da660..9b4a8350d 100644
--- a/lib/model/doctrine/ActivityDataTable.class.php
+++ b/lib/model/doctrine/ActivityDataTable.class.php
@@ -147,8 +147,10 @@ public function updateActivity($memberId, $body, $options = array())
   public function publicFlagToCaption($flag)
   {
     $i18n = sfContext::getInstance()->getI18N();
+    $termMyFriend = Doctrine::getTable('SnsTerm')->get('my_friend');
+    $terms = array('%my_friend%' => $termMyFriend->pluralize()->titleize());
 
-    return $i18n->__(self::$publicFlags[$flag]);
+    return $i18n->__(self::$publicFlags[$flag], $terms, 'publicFlags');
   }
 
   public function getPublicFlags($isI18n = true)
diff --git a/lib/model/doctrine/ProfileTable.class.php b/lib/model/doctrine/ProfileTable.class.php
index e120d6ca0..cb4e67651 100644
--- a/lib/model/doctrine/ProfileTable.class.php
+++ b/lib/model/doctrine/ProfileTable.class.php
@@ -28,7 +28,14 @@ public function getPublicFlags($isI18n = true)
   {
     if ($isI18n)
     {
-      $publicFlags = array_map(array(sfContext::getInstance()->getI18N(), '__'), $this->publicFlags);
+      $i18n = sfContext::getInstance()->getI18N();
+      $termMyFriend = Doctrine::getTable('SnsTerm')->get('my_friend');
+
+      foreach ($this->publicFlags as $key => $publicFlag)
+      {
+        $terms = array('%my_friend%' => $termMyFriend->titleize()->pluralize());
+        $publicFlags[$key] = $i18n->__($publicFlag, $terms, 'publicFlags');
+      }
     }
     else
     {
@@ -40,7 +47,11 @@ public function getPublicFlags($isI18n = true)
 
   public function getPublicFlag($flag)
   {
-    return sfContext::getInstance()->getI18N()->__($this->publicFlags[$flag]);
+    $i18n = sfContext::getInstance()->getI18N();
+    $termMyFriend = Doctrine::getTable('SnsTerm')->get('my_friend');
+    $terms = array('%my_friend%' => $termMyFriend->titleize()->pluralize());
+
+    return $i18n->__($this->publicFlags[$flag], $terms, 'publicFlags');
   }
 
   public function retrievesAll()

From 75e24e30b7209f071232aaf81988e2adbcd8e6e5 Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Tue, 28 Feb 2017 17:57:53 +0900
Subject: [PATCH 603/630] =?UTF-8?q?(fixed=20#4143)=20titleize()=20?=
 =?UTF-8?q?=E3=81=A8=20pluralize()=20=E3=81=AE=E5=91=BC=E3=81=B3=E5=87=BA?=
 =?UTF-8?q?=E3=81=97=E9=A0=86=E3=82=92=E4=BB=96=E3=81=A8=E5=90=88=E3=82=8F?=
 =?UTF-8?q?=E3=81=9B=E3=81=A6=E7=B5=B1=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/model/doctrine/ProfileTable.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/model/doctrine/ProfileTable.class.php b/lib/model/doctrine/ProfileTable.class.php
index cb4e67651..6cf0b987d 100644
--- a/lib/model/doctrine/ProfileTable.class.php
+++ b/lib/model/doctrine/ProfileTable.class.php
@@ -33,7 +33,7 @@ public function getPublicFlags($isI18n = true)
 
       foreach ($this->publicFlags as $key => $publicFlag)
       {
-        $terms = array('%my_friend%' => $termMyFriend->titleize()->pluralize());
+        $terms = array('%my_friend%' => $termMyFriend->pluralize()->titleize());
         $publicFlags[$key] = $i18n->__($publicFlag, $terms, 'publicFlags');
       }
     }
@@ -49,7 +49,7 @@ public function getPublicFlag($flag)
   {
     $i18n = sfContext::getInstance()->getI18N();
     $termMyFriend = Doctrine::getTable('SnsTerm')->get('my_friend');
-    $terms = array('%my_friend%' => $termMyFriend->titleize()->pluralize());
+    $terms = array('%my_friend%' => $termMyFriend->pluralize()->titleize());
 
     return $i18n->__($this->publicFlags[$flag], $terms, 'publicFlags');
   }

From 6681cbc8d2bf32eda3e0671587124a6a0ab69657 Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Thu, 13 Apr 2017 15:32:41 +0900
Subject: [PATCH 604/630] =?UTF-8?q?(fixed=20#4143-11)=20=E3=80=8C%my=5Ffri?=
 =?UTF-8?q?end%=E3=80=8D=E3=81=AE=E7=BF=BB=E8=A8=B3=E3=82=92=E5=89=8A?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/mobile_frontend/i18n/messages.ja.xml | 4 ----
 apps/pc_frontend/i18n/messages.ja.xml     | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/apps/mobile_frontend/i18n/messages.ja.xml b/apps/mobile_frontend/i18n/messages.ja.xml
index 855de27e5..7f3d48ef7 100644
--- a/apps/mobile_frontend/i18n/messages.ja.xml
+++ b/apps/mobile_frontend/i18n/messages.ja.xml
@@ -106,10 +106,6 @@
         <source>Public Flag for Profile Page</source>
         <target>ﾌﾟﾛﾌｨｰﾙﾍﾟｰｼﾞの公開範囲</target>
       </trans-unit>
-      <trans-unit id="">
-        <source>%my_friend%</source>
-        <target>%my_friend%</target>
-      </trans-unit>
       <trans-unit id="">
         <source>Register mobile</source>
         <target>携帯電話を登録する</target>
diff --git a/apps/pc_frontend/i18n/messages.ja.xml b/apps/pc_frontend/i18n/messages.ja.xml
index 24b752598..1661b638a 100644
--- a/apps/pc_frontend/i18n/messages.ja.xml
+++ b/apps/pc_frontend/i18n/messages.ja.xml
@@ -278,10 +278,6 @@
         <source>Public Flag for Profile Page</source>
         <target>プロフィールページの公開範囲</target>
       </trans-unit>
-      <trans-unit id="">
-        <source>%my_friend%</source>
-        <target>%my_friend%</target>
-      </trans-unit>
       <trans-unit id="">
         <source>Invite a friend to %1%</source>
         <target>友人を%1%に招待する</target>

From ac544a235b40eb73100da92b402f1dc6f8d4ed9c Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Fri, 12 May 2017 14:03:33 +0900
Subject: [PATCH 605/630] Update the operating environment (refs #4025)

---
 doc/en/OpenPNE3_Setup_Guide.txt | 26 ++++++++++++++++++++++++++
 doc/ja/OpenPNE3_Setup_Guide.txt | 26 ++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/doc/en/OpenPNE3_Setup_Guide.txt b/doc/en/OpenPNE3_Setup_Guide.txt
index 7153749be..4f37c7bdd 100644
--- a/doc/en/OpenPNE3_Setup_Guide.txt
+++ b/doc/en/OpenPNE3_Setup_Guide.txt
@@ -28,6 +28,32 @@ Database Server
   
   At this time, PostgreSQL and SQLite are not supported (They will be supported in the future)
 
+Supported Client
+  OS
+    Windows
+      * Those that are within the support period of Microsoft
+    Mac OS (or OS X)
+      * (Current - 2) and Current
+    Android
+      * (Current - 2) and Current
+    iOS
+      * (Current - 2) and Current
+  Web browsers
+    Internet Explorer(Compatibility mode is invalid)
+      * Those that are within the support period of Microsoft
+    Microsoft Edge
+      * Those that are within the support period of Microsoft
+    Firefox
+      * Current
+    Google Chrome
+      * Current
+    Safari
+      * Current
+Supported Server
+  OS
+    Debian
+      * Debian 8
+
 Setup
 =====
 
diff --git a/doc/ja/OpenPNE3_Setup_Guide.txt b/doc/ja/OpenPNE3_Setup_Guide.txt
index 1af2e09d8..636f9253c 100644
--- a/doc/ja/OpenPNE3_Setup_Guide.txt
+++ b/doc/ja/OpenPNE3_Setup_Guide.txt
@@ -28,6 +28,32 @@ PHP
   
   PostgreSQL, SQLite は現時点で未サポート（将来的にサポート予定）
 
+サポート対象 クライアント
+  OS
+    Windows
+      * Microsoftのサポート期間内であるもの
+    Mac OS (もしくは OS X)
+      * 最新版とその２バージョン前
+    Android
+      * 最新版とその２バージョン前
+    iOS
+      * 最新版とその２バージョン前
+  ブラウザ
+    Internet Explorer(互換モードは無効の状態)
+      * Microsoftのサポート期間内であるもの
+    Microsoft Edge
+      * Microsoftのサポート期間内であるもの
+    Firefox
+      * 最新版
+    Google Chrome
+      * 最新版
+    Safari
+      * 最新版
+サポート対象 サーバー
+  OS
+    Debian
+      * Debian 8
+
 セットアップ
 ============
 

From f73b8e43b67ffced2982212f0ff2290c60bf7d04 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Fri, 12 May 2017 14:14:21 +0900
Subject: [PATCH 606/630] (Fixed # 4025) Added operating environment and
 recommended environment to OpenPNE3_Setup_Guide

---
 doc/en/OpenPNE3_Setup_Guide.txt | 59 +++++++++++++++++++++++----------
 doc/ja/OpenPNE3_Setup_Guide.txt | 59 +++++++++++++++++++++++----------
 2 files changed, 82 insertions(+), 36 deletions(-)

diff --git a/doc/en/OpenPNE3_Setup_Guide.txt b/doc/en/OpenPNE3_Setup_Guide.txt
index 4f37c7bdd..4da4dc7b0 100644
--- a/doc/en/OpenPNE3_Setup_Guide.txt
+++ b/doc/en/OpenPNE3_Setup_Guide.txt
@@ -9,24 +9,47 @@ This document is for OpenPNE 3.8.
 
 OpenPNE 3 should work under the following server environment.
 
-Web Server
-  Apache
-    * The "mod_rewrite" module is available
-PHP
-  PHP version 5.2.11 or later (if you want to use with earlier than PHP 5.2.11, you should build PHP with libxml 2.9+)
-    * The "mbstring" module is available
-    * The "xml" module is available
-    * The "PCRE" module is available (That must be support UTF-8)
-    * The "PDO" module is available (containing DBMS drivers that you want to use)
-    * The "JSON" module is available
-    * The GD library is available from PHP (That must be support JPEG, GIF and PNG)
-    * The "exif" module is available
-    * The "mcrypt" module recommendation
-    * The "APC" (or "APCu") module recommendation
-Database Server
-  MySQL4.1 or later (5.1 or greater recommended)
-  
-  At this time, PostgreSQL and SQLite are not supported (They will be supported in the future)
+MINIMUM REQUIREMENTS
+  Web Server
+    Apache
+      * The "mod_rewrite" module is available
+  PHP
+    PHP version 5.2.11 or later (if you want to use with earlier than PHP 5.2.11, you should build PHP with libxml 2.9+)
+      * The "mbstring" module is available
+      * The "xml" module is available
+      * The "PCRE" module is available (That must be support UTF-8)
+      * The "PDO" module is available (containing DBMS drivers that you want to use)
+      * The "JSON" module is available
+      * The GD library is available from PHP (That must be support JPEG, GIF and PNG)
+      * The "exif" module is available
+      * The "mcrypt" module recommendation
+      * The "APC" module recommendation
+  Database Server
+    MySQL4.1 or later (5.1 or greater recommended)
+
+    At this time, PostgreSQL and SQLite are not supported (They will be supported in the future)
+
+RECOMMENDED SPECS
+  OS
+    Debian 8 (jessie)
+  RECOMMENDED SPECS
+    Apache version 2.4.10 or later (the version in the Debian 8 stable distribution)
+      * The "mod_rewrite" module is available
+  PHP
+    PHP version 5.6.29 or later (the version in the Debian 8 stable distribution)
+      * The "mbstring" module is available
+      * The "xml" module is available
+      * The "PCRE" module is available (That must be support UTF-8)
+      * The "PDO" module is available (containing DBMS drivers that you want to use)
+      * The "JSON" module is available
+      * The GD library is available from PHP (That must be support JPEG, GIF and PNG)
+      * The "exif" module is available
+      * The "mcrypt" module recommendation
+      * The "APC" module recommendation
+  Database Server
+    MySQL 5.5.53 or later (the version in the Debian 8 stable distribution)
+
+OpenPNE 3 supported under the following environment.
 
 Supported Client
   OS
diff --git a/doc/ja/OpenPNE3_Setup_Guide.txt b/doc/ja/OpenPNE3_Setup_Guide.txt
index 636f9253c..d4ff4491f 100644
--- a/doc/ja/OpenPNE3_Setup_Guide.txt
+++ b/doc/ja/OpenPNE3_Setup_Guide.txt
@@ -9,24 +9,47 @@ OpenPNE3.8 セットアップ手順
 
 OpenPNE3 は以下のようなサーバ環境で動作させることを想定しています。
 
-Webサーバ
-  Apache 
-    * mod_rewrite を使用可能
-PHP
-  PHP 5.2.11 以降 (PHP 5.2.11 未満で動作させる場合は libxml 2.9 以降と一緒に PHP をビルドしてください)
-    * PHP の mbstring 拡張モジュールを使用可能
-    * PHP の XML 拡張モジュールを使用可能
-    * PHP の PCRE 拡張モジュールを使用可能 (UTF-8 サポート)
-    * PHP の PDO 拡張モジュールを使用可能 (利用する DBMS のドライバも含む)
-    * PHP の JSON 拡張モジュールを使用可能
-    * PHP から GD ライブラリを使用可能 (JPEG/GIF/PNG サポート)
-    * PHP の exif 拡張モジュールを使用可能
-    * PHP の mcrypt 拡張モジュールの使用を推奨
-    * PHP の APC (または APCu) 拡張モジュールの使用を推奨
-データベースサーバ
-  MySQL4.1以降（5.1 以降を推奨）
-  
-  PostgreSQL, SQLite は現時点で未サポート（将来的にサポート予定）
+動作環境
+  Webサーバ
+    Apache
+      * mod_rewrite を使用可能
+  PHP
+    PHP 5.2.11 以降 (PHP 5.2.11 未満で動作させる場合は libxml 2.9 以降と一緒に PHP をビルドしてください)
+      * PHP の mbstring 拡張モジュールを使用可能
+      * PHP の XML 拡張モジュールを使用可能
+      * PHP の PCRE 拡張モジュールを使用可能 (UTF-8 サポート)
+      * PHP の PDO 拡張モジュールを使用可能 (利用する DBMS のドライバも含む)
+      * PHP の JSON 拡張モジュールを使用可能
+      * PHP から GD ライブラリを使用可能 (JPEG/GIF/PNG サポート)
+      * PHP の exif 拡張モジュールを使用可能
+      * PHP の mcrypt 拡張モジュールの使用を推奨
+      * PHP の APC 拡張モジュールの使用を推奨
+  データベースサーバ
+    MySQL4.1以降（5.1 以降を推奨）
+
+    PostgreSQL, SQLite は現時点で未サポート（将来的にサポート予定）
+
+推奨環境
+  OS
+    Debian 8 (jessie)
+  Webサーバ
+    Apache 2.4.10 以降 (Debian 8 安定版 (stable) ディストリビューションのパッケージ に含まれているバージョン)
+      * mod_rewrite を使用可能
+  PHP
+    PHP 5.6.29 以降 (Debian 8 安定版 (stable) ディストリビューションのパッケージ に含まれているバージョン)
+      * PHP の mbstring 拡張モジュールを使用可能
+      * PHP の XML 拡張モジュールを使用可能
+      * PHP の PCRE 拡張モジュールを使用可能 (UTF-8 サポート)
+      * PHP の PDO 拡張モジュールを使用可能 (利用する DBMS のドライバも含む)
+      * PHP の JSON 拡張モジュールを使用可能
+      * PHP から GD ライブラリを使用可能 (JPEG/GIF/PNG サポート)
+      * PHP の exif 拡張モジュールを使用可能
+      * PHP の mcrypt 拡張モジュールの使用を推奨
+      * PHP の APC 拡張モジュールの使用を推奨
+  データベースサーバ
+    MySQL 5.5.53 以降 (Debian 8 安定版 (stable) ディストリビューションのパッケージ に含まれているバージョン)
+
+OpenPNE3 は以下のような環境での動作をサポートしています。
 
 サポート対象 クライアント
   OS

From a74ec379d289ac1d5ad77aab18d49f0c12ff3723 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Fri, 12 May 2017 14:18:24 +0900
Subject: [PATCH 607/630] I fixed the style by entering a space(refs #4025)

---
 doc/en/OpenPNE3_Setup_Guide.txt |  2 +-
 doc/ja/OpenPNE3_Setup_Guide.txt | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/en/OpenPNE3_Setup_Guide.txt b/doc/en/OpenPNE3_Setup_Guide.txt
index 4da4dc7b0..7b3abe0b2 100644
--- a/doc/en/OpenPNE3_Setup_Guide.txt
+++ b/doc/en/OpenPNE3_Setup_Guide.txt
@@ -25,7 +25,7 @@ MINIMUM REQUIREMENTS
       * The "mcrypt" module recommendation
       * The "APC" module recommendation
   Database Server
-    MySQL4.1 or later (5.1 or greater recommended)
+    MySQL 4.1 or later (5.1 or greater recommended)
 
     At this time, PostgreSQL and SQLite are not supported (They will be supported in the future)
 
diff --git a/doc/ja/OpenPNE3_Setup_Guide.txt b/doc/ja/OpenPNE3_Setup_Guide.txt
index d4ff4491f..c2218061f 100644
--- a/doc/ja/OpenPNE3_Setup_Guide.txt
+++ b/doc/ja/OpenPNE3_Setup_Guide.txt
@@ -25,7 +25,7 @@ OpenPNE3 は以下のようなサーバ環境で動作させることを想定
       * PHP の mcrypt 拡張モジュールの使用を推奨
       * PHP の APC 拡張モジュールの使用を推奨
   データベースサーバ
-    MySQL4.1以降（5.1 以降を推奨）
+    MySQL 4.1 以降（5.1 以降を推奨）
 
     PostgreSQL, SQLite は現時点で未サポート（将来的にサポート予定）
 
@@ -54,18 +54,18 @@ OpenPNE3 は以下のような環境での動作をサポートしています
 サポート対象 クライアント
   OS
     Windows
-      * Microsoftのサポート期間内であるもの
+      * Microsoft のサポート期間内であるもの
     Mac OS (もしくは OS X)
-      * 最新版とその２バージョン前
+      * 最新版とその 2 バージョン前
     Android
-      * 最新版とその２バージョン前
+      * 最新版とその 2 バージョン前
     iOS
-      * 最新版とその２バージョン前
+      * 最新版とその 2 バージョン前
   ブラウザ
-    Internet Explorer(互換モードは無効の状態)
-      * Microsoftのサポート期間内であるもの
+    Internet Explorer (互換モードは無効の状態)
+      * Microsoft のサポート期間内であるもの
     Microsoft Edge
-      * Microsoftのサポート期間内であるもの
+      * Microsoft のサポート期間内であるもの
     Firefox
       * 最新版
     Google Chrome

From 9f9657e919eee4274179432aa408de087ba083a7 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Fri, 12 May 2017 14:21:04 +0900
Subject: [PATCH 608/630] Fix ACP to ACPu (refs #4025)

---
 doc/en/OpenPNE3_Setup_Guide.txt | 2 +-
 doc/ja/OpenPNE3_Setup_Guide.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/en/OpenPNE3_Setup_Guide.txt b/doc/en/OpenPNE3_Setup_Guide.txt
index 7b3abe0b2..63afc3a58 100644
--- a/doc/en/OpenPNE3_Setup_Guide.txt
+++ b/doc/en/OpenPNE3_Setup_Guide.txt
@@ -45,7 +45,7 @@ RECOMMENDED SPECS
       * The GD library is available from PHP (That must be support JPEG, GIF and PNG)
       * The "exif" module is available
       * The "mcrypt" module recommendation
-      * The "APC" module recommendation
+      * The "APCu" module recommendation
   Database Server
     MySQL 5.5.53 or later (the version in the Debian 8 stable distribution)
 
diff --git a/doc/ja/OpenPNE3_Setup_Guide.txt b/doc/ja/OpenPNE3_Setup_Guide.txt
index c2218061f..80f2f7388 100644
--- a/doc/ja/OpenPNE3_Setup_Guide.txt
+++ b/doc/ja/OpenPNE3_Setup_Guide.txt
@@ -45,7 +45,7 @@ OpenPNE3 は以下のようなサーバ環境で動作させることを想定
       * PHP から GD ライブラリを使用可能 (JPEG/GIF/PNG サポート)
       * PHP の exif 拡張モジュールを使用可能
       * PHP の mcrypt 拡張モジュールの使用を推奨
-      * PHP の APC 拡張モジュールの使用を推奨
+      * PHP の APCu 拡張モジュールの使用を推奨
   データベースサーバ
     MySQL 5.5.53 以降 (Debian 8 安定版 (stable) ディストリビューションのパッケージ に含まれているバージョン)
 

From 38ac21bad21053b3bd0b1eb183ff1c636da11c5b Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Fri, 12 May 2017 14:23:19 +0900
Subject: [PATCH 609/630] Change recommended version of PHP (refs #4025)

---
 doc/en/OpenPNE3_Setup_Guide.txt | 2 +-
 doc/ja/OpenPNE3_Setup_Guide.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/en/OpenPNE3_Setup_Guide.txt b/doc/en/OpenPNE3_Setup_Guide.txt
index 63afc3a58..489bd47be 100644
--- a/doc/en/OpenPNE3_Setup_Guide.txt
+++ b/doc/en/OpenPNE3_Setup_Guide.txt
@@ -36,7 +36,7 @@ RECOMMENDED SPECS
     Apache version 2.4.10 or later (the version in the Debian 8 stable distribution)
       * The "mod_rewrite" module is available
   PHP
-    PHP version 5.6.29 or later (the version in the Debian 8 stable distribution)
+    PHP version 7 or later (the version in the Debian 8 stable distribution)
       * The "mbstring" module is available
       * The "xml" module is available
       * The "PCRE" module is available (That must be support UTF-8)
diff --git a/doc/ja/OpenPNE3_Setup_Guide.txt b/doc/ja/OpenPNE3_Setup_Guide.txt
index 80f2f7388..f278a19b2 100644
--- a/doc/ja/OpenPNE3_Setup_Guide.txt
+++ b/doc/ja/OpenPNE3_Setup_Guide.txt
@@ -36,7 +36,7 @@ OpenPNE3 は以下のようなサーバ環境で動作させることを想定
     Apache 2.4.10 以降 (Debian 8 安定版 (stable) ディストリビューションのパッケージ に含まれているバージョン)
       * mod_rewrite を使用可能
   PHP
-    PHP 5.6.29 以降 (Debian 8 安定版 (stable) ディストリビューションのパッケージ に含まれているバージョン)
+    PHP 7 以降 (Debian 8 安定版 (stable) ディストリビューションのパッケージ に含まれているバージョン)
       * PHP の mbstring 拡張モジュールを使用可能
       * PHP の XML 拡張モジュールを使用可能
       * PHP の PCRE 拡張モジュールを使用可能 (UTF-8 サポート)

From f7752c57d6ed2fee40c665c9f89bb77f6daca755 Mon Sep 17 00:00:00 2001
From: Shinichi Urabe <urabe@tejimaya.com>
Date: Tue, 16 May 2017 18:02:07 +0900
Subject: [PATCH 610/630] (refs #3603) Fixed so that installation can be done
 even if it can not connect to channel server "pear.symfony-project.com",
 "plugins.symfony-project.org".

---
 lib/plugin/opPluginManager.class.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/plugin/opPluginManager.class.php b/lib/plugin/opPluginManager.class.php
index 9bbbe78a4..bcaf196cc 100644
--- a/lib/plugin/opPluginManager.class.php
+++ b/lib/plugin/opPluginManager.class.php
@@ -54,6 +54,16 @@ public function __construct(sfEventDispatcher $dispatcher, sfPearEnvironment $en
     catch (sfPluginException $e) {}
   }
 
+  /**
+   * @see sfSymfonyPluginManager::configure()
+   */
+  public function configure()
+  {
+    // register callbacks to manage web content
+    $this->dispatcher->connect('plugin.post_install',  array($this, 'listenToPluginPostInstall'));
+    $this->dispatcher->connect('plugin.post_uninstall', array($this, 'listenToPluginPostUninstall'));
+  }
+
   public function getChannel()
   {
     return $this->getEnvironment()->getRegistry()->getChannel($this->channel);

From 8b60a6a4d449c0c99652376dbc6047900e8ff7a9 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Thu, 18 May 2017 15:09:55 +0900
Subject: [PATCH 611/630] Fixed the part where 'RECOMMENDED SPECS' was
 erroneously written (refs #4025)

---
 doc/en/OpenPNE3_Setup_Guide.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/en/OpenPNE3_Setup_Guide.txt b/doc/en/OpenPNE3_Setup_Guide.txt
index 489bd47be..512619f1a 100644
--- a/doc/en/OpenPNE3_Setup_Guide.txt
+++ b/doc/en/OpenPNE3_Setup_Guide.txt
@@ -32,7 +32,7 @@ MINIMUM REQUIREMENTS
 RECOMMENDED SPECS
   OS
     Debian 8 (jessie)
-  RECOMMENDED SPECS
+  Web Server
     Apache version 2.4.10 or later (the version in the Debian 8 stable distribution)
       * The "mod_rewrite" module is available
   PHP

From 4d434a5ee1c588ad4cd661855b027af3d63bb4ba Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Thu, 18 May 2017 15:15:35 +0900
Subject: [PATCH 612/630] 'They will be supported in the future' part also
 added to RECOMMENDED SPECS (refs #4025)

---
 doc/en/OpenPNE3_Setup_Guide.txt | 2 ++
 doc/ja/OpenPNE3_Setup_Guide.txt | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/doc/en/OpenPNE3_Setup_Guide.txt b/doc/en/OpenPNE3_Setup_Guide.txt
index 512619f1a..9fb56f946 100644
--- a/doc/en/OpenPNE3_Setup_Guide.txt
+++ b/doc/en/OpenPNE3_Setup_Guide.txt
@@ -49,6 +49,8 @@ RECOMMENDED SPECS
   Database Server
     MySQL 5.5.53 or later (the version in the Debian 8 stable distribution)
 
+    At this time, PostgreSQL and SQLite are not supported (They will be supported in the future)
+
 OpenPNE 3 supported under the following environment.
 
 Supported Client
diff --git a/doc/ja/OpenPNE3_Setup_Guide.txt b/doc/ja/OpenPNE3_Setup_Guide.txt
index f278a19b2..3a853f3d6 100644
--- a/doc/ja/OpenPNE3_Setup_Guide.txt
+++ b/doc/ja/OpenPNE3_Setup_Guide.txt
@@ -49,6 +49,8 @@ OpenPNE3 は以下のようなサーバ環境で動作させることを想定
   データベースサーバ
     MySQL 5.5.53 以降 (Debian 8 安定版 (stable) ディストリビューションのパッケージ に含まれているバージョン)
 
+    PostgreSQL, SQLite は現時点で未サポート（将来的にサポート予定）
+
 OpenPNE3 は以下のような環境での動作をサポートしています。
 
 サポート対象 クライアント

From ee777d708a0a74198f9cee4613b7f0257013edb5 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Thu, 18 May 2017 16:22:11 +0900
Subject: [PATCH 613/630] Changed APC description of MINIMUM REQUIREMENTS (refs
 #4025)

---
 doc/en/OpenPNE3_Setup_Guide.txt | 2 +-
 doc/ja/OpenPNE3_Setup_Guide.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/en/OpenPNE3_Setup_Guide.txt b/doc/en/OpenPNE3_Setup_Guide.txt
index 9fb56f946..42264be23 100644
--- a/doc/en/OpenPNE3_Setup_Guide.txt
+++ b/doc/en/OpenPNE3_Setup_Guide.txt
@@ -23,7 +23,7 @@ MINIMUM REQUIREMENTS
       * The GD library is available from PHP (That must be support JPEG, GIF and PNG)
       * The "exif" module is available
       * The "mcrypt" module recommendation
-      * The "APC" module recommendation
+      * The "APC" (or "APCu") module recommendation
   Database Server
     MySQL 4.1 or later (5.1 or greater recommended)
 
diff --git a/doc/ja/OpenPNE3_Setup_Guide.txt b/doc/ja/OpenPNE3_Setup_Guide.txt
index 3a853f3d6..eecab82f4 100644
--- a/doc/ja/OpenPNE3_Setup_Guide.txt
+++ b/doc/ja/OpenPNE3_Setup_Guide.txt
@@ -23,7 +23,7 @@ OpenPNE3 は以下のようなサーバ環境で動作させることを想定
       * PHP から GD ライブラリを使用可能 (JPEG/GIF/PNG サポート)
       * PHP の exif 拡張モジュールを使用可能
       * PHP の mcrypt 拡張モジュールの使用を推奨
-      * PHP の APC 拡張モジュールの使用を推奨
+      * PHP の APC (もしくは APCu) 拡張モジュールの使用を推奨
   データベースサーバ
     MySQL 4.1 以降（5.1 以降を推奨）
 

From 4bc8a1ee9b06e3898389833c9b24a55ecdf1341b Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Fri, 2 Jun 2017 16:52:05 +0900
Subject: [PATCH 614/630] prevent double submission on member/registerInput
 form (fixes #3150)

---
 .../member/templates/registerInputSuccess.php |  7 ++++++
 web/js/util.js                                |  3 +++
 web/js/util.js.src                            | 22 +++++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/apps/pc_frontend/modules/member/templates/registerInputSuccess.php b/apps/pc_frontend/modules/member/templates/registerInputSuccess.php
index 720fc706b..295b4c58d 100644
--- a/apps/pc_frontend/modules/member/templates/registerInputSuccess.php
+++ b/apps/pc_frontend/modules/member/templates/registerInputSuccess.php
@@ -6,3 +6,10 @@
 );
 op_include_form('RegisterForm', $form, $options);
 ?>
+
+<script type="text/javascript">
+//<![CDATA[
+var formElement = document.querySelector('#RegisterForm form');
+preventDoubleSubmission(formElement);
+//]]>
+</script>
diff --git a/web/js/util.js b/web/js/util.js
index 2bd5c3870..d569a683e 100644
--- a/web/js/util.js
+++ b/web/js/util.js
@@ -30,3 +30,6 @@ return value;}};function pne_url2a(url)
 if(!urlstr)
 {urlstr=url;}
 document.write('<a href="'+url+'" target="_blank">'+urlstr+'</a>');}
+function preventDoubleSubmission(form)
+{var submitted=false;form.addEventListener('submit',function(ev){if(submitted){ev.preventDefault();return;}
+submitted=true;var submitButtons=form.querySelectorAll('input[type="submit"],button[type="submit"]');for(var i=0;i<submitButtons.length;i++){submitButtons[i].disabled=!0;}})}
diff --git a/web/js/util.js.src b/web/js/util.js.src
index 763b58189..ed3a018c9 100644
--- a/web/js/util.js.src
+++ b/web/js/util.js.src
@@ -149,3 +149,25 @@ function pne_url2a(url)
 
   document.write('<a href="'+url+'" target="_blank">'+urlstr+'</a>');
 }
+
+/**
+ * Prevent double submission of forms (eg. double click on submit button)
+ *
+ * @param HTMLFormElement form
+ */
+function preventDoubleSubmission(form)
+{
+  var submitted = false;
+  form.addEventListener('submit', function(ev) {
+    if (submitted) {
+      ev.preventDefault();
+      return;
+    }
+
+    submitted = true;
+    var submitButtons = form.querySelectorAll('input[type="submit"],button[type="submit"]');
+    for (var i = 0; i < submitButtons.length; i++) {
+      submitButtons[i].disabled = true;
+    }
+  });
+}

From 6d7b29aa5545b96b3a17d3d4f8844f618e59f929 Mon Sep 17 00:00:00 2001
From: Shinichi Urabe <urabe@tejimaya.com>
Date: Tue, 27 Jun 2017 16:25:02 +0900
Subject: [PATCH 615/630] (refs #4183) The value "320px" for key "width" was
 truncated to its numeric prefix.

---
 apps/pc_frontend/templates/smtLayoutGroup.php  | 2 +-
 apps/pc_frontend/templates/smtLayoutHome.php   | 2 +-
 apps/pc_frontend/templates/smtLayoutMember.php | 2 +-
 apps/pc_frontend/templates/smtLayoutSns.php    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/pc_frontend/templates/smtLayoutGroup.php b/apps/pc_frontend/templates/smtLayoutGroup.php
index e02b94a00..765c8e99c 100644
--- a/apps/pc_frontend/templates/smtLayoutGroup.php
+++ b/apps/pc_frontend/templates/smtLayoutGroup.php
@@ -10,7 +10,7 @@
 <?php op_smt_use_stylesheet('bootstrap') ?>
 <?php op_smt_use_stylesheet('smt_main') ?>
 <?php op_smt_include_stylesheets() ?>
-<meta name="viewport" content="width=320px,user-scalable=no" />
+<meta name="viewport" content="width=320,user-scalable=no" />
 <?php if (opConfig::get('enable_jsonapi') && opToolkit::isSecurePage()): ?>
 <?php
 $jsonData = array(
diff --git a/apps/pc_frontend/templates/smtLayoutHome.php b/apps/pc_frontend/templates/smtLayoutHome.php
index becdb3ade..c441d2817 100644
--- a/apps/pc_frontend/templates/smtLayoutHome.php
+++ b/apps/pc_frontend/templates/smtLayoutHome.php
@@ -10,7 +10,7 @@
 <?php op_smt_use_stylesheet('bootstrap') ?>
 <?php op_smt_use_stylesheet('smt_main') ?>
 <?php op_smt_include_stylesheets() ?>
-<meta name="viewport" content="width=320px,user-scalable=no" />
+<meta name="viewport" content="width=320,user-scalable=no" />
 <?php if (opConfig::get('enable_jsonapi') && opToolkit::isSecurePage()): ?>
 <?php
 $jsonData = array(
diff --git a/apps/pc_frontend/templates/smtLayoutMember.php b/apps/pc_frontend/templates/smtLayoutMember.php
index 414fe3ca0..3b0c77357 100644
--- a/apps/pc_frontend/templates/smtLayoutMember.php
+++ b/apps/pc_frontend/templates/smtLayoutMember.php
@@ -10,7 +10,7 @@
 <?php op_smt_use_stylesheet('bootstrap') ?>
 <?php op_smt_use_stylesheet('smt_main') ?>
 <?php op_smt_include_stylesheets() ?>
-<meta name="viewport" content="width=320px,user-scalable=no" />
+<meta name="viewport" content="width=320,user-scalable=no" />
 <?php if (opConfig::get('enable_jsonapi') && opToolkit::isSecurePage()): ?>
 <?php
 $jsonData = array(
diff --git a/apps/pc_frontend/templates/smtLayoutSns.php b/apps/pc_frontend/templates/smtLayoutSns.php
index 9326511ae..af0dd156a 100644
--- a/apps/pc_frontend/templates/smtLayoutSns.php
+++ b/apps/pc_frontend/templates/smtLayoutSns.php
@@ -10,7 +10,7 @@
 <?php op_smt_use_stylesheet('bootstrap') ?>
 <?php op_smt_use_stylesheet('smt_main') ?>
 <?php op_smt_include_stylesheets() ?>
-<meta name="viewport" content="width=320px,user-scalable=no" />
+<meta name="viewport" content="width=320,user-scalable=no" />
 <?php if (opConfig::get('enable_jsonapi') && opToolkit::isSecurePage()): ?>
 <?php
 $jsonData = array(

From 92f04935b177fbb3038e42a20f455872b75144dd Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Thu, 5 Jan 2017 16:51:33 +0900
Subject: [PATCH 616/630] =?UTF-8?q?(fixed=20#2909)=20=E3=83=A1=E3=83=BC?=
 =?UTF-8?q?=E3=83=AB=E9=80=9A=E7=9F=A5=E3=83=86=E3=83=B3=E3=83=97=E3=83=AC?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=E8=A8=AD=E5=AE=9A=E3=81=AE=E3=82=BF=E3=82=A4?=
 =?UTF-8?q?=E3=83=88=E3=83=AB=E3=81=AE=E6=96=87=E5=AD=97=E6=95=B0=E3=83=81?=
 =?UTF-8?q?=E3=82=A7=E3=83=83=E3=82=AF=E3=82=92=E8=A1=8C=E3=81=86=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/form/doctrine/NotificationMailTranslationForm.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/form/doctrine/NotificationMailTranslationForm.class.php b/lib/form/doctrine/NotificationMailTranslationForm.class.php
index 95454420c..a612206fd 100644
--- a/lib/form/doctrine/NotificationMailTranslationForm.class.php
+++ b/lib/form/doctrine/NotificationMailTranslationForm.class.php
@@ -13,7 +13,7 @@ public function configure()
   {
     unset($this['lang'], $this['id']);
 
-    $this->setValidator('title', new sfValidatorString(array('required' => false)));
+    $this->setValidator('title', new sfValidatorString(array('required' => false, 'max_length' => 64)));
     $this->setValidator('template', new sfValidatorString(array('required' => false)));
   }
 

From 2d3c8fa93c5077de923bffeab6a3799c87d06f1f Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Wed, 21 Dec 2016 14:29:41 +0900
Subject: [PATCH 617/630] =?UTF-8?q?(fixed=20#4072)=20=E6=9C=AA=E3=83=AD?=
 =?UTF-8?q?=E3=82=B0=E3=82=A4=E3=83=B3=E7=8A=B6=E6=85=8B=E3=81=A7=20/membe?=
 =?UTF-8?q?r/profile=20=E3=81=AB=E3=82=A2=E3=82=AF=E3=82=BB=E3=82=B9?=
 =?UTF-8?q?=E3=81=97=E3=81=9F=E5=A0=B4=E5=90=88=E3=81=AB=E3=83=AD=E3=82=B0?=
 =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=95=E3=82=A9=E3=83=BC=E3=83=A0=E3=82=92?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/action/opMemberAction.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/action/opMemberAction.class.php b/lib/action/opMemberAction.class.php
index a82d42471..104d0eb33 100644
--- a/lib/action/opMemberAction.class.php
+++ b/lib/action/opMemberAction.class.php
@@ -232,8 +232,12 @@ public function executeProfile(opWebRequest $request)
       {
         $this->redirect('member/profile?id='.$id);
       }
-      $this->forward404Unless($id);
       $this->member = $this->getUser()->getMember();
+      if (!$this->getUser()->isSNSMember())
+      {
+        $this->forwardUnless($this->member && $this->member->id, sfConfig::get('sf_login_module'), sfConfig::get('sf_login_action'));
+      }
+      $this->forward404Unless($id);
     }
     else
     {

From ac145e394bc0bff613f9a836fd8e721c69248adb Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Wed, 21 Dec 2016 18:07:19 +0900
Subject: [PATCH 618/630] =?UTF-8?q?(fixed=20#4072)=20=E5=86=97=E9=95=B7?=
 =?UTF-8?q?=E3=81=AA=E5=87=A6=E7=90=86=E3=82=92=E5=89=8A=E9=99=A4=E3=81=97?=
 =?UTF-8?q?=E3=80=81forwardUnless=20=E3=81=AB=E3=82=88=E3=82=8B=E5=87=A6?=
 =?UTF-8?q?=E7=90=86=E3=81=AE=E3=81=BF=E3=81=A8=E3=81=97=E3=81=BE=E3=81=97?=
 =?UTF-8?q?=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/action/opMemberAction.class.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/lib/action/opMemberAction.class.php b/lib/action/opMemberAction.class.php
index 104d0eb33..749cbfeac 100644
--- a/lib/action/opMemberAction.class.php
+++ b/lib/action/opMemberAction.class.php
@@ -232,12 +232,8 @@ public function executeProfile(opWebRequest $request)
       {
         $this->redirect('member/profile?id='.$id);
       }
+      $this->forwardUnless($id, sfConfig::get('sf_login_module'), sfConfig::get('sf_login_action'));
       $this->member = $this->getUser()->getMember();
-      if (!$this->getUser()->isSNSMember())
-      {
-        $this->forwardUnless($this->member && $this->member->id, sfConfig::get('sf_login_module'), sfConfig::get('sf_login_action'));
-      }
-      $this->forward404Unless($id);
     }
     else
     {

From 0ed520fd73636f0001851ba936f741b30dc9434a Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Wed, 21 Dec 2016 18:23:08 +0900
Subject: [PATCH 619/630] =?UTF-8?q?(fixed=20#4072)=20$id=20=E3=81=A7?=
 =?UTF-8?q?=E5=88=A4=E5=AE=9A=E3=81=99=E3=82=8B=E3=81=AE=E3=81=AF=E3=82=8F?=
 =?UTF-8?q?=E3=81=8B=E3=82=8A=E3=81=A5=E3=82=89=E3=81=84=E3=81=9F=E3=82=81?=
 =?UTF-8?q?=E3=80=81=E3=83=AD=E3=82=B0=E3=82=A4=E3=83=B3=E7=8A=B6=E6=85=8B?=
 =?UTF-8?q?=E3=81=A7=E5=88=A4=E5=AE=9A=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/action/opMemberAction.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/action/opMemberAction.class.php b/lib/action/opMemberAction.class.php
index 749cbfeac..33af26663 100644
--- a/lib/action/opMemberAction.class.php
+++ b/lib/action/opMemberAction.class.php
@@ -232,7 +232,7 @@ public function executeProfile(opWebRequest $request)
       {
         $this->redirect('member/profile?id='.$id);
       }
-      $this->forwardUnless($id, sfConfig::get('sf_login_module'), sfConfig::get('sf_login_action'));
+      $this->forwardUnless($this->getUser()->isSNSMember(), sfConfig::get('sf_login_module'), sfConfig::get('sf_login_action'));
       $this->member = $this->getUser()->getMember();
     }
     else

From 7060d6f556d483f0bfb30b9431d0e163041e962d Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Thu, 5 Jan 2017 18:48:07 +0900
Subject: [PATCH 620/630] =?UTF-8?q?(fixed=20#4104)=20=E3=83=A1=E3=83=BC?=
 =?UTF-8?q?=E3=83=AB=E9=80=9A=E7=9F=A5=E3=83=86=E3=83=B3=E3=83=97=E3=83=AC?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=E8=A8=AD=E5=AE=9A=20=E3=81=AE=E3=82=A8?=
 =?UTF-8?q?=E3=83=A9=E3=83=BC=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E6=96=B9=E6=B3=95=E3=82=92=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/pc_backend/modules/mail/actions/actions.class.php     | 1 -
 apps/pc_backend/modules/mail/templates/templateSuccess.php | 6 +++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/pc_backend/modules/mail/actions/actions.class.php b/apps/pc_backend/modules/mail/actions/actions.class.php
index f989b058f..f550b4493 100644
--- a/apps/pc_backend/modules/mail/actions/actions.class.php
+++ b/apps/pc_backend/modules/mail/actions/actions.class.php
@@ -65,7 +65,6 @@ public function executeTemplate(sfWebRequest $request)
         $this->getUser()->setFlash('notice', 'Saved.');
         $this->redirect('@mail_template_specified?name='.$this->name);
       }
-      $this->getUser()->setFlash('error', (string)$this->form->getErrorSchema(), false);
     }
   }
 
diff --git a/apps/pc_backend/modules/mail/templates/templateSuccess.php b/apps/pc_backend/modules/mail/templates/templateSuccess.php
index 4ee34dd68..3dec25c32 100644
--- a/apps/pc_backend/modules/mail/templates/templateSuccess.php
+++ b/apps/pc_backend/modules/mail/templates/templateSuccess.php
@@ -70,10 +70,14 @@
 <h3><?php echo __($rawConfig[$_currentTarget][$_currentKey]['caption']) ?></h3>
 
 <?php echo $form->renderFormTag(url_for('@mail_template_specified?name='.$name), array('method' => 'post')); ?>
+<?php echo $form->renderGlobalErrors() ?>
 <?php echo $form->renderHiddenFields(); ?>
 <?php if (isset($form['title'])): ?>
-<?php echo $form['title']->renderLabel() ?> <?php echo $form['title']->render(array('class' => 'title')) ?>
+<?php echo $form['title']->renderLabel() ?>
+<?php echo $form['title']->renderError() ?>
+<?php echo $form['title']->render(array('class' => 'title')) ?>
 <?php endif; ?>
+<?php echo $form['template']->renderError() ?>
 <?php echo $form['template']->render(array('rows' => 30, 'cols' => 72)) ?>
 
 <input type="submit" value="<?php echo __('Save') ?>">

From eb39278b70cfdb3d737c3b185ecf9954ca0b67a8 Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Thu, 5 Jan 2017 19:53:19 +0900
Subject: [PATCH 621/630] =?UTF-8?q?(fixed=20#4105)=20=E3=82=B3=E3=83=9F?=
 =?UTF-8?q?=E3=83=A5=E3=83=8B=E3=83=86=E3=82=A3=E3=82=AB=E3=83=86=E3=82=B4?=
 =?UTF-8?q?=E3=83=AA=E8=A8=AD=E5=AE=9A=20=E3=82=AB=E3=83=86=E3=82=B4?=
 =?UTF-8?q?=E3=83=AA=E5=90=8D=E7=A7=B0=E5=A4=89=E6=9B=B4=E6=99=82=E3=81=AE?=
 =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC?=
 =?UTF-8?q?=E3=82=B8=E3=81=8C=E7=BF=BB=E8=A8=B3=E3=81=95=E3=82=8C=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/pc_backend/modules/community/actions/actions.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/pc_backend/modules/community/actions/actions.class.php b/apps/pc_backend/modules/community/actions/actions.class.php
index 1bab63cc9..cd6f96e19 100644
--- a/apps/pc_backend/modules/community/actions/actions.class.php
+++ b/apps/pc_backend/modules/community/actions/actions.class.php
@@ -203,7 +203,8 @@ public function executeCategoryEdit(sfWebRequest $request)
       }
       else
       {
-        $this->getUser()->setFlash('error', $form['name']->getError()->getMessage());
+        $i18n = $this->getContext()->getI18N();
+        $this->getUser()->setFlash('error', $i18n->__($form->getWidgetSchema()->getLabel('name'), null, 'form_community').':'.$i18n->__($form['name']->getError()->getMessageFormat(), $form['name']->getError()->getArguments()));
       }
     }
     $this->redirect('community/categoryList');

From c3db3ea1cb7656c8868e894016d5a26ae6e4cfd7 Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Tue, 4 Jul 2017 11:15:56 +0900
Subject: [PATCH 622/630] =?UTF-8?q?(fixed=20#4105-6)=20->getWidgetSchema()?=
 =?UTF-8?q?->getLabel('name')=20=E3=82=92=20['name']->renderLabelName()=20?=
 =?UTF-8?q?=E3=81=AB=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/pc_backend/modules/community/actions/actions.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/pc_backend/modules/community/actions/actions.class.php b/apps/pc_backend/modules/community/actions/actions.class.php
index cd6f96e19..3722e9b8b 100644
--- a/apps/pc_backend/modules/community/actions/actions.class.php
+++ b/apps/pc_backend/modules/community/actions/actions.class.php
@@ -204,7 +204,7 @@ public function executeCategoryEdit(sfWebRequest $request)
       else
       {
         $i18n = $this->getContext()->getI18N();
-        $this->getUser()->setFlash('error', $i18n->__($form->getWidgetSchema()->getLabel('name'), null, 'form_community').':'.$i18n->__($form['name']->getError()->getMessageFormat(), $form['name']->getError()->getArguments()));
+        $this->getUser()->setFlash('error', $i18n->__($form['name']->renderLabelName(), null, 'form_community').':'.$i18n->__($form['name']->getError()->getMessageFormat(), $form['name']->getError()->getArguments()));
       }
     }
     $this->redirect('community/categoryList');

From 3ad6330d75595a43a8bcb70945186aaa3a3663c4 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Fri, 1 Sep 2017 14:48:25 +0900
Subject: [PATCH 623/630] use opWebRequest for api application (fixes #3252)

---
 apps/api/config/factories.yml | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/apps/api/config/factories.yml b/apps/api/config/factories.yml
index 1e872a86e..aea47a0be 100644
--- a/apps/api/config/factories.yml
+++ b/apps/api/config/factories.yml
@@ -52,23 +52,10 @@ all:
 #all:
 #  controller:
 #    class: sfFrontWebController
-#
-#  request:
-#    class: sfWebRequest
-#    param:
-#      logging:           %SF_LOGGING_ENABLED%
-#      path_info_array:   SERVER
-#      path_info_key:     PATH_INFO
-#      relative_url_root: ~
-#      formats:
-#        txt:  text/plain
-#        js:   [application/javascript, application/x-javascript, text/javascript]
-#        css:  text/css
-#        json: [application/json, application/x-json]
-#        xml:  [text/xml, application/xml, application/x-xml]
-#        rdf:  application/rdf+xml
-#        atom: application/atom+xml
-#
+
+  request:
+    class: opWebRequest
+
 #  response:
 #    class: sfWebResponse
 #    param:

From 5406b6bc2a6d589b0cb1fe4c50a4fdaae231021d Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Mon, 4 Sep 2017 14:31:33 +0900
Subject: [PATCH 624/630] =?UTF-8?q?(fixed=20#4143-15)=20=E4=B8=8D=E8=A6=81?=
 =?UTF-8?q?=E3=81=AA=E5=A4=89=E6=95=B0=E3=82=92=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mobile_frontend/modules/member/templates/profileSuccess.php | 1 -
 apps/pc_frontend/modules/member/templates/_profileListBox.php   | 2 --
 2 files changed, 3 deletions(-)

diff --git a/apps/mobile_frontend/modules/member/templates/profileSuccess.php b/apps/mobile_frontend/modules/member/templates/profileSuccess.php
index 3d44346e9..3c0d7527c 100644
--- a/apps/mobile_frontend/modules/member/templates/profileSuccess.php
+++ b/apps/mobile_frontend/modules/member/templates/profileSuccess.php
@@ -84,7 +84,6 @@
 
   if ($member->getId() == $sf_user->getMemberId())
   {
-    $i18n = sfContext::getInstance()->getI18N();
     $termMyFriend = Doctrine::getTable('SnsTerm')->get('my_friend');
     $terms = array('%my_friend%' => $termMyFriend->pluralize()->titleize());
 
diff --git a/apps/pc_frontend/modules/member/templates/_profileListBox.php b/apps/pc_frontend/modules/member/templates/_profileListBox.php
index e7b498e92..d9a1b8216 100644
--- a/apps/pc_frontend/modules/member/templates/_profileListBox.php
+++ b/apps/pc_frontend/modules/member/templates/_profileListBox.php
@@ -11,7 +11,6 @@
   $ageValue = __('%1% years old', array('%1%' => $member->getAge()));
   if ($member->getConfig('age_public_flag') == ProfileTable::PUBLIC_FLAG_FRIEND)
   {
-    $i18n = sfContext::getInstance()->getI18N();
     $termMyFriend = Doctrine::getTable('SnsTerm')->get('my_friend');
     $terms = array('%my_friend%' => $termMyFriend->pluralize()->titleize());
 
@@ -57,7 +56,6 @@
 
   if ($member->getId() == $sf_user->getMemberId())
   {
-    $i18n = sfContext::getInstance()->getI18N();
     $termMyFriend = Doctrine::getTable('SnsTerm')->get('my_friend');
     $terms = array('%my_friend%' => $termMyFriend->pluralize()->titleize());
 

From c3c761cf04dd485995141ad7de1d5696959cd48d Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Mon, 4 Sep 2017 16:36:15 +0900
Subject: [PATCH 625/630] =?UTF-8?q?(fixed=20#4105-10)=20=E3=82=A8=E3=83=A9?=
 =?UTF-8?q?=E3=83=BC=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA=E6=99=82=E3=81=AE=E9=A0=85=E7=9B=AE=E5=90=8D=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA=E6=96=B9=E6=B3=95=E3=82=92=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/pc_backend/modules/community/actions/actions.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/pc_backend/modules/community/actions/actions.class.php b/apps/pc_backend/modules/community/actions/actions.class.php
index 3722e9b8b..fb0ccd610 100644
--- a/apps/pc_backend/modules/community/actions/actions.class.php
+++ b/apps/pc_backend/modules/community/actions/actions.class.php
@@ -204,7 +204,7 @@ public function executeCategoryEdit(sfWebRequest $request)
       else
       {
         $i18n = $this->getContext()->getI18N();
-        $this->getUser()->setFlash('error', $i18n->__($form['name']->renderLabelName(), null, 'form_community').':'.$i18n->__($form['name']->getError()->getMessageFormat(), $form['name']->getError()->getArguments()));
+        $this->getUser()->setFlash('error', $form['name']->renderLabelName().':'.$i18n->__($form['name']->getError()->getMessageFormat(), $form['name']->getError()->getArguments()));
       }
     }
     $this->redirect('community/categoryList');

From bef85a7119eb62babafba88f0e8ff9dcaf53789b Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Mon, 27 Feb 2017 19:22:40 +0900
Subject: [PATCH 626/630] Revert "fixed non-array (#1759)" (refs #4168)

This reverts commit 9b2f55d84ecb1e0cc2aa47a77b9b42f0582799f5.
---
 lib/i18n/opI18N.class.php | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/lib/i18n/opI18N.class.php b/lib/i18n/opI18N.class.php
index 192b2a7d9..516e40510 100644
--- a/lib/i18n/opI18N.class.php
+++ b/lib/i18n/opI18N.class.php
@@ -108,6 +108,14 @@ public function setMessageSource($dirs, $culture = null)
 
   public function __($string, $args = array(), $catalogue = 'messages')
   {
+    foreach ($args as $k => $v)
+    {
+      if ($v instanceof SnsTerm)
+      {
+        $args[$k] = (string)$v;
+      }
+    }
+
     if (empty($this->parsed[$string]))
     {
       $this->parsed[$string] = array();
@@ -135,19 +143,6 @@ public function __($string, $args = array(), $catalogue = 'messages')
       }
     }
 
-    $parsedString = $this->parsed[$string];
-    if (is_array($args))
-    {
-      foreach ($args as $k => $v)
-      {
-        if ($v instanceof SnsTerm)
-        {
-          $args[$k] = (string)$v;
-        }
-      }
-      $parsedString = array_merge($parsedString, $args);
-    }
-
-    return parent::__($string, $parsedString, $catalogue);
+    return parent::__($string, array_merge($this->parsed[$string], $args), $catalogue);
   }
 }

From b6263b33698c73a09efd3a9602cc5725bc47a768 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <yoichi.kimura@tejimaya.com>
Date: Mon, 27 Feb 2017 19:28:45 +0900
Subject: [PATCH 627/630] allow passing null to opI18N::__() method (fixes
 #4168)

---
 lib/i18n/opI18N.class.php     |  5 +++++
 test/unit/i18n/opI18nTest.php | 25 +++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 test/unit/i18n/opI18nTest.php

diff --git a/lib/i18n/opI18N.class.php b/lib/i18n/opI18N.class.php
index 516e40510..5b7520b95 100644
--- a/lib/i18n/opI18N.class.php
+++ b/lib/i18n/opI18N.class.php
@@ -108,6 +108,11 @@ public function setMessageSource($dirs, $culture = null)
 
   public function __($string, $args = array(), $catalogue = 'messages')
   {
+    if (null === $args)
+    {
+      $args = array();
+    }
+
     foreach ($args as $k => $v)
     {
       if ($v instanceof SnsTerm)
diff --git a/test/unit/i18n/opI18nTest.php b/test/unit/i18n/opI18nTest.php
new file mode 100644
index 000000000..ab326c4fe
--- /dev/null
+++ b/test/unit/i18n/opI18nTest.php
@@ -0,0 +1,25 @@
+<?php
+
+require_once __DIR__.'/../../bootstrap/unit.php';
+require_once __DIR__.'/../../bootstrap/database.php';
+
+$t = new lime_test();
+
+$t->diag('opI18N::__()');
+
+$i18n = new opI18N($configuration, new sfNoCache(), array('culture' => 'en'));
+
+$t->is($i18n->__('@@ %my_friend% @@'), '@@ my friend @@');
+$t->is($i18n->__('@@ %My_friend% @@'), '@@ My friend @@');
+
+$t->info('#1759: passing null to parameters');
+
+$t->is($i18n->__('@@ %my_friend% @@', null), '@@ my friend @@');
+
+$t->info('#4168: passing SnsTerm instance to parameters');
+
+// purge cache in opI18N::$parsed
+$i18n = new opI18N($configuration, new sfNoCache(), array('culture' => 'en'));
+
+$term = Doctrine_Core::getTable('SnsTerm')->get('my_friend');
+$t->is($i18n->__('@@ %my_friend% @@', array('%my_friend%' => $term->titleize())), '@@ My Friend @@');

From 0658a7bfaecd3317dc9a5b2a1f96295f210d60ea Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Wed, 20 Dec 2017 18:58:08 +0900
Subject: [PATCH 628/630] version 3.9.0

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 5f524b8f2..3c033ced5 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.9.0-dev');
+  define('OPENPNE_VERSION', '3.9.0');
 }

From e422b988372a173ba20b913dd9af5052624ebd72 Mon Sep 17 00:00:00 2001
From: nishizoe <nishizoe@tejimaya.com>
Date: Wed, 20 Dec 2017 19:01:35 +0900
Subject: [PATCH 629/630] started to development of OpenPNE 3.9.1

---
 data/version.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/version.php b/data/version.php
index 3c033ced5..3c065ad85 100644
--- a/data/version.php
+++ b/data/version.php
@@ -10,5 +10,5 @@
 
 if (!defined('OPENPNE_VERSION'))
 {
-  define('OPENPNE_VERSION', '3.9.0');
+  define('OPENPNE_VERSION', '3.9.1-dev');
 }

From 913da83b7399c859d53976585d07e66797377028 Mon Sep 17 00:00:00 2001
From: isaosano <sano@tejimaya.com>
Date: Fri, 13 Jan 2017 17:15:07 +0900
Subject: [PATCH 630/630] Fix to take the return value into consideration (refs
 #3925)

---
 lib/task/opPluginInstallTask.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/task/opPluginInstallTask.class.php b/lib/task/opPluginInstallTask.class.php
index e4426bebe..0979e466c 100644
--- a/lib/task/opPluginInstallTask.class.php
+++ b/lib/task/opPluginInstallTask.class.php
@@ -94,7 +94,7 @@ protected function execute($arguments = array(), $options = array())
       $str = "\"%s\" is already installed manually, so it will not be reinstalled.\n"
            . "If you want to manage it automatically, delete it manually and retry this command.";
       $this->logBlock(sprintf($str, $arguments['name']), 'INFO');
-      return false;
+      return 1;
     }
 
     try
@@ -163,7 +163,7 @@ protected function execute($arguments = array(), $options = array())
         $this->log($message);
       }
 
-      return false;
+      return 1;
     }
   }